diff --git a/app/build.gradle b/app/build.gradle
index 62d5a70f5e..2055b4075e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,38 +1,38 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
-
-    defaultConfig {
-        applicationId 'com.discord'
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 81014
-        versionName "81.14 - Stable"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-        lintOptions {
-            abortOnError false
-        }
-}
-
-dependencies {
-    // some dependencies
-}
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
+
+    defaultConfig {
+        applicationId 'com.discord'
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 82019
+        versionName "82.19 - Stable"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+        lintOptions {
+            abortOnError false
+        }
+}
+
+dependencies {
+    // some dependencies
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 43dd11f208..288b691220 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="81014" android:versionName="81.14 - Stable" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="82019" android:versionName="82.19 - Stable" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
diff --git a/app/src/main/java/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.java b/app/src/main/java/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.java
index 81f050569a..32a4317fb8 100644
--- a/app/src/main/java/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.java
+++ b/app/src/main/java/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.java
@@ -66,22 +66,17 @@ public class MediaControllerCompat$MediaControllerImplApi21 {
         }
 
         @Override // x.a.b.b.a.c.b, x.a.b.b.a.a
-        public void T(CharSequence charSequence) throws RemoteException {
+        public void U(CharSequence charSequence) throws RemoteException {
             throw new AssertionError();
         }
 
         @Override // x.a.b.b.a.c.b, x.a.b.b.a.a
-        public void U() throws RemoteException {
+        public void V() throws RemoteException {
             throw new AssertionError();
         }
 
         @Override // x.a.b.b.a.c.b, x.a.b.b.a.a
-        public void V(MediaMetadataCompat mediaMetadataCompat) throws RemoteException {
-            throw new AssertionError();
-        }
-
-        @Override // x.a.b.b.a.c.b, x.a.b.b.a.a
-        public void x(Bundle bundle) throws RemoteException {
+        public void W(MediaMetadataCompat mediaMetadataCompat) throws RemoteException {
             throw new AssertionError();
         }
 
@@ -91,7 +86,12 @@ public class MediaControllerCompat$MediaControllerImplApi21 {
         }
 
         @Override // x.a.b.b.a.c.b, x.a.b.b.a.a
-        public void y(List<MediaSessionCompat.QueueItem> list) throws RemoteException {
+        public void y(Bundle bundle) throws RemoteException {
+            throw new AssertionError();
+        }
+
+        @Override // x.a.b.b.a.c.b, x.a.b.b.a.a
+        public void z(List<MediaSessionCompat.QueueItem> list) throws RemoteException {
             throw new AssertionError();
         }
     }
@@ -113,7 +113,7 @@ public class MediaControllerCompat$MediaControllerImplApi21 {
                 this.d.put(cVar, aVar);
                 cVar.a = aVar;
                 try {
-                    this.e.b().j(aVar);
+                    this.e.b().k(aVar);
                 } catch (RemoteException e) {
                     Log.e("MediaControllerCompat", "Dead object in registerCallback.", e);
                 }
diff --git a/app/src/main/java/c/a/a/b.java b/app/src/main/java/c/a/a/a.java
similarity index 79%
rename from app/src/main/java/c/a/a/b.java
rename to app/src/main/java/c/a/a/a.java
index 0e421158d9..bd1e21548a 100644
--- a/app/src/main/java/c/a/a/b.java
+++ b/app/src/main/java/c/a/a/a.java
@@ -29,18 +29,19 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
 /* compiled from: ImageUploadFailedDialog.kt */
-public final class b extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(b.class, "binding", "getBinding()Lcom/discord/databinding/ImageUploadFailedDialogBinding;", 0)};
-    public static final C0005b j = new C0005b(null);
+public final class a extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/ImageUploadFailedDialogBinding;", 0)};
+    public static final b j = new b(null);
     public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
     public Function0<Unit> l;
 
     /* compiled from: java-style lambda group */
-    public static final class a implements View.OnClickListener {
+    /* renamed from: c.a.a.a$a  reason: collision with other inner class name */
+    public static final class View$OnClickListenerC0001a implements View.OnClickListener {
         public final /* synthetic */ int i;
         public final /* synthetic */ Object j;
 
-        public a(int i, Object obj) {
+        public View$OnClickListenerC0001a(int i, Object obj) {
             this.i = i;
             this.j = obj;
         }
@@ -49,15 +50,15 @@ public final class b extends AppDialog {
         public final void onClick(View view) {
             int i = this.i;
             if (i == 0) {
-                Function0<Unit> function0 = ((b) this.j).l;
+                Function0<Unit> function0 = ((a) this.j).l;
                 if (function0 != null) {
                     function0.mo1invoke();
                 }
-                ((b) this.j).dismiss();
+                ((a) this.j).dismiss();
             } else if (i == 1) {
-                ((b) this.j).dismiss();
+                ((a) this.j).dismiss();
             } else if (i == 2) {
-                ((b) this.j).dismiss();
+                ((a) this.j).dismiss();
             } else if (i == 3) {
                 AnalyticsTracker.INSTANCE.premiumSettingsOpened(new Traits.Location(null, "File Upload Popout (w/ Compression)", null, null, null, 29, null));
                 WidgetSettingsPremium.Companion companion = WidgetSettingsPremium.Companion;
@@ -65,10 +66,10 @@ public final class b extends AppDialog {
                 Context context = view.getContext();
                 m.checkNotNullExpressionValue(context, "it.context");
                 WidgetSettingsPremium.Companion.launch$default(companion, context, null, null, 6, null);
-                ((b) this.j).dismiss();
+                ((a) this.j).dismiss();
             } else if (i == 4) {
-                KProperty[] kPropertyArr = b.i;
-                ((b) this.j).g().f158c.toggle();
+                KProperty[] kPropertyArr = a.i;
+                ((a) this.j).g().f161c.toggle();
             } else {
                 throw null;
             }
@@ -76,23 +77,22 @@ public final class b extends AppDialog {
     }
 
     /* compiled from: ImageUploadFailedDialog.kt */
-    /* renamed from: c.a.a.b$b  reason: collision with other inner class name */
-    public static final class C0005b {
-        public C0005b(DefaultConstructorMarker defaultConstructorMarker) {
+    public static final class b {
+        public b(DefaultConstructorMarker defaultConstructorMarker) {
         }
 
         public final void a(FragmentManager fragmentManager, boolean z2, int i, float f, float f2, Function0<Unit> function0, int i2, boolean z3, boolean z4, boolean z5) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             float f3 = (float) 1048576;
             StoreStream.Companion.getAnalytics().trackFileUploadAlertViewed(z2 ? FileUploadAlertType.OVER_MAX_SIZE : FileUploadAlertType.NITRO_UPSELL, i2, (int) (f * f3), (int) (f3 * f2), z3, z4, z2);
-            b bVar = new b();
-            bVar.l = function0;
+            a aVar = new a();
+            aVar.l = function0;
             Bundle bundle = new Bundle();
             bundle.putBoolean("PARAM_IS_USER_PREMIUM", z2);
             bundle.putBoolean("PARAM_CAN_COMPRESS", !z4 && !z5);
             bundle.putInt("PARAM_MAX_FILE_SIZE_MB", i);
-            bVar.setArguments(bundle);
-            bVar.show(fragmentManager, ImageUploadDialog.class.getName());
+            aVar.setArguments(bundle);
+            aVar.show(fragmentManager, ImageUploadDialog.class.getName());
         }
     }
 
@@ -110,41 +110,41 @@ public final class b extends AppDialog {
         public u invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362501;
-            ImageView imageView = (ImageView) view2.findViewById(2131362501);
+            int i2 = 2131362514;
+            ImageView imageView = (ImageView) view2.findViewById(2131362514);
             if (imageView != null) {
-                i2 = 2131363541;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363541);
+                i2 = 2131363582;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363582);
                 if (materialButton != null) {
-                    i2 = 2131363542;
-                    SwitchMaterial switchMaterial = (SwitchMaterial) view2.findViewById(2131363542);
+                    i2 = 2131363583;
+                    SwitchMaterial switchMaterial = (SwitchMaterial) view2.findViewById(2131363583);
                     if (switchMaterial != null) {
-                        i2 = 2131363543;
-                        RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363543);
+                        i2 = 2131363584;
+                        RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363584);
                         if (relativeLayout != null) {
-                            i2 = 2131363544;
-                            View findViewById = view2.findViewById(2131363544);
+                            i2 = 2131363585;
+                            View findViewById = view2.findViewById(2131363585);
                             if (findViewById != null) {
-                                i2 = 2131363545;
-                                MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363545);
+                                i2 = 2131363586;
+                                MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363586);
                                 if (materialButton2 != null) {
-                                    i2 = 2131363546;
-                                    RelativeLayout relativeLayout2 = (RelativeLayout) view2.findViewById(2131363546);
+                                    i2 = 2131363587;
+                                    RelativeLayout relativeLayout2 = (RelativeLayout) view2.findViewById(2131363587);
                                     if (relativeLayout2 != null) {
-                                        i2 = 2131363547;
-                                        MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131363547);
+                                        i2 = 2131363588;
+                                        MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131363588);
                                         if (materialButton3 != null) {
-                                            i2 = 2131363548;
-                                            MaterialButton materialButton4 = (MaterialButton) view2.findViewById(2131363548);
+                                            i2 = 2131363589;
+                                            MaterialButton materialButton4 = (MaterialButton) view2.findViewById(2131363589);
                                             if (materialButton4 != null) {
-                                                i2 = 2131363549;
-                                                TextView textView = (TextView) view2.findViewById(2131363549);
+                                                i2 = 2131363590;
+                                                TextView textView = (TextView) view2.findViewById(2131363590);
                                                 if (textView != null) {
-                                                    i2 = 2131364729;
-                                                    TextView textView2 = (TextView) view2.findViewById(2131364729);
+                                                    i2 = 2131364778;
+                                                    TextView textView2 = (TextView) view2.findViewById(2131364778);
                                                     if (textView2 != null) {
-                                                        i2 = 2131364730;
-                                                        TextView textView3 = (TextView) view2.findViewById(2131364730);
+                                                        i2 = 2131364779;
+                                                        TextView textView3 = (TextView) view2.findViewById(2131364779);
                                                         if (textView3 != null) {
                                                             return new u((RelativeLayout) view2, imageView, materialButton, switchMaterial, relativeLayout, findViewById, materialButton2, relativeLayout2, materialButton3, materialButton4, textView, textView2, textView3);
                                                         }
@@ -173,7 +173,7 @@ public final class b extends AppDialog {
         }
     }
 
-    public b() {
+    public a() {
         super(2131558525);
     }
 
@@ -191,11 +191,11 @@ public final class b extends AppDialog {
         boolean z2 = getArgumentsOrDefault().getBoolean("PARAM_IS_USER_PREMIUM");
         boolean z3 = this.l != null && getArgumentsOrDefault().getBoolean("PARAM_CAN_COMPRESS");
         int i3 = 8;
-        int i4 = i2 != 8 ? i2 != 50 ? i2 != 100 ? i2 != 200 ? 0 : 2131888512 : 2131888511 : 2131888510 : 2131888513;
+        int i4 = i2 != 8 ? i2 != 50 ? i2 != 100 ? i2 != 200 ? 0 : 2131888513 : 2131888512 : 2131888511 : 2131888514;
         MaterialButton materialButton = g().i;
         m.checkNotNullExpressionValue(materialButton, "binding.imageUploadFailedSendCompress");
         materialButton.setVisibility(z3 ? 0 : 8);
-        g().i.setOnClickListener(new a(0, this));
+        g().i.setOnClickListener(new View$OnClickListenerC0001a(0, this));
         boolean z4 = z2 && !z3;
         View view2 = g().e;
         m.checkNotNullExpressionValue(view2, "binding.imageUploadFailedDivider");
@@ -204,26 +204,26 @@ public final class b extends AppDialog {
         MaterialButton materialButton2 = g().h;
         m.checkNotNullExpressionValue(materialButton2, "binding.imageUploadFailedOkay");
         materialButton2.setVisibility(z4 ? 0 : 8);
-        g().h.setOnClickListener(new a(1, this));
+        g().h.setOnClickListener(new View$OnClickListenerC0001a(1, this));
         MaterialButton materialButton3 = g().b;
         m.checkNotNullExpressionValue(materialButton3, "binding.imageUploadFailedCancel");
         materialButton3.setVisibility(z5 ? 0 : 8);
-        g().b.setOnClickListener(new a(2, this));
+        g().b.setOnClickListener(new View$OnClickListenerC0001a(2, this));
         RelativeLayout relativeLayout = g().g;
         m.checkNotNullExpressionValue(relativeLayout, "binding.imageUploadFailedNitroWrapper");
         relativeLayout.setVisibility(z2 ^ true ? 0 : 8);
-        g().f.setOnClickListener(new a(3, this));
+        g().f.setOnClickListener(new View$OnClickListenerC0001a(3, this));
         RelativeLayout relativeLayout2 = g().d;
         m.checkNotNullExpressionValue(relativeLayout2, "binding.imageUploadFaile…pressionSettingsContainer");
         if (z3) {
             i3 = 0;
         }
         relativeLayout2.setVisibility(i3);
-        g().d.setOnClickListener(new a(4, this));
-        SwitchMaterial switchMaterial = g().f158c;
+        g().d.setOnClickListener(new View$OnClickListenerC0001a(4, this));
+        SwitchMaterial switchMaterial = g().f161c;
         m.checkNotNullExpressionValue(switchMaterial, "binding.imageUploadFaile…mpressionSettingsCheckbox");
         switchMaterial.setChecked(StoreStream.Companion.getUserSettings().getIsAutoImageCompressionEnabled());
-        g().f158c.setOnCheckedChangeListener(d.a);
+        g().f161c.setOnCheckedChangeListener(d.a);
         TextView textView = g().j;
         m.checkNotNullExpressionValue(textView, "binding.imageUploadFailedText");
         CharSequence charSequence = null;
@@ -233,7 +233,7 @@ public final class b extends AppDialog {
                 Object[] objArr = new Object[1];
                 Context context2 = getContext();
                 objArr[0] = context2 != null ? c.a.l.b.g(context2, i4, new Object[0], null, 4) : null;
-                charSequence = c.a.l.b.g(context, 2131894117, objArr, null, 4);
+                charSequence = c.a.l.b.g(context, 2131894218, objArr, null, 4);
             }
         } else {
             Context context3 = getContext();
@@ -241,7 +241,7 @@ public final class b extends AppDialog {
                 Object[] objArr2 = new Object[1];
                 Context context4 = getContext();
                 objArr2[0] = context4 != null ? c.a.l.b.g(context4, i4, new Object[0], null, 4) : null;
-                charSequence = c.a.l.b.g(context3, 2131894118, objArr2, null, 4);
+                charSequence = c.a.l.b.g(context3, 2131894219, objArr2, null, 4);
             }
         }
         textView.setText(charSequence);
diff --git a/app/src/main/java/c/a/a/b/a.java b/app/src/main/java/c/a/a/b/a.java
new file mode 100644
index 0000000000..f6f91d0858
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/a.java
@@ -0,0 +1,264 @@
+package c.a.a.b;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentViewModelLazyKt;
+import c.a.a.b.f;
+import c.a.d.h0;
+import c.a.d.j0;
+import c.a.d.o;
+import c.a.i.m1;
+import com.discord.app.AppDialog;
+import com.discord.app.AppViewModel;
+import com.discord.models.user.User;
+import com.discord.utilities.icon.IconUtils;
+import com.discord.utilities.images.MGImages;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.user.UserNameFormatterKt;
+import com.facebook.drawee.view.SimpleDraweeView;
+import d0.z.d.a0;
+import d0.z.d.k;
+import d0.z.d.m;
+import java.util.Objects;
+import kotlin.Lazy;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+/* compiled from: UserActionsDialog.kt */
+public final class a extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/UserActionsDialogBinding;", 0)};
+    public static final b j = new b(null);
+    public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
+    public final Lazy l;
+    public final MGImages.DistinctChangeDetector m;
+
+    /* compiled from: java-style lambda group */
+    /* renamed from: c.a.a.b.a$a  reason: collision with other inner class name */
+    public static final class View$OnClickListenerC0002a implements View.OnClickListener {
+        public final /* synthetic */ int i;
+        public final /* synthetic */ Object j;
+
+        public View$OnClickListenerC0002a(int i, Object obj) {
+            this.i = i;
+            this.j = obj;
+        }
+
+        @Override // android.view.View.OnClickListener
+        public final void onClick(View view) {
+            int i = this.i;
+            if (i == 0) {
+                KProperty[] kPropertyArr = a.i;
+                f h = ((a) this.j).h();
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(h.l, "User Profile", h.k, 2, null, 8, null), false, 1, null), h, null, 2, null), f.class, (Context) null, (Function1) null, new h(h), (Function0) null, (Function0) null, new g(h), 54, (Object) null);
+            } else if (i == 1) {
+                KProperty[] kPropertyArr2 = a.i;
+                ((a) this.j).h().removeRelationship(2131894330);
+            } else if (i == 2) {
+                KProperty[] kPropertyArr3 = a.i;
+                ((a) this.j).h().removeRelationship(2131888788);
+            } else {
+                throw null;
+            }
+        }
+    }
+
+    /* compiled from: UserActionsDialog.kt */
+    public static final class b {
+        public b(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+    }
+
+    /* compiled from: UserActionsDialog.kt */
+    public static final /* synthetic */ class c extends k implements Function1<View, m1> {
+        public static final c i = new c();
+
+        public c() {
+            super(1, m1.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/UserActionsDialogBinding;", 0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public m1 invoke(View view) {
+            View view2 = view;
+            m.checkNotNullParameter(view2, "p1");
+            int i2 = 2131365422;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131365422);
+            if (simpleDraweeView != null) {
+                i2 = 2131365423;
+                TextView textView = (TextView) view2.findViewById(2131365423);
+                if (textView != null) {
+                    i2 = 2131365424;
+                    TextView textView2 = (TextView) view2.findViewById(2131365424);
+                    if (textView2 != null) {
+                        i2 = 2131365425;
+                        TextView textView3 = (TextView) view2.findViewById(2131365425);
+                        if (textView3 != null) {
+                            i2 = 2131365426;
+                            TextView textView4 = (TextView) view2.findViewById(2131365426);
+                            if (textView4 != null) {
+                                return new m1((LinearLayout) view2, simpleDraweeView, textView, textView2, textView3, textView4);
+                            }
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
+        }
+    }
+
+    /* compiled from: ObservableExtensions.kt */
+    public static final class d<T, R> implements j0.k.b<Object, Boolean> {
+        public static final d i = new d();
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // j0.k.b
+        public Boolean call(Object obj) {
+            return Boolean.valueOf(obj instanceof f.d.a);
+        }
+    }
+
+    /* compiled from: ObservableExtensions.kt */
+    public static final class e<T, R> implements j0.k.b<Object, T> {
+        public static final e i = new e();
+
+        @Override // j0.k.b
+        public final T call(Object obj) {
+            Objects.requireNonNull(obj, "null cannot be cast to non-null type com.discord.dialogs.useractions.UserActionsDialogViewModel.ViewState.Loaded");
+            return (T) ((f.d.a) obj);
+        }
+    }
+
+    /* compiled from: UserActionsDialog.kt */
+    public static final /* synthetic */ class f extends k implements Function1<f.d.a, Unit> {
+        public f(a aVar) {
+            super(1, aVar, a.class, "updateView", "updateView(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$ViewState$Loaded;)V", 0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(f.d.a aVar) {
+            f.d.a aVar2 = aVar;
+            m.checkNotNullParameter(aVar2, "p1");
+            a aVar3 = (a) this.receiver;
+            KProperty[] kPropertyArr = a.i;
+            SimpleDraweeView simpleDraweeView = aVar3.g().b;
+            m.checkNotNullExpressionValue(simpleDraweeView, "binding.userActionsDialogAvatar");
+            IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(aVar2.a, true, null, 4, null), 0, (Function1) null, aVar3.m, 12, (Object) null);
+            TextView textView = aVar3.g().f;
+            m.checkNotNullExpressionValue(textView, "binding.userActionsDialogUserName");
+            User user = aVar2.a;
+            String str = aVar2.b;
+            Context requireContext = aVar3.requireContext();
+            m.checkNotNullExpressionValue(requireContext, "requireContext()");
+            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, str, requireContext, 2130968932, 2130969326, 2131427362, 2130968988, 2130969325, 2131427362));
+            TextView textView2 = aVar3.g().f125c;
+            m.checkNotNullExpressionValue(textView2, "binding.userActionsDialogBlockItem");
+            int i = 8;
+            textView2.setVisibility(aVar2.f33c ? 0 : 8);
+            TextView textView3 = aVar3.g().e;
+            m.checkNotNullExpressionValue(textView3, "binding.userActionsDialogUnblockItem");
+            textView3.setVisibility(aVar2.d ? 0 : 8);
+            TextView textView4 = aVar3.g().d;
+            m.checkNotNullExpressionValue(textView4, "binding.userActionsDialogRemoveFriendItem");
+            if (aVar2.e) {
+                i = 0;
+            }
+            textView4.setVisibility(i);
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: UserActionsDialog.kt */
+    public static final /* synthetic */ class g extends k implements Function1<f.b, Unit> {
+        public g(a aVar) {
+            super(1, aVar, a.class, "handleEvent", "handleEvent(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$Event;)V", 0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(f.b bVar) {
+            f.b bVar2 = bVar;
+            m.checkNotNullParameter(bVar2, "p1");
+            a aVar = (a) this.receiver;
+            KProperty[] kPropertyArr = a.i;
+            Objects.requireNonNull(aVar);
+            if (bVar2 instanceof f.b.C0003b) {
+                o.i(aVar, ((f.b.C0003b) bVar2).a, 0, 4);
+                aVar.dismiss();
+            } else if (bVar2 instanceof f.b.a) {
+                o.i(aVar, ((f.b.a) bVar2).a, 0, 4);
+                aVar.dismiss();
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: UserActionsDialog.kt */
+    public static final class h extends d0.z.d.o implements Function0<AppViewModel<f.d>> {
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public h(a aVar) {
+            super(0);
+            this.this$0 = aVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public AppViewModel<f.d> mo1invoke() {
+            a aVar = this.this$0;
+            KProperty[] kPropertyArr = a.i;
+            return new f(aVar.getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", 0), this.this$0.getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0), null, null, 12);
+        }
+    }
+
+    public a() {
+        super(2131558706);
+        h hVar = new h(this);
+        h0 h0Var = new h0(this);
+        this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(f.class), new m(4, h0Var), new j0(hVar));
+        this.m = new MGImages.DistinctChangeDetector();
+    }
+
+    public final m1 g() {
+        return (m1) this.k.getValue((Fragment) this, i[0]);
+    }
+
+    public final f h() {
+        return (f) this.l.getValue();
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBound(View view) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewBound(view);
+        g().f125c.setOnClickListener(new View$OnClickListenerC0002a(0, this));
+        g().e.setOnClickListener(new View$OnClickListenerC0002a(1, this));
+        g().d.setOnClickListener(new View$OnClickListenerC0002a(2, this));
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        Observable<R> F = h().observeViewState().x(d.i).F(e.i);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(F, this), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new f(this), 62, (Object) null);
+        PublishSubject<f.b> publishSubject = h().j;
+        m.checkNotNullExpressionValue(publishSubject, "eventSubject");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(publishSubject, this, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new g(this), 62, (Object) null);
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/b.java b/app/src/main/java/c/a/a/b/b.java
new file mode 100644
index 0000000000..0013d13506
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/b.java
@@ -0,0 +1,43 @@
+package c.a.a.b;
+
+import c.a.a.b.f;
+import com.discord.models.domain.ModelUserRelationship;
+import com.discord.models.member.GuildMember;
+import com.discord.models.user.User;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.Objects;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class b extends o implements Function1<f.c, Unit> {
+    public final /* synthetic */ f this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public b(f fVar) {
+        super(1);
+        this.this$0 = fVar;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public Unit invoke(f.c cVar) {
+        f.c cVar2 = cVar;
+        m.checkNotNullParameter(cVar2, "storeState");
+        f fVar = this.this$0;
+        Objects.requireNonNull(fVar);
+        User user = cVar2.a;
+        if (user == null) {
+            fVar.j.j.onNext(new f.b.a(2131888048));
+        } else {
+            int type = ModelUserRelationship.getType(cVar2.b);
+            boolean z2 = type != 2;
+            boolean z3 = type == 2;
+            boolean z4 = type == 1;
+            GuildMember guildMember = cVar2.f32c;
+            fVar.updateViewState(new f.d.a(user, guildMember != null ? guildMember.getNick() : null, z2, z3, z4));
+        }
+        return Unit.a;
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/c.java b/app/src/main/java/c/a/a/b/c.java
new file mode 100644
index 0000000000..b4deb8b8a6
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/c.java
@@ -0,0 +1,21 @@
+package c.a.a.b;
+
+import com.discord.api.channel.Channel;
+import com.discord.models.member.GuildMember;
+import j0.k.b;
+import java.util.Map;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class c<T, R> implements b<Map<Long, ? extends GuildMember>, GuildMember> {
+    public final /* synthetic */ d i;
+
+    public c(d dVar, Channel channel) {
+        this.i = dVar;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // j0.k.b
+    public GuildMember call(Map<Long, ? extends GuildMember> map) {
+        return (GuildMember) map.get(Long.valueOf(this.i.j));
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/d.java b/app/src/main/java/c/a/a/b/d.java
new file mode 100644
index 0000000000..1e27d76943
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/d.java
@@ -0,0 +1,27 @@
+package c.a.a.b;
+
+import com.discord.api.channel.Channel;
+import com.discord.models.member.GuildMember;
+import com.discord.stores.StoreGuilds;
+import d0.t.m0;
+import j0.k.b;
+import j0.l.e.j;
+import rx.Observable;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class d<T, R> implements b<Channel, Observable<? extends GuildMember>> {
+    public final /* synthetic */ StoreGuilds i;
+    public final /* synthetic */ long j;
+
+    public d(StoreGuilds storeGuilds, long j) {
+        this.i = storeGuilds;
+        this.j = j;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // j0.k.b
+    public Observable<? extends GuildMember> call(Channel channel) {
+        Channel channel2 = channel;
+        return channel2 != null ? this.i.observeComputed(channel2.f(), m0.setOf(Long.valueOf(this.j))).F(new c(this, channel2)) : new j(null);
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/e.java b/app/src/main/java/c/a/a/b/e.java
new file mode 100644
index 0000000000..e562c4fbdd
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/e.java
@@ -0,0 +1,17 @@
+package c.a.a.b;
+
+import c.a.a.b.f;
+import com.discord.models.member.GuildMember;
+import com.discord.models.user.User;
+import rx.functions.Func3;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class e<T1, T2, T3, R> implements Func3<User, Integer, GuildMember, f.c> {
+    public static final e a = new e();
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func3
+    public f.c call(User user, Integer num, GuildMember guildMember) {
+        return new f.c(user, num, guildMember);
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/f.java b/app/src/main/java/c/a/a/b/f.java
new file mode 100644
index 0000000000..a1570c0cc7
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/f.java
@@ -0,0 +1,285 @@
+package c.a.a.b;
+
+import android.content.Context;
+import androidx.annotation.StringRes;
+import com.discord.app.AppViewModel;
+import com.discord.models.member.GuildMember;
+import com.discord.models.user.User;
+import com.discord.stores.StoreChannels;
+import com.discord.stores.StoreGuilds;
+import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
+import com.discord.stores.StoreUserRelationships;
+import com.discord.utilities.error.Error;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class f extends AppViewModel<d> {
+    public static final a i = new a(null);
+    public final PublishSubject<b> j;
+    public final long k;
+    public final RestAPI l;
+
+    /* compiled from: UserActionsDialogViewModel.kt */
+    public static final class a {
+        public a(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+    }
+
+    /* compiled from: UserActionsDialogViewModel.kt */
+    public static abstract class b {
+
+        /* compiled from: UserActionsDialogViewModel.kt */
+        public static final class a extends b {
+            public final int a;
+
+            public a(int i) {
+                super(null);
+                this.a = i;
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof a) && this.a == ((a) obj).a;
+                }
+                return true;
+            }
+
+            public int hashCode() {
+                return this.a;
+            }
+
+            public String toString() {
+                return c.d.b.a.a.z(c.d.b.a.a.L("Failure(failureMessageStringRes="), this.a, ")");
+            }
+        }
+
+        /* compiled from: UserActionsDialogViewModel.kt */
+        /* renamed from: c.a.a.b.f$b$b  reason: collision with other inner class name */
+        public static final class C0003b extends b {
+            public final int a;
+
+            public C0003b(int i) {
+                super(null);
+                this.a = i;
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof C0003b) && this.a == ((C0003b) obj).a;
+                }
+                return true;
+            }
+
+            public int hashCode() {
+                return this.a;
+            }
+
+            public String toString() {
+                return c.d.b.a.a.z(c.d.b.a.a.L("Success(successMessageStringRes="), this.a, ")");
+            }
+        }
+
+        public b() {
+        }
+
+        public b(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+    }
+
+    /* compiled from: UserActionsDialogViewModel.kt */
+    public static final class c {
+        public final User a;
+        public final Integer b;
+
+        /* renamed from: c  reason: collision with root package name */
+        public final GuildMember f32c;
+
+        public c(User user, Integer num, GuildMember guildMember) {
+            this.a = user;
+            this.b = num;
+            this.f32c = guildMember;
+        }
+    }
+
+    /* compiled from: UserActionsDialogViewModel.kt */
+    public static abstract class d {
+
+        /* compiled from: UserActionsDialogViewModel.kt */
+        public static final class a extends d {
+            public final User a;
+            public final String b;
+
+            /* renamed from: c  reason: collision with root package name */
+            public final boolean f33c;
+            public final boolean d;
+            public final boolean e;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public a(User user, String str, boolean z2, boolean z3, boolean z4) {
+                super(null);
+                m.checkNotNullParameter(user, "user");
+                this.a = user;
+                this.b = str;
+                this.f33c = z2;
+                this.d = z3;
+                this.e = z4;
+            }
+
+            public boolean equals(Object obj) {
+                if (this == obj) {
+                    return true;
+                }
+                if (!(obj instanceof a)) {
+                    return false;
+                }
+                a aVar = (a) obj;
+                return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && this.f33c == aVar.f33c && this.d == aVar.d && this.e == aVar.e;
+            }
+
+            public int hashCode() {
+                User user = this.a;
+                int i = 0;
+                int hashCode = (user != null ? user.hashCode() : 0) * 31;
+                String str = this.b;
+                if (str != null) {
+                    i = str.hashCode();
+                }
+                int i2 = (hashCode + i) * 31;
+                boolean z2 = this.f33c;
+                int i3 = 1;
+                if (z2) {
+                    z2 = true;
+                }
+                int i4 = z2 ? 1 : 0;
+                int i5 = z2 ? 1 : 0;
+                int i6 = z2 ? 1 : 0;
+                int i7 = (i2 + i4) * 31;
+                boolean z3 = this.d;
+                if (z3) {
+                    z3 = true;
+                }
+                int i8 = z3 ? 1 : 0;
+                int i9 = z3 ? 1 : 0;
+                int i10 = z3 ? 1 : 0;
+                int i11 = (i7 + i8) * 31;
+                boolean z4 = this.e;
+                if (!z4) {
+                    i3 = z4 ? 1 : 0;
+                }
+                return i11 + i3;
+            }
+
+            public String toString() {
+                StringBuilder L = c.d.b.a.a.L("Loaded(user=");
+                L.append(this.a);
+                L.append(", userNickname=");
+                L.append(this.b);
+                L.append(", showBlockItem=");
+                L.append(this.f33c);
+                L.append(", showUnblockItem=");
+                L.append(this.d);
+                L.append(", showRemoveFriendItem=");
+                return c.d.b.a.a.G(L, this.e, ")");
+            }
+        }
+
+        /* compiled from: UserActionsDialogViewModel.kt */
+        public static final class b extends d {
+            public static final b a = new b();
+
+            public b() {
+                super(null);
+            }
+        }
+
+        public d(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+    }
+
+    /* compiled from: UserActionsDialogViewModel.kt */
+    public static final class e extends o implements Function1<Void, Unit> {
+        public final /* synthetic */ int $successMessageStringRes;
+        public final /* synthetic */ f this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public e(f fVar, int i) {
+            super(1);
+            this.this$0 = fVar;
+            this.$successMessageStringRes = i;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(Void r3) {
+            f fVar = this.this$0;
+            int i = this.$successMessageStringRes;
+            PublishSubject<b> publishSubject = fVar.j;
+            publishSubject.j.onNext(new b.C0003b(i));
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: UserActionsDialogViewModel.kt */
+    /* renamed from: c.a.a.b.f$f  reason: collision with other inner class name */
+    public static final class C0004f extends o implements Function1<Error, Unit> {
+        public final /* synthetic */ f this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public C0004f(f fVar) {
+            super(1);
+            this.this$0 = fVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(Error error) {
+            m.checkNotNullParameter(error, "it");
+            PublishSubject<b> publishSubject = this.this$0.j;
+            publishSubject.j.onNext(new b.a(2131888048));
+            return Unit.a;
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public f(long j, long j2, RestAPI restAPI, Observable observable, int i2) {
+        super(d.b.a);
+        Observable observable2;
+        RestAPI api = (i2 & 4) != 0 ? RestAPI.Companion.getApi() : null;
+        if ((i2 & 8) != 0) {
+            StoreStream.Companion companion = StoreStream.Companion;
+            StoreUser users = companion.getUsers();
+            StoreUserRelationships userRelationships = companion.getUserRelationships();
+            StoreGuilds guilds = companion.getGuilds();
+            StoreChannels channels = companion.getChannels();
+            Observable<User> observeUser = users.observeUser(j);
+            Observable<Integer> observe = userRelationships.observe(j);
+            Observable r = channels.observeChannel(j2).Y(new d(guilds, j)).r();
+            m.checkNotNullExpressionValue(r, "storeChannels\n          …  .distinctUntilChanged()");
+            observable2 = Observable.i(observeUser, observe, r, e.a).r();
+            m.checkNotNullExpressionValue(observable2, "Observable.combineLatest…  .distinctUntilChanged()");
+        } else {
+            observable2 = null;
+        }
+        m.checkNotNullParameter(api, "restAPI");
+        m.checkNotNullParameter(observable2, "storeObservable");
+        this.k = j;
+        this.l = api;
+        this.j = PublishSubject.k0();
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 62, (Object) null);
+    }
+
+    public final void removeRelationship(@StringRes int i2) {
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.l.removeRelationship("User Profile", this.k), false, 1, null), this, null, 2, null), f.class, (Context) null, (Function1) null, new C0004f(this), (Function0) null, (Function0) null, new e(this, i2), 54, (Object) null);
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/g.java b/app/src/main/java/c/a/a/b/g.java
new file mode 100644
index 0000000000..2b4d4b2ed4
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/g.java
@@ -0,0 +1,26 @@
+package c.a.a.b;
+
+import c.a.a.b.f;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.subjects.PublishSubject;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class g extends o implements Function1<Void, Unit> {
+    public final /* synthetic */ f this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public g(f fVar) {
+        super(1);
+        this.this$0 = fVar;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public Unit invoke(Void r3) {
+        PublishSubject<f.b> publishSubject = this.this$0.j;
+        publishSubject.j.onNext(new f.b.C0003b(2131894329));
+        return Unit.a;
+    }
+}
diff --git a/app/src/main/java/c/a/a/b/h.java b/app/src/main/java/c/a/a/b/h.java
new file mode 100644
index 0000000000..58bb39c146
--- /dev/null
+++ b/app/src/main/java/c/a/a/b/h.java
@@ -0,0 +1,29 @@
+package c.a.a.b;
+
+import c.a.a.b.f;
+import com.discord.utilities.error.Error;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.subjects.PublishSubject;
+/* compiled from: UserActionsDialogViewModel.kt */
+public final class h extends o implements Function1<Error, Unit> {
+    public final /* synthetic */ f this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public h(f fVar) {
+        super(1);
+        this.this$0 = fVar;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public Unit invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        PublishSubject<f.b> publishSubject = this.this$0.j;
+        publishSubject.j.onNext(new f.b.a(2131888048));
+        return Unit.a;
+    }
+}
diff --git a/app/src/main/java/c/a/a/c/a.java b/app/src/main/java/c/a/a/c/a.java
index 3bb4b42fb9..9291bc5785 100644
--- a/app/src/main/java/c/a/a/c/a.java
+++ b/app/src/main/java/c/a/a/c/a.java
@@ -1,30 +1,36 @@
 package c.a.a.c;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.a.c.f;
 import c.a.d.h0;
 import c.a.d.j0;
-import c.a.d.o;
-import c.a.i.k1;
+import c.a.i.w0;
 import com.discord.app.AppDialog;
+import com.discord.app.AppViewFlipper;
 import com.discord.app.AppViewModel;
-import com.discord.models.user.User;
-import com.discord.utilities.icon.IconUtils;
-import com.discord.utilities.images.MGImages;
-import com.discord.utilities.rest.RestAPI;
+import com.discord.models.domain.ModelSubscription;
+import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.time.TimeUtils;
+import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.discord.widgets.user.UserNameFormatterKt;
-import com.facebook.drawee.view.SimpleDraweeView;
+import com.discord.views.LoadingButton;
+import com.google.android.material.button.MaterialButton;
+import d0.g;
 import d0.z.d.a0;
 import d0.z.d.k;
 import d0.z.d.m;
+import d0.z.d.o;
+import java.text.DateFormat;
 import java.util.Objects;
 import kotlin.Lazy;
 import kotlin.Unit;
@@ -33,22 +39,21 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
 import rx.Observable;
-import rx.subjects.PublishSubject;
-/* compiled from: UserActionsDialog.kt */
+/* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
 public final class a extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/UserActionsDialogBinding;", 0)};
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildSubscriptionCancelDialogBinding;", 0)};
     public static final b j = new b(null);
     public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
     public final Lazy l;
-    public final MGImages.DistinctChangeDetector m;
+    public final Lazy m;
 
     /* compiled from: java-style lambda group */
     /* renamed from: c.a.a.c.a$a  reason: collision with other inner class name */
-    public static final class View$OnClickListenerC0006a implements View.OnClickListener {
+    public static final class View$OnClickListenerC0005a implements View.OnClickListener {
         public final /* synthetic */ int i;
         public final /* synthetic */ Object j;
 
-        public View$OnClickListenerC0006a(int i, Object obj) {
+        public View$OnClickListenerC0005a(int i, Object obj) {
             this.i = i;
             this.j = obj;
         }
@@ -57,57 +62,84 @@ public final class a extends AppDialog {
         public final void onClick(View view) {
             int i = this.i;
             if (i == 0) {
-                KProperty[] kPropertyArr = a.i;
-                f h = ((a) this.j).h();
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(h.l, "User Profile", h.k, 2, null, 8, null), false, 1, null), h, null, 2, null), f.class, (Context) null, (Function1) null, new h(h), (Function0) null, (Function0) null, new g(h), 54, (Object) null);
+                f fVar = (f) ((a) this.j).l.getValue();
+                f.c viewState = fVar.getViewState();
+                if ((viewState instanceof f.c.C0009f) || (viewState instanceof f.c.a)) {
+                    return;
+                }
+                if ((viewState instanceof f.c.e) || (viewState instanceof f.c.d) || (viewState instanceof f.c.b)) {
+                    fVar.updateViewState(new f.c.C0008c(null, 1));
+                }
             } else if (i == 1) {
-                KProperty[] kPropertyArr2 = a.i;
-                ((a) this.j).h().removeRelationship(2131894229);
-            } else if (i == 2) {
-                KProperty[] kPropertyArr3 = a.i;
-                ((a) this.j).h().removeRelationship(2131888787);
+                f fVar2 = (f) ((a) this.j).l.getValue();
+                f.c viewState2 = fVar2.getViewState();
+                if ((viewState2 instanceof f.c.C0009f) || (viewState2 instanceof f.c.a)) {
+                    return;
+                }
+                if ((viewState2 instanceof f.c.e) || (viewState2 instanceof f.c.d)) {
+                    f.c viewState3 = fVar2.getViewState();
+                    ModelSubscription modelSubscription = viewState3 instanceof f.c.e ? ((f.c.e) viewState3).f : viewState3 instanceof f.c.d ? ((f.c.d) viewState3).f : null;
+                    if (modelSubscription != null) {
+                        fVar2.updateViewState(new f.c.a(modelSubscription));
+                        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(PremiumGuildSubscriptionUtils.INSTANCE.cancelSubscriptionSlot(fVar2.m, fVar2.j, modelSubscription, fVar2.k), fVar2, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new g(fVar2, modelSubscription), 62, (Object) null);
+                    }
+                } else if (viewState2 instanceof f.c.b) {
+                    fVar2.updateViewState(new f.c.C0008c(null, 1));
+                }
             } else {
                 throw null;
             }
         }
     }
 
-    /* compiled from: UserActionsDialog.kt */
+    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
     public static final class b {
         public b(DefaultConstructorMarker defaultConstructorMarker) {
         }
     }
 
-    /* compiled from: UserActionsDialog.kt */
-    public static final /* synthetic */ class c extends k implements Function1<View, k1> {
+    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
+    public static final /* synthetic */ class c extends k implements Function1<View, w0> {
         public static final c i = new c();
 
         public c() {
-            super(1, k1.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/UserActionsDialogBinding;", 0);
+            super(1, w0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildSubscriptionCancelDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public k1 invoke(View view) {
+        public w0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131365362;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131365362);
-            if (simpleDraweeView != null) {
-                i2 = 2131365363;
-                TextView textView = (TextView) view2.findViewById(2131365363);
-                if (textView != null) {
-                    i2 = 2131365364;
-                    TextView textView2 = (TextView) view2.findViewById(2131365364);
-                    if (textView2 != null) {
-                        i2 = 2131365365;
-                        TextView textView3 = (TextView) view2.findViewById(2131365365);
-                        if (textView3 != null) {
-                            i2 = 2131365366;
-                            TextView textView4 = (TextView) view2.findViewById(2131365366);
-                            if (textView4 != null) {
-                                return new k1((LinearLayout) view2, simpleDraweeView, textView, textView2, textView3, textView4);
+            int i2 = 2131361894;
+            ProgressBar progressBar = (ProgressBar) view2.findViewById(2131361894);
+            if (progressBar != null) {
+                i2 = 2131364073;
+                LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364073);
+                if (linearLayout != null) {
+                    i2 = 2131364301;
+                    TextView textView = (TextView) view2.findViewById(2131364301);
+                    if (textView != null) {
+                        i2 = 2131364302;
+                        LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364302);
+                        if (loadingButton != null) {
+                            i2 = 2131364303;
+                            TextView textView2 = (TextView) view2.findViewById(2131364303);
+                            if (textView2 != null) {
+                                i2 = 2131364304;
+                                AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364304);
+                                if (appViewFlipper != null) {
+                                    i2 = 2131364305;
+                                    TextView textView3 = (TextView) view2.findViewById(2131364305);
+                                    if (textView3 != null) {
+                                        i2 = 2131364306;
+                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364306);
+                                        if (materialButton != null) {
+                                            return new w0((LinearLayout) view2, progressBar, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, materialButton);
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -117,101 +149,89 @@ public final class a extends AppDialog {
         }
     }
 
-    /* compiled from: ObservableExtensions.kt */
-    public static final class d<T, R> implements j0.k.b<Object, Boolean> {
-        public static final d i = new d();
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // j0.k.b
-        public Boolean call(Object obj) {
-            return Boolean.valueOf(obj instanceof f.d.a);
-        }
-    }
-
-    /* compiled from: ObservableExtensions.kt */
-    public static final class e<T, R> implements j0.k.b<Object, T> {
-        public static final e i = new e();
-
-        @Override // j0.k.b
-        public final T call(Object obj) {
-            Objects.requireNonNull(obj, "null cannot be cast to non-null type com.discord.dialogs.useractions.UserActionsDialogViewModel.ViewState.Loaded");
-            return (T) ((f.d.a) obj);
-        }
-    }
-
-    /* compiled from: UserActionsDialog.kt */
-    public static final /* synthetic */ class f extends k implements Function1<f.d.a, Unit> {
-        public f(a aVar) {
-            super(1, aVar, a.class, "updateView", "updateView(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$ViewState$Loaded;)V", 0);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(f.d.a aVar) {
-            f.d.a aVar2 = aVar;
-            m.checkNotNullParameter(aVar2, "p1");
-            a aVar3 = (a) this.receiver;
-            KProperty[] kPropertyArr = a.i;
-            SimpleDraweeView simpleDraweeView = aVar3.g().b;
-            m.checkNotNullExpressionValue(simpleDraweeView, "binding.userActionsDialogAvatar");
-            IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(aVar2.a, true, null, 4, null), 0, (Function1) null, aVar3.m, 12, (Object) null);
-            TextView textView = aVar3.g().f;
-            m.checkNotNullExpressionValue(textView, "binding.userActionsDialogUserName");
-            User user = aVar2.a;
-            String str = aVar2.b;
-            Context requireContext = aVar3.requireContext();
-            m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, str, requireContext, 2130968932, 2130969326, 2131427361, 2130968988, 2130969325, 2131427361));
-            TextView textView2 = aVar3.g().f115c;
-            m.checkNotNullExpressionValue(textView2, "binding.userActionsDialogBlockItem");
-            int i = 8;
-            textView2.setVisibility(aVar2.f34c ? 0 : 8);
-            TextView textView3 = aVar3.g().e;
-            m.checkNotNullExpressionValue(textView3, "binding.userActionsDialogUnblockItem");
-            textView3.setVisibility(aVar2.d ? 0 : 8);
-            TextView textView4 = aVar3.g().d;
-            m.checkNotNullExpressionValue(textView4, "binding.userActionsDialogRemoveFriendItem");
-            if (aVar2.e) {
-                i = 0;
-            }
-            textView4.setVisibility(i);
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: UserActionsDialog.kt */
-    public static final /* synthetic */ class g extends k implements Function1<f.b, Unit> {
-        public g(a aVar) {
-            super(1, aVar, a.class, "handleEvent", "handleEvent(Lcom/discord/dialogs/useractions/UserActionsDialogViewModel$Event;)V", 0);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(f.b bVar) {
-            f.b bVar2 = bVar;
-            m.checkNotNullParameter(bVar2, "p1");
-            a aVar = (a) this.receiver;
-            KProperty[] kPropertyArr = a.i;
-            Objects.requireNonNull(aVar);
-            if (bVar2 instanceof f.b.C0007b) {
-                o.i(aVar, ((f.b.C0007b) bVar2).a, 0, 4);
-                aVar.dismiss();
-            } else if (bVar2 instanceof f.b.a) {
-                o.i(aVar, ((f.b.a) bVar2).a, 0, 4);
-                aVar.dismiss();
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: UserActionsDialog.kt */
-    public static final class h extends d0.z.d.o implements Function0<AppViewModel<f.d>> {
+    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
+    public static final class d extends o implements Function1<f.c, Unit> {
         public final /* synthetic */ a this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public h(a aVar) {
+        public d(a aVar) {
+            super(1);
+            this.this$0 = aVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(f.c cVar) {
+            f.c cVar2 = cVar;
+            a aVar = this.this$0;
+            m.checkNotNullExpressionValue(cVar2, "it");
+            KProperty[] kPropertyArr = a.i;
+            TextView textView = aVar.g().d;
+            m.checkNotNullExpressionValue(textView, "binding.premiumGuildSubscriptionCancelError");
+            int i = 8;
+            textView.setVisibility(cVar2.a ? 0 : 8);
+            MaterialButton materialButton = aVar.g().g;
+            m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildSubscriptionCancelNevermind");
+            if (cVar2.b) {
+                i = 0;
+            }
+            materialButton.setVisibility(i);
+            MaterialButton materialButton2 = aVar.g().g;
+            m.checkNotNullExpressionValue(materialButton2, "binding.premiumGuildSubscriptionCancelNevermind");
+            ViewExtensions.setEnabledAndAlpha$default(materialButton2, cVar2.f34c, 0.0f, 2, null);
+            aVar.setCancelable(cVar2.e);
+            aVar.g().f170c.setIsLoading(cVar2.d);
+            AppViewFlipper appViewFlipper = aVar.g().e;
+            m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumGuildSubscriptionCancelFlipper");
+            appViewFlipper.setDisplayedChild(!(cVar2 instanceof f.c.C0009f) ? 1 : 0);
+            if (cVar2 instanceof f.c.e) {
+                TimeUtils timeUtils = TimeUtils.INSTANCE;
+                f.c.e eVar = (f.c.e) cVar2;
+                String currentPeriodEnd = eVar.f.getCurrentPeriodEnd();
+                Context requireContext = aVar.requireContext();
+                m.checkNotNullExpressionValue(requireContext, "requireContext()");
+                String renderUtcDate$default = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodEnd, requireContext, (String) null, (DateFormat) null, 0, 28, (Object) null);
+                if (eVar.g) {
+                    TextView textView2 = aVar.g().b;
+                    m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionCancelBody");
+                    c.a.l.b.m(textView2, 2131892142, new Object[]{renderUtcDate$default}, null, 4);
+                } else {
+                    TextView textView3 = aVar.g().b;
+                    m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionCancelBody");
+                    c.a.l.b.m(textView3, 2131892141, new Object[]{renderUtcDate$default}, null, 4);
+                }
+                aVar.g().f170c.setBackgroundColor(ColorCompat.getColor(aVar, 2131100324));
+            } else if (cVar2 instanceof f.c.b) {
+                TextView textView4 = aVar.g().f;
+                m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionCancelHeader");
+                textView4.setText(aVar.getString(2131892153));
+                TextView textView5 = aVar.g().b;
+                m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionCancelBody");
+                TimeUtils timeUtils2 = TimeUtils.INSTANCE;
+                String currentPeriodEnd2 = ((f.c.b) cVar2).f.getCurrentPeriodEnd();
+                Context requireContext2 = aVar.requireContext();
+                m.checkNotNullExpressionValue(requireContext2, "requireContext()");
+                c.a.l.b.m(textView5, 2131892154, new Object[]{TimeUtils.renderUtcDate$default(timeUtils2, currentPeriodEnd2, requireContext2, (String) null, (DateFormat) null, 0, 28, (Object) null)}, null, 4);
+                aVar.g().f170c.setText(aVar.getString(2131891735));
+                aVar.g().f170c.setBackgroundColor(ColorCompat.getThemedColor(aVar, 2130969007));
+            } else if (cVar2 instanceof f.c.C0008c) {
+                Integer num = ((f.c.C0008c) cVar2).f;
+                if (num != null) {
+                    c.a.d.o.g(aVar.requireContext(), num.intValue(), 0, null, 12);
+                }
+                aVar.dismiss();
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
+    public static final class e extends o implements Function0<Long> {
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public e(a aVar) {
             super(0);
             this.this$0 = aVar;
         }
@@ -219,46 +239,57 @@ public final class a extends AppDialog {
         /* Return type fixed from 'java.lang.Object' to match base method */
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
-        public AppViewModel<f.d> mo1invoke() {
-            a aVar = this.this$0;
-            KProperty[] kPropertyArr = a.i;
-            return new f(aVar.getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", 0), this.this$0.getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0), null, null, 12);
+        public Long mo1invoke() {
+            Bundle arguments = this.this$0.getArguments();
+            Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("extra_slot_id")) : null;
+            Objects.requireNonNull(valueOf, "null cannot be cast to non-null type com.discord.models.domain.PremiumGuildSubscriptionSlotId /* = kotlin.Long */");
+            return Long.valueOf(valueOf.longValue());
+        }
+    }
+
+    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
+    public static final class f extends o implements Function0<AppViewModel<f.c>> {
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public f(a aVar) {
+            super(0);
+            this.this$0 = aVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public AppViewModel<f.c> mo1invoke() {
+            return new f(((Number) this.this$0.m.getValue()).longValue(), null, null, null, null, 30);
         }
     }
 
     public a() {
-        super(2131558706);
-        h hVar = new h(this);
+        super(2131558638);
+        f fVar = new f(this);
         h0 h0Var = new h0(this);
-        this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(f.class), new m(4, h0Var), new j0(hVar));
-        this.m = new MGImages.DistinctChangeDetector();
+        this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(f.class), new m(2, h0Var), new j0(fVar));
+        this.m = g.lazy(new e(this));
     }
 
-    public final k1 g() {
-        return (k1) this.k.getValue((Fragment) this, i[0]);
-    }
-
-    public final f h() {
-        return (f) this.l.getValue();
+    public final w0 g() {
+        return (w0) this.k.getValue((Fragment) this, i[0]);
     }
 
     @Override // com.discord.app.AppDialog
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        g().f115c.setOnClickListener(new View$OnClickListenerC0006a(0, this));
-        g().e.setOnClickListener(new View$OnClickListenerC0006a(1, this));
-        g().d.setOnClickListener(new View$OnClickListenerC0006a(2, this));
+        g().g.setOnClickListener(new View$OnClickListenerC0005a(0, this));
+        g().f170c.setOnClickListener(new View$OnClickListenerC0005a(1, this));
     }
 
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<R> G = h().observeViewState().y(d.i).G(e.i);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(G, this), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new f(this), 62, (Object) null);
-        PublishSubject<f.b> publishSubject = h().j;
-        m.checkNotNullExpressionValue(publishSubject, "eventSubject");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(publishSubject, this, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new g(this), 62, (Object) null);
+        Observable<f.c> r = ((f) this.l.getValue()).observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/c/a/a/c/b.java b/app/src/main/java/c/a/a/c/b.java
index ce517650da..ce019ed024 100644
--- a/app/src/main/java/c/a/a/c/b.java
+++ b/app/src/main/java/c/a/a/c/b.java
@@ -1,43 +1,291 @@
 package c.a.a.c;
 
-import c.a.a.c.f;
-import com.discord.models.domain.ModelUserRelationship;
-import com.discord.models.member.GuildMember;
-import com.discord.models.user.User;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentViewModelLazyKt;
+import c.a.a.c.k;
+import c.a.d.h0;
+import c.a.d.j0;
+import c.a.i.x0;
+import com.discord.app.AppDialog;
+import com.discord.app.AppViewFlipper;
+import com.discord.app.AppViewModel;
+import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.view.extensions.ViewExtensions;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.views.LoadingButton;
+import com.google.android.material.button.MaterialButton;
+import d0.g;
+import d0.z.d.a0;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Objects;
+import kotlin.Lazy;
 import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class b extends o implements Function1<f.c, Unit> {
-    public final /* synthetic */ f this$0;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+import rx.Observable;
+/* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
+public final class b extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(b.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildSubscriptionUncancelDialogBinding;", 0)};
+    public static final C0006b j = new C0006b(null);
+    public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
+    public final Lazy l;
+    public final Lazy m;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public b(f fVar) {
-        super(1);
-        this.this$0 = fVar;
+    /* compiled from: java-style lambda group */
+    public static final class a implements View.OnClickListener {
+        public final /* synthetic */ int i;
+        public final /* synthetic */ Object j;
+
+        public a(int i, Object obj) {
+            this.i = i;
+            this.j = obj;
+        }
+
+        @Override // android.view.View.OnClickListener
+        public final void onClick(View view) {
+            int i = this.i;
+            if (i == 0) {
+                k kVar = (k) ((b) this.j).l.getValue();
+                k.c viewState = kVar.getViewState();
+                if (!m.areEqual(viewState, k.c.C0010c.a)) {
+                    if ((viewState instanceof k.c.b) || (viewState instanceof k.c.a)) {
+                        kVar.updateViewState(new k.c.a(null, 1));
+                    }
+                }
+            } else if (i == 1) {
+                k kVar2 = (k) ((b) this.j).l.getValue();
+                k.c viewState2 = kVar2.getViewState();
+                if (!m.areEqual(viewState2, k.c.C0010c.a)) {
+                    if (viewState2 instanceof k.c.b) {
+                        k.c viewState3 = kVar2.getViewState();
+                        Objects.requireNonNull(viewState3, "null cannot be cast to non-null type com.discord.dialogs.premiumguild.PremiumGuildSubscriptionUncancelViewModel.ViewState.Loaded");
+                        if (!((k.c.b) viewState3).b) {
+                            k.c viewState4 = kVar2.getViewState();
+                            if (!(viewState4 instanceof k.c.b)) {
+                                viewState4 = null;
+                            }
+                            k.c.b bVar = (k.c.b) viewState4;
+                            if (bVar != null) {
+                                kVar2.updateViewState(k.c.b.a(bVar, null, true, false, 5));
+                                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(PremiumGuildSubscriptionUtils.INSTANCE.uncancelSubscriptionSlot(kVar2.m, kVar2.j, bVar.a, kVar2.l), kVar2, null, 2, null), k.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new l(kVar2, bVar), 62, (Object) null);
+                            }
+                        }
+                    } else if ((viewState2 instanceof k.c.d) || (viewState2 instanceof k.c.a)) {
+                        kVar2.updateViewState(new k.c.a(null, 1));
+                    }
+                }
+            } else {
+                throw null;
+            }
+        }
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(f.c cVar) {
-        f.c cVar2 = cVar;
-        m.checkNotNullParameter(cVar2, "storeState");
-        f fVar = this.this$0;
-        Objects.requireNonNull(fVar);
-        User user = cVar2.a;
-        if (user == null) {
-            fVar.j.j.onNext(new f.b.a(2131888049));
-        } else {
-            int type = ModelUserRelationship.getType(cVar2.b);
-            boolean z2 = type != 2;
-            boolean z3 = type == 2;
-            boolean z4 = type == 1;
-            GuildMember guildMember = cVar2.f33c;
-            fVar.updateViewState(new f.d.a(user, guildMember != null ? guildMember.getNick() : null, z2, z3, z4));
+    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
+    /* renamed from: c.a.a.c.b$b  reason: collision with other inner class name */
+    public static final class C0006b {
+        public C0006b(DefaultConstructorMarker defaultConstructorMarker) {
         }
-        return Unit.a;
+    }
+
+    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
+    public static final /* synthetic */ class c extends d0.z.d.k implements Function1<View, x0> {
+        public static final c i = new c();
+
+        public c() {
+            super(1, x0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildSubscriptionUncancelDialogBinding;", 0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public x0 invoke(View view) {
+            View view2 = view;
+            m.checkNotNullParameter(view2, "p1");
+            int i2 = 2131364073;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364073);
+            if (linearLayout != null) {
+                i2 = 2131364307;
+                TextView textView = (TextView) view2.findViewById(2131364307);
+                if (textView != null) {
+                    i2 = 2131364308;
+                    LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364308);
+                    if (loadingButton != null) {
+                        i2 = 2131364309;
+                        TextView textView2 = (TextView) view2.findViewById(2131364309);
+                        if (textView2 != null) {
+                            i2 = 2131364310;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364310);
+                            if (appViewFlipper != null) {
+                                i2 = 2131364311;
+                                TextView textView3 = (TextView) view2.findViewById(2131364311);
+                                if (textView3 != null) {
+                                    i2 = 2131364312;
+                                    ImageView imageView = (ImageView) view2.findViewById(2131364312);
+                                    if (imageView != null) {
+                                        i2 = 2131364313;
+                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364313);
+                                        if (materialButton != null) {
+                                            return new x0((LinearLayout) view2, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, imageView, materialButton);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
+        }
+    }
+
+    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
+    public static final class d extends o implements Function1<k.c, Unit> {
+        public final /* synthetic */ b this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public d(b bVar) {
+            super(1);
+            this.this$0 = bVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(k.c cVar) {
+            k.c cVar2 = cVar;
+            b bVar = this.this$0;
+            m.checkNotNullExpressionValue(cVar2, "it");
+            KProperty[] kPropertyArr = b.i;
+            AppViewFlipper appViewFlipper = bVar.g().e;
+            m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumGuildSubscriptionUncancelFlipper");
+            boolean z2 = true;
+            appViewFlipper.setDisplayedChild(!(cVar2 instanceof k.c.C0010c) ? 1 : 0);
+            TextView textView = bVar.g().d;
+            m.checkNotNullExpressionValue(textView, "binding.premiumGuildSubscriptionUncancelError");
+            boolean z3 = cVar2 instanceof k.c.b;
+            int i = 8;
+            textView.setVisibility(z3 && ((k.c.b) cVar2).f35c ? 0 : 8);
+            MaterialButton materialButton = bVar.g().h;
+            m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildSubscriptionUncancelNevermind");
+            if (z3) {
+                i = 0;
+            }
+            materialButton.setVisibility(i);
+            MaterialButton materialButton2 = bVar.g().h;
+            m.checkNotNullExpressionValue(materialButton2, "binding.premiumGuildSubscriptionUncancelNevermind");
+            ViewExtensions.setEnabledAndAlpha$default(materialButton2, z3 && !((k.c.b) cVar2).b, 0.0f, 2, null);
+            bVar.g().f176c.setIsLoading(z3 && ((k.c.b) cVar2).b);
+            k.c.C0010c cVar3 = k.c.C0010c.a;
+            if (!(!m.areEqual(cVar2, cVar3)) || !z3 || ((k.c.b) cVar2).b) {
+                z2 = false;
+            }
+            bVar.setCancelable(z2);
+            if (!m.areEqual(cVar2, cVar3)) {
+                if (z3) {
+                    TextView textView2 = bVar.g().f;
+                    m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionUncancelHeader");
+                    textView2.setText(bVar.getString(2131892177));
+                    TextView textView3 = bVar.g().b;
+                    m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionUncancelBody");
+                    textView3.setText(bVar.getString(2131892174));
+                } else if (m.areEqual(cVar2, k.c.d.a)) {
+                    TextView textView4 = bVar.g().f;
+                    m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionUncancelHeader");
+                    textView4.setText(bVar.getString(2131892173));
+                    ImageView imageView = bVar.g().g;
+                    m.checkNotNullExpressionValue(imageView, "binding.premiumGuildSubscriptionUncancelImage");
+                    imageView.setVisibility(0);
+                    TextView textView5 = bVar.g().b;
+                    m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionUncancelBody");
+                    textView5.setText(bVar.getString(2131892172));
+                    bVar.g().f176c.setText(bVar.getString(2131891735));
+                } else if (cVar2 instanceof k.c.a) {
+                    Integer num = ((k.c.a) cVar2).a;
+                    if (num != null) {
+                        c.a.d.o.i(bVar, num.intValue(), 0, 4);
+                    }
+                    bVar.dismiss();
+                }
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
+    public static final class e extends o implements Function0<Long> {
+        public final /* synthetic */ b this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public e(b bVar) {
+            super(0);
+            this.this$0 = bVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Long mo1invoke() {
+            Bundle arguments = this.this$0.getArguments();
+            Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("extra_slot_id")) : null;
+            Objects.requireNonNull(valueOf, "null cannot be cast to non-null type com.discord.models.domain.PremiumGuildSubscriptionSlotId /* = kotlin.Long */");
+            return Long.valueOf(valueOf.longValue());
+        }
+    }
+
+    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
+    public static final class f extends o implements Function0<AppViewModel<k.c>> {
+        public final /* synthetic */ b this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public f(b bVar) {
+            super(0);
+            this.this$0 = bVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public AppViewModel<k.c> mo1invoke() {
+            return new k(((Number) this.this$0.m.getValue()).longValue(), null, null, null, null, 30);
+        }
+    }
+
+    public b() {
+        super(2131558639);
+        f fVar = new f(this);
+        h0 h0Var = new h0(this);
+        this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(k.class), new m(3, h0Var), new j0(fVar));
+        this.m = g.lazy(new e(this));
+    }
+
+    public final x0 g() {
+        return (x0) this.k.getValue((Fragment) this, i[0]);
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBound(View view) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewBound(view);
+        g().h.setOnClickListener(new a(0, this));
+        g().f176c.setOnClickListener(new a(1, this));
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        Observable<k.c> r = ((k) this.l.getValue()).observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), b.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/c/a/a/c/c.java b/app/src/main/java/c/a/a/c/c.java
index cfc34f38dd..74a416ba15 100644
--- a/app/src/main/java/c/a/a/c/c.java
+++ b/app/src/main/java/c/a/a/c/c.java
@@ -1,21 +1,144 @@
 package c.a.a.c;
 
-import com.discord.api.channel.Channel;
-import com.discord.models.member.GuildMember;
-import j0.k.b;
-import java.util.Map;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class c<T, R> implements b<Map<Long, ? extends GuildMember>, GuildMember> {
-    public final /* synthetic */ d i;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import c.a.i.v0;
+import com.airbnb.lottie.LottieAnimationView;
+import com.discord.app.AppDialog;
+import com.discord.utilities.animations.LottieAnimationUtilsKt;
+import com.discord.utilities.resources.StringResourceUtilsKt;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.google.android.material.button.MaterialButton;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.ranges.IntRange;
+import kotlin.reflect.KProperty;
+/* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
+public final class c extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(c.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildSubscriptionActivatedDialogBinding;", 0)};
+    public static final IntRange j = new IntRange(540, 825);
+    public static final a k = new a(null);
+    public final FragmentViewBindingDelegate l = FragmentViewBindingDelegateKt.viewBinding$default(this, b.i, null, 2, null);
+    public Function0<Unit> m;
 
-    public c(d dVar, Channel channel) {
-        this.i = dVar;
+    /* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
+    public static final class a {
+        public a(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+
+        public final void a(FragmentManager fragmentManager, Context context, String str, int i, boolean z2, Function0<Unit> function0) {
+            m.checkNotNullParameter(fragmentManager, "fragmentManager");
+            m.checkNotNullParameter(context, "context");
+            m.checkNotNullParameter(function0, "dismissListener");
+            CharSequence g = z2 ? c.a.l.b.g(context, 2131889977, new Object[0], null, 4) : c.a.l.b.g(context, 2131889960, new Object[0], null, 4);
+            CharSequence g2 = str == null ? c.a.l.b.g(context, 2131889962, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755178, i, Integer.valueOf(i))}, null, 4) : z2 ? c.a.l.b.g(context, 2131889978, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755179, i, Integer.valueOf(i))}, null, 4) : c.a.l.b.g(context, 2131889961, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755176, i, Integer.valueOf(i))}, null, 4);
+            c cVar = new c();
+            cVar.m = function0;
+            Bundle bundle = new Bundle();
+            bundle.putCharSequence("extra_body1_text", g);
+            bundle.putCharSequence("extra_body2_text", g2);
+            cVar.setArguments(bundle);
+            cVar.show(fragmentManager, c.class.getName());
+        }
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // j0.k.b
-    public GuildMember call(Map<Long, ? extends GuildMember> map) {
-        return (GuildMember) map.get(Long.valueOf(this.i.j));
+    /* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
+    public static final /* synthetic */ class b extends k implements Function1<View, v0> {
+        public static final b i = new b();
+
+        public b() {
+            super(1, v0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildSubscriptionActivatedDialogBinding;", 0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public v0 invoke(View view) {
+            View view2 = view;
+            m.checkNotNullParameter(view2, "p1");
+            int i2 = 2131364297;
+            TextView textView = (TextView) view2.findViewById(2131364297);
+            if (textView != null) {
+                i2 = 2131364298;
+                TextView textView2 = (TextView) view2.findViewById(2131364298);
+                if (textView2 != null) {
+                    i2 = 2131364299;
+                    LottieAnimationView lottieAnimationView = (LottieAnimationView) view2.findViewById(2131364299);
+                    if (lottieAnimationView != null) {
+                        i2 = 2131364300;
+                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364300);
+                        if (materialButton != null) {
+                            return new v0((LinearLayout) view2, textView, textView2, lottieAnimationView, materialButton);
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
+        }
+    }
+
+    /* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
+    /* renamed from: c.a.a.c.c$c  reason: collision with other inner class name */
+    public static final class View$OnClickListenerC0007c implements View.OnClickListener {
+        public final /* synthetic */ c i;
+
+        public View$OnClickListenerC0007c(c cVar) {
+            this.i = cVar;
+        }
+
+        @Override // android.view.View.OnClickListener
+        public final void onClick(View view) {
+            this.i.dismiss();
+        }
+    }
+
+    public c() {
+        super(2131558637);
+    }
+
+    public final v0 g() {
+        return (v0) this.l.getValue((Fragment) this, i[0]);
+    }
+
+    @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnDismissListener
+    public void onDismiss(DialogInterface dialogInterface) {
+        m.checkNotNullParameter(dialogInterface, "dialog");
+        Function0<Unit> function0 = this.m;
+        if (function0 != null) {
+            function0.mo1invoke();
+        }
+        super.onDismiss(dialogInterface);
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        TextView textView = g().b;
+        m.checkNotNullExpressionValue(textView, "binding.premiumGuildSubscriptionActivatedBody1");
+        Bundle arguments = getArguments();
+        CharSequence charSequence = null;
+        textView.setText(arguments != null ? arguments.getCharSequence("extra_body1_text") : null);
+        TextView textView2 = g().f165c;
+        m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionActivatedBody2");
+        Bundle arguments2 = getArguments();
+        if (arguments2 != null) {
+            charSequence = arguments2.getCharSequence("extra_body2_text");
+        }
+        textView2.setText(charSequence);
+        g().e.setOnClickListener(new View$OnClickListenerC0007c(this));
+        LottieAnimationView lottieAnimationView = g().d;
+        m.checkNotNullExpressionValue(lottieAnimationView, "binding.premiumGuildSubscriptionActivatedLottie");
+        LottieAnimationUtilsKt.loopFrom(lottieAnimationView, 180, j);
     }
 }
diff --git a/app/src/main/java/c/a/a/c/d.java b/app/src/main/java/c/a/a/c/d.java
index 44a05f2583..d978c3ca64 100644
--- a/app/src/main/java/c/a/a/c/d.java
+++ b/app/src/main/java/c/a/a/c/d.java
@@ -1,27 +1,60 @@
 package c.a.a.c;
 
-import com.discord.api.channel.Channel;
-import com.discord.models.member.GuildMember;
-import com.discord.stores.StoreGuilds;
-import d0.t.m0;
-import j0.k.b;
-import j0.l.e.j;
-import rx.Observable;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class d<T, R> implements b<Channel, Observable<? extends GuildMember>> {
-    public final /* synthetic */ StoreGuilds i;
-    public final /* synthetic */ long j;
+import c.a.a.c.f;
+import com.discord.models.domain.ModelPremiumGuildSubscription;
+import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
+import com.discord.models.domain.ModelSubscription;
+import com.discord.stores.StorePremiumGuildSubscription;
+import com.discord.stores.StoreSubscriptions;
+import d0.t.u;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.List;
+import java.util.Objects;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+public final class d extends o implements Function1<f.b, Unit> {
+    public final /* synthetic */ f this$0;
 
-    public d(StoreGuilds storeGuilds, long j) {
-        this.i = storeGuilds;
-        this.j = j;
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public d(f fVar) {
+        super(1);
+        this.this$0 = fVar;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // j0.k.b
-    public Observable<? extends GuildMember> call(Channel channel) {
-        Channel channel2 = channel;
-        return channel2 != null ? this.i.observeComputed(channel2.e(), m0.setOf(Long.valueOf(this.j))).G(new c(this, channel2)) : new j(null);
+    @Override // kotlin.jvm.functions.Function1
+    public Unit invoke(f.b bVar) {
+        Object obj;
+        ModelPremiumGuildSubscription premiumGuildSubscription;
+        f.b bVar2 = bVar;
+        m.checkNotNullParameter(bVar2, "storeState");
+        f fVar = this.this$0;
+        Objects.requireNonNull(fVar);
+        StorePremiumGuildSubscription.State state = bVar2.a;
+        StoreSubscriptions.SubscriptionsState subscriptionsState = bVar2.b;
+        if (!(fVar.getViewState() instanceof f.c.b) && !(fVar.getViewState() instanceof f.c.C0008c)) {
+            if ((state instanceof StorePremiumGuildSubscription.State.Loading) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading)) {
+                obj = f.c.C0009f.f;
+            } else if ((state instanceof StorePremiumGuildSubscription.State.Failure) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure)) {
+                obj = new f.c.C0008c(2131892147);
+            } else if (!(state instanceof StorePremiumGuildSubscription.State.Loaded) || !(subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded)) {
+                obj = new f.c.C0008c(2131892147);
+            } else {
+                ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions());
+                if (modelSubscription == null) {
+                    obj = new f.c.C0008c(2131892147);
+                } else if (fVar.getViewState() instanceof f.c.b) {
+                    obj = new f.c.b(modelSubscription);
+                } else {
+                    ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot = ((StorePremiumGuildSubscription.State.Loaded) state).getPremiumGuildSubscriptionSlotMap().get(Long.valueOf(fVar.j));
+                    obj = new f.c.e(modelSubscription, ((modelPremiumGuildSubscriptionSlot == null || (premiumGuildSubscription = modelPremiumGuildSubscriptionSlot.getPremiumGuildSubscription()) == null) ? null : Long.valueOf(premiumGuildSubscription.getGuildId())) != null);
+                }
+            }
+            fVar.updateViewState(obj);
+        }
+        return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a/c/e.java b/app/src/main/java/c/a/a/c/e.java
index 521575c5df..e75b612559 100644
--- a/app/src/main/java/c/a/a/c/e.java
+++ b/app/src/main/java/c/a/a/c/e.java
@@ -1,17 +1,27 @@
 package c.a.a.c;
 
 import c.a.a.c.f;
-import com.discord.models.member.GuildMember;
-import com.discord.models.user.User;
-import rx.functions.Func3;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class e<T1, T2, T3, R> implements Func3<User, Integer, GuildMember, f.c> {
-    public static final e a = new e();
+import com.discord.stores.StorePremiumGuildSubscription;
+import com.discord.stores.StoreSubscriptions;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function2;
+/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+public final /* synthetic */ class e extends k implements Function2<StorePremiumGuildSubscription.State, StoreSubscriptions.SubscriptionsState, f.b> {
+    public static final e i = new e();
+
+    public e() {
+        super(2, f.b.class, "<init>", "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V", 0);
+    }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
-    @Override // rx.functions.Func3
-    public f.c call(User user, Integer num, GuildMember guildMember) {
-        return new f.c(user, num, guildMember);
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function2
+    public f.b invoke(StorePremiumGuildSubscription.State state, StoreSubscriptions.SubscriptionsState subscriptionsState) {
+        StorePremiumGuildSubscription.State state2 = state;
+        StoreSubscriptions.SubscriptionsState subscriptionsState2 = subscriptionsState;
+        m.checkNotNullParameter(state2, "p1");
+        m.checkNotNullParameter(subscriptionsState2, "p2");
+        return new f.b(state2, subscriptionsState2);
     }
 }
diff --git a/app/src/main/java/c/a/a/c/f.java b/app/src/main/java/c/a/a/c/f.java
index bf3fd65cbf..351bc0c60d 100644
--- a/app/src/main/java/c/a/a/c/f.java
+++ b/app/src/main/java/c/a/a/c/f.java
@@ -3,283 +3,318 @@ package c.a.a.c;
 import android.content.Context;
 import androidx.annotation.StringRes;
 import com.discord.app.AppViewModel;
-import com.discord.models.member.GuildMember;
-import com.discord.models.user.User;
-import com.discord.stores.StoreChannels;
-import com.discord.stores.StoreGuilds;
+import com.discord.models.domain.ModelSubscription;
+import com.discord.stores.StorePremiumGuildSubscription;
 import com.discord.stores.StoreStream;
-import com.discord.stores.StoreUser;
-import com.discord.stores.StoreUserRelationships;
-import com.discord.utilities.error.Error;
+import com.discord.stores.StoreSubscriptions;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import rx.Observable;
-import rx.subjects.PublishSubject;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class f extends AppViewModel<d> {
+import rx.functions.Func2;
+/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+public final class f extends AppViewModel<c> {
     public static final a i = new a(null);
-    public final PublishSubject<b> j;
-    public final long k;
-    public final RestAPI l;
+    public final long j;
+    public final StorePremiumGuildSubscription k;
+    public final StoreSubscriptions l;
+    public final RestAPI m;
 
-    /* compiled from: UserActionsDialogViewModel.kt */
+    /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
     public static final class a {
         public a(DefaultConstructorMarker defaultConstructorMarker) {
         }
     }
 
-    /* compiled from: UserActionsDialogViewModel.kt */
-    public static abstract class b {
+    /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+    public static final class b {
+        public final StorePremiumGuildSubscription.State a;
+        public final StoreSubscriptions.SubscriptionsState b;
 
-        /* compiled from: UserActionsDialogViewModel.kt */
-        public static final class a extends b {
-            public final int a;
+        public b(StorePremiumGuildSubscription.State state, StoreSubscriptions.SubscriptionsState subscriptionsState) {
+            m.checkNotNullParameter(state, "premiumGuildSubscriptionState");
+            m.checkNotNullParameter(subscriptionsState, "subscriptionState");
+            this.a = state;
+            this.b = subscriptionsState;
+        }
 
-            public a(int i) {
-                super(null);
-                this.a = i;
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof a) && this.a == ((a) obj).a;
-                }
+        public boolean equals(Object obj) {
+            if (this == obj) {
                 return true;
             }
-
-            public int hashCode() {
-                return this.a;
-            }
-
-            public String toString() {
-                return c.d.b.a.a.z(c.d.b.a.a.L("Failure(failureMessageStringRes="), this.a, ")");
+            if (!(obj instanceof b)) {
+                return false;
             }
+            b bVar = (b) obj;
+            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b);
         }
 
-        /* compiled from: UserActionsDialogViewModel.kt */
-        /* renamed from: c.a.a.c.f$b$b  reason: collision with other inner class name */
-        public static final class C0007b extends b {
-            public final int a;
-
-            public C0007b(int i) {
-                super(null);
-                this.a = i;
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof C0007b) && this.a == ((C0007b) obj).a;
-                }
-                return true;
-            }
-
-            public int hashCode() {
-                return this.a;
-            }
-
-            public String toString() {
-                return c.d.b.a.a.z(c.d.b.a.a.L("Success(successMessageStringRes="), this.a, ")");
+        public int hashCode() {
+            StorePremiumGuildSubscription.State state = this.a;
+            int i = 0;
+            int hashCode = (state != null ? state.hashCode() : 0) * 31;
+            StoreSubscriptions.SubscriptionsState subscriptionsState = this.b;
+            if (subscriptionsState != null) {
+                i = subscriptionsState.hashCode();
             }
+            return hashCode + i;
         }
 
-        public b() {
-        }
-
-        public b(DefaultConstructorMarker defaultConstructorMarker) {
+        public String toString() {
+            StringBuilder L = c.d.b.a.a.L("StoreState(premiumGuildSubscriptionState=");
+            L.append(this.a);
+            L.append(", subscriptionState=");
+            L.append(this.b);
+            L.append(")");
+            return L.toString();
         }
     }
 
-    /* compiled from: UserActionsDialogViewModel.kt */
-    public static final class c {
-        public final User a;
-        public final Integer b;
+    /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+    public static abstract class c {
+        public final boolean a;
+        public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final GuildMember f33c;
+        public final boolean f34c;
+        public final boolean d;
+        public final boolean e;
 
-        public c(User user, Integer num, GuildMember guildMember) {
-            this.a = user;
-            this.b = num;
-            this.f33c = guildMember;
-        }
-    }
-
-    /* compiled from: UserActionsDialogViewModel.kt */
-    public static abstract class d {
-
-        /* compiled from: UserActionsDialogViewModel.kt */
-        public static final class a extends d {
-            public final User a;
-            public final String b;
-
-            /* renamed from: c  reason: collision with root package name */
-            public final boolean f34c;
-            public final boolean d;
-            public final boolean e;
+        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+        public static final class a extends c {
+            public final ModelSubscription f;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public a(User user, String str, boolean z2, boolean z3, boolean z4) {
-                super(null);
-                m.checkNotNullParameter(user, "user");
-                this.a = user;
-                this.b = str;
-                this.f34c = z2;
-                this.d = z3;
-                this.e = z4;
+            public a(ModelSubscription modelSubscription) {
+                super(false, true, false, true, false, null);
+                m.checkNotNullParameter(modelSubscription, "subscription");
+                this.f = modelSubscription;
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof a) && m.areEqual(this.f, ((a) obj).f);
+                }
+                return true;
+            }
+
+            public int hashCode() {
+                ModelSubscription modelSubscription = this.f;
+                if (modelSubscription != null) {
+                    return modelSubscription.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder L = c.d.b.a.a.L("CancelInProgress(subscription=");
+                L.append(this.f);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
+        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+        public static final class b extends c {
+            public final ModelSubscription f;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public b(ModelSubscription modelSubscription) {
+                super(false, false, false, false, true, null);
+                m.checkNotNullParameter(modelSubscription, "subscription");
+                this.f = modelSubscription;
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof b) && m.areEqual(this.f, ((b) obj).f);
+                }
+                return true;
+            }
+
+            public int hashCode() {
+                ModelSubscription modelSubscription = this.f;
+                if (modelSubscription != null) {
+                    return modelSubscription.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder L = c.d.b.a.a.L("Cancelled(subscription=");
+                L.append(this.f);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
+        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+        /* renamed from: c.a.a.c.f$c$c  reason: collision with other inner class name */
+        public static final class C0008c extends c {
+            public final Integer f;
+
+            public C0008c() {
+                this(null, 1);
+            }
+
+            public C0008c(@StringRes Integer num) {
+                super(false, false, false, false, true, null);
+                this.f = num;
+            }
+
+            /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+            public /* synthetic */ C0008c(Integer num, int i) {
+                this(null);
+                int i2 = i & 1;
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof C0008c) && m.areEqual(this.f, ((C0008c) obj).f);
+                }
+                return true;
+            }
+
+            public int hashCode() {
+                Integer num = this.f;
+                if (num != null) {
+                    return num.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                return c.d.b.a.a.B(c.d.b.a.a.L("Dismiss(dismissStringId="), this.f, ")");
+            }
+        }
+
+        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+        public static final class d extends c {
+            public final ModelSubscription f;
+
+            public d(ModelSubscription modelSubscription) {
+                super(true, true, true, false, true, null);
+                this.f = modelSubscription;
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof d) && m.areEqual(this.f, ((d) obj).f);
+                }
+                return true;
+            }
+
+            public int hashCode() {
+                ModelSubscription modelSubscription = this.f;
+                if (modelSubscription != null) {
+                    return modelSubscription.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder L = c.d.b.a.a.L("FailureCancelling(subscription=");
+                L.append(this.f);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
+        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+        public static final class e extends c {
+            public final ModelSubscription f;
+            public final boolean g;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public e(ModelSubscription modelSubscription, boolean z2) {
+                super(false, true, true, false, true, null);
+                m.checkNotNullParameter(modelSubscription, "subscription");
+                this.f = modelSubscription;
+                this.g = z2;
             }
 
             public boolean equals(Object obj) {
                 if (this == obj) {
                     return true;
                 }
-                if (!(obj instanceof a)) {
+                if (!(obj instanceof e)) {
                     return false;
                 }
-                a aVar = (a) obj;
-                return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && this.f34c == aVar.f34c && this.d == aVar.d && this.e == aVar.e;
+                e eVar = (e) obj;
+                return m.areEqual(this.f, eVar.f) && this.g == eVar.g;
             }
 
             public int hashCode() {
-                User user = this.a;
-                int i = 0;
-                int hashCode = (user != null ? user.hashCode() : 0) * 31;
-                String str = this.b;
-                if (str != null) {
-                    i = str.hashCode();
-                }
-                int i2 = (hashCode + i) * 31;
-                boolean z2 = this.f34c;
-                int i3 = 1;
+                ModelSubscription modelSubscription = this.f;
+                int hashCode = (modelSubscription != null ? modelSubscription.hashCode() : 0) * 31;
+                boolean z2 = this.g;
                 if (z2) {
                     z2 = true;
                 }
-                int i4 = z2 ? 1 : 0;
-                int i5 = z2 ? 1 : 0;
-                int i6 = z2 ? 1 : 0;
-                int i7 = (i2 + i4) * 31;
-                boolean z3 = this.d;
-                if (z3) {
-                    z3 = true;
-                }
-                int i8 = z3 ? 1 : 0;
-                int i9 = z3 ? 1 : 0;
-                int i10 = z3 ? 1 : 0;
-                int i11 = (i7 + i8) * 31;
-                boolean z4 = this.e;
-                if (!z4) {
-                    i3 = z4 ? 1 : 0;
-                }
-                return i11 + i3;
+                int i = z2 ? 1 : 0;
+                int i2 = z2 ? 1 : 0;
+                int i3 = z2 ? 1 : 0;
+                return hashCode + i;
             }
 
             public String toString() {
-                StringBuilder L = c.d.b.a.a.L("Loaded(user=");
-                L.append(this.a);
-                L.append(", userNickname=");
-                L.append(this.b);
-                L.append(", showBlockItem=");
-                L.append(this.f34c);
-                L.append(", showUnblockItem=");
-                L.append(this.d);
-                L.append(", showRemoveFriendItem=");
-                return c.d.b.a.a.G(L, this.e, ")");
+                StringBuilder L = c.d.b.a.a.L("Loaded(subscription=");
+                L.append(this.f);
+                L.append(", isFromInventory=");
+                return c.d.b.a.a.G(L, this.g, ")");
             }
         }
 
-        /* compiled from: UserActionsDialogViewModel.kt */
-        public static final class b extends d {
-            public static final b a = new b();
+        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+        /* renamed from: c.a.a.c.f$c$f  reason: collision with other inner class name */
+        public static final class C0009f extends c {
+            public static final C0009f f = new C0009f();
 
-            public b() {
-                super(null);
+            public C0009f() {
+                super(false, true, false, false, true, null);
             }
         }
 
-        public d(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    /* compiled from: UserActionsDialogViewModel.kt */
-    public static final class e extends o implements Function1<Void, Unit> {
-        public final /* synthetic */ int $successMessageStringRes;
-        public final /* synthetic */ f this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public e(f fVar, int i) {
-            super(1);
-            this.this$0 = fVar;
-            this.$successMessageStringRes = i;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(Void r3) {
-            f fVar = this.this$0;
-            int i = this.$successMessageStringRes;
-            PublishSubject<b> publishSubject = fVar.j;
-            publishSubject.j.onNext(new b.C0007b(i));
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: UserActionsDialogViewModel.kt */
-    /* renamed from: c.a.a.c.f$f  reason: collision with other inner class name */
-    public static final class C0008f extends o implements Function1<Error, Unit> {
-        public final /* synthetic */ f this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public C0008f(f fVar) {
-            super(1);
-            this.this$0 = fVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(Error error) {
-            m.checkNotNullParameter(error, "it");
-            PublishSubject<b> publishSubject = this.this$0.j;
-            publishSubject.j.onNext(new b.a(2131888049));
-            return Unit.a;
+        public c(boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, DefaultConstructorMarker defaultConstructorMarker) {
+            this.a = z2;
+            this.b = z3;
+            this.f34c = z4;
+            this.d = z5;
+            this.e = z6;
         }
     }
 
+    /* JADX WARN: Multi-variable type inference failed */
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public f(long j, long j2, RestAPI restAPI, Observable observable, int i2) {
-        super(d.b.a);
+    /* JADX WARNING: Unknown variable types count: 1 */
+    public f(long j, StorePremiumGuildSubscription storePremiumGuildSubscription, StoreSubscriptions storeSubscriptions, RestAPI restAPI, Observable observable, int i2) {
+        super(c.C0009f.f);
         Observable observable2;
-        RestAPI api = (i2 & 4) != 0 ? RestAPI.Companion.getApi() : null;
-        if ((i2 & 8) != 0) {
-            StoreStream.Companion companion = StoreStream.Companion;
-            StoreUser users = companion.getUsers();
-            StoreUserRelationships userRelationships = companion.getUserRelationships();
-            StoreGuilds guilds = companion.getGuilds();
-            StoreChannels channels = companion.getChannels();
-            Observable<User> observeUser = users.observeUser(j);
-            Observable<Integer> observe = userRelationships.observe(j);
-            Observable s2 = channels.observeChannel(j2).Z(new d(guilds, j)).s();
-            m.checkNotNullExpressionValue(s2, "storeChannels\n          …  .distinctUntilChanged()");
-            observable2 = Observable.i(observeUser, observe, s2, e.a).s();
-            m.checkNotNullExpressionValue(observable2, "Observable.combineLatest…  .distinctUntilChanged()");
+        StorePremiumGuildSubscription premiumGuildSubscriptions = (i2 & 2) != 0 ? StoreStream.Companion.getPremiumGuildSubscriptions() : null;
+        StoreSubscriptions subscriptions = (i2 & 4) != 0 ? StoreStream.Companion.getSubscriptions() : null;
+        RestAPI api = (i2 & 8) != 0 ? RestAPI.Companion.getApi() : null;
+        if ((i2 & 16) != 0) {
+            Observable observePremiumGuildSubscriptionsState$default = StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(premiumGuildSubscriptions, null, 1, null);
+            Observable<StoreSubscriptions.SubscriptionsState> observeSubscriptions = subscriptions.observeSubscriptions();
+            e eVar = e.i;
+            observable2 = Observable.j(observePremiumGuildSubscriptionsState$default, observeSubscriptions, (Func2) (eVar != null ? new h(eVar) : eVar));
+            m.checkNotNullExpressionValue(observable2, "Observable.combineLatest…   ::StoreState\n        )");
         } else {
             observable2 = null;
         }
-        m.checkNotNullParameter(api, "restAPI");
+        m.checkNotNullParameter(premiumGuildSubscriptions, "storePremiumGuildSubscription");
+        m.checkNotNullParameter(subscriptions, "storeSubscriptions");
+        m.checkNotNullParameter(api, "api");
         m.checkNotNullParameter(observable2, "storeObservable");
-        this.k = j;
-        this.l = api;
-        this.j = PublishSubject.l0();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 62, (Object) null);
-    }
-
-    public final void removeRelationship(@StringRes int i2) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.l.removeRelationship("User Profile", this.k), false, 1, null), this, null, 2, null), f.class, (Context) null, (Function1) null, new C0008f(this), (Function0) null, (Function0) null, new e(this, i2), 54, (Object) null);
+        this.j = j;
+        this.k = premiumGuildSubscriptions;
+        this.l = subscriptions;
+        this.m = api;
+        premiumGuildSubscriptions.fetchUserGuildPremiumState();
+        subscriptions.fetchSubscriptions();
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/c/a/a/c/g.java b/app/src/main/java/c/a/a/c/g.java
index c0db5a0817..e25d1959b0 100644
--- a/app/src/main/java/c/a/a/c/g.java
+++ b/app/src/main/java/c/a/a/c/g.java
@@ -1,26 +1,41 @@
 package c.a.a.c;
 
 import c.a.a.c.f;
+import com.discord.models.domain.ModelSubscription;
+import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
+import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
-import rx.subjects.PublishSubject;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class g extends o implements Function1<Void, Unit> {
+/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+public final class g extends o implements Function1<PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult, Unit> {
+    public final /* synthetic */ ModelSubscription $subscription;
     public final /* synthetic */ f this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public g(f fVar) {
+    public g(f fVar, ModelSubscription modelSubscription) {
         super(1);
         this.this$0 = fVar;
+        this.$subscription = modelSubscription;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    /* JADX WARNING: Code restructure failed: missing block: B:5:0x0012, code lost:
+        if (r3 != 2) goto L_0x002e;
+     */
     @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(Void r3) {
-        PublishSubject<f.b> publishSubject = this.this$0.j;
-        publishSubject.j.onNext(new f.b.C0007b(2131894228));
+    public Unit invoke(PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult modifySubscriptionSlotResult) {
+        PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult modifySubscriptionSlotResult2 = modifySubscriptionSlotResult;
+        m.checkNotNullParameter(modifySubscriptionSlotResult2, "result");
+        int ordinal = modifySubscriptionSlotResult2.ordinal();
+        if (ordinal != 0) {
+            if (ordinal == 1) {
+                this.this$0.updateViewState(new f.c.d(this.$subscription));
+            }
+            return Unit.a;
+        }
+        this.this$0.updateViewState(new f.c.b(this.$subscription));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a/c/h.java b/app/src/main/java/c/a/a/c/h.java
index 5ea1e592cd..0354f82549 100644
--- a/app/src/main/java/c/a/a/c/h.java
+++ b/app/src/main/java/c/a/a/c/h.java
@@ -1,29 +1,17 @@
 package c.a.a.c;
 
-import c.a.a.c.f;
-import com.discord.utilities.error.Error;
-import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import rx.subjects.PublishSubject;
-/* compiled from: UserActionsDialogViewModel.kt */
-public final class h extends o implements Function1<Error, Unit> {
-    public final /* synthetic */ f this$0;
+import kotlin.jvm.functions.Function2;
+import rx.functions.Func2;
+/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
+public final class h implements Func2 {
+    public final /* synthetic */ Function2 i;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public h(f fVar) {
-        super(1);
-        this.this$0 = fVar;
+    public h(Function2 function2) {
+        this.i = function2;
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
-        PublishSubject<f.b> publishSubject = this.this$0.j;
-        publishSubject.j.onNext(new f.b.a(2131888049));
-        return Unit.a;
+    @Override // rx.functions.Func2
+    public final /* synthetic */ Object call(Object obj, Object obj2) {
+        return this.i.invoke(obj, obj2);
     }
 }
diff --git a/app/src/main/java/c/a/a/d/i.java b/app/src/main/java/c/a/a/c/i.java
similarity index 91%
rename from app/src/main/java/c/a/a/d/i.java
rename to app/src/main/java/c/a/a/c/i.java
index bc5184c643..3f759a56ce 100644
--- a/app/src/main/java/c/a/a/d/i.java
+++ b/app/src/main/java/c/a/a/c/i.java
@@ -1,6 +1,6 @@
-package c.a.a.d;
+package c.a.a.c;
 
-import c.a.a.d.k;
+import c.a.a.c.k;
 import com.discord.models.domain.ModelSubscription;
 import com.discord.stores.StoreSubscriptions;
 import d0.t.u;
@@ -30,12 +30,12 @@ public final class i extends o implements Function1<k.b, Unit> {
         if (!(kVar.getViewState() instanceof k.c.d) && !(kVar.getViewState() instanceof k.c.a)) {
             StoreSubscriptions.SubscriptionsState subscriptionsState = bVar2.a;
             if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading) {
-                obj = k.c.C0014c.a;
+                obj = k.c.C0010c.a;
             } else if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure) {
-                obj = new k.c.a(2131892076);
+                obj = new k.c.a(2131892147);
             } else if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded) {
                 ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions());
-                obj = modelSubscription == null ? new k.c.a(2131892076) : new k.c.b(modelSubscription, false, false);
+                obj = modelSubscription == null ? new k.c.a(2131892147) : new k.c.b(modelSubscription, false, false);
             } else {
                 obj = new k.c.a(null, 1);
             }
diff --git a/app/src/main/java/c/a/a/d/j.java b/app/src/main/java/c/a/a/c/j.java
similarity index 95%
rename from app/src/main/java/c/a/a/d/j.java
rename to app/src/main/java/c/a/a/c/j.java
index 8dea9307a1..bd16283d4c 100644
--- a/app/src/main/java/c/a/a/d/j.java
+++ b/app/src/main/java/c/a/a/c/j.java
@@ -1,6 +1,6 @@
-package c.a.a.d;
+package c.a.a.c;
 
-import c.a.a.d.k;
+import c.a.a.c.k;
 import com.discord.stores.StoreSubscriptions;
 import d0.z.d.m;
 import j0.k.b;
diff --git a/app/src/main/java/c/a/a/d/k.java b/app/src/main/java/c/a/a/c/k.java
similarity index 93%
rename from app/src/main/java/c/a/a/d/k.java
rename to app/src/main/java/c/a/a/c/k.java
index 69ad872261..98f4046d93 100644
--- a/app/src/main/java/c/a/a/d/k.java
+++ b/app/src/main/java/c/a/a/c/k.java
@@ -1,4 +1,4 @@
-package c.a.a.d;
+package c.a.a.c;
 
 import android.content.Context;
 import com.discord.app.AppViewModel;
@@ -108,7 +108,7 @@ public final class k extends AppViewModel<c> {
             public final boolean b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final boolean f36c;
+            public final boolean f35c;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public b(ModelSubscription modelSubscription, boolean z2, boolean z3) {
@@ -116,7 +116,7 @@ public final class k extends AppViewModel<c> {
                 m.checkNotNullParameter(modelSubscription, "subscription");
                 this.a = modelSubscription;
                 this.b = z2;
-                this.f36c = z3;
+                this.f35c = z3;
             }
 
             public static b a(b bVar, ModelSubscription modelSubscription, boolean z2, boolean z3, int i) {
@@ -125,7 +125,7 @@ public final class k extends AppViewModel<c> {
                     z2 = bVar.b;
                 }
                 if ((i & 4) != 0) {
-                    z3 = bVar.f36c;
+                    z3 = bVar.f35c;
                 }
                 Objects.requireNonNull(bVar);
                 m.checkNotNullParameter(modelSubscription2, "subscription");
@@ -140,7 +140,7 @@ public final class k extends AppViewModel<c> {
                     return false;
                 }
                 b bVar = (b) obj;
-                return m.areEqual(this.a, bVar.a) && this.b == bVar.b && this.f36c == bVar.f36c;
+                return m.areEqual(this.a, bVar.a) && this.b == bVar.b && this.f35c == bVar.f35c;
             }
 
             public int hashCode() {
@@ -155,7 +155,7 @@ public final class k extends AppViewModel<c> {
                 int i3 = z2 ? 1 : 0;
                 int i4 = z2 ? 1 : 0;
                 int i5 = (hashCode + i2) * 31;
-                boolean z3 = this.f36c;
+                boolean z3 = this.f35c;
                 if (!z3) {
                     i = z3 ? 1 : 0;
                 }
@@ -168,16 +168,16 @@ public final class k extends AppViewModel<c> {
                 L.append(", uncancelInProgress=");
                 L.append(this.b);
                 L.append(", error=");
-                return c.d.b.a.a.G(L, this.f36c, ")");
+                return c.d.b.a.a.G(L, this.f35c, ")");
             }
         }
 
         /* compiled from: PremiumGuildSubscriptionUncancelViewModel.kt */
-        /* renamed from: c.a.a.d.k$c$c  reason: collision with other inner class name */
-        public static final class C0014c extends c {
-            public static final C0014c a = new C0014c();
+        /* renamed from: c.a.a.c.k$c$c  reason: collision with other inner class name */
+        public static final class C0010c extends c {
+            public static final C0010c a = new C0010c();
 
-            public C0014c() {
+            public C0010c() {
                 super(null);
             }
         }
@@ -200,13 +200,13 @@ public final class k extends AppViewModel<c> {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public k(long j, StoreSubscriptions storeSubscriptions, StorePremiumGuildSubscription storePremiumGuildSubscription, RestAPI restAPI, Observable observable, int i2) {
-        super(c.C0014c.a);
+        super(c.C0010c.a);
         Observable observable2;
         StoreSubscriptions subscriptions = (i2 & 2) != 0 ? StoreStream.Companion.getSubscriptions() : null;
         StorePremiumGuildSubscription premiumGuildSubscriptions = (i2 & 4) != 0 ? StoreStream.Companion.getPremiumGuildSubscriptions() : null;
         RestAPI api = (i2 & 8) != 0 ? RestAPI.Companion.getApi() : null;
         if ((i2 & 16) != 0) {
-            observable2 = subscriptions.observeSubscriptions().G(j.i);
+            observable2 = subscriptions.observeSubscriptions().F(j.i);
             m.checkNotNullExpressionValue(observable2, "storeSubscriptions\n     …toreState(it)\n          }");
         } else {
             observable2 = null;
diff --git a/app/src/main/java/c/a/a/d/l.java b/app/src/main/java/c/a/a/c/l.java
similarity index 97%
rename from app/src/main/java/c/a/a/d/l.java
rename to app/src/main/java/c/a/a/c/l.java
index f798b2d16e..58e9cd5651 100644
--- a/app/src/main/java/c/a/a/d/l.java
+++ b/app/src/main/java/c/a/a/c/l.java
@@ -1,6 +1,6 @@
-package c.a.a.d;
+package c.a.a.c;
 
-import c.a.a.d.k;
+import c.a.a.c.k;
 import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/c/a/a/d/a.java b/app/src/main/java/c/a/a/d/a.java
deleted file mode 100644
index afcd52ca42..0000000000
--- a/app/src/main/java/c/a/a/d/a.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package c.a.a.d;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentViewModelLazyKt;
-import c.a.a.d.f;
-import c.a.d.h0;
-import c.a.d.j0;
-import c.a.i.v0;
-import com.discord.app.AppDialog;
-import com.discord.app.AppViewFlipper;
-import com.discord.app.AppViewModel;
-import com.discord.models.domain.ModelSubscription;
-import com.discord.utilities.color.ColorCompat;
-import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
-import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.time.TimeUtils;
-import com.discord.utilities.view.extensions.ViewExtensions;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.discord.views.LoadingButton;
-import com.google.android.material.button.MaterialButton;
-import d0.g;
-import d0.z.d.a0;
-import d0.z.d.k;
-import d0.z.d.m;
-import d0.z.d.o;
-import java.text.DateFormat;
-import java.util.Objects;
-import kotlin.Lazy;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.reflect.KProperty;
-import rx.Observable;
-/* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
-public final class a extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildSubscriptionCancelDialogBinding;", 0)};
-    public static final b j = new b(null);
-    public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
-    public final Lazy l;
-    public final Lazy m;
-
-    /* compiled from: java-style lambda group */
-    /* renamed from: c.a.a.d.a$a  reason: collision with other inner class name */
-    public static final class View$OnClickListenerC0009a implements View.OnClickListener {
-        public final /* synthetic */ int i;
-        public final /* synthetic */ Object j;
-
-        public View$OnClickListenerC0009a(int i, Object obj) {
-            this.i = i;
-            this.j = obj;
-        }
-
-        @Override // android.view.View.OnClickListener
-        public final void onClick(View view) {
-            int i = this.i;
-            if (i == 0) {
-                f fVar = (f) ((a) this.j).l.getValue();
-                f.c viewState = fVar.getViewState();
-                if ((viewState instanceof f.c.C0013f) || (viewState instanceof f.c.a)) {
-                    return;
-                }
-                if ((viewState instanceof f.c.e) || (viewState instanceof f.c.d) || (viewState instanceof f.c.b)) {
-                    fVar.updateViewState(new f.c.C0012c(null, 1));
-                }
-            } else if (i == 1) {
-                f fVar2 = (f) ((a) this.j).l.getValue();
-                f.c viewState2 = fVar2.getViewState();
-                if ((viewState2 instanceof f.c.C0013f) || (viewState2 instanceof f.c.a)) {
-                    return;
-                }
-                if ((viewState2 instanceof f.c.e) || (viewState2 instanceof f.c.d)) {
-                    f.c viewState3 = fVar2.getViewState();
-                    ModelSubscription modelSubscription = viewState3 instanceof f.c.e ? ((f.c.e) viewState3).f : viewState3 instanceof f.c.d ? ((f.c.d) viewState3).f : null;
-                    if (modelSubscription != null) {
-                        fVar2.updateViewState(new f.c.a(modelSubscription));
-                        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(PremiumGuildSubscriptionUtils.INSTANCE.cancelSubscriptionSlot(fVar2.m, fVar2.j, modelSubscription, fVar2.k), fVar2, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new g(fVar2, modelSubscription), 62, (Object) null);
-                    }
-                } else if (viewState2 instanceof f.c.b) {
-                    fVar2.updateViewState(new f.c.C0012c(null, 1));
-                }
-            } else {
-                throw null;
-            }
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
-    public static final class b {
-        public b(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
-    public static final /* synthetic */ class c extends k implements Function1<View, v0> {
-        public static final c i = new c();
-
-        public c() {
-            super(1, v0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildSubscriptionCancelDialogBinding;", 0);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public v0 invoke(View view) {
-            View view2 = view;
-            m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131361894;
-            ProgressBar progressBar = (ProgressBar) view2.findViewById(2131361894);
-            if (progressBar != null) {
-                i2 = 2131364030;
-                LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030);
-                if (linearLayout != null) {
-                    i2 = 2131364257;
-                    TextView textView = (TextView) view2.findViewById(2131364257);
-                    if (textView != null) {
-                        i2 = 2131364258;
-                        LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364258);
-                        if (loadingButton != null) {
-                            i2 = 2131364259;
-                            TextView textView2 = (TextView) view2.findViewById(2131364259);
-                            if (textView2 != null) {
-                                i2 = 2131364260;
-                                AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364260);
-                                if (appViewFlipper != null) {
-                                    i2 = 2131364261;
-                                    TextView textView3 = (TextView) view2.findViewById(2131364261);
-                                    if (textView3 != null) {
-                                        i2 = 2131364262;
-                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364262);
-                                        if (materialButton != null) {
-                                            return new v0((LinearLayout) view2, progressBar, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, materialButton);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
-    public static final class d extends o implements Function1<f.c, Unit> {
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public d(a aVar) {
-            super(1);
-            this.this$0 = aVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(f.c cVar) {
-            f.c cVar2 = cVar;
-            a aVar = this.this$0;
-            m.checkNotNullExpressionValue(cVar2, "it");
-            KProperty[] kPropertyArr = a.i;
-            TextView textView = aVar.g().d;
-            m.checkNotNullExpressionValue(textView, "binding.premiumGuildSubscriptionCancelError");
-            int i = 8;
-            textView.setVisibility(cVar2.a ? 0 : 8);
-            MaterialButton materialButton = aVar.g().g;
-            m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildSubscriptionCancelNevermind");
-            if (cVar2.b) {
-                i = 0;
-            }
-            materialButton.setVisibility(i);
-            MaterialButton materialButton2 = aVar.g().g;
-            m.checkNotNullExpressionValue(materialButton2, "binding.premiumGuildSubscriptionCancelNevermind");
-            ViewExtensions.setEnabledAndAlpha$default(materialButton2, cVar2.f35c, 0.0f, 2, null);
-            aVar.setCancelable(cVar2.e);
-            aVar.g().f165c.setIsLoading(cVar2.d);
-            AppViewFlipper appViewFlipper = aVar.g().e;
-            m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumGuildSubscriptionCancelFlipper");
-            appViewFlipper.setDisplayedChild(!(cVar2 instanceof f.c.C0013f) ? 1 : 0);
-            if (cVar2 instanceof f.c.e) {
-                TimeUtils timeUtils = TimeUtils.INSTANCE;
-                f.c.e eVar = (f.c.e) cVar2;
-                String currentPeriodEnd = eVar.f.getCurrentPeriodEnd();
-                Context requireContext = aVar.requireContext();
-                m.checkNotNullExpressionValue(requireContext, "requireContext()");
-                String renderUtcDate$default = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodEnd, requireContext, (String) null, (DateFormat) null, 0, 28, (Object) null);
-                if (eVar.g) {
-                    TextView textView2 = aVar.g().b;
-                    m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionCancelBody");
-                    c.a.l.b.n(textView2, 2131892071, new Object[]{renderUtcDate$default}, null, 4);
-                } else {
-                    TextView textView3 = aVar.g().b;
-                    m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionCancelBody");
-                    c.a.l.b.n(textView3, 2131892070, new Object[]{renderUtcDate$default}, null, 4);
-                }
-                aVar.g().f165c.setBackgroundColor(ColorCompat.getColor(aVar, 2131100324));
-            } else if (cVar2 instanceof f.c.b) {
-                TextView textView4 = aVar.g().f;
-                m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionCancelHeader");
-                textView4.setText(aVar.getString(2131892082));
-                TextView textView5 = aVar.g().b;
-                m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionCancelBody");
-                TimeUtils timeUtils2 = TimeUtils.INSTANCE;
-                String currentPeriodEnd2 = ((f.c.b) cVar2).f.getCurrentPeriodEnd();
-                Context requireContext2 = aVar.requireContext();
-                m.checkNotNullExpressionValue(requireContext2, "requireContext()");
-                c.a.l.b.n(textView5, 2131892083, new Object[]{TimeUtils.renderUtcDate$default(timeUtils2, currentPeriodEnd2, requireContext2, (String) null, (DateFormat) null, 0, 28, (Object) null)}, null, 4);
-                aVar.g().f165c.setText(aVar.getString(2131891666));
-                aVar.g().f165c.setBackgroundColor(ColorCompat.getThemedColor(aVar, 2130969007));
-            } else if (cVar2 instanceof f.c.C0012c) {
-                Integer num = ((f.c.C0012c) cVar2).f;
-                if (num != null) {
-                    c.a.d.o.g(aVar.requireContext(), num.intValue(), 0, null, 12);
-                }
-                aVar.dismiss();
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
-    public static final class e extends o implements Function0<Long> {
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public e(a aVar) {
-            super(0);
-            this.this$0 = aVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Long mo1invoke() {
-            Bundle arguments = this.this$0.getArguments();
-            Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("extra_slot_id")) : null;
-            Objects.requireNonNull(valueOf, "null cannot be cast to non-null type com.discord.models.domain.PremiumGuildSubscriptionSlotId /* = kotlin.Long */");
-            return Long.valueOf(valueOf.longValue());
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelDialog.kt */
-    public static final class f extends o implements Function0<AppViewModel<f.c>> {
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public f(a aVar) {
-            super(0);
-            this.this$0 = aVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public AppViewModel<f.c> mo1invoke() {
-            return new f(((Number) this.this$0.m.getValue()).longValue(), null, null, null, null, 30);
-        }
-    }
-
-    public a() {
-        super(2131558637);
-        f fVar = new f(this);
-        h0 h0Var = new h0(this);
-        this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(f.class), new m(2, h0Var), new j0(fVar));
-        this.m = g.lazy(new e(this));
-    }
-
-    public final v0 g() {
-        return (v0) this.k.getValue((Fragment) this, i[0]);
-    }
-
-    @Override // com.discord.app.AppDialog
-    public void onViewBound(View view) {
-        m.checkNotNullParameter(view, "view");
-        super.onViewBound(view);
-        g().g.setOnClickListener(new View$OnClickListenerC0009a(0, this));
-        g().f165c.setOnClickListener(new View$OnClickListenerC0009a(1, this));
-    }
-
-    @Override // com.discord.app.AppDialog
-    public void onViewBoundOrOnResume() {
-        super.onViewBoundOrOnResume();
-        Observable<f.c> s2 = ((f) this.l.getValue()).observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
-    }
-}
diff --git a/app/src/main/java/c/a/a/e/a/a.java b/app/src/main/java/c/a/a/d/a/a.java
similarity index 94%
rename from app/src/main/java/c/a/a/e/a/a.java
rename to app/src/main/java/c/a/a/d/a/a.java
index 89a3fbb5b2..f3ea620b0c 100644
--- a/app/src/main/java/c/a/a/e/a/a.java
+++ b/app/src/main/java/c/a/a/d/a/a.java
@@ -1,4 +1,4 @@
-package c.a.a.e.a;
+package c.a.a.d.a;
 
 import android.content.Context;
 import android.view.View;
@@ -7,7 +7,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
-import c.a.a.e.a.f;
+import c.a.a.d.a.f;
 import c.a.d.h0;
 import c.a.d.j0;
 import com.discord.app.AppDialog;
@@ -42,12 +42,12 @@ public final class a extends AppDialog {
     public final Lazy l;
 
     /* compiled from: java-style lambda group */
-    /* renamed from: c.a.a.e.a.a$a  reason: collision with other inner class name */
-    public static final class View$OnClickListenerC0015a implements View.OnClickListener {
+    /* renamed from: c.a.a.d.a.a$a  reason: collision with other inner class name */
+    public static final class View$OnClickListenerC0011a implements View.OnClickListener {
         public final /* synthetic */ int i;
         public final /* synthetic */ Object j;
 
-        public View$OnClickListenerC0015a(int i, Object obj) {
+        public View$OnClickListenerC0011a(int i, Object obj) {
             this.i = i;
             this.j = obj;
         }
@@ -65,7 +65,7 @@ public final class a extends AppDialog {
                         aVar = viewState;
                     }
                     f.c.a aVar2 = aVar;
-                    if (!(aVar2 == null || (bluetoothAudio = aVar2.f37c) == null)) {
+                    if (!(aVar2 == null || (bluetoothAudio = aVar2.f36c) == null)) {
                         h.j.selectAudioOutput(bluetoothAudio);
                     }
                 } else {
@@ -194,14 +194,14 @@ public final class a extends AppDialog {
                 } else {
                     throw new NoWhenBranchMatchedException();
                 }
-                aVar.i().f64c.check(i);
+                aVar.i().f65c.check(i);
                 MaterialRadioButton materialRadioButton5 = aVar.i().b;
                 m.checkNotNullExpressionValue(materialRadioButton5, "binding.audioOutputSelectionBluetoothRadio");
                 int i2 = 0;
                 materialRadioButton5.setVisibility(aVar2.b ? 0 : 8);
                 MaterialRadioButton materialRadioButton6 = aVar.i().b;
                 m.checkNotNullExpressionValue(materialRadioButton6, "binding.audioOutputSelectionBluetoothRadio");
-                StoreAudioDevices.OutputDevice.BluetoothAudio bluetoothAudio = aVar2.f37c;
+                StoreAudioDevices.OutputDevice.BluetoothAudio bluetoothAudio = aVar2.f36c;
                 if (bluetoothAudio == null || (str = bluetoothAudio.getName()) == null) {
                     str = aVar.getString(2131886743);
                 }
@@ -248,9 +248,9 @@ public final class a extends AppDialog {
 
     public static final void g(a aVar) {
         Objects.requireNonNull(aVar);
-        Observable<Long> e02 = Observable.e0(300, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, aVar, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(aVar), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(300, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, aVar, null, 2, null), a.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(aVar), 62, (Object) null);
     }
 
     public static final f h(a aVar) {
@@ -278,10 +278,10 @@ public final class a extends AppDialog {
         MaterialRadioButton materialRadioButton4 = i().d;
         m.checkNotNullExpressionValue(materialRadioButton4, "binding.audioOutputSelectionEarpieceRadio");
         ColorCompatKt.setDrawableColor(materialRadioButton4, themedColor);
-        i().b.setOnClickListener(new View$OnClickListenerC0015a(0, this));
-        i().e.setOnClickListener(new View$OnClickListenerC0015a(1, this));
-        i().f.setOnClickListener(new View$OnClickListenerC0015a(2, this));
-        i().d.setOnClickListener(new View$OnClickListenerC0015a(3, this));
+        i().b.setOnClickListener(new View$OnClickListenerC0011a(0, this));
+        i().e.setOnClickListener(new View$OnClickListenerC0011a(1, this));
+        i().f.setOnClickListener(new View$OnClickListenerC0011a(2, this));
+        i().d.setOnClickListener(new View$OnClickListenerC0011a(3, this));
     }
 
     @Override // com.discord.app.AppDialog
diff --git a/app/src/main/java/c/a/a/e/a/b.java b/app/src/main/java/c/a/a/d/a/b.java
similarity index 97%
rename from app/src/main/java/c/a/a/e/a/b.java
rename to app/src/main/java/c/a/a/d/a/b.java
index e3c2939a49..1e735066f1 100644
--- a/app/src/main/java/c/a/a/e/a/b.java
+++ b/app/src/main/java/c/a/a/d/a/b.java
@@ -1,4 +1,4 @@
-package c.a.a.e.a;
+package c.a.a.d.a;
 
 import d0.z.d.o;
 import kotlin.Unit;
diff --git a/app/src/main/java/c/a/a/e/a/c.java b/app/src/main/java/c/a/a/d/a/c.java
similarity index 97%
rename from app/src/main/java/c/a/a/e/a/c.java
rename to app/src/main/java/c/a/a/d/a/c.java
index 3dbffaeaf5..0e3cad1228 100644
--- a/app/src/main/java/c/a/a/e/a/c.java
+++ b/app/src/main/java/c/a/a/d/a/c.java
@@ -1,6 +1,6 @@
-package c.a.a.e.a;
+package c.a.a.d.a;
 
-import c.a.a.e.a.f;
+import c.a.a.d.a.f;
 import com.discord.stores.StoreAudioDevices;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/c/a/a/e/a/d.java b/app/src/main/java/c/a/a/d/a/d.java
similarity index 95%
rename from app/src/main/java/c/a/a/e/a/d.java
rename to app/src/main/java/c/a/a/d/a/d.java
index 50e765ee80..495f68ccc9 100644
--- a/app/src/main/java/c/a/a/e/a/d.java
+++ b/app/src/main/java/c/a/a/d/a/d.java
@@ -1,6 +1,6 @@
-package c.a.a.e.a;
+package c.a.a.d.a;
 
-import c.a.a.e.a.f;
+import c.a.a.d.a.f;
 import com.discord.stores.StoreAudioDevices;
 import d0.z.d.m;
 import j0.k.b;
diff --git a/app/src/main/java/c/a/a/e/a/e.java b/app/src/main/java/c/a/a/d/a/e.java
similarity index 93%
rename from app/src/main/java/c/a/a/e/a/e.java
rename to app/src/main/java/c/a/a/d/a/e.java
index 8391cd8037..6bca46acea 100644
--- a/app/src/main/java/c/a/a/e/a/e.java
+++ b/app/src/main/java/c/a/a/d/a/e.java
@@ -1,6 +1,6 @@
-package c.a.a.e.a;
+package c.a.a.d.a;
 
-import c.a.a.e.a.f;
+import c.a.a.d.a.f;
 import com.discord.stores.StoreAudioManagerV2;
 import j0.k.b;
 /* compiled from: AudioOutputSelectionDialogViewModel.kt */
diff --git a/app/src/main/java/c/a/a/e/a/f.java b/app/src/main/java/c/a/a/d/a/f.java
similarity index 97%
rename from app/src/main/java/c/a/a/e/a/f.java
rename to app/src/main/java/c/a/a/d/a/f.java
index c349561d2c..abee3b0b2f 100644
--- a/app/src/main/java/c/a/a/e/a/f.java
+++ b/app/src/main/java/c/a/a/d/a/f.java
@@ -1,4 +1,4 @@
-package c.a.a.e.a;
+package c.a.a.d.a;
 
 import android.content.Context;
 import com.discord.app.AppViewModel;
@@ -64,7 +64,7 @@ public final class f extends AppViewModel<c> {
             public final boolean b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final StoreAudioDevices.OutputDevice.BluetoothAudio f37c;
+            public final StoreAudioDevices.OutputDevice.BluetoothAudio f36c;
             public final boolean d;
             public final boolean e;
             public final boolean f;
@@ -75,7 +75,7 @@ public final class f extends AppViewModel<c> {
                 m.checkNotNullParameter(outputDevice, "selectedAudioOutput");
                 this.a = outputDevice;
                 this.b = z2;
-                this.f37c = bluetoothAudio;
+                this.f36c = bluetoothAudio;
                 this.d = z3;
                 this.e = z4;
                 this.f = z5;
@@ -89,7 +89,7 @@ public final class f extends AppViewModel<c> {
                     return false;
                 }
                 a aVar = (a) obj;
-                return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f37c, aVar.f37c) && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f;
+                return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f36c, aVar.f36c) && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f;
             }
 
             public int hashCode() {
@@ -105,7 +105,7 @@ public final class f extends AppViewModel<c> {
                 int i4 = z2 ? 1 : 0;
                 int i5 = z2 ? 1 : 0;
                 int i6 = (hashCode + i3) * 31;
-                StoreAudioDevices.OutputDevice.BluetoothAudio bluetoothAudio = this.f37c;
+                StoreAudioDevices.OutputDevice.BluetoothAudio bluetoothAudio = this.f36c;
                 if (bluetoothAudio != null) {
                     i = bluetoothAudio.hashCode();
                 }
@@ -139,7 +139,7 @@ public final class f extends AppViewModel<c> {
                 L.append(", showBluetoothItem=");
                 L.append(this.b);
                 L.append(", bluetoothDevice=");
-                L.append(this.f37c);
+                L.append(this.f36c);
                 L.append(", showSpeakerItem=");
                 L.append(this.d);
                 L.append(", showWiredItem=");
@@ -178,10 +178,10 @@ public final class f extends AppViewModel<c> {
         if ((i2 & 4) == 0) {
             observable2 = null;
         } else if (audioDevices.getEnabled()) {
-            observable2 = audioDevices.observeAudioDevicesState().G(d.i);
+            observable2 = audioDevices.observeAudioDevicesState().F(d.i);
             m.checkNotNullExpressionValue(observable2, "storeAudioDevices.observ…tate(audioDevicesState) }");
         } else {
-            observable2 = audioManagerV2.observeAudioManagerState().G(e.i);
+            observable2 = audioManagerV2.observeAudioManagerState().F(e.i);
             m.checkNotNullExpressionValue(observable2, "storeAudioManager.observ….asAudioDevicesState()) }");
         }
         m.checkNotNullParameter(audioDevices, "storeAudioDevices");
diff --git a/app/src/main/java/c/a/a/d/b.java b/app/src/main/java/c/a/a/d/b.java
deleted file mode 100644
index 6a1af9750a..0000000000
--- a/app/src/main/java/c/a/a/d/b.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package c.a.a.d;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentViewModelLazyKt;
-import c.a.a.d.k;
-import c.a.d.h0;
-import c.a.d.j0;
-import c.a.i.w0;
-import com.discord.app.AppDialog;
-import com.discord.app.AppViewFlipper;
-import com.discord.app.AppViewModel;
-import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
-import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.view.extensions.ViewExtensions;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.discord.views.LoadingButton;
-import com.google.android.material.button.MaterialButton;
-import d0.g;
-import d0.z.d.a0;
-import d0.z.d.m;
-import d0.z.d.o;
-import java.util.Objects;
-import kotlin.Lazy;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.reflect.KProperty;
-import rx.Observable;
-/* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
-public final class b extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(b.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildSubscriptionUncancelDialogBinding;", 0)};
-    public static final C0010b j = new C0010b(null);
-    public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
-    public final Lazy l;
-    public final Lazy m;
-
-    /* compiled from: java-style lambda group */
-    public static final class a implements View.OnClickListener {
-        public final /* synthetic */ int i;
-        public final /* synthetic */ Object j;
-
-        public a(int i, Object obj) {
-            this.i = i;
-            this.j = obj;
-        }
-
-        @Override // android.view.View.OnClickListener
-        public final void onClick(View view) {
-            int i = this.i;
-            if (i == 0) {
-                k kVar = (k) ((b) this.j).l.getValue();
-                k.c viewState = kVar.getViewState();
-                if (!m.areEqual(viewState, k.c.C0014c.a)) {
-                    if ((viewState instanceof k.c.b) || (viewState instanceof k.c.a)) {
-                        kVar.updateViewState(new k.c.a(null, 1));
-                    }
-                }
-            } else if (i == 1) {
-                k kVar2 = (k) ((b) this.j).l.getValue();
-                k.c viewState2 = kVar2.getViewState();
-                if (!m.areEqual(viewState2, k.c.C0014c.a)) {
-                    if (viewState2 instanceof k.c.b) {
-                        k.c viewState3 = kVar2.getViewState();
-                        Objects.requireNonNull(viewState3, "null cannot be cast to non-null type com.discord.dialogs.premiumguild.PremiumGuildSubscriptionUncancelViewModel.ViewState.Loaded");
-                        if (!((k.c.b) viewState3).b) {
-                            k.c viewState4 = kVar2.getViewState();
-                            if (!(viewState4 instanceof k.c.b)) {
-                                viewState4 = null;
-                            }
-                            k.c.b bVar = (k.c.b) viewState4;
-                            if (bVar != null) {
-                                kVar2.updateViewState(k.c.b.a(bVar, null, true, false, 5));
-                                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(PremiumGuildSubscriptionUtils.INSTANCE.uncancelSubscriptionSlot(kVar2.m, kVar2.j, bVar.a, kVar2.l), kVar2, null, 2, null), k.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new l(kVar2, bVar), 62, (Object) null);
-                            }
-                        }
-                    } else if ((viewState2 instanceof k.c.d) || (viewState2 instanceof k.c.a)) {
-                        kVar2.updateViewState(new k.c.a(null, 1));
-                    }
-                }
-            } else {
-                throw null;
-            }
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
-    /* renamed from: c.a.a.d.b$b  reason: collision with other inner class name */
-    public static final class C0010b {
-        public C0010b(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
-    public static final /* synthetic */ class c extends d0.z.d.k implements Function1<View, w0> {
-        public static final c i = new c();
-
-        public c() {
-            super(1, w0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildSubscriptionUncancelDialogBinding;", 0);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public w0 invoke(View view) {
-            View view2 = view;
-            m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364030;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030);
-            if (linearLayout != null) {
-                i2 = 2131364263;
-                TextView textView = (TextView) view2.findViewById(2131364263);
-                if (textView != null) {
-                    i2 = 2131364264;
-                    LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364264);
-                    if (loadingButton != null) {
-                        i2 = 2131364265;
-                        TextView textView2 = (TextView) view2.findViewById(2131364265);
-                        if (textView2 != null) {
-                            i2 = 2131364266;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364266);
-                            if (appViewFlipper != null) {
-                                i2 = 2131364267;
-                                TextView textView3 = (TextView) view2.findViewById(2131364267);
-                                if (textView3 != null) {
-                                    i2 = 2131364268;
-                                    ImageView imageView = (ImageView) view2.findViewById(2131364268);
-                                    if (imageView != null) {
-                                        i2 = 2131364269;
-                                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364269);
-                                        if (materialButton != null) {
-                                            return new w0((LinearLayout) view2, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, imageView, materialButton);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
-    public static final class d extends o implements Function1<k.c, Unit> {
-        public final /* synthetic */ b this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public d(b bVar) {
-            super(1);
-            this.this$0 = bVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(k.c cVar) {
-            k.c cVar2 = cVar;
-            b bVar = this.this$0;
-            m.checkNotNullExpressionValue(cVar2, "it");
-            KProperty[] kPropertyArr = b.i;
-            AppViewFlipper appViewFlipper = bVar.g().e;
-            m.checkNotNullExpressionValue(appViewFlipper, "binding.premiumGuildSubscriptionUncancelFlipper");
-            boolean z2 = true;
-            appViewFlipper.setDisplayedChild(!(cVar2 instanceof k.c.C0014c) ? 1 : 0);
-            TextView textView = bVar.g().d;
-            m.checkNotNullExpressionValue(textView, "binding.premiumGuildSubscriptionUncancelError");
-            boolean z3 = cVar2 instanceof k.c.b;
-            int i = 8;
-            textView.setVisibility(z3 && ((k.c.b) cVar2).f36c ? 0 : 8);
-            MaterialButton materialButton = bVar.g().h;
-            m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildSubscriptionUncancelNevermind");
-            if (z3) {
-                i = 0;
-            }
-            materialButton.setVisibility(i);
-            MaterialButton materialButton2 = bVar.g().h;
-            m.checkNotNullExpressionValue(materialButton2, "binding.premiumGuildSubscriptionUncancelNevermind");
-            ViewExtensions.setEnabledAndAlpha$default(materialButton2, z3 && !((k.c.b) cVar2).b, 0.0f, 2, null);
-            bVar.g().f170c.setIsLoading(z3 && ((k.c.b) cVar2).b);
-            k.c.C0014c cVar3 = k.c.C0014c.a;
-            if (!(!m.areEqual(cVar2, cVar3)) || !z3 || ((k.c.b) cVar2).b) {
-                z2 = false;
-            }
-            bVar.setCancelable(z2);
-            if (!m.areEqual(cVar2, cVar3)) {
-                if (z3) {
-                    TextView textView2 = bVar.g().f;
-                    m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionUncancelHeader");
-                    textView2.setText(bVar.getString(2131892106));
-                    TextView textView3 = bVar.g().b;
-                    m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionUncancelBody");
-                    textView3.setText(bVar.getString(2131892103));
-                } else if (m.areEqual(cVar2, k.c.d.a)) {
-                    TextView textView4 = bVar.g().f;
-                    m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionUncancelHeader");
-                    textView4.setText(bVar.getString(2131892102));
-                    ImageView imageView = bVar.g().g;
-                    m.checkNotNullExpressionValue(imageView, "binding.premiumGuildSubscriptionUncancelImage");
-                    imageView.setVisibility(0);
-                    TextView textView5 = bVar.g().b;
-                    m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionUncancelBody");
-                    textView5.setText(bVar.getString(2131892101));
-                    bVar.g().f170c.setText(bVar.getString(2131891666));
-                } else if (cVar2 instanceof k.c.a) {
-                    Integer num = ((k.c.a) cVar2).a;
-                    if (num != null) {
-                        c.a.d.o.i(bVar, num.intValue(), 0, 4);
-                    }
-                    bVar.dismiss();
-                }
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
-    public static final class e extends o implements Function0<Long> {
-        public final /* synthetic */ b this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public e(b bVar) {
-            super(0);
-            this.this$0 = bVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Long mo1invoke() {
-            Bundle arguments = this.this$0.getArguments();
-            Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("extra_slot_id")) : null;
-            Objects.requireNonNull(valueOf, "null cannot be cast to non-null type com.discord.models.domain.PremiumGuildSubscriptionSlotId /* = kotlin.Long */");
-            return Long.valueOf(valueOf.longValue());
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionUncancelDialog.kt */
-    public static final class f extends o implements Function0<AppViewModel<k.c>> {
-        public final /* synthetic */ b this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public f(b bVar) {
-            super(0);
-            this.this$0 = bVar;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public AppViewModel<k.c> mo1invoke() {
-            return new k(((Number) this.this$0.m.getValue()).longValue(), null, null, null, null, 30);
-        }
-    }
-
-    public b() {
-        super(2131558638);
-        f fVar = new f(this);
-        h0 h0Var = new h0(this);
-        this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(k.class), new m(3, h0Var), new j0(fVar));
-        this.m = g.lazy(new e(this));
-    }
-
-    public final w0 g() {
-        return (w0) this.k.getValue((Fragment) this, i[0]);
-    }
-
-    @Override // com.discord.app.AppDialog
-    public void onViewBound(View view) {
-        m.checkNotNullParameter(view, "view");
-        super.onViewBound(view);
-        g().h.setOnClickListener(new a(0, this));
-        g().f170c.setOnClickListener(new a(1, this));
-    }
-
-    @Override // com.discord.app.AppDialog
-    public void onViewBoundOrOnResume() {
-        super.onViewBoundOrOnResume();
-        Observable<k.c> s2 = ((k) this.l.getValue()).observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), b.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
-    }
-}
diff --git a/app/src/main/java/c/a/a/d/c.java b/app/src/main/java/c/a/a/d/c.java
deleted file mode 100644
index d745846880..0000000000
--- a/app/src/main/java/c/a/a/d/c.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package c.a.a.d;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import c.a.i.u0;
-import com.airbnb.lottie.LottieAnimationView;
-import com.discord.app.AppDialog;
-import com.discord.utilities.animations.LottieAnimationUtilsKt;
-import com.discord.utilities.resources.StringResourceUtilsKt;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.google.android.material.button.MaterialButton;
-import d0.z.d.k;
-import d0.z.d.m;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.ranges.IntRange;
-import kotlin.reflect.KProperty;
-/* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
-public final class c extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(c.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildSubscriptionActivatedDialogBinding;", 0)};
-    public static final IntRange j = new IntRange(540, 825);
-    public static final a k = new a(null);
-    public final FragmentViewBindingDelegate l = FragmentViewBindingDelegateKt.viewBinding$default(this, b.i, null, 2, null);
-    public Function0<Unit> m;
-
-    /* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
-    public static final class a {
-        public a(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-
-        public final void a(FragmentManager fragmentManager, Context context, String str, int i, boolean z2, Function0<Unit> function0) {
-            m.checkNotNullParameter(fragmentManager, "fragmentManager");
-            m.checkNotNullParameter(context, "context");
-            m.checkNotNullParameter(function0, "dismissListener");
-            CharSequence g = z2 ? c.a.l.b.g(context, 2131889968, new Object[0], null, 4) : c.a.l.b.g(context, 2131889951, new Object[0], null, 4);
-            CharSequence g2 = str == null ? c.a.l.b.g(context, 2131889953, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755178, i, Integer.valueOf(i))}, null, 4) : z2 ? c.a.l.b.g(context, 2131889969, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755179, i, Integer.valueOf(i))}, null, 4) : c.a.l.b.g(context, 2131889952, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755176, i, Integer.valueOf(i))}, null, 4);
-            c cVar = new c();
-            cVar.m = function0;
-            Bundle bundle = new Bundle();
-            bundle.putCharSequence("extra_body1_text", g);
-            bundle.putCharSequence("extra_body2_text", g2);
-            cVar.setArguments(bundle);
-            cVar.show(fragmentManager, c.class.getName());
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
-    public static final /* synthetic */ class b extends k implements Function1<View, u0> {
-        public static final b i = new b();
-
-        public b() {
-            super(1, u0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildSubscriptionActivatedDialogBinding;", 0);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public u0 invoke(View view) {
-            View view2 = view;
-            m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364253;
-            TextView textView = (TextView) view2.findViewById(2131364253);
-            if (textView != null) {
-                i2 = 2131364254;
-                TextView textView2 = (TextView) view2.findViewById(2131364254);
-                if (textView2 != null) {
-                    i2 = 2131364255;
-                    LottieAnimationView lottieAnimationView = (LottieAnimationView) view2.findViewById(2131364255);
-                    if (lottieAnimationView != null) {
-                        i2 = 2131364256;
-                        MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364256);
-                        if (materialButton != null) {
-                            return new u0((LinearLayout) view2, textView, textView2, lottieAnimationView, materialButton);
-                        }
-                    }
-                }
-            }
-            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionActivatedDialog.kt */
-    /* renamed from: c.a.a.d.c$c  reason: collision with other inner class name */
-    public static final class View$OnClickListenerC0011c implements View.OnClickListener {
-        public final /* synthetic */ c i;
-
-        public View$OnClickListenerC0011c(c cVar) {
-            this.i = cVar;
-        }
-
-        @Override // android.view.View.OnClickListener
-        public final void onClick(View view) {
-            this.i.dismiss();
-        }
-    }
-
-    public c() {
-        super(2131558636);
-    }
-
-    public final u0 g() {
-        return (u0) this.l.getValue((Fragment) this, i[0]);
-    }
-
-    @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnDismissListener
-    public void onDismiss(DialogInterface dialogInterface) {
-        m.checkNotNullParameter(dialogInterface, "dialog");
-        Function0<Unit> function0 = this.m;
-        if (function0 != null) {
-            function0.mo1invoke();
-        }
-        super.onDismiss(dialogInterface);
-    }
-
-    @Override // com.discord.app.AppDialog
-    public void onViewBoundOrOnResume() {
-        super.onViewBoundOrOnResume();
-        TextView textView = g().b;
-        m.checkNotNullExpressionValue(textView, "binding.premiumGuildSubscriptionActivatedBody1");
-        Bundle arguments = getArguments();
-        CharSequence charSequence = null;
-        textView.setText(arguments != null ? arguments.getCharSequence("extra_body1_text") : null);
-        TextView textView2 = g().f159c;
-        m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionActivatedBody2");
-        Bundle arguments2 = getArguments();
-        if (arguments2 != null) {
-            charSequence = arguments2.getCharSequence("extra_body2_text");
-        }
-        textView2.setText(charSequence);
-        g().e.setOnClickListener(new View$OnClickListenerC0011c(this));
-        LottieAnimationView lottieAnimationView = g().d;
-        m.checkNotNullExpressionValue(lottieAnimationView, "binding.premiumGuildSubscriptionActivatedLottie");
-        LottieAnimationUtilsKt.loopFrom(lottieAnimationView, 180, j);
-    }
-}
diff --git a/app/src/main/java/c/a/a/d/d.java b/app/src/main/java/c/a/a/d/d.java
deleted file mode 100644
index cd2e252238..0000000000
--- a/app/src/main/java/c/a/a/d/d.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package c.a.a.d;
-
-import c.a.a.d.f;
-import com.discord.models.domain.ModelPremiumGuildSubscription;
-import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
-import com.discord.models.domain.ModelSubscription;
-import com.discord.stores.StorePremiumGuildSubscription;
-import com.discord.stores.StoreSubscriptions;
-import d0.t.u;
-import d0.z.d.m;
-import d0.z.d.o;
-import java.util.List;
-import java.util.Objects;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-public final class d extends o implements Function1<f.b, Unit> {
-    public final /* synthetic */ f this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public d(f fVar) {
-        super(1);
-        this.this$0 = fVar;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(f.b bVar) {
-        Object obj;
-        ModelPremiumGuildSubscription premiumGuildSubscription;
-        f.b bVar2 = bVar;
-        m.checkNotNullParameter(bVar2, "storeState");
-        f fVar = this.this$0;
-        Objects.requireNonNull(fVar);
-        StorePremiumGuildSubscription.State state = bVar2.a;
-        StoreSubscriptions.SubscriptionsState subscriptionsState = bVar2.b;
-        if (!(fVar.getViewState() instanceof f.c.b) && !(fVar.getViewState() instanceof f.c.C0012c)) {
-            if ((state instanceof StorePremiumGuildSubscription.State.Loading) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading)) {
-                obj = f.c.C0013f.f;
-            } else if ((state instanceof StorePremiumGuildSubscription.State.Failure) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure)) {
-                obj = new f.c.C0012c(2131892076);
-            } else if (!(state instanceof StorePremiumGuildSubscription.State.Loaded) || !(subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded)) {
-                obj = new f.c.C0012c(2131892076);
-            } else {
-                ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions());
-                if (modelSubscription == null) {
-                    obj = new f.c.C0012c(2131892076);
-                } else if (fVar.getViewState() instanceof f.c.b) {
-                    obj = new f.c.b(modelSubscription);
-                } else {
-                    ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot = ((StorePremiumGuildSubscription.State.Loaded) state).getPremiumGuildSubscriptionSlotMap().get(Long.valueOf(fVar.j));
-                    obj = new f.c.e(modelSubscription, ((modelPremiumGuildSubscriptionSlot == null || (premiumGuildSubscription = modelPremiumGuildSubscriptionSlot.getPremiumGuildSubscription()) == null) ? null : Long.valueOf(premiumGuildSubscription.getGuildId())) != null);
-                }
-            }
-            fVar.updateViewState(obj);
-        }
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/a/d/e.java b/app/src/main/java/c/a/a/d/e.java
deleted file mode 100644
index 827046b2e0..0000000000
--- a/app/src/main/java/c/a/a/d/e.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package c.a.a.d;
-
-import c.a.a.d.f;
-import com.discord.stores.StorePremiumGuildSubscription;
-import com.discord.stores.StoreSubscriptions;
-import d0.z.d.k;
-import d0.z.d.m;
-import kotlin.jvm.functions.Function2;
-/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-public final /* synthetic */ class e extends k implements Function2<StorePremiumGuildSubscription.State, StoreSubscriptions.SubscriptionsState, f.b> {
-    public static final e i = new e();
-
-    public e() {
-        super(2, f.b.class, "<init>", "<init>(Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)V", 0);
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function2
-    public f.b invoke(StorePremiumGuildSubscription.State state, StoreSubscriptions.SubscriptionsState subscriptionsState) {
-        StorePremiumGuildSubscription.State state2 = state;
-        StoreSubscriptions.SubscriptionsState subscriptionsState2 = subscriptionsState;
-        m.checkNotNullParameter(state2, "p1");
-        m.checkNotNullParameter(subscriptionsState2, "p2");
-        return new f.b(state2, subscriptionsState2);
-    }
-}
diff --git a/app/src/main/java/c/a/a/d/f.java b/app/src/main/java/c/a/a/d/f.java
deleted file mode 100644
index 3fd4143058..0000000000
--- a/app/src/main/java/c/a/a/d/f.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package c.a.a.d;
-
-import android.content.Context;
-import androidx.annotation.StringRes;
-import com.discord.app.AppViewModel;
-import com.discord.models.domain.ModelSubscription;
-import com.discord.stores.StorePremiumGuildSubscription;
-import com.discord.stores.StoreStream;
-import com.discord.stores.StoreSubscriptions;
-import com.discord.utilities.rest.RestAPI;
-import com.discord.utilities.rx.ObservableExtensionsKt;
-import d0.z.d.m;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import rx.Observable;
-import rx.functions.Func2;
-/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-public final class f extends AppViewModel<c> {
-    public static final a i = new a(null);
-    public final long j;
-    public final StorePremiumGuildSubscription k;
-    public final StoreSubscriptions l;
-    public final RestAPI m;
-
-    /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-    public static final class a {
-        public a(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-    public static final class b {
-        public final StorePremiumGuildSubscription.State a;
-        public final StoreSubscriptions.SubscriptionsState b;
-
-        public b(StorePremiumGuildSubscription.State state, StoreSubscriptions.SubscriptionsState subscriptionsState) {
-            m.checkNotNullParameter(state, "premiumGuildSubscriptionState");
-            m.checkNotNullParameter(subscriptionsState, "subscriptionState");
-            this.a = state;
-            this.b = subscriptionsState;
-        }
-
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof b)) {
-                return false;
-            }
-            b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b);
-        }
-
-        public int hashCode() {
-            StorePremiumGuildSubscription.State state = this.a;
-            int i = 0;
-            int hashCode = (state != null ? state.hashCode() : 0) * 31;
-            StoreSubscriptions.SubscriptionsState subscriptionsState = this.b;
-            if (subscriptionsState != null) {
-                i = subscriptionsState.hashCode();
-            }
-            return hashCode + i;
-        }
-
-        public String toString() {
-            StringBuilder L = c.d.b.a.a.L("StoreState(premiumGuildSubscriptionState=");
-            L.append(this.a);
-            L.append(", subscriptionState=");
-            L.append(this.b);
-            L.append(")");
-            return L.toString();
-        }
-    }
-
-    /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-    public static abstract class c {
-        public final boolean a;
-        public final boolean b;
-
-        /* renamed from: c  reason: collision with root package name */
-        public final boolean f35c;
-        public final boolean d;
-        public final boolean e;
-
-        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-        public static final class a extends c {
-            public final ModelSubscription f;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public a(ModelSubscription modelSubscription) {
-                super(false, true, false, true, false, null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
-                this.f = modelSubscription;
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof a) && m.areEqual(this.f, ((a) obj).f);
-                }
-                return true;
-            }
-
-            public int hashCode() {
-                ModelSubscription modelSubscription = this.f;
-                if (modelSubscription != null) {
-                    return modelSubscription.hashCode();
-                }
-                return 0;
-            }
-
-            public String toString() {
-                StringBuilder L = c.d.b.a.a.L("CancelInProgress(subscription=");
-                L.append(this.f);
-                L.append(")");
-                return L.toString();
-            }
-        }
-
-        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-        public static final class b extends c {
-            public final ModelSubscription f;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public b(ModelSubscription modelSubscription) {
-                super(false, false, false, false, true, null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
-                this.f = modelSubscription;
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof b) && m.areEqual(this.f, ((b) obj).f);
-                }
-                return true;
-            }
-
-            public int hashCode() {
-                ModelSubscription modelSubscription = this.f;
-                if (modelSubscription != null) {
-                    return modelSubscription.hashCode();
-                }
-                return 0;
-            }
-
-            public String toString() {
-                StringBuilder L = c.d.b.a.a.L("Cancelled(subscription=");
-                L.append(this.f);
-                L.append(")");
-                return L.toString();
-            }
-        }
-
-        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-        /* renamed from: c.a.a.d.f$c$c  reason: collision with other inner class name */
-        public static final class C0012c extends c {
-            public final Integer f;
-
-            public C0012c() {
-                this(null, 1);
-            }
-
-            public C0012c(@StringRes Integer num) {
-                super(false, false, false, false, true, null);
-                this.f = num;
-            }
-
-            /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-            public /* synthetic */ C0012c(Integer num, int i) {
-                this(null);
-                int i2 = i & 1;
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof C0012c) && m.areEqual(this.f, ((C0012c) obj).f);
-                }
-                return true;
-            }
-
-            public int hashCode() {
-                Integer num = this.f;
-                if (num != null) {
-                    return num.hashCode();
-                }
-                return 0;
-            }
-
-            public String toString() {
-                return c.d.b.a.a.B(c.d.b.a.a.L("Dismiss(dismissStringId="), this.f, ")");
-            }
-        }
-
-        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-        public static final class d extends c {
-            public final ModelSubscription f;
-
-            public d(ModelSubscription modelSubscription) {
-                super(true, true, true, false, true, null);
-                this.f = modelSubscription;
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof d) && m.areEqual(this.f, ((d) obj).f);
-                }
-                return true;
-            }
-
-            public int hashCode() {
-                ModelSubscription modelSubscription = this.f;
-                if (modelSubscription != null) {
-                    return modelSubscription.hashCode();
-                }
-                return 0;
-            }
-
-            public String toString() {
-                StringBuilder L = c.d.b.a.a.L("FailureCancelling(subscription=");
-                L.append(this.f);
-                L.append(")");
-                return L.toString();
-            }
-        }
-
-        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-        public static final class e extends c {
-            public final ModelSubscription f;
-            public final boolean g;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public e(ModelSubscription modelSubscription, boolean z2) {
-                super(false, true, true, false, true, null);
-                m.checkNotNullParameter(modelSubscription, "subscription");
-                this.f = modelSubscription;
-                this.g = z2;
-            }
-
-            public boolean equals(Object obj) {
-                if (this == obj) {
-                    return true;
-                }
-                if (!(obj instanceof e)) {
-                    return false;
-                }
-                e eVar = (e) obj;
-                return m.areEqual(this.f, eVar.f) && this.g == eVar.g;
-            }
-
-            public int hashCode() {
-                ModelSubscription modelSubscription = this.f;
-                int hashCode = (modelSubscription != null ? modelSubscription.hashCode() : 0) * 31;
-                boolean z2 = this.g;
-                if (z2) {
-                    z2 = true;
-                }
-                int i = z2 ? 1 : 0;
-                int i2 = z2 ? 1 : 0;
-                int i3 = z2 ? 1 : 0;
-                return hashCode + i;
-            }
-
-            public String toString() {
-                StringBuilder L = c.d.b.a.a.L("Loaded(subscription=");
-                L.append(this.f);
-                L.append(", isFromInventory=");
-                return c.d.b.a.a.G(L, this.g, ")");
-            }
-        }
-
-        /* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-        /* renamed from: c.a.a.d.f$c$f  reason: collision with other inner class name */
-        public static final class C0013f extends c {
-            public static final C0013f f = new C0013f();
-
-            public C0013f() {
-                super(false, true, false, false, true, null);
-            }
-        }
-
-        public c(boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, DefaultConstructorMarker defaultConstructorMarker) {
-            this.a = z2;
-            this.b = z3;
-            this.f35c = z4;
-            this.d = z5;
-            this.e = z6;
-        }
-    }
-
-    /* JADX WARN: Multi-variable type inference failed */
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    /* JADX WARNING: Unknown variable types count: 1 */
-    public f(long j, StorePremiumGuildSubscription storePremiumGuildSubscription, StoreSubscriptions storeSubscriptions, RestAPI restAPI, Observable observable, int i2) {
-        super(c.C0013f.f);
-        Observable observable2;
-        StorePremiumGuildSubscription premiumGuildSubscriptions = (i2 & 2) != 0 ? StoreStream.Companion.getPremiumGuildSubscriptions() : null;
-        StoreSubscriptions subscriptions = (i2 & 4) != 0 ? StoreStream.Companion.getSubscriptions() : null;
-        RestAPI api = (i2 & 8) != 0 ? RestAPI.Companion.getApi() : null;
-        if ((i2 & 16) != 0) {
-            Observable observePremiumGuildSubscriptionsState$default = StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(premiumGuildSubscriptions, null, 1, null);
-            Observable<StoreSubscriptions.SubscriptionsState> observeSubscriptions = subscriptions.observeSubscriptions();
-            e eVar = e.i;
-            observable2 = Observable.j(observePremiumGuildSubscriptionsState$default, observeSubscriptions, (Func2) (eVar != null ? new h(eVar) : eVar));
-            m.checkNotNullExpressionValue(observable2, "Observable.combineLatest…   ::StoreState\n        )");
-        } else {
-            observable2 = null;
-        }
-        m.checkNotNullParameter(premiumGuildSubscriptions, "storePremiumGuildSubscription");
-        m.checkNotNullParameter(subscriptions, "storeSubscriptions");
-        m.checkNotNullParameter(api, "api");
-        m.checkNotNullParameter(observable2, "storeObservable");
-        this.j = j;
-        this.k = premiumGuildSubscriptions;
-        this.l = subscriptions;
-        this.m = api;
-        premiumGuildSubscriptions.fetchUserGuildPremiumState();
-        subscriptions.fetchSubscriptions();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), f.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
-    }
-}
diff --git a/app/src/main/java/c/a/a/d/g.java b/app/src/main/java/c/a/a/d/g.java
deleted file mode 100644
index f15bb897d6..0000000000
--- a/app/src/main/java/c/a/a/d/g.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package c.a.a.d;
-
-import c.a.a.d.f;
-import com.discord.models.domain.ModelSubscription;
-import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
-import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-public final class g extends o implements Function1<PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult, Unit> {
-    public final /* synthetic */ ModelSubscription $subscription;
-    public final /* synthetic */ f this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public g(f fVar, ModelSubscription modelSubscription) {
-        super(1);
-        this.this$0 = fVar;
-        this.$subscription = modelSubscription;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    /* JADX WARNING: Code restructure failed: missing block: B:5:0x0012, code lost:
-        if (r3 != 2) goto L_0x002e;
-     */
-    @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult modifySubscriptionSlotResult) {
-        PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult modifySubscriptionSlotResult2 = modifySubscriptionSlotResult;
-        m.checkNotNullParameter(modifySubscriptionSlotResult2, "result");
-        int ordinal = modifySubscriptionSlotResult2.ordinal();
-        if (ordinal != 0) {
-            if (ordinal == 1) {
-                this.this$0.updateViewState(new f.c.d(this.$subscription));
-            }
-            return Unit.a;
-        }
-        this.this$0.updateViewState(new f.c.b(this.$subscription));
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/a/d/h.java b/app/src/main/java/c/a/a/d/h.java
deleted file mode 100644
index 280828e412..0000000000
--- a/app/src/main/java/c/a/a/d/h.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package c.a.a.d;
-
-import kotlin.jvm.functions.Function2;
-import rx.functions.Func2;
-/* compiled from: PremiumGuildSubscriptionCancelViewModel.kt */
-public final class h implements Func2 {
-    public final /* synthetic */ Function2 i;
-
-    public h(Function2 function2) {
-        this.i = function2;
-    }
-
-    @Override // rx.functions.Func2
-    public final /* synthetic */ Object call(Object obj, Object obj2) {
-        return this.i.invoke(obj, obj2);
-    }
-}
diff --git a/app/src/main/java/c/a/a/a/a.java b/app/src/main/java/c/a/a/e/a.java
similarity index 80%
rename from app/src/main/java/c/a/a/a/a.java
rename to app/src/main/java/c/a/a/e/a.java
index bed77c03ec..403dea3d5d 100644
--- a/app/src/main/java/c/a/a/a/a.java
+++ b/app/src/main/java/c/a/a/e/a.java
@@ -1,4 +1,4 @@
-package c.a.a.a;
+package c.a.a.e;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -12,8 +12,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
-import c.a.i.z0;
-import c.a.i.z4;
+import c.a.i.c5;
+import c.a.i.n0;
 import com.discord.app.AppDialog;
 import com.discord.app.AppFragment;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -33,20 +33,20 @@ import java.util.Objects;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
-/* compiled from: PremiumUpsellDialog.kt */
+/* compiled from: MultiValuePropPremiumUpsellDialog.kt */
 public final class a extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/PremiumUpsellDialogBinding;", 0)};
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(a.class, "binding", "getBinding()Lcom/discord/databinding/MultiValuePropPremiumUpsellDialogBinding;", 0)};
     public static final b j = new b(null);
     public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, f.i, null, 2, null);
     public e l;
 
     /* compiled from: java-style lambda group */
-    /* renamed from: c.a.a.a.a$a  reason: collision with other inner class name */
-    public static final class View$OnClickListenerC0001a implements View.OnClickListener {
+    /* renamed from: c.a.a.e.a$a  reason: collision with other inner class name */
+    public static final class View$OnClickListenerC0012a implements View.OnClickListener {
         public final /* synthetic */ int i;
         public final /* synthetic */ Object j;
 
-        public View$OnClickListenerC0001a(int i, Object obj) {
+        public View$OnClickListenerC0012a(int i, Object obj) {
             this.i = i;
             this.j = obj;
         }
@@ -66,7 +66,7 @@ public final class a extends AppDialog {
         }
     }
 
-    /* compiled from: PremiumUpsellDialog.kt */
+    /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
     public static final class b {
         public b(DefaultConstructorMarker defaultConstructorMarker) {
         }
@@ -118,20 +118,20 @@ public final class a extends AppDialog {
         }
     }
 
-    /* compiled from: PremiumUpsellDialog.kt */
+    /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
     public static final class c {
         public final int a;
         public CharSequence b;
 
         /* renamed from: c  reason: collision with root package name */
-        public CharSequence f32c;
+        public CharSequence f37c;
 
         public c(@DrawableRes int i, CharSequence charSequence, CharSequence charSequence2) {
             m.checkNotNullParameter(charSequence, "headerText");
             m.checkNotNullParameter(charSequence2, "bodyText");
             this.a = i;
             this.b = charSequence;
-            this.f32c = charSequence2;
+            this.f37c = charSequence2;
         }
 
         public boolean equals(Object obj) {
@@ -142,7 +142,7 @@ public final class a extends AppDialog {
                 return false;
             }
             c cVar = (c) obj;
-            return this.a == cVar.a && m.areEqual(this.b, cVar.b) && m.areEqual(this.f32c, cVar.f32c);
+            return this.a == cVar.a && m.areEqual(this.b, cVar.b) && m.areEqual(this.f37c, cVar.f37c);
         }
 
         public int hashCode() {
@@ -150,7 +150,7 @@ public final class a extends AppDialog {
             CharSequence charSequence = this.b;
             int i2 = 0;
             int hashCode = (i + (charSequence != null ? charSequence.hashCode() : 0)) * 31;
-            CharSequence charSequence2 = this.f32c;
+            CharSequence charSequence2 = this.f37c;
             if (charSequence2 != null) {
                 i2 = charSequence2.hashCode();
             }
@@ -163,49 +163,49 @@ public final class a extends AppDialog {
             L.append(", headerText=");
             L.append(this.b);
             L.append(", bodyText=");
-            L.append(this.f32c);
+            L.append(this.f37c);
             L.append(")");
             return L.toString();
         }
     }
 
-    /* compiled from: PremiumUpsellDialog.kt */
+    /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
     public static final class d extends AppFragment {
         public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(d.class, "binding", "getBinding()Lcom/discord/databinding/WidgetPremiumUpsellBinding;", 0)};
-        public static final C0002a j = new C0002a(null);
+        public static final C0013a j = new C0013a(null);
         public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, b.i, null, 2, null);
 
-        /* compiled from: PremiumUpsellDialog.kt */
-        /* renamed from: c.a.a.a.a$d$a  reason: collision with other inner class name */
-        public static final class C0002a {
-            public C0002a(DefaultConstructorMarker defaultConstructorMarker) {
+        /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
+        /* renamed from: c.a.a.e.a$d$a  reason: collision with other inner class name */
+        public static final class C0013a {
+            public C0013a(DefaultConstructorMarker defaultConstructorMarker) {
             }
         }
 
-        /* compiled from: PremiumUpsellDialog.kt */
-        public static final /* synthetic */ class b extends k implements Function1<View, z4> {
+        /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
+        public static final /* synthetic */ class b extends k implements Function1<View, c5> {
             public static final b i = new b();
 
             public b() {
-                super(1, z4.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetPremiumUpsellBinding;", 0);
+                super(1, c5.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetPremiumUpsellBinding;", 0);
             }
 
             /* Return type fixed from 'java.lang.Object' to match base method */
             /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
             @Override // kotlin.jvm.functions.Function1
-            public z4 invoke(View view) {
+            public c5 invoke(View view) {
                 View view2 = view;
                 m.checkNotNullParameter(view2, "p1");
-                int i2 = 2131364321;
-                TextView textView = (TextView) view2.findViewById(2131364321);
+                int i2 = 2131364357;
+                TextView textView = (TextView) view2.findViewById(2131364357);
                 if (textView != null) {
-                    i2 = 2131364328;
-                    TextView textView2 = (TextView) view2.findViewById(2131364328);
+                    i2 = 2131364364;
+                    TextView textView2 = (TextView) view2.findViewById(2131364364);
                     if (textView2 != null) {
-                        i2 = 2131364329;
-                        ImageView imageView = (ImageView) view2.findViewById(2131364329);
+                        i2 = 2131364365;
+                        ImageView imageView = (ImageView) view2.findViewById(2131364365);
                         if (imageView != null) {
-                            return new z4((LinearLayout) view2, textView, textView2, imageView);
+                            return new c5((LinearLayout) view2, textView, textView2, imageView);
                         }
                     }
                 }
@@ -214,11 +214,11 @@ public final class a extends AppDialog {
         }
 
         public d() {
-            super(2131559110);
+            super(2131559116);
         }
 
-        public final z4 g() {
-            return (z4) this.k.getValue((Fragment) this, i[0]);
+        public final c5 g() {
+            return (c5) this.k.getValue((Fragment) this, i[0]);
         }
 
         @Override // com.discord.app.AppFragment
@@ -228,7 +228,7 @@ public final class a extends AppDialog {
             ImageView imageView = g().d;
             Bundle arguments = getArguments();
             imageView.setImageResource(arguments != null ? arguments.getInt("extra_image_id") : 0);
-            TextView textView = g().f189c;
+            TextView textView = g().f75c;
             m.checkNotNullExpressionValue(textView, "binding.premiumUpsellHeader");
             Bundle arguments2 = getArguments();
             textView.setText(arguments2 != null ? arguments2.getString("extra_header_string") : null);
@@ -239,7 +239,7 @@ public final class a extends AppDialog {
         }
     }
 
-    /* compiled from: PremiumUpsellDialog.kt */
+    /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
     public static final class e extends FragmentStateAdapter {
         public final List<c> a;
 
@@ -254,10 +254,10 @@ public final class a extends AppDialog {
         @Override // androidx.viewpager2.adapter.FragmentStateAdapter
         public Fragment createFragment(int i) {
             c cVar = this.a.get(i);
-            d.C0002a aVar = d.j;
+            d.C0013a aVar = d.j;
             int i2 = cVar.a;
             CharSequence charSequence = cVar.b;
-            CharSequence charSequence2 = cVar.f32c;
+            CharSequence charSequence2 = cVar.f37c;
             Objects.requireNonNull(aVar);
             m.checkNotNullParameter(charSequence, "headerText");
             m.checkNotNullParameter(charSequence2, "bodyText");
@@ -276,42 +276,42 @@ public final class a extends AppDialog {
         }
     }
 
-    /* compiled from: PremiumUpsellDialog.kt */
-    public static final /* synthetic */ class f extends k implements Function1<View, z0> {
+    /* compiled from: MultiValuePropPremiumUpsellDialog.kt */
+    public static final /* synthetic */ class f extends k implements Function1<View, n0> {
         public static final f i = new f();
 
         public f() {
-            super(1, z0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumUpsellDialogBinding;", 0);
+            super(1, n0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/MultiValuePropPremiumUpsellDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public z0 invoke(View view) {
+        public n0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364322;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364322);
+            int i2 = 2131364358;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364358);
             if (linearLayout != null) {
-                i2 = 2131364323;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364323);
+                i2 = 2131364359;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364359);
                 if (materialButton != null) {
-                    i2 = 2131364325;
-                    View findViewById = view2.findViewById(2131364325);
+                    i2 = 2131364361;
+                    View findViewById = view2.findViewById(2131364361);
                     if (findViewById != null) {
-                        i2 = 2131364326;
-                        TabLayout tabLayout = (TabLayout) view2.findViewById(2131364326);
+                        i2 = 2131364362;
+                        TabLayout tabLayout = (TabLayout) view2.findViewById(2131364362);
                         if (tabLayout != null) {
-                            i2 = 2131364327;
-                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364327);
+                            i2 = 2131364363;
+                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364363);
                             if (materialButton2 != null) {
-                                i2 = 2131364330;
-                                MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131364330);
+                                i2 = 2131364366;
+                                MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131364366);
                                 if (materialButton3 != null) {
-                                    i2 = 2131364332;
-                                    ViewPager2 viewPager2 = (ViewPager2) view2.findViewById(2131364332);
+                                    i2 = 2131364368;
+                                    ViewPager2 viewPager2 = (ViewPager2) view2.findViewById(2131364368);
                                     if (viewPager2 != null) {
-                                        return new z0((RelativeLayout) view2, linearLayout, materialButton, findViewById, tabLayout, materialButton2, materialButton3, viewPager2);
+                                        return new n0((RelativeLayout) view2, linearLayout, materialButton, findViewById, tabLayout, materialButton2, materialButton3, viewPager2);
                                     }
                                 }
                             }
@@ -324,7 +324,7 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131558643);
+        super(2131558592);
     }
 
     public static final void g(a aVar) {
@@ -343,8 +343,8 @@ public final class a extends AppDialog {
         aVar.dismiss();
     }
 
-    public final z0 h() {
-        return (z0) this.k.getValue((Fragment) this, i[0]);
+    public final n0 h() {
+        return (n0) this.k.getValue((Fragment) this, i[0]);
     }
 
     public final boolean i() {
@@ -363,29 +363,29 @@ public final class a extends AppDialog {
         String str;
         super.onCreate(bundle);
         AppDialog.hideKeyboard$default(this, null, 1, null);
-        String string2 = getString(2131892349);
+        String string2 = getString(2131892426);
         m.checkNotNullExpressionValue(string2, "getString(R.string.premi…psell_tag_passive_mobile)");
-        String string3 = getString(2131892348);
+        String string3 = getString(2131892425);
         m.checkNotNullExpressionValue(string3, "getString(R.string.premi…l_tag_description_mobile)");
-        String string4 = getString(2131892338);
+        String string4 = getString(2131892415);
         m.checkNotNullExpressionValue(string4, "getString(R.string.premi…ell_emoji_passive_mobile)");
-        String string5 = getString(2131892335);
+        String string5 = getString(2131892412);
         m.checkNotNullExpressionValue(string5, "getString(R.string.premi…emoji_description_mobile)");
-        String string6 = getString(2131892328);
+        String string6 = getString(2131892405);
         m.checkNotNullExpressionValue(string6, "getString(R.string.premi…ed_emojis_passive_mobile)");
-        String string7 = getString(2131892327);
+        String string7 = getString(2131892404);
         m.checkNotNullExpressionValue(string7, "getString(R.string.premi…mojis_description_mobile)");
-        CharSequence j2 = c.a.l.b.j(this, 2131892353, new Object[0], null, 4);
-        Object[] objArr = {c.a.l.b.j(this, 2131888513, new Object[0], null, 4), c.a.l.b.j(this, 2131888511, new Object[0], null, 4)};
-        String string8 = getString(2131892323);
+        CharSequence j2 = c.a.l.b.j(this, 2131892430, new Object[0], null, 4);
+        Object[] objArr = {c.a.l.b.j(this, 2131888514, new Object[0], null, 4), c.a.l.b.j(this, 2131888512, new Object[0], null, 4)};
+        String string8 = getString(2131892400);
         m.checkNotNullExpressionValue(string8, "getString(R.string.premi…ed_avatar_passive_mobile)");
-        String string9 = getString(2131892322);
+        String string9 = getString(2131892399);
         m.checkNotNullExpressionValue(string9, "getString(R.string.premi…vatar_description_mobile)");
-        String string10 = getString(2131892331);
+        String string10 = getString(2131892408);
         m.checkNotNullExpressionValue(string10, "getString(R.string.premi…ell_badge_passive_mobile)");
-        String string11 = getString(2131892330);
+        String string11 = getString(2131892407);
         m.checkNotNullExpressionValue(string11, "getString(R.string.premi…badge_description_mobile)");
-        List listOf = n.listOf((Object[]) new c[]{new c(2131232239, string2, string3), new c(2131232155, string4, string5), new c(2131232107, string6, string7), new c(2131232240, j2, c.a.l.b.j(this, 2131892352, objArr, null, 4)), new c(2131232110, string8, string9), new c(2131232113, string10, string11)});
+        List listOf = n.listOf((Object[]) new c[]{new c(2131232248, string2, string3), new c(2131232163, string4, string5), new c(2131232115, string6, string7), new c(2131232249, j2, c.a.l.b.j(this, 2131892429, objArr, null, 4)), new c(2131232118, string8, string9), new c(2131232121, string10, string11)});
         Bundle arguments = getArguments();
         int i2 = arguments != null ? arguments.getInt("extra_page_number") : 0;
         Bundle arguments2 = getArguments();
@@ -409,7 +409,7 @@ public final class a extends AppDialog {
             }
             Objects.requireNonNull(cVar2);
             m.checkNotNullParameter(str2, "<set-?>");
-            cVar2.f32c = str2;
+            cVar2.f37c = str2;
         }
         c cVar3 = (c) listOf.get(i2);
         List mutableListOf = n.mutableListOf(cVar3);
@@ -430,26 +430,26 @@ public final class a extends AppDialog {
             m.throwUninitializedPropertyAccessException("pagerAdapter");
         }
         viewPager2.setAdapter(eVar);
-        TabLayout tabLayout = h().f186c;
+        TabLayout tabLayout = h().f130c;
         m.checkNotNullExpressionValue(tabLayout, "binding.premiumUpsellDots");
         int i2 = 8;
         tabLayout.setVisibility(j() ? 0 : 8);
-        TabLayout tabLayout2 = h().f186c;
+        TabLayout tabLayout2 = h().f130c;
         m.checkNotNullExpressionValue(tabLayout2, "binding.premiumUpsellDots");
         ViewPager2 viewPager22 = h().f;
         m.checkNotNullExpressionValue(viewPager22, "binding.premiumUpsellViewpager");
         ViewPager2ExtensionsKt.setUpWithViewPager2$default(tabLayout2, viewPager22, null, 2, null);
-        h().b.setOnClickListener(new View$OnClickListenerC0001a(0, this));
+        h().b.setOnClickListener(new View$OnClickListenerC0012a(0, this));
         MaterialButton materialButton = h().e;
         m.checkNotNullExpressionValue(materialButton, "binding.premiumUpsellLearnMore");
         materialButton.setVisibility(i() ? 0 : 8);
-        h().e.setOnClickListener(new View$OnClickListenerC0001a(1, this));
+        h().e.setOnClickListener(new View$OnClickListenerC0012a(1, this));
         MaterialButton materialButton2 = h().d;
         m.checkNotNullExpressionValue(materialButton2, "binding.premiumUpsellGetPremium");
         if (!i()) {
             i2 = 0;
         }
         materialButton2.setVisibility(i2);
-        h().d.setOnClickListener(new View$OnClickListenerC0001a(2, this));
+        h().d.setOnClickListener(new View$OnClickListenerC0012a(2, this));
     }
 }
diff --git a/app/src/main/java/c/a/a/a/b.java b/app/src/main/java/c/a/a/e/b.java
similarity index 82%
rename from app/src/main/java/c/a/a/a/b.java
rename to app/src/main/java/c/a/a/e/b.java
index d8e32de4be..ee49f94cab 100644
--- a/app/src/main/java/c/a/a/a/b.java
+++ b/app/src/main/java/c/a/a/e/b.java
@@ -1,4 +1,4 @@
-package c.a.a.a;
+package c.a.a.e;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
-import c.a.i.x0;
+import c.a.i.y0;
 import com.discord.app.AppDialog;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -24,7 +24,7 @@ import kotlin.reflect.KProperty;
 /* compiled from: UpgradePremiumGuildDialog.kt */
 public final class b extends AppDialog {
     public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(b.class, "binding", "getBinding()Lcom/discord/databinding/PremiumGuildUpgradeDialogBinding;", 0)};
-    public static final C0003b j = new C0003b(null);
+    public static final C0014b j = new C0014b(null);
     public Function0<Unit> k;
     public Function0<Unit> l;
     public String m;
@@ -65,42 +65,42 @@ public final class b extends AppDialog {
     }
 
     /* compiled from: UpgradePremiumGuildDialog.kt */
-    /* renamed from: c.a.a.a.b$b  reason: collision with other inner class name */
-    public static final class C0003b {
-        public C0003b(DefaultConstructorMarker defaultConstructorMarker) {
+    /* renamed from: c.a.a.e.b$b  reason: collision with other inner class name */
+    public static final class C0014b {
+        public C0014b(DefaultConstructorMarker defaultConstructorMarker) {
         }
     }
 
     /* compiled from: UpgradePremiumGuildDialog.kt */
-    public static final /* synthetic */ class c extends k implements Function1<View, x0> {
+    public static final /* synthetic */ class c extends k implements Function1<View, y0> {
         public static final c i = new c();
 
         public c() {
-            super(1, x0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildUpgradeDialogBinding;", 0);
+            super(1, y0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumGuildUpgradeDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public x0 invoke(View view) {
+        public y0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362756;
-            TextView textView = (TextView) view2.findViewById(2131362756);
+            int i2 = 2131362781;
+            TextView textView = (TextView) view2.findViewById(2131362781);
             if (textView != null) {
-                i2 = 2131364323;
-                ImageView imageView = (ImageView) view2.findViewById(2131364323);
+                i2 = 2131364359;
+                ImageView imageView = (ImageView) view2.findViewById(2131364359);
                 if (imageView != null) {
-                    i2 = 2131364324;
-                    TextView textView2 = (TextView) view2.findViewById(2131364324);
+                    i2 = 2131364360;
+                    TextView textView2 = (TextView) view2.findViewById(2131364360);
                     if (textView2 != null) {
-                        i2 = 2131364331;
-                        TextView textView3 = (TextView) view2.findViewById(2131364331);
+                        i2 = 2131364367;
+                        TextView textView3 = (TextView) view2.findViewById(2131364367);
                         if (textView3 != null) {
-                            i2 = 2131365344;
-                            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131365344);
+                            i2 = 2131365402;
+                            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131365402);
                             if (materialButton != null) {
-                                return new x0((RelativeLayout) view2, textView, imageView, textView2, textView3, materialButton);
+                                return new y0((RelativeLayout) view2, textView, imageView, textView2, textView3, materialButton);
                             }
                         }
                     }
@@ -111,11 +111,11 @@ public final class b extends AppDialog {
     }
 
     public b() {
-        super(2131558639);
+        super(2131558640);
     }
 
-    public final x0 g() {
-        return (x0) this.o.getValue((Fragment) this, i[0]);
+    public final y0 g() {
+        return (y0) this.o.getValue((Fragment) this, i[0]);
     }
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
@@ -138,17 +138,17 @@ public final class b extends AppDialog {
         requireDialog().setCanceledOnTouchOutside(true);
         TextView textView = g().d;
         m.checkNotNullExpressionValue(textView, "binding.premiumUpsellDescription");
-        c.a.l.b.n(textView, 2131892343, new Object[]{this.m}, null, 4);
+        c.a.l.b.m(textView, 2131892420, new Object[]{this.m}, null, 4);
         TextView textView2 = g().e;
         m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellServerPerk");
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        c.a.l.b.n(textView2, 2131892341, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755293, 2, 2)}, null, 4);
+        c.a.l.b.m(textView2, 2131892418, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755294, 2, 2)}, null, 4);
         TextView textView3 = g().b;
         m.checkNotNullExpressionValue(textView3, "binding.continueButton");
         textView3.setVisibility(this.n ^ true ? 0 : 8);
         g().b.setOnClickListener(new a(0, this));
         g().f.setOnClickListener(new a(1, this));
-        g().f174c.setOnClickListener(new a(2, this));
+        g().f182c.setOnClickListener(new a(2, this));
     }
 }
diff --git a/app/src/main/java/c/a/a/e/c.java b/app/src/main/java/c/a/a/e/c.java
new file mode 100644
index 0000000000..b079481f17
--- /dev/null
+++ b/app/src/main/java/c/a/a/e/c.java
@@ -0,0 +1,160 @@
+package c.a.a.e;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import c.a.i.g1;
+import com.discord.app.AppDialog;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.settings.premium.WidgetSettingsPremium;
+import com.google.android.material.button.MaterialButton;
+import d0.z.d.k;
+import d0.z.d.m;
+import java.util.Objects;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+/* compiled from: SingleValuePropPremiumUpsellDialog.kt */
+public final class c extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(c.class, "binding", "getBinding()Lcom/discord/databinding/SingleValuePropPremiumUpsellDialogBinding;", 0)};
+    public static final b j = new b(null);
+    public final FragmentViewBindingDelegate k = FragmentViewBindingDelegateKt.viewBinding$default(this, C0015c.i, null, 2, null);
+
+    /* compiled from: java-style lambda group */
+    public static final class a implements View.OnClickListener {
+        public final /* synthetic */ int i;
+        public final /* synthetic */ Object j;
+
+        public a(int i, Object obj) {
+            this.i = i;
+            this.j = obj;
+        }
+
+        @Override // android.view.View.OnClickListener
+        public final void onClick(View view) {
+            int i = this.i;
+            if (i != 0) {
+                String str = null;
+                if (i == 1) {
+                    c cVar = (c) this.j;
+                    KProperty[] kPropertyArr = c.i;
+                    Objects.requireNonNull(cVar);
+                    WidgetSettingsPremium.Companion companion = WidgetSettingsPremium.Companion;
+                    Context requireContext = cVar.requireContext();
+                    m.checkNotNullExpressionValue(requireContext, "requireContext()");
+                    Bundle arguments = cVar.getArguments();
+                    if (arguments != null) {
+                        str = arguments.getString("extra_section_name");
+                    }
+                    WidgetSettingsPremium.Companion.launch$default(companion, requireContext, null, str, 2, null);
+                    cVar.dismiss();
+                    return;
+                }
+                throw null;
+            }
+            ((c) this.j).dismiss();
+        }
+    }
+
+    /* compiled from: SingleValuePropPremiumUpsellDialog.kt */
+    public static final class b {
+        public b(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+    }
+
+    /* compiled from: SingleValuePropPremiumUpsellDialog.kt */
+    /* renamed from: c.a.a.e.c$c  reason: collision with other inner class name */
+    public static final /* synthetic */ class C0015c extends k implements Function1<View, g1> {
+        public static final C0015c i = new C0015c();
+
+        public C0015c() {
+            super(1, g1.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/SingleValuePropPremiumUpsellDialogBinding;", 0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public g1 invoke(View view) {
+            View view2 = view;
+            m.checkNotNullParameter(view2, "p1");
+            int i2 = 2131362196;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131362196);
+            if (linearLayout != null) {
+                i2 = 2131362656;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362656);
+                if (materialButton != null) {
+                    i2 = 2131362775;
+                    View findViewById = view2.findViewById(2131362775);
+                    if (findViewById != null) {
+                        i2 = 2131363290;
+                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363290);
+                        if (materialButton2 != null) {
+                            i2 = 2131365373;
+                            View findViewById2 = view2.findViewById(2131365373);
+                            if (findViewById2 != null) {
+                                i2 = 2131365418;
+                                TextView textView = (TextView) view2.findViewById(2131365418);
+                                if (textView != null) {
+                                    i2 = 2131365419;
+                                    TextView textView2 = (TextView) view2.findViewById(2131365419);
+                                    if (textView2 != null) {
+                                        i2 = 2131365535;
+                                        ImageView imageView = (ImageView) view2.findViewById(2131365535);
+                                        if (imageView != null) {
+                                            return new g1((LinearLayout) view2, linearLayout, materialButton, findViewById, materialButton2, findViewById2, textView, textView2, imageView);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
+        }
+    }
+
+    public c() {
+        super(2131558659);
+    }
+
+    public final g1 g() {
+        return (g1) this.k.getValue((Fragment) this, i[0]);
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBound(View view) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewBound(view);
+        Bundle arguments = getArguments();
+        String str = null;
+        Integer valueOf = arguments != null ? Integer.valueOf(arguments.getInt("extra_image_drawable_res")) : null;
+        Bundle arguments2 = getArguments();
+        String string = arguments2 != null ? arguments2.getString("extra_header_text") : null;
+        Bundle arguments3 = getArguments();
+        if (arguments3 != null) {
+            str = arguments3.getString("extra_body_text");
+        }
+        if (valueOf != null) {
+            g().f.setImageDrawable(ContextCompat.getDrawable(requireContext(), valueOf.intValue()));
+        }
+        if (string != null) {
+            TextView textView = g().e;
+            m.checkNotNullExpressionValue(textView, "binding.upsellHeaderText");
+            textView.setText(string);
+        }
+        if (str != null) {
+            TextView textView2 = g().d;
+            m.checkNotNullExpressionValue(textView2, "binding.upsellBodyText");
+            textView2.setText(str);
+        }
+        g().b.setOnClickListener(new a(0, this));
+        g().f95c.setOnClickListener(new a(1, this));
+    }
+}
diff --git a/app/src/main/java/c/a/a/a/c.java b/app/src/main/java/c/a/a/e/d.java
similarity index 74%
rename from app/src/main/java/c/a/a/a/c.java
rename to app/src/main/java/c/a/a/e/d.java
index 5feb842ce2..7a2ad13b4a 100644
--- a/app/src/main/java/c/a/a/a/c.java
+++ b/app/src/main/java/c/a/a/e/d.java
@@ -1,4 +1,4 @@
-package c.a.a.a;
+package c.a.a.e;
 
 import android.app.Dialog;
 import android.view.View;
@@ -7,7 +7,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
-import c.a.i.y0;
+import c.a.i.z0;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -21,14 +21,14 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
 /* compiled from: UpgradePremiumYearlyDialog.kt */
-public final class c extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(c.class, "binding", "getBinding()Lcom/discord/databinding/PremiumUpgradeYearlyDialogBinding;", 0)};
+public final class d extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(d.class, "binding", "getBinding()Lcom/discord/databinding/PremiumUpgradeYearlyDialogBinding;", 0)};
     public static final b j = new b(null);
     public Function0<Unit> k;
     public Function0<Unit> l;
     public String m;
     public boolean n;
-    public final FragmentViewBindingDelegate o = FragmentViewBindingDelegateKt.viewBinding$default(this, C0004c.i, null, 2, null);
+    public final FragmentViewBindingDelegate o = FragmentViewBindingDelegateKt.viewBinding$default(this, c.i, null, 2, null);
 
     /* compiled from: java-style lambda group */
     public static final class a implements View.OnClickListener {
@@ -44,17 +44,17 @@ public final class c extends AppDialog {
         public final void onClick(View view) {
             int i = this.i;
             if (i == 0) {
-                Function0<Unit> function0 = ((c) this.j).k;
+                Function0<Unit> function0 = ((d) this.j).k;
                 if (function0 != null) {
                     function0.mo1invoke();
                 }
-                ((c) this.j).dismiss();
+                ((d) this.j).dismiss();
             } else if (i == 1) {
-                Function0<Unit> function02 = ((c) this.j).l;
+                Function0<Unit> function02 = ((d) this.j).l;
                 if (function02 != null) {
                     function02.mo1invoke();
                 }
-                ((c) this.j).dismiss();
+                ((d) this.j).dismiss();
             } else {
                 throw null;
             }
@@ -68,36 +68,35 @@ public final class c extends AppDialog {
     }
 
     /* compiled from: UpgradePremiumYearlyDialog.kt */
-    /* renamed from: c.a.a.a.c$c  reason: collision with other inner class name */
-    public static final /* synthetic */ class C0004c extends k implements Function1<View, y0> {
-        public static final C0004c i = new C0004c();
+    public static final /* synthetic */ class c extends k implements Function1<View, z0> {
+        public static final c i = new c();
 
-        public C0004c() {
-            super(1, y0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumUpgradeYearlyDialogBinding;", 0);
+        public c() {
+            super(1, z0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumUpgradeYearlyDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public y0 invoke(View view) {
+        public z0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364328;
-            ImageView imageView = (ImageView) view2.findViewById(2131364328);
+            int i2 = 2131364364;
+            ImageView imageView = (ImageView) view2.findViewById(2131364364);
             if (imageView != null) {
-                i2 = 2131364333;
-                TextView textView = (TextView) view2.findViewById(2131364333);
+                i2 = 2131364369;
+                TextView textView = (TextView) view2.findViewById(2131364369);
                 if (textView != null) {
-                    i2 = 2131364334;
-                    TextView textView2 = (TextView) view2.findViewById(2131364334);
+                    i2 = 2131364370;
+                    TextView textView2 = (TextView) view2.findViewById(2131364370);
                     if (textView2 != null) {
-                        i2 = 2131364382;
-                        TextView textView3 = (TextView) view2.findViewById(2131364382);
+                        i2 = 2131364420;
+                        TextView textView3 = (TextView) view2.findViewById(2131364420);
                         if (textView3 != null) {
-                            i2 = 2131364383;
-                            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364383);
+                            i2 = 2131364421;
+                            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364421);
                             if (materialButton != null) {
-                                return new y0((LinearLayout) view2, imageView, textView, textView2, textView3, materialButton);
+                                return new z0((LinearLayout) view2, imageView, textView, textView2, textView3, materialButton);
                             }
                         }
                     }
@@ -107,12 +106,12 @@ public final class c extends AppDialog {
         }
     }
 
-    public c() {
-        super(2131558642);
+    public d() {
+        super(2131558641);
     }
 
-    public final y0 g() {
-        return (y0) this.o.getValue((Fragment) this, i[0]);
+    public final z0 g() {
+        return (z0) this.o.getValue((Fragment) this, i[0]);
     }
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
@@ -134,17 +133,17 @@ public final class c extends AppDialog {
         }
         requireDialog().setCanceledOnTouchOutside(true);
         boolean z2 = getArgumentsOrDefault().getBoolean("ARG_IS_TIER_1");
-        CharSequence j2 = c.a.l.b.j(this, z2 ? 2131892299 : 2131892301, new Object[0], null, 4);
+        CharSequence j2 = c.a.l.b.j(this, z2 ? 2131892376 : 2131892378, new Object[0], null, 4);
         TextView textView = g().d;
         m.checkNotNullExpressionValue(textView, "binding.premiumUpsellYearlyTitle");
-        c.a.l.b.n(textView, 2131892356, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f)), j2}, null, 4);
-        TextView textView2 = g().f180c;
+        c.a.l.b.m(textView, 2131892433, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f)), j2}, null, 4);
+        TextView textView2 = g().f187c;
         m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellYearlyDescription");
-        c.a.l.b.n(textView2, 2131892355, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f))}, null, 4);
+        c.a.l.b.m(textView2, 2131892432, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f))}, null, 4);
         MaterialButton materialButton = g().f;
         m.checkNotNullExpressionValue(materialButton, "binding.purchasePremiumYearly");
-        c.a.l.b.n(materialButton, 2131892354, new Object[]{this.m}, null, 4);
-        g().b.setImageResource(z2 ? 2131232223 : 2131232224);
+        c.a.l.b.m(materialButton, 2131892431, new Object[]{this.m}, null, 4);
+        g().b.setImageResource(z2 ? 2131232231 : 2131232232);
         TextView textView3 = g().e;
         m.checkNotNullExpressionValue(textView3, "binding.purchasePremiumMonthly");
         textView3.setVisibility(this.n ^ true ? 0 : 8);
diff --git a/app/src/main/java/c/a/a/a/d.java b/app/src/main/java/c/a/a/e/e.java
similarity index 80%
rename from app/src/main/java/c/a/a/a/d.java
rename to app/src/main/java/c/a/a/e/e.java
index 6c763dff8e..eb77b766bd 100644
--- a/app/src/main/java/c/a/a/a/d.java
+++ b/app/src/main/java/c/a/a/e/e.java
@@ -1,4 +1,4 @@
-package c.a.a.a;
+package c.a.a.e;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import c.a.i.s0;
+import c.a.i.t0;
 import com.discord.app.AppDialog;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -23,8 +23,8 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
 /* compiled from: PremiumActivatedDialog.kt */
-public final class d extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(d.class, "binding", "getBinding()Lcom/discord/databinding/PremiumActivatedDialogBinding;", 0)};
+public final class e extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(e.class, "binding", "getBinding()Lcom/discord/databinding/PremiumActivatedDialogBinding;", 0)};
     public static final a j = new a(null);
     public Function0<Unit> k;
     public final FragmentViewBindingDelegate l = FragmentViewBindingDelegateKt.viewBinding$default(this, b.i, null, 2, null);
@@ -37,48 +37,48 @@ public final class d extends AppDialog {
         public final void a(FragmentManager fragmentManager, Function0<Unit> function0, boolean z2) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(function0, "onDismiss");
-            d dVar = new d();
-            dVar.k = function0;
+            e eVar = new e();
+            eVar.k = function0;
             Bundle bundle = new Bundle();
             bundle.putBoolean("ARG_IS_TIER_1", z2);
-            dVar.setArguments(bundle);
-            dVar.show(fragmentManager, d.class.getSimpleName());
+            eVar.setArguments(bundle);
+            eVar.show(fragmentManager, e.class.getSimpleName());
         }
     }
 
     /* compiled from: PremiumActivatedDialog.kt */
-    public static final /* synthetic */ class b extends k implements Function1<View, s0> {
+    public static final /* synthetic */ class b extends k implements Function1<View, t0> {
         public static final b i = new b();
 
         public b() {
-            super(1, s0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumActivatedDialogBinding;", 0);
+            super(1, t0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumActivatedDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public s0 invoke(View view) {
+        public t0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364240;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364240);
+            int i2 = 2131364284;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364284);
             if (materialButton != null) {
-                i2 = 2131364241;
-                TextView textView = (TextView) view2.findViewById(2131364241);
+                i2 = 2131364285;
+                TextView textView = (TextView) view2.findViewById(2131364285);
                 if (textView != null) {
-                    i2 = 2131364242;
-                    ImageView imageView = (ImageView) view2.findViewById(2131364242);
+                    i2 = 2131364286;
+                    ImageView imageView = (ImageView) view2.findViewById(2131364286);
                     if (imageView != null) {
-                        i2 = 2131364243;
-                        ImageView imageView2 = (ImageView) view2.findViewById(2131364243);
+                        i2 = 2131364287;
+                        ImageView imageView2 = (ImageView) view2.findViewById(2131364287);
                         if (imageView2 != null) {
-                            i2 = 2131364244;
-                            ImageView imageView3 = (ImageView) view2.findViewById(2131364244);
+                            i2 = 2131364288;
+                            ImageView imageView3 = (ImageView) view2.findViewById(2131364288);
                             if (imageView3 != null) {
-                                i2 = 2131364245;
-                                ImageView imageView4 = (ImageView) view2.findViewById(2131364245);
+                                i2 = 2131364289;
+                                ImageView imageView4 = (ImageView) view2.findViewById(2131364289);
                                 if (imageView4 != null) {
-                                    return new s0((LinearLayout) view2, materialButton, textView, imageView, imageView2, imageView3, imageView4);
+                                    return new t0((LinearLayout) view2, materialButton, textView, imageView, imageView2, imageView3, imageView4);
                                 }
                             }
                         }
@@ -91,10 +91,10 @@ public final class d extends AppDialog {
 
     /* compiled from: PremiumActivatedDialog.kt */
     public static final class c implements View.OnClickListener {
-        public final /* synthetic */ d i;
+        public final /* synthetic */ e i;
 
-        public c(d dVar) {
-            this.i = dVar;
+        public c(e eVar) {
+            this.i = eVar;
         }
 
         @Override // android.view.View.OnClickListener
@@ -107,12 +107,12 @@ public final class d extends AppDialog {
         }
     }
 
-    public d() {
-        super(2131558634);
+    public e() {
+        super(2131558635);
     }
 
-    public final s0 g() {
-        return (s0) this.l.getValue((Fragment) this, i[0]);
+    public final t0 g() {
+        return (t0) this.l.getValue((Fragment) this, i[0]);
     }
 
     @Override // com.discord.app.AppDialog, androidx.fragment.app.Fragment
@@ -123,9 +123,9 @@ public final class d extends AppDialog {
             dismiss();
         }
         boolean z2 = getArgumentsOrDefault().getBoolean("ARG_IS_TIER_1");
-        int i3 = z2 ? 2131230924 : 2131230928;
-        int i4 = z2 ? 2131232176 : 2131232165;
-        int i5 = z2 ? 2131232254 : 2131232252;
+        int i3 = z2 ? 2131230927 : 2131230931;
+        int i4 = z2 ? 2131232184 : 2131232173;
+        int i5 = z2 ? 2131232263 : 2131232261;
         if (z2) {
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
@@ -143,7 +143,7 @@ public final class d extends AppDialog {
         m.checkNotNullExpressionValue(imageView, "binding.premiumActivatedWumpus");
         imageView.setScaleX(z2 ? 1.0f : -1.0f);
         g().f.setImageDrawable(ContextCompat.getDrawable(requireContext(), i2));
-        TextView textView = g().f148c;
+        TextView textView = g().f156c;
         m.checkNotNullExpressionValue(textView, "binding.premiumActivatedDescription");
         textView.setText(getString(i6));
         requireDialog().setCanceledOnTouchOutside(true);
diff --git a/app/src/main/java/c/a/a/a/e.java b/app/src/main/java/c/a/a/e/f.java
similarity index 80%
rename from app/src/main/java/c/a/a/a/e.java
rename to app/src/main/java/c/a/a/e/f.java
index 0d6a98cef2..3783fea6b9 100644
--- a/app/src/main/java/c/a/a/a/e.java
+++ b/app/src/main/java/c/a/a/e/f.java
@@ -1,11 +1,11 @@
-package c.a.a.a;
+package c.a.a.e;
 
 import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
-import c.a.i.t0;
+import c.a.i.u0;
 import com.discord.app.AppDialog;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -18,8 +18,8 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
 /* compiled from: PremiumAndPremiumGuildActivatedDialog.kt */
-public final class e extends AppDialog {
-    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(e.class, "binding", "getBinding()Lcom/discord/databinding/PremiumAndPremiumGuildActivatedDialogBinding;", 0)};
+public final class f extends AppDialog {
+    public static final /* synthetic */ KProperty[] i = {c.d.b.a.a.W(f.class, "binding", "getBinding()Lcom/discord/databinding/PremiumAndPremiumGuildActivatedDialogBinding;", 0)};
     public static final a j = new a(null);
     public Function0<Unit> k;
     public final FragmentViewBindingDelegate l = FragmentViewBindingDelegateKt.viewBinding$default(this, b.i, null, 2, null);
@@ -31,26 +31,26 @@ public final class e extends AppDialog {
     }
 
     /* compiled from: PremiumAndPremiumGuildActivatedDialog.kt */
-    public static final /* synthetic */ class b extends k implements Function1<View, t0> {
+    public static final /* synthetic */ class b extends k implements Function1<View, u0> {
         public static final b i = new b();
 
         public b() {
-            super(1, t0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumAndPremiumGuildActivatedDialogBinding;", 0);
+            super(1, u0.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/PremiumAndPremiumGuildActivatedDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public t0 invoke(View view) {
+        public u0 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364240;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364240);
+            int i2 = 2131364284;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364284);
             if (materialButton != null) {
-                i2 = 2131364246;
-                TextView textView = (TextView) view2.findViewById(2131364246);
+                i2 = 2131364290;
+                TextView textView = (TextView) view2.findViewById(2131364290);
                 if (textView != null) {
-                    return new t0((LinearLayout) view2, materialButton, textView);
+                    return new u0((LinearLayout) view2, materialButton, textView);
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(view2.getResources().getResourceName(i2)));
@@ -59,10 +59,10 @@ public final class e extends AppDialog {
 
     /* compiled from: PremiumAndPremiumGuildActivatedDialog.kt */
     public static final class c implements View.OnClickListener {
-        public final /* synthetic */ e i;
+        public final /* synthetic */ f i;
 
-        public c(e eVar) {
-            this.i = eVar;
+        public c(f fVar) {
+            this.i = fVar;
         }
 
         @Override // android.view.View.OnClickListener
@@ -75,8 +75,8 @@ public final class e extends AppDialog {
         }
     }
 
-    public e() {
-        super(2131558635);
+    public f() {
+        super(2131558636);
     }
 
     @Override // com.discord.app.AppDialog
@@ -93,10 +93,10 @@ public final class e extends AppDialog {
         m.checkNotNullExpressionValue(str, "arguments?.getString(EXTRA_PLAN_NAME) ?: \"\"");
         FragmentViewBindingDelegate fragmentViewBindingDelegate = this.l;
         KProperty<?>[] kPropertyArr = i;
-        TextView textView = ((t0) fragmentViewBindingDelegate.getValue((Fragment) this, kPropertyArr[0])).f153c;
+        TextView textView = ((u0) fragmentViewBindingDelegate.getValue((Fragment) this, kPropertyArr[0])).f162c;
         m.checkNotNullExpressionValue(textView, "binding.premiumAndPremiumGuildActivatedText");
-        c.a.l.b.n(textView, 2131886939, new Object[]{str}, null, 4);
+        c.a.l.b.m(textView, 2131886939, new Object[]{str}, null, 4);
         requireDialog().setCanceledOnTouchOutside(true);
-        ((t0) this.l.getValue((Fragment) this, kPropertyArr[0])).b.setOnClickListener(new c(this));
+        ((u0) this.l.getValue((Fragment) this, kPropertyArr[0])).b.setOnClickListener(new c(this));
     }
 }
diff --git a/app/src/main/java/c/a/a/f/a.java b/app/src/main/java/c/a/a/f/a.java
index 481d7a0ab2..b3449d8ade 100644
--- a/app/src/main/java/c/a/a/f/a.java
+++ b/app/src/main/java/c/a/a/f/a.java
@@ -6,7 +6,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
-import c.a.i.v4;
+import c.a.i.y4;
 import com.discord.app.AppDialog;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStream;
@@ -78,35 +78,35 @@ public final class a extends AppDialog {
     }
 
     /* compiled from: WidgetMaskedLinksDialog.kt */
-    public static final /* synthetic */ class c extends k implements Function1<View, v4> {
+    public static final /* synthetic */ class c extends k implements Function1<View, y4> {
         public static final c i = new c();
 
         public c() {
-            super(1, v4.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetMaskedLinksDialogBinding;", 0);
+            super(1, y4.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetMaskedLinksDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public v4 invoke(View view) {
+        public y4 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363788;
-            TextView textView = (TextView) view2.findViewById(2131363788);
+            int i2 = 2131363829;
+            TextView textView = (TextView) view2.findViewById(2131363829);
             if (textView != null) {
-                i2 = 2131363789;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363789);
+                i2 = 2131363830;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363830);
                 if (materialButton != null) {
-                    i2 = 2131363790;
-                    MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363790);
+                    i2 = 2131363831;
+                    MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363831);
                     if (materialButton2 != null) {
-                        i2 = 2131363791;
-                        TextView textView2 = (TextView) view2.findViewById(2131363791);
+                        i2 = 2131363832;
+                        TextView textView2 = (TextView) view2.findViewById(2131363832);
                         if (textView2 != null) {
-                            i2 = 2131365491;
-                            TextView textView3 = (TextView) view2.findViewById(2131365491);
+                            i2 = 2131365552;
+                            TextView textView3 = (TextView) view2.findViewById(2131365552);
                             if (textView3 != null) {
-                                return new v4((LinearLayout) view2, textView, materialButton, materialButton2, textView2, textView3);
+                                return new y4((LinearLayout) view2, textView, materialButton, materialButton2, textView2, textView3);
                             }
                         }
                     }
@@ -131,11 +131,11 @@ public final class a extends AppDialog {
     }
 
     public a() {
-        super(2131559077);
+        super(2131559083);
     }
 
-    public final v4 g() {
-        return (v4) this.k.getValue((Fragment) this, i[0]);
+    public final y4 g() {
+        return (y4) this.k.getValue((Fragment) this, i[0]);
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -165,8 +165,8 @@ public final class a extends AppDialog {
         }
         TextView textView = g().b;
         m.checkNotNullExpressionValue(textView, "binding.maskedLinksBodyText");
-        c.a.l.b.n(textView, 2131890973, new Object[]{obj}, null, 4);
-        g().f169c.setOnClickListener(new d(this));
+        c.a.l.b.m(textView, 2131891044, new Object[]{obj}, null, 4);
+        g().f185c.setOnClickListener(new d(this));
         g().d.setOnClickListener(new View$OnClickListenerC0016a(0, this, str));
         g().e.setOnClickListener(new View$OnClickListenerC0016a(1, this, str));
     }
diff --git a/app/src/main/java/c/a/a/g.java b/app/src/main/java/c/a/a/g.java
index 28fef8568e..1eb1ade47e 100644
--- a/app/src/main/java/c/a/a/g.java
+++ b/app/src/main/java/c/a/a/g.java
@@ -84,8 +84,8 @@ public final class g extends AppDialog {
                     i2 = 2131361858;
                     MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131361858);
                     if (materialButton2 != null) {
-                        i2 = 2131365491;
-                        TextView textView2 = (TextView) view2.findViewById(2131365491);
+                        i2 = 2131365552;
+                        TextView textView2 = (TextView) view2.findViewById(2131365552);
                         if (textView2 != null) {
                             return new c.a.i.a((LinearLayout) view2, textView, materialButton, materialButton2, textView2);
                         }
@@ -132,10 +132,10 @@ public final class g extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        h().f59c.setOnClickListener(new a(0, this));
+        h().f58c.setOnClickListener(new a(0, this));
         h().d.setOnClickListener(new a(1, this));
         TextView textView = h().b;
         m.checkNotNullExpressionValue(textView, "binding.accessibilityDetectionBodyText");
-        c.a.l.b.n(textView, 2131886119, new Object[]{f.a.a(360035966492L, null)}, null, 4);
+        c.a.l.b.m(textView, 2131886119, new Object[]{f.a.a(360035966492L, null)}, null, 4);
     }
 }
diff --git a/app/src/main/java/c/a/a/h.java b/app/src/main/java/c/a/a/h.java
index 098ed69460..4a8c016fbc 100644
--- a/app/src/main/java/c/a/a/h.java
+++ b/app/src/main/java/c/a/a/h.java
@@ -48,7 +48,7 @@ public final class h extends AppDialog {
                 m.checkNotNullExpressionValue(requireContext2, "requireContext()");
                 String str = (String) this.k;
                 m.checkNotNullExpressionValue(str, "username");
-                o.a(requireContext2, str, 2131887622);
+                o.a(requireContext2, str, 2131887621);
                 ((h) this.j).dismiss();
             } else {
                 throw null;
@@ -76,14 +76,14 @@ public final class h extends AppDialog {
         public c.a.i.h invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362679;
-            TextView textView = (TextView) view2.findViewById(2131362679);
+            int i2 = 2131362703;
+            TextView textView = (TextView) view2.findViewById(2131362703);
             if (textView != null) {
-                i2 = 2131362680;
-                TextView textView2 = (TextView) view2.findViewById(2131362680);
+                i2 = 2131362704;
+                TextView textView2 = (TextView) view2.findViewById(2131362704);
                 if (textView2 != null) {
-                    i2 = 2131362681;
-                    TextView textView3 = (TextView) view2.findViewById(2131362681);
+                    i2 = 2131362705;
+                    TextView textView3 = (TextView) view2.findViewById(2131362705);
                     if (textView3 != null) {
                         return new c.a.i.h((LinearLayout) view2, textView, textView2, textView3);
                     }
@@ -109,11 +109,11 @@ public final class h extends AppDialog {
         String string2 = getArgumentsOrDefault().getString("ARG_USERNAME", "");
         int i2 = getArgumentsOrDefault().getInt("ARG_PLATFORM_IMAGE_RES", 0);
         if (i2 != 0) {
-            TextView textView = g().f98c;
+            TextView textView = g().f99c;
             m.checkNotNullExpressionValue(textView, "binding.connectedAccountActionsDialogHeader");
             ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView, i2, 0, 0, 0, 14, null);
         }
-        TextView textView2 = g().f98c;
+        TextView textView2 = g().f99c;
         m.checkNotNullExpressionValue(textView2, "binding.connectedAccountActionsDialogHeader");
         textView2.setText(string2);
         TextView textView3 = g().d;
diff --git a/app/src/main/java/c/a/a/i.java b/app/src/main/java/c/a/a/i.java
index be733df14c..58060577a5 100644
--- a/app/src/main/java/c/a/a/i.java
+++ b/app/src/main/java/c/a/a/i.java
@@ -51,14 +51,14 @@ public final class i extends AppDialog {
         public e invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362207;
-            TextView textView = (TextView) view2.findViewById(2131362207);
+            int i2 = 2131362218;
+            TextView textView = (TextView) view2.findViewById(2131362218);
             if (textView != null) {
-                i2 = 2131362208;
-                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362208);
+                i2 = 2131362219;
+                MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362219);
                 if (materialButton != null) {
-                    i2 = 2131364030;
-                    LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030);
+                    i2 = 2131364073;
+                    LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364073);
                     if (linearLayout != null) {
                         return new e((LinearLayout) view2, textView, materialButton, linearLayout);
                     }
@@ -92,11 +92,11 @@ public final class i extends AppDialog {
         requireDialog().setCanceledOnTouchOutside(true);
         FragmentViewBindingDelegate fragmentViewBindingDelegate = this.k;
         KProperty<?>[] kPropertyArr = i;
-        ((e) fragmentViewBindingDelegate.getValue((Fragment) this, kPropertyArr[0])).f83c.setOnClickListener(new c(this));
+        ((e) fragmentViewBindingDelegate.getValue((Fragment) this, kPropertyArr[0])).f82c.setOnClickListener(new c(this));
         Bundle arguments = getArguments();
         Integer valueOf = arguments != null ? Integer.valueOf(arguments.getInt("ARG_MAX_VIDEO_CHANNEL_USERS")) : null;
         TextView textView = ((e) this.k.getValue((Fragment) this, kPropertyArr[0])).b;
         m.checkNotNullExpressionValue(textView, "binding.cameraCapacityBody");
-        textView.setText(c.a.l.b.j(this, 2131894478, new Object[]{String.valueOf(valueOf)}, null, 4));
+        textView.setText(c.a.l.b.j(this, 2131894597, new Object[]{String.valueOf(valueOf)}, null, 4));
     }
 }
diff --git a/app/src/main/java/c/a/a/j.java b/app/src/main/java/c/a/a/j.java
index aabb91e32d..cc97ad047c 100644
--- a/app/src/main/java/c/a/a/j.java
+++ b/app/src/main/java/c/a/a/j.java
@@ -61,14 +61,14 @@ public final class j extends AppDialog {
         public c.a.i.k invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362884;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362884);
+            int i2 = 2131362909;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362909);
             if (materialButton != null) {
-                i2 = 2131362885;
-                DatePicker datePicker = (DatePicker) view2.findViewById(2131362885);
+                i2 = 2131362910;
+                DatePicker datePicker = (DatePicker) view2.findViewById(2131362910);
                 if (datePicker != null) {
-                    i2 = 2131362886;
-                    TextView textView = (TextView) view2.findViewById(2131362886);
+                    i2 = 2131362911;
+                    TextView textView = (TextView) view2.findViewById(2131362911);
                     if (textView != null) {
                         return new c.a.i.k((LinearLayout) view2, materialButton, datePicker, textView);
                     }
@@ -132,7 +132,7 @@ public final class j extends AppDialog {
     @Override // com.discord.app.AppDialog, androidx.fragment.app.Fragment
     public void onPause() {
         super.onPause();
-        g().f114c.clearFocus();
+        g().f113c.clearFocus();
     }
 
     @Override // com.discord.app.AppDialog
@@ -146,12 +146,12 @@ public final class j extends AppDialog {
             charSequence = "";
         }
         textView.setText(charSequence);
-        DatePicker datePicker = g().f114c;
+        DatePicker datePicker = g().f113c;
         m.checkNotNullExpressionValue(datePicker, "binding.dialogDatePickerInput");
         Bundle arguments2 = getArguments();
         long j2 = 0;
         datePicker.setMaxDate(arguments2 != null ? arguments2.getLong("max_date") : 0);
-        DatePicker datePicker2 = g().f114c;
+        DatePicker datePicker2 = g().f113c;
         m.checkNotNullExpressionValue(datePicker2, "binding.dialogDatePickerInput");
         datePicker2.setMinDate(BirthdayHelper.INSTANCE.subtractYearsFromToday(150));
         Bundle arguments3 = getArguments();
@@ -165,7 +165,7 @@ public final class j extends AppDialog {
         Calendar instance = Calendar.getInstance();
         m.checkNotNullExpressionValue(instance, "calendar");
         instance.setTimeInMillis(this.l);
-        g().f114c.init(instance.get(1), instance.get(2), instance.get(5), new c(this));
+        g().f113c.init(instance.get(1), instance.get(2), instance.get(5), new c(this));
         g().b.setOnClickListener(new d(this));
     }
 }
diff --git a/app/src/main/java/c/a/a/k.java b/app/src/main/java/c/a/a/k.java
index 4a0edac821..3e141a8a78 100644
--- a/app/src/main/java/c/a/a/k.java
+++ b/app/src/main/java/c/a/a/k.java
@@ -20,7 +20,7 @@ public final class k extends o implements Function1<View, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(View view) {
         m.checkNotNullParameter(view, "<anonymous parameter 0>");
-        this.$onConfirm.invoke(2131888796);
+        this.$onConfirm.invoke(2131888797);
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a/l.java b/app/src/main/java/c/a/a/l.java
index d2a0245829..dd57e40db4 100644
--- a/app/src/main/java/c/a/a/l.java
+++ b/app/src/main/java/c/a/a/l.java
@@ -45,11 +45,11 @@ public final class l extends AppDialog {
         public s invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363461;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363461);
+            int i2 = 2131363502;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363502);
             if (materialButton != null) {
-                i2 = 2131364030;
-                LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030);
+                i2 = 2131364073;
+                LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364073);
                 if (linearLayout != null) {
                     return new s((LinearLayout) view2, materialButton, linearLayout);
                 }
diff --git a/app/src/main/java/c/a/a/m.java b/app/src/main/java/c/a/a/m.java
index 9baf79c1d2..0b05b2e4ec 100644
--- a/app/src/main/java/c/a/a/m.java
+++ b/app/src/main/java/c/a/a/m.java
@@ -95,14 +95,14 @@ public final class m extends AppDialog {
         public l invoke(View view) {
             View view2 = view;
             d0.z.d.m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131362865;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362865);
+            int i2 = 2131362890;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362890);
             if (materialButton != null) {
-                i2 = 2131362889;
-                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131362889);
+                i2 = 2131362914;
+                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131362914);
                 if (maxHeightRecyclerView != null) {
-                    i2 = 2131362890;
-                    TextView textView = (TextView) view2.findViewById(2131362890);
+                    i2 = 2131362915;
+                    TextView textView = (TextView) view2.findViewById(2131362915);
                     if (textView != null) {
                         return new l((LinearLayout) view2, materialButton, maxHeightRecyclerView, textView);
                     }
@@ -176,10 +176,10 @@ public final class m extends AppDialog {
         g().b.setOnClickListener(new d(this));
         CharSequence[] charSequenceArray = getArgumentsOrDefault().getCharSequenceArray("INTENT_DIALOG_OPTIONS");
         if (charSequenceArray != null) {
-            MaxHeightRecyclerView maxHeightRecyclerView = g().f120c;
+            MaxHeightRecyclerView maxHeightRecyclerView = g().f117c;
             d0.z.d.m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.dialogSelections");
             maxHeightRecyclerView.setAdapter(new SimpleRecyclerAdapter(j.asList(charSequenceArray), new e(this)));
-            MaxHeightRecyclerView maxHeightRecyclerView2 = g().f120c;
+            MaxHeightRecyclerView maxHeightRecyclerView2 = g().f117c;
             RecyclerView.Adapter adapter = maxHeightRecyclerView2.getAdapter();
             if (adapter != null) {
                 adapter.notifyDataSetChanged();
@@ -187,7 +187,7 @@ public final class m extends AppDialog {
             maxHeightRecyclerView2.setHasFixedSize(false);
             maxHeightRecyclerView2.setNestedScrollingEnabled(false);
             SimpleRecyclerAdapter.Companion companion = SimpleRecyclerAdapter.Companion;
-            MaxHeightRecyclerView maxHeightRecyclerView3 = g().f120c;
+            MaxHeightRecyclerView maxHeightRecyclerView3 = g().f117c;
             d0.z.d.m.checkNotNullExpressionValue(maxHeightRecyclerView3, "binding.dialogSelections");
             companion.addThemedDivider(maxHeightRecyclerView3);
         }
diff --git a/app/src/main/java/c/a/a/q.java b/app/src/main/java/c/a/a/q.java
index 2b2e8fb1a7..471a621f4c 100644
--- a/app/src/main/java/c/a/a/q.java
+++ b/app/src/main/java/c/a/a/q.java
@@ -5,7 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import c.a.i.p4;
+import c.a.i.s4;
 import com.discord.api.auth.mfa.EnableMfaResponse;
 import com.discord.app.AppDialog;
 import com.discord.restapi.RestAPIParams;
@@ -41,41 +41,41 @@ public final class q extends AppDialog {
     }
 
     /* compiled from: WidgetEnableTwoFactorPasswordDialog.kt */
-    public static final /* synthetic */ class b extends k implements Function1<View, p4> {
+    public static final /* synthetic */ class b extends k implements Function1<View, s4> {
         public static final b i = new b();
 
         public b() {
-            super(1, p4.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetEnableTwoFactorPasswordDialogBinding;", 0);
+            super(1, s4.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetEnableTwoFactorPasswordDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public p4 invoke(View view) {
+        public s4 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363054;
-            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131363054);
+            int i2 = 2131363079;
+            LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131363079);
             if (linearLayout != null) {
-                i2 = 2131363055;
-                TextView textView = (TextView) view2.findViewById(2131363055);
+                i2 = 2131363080;
+                TextView textView = (TextView) view2.findViewById(2131363080);
                 if (textView != null) {
-                    i2 = 2131363056;
-                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363056);
+                    i2 = 2131363081;
+                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363081);
                     if (materialButton != null) {
-                        i2 = 2131363057;
-                        TextView textView2 = (TextView) view2.findViewById(2131363057);
+                        i2 = 2131363082;
+                        TextView textView2 = (TextView) view2.findViewById(2131363082);
                         if (textView2 != null) {
-                            i2 = 2131363058;
-                            LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(2131363058);
+                            i2 = 2131363083;
+                            LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(2131363083);
                             if (linearLayout2 != null) {
-                                i2 = 2131363059;
-                                LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131363059);
+                                i2 = 2131363084;
+                                LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131363084);
                                 if (loadingButton != null) {
-                                    i2 = 2131363060;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view2.findViewById(2131363060);
+                                    i2 = 2131363085;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view2.findViewById(2131363085);
                                     if (textInputLayout != null) {
-                                        return new p4((LinearLayout) view2, linearLayout, textView, materialButton, textView2, linearLayout2, loadingButton, textInputLayout);
+                                        return new s4((LinearLayout) view2, linearLayout, textView, materialButton, textView2, linearLayout2, loadingButton, textInputLayout);
                                     }
                                 }
                             }
@@ -144,7 +144,7 @@ public final class q extends AppDialog {
                 m.checkNotNullParameter(error2, "error");
                 q qVar = this.this$0.i;
                 KProperty[] kPropertyArr = q.i;
-                qVar.g().f140c.setIsLoading(false);
+                qVar.g().f154c.setIsLoading(false);
                 Error.Response response = error2.getResponse();
                 m.checkNotNullExpressionValue(response, "error.response");
                 if (response.getCode() == 60005) {
@@ -172,7 +172,7 @@ public final class q extends AppDialog {
             TextInputLayout textInputLayout = qVar.g().d;
             m.checkNotNullExpressionValue(textInputLayout, "binding.enableTwoFactorPasswordViewInput");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
-            this.i.g().f140c.setIsLoading(true);
+            this.i.g().f154c.setIsLoading(true);
             Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().enableMFA(new RestAPIParams.EnableMFA("random code", "random secret", textOrEmpty)), false, 1, null), this.i, null, 2, null);
             a aVar = a.i;
             ObservableExtensionsKt.appSubscribe$default(ui$default, this.i.getClass(), this.j.getContext(), (Function1) null, new b(this), (Function0) null, (Function0) null, aVar, 52, (Object) null);
@@ -197,11 +197,11 @@ public final class q extends AppDialog {
     }
 
     public q() {
-        super(2131558998);
+        super(2131559002);
     }
 
-    public final p4 g() {
-        return (p4) this.k.getValue((Fragment) this, i[0]);
+    public final s4 g() {
+        return (s4) this.k.getValue((Fragment) this, i[0]);
     }
 
     @Override // com.discord.app.AppDialog
@@ -209,8 +209,8 @@ public final class q extends AppDialog {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setCancelable(false);
-        g().f140c.setIsLoading(false);
-        g().f140c.setOnClickListener(new d(this, view));
+        g().f154c.setIsLoading(false);
+        g().f154c.setOnClickListener(new d(this, view));
         g().b.setOnClickListener(new e(this));
     }
 }
diff --git a/app/src/main/java/c/a/a/r.java b/app/src/main/java/c/a/a/r.java
index 54adca9991..a2868ecbc1 100644
--- a/app/src/main/java/c/a/a/r.java
+++ b/app/src/main/java/c/a/a/r.java
@@ -9,7 +9,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.a.v;
 import c.a.d.h0;
 import c.a.d.j0;
-import c.a.i.i5;
+import c.a.i.l5;
 import com.discord.app.AppDialog;
 import com.discord.app.AppViewModel;
 import com.discord.stores.StoreStream;
@@ -44,29 +44,29 @@ public final class r extends AppDialog {
     }
 
     /* compiled from: WidgetUrgentMessageDialog.kt */
-    public static final /* synthetic */ class b extends k implements Function1<View, i5> {
+    public static final /* synthetic */ class b extends k implements Function1<View, l5> {
         public static final b i = new b();
 
         public b() {
-            super(1, i5.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetUrgentMessageDialogBinding;", 0);
+            super(1, l5.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetUrgentMessageDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public i5 invoke(View view) {
+        public l5 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131365490;
-            LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131365490);
+            int i2 = 2131365551;
+            LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131365551);
             if (loadingButton != null) {
-                i2 = 2131365491;
-                TextView textView = (TextView) view2.findViewById(2131365491);
+                i2 = 2131365552;
+                TextView textView = (TextView) view2.findViewById(2131365552);
                 if (textView != null) {
-                    i2 = 2131365492;
-                    TextView textView2 = (TextView) view2.findViewById(2131365492);
+                    i2 = 2131365553;
+                    TextView textView2 = (TextView) view2.findViewById(2131365553);
                     if (textView2 != null) {
-                        return new i5((LinearLayout) view2, loadingButton, textView, textView2);
+                        return new l5((LinearLayout) view2, loadingButton, textView, textView2);
                     }
                 }
             }
@@ -92,13 +92,13 @@ public final class r extends AppDialog {
             m.checkNotNullParameter(dVar2, "viewState");
             r rVar = this.this$0;
             KProperty[] kPropertyArr = r.i;
-            TextView textView = rVar.g().f107c;
+            TextView textView = rVar.g().f123c;
             m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader");
-            textView.setText(rVar.getString(2131893727));
+            textView.setText(rVar.getString(2131893824));
             TextView textView2 = rVar.g().d;
             m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText");
-            textView2.setText(rVar.getString(2131893726));
-            rVar.g().b.setText(rVar.getString(2131891666));
+            textView2.setText(rVar.getString(2131893823));
+            rVar.g().b.setText(rVar.getString(2131891735));
             rVar.g().b.setIsLoading(dVar2.b);
             rVar.g().b.setOnClickListener(new s(rVar));
             return Unit.a;
@@ -127,7 +127,7 @@ public final class r extends AppDialog {
             if (m.areEqual(bVar2, v.b.a.a)) {
                 rVar.dismiss();
             } else if (m.areEqual(bVar2, v.b.C0018b.a)) {
-                c.a.d.o.g(rVar.getContext(), 2131890463, 0, null, 12);
+                c.a.d.o.g(rVar.getContext(), 2131890529, 0, null, 12);
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -152,14 +152,14 @@ public final class r extends AppDialog {
     }
 
     public r() {
-        super(2131559256);
+        super(2131559265);
         e eVar = e.i;
         h0 h0Var = new h0(this);
         this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(v.class), new m(1, h0Var), new j0(eVar));
     }
 
-    public final i5 g() {
-        return (i5) this.k.getValue((Fragment) this, i[0]);
+    public final l5 g() {
+        return (l5) this.k.getValue((Fragment) this, i[0]);
     }
 
     public final v h() {
diff --git a/app/src/main/java/c/a/a/v.java b/app/src/main/java/c/a/a/v.java
index 2390dd044e..f2e4edc359 100644
--- a/app/src/main/java/c/a/a/v.java
+++ b/app/src/main/java/c/a/a/v.java
@@ -139,7 +139,7 @@ public final class v extends AppViewModel<d> {
         RestAPI api = (i2 & 1) != 0 ? RestAPI.Companion.getApi() : null;
         StoreUser users = (i2 & 2) != 0 ? StoreStream.Companion.getUsers() : null;
         if ((i2 & 4) != 0) {
-            observable2 = StoreUser.observeMe$default(users, false, 1, null).G(u.i);
+            observable2 = StoreUser.observeMe$default(users, false, 1, null).F(u.i);
             m.checkNotNullExpressionValue(observable2, "storeUser.observeMe().ma…oreState(user = meUser) }");
         } else {
             observable2 = null;
@@ -149,6 +149,6 @@ public final class v extends AppViewModel<d> {
         m.checkNotNullParameter(observable2, "storeObservable");
         this.k = api;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable2), this, null, 2, null), v.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new t(this), 62, (Object) null);
-        this.j = PublishSubject.l0();
+        this.j = PublishSubject.k0();
     }
 }
diff --git a/app/src/main/java/c/a/a/y/a.java b/app/src/main/java/c/a/a/y/a.java
index 1f89a3c259..3038e1cf6d 100644
--- a/app/src/main/java/c/a/a/y/a.java
+++ b/app/src/main/java/c/a/a/y/a.java
@@ -61,26 +61,26 @@ public final class a extends AppDialog {
         public p invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131363293;
-            TextView textView = (TextView) view2.findViewById(2131363293);
+            int i2 = 2131363319;
+            TextView textView = (TextView) view2.findViewById(2131363319);
             if (textView != null) {
-                i2 = 2131363294;
-                RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363294);
+                i2 = 2131363320;
+                RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363320);
                 if (relativeLayout != null) {
-                    i2 = 2131363296;
-                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363296);
+                    i2 = 2131363322;
+                    MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363322);
                     if (materialButton != null) {
-                        i2 = 2131363301;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(2131363301);
+                        i2 = 2131363327;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(2131363327);
                         if (linkifiedTextView != null) {
-                            i2 = 2131363302;
-                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363302);
+                            i2 = 2131363328;
+                            MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363328);
                             if (materialButton2 != null) {
-                                i2 = 2131363303;
-                                TextView textView2 = (TextView) view2.findViewById(2131363303);
+                                i2 = 2131363329;
+                                TextView textView2 = (TextView) view2.findViewById(2131363329);
                                 if (textView2 != null) {
-                                    i2 = 2131363304;
-                                    ImageView imageView = (ImageView) view2.findViewById(2131363304);
+                                    i2 = 2131363330;
+                                    ImageView imageView = (ImageView) view2.findViewById(2131363330);
                                     if (imageView != null) {
                                         return new p((LinearLayout) view2, textView, relativeLayout, materialButton, linkifiedTextView, materialButton2, textView2, imageView);
                                     }
@@ -160,8 +160,8 @@ public final class a extends AppDialog {
                 KProperty[] kPropertyArr = a.i;
                 MaterialButton materialButton = aVar.g().d;
                 m.checkNotNullExpressionValue(materialButton, "binding.giftEntitlementCopy");
-                materialButton.setText(context.getString(2131887621));
-                this.i.g().f137c.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969333, 0, 2, (Object) null));
+                materialButton.setText(context.getString(2131887620));
+                this.i.g().f139c.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969333, 0, 2, (Object) null));
             }
         }
     }
@@ -196,7 +196,7 @@ public final class a extends AppDialog {
         }
         LinkifiedTextView linkifiedTextView = g().e;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.giftLinkSubtext");
-        c.a.l.b.m(linkifiedTextView, 2131886538, new Object[0], new d(this));
+        c.a.l.b.l(linkifiedTextView, 2131886538, new Object[0], new d(this));
         GiftingUtils giftingUtils = GiftingUtils.INSTANCE;
         Integer iconForSku = giftingUtils.getIconForSku(inAppSku);
         if (iconForSku != null) {
@@ -205,7 +205,7 @@ public final class a extends AppDialog {
         Pair pair = SubscriptionPlanType.Companion.from(inAppSku.getPaymentGatewaySkuId()).getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131886533, 2131755023) : new Pair(2131886536, 2131755026);
         int intValue = ((Number) pair.component1()).intValue();
         int intValue2 = ((Number) pair.component2()).intValue();
-        String string2 = getString(giftingUtils.getTierForSku(inAppSku.getSkuId()) == PremiumTier.TIER_1 ? 2131892299 : 2131892301);
+        String string2 = getString(giftingUtils.getTierForSku(inAppSku.getSkuId()) == PremiumTier.TIER_1 ? 2131892376 : 2131892378);
         m.checkNotNullExpressionValue(string2, "getString(\n        if (G…ring.premium_tier_2\n    )");
         TextView textView = g().g;
         m.checkNotNullExpressionValue(textView, "binding.giftPurchasedDialogSubtext");
diff --git a/app/src/main/java/c/a/a/y/c.java b/app/src/main/java/c/a/a/y/c.java
index 5836869d51..535f11248c 100644
--- a/app/src/main/java/c/a/a/y/c.java
+++ b/app/src/main/java/c/a/a/y/c.java
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c.a.d.f;
-import c.a.i.x3;
+import c.a.i.a4;
 import com.discord.api.application.Application;
 import com.discord.api.premium.SubscriptionPlan;
 import com.discord.app.AppDialog;
@@ -100,17 +100,17 @@ public final class c extends AppDialog {
     }
 
     /* compiled from: WidgetGiftAcceptDialog.kt */
-    public static final /* synthetic */ class b extends k implements Function1<View, x3> {
+    public static final /* synthetic */ class b extends k implements Function1<View, a4> {
         public static final b i = new b();
 
         public b() {
-            super(1, x3.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetAcceptGiftDialogBinding;", 0);
+            super(1, a4.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetAcceptGiftDialogBinding;", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public x3 invoke(View view) {
+        public a4 invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
             int i2 = 2131361813;
@@ -140,7 +140,7 @@ public final class c extends AppDialog {
                                             i2 = 2131361821;
                                             ProgressBar progressBar = (ProgressBar) view2.findViewById(2131361821);
                                             if (progressBar != null) {
-                                                return new x3((LinearLayout) view2, linearLayout, simpleDraweeView, textView, materialButton, linearLayout2, linkifiedTextView, appViewFlipper, textView2, progressBar);
+                                                return new a4((LinearLayout) view2, linearLayout, simpleDraweeView, textView, materialButton, linearLayout2, linkifiedTextView, appViewFlipper, textView2, progressBar);
                                             }
                                         }
                                     }
@@ -216,14 +216,14 @@ public final class c extends AppDialog {
                             str = "";
                         }
                         CharSequence i2 = cVar2.i(gift);
-                        LinearLayout linearLayout = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar2.h().h, "binding.acceptGiftHeader", gift.isAnyNitroGift() ? c.a.l.b.j(cVar2, 2131889031, new Object[]{str}, null, 4) : c.a.l.b.j(cVar2, 2131889030, new Object[0], null, 4), cVar2).f177c, "binding.acceptGiftBodyText", gift.isNitroClassicGift() ? c.a.l.b.j(cVar2, 2131889012, new Object[]{i2}, null, 4) : gift.isNitroGift() ? c.a.l.b.j(cVar2, 2131889013, new Object[]{i2}, null, 4) : c.a.l.b.j(cVar2, 2131889011, new Object[]{str}, null, 4), cVar2).e;
+                        LinearLayout linearLayout = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar2.h().h, "binding.acceptGiftHeader", gift.isAnyNitroGift() ? c.a.l.b.j(cVar2, 2131889035, new Object[]{str}, null, 4) : c.a.l.b.j(cVar2, 2131889034, new Object[0], null, 4), cVar2).f63c, "binding.acceptGiftBodyText", gift.isNitroClassicGift() ? c.a.l.b.j(cVar2, 2131889016, new Object[]{i2}, null, 4) : gift.isNitroGift() ? c.a.l.b.j(cVar2, 2131889017, new Object[]{i2}, null, 4) : c.a.l.b.j(cVar2, 2131889015, new Object[]{str}, null, 4), cVar2).e;
                         m.checkNotNullExpressionValue(linearLayout, "binding.acceptGiftDisclaimerContainer");
                         linearLayout.setVisibility(8);
                         MaterialButton materialButton = cVar2.h().d;
                         m.checkNotNullExpressionValue(materialButton, "binding.acceptGiftConfirm");
                         Context context = cVar2.getContext();
                         if (context != null) {
-                            charSequence = context.getText(2131889026);
+                            charSequence = context.getText(2131889030);
                         }
                         materialButton.setText(charSequence);
                         cVar2.h().d.setOnClickListener(new d(cVar2));
@@ -234,16 +234,16 @@ public final class c extends AppDialog {
                         cVar3.g(gift2);
                         TextView textView = cVar3.h().h;
                         m.checkNotNullExpressionValue(textView, "binding.acceptGiftHeader");
-                        c.a.l.b.n(textView, 2131889029, new Object[0], null, 4);
-                        TextView textView2 = cVar3.h().f177c;
+                        c.a.l.b.m(textView, 2131889033, new Object[0], null, 4);
+                        TextView textView2 = cVar3.h().f63c;
                         m.checkNotNullExpressionValue(textView2, "binding.acceptGiftBodyText");
-                        c.a.l.b.n(textView2, 2131888996, new Object[0], null, 4);
+                        c.a.l.b.m(textView2, 2131889000, new Object[0], null, 4);
                         LinearLayout linearLayout2 = cVar3.h().e;
                         m.checkNotNullExpressionValue(linearLayout2, "binding.acceptGiftDisclaimerContainer");
                         linearLayout2.setVisibility(8);
                         MaterialButton materialButton2 = cVar3.h().d;
                         m.checkNotNullExpressionValue(materialButton2, "binding.acceptGiftConfirm");
-                        c.a.l.b.n(materialButton2, 2131889022, new Object[0], null, 4);
+                        c.a.l.b.m(materialButton2, 2131889026, new Object[0], null, 4);
                         cVar3.h().d.setOnClickListener(new e(cVar3));
                     } else {
                         c cVar4 = this.this$0;
@@ -252,7 +252,7 @@ public final class c extends AppDialog {
                         cVar4.g(gift3);
                         ModelStoreListing storeListing2 = gift3.getStoreListing();
                         String name = (storeListing2 == null || (sku2 = storeListing2.getSku()) == null) ? null : sku2.getName();
-                        LinearLayout linearLayout3 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar4.h().h, "binding.acceptGiftHeader", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131889028, new Object[]{name}, null, 4) : c.a.l.b.j(cVar4, 2131889027, new Object[0], null, 4), cVar4).f177c, "binding.acceptGiftBodyText", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131888998, new Object[]{name, cVar4.i(gift3)}, null, 4) : c.a.l.b.j(cVar4, 2131888997, new Object[]{name}, null, 4), cVar4).e;
+                        LinearLayout linearLayout3 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar4.h().h, "binding.acceptGiftHeader", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131889032, new Object[]{name}, null, 4) : c.a.l.b.j(cVar4, 2131889031, new Object[0], null, 4), cVar4).f63c, "binding.acceptGiftBodyText", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131889002, new Object[]{name, cVar4.i(gift3)}, null, 4) : c.a.l.b.j(cVar4, 2131889001, new Object[]{name}, null, 4), cVar4).e;
                         m.checkNotNullExpressionValue(linearLayout3, "binding.acceptGiftDisclaimerContainer");
                         if (!gift3.isAnyNitroGift()) {
                             i = 8;
@@ -262,7 +262,7 @@ public final class c extends AppDialog {
                         m.checkNotNullExpressionValue(materialButton3, "binding.acceptGiftConfirm");
                         Context context2 = cVar4.getContext();
                         if (context2 != null) {
-                            charSequence = context2.getText(2131889020);
+                            charSequence = context2.getText(2131889024);
                         }
                         materialButton3.setText(charSequence);
                         cVar4.h().d.setOnClickListener(new f(gift3));
@@ -280,7 +280,7 @@ public final class c extends AppDialog {
                     ProgressBar progressBar = cVar5.h().i;
                     m.checkNotNullExpressionValue(progressBar, "binding.acceptGiftProgress");
                     progressBar.setVisibility(0);
-                    LinearLayout linearLayout4 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar5.h().h, "binding.acceptGiftHeader", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131889028, new Object[]{name2}, null, 4) : c.a.l.b.j(cVar5, 2131889027, new Object[0], null, 4), cVar5).f177c, "binding.acceptGiftBodyText", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131888998, new Object[]{name2, cVar5.i(gift4)}, null, 4) : c.a.l.b.j(cVar5, 2131888997, new Object[]{name2}, null, 4), cVar5).e;
+                    LinearLayout linearLayout4 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar5.h().h, "binding.acceptGiftHeader", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131889032, new Object[]{name2}, null, 4) : c.a.l.b.j(cVar5, 2131889031, new Object[0], null, 4), cVar5).f63c, "binding.acceptGiftBodyText", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131889002, new Object[]{name2, cVar5.i(gift4)}, null, 4) : c.a.l.b.j(cVar5, 2131889001, new Object[]{name2}, null, 4), cVar5).e;
                     m.checkNotNullExpressionValue(linearLayout4, "binding.acceptGiftDisclaimerContainer");
                     if (!gift4.isAnyNitroGift()) {
                         i = 8;
@@ -294,38 +294,38 @@ public final class c extends AppDialog {
                     cVar6.g(redeemedFailed.getGift());
                     TextView textView3 = cVar6.h().h;
                     m.checkNotNullExpressionValue(textView3, "binding.acceptGiftHeader");
-                    textView3.setText(c.a.l.b.j(cVar6, 2131889029, new Object[0], null, 4));
-                    TextView textView4 = cVar6.h().f177c;
+                    textView3.setText(c.a.l.b.j(cVar6, 2131889033, new Object[0], null, 4));
+                    TextView textView4 = cVar6.h().f63c;
                     m.checkNotNullExpressionValue(textView4, "binding.acceptGiftBodyText");
-                    c.a.l.b.n(textView4, 2131889018, new Object[0], null, 4);
+                    c.a.l.b.m(textView4, 2131889022, new Object[0], null, 4);
                     if (redeemedFailed.getCanRetry()) {
-                        TextView textView5 = cVar6.h().f177c;
+                        TextView textView5 = cVar6.h().f63c;
                         m.checkNotNullExpressionValue(textView5, "binding.acceptGiftBodyText");
-                        c.a.l.b.n(textView5, 2131889018, new Object[0], null, 4);
+                        c.a.l.b.m(textView5, 2131889022, new Object[0], null, 4);
                         MaterialButton materialButton5 = cVar6.h().d;
                         m.checkNotNullExpressionValue(materialButton5, "binding.acceptGiftConfirm");
                         Context context3 = cVar6.getContext();
                         if (context3 != null) {
-                            charSequence = context3.getText(2131892653);
+                            charSequence = context3.getText(2131892734);
                         }
                         materialButton5.setText(charSequence);
                         cVar6.h().d.setOnClickListener(new f(0, redeemedFailed));
                     } else {
                         Integer errorCode = redeemedFailed.getErrorCode();
                         if (errorCode != null && errorCode.intValue() == 50054) {
-                            cVar6.h().f177c.setText(2131889005);
+                            cVar6.h().f63c.setText(2131889009);
                         } else if (errorCode != null && errorCode.intValue() == 100024) {
-                            cVar6.h().f177c.setText(2131889001);
+                            cVar6.h().f63c.setText(2131889005);
                         } else if (errorCode != null && errorCode.intValue() == 100022) {
-                            cVar6.h().f177c.setText(2131889002);
+                            cVar6.h().f63c.setText(2131889006);
                         } else if (errorCode != null && errorCode.intValue() == 100025) {
-                            cVar6.h().f177c.setText(2131889000);
+                            cVar6.h().f63c.setText(2131889004);
                         }
                         MaterialButton materialButton6 = cVar6.h().d;
                         m.checkNotNullExpressionValue(materialButton6, "binding.acceptGiftConfirm");
                         Context context4 = cVar6.getContext();
                         if (context4 != null) {
-                            charSequence = context4.getText(2131889022);
+                            charSequence = context4.getText(2131889026);
                         }
                         materialButton6.setText(charSequence);
                         cVar6.h().d.setOnClickListener(new f(1, cVar6));
@@ -339,7 +339,7 @@ public final class c extends AppDialog {
     }
 
     public c() {
-        super(2131558835);
+        super(2131558838);
     }
 
     public final void g(ModelGift modelGift) {
@@ -374,8 +374,8 @@ public final class c extends AppDialog {
         progressBar.setVisibility(8);
     }
 
-    public final x3 h() {
-        return (x3) this.k.getValue((Fragment) this, i[0]);
+    public final a4 h() {
+        return (a4) this.k.getValue((Fragment) this, i[0]);
     }
 
     public final CharSequence i(ModelGift modelGift) {
@@ -397,10 +397,10 @@ public final class c extends AppDialog {
         CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, i2, subscriptionPlan.c(), Integer.valueOf(subscriptionPlan.c()));
         int ordinal2 = subscriptionPlan.b().ordinal();
         if (ordinal2 == 0) {
-            return c.a.l.b.j(this, 2131889032, new Object[]{i18nPluralString}, null, 4);
+            return c.a.l.b.j(this, 2131889036, new Object[]{i18nPluralString}, null, 4);
         }
         if (ordinal2 == 1) {
-            return c.a.l.b.j(this, 2131889033, new Object[]{i18nPluralString}, null, 4);
+            return c.a.l.b.j(this, 2131889037, new Object[]{i18nPluralString}, null, 4);
         }
         throw new NoWhenBranchMatchedException();
     }
@@ -434,7 +434,7 @@ public final class c extends AppDialog {
         }
         LinkifiedTextView linkifiedTextView = h().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.acceptGiftDisclaimerText");
-        c.a.l.b.n(linkifiedTextView, 2131888999, new Object[]{f.a.a(360055386693L, null)}, null, 4);
+        c.a.l.b.m(linkifiedTextView, 2131889003, new Object[]{f.a.a(360055386693L, null)}, null, 4);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getGifting().requestGift(string), this, null, 2, null), c.class, (Context) null, (Function1) null, new C0021c(this), (Function0) null, (Function0) null, new d(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/c.java b/app/src/main/java/c/a/a0/a/a/c.java
index 652d1edb39..f16005906e 100644
--- a/app/src/main/java/c/a/a0/a/a/c.java
+++ b/app/src/main/java/c/a/a0/a/a/c.java
@@ -19,7 +19,7 @@ public final /* synthetic */ class c implements Function1 {
     public final Object invoke(Object obj) {
         WidgetChannelSettingsPermissionsAddMember widgetChannelSettingsPermissionsAddMember = this.i;
         WidgetChannelSettingsPermissionsAddMember.Model model = this.j;
-        WidgetChannelSettingsEditPermissions.createForUser(widgetChannelSettingsPermissionsAddMember.getContext(), WidgetChannelSettingsPermissionsAddMember.Model.access$100(model).e(), WidgetChannelSettingsPermissionsAddMember.Model.access$100(model).g(), ((User) obj).getId());
+        WidgetChannelSettingsEditPermissions.createForUser(widgetChannelSettingsPermissionsAddMember.getContext(), WidgetChannelSettingsPermissionsAddMember.Model.access$100(model).f(), WidgetChannelSettingsPermissionsAddMember.Model.access$100(model).h(), ((User) obj).getId());
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/d.java b/app/src/main/java/c/a/a0/a/a/d.java
index 822926e703..7f7f116efa 100644
--- a/app/src/main/java/c/a/a0/a/a/d.java
+++ b/app/src/main/java/c/a/a0/a/a/d.java
@@ -29,8 +29,8 @@ public final /* synthetic */ class d implements b {
         if (channel == null) {
             return new j(null);
         }
-        Observable h = Observable.h(StoreStream.getUsers().observeMe(), StoreStream.getGuilds().observeGuild(j), StoreStream.getPermissions().observePermissionsForChannel(j2), observable.o(300, TimeUnit.MILLISECONDS).Z(new g(j, channel)).s(), new h(channel));
+        Observable h = Observable.h(StoreStream.getUsers().observeMe(), StoreStream.getGuilds().observeGuild(j), StoreStream.getPermissions().observePermissionsForChannel(j2), observable.o(300, TimeUnit.MILLISECONDS).Y(new g(j, channel)).r(), new h(channel));
         m.checkNotNullExpressionValue(h, "observable");
-        return ObservableExtensionsKt.computationBuffered(h).s();
+        return ObservableExtensionsKt.computationBuffered(h).r();
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/f.java b/app/src/main/java/c/a/a0/a/a/f.java
index 14b7394878..9edddaed8c 100644
--- a/app/src/main/java/c/a/a0/a/a/f.java
+++ b/app/src/main/java/c/a/a0/a/a/f.java
@@ -17,6 +17,6 @@ public final /* synthetic */ class f implements b {
     @Override // j0.k.b
     public final Object call(Object obj) {
         Map map = (Map) obj;
-        return StoreStream.getUsers().observeUsers(map.keySet()).Z(new k(this.i, map, this.j));
+        return StoreStream.getUsers().observeUsers(map.keySet()).Y(new k(this.i, map, this.j));
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/k.java b/app/src/main/java/c/a/a0/a/a/k.java
index 603366e004..a16246bc0a 100644
--- a/app/src/main/java/c/a/a0/a/a/k.java
+++ b/app/src/main/java/c/a/a0/a/a/k.java
@@ -20,6 +20,6 @@ public final /* synthetic */ class k implements b {
     public final Object call(Object obj) {
         List list = this.i;
         Map map = this.j;
-        return Observable.B(((Map) obj).values()).y(new j(list)).y(new l(map)).y(new i(this.k)).U(new e(map)).G(v.i).g0();
+        return Observable.A(((Map) obj).values()).x(new j(list)).x(new l(map)).x(new i(this.k)).T(new e(map)).F(v.i).f0();
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/p.java b/app/src/main/java/c/a/a0/a/a/p.java
index 67a32df861..7e1cef7f57 100644
--- a/app/src/main/java/c/a/a0/a/a/p.java
+++ b/app/src/main/java/c/a/a0/a/a/p.java
@@ -16,6 +16,6 @@ public final /* synthetic */ class p implements b {
     @Override // j0.k.b
     public final Object call(Object obj) {
         Channel channel = (Channel) obj;
-        return channel == null ? new j(null) : Observable.h(StoreStream.getGuilds().observeGuild(channel.e()), StoreStream.getUsers().observeMe(), StoreStream.getPermissions().observePermissionsForChannel(this.i), StoreStream.getGuilds().observeSortedRoles(channel.e()).Z(new r(channel)), new q(channel));
+        return channel == null ? new j(null) : Observable.h(StoreStream.getGuilds().observeGuild(channel.f()), StoreStream.getUsers().observeMe(), StoreStream.getPermissions().observePermissionsForChannel(this.i), StoreStream.getGuilds().observeSortedRoles(channel.f()).Y(new r(channel)), new q(channel));
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/r.java b/app/src/main/java/c/a/a0/a/a/r.java
index 88d0fbebd5..7a312d3609 100644
--- a/app/src/main/java/c/a/a0/a/a/r.java
+++ b/app/src/main/java/c/a/a0/a/a/r.java
@@ -15,6 +15,6 @@ public final /* synthetic */ class r implements b {
 
     @Override // j0.k.b
     public final Object call(Object obj) {
-        return Observable.i0(new q((List) obj)).y(new s(this.i)).G(u.i).g0();
+        return Observable.h0(new q((List) obj)).x(new s(this.i)).F(u.i).f0();
     }
 }
diff --git a/app/src/main/java/c/a/a0/a/a/s.java b/app/src/main/java/c/a/a0/a/a/s.java
index fa449825a0..1580728256 100644
--- a/app/src/main/java/c/a/a0/a/a/s.java
+++ b/app/src/main/java/c/a/a0/a/a/s.java
@@ -15,11 +15,11 @@ public final /* synthetic */ class s implements b {
     public final Object call(Object obj) {
         Channel channel = this.i;
         GuildRole guildRole = (GuildRole) obj;
-        if (channel.r() == null) {
+        if (channel.s() == null) {
             return Boolean.TRUE;
         }
-        for (int i = 0; i < channel.r().size(); i++) {
-            if (channel.r().get(i).e() == guildRole.getId()) {
+        for (int i = 0; i < channel.s().size(); i++) {
+            if (channel.s().get(i).e() == guildRole.getId()) {
                 return Boolean.FALSE;
             }
         }
diff --git a/app/src/main/java/c/a/a0/a/a/t.java b/app/src/main/java/c/a/a0/a/a/t.java
index 7fa51de39b..41acef91e9 100644
--- a/app/src/main/java/c/a/a0/a/a/t.java
+++ b/app/src/main/java/c/a/a0/a/a/t.java
@@ -19,7 +19,7 @@ public final /* synthetic */ class t implements Function1 {
     public final Object invoke(Object obj) {
         WidgetChannelSettingsPermissionsAddRole widgetChannelSettingsPermissionsAddRole = this.i;
         WidgetChannelSettingsPermissionsAddRole.Model model = this.j;
-        WidgetChannelSettingsEditPermissions.createForRole(widgetChannelSettingsPermissionsAddRole.getContext(), WidgetChannelSettingsPermissionsAddRole.Model.access$200(model).e(), WidgetChannelSettingsPermissionsAddRole.Model.access$200(model).g(), ((GuildRole) obj).getId());
+        WidgetChannelSettingsEditPermissions.createForRole(widgetChannelSettingsPermissionsAddRole.getContext(), WidgetChannelSettingsPermissionsAddRole.Model.access$200(model).f(), WidgetChannelSettingsPermissionsAddRole.Model.access$200(model).h(), ((GuildRole) obj).getId());
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/a0/b/a/a.java b/app/src/main/java/c/a/a0/b/a/a.java
deleted file mode 100644
index 2704e6f978..0000000000
--- a/app/src/main/java/c/a/a0/b/a/a.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.guild.Guild;
-import j0.k.b;
-/* compiled from: lambda */
-public final /* synthetic */ class a implements b {
-    public static final /* synthetic */ a i = new a();
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        return Long.valueOf(((Guild) obj).getId());
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/a0.java b/app/src/main/java/c/a/a0/b/a/a0.java
deleted file mode 100644
index 839f36deeb..0000000000
--- a/app/src/main/java/c/a/a0/b/a/a0.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.api.channel.Channel;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import j0.k.b;
-/* compiled from: lambda */
-public final /* synthetic */ class a0 implements b {
-    public static final /* synthetic */ a0 i = new a0();
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        Channel channel = (Channel) obj;
-        int i2 = WidgetChatInputCommandsModel.TYPE_USER;
-        return Boolean.valueOf(channel != null);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/b.java b/app/src/main/java/c/a/a0/b/a/b.java
deleted file mode 100644
index c85d82ffac..0000000000
--- a/app/src/main/java/c/a/a0/b/a/b.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import rx.Emitter;
-import rx.functions.Action1;
-/* compiled from: lambda */
-public final /* synthetic */ class b implements Action1 {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter i;
-
-    public /* synthetic */ b(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        this.i = widgetChatInputCommandsAdapter;
-    }
-
-    @Override // rx.functions.Action1
-    public final void call(Object obj) {
-        this.i.b((Emitter) obj);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/b0.java b/app/src/main/java/c/a/a0/b/a/b0.java
deleted file mode 100644
index 03c054610f..0000000000
--- a/app/src/main/java/c/a/a0/b/a/b0.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.user.User;
-import j0.k.b;
-/* compiled from: lambda */
-public final /* synthetic */ class b0 implements b {
-    public static final /* synthetic */ b0 i = new b0();
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        return Long.valueOf(((User) obj).getId());
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/c.java b/app/src/main/java/c/a/a0/b/a/c.java
deleted file mode 100644
index 8c7ccd9111..0000000000
--- a/app/src/main/java/c/a/a0/b/a/c.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.commands.Application;
-import com.discord.utilities.images.MGImagesBitmap;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import rx.functions.Action1;
-/* compiled from: lambda */
-public final /* synthetic */ class c implements Action1 {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter.CommandHeaderItem i;
-    public final /* synthetic */ Application j;
-
-    public /* synthetic */ c(WidgetChatInputCommandsAdapter.CommandHeaderItem commandHeaderItem, Application application) {
-        this.i = commandHeaderItem;
-        this.j = application;
-    }
-
-    @Override // rx.functions.Action1
-    public final void call(Object obj) {
-        this.i.a(this.j, (MGImagesBitmap.CloseableBitmaps) obj);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/d.java b/app/src/main/java/c/a/a0/b/a/d.java
deleted file mode 100644
index bd60a14cc3..0000000000
--- a/app/src/main/java/c/a/a0/b/a/d.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package c.a.a0.b.a;
-
-import android.graphics.drawable.Drawable;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import rx.functions.Action1;
-/* compiled from: lambda */
-public final /* synthetic */ class d implements Action1 {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter.CommandHeaderItem i;
-    public final /* synthetic */ Drawable j;
-
-    public /* synthetic */ d(WidgetChatInputCommandsAdapter.CommandHeaderItem commandHeaderItem, Drawable drawable) {
-        this.i = commandHeaderItem;
-        this.j = drawable;
-    }
-
-    @Override // rx.functions.Action1
-    public final void call(Object obj) {
-        this.i.b(this.j, (Throwable) obj);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/e.java b/app/src/main/java/c/a/a0/b/a/e.java
deleted file mode 100644
index 69869947c1..0000000000
--- a/app/src/main/java/c/a/a0/b/a/e.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import rx.functions.Action1;
-/* compiled from: lambda */
-public final /* synthetic */ class e implements Action1 {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter i;
-
-    public /* synthetic */ e(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        this.i = widgetChatInputCommandsAdapter;
-    }
-
-    @Override // rx.functions.Action1
-    public final void call(Object obj) {
-        this.i.c(obj);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/f.java b/app/src/main/java/c/a/a0/b/a/f.java
deleted file mode 100644
index e77a94be4c..0000000000
--- a/app/src/main/java/c/a/a0/b/a/f.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package c.a.a0.b.a;
-
-import android.view.View;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-/* compiled from: lambda */
-public final /* synthetic */ class f implements View.OnClickListener {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem i;
-    public final /* synthetic */ WidgetChatInputCommandsModel j;
-
-    public /* synthetic */ f(WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem emojiAutocompleteUpsellItem, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        this.i = emojiAutocompleteUpsellItem;
-        this.j = widgetChatInputCommandsModel;
-    }
-
-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem emojiAutocompleteUpsellItem = this.i;
-        ((WidgetChatInputCommandsAdapter) emojiAutocompleteUpsellItem.adapter).onClickAction.call(this.j);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/g.java b/app/src/main/java/c/a/a0/b/a/g.java
deleted file mode 100644
index c069dde857..0000000000
--- a/app/src/main/java/c/a/a0/b/a/g.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.i18n.RenderContext;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: lambda */
-public final /* synthetic */ class g implements Function1 {
-    public static final /* synthetic */ g i = new g();
-
-    @Override // kotlin.jvm.functions.Function1
-    public final Object invoke(Object obj) {
-        RenderContext renderContext = (RenderContext) obj;
-        int i2 = WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem.a;
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/h.java b/app/src/main/java/c/a/a0/b/a/h.java
deleted file mode 100644
index b2027e965d..0000000000
--- a/app/src/main/java/c/a/a0/b/a/h.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.domain.emoji.Emoji;
-import com.discord.utilities.icon.IconUtils;
-import com.discord.views.PileView;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.Objects;
-/* compiled from: lambda */
-public final /* synthetic */ class h implements PileView.b {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem a;
-    public final /* synthetic */ Emoji b;
-
-    /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ WidgetChatInputCommandsModel f38c;
-
-    public /* synthetic */ h(WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem emojiAutocompleteUpsellItem, Emoji emoji, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        this.a = emojiAutocompleteUpsellItem;
-        this.b = emoji;
-        this.f38c = widgetChatInputCommandsModel;
-    }
-
-    @Override // com.discord.views.PileView.b
-    public final String a(int i) {
-        WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem emojiAutocompleteUpsellItem = this.a;
-        Emoji emoji = this.b;
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = this.f38c;
-        Objects.requireNonNull(emojiAutocompleteUpsellItem);
-        return emoji.getImageUri(widgetChatInputCommandsModel.isAllowEmojiToAnimate(), IconUtils.getMediaProxySize(i), emojiAutocompleteUpsellItem.itemView.getContext());
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/i.java b/app/src/main/java/c/a/a0/b/a/i.java
deleted file mode 100644
index c52d557fb6..0000000000
--- a/app/src/main/java/c/a/a0/b/a/i.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.i18n.RenderContext;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: lambda */
-public final /* synthetic */ class i implements Function1 {
-    public static final /* synthetic */ i i = new i();
-
-    @Override // kotlin.jvm.functions.Function1
-    public final Object invoke(Object obj) {
-        RenderContext renderContext = (RenderContext) obj;
-        int i2 = WidgetChatInputCommandsAdapter.EmojiAutocompleteUpsellItem.a;
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/j.java b/app/src/main/java/c/a/a0/b/a/j.java
deleted file mode 100644
index 009930d49a..0000000000
--- a/app/src/main/java/c/a/a0/b/a/j.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package c.a.a0.b.a;
-
-import android.view.View;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-/* compiled from: lambda */
-public final /* synthetic */ class j implements View.OnClickListener {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter.Item i;
-    public final /* synthetic */ WidgetChatInputCommandsModel j;
-
-    public /* synthetic */ j(WidgetChatInputCommandsAdapter.Item item, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        this.i = item;
-        this.j = widgetChatInputCommandsModel;
-    }
-
-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        WidgetChatInputCommandsAdapter.Item item = this.i;
-        ((WidgetChatInputCommandsAdapter) item.adapter).onClickAction.call(this.j);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/k.java b/app/src/main/java/c/a/a0/b/a/k.java
deleted file mode 100644
index daa07a9128..0000000000
--- a/app/src/main/java/c/a/a0/b/a/k.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.i18n.RenderContext;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: lambda */
-public final /* synthetic */ class k implements Function1 {
-    public static final /* synthetic */ k i = new k();
-
-    @Override // kotlin.jvm.functions.Function1
-    public final Object invoke(Object obj) {
-        RenderContext renderContext = (RenderContext) obj;
-        int i2 = WidgetChatInputCommandsAdapter.Item.a;
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/l.java b/app/src/main/java/c/a/a0/b/a/l.java
deleted file mode 100644
index f3b20ff89b..0000000000
--- a/app/src/main/java/c/a/a0/b/a/l.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package c.a.a0.b.a;
-
-import android.content.Context;
-import com.discord.models.domain.emoji.Emoji;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-import kotlin.jvm.functions.Function3;
-/* compiled from: lambda */
-public final /* synthetic */ class l implements Function3 {
-    public final /* synthetic */ Emoji i;
-
-    public /* synthetic */ l(Emoji emoji) {
-        this.i = emoji;
-    }
-
-    @Override // kotlin.jvm.functions.Function3
-    public final Object invoke(Object obj, Object obj2, Object obj3) {
-        Integer num = (Integer) obj2;
-        int i = WidgetChatInputCommandsAdapter.Item.a;
-        return this.i.getImageUri(((Boolean) obj).booleanValue(), 32, (Context) obj3);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/m.java b/app/src/main/java/c/a/a0/b/a/m.java
deleted file mode 100644
index 24dc4d582a..0000000000
--- a/app/src/main/java/c/a/a0/b/a/m.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package c.a.a0.b.a;
-
-import android.view.View;
-import androidx.recyclerview.widget.RecyclerView;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter;
-/* compiled from: lambda */
-public final /* synthetic */ class m implements View.OnLayoutChangeListener {
-    public final /* synthetic */ WidgetChatInputCommandsAdapter i;
-    public final /* synthetic */ RecyclerView j;
-
-    public /* synthetic */ m(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter, RecyclerView recyclerView) {
-        this.i = widgetChatInputCommandsAdapter;
-        this.j = recyclerView;
-    }
-
-    @Override // android.view.View.OnLayoutChangeListener
-    public final void onLayoutChange(View view, int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
-        this.i.a(this.j, view, i, i2, i3, i4, i5, i6, i7, i8);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/n.java b/app/src/main/java/c/a/a0/b/a/n.java
deleted file mode 100644
index a5ef54f83f..0000000000
--- a/app/src/main/java/c/a/a0/b/a/n.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.user.User;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import kotlin.jvm.functions.Function1;
-/* compiled from: lambda */
-public final /* synthetic */ class n implements Function1 {
-    public final /* synthetic */ int i;
-
-    public /* synthetic */ n(int i) {
-        this.i = i;
-    }
-
-    @Override // kotlin.jvm.functions.Function1
-    public final Object invoke(Object obj) {
-        int i = this.i;
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = (WidgetChatInputCommandsModel) obj;
-        int i2 = WidgetChatInputCommandsModel.TYPE_USER;
-        User user = widgetChatInputCommandsModel.getUser();
-        return user == null ? Integer.valueOf(widgetChatInputCommandsModel.getType() % i) : Integer.valueOf((int) ((user.getId() >> 22) % ((long) i)));
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/o.java b/app/src/main/java/c/a/a0/b/a/o.java
deleted file mode 100644
index 10957e934c..0000000000
--- a/app/src/main/java/c/a/a0/b/a/o.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package c.a.a0.b.a;
-
-import android.content.Context;
-import com.discord.api.channel.Channel;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import j0.k.b;
-/* compiled from: lambda */
-public final /* synthetic */ class o implements b {
-    public final /* synthetic */ Context i;
-    public final /* synthetic */ boolean j;
-    public final /* synthetic */ boolean k;
-
-    public /* synthetic */ o(Context context, boolean z2, boolean z3) {
-        this.i = context;
-        this.j = z2;
-        this.k = z3;
-    }
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        return WidgetChatInputCommandsModel.lambda$get$2(this.i, this.j, this.k, (Channel) obj);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/p.java b/app/src/main/java/c/a/a0/b/a/p.java
deleted file mode 100644
index 1ef84b7d1a..0000000000
--- a/app/src/main/java/c/a/a0/b/a/p.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.stores.DiscoverCommands;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import com.discord.widgets.chat.input.WidgetChatInputDiscoveryCommandsModel;
-import java.util.List;
-import rx.functions.Func2;
-/* compiled from: lambda */
-public final /* synthetic */ class p implements Func2 {
-    public final /* synthetic */ Boolean i;
-    public final /* synthetic */ Integer j;
-
-    public /* synthetic */ p(Boolean bool, Integer num) {
-        this.i = bool;
-        this.j = num;
-    }
-
-    @Override // rx.functions.Func2
-    public final Object call(Object obj, Object obj2) {
-        Boolean bool = this.i;
-        Integer num = this.j;
-        int i = WidgetChatInputCommandsModel.TYPE_USER;
-        return WidgetChatInputDiscoveryCommandsModel.parseModelDiscoveryCommands((List) obj, (DiscoverCommands) obj2, bool.booleanValue(), num.intValue());
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/q.java b/app/src/main/java/c/a/a0/b/a/q.java
deleted file mode 100644
index 09b2658af7..0000000000
--- a/app/src/main/java/c/a/a0/b/a/q.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.guild.Guild;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import j0.k.b;
-/* compiled from: lambda */
-public final /* synthetic */ class q implements b {
-    public static final /* synthetic */ q i = new q();
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        Guild guild = (Guild) obj;
-        int i2 = WidgetChatInputCommandsModel.TYPE_USER;
-        return Boolean.valueOf(guild != null);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/r.java b/app/src/main/java/c/a/a0/b/a/r.java
deleted file mode 100644
index a639c8b4ea..0000000000
--- a/app/src/main/java/c/a/a0/b/a/r.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.api.channel.Channel;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.Map;
-import rx.functions.Func8;
-/* compiled from: lambda */
-public final /* synthetic */ class r implements Func8 {
-    public final /* synthetic */ Channel a;
-
-    public /* synthetic */ r(Channel channel) {
-        this.a = channel;
-    }
-
-    @Override // rx.functions.Func8
-    public final Object call(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8) {
-        return WidgetChatInputCommandsModel.lambda$createMentionCommands$6(this.a, (Long) obj, (Long) obj2, (Map) obj3, (Map) obj4, (Map) obj5, (Map) obj6, (Long) obj7, (Channel) obj8);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/s.java b/app/src/main/java/c/a/a0/b/a/s.java
deleted file mode 100644
index c50f6da5bd..0000000000
--- a/app/src/main/java/c/a/a0/b/a/s.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.List;
-import rx.functions.Func2;
-/* compiled from: lambda */
-public final /* synthetic */ class s implements Func2 {
-    public static final /* synthetic */ s i = new s();
-
-    @Override // rx.functions.Func2
-    public final Object call(Object obj, Object obj2) {
-        return WidgetChatInputCommandsModel.lambda$createSlashCommands$11((List) obj, (List) obj2);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/t.java b/app/src/main/java/c/a/a0/b/a/t.java
deleted file mode 100644
index 6c68106ce5..0000000000
--- a/app/src/main/java/c/a/a0/b/a/t.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.models.domain.emoji.EmojiSet;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import j0.k.b;
-/* compiled from: lambda */
-public final /* synthetic */ class t implements b {
-    public final /* synthetic */ boolean i;
-
-    public /* synthetic */ t(boolean z2) {
-        this.i = z2;
-    }
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        return WidgetChatInputCommandsModel.createCommandsForEmoji((EmojiSet) obj, this.i);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/u.java b/app/src/main/java/c/a/a0/b/a/u.java
deleted file mode 100644
index 6765e44266..0000000000
--- a/app/src/main/java/c/a/a0/b/a/u.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import com.discord.widgets.chat.input.WidgetChatInputSlashAction;
-/* compiled from: lambda */
-public final /* synthetic */ class u implements WidgetChatInputSlashAction {
-    public static final /* synthetic */ u a = new u();
-
-    @Override // com.discord.widgets.chat.input.WidgetChatInputSlashAction
-    public final String call(String str, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        return WidgetChatInputCommandsModel.lambda$createBuiltInSlashCommands$13(str, widgetChatInputCommandsModel);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/v.java b/app/src/main/java/c/a/a0/b/a/v.java
deleted file mode 100644
index 16f1d0c44d..0000000000
--- a/app/src/main/java/c/a/a0/b/a/v.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package c.a.a0.b.a;
-
-import android.content.Context;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.Map;
-import rx.functions.Func2;
-/* compiled from: lambda */
-public final /* synthetic */ class v implements Func2 {
-    public final /* synthetic */ Context i;
-
-    public /* synthetic */ v(Context context) {
-        this.i = context;
-    }
-
-    @Override // rx.functions.Func2
-    public final Object call(Object obj, Object obj2) {
-        return WidgetChatInputCommandsModel.lambda$createChannelCommands$9(this.i, (Map) obj, (Map) obj2);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/w.java b/app/src/main/java/c/a/a0/b/a/w.java
deleted file mode 100644
index 3be22cb70c..0000000000
--- a/app/src/main/java/c/a/a0/b/a/w.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.Comparator;
-/* compiled from: lambda */
-public final /* synthetic */ class w implements Comparator {
-    public static final /* synthetic */ w i = new w();
-
-    @Override // java.util.Comparator
-    public final int compare(Object obj, Object obj2) {
-        return WidgetChatInputCommandsModel.lambda$replaceMatches$4((WidgetChatInputCommandsModel) obj, (WidgetChatInputCommandsModel) obj2);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/x.java b/app/src/main/java/c/a/a0/b/a/x.java
deleted file mode 100644
index ba5586570a..0000000000
--- a/app/src/main/java/c/a/a0/b/a/x.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.Collection;
-import java.util.List;
-import java.util.TreeSet;
-import rx.functions.Func4;
-/* compiled from: lambda */
-public final /* synthetic */ class x implements Func4 {
-    public static final /* synthetic */ x a = new x();
-
-    @Override // rx.functions.Func4
-    public final Object call(Object obj, Object obj2, Object obj3, Object obj4) {
-        int i = WidgetChatInputCommandsModel.TYPE_USER;
-        TreeSet treeSet = new TreeSet();
-        treeSet.addAll((Collection) obj);
-        treeSet.addAll((List) obj2);
-        treeSet.addAll((Collection) obj3);
-        treeSet.addAll((Collection) obj4);
-        return treeSet;
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/y.java b/app/src/main/java/c/a/a0/b/a/y.java
deleted file mode 100644
index c50cde3a7f..0000000000
--- a/app/src/main/java/c/a/a0/b/a/y.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.api.channel.Channel;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import java.util.Map;
-import rx.functions.Func2;
-/* compiled from: lambda */
-public final /* synthetic */ class y implements Func2 {
-    public final /* synthetic */ Channel i;
-
-    public /* synthetic */ y(Channel channel) {
-        this.i = channel;
-    }
-
-    @Override // rx.functions.Func2
-    public final Object call(Object obj, Object obj2) {
-        return WidgetChatInputCommandsModel.lambda$null$7(this.i, (Map) obj, (Map) obj2);
-    }
-}
diff --git a/app/src/main/java/c/a/a0/b/a/z.java b/app/src/main/java/c/a/a0/b/a/z.java
deleted file mode 100644
index 9e25f9142e..0000000000
--- a/app/src/main/java/c/a/a0/b/a/z.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package c.a.a0.b.a;
-
-import com.discord.api.channel.Channel;
-import com.discord.stores.StoreStream;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import j0.k.b;
-import java.util.List;
-import rx.Observable;
-/* compiled from: lambda */
-public final /* synthetic */ class z implements b {
-    public final /* synthetic */ Channel i;
-
-    public /* synthetic */ z(Channel channel) {
-        this.i = channel;
-    }
-
-    @Override // j0.k.b
-    public final Object call(Object obj) {
-        Channel channel = this.i;
-        List list = (List) obj;
-        int i = WidgetChatInputCommandsModel.TYPE_USER;
-        return Observable.j(StoreStream.getUsers().observeUsers(list), StoreStream.getPresences().observePresencesForUsers(list), new y(channel));
-    }
-}
diff --git a/app/src/main/java/c/a/b/a.java b/app/src/main/java/c/a/b/a.java
index 6dc6023596..cfc5b906ae 100644
--- a/app/src/main/java/c/a/b/a.java
+++ b/app/src/main/java/c/a/b/a.java
@@ -69,7 +69,7 @@ import java.util.Map;
 import kotlin.jvm.functions.Function0;
 /* compiled from: TypeAdapterRegistrar.kt */
 public final class a {
-    public static final Map<Class<? extends Object>, Function0<TypeAdapter<? extends Object>>> a = h0.mapOf(o.to(ActivityPlatform.class, b.i), o.to(ApplicationStatus.class, C0022a.B), o.to(UtcDateTime.class, C0022a.C), o.to(NsfwAllowance.class, C0022a.D), o.to(PremiumTier.class, C0022a.E), o.to(ActivityType.class, C0022a.F), o.to(Phone.class, C0022a.G), o.to(ApplicationCommandType.class, C0022a.H), o.to(OAuthScope.class, C0022a.I), o.to(GuildVerificationLevel.class, C0022a.i), o.to(GuildExplicitContentFilter.class, C0022a.j), o.to(GuildMaxVideoChannelUsers.class, C0022a.k), o.to(ComponentType.class, C0022a.l), o.to(ButtonStyle.class, C0022a.m), o.to(ReportNodeChild.class, C0022a.n), o.to(ReportNodeElementData.class, C0022a.o), o.to(ReportNodeBottomButton.class, C0022a.p), o.to(ApplicationCommandPermissionType.class, C0022a.q), o.to(StageInstancePrivacyLevel.class, C0022a.r), o.to(FriendSuggestionReasonType.class, C0022a.f39s), o.to(AllowedInSuggestionsType.class, C0022a.t), o.to(StickerFormatType.class, C0022a.u), o.to(LocalizedString.class, C0022a.v), o.to(MessageActivityType.class, C0022a.w), o.to(EmbedType.class, C0022a.f40x), o.to(StickerType.class, C0022a.f41y), o.to(GuildScheduledEventStatus.class, C0022a.f42z), o.to(GuildScheduledEventEntityType.class, C0022a.A));
+    public static final Map<Class<? extends Object>, Function0<TypeAdapter<? extends Object>>> a = h0.mapOf(o.to(ActivityPlatform.class, b.i), o.to(ApplicationStatus.class, C0022a.B), o.to(UtcDateTime.class, C0022a.C), o.to(NsfwAllowance.class, C0022a.D), o.to(PremiumTier.class, C0022a.E), o.to(ActivityType.class, C0022a.F), o.to(Phone.class, C0022a.G), o.to(ApplicationCommandType.class, C0022a.H), o.to(OAuthScope.class, C0022a.I), o.to(GuildVerificationLevel.class, C0022a.i), o.to(GuildExplicitContentFilter.class, C0022a.j), o.to(GuildMaxVideoChannelUsers.class, C0022a.k), o.to(ComponentType.class, C0022a.l), o.to(ButtonStyle.class, C0022a.m), o.to(ReportNodeChild.class, C0022a.n), o.to(ReportNodeElementData.class, C0022a.o), o.to(ReportNodeBottomButton.class, C0022a.p), o.to(ApplicationCommandPermissionType.class, C0022a.q), o.to(StageInstancePrivacyLevel.class, C0022a.r), o.to(FriendSuggestionReasonType.class, C0022a.f38s), o.to(AllowedInSuggestionsType.class, C0022a.t), o.to(StickerFormatType.class, C0022a.u), o.to(LocalizedString.class, C0022a.v), o.to(MessageActivityType.class, C0022a.w), o.to(EmbedType.class, C0022a.f39x), o.to(StickerType.class, C0022a.f40y), o.to(GuildScheduledEventStatus.class, C0022a.f41z), o.to(GuildScheduledEventEntityType.class, C0022a.A));
     public static final List<c.i.d.o> b = n.listOf((Object[]) new c.i.d.o[]{ComponentRuntimeTypeAdapter.INSTANCE.a(), new NullSerializableTypeAdapterFactory()});
 
     /* compiled from: kotlin-style lambda group */
@@ -96,20 +96,20 @@ public final class a {
         public static final C0022a r = new C0022a(9);
 
         /* renamed from: s  reason: collision with root package name */
-        public static final C0022a f39s = new C0022a(10);
+        public static final C0022a f38s = new C0022a(10);
         public static final C0022a t = new C0022a(11);
         public static final C0022a u = new C0022a(12);
         public static final C0022a v = new C0022a(13);
         public static final C0022a w = new C0022a(14);
 
         /* renamed from: x  reason: collision with root package name */
-        public static final C0022a f40x = new C0022a(15);
+        public static final C0022a f39x = new C0022a(15);
 
         /* renamed from: y  reason: collision with root package name */
-        public static final C0022a f41y = new C0022a(16);
+        public static final C0022a f40y = new C0022a(16);
 
         /* renamed from: z  reason: collision with root package name */
-        public static final C0022a f42z = new C0022a(17);
+        public static final C0022a f41z = new C0022a(17);
         public final /* synthetic */ int J;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/c/a/d/b.java b/app/src/main/java/c/a/d/b.java
index e422d6fc16..3ebfeeeb58 100644
--- a/app/src/main/java/c/a/d/b.java
+++ b/app/src/main/java/c/a/d/b.java
@@ -10,12 +10,12 @@ public final class b implements Toolbar.OnMenuItemClickListener {
     public final /* synthetic */ Action2 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Action1 f43c;
+    public final /* synthetic */ Action1 f42c;
 
     public b(Toolbar toolbar, int i, Action2 action2, Action1 action1) {
         this.a = toolbar;
         this.b = action2;
-        this.f43c = action1;
+        this.f42c = action1;
     }
 
     @Override // androidx.appcompat.widget.Toolbar.OnMenuItemClickListener
diff --git a/app/src/main/java/c/a/d/c0.java b/app/src/main/java/c/a/d/c0.java
index e5add29462..f06cff3c9a 100644
--- a/app/src/main/java/c/a/d/c0.java
+++ b/app/src/main/java/c/a/d/c0.java
@@ -16,6 +16,6 @@ public final class c0<T, R> implements Observable.c<T, R> {
 
     @Override // j0.k.b
     public Object call(Object obj) {
-        return ((Observable) obj).Z(new b0(this));
+        return ((Observable) obj).Y(new b0(this));
     }
 }
diff --git a/app/src/main/java/c/a/d/e.java b/app/src/main/java/c/a/d/e.java
index fa45f28400..93a03a5d5b 100644
--- a/app/src/main/java/c/a/d/e.java
+++ b/app/src/main/java/c/a/d/e.java
@@ -23,7 +23,7 @@ public final class e extends o implements Function1<Exception, Unit> {
         Exception exc2 = exc;
         m.checkNotNullParameter(exc2, "e");
         AppFragment appFragment = this.this$0.this$0;
-        o.j(appFragment, b.j(appFragment, 2131894042, new Object[]{exc2.getMessage()}, null, 4), 0, 4);
+        o.j(appFragment, b.j(appFragment, 2131894142, new Object[]{exc2.getMessage()}, null, 4), 0, 4);
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/d/j.java b/app/src/main/java/c/a/d/j.java
index 8ada65000c..48851818aa 100644
--- a/app/src/main/java/c/a/d/j.java
+++ b/app/src/main/java/c/a/d/j.java
@@ -86,7 +86,7 @@ public final class j implements AppPermissionsRequests {
             m.checkNotNullParameter(map, "it");
             Function0 function0 = this.$onFailure;
             if (function0 == null || ((Unit) function0.mo1invoke()) == null) {
-                j.a(this.this$0, 2131891860);
+                j.a(this.this$0, 2131891932);
             }
             return Unit.a;
         }
@@ -127,7 +127,7 @@ public final class j implements AppPermissionsRequests {
         @Override // kotlin.jvm.functions.Function1
         public Unit invoke(Map<String, ? extends Boolean> map) {
             m.checkNotNullParameter(map, "it");
-            j.a(this.this$0, 2131891853);
+            j.a(this.this$0, 2131891925);
             return Unit.a;
         }
     }
@@ -147,7 +147,7 @@ public final class j implements AppPermissionsRequests {
         @Override // kotlin.jvm.functions.Function1
         public Unit invoke(Map<String, ? extends Boolean> map) {
             m.checkNotNullParameter(map, "it");
-            j.a(this.this$0, 2131891854);
+            j.a(this.this$0, 2131891926);
             return Unit.a;
         }
     }
@@ -196,7 +196,7 @@ public final class j implements AppPermissionsRequests {
             m.checkNotNullParameter(map, "it");
             Function0 function0 = this.$onFailure;
             if (function0 == null || ((Unit) function0.mo1invoke()) == null) {
-                j.a(this.this$0, 2131891855);
+                j.a(this.this$0, 2131891927);
             }
             return Unit.a;
         }
@@ -223,16 +223,16 @@ public final class j implements AppPermissionsRequests {
                 obj = Boolean.FALSE;
             }
             if (!((Boolean) obj).booleanValue()) {
-                j.a(this.this$0, 2131891855);
+                j.a(this.this$0, 2131891927);
             } else {
                 Object obj2 = map2.get("android.permission.CAMERA");
                 if (obj2 == null) {
                     obj2 = Boolean.FALSE;
                 }
                 if (!((Boolean) obj2).booleanValue()) {
-                    j.a(this.this$0, 2131891373);
+                    j.a(this.this$0, 2131891444);
                 } else {
-                    j.a(this.this$0, 2131891373);
+                    j.a(this.this$0, 2131891444);
                 }
             }
             return Unit.a;
diff --git a/app/src/main/java/c/a/d/l.java b/app/src/main/java/c/a/d/l.java
index 2171b6b008..ffa7084697 100644
--- a/app/src/main/java/c/a/d/l.java
+++ b/app/src/main/java/c/a/d/l.java
@@ -81,7 +81,7 @@ public final class l {
     public static final List<c<WidgetAgeVerify>> b = m.listOf(a0.getOrCreateKotlinClass(WidgetAgeVerify.class));
 
     /* renamed from: c  reason: collision with root package name */
-    public static final List<c<? extends WidgetOauth2Authorize>> f44c = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetOauth2Authorize.class), a0.getOrCreateKotlinClass(WidgetOauth2AuthorizeSamsung.class)});
+    public static final List<c<? extends WidgetOauth2Authorize>> f43c = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetOauth2Authorize.class), a0.getOrCreateKotlinClass(WidgetOauth2AuthorizeSamsung.class)});
     public static final List<c<? extends AppFragment>> d = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetSettingsAccount.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountBackupCodes.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountChangePassword.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountUsernameEdit.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountEmailEdit.class), a0.getOrCreateKotlinClass(WidgetUserPasswordVerify.class), a0.getOrCreateKotlinClass(WidgetEnableMFASteps.class), a0.getOrCreateKotlinClass(WidgetSettingsAppearance.class), a0.getOrCreateKotlinClass(WidgetSettingsBehavior.class), a0.getOrCreateKotlinClass(WidgetSettingsLanguage.class), a0.getOrCreateKotlinClass(WidgetSettingsMedia.class), a0.getOrCreateKotlinClass(WidgetSettingsPremium.class), a0.getOrCreateKotlinClass(WidgetSettingsNotifications.class), a0.getOrCreateKotlinClass(WidgetSettingsUserConnections.class), a0.getOrCreateKotlinClass(WidgetSettingsVoice.class), a0.getOrCreateKotlinClass(WidgetSettingsPrivacy.class), a0.getOrCreateKotlinClass(WidgetSettingsAuthorizedApps.class), a0.getOrCreateKotlinClass(WidgetServerNotifications.class), a0.getOrCreateKotlinClass(WidgetServerSettingsOverview.class), a0.getOrCreateKotlinClass(WidgetServerSettingsChannels.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEditMember.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEditRole.class), a0.getOrCreateKotlinClass(WidgetServerSettingsIntegrations.class), a0.getOrCreateKotlinClass(WidgetServerSettingsModeration.class), a0.getOrCreateKotlinClass(WidgetServerSettingsVanityUrl.class), a0.getOrCreateKotlinClass(WidgetServerSettingsSecurity.class), a0.getOrCreateKotlinClass(WidgetServerSettingsMembers.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEmojis.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEmojisEdit.class), a0.getOrCreateKotlinClass(WidgetServerSettingsRolesList.class), a0.getOrCreateKotlinClass(WidgetServerSettingsInstantInvites.class), a0.getOrCreateKotlinClass(WidgetServerSettingsBans.class), a0.getOrCreateKotlinClass(WidgetChannelSettingsEditPermissions.class), a0.getOrCreateKotlinClass(WidgetChannelSettingsPermissionsOverview.class), a0.getOrCreateKotlinClass(WidgetAuthRegisterIdentity.class), a0.getOrCreateKotlinClass(WidgetAuthRegisterAccountInformation.class), a0.getOrCreateKotlinClass(WidgetAuthBirthday.class), a0.getOrCreateKotlinClass(WidgetAuthAgeGated.class), a0.getOrCreateKotlinClass(WidgetAuthLogin.class), a0.getOrCreateKotlinClass(WidgetAuthPhoneVerify.class), a0.getOrCreateKotlinClass(WidgetAuthResetPassword.class), a0.getOrCreateKotlinClass(WidgetSettingsDeveloper.class), a0.getOrCreateKotlinClass(WidgetSettingsBlockedUsers.class), a0.getOrCreateKotlinClass(WidgetNuxChannelPrompt.class), a0.getOrCreateKotlinClass(WidgetChoosePlan.class), a0.getOrCreateKotlinClass(WidgetServerSettingsCommunityOverview.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEnableCommunitySteps.class)});
     public static final List<c<? extends AppFragment>> e = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetUserAccountVerify.class), a0.getOrCreateKotlinClass(WidgetUserEmailVerify.class), a0.getOrCreateKotlinClass(WidgetUserEmailUpdate.class), a0.getOrCreateKotlinClass(WidgetUserPhoneManage.class), a0.getOrCreateKotlinClass(WidgetUserPhoneVerify.class), a0.getOrCreateKotlinClass(WidgetUserPasswordVerify.class)});
     public static final List<c<WidgetTabsHost>> f = m.listOf(a0.getOrCreateKotlinClass(WidgetTabsHost.class));
diff --git a/app/src/main/java/c/a/d/n.java b/app/src/main/java/c/a/d/n.java
index a5864f14f7..e176337a95 100644
--- a/app/src/main/java/c/a/d/n.java
+++ b/app/src/main/java/c/a/d/n.java
@@ -8,10 +8,10 @@ import rx.subjects.BehaviorSubject;
 /* compiled from: AppState.kt */
 public final class n {
     public static final ArrayList<Object> a = new ArrayList<>(4);
-    public static final BehaviorSubject<Integer> b = BehaviorSubject.m0(0);
+    public static final BehaviorSubject<Integer> b = BehaviorSubject.l0(0);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final n f45c = new n();
+    public static final n f44c = new n();
 
     public final synchronized void a(Object obj) {
         m.checkNotNullParameter(obj, "consumer");
diff --git a/app/src/main/java/c/a/d/n0.java b/app/src/main/java/c/a/d/n0.java
index dc7da45280..16d900485f 100644
--- a/app/src/main/java/c/a/d/n0.java
+++ b/app/src/main/java/c/a/d/n0.java
@@ -12,6 +12,6 @@ public final class n0<T, R> implements b<Boolean, Observable<? extends RtcConnec
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // j0.k.b
     public Observable<? extends RtcConnection.StateChange> call(Boolean bool) {
-        return StoreStream.Companion.getRtcConnection().getConnectionState().y(m0.i);
+        return StoreStream.Companion.getRtcConnection().getConnectionState().x(m0.i);
     }
 }
diff --git a/app/src/main/java/c/a/d/o.java b/app/src/main/java/c/a/d/o.java
index 3a68dc99aa..e7a496264d 100644
--- a/app/src/main/java/c/a/d/o.java
+++ b/app/src/main/java/c/a/d/o.java
@@ -40,7 +40,7 @@ public final class o {
 
     public static /* synthetic */ void c(Context context, CharSequence charSequence, int i, int i2) {
         if ((i2 & 4) != 0) {
-            i = 2131887622;
+            i = 2131887621;
         }
         a(context, charSequence, i);
     }
diff --git a/app/src/main/java/c/a/d/o0.java b/app/src/main/java/c/a/d/o0.java
index a7dc26619a..33d631c9b8 100644
--- a/app/src/main/java/c/a/d/o0.java
+++ b/app/src/main/java/c/a/d/o0.java
@@ -9,6 +9,6 @@ public final class o0 {
     public static final List<String> b = new ArrayList();
 
     /* renamed from: c  reason: collision with root package name */
-    public static boolean f46c;
+    public static boolean f45c;
     public static final o0 d = new o0();
 }
diff --git a/app/src/main/java/c/a/d/p.java b/app/src/main/java/c/a/d/p.java
index 208cb849e2..0c2399a889 100644
--- a/app/src/main/java/c/a/d/p.java
+++ b/app/src/main/java/c/a/d/p.java
@@ -11,6 +11,6 @@ public final class p<T, R> implements Observable.c<T, T> {
     public Object call(Object obj) {
         Observable observable = (Observable) obj;
         m.checkNotNullExpressionValue(observable, "observable");
-        return ObservableExtensionsKt.computationBuffered(observable).s();
+        return ObservableExtensionsKt.computationBuffered(observable).r();
     }
 }
diff --git a/app/src/main/java/c/a/d/q.java b/app/src/main/java/c/a/d/q.java
index 5f95a61eca..a5ad3b4d1a 100644
--- a/app/src/main/java/c/a/d/q.java
+++ b/app/src/main/java/c/a/d/q.java
@@ -58,7 +58,7 @@ public final class q {
 
         @Override // j0.k.b
         public Object call(Object obj) {
-            return ((Observable) obj).Z(new u(this)).s();
+            return ((Observable) obj).Y(new u(this)).r();
         }
     }
 
@@ -78,7 +78,7 @@ public final class q {
 
         @Override // j0.k.b
         public Object call(Object obj) {
-            return ((Observable) obj).Z(new v(this));
+            return ((Observable) obj).Y(new v(this));
         }
     }
 
diff --git a/app/src/main/java/c/a/d/q0.java b/app/src/main/java/c/a/d/q0.java
index 9880f20573..a8d21a7641 100644
--- a/app/src/main/java/c/a/d/q0.java
+++ b/app/src/main/java/c/a/d/q0.java
@@ -21,7 +21,7 @@ public final class q0 extends o implements Function1<Experiment, Unit> {
     public Unit invoke(Experiment experiment) {
         Experiment experiment2 = experiment;
         this.this$0.d = experiment2 != null ? experiment2.getBucket() : -1;
-        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c;
+        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1591c;
         boolean z2 = true;
         if (this.this$0.d < 1) {
             z2 = false;
diff --git a/app/src/main/java/c/a/d/r0/b.java b/app/src/main/java/c/a/d/r0/b.java
index b756d9f6a0..fdf5fe96d3 100644
--- a/app/src/main/java/c/a/d/r0/b.java
+++ b/app/src/main/java/c/a/d/r0/b.java
@@ -17,7 +17,7 @@ public final class b {
     public static final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String f47c;
+    public static final String f46c;
     public static final String d;
     public static final String e;
     public static final String f;
@@ -35,20 +35,20 @@ public final class b {
     public static final Regex r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final Regex f48s;
+    public static final Regex f47s;
     public static final Regex t;
     public static final Regex u;
     public static final Regex v;
     public static final Regex w;
 
     /* renamed from: x  reason: collision with root package name */
-    public static final Regex f49x;
+    public static final Regex f48x;
 
     /* renamed from: y  reason: collision with root package name */
-    public static final Regex f50y;
+    public static final Regex f49y;
 
     /* renamed from: z  reason: collision with root package name */
-    public static final Regex f51z;
+    public static final Regex f50z;
 
     static {
         b bVar = new b();
@@ -58,7 +58,7 @@ public final class b {
         String b3 = bVar.b("https://discordapp.com");
         b = b3;
         String b4 = bVar.b("https://discord.gift");
-        f47c = b4;
+        f46c = b4;
         String b5 = bVar.b("https://discord.gg");
         d = b5;
         String b6 = bVar.b("https://discord.new");
@@ -100,14 +100,14 @@ public final class b {
         String sb6 = sb5.toString();
         m.checkNotNullExpressionValue(sb6, "StringBuilder()\n        …?\")\n          .toString()");
         r = new Regex(sb6, iVar);
-        f48s = new Regex("^/connect(?:/(\\d+))?/?$", iVar);
+        f47s = new Regex("^/connect(?:/(\\d+))?/?$", iVar);
         t = new Regex("^/channels/((?:@me)|(?:\\d+))/(\\d+)(?:/(\\d+))?/?$", iVar);
         u = new Regex("^/channels/@me/-1?/?$", iVar);
         v = new Regex("^/lurk/(\\d+)(?:/(\\d+))?/?$", iVar);
         w = new Regex("^/channels/@me/user/(\\d+)/?$", iVar);
-        f49x = new Regex("^/users/(\\d+)/?$", iVar);
-        f50y = new Regex("^/discovery/?$", iVar);
-        f51z = new Regex("^/settings(/\\w+)*/?$", iVar);
+        f48x = new Regex("^/users/(\\d+)/?$", iVar);
+        f49y = new Regex("^/discovery/?$", iVar);
+        f50z = new Regex("^/settings(/\\w+)*/?$", iVar);
         A = new Regex("^/feature(/\\w+)*/?$", iVar);
         B = new Regex("^/query(/\\w+)*/?$", iVar);
         C = new Regex("^/(?:oauth2|connect)/authorize/?$", iVar);
@@ -118,7 +118,7 @@ public final class b {
         if (str == null) {
             return false;
         }
-        if (!m.areEqual(str, a) && !m.areEqual(str, b) && !m.areEqual(str, f47c) && !m.areEqual(str, e) && !m.areEqual(str, d)) {
+        if (!m.areEqual(str, a) && !m.areEqual(str, b) && !m.areEqual(str, f46c) && !m.areEqual(str, e) && !m.areEqual(str, d)) {
             return l.matches(str);
         }
         return true;
diff --git a/app/src/main/java/c/a/d/u.java b/app/src/main/java/c/a/d/u.java
index 616b9d5317..980cca0332 100644
--- a/app/src/main/java/c/a/d/u.java
+++ b/app/src/main/java/c/a/d/u.java
@@ -15,6 +15,6 @@ public final class u<T, R> implements b<Map<K, ? extends V>, Observable<? extend
     @Override // j0.k.b
     public Object call(Object obj) {
         Map map = (Map) obj;
-        return Observable.B(this.i.i).y(new r(map)).h0(s.i, new t(this, map));
+        return Observable.A(this.i.i).x(new r(map)).g0(s.i, new t(this, map));
     }
 }
diff --git a/app/src/main/java/c/a/e/a.java b/app/src/main/java/c/a/e/a.java
index 44a47c4f2a..a7912c5801 100644
--- a/app/src/main/java/c/a/e/a.java
+++ b/app/src/main/java/c/a/e/a.java
@@ -19,7 +19,7 @@ public final /* synthetic */ class a extends k implements Function1<Boolean, Uni
         boolean z2 = d.a;
         Objects.requireNonNull((d) this.receiver);
         d.a = booleanValue;
-        Subscription subscription = d.f52c;
+        Subscription subscription = d.f51c;
         if (subscription != null) {
             subscription.unsubscribe();
         }
diff --git a/app/src/main/java/c/a/e/b.java b/app/src/main/java/c/a/e/b.java
index 4a96dfc997..0f2b0bfab4 100644
--- a/app/src/main/java/c/a/e/b.java
+++ b/app/src/main/java/c/a/e/b.java
@@ -41,7 +41,7 @@ public final class b implements Application.ActivityLifecycleCallbacks {
         if (function1 != null) {
             function1 = new c(function1);
         }
-        d.f52c = q.X(cVar, (Action1) function1);
+        d.f51c = q.W(cVar, (Action1) function1);
     }
 
     @Override // android.app.Application.ActivityLifecycleCallbacks
@@ -49,7 +49,7 @@ public final class b implements Application.ActivityLifecycleCallbacks {
         m.checkNotNullParameter(activity, "activity");
         d dVar = d.d;
         d.a = false;
-        Subscription subscription = d.f52c;
+        Subscription subscription = d.f51c;
         if (subscription != null) {
             subscription.unsubscribe();
         }
diff --git a/app/src/main/java/c/a/e/d.java b/app/src/main/java/c/a/e/d.java
index db4e560ca2..719277e394 100644
--- a/app/src/main/java/c/a/e/d.java
+++ b/app/src/main/java/c/a/e/d.java
@@ -11,18 +11,18 @@ public final class d {
     public static final Subject<Boolean, Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static Subscription f52c;
+    public static Subscription f51c;
     public static final d d = new d();
 
     static {
-        BehaviorSubject m0 = BehaviorSubject.m0(true);
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(isBackgrounded)");
-        b = m0;
+        BehaviorSubject l0 = BehaviorSubject.l0(true);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(isBackgrounded)");
+        b = l0;
     }
 
     public final Observable<Boolean> a() {
-        Observable<Boolean> s2 = b.s();
-        m.checkNotNullExpressionValue(s2, "emitter.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = b.r();
+        m.checkNotNullExpressionValue(r, "emitter.distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/c/a/f/a.java b/app/src/main/java/c/a/f/a.java
index 37243f6858..ccdebb3065 100644
--- a/app/src/main/java/c/a/f/a.java
+++ b/app/src/main/java/c/a/f/a.java
@@ -24,7 +24,7 @@ public final class a<K, T extends ChipsView.a> implements View.OnClickListener {
         public final float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f53c;
+        public final int f52c;
         public final int d;
         public final int e;
         public final int f;
@@ -36,7 +36,7 @@ public final class a<K, T extends ChipsView.a> implements View.OnClickListener {
         public C0023a(int i, float f, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10) {
             this.a = i;
             this.b = f;
-            this.f53c = i2;
+            this.f52c = i2;
             this.d = i3;
             this.e = i4;
             this.f = i5;
diff --git a/app/src/main/java/c/a/f/i/a.java b/app/src/main/java/c/a/f/i/a.java
index c3c6386184..24e887db72 100644
--- a/app/src/main/java/c/a/f/i/a.java
+++ b/app/src/main/java/c/a/f/i/a.java
@@ -15,12 +15,12 @@ public final class a implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f54c;
+    public final TextView f53c;
 
     public a(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f54c = textView;
+        this.f53c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/g/a.java b/app/src/main/java/c/a/g/a.java
index 99c495f126..4291dcb0a9 100644
--- a/app/src/main/java/c/a/g/a.java
+++ b/app/src/main/java/c/a/g/a.java
@@ -17,7 +17,7 @@ public final class a {
     public final float[] b = new float[3];
 
     /* renamed from: c  reason: collision with root package name */
-    public final int[] f55c;
+    public final int[] f54c;
     public final SparseIntArray d;
     public final List<d> e;
 
@@ -45,7 +45,7 @@ public final class a {
         public int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f56c;
+        public int f55c;
         public int d;
         public int e;
         public int f;
@@ -60,7 +60,7 @@ public final class a {
 
         public final void a() {
             this.e = 255;
-            this.f56c = 255;
+            this.f55c = 255;
             this.a = 255;
             this.f = 0;
             this.d = 0;
@@ -69,7 +69,7 @@ public final class a {
             int i2 = this.h;
             if (i <= i2) {
                 while (true) {
-                    int i3 = a.this.f55c[i];
+                    int i3 = a.this.f54c[i];
                     int red = Color.red(i3);
                     int green = Color.green(i3);
                     int blue = Color.blue(i3);
@@ -82,8 +82,8 @@ public final class a {
                     if (green > this.d) {
                         this.d = green;
                     }
-                    if (green < this.f56c) {
-                        this.f56c = green;
+                    if (green < this.f55c) {
+                        this.f55c = green;
                     }
                     if (blue > this.f) {
                         this.f = blue;
@@ -101,7 +101,7 @@ public final class a {
         }
 
         public final int b() {
-            return ((this.f - this.e) + 1) * ((this.d - this.f56c) + 1) * ((this.b - this.a) + 1);
+            return ((this.f - this.e) + 1) * ((this.d - this.f55c) + 1) * ((this.b - this.a) + 1);
         }
     }
 
@@ -124,13 +124,13 @@ public final class a {
         if (i >= 1) {
             int i6 = bVar.d;
             int[] iArr = bVar.b;
-            int[] iArr2 = bVar.f57c;
+            int[] iArr2 = bVar.f56c;
             this.d = new SparseIntArray(i6);
             int length = iArr.length;
             for (int i7 = 0; i7 < length; i7++) {
                 this.d.append(iArr[i7], iArr2[i7]);
             }
-            this.f55c = new int[i6];
+            this.f54c = new int[i6];
             int i8 = 0;
             for (int i9 : iArr) {
                 int alpha = Color.alpha(i9);
@@ -145,7 +145,7 @@ public final class a {
                                 if (!z5) {
                                     z4 = false;
                                     if (z4) {
-                                        this.f55c[i8] = i9;
+                                        this.f54c[i8] = i9;
                                         i8++;
                                     }
                                 }
@@ -162,7 +162,7 @@ public final class a {
             }
             if (i8 <= i) {
                 this.e = new ArrayList();
-                int[] iArr3 = this.f55c;
+                int[] iArr3 = this.f54c;
                 for (int i10 : iArr3) {
                     this.e.add(new d(i10, this.d.get(i10)));
                 }
@@ -179,13 +179,13 @@ public final class a {
                 }
                 if (i13 > 1) {
                     int i14 = cVar.b - cVar.a;
-                    int i15 = cVar.d - cVar.f56c;
+                    int i15 = cVar.d - cVar.f55c;
                     int i16 = cVar.f - cVar.e;
                     int i17 = (i14 < i15 || i14 < i16) ? (i15 < i14 || i15 < i16) ? -1 : -2 : -3;
                     a(a.this, i17, i12, i11);
-                    Arrays.sort(a.this.f55c, cVar.g, cVar.h + 1);
+                    Arrays.sort(a.this.f54c, cVar.g, cVar.h + 1);
                     a(a.this, i17, cVar.g, cVar.h);
-                    int i18 = i17 != -3 ? i17 != -2 ? i17 != -1 ? (cVar.a + cVar.b) / 2 : (cVar.e + cVar.f) / 2 : (cVar.f56c + cVar.d) / 2 : (cVar.a + cVar.b) / 2;
+                    int i18 = i17 != -3 ? i17 != -2 ? i17 != -1 ? (cVar.a + cVar.b) / 2 : (cVar.e + cVar.f) / 2 : (cVar.f55c + cVar.d) / 2 : (cVar.a + cVar.b) / 2;
                     int i19 = cVar.g;
                     int i20 = cVar.h;
                     while (true) {
@@ -193,7 +193,7 @@ public final class a {
                             i19 = cVar.g;
                             break;
                         }
-                        int i21 = a.this.f55c[i19];
+                        int i21 = a.this.f54c[i19];
                         if (i17 != -3) {
                             if (i17 != -2) {
                                 if (i17 == -1 && Color.blue(i21) > i18) {
@@ -229,7 +229,7 @@ public final class a {
                     i2 = 0;
                     while (true) {
                         a aVar = a.this;
-                        int i24 = aVar.f55c[i22];
+                        int i24 = aVar.f54c[i22];
                         int i25 = aVar.d.get(i24);
                         i5 += i25;
                         i4 = (Color.red(i24) * i25) + i4;
@@ -297,14 +297,14 @@ public final class a {
         Objects.requireNonNull(aVar);
         if (i == -2) {
             while (i2 <= i3) {
-                int[] iArr = aVar.f55c;
+                int[] iArr = aVar.f54c;
                 int i4 = iArr[i2];
                 iArr[i2] = Color.rgb((i4 >> 8) & 255, (i4 >> 16) & 255, i4 & 255);
                 i2++;
             }
         } else if (i == -1) {
             while (i2 <= i3) {
-                int[] iArr2 = aVar.f55c;
+                int[] iArr2 = aVar.f54c;
                 int i5 = iArr2[i2];
                 iArr2[i2] = Color.rgb(i5 & 255, (i5 >> 8) & 255, (i5 >> 16) & 255);
                 i2++;
diff --git a/app/src/main/java/c/a/g/b.java b/app/src/main/java/c/a/g/b.java
index 0ec64bf38a..d0bdc4bac4 100644
--- a/app/src/main/java/c/a/g/b.java
+++ b/app/src/main/java/c/a/g/b.java
@@ -9,7 +9,7 @@ public final class b {
     public final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int[] f57c;
+    public final int[] f56c;
     public final int d;
 
     /* compiled from: ColorHistogram.kt */
@@ -41,7 +41,7 @@ public final class b {
         int[] iArr2 = new int[i];
         this.b = iArr2;
         int[] iArr3 = new int[i];
-        this.f57c = iArr3;
+        this.f56c = iArr3;
         if (!(iArr.length == 0)) {
             int i6 = iArr[0];
             iArr2[0] = i6;
@@ -50,13 +50,13 @@ public final class b {
                 int length2 = iArr.length;
                 for (int i7 = 1; i7 < length2; i7++) {
                     if (iArr[i7] == i6) {
-                        int[] iArr4 = this.f57c;
+                        int[] iArr4 = this.f56c;
                         iArr4[i2] = iArr4[i2] + 1;
                     } else {
                         i6 = iArr[i7];
                         i2++;
                         this.b[i2] = i6;
-                        this.f57c[i2] = 1;
+                        this.f56c[i2] = 1;
                     }
                 }
             }
diff --git a/app/src/main/java/c/a/g/d.java b/app/src/main/java/c/a/g/d.java
index 08ecdf443c..12919b5a38 100644
--- a/app/src/main/java/c/a/g/d.java
+++ b/app/src/main/java/c/a/g/d.java
@@ -9,7 +9,7 @@ public final class d {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f58c;
+    public final int f57c;
     public final int d;
     public final int e;
     public float[] f;
@@ -17,7 +17,7 @@ public final class d {
     public d(int i, int i2) {
         this.a = Color.red(i);
         this.b = Color.green(i);
-        this.f58c = Color.blue(i);
+        this.f57c = Color.blue(i);
         this.d = i;
         this.e = i2;
     }
@@ -25,7 +25,7 @@ public final class d {
     public d(int i, int i2, int i3, int i4) {
         this.a = i;
         this.b = i2;
-        this.f58c = i3;
+        this.f57c = i3;
         this.d = Color.rgb(i, i2, i3);
         this.e = i4;
     }
@@ -34,7 +34,7 @@ public final class d {
         if (this.f == null) {
             float[] fArr = new float[3];
             this.f = fArr;
-            c.a(this.a, this.b, this.f58c, fArr);
+            c.a(this.a, this.b, this.f57c, fArr);
         }
         return this.f;
     }
diff --git a/app/src/main/java/c/a/i/a.java b/app/src/main/java/c/a/i/a.java
index 10fa57b8a9..7a54542d32 100644
--- a/app/src/main/java/c/a/i/a.java
+++ b/app/src/main/java/c/a/i/a.java
@@ -15,14 +15,14 @@ public final class a implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f59c;
+    public final MaterialButton f58c;
     @NonNull
     public final MaterialButton d;
 
     public a(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f59c = materialButton;
+        this.f58c = materialButton;
         this.d = materialButton2;
     }
 
diff --git a/app/src/main/java/c/a/i/a0.java b/app/src/main/java/c/a/i/a0.java
index b60e197a19..82a6d98d75 100644
--- a/app/src/main/java/c/a/i/a0.java
+++ b/app/src/main/java/c/a/i/a0.java
@@ -16,14 +16,14 @@ public final class a0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f60c;
+    public final LinkifiedTextView f59c;
     @NonNull
     public final TextView d;
 
     public a0(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f60c = linkifiedTextView;
+        this.f59c = linkifiedTextView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/c/a/i/a1.java b/app/src/main/java/c/a/i/a1.java
index 2193e9ee60..1e7ffd7eb7 100644
--- a/app/src/main/java/c/a/i/a1.java
+++ b/app/src/main/java/c/a/i/a1.java
@@ -13,7 +13,7 @@ public final class a1 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f61c;
+    public final MaterialButton f60c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -22,7 +22,7 @@ public final class a1 implements ViewBinding {
     public a1(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull MaterialButton materialButton4) {
         this.a = view;
         this.b = materialButton;
-        this.f61c = materialButton2;
+        this.f60c = materialButton2;
         this.d = materialButton3;
         this.e = materialButton4;
     }
diff --git a/app/src/main/java/c/a/i/a2.java b/app/src/main/java/c/a/i/a2.java
index b13e25634f..68ce1d21f2 100644
--- a/app/src/main/java/c/a/i/a2.java
+++ b/app/src/main/java/c/a/i/a2.java
@@ -1,21 +1,35 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
+import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewInteractionFailedLabelBinding */
+import com.google.android.material.card.MaterialCardView;
+/* compiled from: ViewExperimentOverrideBinding */
 public final class a2 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final View a;
     @NonNull
     public final TextView b;
+    @NonNull
 
-    public a2(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
-        this.a = constraintLayout;
+    /* renamed from: c  reason: collision with root package name */
+    public final Spinner f61c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final TextView f;
+
+    public a2(@NonNull View view, @NonNull TextView textView, @NonNull Spinner spinner, @NonNull MaterialCardView materialCardView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
+        this.a = view;
         this.b = textView;
+        this.f61c = spinner;
+        this.d = textView2;
+        this.e = textView3;
+        this.f = textView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/a3.java b/app/src/main/java/c/a/i/a3.java
index edee431f34..4a2617467e 100644
--- a/app/src/main/java/c/a/i/a3.java
+++ b/app/src/main/java/c/a/i/a3.java
@@ -1,44 +1,29 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-/* compiled from: ViewServerSettingsUploadBannerBinding */
+/* compiled from: ViewServerSettingsRegionBinding */
 public final class a3 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final FrameLayout b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f62c;
+    public final ImageView f62c;
     @NonNull
-    public final SimpleDraweeView d;
-    @NonNull
-    public final FloatingActionButton e;
-    @NonNull
-    public final LinkifiedTextView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final TextView h;
+    public final LinearLayout d;
 
-    public a3(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FloatingActionButton floatingActionButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull TextView textView3) {
+    public a3(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
-        this.b = frameLayout;
-        this.f62c = textView;
-        this.d = simpleDraweeView;
-        this.e = floatingActionButton;
-        this.f = linkifiedTextView;
-        this.g = textView2;
-        this.h = textView3;
+        this.b = textView;
+        this.f62c = imageView;
+        this.d = linearLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/a4.java b/app/src/main/java/c/a/i/a4.java
index 73452e3d44..98fc34ffe5 100644
--- a/app/src/main/java/c/a/i/a4.java
+++ b/app/src/main/java/c/a/i/a4.java
@@ -2,45 +2,47 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.widgets.voice.fullscreen.grid.PrivateCallBlurredGridView;
-import com.discord.widgets.voice.fullscreen.grid.PrivateCallGridView;
-/* compiled from: WidgetCallFullscreenPrivateCallBinding */
+import com.discord.app.AppViewFlipper;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetAcceptGiftDialogBinding */
 public final class a4 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final PrivateCallBlurredGridView b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
     public final TextView f63c;
     @NonNull
-    public final RelativeLayout d;
+    public final MaterialButton d;
     @NonNull
     public final LinearLayout e;
     @NonNull
-    public final PrivateCallGridView f;
+    public final LinkifiedTextView f;
     @NonNull
-    public final TextView g;
+    public final AppViewFlipper g;
     @NonNull
     public final TextView h;
     @NonNull
-    public final TextView i;
+    public final ProgressBar i;
 
-    public a4(@NonNull RelativeLayout relativeLayout, @NonNull PrivateCallBlurredGridView privateCallBlurredGridView, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout2, @NonNull LinearLayout linearLayout, @NonNull PrivateCallGridView privateCallGridView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
-        this.a = relativeLayout;
-        this.b = privateCallBlurredGridView;
+    public a4(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView2, @NonNull ProgressBar progressBar) {
+        this.a = linearLayout;
+        this.b = simpleDraweeView;
         this.f63c = textView;
-        this.d = relativeLayout2;
-        this.e = linearLayout;
-        this.f = privateCallGridView;
-        this.g = textView2;
-        this.h = textView3;
-        this.i = textView4;
+        this.d = materialButton;
+        this.e = linearLayout3;
+        this.f = linkifiedTextView;
+        this.g = appViewFlipper;
+        this.h = textView2;
+        this.i = progressBar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/a5.java b/app/src/main/java/c/a/i/a5.java
index 8b05d2631f..a943c3e3c9 100644
--- a/app/src/main/java/c/a/i/a5.java
+++ b/app/src/main/java/c/a/i/a5.java
@@ -1,20 +1,58 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.Space;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
+import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetRemoteAuthNotFoundBinding */
+/* compiled from: WidgetMusicRichPresenceBinding */
 public final class a5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final LinearLayout b;
+    @NonNull
 
-    public a5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton) {
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f64c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final SimpleDraweeView e;
+    @NonNull
+    public final SimpleDraweeView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
+    @NonNull
+    public final MaterialButton i;
+    @NonNull
+    public final SeekBar j;
+    @NonNull
+    public final TextView k;
+    @NonNull
+    public final TextView l;
+
+    public a5(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull FrameLayout frameLayout, @NonNull MaterialButton materialButton, @NonNull SeekBar seekBar, @NonNull TextView textView5, @NonNull TextView textView6) {
         this.a = linearLayout;
-        this.b = materialButton;
+        this.b = linearLayout2;
+        this.f64c = textView;
+        this.d = textView2;
+        this.e = simpleDraweeView;
+        this.f = simpleDraweeView2;
+        this.g = textView3;
+        this.h = textView4;
+        this.i = materialButton;
+        this.j = seekBar;
+        this.k = textView5;
+        this.l = textView6;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/b.java b/app/src/main/java/c/a/i/b.java
index 450d864efd..62df684353 100644
--- a/app/src/main/java/c/a/i/b.java
+++ b/app/src/main/java/c/a/i/b.java
@@ -16,7 +16,7 @@ public final class b implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RadioGroup f64c;
+    public final RadioGroup f65c;
     @NonNull
     public final MaterialRadioButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class b implements ViewBinding {
     public b(@NonNull LinearLayout linearLayout, @NonNull MaterialRadioButton materialRadioButton, @NonNull TextView textView, @NonNull RadioGroup radioGroup, @NonNull MaterialRadioButton materialRadioButton2, @NonNull MaterialRadioButton materialRadioButton3, @NonNull MaterialRadioButton materialRadioButton4) {
         this.a = linearLayout;
         this.b = materialRadioButton;
-        this.f64c = radioGroup;
+        this.f65c = radioGroup;
         this.d = materialRadioButton2;
         this.e = materialRadioButton3;
         this.f = materialRadioButton4;
diff --git a/app/src/main/java/c/a/i/b0.java b/app/src/main/java/c/a/i/b0.java
index c84dd54fa4..0426b5c20e 100644
--- a/app/src/main/java/c/a/i/b0.java
+++ b/app/src/main/java/c/a/i/b0.java
@@ -16,12 +16,12 @@ public final class b0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f65c;
+    public final MaterialButton f66c;
 
     public b0(@NonNull ConstraintLayout constraintLayout, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = phoneOrEmailInputView;
-        this.f65c = materialButton;
+        this.f66c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/b2.java b/app/src/main/java/c/a/i/b2.java
index 6d365244d0..c5ec4ac46d 100644
--- a/app/src/main/java/c/a/i/b2.java
+++ b/app/src/main/java/c/a/i/b2.java
@@ -1,25 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ProgressBar;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewLoadingButtonBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewGuildBinding */
 public final class b2 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final MaterialButton b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ProgressBar f66c;
+    public final TextView f67c;
 
-    public b2(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull ProgressBar progressBar) {
+    public b2(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = view;
-        this.b = materialButton;
-        this.f66c = progressBar;
+        this.b = simpleDraweeView;
+        this.f67c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/b3.java b/app/src/main/java/c/a/i/b3.java
index 92a368a562..df565999ba 100644
--- a/app/src/main/java/c/a/i/b3.java
+++ b/app/src/main/java/c/a/i/b3.java
@@ -1,44 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-/* compiled from: ViewServerSettingsUploadSplashBinding */
+/* compiled from: ViewServerSettingsRegionHelpBinding */
 public final class b3 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final FrameLayout b;
+    public final LinkifiedTextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f67c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final SimpleDraweeView e;
-    @NonNull
-    public final LinkifiedTextView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final TextView h;
+    public final LinearLayout f68c;
 
-    public b3(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull TextView textView3) {
+    public b3(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
-        this.b = frameLayout;
-        this.f67c = floatingActionButton;
-        this.d = textView;
-        this.e = simpleDraweeView;
-        this.f = linkifiedTextView;
-        this.g = textView2;
-        this.h = textView3;
+        this.b = linkifiedTextView;
+        this.f68c = linearLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/b4.java b/app/src/main/java/c/a/i/b4.java
index f9d228cd15..2b16267934 100644
--- a/app/src/main/java/c/a/i/b4.java
+++ b/app/src/main/java/c/a/i/b4.java
@@ -5,22 +5,23 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.utilities.view.text.LinkifiedTextView;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetChannelSettingsCannotDeleteBinding */
+/* compiled from: WidgetAuthMfaInfoBinding */
 public final class b4 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f68c;
+    public final LinkifiedTextView f69c;
 
-    public b4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2) {
+    public b4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f68c = materialButton;
+        this.b = materialButton;
+        this.f69c = linkifiedTextView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/b5.java b/app/src/main/java/c/a/i/b5.java
index 8feab484f9..d30fdf1a44 100644
--- a/app/src/main/java/c/a/i/b5.java
+++ b/app/src/main/java/c/a/i/b5.java
@@ -2,28 +2,43 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.Space;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
+import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.switchmaterial.SwitchMaterial;
-/* compiled from: WidgetRemoteAuthPendingLoginBinding */
+/* compiled from: WidgetPlatformRichPresenceBinding */
 public final class b5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final LinearLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f69c;
+    public final TextView f70c;
     @NonNull
-    public final SwitchMaterial d;
+    public final SimpleDraweeView d;
+    @NonNull
+    public final SimpleDraweeView e;
+    @NonNull
+    public final MaterialButton f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
 
-    public b5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull SwitchMaterial switchMaterial) {
+    public b5(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
-        this.b = materialButton;
-        this.f69c = materialButton2;
-        this.d = switchMaterial;
+        this.b = linearLayout2;
+        this.f70c = textView;
+        this.d = simpleDraweeView;
+        this.e = simpleDraweeView2;
+        this.f = materialButton;
+        this.g = textView2;
+        this.h = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/c.java b/app/src/main/java/c/a/i/c.java
index c3022a60be..1f4b9d4589 100644
--- a/app/src/main/java/c/a/i/c.java
+++ b/app/src/main/java/c/a/i/c.java
@@ -11,16 +11,19 @@ public final class c implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
     @NonNull
-    public final TextView b;
+    public final ConstraintLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f70c;
+    public final TextView f71c;
+    @NonNull
+    public final MaxHeightRecyclerView d;
 
     public c(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull MaxHeightRecyclerView maxHeightRecyclerView) {
         this.a = constraintLayout;
-        this.b = textView;
-        this.f70c = maxHeightRecyclerView;
+        this.b = constraintLayout2;
+        this.f71c = textView;
+        this.d = maxHeightRecyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/c0.java b/app/src/main/java/c/a/i/c0.java
index 835b99b44d..32cad2ffee 100644
--- a/app/src/main/java/c/a/i/c0.java
+++ b/app/src/main/java/c/a/i/c0.java
@@ -16,7 +16,7 @@ public final class c0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f71c;
+    public final LoadingButton f72c;
     @NonNull
     public final View d;
     @NonNull
@@ -25,7 +25,7 @@ public final class c0 implements ViewBinding {
     public c0(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LoadingButton loadingButton, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull g0 g0Var) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f71c = loadingButton;
+        this.f72c = loadingButton;
         this.d = view;
         this.e = g0Var;
     }
diff --git a/app/src/main/java/c/a/i/c1.java b/app/src/main/java/c/a/i/c1.java
index a2e53e71af..cf6253c027 100644
--- a/app/src/main/java/c/a/i/c1.java
+++ b/app/src/main/java/c/a/i/c1.java
@@ -16,7 +16,7 @@ public final class c1 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f72c;
+    public final TextView f73c;
     @NonNull
     public final TextSwitcher d;
     @NonNull
@@ -25,7 +25,7 @@ public final class c1 implements ViewBinding {
     public c1(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextSwitcher textSwitcher, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView) {
         this.a = linearLayout;
         this.b = textView;
-        this.f72c = textView2;
+        this.f73c = textView2;
         this.d = textSwitcher;
         this.e = simpleDraweeSpanTextView;
     }
diff --git a/app/src/main/java/c/a/i/c2.java b/app/src/main/java/c/a/i/c2.java
index c0c246f88b..5b24d3ae4e 100644
--- a/app/src/main/java/c/a/i/c2.java
+++ b/app/src/main/java/c/a/i/c2.java
@@ -1,30 +1,21 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewMobileReportBlockUserBinding */
+/* compiled from: ViewInteractionFailedLabelBinding */
 public final class c2 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
-    @NonNull
-    public final SimpleDraweeView b;
+    public final ConstraintLayout a;
     @NonNull
+    public final TextView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f73c;
-    @NonNull
-    public final TextView d;
-
-    public c2(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
-        this.a = linearLayout;
-        this.b = simpleDraweeView;
-        this.f73c = materialButton;
-        this.d = textView3;
+    public c2(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
+        this.a = constraintLayout;
+        this.b = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/c3.java b/app/src/main/java/c/a/i/c3.java
index 8edbc93e8c..1b96291710 100644
--- a/app/src/main/java/c/a/i/c3.java
+++ b/app/src/main/java/c/a/i/c3.java
@@ -1,25 +1,32 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.checkbox.MaterialCheckBox;
-/* compiled from: ViewSettingCheckBinding */
+import com.discord.views.CheckedSetting;
+/* compiled from: ViewServerSettingsSystemChannelWrapBinding */
 public final class c3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final MaterialCheckBox b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f74c;
+    public final CheckedSetting f74c;
+    @NonNull
+    public final CheckedSetting d;
+    @NonNull
+    public final LinearLayout e;
 
-    public c3(@NonNull View view, @NonNull MaterialCheckBox materialCheckBox, @NonNull ConstraintLayout constraintLayout) {
-        this.a = view;
-        this.b = materialCheckBox;
-        this.f74c = constraintLayout;
+    public c3(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull LinearLayout linearLayout2) {
+        this.a = linearLayout;
+        this.b = textView;
+        this.f74c = checkedSetting;
+        this.d = checkedSetting2;
+        this.e = linearLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/c4.java b/app/src/main/java/c/a/i/c4.java
index 0367d12090..e11a7fce1a 100644
--- a/app/src/main/java/c/a/i/c4.java
+++ b/app/src/main/java/c/a/i/c4.java
@@ -1,61 +1,18 @@
 package c.a.i;
 
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetChannelSettingsDeleteBinding */
+/* compiled from: WidgetCallFullscreenAudioShareWarningBinding */
 public final class c4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
-    @NonNull
-    public final TextView b;
+    public final View a;
     @NonNull
+    public final View b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f75c;
-    @NonNull
-    public final MaterialButton d;
-    @NonNull
-    public final TextView e;
-
-    public c4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2) {
-        this.a = linearLayout;
-        this.b = textView;
-        this.f75c = materialButton;
-        this.d = materialButton2;
-        this.e = textView2;
-    }
-
-    @NonNull
-    public static c4 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558883, (ViewGroup) null, false);
-        if (!z2) {
-            int i = 2131362324;
-            TextView textView = (TextView) inflate.findViewById(2131362324);
-            if (textView != null) {
-                i = 2131362325;
-                MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362325);
-                if (materialButton != null) {
-                    i = 2131362326;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131362326);
-                    if (materialButton2 != null) {
-                        i = 2131362327;
-                        TextView textView2 = (TextView) inflate.findViewById(2131362327);
-                        if (textView2 != null) {
-                            return new c4((LinearLayout) inflate, textView, materialButton, materialButton2, textView2);
-                        }
-                    }
-                }
-            }
-            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
-        }
-        throw null;
+    public c4(@NonNull View view, @NonNull View view2) {
+        this.a = view;
+        this.b = view2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/c5.java b/app/src/main/java/c/a/i/c5.java
index 5109f593ef..3ff6ec7859 100644
--- a/app/src/main/java/c/a/i/c5.java
+++ b/app/src/main/java/c/a/i/c5.java
@@ -1,20 +1,29 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetRemoteAuthSuccessBinding */
+/* compiled from: WidgetPremiumUpsellBinding */
 public final class c5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final TextView b;
+    @NonNull
 
-    public c5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton) {
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f75c;
+    @NonNull
+    public final ImageView d;
+
+    public c5(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
         this.a = linearLayout;
-        this.b = materialButton;
+        this.b = textView;
+        this.f75c = textView2;
+        this.d = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/d2.java b/app/src/main/java/c/a/i/d2.java
index 7349939e74..aabd74fc4d 100644
--- a/app/src/main/java/c/a/i/d2.java
+++ b/app/src/main/java/c/a/i/d2.java
@@ -1,31 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.TextView;
+import android.widget.ProgressBar;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewMobileReportsChannelPreviewBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewLoadingButtonBinding */
 public final class d2 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final View a;
     @NonNull
-    public final TextView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f79c;
-    @NonNull
-    public final LinkifiedTextView d;
+    public final ProgressBar f79c;
 
-    public d2(@NonNull ConstraintLayout constraintLayout, @NonNull Guideline guideline, @NonNull TextView textView, @NonNull Guideline guideline2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull Guideline guideline3, @NonNull Guideline guideline4) {
-        this.a = constraintLayout;
-        this.b = textView;
-        this.f79c = simpleDraweeView;
-        this.d = linkifiedTextView;
+    public d2(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull ProgressBar progressBar) {
+        this.a = view;
+        this.b = materialButton;
+        this.f79c = progressBar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/d3.java b/app/src/main/java/c/a/i/d3.java
index 7c0690a1d8..40187e62d2 100644
--- a/app/src/main/java/c/a/i/d3.java
+++ b/app/src/main/java/c/a/i/d3.java
@@ -1,25 +1,44 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.radiobutton.MaterialRadioButton;
-/* compiled from: ViewSettingRadioBinding */
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+/* compiled from: ViewServerSettingsUploadBannerBinding */
 public final class d3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final MaterialRadioButton b;
+    public final FrameLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f80c;
+    public final TextView f80c;
+    @NonNull
+    public final SimpleDraweeView d;
+    @NonNull
+    public final FloatingActionButton e;
+    @NonNull
+    public final LinkifiedTextView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
 
-    public d3(@NonNull View view, @NonNull MaterialRadioButton materialRadioButton, @NonNull ConstraintLayout constraintLayout) {
-        this.a = view;
-        this.b = materialRadioButton;
-        this.f80c = constraintLayout;
+    public d3(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FloatingActionButton floatingActionButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull TextView textView3) {
+        this.a = linearLayout;
+        this.b = frameLayout;
+        this.f80c = textView;
+        this.d = simpleDraweeView;
+        this.e = floatingActionButton;
+        this.f = linkifiedTextView;
+        this.g = textView2;
+        this.h = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/d4.java b/app/src/main/java/c/a/i/d4.java
index cb890b01e6..36439212dd 100644
--- a/app/src/main/java/c/a/i/d4.java
+++ b/app/src/main/java/c/a/i/d4.java
@@ -2,31 +2,45 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetChatInputGuardBinding */
+import com.discord.widgets.voice.fullscreen.grid.PrivateCallBlurredGridView;
+import com.discord.widgets.voice.fullscreen.grid.PrivateCallGridView;
+/* compiled from: WidgetCallFullscreenPrivateCallBinding */
 public final class d4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final RelativeLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final PrivateCallBlurredGridView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f81c;
+    public final TextView f81c;
     @NonNull
-    public final TextView d;
+    public final RelativeLayout d;
     @NonNull
-    public final TextView e;
+    public final LinearLayout e;
+    @NonNull
+    public final PrivateCallGridView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
+    @NonNull
+    public final TextView i;
 
-    public d4(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = linearLayout;
-        this.b = materialButton;
-        this.f81c = materialButton2;
-        this.d = textView;
-        this.e = textView2;
+    public d4(@NonNull RelativeLayout relativeLayout, @NonNull PrivateCallBlurredGridView privateCallBlurredGridView, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout2, @NonNull LinearLayout linearLayout, @NonNull PrivateCallGridView privateCallGridView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
+        this.a = relativeLayout;
+        this.b = privateCallBlurredGridView;
+        this.f81c = textView;
+        this.d = relativeLayout2;
+        this.e = linearLayout;
+        this.f = privateCallGridView;
+        this.g = textView2;
+        this.h = textView3;
+        this.i = textView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/d5.java b/app/src/main/java/c/a/i/d5.java
index 4fdb4052de..ab40c15982 100644
--- a/app/src/main/java/c/a/i/d5.java
+++ b/app/src/main/java/c/a/i/d5.java
@@ -2,28 +2,19 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetServerSettingsConfirmDisableIntegrationBinding */
+/* compiled from: WidgetRemoteAuthNotFoundBinding */
 public final class d5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
-    @NonNull
+    public final MaterialButton b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f82c;
-    @NonNull
-    public final MaterialButton d;
-
-    public d5(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2) {
+    public d5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f82c = materialButton;
-        this.d = materialButton2;
+        this.b = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/e.java b/app/src/main/java/c/a/i/e.java
index a20cd6cfd2..50dae6381b 100644
--- a/app/src/main/java/c/a/i/e.java
+++ b/app/src/main/java/c/a/i/e.java
@@ -15,12 +15,12 @@ public final class e implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f83c;
+    public final MaterialButton f82c;
 
     public e(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f83c = materialButton;
+        this.f82c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/e0.java b/app/src/main/java/c/a/i/e0.java
index aa3b6dc950..c181d12566 100644
--- a/app/src/main/java/c/a/i/e0.java
+++ b/app/src/main/java/c/a/i/e0.java
@@ -17,12 +17,12 @@ public final class e0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f84c;
+    public final LoadingButton f83c;
 
     public e0(@NonNull ConstraintLayout constraintLayout, @NonNull RecyclerView recyclerView, @NonNull LoadingButton loadingButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = recyclerView;
-        this.f84c = loadingButton;
+        this.f83c = loadingButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/e2.java b/app/src/main/java/c/a/i/e2.java
index dbac29c473..141afd630b 100644
--- a/app/src/main/java/c/a/i/e2.java
+++ b/app/src/main/java/c/a/i/e2.java
@@ -1,21 +1,30 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewMobileReportsChildBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewMobileReportBlockUserBinding */
 public final class e2 implements ViewBinding {
     @NonNull
-    public final FrameLayout a;
+    public final LinearLayout a;
+    @NonNull
+    public final SimpleDraweeView b;
     @NonNull
-    public final TextView b;
 
-    public e2(@NonNull FrameLayout frameLayout, @NonNull CardView cardView, @NonNull TextView textView) {
-        this.a = frameLayout;
-        this.b = textView;
+    /* renamed from: c  reason: collision with root package name */
+    public final MaterialButton f84c;
+    @NonNull
+    public final TextView d;
+
+    public e2(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
+        this.a = linearLayout;
+        this.b = simpleDraweeView;
+        this.f84c = materialButton;
+        this.d = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/e3.java b/app/src/main/java/c/a/i/e3.java
index 55d6299b4b..9391d6d1d8 100644
--- a/app/src/main/java/c/a/i/e3.java
+++ b/app/src/main/java/c/a/i/e3.java
@@ -1,31 +1,44 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewSettingSharedBinding */
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+/* compiled from: ViewServerSettingsUploadSplashBinding */
 public final class e3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final ImageView b;
+    public final FrameLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f85c;
+    public final FloatingActionButton f85c;
     @NonNull
     public final TextView d;
     @NonNull
-    public final TextView e;
+    public final SimpleDraweeView e;
+    @NonNull
+    public final LinkifiedTextView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
 
-    public e3(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
-        this.a = view;
-        this.b = imageView;
-        this.f85c = textView;
-        this.d = textView2;
-        this.e = textView3;
+    public e3(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull TextView textView3) {
+        this.a = linearLayout;
+        this.b = frameLayout;
+        this.f85c = floatingActionButton;
+        this.d = textView;
+        this.e = simpleDraweeView;
+        this.f = linkifiedTextView;
+        this.g = textView2;
+        this.h = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/e4.java b/app/src/main/java/c/a/i/e4.java
index eb892e6ec4..70ecfe7c61 100644
--- a/app/src/main/java/c/a/i/e4.java
+++ b/app/src/main/java/c/a/i/e4.java
@@ -1,27 +1,26 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetChatInputMemberVerificationGuardBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetChannelSettingsCannotDeleteBinding */
 public final class e4 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final ImageView b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f86c;
+    public final MaterialButton f86c;
 
-    public e4(@NonNull RelativeLayout relativeLayout, @NonNull CardView cardView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView) {
-        this.a = relativeLayout;
-        this.b = imageView2;
-        this.f86c = textView;
+    public e4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2) {
+        this.a = linearLayout;
+        this.b = textView;
+        this.f86c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/e5.java b/app/src/main/java/c/a/i/e5.java
index fb8486950b..98903c5853 100644
--- a/app/src/main/java/c/a/i/e5.java
+++ b/app/src/main/java/c/a/i/e5.java
@@ -2,30 +2,28 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetServerSettingsOverviewSectionAfkChannelBinding */
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.switchmaterial.SwitchMaterial;
+/* compiled from: WidgetRemoteAuthPendingLoginBinding */
 public final class e5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f87c;
+    public final MaterialButton f87c;
     @NonNull
-    public final TextView d;
-    @NonNull
-    public final LinearLayout e;
+    public final SwitchMaterial d;
 
-    public e5(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3) {
+    public e5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull SwitchMaterial switchMaterial) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f87c = linearLayout2;
-        this.d = textView2;
-        this.e = linearLayout3;
+        this.b = materialButton;
+        this.f87c = materialButton2;
+        this.d = switchMaterial;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/f2.java b/app/src/main/java/c/a/i/f2.java
index 9273df2ce2..bb14c49eb2 100644
--- a/app/src/main/java/c/a/i/f2.java
+++ b/app/src/main/java/c/a/i/f2.java
@@ -1,16 +1,31 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.CheckedSetting;
-/* compiled from: ViewMobileReportsMulticheckItemBinding */
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewMobileReportsChannelPreviewBinding */
 public final class f2 implements ViewBinding {
     @NonNull
-    public final CheckedSetting a;
+    public final ConstraintLayout a;
+    @NonNull
+    public final TextView b;
+    @NonNull
 
-    public f2(@NonNull CheckedSetting checkedSetting) {
-        this.a = checkedSetting;
+    /* renamed from: c  reason: collision with root package name */
+    public final SimpleDraweeView f90c;
+    @NonNull
+    public final LinkifiedTextView d;
+
+    public f2(@NonNull ConstraintLayout constraintLayout, @NonNull Guideline guideline, @NonNull TextView textView, @NonNull Guideline guideline2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull Guideline guideline3, @NonNull Guideline guideline4) {
+        this.a = constraintLayout;
+        this.b = textView;
+        this.f90c = simpleDraweeView;
+        this.d = linkifiedTextView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/f3.java b/app/src/main/java/c/a/i/f3.java
index 714dc6be4c..d47b458ba7 100644
--- a/app/src/main/java/c/a/i/f3.java
+++ b/app/src/main/java/c/a/i/f3.java
@@ -4,22 +4,22 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.switchmaterial.SwitchMaterial;
-/* compiled from: ViewSettingSwitchBinding */
+import com.google.android.material.checkbox.MaterialCheckBox;
+/* compiled from: ViewSettingCheckBinding */
 public final class f3 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final SwitchMaterial b;
+    public final MaterialCheckBox b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f90c;
+    public final ConstraintLayout f91c;
 
-    public f3(@NonNull View view, @NonNull SwitchMaterial switchMaterial, @NonNull ConstraintLayout constraintLayout) {
+    public f3(@NonNull View view, @NonNull MaterialCheckBox materialCheckBox, @NonNull ConstraintLayout constraintLayout) {
         this.a = view;
-        this.b = switchMaterial;
-        this.f90c = constraintLayout;
+        this.b = materialCheckBox;
+        this.f91c = constraintLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/f4.java b/app/src/main/java/c/a/i/f4.java
index 86bb609d11..e32a3c273c 100644
--- a/app/src/main/java/c/a/i/f4.java
+++ b/app/src/main/java/c/a/i/f4.java
@@ -1,21 +1,61 @@
 package c.a.i;
 
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetChatInputPermReqFilesBinding */
+/* compiled from: WidgetChannelSettingsDeleteBinding */
 public final class f4 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
     public final TextView b;
+    @NonNull
 
-    public f4(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
+    /* renamed from: c  reason: collision with root package name */
+    public final MaterialButton f92c;
+    @NonNull
+    public final MaterialButton d;
+    @NonNull
+    public final TextView e;
+
+    public f4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
+        this.f92c = materialButton;
+        this.d = materialButton2;
+        this.e = textView2;
+    }
+
+    @NonNull
+    public static f4 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
+        View inflate = layoutInflater.inflate(2131558886, (ViewGroup) null, false);
+        if (!z2) {
+            int i = 2131362338;
+            TextView textView = (TextView) inflate.findViewById(2131362338);
+            if (textView != null) {
+                i = 2131362339;
+                MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362339);
+                if (materialButton != null) {
+                    i = 2131362340;
+                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131362340);
+                    if (materialButton2 != null) {
+                        i = 2131362341;
+                        TextView textView2 = (TextView) inflate.findViewById(2131362341);
+                        if (textView2 != null) {
+                            return new f4((LinearLayout) inflate, textView, materialButton, materialButton2, textView2);
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
+        }
+        throw null;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/f5.java b/app/src/main/java/c/a/i/f5.java
index 3d0f6efbe7..58f4ee040f 100644
--- a/app/src/main/java/c/a/i/f5.java
+++ b/app/src/main/java/c/a/i/f5.java
@@ -5,21 +5,16 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetSettingsPrivacyDefaultsBinding */
+/* compiled from: WidgetRemoteAuthSuccessBinding */
 public final class f5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
     public final MaterialButton b;
-    @NonNull
 
-    /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f91c;
-
-    public f5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
+    public f5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f91c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/g.java b/app/src/main/java/c/a/i/g.java
index 7b97e894f3..b169c82668 100644
--- a/app/src/main/java/c/a/i/g.java
+++ b/app/src/main/java/c/a/i/g.java
@@ -15,7 +15,7 @@ public final class g implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f92c;
+    public final TextView f93c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class g implements ViewBinding {
     public g(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2) {
         this.a = view;
         this.b = imageView;
-        this.f92c = textView;
+        this.f93c = textView;
         this.d = simpleDraweeView;
         this.e = textView2;
     }
diff --git a/app/src/main/java/c/a/i/g0.java b/app/src/main/java/c/a/i/g0.java
index 10c48cbc80..0fa672b750 100644
--- a/app/src/main/java/c/a/i/g0.java
+++ b/app/src/main/java/c/a/i/g0.java
@@ -16,24 +16,24 @@ public final class g0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f93c;
+    public final CheckedSetting f94c;
 
     public g0(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting) {
         this.a = linearLayout;
         this.b = linkifiedTextView;
-        this.f93c = checkedSetting;
+        this.f94c = checkedSetting;
     }
 
     @NonNull
     public static g0 a(@NonNull View view) {
-        int i = 2131362697;
-        TextView textView = (TextView) view.findViewById(2131362697);
+        int i = 2131362721;
+        TextView textView = (TextView) view.findViewById(2131362721);
         if (textView != null) {
-            i = 2131362698;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362698);
+            i = 2131362722;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362722);
             if (linkifiedTextView != null) {
-                i = 2131362699;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362699);
+                i = 2131362723;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362723);
                 if (checkedSetting != null) {
                     return new g0((LinearLayout) view, textView, linkifiedTextView, checkedSetting);
                 }
diff --git a/app/src/main/java/c/a/i/g1.java b/app/src/main/java/c/a/i/g1.java
index 60c8d425c1..07f405cdec 100644
--- a/app/src/main/java/c/a/i/g1.java
+++ b/app/src/main/java/c/a/i/g1.java
@@ -2,18 +2,35 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: SparkleViewBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: SingleValuePropPremiumUpsellDialogBinding */
 public final class g1 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
+    @NonNull
+    public final MaterialButton b;
     @NonNull
-    public final ImageView b;
 
-    public g1(@NonNull View view, @NonNull ImageView imageView) {
-        this.a = view;
-        this.b = imageView;
+    /* renamed from: c  reason: collision with root package name */
+    public final MaterialButton f95c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final ImageView f;
+
+    public g1(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull MaterialButton materialButton2, @NonNull View view2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
+        this.a = linearLayout;
+        this.b = materialButton;
+        this.f95c = materialButton2;
+        this.d = textView;
+        this.e = textView2;
+        this.f = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/g2.java b/app/src/main/java/c/a/i/g2.java
index 3b48b0d4fd..cde8c66597 100644
--- a/app/src/main/java/c/a/i/g2.java
+++ b/app/src/main/java/c/a/i/g2.java
@@ -1,30 +1,21 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
+import android.widget.FrameLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewOverlayMenuBinding */
+/* compiled from: ViewMobileReportsChildBinding */
 public final class g2 implements ViewBinding {
     @NonNull
-    public final View a;
-    @NonNull
-    public final h2 b;
+    public final FrameLayout a;
     @NonNull
+    public final TextView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final ImageView f94c;
-    @NonNull
-    public final ImageView d;
-    @NonNull
-    public final ImageView e;
-
-    public g2(@NonNull View view, @NonNull h2 h2Var, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3) {
-        this.a = view;
-        this.b = h2Var;
-        this.f94c = imageView;
-        this.d = imageView2;
-        this.e = imageView3;
+    public g2(@NonNull FrameLayout frameLayout, @NonNull CardView cardView, @NonNull TextView textView) {
+        this.a = frameLayout;
+        this.b = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/g3.java b/app/src/main/java/c/a/i/g3.java
index d937cc33d4..ea0a4462a1 100644
--- a/app/src/main/java/c/a/i/g3.java
+++ b/app/src/main/java/c/a/i/g3.java
@@ -1,29 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewSettingsPremiumGuildNoGuildsBinding */
+import com.google.android.material.radiobutton.MaterialRadioButton;
+/* compiled from: ViewSettingRadioBinding */
 public final class g3 implements ViewBinding {
     @NonNull
-    public final LinearLayoutCompat a;
+    public final View a;
     @NonNull
-    public final ImageView b;
+    public final MaterialRadioButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f95c;
-    @NonNull
-    public final TextView d;
+    public final ConstraintLayout f96c;
 
-    public g3(@NonNull LinearLayoutCompat linearLayoutCompat, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = linearLayoutCompat;
-        this.b = imageView;
-        this.f95c = textView;
-        this.d = textView2;
+    public g3(@NonNull View view, @NonNull MaterialRadioButton materialRadioButton, @NonNull ConstraintLayout constraintLayout) {
+        this.a = view;
+        this.b = materialRadioButton;
+        this.f96c = constraintLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/g4.java b/app/src/main/java/c/a/i/g4.java
index e8849c59de..cd88473e12 100644
--- a/app/src/main/java/c/a/i/g4.java
+++ b/app/src/main/java/c/a/i/g4.java
@@ -1,36 +1,32 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.sticker.StickerView;
-/* compiled from: WidgetChatInputStickerSuggestionsBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetChatInputGuardBinding */
 public final class g4 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final StickerView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final StickerView f96c;
+    public final MaterialButton f97c;
     @NonNull
-    public final StickerView d;
+    public final TextView d;
     @NonNull
-    public final StickerView e;
-    @NonNull
-    public final ImageView f;
+    public final TextView e;
 
-    public g4(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
+    public g4(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = linearLayout;
-        this.b = stickerView;
-        this.f96c = stickerView2;
-        this.d = stickerView3;
-        this.e = stickerView4;
-        this.f = imageView2;
+        this.b = materialButton;
+        this.f97c = materialButton2;
+        this.d = textView;
+        this.e = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/g5.java b/app/src/main/java/c/a/i/g5.java
index 3d7753c513..e68ea4223a 100644
--- a/app/src/main/java/c/a/i/g5.java
+++ b/app/src/main/java/c/a/i/g5.java
@@ -1,48 +1,29 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.Space;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetStageChannelRichPresenceBinding */
+/* compiled from: WidgetServerSettingsConfirmDisableIntegrationBinding */
 public final class g5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final LinearLayout b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f97c;
+    public final MaterialButton f98c;
     @NonNull
-    public final TextView d;
-    @NonNull
-    public final SimpleDraweeView e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final MaterialButton g;
-    @NonNull
-    public final TextView h;
-    @NonNull
-    public final TextView i;
+    public final MaterialButton d;
 
-    public g5(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull FrameLayout frameLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView4, @NonNull TextView textView5) {
+    public g5(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2) {
         this.a = linearLayout;
-        this.b = linearLayout2;
-        this.f97c = textView;
-        this.d = textView2;
-        this.e = simpleDraweeView;
-        this.f = textView3;
-        this.g = materialButton;
-        this.h = textView4;
-        this.i = textView5;
+        this.b = textView;
+        this.f98c = materialButton;
+        this.d = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/h.java b/app/src/main/java/c/a/i/h.java
index bd9dc2a8fb..75329e7814 100644
--- a/app/src/main/java/c/a/i/h.java
+++ b/app/src/main/java/c/a/i/h.java
@@ -14,14 +14,14 @@ public final class h implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f98c;
+    public final TextView f99c;
     @NonNull
     public final TextView d;
 
     public h(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f98c = textView2;
+        this.f99c = textView2;
         this.d = textView3;
     }
 
diff --git a/app/src/main/java/c/a/i/h1.java b/app/src/main/java/c/a/i/h1.java
index 45c1c66a8e..64cb0cae7d 100644
--- a/app/src/main/java/c/a/i/h1.java
+++ b/app/src/main/java/c/a/i/h1.java
@@ -4,26 +4,16 @@ import android.view.View;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.rlottie.RLottieImageView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: StickerViewBinding */
+/* compiled from: SparkleViewBinding */
 public final class h1 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final SimpleDraweeView b;
-    @NonNull
+    public final ImageView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final RLottieImageView f99c;
-    @NonNull
-    public final ImageView d;
-
-    public h1(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull RLottieImageView rLottieImageView, @NonNull ImageView imageView) {
+    public h1(@NonNull View view, @NonNull ImageView imageView) {
         this.a = view;
-        this.b = simpleDraweeView;
-        this.f99c = rLottieImageView;
-        this.d = imageView;
+        this.b = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/h2.java b/app/src/main/java/c/a/i/h2.java
index 146c85629e..c6f1094adb 100644
--- a/app/src/main/java/c/a/i/h2.java
+++ b/app/src/main/java/c/a/i/h2.java
@@ -1,38 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewOverlayMenuContentBinding */
+import com.discord.views.CheckedSetting;
+/* compiled from: ViewMobileReportsMulticheckItemBinding */
 public final class h2 implements ViewBinding {
     @NonNull
-    public final CardView a;
-    @NonNull
-    public final TextView b;
-    @NonNull
+    public final CheckedSetting a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final TextView f100c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final ImageView e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final TextView g;
-
-    public h2(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull TextView textView4, @NonNull TextView textView5) {
-        this.a = cardView;
-        this.b = textView;
-        this.f100c = textView2;
-        this.d = textView3;
-        this.e = imageView;
-        this.f = textView4;
-        this.g = textView5;
+    public h2(@NonNull CheckedSetting checkedSetting) {
+        this.a = checkedSetting;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/h3.java b/app/src/main/java/c/a/i/h3.java
index a14b7b1b55..da7f32b6aa 100644
--- a/app/src/main/java/c/a/i/h3.java
+++ b/app/src/main/java/c/a/i/h3.java
@@ -1,16 +1,31 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewSimpleSpinnerDropdownItemBinding */
+/* compiled from: ViewSettingSharedBinding */
 public final class h3 implements ViewBinding {
     @NonNull
-    public final TextView a;
+    public final View a;
+    @NonNull
+    public final ImageView b;
+    @NonNull
 
-    public h3(@NonNull TextView textView) {
-        this.a = textView;
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f100c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+
+    public h3(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
+        this.a = view;
+        this.b = imageView;
+        this.f100c = textView;
+        this.d = textView2;
+        this.e = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/h4.java b/app/src/main/java/c/a/i/h4.java
index 3d2058d928..648cbf9edd 100644
--- a/app/src/main/java/c/a/i/h4.java
+++ b/app/src/main/java/c/a/i/h4.java
@@ -1,17 +1,27 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-/* compiled from: WidgetChatListAdapterItemEmbedFieldBinding */
+/* compiled from: WidgetChatInputMemberVerificationGuardBinding */
 public final class h4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final RelativeLayout a;
+    @NonNull
+    public final ImageView b;
+    @NonNull
 
-    public h4(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2) {
-        this.a = linearLayout;
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f101c;
+
+    public h4(@NonNull RelativeLayout relativeLayout, @NonNull CardView cardView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView) {
+        this.a = relativeLayout;
+        this.b = imageView2;
+        this.f101c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/h5.java b/app/src/main/java/c/a/i/h5.java
index 0ba23dcd62..a73ede14bd 100644
--- a/app/src/main/java/c/a/i/h5.java
+++ b/app/src/main/java/c/a/i/h5.java
@@ -4,43 +4,28 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.StreamPreviewView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: WidgetStreamRichPresenceBinding */
+/* compiled from: WidgetServerSettingsOverviewSectionAfkChannelBinding */
 public final class h5 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final LinearLayout b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f101c;
+    public final LinearLayout f102c;
     @NonNull
     public final TextView d;
     @NonNull
-    public final SimpleDraweeView e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final TextView h;
-    @NonNull
-    public final StreamPreviewView i;
+    public final LinearLayout e;
 
-    public h5(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull StreamPreviewView streamPreviewView) {
-        this.a = constraintLayout;
-        this.b = linearLayout;
-        this.f101c = textView;
+    public h5(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3) {
+        this.a = linearLayout;
+        this.b = textView;
+        this.f102c = linearLayout2;
         this.d = textView2;
-        this.e = simpleDraweeView;
-        this.f = textView3;
-        this.g = textView4;
-        this.h = textView5;
-        this.i = streamPreviewView;
+        this.e = linearLayout3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/i0.java b/app/src/main/java/c/a/i/i0.java
index d9e2295f25..acba16c25a 100644
--- a/app/src/main/java/c/a/i/i0.java
+++ b/app/src/main/java/c/a/i/i0.java
@@ -17,33 +17,33 @@ public final class i0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Group f102c;
+    public final Group f103c;
 
     public i0(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull ImageView imageView3, @NonNull Group group) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f102c = group;
+        this.f103c = group;
     }
 
     @NonNull
     public static i0 a(@NonNull View view) {
-        int i = 2131363530;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363530);
+        int i = 2131363571;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363571);
         if (simpleDraweeView != null) {
-            i = 2131363531;
-            ImageView imageView = (ImageView) view.findViewById(2131363531);
+            i = 2131363572;
+            ImageView imageView = (ImageView) view.findViewById(2131363572);
             if (imageView != null) {
-                i = 2131363532;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363532);
+                i = 2131363573;
+                ImageView imageView2 = (ImageView) view.findViewById(2131363573);
                 if (imageView2 != null) {
-                    i = 2131363533;
-                    TextView textView = (TextView) view.findViewById(2131363533);
+                    i = 2131363574;
+                    TextView textView = (TextView) view.findViewById(2131363574);
                     if (textView != null) {
-                        i = 2131363534;
-                        ImageView imageView3 = (ImageView) view.findViewById(2131363534);
+                        i = 2131363575;
+                        ImageView imageView3 = (ImageView) view.findViewById(2131363575);
                         if (imageView3 != null) {
-                            i = 2131364221;
-                            Group group = (Group) view.findViewById(2131364221);
+                            i = 2131364265;
+                            Group group = (Group) view.findViewById(2131364265);
                             if (group != null) {
                                 return new i0((ConstraintLayout) view, simpleDraweeView, imageView, imageView2, textView, imageView3, group);
                             }
diff --git a/app/src/main/java/c/a/i/i1.java b/app/src/main/java/c/a/i/i1.java
index 0ee8080a28..71b4976bef 100644
--- a/app/src/main/java/c/a/i/i1.java
+++ b/app/src/main/java/c/a/i/i1.java
@@ -2,52 +2,28 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ThreadBrowserEmptyBinding */
+import com.discord.rlottie.RLottieImageView;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: StickerViewBinding */
 public final class i1 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final View a;
     @NonNull
-    public final ConstraintLayout b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f103c;
+    public final RLottieImageView f104c;
     @NonNull
-    public final TextView d;
+    public final ImageView d;
 
-    public i1(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
-        this.a = constraintLayout;
-        this.b = constraintLayout2;
-        this.f103c = materialButton;
-        this.d = textView;
-    }
-
-    @NonNull
-    public static i1 a(@NonNull View view) {
-        ConstraintLayout constraintLayout = (ConstraintLayout) view;
-        int i = 2131365235;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365235);
-        if (materialButton != null) {
-            i = 2131365236;
-            TextView textView = (TextView) view.findViewById(2131365236);
-            if (textView != null) {
-                i = 2131365237;
-                TextView textView2 = (TextView) view.findViewById(2131365237);
-                if (textView2 != null) {
-                    i = 2131365261;
-                    ImageView imageView = (ImageView) view.findViewById(2131365261);
-                    if (imageView != null) {
-                        return new i1(constraintLayout, constraintLayout, materialButton, textView, textView2, imageView);
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    public i1(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull RLottieImageView rLottieImageView, @NonNull ImageView imageView) {
+        this.a = view;
+        this.b = simpleDraweeView;
+        this.f104c = rLottieImageView;
+        this.d = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/i2.java b/app/src/main/java/c/a/i/i2.java
index 5500e943f2..023c6c5abe 100644
--- a/app/src/main/java/c/a/i/i2.java
+++ b/app/src/main/java/c/a/i/i2.java
@@ -1,28 +1,30 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-/* compiled from: ViewPhoneOrEmailInputBinding */
+/* compiled from: ViewOverlayMenuBinding */
 public final class i2 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final TextInputLayout b;
+    public final j2 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputEditText f104c;
+    public final ImageView f105c;
     @NonNull
-    public final TextInputLayout d;
+    public final ImageView d;
+    @NonNull
+    public final ImageView e;
 
-    public i2(@NonNull View view, @NonNull TextInputLayout textInputLayout, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout2) {
+    public i2(@NonNull View view, @NonNull j2 j2Var, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3) {
         this.a = view;
-        this.b = textInputLayout;
-        this.f104c = textInputEditText;
-        this.d = textInputLayout2;
+        this.b = j2Var;
+        this.f105c = imageView;
+        this.d = imageView2;
+        this.e = imageView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/i3.java b/app/src/main/java/c/a/i/i3.java
index f8aed83b84..9a2333c89a 100644
--- a/app/src/main/java/c/a/i/i3.java
+++ b/app/src/main/java/c/a/i/i3.java
@@ -1,42 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.VoiceUserView;
-import com.discord.views.calls.SpeakerPulseView;
-/* compiled from: ViewStageChannelSpeakerBinding */
+import com.google.android.material.switchmaterial.SwitchMaterial;
+/* compiled from: ViewSettingSwitchBinding */
 public final class i3 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final VoiceUserView b;
+    public final SwitchMaterial b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f105c;
-    @NonNull
-    public final ImageView d;
-    @NonNull
-    public final ImageView e;
-    @NonNull
-    public final ImageView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final SpeakerPulseView h;
+    public final ConstraintLayout f106c;
 
-    public i3(@NonNull View view, @NonNull VoiceUserView voiceUserView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull TextView textView, @NonNull SpeakerPulseView speakerPulseView) {
+    public i3(@NonNull View view, @NonNull SwitchMaterial switchMaterial, @NonNull ConstraintLayout constraintLayout) {
         this.a = view;
-        this.b = voiceUserView;
-        this.f105c = imageView;
-        this.d = imageView2;
-        this.e = imageView3;
-        this.f = imageView4;
-        this.g = textView;
-        this.h = speakerPulseView;
+        this.b = switchMaterial;
+        this.f106c = constraintLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/i4.java b/app/src/main/java/c/a/i/i4.java
index 961ace3de5..57ba2836ea 100644
--- a/app/src/main/java/c/a/i/i4.java
+++ b/app/src/main/java/c/a/i/i4.java
@@ -1,35 +1,21 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: WidgetChatListAdapterItemSingleLineMessagePreviewBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetChatInputPermReqFilesBinding */
 public final class i4 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
-    @NonNull
-    public final ImageView b;
+    public final LinearLayout a;
     @NonNull
+    public final TextView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f106c;
-    @NonNull
-    public final SimpleDraweeView d;
-    @NonNull
-    public final TextView e;
-
-    public i4(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull Guideline guideline, @NonNull Guideline guideline2, @NonNull Guideline guideline3) {
-        this.a = constraintLayout;
-        this.b = imageView;
-        this.f106c = linkifiedTextView;
-        this.d = simpleDraweeView;
-        this.e = textView;
+    public i4(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
+        this.a = linearLayout;
+        this.b = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/i5.java b/app/src/main/java/c/a/i/i5.java
index 23e9d6b72b..150f23a9b9 100644
--- a/app/src/main/java/c/a/i/i5.java
+++ b/app/src/main/java/c/a/i/i5.java
@@ -2,28 +2,24 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.LoadingButton;
-/* compiled from: WidgetUrgentMessageDialogBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetSettingsPrivacyDefaultsBinding */
 public final class i5 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final LoadingButton b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f107c;
-    @NonNull
-    public final TextView d;
+    public final MaterialButton f107c;
 
-    public i5(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2) {
+    public i5(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
-        this.b = loadingButton;
-        this.f107c = textView;
-        this.d = textView2;
+        this.b = materialButton;
+        this.f107c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/j1.java b/app/src/main/java/c/a/i/j1.java
index 2aa9670571..b8ecfcc8c7 100644
--- a/app/src/main/java/c/a/i/j1.java
+++ b/app/src/main/java/c/a/i/j1.java
@@ -1,27 +1,18 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.typing.TypingDot;
-/* compiled from: TypingDotsViewBinding */
+import com.google.android.material.textview.MaterialTextView;
+/* compiled from: StubCallFullscreenStartStageEventButtonBinding */
 public final class j1 implements ViewBinding {
     @NonNull
-    public final View a;
-    @NonNull
-    public final TypingDot b;
-    @NonNull
+    public final ConstraintLayout a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final TypingDot f109c;
-    @NonNull
-    public final TypingDot d;
-
-    public j1(@NonNull View view, @NonNull TypingDot typingDot, @NonNull TypingDot typingDot2, @NonNull TypingDot typingDot3) {
-        this.a = view;
-        this.b = typingDot;
-        this.f109c = typingDot2;
-        this.d = typingDot3;
+    public j1(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull MaterialTextView materialTextView, @NonNull MaterialTextView materialTextView2) {
+        this.a = constraintLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/j2.java b/app/src/main/java/c/a/i/j2.java
index c4e8a698a1..94e2ff9517 100644
--- a/app/src/main/java/c/a/i/j2.java
+++ b/app/src/main/java/c/a/i/j2.java
@@ -1,25 +1,38 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.CutoutView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewPileItemBinding */
+/* compiled from: ViewOverlayMenuContentBinding */
 public final class j2 implements ViewBinding {
     @NonNull
-    public final CutoutView a;
+    public final CardView a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f110c;
+    public final TextView f109c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final ImageView e;
+    @NonNull
+    public final TextView f;
+    @NonNull
+    public final TextView g;
 
-    public j2(@NonNull CutoutView cutoutView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2) {
-        this.a = cutoutView;
-        this.b = simpleDraweeView;
-        this.f110c = simpleDraweeView2;
+    public j2(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull TextView textView4, @NonNull TextView textView5) {
+        this.a = cardView;
+        this.b = textView;
+        this.f109c = textView2;
+        this.d = textView3;
+        this.e = imageView;
+        this.f = textView4;
+        this.g = textView5;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/j3.java b/app/src/main/java/c/a/i/j3.java
index 21733c7898..1dcb4c7021 100644
--- a/app/src/main/java/c/a/i/j3.java
+++ b/app/src/main/java/c/a/i/j3.java
@@ -1,26 +1,29 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewStageChannelVisitCommunityBinding */
+/* compiled from: ViewSettingsPremiumGuildNoGuildsBinding */
 public final class j3 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final LinearLayoutCompat a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f111c;
+    public final TextView f110c;
+    @NonNull
+    public final TextView d;
 
-    public j3(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = constraintLayout;
-        this.b = simpleDraweeView;
-        this.f111c = textView;
+    public j3(@NonNull LinearLayoutCompat linearLayoutCompat, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = linearLayoutCompat;
+        this.b = imageView;
+        this.f110c = textView;
+        this.d = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/j4.java b/app/src/main/java/c/a/i/j4.java
index c50bedde50..c83d71eda5 100644
--- a/app/src/main/java/c/a/i/j4.java
+++ b/app/src/main/java/c/a/i/j4.java
@@ -1,43 +1,35 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
-import com.discord.views.typing.TypingDots;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: WidgetChatListAdapterItemTextBinding */
+import com.discord.views.sticker.StickerView;
+/* compiled from: WidgetChatInputStickerSuggestionsBinding */
 public final class j4 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final LinkifiedTextView b;
+    public final StickerView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f112c;
+    public final StickerView f111c;
     @NonNull
-    public final TextView d;
+    public final StickerView d;
     @NonNull
-    public final TextView e;
+    public final StickerView e;
     @NonNull
-    public final TextView f;
+    public final ImageView f;
 
-    public j4(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull LinearLayout linearLayout, @NonNull View view3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout2, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull AppCompatImageView appCompatImageView, @NonNull TypingDots typingDots, @NonNull ConstraintLayout constraintLayout3, @NonNull ImageView imageView3, @NonNull TextView textView6, @NonNull Guideline guideline) {
-        this.a = constraintLayout;
-        this.b = linkifiedTextView;
-        this.f112c = simpleDraweeView;
-        this.d = textView3;
-        this.e = textView4;
-        this.f = textView5;
+    public j4(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4, @NonNull ImageView imageView) {
+        this.a = linearLayout;
+        this.b = stickerView;
+        this.f111c = stickerView2;
+        this.d = stickerView3;
+        this.e = stickerView4;
+        this.f = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/j5.java b/app/src/main/java/c/a/i/j5.java
index a5f30e13bd..baede380ee 100644
--- a/app/src/main/java/c/a/i/j5.java
+++ b/app/src/main/java/c/a/i/j5.java
@@ -1,40 +1,48 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.RelativeLayout;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Space;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: WidgetUserProfileAdapterItemFriendMutualServerBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetStageChannelRichPresenceBinding */
 public final class j5 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final LinearLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f113c;
-
-    public j5(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
-        this.a = relativeLayout;
-        this.b = simpleDraweeView;
-        this.f113c = textView;
-    }
-
+    public final TextView f112c;
     @NonNull
-    public static j5 a(@NonNull View view) {
-        int i = 2131365390;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365390);
-        if (simpleDraweeView != null) {
-            i = 2131365391;
-            TextView textView = (TextView) view.findViewById(2131365391);
-            if (textView != null) {
-                return new j5((RelativeLayout) view, simpleDraweeView, textView);
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    public final TextView d;
+    @NonNull
+    public final SimpleDraweeView e;
+    @NonNull
+    public final TextView f;
+    @NonNull
+    public final MaterialButton g;
+    @NonNull
+    public final TextView h;
+    @NonNull
+    public final TextView i;
+
+    public j5(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull FrameLayout frameLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView4, @NonNull TextView textView5) {
+        this.a = linearLayout;
+        this.b = linearLayout2;
+        this.f112c = textView;
+        this.d = textView2;
+        this.e = simpleDraweeView;
+        this.f = textView3;
+        this.g = materialButton;
+        this.h = textView4;
+        this.i = textView5;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/k.java b/app/src/main/java/c/a/i/k.java
index f78ce5e84e..8a23d01359 100644
--- a/app/src/main/java/c/a/i/k.java
+++ b/app/src/main/java/c/a/i/k.java
@@ -16,14 +16,14 @@ public final class k implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final DatePicker f114c;
+    public final DatePicker f113c;
     @NonNull
     public final TextView d;
 
     public k(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull DatePicker datePicker, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f114c = datePicker;
+        this.f113c = datePicker;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/c/a/i/k1.java b/app/src/main/java/c/a/i/k1.java
index 0c31855649..63e6142a88 100644
--- a/app/src/main/java/c/a/i/k1.java
+++ b/app/src/main/java/c/a/i/k1.java
@@ -1,35 +1,53 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: UserActionsDialogBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ThreadBrowserEmptyBinding */
 public final class k1 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ConstraintLayout a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final ConstraintLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f115c;
+    public final MaterialButton f114c;
     @NonNull
     public final TextView d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final TextView f;
 
-    public k1(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
-        this.a = linearLayout;
-        this.b = simpleDraweeView;
-        this.f115c = textView;
-        this.d = textView2;
-        this.e = textView3;
-        this.f = textView4;
+    public k1(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
+        this.a = constraintLayout;
+        this.b = constraintLayout2;
+        this.f114c = materialButton;
+        this.d = textView;
+    }
+
+    @NonNull
+    public static k1 a(@NonNull View view) {
+        ConstraintLayout constraintLayout = (ConstraintLayout) view;
+        int i = 2131365290;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365290);
+        if (materialButton != null) {
+            i = 2131365291;
+            TextView textView = (TextView) view.findViewById(2131365291);
+            if (textView != null) {
+                i = 2131365292;
+                TextView textView2 = (TextView) view.findViewById(2131365292);
+                if (textView2 != null) {
+                    i = 2131365316;
+                    ImageView imageView = (ImageView) view.findViewById(2131365316);
+                    if (imageView != null) {
+                        return new k1(constraintLayout, constraintLayout, materialButton, textView, textView2, imageView);
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/k2.java b/app/src/main/java/c/a/i/k2.java
index a32d97ec24..0999cc8aad 100644
--- a/app/src/main/java/c/a/i/k2.java
+++ b/app/src/main/java/c/a/i/k2.java
@@ -1,36 +1,28 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.chip.Chip;
-/* compiled from: ViewPremiumGuildConfirmationBinding */
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+/* compiled from: ViewPhoneOrEmailInputBinding */
 public final class k2 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final TextInputLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f116c;
+    public final TextInputEditText f115c;
     @NonNull
-    public final Chip d;
-    @NonNull
-    public final Chip e;
-    @NonNull
-    public final ImageView f;
+    public final TextInputLayout d;
 
-    public k2(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull Chip chip, @NonNull Chip chip2, @NonNull ImageView imageView) {
+    public k2(@NonNull View view, @NonNull TextInputLayout textInputLayout, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout2) {
         this.a = view;
-        this.b = simpleDraweeView;
-        this.f116c = textView;
-        this.d = chip;
-        this.e = chip2;
-        this.f = imageView;
+        this.b = textInputLayout;
+        this.f115c = textInputEditText;
+        this.d = textInputLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/k3.java b/app/src/main/java/c/a/i/k3.java
index 4a561e621c..a82165d78a 100644
--- a/app/src/main/java/c/a/i/k3.java
+++ b/app/src/main/java/c/a/i/k3.java
@@ -1,42 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import androidx.viewpager2.widget.ViewPager2;
-import com.discord.views.LoadingButton;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewStepsBinding */
+/* compiled from: ViewSimpleSpinnerDropdownItemBinding */
 public final class k3 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
-    @NonNull
-    public final LinearLayout b;
-    @NonNull
+    public final TextView a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final TextView f117c;
-    @NonNull
-    public final ImageView d;
-    @NonNull
-    public final LoadingButton e;
-    @NonNull
-    public final MaterialButton f;
-    @NonNull
-    public final ViewPager2 g;
-
-    public k3(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull ViewPager2 viewPager2) {
-        this.a = relativeLayout;
-        this.b = linearLayout;
-        this.f117c = textView;
-        this.d = imageView;
-        this.e = loadingButton;
-        this.f = materialButton;
-        this.g = viewPager2;
+    public k3(@NonNull TextView textView) {
+        this.a = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/k4.java b/app/src/main/java/c/a/i/k4.java
index 50189808d6..6954762e1f 100644
--- a/app/src/main/java/c/a/i/k4.java
+++ b/app/src/main/java/c/a/i/k4.java
@@ -1,51 +1,17 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.widgets.botuikit.views.ActionRowComponentView;
-import com.google.android.flexbox.FlexboxLayout;
-/* compiled from: WidgetChatListBotUiActionRowComponentBinding */
+import com.discord.utilities.view.text.LinkifiedTextView;
+/* compiled from: WidgetChatListAdapterItemEmbedFieldBinding */
 public final class k4 implements ViewBinding {
     @NonNull
-    public final ActionRowComponentView a;
-    @NonNull
-    public final FlexboxLayout b;
-    @NonNull
+    public final LinearLayout a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final a2 f118c;
-
-    public k4(@NonNull ActionRowComponentView actionRowComponentView, @NonNull FlexboxLayout flexboxLayout, @NonNull a2 a2Var) {
-        this.a = actionRowComponentView;
-        this.b = flexboxLayout;
-        this.f118c = a2Var;
-    }
-
-    @NonNull
-    public static k4 a(@NonNull View view) {
-        int i = 2131361884;
-        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131361884);
-        if (flexboxLayout != null) {
-            i = 2131361885;
-            View findViewById = view.findViewById(2131361885);
-            if (findViewById != null) {
-                int i2 = 2131365494;
-                ImageView imageView = (ImageView) findViewById.findViewById(2131365494);
-                if (imageView != null) {
-                    i2 = 2131365495;
-                    TextView textView = (TextView) findViewById.findViewById(2131365495);
-                    if (textView != null) {
-                        return new k4((ActionRowComponentView) view, flexboxLayout, new a2((ConstraintLayout) findViewById, imageView, textView));
-                    }
-                }
-                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(i2)));
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    public k4(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2) {
+        this.a = linearLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/k5.java b/app/src/main/java/c/a/i/k5.java
index 6d275dddef..9a5a2936d9 100644
--- a/app/src/main/java/c/a/i/k5.java
+++ b/app/src/main/java/c/a/i/k5.java
@@ -1,114 +1,46 @@
 package c.a.i;
 
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.Space;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.Barrier;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.views.StreamPreviewView;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetUserRichPresenceBinding */
+/* compiled from: WidgetStreamRichPresenceBinding */
 public final class k5 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ConstraintLayout a;
     @NonNull
     public final LinearLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f119c;
+    public final TextView f116c;
     @NonNull
     public final TextView d;
     @NonNull
     public final SimpleDraweeView e;
     @NonNull
-    public final SimpleDraweeView f;
+    public final TextView f;
     @NonNull
-    public final MaterialButton g;
+    public final TextView g;
     @NonNull
-    public final MaterialButton h;
+    public final TextView h;
     @NonNull
-    public final TextView i;
-    @NonNull
-    public final TextView j;
-    @NonNull
-    public final TextView k;
+    public final StreamPreviewView i;
 
-    public k5(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) {
-        this.a = linearLayout;
-        this.b = linearLayout2;
-        this.f119c = textView;
+    public k5(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull StreamPreviewView streamPreviewView) {
+        this.a = constraintLayout;
+        this.b = linearLayout;
+        this.f116c = textView;
         this.d = textView2;
         this.e = simpleDraweeView;
-        this.f = simpleDraweeView2;
-        this.g = materialButton;
-        this.h = materialButton2;
-        this.i = textView3;
-        this.j = textView4;
-        this.k = textView5;
-    }
-
-    @NonNull
-    public static k5 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131559273, viewGroup, false);
-        if (z2) {
-            viewGroup.addView(inflate);
-        }
-        int i = 2131362092;
-        Barrier barrier = (Barrier) inflate.findViewById(2131362092);
-        if (barrier != null) {
-            i = 2131363540;
-            Space space = (Space) inflate.findViewById(2131363540);
-            if (space != null) {
-                i = 2131364438;
-                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364438);
-                if (linearLayout != null) {
-                    i = 2131364439;
-                    TextView textView = (TextView) inflate.findViewById(2131364439);
-                    if (textView != null) {
-                        i = 2131364440;
-                        TextView textView2 = (TextView) inflate.findViewById(2131364440);
-                        if (textView2 != null) {
-                            i = 2131364441;
-                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364441);
-                            if (simpleDraweeView != null) {
-                                i = 2131364444;
-                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364444);
-                                if (simpleDraweeView2 != null) {
-                                    i = 2131364448;
-                                    MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364448);
-                                    if (materialButton != null) {
-                                        i = 2131364449;
-                                        MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364449);
-                                        if (materialButton2 != null) {
-                                            i = 2131364451;
-                                            TextView textView3 = (TextView) inflate.findViewById(2131364451);
-                                            if (textView3 != null) {
-                                                i = 2131364452;
-                                                TextView textView4 = (TextView) inflate.findViewById(2131364452);
-                                                if (textView4 != null) {
-                                                    i = 2131364453;
-                                                    TextView textView5 = (TextView) inflate.findViewById(2131364453);
-                                                    if (textView5 != null) {
-                                                        return new k5((LinearLayout) inflate, barrier, space, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, materialButton, materialButton2, textView3, textView4, textView5);
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
+        this.f = textView3;
+        this.g = textView4;
+        this.h = textView5;
+        this.i = streamPreviewView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/l.java b/app/src/main/java/c/a/i/l.java
index 09e72725cc..dae1dd30ea 100644
--- a/app/src/main/java/c/a/i/l.java
+++ b/app/src/main/java/c/a/i/l.java
@@ -16,14 +16,14 @@ public final class l implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f120c;
+    public final MaxHeightRecyclerView f117c;
     @NonNull
     public final TextView d;
 
     public l(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f120c = maxHeightRecyclerView;
+        this.f117c = maxHeightRecyclerView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/c/a/i/l0.java b/app/src/main/java/c/a/i/l0.java
index 6a9eec0e60..135f85af63 100644
--- a/app/src/main/java/c/a/i/l0.java
+++ b/app/src/main/java/c/a/i/l0.java
@@ -16,7 +16,7 @@ public final class l0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f121c;
+    public final ImageView f118c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class l0 implements ViewBinding {
     public l0(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull ImageView imageView5, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f121c = imageView3;
+        this.f118c = imageView3;
         this.d = imageView4;
         this.e = imageView5;
         this.f = textView;
diff --git a/app/src/main/java/c/a/i/l1.java b/app/src/main/java/c/a/i/l1.java
index 40144b11bb..de50407984 100644
--- a/app/src/main/java/c/a/i/l1.java
+++ b/app/src/main/java/c/a/i/l1.java
@@ -1,34 +1,27 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.StatusView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: UserAvatarPresenceViewBinding */
+import com.discord.views.typing.TypingDot;
+/* compiled from: TypingDotsViewBinding */
 public final class l1 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final View a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final TypingDot b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f122c;
+    public final TypingDot f119c;
     @NonNull
-    public final SimpleDraweeView d;
-    @NonNull
-    public final StatusView e;
+    public final TypingDot d;
 
-    public l1(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull RelativeLayout relativeLayout2, @NonNull StatusView statusView) {
-        this.a = relativeLayout;
-        this.b = simpleDraweeView;
-        this.f122c = imageView;
-        this.d = simpleDraweeView2;
-        this.e = statusView;
+    public l1(@NonNull View view, @NonNull TypingDot typingDot, @NonNull TypingDot typingDot2, @NonNull TypingDot typingDot3) {
+        this.a = view;
+        this.b = typingDot;
+        this.f119c = typingDot2;
+        this.d = typingDot3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/l2.java b/app/src/main/java/c/a/i/l2.java
index 21edc2672a..5bf26647d8 100644
--- a/app/src/main/java/c/a/i/l2.java
+++ b/app/src/main/java/c/a/i/l2.java
@@ -1,47 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewPremiumGuildProgressBarBinding */
+import com.discord.views.CutoutView;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewPileItemBinding */
 public final class l2 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final CutoutView a;
     @NonNull
-    public final ProgressBar b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f123c;
-    @NonNull
-    public final ImageView d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final ImageView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final ImageView h;
-    @NonNull
-    public final TextView i;
+    public final SimpleDraweeView f120c;
 
-    public l2(@NonNull ConstraintLayout constraintLayout, @NonNull ProgressBar progressBar, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView4, @NonNull TextView textView3) {
-        this.a = constraintLayout;
-        this.b = progressBar;
-        this.f123c = imageView;
-        this.d = imageView2;
-        this.e = textView;
-        this.f = imageView3;
-        this.g = textView2;
-        this.h = imageView4;
-        this.i = textView3;
+    public l2(@NonNull CutoutView cutoutView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2) {
+        this.a = cutoutView;
+        this.b = simpleDraweeView;
+        this.f120c = simpleDraweeView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/l3.java b/app/src/main/java/c/a/i/l3.java
index 12c896767e..36f42509c3 100644
--- a/app/src/main/java/c/a/i/l3.java
+++ b/app/src/main/java/c/a/i/l3.java
@@ -1,29 +1,42 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewStreamPreviewBinding */
+import com.discord.views.VoiceUserView;
+import com.discord.views.calls.SpeakerPulseView;
+/* compiled from: ViewStageChannelSpeakerBinding */
 public final class l3 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final View a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final VoiceUserView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f124c;
+    public final ImageView f121c;
     @NonNull
-    public final TextView d;
+    public final ImageView d;
+    @NonNull
+    public final ImageView e;
+    @NonNull
+    public final ImageView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final SpeakerPulseView h;
 
-    public l3(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = constraintLayout;
-        this.b = simpleDraweeView;
-        this.f124c = textView;
-        this.d = textView2;
+    public l3(@NonNull View view, @NonNull VoiceUserView voiceUserView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull TextView textView, @NonNull SpeakerPulseView speakerPulseView) {
+        this.a = view;
+        this.b = voiceUserView;
+        this.f121c = imageView;
+        this.d = imageView2;
+        this.e = imageView3;
+        this.f = imageView4;
+        this.g = textView;
+        this.h = speakerPulseView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/l4.java b/app/src/main/java/c/a/i/l4.java
index 6400cba868..4b05ba4a84 100644
--- a/app/src/main/java/c/a/i/l4.java
+++ b/app/src/main/java/c/a/i/l4.java
@@ -2,63 +2,34 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.typing.TypingDots;
-import com.discord.widgets.botuikit.views.select.SelectComponentView;
+import com.discord.utilities.view.text.LinkifiedTextView;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.flexbox.FlexboxLayout;
-import com.google.android.material.textview.MaterialTextView;
-/* compiled from: WidgetChatListBotUiSelectComponentBinding */
+/* compiled from: WidgetChatListAdapterItemSingleLineMessagePreviewBinding */
 public final class l4 implements ViewBinding {
     @NonNull
-    public final SelectComponentView a;
+    public final ConstraintLayout a;
     @NonNull
     public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TypingDots f125c;
+    public final LinkifiedTextView f122c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
-    public final MaterialTextView e;
-    @NonNull
-    public final FlexboxLayout f;
+    public final TextView e;
 
-    public l4(@NonNull SelectComponentView selectComponentView, @NonNull ImageView imageView, @NonNull TypingDots typingDots, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialTextView materialTextView, @NonNull FlexboxLayout flexboxLayout) {
-        this.a = selectComponentView;
+    public l4(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull Guideline guideline, @NonNull Guideline guideline2, @NonNull Guideline guideline3) {
+        this.a = constraintLayout;
         this.b = imageView;
-        this.f125c = typingDots;
+        this.f122c = linkifiedTextView;
         this.d = simpleDraweeView;
-        this.e = materialTextView;
-        this.f = flexboxLayout;
-    }
-
-    @NonNull
-    public static l4 a(@NonNull View view) {
-        int i = 2131364565;
-        ImageView imageView = (ImageView) view.findViewById(2131364565);
-        if (imageView != null) {
-            i = 2131364566;
-            TypingDots typingDots = (TypingDots) view.findViewById(2131364566);
-            if (typingDots != null) {
-                i = 2131364567;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364567);
-                if (simpleDraweeView != null) {
-                    i = 2131364568;
-                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364568);
-                    if (materialTextView != null) {
-                        i = 2131364569;
-                        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131364569);
-                        if (flexboxLayout != null) {
-                            return new l4((SelectComponentView) view, imageView, typingDots, simpleDraweeView, materialTextView, flexboxLayout);
-                        }
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+        this.e = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/l5.java b/app/src/main/java/c/a/i/l5.java
new file mode 100644
index 0000000000..18a5b84ce7
--- /dev/null
+++ b/app/src/main/java/c/a/i/l5.java
@@ -0,0 +1,34 @@
+package c.a.i;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.discord.views.LoadingButton;
+/* compiled from: WidgetUrgentMessageDialogBinding */
+public final class l5 implements ViewBinding {
+    @NonNull
+    public final LinearLayout a;
+    @NonNull
+    public final LoadingButton b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f123c;
+    @NonNull
+    public final TextView d;
+
+    public l5(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = linearLayout;
+        this.b = loadingButton;
+        this.f123c = textView;
+        this.d = textView2;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/c/a/i/m0.java b/app/src/main/java/c/a/i/m0.java
index 0a1cb7df09..4be15f1ca0 100644
--- a/app/src/main/java/c/a/i/m0.java
+++ b/app/src/main/java/c/a/i/m0.java
@@ -14,12 +14,12 @@ public final class m0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f126c;
+    public final TextView f124c;
 
     public m0(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f126c = textView;
+        this.f124c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/m1.java b/app/src/main/java/c/a/i/m1.java
index a72a1a8ab6..0fdd806a14 100644
--- a/app/src/main/java/c/a/i/m1.java
+++ b/app/src/main/java/c/a/i/m1.java
@@ -1,16 +1,35 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.calls.VideoCallParticipantView;
-/* compiled from: VideoCallGridItemBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: UserActionsDialogBinding */
 public final class m1 implements ViewBinding {
     @NonNull
-    public final VideoCallParticipantView a;
+    public final LinearLayout a;
+    @NonNull
+    public final SimpleDraweeView b;
+    @NonNull
 
-    public m1(@NonNull VideoCallParticipantView videoCallParticipantView) {
-        this.a = videoCallParticipantView;
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f125c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final TextView f;
+
+    public m1(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
+        this.a = linearLayout;
+        this.b = simpleDraweeView;
+        this.f125c = textView;
+        this.d = textView2;
+        this.e = textView3;
+        this.f = textView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/m2.java b/app/src/main/java/c/a/i/m2.java
index bc59e73887..43f37a9b68 100644
--- a/app/src/main/java/c/a/i/m2.java
+++ b/app/src/main/java/c/a/i/m2.java
@@ -1,30 +1,36 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewPremiumGuildProgressBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.chip.Chip;
+/* compiled from: ViewPremiumGuildConfirmationBinding */
 public final class m2 implements ViewBinding {
     @NonNull
-    public final FrameLayout a;
+    public final View a;
     @NonNull
-    public final ImageView b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f127c;
+    public final TextView f126c;
     @NonNull
-    public final ProgressBar d;
+    public final Chip d;
+    @NonNull
+    public final Chip e;
+    @NonNull
+    public final ImageView f;
 
-    public m2(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ProgressBar progressBar) {
-        this.a = frameLayout;
-        this.b = imageView;
-        this.f127c = textView;
-        this.d = progressBar;
+    public m2(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull Chip chip, @NonNull Chip chip2, @NonNull ImageView imageView) {
+        this.a = view;
+        this.b = simpleDraweeView;
+        this.f126c = textView;
+        this.d = chip;
+        this.e = chip2;
+        this.f = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/m3.java b/app/src/main/java/c/a/i/m3.java
index e6fd6d0033..7a41d780da 100644
--- a/app/src/main/java/c/a/i/m3.java
+++ b/app/src/main/java/c/a/i/m3.java
@@ -1,45 +1,26 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.CheckableImageView;
-/* compiled from: ViewTernaryCheckboxBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewStageChannelVisitCommunityBinding */
 public final class m3 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ConstraintLayout a;
     @NonNull
-    public final FrameLayout b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f128c;
-    @NonNull
-    public final View d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final CheckableImageView g;
-    @NonNull
-    public final CheckableImageView h;
-    @NonNull
-    public final CheckableImageView i;
+    public final TextView f127c;
 
-    public m3(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull View view2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckableImageView checkableImageView, @NonNull CheckableImageView checkableImageView2, @NonNull CheckableImageView checkableImageView3) {
-        this.a = linearLayout;
-        this.b = frameLayout;
-        this.f128c = view;
-        this.d = view2;
-        this.e = textView;
-        this.f = textView2;
-        this.g = checkableImageView;
-        this.h = checkableImageView2;
-        this.i = checkableImageView3;
+    public m3(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = constraintLayout;
+        this.b = simpleDraweeView;
+        this.f127c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/m4.java b/app/src/main/java/c/a/i/m4.java
index b973765bb7..23e54b2ff9 100644
--- a/app/src/main/java/c/a/i/m4.java
+++ b/app/src/main/java/c/a/i/m4.java
@@ -1,16 +1,43 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.textview.MaterialTextView;
-/* compiled from: WidgetChatListBotUiSelectComponentPillBinding */
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
+import com.discord.views.typing.TypingDots;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: WidgetChatListAdapterItemTextBinding */
 public final class m4 implements ViewBinding {
     @NonNull
-    public final MaterialTextView a;
+    public final ConstraintLayout a;
+    @NonNull
+    public final LinkifiedTextView b;
+    @NonNull
 
-    public m4(@NonNull MaterialTextView materialTextView) {
-        this.a = materialTextView;
+    /* renamed from: c  reason: collision with root package name */
+    public final SimpleDraweeView f128c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final TextView f;
+
+    public m4(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull LinearLayout linearLayout, @NonNull View view3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout2, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull AppCompatImageView appCompatImageView, @NonNull TypingDots typingDots, @NonNull ConstraintLayout constraintLayout3, @NonNull ImageView imageView3, @NonNull TextView textView6, @NonNull Guideline guideline) {
+        this.a = constraintLayout;
+        this.b = linkifiedTextView;
+        this.f128c = simpleDraweeView;
+        this.d = textView3;
+        this.e = textView4;
+        this.f = textView5;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/m5.java b/app/src/main/java/c/a/i/m5.java
new file mode 100644
index 0000000000..17e7709e3d
--- /dev/null
+++ b/app/src/main/java/c/a/i/m5.java
@@ -0,0 +1,45 @@
+package c.a.i;
+
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: WidgetUserProfileAdapterItemFriendMutualServerBinding */
+public final class m5 implements ViewBinding {
+    @NonNull
+    public final RelativeLayout a;
+    @NonNull
+    public final SimpleDraweeView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f129c;
+
+    public m5(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
+        this.a = relativeLayout;
+        this.b = simpleDraweeView;
+        this.f129c = textView;
+    }
+
+    @NonNull
+    public static m5 a(@NonNull View view) {
+        int i = 2131365450;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365450);
+        if (simpleDraweeView != null) {
+            i = 2131365451;
+            TextView textView = (TextView) view.findViewById(2131365451);
+            if (textView != null) {
+                return new m5((RelativeLayout) view, simpleDraweeView, textView);
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/c/a/i/n0.java b/app/src/main/java/c/a/i/n0.java
index ac424e37c0..5c8cb879a9 100644
--- a/app/src/main/java/c/a/i/n0.java
+++ b/app/src/main/java/c/a/i/n0.java
@@ -1,16 +1,37 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.TextView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: OauthTokenPermissionListItemBinding */
+import androidx.viewpager2.widget.ViewPager2;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.tabs.TabLayout;
+/* compiled from: MultiValuePropPremiumUpsellDialogBinding */
 public final class n0 implements ViewBinding {
     @NonNull
-    public final TextView a;
+    public final RelativeLayout a;
+    @NonNull
+    public final MaterialButton b;
+    @NonNull
 
-    public n0(@NonNull TextView textView) {
-        this.a = textView;
+    /* renamed from: c  reason: collision with root package name */
+    public final TabLayout f130c;
+    @NonNull
+    public final MaterialButton d;
+    @NonNull
+    public final MaterialButton e;
+    @NonNull
+    public final ViewPager2 f;
+
+    public n0(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull TabLayout tabLayout, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull ViewPager2 viewPager2) {
+        this.a = relativeLayout;
+        this.b = materialButton;
+        this.f130c = tabLayout;
+        this.d = materialButton2;
+        this.e = materialButton3;
+        this.f = viewPager2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/n1.java b/app/src/main/java/c/a/i/n1.java
index aab808ff65..e0efc4ead3 100644
--- a/app/src/main/java/c/a/i/n1.java
+++ b/app/src/main/java/c/a/i/n1.java
@@ -1,33 +1,34 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewAccountCreditBinding */
+import com.discord.views.StatusView;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: UserAvatarPresenceViewBinding */
 public final class n1 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final RelativeLayout a;
     @NonNull
-    public final TextView b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f129c;
+    public final ImageView f131c;
     @NonNull
-    public final TextView d;
+    public final SimpleDraweeView d;
     @NonNull
-    public final TextView e;
+    public final StatusView e;
 
-    public n1(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3) {
-        this.a = constraintLayout;
-        this.b = textView;
-        this.f129c = imageView;
-        this.d = textView2;
-        this.e = textView3;
+    public n1(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull RelativeLayout relativeLayout2, @NonNull StatusView statusView) {
+        this.a = relativeLayout;
+        this.b = simpleDraweeView;
+        this.f131c = imageView;
+        this.d = simpleDraweeView2;
+        this.e = statusView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/n2.java b/app/src/main/java/c/a/i/n2.java
index 28cf3e0cd8..87742d6445 100644
--- a/app/src/main/java/c/a/i/n2.java
+++ b/app/src/main/java/c/a/i/n2.java
@@ -1,47 +1,47 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewPremiumMarketingBinding */
+/* compiled from: ViewPremiumGuildProgressBarBinding */
 public final class n2 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ConstraintLayout a;
     @NonNull
-    public final LinearLayout b;
+    public final ProgressBar b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f130c;
+    public final ImageView f132c;
     @NonNull
-    public final LinearLayout d;
+    public final ImageView d;
     @NonNull
     public final TextView e;
     @NonNull
-    public final TextView f;
+    public final ImageView f;
     @NonNull
     public final TextView g;
     @NonNull
-    public final TextView h;
+    public final ImageView h;
     @NonNull
     public final TextView i;
-    @NonNull
-    public final TextView j;
 
-    public n2(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
-        this.a = linearLayout;
-        this.b = linearLayout2;
-        this.f130c = materialButton;
-        this.d = linearLayout3;
+    public n2(@NonNull ConstraintLayout constraintLayout, @NonNull ProgressBar progressBar, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView4, @NonNull TextView textView3) {
+        this.a = constraintLayout;
+        this.b = progressBar;
+        this.f132c = imageView;
+        this.d = imageView2;
         this.e = textView;
-        this.f = textView2;
-        this.g = textView3;
-        this.h = textView4;
-        this.i = textView5;
-        this.j = textView6;
+        this.f = imageView3;
+        this.g = textView2;
+        this.h = imageView4;
+        this.i = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/n3.java b/app/src/main/java/c/a/i/n3.java
index b255116889..004b22b555 100644
--- a/app/src/main/java/c/a/i/n3.java
+++ b/app/src/main/java/c/a/i/n3.java
@@ -1,28 +1,42 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.StatusView;
-/* compiled from: ViewToolbarTitleBinding */
+import androidx.viewpager2.widget.ViewPager2;
+import com.discord.views.LoadingButton;
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewStepsBinding */
 public final class n3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final RelativeLayout a;
     @NonNull
-    public final StatusView b;
+    public final LinearLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f131c;
+    public final TextView f133c;
     @NonNull
-    public final TextView d;
+    public final ImageView d;
+    @NonNull
+    public final LoadingButton e;
+    @NonNull
+    public final MaterialButton f;
+    @NonNull
+    public final ViewPager2 g;
 
-    public n3(@NonNull View view, @NonNull StatusView statusView, @NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = view;
-        this.b = statusView;
-        this.f131c = textView;
-        this.d = textView2;
+    public n3(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull ViewPager2 viewPager2) {
+        this.a = relativeLayout;
+        this.b = linearLayout;
+        this.f133c = textView;
+        this.d = imageView;
+        this.e = loadingButton;
+        this.f = materialButton;
+        this.g = viewPager2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/n4.java b/app/src/main/java/c/a/i/n4.java
index 32a5bcee8a..9a7e252257 100644
--- a/app/src/main/java/c/a/i/n4.java
+++ b/app/src/main/java/c/a/i/n4.java
@@ -1,20 +1,51 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetDiscoveryOtherSpeakersCountBinding */
+import com.discord.widgets.botuikit.views.ActionRowComponentView;
+import com.google.android.flexbox.FlexboxLayout;
+/* compiled from: WidgetChatListBotUiActionRowComponentBinding */
 public final class n4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ActionRowComponentView a;
+    @NonNull
+    public final FlexboxLayout b;
     @NonNull
-    public final TextView b;
 
-    public n4(@NonNull LinearLayout linearLayout, @NonNull TextView textView) {
-        this.a = linearLayout;
-        this.b = textView;
+    /* renamed from: c  reason: collision with root package name */
+    public final c2 f134c;
+
+    public n4(@NonNull ActionRowComponentView actionRowComponentView, @NonNull FlexboxLayout flexboxLayout, @NonNull c2 c2Var) {
+        this.a = actionRowComponentView;
+        this.b = flexboxLayout;
+        this.f134c = c2Var;
+    }
+
+    @NonNull
+    public static n4 a(@NonNull View view) {
+        int i = 2131361884;
+        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131361884);
+        if (flexboxLayout != null) {
+            i = 2131361885;
+            View findViewById = view.findViewById(2131361885);
+            if (findViewById != null) {
+                int i2 = 2131365555;
+                ImageView imageView = (ImageView) findViewById.findViewById(2131365555);
+                if (imageView != null) {
+                    i2 = 2131365556;
+                    TextView textView = (TextView) findViewById.findViewById(2131365556);
+                    if (textView != null) {
+                        return new n4((ActionRowComponentView) view, flexboxLayout, new c2((ConstraintLayout) findViewById, imageView, textView));
+                    }
+                }
+                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(i2)));
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/n5.java b/app/src/main/java/c/a/i/n5.java
new file mode 100644
index 0000000000..862e1f1ff9
--- /dev/null
+++ b/app/src/main/java/c/a/i/n5.java
@@ -0,0 +1,119 @@
+package c.a.i;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.Space;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.Barrier;
+import androidx.viewbinding.ViewBinding;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
+/* compiled from: WidgetUserRichPresenceBinding */
+public final class n5 implements ViewBinding {
+    @NonNull
+    public final LinearLayout a;
+    @NonNull
+    public final LinearLayout b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f135c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final SimpleDraweeView e;
+    @NonNull
+    public final SimpleDraweeView f;
+    @NonNull
+    public final MaterialButton g;
+    @NonNull
+    public final MaterialButton h;
+    @NonNull
+    public final TextView i;
+    @NonNull
+    public final TextView j;
+    @NonNull
+    public final TextView k;
+
+    public n5(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) {
+        this.a = linearLayout;
+        this.b = linearLayout2;
+        this.f135c = textView;
+        this.d = textView2;
+        this.e = simpleDraweeView;
+        this.f = simpleDraweeView2;
+        this.g = materialButton;
+        this.h = materialButton2;
+        this.i = textView3;
+        this.j = textView4;
+        this.k = textView5;
+    }
+
+    @NonNull
+    public static n5 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
+        View inflate = layoutInflater.inflate(2131559282, viewGroup, false);
+        if (z2) {
+            viewGroup.addView(inflate);
+        }
+        int i = 2131362097;
+        Barrier barrier = (Barrier) inflate.findViewById(2131362097);
+        if (barrier != null) {
+            i = 2131363581;
+            Space space = (Space) inflate.findViewById(2131363581);
+            if (space != null) {
+                i = 2131364476;
+                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364476);
+                if (linearLayout != null) {
+                    i = 2131364477;
+                    TextView textView = (TextView) inflate.findViewById(2131364477);
+                    if (textView != null) {
+                        i = 2131364478;
+                        TextView textView2 = (TextView) inflate.findViewById(2131364478);
+                        if (textView2 != null) {
+                            i = 2131364479;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364479);
+                            if (simpleDraweeView != null) {
+                                i = 2131364482;
+                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364482);
+                                if (simpleDraweeView2 != null) {
+                                    i = 2131364486;
+                                    MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364486);
+                                    if (materialButton != null) {
+                                        i = 2131364487;
+                                        MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364487);
+                                        if (materialButton2 != null) {
+                                            i = 2131364489;
+                                            TextView textView3 = (TextView) inflate.findViewById(2131364489);
+                                            if (textView3 != null) {
+                                                i = 2131364490;
+                                                TextView textView4 = (TextView) inflate.findViewById(2131364490);
+                                                if (textView4 != null) {
+                                                    i = 2131364491;
+                                                    TextView textView5 = (TextView) inflate.findViewById(2131364491);
+                                                    if (textView5 != null) {
+                                                        return new n5((LinearLayout) inflate, barrier, space, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, materialButton, materialButton2, textView3, textView4, textView5);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/c/a/i/o0.java b/app/src/main/java/c/a/i/o0.java
index 239125278d..e935e341d3 100644
--- a/app/src/main/java/c/a/i/o0.java
+++ b/app/src/main/java/c/a/i/o0.java
@@ -1,36 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.OverlayMenuView;
-/* compiled from: OverlayBubbleMenuBinding */
+/* compiled from: OauthTokenPermissionListItemBinding */
 public final class o0 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
-    @NonNull
-    public final LinearLayout b;
-    @NonNull
+    public final TextView a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final View f132c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final RecyclerView e;
-    @NonNull
-    public final OverlayMenuView f;
-
-    public o0(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull OverlayMenuView overlayMenuView) {
-        this.a = linearLayout;
-        this.b = linearLayout2;
-        this.f132c = view;
-        this.d = textView;
-        this.e = recyclerView;
-        this.f = overlayMenuView;
+    public o0(@NonNull TextView textView) {
+        this.a = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/o1.java b/app/src/main/java/c/a/i/o1.java
index 2b0cd8a040..f7c8cd83ec 100644
--- a/app/src/main/java/c/a/i/o1.java
+++ b/app/src/main/java/c/a/i/o1.java
@@ -1,46 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewActiveSubscriptionBinding */
+import com.discord.views.calls.VideoCallParticipantView;
+/* compiled from: VideoCallGridItemBinding */
 public final class o1 implements ViewBinding {
     @NonNull
-    public final FrameLayout a;
-    @NonNull
-    public final TextView b;
-    @NonNull
+    public final VideoCallParticipantView a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final ImageView f133c;
-    @NonNull
-    public final ImageView d;
-    @NonNull
-    public final ImageView e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final MaterialButton g;
-    @NonNull
-    public final ProgressBar h;
-    @NonNull
-    public final MaterialButton i;
-
-    public o1(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull ProgressBar progressBar, @NonNull MaterialButton materialButton2) {
-        this.a = frameLayout;
-        this.b = textView;
-        this.f133c = imageView;
-        this.d = imageView2;
-        this.e = imageView3;
-        this.f = textView2;
-        this.g = materialButton;
-        this.h = progressBar;
-        this.i = materialButton2;
+    public o1(@NonNull VideoCallParticipantView videoCallParticipantView) {
+        this.a = videoCallParticipantView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/o2.java b/app/src/main/java/c/a/i/o2.java
index a398297ec2..c2c4b6cb5d 100644
--- a/app/src/main/java/c/a/i/o2.java
+++ b/app/src/main/java/c/a/i/o2.java
@@ -1,31 +1,30 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewPremiumSettingsPerksBinding */
+/* compiled from: ViewPremiumGuildProgressBinding */
 public final class o2 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final FrameLayout a;
     @NonNull
-    public final TextView b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f134c;
+    public final TextView f136c;
     @NonNull
-    public final TextView d;
-    @NonNull
-    public final TextView e;
+    public final ProgressBar d;
 
-    public o2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
-        this.a = linearLayout;
-        this.b = textView;
-        this.f134c = textView2;
-        this.d = textView3;
-        this.e = textView4;
+    public o2(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ProgressBar progressBar) {
+        this.a = frameLayout;
+        this.b = imageView;
+        this.f136c = textView;
+        this.d = progressBar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/o3.java b/app/src/main/java/c/a/i/o3.java
index 7da3324625..126e549ae2 100644
--- a/app/src/main/java/c/a/i/o3.java
+++ b/app/src/main/java/c/a/i/o3.java
@@ -1,33 +1,29 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewUploadProgressBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewStreamPreviewBinding */
 public final class o3 implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
     @NonNull
-    public final ProgressBar b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f135c;
+    public final TextView f137c;
     @NonNull
     public final TextView d;
-    @NonNull
-    public final TextView e;
 
-    public o3(@NonNull ConstraintLayout constraintLayout, @NonNull ProgressBar progressBar, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
+    public o3(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
-        this.b = progressBar;
-        this.f135c = imageView;
-        this.d = textView;
-        this.e = textView2;
+        this.b = simpleDraweeView;
+        this.f137c = textView;
+        this.d = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/o4.java b/app/src/main/java/c/a/i/o4.java
index 160103c088..e103c75a30 100644
--- a/app/src/main/java/c/a/i/o4.java
+++ b/app/src/main/java/c/a/i/o4.java
@@ -1,26 +1,64 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.views.typing.TypingDots;
+import com.discord.widgets.botuikit.views.select.SelectComponentView;
 import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: WidgetDiscoveryStageCardSpeakerBinding */
+import com.google.android.flexbox.FlexboxLayout;
+import com.google.android.material.textview.MaterialTextView;
+/* compiled from: WidgetChatListBotUiSelectComponentBinding */
 public final class o4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final SelectComponentView a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f136c;
+    public final TypingDots f138c;
+    @NonNull
+    public final SimpleDraweeView d;
+    @NonNull
+    public final MaterialTextView e;
+    @NonNull
+    public final FlexboxLayout f;
 
-    public o4(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
-        this.a = linearLayout;
-        this.b = simpleDraweeView;
-        this.f136c = textView;
+    public o4(@NonNull SelectComponentView selectComponentView, @NonNull ImageView imageView, @NonNull TypingDots typingDots, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialTextView materialTextView, @NonNull FlexboxLayout flexboxLayout) {
+        this.a = selectComponentView;
+        this.b = imageView;
+        this.f138c = typingDots;
+        this.d = simpleDraweeView;
+        this.e = materialTextView;
+        this.f = flexboxLayout;
+    }
+
+    @NonNull
+    public static o4 a(@NonNull View view) {
+        int i = 2131364604;
+        ImageView imageView = (ImageView) view.findViewById(2131364604);
+        if (imageView != null) {
+            i = 2131364605;
+            TypingDots typingDots = (TypingDots) view.findViewById(2131364605);
+            if (typingDots != null) {
+                i = 2131364606;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364606);
+                if (simpleDraweeView != null) {
+                    i = 2131364607;
+                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364607);
+                    if (materialTextView != null) {
+                        i = 2131364608;
+                        FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131364608);
+                        if (flexboxLayout != null) {
+                            return new o4((SelectComponentView) view, imageView, typingDots, simpleDraweeView, materialTextView, flexboxLayout);
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/p.java b/app/src/main/java/c/a/i/p.java
index c4dca24578..6984ada0c7 100644
--- a/app/src/main/java/c/a/i/p.java
+++ b/app/src/main/java/c/a/i/p.java
@@ -18,7 +18,7 @@ public final class p implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f137c;
+    public final RelativeLayout f139c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -33,7 +33,7 @@ public final class p implements ViewBinding {
     public p(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull MaterialButton materialButton2, @NonNull TextView textView2, @NonNull ImageView imageView) {
         this.a = linearLayout;
         this.b = textView;
-        this.f137c = relativeLayout;
+        this.f139c = relativeLayout;
         this.d = materialButton;
         this.e = linkifiedTextView;
         this.f = materialButton2;
diff --git a/app/src/main/java/c/a/i/p0.java b/app/src/main/java/c/a/i/p0.java
index c0d524b9ce..69591d0f1f 100644
--- a/app/src/main/java/c/a/i/p0.java
+++ b/app/src/main/java/c/a/i/p0.java
@@ -1,16 +1,36 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.VoiceUserView;
-/* compiled from: OverlayMenuVoiceMembersItemBinding */
+import com.discord.views.OverlayMenuView;
+/* compiled from: OverlayBubbleMenuBinding */
 public final class p0 implements ViewBinding {
     @NonNull
-    public final VoiceUserView a;
+    public final LinearLayout a;
+    @NonNull
+    public final LinearLayout b;
+    @NonNull
 
-    public p0(@NonNull VoiceUserView voiceUserView) {
-        this.a = voiceUserView;
+    /* renamed from: c  reason: collision with root package name */
+    public final View f140c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final RecyclerView e;
+    @NonNull
+    public final OverlayMenuView f;
+
+    public p0(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull OverlayMenuView overlayMenuView) {
+        this.a = linearLayout;
+        this.b = linearLayout2;
+        this.f140c = view;
+        this.d = textView;
+        this.e = recyclerView;
+        this.f = overlayMenuView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/p1.java b/app/src/main/java/c/a/i/p1.java
index 3da2d114c3..30f073fdb2 100644
--- a/app/src/main/java/c/a/i/p1.java
+++ b/app/src/main/java/c/a/i/p1.java
@@ -2,18 +2,32 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewAddOverrideItemBinding */
+/* compiled from: ViewAccountCreditBinding */
 public final class p1 implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
+    @NonNull
+    public final TextView b;
+    @NonNull
 
-    public p1(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull Guideline guideline, @NonNull ImageView imageView) {
+    /* renamed from: c  reason: collision with root package name */
+    public final ImageView f141c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+
+    public p1(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3) {
         this.a = constraintLayout;
+        this.b = textView;
+        this.f141c = imageView;
+        this.d = textView2;
+        this.e = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/p2.java b/app/src/main/java/c/a/i/p2.java
index 4d88c77094..1487ade0db 100644
--- a/app/src/main/java/c/a/i/p2.java
+++ b/app/src/main/java/c/a/i/p2.java
@@ -1,39 +1,47 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewPremiumSettingsTier1Binding */
+/* compiled from: ViewPremiumMarketingBinding */
 public final class p2 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final LinearLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f138c;
+    public final MaterialButton f142c;
     @NonNull
-    public final TextView d;
+    public final LinearLayout d;
     @NonNull
     public final TextView e;
     @NonNull
-    public final MaterialButton f;
+    public final TextView f;
     @NonNull
     public final TextView g;
+    @NonNull
+    public final TextView h;
+    @NonNull
+    public final TextView i;
+    @NonNull
+    public final TextView j;
 
-    public p2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView2, @NonNull MaterialButton materialButton, @NonNull TextView textView5) {
+    public p2(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f138c = textView2;
-        this.d = textView3;
-        this.e = textView4;
-        this.f = materialButton;
-        this.g = textView5;
+        this.b = linearLayout2;
+        this.f142c = materialButton;
+        this.d = linearLayout3;
+        this.e = textView;
+        this.f = textView2;
+        this.g = textView3;
+        this.h = textView4;
+        this.i = textView5;
+        this.j = textView6;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/p3.java b/app/src/main/java/c/a/i/p3.java
index c070a1087f..d7527b87c9 100644
--- a/app/src/main/java/c/a/i/p3.java
+++ b/app/src/main/java/c/a/i/p3.java
@@ -1,32 +1,45 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.StatusView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewUserListItemBinding */
+import com.discord.views.CheckableImageView;
+/* compiled from: ViewTernaryCheckboxBinding */
 public final class p3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final FrameLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f139c;
+    public final View f143c;
     @NonNull
-    public final TextView d;
+    public final View d;
     @NonNull
-    public final StatusView e;
+    public final TextView e;
+    @NonNull
+    public final TextView f;
+    @NonNull
+    public final CheckableImageView g;
+    @NonNull
+    public final CheckableImageView h;
+    @NonNull
+    public final CheckableImageView i;
 
-    public p3(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull StatusView statusView) {
-        this.a = view;
-        this.b = simpleDraweeView;
-        this.f139c = textView;
-        this.d = textView2;
-        this.e = statusView;
+    public p3(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull View view2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckableImageView checkableImageView, @NonNull CheckableImageView checkableImageView2, @NonNull CheckableImageView checkableImageView3) {
+        this.a = linearLayout;
+        this.b = frameLayout;
+        this.f143c = view;
+        this.d = view2;
+        this.e = textView;
+        this.f = textView2;
+        this.g = checkableImageView;
+        this.h = checkableImageView2;
+        this.i = checkableImageView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/p4.java b/app/src/main/java/c/a/i/p4.java
index 35ea9786ff..9c2ec35d53 100644
--- a/app/src/main/java/c/a/i/p4.java
+++ b/app/src/main/java/c/a/i/p4.java
@@ -1,31 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.LoadingButton;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textfield.TextInputLayout;
-/* compiled from: WidgetEnableTwoFactorPasswordDialogBinding */
+import com.google.android.material.textview.MaterialTextView;
+/* compiled from: WidgetChatListBotUiSelectComponentPillBinding */
 public final class p4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
-    @NonNull
-    public final MaterialButton b;
-    @NonNull
+    public final MaterialTextView a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f140c;
-    @NonNull
-    public final TextInputLayout d;
-
-    public p4(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout) {
-        this.a = linearLayout;
-        this.b = materialButton;
-        this.f140c = loadingButton;
-        this.d = textInputLayout;
+    public p4(@NonNull MaterialTextView materialTextView) {
+        this.a = materialTextView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/q.java b/app/src/main/java/c/a/i/q.java
index 9c96e0f574..5fd9aea304 100644
--- a/app/src/main/java/c/a/i/q.java
+++ b/app/src/main/java/c/a/i/q.java
@@ -13,7 +13,7 @@ public final class q implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f141c;
+    public final MaterialButton f144c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -22,7 +22,7 @@ public final class q implements ViewBinding {
     public q(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull MaterialButton materialButton4) {
         this.a = view;
         this.b = materialButton;
-        this.f141c = materialButton2;
+        this.f144c = materialButton2;
         this.d = materialButton3;
         this.e = materialButton4;
     }
diff --git a/app/src/main/java/c/a/i/q0.java b/app/src/main/java/c/a/i/q0.java
index 3fa36d34a3..944355bff1 100644
--- a/app/src/main/java/c/a/i/q0.java
+++ b/app/src/main/java/c/a/i/q0.java
@@ -3,17 +3,14 @@ package c.a.i;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: OverlayVoiceBubbleBinding */
+import com.discord.views.VoiceUserView;
+/* compiled from: OverlayMenuVoiceMembersItemBinding */
 public final class q0 implements ViewBinding {
     @NonNull
-    public final SimpleDraweeView a;
-    @NonNull
-    public final SimpleDraweeView b;
+    public final VoiceUserView a;
 
-    public q0(@NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2) {
-        this.a = simpleDraweeView;
-        this.b = simpleDraweeView2;
+    public q0(@NonNull VoiceUserView voiceUserView) {
+        this.a = voiceUserView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/q1.java b/app/src/main/java/c/a/i/q1.java
index 8c651c5943..8354a0a3a7 100644
--- a/app/src/main/java/c/a/i/q1.java
+++ b/app/src/main/java/c/a/i/q1.java
@@ -1,25 +1,46 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewChatActionItemBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewActiveSubscriptionBinding */
 public final class q1 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final FrameLayout a;
     @NonNull
-    public final ImageView b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f142c;
+    public final ImageView f145c;
+    @NonNull
+    public final ImageView d;
+    @NonNull
+    public final ImageView e;
+    @NonNull
+    public final TextView f;
+    @NonNull
+    public final MaterialButton g;
+    @NonNull
+    public final ProgressBar h;
+    @NonNull
+    public final MaterialButton i;
 
-    public q1(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView) {
-        this.a = view;
-        this.b = imageView;
-        this.f142c = textView;
+    public q1(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull ProgressBar progressBar, @NonNull MaterialButton materialButton2) {
+        this.a = frameLayout;
+        this.b = textView;
+        this.f145c = imageView;
+        this.d = imageView2;
+        this.e = imageView3;
+        this.f = textView2;
+        this.g = materialButton;
+        this.h = progressBar;
+        this.i = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/q2.java b/app/src/main/java/c/a/i/q2.java
index f6eb2ec0cc..ca484e6f1d 100644
--- a/app/src/main/java/c/a/i/q2.java
+++ b/app/src/main/java/c/a/i/q2.java
@@ -1,21 +1,31 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewPremiumSettingsTier2Binding */
+/* compiled from: ViewPremiumSettingsPerksBinding */
 public final class q2 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final TextView b;
+    @NonNull
 
-    public q2(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull MaterialButton materialButton) {
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f146c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+
+    public q2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = linearLayout;
-        this.b = materialButton;
+        this.b = textView;
+        this.f146c = textView2;
+        this.d = textView3;
+        this.e = textView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/q3.java b/app/src/main/java/c/a/i/q3.java
index 1dc9e89206..f7230e3752 100644
--- a/app/src/main/java/c/a/i/q3.java
+++ b/app/src/main/java/c/a/i/q3.java
@@ -1,50 +1,30 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewUserStatusPresenceBinding */
+import com.discord.views.StatusView;
+/* compiled from: ViewToolbarTitleBinding */
 public final class q3 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final View a;
     @NonNull
-    public final ImageView b;
+    public final StatusView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f143c;
+    public final TextView f147c;
     @NonNull
     public final TextView d;
 
-    public q3(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2) {
-        this.a = linearLayout;
-        this.b = imageView;
-        this.f143c = textView;
+    public q3(@NonNull View view, @NonNull StatusView statusView, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = view;
+        this.b = statusView;
+        this.f147c = textView;
         this.d = textView2;
     }
 
-    @NonNull
-    public static q3 a(@NonNull View view) {
-        int i = 2131365461;
-        ImageView imageView = (ImageView) view.findViewById(2131365461);
-        if (imageView != null) {
-            i = 2131365462;
-            TextView textView = (TextView) view.findViewById(2131365462);
-            if (textView != null) {
-                i = 2131365463;
-                TextView textView2 = (TextView) view.findViewById(2131365463);
-                if (textView2 != null) {
-                    LinearLayout linearLayout = (LinearLayout) view;
-                    return new q3(linearLayout, imageView, textView, textView2, linearLayout);
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
-    }
-
     @Override // androidx.viewbinding.ViewBinding
     @NonNull
     public View getRoot() {
diff --git a/app/src/main/java/c/a/i/q4.java b/app/src/main/java/c/a/i/q4.java
index 2ea6501d53..08e8620f12 100644
--- a/app/src/main/java/c/a/i/q4.java
+++ b/app/src/main/java/c/a/i/q4.java
@@ -1,32 +1,20 @@
 package c.a.i;
 
 import android.view.View;
-import android.view.ViewStub;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentContainerView;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.rounded.RoundedRelativeLayout;
-/* compiled from: WidgetHomePanelCenterBinding */
+/* compiled from: WidgetDiscoveryOtherSpeakersCountBinding */
 public final class q4 implements ViewBinding {
     @NonNull
-    public final RoundedRelativeLayout a;
-    @NonNull
-    public final ViewStub b;
+    public final LinearLayout a;
     @NonNull
+    public final TextView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final r4 f144c;
-    @NonNull
-    public final FragmentContainerView d;
-    @NonNull
-    public final FragmentContainerView e;
-
-    public q4(@NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull ViewStub viewStub, @NonNull ViewStub viewStub2, @NonNull r4 r4Var, @NonNull View view, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull FragmentContainerView fragmentContainerView5, @NonNull FragmentContainerView fragmentContainerView6) {
-        this.a = roundedRelativeLayout;
-        this.b = viewStub2;
-        this.f144c = r4Var;
-        this.d = fragmentContainerView;
-        this.e = fragmentContainerView4;
+    public q4(@NonNull LinearLayout linearLayout, @NonNull TextView textView) {
+        this.a = linearLayout;
+        this.b = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/r0.java b/app/src/main/java/c/a/i/r0.java
index 0e2af8d23c..696332b18b 100644
--- a/app/src/main/java/c/a/i/r0.java
+++ b/app/src/main/java/c/a/i/r0.java
@@ -1,71 +1,19 @@
 package c.a.i;
 
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.textfield.TextInputLayout;
-/* compiled from: OverlayVoiceChannelSelectorBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: OverlayVoiceBubbleBinding */
 public final class r0 implements ViewBinding {
     @NonNull
-    public final CardView a;
-    @NonNull
-    public final ImageView b;
+    public final SimpleDraweeView a;
     @NonNull
+    public final SimpleDraweeView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final CardView f145c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final TextInputLayout e;
-    @NonNull
-    public final RecyclerView f;
-
-    public r0(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull TextView textView2) {
-        this.a = cardView;
-        this.b = imageView;
-        this.f145c = cardView2;
-        this.d = textView;
-        this.e = textInputLayout;
-        this.f = recyclerView;
-    }
-
-    @NonNull
-    public static r0 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558613, viewGroup, false);
-        if (z2) {
-            viewGroup.addView(inflate);
-        }
-        int i = 2131362631;
-        ImageView imageView = (ImageView) inflate.findViewById(2131362631);
-        if (imageView != null) {
-            CardView cardView = (CardView) inflate;
-            i = 2131363033;
-            TextView textView = (TextView) inflate.findViewById(2131363033);
-            if (textView != null) {
-                i = 2131364114;
-                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131364114);
-                if (textInputLayout != null) {
-                    i = 2131364433;
-                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364433);
-                    if (recyclerView != null) {
-                        i = 2131365201;
-                        TextView textView2 = (TextView) inflate.findViewById(2131365201);
-                        if (textView2 != null) {
-                            return new r0(cardView, imageView, cardView, textView, textInputLayout, recyclerView, textView2);
-                        }
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
+    public r0(@NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2) {
+        this.a = simpleDraweeView;
+        this.b = simpleDraweeView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/r1.java b/app/src/main/java/c/a/i/r1.java
index 65560dcaed..defd930b92 100644
--- a/app/src/main/java/c/a/i/r1.java
+++ b/app/src/main/java/c/a/i/r1.java
@@ -5,25 +5,15 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewChatUploadBinding */
+/* compiled from: ViewAddOverrideItemBinding */
 public final class r1 implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
-    @NonNull
-    public final TextView b;
-    @NonNull
 
-    /* renamed from: c  reason: collision with root package name */
-    public final ImageView f146c;
-    @NonNull
-    public final TextView d;
-
-    public r1(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView2) {
+    public r1(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull Guideline guideline, @NonNull ImageView imageView) {
         this.a = constraintLayout;
-        this.b = textView;
-        this.f146c = imageView2;
-        this.d = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/r2.java b/app/src/main/java/c/a/i/r2.java
index a62d7b14bf..a9d23c6cf1 100644
--- a/app/src/main/java/c/a/i/r2.java
+++ b/app/src/main/java/c/a/i/r2.java
@@ -1,11 +1,13 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewPremiumUpsellInfoBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewPremiumSettingsTier1Binding */
 public final class r2 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -14,15 +16,24 @@ public final class r2 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f147c;
+    public final TextView f148c;
     @NonNull
     public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final MaterialButton f;
+    @NonNull
+    public final TextView g;
 
-    public r2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
+    public r2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView2, @NonNull MaterialButton materialButton, @NonNull TextView textView5) {
         this.a = linearLayout;
         this.b = textView;
-        this.f147c = textView2;
+        this.f148c = textView2;
         this.d = textView3;
+        this.e = textView4;
+        this.f = materialButton;
+        this.g = textView5;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/r3.java b/app/src/main/java/c/a/i/r3.java
index bece3b33a7..4c048c5cd8 100644
--- a/app/src/main/java/c/a/i/r3.java
+++ b/app/src/main/java/c/a/i/r3.java
@@ -1,29 +1,33 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.CutoutView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewUserSummaryItemBinding */
+/* compiled from: ViewUploadProgressBinding */
 public final class r3 implements ViewBinding {
     @NonNull
-    public final CutoutView a;
+    public final ConstraintLayout a;
     @NonNull
-    public final SimpleDraweeView b;
-
-    public r3(@NonNull CutoutView cutoutView, @NonNull SimpleDraweeView simpleDraweeView) {
-        this.a = cutoutView;
-        this.b = simpleDraweeView;
-    }
-
+    public final ProgressBar b;
     @NonNull
-    public static r3 a(@NonNull View view) {
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362074);
-        if (simpleDraweeView != null) {
-            return new r3((CutoutView) view, simpleDraweeView);
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362074)));
+
+    /* renamed from: c  reason: collision with root package name */
+    public final ImageView f149c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+
+    public r3(@NonNull ConstraintLayout constraintLayout, @NonNull ProgressBar progressBar, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = constraintLayout;
+        this.b = progressBar;
+        this.f149c = imageView;
+        this.d = textView;
+        this.e = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/r4.java b/app/src/main/java/c/a/i/r4.java
index ebe58a5458..50ec639dd3 100644
--- a/app/src/main/java/c/a/i/r4.java
+++ b/app/src/main/java/c/a/i/r4.java
@@ -1,16 +1,26 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetHomePanelCenterContentUnreadBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: WidgetDiscoveryStageCardSpeakerBinding */
 public final class r4 implements ViewBinding {
     @NonNull
-    public final TextView a;
+    public final LinearLayout a;
+    @NonNull
+    public final SimpleDraweeView b;
+    @NonNull
 
-    public r4(@NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = textView;
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f150c;
+
+    public r4(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
+        this.a = linearLayout;
+        this.b = simpleDraweeView;
+        this.f150c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/s0.java b/app/src/main/java/c/a/i/s0.java
index afdcf14b88..b80d104f68 100644
--- a/app/src/main/java/c/a/i/s0.java
+++ b/app/src/main/java/c/a/i/s0.java
@@ -1,39 +1,71 @@
 package c.a.i;
 
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumActivatedDialogBinding */
+import com.google.android.material.textfield.TextInputLayout;
+/* compiled from: OverlayVoiceChannelSelectorBinding */
 public final class s0 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final CardView a;
     @NonNull
-    public final MaterialButton b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f148c;
+    public final CardView f151c;
     @NonNull
-    public final ImageView d;
+    public final TextView d;
     @NonNull
-    public final ImageView e;
+    public final TextInputLayout e;
     @NonNull
-    public final ImageView f;
-    @NonNull
-    public final ImageView g;
+    public final RecyclerView f;
 
-    public s0(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4) {
-        this.a = linearLayout;
-        this.b = materialButton;
-        this.f148c = textView;
-        this.d = imageView;
-        this.e = imageView2;
-        this.f = imageView3;
-        this.g = imageView4;
+    public s0(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull TextView textView2) {
+        this.a = cardView;
+        this.b = imageView;
+        this.f151c = cardView2;
+        this.d = textView;
+        this.e = textInputLayout;
+        this.f = recyclerView;
+    }
+
+    @NonNull
+    public static s0 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
+        View inflate = layoutInflater.inflate(2131558614, viewGroup, false);
+        if (z2) {
+            viewGroup.addView(inflate);
+        }
+        int i = 2131362655;
+        ImageView imageView = (ImageView) inflate.findViewById(2131362655);
+        if (imageView != null) {
+            CardView cardView = (CardView) inflate;
+            i = 2131363058;
+            TextView textView = (TextView) inflate.findViewById(2131363058);
+            if (textView != null) {
+                i = 2131364157;
+                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131364157);
+                if (textInputLayout != null) {
+                    i = 2131364471;
+                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364471);
+                    if (recyclerView != null) {
+                        i = 2131365256;
+                        TextView textView2 = (TextView) inflate.findViewById(2131365256);
+                        if (textView2 != null) {
+                            return new s0(cardView, imageView, cardView, textView, textInputLayout, recyclerView, textView2);
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/s1.java b/app/src/main/java/c/a/i/s1.java
index e134ef4369..636be3b912 100644
--- a/app/src/main/java/c/a/i/s1.java
+++ b/app/src/main/java/c/a/i/s1.java
@@ -1,28 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.FailedUploadView;
-/* compiled from: ViewChatUploadListBinding */
+/* compiled from: ViewChatActionItemBinding */
 public final class s1 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final View a;
     @NonNull
-    public final FailedUploadView b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FailedUploadView f149c;
-    @NonNull
-    public final FailedUploadView d;
+    public final TextView f152c;
 
-    public s1(@NonNull LinearLayout linearLayout, @NonNull FailedUploadView failedUploadView, @NonNull FailedUploadView failedUploadView2, @NonNull FailedUploadView failedUploadView3) {
-        this.a = linearLayout;
-        this.b = failedUploadView;
-        this.f149c = failedUploadView2;
-        this.d = failedUploadView3;
+    public s1(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView) {
+        this.a = view;
+        this.b = imageView;
+        this.f152c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/s2.java b/app/src/main/java/c/a/i/s2.java
index 3311fb4e5c..0674bb4639 100644
--- a/app/src/main/java/c/a/i/s2.java
+++ b/app/src/main/java/c/a/i/s2.java
@@ -1,16 +1,21 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.RadioButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewRadioButtonBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewPremiumSettingsTier2Binding */
 public final class s2 implements ViewBinding {
     @NonNull
-    public final RadioButton a;
+    public final LinearLayout a;
+    @NonNull
+    public final MaterialButton b;
 
-    public s2(@NonNull RadioButton radioButton) {
-        this.a = radioButton;
+    public s2(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull MaterialButton materialButton) {
+        this.a = linearLayout;
+        this.b = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/s3.java b/app/src/main/java/c/a/i/s3.java
index eeaf66b7ff..ea3b082618 100644
--- a/app/src/main/java/c/a/i/s3.java
+++ b/app/src/main/java/c/a/i/s3.java
@@ -4,22 +4,29 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.span.SimpleDraweeSpanTextView;
-/* compiled from: ViewUsernameBinding */
+import com.discord.views.StatusView;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewUserListItemBinding */
 public final class s3 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final TextView b;
+    public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeSpanTextView f150c;
+    public final TextView f153c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final StatusView e;
 
-    public s3(@NonNull View view, @NonNull TextView textView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView) {
+    public s3(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull StatusView statusView) {
         this.a = view;
-        this.b = textView;
-        this.f150c = simpleDraweeSpanTextView;
+        this.b = simpleDraweeView;
+        this.f153c = textView;
+        this.d = textView2;
+        this.e = statusView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/s4.java b/app/src/main/java/c/a/i/s4.java
index dcf190e019..b0c6b25193 100644
--- a/app/src/main/java/c/a/i/s4.java
+++ b/app/src/main/java/c/a/i/s4.java
@@ -1,27 +1,31 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentContainerView;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetHomePanelLeftBinding */
+import com.discord.views.LoadingButton;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textfield.TextInputLayout;
+/* compiled from: WidgetEnableTwoFactorPasswordDialogBinding */
 public final class s4 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FragmentContainerView f151c;
+    public final LoadingButton f154c;
+    @NonNull
+    public final TextInputLayout d;
 
-    public s4(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FrameLayout frameLayout) {
-        this.a = relativeLayout;
-        this.b = textView;
-        this.f151c = fragmentContainerView2;
+    public s4(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout) {
+        this.a = linearLayout;
+        this.b = materialButton;
+        this.f154c = loadingButton;
+        this.d = textInputLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/t.java b/app/src/main/java/c/a/i/t.java
index c8942ee3ca..e4114fee16 100644
--- a/app/src/main/java/c/a/i/t.java
+++ b/app/src/main/java/c/a/i/t.java
@@ -16,7 +16,7 @@ public final class t implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f152c;
+    public final TextView f155c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class t implements ViewBinding {
     public t(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f152c = textView;
+        this.f155c = textView;
         this.d = simpleDraweeView;
         this.e = materialButton2;
     }
diff --git a/app/src/main/java/c/a/i/t0.java b/app/src/main/java/c/a/i/t0.java
index c9c304ac3d..080dc74870 100644
--- a/app/src/main/java/c/a/i/t0.java
+++ b/app/src/main/java/c/a/i/t0.java
@@ -1,12 +1,13 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumAndPremiumGuildActivatedDialogBinding */
+/* compiled from: PremiumActivatedDialogBinding */
 public final class t0 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -15,12 +16,24 @@ public final class t0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f153c;
+    public final TextView f156c;
+    @NonNull
+    public final ImageView d;
+    @NonNull
+    public final ImageView e;
+    @NonNull
+    public final ImageView f;
+    @NonNull
+    public final ImageView g;
 
-    public t0(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
+    public t0(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f153c = textView;
+        this.f156c = textView;
+        this.d = imageView;
+        this.e = imageView2;
+        this.f = imageView3;
+        this.g = imageView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/t1.java b/app/src/main/java/c/a/i/t1.java
index 949f5cf8f9..2ac6d25152 100644
--- a/app/src/main/java/c/a/i/t1.java
+++ b/app/src/main/java/c/a/i/t1.java
@@ -1,37 +1,29 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewCodeVerificationBinding */
+/* compiled from: ViewChatUploadBinding */
 public final class t1 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ConstraintLayout a;
     @NonNull
     public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f154c;
+    public final ImageView f157c;
     @NonNull
     public final TextView d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final TextView g;
 
-    public t1(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
-        this.a = linearLayout;
+    public t1(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView2) {
+        this.a = constraintLayout;
         this.b = textView;
-        this.f154c = textView2;
-        this.d = textView3;
-        this.e = textView4;
-        this.f = textView5;
-        this.g = textView6;
+        this.f157c = imageView2;
+        this.d = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/t2.java b/app/src/main/java/c/a/i/t2.java
index cc635863fd..f37490a484 100644
--- a/app/src/main/java/c/a/i/t2.java
+++ b/app/src/main/java/c/a/i/t2.java
@@ -5,7 +5,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewScreenTitleBinding */
+/* compiled from: ViewPremiumUpsellInfoBinding */
 public final class t2 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -14,12 +14,15 @@ public final class t2 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f155c;
+    public final TextView f158c;
+    @NonNull
+    public final TextView d;
 
-    public t2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) {
+    public t2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f155c = textView2;
+        this.f158c = textView2;
+        this.d = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/t3.java b/app/src/main/java/c/a/i/t3.java
index e62e6ef96d..fe3815bf9a 100644
--- a/app/src/main/java/c/a/i/t3.java
+++ b/app/src/main/java/c/a/i/t3.java
@@ -3,80 +3,46 @@ package c.a.i;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.Space;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.VoiceUserView;
-import com.discord.views.calls.AppVideoStreamRenderer;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewVideoCallParticipantBinding */
+/* compiled from: ViewUserStatusPresenceBinding */
 public final class t3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final View b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f156c;
-    @NonNull
-    public final ImageView d;
-    @NonNull
-    public final ConstraintLayout e;
-    @NonNull
-    public final ImageView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final TextView h;
-    @NonNull
-    public final TextView i;
-    @NonNull
-    public final ImageView j;
-    @NonNull
-    public final ConstraintLayout k;
-    @NonNull
-    public final TextView l;
-    @NonNull
-    public final SimpleDraweeView m;
-    @NonNull
-    public final TextView n;
-    @NonNull
-    public final TextView o;
-    @NonNull
-    public final ProgressBar p;
-    @NonNull
-    public final AppVideoStreamRenderer q;
-    @NonNull
-    public final LinearLayout r;
+    public final TextView f159c;
     @NonNull
+    public final TextView d;
 
-    /* renamed from: s  reason: collision with root package name */
-    public final VoiceUserView f157s;
+    public t3(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2) {
+        this.a = linearLayout;
+        this.b = imageView;
+        this.f159c = textView;
+        this.d = textView2;
+    }
 
-    public t3(@NonNull View view, @NonNull View view2, @NonNull View view3, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull Space space, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView3, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView4, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull ProgressBar progressBar, @NonNull AppVideoStreamRenderer appVideoStreamRenderer, @NonNull LinearLayout linearLayout2, @NonNull VoiceUserView voiceUserView) {
-        this.a = view;
-        this.b = view2;
-        this.f156c = view3;
-        this.d = imageView;
-        this.e = constraintLayout;
-        this.f = imageView2;
-        this.g = textView;
-        this.h = textView2;
-        this.i = textView3;
-        this.j = imageView3;
-        this.k = constraintLayout2;
-        this.l = textView5;
-        this.m = simpleDraweeView;
-        this.n = textView6;
-        this.o = textView7;
-        this.p = progressBar;
-        this.q = appVideoStreamRenderer;
-        this.r = linearLayout2;
-        this.f157s = voiceUserView;
+    @NonNull
+    public static t3 a(@NonNull View view) {
+        int i = 2131365521;
+        ImageView imageView = (ImageView) view.findViewById(2131365521);
+        if (imageView != null) {
+            i = 2131365522;
+            TextView textView = (TextView) view.findViewById(2131365522);
+            if (textView != null) {
+                i = 2131365523;
+                TextView textView2 = (TextView) view.findViewById(2131365523);
+                if (textView2 != null) {
+                    LinearLayout linearLayout = (LinearLayout) view;
+                    return new t3(linearLayout, imageView, textView, textView2, linearLayout);
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/t4.java b/app/src/main/java/c/a/i/t4.java
index 597bb335e2..b1134269d0 100644
--- a/app/src/main/java/c/a/i/t4.java
+++ b/app/src/main/java/c/a/i/t4.java
@@ -1,20 +1,32 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
+import android.view.ViewStub;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentContainerView;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetHomePanelLoadingBinding */
+import com.discord.utilities.view.rounded.RoundedRelativeLayout;
+/* compiled from: WidgetHomePanelCenterBinding */
 public final class t4 implements ViewBinding {
     @NonNull
-    public final FrameLayout a;
+    public final RoundedRelativeLayout a;
+    @NonNull
+    public final ViewStub b;
     @NonNull
-    public final ImageView b;
 
-    public t4(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView) {
-        this.a = frameLayout;
-        this.b = imageView;
+    /* renamed from: c  reason: collision with root package name */
+    public final u4 f160c;
+    @NonNull
+    public final FragmentContainerView d;
+    @NonNull
+    public final FragmentContainerView e;
+
+    public t4(@NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull ViewStub viewStub, @NonNull ViewStub viewStub2, @NonNull u4 u4Var, @NonNull View view, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull FragmentContainerView fragmentContainerView5, @NonNull FragmentContainerView fragmentContainerView6) {
+        this.a = roundedRelativeLayout;
+        this.b = viewStub2;
+        this.f160c = u4Var;
+        this.d = fragmentContainerView;
+        this.e = fragmentContainerView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/u.java b/app/src/main/java/c/a/i/u.java
index b63844e0b5..6530dc885b 100644
--- a/app/src/main/java/c/a/i/u.java
+++ b/app/src/main/java/c/a/i/u.java
@@ -17,7 +17,7 @@ public final class u implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SwitchMaterial f158c;
+    public final SwitchMaterial f161c;
     @NonNull
     public final RelativeLayout d;
     @NonNull
@@ -36,7 +36,7 @@ public final class u implements ViewBinding {
     public u(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull SwitchMaterial switchMaterial, @NonNull RelativeLayout relativeLayout2, @NonNull View view, @NonNull MaterialButton materialButton2, @NonNull RelativeLayout relativeLayout3, @NonNull MaterialButton materialButton3, @NonNull MaterialButton materialButton4, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f158c = switchMaterial;
+        this.f161c = switchMaterial;
         this.d = relativeLayout2;
         this.e = view;
         this.f = materialButton2;
diff --git a/app/src/main/java/c/a/i/u0.java b/app/src/main/java/c/a/i/u0.java
index 231632b6db..8eb6a86b74 100644
--- a/app/src/main/java/c/a/i/u0.java
+++ b/app/src/main/java/c/a/i/u0.java
@@ -5,29 +5,22 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.airbnb.lottie.LottieAnimationView;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumGuildSubscriptionActivatedDialogBinding */
+/* compiled from: PremiumAndPremiumGuildActivatedDialogBinding */
 public final class u0 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f159c;
-    @NonNull
-    public final LottieAnimationView d;
-    @NonNull
-    public final MaterialButton e;
+    public final TextView f162c;
 
-    public u0(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LottieAnimationView lottieAnimationView, @NonNull MaterialButton materialButton) {
+    public u0(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f159c = textView2;
-        this.d = lottieAnimationView;
-        this.e = materialButton;
+        this.b = materialButton;
+        this.f162c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/u1.java b/app/src/main/java/c/a/i/u1.java
index 116db210c1..81b73f912d 100644
--- a/app/src/main/java/c/a/i/u1.java
+++ b/app/src/main/java/c/a/i/u1.java
@@ -1,41 +1,28 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewDiscoveryStageCardBodyBinding */
+import com.discord.views.FailedUploadView;
+/* compiled from: ViewChatUploadListBinding */
 public final class u1 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final FailedUploadView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f160c;
+    public final FailedUploadView f163c;
     @NonNull
-    public final TextView d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final DiscoveryStageCardSpeakersView f;
-    @NonNull
-    public final TextView g;
+    public final FailedUploadView d;
 
-    public u1(@NonNull View view, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull FrameLayout frameLayout, @NonNull TextView textView3, @NonNull DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView, @NonNull TextView textView4) {
-        this.a = view;
-        this.b = textView;
-        this.f160c = simpleDraweeView;
-        this.d = textView2;
-        this.e = textView3;
-        this.f = discoveryStageCardSpeakersView;
-        this.g = textView4;
+    public u1(@NonNull LinearLayout linearLayout, @NonNull FailedUploadView failedUploadView, @NonNull FailedUploadView failedUploadView2, @NonNull FailedUploadView failedUploadView3) {
+        this.a = linearLayout;
+        this.b = failedUploadView;
+        this.f163c = failedUploadView2;
+        this.d = failedUploadView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/u2.java b/app/src/main/java/c/a/i/u2.java
index 2279fed817..488f2c419e 100644
--- a/app/src/main/java/c/a/i/u2.java
+++ b/app/src/main/java/c/a/i/u2.java
@@ -1,38 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.GridLayout;
-import android.widget.ImageView;
+import android.widget.RadioButton;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.GuildView;
-/* compiled from: ViewServerFolderBinding */
+/* compiled from: ViewRadioButtonBinding */
 public final class u2 implements ViewBinding {
     @NonNull
-    public final View a;
-    @NonNull
-    public final ImageView b;
-    @NonNull
+    public final RadioButton a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final GuildView f161c;
-    @NonNull
-    public final GuildView d;
-    @NonNull
-    public final GuildView e;
-    @NonNull
-    public final GuildView f;
-    @NonNull
-    public final GridLayout g;
-
-    public u2(@NonNull View view, @NonNull ImageView imageView, @NonNull GuildView guildView, @NonNull GuildView guildView2, @NonNull GuildView guildView3, @NonNull GuildView guildView4, @NonNull GridLayout gridLayout) {
-        this.a = view;
-        this.b = imageView;
-        this.f161c = guildView;
-        this.d = guildView2;
-        this.e = guildView3;
-        this.f = guildView4;
-        this.g = gridLayout;
+    public u2(@NonNull RadioButton radioButton) {
+        this.a = radioButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/u3.java b/app/src/main/java/c/a/i/u3.java
index 5fc617d86a..2a3e177383 100644
--- a/app/src/main/java/c/a/i/u3.java
+++ b/app/src/main/java/c/a/i/u3.java
@@ -1,25 +1,29 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.views.CutoutView;
 import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewVoiceUserBinding */
+/* compiled from: ViewUserSummaryItemBinding */
 public final class u3 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final CutoutView a;
     @NonNull
     public final SimpleDraweeView b;
-    @NonNull
 
-    /* renamed from: c  reason: collision with root package name */
-    public final TextView f162c;
-
-    public u3(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
-        this.a = view;
+    public u3(@NonNull CutoutView cutoutView, @NonNull SimpleDraweeView simpleDraweeView) {
+        this.a = cutoutView;
         this.b = simpleDraweeView;
-        this.f162c = textView;
+    }
+
+    @NonNull
+    public static u3 a(@NonNull View view) {
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362075);
+        if (simpleDraweeView != null) {
+            return new u3((CutoutView) view, simpleDraweeView);
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362075)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/u4.java b/app/src/main/java/c/a/i/u4.java
index 79ec45d96b..7e0161f46b 100644
--- a/app/src/main/java/c/a/i/u4.java
+++ b/app/src/main/java/c/a/i/u4.java
@@ -1,26 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentContainerView;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.rounded.RoundedRelativeLayout;
-/* compiled from: WidgetHomePanelRightBinding */
+/* compiled from: WidgetHomePanelCenterContentUnreadBinding */
 public final class u4 implements ViewBinding {
     @NonNull
-    public final FrameLayout a;
-    @NonNull
-    public final RoundedRelativeLayout b;
-    @NonNull
+    public final TextView a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final FragmentContainerView f163c;
-
-    public u4(@NonNull FrameLayout frameLayout, @NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3) {
-        this.a = frameLayout;
-        this.b = roundedRelativeLayout;
-        this.f163c = fragmentContainerView3;
+    public u4(@NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/v0.java b/app/src/main/java/c/a/i/v0.java
index e10eb68af3..78c24c0f69 100644
--- a/app/src/main/java/c/a/i/v0.java
+++ b/app/src/main/java/c/a/i/v0.java
@@ -2,14 +2,12 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.app.AppViewFlipper;
-import com.discord.views.LoadingButton;
+import com.airbnb.lottie.LottieAnimationView;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumGuildSubscriptionCancelDialogBinding */
+/* compiled from: PremiumGuildSubscriptionActivatedDialogBinding */
 public final class v0 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -18,24 +16,18 @@ public final class v0 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f165c;
+    public final TextView f165c;
     @NonNull
-    public final TextView d;
+    public final LottieAnimationView d;
     @NonNull
-    public final AppViewFlipper e;
-    @NonNull
-    public final TextView f;
-    @NonNull
-    public final MaterialButton g;
+    public final MaterialButton e;
 
-    public v0(@NonNull LinearLayout linearLayout, @NonNull ProgressBar progressBar, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
+    public v0(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LottieAnimationView lottieAnimationView, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = textView;
-        this.f165c = loadingButton;
-        this.d = textView2;
-        this.e = appViewFlipper;
-        this.f = textView3;
-        this.g = materialButton;
+        this.f165c = textView2;
+        this.d = lottieAnimationView;
+        this.e = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/v1.java b/app/src/main/java/c/a/i/v1.java
index e2e409010e..c128703340 100644
--- a/app/src/main/java/c/a/i/v1.java
+++ b/app/src/main/java/c/a/i/v1.java
@@ -1,29 +1,37 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: ViewDiscoveryStageCardControlsBinding */
+/* compiled from: ViewCodeVerificationBinding */
 public final class v1 implements ViewBinding {
     @NonNull
-    public final View a;
+    public final LinearLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
     public final TextView f166c;
     @NonNull
-    public final MaterialButton d;
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final TextView f;
+    @NonNull
+    public final TextView g;
 
-    public v1(@NonNull View view, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2) {
-        this.a = view;
-        this.b = materialButton;
-        this.f166c = textView;
-        this.d = materialButton2;
+    public v1(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
+        this.a = linearLayout;
+        this.b = textView;
+        this.f166c = textView2;
+        this.d = textView3;
+        this.e = textView4;
+        this.f = textView5;
+        this.g = textView6;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/v2.java b/app/src/main/java/c/a/i/v2.java
index 9e2ab9e534..5bfc9310a6 100644
--- a/app/src/main/java/c/a/i/v2.java
+++ b/app/src/main/java/c/a/i/v2.java
@@ -1,36 +1,25 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.textfield.TextInputLayout;
-/* compiled from: ViewServerSettingsIconNameBinding */
+/* compiled from: ViewScreenTitleBinding */
 public final class v2 implements ViewBinding {
     @NonNull
-    public final ConstraintLayout a;
+    public final LinearLayout a;
     @NonNull
     public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f167c;
-    @NonNull
-    public final SimpleDraweeView d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final TextView f;
+    public final TextView f167c;
 
-    public v2(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3) {
-        this.a = constraintLayout;
+    public v2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = linearLayout;
         this.b = textView;
-        this.f167c = textInputLayout;
-        this.d = simpleDraweeView;
-        this.e = textView2;
-        this.f = textView3;
+        this.f167c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/v3.java b/app/src/main/java/c/a/i/v3.java
index 780298aaaf..66d9dfc1e6 100644
--- a/app/src/main/java/c/a/i/v3.java
+++ b/app/src/main/java/c/a/i/v3.java
@@ -4,7 +4,8 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: VoiceUserLimitViewBinding */
+import com.facebook.drawee.span.SimpleDraweeSpanTextView;
+/* compiled from: ViewUsernameBinding */
 public final class v3 implements ViewBinding {
     @NonNull
     public final View a;
@@ -13,12 +14,12 @@ public final class v3 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f168c;
+    public final SimpleDraweeSpanTextView f168c;
 
-    public v3(@NonNull View view, @NonNull TextView textView, @NonNull TextView textView2) {
+    public v3(@NonNull View view, @NonNull TextView textView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView) {
         this.a = view;
         this.b = textView;
-        this.f168c = textView2;
+        this.f168c = simpleDraweeSpanTextView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/v4.java b/app/src/main/java/c/a/i/v4.java
index 4d1af88cf9..d43a2a2511 100644
--- a/app/src/main/java/c/a/i/v4.java
+++ b/app/src/main/java/c/a/i/v4.java
@@ -1,32 +1,27 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentContainerView;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetMaskedLinksDialogBinding */
+/* compiled from: WidgetHomePanelLeftBinding */
 public final class v4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final RelativeLayout a;
     @NonNull
     public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f169c;
-    @NonNull
-    public final MaterialButton d;
-    @NonNull
-    public final TextView e;
+    public final FragmentContainerView f169c;
 
-    public v4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2, @NonNull TextView textView3) {
-        this.a = linearLayout;
+    public v4(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FrameLayout frameLayout) {
+        this.a = relativeLayout;
         this.b = textView;
-        this.f169c = materialButton;
-        this.d = materialButton2;
-        this.e = textView2;
+        this.f169c = fragmentContainerView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/w0.java b/app/src/main/java/c/a/i/w0.java
index 20e365d2da..a77955f461 100644
--- a/app/src/main/java/c/a/i/w0.java
+++ b/app/src/main/java/c/a/i/w0.java
@@ -1,15 +1,15 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.discord.app.AppViewFlipper;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumGuildSubscriptionUncancelDialogBinding */
+/* compiled from: PremiumGuildSubscriptionCancelDialogBinding */
 public final class w0 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -26,19 +26,16 @@ public final class w0 implements ViewBinding {
     @NonNull
     public final TextView f;
     @NonNull
-    public final ImageView g;
-    @NonNull
-    public final MaterialButton h;
+    public final MaterialButton g;
 
-    public w0(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull MaterialButton materialButton) {
+    public w0(@NonNull LinearLayout linearLayout, @NonNull ProgressBar progressBar, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = textView;
         this.f170c = loadingButton;
         this.d = textView2;
         this.e = appViewFlipper;
         this.f = textView3;
-        this.g = imageView;
-        this.h = materialButton;
+        this.g = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/w1.java b/app/src/main/java/c/a/i/w1.java
index 0bca1f2a10..dda518b939 100644
--- a/app/src/main/java/c/a/i/w1.java
+++ b/app/src/main/java/c/a/i/w1.java
@@ -1,19 +1,41 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.discovery.speakers.SpeakersRecyclerView;
-/* compiled from: ViewDiscoveryStageCardSpeakersBinding */
+import com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewDiscoveryStageCardBodyBinding */
 public final class w1 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final SpeakersRecyclerView b;
+    public final TextView b;
+    @NonNull
 
-    public w1(@NonNull View view, @NonNull SpeakersRecyclerView speakersRecyclerView) {
+    /* renamed from: c  reason: collision with root package name */
+    public final SimpleDraweeView f171c;
+    @NonNull
+    public final TextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final DiscoveryStageCardSpeakersView f;
+    @NonNull
+    public final TextView g;
+
+    public w1(@NonNull View view, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull FrameLayout frameLayout, @NonNull TextView textView3, @NonNull DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView, @NonNull TextView textView4) {
         this.a = view;
-        this.b = speakersRecyclerView;
+        this.b = textView;
+        this.f171c = simpleDraweeView;
+        this.d = textView2;
+        this.e = textView3;
+        this.f = discoveryStageCardSpeakersView;
+        this.g = textView4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/w2.java b/app/src/main/java/c/a/i/w2.java
index 0af9694989..3595d1cad1 100644
--- a/app/src/main/java/c/a/i/w2.java
+++ b/app/src/main/java/c/a/i/w2.java
@@ -1,25 +1,38 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.GridLayout;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.views.CheckedSetting;
-/* compiled from: ViewServerSettingsNotificationsBinding */
+import com.discord.views.GuildView;
+/* compiled from: ViewServerFolderBinding */
 public final class w2 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final View a;
     @NonNull
-    public final CheckedSetting b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f171c;
+    public final GuildView f172c;
+    @NonNull
+    public final GuildView d;
+    @NonNull
+    public final GuildView e;
+    @NonNull
+    public final GuildView f;
+    @NonNull
+    public final GridLayout g;
 
-    public w2(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2) {
-        this.a = linearLayout;
-        this.b = checkedSetting;
-        this.f171c = checkedSetting2;
+    public w2(@NonNull View view, @NonNull ImageView imageView, @NonNull GuildView guildView, @NonNull GuildView guildView2, @NonNull GuildView guildView3, @NonNull GuildView guildView4, @NonNull GridLayout gridLayout) {
+        this.a = view;
+        this.b = imageView;
+        this.f172c = guildView;
+        this.d = guildView2;
+        this.e = guildView3;
+        this.f = guildView4;
+        this.g = gridLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/w3.java b/app/src/main/java/c/a/i/w3.java
index 684124e5f1..30eca52f63 100644
--- a/app/src/main/java/c/a/i/w3.java
+++ b/app/src/main/java/c/a/i/w3.java
@@ -2,27 +2,81 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.SeekBar;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.Space;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: VolumeSliderViewBinding */
+import com.discord.views.VoiceUserView;
+import com.discord.views.calls.AppVideoStreamRenderer;
+import com.facebook.drawee.view.SimpleDraweeView;
+/* compiled from: ViewVideoCallParticipantBinding */
 public final class w3 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final ImageView b;
+    public final View b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f172c;
+    public final View f173c;
+    @NonNull
+    public final ImageView d;
+    @NonNull
+    public final ConstraintLayout e;
+    @NonNull
+    public final ImageView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
+    @NonNull
+    public final TextView i;
+    @NonNull
+    public final ImageView j;
+    @NonNull
+    public final ConstraintLayout k;
+    @NonNull
+    public final TextView l;
+    @NonNull
+    public final SimpleDraweeView m;
+    @NonNull
+    public final TextView n;
+    @NonNull
+    public final TextView o;
+    @NonNull
+    public final ProgressBar p;
+    @NonNull
+    public final AppVideoStreamRenderer q;
+    @NonNull
+    public final LinearLayout r;
     @NonNull
-    public final SeekBar d;
 
-    public w3(@NonNull View view, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SeekBar seekBar) {
+    /* renamed from: s  reason: collision with root package name */
+    public final VoiceUserView f174s;
+
+    public w3(@NonNull View view, @NonNull View view2, @NonNull View view3, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull Space space, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView3, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView4, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull ProgressBar progressBar, @NonNull AppVideoStreamRenderer appVideoStreamRenderer, @NonNull LinearLayout linearLayout2, @NonNull VoiceUserView voiceUserView) {
         this.a = view;
-        this.b = imageView;
-        this.f172c = imageView2;
-        this.d = seekBar;
+        this.b = view2;
+        this.f173c = view3;
+        this.d = imageView;
+        this.e = constraintLayout;
+        this.f = imageView2;
+        this.g = textView;
+        this.h = textView2;
+        this.i = textView3;
+        this.j = imageView3;
+        this.k = constraintLayout2;
+        this.l = textView5;
+        this.m = simpleDraweeView;
+        this.n = textView6;
+        this.o = textView7;
+        this.p = progressBar;
+        this.q = appVideoStreamRenderer;
+        this.r = linearLayout2;
+        this.f174s = voiceUserView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/w4.java b/app/src/main/java/c/a/i/w4.java
index a9f8714155..747a1f43e4 100644
--- a/app/src/main/java/c/a/i/w4.java
+++ b/app/src/main/java/c/a/i/w4.java
@@ -1,16 +1,20 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.RadioButton;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetMemberVerificationMultipleChoiceRadioItemBinding */
+/* compiled from: WidgetHomePanelLoadingBinding */
 public final class w4 implements ViewBinding {
     @NonNull
-    public final RadioButton a;
+    public final FrameLayout a;
+    @NonNull
+    public final ImageView b;
 
-    public w4(@NonNull RadioButton radioButton) {
-        this.a = radioButton;
+    public w4(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView) {
+        this.a = frameLayout;
+        this.b = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/x.java b/app/src/main/java/c/a/i/x.java
index 6c2b8f3bc2..a482000ef8 100644
--- a/app/src/main/java/c/a/i/x.java
+++ b/app/src/main/java/c/a/i/x.java
@@ -14,14 +14,14 @@ public final class x implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AccountCreditView f173c;
+    public final AccountCreditView f175c;
     @NonNull
     public final View d;
 
     public x(@NonNull CardView cardView, @NonNull AccountCreditView accountCreditView, @NonNull AccountCreditView accountCreditView2, @NonNull View view) {
         this.a = cardView;
         this.b = accountCreditView;
-        this.f173c = accountCreditView2;
+        this.f175c = accountCreditView2;
         this.d = view;
     }
 
diff --git a/app/src/main/java/c/a/i/x0.java b/app/src/main/java/c/a/i/x0.java
index 6fd79134a1..8aa4c76eeb 100644
--- a/app/src/main/java/c/a/i/x0.java
+++ b/app/src/main/java/c/a/i/x0.java
@@ -2,35 +2,43 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.app.AppViewFlipper;
+import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumGuildUpgradeDialogBinding */
+/* compiled from: PremiumGuildSubscriptionUncancelDialogBinding */
 public final class x0 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final LinearLayout a;
     @NonNull
     public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f174c;
+    public final LoadingButton f176c;
     @NonNull
     public final TextView d;
     @NonNull
-    public final TextView e;
+    public final AppViewFlipper e;
     @NonNull
-    public final MaterialButton f;
+    public final TextView f;
+    @NonNull
+    public final ImageView g;
+    @NonNull
+    public final MaterialButton h;
 
-    public x0(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
-        this.a = relativeLayout;
+    public x0(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull MaterialButton materialButton) {
+        this.a = linearLayout;
         this.b = textView;
-        this.f174c = imageView;
+        this.f176c = loadingButton;
         this.d = textView2;
-        this.e = textView3;
-        this.f = materialButton;
+        this.e = appViewFlipper;
+        this.f = textView3;
+        this.g = imageView;
+        this.h = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/x1.java b/app/src/main/java/c/a/i/x1.java
index a2622f17c2..766f4af6cc 100644
--- a/app/src/main/java/c/a/i/x1.java
+++ b/app/src/main/java/c/a/i/x1.java
@@ -1,25 +1,29 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewDiscoveryStageCardTopHatBinding */
+import com.google.android.material.button.MaterialButton;
+/* compiled from: ViewDiscoveryStageCardControlsBinding */
 public final class x1 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final MaterialButton b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f175c;
+    public final TextView f177c;
+    @NonNull
+    public final MaterialButton d;
 
-    public x1(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
+    public x1(@NonNull View view, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2) {
         this.a = view;
-        this.b = simpleDraweeView;
-        this.f175c = textView;
+        this.b = materialButton;
+        this.f177c = textView;
+        this.d = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/x2.java b/app/src/main/java/c/a/i/x2.java
index 508f90a336..d415e10311 100644
--- a/app/src/main/java/c/a/i/x2.java
+++ b/app/src/main/java/c/a/i/x2.java
@@ -6,24 +6,27 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: ViewServerSettingsRegionBinding */
+/* compiled from: ViewServerMemberCountBinding */
 public final class x2 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f176c;
+    public final TextView f178c;
     @NonNull
-    public final LinearLayout d;
+    public final ImageView d;
+    @NonNull
+    public final TextView e;
 
-    public x2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout2) {
+    public x2(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f176c = imageView;
-        this.d = linearLayout2;
+        this.b = imageView;
+        this.f178c = textView;
+        this.d = imageView2;
+        this.e = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/x3.java b/app/src/main/java/c/a/i/x3.java
index a1e12c73ab..3e467d91ac 100644
--- a/app/src/main/java/c/a/i/x3.java
+++ b/app/src/main/java/c/a/i/x3.java
@@ -1,48 +1,25 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.app.AppViewFlipper;
-import com.discord.utilities.view.text.LinkifiedTextView;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetAcceptGiftDialogBinding */
+/* compiled from: ViewVoiceUserBinding */
 public final class x3 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final View a;
     @NonNull
     public final SimpleDraweeView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f177c;
-    @NonNull
-    public final MaterialButton d;
-    @NonNull
-    public final LinearLayout e;
-    @NonNull
-    public final LinkifiedTextView f;
-    @NonNull
-    public final AppViewFlipper g;
-    @NonNull
-    public final TextView h;
-    @NonNull
-    public final ProgressBar i;
+    public final TextView f179c;
 
-    public x3(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView2, @NonNull ProgressBar progressBar) {
-        this.a = linearLayout;
+    public x3(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
+        this.a = view;
         this.b = simpleDraweeView;
-        this.f177c = textView;
-        this.d = materialButton;
-        this.e = linearLayout3;
-        this.f = linkifiedTextView;
-        this.g = appViewFlipper;
-        this.h = textView2;
-        this.i = progressBar;
+        this.f179c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/x4.java b/app/src/main/java/c/a/i/x4.java
index eee628c3a8..93a799c712 100644
--- a/app/src/main/java/c/a/i/x4.java
+++ b/app/src/main/java/c/a/i/x4.java
@@ -2,57 +2,25 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.SeekBar;
-import android.widget.Space;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.Barrier;
+import androidx.fragment.app.FragmentContainerView;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetMusicRichPresenceBinding */
+import com.discord.utilities.view.rounded.RoundedRelativeLayout;
+/* compiled from: WidgetHomePanelRightBinding */
 public final class x4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final FrameLayout a;
     @NonNull
-    public final LinearLayout b;
+    public final RoundedRelativeLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f178c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final SimpleDraweeView e;
-    @NonNull
-    public final SimpleDraweeView f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final TextView h;
-    @NonNull
-    public final MaterialButton i;
-    @NonNull
-    public final SeekBar j;
-    @NonNull
-    public final TextView k;
-    @NonNull
-    public final TextView l;
+    public final FragmentContainerView f180c;
 
-    public x4(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull FrameLayout frameLayout, @NonNull MaterialButton materialButton, @NonNull SeekBar seekBar, @NonNull TextView textView5, @NonNull TextView textView6) {
-        this.a = linearLayout;
-        this.b = linearLayout2;
-        this.f178c = textView;
-        this.d = textView2;
-        this.e = simpleDraweeView;
-        this.f = simpleDraweeView2;
-        this.g = textView3;
-        this.h = textView4;
-        this.i = materialButton;
-        this.j = seekBar;
-        this.k = textView5;
-        this.l = textView6;
+    public x4(@NonNull FrameLayout frameLayout, @NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3) {
+        this.a = frameLayout;
+        this.b = roundedRelativeLayout;
+        this.f180c = fragmentContainerView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/y.java b/app/src/main/java/c/a/i/y.java
index 0dd1bb15fb..9d41d44805 100644
--- a/app/src/main/java/c/a/i/y.java
+++ b/app/src/main/java/c/a/i/y.java
@@ -17,14 +17,14 @@ public final class y implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f179c;
+    public final TextInputLayout f181c;
     @NonNull
     public final LoadingButton d;
 
     public y(@NonNull ConstraintLayout constraintLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputLayout textInputLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = linkifiedTextView;
-        this.f179c = textInputLayout;
+        this.f181c = textInputLayout;
         this.d = loadingButton;
     }
 
diff --git a/app/src/main/java/c/a/i/y0.java b/app/src/main/java/c/a/i/y0.java
index ca973d647f..e3a22209eb 100644
--- a/app/src/main/java/c/a/i/y0.java
+++ b/app/src/main/java/c/a/i/y0.java
@@ -2,21 +2,21 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: PremiumUpgradeYearlyDialogBinding */
+/* compiled from: PremiumGuildUpgradeDialogBinding */
 public final class y0 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final RelativeLayout a;
     @NonNull
-    public final ImageView b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f180c;
+    public final ImageView f182c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,10 +24,10 @@ public final class y0 implements ViewBinding {
     @NonNull
     public final MaterialButton f;
 
-    public y0(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
-        this.a = linearLayout;
-        this.b = imageView;
-        this.f180c = textView;
+    public y0(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
+        this.a = relativeLayout;
+        this.b = textView;
+        this.f182c = imageView;
         this.d = textView2;
         this.e = textView3;
         this.f = materialButton;
diff --git a/app/src/main/java/c/a/i/y1.java b/app/src/main/java/c/a/i/y1.java
index aeb76121a3..b7735fe480 100644
--- a/app/src/main/java/c/a/i/y1.java
+++ b/app/src/main/java/c/a/i/y1.java
@@ -1,35 +1,19 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.Spinner;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.google.android.material.card.MaterialCardView;
-/* compiled from: ViewExperimentOverrideBinding */
+import com.discord.views.discovery.speakers.SpeakersRecyclerView;
+/* compiled from: ViewDiscoveryStageCardSpeakersBinding */
 public final class y1 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final TextView b;
-    @NonNull
+    public final SpeakersRecyclerView b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final Spinner f181c;
-    @NonNull
-    public final TextView d;
-    @NonNull
-    public final TextView e;
-    @NonNull
-    public final TextView f;
-
-    public y1(@NonNull View view, @NonNull TextView textView, @NonNull Spinner spinner, @NonNull MaterialCardView materialCardView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
+    public y1(@NonNull View view, @NonNull SpeakersRecyclerView speakersRecyclerView) {
         this.a = view;
-        this.b = textView;
-        this.f181c = spinner;
-        this.d = textView2;
-        this.e = textView3;
-        this.f = textView4;
+        this.b = speakersRecyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/y2.java b/app/src/main/java/c/a/i/y2.java
index 5edef1fe17..ca2cf8c53d 100644
--- a/app/src/main/java/c/a/i/y2.java
+++ b/app/src/main/java/c/a/i/y2.java
@@ -1,25 +1,36 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-/* compiled from: ViewServerSettingsRegionHelpBinding */
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.textfield.TextInputLayout;
+/* compiled from: ViewServerSettingsIconNameBinding */
 public final class y2 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final ConstraintLayout a;
     @NonNull
-    public final LinkifiedTextView b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f182c;
+    public final TextInputLayout f183c;
+    @NonNull
+    public final SimpleDraweeView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final TextView f;
 
-    public y2(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout2) {
-        this.a = linearLayout;
-        this.b = linkifiedTextView;
-        this.f182c = linearLayout2;
+    public y2(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3) {
+        this.a = constraintLayout;
+        this.b = textView;
+        this.f183c = textInputLayout;
+        this.d = simpleDraweeView;
+        this.e = textView2;
+        this.f = textView3;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/y3.java b/app/src/main/java/c/a/i/y3.java
index cf6e534dda..eba7932d71 100644
--- a/app/src/main/java/c/a/i/y3.java
+++ b/app/src/main/java/c/a/i/y3.java
@@ -1,27 +1,24 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetAuthMfaInfoBinding */
+/* compiled from: VoiceUserLimitViewBinding */
 public final class y3 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
+    public final View a;
     @NonNull
-    public final MaterialButton b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f183c;
+    public final TextView f184c;
 
-    public y3(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LinkifiedTextView linkifiedTextView) {
-        this.a = linearLayout;
-        this.b = materialButton;
-        this.f183c = linkifiedTextView;
+    public y3(@NonNull View view, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = view;
+        this.b = textView;
+        this.f184c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/y4.java b/app/src/main/java/c/a/i/y4.java
index 67fca0f23b..7b80662899 100644
--- a/app/src/main/java/c/a/i/y4.java
+++ b/app/src/main/java/c/a/i/y4.java
@@ -2,43 +2,31 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.Space;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.Barrier;
 import androidx.viewbinding.ViewBinding;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
-/* compiled from: WidgetPlatformRichPresenceBinding */
+/* compiled from: WidgetMaskedLinksDialogBinding */
 public final class y4 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final LinearLayout b;
+    public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f184c;
+    public final MaterialButton f185c;
     @NonNull
-    public final SimpleDraweeView d;
+    public final MaterialButton d;
     @NonNull
-    public final SimpleDraweeView e;
-    @NonNull
-    public final MaterialButton f;
-    @NonNull
-    public final TextView g;
-    @NonNull
-    public final TextView h;
+    public final TextView e;
 
-    public y4(@NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull Space space, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3) {
+    public y4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
-        this.b = linearLayout2;
-        this.f184c = textView;
-        this.d = simpleDraweeView;
-        this.e = simpleDraweeView2;
-        this.f = materialButton;
-        this.g = textView2;
-        this.h = textView3;
+        this.b = textView;
+        this.f185c = materialButton;
+        this.d = materialButton2;
+        this.e = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/z.java b/app/src/main/java/c/a/i/z.java
index 62f37a194c..80a2a88c45 100644
--- a/app/src/main/java/c/a/i/z.java
+++ b/app/src/main/java/c/a/i/z.java
@@ -17,7 +17,7 @@ public final class z implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f185c;
+    public final LoadingButton f186c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class z implements ViewBinding {
     public z(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f185c = loadingButton;
+        this.f186c = loadingButton;
         this.d = linkifiedTextView;
         this.e = textView;
     }
diff --git a/app/src/main/java/c/a/i/z0.java b/app/src/main/java/c/a/i/z0.java
index 4a70870ffa..9012b7215c 100644
--- a/app/src/main/java/c/a/i/z0.java
+++ b/app/src/main/java/c/a/i/z0.java
@@ -1,37 +1,36 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import androidx.viewpager2.widget.ViewPager2;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.tabs.TabLayout;
-/* compiled from: PremiumUpsellDialogBinding */
+/* compiled from: PremiumUpgradeYearlyDialogBinding */
 public final class z0 implements ViewBinding {
     @NonNull
-    public final RelativeLayout a;
+    public final LinearLayout a;
     @NonNull
-    public final MaterialButton b;
+    public final ImageView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TabLayout f186c;
+    public final TextView f187c;
     @NonNull
-    public final MaterialButton d;
+    public final TextView d;
     @NonNull
-    public final MaterialButton e;
+    public final TextView e;
     @NonNull
-    public final ViewPager2 f;
+    public final MaterialButton f;
 
-    public z0(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull TabLayout tabLayout, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull ViewPager2 viewPager2) {
-        this.a = relativeLayout;
-        this.b = materialButton;
-        this.f186c = tabLayout;
-        this.d = materialButton2;
-        this.e = materialButton3;
-        this.f = viewPager2;
+    public z0(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
+        this.a = linearLayout;
+        this.b = imageView;
+        this.f187c = textView;
+        this.d = textView2;
+        this.e = textView3;
+        this.f = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/z1.java b/app/src/main/java/c/a/i/z1.java
index 90b423af69..4d02b86051 100644
--- a/app/src/main/java/c/a/i/z1.java
+++ b/app/src/main/java/c/a/i/z1.java
@@ -5,7 +5,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.facebook.drawee.view.SimpleDraweeView;
-/* compiled from: ViewGuildBinding */
+/* compiled from: ViewDiscoveryStageCardTopHatBinding */
 public final class z1 implements ViewBinding {
     @NonNull
     public final View a;
@@ -14,12 +14,12 @@ public final class z1 implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f187c;
+    public final TextView f188c;
 
     public z1(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f187c = textView;
+        this.f188c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/z2.java b/app/src/main/java/c/a/i/z2.java
index d5074df164..a151a62ca3 100644
--- a/app/src/main/java/c/a/i/z2.java
+++ b/app/src/main/java/c/a/i/z2.java
@@ -2,31 +2,24 @@ package c.a.i;
 
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
 import com.discord.views.CheckedSetting;
-/* compiled from: ViewServerSettingsSystemChannelWrapBinding */
+/* compiled from: ViewServerSettingsNotificationsBinding */
 public final class z2 implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
-    public final TextView b;
+    public final CheckedSetting b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f188c;
-    @NonNull
-    public final CheckedSetting d;
-    @NonNull
-    public final LinearLayout e;
+    public final CheckedSetting f189c;
 
-    public z2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull LinearLayout linearLayout2) {
+    public z2(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2) {
         this.a = linearLayout;
-        this.b = textView;
-        this.f188c = checkedSetting;
-        this.d = checkedSetting2;
-        this.e = linearLayout2;
+        this.b = checkedSetting;
+        this.f189c = checkedSetting2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/z3.java b/app/src/main/java/c/a/i/z3.java
index c0c7b63348..e35c48e9b7 100644
--- a/app/src/main/java/c/a/i/z3.java
+++ b/app/src/main/java/c/a/i/z3.java
@@ -1,18 +1,28 @@
 package c.a.i;
 
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.SeekBar;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetCallFullscreenAudioShareWarningBinding */
+/* compiled from: VolumeSliderViewBinding */
 public final class z3 implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
-    public final View b;
+    public final ImageView b;
+    @NonNull
 
-    public z3(@NonNull View view, @NonNull View view2) {
+    /* renamed from: c  reason: collision with root package name */
+    public final ImageView f190c;
+    @NonNull
+    public final SeekBar d;
+
+    public z3(@NonNull View view, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SeekBar seekBar) {
         this.a = view;
-        this.b = view2;
+        this.b = imageView;
+        this.f190c = imageView2;
+        this.d = seekBar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/i/z4.java b/app/src/main/java/c/a/i/z4.java
index aacdc469b7..df2f095d25 100644
--- a/app/src/main/java/c/a/i/z4.java
+++ b/app/src/main/java/c/a/i/z4.java
@@ -1,29 +1,16 @@
 package c.a.i;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
+import android.widget.RadioButton;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-/* compiled from: WidgetPremiumUpsellBinding */
+/* compiled from: WidgetMemberVerificationMultipleChoiceRadioItemBinding */
 public final class z4 implements ViewBinding {
     @NonNull
-    public final LinearLayout a;
-    @NonNull
-    public final TextView b;
-    @NonNull
+    public final RadioButton a;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final TextView f189c;
-    @NonNull
-    public final ImageView d;
-
-    public z4(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
-        this.a = linearLayout;
-        this.b = textView;
-        this.f189c = textView2;
-        this.d = imageView;
+    public z4(@NonNull RadioButton radioButton) {
+        this.a = radioButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/c/a/j/a.java b/app/src/main/java/c/a/j/a.java
index 86cd92b8a3..6f569a2d1b 100644
--- a/app/src/main/java/c/a/j/a.java
+++ b/app/src/main/java/c/a/j/a.java
@@ -20,7 +20,7 @@ public final class a {
     public final Map<Integer, C0025a> b = new LinkedHashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Logger f190c;
+    public final Logger f191c;
 
     /* compiled from: FloatingViewManager.kt */
     /* renamed from: c.a.j.a$a  reason: collision with other inner class name */
@@ -29,7 +29,7 @@ public final class a {
         public final ViewGroup b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ViewTreeObserver.OnPreDrawListener f191c;
+        public final ViewTreeObserver.OnPreDrawListener f192c;
 
         public C0025a(View view, ViewGroup viewGroup, ViewTreeObserver.OnPreDrawListener onPreDrawListener) {
             m.checkNotNullParameter(view, "floatingView");
@@ -37,7 +37,7 @@ public final class a {
             m.checkNotNullParameter(onPreDrawListener, "ancestorPreDrawListener");
             this.a = view;
             this.b = viewGroup;
-            this.f191c = onPreDrawListener;
+            this.f192c = onPreDrawListener;
         }
     }
 
@@ -48,7 +48,7 @@ public final class a {
 
     public a(Logger logger) {
         m.checkNotNullParameter(logger, "logger");
-        this.f190c = logger;
+        this.f191c = logger;
     }
 
     public static final void a(a aVar, View view, View view2, FloatingViewGravity floatingViewGravity, int i, int i2) {
@@ -79,7 +79,7 @@ public final class a {
         if (aVar != null) {
             ViewGroup viewGroup = aVar.b;
             View view = aVar.a;
-            ViewTreeObserver.OnPreDrawListener onPreDrawListener = aVar.f191c;
+            ViewTreeObserver.OnPreDrawListener onPreDrawListener = aVar.f192c;
             this.b.remove(Integer.valueOf(i));
             viewGroup.getViewTreeObserver().removeOnPreDrawListener(onPreDrawListener);
             viewGroup.removeView(view);
diff --git a/app/src/main/java/c/a/j/e.java b/app/src/main/java/c/a/j/e.java
index f94098082d..22a74b1295 100644
--- a/app/src/main/java/c/a/j/e.java
+++ b/app/src/main/java/c/a/j/e.java
@@ -13,6 +13,6 @@ public final class e<T> implements Action1<Throwable> {
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // rx.functions.Action1
     public void call(Throwable th) {
-        Logger.e$default(this.i.f190c, "error while subscribing to componentPausedObservable for hiding floating view", th, null, 4, null);
+        Logger.e$default(this.i.f191c, "error while subscribing to componentPausedObservable for hiding floating view", th, null, 4, null);
     }
 }
diff --git a/app/src/main/java/c/a/k/c/a.java b/app/src/main/java/c/a/k/c/a.java
index 71c350422e..35ec758af8 100644
--- a/app/src/main/java/c/a/k/c/a.java
+++ b/app/src/main/java/c/a/k/c/a.java
@@ -21,7 +21,7 @@ public final class a {
         public final VideoCodecMimeType b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final float f192c;
+        public final float f193c;
         public final boolean d;
 
         public C0026a(VideoRes videoRes, VideoCodecMimeType videoCodecMimeType, float f, boolean z2) {
@@ -29,7 +29,7 @@ public final class a {
             m.checkNotNullParameter(videoCodecMimeType, "mimeType");
             this.a = videoRes;
             this.b = videoCodecMimeType;
-            this.f192c = f;
+            this.f193c = f;
             this.d = z2;
         }
 
@@ -39,7 +39,7 @@ public final class a {
             }
             VideoCodecMimeType videoCodecMimeType2 = (i & 2) != 0 ? aVar.b : null;
             if ((i & 4) != 0) {
-                f = aVar.f192c;
+                f = aVar.f193c;
             }
             if ((i & 8) != 0) {
                 z2 = aVar.d;
@@ -57,7 +57,7 @@ public final class a {
                 return false;
             }
             C0026a aVar = (C0026a) obj;
-            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && Float.compare(this.f192c, aVar.f192c) == 0 && this.d == aVar.d;
+            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && Float.compare(this.f193c, aVar.f193c) == 0 && this.d == aVar.d;
         }
 
         public int hashCode() {
@@ -68,7 +68,7 @@ public final class a {
             if (videoCodecMimeType != null) {
                 i = videoCodecMimeType.hashCode();
             }
-            int b = c.d.b.a.a.b(this.f192c, (hashCode + i) * 31, 31);
+            int b = c.d.b.a.a.b(this.f193c, (hashCode + i) * 31, 31);
             boolean z2 = this.d;
             if (z2) {
                 z2 = true;
@@ -85,7 +85,7 @@ public final class a {
             L.append(", mimeType=");
             L.append(this.b);
             L.append(", frameRate=");
-            L.append(this.f192c);
+            L.append(this.f193c);
             L.append(", requireHardwareAcceleration=");
             return c.d.b.a.a.G(L, this.d, ")");
         }
@@ -105,7 +105,7 @@ public final class a {
         e eVar;
         VideoCodecMimeType videoCodecMimeType = aVar.b;
         VideoRes videoRes = aVar.a;
-        float f = aVar.f192c;
+        float f = aVar.f193c;
         m.checkNotNullParameter(videoCodecMimeType, "videoCodecMimeType");
         m.checkNotNullParameter(videoRes, "videoRes");
         MediaFormat createVideoFormat = MediaFormat.createVideoFormat(videoCodecMimeType.getMimeType(), videoRes.getWidth(), videoRes.getHeight());
diff --git a/app/src/main/java/c/a/k/c/b.java b/app/src/main/java/c/a/k/c/b.java
index b67b3b08fe..e01ce56c86 100644
--- a/app/src/main/java/c/a/k/c/b.java
+++ b/app/src/main/java/c/a/k/c/b.java
@@ -8,13 +8,13 @@ public final class b {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f193c;
+    public final String f194c;
 
     public b(String str, boolean z2, String str2) {
         m.checkNotNullParameter(str, "name");
         this.a = str;
         this.b = z2;
-        this.f193c = str2;
+        this.f194c = str2;
     }
 
     public boolean equals(Object obj) {
@@ -25,7 +25,7 @@ public final class b {
             return false;
         }
         b bVar = (b) obj;
-        return m.areEqual(this.a, bVar.a) && this.b == bVar.b && m.areEqual(this.f193c, bVar.f193c);
+        return m.areEqual(this.a, bVar.a) && this.b == bVar.b && m.areEqual(this.f194c, bVar.f194c);
     }
 
     public int hashCode() {
@@ -40,7 +40,7 @@ public final class b {
         int i3 = z2 ? 1 : 0;
         int i4 = z2 ? 1 : 0;
         int i5 = (hashCode + i2) * 31;
-        String str2 = this.f193c;
+        String str2 = this.f194c;
         if (str2 != null) {
             i = str2.hashCode();
         }
@@ -53,6 +53,6 @@ public final class b {
         L.append(", isHardwareAccelerated=");
         L.append(this.b);
         L.append(", canonicalName=");
-        return a.D(L, this.f193c, ")");
+        return a.D(L, this.f194c, ")");
     }
 }
diff --git a/app/src/main/java/c/a/k/c/e.java b/app/src/main/java/c/a/k/c/e.java
index ac05f22743..1c7bb12487 100644
--- a/app/src/main/java/c/a/k/c/e.java
+++ b/app/src/main/java/c/a/k/c/e.java
@@ -17,7 +17,7 @@ public final class e {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final MediaCodecInfo f194c;
+    public final MediaCodecInfo f195c;
     public final b d;
     public final MediaCodec e;
     public boolean f;
@@ -60,7 +60,7 @@ public final class e {
                 i++;
             }
             if (mediaCodecInfo != null) {
-                this.f194c = mediaCodecInfo;
+                this.f195c = mediaCodecInfo;
                 m.checkNotNullParameter(mediaCodecInfo, "codecInfo");
                 String name = mediaCodecInfo.getName();
                 m.checkNotNullExpressionValue(name, "codecInfo.name");
diff --git a/app/src/main/java/c/a/l/a.java b/app/src/main/java/c/a/l/a.java
index 45508cde76..7522314de4 100644
--- a/app/src/main/java/c/a/l/a.java
+++ b/app/src/main/java/c/a/l/a.java
@@ -12,7 +12,7 @@ public final class a {
     public static Function0<Integer> b = C0027a.i;
 
     /* renamed from: c  reason: collision with root package name */
-    public static Function2<? super String, ? super View, Unit> f195c = b.i;
+    public static Function2<? super String, ? super View, Unit> f196c = b.i;
     public static final a d = null;
 
     /* compiled from: Format.kt */
diff --git a/app/src/main/java/c/a/l/b.java b/app/src/main/java/c/a/l/b.java
index 6d6d330ac0..5647228ce3 100644
--- a/app/src/main/java/c/a/l/b.java
+++ b/app/src/main/java/c/a/l/b.java
@@ -209,7 +209,7 @@ public final class b {
         m.checkNotNullParameter(objArr, "formatArgs");
         m.checkNotNullParameter(renderContext, "renderContext");
         Map<String, String> map = renderContext.a;
-        List<? extends Object> list = renderContext.f2012c;
+        List<? extends Object> list = renderContext.f2017c;
         boolean z2 = true;
         if (!map.isEmpty()) {
             charSequence = a.replace(charSequence, new f(map));
@@ -250,7 +250,7 @@ public final class b {
         m.checkNotNullParameter(charSequence, "$this$i18nFormat");
         m.checkNotNullParameter(objArr, "formatArgs");
         m.checkNotNullParameter(function1, "initializer");
-        return e(charSequence, objArr, AnimatableValueParser.n2(function1, Arrays.copyOf(objArr, objArr.length)));
+        return e(charSequence, objArr, AnimatableValueParser.p2(function1, Arrays.copyOf(objArr, objArr.length)));
     }
 
     public static /* synthetic */ CharSequence g(Context context, int i, Object[] objArr, Function1 function1, int i2) {
@@ -273,29 +273,22 @@ public final class b {
         return f(charSequence, objArr, (i & 2) != 0 ? e.i : null);
     }
 
-    public static final CharSequence l(CharSequence charSequence, Function1<? super RenderContext, Unit> function1, Object... objArr) {
-        m.checkNotNullParameter(charSequence, "charSequence");
-        m.checkNotNullParameter(function1, "initializer");
-        m.checkNotNullParameter(objArr, "formatArgs");
-        return f(charSequence, Arrays.copyOf(objArr, objArr.length), function1);
-    }
-
-    public static final void m(TextView textView, @StringRes int i, Object[] objArr, Function1<? super RenderContext, Unit> function1) {
+    public static final void l(TextView textView, @StringRes int i, Object[] objArr, Function1<? super RenderContext, Unit> function1) {
         m.checkNotNullParameter(textView, "$this$i18nSetText");
         m.checkNotNullParameter(objArr, "formatArgs");
         m.checkNotNullParameter(function1, "initializer");
-        RenderContext n2 = AnimatableValueParser.n2(function1, Arrays.copyOf(objArr, objArr.length));
-        textView.setMovementMethod(n2.g ? LinkMovementMethod.getInstance() : null);
+        RenderContext p2 = AnimatableValueParser.p2(function1, Arrays.copyOf(objArr, objArr.length));
+        textView.setMovementMethod(p2.g ? LinkMovementMethod.getInstance() : null);
         String string = textView.getContext().getString(i);
         m.checkNotNullExpressionValue(string, "context.getString(stringResId)");
-        textView.setText(e(string, objArr, n2));
+        textView.setText(e(string, objArr, p2));
     }
 
-    public static /* synthetic */ void n(TextView textView, int i, Object[] objArr, Function1 function1, int i2) {
-        m(textView, i, objArr, (i2 & 4) != 0 ? g.i : null);
+    public static /* synthetic */ void m(TextView textView, int i, Object[] objArr, Function1 function1, int i2) {
+        l(textView, i, objArr, (i2 & 4) != 0 ? g.i : null);
     }
 
-    public static void o(TextView textView, CharSequence charSequence, Object[] objArr, Function1 function1, int i) {
+    public static void n(TextView textView, CharSequence charSequence, Object[] objArr, Function1 function1, int i) {
         int i2 = i & 4;
         MovementMethod movementMethod = null;
         h hVar = i2 != 0 ? h.i : null;
@@ -307,11 +300,11 @@ public final class b {
             textView.setMovementMethod(null);
             return;
         }
-        RenderContext n2 = AnimatableValueParser.n2(hVar, Arrays.copyOf(objArr, objArr.length));
-        if (n2.g) {
+        RenderContext p2 = AnimatableValueParser.p2(hVar, Arrays.copyOf(objArr, objArr.length));
+        if (p2.g) {
             movementMethod = LinkMovementMethod.getInstance();
         }
         textView.setMovementMethod(movementMethod);
-        textView.setText(e(charSequence, objArr, n2));
+        textView.setText(e(charSequence, objArr, p2));
     }
 }
diff --git a/app/src/main/java/c/a/l/f/c.java b/app/src/main/java/c/a/l/f/c.java
index 1e413c38fe..a23da30f5d 100644
--- a/app/src/main/java/c/a/l/f/c.java
+++ b/app/src/main/java/c/a/l/f/c.java
@@ -38,12 +38,12 @@ public final class c extends Node.a<RenderContext> {
                 spannableStringBuilder.setSpan(obj2, length, spannableStringBuilder.length(), 33);
             }
         }
-        Hook.a aVar2 = hook != null ? hook.f2011c : null;
+        Hook.a aVar2 = hook != null ? hook.f2016c : null;
         if (aVar2 != null) {
             aVar = aVar2;
         } else if (URLUtil.isValidUrl(this.a)) {
             a aVar3 = a.d;
-            aVar = new Hook.a(a.b.mo1invoke(), a.f195c);
+            aVar = new Hook.a(a.b.mo1invoke(), a.f196c);
         }
         if (aVar != null) {
             Integer num = aVar.a;
diff --git a/app/src/main/java/c/a/l/g/a.java b/app/src/main/java/c/a/l/g/a.java
index 40c357ad65..7e08e45ab5 100644
--- a/app/src/main/java/c/a/l/g/a.java
+++ b/app/src/main/java/c/a/l/g/a.java
@@ -36,6 +36,6 @@ public final class a extends Parser<RenderContext, Node<RenderContext>, c> {
         Pattern pattern6 = c.a.u.b.b.e.f231c;
         m.checkNotNullExpressionValue(pattern6, "SimpleMarkdownRules.PATTERN_STRIKETHRU");
         addRule(new i(pattern6));
-        addRule(eVar.c());
+        addRule(eVar.d());
     }
 }
diff --git a/app/src/main/java/c/a/l/g/d.java b/app/src/main/java/c/a/l/g/d.java
index 6821e8896e..9077d39dbe 100644
--- a/app/src/main/java/c/a/l/g/d.java
+++ b/app/src/main/java/c/a/l/g/d.java
@@ -11,7 +11,7 @@ public final class d extends b {
     public static final d b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ThreadLocal<a> f196c = new b();
+    public final ThreadLocal<a> f197c = new b();
 
     /* compiled from: FormattingParserProvider.kt */
     public static final class a extends o implements Function0<d> {
@@ -40,7 +40,7 @@ public final class d extends b {
 
     @Override // c.a.l.g.b
     public a a() {
-        a aVar = this.f196c.get();
+        a aVar = this.f197c.get();
         m.checkNotNull(aVar);
         return aVar;
     }
diff --git a/app/src/main/java/c/a/o/g/a.java b/app/src/main/java/c/a/o/g/a.java
index 0e19dd59f9..978dd57892 100644
--- a/app/src/main/java/c/a/o/g/a.java
+++ b/app/src/main/java/c/a/o/g/a.java
@@ -14,14 +14,14 @@ public final class a implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f197c;
+    public final FrameLayout f198c;
     @NonNull
     public final FrameLayout d;
 
     public a(@NonNull View view, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2) {
         this.a = view;
         this.b = imageView;
-        this.f197c = frameLayout;
+        this.f198c = frameLayout;
         this.d = frameLayout2;
     }
 
diff --git a/app/src/main/java/c/a/o/h/a.java b/app/src/main/java/c/a/o/h/a.java
index 923b410162..7bf933098b 100644
--- a/app/src/main/java/c/a/o/h/a.java
+++ b/app/src/main/java/c/a/o/h/a.java
@@ -140,46 +140,46 @@ public final class a extends FrameLayout implements f {
     @Override // c.a.o.f
     public void a(OverlayBubbleWrap overlayBubbleWrap) {
         if (overlayBubbleWrap != null) {
-            FrameLayout frameLayout = this.i.f197c;
+            FrameLayout frameLayout = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout, "binding.trashWrapTargetContainer");
             frameLayout.setActivated(true);
             int max = Math.max(overlayBubbleWrap.getWidth(), overlayBubbleWrap.getHeight());
-            FrameLayout frameLayout2 = this.i.f197c;
+            FrameLayout frameLayout2 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout2, "binding.trashWrapTargetContainer");
-            FrameLayout frameLayout3 = this.i.f197c;
+            FrameLayout frameLayout3 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout3, "binding.trashWrapTargetContainer");
             float max2 = (((float) Math.max(max, frameLayout2.getWidth())) / ((float) frameLayout3.getWidth())) + 0.5f;
-            FrameLayout frameLayout4 = this.i.f197c;
+            FrameLayout frameLayout4 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout4, "binding.trashWrapTargetContainer");
             float scaleX = frameLayout4.getScaleX();
-            FrameLayout frameLayout5 = this.i.f197c;
+            FrameLayout frameLayout5 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout5, "binding.trashWrapTargetContainer");
             float scaleY = frameLayout5.getScaleY();
-            FrameLayout frameLayout6 = this.i.f197c;
+            FrameLayout frameLayout6 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout6, "binding.trashWrapTargetContainer");
             float pivotX = frameLayout6.getPivotX();
-            FrameLayout frameLayout7 = this.i.f197c;
+            FrameLayout frameLayout7 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout7, "binding.trashWrapTargetContainer");
             ScaleAnimation scaleAnimation = new ScaleAnimation(scaleX, max2, scaleY, max2, pivotX, frameLayout7.getPivotY());
             scaleAnimation.setDuration(200);
             scaleAnimation.setInterpolator(getContext(), 17563656);
             scaleAnimation.setFillAfter(true);
-            this.i.f197c.startAnimation(scaleAnimation);
+            this.i.f198c.startAnimation(scaleAnimation);
         } else {
-            FrameLayout frameLayout8 = this.i.f197c;
+            FrameLayout frameLayout8 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout8, "binding.trashWrapTargetContainer");
             frameLayout8.setActivated(false);
             setActivated(false);
-            FrameLayout frameLayout9 = this.i.f197c;
+            FrameLayout frameLayout9 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout9, "binding.trashWrapTargetContainer");
             float scaleX2 = frameLayout9.getScaleX();
-            FrameLayout frameLayout10 = this.i.f197c;
+            FrameLayout frameLayout10 = this.i.f198c;
             m.checkNotNullExpressionValue(frameLayout10, "binding.trashWrapTargetContainer");
             ScaleAnimation scaleAnimation2 = new ScaleAnimation(scaleX2, 1.0f, frameLayout10.getScaleY(), 1.0f);
             scaleAnimation2.setDuration(200);
             scaleAnimation2.setInterpolator(getContext(), 17563655);
             scaleAnimation2.setFillAfter(true);
-            this.i.f197c.startAnimation(scaleAnimation2);
+            this.i.f198c.startAnimation(scaleAnimation2);
         }
         if (!m.areEqual(overlayBubbleWrap, this.o)) {
             if (overlayBubbleWrap != null) {
diff --git a/app/src/main/java/c/a/q/e.java b/app/src/main/java/c/a/q/e.java
index 507973770b..79e91edde0 100644
--- a/app/src/main/java/c/a/q/e.java
+++ b/app/src/main/java/c/a/q/e.java
@@ -31,7 +31,7 @@ public final class e<T> implements Action1<k.c> {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            appMediaPlayer.b = Observable.F(500, 500, TimeUnit.MILLISECONDS, appMediaPlayer.i).L().J(a.a()).X(new g(appMediaPlayer), new h(appMediaPlayer));
+            appMediaPlayer.b = Observable.E(500, 500, TimeUnit.MILLISECONDS, appMediaPlayer.i).K().I(a.a()).W(new g(appMediaPlayer), new h(appMediaPlayer));
         } else if (i == 4) {
             PublishSubject<AppMediaPlayer.Event> publishSubject3 = this.i.a;
             publishSubject3.j.onNext(AppMediaPlayer.Event.e.a);
diff --git a/app/src/main/java/c/a/q/k.java b/app/src/main/java/c/a/q/k.java
index e8838d9b30..7cdc9bd7c3 100644
--- a/app/src/main/java/c/a/q/k.java
+++ b/app/src/main/java/c/a/q/k.java
@@ -12,9 +12,9 @@ import java.util.List;
 import rx.subjects.PublishSubject;
 /* compiled from: RxPlayerEventListener.kt */
 public final class k implements g1.a {
-    public final PublishSubject<c> i = PublishSubject.l0();
-    public final PublishSubject<a> j = PublishSubject.l0();
-    public final PublishSubject<b> k = PublishSubject.l0();
+    public final PublishSubject<c> i = PublishSubject.k0();
+    public final PublishSubject<a> j = PublishSubject.k0();
+    public final PublishSubject<b> k = PublishSubject.k0();
 
     /* compiled from: RxPlayerEventListener.kt */
     public static final class a {
diff --git a/app/src/main/java/c/a/r/a.java b/app/src/main/java/c/a/r/a.java
index ceec33015f..5ed3275679 100644
--- a/app/src/main/java/c/a/r/a.java
+++ b/app/src/main/java/c/a/r/a.java
@@ -7,12 +7,12 @@ public final class a {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Integer f198c;
+    public final Integer f199c;
 
     public a(int i, int i2, Integer num) {
         this.a = i;
         this.b = i2;
-        this.f198c = num;
+        this.f199c = num;
     }
 
     public boolean equals(Object obj) {
@@ -23,12 +23,12 @@ public final class a {
             return false;
         }
         a aVar = (a) obj;
-        return this.a == aVar.a && this.b == aVar.b && m.areEqual(this.f198c, aVar.f198c);
+        return this.a == aVar.a && this.b == aVar.b && m.areEqual(this.f199c, aVar.f199c);
     }
 
     public int hashCode() {
         int i = ((this.a * 31) + this.b) * 31;
-        Integer num = this.f198c;
+        Integer num = this.f199c;
         return i + (num != null ? num.hashCode() : 0);
     }
 
@@ -38,6 +38,6 @@ public final class a {
         L.append(", max=");
         L.append(this.b);
         L.append(", target=");
-        return c.d.b.a.a.B(L, this.f198c, ")");
+        return c.d.b.a.a.B(L, this.f199c, ")");
     }
 }
diff --git a/app/src/main/java/c/a/r/a0.java b/app/src/main/java/c/a/r/a0.java
index 0925e0d9d4..e059374b8a 100644
--- a/app/src/main/java/c/a/r/a0.java
+++ b/app/src/main/java/c/a/r/a0.java
@@ -1,10 +1,10 @@
 package c.a.r;
 
-import c.a.r.j0.a;
-import c.a.r.l0.b;
-import c.a.r.l0.c;
-import c.a.r.l0.d;
-import c.a.r.l0.e;
+import c.a.r.k0.a;
+import c.a.r.m0.b;
+import c.a.r.m0.c;
+import c.a.r.m0.d;
+import c.a.r.m0.e;
 import co.discord.media_engine.VoiceQuality;
 import com.discord.rtcconnection.KrispOveruseDetector;
 import com.discord.rtcconnection.MediaSinkWantsManager;
@@ -37,27 +37,28 @@ public final class a0 implements MediaEngineConnection.c {
         m.checkNotNullParameter(transportInfo, "transportInfo");
         m.checkNotNullParameter(list, "supportedVideoCodecs");
         RtcConnection rtcConnection = this.a;
-        rtcConnection.g.succeed();
-        rtcConnection.h = transportInfo;
-        MediaEngineConnection mediaEngineConnection2 = rtcConnection.n;
+        rtcConnection.p.succeed();
+        rtcConnection.q = transportInfo;
+        MediaEngineConnection mediaEngineConnection2 = rtcConnection.w;
         if (mediaEngineConnection2 != null) {
-            d dVar = new d(1000, rtcConnection.J, mediaEngineConnection2, new VoiceQuality(), new e(null, 1), new KrispOveruseDetector(mediaEngineConnection2), 0, 64);
-            rtcConnection.f = dVar;
+            d dVar = new d(1000, rtcConnection.S, mediaEngineConnection2, new VoiceQuality(), new e(null, 1), new KrispOveruseDetector(mediaEngineConnection2), 0, 64);
+            rtcConnection.n = dVar;
             dVar.a.clear();
             Subscription subscription = dVar.b;
             if (subscription != null && !subscription.isUnsubscribed()) {
                 dVar.a();
             }
-            dVar.b = Observable.E(0, dVar.f217c, TimeUnit.MILLISECONDS).X(new b(dVar), new c(dVar));
+            dVar.b = Observable.D(0, dVar.f217c, TimeUnit.MILLISECONDS).W(new b(dVar), new c(dVar));
+            rtcConnection.o = false;
         }
-        if (transportInfo.f2090c.ordinal() != 0) {
+        if (transportInfo.f2096c.ordinal() != 0) {
             StringBuilder L = c.d.b.a.a.L("Unsupported protocol: ");
-            L.append(transportInfo.f2090c);
+            L.append(transportInfo.f2096c);
             L.append('.');
             RtcConnection.j(rtcConnection, true, L.toString(), null, false, 12);
         } else {
-            rtcConnection.J.recordBreadcrumb("Sending UDP info to RTC server.", rtcConnection.f2074c);
-            c.a.r.k0.a aVar = rtcConnection.m;
+            rtcConnection.S.recordBreadcrumb("Sending UDP info to RTC server.", rtcConnection.k);
+            c.a.r.l0.a aVar = rtcConnection.v;
             if (aVar == null) {
                 RtcConnection.o(rtcConnection, "onEngineConnectionConnected() socket was null.", null, null, 6);
                 return;
@@ -72,11 +73,11 @@ public final class a0 implements MediaEngineConnection.c {
             Payloads.Protocol.ProtocolInfo protocolInfo = new Payloads.Protocol.ProtocolInfo(str, i, "xsalsa20_poly1305");
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
             for (a aVar2 : list) {
-                arrayList.add(new Payloads.Protocol.CodecInfo(aVar2.a, aVar2.b, aVar2.f207c, aVar2.d, aVar2.e));
+                arrayList.add(new Payloads.Protocol.CodecInfo(aVar2.a, aVar2.b, aVar2.f208c, aVar2.d, aVar2.e));
             }
             aVar.o(1, new Payloads.Protocol("udp", protocolInfo, arrayList));
         }
-        for (RtcConnection.c cVar : rtcConnection.e) {
+        for (RtcConnection.c cVar : rtcConnection.m) {
             cVar.onMediaEngineConnectionConnected(rtcConnection);
         }
     }
@@ -87,7 +88,7 @@ public final class a0 implements MediaEngineConnection.c {
         m.checkNotNullParameter(mediaEngineConnection, "connection");
         m.checkNotNullParameter(connectionState, "connectionState");
         RtcConnection rtcConnection = this.a;
-        RtcConnection.StateChange stateChange = rtcConnection.i;
+        RtcConnection.StateChange stateChange = rtcConnection.r;
         rtcConnection.r("Connection state change: " + connectionState);
         int ordinal = connectionState.ordinal();
         if (ordinal == 0) {
@@ -102,24 +103,24 @@ public final class a0 implements MediaEngineConnection.c {
             throw new NoWhenBranchMatchedException();
         }
         rtcConnection.u(state);
-        if (stateChange.a == RtcConnection.State.g.a && rtcConnection.i.a == RtcConnection.State.h.a) {
+        if (stateChange.a == RtcConnection.State.g.a && rtcConnection.r.a == RtcConnection.State.h.a) {
             rtcConnection.q();
         }
-        if (rtcConnection.i.a == RtcConnection.State.f.a) {
-            rtcConnection.f2075s = Long.valueOf(rtcConnection.K.currentTimeMillis());
-            rtcConnection.f2076x = true;
-            Map<String, Object> mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.t)));
-            Long l = rtcConnection.r;
-            Long l2 = rtcConnection.f2075s;
+        if (rtcConnection.r.a == RtcConnection.State.f.a) {
+            rtcConnection.B = Long.valueOf(rtcConnection.T.currentTimeMillis());
+            rtcConnection.G = true;
+            Map<String, Object> mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.C)));
+            Long l = rtcConnection.A;
+            Long l2 = rtcConnection.B;
             Long valueOf = (l2 == null || l == null) ? null : Long.valueOf(l2.longValue() - l.longValue());
             if (valueOf != null) {
                 mutableMapOf.put("connect_time", Long.valueOf(valueOf.longValue()));
             }
             rtcConnection.b(mutableMapOf);
             rtcConnection.p(RtcConnection.AnalyticsEvent.VOICE_CONNECTION_SUCCESS, mutableMapOf);
-            MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v;
+            MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.E;
             if (mediaSinkWantsManager != null) {
-                mediaSinkWantsManager.b(new i(mediaSinkWantsManager, rtcConnection.n));
+                mediaSinkWantsManager.b(new i(mediaSinkWantsManager, rtcConnection.w));
             }
         }
     }
@@ -143,7 +144,7 @@ public final class a0 implements MediaEngineConnection.c {
             rtcConnection.r(P.toString());
         } else {
             RtcConnection.AnalyticsEvent analyticsEvent = RtcConnection.AnalyticsEvent.VOICE_CONNECTION_FAILURE;
-            Map<String, Object> mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.t)));
+            Map<String, Object> mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.C)));
             rtcConnection.b(mutableMapOf);
             rtcConnection.p(analyticsEvent, mutableMapOf);
         }
@@ -166,13 +167,13 @@ public final class a0 implements MediaEngineConnection.c {
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c
     public void onSpeaking(long j, int i, boolean z2) {
-        c.a.r.k0.a aVar;
+        c.a.r.l0.a aVar;
         RtcConnection rtcConnection = this.a;
-        if (j == rtcConnection.H && (aVar = rtcConnection.m) != null) {
+        if (j == rtcConnection.Q && (aVar = rtcConnection.v) != null) {
             aVar.b();
             aVar.o(5, new Payloads.Speaking(i, Integer.valueOf(z2 ? 1 : 0), 0, null, 8, null));
         }
-        for (RtcConnection.c cVar : rtcConnection.e) {
+        for (RtcConnection.c cVar : rtcConnection.m) {
             cVar.onSpeaking(j, z2);
         }
     }
@@ -180,21 +181,28 @@ public final class a0 implements MediaEngineConnection.c {
     @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c
     public void onVideo(long j, Integer num, int i, int i2, int i3) {
         RtcConnection rtcConnection = this.a;
-        if (j == rtcConnection.H) {
-            c.a.r.k0.a aVar = rtcConnection.m;
+        if (j == rtcConnection.Q) {
+            c.a.r.l0.a aVar = rtcConnection.v;
+            boolean z2 = true;
             if (aVar == null) {
                 RtcConnection.o(rtcConnection, "sendVideo() socket was null.", null, null, 6);
             } else {
-                rtcConnection.f2078z = i2;
+                rtcConnection.I = i2;
+                if (i2 != 0) {
+                    rtcConnection.o = true;
+                }
                 aVar.b();
                 aVar.o(12, new Payloads.Video(i, i2, i3, null, n.emptyList(), 8, null));
             }
-            MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v;
+            MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.E;
             if (mediaSinkWantsManager != null) {
-                mediaSinkWantsManager.b(new k(mediaSinkWantsManager, i2 != 0));
+                if (i2 == 0) {
+                    z2 = false;
+                }
+                mediaSinkWantsManager.b(new k(mediaSinkWantsManager, z2));
             }
         }
-        for (RtcConnection.c cVar : rtcConnection.e) {
+        for (RtcConnection.c cVar : rtcConnection.m) {
             cVar.onVideoStream(j, num);
         }
     }
diff --git a/app/src/main/java/c/a/r/b.java b/app/src/main/java/c/a/r/b.java
index 2555a1de08..80aaf35aef 100644
--- a/app/src/main/java/c/a/r/b.java
+++ b/app/src/main/java/c/a/r/b.java
@@ -8,13 +8,13 @@ public final class b {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f199c;
+    public final int f200c;
     public final Integer d = null;
 
     public b(int i, int i2, int i3, Integer num) {
         this.a = i;
         this.b = i2;
-        this.f199c = i3;
+        this.f200c = i3;
     }
 
     public boolean equals(Object obj) {
@@ -25,11 +25,11 @@ public final class b {
             return false;
         }
         b bVar = (b) obj;
-        return this.a == bVar.a && this.b == bVar.b && this.f199c == bVar.f199c && m.areEqual(this.d, bVar.d);
+        return this.a == bVar.a && this.b == bVar.b && this.f200c == bVar.f200c && m.areEqual(this.d, bVar.d);
     }
 
     public int hashCode() {
-        int i = ((((this.a * 31) + this.b) * 31) + this.f199c) * 31;
+        int i = ((((this.a * 31) + this.b) * 31) + this.f200c) * 31;
         Integer num = this.d;
         return i + (num != null ? num.hashCode() : 0);
     }
@@ -40,7 +40,7 @@ public final class b {
         L.append(", height=");
         L.append(this.b);
         L.append(", framerate=");
-        L.append(this.f199c);
+        L.append(this.f200c);
         L.append(", pixelCount=");
         return a.B(L, this.d, ")");
     }
diff --git a/app/src/main/java/c/a/r/d0.java b/app/src/main/java/c/a/r/d0.java
index 8f22fe9c06..38bc941225 100644
--- a/app/src/main/java/c/a/r/d0.java
+++ b/app/src/main/java/c/a/r/d0.java
@@ -1,8 +1,8 @@
 package c.a.r;
 
 import c.a.r.e;
-import c.a.r.k0.a;
-import c.a.r.l0.d;
+import c.a.r.l0.a;
+import c.a.r.m0.d;
 import com.discord.rtcconnection.EncodeQuality;
 import com.discord.rtcconnection.MediaSinkWantsManager;
 import com.discord.rtcconnection.RtcConnection;
@@ -33,67 +33,68 @@ public final class d0 implements a.d {
         this.a = rtcConnection;
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void a(String str, String str2) {
         m.checkNotNullParameter(str, "audioCodec");
         m.checkNotNullParameter(str2, "videoCodec");
-        MediaEngineConnection mediaEngineConnection = this.a.n;
+        MediaEngineConnection mediaEngineConnection = this.a.w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.r(str, str2);
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void b(boolean z2, Integer num, String str) {
         RtcConnection rtcConnection = this.a;
         Objects.requireNonNull(rtcConnection);
         rtcConnection.r("Disconnected from RTC server. wasFatal: " + z2 + " -- code: " + num + " -- reason: " + str);
-        MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+        MediaEngineConnection mediaEngineConnection = rtcConnection.w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.destroy();
         }
-        MediaEngineConnection mediaEngineConnection2 = rtcConnection.n;
+        MediaEngineConnection mediaEngineConnection2 = rtcConnection.w;
         if (mediaEngineConnection2 != null) {
-            mediaEngineConnection2.o(rtcConnection.B);
+            mediaEngineConnection2.o(rtcConnection.K);
         }
         boolean z3 = num == null || num.intValue() != 1000;
-        if (!(rtcConnection.i.a instanceof RtcConnection.State.d)) {
+        if (!(rtcConnection.r.a instanceof RtcConnection.State.d)) {
             rtcConnection.n(z3, str);
-            d dVar = rtcConnection.f;
+            d dVar = rtcConnection.n;
             if (dVar != null) {
                 dVar.a();
             }
-            rtcConnection.f = null;
+            rtcConnection.n = null;
+            rtcConnection.o = false;
         }
-        rtcConnection.q = 0;
-        rtcConnection.f2075s = null;
-        MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v;
+        rtcConnection.f2084z = 0;
+        rtcConnection.B = null;
+        MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.E;
         if (mediaSinkWantsManager != null) {
             mediaSinkWantsManager.b(new g(mediaSinkWantsManager));
         }
         rtcConnection.u(new RtcConnection.State.d(z3));
         if (z3) {
-            long fail = rtcConnection.g.fail(new b0(rtcConnection));
-            Logger.w$default(rtcConnection.J, rtcConnection.f2074c, "Disconnect was not clean! Reason: " + str + ", code: " + num + ". Reconnecting in " + (fail / ((long) 1000)) + " seconds.", null, 4, null);
+            long fail = rtcConnection.p.fail(new b0(rtcConnection));
+            Logger.w$default(rtcConnection.S, rtcConnection.k, "Disconnect was not clean! Reason: " + str + ", code: " + num + ". Reconnecting in " + (fail / ((long) 1000)) + " seconds.", null, 4, null);
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void c(String str, List<Integer> list) {
         m.checkNotNullParameter(str, "mode");
         m.checkNotNullParameter(list, "secretKey");
-        MediaEngineConnection mediaEngineConnection = this.a.n;
+        MediaEngineConnection mediaEngineConnection = this.a.w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.t(str, u.toIntArray(list));
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void d(String str) {
         m.checkNotNullParameter(str, "mediaSessionId");
         RtcConnection rtcConnection = this.a;
-        rtcConnection.f2077y = str;
-        for (RtcConnection.c cVar : rtcConnection.e) {
+        rtcConnection.H = str;
+        for (RtcConnection.c cVar : rtcConnection.m) {
             cVar.onMediaSessionIdReceived();
             rtcConnection.p(RtcConnection.AnalyticsEvent.MEDIA_SESSION_JOINED, new LinkedHashMap());
         }
@@ -104,16 +105,16 @@ public final class d0 implements a.d {
     /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: java.util.Iterator<T>, java.util.Iterator */
     /* JADX DEBUG: Type inference failed for r0v11. Raw type applied. Possible types: java.util.Iterator<T>, java.util.Iterator */
     /* JADX WARNING: Unknown variable types count: 1 */
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void e(long j, int i, int i2, List<Payloads.Stream> list) {
         VideoMetadata videoMetadata;
         Object obj;
         boolean z2;
         ?? r1;
         RtcConnection rtcConnection = this.a;
-        if (j != rtcConnection.H) {
+        if (j != rtcConnection.Q) {
             boolean z3 = false;
-            if (rtcConnection.v != null) {
+            if (rtcConnection.E != null) {
                 if (list != null) {
                     r1 = new ArrayList(o.collectionSizeOrDefault(list, 10));
                     for (Payloads.Stream stream : list) {
@@ -132,8 +133,8 @@ public final class d0 implements a.d {
                     }
                     list2 = d0.t.m.listOf(new Payloads.Stream("100", null, 100, valueOf, valueOf2, null, Boolean.valueOf(z3), null));
                 }
-                rtcConnection.v.c(j, Integer.valueOf(i));
-                MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v;
+                rtcConnection.E.c(j, Integer.valueOf(i));
+                MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.E;
                 Objects.requireNonNull(mediaSinkWantsManager);
                 m.checkNotNullParameter(list2, "ssrcs");
                 mediaSinkWantsManager.b(new l(mediaSinkWantsManager, list2, j));
@@ -173,14 +174,14 @@ public final class d0 implements a.d {
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void f(Map<String, Integer> map) {
         boolean z2;
         Integer num;
         m.checkNotNullParameter(map, "wants");
         RtcConnection rtcConnection = this.a;
-        if (rtcConnection.v != null) {
-            int i = rtcConnection.f2078z;
+        if (rtcConnection.E != null) {
+            int i = rtcConnection.I;
             int intValue = (i == 0 || (num = map.get(String.valueOf(i))) == null) ? 0 : num.intValue();
             Integer num2 = map.get("any");
             int intValue2 = num2 != null ? num2.intValue() : 0;
@@ -188,13 +189,13 @@ public final class d0 implements a.d {
                 intValue = intValue2 > 0 ? intValue2 : 100;
             }
             e.c cVar = null;
-            rtcConnection.J.i(rtcConnection.f2074c, "remote MediaSinkWants: " + map + ", decided on encode quality " + intValue, null);
+            rtcConnection.S.i(rtcConnection.k, "remote MediaSinkWants: " + map + ", decided on encode quality " + intValue, null);
             EncodeQuality[] values = EncodeQuality.values();
             for (int i2 = 10; i2 >= 0; i2--) {
                 EncodeQuality encodeQuality = values[i2];
                 if (encodeQuality.getValue() <= intValue) {
-                    e eVar = rtcConnection.v.j;
-                    g0 g0Var = eVar.e;
+                    e eVar = rtcConnection.E.j;
+                    h0 h0Var = eVar.e;
                     m.checkNotNullParameter(encodeQuality, "wantValue");
                     List<e.c> list = eVar.d;
                     ListIterator<e.c> listIterator = list.listIterator(list.size());
@@ -203,7 +204,7 @@ public final class d0 implements a.d {
                             break;
                         }
                         e.c previous = listIterator.previous();
-                        if (encodeQuality.compareTo(previous.f202c) >= 0) {
+                        if (encodeQuality.compareTo(previous.f203c) >= 0) {
                             z2 = true;
                             continue;
                         } else {
@@ -220,9 +221,9 @@ public final class d0 implements a.d {
                         cVar2 = (e.c) u.first((List<? extends Object>) eVar.d);
                     }
                     n nVar = cVar2.a;
-                    int max = Math.max((int) (((double) g0Var.f203c.a) * nVar.f222c), g0Var.d);
-                    int max2 = Math.max((int) (((double) g0Var.f203c.b) * nVar.f222c), g0Var.d);
-                    MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+                    int max = Math.max((int) (((double) h0Var.f204c.a) * nVar.f222c), h0Var.d);
+                    int max2 = Math.max((int) (((double) h0Var.f204c.b) * nVar.f222c), h0Var.d);
+                    MediaEngineConnection mediaEngineConnection = rtcConnection.w;
                     if (mediaEngineConnection != null) {
                         mediaEngineConnection.m(new MediaEngineConnection.a(max, max2, nVar.a, nVar.b, nVar.d, nVar.e));
                         return;
@@ -234,78 +235,78 @@ public final class d0 implements a.d {
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void g(long j) {
         RtcConnection rtcConnection = this.a;
-        rtcConnection.l.add(Long.valueOf(j));
-        if (rtcConnection.l.size() > 5) {
-            r.removeFirst(rtcConnection.l);
+        rtcConnection.u.add(Long.valueOf(j));
+        if (rtcConnection.u.size() > 5) {
+            r.removeFirst(rtcConnection.u);
         }
         if (j > ((long) 500)) {
-            rtcConnection.q++;
+            rtcConnection.f2084z++;
         }
         double d = (double) j;
         Objects.requireNonNull(RtcConnection.Quality.Companion);
         RtcConnection.Quality quality = Double.isNaN(d) ? RtcConnection.Quality.UNKNOWN : d < ((double) 250) ? RtcConnection.Quality.FINE : d < ((double) 500) ? RtcConnection.Quality.AVERAGE : RtcConnection.Quality.BAD;
-        for (RtcConnection.c cVar : rtcConnection.e) {
+        for (RtcConnection.c cVar : rtcConnection.m) {
             cVar.onQualityUpdate(quality);
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void h() {
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void i() {
         RtcConnection rtcConnection = this.a;
-        rtcConnection.g.cancel();
+        rtcConnection.p.cancel();
         StringBuilder sb = new StringBuilder();
         sb.append("Connecting to RTC server ");
-        a aVar = rtcConnection.m;
-        sb.append(aVar != null ? aVar.u : null);
+        a aVar = rtcConnection.v;
+        sb.append(aVar != null ? aVar.C : null);
         rtcConnection.r(sb.toString());
         rtcConnection.u(RtcConnection.State.c.a);
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void j() {
         RtcConnection rtcConnection = this.a;
-        rtcConnection.g.cancel();
-        rtcConnection.J.recordBreadcrumb("Connected to RTC server.", rtcConnection.f2074c);
-        a aVar = rtcConnection.m;
+        rtcConnection.p.cancel();
+        rtcConnection.S.recordBreadcrumb("Connected to RTC server.", rtcConnection.k);
+        a aVar = rtcConnection.v;
         if (aVar == null) {
             RtcConnection.o(rtcConnection, "onSocketConnect() socket was null.", null, null, 6);
             return;
         }
-        String str = rtcConnection.G;
-        long j = rtcConnection.H;
-        String str2 = rtcConnection.E;
-        boolean z2 = rtcConnection.F;
+        String str = rtcConnection.P;
+        long j = rtcConnection.Q;
+        String str2 = rtcConnection.N;
+        boolean z2 = rtcConnection.O;
         m.checkNotNullParameter(str, "serverId");
         m.checkNotNullParameter(str2, "sessionId");
         aVar.b();
-        aVar.j = str;
-        aVar.k = str2;
-        aVar.r = a.c.IDENTIFYING;
-        aVar.o(0, new Payloads.Identify(str, j, str2, aVar.v, z2));
+        aVar.f213s = str;
+        aVar.t = str2;
+        aVar.A = a.c.IDENTIFYING;
+        aVar.o(0, new Payloads.Identify(str, j, str2, aVar.D, z2));
         rtcConnection.u(RtcConnection.State.a.a);
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void k(long j) {
         d dVar;
-        c.a.r.l0.e eVar;
+        c.a.r.m0.e eVar;
         Map<String, Object> b;
         RtcConnection rtcConnection = this.a;
-        if (!(!(rtcConnection.L instanceof RtcConnection.d.a) || (dVar = rtcConnection.f) == null || (eVar = dVar.g) == null || (b = eVar.b(String.valueOf(j))) == null)) {
+        if (!(!(rtcConnection.U instanceof RtcConnection.d.a) || (dVar = rtcConnection.n) == null || (eVar = dVar.g) == null || (b = eVar.b(String.valueOf(j))) == null)) {
             rtcConnection.l(j, b);
         }
-        MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v;
+        MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.E;
         if (mediaSinkWantsManager != null) {
             mediaSinkWantsManager.c(j, null);
         }
-        MediaSinkWantsManager mediaSinkWantsManager2 = rtcConnection.v;
+        MediaSinkWantsManager mediaSinkWantsManager2 = rtcConnection.E;
         if (mediaSinkWantsManager2 != null) {
             List emptyList = n.emptyList();
             m.checkNotNullParameter(emptyList, "ssrcs");
@@ -313,7 +314,7 @@ public final class d0 implements a.d {
         }
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void l(int i, int i2, String str) {
         MediaEngineConnection.Type type;
         m.checkNotNullParameter(str, "ip");
@@ -321,10 +322,10 @@ public final class d0 implements a.d {
         Objects.requireNonNull(rtcConnection);
         rtcConnection.r("Discovered dedicated UDP server on port " + i);
         rtcConnection.u(RtcConnection.State.g.a);
-        MediaEngine mediaEngine = rtcConnection.I;
-        long j = rtcConnection.H;
+        MediaEngine mediaEngine = rtcConnection.R;
+        long j = rtcConnection.Q;
         MediaEngine.a aVar = new MediaEngine.a(i2, str, i);
-        RtcConnection.d dVar = rtcConnection.L;
+        RtcConnection.d dVar = rtcConnection.U;
         if (m.areEqual(dVar, RtcConnection.d.a.a)) {
             type = MediaEngineConnection.Type.DEFAULT;
         } else if (dVar instanceof RtcConnection.d.b) {
@@ -334,26 +335,26 @@ public final class d0 implements a.d {
         }
         MediaEngineConnection h = mediaEngine.h(j, aVar, type, new c0(rtcConnection));
         if (h != null) {
-            h.l(rtcConnection.B);
-            rtcConnection.n = h;
+            h.l(rtcConnection.K);
+            rtcConnection.w = h;
             return;
         }
         RtcConnection.o(rtcConnection, "onSocketHello(): connect() return null.", null, null, 6);
     }
 
-    @Override // c.a.r.k0.a.d
+    @Override // c.a.r.l0.a.d
     public void onSpeaking(long j, int i, boolean z2) {
         RtcConnection rtcConnection = this.a;
-        if (j != rtcConnection.H) {
-            MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+        if (j != rtcConnection.Q) {
+            MediaEngineConnection mediaEngineConnection = rtcConnection.w;
             if (mediaEngineConnection != null) {
                 mediaEngineConnection.s(j, i, null, rtcConnection.g(j), rtcConnection.h(j));
             }
-            MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v;
+            MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.E;
             if (mediaSinkWantsManager != null) {
                 mediaSinkWantsManager.c(j, Integer.valueOf(i));
             }
-            for (RtcConnection.c cVar : rtcConnection.e) {
+            for (RtcConnection.c cVar : rtcConnection.m) {
                 cVar.onUserCreated(rtcConnection, j);
             }
         }
diff --git a/app/src/main/java/c/a/r/e.java b/app/src/main/java/c/a/r/e.java
index 1818a45ea1..8f59010fad 100644
--- a/app/src/main/java/c/a/r/e.java
+++ b/app/src/main/java/c/a/r/e.java
@@ -17,9 +17,9 @@ public final class e {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<EncodeQuality, n> f200c;
+    public final Map<EncodeQuality, n> f201c;
     public final List<c> d;
-    public final g0 e;
+    public final h0 e;
 
     /* compiled from: MediaSinkWantsLadder.kt */
     public static final class a {
@@ -27,13 +27,13 @@ public final class e {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final double f201c;
+        public final double f202c;
         public final int d;
 
         public a(int i, int i2, double d, int i3) {
             this.a = i;
             this.b = i2;
-            this.f201c = d;
+            this.f202c = d;
             this.d = i3;
         }
 
@@ -45,11 +45,11 @@ public final class e {
                 return false;
             }
             a aVar = (a) obj;
-            return this.a == aVar.a && this.b == aVar.b && Double.compare(this.f201c, aVar.f201c) == 0 && this.d == aVar.d;
+            return this.a == aVar.a && this.b == aVar.b && Double.compare(this.f202c, aVar.f202c) == 0 && this.d == aVar.d;
         }
 
         public int hashCode() {
-            return ((a0.a.a.a.a(this.f201c) + (((this.a * 31) + this.b) * 31)) * 31) + this.d;
+            return ((a0.a.a.a.a(this.f202c) + (((this.a * 31) + this.b) * 31)) * 31) + this.d;
         }
 
         public String toString() {
@@ -58,7 +58,7 @@ public final class e {
             L.append(", height=");
             L.append(this.b);
             L.append(", budgetPortion=");
-            L.append(this.f201c);
+            L.append(this.f202c);
             L.append(", pixelCount=");
             return c.d.b.a.a.z(L, this.d, ")");
         }
@@ -76,14 +76,14 @@ public final class e {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final EncodeQuality f202c;
+        public final EncodeQuality f203c;
 
         public c(n nVar, int i, EncodeQuality encodeQuality) {
             m.checkNotNullParameter(nVar, "budget");
             m.checkNotNullParameter(encodeQuality, "wantValue");
             this.a = nVar;
             this.b = i;
-            this.f202c = encodeQuality;
+            this.f203c = encodeQuality;
         }
 
         public boolean equals(Object obj) {
@@ -94,14 +94,14 @@ public final class e {
                 return false;
             }
             c cVar = (c) obj;
-            return m.areEqual(this.a, cVar.a) && this.b == cVar.b && m.areEqual(this.f202c, cVar.f202c);
+            return m.areEqual(this.a, cVar.a) && this.b == cVar.b && m.areEqual(this.f203c, cVar.f203c);
         }
 
         public int hashCode() {
             n nVar = this.a;
             int i = 0;
             int hashCode = (((nVar != null ? nVar.hashCode() : 0) * 31) + this.b) * 31;
-            EncodeQuality encodeQuality = this.f202c;
+            EncodeQuality encodeQuality = this.f203c;
             if (encodeQuality != null) {
                 i = encodeQuality.hashCode();
             }
@@ -114,22 +114,22 @@ public final class e {
             L.append(", pixelCount=");
             L.append(this.b);
             L.append(", wantValue=");
-            L.append(this.f202c);
+            L.append(this.f203c);
             L.append(")");
             return L.toString();
         }
     }
 
-    public e(g0 g0Var, int i) {
+    public e(h0 h0Var, int i) {
         n nVar;
         Object obj;
         int i2;
         EncodeQuality encodeQuality;
         boolean z2;
-        g0 g0Var2 = (i & 1) != 0 ? f.a : null;
-        m.checkNotNullParameter(g0Var2, "options");
-        this.e = g0Var2;
-        b bVar = g0Var2.a;
+        h0 h0Var2 = (i & 1) != 0 ? f.a : null;
+        m.checkNotNullParameter(h0Var2, "options");
+        this.e = h0Var2;
+        b bVar = h0Var2.a;
         int i3 = bVar.a * bVar.b;
         this.b = i3;
         Set of = n0.setOf((Object[]) new Double[]{Double.valueOf(0.0d), Double.valueOf(4.0d), Double.valueOf(8.0d), Double.valueOf(10.0d)});
@@ -169,7 +169,7 @@ public final class e {
             aVar = aVar == null ? (a) u.first((List<? extends Object>) arrayList) : aVar;
             if (i6 != aVar.a) {
                 i2 = i3;
-                linkedHashMap.put(encodeQuality2, new n(aVar.a, aVar.b, aVar.f201c, encodeQuality2.compareTo(EncodeQuality.Twenty) <= 0 ? 12 : 20, 30));
+                linkedHashMap.put(encodeQuality2, new n(aVar.a, aVar.b, aVar.f202c, encodeQuality2.compareTo(EncodeQuality.Twenty) <= 0 ? 12 : 20, 30));
                 EncodeQuality[] values = EncodeQuality.values();
                 int i7 = 10;
                 while (true) {
@@ -191,7 +191,7 @@ public final class e {
             i5++;
             i3 = i2;
         }
-        this.f200c = linkedHashMap;
+        this.f201c = linkedHashMap;
         EncodeQuality[] values2 = EncodeQuality.values();
         ArrayList arrayList2 = new ArrayList(11);
         for (int i8 = 0; i8 < 11; i8++) {
diff --git a/app/src/main/java/c/a/r/f.java b/app/src/main/java/c/a/r/f.java
index bc19323e1a..81576ec995 100644
--- a/app/src/main/java/c/a/r/f.java
+++ b/app/src/main/java/c/a/r/f.java
@@ -1,5 +1,5 @@
 package c.a.r;
 /* compiled from: MediaSinkWantsLadder.kt */
 public final class f {
-    public static final g0 a = new g0(new b(1280, 720, 30, null), new b(1280, 720, 30, null), new a(150000, 2500000, null), 150000, new a(500000, 4000000, 600000));
+    public static final h0 a = new h0(new b(1280, 720, 30, null), new b(1280, 720, 30, null), new a(150000, 2500000, null), 150000, new a(500000, 4000000, 600000));
 }
diff --git a/app/src/main/java/c/a/r/g0.java b/app/src/main/java/c/a/r/g0.java
index 13ea6e8795..cb3e0d5c01 100644
--- a/app/src/main/java/c/a/r/g0.java
+++ b/app/src/main/java/c/a/r/g0.java
@@ -1,67 +1,140 @@
 package c.a.r;
 
-import c.d.b.a.a;
+import android.app.Application;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PowerManager;
+import androidx.annotation.AnyThread;
+import androidx.annotation.RequiresApi;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.rtcconnection.enums.ThermalStatus;
+import com.discord.utilities.debug.DebugPrintBuilder;
+import com.discord.utilities.debug.DebugPrintable;
+import com.discord.utilities.lifecycle.ApplicationProvider;
+import com.discord.utilities.logging.LoggingProvider;
+import d0.g;
+import d0.i;
 import d0.z.d.m;
-/* compiled from: MediaSinkWantsLadder.kt */
-public final class g0 {
-    public final b a;
-    public final b b;
+import d0.z.d.o;
+import java.util.Objects;
+import kotlin.Lazy;
+import kotlin.jvm.functions.Function0;
+/* compiled from: ThermalDetector.kt */
+@AnyThread
+@RequiresApi(29)
+public final class g0 implements PowerManager.OnThermalStatusChangedListener, Runnable, DebugPrintable {
+    public static final Lazy i = g.lazy(i.NONE, a.i);
+    public static boolean j;
+    public static boolean k;
+    public static boolean l;
+    public static final g0 m = new g0();
 
-    /* renamed from: c  reason: collision with root package name */
-    public final a f203c;
-    public final int d;
-    public final a e;
+    /* compiled from: ThermalDetector.kt */
+    public static final class a extends o implements Function0<Handler> {
+        public static final a i = new a();
 
-    public g0(b bVar, b bVar2, a aVar, int i, a aVar2) {
-        m.checkNotNullParameter(bVar, "videoBudget");
-        m.checkNotNullParameter(bVar2, "videoCapture");
-        m.checkNotNullParameter(aVar, "videoBitrate");
-        m.checkNotNullParameter(aVar2, "desktopBitrate");
-        this.a = bVar;
-        this.b = bVar2;
-        this.f203c = aVar;
-        this.d = i;
-        this.e = aVar2;
+        public a() {
+            super(0);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Handler mo1invoke() {
+            return new Handler(Looper.getMainLooper());
+        }
     }
 
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof g0)) {
-            return false;
-        }
-        g0 g0Var = (g0) obj;
-        return m.areEqual(this.a, g0Var.a) && m.areEqual(this.b, g0Var.b) && m.areEqual(this.f203c, g0Var.f203c) && this.d == g0Var.d && m.areEqual(this.e, g0Var.e);
+    public final ThermalStatus a() {
+        ThermalStatus.a aVar = ThermalStatus.Companion;
+        Application application = ApplicationProvider.INSTANCE.get();
+        Objects.requireNonNull(aVar);
+        m.checkNotNullParameter(application, "context");
+        Object systemService = application.getSystemService("power");
+        Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.os.PowerManager");
+        return aVar.a(((PowerManager) systemService).getCurrentThermalStatus());
     }
 
-    public int hashCode() {
-        b bVar = this.a;
-        int i = 0;
-        int hashCode = (bVar != null ? bVar.hashCode() : 0) * 31;
-        b bVar2 = this.b;
-        int hashCode2 = (hashCode + (bVar2 != null ? bVar2.hashCode() : 0)) * 31;
-        a aVar = this.f203c;
-        int hashCode3 = (((hashCode2 + (aVar != null ? aVar.hashCode() : 0)) * 31) + this.d) * 31;
-        a aVar2 = this.e;
-        if (aVar2 != null) {
-            i = aVar2.hashCode();
+    public final void b(ThermalStatus thermalStatus) {
+        LoggingProvider.INSTANCE.get().recordBreadcrumb("thermalStatus = " + thermalStatus, "thermal");
+        switch (thermalStatus.ordinal()) {
+            case 0:
+                if (k) {
+                    AnimatableValueParser.E1("ThermalDetector", "totally cool: no longer in thermal trouble");
+                    k = false;
+                    if (l) {
+                        ((Handler) i.getValue()).removeCallbacks(this);
+                        l = false;
+                        return;
+                    }
+                    return;
+                }
+                AnimatableValueParser.F1("ThermalDetector", "totally cool: thermal status is nominal");
+                return;
+            case 1:
+            case 2:
+                if (k) {
+                    AnimatableValueParser.E1("ThermalDetector", "cooling down: thermal status = " + thermalStatus);
+                    c();
+                    return;
+                }
+                AnimatableValueParser.F1("ThermalDetector", "pretty warm: ignoring low priority thermal status = " + thermalStatus);
+                return;
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+                if (!k) {
+                    AnimatableValueParser.G1("ThermalDetector", "we're starting to be in thermal trouble");
+                    k = true;
+                }
+                String str = "very toasty: thermal status = " + thermalStatus;
+                if (thermalStatus.compareTo(ThermalStatus.Emergency) < 0) {
+                    AnimatableValueParser.G1("ThermalDetector", str);
+                } else {
+                    AnimatableValueParser.D1("ThermalDetector", str, new RuntimeException(str));
+                }
+                c();
+                return;
+            default:
+                return;
         }
-        return hashCode3 + i;
     }
 
-    public String toString() {
-        StringBuilder L = a.L("VideoQualityManagerOptions(videoBudget=");
-        L.append(this.a);
-        L.append(", videoCapture=");
-        L.append(this.b);
-        L.append(", videoBitrate=");
-        L.append(this.f203c);
-        L.append(", videoBitrateFloor=");
-        L.append(this.d);
-        L.append(", desktopBitrate=");
-        L.append(this.e);
-        L.append(")");
-        return L.toString();
+    public final void c() {
+        if (!l) {
+            ((Handler) i.getValue()).postDelayed(this, 1000);
+            l = true;
+        }
+    }
+
+    @Override // com.discord.utilities.debug.DebugPrintable
+    @AnyThread
+    public void debugPrint(DebugPrintBuilder debugPrintBuilder) {
+        m.checkNotNullParameter(debugPrintBuilder, "dp");
+        debugPrintBuilder.appendKeyValue("registered", Boolean.valueOf(j));
+        debugPrintBuilder.appendKeyValue("inThermalTrouble", Boolean.valueOf(k));
+        debugPrintBuilder.appendKeyValue("updateScheduled", Boolean.valueOf(l));
+        debugPrintBuilder.appendKeyValue("currentThermalStatus", a());
+    }
+
+    @Override // android.os.PowerManager.OnThermalStatusChangedListener
+    public synchronized void onThermalStatusChanged(int i2) {
+        ThermalStatus a2 = ThermalStatus.Companion.a(i2);
+        AnimatableValueParser.C1("ThermalDetector", "system update: onThermalStatusChanged( " + a2 + " )");
+        b(a2);
+    }
+
+    @Override // java.lang.Runnable
+    public synchronized void run() {
+        l = false;
+        ThermalStatus a2 = a();
+        AnimatableValueParser.C1("ThermalDetector", "scheduled update: current thermal status = " + a2);
+        b(a2);
+    }
+
+    @Override // java.lang.Object
+    public synchronized String toString() {
+        return "ThermalDetector(registered=" + j + ", inThermalTrouble=" + k + ", updateScheduled=" + l + ')';
     }
 }
diff --git a/app/src/main/java/c/a/r/h0.java b/app/src/main/java/c/a/r/h0.java
new file mode 100644
index 0000000000..4d6d06fe2b
--- /dev/null
+++ b/app/src/main/java/c/a/r/h0.java
@@ -0,0 +1,67 @@
+package c.a.r;
+
+import c.d.b.a.a;
+import d0.z.d.m;
+/* compiled from: MediaSinkWantsLadder.kt */
+public final class h0 {
+    public final b a;
+    public final b b;
+
+    /* renamed from: c  reason: collision with root package name */
+    public final a f204c;
+    public final int d;
+    public final a e;
+
+    public h0(b bVar, b bVar2, a aVar, int i, a aVar2) {
+        m.checkNotNullParameter(bVar, "videoBudget");
+        m.checkNotNullParameter(bVar2, "videoCapture");
+        m.checkNotNullParameter(aVar, "videoBitrate");
+        m.checkNotNullParameter(aVar2, "desktopBitrate");
+        this.a = bVar;
+        this.b = bVar2;
+        this.f204c = aVar;
+        this.d = i;
+        this.e = aVar2;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof h0)) {
+            return false;
+        }
+        h0 h0Var = (h0) obj;
+        return m.areEqual(this.a, h0Var.a) && m.areEqual(this.b, h0Var.b) && m.areEqual(this.f204c, h0Var.f204c) && this.d == h0Var.d && m.areEqual(this.e, h0Var.e);
+    }
+
+    public int hashCode() {
+        b bVar = this.a;
+        int i = 0;
+        int hashCode = (bVar != null ? bVar.hashCode() : 0) * 31;
+        b bVar2 = this.b;
+        int hashCode2 = (hashCode + (bVar2 != null ? bVar2.hashCode() : 0)) * 31;
+        a aVar = this.f204c;
+        int hashCode3 = (((hashCode2 + (aVar != null ? aVar.hashCode() : 0)) * 31) + this.d) * 31;
+        a aVar2 = this.e;
+        if (aVar2 != null) {
+            i = aVar2.hashCode();
+        }
+        return hashCode3 + i;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("VideoQualityManagerOptions(videoBudget=");
+        L.append(this.a);
+        L.append(", videoCapture=");
+        L.append(this.b);
+        L.append(", videoBitrate=");
+        L.append(this.f204c);
+        L.append(", videoBitrateFloor=");
+        L.append(this.d);
+        L.append(", desktopBitrate=");
+        L.append(this.e);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/c/a/r/h0/a.java b/app/src/main/java/c/a/r/h0/a.java
deleted file mode 100644
index 765f601bff..0000000000
--- a/app/src/main/java/c/a/r/h0/a.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package c.a.r.h0;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import androidx.annotation.MainThread;
-import c.a.r.i0.a;
-import com.airbnb.lottie.parser.AnimatableValueParser;
-import com.discord.rtcconnection.enums.AudioManagerBroadcastAction;
-import com.discord.rtcconnection.enums.ScoAudioState;
-import d0.z.d.m;
-import java.util.Objects;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import org.webrtc.ThreadUtils;
-/* compiled from: AudioManagerBroadcastReceiver.kt */
-public final class a extends BroadcastReceiver {
-    public static final C0033a a = new C0033a(null);
-    public final Context b;
-
-    /* renamed from: c  reason: collision with root package name */
-    public final f f204c;
-
-    /* compiled from: AudioManagerBroadcastReceiver.kt */
-    /* renamed from: c.a.r.h0.a$a  reason: collision with other inner class name */
-    public static final class C0033a {
-        public C0033a(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    public a(Context context, f fVar) {
-        m.checkNotNullParameter(context, "context");
-        m.checkNotNullParameter(fVar, "listener");
-        this.b = context;
-        this.f204c = fVar;
-    }
-
-    @Override // android.content.BroadcastReceiver
-    @MainThread
-    public void onReceive(Context context, Intent intent) {
-        c.a.r.i0.a aVar;
-        m.checkNotNullParameter(context, "context");
-        ThreadUtils.checkIsOnMainThread();
-        if (intent != null) {
-            Objects.requireNonNull(AudioManagerBroadcastAction.Companion);
-            m.checkNotNullParameter(intent, "intent");
-            String action = intent.getAction();
-            AudioManagerBroadcastAction audioManagerBroadcastAction = null;
-            boolean z2 = false;
-            if (action != null) {
-                m.checkNotNullParameter(action, "action");
-                AudioManagerBroadcastAction[] values = AudioManagerBroadcastAction.values();
-                int i = 0;
-                while (true) {
-                    if (i >= 5) {
-                        break;
-                    }
-                    AudioManagerBroadcastAction audioManagerBroadcastAction2 = values[i];
-                    if (m.areEqual(audioManagerBroadcastAction2.getAction(), action)) {
-                        audioManagerBroadcastAction = audioManagerBroadcastAction2;
-                        break;
-                    }
-                    i++;
-                }
-            }
-            if (audioManagerBroadcastAction == null) {
-                StringBuilder L = c.d.b.a.a.L("unable to parse AudioManagerBroadcastAction for action: ");
-                L.append(intent.getAction());
-                AnimatableValueParser.E1("AudioManagerBroadcastReceiver", L.toString());
-                return;
-            }
-            AnimatableValueParser.D1("AudioManagerBroadcastReceiver", "onReceive: action = " + audioManagerBroadcastAction);
-            try {
-                f fVar = this.f204c;
-                int ordinal = audioManagerBroadcastAction.ordinal();
-                if (ordinal == 0) {
-                    fVar.c(context);
-                } else if (ordinal == 1) {
-                    m.checkNotNullParameter(intent, "intent");
-                    if (m.areEqual(intent.getAction(), "android.intent.action.HEADSET_PLUG")) {
-                        if (!(intent.getIntExtra("state", 0) == 1)) {
-                            aVar = a.b.a;
-                        } else {
-                            String stringExtra = intent.getStringExtra("name");
-                            if (stringExtra == null) {
-                                stringExtra = "unknown";
-                            }
-                            m.checkNotNullExpressionValue(stringExtra, "intent.getStringExtra(\"name\") ?: \"unknown\"");
-                            if (intent.getIntExtra("microphone", 0) == 1) {
-                                z2 = true;
-                            }
-                            aVar = new a.C0034a(stringExtra, z2);
-                        }
-                        fVar.e(context, aVar);
-                        return;
-                    }
-                    throw new IllegalArgumentException("Failed requirement.".toString());
-                } else if (ordinal == 2) {
-                    fVar.b(context, ScoAudioState.Companion.b(intent));
-                } else if (ordinal == 3) {
-                    m.checkNotNullParameter(context, "$this$isMicrophoneMute");
-                    m.checkNotNullParameter(context, "$this$getAudioManager");
-                    Object systemService = context.getSystemService("audio");
-                    Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.AudioManager");
-                    fVar.a(context, ((AudioManager) systemService).isMicrophoneMute());
-                } else if (ordinal == 4) {
-                    m.checkNotNullParameter(context, "$this$isSpeakerphoneOn");
-                    m.checkNotNullParameter(context, "$this$getAudioManager");
-                    Object systemService2 = context.getSystemService("audio");
-                    Objects.requireNonNull(systemService2, "null cannot be cast to non-null type android.media.AudioManager");
-                    fVar.d(context, ((AudioManager) systemService2).isSpeakerphoneOn());
-                }
-            } catch (Throwable th) {
-                AnimatableValueParser.B1("AudioManagerBroadcastReceiver", "error handling " + audioManagerBroadcastAction, th);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/c/a/r/i0/a.java b/app/src/main/java/c/a/r/i0/a.java
index dbab19f91d..faba393c1e 100644
--- a/app/src/main/java/c/a/r/i0/a.java
+++ b/app/src/main/java/c/a/r/i0/a.java
@@ -1,69 +1,118 @@
 package c.a.r.i0;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import androidx.annotation.MainThread;
+import c.a.r.j0.a;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.rtcconnection.enums.AudioManagerBroadcastAction;
+import com.discord.rtcconnection.enums.ScoAudioState;
 import d0.z.d.m;
+import java.util.Objects;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: WiredHeadsetState.kt */
-public abstract class a {
+import org.webrtc.ThreadUtils;
+/* compiled from: AudioManagerBroadcastReceiver.kt */
+public final class a extends BroadcastReceiver {
+    public static final C0033a a = new C0033a(null);
+    public final Context b;
 
-    /* compiled from: WiredHeadsetState.kt */
+    /* renamed from: c  reason: collision with root package name */
+    public final f f205c;
+
+    /* compiled from: AudioManagerBroadcastReceiver.kt */
     /* renamed from: c.a.r.i0.a$a  reason: collision with other inner class name */
-    public static final class C0034a extends a {
-        public final String a;
-        public final boolean b;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public C0034a(String str, boolean z2) {
-            super(false, null);
-            m.checkNotNullParameter(str, "name");
-            this.a = str;
-            this.b = z2;
-        }
-
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof C0034a)) {
-                return false;
-            }
-            C0034a aVar = (C0034a) obj;
-            return m.areEqual(this.a, aVar.a) && this.b == aVar.b;
-        }
-
-        public int hashCode() {
-            String str = this.a;
-            int hashCode = (str != null ? str.hashCode() : 0) * 31;
-            boolean z2 = this.b;
-            if (z2) {
-                z2 = true;
-            }
-            int i = z2 ? 1 : 0;
-            int i2 = z2 ? 1 : 0;
-            int i3 = z2 ? 1 : 0;
-            return hashCode + i;
-        }
-
-        public String toString() {
-            StringBuilder L = c.d.b.a.a.L("PluggedIn(name=");
-            L.append(this.a);
-            L.append(", hasMic=");
-            return c.d.b.a.a.G(L, this.b, ")");
+    public static final class C0033a {
+        public C0033a(DefaultConstructorMarker defaultConstructorMarker) {
         }
     }
 
-    /* compiled from: WiredHeadsetState.kt */
-    public static final class b extends a {
-        public static final b a = new b();
-
-        public b() {
-            super(false, null);
-        }
-
-        public String toString() {
-            return "WiredHeadsetState.Unplugged";
-        }
+    public a(Context context, f fVar) {
+        m.checkNotNullParameter(context, "context");
+        m.checkNotNullParameter(fVar, "listener");
+        this.b = context;
+        this.f205c = fVar;
     }
 
-    public a(boolean z2, DefaultConstructorMarker defaultConstructorMarker) {
+    @Override // android.content.BroadcastReceiver
+    @MainThread
+    public void onReceive(Context context, Intent intent) {
+        c.a.r.j0.a aVar;
+        m.checkNotNullParameter(context, "context");
+        ThreadUtils.checkIsOnMainThread();
+        if (intent != null) {
+            Objects.requireNonNull(AudioManagerBroadcastAction.Companion);
+            m.checkNotNullParameter(intent, "intent");
+            String action = intent.getAction();
+            AudioManagerBroadcastAction audioManagerBroadcastAction = null;
+            boolean z2 = false;
+            if (action != null) {
+                m.checkNotNullParameter(action, "action");
+                AudioManagerBroadcastAction[] values = AudioManagerBroadcastAction.values();
+                int i = 0;
+                while (true) {
+                    if (i >= 5) {
+                        break;
+                    }
+                    AudioManagerBroadcastAction audioManagerBroadcastAction2 = values[i];
+                    if (m.areEqual(audioManagerBroadcastAction2.getAction(), action)) {
+                        audioManagerBroadcastAction = audioManagerBroadcastAction2;
+                        break;
+                    }
+                    i++;
+                }
+            }
+            if (audioManagerBroadcastAction == null) {
+                StringBuilder L = c.d.b.a.a.L("unable to parse AudioManagerBroadcastAction for action: ");
+                L.append(intent.getAction());
+                AnimatableValueParser.G1("AudioManagerBroadcastReceiver", L.toString());
+                return;
+            }
+            AnimatableValueParser.F1("AudioManagerBroadcastReceiver", "onReceive: action = " + audioManagerBroadcastAction);
+            try {
+                f fVar = this.f205c;
+                int ordinal = audioManagerBroadcastAction.ordinal();
+                if (ordinal == 0) {
+                    fVar.c(context);
+                } else if (ordinal == 1) {
+                    m.checkNotNullParameter(intent, "intent");
+                    if (m.areEqual(intent.getAction(), "android.intent.action.HEADSET_PLUG")) {
+                        if (!(intent.getIntExtra("state", 0) == 1)) {
+                            aVar = a.b.a;
+                        } else {
+                            String stringExtra = intent.getStringExtra("name");
+                            if (stringExtra == null) {
+                                stringExtra = "unknown";
+                            }
+                            m.checkNotNullExpressionValue(stringExtra, "intent.getStringExtra(\"name\") ?: \"unknown\"");
+                            if (intent.getIntExtra("microphone", 0) == 1) {
+                                z2 = true;
+                            }
+                            aVar = new a.C0034a(stringExtra, z2);
+                        }
+                        fVar.e(context, aVar);
+                        return;
+                    }
+                    throw new IllegalArgumentException("Failed requirement.".toString());
+                } else if (ordinal == 2) {
+                    fVar.b(context, ScoAudioState.Companion.b(intent));
+                } else if (ordinal == 3) {
+                    m.checkNotNullParameter(context, "$this$isMicrophoneMute");
+                    m.checkNotNullParameter(context, "$this$getAudioManager");
+                    Object systemService = context.getSystemService("audio");
+                    Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.AudioManager");
+                    fVar.a(context, ((AudioManager) systemService).isMicrophoneMute());
+                } else if (ordinal == 4) {
+                    m.checkNotNullParameter(context, "$this$isSpeakerphoneOn");
+                    m.checkNotNullParameter(context, "$this$getAudioManager");
+                    Object systemService2 = context.getSystemService("audio");
+                    Objects.requireNonNull(systemService2, "null cannot be cast to non-null type android.media.AudioManager");
+                    fVar.d(context, ((AudioManager) systemService2).isSpeakerphoneOn());
+                }
+            } catch (Throwable th) {
+                AnimatableValueParser.D1("AudioManagerBroadcastReceiver", "error handling " + audioManagerBroadcastAction, th);
+            }
+        }
     }
 }
diff --git a/app/src/main/java/c/a/r/h0/b.java b/app/src/main/java/c/a/r/i0/b.java
similarity index 85%
rename from app/src/main/java/c/a/r/h0/b.java
rename to app/src/main/java/c/a/r/i0/b.java
index 84fc58707a..55e6094d2f 100644
--- a/app/src/main/java/c/a/r/h0/b.java
+++ b/app/src/main/java/c/a/r/i0/b.java
@@ -1,4 +1,4 @@
-package c.a.r.h0;
+package c.a.r.i0;
 
 import android.content.Context;
 import android.os.Process;
@@ -11,7 +11,7 @@ public final class b {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f205c;
+    public final boolean f206c;
     public final boolean d;
 
     /* compiled from: AudioPermissions.kt */
@@ -27,16 +27,16 @@ public final class b {
         boolean z4 = context.checkPermission("android.permission.RECORD_AUDIO", Process.myPid(), Process.myUid()) == 0;
         z2 = context.checkPermission("android.permission.BLUETOOTH", Process.myPid(), Process.myUid()) != 0 ? false : z2;
         this.b = z3;
-        this.f205c = z4;
+        this.f206c = z4;
         this.d = z2;
         if (!z3) {
-            AnimatableValueParser.E1("AudioPermissions", "MODIFY_AUDIO_SETTINGS permission is missing");
+            AnimatableValueParser.G1("AudioPermissions", "MODIFY_AUDIO_SETTINGS permission is missing");
         }
         if (!z4) {
-            AnimatableValueParser.E1("AudioPermissions", "RECORD_AUDIO permission is missing");
+            AnimatableValueParser.G1("AudioPermissions", "RECORD_AUDIO permission is missing");
         }
         if (!z2) {
-            AnimatableValueParser.E1("AudioPermissions", "BLUETOOTH permission is missing");
+            AnimatableValueParser.G1("AudioPermissions", "BLUETOOTH permission is missing");
         }
     }
 
@@ -48,7 +48,7 @@ public final class b {
             return false;
         }
         b bVar = (b) obj;
-        return this.b == bVar.b && this.f205c == bVar.f205c && this.d == bVar.d;
+        return this.b == bVar.b && this.f206c == bVar.f206c && this.d == bVar.d;
     }
 
     public int hashCode() {
@@ -61,7 +61,7 @@ public final class b {
         int i3 = z2 ? 1 : 0;
         int i4 = z2 ? 1 : 0;
         int i5 = i2 * 31;
-        boolean z3 = this.f205c;
+        boolean z3 = this.f206c;
         if (z3) {
             z3 = true;
         }
@@ -80,7 +80,7 @@ public final class b {
         StringBuilder L = c.d.b.a.a.L("AudioPermissions(hasModifyAudioSettingsPermission=");
         L.append(this.b);
         L.append(", hasRecordAudioPermission=");
-        L.append(this.f205c);
+        L.append(this.f206c);
         L.append(", hasBluetoothPermission=");
         return c.d.b.a.a.G(L, this.d, ")");
     }
diff --git a/app/src/main/java/c/a/r/h0/c.java b/app/src/main/java/c/a/r/i0/c.java
similarity index 82%
rename from app/src/main/java/c/a/r/h0/c.java
rename to app/src/main/java/c/a/r/i0/c.java
index 1109e696cf..54bb8515f4 100644
--- a/app/src/main/java/c/a/r/h0/c.java
+++ b/app/src/main/java/c/a/r/i0/c.java
@@ -1,4 +1,4 @@
-package c.a.r.h0;
+package c.a.r.i0;
 
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
@@ -68,10 +68,10 @@ public final class c extends BroadcastReceiver implements BluetoothProfile.Servi
             if (bluetoothBroadcastAction == null) {
                 StringBuilder L = c.d.b.a.a.L("unable to parse BluetoothBroadcastAction for action: ");
                 L.append(intent.getAction());
-                AnimatableValueParser.E1("BluetoothBroadcastReceiver", L.toString());
+                AnimatableValueParser.G1("BluetoothBroadcastReceiver", L.toString());
                 return;
             }
-            AnimatableValueParser.D1("BluetoothBroadcastReceiver", "onReceive: action = " + bluetoothBroadcastAction);
+            AnimatableValueParser.F1("BluetoothBroadcastReceiver", "onReceive: action = " + bluetoothBroadcastAction);
             try {
                 g gVar = this.n;
                 int ordinal = bluetoothBroadcastAction.ordinal();
@@ -80,13 +80,13 @@ public final class c extends BroadcastReceiver implements BluetoothProfile.Servi
                 } else if (ordinal == 1) {
                     gVar.a(context, BluetoothHeadsetAudioState.Companion.b(intent));
                 } else if (ordinal != 4) {
-                    AnimatableValueParser.E1("BluetoothBroadcastReceiver", "unexpected " + bluetoothBroadcastAction);
+                    AnimatableValueParser.G1("BluetoothBroadcastReceiver", "unexpected " + bluetoothBroadcastAction);
                 } else {
                     m.checkNotNullParameter(intent, "$this$getBluetoothDeviceExtra");
                     gVar.b((BluetoothDevice) intent.getParcelableExtra("android.bluetooth.device.extra.DEVICE"));
                 }
             } catch (Throwable th) {
-                AnimatableValueParser.B1("BluetoothBroadcastReceiver", "error handling " + bluetoothBroadcastAction, th);
+                AnimatableValueParser.D1("BluetoothBroadcastReceiver", "error handling " + bluetoothBroadcastAction, th);
             }
         }
     }
@@ -94,18 +94,14 @@ public final class c extends BroadcastReceiver implements BluetoothProfile.Servi
     @Override // android.bluetooth.BluetoothProfile.ServiceListener
     public void onServiceConnected(int i2, BluetoothProfile bluetoothProfile) {
         ThreadUtils.checkIsOnMainThread();
-        if (i2 == 1) {
-            if (this.k) {
-                AnimatableValueParser.A1("BluetoothBroadcastReceiver", "BluetoothProfile.ServiceListener.onServiceConnected");
-                if (!(bluetoothProfile instanceof BluetoothHeadset)) {
-                    bluetoothProfile = null;
-                }
-                BluetoothHeadset bluetoothHeadset = (BluetoothHeadset) bluetoothProfile;
-                this.l = bluetoothHeadset;
-                this.n.c(bluetoothHeadset);
-                return;
+        if (i2 == 1 && this.k) {
+            AnimatableValueParser.C1("BluetoothBroadcastReceiver", "BluetoothProfile.ServiceListener.onServiceConnected");
+            if (!(bluetoothProfile instanceof BluetoothHeadset)) {
+                bluetoothProfile = null;
             }
-            throw new IllegalStateException("Check failed.".toString());
+            BluetoothHeadset bluetoothHeadset = (BluetoothHeadset) bluetoothProfile;
+            this.l = bluetoothHeadset;
+            this.n.c(bluetoothHeadset);
         }
     }
 
@@ -113,7 +109,7 @@ public final class c extends BroadcastReceiver implements BluetoothProfile.Servi
     public void onServiceDisconnected(int i2) {
         ThreadUtils.checkIsOnMainThread();
         if (i2 == 1 && this.k) {
-            AnimatableValueParser.A1("BluetoothBroadcastReceiver", "BluetoothProfile.ServiceListener.onServiceDisconnected");
+            AnimatableValueParser.C1("BluetoothBroadcastReceiver", "BluetoothProfile.ServiceListener.onServiceDisconnected");
             this.l = null;
             this.n.c(null);
         }
diff --git a/app/src/main/java/c/a/r/h0/d.java b/app/src/main/java/c/a/r/i0/d.java
similarity index 97%
rename from app/src/main/java/c/a/r/h0/d.java
rename to app/src/main/java/c/a/r/i0/d.java
index 7a7c807837..f9ccf72891 100644
--- a/app/src/main/java/c/a/r/h0/d.java
+++ b/app/src/main/java/c/a/r/i0/d.java
@@ -1,4 +1,4 @@
-package c.a.r.h0;
+package c.a.r.i0;
 
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothHeadset;
@@ -14,7 +14,7 @@ public final class d {
     public static final Lazy b = g.lazy(b.i);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d f206c = null;
+    public static final d f207c = null;
 
     /* compiled from: BluetoothHeadsetPrivateApi.kt */
     public static final class a extends o implements Function0<String> {
diff --git a/app/src/main/java/c/a/r/h0/e.java b/app/src/main/java/c/a/r/i0/e.java
similarity index 89%
rename from app/src/main/java/c/a/r/h0/e.java
rename to app/src/main/java/c/a/r/i0/e.java
index 632277a455..d5ec906a93 100644
--- a/app/src/main/java/c/a/r/h0/e.java
+++ b/app/src/main/java/c/a/r/i0/e.java
@@ -1,4 +1,4 @@
-package c.a.r.h0;
+package c.a.r.i0;
 
 import android.media.AudioManager;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -13,7 +13,7 @@ public final class e implements AudioManager.OnAudioFocusChangeListener {
 
     @Override // android.media.AudioManager.OnAudioFocusChangeListener
     public final void onAudioFocusChange(int i) {
-        AnimatableValueParser.A1("AudioManager", "[AudioFocus] new focus: " + i);
+        AnimatableValueParser.C1("AudioManager", "[AudioFocus] new focus: " + i);
         if (i == -3 || i == -2) {
             this.i.i(false);
         } else if (i == 1) {
diff --git a/app/src/main/java/c/a/r/h0/f.java b/app/src/main/java/c/a/r/i0/f.java
similarity index 91%
rename from app/src/main/java/c/a/r/h0/f.java
rename to app/src/main/java/c/a/r/i0/f.java
index 21e53568af..a7c141050a 100644
--- a/app/src/main/java/c/a/r/h0/f.java
+++ b/app/src/main/java/c/a/r/i0/f.java
@@ -1,8 +1,8 @@
-package c.a.r.h0;
+package c.a.r.i0;
 
 import android.content.Context;
 import androidx.annotation.MainThread;
-import c.a.r.i0.a;
+import c.a.r.j0.a;
 import com.discord.rtcconnection.enums.ScoAudioState;
 /* compiled from: OnAudioManagerBroadcastListener.kt */
 @MainThread
diff --git a/app/src/main/java/c/a/r/h0/g.java b/app/src/main/java/c/a/r/i0/g.java
similarity index 97%
rename from app/src/main/java/c/a/r/h0/g.java
rename to app/src/main/java/c/a/r/i0/g.java
index 19c095fe49..dbf89bfd15 100644
--- a/app/src/main/java/c/a/r/h0/g.java
+++ b/app/src/main/java/c/a/r/i0/g.java
@@ -1,4 +1,4 @@
-package c.a.r.h0;
+package c.a.r.i0;
 
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
diff --git a/app/src/main/java/c/a/r/j.java b/app/src/main/java/c/a/r/j.java
index d15c96d073..ab0ee85dc5 100644
--- a/app/src/main/java/c/a/r/j.java
+++ b/app/src/main/java/c/a/r/j.java
@@ -34,7 +34,7 @@ public final class j extends o implements Function0<Unit> {
         Long l2 = this.$userId;
         if (l2 == null) {
             this.this$0.e = null;
-        } else if (this.this$0.f2072c.contains(l2)) {
+        } else if (this.this$0.f2078c.contains(l2)) {
             MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0;
             Long l3 = this.$userId;
             mediaSinkWantsManager2.e = l3;
diff --git a/app/src/main/java/c/a/r/j0/a.java b/app/src/main/java/c/a/r/j0/a.java
index 9583895666..3902ce32c0 100644
--- a/app/src/main/java/c/a/r/j0/a.java
+++ b/app/src/main/java/c/a/r/j0/a.java
@@ -1,60 +1,69 @@
 package c.a.r.j0;
 
 import d0.z.d.m;
-/* compiled from: Codec.kt */
-public final class a {
-    public final String a;
-    public final int b;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: WiredHeadsetState.kt */
+public abstract class a {
 
-    /* renamed from: c  reason: collision with root package name */
-    public final String f207c;
-    public final int d;
-    public final Integer e;
+    /* compiled from: WiredHeadsetState.kt */
+    /* renamed from: c.a.r.j0.a$a  reason: collision with other inner class name */
+    public static final class C0034a extends a {
+        public final String a;
+        public final boolean b;
 
-    public a(String str, int i, String str2, int i2, Integer num) {
-        m.checkNotNullParameter(str, "name");
-        m.checkNotNullParameter(str2, "type");
-        this.a = str;
-        this.b = i;
-        this.f207c = str2;
-        this.d = i2;
-        this.e = num;
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public C0034a(String str, boolean z2) {
+            super(false, null);
+            m.checkNotNullParameter(str, "name");
+            this.a = str;
+            this.b = z2;
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof C0034a)) {
+                return false;
+            }
+            C0034a aVar = (C0034a) obj;
+            return m.areEqual(this.a, aVar.a) && this.b == aVar.b;
+        }
+
+        public int hashCode() {
+            String str = this.a;
+            int hashCode = (str != null ? str.hashCode() : 0) * 31;
+            boolean z2 = this.b;
+            if (z2) {
+                z2 = true;
+            }
+            int i = z2 ? 1 : 0;
+            int i2 = z2 ? 1 : 0;
+            int i3 = z2 ? 1 : 0;
+            return hashCode + i;
+        }
+
+        public String toString() {
+            StringBuilder L = c.d.b.a.a.L("PluggedIn(name=");
+            L.append(this.a);
+            L.append(", hasMic=");
+            return c.d.b.a.a.G(L, this.b, ")");
+        }
     }
 
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
+    /* compiled from: WiredHeadsetState.kt */
+    public static final class b extends a {
+        public static final b a = new b();
+
+        public b() {
+            super(false, null);
         }
-        if (!(obj instanceof a)) {
-            return false;
+
+        public String toString() {
+            return "WiredHeadsetState.Unplugged";
         }
-        a aVar = (a) obj;
-        return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f207c, aVar.f207c) && this.d == aVar.d && m.areEqual(this.e, aVar.e);
     }
 
-    public int hashCode() {
-        String str = this.a;
-        int i = 0;
-        int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.b) * 31;
-        String str2 = this.f207c;
-        int hashCode2 = (((hashCode + (str2 != null ? str2.hashCode() : 0)) * 31) + this.d) * 31;
-        Integer num = this.e;
-        if (num != null) {
-            i = num.hashCode();
-        }
-        return hashCode2 + i;
-    }
-
-    public String toString() {
-        StringBuilder L = c.d.b.a.a.L("Codec(name=");
-        L.append(this.a);
-        L.append(", priority=");
-        L.append(this.b);
-        L.append(", type=");
-        L.append(this.f207c);
-        L.append(", payloadType=");
-        L.append(this.d);
-        L.append(", rtxPayloadType=");
-        return c.d.b.a.a.B(L, this.e, ")");
+    public a(boolean z2, DefaultConstructorMarker defaultConstructorMarker) {
     }
 }
diff --git a/app/src/main/java/c/a/r/j0/b.java b/app/src/main/java/c/a/r/j0/b.java
deleted file mode 100644
index 0993c3762a..0000000000
--- a/app/src/main/java/c/a/r/j0/b.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package c.a.r.j0;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.media.AudioFormat;
-import android.media.AudioPlaybackCaptureConfiguration;
-import android.media.AudioRecord;
-import android.media.projection.MediaProjection;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import androidx.annotation.RequiresApi;
-import co.discord.media_engine.NativeCapturerObserver;
-import co.discord.media_engine.SoundshareAudioSource;
-import com.discord.rtcconnection.mediaengine.ThumbnailEmitter;
-import com.discord.utilities.display.DisplayUtils;
-import com.discord.utilities.logging.Logger;
-import d0.z.d.m;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import org.webrtc.CapturerObserver;
-import org.webrtc.JniCommon;
-import org.webrtc.ScreenCapturerAndroid;
-import org.webrtc.SurfaceTextureHelper;
-import org.webrtc.TimestampAligner;
-import org.webrtc.VideoFrame;
-import rx.Observable;
-import rx.Subscription;
-import rx.functions.Action1;
-/* compiled from: ScreenCapturer.kt */
-public final class b extends ScreenCapturerAndroid {
-    public static final a i = new a(null);
-    public final RunnableC0035b j = new RunnableC0035b();
-    public NativeCapturerObserver k;
-    public SurfaceTextureHelper l;
-    public Context m;
-    public final SoundshareAudioSource n = new SoundshareAudioSource();
-    public int o;
-    public int p;
-    public Long q;
-    public final Rect r = new Rect();
-
-    /* renamed from: s  reason: collision with root package name */
-    public final Rect f208s = new Rect();
-    public final Point t = new Point();
-    public int u;
-    public Subscription v;
-    public final Logger w;
-
-    /* renamed from: x  reason: collision with root package name */
-    public final ThumbnailEmitter f209x;
-
-    /* compiled from: ScreenCapturer.kt */
-    public static final class a {
-        public a(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    /* compiled from: ScreenCapturer.kt */
-    /* renamed from: c.a.r.j0.b$b  reason: collision with other inner class name */
-    public final class RunnableC0035b implements Runnable {
-        public RunnableC0035b() {
-        }
-
-        @Override // java.lang.Runnable
-        public void run() {
-            b bVar = b.this;
-            if (bVar.o > 0) {
-                Long l = bVar.q;
-                if (l != null) {
-                    long rtcTimeNanos = TimestampAligner.getRtcTimeNanos() - l.longValue();
-                    b bVar2 = b.this;
-                    if (rtcTimeNanos > ((long) bVar2.p)) {
-                        NativeCapturerObserver nativeCapturerObserver = bVar2.k;
-                        if (nativeCapturerObserver == null) {
-                            m.throwUninitializedPropertyAccessException("nativeObserver");
-                        }
-                        nativeCapturerObserver.repeatLastFrame();
-                    }
-                }
-                b.this.c();
-            }
-        }
-    }
-
-    /* compiled from: ScreenCapturer.kt */
-    public static final class c<T> implements Action1<Long> {
-        public final /* synthetic */ b i;
-
-        public c(b bVar) {
-            this.i = bVar;
-        }
-
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // rx.functions.Action1
-        public void call(Long l) {
-            this.i.j.run();
-        }
-    }
-
-    /* compiled from: ScreenCapturer.kt */
-    public static final class d<T> implements Action1<Throwable> {
-        public static final d i = new d();
-
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // rx.functions.Action1
-        public void call(Throwable th) {
-        }
-    }
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public b(Intent intent, MediaProjection.Callback callback, Logger logger, ThumbnailEmitter thumbnailEmitter) {
-        super(intent, callback);
-        m.checkNotNullParameter(intent, "mediaProjectionPermissionResultData");
-        m.checkNotNullParameter(callback, "mediaProjectionCallback");
-        m.checkNotNullParameter(logger, "logger");
-        this.w = logger;
-        this.f209x = thumbnailEmitter;
-    }
-
-    public final synchronized void a(Rect rect, int i2) {
-        m.checkNotNullParameter(rect, "measuredSize");
-        int max = Math.max(rect.width(), rect.height());
-        if (max > 0) {
-            float f = ((float) i2) / ((float) max);
-            this.t.set((int) (((float) rect.width()) * f), (int) (((float) rect.height()) * f));
-            Point point = this.t;
-            int i3 = point.x;
-            int i4 = i3 % 16;
-            if (i4 >= 8) {
-                i3 += 16;
-            }
-            int i5 = i3 - i4;
-            int i6 = point.y;
-            int i7 = i6 % 16;
-            if (i7 >= 8) {
-                i6 += 16;
-            }
-            point.set(i5, i6 - i7);
-            Point point2 = this.t;
-            super.changeCaptureFormat(point2.x, point2.y, this.o);
-        }
-    }
-
-    @RequiresApi(29)
-    public final AudioRecord b() {
-        MediaProjection mediaProjection = this.mediaProjection;
-        if (mediaProjection == null) {
-            return null;
-        }
-        AudioPlaybackCaptureConfiguration build = new AudioPlaybackCaptureConfiguration.Builder(mediaProjection).addMatchingUsage(1).addMatchingUsage(14).addMatchingUsage(0).build();
-        m.checkNotNullExpressionValue(build, "AudioPlaybackCaptureConf…KNOWN)\n          .build()");
-        try {
-            return new AudioRecord.Builder().setAudioFormat(new AudioFormat.Builder().setEncoding(2).setSampleRate(44100).setChannelMask(16).build()).setAudioPlaybackCaptureConfig(build).build();
-        } catch (SecurityException unused) {
-            Log.w(b.class.getName(), "Failed to record audio");
-            return null;
-        }
-    }
-
-    public final void c() {
-        if (this.o > 0) {
-            Subscription subscription = this.v;
-            if (subscription != null) {
-                subscription.unsubscribe();
-            }
-            Observable<Long> e02 = Observable.e0(((long) this.p) / 1000000, TimeUnit.MILLISECONDS);
-            SurfaceTextureHelper surfaceTextureHelper = this.l;
-            if (surfaceTextureHelper == null) {
-                m.throwUninitializedPropertyAccessException("surfaceTextureHelper");
-            }
-            Handler handler = surfaceTextureHelper.getHandler();
-            m.checkNotNullExpressionValue(handler, "surfaceTextureHelper.handler");
-            Looper looper = handler.getLooper();
-            AtomicReference<j0.j.b.a> atomicReference = j0.j.b.a.a;
-            Objects.requireNonNull(looper, "looper == null");
-            this.v = e02.Y(new j0.j.b.b(looper)).X(new c(this), d.i);
-        }
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
-    public synchronized void changeCaptureFormat(int i2, int i3, int i4) {
-        a(this.r, Math.max(i2, i3));
-        d(i4);
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid
-    public void createVirtualDisplay() {
-        try {
-            super.createVirtualDisplay();
-        } catch (Throwable th) {
-            Logger.e$default(this.w, "ScreenCapturer", "error in createVirtualDisplay", th, null, 8, null);
-        }
-    }
-
-    public final void d(int i2) {
-        if (i2 <= 0) {
-            this.o = 0;
-            this.p = 0;
-            return;
-        }
-        this.o = i2;
-        this.p = 1000000000 / Math.max(10, i2 / 2);
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
-    public void dispose() {
-        stopCapture();
-        ThumbnailEmitter thumbnailEmitter = this.f209x;
-        if (thumbnailEmitter != null) {
-            synchronized (thumbnailEmitter) {
-                thumbnailEmitter.d.release();
-                thumbnailEmitter.f2093c.release();
-                JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b);
-                thumbnailEmitter.a = Long.MAX_VALUE;
-            }
-        }
-        this.n.release();
-        super.dispose();
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
-    public synchronized void initialize(SurfaceTextureHelper surfaceTextureHelper, Context context, CapturerObserver capturerObserver) {
-        m.checkNotNullParameter(surfaceTextureHelper, "surfaceTextureHelper");
-        m.checkNotNullParameter(context, "applicationContext");
-        m.checkNotNullParameter(capturerObserver, "capturerObserver");
-        this.l = surfaceTextureHelper;
-        this.m = context;
-        this.k = (NativeCapturerObserver) capturerObserver;
-        super.initialize(surfaceTextureHelper, context, capturerObserver);
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoSink
-    public void onFrame(VideoFrame videoFrame) {
-        Rect rect = this.f208s;
-        Context context = this.m;
-        if (context == null) {
-            m.throwUninitializedPropertyAccessException("context");
-        }
-        rect.set(DisplayUtils.getScreenSize(context));
-        if (!m.areEqual(this.f208s, this.r)) {
-            this.r.set(this.f208s);
-            a(this.f208s, this.u);
-        }
-        this.q = Long.valueOf(videoFrame.getTimestampNs());
-        ThumbnailEmitter thumbnailEmitter = this.f209x;
-        if (thumbnailEmitter != null) {
-            synchronized (thumbnailEmitter) {
-                m.checkNotNullParameter(videoFrame, "frame");
-                long currentTimeMillis = thumbnailEmitter.k.currentTimeMillis() - thumbnailEmitter.e;
-                long timestampNs = videoFrame.getTimestampNs() - thumbnailEmitter.a;
-                if (currentTimeMillis > thumbnailEmitter.j) {
-                    long j = (long) 1000;
-                    if (timestampNs > thumbnailEmitter.i * j * j) {
-                        thumbnailEmitter.a = videoFrame.getTimestampNs();
-                        thumbnailEmitter.l.invoke(thumbnailEmitter.a(videoFrame));
-                    }
-                }
-            }
-        }
-        super.onFrame(videoFrame);
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
-    public synchronized void startCapture(int i2, int i3, int i4) {
-        AudioRecord b;
-        super.startCapture(i2, i3, i4);
-        this.u = Math.max(i2, i3);
-        d(i4);
-        if (Build.VERSION.SDK_INT >= 29 && (b = b()) != null) {
-            this.n.startRecording(b);
-        }
-        c();
-    }
-
-    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
-    public synchronized void stopCapture() {
-        super.stopCapture();
-        this.n.stopRecording();
-        this.o = 0;
-        this.q = null;
-    }
-}
diff --git a/app/src/main/java/c/a/r/k0/a.java b/app/src/main/java/c/a/r/k0/a.java
index b2bf74d78e..4b2568d18b 100644
--- a/app/src/main/java/c/a/r/k0/a.java
+++ b/app/src/main/java/c/a/r/k0/a.java
@@ -1,816 +1,60 @@
 package c.a.r.k0;
 
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Process;
-import com.airbnb.lottie.parser.AnimatableValueParser;
-import com.discord.rtcconnection.socket.io.Opcodes;
-import com.discord.rtcconnection.socket.io.Payloads;
-import com.discord.utilities.debug.DebugPrintBuilder;
-import com.discord.utilities.debug.DebugPrintable;
-import com.discord.utilities.logging.Logger;
-import com.discord.utilities.networking.Backoff;
-import com.discord.utilities.time.Clock;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
 import d0.z.d.m;
-import d0.z.d.o;
-import f0.f0.k.h;
-import f0.x;
-import f0.z;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocketFactory;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import okhttp3.Response;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
-/* compiled from: RtcControlSocket.kt */
-public final class a extends WebSocketListener implements DebugPrintable {
-    public static int a;
-    public static final Type b = new C0038a().getType();
+/* compiled from: Codec.kt */
+public final class a {
+    public final String a;
+    public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b f212c = new b(null);
-    public final String A;
-    public final Gson d = new c.i.d.e().a();
-    public final Timer e = new Timer();
-    public final Backoff f = new Backoff(1000, 5000, 3, false, null, 24, null);
-    public final CopyOnWriteArraySet<d> g = new CopyOnWriteArraySet<>();
-    public int h = 3;
-    public WebSocket i;
-    public String j;
-    public String k;
-    public Long l;
-    public boolean m;
-    public b n = new b(this);
-    public Long o;
-    public TimerTask p;
-    public Long q;
-    public c r = c.DISCONNECTED;
+    public final String f208c;
+    public final int d;
+    public final Integer e;
 
-    /* renamed from: s  reason: collision with root package name */
-    public boolean f213s;
-    public final String t;
-    public final String u;
-    public final String v;
-    public final SSLSocketFactory w;
-
-    /* renamed from: x  reason: collision with root package name */
-    public final Logger f214x;
-
-    /* renamed from: y  reason: collision with root package name */
-    public final c.a.r.c f215y;
-
-    /* renamed from: z  reason: collision with root package name */
-    public final Clock f216z;
-
-    /* compiled from: RtcControlSocket.kt */
-    /* renamed from: c.a.r.k0.a$a  reason: collision with other inner class name */
-    public static final class C0038a extends TypeToken<Map<String, ? extends Integer>> {
+    public a(String str, int i, String str2, int i2, Integer num) {
+        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str2, "type");
+        this.a = str;
+        this.b = i;
+        this.f208c = str2;
+        this.d = i2;
+        this.e = num;
     }
 
-    /* compiled from: RtcControlSocket.kt */
-    public static final class b {
-        public b(DefaultConstructorMarker defaultConstructorMarker) {
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
         }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public enum c {
-        DISCONNECTED,
-        CONNECTING,
-        IDENTIFYING,
-        RESUMING,
-        CONNECTED,
-        RECONNECTING
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public interface d {
-        void a(String str, String str2);
-
-        void b(boolean z2, Integer num, String str);
-
-        void c(String str, List<Integer> list);
-
-        void d(String str);
-
-        void e(long j, int i, int i2, List<Payloads.Stream> list);
-
-        void f(Map<String, Integer> map);
-
-        void g(long j);
-
-        void h();
-
-        void i();
-
-        void j();
-
-        void k(long j);
-
-        void l(int i, int i2, String str);
-
-        void onSpeaking(long j, int i, boolean z2);
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class e extends o implements Function1<WebSocket, Unit> {
-        public static final e i = new e();
-
-        public e() {
-            super(1);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(WebSocket webSocket) {
-            WebSocket webSocket2 = webSocket;
-            m.checkNotNullParameter(webSocket2, "it");
-            webSocket2.e(1000, "Force Close");
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class f extends o implements Function1<WebSocket, Unit> {
-        public static final f i = new f();
-
-        public f() {
-            super(1);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(WebSocket webSocket) {
-            WebSocket webSocket2 = webSocket;
-            m.checkNotNullParameter(webSocket2, "it");
-            webSocket2.e(4000, "close reason");
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class g extends TimerTask {
-        public final /* synthetic */ a i;
-
-        /* compiled from: RtcControlSocket.kt */
-        /* renamed from: c.a.r.k0.a$g$a  reason: collision with other inner class name */
-        public static final class C0039a extends o implements Function0<Unit> {
-            public final /* synthetic */ g this$0;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public C0039a(g gVar) {
-                super(0);
-                this.this$0 = gVar;
-            }
-
-            /* Return type fixed from 'java.lang.Object' to match base method */
-            @Override // kotlin.jvm.functions.Function0
-            /* renamed from: invoke */
-            public Unit mo1invoke() {
-                a.a(this.this$0.i, true, null, "The connection timed out. Did not receive OP_HELLO in time.");
-                return Unit.a;
-            }
-        }
-
-        public g(a aVar) {
-            this.i = aVar;
-        }
-
-        @Override // java.util.TimerTask, java.lang.Runnable
-        public void run() {
-            this.i.n(new C0039a(this));
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class h extends o implements Function0<Unit> {
-        public final /* synthetic */ int $code;
-        public final /* synthetic */ String $reason;
-        public final /* synthetic */ WebSocket $webSocket;
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public h(a aVar, WebSocket webSocket, int i, String str) {
-            super(0);
-            this.this$0 = aVar;
-            this.$webSocket = webSocket;
-            this.$code = i;
-            this.$reason = str;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Unit mo1invoke() {
-            if (!(!m.areEqual(this.$webSocket, this.this$0.i))) {
-                a.a(this.this$0, true, Integer.valueOf(this.$code), this.$reason);
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class i extends o implements Function0<Unit> {
-        public final /* synthetic */ Throwable $t;
-        public final /* synthetic */ WebSocket $webSocket;
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public i(a aVar, WebSocket webSocket, Throwable th) {
-            super(0);
-            this.this$0 = aVar;
-            this.$webSocket = webSocket;
-            this.$t = th;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Unit mo1invoke() {
-            if (!(!m.areEqual(this.$webSocket, this.this$0.i))) {
-                if (this.$t instanceof SSLException) {
-                    a.d(this.this$0, null, 1);
-                    a aVar = this.this$0;
-                    aVar.b();
-                    for (d dVar : aVar.g) {
-                        m.checkNotNullExpressionValue(dVar, "it");
-                        dVar.b(false, 1001, null);
-                    }
-                } else {
-                    a aVar2 = this.this$0;
-                    StringBuilder L = c.d.b.a.a.L("An error with the websocket occurred: ");
-                    L.append(this.$t.getMessage());
-                    a.a(aVar2, true, null, L.toString());
-                }
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class j extends o implements Function0<Unit> {
-        public final /* synthetic */ Payloads.Incoming $message;
-        public final /* synthetic */ WebSocket $webSocket;
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public j(a aVar, WebSocket webSocket, Payloads.Incoming incoming) {
-            super(0);
-            this.this$0 = aVar;
-            this.$webSocket = webSocket;
-            this.$message = incoming;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Unit mo1invoke() {
-            boolean z2 = true;
-            if (!(!m.areEqual(this.$webSocket, this.this$0.i))) {
-                switch (this.$message.getOpcode()) {
-                    case 2:
-                        a aVar = this.this$0;
-                        Object c2 = aVar.d.c(this.$message.getData(), Payloads.Ready.class);
-                        m.checkNotNullExpressionValue(c2, "gson.fromJson(message.da…yloads.Ready::class.java)");
-                        Payloads.Ready ready = (Payloads.Ready) c2;
-                        aVar.f.succeed();
-                        long currentTimeMillis = aVar.f216z.currentTimeMillis();
-                        Long l = aVar.q;
-                        long longValue = currentTimeMillis - (l != null ? l.longValue() : 0);
-                        aVar.j("[READY] took " + longValue + " ms");
-                        aVar.b();
-                        for (d dVar : aVar.g) {
-                            m.checkNotNullExpressionValue(dVar, "it");
-                            dVar.l(ready.getPort(), ready.getSsrc(), ready.getIp());
-                        }
-                        break;
-                    case 3:
-                        a aVar2 = this.this$0;
-                        aVar2.o(3, String.valueOf(aVar2.f216z.currentTimeMillis()));
-                        break;
-                    case 4:
-                        a aVar3 = this.this$0;
-                        Object c3 = aVar3.d.c(this.$message.getData(), Payloads.Description.class);
-                        m.checkNotNullExpressionValue(c3, "gson.fromJson(message.da….Description::class.java)");
-                        Payloads.Description description = (Payloads.Description) c3;
-                        aVar3.b();
-                        for (d dVar2 : aVar3.g) {
-                            m.checkNotNullExpressionValue(dVar2, "it");
-                            dVar2.c(description.getMode(), description.getSecretKey());
-                            dVar2.a(description.getAudioCodec(), description.getVideoCodec());
-                            String mediaSessionId = description.getMediaSessionId();
-                            if (mediaSessionId != null) {
-                                dVar2.d(mediaSessionId);
-                            }
-                        }
-                        aVar3.f213s = true;
-                        break;
-                    case 5:
-                        a aVar4 = this.this$0;
-                        Object c4 = aVar4.d.c(this.$message.getData(), Payloads.Speaking.class);
-                        m.checkNotNullExpressionValue(c4, "gson.fromJson(message.da…ads.Speaking::class.java)");
-                        Payloads.Speaking speaking = (Payloads.Speaking) c4;
-                        if (!(speaking.getUserId() == null || speaking.getSpeaking() == null)) {
-                            Integer speaking2 = speaking.getSpeaking();
-                            if (speaking2 == null || speaking2.intValue() != 1) {
-                                z2 = false;
-                            }
-                            aVar4.b();
-                            for (d dVar3 : aVar4.g) {
-                                m.checkNotNullExpressionValue(dVar3, "it");
-                                dVar3.onSpeaking(speaking.getUserId().longValue(), speaking.getSsrc(), z2);
-                            }
-                            break;
-                        }
-                    case 6:
-                        a aVar5 = this.this$0;
-                        Object c5 = aVar5.d.c(this.$message.getData(), Long.TYPE);
-                        m.checkNotNullExpressionValue(c5, "gson.fromJson(message.data, Long::class.java)");
-                        long longValue2 = ((Number) c5).longValue();
-                        long currentTimeMillis2 = aVar5.f216z.currentTimeMillis();
-                        long j = currentTimeMillis2 - longValue2;
-                        Logger.d$default(aVar5.f214x, aVar5.t, c.d.b.a.a.r("got heartbeat ack after ", j, " ms"), null, 4, null);
-                        aVar5.o = Long.valueOf(currentTimeMillis2);
-                        aVar5.m = true;
-                        aVar5.b();
-                        for (d dVar4 : aVar5.g) {
-                            m.checkNotNullExpressionValue(dVar4, "it");
-                            dVar4.g(j);
-                        }
-                        break;
-                    case 7:
-                    case 10:
-                    case 11:
-                    default:
-                        a aVar6 = this.this$0;
-                        StringBuilder L = c.d.b.a.a.L("unknown opcode: ");
-                        L.append(this.$message.getOpcode());
-                        aVar6.j(L.toString());
-                        break;
-                    case 8:
-                        a aVar7 = this.this$0;
-                        Object c6 = aVar7.d.c(this.$message.getData(), Payloads.Hello.class);
-                        m.checkNotNullExpressionValue(c6, "gson.fromJson(message.da…yloads.Hello::class.java)");
-                        Payloads.Hello hello = (Payloads.Hello) c6;
-                        TimerTask timerTask = aVar7.p;
-                        if (timerTask != null) {
-                            timerTask.cancel();
-                        }
-                        aVar7.j("[HELLO] raw: " + hello);
-                        aVar7.l = Long.valueOf(hello.getHeartbeatIntervalMs());
-                        aVar7.h = hello.getServerVersion();
-                        aVar7.n.cancel();
-                        aVar7.m = true;
-                        aVar7.l();
-                        break;
-                    case 9:
-                        this.this$0.f.succeed();
-                        break;
-                    case 12:
-                        a aVar8 = this.this$0;
-                        Object c7 = aVar8.d.c(this.$message.getData(), Payloads.Video.class);
-                        m.checkNotNullExpressionValue(c7, "gson.fromJson(message.da…yloads.Video::class.java)");
-                        Payloads.Video video = (Payloads.Video) c7;
-                        if (video.getUserId() != null) {
-                            aVar8.b();
-                            for (d dVar5 : aVar8.g) {
-                                m.checkNotNullExpressionValue(dVar5, "it");
-                                dVar5.e(video.getUserId().longValue(), video.getAudioSsrc(), video.getVideoSsrc(), video.getStreams());
-                            }
-                            break;
-                        }
-                        break;
-                    case 13:
-                        a aVar9 = this.this$0;
-                        Object c8 = aVar9.d.c(this.$message.getData(), Payloads.ClientDisconnect.class);
-                        m.checkNotNullExpressionValue(c8, "gson.fromJson(message.da…ntDisconnect::class.java)");
-                        Payloads.ClientDisconnect clientDisconnect = (Payloads.ClientDisconnect) c8;
-                        aVar9.b();
-                        for (d dVar6 : aVar9.g) {
-                            m.checkNotNullExpressionValue(dVar6, "it");
-                            dVar6.k(clientDisconnect.getUserId());
-                        }
-                        break;
-                    case 14:
-                        a aVar10 = this.this$0;
-                        Object c9 = aVar10.d.c(this.$message.getData(), Payloads.SessionUpdate.class);
-                        m.checkNotNullExpressionValue(c9, "gson.fromJson(message.da…essionUpdate::class.java)");
-                        Payloads.SessionUpdate sessionUpdate = (Payloads.SessionUpdate) c9;
-                        aVar10.b();
-                        for (d dVar7 : aVar10.g) {
-                            m.checkNotNullExpressionValue(dVar7, "it");
-                            String mediaSessionId2 = sessionUpdate.getMediaSessionId();
-                            if (mediaSessionId2 != null) {
-                                dVar7.d(mediaSessionId2);
-                            }
-                        }
-                        break;
-                    case 15:
-                        a aVar11 = this.this$0;
-                        Gson gson = aVar11.d;
-                        JsonElement data = this.$message.getData();
-                        Type type = a.b;
-                        Objects.requireNonNull(gson);
-                        Object d = data == null ? null : gson.d(new c.i.d.q.x.a(data), type);
-                        m.checkNotNullExpressionValue(d, "gson.fromJson(message.data, MEDIA_SINK_WANTS_TYPE)");
-                        Map<String, Integer> map = (Map) d;
-                        aVar11.b();
-                        for (d dVar8 : aVar11.g) {
-                            m.checkNotNullExpressionValue(dVar8, "it");
-                            dVar8.f(map);
-                        }
-                        break;
-                }
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class k extends o implements Function0<Unit> {
-        public final /* synthetic */ WebSocket $webSocket;
-        public final /* synthetic */ a this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public k(a aVar, WebSocket webSocket) {
-            super(0);
-            this.this$0 = aVar;
-            this.$webSocket = webSocket;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Unit mo1invoke() {
-            boolean z2 = true;
-            if (!(!m.areEqual(this.$webSocket, this.this$0.i))) {
-                a aVar = this.this$0;
-                c cVar = aVar.r;
-                if (cVar == c.CONNECTING) {
-                    aVar.b();
-                    for (d dVar : aVar.g) {
-                        m.checkNotNullExpressionValue(dVar, "it");
-                        dVar.j();
-                    }
-                } else if (cVar == c.RECONNECTING) {
-                    String str = aVar.k;
-                    String str2 = aVar.j;
-                    String str3 = aVar.v;
-                    Long l = aVar.o;
-                    if (l != null && aVar.f216z.currentTimeMillis() - l.longValue() > 60000) {
-                        z2 = false;
-                    }
-                    if (str == null || str2 == null || !aVar.f213s || !z2) {
-                        StringBuilder L = c.d.b.a.a.L("Cannot resume connection. resumable: ");
-                        L.append(aVar.f213s);
-                        L.append(" -- isHeartbeatRecentEnough: ");
-                        L.append(z2);
-                        aVar.h(false, 4801, L.toString());
-                    } else {
-                        aVar.j("[RESUME] resuming session. serverId=" + str2 + " sessionId=" + str);
-                        aVar.b();
-                        for (d dVar2 : aVar.g) {
-                            m.checkNotNullExpressionValue(dVar2, "it");
-                            dVar2.h();
-                        }
-                        aVar.r = c.RESUMING;
-                        aVar.o(7, new Payloads.Resume(str3, str, str2));
-                    }
-                }
-                a aVar2 = this.this$0;
-                aVar2.r = c.CONNECTED;
-                long currentTimeMillis = aVar2.f216z.currentTimeMillis();
-                Long l2 = this.this$0.q;
-                long longValue = currentTimeMillis - (l2 != null ? l2.longValue() : 0);
-                a aVar3 = this.this$0;
-                Logger logger = aVar3.f214x;
-                String str4 = aVar3.t;
-                StringBuilder L2 = c.d.b.a.a.L("[CONNECTED] to ");
-                L2.append(this.this$0.u);
-                Logger.i$default(logger, str4, L2.toString(), null, 4, null);
-                a aVar4 = this.this$0;
-                aVar4.b();
-                for (d dVar3 : aVar4.g) {
-                    m.checkNotNullExpressionValue(dVar3, "it");
-                    dVar3.g(longValue / ((long) 2));
-                }
-            }
-            return Unit.a;
-        }
-    }
-
-    /* compiled from: RtcControlSocket.kt */
-    public static final class l extends o implements Function1<WebSocket, Unit> {
-        public static final l i = new l();
-
-        public l() {
-            super(1);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public Unit invoke(WebSocket webSocket) {
-            WebSocket webSocket2 = webSocket;
-            m.checkNotNullParameter(webSocket2, "it");
-            webSocket2.e(4000, "reconnecting");
-            return Unit.a;
-        }
-    }
-
-    public a(String str, String str2, SSLSocketFactory sSLSocketFactory, Logger logger, c.a.r.c cVar, Clock clock, String str3) {
-        m.checkNotNullParameter(str, "endpoint");
-        m.checkNotNullParameter(str2, "token");
-        m.checkNotNullParameter(logger, "logger");
-        m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor");
-        m.checkNotNullParameter(clock, "clock");
-        m.checkNotNullParameter(str3, "loggingTagPrefix");
-        this.u = str;
-        this.v = str2;
-        this.w = sSLSocketFactory;
-        this.f214x = logger;
-        this.f215y = cVar;
-        this.f216z = clock;
-        this.A = str3;
-        StringBuilder P = c.d.b.a.a.P(str3, "->RtcControlSocket ");
-        int i2 = a + 1;
-        a = i2;
-        P.append(i2);
-        this.t = P.toString();
-    }
-
-    public static final void a(a aVar, boolean z2, Integer num, String str) {
-        aVar.r = c.DISCONNECTED;
-        if ((num != null && num.intValue() == 4004) || ((num != null && num.intValue() == 4015) || ((num != null && num.intValue() == 4011) || (num != null && num.intValue() == 4006)))) {
-            aVar.h(true, num, str);
-        } else if (aVar.f.hasReachedFailureThreshold()) {
-            aVar.k("[WS CLOSED] Backoff exceeded. Resetting.");
-            aVar.h(z2, num, str);
-        } else {
-            aVar.c(null);
-            String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) aVar.f.fail(new c(aVar, z2, num, str))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)");
-            aVar.k("`[WS CLOSED] (" + z2 + ", " + num + ", " + str + ") retrying in " + H + " seconds.");
-        }
-    }
-
-    public static /* synthetic */ void d(a aVar, Function1 function1, int i2) {
-        int i3 = i2 & 1;
-        aVar.c(null);
-    }
-
-    public final void b() {
-        c.a.r.c cVar = this.f215y;
-        Objects.requireNonNull(cVar);
-        if (Process.myTid() != cVar.j) {
-            IllegalStateException illegalStateException = new IllegalStateException("oops! not called on the MediaEngineExecutor");
-            AnimatableValueParser.B1("MediaEngineExecutor", "oops! not called on the MediaEngineExecutor", illegalStateException);
-            if (cVar.l) {
-                new Handler(Looper.getMainLooper()).post(new c.a.r.d(illegalStateException));
-            }
-        }
-    }
-
-    public final void c(Function1<? super WebSocket, Unit> function1) {
-        this.f.cancel();
-        this.n.cancel();
-        TimerTask timerTask = this.p;
-        if (timerTask != null) {
-            timerTask.cancel();
-        }
-        WebSocket webSocket = this.i;
-        if (!(webSocket == null || function1 == null)) {
-            function1.invoke(webSocket);
-        }
-        this.i = null;
-    }
-
-    @Override // com.discord.utilities.debug.DebugPrintable
-    public void debugPrint(DebugPrintBuilder debugPrintBuilder) {
-        m.checkNotNullParameter(debugPrintBuilder, "dp");
-        debugPrintBuilder.appendKeyValue("serverId", this.j);
-        debugPrintBuilder.appendKeyValue("sessionId", this.k);
-        debugPrintBuilder.appendKeyValue("heartbeatInterval", this.l);
-        debugPrintBuilder.appendKeyValue("lastHeartbeatAckTime", this.o);
-        debugPrintBuilder.appendKeyValue("connectionStartTime", this.q);
-        debugPrintBuilder.appendKeyValue("connectionState", this.r);
-        debugPrintBuilder.appendKeyValue("resumable", Boolean.valueOf(this.f213s));
-    }
-
-    public final void e() {
-        b();
-        j("[CLOSE]");
-        c(e.i);
-        this.j = null;
-        this.k = null;
-        this.f213s = false;
-        this.r = c.DISCONNECTED;
-        b();
-        for (d dVar : this.g) {
-            m.checkNotNullExpressionValue(dVar, "it");
-            dVar.b(false, 1000, "Force Close");
-        }
-    }
-
-    public final boolean f() {
-        b();
-        if (this.r != c.DISCONNECTED) {
-            k("Cannot start a new connection, connection state is not disconnected");
+        if (!(obj instanceof a)) {
             return false;
         }
-        this.r = c.CONNECTING;
-        g();
-        b();
-        for (d dVar : this.g) {
-            m.checkNotNullExpressionValue(dVar, "it");
-            dVar.i();
+        a aVar = (a) obj;
+        return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f208c, aVar.f208c) && this.d == aVar.d && m.areEqual(this.e, aVar.e);
+    }
+
+    public int hashCode() {
+        String str = this.a;
+        int i = 0;
+        int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.b) * 31;
+        String str2 = this.f208c;
+        int hashCode2 = (((hashCode + (str2 != null ? str2.hashCode() : 0)) * 31) + this.d) * 31;
+        Integer num = this.e;
+        if (num != null) {
+            i = num.hashCode();
         }
-        return true;
+        return hashCode2 + i;
     }
 
-    public final void g() {
-        StringBuilder L = c.d.b.a.a.L("[CONNECT] ");
-        L.append(this.u);
-        j(L.toString());
-        if (this.i != null) {
-            this.f214x.e(this.t, "Connect called with already existing websocket", null, null);
-            c(f.i);
-            return;
-        }
-        this.q = Long.valueOf(this.f216z.currentTimeMillis());
-        TimerTask timerTask = this.p;
-        if (timerTask != null) {
-            timerTask.cancel();
-        }
-        g gVar = new g(this);
-        this.p = gVar;
-        this.e.schedule(gVar, 20000);
-        x.a aVar = new x.a();
-        aVar.a(1, TimeUnit.MINUTES);
-        SSLSocketFactory sSLSocketFactory = this.w;
-        if (sSLSocketFactory != null) {
-            h.a aVar2 = f0.f0.k.h.f2731c;
-            aVar.b(sSLSocketFactory, f0.f0.k.h.a.n());
-        }
-        String D = c.d.b.a.a.D(new StringBuilder(), this.u, "?v=5");
-        j("attempting WSS connection with " + D);
-        x xVar = new x(aVar);
-        z.a aVar3 = new z.a();
-        aVar3.f(D);
-        this.i = xVar.g(aVar3.a(), this);
-    }
-
-    public final void h(boolean z2, Integer num, String str) {
-        k("[DISCONNECT] (" + z2 + ", " + num + ", " + str + ')');
-        c(null);
-        this.j = null;
-        this.k = null;
-        this.f213s = false;
-        this.r = c.DISCONNECTED;
-        b();
-        for (d dVar : this.g) {
-            m.checkNotNullExpressionValue(dVar, "it");
-            dVar.b(z2, num, str);
-        }
-    }
-
-    public final void i(long j2, String str, boolean z2) {
-        m.checkNotNullParameter(str, "reason");
-        b();
-        if (this.i != null) {
-            j("Performing an immediate heartbeat on existing socket: " + str);
-            this.n.cancel();
-            b bVar = new b(this);
-            this.n = bVar;
-            this.e.schedule(bVar, j2);
-        } else if (!z2) {
-            j("Immediate heartbeat requested, but is disconnected and a reset was not requested: " + str);
-        } else if (this.f.isPending() && this.i == null) {
-            j("Connection backoff reset Immediate heartbeat when socket was disconnected.");
-            this.f.succeed();
-            m(false, 4802, "Reset backoff.");
-        }
-    }
-
-    public final void j(String str) {
-        Logger.i$default(this.f214x, this.t, str, null, 4, null);
-    }
-
-    public final void k(String str) {
-        Logger.w$default(this.f214x, this.t, str, null, 4, null);
-    }
-
-    public final void l() {
-        if (this.m) {
-            this.m = false;
-            o(3, String.valueOf(this.f216z.currentTimeMillis()));
-            Long l2 = this.l;
-            if (l2 != null) {
-                b bVar = new b(this);
-                this.n = bVar;
-                this.e.schedule(bVar, l2.longValue());
-                return;
-            }
-            k("onHeartbeatInterval called when heartbeatInterval was null");
-            return;
-        }
-        c(d.i);
-        String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) this.f.fail(new e(this))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)");
-        k("[ACK TIMEOUT] reconnecting in " + H + " seconds.");
-    }
-
-    public final void m(boolean z2, Integer num, String str) {
-        j("[RECONNECT] wasFatal=" + z2 + " code=" + num + " reason=" + str);
-        c(l.i);
-        this.r = c.RECONNECTING;
-        g();
-    }
-
-    /* JADX WARN: Multi-variable type inference failed */
-    /* JADX WARNING: Unknown variable types count: 1 */
-    public final Future<?> n(Function0<Unit> function0) {
-        c.a.r.c cVar = this.f215y;
-        if (function0 != null) {
-            function0 = new f(function0);
-        }
-        return cVar.submit((Runnable) function0);
-    }
-
-    public final void o(int i2, Object obj) {
-        WebSocket webSocket = this.i;
-        if (webSocket == null) {
-            StringBuilder L = c.d.b.a.a.L("opcode() websocket null. opcode: ");
-            L.append(Opcodes.INSTANCE.getNameOf(i2));
-            this.f214x.e(this.t, L.toString(), null, null);
-            return;
-        }
-        try {
-            String m = this.d.m(new Payloads.Outgoing(i2, obj));
-            Logger logger = this.f214x;
-            String str = this.t;
-            Logger.d$default(logger, str, "sending (" + Opcodes.INSTANCE.getNameOf(i2) + "): " + m, null, 4, null);
-            m.checkNotNullExpressionValue(m, "json");
-            webSocket.a(m);
-        } catch (Exception unused) {
-            Logger logger2 = this.f214x;
-            String str2 = this.t;
-            Logger.w$default(logger2, str2, "exception sending opcode: " + i2 + " and payload: " + obj, null, 4, null);
-        }
-    }
-
-    @Override // okhttp3.WebSocketListener
-    public void onClosed(WebSocket webSocket, int i2, String str) {
-        m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
-        super.onClosed(webSocket, i2, str);
-        n(new h(this, webSocket, i2, str));
-    }
-
-    @Override // okhttp3.WebSocketListener
-    public void onClosing(WebSocket webSocket, int i2, String str) {
-        m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "reason");
-        ((f0.f0.n.d) webSocket).e(i2, str);
-    }
-
-    @Override // okhttp3.WebSocketListener
-    public void onFailure(WebSocket webSocket, Throwable th, Response response) {
-        m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(th, "t");
-        super.onFailure(webSocket, th, response);
-        n(new i(this, webSocket, th));
-    }
-
-    @Override // okhttp3.WebSocketListener
-    public void onMessage(WebSocket webSocket, String str) {
-        m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(str, "text");
-        Object g2 = this.d.g(str, Payloads.Incoming.class);
-        super.onMessage(webSocket, str);
-        n(new j(this, webSocket, (Payloads.Incoming) c.i.a.f.e.o.c.q0(Payloads.Incoming.class).cast(g2)));
-    }
-
-    @Override // okhttp3.WebSocketListener
-    public void onOpen(WebSocket webSocket, Response response) {
-        m.checkNotNullParameter(webSocket, "webSocket");
-        m.checkNotNullParameter(response, "response");
-        super.onOpen(webSocket, response);
-        n(new k(this, webSocket));
+    public String toString() {
+        StringBuilder L = c.d.b.a.a.L("Codec(name=");
+        L.append(this.a);
+        L.append(", priority=");
+        L.append(this.b);
+        L.append(", type=");
+        L.append(this.f208c);
+        L.append(", payloadType=");
+        L.append(this.d);
+        L.append(", rtxPayloadType=");
+        return c.d.b.a.a.B(L, this.e, ")");
     }
 }
diff --git a/app/src/main/java/c/a/r/k0/b.java b/app/src/main/java/c/a/r/k0/b.java
index 8cab7781b4..6ec00266b3 100644
--- a/app/src/main/java/c/a/r/k0/b.java
+++ b/app/src/main/java/c/a/r/k0/b.java
@@ -1,40 +1,288 @@
 package c.a.r.k0;
 
-import d0.z.d.o;
-import java.util.TimerTask;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-/* compiled from: RtcControlSocket.kt */
-public final class b extends TimerTask {
-    public final /* synthetic */ a i;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.media.AudioFormat;
+import android.media.AudioPlaybackCaptureConfiguration;
+import android.media.AudioRecord;
+import android.media.projection.MediaProjection;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import androidx.annotation.RequiresApi;
+import co.discord.media_engine.NativeCapturerObserver;
+import co.discord.media_engine.SoundshareAudioSource;
+import com.discord.rtcconnection.mediaengine.ThumbnailEmitter;
+import com.discord.utilities.display.DisplayUtils;
+import com.discord.utilities.logging.Logger;
+import d0.z.d.m;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import org.webrtc.CapturerObserver;
+import org.webrtc.JniCommon;
+import org.webrtc.ScreenCapturerAndroid;
+import org.webrtc.SurfaceTextureHelper;
+import org.webrtc.TimestampAligner;
+import org.webrtc.VideoFrame;
+import rx.Observable;
+import rx.Subscription;
+import rx.functions.Action1;
+/* compiled from: ScreenCapturer.kt */
+public final class b extends ScreenCapturerAndroid {
+    public static final a i = new a(null);
+    public final RunnableC0035b j = new RunnableC0035b();
+    public NativeCapturerObserver k;
+    public SurfaceTextureHelper l;
+    public Context m;
+    public final SoundshareAudioSource n = new SoundshareAudioSource();
+    public int o;
+    public int p;
+    public Long q;
+    public final Rect r = new Rect();
 
-    /* compiled from: RtcControlSocket.kt */
-    public static final class a extends o implements Function0<Unit> {
-        public final /* synthetic */ b this$0;
+    /* renamed from: s  reason: collision with root package name */
+    public final Rect f209s = new Rect();
+    public final Point t = new Point();
+    public int u;
+    public Subscription v;
+    public final Logger w;
 
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public a(b bVar) {
-            super(0);
-            this.this$0 = bVar;
-        }
+    /* renamed from: x  reason: collision with root package name */
+    public final ThumbnailEmitter f210x;
 
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public Unit mo1invoke() {
-            a aVar = this.this$0.i;
-            int i = a.a;
-            aVar.l();
-            return Unit.a;
+    /* compiled from: ScreenCapturer.kt */
+    public static final class a {
+        public a(DefaultConstructorMarker defaultConstructorMarker) {
         }
     }
 
-    public b(a aVar) {
-        this.i = aVar;
+    /* compiled from: ScreenCapturer.kt */
+    /* renamed from: c.a.r.k0.b$b  reason: collision with other inner class name */
+    public final class RunnableC0035b implements Runnable {
+        public RunnableC0035b() {
+        }
+
+        @Override // java.lang.Runnable
+        public void run() {
+            b bVar = b.this;
+            if (bVar.o > 0) {
+                Long l = bVar.q;
+                if (l != null) {
+                    long rtcTimeNanos = TimestampAligner.getRtcTimeNanos() - l.longValue();
+                    b bVar2 = b.this;
+                    if (rtcTimeNanos > ((long) bVar2.p)) {
+                        NativeCapturerObserver nativeCapturerObserver = bVar2.k;
+                        if (nativeCapturerObserver == null) {
+                            m.throwUninitializedPropertyAccessException("nativeObserver");
+                        }
+                        nativeCapturerObserver.repeatLastFrame();
+                    }
+                }
+                b.this.c();
+            }
+        }
     }
 
-    @Override // java.util.TimerTask, java.lang.Runnable
-    public void run() {
-        this.i.n(new a(this));
+    /* compiled from: ScreenCapturer.kt */
+    public static final class c<T> implements Action1<Long> {
+        public final /* synthetic */ b i;
+
+        public c(b bVar) {
+            this.i = bVar;
+        }
+
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // rx.functions.Action1
+        public void call(Long l) {
+            this.i.j.run();
+        }
+    }
+
+    /* compiled from: ScreenCapturer.kt */
+    public static final class d<T> implements Action1<Throwable> {
+        public static final d i = new d();
+
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // rx.functions.Action1
+        public void call(Throwable th) {
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public b(Intent intent, MediaProjection.Callback callback, Logger logger, ThumbnailEmitter thumbnailEmitter) {
+        super(intent, callback);
+        m.checkNotNullParameter(intent, "mediaProjectionPermissionResultData");
+        m.checkNotNullParameter(callback, "mediaProjectionCallback");
+        m.checkNotNullParameter(logger, "logger");
+        this.w = logger;
+        this.f210x = thumbnailEmitter;
+    }
+
+    public final synchronized void a(Rect rect, int i2) {
+        m.checkNotNullParameter(rect, "measuredSize");
+        int max = Math.max(rect.width(), rect.height());
+        if (max > 0) {
+            float f = ((float) i2) / ((float) max);
+            this.t.set((int) (((float) rect.width()) * f), (int) (((float) rect.height()) * f));
+            Point point = this.t;
+            int i3 = point.x;
+            int i4 = i3 % 16;
+            if (i4 >= 8) {
+                i3 += 16;
+            }
+            int i5 = i3 - i4;
+            int i6 = point.y;
+            int i7 = i6 % 16;
+            if (i7 >= 8) {
+                i6 += 16;
+            }
+            point.set(i5, i6 - i7);
+            Point point2 = this.t;
+            super.changeCaptureFormat(point2.x, point2.y, this.o);
+        }
+    }
+
+    @RequiresApi(29)
+    public final AudioRecord b() {
+        MediaProjection mediaProjection = this.mediaProjection;
+        if (mediaProjection == null) {
+            return null;
+        }
+        AudioPlaybackCaptureConfiguration build = new AudioPlaybackCaptureConfiguration.Builder(mediaProjection).addMatchingUsage(1).addMatchingUsage(14).addMatchingUsage(0).build();
+        m.checkNotNullExpressionValue(build, "AudioPlaybackCaptureConf…KNOWN)\n          .build()");
+        try {
+            return new AudioRecord.Builder().setAudioFormat(new AudioFormat.Builder().setEncoding(2).setSampleRate(44100).setChannelMask(16).build()).setAudioPlaybackCaptureConfig(build).build();
+        } catch (SecurityException unused) {
+            Log.w(b.class.getName(), "Failed to record audio");
+            return null;
+        }
+    }
+
+    public final void c() {
+        if (this.o > 0) {
+            Subscription subscription = this.v;
+            if (subscription != null) {
+                subscription.unsubscribe();
+            }
+            Observable<Long> d02 = Observable.d0(((long) this.p) / 1000000, TimeUnit.MILLISECONDS);
+            SurfaceTextureHelper surfaceTextureHelper = this.l;
+            if (surfaceTextureHelper == null) {
+                m.throwUninitializedPropertyAccessException("surfaceTextureHelper");
+            }
+            Handler handler = surfaceTextureHelper.getHandler();
+            m.checkNotNullExpressionValue(handler, "surfaceTextureHelper.handler");
+            Looper looper = handler.getLooper();
+            AtomicReference<j0.j.b.a> atomicReference = j0.j.b.a.a;
+            Objects.requireNonNull(looper, "looper == null");
+            this.v = d02.X(new j0.j.b.b(looper)).W(new c(this), d.i);
+        }
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
+    public synchronized void changeCaptureFormat(int i2, int i3, int i4) {
+        a(this.r, Math.max(i2, i3));
+        d(i4);
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid
+    public void createVirtualDisplay() {
+        try {
+            super.createVirtualDisplay();
+        } catch (Throwable th) {
+            Logger.e$default(this.w, "ScreenCapturer", "error in createVirtualDisplay", th, null, 8, null);
+        }
+    }
+
+    public final void d(int i2) {
+        if (i2 <= 0) {
+            this.o = 0;
+            this.p = 0;
+            return;
+        }
+        this.o = i2;
+        this.p = 1000000000 / Math.max(10, i2 / 2);
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
+    public void dispose() {
+        stopCapture();
+        ThumbnailEmitter thumbnailEmitter = this.f210x;
+        if (thumbnailEmitter != null) {
+            synchronized (thumbnailEmitter) {
+                thumbnailEmitter.d.release();
+                thumbnailEmitter.f2099c.release();
+                JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b);
+                thumbnailEmitter.a = Long.MAX_VALUE;
+            }
+        }
+        this.n.release();
+        super.dispose();
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
+    public synchronized void initialize(SurfaceTextureHelper surfaceTextureHelper, Context context, CapturerObserver capturerObserver) {
+        m.checkNotNullParameter(surfaceTextureHelper, "surfaceTextureHelper");
+        m.checkNotNullParameter(context, "applicationContext");
+        m.checkNotNullParameter(capturerObserver, "capturerObserver");
+        this.l = surfaceTextureHelper;
+        this.m = context;
+        this.k = (NativeCapturerObserver) capturerObserver;
+        super.initialize(surfaceTextureHelper, context, capturerObserver);
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoSink
+    public void onFrame(VideoFrame videoFrame) {
+        Rect rect = this.f209s;
+        Context context = this.m;
+        if (context == null) {
+            m.throwUninitializedPropertyAccessException("context");
+        }
+        rect.set(DisplayUtils.getScreenSize(context));
+        if (!m.areEqual(this.f209s, this.r)) {
+            this.r.set(this.f209s);
+            a(this.f209s, this.u);
+        }
+        this.q = Long.valueOf(videoFrame.getTimestampNs());
+        ThumbnailEmitter thumbnailEmitter = this.f210x;
+        if (thumbnailEmitter != null) {
+            synchronized (thumbnailEmitter) {
+                m.checkNotNullParameter(videoFrame, "frame");
+                long currentTimeMillis = thumbnailEmitter.k.currentTimeMillis() - thumbnailEmitter.e;
+                long timestampNs = videoFrame.getTimestampNs() - thumbnailEmitter.a;
+                if (currentTimeMillis > thumbnailEmitter.j) {
+                    long j = (long) 1000;
+                    if (timestampNs > thumbnailEmitter.i * j * j) {
+                        thumbnailEmitter.a = videoFrame.getTimestampNs();
+                        thumbnailEmitter.l.invoke(thumbnailEmitter.a(videoFrame));
+                    }
+                }
+            }
+        }
+        super.onFrame(videoFrame);
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
+    public synchronized void startCapture(int i2, int i3, int i4) {
+        AudioRecord b;
+        super.startCapture(i2, i3, i4);
+        this.u = Math.max(i2, i3);
+        d(i4);
+        if (Build.VERSION.SDK_INT >= 29 && (b = b()) != null) {
+            this.n.startRecording(b);
+        }
+        c();
+    }
+
+    @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer
+    public synchronized void stopCapture() {
+        super.stopCapture();
+        this.n.stopRecording();
+        this.o = 0;
+        this.q = null;
     }
 }
diff --git a/app/src/main/java/c/a/r/k0/c.java b/app/src/main/java/c/a/r/k0/c.java
deleted file mode 100644
index 275c70f6d6..0000000000
--- a/app/src/main/java/c/a/r/k0/c.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package c.a.r.k0;
-
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-/* compiled from: RtcControlSocket.kt */
-public final class c extends o implements Function0<Unit> {
-    public final /* synthetic */ Integer $code;
-    public final /* synthetic */ String $reason;
-    public final /* synthetic */ boolean $wasFatal;
-    public final /* synthetic */ a this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public c(a aVar, boolean z2, Integer num, String str) {
-        super(0);
-        this.this$0 = aVar;
-        this.$wasFatal = z2;
-        this.$code = num;
-        this.$reason = str;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    @Override // kotlin.jvm.functions.Function0
-    /* renamed from: invoke */
-    public Unit mo1invoke() {
-        a aVar = this.this$0;
-        boolean z2 = this.$wasFatal;
-        Integer num = this.$code;
-        String str = this.$reason;
-        int i = a.a;
-        aVar.m(z2, num, str);
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/r/j0/c/a.java b/app/src/main/java/c/a/r/k0/c/a.java
similarity index 98%
rename from app/src/main/java/c/a/r/j0/c/a.java
rename to app/src/main/java/c/a/r/k0/c/a.java
index a4081402ea..324bdf2faf 100644
--- a/app/src/main/java/c/a/r/j0/c/a.java
+++ b/app/src/main/java/c/a/r/k0/c/a.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import d0.z.d.m;
diff --git a/app/src/main/java/c/a/r/j0/c/b.java b/app/src/main/java/c/a/r/k0/c/b.java
similarity index 98%
rename from app/src/main/java/c/a/r/j0/c/b.java
rename to app/src/main/java/c/a/r/k0/c/b.java
index 336982dbb7..df7006481f 100644
--- a/app/src/main/java/c/a/r/j0/c/b.java
+++ b/app/src/main/java/c/a/r/k0/c/b.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import co.discord.media_engine.Connection;
 import d0.z.d.m;
diff --git a/app/src/main/java/c/a/r/j0/c/c.java b/app/src/main/java/c/a/r/k0/c/c.java
similarity index 98%
rename from app/src/main/java/c/a/r/j0/c/c.java
rename to app/src/main/java/c/a/r/k0/c/c.java
index 1035135d9e..0dae4dd559 100644
--- a/app/src/main/java/c/a/r/j0/c/c.java
+++ b/app/src/main/java/c/a/r/k0/c/c.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import co.discord.media_engine.Connection;
 import d0.z.d.o;
diff --git a/app/src/main/java/c/a/r/j0/c/d.java b/app/src/main/java/c/a/r/k0/c/d.java
similarity index 96%
rename from app/src/main/java/c/a/r/j0/c/d.java
rename to app/src/main/java/c/a/r/k0/c/d.java
index 5e7d08ea7d..4f4c3a8d2f 100644
--- a/app/src/main/java/c/a/r/j0/c/d.java
+++ b/app/src/main/java/c/a/r/k0/c/d.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import com.discord.utilities.logging.Logger;
@@ -49,9 +49,9 @@ public final class d implements Discord.ConnectToServerCallback {
                     m.checkNotNullExpressionValue(upperCase, "(this as java.lang.String).toUpperCase()");
                     MediaEngineConnection.TransportInfo transportInfo = new MediaEngineConnection.TransportInfo(str3, i, MediaEngineConnection.TransportInfo.Protocol.valueOf(upperCase));
                     MediaEngineConnection.ConnectionState connectionState = MediaEngineConnection.ConnectionState.CONNECTED;
-                    eVar.f210c = connectionState;
+                    eVar.f211c = connectionState;
                     eVar.y(new a(eVar, connectionState));
-                    c.a.r.j0.a aVar = new c.a.r.j0.a("opus", 1, "audio", 120, null);
+                    c.a.r.k0.a aVar = new c.a.r.k0.a("opus", 1, "audio", 120, null);
                     eVar.j.clear();
                     eVar.j.add(aVar);
                     eVar.j.addAll(eVar.p);
diff --git a/app/src/main/java/c/a/r/j0/c/e.java b/app/src/main/java/c/a/r/k0/c/e.java
similarity index 97%
rename from app/src/main/java/c/a/r/j0/c/e.java
rename to app/src/main/java/c/a/r/k0/c/e.java
index a000965cb3..f1d78801b3 100644
--- a/app/src/main/java/c/a/r/j0/c/e.java
+++ b/app/src/main/java/c/a/r/k0/c/e.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import android.content.Intent;
 import android.media.projection.MediaProjection;
@@ -36,20 +36,20 @@ public final class e implements MediaEngineConnection {
     public final CopyOnWriteArrayList<MediaEngineConnection.c> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public MediaEngineConnection.ConnectionState f210c;
+    public MediaEngineConnection.ConnectionState f211c;
     public boolean d;
     public final Map<Long, Integer> e;
     public final Map<Long, Integer> f = new LinkedHashMap();
     public final Set<Long> g = new LinkedHashSet();
     public final Set<Long> h = new LinkedHashSet();
     public final Set<Long> i = new LinkedHashSet();
-    public final List<c.a.r.j0.a> j = new ArrayList();
+    public final List<c.a.r.k0.a> j = new ArrayList();
     public final Connection k;
     public final c.a.r.c l;
     public final Logger m;
     public final r n;
     public final Discord o;
-    public final List<c.a.r.j0.a> p;
+    public final List<c.a.r.k0.a> p;
     public final MediaEngineConnection.Type q;
     public final long r;
 
@@ -155,7 +155,7 @@ public final class e implements MediaEngineConnection {
     }
 
     /* compiled from: MediaEngineConnectionLegacy.kt */
-    /* renamed from: c.a.r.j0.c.e$e  reason: collision with other inner class name */
+    /* renamed from: c.a.r.k0.c.e$e  reason: collision with other inner class name */
     public static final class C0036e extends d0.z.d.o implements Function1<MediaEngineConnection.c, Unit> {
         public final /* synthetic */ KrispOveruseDetector.Status $status;
         public final /* synthetic */ e this$0;
@@ -291,7 +291,7 @@ public final class e implements MediaEngineConnection {
             Connection connection2 = connection;
             d0.z.d.m.checkNotNullParameter(connection2, "$receiver");
             connection2.setVADLeadingFramesToBuffer(this.$inputModeOptions.b);
-            connection2.setVADTrailingFramesToSend(this.$inputModeOptions.f2092c);
+            connection2.setVADTrailingFramesToSend(this.$inputModeOptions.f2098c);
             connection2.setVADTriggerThreshold((float) this.$inputModeOptions.a);
             connection2.setVADAutoThreshold(this.$inputModeOptions.d ? 3 : -1);
             connection2.setVADUseKrisp(this.$inputModeOptions.e);
@@ -434,7 +434,7 @@ public final class e implements MediaEngineConnection {
             Connection connection2 = connection;
             d0.z.d.m.checkNotNullParameter(connection2, "$receiver");
             MediaEngineConnection.a aVar = this.$quality;
-            connection2.setEncodingQuality(aVar.a, aVar.b, aVar.f2091c, aVar.d, this.$framerate);
+            connection2.setEncodingQuality(aVar.a, aVar.b, aVar.f2097c, aVar.d, this.$framerate);
             return Unit.a;
         }
     }
@@ -504,10 +504,10 @@ public final class e implements MediaEngineConnection {
 
     /* compiled from: MediaEngineConnectionLegacy.kt */
     public static final class t extends d0.z.d.o implements Function1<Connection, Unit> {
-        public final /* synthetic */ c.a.r.j0.b $screenCapturer;
+        public final /* synthetic */ c.a.r.k0.b $screenCapturer;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public t(c.a.r.j0.b bVar) {
+        public t(c.a.r.k0.b bVar) {
             super(1);
             this.$screenCapturer = bVar;
         }
@@ -518,7 +518,7 @@ public final class e implements MediaEngineConnection {
         public Unit invoke(Connection connection) {
             Connection connection2 = connection;
             d0.z.d.m.checkNotNullParameter(connection2, "$receiver");
-            c.a.r.j0.b bVar = this.$screenCapturer;
+            c.a.r.k0.b bVar = this.$screenCapturer;
             connection2.startScreenshareBroadcast(bVar, bVar.n.getNativeInstance());
             return Unit.a;
         }
@@ -550,7 +550,7 @@ public final class e implements MediaEngineConnection {
         }
     }
 
-    public e(c.a.r.c cVar, Logger logger, r rVar, Discord discord, List<c.a.r.j0.a> list, MediaEngineConnection.Type type, long j2, MediaEngine.a aVar, List<? extends MediaEngineConnection.c> list2) {
+    public e(c.a.r.c cVar, Logger logger, r rVar, Discord discord, List<c.a.r.k0.a> list, MediaEngineConnection.Type type, long j2, MediaEngine.a aVar, List<? extends MediaEngineConnection.c> list2) {
         d0.z.d.m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor");
         d0.z.d.m.checkNotNullParameter(logger, "logger");
         d0.z.d.m.checkNotNullParameter(rVar, "noiseCancellationConfig");
@@ -567,15 +567,15 @@ public final class e implements MediaEngineConnection {
         this.q = type;
         this.r = j2;
         MediaEngineConnection.ConnectionState connectionState = MediaEngineConnection.ConnectionState.CONNECTING;
-        this.f210c = connectionState;
+        this.f211c = connectionState;
         this.e = h0.mutableMapOf(d0.o.to(Long.valueOf(j2), Integer.valueOf(aVar.a)));
-        Connection connectToServer = discord.connectToServer(aVar.a, j2, aVar.b, aVar.f2089c, type == MediaEngineConnection.Type.STREAM, new d(this));
+        Connection connectToServer = discord.connectToServer(aVar.a, j2, aVar.b, aVar.f2095c, type == MediaEngineConnection.Type.STREAM, new d(this));
         d0.z.d.m.checkNotNullExpressionValue(connectToServer, "voiceEngineLegacy.connec…fo, errorMessage) }\n    }");
         connectToServer.setOnVideoCallback(new b(this));
         connectToServer.setUserSpeakingStatusChangedCallback(new c(this));
         this.k = connectToServer;
         this.b = new CopyOnWriteArrayList<>(list2);
-        this.f210c = connectionState;
+        this.f211c = connectionState;
         y(new a(this, connectionState));
     }
 
@@ -587,7 +587,7 @@ public final class e implements MediaEngineConnection {
     @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection
     public synchronized void a(Intent intent, ThumbnailEmitter thumbnailEmitter) {
         d0.z.d.m.checkNotNullParameter(intent, "permission");
-        z(new t(new c.a.r.j0.b(intent, new u(), this.m, thumbnailEmitter)));
+        z(new t(new c.a.r.k0.b(intent, new u(), this.m, thumbnailEmitter)));
     }
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection
@@ -673,7 +673,7 @@ public final class e implements MediaEngineConnection {
     public void l(MediaEngineConnection.c cVar) {
         d0.z.d.m.checkNotNullParameter(cVar, "listener");
         this.b.add(cVar);
-        cVar.onConnectionStateChange(this, this.f210c);
+        cVar.onConnectionStateChange(this, this.f211c);
     }
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection
@@ -718,23 +718,23 @@ public final class e implements MediaEngineConnection {
                 break;
             }
             obj2 = it.next();
-            if (d0.z.d.m.areEqual(((c.a.r.j0.a) obj2).a, str)) {
+            if (d0.z.d.m.areEqual(((c.a.r.k0.a) obj2).a, str)) {
                 break;
             }
         }
-        c.a.r.j0.a aVar = (c.a.r.j0.a) obj2;
+        c.a.r.k0.a aVar = (c.a.r.k0.a) obj2;
         Iterator<T> it2 = this.j.iterator();
         while (true) {
             if (!it2.hasNext()) {
                 break;
             }
             Object next = it2.next();
-            if (d0.z.d.m.areEqual(((c.a.r.j0.a) next).a, str2)) {
+            if (d0.z.d.m.areEqual(((c.a.r.k0.a) next).a, str2)) {
                 obj = next;
                 break;
             }
         }
-        c.a.r.j0.a aVar2 = (c.a.r.j0.a) obj;
+        c.a.r.k0.a aVar2 = (c.a.r.k0.a) obj;
         if (aVar == null) {
             throw new MediaEngineConnection.FailedConnectionException("Missing audio codec: " + str + '.', MediaEngineConnection.FailedConnectionException.FailureType.CODEC_NEGOTIATION_FAILED);
         } else if (aVar2 != null) {
diff --git a/app/src/main/java/c/a/r/j0/c/f.java b/app/src/main/java/c/a/r/k0/c/f.java
similarity index 95%
rename from app/src/main/java/c/a/r/j0/c/f.java
rename to app/src/main/java/c/a/r/k0/c/f.java
index 410449a02e..29e5a5f9dd 100644
--- a/app/src/main/java/c/a/r/j0/c/f.java
+++ b/app/src/main/java/c/a/r/k0/c/f.java
@@ -1,6 +1,6 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
-import c.a.r.j0.c.e;
+import c.a.r.k0.c.e;
 import co.discord.media_engine.Connection;
 import co.discord.media_engine.Stats;
 import com.discord.utilities.logging.Logger;
diff --git a/app/src/main/java/c/a/r/j0/c/g.java b/app/src/main/java/c/a/r/k0/c/g.java
similarity index 98%
rename from app/src/main/java/c/a/r/j0/c/g.java
rename to app/src/main/java/c/a/r/k0/c/g.java
index e758835890..9d82ae18c2 100644
--- a/app/src/main/java/c/a/r/j0/c/g.java
+++ b/app/src/main/java/c/a/r/k0/c/g.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import d0.z.d.m;
diff --git a/app/src/main/java/c/a/r/j0/c/h.java b/app/src/main/java/c/a/r/k0/c/h.java
similarity index 98%
rename from app/src/main/java/c/a/r/j0/c/h.java
rename to app/src/main/java/c/a/r/k0/c/h.java
index 85f9203f44..81084a3bdc 100644
--- a/app/src/main/java/c/a/r/j0/c/h.java
+++ b/app/src/main/java/c/a/r/k0/c/h.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import d0.g0.s;
diff --git a/app/src/main/java/c/a/r/j0/c/i.java b/app/src/main/java/c/a/r/k0/c/i.java
similarity index 95%
rename from app/src/main/java/c/a/r/j0/c/i.java
rename to app/src/main/java/c/a/r/k0/c/i.java
index e2435dcccf..2fbe4ec592 100644
--- a/app/src/main/java/c/a/r/j0/c/i.java
+++ b/app/src/main/java/c/a/r/k0/c/i.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import d0.z.d.m;
 import kotlin.jvm.functions.Function0;
diff --git a/app/src/main/java/c/a/r/j0/c/j.java b/app/src/main/java/c/a/r/k0/c/j.java
similarity index 95%
rename from app/src/main/java/c/a/r/j0/c/j.java
rename to app/src/main/java/c/a/r/k0/c/j.java
index edd71ce1e7..4cc9c0072d 100644
--- a/app/src/main/java/c/a/r/j0/c/j.java
+++ b/app/src/main/java/c/a/r/k0/c/j.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import android.content.Context;
 import android.os.Build;
@@ -33,12 +33,12 @@ public final class j implements MediaEngine {
     public static final Set<String> b = n0.setOf((Object[]) new String[]{"Redmi Note 8 Pro", "Redmi Note 8 pro"});
 
     /* renamed from: c  reason: collision with root package name */
-    public final r f211c;
+    public final r f212c;
     public final List<MediaEngineConnection> d;
     public final List<MediaEngine.b> e;
     public boolean f;
     public Discord g;
-    public List<c.a.r.j0.a> h;
+    public List<c.a.r.k0.a> h;
     public MediaEngine.OpenSLUsageMode i;
     public final Context j;
     public final c.a.r.c k;
@@ -52,7 +52,7 @@ public final class j implements MediaEngine {
         public final /* synthetic */ j a;
 
         /* compiled from: MediaEngineLegacy.kt */
-        /* renamed from: c.a.r.j0.c.j$a$a  reason: collision with other inner class name */
+        /* renamed from: c.a.r.k0.c.j$a$a  reason: collision with other inner class name */
         public static final class C0037a extends o implements Function0<Unit> {
             public final /* synthetic */ MediaEngineConnection $connection;
             public final /* synthetic */ a this$0;
@@ -120,7 +120,7 @@ public final class j implements MediaEngine {
         }
 
         @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c
-        public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List<c.a.r.j0.a> list) {
+        public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List<c.a.r.k0.a> list) {
             m.checkNotNullParameter(mediaEngineConnection, "connection");
             m.checkNotNullParameter(transportInfo, "transportInfo");
             m.checkNotNullParameter(list, "supportedVideoCodecs");
@@ -212,7 +212,7 @@ public final class j implements MediaEngine {
     }
 
     /* compiled from: MediaEngineLegacy.kt */
-    public static final class d<T> implements Action1<List<? extends c.a.r.j0.a>> {
+    public static final class d<T> implements Action1<List<? extends c.a.r.k0.a>> {
         public final /* synthetic */ j i;
 
         public d(j jVar) {
@@ -220,11 +220,11 @@ public final class j implements MediaEngine {
         }
 
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends c.a.r.j0.a> */
+        /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends c.a.r.k0.a> */
         /* JADX WARN: Multi-variable type inference failed */
         @Override // rx.functions.Action1
-        public void call(List<? extends c.a.r.j0.a> list) {
-            List<? extends c.a.r.j0.a> list2 = list;
+        public void call(List<? extends c.a.r.k0.a> list) {
+            List<? extends c.a.r.k0.a> list2 = list;
             j jVar = this.i;
             m.checkNotNullExpressionValue(list2, "codecs");
             jVar.h = list2;
@@ -232,13 +232,13 @@ public final class j implements MediaEngine {
     }
 
     /* compiled from: MediaEngineLegacy.kt */
-    public static final class e<T, R> implements j0.k.b<List<? extends c.a.r.j0.a>, Unit> {
+    public static final class e<T, R> implements j0.k.b<List<? extends c.a.r.k0.a>, Unit> {
         public static final e i = new e();
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // j0.k.b
-        public Unit call(List<? extends c.a.r.j0.a> list) {
+        public Unit call(List<? extends c.a.r.k0.a> list) {
             return Unit.a;
         }
     }
@@ -313,7 +313,7 @@ public final class j implements MediaEngine {
         this.m = logger;
         this.n = set4;
         this.o = set3;
-        this.f211c = new r();
+        this.f212c = new r();
         this.d = new ArrayList();
         this.e = new ArrayList();
         this.f = true;
@@ -344,15 +344,15 @@ public final class j implements MediaEngine {
         }
         t();
         if (this.g == null) {
-            Observable<Unit> x2 = Observable.x(new IllegalStateException("Failed to initialize native media engine"));
-            m.checkNotNullExpressionValue(x2, "Observable.error(Illegal…ze native media engine\"))");
-            return x2;
+            Observable<Unit> w = Observable.w(new IllegalStateException("Failed to initialize native media engine"));
+            m.checkNotNullExpressionValue(w, "Observable.error(Illegal…ze native media engine\"))");
+            return w;
         }
         Observable n = Observable.n(new n(this), Emitter.BackpressureMode.NONE);
         m.checkNotNullExpressionValue(n, "Observable.create({ emit…er.BackpressureMode.NONE)");
-        Observable<Unit> G = n.u(new d(this)).G(e.i);
-        m.checkNotNullExpressionValue(G, "getSupportedVideoCodecs(…s }\n        .map { Unit }");
-        return G;
+        Observable<Unit> F = n.t(new d(this)).F(e.i);
+        m.checkNotNullExpressionValue(F, "getSupportedVideoCodecs(…s }\n        .map { Unit }");
+        return F;
     }
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngine
@@ -381,7 +381,7 @@ public final class j implements MediaEngine {
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngine
     public void e(boolean z2) {
-        this.f211c.a = z2;
+        this.f212c.a = z2;
         Discord discord = this.g;
         if (discord != null) {
             discord.setNoiseCancellation(z2);
@@ -425,8 +425,8 @@ public final class j implements MediaEngine {
             a aVar2 = new a(this, aVar, type, j);
             c.a.r.c cVar = this.k;
             Logger logger2 = this.m;
-            r rVar = this.f211c;
-            List<c.a.r.j0.a> list = this.h;
+            r rVar = this.f212c;
+            List<c.a.r.k0.a> list = this.h;
             if (list == null) {
                 m.throwUninitializedPropertyAccessException("supportedVideoCodecs");
             }
diff --git a/app/src/main/java/c/a/r/j0/c/k.java b/app/src/main/java/c/a/r/k0/c/k.java
similarity index 94%
rename from app/src/main/java/c/a/r/j0/c/k.java
rename to app/src/main/java/c/a/r/k0/c/k.java
index 2782b432f8..8c96005617 100644
--- a/app/src/main/java/c/a/r/j0/c/k.java
+++ b/app/src/main/java/c/a/r/k0/c/k.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import d0.u.a;
 import d0.z.d.m;
diff --git a/app/src/main/java/c/a/r/j0/c/l.java b/app/src/main/java/c/a/r/k0/c/l.java
similarity index 97%
rename from app/src/main/java/c/a/r/j0/c/l.java
rename to app/src/main/java/c/a/r/k0/c/l.java
index 0f586e7937..decd025f12 100644
--- a/app/src/main/java/c/a/r/j0/c/l.java
+++ b/app/src/main/java/c/a/r/k0/c/l.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import com.discord.rtcconnection.mediaengine.MediaEngine;
 import com.hammerandchisel.libdiscord.Discord;
diff --git a/app/src/main/java/c/a/r/j0/c/m.java b/app/src/main/java/c/a/r/k0/c/m.java
similarity index 98%
rename from app/src/main/java/c/a/r/j0/c/m.java
rename to app/src/main/java/c/a/r/k0/c/m.java
index 3fc5066061..cb1e8d91c6 100644
--- a/app/src/main/java/c/a/r/j0/c/m.java
+++ b/app/src/main/java/c/a/r/k0/c/m.java
@@ -1,6 +1,6 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
-import c.a.r.j0.a;
+import c.a.r.k0.a;
 import com.hammerandchisel.libdiscord.Discord;
 import d0.t.n;
 import d0.t.o;
diff --git a/app/src/main/java/c/a/r/j0/c/n.java b/app/src/main/java/c/a/r/k0/c/n.java
similarity index 94%
rename from app/src/main/java/c/a/r/j0/c/n.java
rename to app/src/main/java/c/a/r/k0/c/n.java
index ec9b0fd2a5..0071b928ef 100644
--- a/app/src/main/java/c/a/r/j0/c/n.java
+++ b/app/src/main/java/c/a/r/k0/c/n.java
@@ -1,6 +1,6 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
-import c.a.r.j0.a;
+import c.a.r.k0.a;
 import com.hammerandchisel.libdiscord.Discord;
 import java.util.List;
 import rx.Emitter;
diff --git a/app/src/main/java/c/a/r/j0/c/o.java b/app/src/main/java/c/a/r/k0/c/o.java
similarity index 97%
rename from app/src/main/java/c/a/r/j0/c/o.java
rename to app/src/main/java/c/a/r/k0/c/o.java
index 36f0c4350d..db856b4dba 100644
--- a/app/src/main/java/c/a/r/j0/c/o.java
+++ b/app/src/main/java/c/a/r/k0/c/o.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import androidx.annotation.NonNull;
 import com.hammerandchisel.libdiscord.Discord;
diff --git a/app/src/main/java/c/a/r/j0/c/p.java b/app/src/main/java/c/a/r/k0/c/p.java
similarity index 97%
rename from app/src/main/java/c/a/r/j0/c/p.java
rename to app/src/main/java/c/a/r/k0/c/p.java
index 8526189b0f..18663fe843 100644
--- a/app/src/main/java/c/a/r/j0/c/p.java
+++ b/app/src/main/java/c/a/r/k0/c/p.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import androidx.annotation.NonNull;
 import co.discord.media_engine.VideoInputDeviceDescription;
diff --git a/app/src/main/java/c/a/r/j0/c/q.java b/app/src/main/java/c/a/r/k0/c/q.java
similarity index 95%
rename from app/src/main/java/c/a/r/j0/c/q.java
rename to app/src/main/java/c/a/r/k0/c/q.java
index 4312257796..bf24e5f52f 100644
--- a/app/src/main/java/c/a/r/j0/c/q.java
+++ b/app/src/main/java/c/a/r/k0/c/q.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 
 import d0.z.d.m;
 import kotlin.jvm.functions.Function0;
diff --git a/app/src/main/java/c/a/r/j0/c/r.java b/app/src/main/java/c/a/r/k0/c/r.java
similarity index 82%
rename from app/src/main/java/c/a/r/j0/c/r.java
rename to app/src/main/java/c/a/r/k0/c/r.java
index f729a0a984..9e8079b241 100644
--- a/app/src/main/java/c/a/r/j0/c/r.java
+++ b/app/src/main/java/c/a/r/k0/c/r.java
@@ -1,4 +1,4 @@
-package c.a.r.j0.c;
+package c.a.r.k0.c;
 /* compiled from: NoiseCancellationConfig.kt */
 public final class r {
     public boolean a;
diff --git a/app/src/main/java/c/a/r/k0/d.java b/app/src/main/java/c/a/r/k0/d.java
deleted file mode 100644
index 768f03a46c..0000000000
--- a/app/src/main/java/c/a/r/k0/d.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package c.a.r.k0;
-
-import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import okhttp3.WebSocket;
-/* compiled from: RtcControlSocket.kt */
-public final class d extends o implements Function1<WebSocket, Unit> {
-    public static final d i = new d();
-
-    public d() {
-        super(1);
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(WebSocket webSocket) {
-        WebSocket webSocket2 = webSocket;
-        m.checkNotNullParameter(webSocket2, "it");
-        webSocket2.e(4800, "Heartbeat timeout.");
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/r/k0/e.java b/app/src/main/java/c/a/r/k0/e.java
deleted file mode 100644
index 655b51f740..0000000000
--- a/app/src/main/java/c/a/r/k0/e.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package c.a.r.k0;
-
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-/* compiled from: RtcControlSocket.kt */
-public final class e extends o implements Function0<Unit> {
-    public final /* synthetic */ a this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public e(a aVar) {
-        super(0);
-        this.this$0 = aVar;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    @Override // kotlin.jvm.functions.Function0
-    /* renamed from: invoke */
-    public Unit mo1invoke() {
-        a aVar = this.this$0;
-        int i = a.a;
-        aVar.m(true, 4800, "Heartbeat timeout.");
-        return Unit.a;
-    }
-}
diff --git a/app/src/main/java/c/a/r/k0/f.java b/app/src/main/java/c/a/r/k0/f.java
deleted file mode 100644
index a5306bc767..0000000000
--- a/app/src/main/java/c/a/r/k0/f.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package c.a.r.k0;
-
-import d0.z.d.m;
-import kotlin.jvm.functions.Function0;
-/* compiled from: RtcControlSocket.kt */
-public final class f implements Runnable {
-    public final /* synthetic */ Function0 i;
-
-    public f(Function0 function0) {
-        this.i = function0;
-    }
-
-    @Override // java.lang.Runnable
-    public final /* synthetic */ void run() {
-        m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)");
-    }
-}
diff --git a/app/src/main/java/c/a/r/l.java b/app/src/main/java/c/a/r/l.java
index eaf9a22177..a564188e91 100644
--- a/app/src/main/java/c/a/r/l.java
+++ b/app/src/main/java/c/a/r/l.java
@@ -96,10 +96,10 @@ public final class l extends o implements Function0<Unit> {
         }
         if (arrayList2.isEmpty()) {
             this.this$0.b.remove(Long.valueOf(this.$userId));
-            this.this$0.f2072c.remove(Long.valueOf(this.$userId));
+            this.this$0.f2078c.remove(Long.valueOf(this.$userId));
         } else {
             this.this$0.b.put(Long.valueOf(this.$userId), arrayList2);
-            this.this$0.f2072c.add(Long.valueOf(this.$userId));
+            this.this$0.f2078c.add(Long.valueOf(this.$userId));
         }
         this.this$0.d(arrayList2.isEmpty() ? n.emptyList() : d0.t.m.listOf(String.valueOf(this.$userId)));
         return Unit.a;
diff --git a/app/src/main/java/c/a/r/l0/a.java b/app/src/main/java/c/a/r/l0/a.java
index 3a3e15a000..d7f872ee52 100644
--- a/app/src/main/java/c/a/r/l0/a.java
+++ b/app/src/main/java/c/a/r/l0/a.java
@@ -1,113 +1,820 @@
 package c.a.r.l0;
 
-import c.a.r.l0.e;
-import co.discord.media_engine.InboundRtpVideo;
-import co.discord.media_engine.OutboundRtpAudio;
-import co.discord.media_engine.OutboundRtpVideo;
-import co.discord.media_engine.ReceiverReport;
-import co.discord.media_engine.Stats;
-import co.discord.media_engine.Transport;
-import com.discord.rtcconnection.KrispOveruseDetector;
-import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
-import d0.z.d.k;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Process;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.rtcconnection.socket.io.Opcodes;
+import com.discord.rtcconnection.socket.io.Payloads;
+import com.discord.utilities.debug.DebugPrintBuilder;
+import com.discord.utilities.debug.DebugPrintable;
+import com.discord.utilities.logging.Logger;
+import com.discord.utilities.networking.Backoff;
+import com.discord.utilities.time.Clock;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import d0.z.d.m;
+import d0.z.d.o;
+import f0.f0.k.h;
+import f0.x;
+import f0.z;
+import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import kotlin.Pair;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSocketFactory;
 import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
-/* compiled from: RtcStatsCollector.kt */
-public final /* synthetic */ class a extends k implements Function1<Stats, Unit> {
-    public a(d dVar) {
-        super(1, dVar, d.class, "onStatsReceived", "onStatsReceived(Lco/discord/media_engine/Stats;)V", 0);
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import okhttp3.Response;
+import okhttp3.WebSocket;
+import okhttp3.WebSocketListener;
+/* compiled from: RtcControlSocket.kt */
+public final class a extends WebSocketListener implements DebugPrintable {
+    public static int i;
+    public static final Type j = new C0038a().getType();
+    public static final b k = new b(null);
+    public c A;
+    public boolean B;
+    public final String C;
+    public final String D;
+    public final SSLSocketFactory E;
+    public final Logger F;
+    public final c.a.r.c G;
+    public final Clock H;
+    public final String I;
+    public final String l;
+    public final Gson m = new c.i.d.e().a();
+    public final Timer n = new Timer();
+    public final Backoff o;
+    public final CopyOnWriteArraySet<d> p;
+    public int q;
+    public WebSocket r;
+
+    /* renamed from: s  reason: collision with root package name */
+    public String f213s;
+    public String t;
+    public Long u;
+    public boolean v;
+    public b w;
+
+    /* renamed from: x  reason: collision with root package name */
+    public Long f214x;
+
+    /* renamed from: y  reason: collision with root package name */
+    public TimerTask f215y;
+
+    /* renamed from: z  reason: collision with root package name */
+    public Long f216z;
+
+    /* compiled from: RtcControlSocket.kt */
+    /* renamed from: c.a.r.l0.a$a  reason: collision with other inner class name */
+    public static final class C0038a extends TypeToken<Map<String, ? extends Integer>> {
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public Unit invoke(Stats stats) {
-        OutboundRtpVideo outboundRtpVideo;
-        ReceiverReport[] receiverReports;
-        Stats stats2 = stats;
-        m.checkNotNullParameter(stats2, "p1");
-        d dVar = (d) this.receiver;
-        dVar.a.add(stats2);
-        if (dVar.a.size() > dVar.i) {
-            dVar.a.removeFirst();
+    /* compiled from: RtcControlSocket.kt */
+    public static final class b {
+        public b(DefaultConstructorMarker defaultConstructorMarker) {
         }
-        dVar.f.update(stats2);
-        e eVar = dVar.g;
-        Objects.requireNonNull(eVar);
-        m.checkNotNullParameter(stats2, "stats");
-        long currentTimeMillis = eVar.l.currentTimeMillis();
-        Transport transport = stats2.getTransport();
-        Integer valueOf = Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length);
-        if (valueOf != null) {
-            eVar.g.b(valueOf.intValue() == 0, currentTimeMillis);
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public enum c {
+        DISCONNECTED,
+        CONNECTING,
+        IDENTIFYING,
+        RESUMING,
+        CONNECTED,
+        RECONNECTING
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public interface d {
+        void a(String str, String str2);
+
+        void b(boolean z2, Integer num, String str);
+
+        void c(String str, List<Integer> list);
+
+        void d(String str);
+
+        void e(long j, int i, int i2, List<Payloads.Stream> list);
+
+        void f(Map<String, Integer> map);
+
+        void g(long j);
+
+        void h();
+
+        void i();
+
+        void j();
+
+        void k(long j);
+
+        void l(int i, int i2, String str);
+
+        void onSpeaking(long j, int i, boolean z2);
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class e extends o implements Function1<WebSocket, Unit> {
+        public static final e i = new e();
+
+        public e() {
+            super(1);
         }
-        boolean z2 = eVar.f.a() || eVar.g.a();
-        if (z2 != eVar.h.a()) {
-            eVar.h.b(z2, currentTimeMillis);
-            eVar.i.a.clear();
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(WebSocket webSocket) {
+            WebSocket webSocket2 = webSocket;
+            m.checkNotNullParameter(webSocket2, "it");
+            webSocket2.e(1000, "Force Close");
+            return Unit.a;
         }
-        if (!eVar.h.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) {
-            eVar.a(eVar.i, new e.C0040e((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a((long) outboundRtpVideo.getFramesEncoded(), (long) outboundRtpVideo.getFramesSent(), (long) outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), (long) outboundRtpVideo.getNackCount(), (long) outboundRtpVideo.getPliCount())));
-            if (eVar.i.b == null && outboundRtpVideo.getFramesEncoded() > 0) {
-                eVar.i.b = Long.valueOf(currentTimeMillis - eVar.e);
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class f extends o implements Function1<WebSocket, Unit> {
+        public static final f i = new f();
+
+        public f() {
+            super(1);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(WebSocket webSocket) {
+            WebSocket webSocket2 = webSocket;
+            m.checkNotNullParameter(webSocket2, "it");
+            webSocket2.e(4000, "close reason");
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class g extends TimerTask {
+        public final /* synthetic */ a i;
+
+        /* compiled from: RtcControlSocket.kt */
+        /* renamed from: c.a.r.l0.a$g$a  reason: collision with other inner class name */
+        public static final class C0039a extends o implements Function0<Unit> {
+            public final /* synthetic */ g this$0;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public C0039a(g gVar) {
+                super(0);
+                this.this$0 = gVar;
             }
-            eVar.k = outboundRtpVideo.getBitrateTarget();
-        }
-        if (!eVar.f.a()) {
-            for (Map.Entry<String, InboundRtpVideo> entry : stats2.getInboundRtpVideo().entrySet()) {
-                String key = entry.getKey();
-                InboundRtpVideo value = entry.getValue();
-                Map<String, e.d> map = eVar.j;
-                e.d dVar2 = map.get(key);
-                if (dVar2 == null) {
-                    dVar2 = new e.d();
-                    map.put(key, dVar2);
-                }
-                e.d dVar3 = dVar2;
-                eVar.a(dVar3, new e.C0040e((long) value.getResolution().getHeight(), currentTimeMillis, new e.a((long) value.getFramesDecoded(), (long) value.getFramesReceived(), (long) value.getPacketsReceived(), (long) value.getPacketsLost(), (long) value.getFramesDropped(), value.getBytesReceived(), (long) value.getNackCount(), (long) value.getPliCount())));
-                if (dVar3.b == null && value.getFramesDecoded() > 0) {
-                    dVar3.b = Long.valueOf(currentTimeMillis - eVar.e);
-                }
+
+            /* Return type fixed from 'java.lang.Object' to match base method */
+            @Override // kotlin.jvm.functions.Function0
+            /* renamed from: invoke */
+            public Unit mo1invoke() {
+                a.a(this.this$0.i, true, null, "The connection timed out. Did not receive OP_HELLO in time.");
+                return Unit.a;
             }
         }
-        KrispOveruseDetector krispOveruseDetector = dVar.h;
-        Objects.requireNonNull(krispOveruseDetector);
-        m.checkNotNullParameter(stats2, "stats");
-        if (krispOveruseDetector.d.getType() == MediaEngineConnection.Type.DEFAULT && krispOveruseDetector.d.b()) {
-            OutboundRtpAudio outboundRtpAudio = stats2.getOutboundRtpAudio();
-            if (outboundRtpAudio != null && outboundRtpAudio.getNoiseCancellerIsEnabled()) {
-                OutboundRtpAudio outboundRtpAudio2 = krispOveruseDetector.b;
-                if (outboundRtpAudio2 != null) {
-                    Pair<Boolean, Long> a = krispOveruseDetector.a(outboundRtpAudio2, stats2.getOutboundRtpAudio(), 8.0d);
-                    boolean booleanValue = a.component1().booleanValue();
-                    long longValue = a.component2().longValue();
-                    if (booleanValue) {
-                        krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE);
-                    } else if (longValue == 0) {
-                        int i = krispOveruseDetector.f2071c + 1;
-                        krispOveruseDetector.f2071c = i;
-                        if (i > 2) {
-                            krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED);
+
+        public g(a aVar) {
+            this.i = aVar;
+        }
+
+        @Override // java.util.TimerTask, java.lang.Runnable
+        public void run() {
+            this.i.n(new C0039a(this));
+        }
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class h extends o implements Function0<Unit> {
+        public final /* synthetic */ int $code;
+        public final /* synthetic */ String $reason;
+        public final /* synthetic */ WebSocket $webSocket;
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public h(a aVar, WebSocket webSocket, int i, String str) {
+            super(0);
+            this.this$0 = aVar;
+            this.$webSocket = webSocket;
+            this.$code = i;
+            this.$reason = str;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Unit mo1invoke() {
+            if (!(!m.areEqual(this.$webSocket, this.this$0.r))) {
+                a.a(this.this$0, true, Integer.valueOf(this.$code), this.$reason);
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class i extends o implements Function0<Unit> {
+        public final /* synthetic */ Throwable $t;
+        public final /* synthetic */ WebSocket $webSocket;
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public i(a aVar, WebSocket webSocket, Throwable th) {
+            super(0);
+            this.this$0 = aVar;
+            this.$webSocket = webSocket;
+            this.$t = th;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Unit mo1invoke() {
+            if (!(!m.areEqual(this.$webSocket, this.this$0.r))) {
+                if (this.$t instanceof SSLException) {
+                    a.d(this.this$0, null, 1);
+                    a aVar = this.this$0;
+                    aVar.b();
+                    for (d dVar : aVar.p) {
+                        m.checkNotNullExpressionValue(dVar, "it");
+                        dVar.b(false, 1001, null);
+                    }
+                } else {
+                    a aVar2 = this.this$0;
+                    StringBuilder L = c.d.b.a.a.L("An error with the websocket occurred: ");
+                    L.append(this.$t.getMessage());
+                    a.a(aVar2, true, null, L.toString());
+                }
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class j extends o implements Function0<Unit> {
+        public final /* synthetic */ Payloads.Incoming $message;
+        public final /* synthetic */ WebSocket $webSocket;
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public j(a aVar, WebSocket webSocket, Payloads.Incoming incoming) {
+            super(0);
+            this.this$0 = aVar;
+            this.$webSocket = webSocket;
+            this.$message = incoming;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Unit mo1invoke() {
+            boolean z2 = true;
+            if (!(!m.areEqual(this.$webSocket, this.this$0.r))) {
+                switch (this.$message.getOpcode()) {
+                    case 2:
+                        a aVar = this.this$0;
+                        Object c2 = aVar.m.c(this.$message.getData(), Payloads.Ready.class);
+                        m.checkNotNullExpressionValue(c2, "gson.fromJson(message.da…yloads.Ready::class.java)");
+                        Payloads.Ready ready = (Payloads.Ready) c2;
+                        aVar.o.succeed();
+                        long currentTimeMillis = aVar.H.currentTimeMillis();
+                        Long l = aVar.f216z;
+                        long longValue = currentTimeMillis - (l != null ? l.longValue() : 0);
+                        aVar.j("[READY] took " + longValue + " ms");
+                        aVar.b();
+                        for (d dVar : aVar.p) {
+                            m.checkNotNullExpressionValue(dVar, "it");
+                            dVar.l(ready.getPort(), ready.getSsrc(), ready.getIp());
                         }
+                        break;
+                    case 3:
+                        a aVar2 = this.this$0;
+                        aVar2.o(3, String.valueOf(aVar2.H.currentTimeMillis()));
+                        break;
+                    case 4:
+                        a aVar3 = this.this$0;
+                        Object c3 = aVar3.m.c(this.$message.getData(), Payloads.Description.class);
+                        m.checkNotNullExpressionValue(c3, "gson.fromJson(message.da….Description::class.java)");
+                        Payloads.Description description = (Payloads.Description) c3;
+                        aVar3.b();
+                        for (d dVar2 : aVar3.p) {
+                            m.checkNotNullExpressionValue(dVar2, "it");
+                            dVar2.c(description.getMode(), description.getSecretKey());
+                            dVar2.a(description.getAudioCodec(), description.getVideoCodec());
+                            String mediaSessionId = description.getMediaSessionId();
+                            if (mediaSessionId != null) {
+                                dVar2.d(mediaSessionId);
+                            }
+                        }
+                        aVar3.B = true;
+                        break;
+                    case 5:
+                        a aVar4 = this.this$0;
+                        Object c4 = aVar4.m.c(this.$message.getData(), Payloads.Speaking.class);
+                        m.checkNotNullExpressionValue(c4, "gson.fromJson(message.da…ads.Speaking::class.java)");
+                        Payloads.Speaking speaking = (Payloads.Speaking) c4;
+                        if (!(speaking.getUserId() == null || speaking.getSpeaking() == null)) {
+                            Integer speaking2 = speaking.getSpeaking();
+                            if (speaking2 == null || speaking2.intValue() != 1) {
+                                z2 = false;
+                            }
+                            aVar4.b();
+                            for (d dVar3 : aVar4.p) {
+                                m.checkNotNullExpressionValue(dVar3, "it");
+                                dVar3.onSpeaking(speaking.getUserId().longValue(), speaking.getSsrc(), z2);
+                            }
+                            break;
+                        }
+                    case 6:
+                        a aVar5 = this.this$0;
+                        Object c5 = aVar5.m.c(this.$message.getData(), Long.TYPE);
+                        m.checkNotNullExpressionValue(c5, "gson.fromJson(message.data, Long::class.java)");
+                        long longValue2 = ((Number) c5).longValue();
+                        long currentTimeMillis2 = aVar5.H.currentTimeMillis();
+                        long j = currentTimeMillis2 - longValue2;
+                        Logger.d$default(aVar5.F, aVar5.l, c.d.b.a.a.r("got heartbeat ack after ", j, " ms"), null, 4, null);
+                        aVar5.f214x = Long.valueOf(currentTimeMillis2);
+                        aVar5.v = true;
+                        aVar5.b();
+                        for (d dVar4 : aVar5.p) {
+                            m.checkNotNullExpressionValue(dVar4, "it");
+                            dVar4.g(j);
+                        }
+                        break;
+                    case 7:
+                    case 10:
+                    case 11:
+                    default:
+                        a aVar6 = this.this$0;
+                        StringBuilder L = c.d.b.a.a.L("unknown opcode: ");
+                        L.append(this.$message.getOpcode());
+                        aVar6.j(L.toString());
+                        break;
+                    case 8:
+                        a aVar7 = this.this$0;
+                        Object c6 = aVar7.m.c(this.$message.getData(), Payloads.Hello.class);
+                        m.checkNotNullExpressionValue(c6, "gson.fromJson(message.da…yloads.Hello::class.java)");
+                        Payloads.Hello hello = (Payloads.Hello) c6;
+                        TimerTask timerTask = aVar7.f215y;
+                        if (timerTask != null) {
+                            timerTask.cancel();
+                        }
+                        aVar7.j("[HELLO] raw: " + hello);
+                        aVar7.u = Long.valueOf(hello.getHeartbeatIntervalMs());
+                        aVar7.q = hello.getServerVersion();
+                        aVar7.w.cancel();
+                        aVar7.v = true;
+                        aVar7.l();
+                        break;
+                    case 9:
+                        this.this$0.o.succeed();
+                        break;
+                    case 12:
+                        a aVar8 = this.this$0;
+                        Object c7 = aVar8.m.c(this.$message.getData(), Payloads.Video.class);
+                        m.checkNotNullExpressionValue(c7, "gson.fromJson(message.da…yloads.Video::class.java)");
+                        Payloads.Video video = (Payloads.Video) c7;
+                        if (video.getUserId() != null) {
+                            aVar8.b();
+                            for (d dVar5 : aVar8.p) {
+                                m.checkNotNullExpressionValue(dVar5, "it");
+                                dVar5.e(video.getUserId().longValue(), video.getAudioSsrc(), video.getVideoSsrc(), video.getStreams());
+                            }
+                            break;
+                        }
+                        break;
+                    case 13:
+                        a aVar9 = this.this$0;
+                        Object c8 = aVar9.m.c(this.$message.getData(), Payloads.ClientDisconnect.class);
+                        m.checkNotNullExpressionValue(c8, "gson.fromJson(message.da…ntDisconnect::class.java)");
+                        Payloads.ClientDisconnect clientDisconnect = (Payloads.ClientDisconnect) c8;
+                        aVar9.b();
+                        for (d dVar6 : aVar9.p) {
+                            m.checkNotNullExpressionValue(dVar6, "it");
+                            dVar6.k(clientDisconnect.getUserId());
+                        }
+                        break;
+                    case 14:
+                        a aVar10 = this.this$0;
+                        Object c9 = aVar10.m.c(this.$message.getData(), Payloads.SessionUpdate.class);
+                        m.checkNotNullExpressionValue(c9, "gson.fromJson(message.da…essionUpdate::class.java)");
+                        Payloads.SessionUpdate sessionUpdate = (Payloads.SessionUpdate) c9;
+                        aVar10.b();
+                        for (d dVar7 : aVar10.p) {
+                            m.checkNotNullExpressionValue(dVar7, "it");
+                            String mediaSessionId2 = sessionUpdate.getMediaSessionId();
+                            if (mediaSessionId2 != null) {
+                                dVar7.d(mediaSessionId2);
+                            }
+                        }
+                        break;
+                    case 15:
+                        a aVar11 = this.this$0;
+                        Gson gson = aVar11.m;
+                        JsonElement data = this.$message.getData();
+                        Type type = a.j;
+                        Objects.requireNonNull(gson);
+                        Object d = data == null ? null : gson.d(new c.i.d.q.x.a(data), type);
+                        m.checkNotNullExpressionValue(d, "gson.fromJson(message.data, MEDIA_SINK_WANTS_TYPE)");
+                        Map<String, Integer> map = (Map) d;
+                        aVar11.b();
+                        for (d dVar8 : aVar11.p) {
+                            m.checkNotNullExpressionValue(dVar8, "it");
+                            dVar8.f(map);
+                        }
+                        break;
+                }
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class k extends o implements Function0<Unit> {
+        public final /* synthetic */ WebSocket $webSocket;
+        public final /* synthetic */ a this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public k(a aVar, WebSocket webSocket) {
+            super(0);
+            this.this$0 = aVar;
+            this.$webSocket = webSocket;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Unit mo1invoke() {
+            boolean z2 = true;
+            if (!(!m.areEqual(this.$webSocket, this.this$0.r))) {
+                a aVar = this.this$0;
+                c cVar = aVar.A;
+                if (cVar == c.CONNECTING) {
+                    aVar.b();
+                    for (d dVar : aVar.p) {
+                        m.checkNotNullExpressionValue(dVar, "it");
+                        dVar.j();
+                    }
+                } else if (cVar == c.RECONNECTING) {
+                    String str = aVar.t;
+                    String str2 = aVar.f213s;
+                    String str3 = aVar.D;
+                    Long l = aVar.f214x;
+                    if (l != null && aVar.H.currentTimeMillis() - l.longValue() > 60000) {
+                        z2 = false;
+                    }
+                    if (str == null || str2 == null || !aVar.B || !z2) {
+                        StringBuilder L = c.d.b.a.a.L("Cannot resume connection. resumable: ");
+                        L.append(aVar.B);
+                        L.append(" -- isHeartbeatRecentEnough: ");
+                        L.append(z2);
+                        aVar.h(false, 4801, L.toString());
                     } else {
-                        krispOveruseDetector.f2071c = 0;
+                        aVar.j("[RESUME] resuming session. serverId=" + str2 + " sessionId=" + str);
+                        aVar.b();
+                        for (d dVar2 : aVar.p) {
+                            m.checkNotNullExpressionValue(dVar2, "it");
+                            dVar2.h();
+                        }
+                        aVar.A = c.RESUMING;
+                        aVar.o(7, new Payloads.Resume(str3, str, str2));
                     }
                 }
-                krispOveruseDetector.b = stats2.getOutboundRtpAudio();
-            }
-            OutboundRtpAudio outboundRtpAudio3 = stats2.getOutboundRtpAudio();
-            if (outboundRtpAudio3 != null && outboundRtpAudio3.getVoiceActivityDetectorIsEnabled()) {
-                OutboundRtpAudio outboundRtpAudio4 = krispOveruseDetector.a;
-                if (outboundRtpAudio4 != null && krispOveruseDetector.a(outboundRtpAudio4, stats2.getOutboundRtpAudio(), 4.0d).component1().booleanValue()) {
-                    krispOveruseDetector.d.f(KrispOveruseDetector.Status.VAD_CPU_OVERUSE);
+                a aVar2 = this.this$0;
+                aVar2.A = c.CONNECTED;
+                long currentTimeMillis = aVar2.H.currentTimeMillis();
+                Long l2 = this.this$0.f216z;
+                long longValue = currentTimeMillis - (l2 != null ? l2.longValue() : 0);
+                a aVar3 = this.this$0;
+                Logger logger = aVar3.F;
+                String str4 = aVar3.l;
+                StringBuilder L2 = c.d.b.a.a.L("[CONNECTED] to ");
+                L2.append(this.this$0.C);
+                Logger.i$default(logger, str4, L2.toString(), null, 4, null);
+                a aVar4 = this.this$0;
+                aVar4.b();
+                for (d dVar3 : aVar4.p) {
+                    m.checkNotNullExpressionValue(dVar3, "it");
+                    dVar3.g(longValue / ((long) 2));
                 }
-                krispOveruseDetector.a = stats2.getOutboundRtpAudio();
+            }
+            return Unit.a;
+        }
+    }
+
+    /* compiled from: RtcControlSocket.kt */
+    public static final class l extends o implements Function1<WebSocket, Unit> {
+        public static final l i = new l();
+
+        public l() {
+            super(1);
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public Unit invoke(WebSocket webSocket) {
+            WebSocket webSocket2 = webSocket;
+            m.checkNotNullParameter(webSocket2, "it");
+            webSocket2.e(4000, "reconnecting");
+            return Unit.a;
+        }
+    }
+
+    public a(String str, String str2, SSLSocketFactory sSLSocketFactory, Logger logger, c.a.r.c cVar, Clock clock, String str3) {
+        m.checkNotNullParameter(str, "endpoint");
+        m.checkNotNullParameter(str2, "token");
+        m.checkNotNullParameter(logger, "logger");
+        m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor");
+        m.checkNotNullParameter(clock, "clock");
+        m.checkNotNullParameter(str3, "loggingTagPrefix");
+        this.C = str;
+        this.D = str2;
+        this.E = sSLSocketFactory;
+        this.F = logger;
+        this.G = cVar;
+        this.H = clock;
+        this.I = str3;
+        StringBuilder P = c.d.b.a.a.P(str3, "->RtcControlSocket ");
+        int i2 = i + 1;
+        i = i2;
+        P.append(i2);
+        String sb = P.toString();
+        this.l = sb;
+        this.o = new Backoff(1000, 5000, 3, false, new Backoff.TimerScheduler(sb, cVar), 8, null);
+        this.p = new CopyOnWriteArraySet<>();
+        this.q = 3;
+        this.w = new b(this);
+        this.A = c.DISCONNECTED;
+    }
+
+    public static final void a(a aVar, boolean z2, Integer num, String str) {
+        aVar.A = c.DISCONNECTED;
+        if ((num != null && num.intValue() == 4004) || ((num != null && num.intValue() == 4015) || ((num != null && num.intValue() == 4011) || (num != null && num.intValue() == 4006)))) {
+            aVar.h(true, num, str);
+        } else if (aVar.o.hasReachedFailureThreshold()) {
+            aVar.k("[WS CLOSED] Backoff exceeded. Resetting.");
+            aVar.h(z2, num, str);
+        } else {
+            aVar.c(null);
+            String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) aVar.o.fail(new c(aVar, z2, num, str))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)");
+            aVar.k("`[WS CLOSED] (" + z2 + ", " + num + ", " + str + ") retrying in " + H + " seconds.");
+        }
+    }
+
+    public static /* synthetic */ void d(a aVar, Function1 function1, int i2) {
+        int i3 = i2 & 1;
+        aVar.c(null);
+    }
+
+    public final void b() {
+        c.a.r.c cVar = this.G;
+        Objects.requireNonNull(cVar);
+        if (Process.myTid() != cVar.j) {
+            IllegalStateException illegalStateException = new IllegalStateException("oops! not called on the MediaEngineExecutor");
+            AnimatableValueParser.D1("MediaEngineExecutor", "oops! not called on the MediaEngineExecutor", illegalStateException);
+            if (cVar.l) {
+                new Handler(Looper.getMainLooper()).post(new c.a.r.d(illegalStateException));
             }
         }
-        return Unit.a;
+    }
+
+    public final void c(Function1<? super WebSocket, Unit> function1) {
+        this.o.cancel();
+        this.w.cancel();
+        TimerTask timerTask = this.f215y;
+        if (timerTask != null) {
+            timerTask.cancel();
+        }
+        WebSocket webSocket = this.r;
+        if (!(webSocket == null || function1 == null)) {
+            function1.invoke(webSocket);
+        }
+        this.r = null;
+    }
+
+    @Override // com.discord.utilities.debug.DebugPrintable
+    public void debugPrint(DebugPrintBuilder debugPrintBuilder) {
+        m.checkNotNullParameter(debugPrintBuilder, "dp");
+        debugPrintBuilder.appendKeyValue("serverId", this.f213s);
+        debugPrintBuilder.appendKeyValue("sessionId", this.t);
+        debugPrintBuilder.appendKeyValue("heartbeatInterval", this.u);
+        debugPrintBuilder.appendKeyValue("lastHeartbeatAckTime", this.f214x);
+        debugPrintBuilder.appendKeyValue("connectionStartTime", this.f216z);
+        debugPrintBuilder.appendKeyValue("connectionState", this.A);
+        debugPrintBuilder.appendKeyValue("resumable", Boolean.valueOf(this.B));
+    }
+
+    public final void e() {
+        b();
+        j("[CLOSE]");
+        c(e.i);
+        this.f213s = null;
+        this.t = null;
+        this.B = false;
+        this.A = c.DISCONNECTED;
+        b();
+        for (d dVar : this.p) {
+            m.checkNotNullExpressionValue(dVar, "it");
+            dVar.b(false, 1000, "Force Close");
+        }
+    }
+
+    public final boolean f() {
+        b();
+        if (this.A != c.DISCONNECTED) {
+            k("Cannot start a new connection, connection state is not disconnected");
+            return false;
+        }
+        this.A = c.CONNECTING;
+        g();
+        b();
+        for (d dVar : this.p) {
+            m.checkNotNullExpressionValue(dVar, "it");
+            dVar.i();
+        }
+        return true;
+    }
+
+    public final void g() {
+        StringBuilder L = c.d.b.a.a.L("[CONNECT] ");
+        L.append(this.C);
+        j(L.toString());
+        if (this.r != null) {
+            this.F.e(this.l, "Connect called with already existing websocket", null, null);
+            c(f.i);
+            return;
+        }
+        this.f216z = Long.valueOf(this.H.currentTimeMillis());
+        TimerTask timerTask = this.f215y;
+        if (timerTask != null) {
+            timerTask.cancel();
+        }
+        g gVar = new g(this);
+        this.f215y = gVar;
+        this.n.schedule(gVar, 20000);
+        x.a aVar = new x.a();
+        aVar.a(1, TimeUnit.MINUTES);
+        SSLSocketFactory sSLSocketFactory = this.E;
+        if (sSLSocketFactory != null) {
+            h.a aVar2 = f0.f0.k.h.f2737c;
+            aVar.b(sSLSocketFactory, f0.f0.k.h.a.n());
+        }
+        String D = c.d.b.a.a.D(new StringBuilder(), this.C, "?v=5");
+        j("attempting WSS connection with " + D);
+        x xVar = new x(aVar);
+        z.a aVar3 = new z.a();
+        aVar3.f(D);
+        this.r = xVar.g(aVar3.a(), this);
+    }
+
+    public final void h(boolean z2, Integer num, String str) {
+        k("[DISCONNECT] (" + z2 + ", " + num + ", " + str + ')');
+        c(null);
+        this.f213s = null;
+        this.t = null;
+        this.B = false;
+        this.A = c.DISCONNECTED;
+        b();
+        for (d dVar : this.p) {
+            m.checkNotNullExpressionValue(dVar, "it");
+            dVar.b(z2, num, str);
+        }
+    }
+
+    public final void i(long j2, String str, boolean z2) {
+        m.checkNotNullParameter(str, "reason");
+        b();
+        if (this.r != null) {
+            j("Performing an immediate heartbeat on existing socket: " + str);
+            this.w.cancel();
+            b bVar = new b(this);
+            this.w = bVar;
+            this.n.schedule(bVar, j2);
+        } else if (!z2) {
+            j("Immediate heartbeat requested, but is disconnected and a reset was not requested: " + str);
+        } else if (this.o.isPending() && this.r == null) {
+            j("Connection backoff reset Immediate heartbeat when socket was disconnected.");
+            this.o.succeed();
+            m(false, 4802, "Reset backoff.");
+        }
+    }
+
+    public final void j(String str) {
+        Logger.i$default(this.F, this.l, str, null, 4, null);
+    }
+
+    public final void k(String str) {
+        Logger.w$default(this.F, this.l, str, null, 4, null);
+    }
+
+    public final void l() {
+        if (this.v) {
+            this.v = false;
+            o(3, String.valueOf(this.H.currentTimeMillis()));
+            Long l2 = this.u;
+            if (l2 != null) {
+                b bVar = new b(this);
+                this.w = bVar;
+                this.n.schedule(bVar, l2.longValue());
+                return;
+            }
+            k("onHeartbeatInterval called when heartbeatInterval was null");
+            return;
+        }
+        c(d.i);
+        String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) this.o.fail(new e(this))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)");
+        k("[ACK TIMEOUT] reconnecting in " + H + " seconds.");
+    }
+
+    public final void m(boolean z2, Integer num, String str) {
+        j("[RECONNECT] wasFatal=" + z2 + " code=" + num + " reason=" + str);
+        c(l.i);
+        this.A = c.RECONNECTING;
+        g();
+    }
+
+    /* JADX WARN: Multi-variable type inference failed */
+    /* JADX WARNING: Unknown variable types count: 1 */
+    public final Future<?> n(Function0<Unit> function0) {
+        c.a.r.c cVar = this.G;
+        if (function0 != null) {
+            function0 = new f(function0);
+        }
+        return cVar.submit((Runnable) function0);
+    }
+
+    public final void o(int i2, Object obj) {
+        WebSocket webSocket = this.r;
+        if (webSocket == null) {
+            StringBuilder L = c.d.b.a.a.L("opcode() websocket null. opcode: ");
+            L.append(Opcodes.INSTANCE.getNameOf(i2));
+            this.F.e(this.l, L.toString(), null, null);
+            return;
+        }
+        try {
+            String m = this.m.m(new Payloads.Outgoing(i2, obj));
+            Logger logger = this.F;
+            String str = this.l;
+            Logger.d$default(logger, str, "sending (" + Opcodes.INSTANCE.getNameOf(i2) + "): " + m, null, 4, null);
+            m.checkNotNullExpressionValue(m, "json");
+            webSocket.a(m);
+        } catch (Exception unused) {
+            Logger logger2 = this.F;
+            String str2 = this.l;
+            Logger.w$default(logger2, str2, "exception sending opcode: " + i2 + " and payload: " + obj, null, 4, null);
+        }
+    }
+
+    @Override // okhttp3.WebSocketListener
+    public void onClosed(WebSocket webSocket, int i2, String str) {
+        m.checkNotNullParameter(webSocket, "webSocket");
+        m.checkNotNullParameter(str, "reason");
+        super.onClosed(webSocket, i2, str);
+        n(new h(this, webSocket, i2, str));
+    }
+
+    @Override // okhttp3.WebSocketListener
+    public void onClosing(WebSocket webSocket, int i2, String str) {
+        m.checkNotNullParameter(webSocket, "webSocket");
+        m.checkNotNullParameter(str, "reason");
+        ((f0.f0.n.d) webSocket).e(i2, str);
+    }
+
+    @Override // okhttp3.WebSocketListener
+    public void onFailure(WebSocket webSocket, Throwable th, Response response) {
+        m.checkNotNullParameter(webSocket, "webSocket");
+        m.checkNotNullParameter(th, "t");
+        super.onFailure(webSocket, th, response);
+        n(new i(this, webSocket, th));
+    }
+
+    @Override // okhttp3.WebSocketListener
+    public void onMessage(WebSocket webSocket, String str) {
+        m.checkNotNullParameter(webSocket, "webSocket");
+        m.checkNotNullParameter(str, "text");
+        Object g2 = this.m.g(str, Payloads.Incoming.class);
+        super.onMessage(webSocket, str);
+        n(new j(this, webSocket, (Payloads.Incoming) c.i.a.f.e.o.c.q0(Payloads.Incoming.class).cast(g2)));
+    }
+
+    @Override // okhttp3.WebSocketListener
+    public void onOpen(WebSocket webSocket, Response response) {
+        m.checkNotNullParameter(webSocket, "webSocket");
+        m.checkNotNullParameter(response, "response");
+        super.onOpen(webSocket, response);
+        n(new k(this, webSocket));
     }
 }
diff --git a/app/src/main/java/c/a/r/l0/b.java b/app/src/main/java/c/a/r/l0/b.java
index 690725c564..e71a10280c 100644
--- a/app/src/main/java/c/a/r/l0/b.java
+++ b/app/src/main/java/c/a/r/l0/b.java
@@ -1,17 +1,40 @@
 package c.a.r.l0;
 
-import rx.functions.Action1;
-/* compiled from: RtcStatsCollector.kt */
-public final class b<T> implements Action1<Long> {
-    public final /* synthetic */ d i;
+import d0.z.d.o;
+import java.util.TimerTask;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: RtcControlSocket.kt */
+public final class b extends TimerTask {
+    public final /* synthetic */ a i;
 
-    public b(d dVar) {
-        this.i = dVar;
+    /* compiled from: RtcControlSocket.kt */
+    public static final class a extends o implements Function0<Unit> {
+        public final /* synthetic */ b this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public a(b bVar) {
+            super(0);
+            this.this$0 = bVar;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public Unit mo1invoke() {
+            a aVar = this.this$0.i;
+            int i = a.i;
+            aVar.l();
+            return Unit.a;
+        }
     }
 
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // rx.functions.Action1
-    public void call(Long l) {
-        this.i.e.n(new a(this.i));
+    public b(a aVar) {
+        this.i = aVar;
+    }
+
+    @Override // java.util.TimerTask, java.lang.Runnable
+    public void run() {
+        this.i.n(new a(this));
     }
 }
diff --git a/app/src/main/java/c/a/r/l0/c.java b/app/src/main/java/c/a/r/l0/c.java
index af9a05ffd1..b3a232f4aa 100644
--- a/app/src/main/java/c/a/r/l0/c.java
+++ b/app/src/main/java/c/a/r/l0/c.java
@@ -1,18 +1,34 @@
 package c.a.r.l0;
 
-import com.discord.utilities.logging.Logger;
-import rx.functions.Action1;
-/* compiled from: RtcStatsCollector.kt */
-public final class c<T> implements Action1<Throwable> {
-    public final /* synthetic */ d i;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: RtcControlSocket.kt */
+public final class c extends o implements Function0<Unit> {
+    public final /* synthetic */ Integer $code;
+    public final /* synthetic */ String $reason;
+    public final /* synthetic */ boolean $wasFatal;
+    public final /* synthetic */ a this$0;
 
-    public c(d dVar) {
-        this.i = dVar;
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public c(a aVar, boolean z2, Integer num, String str) {
+        super(0);
+        this.this$0 = aVar;
+        this.$wasFatal = z2;
+        this.$code = num;
+        this.$reason = str;
     }
 
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // rx.functions.Action1
-    public void call(Throwable th) {
-        Logger.e$default(this.i.d, "RtcStatsCollector: Error collecting stats", th, null, 4, null);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public Unit mo1invoke() {
+        a aVar = this.this$0;
+        boolean z2 = this.$wasFatal;
+        Integer num = this.$code;
+        String str = this.$reason;
+        int i = a.i;
+        aVar.m(z2, num, str);
+        return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/r/l0/d.java b/app/src/main/java/c/a/r/l0/d.java
index d34024af24..04e31347dd 100644
--- a/app/src/main/java/c/a/r/l0/d.java
+++ b/app/src/main/java/c/a/r/l0/d.java
@@ -1,49 +1,25 @@
 package c.a.r.l0;
 
-import co.discord.media_engine.Stats;
-import co.discord.media_engine.VoiceQuality;
-import com.discord.rtcconnection.KrispOveruseDetector;
-import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
-import com.discord.utilities.logging.Logger;
 import d0.z.d.m;
-import java.util.Deque;
-import java.util.LinkedList;
-import rx.Subscription;
-/* compiled from: RtcStatsCollector.kt */
-public final class d {
-    public final Deque<Stats> a;
-    public Subscription b;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import okhttp3.WebSocket;
+/* compiled from: RtcControlSocket.kt */
+public final class d extends o implements Function1<WebSocket, Unit> {
+    public static final d i = new d();
 
-    /* renamed from: c  reason: collision with root package name */
-    public final long f217c;
-    public final Logger d;
-    public final MediaEngineConnection e;
-    public final VoiceQuality f;
-    public final e g;
-    public final KrispOveruseDetector h;
-    public final int i;
-
-    public d(long j, Logger logger, MediaEngineConnection mediaEngineConnection, VoiceQuality voiceQuality, e eVar, KrispOveruseDetector krispOveruseDetector, int i, int i2) {
-        i = (i2 & 64) != 0 ? 30 : i;
-        m.checkNotNullParameter(logger, "logger");
-        m.checkNotNullParameter(mediaEngineConnection, "connection");
-        m.checkNotNullParameter(voiceQuality, "voiceQuality");
-        m.checkNotNullParameter(eVar, "videoQuality");
-        m.checkNotNullParameter(krispOveruseDetector, "krispOveruseDetector");
-        this.f217c = j;
-        this.d = logger;
-        this.e = mediaEngineConnection;
-        this.f = voiceQuality;
-        this.g = eVar;
-        this.h = krispOveruseDetector;
-        this.i = i;
-        this.a = new LinkedList();
+    public d() {
+        super(1);
     }
 
-    public final void a() {
-        Subscription subscription = this.b;
-        if (subscription != null) {
-            subscription.unsubscribe();
-        }
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public Unit invoke(WebSocket webSocket) {
+        WebSocket webSocket2 = webSocket;
+        m.checkNotNullParameter(webSocket2, "it");
+        webSocket2.e(4800, "Heartbeat timeout.");
+        return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/r/l0/e.java b/app/src/main/java/c/a/r/l0/e.java
index 08b710de7d..feb13d6423 100644
--- a/app/src/main/java/c/a/r/l0/e.java
+++ b/app/src/main/java/c/a/r/l0/e.java
@@ -1,372 +1,25 @@
 package c.a.r.l0;
 
-import com.discord.utilities.time.Clock;
-import com.discord.utilities.time.ClockFactory;
-import d0.o;
-import d0.t.h0;
-import d0.t.n;
-import d0.t.r;
-import d0.z.d.m;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import kotlin.Pair;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: VideoQuality.kt */
-public final class e {
-    public static final List<Integer> a = n.listOf((Object[]) new Integer[]{0, 500000, 1000000, 1500000, 2000000, 3000000, 4000000, 5000000, 6000000, 7000000, 8000000});
-    public static final List<Integer> b = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60});
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: RtcControlSocket.kt */
+public final class e extends o implements Function0<Unit> {
+    public final /* synthetic */ a this$0;
 
-    /* renamed from: c  reason: collision with root package name */
-    public static final List<Integer> f218c = n.listOf((Object[]) new Integer[]{720, 480, 360});
-    public static final b d = new b(null);
-    public final long e;
-    public final c f;
-    public final c g;
-    public final c h;
-    public final d i;
-    public final Map<String, d> j;
-    public int k;
-    public final Clock l;
-
-    /* compiled from: VideoQuality.kt */
-    public static final class a {
-        public long a;
-        public long b;
-
-        /* renamed from: c  reason: collision with root package name */
-        public long f219c;
-        public long d;
-        public long e;
-        public long f;
-        public long g;
-        public long h;
-
-        public a() {
-            this(0, 0, 0, 0, 0, 0, 0, 0, 255);
-        }
-
-        public a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8) {
-            this.a = j;
-            this.b = j2;
-            this.f219c = j3;
-            this.d = j4;
-            this.e = j5;
-            this.f = j6;
-            this.g = j7;
-            this.h = j8;
-        }
-
-        /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, int i) {
-            this((i & 1) != 0 ? 0 : j, (i & 2) != 0 ? 0 : j2, (i & 4) != 0 ? 0 : j3, (i & 8) != 0 ? 0 : j4, (i & 16) != 0 ? 0 : j5, (i & 32) != 0 ? 0 : j6, (i & 64) != 0 ? 0 : j7, (i & 128) == 0 ? j8 : 0);
-        }
-
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof a)) {
-                return false;
-            }
-            a aVar = (a) obj;
-            return this.a == aVar.a && this.b == aVar.b && this.f219c == aVar.f219c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f && this.g == aVar.g && this.h == aVar.h;
-        }
-
-        public int hashCode() {
-            int a = a0.a.a.b.a(this.b);
-            int a2 = a0.a.a.b.a(this.f219c);
-            int a3 = a0.a.a.b.a(this.d);
-            int a4 = a0.a.a.b.a(this.e);
-            int a5 = a0.a.a.b.a(this.f);
-            int a6 = a0.a.a.b.a(this.g);
-            return a0.a.a.b.a(this.h) + ((a6 + ((a5 + ((a4 + ((a3 + ((a2 + ((a + (a0.a.a.b.a(this.a) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31);
-        }
-
-        public String toString() {
-            StringBuilder L = c.d.b.a.a.L("AggregatedProperties(framesCodec=");
-            L.append(this.a);
-            L.append(", framesNetwork=");
-            L.append(this.b);
-            L.append(", packets=");
-            L.append(this.f219c);
-            L.append(", packetsLost=");
-            L.append(this.d);
-            L.append(", framesDropped=");
-            L.append(this.e);
-            L.append(", bytes=");
-            L.append(this.f);
-            L.append(", nackCount=");
-            L.append(this.g);
-            L.append(", pliCount=");
-            return c.d.b.a.a.A(L, this.h, ")");
-        }
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public e(a aVar) {
+        super(0);
+        this.this$0 = aVar;
     }
 
-    /* compiled from: VideoQuality.kt */
-    public static final class b {
-        public b(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-
-        public static final long a(b bVar, Float f) {
-            if (f != null) {
-                return d0.a0.a.roundToLong(f.floatValue());
-            }
-            return 0;
-        }
-    }
-
-    /* compiled from: VideoQuality.kt */
-    public static final class c {
-        public Long a;
-        public long b;
-
-        public c(boolean z2, long j) {
-            this.a = z2 ? Long.valueOf(j) : null;
-        }
-
-        public final boolean a() {
-            return this.a != null;
-        }
-
-        public final void b(boolean z2, long j) {
-            Long l = this.a;
-            if (l == null) {
-                if (z2) {
-                    this.a = Long.valueOf(j);
-                }
-            } else if (l != null) {
-                long longValue = l.longValue();
-                if (!z2) {
-                    this.b = (j - longValue) + this.b;
-                    this.a = null;
-                }
-            }
-        }
-
-        public final long c(long j) {
-            Long l = this.a;
-            if (l == null) {
-                return this.b;
-            }
-            return (this.b + j) - l.longValue();
-        }
-    }
-
-    /* compiled from: VideoQuality.kt */
-    public static final class d {
-        public List<C0040e> a = new ArrayList();
-        public Long b;
-
-        /* renamed from: c  reason: collision with root package name */
-        public a f220c = new a(0, 0, 0, 0, 0, 0, 0, 0, 255);
-        public long d;
-        public Map<Integer, Float> e = new LinkedHashMap();
-        public Map<Integer, Float> f = new LinkedHashMap();
-        public float g;
-        public Map<Integer, Float> h = new LinkedHashMap();
-
-        public d() {
-            for (Number number : e.a) {
-                this.e.put(Integer.valueOf(number.intValue()), Float.valueOf(0.0f));
-            }
-            for (Number number2 : e.b) {
-                this.f.put(Integer.valueOf(number2.intValue()), Float.valueOf(0.0f));
-            }
-            for (Number number3 : e.f218c) {
-                this.h.put(Integer.valueOf(number3.intValue()), Float.valueOf(0.0f));
-            }
-        }
-    }
-
-    /* compiled from: VideoQuality.kt */
-    /* renamed from: c.a.r.l0.e$e  reason: collision with other inner class name */
-    public static final class C0040e {
-        public final long a;
-        public final long b;
-
-        /* renamed from: c  reason: collision with root package name */
-        public final a f221c;
-
-        public C0040e() {
-            this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 255));
-        }
-
-        public C0040e(long j, long j2, a aVar) {
-            m.checkNotNullParameter(aVar, "aggregatedProperties");
-            this.a = j;
-            this.b = j2;
-            this.f221c = aVar;
-        }
-
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof C0040e)) {
-                return false;
-            }
-            C0040e eVar = (C0040e) obj;
-            return this.a == eVar.a && this.b == eVar.b && m.areEqual(this.f221c, eVar.f221c);
-        }
-
-        public int hashCode() {
-            int a = (a0.a.a.b.a(this.b) + (a0.a.a.b.a(this.a) * 31)) * 31;
-            a aVar = this.f221c;
-            return a + (aVar != null ? aVar.hashCode() : 0);
-        }
-
-        public String toString() {
-            StringBuilder L = c.d.b.a.a.L("RawVideoStats(resolution=");
-            L.append(this.a);
-            L.append(", timestamp=");
-            L.append(this.b);
-            L.append(", aggregatedProperties=");
-            L.append(this.f221c);
-            L.append(")");
-            return L.toString();
-        }
-    }
-
-    public e(Clock clock, int i) {
-        Clock clock2 = (i & 1) != 0 ? ClockFactory.get() : null;
-        m.checkNotNullParameter(clock2, "clock");
-        this.l = clock2;
-        long currentTimeMillis = clock2.currentTimeMillis();
-        this.e = currentTimeMillis;
-        this.f = new c(false, currentTimeMillis);
-        this.g = new c(false, currentTimeMillis);
-        this.h = new c(false, currentTimeMillis);
-        this.i = new d();
-        this.j = new LinkedHashMap();
-    }
-
-    public final void a(d dVar, C0040e eVar) {
-        dVar.a.add(eVar);
-        if (dVar.a.size() >= 2) {
-            List<C0040e> list = dVar.a;
-            C0040e eVar2 = list.get(list.size() - 1);
-            List<C0040e> list2 = dVar.a;
-            C0040e eVar3 = list2.get(list2.size() - 2);
-            f fVar = f.i;
-            dVar.d = (eVar2.b - eVar3.b) + dVar.d;
-            a aVar = dVar.f220c;
-            a aVar2 = eVar2.f221c;
-            a aVar3 = eVar3.f221c;
-            aVar.a = fVar.a(aVar2.a, aVar3.a) + aVar.a;
-            aVar.b = fVar.a(aVar2.b, aVar3.b) + aVar.b;
-            aVar.f219c = fVar.a(aVar2.f219c, aVar3.f219c) + aVar.f219c;
-            aVar.d = fVar.a(aVar2.d, aVar3.d) + aVar.d;
-            aVar.e = fVar.a(aVar2.e, aVar3.e) + aVar.e;
-            aVar.f = fVar.a(aVar2.f, aVar3.f) + aVar.f;
-            aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g;
-            aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h;
-            a aVar4 = eVar2.f221c;
-            long j = aVar4.f;
-            long j2 = aVar4.a;
-            long j3 = eVar2.b;
-            long j4 = eVar2.a;
-            float f = ((float) (j3 - eVar3.b)) / 1000.0f;
-            dVar.g = (((float) j4) * f) + dVar.g;
-            if (dVar.a.size() >= 6) {
-                List<C0040e> list3 = dVar.a;
-                C0040e eVar4 = list3.get(list3.size() - 3);
-                a aVar5 = eVar4.f221c;
-                long j5 = aVar5.f;
-                long j6 = aVar5.a;
-                long j7 = eVar4.b;
-                Iterator<T> it = f218c.iterator();
-                while (true) {
-                    float f2 = 0.0f;
-                    if (!it.hasNext()) {
-                        break;
-                    }
-                    int intValue = ((Number) it.next()).intValue();
-                    if (j4 <= ((long) intValue)) {
-                        Map<Integer, Float> map = dVar.h;
-                        Integer valueOf = Integer.valueOf(intValue);
-                        Float f3 = dVar.h.get(Integer.valueOf(intValue));
-                        if (f3 != null) {
-                            f2 = f3.floatValue();
-                        }
-                        map.put(valueOf, Float.valueOf(f2 + f));
-                    }
-                    j2 = j2;
-                    j6 = j6;
-                }
-                float f4 = ((float) (j3 - j7)) / 1000.0f;
-                float f5 = ((float) ((j - j5) * ((long) 8))) / f4;
-                float f6 = ((float) (j2 - j6)) / f4;
-                for (Number number : a) {
-                    int intValue2 = number.intValue();
-                    if (f5 <= ((float) intValue2)) {
-                        Map<Integer, Float> map2 = dVar.e;
-                        Integer valueOf2 = Integer.valueOf(intValue2);
-                        Float f7 = dVar.e.get(Integer.valueOf(intValue2));
-                        map2.put(valueOf2, Float.valueOf((f7 != null ? f7.floatValue() : 0.0f) + f));
-                    }
-                }
-                for (Number number2 : b) {
-                    int intValue3 = number2.intValue();
-                    if (f6 <= ((float) intValue3)) {
-                        Map<Integer, Float> map3 = dVar.f;
-                        Integer valueOf3 = Integer.valueOf(intValue3);
-                        Float f8 = dVar.f.get(Integer.valueOf(intValue3));
-                        map3.put(valueOf3, Float.valueOf((f8 != null ? f8.floatValue() : 0.0f) + f));
-                    }
-                }
-                r.removeFirst(dVar.a);
-            }
-        }
-    }
-
-    public final Map<String, Object> b(String str) {
-        m.checkNotNullParameter(str, "userId");
-        d dVar = this.j.get(str);
-        if (dVar != null) {
-            return d(dVar);
-        }
-        return null;
-    }
-
-    public final Map<String, Object> c() {
-        return h0.plus(d(this.i), h0.mapOf(o.to("target_bitrate", Integer.valueOf(this.k)), o.to("duration_encoder_nvidia_cuda", 0), o.to("duration_encoder_nvidia_direct3d", 0), o.to("duration_encoder_openh264", 0), o.to("duration_encoder_videotoolbox", 0), o.to("duration_encoder_amd_direct3d", 0), o.to("duration_encoder_intel", 0), o.to("duration_encoder_intel_direct3d", 0), o.to("duration_encoder_unknown", 0)));
-    }
-
-    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x03d6: APUT  
-      (r4v4 kotlin.Pair[])
-      (6 ??[int, float, short, byte, char])
-      (wrap: kotlin.Pair : 0x03d1: INVOKE  (r15v3 kotlin.Pair) = 
-      ("time_to_first_frame_ms")
-      (wrap: java.lang.Long : 0x03ca: INVOKE  (r15v2 java.lang.Long) = (r2v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long)
-     type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
-     */
-    public final Map<String, Object> d(d dVar) {
-        Float valueOf;
-        long currentTimeMillis = this.l.currentTimeMillis();
-        float f = ((float) (currentTimeMillis - this.e)) / 1000.0f;
-        float f2 = ((float) dVar.d) / 1000.0f;
-        int i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1));
-        long roundToLong = (i <= 0 || (valueOf = Float.valueOf(dVar.g / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue());
-        b bVar = d;
-        Map mapOf = h0.mapOf(o.to("duration", Double.valueOf(Math.floor((double) f))), c.d.b.a.a.U(bVar, dVar.e.get(8000000), "duration_stream_under_8mbps"), c.d.b.a.a.U(bVar, dVar.e.get(7000000), "duration_stream_under_7mbps"), c.d.b.a.a.U(bVar, dVar.e.get(6000000), "duration_stream_under_6mbps"), c.d.b.a.a.U(bVar, dVar.e.get(5000000), "duration_stream_under_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(4000000), "duration_stream_under_4mbps"), c.d.b.a.a.U(bVar, dVar.e.get(3000000), "duration_stream_under_3mbps"), c.d.b.a.a.U(bVar, dVar.e.get(2000000), "duration_stream_under_2mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1500000), "duration_stream_under_1_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1000000), "duration_stream_under_1mbps"), c.d.b.a.a.U(bVar, dVar.e.get(500000), "duration_stream_under_0_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(0), "duration_stream_at_0mbps"), c.d.b.a.a.U(bVar, dVar.f.get(60), "duration_fps_under_60"), c.d.b.a.a.U(bVar, dVar.f.get(55), "duration_fps_under_55"), c.d.b.a.a.U(bVar, dVar.f.get(50), "duration_fps_under_50"), c.d.b.a.a.U(bVar, dVar.f.get(45), "duration_fps_under_45"), c.d.b.a.a.U(bVar, dVar.f.get(40), "duration_fps_under_40"), c.d.b.a.a.U(bVar, dVar.f.get(35), "duration_fps_under_35"), c.d.b.a.a.U(bVar, dVar.f.get(30), "duration_fps_under_30"), c.d.b.a.a.U(bVar, dVar.f.get(25), "duration_fps_under_25"), c.d.b.a.a.U(bVar, dVar.f.get(20), "duration_fps_under_20"), c.d.b.a.a.U(bVar, dVar.f.get(15), "duration_fps_under_15"), c.d.b.a.a.U(bVar, dVar.f.get(10), "duration_fps_under_10"), c.d.b.a.a.U(bVar, dVar.f.get(5), "duration_fps_under_5"), c.d.b.a.a.U(bVar, dVar.f.get(0), "duration_fps_at_0"), o.to("avg_resolution", Long.valueOf(roundToLong)), c.d.b.a.a.U(bVar, dVar.h.get(720), "duration_resolution_under_720"), c.d.b.a.a.U(bVar, dVar.h.get(480), "duration_resolution_under_480"), c.d.b.a.a.U(bVar, dVar.h.get(360), "duration_resolution_under_360"), o.to("num_pauses", 0), o.to("duration_paused", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.f.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_zero_receivers", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.g.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_video_stopped", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.h.c(currentTimeMillis)) / 1000.0f)))));
-        a aVar = dVar.f220c;
-        long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0;
-        long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0;
-        Pair[] pairArr = new Pair[10];
-        pairArr[0] = o.to("avg_bitrate", Long.valueOf(a2));
-        pairArr[1] = o.to("avg_fps", Long.valueOf(a3));
-        pairArr[2] = o.to("num_bytes", Long.valueOf(aVar.f));
-        pairArr[3] = o.to("num_packets_lost", Long.valueOf(aVar.d));
-        pairArr[4] = o.to("num_packets", Long.valueOf(aVar.f219c));
-        pairArr[5] = o.to("num_frames", Long.valueOf(aVar.b));
-        Long l = dVar.b;
-        pairArr[6] = o.to("time_to_first_frame_ms", Long.valueOf(l != null ? l.longValue() : 0));
-        pairArr[7] = o.to("num_frames_dropped", Long.valueOf(aVar.e));
-        pairArr[8] = o.to("num_nacks", Long.valueOf(aVar.g));
-        pairArr[9] = o.to("num_plis", Long.valueOf(aVar.h));
-        return h0.plus(mapOf, h0.mapOf(pairArr));
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public Unit mo1invoke() {
+        a aVar = this.this$0;
+        int i = a.i;
+        aVar.m(true, 4800, "Heartbeat timeout.");
+        return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/r/l0/f.java b/app/src/main/java/c/a/r/l0/f.java
index b5835d79d5..6e12562e69 100644
--- a/app/src/main/java/c/a/r/l0/f.java
+++ b/app/src/main/java/c/a/r/l0/f.java
@@ -1,23 +1,17 @@
 package c.a.r.l0;
 
-import d0.z.d.o;
-import kotlin.jvm.functions.Function2;
-/* compiled from: VideoQuality.kt */
-public final class f extends o implements Function2<Long, Long, Long> {
-    public static final f i = new f();
+import d0.z.d.m;
+import kotlin.jvm.functions.Function0;
+/* compiled from: RtcControlSocket.kt */
+public final class f implements Runnable {
+    public final /* synthetic */ Function0 i;
 
-    public f() {
-        super(2);
+    public f(Function0 function0) {
+        this.i = function0;
     }
 
-    public final long a(long j, long j2) {
-        return j2 > j ? j : j - j2;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function2
-    public /* bridge */ /* synthetic */ Long invoke(Long l, Long l2) {
-        return Long.valueOf(a(l.longValue(), l2.longValue()));
+    @Override // java.lang.Runnable
+    public final /* synthetic */ void run() {
+        m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)");
     }
 }
diff --git a/app/src/main/java/c/a/r/m0/a.java b/app/src/main/java/c/a/r/m0/a.java
new file mode 100644
index 0000000000..c7685fe833
--- /dev/null
+++ b/app/src/main/java/c/a/r/m0/a.java
@@ -0,0 +1,113 @@
+package c.a.r.m0;
+
+import c.a.r.m0.e;
+import co.discord.media_engine.InboundRtpVideo;
+import co.discord.media_engine.OutboundRtpAudio;
+import co.discord.media_engine.OutboundRtpVideo;
+import co.discord.media_engine.ReceiverReport;
+import co.discord.media_engine.Stats;
+import co.discord.media_engine.Transport;
+import com.discord.rtcconnection.KrispOveruseDetector;
+import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
+import d0.z.d.k;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.Objects;
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: RtcStatsCollector.kt */
+public final /* synthetic */ class a extends k implements Function1<Stats, Unit> {
+    public a(d dVar) {
+        super(1, dVar, d.class, "onStatsReceived", "onStatsReceived(Lco/discord/media_engine/Stats;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public Unit invoke(Stats stats) {
+        OutboundRtpVideo outboundRtpVideo;
+        ReceiverReport[] receiverReports;
+        Stats stats2 = stats;
+        m.checkNotNullParameter(stats2, "p1");
+        d dVar = (d) this.receiver;
+        dVar.a.add(stats2);
+        if (dVar.a.size() > dVar.i) {
+            dVar.a.removeFirst();
+        }
+        dVar.f.update(stats2);
+        e eVar = dVar.g;
+        Objects.requireNonNull(eVar);
+        m.checkNotNullParameter(stats2, "stats");
+        long currentTimeMillis = eVar.l.currentTimeMillis();
+        Transport transport = stats2.getTransport();
+        Integer valueOf = Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length);
+        if (valueOf != null) {
+            eVar.g.b(valueOf.intValue() == 0, currentTimeMillis);
+        }
+        boolean z2 = eVar.f.a() || eVar.g.a();
+        if (z2 != eVar.h.a()) {
+            eVar.h.b(z2, currentTimeMillis);
+            eVar.i.a.clear();
+        }
+        if (!eVar.h.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) {
+            eVar.a(eVar.i, new e.C0040e((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a((long) outboundRtpVideo.getFramesEncoded(), (long) outboundRtpVideo.getFramesSent(), (long) outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), (long) outboundRtpVideo.getNackCount(), (long) outboundRtpVideo.getPliCount())));
+            if (eVar.i.b == null && outboundRtpVideo.getFramesEncoded() > 0) {
+                eVar.i.b = Long.valueOf(currentTimeMillis - eVar.e);
+            }
+            eVar.k = outboundRtpVideo.getBitrateTarget();
+        }
+        if (!eVar.f.a()) {
+            for (Map.Entry<String, InboundRtpVideo> entry : stats2.getInboundRtpVideo().entrySet()) {
+                String key = entry.getKey();
+                InboundRtpVideo value = entry.getValue();
+                Map<String, e.d> map = eVar.j;
+                e.d dVar2 = map.get(key);
+                if (dVar2 == null) {
+                    dVar2 = new e.d();
+                    map.put(key, dVar2);
+                }
+                e.d dVar3 = dVar2;
+                eVar.a(dVar3, new e.C0040e((long) value.getResolution().getHeight(), currentTimeMillis, new e.a((long) value.getFramesDecoded(), (long) value.getFramesReceived(), (long) value.getPacketsReceived(), (long) value.getPacketsLost(), (long) value.getFramesDropped(), value.getBytesReceived(), (long) value.getNackCount(), (long) value.getPliCount())));
+                if (dVar3.b == null && value.getFramesDecoded() > 0) {
+                    dVar3.b = Long.valueOf(currentTimeMillis - eVar.e);
+                }
+            }
+        }
+        KrispOveruseDetector krispOveruseDetector = dVar.h;
+        Objects.requireNonNull(krispOveruseDetector);
+        m.checkNotNullParameter(stats2, "stats");
+        if (krispOveruseDetector.d.getType() == MediaEngineConnection.Type.DEFAULT && krispOveruseDetector.d.b()) {
+            OutboundRtpAudio outboundRtpAudio = stats2.getOutboundRtpAudio();
+            if (outboundRtpAudio != null && outboundRtpAudio.getNoiseCancellerIsEnabled()) {
+                OutboundRtpAudio outboundRtpAudio2 = krispOveruseDetector.b;
+                if (outboundRtpAudio2 != null) {
+                    Pair<Boolean, Long> a = krispOveruseDetector.a(outboundRtpAudio2, stats2.getOutboundRtpAudio(), 8.0d);
+                    boolean booleanValue = a.component1().booleanValue();
+                    long longValue = a.component2().longValue();
+                    if (booleanValue) {
+                        krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE);
+                    } else if (longValue == 0) {
+                        int i = krispOveruseDetector.f2077c + 1;
+                        krispOveruseDetector.f2077c = i;
+                        if (i > 2) {
+                            krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED);
+                        }
+                    } else {
+                        krispOveruseDetector.f2077c = 0;
+                    }
+                }
+                krispOveruseDetector.b = stats2.getOutboundRtpAudio();
+            }
+            OutboundRtpAudio outboundRtpAudio3 = stats2.getOutboundRtpAudio();
+            if (outboundRtpAudio3 != null && outboundRtpAudio3.getVoiceActivityDetectorIsEnabled()) {
+                OutboundRtpAudio outboundRtpAudio4 = krispOveruseDetector.a;
+                if (outboundRtpAudio4 != null && krispOveruseDetector.a(outboundRtpAudio4, stats2.getOutboundRtpAudio(), 4.0d).component1().booleanValue()) {
+                    krispOveruseDetector.d.f(KrispOveruseDetector.Status.VAD_CPU_OVERUSE);
+                }
+                krispOveruseDetector.a = stats2.getOutboundRtpAudio();
+            }
+        }
+        return Unit.a;
+    }
+}
diff --git a/app/src/main/java/c/a/r/m0/b.java b/app/src/main/java/c/a/r/m0/b.java
new file mode 100644
index 0000000000..1cdf056f62
--- /dev/null
+++ b/app/src/main/java/c/a/r/m0/b.java
@@ -0,0 +1,17 @@
+package c.a.r.m0;
+
+import rx.functions.Action1;
+/* compiled from: RtcStatsCollector.kt */
+public final class b<T> implements Action1<Long> {
+    public final /* synthetic */ d i;
+
+    public b(d dVar) {
+        this.i = dVar;
+    }
+
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // rx.functions.Action1
+    public void call(Long l) {
+        this.i.e.n(new a(this.i));
+    }
+}
diff --git a/app/src/main/java/c/a/r/m0/c.java b/app/src/main/java/c/a/r/m0/c.java
new file mode 100644
index 0000000000..8c4897c41d
--- /dev/null
+++ b/app/src/main/java/c/a/r/m0/c.java
@@ -0,0 +1,18 @@
+package c.a.r.m0;
+
+import com.discord.utilities.logging.Logger;
+import rx.functions.Action1;
+/* compiled from: RtcStatsCollector.kt */
+public final class c<T> implements Action1<Throwable> {
+    public final /* synthetic */ d i;
+
+    public c(d dVar) {
+        this.i = dVar;
+    }
+
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // rx.functions.Action1
+    public void call(Throwable th) {
+        Logger.e$default(this.i.d, "RtcStatsCollector: Error collecting stats", th, null, 4, null);
+    }
+}
diff --git a/app/src/main/java/c/a/r/m0/d.java b/app/src/main/java/c/a/r/m0/d.java
new file mode 100644
index 0000000000..2fae59d99a
--- /dev/null
+++ b/app/src/main/java/c/a/r/m0/d.java
@@ -0,0 +1,49 @@
+package c.a.r.m0;
+
+import co.discord.media_engine.Stats;
+import co.discord.media_engine.VoiceQuality;
+import com.discord.rtcconnection.KrispOveruseDetector;
+import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
+import com.discord.utilities.logging.Logger;
+import d0.z.d.m;
+import java.util.Deque;
+import java.util.LinkedList;
+import rx.Subscription;
+/* compiled from: RtcStatsCollector.kt */
+public final class d {
+    public final Deque<Stats> a;
+    public Subscription b;
+
+    /* renamed from: c  reason: collision with root package name */
+    public final long f217c;
+    public final Logger d;
+    public final MediaEngineConnection e;
+    public final VoiceQuality f;
+    public final e g;
+    public final KrispOveruseDetector h;
+    public final int i;
+
+    public d(long j, Logger logger, MediaEngineConnection mediaEngineConnection, VoiceQuality voiceQuality, e eVar, KrispOveruseDetector krispOveruseDetector, int i, int i2) {
+        i = (i2 & 64) != 0 ? 30 : i;
+        m.checkNotNullParameter(logger, "logger");
+        m.checkNotNullParameter(mediaEngineConnection, "connection");
+        m.checkNotNullParameter(voiceQuality, "voiceQuality");
+        m.checkNotNullParameter(eVar, "videoQuality");
+        m.checkNotNullParameter(krispOveruseDetector, "krispOveruseDetector");
+        this.f217c = j;
+        this.d = logger;
+        this.e = mediaEngineConnection;
+        this.f = voiceQuality;
+        this.g = eVar;
+        this.h = krispOveruseDetector;
+        this.i = i;
+        this.a = new LinkedList();
+    }
+
+    public final void a() {
+        Subscription subscription = this.b;
+        if (subscription != null) {
+            subscription.unsubscribe();
+        }
+    }
+}
diff --git a/app/src/main/java/c/a/r/m0/e.java b/app/src/main/java/c/a/r/m0/e.java
new file mode 100644
index 0000000000..0ccb760e28
--- /dev/null
+++ b/app/src/main/java/c/a/r/m0/e.java
@@ -0,0 +1,372 @@
+package c.a.r.m0;
+
+import com.discord.utilities.time.Clock;
+import com.discord.utilities.time.ClockFactory;
+import d0.o;
+import d0.t.h0;
+import d0.t.n;
+import d0.t.r;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import kotlin.Pair;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: VideoQuality.kt */
+public final class e {
+    public static final List<Integer> a = n.listOf((Object[]) new Integer[]{0, 500000, 1000000, 1500000, 2000000, 3000000, 4000000, 5000000, 6000000, 7000000, 8000000});
+    public static final List<Integer> b = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60});
+
+    /* renamed from: c  reason: collision with root package name */
+    public static final List<Integer> f218c = n.listOf((Object[]) new Integer[]{720, 480, 360});
+    public static final b d = new b(null);
+    public final long e;
+    public final c f;
+    public final c g;
+    public final c h;
+    public final d i;
+    public final Map<String, d> j;
+    public int k;
+    public final Clock l;
+
+    /* compiled from: VideoQuality.kt */
+    public static final class a {
+        public long a;
+        public long b;
+
+        /* renamed from: c  reason: collision with root package name */
+        public long f219c;
+        public long d;
+        public long e;
+        public long f;
+        public long g;
+        public long h;
+
+        public a() {
+            this(0, 0, 0, 0, 0, 0, 0, 0, 255);
+        }
+
+        public a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8) {
+            this.a = j;
+            this.b = j2;
+            this.f219c = j3;
+            this.d = j4;
+            this.e = j5;
+            this.f = j6;
+            this.g = j7;
+            this.h = j8;
+        }
+
+        /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+        public /* synthetic */ a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, int i) {
+            this((i & 1) != 0 ? 0 : j, (i & 2) != 0 ? 0 : j2, (i & 4) != 0 ? 0 : j3, (i & 8) != 0 ? 0 : j4, (i & 16) != 0 ? 0 : j5, (i & 32) != 0 ? 0 : j6, (i & 64) != 0 ? 0 : j7, (i & 128) == 0 ? j8 : 0);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof a)) {
+                return false;
+            }
+            a aVar = (a) obj;
+            return this.a == aVar.a && this.b == aVar.b && this.f219c == aVar.f219c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f && this.g == aVar.g && this.h == aVar.h;
+        }
+
+        public int hashCode() {
+            int a = a0.a.a.b.a(this.b);
+            int a2 = a0.a.a.b.a(this.f219c);
+            int a3 = a0.a.a.b.a(this.d);
+            int a4 = a0.a.a.b.a(this.e);
+            int a5 = a0.a.a.b.a(this.f);
+            int a6 = a0.a.a.b.a(this.g);
+            return a0.a.a.b.a(this.h) + ((a6 + ((a5 + ((a4 + ((a3 + ((a2 + ((a + (a0.a.a.b.a(this.a) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31);
+        }
+
+        public String toString() {
+            StringBuilder L = c.d.b.a.a.L("AggregatedProperties(framesCodec=");
+            L.append(this.a);
+            L.append(", framesNetwork=");
+            L.append(this.b);
+            L.append(", packets=");
+            L.append(this.f219c);
+            L.append(", packetsLost=");
+            L.append(this.d);
+            L.append(", framesDropped=");
+            L.append(this.e);
+            L.append(", bytes=");
+            L.append(this.f);
+            L.append(", nackCount=");
+            L.append(this.g);
+            L.append(", pliCount=");
+            return c.d.b.a.a.A(L, this.h, ")");
+        }
+    }
+
+    /* compiled from: VideoQuality.kt */
+    public static final class b {
+        public b(DefaultConstructorMarker defaultConstructorMarker) {
+        }
+
+        public static final long a(b bVar, Float f) {
+            if (f != null) {
+                return d0.a0.a.roundToLong(f.floatValue());
+            }
+            return 0;
+        }
+    }
+
+    /* compiled from: VideoQuality.kt */
+    public static final class c {
+        public Long a;
+        public long b;
+
+        public c(boolean z2, long j) {
+            this.a = z2 ? Long.valueOf(j) : null;
+        }
+
+        public final boolean a() {
+            return this.a != null;
+        }
+
+        public final void b(boolean z2, long j) {
+            Long l = this.a;
+            if (l == null) {
+                if (z2) {
+                    this.a = Long.valueOf(j);
+                }
+            } else if (l != null) {
+                long longValue = l.longValue();
+                if (!z2) {
+                    this.b = (j - longValue) + this.b;
+                    this.a = null;
+                }
+            }
+        }
+
+        public final long c(long j) {
+            Long l = this.a;
+            if (l == null) {
+                return this.b;
+            }
+            return (this.b + j) - l.longValue();
+        }
+    }
+
+    /* compiled from: VideoQuality.kt */
+    public static final class d {
+        public List<C0040e> a = new ArrayList();
+        public Long b;
+
+        /* renamed from: c  reason: collision with root package name */
+        public a f220c = new a(0, 0, 0, 0, 0, 0, 0, 0, 255);
+        public long d;
+        public Map<Integer, Float> e = new LinkedHashMap();
+        public Map<Integer, Float> f = new LinkedHashMap();
+        public float g;
+        public Map<Integer, Float> h = new LinkedHashMap();
+
+        public d() {
+            for (Number number : e.a) {
+                this.e.put(Integer.valueOf(number.intValue()), Float.valueOf(0.0f));
+            }
+            for (Number number2 : e.b) {
+                this.f.put(Integer.valueOf(number2.intValue()), Float.valueOf(0.0f));
+            }
+            for (Number number3 : e.f218c) {
+                this.h.put(Integer.valueOf(number3.intValue()), Float.valueOf(0.0f));
+            }
+        }
+    }
+
+    /* compiled from: VideoQuality.kt */
+    /* renamed from: c.a.r.m0.e$e  reason: collision with other inner class name */
+    public static final class C0040e {
+        public final long a;
+        public final long b;
+
+        /* renamed from: c  reason: collision with root package name */
+        public final a f221c;
+
+        public C0040e() {
+            this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 255));
+        }
+
+        public C0040e(long j, long j2, a aVar) {
+            m.checkNotNullParameter(aVar, "aggregatedProperties");
+            this.a = j;
+            this.b = j2;
+            this.f221c = aVar;
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof C0040e)) {
+                return false;
+            }
+            C0040e eVar = (C0040e) obj;
+            return this.a == eVar.a && this.b == eVar.b && m.areEqual(this.f221c, eVar.f221c);
+        }
+
+        public int hashCode() {
+            int a = (a0.a.a.b.a(this.b) + (a0.a.a.b.a(this.a) * 31)) * 31;
+            a aVar = this.f221c;
+            return a + (aVar != null ? aVar.hashCode() : 0);
+        }
+
+        public String toString() {
+            StringBuilder L = c.d.b.a.a.L("RawVideoStats(resolution=");
+            L.append(this.a);
+            L.append(", timestamp=");
+            L.append(this.b);
+            L.append(", aggregatedProperties=");
+            L.append(this.f221c);
+            L.append(")");
+            return L.toString();
+        }
+    }
+
+    public e(Clock clock, int i) {
+        Clock clock2 = (i & 1) != 0 ? ClockFactory.get() : null;
+        m.checkNotNullParameter(clock2, "clock");
+        this.l = clock2;
+        long currentTimeMillis = clock2.currentTimeMillis();
+        this.e = currentTimeMillis;
+        this.f = new c(false, currentTimeMillis);
+        this.g = new c(false, currentTimeMillis);
+        this.h = new c(false, currentTimeMillis);
+        this.i = new d();
+        this.j = new LinkedHashMap();
+    }
+
+    public final void a(d dVar, C0040e eVar) {
+        dVar.a.add(eVar);
+        if (dVar.a.size() >= 2) {
+            List<C0040e> list = dVar.a;
+            C0040e eVar2 = list.get(list.size() - 1);
+            List<C0040e> list2 = dVar.a;
+            C0040e eVar3 = list2.get(list2.size() - 2);
+            f fVar = f.i;
+            dVar.d = (eVar2.b - eVar3.b) + dVar.d;
+            a aVar = dVar.f220c;
+            a aVar2 = eVar2.f221c;
+            a aVar3 = eVar3.f221c;
+            aVar.a = fVar.a(aVar2.a, aVar3.a) + aVar.a;
+            aVar.b = fVar.a(aVar2.b, aVar3.b) + aVar.b;
+            aVar.f219c = fVar.a(aVar2.f219c, aVar3.f219c) + aVar.f219c;
+            aVar.d = fVar.a(aVar2.d, aVar3.d) + aVar.d;
+            aVar.e = fVar.a(aVar2.e, aVar3.e) + aVar.e;
+            aVar.f = fVar.a(aVar2.f, aVar3.f) + aVar.f;
+            aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g;
+            aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h;
+            a aVar4 = eVar2.f221c;
+            long j = aVar4.f;
+            long j2 = aVar4.a;
+            long j3 = eVar2.b;
+            long j4 = eVar2.a;
+            float f = ((float) (j3 - eVar3.b)) / 1000.0f;
+            dVar.g = (((float) j4) * f) + dVar.g;
+            if (dVar.a.size() >= 6) {
+                List<C0040e> list3 = dVar.a;
+                C0040e eVar4 = list3.get(list3.size() - 3);
+                a aVar5 = eVar4.f221c;
+                long j5 = aVar5.f;
+                long j6 = aVar5.a;
+                long j7 = eVar4.b;
+                Iterator<T> it = f218c.iterator();
+                while (true) {
+                    float f2 = 0.0f;
+                    if (!it.hasNext()) {
+                        break;
+                    }
+                    int intValue = ((Number) it.next()).intValue();
+                    if (j4 <= ((long) intValue)) {
+                        Map<Integer, Float> map = dVar.h;
+                        Integer valueOf = Integer.valueOf(intValue);
+                        Float f3 = dVar.h.get(Integer.valueOf(intValue));
+                        if (f3 != null) {
+                            f2 = f3.floatValue();
+                        }
+                        map.put(valueOf, Float.valueOf(f2 + f));
+                    }
+                    j2 = j2;
+                    j6 = j6;
+                }
+                float f4 = ((float) (j3 - j7)) / 1000.0f;
+                float f5 = ((float) ((j - j5) * ((long) 8))) / f4;
+                float f6 = ((float) (j2 - j6)) / f4;
+                for (Number number : a) {
+                    int intValue2 = number.intValue();
+                    if (f5 <= ((float) intValue2)) {
+                        Map<Integer, Float> map2 = dVar.e;
+                        Integer valueOf2 = Integer.valueOf(intValue2);
+                        Float f7 = dVar.e.get(Integer.valueOf(intValue2));
+                        map2.put(valueOf2, Float.valueOf((f7 != null ? f7.floatValue() : 0.0f) + f));
+                    }
+                }
+                for (Number number2 : b) {
+                    int intValue3 = number2.intValue();
+                    if (f6 <= ((float) intValue3)) {
+                        Map<Integer, Float> map3 = dVar.f;
+                        Integer valueOf3 = Integer.valueOf(intValue3);
+                        Float f8 = dVar.f.get(Integer.valueOf(intValue3));
+                        map3.put(valueOf3, Float.valueOf((f8 != null ? f8.floatValue() : 0.0f) + f));
+                    }
+                }
+                r.removeFirst(dVar.a);
+            }
+        }
+    }
+
+    public final Map<String, Object> b(String str) {
+        m.checkNotNullParameter(str, "userId");
+        d dVar = this.j.get(str);
+        if (dVar != null) {
+            return d(dVar);
+        }
+        return null;
+    }
+
+    public final Map<String, Object> c() {
+        return h0.plus(d(this.i), h0.mapOf(o.to("target_bitrate", Integer.valueOf(this.k)), o.to("duration_encoder_nvidia_cuda", 0), o.to("duration_encoder_nvidia_direct3d", 0), o.to("duration_encoder_openh264", 0), o.to("duration_encoder_videotoolbox", 0), o.to("duration_encoder_amd_direct3d", 0), o.to("duration_encoder_intel", 0), o.to("duration_encoder_intel_direct3d", 0), o.to("duration_encoder_unknown", 0)));
+    }
+
+    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x03d6: APUT  
+      (r4v4 kotlin.Pair[])
+      (6 ??[int, float, short, byte, char])
+      (wrap: kotlin.Pair : 0x03d1: INVOKE  (r15v3 kotlin.Pair) = 
+      ("time_to_first_frame_ms")
+      (wrap: java.lang.Long : 0x03ca: INVOKE  (r15v2 java.lang.Long) = (r2v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long)
+     type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
+     */
+    public final Map<String, Object> d(d dVar) {
+        Float valueOf;
+        long currentTimeMillis = this.l.currentTimeMillis();
+        float f = ((float) (currentTimeMillis - this.e)) / 1000.0f;
+        float f2 = ((float) dVar.d) / 1000.0f;
+        int i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1));
+        long roundToLong = (i <= 0 || (valueOf = Float.valueOf(dVar.g / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue());
+        b bVar = d;
+        Map mapOf = h0.mapOf(o.to("duration", Double.valueOf(Math.floor((double) f))), c.d.b.a.a.U(bVar, dVar.e.get(8000000), "duration_stream_under_8mbps"), c.d.b.a.a.U(bVar, dVar.e.get(7000000), "duration_stream_under_7mbps"), c.d.b.a.a.U(bVar, dVar.e.get(6000000), "duration_stream_under_6mbps"), c.d.b.a.a.U(bVar, dVar.e.get(5000000), "duration_stream_under_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(4000000), "duration_stream_under_4mbps"), c.d.b.a.a.U(bVar, dVar.e.get(3000000), "duration_stream_under_3mbps"), c.d.b.a.a.U(bVar, dVar.e.get(2000000), "duration_stream_under_2mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1500000), "duration_stream_under_1_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1000000), "duration_stream_under_1mbps"), c.d.b.a.a.U(bVar, dVar.e.get(500000), "duration_stream_under_0_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(0), "duration_stream_at_0mbps"), c.d.b.a.a.U(bVar, dVar.f.get(60), "duration_fps_under_60"), c.d.b.a.a.U(bVar, dVar.f.get(55), "duration_fps_under_55"), c.d.b.a.a.U(bVar, dVar.f.get(50), "duration_fps_under_50"), c.d.b.a.a.U(bVar, dVar.f.get(45), "duration_fps_under_45"), c.d.b.a.a.U(bVar, dVar.f.get(40), "duration_fps_under_40"), c.d.b.a.a.U(bVar, dVar.f.get(35), "duration_fps_under_35"), c.d.b.a.a.U(bVar, dVar.f.get(30), "duration_fps_under_30"), c.d.b.a.a.U(bVar, dVar.f.get(25), "duration_fps_under_25"), c.d.b.a.a.U(bVar, dVar.f.get(20), "duration_fps_under_20"), c.d.b.a.a.U(bVar, dVar.f.get(15), "duration_fps_under_15"), c.d.b.a.a.U(bVar, dVar.f.get(10), "duration_fps_under_10"), c.d.b.a.a.U(bVar, dVar.f.get(5), "duration_fps_under_5"), c.d.b.a.a.U(bVar, dVar.f.get(0), "duration_fps_at_0"), o.to("avg_resolution", Long.valueOf(roundToLong)), c.d.b.a.a.U(bVar, dVar.h.get(720), "duration_resolution_under_720"), c.d.b.a.a.U(bVar, dVar.h.get(480), "duration_resolution_under_480"), c.d.b.a.a.U(bVar, dVar.h.get(360), "duration_resolution_under_360"), o.to("num_pauses", 0), o.to("duration_paused", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.f.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_zero_receivers", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.g.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_video_stopped", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.h.c(currentTimeMillis)) / 1000.0f)))));
+        a aVar = dVar.f220c;
+        long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0;
+        long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0;
+        Pair[] pairArr = new Pair[10];
+        pairArr[0] = o.to("avg_bitrate", Long.valueOf(a2));
+        pairArr[1] = o.to("avg_fps", Long.valueOf(a3));
+        pairArr[2] = o.to("num_bytes", Long.valueOf(aVar.f));
+        pairArr[3] = o.to("num_packets_lost", Long.valueOf(aVar.d));
+        pairArr[4] = o.to("num_packets", Long.valueOf(aVar.f219c));
+        pairArr[5] = o.to("num_frames", Long.valueOf(aVar.b));
+        Long l = dVar.b;
+        pairArr[6] = o.to("time_to_first_frame_ms", Long.valueOf(l != null ? l.longValue() : 0));
+        pairArr[7] = o.to("num_frames_dropped", Long.valueOf(aVar.e));
+        pairArr[8] = o.to("num_nacks", Long.valueOf(aVar.g));
+        pairArr[9] = o.to("num_plis", Long.valueOf(aVar.h));
+        return h0.plus(mapOf, h0.mapOf(pairArr));
+    }
+}
diff --git a/app/src/main/java/c/a/r/m0/f.java b/app/src/main/java/c/a/r/m0/f.java
new file mode 100644
index 0000000000..9f393cff04
--- /dev/null
+++ b/app/src/main/java/c/a/r/m0/f.java
@@ -0,0 +1,23 @@
+package c.a.r.m0;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function2;
+/* compiled from: VideoQuality.kt */
+public final class f extends o implements Function2<Long, Long, Long> {
+    public static final f i = new f();
+
+    public f() {
+        super(2);
+    }
+
+    public final long a(long j, long j2) {
+        return j2 > j ? j : j - j2;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function2
+    public /* bridge */ /* synthetic */ Long invoke(Long l, Long l2) {
+        return Long.valueOf(a(l.longValue(), l2.longValue()));
+    }
+}
diff --git a/app/src/main/java/c/a/r/o.java b/app/src/main/java/c/a/r/o.java
index b8c211e484..e5fefe4dc9 100644
--- a/app/src/main/java/c/a/r/o.java
+++ b/app/src/main/java/c/a/r/o.java
@@ -1,6 +1,6 @@
 package c.a.r;
 
-import c.a.r.k0.a;
+import c.a.r.l0.a;
 import com.discord.rtcconnection.RtcConnection;
 import d0.z.d.m;
 import kotlin.Unit;
@@ -25,7 +25,7 @@ public final class o extends d0.z.d.o implements Function0<Unit> {
         Boolean bool = this.$isConnected;
         m.checkNotNullExpressionValue(bool, "isConnected");
         boolean booleanValue = bool.booleanValue();
-        a aVar = rtcConnection.m;
+        a aVar = rtcConnection.v;
         if (aVar == null) {
             RtcConnection.o(rtcConnection, "handleConnectivityChange() socket was null.", null, null, 6);
         } else if (booleanValue) {
diff --git a/app/src/main/java/c/a/r/q.java b/app/src/main/java/c/a/r/q.java
index 43d86f63de..9d5ae35e99 100644
--- a/app/src/main/java/c/a/r/q.java
+++ b/app/src/main/java/c/a/r/q.java
@@ -16,7 +16,7 @@ public final class q<T> implements Action1<Throwable> {
     public void call(Throwable th) {
         RtcConnection rtcConnection = this.i;
         StringBuilder L = a.L("failed to handle connectivity change in ");
-        L.append(this.i.f2074c);
+        L.append(this.i.k);
         RtcConnection.o(rtcConnection, L.toString(), th, null, 4);
     }
 }
diff --git a/app/src/main/java/c/a/r/r.java b/app/src/main/java/c/a/r/r.java
index 6d7c9b6b3b..f375f20c5b 100644
--- a/app/src/main/java/c/a/r/r.java
+++ b/app/src/main/java/c/a/r/r.java
@@ -4,15 +4,15 @@ import com.discord.rtcconnection.RtcConnection;
 import d0.z.d.m;
 /* compiled from: RtcConnection.kt */
 public final class r extends RtcConnection.b {
-    public final /* synthetic */ RtcConnection a;
+    public final /* synthetic */ RtcConnection i;
 
     public r(RtcConnection rtcConnection) {
-        this.a = rtcConnection;
+        this.i = rtcConnection;
     }
 
     @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c
     public void onStateChange(RtcConnection.StateChange stateChange) {
         m.checkNotNullParameter(stateChange, "stateChange");
-        this.a.j.onNext(stateChange);
+        this.i.f2081s.onNext(stateChange);
     }
 }
diff --git a/app/src/main/java/c/a/r/s.java b/app/src/main/java/c/a/r/s.java
index d3f5a04ffb..7d1df5a67c 100644
--- a/app/src/main/java/c/a/r/s.java
+++ b/app/src/main/java/c/a/r/s.java
@@ -1,6 +1,6 @@
 package c.a.r;
 
-import c.a.r.k0.a;
+import c.a.r.l0.a;
 import com.discord.rtcconnection.RtcConnection;
 import d0.g0.t;
 import d0.t.g0;
@@ -29,10 +29,10 @@ public final class s extends o implements Function0<Unit> {
         String str = wVar.$endpoint;
         String str2 = wVar.$token;
         SSLSocketFactory sSLSocketFactory = wVar.$sslSocketFactory;
-        rtcConnection.g.succeed();
+        rtcConnection.p.succeed();
         String str3 = sSLSocketFactory != null ? "wss" : "ws";
         if (str == null || str.length() == 0) {
-            a aVar = rtcConnection.m;
+            a aVar = rtcConnection.v;
             if (aVar != null) {
                 aVar.e();
             }
@@ -41,11 +41,11 @@ public final class s extends o implements Function0<Unit> {
             String replace$default = t.replace$default(str, ".gg", ".media", false, 4, (Object) null);
             String v = c.d.b.a.a.v(str3, "://", replace$default);
             String replace$default2 = t.replace$default(v, ":80", ":443", false, 4, (Object) null);
-            a aVar2 = rtcConnection.m;
+            a aVar2 = rtcConnection.v;
             if (aVar2 != null) {
                 aVar2.e();
             }
-            if (rtcConnection.k) {
+            if (rtcConnection.t) {
                 RtcConnection.j(rtcConnection, false, "Connect called on destroyed instance.", null, false, 4);
             } else if (str2 == null) {
                 RtcConnection.j(rtcConnection, false, "Connect called with no token.", null, false, 12);
@@ -53,17 +53,17 @@ public final class s extends o implements Function0<Unit> {
                 rtcConnection.r("connecting via endpoint: " + replace$default + " token: " + str2);
                 try {
                     URI uri = new URI(v);
-                    rtcConnection.o = uri.getHost();
-                    rtcConnection.p = Integer.valueOf(uri.getPort());
+                    rtcConnection.f2082x = uri.getHost();
+                    rtcConnection.f2083y = Integer.valueOf(uri.getPort());
                 } catch (Exception e) {
-                    rtcConnection.J.e(rtcConnection.f2074c, "Failed to parse RTC endpoint", e, g0.mapOf(d0.o.to("endpoint", replace$default)));
+                    rtcConnection.S.e(rtcConnection.k, "Failed to parse RTC endpoint", e, g0.mapOf(d0.o.to("endpoint", replace$default)));
                 }
-                a aVar3 = new a(replace$default2, str2, sSLSocketFactory, rtcConnection.J, rtcConnection.I.c(), rtcConnection.K, rtcConnection.f2074c);
-                d0 d0Var = rtcConnection.A;
+                a aVar3 = new a(replace$default2, str2, sSLSocketFactory, rtcConnection.S, rtcConnection.R.c(), rtcConnection.T, rtcConnection.k);
+                d0 d0Var = rtcConnection.J;
                 m.checkNotNullParameter(d0Var, "listener");
-                aVar3.g.add(d0Var);
+                aVar3.p.add(d0Var);
                 aVar3.f();
-                rtcConnection.m = aVar3;
+                rtcConnection.v = aVar3;
             }
         }
         return Unit.a;
diff --git a/app/src/main/java/c/a/r/w.java b/app/src/main/java/c/a/r/w.java
index 25cb5ab065..697608d802 100644
--- a/app/src/main/java/c/a/r/w.java
+++ b/app/src/main/java/c/a/r/w.java
@@ -27,10 +27,10 @@ public final class w extends o implements Function0<Unit> {
     /* renamed from: invoke */
     public Unit mo1invoke() {
         RtcConnection rtcConnection = this.this$0;
-        rtcConnection.r = Long.valueOf(rtcConnection.K.currentTimeMillis());
+        rtcConnection.A = Long.valueOf(rtcConnection.T.currentTimeMillis());
         RtcConnection rtcConnection2 = this.this$0;
-        rtcConnection2.t++;
-        rtcConnection2.u = rtcConnection2.I.a().d0(2, TimeUnit.SECONDS).X(new t(this), new v(this));
+        rtcConnection2.C++;
+        rtcConnection2.D = rtcConnection2.R.a().c0(2, TimeUnit.SECONDS).W(new t(this), new v(this));
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/r/z.java b/app/src/main/java/c/a/r/z.java
index f4df750d69..58ac83f940 100644
--- a/app/src/main/java/c/a/r/z.java
+++ b/app/src/main/java/c/a/r/z.java
@@ -1,6 +1,6 @@
 package c.a.r;
 
-import c.a.r.k0.a;
+import c.a.r.l0.a;
 import com.discord.rtcconnection.EncodeQuality;
 import com.discord.rtcconnection.RtcConnection;
 import d0.t.g0;
@@ -24,11 +24,11 @@ public final /* synthetic */ class z extends k implements Function1<Pair<? exten
         Pair<? extends Map<String, ? extends EncodeQuality>, ? extends RtcConnection.State> pair2 = pair;
         m.checkNotNullParameter(pair2, "p1");
         RtcConnection rtcConnection = (RtcConnection) this.receiver;
-        if (rtcConnection.P) {
+        if (rtcConnection.Y) {
             Map map = (Map) pair2.component1();
             if (m.areEqual((RtcConnection.State) pair2.component2(), RtcConnection.State.f.a)) {
-                rtcConnection.J.i(rtcConnection.f2074c, "local MediaSinkWants: " + map, null);
-                a aVar = rtcConnection.m;
+                rtcConnection.S.i(rtcConnection.k, "local MediaSinkWants: " + map, null);
+                a aVar = rtcConnection.v;
                 if (aVar == null) {
                     RtcConnection.o(rtcConnection, "onLocalMediaSinkWants() socket was null.", null, null, 6);
                 } else {
@@ -38,7 +38,7 @@ public final /* synthetic */ class z extends k implements Function1<Pair<? exten
                     }
                     m.checkNotNullParameter(linkedHashMap, "wants");
                     aVar.b();
-                    if (aVar.h >= 5) {
+                    if (aVar.q >= 5) {
                         aVar.o(15, linkedHashMap);
                     }
                 }
diff --git a/app/src/main/java/c/a/s/b.java b/app/src/main/java/c/a/s/b.java
index f21aecead4..3122d0fef7 100644
--- a/app/src/main/java/c/a/s/b.java
+++ b/app/src/main/java/c/a/s/b.java
@@ -74,7 +74,7 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
             }
             String joinToString$default = u.joinToString$default(arrayList, "&", null, null, 0, null, null, 62, null);
             RequestBody.Companion companion = RequestBody.Companion;
-            MediaType.a aVar = MediaType.f2851c;
+            MediaType.a aVar = MediaType.f2857c;
             RequestBody a = companion.a(joinToString$default, MediaType.a.a("application/x-www-form-urlencoded"));
             z.a aVar2 = new z.a();
             m.checkParameterIsNotNull(a, "body");
diff --git a/app/src/main/java/c/a/u/b/b/e.java b/app/src/main/java/c/a/u/b/b/e.java
index ca98aba37c..ee2902968e 100644
--- a/app/src/main/java/c/a/u/b/b/e.java
+++ b/app/src/main/java/c/a/u/b/b/e.java
@@ -79,29 +79,39 @@ public final class e {
         arrayList.add(new d(eVar2, pattern2));
         Pattern pattern3 = a;
         m.checkNotNullExpressionValue(pattern3, "PATTERN_BOLD");
-        arrayList.add(b(pattern3, a.i));
+        arrayList.add(c(pattern3, a.i));
         Pattern pattern4 = b;
         m.checkNotNullExpressionValue(pattern4, "PATTERN_UNDERLINE");
-        arrayList.add(b(pattern4, g.i));
+        arrayList.add(c(pattern4, g.i));
         Pattern pattern5 = g;
         m.checkNotNullExpressionValue(pattern5, "PATTERN_ITALICS");
         arrayList.add(new c(eVar2, pattern5));
         Pattern pattern6 = f231c;
         m.checkNotNullExpressionValue(pattern6, "PATTERN_STRIKETHRU");
-        arrayList.add(b(pattern6, f.i));
+        arrayList.add(c(pattern6, f.i));
         if (z2) {
-            arrayList.add(eVar2.c());
+            arrayList.add(eVar2.d());
         }
         return arrayList;
     }
 
-    public static final <R, S> Rule<R, Node<R>, S> b(Pattern pattern, Function0<? extends List<? extends CharacterStyle>> function0) {
+    public static /* synthetic */ List b(boolean z2, boolean z3, int i) {
+        if ((i & 1) != 0) {
+            z2 = true;
+        }
+        if ((i & 2) != 0) {
+            z3 = true;
+        }
+        return a(z2, z3);
+    }
+
+    public static final <R, S> Rule<R, Node<R>, S> c(Pattern pattern, Function0<? extends List<? extends CharacterStyle>> function0) {
         m.checkNotNullParameter(pattern, "pattern");
         m.checkNotNullParameter(function0, "styleFactory");
         return new a(function0, pattern, pattern);
     }
 
-    public final <R, S> Rule<R, Node<R>, S> c() {
+    public final <R, S> Rule<R, Node<R>, S> d() {
         Pattern pattern = e;
         m.checkNotNullExpressionValue(pattern, "PATTERN_TEXT");
         return new b(this, pattern);
diff --git a/app/src/main/java/c/a/u/c/a.java b/app/src/main/java/c/a/u/c/a.java
index 65ee15007a..49bb7d50c8 100644
--- a/app/src/main/java/c/a/u/c/a.java
+++ b/app/src/main/java/c/a/u/c/a.java
@@ -38,7 +38,7 @@ public final class a {
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
         public C0044a(Function1<? super Integer, ? extends CharacterStyle> function1, Function1<? super String, ? extends T> function12) {
-            this(function1, function12, u.plus((Collection<? extends Rule>) e.a(false, true), e.h.c()));
+            this(function1, function12, u.plus((Collection<? extends Rule>) e.b(false, false, 2), e.h.d()));
             m.checkNotNullParameter(function1, "styleSpanProvider");
             m.checkNotNullParameter(function12, "classSpanProvider");
         }
diff --git a/app/src/main/java/c/a/w/b.java b/app/src/main/java/c/a/w/b.java
index d59276329b..45aaa56072 100644
--- a/app/src/main/java/c/a/w/b.java
+++ b/app/src/main/java/c/a/w/b.java
@@ -1,80 +1,23 @@
 package c.a.w;
 
-import android.graphics.drawable.Drawable;
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
-import com.discord.utilities.views.ViewCoroutineScopeKt;
-import d0.l;
-import d0.w.g.c;
-import d0.w.h.a.e;
-import d0.w.h.a.k;
-import d0.z.d.m;
-import kotlin.Unit;
-import kotlin.coroutines.Continuation;
-import kotlin.jvm.functions.Function2;
-import kotlinx.coroutines.CoroutineScope;
+import com.discord.tooltips.SparkleView;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
 /* compiled from: SparkleView.kt */
-public final class b extends Animatable2Compat.AnimationCallback {
-    public final /* synthetic */ c a;
-    public final /* synthetic */ AnimatedVectorDrawableCompat b;
+public final class b extends o implements Function0<AnimatedVectorDrawableCompat> {
+    public final /* synthetic */ SparkleView this$0;
 
-    /* compiled from: SparkleView.kt */
-    @e(c = "com.discord.tooltips.SparkleView$startAnimation$1$onAnimationEnd$1", f = "SparkleView.kt", l = {59}, m = "invokeSuspend")
-    public static final class a extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
-        public int label;
-        public final /* synthetic */ b this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public a(b bVar, Continuation continuation) {
-            super(2, continuation);
-            this.this$0 = bVar;
-        }
-
-        @Override // d0.w.h.a.a
-        public final Continuation<Unit> create(Object obj, Continuation<?> continuation) {
-            m.checkNotNullParameter(continuation, "completion");
-            return new a(this.this$0, continuation);
-        }
-
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function2
-        public final Object invoke(CoroutineScope coroutineScope, Continuation<? super Unit> continuation) {
-            Continuation<? super Unit> continuation2 = continuation;
-            m.checkNotNullParameter(continuation2, "completion");
-            return new a(this.this$0, continuation2).invokeSuspend(Unit.a);
-        }
-
-        @Override // d0.w.h.a.a
-        public final Object invokeSuspend(Object obj) {
-            Object coroutine_suspended = c.getCOROUTINE_SUSPENDED();
-            int i = this.label;
-            if (i == 0) {
-                l.throwOnFailure(obj);
-                this.label = 1;
-                if (c.q.a.k.a.n(500, this) == coroutine_suspended) {
-                    return coroutine_suspended;
-                }
-            } else if (i == 1) {
-                l.throwOnFailure(obj);
-            } else {
-                throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
-            }
-            this.this$0.b.start();
-            return Unit.a;
-        }
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public b(SparkleView sparkleView) {
+        super(0);
+        this.this$0 = sparkleView;
     }
 
-    public b(c cVar, AnimatedVectorDrawableCompat animatedVectorDrawableCompat) {
-        this.a = cVar;
-        this.b = animatedVectorDrawableCompat;
-    }
-
-    @Override // androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback
-    public void onAnimationEnd(Drawable drawable) {
-        m.checkNotNullParameter(drawable, "drawable");
-        CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(this.a);
-        if (coroutineScope != null) {
-            c.q.a.k.a.G(coroutineScope, null, null, new a(this, null), 3, null);
-        }
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public AnimatedVectorDrawableCompat mo1invoke() {
+        return AnimatedVectorDrawableCompat.create(this.this$0.getContext(), this.this$0.j);
     }
 }
diff --git a/app/src/main/java/c/a/w/c.java b/app/src/main/java/c/a/w/c.java
index b2d53cb293..fd927e1312 100644
--- a/app/src/main/java/c/a/w/c.java
+++ b/app/src/main/java/c/a/w/c.java
@@ -1,41 +1,81 @@
 package c.a.w;
 
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
+import android.graphics.drawable.Drawable;
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
-import c.a.i.g1;
+import com.discord.tooltips.SparkleView;
+import com.discord.utilities.views.ViewCoroutineScopeKt;
+import d0.l;
+import d0.w.h.a.e;
+import d0.w.h.a.k;
 import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.coroutines.Continuation;
+import kotlin.jvm.functions.Function2;
+import kotlinx.coroutines.CoroutineScope;
 /* compiled from: SparkleView.kt */
-public final class c extends FrameLayout {
-    public final g1 i;
-    public int j;
+public final class c extends Animatable2Compat.AnimationCallback {
+    public final /* synthetic */ SparkleView a;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public c(Context context, AttributeSet attributeSet, int i) {
-        super(context, null);
-        int i2 = i & 2;
-        m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558661, this);
-        ImageView imageView = (ImageView) findViewById(2131364953);
-        if (imageView != null) {
-            g1 g1Var = new g1(this, imageView);
-            m.checkNotNullExpressionValue(g1Var, "SparkleViewBinding.infla…ater.from(context), this)");
-            this.i = g1Var;
-            this.j = 2131232311;
-            setLayoutParams(new FrameLayout.LayoutParams(-2, -2));
-            AnimatedVectorDrawableCompat create = AnimatedVectorDrawableCompat.create(getContext(), this.j);
-            if (create != null) {
-                m.checkNotNullExpressionValue(create, "AnimatedVectorDrawableCo…tionResId\n    ) ?: return");
-                imageView.setImageDrawable(create);
-                create.registerAnimationCallback(new b(this, create));
-                create.start();
-                return;
-            }
-            return;
+    /* compiled from: SparkleView.kt */
+    @e(c = "com.discord.tooltips.SparkleView$startAnimation$1$onAnimationEnd$1", f = "SparkleView.kt", l = {61}, m = "invokeSuspend")
+    public static final class a extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
+        public int label;
+        public final /* synthetic */ c this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public a(c cVar, Continuation continuation) {
+            super(2, continuation);
+            this.this$0 = cVar;
+        }
+
+        @Override // d0.w.h.a.a
+        public final Continuation<Unit> create(Object obj, Continuation<?> continuation) {
+            m.checkNotNullParameter(continuation, "completion");
+            return new a(this.this$0, continuation);
+        }
+
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function2
+        public final Object invoke(CoroutineScope coroutineScope, Continuation<? super Unit> continuation) {
+            Continuation<? super Unit> continuation2 = continuation;
+            m.checkNotNullParameter(continuation2, "completion");
+            return new a(this.this$0, continuation2).invokeSuspend(Unit.a);
+        }
+
+        @Override // d0.w.h.a.a
+        public final Object invokeSuspend(Object obj) {
+            Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED();
+            int i = this.label;
+            if (i == 0) {
+                l.throwOnFailure(obj);
+                this.label = 1;
+                if (c.q.a.k.a.n(500, this) == coroutine_suspended) {
+                    return coroutine_suspended;
+                }
+            } else if (i == 1) {
+                l.throwOnFailure(obj);
+            } else {
+                throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
+            }
+            AnimatedVectorDrawableCompat a = SparkleView.a(this.this$0.a);
+            if (a != null) {
+                a.start();
+            }
+            return Unit.a;
+        }
+    }
+
+    public c(SparkleView sparkleView) {
+        this.a = sparkleView;
+    }
+
+    @Override // androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback
+    public void onAnimationEnd(Drawable drawable) {
+        m.checkNotNullParameter(drawable, "drawable");
+        CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(this.a);
+        if (coroutineScope != null) {
+            c.q.a.k.a.G(coroutineScope, null, null, new a(this, null), 3, null);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131364953)));
     }
 }
diff --git a/app/src/main/java/c/a/z/a0.java b/app/src/main/java/c/a/z/a0.java
index fa99232613..b8338e3ab8 100644
--- a/app/src/main/java/c/a/z/a0.java
+++ b/app/src/main/java/c/a/z/a0.java
@@ -8,7 +8,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.os.BundleKt;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.i.d;
 import com.discord.app.AppBottomSheet;
@@ -18,9 +20,9 @@ import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.utilities.views.SimpleRecyclerAdapter;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.textview.MaterialTextView;
+import d0.o;
 import d0.z.d.k;
 import d0.z.d.m;
-import d0.z.d.o;
 import java.io.Serializable;
 import java.util.List;
 import kotlin.Unit;
@@ -39,6 +41,18 @@ public final class a0 extends AppBottomSheet implements h {
     public static final class a {
         public a(DefaultConstructorMarker defaultConstructorMarker) {
         }
+
+        public final a0 a(FragmentManager fragmentManager, String str, List<b0> list, boolean z2, Function1<? super Integer, Unit> function1) {
+            m.checkNotNullParameter(fragmentManager, "fragmentManager");
+            m.checkNotNullParameter(str, "title");
+            m.checkNotNullParameter(list, "options");
+            m.checkNotNullParameter(function1, "onSelectedListener");
+            a0 a0Var = new a0();
+            a0Var.setArguments(BundleKt.bundleOf(o.to("simple_bottom_sheet_title", str), o.to("simple_bottom_sheet_options", list), o.to("simple_bottom_sheet_show_dividers", Boolean.valueOf(z2))));
+            a0Var.k = function1;
+            a0Var.show(fragmentManager, d0.z.d.a0.getOrCreateKotlinClass(a0.class).toString());
+            return a0Var;
+        }
     }
 
     /* compiled from: SelectorBottomSheet.kt */
@@ -55,14 +69,14 @@ public final class a0 extends AppBottomSheet implements h {
         public c.a.i.c invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131365625;
-            ConstraintLayout constraintLayout = (ConstraintLayout) view2.findViewById(2131365625);
+            int i2 = 2131365686;
+            ConstraintLayout constraintLayout = (ConstraintLayout) view2.findViewById(2131365686);
             if (constraintLayout != null) {
-                i2 = 2131365626;
-                TextView textView = (TextView) view2.findViewById(2131365626);
+                i2 = 2131365687;
+                TextView textView = (TextView) view2.findViewById(2131365687);
                 if (textView != null) {
-                    i2 = 2131365627;
-                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131365627);
+                    i2 = 2131365688;
+                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131365688);
                     if (maxHeightRecyclerView != null) {
                         return new c.a.i.c((ConstraintLayout) view2, constraintLayout, textView, maxHeightRecyclerView);
                     }
@@ -73,7 +87,7 @@ public final class a0 extends AppBottomSheet implements h {
     }
 
     /* compiled from: SelectorBottomSheet.kt */
-    public static final class c extends o implements Function2<LayoutInflater, ViewGroup, d0> {
+    public static final class c extends d0.z.d.o implements Function2<LayoutInflater, ViewGroup, d0> {
         public final /* synthetic */ a0 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -91,14 +105,14 @@ public final class a0 extends AppBottomSheet implements h {
             m.checkNotNullParameter(layoutInflater2, "inflater");
             m.checkNotNullParameter(viewGroup2, "parent");
             View inflate = layoutInflater2.inflate(2131558435, viewGroup2, false);
-            int i = 2131364570;
-            MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364570);
+            int i = 2131364609;
+            MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364609);
             if (materialTextView != null) {
-                i = 2131364573;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364573);
+                i = 2131364612;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364612);
                 if (simpleDraweeView != null) {
-                    i = 2131364575;
-                    MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364575);
+                    i = 2131364614;
+                    MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364614);
                     if (materialTextView2 != null) {
                         d dVar = new d((ConstraintLayout) inflate, materialTextView, simpleDraweeView, materialTextView2);
                         m.checkNotNullExpressionValue(dVar, "BottomSheetSimpleSelecto…(inflater, parent, false)");
@@ -158,19 +172,29 @@ public final class a0 extends AppBottomSheet implements h {
             serializable = null;
         }
         List list = (List) serializable;
-        TextView textView = g().b;
+        boolean z2 = getArgumentsOrDefault().getBoolean("simple_bottom_sheet_show_dividers");
+        TextView textView = g().f71c;
         m.checkNotNullExpressionValue(textView, "binding.widgetSimpleBottomSheetSelectorPlaceholder");
         textView.setText(string);
+        ConstraintLayout constraintLayout = g().b;
+        m.checkNotNullExpressionValue(constraintLayout, "binding.widgetSimpleBottomSheetSelectorHeader");
+        int i2 = 0;
+        if (!(!(string == null || string.length() == 0))) {
+            i2 = 8;
+        }
+        constraintLayout.setVisibility(i2);
         if (list != null) {
-            MaxHeightRecyclerView maxHeightRecyclerView = g().f70c;
+            MaxHeightRecyclerView maxHeightRecyclerView = g().d;
             m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.widgetSimpleBottomSheetSelectorRecycler");
             maxHeightRecyclerView.setAdapter(new SimpleRecyclerAdapter(list, new c(this)));
-            MaxHeightRecyclerView maxHeightRecyclerView2 = g().f70c;
+            MaxHeightRecyclerView maxHeightRecyclerView2 = g().d;
             RecyclerView.Adapter adapter = maxHeightRecyclerView2.getAdapter();
             if (adapter != null) {
                 adapter.notifyDataSetChanged();
             }
-            SimpleRecyclerAdapter.Companion.addThemedDivider(maxHeightRecyclerView2);
+            if (z2) {
+                SimpleRecyclerAdapter.Companion.addThemedDivider(maxHeightRecyclerView2);
+            }
         }
     }
 }
diff --git a/app/src/main/java/c/a/z/b0.java b/app/src/main/java/c/a/z/b0.java
index c292ac1589..b350ca5657 100644
--- a/app/src/main/java/c/a/z/b0.java
+++ b/app/src/main/java/c/a/z/b0.java
@@ -1,5 +1,6 @@
 package c.a.z;
 
+import androidx.annotation.ColorInt;
 import c.d.b.a.a;
 import d0.z.d.m;
 import java.io.Serializable;
@@ -8,12 +9,20 @@ public final class b0 implements Serializable {
     private final CharSequence description;
     private final String iconUri;
     private final String title;
+    private final Integer titleTextColor;
 
-    public b0(String str, CharSequence charSequence, String str2) {
+    public b0(String str, CharSequence charSequence, String str2, @ColorInt Integer num) {
         m.checkNotNullParameter(str, "title");
         this.title = str;
         this.description = charSequence;
         this.iconUri = str2;
+        this.titleTextColor = num;
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ b0(String str, CharSequence charSequence, String str2, Integer num, int i) {
+        this(str, charSequence, str2, null);
+        int i2 = i & 8;
     }
 
     public final CharSequence a() {
@@ -28,6 +37,10 @@ public final class b0 implements Serializable {
         return this.title;
     }
 
+    public final Integer d() {
+        return this.titleTextColor;
+    }
+
     @Override // java.lang.Object
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -37,7 +50,7 @@ public final class b0 implements Serializable {
             return false;
         }
         b0 b0Var = (b0) obj;
-        return m.areEqual(this.title, b0Var.title) && m.areEqual(this.description, b0Var.description) && m.areEqual(this.iconUri, b0Var.iconUri);
+        return m.areEqual(this.title, b0Var.title) && m.areEqual(this.description, b0Var.description) && m.areEqual(this.iconUri, b0Var.iconUri) && m.areEqual(this.titleTextColor, b0Var.titleTextColor);
     }
 
     @Override // java.lang.Object
@@ -48,10 +61,12 @@ public final class b0 implements Serializable {
         CharSequence charSequence = this.description;
         int hashCode2 = (hashCode + (charSequence != null ? charSequence.hashCode() : 0)) * 31;
         String str2 = this.iconUri;
-        if (str2 != null) {
-            i = str2.hashCode();
+        int hashCode3 = (hashCode2 + (str2 != null ? str2.hashCode() : 0)) * 31;
+        Integer num = this.titleTextColor;
+        if (num != null) {
+            i = num.hashCode();
         }
-        return hashCode2 + i;
+        return hashCode3 + i;
     }
 
     @Override // java.lang.Object
@@ -61,6 +76,8 @@ public final class b0 implements Serializable {
         L.append(", description=");
         L.append(this.description);
         L.append(", iconUri=");
-        return a.D(L, this.iconUri, ")");
+        L.append(this.iconUri);
+        L.append(", titleTextColor=");
+        return a.B(L, this.titleTextColor, ")");
     }
 }
diff --git a/app/src/main/java/c/a/z/d0.java b/app/src/main/java/c/a/z/d0.java
index 8ff32115bb..f29ec66a3d 100644
--- a/app/src/main/java/c/a/z/d0.java
+++ b/app/src/main/java/c/a/z/d0.java
@@ -3,6 +3,7 @@ package c.a.z;
 import android.content.DialogInterface;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.i.d;
+import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.views.SimpleRecyclerAdapter;
@@ -33,14 +34,24 @@ public final class d0 extends SimpleRecyclerAdapter.ViewHolder<b0> {
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // com.discord.utilities.views.SimpleRecyclerAdapter.ViewHolder
     public void bind(b0 b0Var) {
+        int i;
         b0 b0Var2 = b0Var;
         m.checkNotNullParameter(b0Var2, "data");
         MaterialTextView materialTextView = this.f233c.d;
         m.checkNotNullExpressionValue(materialTextView, "itemBinding.selectComponentSheetItemTitle");
         materialTextView.setText(b0Var2.c());
-        MaterialTextView materialTextView2 = this.f233c.b;
-        m.checkNotNullExpressionValue(materialTextView2, "itemBinding.selectComponentSheetItemDescription");
-        ViewExtensions.setTextAndVisibilityBy(materialTextView2, b0Var2.a());
+        Integer d = b0Var2.d();
+        if (d != null) {
+            i = d.intValue();
+        } else {
+            MaterialTextView materialTextView2 = this.f233c.d;
+            m.checkNotNullExpressionValue(materialTextView2, "itemBinding.selectComponentSheetItemTitle");
+            i = ColorCompat.getThemedColor(materialTextView2, 2130968932);
+        }
+        this.f233c.d.setTextColor(i);
+        MaterialTextView materialTextView3 = this.f233c.b;
+        m.checkNotNullExpressionValue(materialTextView3, "itemBinding.selectComponentSheetItemDescription");
+        ViewExtensions.setTextAndVisibilityBy(materialTextView3, b0Var2.a());
         if (b0Var2.b() != null) {
             SimpleDraweeView simpleDraweeView = this.f233c.f76c;
             m.checkNotNullExpressionValue(simpleDraweeView, "itemBinding.selectComponentSheetItemIcon");
diff --git a/app/src/main/java/c/a/z/e0.java b/app/src/main/java/c/a/z/e0.java
index 2487abb571..05f2846aae 100644
--- a/app/src/main/java/c/a/z/e0.java
+++ b/app/src/main/java/c/a/z/e0.java
@@ -20,7 +20,7 @@ public final class e0 extends o implements Function0<Drawable> {
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public Drawable mo1invoke() {
-        Drawable drawable = ContextCompat.getDrawable(this.this$0.getContext(), 2131232041);
+        Drawable drawable = ContextCompat.getDrawable(this.this$0.getContext(), 2131232049);
         if (drawable != null) {
             drawable.setTint(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968949));
         }
diff --git a/app/src/main/java/c/a/z/g.java b/app/src/main/java/c/a/z/g.java
index 5381ef4c48..1e81097b63 100644
--- a/app/src/main/java/c/a/z/g.java
+++ b/app/src/main/java/c/a/z/g.java
@@ -4,7 +4,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import c.a.i.n0;
+import c.a.i.o0;
 import com.discord.views.OAuthPermissionViews;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -26,10 +26,10 @@ public final class g extends o implements Function2<LayoutInflater, ViewGroup, O
         ViewGroup viewGroup2 = viewGroup;
         m.checkNotNullParameter(layoutInflater2, "inflater");
         m.checkNotNullParameter(viewGroup2, "parent");
-        View inflate = layoutInflater2.inflate(2131558609, viewGroup2, false);
+        View inflate = layoutInflater2.inflate(2131558610, viewGroup2, false);
         Objects.requireNonNull(inflate, "rootView");
-        n0 n0Var = new n0((TextView) inflate);
-        m.checkNotNullExpressionValue(n0Var, "OauthTokenPermissionList…(inflater, parent, false)");
-        return new OAuthPermissionViews.a(n0Var);
+        o0 o0Var = new o0((TextView) inflate);
+        m.checkNotNullExpressionValue(o0Var, "OauthTokenPermissionList…(inflater, parent, false)");
+        return new OAuthPermissionViews.a(o0Var);
     }
 }
diff --git a/app/src/main/java/c/a/z/i0/a.java b/app/src/main/java/c/a/z/i0/a.java
index d4ce627022..2e9745f8e3 100644
--- a/app/src/main/java/c/a/z/i0/a.java
+++ b/app/src/main/java/c/a/z/i0/a.java
@@ -18,8 +18,8 @@ public final class a<T, R> implements b<Unit, Observable<? extends Point>> {
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // j0.k.b
     public Observable<? extends Point> call(Unit unit) {
-        Observable<R> L = this.i.i.P(50, TimeUnit.MILLISECONDS).G(f.i).L();
-        m.checkNotNullExpressionValue(L, "frameResolutionSubject\n …  .onBackpressureLatest()");
-        return L;
+        Observable<R> K = this.i.i.O(50, TimeUnit.MILLISECONDS).F(f.i).K();
+        m.checkNotNullExpressionValue(K, "frameResolutionSubject\n …  .onBackpressureLatest()");
+        return K;
     }
 }
diff --git a/app/src/main/java/c/a/z/i0/e.java b/app/src/main/java/c/a/z/i0/e.java
index 06c69aa7b2..0f87c10936 100644
--- a/app/src/main/java/c/a/z/i0/e.java
+++ b/app/src/main/java/c/a/z/i0/e.java
@@ -4,7 +4,7 @@ import org.webrtc.RendererCommon;
 import rx.subjects.BehaviorSubject;
 /* compiled from: RxRendererEvents.kt */
 public final class e implements RendererCommon.RendererEvents {
-    public final BehaviorSubject<a> i = BehaviorSubject.l0();
+    public final BehaviorSubject<a> i = BehaviorSubject.k0();
 
     /* compiled from: RxRendererEvents.kt */
     public static final class a {
diff --git a/app/src/main/java/c/a/z/i0/o.java b/app/src/main/java/c/a/z/i0/o.java
index 496fba2b5b..72fcf989dc 100644
--- a/app/src/main/java/c/a/z/i0/o.java
+++ b/app/src/main/java/c/a/z/i0/o.java
@@ -31,7 +31,7 @@ public final class o extends d0.z.d.o implements Function1<Point, Unit> {
         m.checkNotNullExpressionValue(appVideoStreamRenderer, "binding.participantVideoStreamRenderer");
         boolean z2 = false;
         appVideoStreamRenderer.setVisibility(0);
-        View view = videoCallParticipantView.i.f156c;
+        View view = videoCallParticipantView.i.f173c;
         m.checkNotNullExpressionValue(view, "binding.participantBgLetterbox");
         view.setVisibility(0);
         ProgressBar progressBar = videoCallParticipantView.i.p;
diff --git a/app/src/main/java/c/a/z/k.java b/app/src/main/java/c/a/z/k.java
index a27c7b1e62..fed089e009 100644
--- a/app/src/main/java/c/a/z/k.java
+++ b/app/src/main/java/c/a/z/k.java
@@ -71,9 +71,9 @@ public abstract class k extends OverlayDialog implements AppComponent {
     public k(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.w = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.w = k0;
         setOnClickListener(new j(this));
     }
 
diff --git a/app/src/main/java/c/a/z/k0/c/a.java b/app/src/main/java/c/a/z/k0/c/a.java
index 0b25804bb7..608b4391ee 100644
--- a/app/src/main/java/c/a/z/k0/c/a.java
+++ b/app/src/main/java/c/a/z/k0/c/a.java
@@ -3,7 +3,7 @@ package c.a.z.k0.c;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.o4;
+import c.a.i.r4;
 import c.a.z.k0.c.d;
 import com.discord.utilities.extensions.SimpleDraweeViewExtensionsKt;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -11,22 +11,22 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: SpeakersViewHolder.kt */
 public final class a extends MGRecyclerViewHolder<c, d> {
-    public final o4 a;
+    public final r4 a;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public a(c cVar) {
-        super(2131558990, cVar);
+        super(2131558994, cVar);
         m.checkNotNullParameter(cVar, "adapter");
         View view = this.itemView;
-        int i = 2131362928;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362928);
+        int i = 2131362953;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362953);
         if (simpleDraweeView != null) {
-            i = 2131362929;
-            TextView textView = (TextView) view.findViewById(2131362929);
+            i = 2131362954;
+            TextView textView = (TextView) view.findViewById(2131362954);
             if (textView != null) {
-                o4 o4Var = new o4((LinearLayout) view, simpleDraweeView, textView);
-                m.checkNotNullExpressionValue(o4Var, "WidgetDiscoveryStageCard…kerBinding.bind(itemView)");
-                this.a = o4Var;
+                r4 r4Var = new r4((LinearLayout) view, simpleDraweeView, textView);
+                m.checkNotNullExpressionValue(r4Var, "WidgetDiscoveryStageCard…kerBinding.bind(itemView)");
+                this.a = r4Var;
                 return;
             }
         }
@@ -46,7 +46,7 @@ public final class a extends MGRecyclerViewHolder<c, d> {
         SimpleDraweeView simpleDraweeView = this.a.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.discoveryStageCardSpeakerAvatar");
         SimpleDraweeViewExtensionsKt.setUserIcon$default(simpleDraweeView, Long.valueOf(j), str, null, false, 2131165290, 12, null);
-        TextView textView = this.a.f136c;
+        TextView textView = this.a.f150c;
         m.checkNotNullExpressionValue(textView, "binding.discoveryStageCardSpeakerName");
         textView.setText(str2);
     }
diff --git a/app/src/main/java/c/a/z/k0/c/b.java b/app/src/main/java/c/a/z/k0/c/b.java
index f01158baa8..0eb7136236 100644
--- a/app/src/main/java/c/a/z/k0/c/b.java
+++ b/app/src/main/java/c/a/z/k0/c/b.java
@@ -3,7 +3,7 @@ package c.a.z.k0.c;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.n4;
+import c.a.i.q4;
 import c.a.z.k0.c.d;
 import c.d.b.a.a;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -11,21 +11,21 @@ import com.discord.utilities.resources.StringResourceUtilsKt;
 import d0.z.d.m;
 /* compiled from: SpeakersViewHolder.kt */
 public final class b extends MGRecyclerViewHolder<c, d> {
-    public final n4 a;
+    public final q4 a;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public b(c cVar) {
-        super(2131558988, cVar);
+        super(2131558992, cVar);
         m.checkNotNullParameter(cVar, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131364108);
+        TextView textView = (TextView) view.findViewById(2131364151);
         if (textView != null) {
-            n4 n4Var = new n4((LinearLayout) view, textView);
-            m.checkNotNullExpressionValue(n4Var, "WidgetDiscoveryOtherSpea…untBinding.bind(itemView)");
-            this.a = n4Var;
+            q4 q4Var = new q4((LinearLayout) view, textView);
+            m.checkNotNullExpressionValue(q4Var, "WidgetDiscoveryOtherSpea…untBinding.bind(itemView)");
+            this.a = q4Var;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364108)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364151)));
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [int, java.lang.Object] */
@@ -39,6 +39,6 @@ public final class b extends MGRecyclerViewHolder<c, d> {
         m.checkNotNullExpressionValue(textView, "binding.otherSpeakersCountText");
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
-        textView.setText(c.a.l.b.i(view, 2131888157, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755061, i2, Integer.valueOf(i2))}, null, 4));
+        textView.setText(c.a.l.b.i(view, 2131888156, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755061, i2, Integer.valueOf(i2))}, null, 4));
     }
 }
diff --git a/app/src/main/java/c/a/z/m.java b/app/src/main/java/c/a/z/m.java
index caed951fec..96a1064284 100644
--- a/app/src/main/java/c/a/z/m.java
+++ b/app/src/main/java/c/a/z/m.java
@@ -3,7 +3,7 @@ package c.a.z;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import c.a.i.p0;
+import c.a.i.q0;
 import com.discord.views.OverlayMenuBubbleDialog;
 import com.discord.views.VoiceUserView;
 import d0.z.d.o;
@@ -25,10 +25,10 @@ public final class m extends o implements Function2<LayoutInflater, ViewGroup, O
         ViewGroup viewGroup2 = viewGroup;
         d0.z.d.m.checkNotNullParameter(layoutInflater2, "layoutInflater");
         d0.z.d.m.checkNotNullParameter(viewGroup2, "parent");
-        View inflate = layoutInflater2.inflate(2131558611, viewGroup2, false);
+        View inflate = layoutInflater2.inflate(2131558612, viewGroup2, false);
         Objects.requireNonNull(inflate, "rootView");
-        p0 p0Var = new p0((VoiceUserView) inflate);
-        d0.z.d.m.checkNotNullExpressionValue(p0Var, "OverlayMenuVoiceMembersI…tInflater, parent, false)");
-        return new OverlayMenuBubbleDialog.a(p0Var);
+        q0 q0Var = new q0((VoiceUserView) inflate);
+        d0.z.d.m.checkNotNullExpressionValue(q0Var, "OverlayMenuVoiceMembersI…tInflater, parent, false)");
+        return new OverlayMenuBubbleDialog.a(q0Var);
     }
 }
diff --git a/app/src/main/java/c/a/z/n.java b/app/src/main/java/c/a/z/n.java
index 7c66779ac6..236e87618f 100644
--- a/app/src/main/java/c/a/z/n.java
+++ b/app/src/main/java/c/a/z/n.java
@@ -32,7 +32,7 @@ public final class n<T, R> implements b<Map<Long, ? extends StoreVoiceParticipan
         for (T t : values) {
             T t2 = t;
             if (t2.isConnected()) {
-                if (AnimatableValueParser.u1(this.i)) {
+                if (AnimatableValueParser.v1(this.i)) {
                     VoiceState voiceState = t2.getVoiceState();
                 }
                 z2 = true;
diff --git a/app/src/main/java/c/a/z/o.java b/app/src/main/java/c/a/z/o.java
index b96d82bc2a..aeb35986fd 100644
--- a/app/src/main/java/c/a/z/o.java
+++ b/app/src/main/java/c/a/z/o.java
@@ -28,6 +28,6 @@ public final class o<T, R> implements b<Channel, Observable<? extends List<? ext
         StoreVoiceParticipants voiceParticipants = StoreStream.Companion.getVoiceParticipants();
         Long l = this.i;
         m.checkNotNullExpressionValue(l, "channelId");
-        return voiceParticipants.get(l.longValue()).G(new n(channel2)).s();
+        return voiceParticipants.get(l.longValue()).F(new n(channel2)).r();
     }
 }
diff --git a/app/src/main/java/c/a/z/o0/c.java b/app/src/main/java/c/a/z/o0/c.java
index b7b9e8151e..f43ced4c26 100644
--- a/app/src/main/java/c/a/z/o0/c.java
+++ b/app/src/main/java/c/a/z/o0/c.java
@@ -27,7 +27,7 @@ public final class c extends o implements Function1<View, Unit> {
     public Unit invoke(View view) {
         m.checkNotNullParameter(view, "it");
         Sticker sticker = this.this$0.$fullSticker;
-        if ((sticker != null ? sticker.j() : null) == StickerType.STANDARD) {
+        if ((sticker != null ? sticker.k() : null) == StickerType.STANDARD) {
             StickerView stickerView = this.this$0.this$0;
             stickerView.l = StickerView.a(stickerView, ((DownloadUtils.DownloadState.Completed) this.$downloadState).getFile(), true);
         }
diff --git a/app/src/main/java/c/a/z/o0/d.java b/app/src/main/java/c/a/z/o0/d.java
index 2ea33e69e1..fc0ae1a99d 100644
--- a/app/src/main/java/c/a/z/o0/d.java
+++ b/app/src/main/java/c/a/z/o0/d.java
@@ -53,7 +53,7 @@ public final class d extends o implements Function1<Pair<? extends DownloadUtils
             if (num != null && num.intValue() == 0) {
                 Sticker sticker = this.$fullSticker;
                 if (sticker != null) {
-                    stickerType = sticker.j();
+                    stickerType = sticker.k();
                 }
                 if (stickerType == StickerType.STANDARD) {
                     StickerView stickerView = this.this$0;
diff --git a/app/src/main/java/c/a/z/o0/g.java b/app/src/main/java/c/a/z/o0/g.java
index 03d3e7c75c..b83c703550 100644
--- a/app/src/main/java/c/a/z/o0/g.java
+++ b/app/src/main/java/c/a/z/o0/g.java
@@ -21,8 +21,8 @@ public final class g extends o implements Function1<View, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        this.this$0.this$0.i.f99c.setPlaybackMode(RLottieDrawable.PlaybackMode.LOOP);
-        this.this$0.this$0.i.f99c.a();
+        this.this$0.this$0.i.f104c.setPlaybackMode(RLottieDrawable.PlaybackMode.LOOP);
+        this.this$0.this$0.i.f104c.a();
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/z/o0/h.java b/app/src/main/java/c/a/z/o0/h.java
index bc82a6a63a..18a72f0819 100644
--- a/app/src/main/java/c/a/z/o0/h.java
+++ b/app/src/main/java/c/a/z/o0/h.java
@@ -47,11 +47,11 @@ public final class h extends o implements Function1<Pair<? extends DownloadUtils
             ImageView imageView = this.this$0.i.d;
             m.checkNotNullExpressionValue(imageView, "binding.stickerViewPlaceholder");
             imageView.setVisibility(8);
-            RLottieImageView rLottieImageView = this.this$0.i.f99c;
+            RLottieImageView rLottieImageView = this.this$0.i.f104c;
             m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie");
             rLottieImageView.setContentDescription(this.this$0.b(this.$sticker));
             StickerView stickerView = this.this$0;
-            RLottieImageView rLottieImageView2 = stickerView.i.f99c;
+            RLottieImageView rLottieImageView2 = stickerView.i.f104c;
             Context context = stickerView.getContext();
             m.checkNotNullExpressionValue(context, "context");
             File file = ((DownloadUtils.DownloadState.Completed) downloadState).getFile();
@@ -71,13 +71,13 @@ public final class h extends o implements Function1<Pair<? extends DownloadUtils
             }
             rLottieImageView2.setImageDrawable(rLottieImageView2.i);
             if (num != null && num.intValue() == 0) {
-                this.this$0.i.f99c.a();
+                this.this$0.i.f104c.a();
             } else if (num != null && num.intValue() == 1) {
-                RLottieImageView rLottieImageView3 = this.this$0.i.f99c;
+                RLottieImageView rLottieImageView3 = this.this$0.i.f104c;
                 m.checkNotNullExpressionValue(rLottieImageView3, "binding.stickerViewLottie");
                 ViewExtensions.setOnLongClickListenerConsumeClick(rLottieImageView3, new g(this));
             } else if (num != null && num.intValue() == 2) {
-                this.this$0.i.f99c.setOnLongClickListener(null);
+                this.this$0.i.f104c.setOnLongClickListener(null);
             }
         }
         return Unit.a;
diff --git a/app/src/main/java/c/a/z/q.java b/app/src/main/java/c/a/z/q.java
index 84e53bdeaa..4607fd0ee1 100644
--- a/app/src/main/java/c/a/z/q.java
+++ b/app/src/main/java/c/a/z/q.java
@@ -25,9 +25,9 @@ public final class q<T, R> implements b<Channel, Observable<? extends OverlayMen
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<Long> observePermissionsForChannel = companion.getPermissions().observePermissionsForChannel(channel2.g());
-        Observable<Guild> observeGuild = companion.getGuilds().observeGuild(channel2.e());
-        Observable<CallModel> observable = CallModel.Companion.get(channel2.g());
+        Observable<Long> observePermissionsForChannel = companion.getPermissions().observePermissionsForChannel(channel2.h());
+        Observable<Guild> observeGuild = companion.getGuilds().observeGuild(channel2.f());
+        Observable<CallModel> observable = CallModel.Companion.get(channel2.h());
         Observable<RtcConnection.Quality> quality = companion.getRtcConnection().getQuality();
         p pVar = p.i;
         if (pVar != null) {
diff --git a/app/src/main/java/c/a/z/r.java b/app/src/main/java/c/a/z/r.java
index a7e701a5ee..10a7ca393c 100644
--- a/app/src/main/java/c/a/z/r.java
+++ b/app/src/main/java/c/a/z/r.java
@@ -21,7 +21,7 @@ public final class r extends o implements Function1<Error, Unit> {
     @Override // kotlin.jvm.functions.Function1
     public Unit invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        c.a.d.o.g(this.this$0.getContext(), 2131890364, 0, null, 12);
+        c.a.d.o.g(this.this$0.getContext(), 2131890430, 0, null, 12);
         return Unit.a;
     }
 }
diff --git a/app/src/main/java/c/a/z/s.java b/app/src/main/java/c/a/z/s.java
index 526ee4bfaf..34f6d81afc 100644
--- a/app/src/main/java/c/a/z/s.java
+++ b/app/src/main/java/c/a/z/s.java
@@ -29,7 +29,7 @@ public final class s extends o implements Function1<ModelInvite, Unit> {
         m.checkNotNullExpressionValue(context, "context");
         String link = modelInvite2.toLink(this.this$0.getResources(), "https://discord.gg");
         m.checkNotNullExpressionValue(link, "invite.toLink(resources, BuildConfig.HOST_INVITE)");
-        c.a.d.o.a(context, link, 2131890549);
+        c.a.d.o.a(context, link, 2131890617);
         this.this$0.getOnDismissRequested$app_productionGoogleRelease().mo1invoke();
         return Unit.a;
     }
diff --git a/app/src/main/java/c/a/z/v.java b/app/src/main/java/c/a/z/v.java
index 45e377c133..5d51a929c3 100644
--- a/app/src/main/java/c/a/z/v.java
+++ b/app/src/main/java/c/a/z/v.java
@@ -5,7 +5,7 @@ import android.content.res.Configuration;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import c.a.i.q0;
+import c.a.i.r0;
 import com.discord.app.AppComponent;
 import com.discord.overlay.views.OverlayBubbleWrap;
 import com.discord.stores.StoreStream;
@@ -28,7 +28,7 @@ public final class v extends OverlayBubbleWrap implements AppComponent {
     public static final /* synthetic */ int w = 0;
 
     /* renamed from: x  reason: collision with root package name */
-    public final q0 f236x;
+    public final r0 f236x;
 
     /* renamed from: y  reason: collision with root package name */
     public final Subject<Void, Void> f237y;
@@ -47,7 +47,7 @@ public final class v extends OverlayBubbleWrap implements AppComponent {
             }
             StoreVoiceParticipants voiceParticipants = StoreStream.Companion.getVoiceParticipants();
             m.checkNotNullExpressionValue(l2, "channelId");
-            return voiceParticipants.get(l2.longValue()).G(u.i).s();
+            return voiceParticipants.get(l2.longValue()).F(u.i).r();
         }
     }
 
@@ -82,16 +82,16 @@ public final class v extends OverlayBubbleWrap implements AppComponent {
     public v(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558612, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558613, (ViewGroup) this, false);
         addView(inflate);
         Objects.requireNonNull(inflate, "rootView");
         SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate;
-        q0 q0Var = new q0(simpleDraweeView, simpleDraweeView);
-        m.checkNotNullExpressionValue(q0Var, "OverlayVoiceBubbleBindin…rom(context), this, true)");
-        this.f236x = q0Var;
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.f237y = l0;
+        r0 r0Var = new r0(simpleDraweeView, simpleDraweeView);
+        m.checkNotNullExpressionValue(r0Var, "OverlayVoiceBubbleBindin…rom(context), this, true)");
+        this.f236x = r0Var;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.f237y = k0;
     }
 
     @Override // com.discord.overlay.views.OverlayBubbleWrap
@@ -129,9 +129,9 @@ public final class v extends OverlayBubbleWrap implements AppComponent {
     @Override // android.view.View, android.view.ViewGroup
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        Observable<R> Z = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().Z(a.i);
-        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…d()\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Z), this, null, 2, null), v.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 60, (Object) null);
+        Observable<R> Y = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().Y(a.i);
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…d()\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Y), this, null, 2, null), v.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 60, (Object) null);
     }
 
     @Override // com.discord.overlay.views.OverlayBubbleWrap, android.view.View
diff --git a/app/src/main/java/c/a/z/x.java b/app/src/main/java/c/a/z/x.java
index 7712b70b5d..b3c2ea4f4d 100644
--- a/app/src/main/java/c/a/z/x.java
+++ b/app/src/main/java/c/a/z/x.java
@@ -34,7 +34,7 @@ public final class x extends o implements Function4<View, Integer, WidgetGlobalS
             DiscordConnectService.a aVar = DiscordConnectService.i;
             Context context = view2.getContext();
             m.checkNotNullExpressionValue(context, "view.context");
-            aVar.b(context, ((WidgetGlobalSearchModel.ItemChannel) itemDataPayload2).getChannel().g());
+            aVar.b(context, ((WidgetGlobalSearchModel.ItemChannel) itemDataPayload2).getChannel().h());
             this.this$0.g();
         }
         return Unit.a;
diff --git a/app/src/main/java/c/a/z/y.java b/app/src/main/java/c/a/z/y.java
index 2dae3c4781..b990f9f461 100644
--- a/app/src/main/java/c/a/z/y.java
+++ b/app/src/main/java/c/a/z/y.java
@@ -10,7 +10,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.r0;
+import c.a.i.s0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppComponent;
@@ -32,11 +32,11 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: OverlayVoiceSelectorBubbleDialog.kt */
 public final class y extends k implements AppComponent {
-    public final BehaviorSubject<String> A = BehaviorSubject.m0("");
+    public final BehaviorSubject<String> A = BehaviorSubject.l0("");
     public String B;
 
     /* renamed from: y  reason: collision with root package name */
-    public r0 f238y;
+    public s0 f238y;
 
     /* renamed from: z  reason: collision with root package name */
     public final WidgetGlobalSearchAdapter f239z;
@@ -121,7 +121,7 @@ public final class y extends k implements AppComponent {
             ArrayList arrayList = new ArrayList();
             for (Object obj : data) {
                 Channel channel = ((WidgetGlobalSearchModel.ItemDataPayload) obj).getChannel();
-                if (channel != null && AnimatableValueParser.z1(channel)) {
+                if (channel != null && AnimatableValueParser.B1(channel)) {
                     arrayList.add(obj);
                 }
             }
@@ -136,7 +136,7 @@ public final class y extends k implements AppComponent {
         super(context);
         m.checkNotNullParameter(context, "context");
         getWindowLayoutParams().flags &= -9;
-        r0 a2 = r0.a(LayoutInflater.from(getContext()), this, true);
+        s0 a2 = s0.a(LayoutInflater.from(getContext()), this, true);
         m.checkNotNullExpressionValue(a2, "OverlayVoiceChannelSelec…rom(context), this, true)");
         this.f238y = a2;
         RecyclerView recyclerView = this.f238y.f;
@@ -147,7 +147,7 @@ public final class y extends k implements AppComponent {
     @Override // c.a.z.k
     public Animator getClosingAnimator() {
         Animator loadAnimator = AnimatorInflater.loadAnimator(getContext(), 2130837533);
-        loadAnimator.setTarget(this.f238y.f145c);
+        loadAnimator.setTarget(this.f238y.f151c);
         m.checkNotNullExpressionValue(loadAnimator, "AnimatorInflater.loadAni…binding.dialogCard)\n    }");
         return loadAnimator;
     }
@@ -169,9 +169,9 @@ public final class y extends k implements AppComponent {
         widgetGlobalSearchAdapter.setRecycler(recyclerView);
         MGRecyclerAdapter.Companion.configure(this.f239z);
         WidgetGlobalSearchModel.Companion companion = WidgetGlobalSearchModel.Companion;
-        Observable<String> G = this.A.G(c.i);
-        m.checkNotNullExpressionValue(G, "filterPublisher.map { \"!$it\" }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(companion.getForNav(G), this, this.f239z), y.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
+        Observable<String> F = this.A.F(c.i);
+        m.checkNotNullExpressionValue(F, "filterPublisher.map { \"!$it\" }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(companion.getForNav(F), this, this.f239z), y.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 
     @Override // android.view.View, android.view.ViewGroup
@@ -179,7 +179,7 @@ public final class y extends k implements AppComponent {
         super.onAttachedToWindow();
         h();
         Animator loadAnimator = AnimatorInflater.loadAnimator(getContext(), 2130837534);
-        loadAnimator.setTarget(this.f238y.f145c);
+        loadAnimator.setTarget(this.f238y.f151c);
         loadAnimator.start();
     }
 
@@ -188,7 +188,7 @@ public final class y extends k implements AppComponent {
         super.onConfigurationChanged(configuration);
         getUnsubscribeSignal().onNext(null);
         removeAllViewsInLayout();
-        r0 a2 = r0.a(LayoutInflater.from(getContext()), this, true);
+        s0 a2 = s0.a(LayoutInflater.from(getContext()), this, true);
         m.checkNotNullExpressionValue(a2, "OverlayVoiceChannelSelec…rom(context), this, true)");
         this.f238y = a2;
         h();
diff --git a/app/src/main/java/c/a/z/z.java b/app/src/main/java/c/a/z/z.java
index fc14861138..065f2ba18c 100644
--- a/app/src/main/java/c/a/z/z.java
+++ b/app/src/main/java/c/a/z/z.java
@@ -21,19 +21,19 @@ public final class z extends LinearLayout {
 
     public z(Context context) {
         super(context);
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558647, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558645, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362766;
-        TextView textView = (TextView) inflate.findViewById(2131362766);
+        int i = 2131362791;
+        TextView textView = (TextView) inflate.findViewById(2131362791);
         if (textView != null) {
-            i = 2131362767;
-            TextView textView2 = (TextView) inflate.findViewById(2131362767);
+            i = 2131362792;
+            TextView textView2 = (TextView) inflate.findViewById(2131362792);
             if (textView2 != null) {
-                i = 2131362768;
-                TextSwitcher textSwitcher = (TextSwitcher) inflate.findViewById(2131362768);
+                i = 2131362793;
+                TextSwitcher textSwitcher = (TextSwitcher) inflate.findViewById(2131362793);
                 if (textSwitcher != null) {
-                    i = 2131363024;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131363024);
+                    i = 2131363049;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131363049);
                     if (simpleDraweeSpanTextView != null) {
                         c1 c1Var = new c1((LinearLayout) inflate, textView, textView2, textSwitcher, simpleDraweeSpanTextView);
                         m.checkNotNullExpressionValue(c1Var, "ReactionViewBinding.infl…rom(context), this, true)");
@@ -52,7 +52,7 @@ public final class z extends LinearLayout {
         TextView textView = this.l.b;
         m.checkNotNullExpressionValue(textView, "binding.counterText1");
         textView.setActivated(z2);
-        TextView textView2 = this.l.f72c;
+        TextView textView2 = this.l.f73c;
         m.checkNotNullExpressionValue(textView2, "binding.counterText2");
         textView2.setActivated(z2);
     }
diff --git a/app/src/main/java/c/b/a/a/l.java b/app/src/main/java/c/b/a/a/l.java
index 6765af2702..03cf6bfce1 100644
--- a/app/src/main/java/c/b/a/a/l.java
+++ b/app/src/main/java/c/b/a/a/l.java
@@ -58,6 +58,6 @@ public final class l extends o implements Function0<Unit> {
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        this.this$0.u = Observable.e0(300, TimeUnit.MILLISECONDS).J(j0.j.b.a.a()).W(new a(this));
+        this.this$0.u = Observable.d0(300, TimeUnit.MILLISECONDS).I(j0.j.b.a.a()).V(new a(this));
     }
 }
diff --git a/app/src/main/java/c/b/a/d/j.java b/app/src/main/java/c/b/a/d/j.java
index 0f42109b52..b49b0abd0a 100644
--- a/app/src/main/java/c/b/a/d/j.java
+++ b/app/src/main/java/c/b/a/d/j.java
@@ -114,7 +114,7 @@ public abstract class j extends RecyclerView.ViewHolder {
             GenericDraweeHierarchy hierarchy = this.this$0.a().getHierarchy();
             ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
             ScalingUtils$ScaleType scalingUtils$ScaleType2 = s.l;
-            hierarchy.n(1, bitmapDrawable);
+            hierarchy.o(1, bitmapDrawable);
             hierarchy.l(1).r(scalingUtils$ScaleType2);
             return Unit.a;
         }
@@ -176,7 +176,7 @@ public abstract class j extends RecyclerView.ViewHolder {
                 ColorDrawable colorDrawable = k;
                 ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
                 ScalingUtils$ScaleType scalingUtils$ScaleType2 = r.l;
-                hierarchy.n(1, colorDrawable);
+                hierarchy.o(1, colorDrawable);
                 hierarchy.l(1).r(scalingUtils$ScaleType2);
                 b bVar = this.m;
                 if (bVar != null) {
diff --git a/app/src/main/java/c/c/a/a0/a.java b/app/src/main/java/c/c/a/a0/a.java
index 45b9e00c0a..b415df8018 100644
--- a/app/src/main/java/c/c/a/a0/a.java
+++ b/app/src/main/java/c/c/a/a0/a.java
@@ -48,12 +48,12 @@ public class a {
                     } else if (cVar.w() == bVar) {
                         cVar.C();
                     } else {
-                        bVar3 = AnimatableValueParser.O1(cVar, dVar);
+                        bVar3 = AnimatableValueParser.Q1(cVar, dVar);
                     }
                 } else if (cVar.w() == bVar) {
                     cVar.C();
                 } else {
-                    bVar2 = AnimatableValueParser.O1(cVar, dVar);
+                    bVar2 = AnimatableValueParser.Q1(cVar, dVar);
                 }
                 z2 = true;
             } else {
diff --git a/app/src/main/java/c/c/a/a0/c.java b/app/src/main/java/c/c/a/a0/c.java
index 461bdb3c5c..13b70b888f 100644
--- a/app/src/main/java/c/c/a/a0/c.java
+++ b/app/src/main/java/c/c/a/a0/c.java
@@ -41,7 +41,7 @@ public class c {
         g gVar2;
         b bVar3;
         m<PointF, PointF> mVar;
-        b P1;
+        b R1;
         b bVar4;
         boolean z4 = false;
         boolean z5 = cVar.w() == c.b.BEGIN_OBJECT;
@@ -83,20 +83,20 @@ public class c {
                 case 2:
                     bVar3 = bVar6;
                     mVar = mVar2;
-                    gVar3 = new g(AnimatableValueParser.M1(cVar, dVar, z.a));
+                    gVar3 = new g(AnimatableValueParser.O1(cVar, dVar, z.a));
                     mVar2 = mVar;
                     break;
                 case 3:
                     dVar.a("Lottie doesn't support 3D layers.");
-                    P1 = AnimatableValueParser.P1(cVar, dVar, z4);
-                    if (!P1.a.isEmpty()) {
-                        bVar4 = P1;
+                    R1 = AnimatableValueParser.R1(cVar, dVar, z4);
+                    if (!R1.a.isEmpty()) {
+                        bVar4 = R1;
                         gVar2 = gVar3;
                         bVar3 = bVar6;
                         mVar = mVar2;
-                        P1.a.add(new a(dVar, Float.valueOf(0.0f), Float.valueOf(0.0f), null, 0.0f, Float.valueOf(dVar.l)));
+                        R1.a.add(new a(dVar, Float.valueOf(0.0f), Float.valueOf(0.0f), null, 0.0f, Float.valueOf(dVar.l)));
                     } else {
-                        bVar4 = P1;
+                        bVar4 = R1;
                         gVar2 = gVar3;
                         bVar3 = bVar6;
                         mVar = mVar2;
@@ -109,27 +109,27 @@ public class c {
                     mVar2 = mVar;
                     break;
                 case 4:
-                    P1 = AnimatableValueParser.P1(cVar, dVar, z4);
-                    if (!P1.a.isEmpty()) {
+                    R1 = AnimatableValueParser.R1(cVar, dVar, z4);
+                    if (!R1.a.isEmpty()) {
                     }
                     bVar5 = bVar4;
                     gVar3 = gVar2;
                     mVar2 = mVar;
                     break;
                 case 5:
-                    dVar2 = AnimatableValueParser.Q1(cVar, dVar);
+                    dVar2 = AnimatableValueParser.S1(cVar, dVar);
                     continue;
                 case 6:
-                    bVar8 = AnimatableValueParser.P1(cVar, dVar, z4);
+                    bVar8 = AnimatableValueParser.R1(cVar, dVar, z4);
                     continue;
                 case 7:
-                    bVar9 = AnimatableValueParser.P1(cVar, dVar, z4);
+                    bVar9 = AnimatableValueParser.R1(cVar, dVar, z4);
                     continue;
                 case 8:
-                    bVar7 = AnimatableValueParser.P1(cVar, dVar, z4);
+                    bVar7 = AnimatableValueParser.R1(cVar, dVar, z4);
                     continue;
                 case 9:
-                    bVar6 = AnimatableValueParser.P1(cVar, dVar, z4);
+                    bVar6 = AnimatableValueParser.R1(cVar, dVar, z4);
                     continue;
                 default:
                     bVar3 = bVar6;
diff --git a/app/src/main/java/c/c/a/a0/r.java b/app/src/main/java/c/c/a/a0/r.java
index 9cc1a90189..d146141769 100644
--- a/app/src/main/java/c/c/a/a0/r.java
+++ b/app/src/main/java/c/c/a/a0/r.java
@@ -160,7 +160,7 @@ public class r {
                                         if (hashCode == 3357091 && s2.equals("mode")) {
                                             c2 = 3;
                                             if (c2 == 0) {
-                                                dVar2 = AnimatableValueParser.Q1(cVar, dVar);
+                                                dVar2 = AnimatableValueParser.S1(cVar, dVar);
                                             } else if (c2 == 1) {
                                                 hVar2 = new h(q.a(cVar, dVar, g.c(), a0.a));
                                             } else if (c2 == 2) {
@@ -276,7 +276,7 @@ public class r {
                         int z5 = cVar.z(b);
                         if (z5 == 0) {
                             str3 = str4;
-                            jVar = new j(AnimatableValueParser.M1(cVar, dVar, g.a));
+                            jVar = new j(AnimatableValueParser.O1(cVar, dVar, g.a));
                         } else if (z5 != i) {
                             cVar.B();
                             cVar.C();
@@ -299,16 +299,16 @@ public class r {
                                         while (cVar.e()) {
                                             int z6 = cVar.z(b.b);
                                             if (z6 == 0) {
-                                                aVar3 = AnimatableValueParser.N1(cVar, dVar);
+                                                aVar3 = AnimatableValueParser.P1(cVar, dVar);
                                             } else if (z6 == i) {
-                                                aVar4 = AnimatableValueParser.N1(cVar, dVar);
+                                                aVar4 = AnimatableValueParser.P1(cVar, dVar);
                                             } else if (z6 == 2) {
-                                                bVar2 = AnimatableValueParser.O1(cVar, dVar);
+                                                bVar2 = AnimatableValueParser.Q1(cVar, dVar);
                                             } else if (z6 != 3) {
                                                 cVar.B();
                                                 cVar.C();
                                             } else {
-                                                bVar3 = AnimatableValueParser.O1(cVar, dVar);
+                                                bVar3 = AnimatableValueParser.Q1(cVar, dVar);
                                             }
                                             i = 1;
                                         }
@@ -395,7 +395,7 @@ public class r {
                     i = 1;
                     z2 = false;
                 case 20:
-                    bVar = AnimatableValueParser.P1(cVar, dVar, z2);
+                    bVar = AnimatableValueParser.R1(cVar, dVar, z2);
                     i = 1;
                     z2 = false;
                 case 21:
diff --git a/app/src/main/java/c/d/a/a/a.java b/app/src/main/java/c/d/a/a/a.java
index fb644347ac..af9ecca0de 100644
--- a/app/src/main/java/c/d/a/a/a.java
+++ b/app/src/main/java/c/d/a/a/a.java
@@ -160,7 +160,7 @@ public class a extends BillingClient {
         String e = skuDetails.e();
         String str11 = "BillingClient";
         if (!e.equals("subs") || this.h) {
-            String str12 = billingFlowParams.f1547c;
+            String str12 = billingFlowParams.f1542c;
             if (str12 != null && !this.i) {
                 c.i.a.f.h.n.a.b(str11, "Current client doesn't support subscriptions update.");
                 BillingResult billingResult2 = q.m;
@@ -214,10 +214,10 @@ public class a extends BillingClient {
                     } else {
                         i = 1;
                     }
-                    if (!TextUtils.isEmpty(billingFlowParams.f1547c)) {
+                    if (!TextUtils.isEmpty(billingFlowParams.f1542c)) {
                         String[] strArr = new String[i];
                         str4 = "; try to reconnect";
-                        strArr[0] = billingFlowParams.f1547c;
+                        strArr[0] = billingFlowParams.f1542c;
                         bundle.putStringArrayList("skusToReplace", new ArrayList<>(Arrays.asList(strArr)));
                     } else {
                         str4 = "; try to reconnect";
diff --git a/app/src/main/java/c/d/a/a/e0.java b/app/src/main/java/c/d/a/a/e0.java
index 9a9912fe9e..06d335c466 100644
--- a/app/src/main/java/c/d/a/a/e0.java
+++ b/app/src/main/java/c/d/a/a/e0.java
@@ -21,6 +21,6 @@ public final class e0 implements Callable<Bundle> {
     @Override // java.util.concurrent.Callable
     public final Bundle call() throws Exception {
         a aVar = this.k;
-        return aVar.f.c0(5, aVar.e.getPackageName(), Arrays.asList(this.i.f1547c), this.j.d(), "subs", null);
+        return aVar.f.c0(5, aVar.e.getPackageName(), Arrays.asList(this.i.f1542c), this.j.d(), "subs", null);
     }
 }
diff --git a/app/src/main/java/c/d/a/a/h.java b/app/src/main/java/c/d/a/a/h.java
index 3a999c2ce1..e8030a0bf5 100644
--- a/app/src/main/java/c/d/a/a/h.java
+++ b/app/src/main/java/c/d/a/a/h.java
@@ -19,6 +19,6 @@ public final class h implements Callable<Bundle> {
     @Override // java.util.concurrent.Callable
     public final /* synthetic */ Bundle call() throws Exception {
         a aVar = this.k;
-        return aVar.f.p(3, aVar.e.getPackageName(), this.i.d(), this.j, null);
+        return aVar.f.q(3, aVar.e.getPackageName(), this.i.d(), this.j, null);
     }
 }
diff --git a/app/src/main/java/c/d/a/a/i.java b/app/src/main/java/c/d/a/a/i.java
index 9c2c4b1f9c..8a16485f7f 100644
--- a/app/src/main/java/c/d/a/a/i.java
+++ b/app/src/main/java/c/d/a/a/i.java
@@ -38,15 +38,15 @@ public final class i implements Callable<Purchase.a> {
         String str3 = null;
         do {
             try {
-                Bundle Q = aVar.l ? aVar.f.Q(9, aVar.e.getPackageName(), str, str3, bundle) : aVar.f.p0(3, aVar.e.getPackageName(), str, str3);
+                Bundle R = aVar.l ? aVar.f.R(9, aVar.e.getPackageName(), str, str3, bundle) : aVar.f.p0(3, aVar.e.getPackageName(), str, str3);
                 BillingResult billingResult = q.h;
-                if (Q == null) {
+                if (R == null) {
                     Object[] objArr = new Object[i];
                     objArr[0] = "getPurchase()";
                     a.b("BillingClient", String.format("%s got null owned items list", objArr));
                 } else {
-                    int d = a.d(Q, "BillingClient");
-                    String e = a.e(Q, "BillingClient");
+                    int d = a.d(R, "BillingClient");
+                    String e = a.e(R, "BillingClient");
                     BillingResult billingResult2 = new BillingResult();
                     billingResult2.a = d;
                     billingResult2.b = e;
@@ -54,13 +54,13 @@ public final class i implements Callable<Purchase.a> {
                         a.b("BillingClient", String.format("%s failed. Response code: %s", "getPurchase()", Integer.valueOf(d)));
                         billingResult = billingResult2;
                         i = 1;
-                    } else if (!Q.containsKey("INAPP_PURCHASE_ITEM_LIST") || !Q.containsKey("INAPP_PURCHASE_DATA_LIST") || !Q.containsKey("INAPP_DATA_SIGNATURE_LIST")) {
+                    } else if (!R.containsKey("INAPP_PURCHASE_ITEM_LIST") || !R.containsKey("INAPP_PURCHASE_DATA_LIST") || !R.containsKey("INAPP_DATA_SIGNATURE_LIST")) {
                         i = 1;
                         a.b("BillingClient", String.format("Bundle returned from %s doesn't contain required fields.", "getPurchase()"));
                     } else {
-                        ArrayList<String> stringArrayList = Q.getStringArrayList("INAPP_PURCHASE_ITEM_LIST");
-                        ArrayList<String> stringArrayList2 = Q.getStringArrayList("INAPP_PURCHASE_DATA_LIST");
-                        ArrayList<String> stringArrayList3 = Q.getStringArrayList("INAPP_DATA_SIGNATURE_LIST");
+                        ArrayList<String> stringArrayList = R.getStringArrayList("INAPP_PURCHASE_ITEM_LIST");
+                        ArrayList<String> stringArrayList2 = R.getStringArrayList("INAPP_PURCHASE_DATA_LIST");
+                        ArrayList<String> stringArrayList3 = R.getStringArrayList("INAPP_DATA_SIGNATURE_LIST");
                         if (stringArrayList == null) {
                             i = 1;
                             a.b("BillingClient", String.format("Bundle returned from %s contains null SKUs list.", "getPurchase()"));
@@ -79,9 +79,9 @@ public final class i implements Callable<Purchase.a> {
                 if (billingResult != q.i) {
                     return new Purchase.a(billingResult, null);
                 }
-                ArrayList<String> stringArrayList4 = Q.getStringArrayList("INAPP_PURCHASE_ITEM_LIST");
-                ArrayList<String> stringArrayList5 = Q.getStringArrayList("INAPP_PURCHASE_DATA_LIST");
-                ArrayList<String> stringArrayList6 = Q.getStringArrayList("INAPP_DATA_SIGNATURE_LIST");
+                ArrayList<String> stringArrayList4 = R.getStringArrayList("INAPP_PURCHASE_ITEM_LIST");
+                ArrayList<String> stringArrayList5 = R.getStringArrayList("INAPP_PURCHASE_DATA_LIST");
+                ArrayList<String> stringArrayList6 = R.getStringArrayList("INAPP_DATA_SIGNATURE_LIST");
                 for (int i2 = 0; i2 < stringArrayList5.size(); i2++) {
                     String str4 = stringArrayList5.get(i2);
                     String str5 = stringArrayList6.get(i2);
@@ -102,7 +102,7 @@ public final class i implements Callable<Purchase.a> {
                         return new Purchase.a(q.h, null);
                     }
                 }
-                str3 = Q.getString("INAPP_CONTINUATION_TOKEN");
+                str3 = R.getString("INAPP_CONTINUATION_TOKEN");
                 String valueOf4 = String.valueOf(str3);
                 a.a("BillingClient", valueOf4.length() != 0 ? "Continuation token: ".concat(valueOf4) : new String("Continuation token: "));
             } catch (Exception e3) {
diff --git a/app/src/main/java/c/d/a/a/k.java b/app/src/main/java/c/d/a/a/k.java
index 831126e4b4..f078558d29 100644
--- a/app/src/main/java/c/d/a/a/k.java
+++ b/app/src/main/java/c/d/a/a/k.java
@@ -49,13 +49,13 @@ public final class k implements Callable<Void> {
             bundle.putStringArrayList("ITEM_ID_LIST", arrayList3);
             bundle.putString("playBillingLibraryVersion", aVar.b);
             try {
-                Bundle K = aVar.m ? aVar.f.K(10, aVar.e.getPackageName(), str, bundle, a.f(aVar.j, aVar.q, aVar.b, null, arrayList2)) : aVar.f.k0(3, aVar.e.getPackageName(), str, bundle);
-                if (K == null) {
+                Bundle L = aVar.m ? aVar.f.L(10, aVar.e.getPackageName(), str, bundle, a.f(aVar.j, aVar.q, aVar.b, null, arrayList2)) : aVar.f.k0(3, aVar.e.getPackageName(), str, bundle);
+                if (L == null) {
                     a.b("BillingClient", "querySkuDetailsAsync got null sku details list");
                     rVar = new r(4, "Item is unavailable for purchase.", null);
                     break;
-                } else if (K.containsKey("DETAILS_LIST")) {
-                    ArrayList<String> stringArrayList = K.getStringArrayList("DETAILS_LIST");
+                } else if (L.containsKey("DETAILS_LIST")) {
+                    ArrayList<String> stringArrayList = L.getStringArrayList("DETAILS_LIST");
                     if (stringArrayList == null) {
                         a.b("BillingClient", "querySkuDetailsAsync got null response list");
                         rVar = new r(4, "Item is unavailable for purchase.", null);
@@ -77,8 +77,8 @@ public final class k implements Callable<Void> {
                     }
                     i = i2;
                 } else {
-                    int d = a.d(K, "BillingClient");
-                    String e = a.e(K, "BillingClient");
+                    int d = a.d(L, "BillingClient");
+                    String e = a.e(L, "BillingClient");
                     if (d != 0) {
                         StringBuilder sb2 = new StringBuilder(50);
                         sb2.append("getSkuDetails() failed. Response code: ");
diff --git a/app/src/main/java/c/d/a/a/m.java b/app/src/main/java/c/d/a/a/m.java
index 477e86066a..f3f4492af8 100644
--- a/app/src/main/java/c/d/a/a/m.java
+++ b/app/src/main/java/c/d/a/a/m.java
@@ -30,7 +30,7 @@ public final class m implements Callable<Void> {
                             break;
                         }
                         try {
-                            i = this.i.l.f.o(i3, packageName, "subs");
+                            i = this.i.l.f.p(i3, packageName, "subs");
                             if (i == 0) {
                                 break;
                             }
@@ -59,7 +59,7 @@ public final class m implements Callable<Void> {
                         if (i4 < 3) {
                             break;
                         }
-                        i = this.i.l.f.o(i4, packageName, "inapp");
+                        i = this.i.l.f.p(i4, packageName, "inapp");
                         if (i == 0) {
                             this.i.l.j = i4;
                             break;
diff --git a/app/src/main/java/c/d/b/a/a.java b/app/src/main/java/c/d/b/a/a.java
index 7ed25fbeb9..9dd94a0ede 100644
--- a/app/src/main/java/c/d/b/a/a.java
+++ b/app/src/main/java/c/d/b/a/a.java
@@ -10,8 +10,8 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelStore;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.x3;
-import c.a.r.l0.e;
+import c.a.i.a4;
+import c.a.r.m0.e;
 import c.i.c.m.d.b;
 import com.discord.api.channel.Channel;
 import com.discord.models.domain.Model;
@@ -229,7 +229,7 @@ public class a {
     }
 
     public static Object c(Channel channel, Map map) {
-        return map.get(Long.valueOf(channel.e()));
+        return map.get(Long.valueOf(channel.f()));
     }
 
     public static void c0(Class cls, StringBuilder sb, String str, KryoException kryoException) {
@@ -239,7 +239,7 @@ public class a {
     }
 
     public static Object d(Channel channel, Map map) {
-        return map.get(Long.valueOf(channel.g()));
+        return map.get(Long.valueOf(channel.h()));
     }
 
     public static void d0(String str, int i, String str2) {
@@ -364,7 +364,7 @@ public class a {
         return str + i + str2 + i2;
     }
 
-    public static x3 o0(TextView textView, String str, CharSequence charSequence, c.a.a.y.c cVar) {
+    public static a4 o0(TextView textView, String str, CharSequence charSequence, c.a.a.y.c cVar) {
         m.checkNotNullExpressionValue(textView, str);
         textView.setText(charSequence);
         return cVar.h();
diff --git a/app/src/main/java/c/e/b/c.java b/app/src/main/java/c/e/b/c.java
index c6a6d7e47b..3368a74d78 100644
--- a/app/src/main/java/c/e/b/c.java
+++ b/app/src/main/java/c/e/b/c.java
@@ -74,8 +74,8 @@ public abstract class c {
                     q(fVar, replace2, arrayList, w.i);
                     n(fVar, replace2, arrayList, w.g);
                     q(fVar, replace2, arrayList, w.g);
-                    n(fVar, replace2, arrayList, w.f2800c);
-                    q(fVar, replace2, arrayList, w.f2800c);
+                    n(fVar, replace2, arrayList, w.f2806c);
+                    q(fVar, replace2, arrayList, w.f2806c);
                     o(fVar, replace2, arrayList);
                     cls2 = b.a(u, fVar.b());
                 }
diff --git a/app/src/main/java/c/f/b/b/a.java b/app/src/main/java/c/f/b/b/a.java
index c02996fd54..27e85adccf 100644
--- a/app/src/main/java/c/f/b/b/a.java
+++ b/app/src/main/java/c/f/b/b/a.java
@@ -146,7 +146,7 @@ public class a implements c {
             long currentTimeMillis = System.currentTimeMillis();
             File j = a.this.j(this.a);
             try {
-                AnimatableValueParser.m2(this.b, j);
+                AnimatableValueParser.o2(this.b, j);
                 if (j.exists()) {
                     j.setLastModified(currentTimeMillis);
                 }
@@ -267,7 +267,7 @@ public class a implements c {
                     }
                     if (z3) {
                         try {
-                            AnimatableValueParser.J1(file2);
+                            AnimatableValueParser.L1(file2);
                         } catch (FileUtils$CreateDirectoryException unused2) {
                             c.f.b.a.a aVar2 = this.f;
                             StringBuilder L = c.d.b.a.a.L("version directory could not be created: ");
@@ -334,7 +334,7 @@ public class a implements c {
 
     @Override // c.f.b.b.c
     public void a() {
-        AnimatableValueParser.K2(this.f342c, new g(null));
+        AnimatableValueParser.M2(this.f342c, new g(null));
     }
 
     @Override // c.f.b.b.c
@@ -342,7 +342,7 @@ public class a implements c {
         File file = new File(k(str));
         if (!file.exists()) {
             try {
-                AnimatableValueParser.J1(file);
+                AnimatableValueParser.L1(file);
             } catch (FileUtils$CreateDirectoryException e2) {
                 Objects.requireNonNull((c.f.b.a.d) this.f);
                 throw e2;
@@ -381,7 +381,7 @@ public class a implements c {
     @Override // c.f.b.b.c
     public Collection e() throws IOException {
         b bVar = new b(null);
-        AnimatableValueParser.K2(this.e, bVar);
+        AnimatableValueParser.M2(this.e, bVar);
         return Collections.unmodifiableList(bVar.a);
     }
 
diff --git a/app/src/main/java/c/f/b/b/d.java b/app/src/main/java/c/f/b/b/d.java
index 0da6fd276b..a1448af1f7 100644
--- a/app/src/main/java/c/f/b/b/d.java
+++ b/app/src/main/java/c/f/b/b/d.java
@@ -219,7 +219,7 @@ public class d implements h {
     }
 
     public c.f.a.a d(CacheKey cacheKey, g gVar) throws IOException {
-        String s2;
+        String u2;
         c.f.a.a b2;
         i a2 = i.a();
         a2.d = cacheKey;
@@ -227,7 +227,7 @@ public class d implements h {
         synchronized (this.q) {
             try {
                 if (!(cacheKey instanceof c.f.b.a.c)) {
-                    s2 = AnimatableValueParser.s2(cacheKey);
+                    u2 = AnimatableValueParser.u2(cacheKey);
                 } else {
                     c.f.b.a.c cVar = (c.f.b.a.c) cacheKey;
                     throw null;
@@ -237,13 +237,13 @@ public class d implements h {
             }
         }
         try {
-            c.b g = g(s2, cacheKey);
+            c.b g = g(u2, cacheKey);
             try {
                 a.f fVar = (a.f) g;
                 fVar.c(gVar, cacheKey);
                 synchronized (this.q) {
                     b2 = fVar.b(cacheKey);
-                    this.h.add(s2);
+                    this.h.add(u2);
                     this.o.b(b2.a(), 1);
                 }
                 b2.a();
diff --git a/app/src/main/java/c/f/b/b/e.java b/app/src/main/java/c/f/b/b/e.java
index a82e0421e4..da9632dcaf 100644
--- a/app/src/main/java/c/f/b/b/e.java
+++ b/app/src/main/java/c/f/b/b/e.java
@@ -83,7 +83,7 @@ public class e implements c {
     public final void h() throws IOException {
         File file = new File(this.b.get(), this.f348c);
         try {
-            AnimatableValueParser.J1(file);
+            AnimatableValueParser.L1(file);
             file.getAbsolutePath();
             int i = c.f.d.e.a.a;
             this.e = new a(file, new a(file, this.a, this.d));
diff --git a/app/src/main/java/c/f/e/g.java b/app/src/main/java/c/f/e/g.java
index 5d1c199411..ec6807f776 100644
--- a/app/src/main/java/c/f/e/g.java
+++ b/app/src/main/java/c/f/e/g.java
@@ -196,8 +196,8 @@ public class g<T> implements Supplier<DataSource<T>> {
     }
 
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
-        D2.c("list", this.a);
-        return D2.toString();
+        i F2 = AnimatableValueParser.F2(this);
+        F2.c("list", this.a);
+        return F2.toString();
     }
 }
diff --git a/app/src/main/java/c/f/g/a/a/c.java b/app/src/main/java/c/f/g/a/a/c.java
index 96f9315fab..983f823915 100644
--- a/app/src/main/java/c/f/g/a/a/c.java
+++ b/app/src/main/java/c/f/g/a/a/c.java
@@ -310,13 +310,13 @@ public class c extends AbstractDraweeController<CloseableReference<c.f.j.j.c>, I
         ImageRequest imageRequest = this.I;
         ImageRequest imageRequest2 = this.K;
         ImageRequest[] imageRequestArr = this.J;
-        if (imageRequest == null || (uri = imageRequest.f2176c) == null) {
+        if (imageRequest == null || (uri = imageRequest.f2182c) == null) {
             if (!(imageRequestArr == null || imageRequestArr.length <= 0 || imageRequestArr[0] == null)) {
                 ImageRequest imageRequest3 = imageRequestArr[0];
-                uri = imageRequest3 != null ? imageRequest3.f2176c : null;
+                uri = imageRequest3 != null ? imageRequest3.f2182c : null;
             }
             if (imageRequest2 != null) {
-                return imageRequest2.f2176c;
+                return imageRequest2.f2182c;
             }
             return null;
         }
@@ -335,10 +335,10 @@ public class c extends AbstractDraweeController<CloseableReference<c.f.j.j.c>, I
 
     @Override // com.facebook.drawee.controller.AbstractDraweeController
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
-        D2.c("super", super.toString());
-        D2.c("dataSourceSupplier", this.B);
-        return D2.toString();
+        i F2 = AnimatableValueParser.F2(this);
+        F2.c("super", super.toString());
+        F2.c("dataSourceSupplier", this.B);
+        return F2.toString();
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.String, java.lang.Object] */
diff --git a/app/src/main/java/c/f/g/a/a/d.java b/app/src/main/java/c/f/g/a/a/d.java
index d371c0f715..658d1ef8b8 100644
--- a/app/src/main/java/c/f/g/a/a/d.java
+++ b/app/src/main/java/c/f/g/a/a/d.java
@@ -85,7 +85,7 @@ public class d extends AbstractDraweeControllerBuilder<d, ImageRequest, Closeabl
         c.f.j.r.b.b();
         try {
             DraweeController draweeController = this.n;
-            String valueOf = String.valueOf(AbstractDraweeControllerBuilder.f2163c.getAndIncrement());
+            String valueOf = String.valueOf(AbstractDraweeControllerBuilder.f2169c.getAndIncrement());
             if (draweeController instanceof c) {
                 cVar = (c) draweeController;
             } else {
diff --git a/app/src/main/java/c/f/g/c/b.java b/app/src/main/java/c/f/g/c/b.java
index 77100ab965..3ac3bf3fb2 100644
--- a/app/src/main/java/c/f/g/c/b.java
+++ b/app/src/main/java/c/f/g/c/b.java
@@ -32,8 +32,8 @@ public class b implements Supplier<DataSource<IMAGE>> {
     }
 
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
-        D2.c("request", this.f375c.toString());
-        return D2.toString();
+        i F2 = AnimatableValueParser.F2(this);
+        F2.c("request", this.f375c.toString());
+        return F2.toString();
     }
 }
diff --git a/app/src/main/java/c/f/g/e/b.java b/app/src/main/java/c/f/g/e/b.java
index b7c770b610..623a6c6c44 100644
--- a/app/src/main/java/c/f/g/e/b.java
+++ b/app/src/main/java/c/f/g/e/b.java
@@ -30,7 +30,7 @@ public class b extends Drawable implements Drawable.Callback, e0, d0 {
         while (true) {
             Drawable[] drawableArr2 = this.k;
             if (i < drawableArr2.length) {
-                AnimatableValueParser.t2(drawableArr2[i], this, this);
+                AnimatableValueParser.v2(drawableArr2[i], this, this);
                 i++;
             } else {
                 this.l = new d[drawableArr2.length];
@@ -66,11 +66,11 @@ public class b extends Drawable implements Drawable.Callback, e0, d0 {
             if (drawable != null && this.p) {
                 drawable.mutate();
             }
-            AnimatableValueParser.t2(this.k[i], null, null);
-            AnimatableValueParser.t2(drawable, null, null);
-            AnimatableValueParser.v2(drawable, this.j);
+            AnimatableValueParser.v2(this.k[i], null, null);
+            AnimatableValueParser.v2(drawable, null, null);
+            AnimatableValueParser.x2(drawable, this.j);
             AnimatableValueParser.N(drawable, this);
-            AnimatableValueParser.t2(drawable, this, this);
+            AnimatableValueParser.v2(drawable, this, this);
             this.o = false;
             this.k[i] = drawable;
             invalidateSelf();
diff --git a/app/src/main/java/c/f/g/e/g.java b/app/src/main/java/c/f/g/e/g.java
index 5543446b84..261d96100e 100644
--- a/app/src/main/java/c/f/g/e/g.java
+++ b/app/src/main/java/c/f/g/e/g.java
@@ -17,7 +17,7 @@ public class g extends Drawable implements Drawable.Callback, e0, d0, d {
 
     public g(Drawable drawable) {
         this.j = drawable;
-        AnimatableValueParser.t2(drawable, this, this);
+        AnimatableValueParser.v2(drawable, this, this);
     }
 
     @Override // c.f.g.e.d0
@@ -130,11 +130,11 @@ public class g extends Drawable implements Drawable.Callback, e0, d0, d {
 
     public Drawable o(Drawable drawable) {
         Drawable drawable2 = this.j;
-        AnimatableValueParser.t2(drawable2, null, null);
-        AnimatableValueParser.t2(drawable, null, null);
-        AnimatableValueParser.v2(drawable, this.k);
+        AnimatableValueParser.v2(drawable2, null, null);
+        AnimatableValueParser.v2(drawable, null, null);
+        AnimatableValueParser.x2(drawable, this.k);
         AnimatableValueParser.N(drawable, this);
-        AnimatableValueParser.t2(drawable, this, this);
+        AnimatableValueParser.v2(drawable, this, this);
         this.j = drawable;
         invalidateSelf();
         return drawable2;
diff --git a/app/src/main/java/c/f/g/e/k.java b/app/src/main/java/c/f/g/e/k.java
index a9eb978aa4..a609a32642 100644
--- a/app/src/main/java/c/f/g/e/k.java
+++ b/app/src/main/java/c/f/g/e/k.java
@@ -69,7 +69,7 @@ public class k extends n {
         float f = this.l;
         if (f > 0.0f) {
             this.M.setStrokeWidth(f);
-            this.M.setColor(AnimatableValueParser.K1(this.o, this.L.getAlpha()));
+            this.M.setColor(AnimatableValueParser.M1(this.o, this.L.getAlpha()));
             canvas.drawPath(this.p, this.M);
         }
         canvas.restoreToCount(save);
diff --git a/app/src/main/java/c/f/g/e/l.java b/app/src/main/java/c/f/g/e/l.java
index 7c8090313f..a314b2be93 100644
--- a/app/src/main/java/c/f/g/e/l.java
+++ b/app/src/main/java/c/f/g/e/l.java
@@ -115,12 +115,12 @@ public class l extends Drawable implements j {
 
     @Override // android.graphics.drawable.Drawable
     public void draw(Canvas canvas) {
-        this.l.setColor(AnimatableValueParser.K1(this.u, this.w));
+        this.l.setColor(AnimatableValueParser.M1(this.u, this.w));
         this.l.setStyle(Paint.Style.FILL);
         this.l.setFilterBitmap(this.r);
         canvas.drawPath(this.f386s, this.l);
         if (this.n != 0.0f) {
-            this.l.setColor(AnimatableValueParser.K1(this.p, this.w));
+            this.l.setColor(AnimatableValueParser.M1(this.p, this.w));
             this.l.setStyle(Paint.Style.STROKE);
             this.l.setStrokeWidth(this.n);
             canvas.drawPath(this.t, this.l);
@@ -151,11 +151,11 @@ public class l extends Drawable implements j {
 
     @Override // android.graphics.drawable.Drawable
     public int getOpacity() {
-        int K1 = AnimatableValueParser.K1(this.u, this.w) >>> 24;
-        if (K1 == 255) {
+        int M1 = AnimatableValueParser.M1(this.u, this.w) >>> 24;
+        if (M1 == 255) {
             return -1;
         }
-        return K1 == 0 ? -2 : -3;
+        return M1 == 0 ? -2 : -3;
     }
 
     @Override // c.f.g.e.j
diff --git a/app/src/main/java/c/f/g/f/b.java b/app/src/main/java/c/f/g/f/b.java
index a8f26ffdbf..70facfb9fe 100644
--- a/app/src/main/java/c/f/g/f/b.java
+++ b/app/src/main/java/c/f/g/f/b.java
@@ -30,7 +30,7 @@ public class b extends g implements f0 {
                 if (!draweeHolder.a) {
                     a.m(c.class, "%x: Draw requested for a non-attached controller %x. %s", Integer.valueOf(System.identityHashCode(draweeHolder)), Integer.valueOf(System.identityHashCode(draweeHolder.e)), draweeHolder.toString());
                     draweeHolder.b = true;
-                    draweeHolder.f2167c = true;
+                    draweeHolder.f2173c = true;
                     draweeHolder.b();
                 }
             }
diff --git a/app/src/main/java/c/f/g/j/a.java b/app/src/main/java/c/f/g/j/a.java
index 90d7bf1e34..8069370777 100644
--- a/app/src/main/java/c/f/g/j/a.java
+++ b/app/src/main/java/c/f/g/j/a.java
@@ -39,7 +39,7 @@ public class a extends DraweeView<GenericDraweeHierarchy> {
         b.b();
         b.b();
         c.f.g.f.a aVar = new c.f.g.f.a(context.getResources());
-        AnimatableValueParser.H2(aVar, context, attributeSet);
+        AnimatableValueParser.J2(aVar, context, attributeSet);
         b.b();
         setAspectRatio(aVar.e);
         setHierarchy(aVar.a());
diff --git a/app/src/main/java/c/f/i/d.java b/app/src/main/java/c/f/i/d.java
index d72e12c53f..624184fcbd 100644
--- a/app/src/main/java/c/f/i/d.java
+++ b/app/src/main/java/c/f/i/d.java
@@ -31,12 +31,12 @@ public class d {
         if (inputStream.markSupported()) {
             try {
                 inputStream.mark(i2);
-                i = AnimatableValueParser.Z1(inputStream, bArr, 0, i2);
+                i = AnimatableValueParser.b2(inputStream, bArr, 0, i2);
             } finally {
                 inputStream.reset();
             }
         } else {
-            i = AnimatableValueParser.Z1(inputStream, bArr, 0, i2);
+            i = AnimatableValueParser.b2(inputStream, bArr, 0, i2);
         }
         c b = c2.d.b(bArr, i);
         if (!(b == null || b == c.a)) {
diff --git a/app/src/main/java/c/f/j/a/c/c.java b/app/src/main/java/c/f/j/a/c/c.java
index 99a19bf56e..32ba171287 100644
--- a/app/src/main/java/c/f/j/a/c/c.java
+++ b/app/src/main/java/c/f/j/a/c/c.java
@@ -72,10 +72,10 @@ public class c {
         }
 
         public String toString() {
-            i D2 = AnimatableValueParser.D2(this);
-            D2.c("imageCacheKey", this.a);
-            D2.a("frameIndex", this.b);
-            return D2.toString();
+            i F2 = AnimatableValueParser.F2(this);
+            F2.c("imageCacheKey", this.a);
+            F2.a("frameIndex", this.b);
+            return F2.toString();
         }
     }
 
diff --git a/app/src/main/java/c/f/j/c/f.java b/app/src/main/java/c/f/j/c/f.java
index edbbc3e4ec..e3d7eb2c12 100644
--- a/app/src/main/java/c/f/j/c/f.java
+++ b/app/src/main/java/c/f/j/c/f.java
@@ -156,7 +156,7 @@ public class f {
         Objects.requireNonNull((z) this.g);
         Executor executor = z.g.a;
         if (eVar instanceof Boolean) {
-            return ((Boolean) eVar).booleanValue() ? z.g.f2879c : z.g.d;
+            return ((Boolean) eVar).booleanValue() ? z.g.f2885c : z.g.d;
         }
         z.g<e> gVar = new z.g<>();
         if (gVar.h(eVar)) {
diff --git a/app/src/main/java/c/f/j/c/n.java b/app/src/main/java/c/f/j/c/n.java
index 20a34b4804..8e4867e6ca 100644
--- a/app/src/main/java/c/f/j/c/n.java
+++ b/app/src/main/java/c/f/j/c/n.java
@@ -9,11 +9,11 @@ public class n implements i {
     public static n a;
 
     public CacheKey a(ImageRequest imageRequest, Object obj) {
-        return new b(imageRequest.f2176c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, null, null, obj);
+        return new b(imageRequest.f2182c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, null, null, obj);
     }
 
     public CacheKey b(ImageRequest imageRequest, Object obj) {
-        return new f(imageRequest.f2176c.toString());
+        return new f(imageRequest.f2182c.toString());
     }
 
     public CacheKey c(ImageRequest imageRequest, Object obj) {
@@ -28,6 +28,6 @@ public class n implements i {
             cacheKey = null;
             str = null;
         }
-        return new b(imageRequest.f2176c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj);
+        return new b(imageRequest.f2182c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj);
     }
 }
diff --git a/app/src/main/java/c/f/j/c/v.java b/app/src/main/java/c/f/j/c/v.java
index 882425bee4..92307bafe1 100644
--- a/app/src/main/java/c/f/j/c/v.java
+++ b/app/src/main/java/c/f/j/c/v.java
@@ -262,7 +262,7 @@ public class v<K, V> implements m<K, V>, w<K, V> {
             MemoryCacheParams memoryCacheParams = this.f;
             int min = Math.min(memoryCacheParams.d, memoryCacheParams.b - e());
             MemoryCacheParams memoryCacheParams2 = this.f;
-            p = p(min, Math.min(memoryCacheParams2.f2169c, memoryCacheParams2.a - f()));
+            p = p(min, Math.min(memoryCacheParams2.f2175c, memoryCacheParams2.a - f()));
             h(p);
         }
         i(p);
diff --git a/app/src/main/java/c/f/j/d/b.java b/app/src/main/java/c/f/j/d/b.java
index f8197758dc..18895fff97 100644
--- a/app/src/main/java/c/f/j/d/b.java
+++ b/app/src/main/java/c/f/j/d/b.java
@@ -34,17 +34,17 @@ public class b {
 
     public String toString() {
         StringBuilder L = a.L("ImageDecodeOptions{");
-        i D2 = AnimatableValueParser.D2(this);
-        D2.a("minDecodeIntervalMs", this.b);
-        D2.a("maxDimensionPx", this.f424c);
-        D2.b("decodePreviewFrame", false);
-        D2.b("useLastFrameForPreview", false);
-        D2.b("decodeAllFrames", false);
-        D2.b("forceStaticImage", false);
-        D2.c("bitmapConfigName", this.d.name());
-        D2.c("customImageDecoder", null);
-        D2.c("bitmapTransformation", null);
-        D2.c("colorSpace", null);
-        return a.D(L, D2.toString(), "}");
+        i F2 = AnimatableValueParser.F2(this);
+        F2.a("minDecodeIntervalMs", this.b);
+        F2.a("maxDimensionPx", this.f424c);
+        F2.b("decodePreviewFrame", false);
+        F2.b("useLastFrameForPreview", false);
+        F2.b("decodeAllFrames", false);
+        F2.b("forceStaticImage", false);
+        F2.c("bitmapConfigName", this.d.name());
+        F2.c("customImageDecoder", null);
+        F2.c("bitmapTransformation", null);
+        F2.c("colorSpace", null);
+        return a.D(L, F2.toString(), "}");
     }
 }
diff --git a/app/src/main/java/c/f/j/e/c.java b/app/src/main/java/c/f/j/e/c.java
index 636073f6aa..479c1bf75b 100644
--- a/app/src/main/java/c/f/j/e/c.java
+++ b/app/src/main/java/c/f/j/e/c.java
@@ -17,7 +17,7 @@ public class c implements f {
 
     public h a(DiskCacheConfig diskCacheConfig) {
         Objects.requireNonNull(this.a);
-        e eVar = new e(diskCacheConfig.a, diskCacheConfig.f2157c, diskCacheConfig.b, diskCacheConfig.h);
+        e eVar = new e(diskCacheConfig.a, diskCacheConfig.f2163c, diskCacheConfig.b, diskCacheConfig.h);
         ExecutorService newSingleThreadExecutor = Executors.newSingleThreadExecutor();
         return new d(eVar, diskCacheConfig.g, new d.c(diskCacheConfig.f, diskCacheConfig.e, diskCacheConfig.d), diskCacheConfig.i, diskCacheConfig.h, diskCacheConfig.j, newSingleThreadExecutor, false);
     }
diff --git a/app/src/main/java/c/f/j/e/h.java b/app/src/main/java/c/f/j/e/h.java
index 27997f76a3..16882474f3 100644
--- a/app/src/main/java/c/f/j/e/h.java
+++ b/app/src/main/java/c/f/j/e/h.java
@@ -85,7 +85,7 @@ public class h {
                 ImageRequest.c f = ImageRequest.c.f(imageRequest.m, cVar);
                 String valueOf = String.valueOf(this.i.getAndIncrement());
                 if (!imageRequest.f) {
-                    if (c.f.d.l.b.e(imageRequest.f2176c)) {
+                    if (c.f.d.l.b.e(imageRequest.f2182c)) {
                         z2 = false;
                         c1 c1Var = new c1(imageRequest, valueOf, str, b0Var, obj, f, false, z2, imageRequest.l, this.l);
                         c.f.j.r.b.b();
diff --git a/app/src/main/java/c/f/j/e/p.java b/app/src/main/java/c/f/j/e/p.java
index fd60e8c923..47142cdf81 100644
--- a/app/src/main/java/c/f/j/e/p.java
+++ b/app/src/main/java/c/f/j/e/p.java
@@ -153,7 +153,7 @@ public class p {
         try {
             b.b();
             Objects.requireNonNull(imageRequest);
-            Uri uri = imageRequest.f2176c;
+            Uri uri = imageRequest.f2182c;
             AnimatableValueParser.y(uri, "Uri is null.");
             int i = imageRequest.d;
             if (i != 0) {
@@ -247,7 +247,7 @@ public class p {
                     }
                 }
             }
-            if (this.m && imageRequest.f2177s > 0) {
+            if (this.m && imageRequest.f2183s > 0) {
                 synchronized (this) {
                     oVar = new o(r0Var, this.b.j.g());
                 }
diff --git a/app/src/main/java/c/f/j/h/d.java b/app/src/main/java/c/f/j/h/d.java
index a897687c08..3ae619e5d5 100644
--- a/app/src/main/java/c/f/j/h/d.java
+++ b/app/src/main/java/c/f/j/h/d.java
@@ -58,7 +58,7 @@ public class d {
                                 AnimatableValueParser.B(false);
                             } else {
                                 int i4 = ((this.b << 8) + read) - 2;
-                                AnimatableValueParser.A2(inputStream, (long) i4);
+                                AnimatableValueParser.C2(inputStream, (long) i4);
                                 this.f447c += i4;
                                 this.a = 2;
                             }
@@ -123,7 +123,7 @@ public class d {
         }
         f fVar = new f(eVar.e(), this.h.get(16384), this.h);
         try {
-            AnimatableValueParser.A2(fVar, (long) this.f447c);
+            AnimatableValueParser.C2(fVar, (long) this.f447c);
             boolean a = a(fVar);
             c.f.d.d.a.b(fVar);
             return a;
diff --git a/app/src/main/java/c/f/j/j/e.java b/app/src/main/java/c/f/j/j/e.java
index 585f59fad0..a394fb1649 100644
--- a/app/src/main/java/c/f/j/j/e.java
+++ b/app/src/main/java/c/f/j/j/e.java
@@ -179,7 +179,7 @@ public class e implements Closeable {
         boolean z3;
         int i3;
         int i4;
-        int h2;
+        int j2;
         c b = d.b(e());
         this.k = b;
         int i5 = 0;
@@ -209,7 +209,7 @@ public class e implements Closeable {
                             inputStream = AnimatableValueParser.P0(e);
                         } else if ("VP8X".equals(sb2)) {
                             e.skip(8);
-                            Pair pair2 = new Pair(Integer.valueOf(AnimatableValueParser.b2(e) + 1), Integer.valueOf(AnimatableValueParser.b2(e) + 1));
+                            Pair pair2 = new Pair(Integer.valueOf(AnimatableValueParser.d2(e) + 1), Integer.valueOf(AnimatableValueParser.d2(e) + 1));
                             try {
                                 e.close();
                             } catch (IOException e2) {
@@ -275,12 +275,12 @@ public class e implements Closeable {
                 try {
                     Objects.requireNonNull(e7);
                     while (true) {
-                        if (AnimatableValueParser.h2(e7, 1, false) != 255) {
+                        if (AnimatableValueParser.j2(e7, 1, false) != 255) {
                             break;
                         }
                         int i7 = 255;
                         while (i7 == 255) {
-                            i7 = AnimatableValueParser.h2(e7, 1, false);
+                            i7 = AnimatableValueParser.j2(e7, 1, false);
                         }
                         if (i7 == 225) {
                             z2 = true;
@@ -292,24 +292,24 @@ public class e implements Closeable {
                                 } else if (i7 == 218) {
                                     break;
                                 } else {
-                                    e7.skip((long) (AnimatableValueParser.h2(e7, 2, false) - 2));
+                                    e7.skip((long) (AnimatableValueParser.j2(e7, 2, false) - 2));
                                 }
                             }
                         }
                     }
                     z2 = false;
-                    if (z2 && (h2 = AnimatableValueParser.h2(e7, 2, false) - 2) > 6) {
-                        int h22 = AnimatableValueParser.h2(e7, 4, false);
-                        int h23 = AnimatableValueParser.h2(e7, 2, false);
-                        i = (h2 - 4) - 2;
-                        if (h22 == 1165519206 && h23 == 0) {
+                    if (z2 && (j2 = AnimatableValueParser.j2(e7, 2, false) - 2) > 6) {
+                        int j22 = AnimatableValueParser.j2(e7, 4, false);
+                        int j23 = AnimatableValueParser.j2(e7, 2, false);
+                        i = (j2 - 4) - 2;
+                        if (j22 == 1165519206 && j23 == 0) {
                             if (i == 0) {
                                 if (i > 8) {
-                                    int h24 = AnimatableValueParser.h2(e7, 4, false);
+                                    int j24 = AnimatableValueParser.j2(e7, 4, false);
                                     int i8 = i - 4;
-                                    if (h24 == 1229531648 || h24 == 1296891946) {
-                                        z3 = h24 == 1229531648;
-                                        i2 = AnimatableValueParser.h2(e7, 4, z3);
+                                    if (j24 == 1229531648 || j24 == 1296891946) {
+                                        z3 = j24 == 1229531648;
+                                        i2 = AnimatableValueParser.j2(e7, 4, z3);
                                         i3 = i8 - 4;
                                         if (i2 < 8 || i2 - 8 > i3) {
                                             c.f.d.e.a.a(c.f.k.c.class, "Invalid offset");
@@ -321,27 +321,27 @@ public class e implements Closeable {
                                                 e7.skip((long) i9);
                                                 int i10 = i3 - i9;
                                                 if (i10 >= 14) {
-                                                    int h25 = AnimatableValueParser.h2(e7, 2, z3);
+                                                    int j25 = AnimatableValueParser.j2(e7, 2, z3);
                                                     int i11 = i10 - 2;
                                                     while (true) {
-                                                        int i12 = h25 - 1;
-                                                        if (h25 <= 0 || i11 < 12) {
+                                                        int i12 = j25 - 1;
+                                                        if (j25 <= 0 || i11 < 12) {
                                                             break;
                                                         }
                                                         i4 = i11 - 2;
-                                                        if (AnimatableValueParser.h2(e7, 2, z3) == 274) {
+                                                        if (AnimatableValueParser.j2(e7, 2, z3) == 274) {
                                                             break;
                                                         }
                                                         e7.skip(10);
                                                         i11 = i4 - 10;
-                                                        h25 = i12;
+                                                        j25 = i12;
                                                     }
                                                 }
                                                 i4 = 0;
                                                 if (i4 >= 10) {
-                                                    if (AnimatableValueParser.h2(e7, 2, z3) == 3) {
-                                                        if (AnimatableValueParser.h2(e7, 4, z3) == 1) {
-                                                            i5 = AnimatableValueParser.h2(e7, 2, z3);
+                                                    if (AnimatableValueParser.j2(e7, 2, z3) == 3) {
+                                                        if (AnimatableValueParser.j2(e7, 4, z3) == 1) {
+                                                            i5 = AnimatableValueParser.j2(e7, 2, z3);
                                                         }
                                                     }
                                                 }
diff --git a/app/src/main/java/c/f/j/p/a1.java b/app/src/main/java/c/f/j/p/a1.java
index 133998e519..412565b7d5 100644
--- a/app/src/main/java/c/f/j/p/a1.java
+++ b/app/src/main/java/c/f/j/p/a1.java
@@ -19,7 +19,7 @@ public class a1 extends g0 {
 
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
-        return c(this.f461c.openInputStream(imageRequest.f2176c), -1);
+        return c(this.f461c.openInputStream(imageRequest.f2182c), -1);
     }
 
     @Override // c.f.j.p.g0
diff --git a/app/src/main/java/c/f/j/p/d.java b/app/src/main/java/c/f/j/p/d.java
index 3df5c85e59..d85c3c124d 100644
--- a/app/src/main/java/c/f/j/p/d.java
+++ b/app/src/main/java/c/f/j/p/d.java
@@ -43,7 +43,7 @@ public class d implements w0 {
         HashMap hashMap = new HashMap();
         this.h = hashMap;
         hashMap.put("id", str);
-        hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2176c);
+        hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2182c);
         this.d = str2;
         this.e = y0Var;
         this.f = obj;
diff --git a/app/src/main/java/c/f/j/p/d0.java b/app/src/main/java/c/f/j/p/d0.java
index d4d3992dd7..10f6220937 100644
--- a/app/src/main/java/c/f/j/p/d0.java
+++ b/app/src/main/java/c/f/j/p/d0.java
@@ -25,10 +25,10 @@ public class d0 extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         int i;
-        InputStream open = this.f467c.open(imageRequest.f2176c.getPath().substring(1), 2);
+        InputStream open = this.f467c.open(imageRequest.f2182c.getPath().substring(1), 2);
         AssetFileDescriptor assetFileDescriptor = null;
         try {
-            assetFileDescriptor = this.f467c.openFd(imageRequest.f2176c.getPath().substring(1));
+            assetFileDescriptor = this.f467c.openFd(imageRequest.f2182c.getPath().substring(1));
             i = (int) assetFileDescriptor.getLength();
         } catch (IOException unused) {
             i = -1;
diff --git a/app/src/main/java/c/f/j/p/e0.java b/app/src/main/java/c/f/j/p/e0.java
index 4f1aa87518..dc21263742 100644
--- a/app/src/main/java/c/f/j/p/e0.java
+++ b/app/src/main/java/c/f/j/p/e0.java
@@ -28,7 +28,7 @@ public class e0 extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         InputStream inputStream;
-        Uri uri = imageRequest.f2176c;
+        Uri uri = imageRequest.f2182c;
         Uri uri2 = b.a;
         boolean z2 = false;
         if (uri.getPath() != null && b.c(uri) && "com.android.contacts".equals(uri.getAuthority()) && !uri.getPath().startsWith(b.a.getPath())) {
diff --git a/app/src/main/java/c/f/j/p/f0.java b/app/src/main/java/c/f/j/p/f0.java
index ccaa3c86f1..ea696b5875 100644
--- a/app/src/main/java/c/f/j/p/f0.java
+++ b/app/src/main/java/c/f/j/p/f0.java
@@ -34,7 +34,7 @@ public class f0 extends g0 implements j1<e> {
     @Override // c.f.j.p.j1
     public boolean a(c.f.j.d.e eVar) {
         Rect rect = e;
-        return AnimatableValueParser.l1(rect.width(), rect.height(), eVar);
+        return AnimatableValueParser.m1(rect.width(), rect.height(), eVar);
     }
 
     @Override // c.f.j.p.g0
@@ -42,7 +42,7 @@ public class f0 extends g0 implements j1<e> {
         c.f.j.d.e eVar;
         Cursor query;
         e f2;
-        Uri uri = imageRequest.f2176c;
+        Uri uri = imageRequest.f2182c;
         if (!b.b(uri) || (eVar = imageRequest.i) == null || (query = this.g.query(uri, f469c, null, null, null)) == null) {
             return null;
         }
@@ -76,11 +76,11 @@ public class f0 extends g0 implements j1<e> {
         int i;
         Cursor queryMiniThumbnail;
         Rect rect = f;
-        if (AnimatableValueParser.l1(rect.width(), rect.height(), eVar)) {
+        if (AnimatableValueParser.m1(rect.width(), rect.height(), eVar)) {
             i = 3;
         } else {
             Rect rect2 = e;
-            i = AnimatableValueParser.l1(rect2.width(), rect2.height(), eVar) ? 1 : 0;
+            i = AnimatableValueParser.m1(rect2.width(), rect2.height(), eVar) ? 1 : 0;
         }
         if (i == 0 || (queryMiniThumbnail = MediaStore.Images.Thumbnails.queryMiniThumbnail(this.g, j, i, d)) == null) {
             return null;
diff --git a/app/src/main/java/c/f/j/p/i0.java b/app/src/main/java/c/f/j/p/i0.java
index ebe075d6e1..197b02774e 100644
--- a/app/src/main/java/c/f/j/p/i0.java
+++ b/app/src/main/java/c/f/j/p/i0.java
@@ -25,10 +25,10 @@ public class i0 extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         int i;
-        InputStream openRawResource = this.f476c.openRawResource(Integer.parseInt(imageRequest.f2176c.getPath().substring(1)));
+        InputStream openRawResource = this.f476c.openRawResource(Integer.parseInt(imageRequest.f2182c.getPath().substring(1)));
         AssetFileDescriptor assetFileDescriptor = null;
         try {
-            assetFileDescriptor = this.f476c.openRawResourceFd(Integer.parseInt(imageRequest.f2176c.getPath().substring(1)));
+            assetFileDescriptor = this.f476c.openRawResourceFd(Integer.parseInt(imageRequest.f2182c.getPath().substring(1)));
             i = (int) assetFileDescriptor.getLength();
         } catch (Resources.NotFoundException unused) {
             i = -1;
diff --git a/app/src/main/java/c/f/j/p/i1.java b/app/src/main/java/c/f/j/p/i1.java
index 2385c5ee0f..c53fe25b3a 100644
--- a/app/src/main/java/c/f/j/p/i1.java
+++ b/app/src/main/java/c/f/j/p/i1.java
@@ -32,7 +32,7 @@ public class i1 implements v0<e> {
         @Override // c.f.j.p.b
         public void i(Object obj, int i) {
             e eVar = (e) obj;
-            if (eVar != null && (b.f(i) || AnimatableValueParser.m1(eVar, this.e))) {
+            if (eVar != null && (b.f(i) || AnimatableValueParser.n1(eVar, this.e))) {
                 this.b.b(eVar, i);
             } else if (b.e(i)) {
                 if (eVar != null) {
diff --git a/app/src/main/java/c/f/j/p/j0.java b/app/src/main/java/c/f/j/p/j0.java
index 08c8a15fd9..84b58eac72 100644
--- a/app/src/main/java/c/f/j/p/j0.java
+++ b/app/src/main/java/c/f/j/p/j0.java
@@ -82,7 +82,7 @@ public class j0 implements v0<CloseableReference<c>> {
                 bitmap = ThumbnailUtils.createVideoThumbnail(str, i);
             } else {
                 try {
-                    ParcelFileDescriptor openFileDescriptor = j0.this.b.openFileDescriptor(this.p.f2176c, "r");
+                    ParcelFileDescriptor openFileDescriptor = j0.this.b.openFileDescriptor(this.p.f2182c, "r");
                     MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
                     mediaMetadataRetriever.setDataSource(openFileDescriptor.getFileDescriptor());
                     bitmap = mediaMetadataRetriever.getFrameAtTime(-1);
@@ -140,7 +140,7 @@ public class j0 implements v0<CloseableReference<c>> {
         String str;
         Uri uri;
         Objects.requireNonNull(j0Var);
-        Uri uri2 = imageRequest.f2176c;
+        Uri uri2 = imageRequest.f2182c;
         if (c.f.d.l.b.d(uri2)) {
             return imageRequest.a().getPath();
         }
diff --git a/app/src/main/java/c/f/j/p/k.java b/app/src/main/java/c/f/j/p/k.java
index 8ae57f686a..7a7a763fe0 100644
--- a/app/src/main/java/c/f/j/p/k.java
+++ b/app/src/main/java/c/f/j/p/k.java
@@ -29,15 +29,15 @@ public class k implements v0<e> {
             e eVar = (e) obj;
             ImageRequest e = this.f480c.e();
             boolean e2 = b.e(i);
-            boolean m1 = AnimatableValueParser.m1(eVar, e.i);
-            if (eVar != null && (m1 || e.g)) {
-                if (!e2 || !m1) {
+            boolean n1 = AnimatableValueParser.n1(eVar, e.i);
+            if (eVar != null && (n1 || e.g)) {
+                if (!e2 || !n1) {
                     this.b.b(eVar, i & -2);
                 } else {
                     this.b.b(eVar, i);
                 }
             }
-            if (e2 && !m1) {
+            if (e2 && !n1) {
                 if (eVar != null) {
                     eVar.close();
                 }
diff --git a/app/src/main/java/c/f/j/p/m.java b/app/src/main/java/c/f/j/p/m.java
index ebf803f55a..c9eaffea2b 100644
--- a/app/src/main/java/c/f/j/p/m.java
+++ b/app/src/main/java/c/f/j/p/m.java
@@ -18,7 +18,7 @@ public class m extends g0 {
     @Override // c.f.j.p.g0
     public e d(ImageRequest imageRequest) throws IOException {
         boolean z2;
-        String uri = imageRequest.f2176c.toString();
+        String uri = imageRequest.f2182c.toString();
         AnimatableValueParser.j(Boolean.valueOf(uri.substring(0, 5).equals("data:")));
         int indexOf = uri.indexOf(44);
         String substring = uri.substring(indexOf + 1, uri.length());
diff --git a/app/src/main/java/c/f/j/p/n.java b/app/src/main/java/c/f/j/p/n.java
index 6a748b8c7e..c9078d6410 100644
--- a/app/src/main/java/c/f/j/p/n.java
+++ b/app/src/main/java/c/f/j/p/n.java
@@ -141,7 +141,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                     w0Var.d("image_format", eVar.k.b);
                     if (n.this.f || !b.m(i2, 16)) {
                         ImageRequest e2 = this.a.e();
-                        if (n.this.g || !c.f.d.l.b.e(e2.f2176c)) {
+                        if (n.this.g || !c.f.d.l.b.e(e2.f2182c)) {
                             eVar.p = AnimatableValueParser.c0(e2.j, e2.i, eVar, this.b);
                         }
                     }
@@ -179,7 +179,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                                 synchronized (c0Var) {
                                     j = c0Var.j - c0Var.i;
                                 }
-                                String valueOf2 = String.valueOf(cVar2.f485c.e().f2176c);
+                                String valueOf2 = String.valueOf(cVar2.f485c.e().f2182c);
                                 int f = (z3 || m) ? eVar.f() : cVar2.o(eVar);
                                 i p = (z3 || m) ? h.a : cVar2.p();
                                 cVar2.d.e(cVar2.f485c, "DecodeProducer");
@@ -439,7 +439,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
     public void b(l<CloseableReference<c.f.j.j.c>> lVar, w0 w0Var) {
         try {
             c.f.j.r.b.b();
-            this.e.b(!c.f.d.l.b.e(w0Var.e().f2176c) ? new a(this, lVar, w0Var, this.h, this.i) : new b(this, lVar, w0Var, new d(this.a), this.d, this.h, this.i), w0Var);
+            this.e.b(!c.f.d.l.b.e(w0Var.e().f2182c) ? new a(this, lVar, w0Var, this.h, this.i) : new b(this, lVar, w0Var, new d(this.a), this.d, this.h, this.i), w0Var);
             c.f.j.r.b.b();
         } catch (Throwable th) {
             c.f.j.r.b.b();
diff --git a/app/src/main/java/c/f/j/p/o.java b/app/src/main/java/c/f/j/p/o.java
index 19e3e18333..ca925ac913 100644
--- a/app/src/main/java/c/f/j/p/o.java
+++ b/app/src/main/java/c/f/j/p/o.java
@@ -36,7 +36,7 @@ public class o implements v0<CloseableReference<c>> {
         ImageRequest e = w0Var.e();
         ScheduledExecutorService scheduledExecutorService = this.b;
         if (scheduledExecutorService != null) {
-            scheduledExecutorService.schedule(new a(lVar, w0Var), (long) e.f2177s, TimeUnit.MILLISECONDS);
+            scheduledExecutorService.schedule(new a(lVar, w0Var), (long) e.f2183s, TimeUnit.MILLISECONDS);
         } else {
             this.a.b(lVar, w0Var);
         }
diff --git a/app/src/main/java/c/f/j/p/o0.java b/app/src/main/java/c/f/j/p/o0.java
index a71e27b9d1..4be6290b94 100644
--- a/app/src/main/java/c/f/j/p/o0.java
+++ b/app/src/main/java/c/f/j/p/o0.java
@@ -64,7 +64,7 @@ public class o0 implements c<e, Void> {
                     this.f487c.b(eVar2, 9);
                 } else {
                     this.f487c.b(eVar2, 8);
-                    ImageRequestBuilder b = ImageRequestBuilder.b(e.f2176c);
+                    ImageRequestBuilder b = ImageRequestBuilder.b(e.f2182c);
                     b.e = e.h;
                     b.o = e.k;
                     b.f = e.b;
@@ -73,11 +73,11 @@ public class o0 implements c<e, Void> {
                     b.j = e.q;
                     b.g = e.f;
                     b.i = e.l;
-                    b.f2178c = e.i;
+                    b.f2184c = e.i;
                     b.n = e.r;
                     b.d = e.j;
                     b.m = e.p;
-                    b.p = e.f2177s;
+                    b.p = e.f2183s;
                     int i = f2 - 1;
                     if (i >= 0) {
                         z3 = true;
diff --git a/app/src/main/java/c/f/j/p/q0.java b/app/src/main/java/c/f/j/p/q0.java
index c6145874a4..d898dcc84f 100644
--- a/app/src/main/java/c/f/j/p/q0.java
+++ b/app/src/main/java/c/f/j/p/q0.java
@@ -185,7 +185,7 @@ public class q0 implements v0<e> {
             return;
         }
         w0Var.o().e(w0Var, "PartialDiskCacheProducer");
-        Uri build = e.f2176c.buildUpon().appendQueryParameter("fresco_partial", "true").build();
+        Uri build = e.f2182c.buildUpon().appendQueryParameter("fresco_partial", "true").build();
         i iVar = this.b;
         w0Var.b();
         Objects.requireNonNull((n) iVar);
diff --git a/app/src/main/java/c/f/j/p/y.java b/app/src/main/java/c/f/j/p/y.java
index a9cf20b41f..a561ee9a41 100644
--- a/app/src/main/java/c/f/j/p/y.java
+++ b/app/src/main/java/c/f/j/p/y.java
@@ -34,7 +34,7 @@ public class y implements Runnable {
         Objects.requireNonNull(a0Var);
         InputStream inputStream = null;
         try {
-            httpURLConnection = a0Var.a(aVar.b.e().f2176c, 5);
+            httpURLConnection = a0Var.a(aVar.b.e().f2182c, 5);
             try {
                 aVar.e = a0Var.f460c.now();
                 if (httpURLConnection != null) {
diff --git a/app/src/main/java/c/f/m/j.java b/app/src/main/java/c/f/m/j.java
index 9edf938c29..31c9d24d88 100644
--- a/app/src/main/java/c/f/m/j.java
+++ b/app/src/main/java/c/f/m/j.java
@@ -12,7 +12,7 @@ public class j implements b {
         boolean z2;
         boolean contains;
         int i2 = ((i & 1) != 0 ? 16 : 0) | 0;
-        ReentrantReadWriteLock reentrantReadWriteLock = SoLoader.f2180c;
+        ReentrantReadWriteLock reentrantReadWriteLock = SoLoader.f2186c;
         reentrantReadWriteLock.readLock().lock();
         try {
             if (SoLoader.d == null) {
@@ -49,7 +49,7 @@ public class j implements b {
                     continue;
                 } catch (UnsatisfiedLinkError e) {
                     int i3 = SoLoader.e;
-                    SoLoader.f2180c.writeLock().lock();
+                    SoLoader.f2186c.writeLock().lock();
                     try {
                         if (SoLoader.g == null || !SoLoader.g.c()) {
                             z2 = false;
@@ -58,21 +58,21 @@ public class j implements b {
                             SoLoader.e = SoLoader.e + 1;
                             z2 = true;
                         }
-                        SoLoader.f2180c.writeLock().unlock();
+                        SoLoader.f2186c.writeLock().unlock();
                         if (SoLoader.e == i3) {
                             throw e;
                         }
                     } catch (IOException e2) {
                         throw new RuntimeException(e2);
                     } catch (Throwable th2) {
-                        SoLoader.f2180c.writeLock().unlock();
+                        SoLoader.f2186c.writeLock().unlock();
                         throw th2;
                     }
                 }
             } while (z2);
             return z5;
         } finally {
-            SoLoader.f2180c.readLock().unlock();
+            SoLoader.f2186c.readLock().unlock();
         }
     }
 }
diff --git a/app/src/main/java/c/g/a/c/c0/c.java b/app/src/main/java/c/g/a/c/c0/c.java
index ce5a7d29a2..b30cf9425f 100644
--- a/app/src/main/java/c/g/a/c/c0/c.java
+++ b/app/src/main/java/c/g/a/c/c0/c.java
@@ -252,9 +252,9 @@ public final class c extends b implements e0 {
                                             int i9 = 0;
                                             while (true) {
                                                 if (i9 < actualTypeArguments.length) {
-                                                    TypeVariable<?> G1 = AnimatableValueParser.G1(actualTypeArguments[i9]);
-                                                    if (G1 != null) {
-                                                        String name = G1.getName();
+                                                    TypeVariable<?> I1 = AnimatableValueParser.I1(actualTypeArguments[i9]);
+                                                    if (I1 != null) {
+                                                        String name = I1.getName();
                                                         if (name == null) {
                                                             jVar = jVar2;
                                                             break;
@@ -292,7 +292,7 @@ public final class c extends b implements e0 {
                                                             if (i11 >= length3) {
                                                                 z2 = true;
                                                                 break;
-                                                            } else if (!AnimatableValueParser.Y1(bVar2, f, bounds[i11])) {
+                                                            } else if (!AnimatableValueParser.a2(bVar2, f, bounds[i11])) {
                                                                 z2 = false;
                                                                 break;
                                                             } else {
diff --git a/app/src/main/java/c/g/a/c/g0/f.java b/app/src/main/java/c/g/a/c/g0/f.java
index 07f8b197b1..07ee78e707 100644
--- a/app/src/main/java/c/g/a/c/g0/f.java
+++ b/app/src/main/java/c/g/a/c/g0/f.java
@@ -1095,7 +1095,7 @@ public class f extends b implements Serializable {
                                         if (set != null || (d6 != null && !d6.isEmpty())) {
                                             Iterator it5 = arrayList.iterator();
                                             while (it5.hasNext()) {
-                                                if (AnimatableValueParser.y2(((c) it5.next())._name._value, d6, set)) {
+                                                if (AnimatableValueParser.A2(((c) it5.next())._name._value, d6, set)) {
                                                     it5.remove();
                                                 }
                                             }
diff --git a/app/src/main/java/c/g/a/c/g0/u/d.java b/app/src/main/java/c/g/a/c/g0/u/d.java
index 1f79e027f1..df2db66ce6 100644
--- a/app/src/main/java/c/g/a/c/g0/u/d.java
+++ b/app/src/main/java/c/g/a/c/g0/u/d.java
@@ -67,7 +67,7 @@ public abstract class d extends q0<Object> implements i, o {
         ArrayList arrayList2 = cVarArr2 == null ? null : new ArrayList(length);
         for (int i = 0; i < length; i++) {
             c cVar = cVarArr[i];
-            if (!AnimatableValueParser.y2(cVar._name._value, set, set2)) {
+            if (!AnimatableValueParser.A2(cVar._name._value, set, set2)) {
                 arrayList.add(cVar);
                 if (cVarArr2 != null) {
                     arrayList2.add(cVarArr2[i]);
diff --git a/app/src/main/java/c/i/a/b/i/a.java b/app/src/main/java/c/i/a/b/i/a.java
index 16b76d4d54..a06dd9ba49 100644
--- a/app/src/main/java/c/i/a/b/i/a.java
+++ b/app/src/main/java/c/i/a/b/i/a.java
@@ -13,7 +13,7 @@ import java.util.Set;
 import java.util.regex.Pattern;
 /* compiled from: CCTDestination */
 public final class a implements d {
-    public static final String a = AnimatableValueParser.I1("hts/frbslgiggolai.o/0clgbthfra=snpoo", "tp:/ieaeogn.ogepscmvc/o/ac?omtjo_rt3");
+    public static final String a = AnimatableValueParser.K1("hts/frbslgiggolai.o/0clgbthfra=snpoo", "tp:/ieaeogn.ogepscmvc/o/ac?omtjo_rt3");
     public static final String b;
 
     /* renamed from: c  reason: collision with root package name */
@@ -26,11 +26,11 @@ public final class a implements d {
     public final String g;
 
     static {
-        String I1 = AnimatableValueParser.I1("hts/frbslgigp.ogepscmv/ieo/eaybtho", "tp:/ieaeogn-agolai.o/1frlglgc/aclg");
-        b = I1;
-        String I12 = AnimatableValueParser.I1("AzSCki82AwsLzKd5O8zo", "IayckHiZRO1EFl1aGoK");
-        f587c = I12;
-        e = new a(I1, I12);
+        String K1 = AnimatableValueParser.K1("hts/frbslgigp.ogepscmv/ieo/eaybtho", "tp:/ieaeogn-agolai.o/1frlglgc/aclg");
+        b = K1;
+        String K12 = AnimatableValueParser.K1("AzSCki82AwsLzKd5O8zo", "IayckHiZRO1EFl1aGoK");
+        f587c = K12;
+        e = new a(K1, K12);
     }
 
     public a(@NonNull String str, @Nullable String str2) {
diff --git a/app/src/main/java/c/i/a/b/i/d.java b/app/src/main/java/c/i/a/b/i/d.java
index 6d3586b89a..1b7ccb96f0 100644
--- a/app/src/main/java/c/i/a/b/i/d.java
+++ b/app/src/main/java/c/i/a/b/i/d.java
@@ -212,7 +212,7 @@ public final class d implements m {
                     }
                 }
                 try {
-                    b bVar3 = (b) AnimatableValueParser.r2(5, new a(url, dVar, str2), new b(this), c.a);
+                    b bVar3 = (b) AnimatableValueParser.t2(5, new a(url, dVar, str2), new b(this), c.a);
                     int i = bVar3.a;
                     if (i == 200) {
                         return new c.i.a.b.j.q.b(g.a.OK, bVar3.f590c);
diff --git a/app/src/main/java/c/i/a/b/i/e/b.java b/app/src/main/java/c/i/a/b/i/e/b.java
index 0c1664631c..c9a08cfbd4 100644
--- a/app/src/main/java/c/i/a/b/i/e/b.java
+++ b/app/src/main/java/c/i/a/b/i/e/b.java
@@ -111,33 +111,33 @@ public final class b implements c.i.c.p.g.a {
         C0073b bVar2 = C0073b.a;
         c.i.c.p.h.e eVar = (c.i.c.p.h.e) bVar;
         eVar.b.put(j.class, bVar2);
-        eVar.f1359c.remove(j.class);
+        eVar.f1354c.remove(j.class);
         eVar.b.put(d.class, bVar2);
-        eVar.f1359c.remove(d.class);
+        eVar.f1354c.remove(d.class);
         e eVar2 = e.a;
         eVar.b.put(m.class, eVar2);
-        eVar.f1359c.remove(m.class);
+        eVar.f1354c.remove(m.class);
         eVar.b.put(g.class, eVar2);
-        eVar.f1359c.remove(g.class);
+        eVar.f1354c.remove(g.class);
         c cVar = c.a;
         eVar.b.put(k.class, cVar);
-        eVar.f1359c.remove(k.class);
+        eVar.f1354c.remove(k.class);
         eVar.b.put(e.class, cVar);
-        eVar.f1359c.remove(e.class);
+        eVar.f1354c.remove(e.class);
         a aVar = a.a;
         eVar.b.put(a.class, aVar);
-        eVar.f1359c.remove(a.class);
+        eVar.f1354c.remove(a.class);
         eVar.b.put(c.class, aVar);
-        eVar.f1359c.remove(c.class);
+        eVar.f1354c.remove(c.class);
         d dVar = d.a;
         eVar.b.put(l.class, dVar);
-        eVar.f1359c.remove(l.class);
+        eVar.f1354c.remove(l.class);
         eVar.b.put(f.class, dVar);
-        eVar.f1359c.remove(f.class);
+        eVar.f1354c.remove(f.class);
         f fVar = f.a;
         eVar.b.put(o.class, fVar);
-        eVar.f1359c.remove(o.class);
+        eVar.f1354c.remove(o.class);
         eVar.b.put(i.class, fVar);
-        eVar.f1359c.remove(i.class);
+        eVar.f1354c.remove(i.class);
     }
 }
diff --git a/app/src/main/java/c/i/a/c/a2/b0/b.java b/app/src/main/java/c/i/a/c/a2/b0/b.java
index 9119254ab2..b09fd967cc 100644
--- a/app/src/main/java/c/i/a/c/a2/b0/b.java
+++ b/app/src/main/java/c/i/a/c/a2/b0/b.java
@@ -126,8 +126,8 @@ public final class b implements h {
                 Format.b bVar = new Format.b();
                 bVar.k = str;
                 bVar.l = e;
-                bVar.f2193x = 1;
-                bVar.f2194y = i;
+                bVar.f2199x = 1;
+                bVar.f2200y = i;
                 wVar.e(bVar.a());
             }
             int i2 = -1;
diff --git a/app/src/main/java/c/i/a/c/a2/c0/c.java b/app/src/main/java/c/i/a/c/a2/c0/c.java
index 9777c81a71..755427968e 100644
--- a/app/src/main/java/c/i/a/c/a2/c0/c.java
+++ b/app/src/main/java/c/i/a/c/a2/c0/c.java
@@ -54,7 +54,7 @@ public final class c extends c.i.a.c.a2.a {
                 } else {
                     w wVar = new w(16);
                     System.arraycopy(bArr, 0, wVar.a, 0, 2);
-                    wVar.C(AnimatableValueParser.X1(iVar, wVar.a, 2, 14));
+                    wVar.C(AnimatableValueParser.Z1(iVar, wVar.a, 2, 14));
                     iVar.k();
                     iVar.g((int) (f - iVar.getPosition()));
                     z2 = m.b(wVar, oVar, i, aVar);
diff --git a/app/src/main/java/c/i/a/c/a2/c0/d.java b/app/src/main/java/c/i/a/c/a2/c0/d.java
index 7d4960bc74..13106b3429 100644
--- a/app/src/main/java/c/i/a/c/a2/c0/d.java
+++ b/app/src/main/java/c/i/a/c/a2/c0/d.java
@@ -59,7 +59,7 @@ public final class d implements h {
 
     @Override // c.i.a.c.a2.h
     public boolean b(i iVar) throws IOException {
-        AnimatableValueParser.W1(iVar, false);
+        AnimatableValueParser.Y1(iVar, false);
         byte[] bArr = new byte[4];
         iVar.n(bArr, 0, 4);
         return (((((((long) bArr[0]) & 255) << 24) | ((((long) bArr[1]) & 255) << 16)) | ((((long) bArr[2]) & 255) << 8)) | (255 & ((long) bArr[3]))) == 1716281667;
@@ -82,9 +82,9 @@ public final class d implements h {
         if (i == 0) {
             iVar.k();
             long f = iVar.f();
-            Metadata W1 = AnimatableValueParser.W1(iVar, !this.f645c);
+            Metadata Y1 = AnimatableValueParser.Y1(iVar, !this.f645c);
             iVar.l((int) (iVar.f() - f));
-            this.h = W1;
+            this.h = Y1;
             this.g = 1;
             return 0;
         } else if (i != 1) {
@@ -143,7 +143,7 @@ public final class d implements h {
                                 i5 = 6;
                             }
                             w wVar = new w(i5);
-                            wVar.C(AnimatableValueParser.X1(iVar, wVar.a, 0, i5));
+                            wVar.C(AnimatableValueParser.Z1(iVar, wVar.a, 0, i5));
                             iVar.k();
                             try {
                                 long y2 = wVar.y();
@@ -271,13 +271,13 @@ public final class d implements h {
                         } else if (g == i4) {
                             w wVar7 = new w(g2);
                             iVar.readFully(wVar7.a, r4, g2);
-                            oVar4 = oVar4.b(AnimatableValueParser.j2(wVar7));
+                            oVar4 = oVar4.b(AnimatableValueParser.l2(wVar7));
                         } else {
                             if (g == i3) {
                                 w wVar8 = new w(g2);
                                 iVar.readFully(wVar8.a, r4, g2);
                                 wVar8.E(i3);
-                                oVar = new o(oVar4.a, oVar4.b, oVar4.f750c, oVar4.d, oVar4.e, oVar4.g, oVar4.h, oVar4.j, oVar4.k, oVar4.f(o.a(Arrays.asList(AnimatableValueParser.l2(wVar8, r4, r4).a), Collections.emptyList())));
+                                oVar = new o(oVar4.a, oVar4.b, oVar4.f750c, oVar4.d, oVar4.e, oVar4.g, oVar4.h, oVar4.j, oVar4.k, oVar4.f(o.a(Arrays.asList(AnimatableValueParser.n2(wVar8, r4, r4).a), Collections.emptyList())));
                                 z2 = f2;
                             } else if (g == 6) {
                                 w wVar9 = new w(g2);
diff --git a/app/src/main/java/c/i/a/c/a2/d0/b.java b/app/src/main/java/c/i/a/c/a2/d0/b.java
index d9c7b722e8..83ac3137bb 100644
--- a/app/src/main/java/c/i/a/c/a2/d0/b.java
+++ b/app/src/main/java/c/i/a/c/a2/d0/b.java
@@ -31,16 +31,16 @@ public final class b extends TagPayloadReader {
                 int i2 = b[(s2 >> 2) & 3];
                 Format.b bVar = new Format.b();
                 bVar.k = "audio/mpeg";
-                bVar.f2193x = 1;
-                bVar.f2194y = i2;
+                bVar.f2199x = 1;
+                bVar.f2200y = i2;
                 this.a.e(bVar.a());
                 this.d = true;
             } else if (i == 7 || i == 8) {
                 String str = i == 7 ? "audio/g711-alaw" : "audio/g711-mlaw";
                 Format.b bVar2 = new Format.b();
                 bVar2.k = str;
-                bVar2.f2193x = 1;
-                bVar2.f2194y = 8000;
+                bVar2.f2199x = 1;
+                bVar2.f2200y = 8000;
                 this.a.e(bVar2.a());
                 this.d = true;
             } else if (i != 10) {
@@ -73,8 +73,8 @@ public final class b extends TagPayloadReader {
             Format.b bVar = new Format.b();
             bVar.k = "audio/mp4a-latm";
             bVar.h = c2.f986c;
-            bVar.f2193x = c2.b;
-            bVar.f2194y = c2.a;
+            bVar.f2199x = c2.b;
+            bVar.f2200y = c2.a;
             bVar.m = Collections.singletonList(bArr);
             this.a.e(bVar.a());
             this.d = true;
diff --git a/app/src/main/java/c/i/a/c/a2/e0/e.java b/app/src/main/java/c/i/a/c/a2/e0/e.java
index 2f389131e8..07fd9e06ef 100644
--- a/app/src/main/java/c/i/a/c/a2/e0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/e0/e.java
@@ -36,13 +36,13 @@ public final class e {
         XmlPullParser newPullParser = XmlPullParserFactory.newInstance().newPullParser();
         newPullParser.setInput(new StringReader(str));
         newPullParser.next();
-        if (AnimatableValueParser.v1(newPullParser, "x:xmpmeta")) {
+        if (AnimatableValueParser.w1(newPullParser, "x:xmpmeta")) {
             a<Object> aVar = u.j;
             u<Object> uVar = q0.k;
             long j2 = -9223372036854775807L;
             do {
                 newPullParser.next();
-                if (AnimatableValueParser.v1(newPullParser, "rdf:Description")) {
+                if (AnimatableValueParser.w1(newPullParser, "rdf:Description")) {
                     String[] strArr = a;
                     int length = strArr.length;
                     int i = 0;
@@ -96,12 +96,12 @@ public final class e {
                         i3++;
                     }
                     j2 = j;
-                } else if (AnimatableValueParser.v1(newPullParser, "Container:Directory")) {
+                } else if (AnimatableValueParser.w1(newPullParser, "Container:Directory")) {
                     uVar = b(newPullParser, "Container", "Item");
-                } else if (AnimatableValueParser.v1(newPullParser, "GContainer:Directory")) {
+                } else if (AnimatableValueParser.w1(newPullParser, "GContainer:Directory")) {
                     uVar = b(newPullParser, "GContainer", "GContainerItem");
                 }
-            } while (!AnimatableValueParser.h1(newPullParser, "x:xmpmeta"));
+            } while (!AnimatableValueParser.i1(newPullParser, "x:xmpmeta"));
             if (uVar.isEmpty()) {
                 return null;
             }
@@ -120,7 +120,7 @@ public final class e {
         int i = 0;
         do {
             xmlPullParser.next();
-            if (AnimatableValueParser.v1(xmlPullParser, u)) {
+            if (AnimatableValueParser.w1(xmlPullParser, u)) {
                 String u3 = c.d.b.a.a.u(str2, ":Mime");
                 String u4 = c.d.b.a.a.u(str2, ":Semantic");
                 String u5 = c.d.b.a.a.u(str2, ":Length");
@@ -140,7 +140,7 @@ public final class e {
                 objArr[i] = aVar2;
                 i = i2;
             }
-        } while (!AnimatableValueParser.h1(xmlPullParser, u2));
+        } while (!AnimatableValueParser.i1(xmlPullParser, u2));
         return u.l(objArr, i);
     }
 }
diff --git a/app/src/main/java/c/i/a/c/a2/f0/e.java b/app/src/main/java/c/i/a/c/a2/f0/e.java
index 8634d54e28..583d618eb2 100644
--- a/app/src/main/java/c/i/a/c/a2/f0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/f0/e.java
@@ -1919,9 +1919,9 @@ public class e implements h {
                                 int i14 = (cVar.V ? 1 : 0) | 0 | (!cVar.U ? 2 : 0);
                                 bVar = new Format.b();
                                 if (!c.i.a.c.i2.s.h(str12)) {
-                                    bVar.f2193x = cVar.O;
-                                    bVar.f2194y = cVar.Q;
-                                    bVar.f2195z = i3;
+                                    bVar.f2199x = cVar.O;
+                                    bVar.f2200y = cVar.Q;
+                                    bVar.f2201z = i3;
                                     i4 = 1;
                                 } else if (c.i.a.c.i2.s.j(str12)) {
                                     if (cVar.q == 0) {
@@ -1987,7 +1987,7 @@ public class e implements h {
                                             bVar.p = cVar.m;
                                             bVar.q = cVar.n;
                                             bVar.t = f;
-                                            bVar.f2192s = i6;
+                                            bVar.f2198s = i6;
                                             bVar.u = cVar.v;
                                             bVar.v = cVar.w;
                                             bVar.w = colorInfo;
@@ -2000,7 +2000,7 @@ public class e implements h {
                                     bVar.p = cVar.m;
                                     bVar.q = cVar.n;
                                     bVar.t = f;
-                                    bVar.f2192s = i6;
+                                    bVar.f2198s = i6;
                                     bVar.u = cVar.v;
                                     bVar.v = cVar.w;
                                     bVar.w = colorInfo;
@@ -2017,7 +2017,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2067,7 +2067,7 @@ public class e implements h {
                                             bVar.b(i13);
                                             bVar.k = str12;
                                             bVar.l = i2;
-                                            bVar.f2191c = cVar.W;
+                                            bVar.f2197c = cVar.W;
                                             bVar.d = i14;
                                             bVar.m = list;
                                             bVar.h = str;
@@ -2106,7 +2106,7 @@ public class e implements h {
                                         bVar.b(i13);
                                         bVar.k = str12;
                                         bVar.l = i2;
-                                        bVar.f2191c = cVar.W;
+                                        bVar.f2197c = cVar.W;
                                         bVar.d = i14;
                                         bVar.m = list;
                                         bVar.h = str;
@@ -2145,7 +2145,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2191c = cVar.W;
+                                    bVar.f2197c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2184,7 +2184,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2249,7 +2249,7 @@ public class e implements h {
                                                     bVar.b(i13);
                                                     bVar.k = str12;
                                                     bVar.l = i2;
-                                                    bVar.f2191c = cVar.W;
+                                                    bVar.f2197c = cVar.W;
                                                     bVar.d = i14;
                                                     bVar.m = list;
                                                     bVar.h = str;
@@ -2301,7 +2301,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2338,7 +2338,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2395,7 +2395,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2191c = cVar.W;
+                                    bVar.f2197c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2439,7 +2439,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2477,7 +2477,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2515,7 +2515,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2553,7 +2553,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2592,7 +2592,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2630,7 +2630,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2669,7 +2669,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2707,7 +2707,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2745,7 +2745,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2783,7 +2783,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2821,7 +2821,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2858,7 +2858,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -2888,7 +2888,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2191c = cVar.W;
+                                    bVar.f2197c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2929,7 +2929,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2191c = cVar.W;
+                                    bVar.f2197c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -2975,7 +2975,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2191c = cVar.W;
+                                    bVar.f2197c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -3005,7 +3005,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3048,7 +3048,7 @@ public class e implements h {
                                     bVar.b(i13);
                                     bVar.k = str12;
                                     bVar.l = i2;
-                                    bVar.f2191c = cVar.W;
+                                    bVar.f2197c = cVar.W;
                                     bVar.d = i14;
                                     bVar.m = list;
                                     bVar.h = str;
@@ -3076,7 +3076,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3118,7 +3118,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3156,7 +3156,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3194,7 +3194,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3232,7 +3232,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3270,7 +3270,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3308,7 +3308,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
@@ -3350,7 +3350,7 @@ public class e implements h {
                                 bVar.b(i13);
                                 bVar.k = str12;
                                 bVar.l = i2;
-                                bVar.f2191c = cVar.W;
+                                bVar.f2197c = cVar.W;
                                 bVar.d = i14;
                                 bVar.m = list;
                                 bVar.h = str;
diff --git a/app/src/main/java/c/i/a/c/a2/g0/f.java b/app/src/main/java/c/i/a/c/a2/g0/f.java
index 8dd059a1a7..b765a74ef1 100644
--- a/app/src/main/java/c/i/a/c/a2/g0/f.java
+++ b/app/src/main/java/c/i/a/c/a2/g0/f.java
@@ -382,8 +382,8 @@ public final class f implements h {
                     z.a aVar4 = fVar.e;
                     bVar.k = aVar4.b;
                     bVar.l = 4096;
-                    bVar.f2193x = aVar4.e;
-                    bVar.f2194y = aVar4.d;
+                    bVar.f2199x = aVar4.e;
+                    bVar.f2200y = aVar4.d;
                     p pVar3 = fVar.f;
                     bVar.A = pVar3.b;
                     bVar.B = pVar3.f751c;
@@ -401,8 +401,8 @@ public final class f implements h {
                 z.a aVar4 = fVar.e;
                 bVar.k = aVar4.b;
                 bVar.l = 4096;
-                bVar.f2193x = aVar4.e;
-                bVar.f2194y = aVar4.d;
+                bVar.f2199x = aVar4.e;
+                bVar.f2200y = aVar4.d;
                 p pVar3 = fVar.f;
                 bVar.A = pVar3.b;
                 bVar.B = pVar3.f751c;
@@ -449,8 +449,8 @@ public final class f implements h {
                     z.a aVar4 = fVar.e;
                     bVar.k = aVar4.b;
                     bVar.l = 4096;
-                    bVar.f2193x = aVar4.e;
-                    bVar.f2194y = aVar4.d;
+                    bVar.f2199x = aVar4.e;
+                    bVar.f2200y = aVar4.d;
                     p pVar3 = fVar.f;
                     bVar.A = pVar3.b;
                     bVar.B = pVar3.f751c;
@@ -495,8 +495,8 @@ public final class f implements h {
             z.a aVar4 = fVar.e;
             bVar.k = aVar4.b;
             bVar.l = 4096;
-            bVar.f2193x = aVar4.e;
-            bVar.f2194y = aVar4.d;
+            bVar.f2199x = aVar4.e;
+            bVar.f2200y = aVar4.d;
             p pVar3 = fVar.f;
             bVar.A = pVar3.b;
             bVar.B = pVar3.f751c;
diff --git a/app/src/main/java/c/i/a/c/a2/h0/e.java b/app/src/main/java/c/i/a/c/a2/h0/e.java
index a00e2c9c9d..b4e42b975b 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/e.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/e.java
@@ -1113,7 +1113,7 @@ public final class e {
                                 p0.q = x4;
                                 p0.t = f12;
                                 i29 = i29;
-                                p0.f2192s = i29;
+                                p0.f2198s = i29;
                                 p0.u = bArr;
                                 p0.v = i7;
                                 p0.m = list;
@@ -1233,10 +1233,10 @@ public final class e {
                                                     Format.b bVar = new Format.b();
                                                     bVar.a = num;
                                                     bVar.k = str15;
-                                                    bVar.f2193x = i43;
-                                                    bVar.f2194y = i42;
+                                                    bVar.f2199x = i43;
+                                                    bVar.f2200y = i42;
                                                     bVar.n = drmInitData3;
-                                                    bVar.f2191c = str11;
+                                                    bVar.f2197c = str11;
                                                     format = bVar.a();
                                                     str7 = str15;
                                                 } else {
@@ -1265,10 +1265,10 @@ public final class e {
                                                         Format.b bVar2 = new Format.b();
                                                         bVar2.a = num2;
                                                         bVar2.k = str9;
-                                                        bVar2.f2193x = i45;
-                                                        bVar2.f2194y = i44;
+                                                        bVar2.f2199x = i45;
+                                                        bVar2.f2200y = i44;
                                                         bVar2.n = drmInitData3;
-                                                        bVar2.f2191c = str11;
+                                                        bVar2.f2197c = str11;
                                                         format = bVar2.a();
                                                     } else {
                                                         str7 = str15;
@@ -1280,18 +1280,18 @@ public final class e {
                                                             Format.b bVar3 = new Format.b();
                                                             bVar3.a = num3;
                                                             bVar3.k = "audio/ac4";
-                                                            bVar3.f2193x = 2;
-                                                            bVar3.f2194y = i46;
+                                                            bVar3.f2199x = 2;
+                                                            bVar3.f2200y = i46;
                                                             bVar3.n = drmInitData3;
-                                                            bVar3.f2191c = str11;
+                                                            bVar3.f2197c = str11;
                                                             format = bVar3.a();
                                                         } else if (f17 == 1684305011) {
                                                             Format.b p02 = c.d.b.a.a.p0(f3);
                                                             p02.k = str6;
-                                                            p02.f2193x = i19;
-                                                            p02.f2194y = i18;
+                                                            p02.f2199x = i19;
+                                                            p02.f2200y = i18;
                                                             p02.n = drmInitData3;
-                                                            p02.f2191c = str11;
+                                                            p02.f2197c = str11;
                                                             format = p02.a();
                                                         } else {
                                                             if (f17 == 1682927731) {
@@ -1411,12 +1411,12 @@ public final class e {
                                             Format.b p03 = c.d.b.a.a.p0(f3);
                                             p03.k = str6;
                                             p03.h = str5;
-                                            p03.f2193x = i19;
-                                            p03.f2194y = i18;
-                                            p03.f2195z = i16;
+                                            p03.f2199x = i19;
+                                            p03.f2200y = i18;
+                                            p03.f2201z = i16;
                                             p03.m = uVar;
                                             p03.n = drmInitData3;
-                                            p03.f2191c = str11;
+                                            p03.f2197c = str11;
                                             format2 = p03.a();
                                         }
                                         str = str11;
@@ -1441,12 +1441,12 @@ public final class e {
                                         Format.b p03 = c.d.b.a.a.p0(f3);
                                         p03.k = str6;
                                         p03.h = str5;
-                                        p03.f2193x = i19;
-                                        p03.f2194y = i18;
-                                        p03.f2195z = i16;
+                                        p03.f2199x = i19;
+                                        p03.f2200y = i18;
+                                        p03.f2201z = i16;
                                         p03.m = uVar;
                                         p03.n = drmInitData3;
-                                        p03.f2191c = str11;
+                                        p03.f2197c = str11;
                                         format2 = p03.a();
                                         str = str11;
                                         i29 = i12;
@@ -1474,12 +1474,12 @@ public final class e {
                                 Format.b p03 = c.d.b.a.a.p0(f3);
                                 p03.k = str6;
                                 p03.h = str5;
-                                p03.f2193x = i19;
-                                p03.f2194y = i18;
-                                p03.f2195z = i16;
+                                p03.f2199x = i19;
+                                p03.f2200y = i18;
+                                p03.f2201z = i16;
                                 p03.m = uVar;
                                 p03.n = drmInitData3;
-                                p03.f2191c = str11;
+                                p03.f2197c = str11;
                                 format2 = p03.a();
                                 str = str11;
                                 i29 = i12;
@@ -1500,7 +1500,7 @@ public final class e {
                                         aVar4 = aVar6;
                                         Format.b p04 = c.d.b.a.a.p0(f3);
                                         p04.k = str18;
-                                        p04.f2191c = str11;
+                                        p04.f2197c = str11;
                                         p04.o = j3;
                                         p04.m = uVar2;
                                         format2 = p04.a();
@@ -1521,7 +1521,7 @@ public final class e {
                                         aVar4 = aVar6;
                                         Format.b p04 = c.d.b.a.a.p0(f3);
                                         p04.k = str18;
-                                        p04.f2191c = str11;
+                                        p04.f2197c = str11;
                                         p04.o = j3;
                                         p04.m = uVar2;
                                         format2 = p04.a();
@@ -1532,7 +1532,7 @@ public final class e {
                                 aVar4 = aVar6;
                                 Format.b p04 = c.d.b.a.a.p0(f3);
                                 p04.k = str18;
-                                p04.f2191c = str11;
+                                p04.f2197c = str11;
                                 p04.o = j3;
                                 p04.m = uVar2;
                                 format2 = p04.a();
diff --git a/app/src/main/java/c/i/a/c/a2/h0/g.java b/app/src/main/java/c/i/a/c/a2/h0/g.java
index 104429a1b1..ea985ebd7f 100644
--- a/app/src/main/java/c/i/a/c/a2/h0/g.java
+++ b/app/src/main/java/c/i/a/c/a2/h0/g.java
@@ -276,8 +276,8 @@ public class g implements h {
                     arrayList = new ArrayList();
                 }
                 byte[] bArr = bVar.b.a;
-                j T1 = AnimatableValueParser.T1(bArr);
-                UUID uuid = T1 == null ? null : T1.a;
+                j V1 = AnimatableValueParser.V1(bArr);
+                UUID uuid = V1 == null ? null : V1.a;
                 if (uuid == null) {
                     Log.w("FragmentedMp4Extractor", "Skipped pssh atom (failed to extract uuid)");
                 } else {
diff --git a/app/src/main/java/c/i/a/c/a2/i0/c.java b/app/src/main/java/c/i/a/c/a2/i0/c.java
index 9dcb3bb7a5..ccbfd2bea5 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/c.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/c.java
@@ -85,10 +85,10 @@ public final class c extends i {
             bVar.a = oVar2.e(Arrays.copyOfRange(bArr, 9, wVar.f908c), null);
             return true;
         } else if ((bArr[0] & Byte.MAX_VALUE) == 3) {
-            o.a j2 = AnimatableValueParser.j2(wVar);
-            o b = oVar.b(j2);
+            o.a l2 = AnimatableValueParser.l2(wVar);
+            o b = oVar.b(l2);
             this.n = b;
-            this.o = new a(b, j2);
+            this.o = new a(b, l2);
             return true;
         } else {
             if (!(bArr[0] == -1)) {
diff --git a/app/src/main/java/c/i/a/c/a2/i0/d.java b/app/src/main/java/c/i/a/c/a2/i0/d.java
index dba0452099..a8906e84c1 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/d.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/d.java
@@ -41,7 +41,7 @@ public class d implements h {
             } else {
                 wVar.D(0);
                 try {
-                    z2 = AnimatableValueParser.J2(1, wVar, true);
+                    z2 = AnimatableValueParser.L2(1, wVar, true);
                 } catch (ParserException unused) {
                     z2 = false;
                 }
diff --git a/app/src/main/java/c/i/a/c/a2/i0/h.java b/app/src/main/java/c/i/a/c/a2/i0/h.java
index 347fcea304..40b543e4eb 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/h.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/h.java
@@ -38,8 +38,8 @@ public final class h extends i {
             List<byte[]> h = AnimatableValueParser.h(copyOf);
             Format.b bVar2 = new Format.b();
             bVar2.k = "audio/opus";
-            bVar2.f2193x = copyOf[9] & 255;
-            bVar2.f2194y = 48000;
+            bVar2.f2199x = copyOf[9] & 255;
+            bVar2.f2200y = 48000;
             bVar2.m = h;
             bVar.a = bVar2.a();
             this.o = true;
diff --git a/app/src/main/java/c/i/a/c/a2/i0/j.java b/app/src/main/java/c/i/a/c/a2/i0/j.java
index d1d5c336d7..dae7955f88 100644
--- a/app/src/main/java/c/i/a/c/a2/i0/j.java
+++ b/app/src/main/java/c/i/a/c/a2/i0/j.java
@@ -108,7 +108,7 @@ public final class j extends i {
         }
         a0 a0Var = this.q;
         if (a0Var == null) {
-            AnimatableValueParser.J2(1, wVar, false);
+            AnimatableValueParser.L2(1, wVar, false);
             int k = wVar.k();
             int s2 = wVar.s();
             int k2 = wVar.k();
@@ -123,14 +123,14 @@ public final class j extends i {
         } else {
             y yVar = this.r;
             if (yVar == null) {
-                this.r = AnimatableValueParser.l2(wVar, true, true);
+                this.r = AnimatableValueParser.n2(wVar, true, true);
             } else {
                 int i7 = wVar.f908c;
                 byte[] bArr3 = new byte[i7];
                 System.arraycopy(wVar.a, 0, bArr3, 0, i7);
                 int i8 = a0Var.a;
                 int i9 = 5;
-                AnimatableValueParser.J2(5, wVar, false);
+                AnimatableValueParser.L2(5, wVar, false);
                 int s4 = wVar.s() + 1;
                 x xVar = new x(wVar.a);
                 xVar.c(wVar.b * 8);
@@ -373,8 +373,8 @@ public final class j extends i {
                 bVar2.k = "audio/vorbis";
                 bVar2.f = a0Var2.d;
                 bVar2.g = a0Var2.f640c;
-                bVar2.f2193x = a0Var2.a;
-                bVar2.f2194y = a0Var2.b;
+                bVar2.f2199x = a0Var2.a;
+                bVar2.f2200y = a0Var2.b;
                 bVar2.m = arrayList;
                 bVar.a = bVar2.a();
                 return true;
diff --git a/app/src/main/java/c/i/a/c/a2/j0/e0.java b/app/src/main/java/c/i/a/c/a2/j0/e0.java
index 2b032d94aa..4a4c40df68 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/e0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/e0.java
@@ -32,7 +32,7 @@ public final class e0 {
             bVar.a = str2;
             bVar.k = str;
             bVar.d = format.l;
-            bVar.f2191c = format.k;
+            bVar.f2197c = format.k;
             bVar.C = format.L;
             bVar.m = format.v;
             p.e(bVar.a());
diff --git a/app/src/main/java/c/i/a/c/a2/j0/f0.java b/app/src/main/java/c/i/a/c/a2/j0/f0.java
index bb4f51c24b..166e96dd39 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/f0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/f0.java
@@ -50,9 +50,9 @@ public final class f0 extends c.i.a.c.a2.a {
                 if (i3 > i) {
                     break;
                 }
-                long i22 = AnimatableValueParser.i2(wVar, i2, this.f713c);
-                if (i22 != -9223372036854775807L) {
-                    long b = this.a.b(i22);
+                long k2 = AnimatableValueParser.k2(wVar, i2, this.f713c);
+                if (k2 != -9223372036854775807L) {
+                    long b = this.a.b(k2);
                     if (b > j) {
                         return j4 == -9223372036854775807L ? a.e.a(b, position) : a.e.b(position + j3);
                     }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/g.java b/app/src/main/java/c/i/a/c/a2/j0/g.java
index 1b40030aeb..6cecfb7f76 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/g.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/g.java
@@ -313,9 +313,9 @@ public final class g implements o {
                         Format.b bVar = new Format.b();
                         bVar.a = this.d;
                         bVar.k = str;
-                        bVar.f2193x = i;
-                        bVar.f2194y = i15;
-                        bVar.f2191c = this.f714c;
+                        bVar.f2199x = i;
+                        bVar.f2200y = i15;
+                        bVar.f2197c = this.f714c;
                         Format a2 = bVar.a();
                         this.j = a2;
                         this.e.e(a2);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/h0.java b/app/src/main/java/c/i/a/c/a2/j0/h0.java
index ab600e5403..3412f7e599 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/h0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/h0.java
@@ -489,9 +489,9 @@ public final class h0 implements h {
                                 if (i5 < i4) {
                                     break;
                                 } else if (wVar.a[i5] == 71) {
-                                    long i22 = AnimatableValueParser.i2(wVar, i5, i3);
-                                    if (i22 != -9223372036854775807L) {
-                                        j = i22;
+                                    long k2 = AnimatableValueParser.k2(wVar, i5, i3);
+                                    if (k2 != -9223372036854775807L) {
+                                        j = k2;
                                         break;
                                     }
                                 }
@@ -520,9 +520,9 @@ public final class h0 implements h {
                                     break;
                                 }
                                 if (wVar2.a[i6] == 71) {
-                                    long i23 = AnimatableValueParser.i2(wVar2, i6, i3);
-                                    if (i23 != -9223372036854775807L) {
-                                        j = i23;
+                                    long k22 = AnimatableValueParser.k2(wVar2, i6, i3);
+                                    if (k22 != -9223372036854775807L) {
+                                        j = k22;
                                         break;
                                     }
                                 }
@@ -670,9 +670,9 @@ public final class h0 implements h {
             i17 |= (this.d.s() & 64) != 0 ? 2 : 0;
             w wVar6 = this.d;
             int i21 = r4 == true ? 1 : 0;
+            int i22 = r4 == true ? 1 : 0;
+            int i23 = r4 == true ? 1 : 0;
             int i24 = r4 == true ? 1 : 0;
-            int i25 = r4 == true ? 1 : 0;
-            int i26 = r4 == true ? 1 : 0;
             wVar6.E(s2 - i21);
         }
         boolean z9 = this.n;
@@ -685,12 +685,12 @@ public final class h0 implements h {
             this.p = r4;
         }
         this.d.D(i12);
+        int i25 = r3 == true ? 1 : 0;
+        int i26 = r3 == true ? 1 : 0;
         int i27 = r3 == true ? 1 : 0;
         int i28 = r3 == true ? 1 : 0;
         int i29 = r3 == true ? 1 : 0;
-        int i30 = r3 == true ? 1 : 0;
-        int i31 = r3 == true ? 1 : 0;
-        return i27;
+        return i25;
     }
 
     @Override // c.i.a.c.a2.h
diff --git a/app/src/main/java/c/i/a/c/a2/j0/i.java b/app/src/main/java/c/i/a/c/a2/j0/i.java
index 97976c21f3..0a07606dc4 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/i.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/i.java
@@ -89,9 +89,9 @@ public final class i implements o {
                         Format.b bVar = new Format.b();
                         bVar.a = this.d;
                         bVar.k = "audio/ac4";
-                        bVar.f2193x = 2;
-                        bVar.f2194y = b.a;
-                        bVar.f2191c = this.f720c;
+                        bVar.f2199x = 2;
+                        bVar.f2200y = b.a;
+                        bVar.f2197c = this.f720c;
                         Format a = bVar.a();
                         this.k = a;
                         this.e.e(a);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/j0.java b/app/src/main/java/c/i/a/c/a2/j0/j0.java
index 57911fcebe..d39b1b8d2b 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/j0.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/j0.java
@@ -39,7 +39,7 @@ public final class j0 {
             bVar.a = dVar.b();
             bVar.k = str;
             bVar.d = format.l;
-            bVar.f2191c = format.k;
+            bVar.f2197c = format.k;
             bVar.C = format.L;
             bVar.m = format.v;
             p.e(bVar.a());
diff --git a/app/src/main/java/c/i/a/c/a2/j0/k.java b/app/src/main/java/c/i/a/c/a2/j0/k.java
index 338f47c3f0..294d02a51d 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/k.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/k.java
@@ -191,10 +191,10 @@ public final class k implements o {
                                 bVar.a = this.f;
                                 bVar.k = "audio/mp4a-latm";
                                 bVar.h = c2.f986c;
-                                bVar.f2193x = c2.b;
-                                bVar.f2194y = c2.a;
+                                bVar.f2199x = c2.b;
+                                bVar.f2200y = c2.a;
                                 bVar.m = Collections.singletonList(bArr3);
-                                bVar.f2191c = this.e;
+                                bVar.f2197c = this.e;
                                 Format a2 = bVar.a();
                                 this.r = 1024000000 / ((long) a2.H);
                                 this.g.e(a2);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/l.java b/app/src/main/java/c/i/a/c/a2/j0/l.java
index 90bcf85598..19e0e5ce3d 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/l.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/l.java
@@ -122,7 +122,7 @@ public final class l implements i0.c {
                 int i8 = bArr[i5] & 255 & 31;
                 int i9 = 0;
                 while (i9 < i8) {
-                    String str2 = new String(bArr, i7, 3, c.f1264c);
+                    String str2 = new String(bArr, i7, 3, c.f1261c);
                     int i10 = i7 + 3;
                     int i11 = i10 + 1;
                     int i12 = bArr[i10] & 255;
@@ -144,7 +144,7 @@ public final class l implements i0.c {
                     }
                     Format.b bVar2 = new Format.b();
                     bVar2.k = str;
-                    bVar2.f2191c = str2;
+                    bVar2.f2197c = str2;
                     bVar2.C = i;
                     bVar2.m = list;
                     arrayList.add(bVar2.a());
diff --git a/app/src/main/java/c/i/a/c/a2/j0/m.java b/app/src/main/java/c/i/a/c/a2/j0/m.java
index e8e038e619..1a34c06150 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/m.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/m.java
@@ -168,10 +168,10 @@ public final class m implements o {
                         bVar.a = str;
                         bVar.k = "audio/vnd.dts";
                         bVar.f = i8;
-                        bVar.f2193x = i24;
-                        bVar.f2194y = i23;
+                        bVar.f2199x = i24;
+                        bVar.f2200y = i23;
                         bVar.n = null;
-                        bVar.f2191c = str2;
+                        bVar.f2197c = str2;
                         Format a = bVar.a();
                         this.i = a;
                         this.d.e(a);
diff --git a/app/src/main/java/c/i/a/c/a2/j0/n.java b/app/src/main/java/c/i/a/c/a2/j0/n.java
index 292347f667..641fccac84 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/n.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/n.java
@@ -77,7 +77,7 @@ public final class n implements o {
             bVar.a = dVar.b();
             bVar.k = "application/dvbsubs";
             bVar.m = Collections.singletonList(aVar.b);
-            bVar.f2191c = aVar.a;
+            bVar.f2197c = aVar.a;
             p.e(bVar.a());
             this.b[i] = p;
         }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/u.java b/app/src/main/java/c/i/a/c/a2/j0/u.java
index ee83ea4397..338443be40 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/u.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/u.java
@@ -124,10 +124,10 @@ public final class u implements o {
                                             bVar.a = this.e;
                                             bVar.k = "audio/mp4a-latm";
                                             bVar.h = this.u;
-                                            bVar.f2193x = this.t;
-                                            bVar.f2194y = this.r;
+                                            bVar.f2199x = this.t;
+                                            bVar.f2200y = this.r;
                                             bVar.m = Collections.singletonList(bArr3);
-                                            bVar.f2191c = this.a;
+                                            bVar.f2197c = this.a;
                                             Format a = bVar.a();
                                             if (!a.equals(this.f)) {
                                                 this.f = a;
diff --git a/app/src/main/java/c/i/a/c/a2/j0/v.java b/app/src/main/java/c/i/a/c/a2/j0/v.java
index 80a2450110..87c5a795e2 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/v.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/v.java
@@ -80,9 +80,9 @@ public final class v implements o {
                             bVar.a = this.e;
                             bVar.k = aVar.b;
                             bVar.l = 4096;
-                            bVar.f2193x = aVar.e;
-                            bVar.f2194y = i5;
-                            bVar.f2191c = this.f741c;
+                            bVar.f2199x = aVar.e;
+                            bVar.f2200y = i5;
+                            bVar.f2197c = this.f741c;
                             this.d.e(bVar.a());
                             this.h = true;
                         }
diff --git a/app/src/main/java/c/i/a/c/a2/j0/x.java b/app/src/main/java/c/i/a/c/a2/j0/x.java
index 194037407c..a6839db018 100644
--- a/app/src/main/java/c/i/a/c/a2/j0/x.java
+++ b/app/src/main/java/c/i/a/c/a2/j0/x.java
@@ -39,7 +39,7 @@ public final class x implements c0 {
         long j2 = -9223372036854775807L;
         if (d != -9223372036854775807L) {
             Format format = this.a;
-            if (d != format.f2188x) {
+            if (d != format.f2194x) {
                 Format.b a = format.a();
                 a.o = d;
                 Format a2 = a.a();
diff --git a/app/src/main/java/c/i/a/c/a2/k0/b.java b/app/src/main/java/c/i/a/c/a2/k0/b.java
index 5e45f7deed..2f439976d3 100644
--- a/app/src/main/java/c/i/a/c/a2/k0/b.java
+++ b/app/src/main/java/c/i/a/c/a2/k0/b.java
@@ -67,9 +67,9 @@ public final class b implements h {
                 bVar.f = i5;
                 bVar.g = i5;
                 bVar.l = max * 2 * i2;
-                bVar.f2193x = cVar.b;
-                bVar.f2194y = i4;
-                bVar.f2195z = 2;
+                bVar.f2199x = cVar.b;
+                bVar.f2200y = i4;
+                bVar.f2201z = 2;
                 this.j = bVar.a();
                 return;
             }
@@ -157,9 +157,9 @@ public final class b implements h {
                 bVar.f = i4;
                 bVar.g = i4;
                 bVar.l = max;
-                bVar.f2193x = cVar.b;
-                bVar.f2194y = cVar.f748c;
-                bVar.f2195z = i;
+                bVar.f2199x = cVar.b;
+                bVar.f2200y = cVar.f748c;
+                bVar.f2201z = i;
                 this.d = bVar.a();
                 return;
             }
@@ -220,7 +220,7 @@ public final class b implements h {
 
     @Override // c.i.a.c.a2.h
     public boolean b(i iVar) throws IOException {
-        return AnimatableValueParser.V1(iVar) != null;
+        return AnimatableValueParser.X1(iVar) != null;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:27:0x006a  */
@@ -233,17 +233,17 @@ public final class b implements h {
         int i3 = f0.a;
         boolean z2 = true;
         if (this.f745c == null) {
-            c V1 = AnimatableValueParser.V1(iVar);
-            if (V1 != null) {
-                int i4 = V1.a;
+            c X1 = AnimatableValueParser.X1(iVar);
+            if (X1 != null) {
+                int i4 = X1.a;
                 if (i4 == 17) {
-                    this.f745c = new a(this.a, this.b, V1);
+                    this.f745c = new a(this.a, this.b, X1);
                 } else if (i4 == 6) {
-                    this.f745c = new c(this.a, this.b, V1, "audio/g711-alaw", -1);
+                    this.f745c = new c(this.a, this.b, X1, "audio/g711-alaw", -1);
                 } else if (i4 == 7) {
-                    this.f745c = new c(this.a, this.b, V1, "audio/g711-mlaw", -1);
+                    this.f745c = new c(this.a, this.b, X1, "audio/g711-mlaw", -1);
                 } else {
-                    int i5 = V1.e;
+                    int i5 = X1.e;
                     if (i4 != 1) {
                         if (i4 == 3) {
                             i2 = i5 == 32 ? 4 : 0;
@@ -253,10 +253,10 @@ public final class b implements h {
                         } else if (i4 != 65534) {
                             i = 0;
                             if (i != 0) {
-                                this.f745c = new c(this.a, this.b, V1, "audio/raw", i);
+                                this.f745c = new c(this.a, this.b, X1, "audio/raw", i);
                             } else {
                                 StringBuilder L = c.d.b.a.a.L("Unsupported WAV format type: ");
-                                L.append(V1.a);
+                                L.append(X1.a);
                                 throw new ParserException(L.toString());
                             }
                         }
diff --git a/app/src/main/java/c/i/a/c/a2/o.java b/app/src/main/java/c/i/a/c/a2/o.java
index 29bd760c05..ac55e5a0ba 100644
--- a/app/src/main/java/c/i/a/c/a2/o.java
+++ b/app/src/main/java/c/i/a/c/a2/o.java
@@ -163,8 +163,8 @@ public final class o {
         Format.b bVar = new Format.b();
         bVar.k = "audio/flac";
         bVar.l = i;
-        bVar.f2193x = this.g;
-        bVar.f2194y = this.e;
+        bVar.f2199x = this.g;
+        bVar.f2200y = this.e;
         bVar.m = Collections.singletonList(bArr);
         bVar.i = f;
         return bVar.a();
diff --git a/app/src/main/java/c/i/a/c/b2/s.java b/app/src/main/java/c/i/a/c/b2/s.java
index 94c18b57d7..983acec360 100644
--- a/app/src/main/java/c/i/a/c/b2/s.java
+++ b/app/src/main/java/c/i/a/c/b2/s.java
@@ -116,7 +116,7 @@ public final class s {
             if (format.B != format2.B) {
                 i |= 1024;
             }
-            if (!this.e && !(format.f2189y == format2.f2189y && format.f2190z == format2.f2190z)) {
+            if (!this.e && !(format.f2195y == format2.f2195y && format.f2196z == format2.f2196z)) {
                 i |= 512;
             }
             if (!f0.a(format.F, format2.F)) {
@@ -226,8 +226,8 @@ public final class s {
                 return false;
             }
             if (this.g) {
-                int i4 = format.f2189y;
-                if (i4 <= 0 || (i = format.f2190z) <= 0) {
+                int i4 = format.f2195y;
+                if (i4 <= 0 || (i = format.f2196z) <= 0) {
                     return true;
                 }
                 if (f0.a >= 21) {
@@ -238,9 +238,9 @@ public final class s {
                 }
                 if (!z5) {
                     StringBuilder L3 = a.L("legacyFrameSize, ");
-                    L3.append(format.f2189y);
+                    L3.append(format.f2195y);
                     L3.append("x");
-                    L3.append(format.f2190z);
+                    L3.append(format.f2196z);
                     h(L3.toString());
                 }
                 return z5;
diff --git a/app/src/main/java/c/i/a/c/c2/f.java b/app/src/main/java/c/i/a/c/c2/f.java
index e39b49e6a7..0e42e15106 100644
--- a/app/src/main/java/c/i/a/c/c2/f.java
+++ b/app/src/main/java/c/i/a/c/c2/f.java
@@ -174,7 +174,7 @@ public final class f extends g0 implements Handler.Callback {
             } else if (I == -5) {
                 Format format = A.b;
                 Objects.requireNonNull(format);
-                this.E = format.f2188x;
+                this.E = format.f2194x;
             }
         }
         if (this.A > 0) {
diff --git a/app/src/main/java/c/i/a/c/c2/j/a.java b/app/src/main/java/c/i/a/c/c2/j/a.java
index 2d69431332..9e202a6d4f 100644
--- a/app/src/main/java/c/i/a/c/c2/j/a.java
+++ b/app/src/main/java/c/i/a/c/c2/j/a.java
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 /* compiled from: IcyDecoder */
 public final class a extends g {
     public static final Pattern a = Pattern.compile("(.+?)='(.*?)';", 32);
-    public final CharsetDecoder b = c.f1264c.newDecoder();
+    public final CharsetDecoder b = c.f1261c.newDecoder();
 
     /* renamed from: c  reason: collision with root package name */
     public final CharsetDecoder f773c = c.b.newDecoder();
diff --git a/app/src/main/java/c/i/a/c/d2/c0.java b/app/src/main/java/c/i/a/c/d2/c0.java
index b97ba10064..2bb9969f58 100644
--- a/app/src/main/java/c/i/a/c/d2/c0.java
+++ b/app/src/main/java/c/i/a/c/d2/c0.java
@@ -104,8 +104,8 @@ public final class c0 extends j implements b0.b {
         if (dVar != null) {
             dVar.a(true);
         }
-        loader.f2261c.execute(new Loader.g(b0Var));
-        loader.f2261c.shutdown();
+        loader.f2267c.execute(new Loader.g(b0Var));
+        loader.f2267c.shutdown();
         b0Var.f781z.removeCallbacksAndMessages(null);
         b0Var.A = null;
         b0Var.V = true;
diff --git a/app/src/main/java/c/i/a/c/e2/l.java b/app/src/main/java/c/i/a/c/e2/l.java
index cd2ddc6404..3e56f3acb6 100644
--- a/app/src/main/java/c/i/a/c/e2/l.java
+++ b/app/src/main/java/c/i/a/c/e2/l.java
@@ -444,7 +444,7 @@ public final class l extends g0 implements Handler.Callback {
                                 } else {
                                     Format format = this.w.b;
                                     if (format != null) {
-                                        iVar.q = format.f2188x;
+                                        iVar.q = format.f2194x;
                                         iVar.s();
                                         this.f813z &= !iVar.o();
                                     } else {
diff --git a/app/src/main/java/c/i/a/c/e2/s/c.java b/app/src/main/java/c/i/a/c/e2/s/c.java
index 86b33029db..b888d3db7a 100644
--- a/app/src/main/java/c/i/a/c/e2/s/c.java
+++ b/app/src/main/java/c/i/a/c/e2/s/c.java
@@ -227,7 +227,7 @@ public final class c extends d {
         char c2;
         do {
             xmlPullParser.next();
-            if (AnimatableValueParser.v1(xmlPullParser, "style")) {
+            if (AnimatableValueParser.w1(xmlPullParser, "style")) {
                 String t03 = AnimatableValueParser.t0(xmlPullParser, "style");
                 f r2 = r(xmlPullParser, new f());
                 if (t03 != null) {
@@ -239,7 +239,7 @@ public final class c extends d {
                 if (str2 != null) {
                     map.put(str2, r2);
                 }
-            } else if (AnimatableValueParser.v1(xmlPullParser, "region")) {
+            } else if (AnimatableValueParser.w1(xmlPullParser, "region")) {
                 String t04 = AnimatableValueParser.t0(xmlPullParser, "id");
                 if (t04 != null) {
                     String t05 = AnimatableValueParser.t0(xmlPullParser, "origin");
@@ -398,15 +398,15 @@ public final class c extends d {
                 eVar = null;
                 if (eVar != null) {
                 }
-            } else if (AnimatableValueParser.v1(xmlPullParser, "metadata")) {
+            } else if (AnimatableValueParser.w1(xmlPullParser, "metadata")) {
                 do {
                     xmlPullParser.next();
-                    if (AnimatableValueParser.v1(xmlPullParser, "image") && (t0 = AnimatableValueParser.t0(xmlPullParser, "id")) != null) {
+                    if (AnimatableValueParser.w1(xmlPullParser, "image") && (t0 = AnimatableValueParser.t0(xmlPullParser, "id")) != null) {
                         map3.put(t0, xmlPullParser.nextText());
                     }
-                } while (!AnimatableValueParser.h1(xmlPullParser, "metadata"));
+                } while (!AnimatableValueParser.i1(xmlPullParser, "metadata"));
             }
-        } while (!AnimatableValueParser.h1(xmlPullParser, "head"));
+        } while (!AnimatableValueParser.i1(xmlPullParser, "head"));
         return map;
     }
 
diff --git a/app/src/main/java/c/i/a/c/e2/s/d.java b/app/src/main/java/c/i/a/c/e2/s/d.java
index b78061c807..04e8c44cfa 100644
--- a/app/src/main/java/c/i/a/c/e2/s/d.java
+++ b/app/src/main/java/c/i/a/c/e2/s/d.java
@@ -165,41 +165,41 @@ public final class d {
                     e eVar = map2.get(str2);
                     Objects.requireNonNull(eVar);
                     int i3 = eVar.j;
-                    f p2 = AnimatableValueParser.p2(this.f, this.g, map);
+                    f r2 = AnimatableValueParser.r2(this.f, this.g, map);
                     SpannableStringBuilder spannableStringBuilder = (SpannableStringBuilder) bVar.a;
                     if (spannableStringBuilder == null) {
                         spannableStringBuilder = new SpannableStringBuilder();
                         bVar.a = spannableStringBuilder;
                     }
-                    if (p2 != null) {
+                    if (r2 != null) {
                         d dVar2 = this.j;
-                        if (p2.b() != -1) {
-                            spannableStringBuilder.setSpan(new StyleSpan(p2.b()), intValue, intValue2, 33);
+                        if (r2.b() != -1) {
+                            spannableStringBuilder.setSpan(new StyleSpan(r2.b()), intValue, intValue2, 33);
                         }
-                        if (p2.f == 1) {
+                        if (r2.f == 1) {
                             spannableStringBuilder.setSpan(new StrikethroughSpan(), intValue, intValue2, 33);
                         }
-                        if (p2.g == 1) {
+                        if (r2.g == 1) {
                             spannableStringBuilder.setSpan(new UnderlineSpan(), intValue, intValue2, 33);
                         }
-                        if (p2.f846c) {
-                            if (p2.f846c) {
-                                AnimatableValueParser.c(spannableStringBuilder, new ForegroundColorSpan(p2.b), intValue, intValue2, 33);
+                        if (r2.f846c) {
+                            if (r2.f846c) {
+                                AnimatableValueParser.c(spannableStringBuilder, new ForegroundColorSpan(r2.b), intValue, intValue2, 33);
                             } else {
                                 throw new IllegalStateException("Font color has not been defined.");
                             }
                         }
-                        if (p2.e) {
-                            if (p2.e) {
-                                AnimatableValueParser.c(spannableStringBuilder, new BackgroundColorSpan(p2.d), intValue, intValue2, 33);
+                        if (r2.e) {
+                            if (r2.e) {
+                                AnimatableValueParser.c(spannableStringBuilder, new BackgroundColorSpan(r2.d), intValue, intValue2, 33);
                             } else {
                                 throw new IllegalStateException("Background color has not been defined.");
                             }
                         }
-                        if (p2.a != null) {
-                            AnimatableValueParser.c(spannableStringBuilder, new TypefaceSpan(p2.a), intValue, intValue2, 33);
+                        if (r2.a != null) {
+                            AnimatableValueParser.c(spannableStringBuilder, new TypefaceSpan(r2.a), intValue, intValue2, 33);
                         }
-                        b bVar2 = p2.q;
+                        b bVar2 = r2.q;
                         if (bVar2 != null) {
                             int i4 = bVar2.f;
                             it = it2;
@@ -217,15 +217,15 @@ public final class d {
                         } else {
                             it = it2;
                         }
-                        int i6 = p2.m;
+                        int i6 = r2.m;
                         if (i6 == 2) {
                             while (true) {
                                 if (dVar2 == null) {
                                     dVar2 = null;
                                     break;
                                 }
-                                f p22 = AnimatableValueParser.p2(dVar2.f, dVar2.g, map);
-                                if (p22 != null && p22.m == 1) {
+                                f r22 = AnimatableValueParser.r2(dVar2.f, dVar2.g, map);
+                                if (r22 != null && r22.m == 1) {
                                     break;
                                 }
                                 dVar2 = dVar2.j;
@@ -239,8 +239,8 @@ public final class d {
                                         break;
                                     }
                                     d dVar3 = (d) arrayDeque.pop();
-                                    f p23 = AnimatableValueParser.p2(dVar3.f, dVar3.g, map);
-                                    if (p23 != null && p23.m == 3) {
+                                    f r23 = AnimatableValueParser.r2(dVar3.f, dVar3.g, map);
+                                    if (r23 != null && r23.m == 3) {
                                         dVar = dVar3;
                                         break;
                                     }
@@ -256,39 +256,39 @@ public final class d {
                                             int i7 = f0.a;
                                             f fVar = dVar2.f;
                                             spannableStringBuilder.setSpan(new b(str3, fVar != null ? fVar.n : -1), intValue, intValue2, 33);
-                                            if (p2.p == 1) {
+                                            if (r2.p == 1) {
                                                 z2 = true;
                                             }
                                             if (z2) {
                                                 AnimatableValueParser.c(spannableStringBuilder, new a(), intValue, intValue2, 33);
                                             }
-                                            i = p2.j;
+                                            i = r2.j;
                                             if (i == 1) {
-                                                AnimatableValueParser.c(spannableStringBuilder, new AbsoluteSizeSpan((int) p2.k, true), intValue, intValue2, 33);
+                                                AnimatableValueParser.c(spannableStringBuilder, new AbsoluteSizeSpan((int) r2.k, true), intValue, intValue2, 33);
                                             } else if (i == 2) {
-                                                AnimatableValueParser.c(spannableStringBuilder, new RelativeSizeSpan(p2.k), intValue, intValue2, 33);
+                                                AnimatableValueParser.c(spannableStringBuilder, new RelativeSizeSpan(r2.k), intValue, intValue2, 33);
                                             } else if (i == 3) {
-                                                AnimatableValueParser.c(spannableStringBuilder, new RelativeSizeSpan(p2.k / 100.0f), intValue, intValue2, 33);
+                                                AnimatableValueParser.c(spannableStringBuilder, new RelativeSizeSpan(r2.k / 100.0f), intValue, intValue2, 33);
                                             }
-                                            if (p2.r != Float.MAX_VALUE && "p".equals(this.a)) {
-                                                bVar.p = (p2.r * -90.0f) / 100.0f;
+                                            if (r2.r != Float.MAX_VALUE && "p".equals(this.a)) {
+                                                bVar.p = (r2.r * -90.0f) / 100.0f;
                                             }
-                                            bVar.f810c = p2.o;
+                                            bVar.f810c = r2.o;
                                             it2 = it;
                                         }
                                     } else {
                                         z2 = false;
                                     }
                                     Log.i("TtmlRenderUtil", "Skipping rubyText node without exactly one text child.");
-                                    if (p2.p == 1) {
+                                    if (r2.p == 1) {
                                     }
                                     if (z2) {
                                     }
-                                    i = p2.j;
+                                    i = r2.j;
                                     if (i == 1) {
                                     }
-                                    bVar.p = (p2.r * -90.0f) / 100.0f;
-                                    bVar.f810c = p2.o;
+                                    bVar.p = (r2.r * -90.0f) / 100.0f;
+                                    bVar.f810c = r2.o;
                                     it2 = it;
                                 }
                             }
@@ -296,15 +296,15 @@ public final class d {
                             spannableStringBuilder.setSpan(new a(), intValue, intValue2, 33);
                         }
                         z2 = false;
-                        if (p2.p == 1) {
+                        if (r2.p == 1) {
                         }
                         if (z2) {
                         }
-                        i = p2.j;
+                        i = r2.j;
                         if (i == 1) {
                         }
-                        bVar.p = (p2.r * -90.0f) / 100.0f;
-                        bVar.f810c = p2.o;
+                        bVar.p = (r2.r * -90.0f) / 100.0f;
+                        bVar.f810c = r2.o;
                         it2 = it;
                     }
                 }
diff --git a/app/src/main/java/c/i/a/c/e2/t/a.java b/app/src/main/java/c/i/a/c/e2/t/a.java
index 2015877b45..84d7318400 100644
--- a/app/src/main/java/c/i/a/c/e2/t/a.java
+++ b/app/src/main/java/c/i/a/c/e2/t/a.java
@@ -108,7 +108,7 @@ public final class a extends d {
                     str = wVar.q(x2, c.e);
                 }
             }
-            str = wVar.q(x2, c.f1264c);
+            str = wVar.q(x2, c.f1261c);
         }
         if (str.isEmpty()) {
             return b.i;
diff --git a/app/src/main/java/c/i/a/c/f2/b.java b/app/src/main/java/c/i/a/c/f2/b.java
index 4c040d2fb9..11a61c14a5 100644
--- a/app/src/main/java/c/i/a/c/f2/b.java
+++ b/app/src/main/java/c/i/a/c/f2/b.java
@@ -10,7 +10,7 @@ public final /* synthetic */ class b implements Comparator {
     public final int compare(Object obj, Object obj2) {
         Integer num = (Integer) obj;
         Integer num2 = (Integer) obj2;
-        int[] iArr = DefaultTrackSelector.f2230c;
+        int[] iArr = DefaultTrackSelector.f2236c;
         return 0;
     }
 }
diff --git a/app/src/main/java/c/i/a/c/f2/c.java b/app/src/main/java/c/i/a/c/f2/c.java
index 46611fe12a..8e2f6f0afb 100644
--- a/app/src/main/java/c/i/a/c/f2/c.java
+++ b/app/src/main/java/c/i/a/c/f2/c.java
@@ -10,7 +10,7 @@ public final /* synthetic */ class c implements Comparator {
     public final int compare(Object obj, Object obj2) {
         Integer num = (Integer) obj;
         Integer num2 = (Integer) obj2;
-        int[] iArr = DefaultTrackSelector.f2230c;
+        int[] iArr = DefaultTrackSelector.f2236c;
         if (num.intValue() == -1) {
             return num2.intValue() == -1 ? 0 : -1;
         }
diff --git a/app/src/main/java/c/i/a/c/f2/i.java b/app/src/main/java/c/i/a/c/f2/i.java
index 8e2c27b194..1d3054056b 100644
--- a/app/src/main/java/c/i/a/c/f2/i.java
+++ b/app/src/main/java/c/i/a/c/f2/i.java
@@ -205,7 +205,7 @@ public abstract class i extends l {
                     int i25 = iArr13[i24];
                     if (!parameters6.N && !parameters6.M) {
                         int i26 = parameters6.A ? 24 : 16;
-                        boolean z12 = parameters6.f2234z && (i25 & i26) != 0;
+                        boolean z12 = parameters6.f2240z && (i25 & i26) != 0;
                         DefaultTrackSelector.Parameters parameters7 = parameters6;
                         int i27 = 0;
                         while (true) {
@@ -219,7 +219,7 @@ public abstract class i extends l {
                             iArr7 = iArr13;
                             int i29 = parameters7.r;
                             iArr6 = iArr12;
-                            int i30 = parameters7.f2231s;
+                            int i30 = parameters7.f2237s;
                             i9 = i23;
                             int i31 = parameters7.t;
                             z5 = z10;
@@ -229,7 +229,7 @@ public abstract class i extends l {
                             aVarArr = aVarArr2;
                             int i34 = parameters7.w;
                             i8 = i24;
-                            int i35 = parameters7.f2232x;
+                            int i35 = parameters7.f2238x;
                             iArr8 = iArr16;
                             int i36 = parameters7.B;
                             parameters4 = parameters5;
@@ -237,12 +237,12 @@ public abstract class i extends l {
                             boolean z13 = parameters7.D;
                             trackGroupArray2 = trackGroupArray4;
                             if (trackGroup4.i < 2) {
-                                iArr9 = DefaultTrackSelector.f2230c;
+                                iArr9 = DefaultTrackSelector.f2236c;
                             } else {
                                 List<Integer> d = DefaultTrackSelector.d(trackGroup4, i36, i37, z13);
                                 ArrayList arrayList3 = (ArrayList) d;
                                 if (arrayList3.size() < 2) {
-                                    iArr9 = DefaultTrackSelector.f2230c;
+                                    iArr9 = DefaultTrackSelector.f2236c;
                                 } else {
                                     if (!z12) {
                                         HashSet hashSet2 = new HashSet();
@@ -300,7 +300,7 @@ public abstract class i extends l {
                                         }
                                         arrayList = arrayList;
                                     }
-                                    iArr9 = arrayList.size() < 2 ? DefaultTrackSelector.f2230c : c.k0(list);
+                                    iArr9 = arrayList.size() < 2 ? DefaultTrackSelector.f2236c : c.k0(list);
                                     if (iArr9.length <= 0) {
                                         aVar5 = new g.a(trackGroup4, iArr9);
                                         break;
@@ -353,7 +353,7 @@ public abstract class i extends l {
                                 Format format = trackGroup6.j[i44];
                                 if ((format.m & 16384) == 0 && DefaultTrackSelector.e(iArr18[i44], parameters4.O)) {
                                     DefaultTrackSelector.e eVar3 = new DefaultTrackSelector.e(format, parameters4, iArr18[i44], ((ArrayList) d2).contains(Integer.valueOf(i44)));
-                                    if ((eVar3.i || parameters4.f2233y) && (eVar2 == null || eVar3.compareTo(eVar2) > 0)) {
+                                    if ((eVar3.i || parameters4.f2239y) && (eVar2 == null || eVar3.compareTo(eVar2) > 0)) {
                                         i43 = i44;
                                         trackGroup7 = trackGroup6;
                                         eVar2 = eVar3;
diff --git a/app/src/main/java/c/i/a/c/g0.java b/app/src/main/java/c/i/a/c/g0.java
index 15c888f656..7af39ed971 100644
--- a/app/src/main/java/c/i/a/c/g0.java
+++ b/app/src/main/java/c/i/a/c/g0.java
@@ -70,9 +70,9 @@ public abstract class g0 implements k1, l1 {
         } else if (a == -5) {
             Format format = s0Var.b;
             Objects.requireNonNull(format);
-            if (format.f2188x != Long.MAX_VALUE) {
+            if (format.f2194x != Long.MAX_VALUE) {
                 Format.b a2 = format.a();
-                a2.o = format.f2188x + this.p;
+                a2.o = format.f2194x + this.p;
                 s0Var.b = a2.a();
             }
         }
diff --git a/app/src/main/java/c/i/a/c/g2/g.java b/app/src/main/java/c/i/a/c/g2/g.java
index b43a77a49d..78575c905c 100644
--- a/app/src/main/java/c/i/a/c/g2/g.java
+++ b/app/src/main/java/c/i/a/c/g2/g.java
@@ -97,8 +97,8 @@ public final class g extends View implements SubtitleView.a {
             int paddingBottom = height - getPaddingBottom();
             if (paddingBottom > paddingTop && width > paddingLeft) {
                 int i17 = paddingBottom - paddingTop;
-                float q2 = AnimatableValueParser.q2(gVar.k, gVar.l, height, i17);
-                if (q2 > 0.0f) {
+                float s2 = AnimatableValueParser.s2(gVar.k, gVar.l, height, i17);
+                if (s2 > 0.0f) {
                     int size = list.size();
                     int i18 = 0;
                     while (i18 < size) {
@@ -123,7 +123,7 @@ public final class g extends View implements SubtitleView.a {
                             }
                             cVar = a.a();
                         }
-                        float q22 = AnimatableValueParser.q2(cVar.n, cVar.o, height, i17);
+                        float s22 = AnimatableValueParser.s2(cVar.n, cVar.o, height, i17);
                         j jVar = gVar.i.get(i18);
                         b bVar = gVar.m;
                         float f4 = gVar.n;
@@ -153,8 +153,8 @@ public final class g extends View implements SubtitleView.a {
                             jVar.w = bVar.e;
                             jVar.v = bVar.f;
                             jVar.f.setTypeface(bVar.g);
-                            jVar.f864x = q2;
-                            jVar.f865y = q22;
+                            jVar.f864x = s2;
+                            jVar.f865y = s22;
                             jVar.f866z = f4;
                             jVar.A = paddingLeft;
                             jVar.B = paddingTop;
@@ -175,7 +175,7 @@ public final class g extends View implements SubtitleView.a {
                             paddingTop = i4;
                             width = i3;
                             paddingBottom = i2;
-                            q2 = f;
+                            s2 = f;
                             gVar = this;
                         } else if (TextUtils.isEmpty(cVar.b)) {
                             canvas2 = canvas3;
@@ -184,7 +184,7 @@ public final class g extends View implements SubtitleView.a {
                             i3 = width;
                             i2 = paddingBottom;
                             i7 = i17;
-                            f = q2;
+                            f = s2;
                             i6 = size;
                         } else {
                             i8 = cVar.l ? cVar.m : bVar.d;
@@ -192,14 +192,14 @@ public final class g extends View implements SubtitleView.a {
                             charSequence = jVar.i;
                             i6 = size;
                             charSequence2 = cVar.b;
-                            if (!(charSequence != charSequence2 || (charSequence != null && charSequence.equals(charSequence2))) && f0.a(jVar.j, cVar.f809c) && jVar.k == cVar.d && jVar.l == cVar.e && jVar.m == cVar.f && f0.a(Integer.valueOf(jVar.n), Integer.valueOf(cVar.g)) && jVar.o == cVar.h && f0.a(Integer.valueOf(jVar.p), Integer.valueOf(cVar.i)) && jVar.q == cVar.j && jVar.r == cVar.k && jVar.f863s == bVar.b && jVar.t == bVar.f808c && jVar.u == i8 && jVar.w == bVar.e && jVar.v == bVar.f && f0.a(jVar.f.getTypeface(), bVar.g) && jVar.f864x == q2 && jVar.f865y == q22 && jVar.f866z == f4 && jVar.A == paddingLeft && jVar.B == paddingTop && jVar.C == width && jVar.D == paddingBottom) {
+                            if (!(charSequence != charSequence2 || (charSequence != null && charSequence.equals(charSequence2))) && f0.a(jVar.j, cVar.f809c) && jVar.k == cVar.d && jVar.l == cVar.e && jVar.m == cVar.f && f0.a(Integer.valueOf(jVar.n), Integer.valueOf(cVar.g)) && jVar.o == cVar.h && f0.a(Integer.valueOf(jVar.p), Integer.valueOf(cVar.i)) && jVar.q == cVar.j && jVar.r == cVar.k && jVar.f863s == bVar.b && jVar.t == bVar.f808c && jVar.u == i8 && jVar.w == bVar.e && jVar.v == bVar.f && f0.a(jVar.f.getTypeface(), bVar.g) && jVar.f864x == s2 && jVar.f865y == s22 && jVar.f866z == f4 && jVar.A == paddingLeft && jVar.B == paddingTop && jVar.C == width && jVar.D == paddingBottom) {
                                 jVar.a(canvas3, z4);
                                 canvas2 = canvas3;
                                 i5 = paddingLeft;
                                 i4 = paddingTop;
                                 i3 = width;
                                 i2 = paddingBottom;
-                                f = q2;
+                                f = s2;
                             } else {
                                 jVar.i = cVar.b;
                                 jVar.j = cVar.f809c;
@@ -217,8 +217,8 @@ public final class g extends View implements SubtitleView.a {
                                 jVar.w = bVar.e;
                                 jVar.v = bVar.f;
                                 jVar.f.setTypeface(bVar.g);
-                                jVar.f864x = q2;
-                                jVar.f865y = q22;
+                                jVar.f864x = s2;
+                                jVar.f865y = s22;
                                 jVar.f866z = f4;
                                 jVar.A = paddingLeft;
                                 jVar.B = paddingTop;
@@ -244,7 +244,7 @@ public final class g extends View implements SubtitleView.a {
                                         i4 = paddingTop;
                                         i3 = width;
                                         i2 = paddingBottom;
-                                        f = q2;
+                                        f = s2;
                                         i = i18;
                                         z2 = z4;
                                         canvas2 = canvas3;
@@ -273,14 +273,14 @@ public final class g extends View implements SubtitleView.a {
                                         if (Color.alpha(jVar.t) > 0) {
                                             int i26 = jVar.w;
                                             if (i26 == 0 || i26 == 2) {
-                                                f = q2;
+                                                f = s2;
                                                 spannableStringBuilder.setSpan(new BackgroundColorSpan(jVar.t), 0, spannableStringBuilder.length(), 16711680);
                                             } else {
-                                                f = q2;
+                                                f = s2;
                                                 spannableStringBuilder2.setSpan(new BackgroundColorSpan(jVar.t), 0, spannableStringBuilder2.length(), 16711680);
                                             }
                                         } else {
-                                            f = q2;
+                                            f = s2;
                                         }
                                         Layout.Alignment alignment = jVar.j;
                                         if (alignment == null) {
@@ -384,7 +384,7 @@ public final class g extends View implements SubtitleView.a {
                                     paddingTop = i4;
                                     width = i3;
                                     paddingBottom = i2;
-                                    q2 = f;
+                                    s2 = f;
                                     gVar = this;
                                 } else {
                                     z3 = z4;
@@ -392,7 +392,7 @@ public final class g extends View implements SubtitleView.a {
                                     i4 = paddingTop;
                                     i3 = width;
                                     i2 = paddingBottom;
-                                    f = q2;
+                                    f = s2;
                                     i = i18;
                                     Objects.requireNonNull(jVar.k);
                                     Bitmap bitmap = jVar.k;
@@ -451,7 +451,7 @@ public final class g extends View implements SubtitleView.a {
                                 paddingTop = i4;
                                 width = i3;
                                 paddingBottom = i2;
-                                q2 = f;
+                                s2 = f;
                                 gVar = this;
                             }
                         }
@@ -466,7 +466,7 @@ public final class g extends View implements SubtitleView.a {
                         paddingTop = i4;
                         width = i3;
                         paddingBottom = i2;
-                        q2 = f;
+                        s2 = f;
                         gVar = this;
                     }
                 }
diff --git a/app/src/main/java/c/i/a/c/g2/n.java b/app/src/main/java/c/i/a/c/g2/n.java
index 6f8a9e0d69..069149a885 100644
--- a/app/src/main/java/c/i/a/c/g2/n.java
+++ b/app/src/main/java/c/i/a/c/g2/n.java
@@ -105,8 +105,8 @@ public final class n extends FrameLayout implements SubtitleView.a {
     }
 
     public final String c(int i, float f) {
-        float q2 = AnimatableValueParser.q2(i, f, getHeight(), (getHeight() - getPaddingTop()) - getPaddingBottom());
-        return q2 == -3.4028235E38f ? "unset" : f0.k("%.2fpx", Float.valueOf(q2 / getContext().getResources().getDisplayMetrics().density));
+        float s2 = AnimatableValueParser.s2(i, f, getHeight(), (getHeight() - getPaddingTop()) - getPaddingBottom());
+        return s2 == -3.4028235E38f ? "unset" : f0.k("%.2fpx", Float.valueOf(s2 / getContext().getResources().getDisplayMetrics().density));
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x007e: APUT  (r3v0 java.lang.Object[]), (3 ??[int, float, short, byte, char]), (r2v1 java.lang.String) */
@@ -162,19 +162,19 @@ public final class n extends FrameLayout implements SubtitleView.a {
         StringBuilder sb = new StringBuilder();
         Object[] objArr = new Object[4];
         char c3 = 0;
-        objArr[0] = AnimatableValueParser.C2(nVar.l.b);
+        objArr[0] = AnimatableValueParser.E2(nVar.l.b);
         int i7 = 1;
         objArr[1] = nVar.c(nVar.n, nVar.m);
         float f3 = 1.2f;
         objArr[2] = Float.valueOf(1.2f);
         b bVar2 = nVar.l;
         int i8 = bVar2.e;
-        objArr[3] = i8 != 1 ? i8 != 2 ? i8 != 3 ? i8 != 4 ? "unset" : f0.k("-0.05em -0.05em 0.15em %s", AnimatableValueParser.C2(bVar2.f)) : f0.k("0.06em 0.08em 0.15em %s", AnimatableValueParser.C2(bVar2.f)) : f0.k("0.1em 0.12em 0.15em %s", AnimatableValueParser.C2(bVar2.f)) : f0.k("1px 1px 0 %1$s, 1px -1px 0 %1$s, -1px 1px 0 %1$s, -1px -1px 0 %1$s", AnimatableValueParser.C2(bVar2.f));
+        objArr[3] = i8 != 1 ? i8 != 2 ? i8 != 3 ? i8 != 4 ? "unset" : f0.k("-0.05em -0.05em 0.15em %s", AnimatableValueParser.E2(bVar2.f)) : f0.k("0.06em 0.08em 0.15em %s", AnimatableValueParser.E2(bVar2.f)) : f0.k("0.1em 0.12em 0.15em %s", AnimatableValueParser.E2(bVar2.f)) : f0.k("1px 1px 0 %1$s, 1px -1px 0 %1$s, -1px 1px 0 %1$s, -1px -1px 0 %1$s", AnimatableValueParser.E2(bVar2.f));
         sb.append(f0.k("<body><div style='-webkit-user-select:none;position:fixed;top:0;bottom:0;left:0;right:0;color:%s;font-size:%s;line-height:%.2fem;text-shadow:%s;'>", objArr));
         HashMap hashMap = new HashMap();
         String str19 = "default_bg";
         String str20 = "background-color:%s;";
-        hashMap.put(AnimatableValueParser.Y(str19), f0.k(str20, AnimatableValueParser.C2(nVar.l.f808c)));
+        hashMap.put(AnimatableValueParser.Y(str19), f0.k(str20, AnimatableValueParser.E2(nVar.l.f808c)));
         int i9 = 0;
         while (i9 < nVar.k.size()) {
             c cVar2 = nVar.k.get(i9);
@@ -242,7 +242,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
             int i11 = cVar2.p;
             String str22 = i11 != 1 ? i11 != i3 ? "horizontal-tb" : "vertical-lr" : "vertical-rl";
             String c4 = nVar.c(cVar2.n, cVar2.o);
-            String C2 = AnimatableValueParser.C2(cVar2.l ? cVar2.m : nVar.l.d);
+            String E2 = AnimatableValueParser.E2(cVar2.l ? cVar2.m : nVar.l.d);
             int i12 = cVar2.p;
             String str23 = "right";
             String str24 = "left";
@@ -274,7 +274,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
                         Spanned spanned = (Spanned) charSequence;
                         HashSet hashSet = new HashSet();
                         cVar = cVar2;
-                        str9 = C2;
+                        str9 = E2;
                         int i13 = 0;
                         BackgroundColorSpan[] backgroundColorSpanArr = (BackgroundColorSpan[]) spanned.getSpans(0, spanned.length(), BackgroundColorSpan.class);
                         int length = backgroundColorSpanArr.length;
@@ -286,7 +286,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
                         HashMap hashMap2 = new HashMap();
                         for (Iterator it = hashSet.iterator(); it.hasNext(); it = it) {
                             int intValue = ((Integer) it.next()).intValue();
-                            hashMap2.put(AnimatableValueParser.Y("bg_" + intValue), f0.k(str20, AnimatableValueParser.C2(intValue)));
+                            hashMap2.put(AnimatableValueParser.Y("bg_" + intValue), f0.k(str20, AnimatableValueParser.E2(intValue)));
                         }
                         SparseArray sparseArray = new SparseArray();
                         str8 = str20;
@@ -307,7 +307,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
                                 str15 = c4;
                                 if (obj instanceof ForegroundColorSpan) {
                                     str14 = str22;
-                                    str16 = f0.k("<span style='color:%s;'>", AnimatableValueParser.C2(((ForegroundColorSpan) obj).getForegroundColor()));
+                                    str16 = f0.k("<span style='color:%s;'>", AnimatableValueParser.E2(((ForegroundColorSpan) obj).getForegroundColor()));
                                 } else {
                                     str14 = str22;
                                     if (obj instanceof BackgroundColorSpan) {
@@ -553,7 +553,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
                     str4 = str2;
                     str7 = c4;
                     str5 = str21;
-                    str9 = C2;
+                    str9 = E2;
                     while (r1.hasNext()) {
                     }
                     Object[] objArr7 = new Object[13];
@@ -609,7 +609,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
             str4 = str2;
             str7 = c4;
             str5 = str21;
-            str9 = C2;
+            str9 = E2;
             while (r1.hasNext()) {
             }
             Object[] objArr7 = new Object[13];
@@ -657,7 +657,7 @@ public final class n extends FrameLayout implements SubtitleView.a {
         }
         sb4.append("</style></head>");
         sb.insert(0, sb4.toString());
-        this.j.loadData(Base64.encodeToString(sb.toString().getBytes(c.i.b.a.c.f1264c), 1), "text/html", "base64");
+        this.j.loadData(Base64.encodeToString(sb.toString().getBytes(c.i.b.a.c.f1261c), 1), "text/html", "base64");
     }
 
     @Override // android.widget.FrameLayout, android.view.View, android.view.ViewGroup
diff --git a/app/src/main/java/c/i/a/c/g2/o/f.java b/app/src/main/java/c/i/a/c/g2/o/f.java
index f19451d8bd..9faa66c179 100644
--- a/app/src/main/java/c/i/a/c/g2/o/f.java
+++ b/app/src/main/java/c/i/a/c/g2/o/f.java
@@ -110,9 +110,9 @@ public final class f implements s, a {
                             }
                         }
                         wVar.C(f3);
-                        arrayList = AnimatableValueParser.R1(wVar);
+                        arrayList = AnimatableValueParser.T1(wVar);
                     } else {
-                        arrayList = AnimatableValueParser.R1(wVar);
+                        arrayList = AnimatableValueParser.T1(wVar);
                     }
                 } catch (ArrayIndexOutOfBoundsException unused) {
                 }
diff --git a/app/src/main/java/c/i/a/c/h2/y/c.java b/app/src/main/java/c/i/a/c/h2/y/c.java
index b2e55fdeaa..b503a3ab6c 100644
--- a/app/src/main/java/c/i/a/c/h2/y/c.java
+++ b/app/src/main/java/c/i/a/c/h2/y/c.java
@@ -87,7 +87,7 @@ public final class c implements j {
             Uri uri = a3.a;
             byte[] bArr = ((n) cache.b(str)).f895c.get("exo_redir");
             Uri uri2 = null;
-            String str2 = bArr != null ? new String(bArr, c.i.b.a.c.f1264c) : null;
+            String str2 = bArr != null ? new String(bArr, c.i.b.a.c.f1261c) : null;
             if (str2 != null) {
                 uri2 = Uri.parse(str2);
             }
diff --git a/app/src/main/java/c/i/a/c/h2/y/f.java b/app/src/main/java/c/i/a/c/h2/y/f.java
index 16a9288d2c..556193b2e7 100644
--- a/app/src/main/java/c/i/a/c/h2/y/f.java
+++ b/app/src/main/java/c/i/a/c/h2/y/f.java
@@ -68,7 +68,7 @@ public final class f {
                 SQLiteDatabase writableDatabase = this.b.getWritableDatabase();
                 writableDatabase.beginTransactionNonExclusive();
                 try {
-                    AnimatableValueParser.x2(writableDatabase, 2, hexString, 1);
+                    AnimatableValueParser.z2(writableDatabase, 2, hexString, 1);
                     String str = this.f890c;
                     writableDatabase.execSQL("DROP TABLE IF EXISTS " + str);
                     writableDatabase.execSQL("CREATE TABLE " + this.f890c + " (name TEXT PRIMARY KEY NOT NULL,length INTEGER NOT NULL,last_touch_timestamp INTEGER NOT NULL)");
diff --git a/app/src/main/java/c/i/a/c/h2/y/j.java b/app/src/main/java/c/i/a/c/h2/y/j.java
index 44b5e06df3..14c4eecf47 100644
--- a/app/src/main/java/c/i/a/c/h2/y/j.java
+++ b/app/src/main/java/c/i/a/c/h2/y/j.java
@@ -235,7 +235,7 @@ public class j {
         public final void j(SQLiteDatabase sQLiteDatabase) throws DatabaseIOException {
             String str = this.d;
             Objects.requireNonNull(str);
-            AnimatableValueParser.x2(sQLiteDatabase, 1, str, 1);
+            AnimatableValueParser.z2(sQLiteDatabase, 1, str, 1);
             String str2 = this.e;
             Objects.requireNonNull(str2);
             sQLiteDatabase.execSQL("DROP TABLE IF EXISTS " + str2);
diff --git a/app/src/main/java/c/i/a/c/h2/y/n.java b/app/src/main/java/c/i/a/c/h2/y/n.java
index fcb58f669d..3d07ad1ed1 100644
--- a/app/src/main/java/c/i/a/c/h2/y/n.java
+++ b/app/src/main/java/c/i/a/c/h2/y/n.java
@@ -60,7 +60,7 @@ public final class n implements l {
             if (value2 instanceof Long) {
                 bArr = ByteBuffer.allocate(8).putLong(((Long) value2).longValue()).array();
             } else if (value2 instanceof String) {
-                bArr = ((String) value2).getBytes(c.f1264c);
+                bArr = ((String) value2).getBytes(c.f1261c);
             } else if (value2 instanceof byte[]) {
                 bArr = (byte[]) value2;
             } else {
diff --git a/app/src/main/java/c/i/a/c/i2/f0.java b/app/src/main/java/c/i/a/c/i2/f0.java
index 097b353972..d1ca5b1480 100644
--- a/app/src/main/java/c/i/a/c/i2/f0.java
+++ b/app/src/main/java/c/i/a/c/i2/f0.java
@@ -306,11 +306,11 @@ public final class f0 {
     }
 
     public static String l(byte[] bArr) {
-        return new String(bArr, c.f1264c);
+        return new String(bArr, c.f1261c);
     }
 
     public static String m(byte[] bArr, int i2, int i3) {
-        return new String(bArr, i2, i3, c.f1264c);
+        return new String(bArr, i2, i3, c.f1261c);
     }
 
     public static int n(int i2) {
@@ -488,7 +488,7 @@ public final class f0 {
     }
 
     public static byte[] w(String str) {
-        return str.getBytes(c.f1264c);
+        return str.getBytes(c.f1261c);
     }
 
     public static boolean x(w wVar, w wVar2, @Nullable Inflater inflater) {
diff --git a/app/src/main/java/c/i/a/c/i2/w.java b/app/src/main/java/c/i/a/c/i2/w.java
index 5ef3980ebf..f2437031bb 100644
--- a/app/src/main/java/c/i/a/c/i2/w.java
+++ b/app/src/main/java/c/i/a/c/i2/w.java
@@ -250,7 +250,7 @@ public final class w {
     }
 
     public String p(int i) {
-        return q(i, c.f1264c);
+        return q(i, c.f1261c);
     }
 
     public String q(int i, Charset charset) {
diff --git a/app/src/main/java/c/i/a/c/j2/n.java b/app/src/main/java/c/i/a/c/j2/n.java
index 8aea343f91..9546654661 100644
--- a/app/src/main/java/c/i/a/c/j2/n.java
+++ b/app/src/main/java/c/i/a/c/j2/n.java
@@ -1517,7 +1517,7 @@ public class n extends MediaCodecRenderer {
 
     public static int I0(s sVar, Format format) {
         if (format.u == -1) {
-            return G0(sVar, format.t, format.f2189y, format.f2190z);
+            return G0(sVar, format.t, format.f2195y, format.f2196z);
         }
         int size = format.v.size();
         int i = 0;
@@ -1709,9 +1709,9 @@ public class n extends MediaCodecRenderer {
     public e K(s sVar, Format format, Format format2) {
         e c2 = sVar.c(format, format2);
         int i = c2.e;
-        int i2 = format2.f2189y;
+        int i2 = format2.f2195y;
         a aVar = this.Y0;
-        if (i2 > aVar.a || format2.f2190z > aVar.b) {
+        if (i2 > aVar.a || format2.f2196z > aVar.b) {
             i |= 256;
         }
         if (I0(sVar, format2) > this.Y0.f917c) {
@@ -1767,11 +1767,11 @@ public class n extends MediaCodecRenderer {
         String str2 = sVar.f765c;
         Format[] formatArr2 = this.o;
         Objects.requireNonNull(formatArr2);
-        int i3 = format.f2189y;
-        int i4 = format.f2190z;
+        int i3 = format.f2195y;
+        int i4 = format.f2196z;
         int I0 = I0(sVar, format);
         if (formatArr2.length == 1) {
-            if (!(I0 == -1 || (G0 = G0(sVar, format.t, format.f2189y, format.f2190z)) == -1)) {
+            if (!(I0 == -1 || (G0 = G0(sVar, format.t, format.f2195y, format.f2196z)) == -1)) {
                 I0 = Math.min((int) (((float) I0) * 1.5f), G0);
             }
             aVar = new a(i3, i4, I0);
@@ -1788,11 +1788,11 @@ public class n extends MediaCodecRenderer {
                     format2 = a2.a();
                 }
                 if (sVar.c(format, format2).d != 0) {
-                    int i6 = format2.f2189y;
+                    int i6 = format2.f2195y;
                     formatArr = formatArr2;
-                    z4 |= i6 == -1 || format2.f2190z == -1;
+                    z4 |= i6 == -1 || format2.f2196z == -1;
                     int max = Math.max(i3, i6);
-                    int max2 = Math.max(i4, format2.f2190z);
+                    int max2 = Math.max(i4, format2.f2196z);
                     I0 = Math.max(I0, I0(sVar, format2));
                     i4 = max2;
                     i3 = max;
@@ -1804,8 +1804,8 @@ public class n extends MediaCodecRenderer {
             }
             if (z4) {
                 Log.w("MediaCodecVideoRenderer", "Resolutions unknown. Codec max resolution: " + i3 + "x" + i4);
-                int i7 = format.f2190z;
-                int i8 = format.f2189y;
+                int i7 = format.f2196z;
+                int i8 = format.f2195y;
                 boolean z5 = i7 > i8;
                 int i9 = z5 ? i7 : i8;
                 if (z5) {
@@ -1862,20 +1862,20 @@ public class n extends MediaCodecRenderer {
                             }
                             mediaFormat = new MediaFormat();
                             mediaFormat.setString("mime", str);
-                            mediaFormat.setInteger("width", format.f2189y);
-                            mediaFormat.setInteger("height", format.f2190z);
-                            AnimatableValueParser.u2(mediaFormat, format.v);
+                            mediaFormat.setInteger("width", format.f2195y);
+                            mediaFormat.setInteger("height", format.f2196z);
+                            AnimatableValueParser.w2(mediaFormat, format.v);
                             f2 = format.A;
                             if (f2 != -1.0f) {
                             }
-                            AnimatableValueParser.H1(mediaFormat, "rotation-degrees", format.B);
+                            AnimatableValueParser.J1(mediaFormat, "rotation-degrees", format.B);
                             colorInfo = format.F;
                             if (colorInfo != null) {
                             }
-                            AnimatableValueParser.H1(mediaFormat, "profile", ((Integer) c2.first).intValue());
+                            AnimatableValueParser.J1(mediaFormat, "profile", ((Integer) c2.first).intValue());
                             mediaFormat.setInteger("max-width", aVar.a);
                             mediaFormat.setInteger("max-height", aVar.b);
-                            AnimatableValueParser.H1(mediaFormat, "max-input-size", aVar.f917c);
+                            AnimatableValueParser.J1(mediaFormat, "max-input-size", aVar.f917c);
                             i2 = f0.a;
                             if (i2 >= 23) {
                             }
@@ -1914,30 +1914,30 @@ public class n extends MediaCodecRenderer {
         i = !this.A1 ? this.B1 : 0;
         mediaFormat = new MediaFormat();
         mediaFormat.setString("mime", str);
-        mediaFormat.setInteger("width", format.f2189y);
-        mediaFormat.setInteger("height", format.f2190z);
-        AnimatableValueParser.u2(mediaFormat, format.v);
+        mediaFormat.setInteger("width", format.f2195y);
+        mediaFormat.setInteger("height", format.f2196z);
+        AnimatableValueParser.w2(mediaFormat, format.v);
         f2 = format.A;
         if (f2 != -1.0f) {
             mediaFormat.setFloat("frame-rate", f2);
         }
-        AnimatableValueParser.H1(mediaFormat, "rotation-degrees", format.B);
+        AnimatableValueParser.J1(mediaFormat, "rotation-degrees", format.B);
         colorInfo = format.F;
         if (colorInfo != null) {
-            AnimatableValueParser.H1(mediaFormat, "color-transfer", colorInfo.k);
-            AnimatableValueParser.H1(mediaFormat, "color-standard", colorInfo.i);
-            AnimatableValueParser.H1(mediaFormat, "color-range", colorInfo.j);
+            AnimatableValueParser.J1(mediaFormat, "color-transfer", colorInfo.k);
+            AnimatableValueParser.J1(mediaFormat, "color-standard", colorInfo.i);
+            AnimatableValueParser.J1(mediaFormat, "color-range", colorInfo.j);
             byte[] bArr = colorInfo.l;
             if (bArr != null) {
                 mediaFormat.setByteBuffer("hdr-static-info", ByteBuffer.wrap(bArr));
             }
         }
         if ("video/dolby-vision".equals(format.t) && (c2 = MediaCodecUtil.c(format)) != null) {
-            AnimatableValueParser.H1(mediaFormat, "profile", ((Integer) c2.first).intValue());
+            AnimatableValueParser.J1(mediaFormat, "profile", ((Integer) c2.first).intValue());
         }
         mediaFormat.setInteger("max-width", aVar.a);
         mediaFormat.setInteger("max-height", aVar.b);
-        AnimatableValueParser.H1(mediaFormat, "max-input-size", aVar.f917c);
+        AnimatableValueParser.J1(mediaFormat, "max-input-size", aVar.f917c);
         i2 = f0.a;
         if (i2 >= 23) {
             mediaFormat.setInteger("priority", 0);
@@ -2214,8 +2214,8 @@ public class n extends MediaCodecRenderer {
             rVar.f(this.e1);
         }
         if (this.A1) {
-            this.s1 = format.f2189y;
-            this.t1 = format.f2190z;
+            this.s1 = format.f2195y;
+            this.t1 = format.f2196z;
         } else {
             Objects.requireNonNull(mediaFormat);
             boolean z2 = mediaFormat.containsKey("crop-right") && mediaFormat.containsKey("crop-left") && mediaFormat.containsKey("crop-bottom") && mediaFormat.containsKey("crop-top");
diff --git a/app/src/main/java/c/i/a/c/v1/a0.java b/app/src/main/java/c/i/a/c/v1/a0.java
index bf940f6304..bef7786bcc 100644
--- a/app/src/main/java/c/i/a/c/v1/a0.java
+++ b/app/src/main/java/c/i/a/c/v1/a0.java
@@ -84,7 +84,7 @@ public final class a0 extends u {
     public AudioProcessor.a f(AudioProcessor.a aVar) throws AudioProcessor.UnhandledAudioFormatException {
         int i = aVar.d;
         if (i == 3 || i == 2 || i == 268435456 || i == 536870912 || i == 805306368 || i == 4) {
-            return i != 2 ? new AudioProcessor.a(aVar.b, aVar.f2196c, 2) : AudioProcessor.a.a;
+            return i != 2 ? new AudioProcessor.a(aVar.b, aVar.f2202c, 2) : AudioProcessor.a.a;
         }
         throw new AudioProcessor.UnhandledAudioFormatException(aVar);
     }
diff --git a/app/src/main/java/c/i/a/c/v1/d0.java b/app/src/main/java/c/i/a/c/v1/d0.java
index 8650214305..9fc533a5a5 100644
--- a/app/src/main/java/c/i/a/c/v1/d0.java
+++ b/app/src/main/java/c/i/a/c/v1/d0.java
@@ -79,7 +79,7 @@ public final class d0 implements AudioProcessor {
                 i = aVar.b;
             }
             this.e = aVar;
-            AudioProcessor.a aVar2 = new AudioProcessor.a(i, aVar.f2196c, 2);
+            AudioProcessor.a aVar2 = new AudioProcessor.a(i, aVar.f2202c, 2);
             this.f = aVar2;
             this.i = true;
             return aVar2;
@@ -128,7 +128,7 @@ public final class d0 implements AudioProcessor {
             AudioProcessor.a aVar2 = this.f;
             this.h = aVar2;
             if (this.i) {
-                this.j = new c0(aVar.b, aVar.f2196c, this.f985c, this.d, aVar2.b);
+                this.j = new c0(aVar.b, aVar.f2202c, this.f985c, this.d, aVar2.b);
             } else {
                 c0 c0Var = this.j;
                 if (c0Var != null) {
diff --git a/app/src/main/java/c/i/a/c/v1/v.java b/app/src/main/java/c/i/a/c/v1/v.java
index 88453cfafa..59537386b2 100644
--- a/app/src/main/java/c/i/a/c/v1/v.java
+++ b/app/src/main/java/c/i/a/c/v1/v.java
@@ -35,11 +35,11 @@ public final class v extends u {
             return AudioProcessor.a.a;
         }
         if (aVar.d == 2) {
-            boolean z2 = aVar.f2196c != iArr.length;
+            boolean z2 = aVar.f2202c != iArr.length;
             int i = 0;
             while (i < iArr.length) {
                 int i2 = iArr[i];
-                if (i2 < aVar.f2196c) {
+                if (i2 < aVar.f2202c) {
                     z2 |= i2 != i;
                     i++;
                 } else {
diff --git a/app/src/main/java/c/i/a/c/v1/x.java b/app/src/main/java/c/i/a/c/v1/x.java
index fa86a078af..ce50bcb85d 100644
--- a/app/src/main/java/c/i/a/c/v1/x.java
+++ b/app/src/main/java/c/i/a/c/v1/x.java
@@ -45,7 +45,7 @@ public final class x extends u {
     public AudioProcessor.a f(AudioProcessor.a aVar) throws AudioProcessor.UnhandledAudioFormatException {
         int i2 = aVar.d;
         if (f0.y(i2)) {
-            return i2 != 4 ? new AudioProcessor.a(aVar.b, aVar.f2196c, 4) : AudioProcessor.a.a;
+            return i2 != 4 ? new AudioProcessor.a(aVar.b, aVar.f2202c, 4) : AudioProcessor.a.a;
         }
         throw new AudioProcessor.UnhandledAudioFormatException(aVar);
     }
diff --git a/app/src/main/java/c/i/a/c/v1/y.java b/app/src/main/java/c/i/a/c/v1/y.java
index c429f46d5e..8532c5d719 100644
--- a/app/src/main/java/c/i/a/c/v1/y.java
+++ b/app/src/main/java/c/i/a/c/v1/y.java
@@ -200,8 +200,8 @@ public class y extends MediaCodecRenderer implements r {
                 mediaFormat.setString("mime", str3);
                 mediaFormat.setInteger("channel-count", format.G);
                 mediaFormat.setInteger("sample-rate", format.H);
-                AnimatableValueParser.u2(mediaFormat, format.v);
-                AnimatableValueParser.H1(mediaFormat, "max-input-size", i2);
+                AnimatableValueParser.w2(mediaFormat, format.v);
+                AnimatableValueParser.J1(mediaFormat, "max-input-size", i2);
                 if (i >= 23) {
                     mediaFormat.setInteger("priority", 0);
                     if (f != -1.0f) {
@@ -228,9 +228,9 @@ public class y extends MediaCodecRenderer implements r {
                     int i4 = format.H;
                     Format.b bVar = new Format.b();
                     bVar.k = "audio/raw";
-                    bVar.f2193x = i3;
-                    bVar.f2194y = i4;
-                    bVar.f2195z = 4;
+                    bVar.f2199x = i3;
+                    bVar.f2200y = i4;
+                    bVar.f2201z = 4;
                     if (audioSink.s(bVar.a()) == 2) {
                         mediaFormat.setInteger("pcm-encoding", 4);
                     }
@@ -253,8 +253,8 @@ public class y extends MediaCodecRenderer implements r {
         mediaFormat.setString("mime", str3);
         mediaFormat.setInteger("channel-count", format.G);
         mediaFormat.setInteger("sample-rate", format.H);
-        AnimatableValueParser.u2(mediaFormat, format.v);
-        AnimatableValueParser.H1(mediaFormat, "max-input-size", i2);
+        AnimatableValueParser.w2(mediaFormat, format.v);
+        AnimatableValueParser.J1(mediaFormat, "max-input-size", i2);
         if (i >= 23) {
         }
         mediaFormat.setInteger("ac4-is-sync", 1);
@@ -366,11 +366,11 @@ public class y extends MediaCodecRenderer implements r {
             int r = "audio/raw".equals(format.t) ? format.I : (f0.a < 24 || !mediaFormat.containsKey("pcm-encoding")) ? mediaFormat.containsKey("v-bits-per-sample") ? f0.r(mediaFormat.getInteger("v-bits-per-sample")) : "audio/raw".equals(format.t) ? format.I : 2 : mediaFormat.getInteger("pcm-encoding");
             Format.b bVar = new Format.b();
             bVar.k = "audio/raw";
-            bVar.f2195z = r;
+            bVar.f2201z = r;
             bVar.A = format.J;
             bVar.B = format.K;
-            bVar.f2193x = mediaFormat.getInteger("channel-count");
-            bVar.f2194y = mediaFormat.getInteger("sample-rate");
+            bVar.f2199x = mediaFormat.getInteger("channel-count");
+            bVar.f2200y = mediaFormat.getInteger("sample-rate");
             Format a2 = bVar.a();
             if (this.T0 && a2.G == 6 && (i = format.G) < 6) {
                 iArr = new int[i];
@@ -511,9 +511,9 @@ public class y extends MediaCodecRenderer implements r {
         int i3 = format.H;
         Format.b bVar = new Format.b();
         bVar.k = "audio/raw";
-        bVar.f2193x = i2;
-        bVar.f2194y = i3;
-        bVar.f2195z = 2;
+        bVar.f2199x = i2;
+        bVar.f2200y = i3;
+        bVar.f2201z = 2;
         if (!audioSink.a(bVar.a())) {
             return 1;
         }
diff --git a/app/src/main/java/c/i/a/c/z1/m.java b/app/src/main/java/c/i/a/c/z1/m.java
index 77b87f35a0..c46cce3f9f 100644
--- a/app/src/main/java/c/i/a/c/z1/m.java
+++ b/app/src/main/java/c/i/a/c/z1/m.java
@@ -19,7 +19,7 @@ public final /* synthetic */ class m implements MediaDrm.OnEventListener {
         z zVar = this.a;
         x.b bVar = this.b;
         Objects.requireNonNull(zVar);
-        DefaultDrmSessionManager.c cVar = DefaultDrmSessionManager.this.f2211x;
+        DefaultDrmSessionManager.c cVar = DefaultDrmSessionManager.this.f2217x;
         Objects.requireNonNull(cVar);
         cVar.obtainMessage(i, bArr).sendToTarget();
     }
diff --git a/app/src/main/java/c/i/a/c/z1/z.java b/app/src/main/java/c/i/a/c/z1/z.java
index e169d0aa0e..e51461e259 100644
--- a/app/src/main/java/c/i/a/c/z1/z.java
+++ b/app/src/main/java/c/i/a/c/z1/z.java
@@ -170,7 +170,7 @@ public final class z implements x {
                         if (!(f0.a(schemeData4.l, schemeData3.l) && f0.a(schemeData4.k, schemeData3.k))) {
                             break;
                         }
-                        if (!(AnimatableValueParser.T1(bArr4) != null)) {
+                        if (!(AnimatableValueParser.V1(bArr4) != null)) {
                             break;
                         }
                         i3 += bArr4.length;
@@ -194,8 +194,8 @@ public final class z implements x {
                     DrmInitData.SchemeData schemeData5 = list.get(i6);
                     byte[] bArr7 = schemeData5.m;
                     Objects.requireNonNull(bArr7);
-                    j T1 = AnimatableValueParser.T1(bArr7);
-                    int i7 = T1 == null ? -1 : T1.b;
+                    j V1 = AnimatableValueParser.V1(bArr7);
+                    int i7 = V1 == null ? -1 : V1.b;
                     int i8 = f0.a;
                     if ((i8 < 23 && i7 == 0) || (i8 >= 23 && i7 == 1)) {
                         schemeData2 = schemeData5;
@@ -210,9 +210,9 @@ public final class z implements x {
             Objects.requireNonNull(bArr8);
             UUID uuid2 = h0.e;
             if (uuid2.equals(uuid)) {
-                byte[] U1 = AnimatableValueParser.U1(bArr8, uuid);
-                if (U1 != null) {
-                    bArr8 = U1;
+                byte[] W1 = AnimatableValueParser.W1(bArr8, uuid);
+                if (W1 != null) {
+                    bArr8 = W1;
                 }
                 int i9 = (bArr8[0] & 255) | ((bArr8[1] & 255) << 8) | ((bArr8[2] & 255) << 16) | ((bArr8[3] & 255) << 24);
                 short s2 = (short) (((bArr8[5] & 255) << 8) | (bArr8[4] & 255));
@@ -270,7 +270,7 @@ public final class z implements x {
                 bArr2 = bArr3;
                 str = (i12 >= 26 || !h0.f873c.equals(uuid3) || (!"video/mp4".equals(str5) && !"audio/mp4".equals(str5))) ? str5 : "cenc";
             }
-            bArr3 = AnimatableValueParser.U1(bArr8, uuid);
+            bArr3 = AnimatableValueParser.W1(bArr8, uuid);
         } else {
             bArr2 = null;
             str = null;
diff --git a/app/src/main/java/c/i/a/d/a/a.java b/app/src/main/java/c/i/a/d/a/a.java
index 4ac2d1d3db..c8079d9458 100644
--- a/app/src/main/java/c/i/a/d/a/a.java
+++ b/app/src/main/java/c/i/a/d/a/a.java
@@ -24,7 +24,7 @@ public interface a extends IInterface {
             }
 
             @Override // c.i.a.d.a.a
-            public final Bundle B(Bundle bundle) throws RemoteException {
+            public final Bundle C(Bundle bundle) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 obtain.writeInterfaceToken("com.google.android.finsky.externalreferrer.IGetInstallReferrerService");
                 int i = c.a;
@@ -45,5 +45,5 @@ public interface a extends IInterface {
         }
     }
 
-    Bundle B(Bundle bundle) throws RemoteException;
+    Bundle C(Bundle bundle) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/d/e.java b/app/src/main/java/c/i/a/f/c/a/d/e.java
index b800557cd0..a689965965 100644
--- a/app/src/main/java/c/i/a/f/c/a/d/e.java
+++ b/app/src/main/java/c/i/a/f/c/a/d/e.java
@@ -12,7 +12,7 @@ public final class e implements Parcelable.Creator<Credential> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Credential createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         Uri uri = null;
@@ -21,7 +21,7 @@ public final class e implements Parcelable.Creator<Credential> {
         String str4 = null;
         String str5 = null;
         String str6 = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
@@ -45,7 +45,7 @@ public final class e implements Parcelable.Creator<Credential> {
                 case 7:
                 case 8:
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
                 case 9:
                     str5 = AnimatableValueParser.T(parcel, readInt);
@@ -55,7 +55,7 @@ public final class e implements Parcelable.Creator<Credential> {
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Credential(str, str2, uri, arrayList, str3, str4, str5, str6);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/d/f.java b/app/src/main/java/c/i/a/f/c/a/d/f.java
index 9f6ec61a12..9e126c679b 100644
--- a/app/src/main/java/c/i/a/f/c/a/d/f.java
+++ b/app/src/main/java/c/i/a/f/c/a/d/f.java
@@ -9,30 +9,30 @@ public final class f implements Parcelable.Creator<CredentialPickerConfig> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final CredentialPickerConfig createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         boolean z2 = false;
         boolean z3 = false;
         boolean z4 = false;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i3 == 2) {
-                z3 = AnimatableValueParser.c2(parcel, readInt);
+                z3 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i3 == 3) {
-                z4 = AnimatableValueParser.c2(parcel, readInt);
+                z4 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i3 == 4) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new CredentialPickerConfig(i, z2, z3, z4, i2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/d/g.java b/app/src/main/java/c/i/a/f/c/a/d/g.java
index 29e7a3770d..60598b75ec 100644
--- a/app/src/main/java/c/i/a/f/c/a/d/g.java
+++ b/app/src/main/java/c/i/a/f/c/a/d/g.java
@@ -10,7 +10,7 @@ public final class g implements Parcelable.Creator<CredentialRequest> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final CredentialRequest createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String[] strArr = null;
         CredentialPickerConfig credentialPickerConfig = null;
         CredentialPickerConfig credentialPickerConfig2 = null;
@@ -20,13 +20,13 @@ public final class g implements Parcelable.Creator<CredentialRequest> {
         boolean z2 = false;
         boolean z3 = false;
         boolean z4 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 != 1000) {
                 switch (i2) {
                     case 1:
-                        z2 = AnimatableValueParser.c2(parcel, readInt);
+                        z2 = AnimatableValueParser.e2(parcel, readInt);
                         continue;
                     case 2:
                         strArr = AnimatableValueParser.U(parcel, readInt);
@@ -38,7 +38,7 @@ public final class g implements Parcelable.Creator<CredentialRequest> {
                         credentialPickerConfig2 = (CredentialPickerConfig) AnimatableValueParser.S(parcel, readInt, CredentialPickerConfig.CREATOR);
                         continue;
                     case 5:
-                        z3 = AnimatableValueParser.c2(parcel, readInt);
+                        z3 = AnimatableValueParser.e2(parcel, readInt);
                         continue;
                     case 6:
                         str = AnimatableValueParser.T(parcel, readInt);
@@ -47,17 +47,17 @@ public final class g implements Parcelable.Creator<CredentialRequest> {
                         str2 = AnimatableValueParser.T(parcel, readInt);
                         continue;
                     case 8:
-                        z4 = AnimatableValueParser.c2(parcel, readInt);
+                        z4 = AnimatableValueParser.e2(parcel, readInt);
                         continue;
                     default:
-                        AnimatableValueParser.B2(parcel, readInt);
+                        AnimatableValueParser.D2(parcel, readInt);
                         continue;
                 }
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new CredentialRequest(i, z2, strArr, credentialPickerConfig, credentialPickerConfig2, z3, str, str2, z4);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/d/i.java b/app/src/main/java/c/i/a/f/c/a/d/i.java
index 2bce0734fc..eb9dbe25df 100644
--- a/app/src/main/java/c/i/a/f/c/a/d/i.java
+++ b/app/src/main/java/c/i/a/f/c/a/d/i.java
@@ -9,21 +9,21 @@ public final class i implements Parcelable.Creator<IdToken> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final IdToken createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
                 str = AnimatableValueParser.T(parcel, readInt);
             } else if (i != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str2 = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new IdToken(str, str2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/e/a.java b/app/src/main/java/c/i/a/f/c/a/e/a.java
index 304bf21e8d..aa19b7dd89 100644
--- a/app/src/main/java/c/i/a/f/c/a/e/a.java
+++ b/app/src/main/java/c/i/a/f/c/a/e/a.java
@@ -4,15 +4,15 @@ import android.app.Activity;
 import androidx.annotation.NonNull;
 import c.i.a.f.e.h.a;
 import c.i.a.f.e.h.b;
-import c.i.a.f.h.b.i;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
+import c.i.a.f.e.h.j.n;
+import c.i.a.f.h.b.g;
 public abstract class a extends b<a.d.c> {
-    public static final a.g<i> j;
-    public static final a.AbstractC0100a<i, a.d.c> k;
+    public static final a.g<g> j;
+    public static final a.AbstractC0100a<g, a.d.c> k;
     public static final c.i.a.f.e.h.a<a.d.c> l;
 
     static {
-        a.g<i> gVar = new a.g<>();
+        a.g<g> gVar = new a.g<>();
         j = gVar;
         b bVar = new b();
         k = bVar;
@@ -20,6 +20,6 @@ public abstract class a extends b<a.d.c> {
     }
 
     public a(@NonNull Activity activity) {
-        super(activity, (c.i.a.f.e.h.a<a.d>) l, (a.d) null, b.a.a);
+        super(activity, (c.i.a.f.e.h.a<a.d>) l, (a.d) null, (n) new c.i.a.f.e.h.j.a());
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/e/b.java b/app/src/main/java/c/i/a/f/c/a/e/b.java
index 79974acdd4..c2a0288ff7 100644
--- a/app/src/main/java/c/i/a/f/c/a/e/b.java
+++ b/app/src/main/java/c/i/a/f/c/a/e/b.java
@@ -3,16 +3,14 @@ package c.i.a.f.c.a.e;
 import android.content.Context;
 import android.os.Looper;
 import c.i.a.f.e.h.a;
-import c.i.a.f.e.h.j.f;
-import c.i.a.f.e.h.j.l;
+import c.i.a.f.e.h.c;
 import c.i.a.f.e.k.c;
-import c.i.a.f.h.b.i;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public final class b extends a.AbstractC0100a<i, a.d.c> {
+import c.i.a.f.h.b.g;
+public final class b extends a.AbstractC0100a<g, a.d.c> {
     /* Return type fixed from 'c.i.a.f.e.h.a$f' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [android.content.Context, android.os.Looper, c.i.a.f.e.k.c, java.lang.Object, c.i.a.f.e.h.j.f, c.i.a.f.e.h.j.l] */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [android.content.Context, android.os.Looper, c.i.a.f.e.k.c, java.lang.Object, c.i.a.f.e.h.c$a, c.i.a.f.e.h.c$b] */
     @Override // c.i.a.f.e.h.a.AbstractC0100a
-    public final /* synthetic */ i b(Context context, Looper looper, c cVar, a.d.c cVar2, f fVar, l lVar) {
-        return new i(context, looper, cVar, fVar, lVar);
+    public final /* synthetic */ g a(Context context, Looper looper, c cVar, a.d.c cVar2, c.a aVar, c.b bVar) {
+        return new g(context, looper, cVar, aVar, bVar);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/a.java b/app/src/main/java/c/i/a/f/c/a/f/a.java
index 9cf551fc0d..06ea1a44ce 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/a.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/a.java
@@ -17,7 +17,7 @@ public class a extends b<GoogleSignInOptions> {
     public final synchronized int f() {
         if (j == 1) {
             Context context = this.a;
-            Object obj = GoogleApiAvailability.f2279c;
+            Object obj = GoogleApiAvailability.f2285c;
             GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
             int b = googleApiAvailability.b(context, 12451000);
             if (b == 0) {
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/a.java b/app/src/main/java/c/i/a/f/c/a/f/b/a.java
index f16ee50d08..1002ec7876 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/a.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/a.java
@@ -107,7 +107,7 @@ public class a {
             if (str5 != null) {
                 jSONObject.put("displayName", str5);
             }
-            String str6 = googleSignInAccount.f2274s;
+            String str6 = googleSignInAccount.f2280s;
             if (str6 != null) {
                 jSONObject.put("givenName", str6);
             }
@@ -155,7 +155,7 @@ public class a {
                 }
                 jSONObject2.put("idTokenRequested", googleSignInOptions.r);
                 jSONObject2.put("forceCodeForRefreshToken", googleSignInOptions.t);
-                jSONObject2.put("serverAuthRequested", googleSignInOptions.f2275s);
+                jSONObject2.put("serverAuthRequested", googleSignInOptions.f2281s);
                 if (!TextUtils.isEmpty(googleSignInOptions.u)) {
                     jSONObject2.put("serverClientId", googleSignInOptions.u);
                 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/b.java b/app/src/main/java/c/i/a/f/c/a/f/b/b.java
index ef5bb522ec..c8df7e8811 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/b.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/b.java
@@ -10,24 +10,24 @@ public final class b implements Parcelable.Creator<GoogleSignInOptionsExtensionP
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final GoogleSignInOptionsExtensionParcelable createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         Bundle bundle = null;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 bundle = AnimatableValueParser.P(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new GoogleSignInOptionsExtensionParcelable(i, i2, bundle);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/c.java b/app/src/main/java/c/i/a/f/c/a/f/b/c.java
index 9f57a4e31f..57966cb8ac 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/c.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/c.java
@@ -5,12 +5,12 @@ import com.google.android.gms.common.api.Status;
 /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */
 public class c extends p {
     @Override // c.i.a.f.c.a.f.b.n
-    public void n(Status status) throws RemoteException {
+    public void o(Status status) throws RemoteException {
         throw new UnsupportedOperationException();
     }
 
     @Override // c.i.a.f.c.a.f.b.n
-    public void u(Status status) throws RemoteException {
+    public void v(Status status) throws RemoteException {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/f.java b/app/src/main/java/c/i/a/f/c/a/f/b/f.java
index 4c0a816239..e2508d60c5 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/f.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/f.java
@@ -23,8 +23,8 @@ public final class f extends d<o> {
         byte[] bArr = new byte[16];
         a.a.nextBytes(bArr);
         aVar2.i = Base64.encodeToString(bArr, 11);
-        if (!cVar.f1050c.isEmpty()) {
-            for (Scope scope : cVar.f1050c) {
+        if (!cVar.f1049c.isEmpty()) {
+            for (Scope scope : cVar.f1049c) {
                 aVar2.a.add(scope);
                 aVar2.a.addAll(Arrays.asList(new Scope[0]));
             }
@@ -47,12 +47,12 @@ public final class f extends d<o> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.auth.api.signin.internal.ISignInService";
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.auth.api.signin.service.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/h.java b/app/src/main/java/c/i/a/f/c/a/f/b/h.java
index fcea653daa..13e72ea22e 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/h.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/h.java
@@ -18,6 +18,6 @@ public final class h extends k<Status> {
     @Override // c.i.a.f.e.h.j.d
     public final void k(f fVar) throws RemoteException {
         f fVar2 = fVar;
-        fVar2.w().n0(new j(this), fVar2.A);
+        fVar2.v().n0(new j(this), fVar2.A);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/i.java b/app/src/main/java/c/i/a/f/c/a/f/b/i.java
index 979689f864..25f92465ee 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/i.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/i.java
@@ -19,6 +19,6 @@ public final class i extends k<Status> {
     @Override // c.i.a.f.e.h.j.d
     public final void k(f fVar) throws RemoteException {
         f fVar2 = fVar;
-        fVar2.w().Z(new l(this), fVar2.A);
+        fVar2.v().Z(new l(this), fVar2.A);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/j.java b/app/src/main/java/c/i/a/f/c/a/f/b/j.java
index c7ea40208e..173547a9f5 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/j.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/j.java
@@ -11,7 +11,7 @@ public final class j extends c {
     }
 
     @Override // c.i.a.f.c.a.f.b.c, c.i.a.f.c.a.f.b.n
-    public final void n(Status status) throws RemoteException {
+    public final void o(Status status) throws RemoteException {
         this.a.b(status);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/l.java b/app/src/main/java/c/i/a/f/c/a/f/b/l.java
index 6c825917da..eddba6f6a8 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/l.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/l.java
@@ -11,7 +11,7 @@ public final class l extends c {
     }
 
     @Override // c.i.a.f.c.a.f.b.c, c.i.a.f.c.a.f.b.n
-    public final void u(Status status) throws RemoteException {
+    public final void v(Status status) throws RemoteException {
         this.a.b(status);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/n.java b/app/src/main/java/c/i/a/f/c/a/f/b/n.java
index 12631ef01f..2a75702edb 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/n.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/n.java
@@ -5,7 +5,7 @@ import android.os.RemoteException;
 import com.google.android.gms.common.api.Status;
 /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */
 public interface n extends IInterface {
-    void n(Status status) throws RemoteException;
+    void o(Status status) throws RemoteException;
 
-    void u(Status status) throws RemoteException;
+    void v(Status status) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/p.java b/app/src/main/java/c/i/a/f/c/a/f/b/p.java
index 83a25492b5..690a7f9b41 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/p.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/p.java
@@ -20,10 +20,10 @@ public abstract class p extends b implements n {
                 Status status = (Status) d.a(parcel, Status.CREATOR);
                 throw new UnsupportedOperationException();
             case 102:
-                n((Status) d.a(parcel, Status.CREATOR));
+                o((Status) d.a(parcel, Status.CREATOR));
                 break;
             case 103:
-                u((Status) d.a(parcel, Status.CREATOR));
+                v((Status) d.a(parcel, Status.CREATOR));
                 break;
             default:
                 return false;
diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/s.java b/app/src/main/java/c/i/a/f/c/a/f/b/s.java
index 333e5313d3..ec5d42a105 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/b/s.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/b/s.java
@@ -10,21 +10,21 @@ public final class s implements Parcelable.Creator<SignInConfiguration> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final SignInConfiguration createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         GoogleSignInOptions googleSignInOptions = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 2) {
                 str = AnimatableValueParser.T(parcel, readInt);
             } else if (i != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 googleSignInOptions = (GoogleSignInOptions) AnimatableValueParser.S(parcel, readInt, GoogleSignInOptions.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new SignInConfiguration(str, googleSignInOptions);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/f/d.java b/app/src/main/java/c/i/a/f/c/a/f/d.java
index 8ec90da4b3..74956deb04 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/d.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/d.java
@@ -12,7 +12,7 @@ public final class d implements Parcelable.Creator<GoogleSignInAccount> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final GoogleSignInAccount createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         String str3 = null;
@@ -25,11 +25,11 @@ public final class d implements Parcelable.Creator<GoogleSignInAccount> {
         String str8 = null;
         long j = 0;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -50,7 +50,7 @@ public final class d implements Parcelable.Creator<GoogleSignInAccount> {
                     str5 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 8:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 9:
                     str6 = AnimatableValueParser.T(parcel, readInt);
@@ -65,11 +65,11 @@ public final class d implements Parcelable.Creator<GoogleSignInAccount> {
                     str8 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new GoogleSignInAccount(i, str, str2, str3, str4, uri, str5, j, str6, arrayList, str7, str8);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/f/f.java b/app/src/main/java/c/i/a/f/c/a/f/f.java
index 2405eb0466..fb4ca260fa 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/f.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/f.java
@@ -13,7 +13,7 @@ public final class f implements Parcelable.Creator<GoogleSignInOptions> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final GoogleSignInOptions createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         ArrayList arrayList = null;
         ArrayList arrayList2 = null;
         Account account = null;
@@ -24,11 +24,11 @@ public final class f implements Parcelable.Creator<GoogleSignInOptions> {
         boolean z2 = false;
         boolean z3 = false;
         boolean z4 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
                     arrayList2 = AnimatableValueParser.X(parcel, readInt, Scope.CREATOR);
@@ -37,13 +37,13 @@ public final class f implements Parcelable.Creator<GoogleSignInOptions> {
                     account = (Account) AnimatableValueParser.S(parcel, readInt, Account.CREATOR);
                     break;
                 case 4:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 5:
-                    z3 = AnimatableValueParser.c2(parcel, readInt);
+                    z3 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 6:
-                    z4 = AnimatableValueParser.c2(parcel, readInt);
+                    z4 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 7:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -58,11 +58,11 @@ public final class f implements Parcelable.Creator<GoogleSignInOptions> {
                     str3 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new GoogleSignInOptions(i, arrayList2, account, z2, z3, z4, str, str2, GoogleSignInOptions.x0(arrayList), str3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/c/a/f/g.java b/app/src/main/java/c/i/a/f/c/a/f/g.java
index 1ca3bd2d42..8bb94d622d 100644
--- a/app/src/main/java/c/i/a/f/c/a/f/g.java
+++ b/app/src/main/java/c/i/a/f/c/a/f/g.java
@@ -10,11 +10,11 @@ public final class g implements Parcelable.Creator<SignInAccount> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final SignInAccount createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = "";
         GoogleSignInAccount googleSignInAccount = null;
         String str2 = str;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 4) {
@@ -22,12 +22,12 @@ public final class g implements Parcelable.Creator<SignInAccount> {
             } else if (i == 7) {
                 googleSignInAccount = (GoogleSignInAccount) AnimatableValueParser.S(parcel, readInt, GoogleSignInAccount.CREATOR);
             } else if (i != 8) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str2 = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new SignInAccount(str, googleSignInAccount, str2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/d/c.java b/app/src/main/java/c/i/a/f/d/c.java
index 5545884cce..05e1b04dab 100644
--- a/app/src/main/java/c/i/a/f/d/c.java
+++ b/app/src/main/java/c/i/a/f/d/c.java
@@ -10,17 +10,17 @@ public final class c implements Parcelable.Creator<CloudMessage> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final CloudMessage createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Intent intent = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 1) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 intent = (Intent) AnimatableValueParser.S(parcel, readInt, Intent.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new CloudMessage(intent);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/b0.java b/app/src/main/java/c/i/a/f/e/b0.java
index ba50780c2d..b84c17da7d 100644
--- a/app/src/main/java/c/i/a/f/e/b0.java
+++ b/app/src/main/java/c/i/a/f/e/b0.java
@@ -10,27 +10,27 @@ public final class b0 implements Parcelable.Creator<zzj> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzj createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         boolean z2 = false;
         String str = null;
         IBinder iBinder = null;
         boolean z3 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
                 str = AnimatableValueParser.T(parcel, readInt);
             } else if (i == 2) {
-                iBinder = AnimatableValueParser.d2(parcel, readInt);
+                iBinder = AnimatableValueParser.f2(parcel, readInt);
             } else if (i == 3) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i != 4) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                z3 = AnimatableValueParser.c2(parcel, readInt);
+                z3 = AnimatableValueParser.e2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzj(str, iBinder, z2, z3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/c.java b/app/src/main/java/c/i/a/f/e/c.java
index d65fc9160c..a78c2d047e 100644
--- a/app/src/main/java/c/i/a/f/e/c.java
+++ b/app/src/main/java/c/i/a/f/e/c.java
@@ -113,10 +113,10 @@ public class c {
         }
         boolean z4 = true;
         if (!c.i.a.f.e.o.c.V(context)) {
-            if (c.i.a.f.e.o.c.f1061c == null) {
-                c.i.a.f.e.o.c.f1061c = Boolean.valueOf(context.getPackageManager().hasSystemFeature("android.hardware.type.iot") || context.getPackageManager().hasSystemFeature("android.hardware.type.embedded"));
+            if (c.i.a.f.e.o.c.f1060c == null) {
+                c.i.a.f.e.o.c.f1060c = Boolean.valueOf(context.getPackageManager().hasSystemFeature("android.hardware.type.iot") || context.getPackageManager().hasSystemFeature("android.hardware.type.embedded"));
             }
-            if (!c.i.a.f.e.o.c.f1061c.booleanValue()) {
+            if (!c.i.a.f.e.o.c.f1060c.booleanValue()) {
                 z2 = true;
                 AnimatableValueParser.m(i < 0);
                 packageName = context.getPackageName();
diff --git a/app/src/main/java/c/i/a/f/e/f.java b/app/src/main/java/c/i/a/f/e/f.java
index 95fc0650a7..d615d68e1d 100644
--- a/app/src/main/java/c/i/a/f/e/f.java
+++ b/app/src/main/java/c/i/a/f/e/f.java
@@ -29,8 +29,8 @@ public class f {
             if (a == null) {
                 o0 o0Var = s.a;
                 synchronized (s.class) {
-                    if (s.f1063c == null) {
-                        s.f1063c = context.getApplicationContext();
+                    if (s.f1062c == null) {
+                        s.f1062c = context.getApplicationContext();
                     } else {
                         Log.w("GoogleCertificates", "GoogleCertificates has been initialized already");
                     }
diff --git a/app/src/main/java/c/i/a/f/e/h/b.java b/app/src/main/java/c/i/a/f/e/h/b.java
index ee8638d48c..e393c6d55a 100644
--- a/app/src/main/java/c/i/a/f/e/h/b.java
+++ b/app/src/main/java/c/i/a/f/e/h/b.java
@@ -13,16 +13,16 @@ import androidx.annotation.Nullable;
 import androidx.collection.ArraySet;
 import c.i.a.f.e.h.a;
 import c.i.a.f.e.h.a.d;
-import c.i.a.f.e.h.j.a1;
 import c.i.a.f.e.h.j.c0;
 import c.i.a.f.e.h.j.g;
 import c.i.a.f.e.h.j.k;
+import c.i.a.f.e.h.j.m0;
 import c.i.a.f.e.h.j.n;
+import c.i.a.f.e.h.j.n0;
 import c.i.a.f.e.h.j.o0;
 import c.i.a.f.e.h.j.p;
-import c.i.a.f.e.h.j.p0;
-import c.i.a.f.e.h.j.q0;
 import c.i.a.f.e.h.j.y;
+import c.i.a.f.e.h.j.y0;
 import c.i.a.f.e.k.c;
 import c.i.a.f.e.o.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -87,7 +87,7 @@ public class b<O extends a.d> {
         this.h = aVar2.b;
         if (!(activity instanceof GoogleApiActivity)) {
             try {
-                a1.o(activity, a2, bVar);
+                y0.o(activity, a2, bVar);
             } catch (IllegalStateException | ConcurrentModificationException unused) {
             }
         }
@@ -95,6 +95,15 @@ public class b<O extends a.d> {
         handler.sendMessage(handler.obtainMessage(7, this));
     }
 
+    /* JADX WARNING: Illegal instructions before constructor call */
+    @Deprecated
+    public b(@NonNull Activity activity, a<O> aVar, O o, n nVar) {
+        this(activity, (a<a.d>) aVar, (a.d) null, new a(nVar, null, r5));
+        AnimatableValueParser.z(nVar, "StatusExceptionMapper must not be null.");
+        Looper mainLooper = activity.getMainLooper();
+        AnimatableValueParser.z(mainLooper, "Looper must not be null.");
+    }
+
     public b(@NonNull Context context, a<O> aVar, O o, a aVar2) {
         AnimatableValueParser.z(context, "Null context is not permitted.");
         AnimatableValueParser.z(aVar, "Api must not be null.");
@@ -187,7 +196,7 @@ public class b<O extends a.d> {
         }
         aVar.b.addAll(emptySet);
         aVar.d = this.a.getClass().getName();
-        aVar.f1051c = this.a.getPackageName();
+        aVar.f1050c = this.a.getPackageName();
         return aVar;
     }
 
@@ -196,9 +205,9 @@ public class b<O extends a.d> {
         g gVar = this.i;
         Objects.requireNonNull(gVar);
         TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
-        p0 p0Var = new p0(aVar, taskCompletionSource);
+        n0 n0Var = new n0(aVar, taskCompletionSource);
         Handler handler = gVar.w;
-        handler.sendMessage(handler.obtainMessage(13, new c0(p0Var, gVar.r.get(), this)));
+        handler.sendMessage(handler.obtainMessage(13, new c0(n0Var, gVar.r.get(), this)));
         return taskCompletionSource.a;
     }
 
@@ -207,9 +216,9 @@ public class b<O extends a.d> {
         g gVar = this.i;
         n nVar = this.h;
         Objects.requireNonNull(gVar);
-        q0 q0Var = new q0(1, pVar, taskCompletionSource, nVar);
+        o0 o0Var = new o0(1, pVar, taskCompletionSource, nVar);
         Handler handler = gVar.w;
-        handler.sendMessage(handler.obtainMessage(4, new c0(q0Var, gVar.r.get(), this)));
+        handler.sendMessage(handler.obtainMessage(4, new c0(o0Var, gVar.r.get(), this)));
         return taskCompletionSource.a;
     }
 
@@ -217,9 +226,9 @@ public class b<O extends a.d> {
         t.k = t.k || BasePendingResult.a.get().booleanValue();
         g gVar = this.i;
         Objects.requireNonNull(gVar);
-        o0 o0Var = new o0(i, t);
+        m0 m0Var = new m0(i, t);
         Handler handler = gVar.w;
-        handler.sendMessage(handler.obtainMessage(4, new c0(o0Var, gVar.r.get(), this)));
+        handler.sendMessage(handler.obtainMessage(4, new c0(m0Var, gVar.r.get(), this)));
         return t;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/a0.java b/app/src/main/java/c/i/a/f/e/h/j/a0.java
index b081f6f721..6c31b0b7de 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/a0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/a0.java
@@ -9,10 +9,10 @@ import androidx.annotation.Nullable;
 public final class a0 extends BroadcastReceiver {
     @Nullable
     public Context a;
-    public final u0 b;
+    public final s0 b;
 
-    public a0(u0 u0Var) {
-        this.b = u0Var;
+    public a0(s0 s0Var) {
+        this.b = s0Var;
     }
 
     public final synchronized void a() {
@@ -27,10 +27,10 @@ public final class a0 extends BroadcastReceiver {
     public final void onReceive(Context context, Intent intent) {
         Uri data = intent.getData();
         if ("com.google.android.gms".equals(data != null ? data.getSchemeSpecificPart() : null)) {
-            u0 u0Var = this.b;
-            u0Var.b.j.m();
-            if (u0Var.a.isShowing()) {
-                u0Var.a.dismiss();
+            s0 s0Var = this.b;
+            s0Var.b.j.m();
+            if (s0Var.a.isShowing()) {
+                s0Var.a.dismiss();
             }
             a();
         }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/a1.java b/app/src/main/java/c/i/a/f/e/h/j/a1.java
index 90c952aa1d..a35cbf9565 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/a1.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/a1.java
@@ -1,77 +1,38 @@
 package c.i.a.f.e.h.j;
 
-import android.app.Activity;
-import android.os.Handler;
-import androidx.collection.ArraySet;
-import com.airbnb.lottie.parser.AnimatableValueParser;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
+import android.os.Bundle;
 import com.google.android.gms.common.api.internal.LifecycleCallback;
-import java.util.Objects;
-/* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public class a1 extends t0 {
-    public final ArraySet<b<?>> n = new ArraySet<>();
-    public final g o;
+/* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
+public final class a1 implements Runnable {
+    public final /* synthetic */ LifecycleCallback i;
+    public final /* synthetic */ String j;
+    public final /* synthetic */ b1 k;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public a1(j jVar, g gVar) {
-        super(jVar, GoogleApiAvailability.d);
-        Object obj = GoogleApiAvailability.f2279c;
-        this.o = gVar;
-        jVar.a("ConnectionlessLifecycleHelper", this);
+    public a1(b1 b1Var, LifecycleCallback lifecycleCallback, String str) {
+        this.k = b1Var;
+        this.i = lifecycleCallback;
+        this.j = str;
     }
 
-    public static void o(Activity activity, g gVar, b<?> bVar) {
-        j c2 = LifecycleCallback.c(activity);
-        a1 a1Var = (a1) c2.d("ConnectionlessLifecycleHelper", a1.class);
-        if (a1Var == null) {
-            a1Var = new a1(c2, gVar);
+    @Override // java.lang.Runnable
+    public final void run() {
+        b1 b1Var = this.k;
+        if (b1Var.k > 0) {
+            LifecycleCallback lifecycleCallback = this.i;
+            Bundle bundle = b1Var.l;
+            lifecycleCallback.e(bundle != null ? bundle.getBundle(this.j) : null);
         }
-        AnimatableValueParser.z(bVar, "ApiKey cannot be null");
-        a1Var.n.add(bVar);
-        gVar.b(a1Var);
-    }
-
-    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
-    public void g() {
-        if (!this.n.isEmpty()) {
-            this.o.b(this);
+        if (this.k.k >= 2) {
+            this.i.i();
         }
-    }
-
-    @Override // c.i.a.f.e.h.j.t0, com.google.android.gms.common.api.internal.LifecycleCallback
-    public void i() {
-        this.j = true;
-        if (!this.n.isEmpty()) {
-            this.o.b(this);
+        if (this.k.k >= 3) {
+            this.i.g();
         }
-    }
-
-    @Override // c.i.a.f.e.h.j.t0, com.google.android.gms.common.api.internal.LifecycleCallback
-    public void j() {
-        this.j = false;
-        g gVar = this.o;
-        Objects.requireNonNull(gVar);
-        synchronized (g.k) {
-            if (gVar.t == this) {
-                gVar.t = null;
-                gVar.u.clear();
-            }
+        if (this.k.k >= 4) {
+            this.i.j();
         }
-    }
-
-    @Override // c.i.a.f.e.h.j.t0
-    public final void k() {
-        Handler handler = this.o.w;
-        handler.sendMessage(handler.obtainMessage(3));
-    }
-
-    @Override // c.i.a.f.e.h.j.t0
-    public final void l(ConnectionResult connectionResult, int i) {
-        g gVar = this.o;
-        if (!gVar.c(connectionResult, i)) {
-            Handler handler = gVar.w;
-            handler.sendMessage(handler.obtainMessage(5, i, 0, connectionResult));
+        if (this.k.k >= 5) {
+            this.i.f();
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/b0.java b/app/src/main/java/c/i/a/f/e/h/j/b0.java
index 86db9dab95..b2019e9be4 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/b0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/b0.java
@@ -10,13 +10,13 @@ import com.google.android.gms.common.api.Status;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import java.util.concurrent.CancellationException;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public class b0 extends t0 {
+public class b0 extends r0 {
     public TaskCompletionSource<Void> n = new TaskCompletionSource<>();
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public b0(j jVar) {
         super(jVar, GoogleApiAvailability.d);
-        Object obj = GoogleApiAvailability.f2279c;
+        Object obj = GoogleApiAvailability.f2285c;
         jVar.a("GmsAvailabilityHelper", this);
     }
 
@@ -25,7 +25,7 @@ public class b0 extends t0 {
         this.n.a(new CancellationException("Host activity was destroyed before Google Play services could be made available."));
     }
 
-    @Override // c.i.a.f.e.h.j.t0
+    @Override // c.i.a.f.e.h.j.r0
     public final void k() {
         Activity e = this.i.e();
         if (e == null) {
@@ -40,7 +40,7 @@ public class b0 extends t0 {
         }
     }
 
-    @Override // c.i.a.f.e.h.j.t0
+    @Override // c.i.a.f.e.h.j.r0
     public final void l(ConnectionResult connectionResult, int i) {
         TaskCompletionSource<Void> taskCompletionSource = this.n;
         taskCompletionSource.a.s(AnimatableValueParser.n0(new Status(connectionResult.k, connectionResult.m, connectionResult.l)));
diff --git a/app/src/main/java/c/i/a/f/e/h/j/b1.java b/app/src/main/java/c/i/a/f/e/h/j/b1.java
index 5f6cf09f09..adbad754a4 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/b1.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/b1.java
@@ -1,4 +1,125 @@
 package c.i.a.f.e.h.j;
-/* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class b1 {
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Looper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+import c.d.b.a.a;
+import c.i.a.f.h.g.d;
+import com.google.android.gms.common.api.internal.LifecycleCallback;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+/* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
+public final class b1 extends Fragment implements j {
+    public static WeakHashMap<Activity, WeakReference<b1>> i = new WeakHashMap<>();
+    public Map<String, LifecycleCallback> j = Collections.synchronizedMap(new ArrayMap());
+    public int k = 0;
+    @Nullable
+    public Bundle l;
+
+    @Override // c.i.a.f.e.h.j.j
+    public final void a(String str, @NonNull LifecycleCallback lifecycleCallback) {
+        if (!this.j.containsKey(str)) {
+            this.j.put(str, lifecycleCallback);
+            if (this.k > 0) {
+                new d(Looper.getMainLooper()).post(new a1(this, lifecycleCallback, str));
+                return;
+            }
+            return;
+        }
+        throw new IllegalArgumentException(a.g(str.length() + 59, "LifecycleCallback with tag ", str, " already added to this fragment."));
+    }
+
+    @Override // c.i.a.f.e.h.j.j
+    @Nullable
+    public final <T extends LifecycleCallback> T d(String str, Class<T> cls) {
+        return cls.cast(this.j.get(str));
+    }
+
+    @Override // android.app.Fragment
+    public final void dump(String str, @Nullable FileDescriptor fileDescriptor, PrintWriter printWriter, @Nullable String[] strArr) {
+        super.dump(str, fileDescriptor, printWriter, strArr);
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.a();
+        }
+    }
+
+    @Override // c.i.a.f.e.h.j.j
+    public final Activity e() {
+        return getActivity();
+    }
+
+    @Override // android.app.Fragment
+    public final void onActivityResult(int i2, int i3, @Nullable Intent intent) {
+        super.onActivityResult(i2, i3, intent);
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.d(i2, i3, intent);
+        }
+    }
+
+    @Override // android.app.Fragment
+    public final void onCreate(@Nullable Bundle bundle) {
+        super.onCreate(bundle);
+        this.k = 1;
+        this.l = bundle;
+        for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
+            entry.getValue().e(bundle != null ? bundle.getBundle(entry.getKey()) : null);
+        }
+    }
+
+    @Override // android.app.Fragment
+    public final void onDestroy() {
+        super.onDestroy();
+        this.k = 5;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.f();
+        }
+    }
+
+    @Override // android.app.Fragment
+    public final void onResume() {
+        super.onResume();
+        this.k = 3;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.g();
+        }
+    }
+
+    @Override // android.app.Fragment
+    public final void onSaveInstanceState(Bundle bundle) {
+        super.onSaveInstanceState(bundle);
+        if (bundle != null) {
+            for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
+                Bundle bundle2 = new Bundle();
+                entry.getValue().h(bundle2);
+                bundle.putBundle(entry.getKey(), bundle2);
+            }
+        }
+    }
+
+    @Override // android.app.Fragment
+    public final void onStart() {
+        super.onStart();
+        this.k = 2;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.i();
+        }
+    }
+
+    @Override // android.app.Fragment
+    public final void onStop() {
+        super.onStop();
+        this.k = 4;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.j();
+        }
+    }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/c1.java b/app/src/main/java/c/i/a/f/e/h/j/c1.java
index ef487f128d..2191a5c559 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/c1.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/c1.java
@@ -1,38 +1,126 @@
 package c.i.a.f.e.h.j;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Looper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import c.d.b.a.a;
+import c.i.a.f.h.g.d;
 import com.google.android.gms.common.api.internal.LifecycleCallback;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
-public final class c1 implements Runnable {
-    public final /* synthetic */ LifecycleCallback i;
-    public final /* synthetic */ String j;
-    public final /* synthetic */ d1 k;
+public final class c1 extends Fragment implements j {
+    public static WeakHashMap<FragmentActivity, WeakReference<c1>> i = new WeakHashMap<>();
+    public Map<String, LifecycleCallback> j = Collections.synchronizedMap(new ArrayMap());
+    public int k = 0;
+    @Nullable
+    public Bundle l;
 
-    public c1(d1 d1Var, LifecycleCallback lifecycleCallback, String str) {
-        this.k = d1Var;
-        this.i = lifecycleCallback;
-        this.j = str;
+    @Override // c.i.a.f.e.h.j.j
+    public final void a(String str, @NonNull LifecycleCallback lifecycleCallback) {
+        if (!this.j.containsKey(str)) {
+            this.j.put(str, lifecycleCallback);
+            if (this.k > 0) {
+                new d(Looper.getMainLooper()).post(new d1(this, lifecycleCallback, str));
+                return;
+            }
+            return;
+        }
+        throw new IllegalArgumentException(a.g(str.length() + 59, "LifecycleCallback with tag ", str, " already added to this fragment."));
     }
 
-    @Override // java.lang.Runnable
-    public final void run() {
-        d1 d1Var = this.k;
-        if (d1Var.k > 0) {
-            LifecycleCallback lifecycleCallback = this.i;
-            Bundle bundle = d1Var.l;
-            lifecycleCallback.e(bundle != null ? bundle.getBundle(this.j) : null);
+    @Override // c.i.a.f.e.h.j.j
+    @Nullable
+    public final <T extends LifecycleCallback> T d(String str, Class<T> cls) {
+        return cls.cast(this.j.get(str));
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void dump(String str, @Nullable FileDescriptor fileDescriptor, PrintWriter printWriter, @Nullable String[] strArr) {
+        super.dump(str, fileDescriptor, printWriter, strArr);
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.a();
         }
-        if (this.k.k >= 2) {
-            this.i.i();
+    }
+
+    @Override // c.i.a.f.e.h.j.j
+    public final /* synthetic */ Activity e() {
+        return getActivity();
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onActivityResult(int i2, int i3, @Nullable Intent intent) {
+        super.onActivityResult(i2, i3, intent);
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.d(i2, i3, intent);
         }
-        if (this.k.k >= 3) {
-            this.i.g();
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onCreate(@Nullable Bundle bundle) {
+        super.onCreate(bundle);
+        this.k = 1;
+        this.l = bundle;
+        for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
+            entry.getValue().e(bundle != null ? bundle.getBundle(entry.getKey()) : null);
         }
-        if (this.k.k >= 4) {
-            this.i.j();
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onDestroy() {
+        super.onDestroy();
+        this.k = 5;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.f();
         }
-        if (this.k.k >= 5) {
-            this.i.f();
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onResume() {
+        super.onResume();
+        this.k = 3;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.g();
+        }
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onSaveInstanceState(Bundle bundle) {
+        super.onSaveInstanceState(bundle);
+        if (bundle != null) {
+            for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
+                Bundle bundle2 = new Bundle();
+                entry.getValue().h(bundle2);
+                bundle.putBundle(entry.getKey(), bundle2);
+            }
+        }
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onStart() {
+        super.onStart();
+        this.k = 2;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.i();
+        }
+    }
+
+    @Override // androidx.fragment.app.Fragment
+    public final void onStop() {
+        super.onStop();
+        this.k = 4;
+        for (LifecycleCallback lifecycleCallback : this.j.values()) {
+            lifecycleCallback.j();
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/d1.java b/app/src/main/java/c/i/a/f/e/h/j/d1.java
index 418a66079a..c7e5e09f86 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/d1.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/d1.java
@@ -1,125 +1,38 @@
 package c.i.a.f.e.h.j;
 
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Intent;
 import android.os.Bundle;
-import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
-import c.d.b.a.a;
-import c.i.a.f.h.g.d;
 import com.google.android.gms.common.api.internal.LifecycleCallback;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.Map;
-import java.util.WeakHashMap;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
-public final class d1 extends Fragment implements j {
-    public static WeakHashMap<Activity, WeakReference<d1>> i = new WeakHashMap<>();
-    public Map<String, LifecycleCallback> j = Collections.synchronizedMap(new ArrayMap());
-    public int k = 0;
-    @Nullable
-    public Bundle l;
+public final class d1 implements Runnable {
+    public final /* synthetic */ LifecycleCallback i;
+    public final /* synthetic */ String j;
+    public final /* synthetic */ c1 k;
 
-    @Override // c.i.a.f.e.h.j.j
-    public final void a(String str, @NonNull LifecycleCallback lifecycleCallback) {
-        if (!this.j.containsKey(str)) {
-            this.j.put(str, lifecycleCallback);
-            if (this.k > 0) {
-                new d(Looper.getMainLooper()).post(new c1(this, lifecycleCallback, str));
-                return;
-            }
-            return;
+    public d1(c1 c1Var, LifecycleCallback lifecycleCallback, String str) {
+        this.k = c1Var;
+        this.i = lifecycleCallback;
+        this.j = str;
+    }
+
+    @Override // java.lang.Runnable
+    public final void run() {
+        c1 c1Var = this.k;
+        if (c1Var.k > 0) {
+            LifecycleCallback lifecycleCallback = this.i;
+            Bundle bundle = c1Var.l;
+            lifecycleCallback.e(bundle != null ? bundle.getBundle(this.j) : null);
         }
-        throw new IllegalArgumentException(a.g(str.length() + 59, "LifecycleCallback with tag ", str, " already added to this fragment."));
-    }
-
-    @Override // c.i.a.f.e.h.j.j
-    @Nullable
-    public final <T extends LifecycleCallback> T d(String str, Class<T> cls) {
-        return cls.cast(this.j.get(str));
-    }
-
-    @Override // android.app.Fragment
-    public final void dump(String str, @Nullable FileDescriptor fileDescriptor, PrintWriter printWriter, @Nullable String[] strArr) {
-        super.dump(str, fileDescriptor, printWriter, strArr);
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.a();
+        if (this.k.k >= 2) {
+            this.i.i();
         }
-    }
-
-    @Override // c.i.a.f.e.h.j.j
-    public final Activity e() {
-        return getActivity();
-    }
-
-    @Override // android.app.Fragment
-    public final void onActivityResult(int i2, int i3, @Nullable Intent intent) {
-        super.onActivityResult(i2, i3, intent);
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.d(i2, i3, intent);
+        if (this.k.k >= 3) {
+            this.i.g();
         }
-    }
-
-    @Override // android.app.Fragment
-    public final void onCreate(@Nullable Bundle bundle) {
-        super.onCreate(bundle);
-        this.k = 1;
-        this.l = bundle;
-        for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
-            entry.getValue().e(bundle != null ? bundle.getBundle(entry.getKey()) : null);
+        if (this.k.k >= 4) {
+            this.i.j();
         }
-    }
-
-    @Override // android.app.Fragment
-    public final void onDestroy() {
-        super.onDestroy();
-        this.k = 5;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.f();
-        }
-    }
-
-    @Override // android.app.Fragment
-    public final void onResume() {
-        super.onResume();
-        this.k = 3;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.g();
-        }
-    }
-
-    @Override // android.app.Fragment
-    public final void onSaveInstanceState(Bundle bundle) {
-        super.onSaveInstanceState(bundle);
-        if (bundle != null) {
-            for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
-                Bundle bundle2 = new Bundle();
-                entry.getValue().h(bundle2);
-                bundle.putBundle(entry.getKey(), bundle2);
-            }
-        }
-    }
-
-    @Override // android.app.Fragment
-    public final void onStart() {
-        super.onStart();
-        this.k = 2;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.i();
-        }
-    }
-
-    @Override // android.app.Fragment
-    public final void onStop() {
-        super.onStop();
-        this.k = 4;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.j();
+        if (this.k.k >= 5) {
+            this.i.f();
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/e0.java b/app/src/main/java/c/i/a/f/e/h/j/e0.java
index 411114b9d3..3efc379922 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/e0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/e0.java
@@ -8,7 +8,7 @@ import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.tasks.TaskCompletionSource;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public abstract class e0<T> extends m0 {
+public abstract class e0<T> extends k0 {
     public final TaskCompletionSource<T> b;
 
     public e0(int i, TaskCompletionSource<T> taskCompletionSource) {
diff --git a/app/src/main/java/c/i/a/f/e/h/j/e1.java b/app/src/main/java/c/i/a/f/e/h/j/e1.java
deleted file mode 100644
index bef431f4f0..0000000000
--- a/app/src/main/java/c/i/a/f/e/h/j/e1.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package c.i.a.f.e.h.j;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import c.d.b.a.a;
-import c.i.a.f.h.g.d;
-import com.google.android.gms.common.api.internal.LifecycleCallback;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.Map;
-import java.util.WeakHashMap;
-/* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
-public final class e1 extends Fragment implements j {
-    public static WeakHashMap<FragmentActivity, WeakReference<e1>> i = new WeakHashMap<>();
-    public Map<String, LifecycleCallback> j = Collections.synchronizedMap(new ArrayMap());
-    public int k = 0;
-    @Nullable
-    public Bundle l;
-
-    @Override // c.i.a.f.e.h.j.j
-    public final void a(String str, @NonNull LifecycleCallback lifecycleCallback) {
-        if (!this.j.containsKey(str)) {
-            this.j.put(str, lifecycleCallback);
-            if (this.k > 0) {
-                new d(Looper.getMainLooper()).post(new f1(this, lifecycleCallback, str));
-                return;
-            }
-            return;
-        }
-        throw new IllegalArgumentException(a.g(str.length() + 59, "LifecycleCallback with tag ", str, " already added to this fragment."));
-    }
-
-    @Override // c.i.a.f.e.h.j.j
-    @Nullable
-    public final <T extends LifecycleCallback> T d(String str, Class<T> cls) {
-        return cls.cast(this.j.get(str));
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void dump(String str, @Nullable FileDescriptor fileDescriptor, PrintWriter printWriter, @Nullable String[] strArr) {
-        super.dump(str, fileDescriptor, printWriter, strArr);
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.a();
-        }
-    }
-
-    @Override // c.i.a.f.e.h.j.j
-    public final /* synthetic */ Activity e() {
-        return getActivity();
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onActivityResult(int i2, int i3, @Nullable Intent intent) {
-        super.onActivityResult(i2, i3, intent);
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.d(i2, i3, intent);
-        }
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onCreate(@Nullable Bundle bundle) {
-        super.onCreate(bundle);
-        this.k = 1;
-        this.l = bundle;
-        for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
-            entry.getValue().e(bundle != null ? bundle.getBundle(entry.getKey()) : null);
-        }
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onDestroy() {
-        super.onDestroy();
-        this.k = 5;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.f();
-        }
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onResume() {
-        super.onResume();
-        this.k = 3;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.g();
-        }
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onSaveInstanceState(Bundle bundle) {
-        super.onSaveInstanceState(bundle);
-        if (bundle != null) {
-            for (Map.Entry<String, LifecycleCallback> entry : this.j.entrySet()) {
-                Bundle bundle2 = new Bundle();
-                entry.getValue().h(bundle2);
-                bundle.putBundle(entry.getKey(), bundle2);
-            }
-        }
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onStart() {
-        super.onStart();
-        this.k = 2;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.i();
-        }
-    }
-
-    @Override // androidx.fragment.app.Fragment
-    public final void onStop() {
-        super.onStop();
-        this.k = 4;
-        for (LifecycleCallback lifecycleCallback : this.j.values()) {
-            lifecycleCallback.j();
-        }
-    }
-}
diff --git a/app/src/main/java/c/i/a/f/e/h/j/f1.java b/app/src/main/java/c/i/a/f/e/h/j/f1.java
deleted file mode 100644
index d43e324324..0000000000
--- a/app/src/main/java/c/i/a/f/e/h/j/f1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package c.i.a.f.e.h.j;
-
-import android.os.Bundle;
-import com.google.android.gms.common.api.internal.LifecycleCallback;
-/* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
-public final class f1 implements Runnable {
-    public final /* synthetic */ LifecycleCallback i;
-    public final /* synthetic */ String j;
-    public final /* synthetic */ e1 k;
-
-    public f1(e1 e1Var, LifecycleCallback lifecycleCallback, String str) {
-        this.k = e1Var;
-        this.i = lifecycleCallback;
-        this.j = str;
-    }
-
-    @Override // java.lang.Runnable
-    public final void run() {
-        e1 e1Var = this.k;
-        if (e1Var.k > 0) {
-            LifecycleCallback lifecycleCallback = this.i;
-            Bundle bundle = e1Var.l;
-            lifecycleCallback.e(bundle != null ? bundle.getBundle(this.j) : null);
-        }
-        if (this.k.k >= 2) {
-            this.i.i();
-        }
-        if (this.k.k >= 3) {
-            this.i.g();
-        }
-        if (this.k.k >= 4) {
-            this.i.j();
-        }
-        if (this.k.k >= 5) {
-            this.i.f();
-        }
-    }
-}
diff --git a/app/src/main/java/c/i/a/f/e/h/j/g.java b/app/src/main/java/c/i/a/f/e/h/j/g.java
index 182c20ebd9..5d0fc12bda 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/g.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/g.java
@@ -69,7 +69,7 @@ public class g implements Handler.Callback {
     /* renamed from: s  reason: collision with root package name */
     public final Map<b<?>, a<?>> f1036s;
     @Nullable
-    public a1 t;
+    public y0 t;
     public final Set<b<?>> u;
     public final Set<b<?>> v;
     @NotOnlyInitialized
@@ -87,8 +87,8 @@ public class g implements Handler.Callback {
         /* renamed from: c  reason: collision with root package name */
         public final a.b f1038c;
         public final b<O> d;
-        public final x0 e;
-        public final Set<r0> f = new HashSet();
+        public final v0 e;
+        public final Set<p0> f = new HashSet();
         public final Map<k.a<?>, d0> g = new HashMap();
         public final int h;
         @Nullable
@@ -111,7 +111,7 @@ public class g implements Handler.Callback {
             if (!(a2 instanceof z)) {
                 this.f1038c = a2;
                 this.d = bVar.d;
-                this.e = new x0();
+                this.e = new v0();
                 this.h = bVar.f;
                 if (a2.o()) {
                     this.i = new g0(g.this.n, g.this.w, bVar.a().a());
@@ -151,11 +151,11 @@ public class g implements Handler.Callback {
             AnimatableValueParser.s(g.this.w);
             Status status = g.i;
             f(status);
-            x0 x0Var = this.e;
-            Objects.requireNonNull(x0Var);
-            x0Var.a(false, status);
+            v0 v0Var = this.e;
+            Objects.requireNonNull(v0Var);
+            v0Var.a(false, status);
             for (k.a aVar : (k.a[]) this.g.keySet().toArray(new k.a[0])) {
-                j(new p0(aVar, new TaskCompletionSource()));
+                j(new n0(aVar, new TaskCompletionSource()));
             }
             n(new ConnectionResult(4));
             if (this.b.j()) {
@@ -167,9 +167,9 @@ public class g implements Handler.Callback {
         public final void c(int i) {
             q();
             this.j = true;
-            x0 x0Var = this.e;
+            v0 v0Var = this.e;
             String n = this.b.n();
-            Objects.requireNonNull(x0Var);
+            Objects.requireNonNull(v0Var);
             StringBuilder sb = new StringBuilder("The connection to Google Play services was lost");
             if (i == 1) {
                 sb.append(" due to service disconnection.");
@@ -180,7 +180,7 @@ public class g implements Handler.Callback {
                 sb.append(" Last reason for disconnect: ");
                 sb.append(n);
             }
-            x0Var.a(true, new Status(20, sb.toString()));
+            v0Var.a(true, new Status(20, sb.toString()));
             Handler handler = g.this.w;
             Message obtain = Message.obtain(handler, 9, this.d);
             Objects.requireNonNull(g.this);
@@ -317,8 +317,8 @@ public class g implements Handler.Callback {
             if (!this.b.j() || this.g.size() != 0) {
                 return false;
             }
-            x0 x0Var = this.e;
-            if (!x0Var.a.isEmpty() || !x0Var.b.isEmpty()) {
+            v0 v0Var = this.e;
+            if (!v0Var.a.isEmpty() || !v0Var.b.isEmpty()) {
                 if (z2) {
                     w();
                 }
@@ -342,12 +342,12 @@ public class g implements Handler.Callback {
 
         @WorkerThread
         public final boolean m(s sVar) {
-            if (!(sVar instanceof m0)) {
+            if (!(sVar instanceof k0)) {
                 o(sVar);
                 return true;
             }
-            m0 m0Var = (m0) sVar;
-            Feature a = a(m0Var.f(this));
+            k0 k0Var = (k0) sVar;
+            Feature a = a(k0Var.f(this));
             if (a == null) {
                 o(sVar);
                 return true;
@@ -359,8 +359,8 @@ public class g implements Handler.Callback {
             K.append(v0);
             K.append(").");
             Log.w("GoogleApiManager", K.toString());
-            if (!g.this.f1037x || !m0Var.g(this)) {
-                m0Var.e(new UnsupportedApiCallException(a));
+            if (!g.this.f1037x || !k0Var.g(this)) {
+                k0Var.e(new UnsupportedApiCallException(a));
                 return true;
             }
             c cVar = new c(this.d, a, null);
@@ -393,9 +393,9 @@ public class g implements Handler.Callback {
 
         @WorkerThread
         public final void n(ConnectionResult connectionResult) {
-            Iterator<r0> it = this.f.iterator();
+            Iterator<p0> it = this.f.iterator();
             if (it.hasNext()) {
-                r0 next = it.next();
+                p0 next = it.next();
                 if (AnimatableValueParser.j0(connectionResult, ConnectionResult.i)) {
                     this.b.f();
                 }
@@ -507,7 +507,7 @@ public class g implements Handler.Callback {
                         TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
                         v vVar = (v) mVar;
                         Objects.requireNonNull(vVar);
-                        vVar.b.a((c.i.a.f.j.b.e.f) bVar, i.j(vVar.f1212c, taskCompletionSource));
+                        vVar.b.a((c.i.a.f.j.b.e.f) bVar, i.j(vVar.f1210c, taskCompletionSource));
                     } catch (DeadObjectException unused) {
                         e(3);
                         this.b.c("DeadObjectException thrown while calling register listener method.");
@@ -654,7 +654,7 @@ public class g implements Handler.Callback {
                 handlerThread.start();
                 Looper looper = handlerThread.getLooper();
                 Context applicationContext = context.getApplicationContext();
-                Object obj = GoogleApiAvailability.f2279c;
+                Object obj = GoogleApiAvailability.f2285c;
                 l = new g(applicationContext, looper, GoogleApiAvailability.d);
             }
             gVar = l;
@@ -662,13 +662,13 @@ public class g implements Handler.Callback {
         return gVar;
     }
 
-    public final void b(@NonNull a1 a1Var) {
+    public final void b(@NonNull y0 y0Var) {
         synchronized (k) {
-            if (this.t != a1Var) {
-                this.t = a1Var;
+            if (this.t != y0Var) {
+                this.t = y0Var;
                 this.u.clear();
             }
-            this.u.addAll(a1Var.n);
+            this.u.addAll(y0Var.n);
         }
     }
 
@@ -732,7 +732,7 @@ public class g implements Handler.Callback {
                 }
                 break;
             case 2:
-                Objects.requireNonNull((r0) message.obj);
+                Objects.requireNonNull((p0) message.obj);
                 throw null;
             case 3:
                 for (a<?> aVar2 : this.f1036s.values()) {
@@ -854,7 +854,7 @@ public class g implements Handler.Callback {
                 }
                 break;
             case 14:
-                Objects.requireNonNull((b1) message.obj);
+                Objects.requireNonNull((z0) message.obj);
                 if (!this.f1036s.containsKey(null)) {
                     throw null;
                 }
@@ -885,7 +885,7 @@ public class g implements Handler.Callback {
                         Feature feature = cVar3.b;
                         ArrayList arrayList = new ArrayList(aVar7.a.size());
                         for (s sVar : aVar7.a) {
-                            if ((sVar instanceof m0) && (f = ((m0) sVar).f(aVar7)) != null) {
+                            if ((sVar instanceof k0) && (f = ((k0) sVar).f(aVar7)) != null) {
                                 int length = f.length;
                                 int i6 = 0;
                                 while (true) {
diff --git a/app/src/main/java/c/i/a/f/e/h/j/g0.java b/app/src/main/java/c/i/a/f/e/h/j/g0.java
index fbaebaaee0..8dcd7adb80 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/g0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/g0.java
@@ -17,7 +17,7 @@ import com.google.android.gms.common.api.Scope;
 import java.util.Set;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
 public final class g0 extends d implements c.a, c.b {
-    public static a.AbstractC0100a<? extends f, c.i.a.f.l.a> a = c.i.a.f.l.c.f1216c;
+    public static a.AbstractC0100a<? extends f, c.i.a.f.l.a> a = c.i.a.f.l.c.f1213c;
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
diff --git a/app/src/main/java/c/i/a/f/e/h/j/h.java b/app/src/main/java/c/i/a/f/e/h/j/h.java
index 377339f499..341aebe313 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/h.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/h.java
@@ -31,7 +31,7 @@ public final class h {
             this.e = false;
         }
         q0.a(context);
-        String str = q0.f1057c;
+        String str = q0.f1056c;
         if (str == null) {
             Resources resources2 = context.getResources();
             int identifier2 = resources2.getIdentifier("google_app_id", "string", resources2.getResourcePackageName(i));
diff --git a/app/src/main/java/c/i/a/f/e/h/j/j0.java b/app/src/main/java/c/i/a/f/e/h/j/j0.java
new file mode 100644
index 0000000000..e15fb37513
--- /dev/null
+++ b/app/src/main/java/c/i/a/f/e/h/j/j0.java
@@ -0,0 +1,7 @@
+package c.i.a.f.e.h.j;
+
+import com.google.android.gms.common.api.internal.BasePendingResult;
+/* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
+public interface j0 {
+    void a(BasePendingResult<?> basePendingResult);
+}
diff --git a/app/src/main/java/c/i/a/f/e/h/j/k0.java b/app/src/main/java/c/i/a/f/e/h/j/k0.java
index 029256939e..d50f1ffde9 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/k0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/k0.java
@@ -1,26 +1,16 @@
 package c.i.a.f.e.h.j;
 
-import android.os.RemoteException;
-import c.i.a.f.e.h.j.p;
-import c.i.a.f.h.b.k;
+import androidx.annotation.Nullable;
+import c.i.a.f.e.h.j.g;
 import com.google.android.gms.common.Feature;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class k0 extends p<A, ResultT> {
-
-    /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ p.a f1043c;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public k0(p.a aVar, Feature[] featureArr, boolean z2) {
-        super(featureArr, z2, null);
-        this.f1043c = aVar;
+public abstract class k0 extends s {
+    public k0(int i) {
+        super(i);
     }
 
-    @Override // c.i.a.f.e.h.j.p
-    public final void c(A a, TaskCompletionSource<ResultT> taskCompletionSource) throws RemoteException {
-        Objects.requireNonNull(this.f1043c.a);
-        a.w().W(new k(taskCompletionSource));
-    }
+    @Nullable
+    public abstract Feature[] f(g.a<?> aVar);
+
+    public abstract boolean g(g.a<?> aVar);
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/l0.java b/app/src/main/java/c/i/a/f/e/h/j/l0.java
index 69fddaa863..a161c9e1ae 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/l0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/l0.java
@@ -1,7 +1,56 @@
 package c.i.a.f.e.h.j;
 
-import com.google.android.gms.common.api.internal.BasePendingResult;
+import android.os.RemoteException;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import c.i.a.f.e.h.a;
+import c.i.a.f.e.h.j.g;
+import c.i.a.f.e.h.j.k;
+import c.i.a.f.j.b.e.f;
+import c.i.a.f.j.b.e.i;
+import c.i.a.f.j.b.e.v;
+import com.google.android.gms.common.Feature;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public interface l0 {
-    void a(BasePendingResult<?> basePendingResult);
+public final class l0 extends e0<Void> {
+
+    /* renamed from: c  reason: collision with root package name */
+    public final d0 f1043c;
+
+    public l0(d0 d0Var, TaskCompletionSource<Void> taskCompletionSource) {
+        super(3, taskCompletionSource);
+        this.f1043c = d0Var;
+    }
+
+    @Override // c.i.a.f.e.h.j.s
+    public final /* bridge */ /* synthetic */ void d(@NonNull v0 v0Var, boolean z2) {
+    }
+
+    @Override // c.i.a.f.e.h.j.k0
+    @Nullable
+    public final Feature[] f(g.a<?> aVar) {
+        Objects.requireNonNull(this.f1043c.a);
+        return null;
+    }
+
+    @Override // c.i.a.f.e.h.j.k0
+    public final boolean g(g.a<?> aVar) {
+        Objects.requireNonNull(this.f1043c.a);
+        return false;
+    }
+
+    @Override // c.i.a.f.e.h.j.e0
+    public final void h(g.a<?> aVar) throws RemoteException {
+        m<a.b, ?> mVar = this.f1043c.a;
+        a.f fVar = aVar.b;
+        TaskCompletionSource<T> taskCompletionSource = this.b;
+        v vVar = (v) mVar;
+        Objects.requireNonNull(vVar);
+        vVar.b.a((f) fVar, i.j(vVar.f1210c, taskCompletionSource));
+        k.a<?> aVar2 = this.f1043c.a.a.f1042c;
+        if (aVar2 != null) {
+            aVar.g.put(aVar2, this.f1043c);
+        }
+    }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/m0.java b/app/src/main/java/c/i/a/f/e/h/j/m0.java
index 91619d48e9..98d6abfce9 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/m0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/m0.java
@@ -1,16 +1,48 @@
 package c.i.a.f.e.h.j;
 
-import androidx.annotation.Nullable;
+import android.os.DeadObjectException;
+import androidx.annotation.NonNull;
+import c.i.a.f.e.h.a;
+import c.i.a.f.e.h.h;
+import c.i.a.f.e.h.j.d;
 import c.i.a.f.e.h.j.g;
-import com.google.android.gms.common.Feature;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.google.android.gms.common.api.Status;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public abstract class m0 extends s {
-    public m0(int i) {
+public final class m0<A extends d<? extends h, a.b>> extends s {
+    public final A b;
+
+    public m0(int i, A a) {
         super(i);
+        AnimatableValueParser.z(a, "Null methods are not runnable.");
+        this.b = a;
     }
 
-    @Nullable
-    public abstract Feature[] f(g.a<?> aVar);
+    @Override // c.i.a.f.e.h.j.s
+    public final void b(@NonNull Status status) {
+        this.b.a(status);
+    }
 
-    public abstract boolean g(g.a<?> aVar);
+    @Override // c.i.a.f.e.h.j.s
+    public final void c(g.a<?> aVar) throws DeadObjectException {
+        try {
+            this.b.l(aVar.b);
+        } catch (RuntimeException e) {
+            e(e);
+        }
+    }
+
+    @Override // c.i.a.f.e.h.j.s
+    public final void d(@NonNull v0 v0Var, boolean z2) {
+        A a = this.b;
+        v0Var.a.put(a, Boolean.valueOf(z2));
+        a.c(new x0(v0Var, a));
+    }
+
+    @Override // c.i.a.f.e.h.j.s
+    public final void e(@NonNull Exception exc) {
+        String simpleName = exc.getClass().getSimpleName();
+        String localizedMessage = exc.getLocalizedMessage();
+        this.b.a(new Status(10, c.d.b.a.a.g(c.d.b.a.a.m(localizedMessage, simpleName.length() + 2), simpleName, ": ", localizedMessage)));
+    }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/n0.java b/app/src/main/java/c/i/a/f/e/h/j/n0.java
index 7b9a021087..dac128d45e 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/n0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/n0.java
@@ -8,49 +8,61 @@ import c.i.a.f.e.h.j.g;
 import c.i.a.f.e.h.j.k;
 import c.i.a.f.j.b.e.f;
 import c.i.a.f.j.b.e.i;
-import c.i.a.f.j.b.e.v;
+import c.i.a.f.j.b.e.x;
 import com.google.android.gms.common.Feature;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class n0 extends e0<Void> {
+public final class n0 extends e0<Boolean> {
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0 f1044c;
+    public final k.a<?> f1044c;
 
-    public n0(d0 d0Var, TaskCompletionSource<Void> taskCompletionSource) {
-        super(3, taskCompletionSource);
-        this.f1044c = d0Var;
+    public n0(k.a<?> aVar, TaskCompletionSource<Boolean> taskCompletionSource) {
+        super(4, taskCompletionSource);
+        this.f1044c = aVar;
     }
 
     @Override // c.i.a.f.e.h.j.s
-    public final /* bridge */ /* synthetic */ void d(@NonNull x0 x0Var, boolean z2) {
+    public final /* bridge */ /* synthetic */ void d(@NonNull v0 v0Var, boolean z2) {
     }
 
-    @Override // c.i.a.f.e.h.j.m0
+    @Override // c.i.a.f.e.h.j.k0
     @Nullable
     public final Feature[] f(g.a<?> aVar) {
-        Objects.requireNonNull(this.f1044c.a);
+        d0 d0Var = aVar.g.get(this.f1044c);
+        if (d0Var == null) {
+            return null;
+        }
+        Objects.requireNonNull(d0Var.a);
         return null;
     }
 
-    @Override // c.i.a.f.e.h.j.m0
+    @Override // c.i.a.f.e.h.j.k0
     public final boolean g(g.a<?> aVar) {
-        Objects.requireNonNull(this.f1044c.a);
+        d0 d0Var = aVar.g.get(this.f1044c);
+        if (d0Var == null) {
+            return false;
+        }
+        Objects.requireNonNull(d0Var.a);
         return false;
     }
 
     @Override // c.i.a.f.e.h.j.e0
     public final void h(g.a<?> aVar) throws RemoteException {
-        m<a.b, ?> mVar = this.f1044c.a;
-        a.f fVar = aVar.b;
-        TaskCompletionSource<T> taskCompletionSource = this.b;
-        v vVar = (v) mVar;
-        Objects.requireNonNull(vVar);
-        vVar.b.a((f) fVar, i.j(vVar.f1212c, taskCompletionSource));
-        k.a<?> aVar2 = this.f1044c.a.a.f1042c;
-        if (aVar2 != null) {
-            aVar.g.put(aVar2, this.f1044c);
+        d0 remove = aVar.g.remove(this.f1044c);
+        if (remove != null) {
+            q<a.b, ?> qVar = remove.b;
+            a.f fVar = aVar.b;
+            TaskCompletionSource<T> taskCompletionSource = this.b;
+            x xVar = (x) qVar;
+            Objects.requireNonNull(xVar);
+            xVar.b.a((f) fVar, i.j(xVar.f1211c, taskCompletionSource));
+            k<?> kVar = remove.a.a;
+            kVar.b = null;
+            kVar.f1042c = null;
+            return;
         }
+        this.b.b(Boolean.FALSE);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/o0.java b/app/src/main/java/c/i/a/f/e/h/j/o0.java
index 904bba6309..ee4d67175e 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/o0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/o0.java
@@ -1,48 +1,77 @@
 package c.i.a.f.e.h.j;
 
 import android.os.DeadObjectException;
+import android.os.RemoteException;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import c.i.a.f.e.h.a;
-import c.i.a.f.e.h.h;
-import c.i.a.f.e.h.j.d;
 import c.i.a.f.e.h.j.g;
-import com.airbnb.lottie.parser.AnimatableValueParser;
+import c.i.a.f.n.b0;
+import com.google.android.gms.common.Feature;
 import com.google.android.gms.common.api.Status;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class o0<A extends d<? extends h, a.b>> extends s {
-    public final A b;
+public final class o0<ResultT> extends k0 {
+    public final p<a.b, ResultT> b;
 
-    public o0(int i, A a) {
+    /* renamed from: c  reason: collision with root package name */
+    public final TaskCompletionSource<ResultT> f1045c;
+    public final n d;
+
+    public o0(int i, p<a.b, ResultT> pVar, TaskCompletionSource<ResultT> taskCompletionSource, n nVar) {
         super(i);
-        AnimatableValueParser.z(a, "Null methods are not runnable.");
-        this.b = a;
+        this.f1045c = taskCompletionSource;
+        this.b = pVar;
+        this.d = nVar;
+        if (i == 2) {
+            Objects.requireNonNull(pVar);
+        }
     }
 
     @Override // c.i.a.f.e.h.j.s
     public final void b(@NonNull Status status) {
-        this.b.a(status);
+        this.f1045c.a(this.d.a(status));
     }
 
     @Override // c.i.a.f.e.h.j.s
     public final void c(g.a<?> aVar) throws DeadObjectException {
         try {
-            this.b.l(aVar.b);
-        } catch (RuntimeException e) {
-            e(e);
+            this.b.c(aVar.b, this.f1045c);
+        } catch (DeadObjectException e) {
+            throw e;
+        } catch (RemoteException e2) {
+            this.f1045c.a(this.d.a(s.a(e2)));
+        } catch (RuntimeException e3) {
+            this.f1045c.a(e3);
         }
     }
 
     @Override // c.i.a.f.e.h.j.s
-    public final void d(@NonNull x0 x0Var, boolean z2) {
-        A a = this.b;
-        x0Var.a.put(a, Boolean.valueOf(z2));
-        a.c(new z0(x0Var, a));
+    public final void d(@NonNull v0 v0Var, boolean z2) {
+        TaskCompletionSource<ResultT> taskCompletionSource = this.f1045c;
+        v0Var.b.put(taskCompletionSource, Boolean.valueOf(z2));
+        b0<ResultT> b0Var = taskCompletionSource.a;
+        w0 w0Var = new w0(v0Var, taskCompletionSource);
+        Objects.requireNonNull(b0Var);
+        b0Var.c(c.i.a.f.n.g.a, w0Var);
     }
 
     @Override // c.i.a.f.e.h.j.s
     public final void e(@NonNull Exception exc) {
-        String simpleName = exc.getClass().getSimpleName();
-        String localizedMessage = exc.getLocalizedMessage();
-        this.b.a(new Status(10, c.d.b.a.a.g(c.d.b.a.a.m(localizedMessage, simpleName.length() + 2), simpleName, ": ", localizedMessage)));
+        this.f1045c.a(exc);
+    }
+
+    @Override // c.i.a.f.e.h.j.k0
+    @Nullable
+    public final Feature[] f(g.a<?> aVar) {
+        Objects.requireNonNull(this.b);
+        return null;
+    }
+
+    @Override // c.i.a.f.e.h.j.k0
+    public final boolean g(g.a<?> aVar) {
+        Objects.requireNonNull(this.b);
+        return false;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/p.java b/app/src/main/java/c/i/a/f/e/h/j/p.java
index 40ac5a684e..812582548c 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/p.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/p.java
@@ -1,37 +1,10 @@
 package c.i.a.f.e.h.j;
 
 import android.os.RemoteException;
-import androidx.annotation.Nullable;
 import c.i.a.f.e.h.a;
 import c.i.a.f.e.h.a.b;
-import c.i.a.f.h.b.j;
-import com.google.android.gms.common.Feature;
 import com.google.android.gms.tasks.TaskCompletionSource;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
 public abstract class p<A extends a.b, ResultT> {
-    @Nullable
-    public final Feature[] a;
-    public final boolean b;
-
-    /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-    public static class a<A extends a.b, ResultT> {
-        public j<A, TaskCompletionSource<ResultT>> a;
-        public Feature[] b;
-
-        public a(j0 j0Var) {
-        }
-    }
-
-    @Deprecated
-    public p() {
-        this.a = null;
-        this.b = false;
-    }
-
-    public p(Feature[] featureArr, boolean z2, j0 j0Var) {
-        this.a = featureArr;
-        this.b = z2;
-    }
-
-    public abstract void c(A a2, TaskCompletionSource<ResultT> taskCompletionSource) throws RemoteException;
+    public abstract void c(A a, TaskCompletionSource<ResultT> taskCompletionSource) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/p0.java b/app/src/main/java/c/i/a/f/e/h/j/p0.java
index 21885fc6ea..4ccd779265 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/p0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/p0.java
@@ -1,68 +1,4 @@
 package c.i.a.f.e.h.j;
-
-import android.os.RemoteException;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import c.i.a.f.e.h.a;
-import c.i.a.f.e.h.j.g;
-import c.i.a.f.e.h.j.k;
-import c.i.a.f.j.b.e.f;
-import c.i.a.f.j.b.e.i;
-import c.i.a.f.j.b.e.x;
-import com.google.android.gms.common.Feature;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class p0 extends e0<Boolean> {
-
-    /* renamed from: c  reason: collision with root package name */
-    public final k.a<?> f1045c;
-
-    public p0(k.a<?> aVar, TaskCompletionSource<Boolean> taskCompletionSource) {
-        super(4, taskCompletionSource);
-        this.f1045c = aVar;
-    }
-
-    @Override // c.i.a.f.e.h.j.s
-    public final /* bridge */ /* synthetic */ void d(@NonNull x0 x0Var, boolean z2) {
-    }
-
-    @Override // c.i.a.f.e.h.j.m0
-    @Nullable
-    public final Feature[] f(g.a<?> aVar) {
-        d0 d0Var = aVar.g.get(this.f1045c);
-        if (d0Var == null) {
-            return null;
-        }
-        Objects.requireNonNull(d0Var.a);
-        return null;
-    }
-
-    @Override // c.i.a.f.e.h.j.m0
-    public final boolean g(g.a<?> aVar) {
-        d0 d0Var = aVar.g.get(this.f1045c);
-        if (d0Var == null) {
-            return false;
-        }
-        Objects.requireNonNull(d0Var.a);
-        return false;
-    }
-
-    @Override // c.i.a.f.e.h.j.e0
-    public final void h(g.a<?> aVar) throws RemoteException {
-        d0 remove = aVar.g.remove(this.f1045c);
-        if (remove != null) {
-            q<a.b, ?> qVar = remove.b;
-            a.f fVar = aVar.b;
-            TaskCompletionSource<T> taskCompletionSource = this.b;
-            x xVar = (x) qVar;
-            Objects.requireNonNull(xVar);
-            xVar.b.a((f) fVar, i.j(xVar.f1213c, taskCompletionSource));
-            k<?> kVar = remove.a.a;
-            kVar.b = null;
-            kVar.f1042c = null;
-            return;
-        }
-        this.b.b(Boolean.FALSE);
-    }
+public final class p0 {
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/q0.java b/app/src/main/java/c/i/a/f/e/h/j/q0.java
index f48341e889..aac40375a1 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/q0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/q0.java
@@ -1,75 +1,15 @@
 package c.i.a.f.e.h.j;
 
-import android.os.DeadObjectException;
-import android.os.RemoteException;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import c.i.a.f.e.h.a;
-import c.i.a.f.e.h.j.g;
-import c.i.a.f.n.b0;
-import com.google.android.gms.common.Feature;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.tasks.TaskCompletionSource;
+import com.google.android.gms.common.ConnectionResult;
 import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class q0<ResultT> extends m0 {
-    public final p<a.b, ResultT> b;
+public final class q0 {
+    public final int a;
+    public final ConnectionResult b;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final TaskCompletionSource<ResultT> f1046c;
-    public final n d;
-
-    public q0(int i, p<a.b, ResultT> pVar, TaskCompletionSource<ResultT> taskCompletionSource, n nVar) {
-        super(i);
-        this.f1046c = taskCompletionSource;
-        this.b = pVar;
-        this.d = nVar;
-        if (i == 2 && pVar.b) {
-            throw new IllegalArgumentException("Best-effort write calls cannot pass methods that should auto-resolve missing features.");
-        }
-    }
-
-    @Override // c.i.a.f.e.h.j.s
-    public final void b(@NonNull Status status) {
-        this.f1046c.a(this.d.a(status));
-    }
-
-    @Override // c.i.a.f.e.h.j.s
-    public final void c(g.a<?> aVar) throws DeadObjectException {
-        try {
-            this.b.c(aVar.b, this.f1046c);
-        } catch (DeadObjectException e) {
-            throw e;
-        } catch (RemoteException e2) {
-            this.f1046c.a(this.d.a(s.a(e2)));
-        } catch (RuntimeException e3) {
-            this.f1046c.a(e3);
-        }
-    }
-
-    @Override // c.i.a.f.e.h.j.s
-    public final void d(@NonNull x0 x0Var, boolean z2) {
-        TaskCompletionSource<ResultT> taskCompletionSource = this.f1046c;
-        x0Var.b.put(taskCompletionSource, Boolean.valueOf(z2));
-        b0<ResultT> b0Var = taskCompletionSource.a;
-        y0 y0Var = new y0(x0Var, taskCompletionSource);
-        Objects.requireNonNull(b0Var);
-        b0Var.c(c.i.a.f.n.g.a, y0Var);
-    }
-
-    @Override // c.i.a.f.e.h.j.s
-    public final void e(@NonNull Exception exc) {
-        this.f1046c.a(exc);
-    }
-
-    @Override // c.i.a.f.e.h.j.m0
-    @Nullable
-    public final Feature[] f(g.a<?> aVar) {
-        return this.b.a;
-    }
-
-    @Override // c.i.a.f.e.h.j.m0
-    public final boolean g(g.a<?> aVar) {
-        return this.b.b;
+    public q0(ConnectionResult connectionResult, int i) {
+        Objects.requireNonNull(connectionResult, "null reference");
+        this.b = connectionResult;
+        this.a = i;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/r0.java b/app/src/main/java/c/i/a/f/e/h/j/r0.java
index 4f311561b0..1c78514f4a 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/r0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/r0.java
@@ -1,4 +1,117 @@
 package c.i.a.f.e.h.j;
+
+import android.app.PendingIntent;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import c.i.a.f.h.e.c;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.common.api.internal.LifecycleCallback;
+import java.util.concurrent.atomic.AtomicReference;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class r0 {
+public abstract class r0 extends LifecycleCallback implements DialogInterface.OnCancelListener {
+    public volatile boolean j;
+    public final AtomicReference<q0> k = new AtomicReference<>(null);
+    public final Handler l = new c(Looper.getMainLooper());
+    public final GoogleApiAvailability m;
+
+    public r0(j jVar, GoogleApiAvailability googleApiAvailability) {
+        super(jVar);
+        this.m = googleApiAvailability;
+    }
+
+    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
+    public void d(int i, int i2, Intent intent) {
+        q0 q0Var = this.k.get();
+        boolean z2 = false;
+        if (i != 1) {
+            if (i == 2) {
+                int c2 = this.m.c(b());
+                if (c2 == 0) {
+                    z2 = true;
+                }
+                if (q0Var != null) {
+                    if (q0Var.b.k == 18 && c2 == 18) {
+                        return;
+                    }
+                } else {
+                    return;
+                }
+            }
+        } else if (i2 == -1) {
+            z2 = true;
+        } else if (i2 == 0) {
+            if (q0Var != null) {
+                int i3 = 13;
+                if (intent != null) {
+                    i3 = intent.getIntExtra("<<ResolutionFailureErrorDetail>>", 13);
+                }
+                q0 q0Var2 = new q0(new ConnectionResult(i3, null, q0Var.b.toString()), q0Var.a);
+                this.k.set(q0Var2);
+                q0Var = q0Var2;
+            } else {
+                return;
+            }
+        }
+        if (z2) {
+            m();
+        } else if (q0Var != null) {
+            l(q0Var.b, q0Var.a);
+        }
+    }
+
+    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
+    public void e(Bundle bundle) {
+        if (bundle != null) {
+            this.k.set(bundle.getBoolean("resolving_error", false) ? new q0(new ConnectionResult(bundle.getInt("failed_status"), (PendingIntent) bundle.getParcelable("failed_resolution")), bundle.getInt("failed_client_id", -1)) : null);
+        }
+    }
+
+    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
+    public void h(Bundle bundle) {
+        q0 q0Var = this.k.get();
+        if (q0Var != null) {
+            bundle.putBoolean("resolving_error", true);
+            bundle.putInt("failed_client_id", q0Var.a);
+            bundle.putInt("failed_status", q0Var.b.k);
+            bundle.putParcelable("failed_resolution", q0Var.b.l);
+        }
+    }
+
+    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
+    public void i() {
+        this.j = true;
+    }
+
+    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
+    public void j() {
+        this.j = false;
+    }
+
+    public abstract void k();
+
+    public abstract void l(ConnectionResult connectionResult, int i);
+
+    public final void m() {
+        this.k.set(null);
+        k();
+    }
+
+    public final void n(ConnectionResult connectionResult, int i) {
+        q0 q0Var = new q0(connectionResult, i);
+        if (this.k.compareAndSet(null, q0Var)) {
+            this.l.post(new t0(this, q0Var));
+        }
+    }
+
+    @Override // android.content.DialogInterface.OnCancelListener
+    public void onCancel(DialogInterface dialogInterface) {
+        ConnectionResult connectionResult = new ConnectionResult(13, null);
+        q0 q0Var = this.k.get();
+        l(connectionResult, q0Var == null ? -1 : q0Var.a);
+        m();
+    }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/s.java b/app/src/main/java/c/i/a/f/e/h/j/s.java
index 56d3022e96..0da1749184 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/s.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/s.java
@@ -21,7 +21,7 @@ public abstract class s {
 
     public abstract void c(g.a<?> aVar) throws DeadObjectException;
 
-    public abstract void d(@NonNull x0 x0Var, boolean z2);
+    public abstract void d(@NonNull v0 v0Var, boolean z2);
 
     public abstract void e(@NonNull Exception exc);
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/s0.java b/app/src/main/java/c/i/a/f/e/h/j/s0.java
index 5fa2c934c8..e3dc124f92 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/s0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/s0.java
@@ -1,15 +1,13 @@
 package c.i.a.f.e.h.j;
 
-import com.google.android.gms.common.ConnectionResult;
-import java.util.Objects;
+import android.app.Dialog;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
 public final class s0 {
-    public final int a;
-    public final ConnectionResult b;
+    public final /* synthetic */ Dialog a;
+    public final /* synthetic */ t0 b;
 
-    public s0(ConnectionResult connectionResult, int i) {
-        Objects.requireNonNull(connectionResult, "null reference");
-        this.b = connectionResult;
-        this.a = i;
+    public s0(t0 t0Var, Dialog dialog) {
+        this.b = t0Var;
+        this.a = dialog;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/t0.java b/app/src/main/java/c/i/a/f/e/h/j/t0.java
index d7917f7a97..1cb93b8a63 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/t0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/t0.java
@@ -1,117 +1,86 @@
 package c.i.a.f.e.h.j;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import c.i.a.f.h.e.c;
+import android.content.IntentFilter;
+import android.widget.ProgressBar;
+import androidx.annotation.MainThread;
+import c.i.a.f.e.e;
+import c.i.a.f.e.k.m;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.internal.LifecycleCallback;
-import java.util.concurrent.atomic.AtomicReference;
+import com.google.android.gms.common.api.GoogleApiActivity;
+import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public abstract class t0 extends LifecycleCallback implements DialogInterface.OnCancelListener {
-    public volatile boolean j;
-    public final AtomicReference<s0> k = new AtomicReference<>(null);
-    public final Handler l = new c(Looper.getMainLooper());
-    public final GoogleApiAvailability m;
+public final class t0 implements Runnable {
+    public final q0 i;
+    public final /* synthetic */ r0 j;
 
-    public t0(j jVar, GoogleApiAvailability googleApiAvailability) {
-        super(jVar);
-        this.m = googleApiAvailability;
+    public t0(r0 r0Var, q0 q0Var) {
+        this.j = r0Var;
+        this.i = q0Var;
     }
 
-    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
-    public void d(int i, int i2, Intent intent) {
-        s0 s0Var = this.k.get();
-        boolean z2 = false;
-        if (i != 1) {
-            if (i == 2) {
-                int c2 = this.m.c(b());
-                if (c2 == 0) {
-                    z2 = true;
-                }
-                if (s0Var != null) {
-                    if (s0Var.b.k == 18 && c2 == 18) {
-                        return;
+    @Override // java.lang.Runnable
+    @MainThread
+    public final void run() {
+        if (this.j.j) {
+            ConnectionResult connectionResult = this.i.b;
+            if (connectionResult.v0()) {
+                r0 r0Var = this.j;
+                j jVar = r0Var.i;
+                Activity b = r0Var.b();
+                PendingIntent pendingIntent = connectionResult.l;
+                Objects.requireNonNull(pendingIntent, "null reference");
+                int i = this.i.a;
+                int i2 = GoogleApiActivity.i;
+                Intent intent = new Intent(b, GoogleApiActivity.class);
+                intent.putExtra("pending_intent", pendingIntent);
+                intent.putExtra("failing_client_id", i);
+                intent.putExtra("notify_manager", false);
+                jVar.startActivityForResult(intent, 1);
+            } else if (this.j.m.d(connectionResult.k)) {
+                r0 r0Var2 = this.j;
+                GoogleApiAvailability googleApiAvailability = r0Var2.m;
+                Activity b2 = r0Var2.b();
+                r0 r0Var3 = this.j;
+                googleApiAvailability.j(b2, r0Var3.i, connectionResult.k, r0Var3);
+            } else if (connectionResult.k == 18) {
+                Activity b3 = this.j.b();
+                r0 r0Var4 = this.j;
+                ProgressBar progressBar = new ProgressBar(b3, null, 16842874);
+                progressBar.setIndeterminate(true);
+                progressBar.setVisibility(0);
+                AlertDialog.Builder builder = new AlertDialog.Builder(b3);
+                builder.setView(progressBar);
+                builder.setMessage(m.e(b3, 18));
+                builder.setPositiveButton("", (DialogInterface.OnClickListener) null);
+                AlertDialog create = builder.create();
+                GoogleApiAvailability.h(b3, create, "GooglePlayServicesUpdatingDialog", r0Var4);
+                r0 r0Var5 = this.j;
+                GoogleApiAvailability googleApiAvailability2 = r0Var5.m;
+                Context applicationContext = r0Var5.b().getApplicationContext();
+                s0 s0Var = new s0(this, create);
+                Objects.requireNonNull(googleApiAvailability2);
+                IntentFilter intentFilter = new IntentFilter("android.intent.action.PACKAGE_ADDED");
+                intentFilter.addDataScheme("package");
+                a0 a0Var = new a0(s0Var);
+                applicationContext.registerReceiver(a0Var, intentFilter);
+                a0Var.a = applicationContext;
+                if (!e.b(applicationContext, "com.google.android.gms")) {
+                    this.j.m();
+                    if (create.isShowing()) {
+                        create.dismiss();
                     }
-                } else {
-                    return;
+                    a0Var.a();
                 }
-            }
-        } else if (i2 == -1) {
-            z2 = true;
-        } else if (i2 == 0) {
-            if (s0Var != null) {
-                int i3 = 13;
-                if (intent != null) {
-                    i3 = intent.getIntExtra("<<ResolutionFailureErrorDetail>>", 13);
-                }
-                s0 s0Var2 = new s0(new ConnectionResult(i3, null, s0Var.b.toString()), s0Var.a);
-                this.k.set(s0Var2);
-                s0Var = s0Var2;
             } else {
-                return;
+                this.j.l(connectionResult, this.i.a);
             }
         }
-        if (z2) {
-            m();
-        } else if (s0Var != null) {
-            l(s0Var.b, s0Var.a);
-        }
-    }
-
-    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
-    public void e(Bundle bundle) {
-        if (bundle != null) {
-            this.k.set(bundle.getBoolean("resolving_error", false) ? new s0(new ConnectionResult(bundle.getInt("failed_status"), (PendingIntent) bundle.getParcelable("failed_resolution")), bundle.getInt("failed_client_id", -1)) : null);
-        }
-    }
-
-    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
-    public void h(Bundle bundle) {
-        s0 s0Var = this.k.get();
-        if (s0Var != null) {
-            bundle.putBoolean("resolving_error", true);
-            bundle.putInt("failed_client_id", s0Var.a);
-            bundle.putInt("failed_status", s0Var.b.k);
-            bundle.putParcelable("failed_resolution", s0Var.b.l);
-        }
-    }
-
-    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
-    public void i() {
-        this.j = true;
-    }
-
-    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
-    public void j() {
-        this.j = false;
-    }
-
-    public abstract void k();
-
-    public abstract void l(ConnectionResult connectionResult, int i);
-
-    public final void m() {
-        this.k.set(null);
-        k();
-    }
-
-    public final void n(ConnectionResult connectionResult, int i) {
-        s0 s0Var = new s0(connectionResult, i);
-        if (this.k.compareAndSet(null, s0Var)) {
-            this.l.post(new v0(this, s0Var));
-        }
-    }
-
-    @Override // android.content.DialogInterface.OnCancelListener
-    public void onCancel(DialogInterface dialogInterface) {
-        ConnectionResult connectionResult = new ConnectionResult(13, null);
-        s0 s0Var = this.k.get();
-        l(connectionResult, s0Var == null ? -1 : s0Var.a);
-        m();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/u0.java b/app/src/main/java/c/i/a/f/e/h/j/u0.java
index 91306bf909..efe6da79fa 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/u0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/u0.java
@@ -1,13 +1,9 @@
 package c.i.a.f.e.h.j;
-
-import android.app.Dialog;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class u0 {
-    public final /* synthetic */ Dialog a;
-    public final /* synthetic */ v0 b;
-
-    public u0(v0 v0Var, Dialog dialog) {
-        this.b = v0Var;
-        this.a = dialog;
+public final class u0 extends ThreadLocal<Boolean> {
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    @Override // java.lang.ThreadLocal
+    public final /* synthetic */ Boolean initialValue() {
+        return Boolean.FALSE;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/v0.java b/app/src/main/java/c/i/a/f/e/h/j/v0.java
index 5e39566394..0f4275da78 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/v0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/v0.java
@@ -1,85 +1,35 @@
 package c.i.a.f.e.h.j;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.widget.ProgressBar;
-import androidx.annotation.MainThread;
-import c.i.a.f.e.e;
-import c.i.a.f.e.k.m;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.GoogleApiActivity;
-import java.util.Objects;
+import com.google.android.gms.common.api.ApiException;
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.common.api.internal.BasePendingResult;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class v0 implements Runnable {
-    public final s0 i;
-    public final /* synthetic */ t0 j;
+public final class v0 {
+    public final Map<BasePendingResult<?>, Boolean> a = Collections.synchronizedMap(new WeakHashMap());
+    public final Map<TaskCompletionSource<?>, Boolean> b = Collections.synchronizedMap(new WeakHashMap());
 
-    public v0(t0 t0Var, s0 s0Var) {
-        this.j = t0Var;
-        this.i = s0Var;
-    }
-
-    @Override // java.lang.Runnable
-    @MainThread
-    public final void run() {
-        if (this.j.j) {
-            ConnectionResult connectionResult = this.i.b;
-            if (connectionResult.v0()) {
-                t0 t0Var = this.j;
-                j jVar = t0Var.i;
-                Activity b = t0Var.b();
-                PendingIntent pendingIntent = connectionResult.l;
-                Objects.requireNonNull(pendingIntent, "null reference");
-                int i = this.i.a;
-                int i2 = GoogleApiActivity.i;
-                Intent intent = new Intent(b, GoogleApiActivity.class);
-                intent.putExtra("pending_intent", pendingIntent);
-                intent.putExtra("failing_client_id", i);
-                intent.putExtra("notify_manager", false);
-                jVar.startActivityForResult(intent, 1);
-            } else if (this.j.m.d(connectionResult.k)) {
-                t0 t0Var2 = this.j;
-                GoogleApiAvailability googleApiAvailability = t0Var2.m;
-                Activity b2 = t0Var2.b();
-                t0 t0Var3 = this.j;
-                googleApiAvailability.j(b2, t0Var3.i, connectionResult.k, t0Var3);
-            } else if (connectionResult.k == 18) {
-                Activity b3 = this.j.b();
-                t0 t0Var4 = this.j;
-                ProgressBar progressBar = new ProgressBar(b3, null, 16842874);
-                progressBar.setIndeterminate(true);
-                progressBar.setVisibility(0);
-                AlertDialog.Builder builder = new AlertDialog.Builder(b3);
-                builder.setView(progressBar);
-                builder.setMessage(m.e(b3, 18));
-                builder.setPositiveButton("", (DialogInterface.OnClickListener) null);
-                AlertDialog create = builder.create();
-                GoogleApiAvailability.h(b3, create, "GooglePlayServicesUpdatingDialog", t0Var4);
-                t0 t0Var5 = this.j;
-                GoogleApiAvailability googleApiAvailability2 = t0Var5.m;
-                Context applicationContext = t0Var5.b().getApplicationContext();
-                u0 u0Var = new u0(this, create);
-                Objects.requireNonNull(googleApiAvailability2);
-                IntentFilter intentFilter = new IntentFilter("android.intent.action.PACKAGE_ADDED");
-                intentFilter.addDataScheme("package");
-                a0 a0Var = new a0(u0Var);
-                applicationContext.registerReceiver(a0Var, intentFilter);
-                a0Var.a = applicationContext;
-                if (!e.b(applicationContext, "com.google.android.gms")) {
-                    this.j.m();
-                    if (create.isShowing()) {
-                        create.dismiss();
-                    }
-                    a0Var.a();
-                }
-            } else {
-                this.j.l(connectionResult, this.i.a);
+    public final void a(boolean z2, Status status) {
+        HashMap hashMap;
+        HashMap hashMap2;
+        synchronized (this.a) {
+            hashMap = new HashMap(this.a);
+        }
+        synchronized (this.b) {
+            hashMap2 = new HashMap(this.b);
+        }
+        for (Map.Entry entry : hashMap.entrySet()) {
+            if (z2 || ((Boolean) entry.getValue()).booleanValue()) {
+                ((BasePendingResult) entry.getKey()).e(status);
+            }
+        }
+        for (Map.Entry entry2 : hashMap2.entrySet()) {
+            if (z2 || ((Boolean) entry2.getValue()).booleanValue()) {
+                ((TaskCompletionSource) entry2.getKey()).a(new ApiException(status));
             }
         }
     }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/w0.java b/app/src/main/java/c/i/a/f/e/h/j/w0.java
index 2ad7a70dc3..52b1e8a3b0 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/w0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/w0.java
@@ -1,9 +1,21 @@
 package c.i.a.f.e.h.j;
+
+import androidx.annotation.NonNull;
+import c.i.a.f.n.c;
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class w0 extends ThreadLocal<Boolean> {
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    @Override // java.lang.ThreadLocal
-    public final /* synthetic */ Boolean initialValue() {
-        return Boolean.FALSE;
+public final class w0 implements c<TResult> {
+    public final /* synthetic */ TaskCompletionSource a;
+    public final /* synthetic */ v0 b;
+
+    public w0(v0 v0Var, TaskCompletionSource taskCompletionSource) {
+        this.b = v0Var;
+        this.a = taskCompletionSource;
+    }
+
+    @Override // c.i.a.f.n.c
+    public final void onComplete(@NonNull Task<TResult> task) {
+        this.b.b.remove(this.a);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/x0.java b/app/src/main/java/c/i/a/f/e/h/j/x0.java
index 4d315740ff..d0bdcfe15e 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/x0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/x0.java
@@ -1,36 +1,20 @@
 package c.i.a.f.e.h.j;
 
-import com.google.android.gms.common.api.ApiException;
+import c.i.a.f.e.h.d;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.common.api.internal.BasePendingResult;
-import com.google.android.gms.tasks.TaskCompletionSource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class x0 {
-    public final Map<BasePendingResult<?>, Boolean> a = Collections.synchronizedMap(new WeakHashMap());
-    public final Map<TaskCompletionSource<?>, Boolean> b = Collections.synchronizedMap(new WeakHashMap());
+public final class x0 implements d.a {
+    public final /* synthetic */ BasePendingResult a;
+    public final /* synthetic */ v0 b;
 
-    public final void a(boolean z2, Status status) {
-        HashMap hashMap;
-        HashMap hashMap2;
-        synchronized (this.a) {
-            hashMap = new HashMap(this.a);
-        }
-        synchronized (this.b) {
-            hashMap2 = new HashMap(this.b);
-        }
-        for (Map.Entry entry : hashMap.entrySet()) {
-            if (z2 || ((Boolean) entry.getValue()).booleanValue()) {
-                ((BasePendingResult) entry.getKey()).e(status);
-            }
-        }
-        for (Map.Entry entry2 : hashMap2.entrySet()) {
-            if (z2 || ((Boolean) entry2.getValue()).booleanValue()) {
-                ((TaskCompletionSource) entry2.getKey()).a(new ApiException(status));
-            }
-        }
+    public x0(v0 v0Var, BasePendingResult basePendingResult) {
+        this.b = v0Var;
+        this.a = basePendingResult;
+    }
+
+    @Override // c.i.a.f.e.h.d.a
+    public final void a(Status status) {
+        this.b.a.remove(this.a);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/y0.java b/app/src/main/java/c/i/a/f/e/h/j/y0.java
index f36a0ee037..5ae07e52fe 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/y0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/y0.java
@@ -1,21 +1,77 @@
 package c.i.a.f.e.h.j;
 
-import androidx.annotation.NonNull;
-import c.i.a.f.n.c;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
+import android.app.Activity;
+import android.os.Handler;
+import androidx.collection.ArraySet;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.common.api.internal.LifecycleCallback;
+import java.util.Objects;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class y0 implements c<TResult> {
-    public final /* synthetic */ TaskCompletionSource a;
-    public final /* synthetic */ x0 b;
+public class y0 extends r0 {
+    public final ArraySet<b<?>> n = new ArraySet<>();
+    public final g o;
 
-    public y0(x0 x0Var, TaskCompletionSource taskCompletionSource) {
-        this.b = x0Var;
-        this.a = taskCompletionSource;
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public y0(j jVar, g gVar) {
+        super(jVar, GoogleApiAvailability.d);
+        Object obj = GoogleApiAvailability.f2285c;
+        this.o = gVar;
+        jVar.a("ConnectionlessLifecycleHelper", this);
     }
 
-    @Override // c.i.a.f.n.c
-    public final void onComplete(@NonNull Task<TResult> task) {
-        this.b.b.remove(this.a);
+    public static void o(Activity activity, g gVar, b<?> bVar) {
+        j c2 = LifecycleCallback.c(activity);
+        y0 y0Var = (y0) c2.d("ConnectionlessLifecycleHelper", y0.class);
+        if (y0Var == null) {
+            y0Var = new y0(c2, gVar);
+        }
+        AnimatableValueParser.z(bVar, "ApiKey cannot be null");
+        y0Var.n.add(bVar);
+        gVar.b(y0Var);
+    }
+
+    @Override // com.google.android.gms.common.api.internal.LifecycleCallback
+    public void g() {
+        if (!this.n.isEmpty()) {
+            this.o.b(this);
+        }
+    }
+
+    @Override // c.i.a.f.e.h.j.r0, com.google.android.gms.common.api.internal.LifecycleCallback
+    public void i() {
+        this.j = true;
+        if (!this.n.isEmpty()) {
+            this.o.b(this);
+        }
+    }
+
+    @Override // c.i.a.f.e.h.j.r0, com.google.android.gms.common.api.internal.LifecycleCallback
+    public void j() {
+        this.j = false;
+        g gVar = this.o;
+        Objects.requireNonNull(gVar);
+        synchronized (g.k) {
+            if (gVar.t == this) {
+                gVar.t = null;
+                gVar.u.clear();
+            }
+        }
+    }
+
+    @Override // c.i.a.f.e.h.j.r0
+    public final void k() {
+        Handler handler = this.o.w;
+        handler.sendMessage(handler.obtainMessage(3));
+    }
+
+    @Override // c.i.a.f.e.h.j.r0
+    public final void l(ConnectionResult connectionResult, int i) {
+        g gVar = this.o;
+        if (!gVar.c(connectionResult, i)) {
+            Handler handler = gVar.w;
+            handler.sendMessage(handler.obtainMessage(5, i, 0, connectionResult));
+        }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/j/z0.java b/app/src/main/java/c/i/a/f/e/h/j/z0.java
index 6180888231..7b1f2e90eb 100644
--- a/app/src/main/java/c/i/a/f/e/h/j/z0.java
+++ b/app/src/main/java/c/i/a/f/e/h/j/z0.java
@@ -1,20 +1,4 @@
 package c.i.a.f.e.h.j;
-
-import c.i.a.f.e.h.d;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.common.api.internal.BasePendingResult;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
-public final class z0 implements d.a {
-    public final /* synthetic */ BasePendingResult a;
-    public final /* synthetic */ x0 b;
-
-    public z0(x0 x0Var, BasePendingResult basePendingResult) {
-        this.b = x0Var;
-        this.a = basePendingResult;
-    }
-
-    @Override // c.i.a.f.e.h.d.a
-    public final void a(Status status) {
-        this.b.a.remove(this.a);
-    }
+public final class z0 {
 }
diff --git a/app/src/main/java/c/i/a/f/e/h/l.java b/app/src/main/java/c/i/a/f/e/h/l.java
index dc9c1a53d9..74676d45db 100644
--- a/app/src/main/java/c/i/a/f/e/h/l.java
+++ b/app/src/main/java/c/i/a/f/e/h/l.java
@@ -9,21 +9,21 @@ public final class l implements Parcelable.Creator<Scope> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Scope createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         String str = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Scope(i, str);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/h/m.java b/app/src/main/java/c/i/a/f/e/h/m.java
index 7063c5fa07..829ba4c8da 100644
--- a/app/src/main/java/c/i/a/f/e/h/m.java
+++ b/app/src/main/java/c/i/a/f/e/h/m.java
@@ -11,17 +11,17 @@ public final class m implements Parcelable.Creator<Status> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Status createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         PendingIntent pendingIntent = null;
         ConnectionResult connectionResult = null;
         int i = 0;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
                 str = AnimatableValueParser.T(parcel, readInt);
             } else if (i3 == 3) {
@@ -29,12 +29,12 @@ public final class m implements Parcelable.Creator<Status> {
             } else if (i3 == 4) {
                 connectionResult = (ConnectionResult) AnimatableValueParser.S(parcel, readInt, ConnectionResult.CREATOR);
             } else if (i3 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Status(i, i2, str, pendingIntent, connectionResult);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/j/a.java b/app/src/main/java/c/i/a/f/e/j/a.java
index cc1696d001..641b4a8f7a 100644
--- a/app/src/main/java/c/i/a/f/e/j/a.java
+++ b/app/src/main/java/c/i/a/f/e/j/a.java
@@ -11,14 +11,14 @@ public final class a implements Parcelable.Creator<DataHolder> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final DataHolder createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         String[] strArr = null;
         CursorWindow[] cursorWindowArr = null;
         Bundle bundle = null;
         int i2 = 0;
         int i3 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i4 = 65535 & readInt;
             if (i4 == 1) {
@@ -26,16 +26,16 @@ public final class a implements Parcelable.Creator<DataHolder> {
             } else if (i4 == 2) {
                 cursorWindowArr = (CursorWindow[]) AnimatableValueParser.W(parcel, readInt, CursorWindow.CREATOR);
             } else if (i4 == 3) {
-                i3 = AnimatableValueParser.e2(parcel, readInt);
+                i3 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i4 == 4) {
                 bundle = AnimatableValueParser.P(parcel, readInt);
             } else if (i4 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         DataHolder dataHolder = new DataHolder(i2, strArr, cursorWindowArr, i3, bundle);
         dataHolder.k = new Bundle();
         int i5 = 0;
diff --git a/app/src/main/java/c/i/a/f/e/k/a0.java b/app/src/main/java/c/i/a/f/e/k/a0.java
index 57a7edc719..1e9f99460b 100644
--- a/app/src/main/java/c/i/a/f/e/k/a0.java
+++ b/app/src/main/java/c/i/a/f/e/k/a0.java
@@ -12,11 +12,11 @@ public final class a0 implements Parcelable.Creator<zzc> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzc createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Bundle bundle = null;
         Feature[] featureArr = null;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
@@ -24,14 +24,14 @@ public final class a0 implements Parcelable.Creator<zzc> {
             } else if (i2 == 2) {
                 featureArr = (Feature[]) AnimatableValueParser.W(parcel, readInt, Feature.CREATOR);
             } else if (i2 == 3) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 4) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 ConnectionTelemetryConfiguration connectionTelemetryConfiguration = (ConnectionTelemetryConfiguration) AnimatableValueParser.S(parcel, readInt, ConnectionTelemetryConfiguration.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzc(bundle, featureArr, i);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/k/b.java b/app/src/main/java/c/i/a/f/e/k/b.java
index a805ab75c5..4cb12f283a 100644
--- a/app/src/main/java/c/i/a/f/e/k/b.java
+++ b/app/src/main/java/c/i/a/f/e/k/b.java
@@ -44,7 +44,7 @@ public abstract class b<T extends IInterface> {
     public volatile String b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public j0 f1047c;
+    public j0 f1046c;
     public final Context d;
     public final e e;
     public final c.i.a.f.e.c f;
@@ -69,7 +69,7 @@ public abstract class b<T extends IInterface> {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public final String f1048s;
+    public final String f1047s;
     @Nullable
     public ConnectionResult t = null;
     public boolean u = false;
@@ -105,7 +105,7 @@ public abstract class b<T extends IInterface> {
         public void a(@RecentlyNonNull ConnectionResult connectionResult) {
             if (connectionResult.w0()) {
                 b bVar = b.this;
-                bVar.b(null, bVar.v());
+                bVar.b(null, bVar.u());
                 return;
             }
             AbstractC0102b bVar2 = b.this.q;
@@ -137,14 +137,14 @@ public abstract class b<T extends IInterface> {
         public final /* synthetic */ void a(Boolean bool) {
             PendingIntent pendingIntent = null;
             if (this.d != 0) {
-                b.this.C(1, null);
+                b.this.B(1, null);
                 Bundle bundle = this.e;
                 if (bundle != null) {
                     pendingIntent = (PendingIntent) bundle.getParcelable("pendingIntent");
                 }
                 d(new ConnectionResult(this.d, pendingIntent));
             } else if (!e()) {
-                b.this.C(1, null);
+                b.this.B(1, null);
                 d(new ConnectionResult(8, null));
             }
         }
@@ -192,10 +192,10 @@ public abstract class b<T extends IInterface> {
                 PendingIntent pendingIntent = null;
                 if (i2 == 4) {
                     b.this.t = new ConnectionResult(message.arg2);
-                    if (b.F(b.this)) {
+                    if (b.E(b.this)) {
                         b bVar = b.this;
                         if (!bVar.u) {
-                            bVar.C(3, null);
+                            bVar.B(3, null);
                             return;
                         }
                     }
@@ -223,13 +223,13 @@ public abstract class b<T extends IInterface> {
                     Objects.requireNonNull(b.this);
                     System.currentTimeMillis();
                 } else if (i2 == 6) {
-                    b.this.C(5, null);
+                    b.this.B(5, null);
                     a aVar = b.this.p;
                     if (aVar != null) {
                         aVar.e(message.arg2);
                     }
-                    b.this.A(message.arg2);
-                    b.E(b.this, 5, 1, null);
+                    b.this.z(message.arg2);
+                    b.D(b.this, 5, 1, null);
                 } else if (i2 == 2 && !b.this.j()) {
                     h hVar2 = (h) message.obj;
                     hVar2.b();
@@ -307,7 +307,7 @@ public abstract class b<T extends IInterface> {
         @Override // android.content.ServiceConnection
         public final void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             if (iBinder == null) {
-                b.D(b.this);
+                b.C(b.this);
                 return;
             }
             synchronized (b.this.i) {
@@ -382,13 +382,13 @@ public abstract class b<T extends IInterface> {
                 IBinder iBinder = this.g;
                 Objects.requireNonNull(iBinder, "null reference");
                 String interfaceDescriptor = iBinder.getInterfaceDescriptor();
-                if (!b.this.x().equals(interfaceDescriptor)) {
-                    String x2 = b.this.x();
-                    Log.e("GmsClient", c.d.b.a.a.h(c.d.b.a.a.m(interfaceDescriptor, c.d.b.a.a.m(x2, 34)), "service descriptor mismatch: ", x2, " vs. ", interfaceDescriptor));
+                if (!b.this.w().equals(interfaceDescriptor)) {
+                    String w = b.this.w();
+                    Log.e("GmsClient", c.d.b.a.a.h(c.d.b.a.a.m(interfaceDescriptor, c.d.b.a.a.m(w, 34)), "service descriptor mismatch: ", w, " vs. ", interfaceDescriptor));
                     return false;
                 }
                 IInterface r = b.this.r(this.g);
-                if (r == null || (!b.E(b.this, 2, 4, r) && !b.E(b.this, 3, 4, r))) {
+                if (r == null || (!b.D(b.this, 2, 4, r) && !b.D(b.this, 3, 4, r))) {
                     return false;
                 }
                 b bVar = b.this;
@@ -440,10 +440,10 @@ public abstract class b<T extends IInterface> {
         this.r = i2;
         this.p = aVar;
         this.q = bVar;
-        this.f1048s = str;
+        this.f1047s = str;
     }
 
-    public static void D(b bVar) {
+    public static void C(b bVar) {
         boolean z2;
         int i2;
         synchronized (bVar.h) {
@@ -459,42 +459,37 @@ public abstract class b<T extends IInterface> {
         handler.sendMessage(handler.obtainMessage(i2, bVar.w.get(), 16));
     }
 
-    public static boolean E(b bVar, int i2, int i3, IInterface iInterface) {
+    public static boolean D(b bVar, int i2, int i3, IInterface iInterface) {
         boolean z2;
         synchronized (bVar.h) {
             if (bVar.o != i2) {
                 z2 = false;
             } else {
-                bVar.C(i3, iInterface);
+                bVar.B(i3, iInterface);
                 z2 = true;
             }
         }
         return z2;
     }
 
-    public static boolean F(b bVar) {
-        if (bVar.u || TextUtils.isEmpty(bVar.x()) || TextUtils.isEmpty(null)) {
+    public static boolean E(b bVar) {
+        if (bVar.u || TextUtils.isEmpty(bVar.w()) || TextUtils.isEmpty(null)) {
             return false;
         }
         try {
-            Class.forName(bVar.x());
+            Class.forName(bVar.w());
             return true;
         } catch (ClassNotFoundException unused) {
             return false;
         }
     }
 
-    @CallSuper
-    public void A(@RecentlyNonNull int i2) {
-        System.currentTimeMillis();
-    }
-
-    public final String B() {
-        String str = this.f1048s;
+    public final String A() {
+        String str = this.f1047s;
         return str == null ? this.d.getClass().getName() : str;
     }
 
-    public final void C(int i2, @Nullable T t) {
+    public final void B(int i2, @Nullable T t) {
         j0 j0Var;
         AnimatableValueParser.m((i2 == 4) == (t != null));
         synchronized (this.h) {
@@ -504,18 +499,18 @@ public abstract class b<T extends IInterface> {
                 i iVar = this.n;
                 if (iVar != null) {
                     e eVar = this.e;
-                    String str = this.f1047c.a;
+                    String str = this.f1046c.a;
                     Objects.requireNonNull(str, "null reference");
-                    Objects.requireNonNull(this.f1047c);
-                    String B = B();
-                    Objects.requireNonNull(this.f1047c);
+                    Objects.requireNonNull(this.f1046c);
+                    String A = A();
+                    Objects.requireNonNull(this.f1046c);
                     Objects.requireNonNull(eVar);
-                    eVar.c(new e.a(str, "com.google.android.gms", 4225, false), iVar, B);
+                    eVar.c(new e.a(str, "com.google.android.gms", 4225, false), iVar, A);
                     this.n = null;
                 }
             } else if (i2 == 2 || i2 == 3) {
                 i iVar2 = this.n;
-                if (!(iVar2 == null || (j0Var = this.f1047c) == null)) {
+                if (!(iVar2 == null || (j0Var = this.f1046c) == null)) {
                     String str2 = j0Var.a;
                     StringBuilder sb = new StringBuilder(String.valueOf(str2).length() + 70 + "com.google.android.gms".length());
                     sb.append("Calling connect() while still connected, missing disconnect() for ");
@@ -524,27 +519,27 @@ public abstract class b<T extends IInterface> {
                     sb.append("com.google.android.gms");
                     Log.e("GmsClient", sb.toString());
                     e eVar2 = this.e;
-                    String str3 = this.f1047c.a;
+                    String str3 = this.f1046c.a;
                     Objects.requireNonNull(str3, "null reference");
-                    Objects.requireNonNull(this.f1047c);
-                    String B2 = B();
-                    Objects.requireNonNull(this.f1047c);
+                    Objects.requireNonNull(this.f1046c);
+                    String A2 = A();
+                    Objects.requireNonNull(this.f1046c);
                     Objects.requireNonNull(eVar2);
-                    eVar2.c(new e.a(str3, "com.google.android.gms", 4225, false), iVar2, B2);
+                    eVar2.c(new e.a(str3, "com.google.android.gms", 4225, false), iVar2, A2);
                     this.w.incrementAndGet();
                 }
                 i iVar3 = new i(this.w.get());
                 this.n = iVar3;
-                String y2 = y();
+                String x2 = x();
                 Object obj = e.a;
-                this.f1047c = new j0("com.google.android.gms", y2, false, 4225, false);
+                this.f1046c = new j0("com.google.android.gms", x2, false, 4225, false);
                 e eVar3 = this.e;
-                Objects.requireNonNull(y2, "null reference");
-                Objects.requireNonNull(this.f1047c);
-                String B3 = B();
-                Objects.requireNonNull(this.f1047c);
-                if (!eVar3.b(new e.a(y2, "com.google.android.gms", 4225, false), iVar3, B3)) {
-                    String str4 = this.f1047c.a;
+                Objects.requireNonNull(x2, "null reference");
+                Objects.requireNonNull(this.f1046c);
+                String A3 = A();
+                Objects.requireNonNull(this.f1046c);
+                if (!eVar3.b(new e.a(x2, "com.google.android.gms", 4225, false), iVar3, A3)) {
+                    String str4 = this.f1046c.a;
                     StringBuilder sb2 = new StringBuilder(String.valueOf(str4).length() + 34 + "com.google.android.gms".length());
                     sb2.append("unable to connect to service: ");
                     sb2.append(str4);
@@ -557,17 +552,17 @@ public abstract class b<T extends IInterface> {
                 }
             } else if (i2 == 4) {
                 Objects.requireNonNull(t, "null reference");
-                z(t);
+                y(t);
             }
         }
     }
 
     @WorkerThread
     public void b(@Nullable g gVar, @RecentlyNonNull Set<Scope> set) {
-        Bundle u = u();
+        Bundle t = t();
         GetServiceRequest getServiceRequest = new GetServiceRequest(this.r);
         getServiceRequest.l = this.d.getPackageName();
-        getServiceRequest.o = u;
+        getServiceRequest.o = t;
         if (set != null) {
             getServiceRequest.n = (Scope[]) set.toArray(new Scope[set.size()]);
         }
@@ -581,13 +576,14 @@ public abstract class b<T extends IInterface> {
                 getServiceRequest.m = gVar.asBinder();
             }
         }
-        getServiceRequest.q = a;
-        getServiceRequest.r = t();
+        Feature[] featureArr = a;
+        getServiceRequest.q = featureArr;
+        getServiceRequest.r = featureArr;
         try {
             synchronized (this.i) {
                 j jVar = this.j;
                 if (jVar != null) {
-                    jVar.v(new j(this, this.w.get()), getServiceRequest);
+                    jVar.w(new j(this, this.w.get()), getServiceRequest);
                 } else {
                     Log.w("GmsClient", "mServiceBroker is null, client disconnected");
                 }
@@ -629,7 +625,7 @@ public abstract class b<T extends IInterface> {
     @RecentlyNonNull
     public String f() {
         j0 j0Var;
-        if (!j() || (j0Var = this.f1047c) == null) {
+        if (!j() || (j0Var = this.f1046c) == null) {
             throw new RuntimeException("Failed to connect when checking package");
         }
         Objects.requireNonNull(j0Var);
@@ -639,7 +635,7 @@ public abstract class b<T extends IInterface> {
     public void g(@RecentlyNonNull c cVar) {
         AnimatableValueParser.z(cVar, "Connection progress callbacks cannot be null.");
         this.k = cVar;
-        C(2, null);
+        B(2, null);
     }
 
     @Override // c.i.a.f.e.h.a.f
@@ -658,7 +654,7 @@ public abstract class b<T extends IInterface> {
         synchronized (this.i) {
             this.j = null;
         }
-        C(1, null);
+        B(1, null);
     }
 
     public void i(@RecentlyNonNull e eVar) {
@@ -710,7 +706,7 @@ public abstract class b<T extends IInterface> {
     public void q() {
         int b = this.f.b(this.d, l());
         if (b != 0) {
-            C(1, null);
+            B(1, null);
             d dVar = new d();
             AnimatableValueParser.z(dVar, "Connection progress callbacks cannot be null.");
             this.k = dVar;
@@ -730,22 +726,17 @@ public abstract class b<T extends IInterface> {
     }
 
     @RecentlyNonNull
-    public Feature[] t() {
-        return a;
-    }
-
-    @RecentlyNonNull
-    public Bundle u() {
+    public Bundle t() {
         return new Bundle();
     }
 
     @RecentlyNonNull
-    public Set<Scope> v() {
+    public Set<Scope> u() {
         return Collections.emptySet();
     }
 
     @RecentlyNonNull
-    public final T w() throws DeadObjectException {
+    public final T v() throws DeadObjectException {
         T t;
         synchronized (this.h) {
             if (this.o == 5) {
@@ -762,13 +753,18 @@ public abstract class b<T extends IInterface> {
     }
 
     @NonNull
-    public abstract String x();
+    public abstract String w();
 
     @NonNull
-    public abstract String y();
+    public abstract String x();
 
     @CallSuper
-    public void z(@RecentlyNonNull T t) {
+    public void y(@RecentlyNonNull T t) {
+        System.currentTimeMillis();
+    }
+
+    @CallSuper
+    public void z(@RecentlyNonNull int i2) {
         System.currentTimeMillis();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/k/b0.java b/app/src/main/java/c/i/a/f/e/k/b0.java
index e7d62611cc..9c5d4aca7c 100644
--- a/app/src/main/java/c/i/a/f/e/k/b0.java
+++ b/app/src/main/java/c/i/a/f/e/k/b0.java
@@ -10,37 +10,37 @@ public final class b0 implements Parcelable.Creator<ConnectionTelemetryConfigura
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final ConnectionTelemetryConfiguration createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         RootTelemetryConfiguration rootTelemetryConfiguration = null;
         int[] iArr = null;
         boolean z2 = false;
         boolean z3 = false;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
                 rootTelemetryConfiguration = (RootTelemetryConfiguration) AnimatableValueParser.S(parcel, readInt, RootTelemetryConfiguration.CREATOR);
             } else if (i2 == 2) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i2 == 3) {
-                z3 = AnimatableValueParser.c2(parcel, readInt);
+                z3 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i2 == 4) {
-                int k2 = AnimatableValueParser.k2(parcel, readInt);
+                int m2 = AnimatableValueParser.m2(parcel, readInt);
                 int dataPosition = parcel.dataPosition();
-                if (k2 == 0) {
+                if (m2 == 0) {
                     iArr = null;
                 } else {
                     iArr = parcel.createIntArray();
-                    parcel.setDataPosition(dataPosition + k2);
+                    parcel.setDataPosition(dataPosition + m2);
                 }
             } else if (i2 != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new ConnectionTelemetryConfiguration(rootTelemetryConfiguration, z2, z3, iArr, i);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/k/c.java b/app/src/main/java/c/i/a/f/e/k/c.java
index 9e3e17b220..41a954a640 100644
--- a/app/src/main/java/c/i/a/f/e/k/c.java
+++ b/app/src/main/java/c/i/a/f/e/k/c.java
@@ -15,7 +15,7 @@ public final class c {
     public final Set<Scope> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<Scope> f1050c;
+    public final Set<Scope> f1049c;
     public final Map<c.i.a.f.e.h.a<?>, b> d;
     public final String e;
     public final String f;
@@ -28,11 +28,11 @@ public final class c {
         public ArraySet<Scope> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f1051c;
+        public String f1050c;
         public String d;
 
         public final c a() {
-            return new c(this.a, this.b, null, 0, null, this.f1051c, this.d, c.i.a.f.l.a.i);
+            return new c(this.a, this.b, null, 0, null, this.f1050c, this.d, c.i.a.f.l.a.i);
         }
     }
 
@@ -55,6 +55,6 @@ public final class c {
             Objects.requireNonNull(bVar);
             hashSet.addAll(null);
         }
-        this.f1050c = Collections.unmodifiableSet(hashSet);
+        this.f1049c = Collections.unmodifiableSet(hashSet);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/k/c0.java b/app/src/main/java/c/i/a/f/e/k/c0.java
index 53d73a4a88..5f2e064f51 100644
--- a/app/src/main/java/c/i/a/f/e/k/c0.java
+++ b/app/src/main/java/c/i/a/f/e/k/c0.java
@@ -14,7 +14,7 @@ public final class c0 implements Parcelable.Creator<GetServiceRequest> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final GetServiceRequest createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         IBinder iBinder = null;
         Scope[] scopeArr = null;
@@ -28,23 +28,23 @@ public final class c0 implements Parcelable.Creator<GetServiceRequest> {
         boolean z2 = false;
         int i4 = 0;
         boolean z3 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 3:
-                    i3 = AnimatableValueParser.e2(parcel, readInt);
+                    i3 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 4:
                     str = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 5:
-                    iBinder = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 6:
                     scopeArr = (Scope[]) AnimatableValueParser.W(parcel, readInt, Scope.CREATOR);
@@ -57,7 +57,7 @@ public final class c0 implements Parcelable.Creator<GetServiceRequest> {
                     break;
                 case 9:
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
                 case 10:
                     featureArr = (Feature[]) AnimatableValueParser.W(parcel, readInt, Feature.CREATOR);
@@ -66,17 +66,17 @@ public final class c0 implements Parcelable.Creator<GetServiceRequest> {
                     featureArr2 = (Feature[]) AnimatableValueParser.W(parcel, readInt, Feature.CREATOR);
                     break;
                 case 12:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 13:
-                    i4 = AnimatableValueParser.e2(parcel, readInt);
+                    i4 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 14:
-                    z3 = AnimatableValueParser.c2(parcel, readInt);
+                    z3 = AnimatableValueParser.e2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new GetServiceRequest(i, i2, i3, str, iBinder, scopeArr, bundle, account, featureArr, featureArr2, z2, i4, z3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/k/d.java b/app/src/main/java/c/i/a/f/e/k/d.java
index 534e5d5c7f..33d01e800e 100644
--- a/app/src/main/java/c/i/a/f/e/k/d.java
+++ b/app/src/main/java/c/i/a/f/e/k/d.java
@@ -18,48 +18,48 @@ import java.util.Set;
 public abstract class d<T extends IInterface> extends b<T> implements a.f {
 
     /* renamed from: x  reason: collision with root package name */
-    public final c f1052x;
+    public final c f1051x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final Set<Scope> f1053y;
+    public final Set<Scope> f1052y;
     @Nullable
 
     /* renamed from: z  reason: collision with root package name */
-    public final Account f1054z;
+    public final Account f1053z;
 
     /* JADX WARNING: Illegal instructions before constructor call */
     public d(Context context, Looper looper, int i, c cVar, f fVar, l lVar) {
         super(context, looper, r3, r4, i, new r(fVar), new q(lVar), cVar.f);
         e a = e.a(context);
-        Object obj = GoogleApiAvailability.f2279c;
+        Object obj = GoogleApiAvailability.f2285c;
         GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
         Objects.requireNonNull(fVar, "null reference");
         Objects.requireNonNull(lVar, "null reference");
-        this.f1052x = cVar;
-        this.f1054z = cVar.a;
-        Set<Scope> set = cVar.f1050c;
+        this.f1051x = cVar;
+        this.f1053z = cVar.a;
+        Set<Scope> set = cVar.f1049c;
         for (Scope scope : set) {
             if (!set.contains(scope)) {
                 throw new IllegalStateException("Expanding scopes is not permitted, use implied scopes instead");
             }
         }
-        this.f1053y = set;
+        this.f1052y = set;
     }
 
     @Override // c.i.a.f.e.h.a.f
     @NonNull
     public Set<Scope> a() {
-        return o() ? this.f1053y : Collections.emptySet();
+        return o() ? this.f1052y : Collections.emptySet();
     }
 
     @Override // c.i.a.f.e.k.b
     @Nullable
     public final Account s() {
-        return this.f1054z;
+        return this.f1053z;
     }
 
     @Override // c.i.a.f.e.k.b
-    public final Set<Scope> v() {
-        return this.f1053y;
+    public final Set<Scope> u() {
+        return this.f1052y;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/k/e.java b/app/src/main/java/c/i/a/f/e/k/e.java
index ec76414175..3c3575248e 100644
--- a/app/src/main/java/c/i/a/f/e/k/e.java
+++ b/app/src/main/java/c/i/a/f/e/k/e.java
@@ -21,7 +21,7 @@ public abstract class e {
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f1055c;
+        public final String f1054c;
         public final int d;
         public final boolean e;
 
@@ -29,7 +29,7 @@ public abstract class e {
             AnimatableValueParser.w(str);
             this.b = str;
             AnimatableValueParser.w(str2);
-            this.f1055c = str2;
+            this.f1054c = str2;
             this.d = i;
             this.e = z2;
         }
@@ -42,11 +42,11 @@ public abstract class e {
                 return false;
             }
             a aVar = (a) obj;
-            return AnimatableValueParser.j0(this.b, aVar.b) && AnimatableValueParser.j0(this.f1055c, aVar.f1055c) && AnimatableValueParser.j0(null, null) && this.d == aVar.d && this.e == aVar.e;
+            return AnimatableValueParser.j0(this.b, aVar.b) && AnimatableValueParser.j0(this.f1054c, aVar.f1054c) && AnimatableValueParser.j0(null, null) && this.d == aVar.d && this.e == aVar.e;
         }
 
         public final int hashCode() {
-            return Arrays.hashCode(new Object[]{this.b, this.f1055c, null, Integer.valueOf(this.d), Boolean.valueOf(this.e)});
+            return Arrays.hashCode(new Object[]{this.b, this.f1054c, null, Integer.valueOf(this.d), Boolean.valueOf(this.e)});
         }
 
         public final String toString() {
diff --git a/app/src/main/java/c/i/a/f/e/k/e0.java b/app/src/main/java/c/i/a/f/e/k/e0.java
index 39dceee3f8..4eb809061f 100644
--- a/app/src/main/java/c/i/a/f/e/k/e0.java
+++ b/app/src/main/java/c/i/a/f/e/k/e0.java
@@ -13,7 +13,7 @@ import java.util.HashMap;
 public final class e0 extends e {
 
     /* renamed from: c  reason: collision with root package name */
-    public final HashMap<e.a, g0> f1056c = new HashMap<>();
+    public final HashMap<e.a, g0> f1055c = new HashMap<>();
     public final Context d;
     public final Handler e;
     public final a f;
@@ -32,13 +32,13 @@ public final class e0 extends e {
     public final boolean b(e.a aVar, ServiceConnection serviceConnection, String str) {
         boolean z2;
         AnimatableValueParser.z(serviceConnection, "ServiceConnection must not be null");
-        synchronized (this.f1056c) {
-            g0 g0Var = this.f1056c.get(aVar);
+        synchronized (this.f1055c) {
+            g0 g0Var = this.f1055c.get(aVar);
             if (g0Var == null) {
                 g0Var = new g0(this, aVar);
                 g0Var.i.put(serviceConnection, serviceConnection);
                 g0Var.a(str);
-                this.f1056c.put(aVar, g0Var);
+                this.f1055c.put(aVar, g0Var);
             } else {
                 this.e.removeMessages(0, aVar);
                 if (!g0Var.i.containsKey(serviceConnection)) {
@@ -65,8 +65,8 @@ public final class e0 extends e {
     @Override // c.i.a.f.e.k.e
     public final void c(e.a aVar, ServiceConnection serviceConnection, String str) {
         AnimatableValueParser.z(serviceConnection, "ServiceConnection must not be null");
-        synchronized (this.f1056c) {
-            g0 g0Var = this.f1056c.get(aVar);
+        synchronized (this.f1055c) {
+            g0 g0Var = this.f1055c.get(aVar);
             if (g0Var == null) {
                 String valueOf = String.valueOf(aVar);
                 StringBuilder sb = new StringBuilder(valueOf.length() + 50);
diff --git a/app/src/main/java/c/i/a/f/e/k/f0.java b/app/src/main/java/c/i/a/f/e/k/f0.java
index 5be64b7dfd..4e715824c1 100644
--- a/app/src/main/java/c/i/a/f/e/k/f0.java
+++ b/app/src/main/java/c/i/a/f/e/k/f0.java
@@ -18,9 +18,9 @@ public final class f0 implements Handler.Callback {
     public final boolean handleMessage(Message message) {
         int i = message.what;
         if (i == 0) {
-            synchronized (this.i.f1056c) {
+            synchronized (this.i.f1055c) {
                 e.a aVar = (e.a) message.obj;
-                g0 g0Var = this.i.f1056c.get(aVar);
+                g0 g0Var = this.i.f1055c.get(aVar);
                 if (g0Var != null && g0Var.i.isEmpty()) {
                     if (g0Var.k) {
                         g0Var.o.e.removeMessages(1, g0Var.m);
@@ -29,16 +29,16 @@ public final class f0 implements Handler.Callback {
                         g0Var.k = false;
                         g0Var.j = 2;
                     }
-                    this.i.f1056c.remove(aVar);
+                    this.i.f1055c.remove(aVar);
                 }
             }
             return true;
         } else if (i != 1) {
             return false;
         } else {
-            synchronized (this.i.f1056c) {
+            synchronized (this.i.f1055c) {
                 e.a aVar2 = (e.a) message.obj;
-                g0 g0Var2 = this.i.f1056c.get(aVar2);
+                g0 g0Var2 = this.i.f1055c.get(aVar2);
                 if (g0Var2 != null && g0Var2.j == 3) {
                     String valueOf = String.valueOf(aVar2);
                     StringBuilder sb = new StringBuilder(valueOf.length() + 47);
@@ -51,7 +51,7 @@ public final class f0 implements Handler.Callback {
                         componentName = null;
                     }
                     if (componentName == null) {
-                        String str = aVar2.f1055c;
+                        String str = aVar2.f1054c;
                         Objects.requireNonNull(str, "null reference");
                         componentName = new ComponentName(str, "unknown");
                     }
diff --git a/app/src/main/java/c/i/a/f/e/k/g0.java b/app/src/main/java/c/i/a/f/e/k/g0.java
index 31a776ec31..acfb0fd137 100644
--- a/app/src/main/java/c/i/a/f/e/k/g0.java
+++ b/app/src/main/java/c/i/a/f/e/k/g0.java
@@ -61,7 +61,7 @@ public final class g0 implements ServiceConnection, i0 {
                 }
             }
             if (intent2 == null) {
-                intent = new Intent(aVar2.b).setPackage(aVar2.f1055c);
+                intent = new Intent(aVar2.b).setPackage(aVar2.f1054c);
             }
             d = aVar.d(context, str, intent2, this, this.m.d);
             this.k = d;
@@ -91,7 +91,7 @@ public final class g0 implements ServiceConnection, i0 {
 
     @Override // android.content.ServiceConnection
     public final void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-        synchronized (this.o.f1056c) {
+        synchronized (this.o.f1055c) {
             this.o.e.removeMessages(1, this.m);
             this.l = iBinder;
             this.n = componentName;
@@ -104,7 +104,7 @@ public final class g0 implements ServiceConnection, i0 {
 
     @Override // android.content.ServiceConnection
     public final void onServiceDisconnected(ComponentName componentName) {
-        synchronized (this.o.f1056c) {
+        synchronized (this.o.f1055c) {
             this.o.e.removeMessages(1, this.m);
             this.l = null;
             this.n = componentName;
diff --git a/app/src/main/java/c/i/a/f/e/k/i.java b/app/src/main/java/c/i/a/f/e/k/i.java
index 998218d334..83865ad951 100644
--- a/app/src/main/java/c/i/a/f/e/k/i.java
+++ b/app/src/main/java/c/i/a/f/e/k/i.java
@@ -20,7 +20,7 @@ public final class i implements j {
     }
 
     @Override // c.i.a.f.e.k.j
-    public final void v(h hVar, @Nullable GetServiceRequest getServiceRequest) throws RemoteException {
+    public final void w(h hVar, @Nullable GetServiceRequest getServiceRequest) throws RemoteException {
         Parcel obtain = Parcel.obtain();
         Parcel obtain2 = Parcel.obtain();
         try {
diff --git a/app/src/main/java/c/i/a/f/e/k/j.java b/app/src/main/java/c/i/a/f/e/k/j.java
index 1e378cdec9..112bda65a2 100644
--- a/app/src/main/java/c/i/a/f/e/k/j.java
+++ b/app/src/main/java/c/i/a/f/e/k/j.java
@@ -7,5 +7,5 @@ import androidx.annotation.RecentlyNonNull;
 import com.google.android.gms.common.internal.GetServiceRequest;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
 public interface j extends IInterface {
-    void v(@RecentlyNonNull h hVar, @Nullable GetServiceRequest getServiceRequest) throws RemoteException;
+    void w(@RecentlyNonNull h hVar, @Nullable GetServiceRequest getServiceRequest) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/e/k/q0.java b/app/src/main/java/c/i/a/f/e/k/q0.java
index fe3ba466bc..78b6bcef95 100644
--- a/app/src/main/java/c/i/a/f/e/k/q0.java
+++ b/app/src/main/java/c/i/a/f/e/k/q0.java
@@ -13,7 +13,7 @@ public final class q0 {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public static String f1057c;
+    public static String f1056c;
     public static int d;
 
     public static void a(Context context) {
@@ -23,7 +23,7 @@ public final class q0 {
                 try {
                     Bundle bundle = b.a(context).a(context.getPackageName(), 128).metaData;
                     if (bundle != null) {
-                        f1057c = bundle.getString("com.google.app.id");
+                        f1056c = bundle.getString("com.google.app.id");
                         d = bundle.getInt("com.google.android.gms.version");
                     }
                 } catch (PackageManager.NameNotFoundException e) {
diff --git a/app/src/main/java/c/i/a/f/e/k/s0.java b/app/src/main/java/c/i/a/f/e/k/s0.java
index e9fda09fed..a2ab6209fb 100644
--- a/app/src/main/java/c/i/a/f/e/k/s0.java
+++ b/app/src/main/java/c/i/a/f/e/k/s0.java
@@ -9,30 +9,30 @@ public final class s0 implements Parcelable.Creator<RootTelemetryConfiguration>
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final RootTelemetryConfiguration createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         boolean z2 = false;
         boolean z3 = false;
         int i2 = 0;
         int i3 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i4 = 65535 & readInt;
             if (i4 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i4 == 2) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i4 == 3) {
-                z3 = AnimatableValueParser.c2(parcel, readInt);
+                z3 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i4 == 4) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i4 != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i3 = AnimatableValueParser.e2(parcel, readInt);
+                i3 = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new RootTelemetryConfiguration(i, z2, z3, i2, i3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/k/t.java b/app/src/main/java/c/i/a/f/e/k/t.java
index 36c430e136..e996d6f54c 100644
--- a/app/src/main/java/c/i/a/f/e/k/t.java
+++ b/app/src/main/java/c/i/a/f/e/k/t.java
@@ -15,12 +15,12 @@ public final class t implements d.a {
     public final /* synthetic */ TaskCompletionSource b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ l.a f1058c;
+    public final /* synthetic */ l.a f1057c;
 
     public t(d dVar, TaskCompletionSource taskCompletionSource, l.a aVar, l.b bVar) {
         this.a = dVar;
         this.b = taskCompletionSource;
-        this.f1058c = aVar;
+        this.f1057c = aVar;
     }
 
     @Override // c.i.a.f.e.h.d.a
@@ -42,7 +42,7 @@ public final class t implements d.a {
             AnimatableValueParser.G(basePendingResult.f(), "Result is not ready.");
             h j = basePendingResult.j();
             TaskCompletionSource taskCompletionSource = this.b;
-            taskCompletionSource.a.t(this.f1058c.a(j));
+            taskCompletionSource.a.t(this.f1057c.a(j));
             return;
         }
         TaskCompletionSource taskCompletionSource2 = this.b;
diff --git a/app/src/main/java/c/i/a/f/e/k/x.java b/app/src/main/java/c/i/a/f/e/k/x.java
index 37b6ca657e..dba3eb4164 100644
--- a/app/src/main/java/c/i/a/f/e/k/x.java
+++ b/app/src/main/java/c/i/a/f/e/k/x.java
@@ -11,27 +11,27 @@ public final class x implements Parcelable.Creator<zas> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zas createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         Account account = null;
         GoogleSignInAccount googleSignInAccount = null;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
                 account = (Account) AnimatableValueParser.S(parcel, readInt, Account.CREATOR);
             } else if (i3 == 3) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 != 4) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 googleSignInAccount = (GoogleSignInAccount) AnimatableValueParser.S(parcel, readInt, GoogleSignInAccount.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zas(i, account, i2, googleSignInAccount);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/k/y.java b/app/src/main/java/c/i/a/f/e/k/y.java
index 21e548c5b3..059dbd1d03 100644
--- a/app/src/main/java/c/i/a/f/e/k/y.java
+++ b/app/src/main/java/c/i/a/f/e/k/y.java
@@ -11,30 +11,30 @@ public final class y implements Parcelable.Creator<zau> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zau createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         IBinder iBinder = null;
         ConnectionResult connectionResult = null;
         int i = 0;
         boolean z2 = false;
         boolean z3 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 == 2) {
-                iBinder = AnimatableValueParser.d2(parcel, readInt);
+                iBinder = AnimatableValueParser.f2(parcel, readInt);
             } else if (i2 == 3) {
                 connectionResult = (ConnectionResult) AnimatableValueParser.S(parcel, readInt, ConnectionResult.CREATOR);
             } else if (i2 == 4) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i2 != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                z3 = AnimatableValueParser.c2(parcel, readInt);
+                z3 = AnimatableValueParser.e2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zau(i, iBinder, connectionResult, z2, z3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/k/z.java b/app/src/main/java/c/i/a/f/e/k/z.java
index e15a0c3992..98b6707be4 100644
--- a/app/src/main/java/c/i/a/f/e/k/z.java
+++ b/app/src/main/java/c/i/a/f/e/k/z.java
@@ -10,12 +10,12 @@ public final class z<T extends IInterface> extends d<T> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String x() {
+    public final String w() {
         throw new NoSuchMethodError();
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String y() {
+    public final String x() {
         throw new NoSuchMethodError();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/e/l/a.java b/app/src/main/java/c/i/a/f/e/l/a.java
index cd96819bab..204b760646 100644
--- a/app/src/main/java/c/i/a/f/e/l/a.java
+++ b/app/src/main/java/c/i/a/f/e/l/a.java
@@ -11,7 +11,7 @@ public class a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1059c;
+    public final int f1058c;
 
     public a(@RecentlyNonNull String str, @RecentlyNonNull String... strArr) {
         String str2;
@@ -36,11 +36,11 @@ public class a {
         while (7 >= i && !Log.isLoggable(this.a, i)) {
             i++;
         }
-        this.f1059c = i;
+        this.f1058c = i;
     }
 
     public void a(@RecentlyNonNull String str, @Nullable Object... objArr) {
-        if (this.f1059c <= 3) {
+        if (this.f1058c <= 3) {
             String str2 = this.a;
             if (objArr.length > 0) {
                 str = String.format(Locale.US, str, objArr);
diff --git a/app/src/main/java/c/i/a/f/e/n/a.java b/app/src/main/java/c/i/a/f/e/n/a.java
index e96bed7a53..c9b3d44885 100644
--- a/app/src/main/java/c/i/a/f/e/n/a.java
+++ b/app/src/main/java/c/i/a/f/e/n/a.java
@@ -18,7 +18,7 @@ public class a {
     public static volatile a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public ConcurrentHashMap<ServiceConnection, ServiceConnection> f1060c = new ConcurrentHashMap<>();
+    public ConcurrentHashMap<ServiceConnection, ServiceConnection> f1059c = new ConcurrentHashMap<>();
 
     @RecentlyNonNull
     public static a b() {
@@ -41,7 +41,7 @@ public class a {
 
     @SuppressLint({"UntrackedBindService"})
     public void c(@RecentlyNonNull Context context, @RecentlyNonNull ServiceConnection serviceConnection) {
-        if (!(!(serviceConnection instanceof i0)) || !this.f1060c.containsKey(serviceConnection)) {
+        if (!(!(serviceConnection instanceof i0)) || !this.f1059c.containsKey(serviceConnection)) {
             try {
                 context.unbindService(serviceConnection);
             } catch (IllegalArgumentException | IllegalStateException unused) {
@@ -49,11 +49,11 @@ public class a {
         } else {
             try {
                 try {
-                    context.unbindService(this.f1060c.get(serviceConnection));
+                    context.unbindService(this.f1059c.get(serviceConnection));
                 } catch (IllegalArgumentException | IllegalStateException unused2) {
                 }
             } finally {
-                this.f1060c.remove(serviceConnection);
+                this.f1059c.remove(serviceConnection);
             }
         }
     }
@@ -76,7 +76,7 @@ public class a {
                         return false;
                     }
                     if (!(serviceConnection instanceof i0)) {
-                        ServiceConnection putIfAbsent = this.f1060c.putIfAbsent(serviceConnection, serviceConnection);
+                        ServiceConnection putIfAbsent = this.f1059c.putIfAbsent(serviceConnection, serviceConnection);
                         if (!(putIfAbsent == null || serviceConnection == putIfAbsent)) {
                             Log.w("ConnectionTracker", String.format("Duplicate binding with the same ServiceConnection: %s, %s, %s.", serviceConnection, str, intent.getAction()));
                         }
@@ -85,7 +85,7 @@ public class a {
                             if (!z3) {
                             }
                         } finally {
-                            this.f1060c.remove(serviceConnection, serviceConnection);
+                            this.f1059c.remove(serviceConnection, serviceConnection);
                         }
                     } else {
                         z3 = context.bindService(intent, serviceConnection, i);
diff --git a/app/src/main/java/c/i/a/f/e/o/c.java b/app/src/main/java/c/i/a/f/e/o/c.java
index 84ec208522..a2e3c17b10 100644
--- a/app/src/main/java/c/i/a/f/e/o/c.java
+++ b/app/src/main/java/c/i/a/f/e/o/c.java
@@ -131,7 +131,7 @@ public final class c {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public static Boolean f1061c;
+    public static Boolean f1060c;
     @Nullable
     public static Boolean d;
     public static Boolean e;
@@ -743,7 +743,7 @@ public final class c {
         c7 c7Var = ((u4) c6Var).zzb;
         if (c7Var != null) {
             for (int i2 = 0; i2 < c7Var.b; i2++) {
-                T0(sb, i, String.valueOf(c7Var.f1086c[i2] >>> 3), c7Var.d[i2]);
+                T0(sb, i, String.valueOf(c7Var.f1084c[i2] >>> 3), c7Var.d[i2]);
             }
         }
     }
@@ -1077,10 +1077,10 @@ public final class c {
         if (i2 < 0) {
             throw zzij.b();
         } else if (i2 == 0) {
-            s3Var.f1125c = "";
+            s3Var.f1123c = "";
             return z0;
         } else {
-            s3Var.f1125c = new String(bArr, z0, i2, w4.a);
+            s3Var.f1123c = new String(bArr, z0, i2, w4.a);
             return z0 + i2;
         }
     }
@@ -1108,10 +1108,10 @@ public final class c {
         if (i2 < 0) {
             throw zzij.b();
         } else if (i2 == 0) {
-            s3Var.f1125c = "";
+            s3Var.f1123c = "";
             return z0;
         } else {
-            s3Var.f1125c = k7.a.c(bArr, z0, i2);
+            s3Var.f1123c = k7.a.c(bArr, z0, i2);
             return z0 + i2;
         }
     }
@@ -1134,10 +1134,10 @@ public final class c {
         } else if (i2 > bArr.length - z0) {
             throw zzij.a();
         } else if (i2 == 0) {
-            s3Var.f1125c = t3.i;
+            s3Var.f1123c = t3.i;
             return z0;
         } else {
-            s3Var.f1125c = t3.h(bArr, z0, i2);
+            s3Var.f1123c = t3.h(bArr, z0, i2);
             return z0 + i2;
         }
     }
@@ -1683,14 +1683,14 @@ public final class c {
 
     public static int v0(q6<?> q6Var, int i, byte[] bArr, int i2, int i3, b5<?> b5Var, s3 s3Var) throws IOException {
         int x0 = x0(q6Var, bArr, i2, i3, s3Var);
-        b5Var.add(s3Var.f1125c);
+        b5Var.add(s3Var.f1123c);
         while (x0 < i3) {
             int z0 = z0(bArr, x0, s3Var);
             if (i != s3Var.a) {
                 break;
             }
             x0 = x0(q6Var, bArr, z0, i3, s3Var);
-            b5Var.add(s3Var.f1125c);
+            b5Var.add(s3Var.f1123c);
         }
         return x0;
     }
@@ -1708,7 +1708,7 @@ public final class c {
         Object b2 = e6Var.m.b(e6Var.g);
         int m = e6Var.m(b2, bArr, i, i2, i3, s3Var);
         e6Var.d(b2);
-        s3Var.f1125c = b2;
+        s3Var.f1123c = b2;
         return m;
     }
 
@@ -1733,7 +1733,7 @@ public final class c {
         int i4 = (b3 == 1 ? 1 : 0) + i3;
         q6Var.h(a2, bArr, i3, i4, s3Var);
         q6Var.d(a2);
-        s3Var.f1125c = a2;
+        s3Var.f1123c = a2;
         return i4;
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/o/i.java b/app/src/main/java/c/i/a/f/e/o/i.java
index a9c583aa99..069a2c17fe 100644
--- a/app/src/main/java/c/i/a/f/e/o/i.java
+++ b/app/src/main/java/c/i/a/f/e/o/i.java
@@ -18,7 +18,7 @@ public class i {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Method f1062c;
+    public static final Method f1061c;
     @Nullable
     public static final Method d;
 
@@ -45,7 +45,7 @@ public class i {
         } catch (Exception unused3) {
             method3 = null;
         }
-        f1062c = method3;
+        f1061c = method3;
         try {
             WorkSource.class.getMethod("get", Integer.TYPE);
         } catch (Exception unused4) {
diff --git a/app/src/main/java/c/i/a/f/e/q.java b/app/src/main/java/c/i/a/f/e/q.java
index d2b7a7c57f..e60ceb1e8c 100644
--- a/app/src/main/java/c/i/a/f/e/q.java
+++ b/app/src/main/java/c/i/a/f/e/q.java
@@ -10,27 +10,27 @@ public final class q implements Parcelable.Creator<ConnectionResult> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final ConnectionResult createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         PendingIntent pendingIntent = null;
         String str = null;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 3) {
                 pendingIntent = (PendingIntent) AnimatableValueParser.S(parcel, readInt, PendingIntent.CREATOR);
             } else if (i3 != 4) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new ConnectionResult(i, i2, pendingIntent, str);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/r.java b/app/src/main/java/c/i/a/f/e/r.java
index dc9da9bc79..242e4d816b 100644
--- a/app/src/main/java/c/i/a/f/e/r.java
+++ b/app/src/main/java/c/i/a/f/e/r.java
@@ -9,24 +9,24 @@ public final class r implements Parcelable.Creator<Feature> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Feature createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         int i = 0;
         long j = -1;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
                 str = AnimatableValueParser.T(parcel, readInt);
             } else if (i2 == 2) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                j = AnimatableValueParser.f2(parcel, readInt);
+                j = AnimatableValueParser.h2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Feature(str, i, j);
     }
 
diff --git a/app/src/main/java/c/i/a/f/e/s.java b/app/src/main/java/c/i/a/f/e/s.java
index f2c9656fbf..2defe5253e 100644
--- a/app/src/main/java/c/i/a/f/e/s.java
+++ b/app/src/main/java/c/i/a/f/e/s.java
@@ -18,16 +18,16 @@ public final class s {
     public static final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public static Context f1063c;
+    public static Context f1062c;
 
     public static a0 a(String str, t tVar, boolean z2, boolean z3) {
         o0 o0Var;
         try {
             if (a == null) {
-                Objects.requireNonNull(f1063c, "null reference");
+                Objects.requireNonNull(f1062c, "null reference");
                 synchronized (b) {
                     if (a == null) {
-                        IBinder b2 = DynamiteModule.c(f1063c, DynamiteModule.i, "com.google.android.gms.googlecertificates").b("com.google.android.gms.common.GoogleCertificatesImpl");
+                        IBinder b2 = DynamiteModule.c(f1062c, DynamiteModule.i, "com.google.android.gms.googlecertificates").b("com.google.android.gms.common.GoogleCertificatesImpl");
                         int i = n0.a;
                         if (b2 == null) {
                             o0Var = null;
@@ -39,9 +39,9 @@ public final class s {
                     }
                 }
             }
-            Objects.requireNonNull(f1063c, "null reference");
+            Objects.requireNonNull(f1062c, "null reference");
             try {
-                return a.t0(new zzj(str, tVar, z2, z3), new b(f1063c.getPackageManager())) ? a0.a : new c0(new u(z2, str, tVar), null);
+                return a.t0(new zzj(str, tVar, z2, z3), new b(f1062c.getPackageManager())) ? a0.a : new c0(new u(z2, str, tVar), null);
             } catch (RemoteException e) {
                 Log.e("GoogleCertificates", "Failed to get Google certificates from remote", e);
                 return a0.b("module call", e);
diff --git a/app/src/main/java/c/i/a/f/e/v.java b/app/src/main/java/c/i/a/f/e/v.java
index d77828fc89..e830bb0cbf 100644
--- a/app/src/main/java/c/i/a/f/e/v.java
+++ b/app/src/main/java/c/i/a/f/e/v.java
@@ -5,8 +5,8 @@ import java.lang.ref.WeakReference;
 public abstract class v extends t {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final WeakReference<byte[]> f1064c = new WeakReference<>(null);
-    public WeakReference<byte[]> d = f1064c;
+    public static final WeakReference<byte[]> f1063c = new WeakReference<>(null);
+    public WeakReference<byte[]> d = f1063c;
 
     public v(byte[] bArr) {
         super(bArr);
diff --git a/app/src/main/java/c/i/a/f/e/w.java b/app/src/main/java/c/i/a/f/e/w.java
index ecc2d0c15d..205c3d4969 100644
--- a/app/src/main/java/c/i/a/f/e/w.java
+++ b/app/src/main/java/c/i/a/f/e/w.java
@@ -5,15 +5,15 @@ import java.util.Arrays;
 public final class w extends t {
 
     /* renamed from: c  reason: collision with root package name */
-    public final byte[] f1065c;
+    public final byte[] f1064c;
 
     public w(byte[] bArr) {
         super(Arrays.copyOfRange(bArr, 0, 25));
-        this.f1065c = bArr;
+        this.f1064c = bArr;
     }
 
     @Override // c.i.a.f.e.t
     public final byte[] g() {
-        return this.f1065c;
+        return this.f1064c;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/g/b.java b/app/src/main/java/c/i/a/f/g/b.java
index 99504a618b..bc0d6ebb6d 100644
--- a/app/src/main/java/c/i/a/f/g/b.java
+++ b/app/src/main/java/c/i/a/f/g/b.java
@@ -10,12 +10,12 @@ public final class b implements DynamiteModule.a {
         int b = bVar.b(context, str);
         aVar.a = b;
         if (b != 0) {
-            aVar.f2283c = -1;
+            aVar.f2289c = -1;
         } else {
             int a = bVar.a(context, str, true);
             aVar.b = a;
             if (a != 0) {
-                aVar.f2283c = 1;
+                aVar.f2289c = 1;
             }
         }
         return aVar;
diff --git a/app/src/main/java/c/i/a/f/g/c.java b/app/src/main/java/c/i/a/f/g/c.java
index bf2eb8c2f1..20088a9022 100644
--- a/app/src/main/java/c/i/a/f/g/c.java
+++ b/app/src/main/java/c/i/a/f/g/c.java
@@ -16,11 +16,11 @@ public final class c implements DynamiteModule.a {
         }
         int i = aVar.a;
         if (i == 0 && aVar.b == 0) {
-            aVar.f2283c = 0;
+            aVar.f2289c = 0;
         } else if (i >= aVar.b) {
-            aVar.f2283c = -1;
+            aVar.f2289c = -1;
         } else {
-            aVar.f2283c = 1;
+            aVar.f2289c = 1;
         }
         return aVar;
     }
diff --git a/app/src/main/java/c/i/a/f/g/d.java b/app/src/main/java/c/i/a/f/g/d.java
index 849f85243f..c064a3f2c8 100644
--- a/app/src/main/java/c/i/a/f/g/d.java
+++ b/app/src/main/java/c/i/a/f/g/d.java
@@ -12,11 +12,11 @@ public final class d implements DynamiteModule.a {
         aVar.b = a;
         int i = aVar.a;
         if (i == 0 && a == 0) {
-            aVar.f2283c = 0;
+            aVar.f2289c = 0;
         } else if (a >= i) {
-            aVar.f2283c = 1;
+            aVar.f2289c = 1;
         } else {
-            aVar.f2283c = -1;
+            aVar.f2289c = -1;
         }
         return aVar;
     }
diff --git a/app/src/main/java/c/i/a/f/g/f.java b/app/src/main/java/c/i/a/f/g/f.java
index 9198321afe..183c2219e7 100644
--- a/app/src/main/java/c/i/a/f/g/f.java
+++ b/app/src/main/java/c/i/a/f/g/f.java
@@ -13,7 +13,7 @@ public final class f extends b implements g {
     }
 
     @Override // c.i.a.f.g.g
-    public final a A(a aVar, String str, int i) throws RemoteException {
+    public final a B(a aVar, String str, int i) throws RemoteException {
         Parcel e = e();
         c.b(e, aVar);
         e.writeString(str);
@@ -25,7 +25,7 @@ public final class f extends b implements g {
     }
 
     @Override // c.i.a.f.g.g
-    public final int O(a aVar, String str, boolean z2) throws RemoteException {
+    public final int P(a aVar, String str, boolean z2) throws RemoteException {
         Parcel e = e();
         c.b(e, aVar);
         e.writeString(str);
diff --git a/app/src/main/java/c/i/a/f/g/g.java b/app/src/main/java/c/i/a/f/g/g.java
index 164d3f3185..080a05f2cb 100644
--- a/app/src/main/java/c/i/a/f/g/g.java
+++ b/app/src/main/java/c/i/a/f/g/g.java
@@ -5,9 +5,9 @@ import android.os.RemoteException;
 import c.i.a.f.f.a;
 /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
 public interface g extends IInterface {
-    a A(a aVar, String str, int i) throws RemoteException;
+    a B(a aVar, String str, int i) throws RemoteException;
 
-    int O(a aVar, String str, boolean z2) throws RemoteException;
+    int P(a aVar, String str, boolean z2) throws RemoteException;
 
     int b() throws RemoteException;
 
diff --git a/app/src/main/java/c/i/a/f/g/h.java b/app/src/main/java/c/i/a/f/g/h.java
index 9cdc18d676..2d37a37ab8 100644
--- a/app/src/main/java/c/i/a/f/g/h.java
+++ b/app/src/main/java/c/i/a/f/g/h.java
@@ -26,7 +26,7 @@ public final class h extends b implements i {
     }
 
     @Override // c.i.a.f.g.i
-    public final a q(a aVar, String str, int i, a aVar2) throws RemoteException {
+    public final a r(a aVar, String str, int i, a aVar2) throws RemoteException {
         Parcel e = e();
         c.b(e, aVar);
         e.writeString(str);
diff --git a/app/src/main/java/c/i/a/f/g/i.java b/app/src/main/java/c/i/a/f/g/i.java
index b98b9f4be2..d3cae766be 100644
--- a/app/src/main/java/c/i/a/f/g/i.java
+++ b/app/src/main/java/c/i/a/f/g/i.java
@@ -7,5 +7,5 @@ import c.i.a.f.f.a;
 public interface i extends IInterface {
     a d(a aVar, String str, int i, a aVar2) throws RemoteException;
 
-    a q(a aVar, String str, int i, a aVar2) throws RemoteException;
+    a r(a aVar, String str, int i, a aVar2) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/a/b.java b/app/src/main/java/c/i/a/f/h/a/b.java
index 672ccea164..c585dd16ef 100644
--- a/app/src/main/java/c/i/a/f/h/a/b.java
+++ b/app/src/main/java/c/i/a/f/h/a/b.java
@@ -3,7 +3,7 @@ package c.i.a.f.h.a;
 import android.os.IInterface;
 import android.os.RemoteException;
 public interface b extends IInterface {
-    boolean D(boolean z2) throws RemoteException;
+    boolean E(boolean z2) throws RemoteException;
 
     String getId() throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/a/d.java b/app/src/main/java/c/i/a/f/h/a/d.java
index 337292f8e6..c0cae48ead 100644
--- a/app/src/main/java/c/i/a/f/h/a/d.java
+++ b/app/src/main/java/c/i/a/f/h/a/d.java
@@ -13,7 +13,7 @@ public final class d implements b, IInterface {
     }
 
     @Override // c.i.a.f.h.a.b
-    public final boolean D(boolean z2) throws RemoteException {
+    public final boolean E(boolean z2) throws RemoteException {
         Parcel obtain = Parcel.obtain();
         obtain.writeInterfaceToken(this.b);
         int i = a.a;
diff --git a/app/src/main/java/c/i/a/f/h/b/a.java b/app/src/main/java/c/i/a/f/h/b/a.java
index 7ef191af9a..4dac2da9eb 100644
--- a/app/src/main/java/c/i/a/f/h/b/a.java
+++ b/app/src/main/java/c/i/a/f/h/b/a.java
@@ -8,7 +8,6 @@ import android.os.Parcelable;
 import android.os.RemoteException;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.gms.common.api.Status;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
 public class a extends Binder implements IInterface {
     public a(String str) {
         attachInterface(this, str);
@@ -36,8 +35,8 @@ public class a extends Binder implements IInterface {
             return false;
         }
         Parcelable.Creator<Status> creator = Status.CREATOR;
-        int i3 = c.a;
-        AnimatableValueParser.w2(parcel.readInt() == 0 ? null : creator.createFromParcel(parcel), null, ((k) fVar).a);
+        int i3 = b.a;
+        AnimatableValueParser.y2(parcel.readInt() == 0 ? null : creator.createFromParcel(parcel), null, ((j) fVar).a.a);
         return true;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/b.java b/app/src/main/java/c/i/a/f/h/b/b.java
index c07f6c8950..9810fac9c3 100644
--- a/app/src/main/java/c/i/a/f/h/b/b.java
+++ b/app/src/main/java/c/i/a/f/h/b/b.java
@@ -1,22 +1,8 @@
 package c.i.a.f.h.b;
-
-import com.google.android.gms.common.Feature;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public final class b {
-    public static final Feature a;
-    public static final Feature b;
-
-    /* renamed from: c  reason: collision with root package name */
-    public static final Feature f1066c;
-    public static final Feature[] d;
+public class b {
+    public static final /* synthetic */ int a = 0;
 
     static {
-        Feature feature = new Feature("sms_code_autofill", 2);
-        a = feature;
-        Feature feature2 = new Feature("sms_retrieve", 1);
-        b = feature2;
-        Feature feature3 = new Feature("user_consent", 3);
-        f1066c = feature3;
-        d = new Feature[]{feature, feature2, feature3};
+        b.class.getClassLoader();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/c.java b/app/src/main/java/c/i/a/f/h/b/c.java
index 10e57aa3a2..dbe0bfcaa0 100644
--- a/app/src/main/java/c/i/a/f/h/b/c.java
+++ b/app/src/main/java/c/i/a/f/h/b/c.java
@@ -1,9 +1,7 @@
 package c.i.a.f.h.b;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public class c {
-    public static final /* synthetic */ int a = 0;
 
-    static {
-        c.class.getClassLoader();
-    }
+import android.os.IInterface;
+import android.os.RemoteException;
+public interface c extends IInterface {
+    void i(e eVar) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/d.java b/app/src/main/java/c/i/a/f/h/b/d.java
index d3069694ce..a48a6b6ba1 100644
--- a/app/src/main/java/c/i/a/f/h/b/d.java
+++ b/app/src/main/java/c/i/a/f/h/b/d.java
@@ -4,8 +4,7 @@ import android.os.IBinder;
 import android.os.IInterface;
 import android.os.Parcel;
 import android.os.RemoteException;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public final class d implements e, IInterface {
+public final class d implements c, IInterface {
     public final IBinder a;
     public final String b = "com.google.android.gms.auth.api.phone.internal.ISmsRetrieverApiService";
 
@@ -13,12 +12,17 @@ public final class d implements e, IInterface {
         this.a = iBinder;
     }
 
-    @Override // c.i.a.f.h.b.e
-    public final void W(g gVar) throws RemoteException {
+    @Override // android.os.IInterface
+    public IBinder asBinder() {
+        return this.a;
+    }
+
+    @Override // c.i.a.f.h.b.c
+    public final void i(e eVar) throws RemoteException {
         Parcel obtain = Parcel.obtain();
         obtain.writeInterfaceToken(this.b);
-        int i = c.a;
-        obtain.writeStrongBinder((a) gVar);
+        int i = b.a;
+        obtain.writeStrongBinder((a) eVar);
         Parcel obtain2 = Parcel.obtain();
         try {
             this.a.transact(1, obtain, obtain2, 0);
@@ -28,9 +32,4 @@ public final class d implements e, IInterface {
             obtain2.recycle();
         }
     }
-
-    @Override // android.os.IInterface
-    public IBinder asBinder() {
-        return this.a;
-    }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/e.java b/app/src/main/java/c/i/a/f/h/b/e.java
index e745734514..90035500d3 100644
--- a/app/src/main/java/c/i/a/f/h/b/e.java
+++ b/app/src/main/java/c/i/a/f/h/b/e.java
@@ -1,8 +1,5 @@
 package c.i.a.f.h.b;
 
 import android.os.IInterface;
-import android.os.RemoteException;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
 public interface e extends IInterface {
-    void W(g gVar) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/f.java b/app/src/main/java/c/i/a/f/h/b/f.java
index 5ab7e1ce64..4b2ed5ad5a 100644
--- a/app/src/main/java/c/i/a/f/h/b/f.java
+++ b/app/src/main/java/c/i/a/f/h/b/f.java
@@ -1,6 +1,5 @@
 package c.i.a.f.h.b;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public abstract class f extends a implements g {
+public abstract class f extends a implements e {
     public f() {
         super("com.google.android.gms.auth.api.phone.internal.ISmsRetrieverResultCallback");
     }
diff --git a/app/src/main/java/c/i/a/f/h/b/g.java b/app/src/main/java/c/i/a/f/h/b/g.java
index 68b7ab1c2a..a3e32b1b01 100644
--- a/app/src/main/java/c/i/a/f/h/b/g.java
+++ b/app/src/main/java/c/i/a/f/h/b/g.java
@@ -1,6 +1,38 @@
 package c.i.a.f.h.b;
 
+import android.content.Context;
+import android.os.IBinder;
 import android.os.IInterface;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public interface g extends IInterface {
+import android.os.Looper;
+import c.i.a.f.e.h.c;
+import c.i.a.f.e.k.c;
+import c.i.a.f.e.k.d;
+public final class g extends d<c> {
+    public g(Context context, Looper looper, c cVar, c.a aVar, c.b bVar) {
+        super(context, looper, 126, cVar, aVar, bVar);
+    }
+
+    @Override // c.i.a.f.e.k.b, c.i.a.f.e.h.a.f
+    public final int l() {
+        return 12451000;
+    }
+
+    @Override // c.i.a.f.e.k.b
+    public final /* synthetic */ IInterface r(IBinder iBinder) {
+        if (iBinder == null) {
+            return null;
+        }
+        IInterface queryLocalInterface = iBinder.queryLocalInterface("com.google.android.gms.auth.api.phone.internal.ISmsRetrieverApiService");
+        return queryLocalInterface instanceof c ? (c) queryLocalInterface : new d(iBinder);
+    }
+
+    @Override // c.i.a.f.e.k.b
+    public final String w() {
+        return "com.google.android.gms.auth.api.phone.internal.ISmsRetrieverApiService";
+    }
+
+    @Override // c.i.a.f.e.k.b
+    public final String x() {
+        return "com.google.android.gms.auth.api.phone.service.SmsRetrieverApiService.START";
+    }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/h.java b/app/src/main/java/c/i/a/f/h/b/h.java
index 9dad66a31b..c108039ef6 100644
--- a/app/src/main/java/c/i/a/f/h/b/h.java
+++ b/app/src/main/java/c/i/a/f/h/b/h.java
@@ -1,10 +1,10 @@
 package c.i.a.f.h.b;
 
 import android.app.Activity;
+import androidx.annotation.NonNull;
 import c.i.a.f.c.a.e.a;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
 public final class h extends a {
-    public h(Activity activity) {
+    public h(@NonNull Activity activity) {
         super(activity);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/i.java b/app/src/main/java/c/i/a/f/h/b/i.java
index bfd6385701..6bc64875c3 100644
--- a/app/src/main/java/c/i/a/f/h/b/i.java
+++ b/app/src/main/java/c/i/a/f/h/b/i.java
@@ -1,46 +1,6 @@
 package c.i.a.f.h.b;
-
-import android.content.Context;
-import android.os.IBinder;
-import android.os.IInterface;
-import android.os.Looper;
-import c.i.a.f.e.h.j.f;
-import c.i.a.f.e.h.j.l;
-import c.i.a.f.e.k.c;
-import c.i.a.f.e.k.d;
-import com.google.android.gms.common.Feature;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public final class i extends d<e> {
-    public i(Context context, Looper looper, c cVar, f fVar, l lVar) {
-        super(context, looper, 126, cVar, fVar, lVar);
-    }
-
-    @Override // c.i.a.f.e.k.b, c.i.a.f.e.h.a.f
-    public final int l() {
-        return 12451000;
-    }
-
-    @Override // c.i.a.f.e.k.b
-    public final /* synthetic */ IInterface r(IBinder iBinder) {
-        if (iBinder == null) {
-            return null;
-        }
-        IInterface queryLocalInterface = iBinder.queryLocalInterface("com.google.android.gms.auth.api.phone.internal.ISmsRetrieverApiService");
-        return queryLocalInterface instanceof e ? (e) queryLocalInterface : new d(iBinder);
-    }
-
-    @Override // c.i.a.f.e.k.b
-    public final Feature[] t() {
-        return b.d;
-    }
-
-    @Override // c.i.a.f.e.k.b
-    public final String x() {
-        return "com.google.android.gms.auth.api.phone.internal.ISmsRetrieverApiService";
-    }
-
-    @Override // c.i.a.f.e.k.b
-    public final String y() {
-        return "com.google.android.gms.auth.api.phone.service.SmsRetrieverApiService.START";
+public final class i extends k {
+    public i() {
+        super(null);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/j.java b/app/src/main/java/c/i/a/f/h/b/j.java
index 6b23d5f5df..ab9f6bbcf8 100644
--- a/app/src/main/java/c/i/a/f/h/b/j.java
+++ b/app/src/main/java/c/i/a/f/h/b/j.java
@@ -1,9 +1,8 @@
 package c.i.a.f.h.b;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public final /* synthetic */ class j {
-    public final h a;
+public final class j extends f {
+    public final /* synthetic */ i a;
 
-    public j(h hVar) {
-        this.a = hVar;
+    public j(i iVar) {
+        this.a = iVar;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/b/k.java b/app/src/main/java/c/i/a/f/h/b/k.java
index 10b289bbdf..a1a5962e39 100644
--- a/app/src/main/java/c/i/a/f/h/b/k.java
+++ b/app/src/main/java/c/i/a/f/h/b/k.java
@@ -1,11 +1,18 @@
 package c.i.a.f.h.b;
 
+import android.os.RemoteException;
+import c.i.a.f.e.h.j.p;
 import com.google.android.gms.tasks.TaskCompletionSource;
-/* compiled from: com.google.android.gms:play-services-auth-api-phone@@17.4.0 */
-public final class k extends f {
-    public final /* synthetic */ TaskCompletionSource a;
+public abstract class k extends p<g, Void> {
+    public TaskCompletionSource<Void> a;
 
-    public k(TaskCompletionSource taskCompletionSource) {
+    public k(i iVar) {
+    }
+
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [c.i.a.f.e.h.a$b, com.google.android.gms.tasks.TaskCompletionSource] */
+    @Override // c.i.a.f.e.h.j.p
+    public void c(g gVar, TaskCompletionSource<Void> taskCompletionSource) throws RemoteException {
         this.a = taskCompletionSource;
+        gVar.v().i(new j((i) this));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/f.java b/app/src/main/java/c/i/a/f/h/c/f.java
index 8f78a5ff97..aa42ad52c4 100644
--- a/app/src/main/java/c/i/a/f/h/c/f.java
+++ b/app/src/main/java/c/i/a/f/h/c/f.java
@@ -5,7 +5,7 @@ import com.google.android.gms.common.api.Status;
 /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */
 public class f extends q {
     @Override // c.i.a.f.h.c.r
-    public void L(Status status, Credential credential) {
+    public void M(Status status, Credential credential) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/g.java b/app/src/main/java/c/i/a/f/h/c/g.java
index 33b958e6ac..54ed456927 100644
--- a/app/src/main/java/c/i/a/f/h/c/g.java
+++ b/app/src/main/java/c/i/a/f/h/c/g.java
@@ -24,6 +24,6 @@ public final class g extends m<b> {
 
     @Override // c.i.a.f.h.c.m
     public final void m(Context context, t tVar) throws RemoteException {
-        tVar.s(new j(this), this.l);
+        tVar.t(new j(this), this.l);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/i.java b/app/src/main/java/c/i/a/f/h/c/i.java
index 6a3405d7fd..a2688831bc 100644
--- a/app/src/main/java/c/i/a/f/h/c/i.java
+++ b/app/src/main/java/c/i/a/f/h/c/i.java
@@ -24,6 +24,6 @@ public final class i extends m<Status> {
 
     @Override // c.i.a.f.h.c.m
     public final void m(Context context, t tVar) throws RemoteException {
-        tVar.w(new n(this), new zzz(this.l));
+        tVar.x(new n(this), new zzz(this.l));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/j.java b/app/src/main/java/c/i/a/f/h/c/j.java
index 65df49e03d..54c6b349a7 100644
--- a/app/src/main/java/c/i/a/f/h/c/j.java
+++ b/app/src/main/java/c/i/a/f/h/c/j.java
@@ -11,12 +11,12 @@ public final class j extends f {
     }
 
     @Override // c.i.a.f.h.c.f, c.i.a.f.h.c.r
-    public final void L(Status status, Credential credential) {
+    public final void M(Status status, Credential credential) {
         this.a.b(new e(status, credential));
     }
 
     @Override // c.i.a.f.h.c.r
-    public final void k(Status status) {
+    public final void l(Status status) {
         this.a.b(new e(status, null));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/k.java b/app/src/main/java/c/i/a/f/h/c/k.java
index d6e501a467..04b89ef80c 100644
--- a/app/src/main/java/c/i/a/f/h/c/k.java
+++ b/app/src/main/java/c/i/a/f/h/c/k.java
@@ -18,6 +18,6 @@ public final class k extends m<Status> {
 
     @Override // c.i.a.f.h.c.m
     public final void m(Context context, t tVar) throws RemoteException {
-        tVar.J(new n(this));
+        tVar.K(new n(this));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/l.java b/app/src/main/java/c/i/a/f/h/c/l.java
index 41147e5892..075d911008 100644
--- a/app/src/main/java/c/i/a/f/h/c/l.java
+++ b/app/src/main/java/c/i/a/f/h/c/l.java
@@ -24,6 +24,6 @@ public final class l extends m<Status> {
 
     @Override // c.i.a.f.h.c.m
     public final void m(Context context, t tVar) throws RemoteException {
-        tVar.I(new n(this), new zzt(this.l));
+        tVar.J(new n(this), new zzt(this.l));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/m.java b/app/src/main/java/c/i/a/f/h/c/m.java
index 06dd4fd40f..01ac5700d5 100644
--- a/app/src/main/java/c/i/a/f/h/c/m.java
+++ b/app/src/main/java/c/i/a/f/h/c/m.java
@@ -24,7 +24,7 @@ public abstract class m<R extends h> extends d<R, o> {
     @Override // c.i.a.f.e.h.j.d
     public void k(o oVar) throws RemoteException {
         o oVar2 = oVar;
-        m(oVar2.d, oVar2.w());
+        m(oVar2.d, oVar2.v());
     }
 
     public abstract void m(Context context, t tVar) throws DeadObjectException, RemoteException;
diff --git a/app/src/main/java/c/i/a/f/h/c/n.java b/app/src/main/java/c/i/a/f/h/c/n.java
index 6b75500f2f..8cafbd780e 100644
--- a/app/src/main/java/c/i/a/f/h/c/n.java
+++ b/app/src/main/java/c/i/a/f/h/c/n.java
@@ -11,7 +11,7 @@ public final class n extends f {
     }
 
     @Override // c.i.a.f.h.c.r
-    public final void k(Status status) {
+    public final void l(Status status) {
         this.a.b(status);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/o.java b/app/src/main/java/c/i/a/f/h/c/o.java
index 41e094a59a..5d56e7d9bb 100644
--- a/app/src/main/java/c/i/a/f/h/c/o.java
+++ b/app/src/main/java/c/i/a/f/h/c/o.java
@@ -39,7 +39,7 @@ public final class o extends d<t> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final Bundle u() {
+    public final Bundle t() {
         a.C0098a aVar = this.A;
         Objects.requireNonNull(aVar);
         Bundle bundle = new Bundle();
@@ -50,12 +50,12 @@ public final class o extends d<t> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.auth.api.credentials.internal.ICredentialsService";
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.auth.api.credentials.service.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/p.java b/app/src/main/java/c/i/a/f/h/c/p.java
index eec2b64a74..62a3fbc482 100644
--- a/app/src/main/java/c/i/a/f/h/c/p.java
+++ b/app/src/main/java/c/i/a/f/h/c/p.java
@@ -10,17 +10,17 @@ public final class p implements Parcelable.Creator<zzt> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzt createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Credential credential = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 1) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 credential = (Credential) AnimatableValueParser.S(parcel, readInt, Credential.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzt(credential);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/c/q.java b/app/src/main/java/c/i/a/f/h/c/q.java
index f0b4383ada..287a43db82 100644
--- a/app/src/main/java/c/i/a/f/h/c/q.java
+++ b/app/src/main/java/c/i/a/f/h/c/q.java
@@ -13,9 +13,9 @@ public abstract class q extends b implements r {
     @Override // c.i.a.f.h.c.b
     public final boolean e(int i, Parcel parcel, Parcel parcel2, int i2) throws RemoteException {
         if (i == 1) {
-            L((Status) d.a(parcel, Status.CREATOR), (Credential) d.a(parcel, Credential.CREATOR));
+            M((Status) d.a(parcel, Status.CREATOR), (Credential) d.a(parcel, Credential.CREATOR));
         } else if (i == 2) {
-            k((Status) d.a(parcel, Status.CREATOR));
+            l((Status) d.a(parcel, Status.CREATOR));
         } else if (i != 3) {
             return false;
         } else {
diff --git a/app/src/main/java/c/i/a/f/h/c/r.java b/app/src/main/java/c/i/a/f/h/c/r.java
index ae92d27daf..4f9a74fee9 100644
--- a/app/src/main/java/c/i/a/f/h/c/r.java
+++ b/app/src/main/java/c/i/a/f/h/c/r.java
@@ -6,7 +6,7 @@ import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.common.api.Status;
 /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */
 public interface r extends IInterface {
-    void L(Status status, Credential credential) throws RemoteException;
+    void M(Status status, Credential credential) throws RemoteException;
 
-    void k(Status status) throws RemoteException;
+    void l(Status status) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/s.java b/app/src/main/java/c/i/a/f/h/c/s.java
index c866a2c545..b66ffe9d8b 100644
--- a/app/src/main/java/c/i/a/f/h/c/s.java
+++ b/app/src/main/java/c/i/a/f/h/c/s.java
@@ -13,7 +13,7 @@ public final class s extends c implements t {
     }
 
     @Override // c.i.a.f.h.c.t
-    public final void I(r rVar, zzt zzt) throws RemoteException {
+    public final void J(r rVar, zzt zzt) throws RemoteException {
         Parcel e = e();
         d.b(e, rVar);
         d.c(e, zzt);
@@ -21,14 +21,14 @@ public final class s extends c implements t {
     }
 
     @Override // c.i.a.f.h.c.t
-    public final void J(r rVar) throws RemoteException {
+    public final void K(r rVar) throws RemoteException {
         Parcel e = e();
         d.b(e, rVar);
         g(4, e);
     }
 
     @Override // c.i.a.f.h.c.t
-    public final void s(r rVar, CredentialRequest credentialRequest) throws RemoteException {
+    public final void t(r rVar, CredentialRequest credentialRequest) throws RemoteException {
         Parcel e = e();
         d.b(e, rVar);
         d.c(e, credentialRequest);
@@ -36,7 +36,7 @@ public final class s extends c implements t {
     }
 
     @Override // c.i.a.f.h.c.t
-    public final void w(r rVar, zzz zzz) throws RemoteException {
+    public final void x(r rVar, zzz zzz) throws RemoteException {
         Parcel e = e();
         d.b(e, rVar);
         d.c(e, zzz);
diff --git a/app/src/main/java/c/i/a/f/h/c/t.java b/app/src/main/java/c/i/a/f/h/c/t.java
index 1901b549b7..7a59727098 100644
--- a/app/src/main/java/c/i/a/f/h/c/t.java
+++ b/app/src/main/java/c/i/a/f/h/c/t.java
@@ -7,11 +7,11 @@ import com.google.android.gms.internal.p000authapi.zzt;
 import com.google.android.gms.internal.p000authapi.zzz;
 /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */
 public interface t extends IInterface {
-    void I(r rVar, zzt zzt) throws RemoteException;
+    void J(r rVar, zzt zzt) throws RemoteException;
 
-    void J(r rVar) throws RemoteException;
+    void K(r rVar) throws RemoteException;
 
-    void s(r rVar, CredentialRequest credentialRequest) throws RemoteException;
+    void t(r rVar, CredentialRequest credentialRequest) throws RemoteException;
 
-    void w(r rVar, zzz zzz) throws RemoteException;
+    void x(r rVar, zzz zzz) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/c/u.java b/app/src/main/java/c/i/a/f/h/c/u.java
index 99de513105..f1fe6eb810 100644
--- a/app/src/main/java/c/i/a/f/h/c/u.java
+++ b/app/src/main/java/c/i/a/f/h/c/u.java
@@ -10,17 +10,17 @@ public final class u implements Parcelable.Creator<zzz> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzz createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Credential credential = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 1) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 credential = (Credential) AnimatableValueParser.S(parcel, readInt, Credential.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzz(credential);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/d/a.java b/app/src/main/java/c/i/a/f/h/d/a.java
index dfb30cc3db..88e66976a0 100644
--- a/app/src/main/java/c/i/a/f/h/d/a.java
+++ b/app/src/main/java/c/i/a/f/h/d/a.java
@@ -30,7 +30,7 @@ public final class a extends d<b> {
 
     @Override // c.i.a.f.e.k.b, c.i.a.f.e.h.a.f
     public final boolean o() {
-        c.i.a.f.e.k.c cVar = this.f1052x;
+        c.i.a.f.e.k.c cVar = this.f1051x;
         Account account = cVar.a;
         if (TextUtils.isEmpty(account != null ? account.name : null)) {
             return false;
@@ -51,17 +51,17 @@ public final class a extends d<b> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final Bundle u() {
+    public final Bundle t() {
         return this.A;
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.auth.api.internal.IAuthService";
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.auth.service.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/h/a.java b/app/src/main/java/c/i/a/f/h/h/a.java
index 397260e84e..4ac48be04f 100644
--- a/app/src/main/java/c/i/a/f/h/h/a.java
+++ b/app/src/main/java/c/i/a/f/h/h/a.java
@@ -41,7 +41,7 @@ public class a extends Binder implements IInterface {
             Status status = (Status) b.a(parcel, Status.CREATOR);
             DynamicLinkData dynamicLinkData = (DynamicLinkData) b.a(parcel, DynamicLinkData.CREATOR);
             g gVar = (g) kVar;
-            AnimatableValueParser.w2(status, dynamicLinkData == null ? null : new PendingDynamicLinkData(dynamicLinkData), gVar.a);
+            AnimatableValueParser.y2(status, dynamicLinkData == null ? null : new PendingDynamicLinkData(dynamicLinkData), gVar.a);
             if (dynamicLinkData != null) {
                 Bundle bundle = dynamicLinkData.m;
                 if (bundle == null) {
diff --git a/app/src/main/java/c/i/a/f/h/j/a0.java b/app/src/main/java/c/i/a/f/h/j/a0.java
index 5f293cd9d2..8a5d0c9ced 100644
--- a/app/src/main/java/c/i/a/f/h/j/a0.java
+++ b/app/src/main/java/c/i/a/f/h/j/a0.java
@@ -8,7 +8,7 @@ public abstract class a0 {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Runnable f1067c = new b0(this);
+    public final Runnable f1065c = new b0(this);
     public volatile long d;
 
     public a0(g gVar) {
@@ -18,7 +18,7 @@ public abstract class a0 {
 
     public final void a() {
         this.d = 0;
-        b().removeCallbacks(this.f1067c);
+        b().removeCallbacks(this.f1065c);
     }
 
     public final Handler b() {
@@ -46,7 +46,7 @@ public abstract class a0 {
         if (j >= 0) {
             Objects.requireNonNull((d) this.b.d);
             this.d = System.currentTimeMillis();
-            if (!b().postDelayed(this.f1067c, j)) {
+            if (!b().postDelayed(this.f1065c, j)) {
                 this.b.c().B("Failed to schedule delayed post. time", Long.valueOf(j));
             }
         }
diff --git a/app/src/main/java/c/i/a/f/h/j/a1.java b/app/src/main/java/c/i/a/f/h/j/a1.java
index 5f41d3f385..90ff4de5f3 100644
--- a/app/src/main/java/c/i/a/f/h/j/a1.java
+++ b/app/src/main/java/c/i/a/f/h/j/a1.java
@@ -38,7 +38,7 @@ public final class a1 extends e {
         if (bundle != null && (i = bundle.getInt("com.google.android.gms.analytics.globalConfigResource")) > 0) {
             g0 g0Var = new g0(this.i);
             try {
-                i0Var = g0Var.I(g0Var.i.f1075c.getResources().getXml(i));
+                i0Var = g0Var.I(g0Var.i.f1073c.getResources().getXml(i));
             } catch (Resources.NotFoundException e2) {
                 g0Var.x("inflate() called with unknown resourceId", e2);
             }
@@ -55,7 +55,7 @@ public final class a1 extends e {
                     this.k = str2;
                     d("XML config - app version", str2);
                 }
-                String str3 = i0Var.f1076c;
+                String str3 = i0Var.f1074c;
                 if (str3 != null) {
                     String lowerCase = str3.toLowerCase(Locale.US);
                     int i2 = "verbose".equals(lowerCase) ? 0 : "info".equals(lowerCase) ? 1 : "warning".equals(lowerCase) ? 2 : "error".equals(lowerCase) ? 3 : -1;
diff --git a/app/src/main/java/c/i/a/f/h/j/b1.java b/app/src/main/java/c/i/a/f/h/j/b1.java
index a857e9ae79..2dac8901f9 100644
--- a/app/src/main/java/c/i/a/f/h/j/b1.java
+++ b/app/src/main/java/c/i/a/f/h/j/b1.java
@@ -16,7 +16,7 @@ public final class b1 {
     public static final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static volatile d1 f1068c = c1.a;
+    public static volatile d1 f1066c = c1.a;
 
     /* JADX WARNING: Removed duplicated region for block: B:12:0x003b  */
     static {
diff --git a/app/src/main/java/c/i/a/f/h/j/e0.java b/app/src/main/java/c/i/a/f/h/j/e0.java
index 2394d56e1b..44144dfef4 100644
--- a/app/src/main/java/c/i/a/f/h/j/e0.java
+++ b/app/src/main/java/c/i/a/f/h/j/e0.java
@@ -10,7 +10,7 @@ public final class e0 {
     public static f0<String> b = f0.c("analytics.log_tag", "GAv4", "GAv4-SVC");
 
     /* renamed from: c  reason: collision with root package name */
-    public static f0<Long> f1069c = f0.b("analytics.local_dispatch_millis", 1800000, 120000);
+    public static f0<Long> f1067c = f0.b("analytics.local_dispatch_millis", 1800000, 120000);
     public static f0<Long> d = f0.b("analytics.initial_local_dispatch_millis", 5000, 5000);
     public static f0<Long> e = f0.b("analytics.dispatch_alarm_millis", 7200000, 7200000);
     public static f0<Long> f = f0.b("analytics.max_dispatch_alarm_millis", 32400000, 32400000);
@@ -28,20 +28,20 @@ public final class e0 {
     public static f0<Integer> r = f0.a("analytics.max_batch_post_length", 8192, 8192);
 
     /* renamed from: s  reason: collision with root package name */
-    public static f0<String> f1070s = f0.c("analytics.fallback_responses.k", "404,502", "404,502");
+    public static f0<String> f1068s = f0.c("analytics.fallback_responses.k", "404,502", "404,502");
     public static f0<Integer> t = f0.a("analytics.batch_retry_interval.seconds.k", 3600, 3600);
     public static f0<Integer> u = f0.a("analytics.http_connection.connect_timeout_millis", 60000, 60000);
     public static f0<Integer> v = f0.a("analytics.http_connection.read_timeout_millis", 61000, 61000);
     public static f0<Boolean> w = f0.d("analytics.test.disable_receiver", false, false);
 
     /* renamed from: x  reason: collision with root package name */
-    public static f0<Long> f1071x = f0.b("analytics.service_client.idle_disconnect_millis", 10000, 10000);
+    public static f0<Long> f1069x = f0.b("analytics.service_client.idle_disconnect_millis", 10000, 10000);
 
     /* renamed from: y  reason: collision with root package name */
-    public static f0<Long> f1072y = f0.b("analytics.service_client.connect_timeout_millis", 5000, 5000);
+    public static f0<Long> f1070y = f0.b("analytics.service_client.connect_timeout_millis", 5000, 5000);
 
     /* renamed from: z  reason: collision with root package name */
-    public static f0<Long> f1073z = f0.b("analytics.service_client.reconnect_throttle_millis", 1800000, 1800000);
+    public static f0<Long> f1071z = f0.b("analytics.service_client.reconnect_throttle_millis", 1800000, 1800000);
 
     static {
         f0.d("analytics.service_enabled", false, false);
diff --git a/app/src/main/java/c/i/a/f/h/j/f1.java b/app/src/main/java/c/i/a/f/h/j/f1.java
index 6eaf18c9a5..cb9c06e05d 100644
--- a/app/src/main/java/c/i/a/f/h/j/f1.java
+++ b/app/src/main/java/c/i/a/f/h/j/f1.java
@@ -7,14 +7,14 @@ public final class f1 extends e<f1> {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1074c;
+    public String f1072c;
     public String d;
 
     public final String toString() {
         HashMap hashMap = new HashMap();
         hashMap.put("appName", this.a);
         hashMap.put("appVersion", this.b);
-        hashMap.put("appId", this.f1074c);
+        hashMap.put("appId", this.f1072c);
         hashMap.put("appInstallerId", this.d);
         return e.a(hashMap, 0);
     }
diff --git a/app/src/main/java/c/i/a/f/h/j/g.java b/app/src/main/java/c/i/a/f/h/j/g.java
index f4bcbe8562..7456c16f39 100644
--- a/app/src/main/java/c/i/a/f/h/j/g.java
+++ b/app/src/main/java/c/i/a/f/h/j/g.java
@@ -16,7 +16,7 @@ public class g {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Context f1075c;
+    public final Context f1073c;
     public final b d;
     public final z e = new z(this);
     public final m0 f;
@@ -32,7 +32,7 @@ public class g {
         Context context2 = iVar.b;
         Objects.requireNonNull(context2, "null reference");
         this.b = context;
-        this.f1075c = context2;
+        this.f1073c = context2;
         d dVar = d.a;
         this.d = dVar;
         m0 m0Var = new m0(this);
diff --git a/app/src/main/java/c/i/a/f/h/j/h0.java b/app/src/main/java/c/i/a/f/h/j/h0.java
index 15c73e3498..3280e069a4 100644
--- a/app/src/main/java/c/i/a/f/h/j/h0.java
+++ b/app/src/main/java/c/i/a/f/h/j/h0.java
@@ -29,7 +29,7 @@ public final class h0 {
         } else if ("ga_appVersion".equals(str)) {
             this.b.b = str2;
         } else if ("ga_logLevel".equals(str)) {
-            this.b.f1076c = str2;
+            this.b.f1074c = str2;
         } else {
             this.a.c().x("String xml configuration name not recognized", str);
         }
diff --git a/app/src/main/java/c/i/a/f/h/j/i0.java b/app/src/main/java/c/i/a/f/h/j/i0.java
index e1abca721e..f9c69db3e1 100644
--- a/app/src/main/java/c/i/a/f/h/j/i0.java
+++ b/app/src/main/java/c/i/a/f/h/j/i0.java
@@ -4,7 +4,7 @@ public final class i0 {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1076c;
+    public String f1074c;
     public int d = -1;
     public int e = -1;
 }
diff --git a/app/src/main/java/c/i/a/f/h/j/j.java b/app/src/main/java/c/i/a/f/h/j/j.java
index 12b9dccc8c..5e734cd948 100644
--- a/app/src/main/java/c/i/a/f/h/j/j.java
+++ b/app/src/main/java/c/i/a/f/h/j/j.java
@@ -66,6 +66,6 @@ public final class j extends e {
 
     public final void T() {
         this.n.a();
-        this.m.e(e0.f1071x.a.longValue());
+        this.m.e(e0.f1069x.a.longValue());
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/j/j0.java b/app/src/main/java/c/i/a/f/h/j/j0.java
index 6456cd34af..ce226e1fe5 100644
--- a/app/src/main/java/c/i/a/f/h/j/j0.java
+++ b/app/src/main/java/c/i/a/f/h/j/j0.java
@@ -14,7 +14,7 @@ public final class j0 {
     public final List<?> b = Collections.emptyList();
 
     /* renamed from: c  reason: collision with root package name */
-    public final long f1077c;
+    public final long f1075c;
     public final long d;
     public final int e;
     public final boolean f;
@@ -26,7 +26,7 @@ public final class j0 {
         Objects.requireNonNull(map, "null reference");
         this.d = j;
         this.f = z2;
-        this.f1077c = j2;
+        this.f1075c = j2;
         this.e = i;
         TextUtils.isEmpty(null);
         this.g = null;
@@ -94,9 +94,9 @@ public final class j0 {
     public final String toString() {
         StringBuilder L = a.L("ht=");
         L.append(this.d);
-        if (this.f1077c != 0) {
+        if (this.f1075c != 0) {
             L.append(", dbId=");
-            L.append(this.f1077c);
+            L.append(this.f1075c);
         }
         if (this.e != 0) {
             L.append(", appUID=");
diff --git a/app/src/main/java/c/i/a/f/h/j/n0.java b/app/src/main/java/c/i/a/f/h/j/n0.java
index 486c325198..4d993216de 100644
--- a/app/src/main/java/c/i/a/f/h/j/n0.java
+++ b/app/src/main/java/c/i/a/f/h/j/n0.java
@@ -12,7 +12,7 @@ public class n0 extends BroadcastReceiver {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1078c;
+    public boolean f1076c;
     public boolean d;
 
     public n0(g gVar) {
@@ -21,9 +21,9 @@ public class n0 extends BroadcastReceiver {
     }
 
     public final void a() {
-        if (this.f1078c) {
+        if (this.f1076c) {
             this.b.c().C("Unregistering connectivity change receiver");
-            this.f1078c = false;
+            this.f1076c = false;
             this.d = false;
             try {
                 this.b.b.unregisterReceiver(this);
diff --git a/app/src/main/java/c/i/a/f/h/j/o0.java b/app/src/main/java/c/i/a/f/h/j/o0.java
index 9f55f45aff..5162ecce4a 100644
--- a/app/src/main/java/c/i/a/f/h/j/o0.java
+++ b/app/src/main/java/c/i/a/f/h/j/o0.java
@@ -184,7 +184,7 @@ public final class o0 extends e {
                 } catch (NumberFormatException unused) {
                     j = 0;
                 }
-                S(sb, "z", j != 0 ? String.valueOf(j) : String.valueOf(j0Var.f1077c));
+                S(sb, "z", j != 0 ? String.valueOf(j) : String.valueOf(j0Var.f1075c));
             }
             return sb.toString();
         } catch (UnsupportedEncodingException e) {
@@ -336,7 +336,7 @@ public final class o0 extends e {
                             if (z5) {
                                 break;
                             }
-                            arrayList.add(Long.valueOf(j0Var.f1077c));
+                            arrayList.add(Long.valueOf(j0Var.f1075c));
                         }
                         z5 = false;
                         if (z5) {
@@ -598,7 +598,7 @@ public final class o0 extends e {
                         if (z4) {
                             break;
                         }
-                        arrayList2.add(Long.valueOf(j0Var2.f1077c));
+                        arrayList2.add(Long.valueOf(j0Var2.f1075c));
                         if (arrayList2.size() >= z.c()) {
                             break;
                         }
diff --git a/app/src/main/java/c/i/a/f/h/j/q.java b/app/src/main/java/c/i/a/f/h/j/q.java
index e9b5773d96..9af72355ce 100644
--- a/app/src/main/java/c/i/a/f/h/j/q.java
+++ b/app/src/main/java/c/i/a/f/h/j/q.java
@@ -21,7 +21,7 @@ public final class q extends e {
                     f1 f1Var = new f1();
                     PackageManager packageManager = r.b.getPackageManager();
                     String packageName = r.b.getPackageName();
-                    f1Var.f1074c = packageName;
+                    f1Var.f1072c = packageName;
                     f1Var.d = packageManager.getInstallerPackageName(packageName);
                     String str = null;
                     try {
@@ -51,8 +51,8 @@ public final class q extends e {
         if (!TextUtils.isEmpty(f1Var2.b)) {
             f1Var3.b = f1Var2.b;
         }
-        if (!TextUtils.isEmpty(f1Var2.f1074c)) {
-            f1Var3.f1074c = f1Var2.f1074c;
+        if (!TextUtils.isEmpty(f1Var2.f1072c)) {
+            f1Var3.f1072c = f1Var2.f1072c;
         }
         if (!TextUtils.isEmpty(f1Var2.d)) {
             f1Var3.d = f1Var2.d;
diff --git a/app/src/main/java/c/i/a/f/h/j/r.java b/app/src/main/java/c/i/a/f/h/j/r.java
index 5dfd29d0e6..c1e96652d6 100644
--- a/app/src/main/java/c/i/a/f/h/j/r.java
+++ b/app/src/main/java/c/i/a/f/h/j/r.java
@@ -31,7 +31,7 @@ public final class r extends e {
     public final a0 r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final y0 f1079s;
+    public final y0 f1077s;
     public long t;
     public boolean u;
 
@@ -41,7 +41,7 @@ public final class r extends e {
         this.l = new o(gVar);
         this.m = new o0(gVar);
         this.o = new j(gVar);
-        this.f1079s = new y0(this.i.d);
+        this.f1077s = new y0(this.i.d);
         this.q = new s(this, gVar);
         this.r = new t(this, gVar);
     }
@@ -82,7 +82,7 @@ public final class r extends e {
                             }
                             arrayList.remove(j0Var);
                             try {
-                                this.l.W(j0Var.f1077c);
+                                this.l.W(j0Var.f1075c);
                             } catch (SQLiteException e) {
                                 B("Failed to remove hit that was send for delivery", e);
                                 W();
@@ -143,8 +143,8 @@ public final class r extends e {
     public final void S() {
         k0 k0Var;
         if (!this.u && e0.a.a.booleanValue() && !this.o.R()) {
-            if (this.f1079s.b(e0.f1073z.a.longValue())) {
-                this.f1079s.a();
+            if (this.f1077s.b(e0.f1071z.a.longValue())) {
+                this.f1077s.a();
                 C("Connecting to service");
                 j jVar = this.o;
                 Objects.requireNonNull(jVar);
@@ -170,7 +170,7 @@ public final class r extends e {
                             lVar.j = false;
                         } else {
                             try {
-                                lVar.wait(e0.f1072y.a.longValue());
+                                lVar.wait(e0.f1070y.a.longValue());
                             } catch (InterruptedException unused) {
                                 lVar.k.G("Wait for service connect was interrupted");
                             }
@@ -192,7 +192,7 @@ public final class r extends e {
                 }
                 if (z2) {
                     C("Connected to service");
-                    this.f1079s.b = 0;
+                    this.f1077s.b = 0;
                     Q();
                 }
             }
@@ -234,7 +234,7 @@ public final class r extends e {
                             b("Hits loaded from store. count", Integer.valueOf(arrayList2.size()));
                             Iterator it = arrayList2.iterator();
                             while (it.hasNext()) {
-                                if (((j0) it.next()).f1077c == j) {
+                                if (((j0) it.next()).f1075c == j) {
                                     z("Database contains successfully uploaded hit", Long.valueOf(j), Integer.valueOf(arrayList2.size()));
                                     W();
                                     try {
@@ -253,12 +253,12 @@ public final class r extends e {
                                     if (!this.o.S(j0Var)) {
                                         break;
                                     }
-                                    j = Math.max(j, j0Var.f1077c);
+                                    j = Math.max(j, j0Var.f1075c);
                                     arrayList2.remove(j0Var);
                                     d("Hit sent do device AnalyticsService for delivery", j0Var);
                                     try {
-                                        this.l.W(j0Var.f1077c);
-                                        arrayList.add(Long.valueOf(j0Var.f1077c));
+                                        this.l.W(j0Var.f1075c);
+                                        arrayList.add(Long.valueOf(j0Var.f1075c));
                                     } catch (SQLiteException e3) {
                                         B("Failed to remove hit that was send for delivery", e3);
                                         W();
@@ -365,7 +365,7 @@ public final class r extends e {
                 n0 n0Var = this.n;
                 n0Var.b.c();
                 n0Var.b.e();
-                if (!n0Var.f1078c) {
+                if (!n0Var.f1076c) {
                     Context context = n0Var.b.b;
                     context.registerReceiver(n0Var, new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"));
                     IntentFilter intentFilter = new IntentFilter("com.google.analytics.RADIO_POWERED");
@@ -373,10 +373,10 @@ public final class r extends e {
                     context.registerReceiver(n0Var, intentFilter);
                     n0Var.d = n0Var.b();
                     n0Var.b.c().b("Registering connectivity change receiver. Network connected", Boolean.valueOf(n0Var.d));
-                    n0Var.f1078c = true;
+                    n0Var.f1076c = true;
                 }
                 n0 n0Var2 = this.n;
-                if (!n0Var2.f1078c) {
+                if (!n0Var2.f1076c) {
                     n0Var2.b.c().G("Connectivity unknown. Receiver not registered");
                 }
                 z2 = n0Var2.d;
@@ -415,8 +415,8 @@ public final class r extends e {
                         if (abs >= 0) {
                             j3 = abs;
                         }
-                        a0Var2.b().removeCallbacks(a0Var2.f1067c);
-                        if (!a0Var2.b().postDelayed(a0Var2.f1067c, j3)) {
+                        a0Var2.b().removeCallbacks(a0Var2.f1065c);
+                        if (!a0Var2.b().postDelayed(a0Var2.f1065c, j3)) {
                             a0Var2.b.c().B("Failed to adjust delayed post. time", Long.valueOf(j3));
                             return;
                         }
@@ -471,7 +471,7 @@ public final class r extends e {
                             Method method = b1.a;
                             JobScheduler jobScheduler = (JobScheduler) context.getSystemService("jobscheduler");
                             if (b1.a != null) {
-                                Objects.requireNonNull((c1) b1.f1068c);
+                                Objects.requireNonNull((c1) b1.f1066c);
                             }
                             jobScheduler.schedule(build);
                             return;
@@ -502,7 +502,7 @@ public final class r extends e {
         if (j != Long.MIN_VALUE) {
             return j;
         }
-        long longValue = e0.f1069c.a.longValue();
+        long longValue = e0.f1067c.a.longValue();
         a1 t = t();
         t.N();
         if (!t.m) {
diff --git a/app/src/main/java/c/i/a/f/h/j/s0.java b/app/src/main/java/c/i/a/f/h/j/s0.java
index ef56f2e444..aa8234c7f0 100644
--- a/app/src/main/java/c/i/a/f/h/j/s0.java
+++ b/app/src/main/java/c/i/a/f/h/j/s0.java
@@ -8,16 +8,16 @@ public final class s0 {
     public static a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static Boolean f1080c;
+    public static Boolean f1078c;
 
     public static boolean a(Context context) {
         Objects.requireNonNull(context, "null reference");
-        Boolean bool = f1080c;
+        Boolean bool = f1078c;
         if (bool != null) {
             return bool.booleanValue();
         }
         boolean a2 = z0.a(context, "com.google.android.gms.analytics.AnalyticsReceiver", false);
-        f1080c = Boolean.valueOf(a2);
+        f1078c = Boolean.valueOf(a2);
         return a2;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/j/t0.java b/app/src/main/java/c/i/a/f/h/j/t0.java
index a76b7d594c..9c3afa2766 100644
--- a/app/src/main/java/c/i/a/f/h/j/t0.java
+++ b/app/src/main/java/c/i/a/f/h/j/t0.java
@@ -15,10 +15,10 @@ public final class t0<T extends Context & x0> {
     public final Handler b = new e1();
 
     /* renamed from: c  reason: collision with root package name */
-    public final T f1081c;
+    public final T f1079c;
 
     public t0(T t) {
-        this.f1081c = t;
+        this.f1079c = t;
     }
 
     public static boolean c(Context context) {
@@ -44,13 +44,13 @@ public final class t0<T extends Context & x0> {
         try {
             synchronized (s0.a) {
                 a aVar = s0.b;
-                if (aVar != null && aVar.f1217c.isHeld()) {
+                if (aVar != null && aVar.f1214c.isHeld()) {
                     aVar.b();
                 }
             }
         } catch (SecurityException unused) {
         }
-        m0 c2 = g.b(this.f1081c).c();
+        m0 c2 = g.b(this.f1079c).c();
         if (intent == null) {
             c2.G("AnalyticsService started with null intent");
             return 2;
@@ -64,7 +64,7 @@ public final class t0<T extends Context & x0> {
     }
 
     public final void b(Runnable runnable) {
-        a e = g.b(this.f1081c).e();
+        a e = g.b(this.f1079c).e();
         w0 w0Var = new w0(this, runnable);
         e.N();
         e.r().a(new c(e, w0Var));
diff --git a/app/src/main/java/c/i/a/f/h/j/u0.java b/app/src/main/java/c/i/a/f/h/j/u0.java
index ab339d942e..1560837f87 100644
--- a/app/src/main/java/c/i/a/f/h/j/u0.java
+++ b/app/src/main/java/c/i/a/f/h/j/u0.java
@@ -15,7 +15,7 @@ public final /* synthetic */ class u0 implements Runnable {
         t0 t0Var = this.i;
         int i = this.j;
         m0 m0Var = this.k;
-        if (t0Var.f1081c.b(i)) {
+        if (t0Var.f1079c.b(i)) {
             m0Var.C("Local AnalyticsService processed last dispatch request");
         }
     }
diff --git a/app/src/main/java/c/i/a/f/h/j/v0.java b/app/src/main/java/c/i/a/f/h/j/v0.java
index 3e93a4b139..d7f37804f2 100644
--- a/app/src/main/java/c/i/a/f/h/j/v0.java
+++ b/app/src/main/java/c/i/a/f/h/j/v0.java
@@ -20,6 +20,6 @@ public final /* synthetic */ class v0 implements Runnable {
         JobParameters jobParameters = this.k;
         Objects.requireNonNull(t0Var);
         m0Var.C("AnalyticsJobService processed last dispatch request");
-        t0Var.f1081c.a(jobParameters, false);
+        t0Var.f1079c.a(jobParameters, false);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/j/z.java b/app/src/main/java/c/i/a/f/h/j/z.java
index c8b51948b3..60c10070fe 100644
--- a/app/src/main/java/c/i/a/f/h/j/z.java
+++ b/app/src/main/java/c/i/a/f/h/j/z.java
@@ -10,7 +10,7 @@ public final class z {
     public volatile Boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1082c;
+    public String f1080c;
     public Set<Integer> d;
 
     public z(g gVar) {
@@ -62,8 +62,8 @@ public final class z {
 
     public final Set<Integer> g() {
         String str;
-        String str2 = e0.f1070s.a;
-        if (this.d == null || (str = this.f1082c) == null || !str.equals(str2)) {
+        String str2 = e0.f1068s.a;
+        if (this.d == null || (str = this.f1080c) == null || !str.equals(str2)) {
             String[] split = TextUtils.split(str2, ",");
             HashSet hashSet = new HashSet();
             for (String str3 : split) {
@@ -72,7 +72,7 @@ public final class z {
                 } catch (NumberFormatException unused) {
                 }
             }
-            this.f1082c = str2;
+            this.f1080c = str2;
             this.d = hashSet;
         }
         return this.d;
diff --git a/app/src/main/java/c/i/a/f/h/k/b.java b/app/src/main/java/c/i/a/f/h/k/b.java
index 22374802ae..cec36ebb93 100644
--- a/app/src/main/java/c/i/a/f/h/k/b.java
+++ b/app/src/main/java/c/i/a/f/h/k/b.java
@@ -5,5 +5,5 @@ import android.os.RemoteException;
 import com.google.firebase.appindexing.internal.zza;
 /* compiled from: com.google.firebase:firebase-appindexing@@19.1.0 */
 public interface b extends IInterface {
-    void R(c cVar, zza[] zzaArr) throws RemoteException;
+    void S(c cVar, zza[] zzaArr) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/k/d.java b/app/src/main/java/c/i/a/f/h/k/d.java
index 44d214e6b9..517dedad7e 100644
--- a/app/src/main/java/c/i/a/f/h/k/d.java
+++ b/app/src/main/java/c/i/a/f/h/k/d.java
@@ -15,7 +15,7 @@ public final class d implements b, IInterface {
     }
 
     @Override // c.i.a.f.h.k.b
-    public final void R(c cVar, zza[] zzaArr) throws RemoteException {
+    public final void S(c cVar, zza[] zzaArr) throws RemoteException {
         Parcel obtain = Parcel.obtain();
         obtain.writeInterfaceToken(this.b);
         int i = i.a;
diff --git a/app/src/main/java/c/i/a/f/h/k/g.java b/app/src/main/java/c/i/a/f/h/k/g.java
index ab50841250..697a09000c 100644
--- a/app/src/main/java/c/i/a/f/h/k/g.java
+++ b/app/src/main/java/c/i/a/f/h/k/g.java
@@ -29,12 +29,12 @@ public final class g extends d<b> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearch";
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/k/k.java b/app/src/main/java/c/i/a/f/h/k/k.java
index 6ef4c3a821..f5fec9bd07 100644
--- a/app/src/main/java/c/i/a/f/h/k/k.java
+++ b/app/src/main/java/c/i/a/f/h/k/k.java
@@ -7,13 +7,13 @@ public final class k {
     public static final a.AbstractC0100a<g, a.d.c> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a<a.d.c> f1083c;
+    public static final a<a.d.c> f1081c;
 
     static {
         a.g<g> gVar = new a.g<>();
         a = gVar;
         j jVar = new j();
         b = jVar;
-        f1083c = new a<>("AppDataSearch.LIGHTWEIGHT_API", jVar, gVar);
+        f1081c = new a<>("AppDataSearch.LIGHTWEIGHT_API", jVar, gVar);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/k/m.java b/app/src/main/java/c/i/a/f/h/k/m.java
index 627d72791b..f5b0fc3b5e 100644
--- a/app/src/main/java/c/i/a/f/h/k/m.java
+++ b/app/src/main/java/c/i/a/f/h/k/m.java
@@ -11,12 +11,12 @@ public final class m implements Parcelable.Creator<zzh> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzh createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         zzk[] zzkArr = null;
         String str = null;
         Account account = null;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
@@ -24,14 +24,14 @@ public final class m implements Parcelable.Creator<zzh> {
             } else if (i == 2) {
                 str = AnimatableValueParser.T(parcel, readInt);
             } else if (i == 3) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i != 4) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 account = (Account) AnimatableValueParser.S(parcel, readInt, Account.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzh(zzkArr, str, z2, account);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/n.java b/app/src/main/java/c/i/a/f/h/k/n.java
index f90f456735..de4832be06 100644
--- a/app/src/main/java/c/i/a/f/h/k/n.java
+++ b/app/src/main/java/c/i/a/f/h/k/n.java
@@ -9,11 +9,11 @@ public final class n implements Parcelable.Creator<zzi> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzi createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         String str3 = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
@@ -21,12 +21,12 @@ public final class n implements Parcelable.Creator<zzi> {
             } else if (i == 2) {
                 str2 = AnimatableValueParser.T(parcel, readInt);
             } else if (i != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str3 = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzi(str, str2, str3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/o.java b/app/src/main/java/c/i/a/f/h/k/o.java
index 2b7d5f8009..9069c57c83 100644
--- a/app/src/main/java/c/i/a/f/h/k/o.java
+++ b/app/src/main/java/c/i/a/f/h/k/o.java
@@ -10,12 +10,12 @@ public final class o implements Parcelable.Creator<zzk> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzk createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         zzt zzt = null;
         byte[] bArr = null;
         int i = -1;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
@@ -23,14 +23,14 @@ public final class o implements Parcelable.Creator<zzk> {
             } else if (i2 == 3) {
                 zzt = (zzt) AnimatableValueParser.S(parcel, readInt, zzt.CREATOR);
             } else if (i2 == 4) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 bArr = AnimatableValueParser.Q(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzk(str, zzt, i, bArr);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/p.java b/app/src/main/java/c/i/a/f/h/k/p.java
index a317817c79..8afff1a68d 100644
--- a/app/src/main/java/c/i/a/f/h/k/p.java
+++ b/app/src/main/java/c/i/a/f/h/k/p.java
@@ -10,21 +10,21 @@ public final class p implements Parcelable.Creator<zzm> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzm createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         Bundle bundle = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 bundle = AnimatableValueParser.P(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzm(i, bundle);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/r.java b/app/src/main/java/c/i/a/f/h/k/r.java
index 10c536a3dc..03617b93cb 100644
--- a/app/src/main/java/c/i/a/f/h/k/r.java
+++ b/app/src/main/java/c/i/a/f/h/k/r.java
@@ -12,11 +12,11 @@ public final class r implements Parcelable.Creator<zzo> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzo createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Status status = null;
         ArrayList arrayList = null;
         String[] strArr = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
@@ -24,12 +24,12 @@ public final class r implements Parcelable.Creator<zzo> {
             } else if (i == 2) {
                 arrayList = AnimatableValueParser.X(parcel, readInt, zzw.CREATOR);
             } else if (i != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 strArr = AnimatableValueParser.U(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzo(status, arrayList, strArr);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/s.java b/app/src/main/java/c/i/a/f/h/k/s.java
index 0b4ad01db1..81e8f12cbe 100644
--- a/app/src/main/java/c/i/a/f/h/k/s.java
+++ b/app/src/main/java/c/i/a/f/h/k/s.java
@@ -11,7 +11,7 @@ public final class s implements Parcelable.Creator<zzt> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzt createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         String str3 = null;
@@ -21,7 +21,7 @@ public final class s implements Parcelable.Creator<zzt> {
         boolean z2 = false;
         int i = 1;
         boolean z3 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 11) {
@@ -35,13 +35,13 @@ public final class s implements Parcelable.Creator<zzt> {
                         str2 = AnimatableValueParser.T(parcel, readInt);
                         continue;
                     case 3:
-                        z2 = AnimatableValueParser.c2(parcel, readInt);
+                        z2 = AnimatableValueParser.e2(parcel, readInt);
                         continue;
                     case 4:
-                        i = AnimatableValueParser.e2(parcel, readInt);
+                        i = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 5:
-                        z3 = AnimatableValueParser.c2(parcel, readInt);
+                        z3 = AnimatableValueParser.e2(parcel, readInt);
                         continue;
                     case 6:
                         str3 = AnimatableValueParser.T(parcel, readInt);
@@ -50,14 +50,14 @@ public final class s implements Parcelable.Creator<zzt> {
                         zzmArr = (zzm[]) AnimatableValueParser.W(parcel, readInt, zzm.CREATOR);
                         continue;
                     default:
-                        AnimatableValueParser.B2(parcel, readInt);
+                        AnimatableValueParser.D2(parcel, readInt);
                         continue;
                 }
             } else {
                 zzu = (zzu) AnimatableValueParser.S(parcel, readInt, zzu.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzt(str, str2, z2, i, z3, str3, zzmArr, str4, zzu);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/t.java b/app/src/main/java/c/i/a/f/h/k/t.java
index b3d8e1c641..b7681d2cae 100644
--- a/app/src/main/java/c/i/a/f/h/k/t.java
+++ b/app/src/main/java/c/i/a/f/h/k/t.java
@@ -9,17 +9,17 @@ public final class t implements Parcelable.Creator<zzu> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzu createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 1) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzu(z2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/k/u.java b/app/src/main/java/c/i/a/f/h/k/u.java
index d463c023e3..57051fa5e6 100644
--- a/app/src/main/java/c/i/a/f/h/k/u.java
+++ b/app/src/main/java/c/i/a/f/h/k/u.java
@@ -11,7 +11,7 @@ public final class u implements Parcelable.Creator<zzw> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzw createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         zzi zzi = null;
         String str = null;
         zzh zzh = null;
@@ -21,17 +21,17 @@ public final class u implements Parcelable.Creator<zzw> {
         boolean z2 = false;
         int i2 = -1;
         int i3 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
                     zzi = (zzi) AnimatableValueParser.S(parcel, readInt, zzi.CREATOR);
                     break;
                 case 2:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 3:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 4:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -40,23 +40,23 @@ public final class u implements Parcelable.Creator<zzw> {
                     zzh = (zzh) AnimatableValueParser.S(parcel, readInt, zzh.CREATOR);
                     break;
                 case 6:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 7:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 8:
-                    i3 = AnimatableValueParser.e2(parcel, readInt);
+                    i3 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 9:
                     str2 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzw(zzi, j, i, str, zzh, z2, i2, i3, str2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/c0.java b/app/src/main/java/c/i/a/f/h/l/c0.java
index c616839381..19c5f6bace 100644
--- a/app/src/main/java/c/i/a/f/h/l/c0.java
+++ b/app/src/main/java/c/i/a/f/h/l/c0.java
@@ -13,12 +13,12 @@ public final class c0 extends g.a {
     public final /* synthetic */ boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final /* synthetic */ g f1084s;
+    public final /* synthetic */ g f1082s;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public c0(g gVar, Long l, String str, String str2, Bundle bundle, boolean z2, boolean z3) {
         super(true);
-        this.f1084s = gVar;
+        this.f1082s = gVar;
         this.m = l;
         this.n = str;
         this.o = str2;
@@ -30,6 +30,6 @@ public final class c0 extends g.a {
     @Override // c.i.a.f.h.l.g.a
     public final void a() throws RemoteException {
         Long l = this.m;
-        this.f1084s.j.logEvent(this.n, this.o, this.p, this.q, this.r, l == null ? this.i : l.longValue());
+        this.f1082s.j.logEvent(this.n, this.o, this.p, this.q, this.r, l == null ? this.i : l.longValue());
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/l/c2.java b/app/src/main/java/c/i/a/f/h/l/c2.java
index 2d361ea9d7..35be2b6a30 100644
--- a/app/src/main/java/c/i/a/f/h/l/c2.java
+++ b/app/src/main/java/c/i/a/f/h/l/c2.java
@@ -13,17 +13,17 @@ public final class c2 implements b2 {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ContentObserver f1085c;
+    public final ContentObserver f1083c;
 
     public c2() {
         this.b = null;
-        this.f1085c = null;
+        this.f1083c = null;
     }
 
     public c2(Context context) {
         this.b = context;
         f2 f2Var = new f2();
-        this.f1085c = f2Var;
+        this.f1083c = f2Var;
         context.getContentResolver().registerContentObserver(u1.a, true, f2Var);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/c7.java b/app/src/main/java/c/i/a/f/h/l/c7.java
index 05398b6414..6d553797c7 100644
--- a/app/src/main/java/c/i/a/f/h/l/c7.java
+++ b/app/src/main/java/c/i/a/f/h/l/c7.java
@@ -12,7 +12,7 @@ public final class c7 {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int[] f1086c;
+    public int[] f1084c;
     public Object[] d;
     public int e;
     public boolean f;
@@ -24,7 +24,7 @@ public final class c7 {
     public c7(int i, int[] iArr, Object[] objArr, boolean z2) {
         this.e = -1;
         this.b = i;
-        this.f1086c = iArr;
+        this.f1084c = iArr;
         this.d = objArr;
         this.f = z2;
     }
@@ -58,13 +58,13 @@ public final class c7 {
     public final void a(int i, Object obj) {
         if (this.f) {
             int i2 = this.b;
-            int[] iArr = this.f1086c;
+            int[] iArr = this.f1084c;
             if (i2 == iArr.length) {
                 int i3 = i2 + (i2 < 4 ? 8 : i2 >> 1);
-                this.f1086c = Arrays.copyOf(iArr, i3);
+                this.f1084c = Arrays.copyOf(iArr, i3);
                 this.d = Arrays.copyOf(this.d, i3);
             }
-            int[] iArr2 = this.f1086c;
+            int[] iArr2 = this.f1084c;
             int i4 = this.b;
             iArr2[i4] = i;
             this.d[i4] = obj;
@@ -78,7 +78,7 @@ public final class c7 {
         if (this.b != 0) {
             Objects.requireNonNull(v7Var);
             for (int i = 0; i < this.b; i++) {
-                b(this.f1086c[i], this.d[i], v7Var);
+                b(this.f1084c[i], this.d[i], v7Var);
             }
         }
     }
@@ -91,7 +91,7 @@ public final class c7 {
         }
         int i3 = 0;
         for (int i4 = 0; i4 < this.b; i4++) {
-            int i5 = this.f1086c[i4];
+            int i5 = this.f1084c[i4];
             int i6 = i5 >>> 3;
             int i7 = i5 & 7;
             if (i7 == 0) {
@@ -128,8 +128,8 @@ public final class c7 {
         c7 c7Var = (c7) obj;
         int i = this.b;
         if (i == c7Var.b) {
-            int[] iArr = this.f1086c;
-            int[] iArr2 = c7Var.f1086c;
+            int[] iArr = this.f1084c;
+            int[] iArr2 = c7Var.f1084c;
             int i2 = 0;
             while (true) {
                 if (i2 >= i) {
@@ -169,7 +169,7 @@ public final class c7 {
     public final int hashCode() {
         int i = this.b;
         int i2 = (i + 527) * 31;
-        int[] iArr = this.f1086c;
+        int[] iArr = this.f1084c;
         int i3 = 17;
         int i4 = 17;
         for (int i5 = 0; i5 < i; i5++) {
diff --git a/app/src/main/java/c/i/a/f/h/l/d5.java b/app/src/main/java/c/i/a/f/h/l/d5.java
index 89d3918ace..def58ab7e5 100644
--- a/app/src/main/java/c/i/a/f/h/l/d5.java
+++ b/app/src/main/java/c/i/a/f/h/l/d5.java
@@ -3,7 +3,7 @@ package c.i.a.f.h.l;
 public final class d5 extends h5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final /* synthetic */ int f1087c = 0;
+    public static final /* synthetic */ int f1085c = 0;
 
     @Override // c.i.a.f.h.l.h5
     public final boolean equals(Object obj) {
diff --git a/app/src/main/java/c/i/a/f/h/l/e6.java b/app/src/main/java/c/i/a/f/h/l/e6.java
index c813f6457f..27f2e41a7c 100644
--- a/app/src/main/java/c/i/a/f/h/l/e6.java
+++ b/app/src/main/java/c/i/a/f/h/l/e6.java
@@ -19,7 +19,7 @@ public final class e6<T> implements q6<T> {
     public static final Unsafe b = j7.k();
 
     /* renamed from: c  reason: collision with root package name */
-    public final int[] f1089c;
+    public final int[] f1087c;
     public final Object[] d;
     public final int e;
     public final int f;
@@ -37,7 +37,7 @@ public final class e6<T> implements q6<T> {
 
     /* JADX WARN: Incorrect args count in method signature: ([I[Ljava/lang/Object;IILc/i/a/f/h/l/c6;ZZ[IIILc/i/a/f/h/l/i6;Lc/i/a/f/h/l/m5;Lc/i/a/f/h/l/d7<**>;Lc/i/a/f/h/l/j4<*>;Lc/i/a/f/h/l/v5;)V */
     public e6(int[] iArr, Object[] objArr, int i, int i2, c6 c6Var, boolean z2, int[] iArr2, int i3, int i4, i6 i6Var, m5 m5Var, d7 d7Var, j4 j4Var, v5 v5Var) {
-        this.f1089c = iArr;
+        this.f1087c = iArr;
         this.d = objArr;
         this.e = i;
         this.f = i2;
@@ -332,7 +332,7 @@ public final class e6<T> implements q6<T> {
                 i33 = i57;
             }
             Unsafe unsafe = b;
-            Object[] objArr2 = o6Var2.f1114c;
+            Object[] objArr2 = o6Var2.f1112c;
             Class<?> cls = o6Var2.a.getClass();
             int[] iArr2 = new int[(i4 * 3)];
             Object[] objArr3 = new Object[(i4 << 1)];
@@ -606,7 +606,7 @@ public final class e6<T> implements q6<T> {
     }
 
     public final void B(T t, int i) {
-        int i2 = this.f1089c[i + 2];
+        int i2 = this.f1087c[i + 2];
         long j = (long) (1048575 & i2);
         if (j != 1048575) {
             j7.e.e(t, j, (1 << (i2 >>> 20)) | j7.b(t, j));
@@ -614,7 +614,7 @@ public final class e6<T> implements q6<T> {
     }
 
     public final void C(T t, int i, int i2) {
-        j7.e.e(t, (long) (this.f1089c[i2 + 2] & 1048575), i);
+        j7.e.e(t, (long) (this.f1087c[i2 + 2] & 1048575), i);
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:168:0x0527  */
@@ -630,13 +630,13 @@ public final class e6<T> implements q6<T> {
             if (!b2.b.isEmpty()) {
                 it = b2.l();
                 entry = it.next();
-                length = this.f1089c.length;
+                length = this.f1087c.length;
                 Unsafe unsafe = b;
                 int i3 = 1048575;
                 int i4 = 0;
                 for (i = 0; i < length; i += 3) {
                     int I = I(i);
-                    int[] iArr = this.f1089c;
+                    int[] iArr = this.f1087c;
                     int i5 = iArr[i];
                     int i6 = (I & 267386880) >>> 20;
                     if (i6 <= 17) {
@@ -764,100 +764,100 @@ public final class e6<T> implements q6<T> {
                                 continue;
                             }
                         case 18:
-                            s6.h(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.h(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 19:
-                            s6.q(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.q(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 20:
-                            s6.u(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.u(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 21:
-                            s6.x(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.x(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 22:
-                            s6.J(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.J(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 23:
-                            s6.D(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.D(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 24:
-                            s6.O(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.O(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 25:
-                            s6.R(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.R(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 26:
-                            s6.f(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var);
+                            s6.f(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var);
                             break;
                         case 27:
-                            s6.g(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, o(i));
+                            s6.g(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, o(i));
                             break;
                         case 28:
-                            s6.o(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var);
+                            s6.o(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var);
                             break;
                         case 29:
-                            s6.M(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.M(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 30:
-                            s6.Q(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.Q(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 31:
-                            s6.P(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.P(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 32:
-                            s6.G(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.G(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 33:
-                            s6.N(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.N(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 34:
-                            s6.A(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, false);
+                            s6.A(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, false);
                             break;
                         case 35:
-                            s6.h(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.h(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 36:
-                            s6.q(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.q(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 37:
-                            s6.u(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.u(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 38:
-                            s6.x(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.x(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 39:
-                            s6.J(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.J(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 40:
-                            s6.D(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.D(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 41:
-                            s6.O(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.O(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 42:
-                            s6.R(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.R(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 43:
-                            s6.M(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.M(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 44:
-                            s6.Q(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.Q(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 45:
-                            s6.P(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.P(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 46:
-                            s6.G(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.G(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 47:
-                            s6.N(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.N(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 48:
-                            s6.A(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, true);
+                            s6.A(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, true);
                             break;
                         case 49:
-                            s6.p(this.f1089c[i], (List) unsafe.getObject(t, j), v7Var, o(i));
+                            s6.p(this.f1087c[i], (List) unsafe.getObject(t, j), v7Var, o(i));
                             break;
                         case 50:
                             t(v7Var, i5, unsafe.getObject(t, j), i);
@@ -981,7 +981,7 @@ public final class e6<T> implements q6<T> {
         }
         it = null;
         entry = null;
-        length = this.f1089c.length;
+        length = this.f1087c.length;
         Unsafe unsafe = b;
         int i3 = 1048575;
         int i4 = 0;
@@ -993,7 +993,7 @@ public final class e6<T> implements q6<T> {
     }
 
     public final void E(T t, T t2, int i) {
-        int[] iArr = this.f1089c;
+        int[] iArr = this.f1087c;
         int i2 = iArr[i + 1];
         int i3 = iArr[i];
         long j = (long) (i2 & 1048575);
@@ -1022,11 +1022,11 @@ public final class e6<T> implements q6<T> {
     }
 
     public final int I(int i) {
-        return this.f1089c[i + 1];
+        return this.f1087c[i + 1];
     }
 
     public final int K(int i) {
-        return this.f1089c[i + 2];
+        return this.f1087c[i + 2];
     }
 
     @Override // c.i.a.f.h.l.q6
@@ -1038,11 +1038,11 @@ public final class e6<T> implements q6<T> {
     public final int b(T t) {
         int i;
         int i2;
-        int length = this.f1089c.length;
+        int length = this.f1087c.length;
         int i3 = 0;
         for (int i4 = 0; i4 < length; i4 += 3) {
             int I = I(i4);
-            int i5 = this.f1089c[i4];
+            int i5 = this.f1087c[i4];
             long j = (long) (1048575 & I);
             int i6 = 37;
             switch ((I & 267386880) >>> 20) {
@@ -1366,9 +1366,9 @@ public final class e6<T> implements q6<T> {
                 return !this.h || this.p.b(t).m();
             }
             int i6 = this.j[i5];
-            int i7 = this.f1089c[i6];
+            int i7 = this.f1087c[i6];
             int I = I(i6);
-            int i8 = this.f1089c[i6 + 2];
+            int i8 = this.f1087c[i6 + 2];
             int i9 = i8 & 1048575;
             int i10 = 1 << (i8 >>> 20);
             if (i9 != i3) {
@@ -1466,13 +1466,13 @@ public final class e6<T> implements q6<T> {
         if (this.i) {
             Unsafe unsafe = b;
             int i10 = 0;
-            for (int i11 = 0; i11 < this.f1089c.length; i11 += 3) {
+            for (int i11 = 0; i11 < this.f1087c.length; i11 += 3) {
                 int I = I(i11);
                 int i12 = (I & 267386880) >>> 20;
-                int i13 = this.f1089c[i11];
+                int i13 = this.f1087c[i11];
                 long j = (long) (I & 1048575);
                 if (i12 >= o4.DOUBLE_LIST_PACKED.a() && i12 <= o4.SINT64_LIST_PACKED.a()) {
-                    int i14 = this.f1089c[i11 + 2];
+                    int i14 = this.f1087c[i11 + 2];
                 }
                 switch (i12) {
                     case 0:
@@ -1994,9 +1994,9 @@ public final class e6<T> implements q6<T> {
         int i15 = 0;
         int i16 = 1048575;
         int i17 = 0;
-        for (int i18 = 0; i18 < this.f1089c.length; i18 += 3) {
+        for (int i18 = 0; i18 < this.f1087c.length; i18 += 3) {
             int I2 = I(i18);
-            int[] iArr = this.f1089c;
+            int[] iArr = this.f1087c;
             int i19 = iArr[i18];
             int i20 = (I2 & 267386880) >>> 20;
             if (i20 <= 17) {
@@ -2599,7 +2599,7 @@ public final class e6<T> implements q6<T> {
      */
     @Override // c.i.a.f.h.l.q6
     public final boolean f(T t, T t2) {
-        int length = this.f1089c.length;
+        int length = this.f1087c.length;
         int i = 0;
         while (true) {
             boolean z2 = true;
@@ -2807,10 +2807,10 @@ public final class e6<T> implements q6<T> {
                 if (!b2.b.isEmpty()) {
                     it = b2.l();
                     entry = it.next();
-                    length = this.f1089c.length;
+                    length = this.f1087c.length;
                     for (i = 0; i < length; i += 3) {
                         int I = I(i);
-                        int i2 = this.f1089c[i];
+                        int i2 = this.f1087c[i];
                         while (entry != null && this.p.a(entry) <= i2) {
                             this.p.d(v7Var, entry);
                             entry = it.hasNext() ? it.next() : null;
@@ -2943,100 +2943,100 @@ public final class e6<T> implements q6<T> {
                                     break;
                                 }
                             case 18:
-                                s6.h(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.h(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 19:
-                                s6.q(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.q(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 20:
-                                s6.u(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.u(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 21:
-                                s6.x(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.x(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 22:
-                                s6.J(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.J(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 23:
-                                s6.D(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.D(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 24:
-                                s6.O(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.O(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 25:
-                                s6.R(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.R(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 26:
-                                s6.f(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var);
+                                s6.f(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var);
                                 break;
                             case 27:
-                                s6.g(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, o(i));
+                                s6.g(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, o(i));
                                 break;
                             case 28:
-                                s6.o(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var);
+                                s6.o(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var);
                                 break;
                             case 29:
-                                s6.M(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.M(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 30:
-                                s6.Q(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.Q(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 31:
-                                s6.P(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.P(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 32:
-                                s6.G(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.G(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 33:
-                                s6.N(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.N(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 34:
-                                s6.A(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
+                                s6.A(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, false);
                                 break;
                             case 35:
-                                s6.h(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.h(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 36:
-                                s6.q(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.q(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 37:
-                                s6.u(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.u(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 38:
-                                s6.x(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.x(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 39:
-                                s6.J(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.J(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 40:
-                                s6.D(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.D(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 41:
-                                s6.O(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.O(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 42:
-                                s6.R(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.R(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 43:
-                                s6.M(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.M(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 44:
-                                s6.Q(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.Q(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 45:
-                                s6.P(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.P(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 46:
-                                s6.G(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.G(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 47:
-                                s6.N(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.N(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 48:
-                                s6.A(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
+                                s6.A(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, true);
                                 break;
                             case 49:
-                                s6.p(this.f1089c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, o(i));
+                                s6.p(this.f1087c[i], (List) j7.r(t, (long) (I & 1048575)), v7Var, o(i));
                                 break;
                             case 50:
                                 t(v7Var, i2, j7.r(t, (long) (I & 1048575)), i);
@@ -3179,7 +3179,7 @@ public final class e6<T> implements q6<T> {
             }
             it = null;
             entry = null;
-            length = this.f1089c.length;
+            length = this.f1087c.length;
             while (i < length) {
             }
             while (entry != null) {
@@ -3269,7 +3269,7 @@ public final class e6<T> implements q6<T> {
                         i5 = i26;
                         i6 = 0;
                     } else {
-                        int[] iArr = e6Var5.f1089c;
+                        int[] iArr = e6Var5.f1087c;
                         int i29 = iArr[i4 + 1];
                         int i30 = (i29 & 267386880) >>> 20;
                         long j = (long) (i29 & 1048575);
@@ -3471,7 +3471,7 @@ public final class e6<T> implements q6<T> {
                                     t4 = t7;
                                     if (i27 == 2) {
                                         i20 = (536870912 & i29) == 0 ? c.Z0(bArr3, i3, s3Var4) : c.a1(bArr3, i3, s3Var4);
-                                        unsafe2.putObject(t4, j, s3Var4.f1125c);
+                                        unsafe2.putObject(t4, j, s3Var4.f1123c);
                                         s3Var3 = s3Var4;
                                         e6Var3 = e6Var6;
                                         t3 = t4;
@@ -3502,9 +3502,9 @@ public final class e6<T> implements q6<T> {
                                         i20 = c.x0(o, bArr3, i3, i2, s3Var4);
                                         Object object = unsafe2.getObject(t4, j);
                                         if (object == null) {
-                                            unsafe2.putObject(t4, j, s3Var4.f1125c);
+                                            unsafe2.putObject(t4, j, s3Var4.f1123c);
                                         } else {
-                                            unsafe2.putObject(t4, j, w4.c(object, s3Var4.f1125c));
+                                            unsafe2.putObject(t4, j, w4.c(object, s3Var4.f1123c));
                                         }
                                         s3Var3 = s3Var4;
                                         e6Var3 = e6Var6;
@@ -3536,7 +3536,7 @@ public final class e6<T> implements q6<T> {
                                         break;
                                     } else {
                                         i20 = c.b1(bArr3, i3, s3Var6);
-                                        unsafe2.putObject(t6, j, s3Var6.f1125c);
+                                        unsafe2.putObject(t6, j, s3Var6.f1123c);
                                         i24 |= i32;
                                         i17 = i2;
                                         e6Var2 = e6Var4;
@@ -3777,10 +3777,10 @@ public final class e6<T> implements q6<T> {
     @Override // c.i.a.f.h.l.q6
     public final void i(T t, T t2) {
         Objects.requireNonNull(t2);
-        for (int i = 0; i < this.f1089c.length; i += 3) {
+        for (int i = 0; i < this.f1087c.length; i += 3) {
             int I = I(i);
             long j = (long) (1048575 & I);
-            int i2 = this.f1089c[i];
+            int i2 = this.f1087c[i];
             switch ((I & 267386880) >>> 20) {
                 case 0:
                     if (v(t2, i)) {
@@ -4004,7 +4004,7 @@ public final class e6<T> implements q6<T> {
     public final int j(T t, byte[] bArr, int i, int i2, int i3, int i4, int i5, int i6, int i7, long j, int i8, s3 s3Var) throws IOException {
         int i9;
         Unsafe unsafe = b;
-        long j2 = (long) (this.f1089c[i8 + 2] & 1048575);
+        long j2 = (long) (this.f1087c[i8 + 2] & 1048575);
         boolean z2 = true;
         switch (i7) {
             case 51:
@@ -4091,9 +4091,9 @@ public final class e6<T> implements q6<T> {
                     int x0 = c.x0(o(i8), bArr, i, i2, s3Var);
                     Object object = unsafe.getInt(t, j2) == i4 ? unsafe.getObject(t, j) : null;
                     if (object == null) {
-                        unsafe.putObject(t, j, s3Var.f1125c);
+                        unsafe.putObject(t, j, s3Var.f1123c);
                     } else {
-                        unsafe.putObject(t, j, w4.c(object, s3Var.f1125c));
+                        unsafe.putObject(t, j, w4.c(object, s3Var.f1123c));
                     }
                     unsafe.putInt(t, j2, i4);
                     return x0;
@@ -4102,7 +4102,7 @@ public final class e6<T> implements q6<T> {
             case 61:
                 if (i5 == 2) {
                     i9 = c.b1(bArr, i, s3Var);
-                    unsafe.putObject(t, j, s3Var.f1125c);
+                    unsafe.putObject(t, j, s3Var.f1123c);
                     unsafe.putInt(t, j2, i4);
                     return i9;
                 }
@@ -4143,9 +4143,9 @@ public final class e6<T> implements q6<T> {
                     i9 = c.w0(o(i8), bArr, i, i2, (i3 & -8) | 4, s3Var);
                     Object object2 = unsafe.getInt(t, j2) == i4 ? unsafe.getObject(t, j) : null;
                     if (object2 == null) {
-                        unsafe.putObject(t, j, s3Var.f1125c);
+                        unsafe.putObject(t, j, s3Var.f1123c);
                     } else {
-                        unsafe.putObject(t, j, w4.c(object2, s3Var.f1125c));
+                        unsafe.putObject(t, j, w4.c(object2, s3Var.f1123c));
                     }
                     unsafe.putInt(t, j2, i4);
                     return i9;
@@ -4334,7 +4334,7 @@ public final class e6<T> implements q6<T> {
                         i24 = i6;
                     }
                 } else {
-                    int[] iArr = e6Var2.f1089c;
+                    int[] iArr = e6Var2.f1087c;
                     int i29 = iArr[i4 + 1];
                     int i30 = (i29 & 267386880) >>> 20;
                     long j2 = (long) (i29 & 1048575);
@@ -4669,7 +4669,7 @@ public final class e6<T> implements q6<T> {
                                 i13 = i4;
                                 if (i28 == 2) {
                                     i20 = (536870912 & i29) == 0 ? c.Z0(bArr2, i26, s3Var3) : c.a1(bArr2, i26, s3Var3);
-                                    unsafe2.putObject(t5, j, s3Var3.f1125c);
+                                    unsafe2.putObject(t5, j, s3Var3.f1123c);
                                     i18 = i7 | i32;
                                     i19 = i2;
                                     b10 = b8;
@@ -4714,9 +4714,9 @@ public final class e6<T> implements q6<T> {
                                 if (i28 == 2) {
                                     i20 = c.x0(e6Var2.o(i13), bArr2, i26, i2, s3Var3);
                                     if ((i7 & i32) == 0) {
-                                        unsafe2.putObject(t5, j, s3Var3.f1125c);
+                                        unsafe2.putObject(t5, j, s3Var3.f1123c);
                                     } else {
-                                        unsafe2.putObject(t5, j, w4.c(unsafe2.getObject(t5, j), s3Var3.f1125c));
+                                        unsafe2.putObject(t5, j, w4.c(unsafe2.getObject(t5, j), s3Var3.f1123c));
                                     }
                                     i18 = i7 | i32;
                                     i19 = i2;
@@ -4761,7 +4761,7 @@ public final class e6<T> implements q6<T> {
                                 i13 = i4;
                                 if (i28 == 2) {
                                     i20 = c.b1(bArr2, i26, s3Var3);
-                                    unsafe2.putObject(t5, j, s3Var3.f1125c);
+                                    unsafe2.putObject(t5, j, s3Var3.f1123c);
                                     b5 = b9;
                                     i7 |= i32;
                                     i24 = i17;
@@ -4943,9 +4943,9 @@ public final class e6<T> implements q6<T> {
                                 if (i28 == 3) {
                                     i20 = c.w0(e6Var2.o(i4), bArr, i26, i2, (i27 << 3) | 4, s3Var);
                                     if ((i7 & i32) == 0) {
-                                        unsafe2.putObject(t5, j, s3Var3.f1125c);
+                                        unsafe2.putObject(t5, j, s3Var3.f1123c);
                                     } else {
-                                        unsafe2.putObject(t5, j, w4.c(unsafe2.getObject(t5, j), s3Var3.f1125c));
+                                        unsafe2.putObject(t5, j, w4.c(unsafe2.getObject(t5, j), s3Var3.f1123c));
                                     }
                                     i18 = i7 | i32;
                                     i19 = i2;
@@ -5175,7 +5175,7 @@ public final class e6<T> implements q6<T> {
         for (int i35 = e6Var.k; i35 < e6Var.l; i35++) {
             int i36 = e6Var.j[i35];
             d7<?, ?> d7Var = e6Var.o;
-            int[] iArr2 = e6Var.f1089c;
+            int[] iArr2 = e6Var.f1087c;
             int i37 = iArr2[i36];
             Object r = j7.r(t2, (long) (iArr2[i36 + 1] & 1048575));
             if (r != null) {
@@ -5240,7 +5240,7 @@ public final class e6<T> implements q6<T> {
     }
 
     public final void u(T t, T t2, int i) {
-        long j = (long) (this.f1089c[i + 1] & 1048575);
+        long j = (long) (this.f1087c[i + 1] & 1048575);
         if (v(t2, i)) {
             Object r = j7.r(t, j);
             Object r2 = j7.r(t2, j);
@@ -5255,7 +5255,7 @@ public final class e6<T> implements q6<T> {
     }
 
     public final boolean v(T t, int i) {
-        int[] iArr = this.f1089c;
+        int[] iArr = this.f1087c;
         int i2 = iArr[i + 2];
         long j = (long) (i2 & 1048575);
         if (j == 1048575) {
@@ -5314,7 +5314,7 @@ public final class e6<T> implements q6<T> {
     }
 
     public final boolean w(T t, int i, int i2) {
-        return j7.b(t, (long) (this.f1089c[i2 + 2] & 1048575)) == i;
+        return j7.b(t, (long) (this.f1087c[i2 + 2] & 1048575)) == i;
     }
 
     public final boolean x(T t, int i, int i2, int i3, int i4) {
@@ -5322,11 +5322,11 @@ public final class e6<T> implements q6<T> {
     }
 
     public final int z(int i, int i2) {
-        int length = (this.f1089c.length / 3) - 1;
+        int length = (this.f1087c.length / 3) - 1;
         while (i2 <= length) {
             int i3 = (length + i2) >>> 1;
             int i4 = i3 * 3;
-            int i5 = this.f1089c[i4];
+            int i5 = this.f1087c[i4];
             if (i == i5) {
                 return i4;
             }
diff --git a/app/src/main/java/c/i/a/f/h/l/f5.java b/app/src/main/java/c/i/a/f/h/l/f5.java
index 520c526703..a0122bd084 100644
--- a/app/src/main/java/c/i/a/f/h/l/f5.java
+++ b/app/src/main/java/c/i/a/f/h/l/f5.java
@@ -19,7 +19,7 @@ public final class f5<K> implements Map.Entry<K, Object> {
         if (this.i.getValue() == null) {
             return null;
         }
-        int i = d5.f1087c;
+        int i = d5.f1085c;
         throw new NoSuchMethodError();
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/f7.java b/app/src/main/java/c/i/a/f/h/l/f7.java
index 4ef0cff662..ab4d7decb0 100644
--- a/app/src/main/java/c/i/a/f/h/l/f7.java
+++ b/app/src/main/java/c/i/a/f/h/l/f7.java
@@ -43,7 +43,7 @@ public final class f7 extends d7<c7, c7> {
         Objects.requireNonNull(c7Var2);
         Objects.requireNonNull(v7Var);
         for (int i = 0; i < c7Var2.b; i++) {
-            ((g4) v7Var).c(c7Var2.f1086c[i] >>> 3, c7Var2.d[i]);
+            ((g4) v7Var).c(c7Var2.f1084c[i] >>> 3, c7Var2.d[i]);
         }
     }
 
@@ -57,8 +57,8 @@ public final class f7 extends d7<c7, c7> {
             return c7Var3;
         }
         int i = c7Var3.b + c7Var4.b;
-        int[] copyOf = Arrays.copyOf(c7Var3.f1086c, i);
-        System.arraycopy(c7Var4.f1086c, 0, copyOf, c7Var3.b, c7Var4.b);
+        int[] copyOf = Arrays.copyOf(c7Var3.f1084c, i);
+        System.arraycopy(c7Var4.f1084c, 0, copyOf, c7Var3.b, c7Var4.b);
         Object[] copyOf2 = Arrays.copyOf(c7Var3.d, i);
         System.arraycopy(c7Var4.d, 0, copyOf2, c7Var3.b, c7Var4.b);
         return new c7(i, copyOf, copyOf2, true);
@@ -79,7 +79,7 @@ public final class f7 extends d7<c7, c7> {
         }
         int i2 = 0;
         for (int i3 = 0; i3 < c7Var2.b; i3++) {
-            int M = zzhi.M(2, c7Var2.f1086c[i3] >>> 3);
+            int M = zzhi.M(2, c7Var2.f1084c[i3] >>> 3);
             i2 += zzhi.w(3, (t3) c7Var2.d[i3]) + M + (zzhi.L(8) << 1);
         }
         c7Var2.e = i2;
diff --git a/app/src/main/java/c/i/a/f/h/l/g.java b/app/src/main/java/c/i/a/f/h/l/g.java
index 31f66ac73a..1496b52b47 100644
--- a/app/src/main/java/c/i/a/f/h/l/g.java
+++ b/app/src/main/java/c/i/a/f/h/l/g.java
@@ -29,7 +29,7 @@ public class g {
     public static Boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1090c;
+    public final String f1088c;
     public final c.i.a.f.e.o.b d;
     public final ExecutorService e;
     public final c.i.a.f.i.a.a f;
@@ -152,9 +152,9 @@ public class g {
         boolean z3;
         boolean z4;
         if (str == null || !e(str2, str3)) {
-            this.f1090c = "FA";
+            this.f1088c = "FA";
         } else {
-            this.f1090c = str;
+            this.f1088c = str;
         }
         this.d = d.a;
         ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, new LinkedBlockingQueue(), new o());
@@ -177,22 +177,22 @@ public class g {
                         z3 = false;
                         if (!z3) {
                             this.i = true;
-                            Log.w(this.f1090c, "Disabling data collection. Found google_app_id in strings.xml but Google Analytics for Firebase is missing. Remove this value or add Google Analytics for Firebase to resume data collection.");
+                            Log.w(this.f1088c, "Disabling data collection. Found google_app_id in strings.xml but Google Analytics for Firebase is missing. Remove this value or add Google Analytics for Firebase to resume data collection.");
                             return;
                         }
                         if (!e(str2, str3)) {
                             if (str2 == null || str3 == null) {
                                 if ((str2 == null) ^ (str3 != null ? false : z5)) {
-                                    Log.w(this.f1090c, "Specified origin or custom app id is null. Both parameters will be ignored.");
+                                    Log.w(this.f1088c, "Specified origin or custom app id is null. Both parameters will be ignored.");
                                 }
                             } else {
-                                Log.v(this.f1090c, "Deferring to Google Analytics for Firebase for event data collection. https://goo.gl/J1sWQy");
+                                Log.v(this.f1088c, "Deferring to Google Analytics for Firebase for event data collection. https://goo.gl/J1sWQy");
                             }
                         }
                         this.e.execute(new j(this, str2, str3, context, bundle));
                         Application application = (Application) context.getApplicationContext();
                         if (application == null) {
-                            Log.w(this.f1090c, "Unable to register lifecycle notifications. Application null.");
+                            Log.w(this.f1088c, "Unable to register lifecycle notifications. Application null.");
                             return;
                         } else {
                             application.registerActivityLifecycleCallbacks(new b());
@@ -284,13 +284,13 @@ public class g {
     public final void b(Exception exc, boolean z2, boolean z3) {
         this.i |= z2;
         if (z2) {
-            Log.w(this.f1090c, "Data collection startup failed. No data will be collected.", exc);
+            Log.w(this.f1088c, "Data collection startup failed. No data will be collected.", exc);
             return;
         }
         if (z3) {
             this.e.execute(new y(this, "Error with data collection. Data lost.", exc));
         }
-        Log.w(this.f1090c, "Error with data collection. Data lost.", exc);
+        Log.w(this.f1088c, "Error with data collection. Data lost.", exc);
     }
 
     public final void c(String str, String str2, Bundle bundle, boolean z2, boolean z3, Long l) {
diff --git a/app/src/main/java/c/i/a/f/h/l/g4.java b/app/src/main/java/c/i/a/f/h/l/g4.java
index 1d17a4777f..3a2dd247f4 100644
--- a/app/src/main/java/c/i/a/f/h/l/g4.java
+++ b/app/src/main/java/c/i/a/f/h/l/g4.java
@@ -11,7 +11,7 @@ public final class g4 implements v7 {
     public g4(zzhi zzhi) {
         Charset charset = w4.a;
         this.a = zzhi;
-        zzhi.f2284c = this;
+        zzhi.f2290c = this;
     }
 
     public final void a(int i, double d) throws IOException {
@@ -41,7 +41,7 @@ public final class g4 implements v7 {
     public final void e(int i, Object obj, q6 q6Var) throws IOException {
         zzhi zzhi = this.a;
         zzhi.f(i, 3);
-        q6Var.g((c6) obj, zzhi.f2284c);
+        q6Var.g((c6) obj, zzhi.f2290c);
         zzhi.f(i, 4);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/g6.java b/app/src/main/java/c/i/a/f/h/l/g6.java
index ec603b35f7..c2e75e7b48 100644
--- a/app/src/main/java/c/i/a/f/h/l/g6.java
+++ b/app/src/main/java/c/i/a/f/h/l/g6.java
@@ -12,12 +12,12 @@ public final class g6<T> implements q6<T> {
     public final d7<?, ?> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1091c;
+    public final boolean f1089c;
     public final j4<?> d;
 
     public g6(d7<?, ?> d7Var, j4<?> j4Var, c6 c6Var) {
         this.b = d7Var;
-        this.f1091c = j4Var.e(c6Var);
+        this.f1089c = j4Var.e(c6Var);
         this.d = j4Var;
         this.a = c6Var;
     }
@@ -30,7 +30,7 @@ public final class g6<T> implements q6<T> {
     @Override // c.i.a.f.h.l.q6
     public final int b(T t) {
         int hashCode = this.b.e(t).hashCode();
-        return this.f1091c ? (hashCode * 53) + this.d.b(t).hashCode() : hashCode;
+        return this.f1089c ? (hashCode * 53) + this.d.b(t).hashCode() : hashCode;
     }
 
     @Override // c.i.a.f.h.l.q6
@@ -48,7 +48,7 @@ public final class g6<T> implements q6<T> {
     public final int e(T t) {
         d7<?, ?> d7Var = this.b;
         int i = d7Var.i(d7Var.e(t)) + 0;
-        if (!this.f1091c) {
+        if (!this.f1089c) {
             return i;
         }
         n4<?> b = this.d.b(t);
@@ -67,7 +67,7 @@ public final class g6<T> implements q6<T> {
         if (!this.b.e(t).equals(this.b.e(t2))) {
             return false;
         }
-        if (this.f1091c) {
+        if (this.f1089c) {
             return this.d.b(t).equals(this.d.b(t2));
         }
         return true;
@@ -119,7 +119,7 @@ public final class g6<T> implements q6<T> {
                                 throw new NoSuchMethodError();
                             } else if (i7 == 2) {
                                 z0 = c.b1(bArr, z0, s3Var);
-                                t3Var = (t3) s3Var.f1125c;
+                                t3Var = (t3) s3Var.f1123c;
                             }
                         }
                     } else if (i7 == 0) {
@@ -158,7 +158,7 @@ public final class g6<T> implements q6<T> {
         d7<?, ?> d7Var = this.b;
         Class<?> cls = s6.a;
         d7Var.d(t, d7Var.g(d7Var.e(t), d7Var.e(t2)));
-        if (this.f1091c) {
+        if (this.f1089c) {
             s6.i(this.d, t, t2);
         }
     }
diff --git a/app/src/main/java/c/i/a/f/h/l/ga.java b/app/src/main/java/c/i/a/f/h/l/ga.java
index 1e303d2b9f..73cd68995a 100644
--- a/app/src/main/java/c/i/a/f/h/l/ga.java
+++ b/app/src/main/java/c/i/a/f/h/l/ga.java
@@ -5,13 +5,13 @@ public final class ga implements ha {
     public static final l2<Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<Boolean> f1092c;
+    public static final l2<Boolean> f1090c;
 
     static {
         q2 q2Var = new q2(i2.a("com.google.android.gms.measurement"));
         a = q2Var.c("measurement.client.global_params", true);
         b = q2Var.c("measurement.service.global_params_in_payload", true);
-        f1092c = q2Var.c("measurement.service.global_params", true);
+        f1090c = q2Var.c("measurement.service.global_params", true);
         q2Var.a("measurement.id.service.global_params", 0);
     }
 
@@ -32,6 +32,6 @@ public final class ga implements ha {
 
     @Override // c.i.a.f.h.l.ha
     public final boolean d() {
-        return f1092c.d().booleanValue();
+        return f1090c.d().booleanValue();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/l/h.java b/app/src/main/java/c/i/a/f/h/l/h.java
index ced2d7c656..5bf9e01bc3 100644
--- a/app/src/main/java/c/i/a/f/h/l/h.java
+++ b/app/src/main/java/c/i/a/f/h/l/h.java
@@ -10,7 +10,7 @@ public final class h implements Parcelable.Creator<zzae> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzae createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         long j = 0;
         long j2 = 0;
         String str = null;
@@ -18,17 +18,17 @@ public final class h implements Parcelable.Creator<zzae> {
         String str3 = null;
         Bundle bundle = null;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 2:
-                    j2 = AnimatableValueParser.f2(parcel, readInt);
+                    j2 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 3:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 4:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -43,11 +43,11 @@ public final class h implements Parcelable.Creator<zzae> {
                     bundle = AnimatableValueParser.P(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzae(j, j2, z2, str, str2, str3, bundle);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/h4.java b/app/src/main/java/c/i/a/f/h/l/h4.java
index e1de77fb2a..bdaeceee83 100644
--- a/app/src/main/java/c/i/a/f/h/l/h4.java
+++ b/app/src/main/java/c/i/a/f/h/l/h4.java
@@ -10,7 +10,7 @@ public class h4 {
     public static volatile h4 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final h4 f1093c = new h4(true);
+    public static final h4 f1091c = new h4(true);
     public final Map<a, u4.f<?, ?>> d;
 
     /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
@@ -50,7 +50,7 @@ public class h4 {
             synchronized (h4.class) {
                 h4Var = a;
                 if (h4Var == null) {
-                    h4Var = f1093c;
+                    h4Var = f1091c;
                     a = h4Var;
                 }
             }
diff --git a/app/src/main/java/c/i/a/f/h/l/h9.java b/app/src/main/java/c/i/a/f/h/l/h9.java
index c897642003..2588269b4b 100644
--- a/app/src/main/java/c/i/a/f/h/l/h9.java
+++ b/app/src/main/java/c/i/a/f/h/l/h9.java
@@ -5,14 +5,14 @@ public final class h9 implements e9 {
     public static final l2<Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<Boolean> f1094c;
+    public static final l2<Boolean> f1092c;
 
     static {
         q2 q2Var = new q2(i2.a("com.google.android.gms.measurement"));
         q2Var.c("measurement.service.audience.fix_skip_audience_with_failed_filters", true);
         a = q2Var.c("measurement.audience.refresh_event_count_filters_timestamp", false);
         b = q2Var.c("measurement.audience.use_bundle_end_timestamp_for_non_sequence_property_filters", false);
-        f1094c = q2Var.c("measurement.audience.use_bundle_timestamp_for_event_count_filters", false);
+        f1092c = q2Var.c("measurement.audience.use_bundle_timestamp_for_event_count_filters", false);
     }
 
     @Override // c.i.a.f.h.l.e9
@@ -32,6 +32,6 @@ public final class h9 implements e9 {
 
     @Override // c.i.a.f.h.l.e9
     public final boolean d() {
-        return f1094c.d().booleanValue();
+        return f1092c.d().booleanValue();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/l/j.java b/app/src/main/java/c/i/a/f/h/l/j.java
index d77fd0ce7d..8a2be4b560 100644
--- a/app/src/main/java/c/i/a/f/h/l/j.java
+++ b/app/src/main/java/c/i/a/f/h/l/j.java
@@ -44,7 +44,7 @@ public final class j extends g.a {
             if (g.e(this.m, this.n)) {
                 str = this.n;
                 str2 = this.m;
-                str3 = this.q.f1090c;
+                str3 = this.q.f1088c;
             } else {
                 str3 = null;
                 str2 = null;
@@ -69,7 +69,7 @@ public final class j extends g.a {
                     ecVar = dc.asInterface(DynamiteModule.c(context, aVar, "com.google.android.gms.measurement.dynamite").b("com.google.android.gms.measurement.internal.AppMeasurementDynamiteService"));
                     gVar.j = ecVar;
                     if (this.q.j != null) {
-                        Log.w(this.q.f1090c, "Failed to connect to measurement client.");
+                        Log.w(this.q.f1088c, "Failed to connect to measurement client.");
                         return;
                     }
                     int a = DynamiteModule.a(this.o, "com.google.android.gms.measurement.dynamite");
diff --git a/app/src/main/java/c/i/a/f/h/l/j7.java b/app/src/main/java/c/i/a/f/h/l/j7.java
index 488f3fe494..918af40cc7 100644
--- a/app/src/main/java/c/i/a/f/h/l/j7.java
+++ b/app/src/main/java/c/i/a/f/h/l/j7.java
@@ -13,7 +13,7 @@ public final class j7 {
     public static final Class<?> b = q3.a;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final boolean f1095c;
+    public static final boolean f1093c;
     public static final boolean d;
     public static final c e;
     public static final boolean f;
@@ -253,7 +253,7 @@ public final class j7 {
         a = k;
         Class<?> cls = Long.TYPE;
         boolean p = p(cls);
-        f1095c = p;
+        f1093c = p;
         Class<?> cls2 = Integer.TYPE;
         boolean p2 = p(cls2);
         d = p2;
diff --git a/app/src/main/java/c/i/a/f/h/l/l2.java b/app/src/main/java/c/i/a/f/h/l/l2.java
index da14c7fa5e..62852c11ec 100644
--- a/app/src/main/java/c/i/a/f/h/l/l2.java
+++ b/app/src/main/java/c/i/a/f/h/l/l2.java
@@ -13,7 +13,7 @@ public abstract class l2<T> {
     public static volatile t2 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static u2 f1096c = new u2(n2.a);
+    public static u2 f1094c = new u2(n2.a);
     public static final AtomicInteger d = new AtomicInteger();
     public final q2 e;
     public final String f;
@@ -64,7 +64,7 @@ public abstract class l2<T> {
         Object g;
         boolean z2 = true;
         if (!this.j) {
-            u2 u2Var = f1096c;
+            u2 u2Var = f1094c;
             String str = this.f;
             Objects.requireNonNull(u2Var);
             Objects.requireNonNull(str, "flagName must not be null");
@@ -77,7 +77,7 @@ public abstract class l2<T> {
                     t2 t2Var = b;
                     c.Y0(t2Var != null, "Must call PhenotypeFlag.init() first");
                     String str2 = (String) c2.a(t2Var.a()).g("gms:phenotype:phenotype_flag:debug_bypass_phenotype");
-                    if (str2 == null || !u1.f1127c.matcher(str2).matches()) {
+                    if (str2 == null || !u1.f1125c.matcher(str2).matches()) {
                         z2 = false;
                     }
                     String str3 = null;
diff --git a/app/src/main/java/c/i/a/f/h/l/la.java b/app/src/main/java/c/i/a/f/h/l/la.java
index 7a3b34aa3e..ca88705f9c 100644
--- a/app/src/main/java/c/i/a/f/h/l/la.java
+++ b/app/src/main/java/c/i/a/f/h/l/la.java
@@ -5,14 +5,14 @@ public final class la implements ia {
     public static final l2<Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<Boolean> f1097c;
+    public static final l2<Boolean> f1095c;
     public static final l2<Boolean> d;
 
     static {
         q2 q2Var = new q2(i2.a("com.google.android.gms.measurement"));
         a = q2Var.c("measurement.sdk.collection.enable_extend_user_property_size", true);
         b = q2Var.c("measurement.sdk.collection.last_deep_link_referrer2", true);
-        f1097c = q2Var.c("measurement.sdk.collection.last_deep_link_referrer_campaign2", false);
+        f1095c = q2Var.c("measurement.sdk.collection.last_deep_link_referrer_campaign2", false);
         d = q2Var.c("measurement.sdk.collection.last_gclid_from_referrer2", false);
         q2Var.a("measurement.id.sdk.collection.last_deep_link_referrer2", 0);
     }
@@ -29,7 +29,7 @@ public final class la implements ia {
 
     @Override // c.i.a.f.h.l.ia
     public final boolean c() {
-        return f1097c.d().booleanValue();
+        return f1095c.d().booleanValue();
     }
 
     @Override // c.i.a.f.h.l.ia
diff --git a/app/src/main/java/c/i/a/f/h/l/n4.java b/app/src/main/java/c/i/a/f/h/l/n4.java
index c55d565d5c..cdb4f7f369 100644
--- a/app/src/main/java/c/i/a/f/h/l/n4.java
+++ b/app/src/main/java/c/i/a/f/h/l/n4.java
@@ -16,7 +16,7 @@ public final class n4<T extends p4<T>> {
     public final r6<T, Object> b = new t6(16);
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1098c;
+    public boolean f1096c;
     public boolean d;
 
     public n4() {
@@ -263,7 +263,7 @@ public final class n4<T extends p4<T>> {
             return obj;
         }
         d5 d5Var = (d5) obj;
-        int i = d5.f1087c;
+        int i = d5.f1085c;
         throw new NoSuchMethodError();
     }
 
@@ -291,9 +291,9 @@ public final class n4<T extends p4<T>> {
     }
 
     public final void h() {
-        if (!this.f1098c) {
+        if (!this.f1096c) {
             this.b.c();
-            this.f1098c = true;
+            this.f1096c = true;
         }
     }
 
@@ -329,7 +329,7 @@ public final class n4<T extends p4<T>> {
         Object value = entry.getValue();
         if (value instanceof d5) {
             d5 d5Var = (d5) value;
-            int i = d5.f1087c;
+            int i = d5.f1085c;
             throw new NoSuchMethodError();
         } else if (key.d()) {
             Object c2 = c(key);
diff --git a/app/src/main/java/c/i/a/f/h/l/n6.java b/app/src/main/java/c/i/a/f/h/l/n6.java
index 4db9fac51b..25c95682fc 100644
--- a/app/src/main/java/c/i/a/f/h/l/n6.java
+++ b/app/src/main/java/c/i/a/f/h/l/n6.java
@@ -10,7 +10,7 @@ public final class n6 {
     public final p6 b = new p5();
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConcurrentMap<Class<?>, q6<?>> f1099c = new ConcurrentHashMap();
+    public final ConcurrentMap<Class<?>, q6<?>> f1097c = new ConcurrentHashMap();
 
     public final <T> q6<T> a(Class<T> cls) {
         q6<T> q6Var;
@@ -18,7 +18,7 @@ public final class n6 {
         Class<?> cls2;
         Charset charset = w4.a;
         Objects.requireNonNull(cls, "messageType");
-        q6<T> q6Var2 = (q6<T>) this.f1099c.get(cls);
+        q6<T> q6Var2 = (q6<T>) this.f1097c.get(cls);
         if (q6Var2 != null) {
             return q6Var2;
         }
@@ -72,11 +72,11 @@ public final class n6 {
                             throw new IllegalStateException("Protobuf runtime is not correctly loaded.");
                         }
                     } else {
-                        q6Var = e6.n(b, k6.a, m5.a, s6.f1126c, null, x5.a);
+                        q6Var = e6.n(b, k6.a, m5.a, s6.f1124c, null, x5.a);
                     }
                 }
             }
-            q6<T> q6Var3 = (q6<T>) this.f1099c.putIfAbsent(cls, q6Var);
+            q6<T> q6Var3 = (q6<T>) this.f1097c.putIfAbsent(cls, q6Var);
             return q6Var3 != null ? q6Var3 : q6Var;
         }
         throw new IllegalArgumentException("Message classes must extend GeneratedMessage or GeneratedMessageLite");
diff --git a/app/src/main/java/c/i/a/f/h/l/o4.java b/app/src/main/java/c/i/a/f/h/l/o4.java
index 9123feffea..9c29209aa4 100644
--- a/app/src/main/java/c/i/a/f/h/l/o4.java
+++ b/app/src/main/java/c/i/a/f/h/l/o4.java
@@ -105,7 +105,7 @@ public enum o4 {
     
 
     /* renamed from: h0  reason: collision with root package name */
-    public static final o4[] f1107h0 = new o4[51];
+    public static final o4[] f1105h0 = new o4[51];
     private final e5 zzaz;
     private final int zzba;
     private final q4 zzbb;
@@ -129,7 +129,7 @@ public enum o4 {
         o4[] values = values();
         for (int i = 0; i < 51; i++) {
             o4 o4Var = values[i];
-            f1107h0[o4Var.zzba] = o4Var;
+            f1105h0[o4Var.zzba] = o4Var;
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/l/o5.java b/app/src/main/java/c/i/a/f/h/l/o5.java
index d80b95ee8b..996881934a 100644
--- a/app/src/main/java/c/i/a/f/h/l/o5.java
+++ b/app/src/main/java/c/i/a/f/h/l/o5.java
@@ -7,7 +7,7 @@ import java.util.List;
 public final class o5 extends m5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Class<?> f1113c = Collections.unmodifiableList(Collections.emptyList()).getClass();
+    public static final Class<?> f1111c = Collections.unmodifiableList(Collections.emptyList()).getClass();
 
     public o5(l5 l5Var) {
         super(null);
@@ -23,7 +23,7 @@ public final class o5 extends m5 {
             list2 = list2 instanceof j5 ? new k5(size) : (!(list2 instanceof l6) || !(list2 instanceof b5)) ? new ArrayList(size) : ((b5) list2).f(size);
             j7.f(obj, j, list2);
         } else {
-            if (f1113c.isAssignableFrom(list2.getClass())) {
+            if (f1111c.isAssignableFrom(list2.getClass())) {
                 ArrayList arrayList2 = new ArrayList(list2.size() + size);
                 arrayList2.addAll(list2);
                 j7.f(obj, j, arrayList2);
@@ -59,7 +59,7 @@ public final class o5 extends m5 {
         List list = (List) j7.r(obj, j);
         if (list instanceof j5) {
             obj2 = ((j5) list).r();
-        } else if (!f1113c.isAssignableFrom(list.getClass())) {
+        } else if (!f1111c.isAssignableFrom(list.getClass())) {
             if (!(list instanceof l6) || !(list instanceof b5)) {
                 obj2 = Collections.unmodifiableList(list);
             } else {
diff --git a/app/src/main/java/c/i/a/f/h/l/o6.java b/app/src/main/java/c/i/a/f/h/l/o6.java
index df778643ed..cae39c2c5d 100644
--- a/app/src/main/java/c/i/a/f/h/l/o6.java
+++ b/app/src/main/java/c/i/a/f/h/l/o6.java
@@ -5,13 +5,13 @@ public final class o6 implements a6 {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Object[] f1114c;
+    public final Object[] f1112c;
     public final int d;
 
     public o6(c6 c6Var, String str, Object[] objArr) {
         this.a = c6Var;
         this.b = str;
-        this.f1114c = objArr;
+        this.f1112c = objArr;
         char charAt = str.charAt(0);
         if (charAt < 55296) {
             this.d = charAt;
diff --git a/app/src/main/java/c/i/a/f/h/l/p2.java b/app/src/main/java/c/i/a/f/h/l/p2.java
index e939464ac9..cc20d8a987 100644
--- a/app/src/main/java/c/i/a/f/h/l/p2.java
+++ b/app/src/main/java/c/i/a/f/h/l/p2.java
@@ -16,7 +16,7 @@ public final class p2 extends l2<Boolean> {
         }
         if (obj instanceof String) {
             String str = (String) obj;
-            if (u1.f1127c.matcher(str).matches()) {
+            if (u1.f1125c.matcher(str).matches()) {
                 return Boolean.TRUE;
             }
             if (u1.d.matcher(str).matches()) {
diff --git a/app/src/main/java/c/i/a/f/h/l/p8.java b/app/src/main/java/c/i/a/f/h/l/p8.java
index 8bb03c82c4..1ffe1f3697 100644
--- a/app/src/main/java/c/i/a/f/h/l/p8.java
+++ b/app/src/main/java/c/i/a/f/h/l/p8.java
@@ -12,7 +12,7 @@ public final class p8 implements m8 {
     public static final l2<Long> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<String> f1119c;
+    public static final l2<String> f1117c;
     public static final l2<String> d;
     public static final l2<Long> e;
     public static final l2<Long> f;
@@ -30,27 +30,27 @@ public final class p8 implements m8 {
     public static final l2<Long> r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final l2<Long> f1120s;
+    public static final l2<Long> f1118s;
     public static final l2<Long> t;
     public static final l2<Long> u;
     public static final l2<Long> v;
     public static final l2<Long> w;
 
     /* renamed from: x  reason: collision with root package name */
-    public static final l2<Long> f1121x;
+    public static final l2<Long> f1119x;
 
     /* renamed from: y  reason: collision with root package name */
-    public static final l2<Long> f1122y;
+    public static final l2<Long> f1120y;
 
     /* renamed from: z  reason: collision with root package name */
-    public static final l2<Long> f1123z;
+    public static final l2<Long> f1121z;
 
     static {
         q2 q2Var = new q2(i2.a("com.google.android.gms.measurement"));
         a = q2Var.a("measurement.ad_id_cache_time", 10000);
         b = q2Var.a("measurement.config.cache_time", 86400000);
         q2Var.b("measurement.log_tag", "FA");
-        f1119c = q2Var.b("measurement.config.url_authority", "app-measurement.com");
+        f1117c = q2Var.b("measurement.config.url_authority", "app-measurement.com");
         d = q2Var.b("measurement.config.url_scheme", "https");
         e = q2Var.a("measurement.upload.debug_upload_interval", 1000);
         f = q2Var.a("measurement.lifetimevalue.max_currency_tracked", 4);
@@ -68,14 +68,14 @@ public final class p8 implements m8 {
         p = q2Var.a("measurement.upload.stale_data_deletion_interval", 86400000);
         q = q2Var.a("measurement.upload.backoff_period", 43200000);
         r = q2Var.a("measurement.upload.initial_upload_delay_time", 15000);
-        f1120s = q2Var.a("measurement.upload.interval", 3600000);
+        f1118s = q2Var.a("measurement.upload.interval", 3600000);
         t = q2Var.a("measurement.upload.max_bundle_size", 65536);
         u = q2Var.a("measurement.upload.max_bundles", 100);
         v = q2Var.a("measurement.upload.max_conversions_per_day", 500);
         w = q2Var.a("measurement.upload.max_error_events_per_day", 1000);
-        f1121x = q2Var.a("measurement.upload.max_events_per_bundle", 1000);
-        f1122y = q2Var.a("measurement.upload.max_events_per_day", 100000);
-        f1123z = q2Var.a("measurement.upload.max_public_events_per_day", 50000);
+        f1119x = q2Var.a("measurement.upload.max_events_per_bundle", 1000);
+        f1120y = q2Var.a("measurement.upload.max_events_per_day", 100000);
+        f1121z = q2Var.a("measurement.upload.max_public_events_per_day", 50000);
         A = q2Var.a("measurement.upload.max_queue_time", 2419200000L);
         B = q2Var.a("measurement.upload.max_realtime_events_per_day", 10);
         C = q2Var.a("measurement.upload.max_batch_size", 65536);
@@ -112,7 +112,7 @@ public final class p8 implements m8 {
 
     @Override // c.i.a.f.h.l.m8
     public final long F() {
-        return f1120s.d().longValue();
+        return f1118s.d().longValue();
     }
 
     @Override // c.i.a.f.h.l.m8
@@ -137,7 +137,7 @@ public final class p8 implements m8 {
 
     @Override // c.i.a.f.h.l.m8
     public final String c() {
-        return f1119c.d();
+        return f1117c.d();
     }
 
     @Override // c.i.a.f.h.l.m8
@@ -177,7 +177,7 @@ public final class p8 implements m8 {
 
     @Override // c.i.a.f.h.l.m8
     public final long l() {
-        return f1122y.d().longValue();
+        return f1120y.d().longValue();
     }
 
     @Override // c.i.a.f.h.l.m8
@@ -192,7 +192,7 @@ public final class p8 implements m8 {
 
     @Override // c.i.a.f.h.l.m8
     public final long o() {
-        return f1123z.d().longValue();
+        return f1121z.d().longValue();
     }
 
     @Override // c.i.a.f.h.l.m8
@@ -237,7 +237,7 @@ public final class p8 implements m8 {
 
     @Override // c.i.a.f.h.l.m8
     public final long x() {
-        return f1121x.d().longValue();
+        return f1119x.d().longValue();
     }
 
     @Override // c.i.a.f.h.l.m8
diff --git a/app/src/main/java/c/i/a/f/h/l/s2.java b/app/src/main/java/c/i/a/f/h/l/s2.java
index 3d81f0bad4..13b18398af 100644
--- a/app/src/main/java/c/i/a/f/h/l/s2.java
+++ b/app/src/main/java/c/i/a/f/h/l/s2.java
@@ -13,7 +13,7 @@ public final class s2 implements b2 {
     public final SharedPreferences b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final SharedPreferences.OnSharedPreferenceChangeListener f1124c;
+    public final SharedPreferences.OnSharedPreferenceChangeListener f1122c;
     public final Object d;
     public volatile Map<String, ?> e;
 
@@ -40,7 +40,7 @@ public final class s2 implements b2 {
     public static synchronized void b() {
         synchronized (s2.class) {
             for (s2 s2Var : a.values()) {
-                s2Var.b.unregisterOnSharedPreferenceChangeListener(s2Var.f1124c);
+                s2Var.b.unregisterOnSharedPreferenceChangeListener(s2Var.f1122c);
             }
             a.clear();
         }
diff --git a/app/src/main/java/c/i/a/f/h/l/s3.java b/app/src/main/java/c/i/a/f/h/l/s3.java
index 5c8502528c..12e1a5a06a 100644
--- a/app/src/main/java/c/i/a/f/h/l/s3.java
+++ b/app/src/main/java/c/i/a/f/h/l/s3.java
@@ -7,7 +7,7 @@ public final class s3 {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Object f1125c;
+    public Object f1123c;
     public final h4 d;
 
     public s3(h4 h4Var) {
diff --git a/app/src/main/java/c/i/a/f/h/l/s6.java b/app/src/main/java/c/i/a/f/h/l/s6.java
index d653a1b491..fe33869874 100644
--- a/app/src/main/java/c/i/a/f/h/l/s6.java
+++ b/app/src/main/java/c/i/a/f/h/l/s6.java
@@ -12,7 +12,7 @@ public final class s6 {
     public static final d7<?, ?> b = e(false);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d7<?, ?> f1126c = e(true);
+    public static final d7<?, ?> f1124c = e(true);
     public static final d7<?, ?> d = new f7();
 
     static {
diff --git a/app/src/main/java/c/i/a/f/h/l/u1.java b/app/src/main/java/c/i/a/f/h/l/u1.java
index 3dfafeaaed..bd0da0db8c 100644
--- a/app/src/main/java/c/i/a/f/h/l/u1.java
+++ b/app/src/main/java/c/i/a/f/h/l/u1.java
@@ -10,7 +10,7 @@ public class u1 {
     public static final Uri b = Uri.parse("content://com.google.android.gsf.gservices/prefix");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pattern f1127c = Pattern.compile("^(1|true|t|on|yes|y)$", 2);
+    public static final Pattern f1125c = Pattern.compile("^(1|true|t|on|yes|y)$", 2);
     public static final Pattern d = Pattern.compile("^(0|false|f|off|no|n)$", 2);
     public static final AtomicBoolean e = new AtomicBoolean();
     public static HashMap<String, String> f;
diff --git a/app/src/main/java/c/i/a/f/h/l/u4.java b/app/src/main/java/c/i/a/f/h/l/u4.java
index a5f560ab0f..83fcf6167f 100644
--- a/app/src/main/java/c/i/a/f/h/l/u4.java
+++ b/app/src/main/java/c/i/a/f/h/l/u4.java
@@ -149,7 +149,7 @@ public abstract class u4<MessageType extends u4<MessageType, BuilderType>, Build
 
         public final n4<c> u() {
             n4<c> n4Var = this.zzc;
-            if (n4Var.f1098c) {
+            if (n4Var.f1096c) {
                 this.zzc = (n4) n4Var.clone();
             }
             return this.zzc;
@@ -270,7 +270,7 @@ public abstract class u4<MessageType extends u4<MessageType, BuilderType>, Build
     @Override // c.i.a.f.h.l.c6
     public final void i(zzhi zzhi) throws IOException {
         q6 b2 = n6.a.b(this);
-        g4 g4Var = zzhi.f2284c;
+        g4 g4Var = zzhi.f2290c;
         if (g4Var == null) {
             g4Var = new g4(zzhi);
         }
diff --git a/app/src/main/java/c/i/a/f/h/l/v8.java b/app/src/main/java/c/i/a/f/h/l/v8.java
index c4c8ce30b1..1d791d52be 100644
--- a/app/src/main/java/c/i/a/f/h/l/v8.java
+++ b/app/src/main/java/c/i/a/f/h/l/v8.java
@@ -5,14 +5,14 @@ public final class v8 implements s8 {
     public static final l2<Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<Boolean> f1128c;
+    public static final l2<Boolean> f1126c;
     public static final l2<Long> d;
 
     static {
         q2 q2Var = new q2(i2.a("com.google.android.gms.measurement"));
         a = q2Var.c("measurement.client.consent_state_v1", false);
         b = q2Var.c("measurement.client.3p_consent_state_v1", false);
-        f1128c = q2Var.c("measurement.service.consent_state_v1_W36", false);
+        f1126c = q2Var.c("measurement.service.consent_state_v1_W36", false);
         q2Var.a("measurement.id.service.consent_state_v1_W36", 0);
         d = q2Var.a("measurement.service.storage_consent_support_version", 203590);
     }
@@ -34,7 +34,7 @@ public final class v8 implements s8 {
 
     @Override // c.i.a.f.h.l.s8
     public final boolean d() {
-        return f1128c.d().booleanValue();
+        return f1126c.d().booleanValue();
     }
 
     @Override // c.i.a.f.h.l.s8
diff --git a/app/src/main/java/c/i/a/f/h/l/x1.java b/app/src/main/java/c/i/a/f/h/l/x1.java
index 23f18d7e9f..1e4ce92ec3 100644
--- a/app/src/main/java/c/i/a/f/h/l/x1.java
+++ b/app/src/main/java/c/i/a/f/h/l/x1.java
@@ -16,7 +16,7 @@ public final /* synthetic */ class x1 implements d2 {
     @Override // c.i.a.f.h.l.d2
     public final Object a() {
         y1 y1Var = this.a;
-        Cursor query = y1Var.f1129c.query(y1Var.d, y1.b, null, null, null);
+        Cursor query = y1Var.f1127c.query(y1Var.d, y1.b, null, null, null);
         if (query == null) {
             return Collections.emptyMap();
         }
diff --git a/app/src/main/java/c/i/a/f/h/l/y1.java b/app/src/main/java/c/i/a/f/h/l/y1.java
index 8c53680453..f492c0fd1a 100644
--- a/app/src/main/java/c/i/a/f/h/l/y1.java
+++ b/app/src/main/java/c/i/a/f/h/l/y1.java
@@ -21,7 +21,7 @@ public final class y1 implements b2 {
     public static final String[] b = {"key", "value"};
 
     /* renamed from: c  reason: collision with root package name */
-    public final ContentResolver f1129c;
+    public final ContentResolver f1127c;
     public final Uri d;
     public final ContentObserver e;
     public final Object f = new Object();
@@ -34,7 +34,7 @@ public final class y1 implements b2 {
         this.e = a2Var;
         Objects.requireNonNull(contentResolver);
         Objects.requireNonNull(uri);
-        this.f1129c = contentResolver;
+        this.f1127c = contentResolver;
         this.d = uri;
         contentResolver.registerContentObserver(uri, false, a2Var);
     }
@@ -62,7 +62,7 @@ public final class y1 implements b2 {
     public static synchronized void c() {
         synchronized (y1.class) {
             for (y1 y1Var : a.values()) {
-                y1Var.f1129c.unregisterContentObserver(y1Var.e);
+                y1Var.f1127c.unregisterContentObserver(y1Var.e);
             }
             a.clear();
         }
diff --git a/app/src/main/java/c/i/a/f/h/l/y7.java b/app/src/main/java/c/i/a/f/h/l/y7.java
index 17445628ef..32f247a25f 100644
--- a/app/src/main/java/c/i/a/f/h/l/y7.java
+++ b/app/src/main/java/c/i/a/f/h/l/y7.java
@@ -5,13 +5,13 @@ public final class y7 implements z7 {
     public static final l2<Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<Boolean> f1130c;
+    public static final l2<Boolean> f1128c;
 
     static {
         q2 q2Var = new q2(i2.a("com.google.android.gms.measurement"));
         a = q2Var.c("measurement.client.ad_impression", true);
         b = q2Var.c("measurement.service.separate_public_internal_event_blacklisting", true);
-        f1130c = q2Var.c("measurement.service.ad_impression", true);
+        f1128c = q2Var.c("measurement.service.ad_impression", true);
         q2Var.a("measurement.id.service.ad_impression", 0);
     }
 
@@ -32,6 +32,6 @@ public final class y7 implements z7 {
 
     @Override // c.i.a.f.h.l.z7
     public final boolean d() {
-        return f1130c.d().booleanValue();
+        return f1128c.d().booleanValue();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/l/ya.java b/app/src/main/java/c/i/a/f/h/l/ya.java
index b9ed3d28cc..1a8775eff5 100644
--- a/app/src/main/java/c/i/a/f/h/l/ya.java
+++ b/app/src/main/java/c/i/a/f/h/l/ya.java
@@ -5,7 +5,7 @@ public final class ya implements za {
     public static final l2<Double> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final l2<Long> f1131c;
+    public static final l2<Long> f1129c;
     public static final l2<Long> d;
     public static final l2<String> e;
 
@@ -14,7 +14,7 @@ public final class ya implements za {
         a = q2Var.c("measurement.test.boolean_flag", false);
         Object obj = l2.a;
         b = new o2(q2Var, "measurement.test.double_flag", Double.valueOf(-3.0d));
-        f1131c = q2Var.a("measurement.test.int_flag", -2);
+        f1129c = q2Var.a("measurement.test.int_flag", -2);
         d = q2Var.a("measurement.test.long_flag", -1);
         e = q2Var.b("measurement.test.string_flag", "---");
     }
@@ -31,7 +31,7 @@ public final class ya implements za {
 
     @Override // c.i.a.f.h.l.za
     public final long c() {
-        return f1131c.d().longValue();
+        return f1129c.d().longValue();
     }
 
     @Override // c.i.a.f.h.l.za
diff --git a/app/src/main/java/c/i/a/f/h/m/d.java b/app/src/main/java/c/i/a/f/h/m/d.java
index c625f95654..99f8dbdf29 100644
--- a/app/src/main/java/c/i/a/f/h/m/d.java
+++ b/app/src/main/java/c/i/a/f/h/m/d.java
@@ -9,7 +9,7 @@ public final class d implements Parcelable.Creator<zzgp> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzgp createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         ParcelUuid parcelUuid = null;
         ParcelUuid parcelUuid2 = null;
         ParcelUuid parcelUuid3 = null;
@@ -19,7 +19,7 @@ public final class d implements Parcelable.Creator<zzgp> {
         byte[] bArr4 = null;
         int i = 0;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 != 1) {
@@ -40,7 +40,7 @@ public final class d implements Parcelable.Creator<zzgp> {
                         bArr2 = AnimatableValueParser.Q(parcel, readInt);
                         continue;
                     case 9:
-                        i2 = AnimatableValueParser.e2(parcel, readInt);
+                        i2 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 10:
                         bArr3 = AnimatableValueParser.Q(parcel, readInt);
@@ -49,14 +49,14 @@ public final class d implements Parcelable.Creator<zzgp> {
                         bArr4 = AnimatableValueParser.Q(parcel, readInt);
                         continue;
                     default:
-                        AnimatableValueParser.B2(parcel, readInt);
+                        AnimatableValueParser.D2(parcel, readInt);
                         continue;
                 }
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzgp(i, parcelUuid, parcelUuid2, parcelUuid3, bArr, bArr2, i2, bArr3, bArr4);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/m/e.java b/app/src/main/java/c/i/a/f/h/m/e.java
index 267a696a08..554dba9e15 100644
--- a/app/src/main/java/c/i/a/f/h/m/e.java
+++ b/app/src/main/java/c/i/a/f/h/m/e.java
@@ -16,7 +16,7 @@ public final class e {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<ParcelUuid> f1132c;
+    public final List<ParcelUuid> f1130c;
     @Nullable
     public final SparseArray<byte[]> d;
     @Nullable
@@ -27,7 +27,7 @@ public final class e {
     public final byte[] h;
 
     public e(@Nullable List<ParcelUuid> list, @Nullable SparseArray<byte[]> sparseArray, @Nullable Map<ParcelUuid, byte[]> map, int i, int i2, @Nullable String str, byte[] bArr) {
-        this.f1132c = list;
+        this.f1130c = list;
         this.d = sparseArray;
         this.e = map;
         this.g = str;
@@ -87,7 +87,7 @@ public final class e {
     public final String toString() {
         String str;
         int i = this.b;
-        String valueOf = String.valueOf(this.f1132c);
+        String valueOf = String.valueOf(this.f1130c);
         SparseArray<byte[]> sparseArray = this.d;
         StringBuilder sb = new StringBuilder();
         String str2 = "{}";
diff --git a/app/src/main/java/c/i/a/f/h/m/f.java b/app/src/main/java/c/i/a/f/h/m/f.java
index 28cbcecb13..38e01a7f06 100644
--- a/app/src/main/java/c/i/a/f/h/m/f.java
+++ b/app/src/main/java/c/i/a/f/h/m/f.java
@@ -8,11 +8,11 @@ public final class f implements Parcelable.Creator<zzgs> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzgs createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 3) {
@@ -20,12 +20,12 @@ public final class f implements Parcelable.Creator<zzgs> {
             } else if (i2 == 6) {
                 str2 = AnimatableValueParser.T(parcel, readInt);
             } else if (i2 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzgs(i, str, str2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/m/g.java b/app/src/main/java/c/i/a/f/h/m/g.java
index 7040b462bb..d842c90155 100644
--- a/app/src/main/java/c/i/a/f/h/m/g.java
+++ b/app/src/main/java/c/i/a/f/h/m/g.java
@@ -8,27 +8,27 @@ public final class g implements Parcelable.Creator<zzgu> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzgu createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         byte[] bArr = null;
         int i2 = 0;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
                 bArr = AnimatableValueParser.Q(parcel, readInt);
             } else if (i3 == 3) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i3 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzgu(i, i2, bArr, z2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/h/m/p.java b/app/src/main/java/c/i/a/f/h/m/p.java
index 2e98fcec66..3b70a18ab7 100644
--- a/app/src/main/java/c/i/a/f/h/m/p.java
+++ b/app/src/main/java/c/i/a/f/h/m/p.java
@@ -10,7 +10,7 @@ public class p {
     public static final Uri b = Uri.parse("content://com.google.android.gsf.gservices/prefix");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pattern f1133c = Pattern.compile("^(1|true|t|on|yes|y)$", 2);
+    public static final Pattern f1131c = Pattern.compile("^(1|true|t|on|yes|y)$", 2);
     public static final Pattern d = Pattern.compile("^(0|false|f|off|no|n)$", 2);
     public static final AtomicBoolean e = new AtomicBoolean();
     public static HashMap<String, String> f;
diff --git a/app/src/main/java/c/i/a/f/h/n/b.java b/app/src/main/java/c/i/a/f/h/n/b.java
index 10a33e80c9..1ca0a4a250 100644
--- a/app/src/main/java/c/i/a/f/h/n/b.java
+++ b/app/src/main/java/c/i/a/f/h/n/b.java
@@ -12,7 +12,7 @@ public final class b extends e implements d {
     }
 
     @Override // c.i.a.f.h.n.d
-    public final Bundle K(int i, String str, String str2, Bundle bundle, Bundle bundle2) throws RemoteException {
+    public final Bundle L(int i, String str, String str2, Bundle bundle, Bundle bundle2) throws RemoteException {
         Parcel e = e();
         e.writeInt(10);
         e.writeString(str);
@@ -29,7 +29,7 @@ public final class b extends e implements d {
     }
 
     @Override // c.i.a.f.h.n.d
-    public final Bundle Q(int i, String str, String str2, String str3, Bundle bundle) throws RemoteException {
+    public final Bundle R(int i, String str, String str2, String str3, Bundle bundle) throws RemoteException {
         Parcel e = e();
         e.writeInt(9);
         e.writeString(str);
@@ -103,18 +103,6 @@ public final class b extends e implements d {
         return bundle2;
     }
 
-    @Override // c.i.a.f.h.n.d
-    public final int o(int i, String str, String str2) throws RemoteException {
-        Parcel e = e();
-        e.writeInt(i);
-        e.writeString(str);
-        e.writeString(str2);
-        Parcel g = g(1, e);
-        int readInt = g.readInt();
-        g.recycle();
-        return readInt;
-    }
-
     @Override // c.i.a.f.h.n.d
     public final Bundle o0(int i, String str, String str2, Bundle bundle) throws RemoteException {
         Parcel e = e();
@@ -131,17 +119,15 @@ public final class b extends e implements d {
     }
 
     @Override // c.i.a.f.h.n.d
-    public final Bundle p(int i, String str, String str2, String str3, String str4) throws RemoteException {
+    public final int p(int i, String str, String str2) throws RemoteException {
         Parcel e = e();
-        e.writeInt(3);
+        e.writeInt(i);
         e.writeString(str);
         e.writeString(str2);
-        e.writeString(str3);
-        e.writeString(null);
-        Parcel g = g(3, e);
-        Bundle bundle = (Bundle) g.a(g, Bundle.CREATOR);
+        Parcel g = g(1, e);
+        int readInt = g.readInt();
         g.recycle();
-        return bundle;
+        return readInt;
     }
 
     @Override // c.i.a.f.h.n.d
@@ -156,4 +142,18 @@ public final class b extends e implements d {
         g.recycle();
         return bundle;
     }
+
+    @Override // c.i.a.f.h.n.d
+    public final Bundle q(int i, String str, String str2, String str3, String str4) throws RemoteException {
+        Parcel e = e();
+        e.writeInt(3);
+        e.writeString(str);
+        e.writeString(str2);
+        e.writeString(str3);
+        e.writeString(null);
+        Parcel g = g(3, e);
+        Bundle bundle = (Bundle) g.a(g, Bundle.CREATOR);
+        g.recycle();
+        return bundle;
+    }
 }
diff --git a/app/src/main/java/c/i/a/f/h/n/d.java b/app/src/main/java/c/i/a/f/h/n/d.java
index 9f0577b9ef..b5570cd643 100644
--- a/app/src/main/java/c/i/a/f/h/n/d.java
+++ b/app/src/main/java/c/i/a/f/h/n/d.java
@@ -6,9 +6,9 @@ import android.os.RemoteException;
 import java.util.List;
 /* compiled from: com.android.billingclient:billing@@3.0.3 */
 public interface d extends IInterface {
-    Bundle K(int i, String str, String str2, Bundle bundle, Bundle bundle2) throws RemoteException;
+    Bundle L(int i, String str, String str2, Bundle bundle, Bundle bundle2) throws RemoteException;
 
-    Bundle Q(int i, String str, String str2, String str3, Bundle bundle) throws RemoteException;
+    Bundle R(int i, String str, String str2, String str3, Bundle bundle) throws RemoteException;
 
     int Y(int i, String str, String str2) throws RemoteException;
 
@@ -18,11 +18,11 @@ public interface d extends IInterface {
 
     Bundle k0(int i, String str, String str2, Bundle bundle) throws RemoteException;
 
-    int o(int i, String str, String str2) throws RemoteException;
-
     Bundle o0(int i, String str, String str2, Bundle bundle) throws RemoteException;
 
-    Bundle p(int i, String str, String str2, String str3, String str4) throws RemoteException;
+    int p(int i, String str, String str2) throws RemoteException;
 
     Bundle p0(int i, String str, String str2, String str3) throws RemoteException;
+
+    Bundle q(int i, String str, String str2, String str3, String str4) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/h/o/d.java b/app/src/main/java/c/i/a/f/h/o/d.java
index 8904abd832..5094363321 100644
--- a/app/src/main/java/c/i/a/f/h/o/d.java
+++ b/app/src/main/java/c/i/a/f/h/o/d.java
@@ -5,6 +5,6 @@ import c.i.a.f.e.h.h;
 import c.i.a.f.k.a;
 public abstract class d<R extends h> extends c.i.a.f.e.h.j.d<R, l> {
     public d(c cVar) {
-        super(a.f1215c, cVar);
+        super(a.f1212c, cVar);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/o/j.java b/app/src/main/java/c/i/a/f/h/o/j.java
index c3e17c0ddd..68985fe2aa 100644
--- a/app/src/main/java/c/i/a/f/h/o/j.java
+++ b/app/src/main/java/c/i/a/f/h/o/j.java
@@ -15,6 +15,6 @@ public final class j extends i.a {
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [c.i.a.f.e.h.a$b] */
     @Override // c.i.a.f.e.h.j.d
     public final /* synthetic */ void k(l lVar) throws RemoteException {
-        lVar.w().s0(this.l, this.m);
+        lVar.v().s0(this.l, this.m);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/h/o/l.java b/app/src/main/java/c/i/a/f/h/o/l.java
index 9cba46e1ca..cfd27c3362 100644
--- a/app/src/main/java/c/i/a/f/h/o/l.java
+++ b/app/src/main/java/c/i/a/f/h/o/l.java
@@ -27,12 +27,12 @@ public final class l extends d<g> {
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.safetynet.internal.ISafetyNetService";
     }
 
     @Override // c.i.a.f.e.k.b
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.safetynet.service.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/a/a.java b/app/src/main/java/c/i/a/f/i/a/a.java
index 997e568fe6..753b5a7092 100644
--- a/app/src/main/java/c/i/a/f/i/a/a.java
+++ b/app/src/main/java/c/i/a/f/i/a/a.java
@@ -29,7 +29,7 @@ public class a {
         synchronized (gVar.g) {
             for (int i = 0; i < gVar.g.size(); i++) {
                 if (aVar.equals(gVar.g.get(i).first)) {
-                    Log.w(gVar.f1090c, "OnEventListener already registered.");
+                    Log.w(gVar.f1088c, "OnEventListener already registered.");
                     return;
                 }
             }
@@ -41,7 +41,7 @@ public class a {
                 gVar.j.registerOnMeasurementEventListener(cVar);
                 return;
             } catch (BadParcelableException | NetworkOnMainThreadException | RemoteException | IllegalArgumentException | IllegalStateException | NullPointerException | SecurityException | UnsupportedOperationException unused) {
-                Log.w(gVar.f1090c, "Failed to register event listener on calling thread. Trying again on the dynamite thread.");
+                Log.w(gVar.f1088c, "Failed to register event listener on calling thread. Trying again on the dynamite thread.");
             }
         }
         gVar.e.execute(new a0(gVar, cVar));
diff --git a/app/src/main/java/c/i/a/f/i/b/a.java b/app/src/main/java/c/i/a/f/i/b/a.java
index ae505c7dbb..d0bf0d59f7 100644
--- a/app/src/main/java/c/i/a/f/i/b/a.java
+++ b/app/src/main/java/c/i/a/f/i/b/a.java
@@ -9,7 +9,7 @@ public final class a extends z1 {
     public final Map<String, Long> b = new ArrayMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<String, Integer> f1134c = new ArrayMap();
+    public final Map<String, Integer> f1132c = new ArrayMap();
     public long d;
 
     public a(u4 u4Var) {
diff --git a/app/src/main/java/c/i/a/f/i/b/a4.java b/app/src/main/java/c/i/a/f/i/b/a4.java
index a727ab260d..8c4940f63c 100644
--- a/app/src/main/java/c/i/a/f/i/b/a4.java
+++ b/app/src/main/java/c/i/a/f/i/b/a4.java
@@ -20,7 +20,7 @@ public final class a4 {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1135c;
+    public String f1133c;
     public String d;
     public String e;
     public String f;
@@ -38,20 +38,20 @@ public final class a4 {
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public String f1136s;
+    public String f1134s;
     public Boolean t;
     public long u;
     public List<String> v;
     public String w;
 
     /* renamed from: x  reason: collision with root package name */
-    public long f1137x;
+    public long f1135x;
 
     /* renamed from: y  reason: collision with root package name */
-    public long f1138y;
+    public long f1136y;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f1139z;
+    public long f1137z;
 
     @WorkerThread
     public a4(u4 u4Var, String str) {
@@ -245,8 +245,8 @@ public final class a4 {
     @WorkerThread
     public final void c(String str) {
         this.a.f().b();
-        this.E |= !t9.q0(this.f1135c, str);
-        this.f1135c = str;
+        this.E |= !t9.q0(this.f1133c, str);
+        this.f1133c = str;
     }
 
     @WorkerThread
@@ -348,8 +348,8 @@ public final class a4 {
         if (TextUtils.isEmpty(str)) {
             str = null;
         }
-        this.E |= !t9.q0(this.f1136s, str);
-        this.f1136s = str;
+        this.E |= !t9.q0(this.f1134s, str);
+        this.f1134s = str;
     }
 
     @WorkerThread
@@ -362,7 +362,7 @@ public final class a4 {
     @WorkerThread
     public final String s() {
         this.a.f().b();
-        return this.f1135c;
+        return this.f1133c;
     }
 
     @WorkerThread
@@ -405,7 +405,7 @@ public final class a4 {
     @WorkerThread
     public final String y() {
         this.a.f().b();
-        return this.f1136s;
+        return this.f1134s;
     }
 
     @WorkerThread
diff --git a/app/src/main/java/c/i/a/f/i/b/a9.java b/app/src/main/java/c/i/a/f/i/b/a9.java
index baf243bff5..29ef4f69da 100644
--- a/app/src/main/java/c/i/a/f/i/b/a9.java
+++ b/app/src/main/java/c/i/a/f/i/b/a9.java
@@ -19,11 +19,11 @@ public final /* synthetic */ class a9 implements Runnable {
         x8Var.b.g().m.a("Application going to the background");
         boolean z2 = true;
         if (x8Var.b.a.h.o(p.v0)) {
-            x8Var.b.l().f1147x.a(true);
+            x8Var.b.l().f1145x.a(true);
         }
         Bundle bundle = new Bundle();
         if (!x8Var.b.a.h.z().booleanValue()) {
-            x8Var.b.e.f1150c.c();
+            x8Var.b.e.f1148c.c();
             if (x8Var.b.a.h.o(p.m0)) {
                 d9 d9Var = x8Var.b.e;
                 d9Var.b = j2;
diff --git a/app/src/main/java/c/i/a/f/i/b/b4.java b/app/src/main/java/c/i/a/f/i/b/b4.java
index a20d1761ba..3758413936 100644
--- a/app/src/main/java/c/i/a/f/i/b/b4.java
+++ b/app/src/main/java/c/i/a/f/i/b/b4.java
@@ -11,7 +11,7 @@ public class b4 extends BroadcastReceiver {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1140c;
+    public boolean f1138c;
 
     public b4(k9 k9Var) {
         this.a = k9Var;
@@ -25,7 +25,7 @@ public class b4 extends BroadcastReceiver {
         if (this.b) {
             this.a.g().n.a("Unregistering connectivity change receiver");
             this.b = false;
-            this.f1140c = false;
+            this.f1138c = false;
             try {
                 this.a.k.b.unregisterReceiver(this);
             } catch (IllegalArgumentException e) {
@@ -42,8 +42,8 @@ public class b4 extends BroadcastReceiver {
         this.a.g().n.b("NetworkBroadcastReceiver received action", action);
         if ("android.net.conn.CONNECTIVITY_CHANGE".equals(action)) {
             boolean u = this.a.J().u();
-            if (this.f1140c != u) {
-                this.f1140c = u;
+            if (this.f1138c != u) {
+                this.f1138c = u;
                 this.a.f().v(new e4(this, u));
                 return;
             }
diff --git a/app/src/main/java/c/i/a/f/i/b/ba.java b/app/src/main/java/c/i/a/f/i/b/ba.java
index 9fe0b7012c..cf0d2aa660 100644
--- a/app/src/main/java/c/i/a/f/i/b/ba.java
+++ b/app/src/main/java/c/i/a/f/i/b/ba.java
@@ -146,8 +146,8 @@ public final class ba extends i9 {
                 break;
             }
         }
-        boolean z4 = f9.b() && this.a.h.u(this.d, p.f1179c0);
-        boolean z5 = f9.b() && this.a.h.u(this.d, p.f1177b0);
+        boolean z4 = f9.b() && this.a.h.u(this.d, p.f1177c0);
+        boolean z5 = f9.b() && this.a.h.u(this.d, p.f1175b0);
         if (z2) {
             g q2 = q();
             String str6 = this.d;
@@ -600,10 +600,10 @@ public final class ba extends i9 {
                                     q5.g().i.c("Event aggregate wasn't created during raw event logging. appId, event", q3.s(str10), q5.d().u(F));
                                     lVar = new l(str10, next2.F(), 1, 1, 1, next2.H(), 0, null, null, null, null);
                                 } else {
-                                    lVar = new l(z6.a, z6.b, z6.f1171c + 1, z6.d + 1, z6.e + 1, z6.f, z6.g, z6.h, z6.i, z6.j, z6.k);
+                                    lVar = new l(z6.a, z6.b, z6.f1169c + 1, z6.d + 1, z6.e + 1, z6.f, z6.g, z6.h, z6.i, z6.j, z6.k);
                                 }
                                 q().H(lVar);
-                                long j = lVar.f1171c;
+                                long j = lVar.f1169c;
                                 String F2 = a.F();
                                 V v = arrayMap14.get(F2);
                                 if (v == null) {
diff --git a/app/src/main/java/c/i/a/f/i/b/c.java b/app/src/main/java/c/i/a/f/i/b/c.java
index 4fd1f4e323..2e28c1acb9 100644
--- a/app/src/main/java/c/i/a/f/i/b/c.java
+++ b/app/src/main/java/c/i/a/f/i/b/c.java
@@ -20,7 +20,7 @@ public final class c extends s5 {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public e f1141c = b.a;
+    public e f1139c = b.a;
     public Boolean d;
 
     public c(u4 u4Var) {
@@ -32,7 +32,7 @@ public final class c extends s5 {
     }
 
     public final boolean A(String str) {
-        return "1".equals(this.f1141c.i(str, "measurement.event_sampling_enabled"));
+        return "1".equals(this.f1139c.i(str, "measurement.event_sampling_enabled"));
     }
 
     @WorkerThread
@@ -93,7 +93,7 @@ public final class c extends s5 {
         if (str == null) {
             return j3Var.a(null).longValue();
         }
-        String i = this.f1141c.i(str, j3Var.b);
+        String i = this.f1139c.i(str, j3Var.b);
         if (TextUtils.isEmpty(i)) {
             return j3Var.a(null).longValue();
         }
@@ -120,7 +120,7 @@ public final class c extends s5 {
         if (str == null) {
             return j3Var.a(null).intValue();
         }
-        String i = this.f1141c.i(str, j3Var.b);
+        String i = this.f1139c.i(str, j3Var.b);
         if (TextUtils.isEmpty(i)) {
             return j3Var.a(null).intValue();
         }
@@ -136,7 +136,7 @@ public final class c extends s5 {
         if (str == null) {
             return j3Var.a(null).doubleValue();
         }
-        String i = this.f1141c.i(str, j3Var.b);
+        String i = this.f1139c.i(str, j3Var.b);
         if (TextUtils.isEmpty(i)) {
             return j3Var.a(null).doubleValue();
         }
@@ -166,7 +166,7 @@ public final class c extends s5 {
         if (str == null) {
             return j3Var.a(null).booleanValue();
         }
-        String i = this.f1141c.i(str, j3Var.b);
+        String i = this.f1139c.i(str, j3Var.b);
         return TextUtils.isEmpty(i) ? j3Var.a(null).booleanValue() : j3Var.a(Boolean.valueOf(Boolean.parseBoolean(i))).booleanValue();
     }
 
diff --git a/app/src/main/java/c/i/a/f/i/b/c6.java b/app/src/main/java/c/i/a/f/i/b/c6.java
index 167df0650e..d8e7149eac 100644
--- a/app/src/main/java/c/i/a/f/i/b/c6.java
+++ b/app/src/main/java/c/i/a/f/i/b/c6.java
@@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public final class c6 extends a5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public y6 f1142c;
+    public y6 f1140c;
     public w5 d;
     public final Set<z5> e = new CopyOnWriteArraySet();
     public boolean f;
@@ -123,7 +123,7 @@ public final class c6 extends a5 {
         boolean z4;
         if (t8.b() && this.a.h.o(p.H0)) {
             t();
-            if ((!this.a.h.o(p.I0) || i != 20) && dVar.b == null && dVar.f1144c == null) {
+            if ((!this.a.h.o(p.I0) || i != 20) && dVar.b == null && dVar.f1142c == null) {
                 g().k.a("Discarding empty consent settings");
                 return;
             }
@@ -139,9 +139,9 @@ public final class c6 extends a5 {
                     if (bool == null) {
                         bool = dVar3.b;
                     }
-                    Boolean bool2 = dVar.f1144c;
+                    Boolean bool2 = dVar.f1142c;
                     if (bool2 == null) {
-                        bool2 = dVar3.f1144c;
+                        bool2 = dVar3.f1142c;
                     }
                     d dVar4 = new d(bool, bool2);
                     this.i = dVar4;
@@ -247,7 +247,7 @@ public final class c6 extends a5 {
                     g().l.a("Tag Manager is not found and thus will not be used");
                 }
             }
-            if (this.a.h.o(p.f1181e0) && "_cmp".equals(str2) && bundle.containsKey("gclid")) {
+            if (this.a.h.o(p.f1179e0) && "_cmp".equals(str2) && bundle.containsKey("gclid")) {
                 String string = bundle.getString("gclid");
                 Objects.requireNonNull((d) this.a.o);
                 K("auto", "_lgclid", string, System.currentTimeMillis());
@@ -361,7 +361,7 @@ public final class c6 extends a5 {
                 ArrayList arrayList2 = new ArrayList();
                 arrayList2.add(z10);
                 e().v0().nextLong();
-                if (l().v.a() <= 0 || !l().u(j) || !l().f1147x.b()) {
+                if (l().v.a() <= 0 || !l().u(j) || !l().f1145x.b()) {
                     bundle2 = z10;
                     arrayList = arrayList2;
                 } else {
@@ -483,10 +483,10 @@ public final class c6 extends a5 {
                             } else {
                                 str3 = string2;
                             }
-                            if (q.h && q.f1156c != null) {
+                            if (q.h && q.f1154c != null) {
                                 q.h = false;
-                                boolean q0 = t9.q0(q.f1156c.b, str3);
-                                boolean q02 = t9.q0(q.f1156c.a, string);
+                                boolean q0 = t9.q0(q.f1154c.b, str3);
+                                boolean q02 = t9.q0(q.f1154c.a, string);
                                 if (q0 && q02) {
                                     q.g().k.a("Ignoring call to log screen view event with duplicate parameters.");
                                     return;
@@ -502,9 +502,9 @@ public final class c6 extends a5 {
                     }
                 }
                 q.g().n.c("Logging screen view with name, class", string == null ? "null" : string, str3 == null ? "null" : str3);
-                i7 i7Var = q.f1156c == null ? q.d : q.f1156c;
+                i7 i7Var = q.f1154c == null ? q.d : q.f1154c;
                 i7 i7Var2 = new i7(string, str3, q.e().t0(), true, j);
-                q.f1156c = i7Var2;
+                q.f1154c = i7Var2;
                 q.d = i7Var;
                 q.i = i7Var2;
                 Objects.requireNonNull((d) q.a.o);
@@ -623,7 +623,7 @@ public final class c6 extends a5 {
 
     public final void M() {
         if (this.a.b.getApplicationContext() instanceof Application) {
-            ((Application) this.a.b.getApplicationContext()).unregisterActivityLifecycleCallbacks(this.f1142c);
+            ((Application) this.a.b.getApplicationContext()).unregisterActivityLifecycleCallbacks(this.f1140c);
         }
     }
 
@@ -632,7 +632,7 @@ public final class c6 extends a5 {
         b();
         t();
         if (this.a.m()) {
-            if (this.a.h.o(p.f1180d0)) {
+            if (this.a.h.o(p.f1178d0)) {
                 Boolean w = this.a.h.w("google_analytics_deferred_deep_link_enabled");
                 if (w != null && w.booleanValue()) {
                     g().m.a("Deferred Deep Link feature enabled.");
@@ -670,7 +670,7 @@ public final class c6 extends a5 {
     @Nullable
     public final String O() {
         u4 u4Var = this.a;
-        String str = u4Var.f1197c;
+        String str = u4Var.f1195c;
         if (str != null) {
             return str;
         }
@@ -711,11 +711,11 @@ public final class c6 extends a5 {
             s().d.a();
         }
         if (((j9) g9.i.a()).a() && this.a.h.o(p.t0)) {
-            if (this.a.f1199x.a.o().l.a() <= 0) {
+            if (this.a.f1197x.a.o().l.a() <= 0) {
                 z2 = false;
             }
             if (!z2) {
-                m4 m4Var = this.a.f1199x;
+                m4 m4Var = this.a.f1197x;
                 m4Var.a(m4Var.a.b.getPackageName());
             }
         }
@@ -781,7 +781,7 @@ public final class c6 extends a5 {
         w8 s2 = s();
         s2.b();
         d9 d9Var = s2.e;
-        d9Var.f1150c.c();
+        d9Var.f1148c.c();
         d9Var.a = 0;
         d9Var.b = 0;
         boolean d = this.a.d();
diff --git a/app/src/main/java/c/i/a/f/i/b/c7.java b/app/src/main/java/c/i/a/f/i/b/c7.java
index 3be4ededcc..de86294afd 100644
--- a/app/src/main/java/c/i/a/f/i/b/c7.java
+++ b/app/src/main/java/c/i/a/f/i/b/c7.java
@@ -34,7 +34,7 @@ public final class c7 implements Runnable {
         String str2 = this.l;
         y6Var.i.b();
         try {
-            if (y6Var.i.a.h.o(p.f1181e0) || y6Var.i.a.h.o(p.f1183g0) || y6Var.i.a.h.o(p.f1182f0)) {
+            if (y6Var.i.a.h.o(p.f1179e0) || y6Var.i.a.h.o(p.f1181g0) || y6Var.i.a.h.o(p.f1180f0)) {
                 t9 e = y6Var.i.e();
                 if (!TextUtils.isEmpty(str2)) {
                     if (str2.contains("gclid") || str2.contains("utm_campaign") || str2.contains("utm_source") || str2.contains("utm_medium")) {
@@ -47,7 +47,7 @@ public final class c7 implements Runnable {
                             bundle2 = y6Var.i.e().x(uri);
                             if (bundle2 != null) {
                                 bundle2.putString("_cis", "intent");
-                                if (y6Var.i.a.h.o(p.f1181e0) && !bundle2.containsKey("gclid") && bundle != null && bundle.containsKey("gclid")) {
+                                if (y6Var.i.a.h.o(p.f1179e0) && !bundle2.containsKey("gclid") && bundle != null && bundle.containsKey("gclid")) {
                                     bundle2.putString("_cer", String.format("gclid=%s", bundle.getString("gclid")));
                                 }
                                 y6Var.i.H(str, "_cmp", bundle2);
@@ -58,12 +58,12 @@ public final class c7 implements Runnable {
                         } else {
                             bundle2 = null;
                         }
-                        if (y6Var.i.a.h.o(p.f1183g0) && !y6Var.i.a.h.o(p.f1182f0) && bundle != null && bundle.containsKey("gclid") && (bundle2 == null || !bundle2.containsKey("gclid"))) {
+                        if (y6Var.i.a.h.o(p.f1181g0) && !y6Var.i.a.h.o(p.f1180f0) && bundle != null && bundle.containsKey("gclid") && (bundle2 == null || !bundle2.containsKey("gclid"))) {
                             y6Var.i.J("auto", "_lgclid", bundle.getString("gclid"));
                         }
                         if (TextUtils.isEmpty(str2)) {
                             y6Var.i.g().m.b("Activity created with referrer", str2);
-                            if (y6Var.i.a.h.o(p.f1182f0)) {
+                            if (y6Var.i.a.h.o(p.f1180f0)) {
                                 if (bundle != null) {
                                     y6Var.i.H(str, "_cmp", bundle);
                                     if (y6Var.i.a.h.o(p.D0)) {
diff --git a/app/src/main/java/c/i/a/f/i/b/c8.java b/app/src/main/java/c/i/a/f/i/b/c8.java
index 12ecb09f6a..682eae0a56 100644
--- a/app/src/main/java/c/i/a/f/i/b/c8.java
+++ b/app/src/main/java/c/i/a/f/i/b/c8.java
@@ -27,9 +27,9 @@ public final class c8 implements Runnable {
                 q7Var.g().f.a("Discarding data. Failed to send event to service to bundle");
                 return;
             }
-            byte[] i = i3Var.i(this.i, this.j);
+            byte[] j = i3Var.j(this.i, this.j);
             this.l.F();
-            this.l.e().P(this.k, i);
+            this.l.e().P(this.k, j);
         } catch (RemoteException e) {
             this.l.g().f.b("Failed to send event to the service to bundle", e);
         } finally {
diff --git a/app/src/main/java/c/i/a/f/i/b/ca.java b/app/src/main/java/c/i/a/f/i/b/ca.java
index 7b189fd890..1da0009336 100644
--- a/app/src/main/java/c/i/a/f/i/b/ca.java
+++ b/app/src/main/java/c/i/a/f/i/b/ca.java
@@ -16,7 +16,7 @@ public final class ca {
     public Long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f1143c;
+    public long f1141c;
     public final /* synthetic */ ba d;
 
     public ca(ba baVar, aa aaVar) {
@@ -114,12 +114,12 @@ public final class ca {
                     return null;
                 }
                 this.a = (a1) obj;
-                this.f1143c = ((Long) pair.second).longValue();
+                this.f1141c = ((Long) pair.second).longValue();
                 this.d.m();
                 this.b = (Long) q9.R(this.a, "_eid");
             }
-            long j = this.f1143c - 1;
-            this.f1143c = j;
+            long j = this.f1141c - 1;
+            this.f1141c = j;
             if (j <= 0) {
                 g q2 = this.d.q();
                 q2.b();
@@ -130,7 +130,7 @@ public final class ca {
                     q2.g().f.b("Error clearing complex main event", e5);
                 }
             } else {
-                this.d.q().Q(str, l, this.f1143c, this.a);
+                this.d.q().Q(str, l, this.f1141c, this.a);
             }
             ArrayList arrayList = new ArrayList();
             for (c1 c1Var : this.a.v()) {
@@ -156,11 +156,11 @@ public final class ca {
                 j2 = R;
             }
             long longValue = ((Long) j2).longValue();
-            this.f1143c = longValue;
+            this.f1141c = longValue;
             if (longValue <= 0) {
                 this.d.g().g.b("Complex event with zero extra param count. eventName", F);
             } else {
-                this.d.q().Q(str, l, this.f1143c, a1Var);
+                this.d.q().Q(str, l, this.f1141c, a1Var);
             }
         }
         a1.a t = a1Var.t();
diff --git a/app/src/main/java/c/i/a/f/i/b/d.java b/app/src/main/java/c/i/a/f/i/b/d.java
index 1d991d76dd..4cfd64be4b 100644
--- a/app/src/main/java/c/i/a/f/i/b/d.java
+++ b/app/src/main/java/c/i/a/f/i/b/d.java
@@ -7,11 +7,11 @@ public final class d {
     public final Boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Boolean f1144c;
+    public final Boolean f1142c;
 
     public d(Boolean bool, Boolean bool2) {
         this.b = bool;
-        this.f1144c = bool2;
+        this.f1142c = bool2;
     }
 
     public static int a(Boolean bool) {
@@ -94,7 +94,7 @@ public final class d {
         Boolean bool = this.b;
         char c2 = '0';
         sb.append(bool == null ? '-' : bool.booleanValue() ? '1' : '0');
-        Boolean bool2 = this.f1144c;
+        Boolean bool2 = this.f1142c;
         if (bool2 == null) {
             c2 = '-';
         } else if (bool2.booleanValue()) {
@@ -109,24 +109,24 @@ public final class d {
             return false;
         }
         d dVar = (d) obj;
-        return a(this.b) == a(dVar.b) && a(this.f1144c) == a(dVar.f1144c);
+        return a(this.b) == a(dVar.b) && a(this.f1142c) == a(dVar.f1142c);
     }
 
     public final boolean f(d dVar) {
         Boolean bool = this.b;
         Boolean bool2 = Boolean.FALSE;
         if (bool != bool2 || dVar.b == bool2) {
-            return this.f1144c == bool2 && dVar.f1144c != bool2;
+            return this.f1142c == bool2 && dVar.f1142c != bool2;
         }
         return true;
     }
 
     public final d h(d dVar) {
-        return new d(c(this.b, dVar.b), c(this.f1144c, dVar.f1144c));
+        return new d(c(this.b, dVar.b), c(this.f1142c, dVar.f1142c));
     }
 
     public final int hashCode() {
-        return a(this.f1144c) + ((a(this.b) + 527) * 31);
+        return a(this.f1142c) + ((a(this.b) + 527) * 31);
     }
 
     public final boolean j() {
@@ -135,7 +135,7 @@ public final class d {
     }
 
     public final boolean k() {
-        Boolean bool = this.f1144c;
+        Boolean bool = this.f1142c;
         return bool == null || bool.booleanValue();
     }
 
@@ -150,7 +150,7 @@ public final class d {
             sb.append(bool.booleanValue() ? str : "denied");
         }
         sb.append(", analyticsStorage=");
-        Boolean bool2 = this.f1144c;
+        Boolean bool2 = this.f1142c;
         if (bool2 == null) {
             sb.append("uninitialized");
         } else {
diff --git a/app/src/main/java/c/i/a/f/i/b/d4.java b/app/src/main/java/c/i/a/f/i/b/d4.java
index eaeb68390e..f2f4c756dd 100644
--- a/app/src/main/java/c/i/a/f/i/b/d4.java
+++ b/app/src/main/java/c/i/a/f/i/b/d4.java
@@ -7,7 +7,7 @@ import androidx.annotation.WorkerThread;
 public final class d4 extends r5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pair<String, Long> f1145c = new Pair<>("", 0L);
+    public static final Pair<String, Long> f1143c = new Pair<>("", 0L);
     public final j4 A = new j4(this, "firebase_feature_rollouts");
     public final j4 B = new j4(this, "deferred_attribution_cache");
     public final h4 C = new h4(this, "deferred_attribution_cache_timestamp", 0);
@@ -29,20 +29,20 @@ public final class d4 extends r5 {
     public final h4 r = new h4(this, "session_timeout", 1800000);
 
     /* renamed from: s  reason: collision with root package name */
-    public final f4 f1146s = new f4(this, "start_new_session", true);
+    public final f4 f1144s = new f4(this, "start_new_session", true);
     public final j4 t = new j4(this, "non_personalized_ads");
     public final f4 u = new f4(this, "allow_remote_dynamite", false);
     public final h4 v = new h4(this, "last_pause_time", 0);
     public boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public f4 f1147x = new f4(this, "app_backgrounded", false);
+    public f4 f1145x = new f4(this, "app_backgrounded", false);
 
     /* renamed from: y  reason: collision with root package name */
-    public f4 f1148y = new f4(this, "deep_link_retrieval_complete", false);
+    public f4 f1146y = new f4(this, "deep_link_retrieval_complete", false);
 
     /* renamed from: z  reason: collision with root package name */
-    public h4 f1149z = new h4(this, "deep_link_retrieval_attempts", 0);
+    public h4 f1147z = new h4(this, "deep_link_retrieval_attempts", 0);
 
     public d4(u4 u4Var) {
         super(u4Var);
@@ -60,7 +60,7 @@ public final class d4 extends r5 {
             edit.putBoolean("has_been_opened", true);
             edit.apply();
         }
-        this.e = new k4(this, "health_monitor", Math.max(0L, p.f1178c.a(null).longValue()), null);
+        this.e = new k4(this, "health_monitor", Math.max(0L, p.f1176c.a(null).longValue()), null);
     }
 
     @Override // c.i.a.f.i.b.r5
diff --git a/app/src/main/java/c/i/a/f/i/b/d6.java b/app/src/main/java/c/i/a/f/i/b/d6.java
index 912ba99abe..6d97fc2f48 100644
--- a/app/src/main/java/c/i/a/f/i/b/d6.java
+++ b/app/src/main/java/c/i/a/f/i/b/d6.java
@@ -21,7 +21,7 @@ public final class d6 implements Runnable {
                 c cVar = c6Var.a.h;
                 n3 o = c6Var.o();
                 o.t();
-                String str = o.f1174c;
+                String str = o.f1172c;
                 Objects.requireNonNull(cVar);
                 atomicReference.set(Boolean.valueOf(cVar.u(str, p.K)));
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/d9.java b/app/src/main/java/c/i/a/f/i/b/d9.java
index 06f4faf40e..c0b5fc6352 100644
--- a/app/src/main/java/c/i/a/f/i/b/d9.java
+++ b/app/src/main/java/c/i/a/f/i/b/d9.java
@@ -14,12 +14,12 @@ public final class d9 {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final i f1150c;
+    public final i f1148c;
     public final /* synthetic */ w8 d;
 
     public d9(w8 w8Var) {
         this.d = w8Var;
-        this.f1150c = new c9(this, w8Var.a);
+        this.f1148c = new c9(this, w8Var.a);
         Objects.requireNonNull((d) w8Var.a.o);
         long elapsedRealtime = SystemClock.elapsedRealtime();
         this.a = elapsedRealtime;
@@ -56,8 +56,8 @@ public final class d9 {
                 this.d.n().H("auto", "_e", bundle);
             }
             this.a = j;
-            this.f1150c.c();
-            this.f1150c.b(3600000);
+            this.f1148c.c();
+            this.f1148c.b(3600000);
             return true;
         }
         this.d.g().n.b("Screen exposed for less than 1000 ms. Event not sent. time", Long.valueOf(j2));
diff --git a/app/src/main/java/c/i/a/f/i/b/da.java b/app/src/main/java/c/i/a/f/i/b/da.java
index f1dd273ed7..5b5ca5ec0e 100644
--- a/app/src/main/java/c/i/a/f/i/b/da.java
+++ b/app/src/main/java/c/i/a/f/i/b/da.java
@@ -19,7 +19,7 @@ public final class da {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public g1 f1151c;
+    public g1 f1149c;
     public BitSet d;
     public BitSet e;
     public Map<Integer, Long> f;
@@ -39,7 +39,7 @@ public final class da {
             this.g.put(num, arrayList);
         }
         this.b = false;
-        this.f1151c = g1Var;
+        this.f1149c = g1Var;
     }
 
     public da(ba baVar, String str, aa aaVar) {
@@ -83,7 +83,7 @@ public final class da {
             F.k = false;
         }
         y0.w((y0) F.j, z2);
-        g1 g1Var = this.f1151c;
+        g1 g1Var = this.f1149c;
         if (g1Var != null) {
             if (F.k) {
                 F.n();
@@ -169,7 +169,7 @@ public final class da {
 
     public final void b(@NonNull ea eaVar) {
         int a = eaVar.a();
-        Boolean bool = eaVar.f1152c;
+        Boolean bool = eaVar.f1150c;
         if (bool != null) {
             this.e.set(a, bool.booleanValue());
         }
@@ -193,10 +193,10 @@ public final class da {
             if (eaVar.g()) {
                 list.clear();
             }
-            if (f9.b() && this.h.a.h.u(this.a, p.f1179c0) && eaVar.h()) {
+            if (f9.b() && this.h.a.h.u(this.a, p.f1177c0) && eaVar.h()) {
                 list.clear();
             }
-            if (!f9.b() || !this.h.a.h.u(this.a, p.f1179c0)) {
+            if (!f9.b() || !this.h.a.h.u(this.a, p.f1177c0)) {
                 list.add(Long.valueOf(eaVar.f.longValue() / 1000));
                 return;
             }
diff --git a/app/src/main/java/c/i/a/f/i/b/e6.java b/app/src/main/java/c/i/a/f/i/b/e6.java
index 61a4e809d9..d138344064 100644
--- a/app/src/main/java/c/i/a/f/i/b/e6.java
+++ b/app/src/main/java/c/i/a/f/i/b/e6.java
@@ -26,15 +26,15 @@ public final /* synthetic */ class e6 implements Runnable {
         URL url;
         c6 c6Var = this.i;
         c6Var.b();
-        if (c6Var.l().f1148y.b()) {
+        if (c6Var.l().f1146y.b()) {
             c6Var.g().m.a("Deferred Deep Link already retrieved. Not fetching again.");
             return;
         }
-        long a = c6Var.l().f1149z.a();
-        c6Var.l().f1149z.b(a + 1);
+        long a = c6Var.l().f1147z.a();
+        c6Var.l().f1147z.b(a + 1);
         if (a >= 5) {
             c6Var.g().i.a("Permanently failed to retrieve Deferred Deep Link. Reached maximum retries.");
-            c6Var.l().f1148y.a(true);
+            c6Var.l().f1146y.a(true);
             return;
         }
         u4 u4Var = c6Var.a;
@@ -42,7 +42,7 @@ public final /* synthetic */ class e6 implements Runnable {
         u4.q(u4Var.n());
         n3 z2 = u4Var.z();
         z2.t();
-        String str = z2.f1174c;
+        String str = z2.f1172c;
         d4 o = u4Var.o();
         o.b();
         Objects.requireNonNull((d) o.a.o);
@@ -86,7 +86,7 @@ public final /* synthetic */ class e6 implements Runnable {
         t9 t = u4Var.t();
         u4Var.z();
         String str2 = (String) pair.first;
-        long a2 = u4Var.o().f1149z.a() - 1;
+        long a2 = u4Var.o().f1147z.a() - 1;
         Objects.requireNonNull(t);
         try {
             AnimatableValueParser.w(str2);
diff --git a/app/src/main/java/c/i/a/f/i/b/e7.java b/app/src/main/java/c/i/a/f/i/b/e7.java
index 684f13c508..e65a39334f 100644
--- a/app/src/main/java/c/i/a/f/i/b/e7.java
+++ b/app/src/main/java/c/i/a/f/i/b/e7.java
@@ -38,7 +38,7 @@ public final /* synthetic */ class e7 implements Runnable {
             u4Var.g().i.c("Network Request for Deferred Deep Link failed. response, exception", Integer.valueOf(i), exc);
             return;
         }
-        u4Var.o().f1148y.a(true);
+        u4Var.o().f1146y.a(true);
         if (bArr.length == 0) {
             u4Var.g().m.a("Deferred Deep Link response empty.");
             return;
diff --git a/app/src/main/java/c/i/a/f/i/b/e8.java b/app/src/main/java/c/i/a/f/i/b/e8.java
index 7ba2de7a29..9608822601 100644
--- a/app/src/main/java/c/i/a/f/i/b/e8.java
+++ b/app/src/main/java/c/i/a/f/i/b/e8.java
@@ -21,7 +21,7 @@ public final class e8 implements Runnable {
             return;
         }
         try {
-            i3Var.l(this.i);
+            i3Var.m(this.i);
             this.j.F();
         } catch (RemoteException e) {
             this.j.g().f.b("Failed to send consent settings to the service", e);
diff --git a/app/src/main/java/c/i/a/f/i/b/ea.java b/app/src/main/java/c/i/a/f/i/b/ea.java
index 660a3a8f5e..309596f7da 100644
--- a/app/src/main/java/c/i/a/f/i/b/ea.java
+++ b/app/src/main/java/c/i/a/f/i/b/ea.java
@@ -16,7 +16,7 @@ public abstract class ea {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Boolean f1152c;
+    public Boolean f1150c;
     public Boolean d;
     public Long e;
     public Long f;
diff --git a/app/src/main/java/c/i/a/f/i/b/f.java b/app/src/main/java/c/i/a/f/i/b/f.java
index 61f3a4e5d4..1b16a6159d 100644
--- a/app/src/main/java/c/i/a/f/i/b/f.java
+++ b/app/src/main/java/c/i/a/f/i/b/f.java
@@ -5,7 +5,7 @@ public final class f {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f1153c;
+    public long f1151c;
     public long d;
     public long e;
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/f4.java b/app/src/main/java/c/i/a/f/i/b/f4.java
index 0d34a3994e..1c2b8a469c 100644
--- a/app/src/main/java/c/i/a/f/i/b/f4.java
+++ b/app/src/main/java/c/i/a/f/i/b/f4.java
@@ -9,7 +9,7 @@ public final class f4 {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1154c;
+    public boolean f1152c;
     public boolean d;
     public final /* synthetic */ d4 e;
 
@@ -30,8 +30,8 @@ public final class f4 {
 
     @WorkerThread
     public final boolean b() {
-        if (!this.f1154c) {
-            this.f1154c = true;
+        if (!this.f1152c) {
+            this.f1152c = true;
             this.d = this.e.w().getBoolean(this.a, this.b);
         }
         return this.d;
diff --git a/app/src/main/java/c/i/a/f/i/b/f8.java b/app/src/main/java/c/i/a/f/i/b/f8.java
index a7488f9f9a..e5e39766b3 100644
--- a/app/src/main/java/c/i/a/f/i/b/f8.java
+++ b/app/src/main/java/c/i/a/f/i/b/f8.java
@@ -35,9 +35,9 @@ public final class f8 implements Runnable {
                     return;
                 }
                 if (TextUtils.isEmpty(this.j)) {
-                    this.i.set(i3Var.H(this.k, this.l, this.m));
+                    this.i.set(i3Var.I(this.k, this.l, this.m));
                 } else {
-                    this.i.set(i3Var.G(this.j, this.k, this.l));
+                    this.i.set(i3Var.H(this.j, this.k, this.l));
                 }
                 this.n.F();
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/f9.java b/app/src/main/java/c/i/a/f/i/b/f9.java
index ae630da9e0..6b6393f7bb 100644
--- a/app/src/main/java/c/i/a/f/i/b/f9.java
+++ b/app/src/main/java/c/i/a/f/i/b/f9.java
@@ -22,7 +22,7 @@ public final class f9 {
         d4 l = this.a.l();
         Objects.requireNonNull((d) this.a.a.o);
         if (l.u(System.currentTimeMillis())) {
-            this.a.l().f1146s.a(true);
+            this.a.l().f1144s.a(true);
             ActivityManager.RunningAppProcessInfo runningAppProcessInfo = new ActivityManager.RunningAppProcessInfo();
             ActivityManager.getMyMemoryState(runningAppProcessInfo);
             if (runningAppProcessInfo.importance == 100) {
@@ -38,10 +38,10 @@ public final class f9 {
         this.a.b();
         this.a.x();
         if (this.a.l().u(j)) {
-            this.a.l().f1146s.a(true);
+            this.a.l().f1144s.a(true);
         }
         this.a.l().v.b(j);
-        if (this.a.l().f1146s.b()) {
+        if (this.a.l().f1144s.b()) {
             c(j, z2);
         }
     }
@@ -55,7 +55,7 @@ public final class f9 {
             this.a.g().n.b("Session started, time", Long.valueOf(SystemClock.elapsedRealtime()));
             Long valueOf = Long.valueOf(j / 1000);
             this.a.n().K("auto", "_sid", valueOf, j);
-            this.a.l().f1146s.a(false);
+            this.a.l().f1144s.a(false);
             Bundle bundle = new Bundle();
             bundle.putLong("_sid", valueOf.longValue());
             if (this.a.a.h.o(p.k0) && z2) {
diff --git a/app/src/main/java/c/i/a/f/i/b/fa.java b/app/src/main/java/c/i/a/f/i/b/fa.java
index da3deb2d9f..95dc4eb340 100644
--- a/app/src/main/java/c/i/a/f/i/b/fa.java
+++ b/app/src/main/java/c/i/a/f/i/b/fa.java
@@ -66,7 +66,7 @@ public final class fa extends ea {
         Boolean bool;
         Boolean bool2;
         String str;
-        boolean z3 = f9.b() && this.h.a.h.u(this.a, p.f1179c0);
+        boolean z3 = f9.b() && this.h.a.h.u(this.a, p.f1177c0);
         long j2 = this.g.H() ? lVar.e : j;
         String str2 = "null";
         Integer num = null;
@@ -145,7 +145,7 @@ public final class fa extends ea {
                     return false;
                 }
                 Boolean bool4 = Boolean.TRUE;
-                this.f1152c = bool4;
+                this.f1150c = bool4;
                 if (!bool3.booleanValue()) {
                     return true;
                 }
diff --git a/app/src/main/java/c/i/a/f/i/b/g.java b/app/src/main/java/c/i/a/f/i/b/g.java
index bf71f1877b..4030648b9c 100644
--- a/app/src/main/java/c/i/a/f/i/b/g.java
+++ b/app/src/main/java/c/i/a/f/i/b/g.java
@@ -465,7 +465,7 @@ public final class g extends i9 {
         ContentValues contentValues = new ContentValues();
         contentValues.put("app_id", lVar.a);
         contentValues.put("name", lVar.b);
-        contentValues.put("lifetime_count", Long.valueOf(lVar.f1171c));
+        contentValues.put("lifetime_count", Long.valueOf(lVar.f1169c));
         contentValues.put("current_bundle_count", Long.valueOf(lVar.d));
         contentValues.put("last_fire_timestamp", Long.valueOf(lVar.f));
         contentValues.put("last_bundled_timestamp", Long.valueOf(lVar.g));
@@ -502,11 +502,11 @@ public final class g extends i9 {
         contentValues.put("dev_cert_hash", Long.valueOf(a4Var.Q()));
         contentValues.put("measurement_enabled", Boolean.valueOf(a4Var.T()));
         a4Var.a.f().b();
-        contentValues.put("day", Long.valueOf(a4Var.f1137x));
+        contentValues.put("day", Long.valueOf(a4Var.f1135x));
         a4Var.a.f().b();
-        contentValues.put("daily_public_events_count", Long.valueOf(a4Var.f1138y));
+        contentValues.put("daily_public_events_count", Long.valueOf(a4Var.f1136y));
         a4Var.a.f().b();
-        contentValues.put("daily_events_count", Long.valueOf(a4Var.f1139z));
+        contentValues.put("daily_events_count", Long.valueOf(a4Var.f1137z));
         a4Var.a.f().b();
         contentValues.put("daily_conversions_count", Long.valueOf(a4Var.A));
         a4Var.a.f().b();
@@ -533,7 +533,7 @@ public final class g extends i9 {
                 contentValues.put("safelisted_events", TextUtils.join(",", a4Var.k()));
             }
         }
-        if (da.b() && this.a.h.u(a4Var.o(), p.f1186j0)) {
+        if (da.b() && this.a.h.u(a4Var.o(), p.f1184j0)) {
             contentValues.put("ga_app_id", a4Var.B());
         }
         try {
@@ -639,8 +639,8 @@ public final class g extends i9 {
     public final boolean M(u9 u9Var) {
         b();
         n();
-        if (Y(u9Var.a, u9Var.f1203c) == null) {
-            if (t9.X(u9Var.f1203c)) {
+        if (Y(u9Var.a, u9Var.f1201c) == null) {
+            if (t9.X(u9Var.f1201c)) {
                 long S = S("select count(1) from user_attributes where app_id=? and name not like '!_%' escape '!'", new String[]{u9Var.a});
                 c cVar = this.a.h;
                 String str = u9Var.a;
@@ -652,14 +652,14 @@ public final class g extends i9 {
                 if (S >= ((long) i2)) {
                     return false;
                 }
-            } else if (!"_npa".equals(u9Var.f1203c) && S("select count(1) from user_attributes where app_id=? and origin=? AND name like '!_%' escape '!'", new String[]{u9Var.a, u9Var.b}) >= 25) {
+            } else if (!"_npa".equals(u9Var.f1201c) && S("select count(1) from user_attributes where app_id=? and origin=? AND name like '!_%' escape '!'", new String[]{u9Var.a, u9Var.b}) >= 25) {
                 return false;
             }
         }
         ContentValues contentValues = new ContentValues();
         contentValues.put("app_id", u9Var.a);
         contentValues.put("origin", u9Var.b);
-        contentValues.put("name", u9Var.f1203c);
+        contentValues.put("name", u9Var.f1201c);
         contentValues.put("set_timestamp", Long.valueOf(u9Var.d));
         G(contentValues, "value", u9Var.e);
         try {
@@ -695,7 +695,7 @@ public final class g extends i9 {
         contentValues.put("triggered_timestamp", Long.valueOf(zzz.k.k));
         contentValues.put("time_to_live", Long.valueOf(zzz.r));
         e();
-        contentValues.put("expired_event", t9.g0(zzz.f2290s));
+        contentValues.put("expired_event", t9.g0(zzz.f2296s));
         try {
             if (t().insertWithOnConflict("conditional_properties", null, contentValues, 5) == -1) {
                 g().f.b("Failed to insert/update conditional user property (got -1)", q3.s(zzz.i));
@@ -864,16 +864,16 @@ public final class g extends i9 {
                 a4Var.e(cursor.isNull(10) || cursor.getInt(10) != 0);
                 long j2 = cursor.getLong(11);
                 a4Var.a.f().b();
-                a4Var.E |= a4Var.f1137x != j2;
-                a4Var.f1137x = j2;
+                a4Var.E |= a4Var.f1135x != j2;
+                a4Var.f1135x = j2;
                 long j3 = cursor.getLong(12);
                 a4Var.a.f().b();
-                a4Var.E |= a4Var.f1138y != j3;
-                a4Var.f1138y = j3;
+                a4Var.E |= a4Var.f1136y != j3;
+                a4Var.f1136y = j3;
                 long j4 = cursor.getLong(13);
                 a4Var.a.f().b();
-                a4Var.E |= a4Var.f1139z != j4;
-                a4Var.f1139z = j4;
+                a4Var.E |= a4Var.f1137z != j4;
+                a4Var.f1137z = j4;
                 long j5 = cursor.getLong(14);
                 a4Var.a.f().b();
                 a4Var.E |= a4Var.A != j5;
@@ -908,7 +908,7 @@ public final class g extends i9 {
                 if (!cursor.isNull(27)) {
                     a4Var.d(Arrays.asList(cursor.getString(27).split(",", -1)));
                 }
-                if (da.b() && this.a.h.u(str, p.f1186j0)) {
+                if (da.b() && this.a.h.u(str, p.f1184j0)) {
                     a4Var.u(cursor.getString(28));
                 }
                 a4Var.a.f().b();
@@ -1512,7 +1512,7 @@ public final class g extends i9 {
             long a = l().i.a();
             Objects.requireNonNull((d) this.a.o);
             long elapsedRealtime = SystemClock.elapsedRealtime();
-            if (Math.abs(elapsedRealtime - a) > p.f1189y.a(null).longValue()) {
+            if (Math.abs(elapsedRealtime - a) > p.f1187y.a(null).longValue()) {
                 l().i.b(elapsedRealtime);
                 b();
                 n();
@@ -1685,7 +1685,7 @@ public final class g extends i9 {
             if (query.getLong(0) == j2) {
                 fVar.b = query.getLong(1);
                 fVar.a = query.getLong(2);
-                fVar.f1153c = query.getLong(3);
+                fVar.f1151c = query.getLong(3);
                 fVar.d = query.getLong(4);
                 fVar.e = query.getLong(5);
             }
@@ -1696,7 +1696,7 @@ public final class g extends i9 {
                 fVar.a += j3;
             }
             if (z4) {
-                fVar.f1153c += j3;
+                fVar.f1151c += j3;
             }
             if (z5) {
                 fVar.d += j3;
@@ -1708,7 +1708,7 @@ public final class g extends i9 {
             contentValues.put("day", Long.valueOf(j2));
             contentValues.put("daily_public_events_count", Long.valueOf(fVar.a));
             contentValues.put("daily_events_count", Long.valueOf(fVar.b));
-            contentValues.put("daily_conversions_count", Long.valueOf(fVar.f1153c));
+            contentValues.put("daily_conversions_count", Long.valueOf(fVar.f1151c));
             contentValues.put("daily_error_events_count", Long.valueOf(fVar.d));
             contentValues.put("daily_realtime_events_count", Long.valueOf(fVar.e));
             t.update("apps", contentValues, "app_id=?", strArr);
diff --git a/app/src/main/java/c/i/a/f/i/b/h4.java b/app/src/main/java/c/i/a/f/i/b/h4.java
index d390fd24be..54ab95d04f 100644
--- a/app/src/main/java/c/i/a/f/i/b/h4.java
+++ b/app/src/main/java/c/i/a/f/i/b/h4.java
@@ -9,7 +9,7 @@ public final class h4 {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1155c;
+    public boolean f1153c;
     public long d;
     public final /* synthetic */ d4 e;
 
@@ -22,8 +22,8 @@ public final class h4 {
 
     @WorkerThread
     public final long a() {
-        if (!this.f1155c) {
-            this.f1155c = true;
+        if (!this.f1153c) {
+            this.f1153c = true;
             this.d = this.e.w().getLong(this.a, this.b);
         }
         return this.d;
diff --git a/app/src/main/java/c/i/a/f/i/b/h7.java b/app/src/main/java/c/i/a/f/i/b/h7.java
index 280cfa67db..22a9dc316b 100644
--- a/app/src/main/java/c/i/a/f/i/b/h7.java
+++ b/app/src/main/java/c/i/a/f/i/b/h7.java
@@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public final class h7 extends a5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public volatile i7 f1156c;
+    public volatile i7 f1154c;
     public i7 d;
     public i7 e;
     public final Map<Activity, i7> f = new ConcurrentHashMap();
@@ -46,7 +46,7 @@ public final class h7 extends a5 {
             } else {
                 bundle.remove("_sc");
             }
-            bundle.putLong("_si", i7Var.f1159c);
+            bundle.putLong("_si", i7Var.f1157c);
         } else if (i7Var == null && z2) {
             bundle.remove("_sn");
             bundle.remove("_sc");
@@ -82,7 +82,7 @@ public final class h7 extends a5 {
             }
             z3 = false;
         }
-        if (i7Var2 == null || i7Var2.f1159c != i7Var.f1159c || !t9.q0(i7Var2.b, i7Var.b) || !t9.q0(i7Var2.a, i7Var.a)) {
+        if (i7Var2 == null || i7Var2.f1157c != i7Var.f1157c || !t9.q0(i7Var2.b, i7Var.b) || !t9.q0(i7Var2.a, i7Var.a)) {
             z4 = true;
         }
         if (z4) {
@@ -100,7 +100,7 @@ public final class h7 extends a5 {
                 if (str3 != null) {
                     bundle2.putString("_pc", str3);
                 }
-                bundle2.putLong("_pi", i7Var2.f1159c);
+                bundle2.putLong("_pi", i7Var2.f1157c);
             }
             if (this.a.h.o(p.T) && z3) {
                 if (!((v9) s9.i.a()).a() || !this.a.h.o(p.V)) {
@@ -214,14 +214,14 @@ public final class h7 extends a5 {
     @MainThread
     public final void z(Activity activity, i7 i7Var, boolean z2) {
         i7 i7Var2;
-        i7 i7Var3 = this.f1156c == null ? this.d : this.f1156c;
+        i7 i7Var3 = this.f1154c == null ? this.d : this.f1154c;
         if (i7Var.b == null) {
-            i7Var2 = new i7(i7Var.a, activity != null ? x(activity.getClass().getCanonicalName()) : null, i7Var.f1159c, i7Var.e, i7Var.f);
+            i7Var2 = new i7(i7Var.a, activity != null ? x(activity.getClass().getCanonicalName()) : null, i7Var.f1157c, i7Var.e, i7Var.f);
         } else {
             i7Var2 = i7Var;
         }
-        this.d = this.f1156c;
-        this.f1156c = i7Var2;
+        this.d = this.f1154c;
+        this.f1154c = i7Var2;
         Objects.requireNonNull((d) this.a.o);
         f().v(new j7(this, i7Var2, i7Var3, SystemClock.elapsedRealtime(), z2));
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/h8.java b/app/src/main/java/c/i/a/f/i/b/h8.java
index 87fd6b6052..595931be9a 100644
--- a/app/src/main/java/c/i/a/f/i/b/h8.java
+++ b/app/src/main/java/c/i/a/f/i/b/h8.java
@@ -37,9 +37,9 @@ public final class h8 implements Runnable {
                     return;
                 }
                 if (TextUtils.isEmpty(this.j)) {
-                    this.i.set(i3Var.P(this.k, this.l, this.m, this.n));
+                    this.i.set(i3Var.Q(this.k, this.l, this.m, this.n));
                 } else {
-                    this.i.set(i3Var.t(this.j, this.k, this.l, this.m));
+                    this.i.set(i3Var.u(this.j, this.k, this.l, this.m));
                 }
                 this.o.F();
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/ha.java b/app/src/main/java/c/i/a/f/i/b/ha.java
index 2830d9aa92..a7e8204a8c 100644
--- a/app/src/main/java/c/i/a/f/i/b/ha.java
+++ b/app/src/main/java/c/i/a/f/i/b/ha.java
@@ -33,7 +33,7 @@ public final class ha extends ea {
     }
 
     public final boolean i(Long l, Long l2, i1 i1Var, boolean z2) {
-        boolean z3 = f9.b() && this.h.a.h.u(this.a, p.f1176a0);
+        boolean z3 = f9.b() && this.h.a.h.u(this.a, p.f1174a0);
         boolean z4 = this.g.z();
         boolean A = this.g.A();
         boolean C = this.g.C();
@@ -80,7 +80,7 @@ public final class ha extends ea {
             if (bool == null) {
                 return false;
             }
-            this.f1152c = Boolean.TRUE;
+            this.f1150c = Boolean.TRUE;
             if (C && !bool.booleanValue()) {
                 return true;
             }
diff --git a/app/src/main/java/c/i/a/f/i/b/i.java b/app/src/main/java/c/i/a/f/i/b/i.java
index d4f7fb204c..f536f8b7cd 100644
--- a/app/src/main/java/c/i/a/f/i/b/i.java
+++ b/app/src/main/java/c/i/a/f/i/b/i.java
@@ -10,13 +10,13 @@ public abstract class i {
     public final t5 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Runnable f1157c;
+    public final Runnable f1155c;
     public volatile long d;
 
     public i(t5 t5Var) {
         Objects.requireNonNull(t5Var, "null reference");
         this.b = t5Var;
-        this.f1157c = new k(this, t5Var);
+        this.f1155c = new k(this, t5Var);
     }
 
     public abstract void a();
@@ -26,7 +26,7 @@ public abstract class i {
         if (j >= 0) {
             Objects.requireNonNull((d) this.b.h());
             this.d = System.currentTimeMillis();
-            if (!d().postDelayed(this.f1157c, j)) {
+            if (!d().postDelayed(this.f1155c, j)) {
                 this.b.g().f.b("Failed to schedule delayed post. time", Long.valueOf(j));
             }
         }
@@ -34,7 +34,7 @@ public abstract class i {
 
     public final void c() {
         this.d = 0;
-        d().removeCallbacks(this.f1157c);
+        d().removeCallbacks(this.f1155c);
     }
 
     public final Handler d() {
diff --git a/app/src/main/java/c/i/a/f/i/b/i3.java b/app/src/main/java/c/i/a/f/i/b/i3.java
index 4c6af90e2f..575eb325b1 100644
--- a/app/src/main/java/c/i/a/f/i/b/i3.java
+++ b/app/src/main/java/c/i/a/f/i/b/i3.java
@@ -10,33 +10,33 @@ import com.google.android.gms.measurement.internal.zzz;
 import java.util.List;
 /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
 public interface i3 extends IInterface {
-    void E(long j, String str, String str2, String str3) throws RemoteException;
+    String A(zzn zzn) throws RemoteException;
 
-    void F(zzn zzn) throws RemoteException;
+    void F(long j, String str, String str2, String str3) throws RemoteException;
 
-    List<zzz> G(String str, String str2, String str3) throws RemoteException;
+    void G(zzn zzn) throws RemoteException;
 
-    List<zzz> H(String str, String str2, zzn zzn) throws RemoteException;
+    List<zzz> H(String str, String str2, String str3) throws RemoteException;
 
-    List<zzku> P(String str, String str2, boolean z2, zzn zzn) throws RemoteException;
+    List<zzz> I(String str, String str2, zzn zzn) throws RemoteException;
 
-    void S(zzn zzn) throws RemoteException;
+    List<zzku> Q(String str, String str2, boolean z2, zzn zzn) throws RemoteException;
+
+    void T(zzn zzn) throws RemoteException;
 
     void f0(zzn zzn) throws RemoteException;
 
-    byte[] i(zzaq zzaq, String str) throws RemoteException;
+    byte[] j(zzaq zzaq, String str) throws RemoteException;
 
-    void l(zzn zzn) throws RemoteException;
+    void m(zzn zzn) throws RemoteException;
 
     void q0(zzaq zzaq, zzn zzn) throws RemoteException;
 
     void r0(Bundle bundle, zzn zzn) throws RemoteException;
 
-    List<zzku> t(String str, String str2, String str3, boolean z2) throws RemoteException;
+    List<zzku> u(String str, String str2, String str3, boolean z2) throws RemoteException;
 
     void u0(zzku zzku, zzn zzn) throws RemoteException;
 
     void v0(zzz zzz, zzn zzn) throws RemoteException;
-
-    String z(zzn zzn) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/i4.java b/app/src/main/java/c/i/a/f/i/b/i4.java
index 1294b45cc3..d30f1ade4f 100644
--- a/app/src/main/java/c/i/a/f/i/b/i4.java
+++ b/app/src/main/java/c/i/a/f/i/b/i4.java
@@ -13,7 +13,7 @@ public final class i4 {
     public final Bundle b = new Bundle();
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1158c;
+    public boolean f1156c;
     public Bundle d;
     public final /* synthetic */ d4 e;
 
@@ -25,8 +25,8 @@ public final class i4 {
 
     @WorkerThread
     public final Bundle a() {
-        if (!this.f1158c) {
-            this.f1158c = true;
+        if (!this.f1156c) {
+            this.f1156c = true;
             String string = this.e.w().getString(this.a, null);
             if (string != null) {
                 try {
diff --git a/app/src/main/java/c/i/a/f/i/b/i7.java b/app/src/main/java/c/i/a/f/i/b/i7.java
index a3b48f4010..2214e8daed 100644
--- a/app/src/main/java/c/i/a/f/i/b/i7.java
+++ b/app/src/main/java/c/i/a/f/i/b/i7.java
@@ -5,7 +5,7 @@ public final class i7 {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final long f1159c;
+    public final long f1157c;
     public boolean d;
     public final boolean e;
     public final long f;
@@ -17,7 +17,7 @@ public final class i7 {
     public i7(String str, String str2, long j, boolean z2, long j2) {
         this.a = str;
         this.b = str2;
-        this.f1159c = j;
+        this.f1157c = j;
         this.d = false;
         this.e = z2;
         this.f = j2;
diff --git a/app/src/main/java/c/i/a/f/i/b/i8.java b/app/src/main/java/c/i/a/f/i/b/i8.java
index d7d08fb170..4eaf78e53d 100644
--- a/app/src/main/java/c/i/a/f/i/b/i8.java
+++ b/app/src/main/java/c/i/a/f/i/b/i8.java
@@ -31,7 +31,7 @@ public final class i8 implements Runnable {
                 q7Var.g().f.c("Failed to get conditional properties; not connected to service", this.i, this.j);
                 return;
             }
-            ArrayList<Bundle> j02 = t9.j0(i3Var.H(this.i, this.j, this.k));
+            ArrayList<Bundle> j02 = t9.j0(i3Var.I(this.i, this.j, this.k));
             this.m.F();
             this.m.e().N(this.l, j02);
         } catch (RemoteException e) {
diff --git a/app/src/main/java/c/i/a/f/i/b/i9.java b/app/src/main/java/c/i/a/f/i/b/i9.java
index 83648f60ff..14f1c3285a 100644
--- a/app/src/main/java/c/i/a/f/i/b/i9.java
+++ b/app/src/main/java/c/i/a/f/i/b/i9.java
@@ -4,7 +4,7 @@ public abstract class i9 extends s5 implements t5 {
     public final k9 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1160c;
+    public boolean f1158c;
 
     public i9(k9 k9Var) {
         super(k9Var.k);
@@ -17,16 +17,16 @@ public abstract class i9 extends s5 implements t5 {
     }
 
     public final void n() {
-        if (!this.f1160c) {
+        if (!this.f1158c) {
             throw new IllegalStateException("Not initialized");
         }
     }
 
     public final void o() {
-        if (!this.f1160c) {
+        if (!this.f1158c) {
             p();
             this.b.q++;
-            this.f1160c = true;
+            this.f1158c = true;
             return;
         }
         throw new IllegalStateException("Can't initialize twice");
diff --git a/app/src/main/java/c/i/a/f/i/b/ia.java b/app/src/main/java/c/i/a/f/i/b/ia.java
index 1274b65695..b274be4208 100644
--- a/app/src/main/java/c/i/a/f/i/b/ia.java
+++ b/app/src/main/java/c/i/a/f/i/b/ia.java
@@ -11,7 +11,7 @@ public final class ia implements Parcelable.Creator<zzz> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzz createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         long j = 0;
         long j2 = 0;
         long j3 = 0;
@@ -23,7 +23,7 @@ public final class ia implements Parcelable.Creator<zzz> {
         zzaq zzaq2 = null;
         zzaq zzaq3 = null;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 2:
@@ -36,10 +36,10 @@ public final class ia implements Parcelable.Creator<zzz> {
                     zzku = (zzku) AnimatableValueParser.S(parcel, readInt, zzku.CREATOR);
                     break;
                 case 5:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 6:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 7:
                     str3 = AnimatableValueParser.T(parcel, readInt);
@@ -48,23 +48,23 @@ public final class ia implements Parcelable.Creator<zzz> {
                     zzaq = (zzaq) AnimatableValueParser.S(parcel, readInt, zzaq.CREATOR);
                     break;
                 case 9:
-                    j2 = AnimatableValueParser.f2(parcel, readInt);
+                    j2 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 10:
                     zzaq2 = (zzaq) AnimatableValueParser.S(parcel, readInt, zzaq.CREATOR);
                     break;
                 case 11:
-                    j3 = AnimatableValueParser.f2(parcel, readInt);
+                    j3 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 12:
                     zzaq3 = (zzaq) AnimatableValueParser.S(parcel, readInt, zzaq.CREATOR);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzz(str, str2, zzku, j, z2, str3, zzaq, j2, zzaq2, j3, zzaq3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/i/b/j.java b/app/src/main/java/c/i/a/f/i/b/j.java
index 6c59c88bc2..bdaec7a970 100644
--- a/app/src/main/java/c/i/a/f/i/b/j.java
+++ b/app/src/main/java/c/i/a/f/i/b/j.java
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
 public final class j extends r5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public long f1161c;
+    public long f1159c;
     public String d;
     public Boolean e;
     public AccountManager f;
@@ -33,7 +33,7 @@ public final class j extends r5 {
     @Override // c.i.a.f.i.b.r5
     public final boolean r() {
         Calendar instance = Calendar.getInstance();
-        this.f1161c = TimeUnit.MINUTES.convert((long) (instance.get(16) + instance.get(15)), TimeUnit.MILLISECONDS);
+        this.f1159c = TimeUnit.MINUTES.convert((long) (instance.get(16) + instance.get(15)), TimeUnit.MILLISECONDS);
         Locale locale = Locale.getDefault();
         String language = locale.getLanguage();
         Locale locale2 = Locale.ENGLISH;
@@ -60,7 +60,7 @@ public final class j extends r5 {
 
     public final long t() {
         o();
-        return this.f1161c;
+        return this.f1159c;
     }
 
     public final String u() {
diff --git a/app/src/main/java/c/i/a/f/i/b/j3.java b/app/src/main/java/c/i/a/f/i/b/j3.java
index b08bf62627..22097b115c 100644
--- a/app/src/main/java/c/i/a/f/i/b/j3.java
+++ b/app/src/main/java/c/i/a/f/i/b/j3.java
@@ -9,7 +9,7 @@ public final class j3<V> {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final h3<V> f1162c;
+    public final h3<V> f1160c;
     public final V d;
     public final V e;
     public final Object f = new Object();
@@ -23,7 +23,7 @@ public final class j3<V> {
         this.b = str;
         this.d = obj;
         this.e = obj2;
-        this.f1162c = h3Var;
+        this.f1160c = h3Var;
     }
 
     public final V a(@Nullable V v) {
@@ -45,7 +45,7 @@ public final class j3<V> {
                 if (!ga.a()) {
                     V v2 = null;
                     try {
-                        h3<?> h3Var = j3Var.f1162c;
+                        h3<?> h3Var = j3Var.f1160c;
                         if (h3Var != null) {
                             v2 = (V) h3Var.a();
                         }
@@ -60,7 +60,7 @@ public final class j3<V> {
             }
         } catch (SecurityException unused2) {
         }
-        h3<V> h3Var2 = this.f1162c;
+        h3<V> h3Var2 = this.f1160c;
         if (h3Var2 == null) {
             return this.d;
         }
diff --git a/app/src/main/java/c/i/a/f/i/b/j4.java b/app/src/main/java/c/i/a/f/i/b/j4.java
index 84353905ec..ab25270ab2 100644
--- a/app/src/main/java/c/i/a/f/i/b/j4.java
+++ b/app/src/main/java/c/i/a/f/i/b/j4.java
@@ -9,7 +9,7 @@ public final class j4 {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1163c;
+    public String f1161c;
     public final /* synthetic */ d4 d;
 
     public j4(d4 d4Var, String str) {
@@ -22,9 +22,9 @@ public final class j4 {
     public final String a() {
         if (!this.b) {
             this.b = true;
-            this.f1163c = this.d.w().getString(this.a, null);
+            this.f1161c = this.d.w().getString(this.a, null);
         }
-        return this.f1163c;
+        return this.f1161c;
     }
 
     @WorkerThread
@@ -32,6 +32,6 @@ public final class j4 {
         SharedPreferences.Editor edit = this.d.w().edit();
         edit.putString(this.a, str);
         edit.apply();
-        this.f1163c = str;
+        this.f1161c = str;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/j9.java b/app/src/main/java/c/i/a/f/i/b/j9.java
index 756d5610d1..ffd55ef879 100644
--- a/app/src/main/java/c/i/a/f/i/b/j9.java
+++ b/app/src/main/java/c/i/a/f/i/b/j9.java
@@ -19,7 +19,7 @@ public final class j9 implements Runnable {
         g gVar = new g(k9Var);
         gVar.o();
         k9Var.d = gVar;
-        k9Var.k.h.f1141c = k9Var.b;
+        k9Var.k.h.f1139c = k9Var.b;
         q8 q8Var = new q8(k9Var);
         q8Var.o();
         k9Var.j = q8Var;
diff --git a/app/src/main/java/c/i/a/f/i/b/k3.java b/app/src/main/java/c/i/a/f/i/b/k3.java
index 87fc3f3802..b3649e25b0 100644
--- a/app/src/main/java/c/i/a/f/i/b/k3.java
+++ b/app/src/main/java/c/i/a/f/i/b/k3.java
@@ -19,7 +19,17 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final void E(long j, String str, String str2, String str3) throws RemoteException {
+    public final String A(zzn zzn) throws RemoteException {
+        Parcel e = e();
+        v.c(e, zzn);
+        Parcel g = g(11, e);
+        String readString = g.readString();
+        g.recycle();
+        return readString;
+    }
+
+    @Override // c.i.a.f.i.b.i3
+    public final void F(long j, String str, String str2, String str3) throws RemoteException {
         Parcel e = e();
         e.writeLong(j);
         e.writeString(str);
@@ -29,14 +39,14 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final void F(zzn zzn) throws RemoteException {
+    public final void G(zzn zzn) throws RemoteException {
         Parcel e = e();
         v.c(e, zzn);
         h(18, e);
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final List<zzz> G(String str, String str2, String str3) throws RemoteException {
+    public final List<zzz> H(String str, String str2, String str3) throws RemoteException {
         Parcel e = e();
         e.writeString(str);
         e.writeString(str2);
@@ -48,7 +58,7 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final List<zzz> H(String str, String str2, zzn zzn) throws RemoteException {
+    public final List<zzz> I(String str, String str2, zzn zzn) throws RemoteException {
         Parcel e = e();
         e.writeString(str);
         e.writeString(str2);
@@ -60,7 +70,7 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final List<zzku> P(String str, String str2, boolean z2, zzn zzn) throws RemoteException {
+    public final List<zzku> Q(String str, String str2, boolean z2, zzn zzn) throws RemoteException {
         Parcel e = e();
         e.writeString(str);
         e.writeString(str2);
@@ -74,7 +84,7 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final void S(zzn zzn) throws RemoteException {
+    public final void T(zzn zzn) throws RemoteException {
         Parcel e = e();
         v.c(e, zzn);
         h(4, e);
@@ -88,7 +98,7 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final byte[] i(zzaq zzaq, String str) throws RemoteException {
+    public final byte[] j(zzaq zzaq, String str) throws RemoteException {
         Parcel e = e();
         v.c(e, zzaq);
         e.writeString(str);
@@ -99,7 +109,7 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final void l(zzn zzn) throws RemoteException {
+    public final void m(zzn zzn) throws RemoteException {
         Parcel e = e();
         v.c(e, zzn);
         h(20, e);
@@ -122,7 +132,7 @@ public final class k3 extends a implements i3 {
     }
 
     @Override // c.i.a.f.i.b.i3
-    public final List<zzku> t(String str, String str2, String str3, boolean z2) throws RemoteException {
+    public final List<zzku> u(String str, String str2, String str3, boolean z2) throws RemoteException {
         Parcel e = e();
         e.writeString(str);
         e.writeString(str2);
@@ -150,14 +160,4 @@ public final class k3 extends a implements i3 {
         v.c(e, zzn);
         h(12, e);
     }
-
-    @Override // c.i.a.f.i.b.i3
-    public final String z(zzn zzn) throws RemoteException {
-        Parcel e = e();
-        v.c(e, zzn);
-        Parcel g = g(11, e);
-        String readString = g.readString();
-        g.recycle();
-        return readString;
-    }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/k4.java b/app/src/main/java/c/i/a/f/i/b/k4.java
index 44f6aad822..af0f55ea16 100644
--- a/app/src/main/java/c/i/a/f/i/b/k4.java
+++ b/app/src/main/java/c/i/a/f/i/b/k4.java
@@ -11,7 +11,7 @@ public final class k4 {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1164c;
+    public final String f1162c;
     public final long d;
     public final /* synthetic */ d4 e;
 
@@ -21,7 +21,7 @@ public final class k4 {
         AnimatableValueParser.m(j > 0);
         this.a = str.concat(":start");
         this.b = str.concat(":count");
-        this.f1164c = str.concat(":value");
+        this.f1162c = str.concat(":value");
         this.d = j;
     }
 
@@ -32,7 +32,7 @@ public final class k4 {
         long currentTimeMillis = System.currentTimeMillis();
         SharedPreferences.Editor edit = this.e.w().edit();
         edit.remove(this.b);
-        edit.remove(this.f1164c);
+        edit.remove(this.f1162c);
         edit.putLong(this.a, currentTimeMillis);
         edit.apply();
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/k8.java b/app/src/main/java/c/i/a/f/i/b/k8.java
index 6b4e2e5aef..dc44977981 100644
--- a/app/src/main/java/c/i/a/f/i/b/k8.java
+++ b/app/src/main/java/c/i/a/f/i/b/k8.java
@@ -55,7 +55,7 @@ public final class k8 implements ServiceConnection, b.a, b.AbstractC0102b {
         AnimatableValueParser.u("MeasurementServiceConnection.onConnected");
         synchronized (this) {
             try {
-                this.k.f().v(new l8(this, this.j.w()));
+                this.k.f().v(new l8(this, this.j.v()));
             } catch (DeadObjectException | IllegalStateException unused) {
                 this.j = null;
                 this.i = false;
@@ -91,7 +91,7 @@ public final class k8 implements ServiceConnection, b.a, b.AbstractC0102b {
                 try {
                     a b = a.b();
                     q7 q7Var = this.k;
-                    b.c(q7Var.a.b, q7Var.f1192c);
+                    b.c(q7Var.a.b, q7Var.f1190c);
                 } catch (IllegalArgumentException unused2) {
                 }
             } else {
diff --git a/app/src/main/java/c/i/a/f/i/b/k9.java b/app/src/main/java/c/i/a/f/i/b/k9.java
index 88c662f362..a8ed2a78ac 100644
--- a/app/src/main/java/c/i/a/f/i/b/k9.java
+++ b/app/src/main/java/c/i/a/f/i/b/k9.java
@@ -77,7 +77,7 @@ public class k9 implements t5 {
     public p4 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public x3 f1165c;
+    public x3 f1163c;
     public g d;
     public b4 e;
     public h9 f;
@@ -95,20 +95,20 @@ public class k9 implements t5 {
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f1166s;
+    public boolean f1164s;
     public boolean t;
     public FileLock u;
     public FileChannel v;
     public List<Long> w;
 
     /* renamed from: x  reason: collision with root package name */
-    public List<Long> f1167x;
+    public List<Long> f1165x;
 
     /* renamed from: y  reason: collision with root package name */
-    public long f1168y;
+    public long f1166y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final Map<String, d> f1169z;
+    public final Map<String, d> f1167z;
 
     /* compiled from: com.google.android.gms:play-services-measurement@@18.0.0 */
     public class a {
@@ -116,7 +116,7 @@ public class k9 implements t5 {
         public List<Long> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public List<a1> f1170c;
+        public List<a1> f1168c;
         public long d;
 
         public a(k9 k9Var, j9 j9Var) {
@@ -127,13 +127,13 @@ public class k9 implements t5 {
         }
 
         public final boolean b(long j, a1 a1Var) {
-            if (this.f1170c == null) {
-                this.f1170c = new ArrayList();
+            if (this.f1168c == null) {
+                this.f1168c = new ArrayList();
             }
             if (this.b == null) {
                 this.b = new ArrayList();
             }
-            if (this.f1170c.size() > 0 && ((this.f1170c.get(0).H() / 1000) / 60) / 60 != ((a1Var.H() / 1000) / 60) / 60) {
+            if (this.f1168c.size() > 0 && ((this.f1168c.get(0).H() / 1000) / 60) / 60 != ((a1Var.H() / 1000) / 60) / 60) {
                 return false;
             }
             long g = this.d + ((long) a1Var.g());
@@ -141,33 +141,33 @@ public class k9 implements t5 {
                 return false;
             }
             this.d = g;
-            this.f1170c.add(a1Var);
+            this.f1168c.add(a1Var);
             this.b.add(Long.valueOf(j));
-            return this.f1170c.size() < Math.max(1, p.j.a(null).intValue());
+            return this.f1168c.size() < Math.max(1, p.j.a(null).intValue());
         }
     }
 
     public k9(r9 r9Var) {
         u4 b = u4.b(r9Var.a, null, null);
         this.k = b;
-        this.f1168y = -1;
+        this.f1166y = -1;
         q9 q9Var = new q9(this);
         q9Var.o();
         this.h = q9Var;
         x3 x3Var = new x3(this);
         x3Var.o();
-        this.f1165c = x3Var;
+        this.f1163c = x3Var;
         p4 p4Var = new p4(this);
         p4Var.o();
         this.b = p4Var;
-        this.f1169z = new HashMap();
+        this.f1167z = new HashMap();
         b.f().v(new j9(this, r9Var));
     }
 
     public static void C(i9 i9Var) {
         if (i9Var == null) {
             throw new IllegalStateException("Upload Component not created");
-        } else if (!i9Var.f1160c) {
+        } else if (!i9Var.f1158c) {
             String valueOf = String.valueOf(i9Var.getClass());
             StringBuilder sb = new StringBuilder(valueOf.length() + 27);
             sb.append("Component not initialized: ");
@@ -252,7 +252,7 @@ public class k9 implements t5 {
             this.k.t().Q(b, this.k.h.m(zzn.i));
             zzaq = b.a();
         }
-        if (this.k.h.o(p.f1181e0) && "_cmp".equals(zzaq.i) && "referrer API v2".equals(zzaq.j.i.getString("_cis"))) {
+        if (this.k.h.o(p.f1179e0) && "_cmp".equals(zzaq.i) && "referrer API v2".equals(zzaq.j.i.getString("_cis"))) {
             String string = zzaq.j.i.getString("gclid");
             if (!TextUtils.isEmpty(string)) {
                 o(new zzku("_lgclid", zzaq.l, string, "auto"), zzn);
@@ -353,7 +353,7 @@ public class k9 implements t5 {
                         T = K().T(zzn.i);
                         if (T != null) {
                             this.k.t();
-                            if (t9.d0(zzn.j, T.v(), zzn.f2289z, T.y())) {
+                            if (t9.d0(zzn.j, T.v(), zzn.f2295z, T.y())) {
                                 this.k.g().i.b("New GMP App Id passed in. Removing cached database data. appId", q3.s(T.o()));
                                 g K = K();
                                 String o = T.o();
@@ -384,7 +384,7 @@ public class k9 implements t5 {
                                     if (i == 0) {
                                         o(new zzku("_fot", j4, Long.valueOf(j5), "auto"), zzn);
                                         U();
-                                        this.k.f1199x.a(zzn.i);
+                                        this.k.f1197x.a(zzn.i);
                                         U();
                                         P();
                                         Bundle bundle2 = new Bundle();
@@ -402,7 +402,7 @@ public class k9 implements t5 {
                                             str2 = "_et";
                                             j2 = 1;
                                         }
-                                        if (zzn.f2288y) {
+                                        if (zzn.f2294y) {
                                             bundle2.putLong("_dac", j2);
                                         }
                                         g K2 = K();
@@ -480,7 +480,7 @@ public class k9 implements t5 {
                                             } else {
                                                 j = 1;
                                             }
-                                            if (zzn.f2288y) {
+                                            if (zzn.f2294y) {
                                                 bundle3.putLong("_dac", j);
                                             }
                                             B(new zzaq("_v", new zzap(bundle3), "auto", j4), zzn);
@@ -557,7 +557,7 @@ public class k9 implements t5 {
                     if (Z.m) {
                         K().V(zzz.i, zzz.k.j);
                     }
-                    zzaq zzaq = zzz.f2290s;
+                    zzaq zzaq = zzz.f2296s;
                     if (zzaq != null) {
                         Bundle bundle = null;
                         zzap zzap = zzaq.j;
@@ -566,7 +566,7 @@ public class k9 implements t5 {
                         }
                         t9 t = this.k.t();
                         String str = zzz.i;
-                        zzaq zzaq2 = zzz.f2290s;
+                        zzaq zzaq2 = zzz.f2296s;
                         I(t.B(str, zzaq2.i, bundle, Z.j, zzaq2.l, true, x7.b() && this.k.h.o(p.M0)), zzn);
                     }
                 } else {
@@ -632,16 +632,16 @@ public class k9 implements t5 {
                     T.m(zzn.j);
                     z2 = true;
                 }
-                if (!TextUtils.equals(zzn.f2289z, T.y())) {
-                    T.q(zzn.f2289z);
+                if (!TextUtils.equals(zzn.f2295z, T.y())) {
+                    T.q(zzn.f2295z);
                     z2 = true;
                 }
-                if (da.b() && this.k.h.u(T.o(), p.f1186j0) && !TextUtils.equals(zzn.D, T.B())) {
+                if (da.b() && this.k.h.u(T.o(), p.f1184j0) && !TextUtils.equals(zzn.D, T.B())) {
                     T.u(zzn.D);
                     z2 = true;
                 }
-                if (!TextUtils.isEmpty(zzn.f2286s) && !zzn.f2286s.equals(T.H())) {
-                    T.A(zzn.f2286s);
+                if (!TextUtils.isEmpty(zzn.f2292s) && !zzn.f2292s.equals(T.H())) {
+                    T.A(zzn.f2292s);
                     z2 = true;
                 }
                 long j2 = zzn.m;
@@ -686,8 +686,8 @@ public class k9 implements t5 {
                     T.n(zzn.w);
                     z2 = true;
                 }
-                if (zzn.f2287x != T.i()) {
-                    T.r(zzn.f2287x);
+                if (zzn.f2293x != T.i()) {
+                    T.r(zzn.f2293x);
                     z2 = true;
                 }
                 if (zzn.A != T.j()) {
@@ -710,11 +710,11 @@ public class k9 implements t5 {
             z2 = true;
             if (!TextUtils.equals(zzn.j, T.v())) {
             }
-            if (!TextUtils.equals(zzn.f2289z, T.y())) {
+            if (!TextUtils.equals(zzn.f2295z, T.y())) {
             }
             T.u(zzn.D);
             z2 = true;
-            T.A(zzn.f2286s);
+            T.A(zzn.f2292s);
             z2 = true;
             long j2 = zzn.m;
             T.t(zzn.m);
@@ -736,7 +736,7 @@ public class k9 implements t5 {
             z2 = true;
             if (zzn.w != T.h()) {
             }
-            if (zzn.f2287x != T.i()) {
+            if (zzn.f2293x != T.i()) {
             }
             if (zzn.A != T.j()) {
             }
@@ -772,12 +772,12 @@ public class k9 implements t5 {
             T.c(c(h));
         }
         T.m(zzn.j);
-        T.q(zzn.f2289z);
-        if (da.b() && this.k.h.u(T.o(), p.f1186j0)) {
+        T.q(zzn.f2295z);
+        if (da.b() && this.k.h.u(T.o(), p.f1184j0)) {
             T.u(zzn.D);
         }
-        if (!TextUtils.isEmpty(zzn.f2286s)) {
-            T.A(zzn.f2286s);
+        if (!TextUtils.isEmpty(zzn.f2292s)) {
+            T.A(zzn.f2292s);
         }
         long j3 = zzn.m;
         if (j3 != 0) {
@@ -800,7 +800,7 @@ public class k9 implements t5 {
             T.R(zzn.t);
         }
         T.n(zzn.w);
-        T.r(zzn.f2287x);
+        T.r(zzn.f2293x);
         T.b(zzn.A);
         T.z(zzn.B);
         T.a.f().b();
@@ -861,7 +861,7 @@ public class k9 implements t5 {
                     l = null;
                     this.k.t().S(this.A, str, 11, "_ev", zzaq2.i, 0);
                 }
-                if (z3 && (T = K().T(str)) != null && Math.abs(((d) this.k.h()).a() - Math.max(T.W(), T.V())) > p.f1190z.a(l).longValue()) {
+                if (z3 && (T = K().T(str)) != null && Math.abs(((d) this.k.h()).a() - Math.max(T.W(), T.V())) > p.f1188z.a(l).longValue()) {
                     this.k.g().C().a("Fetching config for blacklisted app");
                     n(T);
                     return;
@@ -917,7 +917,7 @@ public class k9 implements t5 {
                                     i = 0;
                                     u9Var = new u9(str, zzaq2.k, concat, ((d) this.k.h()).a(), Long.valueOf(((Long) obj).longValue() + j2));
                                     if (!K().M(u9Var)) {
-                                        this.k.g().z().d("Too many unique user properties are set. Ignoring user property. appId", q3.s(str), this.k.u().y(u9Var.f1203c), u9Var.e);
+                                        this.k.g().z().d("Too many unique user properties are set. Ignoring user property. appId", q3.s(str), this.k.u().y(u9Var.f1201c), u9Var.e);
                                         this.k.t().S(this.A, str, 9, null, null, 0);
                                     }
                                     z2 = true;
@@ -1049,15 +1049,15 @@ public class k9 implements t5 {
             if (t8.b() && this.k.a().o(p.J0)) {
                 u0.w0(a(zzn.i).h(d.b(zzn.E)).d());
             }
-            if (da.b() && this.k.a().v(zzn.i, p.f1186j0)) {
+            if (da.b() && this.k.a().v(zzn.i, p.f1184j0)) {
                 if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.D)) {
                     u0.u0(zzn.D);
                 }
-                if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2289z)) {
-                    u0.r0(zzn.f2289z);
+                if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2295z)) {
+                    u0.r0(zzn.f2295z);
                 }
-            } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2289z)) {
-                u0.r0(zzn.f2289z);
+            } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2295z)) {
+                u0.r0(zzn.f2295z);
             }
             long j4 = zzn.n;
             if (j4 != 0) {
@@ -1079,7 +1079,7 @@ public class k9 implements t5 {
                             u0.y(((Boolean) obj2).booleanValue());
                         }
                     }
-                } else if (!this.k.y().s(this.k.j()) && zzn.f2287x && (!hb.b() || !this.k.a().v(zzn.i, p.G0))) {
+                } else if (!this.k.y().s(this.k.j()) && zzn.f2293x && (!hb.b() || !this.k.a().v(zzn.i, p.G0))) {
                     String string = Settings.Secure.getString(this.k.j().getContentResolver(), "android_id");
                     if (string == null) {
                         this.k.g().A().b("null secure ID. appId", q3.s(u0.k0()));
@@ -1118,7 +1118,7 @@ public class k9 implements t5 {
                 } else {
                     T2.c(c(h));
                 }
-                T2.A(zzn.f2286s);
+                T2.A(zzn.f2292s);
                 T2.m(zzn.j);
                 if (!t8.b() || !this.k.a().o(p.J0) || h.j()) {
                     T2.x(this.j.t(zzn.i));
@@ -1147,7 +1147,7 @@ public class k9 implements t5 {
             List<u9> C = K().C(zzn.i);
             for (int i2 = 0; i2 < C.size(); i2++) {
                 i1.a L = i1.L();
-                L.r(C.get(i2).f1203c);
+                L.r(C.get(i2).f1201c);
                 L.q(C.get(i2).d);
                 N().G(L, C.get(i2).e);
                 u0.u(L);
@@ -1188,8 +1188,8 @@ public class k9 implements t5 {
     }
 
     public final x3 J() {
-        C(this.f1165c);
-        return this.f1165c;
+        C(this.f1163c);
+        return this.f1163c;
     }
 
     public final g K() {
@@ -1198,7 +1198,7 @@ public class k9 implements t5 {
     }
 
     public final boolean L(zzn zzn) {
-        return (!da.b() || !this.k.h.u(zzn.i, p.f1186j0)) ? !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2289z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2289z);
+        return (!da.b() || !this.k.h.u(zzn.i, p.f1184j0)) ? !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2295z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2295z);
     }
 
     public final ba M() {
@@ -1265,8 +1265,8 @@ public class k9 implements t5 {
                     }
                     String u = K().u();
                     if (!TextUtils.isEmpty(u)) {
-                        if (this.f1168y == -1) {
-                            this.f1168y = K().j0();
+                        if (this.f1166y == -1) {
+                            this.f1166y = K().j0();
                         }
                         List<Pair<e1, Long>> D = K().D(u, this.k.h.q(u, p.g), Math.max(0, this.k.h.q(u, p.h)));
                         if (!D.isEmpty()) {
@@ -1301,7 +1301,7 @@ public class k9 implements t5 {
                             d1.a x2 = d1.x();
                             int size = D.size();
                             ArrayList arrayList = new ArrayList(D.size());
-                            boolean z3 = "1".equals(this.k.h.f1141c.i(u, "gaia_collection_enabled")) && (!t8.b() || !this.k.h.o(p.J0) || a(u).j());
+                            boolean z3 = "1".equals(this.k.h.f1139c.i(u, "gaia_collection_enabled")) && (!t8.b() || !this.k.h.o(p.J0) || a(u).j());
                             boolean z4 = !t8.b() || !this.k.h.o(p.J0) || a(u).j();
                             boolean z5 = !t8.b() || !this.k.h.o(p.J0) || a(u).k();
                             int i3 = 0;
@@ -1381,7 +1381,7 @@ public class k9 implements t5 {
                                     str2 = ((d1) x2.j).u().G1();
                                 }
                                 this.k.g().n.d("Uploading data. app, uncompressed size, data", str2, Integer.valueOf(d.length), z6);
-                                this.f1166s = true;
+                                this.f1164s = true;
                                 x3 J = J();
                                 m9 m9Var = new m9(this, u);
                                 J.b();
@@ -1392,7 +1392,7 @@ public class k9 implements t5 {
                             }
                         }
                     } else {
-                        this.f1168y = -1;
+                        this.f1166y = -1;
                         String B = K().B(currentTimeMillis - p.d.a(null).longValue());
                         if (!TextUtils.isEmpty(B) && (T = K().T(B)) != null) {
                             n(T);
@@ -1426,7 +1426,7 @@ public class k9 implements t5 {
             boolean z3 = true;
             this.m = true;
             U();
-            if (!this.k.h.o(p.f1185i0) || (fileLock = this.u) == null || !fileLock.isValid()) {
+            if (!this.k.h.o(p.f1183i0) || (fileLock = this.u) == null || !fileLock.isValid()) {
                 try {
                     FileChannel channel = new RandomAccessFile(new File(this.k.b.getFilesDir(), "google_app_measurement.db"), "rw").getChannel();
                     this.v = channel;
@@ -1574,7 +1574,7 @@ public class k9 implements t5 {
         }
         U();
         P();
-        d dVar2 = this.f1169z.get(str);
+        d dVar2 = this.f1167z.get(str);
         if (dVar2 != null) {
             return dVar2;
         }
@@ -1751,7 +1751,7 @@ public class k9 implements t5 {
                     if (zzz2 != null) {
                         this.k.g().n.d("User property expired", zzz2.i, this.k.u().y(zzz2.k.j), zzz2.k.v0());
                         K().V(str, zzz2.k.j);
-                        zzaq zzaq4 = zzz2.f2290s;
+                        zzaq zzaq4 = zzz2.f2296s;
                         if (zzaq4 != null) {
                             arrayList.add(zzaq4);
                         }
@@ -1783,9 +1783,9 @@ public class k9 implements t5 {
                         zzku zzku = zzz3.k;
                         u9 u9Var = new u9(zzz3.i, zzz3.j, zzku.j, j, zzku.v0());
                         if (K().M(u9Var)) {
-                            this.k.g().n.d("User property triggered", zzz3.i, this.k.u().y(u9Var.f1203c), u9Var.e);
+                            this.k.g().n.d("User property triggered", zzz3.i, this.k.u().y(u9Var.f1201c), u9Var.e);
                         } else {
-                            this.k.g().f.d("Too many active user properties, ignoring", q3.s(zzz3.i), this.k.u().y(u9Var.f1203c), u9Var.e);
+                            this.k.g().f.d("Too many active user properties, ignoring", q3.s(zzz3.i), this.k.u().y(u9Var.f1201c), u9Var.e);
                         }
                         zzaq zzaq5 = zzz3.q;
                         if (zzaq5 != null) {
@@ -1846,7 +1846,7 @@ public class k9 implements t5 {
         List<String> k = T.k();
         if (da.b()) {
             z2 = T2;
-            if (this.k.h.u(T.o(), p.f1186j0)) {
+            if (this.k.h.u(T.o(), p.f1184j0)) {
                 str2 = T.B();
                 B(zzaq, new zzn(str, v, M, N, O, P, Q, (String) null, z2, false, H, g, 0L, 0, h, i, false, y2, j, S, k, str2, (t8.b() || !this.k.h.o(p.J0)) ? "" : a(str).d()));
             }
@@ -1863,7 +1863,7 @@ public class k9 implements t5 {
     @WorkerThread
     public final void n(a4 a4Var) {
         U();
-        if (!da.b() || !this.k.h.u(a4Var.o(), p.f1186j0)) {
+        if (!da.b() || !this.k.h.u(a4Var.o(), p.f1184j0)) {
             if (TextUtils.isEmpty(a4Var.v()) && TextUtils.isEmpty(a4Var.y())) {
                 r(a4Var.o(), 204, null, null, null);
                 return;
@@ -1877,7 +1877,7 @@ public class k9 implements t5 {
         Uri.Builder builder = new Uri.Builder();
         String v = a4Var.v();
         if (TextUtils.isEmpty(v)) {
-            if (da.b() && cVar.a.h.u(a4Var.o(), p.f1186j0)) {
+            if (da.b() && cVar.a.h.u(a4Var.o(), p.f1184j0)) {
                 v = a4Var.B();
             }
             v = a4Var.y();
@@ -1955,20 +1955,20 @@ public class k9 implements t5 {
                     }
                     l z2 = K().z(zzn.i, "_s");
                     if (z2 != null) {
-                        j2 = z2.f1171c;
+                        j2 = z2.f1169c;
                         this.k.g().n.b("Backfill the session number. Last used session number", Long.valueOf(j2));
                     }
                     o(new zzku("_sno", j, Long.valueOf(j2 + 1), str2), zzn);
                 }
                 u9 u9Var = new u9(zzn.i, zzku.n, zzku.j, zzku.k, n0);
-                this.k.g().n.c("Setting user property", this.k.u().y(u9Var.f1203c), n0);
+                this.k.g().n.c("Setting user property", this.k.u().y(u9Var.f1201c), n0);
                 K().b0();
                 try {
                     G(zzn);
                     boolean M = K().M(u9Var);
                     K().s();
                     if (!M) {
-                        this.k.g().f.c("Too many unique user properties are set. Ignoring user property", this.k.u().y(u9Var.f1203c), u9Var.e);
+                        this.k.g().f.c("Too many unique user properties are set. Ignoring user property", this.k.u().y(u9Var.f1201c), u9Var.e);
                         this.k.t().S(this.A, zzn.i, 9, null, null, 0);
                     }
                 } finally {
@@ -1982,7 +1982,7 @@ public class k9 implements t5 {
     public final void p(zzn zzn) {
         if (this.w != null) {
             ArrayList arrayList = new ArrayList();
-            this.f1167x = arrayList;
+            this.f1165x = arrayList;
             arrayList.addAll(this.w);
         }
         g K = K();
@@ -2049,9 +2049,9 @@ public class k9 implements t5 {
                     zzku zzku3 = zzz2.k;
                     u9 u9Var = new u9(zzz2.i, zzz2.j, zzku3.j, zzku3.k, zzku3.v0());
                     if (K().M(u9Var)) {
-                        this.k.g().m.d("User property updated immediately", zzz2.i, this.k.u().y(u9Var.f1203c), u9Var.e);
+                        this.k.g().m.d("User property updated immediately", zzz2.i, this.k.u().y(u9Var.f1201c), u9Var.e);
                     } else {
-                        this.k.g().f.d("(2)Too many active user properties, ignoring", q3.s(zzz2.i), this.k.u().y(u9Var.f1203c), u9Var.e);
+                        this.k.g().f.d("(2)Too many active user properties, ignoring", q3.s(zzz2.i), this.k.u().y(u9Var.f1201c), u9Var.e);
                     }
                     if (z3 && (zzaq = zzz2.q) != null) {
                         I(new zzaq(zzaq, zzz2.l), zzn);
@@ -2167,7 +2167,7 @@ public class k9 implements t5 {
         if (t8.b() && this.k.h.o(p.J0)) {
             U();
             P();
-            this.f1169z.put(str, dVar);
+            this.f1167z.put(str, dVar);
             g K = K();
             if (t8.b() && K.a.h.o(p.J0)) {
                 Objects.requireNonNull(str, "null reference");
@@ -2388,7 +2388,7 @@ public class k9 implements t5 {
         try {
             a aVar9 = new a(k9Var3, null);
             g K = K();
-            long j3 = k9Var3.f1168y;
+            long j3 = k9Var3.f1166y;
             AnimatableValueParser.A(aVar9);
             K.b();
             K.n();
@@ -2411,7 +2411,7 @@ public class k9 implements t5 {
                             str = "_sc";
                             str5 = str14;
                             str3 = "_npa";
-                            list = aVar9.f1170c;
+                            list = aVar9.f1168c;
                             if (!(list != null || list.isEmpty())) {
                                 e1.a t2 = aVar9.a.t();
                                 t2.F();
@@ -2426,10 +2426,10 @@ public class k9 implements t5 {
                                 long j4 = 0;
                                 while (true) {
                                     z2 = z11;
-                                    if (i13 >= aVar9.f1170c.size()) {
+                                    if (i13 >= aVar9.f1168c.size()) {
                                         break;
                                     }
-                                    a1.a t3 = aVar9.f1170c.get(i13).t();
+                                    a1.a t3 = aVar9.f1168c.get(i13).t();
                                     if (H().x(aVar9.a.G1(), t3.y())) {
                                         z7 = v;
                                         k9Var3.k.g().A().c("Dropping blacklisted raw event. appId", q3.s(aVar9.a.G1()), k9Var3.k.u().u(t3.y()));
@@ -2524,7 +2524,7 @@ public class k9 implements t5 {
                                                         } else {
                                                             z2 = true;
                                                         }
-                                                        if (t9.X(t3.y()) && y2 && K().y(V(), aVar9.a.G1(), true, false).f1153c > ((long) k9Var3.k.a().q(aVar9.a.G1(), p.n))) {
+                                                        if (t9.X(t3.y()) && y2 && K().y(V(), aVar9.a.G1(), true, false).f1151c > ((long) k9Var3.k.a().q(aVar9.a.G1(), p.n))) {
                                                             k9Var3.k.g().A().b("Too many conversions. Not logging as conversion. appId", q3.s(aVar9.a.G1()));
                                                             z9 = false;
                                                             int i16 = -1;
@@ -2767,7 +2767,7 @@ public class k9 implements t5 {
                                                                             }
                                                                         }
                                                                         i4 = i13;
-                                                                        aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                                                        aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                                                         i12++;
                                                                         aVar4.t(t3);
                                                                         aVar10 = aVar5;
@@ -2804,7 +2804,7 @@ public class k9 implements t5 {
                                                                             if (t3.w() == 0) {
                                                                             }
                                                                             i4 = i13;
-                                                                            aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                                                            aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                                                             i12++;
                                                                             aVar4.t(t3);
                                                                             aVar10 = aVar5;
@@ -2856,7 +2856,7 @@ public class k9 implements t5 {
                                                                         if (t3.w() == 0) {
                                                                         }
                                                                         i4 = i13;
-                                                                        aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                                                        aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                                                         i12++;
                                                                         aVar4.t(t3);
                                                                         aVar10 = aVar5;
@@ -2873,7 +2873,7 @@ public class k9 implements t5 {
                                                         if (t3.w() == 0) {
                                                         }
                                                         i4 = i13;
-                                                        aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                                        aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                                         i12++;
                                                         aVar4.t(t3);
                                                         aVar10 = aVar5;
@@ -2890,7 +2890,7 @@ public class k9 implements t5 {
                                                     if (t3.w() == 0) {
                                                     }
                                                     i4 = i13;
-                                                    aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                                    aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                                     i12++;
                                                     aVar4.t(t3);
                                                     aVar10 = aVar5;
@@ -2907,7 +2907,7 @@ public class k9 implements t5 {
                                             if (t3.w() == 0) {
                                             }
                                             i4 = i13;
-                                            aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                            aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                             i12++;
                                             aVar4.t(t3);
                                             aVar10 = aVar5;
@@ -2918,7 +2918,7 @@ public class k9 implements t5 {
                                         if (t3.w() == 0) {
                                         }
                                         i4 = i13;
-                                        aVar9.f1170c.set(i4, (a1) ((u4) t3.p()));
+                                        aVar9.f1168c.set(i4, (a1) ((u4) t3.p()));
                                         i12++;
                                         aVar4.t(t3);
                                         aVar10 = aVar5;
@@ -3300,7 +3300,7 @@ public class k9 implements t5 {
                         str = "_sc";
                         str5 = str14;
                         str3 = "_npa";
-                        list = aVar9.f1170c;
+                        list = aVar9.f1168c;
                         if (!(list != null || list.isEmpty())) {
                         }
                     } else {
@@ -3320,7 +3320,7 @@ public class k9 implements t5 {
                             str = "_sc";
                             str5 = str14;
                             str3 = "_npa";
-                            list = aVar9.f1170c;
+                            list = aVar9.f1168c;
                             if (!(list != null || list.isEmpty())) {
                             }
                         } else {
@@ -3379,7 +3379,7 @@ public class k9 implements t5 {
                                 K.g().z().c("Data loss. Failed to merge raw event metadata. appId", q3.s(str11), e6);
                                 cursor2.close();
                             }
-                            list = aVar9.f1170c;
+                            list = aVar9.f1168c;
                             if (!(list != null || list.isEmpty())) {
                             }
                         }
@@ -3396,7 +3396,7 @@ public class k9 implements t5 {
                             if (cursor2 != null) {
                                 cursor2.close();
                             }
-                            list = aVar9.f1170c;
+                            list = aVar9.f1168c;
                             if (!(list != null || list.isEmpty())) {
                             }
                         } catch (Throwable th5) {
@@ -3425,7 +3425,7 @@ public class k9 implements t5 {
                     K.g().z().c("Data loss. Error selecting raw event. appId", q3.s(str11), sQLiteException);
                     if (cursor2 != null) {
                     }
-                    list = aVar9.f1170c;
+                    list = aVar9.f1168c;
                     if (!(list != null || list.isEmpty())) {
                     }
                 } catch (Throwable th7) {
@@ -3442,7 +3442,7 @@ public class k9 implements t5 {
                 K.g().z().c("Data loss. Error selecting raw event. appId", q3.s(str11), sQLiteException);
                 if (cursor2 != null) {
                 }
-                list = aVar9.f1170c;
+                list = aVar9.f1168c;
                 if (!(list != null || list.isEmpty())) {
                 }
             } catch (SQLiteException e9) {
@@ -3566,8 +3566,8 @@ public class k9 implements t5 {
                         S.a.f().b();
                         if (!S.b) {
                             S.a.k.b.registerReceiver(S, new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE"));
-                            S.f1140c = S.a.J().u();
-                            S.a.g().n.b("Registering connectivity change receiver. Network connected", Boolean.valueOf(S.f1140c));
+                            S.f1138c = S.a.J().u();
+                            S.a.g().n.b("Registering connectivity change receiver. Network connected", Boolean.valueOf(S.f1138c));
                             S.b = true;
                         }
                         T().s();
@@ -3601,7 +3601,7 @@ public class k9 implements t5 {
                         T.g().n.b("Scheduling upload, millis", Long.valueOf(currentTimeMillis2));
                         Objects.requireNonNull((d) T.a.o);
                         long elapsedRealtime = SystemClock.elapsedRealtime() + currentTimeMillis2;
-                        if (currentTimeMillis2 < Math.max(0L, p.f1188x.a(null).longValue())) {
+                        if (currentTimeMillis2 < Math.max(0L, p.f1186x.a(null).longValue())) {
                             if (!(T.e.d != 0)) {
                                 T.e.b(currentTimeMillis2);
                             }
@@ -3647,7 +3647,7 @@ public class k9 implements t5 {
                             jobScheduler.schedule(build);
                             return;
                         }
-                        T.d.setInexactRepeating(2, elapsedRealtime, Math.max(p.f1187s.a(null).longValue(), currentTimeMillis2), T.u());
+                        T.d.setInexactRepeating(2, elapsedRealtime, Math.max(p.f1185s.a(null).longValue(), currentTimeMillis2), T.u());
                         return;
                     }
                 }
@@ -3672,8 +3672,8 @@ public class k9 implements t5 {
     @WorkerThread
     public final void x() {
         U();
-        if (this.r || this.f1166s || this.t) {
-            this.k.g().n.d("Not stopping services. fetch, network, upload", Boolean.valueOf(this.r), Boolean.valueOf(this.f1166s), Boolean.valueOf(this.t));
+        if (this.r || this.f1164s || this.t) {
+            this.k.g().n.d("Not stopping services. fetch, network, upload", Boolean.valueOf(this.r), Boolean.valueOf(this.f1164s), Boolean.valueOf(this.t));
             return;
         }
         this.k.g().n.a("Stopping uploading service(s)");
@@ -3695,7 +3695,7 @@ public class k9 implements t5 {
         }
         Boolean z2 = z(T);
         if (z2 == null || z2.booleanValue()) {
-            return new zzn(str, T.v(), T.M(), T.N(), T.O(), T.P(), T.Q(), (String) null, T.T(), false, T.H(), T.g(), 0L, 0, T.h(), T.i(), false, T.y(), T.j(), T.S(), T.k(), (!da.b() || !this.k.h.u(str, p.f1186j0)) ? null : T.B(), (!t8.b() || !this.k.h.o(p.J0)) ? "" : a(str).d());
+            return new zzn(str, T.v(), T.M(), T.N(), T.O(), T.P(), T.Q(), (String) null, T.T(), false, T.H(), T.g(), 0L, 0, T.h(), T.i(), false, T.y(), T.j(), T.S(), T.k(), (!da.b() || !this.k.h.u(str, p.f1184j0)) ? null : T.B(), (!t8.b() || !this.k.h.o(p.J0)) ? "" : a(str).d());
         }
         this.k.g().f.b("App version does not match; dropping. appId", q3.s(str));
         return null;
diff --git a/app/src/main/java/c/i/a/f/i/b/l.java b/app/src/main/java/c/i/a/f/i/b/l.java
index 08b647725c..d9327984d6 100644
--- a/app/src/main/java/c/i/a/f/i/b/l.java
+++ b/app/src/main/java/c/i/a/f/i/b/l.java
@@ -7,7 +7,7 @@ public final class l {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final long f1171c;
+    public final long f1169c;
     public final long d;
     public final long e;
     public final long f;
@@ -31,7 +31,7 @@ public final class l {
         AnimatableValueParser.m(j5 < 0 ? false : z2);
         this.a = str;
         this.b = str2;
-        this.f1171c = j;
+        this.f1169c = j;
         this.d = j2;
         this.e = j3;
         this.f = j4;
@@ -43,14 +43,14 @@ public final class l {
     }
 
     public final l a(long j) {
-        return new l(this.a, this.b, this.f1171c, this.d, this.e, j, this.g, this.h, this.i, this.j, this.k);
+        return new l(this.a, this.b, this.f1169c, this.d, this.e, j, this.g, this.h, this.i, this.j, this.k);
     }
 
     public final l b(long j, long j2) {
-        return new l(this.a, this.b, this.f1171c, this.d, this.e, this.f, j, Long.valueOf(j2), this.i, this.j, this.k);
+        return new l(this.a, this.b, this.f1169c, this.d, this.e, this.f, j, Long.valueOf(j2), this.i, this.j, this.k);
     }
 
     public final l c(Long l, Long l2, Boolean bool) {
-        return new l(this.a, this.b, this.f1171c, this.d, this.e, this.f, this.g, this.h, l, l2, (bool == null || bool.booleanValue()) ? bool : null);
+        return new l(this.a, this.b, this.f1169c, this.d, this.e, this.f, this.g, this.h, l, l2, (bool == null || bool.booleanValue()) ? bool : null);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/l3.java b/app/src/main/java/c/i/a/f/i/b/l3.java
index 56cff251f0..42126b3aa1 100644
--- a/app/src/main/java/c/i/a/f/i/b/l3.java
+++ b/app/src/main/java/c/i/a/f/i/b/l3.java
@@ -79,7 +79,7 @@ public abstract class l3 extends s0 implements i3 {
                     List<u9> list = (List) ((FutureTask) z4Var5.a.f().t(new n5(z4Var5, zzn4))).get();
                     arrayList = new ArrayList(list.size());
                     for (u9 u9Var : list) {
-                        if (z2 || !t9.r0(u9Var.f1203c)) {
+                        if (z2 || !t9.r0(u9Var.f1201c)) {
                             arrayList.add(new zzku(u9Var));
                         }
                     }
@@ -91,18 +91,18 @@ public abstract class l3 extends s0 implements i3 {
                 parcel2.writeTypedList(arrayList);
                 break;
             case 9:
-                byte[] i3 = ((z4) this).i((zzaq) v.a(parcel, zzaq.CREATOR), parcel.readString());
+                byte[] j = ((z4) this).j((zzaq) v.a(parcel, zzaq.CREATOR), parcel.readString());
                 parcel2.writeNoException();
-                parcel2.writeByteArray(i3);
+                parcel2.writeByteArray(j);
                 break;
             case 10:
-                ((z4) this).E(parcel.readLong(), parcel.readString(), parcel.readString(), parcel.readString());
+                ((z4) this).F(parcel.readLong(), parcel.readString(), parcel.readString(), parcel.readString());
                 parcel2.writeNoException();
                 break;
             case 11:
-                String z3 = ((z4) this).z((zzn) v.a(parcel, zzn.CREATOR));
+                String A = ((z4) this).A((zzn) v.a(parcel, zzn.CREATOR));
                 parcel2.writeNoException();
-                parcel2.writeString(z3);
+                parcel2.writeString(A);
                 break;
             case 12:
                 ((z4) this).v0((zzz) v.a(parcel, zzz.CREATOR), (zzn) v.a(parcel, zzn.CREATOR));
@@ -119,9 +119,9 @@ public abstract class l3 extends s0 implements i3 {
                 if (parcel.readInt() != 0) {
                     z2 = true;
                 }
-                List<zzku> P = ((z4) this).P(readString2, readString3, z2, (zzn) v.a(parcel, zzn.CREATOR));
+                List<zzku> Q = ((z4) this).Q(readString2, readString3, z2, (zzn) v.a(parcel, zzn.CREATOR));
                 parcel2.writeNoException();
-                parcel2.writeTypedList(P);
+                parcel2.writeTypedList(Q);
                 break;
             case 15:
                 String readString4 = parcel.readString();
@@ -131,19 +131,19 @@ public abstract class l3 extends s0 implements i3 {
                 if (parcel.readInt() != 0) {
                     z2 = true;
                 }
-                List<zzku> t = ((z4) this).t(readString4, readString5, readString6, z2);
+                List<zzku> u = ((z4) this).u(readString4, readString5, readString6, z2);
                 parcel2.writeNoException();
-                parcel2.writeTypedList(t);
+                parcel2.writeTypedList(u);
                 break;
             case 16:
-                List<zzz> H = ((z4) this).H(parcel.readString(), parcel.readString(), (zzn) v.a(parcel, zzn.CREATOR));
+                List<zzz> I = ((z4) this).I(parcel.readString(), parcel.readString(), (zzn) v.a(parcel, zzn.CREATOR));
                 parcel2.writeNoException();
-                parcel2.writeTypedList(H);
+                parcel2.writeTypedList(I);
                 break;
             case 17:
-                List<zzz> G = ((z4) this).G(parcel.readString(), parcel.readString(), parcel.readString());
+                List<zzz> H = ((z4) this).H(parcel.readString(), parcel.readString(), parcel.readString());
                 parcel2.writeNoException();
-                parcel2.writeTypedList(G);
+                parcel2.writeTypedList(H);
                 break;
             case 18:
                 zzn zzn5 = (zzn) v.a(parcel, zzn.CREATOR);
@@ -157,7 +157,7 @@ public abstract class l3 extends s0 implements i3 {
                 parcel2.writeNoException();
                 break;
             case 20:
-                ((z4) this).l((zzn) v.a(parcel, zzn.CREATOR));
+                ((z4) this).m((zzn) v.a(parcel, zzn.CREATOR));
                 parcel2.writeNoException();
                 break;
         }
diff --git a/app/src/main/java/c/i/a/f/i/b/m.java b/app/src/main/java/c/i/a/f/i/b/m.java
index 96deae053f..83368ef04a 100644
--- a/app/src/main/java/c/i/a/f/i/b/m.java
+++ b/app/src/main/java/c/i/a/f/i/b/m.java
@@ -13,7 +13,7 @@ public final class m {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1172c;
+    public final String f1170c;
     public final long d;
     public final long e;
     public final zzap f;
@@ -24,7 +24,7 @@ public final class m {
         AnimatableValueParser.w(str3);
         this.a = str2;
         this.b = str3;
-        this.f1172c = TextUtils.isEmpty(str) ? null : str;
+        this.f1170c = TextUtils.isEmpty(str) ? null : str;
         this.d = j;
         this.e = j2;
         if (j2 != 0 && j2 > j) {
@@ -61,7 +61,7 @@ public final class m {
         Objects.requireNonNull(zzap, "null reference");
         this.a = str2;
         this.b = str3;
-        this.f1172c = TextUtils.isEmpty(str) ? null : str;
+        this.f1170c = TextUtils.isEmpty(str) ? null : str;
         this.d = j;
         this.e = j2;
         if (j2 != 0 && j2 > j) {
@@ -71,7 +71,7 @@ public final class m {
     }
 
     public final m a(u4 u4Var, long j) {
-        return new m(u4Var, this.f1172c, this.a, this.b, this.d, j, this.f);
+        return new m(u4Var, this.f1170c, this.a, this.b, this.d, j, this.f);
     }
 
     public final String toString() {
diff --git a/app/src/main/java/c/i/a/f/i/b/m3.java b/app/src/main/java/c/i/a/f/i/b/m3.java
index ab5da9fb0d..05e8ad07b4 100644
--- a/app/src/main/java/c/i/a/f/i/b/m3.java
+++ b/app/src/main/java/c/i/a/f/i/b/m3.java
@@ -12,7 +12,7 @@ import androidx.annotation.WorkerThread;
 public final class m3 extends a5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public final p3 f1173c = new p3(this, this.a.b, "google_app_measurement_local.db");
+    public final p3 f1171c = new p3(this, this.a.b, "google_app_measurement_local.db");
     public boolean d;
 
     public m3(u4 u4Var) {
@@ -43,7 +43,7 @@ public final class m3 extends a5 {
         if (this.d) {
             return null;
         }
-        SQLiteDatabase writableDatabase = this.f1173c.getWritableDatabase();
+        SQLiteDatabase writableDatabase = this.f1171c.getWritableDatabase();
         if (writableDatabase != null) {
             return writableDatabase;
         }
diff --git a/app/src/main/java/c/i/a/f/i/b/m6.java b/app/src/main/java/c/i/a/f/i/b/m6.java
index 55ec389eec..b9e871f338 100644
--- a/app/src/main/java/c/i/a/f/i/b/m6.java
+++ b/app/src/main/java/c/i/a/f/i/b/m6.java
@@ -21,10 +21,10 @@ public final class m6 implements Runnable {
                 c cVar = c6Var.a.h;
                 n3 o = c6Var.o();
                 o.t();
-                String str = o.f1174c;
+                String str = o.f1172c;
                 Objects.requireNonNull(cVar);
                 j3<String> j3Var = p.L;
-                atomicReference.set(str == null ? j3Var.a(null) : j3Var.a(cVar.f1141c.i(str, j3Var.b)));
+                atomicReference.set(str == null ? j3Var.a(null) : j3Var.a(cVar.f1139c.i(str, j3Var.b)));
                 this.i.notify();
             } catch (Throwable th) {
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/m9.java b/app/src/main/java/c/i/a/f/i/b/m9.java
index f93a9e8e8e..387c82d07e 100644
--- a/app/src/main/java/c/i/a/f/i/b/m9.java
+++ b/app/src/main/java/c/i/a/f/i/b/m9.java
@@ -26,7 +26,7 @@ public final class m9 implements z3 {
             try {
                 bArr = new byte[0];
             } catch (Throwable th2) {
-                k9Var.f1166s = false;
+                k9Var.f1164s = false;
                 k9Var.x();
                 throw th2;
             }
@@ -59,7 +59,7 @@ public final class m9 implements z3 {
                                 throw e;
                             }
                         } catch (SQLiteException e2) {
-                            List<Long> list2 = k9Var.f1167x;
+                            List<Long> list2 = k9Var.f1165x;
                             if (list2 == null || !list2.contains(l)) {
                                 throw e2;
                             }
@@ -67,9 +67,9 @@ public final class m9 implements z3 {
                     }
                     k9Var.K().s();
                     k9Var.K().e0();
-                    k9Var.f1167x = null;
+                    k9Var.f1165x = null;
                     if (!k9Var.J().u() || !k9Var.v()) {
-                        k9Var.f1168y = -1;
+                        k9Var.f1166y = -1;
                         k9Var.w();
                     } else {
                         k9Var.Q();
@@ -101,7 +101,7 @@ public final class m9 implements z3 {
             k9Var.K().J(list);
             k9Var.w();
         }
-        k9Var.f1166s = false;
+        k9Var.f1164s = false;
         k9Var.x();
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/n3.java b/app/src/main/java/c/i/a/f/i/b/n3.java
index 64196b6b65..61c54d6eff 100644
--- a/app/src/main/java/c/i/a/f/i/b/n3.java
+++ b/app/src/main/java/c/i/a/f/i/b/n3.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 public final class n3 extends a5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1174c;
+    public String f1172c;
     public String d;
     public int e;
     public String f;
@@ -95,7 +95,7 @@ public final class n3 extends a5 {
                 g().f.c("Error retrieving package info. appId, appName", q3.s(packageName), "Unknown");
             }
         }
-        this.f1174c = packageName;
+        this.f1172c = packageName;
         this.f = str;
         this.d = str2;
         this.e = i;
@@ -111,7 +111,7 @@ public final class n3 extends a5 {
         }
         boolean z3 = true;
         boolean z4 = status != null && status.v0();
-        boolean z5 = !TextUtils.isEmpty(this.a.f1197c) && "am".equals(this.a.d);
+        boolean z5 = !TextUtils.isEmpty(this.a.f1195c) && "am".equals(this.a.d);
         boolean z6 = z4 | z5;
         if (!z6) {
             if (status == null) {
@@ -161,12 +161,12 @@ public final class n3 extends a5 {
                 this.l = "";
                 this.m = "";
                 if (z5) {
-                    this.l = this.a.f1197c;
+                    this.l = this.a.f1195c;
                 }
                 list = null;
                 G0 = (((lb) ib.i.a()).a() || !this.a.h.o(p.C0)) ? h.a("getGoogleAppId").f1041c : c.G0(this.a.b, "google_app_id");
                 this.k = !TextUtils.isEmpty(G0) ? "" : G0;
-                if (!da.b() && this.a.h.o(p.f1186j0)) {
+                if (!da.b() && this.a.h.o(p.f1184j0)) {
                     Context context2 = this.a.b;
                     Objects.requireNonNull(context2, "null reference");
                     Resources resources = context2.getResources();
@@ -186,7 +186,7 @@ public final class n3 extends a5 {
                     this.l = identifier3 == 0 ? null : resources2.getString(identifier3);
                 }
                 if (z2) {
-                    g().n.c("App measurement enabled for app package, google app id", this.f1174c, TextUtils.isEmpty(this.k) ? this.l : this.k);
+                    g().n.c("App measurement enabled for app package, google app id", this.f1172c, TextUtils.isEmpty(this.k) ? this.l : this.k);
                 }
                 this.i = null;
                 c cVar = this.a.h;
diff --git a/app/src/main/java/c/i/a/f/i/b/o.java b/app/src/main/java/c/i/a/f/i/b/o.java
index e5b1f2f803..bfff5a2c20 100644
--- a/app/src/main/java/c/i/a/f/i/b/o.java
+++ b/app/src/main/java/c/i/a/f/i/b/o.java
@@ -10,17 +10,17 @@ public final class o implements Parcelable.Creator<zzap> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzap createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Bundle bundle = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 bundle = AnimatableValueParser.P(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzap(bundle);
     }
 
diff --git a/app/src/main/java/c/i/a/f/i/b/o3.java b/app/src/main/java/c/i/a/f/i/b/o3.java
index 440330fa5e..1a01d95fc1 100644
--- a/app/src/main/java/c/i/a/f/i/b/o3.java
+++ b/app/src/main/java/c/i/a/f/i/b/o3.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public final class o3 extends r5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicReference<String[]> f1175c = new AtomicReference<>();
+    public static final AtomicReference<String[]> f1173c = new AtomicReference<>();
     public static final AtomicReference<String[]> d = new AtomicReference<>();
     public static final AtomicReference<String[]> e = new AtomicReference<>();
 
@@ -92,7 +92,7 @@ public final class o3 extends r5 {
         if (str == null) {
             return null;
         }
-        return !z() ? str : v(str, v5.f1204c, v5.a, f1175c);
+        return !z() ? str : v(str, v5.f1202c, v5.a, f1173c);
     }
 
     @Nullable
diff --git a/app/src/main/java/c/i/a/f/i/b/p.java b/app/src/main/java/c/i/a/f/i/b/p.java
index 0d0f5da998..76facabbcb 100644
--- a/app/src/main/java/c/i/a/f/i/b/p.java
+++ b/app/src/main/java/c/i/a/f/i/b/p.java
@@ -51,45 +51,45 @@ public final class p {
     public static List<j3<?>> a = Collections.synchronizedList(new ArrayList());
 
     /* renamed from: a0  reason: collision with root package name */
-    public static j3<Boolean> f1176a0;
+    public static j3<Boolean> f1174a0;
     public static j3<Long> b = a("measurement.ad_id_cache_time", 10000L, 10000L, s.a);
 
     /* renamed from: b0  reason: collision with root package name */
-    public static j3<Boolean> f1177b0;
+    public static j3<Boolean> f1175b0;
 
     /* renamed from: c  reason: collision with root package name */
-    public static j3<Long> f1178c = a("measurement.monitoring.sample_period_millis", 86400000L, 86400000L, r.a);
+    public static j3<Long> f1176c = a("measurement.monitoring.sample_period_millis", 86400000L, 86400000L, r.a);
 
     /* renamed from: c0  reason: collision with root package name */
-    public static j3<Boolean> f1179c0;
+    public static j3<Boolean> f1177c0;
     public static j3<Long> d = a("measurement.config.cache_time", 86400000L, 3600000L, f0.a);
 
     /* renamed from: d0  reason: collision with root package name */
-    public static j3<Boolean> f1180d0;
+    public static j3<Boolean> f1178d0;
     public static j3<String> e = a("measurement.config.url_scheme", "https", "https", o0.a);
 
     /* renamed from: e0  reason: collision with root package name */
-    public static j3<Boolean> f1181e0;
+    public static j3<Boolean> f1179e0;
     public static j3<String> f = a("measurement.config.url_authority", "app-measurement.com", "app-measurement.com", c1.a);
 
     /* renamed from: f0  reason: collision with root package name */
-    public static j3<Boolean> f1182f0;
+    public static j3<Boolean> f1180f0;
     public static j3<Integer> g = a("measurement.upload.max_bundles", 100, 100, l1.a);
 
     /* renamed from: g0  reason: collision with root package name */
-    public static j3<Boolean> f1183g0;
+    public static j3<Boolean> f1181g0;
     public static j3<Integer> h = a("measurement.upload.max_batch_size", 65536, 65536, y1.a);
 
     /* renamed from: h0  reason: collision with root package name */
-    public static j3<Boolean> f1184h0;
+    public static j3<Boolean> f1182h0;
     public static j3<Integer> i = a("measurement.upload.max_bundle_size", 65536, 65536, i2.a);
 
     /* renamed from: i0  reason: collision with root package name */
-    public static j3<Boolean> f1185i0;
+    public static j3<Boolean> f1183i0;
     public static j3<Integer> j = a("measurement.upload.max_events_per_bundle", 1000, 1000, v2.a);
 
     /* renamed from: j0  reason: collision with root package name */
-    public static j3<Boolean> f1186j0;
+    public static j3<Boolean> f1184j0;
     public static j3<Integer> k = a("measurement.upload.max_events_per_day", 100000, 100000, g3.a);
     public static j3<Boolean> k0;
     public static j3<Integer> l = a("measurement.upload.max_error_events_per_day", 1000, 1000, u.a);
@@ -108,7 +108,7 @@ public final class p {
     public static j3<Boolean> r0;
 
     /* renamed from: s  reason: collision with root package name */
-    public static j3<Long> f1187s = a("measurement.upload.window_interval", 3600000L, 3600000L, a0.a);
+    public static j3<Long> f1185s = a("measurement.upload.window_interval", 3600000L, 3600000L, a0.a);
     public static j3<Boolean> s0;
     public static j3<Long> t = a("measurement.upload.interval", 3600000L, 3600000L, d0.a);
     public static j3<Boolean> t0;
@@ -120,15 +120,15 @@ public final class p {
     public static j3<Boolean> w0;
 
     /* renamed from: x  reason: collision with root package name */
-    public static j3<Long> f1188x = a("measurement.alarm_manager.minimum_interval", 60000L, 60000L, g0.a);
+    public static j3<Long> f1186x = a("measurement.alarm_manager.minimum_interval", 60000L, 60000L, g0.a);
     public static j3<Boolean> x0;
 
     /* renamed from: y  reason: collision with root package name */
-    public static j3<Long> f1189y = a("measurement.upload.stale_data_deletion_interval", 86400000L, 86400000L, j0.a);
+    public static j3<Long> f1187y = a("measurement.upload.stale_data_deletion_interval", 86400000L, 86400000L, j0.a);
     public static j3<Boolean> y0;
 
     /* renamed from: z  reason: collision with root package name */
-    public static j3<Long> f1190z = a("measurement.upload.refresh_blacklisted_config_interval", 604800000L, 604800000L, i0.a);
+    public static j3<Long> f1188z = a("measurement.upload.refresh_blacklisted_config_interval", 604800000L, 604800000L, i0.a);
     public static j3<Boolean> z0;
 
     static {
@@ -147,16 +147,16 @@ public final class p {
         X = a("measurement.quality.checksum", bool, bool, null);
         Y = a("measurement.sdk.dynamite.allow_remote_dynamite3", bool2, bool2, i1.a);
         Z = a("measurement.sdk.collection.validate_param_names_alphabetical", bool2, bool2, h1.a);
-        f1176a0 = a("measurement.audience.use_bundle_end_timestamp_for_non_sequence_property_filters", bool, bool, k1.a);
-        f1177b0 = a("measurement.audience.refresh_event_count_filters_timestamp", bool, bool, j1.a);
-        f1179c0 = a("measurement.audience.use_bundle_timestamp_for_event_count_filters", bool, bool, m1.a);
-        f1180d0 = a("measurement.sdk.collection.retrieve_deeplink_from_bow_2", bool2, bool2, o1.a);
-        f1181e0 = a("measurement.sdk.collection.last_deep_link_referrer2", bool2, bool2, n1.a);
-        f1182f0 = a("measurement.sdk.collection.last_deep_link_referrer_campaign2", bool, bool, q1.a);
-        f1183g0 = a("measurement.sdk.collection.last_gclid_from_referrer2", bool, bool, p1.a);
-        f1184h0 = a("measurement.sdk.collection.enable_extend_user_property_size", bool2, bool2, s1.a);
-        f1185i0 = a("measurement.upload.file_lock_state_check", bool, bool, r1.a);
-        f1186j0 = a("measurement.ga.ga_app_id", bool, bool, u1.a);
+        f1174a0 = a("measurement.audience.use_bundle_end_timestamp_for_non_sequence_property_filters", bool, bool, k1.a);
+        f1175b0 = a("measurement.audience.refresh_event_count_filters_timestamp", bool, bool, j1.a);
+        f1177c0 = a("measurement.audience.use_bundle_timestamp_for_event_count_filters", bool, bool, m1.a);
+        f1178d0 = a("measurement.sdk.collection.retrieve_deeplink_from_bow_2", bool2, bool2, o1.a);
+        f1179e0 = a("measurement.sdk.collection.last_deep_link_referrer2", bool2, bool2, n1.a);
+        f1180f0 = a("measurement.sdk.collection.last_deep_link_referrer_campaign2", bool, bool, q1.a);
+        f1181g0 = a("measurement.sdk.collection.last_gclid_from_referrer2", bool, bool, p1.a);
+        f1182h0 = a("measurement.sdk.collection.enable_extend_user_property_size", bool2, bool2, s1.a);
+        f1183i0 = a("measurement.upload.file_lock_state_check", bool, bool, r1.a);
+        f1184j0 = a("measurement.ga.ga_app_id", bool, bool, u1.a);
         k0 = a("measurement.lifecycle.app_in_background_parameter", bool, bool, t1.a);
         l0 = a("measurement.integration.disable_firebase_instance_id", bool, bool, w1.a);
         m0 = a("measurement.lifecycle.app_backgrounded_engagement", bool, bool, v1.a);
diff --git a/app/src/main/java/c/i/a/f/i/b/p4.java b/app/src/main/java/c/i/a/f/i/b/p4.java
index 55e77e8fe2..e67cc14d97 100644
--- a/app/src/main/java/c/i/a/f/i/b/p4.java
+++ b/app/src/main/java/c/i/a/f/i/b/p4.java
@@ -223,7 +223,7 @@ public final class p4 extends i9 implements e {
                 g().i.a("EventConfig contained null event name");
             } else {
                 String q = t.q();
-                String J0 = c.J0(t.q(), v5.a, v5.f1204c);
+                String J0 = c.J0(t.q(), v5.a, v5.f1202c);
                 if (!TextUtils.isEmpty(J0)) {
                     if (t.k) {
                         t.n();
@@ -284,7 +284,7 @@ public final class p4 extends i9 implements e {
                 while (i2 < ((k0) t2.j).D()) {
                     l0.a t3 = ((k0) t2.j).z(i2).t();
                     l0.a aVar = (l0.a) ((u4.b) t3.clone());
-                    String J0 = c.J0(((l0) t3.j).z(), v5.a, v5.f1204c);
+                    String J0 = c.J0(((l0) t3.j).z(), v5.a, v5.f1202c);
                     if (J0 != null) {
                         if (aVar.k) {
                             aVar.n();
diff --git a/app/src/main/java/c/i/a/f/i/b/q.java b/app/src/main/java/c/i/a/f/i/b/q.java
index 0301aa9c3a..0765de78b1 100644
--- a/app/src/main/java/c/i/a/f/i/b/q.java
+++ b/app/src/main/java/c/i/a/f/i/b/q.java
@@ -10,12 +10,12 @@ public final class q implements Parcelable.Creator<zzaq> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzaq createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         zzap zzap = null;
         String str2 = null;
         long j = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 2) {
@@ -25,12 +25,12 @@ public final class q implements Parcelable.Creator<zzaq> {
             } else if (i == 4) {
                 str2 = AnimatableValueParser.T(parcel, readInt);
             } else if (i != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                j = AnimatableValueParser.f2(parcel, readInt);
+                j = AnimatableValueParser.h2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzaq(str, zzap, str2, j);
     }
 
diff --git a/app/src/main/java/c/i/a/f/i/b/q3.java b/app/src/main/java/c/i/a/f/i/b/q3.java
index 3cdf278d4f..0c8075e118 100644
--- a/app/src/main/java/c/i/a/f/i/b/q3.java
+++ b/app/src/main/java/c/i/a/f/i/b/q3.java
@@ -11,7 +11,7 @@ import java.util.Objects;
 public final class q3 extends r5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public char f1191c = 0;
+    public char f1189c = 0;
     public long d = -1;
     @GuardedBy("this")
     public String e;
@@ -169,11 +169,11 @@ public final class q3 extends r5 {
             if (j > (j3 << 1)) {
                 k4Var.a();
             } else {
-                String string = k4Var.e.w().getString(k4Var.f1164c, null);
+                String string = k4Var.e.w().getString(k4Var.f1162c, null);
                 long j4 = k4Var.e.w().getLong(k4Var.b, 0);
                 k4Var.a();
-                pair = (string == null || j4 <= 0) ? d4.f1145c : new Pair<>(string, Long.valueOf(j4));
-                if (pair != null || pair == d4.f1145c) {
+                pair = (string == null || j4 <= 0) ? d4.f1143c : new Pair<>(string, Long.valueOf(j4));
+                if (pair != null || pair == d4.f1143c) {
                     return null;
                 }
                 String valueOf = String.valueOf(pair.second);
diff --git a/app/src/main/java/c/i/a/f/i/b/q7.java b/app/src/main/java/c/i/a/f/i/b/q7.java
index df3cfecc19..33329a6159 100644
--- a/app/src/main/java/c/i/a/f/i/b/q7.java
+++ b/app/src/main/java/c/i/a/f/i/b/q7.java
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public final class q7 extends a5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public final k8 f1192c;
+    public final k8 f1190c;
     public i3 d;
     public volatile Boolean e;
     public final i f;
@@ -54,7 +54,7 @@ public final class q7 extends a5 {
     public q7(u4 u4Var) {
         super(u4Var);
         this.g = new e9(u4Var.o);
-        this.f1192c = new k8(this);
+        this.f1190c = new k8(this);
         this.f = new p7(this, u4Var);
         this.i = new z7(this, u4Var);
     }
@@ -89,7 +89,7 @@ public final class q7 extends a5 {
         t();
         if (!B()) {
             if (G()) {
-                k8 k8Var = this.f1192c;
+                k8 k8Var = this.f1190c;
                 k8Var.k.b();
                 Context context = k8Var.k.a.b;
                 synchronized (k8Var) {
@@ -109,7 +109,7 @@ public final class q7 extends a5 {
                 if (queryIntentServices != null && queryIntentServices.size() > 0) {
                     Intent intent = new Intent("com.google.android.gms.measurement.START");
                     intent.setComponent(new ComponentName(this.a.b, "com.google.android.gms.measurement.AppMeasurementService"));
-                    k8 k8Var2 = this.f1192c;
+                    k8 k8Var2 = this.f1190c;
                     k8Var2.k.b();
                     Context context2 = k8Var2.k.a.b;
                     a b = a.b();
@@ -120,7 +120,7 @@ public final class q7 extends a5 {
                         }
                         k8Var2.k.g().n.a("Using local app measurement service");
                         k8Var2.i = true;
-                        b.a(context2, intent, k8Var2.k.f1192c, 129);
+                        b.a(context2, intent, k8Var2.k.f1190c, 129);
                         return;
                     }
                 }
@@ -133,13 +133,13 @@ public final class q7 extends a5 {
     public final void D() {
         b();
         t();
-        k8 k8Var = this.f1192c;
+        k8 k8Var = this.f1190c;
         if (k8Var.j != null && (k8Var.j.j() || k8Var.j.e())) {
             k8Var.j.h();
         }
         k8Var.j = null;
         try {
-            a.b().c(this.a.b, this.f1192c);
+            a.b().c(this.a.b, this.f1190c);
         } catch (IllegalArgumentException | IllegalStateException unused) {
         }
         this.d = null;
@@ -289,7 +289,7 @@ public final class q7 extends a5 {
         String E = z2 ? g().E() : null;
         o.b();
         o.t();
-        String str4 = o.f1174c;
+        String str4 = o.f1172c;
         o.t();
         String str5 = o.k;
         o.t();
@@ -438,7 +438,7 @@ public final class q7 extends a5 {
                         if (!da.b()) {
                             list = list2;
                             j2 = j7;
-                            if (o.a.h.o(p.f1186j0)) {
+                            if (o.a.h.o(p.f1184j0)) {
                                 o.t();
                                 str3 = o.m;
                                 return new zzn(str4, str5, str6, j4, str7, 33025, j6, E, z3, z4, str2, 0, j, i, booleanValue, booleanValue2, z5, str8, valueOf2, j2, list, str3, (t8.b() || !o.a.h.o(p.H0)) ? "" : o.l().y().d());
diff --git a/app/src/main/java/c/i/a/f/i/b/q9.java b/app/src/main/java/c/i/a/f/i/b/q9.java
index 4c85b9533d..144294a617 100644
--- a/app/src/main/java/c/i/a/f/i/b/q9.java
+++ b/app/src/main/java/c/i/a/f/i/b/q9.java
@@ -281,7 +281,7 @@ public final class q9 extends i9 {
     @WorkerThread
     public static boolean O(zzaq zzaq, zzn zzn) {
         Objects.requireNonNull(zzaq, "null reference");
-        return !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2289z);
+        return !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2295z);
     }
 
     public static boolean P(String str) {
diff --git a/app/src/main/java/c/i/a/f/i/b/r3.java b/app/src/main/java/c/i/a/f/i/b/r3.java
index 275c28161d..db9d46d140 100644
--- a/app/src/main/java/c/i/a/f/i/b/r3.java
+++ b/app/src/main/java/c/i/a/f/i/b/r3.java
@@ -31,13 +31,13 @@ public final class r3 extends b<i3> {
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.measurement.internal.IMeasurementService";
     }
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.measurement.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/r4.java b/app/src/main/java/c/i/a/f/i/b/r4.java
index 651b44bb26..78045f83a1 100644
--- a/app/src/main/java/c/i/a/f/i/b/r4.java
+++ b/app/src/main/java/c/i/a/f/i/b/r4.java
@@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public final class r4 extends r5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicLong f1193c = new AtomicLong(Long.MIN_VALUE);
+    public static final AtomicLong f1191c = new AtomicLong(Long.MIN_VALUE);
     public v4 d;
     public v4 e;
     public final PriorityBlockingQueue<s4<?>> f = new PriorityBlockingQueue<>();
diff --git a/app/src/main/java/c/i/a/f/i/b/s3.java b/app/src/main/java/c/i/a/f/i/b/s3.java
index 56b248a649..c394a61a38 100644
--- a/app/src/main/java/c/i/a/f/i/b/s3.java
+++ b/app/src/main/java/c/i/a/f/i/b/s3.java
@@ -5,29 +5,29 @@ public final class s3 {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1194c;
+    public final boolean f1192c;
     public final /* synthetic */ q3 d;
 
     public s3(q3 q3Var, int i, boolean z2, boolean z3) {
         this.d = q3Var;
         this.a = i;
         this.b = z2;
-        this.f1194c = z3;
+        this.f1192c = z3;
     }
 
     public final void a(String str) {
-        this.d.w(this.a, this.b, this.f1194c, str, null, null, null);
+        this.d.w(this.a, this.b, this.f1192c, str, null, null, null);
     }
 
     public final void b(String str, Object obj) {
-        this.d.w(this.a, this.b, this.f1194c, str, obj, null, null);
+        this.d.w(this.a, this.b, this.f1192c, str, obj, null, null);
     }
 
     public final void c(String str, Object obj, Object obj2) {
-        this.d.w(this.a, this.b, this.f1194c, str, obj, obj2, null);
+        this.d.w(this.a, this.b, this.f1192c, str, obj, obj2, null);
     }
 
     public final void d(String str, Object obj, Object obj2, Object obj3) {
-        this.d.w(this.a, this.b, this.f1194c, str, obj, obj2, obj3);
+        this.d.w(this.a, this.b, this.f1192c, str, obj, obj2, obj3);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/s4.java b/app/src/main/java/c/i/a/f/i/b/s4.java
index 7015617112..e196d247c2 100644
--- a/app/src/main/java/c/i/a/f/i/b/s4.java
+++ b/app/src/main/java/c/i/a/f/i/b/s4.java
@@ -14,7 +14,7 @@ public final class s4<V> extends FutureTask<V> implements Comparable<s4<V>> {
     public s4(r4 r4Var, Runnable runnable, boolean z2, String str) {
         super(runnable, null);
         this.l = r4Var;
-        long andIncrement = r4.f1193c.getAndIncrement();
+        long andIncrement = r4.f1191c.getAndIncrement();
         this.i = andIncrement;
         this.k = str;
         this.j = z2;
@@ -27,7 +27,7 @@ public final class s4<V> extends FutureTask<V> implements Comparable<s4<V>> {
     public s4(r4 r4Var, Callable<V> callable, boolean z2, String str) {
         super(callable);
         this.l = r4Var;
-        long andIncrement = r4.f1193c.getAndIncrement();
+        long andIncrement = r4.f1191c.getAndIncrement();
         this.i = andIncrement;
         this.k = str;
         this.j = z2;
diff --git a/app/src/main/java/c/i/a/f/i/b/s6.java b/app/src/main/java/c/i/a/f/i/b/s6.java
index 7681e1c0f8..d025da5642 100644
--- a/app/src/main/java/c/i/a/f/i/b/s6.java
+++ b/app/src/main/java/c/i/a/f/i/b/s6.java
@@ -20,7 +20,7 @@ public final class s6 implements Runnable {
                 c cVar = c6Var.a.h;
                 n3 o = c6Var.o();
                 o.t();
-                atomicReference.set(Integer.valueOf(cVar.q(o.f1174c, p.N)));
+                atomicReference.set(Integer.valueOf(cVar.q(o.f1172c, p.N)));
                 this.i.notify();
             } catch (Throwable th) {
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/s7.java b/app/src/main/java/c/i/a/f/i/b/s7.java
index 62f6044120..a7a354293f 100644
--- a/app/src/main/java/c/i/a/f/i/b/s7.java
+++ b/app/src/main/java/c/i/a/f/i/b/s7.java
@@ -32,7 +32,7 @@ public final class s7 implements Runnable {
                 q7Var.g().f.c("Failed to get user properties; not connected to service", this.i, this.j);
                 return;
             }
-            Bundle A = t9.A(i3Var.P(this.i, this.j, this.k, this.l));
+            Bundle A = t9.A(i3Var.Q(this.i, this.j, this.k, this.l));
             this.n.F();
             this.n.e().L(this.m, A);
         } catch (RemoteException e) {
diff --git a/app/src/main/java/c/i/a/f/i/b/s9.java b/app/src/main/java/c/i/a/f/i/b/s9.java
index 54dc6e5eed..9ddc2f4ed6 100644
--- a/app/src/main/java/c/i/a/f/i/b/s9.java
+++ b/app/src/main/java/c/i/a/f/i/b/s9.java
@@ -9,7 +9,7 @@ public final class s9 implements Parcelable.Creator<zzku> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzku createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         Long l = null;
         Float f = null;
@@ -18,22 +18,22 @@ public final class s9 implements Parcelable.Creator<zzku> {
         Double d = null;
         long j = 0;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
                     str = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 3:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 4:
-                    int k2 = AnimatableValueParser.k2(parcel, readInt);
-                    if (k2 != 0) {
-                        AnimatableValueParser.X2(parcel, k2, 8);
+                    int m2 = AnimatableValueParser.m2(parcel, readInt);
+                    if (m2 != 0) {
+                        AnimatableValueParser.Z2(parcel, m2, 8);
                         l = Long.valueOf(parcel.readLong());
                         break;
                     } else {
@@ -41,9 +41,9 @@ public final class s9 implements Parcelable.Creator<zzku> {
                         break;
                     }
                 case 5:
-                    int k22 = AnimatableValueParser.k2(parcel, readInt);
-                    if (k22 != 0) {
-                        AnimatableValueParser.X2(parcel, k22, 4);
+                    int m22 = AnimatableValueParser.m2(parcel, readInt);
+                    if (m22 != 0) {
+                        AnimatableValueParser.Z2(parcel, m22, 4);
                         f = Float.valueOf(parcel.readFloat());
                         break;
                     } else {
@@ -57,9 +57,9 @@ public final class s9 implements Parcelable.Creator<zzku> {
                     str3 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 8:
-                    int k23 = AnimatableValueParser.k2(parcel, readInt);
-                    if (k23 != 0) {
-                        AnimatableValueParser.X2(parcel, k23, 8);
+                    int m23 = AnimatableValueParser.m2(parcel, readInt);
+                    if (m23 != 0) {
+                        AnimatableValueParser.Z2(parcel, m23, 8);
                         d = Double.valueOf(parcel.readDouble());
                         break;
                     } else {
@@ -67,11 +67,11 @@ public final class s9 implements Parcelable.Creator<zzku> {
                         break;
                     }
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzku(i, str, j, l, f, str2, str3, d);
     }
 
diff --git a/app/src/main/java/c/i/a/f/i/b/t3.java b/app/src/main/java/c/i/a/f/i/b/t3.java
index d399406bcc..20216e3e8d 100644
--- a/app/src/main/java/c/i/a/f/i/b/t3.java
+++ b/app/src/main/java/c/i/a/f/i/b/t3.java
@@ -30,7 +30,7 @@ public final class t3 implements Runnable {
         }
         q3 q3Var = this.n;
         boolean z2 = true;
-        if (q3Var.f1191c == 0) {
+        if (q3Var.f1189c == 0) {
             c cVar = q3Var.a.h;
             if (cVar.d == null) {
                 synchronized (cVar) {
@@ -49,9 +49,9 @@ public final class t3 implements Runnable {
                 }
             }
             if (cVar.d.booleanValue()) {
-                this.n.f1191c = 'C';
+                this.n.f1189c = 'C';
             } else {
-                this.n.f1191c = 'c';
+                this.n.f1189c = 'c';
             }
         }
         q3 q3Var2 = this.n;
@@ -60,7 +60,7 @@ public final class t3 implements Runnable {
         }
         char charAt = "01VDIWEA?".charAt(this.i);
         q3 q3Var3 = this.n;
-        char c2 = q3Var3.f1191c;
+        char c2 = q3Var3.f1189c;
         long j = q3Var3.d;
         String u = q3.u(true, this.j, this.k, this.l, this.m);
         StringBuilder sb = new StringBuilder(String.valueOf(u).length() + 24);
@@ -85,7 +85,7 @@ public final class t3 implements Runnable {
         long j2 = k4Var.e.w().getLong(k4Var.b, 0);
         if (j2 <= 0) {
             SharedPreferences.Editor edit = k4Var.e.w().edit();
-            edit.putString(k4Var.f1164c, sb2);
+            edit.putString(k4Var.f1162c, sb2);
             edit.putLong(k4Var.b, 1);
             edit.apply();
             return;
@@ -96,7 +96,7 @@ public final class t3 implements Runnable {
         }
         SharedPreferences.Editor edit2 = k4Var.e.w().edit();
         if (z2) {
-            edit2.putString(k4Var.f1164c, sb2);
+            edit2.putString(k4Var.f1162c, sb2);
         }
         edit2.putLong(k4Var.b, j3);
         edit2.apply();
diff --git a/app/src/main/java/c/i/a/f/i/b/t6.java b/app/src/main/java/c/i/a/f/i/b/t6.java
index 39678ca746..b92a285b0a 100644
--- a/app/src/main/java/c/i/a/f/i/b/t6.java
+++ b/app/src/main/java/c/i/a/f/i/b/t6.java
@@ -20,7 +20,7 @@ public final class t6 implements Runnable {
                 c cVar = c6Var.a.h;
                 n3 o = c6Var.o();
                 o.t();
-                atomicReference.set(Long.valueOf(cVar.n(o.f1174c, p.M)));
+                atomicReference.set(Long.valueOf(cVar.n(o.f1172c, p.M)));
                 this.i.notify();
             } catch (Throwable th) {
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/t7.java b/app/src/main/java/c/i/a/f/i/b/t7.java
index aad4c107f3..ba6614e8b1 100644
--- a/app/src/main/java/c/i/a/f/i/b/t7.java
+++ b/app/src/main/java/c/i/a/f/i/b/t7.java
@@ -21,7 +21,7 @@ public final class t7 implements Runnable {
             return;
         }
         try {
-            i3Var.F(this.i);
+            i3Var.G(this.i);
         } catch (RemoteException e) {
             this.j.g().f.b("Failed to reset data on the service: remote exception", e);
         }
diff --git a/app/src/main/java/c/i/a/f/i/b/t9.java b/app/src/main/java/c/i/a/f/i/b/t9.java
index b53a4ea3a5..70a929a199 100644
--- a/app/src/main/java/c/i/a/f/i/b/t9.java
+++ b/app/src/main/java/c/i/a/f/i/b/t9.java
@@ -54,7 +54,7 @@ import javax.security.auth.x500.X500Principal;
 public final class t9 extends r5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String[] f1195c = {"firebase_", "google_", "ga_"};
+    public static final String[] f1193c = {"firebase_", "google_", "ga_"};
     public static final String[] d = {"_err"};
     public SecureRandom e;
     public final AtomicLong f = new AtomicLong(0);
@@ -209,10 +209,10 @@ public final class t9 extends r5 {
             }
             bundle.putLong("triggered_timestamp", zzz.k.k);
             bundle.putLong("time_to_live", zzz.r);
-            zzaq zzaq3 = zzz.f2290s;
+            zzaq zzaq3 = zzz.f2296s;
             if (zzaq3 != null) {
                 bundle.putString("expired_event_name", zzaq3.i);
-                zzap zzap3 = zzz.f2290s.j;
+                zzap zzap3 = zzz.f2296s.j;
                 if (zzap3 != null) {
                     bundle.putBundle("expired_event_params", zzap3.w0());
                 }
@@ -626,7 +626,7 @@ public final class t9 extends r5 {
                 g().h.b("Invalid google_app_id. Firebase Analytics disabled. See https://goo.gl/NAOOOI. provided id", q3.s(str));
             }
             return false;
-        } else if (da.b() && this.a.h.o(p.f1186j0) && !TextUtils.isEmpty(str3)) {
+        } else if (da.b() && this.a.h.o(p.f1184j0) && !TextUtils.isEmpty(str3)) {
             return true;
         } else {
             if (!TextUtils.isEmpty(str2)) {
@@ -650,7 +650,7 @@ public final class t9 extends r5 {
             g().h.b("Name is required and can't be null. Type", str);
             return false;
         }
-        String[] strArr3 = f1195c;
+        String[] strArr3 = f1193c;
         int length = strArr3.length;
         int i = 0;
         while (true) {
@@ -783,7 +783,7 @@ public final class t9 extends r5 {
             if (!z3) {
                 return 21;
             }
-            if (!e0(str3, u5.f1202c)) {
+            if (!e0(str3, u5.f1200c)) {
                 return 20;
             }
             q7 x2 = this.a.x();
@@ -1110,6 +1110,6 @@ public final class t9 extends r5 {
         if ("_id".equals(str)) {
             return 256;
         }
-        return (!this.a.h.o(p.f1184h0) || !"_lgclid".equals(str)) ? 36 : 100;
+        return (!this.a.h.o(p.f1182h0) || !"_lgclid".equals(str)) ? 36 : 100;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/u3.java b/app/src/main/java/c/i/a/f/i/b/u3.java
index a6ac5aab9c..34caaeaae1 100644
--- a/app/src/main/java/c/i/a/f/i/b/u3.java
+++ b/app/src/main/java/c/i/a/f/i/b/u3.java
@@ -14,7 +14,7 @@ public final class u3 {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f1196c;
+    public long f1194c;
     @NonNull
     public Bundle d;
 
@@ -22,7 +22,7 @@ public final class u3 {
         this.a = str;
         this.b = str2;
         this.d = bundle;
-        this.f1196c = j;
+        this.f1194c = j;
     }
 
     public static u3 b(zzaq zzaq) {
@@ -30,7 +30,7 @@ public final class u3 {
     }
 
     public final zzaq a() {
-        return new zzaq(this.a, new zzap(new Bundle(this.d)), this.b, this.f1196c);
+        return new zzaq(this.a, new zzap(new Bundle(this.d)), this.b, this.f1194c);
     }
 
     public final String toString() {
diff --git a/app/src/main/java/c/i/a/f/i/b/u4.java b/app/src/main/java/c/i/a/f/i/b/u4.java
index 203f1cdcf4..72610c6172 100644
--- a/app/src/main/java/c/i/a/f/i/b/u4.java
+++ b/app/src/main/java/c/i/a/f/i/b/u4.java
@@ -35,7 +35,7 @@ public class u4 implements t5 {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1197c;
+    public final String f1195c;
     public final String d;
     public final String e;
     public final boolean f;
@@ -53,20 +53,20 @@ public class u4 implements t5 {
     public final a r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final d7 f1198s;
+    public final d7 f1196s;
     public m3 t;
     public q7 u;
     public j v;
     public n3 w;
 
     /* renamed from: x  reason: collision with root package name */
-    public m4 f1199x;
+    public m4 f1197x;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f1200y = false;
+    public boolean f1198y = false;
 
     /* renamed from: z  reason: collision with root package name */
-    public Boolean f1201z;
+    public Boolean f1199z;
 
     public u4(y5 y5Var) {
         Context context;
@@ -77,8 +77,8 @@ public class u4 implements t5 {
         this.g = gaVar;
         c.h = gaVar;
         this.b = context2;
-        this.f1197c = y5Var.b;
-        this.d = y5Var.f1206c;
+        this.f1195c = y5Var.b;
+        this.d = y5Var.f1204c;
         this.e = y5Var.d;
         this.f = y5Var.h;
         this.B = y5Var.e;
@@ -103,8 +103,8 @@ public class u4 implements t5 {
                 s2.b();
                 synchronized (c2.class) {
                     c2 c2Var = c2.a;
-                    if (!(c2Var == null || (context = c2Var.b) == null || c2Var.f1085c == null)) {
-                        context.getContentResolver().unregisterContentObserver(c2.a.f1085c);
+                    if (!(c2Var == null || (context = c2Var.b) == null || c2Var.f1083c == null)) {
+                        context.getContentResolver().unregisterContentObserver(c2.a.f1083c);
                     }
                     c2.a = null;
                 }
@@ -140,7 +140,7 @@ public class u4 implements t5 {
         this.l = w8Var;
         d7 d7Var = new d7(this);
         d7Var.p();
-        this.f1198s = d7Var;
+        this.f1196s = d7Var;
         r4 r4Var = new r4(this);
         r4Var.p();
         this.k = r4Var;
@@ -153,12 +153,12 @@ public class u4 implements t5 {
             c6 s2 = s();
             if (s2.a.b.getApplicationContext() instanceof Application) {
                 Application application = (Application) s2.a.b.getApplicationContext();
-                if (s2.f1142c == null) {
-                    s2.f1142c = new y6(s2, null);
+                if (s2.f1140c == null) {
+                    s2.f1140c = new y6(s2, null);
                 }
                 if (z3) {
-                    application.unregisterActivityLifecycleCallbacks(s2.f1142c);
-                    application.registerActivityLifecycleCallbacks(s2.f1142c);
+                    application.unregisterActivityLifecycleCallbacks(s2.f1140c);
+                    application.registerActivityLifecycleCallbacks(s2.f1140c);
                     s2.g().n.a("Registered activity lifecycle callback");
                 }
             }
@@ -315,20 +315,20 @@ public class u4 implements t5 {
      */
     @WorkerThread
     public final boolean m() {
-        if (this.f1200y) {
+        if (this.f1198y) {
             f().b();
-            Boolean bool = this.f1201z;
+            Boolean bool = this.f1199z;
             if (!(bool == null || this.A == 0)) {
                 if (!bool.booleanValue()) {
                     Objects.requireNonNull((d) this.o);
                 }
-                return this.f1201z.booleanValue();
+                return this.f1199z.booleanValue();
             }
             Objects.requireNonNull((d) this.o);
             this.A = SystemClock.elapsedRealtime();
             boolean z2 = false;
             Boolean valueOf = Boolean.valueOf(t().p0("android.permission.INTERNET") && t().p0("android.permission.ACCESS_NETWORK_STATE") && (c.i.a.f.e.p.b.a(this.b).c() || this.h.C() || (n4.a(this.b) && t9.U(this.b))));
-            this.f1201z = valueOf;
+            this.f1199z = valueOf;
             if (valueOf.booleanValue()) {
                 t9 t = t();
                 n3 z3 = z();
@@ -344,16 +344,16 @@ public class u4 implements t5 {
                     z6.t();
                 }
                 z2 = true;
-                this.f1201z = Boolean.valueOf(z2);
+                this.f1199z = Boolean.valueOf(z2);
             }
-            return this.f1201z.booleanValue();
+            return this.f1199z.booleanValue();
         }
         throw new IllegalStateException("AppMeasurement is not initialized");
     }
 
     public final d7 n() {
-        q(this.f1198s);
-        return this.f1198s;
+        q(this.f1196s);
+        return this.f1196s;
     }
 
     public final d4 o() {
@@ -382,7 +382,7 @@ public class u4 implements t5 {
     }
 
     public final boolean v() {
-        return TextUtils.isEmpty(this.f1197c);
+        return TextUtils.isEmpty(this.f1195c);
     }
 
     public final h7 w() {
diff --git a/app/src/main/java/c/i/a/f/i/b/u5.java b/app/src/main/java/c/i/a/f/i/b/u5.java
index 5948242032..b301cf2594 100644
--- a/app/src/main/java/c/i/a/f/i/b/u5.java
+++ b/app/src/main/java/c/i/a/f/i/b/u5.java
@@ -5,6 +5,6 @@ public final class u5 {
     public static final String[] b = {"_c", "_et", "_xt", "_aeid", "_ai", "_err", "_ev", "_el", "_o", "_sn", "_sc", "_si", "_pn", "_pc", "_pi", "_mst", "_ndt", "_nmid", "_nmn", "_nmt", "_nmtid", "_nmc", "_pv", "_po", "_nt", "_uwa", "_pfo", "_sys", "_sysu", "_pin", "_eid", "_epc", "_gn", "_ll", "_i", "_en", "_cis", "_cc", "_dac", "_sno", "_sid", "_cer", "_aib", "_ffr", "_c", "_err", "_ev", "_el", "_o", "_sn", "_sc", "_si", "_pn", "_pc", "_pi", "_sno", "_sid"};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String[] f1202c = {"items"};
+    public static final String[] f1200c = {"items"};
     public static final String[] d = {"affiliation", "coupon", "creative_name", "creative_slot", "currency", "discount", "index", "item_id", "item_brand", "item_category", "item_category2", "item_category3", "item_category4", "item_category5", "item_list_name", "item_list_id", "item_name", "item_variant", "location_id", "payment_type", "price", "promotion_id", "promotion_name", "quantity", "shipping", "shipping_tier", "tax", "transaction_id", "value", "item_list", "checkout_step", "checkout_option", "item_location_id"};
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/u7.java b/app/src/main/java/c/i/a/f/i/b/u7.java
index a3e9338500..39ab32a06d 100644
--- a/app/src/main/java/c/i/a/f/i/b/u7.java
+++ b/app/src/main/java/c/i/a/f/i/b/u7.java
@@ -28,13 +28,13 @@ public final class u7 implements Runnable {
                     this.k.e().M(this.j, null);
                     return;
                 }
-                String z2 = i3Var.z(this.i);
-                if (z2 != null) {
-                    this.k.n().g.set(z2);
-                    this.k.l().m.b(z2);
+                String A = i3Var.A(this.i);
+                if (A != null) {
+                    this.k.n().g.set(A);
+                    this.k.l().m.b(A);
                 }
                 this.k.F();
-                this.k.e().M(this.j, z2);
+                this.k.e().M(this.j, A);
                 return;
             }
             this.k.g().k.a("Analytics storage consent denied; will not get app instance id");
diff --git a/app/src/main/java/c/i/a/f/i/b/u9.java b/app/src/main/java/c/i/a/f/i/b/u9.java
index a05af22667..d5f91a4380 100644
--- a/app/src/main/java/c/i/a/f/i/b/u9.java
+++ b/app/src/main/java/c/i/a/f/i/b/u9.java
@@ -8,7 +8,7 @@ public final class u9 {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1203c;
+    public final String f1201c;
     public final long d;
     public final Object e;
 
@@ -18,7 +18,7 @@ public final class u9 {
         Objects.requireNonNull(obj, "null reference");
         this.a = str;
         this.b = str2;
-        this.f1203c = str3;
+        this.f1201c = str3;
         this.d = j;
         this.e = obj;
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/v5.java b/app/src/main/java/c/i/a/f/i/b/v5.java
index 4502b6b8f1..84fb03ff48 100644
--- a/app/src/main/java/c/i/a/f/i/b/v5.java
+++ b/app/src/main/java/c/i/a/f/i/b/v5.java
@@ -7,10 +7,10 @@ public final class v5 {
     public static final String[] b = {"ad_impression"};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String[] f1204c = {"_aa", "_ac", "_xa", "_aq", "_ar", "_xu", "_ab", "_cd", "_ae", "_ui", "app_store_refund", "app_store_subscription_cancel", "app_store_subscription_convert", "app_store_subscription_renew", "_ug", "_au", "dynamic_link_app_open", "dynamic_link_app_update", "dynamic_link_first_open", "_cmp", "_err", "_f", "_v", "_iap", "_nd", "_nf", "_no", "_nr", "_ou", "_s", "_ssr", "_e", "_ai", "_vs", "_ep", "_cmp"};
+    public static final String[] f1202c = {"_aa", "_ac", "_xa", "_aq", "_ar", "_xu", "_ab", "_cd", "_ae", "_ui", "app_store_refund", "app_store_subscription_cancel", "app_store_subscription_convert", "app_store_subscription_renew", "_ug", "_au", "dynamic_link_app_open", "dynamic_link_app_update", "dynamic_link_first_open", "_cmp", "_err", "_f", "_v", "_iap", "_nd", "_nf", "_no", "_nr", "_ou", "_s", "_ssr", "_e", "_ai", "_vs", "_ep", "_cmp"};
     public static final String[] d = {"purchase", "refund", "add_payment_info", "add_shipping_info", "add_to_cart", "add_to_wishlist", "begin_checkout", "remove_from_cart", "select_item", "select_promotion", "view_cart", "view_item", "view_item_list", "view_promotion", "ecommerce_purchase", "purchase_refund", "set_checkout_option", "checkout_progress", "select_content", "view_search_results"};
 
     public static String a(String str) {
-        return c.J0(str, f1204c, a);
+        return c.J0(str, f1202c, a);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/v6.java b/app/src/main/java/c/i/a/f/i/b/v6.java
index a00da42dab..52f0e6caf0 100644
--- a/app/src/main/java/c/i/a/f/i/b/v6.java
+++ b/app/src/main/java/c/i/a/f/i/b/v6.java
@@ -20,7 +20,7 @@ public final class v6 implements Runnable {
                 c cVar = c6Var.a.h;
                 n3 o = c6Var.o();
                 o.t();
-                atomicReference.set(Double.valueOf(cVar.r(o.f1174c, p.O)));
+                atomicReference.set(Double.valueOf(cVar.r(o.f1172c, p.O)));
                 this.i.notify();
             } catch (Throwable th) {
                 this.i.notify();
diff --git a/app/src/main/java/c/i/a/f/i/b/v7.java b/app/src/main/java/c/i/a/f/i/b/v7.java
index 48fbbd4fde..ecb8ff18d1 100644
--- a/app/src/main/java/c/i/a/f/i/b/v7.java
+++ b/app/src/main/java/c/i/a/f/i/b/v7.java
@@ -28,7 +28,7 @@ public final class v7 implements Runnable {
                         this.i.notify();
                         return;
                     }
-                    this.i.set(i3Var.z(this.j));
+                    this.i.set(i3Var.A(this.j));
                     String str = (String) this.i.get();
                     if (str != null) {
                         this.k.n().g.set(str);
diff --git a/app/src/main/java/c/i/a/f/i/b/v8.java b/app/src/main/java/c/i/a/f/i/b/v8.java
index b5343d9a54..ad194b0f02 100644
--- a/app/src/main/java/c/i/a/f/i/b/v8.java
+++ b/app/src/main/java/c/i/a/f/i/b/v8.java
@@ -20,10 +20,10 @@ public final class v8 implements Runnable {
         w8Var.x();
         w8Var.g().n.b("Activity resumed, time", Long.valueOf(j));
         if (w8Var.a.h.o(p.v0)) {
-            if (w8Var.a.h.z().booleanValue() || w8Var.l().f1147x.b()) {
+            if (w8Var.a.h.z().booleanValue() || w8Var.l().f1145x.b()) {
                 d9 d9Var = w8Var.e;
                 d9Var.d.b();
-                d9Var.f1150c.c();
+                d9Var.f1148c.c();
                 d9Var.a = j;
                 d9Var.b = j;
             }
@@ -33,7 +33,7 @@ public final class v8 implements Runnable {
             if (w8Var.a.h.z().booleanValue()) {
                 d9 d9Var2 = w8Var.e;
                 d9Var2.d.b();
-                d9Var2.f1150c.c();
+                d9Var2.f1148c.c();
                 d9Var2.a = j;
                 d9Var2.b = j;
             }
@@ -42,7 +42,7 @@ public final class v8 implements Runnable {
         f9Var.a.b();
         if (f9Var.a.a.d()) {
             if (!f9Var.a.a.h.o(p.v0)) {
-                f9Var.a.l().f1147x.a(false);
+                f9Var.a.l().f1145x.a(false);
             }
             Objects.requireNonNull((d) f9Var.a.a.o);
             f9Var.b(System.currentTimeMillis(), false);
diff --git a/app/src/main/java/c/i/a/f/i/b/w4.java b/app/src/main/java/c/i/a/f/i/b/w4.java
index dcacd2c6ab..b0e719a03f 100644
--- a/app/src/main/java/c/i/a/f/i/b/w4.java
+++ b/app/src/main/java/c/i/a/f/i/b/w4.java
@@ -52,7 +52,7 @@ public final class w4 implements Runnable {
         u4Var.u = q7Var;
         u4Var.m.q();
         u4Var.i.q();
-        u4Var.f1199x = new m4(u4Var);
+        u4Var.f1197x = new m4(u4Var);
         n3 n3Var2 = u4Var.w;
         if (!n3Var2.b) {
             n3Var2.w();
@@ -62,8 +62,8 @@ public final class w4 implements Runnable {
             u4Var.g().l.b("App measurement initialized, version", 33025L);
             u4Var.g().l.a("To enable debug logging run: adb shell setprop log.tag.FA VERBOSE");
             n3Var.t();
-            String str2 = n3Var.f1174c;
-            if (TextUtils.isEmpty(u4Var.f1197c)) {
+            String str2 = n3Var.f1172c;
+            if (TextUtils.isEmpty(u4Var.f1195c)) {
                 if (u4Var.t().s0(str2)) {
                     s3Var = u4Var.g().l;
                     str = "Faster debug mode event logging enabled. To disable, run:\n  adb shell setprop debug.firebase.analytics.app .none.";
@@ -79,7 +79,7 @@ public final class w4 implements Runnable {
             if (u4Var.F != u4Var.G.get()) {
                 u4Var.g().f.c("Not all components initialized", Integer.valueOf(u4Var.F), Integer.valueOf(u4Var.G.get()));
             }
-            u4Var.f1200y = true;
+            u4Var.f1198y = true;
             u4 u4Var2 = this.j;
             zzae zzae = this.i.g;
             u4Var2.f().b();
diff --git a/app/src/main/java/c/i/a/f/i/b/w7.java b/app/src/main/java/c/i/a/f/i/b/w7.java
index 10e034f01b..765c149897 100644
--- a/app/src/main/java/c/i/a/f/i/b/w7.java
+++ b/app/src/main/java/c/i/a/f/i/b/w7.java
@@ -22,9 +22,9 @@ public final class w7 implements Runnable {
         try {
             i7 i7Var = this.i;
             if (i7Var == null) {
-                i3Var.E(0, null, null, q7Var.a.b.getPackageName());
+                i3Var.F(0, null, null, q7Var.a.b.getPackageName());
             } else {
-                i3Var.E(i7Var.f1159c, i7Var.a, i7Var.b, q7Var.a.b.getPackageName());
+                i3Var.F(i7Var.f1157c, i7Var.a, i7Var.b, q7Var.a.b.getPackageName());
             }
             this.j.F();
         } catch (RemoteException e) {
diff --git a/app/src/main/java/c/i/a/f/i/b/w8.java b/app/src/main/java/c/i/a/f/i/b/w8.java
index 1730d90a2d..c0d47eecdf 100644
--- a/app/src/main/java/c/i/a/f/i/b/w8.java
+++ b/app/src/main/java/c/i/a/f/i/b/w8.java
@@ -8,7 +8,7 @@ import c.i.a.f.h.l.bc;
 public final class w8 extends a5 {
 
     /* renamed from: c  reason: collision with root package name */
-    public Handler f1205c;
+    public Handler f1203c;
     public final f9 d = new f9(this);
     public final d9 e = new d9(this);
     public final x8 f = new x8(this);
@@ -29,8 +29,8 @@ public final class w8 extends a5 {
     @WorkerThread
     public final void x() {
         b();
-        if (this.f1205c == null) {
-            this.f1205c = new bc(Looper.getMainLooper());
+        if (this.f1203c == null) {
+            this.f1203c = new bc(Looper.getMainLooper());
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/x.java b/app/src/main/java/c/i/a/f/i/b/x.java
index 15f1b43656..f926622c12 100644
--- a/app/src/main/java/c/i/a/f/i/b/x.java
+++ b/app/src/main/java/c/i/a/f/i/b/x.java
@@ -20,12 +20,12 @@ public final class x implements Runnable {
         long j = this.j;
         aVar.b();
         AnimatableValueParser.w(str);
-        Integer num = aVar.f1134c.get(str);
+        Integer num = aVar.f1132c.get(str);
         if (num != null) {
             i7 w = aVar.q().w(false);
             int intValue = num.intValue() - 1;
             if (intValue == 0) {
-                aVar.f1134c.remove(str);
+                aVar.f1132c.remove(str);
                 Long l = aVar.b.get(str);
                 if (l == null) {
                     aVar.g().f.a("First ad unit exposure time was never set");
@@ -33,7 +33,7 @@ public final class x implements Runnable {
                     aVar.b.remove(str);
                     aVar.w(str, j - l.longValue(), w);
                 }
-                if (aVar.f1134c.isEmpty()) {
+                if (aVar.f1132c.isEmpty()) {
                     long j2 = aVar.d;
                     if (j2 == 0) {
                         aVar.g().f.a("First ad exposure time was never set");
@@ -45,7 +45,7 @@ public final class x implements Runnable {
                 }
                 return;
             }
-            aVar.f1134c.put(str, Integer.valueOf(intValue));
+            aVar.f1132c.put(str, Integer.valueOf(intValue));
             return;
         }
         aVar.g().f.b("Call to endAdUnitExposure for unknown ad unit id", str);
diff --git a/app/src/main/java/c/i/a/f/i/b/x7.java b/app/src/main/java/c/i/a/f/i/b/x7.java
index ef2f0db438..94f9070dc3 100644
--- a/app/src/main/java/c/i/a/f/i/b/x7.java
+++ b/app/src/main/java/c/i/a/f/i/b/x7.java
@@ -21,7 +21,7 @@ public final class x7 implements Runnable {
             return;
         }
         try {
-            i3Var.S(this.i);
+            i3Var.T(this.i);
             this.j.r().z();
             this.j.w(i3Var, null, this.i);
             this.j.F();
diff --git a/app/src/main/java/c/i/a/f/i/b/x8.java b/app/src/main/java/c/i/a/f/i/b/x8.java
index f086125d3d..fe925ddbe8 100644
--- a/app/src/main/java/c/i/a/f/i/b/x8.java
+++ b/app/src/main/java/c/i/a/f/i/b/x8.java
@@ -15,10 +15,10 @@ public final class x8 {
         this.b.b();
         b9 b9Var = this.a;
         if (b9Var != null) {
-            this.b.f1205c.removeCallbacks(b9Var);
+            this.b.f1203c.removeCallbacks(b9Var);
         }
         if (this.b.a.h.o(p.v0)) {
-            this.b.l().f1147x.a(false);
+            this.b.l().f1145x.a(false);
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/y0.java b/app/src/main/java/c/i/a/f/i/b/y0.java
index 8781122908..ef62084287 100644
--- a/app/src/main/java/c/i/a/f/i/b/y0.java
+++ b/app/src/main/java/c/i/a/f/i/b/y0.java
@@ -20,16 +20,16 @@ public final class y0 implements Runnable {
         long j = this.j;
         aVar.b();
         AnimatableValueParser.w(str);
-        if (aVar.f1134c.isEmpty()) {
+        if (aVar.f1132c.isEmpty()) {
             aVar.d = j;
         }
-        Integer num = aVar.f1134c.get(str);
+        Integer num = aVar.f1132c.get(str);
         if (num != null) {
-            aVar.f1134c.put(str, Integer.valueOf(num.intValue() + 1));
-        } else if (aVar.f1134c.size() >= 100) {
+            aVar.f1132c.put(str, Integer.valueOf(num.intValue() + 1));
+        } else if (aVar.f1132c.size() >= 100) {
             aVar.g().i.a("Too many ads visible");
         } else {
-            aVar.f1134c.put(str, 1);
+            aVar.f1132c.put(str, 1);
             aVar.b.put(str, Long.valueOf(j));
         }
     }
diff --git a/app/src/main/java/c/i/a/f/i/b/y5.java b/app/src/main/java/c/i/a/f/i/b/y5.java
index 7034b17f3a..cb0dd7a941 100644
--- a/app/src/main/java/c/i/a/f/i/b/y5.java
+++ b/app/src/main/java/c/i/a/f/i/b/y5.java
@@ -10,7 +10,7 @@ public final class y5 {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1206c;
+    public String f1204c;
     public String d;
     public Boolean e;
     public long f;
@@ -26,7 +26,7 @@ public final class y5 {
         if (zzae != null) {
             this.g = zzae;
             this.b = zzae.n;
-            this.f1206c = zzae.m;
+            this.f1204c = zzae.m;
             this.d = zzae.l;
             this.h = zzae.k;
             this.f = zzae.j;
diff --git a/app/src/main/java/c/i/a/f/i/b/y6.java b/app/src/main/java/c/i/a/f/i/b/y6.java
index 73731d9d0f..02c6258232 100644
--- a/app/src/main/java/c/i/a/f/i/b/y6.java
+++ b/app/src/main/java/c/i/a/f/i/b/y6.java
@@ -69,11 +69,11 @@ public final class y6 implements Application.ActivityLifecycleCallbacks {
         long elapsedRealtime = SystemClock.elapsedRealtime();
         if (!q.a.h.o(p.u0) || q.a.h.z().booleanValue()) {
             i7 E = q.E(activity);
-            q.d = q.f1156c;
-            q.f1156c = null;
+            q.d = q.f1154c;
+            q.f1154c = null;
             q.f().v(new o7(q, E, elapsedRealtime));
         } else {
-            q.f1156c = null;
+            q.f1154c = null;
             q.f().v(new l7(q, elapsedRealtime));
         }
         w8 s2 = this.i.s();
@@ -110,7 +110,7 @@ public final class y6 implements Application.ActivityLifecycleCallbacks {
             m.f().v(new a3(m, SystemClock.elapsedRealtime()));
             return;
         }
-        q.f1156c = q.i;
+        q.f1154c = q.i;
         q.f().v(new m7(q));
     }
 
@@ -120,7 +120,7 @@ public final class y6 implements Application.ActivityLifecycleCallbacks {
         h7 q = this.i.q();
         if (q.a.h.z().booleanValue() && bundle != null && (i7Var = q.f.get(activity)) != null) {
             Bundle bundle2 = new Bundle();
-            bundle2.putLong("id", i7Var.f1159c);
+            bundle2.putLong("id", i7Var.f1157c);
             bundle2.putString("name", i7Var.a);
             bundle2.putString("referrer_name", i7Var.b);
             bundle.putBundle("com.google.app_measurement.screen_service", bundle2);
diff --git a/app/src/main/java/c/i/a/f/i/b/y8.java b/app/src/main/java/c/i/a/f/i/b/y8.java
index f346fcae84..1fc001d700 100644
--- a/app/src/main/java/c/i/a/f/i/b/y8.java
+++ b/app/src/main/java/c/i/a/f/i/b/y8.java
@@ -23,13 +23,13 @@ public final class y8 implements Runnable {
         Objects.requireNonNull((d) x8Var.b.a.o);
         b9 b9Var = new b9(x8Var, System.currentTimeMillis(), j);
         x8Var.a = b9Var;
-        x8Var.b.f1205c.postDelayed(b9Var, 2000);
+        x8Var.b.f1203c.postDelayed(b9Var, 2000);
         if (w8Var.a.h.z().booleanValue()) {
-            w8Var.e.f1150c.c();
+            w8Var.e.f1148c.c();
         }
         f9 f9Var = w8Var.d;
         if (!f9Var.a.a.h.o(p.v0)) {
-            f9Var.a.l().f1147x.a(true);
+            f9Var.a.l().f1145x.a(true);
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/z4.java b/app/src/main/java/c/i/a/f/i/b/z4.java
index 76a3f2c5dd..a42786e34f 100644
--- a/app/src/main/java/c/i/a/f/i/b/z4.java
+++ b/app/src/main/java/c/i/a/f/i/b/z4.java
@@ -33,7 +33,7 @@ public final class z4 extends l3 {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1207c = null;
+    public String f1205c = null;
 
     public z4(k9 k9Var) {
         Objects.requireNonNull(k9Var, "null reference");
@@ -42,20 +42,33 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final void E(long j, String str, String str2, String str3) {
+    public final String A(zzn zzn) {
+        z0(zzn);
+        k9 k9Var = this.a;
+        try {
+            return (String) ((FutureTask) k9Var.k.f().t(new o9(k9Var, zzn))).get(30000, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            k9Var.k.g().f.c("Failed to get app instance id. appId", q3.s(zzn.i), e);
+            return null;
+        }
+    }
+
+    @Override // c.i.a.f.i.b.i3
+    @BinderThread
+    public final void F(long j, String str, String str2, String str3) {
         h(new p5(this, str2, str3, str, j));
     }
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final void F(zzn zzn) {
+    public final void G(zzn zzn) {
         y0(zzn.i, false);
         h(new h5(this, zzn));
     }
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final List<zzz> G(String str, String str2, String str3) {
+    public final List<zzz> H(String str, String str2, String str3) {
         y0(str, true);
         try {
             return (List) ((FutureTask) this.a.f().t(new i5(this, str, str2, str3))).get();
@@ -67,7 +80,7 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final List<zzz> H(String str, String str2, zzn zzn) {
+    public final List<zzz> I(String str, String str2, zzn zzn) {
         z0(zzn);
         try {
             return (List) ((FutureTask) this.a.f().t(new f5(this, zzn, str, str2))).get();
@@ -79,13 +92,13 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final List<zzku> P(String str, String str2, boolean z2, zzn zzn) {
+    public final List<zzku> Q(String str, String str2, boolean z2, zzn zzn) {
         z0(zzn);
         try {
             List<u9> list = (List) ((FutureTask) this.a.f().t(new d5(this, zzn, str, str2))).get();
             ArrayList arrayList = new ArrayList(list.size());
             for (u9 u9Var : list) {
-                if (z2 || !t9.r0(u9Var.f1203c)) {
+                if (z2 || !t9.r0(u9Var.f1201c)) {
                     arrayList.add(new zzku(u9Var));
                 }
             }
@@ -98,7 +111,7 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final void S(zzn zzn) {
+    public final void T(zzn zzn) {
         z0(zzn);
         h(new q5(this, zzn));
     }
@@ -128,7 +141,7 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final byte[] i(zzaq zzaq, String str) {
+    public final byte[] j(zzaq zzaq, String str) {
         AnimatableValueParser.w(str);
         Objects.requireNonNull(zzaq, "null reference");
         y0(str, true);
@@ -161,7 +174,7 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final void l(zzn zzn) {
+    public final void m(zzn zzn) {
         if (t8.b() && this.a.k.h.o(p.J0)) {
             AnimatableValueParser.w(zzn.i);
             Objects.requireNonNull(zzn.E, "null reference");
@@ -193,13 +206,13 @@ public final class z4 extends l3 {
 
     @Override // c.i.a.f.i.b.i3
     @BinderThread
-    public final List<zzku> t(String str, String str2, String str3, boolean z2) {
+    public final List<zzku> u(String str, String str2, String str3, boolean z2) {
         y0(str, true);
         try {
             List<u9> list = (List) ((FutureTask) this.a.f().t(new g5(this, str, str2, str3))).get();
             ArrayList arrayList = new ArrayList(list.size());
             for (u9 u9Var : list) {
-                if (z2 || !t9.r0(u9Var.f1203c)) {
+                if (z2 || !t9.r0(u9Var.f1201c)) {
                     arrayList.add(new zzku(u9Var));
                 }
             }
@@ -236,7 +249,7 @@ public final class z4 extends l3 {
             if (z2) {
                 try {
                     if (this.b == null) {
-                        if (!"com.google.android.gms".equals(this.f1207c) && !c.S(this.a.k.b, Binder.getCallingUid())) {
+                        if (!"com.google.android.gms".equals(this.f1205c) && !c.S(this.a.k.b, Binder.getCallingUid())) {
                             if (!f.a(this.a.k.b).b(Binder.getCallingUid())) {
                                 z3 = false;
                                 this.b = Boolean.valueOf(z3);
@@ -253,15 +266,15 @@ public final class z4 extends l3 {
                     throw e;
                 }
             }
-            if (this.f1207c == null) {
+            if (this.f1205c == null) {
                 Context context = this.a.k.b;
                 int callingUid = Binder.getCallingUid();
                 boolean z4 = e.a;
                 if (c.n0(context, callingUid, str)) {
-                    this.f1207c = str;
+                    this.f1205c = str;
                 }
             }
-            if (!str.equals(this.f1207c)) {
+            if (!str.equals(this.f1205c)) {
                 throw new SecurityException(String.format("Unknown calling package name '%s'.", str));
             }
             return;
@@ -270,23 +283,10 @@ public final class z4 extends l3 {
         throw new SecurityException("Measurement Service called without app package");
     }
 
-    @Override // c.i.a.f.i.b.i3
-    @BinderThread
-    public final String z(zzn zzn) {
-        z0(zzn);
-        k9 k9Var = this.a;
-        try {
-            return (String) ((FutureTask) k9Var.k.f().t(new o9(k9Var, zzn))).get(30000, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            k9Var.k.g().f.c("Failed to get app instance id. appId", q3.s(zzn.i), e);
-            return null;
-        }
-    }
-
     @BinderThread
     public final void z0(zzn zzn) {
         Objects.requireNonNull(zzn, "null reference");
         y0(zzn.i, false);
-        this.a.k.t().c0(zzn.j, zzn.f2289z, zzn.D);
+        this.a.k.t().c0(zzn.j, zzn.f2295z, zzn.D);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/i/b/z9.java b/app/src/main/java/c/i/a/f/i/b/z9.java
index d6ec1cc4b2..db9f2f963e 100644
--- a/app/src/main/java/c/i/a/f/i/b/z9.java
+++ b/app/src/main/java/c/i/a/f/i/b/z9.java
@@ -10,7 +10,7 @@ public final class z9 implements Parcelable.Creator<zzn> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzn createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         long j = 0;
         long j2 = 0;
         long j3 = 0;
@@ -34,7 +34,7 @@ public final class z9 implements Parcelable.Creator<zzn> {
         boolean z4 = true;
         boolean z5 = true;
         boolean z6 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 2:
@@ -50,55 +50,55 @@ public final class z9 implements Parcelable.Creator<zzn> {
                     str4 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 6:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 7:
-                    j2 = AnimatableValueParser.f2(parcel, readInt);
+                    j2 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 8:
                     str5 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 9:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 10:
-                    z3 = AnimatableValueParser.c2(parcel, readInt);
+                    z3 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 11:
-                    j6 = AnimatableValueParser.f2(parcel, readInt);
+                    j6 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 12:
                     str6 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 13:
-                    j3 = AnimatableValueParser.f2(parcel, readInt);
+                    j3 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 14:
-                    j4 = AnimatableValueParser.f2(parcel, readInt);
+                    j4 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 15:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 16:
-                    z4 = AnimatableValueParser.c2(parcel, readInt);
+                    z4 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 17:
-                    z5 = AnimatableValueParser.c2(parcel, readInt);
+                    z5 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 18:
-                    z6 = AnimatableValueParser.c2(parcel, readInt);
+                    z6 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 19:
                     str7 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 20:
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
                 case 21:
-                    int k2 = AnimatableValueParser.k2(parcel, readInt);
-                    if (k2 != 0) {
-                        AnimatableValueParser.X2(parcel, k2, 4);
+                    int m2 = AnimatableValueParser.m2(parcel, readInt);
+                    if (m2 != 0) {
+                        AnimatableValueParser.Z2(parcel, m2, 4);
                         bool = Boolean.valueOf(parcel.readInt() != 0);
                         break;
                     } else {
@@ -106,7 +106,7 @@ public final class z9 implements Parcelable.Creator<zzn> {
                         break;
                     }
                 case 22:
-                    j5 = AnimatableValueParser.f2(parcel, readInt);
+                    j5 = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 23:
                     arrayList = AnimatableValueParser.V(parcel, readInt);
@@ -119,7 +119,7 @@ public final class z9 implements Parcelable.Creator<zzn> {
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzn(str, str2, str3, str4, j, j2, str5, z2, z3, j6, str6, j3, j4, i, z4, z5, z6, str7, bool, j5, arrayList, str8, str9);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/a.java b/app/src/main/java/c/i/a/f/j/a.java
index 47d5e76695..d97115d0e6 100644
--- a/app/src/main/java/c/i/a/f/j/a.java
+++ b/app/src/main/java/c/i/a/f/j/a.java
@@ -109,7 +109,7 @@ public final class a {
             str = str2;
         }
         if (str != null && !str.equals("")) {
-            if (p.f1133c.matcher(str).matches()) {
+            if (p.f1131c.matcher(str).matches()) {
                 bool4 = Boolean.TRUE;
             } else if (p.d.matcher(str).matches()) {
                 bool = Boolean.FALSE;
diff --git a/app/src/main/java/c/i/a/f/j/b/e/b.java b/app/src/main/java/c/i/a/f/j/b/e/b.java
index 7cc18efcd1..9773f4187c 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/b.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/b.java
@@ -15,7 +15,7 @@ public abstract class b extends c.i.a.f.h.m.b implements a {
             return false;
         }
         s sVar = (s) this;
-        sVar.d.b(sVar.f1211c.f1042c);
+        sVar.d.b(sVar.f1209c.f1042c);
         k<d> kVar = sVar.b;
         if (kVar != null) {
             kVar.a(d0.a);
diff --git a/app/src/main/java/c/i/a/f/j/b/e/d.java b/app/src/main/java/c/i/a/f/j/b/e/d.java
index 1bb19ddde9..dccbedd345 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/d.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/d.java
@@ -8,11 +8,11 @@ public final class d implements Parcelable.Creator<zzad> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzad createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
@@ -20,12 +20,12 @@ public final class d implements Parcelable.Creator<zzad> {
             } else if (i2 == 2) {
                 str2 = AnimatableValueParser.T(parcel, readInt);
             } else if (i2 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzad(i, str, str2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/e.java b/app/src/main/java/c/i/a/f/j/b/e/e.java
index 71fd5f5ea7..4c79d78991 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/e.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/e.java
@@ -9,21 +9,21 @@ public final class e implements Parcelable.Creator<zzaf> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzaf createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         Message message = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
                 message = (Message) AnimatableValueParser.S(parcel, readInt, Message.CREATOR);
             } else if (i2 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzaf(i, message);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/f.java b/app/src/main/java/c/i/a/f/j/b/e/f.java
index 7c19d86898..e62250de1f 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/f.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/f.java
@@ -47,7 +47,7 @@ public final class f extends d<u0> {
         }
     }
 
-    public final void G(int i) throws RemoteException {
+    public final void F(int i) throws RemoteException {
         String str;
         if (i == 1) {
             str = "ACTIVITY_STOPPED";
@@ -64,7 +64,7 @@ public final class f extends d<u0> {
             if (Log.isLoggable("NearbyMessagesClient", 3)) {
                 Log.d("NearbyMessagesClient", String.format("Emitting client lifecycle event %s", str));
             }
-            w().l0(zzj);
+            v().l0(zzj);
         } else if (Log.isLoggable("NearbyMessagesClient", 3)) {
             Log.d("NearbyMessagesClient", String.format("Failed to emit client lifecycle event %s due to GmsClient being disconnected", str));
         }
@@ -73,7 +73,7 @@ public final class f extends d<u0> {
     @Override // c.i.a.f.e.k.b, c.i.a.f.e.h.a.f
     public final void h() {
         try {
-            G(2);
+            F(2);
         } catch (RemoteException e) {
             if (Log.isLoggable("NearbyMessagesClient", 2)) {
                 Log.v("NearbyMessagesClient", String.format("Failed to emit CLIENT_DISCONNECTED from override of GmsClient#disconnect(): %s", e));
@@ -104,7 +104,7 @@ public final class f extends d<u0> {
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final Bundle u() {
+    public final Bundle t() {
         Bundle bundle = new Bundle();
         bundle.putInt("NearbyPermissions", this.C);
         bundle.putParcelable("ClientAppContext", this.B);
@@ -113,13 +113,13 @@ public final class f extends d<u0> {
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final String x() {
+    public final String w() {
         return "com.google.android.gms.nearby.messages.internal.INearbyMessagesService";
     }
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final String y() {
+    public final String x() {
         return "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/f0.java b/app/src/main/java/c/i/a/f/j/b/e/f0.java
index 4bfc632c09..7ee835cb8a 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/f0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/f0.java
@@ -12,7 +12,7 @@ public final class f0 implements Parcelable.Creator<zzbz> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzbz createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         zzaf zzaf = null;
         Strategy strategy = null;
         IBinder iBinder = null;
@@ -24,11 +24,11 @@ public final class f0 implements Parcelable.Creator<zzbz> {
         boolean z2 = false;
         boolean z3 = false;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
                     zzaf = (zzaf) AnimatableValueParser.S(parcel, readInt, zzaf.CREATOR);
@@ -37,7 +37,7 @@ public final class f0 implements Parcelable.Creator<zzbz> {
                     strategy = (Strategy) AnimatableValueParser.S(parcel, readInt, Strategy.CREATOR);
                     break;
                 case 4:
-                    iBinder = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 5:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -46,26 +46,26 @@ public final class f0 implements Parcelable.Creator<zzbz> {
                     str2 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 7:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 8:
-                    iBinder2 = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder2 = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 9:
-                    z3 = AnimatableValueParser.c2(parcel, readInt);
+                    z3 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 10:
                     clientAppContext = (ClientAppContext) AnimatableValueParser.S(parcel, readInt, ClientAppContext.CREATOR);
                     break;
                 case 11:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzbz(i, zzaf, strategy, iBinder, str, str2, z2, iBinder2, z3, clientAppContext, i2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/g0.java b/app/src/main/java/c/i/a/f/j/b/e/g0.java
index 638e7faa84..2065f18bc0 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/g0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/g0.java
@@ -10,27 +10,27 @@ public final class g0 implements Parcelable.Creator<zzcb> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzcb createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         IBinder iBinder = null;
         IBinder iBinder2 = null;
         String str = null;
         ClientAppContext clientAppContext = null;
         int i = 0;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
-                    iBinder = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 3:
-                    iBinder2 = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder2 = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 4:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 5:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -39,11 +39,11 @@ public final class g0 implements Parcelable.Creator<zzcb> {
                     clientAppContext = (ClientAppContext) AnimatableValueParser.S(parcel, readInt, ClientAppContext.CREATOR);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzcb(i, iBinder, iBinder2, z2, str, clientAppContext);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/h.java b/app/src/main/java/c/i/a/f/j/b/e/h.java
index 99db85f5b4..f3a47f21d2 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/h.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/h.java
@@ -50,7 +50,7 @@ public final class h implements Application.ActivityLifecycleCallbacks {
     public final void onActivityStopped(Activity activity) {
         if (activity == this.i) {
             try {
-                this.j.G(1);
+                this.j.F(1);
             } catch (RemoteException e) {
                 if (Log.isLoggable("NearbyMessagesClient", 2)) {
                     Log.v("NearbyMessagesClient", String.format("Failed to emit ACTIVITY_STOPPED from ClientLifecycleSafetyNet for Activity %s: %s", activity.getPackageName(), e));
diff --git a/app/src/main/java/c/i/a/f/j/b/e/h0.java b/app/src/main/java/c/i/a/f/j/b/e/h0.java
index a9bff53eec..e63cae8030 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/h0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/h0.java
@@ -13,7 +13,7 @@ public final class h0 implements Parcelable.Creator<SubscribeRequest> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final SubscribeRequest createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         IBinder iBinder = null;
         Strategy strategy = null;
         IBinder iBinder2 = null;
@@ -31,20 +31,20 @@ public final class h0 implements Parcelable.Creator<SubscribeRequest> {
         boolean z4 = false;
         int i3 = 0;
         int i4 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
-                    iBinder = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 3:
                     strategy = (Strategy) AnimatableValueParser.S(parcel, readInt, Strategy.CREATOR);
                     break;
                 case 4:
-                    iBinder2 = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder2 = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 5:
                     messageFilter = (MessageFilter) AnimatableValueParser.S(parcel, readInt, MessageFilter.CREATOR);
@@ -53,7 +53,7 @@ public final class h0 implements Parcelable.Creator<SubscribeRequest> {
                     pendingIntent = (PendingIntent) AnimatableValueParser.S(parcel, readInt, PendingIntent.CREATOR);
                     break;
                 case 7:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 8:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -65,32 +65,32 @@ public final class h0 implements Parcelable.Creator<SubscribeRequest> {
                     bArr = AnimatableValueParser.Q(parcel, readInt);
                     break;
                 case 11:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 12:
-                    iBinder3 = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder3 = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 13:
-                    z3 = AnimatableValueParser.c2(parcel, readInt);
+                    z3 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 14:
                     clientAppContext = (ClientAppContext) AnimatableValueParser.S(parcel, readInt, ClientAppContext.CREATOR);
                     break;
                 case 15:
-                    z4 = AnimatableValueParser.c2(parcel, readInt);
+                    z4 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 16:
-                    i3 = AnimatableValueParser.e2(parcel, readInt);
+                    i3 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 17:
-                    i4 = AnimatableValueParser.e2(parcel, readInt);
+                    i4 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new SubscribeRequest(i, iBinder, strategy, iBinder2, messageFilter, pendingIntent, i2, str, str2, bArr, z2, iBinder3, z3, clientAppContext, z4, i3, i4);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/i.java b/app/src/main/java/c/i/a/f/j/b/e/i.java
index 0da979026f..e0063a45a3 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/i.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/i.java
@@ -10,7 +10,7 @@ import c.i.a.f.e.h.j.c0;
 import c.i.a.f.e.h.j.d0;
 import c.i.a.f.e.h.j.g;
 import c.i.a.f.e.h.j.k;
-import c.i.a.f.e.h.j.n0;
+import c.i.a.f.e.h.j.l0;
 import c.i.a.f.e.k.c;
 import c.i.a.f.n.b0;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -68,7 +68,7 @@ public final class i extends MessagesClient {
     public final Task<Void> g(MessageListener messageListener, SubscribeOptions subscribeOptions) {
         AnimatableValueParser.p(subscribeOptions.a.r == 0, "Strategy.setBackgroundScanMode() is only supported by background subscribe (the version which takes a PendingIntent).");
         k m = m(messageListener);
-        return k(m, new l(this, m, new s(this, m(subscribeOptions.f2291c), m), subscribeOptions), new m(m));
+        return k(m, new l(this, m, new s(this, m(subscribeOptions.f2297c), m), subscribeOptions), new m(m));
     }
 
     @Override // com.google.android.gms.nearby.messages.MessagesClient
@@ -92,9 +92,9 @@ public final class i extends MessagesClient {
         Runnable runnable = c.i.a.f.e.h.k.i;
         Objects.requireNonNull(gVar);
         TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
-        n0 n0Var = new n0(new d0(vVar, xVar, runnable), taskCompletionSource);
+        l0 l0Var = new l0(new d0(vVar, xVar, runnable), taskCompletionSource);
         Handler handler = gVar.w;
-        handler.sendMessage(handler.obtainMessage(8, new c0(n0Var, gVar.r.get(), this)));
+        handler.sendMessage(handler.obtainMessage(8, new c0(l0Var, gVar.r.get(), this)));
         return taskCompletionSource.a;
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/i0.java b/app/src/main/java/c/i/a/f/j/b/e/i0.java
index 23240f62d0..507d8f1487 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/i0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/i0.java
@@ -11,7 +11,7 @@ public final class i0 implements Parcelable.Creator<zzce> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzce createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         zzaf zzaf = null;
         IBinder iBinder = null;
         String str = null;
@@ -19,17 +19,17 @@ public final class i0 implements Parcelable.Creator<zzce> {
         ClientAppContext clientAppContext = null;
         int i = 0;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
                     zzaf = (zzaf) AnimatableValueParser.S(parcel, readInt, zzaf.CREATOR);
                     break;
                 case 3:
-                    iBinder = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 4:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -38,17 +38,17 @@ public final class i0 implements Parcelable.Creator<zzce> {
                     str2 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 6:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 7:
                     clientAppContext = (ClientAppContext) AnimatableValueParser.S(parcel, readInt, ClientAppContext.CREATOR);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzce(i, zzaf, iBinder, str, str2, z2, clientAppContext);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/j.java b/app/src/main/java/c/i/a/f/j/b/e/j.java
index 66d76c0ad9..8910dbbb30 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/j.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/j.java
@@ -11,13 +11,13 @@ public final /* synthetic */ class j implements a0 {
     public final Message b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b0 f1208c;
+    public final b0 f1206c;
     public final PublishOptions d;
 
     public j(i iVar, Message message, b0 b0Var, PublishOptions publishOptions) {
         this.a = iVar;
         this.b = message;
-        this.f1208c = b0Var;
+        this.f1206c = b0Var;
         this.d = publishOptions;
     }
 
@@ -25,12 +25,12 @@ public final /* synthetic */ class j implements a0 {
     public final void a(f fVar, k kVar) {
         i iVar = this.a;
         Message message = this.b;
-        b0 b0Var = this.f1208c;
+        b0 b0Var = this.f1206c;
         PublishOptions publishOptions = this.d;
         Objects.requireNonNull(iVar);
         zzaf zzaf = new zzaf(1, message);
         int i = iVar.m;
         Objects.requireNonNull(fVar);
-        fVar.w().m(new zzbz(2, zzaf, publishOptions.a, new c.i.a.f.h.m.j(kVar), null, null, false, b0Var, false, null, i));
+        fVar.v().n(new zzbz(2, zzaf, publishOptions.a, new c.i.a.f.h.m.j(kVar), null, null, false, b0Var, false, null, i));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/j0.java b/app/src/main/java/c/i/a/f/j/b/e/j0.java
index 3897046082..b678dcd952 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/j0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/j0.java
@@ -11,7 +11,7 @@ public final class j0 implements Parcelable.Creator<zzcg> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzcg createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         IBinder iBinder = null;
         IBinder iBinder2 = null;
         PendingIntent pendingIntent = null;
@@ -21,23 +21,23 @@ public final class j0 implements Parcelable.Creator<zzcg> {
         int i = 0;
         int i2 = 0;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
-                    iBinder = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 3:
-                    iBinder2 = AnimatableValueParser.d2(parcel, readInt);
+                    iBinder2 = AnimatableValueParser.f2(parcel, readInt);
                     break;
                 case 4:
                     pendingIntent = (PendingIntent) AnimatableValueParser.S(parcel, readInt, PendingIntent.CREATOR);
                     break;
                 case 5:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 6:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -46,17 +46,17 @@ public final class j0 implements Parcelable.Creator<zzcg> {
                     str2 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 8:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 9:
                     clientAppContext = (ClientAppContext) AnimatableValueParser.S(parcel, readInt, ClientAppContext.CREATOR);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzcg(i, iBinder, iBinder2, pendingIntent, i2, str, str2, z2, clientAppContext);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/k.java b/app/src/main/java/c/i/a/f/j/b/e/k.java
index 363d438964..e8efaaf231 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/k.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/k.java
@@ -16,6 +16,6 @@ public final /* synthetic */ class k implements a0 {
     public final void a(f fVar, c.i.a.f.e.h.j.k kVar) {
         zzaf zzaf = new zzaf(1, this.a);
         Objects.requireNonNull(fVar);
-        fVar.w().M(new zzce(1, zzaf, new j(kVar), null, null, false, null));
+        fVar.v().N(new zzce(1, zzaf, new j(kVar), null, null, false, null));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/k0.java b/app/src/main/java/c/i/a/f/j/b/e/k0.java
index b789a753b1..bf7b49933f 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/k0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/k0.java
@@ -12,7 +12,7 @@ public final class k0 implements Parcelable.Creator<Update> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Update createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Message message = null;
         zze zze = null;
         zza zza = null;
@@ -20,14 +20,14 @@ public final class k0 implements Parcelable.Creator<Update> {
         byte[] bArr = null;
         int i = 0;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 3:
                     message = (Message) AnimatableValueParser.S(parcel, readInt, Message.CREATOR);
@@ -45,11 +45,11 @@ public final class k0 implements Parcelable.Creator<Update> {
                     bArr = AnimatableValueParser.Q(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Update(i, i2, message, zze, zza, zzgs, bArr);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/l.java b/app/src/main/java/c/i/a/f/j/b/e/l.java
index b43a37fea8..962eec4632 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/l.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/l.java
@@ -13,13 +13,13 @@ public final /* synthetic */ class l implements a0 {
     public final k b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0 f1209c;
+    public final d0 f1207c;
     public final SubscribeOptions d;
 
     public l(i iVar, k kVar, d0 d0Var, SubscribeOptions subscribeOptions) {
         this.a = iVar;
         this.b = kVar;
-        this.f1209c = d0Var;
+        this.f1207c = d0Var;
         this.d = subscribeOptions;
     }
 
@@ -27,13 +27,13 @@ public final /* synthetic */ class l implements a0 {
     public final void a(f fVar, k kVar) {
         i iVar = this.a;
         k kVar2 = this.b;
-        d0 d0Var = this.f1209c;
+        d0 d0Var = this.f1207c;
         SubscribeOptions subscribeOptions = this.d;
         int i = iVar.m;
         if (!fVar.A.a(kVar2.f1042c)) {
             o<k.a, IBinder> oVar = fVar.A;
             oVar.a.put(kVar2.f1042c, new WeakReference<>(new h(kVar2)));
         }
-        fVar.w().C(new SubscribeRequest(3, fVar.A.b(kVar2.f1042c), subscribeOptions.a, new j(kVar), subscribeOptions.b, null, 0, null, null, null, false, d0Var, false, null, subscribeOptions.d, 0, i));
+        fVar.v().D(new SubscribeRequest(3, fVar.A.b(kVar2.f1042c), subscribeOptions.a, new j(kVar), subscribeOptions.b, null, 0, null, null, null, false, d0Var, false, null, subscribeOptions.d, 0, i));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/l0.java b/app/src/main/java/c/i/a/f/j/b/e/l0.java
index db7923ee91..fa350e2d2d 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/l0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/l0.java
@@ -8,18 +8,18 @@ public final class l0 implements Parcelable.Creator<ClientAppContext> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final ClientAppContext createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         String str3 = null;
         int i = 0;
         boolean z2 = false;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -28,20 +28,20 @@ public final class l0 implements Parcelable.Creator<ClientAppContext> {
                     str2 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 4:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 5:
-                    i2 = AnimatableValueParser.e2(parcel, readInt);
+                    i2 = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 6:
                     str3 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new ClientAppContext(i, str, str2, z2, i2, str3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/m.java b/app/src/main/java/c/i/a/f/j/b/e/m.java
index 766fb2a05f..511465be73 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/m.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/m.java
@@ -23,7 +23,7 @@ public final /* synthetic */ class m implements a0 {
             jVar.g(new Status(0, null));
             return;
         }
-        fVar.w().m0(new zzcg(1, fVar.A.b(kVar2.f1042c), jVar, null, 0, null, null, false, null));
+        fVar.v().m0(new zzcg(1, fVar.A.b(kVar2.f1042c), jVar, null, 0, null, null, false, null));
         o<k.a, IBinder> oVar = fVar.A;
         oVar.a.remove(kVar2.f1042c);
     }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/m0.java b/app/src/main/java/c/i/a/f/j/b/e/m0.java
index d7d1582614..97c4782246 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/m0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/m0.java
@@ -8,25 +8,25 @@ public final class m0 implements Parcelable.Creator<zze> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zze createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         double d = 0.0d;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                AnimatableValueParser.U2(parcel, readInt, 8);
+                AnimatableValueParser.W2(parcel, readInt, 8);
                 d = parcel.readDouble();
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zze(i, i2, d);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/n.java b/app/src/main/java/c/i/a/f/j/b/e/n.java
index 45aef8c061..c865d614dd 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/n.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/n.java
@@ -23,6 +23,6 @@ public final /* synthetic */ class n implements a0 {
         }
         zzcb zzcb = new zzcb(1, new j(kVar), fVar.A.b(kVar2.f1042c), false, null, null);
         zzcb.l = true;
-        fVar.w().r(zzcb);
+        fVar.v().s(zzcb);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/n0.java b/app/src/main/java/c/i/a/f/j/b/e/n0.java
index 65843f85ba..442317f0c3 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/n0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/n0.java
@@ -9,24 +9,24 @@ public final class n0 implements Parcelable.Creator<zzj> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzj createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         ClientAppContext clientAppContext = null;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
                 clientAppContext = (ClientAppContext) AnimatableValueParser.S(parcel, readInt, ClientAppContext.CREATOR);
             } else if (i3 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzj(i, clientAppContext, i2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/o.java b/app/src/main/java/c/i/a/f/j/b/e/o.java
index 2b0ee8a0f9..0e17860483 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/o.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/o.java
@@ -24,7 +24,7 @@ public final /* synthetic */ class o implements a0 {
         }
         zzcb zzcb = new zzcb(1, jVar, fVar.A.b(kVar2.f1042c), false, null, null);
         zzcb.l = false;
-        fVar.w().r(zzcb);
+        fVar.v().s(zzcb);
         c.i.a.f.h.m.o<k.a, IBinder> oVar = fVar.A;
         oVar.a.remove(kVar2.f1042c);
     }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/p.java b/app/src/main/java/c/i/a/f/j/b/e/p.java
index 26a15418bc..127ffb5d27 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/p.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/p.java
@@ -7,6 +7,6 @@ public final /* synthetic */ class p implements a0 {
 
     @Override // c.i.a.f.j.b.e.a0
     public final void a(f fVar, k kVar) {
-        fVar.G(1);
+        fVar.F(1);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/r.java b/app/src/main/java/c/i/a/f/j/b/e/r.java
index 7987e92328..201fcbd7a5 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/r.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/r.java
@@ -4,13 +4,13 @@ import c.i.a.f.e.h.j.k;
 public final class r extends b0 {
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ k f1210c;
+    public final /* synthetic */ k f1208c;
     public final /* synthetic */ i d;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public r(i iVar, k kVar, k kVar2) {
         super(kVar);
         this.d = iVar;
-        this.f1210c = kVar2;
+        this.f1208c = kVar2;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/s.java b/app/src/main/java/c/i/a/f/j/b/e/s.java
index dd361a9621..89cad02838 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/s.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/s.java
@@ -4,13 +4,13 @@ import c.i.a.f.e.h.j.k;
 public final class s extends d0 {
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ k f1211c;
+    public final /* synthetic */ k f1209c;
     public final /* synthetic */ i d;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public s(i iVar, k kVar, k kVar2) {
         super(kVar);
         this.d = iVar;
-        this.f1211c = kVar2;
+        this.f1209c = kVar2;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/u0.java b/app/src/main/java/c/i/a/f/j/b/e/u0.java
index 895fdcaa3b..8e6a17495c 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/u0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/u0.java
@@ -9,15 +9,15 @@ import com.google.android.gms.nearby.messages.internal.zzce;
 import com.google.android.gms.nearby.messages.internal.zzcg;
 import com.google.android.gms.nearby.messages.internal.zzj;
 public interface u0 extends IInterface {
-    void C(SubscribeRequest subscribeRequest) throws RemoteException;
+    void D(SubscribeRequest subscribeRequest) throws RemoteException;
 
-    void M(zzce zzce) throws RemoteException;
+    void N(zzce zzce) throws RemoteException;
 
     void l0(zzj zzj) throws RemoteException;
 
-    void m(zzbz zzbz) throws RemoteException;
-
     void m0(zzcg zzcg) throws RemoteException;
 
-    void r(zzcb zzcb) throws RemoteException;
+    void n(zzbz zzbz) throws RemoteException;
+
+    void s(zzcb zzcb) throws RemoteException;
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/v.java b/app/src/main/java/c/i/a/f/j/b/e/v.java
index 4bc79b5568..f9db18ae18 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/v.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/v.java
@@ -6,12 +6,12 @@ public final class v extends m<f, T> {
     public final /* synthetic */ a0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ i f1212c;
+    public final /* synthetic */ i f1210c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public v(i iVar, k kVar, a0 a0Var) {
         super(kVar);
-        this.f1212c = iVar;
+        this.f1210c = iVar;
         this.b = a0Var;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/v0.java b/app/src/main/java/c/i/a/f/j/b/e/v0.java
index 9f8d5d1386..9550a44230 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/v0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/v0.java
@@ -17,14 +17,14 @@ public final class v0 extends a implements u0 {
     }
 
     @Override // c.i.a.f.j.b.e.u0
-    public final void C(SubscribeRequest subscribeRequest) throws RemoteException {
+    public final void D(SubscribeRequest subscribeRequest) throws RemoteException {
         Parcel e = e();
         c.b(e, subscribeRequest);
         g(3, e);
     }
 
     @Override // c.i.a.f.j.b.e.u0
-    public final void M(zzce zzce) throws RemoteException {
+    public final void N(zzce zzce) throws RemoteException {
         Parcel e = e();
         c.b(e, zzce);
         g(2, e);
@@ -37,13 +37,6 @@ public final class v0 extends a implements u0 {
         g(9, e);
     }
 
-    @Override // c.i.a.f.j.b.e.u0
-    public final void m(zzbz zzbz) throws RemoteException {
-        Parcel e = e();
-        c.b(e, zzbz);
-        g(1, e);
-    }
-
     @Override // c.i.a.f.j.b.e.u0
     public final void m0(zzcg zzcg) throws RemoteException {
         Parcel e = e();
@@ -52,7 +45,14 @@ public final class v0 extends a implements u0 {
     }
 
     @Override // c.i.a.f.j.b.e.u0
-    public final void r(zzcb zzcb) throws RemoteException {
+    public final void n(zzbz zzbz) throws RemoteException {
+        Parcel e = e();
+        c.b(e, zzbz);
+        g(1, e);
+    }
+
+    @Override // c.i.a.f.j.b.e.u0
+    public final void s(zzcb zzcb) throws RemoteException {
         Parcel e = e();
         c.b(e, zzcb);
         g(8, e);
diff --git a/app/src/main/java/c/i/a/f/j/b/e/w.java b/app/src/main/java/c/i/a/f/j/b/e/w.java
index 44e9c6c999..6118f15a5f 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/w.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/w.java
@@ -8,24 +8,24 @@ public final class w implements Parcelable.Creator<zza> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zza createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         int i2 = 0;
         int i3 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i4 = 65535 & readInt;
             if (i4 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i4 == 2) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i4 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i3 = AnimatableValueParser.e2(parcel, readInt);
+                i3 = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zza(i, i2, i3);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/e/x.java b/app/src/main/java/c/i/a/f/j/b/e/x.java
index 60a4b23b1f..de3b1cf210 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/x.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/x.java
@@ -6,12 +6,12 @@ public final class x extends q<f, T> {
     public final /* synthetic */ a0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ i f1213c;
+    public final /* synthetic */ i f1211c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public x(i iVar, k.a aVar, a0 a0Var) {
         super(aVar);
-        this.f1213c = iVar;
+        this.f1211c = iVar;
         this.b = a0Var;
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/e/x0.java b/app/src/main/java/c/i/a/f/j/b/e/x0.java
index 19d67f2361..e1af55521b 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/x0.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/x0.java
@@ -15,7 +15,7 @@ public abstract class x0 extends b implements w0 {
             return false;
         }
         r rVar = (r) this;
-        rVar.d.b(rVar.f1210c.f1042c);
+        rVar.d.b(rVar.f1208c.f1042c);
         k<c.i.a.f.j.b.b> kVar = rVar.b;
         if (kVar != null) {
             kVar.a(b0.a);
diff --git a/app/src/main/java/c/i/a/f/j/b/e/y.java b/app/src/main/java/c/i/a/f/j/b/e/y.java
index f8c066b3da..83ca1d3fd8 100644
--- a/app/src/main/java/c/i/a/f/j/b/e/y.java
+++ b/app/src/main/java/c/i/a/f/j/b/e/y.java
@@ -4,19 +4,17 @@ import android.os.RemoteException;
 import c.i.a.f.e.h.j.p;
 import com.google.android.gms.tasks.TaskCompletionSource;
 public final class y extends p<f, Void> {
-
-    /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ a0 f1214c;
-    public final /* synthetic */ i d;
+    public final /* synthetic */ a0 a;
+    public final /* synthetic */ i b;
 
     public y(i iVar, a0 a0Var) {
-        this.d = iVar;
-        this.f1214c = a0Var;
+        this.b = iVar;
+        this.a = a0Var;
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [c.i.a.f.e.h.a$b, com.google.android.gms.tasks.TaskCompletionSource] */
     @Override // c.i.a.f.e.h.j.p
     public final /* synthetic */ void c(f fVar, TaskCompletionSource<Void> taskCompletionSource) throws RemoteException {
-        this.f1214c.a(fVar, i.j(this.d, taskCompletionSource));
+        this.a.a(fVar, i.j(this.b, taskCompletionSource));
     }
 }
diff --git a/app/src/main/java/c/i/a/f/j/b/f.java b/app/src/main/java/c/i/a/f/j/b/f.java
index 33bc0561e4..d7fba898f4 100644
--- a/app/src/main/java/c/i/a/f/j/b/f.java
+++ b/app/src/main/java/c/i/a/f/j/b/f.java
@@ -9,14 +9,14 @@ public final class f implements Parcelable.Creator<Message> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Message createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         byte[] bArr = null;
         String str = null;
         String str2 = null;
         zzgs[] zzgsArr = null;
         long j = 0;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
@@ -28,14 +28,14 @@ public final class f implements Parcelable.Creator<Message> {
             } else if (i2 == 4) {
                 zzgsArr = (zzgs[]) AnimatableValueParser.W(parcel, readInt, zzgs.CREATOR);
             } else if (i2 == 5) {
-                j = AnimatableValueParser.f2(parcel, readInt);
+                j = AnimatableValueParser.h2(parcel, readInt);
             } else if (i2 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Message(i, bArr, str, str2, zzgsArr, j);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/g.java b/app/src/main/java/c/i/a/f/j/b/g.java
index 321eec26e2..aa20056701 100644
--- a/app/src/main/java/c/i/a/f/j/b/g.java
+++ b/app/src/main/java/c/i/a/f/j/b/g.java
@@ -12,14 +12,14 @@ public final class g implements Parcelable.Creator<MessageFilter> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final MessageFilter createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         ArrayList arrayList = null;
         ArrayList arrayList2 = null;
         ArrayList arrayList3 = null;
         int i = 0;
         boolean z2 = false;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
@@ -27,18 +27,18 @@ public final class g implements Parcelable.Creator<MessageFilter> {
             } else if (i3 == 2) {
                 arrayList2 = AnimatableValueParser.X(parcel, readInt, zzgu.CREATOR);
             } else if (i3 == 3) {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             } else if (i3 == 4) {
                 arrayList3 = AnimatableValueParser.X(parcel, readInt, zzgp.CREATOR);
             } else if (i3 == 5) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 != 1000) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new MessageFilter(i, arrayList, arrayList2, z2, arrayList3, i2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/j/b/j.java b/app/src/main/java/c/i/a/f/j/b/j.java
index e3e6266924..88ae1fb8d2 100644
--- a/app/src/main/java/c/i/a/f/j/b/j.java
+++ b/app/src/main/java/c/i/a/f/j/b/j.java
@@ -8,7 +8,7 @@ public final class j implements Parcelable.Creator<Strategy> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final Strategy createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         int i2 = 0;
         int i3 = 0;
@@ -17,41 +17,41 @@ public final class j implements Parcelable.Creator<Strategy> {
         int i5 = 0;
         int i6 = 0;
         int i7 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i8 = 65535 & readInt;
             if (i8 != 1000) {
                 switch (i8) {
                     case 1:
-                        i2 = AnimatableValueParser.e2(parcel, readInt);
+                        i2 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 2:
-                        i3 = AnimatableValueParser.e2(parcel, readInt);
+                        i3 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 3:
-                        i4 = AnimatableValueParser.e2(parcel, readInt);
+                        i4 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 4:
-                        z2 = AnimatableValueParser.c2(parcel, readInt);
+                        z2 = AnimatableValueParser.e2(parcel, readInt);
                         continue;
                     case 5:
-                        i5 = AnimatableValueParser.e2(parcel, readInt);
+                        i5 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 6:
-                        i6 = AnimatableValueParser.e2(parcel, readInt);
+                        i6 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     case 7:
-                        i7 = AnimatableValueParser.e2(parcel, readInt);
+                        i7 = AnimatableValueParser.g2(parcel, readInt);
                         continue;
                     default:
-                        AnimatableValueParser.B2(parcel, readInt);
+                        AnimatableValueParser.D2(parcel, readInt);
                         continue;
                 }
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new Strategy(i, i2, i3, i4, z2, i5, i6, i7);
     }
 
diff --git a/app/src/main/java/c/i/a/f/k/a.java b/app/src/main/java/c/i/a/f/k/a.java
index 2ee73a05d7..b2730a4526 100644
--- a/app/src/main/java/c/i/a/f/k/a.java
+++ b/app/src/main/java/c/i/a/f/k/a.java
@@ -10,7 +10,7 @@ public final class a {
     @Deprecated
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c.i.a.f.e.h.a<a.d.c> f1215c;
+    public static final c.i.a.f.e.h.a<a.d.c> f1212c;
     @Deprecated
     public static final SafetyNetApi d = new i();
 
@@ -19,6 +19,6 @@ public final class a {
         a = gVar;
         h hVar = new h();
         b = hVar;
-        f1215c = new c.i.a.f.e.h.a<>("SafetyNet.API", hVar, gVar);
+        f1212c = new c.i.a.f.e.h.a<>("SafetyNet.API", hVar, gVar);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/k/b.java b/app/src/main/java/c/i/a/f/k/b.java
index d15dd153f1..9f9ad36abc 100644
--- a/app/src/main/java/c/i/a/f/k/b.java
+++ b/app/src/main/java/c/i/a/f/k/b.java
@@ -8,17 +8,17 @@ public final class b implements Parcelable.Creator<zza> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zza createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zza(str);
     }
 
diff --git a/app/src/main/java/c/i/a/f/k/c.java b/app/src/main/java/c/i/a/f/k/c.java
index 6d6f188b87..4b29d5f3ca 100644
--- a/app/src/main/java/c/i/a/f/k/c.java
+++ b/app/src/main/java/c/i/a/f/k/c.java
@@ -8,11 +8,11 @@ public final class c implements Parcelable.Creator<HarmfulAppsData> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final HarmfulAppsData createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         byte[] bArr = null;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 2) {
@@ -20,12 +20,12 @@ public final class c implements Parcelable.Creator<HarmfulAppsData> {
             } else if (i2 == 3) {
                 bArr = AnimatableValueParser.Q(parcel, readInt);
             } else if (i2 != 4) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new HarmfulAppsData(str, bArr, i);
     }
 
diff --git a/app/src/main/java/c/i/a/f/k/d.java b/app/src/main/java/c/i/a/f/k/d.java
index 303b4e3da2..899af2a8b0 100644
--- a/app/src/main/java/c/i/a/f/k/d.java
+++ b/app/src/main/java/c/i/a/f/k/d.java
@@ -9,27 +9,27 @@ public final class d implements Parcelable.Creator<zzd> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzd createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         long j = 0;
         HarmfulAppsData[] harmfulAppsDataArr = null;
         int i = 0;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 2) {
-                j = AnimatableValueParser.f2(parcel, readInt);
+                j = AnimatableValueParser.h2(parcel, readInt);
             } else if (i2 == 3) {
                 harmfulAppsDataArr = (HarmfulAppsData[]) AnimatableValueParser.W(parcel, readInt, HarmfulAppsData.CREATOR);
             } else if (i2 == 4) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 5) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzd(j, harmfulAppsDataArr, i, z2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/k/e.java b/app/src/main/java/c/i/a/f/k/e.java
index e440eddc3c..1a441d7765 100644
--- a/app/src/main/java/c/i/a/f/k/e.java
+++ b/app/src/main/java/c/i/a/f/k/e.java
@@ -8,17 +8,17 @@ public final class e implements Parcelable.Creator<zzf> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzf createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzf(str);
     }
 
diff --git a/app/src/main/java/c/i/a/f/k/f.java b/app/src/main/java/c/i/a/f/k/f.java
index 98aa1d73c1..32fd06dfab 100644
--- a/app/src/main/java/c/i/a/f/k/f.java
+++ b/app/src/main/java/c/i/a/f/k/f.java
@@ -8,21 +8,21 @@ public final class f implements Parcelable.Creator<zzh> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzh createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         boolean z2 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 2) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
-                z2 = AnimatableValueParser.c2(parcel, readInt);
+                z2 = AnimatableValueParser.e2(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzh(i, z2);
     }
 
diff --git a/app/src/main/java/c/i/a/f/k/g.java b/app/src/main/java/c/i/a/f/k/g.java
index e790d3e990..cde01cbf0a 100644
--- a/app/src/main/java/c/i/a/f/k/g.java
+++ b/app/src/main/java/c/i/a/f/k/g.java
@@ -8,27 +8,27 @@ import com.google.android.gms.common.data.DataHolder;
 import com.google.android.gms.safetynet.SafeBrowsingData;
 public final class g implements Parcelable.Creator<SafeBrowsingData> {
     public static void a(SafeBrowsingData safeBrowsingData, Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, safeBrowsingData.i, false);
-        AnimatableValueParser.O2(parcel, 3, safeBrowsingData.j, i, false);
-        AnimatableValueParser.O2(parcel, 4, safeBrowsingData.k, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, safeBrowsingData.i, false);
+        AnimatableValueParser.Q2(parcel, 3, safeBrowsingData.j, i, false);
+        AnimatableValueParser.Q2(parcel, 4, safeBrowsingData.k, i, false);
         long j = safeBrowsingData.l;
-        AnimatableValueParser.W2(parcel, 5, 8);
+        AnimatableValueParser.Y2(parcel, 5, 8);
         parcel.writeLong(j);
-        AnimatableValueParser.M2(parcel, 6, safeBrowsingData.m, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.O2(parcel, 6, safeBrowsingData.m, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final SafeBrowsingData createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         DataHolder dataHolder = null;
         ParcelFileDescriptor parcelFileDescriptor = null;
         byte[] bArr = null;
         long j = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 2) {
@@ -38,14 +38,14 @@ public final class g implements Parcelable.Creator<SafeBrowsingData> {
             } else if (i == 4) {
                 parcelFileDescriptor = (ParcelFileDescriptor) AnimatableValueParser.S(parcel, readInt, ParcelFileDescriptor.CREATOR);
             } else if (i == 5) {
-                j = AnimatableValueParser.f2(parcel, readInt);
+                j = AnimatableValueParser.h2(parcel, readInt);
             } else if (i != 6) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 bArr = AnimatableValueParser.Q(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new SafeBrowsingData(str, dataHolder, parcelFileDescriptor, j, bArr);
     }
 
diff --git a/app/src/main/java/c/i/a/f/l/b/a.java b/app/src/main/java/c/i/a/f/l/b/a.java
index 1cb598c9ee..d0506597e0 100644
--- a/app/src/main/java/c/i/a/f/l/b/a.java
+++ b/app/src/main/java/c/i/a/f/l/b/a.java
@@ -52,7 +52,7 @@ public class a extends d<e> implements f {
             }
             Integer num = this.D;
             Objects.requireNonNull(num, "null reference");
-            w().g0(new zak(new zas(account, num.intValue(), googleSignInAccount)), cVar);
+            v().g0(new zak(new zas(account, num.intValue(), googleSignInAccount)), cVar);
         } catch (RemoteException e) {
             Log.w("SignInClientImpl", "Remote service probably died when signIn is called");
             try {
@@ -89,7 +89,7 @@ public class a extends d<e> implements f {
     }
 
     @Override // c.i.a.f.e.k.b
-    public Bundle u() {
+    public Bundle t() {
         if (!this.d.getPackageName().equals(this.B.e)) {
             this.C.putString("com.google.android.gms.signin.internal.realClientPackageName", this.B.e);
         }
@@ -97,12 +97,12 @@ public class a extends d<e> implements f {
     }
 
     @Override // c.i.a.f.e.k.b
-    public String x() {
+    public String w() {
         return "com.google.android.gms.signin.internal.ISignInService";
     }
 
     @Override // c.i.a.f.e.k.b
-    public String y() {
+    public String x() {
         return "com.google.android.gms.signin.service.START";
     }
 }
diff --git a/app/src/main/java/c/i/a/f/l/b/b.java b/app/src/main/java/c/i/a/f/l/b/b.java
index d06038c1a5..b0fcb81b38 100644
--- a/app/src/main/java/c/i/a/f/l/b/b.java
+++ b/app/src/main/java/c/i/a/f/l/b/b.java
@@ -10,24 +10,24 @@ public final class b implements Parcelable.Creator<zab> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zab createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         Intent intent = null;
         int i2 = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i3 = 65535 & readInt;
             if (i3 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 == 2) {
-                i2 = AnimatableValueParser.e2(parcel, readInt);
+                i2 = AnimatableValueParser.g2(parcel, readInt);
             } else if (i3 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 intent = (Intent) AnimatableValueParser.S(parcel, readInt, Intent.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zab(i, i2, intent);
     }
 
diff --git a/app/src/main/java/c/i/a/f/l/b/h.java b/app/src/main/java/c/i/a/f/l/b/h.java
index d46709bf6f..208bccabe3 100644
--- a/app/src/main/java/c/i/a/f/l/b/h.java
+++ b/app/src/main/java/c/i/a/f/l/b/h.java
@@ -10,21 +10,21 @@ public final class h implements Parcelable.Creator<zag> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zag createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         ArrayList<String> arrayList = null;
         String str = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
                 arrayList = AnimatableValueParser.V(parcel, readInt);
             } else if (i != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zag(arrayList, str);
     }
 
diff --git a/app/src/main/java/c/i/a/f/l/b/i.java b/app/src/main/java/c/i/a/f/l/b/i.java
index 0f2650b20b..ca45acf0a0 100644
--- a/app/src/main/java/c/i/a/f/l/b/i.java
+++ b/app/src/main/java/c/i/a/f/l/b/i.java
@@ -10,21 +10,21 @@ public final class i implements Parcelable.Creator<zak> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zak createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         int i = 0;
         zas zas = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 zas = (zas) AnimatableValueParser.S(parcel, readInt, zas.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zak(i, zas);
     }
 
diff --git a/app/src/main/java/c/i/a/f/l/b/j.java b/app/src/main/java/c/i/a/f/l/b/j.java
index f199ae85b5..6523d6999c 100644
--- a/app/src/main/java/c/i/a/f/l/b/j.java
+++ b/app/src/main/java/c/i/a/f/l/b/j.java
@@ -11,24 +11,24 @@ public final class j implements Parcelable.Creator<zam> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zam createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         ConnectionResult connectionResult = null;
         zau zau = null;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i2 = 65535 & readInt;
             if (i2 == 1) {
-                i = AnimatableValueParser.e2(parcel, readInt);
+                i = AnimatableValueParser.g2(parcel, readInt);
             } else if (i2 == 2) {
                 connectionResult = (ConnectionResult) AnimatableValueParser.S(parcel, readInt, ConnectionResult.CREATOR);
             } else if (i2 != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 zau = (zau) AnimatableValueParser.S(parcel, readInt, zau.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zam(i, connectionResult, zau);
     }
 
diff --git a/app/src/main/java/c/i/a/f/l/c.java b/app/src/main/java/c/i/a/f/l/c.java
index 070db11103..9308e7b2f1 100644
--- a/app/src/main/java/c/i/a/f/l/c.java
+++ b/app/src/main/java/c/i/a/f/l/c.java
@@ -9,7 +9,7 @@ public final class c {
     public static final a.g<c.i.a.f.l.b.a> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a.AbstractC0100a<c.i.a.f.l.b.a, a> f1216c;
+    public static final a.AbstractC0100a<c.i.a.f.l.b.a, a> f1213c;
     public static final a.AbstractC0100a<c.i.a.f.l.b.a, g> d;
 
     static {
@@ -18,7 +18,7 @@ public final class c {
         a.g<c.i.a.f.l.b.a> gVar2 = new a.g<>();
         b = gVar2;
         e eVar = new e();
-        f1216c = eVar;
+        f1213c = eVar;
         d dVar = new d();
         d = dVar;
         new Scope("profile");
diff --git a/app/src/main/java/c/i/a/f/m/a.java b/app/src/main/java/c/i/a/f/m/a.java
index 5f694acff6..dfbc0a45db 100644
--- a/app/src/main/java/c/i/a/f/m/a.java
+++ b/app/src/main/java/c/i/a/f/m/a.java
@@ -30,7 +30,7 @@ public class a {
     public final Object b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final PowerManager.WakeLock f1217c;
+    public final PowerManager.WakeLock f1214c;
     public WorkSource d;
     public final int e;
     public final String f;
@@ -58,7 +58,7 @@ public class a {
         } else {
             this.f = str;
         }
-        this.f1217c = ((PowerManager) context.getSystemService("power")).newWakeLock(i, str);
+        this.f1214c = ((PowerManager) context.getSystemService("power")).newWakeLock(i, str);
         if (i.a(context)) {
             packageName = h.a(packageName) ? context.getPackageName() : packageName;
             if (!(context.getPackageManager() == null || packageName == null)) {
@@ -100,7 +100,7 @@ public class a {
                     this.d = workSource;
                 }
                 try {
-                    this.f1217c.setWorkSource(this.d);
+                    this.f1214c.setWorkSource(this.d);
                 } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException e3) {
                     Log.wtf("WakeLock", e3.toString());
                 }
@@ -125,7 +125,7 @@ public class a {
         if (r7.j == 0) goto L_0x0061;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:24:0x0061, code lost:
-        com.airbnb.lottie.parser.AnimatableValueParser.C0(r7.f1217c, null);
+        com.airbnb.lottie.parser.AnimatableValueParser.C0(r7.f1214c, null);
         c();
         r7.j++;
      */
@@ -136,7 +136,7 @@ public class a {
         }
         synchronized (this.b) {
             boolean z2 = false;
-            if ((!this.i.isEmpty() || this.j > 0) && !this.f1217c.isHeld()) {
+            if ((!this.i.isEmpty() || this.j > 0) && !this.f1214c.isHeld()) {
                 this.i.clear();
                 this.j = 0;
             }
@@ -152,7 +152,7 @@ public class a {
             if (!this.h) {
             }
         }
-        this.f1217c.acquire();
+        this.f1214c.acquire();
         if (j > 0) {
             a.schedule(new b(this), j, TimeUnit.MILLISECONDS);
         }
@@ -165,7 +165,7 @@ public class a {
         if (r6.j == 1) goto L_0x005b;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:23:0x005b, code lost:
-        com.airbnb.lottie.parser.AnimatableValueParser.C0(r6.f1217c, null);
+        com.airbnb.lottie.parser.AnimatableValueParser.C0(r6.f1214c, null);
         c();
         r6.j--;
      */
@@ -205,7 +205,7 @@ public class a {
         WorkSource workSource = this.d;
         Method method2 = i.a;
         ArrayList arrayList = new ArrayList();
-        if (!(workSource == null || (method = i.f1062c) == null)) {
+        if (!(workSource == null || (method = i.f1061c) == null)) {
             try {
                 Object invoke = method.invoke(workSource, new Object[0]);
                 Objects.requireNonNull(invoke, "null reference");
@@ -241,9 +241,9 @@ public class a {
     }
 
     public final void d() {
-        if (this.f1217c.isHeld()) {
+        if (this.f1214c.isHeld()) {
             try {
-                this.f1217c.release();
+                this.f1214c.release();
             } catch (RuntimeException e) {
                 if (e.getClass().equals(RuntimeException.class)) {
                     Log.e("WakeLock", String.valueOf(this.f).concat(" was already released!"), e);
@@ -251,7 +251,7 @@ public class a {
                     throw e;
                 }
             }
-            this.f1217c.isHeld();
+            this.f1214c.isHeld();
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/n/b0.java b/app/src/main/java/c/i/a/f/n/b0.java
index a1cd509e82..06b18851bc 100644
--- a/app/src/main/java/c/i/a/f/n/b0.java
+++ b/app/src/main/java/c/i/a/f/n/b0.java
@@ -14,7 +14,7 @@ public final class b0<TResult> extends Task<TResult> {
     public final y<TResult> b = new y<>();
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1218c;
+    public boolean f1215c;
     public volatile boolean d;
     @Nullable
     public TResult e;
@@ -123,7 +123,7 @@ public final class b0<TResult> extends Task<TResult> {
     public final TResult l() {
         TResult tresult;
         synchronized (this.a) {
-            AnimatableValueParser.G(this.f1218c, "Task is not yet complete");
+            AnimatableValueParser.G(this.f1215c, "Task is not yet complete");
             if (this.d) {
                 throw new CancellationException("Task is already canceled.");
             } else if (this.f == null) {
@@ -139,7 +139,7 @@ public final class b0<TResult> extends Task<TResult> {
     public final <X extends Throwable> TResult m(@NonNull Class<X> cls) throws Throwable {
         TResult tresult;
         synchronized (this.a) {
-            AnimatableValueParser.G(this.f1218c, "Task is not yet complete");
+            AnimatableValueParser.G(this.f1215c, "Task is not yet complete");
             if (this.d) {
                 throw new CancellationException("Task is already canceled.");
             } else if (cls.isInstance(this.f)) {
@@ -162,7 +162,7 @@ public final class b0<TResult> extends Task<TResult> {
     public final boolean o() {
         boolean z2;
         synchronized (this.a) {
-            z2 = this.f1218c;
+            z2 = this.f1215c;
         }
         return z2;
     }
@@ -171,7 +171,7 @@ public final class b0<TResult> extends Task<TResult> {
     public final boolean p() {
         boolean z2;
         synchronized (this.a) {
-            z2 = this.f1218c && !this.d && this.f == null;
+            z2 = this.f1215c && !this.d && this.f == null;
         }
         return z2;
     }
@@ -197,7 +197,7 @@ public final class b0<TResult> extends Task<TResult> {
         AnimatableValueParser.z(exc, "Exception must not be null");
         synchronized (this.a) {
             v();
-            this.f1218c = true;
+            this.f1215c = true;
             this.f = exc;
         }
         this.b.a(this);
@@ -206,7 +206,7 @@ public final class b0<TResult> extends Task<TResult> {
     public final void t(@Nullable TResult tresult) {
         synchronized (this.a) {
             v();
-            this.f1218c = true;
+            this.f1215c = true;
             this.e = tresult;
         }
         this.b.a(this);
@@ -214,10 +214,10 @@ public final class b0<TResult> extends Task<TResult> {
 
     public final boolean u() {
         synchronized (this.a) {
-            if (this.f1218c) {
+            if (this.f1215c) {
                 return false;
             }
-            this.f1218c = true;
+            this.f1215c = true;
             this.d = true;
             this.b.a(this);
             return true;
@@ -226,7 +226,7 @@ public final class b0<TResult> extends Task<TResult> {
 
     public final void v() {
         String str;
-        if (this.f1218c) {
+        if (this.f1215c) {
             int i = DuplicateTaskCompletionException.i;
             if (o()) {
                 Exception k = k();
@@ -250,7 +250,7 @@ public final class b0<TResult> extends Task<TResult> {
 
     public final void w() {
         synchronized (this.a) {
-            if (this.f1218c) {
+            if (this.f1215c) {
                 this.b.a(this);
             }
         }
diff --git a/app/src/main/java/c/i/a/f/n/j.java b/app/src/main/java/c/i/a/f/n/j.java
index e0909412d0..5a5c66ce8f 100644
--- a/app/src/main/java/c/i/a/f/n/j.java
+++ b/app/src/main/java/c/i/a/f/n/j.java
@@ -8,7 +8,7 @@ public final class j implements h {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b0<Void> f1219c;
+    public final b0<Void> f1216c;
     public int d;
     public int e;
     public int f;
@@ -17,7 +17,7 @@ public final class j implements h {
 
     public j(int i, b0<Void> b0Var) {
         this.b = i;
-        this.f1219c = b0Var;
+        this.f1216c = b0Var;
     }
 
     public final void a() {
@@ -25,7 +25,7 @@ public final class j implements h {
             return;
         }
         if (this.g != null) {
-            b0<Void> b0Var = this.f1219c;
+            b0<Void> b0Var = this.f1216c;
             int i = this.e;
             int i2 = this.b;
             StringBuilder sb = new StringBuilder(54);
@@ -35,9 +35,9 @@ public final class j implements h {
             sb.append(" underlying tasks failed");
             b0Var.s(new ExecutionException(sb.toString(), this.g));
         } else if (this.h) {
-            this.f1219c.u();
+            this.f1216c.u();
         } else {
-            this.f1219c.t(null);
+            this.f1216c.t(null);
         }
     }
 
diff --git a/app/src/main/java/c/i/a/f/n/k.java b/app/src/main/java/c/i/a/f/n/k.java
index 42986cf78c..e8ef61f24e 100644
--- a/app/src/main/java/c/i/a/f/n/k.java
+++ b/app/src/main/java/c/i/a/f/n/k.java
@@ -9,12 +9,12 @@ public final class k<TResult, TContinuationResult> implements z<TResult> {
     public final a<TResult, TContinuationResult> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b0<TContinuationResult> f1220c;
+    public final b0<TContinuationResult> f1217c;
 
     public k(@NonNull Executor executor, @NonNull a<TResult, TContinuationResult> aVar, @NonNull b0<TContinuationResult> b0Var) {
         this.a = executor;
         this.b = aVar;
-        this.f1220c = b0Var;
+        this.f1217c = b0Var;
     }
 
     @Override // c.i.a.f.n.z
diff --git a/app/src/main/java/c/i/a/f/n/l.java b/app/src/main/java/c/i/a/f/n/l.java
index ae5bc2ea3e..b139ba809a 100644
--- a/app/src/main/java/c/i/a/f/n/l.java
+++ b/app/src/main/java/c/i/a/f/n/l.java
@@ -9,12 +9,12 @@ public final class l<TResult, TContinuationResult> implements b, d, e<TContinuat
     public final a<TResult, Task<TContinuationResult>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b0<TContinuationResult> f1221c;
+    public final b0<TContinuationResult> f1218c;
 
     public l(@NonNull Executor executor, @NonNull a<TResult, Task<TContinuationResult>> aVar, @NonNull b0<TContinuationResult> b0Var) {
         this.a = executor;
         this.b = aVar;
-        this.f1221c = b0Var;
+        this.f1218c = b0Var;
     }
 
     @Override // c.i.a.f.n.z
@@ -24,16 +24,16 @@ public final class l<TResult, TContinuationResult> implements b, d, e<TContinuat
 
     @Override // c.i.a.f.n.b
     public final void b() {
-        this.f1221c.u();
+        this.f1218c.u();
     }
 
     @Override // c.i.a.f.n.d
     public final void onFailure(@NonNull Exception exc) {
-        this.f1221c.s(exc);
+        this.f1218c.s(exc);
     }
 
     @Override // c.i.a.f.n.e
     public final void onSuccess(TContinuationResult tcontinuationresult) {
-        this.f1221c.t(tcontinuationresult);
+        this.f1218c.t(tcontinuationresult);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/n/m.java b/app/src/main/java/c/i/a/f/n/m.java
index e88806d6c4..54356a8f5c 100644
--- a/app/src/main/java/c/i/a/f/n/m.java
+++ b/app/src/main/java/c/i/a/f/n/m.java
@@ -15,19 +15,19 @@ public final class m implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         if (this.i.n()) {
-            this.j.f1220c.u();
+            this.j.f1217c.u();
             return;
         }
         try {
-            this.j.f1220c.t(this.j.b.a(this.i));
+            this.j.f1217c.t(this.j.b.a(this.i));
         } catch (RuntimeExecutionException e) {
             if (e.getCause() instanceof Exception) {
-                this.j.f1220c.s((Exception) e.getCause());
+                this.j.f1217c.s((Exception) e.getCause());
             } else {
-                this.j.f1220c.s(e);
+                this.j.f1217c.s(e);
             }
         } catch (Exception e2) {
-            this.j.f1220c.s(e2);
+            this.j.f1217c.s(e2);
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/n/n.java b/app/src/main/java/c/i/a/f/n/n.java
index b9bd34ba30..9e3e2d89a0 100644
--- a/app/src/main/java/c/i/a/f/n/n.java
+++ b/app/src/main/java/c/i/a/f/n/n.java
@@ -19,7 +19,7 @@ public final class n implements Runnable {
             Task task = (Task) this.j.b.a(this.i);
             if (task == null) {
                 l lVar = this.j;
-                lVar.f1221c.s(new NullPointerException("Continuation returned null"));
+                lVar.f1218c.s(new NullPointerException("Continuation returned null"));
                 return;
             }
             Executor executor = g.b;
@@ -28,12 +28,12 @@ public final class n implements Runnable {
             task.a(executor, this.j);
         } catch (RuntimeExecutionException e) {
             if (e.getCause() instanceof Exception) {
-                this.j.f1221c.s((Exception) e.getCause());
+                this.j.f1218c.s((Exception) e.getCause());
             } else {
-                this.j.f1221c.s(e);
+                this.j.f1218c.s(e);
             }
         } catch (Exception e2) {
-            this.j.f1221c.s(e2);
+            this.j.f1218c.s(e2);
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/n/o.java b/app/src/main/java/c/i/a/f/n/o.java
index c2763213ea..74fa4e0083 100644
--- a/app/src/main/java/c/i/a/f/n/o.java
+++ b/app/src/main/java/c/i/a/f/n/o.java
@@ -10,7 +10,7 @@ public final class o implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         synchronized (this.i.b) {
-            b bVar = this.i.f1222c;
+            b bVar = this.i.f1219c;
             if (bVar != null) {
                 bVar.b();
             }
diff --git a/app/src/main/java/c/i/a/f/n/p.java b/app/src/main/java/c/i/a/f/n/p.java
index 0af498c59d..05c5d567cc 100644
--- a/app/src/main/java/c/i/a/f/n/p.java
+++ b/app/src/main/java/c/i/a/f/n/p.java
@@ -9,18 +9,18 @@ public final class p<TResult> implements z<TResult> {
     public final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public b f1222c;
+    public b f1219c;
 
     public p(@NonNull Executor executor, @NonNull b bVar) {
         this.a = executor;
-        this.f1222c = bVar;
+        this.f1219c = bVar;
     }
 
     @Override // c.i.a.f.n.z
     public final void a(@NonNull Task<TResult> task) {
         if (task.n()) {
             synchronized (this.b) {
-                if (this.f1222c != null) {
+                if (this.f1219c != null) {
                     this.a.execute(new o(this));
                 }
             }
diff --git a/app/src/main/java/c/i/a/f/n/q.java b/app/src/main/java/c/i/a/f/n/q.java
index 90e06fac58..2464c9b1bc 100644
--- a/app/src/main/java/c/i/a/f/n/q.java
+++ b/app/src/main/java/c/i/a/f/n/q.java
@@ -9,17 +9,17 @@ public final class q<TResult> implements z<TResult> {
     public final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public c<TResult> f1223c;
+    public c<TResult> f1220c;
 
     public q(@NonNull Executor executor, @NonNull c<TResult> cVar) {
         this.a = executor;
-        this.f1223c = cVar;
+        this.f1220c = cVar;
     }
 
     @Override // c.i.a.f.n.z
     public final void a(@NonNull Task<TResult> task) {
         synchronized (this.b) {
-            if (this.f1223c != null) {
+            if (this.f1220c != null) {
                 this.a.execute(new r(this, task));
             }
         }
diff --git a/app/src/main/java/c/i/a/f/n/r.java b/app/src/main/java/c/i/a/f/n/r.java
index bebd4ab25f..09239e7f4a 100644
--- a/app/src/main/java/c/i/a/f/n/r.java
+++ b/app/src/main/java/c/i/a/f/n/r.java
@@ -14,7 +14,7 @@ public final class r implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         synchronized (this.j.b) {
-            c<TResult> cVar = this.j.f1223c;
+            c<TResult> cVar = this.j.f1220c;
             if (cVar != 0) {
                 cVar.onComplete(this.i);
             }
diff --git a/app/src/main/java/c/i/a/f/n/s.java b/app/src/main/java/c/i/a/f/n/s.java
index e09e85dc01..e823ac7cb5 100644
--- a/app/src/main/java/c/i/a/f/n/s.java
+++ b/app/src/main/java/c/i/a/f/n/s.java
@@ -15,7 +15,7 @@ public final class s implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         synchronized (this.j.b) {
-            d dVar = this.j.f1224c;
+            d dVar = this.j.f1221c;
             if (dVar != null) {
                 Exception k = this.i.k();
                 Objects.requireNonNull(k, "null reference");
diff --git a/app/src/main/java/c/i/a/f/n/t.java b/app/src/main/java/c/i/a/f/n/t.java
index 4af6bd0f52..74454c13d3 100644
--- a/app/src/main/java/c/i/a/f/n/t.java
+++ b/app/src/main/java/c/i/a/f/n/t.java
@@ -9,18 +9,18 @@ public final class t<TResult> implements z<TResult> {
     public final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public d f1224c;
+    public d f1221c;
 
     public t(@NonNull Executor executor, @NonNull d dVar) {
         this.a = executor;
-        this.f1224c = dVar;
+        this.f1221c = dVar;
     }
 
     @Override // c.i.a.f.n.z
     public final void a(@NonNull Task<TResult> task) {
         if (!task.p() && !task.n()) {
             synchronized (this.b) {
-                if (this.f1224c != null) {
+                if (this.f1221c != null) {
                     this.a.execute(new s(this, task));
                 }
             }
diff --git a/app/src/main/java/c/i/a/f/n/u.java b/app/src/main/java/c/i/a/f/n/u.java
index 7222cec68c..872f36fa39 100644
--- a/app/src/main/java/c/i/a/f/n/u.java
+++ b/app/src/main/java/c/i/a/f/n/u.java
@@ -9,18 +9,18 @@ public final class u<TResult> implements z<TResult> {
     public final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public e<? super TResult> f1225c;
+    public e<? super TResult> f1222c;
 
     public u(@NonNull Executor executor, @NonNull e<? super TResult> eVar) {
         this.a = executor;
-        this.f1225c = eVar;
+        this.f1222c = eVar;
     }
 
     @Override // c.i.a.f.n.z
     public final void a(@NonNull Task<TResult> task) {
         if (task.p()) {
             synchronized (this.b) {
-                if (this.f1225c != null) {
+                if (this.f1222c != null) {
                     this.a.execute(new v(this, task));
                 }
             }
diff --git a/app/src/main/java/c/i/a/f/n/v.java b/app/src/main/java/c/i/a/f/n/v.java
index 51ebd56f1c..e1efd20540 100644
--- a/app/src/main/java/c/i/a/f/n/v.java
+++ b/app/src/main/java/c/i/a/f/n/v.java
@@ -14,7 +14,7 @@ public final class v implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         synchronized (this.j.b) {
-            e<? super TResult> eVar = this.j.f1225c;
+            e<? super TResult> eVar = this.j.f1222c;
             if (eVar != 0) {
                 eVar.onSuccess(this.i.l());
             }
diff --git a/app/src/main/java/c/i/a/f/n/w.java b/app/src/main/java/c/i/a/f/n/w.java
index 18b740eee7..56de6725f5 100644
--- a/app/src/main/java/c/i/a/f/n/w.java
+++ b/app/src/main/java/c/i/a/f/n/w.java
@@ -20,7 +20,7 @@ public final class w implements Runnable {
             Task a = this.j.b.a(this.i.l());
             if (a == null) {
                 x xVar = this.j;
-                xVar.f1226c.s(new NullPointerException("Continuation returned null"));
+                xVar.f1223c.s(new NullPointerException("Continuation returned null"));
                 return;
             }
             Executor executor = g.b;
@@ -29,14 +29,14 @@ public final class w implements Runnable {
             a.a(executor, this.j);
         } catch (RuntimeExecutionException e) {
             if (e.getCause() instanceof Exception) {
-                this.j.f1226c.s((Exception) e.getCause());
+                this.j.f1223c.s((Exception) e.getCause());
                 return;
             }
-            this.j.f1226c.s(e);
+            this.j.f1223c.s(e);
         } catch (CancellationException unused) {
-            this.j.f1226c.u();
+            this.j.f1223c.u();
         } catch (Exception e2) {
-            this.j.f1226c.s(e2);
+            this.j.f1223c.s(e2);
         }
     }
 }
diff --git a/app/src/main/java/c/i/a/f/n/x.java b/app/src/main/java/c/i/a/f/n/x.java
index 2eabe171a9..0807f00894 100644
--- a/app/src/main/java/c/i/a/f/n/x.java
+++ b/app/src/main/java/c/i/a/f/n/x.java
@@ -9,12 +9,12 @@ public final class x<TResult, TContinuationResult> implements b, d, e<TContinuat
     public final f<TResult, TContinuationResult> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b0<TContinuationResult> f1226c;
+    public final b0<TContinuationResult> f1223c;
 
     public x(@NonNull Executor executor, @NonNull f<TResult, TContinuationResult> fVar, @NonNull b0<TContinuationResult> b0Var) {
         this.a = executor;
         this.b = fVar;
-        this.f1226c = b0Var;
+        this.f1223c = b0Var;
     }
 
     @Override // c.i.a.f.n.z
@@ -24,16 +24,16 @@ public final class x<TResult, TContinuationResult> implements b, d, e<TContinuat
 
     @Override // c.i.a.f.n.b
     public final void b() {
-        this.f1226c.u();
+        this.f1223c.u();
     }
 
     @Override // c.i.a.f.n.d
     public final void onFailure(@NonNull Exception exc) {
-        this.f1226c.s(exc);
+        this.f1223c.s(exc);
     }
 
     @Override // c.i.a.f.n.e
     public final void onSuccess(TContinuationResult tcontinuationresult) {
-        this.f1226c.t(tcontinuationresult);
+        this.f1223c.t(tcontinuationresult);
     }
 }
diff --git a/app/src/main/java/c/i/a/f/n/y.java b/app/src/main/java/c/i/a/f/n/y.java
index c55f87b99e..8130c93531 100644
--- a/app/src/main/java/c/i/a/f/n/y.java
+++ b/app/src/main/java/c/i/a/f/n/y.java
@@ -10,14 +10,14 @@ public final class y<TResult> {
     public Queue<z<TResult>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1227c;
+    public boolean f1224c;
 
     public final void a(@NonNull Task<TResult> task) {
         z<TResult> poll;
         synchronized (this.a) {
             if (this.b != null) {
-                if (!this.f1227c) {
-                    this.f1227c = true;
+                if (!this.f1224c) {
+                    this.f1224c = true;
                 }
             }
             return;
@@ -26,7 +26,7 @@ public final class y<TResult> {
             synchronized (this.a) {
                 poll = this.b.poll();
                 if (poll == null) {
-                    this.f1227c = false;
+                    this.f1224c = false;
                     return;
                 }
             }
diff --git a/app/src/main/java/c/i/a/g/a/c.java b/app/src/main/java/c/i/a/g/a/c.java
index 6c6d3881ef..3a95be80fa 100644
--- a/app/src/main/java/c/i/a/g/a/c.java
+++ b/app/src/main/java/c/i/a/g/a/c.java
@@ -56,7 +56,7 @@ public class c<V extends View> extends CoordinatorLayout.Behavior<V> {
         }
         d dVar = this.viewOffsetHelper;
         dVar.b = dVar.a.getTop();
-        dVar.f1228c = dVar.a.getLeft();
+        dVar.f1225c = dVar.a.getLeft();
         this.viewOffsetHelper.a();
         int i2 = this.tempTopBottomOffset;
         if (i2 != 0) {
diff --git a/app/src/main/java/c/i/a/g/a/d.java b/app/src/main/java/c/i/a/g/a/d.java
index ecfba94435..a6151fc516 100644
--- a/app/src/main/java/c/i/a/g/a/d.java
+++ b/app/src/main/java/c/i/a/g/a/d.java
@@ -8,7 +8,7 @@ public class d {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1228c;
+    public int f1225c;
     public int d;
     public int e;
     public boolean f = true;
@@ -22,7 +22,7 @@ public class d {
         View view = this.a;
         ViewCompat.offsetTopAndBottom(view, this.d - (view.getTop() - this.b));
         View view2 = this.a;
-        ViewCompat.offsetLeftAndRight(view2, this.e - (view2.getLeft() - this.f1228c));
+        ViewCompat.offsetLeftAndRight(view2, this.e - (view2.getLeft() - this.f1225c));
     }
 
     public boolean b(int i) {
diff --git a/app/src/main/java/c/i/a/g/b/a.java b/app/src/main/java/c/i/a/g/b/a.java
index 856aa74fe2..d9890c4417 100644
--- a/app/src/main/java/c/i/a/g/b/a.java
+++ b/app/src/main/java/c/i/a/g/b/a.java
@@ -27,7 +27,7 @@ public class a {
     public ShapeAppearanceModel b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1229c;
+    public int f1226c;
     public int d;
     public int e;
     public int f;
@@ -50,7 +50,7 @@ public class a {
     public LayerDrawable r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f1230s;
+    public int f1227s;
 
     public a(MaterialButton materialButton, @NonNull ShapeAppearanceModel shapeAppearanceModel) {
         this.a = materialButton;
@@ -129,12 +129,12 @@ public class a {
         MaterialShapeDrawable materialShapeDrawable3 = new MaterialShapeDrawable(this.b);
         this.m = materialShapeDrawable3;
         DrawableCompat.setTint(materialShapeDrawable3, -1);
-        RippleDrawable rippleDrawable = new RippleDrawable(RippleUtils.sanitizeRippleDrawableColor(this.l), new InsetDrawable((Drawable) new LayerDrawable(new Drawable[]{materialShapeDrawable2, materialShapeDrawable}), this.f1229c, this.e, this.d, this.f), this.m);
+        RippleDrawable rippleDrawable = new RippleDrawable(RippleUtils.sanitizeRippleDrawableColor(this.l), new InsetDrawable((Drawable) new LayerDrawable(new Drawable[]{materialShapeDrawable2, materialShapeDrawable}), this.f1226c, this.e, this.d, this.f), this.m);
         this.r = rippleDrawable;
         materialButton.setInternalBackground(rippleDrawable);
         MaterialShapeDrawable b = b();
         if (b != null) {
-            b.setElevation((float) this.f1230s);
+            b.setElevation((float) this.f1227s);
         }
     }
 
diff --git a/app/src/main/java/c/i/a/g/c/a.java b/app/src/main/java/c/i/a/g/c/a.java
index b70065a4c2..7053f56a4f 100644
--- a/app/src/main/java/c/i/a/g/c/a.java
+++ b/app/src/main/java/c/i/a/g/c/a.java
@@ -31,7 +31,7 @@ public class a {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialCardView f1231c;
+    public final MaterialCardView f1228c;
     @NonNull
     public final Rect d = new Rect();
     @NonNull
@@ -65,7 +65,7 @@ public class a {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public MaterialShapeDrawable f1232s;
+    public MaterialShapeDrawable f1229s;
     public boolean t = false;
     public boolean u;
 
@@ -93,7 +93,7 @@ public class a {
     }
 
     public a(@NonNull MaterialCardView materialCardView, AttributeSet attributeSet, int i, @StyleRes int i2) {
-        this.f1231c = materialCardView;
+        this.f1228c = materialCardView;
         MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(materialCardView.getContext(), attributeSet, i, i2);
         this.e = materialShapeDrawable;
         materialShapeDrawable.initializeElevationOverlay(materialCardView.getContext());
@@ -124,11 +124,11 @@ public class a {
     }
 
     public final float c() {
-        return this.f1231c.getMaxCardElevation() + (j() ? a() : 0.0f);
+        return this.f1228c.getMaxCardElevation() + (j() ? a() : 0.0f);
     }
 
     public final float d() {
-        return (this.f1231c.getMaxCardElevation() * 1.5f) + (j() ? a() : 0.0f);
+        return (this.f1228c.getMaxCardElevation() * 1.5f) + (j() ? a() : 0.0f);
     }
 
     @NonNull
@@ -136,8 +136,8 @@ public class a {
         RippleDrawable rippleDrawable;
         if (this.p == null) {
             if (RippleUtils.USE_FRAMEWORK_RIPPLE) {
-                this.f1232s = new MaterialShapeDrawable(this.n);
-                rippleDrawable = new RippleDrawable(this.l, null, this.f1232s);
+                this.f1229s = new MaterialShapeDrawable(this.n);
+                rippleDrawable = new RippleDrawable(this.l, null, this.f1229s);
             } else {
                 StateListDrawable stateListDrawable = new StateListDrawable();
                 MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(this.n);
@@ -165,7 +165,7 @@ public class a {
     public final Drawable f(Drawable drawable) {
         int i;
         int i2;
-        if (this.f1231c.getUseCompatPadding()) {
+        if (this.f1228c.getUseCompatPadding()) {
             int ceil = (int) Math.ceil((double) d());
             i2 = (int) Math.ceil((double) c());
             i = ceil;
@@ -202,7 +202,7 @@ public class a {
         if (materialShapeDrawable2 != null) {
             materialShapeDrawable2.setShapeAppearanceModel(shapeAppearanceModel);
         }
-        MaterialShapeDrawable materialShapeDrawable3 = this.f1232s;
+        MaterialShapeDrawable materialShapeDrawable3 = this.f1229s;
         if (materialShapeDrawable3 != null) {
             materialShapeDrawable3.setShapeAppearanceModel(shapeAppearanceModel);
         }
@@ -213,30 +213,30 @@ public class a {
     }
 
     public final boolean i() {
-        return this.f1231c.getPreventCornerOverlap() && !this.e.isRoundRect();
+        return this.f1228c.getPreventCornerOverlap() && !this.e.isRoundRect();
     }
 
     public final boolean j() {
-        return this.f1231c.getPreventCornerOverlap() && this.e.isRoundRect() && this.f1231c.getUseCompatPadding();
+        return this.f1228c.getPreventCornerOverlap() && this.e.isRoundRect() && this.f1228c.getUseCompatPadding();
     }
 
     public void k() {
         float f = 0.0f;
         float a2 = i() || j() ? a() : 0.0f;
-        if (this.f1231c.getPreventCornerOverlap() && this.f1231c.getUseCompatPadding()) {
-            f = (float) ((1.0d - b) * ((double) this.f1231c.getCardViewRadius()));
+        if (this.f1228c.getPreventCornerOverlap() && this.f1228c.getUseCompatPadding()) {
+            f = (float) ((1.0d - b) * ((double) this.f1228c.getCardViewRadius()));
         }
         int i = (int) (a2 - f);
-        MaterialCardView materialCardView = this.f1231c;
+        MaterialCardView materialCardView = this.f1228c;
         Rect rect = this.d;
         materialCardView.setAncestorContentPadding(rect.left + i, rect.top + i, rect.right + i, rect.bottom + i);
     }
 
     public void l() {
         if (!this.t) {
-            this.f1231c.setBackgroundInternal(f(this.e));
+            this.f1228c.setBackgroundInternal(f(this.e));
         }
-        this.f1231c.setForeground(f(this.j));
+        this.f1228c.setForeground(f(this.j));
     }
 
     public final void m() {
diff --git a/app/src/main/java/c/i/a/g/d/a.java b/app/src/main/java/c/i/a/g/d/a.java
index ba234fe414..7bd0cfe90d 100644
--- a/app/src/main/java/c/i/a/g/d/a.java
+++ b/app/src/main/java/c/i/a/g/d/a.java
@@ -23,7 +23,7 @@ public final class a {
     public final ColorStateList b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ColorStateList f1233c;
+    public final ColorStateList f1230c;
     public final ColorStateList d;
     public final int e;
     public final ShapeAppearanceModel f;
@@ -35,7 +35,7 @@ public final class a {
         Preconditions.checkArgumentNonnegative(rect.bottom);
         this.a = rect;
         this.b = colorStateList2;
-        this.f1233c = colorStateList;
+        this.f1230c = colorStateList;
         this.d = colorStateList3;
         this.e = i;
         this.f = shapeAppearanceModel;
@@ -60,7 +60,7 @@ public final class a {
         MaterialShapeDrawable materialShapeDrawable2 = new MaterialShapeDrawable();
         materialShapeDrawable.setShapeAppearanceModel(this.f);
         materialShapeDrawable2.setShapeAppearanceModel(this.f);
-        materialShapeDrawable.setFillColor(this.f1233c);
+        materialShapeDrawable.setFillColor(this.f1230c);
         materialShapeDrawable.setStroke((float) this.e, this.d);
         textView.setTextColor(this.b);
         RippleDrawable rippleDrawable = new RippleDrawable(this.b.withAlpha(30), materialShapeDrawable, materialShapeDrawable2);
diff --git a/app/src/main/java/c/i/a/g/d/b.java b/app/src/main/java/c/i/a/g/d/b.java
index e1a685edc0..83ea6fae49 100644
--- a/app/src/main/java/c/i/a/g/d/b.java
+++ b/app/src/main/java/c/i/a/g/d/b.java
@@ -18,7 +18,7 @@ public final class b {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f1234c;
+    public final a f1231c;
     @NonNull
     public final a d;
     @NonNull
@@ -35,7 +35,7 @@ public final class b {
         this.a = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_dayStyle, 0));
         this.g = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_dayInvalidStyle, 0));
         this.b = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_daySelectedStyle, 0));
-        this.f1234c = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_dayTodayStyle, 0));
+        this.f1231c = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_dayTodayStyle, 0));
         ColorStateList colorStateList = MaterialResources.getColorStateList(context, obtainStyledAttributes, R.styleable.MaterialCalendar_rangeFillColor);
         this.d = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_yearStyle, 0));
         this.e = a.a(context, obtainStyledAttributes.getResourceId(R.styleable.MaterialCalendar_yearSelectedStyle, 0));
diff --git a/app/src/main/java/c/i/a/g/d/g.java b/app/src/main/java/c/i/a/g/d/g.java
index 6a06108af3..a3faf557b8 100644
--- a/app/src/main/java/c/i/a/g/d/g.java
+++ b/app/src/main/java/c/i/a/g/d/g.java
@@ -75,7 +75,7 @@ public class g extends BaseAdapter {
                         break;
                     }
                 }
-                aVar = z2 ? this.m.b : l.h().getTimeInMillis() == j ? this.m.f1234c : this.m.a;
+                aVar = z2 ? this.m.b : l.h().getTimeInMillis() == j ? this.m.f1231c : this.m.a;
             } else {
                 textView.setEnabled(false);
                 aVar = this.m.g;
diff --git a/app/src/main/java/c/i/a/g/d/k.java b/app/src/main/java/c/i/a/g/d/k.java
index 34e620bad2..29fdb74fbe 100644
--- a/app/src/main/java/c/i/a/g/d/k.java
+++ b/app/src/main/java/c/i/a/g/d/k.java
@@ -10,7 +10,7 @@ public class k {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public final TimeZone f1235c = null;
+    public final TimeZone f1232c = null;
 
     public k(@Nullable Long l, @Nullable TimeZone timeZone) {
     }
diff --git a/app/src/main/java/c/i/a/g/d/l.java b/app/src/main/java/c/i/a/g/d/l.java
index d27728e7ac..3ede9d2ff5 100644
--- a/app/src/main/java/c/i/a/g/d/l.java
+++ b/app/src/main/java/c/i/a/g/d/l.java
@@ -71,7 +71,7 @@ public class l {
         if (kVar == null) {
             kVar = k.a;
         }
-        java.util.TimeZone timeZone = kVar.f1235c;
+        java.util.TimeZone timeZone = kVar.f1232c;
         Calendar instance = timeZone == null ? Calendar.getInstance() : Calendar.getInstance(timeZone);
         Long l = kVar.b;
         if (l != null) {
diff --git a/app/src/main/java/c/i/a/g/e/b.java b/app/src/main/java/c/i/a/g/e/b.java
index 84e034b04f..a9c1efb5bb 100644
--- a/app/src/main/java/c/i/a/g/e/b.java
+++ b/app/src/main/java/c/i/a/g/e/b.java
@@ -23,7 +23,7 @@ public abstract class b implements j {
     public final ExtendedFloatingActionButton b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ArrayList<Animator.AnimatorListener> f1236c = new ArrayList<>();
+    public final ArrayList<Animator.AnimatorListener> f1233c = new ArrayList<>();
     public final a d;
     @Nullable
     public MotionSpec e;
diff --git a/app/src/main/java/c/i/a/g/e/c.java b/app/src/main/java/c/i/a/g/e/c.java
index a016b2b040..e57d28ba4a 100644
--- a/app/src/main/java/c/i/a/g/e/c.java
+++ b/app/src/main/java/c/i/a/g/e/c.java
@@ -29,7 +29,7 @@ public class c extends Drawable {
     public final Paint b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Path f1237c = new Path();
+    public final Path f1234c = new Path();
     public final Rect d = new Rect();
     public final RectF e = new RectF();
     public final RectF f = new RectF();
@@ -130,9 +130,9 @@ public class c extends Drawable {
         }
         copyBounds(this.d);
         this.e.set(this.d);
-        this.a.calculatePath(this.o, 1.0f, this.e, this.f1237c);
-        if (this.f1237c.isConvex()) {
-            outline.setConvexPath(this.f1237c);
+        this.a.calculatePath(this.o, 1.0f, this.e, this.f1234c);
+        if (this.f1234c.isConvex()) {
+            outline.setConvexPath(this.f1234c);
         }
     }
 
diff --git a/app/src/main/java/c/i/a/g/e/d.java b/app/src/main/java/c/i/a/g/e/d.java
index 02b98017cb..0288c5e5ce 100644
--- a/app/src/main/java/c/i/a/g/e/d.java
+++ b/app/src/main/java/c/i/a/g/e/d.java
@@ -10,13 +10,13 @@ public class d extends AnimatorListenerAdapter {
     public final /* synthetic */ boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ f.AbstractC0112f f1238c;
+    public final /* synthetic */ f.AbstractC0112f f1235c;
     public final /* synthetic */ f d;
 
     public d(f fVar, boolean z2, f.AbstractC0112f fVar2) {
         this.d = fVar;
         this.b = z2;
-        this.f1238c = fVar2;
+        this.f1235c = fVar2;
     }
 
     @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
@@ -33,7 +33,7 @@ public class d extends AnimatorListenerAdapter {
             FloatingActionButton floatingActionButton = fVar.F;
             boolean z2 = this.b;
             floatingActionButton.internalSetVisibility(z2 ? 8 : 4, z2);
-            f.AbstractC0112f fVar2 = this.f1238c;
+            f.AbstractC0112f fVar2 = this.f1235c;
             if (fVar2 != null) {
                 FloatingActionButton.a aVar = (FloatingActionButton.a) fVar2;
                 aVar.a.onHidden(FloatingActionButton.this);
diff --git a/app/src/main/java/c/i/a/g/e/e.java b/app/src/main/java/c/i/a/g/e/e.java
index 7a701c19b0..e275f3aaeb 100644
--- a/app/src/main/java/c/i/a/g/e/e.java
+++ b/app/src/main/java/c/i/a/g/e/e.java
@@ -10,17 +10,17 @@ public class e extends AnimatorListenerAdapter {
     public final /* synthetic */ f.AbstractC0112f b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ f f1239c;
+    public final /* synthetic */ f f1236c;
 
     public e(f fVar, boolean z2, f.AbstractC0112f fVar2) {
-        this.f1239c = fVar;
+        this.f1236c = fVar;
         this.a = z2;
         this.b = fVar2;
     }
 
     @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
     public void onAnimationEnd(Animator animator) {
-        f fVar = this.f1239c;
+        f fVar = this.f1236c;
         fVar.B = 0;
         fVar.v = null;
         f.AbstractC0112f fVar2 = this.b;
@@ -32,8 +32,8 @@ public class e extends AnimatorListenerAdapter {
 
     @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
     public void onAnimationStart(Animator animator) {
-        this.f1239c.F.internalSetVisibility(0, this.a);
-        f fVar = this.f1239c;
+        this.f1236c.F.internalSetVisibility(0, this.a);
+        f fVar = this.f1236c;
         fVar.B = 2;
         fVar.v = animator;
     }
diff --git a/app/src/main/java/c/i/a/g/e/f.java b/app/src/main/java/c/i/a/g/e/f.java
index bc826a9858..c8ee5e262c 100644
--- a/app/src/main/java/c/i/a/g/e/f.java
+++ b/app/src/main/java/c/i/a/g/e/f.java
@@ -39,7 +39,7 @@ public class f {
     public static final int[] b = {16842919, 16842910};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f1240c = {16843623, 16842908, 16842910};
+    public static final int[] f1237c = {16843623, 16842908, 16842910};
     public static final int[] d = {16842908, 16842910};
     public static final int[] e = {16843623, 16842910};
     public static final int[] f = {16842910};
@@ -76,7 +76,7 @@ public class f {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final StateListAnimator f1241s;
+    public final StateListAnimator f1238s;
     @Nullable
     public MotionSpec t;
     @Nullable
@@ -88,13 +88,13 @@ public class f {
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public MotionSpec f1242x;
+    public MotionSpec f1239x;
 
     /* renamed from: y  reason: collision with root package name */
-    public float f1243y;
+    public float f1240y;
 
     /* renamed from: z  reason: collision with root package name */
-    public float f1244z = 1.0f;
+    public float f1241z = 1.0f;
 
     /* compiled from: FloatingActionButtonImpl */
     public class a extends MatrixEvaluator {
@@ -103,7 +103,7 @@ public class f {
 
         @Override // com.google.android.material.animation.MatrixEvaluator
         public Matrix evaluate(float f, @NonNull Matrix matrix, @NonNull Matrix matrix2) {
-            f.this.f1244z = f;
+            f.this.f1241z = f;
             return super.evaluate(f, matrix, matrix2);
         }
 
@@ -111,7 +111,7 @@ public class f {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [float, java.lang.Object, java.lang.Object] */
         @Override // com.google.android.material.animation.MatrixEvaluator, android.animation.TypeEvaluator
         public Matrix evaluate(float f, @NonNull Matrix matrix, @NonNull Matrix matrix2) {
-            f.this.f1244z = f;
+            f.this.f1241z = f;
             return super.evaluate(f, matrix, matrix2);
         }
     }
@@ -184,7 +184,7 @@ public class f {
         public float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public float f1245c;
+        public float f1242c;
 
         public h(d dVar) {
         }
@@ -193,7 +193,7 @@ public class f {
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
-            f.this.w((float) ((int) this.f1245c));
+            f.this.w((float) ((int) this.f1242c));
             this.a = false;
         }
 
@@ -202,12 +202,12 @@ public class f {
             if (!this.a) {
                 MaterialShapeDrawable materialShapeDrawable = f.this.i;
                 this.b = materialShapeDrawable == null ? 0.0f : materialShapeDrawable.getElevation();
-                this.f1245c = a();
+                this.f1242c = a();
                 this.a = true;
             }
             f fVar = f.this;
             float f = this.b;
-            fVar.w((float) ((int) ((valueAnimator.getAnimatedFraction() * (this.f1245c - f)) + f)));
+            fVar.w((float) ((int) ((valueAnimator.getAnimatedFraction() * (this.f1242c - f)) + f)));
         }
     }
 
@@ -215,14 +215,14 @@ public class f {
         this.F = floatingActionButton;
         this.G = shadowViewDelegate;
         StateListAnimator stateListAnimator = new StateListAnimator();
-        this.f1241s = stateListAnimator;
+        this.f1238s = stateListAnimator;
         stateListAnimator.addState(b, c(new d()));
-        stateListAnimator.addState(f1240c, c(new c()));
+        stateListAnimator.addState(f1237c, c(new c()));
         stateListAnimator.addState(d, c(new c()));
         stateListAnimator.addState(e, c(new c()));
         stateListAnimator.addState(f, c(new g()));
         stateListAnimator.addState(g, c(new b(this)));
-        this.f1243y = floatingActionButton.getRotation();
+        this.f1240y = floatingActionButton.getRotation();
     }
 
     public final void a(float f2, @NonNull Matrix matrix) {
@@ -340,7 +340,7 @@ public class f {
     }
 
     public final void o(float f2) {
-        this.f1244z = f2;
+        this.f1241z = f2;
         Matrix matrix = this.K;
         a(f2, matrix);
         this.F.setImageMatrix(matrix);
diff --git a/app/src/main/java/c/i/a/g/e/h.java b/app/src/main/java/c/i/a/g/e/h.java
index 835e46d1c1..e9d6d0fd16 100644
--- a/app/src/main/java/c/i/a/g/e/h.java
+++ b/app/src/main/java/c/i/a/g/e/h.java
@@ -13,10 +13,10 @@ public class h implements ViewTreeObserver.OnPreDrawListener {
     public boolean onPreDraw() {
         f fVar = this.i;
         float rotation = fVar.F.getRotation();
-        if (fVar.f1243y == rotation) {
+        if (fVar.f1240y == rotation) {
             return true;
         }
-        fVar.f1243y = rotation;
+        fVar.f1240y = rotation;
         fVar.u();
         return true;
     }
diff --git a/app/src/main/java/c/i/a/g/e/i.java b/app/src/main/java/c/i/a/g/e/i.java
index f047b5fdbb..356e4556a8 100644
--- a/app/src/main/java/c/i/a/g/e/i.java
+++ b/app/src/main/java/c/i/a/g/e/i.java
@@ -140,7 +140,7 @@ public class i extends f {
         } else {
             StateListAnimator stateListAnimator = new StateListAnimator();
             stateListAnimator.addState(f.b, x(f, f3));
-            stateListAnimator.addState(f.f1240c, x(f, f2));
+            stateListAnimator.addState(f.f1237c, x(f, f2));
             stateListAnimator.addState(f.d, x(f, f2));
             stateListAnimator.addState(f.e, x(f, f2));
             AnimatorSet animatorSet = new AnimatorSet();
diff --git a/app/src/main/java/c/i/a/g/f/a.java b/app/src/main/java/c/i/a/g/f/a.java
index 0b8a2e3172..8127079ac2 100644
--- a/app/src/main/java/c/i/a/g/f/a.java
+++ b/app/src/main/java/c/i/a/g/f/a.java
@@ -20,7 +20,7 @@ public final class a {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public static Object f1246c;
+    public static Object f1243c;
     public CharSequence d;
     public final TextPaint e;
     public final int f;
@@ -79,7 +79,7 @@ public final class a {
         }
         if (!a) {
             try {
-                f1246c = this.k && i >= 23 ? TextDirectionHeuristics.RTL : TextDirectionHeuristics.LTR;
+                f1243c = this.k && i >= 23 ? TextDirectionHeuristics.RTL : TextDirectionHeuristics.LTR;
                 Class cls = Integer.TYPE;
                 Class cls2 = Float.TYPE;
                 Constructor<StaticLayout> declaredConstructor = StaticLayout.class.getDeclaredConstructor(CharSequence.class, cls, cls, TextPaint.class, cls, Layout.Alignment.class, TextDirectionHeuristic.class, cls2, cls2, Boolean.TYPE, TextUtils.TruncateAt.class, cls, cls);
@@ -91,7 +91,7 @@ public final class a {
             }
         }
         try {
-            return (StaticLayout) ((Constructor) Preconditions.checkNotNull(b)).newInstance(charSequence, 0, Integer.valueOf(this.g), this.e, Integer.valueOf(max), this.h, Preconditions.checkNotNull(f1246c), Float.valueOf(1.0f), Float.valueOf(0.0f), Boolean.valueOf(this.j), null, Integer.valueOf(max), Integer.valueOf(this.i));
+            return (StaticLayout) ((Constructor) Preconditions.checkNotNull(b)).newInstance(charSequence, 0, Integer.valueOf(this.g), this.e, Integer.valueOf(max), this.h, Preconditions.checkNotNull(f1243c), Float.valueOf(1.0f), Float.valueOf(0.0f), Boolean.valueOf(this.j), null, Integer.valueOf(max), Integer.valueOf(this.i));
         } catch (Exception e2) {
             throw new C0113a(e2);
         }
diff --git a/app/src/main/java/c/i/a/g/g/a.java b/app/src/main/java/c/i/a/g/g/a.java
index 944a132cec..f853f808ea 100644
--- a/app/src/main/java/c/i/a/g/g/a.java
+++ b/app/src/main/java/c/i/a/g/g/a.java
@@ -12,7 +12,7 @@ import com.google.android.material.progressindicator.CircularProgressIndicatorSp
 public final class a extends f<CircularProgressIndicatorSpec> {
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1247c = 1;
+    public int f1244c = 1;
     public float d;
     public float e;
     public float f;
@@ -30,7 +30,7 @@ public final class a extends f<CircularProgressIndicatorSpec> {
         float f3 = -f2;
         canvas.clipRect(f3, f3, f2, f2);
         S s3 = this.a;
-        this.f1247c = ((CircularProgressIndicatorSpec) s3).indicatorDirection == 0 ? 1 : -1;
+        this.f1244c = ((CircularProgressIndicatorSpec) s3).indicatorDirection == 0 ? 1 : -1;
         this.d = ((float) ((CircularProgressIndicatorSpec) s3).trackThickness) * f;
         this.e = ((float) ((CircularProgressIndicatorSpec) s3).trackCornerRadius) * f;
         this.f = ((float) (((CircularProgressIndicatorSpec) s3).indicatorSize - ((CircularProgressIndicatorSpec) s3).trackThickness)) / 2.0f;
@@ -49,7 +49,7 @@ public final class a extends f<CircularProgressIndicatorSpec> {
             paint.setAntiAlias(true);
             paint.setColor(i);
             paint.setStrokeWidth(this.d);
-            float f3 = (float) this.f1247c;
+            float f3 = (float) this.f1244c;
             float f4 = f * 360.0f * f3;
             if (f2 < f) {
                 f2 += 1.0f;
@@ -100,11 +100,11 @@ public final class a extends f<CircularProgressIndicatorSpec> {
         canvas.rotate(f3);
         float f5 = f / 2.0f;
         float f6 = f4 * f2;
-        canvas.drawRect((this.f - f5) + f2, Math.min(0.0f, ((float) this.f1247c) * f6), (this.f + f5) - f2, Math.max(0.0f, f6 * ((float) this.f1247c)), paint);
+        canvas.drawRect((this.f - f5) + f2, Math.min(0.0f, ((float) this.f1244c) * f6), (this.f + f5) - f2, Math.max(0.0f, f6 * ((float) this.f1244c)), paint);
         canvas.translate((this.f - f5) + f2, 0.0f);
-        canvas.drawArc(rectF, 180.0f, (-f4) * 90.0f * ((float) this.f1247c), true, paint);
+        canvas.drawArc(rectF, 180.0f, (-f4) * 90.0f * ((float) this.f1244c), true, paint);
         canvas.translate(f - (f2 * 2.0f), 0.0f);
-        canvas.drawArc(rectF, 0.0f, f4 * 90.0f * ((float) this.f1247c), true, paint);
+        canvas.drawArc(rectF, 0.0f, f4 * 90.0f * ((float) this.f1244c), true, paint);
         canvas.restore();
     }
 }
diff --git a/app/src/main/java/c/i/a/g/g/d.java b/app/src/main/java/c/i/a/g/g/d.java
index 53b6e805d2..9915c81bd0 100644
--- a/app/src/main/java/c/i/a/g/g/d.java
+++ b/app/src/main/java/c/i/a/g/g/d.java
@@ -74,7 +74,7 @@ public final class d extends g<ObjectAnimator> {
                     int length = i4 % iArr.length;
                     int compositeARGBWithAlpha = MaterialColors.compositeARGBWithAlpha(iArr[length], dVar2.a.getAlpha());
                     int compositeARGBWithAlpha2 = MaterialColors.compositeARGBWithAlpha(dVar2.l.indicatorColors[(length + 1) % iArr.length], dVar2.a.getAlpha());
-                    dVar2.f1248c[0] = ArgbEvaluatorCompat.getInstance().evaluate(dVar2.k.getInterpolation(b3), Integer.valueOf(compositeARGBWithAlpha), Integer.valueOf(compositeARGBWithAlpha2)).intValue();
+                    dVar2.f1245c[0] = ArgbEvaluatorCompat.getInstance().evaluate(dVar2.k.getInterpolation(b3), Integer.valueOf(compositeARGBWithAlpha), Integer.valueOf(compositeARGBWithAlpha2)).intValue();
                     break;
                 }
                 i3++;
@@ -167,7 +167,7 @@ public final class d extends g<ObjectAnimator> {
     @VisibleForTesting
     public void h() {
         this.m = 0;
-        this.f1248c[0] = MaterialColors.compositeARGBWithAlpha(this.l.indicatorColors[0], this.a.getAlpha());
+        this.f1245c[0] = MaterialColors.compositeARGBWithAlpha(this.l.indicatorColors[0], this.a.getAlpha());
         this.o = 0.0f;
     }
 }
diff --git a/app/src/main/java/c/i/a/g/g/g.java b/app/src/main/java/c/i/a/g/g/g.java
index 8afd742d5e..4802b967be 100644
--- a/app/src/main/java/c/i/a/g/g/g.java
+++ b/app/src/main/java/c/i/a/g/g/g.java
@@ -10,11 +10,11 @@ public abstract class g<T extends Animator> {
     public final float[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int[] f1248c;
+    public final int[] f1245c;
 
     public g(int i) {
         this.b = new float[(i * 2)];
-        this.f1248c = new int[i];
+        this.f1245c = new int[i];
     }
 
     public abstract void a();
diff --git a/app/src/main/java/c/i/a/g/g/h.java b/app/src/main/java/c/i/a/g/g/h.java
index ea32c68b55..d88717e1ca 100644
--- a/app/src/main/java/c/i/a/g/g/h.java
+++ b/app/src/main/java/c/i/a/g/g/h.java
@@ -13,7 +13,7 @@ import com.google.android.material.progressindicator.LinearProgressIndicatorSpec
 public final class h extends f<LinearProgressIndicatorSpec> {
 
     /* renamed from: c  reason: collision with root package name */
-    public float f1249c = 300.0f;
+    public float f1246c = 300.0f;
     public float d;
     public float e;
 
@@ -42,7 +42,7 @@ public final class h extends f<LinearProgressIndicatorSpec> {
     @Override // c.i.a.g.g.f
     public void a(@NonNull Canvas canvas, @FloatRange(from = 0.0d, to = 1.0d) float f) {
         Rect clipBounds = canvas.getClipBounds();
-        this.f1249c = (float) clipBounds.width();
+        this.f1246c = (float) clipBounds.width();
         float f2 = (float) ((LinearProgressIndicatorSpec) this.a).trackThickness;
         canvas.translate(((float) clipBounds.width()) / 2.0f, Math.max(0.0f, ((float) (clipBounds.height() - ((LinearProgressIndicatorSpec) this.a).trackThickness)) / 2.0f) + (((float) clipBounds.height()) / 2.0f));
         if (((LinearProgressIndicatorSpec) this.a).drawHorizontallyInverse) {
@@ -54,7 +54,7 @@ public final class h extends f<LinearProgressIndicatorSpec> {
         if (this.b.isShowing() || this.b.isHiding()) {
             canvas.translate(0.0f, ((f - 1.0f) * ((float) ((LinearProgressIndicatorSpec) this.a).trackThickness)) / 2.0f);
         }
-        float f3 = this.f1249c;
+        float f3 = this.f1246c;
         canvas.clipRect((-f3) / 2.0f, (-f2) / 2.0f, f3 / 2.0f, f2 / 2.0f);
         S s2 = this.a;
         this.d = ((float) ((LinearProgressIndicatorSpec) s2).trackThickness) * f;
@@ -64,7 +64,7 @@ public final class h extends f<LinearProgressIndicatorSpec> {
     @Override // c.i.a.g.g.f
     public void b(@NonNull Canvas canvas, @NonNull Paint paint, @FloatRange(from = 0.0d, to = 1.0d) float f, @FloatRange(from = 0.0d, to = 1.0d) float f2, @ColorInt int i) {
         if (f != f2) {
-            float f3 = this.f1249c;
+            float f3 = this.f1246c;
             float f4 = this.e;
             float f5 = ((-f3) / 2.0f) + f4;
             float f6 = f3 - (f4 * 2.0f);
@@ -86,7 +86,7 @@ public final class h extends f<LinearProgressIndicatorSpec> {
     @Override // c.i.a.g.g.f
     public void c(@NonNull Canvas canvas, @NonNull Paint paint) {
         int compositeARGBWithAlpha = MaterialColors.compositeARGBWithAlpha(((LinearProgressIndicatorSpec) this.a).trackColor, this.b.getAlpha());
-        float f = ((-this.f1249c) / 2.0f) + this.e;
+        float f = ((-this.f1246c) / 2.0f) + this.e;
         float f2 = -f;
         paint.setStyle(Paint.Style.FILL);
         paint.setAntiAlias(true);
diff --git a/app/src/main/java/c/i/a/g/g/j.java b/app/src/main/java/c/i/a/g/g/j.java
index 548df43871..5002c9e961 100644
--- a/app/src/main/java/c/i/a/g/g/j.java
+++ b/app/src/main/java/c/i/a/g/g/j.java
@@ -53,7 +53,7 @@ public final class j extends g<ObjectAnimator> {
             float[] fArr3 = jVar2.b;
             fArr3[5] = 1.0f;
             if (jVar2.i && fArr3[3] < 1.0f) {
-                int[] iArr = jVar2.f1248c;
+                int[] iArr = jVar2.f1245c;
                 iArr[2] = iArr[1];
                 iArr[1] = iArr[0];
                 iArr[0] = MaterialColors.compositeARGBWithAlpha(jVar2.g.indicatorColors[jVar2.h], jVar2.a.getAlpha());
@@ -112,6 +112,6 @@ public final class j extends g<ObjectAnimator> {
     public void h() {
         this.i = true;
         this.h = 1;
-        Arrays.fill(this.f1248c, MaterialColors.compositeARGBWithAlpha(this.g.indicatorColors[0], this.a.getAlpha()));
+        Arrays.fill(this.f1245c, MaterialColors.compositeARGBWithAlpha(this.g.indicatorColors[0], this.a.getAlpha()));
     }
 }
diff --git a/app/src/main/java/c/i/a/g/g/l.java b/app/src/main/java/c/i/a/g/g/l.java
index a998cd9009..cb1d1a2f68 100644
--- a/app/src/main/java/c/i/a/g/g/l.java
+++ b/app/src/main/java/c/i/a/g/g/l.java
@@ -51,7 +51,7 @@ public final class l extends g<ObjectAnimator> {
                 lVar2.b[i2] = Math.max(0.0f, Math.min(1.0f, lVar2.h[i2].getInterpolation(lVar2.b(i, l.e[i2], l.d[i2]))));
             }
             if (lVar2.k) {
-                Arrays.fill(lVar2.f1248c, MaterialColors.compositeARGBWithAlpha(lVar2.i.indicatorColors[lVar2.j], lVar2.a.getAlpha()));
+                Arrays.fill(lVar2.f1245c, MaterialColors.compositeARGBWithAlpha(lVar2.i.indicatorColors[lVar2.j], lVar2.a.getAlpha()));
                 lVar2.k = false;
             }
             lVar2.a.invalidateSelf();
@@ -118,7 +118,7 @@ public final class l extends g<ObjectAnimator> {
     public void h() {
         this.j = 0;
         int compositeARGBWithAlpha = MaterialColors.compositeARGBWithAlpha(this.i.indicatorColors[0], this.a.getAlpha());
-        int[] iArr = this.f1248c;
+        int[] iArr = this.f1245c;
         iArr[0] = compositeARGBWithAlpha;
         iArr[1] = compositeARGBWithAlpha;
     }
diff --git a/app/src/main/java/c/i/a/g/h/a.java b/app/src/main/java/c/i/a/g/h/a.java
index 7eca637b0e..b03180d049 100644
--- a/app/src/main/java/c/i/a/g/h/a.java
+++ b/app/src/main/java/c/i/a/g/h/a.java
@@ -14,7 +14,7 @@ public class a {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Handler f1250c = new Handler(Looper.getMainLooper(), new C0114a());
+    public final Handler f1247c = new Handler(Looper.getMainLooper(), new C0114a());
     @Nullable
     public c d;
     @Nullable
@@ -56,7 +56,7 @@ public class a {
         public int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f1251c;
+        public boolean f1248c;
 
         public c(int i, b bVar) {
             this.a = new WeakReference<>(bVar);
@@ -76,7 +76,7 @@ public class a {
         if (bVar == null) {
             return false;
         }
-        this.f1250c.removeCallbacksAndMessages(cVar);
+        this.f1247c.removeCallbacksAndMessages(cVar);
         bVar.a(i);
         return true;
     }
@@ -101,9 +101,9 @@ public class a {
         synchronized (this.b) {
             if (c(bVar)) {
                 c cVar = this.d;
-                if (!cVar.f1251c) {
-                    cVar.f1251c = true;
-                    this.f1250c.removeCallbacksAndMessages(cVar);
+                if (!cVar.f1248c) {
+                    cVar.f1248c = true;
+                    this.f1247c.removeCallbacksAndMessages(cVar);
                 }
             }
         }
@@ -113,8 +113,8 @@ public class a {
         synchronized (this.b) {
             if (c(bVar)) {
                 c cVar = this.d;
-                if (cVar.f1251c) {
-                    cVar.f1251c = false;
+                if (cVar.f1248c) {
+                    cVar.f1248c = false;
                     g(cVar);
                 }
             }
@@ -127,8 +127,8 @@ public class a {
             if (i <= 0) {
                 i = i == -1 ? 1500 : 2750;
             }
-            this.f1250c.removeCallbacksAndMessages(cVar);
-            Handler handler = this.f1250c;
+            this.f1247c.removeCallbacksAndMessages(cVar);
+            Handler handler = this.f1247c;
             handler.sendMessageDelayed(Message.obtain(handler, 0, cVar), (long) i);
         }
     }
diff --git a/app/src/main/java/c/i/a/g/j/d.java b/app/src/main/java/c/i/a/g/j/d.java
index 2e3e6b3878..610b352522 100644
--- a/app/src/main/java/c/i/a/g/j/d.java
+++ b/app/src/main/java/c/i/a/g/j/d.java
@@ -12,6 +12,6 @@ public class d implements ValueAnimator.AnimatorUpdateListener {
 
     @Override // android.animation.ValueAnimator.AnimatorUpdateListener
     public void onAnimationUpdate(@NonNull ValueAnimator valueAnimator) {
-        this.a.f1252c.setAlpha(((Float) valueAnimator.getAnimatedValue()).floatValue());
+        this.a.f1249c.setAlpha(((Float) valueAnimator.getAnimatedValue()).floatValue());
     }
 }
diff --git a/app/src/main/java/c/i/a/g/j/e.java b/app/src/main/java/c/i/a/g/j/e.java
index 27b2fe157c..d7fee97a9f 100644
--- a/app/src/main/java/c/i/a/g/j/e.java
+++ b/app/src/main/java/c/i/a/g/j/e.java
@@ -13,7 +13,7 @@ public class e implements ValueAnimator.AnimatorUpdateListener {
     @Override // android.animation.ValueAnimator.AnimatorUpdateListener
     public void onAnimationUpdate(@NonNull ValueAnimator valueAnimator) {
         float floatValue = ((Float) valueAnimator.getAnimatedValue()).floatValue();
-        this.a.f1252c.setScaleX(floatValue);
-        this.a.f1252c.setScaleY(floatValue);
+        this.a.f1249c.setScaleX(floatValue);
+        this.a.f1249c.setScaleY(floatValue);
     }
 }
diff --git a/app/src/main/java/c/i/a/g/j/h.java b/app/src/main/java/c/i/a/g/j/h.java
index 92d8ec30bd..ff13d82f66 100644
--- a/app/src/main/java/c/i/a/g/j/h.java
+++ b/app/src/main/java/c/i/a/g/j/h.java
@@ -73,7 +73,7 @@ public class h extends m {
         @Override // com.google.android.material.internal.TextWatcherAdapter, android.text.TextWatcher
         public void afterTextChanged(Editable editable) {
             AutoCompleteTextView d = h.d(h.this.a.getEditText());
-            if (h.this.n.isTouchExplorationEnabled() && h.e(d) && !h.this.f1252c.hasFocus()) {
+            if (h.this.n.isTouchExplorationEnabled() && h.e(d) && !h.this.f1249c.hasFocus()) {
                 d.dismissDropDown();
             }
             d.post(new RunnableC0117a(d));
@@ -174,7 +174,7 @@ public class h extends m {
                 z2 = true;
             }
             if (!z2) {
-                ViewCompat.setImportantForAccessibility(h.this.f1252c, 2);
+                ViewCompat.setImportantForAccessibility(h.this.f1249c, 2);
             }
             textInputLayout.setTextInputAccessibilityDelegate(h.this.f);
             textInputLayout.setEndIconVisible(true);
diff --git a/app/src/main/java/c/i/a/g/j/i.java b/app/src/main/java/c/i/a/g/j/i.java
index e745686876..9f724b4b66 100644
--- a/app/src/main/java/c/i/a/g/j/i.java
+++ b/app/src/main/java/c/i/a/g/j/i.java
@@ -12,6 +12,6 @@ public class i implements ValueAnimator.AnimatorUpdateListener {
 
     @Override // android.animation.ValueAnimator.AnimatorUpdateListener
     public void onAnimationUpdate(@NonNull ValueAnimator valueAnimator) {
-        this.a.f1252c.setAlpha(((Float) valueAnimator.getAnimatedValue()).floatValue());
+        this.a.f1249c.setAlpha(((Float) valueAnimator.getAnimatedValue()).floatValue());
     }
 }
diff --git a/app/src/main/java/c/i/a/g/j/l.java b/app/src/main/java/c/i/a/g/j/l.java
index 5c68784039..781ee07b7c 100644
--- a/app/src/main/java/c/i/a/g/j/l.java
+++ b/app/src/main/java/c/i/a/g/j/l.java
@@ -13,7 +13,7 @@ public class l extends AnimatorListenerAdapter {
     @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
     public void onAnimationEnd(Animator animator) {
         h hVar = this.a;
-        hVar.f1252c.setChecked(hVar.j);
+        hVar.f1249c.setChecked(hVar.j);
         this.a.p.start();
     }
 }
diff --git a/app/src/main/java/c/i/a/g/j/m.java b/app/src/main/java/c/i/a/g/j/m.java
index 3c80ef0b5b..259a450ece 100644
--- a/app/src/main/java/c/i/a/g/j/m.java
+++ b/app/src/main/java/c/i/a/g/j/m.java
@@ -10,12 +10,12 @@ public abstract class m {
     public Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public CheckableImageButton f1252c;
+    public CheckableImageButton f1249c;
 
     public m(@NonNull TextInputLayout textInputLayout) {
         this.a = textInputLayout;
         this.b = textInputLayout.getContext();
-        this.f1252c = textInputLayout.getEndIconView();
+        this.f1249c = textInputLayout.getEndIconView();
     }
 
     public abstract void a();
diff --git a/app/src/main/java/c/i/a/g/j/n.java b/app/src/main/java/c/i/a/g/j/n.java
index 5b83d8601d..142c4c3204 100644
--- a/app/src/main/java/c/i/a/g/j/n.java
+++ b/app/src/main/java/c/i/a/g/j/n.java
@@ -32,7 +32,7 @@ public final class n {
     public final TextInputLayout b;
 
     /* renamed from: c  reason: collision with root package name */
-    public LinearLayout f1253c;
+    public LinearLayout f1250c;
     public int d;
     public FrameLayout e;
     @Nullable
@@ -56,7 +56,7 @@ public final class n {
     public TextView r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f1254s;
+    public int f1251s;
     @Nullable
     public ColorStateList t;
     public Typeface u;
@@ -67,13 +67,13 @@ public final class n {
         public final /* synthetic */ TextView b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ int f1255c;
+        public final /* synthetic */ int f1252c;
         public final /* synthetic */ TextView d;
 
         public a(int i, TextView textView, int i2, TextView textView2) {
             this.a = i;
             this.b = textView;
-            this.f1255c = i2;
+            this.f1252c = i2;
             this.d = textView2;
         }
 
@@ -86,7 +86,7 @@ public final class n {
             TextView textView2 = this.b;
             if (textView2 != null) {
                 textView2.setVisibility(4);
-                if (this.f1255c == 1 && (textView = n.this.l) != null) {
+                if (this.f1252c == 1 && (textView = n.this.l) != null) {
                     textView.setText((CharSequence) null);
                 }
             }
@@ -114,13 +114,13 @@ public final class n {
     }
 
     public void a(TextView textView, int i) {
-        if (this.f1253c == null && this.e == null) {
+        if (this.f1250c == null && this.e == null) {
             LinearLayout linearLayout = new LinearLayout(this.a);
-            this.f1253c = linearLayout;
+            this.f1250c = linearLayout;
             linearLayout.setOrientation(0);
-            this.b.addView(this.f1253c, -1, -2);
+            this.b.addView(this.f1250c, -1, -2);
             this.e = new FrameLayout(this.a);
-            this.f1253c.addView(this.e, new LinearLayout.LayoutParams(0, -2, 1.0f));
+            this.f1250c.addView(this.e, new LinearLayout.LayoutParams(0, -2, 1.0f));
             if (this.b.getEditText() != null) {
                 b();
             }
@@ -129,17 +129,17 @@ public final class n {
             this.e.setVisibility(0);
             this.e.addView(textView);
         } else {
-            this.f1253c.addView(textView, new LinearLayout.LayoutParams(-2, -2));
+            this.f1250c.addView(textView, new LinearLayout.LayoutParams(-2, -2));
         }
-        this.f1253c.setVisibility(0);
+        this.f1250c.setVisibility(0);
         this.d++;
     }
 
     public void b() {
-        if ((this.f1253c == null || this.b.getEditText() == null) ? false : true) {
+        if ((this.f1250c == null || this.b.getEditText() == null) ? false : true) {
             EditText editText = this.b.getEditText();
             boolean isFontScaleAtLeast1_3 = MaterialResources.isFontScaleAtLeast1_3(this.a);
-            LinearLayout linearLayout = this.f1253c;
+            LinearLayout linearLayout = this.f1250c;
             int i = R.dimen.material_helper_text_font_1_3_padding_horizontal;
             ViewCompat.setPaddingRelative(linearLayout, h(isFontScaleAtLeast1_3, i, ViewCompat.getPaddingStart(editText)), h(isFontScaleAtLeast1_3, R.dimen.material_helper_text_font_1_3_padding_top, this.a.getResources().getDimensionPixelSize(R.dimen.material_helper_text_default_padding_top)), h(isFontScaleAtLeast1_3, i, ViewCompat.getPaddingEnd(editText)), 0);
         }
@@ -212,7 +212,7 @@ public final class n {
 
     public void j(TextView textView, int i) {
         FrameLayout frameLayout;
-        LinearLayout linearLayout = this.f1253c;
+        LinearLayout linearLayout = this.f1250c;
         if (linearLayout != null) {
             if (!(i == 0 || i == 1) || (frameLayout = this.e) == null) {
                 linearLayout.removeView(textView);
@@ -221,7 +221,7 @@ public final class n {
             }
             int i2 = this.d - 1;
             this.d = i2;
-            LinearLayout linearLayout2 = this.f1253c;
+            LinearLayout linearLayout2 = this.f1250c;
             if (i2 == 0) {
                 linearLayout2.setVisibility(8);
             }
diff --git a/app/src/main/java/c/i/a/g/j/p.java b/app/src/main/java/c/i/a/g/j/p.java
index fbd1fbf62c..4182d5b072 100644
--- a/app/src/main/java/c/i/a/g/j/p.java
+++ b/app/src/main/java/c/i/a/g/j/p.java
@@ -23,7 +23,7 @@ public class p extends m {
         @Override // com.google.android.material.internal.TextWatcherAdapter, android.text.TextWatcher
         public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
             p pVar = p.this;
-            pVar.f1252c.setChecked(!p.d(pVar));
+            pVar.f1249c.setChecked(!p.d(pVar));
         }
     }
 
@@ -38,7 +38,7 @@ public class p extends m {
             textInputLayout.setEndIconVisible(true);
             textInputLayout.setEndIconCheckable(true);
             p pVar = p.this;
-            pVar.f1252c.setChecked(!p.d(pVar));
+            pVar.f1249c.setChecked(!p.d(pVar));
             editText.removeTextChangedListener(p.this.d);
             editText.addTextChangedListener(p.this.d);
         }
diff --git a/app/src/main/java/c/i/a/g/k/b.java b/app/src/main/java/c/i/a/g/k/b.java
index d1963616f3..12cbaf4308 100644
--- a/app/src/main/java/c/i/a/g/k/b.java
+++ b/app/src/main/java/c/i/a/g/k/b.java
@@ -18,12 +18,12 @@ public class b implements ViewTreeObserver.OnPreDrawListener {
         }
         this.i.getViewTreeObserver().removeOnPreDrawListener(this);
         ClockFaceView clockFaceView = this.i;
-        int height = ((this.i.getHeight() / 2) - clockFaceView.l.q) - clockFaceView.f2322s;
+        int height = ((this.i.getHeight() / 2) - clockFaceView.l.q) - clockFaceView.f2328s;
         if (height != clockFaceView.j) {
             clockFaceView.j = height;
             clockFaceView.a();
             ClockHandView clockHandView = clockFaceView.l;
-            clockHandView.f2326z = clockFaceView.j;
+            clockHandView.f2332z = clockFaceView.j;
             clockHandView.invalidate();
         }
         return true;
diff --git a/app/src/main/java/c/i/a/g/k/f.java b/app/src/main/java/c/i/a/g/k/f.java
index 28c6f2be58..0b2f282f16 100644
--- a/app/src/main/java/c/i/a/g/k/f.java
+++ b/app/src/main/java/c/i/a/g/k/f.java
@@ -31,7 +31,7 @@ public class f implements ClockHandView.OnRotateListener, TimePickerView.d, Time
         TimePickerView timePickerView2 = this.l;
         timePickerView2.p = this;
         timePickerView2.o = this;
-        timePickerView2.k.f2324x = this;
+        timePickerView2.k.f2330x = this;
         g(i, "%d");
         g(j, "%d");
         g(k, "%02d");
diff --git a/app/src/main/java/c/i/a/g/l/b.java b/app/src/main/java/c/i/a/g/l/b.java
index bf528bd15d..986f3d9d79 100644
--- a/app/src/main/java/c/i/a/g/l/b.java
+++ b/app/src/main/java/c/i/a/g/l/b.java
@@ -5,7 +5,7 @@ public class b {
     public static final a b = new C0118b();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f1256c = new c();
+    public static final a f1253c = new c();
     public static final a d = new d();
 
     /* compiled from: FadeModeEvaluators */
diff --git a/app/src/main/java/c/i/a/g/l/c.java b/app/src/main/java/c/i/a/g/l/c.java
index bb5fe61478..844692bc99 100644
--- a/app/src/main/java/c/i/a/g/l/c.java
+++ b/app/src/main/java/c/i/a/g/l/c.java
@@ -5,12 +5,12 @@ public class c {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1257c;
+    public final boolean f1254c;
 
     public c(int i, int i2, boolean z2) {
         this.a = i;
         this.b = i2;
-        this.f1257c = z2;
+        this.f1254c = z2;
     }
 
     public static c a(int i, int i2) {
diff --git a/app/src/main/java/c/i/a/g/l/e.java b/app/src/main/java/c/i/a/g/l/e.java
index e394c84787..1c58f86277 100644
--- a/app/src/main/java/c/i/a/g/l/e.java
+++ b/app/src/main/java/c/i/a/g/l/e.java
@@ -39,12 +39,12 @@ public class e {
 
         @Override // c.i.a.g.l.d
         public boolean b(f fVar) {
-            return fVar.f1258c > fVar.e;
+            return fVar.f1255c > fVar.e;
         }
 
         @Override // c.i.a.g.l.d
         public void c(RectF rectF, float f, f fVar) {
-            float abs = (Math.abs(fVar.e - fVar.f1258c) / 2.0f) * f;
+            float abs = (Math.abs(fVar.e - fVar.f1255c) / 2.0f) * f;
             rectF.left += abs;
             rectF.right -= abs;
         }
diff --git a/app/src/main/java/c/i/a/g/l/f.java b/app/src/main/java/c/i/a/g/l/f.java
index b87e6dabca..3746e0e22c 100644
--- a/app/src/main/java/c/i/a/g/l/f.java
+++ b/app/src/main/java/c/i/a/g/l/f.java
@@ -5,7 +5,7 @@ public class f {
     public final float b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final float f1258c;
+    public final float f1255c;
     public final float d;
     public final float e;
     public final float f;
@@ -13,7 +13,7 @@ public class f {
     public f(float f, float f2, float f3, float f4, float f5, float f6) {
         this.a = f;
         this.b = f2;
-        this.f1258c = f3;
+        this.f1255c = f3;
         this.d = f4;
         this.e = f5;
         this.f = f6;
diff --git a/app/src/main/java/c/i/a/g/l/g.java b/app/src/main/java/c/i/a/g/l/g.java
index a7bcaad9bc..cde3f7ee19 100644
--- a/app/src/main/java/c/i/a/g/l/g.java
+++ b/app/src/main/java/c/i/a/g/l/g.java
@@ -9,7 +9,7 @@ public class g {
     public final Path b = new Path();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Path f1259c = new Path();
+    public final Path f1256c = new Path();
     public final ShapeAppearancePathProvider d = ShapeAppearancePathProvider.getInstance();
     public ShapeAppearanceModel e;
 }
diff --git a/app/src/main/java/c/i/a/g/l/l/b.java b/app/src/main/java/c/i/a/g/l/l/b.java
index b43f4aadb5..ca90f9e5a6 100644
--- a/app/src/main/java/c/i/a/g/l/l/b.java
+++ b/app/src/main/java/c/i/a/g/l/l/b.java
@@ -8,7 +8,7 @@ public class b {
     public static final a b = new C0119b();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f1260c = new c();
+    public static final a f1257c = new c();
     public static final a d = new d();
 
     /* compiled from: FadeModeEvaluators */
diff --git a/app/src/main/java/c/i/a/g/l/l/c.java b/app/src/main/java/c/i/a/g/l/l/c.java
index f9ae2a97b3..4322900819 100644
--- a/app/src/main/java/c/i/a/g/l/l/c.java
+++ b/app/src/main/java/c/i/a/g/l/l/c.java
@@ -8,12 +8,12 @@ public class c {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1261c;
+    public final boolean f1258c;
 
     public c(int i, int i2, boolean z2) {
         this.a = i;
         this.b = i2;
-        this.f1261c = z2;
+        this.f1258c = z2;
     }
 
     public static c a(int i, int i2) {
diff --git a/app/src/main/java/c/i/a/g/l/l/e.java b/app/src/main/java/c/i/a/g/l/l/e.java
index d0aed1318d..c50a00c5d7 100644
--- a/app/src/main/java/c/i/a/g/l/l/e.java
+++ b/app/src/main/java/c/i/a/g/l/l/e.java
@@ -41,12 +41,12 @@ public class e {
 
         @Override // c.i.a.g.l.l.d
         public boolean b(f fVar) {
-            return fVar.f1262c > fVar.e;
+            return fVar.f1259c > fVar.e;
         }
 
         @Override // c.i.a.g.l.l.d
         public void c(RectF rectF, float f, f fVar) {
-            float abs = (Math.abs(fVar.e - fVar.f1262c) / 2.0f) * f;
+            float abs = (Math.abs(fVar.e - fVar.f1259c) / 2.0f) * f;
             rectF.left += abs;
             rectF.right -= abs;
         }
diff --git a/app/src/main/java/c/i/a/g/l/l/f.java b/app/src/main/java/c/i/a/g/l/l/f.java
index b645e17dcf..06e40010ee 100644
--- a/app/src/main/java/c/i/a/g/l/l/f.java
+++ b/app/src/main/java/c/i/a/g/l/l/f.java
@@ -8,7 +8,7 @@ public class f {
     public final float b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final float f1262c;
+    public final float f1259c;
     public final float d;
     public final float e;
     public final float f;
@@ -16,7 +16,7 @@ public class f {
     public f(float f, float f2, float f3, float f4, float f5, float f6) {
         this.a = f;
         this.b = f2;
-        this.f1262c = f3;
+        this.f1259c = f3;
         this.d = f4;
         this.e = f5;
         this.f = f6;
diff --git a/app/src/main/java/c/i/a/g/l/l/g.java b/app/src/main/java/c/i/a/g/l/l/g.java
index 36ae896273..bc23891902 100644
--- a/app/src/main/java/c/i/a/g/l/l/g.java
+++ b/app/src/main/java/c/i/a/g/l/l/g.java
@@ -11,7 +11,7 @@ public class g {
     public final Path b = new Path();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Path f1263c = new Path();
+    public final Path f1260c = new Path();
     public final ShapeAppearancePathProvider d = ShapeAppearancePathProvider.getInstance();
     public ShapeAppearanceModel e;
 }
diff --git a/app/src/main/java/c/i/b/a/c.java b/app/src/main/java/c/i/b/a/c.java
index 83e7739b0e..0b059eaf20 100644
--- a/app/src/main/java/c/i/b/a/c.java
+++ b/app/src/main/java/c/i/b/a/c.java
@@ -7,7 +7,7 @@ public final class c {
     public static final Charset b = Charset.forName("ISO-8859-1");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Charset f1264c = Charset.forName("UTF-8");
+    public static final Charset f1261c = Charset.forName("UTF-8");
     public static final Charset d = Charset.forName("UTF-16LE");
     public static final Charset e = Charset.forName("UTF-16");
 
diff --git a/app/src/main/java/c/i/b/a/g.java b/app/src/main/java/c/i/b/a/g.java
index b4c3fd37b8..134f46d847 100644
--- a/app/src/main/java/c/i/b/a/g.java
+++ b/app/src/main/java/c/i/b/a/g.java
@@ -9,7 +9,7 @@ public final class g {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public a f1265c;
+    public a f1262c;
 
     /* compiled from: MoreObjects */
     public static final class a {
@@ -20,7 +20,7 @@ public final class g {
         @NullableDecl
 
         /* renamed from: c  reason: collision with root package name */
-        public a f1266c;
+        public a f1263c;
 
         public a(f fVar) {
         }
@@ -29,7 +29,7 @@ public final class g {
     public g(String str, f fVar) {
         a aVar = new a(null);
         this.b = aVar;
-        this.f1265c = aVar;
+        this.f1262c = aVar;
         this.a = str;
     }
 
@@ -37,8 +37,8 @@ public final class g {
     public g a(String str, int i) {
         String valueOf = String.valueOf(i);
         a aVar = new a(null);
-        this.f1265c.f1266c = aVar;
-        this.f1265c = aVar;
+        this.f1262c.f1263c = aVar;
+        this.f1262c = aVar;
         aVar.b = valueOf;
         aVar.a = str;
         return this;
@@ -48,7 +48,7 @@ public final class g {
         StringBuilder sb = new StringBuilder(32);
         sb.append(this.a);
         sb.append('{');
-        a aVar = this.b.f1266c;
+        a aVar = this.b.f1263c;
         String str = "";
         while (aVar != null) {
             Object obj = aVar.b;
@@ -64,7 +64,7 @@ public final class g {
                 String deepToString = Arrays.deepToString(new Object[]{obj});
                 sb.append((CharSequence) deepToString, 1, deepToString.length() - 1);
             }
-            aVar = aVar.f1266c;
+            aVar = aVar.f1263c;
             str = ", ";
         }
         sb.append('}');
diff --git a/app/src/main/java/c/i/b/a/k.java b/app/src/main/java/c/i/b/a/k.java
index 44f10dba7b..d65ec5787e 100644
--- a/app/src/main/java/c/i/b/a/k.java
+++ b/app/src/main/java/c/i/b/a/k.java
@@ -11,7 +11,7 @@ public final class k {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1267c = Integer.MAX_VALUE;
+    public final int f1264c = Integer.MAX_VALUE;
 
     /* compiled from: Splitter */
     public static abstract class a extends a<String> {
@@ -24,7 +24,7 @@ public final class k {
         public a(k kVar, CharSequence charSequence) {
             this.l = kVar.a;
             this.m = false;
-            this.o = kVar.f1267c;
+            this.o = kVar.f1264c;
             this.k = charSequence;
         }
     }
diff --git a/app/src/main/java/c/i/b/b/d0.java b/app/src/main/java/c/i/b/b/d0.java
index 4a21fd563e..9afd0fa620 100644
--- a/app/src/main/java/c/i/b/b/d0.java
+++ b/app/src/main/java/c/i/b/b/d0.java
@@ -14,7 +14,7 @@ public final class d0 {
     public int b = -1;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1268c = -1;
+    public int f1265c = -1;
     @MonotonicNonNullDecl
     public e0.p d;
     @MonotonicNonNullDecl
@@ -36,7 +36,7 @@ public final class d0 {
             if (i == -1) {
                 i = 16;
             }
-            int i2 = this.f1268c;
+            int i2 = this.f1265c;
             if (i2 == -1) {
                 i2 = 4;
             }
@@ -78,7 +78,7 @@ public final class d0 {
         if (i != -1) {
             gVar.a("initialCapacity", i);
         }
-        int i2 = this.f1268c;
+        int i2 = this.f1265c;
         if (i2 != -1) {
             gVar.a("concurrencyLevel", i2);
         }
@@ -86,8 +86,8 @@ public final class d0 {
         if (pVar != null) {
             String l0 = c.l0(pVar.toString());
             g.a aVar = new g.a(null);
-            gVar.f1265c.f1266c = aVar;
-            gVar.f1265c = aVar;
+            gVar.f1262c.f1263c = aVar;
+            gVar.f1262c = aVar;
             aVar.b = l0;
             aVar.a = "keyStrength";
         }
@@ -95,15 +95,15 @@ public final class d0 {
         if (pVar2 != null) {
             String l02 = c.l0(pVar2.toString());
             g.a aVar2 = new g.a(null);
-            gVar.f1265c.f1266c = aVar2;
-            gVar.f1265c = aVar2;
+            gVar.f1262c.f1263c = aVar2;
+            gVar.f1262c = aVar2;
             aVar2.b = l02;
             aVar2.a = "valueStrength";
         }
         if (this.f != null) {
             g.a aVar3 = new g.a(null);
-            gVar.f1265c.f1266c = aVar3;
-            gVar.f1265c = aVar3;
+            gVar.f1262c.f1263c = aVar3;
+            gVar.f1262c = aVar3;
             aVar3.b = "keyEquivalence";
         }
         return gVar.toString();
diff --git a/app/src/main/java/c/i/b/b/e0.java b/app/src/main/java/c/i/b/b/e0.java
index 4de1e84607..2908defea6 100644
--- a/app/src/main/java/c/i/b/b/e0.java
+++ b/app/src/main/java/c/i/b/b/e0.java
@@ -115,17 +115,17 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
         @NullableDecl
 
         /* renamed from: c  reason: collision with root package name */
-        public final E f1269c;
+        public final E f1266c;
 
         public c(K k, int i, @NullableDecl E e) {
             this.a = k;
             this.b = i;
-            this.f1269c = e;
+            this.f1266c = e;
         }
 
         @Override // c.i.b.b.e0.i
         public E a() {
-            return this.f1269c;
+            return this.f1266c;
         }
 
         @Override // c.i.b.b.e0.i
@@ -853,13 +853,13 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
             d0Var.f = dVar;
             d0Var.a = true;
             int i2 = this.concurrencyLevel;
-            int i3 = d0Var.f1268c;
+            int i3 = d0Var.f1265c;
             c.i.a.f.e.o.c.r(i3 == -1, "concurrency level was already set to %s", i3);
             if (i2 > 0) {
                 z2 = true;
             }
             c.i.a.f.e.o.c.h(z2);
-            d0Var.f1268c = i2;
+            d0Var.f1265c = i2;
             this.i = d0Var.c();
             while (true) {
                 Object readObject = objectInputStream.readObject();
@@ -1135,7 +1135,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
         @NullableDecl
 
         /* renamed from: c  reason: collision with root package name */
-        public volatile V f1270c = null;
+        public volatile V f1267c = null;
 
         /* compiled from: MapMakerInternalMap */
         public static final class a<K, V> implements j<K, V, w<K, V>, x<K, V>> {
@@ -1150,7 +1150,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
                     return null;
                 }
                 w wVar3 = new w(x.o(xVar), wVar.get(), wVar.a, wVar2);
-                wVar3.f1270c = wVar.f1270c;
+                wVar3.f1267c = wVar.f1267c;
                 return wVar3;
             }
 
@@ -1169,7 +1169,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
             @Override // c.i.b.b.e0.j
             public void d(n nVar, i iVar, Object obj) {
                 x xVar = (x) nVar;
-                ((w) iVar).f1270c = obj;
+                ((w) iVar).f1267c = obj;
             }
 
             @Override // c.i.b.b.e0.j
@@ -1190,7 +1190,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
         @Override // c.i.b.b.e0.i
         @NullableDecl
         public V getValue() {
-            return this.f1270c;
+            return this.f1267c;
         }
     }
 
@@ -1227,7 +1227,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
     public static final class y<K, V> extends d<K, V, y<K, V>> implements a0<K, V, y<K, V>> {
 
         /* renamed from: c  reason: collision with root package name */
-        public volatile b0<K, V, y<K, V>> f1271c = ((b0<K, V, y<K, V>>) e0.i);
+        public volatile b0<K, V, y<K, V>> f1268c = ((b0<K, V, y<K, V>>) e0.i);
 
         /* compiled from: MapMakerInternalMap */
         public static final class a<K, V> implements j<K, V, y<K, V>, z<K, V>> {
@@ -1248,7 +1248,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
                 ReferenceQueue o = z.o(zVar);
                 ReferenceQueue<V> p = z.p(zVar);
                 y<K, V> yVar3 = new y<>(o, yVar.get(), yVar.a, yVar2);
-                yVar3.f1271c = yVar.f1271c.b(p, yVar3);
+                yVar3.f1268c = yVar.f1268c.b(p, yVar3);
                 return yVar3;
             }
 
@@ -1266,8 +1266,8 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
             public void d(n nVar, i iVar, Object obj) {
                 y yVar = (y) iVar;
                 ReferenceQueue p = z.p((z) nVar);
-                b0<K, V, y<K, V>> b0Var = yVar.f1271c;
-                yVar.f1271c = new c0(p, obj, yVar);
+                b0<K, V, y<K, V>> b0Var = yVar.f1268c;
+                yVar.f1268c = new c0(p, obj, yVar);
                 b0Var.clear();
             }
 
@@ -1289,12 +1289,12 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
 
         @Override // c.i.b.b.e0.a0
         public b0<K, V, y<K, V>> b() {
-            return this.f1271c;
+            return this.f1268c;
         }
 
         @Override // c.i.b.b.e0.i
         public V getValue() {
-            return this.f1271c.get();
+            return this.f1268c.get();
         }
     }
 
@@ -1334,7 +1334,7 @@ public class e0<K, V, E extends i<K, V, E>, S extends n<K, V, E, S>> extends Abs
     }
 
     public e0(d0 d0Var, j<K, V, E, S> jVar) {
-        int i2 = d0Var.f1268c;
+        int i2 = d0Var.f1265c;
         this.concurrencyLevel = Math.min(i2 == -1 ? 4 : i2, 65536);
         this.keyEquivalence = (c.i.b.a.d) c.i.a.f.e.o.c.C(d0Var.f, d0Var.a().f());
         this.m = jVar;
diff --git a/app/src/main/java/c/i/b/b/l.java b/app/src/main/java/c/i/b/b/l.java
index d6d8335241..fb5aa30c3a 100644
--- a/app/src/main/java/c/i/b/b/l.java
+++ b/app/src/main/java/c/i/b/b/l.java
@@ -38,7 +38,7 @@ public class l<K, V> extends AbstractMap<K, V> implements Serializable {
     @MonotonicNonNullDecl
 
     /* renamed from: s  reason: collision with root package name */
-    public transient Set<Map.Entry<K, V>> f1272s;
+    public transient Set<Map.Entry<K, V>> f1269s;
     @MonotonicNonNullDecl
     public transient Collection<V> t;
 
@@ -370,12 +370,12 @@ public class l<K, V> extends AbstractMap<K, V> implements Serializable {
 
     @Override // java.util.AbstractMap, java.util.Map
     public Set<Map.Entry<K, V>> entrySet() {
-        Set<Map.Entry<K, V>> set = this.f1272s;
+        Set<Map.Entry<K, V>> set = this.f1269s;
         if (set != null) {
             return set;
         }
         a aVar = new a();
-        this.f1272s = aVar;
+        this.f1269s = aVar;
         return aVar;
     }
 
diff --git a/app/src/main/java/c/i/b/b/n.java b/app/src/main/java/c/i/b/b/n.java
index 3ec0aa941c..33970c88db 100644
--- a/app/src/main/java/c/i/b/b/n.java
+++ b/app/src/main/java/c/i/b/b/n.java
@@ -8,7 +8,7 @@ public abstract class n {
     public static final n b = new b(-1);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final n f1273c = new b(1);
+    public static final n f1270c = new b(1);
 
     /* compiled from: ComparisonChain */
     public static class a extends n {
@@ -42,7 +42,7 @@ public abstract class n {
         }
 
         public n f(int i) {
-            return i < 0 ? n.b : i > 0 ? n.f1273c : n.a;
+            return i < 0 ? n.b : i > 0 ? n.f1270c : n.a;
         }
     }
 
diff --git a/app/src/main/java/c/i/b/b/s.java b/app/src/main/java/c/i/b/b/s.java
index 9610966899..ae6c7f626b 100644
--- a/app/src/main/java/c/i/b/b/s.java
+++ b/app/src/main/java/c/i/b/b/s.java
@@ -20,7 +20,7 @@ public abstract class s<E> extends AbstractCollection<E> implements Serializable
         public int b = 0;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f1274c;
+        public boolean f1271c;
 
         public a(int i) {
             c.n(i, "initialCapacity");
diff --git a/app/src/main/java/c/i/b/b/u.java b/app/src/main/java/c/i/b/b/u.java
index b249d0f77c..4fa8ba75e4 100644
--- a/app/src/main/java/c/i/b/b/u.java
+++ b/app/src/main/java/c/i/b/b/u.java
@@ -30,10 +30,10 @@ public abstract class u<E> extends s<E> implements List<E>, RandomAccess {
             Object[] objArr = this.a;
             if (objArr.length < i) {
                 this.a = Arrays.copyOf(objArr, s.b.a(objArr.length, i));
-                this.f1274c = false;
-            } else if (this.f1274c) {
+                this.f1271c = false;
+            } else if (this.f1271c) {
                 this.a = (Object[]) objArr.clone();
-                this.f1274c = false;
+                this.f1271c = false;
             }
             Object[] objArr2 = this.a;
             int i2 = this.b;
@@ -43,7 +43,7 @@ public abstract class u<E> extends s<E> implements List<E>, RandomAccess {
         }
 
         public u<E> c() {
-            this.f1274c = true;
+            this.f1271c = true;
             return u.l(this.a, this.b);
         }
     }
diff --git a/app/src/main/java/c/i/b/b/w.java b/app/src/main/java/c/i/b/b/w.java
index b3482a65af..29966c68f3 100644
--- a/app/src/main/java/c/i/b/b/w.java
+++ b/app/src/main/java/c/i/b/b/w.java
@@ -27,7 +27,7 @@ public abstract class w<K, V> implements Map<K, V>, Serializable {
         public int b = 0;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f1275c = false;
+        public boolean f1272c = false;
 
         public a(int i) {
             this.a = new Object[(i * 2)];
@@ -38,7 +38,7 @@ public abstract class w<K, V> implements Map<K, V>, Serializable {
             r4 = r4 + 1;
          */
         public w<K, V> a() {
-            this.f1275c = true;
+            this.f1272c = true;
             int i = this.b;
             Object[] objArr = this.a;
             if (i == 0) {
@@ -87,7 +87,7 @@ public abstract class w<K, V> implements Map<K, V>, Serializable {
             Object[] objArr = this.a;
             if (i2 > objArr.length) {
                 this.a = Arrays.copyOf(objArr, s.b.a(objArr.length, i2));
-                this.f1275c = false;
+                this.f1272c = false;
             }
         }
 
diff --git a/app/src/main/java/c/i/c/c.java b/app/src/main/java/c/i/c/c.java
index 62616a2762..ea8a7a5f8d 100644
--- a/app/src/main/java/c/i/c/c.java
+++ b/app/src/main/java/c/i/c/c.java
@@ -49,7 +49,7 @@ public class c {
     public static final Executor b = new d(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<String, c> f1276c = new ArrayMap();
+    public static final Map<String, c> f1273c = new ArrayMap();
     public final Context d;
     public final String e;
     public final i f;
@@ -74,7 +74,7 @@ public class c {
         public void a(boolean z2) {
             Object obj = c.a;
             synchronized (c.a) {
-                Iterator it = new ArrayList(c.f1276c.values()).iterator();
+                Iterator it = new ArrayList(c.f1273c.values()).iterator();
                 while (it.hasNext()) {
                     c cVar = (c) it.next();
                     if (cVar.h.get()) {
@@ -115,7 +115,7 @@ public class c {
         public void onReceive(Context context, Intent intent) {
             Object obj = c.a;
             synchronized (c.a) {
-                for (c cVar : c.f1276c.values()) {
+                for (c cVar : c.f1273c.values()) {
                     cVar.d();
                 }
             }
@@ -201,7 +201,7 @@ public class c {
     public static c b() {
         c cVar;
         synchronized (a) {
-            cVar = f1276c.get("[DEFAULT]");
+            cVar = f1273c.get("[DEFAULT]");
             if (cVar == null) {
                 throw new IllegalStateException("Default FirebaseApp is not initialized in this process " + c.i.a.f.e.o.g.a() + ". Make sure to call FirebaseApp.initializeApp(Context) first.");
             }
@@ -212,7 +212,7 @@ public class c {
     @Nullable
     public static c e(@NonNull Context context) {
         synchronized (a) {
-            if (f1276c.containsKey("[DEFAULT]")) {
+            if (f1273c.containsKey("[DEFAULT]")) {
                 return b();
             }
             i a2 = i.a(context);
@@ -246,7 +246,7 @@ public class c {
             context = context.getApplicationContext();
         }
         synchronized (a) {
-            Map<String, c> map = f1276c;
+            Map<String, c> map = f1273c;
             AnimatableValueParser.G(!map.containsKey("[DEFAULT]"), "FirebaseApp name [DEFAULT] already exists!");
             AnimatableValueParser.z(context, "Application context cannot be null.");
             cVar = new c(context, "[DEFAULT]", iVar);
@@ -305,7 +305,7 @@ public class c {
         boolean h = h();
         for (Map.Entry<c.i.c.l.d<?>, r<?>> entry : kVar.b.entrySet()) {
             r<?> value = entry.getValue();
-            int i = entry.getKey().f1284c;
+            int i = entry.getKey().f1280c;
             boolean z2 = false;
             if (!(i == 1)) {
                 if (i == 2) {
diff --git a/app/src/main/java/c/i/c/i.java b/app/src/main/java/c/i/c/i.java
index b139d29dc5..1233416bea 100644
--- a/app/src/main/java/c/i/c/i.java
+++ b/app/src/main/java/c/i/c/i.java
@@ -17,7 +17,7 @@ public final class i {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1277c;
+    public final String f1274c;
     public final String d;
     public final String e;
     public final String f;
@@ -27,7 +27,7 @@ public final class i {
         AnimatableValueParser.G(!h.a(str), "ApplicationId must be set.");
         this.b = str;
         this.a = str2;
-        this.f1277c = str3;
+        this.f1274c = str3;
         this.d = str4;
         this.e = str5;
         this.f = str6;
@@ -67,18 +67,18 @@ public final class i {
             return false;
         }
         i iVar = (i) obj;
-        return AnimatableValueParser.j0(this.b, iVar.b) && AnimatableValueParser.j0(this.a, iVar.a) && AnimatableValueParser.j0(this.f1277c, iVar.f1277c) && AnimatableValueParser.j0(this.d, iVar.d) && AnimatableValueParser.j0(this.e, iVar.e) && AnimatableValueParser.j0(this.f, iVar.f) && AnimatableValueParser.j0(this.g, iVar.g);
+        return AnimatableValueParser.j0(this.b, iVar.b) && AnimatableValueParser.j0(this.a, iVar.a) && AnimatableValueParser.j0(this.f1274c, iVar.f1274c) && AnimatableValueParser.j0(this.d, iVar.d) && AnimatableValueParser.j0(this.e, iVar.e) && AnimatableValueParser.j0(this.f, iVar.f) && AnimatableValueParser.j0(this.g, iVar.g);
     }
 
     public int hashCode() {
-        return Arrays.hashCode(new Object[]{this.b, this.a, this.f1277c, this.d, this.e, this.f, this.g});
+        return Arrays.hashCode(new Object[]{this.b, this.a, this.f1274c, this.d, this.e, this.f, this.g});
     }
 
     public String toString() {
         k kVar = new k(this, null);
         kVar.a("applicationId", this.b);
         kVar.a("apiKey", this.a);
-        kVar.a("databaseUrl", this.f1277c);
+        kVar.a("databaseUrl", this.f1274c);
         kVar.a("gcmSenderId", this.e);
         kVar.a("storageBucket", this.f);
         kVar.a("projectId", this.g);
diff --git a/app/src/main/java/c/i/c/j/a/b.java b/app/src/main/java/c/i/c/j/a/b.java
index bcedcbb591..0f8e800470 100644
--- a/app/src/main/java/c/i/c/j/a/b.java
+++ b/app/src/main/java/c/i/c/j/a/b.java
@@ -18,7 +18,7 @@ public class b implements a {
     public final c.i.a.f.i.a.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<String, ?> f1278c = new ConcurrentHashMap();
+    public final Map<String, ?> f1275c = new ConcurrentHashMap();
 
     /* compiled from: com.google.android.gms:play-services-measurement-api@@18.0.0 */
     public class a implements a.AbstractC0125a {
@@ -159,7 +159,7 @@ public class b implements a {
         if (!c.a(str)) {
             return null;
         }
-        if (!str.isEmpty() && this.f1278c.containsKey(str) && this.f1278c.get(str) != null) {
+        if (!str.isEmpty() && this.f1275c.containsKey(str) && this.f1275c.get(str) != null) {
             return null;
         }
         c.i.a.f.i.a.a aVar = this.b;
@@ -167,7 +167,7 @@ public class b implements a {
         if (bVar2 == null) {
             return null;
         }
-        this.f1278c.put(str, bVar2);
+        this.f1275c.put(str, bVar2);
         return new a(this, str);
     }
 }
diff --git a/app/src/main/java/c/i/c/j/a/c/b.java b/app/src/main/java/c/i/c/j/a/c/b.java
index 073601a531..80b9ccaf02 100644
--- a/app/src/main/java/c/i/c/j/a/c/b.java
+++ b/app/src/main/java/c/i/c/j/a/c/b.java
@@ -9,12 +9,12 @@ public final class b {
     public a.b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public c.i.a.f.i.a.a f1279c;
+    public c.i.a.f.i.a.a f1276c;
     public e d;
 
     public b(c.i.a.f.i.a.a aVar, a.b bVar) {
         this.b = bVar;
-        this.f1279c = aVar;
+        this.f1276c = aVar;
         e eVar = new e(this);
         this.d = eVar;
         aVar.a(eVar);
diff --git a/app/src/main/java/c/i/c/j/a/c/c.java b/app/src/main/java/c/i/c/j/a/c/c.java
index 29a8c34f0e..bfc1ed6541 100644
--- a/app/src/main/java/c/i/c/j/a/c/c.java
+++ b/app/src/main/java/c/i/c/j/a/c/c.java
@@ -12,7 +12,7 @@ public final class c {
     public static final List<String> b = Arrays.asList("_e", "_f", "_iap", "_s", "_au", "_ui", "_cd");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final List<String> f1280c = Arrays.asList("auto", "app", "am");
+    public static final List<String> f1277c = Arrays.asList("auto", "app", "am");
     public static final List<String> d = Arrays.asList("_r", "_dbg");
     public static final List<String> e;
     public static final List<String> f = Arrays.asList("^_ltv_[A-Z]{3}$", "^_cc[1-5]{1}$");
@@ -34,6 +34,6 @@ public final class c {
     }
 
     public static boolean a(@NonNull String str) {
-        return !f1280c.contains(str);
+        return !f1277c.contains(str);
     }
 }
diff --git a/app/src/main/java/c/i/c/j/a/c/d.java b/app/src/main/java/c/i/c/j/a/c/d.java
index c63b328767..d8cb6ca9d5 100644
--- a/app/src/main/java/c/i/c/j/a/c/d.java
+++ b/app/src/main/java/c/i/c/j/a/c/d.java
@@ -7,13 +7,13 @@ public final class d {
     public c.i.a.f.i.a.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public f f1281c;
+    public f f1278c;
 
     public d(c.i.a.f.i.a.a aVar, a.b bVar) {
         this.a = bVar;
         this.b = aVar;
         f fVar = new f(this);
-        this.f1281c = fVar;
+        this.f1278c = fVar;
         aVar.a(fVar);
     }
 }
diff --git a/app/src/main/java/c/i/c/j/a/c/e.java b/app/src/main/java/c/i/c/j/a/c/e.java
index 9dfe69bd55..46b67ce1a4 100644
--- a/app/src/main/java/c/i/c/j/a/c/e.java
+++ b/app/src/main/java/c/i/c/j/a/c/e.java
@@ -18,7 +18,7 @@ public final class e implements a.AbstractC0108a {
         if (this.a.a.contains(str2)) {
             Bundle bundle2 = new Bundle();
             Set<String> set = c.a;
-            String J0 = c.J0(str2, v5.f1204c, v5.a);
+            String J0 = c.J0(str2, v5.f1202c, v5.a);
             if (J0 != null) {
                 str2 = J0;
             }
diff --git a/app/src/main/java/c/i/c/k/a.java b/app/src/main/java/c/i/c/k/a.java
index d2fb960b7b..20847907d5 100644
--- a/app/src/main/java/c/i/c/k/a.java
+++ b/app/src/main/java/c/i/c/k/a.java
@@ -14,7 +14,7 @@ public interface a {
         public final String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f1282c;
+        public String f1279c;
         public String d;
         public String e;
 
diff --git a/app/src/main/java/c/i/c/k/d/a.java b/app/src/main/java/c/i/c/k/d/a.java
index 68fc51b43e..b28b22de03 100644
--- a/app/src/main/java/c/i/c/k/d/a.java
+++ b/app/src/main/java/c/i/c/k/d/a.java
@@ -11,7 +11,7 @@ public final class a implements Parcelable.Creator<zza> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zza createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         String str3 = null;
@@ -19,7 +19,7 @@ public final class a implements Parcelable.Creator<zza> {
         zzc zzc = null;
         String str5 = null;
         Bundle bundle = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
@@ -44,11 +44,11 @@ public final class a implements Parcelable.Creator<zza> {
                     bundle = AnimatableValueParser.P(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zza(str, str2, str3, str4, zzc, str5, bundle);
     }
 
diff --git a/app/src/main/java/c/i/c/k/d/c.java b/app/src/main/java/c/i/c/k/d/c.java
index b17a7cd646..1af4637a42 100644
--- a/app/src/main/java/c/i/c/k/d/c.java
+++ b/app/src/main/java/c/i/c/k/d/c.java
@@ -8,6 +8,6 @@ import c.i.c.h;
 /* compiled from: com.google.firebase:firebase-appindexing@@19.1.0 */
 public final class c extends b<a.d.c> {
     public c(Context context) {
-        super(context, k.f1083c, (a.d) null, new h());
+        super(context, k.f1081c, (a.d) null, new h());
     }
 }
diff --git a/app/src/main/java/c/i/c/k/d/d.java b/app/src/main/java/c/i/c/k/d/d.java
index 4b6a46b691..ee6e81c784 100644
--- a/app/src/main/java/c/i/c/k/d/d.java
+++ b/app/src/main/java/c/i/c/k/d/d.java
@@ -3,11 +3,11 @@ package c.i.c.k.d;
 import com.google.firebase.appindexing.internal.zza;
 /* compiled from: com.google.firebase:firebase-appindexing@@19.1.0 */
 public final class d extends e {
-    public final /* synthetic */ zza[] d;
+    public final /* synthetic */ zza[] b;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public d(zza[] zzaArr) {
         super(null);
-        this.d = zzaArr;
+        this.b = zzaArr;
     }
 }
diff --git a/app/src/main/java/c/i/c/k/d/e.java b/app/src/main/java/c/i/c/k/d/e.java
index f45ad46ada..5e1b81733e 100644
--- a/app/src/main/java/c/i/c/k/d/e.java
+++ b/app/src/main/java/c/i/c/k/d/e.java
@@ -10,9 +10,7 @@ import com.google.android.gms.common.api.Status;
 import com.google.android.gms.tasks.TaskCompletionSource;
 /* compiled from: com.google.firebase:firebase-appindexing@@19.1.0 */
 public abstract class e extends p<g, Void> implements c.i.a.f.e.h.j.e<Status> {
-
-    /* renamed from: c  reason: collision with root package name */
-    public TaskCompletionSource<Void> f1283c;
+    public TaskCompletionSource<Void> a;
 
     public e(d dVar) {
     }
@@ -20,7 +18,7 @@ public abstract class e extends p<g, Void> implements c.i.a.f.e.h.j.e<Status> {
     @Override // c.i.a.f.e.h.j.e
     public void a(Status status) {
         AnimatableValueParser.p(!status.v0(), "Failed result must not be success.");
-        TaskCompletionSource<Void> taskCompletionSource = this.f1283c;
+        TaskCompletionSource<Void> taskCompletionSource = this.a;
         taskCompletionSource.a.s(c.C0(status, status.p));
     }
 
@@ -29,18 +27,18 @@ public abstract class e extends p<g, Void> implements c.i.a.f.e.h.j.e<Status> {
     public void b(Status status) {
         Status status2 = status;
         if (status2.v0()) {
-            this.f1283c.a.t(null);
+            this.a.a.t(null);
             return;
         }
-        TaskCompletionSource<Void> taskCompletionSource = this.f1283c;
+        TaskCompletionSource<Void> taskCompletionSource = this.a;
         taskCompletionSource.a.s(c.C0(status2, "User Action indexing error, please try again."));
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [c.i.a.f.e.h.a$b, com.google.android.gms.tasks.TaskCompletionSource] */
     @Override // c.i.a.f.e.h.j.p
     public void c(g gVar, TaskCompletionSource<Void> taskCompletionSource) throws RemoteException {
-        this.f1283c = taskCompletionSource;
+        this.a = taskCompletionSource;
         d dVar = (d) this;
-        gVar.w().R(new h(dVar), dVar.d);
+        gVar.v().S(new h(dVar), dVar.b);
     }
 }
diff --git a/app/src/main/java/c/i/c/k/d/f.java b/app/src/main/java/c/i/c/k/d/f.java
index b395ad32a4..e4aad421b0 100644
--- a/app/src/main/java/c/i/c/k/d/f.java
+++ b/app/src/main/java/c/i/c/k/d/f.java
@@ -9,21 +9,21 @@ public final class f implements Parcelable.Creator<zzc> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzc createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         byte[] bArr = null;
         int i = 0;
         boolean z2 = false;
         boolean z3 = false;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 2:
-                    z2 = AnimatableValueParser.c2(parcel, readInt);
+                    z2 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 case 3:
                     str = AnimatableValueParser.T(parcel, readInt);
@@ -35,14 +35,14 @@ public final class f implements Parcelable.Creator<zzc> {
                     bArr = AnimatableValueParser.Q(parcel, readInt);
                     break;
                 case 6:
-                    z3 = AnimatableValueParser.c2(parcel, readInt);
+                    z3 = AnimatableValueParser.e2(parcel, readInt);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzc(i, z2, str, str2, bArr, z3);
     }
 
diff --git a/app/src/main/java/c/i/c/l/d.java b/app/src/main/java/c/i/c/l/d.java
index 246b73ebdf..b991285fce 100644
--- a/app/src/main/java/c/i/c/l/d.java
+++ b/app/src/main/java/c/i/c/l/d.java
@@ -11,7 +11,7 @@ public final class d<T> {
     public final Set<o> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1284c;
+    public final int f1280c;
     public final int d;
     public final f<T> e;
     public final Set<Class<?>> f;
@@ -22,7 +22,7 @@ public final class d<T> {
         public final Set<o> b = new HashSet();
 
         /* renamed from: c  reason: collision with root package name */
-        public int f1285c;
+        public int f1281c;
         public int d;
         public f<T> e;
         public Set<Class<?>> f;
@@ -30,7 +30,7 @@ public final class d<T> {
         public b(Class cls, Class[] clsArr, a aVar) {
             HashSet hashSet = new HashSet();
             this.a = hashSet;
-            this.f1285c = 0;
+            this.f1281c = 0;
             this.d = 0;
             this.f = new HashSet();
             Objects.requireNonNull(cls, "Null interface");
@@ -51,7 +51,7 @@ public final class d<T> {
 
         public d<T> b() {
             if (this.e != null) {
-                return new d<>(new HashSet(this.a), new HashSet(this.b), this.f1285c, this.d, this.e, this.f, null);
+                return new d<>(new HashSet(this.a), new HashSet(this.b), this.f1281c, this.d, this.e, this.f, null);
             }
             throw new IllegalStateException("Missing required property: factory.");
         }
@@ -62,8 +62,8 @@ public final class d<T> {
         }
 
         public final b<T> d(int i) {
-            if (this.f1285c == 0) {
-                this.f1285c = i;
+            if (this.f1281c == 0) {
+                this.f1281c = i;
                 return this;
             }
             throw new IllegalStateException("Instantiation type has already been set.");
@@ -73,7 +73,7 @@ public final class d<T> {
     public d(Set set, Set set2, int i, int i2, f fVar, Set set3, a aVar) {
         this.a = Collections.unmodifiableSet(set);
         this.b = Collections.unmodifiableSet(set2);
-        this.f1284c = i;
+        this.f1280c = i;
         this.d = i2;
         this.e = fVar;
         this.f = Collections.unmodifiableSet(set3);
@@ -95,6 +95,6 @@ public final class d<T> {
     }
 
     public String toString() {
-        return "Component<" + Arrays.toString(this.a.toArray()) + ">{" + this.f1284c + ", type=" + this.d + ", deps=" + Arrays.toString(this.b.toArray()) + "}";
+        return "Component<" + Arrays.toString(this.a.toArray()) + ">{" + this.f1280c + ", type=" + this.d + ", deps=" + Arrays.toString(this.b.toArray()) + "}";
     }
 }
diff --git a/app/src/main/java/c/i/c/l/k.java b/app/src/main/java/c/i/c/l/k.java
index ebdcbc353d..24c79176e1 100644
--- a/app/src/main/java/c/i/c/l/k.java
+++ b/app/src/main/java/c/i/c/l/k.java
@@ -19,7 +19,7 @@ public class k extends a {
     public final Map<d<?>, r<?>> b = new HashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<Class<?>, r<?>> f1286c = new HashMap();
+    public final Map<Class<?>, r<?>> f1282c = new HashMap();
     public final Map<Class<?>, r<Set<?>>> d = new HashMap();
     public final q e;
 
@@ -63,10 +63,10 @@ public class k extends a {
         for (Set<m> set3 : hashMap.values()) {
             for (m mVar2 : set3) {
                 for (o oVar : mVar2.a.b) {
-                    if ((oVar.f1288c == 0) && (set = (Set) hashMap.get(new n(oVar.a, oVar.a(), null))) != null) {
+                    if ((oVar.f1284c == 0) && (set = (Set) hashMap.get(new n(oVar.a, oVar.a(), null))) != null) {
                         for (m mVar3 : set) {
                             mVar2.b.add(mVar3);
-                            mVar3.f1287c.add(mVar2);
+                            mVar3.f1283c.add(mVar2);
                         }
                     }
                 }
@@ -90,7 +90,7 @@ public class k extends a {
             hashSet2.remove(mVar5);
             i++;
             for (m mVar6 : mVar5.b) {
-                mVar6.f1287c.remove(mVar5);
+                mVar6.f1283c.remove(mVar5);
                 if (mVar6.a()) {
                     hashSet2.add(mVar6);
                 }
@@ -107,7 +107,7 @@ public class k extends a {
                 if (key.b()) {
                     r<?> value = entry.getValue();
                     for (Class<? super Object> cls2 : key.a) {
-                        this.f1286c.put(cls2, value);
+                        this.f1282c.put(cls2, value);
                     }
                 }
             }
@@ -116,7 +116,7 @@ public class k extends a {
                 while (true) {
                     if (it5.hasNext()) {
                         o next = it5.next();
-                        if ((next.b == 1) && !this.f1286c.containsKey(next.a)) {
+                        if ((next.b == 1) && !this.f1282c.containsKey(next.a)) {
                             throw new MissingDependencyException(String.format("Unsatisfied dependency for component %s: %s", dVar4, next.a));
                         }
                     }
@@ -154,7 +154,7 @@ public class k extends a {
     @Override // c.i.c.l.e
     public <T> a<T> b(Class<T> cls) {
         Objects.requireNonNull(cls, "Null interface requested.");
-        return this.f1286c.get(cls);
+        return this.f1282c.get(cls);
     }
 
     @Override // c.i.c.l.e
diff --git a/app/src/main/java/c/i/c/l/m.java b/app/src/main/java/c/i/c/l/m.java
index 181e8580b2..dc2a747ee3 100644
--- a/app/src/main/java/c/i/c/l/m.java
+++ b/app/src/main/java/c/i/c/l/m.java
@@ -8,13 +8,13 @@ public class m {
     public final Set<m> b = new HashSet();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<m> f1287c = new HashSet();
+    public final Set<m> f1283c = new HashSet();
 
     public m(d<?> dVar) {
         this.a = dVar;
     }
 
     public boolean a() {
-        return this.f1287c.isEmpty();
+        return this.f1283c.isEmpty();
     }
 }
diff --git a/app/src/main/java/c/i/c/l/o.java b/app/src/main/java/c/i/c/l/o.java
index 1c44a0e360..ec500f41a1 100644
--- a/app/src/main/java/c/i/c/l/o.java
+++ b/app/src/main/java/c/i/c/l/o.java
@@ -8,13 +8,13 @@ public final class o {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1288c;
+    public final int f1284c;
 
     public o(Class<?> cls, int i, int i2) {
         Objects.requireNonNull(cls, "Null dependency anInterface.");
         this.a = cls;
         this.b = i;
-        this.f1288c = i2;
+        this.f1284c = i2;
     }
 
     public boolean a() {
@@ -26,11 +26,11 @@ public final class o {
             return false;
         }
         o oVar = (o) obj;
-        return this.a == oVar.a && this.b == oVar.b && this.f1288c == oVar.f1288c;
+        return this.a == oVar.a && this.b == oVar.b && this.f1284c == oVar.f1284c;
     }
 
     public int hashCode() {
-        return ((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b) * 1000003) ^ this.f1288c;
+        return ((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b) * 1000003) ^ this.f1284c;
     }
 
     public String toString() {
@@ -41,7 +41,7 @@ public final class o {
         boolean z2 = true;
         sb.append(i == 1 ? "required" : i == 0 ? "optional" : "set");
         sb.append(", direct=");
-        if (this.f1288c != 0) {
+        if (this.f1284c != 0) {
             z2 = false;
         }
         return a.G(sb, z2, "}");
diff --git a/app/src/main/java/c/i/c/l/q.java b/app/src/main/java/c/i/c/l/q.java
index 940a1c6e2b..89e838909a 100644
--- a/app/src/main/java/c/i/c/l/q.java
+++ b/app/src/main/java/c/i/c/l/q.java
@@ -20,15 +20,15 @@ public class q implements d, c {
     public Queue<a<?>> b = new ArrayDeque();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Executor f1289c;
+    public final Executor f1285c;
 
     public q(Executor executor) {
-        this.f1289c = executor;
+        this.f1285c = executor;
     }
 
     @Override // c.i.c.q.d
     public <T> void a(Class<T> cls, b<? super T> bVar) {
-        b(cls, this.f1289c, bVar);
+        b(cls, this.f1285c, bVar);
     }
 
     @Override // c.i.c.q.d
diff --git a/app/src/main/java/c/i/c/l/r.java b/app/src/main/java/c/i/c/l/r.java
index d4c8b043bf..e3592cee8e 100644
--- a/app/src/main/java/c/i/c/l/r.java
+++ b/app/src/main/java/c/i/c/l/r.java
@@ -7,10 +7,10 @@ public class r<T> implements a<T> {
     public volatile Object b = a;
 
     /* renamed from: c  reason: collision with root package name */
-    public volatile a<T> f1290c;
+    public volatile a<T> f1286c;
 
     public r(a<T> aVar) {
-        this.f1290c = aVar;
+        this.f1286c = aVar;
     }
 
     @Override // c.i.c.t.a
@@ -21,9 +21,9 @@ public class r<T> implements a<T> {
             synchronized (this) {
                 t = this.b;
                 if (t == obj) {
-                    t = this.f1290c.get();
+                    t = this.f1286c.get();
                     this.b = t;
-                    this.f1290c = null;
+                    this.f1286c = null;
                 }
             }
         }
diff --git a/app/src/main/java/c/i/c/l/s.java b/app/src/main/java/c/i/c/l/s.java
index 454aa654d0..fa5e10afc4 100644
--- a/app/src/main/java/c/i/c/l/s.java
+++ b/app/src/main/java/c/i/c/l/s.java
@@ -10,7 +10,7 @@ public final class s extends a {
     public final Set<Class<?>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<Class<?>> f1291c;
+    public final Set<Class<?>> f1287c;
     public final Set<Class<?>> d;
     public final Set<Class<?>> e;
     public final e f;
@@ -30,7 +30,7 @@ public final class s extends a {
         HashSet hashSet3 = new HashSet();
         HashSet hashSet4 = new HashSet();
         for (o oVar : dVar.b) {
-            if (oVar.f1288c == 0) {
+            if (oVar.f1284c == 0) {
                 if (oVar.a()) {
                     hashSet3.add(oVar.a);
                 } else {
@@ -47,7 +47,7 @@ public final class s extends a {
         }
         this.a = Collections.unmodifiableSet(hashSet);
         this.b = Collections.unmodifiableSet(hashSet2);
-        this.f1291c = Collections.unmodifiableSet(hashSet3);
+        this.f1287c = Collections.unmodifiableSet(hashSet3);
         this.d = Collections.unmodifiableSet(hashSet4);
         this.e = dVar.f;
         this.f = eVar;
@@ -80,7 +80,7 @@ public final class s extends a {
 
     @Override // c.i.c.l.a, c.i.c.l.e
     public <T> Set<T> d(Class<T> cls) {
-        if (this.f1291c.contains(cls)) {
+        if (this.f1287c.contains(cls)) {
             return this.f.d(cls);
         }
         throw new IllegalArgumentException(String.format("Attempting to request an undeclared dependency Set<%s>.", cls));
diff --git a/app/src/main/java/c/i/c/m/b.java b/app/src/main/java/c/i/c/m/b.java
index dc13ee52ff..36f20f1e94 100644
--- a/app/src/main/java/c/i/c/m/b.java
+++ b/app/src/main/java/c/i/c/m/b.java
@@ -195,7 +195,7 @@ public final /* synthetic */ class b implements f {
                     try {
                         c.i.c.m.d.k.b bVar6 = new c.i.c.m.d.k.b(str6, l, c5, packageName2, num, str7, aVar5);
                         bVar4.b("Installer package name is: " + c5);
-                        k0Var.h = new x(k0Var.a, k0Var.m, bVar5, k0Var.i, k0Var.f1302c, hVar2, k0Var.f, bVar6, null, null, k0Var.n, k0Var.k, cVar4);
+                        k0Var.h = new x(k0Var.a, k0Var.m, bVar5, k0Var.i, k0Var.f1298c, hVar2, k0Var.f, bVar6, null, null, k0Var.n, k0Var.k, cVar4);
                         boolean exists = k0Var.e.b().exists();
                         try {
                             k0Var.g = Boolean.TRUE.equals((Boolean) h1.a(k0Var.m.b(new l0(k0Var))));
diff --git a/app/src/main/java/c/i/c/m/d/e.java b/app/src/main/java/c/i/c/m/d/e.java
index eea4a6a41f..10d407ded9 100644
--- a/app/src/main/java/c/i/c/m/d/e.java
+++ b/app/src/main/java/c/i/c/m/d/e.java
@@ -14,14 +14,14 @@ public class e implements f<b, Void> {
     public final /* synthetic */ c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Executor f1292c;
+    public final /* synthetic */ Executor f1288c;
     public final /* synthetic */ h d;
 
     public e(h hVar, String str, c cVar, Executor executor) {
         this.d = hVar;
         this.a = str;
         this.b = cVar;
-        this.f1292c = executor;
+        this.f1288c = executor;
     }
 
     /* Return type fixed from 'com.google.android.gms.tasks.Task' to match base method */
@@ -30,7 +30,7 @@ public class e implements f<b, Void> {
     @NonNull
     public Task<Void> a(@Nullable b bVar) throws Exception {
         try {
-            h.a(this.d, bVar, this.a, this.b, this.f1292c, true);
+            h.a(this.d, bVar, this.a, this.b, this.f1288c, true);
             return null;
         } catch (Exception e) {
             if (b.a.a(6)) {
diff --git a/app/src/main/java/c/i/c/m/d/h.java b/app/src/main/java/c/i/c/m/d/h.java
index 11b84b30b8..6d1cf1119a 100644
--- a/app/src/main/java/c/i/c/m/d/h.java
+++ b/app/src/main/java/c/i/c/m/d/h.java
@@ -19,7 +19,7 @@ public class h {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Context f1293c;
+    public final Context f1289c;
     public PackageManager d;
     public String e;
     public PackageInfo f;
@@ -33,7 +33,7 @@ public class h {
 
     public h(c cVar, Context context, v0 v0Var, q0 q0Var) {
         this.b = cVar;
-        this.f1293c = context;
+        this.f1289c = context;
         this.l = v0Var;
         this.m = q0Var;
     }
@@ -55,11 +55,11 @@ public class h {
     }
 
     public final a b(String str, String str2) {
-        return new a(str, str2, this.l.e, this.h, this.g, c.i.c.m.d.k.h.f(c.i.c.m.d.k.h.l(this.f1293c), str2, this.h, this.g), this.j, r0.f(this.i).g(), this.k, "0");
+        return new a(str, str2, this.l.e, this.h, this.g, c.i.c.m.d.k.h.f(c.i.c.m.d.k.h.l(this.f1289c), str2, this.h, this.g), this.j, r0.f(this.i).g(), this.k, "0");
     }
 
     public String c() {
-        Context context = this.f1293c;
+        Context context = this.f1289c;
         int n = c.i.c.m.d.k.h.n(context, "com.crashlytics.ApiEndpoint", "string");
         return n > 0 ? context.getString(n) : "";
     }
diff --git a/app/src/main/java/c/i/c/m/d/i/c.java b/app/src/main/java/c/i/c/m/d/i/c.java
index b3e643ae66..60e8071663 100644
--- a/app/src/main/java/c/i/c/m/d/i/c.java
+++ b/app/src/main/java/c/i/c/m/d/i/c.java
@@ -12,7 +12,7 @@ public class c implements b, a {
     public final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public CountDownLatch f1294c;
+    public CountDownLatch f1290c;
 
     public c(@NonNull e eVar, int i, TimeUnit timeUnit) {
         this.a = eVar;
@@ -23,11 +23,11 @@ public class c implements b, a {
         synchronized (this.b) {
             b bVar = b.a;
             bVar.b("Logging Crashlytics event to Firebase");
-            this.f1294c = new CountDownLatch(1);
+            this.f1290c = new CountDownLatch(1);
             this.a.a.a("clx", str, bundle);
             bVar.b("Awaiting app exception callback from FA...");
             try {
-                if (this.f1294c.await((long) 500, TimeUnit.MILLISECONDS)) {
+                if (this.f1290c.await((long) 500, TimeUnit.MILLISECONDS)) {
                     bVar.b("App exception callback received from FA listener.");
                 } else {
                     bVar.b("Timeout exceeded while awaiting app exception callback from FA listener.");
@@ -35,13 +35,13 @@ public class c implements b, a {
             } catch (InterruptedException unused) {
                 b.a.b("Interrupted while awaiting app exception callback from FA listener.");
             }
-            this.f1294c = null;
+            this.f1290c = null;
         }
     }
 
     @Override // c.i.c.m.d.i.b
     public void b(@NonNull String str, @NonNull Bundle bundle) {
-        CountDownLatch countDownLatch = this.f1294c;
+        CountDownLatch countDownLatch = this.f1290c;
         if (countDownLatch != null && "_ae".equals(str)) {
             countDownLatch.countDown();
         }
diff --git a/app/src/main/java/c/i/c/m/d/k/a.java b/app/src/main/java/c/i/c/m/d/k/a.java
index 51cce7013d..194e6aeaca 100644
--- a/app/src/main/java/c/i/c/m/d/k/a.java
+++ b/app/src/main/java/c/i/c/m/d/k/a.java
@@ -11,7 +11,7 @@ public abstract class a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b f1295c;
+    public final b f1291c;
     public final int d;
     public final String e;
 
@@ -21,7 +21,7 @@ public abstract class a {
         } else if (bVar != null) {
             this.e = str;
             this.b = !h.s(str) ? a.matcher(str2).replaceFirst(str) : str2;
-            this.f1295c = bVar;
+            this.f1291c = bVar;
             this.d = i;
         } else {
             throw new IllegalArgumentException("requestFactory must not be null.");
@@ -33,7 +33,7 @@ public abstract class a {
     }
 
     public c.i.c.m.d.n.a c(Map<String, String> map) {
-        b bVar = this.f1295c;
+        b bVar = this.f1291c;
         int i = this.d;
         String str = this.b;
         Objects.requireNonNull(bVar);
diff --git a/app/src/main/java/c/i/c/m/d/k/a0.java b/app/src/main/java/c/i/c/m/d/k/a0.java
index 4c8af6ab75..271973b43c 100644
--- a/app/src/main/java/c/i/c/m/d/k/a0.java
+++ b/app/src/main/java/c/i/c/m/d/k/a0.java
@@ -18,7 +18,7 @@ public class a0 implements Callable<Void> {
         Bundle bundle = new Bundle();
         bundle.putInt("fatal", 1);
         bundle.putLong("timestamp", this.i);
-        this.j.f1315z.a("_ae", bundle);
+        this.j.f1311z.a("_ae", bundle);
         return null;
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/k/b.java b/app/src/main/java/c/i/c/m/d/k/b.java
index db8c25313b..4d5de606ac 100644
--- a/app/src/main/java/c/i/c/m/d/k/b.java
+++ b/app/src/main/java/c/i/c/m/d/k/b.java
@@ -7,7 +7,7 @@ public class b {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1296c;
+    public final String f1292c;
     public final String d;
     public final String e;
     public final String f;
@@ -16,7 +16,7 @@ public class b {
     public b(String str, String str2, String str3, String str4, String str5, String str6, a aVar) {
         this.a = str;
         this.b = str2;
-        this.f1296c = str3;
+        this.f1292c = str3;
         this.d = str4;
         this.e = str5;
         this.f = str6;
diff --git a/app/src/main/java/c/i/c/m/d/k/d1.java b/app/src/main/java/c/i/c/m/d/k/d1.java
index b88df434b7..bb4828c55a 100644
--- a/app/src/main/java/c/i/c/m/d/k/d1.java
+++ b/app/src/main/java/c/i/c/m/d/k/d1.java
@@ -39,14 +39,14 @@ public class d1 {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1297c;
+    public final c f1293c;
     public final b d;
     public final f1 e;
 
     public d1(n0 n0Var, g gVar, c cVar, b bVar, f1 f1Var) {
         this.a = n0Var;
         this.b = gVar;
-        this.f1297c = cVar;
+        this.f1293c = cVar;
         this.d = bVar;
         this.e = f1Var;
     }
@@ -66,14 +66,14 @@ public class d1 {
         s sVar;
         boolean equals = str2.equals("crash");
         n0 n0Var = this.a;
-        int i = n0Var.f1303c.getResources().getConfiguration().orientation;
+        int i = n0Var.f1299c.getResources().getConfiguration().orientation;
         e eVar = new e(th, n0Var.f);
         Long valueOf = Long.valueOf(j);
-        ActivityManager.RunningAppProcessInfo i2 = h.i(n0Var.e.d, n0Var.f1303c);
+        ActivityManager.RunningAppProcessInfo i2 = h.i(n0Var.e.d, n0Var.f1299c);
         Boolean valueOf2 = i2 != null ? Boolean.valueOf(i2.importance != 100) : null;
         Integer valueOf3 = Integer.valueOf(i);
         ArrayList arrayList = new ArrayList();
-        arrayList.add(n0Var.c(thread, eVar.f1353c, 4));
+        arrayList.add(n0Var.c(thread, eVar.f1349c, 4));
         if (z2) {
             for (Map.Entry<Thread, StackTraceElement[]> entry : Thread.getAllStackTraces().entrySet()) {
                 Thread key = entry.getKey();
@@ -105,13 +105,13 @@ public class d1 {
                 String str8 = valueOf3 == null ? " uiOrientation" : str3;
                 if (str8.isEmpty()) {
                     k kVar = new k(lVar, null, valueOf2, valueOf3.intValue(), null);
-                    e a2 = e.a(n0Var.f1303c);
+                    e a2 = e.a(n0Var.f1299c);
                     Float f = a2.a;
                     Double valueOf4 = f != null ? Double.valueOf(f.doubleValue()) : null;
                     int b = a2.b();
-                    boolean m = h.m(n0Var.f1303c);
+                    boolean m = h.m(n0Var.f1299c);
                     long p = h.p();
-                    Context context = n0Var.f1303c;
+                    Context context = n0Var.f1299c;
                     ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
                     ((ActivityManager) context.getSystemService("activity")).getMemoryInfo(memoryInfo);
                     long j2 = p - memoryInfo.availMem;
@@ -119,7 +119,7 @@ public class d1 {
                     r.b bVar = new r.b();
                     bVar.a = valueOf4;
                     bVar.b = Integer.valueOf(b);
-                    bVar.f1339c = Boolean.valueOf(m);
+                    bVar.f1335c = Boolean.valueOf(m);
                     bVar.d = Integer.valueOf(i);
                     bVar.e = Long.valueOf(j2);
                     bVar.f = Long.valueOf(a3);
@@ -160,7 +160,7 @@ public class d1 {
                             j jVar = new j(valueOf5.longValue(), str2, kVar2, a4, sVar, null);
                             int i3 = ((c.i.c.m.d.s.c) gVar.k).c().b().a;
                             File h = gVar.h(str);
-                            Objects.requireNonNull(g.f1343c);
+                            Objects.requireNonNull(g.f1339c);
                             String a6 = ((d) h.a).a(jVar);
                             String format = String.format(Locale.US, "%010d", Integer.valueOf(gVar.f.getAndIncrement()));
                             if (equals) {
@@ -210,7 +210,7 @@ public class d1 {
         while (it.hasNext()) {
             File file = (File) it.next();
             try {
-                arrayList.add(new c(g.f1343c.f(g.j(file)), file.getName()));
+                arrayList.add(new c(g.f1339c.f(g.j(file)), file.getName()));
             } catch (IOException e2) {
                 c.i.c.m.d.b bVar = c.i.c.m.d.b.a;
                 bVar.c("Could not load report file " + file + "; deleting", e2);
@@ -223,7 +223,7 @@ public class d1 {
             o0 o0Var = (o0) it2.next();
             v a = o0Var.a();
             if ((a.h() != null ? 2 : a.e() != null ? (char) 3 : 1) != 3 || i == 3) {
-                c cVar = this.f1297c;
+                c cVar = this.f1293c;
                 Objects.requireNonNull(cVar);
                 v a2 = o0Var.a();
                 TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
diff --git a/app/src/main/java/c/i/c/m/d/k/f0.java b/app/src/main/java/c/i/c/m/d/k/f0.java
index 457e0e73b1..c99d63a01d 100644
--- a/app/src/main/java/c/i/c/m/d/k/f0.java
+++ b/app/src/main/java/c/i/c/m/d/k/f0.java
@@ -15,14 +15,14 @@ public class f0 implements f<b, Void> {
     public final /* synthetic */ boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Executor f1298c;
+    public final /* synthetic */ Executor f1294c;
     public final /* synthetic */ g0 d;
 
     public f0(g0 g0Var, List list, boolean z2, Executor executor) {
         this.d = g0Var;
         this.a = list;
         this.b = z2;
-        this.f1298c = executor;
+        this.f1294c = executor;
     }
 
     /* Return type fixed from 'com.google.android.gms.tasks.Task' to match base method */
@@ -54,7 +54,7 @@ public class f0 implements f<b, Void> {
                 thread.start();
             }
         }
-        x.this.A.b(this.f1298c, c.c.a.y.b.m(bVar2));
+        x.this.A.b(this.f1294c, c.c.a.y.b.m(bVar2));
         x.this.E.b(null);
         return c.F(null);
     }
diff --git a/app/src/main/java/c/i/c/m/d/k/h.java b/app/src/main/java/c/i/c/m/d/k/h.java
index cb809e46ac..7f71310a2b 100644
--- a/app/src/main/java/c/i/c/m/d/k/h.java
+++ b/app/src/main/java/c/i/c/m/d/k/h.java
@@ -40,7 +40,7 @@ public class h {
     public static long b = -1;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Comparator<File> f1299c = new a();
+    public static final Comparator<File> f1295c = new a();
 
     /* compiled from: CommonUtils */
     public class a implements Comparator<File> {
@@ -66,7 +66,7 @@ public class h {
         
 
         /* renamed from: s  reason: collision with root package name */
-        public static final Map<String, b> f1300s;
+        public static final Map<String, b> f1296s;
 
         static {
             b bVar = X86_32;
@@ -74,7 +74,7 @@ public class h {
             b bVar3 = ARMV7;
             b bVar4 = ARM64;
             HashMap hashMap = new HashMap(4);
-            f1300s = hashMap;
+            f1296s = hashMap;
             hashMap.put("armeabi-v7a", bVar3);
             hashMap.put("armeabi", bVar2);
             hashMap.put("arm64-v8a", bVar4);
diff --git a/app/src/main/java/c/i/c/m/d/k/h0.java b/app/src/main/java/c/i/c/m/d/k/h0.java
index 98d92a3a39..e29d462729 100644
--- a/app/src/main/java/c/i/c/m/d/k/h0.java
+++ b/app/src/main/java/c/i/c/m/d/k/h0.java
@@ -15,7 +15,7 @@ public class h0 implements b.AbstractC0139b {
     }
 
     public b a(@NonNull c.i.c.m.d.s.h.b bVar) {
-        String str = bVar.f1350c;
+        String str = bVar.f1346c;
         String str2 = bVar.d;
         String str3 = bVar.e;
         x xVar = this.a;
diff --git a/app/src/main/java/c/i/c/m/d/k/i.java b/app/src/main/java/c/i/c/m/d/k/i.java
index c73d4f0fb5..e5447f40cf 100644
--- a/app/src/main/java/c/i/c/m/d/k/i.java
+++ b/app/src/main/java/c/i/c/m/d/k/i.java
@@ -10,7 +10,7 @@ public class i {
     public Task<Void> b = c.F(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final Object f1301c = new Object();
+    public final Object f1297c = new Object();
     public ThreadLocal<Boolean> d = new ThreadLocal<>();
 
     /* compiled from: CrashlyticsBackgroundWorker */
@@ -37,7 +37,7 @@ public class i {
 
     public <T> Task<T> b(Callable<T> callable) {
         Task<T> task;
-        synchronized (this.f1301c) {
+        synchronized (this.f1297c) {
             task = (Task<T>) this.b.i(this.a, new k(this, callable));
             this.b = task.i(this.a, new l(this));
         }
@@ -46,7 +46,7 @@ public class i {
 
     public <T> Task<T> c(Callable<Task<T>> callable) {
         Task<T> task;
-        synchronized (this.f1301c) {
+        synchronized (this.f1297c) {
             task = (Task<T>) this.b.j(this.a, new k(this, callable));
             this.b = task.i(this.a, new l(this));
         }
diff --git a/app/src/main/java/c/i/c/m/d/k/k0.java b/app/src/main/java/c/i/c/m/d/k/k0.java
index bdf575ca4e..cfaae20a24 100644
--- a/app/src/main/java/c/i/c/m/d/k/k0.java
+++ b/app/src/main/java/c/i/c/m/d/k/k0.java
@@ -22,7 +22,7 @@ public class k0 {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final q0 f1302c;
+    public final q0 f1298c;
     public final long d = System.currentTimeMillis();
     public m0 e;
     public m0 f;
@@ -73,7 +73,7 @@ public class k0 {
 
     public k0(c cVar, v0 v0Var, c.i.c.m.d.a aVar, q0 q0Var, c.i.c.m.d.j.a aVar2, c.i.c.m.d.i.a aVar3, ExecutorService executorService) {
         this.b = cVar;
-        this.f1302c = q0Var;
+        this.f1298c = q0Var;
         cVar.a();
         this.a = cVar.d;
         this.i = v0Var;
@@ -145,7 +145,7 @@ public class k0 {
 
     public void d(@Nullable Boolean bool) {
         Boolean bool2;
-        q0 q0Var = this.f1302c;
+        q0 q0Var = this.f1298c;
         synchronized (q0Var) {
             if (bool != null) {
                 try {
@@ -169,7 +169,7 @@ public class k0 {
                 edit.remove("firebase_crashlytics_collection_enabled");
             }
             edit.commit();
-            synchronized (q0Var.f1305c) {
+            synchronized (q0Var.f1301c) {
                 if (q0Var.b()) {
                     if (!q0Var.e) {
                         q0Var.d.b(null);
diff --git a/app/src/main/java/c/i/c/m/d/k/n0.java b/app/src/main/java/c/i/c/m/d/k/n0.java
index a8406e0a64..c35bc627a4 100644
--- a/app/src/main/java/c/i/c/m/d/k/n0.java
+++ b/app/src/main/java/c/i/c/m/d/k/n0.java
@@ -20,7 +20,7 @@ public class n0 {
     public static final Map<String, Integer> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Context f1303c;
+    public final Context f1299c;
     public final v0 d;
     public final b e;
     public final d f;
@@ -33,7 +33,7 @@ public class n0 {
     }
 
     public n0(Context context, v0 v0Var, b bVar, d dVar) {
-        this.f1303c = context;
+        this.f1299c = context;
         this.d = v0Var;
         this.e = bVar;
         this.f = dVar;
@@ -42,7 +42,7 @@ public class n0 {
     public final v.d.AbstractC0132d.a.b.AbstractC0135b a(e eVar, int i, int i2, int i3) {
         String str = eVar.b;
         String str2 = eVar.a;
-        StackTraceElement[] stackTraceElementArr = eVar.f1353c;
+        StackTraceElement[] stackTraceElementArr = eVar.f1349c;
         int i4 = 0;
         if (stackTraceElementArr == null) {
             stackTraceElementArr = new StackTraceElement[0];
@@ -84,7 +84,7 @@ public class n0 {
             bVar.a = Long.valueOf(max);
             Objects.requireNonNull(str, "Null symbol");
             bVar.b = str;
-            bVar.f1337c = fileName;
+            bVar.f1333c = fileName;
             bVar.d = Long.valueOf(j);
             arrayList.add(bVar.a());
         }
diff --git a/app/src/main/java/c/i/c/m/d/k/p0.java b/app/src/main/java/c/i/c/m/d/k/p0.java
index f5d5bc663b..ddf21adb9c 100644
--- a/app/src/main/java/c/i/c/m/d/k/p0.java
+++ b/app/src/main/java/c/i/c/m/d/k/p0.java
@@ -11,7 +11,7 @@ public class p0 implements Thread.UncaughtExceptionHandler {
     public final d b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Thread.UncaughtExceptionHandler f1304c;
+    public final Thread.UncaughtExceptionHandler f1300c;
     public final AtomicBoolean d = new AtomicBoolean(false);
 
     /* compiled from: CrashlyticsUncaughtExceptionHandler */
@@ -21,7 +21,7 @@ public class p0 implements Thread.UncaughtExceptionHandler {
     public p0(a aVar, d dVar, Thread.UncaughtExceptionHandler uncaughtExceptionHandler) {
         this.a = aVar;
         this.b = dVar;
-        this.f1304c = uncaughtExceptionHandler;
+        this.f1300c = uncaughtExceptionHandler;
     }
 
     @Override // java.lang.Thread.UncaughtExceptionHandler
@@ -38,7 +38,7 @@ public class p0 implements Thread.UncaughtExceptionHandler {
                 bVar.b("Crashlytics completed exception processing. Invoking default exception handler.");
             } catch (Throwable th2) {
                 b.a.b("Crashlytics completed exception processing. Invoking default exception handler.");
-                this.f1304c.uncaughtException(thread, th);
+                this.f1300c.uncaughtException(thread, th);
                 this.d.set(false);
                 throw th2;
             }
@@ -48,7 +48,7 @@ public class p0 implements Thread.UncaughtExceptionHandler {
             ((b0) this.a).a(this.b, thread, th);
         }
         b.a.b("Crashlytics completed exception processing. Invoking default exception handler.");
-        this.f1304c.uncaughtException(thread, th);
+        this.f1300c.uncaughtException(thread, th);
         this.d.set(false);
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/k/q0.java b/app/src/main/java/c/i/c/m/d/k/q0.java
index 5f202c3871..e1e867ca02 100644
--- a/app/src/main/java/c/i/c/m/d/k/q0.java
+++ b/app/src/main/java/c/i/c/m/d/k/q0.java
@@ -19,7 +19,7 @@ public class q0 {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Object f1305c;
+    public final Object f1301c;
     public TaskCompletionSource<Void> d = new TaskCompletionSource<>();
     public boolean e = false;
     public boolean f = false;
@@ -30,7 +30,7 @@ public class q0 {
     public q0(c cVar) {
         Boolean bool;
         Object obj = new Object();
-        this.f1305c = obj;
+        this.f1301c = obj;
         cVar.a();
         Context context = cVar.d;
         this.b = cVar;
@@ -90,7 +90,7 @@ public class q0 {
     public Task<Void> c() {
         b0<Void> b0Var;
         b0<Void> b0Var2 = this.h.a;
-        synchronized (this.f1305c) {
+        synchronized (this.f1301c) {
             b0Var = this.d.a;
         }
         FilenameFilter filenameFilter = h1.a;
diff --git a/app/src/main/java/c/i/c/m/d/k/r0.java b/app/src/main/java/c/i/c/m/d/k/r0.java
index 716bf139b9..ac89d85590 100644
--- a/app/src/main/java/c/i/c/m/d/k/r0.java
+++ b/app/src/main/java/c/i/c/m/d/k/r0.java
@@ -8,10 +8,10 @@ public enum r0 {
     
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f1306id;
+    private final int f1302id;
 
     public r0(int i) {
-        this.f1306id = i;
+        this.f1302id = i;
     }
 
     public static r0 f(String str) {
@@ -19,11 +19,11 @@ public enum r0 {
     }
 
     public int g() {
-        return this.f1306id;
+        return this.f1302id;
     }
 
     @Override // java.lang.Enum, java.lang.Object
     public String toString() {
-        return Integer.toString(this.f1306id);
+        return Integer.toString(this.f1302id);
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/k/u.java b/app/src/main/java/c/i/c/m/d/k/u.java
index d2957b6d51..633cc745c0 100644
--- a/app/src/main/java/c/i/c/m/d/k/u.java
+++ b/app/src/main/java/c/i/c/m/d/k/u.java
@@ -10,19 +10,19 @@ public class u implements x.g {
     public final /* synthetic */ String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ long f1307c;
+    public final /* synthetic */ long f1303c;
 
     public u(x xVar, String str, String str2, long j) {
         this.a = str;
         this.b = str2;
-        this.f1307c = j;
+        this.f1303c = j;
     }
 
     @Override // c.i.c.m.d.k.x.g
     public void a(c cVar) throws Exception {
         String str = this.a;
         String str2 = this.b;
-        long j = this.f1307c;
+        long j = this.f1303c;
         a aVar = d.a;
         cVar.l(1, a.a(str2));
         cVar.l(2, a.a(str));
diff --git a/app/src/main/java/c/i/c/m/d/k/u0.java b/app/src/main/java/c/i/c/m/d/k/u0.java
index 896edf781c..3d5c4343ea 100644
--- a/app/src/main/java/c/i/c/m/d/k/u0.java
+++ b/app/src/main/java/c/i/c/m/d/k/u0.java
@@ -22,18 +22,18 @@ public class u0 implements a1 {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1308c;
+    public final String f1304c;
 
     public u0(@NonNull String str, @NonNull String str2, @NonNull File file) {
         this.b = str;
-        this.f1308c = str2;
+        this.f1304c = str2;
         this.a = file;
     }
 
     @Override // c.i.c.m.d.k.a1
     @NonNull
     public String a() {
-        return this.f1308c;
+        return this.f1304c;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:37:0x0051  */
diff --git a/app/src/main/java/c/i/c/m/d/k/v.java b/app/src/main/java/c/i/c/m/d/k/v.java
index 72189d4588..903b859de6 100644
--- a/app/src/main/java/c/i/c/m/d/k/v.java
+++ b/app/src/main/java/c/i/c/m/d/k/v.java
@@ -10,7 +10,7 @@ public class v implements x.g {
     public final /* synthetic */ String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ String f1309c;
+    public final /* synthetic */ String f1305c;
     public final /* synthetic */ String d;
     public final /* synthetic */ int e;
     public final /* synthetic */ x f;
@@ -19,7 +19,7 @@ public class v implements x.g {
         this.f = xVar;
         this.a = str;
         this.b = str2;
-        this.f1309c = str3;
+        this.f1305c = str3;
         this.d = str4;
         this.e = i;
     }
@@ -28,10 +28,10 @@ public class v implements x.g {
     public void a(c cVar) throws Exception {
         String str = this.a;
         String str2 = this.b;
-        String str3 = this.f1309c;
+        String str3 = this.f1305c;
         String str4 = this.d;
         int i = this.e;
-        String str5 = this.f.f1314y;
+        String str5 = this.f.f1310y;
         a aVar = d.a;
         a a = a.a(str);
         a a2 = a.a(str2);
diff --git a/app/src/main/java/c/i/c/m/d/k/v0.java b/app/src/main/java/c/i/c/m/d/k/v0.java
index 7bcf328ca2..efc63979dd 100644
--- a/app/src/main/java/c/i/c/m/d/k/v0.java
+++ b/app/src/main/java/c/i/c/m/d/k/v0.java
@@ -16,7 +16,7 @@ public class v0 implements w0 {
     public static final String b = Pattern.quote("/");
 
     /* renamed from: c  reason: collision with root package name */
-    public final x0 f1310c;
+    public final x0 f1306c;
     public final Context d;
     public final String e;
     public final g f;
@@ -27,7 +27,7 @@ public class v0 implements w0 {
             this.d = context;
             this.e = str;
             this.f = gVar;
-            this.f1310c = new x0();
+            this.f1306c = new x0();
             return;
         }
         throw new IllegalArgumentException("appIdentifier must not be null");
@@ -89,7 +89,7 @@ public class v0 implements w0 {
 
     public String c() {
         String str;
-        x0 x0Var = this.f1310c;
+        x0 x0Var = this.f1306c;
         Context context = this.d;
         synchronized (x0Var) {
             if (x0Var.a == null) {
diff --git a/app/src/main/java/c/i/c/m/d/k/x.java b/app/src/main/java/c/i/c/m/d/k/x.java
index 9f680aa2c0..e3c704e614 100644
--- a/app/src/main/java/c/i/c/m/d/k/x.java
+++ b/app/src/main/java/c/i/c/m/d/k/x.java
@@ -55,7 +55,7 @@ public class x {
     public static final FilenameFilter b = new b();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Comparator<File> f1311c = new c();
+    public static final Comparator<File> f1307c = new c();
     public static final Comparator<File> d = new d();
     public static final Pattern e = Pattern.compile("([\\d|A-Z|a-z]{12}\\-[\\d|A-Z|a-z]{4}\\-[\\d|A-Z|a-z]{4}\\-[\\d|A-Z|a-z]{12}).+");
     public static final Map<String, String> f = Collections.singletonMap("X-CRASHLYTICS-SEND-FLAGS", "1");
@@ -79,20 +79,20 @@ public class x {
     public final b.AbstractC0139b r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final j f1312s;
+    public final j f1308s;
     public final c.i.c.m.d.l.b t;
     public final c.i.c.m.d.q.a u;
     public final b.a v;
     public final c.i.c.m.d.a w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final c.i.c.m.d.t.d f1313x;
+    public final c.i.c.m.d.t.d f1309x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final String f1314y;
+    public final String f1310y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final c.i.c.m.d.i.a f1315z;
+    public final c.i.c.m.d.i.a f1311z;
 
     /* compiled from: CrashlyticsController */
     public class a extends h {
@@ -269,24 +269,24 @@ public class x {
         this.q = bVar2;
         this.r = new h0(this);
         this.w = aVar2;
-        this.f1314y = bVar2.g.a();
-        this.f1315z = aVar3;
+        this.f1310y = bVar2.g.a();
+        this.f1311z = aVar3;
         f1 f1Var = new f1();
         this.l = f1Var;
         j jVar = new j(hVar);
-        this.f1312s = jVar;
+        this.f1308s = jVar;
         c.i.c.m.d.l.b bVar4 = new c.i.c.m.d.l.b(context, jVar);
         this.t = bVar4;
         this.u = new c.i.c.m.d.q.a(new k(null));
         this.v = new l(null);
         c.i.c.m.d.t.a aVar4 = new c.i.c.m.d.t.a(1024, new c.i.c.m.d.t.c(10));
-        this.f1313x = aVar4;
+        this.f1309x = aVar4;
         File file = new File(new File(hVar.a.getFilesDir(), ".com.google.firebase.crashlytics").getPath());
         n0 n0Var = new n0(context, v0Var, bVar2, aVar4);
         c.i.c.m.d.o.g gVar = new c.i.c.m.d.o.g(file, dVar);
         c.i.c.m.d.m.x.h hVar2 = c.i.c.m.d.r.c.a;
         c.i.a.b.j.n.b(context);
-        c.i.a.b.g c2 = c.i.a.b.j.n.a().c(new c.i.a.b.i.a(c.i.c.m.d.r.c.b, c.i.c.m.d.r.c.f1347c));
+        c.i.a.b.g c2 = c.i.a.b.j.n.a().c(new c.i.a.b.i.a(c.i.c.m.d.r.c.b, c.i.c.m.d.r.c.f1343c));
         c.i.a.b.b bVar5 = new c.i.a.b.b("json");
         c.i.a.b.e<v, byte[]> eVar = c.i.c.m.d.r.c.d;
         this.A = new d1(n0Var, gVar, new c.i.c.m.d.r.c(((c.i.a.b.j.j) c2).a("FIREBASE_CRASHLYTICS_REPORT", v.class, bVar5, eVar), eVar), bVar4, f1Var);
@@ -341,9 +341,9 @@ public class x {
         String str5 = bVar2.e;
         String str6 = bVar2.f;
         String b2 = v0Var.b();
-        int g2 = r0.f(xVar.q.f1296c).g();
+        int g2 = r0.f(xVar.q.f1292c).g();
         xVar.z(str3, "SessionApp", new v(xVar, str4, str5, str6, b2, g2));
-        xVar.w.f(str3, str4, str5, str6, b2, g2, xVar.f1314y);
+        xVar.w.f(str3, str4, str5, str6, b2, g2, xVar.f1310y);
         String str7 = Build.VERSION.RELEASE;
         String str8 = Build.VERSION.CODENAME;
         boolean t = h.t(xVar.i);
@@ -356,7 +356,7 @@ public class x {
         if (TextUtils.isEmpty(str9)) {
             bVar.b("Architecture#getValue()::Build.CPU_ABI returned null or empty");
         } else {
-            h.b bVar4 = h.b.f1300s.get(str9.toLowerCase(locale));
+            h.b bVar4 = h.b.f1296s.get(str9.toLowerCase(locale));
             if (bVar4 != null) {
                 bVar3 = bVar4;
             }
@@ -392,10 +392,10 @@ public class x {
         String str15 = n0Var.e.f;
         Objects.requireNonNull(str15, "Null displayVersion");
         bVar5.f = str15;
-        bVar5.f1322c = 4;
+        bVar5.f1318c = 4;
         f.b bVar6 = new f.b();
         bVar6.b(false);
-        bVar6.f1324c = Long.valueOf(j2);
+        bVar6.f1320c = Long.valueOf(j2);
         Objects.requireNonNull(t2, "Null identifier");
         bVar6.b = t2;
         String str16 = n0.a;
@@ -419,7 +419,7 @@ public class x {
         Integer num2 = 3;
         Objects.requireNonNull(str7, "Null version");
         Objects.requireNonNull(str8, "Null buildVersion");
-        Boolean valueOf = Boolean.valueOf(h.t(n0Var.f1303c));
+        Boolean valueOf = Boolean.valueOf(h.t(n0Var.f1299c));
         String str20 = num2 == null ? " platform" : "";
         if (valueOf == null) {
             str20 = c.d.b.a.a.u(str20, " jailbroken");
@@ -434,13 +434,13 @@ public class x {
             int availableProcessors2 = Runtime.getRuntime().availableProcessors();
             long p2 = h.p();
             long blockCount2 = ((long) statFs2.getBlockCount()) * ((long) statFs2.getBlockSize());
-            boolean r2 = h.r(n0Var.f1303c);
-            int k3 = h.k(n0Var.f1303c);
+            boolean r2 = h.r(n0Var.f1299c);
+            int k3 = h.k(n0Var.f1299c);
             i.b bVar7 = new i.b();
             bVar7.a = Integer.valueOf(i2);
             Objects.requireNonNull(str10, "Null model");
             bVar7.b = str10;
-            bVar7.f1327c = Integer.valueOf(availableProcessors2);
+            bVar7.f1323c = Integer.valueOf(availableProcessors2);
             bVar7.d = Long.valueOf(p2);
             bVar7.e = Long.valueOf(blockCount2);
             bVar7.f = Boolean.valueOf(r2);
@@ -464,7 +464,7 @@ public class x {
             try {
                 File h3 = gVar.h(g3);
                 c.i.c.m.d.o.g.i(h3);
-                c.i.c.m.d.o.g.l(new File(h3, "report"), c.i.c.m.d.o.g.f1343c.g(a3));
+                c.i.c.m.d.o.g.l(new File(h3, "report"), c.i.c.m.d.o.g.f1339c.g(a3));
             } catch (IOException e2) {
                 c.i.c.m.d.b.a.c("Could not persist report for session " + g3, e2);
             }
@@ -598,7 +598,7 @@ public class x {
     }
 
     public static void x(c.i.c.m.d.p.c cVar, File[] fileArr, String str) {
-        Arrays.sort(fileArr, h.f1299c);
+        Arrays.sort(fileArr, h.f1295c);
         for (File file : fileArr) {
             try {
                 c.i.c.m.d.b.a.b(String.format(Locale.US, "Found Non Fatal for session ID %s in %s ", str, file.getName()));
@@ -665,7 +665,7 @@ public class x {
         for (int i5 = 0; i5 < min; i5++) {
             hashSet.add(o(s2[i5]));
         }
-        File[] listFiles = ((j) this.t.f1318c).a().listFiles();
+        File[] listFiles = ((j) this.t.f1314c).a().listFiles();
         if (listFiles != null) {
             for (File file2 : listFiles) {
                 String name = file2.getName();
@@ -802,7 +802,7 @@ public class x {
                 bVar2.g("No minidump data found for session " + o);
             } else {
                 long lastModified = d2.lastModified();
-                c.i.c.m.d.l.b bVar3 = new c.i.c.m.d.l.b(this.i, this.f1312s, o);
+                c.i.c.m.d.l.b bVar3 = new c.i.c.m.d.l.b(this.i, this.f1308s, o);
                 File file4 = new File(m(), o);
                 if (!file4.mkdirs()) {
                     bVar2.b("Couldn't create native sessions directory");
@@ -865,7 +865,7 @@ public class x {
                     File file5 = new File(gVar2.h(replaceAll), str4);
                     File file6 = gVar2.j;
                     try {
-                        c.i.c.m.d.m.x.h hVar = c.i.c.m.d.o.g.f1343c;
+                        c.i.c.m.d.m.x.h hVar = c.i.c.m.d.o.g.f1339c;
                         b.C0130b bVar4 = (b.C0130b) hVar.f(c.i.c.m.d.o.g.j(file5)).i();
                         bVar4.g = null;
                         bVar4.h = dVar;
@@ -1061,7 +1061,7 @@ public class x {
                         }
                         File next = it3.next();
                         try {
-                            c.i.c.m.d.m.x.h hVar2 = c.i.c.m.d.o.g.f1343c;
+                            c.i.c.m.d.m.x.h hVar2 = c.i.c.m.d.o.g.f1339c;
                             String j4 = c.i.c.m.d.o.g.j(next);
                             Objects.requireNonNull(hVar2);
                             try {
@@ -1107,7 +1107,7 @@ public class x {
                         str = str6;
                         file = new File(file11, str);
                         File file13 = !z3 ? gVar.h : gVar.i;
-                        c.i.c.m.d.m.x.h hVar3 = c.i.c.m.d.o.g.f1343c;
+                        c.i.c.m.d.m.x.h hVar3 = c.i.c.m.d.o.g.f1339c;
                         j2 = hVar3.f(c.i.c.m.d.o.g.j(file)).j(j3, z3, str2);
                         w<v.d.AbstractC0132d> wVar = new w<>(arrayList4);
                         if (j2.h() == null) {
@@ -1134,7 +1134,7 @@ public class x {
                     if (!z3) {
                     }
                     try {
-                        c.i.c.m.d.m.x.h hVar3 = c.i.c.m.d.o.g.f1343c;
+                        c.i.c.m.d.m.x.h hVar3 = c.i.c.m.d.o.g.f1339c;
                         j2 = hVar3.f(c.i.c.m.d.o.g.j(file)).j(j3, z3, str2);
                         w<v.d.AbstractC0132d> wVar = new w<>(arrayList4);
                         if (j2.h() == null) {
@@ -1240,7 +1240,7 @@ public class x {
 
     public final File[] s() {
         File[] r = r(l(), a);
-        Arrays.sort(r, f1311c);
+        Arrays.sort(r, f1307c);
         return r;
     }
 
@@ -1273,7 +1273,7 @@ public class x {
             bVar.b("Notifying that unsent reports are available.");
             this.C.b(Boolean.TRUE);
             q0 q0Var = this.j;
-            synchronized (q0Var.f1305c) {
+            synchronized (q0Var.f1301c) {
                 b0Var = q0Var.d.a;
             }
             Task<TContinuationResult> q2 = b0Var.q(new e0(this));
@@ -1327,7 +1327,7 @@ public class x {
         int length;
         int i2;
         Map<String, String> map;
-        c.i.c.m.d.t.e eVar = new c.i.c.m.d.t.e(th, this.f1313x);
+        c.i.c.m.d.t.e eVar = new c.i.c.m.d.t.e(th, this.f1309x);
         Context context = this.i;
         e a2 = e.a(context);
         Float f2 = a2.a;
@@ -1341,7 +1341,7 @@ public class x {
         long a3 = h.a(Environment.getDataDirectory().getPath());
         ActivityManager.RunningAppProcessInfo i4 = h.i(context.getPackageName(), context);
         LinkedList linkedList = new LinkedList();
-        StackTraceElement[] stackTraceElementArr = eVar.f1353c;
+        StackTraceElement[] stackTraceElementArr = eVar.f1349c;
         String str3 = this.q.b;
         String str4 = this.o.e;
         if (z2) {
@@ -1350,7 +1350,7 @@ public class x {
             int i5 = 0;
             for (Map.Entry<Thread, StackTraceElement[]> entry : allStackTraces.entrySet()) {
                 threadArr2[i5] = entry.getKey();
-                linkedList.add(this.f1313x.a(entry.getValue()));
+                linkedList.add(this.f1309x.a(entry.getValue()));
                 i5++;
                 threadArr2 = threadArr2;
             }
diff --git a/app/src/main/java/c/i/c/m/d/k/y.java b/app/src/main/java/c/i/c/m/d/k/y.java
index 19f796d788..e3092f0c4c 100644
--- a/app/src/main/java/c/i/c/m/d/k/y.java
+++ b/app/src/main/java/c/i/c/m/d/k/y.java
@@ -11,7 +11,7 @@ public class y implements x.g {
     public final /* synthetic */ int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ long f1317c;
+    public final /* synthetic */ long f1313c;
     public final /* synthetic */ long d;
     public final /* synthetic */ boolean e;
     public final /* synthetic */ int f;
@@ -19,7 +19,7 @@ public class y implements x.g {
     public y(x xVar, int i, String str, int i2, long j, long j2, boolean z2, int i3, String str2, String str3) {
         this.a = i;
         this.b = i2;
-        this.f1317c = j;
+        this.f1313c = j;
         this.d = j2;
         this.e = z2;
         this.f = i3;
@@ -30,7 +30,7 @@ public class y implements x.g {
         int i = this.a;
         String str = Build.MODEL;
         int i2 = this.b;
-        long j = this.f1317c;
+        long j = this.f1313c;
         long j2 = this.d;
         boolean z2 = this.e;
         int i3 = this.f;
diff --git a/app/src/main/java/c/i/c/m/d/l/b.java b/app/src/main/java/c/i/c/m/d/l/b.java
index 2857d94157..d7f5053c14 100644
--- a/app/src/main/java/c/i/c/m/d/l/b.java
+++ b/app/src/main/java/c/i/c/m/d/l/b.java
@@ -10,7 +10,7 @@ public class b {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final AbstractC0127b f1318c;
+    public final AbstractC0127b f1314c;
     public a d = a;
 
     /* compiled from: LogFileManager */
@@ -48,13 +48,13 @@ public class b {
 
     public b(Context context, AbstractC0127b bVar) {
         this.b = context;
-        this.f1318c = bVar;
+        this.f1314c = bVar;
         a(null);
     }
 
     public b(Context context, AbstractC0127b bVar, String str) {
         this.b = context;
-        this.f1318c = bVar;
+        this.f1314c = bVar;
         a(str);
     }
 
@@ -66,7 +66,7 @@ public class b {
                 c.i.c.m.d.b.a.b("Preferences requested no custom logs. Aborting log file creation.");
                 return;
             }
-            this.d = new e(new File(((x.j) this.f1318c).a(), c.d.b.a.a.v("crashlytics-userlog-", str, ".temp")), 65536);
+            this.d = new e(new File(((x.j) this.f1314c).a(), c.d.b.a.a.v("crashlytics-userlog-", str, ".temp")), 65536);
         }
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/l/c.java b/app/src/main/java/c/i/c/m/d/l/c.java
index 34d3d3ae3f..70b848d128 100644
--- a/app/src/main/java/c/i/c/m/d/l/c.java
+++ b/app/src/main/java/c/i/c/m/d/l/c.java
@@ -46,11 +46,11 @@ public class c implements Closeable {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f1319c;
+        public final int f1315c;
 
         public b(int i, int i2) {
             this.b = i;
-            this.f1319c = i2;
+            this.f1315c = i2;
         }
 
         public String toString() {
@@ -59,7 +59,7 @@ public class c implements Closeable {
             sb.append("[position = ");
             sb.append(this.b);
             sb.append(", length = ");
-            return c.d.b.a.a.z(sb, this.f1319c, "]");
+            return c.d.b.a.a.z(sb, this.f1315c, "]");
         }
     }
 
@@ -73,7 +73,7 @@ public class c implements Closeable {
             int i = bVar.b + 4;
             int i2 = c.this.k;
             this.i = i >= i2 ? (i + 16) - i2 : i;
-            this.j = bVar.f1319c;
+            this.j = bVar.f1315c;
         }
 
         @Override // java.io.InputStream
@@ -199,7 +199,7 @@ public class c implements Closeable {
                         i2 = 16;
                     } else {
                         b bVar = this.n;
-                        i2 = z(bVar.b + 4 + bVar.f1319c);
+                        i2 = z(bVar.b + 4 + bVar.f1315c);
                     }
                     b bVar2 = new b(i2, length);
                     C(this.o, 0, length);
@@ -247,7 +247,7 @@ public class c implements Closeable {
             this.j.setLength((long) i4);
             this.j.getChannel().force(true);
             b bVar = this.n;
-            int z2 = z(bVar.b + 4 + bVar.f1319c);
+            int z2 = z(bVar.b + 4 + bVar.f1315c);
             if (z2 < this.m.b) {
                 FileChannel channel = this.j.getChannel();
                 channel.position((long) this.k);
@@ -261,7 +261,7 @@ public class c implements Closeable {
             if (i5 < i6) {
                 int i7 = (this.k + i5) - 16;
                 B(i4, this.l, i6, i7);
-                this.n = new b(i7, this.n.f1319c);
+                this.n = new b(i7, this.n.f1315c);
             } else {
                 B(i4, this.l, i6, i5);
             }
@@ -273,8 +273,8 @@ public class c implements Closeable {
         int i2 = this.m.b;
         for (int i3 = 0; i3 < this.l; i3++) {
             b p = p(i2);
-            dVar.a(new C0128c(p, null), p.f1319c);
-            i2 = z(p.b + 4 + p.f1319c);
+            dVar.a(new C0128c(p, null), p.f1315c);
+            i2 = z(p.b + 4 + p.f1315c);
         }
     }
 
@@ -297,7 +297,7 @@ public class c implements Closeable {
             c();
         } else {
             b bVar = this.m;
-            int z2 = z(bVar.b + 4 + bVar.f1319c);
+            int z2 = z(bVar.b + 4 + bVar.f1315c);
             t(z2, this.o, 0, 4);
             int r = r(this.o, 0);
             B(this.k, this.l - 1, z2, this.n.b);
@@ -370,7 +370,7 @@ public class c implements Closeable {
         b bVar = this.n;
         int i2 = bVar.b;
         int i3 = this.m.b;
-        return i2 >= i3 ? (i2 - i3) + 4 + bVar.f1319c + 16 : (((i2 + 4) + bVar.f1319c) + this.k) - i3;
+        return i2 >= i3 ? (i2 - i3) + 4 + bVar.f1315c + 16 : (((i2 + 4) + bVar.f1315c) + this.k) - i3;
     }
 
     public final int z(int i2) {
diff --git a/app/src/main/java/c/i/c/m/d/l/e.java b/app/src/main/java/c/i/c/m/d/l/e.java
index 0ba0762805..07640347b5 100644
--- a/app/src/main/java/c/i/c/m/d/l/e.java
+++ b/app/src/main/java/c/i/c/m/d/l/e.java
@@ -13,7 +13,7 @@ public class e implements a {
     public final File b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1320c;
+    public final int f1316c;
     public c d;
 
     /* compiled from: QueueFileLogStore */
@@ -29,7 +29,7 @@ public class e implements a {
 
     public e(File file, int i) {
         this.b = file;
-        this.f1320c = i;
+        this.f1316c = i;
     }
 
     @Override // c.i.c.m.d.l.a
@@ -95,12 +95,12 @@ public class e implements a {
                 str = "null";
             }
             try {
-                int i = this.f1320c / 4;
+                int i = this.f1316c / 4;
                 if (str.length() > i) {
                     str = "..." + str.substring(str.length() - i);
                 }
                 this.d.b(String.format(Locale.US, "%d %s%n", Long.valueOf(j), str.replaceAll("\r", " ").replaceAll("\n", " ")).getBytes(a));
-                while (!this.d.f() && this.d.x() > this.f1320c) {
+                while (!this.d.f() && this.d.x() > this.f1316c) {
                     this.d.s();
                 }
             } catch (IOException e) {
diff --git a/app/src/main/java/c/i/c/m/d/m/a.java b/app/src/main/java/c/i/c/m/d/m/a.java
index 95e9a13b39..6f521bb7ad 100644
--- a/app/src/main/java/c/i/c/m/d/m/a.java
+++ b/app/src/main/java/c/i/c/m/d/m/a.java
@@ -333,103 +333,103 @@ public final class a implements c.i.c.p.g.a {
         b bVar2 = b.a;
         c.i.c.p.h.e eVar = (c.i.c.p.h.e) bVar;
         eVar.b.put(v.class, bVar2);
-        eVar.f1359c.remove(v.class);
+        eVar.f1354c.remove(v.class);
         eVar.b.put(b.class, bVar2);
-        eVar.f1359c.remove(b.class);
+        eVar.f1354c.remove(b.class);
         h hVar = h.a;
         eVar.b.put(v.d.class, hVar);
-        eVar.f1359c.remove(v.d.class);
+        eVar.f1354c.remove(v.d.class);
         eVar.b.put(f.class, hVar);
-        eVar.f1359c.remove(f.class);
+        eVar.f1354c.remove(f.class);
         e eVar2 = e.a;
         eVar.b.put(v.d.a.class, eVar2);
-        eVar.f1359c.remove(v.d.a.class);
+        eVar.f1354c.remove(v.d.a.class);
         eVar.b.put(g.class, eVar2);
-        eVar.f1359c.remove(g.class);
+        eVar.f1354c.remove(g.class);
         f fVar = f.a;
         eVar.b.put(v.d.a.AbstractC0131a.class, fVar);
-        eVar.f1359c.remove(v.d.a.AbstractC0131a.class);
+        eVar.f1354c.remove(v.d.a.AbstractC0131a.class);
         eVar.b.put(h.class, fVar);
-        eVar.f1359c.remove(h.class);
+        eVar.f1354c.remove(h.class);
         t tVar = t.a;
         eVar.b.put(v.d.f.class, tVar);
-        eVar.f1359c.remove(v.d.f.class);
+        eVar.f1354c.remove(v.d.f.class);
         eVar.b.put(u.class, tVar);
-        eVar.f1359c.remove(u.class);
+        eVar.f1354c.remove(u.class);
         s sVar = s.a;
         eVar.b.put(v.d.e.class, sVar);
-        eVar.f1359c.remove(v.d.e.class);
+        eVar.f1354c.remove(v.d.e.class);
         eVar.b.put(t.class, sVar);
-        eVar.f1359c.remove(t.class);
+        eVar.f1354c.remove(t.class);
         g gVar = g.a;
         eVar.b.put(v.d.c.class, gVar);
-        eVar.f1359c.remove(v.d.c.class);
+        eVar.f1354c.remove(v.d.c.class);
         eVar.b.put(i.class, gVar);
-        eVar.f1359c.remove(i.class);
+        eVar.f1354c.remove(i.class);
         q qVar = q.a;
         eVar.b.put(v.d.AbstractC0132d.class, qVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.class);
         eVar.b.put(j.class, qVar);
-        eVar.f1359c.remove(j.class);
+        eVar.f1354c.remove(j.class);
         i iVar = i.a;
         eVar.b.put(v.d.AbstractC0132d.a.class, iVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.class);
         eVar.b.put(k.class, iVar);
-        eVar.f1359c.remove(k.class);
+        eVar.f1354c.remove(k.class);
         k kVar = k.a;
         eVar.b.put(v.d.AbstractC0132d.a.b.class, kVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.b.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.b.class);
         eVar.b.put(l.class, kVar);
-        eVar.f1359c.remove(l.class);
+        eVar.f1354c.remove(l.class);
         n nVar = n.a;
         eVar.b.put(v.d.AbstractC0132d.a.b.AbstractC0136d.class, nVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.b.AbstractC0136d.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.b.AbstractC0136d.class);
         eVar.b.put(p.class, nVar);
-        eVar.f1359c.remove(p.class);
+        eVar.f1354c.remove(p.class);
         o oVar = o.a;
         eVar.b.put(v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a.class, oVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a.class);
         eVar.b.put(q.class, oVar);
-        eVar.f1359c.remove(q.class);
+        eVar.f1354c.remove(q.class);
         l lVar = l.a;
         eVar.b.put(v.d.AbstractC0132d.a.b.AbstractC0135b.class, lVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.b.AbstractC0135b.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.b.AbstractC0135b.class);
         eVar.b.put(n.class, lVar);
-        eVar.f1359c.remove(n.class);
+        eVar.f1354c.remove(n.class);
         m mVar = m.a;
         eVar.b.put(v.d.AbstractC0132d.a.b.c.class, mVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.b.c.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.b.c.class);
         eVar.b.put(o.class, mVar);
-        eVar.f1359c.remove(o.class);
+        eVar.f1354c.remove(o.class);
         j jVar = j.a;
         eVar.b.put(v.d.AbstractC0132d.a.b.AbstractC0134a.class, jVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.a.b.AbstractC0134a.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.a.b.AbstractC0134a.class);
         eVar.b.put(m.class, jVar);
-        eVar.f1359c.remove(m.class);
+        eVar.f1354c.remove(m.class);
         C0129a aVar = C0129a.a;
         eVar.b.put(v.b.class, aVar);
-        eVar.f1359c.remove(v.b.class);
+        eVar.f1354c.remove(v.b.class);
         eVar.b.put(c.class, aVar);
-        eVar.f1359c.remove(c.class);
+        eVar.f1354c.remove(c.class);
         p pVar = p.a;
         eVar.b.put(v.d.AbstractC0132d.b.class, pVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.b.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.b.class);
         eVar.b.put(r.class, pVar);
-        eVar.f1359c.remove(r.class);
+        eVar.f1354c.remove(r.class);
         r rVar = r.a;
         eVar.b.put(v.d.AbstractC0132d.c.class, rVar);
-        eVar.f1359c.remove(v.d.AbstractC0132d.c.class);
+        eVar.f1354c.remove(v.d.AbstractC0132d.c.class);
         eVar.b.put(s.class, rVar);
-        eVar.f1359c.remove(s.class);
+        eVar.f1354c.remove(s.class);
         c cVar = c.a;
         eVar.b.put(v.c.class, cVar);
-        eVar.f1359c.remove(v.c.class);
+        eVar.f1354c.remove(v.c.class);
         eVar.b.put(d.class, cVar);
-        eVar.f1359c.remove(d.class);
+        eVar.f1354c.remove(d.class);
         d dVar = d.a;
         eVar.b.put(v.c.a.class, dVar);
-        eVar.f1359c.remove(v.c.a.class);
+        eVar.f1354c.remove(v.c.a.class);
         eVar.b.put(e.class, dVar);
-        eVar.f1359c.remove(e.class);
+        eVar.f1354c.remove(e.class);
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/m/b.java b/app/src/main/java/c/i/c/m/d/m/b.java
index 0f8b83e1d2..4fa313d279 100644
--- a/app/src/main/java/c/i/c/m/d/m/b.java
+++ b/app/src/main/java/c/i/c/m/d/m/b.java
@@ -8,7 +8,7 @@ public final class b extends v {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1321c;
+    public final String f1317c;
     public final int d;
     public final String e;
     public final String f;
@@ -23,7 +23,7 @@ public final class b extends v {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Integer f1322c;
+        public Integer f1318c;
         public String d;
         public String e;
         public String f;
@@ -36,8 +36,8 @@ public final class b extends v {
         public C0130b(v vVar, a aVar) {
             b bVar = (b) vVar;
             this.a = bVar.b;
-            this.b = bVar.f1321c;
-            this.f1322c = Integer.valueOf(bVar.d);
+            this.b = bVar.f1317c;
+            this.f1318c = Integer.valueOf(bVar.d);
             this.d = bVar.e;
             this.e = bVar.f;
             this.f = bVar.g;
@@ -51,7 +51,7 @@ public final class b extends v {
             if (this.b == null) {
                 str = c.d.b.a.a.u(str, " gmpAppId");
             }
-            if (this.f1322c == null) {
+            if (this.f1318c == null) {
                 str = c.d.b.a.a.u(str, " platform");
             }
             if (this.d == null) {
@@ -64,7 +64,7 @@ public final class b extends v {
                 str = c.d.b.a.a.u(str, " displayVersion");
             }
             if (str.isEmpty()) {
-                return new b(this.a, this.b, this.f1322c.intValue(), this.d, this.e, this.f, this.g, this.h, null);
+                return new b(this.a, this.b, this.f1318c.intValue(), this.d, this.e, this.f, this.g, this.h, null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -72,7 +72,7 @@ public final class b extends v {
 
     public b(String str, String str2, int i, String str3, String str4, String str5, v.d dVar, v.c cVar, a aVar) {
         this.b = str;
-        this.f1321c = str2;
+        this.f1317c = str2;
         this.d = i;
         this.e = str3;
         this.f = str4;
@@ -96,7 +96,7 @@ public final class b extends v {
     @Override // c.i.c.m.d.m.v
     @NonNull
     public String c() {
-        return this.f1321c;
+        return this.f1317c;
     }
 
     @Override // c.i.c.m.d.m.v
@@ -120,7 +120,7 @@ public final class b extends v {
             return false;
         }
         v vVar = (v) obj;
-        if (this.b.equals(vVar.g()) && this.f1321c.equals(vVar.c()) && this.d == vVar.f() && this.e.equals(vVar.d()) && this.f.equals(vVar.a()) && this.g.equals(vVar.b()) && ((dVar = this.h) != null ? dVar.equals(vVar.h()) : vVar.h() == null)) {
+        if (this.b.equals(vVar.g()) && this.f1317c.equals(vVar.c()) && this.d == vVar.f() && this.e.equals(vVar.d()) && this.f.equals(vVar.a()) && this.g.equals(vVar.b()) && ((dVar = this.h) != null ? dVar.equals(vVar.h()) : vVar.h() == null)) {
             v.c cVar = this.i;
             if (cVar == null) {
                 if (vVar.e() == null) {
@@ -151,7 +151,7 @@ public final class b extends v {
     }
 
     public int hashCode() {
-        int hashCode = (((((((((((this.b.hashCode() ^ 1000003) * 1000003) ^ this.f1321c.hashCode()) * 1000003) ^ this.d) * 1000003) ^ this.e.hashCode()) * 1000003) ^ this.f.hashCode()) * 1000003) ^ this.g.hashCode()) * 1000003;
+        int hashCode = (((((((((((this.b.hashCode() ^ 1000003) * 1000003) ^ this.f1317c.hashCode()) * 1000003) ^ this.d) * 1000003) ^ this.e.hashCode()) * 1000003) ^ this.f.hashCode()) * 1000003) ^ this.g.hashCode()) * 1000003;
         v.d dVar = this.h;
         int i = 0;
         int hashCode2 = (hashCode ^ (dVar == null ? 0 : dVar.hashCode())) * 1000003;
@@ -171,7 +171,7 @@ public final class b extends v {
         StringBuilder L = c.d.b.a.a.L("CrashlyticsReport{sdkVersion=");
         L.append(this.b);
         L.append(", gmpAppId=");
-        L.append(this.f1321c);
+        L.append(this.f1317c);
         L.append(", platform=");
         L.append(this.d);
         L.append(", installationUuid=");
diff --git a/app/src/main/java/c/i/c/m/d/m/f.java b/app/src/main/java/c/i/c/m/d/m/f.java
index 8638aad586..308727d3b9 100644
--- a/app/src/main/java/c/i/c/m/d/m/f.java
+++ b/app/src/main/java/c/i/c/m/d/m/f.java
@@ -9,7 +9,7 @@ public final class f extends v.d {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final long f1323c;
+    public final long f1319c;
     public final Long d;
     public final boolean e;
     public final v.d.a f;
@@ -25,7 +25,7 @@ public final class f extends v.d {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Long f1324c;
+        public Long f1320c;
         public Long d;
         public Boolean e;
         public v.d.a f;
@@ -42,7 +42,7 @@ public final class f extends v.d {
             f fVar = (f) dVar;
             this.a = fVar.a;
             this.b = fVar.b;
-            this.f1324c = Long.valueOf(fVar.f1323c);
+            this.f1320c = Long.valueOf(fVar.f1319c);
             this.d = fVar.d;
             this.e = Boolean.valueOf(fVar.e);
             this.f = fVar.f;
@@ -59,7 +59,7 @@ public final class f extends v.d {
             if (this.b == null) {
                 str = c.d.b.a.a.u(str, " identifier");
             }
-            if (this.f1324c == null) {
+            if (this.f1320c == null) {
                 str = c.d.b.a.a.u(str, " startedAt");
             }
             if (this.e == null) {
@@ -72,7 +72,7 @@ public final class f extends v.d {
                 str = c.d.b.a.a.u(str, " generatorType");
             }
             if (str.isEmpty()) {
-                return new f(this.a, this.b, this.f1324c.longValue(), this.d, this.e.booleanValue(), this.f, this.g, this.h, this.i, this.j, this.k.intValue(), null);
+                return new f(this.a, this.b, this.f1320c.longValue(), this.d, this.e.booleanValue(), this.f, this.g, this.h, this.i, this.j, this.k.intValue(), null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -86,7 +86,7 @@ public final class f extends v.d {
     public f(String str, String str2, long j, Long l, boolean z2, v.d.a aVar, v.d.f fVar, v.d.e eVar, v.d.c cVar, w wVar, int i, a aVar2) {
         this.a = str;
         this.b = str2;
-        this.f1323c = j;
+        this.f1319c = j;
         this.d = l;
         this.e = z2;
         this.f = aVar;
@@ -140,7 +140,7 @@ public final class f extends v.d {
             return false;
         }
         v.d dVar = (v.d) obj;
-        return this.a.equals(dVar.e()) && this.b.equals(dVar.g()) && this.f1323c == dVar.i() && ((l = this.d) != null ? l.equals(dVar.c()) : dVar.c() == null) && this.e == dVar.k() && this.f.equals(dVar.a()) && ((fVar = this.g) != null ? fVar.equals(dVar.j()) : dVar.j() == null) && ((eVar = this.h) != null ? eVar.equals(dVar.h()) : dVar.h() == null) && ((cVar = this.i) != null ? cVar.equals(dVar.b()) : dVar.b() == null) && ((wVar = this.j) != null ? wVar.equals(dVar.d()) : dVar.d() == null) && this.k == dVar.f();
+        return this.a.equals(dVar.e()) && this.b.equals(dVar.g()) && this.f1319c == dVar.i() && ((l = this.d) != null ? l.equals(dVar.c()) : dVar.c() == null) && this.e == dVar.k() && this.f.equals(dVar.a()) && ((fVar = this.g) != null ? fVar.equals(dVar.j()) : dVar.j() == null) && ((eVar = this.h) != null ? eVar.equals(dVar.h()) : dVar.h() == null) && ((cVar = this.i) != null ? cVar.equals(dVar.b()) : dVar.b() == null) && ((wVar = this.j) != null ? wVar.equals(dVar.d()) : dVar.d() == null) && this.k == dVar.f();
     }
 
     @Override // c.i.c.m.d.m.v.d
@@ -161,7 +161,7 @@ public final class f extends v.d {
     }
 
     public int hashCode() {
-        long j = this.f1323c;
+        long j = this.f1319c;
         int hashCode = (((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ ((int) (j ^ (j >>> 32)))) * 1000003;
         Long l = this.d;
         int i = 0;
@@ -181,7 +181,7 @@ public final class f extends v.d {
 
     @Override // c.i.c.m.d.m.v.d
     public long i() {
-        return this.f1323c;
+        return this.f1319c;
     }
 
     @Override // c.i.c.m.d.m.v.d
@@ -206,7 +206,7 @@ public final class f extends v.d {
         L.append(", identifier=");
         L.append(this.b);
         L.append(", startedAt=");
-        L.append(this.f1323c);
+        L.append(this.f1319c);
         L.append(", endedAt=");
         L.append(this.d);
         L.append(", crashed=");
diff --git a/app/src/main/java/c/i/c/m/d/m/g.java b/app/src/main/java/c/i/c/m/d/m/g.java
index 328fa9f283..4766e8a084 100644
--- a/app/src/main/java/c/i/c/m/d/m/g.java
+++ b/app/src/main/java/c/i/c/m/d/m/g.java
@@ -9,7 +9,7 @@ public final class g extends v.d.a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1325c;
+    public final String f1321c;
     public final v.d.a.AbstractC0131a d = null;
     public final String e;
     public final String f;
@@ -18,7 +18,7 @@ public final class g extends v.d.a {
     public g(String str, String str2, String str3, v.d.a.AbstractC0131a aVar, String str4, String str5, String str6, a aVar2) {
         this.a = str;
         this.b = str2;
-        this.f1325c = str3;
+        this.f1321c = str3;
         this.e = str4;
         this.f = str5;
         this.g = str6;
@@ -39,7 +39,7 @@ public final class g extends v.d.a {
     @Override // c.i.c.m.d.m.v.d.a
     @Nullable
     public String c() {
-        return this.f1325c;
+        return this.f1321c;
     }
 
     @Override // c.i.c.m.d.m.v.d.a
@@ -66,7 +66,7 @@ public final class g extends v.d.a {
             return false;
         }
         v.d.a aVar2 = (v.d.a) obj;
-        if (this.a.equals(aVar2.d()) && this.b.equals(aVar2.g()) && ((str = this.f1325c) != null ? str.equals(aVar2.c()) : aVar2.c() == null) && ((aVar = this.d) != null ? aVar.equals(aVar2.f()) : aVar2.f() == null) && ((str2 = this.e) != null ? str2.equals(aVar2.e()) : aVar2.e() == null) && ((str3 = this.f) != null ? str3.equals(aVar2.a()) : aVar2.a() == null)) {
+        if (this.a.equals(aVar2.d()) && this.b.equals(aVar2.g()) && ((str = this.f1321c) != null ? str.equals(aVar2.c()) : aVar2.c() == null) && ((aVar = this.d) != null ? aVar.equals(aVar2.f()) : aVar2.f() == null) && ((str2 = this.e) != null ? str2.equals(aVar2.e()) : aVar2.e() == null) && ((str3 = this.f) != null ? str3.equals(aVar2.a()) : aVar2.a() == null)) {
             String str4 = this.g;
             if (str4 == null) {
                 if (aVar2.b() == null) {
@@ -93,7 +93,7 @@ public final class g extends v.d.a {
 
     public int hashCode() {
         int hashCode = (((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003;
-        String str = this.f1325c;
+        String str = this.f1321c;
         int i = 0;
         int hashCode2 = (hashCode ^ (str == null ? 0 : str.hashCode())) * 1000003;
         v.d.a.AbstractC0131a aVar = this.d;
@@ -115,7 +115,7 @@ public final class g extends v.d.a {
         L.append(", version=");
         L.append(this.b);
         L.append(", displayVersion=");
-        L.append(this.f1325c);
+        L.append(this.f1321c);
         L.append(", organization=");
         L.append(this.d);
         L.append(", installationUuid=");
diff --git a/app/src/main/java/c/i/c/m/d/m/i.java b/app/src/main/java/c/i/c/m/d/m/i.java
index 093e39e18b..9a8fb0f5c3 100644
--- a/app/src/main/java/c/i/c/m/d/m/i.java
+++ b/app/src/main/java/c/i/c/m/d/m/i.java
@@ -8,7 +8,7 @@ public final class i extends v.d.c {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1326c;
+    public final int f1322c;
     public final long d;
     public final long e;
     public final boolean f;
@@ -22,7 +22,7 @@ public final class i extends v.d.c {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Integer f1327c;
+        public Integer f1323c;
         public Long d;
         public Long e;
         public Boolean f;
@@ -35,7 +35,7 @@ public final class i extends v.d.c {
             if (this.b == null) {
                 str = c.d.b.a.a.u(str, " model");
             }
-            if (this.f1327c == null) {
+            if (this.f1323c == null) {
                 str = c.d.b.a.a.u(str, " cores");
             }
             if (this.d == null) {
@@ -57,7 +57,7 @@ public final class i extends v.d.c {
                 str = c.d.b.a.a.u(str, " modelClass");
             }
             if (str.isEmpty()) {
-                return new i(this.a.intValue(), this.b, this.f1327c.intValue(), this.d.longValue(), this.e.longValue(), this.f.booleanValue(), this.g.intValue(), this.h, this.i, null);
+                return new i(this.a.intValue(), this.b, this.f1323c.intValue(), this.d.longValue(), this.e.longValue(), this.f.booleanValue(), this.g.intValue(), this.h, this.i, null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -66,7 +66,7 @@ public final class i extends v.d.c {
     public i(int i, String str, int i2, long j, long j2, boolean z2, int i3, String str2, String str3, a aVar) {
         this.a = i;
         this.b = str;
-        this.f1326c = i2;
+        this.f1322c = i2;
         this.d = j;
         this.e = j2;
         this.f = z2;
@@ -83,7 +83,7 @@ public final class i extends v.d.c {
 
     @Override // c.i.c.m.d.m.v.d.c
     public int b() {
-        return this.f1326c;
+        return this.f1322c;
     }
 
     @Override // c.i.c.m.d.m.v.d.c
@@ -111,7 +111,7 @@ public final class i extends v.d.c {
             return false;
         }
         v.d.c cVar = (v.d.c) obj;
-        return this.a == cVar.a() && this.b.equals(cVar.e()) && this.f1326c == cVar.b() && this.d == cVar.g() && this.e == cVar.c() && this.f == cVar.i() && this.g == cVar.h() && this.h.equals(cVar.d()) && this.i.equals(cVar.f());
+        return this.a == cVar.a() && this.b.equals(cVar.e()) && this.f1322c == cVar.b() && this.d == cVar.g() && this.e == cVar.c() && this.f == cVar.i() && this.g == cVar.h() && this.h.equals(cVar.d()) && this.i.equals(cVar.f());
     }
 
     @Override // c.i.c.m.d.m.v.d.c
@@ -133,7 +133,7 @@ public final class i extends v.d.c {
     public int hashCode() {
         long j = this.d;
         long j2 = this.e;
-        return ((((((((((((((((this.a ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1326c) * 1000003) ^ ((int) (j ^ (j >>> 32)))) * 1000003) ^ ((int) (j2 ^ (j2 >>> 32)))) * 1000003) ^ (this.f ? 1231 : 1237)) * 1000003) ^ this.g) * 1000003) ^ this.h.hashCode()) * 1000003) ^ this.i.hashCode();
+        return ((((((((((((((((this.a ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1322c) * 1000003) ^ ((int) (j ^ (j >>> 32)))) * 1000003) ^ ((int) (j2 ^ (j2 >>> 32)))) * 1000003) ^ (this.f ? 1231 : 1237)) * 1000003) ^ this.g) * 1000003) ^ this.h.hashCode()) * 1000003) ^ this.i.hashCode();
     }
 
     @Override // c.i.c.m.d.m.v.d.c
@@ -147,7 +147,7 @@ public final class i extends v.d.c {
         L.append(", model=");
         L.append(this.b);
         L.append(", cores=");
-        L.append(this.f1326c);
+        L.append(this.f1322c);
         L.append(", ram=");
         L.append(this.d);
         L.append(", diskSpace=");
diff --git a/app/src/main/java/c/i/c/m/d/m/j.java b/app/src/main/java/c/i/c/m/d/m/j.java
index e6ae1a00e7..62cf41d6fe 100644
--- a/app/src/main/java/c/i/c/m/d/m/j.java
+++ b/app/src/main/java/c/i/c/m/d/m/j.java
@@ -9,14 +9,14 @@ public final class j extends v.d.AbstractC0132d {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final v.d.AbstractC0132d.a f1328c;
+    public final v.d.AbstractC0132d.a f1324c;
     public final v.d.AbstractC0132d.b d;
     public final v.d.AbstractC0132d.c e;
 
     public j(long j, String str, v.d.AbstractC0132d.a aVar, v.d.AbstractC0132d.b bVar, v.d.AbstractC0132d.c cVar, a aVar2) {
         this.a = j;
         this.b = str;
-        this.f1328c = aVar;
+        this.f1324c = aVar;
         this.d = bVar;
         this.e = cVar;
     }
@@ -24,7 +24,7 @@ public final class j extends v.d.AbstractC0132d {
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d
     @NonNull
     public v.d.AbstractC0132d.a a() {
-        return this.f1328c;
+        return this.f1324c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d
@@ -58,7 +58,7 @@ public final class j extends v.d.AbstractC0132d {
             return false;
         }
         v.d.AbstractC0132d dVar = (v.d.AbstractC0132d) obj;
-        if (this.a == dVar.d() && this.b.equals(dVar.e()) && this.f1328c.equals(dVar.a()) && this.d.equals(dVar.b())) {
+        if (this.a == dVar.d() && this.b.equals(dVar.e()) && this.f1324c.equals(dVar.a()) && this.d.equals(dVar.b())) {
             v.d.AbstractC0132d.c cVar = this.e;
             if (cVar == null) {
                 if (dVar.c() == null) {
@@ -73,7 +73,7 @@ public final class j extends v.d.AbstractC0132d {
 
     public int hashCode() {
         long j = this.a;
-        int hashCode = (((((((((int) (j ^ (j >>> 32))) ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1328c.hashCode()) * 1000003) ^ this.d.hashCode()) * 1000003;
+        int hashCode = (((((((((int) (j ^ (j >>> 32))) ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1324c.hashCode()) * 1000003) ^ this.d.hashCode()) * 1000003;
         v.d.AbstractC0132d.c cVar = this.e;
         return (cVar == null ? 0 : cVar.hashCode()) ^ hashCode;
     }
@@ -84,7 +84,7 @@ public final class j extends v.d.AbstractC0132d {
         L.append(", type=");
         L.append(this.b);
         L.append(", app=");
-        L.append(this.f1328c);
+        L.append(this.f1324c);
         L.append(", device=");
         L.append(this.d);
         L.append(", log=");
diff --git a/app/src/main/java/c/i/c/m/d/m/k.java b/app/src/main/java/c/i/c/m/d/m/k.java
index 575d117c1f..dd33d7a4b3 100644
--- a/app/src/main/java/c/i/c/m/d/m/k.java
+++ b/app/src/main/java/c/i/c/m/d/m/k.java
@@ -9,7 +9,7 @@ public final class k extends v.d.AbstractC0132d.a {
     public final w<v.b> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Boolean f1329c;
+    public final Boolean f1325c;
     public final int d;
 
     /* compiled from: AutoValue_CrashlyticsReport_Session_Event_Application */
@@ -18,7 +18,7 @@ public final class k extends v.d.AbstractC0132d.a {
         public w<v.b> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Boolean f1330c;
+        public Boolean f1326c;
         public Integer d;
 
         public b() {
@@ -28,7 +28,7 @@ public final class k extends v.d.AbstractC0132d.a {
             k kVar = (k) aVar;
             this.a = kVar.a;
             this.b = kVar.b;
-            this.f1330c = kVar.f1329c;
+            this.f1326c = kVar.f1325c;
             this.d = Integer.valueOf(kVar.d);
         }
 
@@ -38,7 +38,7 @@ public final class k extends v.d.AbstractC0132d.a {
                 str = c.d.b.a.a.u(str, " uiOrientation");
             }
             if (str.isEmpty()) {
-                return new k(this.a, this.b, this.f1330c, this.d.intValue(), null);
+                return new k(this.a, this.b, this.f1326c, this.d.intValue(), null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -47,14 +47,14 @@ public final class k extends v.d.AbstractC0132d.a {
     public k(v.d.AbstractC0132d.a.b bVar, w wVar, Boolean bool, int i, a aVar) {
         this.a = bVar;
         this.b = wVar;
-        this.f1329c = bool;
+        this.f1325c = bool;
         this.d = i;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a
     @Nullable
     public Boolean a() {
-        return this.f1329c;
+        return this.f1325c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a
@@ -88,7 +88,7 @@ public final class k extends v.d.AbstractC0132d.a {
             return false;
         }
         v.d.AbstractC0132d.a aVar = (v.d.AbstractC0132d.a) obj;
-        return this.a.equals(aVar.c()) && ((wVar = this.b) != null ? wVar.equals(aVar.b()) : aVar.b() == null) && ((bool = this.f1329c) != null ? bool.equals(aVar.a()) : aVar.a() == null) && this.d == aVar.d();
+        return this.a.equals(aVar.c()) && ((wVar = this.b) != null ? wVar.equals(aVar.b()) : aVar.b() == null) && ((bool = this.f1325c) != null ? bool.equals(aVar.a()) : aVar.a() == null) && this.d == aVar.d();
     }
 
     public int hashCode() {
@@ -96,7 +96,7 @@ public final class k extends v.d.AbstractC0132d.a {
         w<v.b> wVar = this.b;
         int i = 0;
         int hashCode2 = (hashCode ^ (wVar == null ? 0 : wVar.hashCode())) * 1000003;
-        Boolean bool = this.f1329c;
+        Boolean bool = this.f1325c;
         if (bool != null) {
             i = bool.hashCode();
         }
@@ -109,7 +109,7 @@ public final class k extends v.d.AbstractC0132d.a {
         L.append(", customAttributes=");
         L.append(this.b);
         L.append(", background=");
-        L.append(this.f1329c);
+        L.append(this.f1325c);
         L.append(", uiOrientation=");
         return c.d.b.a.a.z(L, this.d, "}");
     }
diff --git a/app/src/main/java/c/i/c/m/d/m/l.java b/app/src/main/java/c/i/c/m/d/m/l.java
index 7399c6b799..d01dcfd2e5 100644
--- a/app/src/main/java/c/i/c/m/d/m/l.java
+++ b/app/src/main/java/c/i/c/m/d/m/l.java
@@ -8,13 +8,13 @@ public final class l extends v.d.AbstractC0132d.a.b {
     public final v.d.AbstractC0132d.a.b.AbstractC0135b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final v.d.AbstractC0132d.a.b.c f1331c;
+    public final v.d.AbstractC0132d.a.b.c f1327c;
     public final w<v.d.AbstractC0132d.a.b.AbstractC0134a> d;
 
     public l(w wVar, v.d.AbstractC0132d.a.b.AbstractC0135b bVar, v.d.AbstractC0132d.a.b.c cVar, w wVar2, a aVar) {
         this.a = wVar;
         this.b = bVar;
-        this.f1331c = cVar;
+        this.f1327c = cVar;
         this.d = wVar2;
     }
 
@@ -33,7 +33,7 @@ public final class l extends v.d.AbstractC0132d.a.b {
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b
     @NonNull
     public v.d.AbstractC0132d.a.b.c c() {
-        return this.f1331c;
+        return this.f1327c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b
@@ -50,11 +50,11 @@ public final class l extends v.d.AbstractC0132d.a.b {
             return false;
         }
         v.d.AbstractC0132d.a.b bVar = (v.d.AbstractC0132d.a.b) obj;
-        return this.a.equals(bVar.d()) && this.b.equals(bVar.b()) && this.f1331c.equals(bVar.c()) && this.d.equals(bVar.a());
+        return this.a.equals(bVar.d()) && this.b.equals(bVar.b()) && this.f1327c.equals(bVar.c()) && this.d.equals(bVar.a());
     }
 
     public int hashCode() {
-        return ((((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1331c.hashCode()) * 1000003) ^ this.d.hashCode();
+        return ((((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1327c.hashCode()) * 1000003) ^ this.d.hashCode();
     }
 
     public String toString() {
@@ -63,7 +63,7 @@ public final class l extends v.d.AbstractC0132d.a.b {
         L.append(", exception=");
         L.append(this.b);
         L.append(", signal=");
-        L.append(this.f1331c);
+        L.append(this.f1327c);
         L.append(", binaries=");
         L.append(this.d);
         L.append("}");
diff --git a/app/src/main/java/c/i/c/m/d/m/m.java b/app/src/main/java/c/i/c/m/d/m/m.java
index d5eba5f316..a834d5916d 100644
--- a/app/src/main/java/c/i/c/m/d/m/m.java
+++ b/app/src/main/java/c/i/c/m/d/m/m.java
@@ -9,13 +9,13 @@ public final class m extends v.d.AbstractC0132d.a.b.AbstractC0134a {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1332c;
+    public final String f1328c;
     public final String d;
 
     public m(long j, long j2, String str, String str2, a aVar) {
         this.a = j;
         this.b = j2;
-        this.f1332c = str;
+        this.f1328c = str;
         this.d = str2;
     }
 
@@ -28,7 +28,7 @@ public final class m extends v.d.AbstractC0132d.a.b.AbstractC0134a {
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0134a
     @NonNull
     public String b() {
-        return this.f1332c;
+        return this.f1328c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0134a
@@ -50,7 +50,7 @@ public final class m extends v.d.AbstractC0132d.a.b.AbstractC0134a {
             return false;
         }
         v.d.AbstractC0132d.a.b.AbstractC0134a aVar = (v.d.AbstractC0132d.a.b.AbstractC0134a) obj;
-        if (this.a == aVar.a() && this.b == aVar.c() && this.f1332c.equals(aVar.b())) {
+        if (this.a == aVar.a() && this.b == aVar.c() && this.f1328c.equals(aVar.b())) {
             String str = this.d;
             if (str == null) {
                 if (aVar.d() == null) {
@@ -66,7 +66,7 @@ public final class m extends v.d.AbstractC0132d.a.b.AbstractC0134a {
     public int hashCode() {
         long j = this.a;
         long j2 = this.b;
-        int hashCode = (((((((int) (j ^ (j >>> 32))) ^ 1000003) * 1000003) ^ ((int) ((j2 >>> 32) ^ j2))) * 1000003) ^ this.f1332c.hashCode()) * 1000003;
+        int hashCode = (((((((int) (j ^ (j >>> 32))) ^ 1000003) * 1000003) ^ ((int) ((j2 >>> 32) ^ j2))) * 1000003) ^ this.f1328c.hashCode()) * 1000003;
         String str = this.d;
         return (str == null ? 0 : str.hashCode()) ^ hashCode;
     }
@@ -77,7 +77,7 @@ public final class m extends v.d.AbstractC0132d.a.b.AbstractC0134a {
         L.append(", size=");
         L.append(this.b);
         L.append(", name=");
-        L.append(this.f1332c);
+        L.append(this.f1328c);
         L.append(", uuid=");
         return c.d.b.a.a.D(L, this.d, "}");
     }
diff --git a/app/src/main/java/c/i/c/m/d/m/n.java b/app/src/main/java/c/i/c/m/d/m/n.java
index 24f989ada8..16533d237b 100644
--- a/app/src/main/java/c/i/c/m/d/m/n.java
+++ b/app/src/main/java/c/i/c/m/d/m/n.java
@@ -9,14 +9,14 @@ public final class n extends v.d.AbstractC0132d.a.b.AbstractC0135b {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final w<v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a> f1333c;
+    public final w<v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a> f1329c;
     public final v.d.AbstractC0132d.a.b.AbstractC0135b d;
     public final int e;
 
     public n(String str, String str2, w wVar, v.d.AbstractC0132d.a.b.AbstractC0135b bVar, int i, a aVar) {
         this.a = str;
         this.b = str2;
-        this.f1333c = wVar;
+        this.f1329c = wVar;
         this.d = bVar;
         this.e = i;
     }
@@ -30,7 +30,7 @@ public final class n extends v.d.AbstractC0132d.a.b.AbstractC0135b {
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0135b
     @NonNull
     public w<v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a> b() {
-        return this.f1333c;
+        return this.f1329c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0135b
@@ -60,14 +60,14 @@ public final class n extends v.d.AbstractC0132d.a.b.AbstractC0135b {
             return false;
         }
         v.d.AbstractC0132d.a.b.AbstractC0135b bVar2 = (v.d.AbstractC0132d.a.b.AbstractC0135b) obj;
-        return this.a.equals(bVar2.e()) && ((str = this.b) != null ? str.equals(bVar2.d()) : bVar2.d() == null) && this.f1333c.equals(bVar2.b()) && ((bVar = this.d) != null ? bVar.equals(bVar2.a()) : bVar2.a() == null) && this.e == bVar2.c();
+        return this.a.equals(bVar2.e()) && ((str = this.b) != null ? str.equals(bVar2.d()) : bVar2.d() == null) && this.f1329c.equals(bVar2.b()) && ((bVar = this.d) != null ? bVar.equals(bVar2.a()) : bVar2.a() == null) && this.e == bVar2.c();
     }
 
     public int hashCode() {
         int hashCode = (this.a.hashCode() ^ 1000003) * 1000003;
         String str = this.b;
         int i = 0;
-        int hashCode2 = (((hashCode ^ (str == null ? 0 : str.hashCode())) * 1000003) ^ this.f1333c.hashCode()) * 1000003;
+        int hashCode2 = (((hashCode ^ (str == null ? 0 : str.hashCode())) * 1000003) ^ this.f1329c.hashCode()) * 1000003;
         v.d.AbstractC0132d.a.b.AbstractC0135b bVar = this.d;
         if (bVar != null) {
             i = bVar.hashCode();
@@ -81,7 +81,7 @@ public final class n extends v.d.AbstractC0132d.a.b.AbstractC0135b {
         L.append(", reason=");
         L.append(this.b);
         L.append(", frames=");
-        L.append(this.f1333c);
+        L.append(this.f1329c);
         L.append(", causedBy=");
         L.append(this.d);
         L.append(", overflowCount=");
diff --git a/app/src/main/java/c/i/c/m/d/m/o.java b/app/src/main/java/c/i/c/m/d/m/o.java
index 382662d0c5..b0269df547 100644
--- a/app/src/main/java/c/i/c/m/d/m/o.java
+++ b/app/src/main/java/c/i/c/m/d/m/o.java
@@ -8,18 +8,18 @@ public final class o extends v.d.AbstractC0132d.a.b.c {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final long f1334c;
+    public final long f1330c;
 
     public o(String str, String str2, long j, a aVar) {
         this.a = str;
         this.b = str2;
-        this.f1334c = j;
+        this.f1330c = j;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.c
     @NonNull
     public long a() {
-        return this.f1334c;
+        return this.f1330c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.c
@@ -42,11 +42,11 @@ public final class o extends v.d.AbstractC0132d.a.b.c {
             return false;
         }
         v.d.AbstractC0132d.a.b.c cVar = (v.d.AbstractC0132d.a.b.c) obj;
-        return this.a.equals(cVar.c()) && this.b.equals(cVar.b()) && this.f1334c == cVar.a();
+        return this.a.equals(cVar.c()) && this.b.equals(cVar.b()) && this.f1330c == cVar.a();
     }
 
     public int hashCode() {
-        long j = this.f1334c;
+        long j = this.f1330c;
         return ((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ ((int) (j ^ (j >>> 32)));
     }
 
@@ -56,6 +56,6 @@ public final class o extends v.d.AbstractC0132d.a.b.c {
         L.append(", code=");
         L.append(this.b);
         L.append(", address=");
-        return c.d.b.a.a.A(L, this.f1334c, "}");
+        return c.d.b.a.a.A(L, this.f1330c, "}");
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/m/p.java b/app/src/main/java/c/i/c/m/d/m/p.java
index 8fcc6a96dc..3324cb21cd 100644
--- a/app/src/main/java/c/i/c/m/d/m/p.java
+++ b/app/src/main/java/c/i/c/m/d/m/p.java
@@ -8,18 +8,18 @@ public final class p extends v.d.AbstractC0132d.a.b.AbstractC0136d {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final w<v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a> f1335c;
+    public final w<v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a> f1331c;
 
     public p(String str, int i, w wVar, a aVar) {
         this.a = str;
         this.b = i;
-        this.f1335c = wVar;
+        this.f1331c = wVar;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0136d
     @NonNull
     public w<v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a> a() {
-        return this.f1335c;
+        return this.f1331c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0136d
@@ -41,11 +41,11 @@ public final class p extends v.d.AbstractC0132d.a.b.AbstractC0136d {
             return false;
         }
         v.d.AbstractC0132d.a.b.AbstractC0136d dVar = (v.d.AbstractC0132d.a.b.AbstractC0136d) obj;
-        return this.a.equals(dVar.c()) && this.b == dVar.b() && this.f1335c.equals(dVar.a());
+        return this.a.equals(dVar.c()) && this.b == dVar.b() && this.f1331c.equals(dVar.a());
     }
 
     public int hashCode() {
-        return ((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b) * 1000003) ^ this.f1335c.hashCode();
+        return ((((this.a.hashCode() ^ 1000003) * 1000003) ^ this.b) * 1000003) ^ this.f1331c.hashCode();
     }
 
     public String toString() {
@@ -54,7 +54,7 @@ public final class p extends v.d.AbstractC0132d.a.b.AbstractC0136d {
         L.append(", importance=");
         L.append(this.b);
         L.append(", frames=");
-        L.append(this.f1335c);
+        L.append(this.f1331c);
         L.append("}");
         return L.toString();
     }
diff --git a/app/src/main/java/c/i/c/m/d/m/q.java b/app/src/main/java/c/i/c/m/d/m/q.java
index bd03a31bd8..abfb3759c8 100644
--- a/app/src/main/java/c/i/c/m/d/m/q.java
+++ b/app/src/main/java/c/i/c/m/d/m/q.java
@@ -9,7 +9,7 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1336c;
+    public final String f1332c;
     public final long d;
     public final int e;
 
@@ -19,7 +19,7 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f1337c;
+        public String f1333c;
         public Long d;
         public Integer e;
 
@@ -35,7 +35,7 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
                 str = c.d.b.a.a.u(str, " importance");
             }
             if (str.isEmpty()) {
-                return new q(this.a.longValue(), this.b, this.f1337c, this.d.longValue(), this.e.intValue(), null);
+                return new q(this.a.longValue(), this.b, this.f1333c, this.d.longValue(), this.e.intValue(), null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -44,7 +44,7 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
     public q(long j, String str, String str2, long j2, int i, a aVar) {
         this.a = j;
         this.b = str;
-        this.f1336c = str2;
+        this.f1332c = str2;
         this.d = j2;
         this.e = i;
     }
@@ -52,7 +52,7 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a
     @Nullable
     public String a() {
-        return this.f1336c;
+        return this.f1332c;
     }
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a
@@ -85,13 +85,13 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
             return false;
         }
         v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a aVar = (v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137a) obj;
-        return this.a == aVar.d() && this.b.equals(aVar.e()) && ((str = this.f1336c) != null ? str.equals(aVar.a()) : aVar.a() == null) && this.d == aVar.c() && this.e == aVar.b();
+        return this.a == aVar.d() && this.b.equals(aVar.e()) && ((str = this.f1332c) != null ? str.equals(aVar.a()) : aVar.a() == null) && this.d == aVar.c() && this.e == aVar.b();
     }
 
     public int hashCode() {
         long j = this.a;
         int hashCode = (((((int) (j ^ (j >>> 32))) ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003;
-        String str = this.f1336c;
+        String str = this.f1332c;
         int hashCode2 = str == null ? 0 : str.hashCode();
         long j2 = this.d;
         return this.e ^ ((((hashCode ^ hashCode2) * 1000003) ^ ((int) ((j2 >>> 32) ^ j2))) * 1000003);
@@ -103,7 +103,7 @@ public final class q extends v.d.AbstractC0132d.a.b.AbstractC0136d.AbstractC0137
         L.append(", symbol=");
         L.append(this.b);
         L.append(", file=");
-        L.append(this.f1336c);
+        L.append(this.f1332c);
         L.append(", offset=");
         L.append(this.d);
         L.append(", importance=");
diff --git a/app/src/main/java/c/i/c/m/d/m/r.java b/app/src/main/java/c/i/c/m/d/m/r.java
index 43fb51b611..7aedd0bf29 100644
--- a/app/src/main/java/c/i/c/m/d/m/r.java
+++ b/app/src/main/java/c/i/c/m/d/m/r.java
@@ -8,7 +8,7 @@ public final class r extends v.d.AbstractC0132d.b {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1338c;
+    public final boolean f1334c;
     public final int d;
     public final long e;
     public final long f;
@@ -19,14 +19,14 @@ public final class r extends v.d.AbstractC0132d.b {
         public Integer b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Boolean f1339c;
+        public Boolean f1335c;
         public Integer d;
         public Long e;
         public Long f;
 
         public v.d.AbstractC0132d.b a() {
             String str = this.b == null ? " batteryVelocity" : "";
-            if (this.f1339c == null) {
+            if (this.f1335c == null) {
                 str = c.d.b.a.a.u(str, " proximityOn");
             }
             if (this.d == null) {
@@ -39,7 +39,7 @@ public final class r extends v.d.AbstractC0132d.b {
                 str = c.d.b.a.a.u(str, " diskUsed");
             }
             if (str.isEmpty()) {
-                return new r(this.a, this.b.intValue(), this.f1339c.booleanValue(), this.d.intValue(), this.e.longValue(), this.f.longValue(), null);
+                return new r(this.a, this.b.intValue(), this.f1335c.booleanValue(), this.d.intValue(), this.e.longValue(), this.f.longValue(), null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -48,7 +48,7 @@ public final class r extends v.d.AbstractC0132d.b {
     public r(Double d, int i, boolean z2, int i2, long j, long j2, a aVar) {
         this.a = d;
         this.b = i;
-        this.f1338c = z2;
+        this.f1334c = z2;
         this.d = i2;
         this.e = j;
         this.f = j2;
@@ -90,7 +90,7 @@ public final class r extends v.d.AbstractC0132d.b {
         v.d.AbstractC0132d.b bVar = (v.d.AbstractC0132d.b) obj;
         Double d = this.a;
         if (d != null ? d.equals(bVar.a()) : bVar.a() == null) {
-            if (this.b == bVar.b() && this.f1338c == bVar.f() && this.d == bVar.d() && this.e == bVar.e() && this.f == bVar.c()) {
+            if (this.b == bVar.b() && this.f1334c == bVar.f() && this.d == bVar.d() && this.e == bVar.e() && this.f == bVar.c()) {
                 return true;
             }
         }
@@ -99,13 +99,13 @@ public final class r extends v.d.AbstractC0132d.b {
 
     @Override // c.i.c.m.d.m.v.d.AbstractC0132d.b
     public boolean f() {
-        return this.f1338c;
+        return this.f1334c;
     }
 
     public int hashCode() {
         Double d = this.a;
         int hashCode = ((((d == null ? 0 : d.hashCode()) ^ 1000003) * 1000003) ^ this.b) * 1000003;
-        int i = this.f1338c ? 1231 : 1237;
+        int i = this.f1334c ? 1231 : 1237;
         long j = this.e;
         long j2 = this.f;
         return ((((((hashCode ^ i) * 1000003) ^ this.d) * 1000003) ^ ((int) (j ^ (j >>> 32)))) * 1000003) ^ ((int) (j2 ^ (j2 >>> 32)));
@@ -117,7 +117,7 @@ public final class r extends v.d.AbstractC0132d.b {
         L.append(", batteryVelocity=");
         L.append(this.b);
         L.append(", proximityOn=");
-        L.append(this.f1338c);
+        L.append(this.f1334c);
         L.append(", orientation=");
         L.append(this.d);
         L.append(", ramUsed=");
diff --git a/app/src/main/java/c/i/c/m/d/m/t.java b/app/src/main/java/c/i/c/m/d/m/t.java
index 8e52d8b3e0..4908dcc13e 100644
--- a/app/src/main/java/c/i/c/m/d/m/t.java
+++ b/app/src/main/java/c/i/c/m/d/m/t.java
@@ -8,20 +8,20 @@ public final class t extends v.d.e {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1340c;
+    public final String f1336c;
     public final boolean d;
 
     public t(int i, String str, String str2, boolean z2, a aVar) {
         this.a = i;
         this.b = str;
-        this.f1340c = str2;
+        this.f1336c = str2;
         this.d = z2;
     }
 
     @Override // c.i.c.m.d.m.v.d.e
     @NonNull
     public String a() {
-        return this.f1340c;
+        return this.f1336c;
     }
 
     @Override // c.i.c.m.d.m.v.d.e
@@ -48,11 +48,11 @@ public final class t extends v.d.e {
             return false;
         }
         v.d.e eVar = (v.d.e) obj;
-        return this.a == eVar.b() && this.b.equals(eVar.c()) && this.f1340c.equals(eVar.a()) && this.d == eVar.d();
+        return this.a == eVar.b() && this.b.equals(eVar.c()) && this.f1336c.equals(eVar.a()) && this.d == eVar.d();
     }
 
     public int hashCode() {
-        return ((((((this.a ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1340c.hashCode()) * 1000003) ^ (this.d ? 1231 : 1237);
+        return ((((((this.a ^ 1000003) * 1000003) ^ this.b.hashCode()) * 1000003) ^ this.f1336c.hashCode()) * 1000003) ^ (this.d ? 1231 : 1237);
     }
 
     public String toString() {
@@ -61,7 +61,7 @@ public final class t extends v.d.e {
         L.append(", version=");
         L.append(this.b);
         L.append(", buildVersion=");
-        L.append(this.f1340c);
+        L.append(this.f1336c);
         L.append(", jailbroken=");
         return c.d.b.a.a.G(L, this.d, "}");
     }
diff --git a/app/src/main/java/c/i/c/m/d/m/x/h.java b/app/src/main/java/c/i/c/m/d/m/x/h.java
index e294c8f037..dd059f45f6 100644
--- a/app/src/main/java/c/i/c/m/d/m/x/h.java
+++ b/app/src/main/java/c/i/c/m/d/m/x/h.java
@@ -189,7 +189,7 @@ public class h {
                         } else if (c3 != 5) {
                             jsonReader.skipValue();
                         } else {
-                            bVar2.f1339c = Boolean.valueOf(jsonReader.nextBoolean());
+                            bVar2.f1335c = Boolean.valueOf(jsonReader.nextBoolean());
                         }
                     }
                     jsonReader.endObject();
@@ -572,7 +572,7 @@ public class h {
                     bVar.a = Long.valueOf(jsonReader.nextLong());
                     break;
                 case 3:
-                    bVar.f1337c = jsonReader.nextString();
+                    bVar.f1333c = jsonReader.nextString();
                     break;
                 case 4:
                     bVar.e = Integer.valueOf(jsonReader.nextInt());
@@ -709,7 +709,7 @@ public class h {
                     bVar.d = nextString4;
                     break;
                 case 5:
-                    bVar.f1322c = Integer.valueOf(jsonReader.nextInt());
+                    bVar.f1318c = Integer.valueOf(jsonReader.nextInt());
                     break;
                 case 6:
                     String nextString5 = jsonReader.nextString();
@@ -808,7 +808,7 @@ public class h {
                         switch (c3) {
                             case 0:
                                 str = str3;
-                                bVar2.f1324c = Long.valueOf(jsonReader.nextLong());
+                                bVar2.f1320c = Long.valueOf(jsonReader.nextLong());
                                 break;
                             case 1:
                                 str = str3;
@@ -912,7 +912,7 @@ public class h {
                                             bVar3.e = Long.valueOf(jsonReader.nextLong());
                                             break;
                                         case 5:
-                                            bVar3.f1327c = Integer.valueOf(jsonReader.nextInt());
+                                            bVar3.f1323c = Integer.valueOf(jsonReader.nextInt());
                                             break;
                                         case 6:
                                             String nextString7 = jsonReader.nextString();
diff --git a/app/src/main/java/c/i/c/m/d/n/a.java b/app/src/main/java/c/i/c/m/d/n/a.java
index 0bb3850e38..7263c153fe 100644
--- a/app/src/main/java/c/i/c/m/d/n/a.java
+++ b/app/src/main/java/c/i/c/m/d/n/a.java
@@ -25,7 +25,7 @@ public class a {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1341c;
+    public final String f1337c;
     public final Map<String, String> d;
     public final Map<String, String> e;
     public MultipartBody.a f = null;
@@ -41,7 +41,7 @@ public class a {
     /* JADX WARN: Incorrect types in method signature: (Ljava/lang/Object;Ljava/lang/String;Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V */
     public a(int i, String str, Map map) {
         this.b = i;
-        this.f1341c = str;
+        this.f1337c = str;
         this.d = map;
         this.e = new HashMap();
     }
@@ -57,7 +57,7 @@ public class a {
         } else {
             aVar.b("Cache-Control", dVar2);
         }
-        String str = this.f1341c;
+        String str = this.f1337c;
         m.checkParameterIsNotNull(str, "$this$toHttpUrlOrNull");
         String str2 = null;
         try {
@@ -104,7 +104,7 @@ public class a {
     }
 
     public a c(String str, String str2, String str3, File file) {
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
         RequestBody create = RequestBody.create(MediaType.a.b(str3), file);
         if (this.f == null) {
             MultipartBody.a aVar2 = new MultipartBody.a();
diff --git a/app/src/main/java/c/i/c/m/d/n/c.java b/app/src/main/java/c/i/c/m/d/n/c.java
index 569266aa56..571860a281 100644
--- a/app/src/main/java/c/i/c/m/d/n/c.java
+++ b/app/src/main/java/c/i/c/m/d/n/c.java
@@ -7,11 +7,11 @@ public class c {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Headers f1342c;
+    public Headers f1338c;
 
     public c(int i, String str, Headers headers) {
         this.a = i;
         this.b = str;
-        this.f1342c = headers;
+        this.f1338c = headers;
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/o/g.java b/app/src/main/java/c/i/c/m/d/o/g.java
index 9bce1dbe44..185e115aaf 100644
--- a/app/src/main/java/c/i/c/m/d/o/g.java
+++ b/app/src/main/java/c/i/c/m/d/o/g.java
@@ -26,7 +26,7 @@ public class g {
     public static final int b = 15;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final h f1343c = new h();
+    public static final h f1339c = new h();
     public static final Comparator<? super File> d = e.i;
     public static final FilenameFilter e = f.a;
     @NonNull
diff --git a/app/src/main/java/c/i/c/m/d/p/d.java b/app/src/main/java/c/i/c/m/d/p/d.java
index 62ed9a4fa9..3d6aedd2ba 100644
--- a/app/src/main/java/c/i/c/m/d/p/d.java
+++ b/app/src/main/java/c/i/c/m/d/p/d.java
@@ -29,7 +29,7 @@ public class d {
         if (str != null) {
             b2 += c.b(3, a.a(str));
         }
-        for (StackTraceElement stackTraceElement : eVar.f1353c) {
+        for (StackTraceElement stackTraceElement : eVar.f1349c) {
             int h = h(stackTraceElement, true);
             b2 += c.d(h) + c.e(4) + h;
         }
@@ -164,7 +164,7 @@ public class d {
             cVar.l(3, a.a(str));
         }
         int i4 = 0;
-        for (StackTraceElement stackTraceElement : eVar.f1353c) {
+        for (StackTraceElement stackTraceElement : eVar.f1349c) {
             k(cVar, 4, stackTraceElement, true);
         }
         e eVar2 = eVar.d;
diff --git a/app/src/main/java/c/i/c/m/d/q/b.java b/app/src/main/java/c/i/c/m/d/q/b.java
index fe324d4d8a..342a609d4f 100644
--- a/app/src/main/java/c/i/c/m/d/q/b.java
+++ b/app/src/main/java/c/i/c/m/d/q/b.java
@@ -13,7 +13,7 @@ public class b {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1344c;
+    public final String f1340c;
     public final String d;
     public final int e;
     public final a f;
@@ -109,7 +109,7 @@ public class b {
     public b(@Nullable String str, String str2, int i, a aVar, c.i.c.m.d.q.d.b bVar, a aVar2) {
         if (bVar != null) {
             this.b = bVar;
-            this.f1344c = str;
+            this.f1340c = str;
             this.d = str2;
             this.e = i;
             this.f = aVar;
@@ -123,7 +123,7 @@ public class b {
     public boolean a(c.i.c.m.d.q.c.c cVar, boolean z2) {
         boolean z3;
         try {
-            c.i.c.m.d.q.c.a aVar = new c.i.c.m.d.q.c.a(this.f1344c, this.d, cVar);
+            c.i.c.m.d.q.c.a aVar = new c.i.c.m.d.q.c.a(this.f1340c, this.d, cVar);
             int i = this.e;
             if (i == 3) {
                 c.i.c.m.d.b.a.b("Report configured to be sent via DataTransport.");
diff --git a/app/src/main/java/c/i/c/m/d/q/c/a.java b/app/src/main/java/c/i/c/m/d/q/c/a.java
index 4cef3c68e5..a4f22f7e87 100644
--- a/app/src/main/java/c/i/c/m/d/q/c/a.java
+++ b/app/src/main/java/c/i/c/m/d/q/c/a.java
@@ -8,11 +8,11 @@ public class a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1345c;
+    public final c f1341c;
 
     public a(@Nullable String str, String str2, c cVar) {
         this.a = str;
         this.b = str2;
-        this.f1345c = cVar;
+        this.f1341c = cVar;
     }
 }
diff --git a/app/src/main/java/c/i/c/m/d/q/c/d.java b/app/src/main/java/c/i/c/m/d/q/c/d.java
index e14dcc5acd..18273b82f5 100644
--- a/app/src/main/java/c/i/c/m/d/q/c/d.java
+++ b/app/src/main/java/c/i/c/m/d/q/c/d.java
@@ -12,12 +12,12 @@ public class d implements c {
     public final File[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<String, String> f1346c;
+    public final Map<String, String> f1342c;
 
     public d(File file, Map<String, String> map) {
         this.a = file;
         this.b = new File[]{file};
-        this.f1346c = new HashMap(map);
+        this.f1342c = new HashMap(map);
     }
 
     @Override // c.i.c.m.d.q.c.c
@@ -28,7 +28,7 @@ public class d implements c {
 
     @Override // c.i.c.m.d.q.c.c
     public Map<String, String> b() {
-        return Collections.unmodifiableMap(this.f1346c);
+        return Collections.unmodifiableMap(this.f1342c);
     }
 
     @Override // c.i.c.m.d.q.c.c
diff --git a/app/src/main/java/c/i/c/m/d/q/d/a.java b/app/src/main/java/c/i/c/m/d/q/d/a.java
index 79f91d5830..c8e8ebab9a 100644
--- a/app/src/main/java/c/i/c/m/d/q/d/a.java
+++ b/app/src/main/java/c/i/c/m/d/q/d/a.java
@@ -13,7 +13,7 @@ public class a implements b {
 
     @Override // c.i.c.m.d.q.d.b
     public boolean a(c.i.c.m.d.q.c.a aVar, boolean z2) {
-        int h = b.h(aVar.f1345c.d());
+        int h = b.h(aVar.f1341c.d());
         if (h == 0) {
             this.a.a(aVar, z2);
             return true;
diff --git a/app/src/main/java/c/i/c/m/d/q/d/c.java b/app/src/main/java/c/i/c/m/d/q/d/c.java
index 6b2625d077..968352f894 100644
--- a/app/src/main/java/c/i/c/m/d/q/d/c.java
+++ b/app/src/main/java/c/i/c/m/d/q/d/c.java
@@ -22,10 +22,10 @@ public class c extends a implements b {
             b.e.put("X-CRASHLYTICS-GOOGLE-APP-ID", aVar.b);
             b.e.put("X-CRASHLYTICS-API-CLIENT-TYPE", "android");
             b.e.put("X-CRASHLYTICS-API-CLIENT-VERSION", this.f);
-            for (Map.Entry<String, String> entry : aVar.f1345c.b().entrySet()) {
+            for (Map.Entry<String, String> entry : aVar.f1341c.b().entrySet()) {
                 b.e.put(entry.getKey(), entry.getValue());
             }
-            c.i.c.m.d.q.c.c cVar = aVar.f1345c;
+            c.i.c.m.d.q.c.c cVar = aVar.f1341c;
             b.b("report[identifier]", cVar.a());
             if (cVar.e().length == 1) {
                 c.i.c.m.d.b bVar = c.i.c.m.d.b.a;
@@ -56,7 +56,7 @@ public class c extends a implements b {
             try {
                 c.i.c.m.d.n.c a = b.a();
                 int i2 = a.a;
-                bVar3.b("Create report request ID: " + a.f1342c.c("X-REQUEST-ID"));
+                bVar3.b("Create report request ID: " + a.f1338c.c("X-REQUEST-ID"));
                 bVar3.b("Result was: " + i2);
                 return c.i.a.f.e.o.c.e0(i2) == 0;
             } catch (IOException e2) {
diff --git a/app/src/main/java/c/i/c/m/d/q/d/d.java b/app/src/main/java/c/i/c/m/d/q/d/d.java
index dabd62f26a..ce4c0e883b 100644
--- a/app/src/main/java/c/i/c/m/d/q/d/d.java
+++ b/app/src/main/java/c/i/c/m/d/q/d/d.java
@@ -24,7 +24,7 @@ public class d extends a implements b {
             b.e.put("X-CRASHLYTICS-API-CLIENT-VERSION", this.f);
             b.e.put("X-CRASHLYTICS-GOOGLE-APP-ID", str);
             String str2 = aVar.a;
-            c cVar = aVar.f1345c;
+            c cVar = aVar.f1341c;
             if (str2 != null) {
                 b.b("org_id", str2);
             }
diff --git a/app/src/main/java/c/i/c/m/d/r/c.java b/app/src/main/java/c/i/c/m/d/r/c.java
index 1c8f94fdc2..f149fc043a 100644
--- a/app/src/main/java/c/i/c/m/d/r/c.java
+++ b/app/src/main/java/c/i/c/m/d/r/c.java
@@ -10,7 +10,7 @@ public class c {
     public static final String b = a("hts/cahyiseot-agolai.o/1frlglgc/aclg", "tp:/rsltcrprsp.ogepscmv/ieo/eaybtho");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String f1347c = a("AzSBpY4F0rHiHFdinTvM", "IayrSTFL9eJ69YeSUO2");
+    public static final String f1343c = a("AzSBpY4F0rHiHFdinTvM", "IayrSTFL9eJ69YeSUO2");
     public static final e<v, byte[]> d = b.a;
     public final f<v> e;
 
diff --git a/app/src/main/java/c/i/c/m/d/s/c.java b/app/src/main/java/c/i/c/m/d/s/c.java
index d2492a5230..8244ffa177 100644
--- a/app/src/main/java/c/i/c/m/d/s/c.java
+++ b/app/src/main/java/c/i/c/m/d/s/c.java
@@ -30,7 +30,7 @@ public class c implements d {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f1348c;
+    public final e f1344c;
     public final e1 d;
     public final a e;
     public final d f;
@@ -65,7 +65,7 @@ public class c implements d {
                 cVar2.f.b("Requesting settings from " + cVar2.b);
                 cVar2.f.b("Settings query params were: " + f);
                 c.i.c.m.d.n.c a = c2.a();
-                cVar2.f.b("Settings request ID: " + a.f1342c.c("X-REQUEST-ID"));
+                cVar2.f.b("Settings request ID: " + a.f1338c.c("X-REQUEST-ID"));
                 jSONObject = cVar2.g(a);
             } catch (IOException e2) {
                 if (cVar2.f.a(6)) {
@@ -74,7 +74,7 @@ public class c implements d {
                 jSONObject = null;
             }
             if (jSONObject != null) {
-                c.i.c.m.d.s.h.f a2 = c.this.f1348c.a(jSONObject);
+                c.i.c.m.d.s.h.f a2 = c.this.f1344c.a(jSONObject);
                 a aVar = c.this.e;
                 long j = a2.d;
                 Objects.requireNonNull(aVar);
@@ -148,7 +148,7 @@ public class c implements d {
         this.a = context;
         this.b = gVar;
         this.d = e1Var;
-        this.f1348c = eVar;
+        this.f1344c = eVar;
         this.e = aVar;
         this.f = dVar;
         this.g = q0Var;
@@ -171,7 +171,7 @@ public class c implements d {
             }
             JSONObject a2 = this.e.a();
             if (a2 != null) {
-                c.i.c.m.d.s.h.f a3 = this.f1348c.a(a2);
+                c.i.c.m.d.s.h.f a3 = this.f1344c.a(a2);
                 if (a3 != null) {
                     e(a2, "Loaded cached settings: ");
                     Objects.requireNonNull(this.d);
diff --git a/app/src/main/java/c/i/c/m/d/s/h/a.java b/app/src/main/java/c/i/c/m/d/s/h/a.java
index 25165e0f25..82fec91308 100644
--- a/app/src/main/java/c/i/c/m/d/s/h/a.java
+++ b/app/src/main/java/c/i/c/m/d/s/h/a.java
@@ -5,7 +5,7 @@ public class a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1349c;
+    public final String f1345c;
     public final String d;
     public final String e;
     public final String f;
@@ -16,7 +16,7 @@ public class a {
     public a(String str, String str2, String str3, String str4, String str5, String str6, String str7, int i, String str8, String str9) {
         this.a = str;
         this.b = str2;
-        this.f1349c = str3;
+        this.f1345c = str3;
         this.d = str4;
         this.e = str5;
         this.f = str6;
diff --git a/app/src/main/java/c/i/c/m/d/s/h/b.java b/app/src/main/java/c/i/c/m/d/s/h/b.java
index 80cf9c2e82..7434b61e87 100644
--- a/app/src/main/java/c/i/c/m/d/s/h/b.java
+++ b/app/src/main/java/c/i/c/m/d/s/h/b.java
@@ -5,7 +5,7 @@ public class b {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1350c;
+    public final String f1346c;
     public final String d;
     public final String e;
     public final boolean f;
@@ -15,7 +15,7 @@ public class b {
     public b(String str, String str2, String str3, String str4, String str5, String str6, boolean z2, int i, int i2) {
         this.a = str;
         this.b = str2;
-        this.f1350c = str3;
+        this.f1346c = str3;
         this.d = str4;
         this.e = str6;
         this.f = z2;
@@ -26,7 +26,7 @@ public class b {
     public b(String str, String str2, String str3, String str4, boolean z2) {
         this.a = str;
         this.b = str2;
-        this.f1350c = str3;
+        this.f1346c = str3;
         this.d = str4;
         this.e = null;
         this.f = z2;
diff --git a/app/src/main/java/c/i/c/m/d/s/h/f.java b/app/src/main/java/c/i/c/m/d/s/h/f.java
index 3e9f428316..7ea8604554 100644
--- a/app/src/main/java/c/i/c/m/d/s/h/f.java
+++ b/app/src/main/java/c/i/c/m/d/s/h/f.java
@@ -5,19 +5,19 @@ public class f implements e {
     public final d b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1351c;
+    public final c f1347c;
     public final long d;
 
     public f(long j, b bVar, d dVar, c cVar, int i, int i2) {
         this.d = j;
         this.a = bVar;
         this.b = dVar;
-        this.f1351c = cVar;
+        this.f1347c = cVar;
     }
 
     @Override // c.i.c.m.d.s.h.e
     public c a() {
-        return this.f1351c;
+        return this.f1347c;
     }
 
     @Override // c.i.c.m.d.s.h.e
diff --git a/app/src/main/java/c/i/c/m/d/s/h/g.java b/app/src/main/java/c/i/c/m/d/s/h/g.java
index 5737a45b0d..0c5c811187 100644
--- a/app/src/main/java/c/i/c/m/d/s/h/g.java
+++ b/app/src/main/java/c/i/c/m/d/s/h/g.java
@@ -7,7 +7,7 @@ public class g {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1352c;
+    public final String f1348c;
     public final String d;
     public final w0 e;
     public final String f;
@@ -18,7 +18,7 @@ public class g {
     public g(String str, String str2, String str3, String str4, w0 w0Var, String str5, String str6, String str7, int i) {
         this.a = str;
         this.b = str2;
-        this.f1352c = str3;
+        this.f1348c = str3;
         this.d = str4;
         this.e = w0Var;
         this.f = str5;
diff --git a/app/src/main/java/c/i/c/m/d/s/i/a.java b/app/src/main/java/c/i/c/m/d/s/i/a.java
index 183a845a25..6aae54449f 100644
--- a/app/src/main/java/c/i/c/m/d/s/i/a.java
+++ b/app/src/main/java/c/i/c/m/d/s/i/a.java
@@ -22,7 +22,7 @@ public abstract class a extends c.i.c.m.d.k.a {
             b.e.put("X-CRASHLYTICS-API-CLIENT-TYPE", "android");
             b.e.put("X-CRASHLYTICS-API-CLIENT-VERSION", this.f);
             b.b("org_id", aVar.a);
-            b.b("app[identifier]", aVar.f1349c);
+            b.b("app[identifier]", aVar.f1345c);
             b.b("app[name]", aVar.g);
             b.b("app[display_version]", aVar.d);
             b.b("app[build_version]", aVar.e);
@@ -40,7 +40,7 @@ public abstract class a extends c.i.c.m.d.k.a {
                 c a = b.a();
                 int i = a.a;
                 String str = "POST".equalsIgnoreCase(c.c.a.y.b.n(b.b)) ? "Create" : "Update";
-                bVar.b(str + " app request ID: " + a.f1342c.c("X-REQUEST-ID"));
+                bVar.b(str + " app request ID: " + a.f1338c.c("X-REQUEST-ID"));
                 StringBuilder sb = new StringBuilder();
                 sb.append("Result was ");
                 sb.append(i);
diff --git a/app/src/main/java/c/i/c/m/d/s/i/c.java b/app/src/main/java/c/i/c/m/d/s/i/c.java
index 3365b11e45..c6749bb666 100644
--- a/app/src/main/java/c/i/c/m/d/s/i/c.java
+++ b/app/src/main/java/c/i/c/m/d/s/i/c.java
@@ -25,7 +25,7 @@ public class c extends a implements d {
         e(aVar, "X-CRASHLYTICS-API-CLIENT-VERSION", "17.3.0");
         e(aVar, "Accept", "application/json");
         e(aVar, "X-CRASHLYTICS-DEVICE-MODEL", gVar.b);
-        e(aVar, "X-CRASHLYTICS-OS-BUILD-VERSION", gVar.f1352c);
+        e(aVar, "X-CRASHLYTICS-OS-BUILD-VERSION", gVar.f1348c);
         e(aVar, "X-CRASHLYTICS-OS-DISPLAY-VERSION", gVar.d);
         e(aVar, "X-CRASHLYTICS-INSTALLATION-ID", ((v0) gVar.e).b());
         return aVar;
diff --git a/app/src/main/java/c/i/c/m/d/t/e.java b/app/src/main/java/c/i/c/m/d/t/e.java
index 40d9dd4dbe..d64de998a4 100644
--- a/app/src/main/java/c/i/c/m/d/t/e.java
+++ b/app/src/main/java/c/i/c/m/d/t/e.java
@@ -5,13 +5,13 @@ public class e {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final StackTraceElement[] f1353c;
+    public final StackTraceElement[] f1349c;
     public final e d;
 
     public e(Throwable th, d dVar) {
         this.a = th.getLocalizedMessage();
         this.b = th.getClass().getName();
-        this.f1353c = dVar.a(th.getStackTrace());
+        this.f1349c = dVar.a(th.getStackTrace());
         Throwable cause = th.getCause();
         this.d = cause != null ? new e(cause, dVar) : null;
     }
diff --git a/app/src/main/java/c/i/c/m/d/u/a.java b/app/src/main/java/c/i/c/m/d/u/a.java
index be868fc63c..ec53b61def 100644
--- a/app/src/main/java/c/i/c/m/d/u/a.java
+++ b/app/src/main/java/c/i/c/m/d/u/a.java
@@ -9,7 +9,7 @@ public class a {
     public boolean b = false;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1354c;
+    public String f1350c;
 
     public a(Context context) {
         this.a = context;
@@ -26,10 +26,10 @@ public class a {
             } else {
                 str = null;
             }
-            this.f1354c = str;
+            this.f1350c = str;
             this.b = true;
         }
-        String str2 = this.f1354c;
+        String str2 = this.f1350c;
         if (str2 != null) {
             return str2;
         }
diff --git a/app/src/main/java/c/i/c/m/e/a.java b/app/src/main/java/c/i/c/m/e/a.java
index 5607608840..c869325dd8 100644
--- a/app/src/main/java/c/i/c/m/e/a.java
+++ b/app/src/main/java/c/i/c/m/e/a.java
@@ -18,12 +18,12 @@ public class a implements e {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d f1355c;
+    public final d f1351c;
     public final f d;
 
     public a(Context context, d dVar, f fVar) {
         this.b = context;
-        this.f1355c = dVar;
+        this.f1351c = dVar;
         this.d = fVar;
     }
 
@@ -57,7 +57,7 @@ public class a implements e {
         if (a2 != null && a2.exists() && file.exists()) {
             bVar2.a = b(file, ".dmp");
             bVar2.b = b(a2, ".device_info");
-            bVar2.f1357c = new File(a2, "session.json");
+            bVar2.f1353c = new File(a2, "session.json");
             bVar2.d = new File(a2, "app.json");
             bVar2.e = new File(a2, "device.json");
             bVar2.f = new File(a2, "os.json");
diff --git a/app/src/main/java/c/i/c/m/e/c.java b/app/src/main/java/c/i/c/m/e/c.java
index 32049fbc82..30c189bb3d 100644
--- a/app/src/main/java/c/i/c/m/e/c.java
+++ b/app/src/main/java/c/i/c/m/e/c.java
@@ -106,7 +106,7 @@ public class c implements a {
         boolean z2 = false;
         if (a != null) {
             try {
-                z2 = ((JniNativeApi) aVar.f1355c).a(a.getCanonicalPath(), aVar.b.getAssets());
+                z2 = ((JniNativeApi) aVar.f1351c).a(a.getCanonicalPath(), aVar.b.getAssets());
             } catch (IOException e) {
                 if (b.a.a(6)) {
                     Log.e("FirebaseCrashlytics", "Error initializing CrashlyticsNdk", e);
diff --git a/app/src/main/java/c/i/c/m/e/g.java b/app/src/main/java/c/i/c/m/e/g.java
index d5ecfd0f1c..9c48c0e8cb 100644
--- a/app/src/main/java/c/i/c/m/e/g.java
+++ b/app/src/main/java/c/i/c/m/e/g.java
@@ -7,7 +7,7 @@ public final class g {
     public final File b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final File f1356c;
+    public final File f1352c;
     public final File d;
     public final File e;
     public final File f;
@@ -18,7 +18,7 @@ public final class g {
         public File b;
 
         /* renamed from: c  reason: collision with root package name */
-        public File f1357c;
+        public File f1353c;
         public File d;
         public File e;
         public File f;
@@ -27,7 +27,7 @@ public final class g {
     public g(b bVar, a aVar) {
         this.a = bVar.a;
         this.b = bVar.b;
-        this.f1356c = bVar.f1357c;
+        this.f1352c = bVar.f1353c;
         this.d = bVar.d;
         this.e = bVar.e;
         this.f = bVar.f;
diff --git a/app/src/main/java/c/i/c/m/e/h.java b/app/src/main/java/c/i/c/m/e/h.java
index bd4cff0cb1..94045d2a94 100644
--- a/app/src/main/java/c/i/c/m/e/h.java
+++ b/app/src/main/java/c/i/c/m/e/h.java
@@ -32,7 +32,7 @@ public class h implements d {
 
     @Override // c.i.c.m.d.d
     public File e() {
-        return this.a.f1356c;
+        return this.a.f1352c;
     }
 
     @Override // c.i.c.m.d.d
diff --git a/app/src/main/java/c/i/c/o/b/a.java b/app/src/main/java/c/i/c/o/b/a.java
index e43da53229..23f92e31e2 100644
--- a/app/src/main/java/c/i/c/o/b/a.java
+++ b/app/src/main/java/c/i/c/o/b/a.java
@@ -11,14 +11,14 @@ public final class a implements Parcelable.Creator<DynamicLinkData> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final DynamicLinkData createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
         String str2 = null;
         Bundle bundle = null;
         Uri uri = null;
         long j = 0;
         int i = 0;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             switch (65535 & readInt) {
                 case 1:
@@ -28,10 +28,10 @@ public final class a implements Parcelable.Creator<DynamicLinkData> {
                     str2 = AnimatableValueParser.T(parcel, readInt);
                     break;
                 case 3:
-                    i = AnimatableValueParser.e2(parcel, readInt);
+                    i = AnimatableValueParser.g2(parcel, readInt);
                     break;
                 case 4:
-                    j = AnimatableValueParser.f2(parcel, readInt);
+                    j = AnimatableValueParser.h2(parcel, readInt);
                     break;
                 case 5:
                     bundle = AnimatableValueParser.P(parcel, readInt);
@@ -40,11 +40,11 @@ public final class a implements Parcelable.Creator<DynamicLinkData> {
                     uri = (Uri) AnimatableValueParser.S(parcel, readInt, Uri.CREATOR);
                     break;
                 default:
-                    AnimatableValueParser.B2(parcel, readInt);
+                    AnimatableValueParser.D2(parcel, readInt);
                     break;
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new DynamicLinkData(str, str2, i, j, bundle, uri);
     }
 
diff --git a/app/src/main/java/c/i/c/o/b/d.java b/app/src/main/java/c/i/c/o/b/d.java
index 7acdac8d7b..a298838874 100644
--- a/app/src/main/java/c/i/c/o/b/d.java
+++ b/app/src/main/java/c/i/c/o/b/d.java
@@ -31,13 +31,13 @@ public final class d extends c.i.a.f.e.k.d<j> {
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final String x() {
+    public final String w() {
         return "com.google.firebase.dynamiclinks.internal.IDynamicLinksService";
     }
 
     @Override // c.i.a.f.e.k.b
     @NonNull
-    public final String y() {
+    public final String x() {
         return "com.google.firebase.dynamiclinks.service.START";
     }
 }
diff --git a/app/src/main/java/c/i/c/o/b/i.java b/app/src/main/java/c/i/c/o/b/i.java
index 64e229cf78..892e87cecd 100644
--- a/app/src/main/java/c/i/c/o/b/i.java
+++ b/app/src/main/java/c/i/c/o/b/i.java
@@ -8,15 +8,13 @@ import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.dynamiclinks.PendingDynamicLinkData;
 /* compiled from: com.google.firebase:firebase-dynamic-links@@19.1.1 */
 public final class i extends p<d, PendingDynamicLinkData> {
-
-    /* renamed from: c  reason: collision with root package name */
-    public final String f1358c;
+    public final String a;
     @Nullable
-    public final a d;
+    public final a b;
 
     public i(a aVar, String str) {
-        this.f1358c = str;
-        this.d = aVar;
+        this.a = str;
+        this.b = aVar;
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [c.i.a.f.e.h.a$b, com.google.android.gms.tasks.TaskCompletionSource] */
@@ -24,7 +22,7 @@ public final class i extends p<d, PendingDynamicLinkData> {
     public final /* synthetic */ void c(d dVar, TaskCompletionSource<PendingDynamicLinkData> taskCompletionSource) throws RemoteException {
         d dVar2 = dVar;
         try {
-            dVar2.w().a0(new g(this.d, taskCompletionSource), this.f1358c);
+            dVar2.v().a0(new g(this.b, taskCompletionSource), this.a);
         } catch (RemoteException unused) {
         }
     }
diff --git a/app/src/main/java/c/i/c/o/b/m.java b/app/src/main/java/c/i/c/o/b/m.java
index 055079c08b..25cad72f8d 100644
--- a/app/src/main/java/c/i/c/o/b/m.java
+++ b/app/src/main/java/c/i/c/o/b/m.java
@@ -12,11 +12,11 @@ public final class m implements Parcelable.Creator<zzo> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzo createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Uri uri = null;
         Uri uri2 = null;
         ArrayList arrayList = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             int i = 65535 & readInt;
             if (i == 1) {
@@ -24,12 +24,12 @@ public final class m implements Parcelable.Creator<zzo> {
             } else if (i == 2) {
                 uri2 = (Uri) AnimatableValueParser.S(parcel, readInt, Uri.CREATOR);
             } else if (i != 3) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 arrayList = AnimatableValueParser.X(parcel, readInt, zzr.CREATOR);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzo(uri, uri2, arrayList);
     }
 
diff --git a/app/src/main/java/c/i/c/o/b/n.java b/app/src/main/java/c/i/c/o/b/n.java
index 861035562f..9f6a2e7097 100644
--- a/app/src/main/java/c/i/c/o/b/n.java
+++ b/app/src/main/java/c/i/c/o/b/n.java
@@ -9,17 +9,17 @@ public final class n implements Parcelable.Creator<zzr> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public final zzr createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         String str = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 str = AnimatableValueParser.T(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new zzr(str);
     }
 
diff --git a/app/src/main/java/c/i/c/p/h/d.java b/app/src/main/java/c/i/c/p/h/d.java
index 00a74f1e05..a1f05d534a 100644
--- a/app/src/main/java/c/i/c/p/h/d.java
+++ b/app/src/main/java/c/i/c/p/h/d.java
@@ -24,7 +24,7 @@ public class d implements a {
 
     public void b(@NonNull Object obj, @NonNull Writer writer) throws IOException {
         e eVar = this.a;
-        f fVar = new f(writer, eVar.b, eVar.f1359c, eVar.d, eVar.e);
+        f fVar = new f(writer, eVar.b, eVar.f1354c, eVar.d, eVar.e);
         fVar.g(obj, false);
         fVar.i();
         fVar.b.flush();
diff --git a/app/src/main/java/c/i/c/p/h/e.java b/app/src/main/java/c/i/c/p/h/e.java
index 35bb648ac9..63767affe7 100644
--- a/app/src/main/java/c/i/c/p/h/e.java
+++ b/app/src/main/java/c/i/c/p/h/e.java
@@ -18,7 +18,7 @@ public final class e implements b<e> {
     public final Map<Class<?>, c<?>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<Class<?>, c.i.c.p.e<?>> f1359c;
+    public final Map<Class<?>, c.i.c.p.e<?>> f1354c;
     public c<Object> d = a.a;
     public boolean e = false;
 
@@ -46,7 +46,7 @@ public final class e implements b<e> {
         HashMap hashMap = new HashMap();
         this.b = hashMap;
         HashMap hashMap2 = new HashMap();
-        this.f1359c = hashMap2;
+        this.f1354c = hashMap2;
         hashMap2.put(String.class, b.a);
         hashMap.remove(String.class);
         hashMap2.put(Boolean.class, c.a);
diff --git a/app/src/main/java/c/i/c/p/h/f.java b/app/src/main/java/c/i/c/p/h/f.java
index c2bba389d0..90c1cc0ca7 100644
--- a/app/src/main/java/c/i/c/p/h/f.java
+++ b/app/src/main/java/c/i/c/p/h/f.java
@@ -19,14 +19,14 @@ public final class f implements d, c.i.c.p.f {
     public final JsonWriter b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<Class<?>, c<?>> f1360c;
+    public final Map<Class<?>, c<?>> f1355c;
     public final Map<Class<?>, e<?>> d;
     public final c<Object> e;
     public final boolean f;
 
     public f(@NonNull Writer writer, @NonNull Map<Class<?>, c<?>> map, @NonNull Map<Class<?>, e<?>> map2, c<Object> cVar, boolean z2) {
         this.b = new JsonWriter(writer);
-        this.f1360c = map;
+        this.f1355c = map;
         this.d = map2;
         this.e = cVar;
         this.f = z2;
@@ -163,7 +163,7 @@ public final class f implements d, c.i.c.p.f {
             this.b.endObject();
             return this;
         } else {
-            c<?> cVar = this.f1360c.get(obj.getClass());
+            c<?> cVar = this.f1355c.get(obj.getClass());
             if (cVar != null) {
                 if (!z2) {
                     this.b.beginObject();
diff --git a/app/src/main/java/c/i/c/s/f.java b/app/src/main/java/c/i/c/s/f.java
index 041a3e4a1b..7a1989a4b4 100644
--- a/app/src/main/java/c/i/c/s/f.java
+++ b/app/src/main/java/c/i/c/s/f.java
@@ -22,16 +22,16 @@ public class f {
     public static d0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Context f1361c;
+    public final Context f1356c;
     public final Executor d;
 
     public f(Context context) {
-        this.f1361c = context;
+        this.f1356c = context;
         this.d = a.i;
     }
 
     public f(Context context, ExecutorService executorService) {
-        this.f1361c = context;
+        this.f1356c = context;
         this.d = executorService;
     }
 
@@ -75,7 +75,7 @@ public class f {
             intent.putExtra("rawData", Base64.decode(stringExtra, 0));
             intent.removeExtra("gcm.rawData64");
         }
-        Context context = this.f1361c;
+        Context context = this.f1356c;
         boolean z3 = c.R() && context.getApplicationInfo().targetSdkVersion >= 26;
         if ((intent.getFlags() & 268435456) != 0) {
             z2 = true;
diff --git a/app/src/main/java/c/i/c/s/i.java b/app/src/main/java/c/i/c/s/i.java
index b19c1ffd2a..aaf4269c54 100644
--- a/app/src/main/java/c/i/c/s/i.java
+++ b/app/src/main/java/c/i/c/s/i.java
@@ -9,16 +9,16 @@ public final /* synthetic */ class i implements a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1362c;
+    public final String f1357c;
 
     public i(FirebaseInstanceId firebaseInstanceId, String str, String str2) {
         this.a = firebaseInstanceId;
         this.b = str;
-        this.f1362c = str2;
+        this.f1357c = str2;
     }
 
     @Override // c.i.a.f.n.a
     public final Object a(Task task) {
-        return this.a.m(this.b, this.f1362c);
+        return this.a.m(this.b, this.f1357c);
     }
 }
diff --git a/app/src/main/java/c/i/c/s/l.java b/app/src/main/java/c/i/c/s/l.java
index 223b8295ef..3bca1cfe5f 100644
--- a/app/src/main/java/c/i/c/s/l.java
+++ b/app/src/main/java/c/i/c/s/l.java
@@ -12,13 +12,13 @@ public final /* synthetic */ class l implements f {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1363c;
+    public final String f1358c;
     public final String d;
 
     public l(FirebaseInstanceId firebaseInstanceId, String str, String str2, String str3) {
         this.a = firebaseInstanceId;
         this.b = str;
-        this.f1363c = str2;
+        this.f1358c = str2;
         this.d = str3;
     }
 
@@ -26,7 +26,7 @@ public final /* synthetic */ class l implements f {
     public final Task a(Object obj) {
         FirebaseInstanceId firebaseInstanceId = this.a;
         String str = this.b;
-        String str2 = this.f1363c;
+        String str2 = this.f1358c;
         String str3 = this.d;
         String str4 = (String) obj;
         w wVar = FirebaseInstanceId.b;
diff --git a/app/src/main/java/c/i/c/s/n.java b/app/src/main/java/c/i/c/s/n.java
index a60a857003..9cf22b6b8a 100644
--- a/app/src/main/java/c/i/c/s/n.java
+++ b/app/src/main/java/c/i/c/s/n.java
@@ -30,7 +30,7 @@ public class n {
     public final q b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b f1364c;
+    public final b f1359c;
     public final a<h> d;
     public final a<d> e;
     public final g f;
@@ -40,7 +40,7 @@ public class n {
         b bVar = new b(cVar.d);
         this.a = cVar;
         this.b = qVar;
-        this.f1364c = bVar;
+        this.f1359c = bVar;
         this.d = aVar;
         this.e = aVar2;
         this.f = gVar;
@@ -79,10 +79,10 @@ public class n {
         bundle.putString("app_ver", this.b.a());
         q qVar2 = this.b;
         synchronized (qVar2) {
-            if (qVar2.f1365c == null) {
+            if (qVar2.f1360c == null) {
                 qVar2.e();
             }
-            str4 = qVar2.f1365c;
+            str4 = qVar2.f1360c;
         }
         bundle.putString("app_ver_name", str4);
         c cVar2 = this.a;
@@ -111,7 +111,7 @@ public class n {
             bundle.putString("Firebase-Client-Log-Type", Integer.toString(a.f()));
             bundle.putString("Firebase-Client", hVar.getUserAgent());
         }
-        b bVar = this.f1364c;
+        b bVar = this.f1359c;
         r rVar = bVar.e;
         synchronized (rVar) {
             if (rVar.b == 0 && (b = rVar.b("com.google.android.gms")) != null) {
diff --git a/app/src/main/java/c/i/c/s/q.java b/app/src/main/java/c/i/c/s/q.java
index 68488f74db..7cb8f1b8ce 100644
--- a/app/src/main/java/c/i/c/s/q.java
+++ b/app/src/main/java/c/i/c/s/q.java
@@ -15,7 +15,7 @@ public class q {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1365c;
+    public String f1360c;
     public int d;
     public int e = 0;
 
@@ -106,7 +106,7 @@ public class q {
         PackageInfo c2 = c(this.a.getPackageName());
         if (c2 != null) {
             this.b = Integer.toString(c2.versionCode);
-            this.f1365c = c2.versionName;
+            this.f1360c = c2.versionName;
         }
     }
 }
diff --git a/app/src/main/java/c/i/c/s/v.java b/app/src/main/java/c/i/c/s/v.java
index 70bf0fd3a3..b8ab77d97d 100644
--- a/app/src/main/java/c/i/c/s/v.java
+++ b/app/src/main/java/c/i/c/s/v.java
@@ -13,7 +13,7 @@ public class v {
     public String b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public Boolean f1366c = null;
+    public Boolean f1361c = null;
     public Boolean d = null;
     public final Queue<Intent> e = new ArrayDeque();
 
@@ -32,19 +32,19 @@ public class v {
         if (this.d == null) {
             this.d = Boolean.valueOf(context.checkCallingOrSelfPermission("android.permission.ACCESS_NETWORK_STATE") == 0);
         }
-        if (!this.f1366c.booleanValue() && Log.isLoggable("FirebaseInstanceId", 3)) {
+        if (!this.f1361c.booleanValue() && Log.isLoggable("FirebaseInstanceId", 3)) {
             Log.d("FirebaseInstanceId", "Missing Permission: android.permission.ACCESS_NETWORK_STATE this should normally be included by the manifest merger, but may needed to be manually added to your manifest");
         }
         return this.d.booleanValue();
     }
 
     public boolean c(Context context) {
-        if (this.f1366c == null) {
-            this.f1366c = Boolean.valueOf(context.checkCallingOrSelfPermission("android.permission.WAKE_LOCK") == 0);
+        if (this.f1361c == null) {
+            this.f1361c = Boolean.valueOf(context.checkCallingOrSelfPermission("android.permission.WAKE_LOCK") == 0);
         }
-        if (!this.f1366c.booleanValue() && Log.isLoggable("FirebaseInstanceId", 3)) {
+        if (!this.f1361c.booleanValue() && Log.isLoggable("FirebaseInstanceId", 3)) {
             Log.d("FirebaseInstanceId", "Missing Permission: android.permission.WAKE_LOCK this should normally be included by the manifest merger, but may needed to be manually added to your manifest");
         }
-        return this.f1366c.booleanValue();
+        return this.f1361c.booleanValue();
     }
 }
diff --git a/app/src/main/java/c/i/c/s/w.java b/app/src/main/java/c/i/c/s/w.java
index 1bee4a4858..c708a3db53 100644
--- a/app/src/main/java/c/i/c/s/w.java
+++ b/app/src/main/java/c/i/c/s/w.java
@@ -22,7 +22,7 @@ public class w {
     @GuardedBy("this")
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<String, Long> f1367c = new ArrayMap();
+    public final Map<String, Long> f1362c = new ArrayMap();
 
     /* compiled from: com.google.firebase:firebase-iid@@21.0.0 */
     public static class a {
@@ -30,12 +30,12 @@ public class w {
         public static final /* synthetic */ int b = 0;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f1368c;
+        public final String f1363c;
         public final String d;
         public final long e;
 
         public a(String str, String str2, long j) {
-            this.f1368c = str;
+            this.f1363c = str;
             this.d = str2;
             this.e = j;
         }
@@ -113,7 +113,7 @@ public class w {
     }
 
     public synchronized void c() {
-        this.f1367c.clear();
+        this.f1362c.clear();
         this.a.edit().clear().commit();
     }
 
diff --git a/app/src/main/java/c/i/c/s/x.java b/app/src/main/java/c/i/c/s/x.java
index 3a438d9f88..767bbfe43a 100644
--- a/app/src/main/java/c/i/c/s/x.java
+++ b/app/src/main/java/c/i/c/s/x.java
@@ -102,7 +102,7 @@ public class x implements Runnable {
             if (Log.isLoggable("FirebaseInstanceId", 3)) {
                 Log.d("FirebaseInstanceId", "Token successfully retrieved");
             }
-            if (j == null || !b.equals(j.f1368c)) {
+            if (j == null || !b.equals(j.f1363c)) {
                 b(b);
             }
             return true;
diff --git a/app/src/main/java/c/i/c/s/y.java b/app/src/main/java/c/i/c/s/y.java
index 8465bf3f51..b4cf91885f 100644
--- a/app/src/main/java/c/i/c/s/y.java
+++ b/app/src/main/java/c/i/c/s/y.java
@@ -12,14 +12,14 @@ public final class y {
     public static final Object b = new Object();
 
     /* renamed from: c  reason: collision with root package name */
-    public static a f1369c;
+    public static a f1364c;
 
     public static ComponentName a(@NonNull Context context, @NonNull Intent intent) {
         synchronized (b) {
-            if (f1369c == null) {
+            if (f1364c == null) {
                 a aVar = new a(context, 1, "wake:com.google.firebase.iid.WakeLockHolder");
-                f1369c = aVar;
-                aVar.f1217c.setReferenceCounted(true);
+                f1364c = aVar;
+                aVar.f1214c.setReferenceCounted(true);
                 aVar.h = true;
             }
             boolean booleanExtra = intent.getBooleanExtra("com.google.firebase.iid.WakeLockHolder.wakefulintent", false);
@@ -29,7 +29,7 @@ public final class y {
                 return null;
             }
             if (!booleanExtra) {
-                f1369c.a(a);
+                f1364c.a(a);
             }
             return startService;
         }
diff --git a/app/src/main/java/c/i/c/u/a.java b/app/src/main/java/c/i/c/u/a.java
index 10b342446c..08245d48aa 100644
--- a/app/src/main/java/c/i/c/u/a.java
+++ b/app/src/main/java/c/i/c/u/a.java
@@ -7,12 +7,12 @@ public final class a extends k {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final long f1370c;
+    public final long f1365c;
 
     public a(String str, long j, long j2, C0140a aVar) {
         this.a = str;
         this.b = j;
-        this.f1370c = j2;
+        this.f1365c = j2;
     }
 
     @Override // c.i.c.u.k
@@ -24,7 +24,7 @@ public final class a extends k {
     @Override // c.i.c.u.k
     @NonNull
     public long b() {
-        return this.f1370c;
+        return this.f1365c;
     }
 
     @Override // c.i.c.u.k
@@ -41,12 +41,12 @@ public final class a extends k {
             return false;
         }
         k kVar = (k) obj;
-        return this.a.equals(kVar.a()) && this.b == kVar.c() && this.f1370c == kVar.b();
+        return this.a.equals(kVar.a()) && this.b == kVar.c() && this.f1365c == kVar.b();
     }
 
     public int hashCode() {
         long j = this.b;
-        long j2 = this.f1370c;
+        long j2 = this.f1365c;
         return ((((this.a.hashCode() ^ 1000003) * 1000003) ^ ((int) (j ^ (j >>> 32)))) * 1000003) ^ ((int) (j2 ^ (j2 >>> 32)));
     }
 
@@ -56,6 +56,6 @@ public final class a extends k {
         L.append(", tokenExpirationTimestamp=");
         L.append(this.b);
         L.append(", tokenCreationTimestamp=");
-        return c.d.b.a.a.A(L, this.f1370c, "}");
+        return c.d.b.a.a.A(L, this.f1365c, "}");
     }
 }
diff --git a/app/src/main/java/c/i/c/u/e.java b/app/src/main/java/c/i/c/u/e.java
index 6cf7139b15..9b50ceda9b 100644
--- a/app/src/main/java/c/i/c/u/e.java
+++ b/app/src/main/java/c/i/c/u/e.java
@@ -28,7 +28,7 @@ public final /* synthetic */ class e implements Runnable {
         Objects.requireNonNull(fVar);
         Object obj2 = f.a;
         synchronized (obj2) {
-            c cVar = fVar.f1371c;
+            c cVar = fVar.f1366c;
             cVar.a();
             b a = b.a(cVar.d, "generatefid.lock");
             try {
@@ -45,7 +45,7 @@ public final /* synthetic */ class e implements Runnable {
                     if (z2 || fVar.f.d(b)) {
                         dVar = fVar.c(b);
                         synchronized (obj2) {
-                            c.i.c.c cVar2 = fVar.f1371c;
+                            c.i.c.c cVar2 = fVar.f1366c;
                             cVar2.a();
                             b a2 = b.a(cVar2.d, "generatefid.lock");
                             try {
diff --git a/app/src/main/java/c/i/c/u/f.java b/app/src/main/java/c/i/c/u/f.java
index c9a45c7112..3bb26f6beb 100644
--- a/app/src/main/java/c/i/c/u/f.java
+++ b/app/src/main/java/c/i/c/u/f.java
@@ -41,7 +41,7 @@ public class f implements g {
     public static final ThreadFactory b = new a();
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1371c;
+    public final c f1366c;
     public final c.i.c.u.p.c d;
     public final c.i.c.u.o.c e;
     public final n f;
@@ -76,7 +76,7 @@ public class f implements g {
         n c2 = n.c();
         b bVar = new b(cVar);
         l lVar = new l();
-        this.f1371c = cVar;
+        this.f1366c = cVar;
         this.d = cVar2;
         this.e = cVar3;
         this.f = c2;
@@ -111,7 +111,7 @@ public class f implements g {
     public final void b(boolean z2) {
         c.i.c.u.o.d b2;
         synchronized (a) {
-            c cVar = this.f1371c;
+            c cVar = this.f1366c;
             cVar.a();
             b a2 = b.a(cVar.d, "generatefid.lock");
             try {
@@ -133,7 +133,7 @@ public class f implements g {
         }
         if (z2) {
             a.b bVar2 = (a.b) b2.k();
-            bVar2.f1374c = null;
+            bVar2.f1369c = null;
             b2 = bVar2.a();
         }
         l(b2);
@@ -171,7 +171,7 @@ public class f implements g {
                                 } else if (responseCode < 500 || responseCode >= 600) {
                                     Log.e("Firebase-Installations", "Firebase Installations can not communicate with Firebase server APIs due to invalid configuration. Please update your Firebase initialization process and set valid Firebase options (API key, Project ID, Application ID) when initializing Firebase.");
                                     b.C0143b bVar = (b.C0143b) c.i.c.u.p.f.a();
-                                    bVar.f1378c = f.b.BAD_CONFIG;
+                                    bVar.f1373c = f.b.BAD_CONFIG;
                                     f = bVar.a();
                                 } else {
                                     c2.disconnect();
@@ -179,18 +179,18 @@ public class f implements g {
                             }
                         }
                         b.C0143b bVar2 = (b.C0143b) c.i.c.u.p.f.a();
-                        bVar2.f1378c = f.b.AUTH_ERROR;
+                        bVar2.f1373c = f.b.AUTH_ERROR;
                         f = bVar2.a();
                     }
                     c2.disconnect();
                     c.i.c.u.p.b bVar3 = (c.i.c.u.p.b) f;
-                    int ordinal = bVar3.f1377c.ordinal();
+                    int ordinal = bVar3.f1372c.ordinal();
                     if (ordinal == 0) {
                         String str3 = bVar3.a;
                         long j = bVar3.b;
                         long b2 = this.f.b();
                         a.b bVar4 = (a.b) dVar.k();
-                        bVar4.f1374c = str3;
+                        bVar4.f1369c = str3;
                         bVar4.e = Long.valueOf(j);
                         bVar4.f = Long.valueOf(b2);
                         return bVar4.a();
@@ -222,21 +222,21 @@ public class f implements g {
 
     @Nullable
     public String d() {
-        c.i.c.c cVar = this.f1371c;
+        c.i.c.c cVar = this.f1366c;
         cVar.a();
         return cVar.f.a;
     }
 
     @VisibleForTesting
     public String e() {
-        c.i.c.c cVar = this.f1371c;
+        c.i.c.c cVar = this.f1366c;
         cVar.a();
         return cVar.f.b;
     }
 
     @Nullable
     public String g() {
-        c.i.c.c cVar = this.f1371c;
+        c.i.c.c cVar = this.f1366c;
         cVar.a();
         return cVar.f.g;
     }
@@ -274,10 +274,10 @@ public class f implements g {
 
     public final String i(c.i.c.u.o.d dVar) {
         String string;
-        c.i.c.c cVar = this.f1371c;
+        c.i.c.c cVar = this.f1366c;
         cVar.a();
-        if (cVar.e.equals("CHIME_ANDROID_SDK") || this.f1371c.h()) {
-            if (((c.i.c.u.o.a) dVar).f1373c == c.a.ATTEMPT_MIGRATION) {
+        if (cVar.e.equals("CHIME_ANDROID_SDK") || this.f1366c.h()) {
+            if (((c.i.c.u.o.a) dVar).f1368c == c.a.ATTEMPT_MIGRATION) {
                 c.i.c.u.o.b bVar = this.g;
                 synchronized (bVar.b) {
                     synchronized (bVar.b) {
@@ -311,7 +311,7 @@ public class f implements g {
                         break;
                     }
                     String str3 = strArr[i];
-                    String str4 = bVar.f1375c;
+                    String str4 = bVar.f1370c;
                     String string = bVar.b.getString("|T|" + str4 + "|" + str3, null);
                     if (string == null || string.isEmpty()) {
                         i++;
@@ -367,14 +367,14 @@ public class f implements g {
                     int ordinal = aVar4.e.ordinal();
                     if (ordinal == 0) {
                         String str6 = aVar4.b;
-                        String str7 = aVar4.f1376c;
+                        String str7 = aVar4.f1371c;
                         long b2 = this.f.b();
                         String c3 = aVar4.d.c();
                         long d2 = aVar4.d.d();
                         a.b bVar2 = (a.b) dVar.k();
                         bVar2.a = str6;
                         bVar2.b(c.a.REGISTERED);
-                        bVar2.f1374c = c3;
+                        bVar2.f1369c = c3;
                         bVar2.d = str7;
                         bVar2.e = Long.valueOf(d2);
                         bVar2.f = Long.valueOf(b2);
diff --git a/app/src/main/java/c/i/c/u/n.java b/app/src/main/java/c/i/c/u/n.java
index ec3a53a100..5eead14e22 100644
--- a/app/src/main/java/c/i/c/u/n.java
+++ b/app/src/main/java/c/i/c/u/n.java
@@ -13,7 +13,7 @@ public final class n {
     public static final Pattern b = Pattern.compile("\\AA[\\w-]{38}\\z");
 
     /* renamed from: c  reason: collision with root package name */
-    public static n f1372c;
+    public static n f1367c;
     public final a d;
 
     public n(a aVar) {
@@ -25,10 +25,10 @@ public final class n {
             a.a = new a();
         }
         a aVar = a.a;
-        if (f1372c == null) {
-            f1372c = new n(aVar);
+        if (f1367c == null) {
+            f1367c = new n(aVar);
         }
-        return f1372c;
+        return f1367c;
     }
 
     public long a() {
diff --git a/app/src/main/java/c/i/c/u/o/a.java b/app/src/main/java/c/i/c/u/o/a.java
index e4246ed021..955d9853d6 100644
--- a/app/src/main/java/c/i/c/u/o/a.java
+++ b/app/src/main/java/c/i/c/u/o/a.java
@@ -10,7 +10,7 @@ public final class a extends d {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c.a f1373c;
+    public final c.a f1368c;
     public final String d;
     public final String e;
     public final long f;
@@ -23,7 +23,7 @@ public final class a extends d {
         public c.a b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f1374c;
+        public String f1369c;
         public String d;
         public Long e;
         public Long f;
@@ -35,8 +35,8 @@ public final class a extends d {
         public b(d dVar, C0141a aVar) {
             a aVar2 = (a) dVar;
             this.a = aVar2.b;
-            this.b = aVar2.f1373c;
-            this.f1374c = aVar2.d;
+            this.b = aVar2.f1368c;
+            this.f1369c = aVar2.d;
             this.d = aVar2.e;
             this.e = Long.valueOf(aVar2.f);
             this.f = Long.valueOf(aVar2.g);
@@ -53,7 +53,7 @@ public final class a extends d {
                 str = c.d.b.a.a.u(str, " tokenCreationEpochInSecs");
             }
             if (str.isEmpty()) {
-                return new a(this.a, this.b, this.f1374c, this.d, this.e.longValue(), this.f.longValue(), this.g, null);
+                return new a(this.a, this.b, this.f1369c, this.d, this.e.longValue(), this.f.longValue(), this.g, null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -78,7 +78,7 @@ public final class a extends d {
 
     public a(String str, c.a aVar, String str2, String str3, long j, long j2, String str4, C0141a aVar2) {
         this.b = str;
-        this.f1373c = aVar;
+        this.f1368c = aVar;
         this.d = str2;
         this.e = str3;
         this.f = j;
@@ -127,7 +127,7 @@ public final class a extends d {
         d dVar = (d) obj;
         String str3 = this.b;
         if (str3 != null ? str3.equals(dVar.c()) : dVar.c() == null) {
-            if (this.f1373c.equals(dVar.f()) && ((str = this.d) != null ? str.equals(dVar.a()) : dVar.a() == null) && ((str2 = this.e) != null ? str2.equals(dVar.e()) : dVar.e() == null) && this.f == dVar.b() && this.g == dVar.g()) {
+            if (this.f1368c.equals(dVar.f()) && ((str = this.d) != null ? str.equals(dVar.a()) : dVar.a() == null) && ((str2 = this.e) != null ? str2.equals(dVar.e()) : dVar.e() == null) && this.f == dVar.b() && this.g == dVar.g()) {
                 String str4 = this.h;
                 if (str4 == null) {
                     if (dVar.d() == null) {
@@ -144,7 +144,7 @@ public final class a extends d {
     @Override // c.i.c.u.o.d
     @NonNull
     public c.a f() {
-        return this.f1373c;
+        return this.f1368c;
     }
 
     @Override // c.i.c.u.o.d
@@ -155,7 +155,7 @@ public final class a extends d {
     public int hashCode() {
         String str = this.b;
         int i = 0;
-        int hashCode = ((((str == null ? 0 : str.hashCode()) ^ 1000003) * 1000003) ^ this.f1373c.hashCode()) * 1000003;
+        int hashCode = ((((str == null ? 0 : str.hashCode()) ^ 1000003) * 1000003) ^ this.f1368c.hashCode()) * 1000003;
         String str2 = this.d;
         int hashCode2 = (hashCode ^ (str2 == null ? 0 : str2.hashCode())) * 1000003;
         String str3 = this.e;
@@ -179,7 +179,7 @@ public final class a extends d {
         StringBuilder L = c.d.b.a.a.L("PersistedInstallationEntry{firebaseInstallationId=");
         L.append(this.b);
         L.append(", registrationStatus=");
-        L.append(this.f1373c);
+        L.append(this.f1368c);
         L.append(", authToken=");
         L.append(this.d);
         L.append(", refreshToken=");
diff --git a/app/src/main/java/c/i/c/u/o/b.java b/app/src/main/java/c/i/c/u/o/b.java
index 62cfe383dd..0849d81172 100644
--- a/app/src/main/java/c/i/c/u/o/b.java
+++ b/app/src/main/java/c/i/c/u/o/b.java
@@ -20,7 +20,7 @@ public class b {
     public final SharedPreferences b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1375c;
+    public final String f1370c;
 
     /* JADX WARNING: Code restructure failed: missing block: B:9:0x0046, code lost:
         if (r0.isEmpty() != false) goto L_0x0048;
@@ -41,7 +41,7 @@ public class b {
                 str = null;
             }
         }
-        this.f1375c = str;
+        this.f1370c = str;
     }
 
     @Nullable
diff --git a/app/src/main/java/c/i/c/u/o/c.java b/app/src/main/java/c/i/c/u/o/c.java
index 6cb973d187..301e2dc9fd 100644
--- a/app/src/main/java/c/i/c/u/o/c.java
+++ b/app/src/main/java/c/i/c/u/o/c.java
@@ -95,7 +95,7 @@ public class c {
         bVar.c(0);
         bVar.a = optString;
         bVar.b(a.values()[optInt]);
-        bVar.f1374c = optString2;
+        bVar.f1369c = optString2;
         bVar.d = optString3;
         bVar.d(optLong);
         bVar.c(optLong2);
diff --git a/app/src/main/java/c/i/c/u/o/d.java b/app/src/main/java/c/i/c/u/o/d.java
index 6c7df5c6c3..0979f4ea7d 100644
--- a/app/src/main/java/c/i/c/u/o/d.java
+++ b/app/src/main/java/c/i/c/u/o/d.java
@@ -57,7 +57,7 @@ public abstract class d {
     }
 
     public boolean i() {
-        c.a aVar = ((a) this).f1373c;
+        c.a aVar = ((a) this).f1368c;
         return aVar == c.a.NOT_GENERATED || aVar == c.a.ATTEMPT_MIGRATION;
     }
 
diff --git a/app/src/main/java/c/i/c/u/p/a.java b/app/src/main/java/c/i/c/u/p/a.java
index a83726a5f7..9d318a7bdc 100644
--- a/app/src/main/java/c/i/c/u/p/a.java
+++ b/app/src/main/java/c/i/c/u/p/a.java
@@ -8,14 +8,14 @@ public final class a extends d {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1376c;
+    public final String f1371c;
     public final f d;
     public final d.a e;
 
     public a(String str, String str2, String str3, f fVar, d.a aVar, C0142a aVar2) {
         this.a = str;
         this.b = str2;
-        this.f1376c = str3;
+        this.f1371c = str3;
         this.d = fVar;
         this.e = aVar;
     }
@@ -35,7 +35,7 @@ public final class a extends d {
     @Override // c.i.c.u.p.d
     @Nullable
     public String c() {
-        return this.f1376c;
+        return this.f1371c;
     }
 
     @Override // c.i.c.u.p.d
@@ -62,7 +62,7 @@ public final class a extends d {
         if (str != null ? str.equals(dVar.e()) : dVar.e() == null) {
             String str2 = this.b;
             if (str2 != null ? str2.equals(dVar.b()) : dVar.b() == null) {
-                String str3 = this.f1376c;
+                String str3 = this.f1371c;
                 if (str3 != null ? str3.equals(dVar.c()) : dVar.c() == null) {
                     f fVar = this.d;
                     if (fVar != null ? fVar.equals(dVar.a()) : dVar.a() == null) {
@@ -87,7 +87,7 @@ public final class a extends d {
         int hashCode = ((str == null ? 0 : str.hashCode()) ^ 1000003) * 1000003;
         String str2 = this.b;
         int hashCode2 = (hashCode ^ (str2 == null ? 0 : str2.hashCode())) * 1000003;
-        String str3 = this.f1376c;
+        String str3 = this.f1371c;
         int hashCode3 = (hashCode2 ^ (str3 == null ? 0 : str3.hashCode())) * 1000003;
         f fVar = this.d;
         int hashCode4 = (hashCode3 ^ (fVar == null ? 0 : fVar.hashCode())) * 1000003;
@@ -104,7 +104,7 @@ public final class a extends d {
         L.append(", fid=");
         L.append(this.b);
         L.append(", refreshToken=");
-        L.append(this.f1376c);
+        L.append(this.f1371c);
         L.append(", authToken=");
         L.append(this.d);
         L.append(", responseCode=");
diff --git a/app/src/main/java/c/i/c/u/p/b.java b/app/src/main/java/c/i/c/u/p/b.java
index 7e6598ac82..303167a5c8 100644
--- a/app/src/main/java/c/i/c/u/p/b.java
+++ b/app/src/main/java/c/i/c/u/p/b.java
@@ -9,7 +9,7 @@ public final class b extends f {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final f.b f1377c;
+    public final f.b f1372c;
 
     /* compiled from: AutoValue_TokenResult */
     /* renamed from: c.i.c.u.p.b$b  reason: collision with other inner class name */
@@ -18,13 +18,13 @@ public final class b extends f {
         public Long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public f.b f1378c;
+        public f.b f1373c;
 
         @Override // c.i.c.u.p.f.a
         public f a() {
             String str = this.b == null ? " tokenExpirationTimestamp" : "";
             if (str.isEmpty()) {
-                return new b(this.a, this.b.longValue(), this.f1378c, null);
+                return new b(this.a, this.b.longValue(), this.f1373c, null);
             }
             throw new IllegalStateException(c.d.b.a.a.u("Missing required properties:", str));
         }
@@ -39,13 +39,13 @@ public final class b extends f {
     public b(String str, long j, f.b bVar, a aVar) {
         this.a = str;
         this.b = j;
-        this.f1377c = bVar;
+        this.f1372c = bVar;
     }
 
     @Override // c.i.c.u.p.f
     @Nullable
     public f.b b() {
-        return this.f1377c;
+        return this.f1372c;
     }
 
     @Override // c.i.c.u.p.f
@@ -71,7 +71,7 @@ public final class b extends f {
         String str = this.a;
         if (str != null ? str.equals(fVar.c()) : fVar.c() == null) {
             if (this.b == fVar.d()) {
-                f.b bVar = this.f1377c;
+                f.b bVar = this.f1372c;
                 if (bVar == null) {
                     if (fVar.b() == null) {
                         return true;
@@ -90,7 +90,7 @@ public final class b extends f {
         int hashCode = str == null ? 0 : str.hashCode();
         long j = this.b;
         int i2 = (((hashCode ^ 1000003) * 1000003) ^ ((int) (j ^ (j >>> 32)))) * 1000003;
-        f.b bVar = this.f1377c;
+        f.b bVar = this.f1372c;
         if (bVar != null) {
             i = bVar.hashCode();
         }
@@ -103,7 +103,7 @@ public final class b extends f {
         L.append(", tokenExpirationTimestamp=");
         L.append(this.b);
         L.append(", responseCode=");
-        L.append(this.f1377c);
+        L.append(this.f1372c);
         L.append("}");
         return L.toString();
     }
diff --git a/app/src/main/java/c/i/c/u/p/c.java b/app/src/main/java/c/i/c/u/p/c.java
index 4ca17f7ffb..909d45637c 100644
--- a/app/src/main/java/c/i/c/u/p/c.java
+++ b/app/src/main/java/c/i/c/u/p/c.java
@@ -40,13 +40,13 @@ public class c {
     public static final Charset b = Charset.forName("UTF-8");
 
     /* renamed from: c  reason: collision with root package name */
-    public final Context f1379c;
+    public final Context f1374c;
     public final a<h> d;
     public final a<d> e;
     public final e f = new e();
 
     public c(@NonNull Context context, @NonNull a<h> aVar, @NonNull a<d> aVar2) {
-        this.f1379c = context;
+        this.f1374c = context;
         this.d = aVar;
         this.e = aVar2;
     }
@@ -137,25 +137,25 @@ public class c {
             httpURLConnection.addRequestProperty("Accept", "application/json");
             httpURLConnection.addRequestProperty("Content-Encoding", "gzip");
             httpURLConnection.addRequestProperty("Cache-Control", "no-cache");
-            httpURLConnection.addRequestProperty("X-Android-Package", this.f1379c.getPackageName());
+            httpURLConnection.addRequestProperty("X-Android-Package", this.f1374c.getPackageName());
             if (!(this.e.get() == null || this.d.get() == null || (a3 = this.e.get().a("fire-installations-id")) == d.a.NONE)) {
                 httpURLConnection.addRequestProperty("x-firebase-client", this.d.get().getUserAgent());
                 httpURLConnection.addRequestProperty("x-firebase-client-log-type", Integer.toString(a3.f()));
             }
             String str2 = null;
             try {
-                Context context = this.f1379c;
+                Context context = this.f1374c;
                 PackageInfo packageInfo = b.a(context).a.getPackageManager().getPackageInfo(context.getPackageName(), 64);
                 Signature[] signatureArr = packageInfo.signatures;
                 byte[] digest = (signatureArr == null || signatureArr.length != 1 || (a2 = c.i.a.f.e.o.a.a("SHA1")) == null) ? null : a2.digest(packageInfo.signatures[0].toByteArray());
                 if (digest == null) {
-                    Log.e("ContentValues", "Could not get fingerprint hash for package: " + this.f1379c.getPackageName());
+                    Log.e("ContentValues", "Could not get fingerprint hash for package: " + this.f1374c.getPackageName());
                 } else {
                     str2 = e.a(digest, false);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 StringBuilder L = c.d.b.a.a.L("No such package: ");
-                L.append(this.f1379c.getPackageName());
+                L.append(this.f1374c.getPackageName());
                 Log.e("ContentValues", L.toString(), e);
             }
             httpURLConnection.addRequestProperty("X-Android-Cert", str2);
@@ -226,7 +226,7 @@ public class c {
         jsonReader.close();
         inputStream.close();
         b.C0143b bVar = (b.C0143b) a2;
-        bVar.f1378c = f.b.OK;
+        bVar.f1373c = f.b.OK;
         return bVar.a();
     }
 
diff --git a/app/src/main/java/c/i/c/u/p/e.java b/app/src/main/java/c/i/c/u/p/e.java
index 3cf2e42e0f..1ec55a7d7b 100644
--- a/app/src/main/java/c/i/c/u/p/e.java
+++ b/app/src/main/java/c/i/c/u/p/e.java
@@ -10,14 +10,14 @@ public class e {
     public static final long b = TimeUnit.MINUTES.toMillis(30);
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f1380c = n.c();
+    public final n f1375c = n.c();
     @GuardedBy("this")
     public long d;
     @GuardedBy("this")
     public int e;
 
     public synchronized boolean a() {
-        return this.e == 0 || this.f1380c.a() > this.d;
+        return this.e == 0 || this.f1375c.a() > this.d;
     }
 
     public synchronized void b(int i) {
@@ -38,11 +38,11 @@ public class e {
                 j = a;
             } else {
                 double pow = Math.pow(2.0d, (double) this.e);
-                Objects.requireNonNull(this.f1380c);
+                Objects.requireNonNull(this.f1375c);
                 j = (long) Math.min(pow + ((double) ((long) (Math.random() * 1000.0d))), (double) b);
             }
-            this.d = this.f1380c.a() + j;
+            this.d = this.f1375c.a() + j;
         }
-        this.d = this.f1380c.a() + j;
+        this.d = this.f1375c.a() + j;
     }
 }
diff --git a/app/src/main/java/c/i/c/v/a.java b/app/src/main/java/c/i/c/v/a.java
index 7b662024fb..aee6c356d5 100644
--- a/app/src/main/java/c/i/c/v/a.java
+++ b/app/src/main/java/c/i/c/v/a.java
@@ -14,7 +14,7 @@ public class a {
     public final SharedPreferences b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1381c;
+    public final c f1376c;
     public boolean d;
 
     public a(Context context, String str, c cVar) {
@@ -25,7 +25,7 @@ public class a {
         this.a = context;
         SharedPreferences sharedPreferences = context.getSharedPreferences("com.google.firebase.common.prefs:" + str, 0);
         this.b = sharedPreferences;
-        this.f1381c = cVar;
+        this.f1376c = cVar;
         boolean z3 = true;
         if (sharedPreferences.contains("firebase_data_collection_default_enabled")) {
             z2 = sharedPreferences.getBoolean("firebase_data_collection_default_enabled", true);
diff --git a/app/src/main/java/c/i/c/w/c.java b/app/src/main/java/c/i/c/w/c.java
index 1c4120028c..383bcff8d0 100644
--- a/app/src/main/java/c/i/c/w/c.java
+++ b/app/src/main/java/c/i/c/w/c.java
@@ -42,12 +42,12 @@ public class c {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final r f1382c;
+    public final r f1377c;
 
     public c(Context context, r rVar, Executor executor) {
         this.a = executor;
         this.b = context;
-        this.f1382c = rVar;
+        this.f1377c = rVar;
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x04cc: APUT  (r9v4 int[]), (0 ??[int, short, byte, char]), (r8v21 int) */
@@ -124,7 +124,7 @@ public class c {
         String e7;
         int i2;
         ApplicationInfo applicationInfo;
-        if (this.f1382c.a("gcm.n.noui")) {
+        if (this.f1377c.a("gcm.n.noui")) {
             return true;
         }
         if (!((KeyguardManager) this.b.getSystemService("keyguard")).inKeyguardRestrictedInputMode()) {
@@ -149,7 +149,7 @@ public class c {
         if (z2) {
             return false;
         }
-        String e8 = this.f1382c.e("gcm.n.image");
+        String e8 = this.f1377c.e("gcm.n.image");
         if (!TextUtils.isEmpty(e8)) {
             try {
                 oVar = new o(new URL(e8));
@@ -161,7 +161,7 @@ public class c {
                 oVar.j = c.i.a.f.e.o.c.g(this.a, new n(oVar));
             }
             context = this.b;
-            rVar = this.f1382c;
+            rVar = this.f1377c;
             AtomicInteger atomicInteger = a.a;
             applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 128);
             if (applicationInfo != null) {
@@ -1278,7 +1278,7 @@ public class c {
         if (oVar != null) {
         }
         context = this.b;
-        rVar = this.f1382c;
+        rVar = this.f1377c;
         AtomicInteger atomicInteger = a.a;
         try {
             applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 128);
diff --git a/app/src/main/java/c/i/c/w/q.java b/app/src/main/java/c/i/c/w/q.java
index 6f6cb7546b..e31dfb28a1 100644
--- a/app/src/main/java/c/i/c/w/q.java
+++ b/app/src/main/java/c/i/c/w/q.java
@@ -18,9 +18,9 @@ public class q {
     static {
         e eVar = new e();
         eVar.b.put(m.b.class, new m.c());
-        eVar.f1359c.remove(m.b.class);
+        eVar.f1354c.remove(m.b.class);
         eVar.b.put(m.class, new m.a());
-        eVar.f1359c.remove(m.class);
+        eVar.f1354c.remove(m.class);
         a = new d(eVar);
     }
 
diff --git a/app/src/main/java/c/i/c/w/s.java b/app/src/main/java/c/i/c/w/s.java
index becb4e3dab..a59732acd9 100644
--- a/app/src/main/java/c/i/c/w/s.java
+++ b/app/src/main/java/c/i/c/w/s.java
@@ -10,17 +10,17 @@ public class s implements Parcelable.Creator<RemoteMessage> {
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // android.os.Parcelable.Creator
     public RemoteMessage createFromParcel(Parcel parcel) {
-        int I2 = AnimatableValueParser.I2(parcel);
+        int K2 = AnimatableValueParser.K2(parcel);
         Bundle bundle = null;
-        while (parcel.dataPosition() < I2) {
+        while (parcel.dataPosition() < K2) {
             int readInt = parcel.readInt();
             if ((65535 & readInt) != 2) {
-                AnimatableValueParser.B2(parcel, readInt);
+                AnimatableValueParser.D2(parcel, readInt);
             } else {
                 bundle = AnimatableValueParser.P(parcel, readInt);
             }
         }
-        AnimatableValueParser.h0(parcel, I2);
+        AnimatableValueParser.h0(parcel, K2);
         return new RemoteMessage(bundle);
     }
 
diff --git a/app/src/main/java/c/i/c/w/t.java b/app/src/main/java/c/i/c/w/t.java
index bd99d87334..465a637879 100644
--- a/app/src/main/java/c/i/c/w/t.java
+++ b/app/src/main/java/c/i/c/w/t.java
@@ -20,7 +20,7 @@ public final /* synthetic */ class t implements Runnable {
             Iterator<String> it = uVar.d.iterator();
             while (it.hasNext()) {
                 sb.append(it.next());
-                sb.append(uVar.f1383c);
+                sb.append(uVar.f1378c);
             }
             edit.putString(str, sb.toString()).commit();
         }
diff --git a/app/src/main/java/c/i/c/w/u.java b/app/src/main/java/c/i/c/w/u.java
index e3b43f6b80..6d3c2a8ba4 100644
--- a/app/src/main/java/c/i/c/w/u.java
+++ b/app/src/main/java/c/i/c/w/u.java
@@ -13,7 +13,7 @@ public final class u {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1383c;
+    public final String f1378c;
     @GuardedBy("internalQueue")
     public final ArrayDeque<String> d = new ArrayDeque<>();
     public final Executor e;
@@ -21,7 +21,7 @@ public final class u {
     public u(SharedPreferences sharedPreferences, String str, String str2, Executor executor) {
         this.a = sharedPreferences;
         this.b = str;
-        this.f1383c = str2;
+        this.f1378c = str2;
         this.e = executor;
     }
 
@@ -32,8 +32,8 @@ public final class u {
             uVar.d.clear();
             String string = uVar.a.getString(uVar.b, "");
             if (!TextUtils.isEmpty(string)) {
-                if (string.contains(uVar.f1383c)) {
-                    String[] split = string.split(uVar.f1383c, -1);
+                if (string.contains(uVar.f1378c)) {
+                    String[] split = string.split(uVar.f1378c, -1);
                     if (split.length == 0) {
                         Log.e("FirebaseMessaging", "Corrupted queue. Please check the queue contents and item separator provided");
                     }
diff --git a/app/src/main/java/c/i/c/w/v.java b/app/src/main/java/c/i/c/w/v.java
index a682cc4880..c9caaf3f77 100644
--- a/app/src/main/java/c/i/c/w/v.java
+++ b/app/src/main/java/c/i/c/w/v.java
@@ -11,7 +11,7 @@ public final class v {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1384c;
+    public final String f1379c;
     public final String d;
 
     public v(String str, String str2) {
@@ -26,7 +26,7 @@ public final class v {
             throw new IllegalArgumentException(String.format("Invalid topic name: %s does not match the allowed format %s.", str3, "[a-zA-Z0-9-_.~%]{1,900}"));
         }
         this.b = str3;
-        this.f1384c = str;
+        this.f1379c = str;
         this.d = a.g(a.m(str2, a.m(str, 1)), str, "!", str2);
     }
 
@@ -35,10 +35,10 @@ public final class v {
             return false;
         }
         v vVar = (v) obj;
-        return this.b.equals(vVar.b) && this.f1384c.equals(vVar.f1384c);
+        return this.b.equals(vVar.b) && this.f1379c.equals(vVar.f1379c);
     }
 
     public final int hashCode() {
-        return Arrays.hashCode(new Object[]{this.f1384c, this.b});
+        return Arrays.hashCode(new Object[]{this.f1379c, this.b});
     }
 }
diff --git a/app/src/main/java/c/i/c/w/w.java b/app/src/main/java/c/i/c/w/w.java
index 1b460f6189..f1915fe80e 100644
--- a/app/src/main/java/c/i/c/w/w.java
+++ b/app/src/main/java/c/i/c/w/w.java
@@ -14,7 +14,7 @@ public final class w {
     public final SharedPreferences b;
 
     /* renamed from: c  reason: collision with root package name */
-    public u f1385c;
+    public u f1380c;
     public final Executor d;
 
     public w(SharedPreferences sharedPreferences, Executor executor) {
@@ -26,7 +26,7 @@ public final class w {
     public final synchronized v a() {
         String peek;
         v vVar;
-        u uVar = this.f1385c;
+        u uVar = this.f1380c;
         synchronized (uVar.d) {
             peek = uVar.d.peek();
         }
diff --git a/app/src/main/java/c/i/c/w/x.java b/app/src/main/java/c/i/c/w/x.java
index bccbd5d31c..8d2c347846 100644
--- a/app/src/main/java/c/i/c/w/x.java
+++ b/app/src/main/java/c/i/c/w/x.java
@@ -42,7 +42,7 @@ public final /* synthetic */ class x implements Callable {
                 SharedPreferences sharedPreferences = context.getSharedPreferences("com.google.android.gms.appid", 0);
                 w wVar2 = new w(sharedPreferences, scheduledExecutorService);
                 synchronized (wVar2) {
-                    wVar2.f1385c = u.a(sharedPreferences, "topic_operation_queue", ",", scheduledExecutorService);
+                    wVar2.f1380c = u.a(sharedPreferences, "topic_operation_queue", ",", scheduledExecutorService);
                 }
                 w.a = new WeakReference<>(wVar2);
                 wVar = wVar2;
diff --git a/app/src/main/java/c/i/c/w/y.java b/app/src/main/java/c/i/c/w/y.java
index 7139f79511..6ee3da5606 100644
--- a/app/src/main/java/c/i/c/w/y.java
+++ b/app/src/main/java/c/i/c/w/y.java
@@ -29,7 +29,7 @@ public class y {
     public static final /* synthetic */ int b = 0;
 
     /* renamed from: c  reason: collision with root package name */
-    public final FirebaseInstanceId f1386c;
+    public final FirebaseInstanceId f1381c;
     public final Context d;
     public final q e;
     public final n f;
@@ -41,7 +41,7 @@ public class y {
     public final w j;
 
     public y(FirebaseInstanceId firebaseInstanceId, q qVar, w wVar, n nVar, Context context, @NonNull ScheduledExecutorService scheduledExecutorService) {
-        this.f1386c = firebaseInstanceId;
+        this.f1381c = firebaseInstanceId;
         this.e = qVar;
         this.j = wVar;
         this.f = nVar;
@@ -76,7 +76,7 @@ public class y {
 
     @WorkerThread
     public final void b(String str) throws IOException {
-        o oVar = (o) a(this.f1386c.f());
+        o oVar = (o) a(this.f1381c.f());
         n nVar = this.f;
         String id2 = oVar.getId();
         String a2 = oVar.a();
@@ -90,7 +90,7 @@ public class y {
 
     @WorkerThread
     public final void c(String str) throws IOException {
-        o oVar = (o) a(this.f1386c.f());
+        o oVar = (o) a(this.f1381c.f());
         n nVar = this.f;
         String id2 = oVar.getId();
         String a2 = oVar.a();
@@ -123,7 +123,7 @@ public class y {
                 }
             }
             try {
-                String str = a2.f1384c;
+                String str = a2.f1379c;
                 char c2 = 65535;
                 int hashCode = str.hashCode();
                 if (hashCode != 83) {
@@ -183,7 +183,7 @@ public class y {
             }
             w wVar = this.j;
             synchronized (wVar) {
-                u uVar = wVar.f1385c;
+                u uVar = wVar.f1380c;
                 String str4 = a2.d;
                 synchronized (uVar.d) {
                     if (uVar.d.remove(str4)) {
diff --git a/app/src/main/java/c/i/d/e.java b/app/src/main/java/c/i/d/e.java
index 1239c1a933..4bd4da7c6d 100644
--- a/app/src/main/java/c/i/d/e.java
+++ b/app/src/main/java/c/i/d/e.java
@@ -22,7 +22,7 @@ public final class e {
     public n b = n.DEFAULT;
 
     /* renamed from: c  reason: collision with root package name */
-    public d f1387c = c.IDENTITY;
+    public d f1382c = c.IDENTITY;
     public final Map<Type, f<?>> d = new HashMap();
     public final List<o> e = new ArrayList();
     public final List<o> f = new ArrayList();
@@ -49,7 +49,7 @@ public final class e {
             arrayList.add(new TypeAdapters.AnonymousClass32(Timestamp.class, defaultDateTypeAdapter2));
             arrayList.add(new TypeAdapters.AnonymousClass32(java.sql.Date.class, defaultDateTypeAdapter3));
         }
-        return new Gson(this.a, this.f1387c, this.d, this.g, false, false, this.j, false, false, false, this.b, null, this.h, this.i, this.e, this.f, arrayList);
+        return new Gson(this.a, this.f1382c, this.d, this.g, false, false, this.j, false, false, false, this.b, null, this.h, this.i, this.e, this.f, arrayList);
     }
 
     public e b(Type type, Object obj) {
diff --git a/app/src/main/java/c/i/d/q/f.java b/app/src/main/java/c/i/d/q/f.java
index 2940a8df57..5364e25180 100644
--- a/app/src/main/java/c/i/d/q/f.java
+++ b/app/src/main/java/c/i/d/q/f.java
@@ -12,12 +12,12 @@ public class f implements r<T> {
     public final /* synthetic */ Class b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Type f1388c;
+    public final /* synthetic */ Type f1383c;
 
     public f(g gVar, Class cls, Type type) {
         w wVar;
         this.b = cls;
-        this.f1388c = type;
+        this.f1383c = type;
         try {
             Class<?> cls2 = Class.forName("sun.misc.Unsafe");
             Field declaredField = cls2.getDeclaredField("theUnsafe");
@@ -51,7 +51,7 @@ public class f implements r<T> {
             return this.a.b(this.b);
         } catch (Exception e) {
             StringBuilder L = a.L("Unable to invoke no-args constructor for ");
-            L.append(this.f1388c);
+            L.append(this.f1383c);
             L.append(". Registering an InstanceCreator with Gson for this type may fix this problem.");
             throw new RuntimeException(L.toString(), e);
         }
diff --git a/app/src/main/java/c/i/d/q/x/a.java b/app/src/main/java/c/i/d/q/x/a.java
index 2fb1e9fde4..ecc075bf13 100644
--- a/app/src/main/java/c/i/d/q/x/a.java
+++ b/app/src/main/java/c/i/d/q/x/a.java
@@ -17,10 +17,10 @@ import java.util.Map;
 public final class a extends JsonReader {
 
     /* renamed from: y  reason: collision with root package name */
-    public static final Reader f1389y = new C0146a();
+    public static final Reader f1384y = new C0146a();
 
     /* renamed from: z  reason: collision with root package name */
-    public static final Object f1390z = new Object();
+    public static final Object f1385z = new Object();
     public Object[] A = new Object[32];
     public int B = 0;
     public String[] C = new String[32];
@@ -41,7 +41,7 @@ public final class a extends JsonReader {
     }
 
     public a(JsonElement jsonElement) {
-        super(f1389y);
+        super(f1384y);
         c0(jsonElement);
     }
 
@@ -147,7 +147,7 @@ public final class a extends JsonReader {
             } else if (a02 instanceof j) {
                 return JsonToken.NULL;
             } else {
-                if (a02 == f1390z) {
+                if (a02 == f1385z) {
                     throw new IllegalStateException("JsonReader is closed");
                 }
                 throw new AssertionError();
@@ -224,7 +224,7 @@ public final class a extends JsonReader {
 
     @Override // com.google.gson.stream.JsonReader, java.io.Closeable, java.lang.AutoCloseable
     public void close() throws IOException {
-        this.A = new Object[]{f1390z};
+        this.A = new Object[]{f1385z};
         this.B = 1;
     }
 
diff --git a/app/src/main/java/c/i/d/q/x/b.java b/app/src/main/java/c/i/d/q/x/b.java
index b6ca5ded8e..82a3834eeb 100644
--- a/app/src/main/java/c/i/d/q/x/b.java
+++ b/app/src/main/java/c/i/d/q/x/b.java
@@ -18,7 +18,7 @@ public final class b extends JsonWriter {
     public String w;
 
     /* renamed from: x  reason: collision with root package name */
-    public JsonElement f1391x = j.a;
+    public JsonElement f1386x = j.a;
 
     /* compiled from: JsonTreeWriter */
     public class a extends Writer {
@@ -97,12 +97,12 @@ public final class b extends JsonWriter {
 
     public final void N(JsonElement jsonElement) {
         if (this.w != null) {
-            if (!(jsonElement instanceof j) || this.f2366s) {
+            if (!(jsonElement instanceof j) || this.f2372s) {
                 ((JsonObject) M()).a.put(this.w, jsonElement);
             }
             this.w = null;
         } else if (this.v.isEmpty()) {
-            this.f1391x = jsonElement;
+            this.f1386x = jsonElement;
         } else {
             JsonElement M = M();
             if (M instanceof g) {
diff --git a/app/src/main/java/c/i/d/q/y/c.java b/app/src/main/java/c/i/d/q/y/c.java
index 4208829bc7..0865df3869 100644
--- a/app/src/main/java/c/i/d/q/y/c.java
+++ b/app/src/main/java/c/i/d/q/y/c.java
@@ -8,7 +8,7 @@ public final class c extends b {
     public static Class b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Object f1392c;
+    public final Object f1387c;
     public final Field d;
 
     public c() {
@@ -23,7 +23,7 @@ public final class c extends b {
         } catch (Exception unused) {
             obj = null;
         }
-        this.f1392c = obj;
+        this.f1387c = obj;
         try {
             field = AccessibleObject.class.getDeclaredField("override");
         } catch (NoSuchFieldException unused2) {
@@ -34,9 +34,9 @@ public final class c extends b {
     @Override // c.i.d.q.y.b
     public void a(AccessibleObject accessibleObject) {
         boolean z2 = false;
-        if (!(this.f1392c == null || this.d == null)) {
+        if (!(this.f1387c == null || this.d == null)) {
             try {
-                b.getMethod("putBoolean", Object.class, Long.TYPE, Boolean.TYPE).invoke(this.f1392c, accessibleObject, Long.valueOf(((Long) b.getMethod("objectFieldOffset", Field.class).invoke(this.f1392c, this.d)).longValue()), Boolean.TRUE);
+                b.getMethod("putBoolean", Object.class, Long.TYPE, Boolean.TYPE).invoke(this.f1387c, accessibleObject, Long.valueOf(((Long) b.getMethod("objectFieldOffset", Field.class).invoke(this.f1387c, this.d)).longValue()), Boolean.TRUE);
                 z2 = true;
             } catch (Exception unused) {
             }
diff --git a/app/src/main/java/c/i/e/c.java b/app/src/main/java/c/i/e/c.java
index b6e9e7c642..a8be23a977 100644
--- a/app/src/main/java/c/i/e/c.java
+++ b/app/src/main/java/c/i/e/c.java
@@ -29,7 +29,7 @@ public final class c {
                     hVar.b(i2);
                     int[] iArr = hVar.d;
                     for (int i4 = 1; i4 < 5; i4++) {
-                        byte[] b = fVar.b((i3 * i4) / 5, hVar.f1410c);
+                        byte[] b = fVar.b((i3 * i4) / 5, hVar.f1405c);
                         int i5 = (i2 << 2) / 5;
                         for (int i6 = i2 / 5; i6 < i5; i6++) {
                             int i7 = (b[i6] & 255) >> 3;
@@ -224,7 +224,7 @@ public final class c {
             }
         }
         hVar.b(i3);
-        byte[] b = fVar.b(i, hVar.f1410c);
+        byte[] b = fVar.b(i, hVar.f1405c);
         int[] iArr = hVar.d;
         int i5 = 0;
         while (true) {
diff --git a/app/src/main/java/c/i/e/e.java b/app/src/main/java/c/i/e/e.java
index 6ca3900455..0a5278aa15 100644
--- a/app/src/main/java/c/i/e/e.java
+++ b/app/src/main/java/c/i/e/e.java
@@ -3,16 +3,16 @@ package c.i.e;
 public final class e extends f {
 
     /* renamed from: c  reason: collision with root package name */
-    public final f f1398c;
+    public final f f1393c;
 
     public e(f fVar) {
         super(fVar.a, fVar.b);
-        this.f1398c = fVar;
+        this.f1393c = fVar;
     }
 
     @Override // c.i.e.f
     public byte[] a() {
-        byte[] a = this.f1398c.a();
+        byte[] a = this.f1393c.a();
         int i = this.a * this.b;
         byte[] bArr = new byte[i];
         for (int i2 = 0; i2 < i; i2++) {
@@ -23,7 +23,7 @@ public final class e extends f {
 
     @Override // c.i.e.f
     public byte[] b(int i, byte[] bArr) {
-        byte[] b = this.f1398c.b(i, bArr);
+        byte[] b = this.f1393c.b(i, bArr);
         int i2 = this.a;
         for (int i3 = 0; i3 < i2; i3++) {
             b[i3] = (byte) (255 - (b[i3] & 255));
@@ -33,11 +33,11 @@ public final class e extends f {
 
     @Override // c.i.e.f
     public boolean c() {
-        return this.f1398c.c();
+        return this.f1393c.c();
     }
 
     @Override // c.i.e.f
     public f d() {
-        return new e(this.f1398c.d());
+        return new e(this.f1393c.d());
     }
 }
diff --git a/app/src/main/java/c/i/e/h.java b/app/src/main/java/c/i/e/h.java
index df219ba5dc..f0faaa996a 100644
--- a/app/src/main/java/c/i/e/h.java
+++ b/app/src/main/java/c/i/e/h.java
@@ -3,7 +3,7 @@ package c.i.e;
 public final class h extends f {
 
     /* renamed from: c  reason: collision with root package name */
-    public final byte[] f1399c;
+    public final byte[] f1394c;
     public final int d;
     public final int e;
     public final int f;
@@ -14,7 +14,7 @@ public final class h extends f {
         if (i3 + i5 > i || i4 + i6 > i2) {
             throw new IllegalArgumentException("Crop rectangle does not fit within image data.");
         }
-        this.f1399c = bArr;
+        this.f1394c = bArr;
         this.d = i;
         this.e = i2;
         this.f = i3;
@@ -45,17 +45,17 @@ public final class h extends f {
         int i2 = this.b;
         int i3 = this.d;
         if (i == i3 && i2 == this.e) {
-            return this.f1399c;
+            return this.f1394c;
         }
         int i4 = i * i2;
         byte[] bArr = new byte[i4];
         int i5 = (this.g * i3) + this.f;
         if (i == i3) {
-            System.arraycopy(this.f1399c, i5, bArr, 0, i4);
+            System.arraycopy(this.f1394c, i5, bArr, 0, i4);
             return bArr;
         }
         for (int i6 = 0; i6 < i2; i6++) {
-            System.arraycopy(this.f1399c, i5, bArr, i6 * i, i);
+            System.arraycopy(this.f1394c, i5, bArr, i6 * i, i);
             i5 += this.d;
         }
         return bArr;
@@ -70,7 +70,7 @@ public final class h extends f {
         if (bArr == null || bArr.length < i2) {
             bArr = new byte[i2];
         }
-        System.arraycopy(this.f1399c, ((i + this.g) * this.d) + this.f, bArr, 0, i2);
+        System.arraycopy(this.f1394c, ((i + this.g) * this.d) + this.f, bArr, 0, i2);
         return bArr;
     }
 }
diff --git a/app/src/main/java/c/i/e/m/a.java b/app/src/main/java/c/i/e/m/a.java
index a2fa1b0036..a6c13f0cef 100644
--- a/app/src/main/java/c/i/e/m/a.java
+++ b/app/src/main/java/c/i/e/m/a.java
@@ -7,13 +7,13 @@ import c.i.e.n.g;
 public final class a extends g {
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1401c;
+    public final boolean f1396c;
     public final int d;
     public final int e;
 
     public a(b bVar, k[] kVarArr, boolean z2, int i, int i2) {
         super(bVar, kVarArr);
-        this.f1401c = z2;
+        this.f1396c = z2;
         this.d = i;
         this.e = i2;
     }
diff --git a/app/src/main/java/c/i/e/m/b.java b/app/src/main/java/c/i/e/m/b.java
index 29e2629798..e5c86f5b7f 100644
--- a/app/src/main/java/c/i/e/m/b.java
+++ b/app/src/main/java/c/i/e/m/b.java
@@ -47,7 +47,7 @@ public final class b implements i {
                 }
                 while (r11 < r0) {
                 }
-                Result result = new Result(eVar.f1409c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
+                Result result = new Result(eVar.f1404c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
                 list = eVar.d;
                 if (list != null) {
                 }
@@ -64,7 +64,7 @@ public final class b implements i {
                 }
                 while (r11 < r0) {
                 }
-                Result result = new Result(eVar.f1409c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
+                Result result = new Result(eVar.f1404c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
                 list = eVar.d;
                 if (list != null) {
                 }
@@ -82,7 +82,7 @@ public final class b implements i {
             }
             while (r11 < r0) {
             }
-            Result result = new Result(eVar.f1409c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
+            Result result = new Result(eVar.f1404c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
             list = eVar.d;
             if (list != null) {
             }
@@ -100,7 +100,7 @@ public final class b implements i {
             }
             while (r11 < r0) {
             }
-            Result result = new Result(eVar.f1409c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
+            Result result = new Result(eVar.f1404c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
             list = eVar.d;
             if (list != null) {
             }
@@ -129,7 +129,7 @@ public final class b implements i {
                 lVar.a(kVar);
             }
         }
-        Result result = new Result(eVar.f1409c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
+        Result result = new Result(eVar.f1404c, eVar.a, eVar.b, kVarArr, c.i.e.a.AZTEC, System.currentTimeMillis());
         list = eVar.d;
         if (list != null) {
             result.b(j.BYTE_SEGMENTS, list);
diff --git a/app/src/main/java/c/i/e/m/c/a.java b/app/src/main/java/c/i/e/m/c/a.java
index ea07588185..fd339161fd 100644
--- a/app/src/main/java/c/i/e/m/c/a.java
+++ b/app/src/main/java/c/i/e/m/c/a.java
@@ -13,7 +13,7 @@ public final class a {
     public static final String[] b = {"CTRL_PS", " ", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "CTRL_US", "CTRL_ML", "CTRL_DL", "CTRL_BS"};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String[] f1402c = {"CTRL_PS", " ", "\u0001", "\u0002", "\u0003", "\u0004", "\u0005", "\u0006", "\u0007", "\b", "\t", "\n", "\u000b", "\f", "\r", "\u001b", "\u001c", "\u001d", "\u001e", "\u001f", "@", "\\", "^", "_", "`", "|", "~", "", "CTRL_LL", "CTRL_UL", "CTRL_PL", "CTRL_BS"};
+    public static final String[] f1397c = {"CTRL_PS", " ", "\u0001", "\u0002", "\u0003", "\u0004", "\u0005", "\u0006", "\u0007", "\b", "\t", "\n", "\u000b", "\f", "\r", "\u001b", "\u001c", "\u001d", "\u001e", "\u001f", "@", "\\", "^", "_", "`", "|", "~", "", "CTRL_LL", "CTRL_UL", "CTRL_PL", "CTRL_BS"};
     public static final String[] d = {"", "\r", "\r\n", ". ", ", ", ": ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/", ":", ";", "<", "=", ">", "?", "[", "]", "{", "}", "CTRL_UL"};
     public static final String[] e = {"CTRL_PS", " ", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ",", ".", "CTRL_UL", "CTRL_US"};
     public c.i.e.m.a f;
@@ -35,7 +35,7 @@ public final class a {
         String str;
         this.f = aVar;
         b bVar = aVar.a;
-        boolean z2 = aVar.f1401c;
+        boolean z2 = aVar.f1396c;
         int i2 = aVar.e;
         int i3 = (z2 ? 11 : 14) + (i2 << 2);
         int[] iArr = new int[i3];
@@ -99,7 +99,7 @@ public final class a {
         int i24 = aVar3.e;
         int i25 = 8;
         if (i24 <= 2) {
-            aVar2 = c.i.e.n.l.a.f1413c;
+            aVar2 = c.i.e.n.l.a.f1408c;
             i = 6;
         } else if (i24 <= 8) {
             aVar2 = c.i.e.n.l.a.g;
@@ -210,7 +210,7 @@ public final class a {
                         } else if (h == 1) {
                             str = b[b3];
                         } else if (h == 2) {
-                            str = f1402c[b3];
+                            str = f1397c[b3];
                         } else if (h == 3) {
                             str = e[b3];
                         } else if (h == 4) {
diff --git a/app/src/main/java/c/i/e/m/d/a.java b/app/src/main/java/c/i/e/m/d/a.java
index 68e3ef9dbb..7a48ad392f 100644
--- a/app/src/main/java/c/i/e/m/d/a.java
+++ b/app/src/main/java/c/i/e/m/d/a.java
@@ -13,7 +13,7 @@ public final class a {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1403c;
+    public boolean f1398c;
     public int d;
     public int e;
     public int f;
@@ -297,7 +297,7 @@ public final class a {
         }
         int i48 = this.f;
         if (i48 == 5 || i48 == 7) {
-            this.f1403c = i48 == 5;
+            this.f1398c = i48 == 5;
             int i49 = i48 * 2;
             k[] b3 = b(new k[]{new k(((float) aVar2.a) + 0.5f, ((float) aVar2.b) - 0.5f), new k(((float) aVar3.a) + 0.5f, ((float) aVar3.b) + 0.5f), new k(((float) aVar4.a) - 0.5f, ((float) aVar4.b) + 0.5f), new k(((float) aVar5.a) - 0.5f, ((float) aVar5.b) - 0.5f)}, i49 - 3, i49);
             if (z2) {
@@ -322,7 +322,7 @@ public final class a {
                     long j2 = 0;
                     for (int i56 = 0; i56 < 4; i56++) {
                         int i57 = iArr[(this.g + i56) % 4];
-                        if (this.f1403c) {
+                        if (this.f1398c) {
                             j = j2 << 7;
                             i2 = (i57 >> 1) & 127;
                         } else {
@@ -332,7 +332,7 @@ public final class a {
                         j2 = j + ((long) i2);
                     }
                     int i58 = 7;
-                    if (this.f1403c) {
+                    if (this.f1398c) {
                         i = 2;
                     } else {
                         i = 4;
@@ -358,7 +358,7 @@ public final class a {
                     for (int i61 = 0; i61 < i; i61++) {
                         i60 = (i60 << 4) + iArr2[i61];
                     }
-                    if (this.f1403c) {
+                    if (this.f1398c) {
                         this.d = (i60 >> 6) + 1;
                         this.e = (i60 & 63) + 1;
                     } else {
@@ -377,7 +377,7 @@ public final class a {
                     float f2 = (float) this.f;
                     float f3 = f - f2;
                     float f4 = f + f2;
-                    return new c.i.e.m.a(fVar.a(bVar3, d, d, i.a(f3, f3, f4, f3, f4, f4, f3, f4, kVar16.a, kVar16.b, kVar17.a, kVar17.b, kVar18.a, kVar18.b, kVar19.a, kVar19.b)), b(b3, this.f * 2, d()), this.f1403c, this.e, this.d);
+                    return new c.i.e.m.a(fVar.a(bVar3, d, d, i.a(f3, f3, f4, f3, f4, f4, f3, f4, kVar16.a, kVar16.b, kVar17.a, kVar17.b, kVar18.a, kVar18.b, kVar19.a, kVar19.b)), b(b3, this.f * 2, d()), this.f1398c, this.e, this.d);
                 }
             }
             throw NotFoundException.k;
@@ -417,7 +417,7 @@ public final class a {
     }
 
     public final int d() {
-        if (this.f1403c) {
+        if (this.f1398c) {
             return (this.d * 4) + 11;
         }
         int i = this.d;
diff --git a/app/src/main/java/c/i/e/n/c.java b/app/src/main/java/c/i/e/n/c.java
index 822c01672b..d76046f604 100644
--- a/app/src/main/java/c/i/e/n/c.java
+++ b/app/src/main/java/c/i/e/n/c.java
@@ -5,21 +5,21 @@ public final class c {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1404c;
+    public int f1399c;
 
     public c(byte[] bArr) {
         this.a = bArr;
     }
 
     public int a() {
-        return ((this.a.length - this.b) * 8) - this.f1404c;
+        return ((this.a.length - this.b) * 8) - this.f1399c;
     }
 
     public int b(int i) {
         if (i <= 0 || i > 32 || i > a()) {
             throw new IllegalArgumentException(String.valueOf(i));
         }
-        int i2 = this.f1404c;
+        int i2 = this.f1399c;
         int i3 = 0;
         if (i2 > 0) {
             int i4 = 8 - i2;
@@ -30,9 +30,9 @@ public final class c {
             int i8 = (((255 >> (8 - i5)) << i6) & bArr[i7]) >> i6;
             i -= i5;
             int i9 = i2 + i5;
-            this.f1404c = i9;
+            this.f1399c = i9;
             if (i9 == 8) {
-                this.f1404c = 0;
+                this.f1399c = 0;
                 this.b = i7 + 1;
             }
             i3 = i8;
@@ -53,7 +53,7 @@ public final class c {
         }
         int i12 = 8 - i;
         int i13 = (i3 << i) | ((((255 >> i12) << i12) & this.a[this.b]) >> i12);
-        this.f1404c += i;
+        this.f1399c += i;
         return i13;
     }
 }
diff --git a/app/src/main/java/c/i/e/n/e.java b/app/src/main/java/c/i/e/n/e.java
index 2fc7b955e9..745e3d2d18 100644
--- a/app/src/main/java/c/i/e/n/e.java
+++ b/app/src/main/java/c/i/e/n/e.java
@@ -7,7 +7,7 @@ public final class e {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1409c;
+    public final String f1404c;
     public final List<byte[]> d;
     public final String e;
     public Object f;
@@ -21,7 +21,7 @@ public final class e {
     public e(byte[] bArr, String str, List<byte[]> list, String str2, int i, int i2) {
         this.a = bArr;
         this.b = bArr == null ? 0 : bArr.length * 8;
-        this.f1409c = str;
+        this.f1404c = str;
         this.d = list;
         this.e = str2;
         this.g = i2;
diff --git a/app/src/main/java/c/i/e/n/f.java b/app/src/main/java/c/i/e/n/f.java
index 33c51a591b..a9a1257543 100644
--- a/app/src/main/java/c/i/e/n/f.java
+++ b/app/src/main/java/c/i/e/n/f.java
@@ -28,7 +28,7 @@ public final class f {
             Objects.requireNonNull(iVar);
             float f2 = iVar.a;
             float f3 = iVar.b;
-            float f4 = iVar.f1411c;
+            float f4 = iVar.f1406c;
             float f5 = iVar.d;
             float f6 = iVar.e;
             float f7 = iVar.f;
diff --git a/app/src/main/java/c/i/e/n/h.java b/app/src/main/java/c/i/e/n/h.java
index f718890c76..fb117e0218 100644
--- a/app/src/main/java/c/i/e/n/h.java
+++ b/app/src/main/java/c/i/e/n/h.java
@@ -8,7 +8,7 @@ public final class h extends b {
     public static final byte[] b = new byte[0];
 
     /* renamed from: c  reason: collision with root package name */
-    public byte[] f1410c = b;
+    public byte[] f1405c = b;
     public final int[] d = new int[32];
     public b e;
 
@@ -63,8 +63,8 @@ public final class h extends b {
     }
 
     public final void b(int i) {
-        if (this.f1410c.length < i) {
-            this.f1410c = new byte[i];
+        if (this.f1405c.length < i) {
+            this.f1405c = new byte[i];
         }
         for (int i2 = 0; i2 < 32; i2++) {
             this.d[i2] = 0;
diff --git a/app/src/main/java/c/i/e/n/i.java b/app/src/main/java/c/i/e/n/i.java
index 4e97894251..edddeca5fe 100644
--- a/app/src/main/java/c/i/e/n/i.java
+++ b/app/src/main/java/c/i/e/n/i.java
@@ -5,7 +5,7 @@ public final class i {
     public final float b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final float f1411c;
+    public final float f1406c;
     public final float d;
     public final float e;
     public final float f;
@@ -16,7 +16,7 @@ public final class i {
     public i(float f, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9) {
         this.a = f;
         this.b = f4;
-        this.f1411c = f7;
+        this.f1406c = f7;
         this.d = f2;
         this.e = f5;
         this.f = f8;
@@ -36,7 +36,7 @@ public final class i {
         float f23 = b.d;
         float f24 = (f19 * f22) - (f23 * f18);
         float f25 = (f23 * f20) - (f17 * f22);
-        float f26 = b.f1411c;
+        float f26 = b.f1406c;
         float f27 = b.b;
         float f28 = (f26 * f20) - (f27 * f18);
         float f29 = b.a;
@@ -59,7 +59,7 @@ public final class i {
         float f45 = (f44 * f32) + (f43 * f28) + (f42 * f21);
         float f46 = (f43 * f30) + (f42 * f24);
         float f47 = (f43 * f31) + (f42 * f25) + (f44 * f34);
-        float f48 = b2.f1411c;
+        float f48 = b2.f1406c;
         float f49 = b2.f;
         float f50 = f28 * f49;
         float f51 = b2.i;
diff --git a/app/src/main/java/c/i/e/n/k/a.java b/app/src/main/java/c/i/e/n/k/a.java
index aad9d433d3..6ea400936e 100644
--- a/app/src/main/java/c/i/e/n/k/a.java
+++ b/app/src/main/java/c/i/e/n/k/a.java
@@ -10,7 +10,7 @@ public final class a {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1412c;
+    public final int f1407c;
     public final int d;
     public final int e;
     public final int f;
@@ -21,7 +21,7 @@ public final class a {
         int i4 = bVar.j;
         this.b = i4;
         int i5 = bVar.i;
-        this.f1412c = i5;
+        this.f1407c = i5;
         int i6 = i / 2;
         int i7 = i2 - i6;
         this.d = i7;
@@ -75,7 +75,7 @@ public final class a {
             boolean z9 = true;
             boolean z10 = false;
             while (true) {
-                if ((z9 || !z4) && i2 < this.f1412c) {
+                if ((z9 || !z4) && i2 < this.f1407c) {
                     z9 = a(i3, i4, i2, false);
                     if (z9) {
                         i2++;
@@ -86,7 +86,7 @@ public final class a {
                     }
                 }
             }
-            if (i2 >= this.f1412c) {
+            if (i2 >= this.f1407c) {
                 break;
             }
             boolean z11 = true;
@@ -182,7 +182,7 @@ public final class a {
                         float f6 = kVar4.b;
                         float f7 = kVar3.a;
                         float f8 = kVar3.b;
-                        return f < ((float) this.f1412c) / 2.0f ? new k[]{new k(f7 - 1.0f, f8 + 1.0f), new k(f3 + 1.0f, f4 + 1.0f), new k(f5 - 1.0f, f6 - 1.0f), new k(f + 1.0f, f2 - 1.0f)} : new k[]{new k(f7 + 1.0f, f8 + 1.0f), new k(f3 + 1.0f, f4 - 1.0f), new k(f5 - 1.0f, f6 + 1.0f), new k(f - 1.0f, f2 - 1.0f)};
+                        return f < ((float) this.f1407c) / 2.0f ? new k[]{new k(f7 - 1.0f, f8 + 1.0f), new k(f3 + 1.0f, f4 + 1.0f), new k(f5 - 1.0f, f6 - 1.0f), new k(f + 1.0f, f2 - 1.0f)} : new k[]{new k(f7 + 1.0f, f8 + 1.0f), new k(f3 + 1.0f, f4 - 1.0f), new k(f5 - 1.0f, f6 + 1.0f), new k(f - 1.0f, f2 - 1.0f)};
                     }
                     throw NotFoundException.k;
                 }
diff --git a/app/src/main/java/c/i/e/n/l/a.java b/app/src/main/java/c/i/e/n/l/a.java
index eb1d36998d..aafd38e722 100644
--- a/app/src/main/java/c/i/e/n/l/a.java
+++ b/app/src/main/java/c/i/e/n/l/a.java
@@ -5,7 +5,7 @@ public final class a {
     public static final a b = new a(1033, 1024, 1);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f1413c;
+    public static final a f1408c;
     public static final a d = new a(19, 16, 1);
     public static final a e = new a(285, 256, 0);
     public static final a f;
@@ -21,7 +21,7 @@ public final class a {
 
     static {
         a aVar = new a(67, 64, 1);
-        f1413c = aVar;
+        f1408c = aVar;
         a aVar2 = new a(301, 256, 1);
         f = aVar2;
         g = aVar2;
diff --git a/app/src/main/java/c/i/e/o/a.java b/app/src/main/java/c/i/e/o/a.java
index 714dbe2008..ebcac5b662 100644
--- a/app/src/main/java/c/i/e/o/a.java
+++ b/app/src/main/java/c/i/e/o/a.java
@@ -71,8 +71,8 @@ public final class a implements i {
             if (hashMap.containsKey(kVar)) {
                 kVar = !hashMap.containsKey(kVar2) ? kVar2 : !hashMap.containsKey(kVar3) ? kVar3 : kVar4;
             }
-            int i = aVar.e(kVar11, kVar).f1417c;
-            int i2 = aVar.e(kVar9, kVar).f1417c;
+            int i = aVar.e(kVar11, kVar).f1412c;
+            int i2 = aVar.e(kVar9, kVar).f1412c;
             if ((i & 1) == 1) {
                 i++;
             }
@@ -98,14 +98,14 @@ public final class a implements i {
                     if (!aVar.c(kVar13)) {
                         kVar13 = null;
                     }
-                } else if (!aVar.c(kVar13) || Math.abs(i4 - aVar.e(kVar9, kVar12).f1417c) + Math.abs(i3 - aVar.e(kVar11, kVar12).f1417c) <= Math.abs(i4 - aVar.e(kVar9, kVar13).f1417c) + Math.abs(i3 - aVar.e(kVar11, kVar13).f1417c)) {
+                } else if (!aVar.c(kVar13) || Math.abs(i4 - aVar.e(kVar9, kVar12).f1412c) + Math.abs(i3 - aVar.e(kVar11, kVar12).f1412c) <= Math.abs(i4 - aVar.e(kVar9, kVar13).f1412c) + Math.abs(i3 - aVar.e(kVar11, kVar13).f1412c)) {
                     kVar13 = kVar12;
                 }
                 if (kVar13 != null) {
                     kVar = kVar13;
                 }
-                int i5 = aVar.e(kVar11, kVar).f1417c;
-                int i6 = aVar.e(kVar9, kVar).f1417c;
+                int i5 = aVar.e(kVar11, kVar).f1412c;
+                int i6 = aVar.e(kVar9, kVar).f1412c;
                 if ((i5 & 1) == 1) {
                     i5++;
                 }
@@ -131,13 +131,13 @@ public final class a implements i {
                     if (!aVar.c(kVar15)) {
                         kVar15 = null;
                     }
-                } else if (!aVar.c(kVar15) || Math.abs(aVar.e(kVar11, kVar14).f1417c - aVar.e(kVar9, kVar14).f1417c) <= Math.abs(aVar.e(kVar11, kVar15).f1417c - aVar.e(kVar9, kVar15).f1417c)) {
+                } else if (!aVar.c(kVar15) || Math.abs(aVar.e(kVar11, kVar14).f1412c - aVar.e(kVar9, kVar14).f1412c) <= Math.abs(aVar.e(kVar11, kVar15).f1412c - aVar.e(kVar9, kVar15).f1412c)) {
                     kVar15 = kVar14;
                 }
                 if (kVar15 != null) {
                     kVar = kVar15;
                 }
-                int max = Math.max(aVar.e(kVar11, kVar).f1417c, aVar.e(kVar9, kVar).f1417c) + 1;
+                int max = Math.max(aVar.e(kVar11, kVar).f1412c, aVar.e(kVar9, kVar).f1412c) + 1;
                 if ((max & 1) == 1) {
                     max++;
                 }
@@ -190,7 +190,7 @@ public final class a implements i {
                 throw NotFoundException.k;
             }
         }
-        Result result = new Result(eVar.f1409c, eVar.a, kVarArr, c.i.e.a.DATA_MATRIX);
+        Result result = new Result(eVar.f1404c, eVar.a, kVarArr, c.i.e.a.DATA_MATRIX);
         List<byte[]> list = eVar.d;
         if (list != null) {
             result.b(j.BYTE_SEGMENTS, list);
diff --git a/app/src/main/java/c/i/e/o/b/a.java b/app/src/main/java/c/i/e/o/b/a.java
index bddc99171a..8d016c5cfe 100644
--- a/app/src/main/java/c/i/e/o/b/a.java
+++ b/app/src/main/java/c/i/e/o/b/a.java
@@ -8,7 +8,7 @@ public final class a {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f1414c;
+    public final e f1409c;
 
     public a(b bVar) throws FormatException {
         int i;
@@ -21,9 +21,9 @@ public final class a {
         if ((i2 & 1) == 0 && (i3 & 1) == 0) {
             e[] eVarArr2 = e.a;
             for (e eVar : eVarArr2) {
-                int i4 = eVar.f1416c;
+                int i4 = eVar.f1411c;
                 if (i4 == i2 && (i = eVar.d) == i3) {
-                    this.f1414c = eVar;
+                    this.f1409c = eVar;
                     if (bVar.j == i4) {
                         int i5 = eVar.e;
                         int i6 = eVar.f;
diff --git a/app/src/main/java/c/i/e/o/b/c.java b/app/src/main/java/c/i/e/o/b/c.java
index 75998b45c3..d4b55f544c 100644
--- a/app/src/main/java/c/i/e/o/b/c.java
+++ b/app/src/main/java/c/i/e/o/b/c.java
@@ -5,7 +5,7 @@ public final class c {
     public static final char[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final char[] f1415c = {'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
+    public static final char[] f1410c = {'*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
     public static final char[] d;
     public static final char[] e = {'`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', 127};
 
diff --git a/app/src/main/java/c/i/e/o/b/d.java b/app/src/main/java/c/i/e/o/b/d.java
index 84759a0c68..8d481813b3 100644
--- a/app/src/main/java/c/i/e/o/b/d.java
+++ b/app/src/main/java/c/i/e/o/b/d.java
@@ -44,7 +44,7 @@ public final class d {
         int b2;
         int b3;
         a aVar = new a(bVar);
-        e eVar = aVar.f1414c;
+        e eVar = aVar.f1409c;
         int i2 = eVar.h;
         byte[] bArr = new byte[i2];
         b bVar2 = aVar.a;
@@ -249,7 +249,7 @@ public final class d {
             }
             i5 = 0;
         }
-        if (i8 == aVar.f1414c.h) {
+        if (i8 == aVar.f1409c.h) {
             e.c cVar = eVar.g;
             e.b[] bVarArr = cVar.b;
             int i52 = 0;
@@ -551,7 +551,7 @@ public final class d {
                                     } else if (i83 < i80) {
                                         i81 = i83 + 1;
                                     } else {
-                                        char[] cArr5 = c.f1415c;
+                                        char[] cArr5 = c.f1410c;
                                         if (i83 < cArr5.length) {
                                             char c7 = cArr5[i83];
                                             if (z11) {
@@ -612,7 +612,7 @@ public final class d {
                                         if (i87 < 4) {
                                             int b5 = cVar2.b(6);
                                             if (b5 == 31) {
-                                                int i88 = 8 - cVar2.f1404c;
+                                                int i88 = 8 - cVar2.f1399c;
                                                 if (i88 != i60) {
                                                     cVar2.b(i88);
                                                 }
diff --git a/app/src/main/java/c/i/e/o/b/e.java b/app/src/main/java/c/i/e/o/b/e.java
index 4fbf36a097..af026c5bcf 100644
--- a/app/src/main/java/c/i/e/o/b/e.java
+++ b/app/src/main/java/c/i/e/o/b/e.java
@@ -5,7 +5,7 @@ public final class e {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1416c;
+    public final int f1411c;
     public final int d;
     public final int e;
     public final int f;
@@ -41,7 +41,7 @@ public final class e {
 
     public e(int i, int i2, int i3, int i4, int i5, c cVar) {
         this.b = i;
-        this.f1416c = i2;
+        this.f1411c = i2;
         this.d = i3;
         this.e = i4;
         this.f = i5;
diff --git a/app/src/main/java/c/i/e/o/c/a.java b/app/src/main/java/c/i/e/o/c/a.java
index c4e0ce5048..d93ae8c7f1 100644
--- a/app/src/main/java/c/i/e/o/c/a.java
+++ b/app/src/main/java/c/i/e/o/c/a.java
@@ -18,16 +18,16 @@ public final class a {
         public final k b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f1417c;
+        public final int f1412c;
 
         public b(k kVar, k kVar2, int i, C0148a aVar) {
             this.a = kVar;
             this.b = kVar2;
-            this.f1417c = i;
+            this.f1412c = i;
         }
 
         public String toString() {
-            return this.a + "/" + this.b + '/' + this.f1417c;
+            return this.a + "/" + this.b + '/' + this.f1412c;
         }
     }
 
@@ -39,7 +39,7 @@ public final class a {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
         @Override // java.util.Comparator
         public int compare(b bVar, b bVar2) {
-            return bVar.f1417c - bVar2.f1417c;
+            return bVar.f1412c - bVar2.f1412c;
         }
     }
 
diff --git a/app/src/main/java/c/i/e/q/a.java b/app/src/main/java/c/i/e/q/a.java
index 74bee3dad9..2c6b2461f1 100644
--- a/app/src/main/java/c/i/e/q/a.java
+++ b/app/src/main/java/c/i/e/q/a.java
@@ -12,7 +12,7 @@ public final class a extends k {
     public static final int[] b = {3, 6, 9, 96, 18, 66, 33, 36, 48, 72, 12, 24, 69, 81, 84, 21, 26, 41, 11, 14};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final char[] f1418c = {'A', 'B', 'C', 'D'};
+    public static final char[] f1413c = {'A', 'B', 'C', 'D'};
     public final StringBuilder d = new StringBuilder(20);
     public int[] e = new int[80];
     public int f = 0;
@@ -51,7 +51,7 @@ public final class a extends k {
             int i4 = 1;
             while (i4 < this.f) {
                 int i5 = i(i4);
-                if (i5 != -1 && g(f1418c, a[i5])) {
+                if (i5 != -1 && g(f1413c, a[i5])) {
                     int i6 = 0;
                     for (int i7 = i4; i7 < i4 + 7; i7++) {
                         i6 += this.e[i7];
@@ -64,7 +64,7 @@ public final class a extends k {
                             if (i9 != -1) {
                                 this.d.append((char) i9);
                                 i8 += 8;
-                                if ((this.d.length() <= 1 || !g(f1418c, a[i9])) && i8 < this.f) {
+                                if ((this.d.length() <= 1 || !g(f1413c, a[i9])) && i8 < this.f) {
                                 }
                             } else {
                                 throw NotFoundException.k;
@@ -129,7 +129,7 @@ public final class a extends k {
                                         sb.setCharAt(i27, a[sb.charAt(i27)]);
                                     }
                                     char charAt = this.d.charAt(0);
-                                    char[] cArr = f1418c;
+                                    char[] cArr = f1413c;
                                     if (g(cArr, charAt)) {
                                         StringBuilder sb2 = this.d;
                                         if (!g(cArr, sb2.charAt(sb2.length() - 1))) {
diff --git a/app/src/main/java/c/i/e/q/c.java b/app/src/main/java/c/i/e/q/c.java
index eeed5209de..5342cb9211 100644
--- a/app/src/main/java/c/i/e/q/c.java
+++ b/app/src/main/java/c/i/e/q/c.java
@@ -15,7 +15,7 @@ public final class c extends k {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final StringBuilder f1419c = new StringBuilder(20);
+    public final StringBuilder f1414c = new StringBuilder(20);
     public final int[] d = new int[9];
 
     public c(boolean z2) {
@@ -67,7 +67,7 @@ public final class c extends k {
         char c2;
         int[] iArr = this.d;
         Arrays.fill(iArr, 0);
-        StringBuilder sb = this.f1419c;
+        StringBuilder sb = this.f1414c;
         sb.setLength(0);
         int i2 = aVar.j;
         int f = aVar.f(0);
@@ -129,7 +129,7 @@ public final class c extends k {
                                         int length2 = sb.length() - 1;
                                         int i13 = 0;
                                         for (int i14 = 0; i14 < length2; i14++) {
-                                            i13 += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%".indexOf(this.f1419c.charAt(i14));
+                                            i13 += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%".indexOf(this.f1414c.charAt(i14));
                                         }
                                         if (sb.charAt(length2) == "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%".charAt(i13 % 43)) {
                                             sb.setLength(length2);
diff --git a/app/src/main/java/c/i/e/q/d.java b/app/src/main/java/c/i/e/q/d.java
index 65cdd93232..bff87c3763 100644
--- a/app/src/main/java/c/i/e/q/d.java
+++ b/app/src/main/java/c/i/e/q/d.java
@@ -13,14 +13,14 @@ public final class d extends k {
     public static final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f1420c;
+    public static final int f1415c;
     public final StringBuilder d = new StringBuilder(20);
     public final int[] e = new int[6];
 
     static {
         int[] iArr = {276, 328, 324, 322, 296, 292, 290, 336, 274, 266, 424, 420, 418, 404, 402, 394, 360, 356, 354, 308, 282, 344, 332, 326, 300, 278, 436, 434, 428, 422, 406, 410, 364, 358, 310, 314, 302, 468, 466, 458, 366, 374, 430, 294, 474, 470, 306, 350};
         b = iArr;
-        f1420c = iArr[47];
+        f1415c = iArr[47];
     }
 
     public static void g(CharSequence charSequence, int i, int i2) throws ChecksumException {
@@ -277,7 +277,7 @@ public final class d extends k {
             } else {
                 if (i4 != length - 1) {
                     i4++;
-                } else if (h(iArr) == f1420c) {
+                } else if (h(iArr) == f1415c) {
                     int[] iArr2 = {i3, f2};
                     int f3 = aVar.f(iArr2[1]);
                     int i5 = aVar.j;
diff --git a/app/src/main/java/c/i/e/q/e.java b/app/src/main/java/c/i/e/q/e.java
index 682d424f93..ef00154b7a 100644
--- a/app/src/main/java/c/i/e/q/e.java
+++ b/app/src/main/java/c/i/e/q/e.java
@@ -33,7 +33,7 @@ public final class e extends p {
                 int[] iArr3 = p.b;
                 int i7 = p.l(aVar, i2, true, iArr3, new int[iArr3.length])[1];
                 for (int i8 = 0; i8 < 6 && i7 < i; i8++) {
-                    sb.append((char) (p.h(aVar, iArr2, i7, p.f1424c) + 48));
+                    sb.append((char) (p.h(aVar, iArr2, i7, p.f1419c) + 48));
                     for (int i9 : iArr2) {
                         i7 += i9;
                     }
diff --git a/app/src/main/java/c/i/e/q/f.java b/app/src/main/java/c/i/e/q/f.java
index 2c6a5195fe..f15242ca8c 100644
--- a/app/src/main/java/c/i/e/q/f.java
+++ b/app/src/main/java/c/i/e/q/f.java
@@ -16,7 +16,7 @@ public final class f extends p {
         int i = aVar.j;
         int i2 = iArr[1];
         for (int i3 = 0; i3 < 4 && i2 < i; i3++) {
-            sb.append((char) (p.h(aVar, iArr2, i2, p.f1424c) + 48));
+            sb.append((char) (p.h(aVar, iArr2, i2, p.f1419c) + 48));
             for (int i4 : iArr2) {
                 i2 += i4;
             }
@@ -24,7 +24,7 @@ public final class f extends p {
         int[] iArr3 = p.b;
         int i5 = p.l(aVar, i2, true, iArr3, new int[iArr3.length])[1];
         for (int i6 = 0; i6 < 4 && i5 < i; i6++) {
-            sb.append((char) (p.h(aVar, iArr2, i5, p.f1424c) + 48));
+            sb.append((char) (p.h(aVar, iArr2, i5, p.f1419c) + 48));
             for (int i7 : iArr2) {
                 i5 += i7;
             }
diff --git a/app/src/main/java/c/i/e/q/h.java b/app/src/main/java/c/i/e/q/h.java
index 173dae54ec..cef9165799 100644
--- a/app/src/main/java/c/i/e/q/h.java
+++ b/app/src/main/java/c/i/e/q/h.java
@@ -13,7 +13,7 @@ public final class h extends k {
     public static final int[] b = {1, 1, 1, 1};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[][] f1421c = {new int[]{1, 1, 2}, new int[]{1, 1, 3}};
+    public static final int[][] f1416c = {new int[]{1, 1, 2}, new int[]{1, 1, 3}};
     public static final int[][] d = {new int[]{1, 1, 2, 2, 1}, new int[]{2, 1, 1, 1, 2}, new int[]{1, 2, 1, 1, 2}, new int[]{2, 2, 1, 1, 1}, new int[]{1, 1, 2, 1, 2}, new int[]{2, 1, 2, 1, 1}, new int[]{1, 2, 2, 1, 1}, new int[]{1, 1, 1, 2, 2}, new int[]{2, 1, 1, 2, 1}, new int[]{1, 2, 1, 2, 1}, new int[]{1, 1, 3, 3, 1}, new int[]{3, 1, 1, 1, 3}, new int[]{1, 3, 1, 1, 3}, new int[]{3, 3, 1, 1, 1}, new int[]{1, 1, 3, 1, 3}, new int[]{3, 1, 3, 1, 1}, new int[]{1, 3, 3, 1, 1}, new int[]{1, 1, 1, 3, 3}, new int[]{3, 1, 1, 3, 1}, new int[]{1, 3, 1, 3, 1}};
     public int e = -1;
 
@@ -84,9 +84,9 @@ public final class h extends k {
                 int f2 = aVar.f(0);
                 if (f2 != i3) {
                     try {
-                        iArr = h(aVar, f2, f1421c[0]);
+                        iArr = h(aVar, f2, f1416c[0]);
                     } catch (NotFoundException unused) {
-                        iArr = h(aVar, f2, f1421c[1]);
+                        iArr = h(aVar, f2, f1416c[1]);
                     }
                     i(aVar, iArr[0]);
                     int i4 = iArr[0];
diff --git a/app/src/main/java/c/i/e/q/j.java b/app/src/main/java/c/i/e/q/j.java
index f4bb5f56dc..8faec8c52c 100644
--- a/app/src/main/java/c/i/e/q/j.java
+++ b/app/src/main/java/c/i/e/q/j.java
@@ -54,7 +54,7 @@ public final class j extends k {
                         if (z3 || !z2) {
                             return k;
                         }
-                        Result result = new Result(k.a.substring(1), k.b, k.f2367c, aVar2);
+                        Result result = new Result(k.a.substring(1), k.b, k.f2373c, aVar2);
                         result.a(k.e);
                         return result;
                     }
diff --git a/app/src/main/java/c/i/e/q/k.java b/app/src/main/java/c/i/e/q/k.java
index 48554c36c8..0712d2f15d 100644
--- a/app/src/main/java/c/i/e/q/k.java
+++ b/app/src/main/java/c/i/e/q/k.java
@@ -112,7 +112,7 @@ public abstract class k implements i {
                 i = (((Integer) map2.get(jVar)).intValue() + 270) % 360;
             }
             c2.b(jVar, Integer.valueOf(i));
-            c.i.e.k[] kVarArr = c2.f2367c;
+            c.i.e.k[] kVarArr = c2.f2373c;
             if (kVarArr != null) {
                 int i2 = d.b;
                 for (int i3 = 0; i3 < kVarArr.length; i3++) {
@@ -170,7 +170,7 @@ public abstract class k implements i {
                                 Result b = kVar.b(i10, aVar, enumMap);
                                 if (i11 != i4) {
                                     b.b(j.ORIENTATION, 180);
-                                    c.i.e.k[] kVarArr = b.f2367c;
+                                    c.i.e.k[] kVarArr = b.f2373c;
                                     if (kVarArr != null) {
                                         float f = (float) i2;
                                         map2 = enumMap;
diff --git a/app/src/main/java/c/i/e/q/l.java b/app/src/main/java/c/i/e/q/l.java
index efc8120061..e0eab8a807 100644
--- a/app/src/main/java/c/i/e/q/l.java
+++ b/app/src/main/java/c/i/e/q/l.java
@@ -16,7 +16,7 @@ public final class l extends p {
     public static Result o(Result result) throws FormatException {
         String str = result.a;
         if (str.charAt(0) == '0') {
-            Result result2 = new Result(str.substring(1), null, result.f2367c, a.UPC_A);
+            Result result2 = new Result(str.substring(1), null, result.f2373c, a.UPC_A);
             Map<j, Object> map = result.e;
             if (map != null) {
                 result2.a(map);
diff --git a/app/src/main/java/c/i/e/q/n.java b/app/src/main/java/c/i/e/q/n.java
index 3dadc6ecd3..89f5b8a704 100644
--- a/app/src/main/java/c/i/e/q/n.java
+++ b/app/src/main/java/c/i/e/q/n.java
@@ -12,7 +12,7 @@ public final class n {
     public final int[] b = new int[4];
 
     /* renamed from: c  reason: collision with root package name */
-    public final StringBuilder f1422c = new StringBuilder();
+    public final StringBuilder f1417c = new StringBuilder();
 
     /* JADX WARNING: Removed duplicated region for block: B:60:0x0121  */
     /* JADX WARNING: Removed duplicated region for block: B:63:0x0153  */
@@ -20,7 +20,7 @@ public final class n {
         EnumMap enumMap;
         String str;
         String str2;
-        StringBuilder sb = this.f1422c;
+        StringBuilder sb = this.f1417c;
         sb.setLength(0);
         int[] iArr2 = this.b;
         iArr2[0] = 0;
diff --git a/app/src/main/java/c/i/e/q/o.java b/app/src/main/java/c/i/e/q/o.java
index a0a74846d2..31d5481975 100644
--- a/app/src/main/java/c/i/e/q/o.java
+++ b/app/src/main/java/c/i/e/q/o.java
@@ -13,14 +13,14 @@ public final class o {
     public final m b = new m();
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f1423c = new n();
+    public final n f1418c = new n();
 
     public Result a(int i, a aVar, int i2) throws NotFoundException {
         EnumMap enumMap;
         int[] iArr = a;
         int[] l = p.l(aVar, i2, false, iArr, new int[iArr.length]);
         try {
-            return this.f1423c.a(i, aVar, l);
+            return this.f1418c.a(i, aVar, l);
         } catch (ReaderException unused) {
             m mVar = this.b;
             StringBuilder sb = mVar.b;
diff --git a/app/src/main/java/c/i/e/q/p.java b/app/src/main/java/c/i/e/q/p.java
index 18a1c4d0ff..f757563ad5 100644
--- a/app/src/main/java/c/i/e/q/p.java
+++ b/app/src/main/java/c/i/e/q/p.java
@@ -18,7 +18,7 @@ public abstract class p extends k {
     public static final int[] b = {1, 1, 1, 1, 1};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[][] f1424c;
+    public static final int[][] f1419c;
     public static final int[][] d;
     public final StringBuilder e = new StringBuilder(20);
     public final o f = new o();
@@ -26,12 +26,12 @@ public abstract class p extends k {
 
     static {
         int[][] iArr = {new int[]{3, 2, 1, 1}, new int[]{2, 2, 2, 1}, new int[]{2, 1, 2, 2}, new int[]{1, 4, 1, 1}, new int[]{1, 1, 3, 2}, new int[]{1, 2, 3, 1}, new int[]{1, 1, 1, 4}, new int[]{1, 3, 1, 2}, new int[]{1, 2, 1, 3}, new int[]{3, 1, 1, 2}};
-        f1424c = iArr;
+        f1419c = iArr;
         int[][] iArr2 = new int[20][];
         d = iArr2;
         System.arraycopy(iArr, 0, iArr2, 0, 10);
         for (int i = 10; i < 20; i++) {
-            int[] iArr3 = f1424c[i - 10];
+            int[] iArr3 = f1419c[i - 10];
             int[] iArr4 = new int[iArr3.length];
             for (int i2 = 0; i2 < iArr3.length; i2++) {
                 iArr4[i2] = iArr3[(iArr3.length - i2) - 1];
@@ -187,15 +187,15 @@ public abstract class p extends k {
                 Result a2 = this.f.a(i, aVar, i3[1]);
                 result.b(j.UPC_EAN_EXTENSION, a2.a);
                 result.a(a2.e);
-                k[] kVarArr = a2.f2367c;
-                k[] kVarArr2 = result.f2367c;
+                k[] kVarArr = a2.f2373c;
+                k[] kVarArr2 = result.f2373c;
                 if (kVarArr2 == null) {
-                    result.f2367c = kVarArr;
+                    result.f2373c = kVarArr;
                 } else if (kVarArr != null && kVarArr.length > 0) {
                     k[] kVarArr3 = new k[(kVarArr2.length + kVarArr.length)];
                     System.arraycopy(kVarArr2, 0, kVarArr3, 0, kVarArr2.length);
                     System.arraycopy(kVarArr, 0, kVarArr3, kVarArr2.length, kVarArr.length);
-                    result.f2367c = kVarArr3;
+                    result.f2373c = kVarArr3;
                 }
                 i2 = a2.a.length();
             } catch (ReaderException unused) {
diff --git a/app/src/main/java/c/i/e/q/r/a.java b/app/src/main/java/c/i/e/q/r/a.java
index c8ba9fa5a3..81e7fa4780 100644
--- a/app/src/main/java/c/i/e/q/r/a.java
+++ b/app/src/main/java/c/i/e/q/r/a.java
@@ -8,7 +8,7 @@ public abstract class a extends k {
     public final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final float[] f1425c;
+    public final float[] f1420c;
     public final float[] d;
     public final int[] e;
     public final int[] f;
@@ -16,7 +16,7 @@ public abstract class a extends k {
     public a() {
         int[] iArr = new int[8];
         this.b = iArr;
-        this.f1425c = new float[4];
+        this.f1420c = new float[4];
         this.d = new float[4];
         this.e = new int[(iArr.length / 2)];
         this.f = new int[(iArr.length / 2)];
diff --git a/app/src/main/java/c/i/e/q/r/c.java b/app/src/main/java/c/i/e/q/r/c.java
index 119c48a1ce..1c536cb4ad 100644
--- a/app/src/main/java/c/i/e/q/r/c.java
+++ b/app/src/main/java/c/i/e/q/r/c.java
@@ -7,13 +7,13 @@ public final class c {
     public final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final k[] f1426c;
+    public final k[] f1421c;
 
     public c(int i, int[] iArr, int i2, int i3, int i4) {
         this.a = i;
         this.b = iArr;
         float f = (float) i4;
-        this.f1426c = new k[]{new k((float) i2, f), new k((float) i3, f)};
+        this.f1421c = new k[]{new k((float) i2, f), new k((float) i3, f)};
     }
 
     public boolean equals(Object obj) {
diff --git a/app/src/main/java/c/i/e/q/r/d.java b/app/src/main/java/c/i/e/q/r/d.java
index 4b22cf4df4..5982e93d1e 100644
--- a/app/src/main/java/c/i/e/q/r/d.java
+++ b/app/src/main/java/c/i/e/q/r/d.java
@@ -3,11 +3,11 @@ package c.i.e.q.r;
 public final class d extends b {
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1427c;
+    public final c f1422c;
     public int d;
 
     public d(int i, int i2, c cVar) {
         super(i, i2);
-        this.f1427c = cVar;
+        this.f1422c = cVar;
     }
 }
diff --git a/app/src/main/java/c/i/e/q/r/e.java b/app/src/main/java/c/i/e/q/r/e.java
index b14ae86e79..7766a18ae2 100644
--- a/app/src/main/java/c/i/e/q/r/e.java
+++ b/app/src/main/java/c/i/e/q/r/e.java
@@ -56,7 +56,7 @@ public final class e extends a {
                 for (d dVar2 : this.o) {
                     if (dVar2.d > 1) {
                         int i3 = ((dVar2.b * 16) + dVar.b) % 79;
-                        int i4 = (dVar.f1427c.a * 9) + dVar2.f1427c.a;
+                        int i4 = (dVar.f1422c.a * 9) + dVar2.f1422c.a;
                         if (i4 > 72) {
                             i4--;
                         }
@@ -83,8 +83,8 @@ public final class e extends a {
                                 i7 = 0;
                             }
                             sb.append(i7);
-                            k[] kVarArr = dVar.f1427c.f1426c;
-                            k[] kVarArr2 = dVar2.f1427c.f1426c;
+                            k[] kVarArr = dVar.f1422c.f1421c;
+                            k[] kVarArr2 = dVar2.f1422c.f1421c;
                             return new Result(sb.toString(), null, new k[]{kVarArr[0], kVarArr[1], kVarArr2[0], kVarArr2[1]}, c.i.e.a.RSS_14);
                         }
                     }
@@ -143,7 +143,7 @@ public final class e extends a {
         float j02 = ((float) c.j0(iArr)) / ((float) i5);
         int[] iArr2 = this.e;
         int[] iArr3 = this.f;
-        float[] fArr = this.f1425c;
+        float[] fArr = this.f1420c;
         float[] fArr2 = this.d;
         for (int i6 = 0; i6 < iArr.length; i6++) {
             float f = ((float) iArr[i6]) / j02;
@@ -243,17 +243,17 @@ public final class e extends a {
             z3 = true;
             if (z4) {
                 if (!z3) {
-                    a.h(this.e, this.f1425c);
+                    a.h(this.e, this.f1420c);
                 } else {
                     throw NotFoundException.k;
                 }
             }
             if (z3) {
-                a.g(this.e, this.f1425c);
+                a.g(this.e, this.f1420c);
             }
             if (z5) {
                 if (!z6) {
-                    a.h(this.f, this.f1425c);
+                    a.h(this.f, this.f1420c);
                 } else {
                     throw NotFoundException.k;
                 }
diff --git a/app/src/main/java/c/i/e/q/r/f/a.java b/app/src/main/java/c/i/e/q/r/f/a.java
index 25a721b90f..ec0e90799c 100644
--- a/app/src/main/java/c/i/e/q/r/f/a.java
+++ b/app/src/main/java/c/i/e/q/r/f/a.java
@@ -8,12 +8,12 @@ public final class a {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1428c;
+    public final c f1423c;
 
     public a(b bVar, b bVar2, c cVar, boolean z2) {
         this.a = bVar;
         this.b = bVar2;
-        this.f1428c = cVar;
+        this.f1423c = cVar;
     }
 
     public static boolean a(Object obj, Object obj2) {
@@ -32,11 +32,11 @@ public final class a {
             return false;
         }
         a aVar = (a) obj;
-        return a(this.a, aVar.a) && a(this.b, aVar.b) && a(this.f1428c, aVar.f1428c);
+        return a(this.a, aVar.a) && a(this.b, aVar.b) && a(this.f1423c, aVar.f1423c);
     }
 
     public int hashCode() {
-        return (b(this.a) ^ b(this.b)) ^ b(this.f1428c);
+        return (b(this.a) ^ b(this.b)) ^ b(this.f1423c);
     }
 
     public String toString() {
@@ -45,7 +45,7 @@ public final class a {
         sb.append(" , ");
         sb.append(this.b);
         sb.append(" : ");
-        c cVar = this.f1428c;
+        c cVar = this.f1423c;
         sb.append(cVar == null ? "null" : Integer.valueOf(cVar.a));
         sb.append(" ]");
         return sb.toString();
diff --git a/app/src/main/java/c/i/e/q/r/f/b.java b/app/src/main/java/c/i/e/q/r/f/b.java
index 3ebb38f708..92690e97e1 100644
--- a/app/src/main/java/c/i/e/q/r/f/b.java
+++ b/app/src/main/java/c/i/e/q/r/f/b.java
@@ -9,12 +9,12 @@ public final class b {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1429c;
+    public final boolean f1424c;
 
     public b(List<a> list, int i, boolean z2) {
         this.a = new ArrayList(list);
         this.b = i;
-        this.f1429c = z2;
+        this.f1424c = z2;
     }
 
     public boolean equals(Object obj) {
@@ -22,11 +22,11 @@ public final class b {
             return false;
         }
         b bVar = (b) obj;
-        return this.a.equals(bVar.a) && this.f1429c == bVar.f1429c;
+        return this.a.equals(bVar.a) && this.f1424c == bVar.f1424c;
     }
 
     public int hashCode() {
-        return this.a.hashCode() ^ Boolean.valueOf(this.f1429c).hashCode();
+        return this.a.hashCode() ^ Boolean.valueOf(this.f1424c).hashCode();
     }
 
     public String toString() {
diff --git a/app/src/main/java/c/i/e/q/r/f/c.java b/app/src/main/java/c/i/e/q/r/f/c.java
index 9e1719d5d9..3eda120eb7 100644
--- a/app/src/main/java/c/i/e/q/r/f/c.java
+++ b/app/src/main/java/c/i/e/q/r/f/c.java
@@ -113,8 +113,8 @@ public final class c extends a {
             }
         }
         String a = jVar.a();
-        c.i.e.k[] kVarArr = list.get(0).f1428c.f1426c;
-        c.i.e.k[] kVarArr2 = list.get(list.size() - 1).f1428c.f1426c;
+        c.i.e.k[] kVarArr = list.get(0).f1423c.f1421c;
+        c.i.e.k[] kVarArr2 = list.get(list.size() - 1).f1423c.f1421c;
         return new Result(a, null, new c.i.e.k[]{kVarArr[0], kVarArr[1], kVarArr2[0], kVarArr2[1]}, c.i.e.a.RSS_EXPANDED);
     }
 
@@ -188,7 +188,7 @@ public final class c extends a {
                         if (i4 >= list2.size()) {
                             z2 = true;
                             break;
-                        } else if (list2.get(i4).f1428c.a != iArr2[i4]) {
+                        } else if (list2.get(i4).f1423c.a != iArr2[i4]) {
                             z2 = false;
                             break;
                         } else {
@@ -278,7 +278,7 @@ public final class c extends a {
         if (Math.abs(j02 - f) / f <= 0.3f) {
             int[] iArr3 = this.e;
             int[] iArr4 = this.f;
-            float[] fArr = this.f1425c;
+            float[] fArr = this.f1420c;
             float[] fArr2 = this.d;
             for (int i6 = 0; i6 < iArr.length; i6++) {
                 float f2 = (((float) iArr[i6]) * 1.0f) / j02;
@@ -378,17 +378,17 @@ public final class c extends a {
                 z4 = true;
                 if (z5) {
                     if (!z4) {
-                        a.h(this.e, this.f1425c);
+                        a.h(this.e, this.f1420c);
                     } else {
                         throw NotFoundException.k;
                     }
                 }
                 if (z4) {
-                    a.g(this.e, this.f1425c);
+                    a.g(this.e, this.f1420c);
                 }
                 if (z7) {
                     if (!z6) {
-                        a.h(this.f, this.f1425c);
+                        a.h(this.f, this.f1420c);
                     } else {
                         throw NotFoundException.k;
                     }
@@ -601,7 +601,7 @@ public final class c extends a {
             iArr[i7] = i8;
             iArr[3] = i8;
             int i10 = aVar.j;
-            int i11 = i9 >= 0 ? i9 : list.isEmpty() ? 0 : list.get(list.size() - 1).f1428c.b[1];
+            int i11 = i9 >= 0 ? i9 : list.isEmpty() ? 0 : list.get(list.size() - 1).f1423c.b[1];
             boolean z4 = list.size() % i7 != 0;
             if (this.p) {
                 z4 = !z4;
diff --git a/app/src/main/java/c/i/e/q/r/f/d/e.java b/app/src/main/java/c/i/e/q/r/f/d/e.java
index a01d56796e..95cfc0b7de 100644
--- a/app/src/main/java/c/i/e/q/r/f/d/e.java
+++ b/app/src/main/java/c/i/e/q/r/f/d/e.java
@@ -6,12 +6,12 @@ import com.google.zxing.NotFoundException;
 public final class e extends i {
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1430c;
+    public final String f1425c;
     public final String d;
 
     public e(a aVar, String str, String str2) {
         super(aVar);
-        this.f1430c = str2;
+        this.f1425c = str2;
         this.d = str;
     }
 
@@ -24,7 +24,7 @@ public final class e extends i {
             int d = s.d(this.b.a, 68, 16);
             if (d != 38400) {
                 sb.append('(');
-                sb.append(this.f1430c);
+                sb.append(this.f1425c);
                 sb.append(')');
                 int i = d % 32;
                 int i2 = d / 32;
diff --git a/app/src/main/java/c/i/e/q/r/f/d/o.java b/app/src/main/java/c/i/e/q/r/f/d/o.java
index 1bd4b91841..c8f189c1ae 100644
--- a/app/src/main/java/c/i/e/q/r/f/d/o.java
+++ b/app/src/main/java/c/i/e/q/r/f/d/o.java
@@ -4,20 +4,20 @@ public final class o extends q {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1431c;
+    public final int f1426c;
     public final boolean d;
 
     public o(int i, String str) {
         super(i);
         this.b = str;
         this.d = false;
-        this.f1431c = 0;
+        this.f1426c = 0;
     }
 
     public o(int i, String str, int i2) {
         super(i);
         this.d = true;
-        this.f1431c = i2;
+        this.f1426c = i2;
         this.b = str;
     }
 }
diff --git a/app/src/main/java/c/i/e/q/r/f/d/p.java b/app/src/main/java/c/i/e/q/r/f/d/p.java
index b9bbe520e4..7eed4cd616 100644
--- a/app/src/main/java/c/i/e/q/r/f/d/p.java
+++ b/app/src/main/java/c/i/e/q/r/f/d/p.java
@@ -6,7 +6,7 @@ public final class p extends q {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1432c;
+    public final int f1427c;
 
     public p(int i, int i2, int i3) throws FormatException {
         super(i);
@@ -14,6 +14,6 @@ public final class p extends q {
             throw FormatException.a();
         }
         this.b = i2;
-        this.f1432c = i3;
+        this.f1427c = i3;
     }
 }
diff --git a/app/src/main/java/c/i/e/q/r/f/d/r.java b/app/src/main/java/c/i/e/q/r/f/d/r.java
index 5b2a8410e1..97ab8e56f9 100644
--- a/app/src/main/java/c/i/e/q/r/f/d/r.java
+++ b/app/src/main/java/c/i/e/q/r/f/d/r.java
@@ -8,7 +8,7 @@ public final class r {
     public static final Object[][] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Object[][] f1433c;
+    public static final Object[][] f1428c;
     public static final Object[][] d;
     public static final Object[][] e;
 
@@ -16,7 +16,7 @@ public final class r {
         Object obj = new Object();
         a = obj;
         b = new Object[][]{new Object[]{"00", 18}, new Object[]{"01", 14}, new Object[]{"02", 14}, new Object[]{"10", obj, 20}, new Object[]{"11", 6}, new Object[]{"12", 6}, new Object[]{"13", 6}, new Object[]{"15", 6}, new Object[]{"17", 6}, new Object[]{"20", 2}, new Object[]{"21", obj, 20}, new Object[]{"22", obj, 29}, new Object[]{"30", obj, 8}, new Object[]{"37", obj, 8}, new Object[]{"90", obj, 30}, new Object[]{"91", obj, 30}, new Object[]{"92", obj, 30}, new Object[]{"93", obj, 30}, new Object[]{"94", obj, 30}, new Object[]{"95", obj, 30}, new Object[]{"96", obj, 30}, new Object[]{"97", obj, 30}, new Object[]{"98", obj, 30}, new Object[]{"99", obj, 30}};
-        f1433c = new Object[][]{new Object[]{"240", obj, 30}, new Object[]{"241", obj, 30}, new Object[]{"242", obj, 6}, new Object[]{"250", obj, 30}, new Object[]{"251", obj, 30}, new Object[]{"253", obj, 17}, new Object[]{"254", obj, 20}, new Object[]{"400", obj, 30}, new Object[]{"401", obj, 30}, new Object[]{"402", 17}, new Object[]{"403", obj, 30}, new Object[]{"410", 13}, new Object[]{"411", 13}, new Object[]{"412", 13}, new Object[]{"413", 13}, new Object[]{"414", 13}, new Object[]{"420", obj, 20}, new Object[]{"421", obj, 15}, new Object[]{"422", 3}, new Object[]{"423", obj, 15}, new Object[]{"424", 3}, new Object[]{"425", 3}, new Object[]{"426", 3}};
+        f1428c = new Object[][]{new Object[]{"240", obj, 30}, new Object[]{"241", obj, 30}, new Object[]{"242", obj, 6}, new Object[]{"250", obj, 30}, new Object[]{"251", obj, 30}, new Object[]{"253", obj, 17}, new Object[]{"254", obj, 20}, new Object[]{"400", obj, 30}, new Object[]{"401", obj, 30}, new Object[]{"402", 17}, new Object[]{"403", obj, 30}, new Object[]{"410", 13}, new Object[]{"411", 13}, new Object[]{"412", 13}, new Object[]{"413", 13}, new Object[]{"414", 13}, new Object[]{"420", obj, 20}, new Object[]{"421", obj, 15}, new Object[]{"422", 3}, new Object[]{"423", obj, 15}, new Object[]{"424", 3}, new Object[]{"425", 3}, new Object[]{"426", 3}};
         d = new Object[][]{new Object[]{"310", 6}, new Object[]{"311", 6}, new Object[]{"312", 6}, new Object[]{"313", 6}, new Object[]{"314", 6}, new Object[]{"315", 6}, new Object[]{"316", 6}, new Object[]{"320", 6}, new Object[]{"321", 6}, new Object[]{"322", 6}, new Object[]{"323", 6}, new Object[]{"324", 6}, new Object[]{"325", 6}, new Object[]{"326", 6}, new Object[]{"327", 6}, new Object[]{"328", 6}, new Object[]{"329", 6}, new Object[]{"330", 6}, new Object[]{"331", 6}, new Object[]{"332", 6}, new Object[]{"333", 6}, new Object[]{"334", 6}, new Object[]{"335", 6}, new Object[]{"336", 6}, new Object[]{"340", 6}, new Object[]{"341", 6}, new Object[]{"342", 6}, new Object[]{"343", 6}, new Object[]{"344", 6}, new Object[]{"345", 6}, new Object[]{"346", 6}, new Object[]{"347", 6}, new Object[]{"348", 6}, new Object[]{"349", 6}, new Object[]{"350", 6}, new Object[]{"351", 6}, new Object[]{"352", 6}, new Object[]{"353", 6}, new Object[]{"354", 6}, new Object[]{"355", 6}, new Object[]{"356", 6}, new Object[]{"357", 6}, new Object[]{"360", 6}, new Object[]{"361", 6}, new Object[]{"362", 6}, new Object[]{"363", 6}, new Object[]{"364", 6}, new Object[]{"365", 6}, new Object[]{"366", 6}, new Object[]{"367", 6}, new Object[]{"368", 6}, new Object[]{"369", 6}, new Object[]{"390", obj, 15}, new Object[]{"391", obj, 18}, new Object[]{"392", obj, 15}, new Object[]{"393", obj, 18}, new Object[]{"703", obj, 30}};
         e = new Object[][]{new Object[]{"7001", 13}, new Object[]{"7002", obj, 30}, new Object[]{"7003", 10}, new Object[]{"8001", 14}, new Object[]{"8002", obj, 20}, new Object[]{"8003", obj, 30}, new Object[]{"8004", obj, 30}, new Object[]{"8005", 6}, new Object[]{"8006", 18}, new Object[]{"8007", obj, 30}, new Object[]{"8008", obj, 12}, new Object[]{"8018", 18}, new Object[]{"8020", obj, 25}, new Object[]{"8100", 6}, new Object[]{"8101", 10}, new Object[]{"8102", 2}, new Object[]{"8110", obj, 70}, new Object[]{"8200", obj, 70}};
     }
@@ -35,7 +35,7 @@ public final class r {
             }
             if (str.length() >= 3) {
                 String substring2 = str.substring(0, 3);
-                Object[][] objArr3 = f1433c;
+                Object[][] objArr3 = f1428c;
                 for (Object[] objArr4 : objArr3) {
                     if (objArr4[0].equals(substring2)) {
                         return objArr4[1] == a ? c(3, ((Integer) objArr4[2]).intValue(), str) : b(3, ((Integer) objArr4[1]).intValue(), str);
diff --git a/app/src/main/java/c/i/e/q/r/f/d/s.java b/app/src/main/java/c/i/e/q/r/f/d/s.java
index 009a052701..394467e5c6 100644
--- a/app/src/main/java/c/i/e/q/r/f/d/s.java
+++ b/app/src/main/java/c/i/e/q/r/f/d/s.java
@@ -9,7 +9,7 @@ public final class s {
     public final m b = new m();
 
     /* renamed from: c  reason: collision with root package name */
-    public final StringBuilder f1434c = new StringBuilder();
+    public final StringBuilder f1429c = new StringBuilder();
 
     public s(a aVar) {
         this.a = aVar;
@@ -33,7 +33,7 @@ public final class s {
             if (a != null) {
                 sb.append(a);
             }
-            String valueOf = b.d ? String.valueOf(b.f1431c) : null;
+            String valueOf = b.d ? String.valueOf(b.f1426c) : null;
             int i2 = b.a;
             if (i == i2) {
                 return sb.toString();
@@ -73,9 +73,9 @@ public final class s {
         n nVar3;
         char c3;
         n nVar4;
-        this.f1434c.setLength(0);
+        this.f1429c.setLength(0);
         if (str != null) {
-            this.f1434c.append(str);
+            this.f1429c.append(str);
         }
         this.b.a = i;
         int i3 = 2;
@@ -143,9 +143,9 @@ public final class s {
                             mVar2.a = i10;
                             char c4 = nVar3.b;
                             if (c4 == '$') {
-                                lVar = new l(new o(i10, this.f1434c.toString()), true);
+                                lVar = new l(new o(i10, this.f1429c.toString()), true);
                             } else {
-                                this.f1434c.append(c4);
+                                this.f1429c.append(c4);
                             }
                         } else {
                             if (e(this.b.a)) {
@@ -287,9 +287,9 @@ public final class s {
                                 mVar4.a = i18;
                                 char c5 = nVar.b;
                                 if (c5 == '$') {
-                                    lVar = new l(new o(i18, this.f1434c.toString()), true);
+                                    lVar = new l(new o(i18, this.f1429c.toString()), true);
                                 } else {
-                                    this.f1434c.append(c5);
+                                    this.f1429c.append(c5);
                                 }
                             } else {
                                 if (e(this.b.a)) {
@@ -347,14 +347,14 @@ public final class s {
                                 mVar6.a = i28;
                                 int i29 = pVar.b;
                                 if (i29 == 10) {
-                                    lVar = new l(pVar.f1432c == 10 ? new o(i28, this.f1434c.toString()) : new o(i28, this.f1434c.toString(), pVar.f1432c), true);
+                                    lVar = new l(pVar.f1427c == 10 ? new o(i28, this.f1429c.toString()) : new o(i28, this.f1429c.toString(), pVar.f1427c), true);
                                 } else {
-                                    this.f1434c.append(i29);
-                                    int i30 = pVar.f1432c;
+                                    this.f1429c.append(i29);
+                                    int i30 = pVar.f1427c;
                                     if (i30 == 10) {
-                                        lVar = new l(new o(this.b.a, this.f1434c.toString()), true);
+                                        lVar = new l(new o(this.b.a, this.f1429c.toString()), true);
                                     } else {
-                                        this.f1434c.append(i30);
+                                        this.f1429c.append(i30);
                                     }
                                 }
                             } else {
@@ -408,7 +408,7 @@ public final class s {
             i3 = 2;
         }
         o oVar = lVar.a;
-        return (oVar == null || !oVar.d) ? new o(i2, this.f1434c.toString()) : new o(i2, this.f1434c.toString(), oVar.f1431c);
+        return (oVar == null || !oVar.d) ? new o(i2, this.f1429c.toString()) : new o(i2, this.f1429c.toString(), oVar.f1426c);
     }
 
     public int c(int i, int i2) {
diff --git a/app/src/main/java/c/i/e/r/a.java b/app/src/main/java/c/i/e/r/a.java
index 61c8191680..80ac1e2f0b 100644
--- a/app/src/main/java/c/i/e/r/a.java
+++ b/app/src/main/java/c/i/e/r/a.java
@@ -8,14 +8,14 @@ public final class a {
     public static final int[] b = {66142, 66170, 66206, 66236, 66290, 66292, 66350, 66382, 66396, 66454, 66470, 66476, 66594, 66600, 66614, 66626, 66628, 66632, 66640, 66654, 66662, 66668, 66682, 66690, 66718, 66720, 66748, 66758, 66776, 66798, 66802, 66804, 66820, 66824, 66832, 66846, 66848, 66876, 66880, 66936, 66950, 66956, 66968, 66992, 67006, 67022, 67036, 67042, 67044, 67048, 67062, 67118, 67150, 67164, 67214, 67228, 67256, 67294, 67322, 67350, 67366, 67372, 67398, 67404, 67416, 67438, 67474, 67476, 67490, 67492, 67496, 67510, 67618, 67624, 67650, 67656, 67664, 67678, 67686, 67692, 67706, 67714, 67716, 67728, 67742, 67744, 67772, 67782, 67788, 67800, 67822, 67826, 67828, 67842, 67848, 67870, 67872, 67900, 67904, 67960, 67974, 67992, 68016, 68030, 68046, 68060, 68066, 68068, 68072, 68086, 68104, 68112, 68126, 68128, 68156, 68160, 68216, 68336, 68358, 68364, 68376, 68400, 68414, 68448, 68476, 68494, 68508, 68536, 68546, 68548, 68552, 68560, 68574, 68582, 68588, 68654, 68686, 68700, 68706, 68708, 68712, 68726, 68750, 68764, 68792, 68802, 68804, 68808, 68816, 68830, 68838, 68844, 68858, 68878, 68892, 68920, 68976, 68990, 68994, 68996, 69000, 69008, 69022, 69024, 69052, 69062, 69068, 69080, 69102, 69106, 69108, 69142, 69158, 69164, 69190, 69208, 69230, 69254, 69260, 69272, 69296, 69310, 69326, 69340, 69386, 69394, 69396, 69410, 69416, 69430, 69442, 69444, 69448, 69456, 69470, 69478, 69484, 69554, 69556, 69666, 69672, 69698, 69704, 69712, 69726, 69754, 69762, 69764, 69776, 69790, 69792, 69820, 69830, 69836, 69848, 69870, 69874, 69876, 69890, 69918, 69920, 69948, 69952, 70008, 70022, 70040, 70064, 70078, 70094, 70108, 70114, 70116, 70120, 70134, 70152, 70174, 70176, 70264, 70384, 70412, 70448, 70462, 70496, 70524, 70542, 70556, 70584, 70594, 70600, 70608, 70622, 70630, 70636, 70664, 70672, 70686, 70688, 70716, 70720, 70776, 70896, 71136, 71180, 71192, 71216, 71230, 71264, 71292, 71360, 71416, 71452, 71480, 71536, 71550, 71554, 71556, 71560, 71568, 71582, 71584, 71612, 71622, 71628, 71640, 71662, 71726, 71732, 71758, 71772, 71778, 71780, 71784, 71798, 71822, 71836, 71864, 71874, 71880, 71888, 71902, 71910, 71916, 71930, 71950, 71964, 71992, 72048, 72062, 72066, 72068, 72080, 72094, 72096, 72124, 72134, 72140, 72152, 72174, 72178, 72180, 72206, 72220, 72248, 72304, 72318, 72416, 72444, 72456, 72464, 72478, 72480, 72508, 72512, 72568, 72588, 72600, 72624, 72638, 72654, 72668, 72674, 72676, 72680, 72694, 72726, 72742, 72748, 72774, 72780, 72792, 72814, 72838, 72856, 72880, 72894, 72910, 72924, 72930, 72932, 72936, 72950, 72966, 72972, 72984, 73008, 73022, 73056, 73084, 73102, 73116, 73144, 73156, 73160, 73168, 73182, 73190, 73196, 73210, 73226, 73234, 73236, 73250, 73252, 73256, 73270, 73282, 73284, 73296, 73310, 73318, 73324, 73346, 73348, 73352, 73360, 73374, 73376, 73404, 73414, 73420, 73432, 73454, 73498, 73518, 73522, 73524, 73550, 73564, 73570, 73572, 73576, 73590, 73800, 73822, 73858, 73860, 73872, 73886, 73888, 73916, 73944, 73970, 73972, 73992, 74014, 74016, 74044, 74048, 74104, 74118, 74136, 74160, 74174, 74210, 74212, 74216, 74230, 74244, 74256, 74270, 74272, 74360, 74480, 74502, 74508, 74544, 74558, 74592, 74620, 74638, 74652, 74680, 74690, 74696, 74704, 74726, 74732, 74782, 74784, 74812, 74992, 75232, 75288, 75326, 75360, 75388, 75456, 75512, 75576, 75632, 75646, 75650, 75652, 75664, 75678, 75680, 75708, 75718, 75724, 75736, 75758, 75808, 75836, 75840, 75896, 76016, 76256, 76736, 76824, 76848, 76862, 76896, 76924, 76992, 77048, 77296, 77340, 77368, 77424, 77438, 77536, 77564, 77572, 77576, 77584, 77600, 77628, 77632, 77688, 77702, 77708, 77720, 77744, 77758, 77774, 77788, 77870, 77902, 77916, 77922, 77928, 77966, 77980, 78008, 78018, 78024, 78032, 78046, 78060, 78074, 78094, 78136, 78192, 78206, 78210, 78212, 78224, 78238, 78240, 78268, 78278, 78284, 78296, 78322, 78324, 78350, 78364, 78448, 78462, 78560, 78588, 78600, 78622, 78624, 78652, 78656, 78712, 78726, 78744, 78768, 78782, 78798, 78812, 78818, 78820, 78824, 78838, 78862, 78876, 78904, 78960, 78974, 79072, 79100, 79296, 79352, 79368, 79376, 79390, 79392, 79420, 79424, 79480, 79600, 79628, 79640, 79664, 79678, 79712, 79740, 79772, 79800, 79810, 79812, 79816, 79824, 79838, 79846, 79852, 79894, 79910, 79916, 79942, 79948, 79960, 79982, 79988, 80006, 80024, 80048, 80062, 80078, 80092, 80098, 80100, 80104, 80134, 80140, 80176, 80190, 80224, 80252, 80270, 80284, 80312, 80328, 80336, 80350, 80358, 80364, 80378, 80390, 80396, 80408, 80432, 80446, 80480, 80508, 80576, 80632, 80654, 80668, 80696, 80752, 80766, 80776, 80784, 80798, 80800, 80828, 80844, 80856, 80878, 80882, 80884, 80914, 80916, 80930, 80932, 80936, 80950, 80962, 80968, 80976, 80990, 80998, 81004, 81026, 81028, 81040, 81054, 81056, 81084, 81094, 81100, 81112, 81134, 81154, 81156, 81160, 81168, 81182, 81184, 81212, 81216, 81272, 81286, 81292, 81304, 81328, 81342, 81358, 81372, 81380, 81384, 81398, 81434, 81454, 81458, 81460, 81486, 81500, 81506, 81508, 81512, 81526, 81550, 81564, 81592, 81602, 81604, 81608, 81616, 81630, 81638, 81644, 81702, 81708, 81722, 81734, 81740, 81752, 81774, 81778, 81780, 82050, 82078, 82080, 82108, 82180, 82184, 82192, 82206, 82208, 82236, 82240, 82296, 82316, 82328, 82352, 82366, 82402, 82404, 82408, 82440, 82448, 82462, 82464, 82492, 82496, 82552, 82672, 82694, 82700, 82712, 82736, 82750, 82784, 82812, 82830, 82882, 82884, 82888, 82896, 82918, 82924, 82952, 82960, 82974, 82976, 83004, 83008, 83064, 83184, 83424, 83468, 83480, 83504, 83518, 83552, 83580, 83648, 83704, 83740, 83768, 83824, 83838, 83842, 83844, 83848, 83856, 83872, 83900, 83910, 83916, 83928, 83950, 83984, 84000, 84028, 84032, 84088, 84208, 84448, 84928, 85040, 85054, 85088, 85116, 85184, 85240, 85488, 85560, 85616, 85630, 85728, 85756, 85764, 85768, 85776, 85790, 85792, 85820, 85824, 85880, 85894, 85900, 85912, 85936, 85966, 85980, 86048, 86080, 86136, 86256, 86496, 86976, 88160, 88188, 88256, 88312, 88560, 89056, 89200, 89214, 89312, 89340, 89536, 89592, 89608, 89616, 89632, 89664, 89720, 89840, 89868, 89880, 89904, 89952, 89980, 89998, 90012, 90040, 90190, 90204, 90254, 90268, 90296, 90306, 90308, 90312, 90334, 90382, 90396, 90424, 90480, 90494, 90500, 90504, 90512, 90526, 90528, 90556, 90566, 90572, 90584, 90610, 90612, 90638, 90652, 90680, 90736, 90750, 90848, 90876, 90884, 90888, 90896, 90910, 90912, 90940, 90944, 91000, 91014, 91020, 91032, 91056, 91070, 91086, 91100, 91106, 91108, 91112, 91126, 91150, 91164, 91192, 91248, 91262, 91360, 91388, 91584, 91640, 91664, 91678, 91680, 91708, 91712, 91768, 91888, 91928, 91952, 91966, 92000, 92028, 92046, 92060, 92088, 92098, 92100, 92104, 92112, 92126, 92134, 92140, 92188, 92216, 92272, 92384, 92412, 92608, 92664, 93168, 93200, 93214, 93216, 93244, 93248, 93304, 93424, 93664, 93720, 93744, 93758, 93792, 93820, 93888, 93944, 93980, 94008, 94064, 94078, 94084, 94088, 94096, 94110, 94112, 94140, 94150, 94156, 94168, 94246, 94252, 94278, 94284, 94296, 94318, 94342, 94348, 94360, 94384, 94398, 94414, 94428, 94440, 94470, 94476, 94488, 94512, 94526, 94560, 94588, 94606, 94620, 94648, 94658, 94660, 94664, 94672, 94686, 94694, 94700, 94714, 94726, 94732, 94744, 94768, 94782, 94816, 94844, 94912, 94968, 94990, 95004, 95032, 95088, 95102, 95112, 95120, 95134, 95136, 95164, 95180, 95192, 95214, 95218, 95220, 95244, 95256, 95280, 95294, 95328, 95356, 95424, 95480, 95728, 95758, 95772, 95800, 95856, 95870, 95968, 95996, 96008, 96016, 96030, 96032, 96060, 96064, 96120, 96152, 96176, 96190, 96220, 96226, 96228, 96232, 96290, 96292, 96296, 96310, 96322, 96324, 96328, 96336, 96350, 96358, 96364, 96386, 96388, 96392, 96400, 96414, 96416, 96444, 96454, 96460, 96472, 96494, 96498, 96500, 96514, 96516, 96520, 96528, 96542, 96544, 96572, 96576, 96632, 96646, 96652, 96664, 96688, 96702, 96718, 96732, 96738, 96740, 96744, 96758, 96772, 96776, 96784, 96798, 96800, 96828, 96832, 96888, 97008, 97030, 97036, 97048, 97072, 97086, 97120, 97148, 97166, 97180, 97208, 97220, 97224, 97232, 97246, 97254, 97260, 97326, 97330, 97332, 97358, 97372, 97378, 97380, 97384, 97398, 97422, 97436, 97464, 97474, 97476, 97480, 97488, 97502, 97510, 97516, 97550, 97564, 97592, 97648, 97666, 97668, 97672, 97680, 97694, 97696, 97724, 97734, 97740, 97752, 97774, 97830, 97836, 97850, 97862, 97868, 97880, 97902, 97906, 97908, 97926, 97932, 97944, 97968, 97998, 98012, 98018, 98020, 98024, 98038, 98618, 98674, 98676, 98838, 98854, 98874, 98892, 98904, 98926, 98930, 98932, 98968, 99006, 99042, 99044, 99048, 99062, 99166, 99194, 99246, 99286, 99350, 99366, 99372, 99386, 99398, 99416, 99438, 99442, 99444, 99462, 99504, 99518, 99534, 99548, 99554, 99556, 99560, 99574, 99590, 99596, 99608, 99632, 99646, 99680, 99708, 99726, 99740, 99768, 99778, 99780, 99784, 99792, 99806, 99814, 99820, 99834, 99858, 99860, 99874, 99880, 99894, 99906, 99920, 99934, 99962, 99970, 99972, 99976, 99984, 99998, 100000, 100028, 100038, 100044, 100056, 100078, 100082, 100084, 100142, 100174, 100188, 100246, 100262, 100268, 100306, 100308, 100390, 100396, 100410, 100422, 100428, 100440, 100462, 100466, 100468, 100486, 100504, 100528, 100542, 100558, 100572, 100578, 100580, 100584, 100598, 100620, 100656, 100670, 100704, 100732, 100750, 100792, 100802, 100808, 100816, 100830, 100838, 100844, 100858, 100888, 100912, 100926, 100960, 100988, 101056, 101112, 101148, 101176, 101232, 101246, 101250, 101252, 101256, 101264, 101278, 101280, 101308, 101318, 101324, 101336, 101358, 101362, 101364, 101410, 101412, 101416, 101430, 101442, 101448, 101456, 101470, 101478, 101498, 101506, 101508, 101520, 101534, 101536, 101564, 101580, 101618, 101620, 101636, 101640, 101648, 101662, 101664, 101692, 101696, 101752, 101766, 101784, 101838, 101858, 101860, 101864, 101934, 101938, 101940, 101966, 101980, 101986, 101988, 101992, 102030, 102044, 102072, 102082, 102084, 102088, 102096, 102138, 102166, 102182, 102188, 102214, 102220, 102232, 102254, 102282, 102290, 102292, 102306, 102308, 102312, 102326, 102444, 102458, 102470, 102476, 102488, 102514, 102516, 102534, 102552, 102576, 102590, 102606, 102620, 102626, 102632, 102646, 102662, 102668, 102704, 102718, 102752, 102780, 102798, 102812, 102840, 102850, 102856, 102864, 102878, 102886, 102892, 102906, 102936, 102974, 103008, 103036, 103104, 103160, 103224, 103280, 103294, 103298, 103300, 103312, 103326, 103328, 103356, 103366, 103372, 103384, 103406, 103410, 103412, 103472, 103486, 103520, 103548, 103616, 103672, 103920, 103992, 104048, 104062, 104160, 104188, 104194, 104196, 104200, 104208, 104224, 104252, 104256, 104312, 104326, 104332, 104344, 104368, 104382, 104398, 104412, 104418, 104420, 104424, 104482, 104484, 104514, 104520, 104528, 104542, 104550, 104570, 104578, 104580, 104592, 104606, 104608, 104636, 104652, 104690, 104692, 104706, 104712, 104734, 104736, 104764, 104768, 104824, 104838, 104856, 104910, 104930, 104932, 104936, 104968, 104976, 104990, 104992, 105020, 105024, 105080, 105200, 105240, 105278, 105312, 105372, 105410, 105412, 105416, 105424, 105446, 105518, 105524, 105550, 105564, 105570, 105572, 105576, 105614, 105628, 105656, 105666, 105672, 105680, 105702, 105722, 105742, 105756, 105784, 105840, 105854, 105858, 105860, 105864, 105872, 105888, 105932, 105970, 105972, 106006, 106022, 106028, 106054, 106060, 106072, 106100, 106118, 106124, 106136, 106160, 106174, 106190, 106210, 106212, 106216, 106250, 106258, 106260, 106274, 106276, 106280, 106306, 106308, 106312, 106320, 106334, 106348, 106394, 106414, 106418, 106420, 106566, 106572, 106610, 106612, 106630, 106636, 106648, 106672, 106686, 106722, 106724, 106728, 106742, 106758, 106764, 106776, 106800, 106814, 106848, 106876, 106894, 106908, 106936, 106946, 106948, 106952, 106960, 106974, 106982, 106988, 107032, 107056, 107070, 107104, 107132, 107200, 107256, 107292, 107320, 107376, 107390, 107394, 107396, 107400, 107408, 107422, 107424, 107452, 107462, 107468, 107480, 107502, 107506, 107508, 107544, 107568, 107582, 107616, 107644, 107712, 107768, 108016, 108060, 108088, 108144, 108158, 108256, 108284, 108290, 108292, 108296, 108304, 108318, 108320, 108348, 108352, 108408, 108422, 108428, 108440, 108464, 108478, 108494, 108508, 108514, 108516, 108520, 108592, 108640, 108668, 108736, 108792, 109040, 109536, 109680, 109694, 109792, 109820, 110016, 110072, 110084, 110088, 110096, 110112, 110140, 110144, 110200, 110320, 110342, 110348, 110360, 110384, 110398, 110432, 110460, 110478, 110492, 110520, 110532, 110536, 110544, 110558, 110658, 110686, 110714, 110722, 110724, 110728, 110736, 110750, 110752, 110780, 110796, 110834, 110836, 110850, 110852, 110856, 110864, 110878, 110880, 110908, 110912, 110968, 110982, 111000, 111054, 111074, 111076, 111080, 111108, 111112, 111120, 111134, 111136, 111164, 111168, 111224, 111344, 111372, 111422, 111456, 111516, 111554, 111556, 111560, 111568, 111590, 111632, 111646, 111648, 111676, 111680, 111736, 111856, 112096, 112152, 112224, 112252, 112320, 112440, 112514, 112516, 112520, 112528, 112542, 112544, 112588, 112686, 112718, 112732, 112782, 112796, 112824, 112834, 112836, 112840, 112848, 112870, 112890, 112910, 112924, 112952, 113008, 113022, 113026, 113028, 113032, 113040, 113054, 113056, 113100, 113138, 113140, 113166, 113180, 113208, 113264, 113278, 113376, 113404, 113416, 113424, 113440, 113468, 113472, 113560, 113614, 113634, 113636, 113640, 113686, 113702, 113708, 113734, 113740, 113752, 113778, 113780, 113798, 113804, 113816, 113840, 113854, 113870, 113890, 113892, 113896, 113926, 113932, 113944, 113968, 113982, 114016, 114044, 114076, 114114, 114116, 114120, 114128, 114150, 114170, 114194, 114196, 114210, 114212, 114216, 114242, 114244, 114248, 114256, 114270, 114278, 114306, 114308, 114312, 114320, 114334, 114336, 114364, 114380, 114420, 114458, 114478, 114482, 114484, 114510, 114524, 114530, 114532, 114536, 114842, 114866, 114868, 114970, 114994, 114996, 115042, 115044, 115048, 115062, 115130, 115226, 115250, 115252, 115278, 115292, 115298, 115300, 115304, 115318, 115342, 115394, 115396, 115400, 115408, 115422, 115430, 115436, 115450, 115478, 115494, 115514, 115526, 115532, 115570, 115572, 115738, 115758, 115762, 115764, 115790, 115804, 115810, 115812, 115816, 115830, 115854, 115868, 115896, 115906, 115912, 115920, 115934, 115942, 115948, 115962, 115996, 116024, 116080, 116094, 116098, 116100, 116104, 116112, 116126, 116128, 116156, 116166, 116172, 116184, 116206, 116210, 116212, 116246, 116262, 116268, 116282, 116294, 116300, 116312, 116334, 116338, 116340, 116358, 116364, 116376, 116400, 116414, 116430, 116444, 116450, 116452, 116456, 116498, 116500, 116514, 116520, 116534, 116546, 116548, 116552, 116560, 116574, 116582, 116588, 116602, 116654, 116694, 116714, 116762, 116782, 116786, 116788, 116814, 116828, 116834, 116836, 116840, 116854, 116878, 116892, 116920, 116930, 116936, 116944, 116958, 116966, 116972, 116986, 117006, 117048, 117104, 117118, 117122, 117124, 117136, 117150, 117152, 117180, 117190, 117196, 117208, 117230, 117234, 117236, 117304, 117360, 117374, 117472, 117500, 117506, 117508, 117512, 117520, 117536, 117564, 117568, 117624, 117638, 117644, 117656, 117680, 117694, 117710, 117724, 117730, 117732, 117736, 117750, 117782, 117798, 117804, 117818, 117830, 117848, 117874, 117876, 117894, 117936, 117950, 117966, 117986, 117988, 117992, 118022, 118028, 118040, 118064, 118078, 118112, 118140, 118172, 118210, 118212, 118216, 118224, 118238, 118246, 118266, 118306, 118312, 118338, 118352, 118366, 118374, 118394, 118402, 118404, 118408, 118416, 118430, 118432, 118460, 118476, 118514, 118516, 118574, 118578, 118580, 118606, 118620, 118626, 118628, 118632, 118678, 118694, 118700, 118730, 118738, 118740, 118830, 118834, 118836, 118862, 118876, 118882, 118884, 118888, 118902, 118926, 118940, 118968, 118978, 118980, 118984, 118992, 119006, 119014, 119020, 119034, 119068, 119096, 119152, 119166, 119170, 119172, 119176, 119184, 119198, 119200, 119228, 119238, 119244, 119256, 119278, 119282, 119284, 119324, 119352, 119408, 119422, 119520, 119548, 119554, 119556, 119560, 119568, 119582, 119584, 119612, 119616, 119672, 119686, 119692, 119704, 119728, 119742, 119758, 119772, 119778, 119780, 119784, 119798, 119920, 119934, 120032, 120060, 120256, 120312, 120324, 120328, 120336, 120352, 120384, 120440, 120560, 120582, 120588, 120600, 120624, 120638, 120672, 120700, 120718, 120732, 120760, 120770, 120772, 120776, 120784, 120798, 120806, 120812, 120870, 120876, 120890, 120902, 120908, 120920, 120946, 120948, 120966, 120972, 120984, 121008, 121022, 121038, 121058, 121060, 121064, 121078, 121100, 121112, 121136, 121150, 121184, 121212, 121244, 121282, 121284, 121288, 121296, 121318, 121338, 121356, 121368, 121392, 121406, 121440, 121468, 121536, 121592, 121656, 121730, 121732, 121736, 121744, 121758, 121760, 121804, 121842, 121844, 121890, 121922, 121924, 121928, 121936, 121950, 121958, 121978, 121986, 121988, 121992, 122000, 122014, 122016, 122044, 122060, 122098, 122100, 122116, 122120, 122128, 122142, 122144, 122172, 122176, 122232, 122246, 122264, 122318, 122338, 122340, 122344, 122414, 122418, 122420, 122446, 122460, 122466, 122468, 122472, 122510, 122524, 122552, 122562, 122564, 122568, 122576, 122598, 122618, 122646, 122662, 122668, 122694, 122700, 122712, 122738, 122740, 122762, 122770, 122772, 122786, 122788, 122792, 123018, 123026, 123028, 123042, 123044, 123048, 123062, 123098, 123146, 123154, 123156, 123170, 123172, 123176, 123190, 123202, 123204, 123208, 123216, 123238, 123244, 123258, 123290, 123314, 123316, 123402, 123410, 123412, 123426, 123428, 123432, 123446, 123458, 123464, 123472, 123486, 123494, 123500, 123514, 123522, 123524, 123528, 123536, 123552, 123580, 123590, 123596, 123608, 123630, 123634, 123636, 123674, 123698, 123700, 123740, 123746, 123748, 123752, 123834, 123914, 123922, 123924, 123938, 123944, 123958, 123970, 123976, 123984, 123998, 124006, 124012, 124026, 124034, 124036, 124048, 124062, 124064, 124092, 124102, 124108, 124120, 124142, 124146, 124148, 124162, 124164, 124168, 124176, 124190, 124192, 124220, 124224, 124280, 124294, 124300, 124312, 124336, 124350, 124366, 124380, 124386, 124388, 124392, 124406, 124442, 124462, 124466, 124468, 124494, 124508, 124514, 124520, 124558, 124572, 124600, 124610, 124612, 124616, 124624, 124646, 124666, 124694, 124710, 124716, 124730, 124742, 124748, 124760, 124786, 124788, 124818, 124820, 124834, 124836, 124840, 124854, 124946, 124948, 124962, 124964, 124968, 124982, 124994, 124996, 125000, 125008, 125022, 125030, 125036, 125050, 125058, 125060, 125064, 125072, 125086, 125088, 125116, 125126, 125132, 125144, 125166, 125170, 125172, 125186, 125188, 125192, 125200, 125216, 125244, 125248, 125304, 125318, 125324, 125336, 125360, 125374, 125390, 125404, 125410, 125412, 125416, 125430, 125444, 125448, 125456, 125472, 125504, 125560, 125680, 125702, 125708, 125720, 125744, 125758, 125792, 125820, 125838, 125852, 125880, 125890, 125892, 125896, 125904, 125918, 125926, 125932, 125978, 125998, 126002, 126004, 126030, 126044, 126050, 126052, 126056, 126094, 126108, 126136, 126146, 126148, 126152, 126160, 126182, 126202, 126222, 126236, 126264, 126320, 126334, 126338, 126340, 126344, 126352, 126366, 126368, 126412, 126450, 126452, 126486, 126502, 126508, 126522, 126534, 126540, 126552, 126574, 126578, 126580, 126598, 126604, 126616, 126640, 126654, 126670, 126684, 126690, 126692, 126696, 126738, 126754, 126756, 126760, 126774, 126786, 126788, 126792, 126800, 126814, 126822, 126828, 126842, 126894, 126898, 126900, 126934, 127126, 127142, 127148, 127162, 127178, 127186, 127188, 127254, 127270, 127276, 127290, 127302, 127308, 127320, 127342, 127346, 127348, 127370, 127378, 127380, 127394, 127396, 127400, 127450, 127510, 127526, 127532, 127546, 127558, 127576, 127598, 127602, 127604, 127622, 127628, 127640, 127664, 127678, 127694, 127708, 127714, 127716, 127720, 127734, 127754, 127762, 127764, 127778, 127784, 127810, 127812, 127816, 127824, 127838, 127846, 127866, 127898, 127918, 127922, 127924, 128022, 128038, 128044, 128058, 128070, 128076, 128088, 128110, 128114, 128116, 128134, 128140, 128152, 128176, 128190, 128206, 128220, 128226, 128228, 128232, 128246, 128262, 128268, 128280, 128304, 128318, 128352, 128380, 128398, 128412, 128440, 128450, 128452, 128456, 128464, 128478, 128486, 128492, 128506, 128522, 128530, 128532, 128546, 128548, 128552, 128566, 128578, 128580, 128584, 128592, 128606, 128614, 128634, 128642, 128644, 128648, 128656, 128670, 128672, 128700, 128716, 128754, 128756, 128794, 128814, 128818, 128820, 128846, 128860, 128866, 128868, 128872, 128886, 128918, 128934, 128940, 128954, 128978, 128980, 129178, 129198, 129202, 129204, 129238, 129258, 129306, 129326, 129330, 129332, 129358, 129372, 129378, 129380, 129384, 129398, 129430, 129446, 129452, 129466, 129482, 129490, 129492, 129562, 129582, 129586, 129588, 129614, 129628, 129634, 129636, 129640, 129654, 129678, 129692, 129720, 129730, 129732, 129736, 129744, 129758, 129766, 129772, 129814, 129830, 129836, 129850, 129862, 129868, 129880, 129902, 129906, 129908, 129930, 129938, 129940, 129954, 129956, 129960, 129974, 130010};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f1435c = {2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, 2779, 2774, 2773, 902, 896, 908, 868, 865, 861, 859, 2511, 873, 871, 1780, 835, 2493, 825, 2491, 842, 837, 844, 1764, 1762, 811, 810, 809, 2483, 807, 2482, 806, 2480, 815, 814, 813, 812, 2484, 817, 816, 1745, 1744, 1742, 1746, 2655, 2637, 2635, 2626, 2625, 2623, 2628, 1820, 2752, 2739, 2737, 2728, 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780, 787, 781, 747, 739, 736, 2413, 754, 752, 1719, 692, 689, 681, 2371, 678, 2369, 700, 697, 694, 703, 1688, 1686, 642, 638, 2343, 631, 2341, 627, 2338, 651, 646, 643, 2345, 654, 652, 1652, 1650, 1647, 1654, 601, 599, 2322, 596, 2321, 594, 2319, 2317, 611, 610, 608, 606, 2324, 603, 2323, 615, 614, 612, 1617, 1616, 1614, 1612, 616, 1619, 1618, 2575, 2538, 2536, 905, 901, 898, 909, 2509, 2507, 2504, 870, 867, 864, 860, 2512, 875, 872, 1781, 2490, 2489, 2487, 2485, 1748, 836, 834, 832, 830, 2494, 827, 2492, 843, 841, 839, 845, 1765, 1763, 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631, 2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, 2753, 2736, 2735, 2733, 2731, 1848, 2740, 2738, 2786, 2784, 591, 588, 576, 569, 566, 2296, 1590, 537, 534, 526, 2276, 522, 2274, 545, 542, 539, 548, 1572, 1570, 481, 2245, 466, 2242, 462, 2239, 492, 485, 482, 2249, 496, 494, 1534, 1531, 1528, 1538, 413, 2196, 406, 2191, 2188, 425, 419, 2202, 415, 2199, 432, 430, 427, 1472, 1467, 1464, 433, 1476, 1474, 368, 367, 2160, 365, 2159, 362, 2157, 2155, 2152, 378, 377, 375, 2166, 372, 2165, 369, 2162, 383, 381, 379, 2168, 1419, 1418, 1416, 1414, 385, 1411, 384, 1423, 1422, 1420, 1424, 2461, 802, 2441, 2439, 790, 786, 783, 794, 2409, 2406, 2403, 750, 742, 738, 2414, 756, 753, 1720, 2367, 2365, 2362, 2359, 1663, 693, 691, 684, 2373, 680, 2370, 702, 699, 696, 704, 1690, 1687, 2337, 2336, 2334, 2332, 1624, 2329, 1622, 640, 637, 2344, 634, 2342, 630, 2340, 650, 648, 645, 2346, 655, 653, 1653, 1651, 1649, 1655, 2612, 2597, 2595, 2571, 2568, 2565, 2576, 2534, 2529, 2526, 1787, 2540, 2537, 907, 904, 900, 910, 2503, 2502, 2500, 2498, 1768, 2495, 1767, 2510, 2508, 2506, 869, 866, 863, 2513, 876, 874, 1782, 2720, 2713, 2711, 2697, 2694, 2691, 2702, 2672, 2670, 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823, 2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, 2762, 1850, 1849, 2751, 2749, 2747, 2754, 353, 2148, 344, 342, 336, 2142, 332, 2140, 345, 1375, 1373, 306, 2130, 299, 2128, 295, 2125, 319, 314, 311, 2132, 1354, 1352, 1349, 1356, 262, 257, 2101, 253, 2096, 2093, 274, 273, 267, 2107, 263, 2104, 280, 278, 275, 1316, 1311, 1308, 1320, 1318, 2052, 202, 2050, 2044, 2040, 219, 2063, 212, 2060, 208, 2055, 224, 221, 2066, 1260, 1258, 1252, 231, 1248, 229, 1266, 1264, 1261, 1268, 155, 1998, 153, 1996, 1994, 1991, 1988, 165, 164, 2007, 162, 2006, 159, 2003, 2000, 172, 171, 169, 2012, 166, 2010, 1186, 1184, 1182, 1179, 175, 1176, 173, 1192, 1191, 1189, 1187, 176, 1194, 1193, 2313, 2307, 2305, 592, 589, 2294, 2292, 2289, 578, 572, 568, 2297, 580, 1591, 2272, 2267, 2264, 1547, 538, 536, 529, 2278, 525, 2275, 547, 544, 541, 1574, 1571, 2237, 2235, 2229, 1493, 2225, 1489, 478, 2247, 470, 2244, 465, 2241, 493, 488, 484, 2250, 498, 495, 1536, 1533, 1530, 1539, 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427, 414, 412, 2197, 409, 2195, 405, 2193, 2190, 426, 424, 421, 2203, 418, 2201, 431, 429, 1473, 1471, 1469, 1466, 434, 1477, 1475, 2478, 2472, 2470, 2459, 2457, 2454, 2462, 803, 2437, 2432, 2429, 1726, 2443, 2440, 792, 789, 785, 2401, 2399, 2393, 1702, 2389, 1699, 2411, 2408, 2405, 745, 741, 2415, 758, 755, 1721, 2358, 2357, 2355, 2353, 1661, 2350, 1660, 2347, 1657, 2368, 2366, 2364, 2361, 1666, 690, 687, 2374, 683, 2372, 701, 698, 705, 1691, 1689, 2619, 2617, 2610, 2608, 2605, 2613, 2593, 2588, 2585, 1803, 2599, 2596, 2563, 2561, 2555, 1797, 2551, 1795, 2573, 2570, 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785, 2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, 906, 903, 911, 2721, 1844, 2715, 2712, 1838, 1836, 2699, 2696, 2693, 2703, 1827, 1826, 1824, 2673, 2671, 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854, 1853, 1851, 1856, 2766, 2764, 143, 1987, 139, 1986, 135, 133, 131, 1984, 128, 1983, 125, 1981, 138, 137, 136, 1985, 1133, 1132, 1130, 112, 110, 1974, 107, 1973, 104, 1971, 1969, 122, 121, 119, 117, 1977, 114, 1976, 124, 1115, 1114, 1112, 1110, 1117, 1116, 84, 83, 1953, 81, 1952, 78, 1950, 1948, 1945, 94, 93, 91, 1959, 88, 1958, 85, 1955, 99, 97, 95, 1961, 1086, 1085, 1083, 1081, 1078, 100, 1090, 1089, 1087, 1091, 49, 47, 1917, 44, 1915, 1913, 1910, 1907, 59, 1926, 56, 1925, 53, 1922, 1919, 66, 64, 1931, 61, 1929, 1042, 1040, 1038, 71, 1035, 70, 1032, 68, 1048, 1047, 1045, 1043, 1050, 1049, 12, 10, 1869, 1867, 1864, 1861, 21, 1880, 19, 1877, 1874, 1871, 28, 1888, 25, 1886, 22, 1883, 982, 980, 977, 974, 32, 30, 991, 989, 987, 984, 34, 995, 994, 992, 2151, 2150, 2147, 2146, 2144, 356, 355, 354, 2149, 2139, 2138, 2136, 2134, 1359, 343, 341, 338, 2143, 335, 2141, 348, 347, 346, 1376, 1374, 2124, 2123, 2121, 2119, 1326, 2116, 1324, 310, 308, 305, 2131, 302, 2129, 298, 2127, 320, 318, 316, 313, 2133, 322, 321, 1355, 1353, 1351, 1357, 2092, 2091, 2089, 2087, 1276, 2084, 1274, 2081, 1271, 259, 2102, 256, 2100, 252, 2098, 2095, 272, 269, 2108, 266, 2106, 281, 279, 277, 1317, 1315, 1313, 1310, 282, 1321, 1319, 2039, 2037, 2035, 2032, 1203, 2029, 1200, 1197, 207, 2053, 205, 2051, 201, 2049, 2046, 2043, 220, 218, 2064, 215, 2062, 211, 2059, 228, 226, 223, 2069, 1259, 1257, 1254, 232, 1251, 230, 1267, 1265, 1263, 2316, 2315, 2312, 2311, 2309, 2314, 2304, 2303, 2301, 2299, 1593, 2308, 2306, 590, 2288, 2287, 2285, 2283, 1578, 2280, 1577, 2295, 2293, 2291, 579, 577, 574, 571, 2298, 582, 581, 1592, 2263, 2262, 2260, 2258, 1545, 2255, 1544, 2252, 1541, 2273, 2271, 2269, 2266, 1550, 535, 532, 2279, 528, 2277, 546, 543, 549, 1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214, 1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, 480, 477, 2248, 473, 2246, 469, 2243, 490, 487, 2251, 497, 1537, 1535, 1532, 2477, 2476, 2474, 2479, 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452, 2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, 805, 804, 2428, 2427, 2425, 2423, 1725, 2420, 1724, 2417, 1722, 2438, 2436, 2434, 2431, 1727, 2444, 2442, 793, 791, 788, 795, 2388, 2386, 2384, 1697, 2381, 1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, 2392, 1701, 2412, 2410, 2407, 751, 748, 744, 2416, 759, 757, 1807, 2620, 2618, 1806, 1805, 2611, 2609, 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587, 1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, 2560, 2557, 1798, 2554, 1796, 2574, 2572, 2569, 2578, 1847, 1846, 2722, 1843, 1842, 1840, 1845, 2716, 2714, 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695, 2704, 1817, 1811, 1810, 897, 862, 1777, 829, 826, 838, 1760, 1758, 808, 2481, 1741, 1740, 1738, 1743, 2624, 1818, 2726, 2776, 782, 740, 737, 1715, 686, 679, 695, 1682, 1680, 639, 628, 2339, 647, 644, 1645, 1643, 1640, 1648, 602, 600, 597, 595, 2320, 593, 2318, 609, 607, 604, 1611, 1610, 1608, 1606, 613, 1615, 1613, 2328, 926, 924, 892, 886, 899, 857, 850, 2505, 1778, 824, 823, 821, 819, 2488, 818, 2486, 833, 831, 828, 840, 1761, 1759, 2649, 2632, 2630, 2746, 2734, 2732, 2782, 2781, 570, 567, 1587, 531, 527, 523, 540, 1566, 1564, 476, 467, 463, 2240, 486, 483, 1524, 1521, 1518, 1529, 411, 403, 2192, 399, 2189, 423, 416, 1462, 1457, 1454, 428, 1468, 1465, 2210, 366, 363, 2158, 360, 2156, 357, 2153, 376, 373, 370, 2163, 1410, 1409, 1407, 1405, 382, 1402, 380, 1417, 1415, 1412, 1421, 2175, 2174, 777, 774, 771, 784, 732, 725, 722, 2404, 743, 1716, 676, 674, 668, 2363, 665, 2360, 685, 1684, 1681, 626, 624, 622, 2335, 620, 2333, 617, 2330, 641, 635, 649, 1646, 1644, 1642, 2566, 928, 925, 2530, 2527, 894, 891, 888, 2501, 2499, 2496, 858, 856, 854, 851, 1779, 2692, 2668, 2665, 2645, 2643, 2640, 2651, 2768, 2759, 2757, 2744, 2743, 2741, 2748, 352, 1382, 340, 337, 333, 1371, 1369, 307, 300, 296, 2126, 315, 312, 1347, 1342, 1350, 261, 258, 250, 2097, 246, 2094, 271, 268, 264, 1306, 1301, 1298, 276, 1312, 1309, 2115, 203, 2048, 195, 2045, 191, 2041, 213, 209, 2056, 1246, 1244, 1238, 225, 1234, 222, 1256, 1253, 1249, 1262, 2080, 2079, 154, 1997, 150, 1995, 147, 1992, 1989, 163, 160, 2004, 156, 2001, 1175, 1174, 1172, 1170, 1167, 170, 1164, 167, 1185, 1183, 1180, 1177, 174, 1190, 1188, 2025, 2024, 2022, 587, 586, 564, 559, 556, 2290, 573, 1588, 520, 518, 512, 2268, 508, 2265, 530, 1568, 1565, 461, 457, 2233, 450, 2230, 446, 2226, 479, 471, 489, 1526, 1523, 1520, 397, 395, 2185, 392, 2183, 389, 2180, 2177, 410, 2194, 402, 422, 1463, 1461, 1459, 1456, 1470, 2455, 799, 2433, 2430, 779, 776, 773, 2397, 2394, 2390, 734, 728, 724, 746, 1717, 2356, 2354, 2351, 2348, 1658, 677, 675, 673, 670, 667, 688, 1685, 1683, 2606, 2589, 2586, 2559, 2556, 2552, 927, 2523, 2521, 2518, 2515, 1784, 2532, 895, 893, 890, 2718, 2709, 2707, 2689, 2687, 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852, 2760, 2758, 142, 141, 1139, 1138, 134, 132, 129, 126, 1982, 1129, 1128, 1126, 1131, 113, 111, 108, 105, 1972, 101, 1970, 120, 118, 115, 1109, 1108, 1106, 1104, 123, 1113, 1111, 82, 79, 1951, 75, 1949, 72, 1946, 92, 89, 86, 1956, 1077, 1076, 1074, 1072, 98, 1069, 96, 1084, 1082, 1079, 1088, 1968, 1967, 48, 45, 1916, 42, 1914, 39, 1911, 1908, 60, 57, 54, 1923, 50, 1920, 1031, 1030, 1028, 1026, 67, 1023, 65, 1020, 62, 1041, 1039, 1036, 1033, 69, 1046, 1044, 1944, 1943, 1941, 11, 9, 1868, 7, 1865, 1862, 1859, 20, 1878, 16, 1875, 13, 1872, 970, 968, 966, 963, 29, 960, 26, 23, 983, 981, 978, 975, 33, 971, 31, 990, 988, 985, 1906, 1904, 1902, 993, 351, 2145, 1383, 331, 330, 328, 326, 2137, 323, 2135, 339, 1372, 1370, 294, 293, 291, 289, 2122, 286, 2120, 283, 2117, 309, 303, 317, 1348, 1346, 1344, 245, 244, 242, 2090, 239, 2088, 236, 2085, 2082, 260, 2099, 249, 270, 1307, 1305, 1303, 1300, 1314, 189, 2038, 186, 2036, 183, 2033, 2030, 2026, 206, 198, 2047, 194, 216, 1247, 1245, 1243, 1240, 227, 1237, 1255, 2310, 2302, 2300, 2286, 2284, 2281, 565, 563, 561, 558, 575, 1589, 2261, 2259, 2256, 2253, 1542, 521, 519, 517, 514, 2270, 511, 533, 1569, 1567, 2223, 2221, 2218, 2215, 1483, 2211, 1480, 459, 456, 453, 2232, 449, 474, 491, 1527, 1525, 1522, 2475, 2467, 2465, 2451, 2449, 2446, 801, 800, 2426, 2424, 2421, 2418, 1723, 2435, 780, 778, 775, 2387, 2385, 2382, 2379, 1695, 2375, 1693, 2396, 735, 733, 730, 727, 749, 1718, 2616, 2615, 2604, 2603, 2601, 2584, 2583, 2581, 2579, 1800, 2591, 2550, 2549, 2547, 2545, 1792, 2542, 1790, 2558, 929, 2719, 1841, 2710, 2708, 1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, 1756, 1754, 1737, 1736, 1734, 1739, 1816, 1711, 1676, 1674, 633, 629, 1638, 1636, 1633, 1641, 598, 1605, 1604, 1602, 1600, 605, 1609, 1607, 2327, 887, 853, 1775, 822, 820, 1757, 1755, 1584, 524, 1560, 1558, 468, 464, 1514, 1511, 1508, 1519, 408, 404, 400, 1452, 1447, 1444, 417, 1458, 1455, 2208, 364, 361, 358, 2154, 1401, 1400, 1398, 1396, 374, 1393, 371, 1408, 1406, 1403, 1413, 2173, 2172, 772, 726, 723, 1712, 672, 669, 666, 682, 1678, 1675, 625, 623, 621, 618, 2331, 636, 632, 1639, 1637, 1635, 920, 918, 884, 880, 889, 849, 848, 847, 846, 2497, 855, 852, 1776, 2641, 2742, 2787, 1380, 334, 1367, 1365, 301, 297, 1340, 1338, 1335, 1343, 255, 251, 247, 1296, 1291, 1288, 265, 1302, 1299, 2113, 204, 196, 192, 2042, 1232, 1230, 1224, 214, 1220, 210, 1242, 1239, 1235, 1250, 2077, 2075, 151, 148, 1993, 144, 1990, 1163, 1162, 1160, 1158, 1155, 161, 1152, 157, 1173, 1171, 1168, 1165, 168, 1181, 1178, 2021, 2020, 2018, 2023, 585, 560, 557, 1585, 516, 509, 1562, 1559, 458, 447, 2227, 472, 1516, 1513, 1510, 398, 396, 393, 390, 2181, 386, 2178, 407, 1453, 1451, 1449, 1446, 420, 1460, 2209, 769, 764, 720, 712, 2391, 729, 1713, 664, 663, 661, 659, 2352, 656, 2349, 671, 1679, 1677, 2553, 922, 919, 2519, 2516, 885, 883, 881, 2685, 2661, 2659, 2767, 2756, 2755, 140, 1137, 1136, 130, 127, 1125, 1124, 1122, 1127, 109, 106, 102, 1103, 1102, 1100, 1098, 116, 1107, 1105, 1980, 80, 76, 73, 1947, 1068, 1067, 1065, 1063, 90, 1060, 87, 1075, 1073, 1070, 1080, 1966, 1965, 46, 43, 40, 1912, 36, 1909, 1019, 1018, 1016, 1014, 58, 1011, 55, 1008, 51, 1029, 1027, 1024, 1021, 63, 1037, 1034, 1940, 1939, 1937, 1942, 8, 1866, 4, 1863, 1, 1860, 956, 954, 952, 949, 946, 17, 14, 969, 967, 964, 961, 27, 957, 24, 979, 976, 972, 1901, 1900, 1898, 1896, 986, 1905, 1903, 350, 349, 1381, 329, 327, 324, 1368, 1366, 292, 290, 287, 284, 2118, 304, 1341, 1339, 1337, 1345, 243, 240, 237, 2086, 233, 2083, 254, 1297, 1295, 1293, 1290, 1304, 2114, 190, 187, 184, 2034, 180, 2031, 177, 2027, 199, 1233, 1231, 1229, 1226, 217, 1223, 1241, 2078, 2076, 584, 555, 554, 552, 550, 2282, 562, 1586, 507, 506, 504, 502, 2257, 499, 2254, 515, 1563, 1561, 445, 443, 441, 2219, 438, 2216, 435, 2212, 460, 454, 475, 1517, 1515, 1512, 2447, 798, 797, 2422, 2419, 770, 768, 766, 2383, 2380, 2376, 721, 719, 717, 714, 731, 1714, 2602, 2582, 2580, 2548, 2546, 2543, 923, 921, 2717, 2706, 2705, 2683, 2682, 2680, 1771, 1752, 1750, 1733, 1732, 1731, 1735, 1814, 1707, 1670, 1668, 1631, 1629, 1626, 1634, 1599, 1598, 1596, 1594, 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552, 1504, 1501, 1498, 1509, 1442, 1437, 1434, 401, 1448, 1445, 2206, 1392, 1391, 1389, 1387, 1384, 359, 1399, 1397, 1394, 1404, 2171, 2170, 1708, 1672, 1669, 619, 1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328, 1336, 1286, 1281, 1278, 248, 1292, 1289, 2111, 1218, 1216, 1210, 197, 1206, 193, 1228, 1225, 1221, 1236, 2073, 2071, 1151, 1150, 1148, 1146, 152, 1143, 149, 1140, 145, 1161, 1159, 1156, 1153, 158, 1169, 1166, 2017, 2016, 2014, 2019, 1582, 510, 1556, 1553, 452, 448, 1506, 1500, 394, 391, 387, 1443, 1441, 1439, 1436, 1450, 2207, 765, 716, 713, 1709, 662, 660, 657, 1673, 1671, 916, 914, 879, 878, 877, 882, 1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, 1092, 103, 1101, 1099, 1979, 1059, 1058, 1056, 1054, 77, 1051, 74, 1066, 1064, 1061, 1071, 1964, 1963, 1007, 1006, 1004, 1002, 999, 41, 996, 37, 1017, 1015, 1012, 1009, 52, 1025, 1022, 1936, 1935, 1933, 1938, 942, 940, 938, 935, 932, 5, 2, 955, 953, 950, 947, 18, 943, 15, 965, 962, 958, 1895, 1894, 1892, 1890, 973, 1899, 1897, 1379, 325, 1364, 1362, 288, 285, 1334, 1332, 1330, 241, 238, 234, 1287, 1285, 1283, 1280, 1294, 2112, 188, 185, 181, 178, 2028, 1219, 1217, 1215, 1212, 200, 1209, 1227, 2074, 2072, 583, 553, 551, 1583, 505, 503, 500, 513, 1557, 1555, 444, 442, 439, 436, 2213, 455, 451, 1507, 1505, 1502, 796, 763, 762, 760, 767, 711, 710, 708, 706, 2377, 718, 715, 1710, 2544, 917, 915, 2681, 1627, 1597, 1595, 2325, 1769, 1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, 1395, 2169, 2167, 1704, 1665, 1662, 1625, 1623, 1620, 1770, 1329, 1282, 1279, 2109, 1214, 1207, 1222, 2068, 2065, 1149, 1147, 1144, 1141, 146, 1157, 1154, 2013, 2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, 1431, 1428, 1425, 388, 1440, 2205, 1705, 658, 1667, 1664, 1119, 1095, 1093, 1978, 1057, 1055, 1052, 1062, 1962, 1960, 1005, 1003, 1000, 997, 38, 1013, 1010, 1932, 1930, 1927, 1934, 941, 939, 936, 933, 6, 930, 3, 951, 948, 944, 1889, 1887, 1884, 1881, 959, 1893, 1891, 35, 1377, 1360, 1358, 1327, 1325, 1322, 1331, 1277, 1275, 1272, 1269, 235, 1284, 2110, 1205, 1204, 1201, 1198, 182, 1195, 179, 1213, 2070, 2067, 1580, 501, 1551, 1548, 440, 437, 1497, 1494, 1490, 1503, 761, 709, 707, 1706, 913, 912, 2198, 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054, 1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, 2200, 1698, 1659, 1656, 1975, 1053, 1957, 1954, 1001, 998, 1924, 1921, 1918, 1928, 937, 934, 931, 1879, 1876, 1873, 1870, 945, 1885, 1882, 1323, 1273, 1270, 2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, 1540, 1484, 1481, 1478, 1491, 1700};
+    public static final int[] f1430c = {2627, 1819, 2622, 2621, 1813, 1812, 2729, 2724, 2723, 2779, 2774, 2773, 902, 896, 908, 868, 865, 861, 859, 2511, 873, 871, 1780, 835, 2493, 825, 2491, 842, 837, 844, 1764, 1762, 811, 810, 809, 2483, 807, 2482, 806, 2480, 815, 814, 813, 812, 2484, 817, 816, 1745, 1744, 1742, 1746, 2655, 2637, 2635, 2626, 2625, 2623, 2628, 1820, 2752, 2739, 2737, 2728, 2727, 2725, 2730, 2785, 2783, 2778, 2777, 2775, 2780, 787, 781, 747, 739, 736, 2413, 754, 752, 1719, 692, 689, 681, 2371, 678, 2369, 700, 697, 694, 703, 1688, 1686, 642, 638, 2343, 631, 2341, 627, 2338, 651, 646, 643, 2345, 654, 652, 1652, 1650, 1647, 1654, 601, 599, 2322, 596, 2321, 594, 2319, 2317, 611, 610, 608, 606, 2324, 603, 2323, 615, 614, 612, 1617, 1616, 1614, 1612, 616, 1619, 1618, 2575, 2538, 2536, 905, 901, 898, 909, 2509, 2507, 2504, 870, 867, 864, 860, 2512, 875, 872, 1781, 2490, 2489, 2487, 2485, 1748, 836, 834, 832, 830, 2494, 827, 2492, 843, 841, 839, 845, 1765, 1763, 2701, 2676, 2674, 2653, 2648, 2656, 2634, 2633, 2631, 2629, 1821, 2638, 2636, 2770, 2763, 2761, 2750, 2745, 2753, 2736, 2735, 2733, 2731, 1848, 2740, 2738, 2786, 2784, 591, 588, 576, 569, 566, 2296, 1590, 537, 534, 526, 2276, 522, 2274, 545, 542, 539, 548, 1572, 1570, 481, 2245, 466, 2242, 462, 2239, 492, 485, 482, 2249, 496, 494, 1534, 1531, 1528, 1538, 413, 2196, 406, 2191, 2188, 425, 419, 2202, 415, 2199, 432, 430, 427, 1472, 1467, 1464, 433, 1476, 1474, 368, 367, 2160, 365, 2159, 362, 2157, 2155, 2152, 378, 377, 375, 2166, 372, 2165, 369, 2162, 383, 381, 379, 2168, 1419, 1418, 1416, 1414, 385, 1411, 384, 1423, 1422, 1420, 1424, 2461, 802, 2441, 2439, 790, 786, 783, 794, 2409, 2406, 2403, 750, 742, 738, 2414, 756, 753, 1720, 2367, 2365, 2362, 2359, 1663, 693, 691, 684, 2373, 680, 2370, 702, 699, 696, 704, 1690, 1687, 2337, 2336, 2334, 2332, 1624, 2329, 1622, 640, 637, 2344, 634, 2342, 630, 2340, 650, 648, 645, 2346, 655, 653, 1653, 1651, 1649, 1655, 2612, 2597, 2595, 2571, 2568, 2565, 2576, 2534, 2529, 2526, 1787, 2540, 2537, 907, 904, 900, 910, 2503, 2502, 2500, 2498, 1768, 2495, 1767, 2510, 2508, 2506, 869, 866, 863, 2513, 876, 874, 1782, 2720, 2713, 2711, 2697, 2694, 2691, 2702, 2672, 2670, 2664, 1828, 2678, 2675, 2647, 2646, 2644, 2642, 1823, 2639, 1822, 2654, 2652, 2650, 2657, 2771, 1855, 2765, 2762, 1850, 1849, 2751, 2749, 2747, 2754, 353, 2148, 344, 342, 336, 2142, 332, 2140, 345, 1375, 1373, 306, 2130, 299, 2128, 295, 2125, 319, 314, 311, 2132, 1354, 1352, 1349, 1356, 262, 257, 2101, 253, 2096, 2093, 274, 273, 267, 2107, 263, 2104, 280, 278, 275, 1316, 1311, 1308, 1320, 1318, 2052, 202, 2050, 2044, 2040, 219, 2063, 212, 2060, 208, 2055, 224, 221, 2066, 1260, 1258, 1252, 231, 1248, 229, 1266, 1264, 1261, 1268, 155, 1998, 153, 1996, 1994, 1991, 1988, 165, 164, 2007, 162, 2006, 159, 2003, 2000, 172, 171, 169, 2012, 166, 2010, 1186, 1184, 1182, 1179, 175, 1176, 173, 1192, 1191, 1189, 1187, 176, 1194, 1193, 2313, 2307, 2305, 592, 589, 2294, 2292, 2289, 578, 572, 568, 2297, 580, 1591, 2272, 2267, 2264, 1547, 538, 536, 529, 2278, 525, 2275, 547, 544, 541, 1574, 1571, 2237, 2235, 2229, 1493, 2225, 1489, 478, 2247, 470, 2244, 465, 2241, 493, 488, 484, 2250, 498, 495, 1536, 1533, 1530, 1539, 2187, 2186, 2184, 2182, 1432, 2179, 1430, 2176, 1427, 414, 412, 2197, 409, 2195, 405, 2193, 2190, 426, 424, 421, 2203, 418, 2201, 431, 429, 1473, 1471, 1469, 1466, 434, 1477, 1475, 2478, 2472, 2470, 2459, 2457, 2454, 2462, 803, 2437, 2432, 2429, 1726, 2443, 2440, 792, 789, 785, 2401, 2399, 2393, 1702, 2389, 1699, 2411, 2408, 2405, 745, 741, 2415, 758, 755, 1721, 2358, 2357, 2355, 2353, 1661, 2350, 1660, 2347, 1657, 2368, 2366, 2364, 2361, 1666, 690, 687, 2374, 683, 2372, 701, 698, 705, 1691, 1689, 2619, 2617, 2610, 2608, 2605, 2613, 2593, 2588, 2585, 1803, 2599, 2596, 2563, 2561, 2555, 1797, 2551, 1795, 2573, 2570, 2567, 2577, 2525, 2524, 2522, 2520, 1786, 2517, 1785, 2514, 1783, 2535, 2533, 2531, 2528, 1788, 2541, 2539, 906, 903, 911, 2721, 1844, 2715, 2712, 1838, 1836, 2699, 2696, 2693, 2703, 1827, 1826, 1824, 2673, 2671, 2669, 2666, 1829, 2679, 2677, 1858, 1857, 2772, 1854, 1853, 1851, 1856, 2766, 2764, 143, 1987, 139, 1986, 135, 133, 131, 1984, 128, 1983, 125, 1981, 138, 137, 136, 1985, 1133, 1132, 1130, 112, 110, 1974, 107, 1973, 104, 1971, 1969, 122, 121, 119, 117, 1977, 114, 1976, 124, 1115, 1114, 1112, 1110, 1117, 1116, 84, 83, 1953, 81, 1952, 78, 1950, 1948, 1945, 94, 93, 91, 1959, 88, 1958, 85, 1955, 99, 97, 95, 1961, 1086, 1085, 1083, 1081, 1078, 100, 1090, 1089, 1087, 1091, 49, 47, 1917, 44, 1915, 1913, 1910, 1907, 59, 1926, 56, 1925, 53, 1922, 1919, 66, 64, 1931, 61, 1929, 1042, 1040, 1038, 71, 1035, 70, 1032, 68, 1048, 1047, 1045, 1043, 1050, 1049, 12, 10, 1869, 1867, 1864, 1861, 21, 1880, 19, 1877, 1874, 1871, 28, 1888, 25, 1886, 22, 1883, 982, 980, 977, 974, 32, 30, 991, 989, 987, 984, 34, 995, 994, 992, 2151, 2150, 2147, 2146, 2144, 356, 355, 354, 2149, 2139, 2138, 2136, 2134, 1359, 343, 341, 338, 2143, 335, 2141, 348, 347, 346, 1376, 1374, 2124, 2123, 2121, 2119, 1326, 2116, 1324, 310, 308, 305, 2131, 302, 2129, 298, 2127, 320, 318, 316, 313, 2133, 322, 321, 1355, 1353, 1351, 1357, 2092, 2091, 2089, 2087, 1276, 2084, 1274, 2081, 1271, 259, 2102, 256, 2100, 252, 2098, 2095, 272, 269, 2108, 266, 2106, 281, 279, 277, 1317, 1315, 1313, 1310, 282, 1321, 1319, 2039, 2037, 2035, 2032, 1203, 2029, 1200, 1197, 207, 2053, 205, 2051, 201, 2049, 2046, 2043, 220, 218, 2064, 215, 2062, 211, 2059, 228, 226, 223, 2069, 1259, 1257, 1254, 232, 1251, 230, 1267, 1265, 1263, 2316, 2315, 2312, 2311, 2309, 2314, 2304, 2303, 2301, 2299, 1593, 2308, 2306, 590, 2288, 2287, 2285, 2283, 1578, 2280, 1577, 2295, 2293, 2291, 579, 577, 574, 571, 2298, 582, 581, 1592, 2263, 2262, 2260, 2258, 1545, 2255, 1544, 2252, 1541, 2273, 2271, 2269, 2266, 1550, 535, 532, 2279, 528, 2277, 546, 543, 549, 1575, 1573, 2224, 2222, 2220, 1486, 2217, 1485, 2214, 1482, 1479, 2238, 2236, 2234, 2231, 1496, 2228, 1492, 480, 477, 2248, 473, 2246, 469, 2243, 490, 487, 2251, 497, 1537, 1535, 1532, 2477, 2476, 2474, 2479, 2469, 2468, 2466, 2464, 1730, 2473, 2471, 2453, 2452, 2450, 2448, 1729, 2445, 1728, 2460, 2458, 2456, 2463, 805, 804, 2428, 2427, 2425, 2423, 1725, 2420, 1724, 2417, 1722, 2438, 2436, 2434, 2431, 1727, 2444, 2442, 793, 791, 788, 795, 2388, 2386, 2384, 1697, 2381, 1696, 2378, 1694, 1692, 2402, 2400, 2398, 2395, 1703, 2392, 1701, 2412, 2410, 2407, 751, 748, 744, 2416, 759, 757, 1807, 2620, 2618, 1806, 1805, 2611, 2609, 2607, 2614, 1802, 1801, 1799, 2594, 2592, 2590, 2587, 1804, 2600, 2598, 1794, 1793, 1791, 1789, 2564, 2562, 2560, 2557, 1798, 2554, 1796, 2574, 2572, 2569, 2578, 1847, 1846, 2722, 1843, 1842, 1840, 1845, 2716, 2714, 1835, 1834, 1832, 1830, 1839, 1837, 2700, 2698, 2695, 2704, 1817, 1811, 1810, 897, 862, 1777, 829, 826, 838, 1760, 1758, 808, 2481, 1741, 1740, 1738, 1743, 2624, 1818, 2726, 2776, 782, 740, 737, 1715, 686, 679, 695, 1682, 1680, 639, 628, 2339, 647, 644, 1645, 1643, 1640, 1648, 602, 600, 597, 595, 2320, 593, 2318, 609, 607, 604, 1611, 1610, 1608, 1606, 613, 1615, 1613, 2328, 926, 924, 892, 886, 899, 857, 850, 2505, 1778, 824, 823, 821, 819, 2488, 818, 2486, 833, 831, 828, 840, 1761, 1759, 2649, 2632, 2630, 2746, 2734, 2732, 2782, 2781, 570, 567, 1587, 531, 527, 523, 540, 1566, 1564, 476, 467, 463, 2240, 486, 483, 1524, 1521, 1518, 1529, 411, 403, 2192, 399, 2189, 423, 416, 1462, 1457, 1454, 428, 1468, 1465, 2210, 366, 363, 2158, 360, 2156, 357, 2153, 376, 373, 370, 2163, 1410, 1409, 1407, 1405, 382, 1402, 380, 1417, 1415, 1412, 1421, 2175, 2174, 777, 774, 771, 784, 732, 725, 722, 2404, 743, 1716, 676, 674, 668, 2363, 665, 2360, 685, 1684, 1681, 626, 624, 622, 2335, 620, 2333, 617, 2330, 641, 635, 649, 1646, 1644, 1642, 2566, 928, 925, 2530, 2527, 894, 891, 888, 2501, 2499, 2496, 858, 856, 854, 851, 1779, 2692, 2668, 2665, 2645, 2643, 2640, 2651, 2768, 2759, 2757, 2744, 2743, 2741, 2748, 352, 1382, 340, 337, 333, 1371, 1369, 307, 300, 296, 2126, 315, 312, 1347, 1342, 1350, 261, 258, 250, 2097, 246, 2094, 271, 268, 264, 1306, 1301, 1298, 276, 1312, 1309, 2115, 203, 2048, 195, 2045, 191, 2041, 213, 209, 2056, 1246, 1244, 1238, 225, 1234, 222, 1256, 1253, 1249, 1262, 2080, 2079, 154, 1997, 150, 1995, 147, 1992, 1989, 163, 160, 2004, 156, 2001, 1175, 1174, 1172, 1170, 1167, 170, 1164, 167, 1185, 1183, 1180, 1177, 174, 1190, 1188, 2025, 2024, 2022, 587, 586, 564, 559, 556, 2290, 573, 1588, 520, 518, 512, 2268, 508, 2265, 530, 1568, 1565, 461, 457, 2233, 450, 2230, 446, 2226, 479, 471, 489, 1526, 1523, 1520, 397, 395, 2185, 392, 2183, 389, 2180, 2177, 410, 2194, 402, 422, 1463, 1461, 1459, 1456, 1470, 2455, 799, 2433, 2430, 779, 776, 773, 2397, 2394, 2390, 734, 728, 724, 746, 1717, 2356, 2354, 2351, 2348, 1658, 677, 675, 673, 670, 667, 688, 1685, 1683, 2606, 2589, 2586, 2559, 2556, 2552, 927, 2523, 2521, 2518, 2515, 1784, 2532, 895, 893, 890, 2718, 2709, 2707, 2689, 2687, 2684, 2663, 2662, 2660, 2658, 1825, 2667, 2769, 1852, 2760, 2758, 142, 141, 1139, 1138, 134, 132, 129, 126, 1982, 1129, 1128, 1126, 1131, 113, 111, 108, 105, 1972, 101, 1970, 120, 118, 115, 1109, 1108, 1106, 1104, 123, 1113, 1111, 82, 79, 1951, 75, 1949, 72, 1946, 92, 89, 86, 1956, 1077, 1076, 1074, 1072, 98, 1069, 96, 1084, 1082, 1079, 1088, 1968, 1967, 48, 45, 1916, 42, 1914, 39, 1911, 1908, 60, 57, 54, 1923, 50, 1920, 1031, 1030, 1028, 1026, 67, 1023, 65, 1020, 62, 1041, 1039, 1036, 1033, 69, 1046, 1044, 1944, 1943, 1941, 11, 9, 1868, 7, 1865, 1862, 1859, 20, 1878, 16, 1875, 13, 1872, 970, 968, 966, 963, 29, 960, 26, 23, 983, 981, 978, 975, 33, 971, 31, 990, 988, 985, 1906, 1904, 1902, 993, 351, 2145, 1383, 331, 330, 328, 326, 2137, 323, 2135, 339, 1372, 1370, 294, 293, 291, 289, 2122, 286, 2120, 283, 2117, 309, 303, 317, 1348, 1346, 1344, 245, 244, 242, 2090, 239, 2088, 236, 2085, 2082, 260, 2099, 249, 270, 1307, 1305, 1303, 1300, 1314, 189, 2038, 186, 2036, 183, 2033, 2030, 2026, 206, 198, 2047, 194, 216, 1247, 1245, 1243, 1240, 227, 1237, 1255, 2310, 2302, 2300, 2286, 2284, 2281, 565, 563, 561, 558, 575, 1589, 2261, 2259, 2256, 2253, 1542, 521, 519, 517, 514, 2270, 511, 533, 1569, 1567, 2223, 2221, 2218, 2215, 1483, 2211, 1480, 459, 456, 453, 2232, 449, 474, 491, 1527, 1525, 1522, 2475, 2467, 2465, 2451, 2449, 2446, 801, 800, 2426, 2424, 2421, 2418, 1723, 2435, 780, 778, 775, 2387, 2385, 2382, 2379, 1695, 2375, 1693, 2396, 735, 733, 730, 727, 749, 1718, 2616, 2615, 2604, 2603, 2601, 2584, 2583, 2581, 2579, 1800, 2591, 2550, 2549, 2547, 2545, 1792, 2542, 1790, 2558, 929, 2719, 1841, 2710, 2708, 1833, 1831, 2690, 2688, 2686, 1815, 1809, 1808, 1774, 1756, 1754, 1737, 1736, 1734, 1739, 1816, 1711, 1676, 1674, 633, 629, 1638, 1636, 1633, 1641, 598, 1605, 1604, 1602, 1600, 605, 1609, 1607, 2327, 887, 853, 1775, 822, 820, 1757, 1755, 1584, 524, 1560, 1558, 468, 464, 1514, 1511, 1508, 1519, 408, 404, 400, 1452, 1447, 1444, 417, 1458, 1455, 2208, 364, 361, 358, 2154, 1401, 1400, 1398, 1396, 374, 1393, 371, 1408, 1406, 1403, 1413, 2173, 2172, 772, 726, 723, 1712, 672, 669, 666, 682, 1678, 1675, 625, 623, 621, 618, 2331, 636, 632, 1639, 1637, 1635, 920, 918, 884, 880, 889, 849, 848, 847, 846, 2497, 855, 852, 1776, 2641, 2742, 2787, 1380, 334, 1367, 1365, 301, 297, 1340, 1338, 1335, 1343, 255, 251, 247, 1296, 1291, 1288, 265, 1302, 1299, 2113, 204, 196, 192, 2042, 1232, 1230, 1224, 214, 1220, 210, 1242, 1239, 1235, 1250, 2077, 2075, 151, 148, 1993, 144, 1990, 1163, 1162, 1160, 1158, 1155, 161, 1152, 157, 1173, 1171, 1168, 1165, 168, 1181, 1178, 2021, 2020, 2018, 2023, 585, 560, 557, 1585, 516, 509, 1562, 1559, 458, 447, 2227, 472, 1516, 1513, 1510, 398, 396, 393, 390, 2181, 386, 2178, 407, 1453, 1451, 1449, 1446, 420, 1460, 2209, 769, 764, 720, 712, 2391, 729, 1713, 664, 663, 661, 659, 2352, 656, 2349, 671, 1679, 1677, 2553, 922, 919, 2519, 2516, 885, 883, 881, 2685, 2661, 2659, 2767, 2756, 2755, 140, 1137, 1136, 130, 127, 1125, 1124, 1122, 1127, 109, 106, 102, 1103, 1102, 1100, 1098, 116, 1107, 1105, 1980, 80, 76, 73, 1947, 1068, 1067, 1065, 1063, 90, 1060, 87, 1075, 1073, 1070, 1080, 1966, 1965, 46, 43, 40, 1912, 36, 1909, 1019, 1018, 1016, 1014, 58, 1011, 55, 1008, 51, 1029, 1027, 1024, 1021, 63, 1037, 1034, 1940, 1939, 1937, 1942, 8, 1866, 4, 1863, 1, 1860, 956, 954, 952, 949, 946, 17, 14, 969, 967, 964, 961, 27, 957, 24, 979, 976, 972, 1901, 1900, 1898, 1896, 986, 1905, 1903, 350, 349, 1381, 329, 327, 324, 1368, 1366, 292, 290, 287, 284, 2118, 304, 1341, 1339, 1337, 1345, 243, 240, 237, 2086, 233, 2083, 254, 1297, 1295, 1293, 1290, 1304, 2114, 190, 187, 184, 2034, 180, 2031, 177, 2027, 199, 1233, 1231, 1229, 1226, 217, 1223, 1241, 2078, 2076, 584, 555, 554, 552, 550, 2282, 562, 1586, 507, 506, 504, 502, 2257, 499, 2254, 515, 1563, 1561, 445, 443, 441, 2219, 438, 2216, 435, 2212, 460, 454, 475, 1517, 1515, 1512, 2447, 798, 797, 2422, 2419, 770, 768, 766, 2383, 2380, 2376, 721, 719, 717, 714, 731, 1714, 2602, 2582, 2580, 2548, 2546, 2543, 923, 921, 2717, 2706, 2705, 2683, 2682, 2680, 1771, 1752, 1750, 1733, 1732, 1731, 1735, 1814, 1707, 1670, 1668, 1631, 1629, 1626, 1634, 1599, 1598, 1596, 1594, 1603, 1601, 2326, 1772, 1753, 1751, 1581, 1554, 1552, 1504, 1501, 1498, 1509, 1442, 1437, 1434, 401, 1448, 1445, 2206, 1392, 1391, 1389, 1387, 1384, 359, 1399, 1397, 1394, 1404, 2171, 2170, 1708, 1672, 1669, 619, 1632, 1630, 1628, 1773, 1378, 1363, 1361, 1333, 1328, 1336, 1286, 1281, 1278, 248, 1292, 1289, 2111, 1218, 1216, 1210, 197, 1206, 193, 1228, 1225, 1221, 1236, 2073, 2071, 1151, 1150, 1148, 1146, 152, 1143, 149, 1140, 145, 1161, 1159, 1156, 1153, 158, 1169, 1166, 2017, 2016, 2014, 2019, 1582, 510, 1556, 1553, 452, 448, 1506, 1500, 394, 391, 387, 1443, 1441, 1439, 1436, 1450, 2207, 765, 716, 713, 1709, 662, 660, 657, 1673, 1671, 916, 914, 879, 878, 877, 882, 1135, 1134, 1121, 1120, 1118, 1123, 1097, 1096, 1094, 1092, 103, 1101, 1099, 1979, 1059, 1058, 1056, 1054, 77, 1051, 74, 1066, 1064, 1061, 1071, 1964, 1963, 1007, 1006, 1004, 1002, 999, 41, 996, 37, 1017, 1015, 1012, 1009, 52, 1025, 1022, 1936, 1935, 1933, 1938, 942, 940, 938, 935, 932, 5, 2, 955, 953, 950, 947, 18, 943, 15, 965, 962, 958, 1895, 1894, 1892, 1890, 973, 1899, 1897, 1379, 325, 1364, 1362, 288, 285, 1334, 1332, 1330, 241, 238, 234, 1287, 1285, 1283, 1280, 1294, 2112, 188, 185, 181, 178, 2028, 1219, 1217, 1215, 1212, 200, 1209, 1227, 2074, 2072, 583, 553, 551, 1583, 505, 503, 500, 513, 1557, 1555, 444, 442, 439, 436, 2213, 455, 451, 1507, 1505, 1502, 796, 763, 762, 760, 767, 711, 710, 708, 706, 2377, 718, 715, 1710, 2544, 917, 915, 2681, 1627, 1597, 1595, 2325, 1769, 1749, 1747, 1499, 1438, 1435, 2204, 1390, 1388, 1385, 1395, 2169, 2167, 1704, 1665, 1662, 1625, 1623, 1620, 1770, 1329, 1282, 1279, 2109, 1214, 1207, 1222, 2068, 2065, 1149, 1147, 1144, 1141, 146, 1157, 1154, 2013, 2011, 2008, 2015, 1579, 1549, 1546, 1495, 1487, 1433, 1431, 1428, 1425, 388, 1440, 2205, 1705, 658, 1667, 1664, 1119, 1095, 1093, 1978, 1057, 1055, 1052, 1062, 1962, 1960, 1005, 1003, 1000, 997, 38, 1013, 1010, 1932, 1930, 1927, 1934, 941, 939, 936, 933, 6, 930, 3, 951, 948, 944, 1889, 1887, 1884, 1881, 959, 1893, 1891, 35, 1377, 1360, 1358, 1327, 1325, 1322, 1331, 1277, 1275, 1272, 1269, 235, 1284, 2110, 1205, 1204, 1201, 1198, 182, 1195, 179, 1213, 2070, 2067, 1580, 501, 1551, 1548, 440, 437, 1497, 1494, 1490, 1503, 761, 709, 707, 1706, 913, 912, 2198, 1386, 2164, 2161, 1621, 1766, 2103, 1208, 2058, 2054, 1145, 1142, 2005, 2002, 1999, 2009, 1488, 1429, 1426, 2200, 1698, 1659, 1656, 1975, 1053, 1957, 1954, 1001, 998, 1924, 1921, 1918, 1928, 937, 934, 931, 1879, 1876, 1873, 1870, 945, 1885, 1882, 1323, 1273, 1270, 2105, 1202, 1199, 1196, 1211, 2061, 2057, 1576, 1543, 1540, 1484, 1481, 1478, 1491, 1700};
 
     public static int a(int i) {
         int binarySearch = Arrays.binarySearch(b, i & 262143);
         if (binarySearch < 0) {
             return -1;
         }
-        return (f1435c[binarySearch] - 1) % 929;
+        return (f1430c[binarySearch] - 1) % 929;
     }
 
     public static int[] b(Collection<Integer> collection) {
diff --git a/app/src/main/java/c/i/e/r/b.java b/app/src/main/java/c/i/e/r/b.java
index 72ff2297e9..eb98fb6914 100644
--- a/app/src/main/java/c/i/e/r/b.java
+++ b/app/src/main/java/c/i/e/r/b.java
@@ -36,15 +36,15 @@ public final class b implements i {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:312:0x064c, code lost:
-        r3 = new com.google.zxing.Result(r2.f1409c, r2.a, r4, c.i.e.a.PDF_417);
-        r3.b(c.i.e.j.ERROR_CORRECTION_LEVEL, r2.e);
+        r3 = new com.google.zxing.Result(r2.f1404c, r2.a, r4, c.i.e.a.PDF_417);
+        r3.b(c.i.e.j.l, r2.e);
         r2 = (c.i.e.r.c) r2.f;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:313:0x0662, code lost:
         if (r2 == null) goto L_0x0669;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:314:0x0664, code lost:
-        r3.b(c.i.e.j.PDF417_EXTRA_METADATA, r2);
+        r3.b(c.i.e.j.q, r2);
      */
     /* JADX WARNING: Code restructure failed: missing block: B:315:0x0669, code lost:
         r0.add(r3);
@@ -170,11 +170,11 @@ public final class b implements i {
                             if (a3 == null) {
                                 a3 = a4;
                             } else if (a4 != null) {
-                                a3 = new c.i.e.r.d.c(a3.a, a3.b, a3.f1437c, a4.d, a4.e);
+                                a3 = new c.i.e.r.d.c(a3.a, a3.b, a3.f1432c, a4.d, a4.e);
                             }
                             fVar2 = new f(aVar, a3);
                             if (fVar2 == null) {
-                                if (i12 != 0 || (cVar6 = fVar2.f1440c) == null) {
+                                if (i12 != 0 || (cVar6 = fVar2.f1435c) == null) {
                                     break;
                                 }
                                 cVar2 = cVar5;
@@ -197,7 +197,7 @@ public final class b implements i {
                 if (fVar2 == null) {
                 }
             }
-            fVar2.f1440c = cVar2;
+            fVar2.f1435c = cVar2;
             fVar = fVar2;
             hVar = hVar;
             int i21 = fVar.d + 1;
@@ -263,7 +263,7 @@ public final class b implements i {
                                             i25 = i5;
                                         } else {
                                             i5 = i25;
-                                            i6 = z3 ? fVar.f1440c.f : fVar.f1440c.g;
+                                            i6 = z3 ? fVar.f1435c.f : fVar.f1435c.g;
                                         }
                                     }
                                     if (i6 < 0 && i6 <= cVar2.g) {
@@ -468,7 +468,7 @@ public final class b implements i {
                                 int i64 = 0;
                                 for (int i65 = 14; i64 < i65; i65 = 14) {
                                     c.i.e.r.d.d dVar7 = dVarArr9[i64];
-                                    if (dVar7 != null && dVar7.a() && dVar7.f1438c == dVar6.f1438c) {
+                                    if (dVar7 != null && dVar7.a() && dVar7.f1433c == dVar6.f1433c) {
                                         dVar6.e = dVar7.e;
                                         z2 = true;
                                     } else {
diff --git a/app/src/main/java/c/i/e/r/d/a.java b/app/src/main/java/c/i/e/r/d/a.java
index 9b281d4be5..8c0a0d3465 100644
--- a/app/src/main/java/c/i/e/r/d/a.java
+++ b/app/src/main/java/c/i/e/r/d/a.java
@@ -5,14 +5,14 @@ public final class a {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1436c;
+    public final int f1431c;
     public final int d;
     public final int e;
 
     public a(int i, int i2, int i3, int i4) {
         this.a = i;
         this.b = i4;
-        this.f1436c = i2;
+        this.f1431c = i2;
         this.d = i3;
         this.e = i2 + i3;
     }
diff --git a/app/src/main/java/c/i/e/r/d/c.java b/app/src/main/java/c/i/e/r/d/c.java
index ac71dc9657..852c5d2342 100644
--- a/app/src/main/java/c/i/e/r/d/c.java
+++ b/app/src/main/java/c/i/e/r/d/c.java
@@ -9,7 +9,7 @@ public final class c {
     public final k b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final k f1437c;
+    public final k f1432c;
     public final k d;
     public final k e;
     public final int f;
@@ -32,7 +32,7 @@ public final class c {
             }
             this.a = bVar;
             this.b = kVar;
-            this.f1437c = kVar2;
+            this.f1432c = kVar2;
             this.d = kVar3;
             this.e = kVar4;
             this.f = (int) Math.min(kVar.a, kVar2.a);
@@ -47,7 +47,7 @@ public final class c {
     public c(c cVar) {
         this.a = cVar.a;
         this.b = cVar.b;
-        this.f1437c = cVar.f1437c;
+        this.f1432c = cVar.f1432c;
         this.d = cVar.d;
         this.e = cVar.e;
         this.f = cVar.f;
diff --git a/app/src/main/java/c/i/e/r/d/d.java b/app/src/main/java/c/i/e/r/d/d.java
index e59f351798..f29a9c42e3 100644
--- a/app/src/main/java/c/i/e/r/d/d.java
+++ b/app/src/main/java/c/i/e/r/d/d.java
@@ -5,24 +5,24 @@ public final class d {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1438c;
+    public final int f1433c;
     public final int d;
     public int e = -1;
 
     public d(int i, int i2, int i3, int i4) {
         this.a = i;
         this.b = i2;
-        this.f1438c = i3;
+        this.f1433c = i3;
         this.d = i4;
     }
 
     public boolean a() {
         int i = this.e;
-        return i != -1 && this.f1438c == (i % 3) * 3;
+        return i != -1 && this.f1433c == (i % 3) * 3;
     }
 
     public void b() {
-        this.e = (this.f1438c / 3) + ((this.d / 30) * 3);
+        this.e = (this.f1433c / 3) + ((this.d / 30) * 3);
     }
 
     public String toString() {
diff --git a/app/src/main/java/c/i/e/r/d/e.java b/app/src/main/java/c/i/e/r/d/e.java
index 6022f5c429..15083ce90f 100644
--- a/app/src/main/java/c/i/e/r/d/e.java
+++ b/app/src/main/java/c/i/e/r/d/e.java
@@ -9,17 +9,17 @@ public final class e {
     public static final char[] b = "0123456789&\r\t,:#-.$/+%*=^".toCharArray();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final BigInteger[] f1439c;
+    public static final BigInteger[] f1434c;
 
     static {
         BigInteger[] bigIntegerArr = new BigInteger[16];
-        f1439c = bigIntegerArr;
+        f1434c = bigIntegerArr;
         bigIntegerArr[0] = BigInteger.ONE;
         BigInteger valueOf = BigInteger.valueOf(900);
         bigIntegerArr[1] = valueOf;
         int i = 2;
         while (true) {
-            BigInteger[] bigIntegerArr2 = f1439c;
+            BigInteger[] bigIntegerArr2 = f1434c;
             if (i < bigIntegerArr2.length) {
                 bigIntegerArr2[i] = bigIntegerArr2[i - 1].multiply(valueOf);
                 i++;
@@ -32,7 +32,7 @@ public final class e {
     public static String a(int[] iArr, int i) throws FormatException {
         BigInteger bigInteger = BigInteger.ZERO;
         for (int i2 = 0; i2 < i; i2++) {
-            bigInteger = bigInteger.add(f1439c[(i - i2) - 1].multiply(BigInteger.valueOf((long) iArr[i2])));
+            bigInteger = bigInteger.add(f1434c[(i - i2) - 1].multiply(BigInteger.valueOf((long) iArr[i2])));
         }
         String bigInteger2 = bigInteger.toString();
         if (bigInteger2.charAt(0) == '1') {
diff --git a/app/src/main/java/c/i/e/r/d/f.java b/app/src/main/java/c/i/e/r/d/f.java
index ea9ceb1395..990fbe64f7 100644
--- a/app/src/main/java/c/i/e/r/d/f.java
+++ b/app/src/main/java/c/i/e/r/d/f.java
@@ -8,14 +8,14 @@ public final class f {
     public final g[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public c f1440c;
+    public c f1435c;
     public final int d;
 
     public f(a aVar, c cVar) {
         this.a = aVar;
         int i = aVar.a;
         this.d = i;
-        this.f1440c = cVar;
+        this.f1435c = cVar;
         this.b = new g[(i + 2)];
     }
 
@@ -23,7 +23,7 @@ public final class f {
         if (dVar.a()) {
             return i2;
         }
-        if (!(i != -1 && dVar.f1438c == (i % 3) * 3)) {
+        if (!(i != -1 && dVar.f1433c == (i % 3) * 3)) {
             return i2 + 1;
         }
         dVar.e = i;
@@ -43,9 +43,9 @@ public final class f {
             }
             hVar.d(dVarArr, aVar);
             c cVar = hVar.a;
-            boolean z2 = hVar.f1441c;
+            boolean z2 = hVar.f1436c;
             k kVar = z2 ? cVar.b : cVar.d;
-            k kVar2 = z2 ? cVar.f1437c : cVar.e;
+            k kVar2 = z2 ? cVar.f1432c : cVar.e;
             int b = hVar.b((int) kVar.b);
             int b2 = hVar.b((int) kVar2.b);
             int i2 = -1;
diff --git a/app/src/main/java/c/i/e/r/d/h.java b/app/src/main/java/c/i/e/r/d/h.java
index 49769acd4f..f2487ed1dc 100644
--- a/app/src/main/java/c/i/e/r/d/h.java
+++ b/app/src/main/java/c/i/e/r/d/h.java
@@ -3,11 +3,11 @@ package c.i.e.r.d;
 public final class h extends g {
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1441c;
+    public final boolean f1436c;
 
     public h(c cVar, boolean z2) {
         super(cVar);
-        this.f1441c = z2;
+        this.f1436c = z2;
     }
 
     public a c() {
@@ -21,7 +21,7 @@ public final class h extends g {
                 dVar.b();
                 int i = dVar.d % 30;
                 int i2 = dVar.e;
-                if (!this.f1441c) {
+                if (!this.f1436c) {
                     i2 += 2;
                 }
                 int i3 = i2 % 3;
@@ -52,7 +52,7 @@ public final class h extends g {
                 if (i3 > aVar.e) {
                     dVarArr[i] = null;
                 } else {
-                    if (!this.f1441c) {
+                    if (!this.f1436c) {
                         i3 += 2;
                     }
                     int i4 = i3 % 3;
@@ -64,7 +64,7 @@ public final class h extends g {
                         } else if (i2 / 3 != aVar.b || i2 % 3 != aVar.d) {
                             dVarArr[i] = null;
                         }
-                    } else if ((i2 * 3) + 1 != aVar.f1436c) {
+                    } else if ((i2 * 3) + 1 != aVar.f1431c) {
                         dVarArr[i] = null;
                     }
                 }
@@ -74,6 +74,6 @@ public final class h extends g {
 
     @Override // c.i.e.r.d.g
     public String toString() {
-        return "IsLeft: " + this.f1441c + '\n' + super.toString();
+        return "IsLeft: " + this.f1436c + '\n' + super.toString();
     }
 }
diff --git a/app/src/main/java/c/i/e/r/d/j.java b/app/src/main/java/c/i/e/r/d/j.java
index c58f36d231..282e684a3c 100644
--- a/app/src/main/java/c/i/e/r/d/j.java
+++ b/app/src/main/java/c/i/e/r/d/j.java
@@ -35,9 +35,9 @@ public final class j {
             iArr = null;
         } else {
             c cVar = hVar.a;
-            boolean z2 = hVar.f1441c;
+            boolean z2 = hVar.f1436c;
             k kVar5 = z2 ? cVar.b : cVar.d;
-            k kVar6 = z2 ? cVar.f1437c : cVar.e;
+            k kVar6 = z2 ? cVar.f1432c : cVar.e;
             int b = hVar.b((int) kVar6.b);
             d[] dVarArr = hVar.b;
             int i3 = -1;
@@ -106,9 +106,9 @@ public final class j {
             length2--;
         }
         c cVar2 = hVar.a;
-        boolean z3 = hVar.f1441c;
+        boolean z3 = hVar.f1436c;
         k kVar7 = cVar2.b;
-        k kVar8 = cVar2.f1437c;
+        k kVar8 = cVar2.f1432c;
         k kVar9 = cVar2.d;
         k kVar10 = cVar2.e;
         if (i11 > 0) {
@@ -242,7 +242,7 @@ public final class j {
                                         int i16 = iArr4[i15];
                                         Objects.requireNonNull(bVar3);
                                         if (i16 != 0) {
-                                            int i17 = length - bVar3.f1442c[i16];
+                                            int i17 = length - bVar3.f1437c[i16];
                                             if (i17 >= 0) {
                                                 iArr[i17] = aVar.a.e(iArr[i17], iArr6[i15]);
                                             } else {
diff --git a/app/src/main/java/c/i/e/r/d/k/b.java b/app/src/main/java/c/i/e/r/d/k/b.java
index 90cb45ebc9..cd896312c1 100644
--- a/app/src/main/java/c/i/e/r/d/k/b.java
+++ b/app/src/main/java/c/i/e/r/d/k/b.java
@@ -5,20 +5,20 @@ public final class b {
     public final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int[] f1442c;
+    public final int[] f1437c;
     public final c d;
     public final c e;
 
     public b(int i, int i2) {
         this.b = new int[i];
-        this.f1442c = new int[i];
+        this.f1437c = new int[i];
         int i3 = 1;
         for (int i4 = 0; i4 < i; i4++) {
             this.b[i4] = i3;
             i3 = (i3 * i2) % i;
         }
         for (int i5 = 0; i5 < i - 1; i5++) {
-            this.f1442c[this.b[i5]] = i5;
+            this.f1437c[this.b[i5]] = i5;
         }
         this.d = new c(this, new int[]{0});
         this.e = new c(this, new int[]{1});
@@ -42,7 +42,7 @@ public final class b {
 
     public int c(int i) {
         if (i != 0) {
-            return this.b[(929 - this.f1442c[i]) - 1];
+            return this.b[(929 - this.f1437c[i]) - 1];
         }
         throw new ArithmeticException();
     }
@@ -52,7 +52,7 @@ public final class b {
             return 0;
         }
         int[] iArr = this.b;
-        int[] iArr2 = this.f1442c;
+        int[] iArr2 = this.f1437c;
         return iArr[(iArr2[i] + iArr2[i2]) % 928];
     }
 
diff --git a/app/src/main/java/c/i/e/r/e/a.java b/app/src/main/java/c/i/e/r/e/a.java
index b782635b6d..648b8ce7f6 100644
--- a/app/src/main/java/c/i/e/r/e/a.java
+++ b/app/src/main/java/c/i/e/r/e/a.java
@@ -11,7 +11,7 @@ public final class a {
     public static final int[] b = {6, 2, 7, 3};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f1443c = {8, 1, 1, 1, 1, 1, 1, 3};
+    public static final int[] f1438c = {8, 1, 1, 1, 1, 1, 1, 3};
     public static final int[] d = {7, 1, 1, 3, 1, 1, 1, 2, 1};
 
     /* JADX WARNING: Code restructure failed: missing block: B:20:0x0068, code lost:
@@ -55,7 +55,7 @@ public final class a {
                 }
                 int i6 = bVar.i;
                 k[] kVarArr = new k[8];
-                k[] c2 = c(bVar, i5, i6, i3, i4, f1443c);
+                k[] c2 = c(bVar, i5, i6, i3, i4, f1438c);
                 int[] iArr = a;
                 for (int i7 = 0; i7 < iArr.length; i7++) {
                     kVarArr[iArr[i7]] = c2[i7];
diff --git a/app/src/main/java/c/i/e/s/a.java b/app/src/main/java/c/i/e/s/a.java
index 6cb2a08cca..28ac951da5 100644
--- a/app/src/main/java/c/i/e/s/a.java
+++ b/app/src/main/java/c/i/e/s/a.java
@@ -70,7 +70,7 @@ public class a implements i {
                         if (!c.i.e.s.c.e.c(iArr)) {
                             eVar2.g(iArr);
                         } else if (eVar2.e(iArr, i7, i9)) {
-                            if (eVar2.f1451c) {
+                            if (eVar2.f1446c) {
                                 z3 = eVar2.f();
                             } else {
                                 if (eVar2.b.size() > 1) {
@@ -83,7 +83,7 @@ public class a implements i {
                                         c.i.e.s.c.d next = it.next();
                                         if (next.d >= 2) {
                                             if (dVar != null) {
-                                                eVar2.f1451c = true;
+                                                eVar2.f1446c = true;
                                                 i2 = 2;
                                                 i3 = ((int) (Math.abs(dVar.a - next.a) - Math.abs(dVar.b - next.b))) / 2;
                                                 break;
@@ -115,7 +115,7 @@ public class a implements i {
                 }
                 if (c.i.e.s.c.e.c(iArr) && eVar2.e(iArr, i7, i5)) {
                     i6 = iArr[0];
-                    if (eVar2.f1451c) {
+                    if (eVar2.f1446c) {
                         z3 = eVar2.f();
                     }
                 }
@@ -128,7 +128,7 @@ public class a implements i {
                     float f5 = 0.0f;
                     float f6 = 0.0f;
                     for (c.i.e.s.c.d dVar2 : eVar2.b) {
-                        float f7 = dVar2.f1450c;
+                        float f7 = dVar2.f1445c;
                         f5 += f7;
                         f6 += f7 * f7;
                     }
@@ -138,7 +138,7 @@ public class a implements i {
                     float max = Math.max(0.2f * f9, (float) Math.sqrt((double) ((f6 / f8) - (f9 * f9))));
                     int i11 = 0;
                     while (i11 < eVar2.b.size() && eVar2.b.size() > 3) {
-                        if (Math.abs(eVar2.b.get(i11).f1450c - f9) > max) {
+                        if (Math.abs(eVar2.b.get(i11).f1445c - f9) > max) {
                             eVar2.b.remove(i11);
                             i11--;
                         }
@@ -147,7 +147,7 @@ public class a implements i {
                 }
                 if (eVar2.b.size() > 3) {
                     for (c.i.e.s.c.d dVar3 : eVar2.b) {
-                        f4 += dVar3.f1450c;
+                        f4 += dVar3.f1445c;
                     }
                     Collections.sort(eVar2.b, new e.b(f4 / ((float) eVar2.b.size()), null));
                     List<c.i.e.s.c.d> list = eVar2.b;
@@ -163,7 +163,7 @@ public class a implements i {
                 k.b(dVarArr);
                 f fVar = new f(dVarArr);
                 c.i.e.s.c.d dVar4 = fVar.b;
-                c.i.e.s.c.d dVar5 = fVar.f1452c;
+                c.i.e.s.c.d dVar5 = fVar.f1447c;
                 c.i.e.s.c.d dVar6 = fVar.a;
                 float a3 = (cVar2.a(dVar4, dVar6) + cVar2.a(dVar4, dVar5)) / 2.0f;
                 if (a3 >= 1.0f) {
@@ -315,7 +315,7 @@ public class a implements i {
             kVarArr[0] = kVarArr[2];
             kVarArr[2] = kVar;
         }
-        Result result = new Result(eVar.f1409c, eVar.a, kVarArr, c.i.e.a.QR_CODE);
+        Result result = new Result(eVar.f1404c, eVar.a, kVarArr, c.i.e.a.QR_CODE);
         List<byte[]> list2 = eVar.d;
         if (list2 != null) {
             result.b(c.i.e.j.BYTE_SEGMENTS, list2);
diff --git a/app/src/main/java/c/i/e/s/b/a.java b/app/src/main/java/c/i/e/s/b/a.java
index 2424f2a3f0..b57651ed53 100644
--- a/app/src/main/java/c/i/e/s/b/a.java
+++ b/app/src/main/java/c/i/e/s/b/a.java
@@ -8,7 +8,7 @@ public final class a {
     public j b;
 
     /* renamed from: c  reason: collision with root package name */
-    public g f1444c;
+    public g f1439c;
     public boolean d;
 
     public a(b bVar) throws FormatException {
@@ -44,7 +44,7 @@ public final class a {
     }
 
     public g c() throws FormatException {
-        g gVar = this.f1444c;
+        g gVar = this.f1439c;
         if (gVar != null) {
             return gVar;
         }
@@ -69,7 +69,7 @@ public final class a {
         if (a2 == null) {
             a2 = g.a(a ^ 21522, i ^ 21522);
         }
-        this.f1444c = a2;
+        this.f1439c = a2;
         if (a2 != null) {
             return a2;
         }
@@ -113,8 +113,8 @@ public final class a {
     }
 
     public void e() {
-        if (this.f1444c != null) {
-            c cVar = c.values()[this.f1444c.f1445c];
+        if (this.f1439c != null) {
+            c cVar = c.values()[this.f1439c.f1440c];
             b bVar = this.a;
             cVar.g(bVar, bVar.j);
         }
diff --git a/app/src/main/java/c/i/e/s/b/e.java b/app/src/main/java/c/i/e/s/b/e.java
index 901d54a83e..c93d579430 100644
--- a/app/src/main/java/c/i/e/s/b/e.java
+++ b/app/src/main/java/c/i/e/s/b/e.java
@@ -26,7 +26,7 @@ public final class e {
             try {
                 aVar.e();
                 aVar.b = null;
-                aVar.f1444c = null;
+                aVar.f1439c = null;
                 aVar.d = true;
                 aVar.d();
                 aVar.c();
@@ -45,7 +45,7 @@ public final class e {
             e = null;
             aVar.e();
             aVar.b = null;
-            aVar.f1444c = null;
+            aVar.f1439c = null;
             aVar.d = true;
             aVar.d();
             aVar.c();
@@ -70,7 +70,7 @@ public final class e {
         f fVar = aVar.c().b;
         g c2 = aVar.c();
         j d2 = aVar.d();
-        c cVar = c.values()[c2.f1445c];
+        c cVar = c.values()[c2.f1440c];
         b bVar2 = aVar.a;
         int i4 = bVar2.j;
         cVar.g(bVar2, i4);
@@ -94,7 +94,7 @@ public final class e {
         int i11 = 6;
         bVar3.k(6, 9, 1, i10);
         bVar3.k(9, 6, i10, 1);
-        if (d2.f1447c > 6) {
+        if (d2.f1442c > 6) {
             int i12 = c3 - 11;
             bVar3.k(i12, 0, 3, 6);
             bVar3.k(0, i12, 6, 3);
diff --git a/app/src/main/java/c/i/e/s/b/g.java b/app/src/main/java/c/i/e/s/b/g.java
index 50fd041e67..ec6218e17e 100644
--- a/app/src/main/java/c/i/e/s/b/g.java
+++ b/app/src/main/java/c/i/e/s/b/g.java
@@ -5,7 +5,7 @@ public final class g {
     public final f b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final byte f1445c;
+    public final byte f1440c;
 
     public g(int i) {
         int i2 = (i >> 3) & 3;
@@ -13,7 +13,7 @@ public final class g {
             f[] fVarArr = f.m;
             if (i2 < fVarArr.length) {
                 this.b = fVarArr[i2];
-                this.f1445c = (byte) (i & 7);
+                this.f1440c = (byte) (i & 7);
                 return;
             }
         }
@@ -55,10 +55,10 @@ public final class g {
             return false;
         }
         g gVar = (g) obj;
-        return this.b == gVar.b && this.f1445c == gVar.f1445c;
+        return this.b == gVar.b && this.f1440c == gVar.f1440c;
     }
 
     public int hashCode() {
-        return (this.b.ordinal() << 3) | this.f1445c;
+        return (this.b.ordinal() << 3) | this.f1440c;
     }
 }
diff --git a/app/src/main/java/c/i/e/s/b/h.java b/app/src/main/java/c/i/e/s/b/h.java
index 4cd3374cc1..748ae9af90 100644
--- a/app/src/main/java/c/i/e/s/b/h.java
+++ b/app/src/main/java/c/i/e/s/b/h.java
@@ -21,7 +21,7 @@ public enum h {
     }
 
     public int f(j jVar) {
-        int i = jVar.f1447c;
+        int i = jVar.f1442c;
         return this.characterCountBitsForVersions[i <= 9 ? 0 : i <= 26 ? (char) 1 : 2];
     }
 }
diff --git a/app/src/main/java/c/i/e/s/b/j.java b/app/src/main/java/c/i/e/s/b/j.java
index 679c0f7d12..df679d4078 100644
--- a/app/src/main/java/c/i/e/s/b/j.java
+++ b/app/src/main/java/c/i/e/s/b/j.java
@@ -5,7 +5,7 @@ public final class j {
     public static final j[] b = a();
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1447c;
+    public final int f1442c;
     public final int[] d;
     public final b[] e;
     public final int f;
@@ -33,7 +33,7 @@ public final class j {
     }
 
     public j(int i, int[] iArr, b... bVarArr) {
-        this.f1447c = i;
+        this.f1442c = i;
         this.d = iArr;
         this.e = bVarArr;
         int i2 = bVarArr[0].a;
@@ -82,10 +82,10 @@ public final class j {
     }
 
     public int c() {
-        return (this.f1447c * 4) + 17;
+        return (this.f1442c * 4) + 17;
     }
 
     public String toString() {
-        return String.valueOf(this.f1447c);
+        return String.valueOf(this.f1442c);
     }
 }
diff --git a/app/src/main/java/c/i/e/s/c/a.java b/app/src/main/java/c/i/e/s/c/a.java
index 742a360bc4..b4171c2dce 100644
--- a/app/src/main/java/c/i/e/s/c/a.java
+++ b/app/src/main/java/c/i/e/s/c/a.java
@@ -5,10 +5,10 @@ import c.i.e.k;
 public final class a extends k {
 
     /* renamed from: c  reason: collision with root package name */
-    public final float f1448c;
+    public final float f1443c;
 
     public a(float f, float f2, float f3) {
         super(f, f2);
-        this.f1448c = f3;
+        this.f1443c = f3;
     }
 }
diff --git a/app/src/main/java/c/i/e/s/c/b.java b/app/src/main/java/c/i/e/s/c/b.java
index 0060cb6268..93f81d896b 100644
--- a/app/src/main/java/c/i/e/s/c/b.java
+++ b/app/src/main/java/c/i/e/s/c/b.java
@@ -9,7 +9,7 @@ public final class b {
     public final List<a> b = new ArrayList(5);
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1449c;
+    public final int f1444c;
     public final int d;
     public final int e;
     public final int f;
@@ -19,7 +19,7 @@ public final class b {
 
     public b(c.i.e.n.b bVar, int i, int i2, int i3, int i4, float f, l lVar) {
         this.a = bVar;
-        this.f1449c = i;
+        this.f1444c = i;
         this.d = i2;
         this.e = i3;
         this.f = i4;
@@ -90,12 +90,12 @@ public final class b {
         float f2 = ((float) ((iArr[0] + iArr[1]) + iArr[2])) / 3.0f;
         for (a aVar : this.b) {
             if (Math.abs(f - aVar.b) <= f2 && Math.abs(a - aVar.a) <= f2) {
-                float abs = Math.abs(f2 - aVar.f1448c);
-                if (abs <= 1.0f || abs <= aVar.f1448c) {
+                float abs = Math.abs(f2 - aVar.f1443c);
+                if (abs <= 1.0f || abs <= aVar.f1443c) {
                     z2 = true;
                     continue;
                     if (z2) {
-                        return new a((aVar.a + a) / 2.0f, (aVar.b + f) / 2.0f, (aVar.f1448c + f2) / 2.0f);
+                        return new a((aVar.a + a) / 2.0f, (aVar.b + f) / 2.0f, (aVar.f1443c + f2) / 2.0f);
                     }
                 }
             }
diff --git a/app/src/main/java/c/i/e/s/c/c.java b/app/src/main/java/c/i/e/s/c/c.java
index 4cc8243064..5b649c9bb4 100644
--- a/app/src/main/java/c/i/e/s/c/c.java
+++ b/app/src/main/java/c/i/e/s/c/c.java
@@ -32,7 +32,7 @@ public class c {
             int min2 = Math.min(this.a.j - 1, i2 + i3) - max2;
             if (((float) min2) >= f3) {
                 b bVar = new b(this.a, max, max2, min, min2, f, this.b);
-                int i4 = bVar.f1449c;
+                int i4 = bVar.f1444c;
                 int i5 = bVar.f;
                 int i6 = bVar.e + i4;
                 int i7 = (i5 / 2) + bVar.d;
diff --git a/app/src/main/java/c/i/e/s/c/d.java b/app/src/main/java/c/i/e/s/c/d.java
index e5e7f31440..8b620d19ae 100644
--- a/app/src/main/java/c/i/e/s/c/d.java
+++ b/app/src/main/java/c/i/e/s/c/d.java
@@ -5,18 +5,18 @@ import c.i.e.k;
 public final class d extends k {
 
     /* renamed from: c  reason: collision with root package name */
-    public final float f1450c;
+    public final float f1445c;
     public final int d;
 
     public d(float f, float f2, float f3) {
         super(f, f2);
-        this.f1450c = f3;
+        this.f1445c = f3;
         this.d = 1;
     }
 
     public d(float f, float f2, float f3, int i) {
         super(f, f2);
-        this.f1450c = f3;
+        this.f1445c = f3;
         this.d = i;
     }
 }
diff --git a/app/src/main/java/c/i/e/s/c/e.java b/app/src/main/java/c/i/e/s/c/e.java
index 3b7c75d5d7..15fbecbff0 100644
--- a/app/src/main/java/c/i/e/s/c/e.java
+++ b/app/src/main/java/c/i/e/s/c/e.java
@@ -11,7 +11,7 @@ public class e {
     public final List<d> b = new ArrayList();
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f1451c;
+    public boolean f1446c;
     public final int[] d = new int[5];
     public final l e;
 
@@ -29,7 +29,7 @@ public class e {
             d dVar3 = dVar;
             d dVar4 = dVar2;
             int compare = Integer.compare(dVar4.d, dVar3.d);
-            return compare == 0 ? Float.compare(Math.abs(dVar3.f1450c - this.average), Math.abs(dVar4.f1450c - this.average)) : compare;
+            return compare == 0 ? Float.compare(Math.abs(dVar3.f1445c - this.average), Math.abs(dVar4.f1445c - this.average)) : compare;
         }
     }
 
@@ -44,7 +44,7 @@ public class e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
         @Override // java.util.Comparator
         public int compare(d dVar, d dVar2) {
-            return Float.compare(Math.abs(dVar2.f1450c - this.average), Math.abs(dVar.f1450c - this.average));
+            return Float.compare(Math.abs(dVar2.f1445c - this.average), Math.abs(dVar.f1445c - this.average));
         }
     }
 
@@ -267,8 +267,8 @@ public class e {
                                                             }
                                                             d dVar = this.b.get(i27);
                                                             if (Math.abs(f - dVar.b) <= f5 && Math.abs(f2 - dVar.a) <= f5) {
-                                                                float abs = Math.abs(f5 - dVar.f1450c);
-                                                                if (abs <= 1.0f || abs <= dVar.f1450c) {
+                                                                float abs = Math.abs(f5 - dVar.f1445c);
+                                                                if (abs <= 1.0f || abs <= dVar.f1445c) {
                                                                     z4 = true;
                                                                     if (!z4) {
                                                                         List<d> list = this.b;
@@ -276,7 +276,7 @@ public class e {
                                                                         int i29 = i28 + 1;
                                                                         float f6 = (float) i28;
                                                                         float f7 = (float) i29;
-                                                                        list.set(i27, new d(((dVar.a * f6) + f2) / f7, ((dVar.b * f6) + f) / f7, ((f6 * dVar.f1450c) + f5) / f7, i29));
+                                                                        list.set(i27, new d(((dVar.a * f6) + f2) / f7, ((dVar.b * f6) + f) / f7, ((f6 * dVar.f1445c) + f5) / f7, i29));
                                                                         z3 = true;
                                                                         break;
                                                                     }
@@ -324,7 +324,7 @@ public class e {
         for (d dVar : this.b) {
             if (dVar.d >= 2) {
                 i++;
-                f2 += dVar.f1450c;
+                f2 += dVar.f1445c;
             }
         }
         if (i < 3) {
@@ -332,7 +332,7 @@ public class e {
         }
         float f3 = f2 / ((float) size);
         for (d dVar2 : this.b) {
-            f += Math.abs(dVar2.f1450c - f3);
+            f += Math.abs(dVar2.f1445c - f3);
         }
         return f <= f2 * 0.05f;
     }
diff --git a/app/src/main/java/c/i/e/s/c/f.java b/app/src/main/java/c/i/e/s/c/f.java
index 51f04761cd..903ac47759 100644
--- a/app/src/main/java/c/i/e/s/c/f.java
+++ b/app/src/main/java/c/i/e/s/c/f.java
@@ -5,11 +5,11 @@ public final class f {
     public final d b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d f1452c;
+    public final d f1447c;
 
     public f(d[] dVarArr) {
         this.a = dVarArr[0];
         this.b = dVarArr[1];
-        this.f1452c = dVarArr[2];
+        this.f1447c = dVarArr[2];
     }
 }
diff --git a/app/src/main/java/c/j/a/f/d.java b/app/src/main/java/c/j/a/f/d.java
index 7416c949eb..dc2a224262 100644
--- a/app/src/main/java/c/j/a/f/d.java
+++ b/app/src/main/java/c/j/a/f/d.java
@@ -9,12 +9,12 @@ public abstract class d<TResult> {
     public HCaptchaException b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<c<TResult>> f1453c = new ArrayList();
+    public final List<c<TResult>> f1448c = new ArrayList();
     public final List<a> d = new ArrayList();
 
     public final void a() {
         if (this.a != null) {
-            Iterator<c<TResult>> it = this.f1453c.iterator();
+            Iterator<c<TResult>> it = this.f1448c.iterator();
             while (it.hasNext()) {
                 it.next().onSuccess(this.a);
                 it.remove();
diff --git a/app/src/main/java/c/k/a/a/a.java b/app/src/main/java/c/k/a/a/a.java
index 937d77778a..625d94605c 100644
--- a/app/src/main/java/c/k/a/a/a.java
+++ b/app/src/main/java/c/k/a/a/a.java
@@ -12,7 +12,7 @@ public class a extends Drawable {
     public Paint b = new Paint();
 
     /* renamed from: c  reason: collision with root package name */
-    public Paint f1454c = new Paint();
+    public Paint f1449c = new Paint();
     public Paint d = new Paint();
     public int e;
     public int f;
@@ -20,7 +20,7 @@ public class a extends Drawable {
 
     public a(int i) {
         this.a = i;
-        this.f1454c.setColor(-1);
+        this.f1449c.setColor(-1);
         this.d.setColor(-3421237);
     }
 
@@ -58,7 +58,7 @@ public class a extends Drawable {
                     rect2.left = i5;
                     rect2.bottom = i4 + i3;
                     rect2.right = i5 + i3;
-                    canvas.drawRect(rect2, z3 ? this.f1454c : this.d);
+                    canvas.drawRect(rect2, z3 ? this.f1449c : this.d);
                     z3 = !z3;
                 }
                 z2 = !z2;
diff --git a/app/src/main/java/c/k/a/a/b.java b/app/src/main/java/c/k/a/a/b.java
index f56186f6b5..4e4c5f092d 100644
--- a/app/src/main/java/c/k/a/a/b.java
+++ b/app/src/main/java/c/k/a/a/b.java
@@ -29,14 +29,14 @@ public class b extends BaseAdapter {
         public ColorPanelView b;
 
         /* renamed from: c  reason: collision with root package name */
-        public ImageView f1455c;
+        public ImageView f1450c;
         public int d;
 
         public C0150b(Context context) {
             View inflate = View.inflate(context, b.this.l == 0 ? R.d.cpv_color_item_square : R.d.cpv_color_item_circle, null);
             this.a = inflate;
             this.b = (ColorPanelView) inflate.findViewById(R.c.cpv_color_panel_view);
-            this.f1455c = (ImageView) this.a.findViewById(R.c.cpv_color_image_view);
+            this.f1450c = (ImageView) this.a.findViewById(R.c.cpv_color_image_view);
             this.d = this.b.getBorderColor();
             this.a.setTag(this);
         }
@@ -78,20 +78,20 @@ public class b extends BaseAdapter {
         int i2 = b.this.j[i];
         int alpha = Color.alpha(i2);
         bVar.b.setColor(i2);
-        bVar.f1455c.setImageResource(b.this.k == i ? R.b.cpv_preset_checked : 0);
+        bVar.f1450c.setImageResource(b.this.k == i ? R.b.cpv_preset_checked : 0);
         if (alpha == 255) {
             b bVar2 = b.this;
             if (i != bVar2.k || ColorUtils.calculateLuminance(bVar2.j[i]) < 0.65d) {
-                bVar.f1455c.setColorFilter((ColorFilter) null);
+                bVar.f1450c.setColorFilter((ColorFilter) null);
             } else {
-                bVar.f1455c.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+                bVar.f1450c.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
             }
         } else if (alpha <= 165) {
             bVar.b.setBorderColor(i2 | -16777216);
-            bVar.f1455c.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
+            bVar.f1450c.setColorFilter(-16777216, PorterDuff.Mode.SRC_IN);
         } else {
             bVar.b.setBorderColor(bVar.d);
-            bVar.f1455c.setColorFilter(-1, PorterDuff.Mode.SRC_IN);
+            bVar.f1450c.setColorFilter(-1, PorterDuff.Mode.SRC_IN);
         }
         bVar.b.setOnClickListener(new c(bVar, i));
         bVar.b.setOnLongClickListener(new d(bVar));
diff --git a/app/src/main/java/c/k/a/a/e.java b/app/src/main/java/c/k/a/a/e.java
index e4e8df92b0..07639a667e 100644
--- a/app/src/main/java/c/k/a/a/e.java
+++ b/app/src/main/java/c/k/a/a/e.java
@@ -67,20 +67,20 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public b f1456s;
+    public b f1451s;
     public LinearLayout t;
     public SeekBar u;
     public TextView v;
     public ColorPickerView w;
 
     /* renamed from: x  reason: collision with root package name */
-    public ColorPanelView f1457x;
+    public ColorPanelView f1452x;
 
     /* renamed from: y  reason: collision with root package name */
-    public EditText f1458y;
+    public EditText f1453y;
 
     /* renamed from: z  reason: collision with root package name */
-    public EditText f1459z;
+    public EditText f1454z;
 
     /* compiled from: ColorPickerDialog */
     public class a implements View.OnLongClickListener {
@@ -104,13 +104,13 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
 
         @Override // android.view.View.OnTouchListener
         public boolean onTouch(View view, MotionEvent motionEvent) {
-            EditText editText = e.this.f1459z;
+            EditText editText = e.this.f1454z;
             if (view == editText || !editText.hasFocus()) {
                 return false;
             }
-            e.this.f1459z.clearFocus();
-            ((InputMethodManager) e.this.getActivity().getSystemService("input_method")).hideSoftInputFromWindow(e.this.f1459z.getWindowToken(), 0);
-            e.this.f1459z.clearFocus();
+            e.this.f1454z.clearFocus();
+            ((InputMethodManager) e.this.getActivity().getSystemService("input_method")).hideSoftInputFromWindow(e.this.f1454z.getWindowToken(), 0);
+            e.this.f1454z.clearFocus();
             return true;
         }
     }
@@ -193,7 +193,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
 
         @Override // android.view.View.OnClickListener
         public void onClick(View view) {
-            int color = e.this.f1457x.getColor();
+            int color = e.this.f1452x.getColor();
             e eVar = e.this;
             int i = eVar.n;
             if (color == i) {
@@ -211,7 +211,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         @Override // android.view.View.OnFocusChangeListener
         public void onFocusChange(View view, boolean z2) {
             if (z2) {
-                ((InputMethodManager) e.this.getActivity().getSystemService("input_method")).showSoftInput(e.this.f1459z, 1);
+                ((InputMethodManager) e.this.getActivity().getSystemService("input_method")).showSoftInput(e.this.f1454z, 1);
             }
         }
     }
@@ -250,7 +250,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         public void onClick(View view) {
             if (!(view.getTag() instanceof Boolean) || !((Boolean) view.getTag()).booleanValue()) {
                 e.this.n = this.i.getColor();
-                b bVar = e.this.f1456s;
+                b bVar = e.this.f1451s;
                 bVar.k = -1;
                 bVar.notifyDataSetChanged();
                 for (int i = 0; i < e.this.t.getChildCount(); i++) {
@@ -282,7 +282,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         @StringRes
 
         /* renamed from: c  reason: collision with root package name */
-        public int f1460c = R.e.cpv_custom;
+        public int f1455c = R.e.cpv_custom;
         @StringRes
         public int d = R.e.cpv_select;
         @StringRes
@@ -308,7 +308,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         @ColorInt
 
         /* renamed from: s  reason: collision with root package name */
-        public int f1461s = 0;
+        public int f1456s = 0;
         @ColorInt
         public int t = 0;
         @DrawableRes
@@ -320,15 +320,15 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         @FontRes
 
         /* renamed from: x  reason: collision with root package name */
-        public int f1462x = 0;
+        public int f1457x = 0;
         @FontRes
 
         /* renamed from: y  reason: collision with root package name */
-        public int f1463y = 0;
+        public int f1458y = 0;
         @FontRes
 
         /* renamed from: z  reason: collision with root package name */
-        public int f1464z = 0;
+        public int f1459z = 0;
 
         public e a() {
             e eVar = new e();
@@ -345,21 +345,21 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
             bundle.putBoolean("showColorShades", this.m);
             bundle.putInt("colorShape", this.n);
             bundle.putInt("presetsButtonText", this.b);
-            bundle.putInt("customButtonText", this.f1460c);
+            bundle.putInt("customButtonText", this.f1455c);
             bundle.putInt("customButtonColor", this.o);
             bundle.putInt("customButtonTextColor", this.v);
             bundle.putInt("selectedButtonText", this.d);
             bundle.putInt("selectedButtonColor", this.p);
             bundle.putInt("selectedButtonTextColor", this.w);
             bundle.putInt("resetButtonText", this.e);
-            bundle.putInt("buttonFont", this.f1463y);
+            bundle.putInt("buttonFont", this.f1458y);
             bundle.putInt("titleTextColor", this.r);
-            bundle.putInt("titleFont", this.f1462x);
+            bundle.putInt("titleFont", this.f1457x);
             bundle.putInt("dividerColor", this.q);
-            bundle.putInt("backgroundColor", this.f1461s);
+            bundle.putInt("backgroundColor", this.f1456s);
             bundle.putInt("inputTextColor", this.t);
             bundle.putInt("inputBackground", this.u);
-            bundle.putInt("inputFont", this.f1464z);
+            bundle.putInt("inputFont", this.f1459z);
             eVar.setArguments(bundle);
             return eVar;
         }
@@ -392,7 +392,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         int parseInt;
         int parseInt2;
         int parseInt3;
-        if (this.f1459z.isFocused()) {
+        if (this.f1454z.isFocused()) {
             String obj = editable.toString();
             if (obj.startsWith("#")) {
                 obj = obj.substring(1);
@@ -511,26 +511,26 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
     public View i() {
         View inflate = View.inflate(getActivity(), R.d.cpv_dialog_color_picker, null);
         this.w = (ColorPickerView) inflate.findViewById(R.c.cpv_color_picker_view);
-        this.f1457x = (ColorPanelView) inflate.findViewById(R.c.cpv_color_panel_new);
-        this.f1459z = (EditText) inflate.findViewById(R.c.cpv_hex);
-        this.f1458y = (EditText) inflate.findViewById(R.c.cpv_hex_prefix);
+        this.f1452x = (ColorPanelView) inflate.findViewById(R.c.cpv_color_panel_new);
+        this.f1454z = (EditText) inflate.findViewById(R.c.cpv_hex);
+        this.f1453y = (EditText) inflate.findViewById(R.c.cpv_hex_prefix);
         this.A = inflate.findViewById(R.c.cpv_hex_container);
         this.w.setAlphaSliderVisible(this.F);
         this.w.b(this.n, true);
-        this.f1457x.setColor(this.n);
+        this.f1452x.setColor(this.n);
         l(this.n);
         if (!this.F) {
-            this.f1459z.setFilters(new InputFilter[]{new InputFilter.LengthFilter(6)});
+            this.f1454z.setFilters(new InputFilter[]{new InputFilter.LengthFilter(6)});
         }
-        this.f1457x.setOnClickListener(new f());
+        this.f1452x.setOnClickListener(new f());
         inflate.setOnTouchListener(this.J);
         this.w.setOnColorChangedListener(this);
-        this.f1459z.addTextChangedListener(this);
-        this.f1459z.setOnFocusChangeListener(new g());
+        this.f1454z.addTextChangedListener(this);
+        this.f1454z.setOnFocusChangeListener(new g());
         int i2 = getArguments().getInt("inputTextColor", 0);
         if (i2 != 0) {
-            this.f1459z.setTextColor(i2);
-            this.f1458y.setTextColor(i2);
+            this.f1454z.setTextColor(i2);
+            this.f1453y.setTextColor(i2);
         }
         int i3 = getArguments().getInt("inputBackground", 0);
         if (i3 != 0) {
@@ -538,8 +538,8 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
         }
         int i4 = getArguments().getInt("inputFont", 0);
         if (i4 != 0) {
-            this.f1459z.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
-            this.f1458y.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
+            this.f1454z.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
+            this.f1453y.setTypeface(ResourcesCompat.getFont(requireContext(), i4));
         }
         return inflate;
     }
@@ -632,7 +632,7 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
             }
         }
         b bVar = new b(hVar, iArr5, i8, this.r);
-        this.f1456s = bVar;
+        this.f1451s = bVar;
         gridView.setAdapter((ListAdapter) bVar);
         if (this.F) {
             int alpha2 = 255 - Color.alpha(this.n);
@@ -649,15 +649,15 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
 
     public void k(int i2) {
         this.n = i2;
-        ColorPanelView colorPanelView = this.f1457x;
+        ColorPanelView colorPanelView = this.f1452x;
         if (colorPanelView != null) {
             colorPanelView.setColor(i2);
         }
-        if (!this.H && this.f1459z != null) {
+        if (!this.H && this.f1454z != null) {
             l(i2);
-            if (this.f1459z.hasFocus()) {
-                ((InputMethodManager) getActivity().getSystemService("input_method")).hideSoftInputFromWindow(this.f1459z.getWindowToken(), 0);
-                this.f1459z.clearFocus();
+            if (this.f1454z.hasFocus()) {
+                ((InputMethodManager) getActivity().getSystemService("input_method")).hideSoftInputFromWindow(this.f1454z.getWindowToken(), 0);
+                this.f1454z.clearFocus();
             }
         }
         this.H = false;
@@ -665,9 +665,9 @@ public class e extends DialogFragment implements ColorPickerView.c, TextWatcher
 
     public final void l(int i2) {
         if (this.F) {
-            this.f1459z.setText(String.format("%08X", Integer.valueOf(i2)));
+            this.f1454z.setText(String.format("%08X", Integer.valueOf(i2)));
         } else {
-            this.f1459z.setText(String.format("%06X", Integer.valueOf(i2 & 16777215)));
+            this.f1454z.setText(String.format("%06X", Integer.valueOf(i2 & 16777215)));
         }
     }
 
diff --git a/app/src/main/java/c/k/a/a/f.java b/app/src/main/java/c/k/a/a/f.java
index 0b0f19a725..8e7ccbe311 100644
--- a/app/src/main/java/c/k/a/a/f.java
+++ b/app/src/main/java/c/k/a/a/f.java
@@ -24,13 +24,13 @@ public class f implements SeekBar.OnSeekBarChangeListener {
         int i2 = 255 - i;
         int i3 = 0;
         while (true) {
-            bVar = this.a.f1456s;
+            bVar = this.a.f1451s;
             int[] iArr = bVar.j;
             if (i3 >= iArr.length) {
                 break;
             }
             int i4 = iArr[i3];
-            this.a.f1456s.j[i3] = Color.argb(i2, Color.red(i4), Color.green(i4), Color.blue(i4));
+            this.a.f1451s.j[i3] = Color.argb(i2, Color.red(i4), Color.green(i4), Color.blue(i4));
             i3++;
         }
         bVar.notifyDataSetChanged();
diff --git a/app/src/main/java/c/l/a/a.java b/app/src/main/java/c/l/a/a.java
index 3646ce308a..5a0e4ec53a 100644
--- a/app/src/main/java/c/l/a/a.java
+++ b/app/src/main/java/c/l/a/a.java
@@ -37,7 +37,7 @@ public final class a extends Drawable implements Animatable2Compat {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f1465s;
+    public int f1460s;
     public boolean t;
     public long u;
     public Long v;
@@ -50,7 +50,7 @@ public final class a extends Drawable implements Animatable2Compat {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f1466c;
+        public final int f1461c;
         public final int d;
         public final Function0<Long> e;
 
@@ -73,7 +73,7 @@ public final class a extends Drawable implements Animatable2Compat {
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
         public C0152a(C0152a aVar) {
-            this(aVar.a.copy(), aVar.b, aVar.f1466c, aVar.d, aVar.e);
+            this(aVar.a.copy(), aVar.b, aVar.f1461c, aVar.d, aVar.e);
             m.checkNotNullParameter(aVar, "apngState");
         }
 
@@ -82,7 +82,7 @@ public final class a extends Drawable implements Animatable2Compat {
             m.checkNotNullParameter(function0, "currentTimeProvider");
             this.a = apng;
             this.b = i;
-            this.f1466c = i2;
+            this.f1461c = i2;
             this.d = i3;
             this.e = function0;
         }
@@ -114,7 +114,7 @@ public final class a extends Drawable implements Animatable2Compat {
         this.q = new int[frameCount];
         C0152a aVar2 = this.w;
         this.r = aVar2.b;
-        this.f1465s = aVar2.f1466c;
+        this.f1460s = aVar2.f1461c;
         for (int i = 1; i < frameCount; i++) {
             int[] iArr = this.q;
             int i2 = i - 1;
@@ -122,7 +122,7 @@ public final class a extends Drawable implements Animatable2Compat {
         }
         Rect bounds = getBounds();
         C0152a aVar3 = this.w;
-        bounds.set(0, 0, aVar3.b, aVar3.f1466c);
+        bounds.set(0, 0, aVar3.b, aVar3.f1461c);
     }
 
     @WorkerThread
@@ -230,7 +230,7 @@ public final class a extends Drawable implements Animatable2Compat {
 
     @Override // android.graphics.drawable.Drawable
     public int getIntrinsicHeight() {
-        return this.f1465s;
+        return this.f1460s;
     }
 
     @Override // android.graphics.drawable.Drawable
diff --git a/app/src/main/java/c/m/a/a.java b/app/src/main/java/c/m/a/a.java
index 4997d4f9a3..1c83bac3a0 100644
--- a/app/src/main/java/c/m/a/a.java
+++ b/app/src/main/java/c/m/a/a.java
@@ -33,7 +33,7 @@ public final class a {
         }
         if ((i & 16) != 0) {
             c cVar3 = c.e;
-            j5 = c.f1467c;
+            j5 = c.f1462c;
         } else {
             j5 = j2;
         }
diff --git a/app/src/main/java/c/m/a/c.java b/app/src/main/java/c/m/a/c.java
index d61c674333..db533b72ce 100644
--- a/app/src/main/java/c/m/a/c.java
+++ b/app/src/main/java/c/m/a/c.java
@@ -9,13 +9,13 @@ public final class c {
     public static final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final long f1467c;
+    public static final long f1462c;
     public static final long d = TimeUnit.SECONDS.toMillis(6);
     public static final c e = new c();
 
     static {
         TimeUnit timeUnit = TimeUnit.MINUTES;
         b = timeUnit.toMillis(1);
-        f1467c = timeUnit.toMillis(1);
+        f1462c = timeUnit.toMillis(1);
     }
 }
diff --git a/app/src/main/java/c/m/a/g/d/e.java b/app/src/main/java/c/m/a/g/d/e.java
index af7aeedd4c..32d5e2a900 100644
--- a/app/src/main/java/c/m/a/g/d/e.java
+++ b/app/src/main/java/c/m/a/g/d/e.java
@@ -11,7 +11,7 @@ public class e {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f1468c;
+    public final a f1463c;
 
     /* compiled from: SntpClient */
     public static class a extends IOException {
@@ -26,25 +26,25 @@ public class e {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f1469c;
+        public final long f1464c;
         public final c.m.a.b d;
 
         public b(long j, long j2, long j3, c.m.a.b bVar) {
             this.a = j;
             this.b = j2;
-            this.f1469c = j3;
+            this.f1464c = j3;
             this.d = bVar;
         }
 
         public long a() {
-            return this.a + this.f1469c + (this.d.b() - this.b);
+            return this.a + this.f1464c + (this.d.b() - this.b);
         }
     }
 
     public e(c.m.a.b bVar, c cVar, a aVar) {
         this.a = bVar;
         this.b = cVar;
-        this.f1468c = aVar;
+        this.f1463c = aVar;
     }
 
     public static void a(byte b2, byte b3, int i, long j) throws a {
@@ -96,10 +96,10 @@ public class e {
         DatagramSocket datagramSocket = null;
         try {
             InetAddress a2 = this.b.a(str);
-            datagramSocket = this.f1468c.c();
+            datagramSocket = this.f1463c.c();
             datagramSocket.setSoTimeout(l.intValue());
             byte[] bArr = new byte[48];
-            DatagramPacket b2 = this.f1468c.b(bArr, a2, 123);
+            DatagramPacket b2 = this.f1463c.b(bArr, a2, 123);
             bArr[0] = 27;
             long a3 = this.a.a();
             long b3 = this.a.b();
@@ -118,7 +118,7 @@ public class e {
             bArr[47] = (byte) ((int) (Math.random() * 255.0d));
             datagramSocket.send(b2);
             byte[] copyOf = Arrays.copyOf(bArr, 48);
-            datagramSocket.receive(this.f1468c.a(copyOf));
+            datagramSocket.receive(this.f1463c.a(copyOf));
             long b4 = this.a.b();
             long j5 = (b4 - b3) + a3;
             long c2 = c(copyOf, 24);
diff --git a/app/src/main/java/c/m/a/g/d/g.java b/app/src/main/java/c/m/a/g/d/g.java
index 22649c3099..df08f9588c 100644
--- a/app/src/main/java/c/m/a/g/d/g.java
+++ b/app/src/main/java/c/m/a/g/d/g.java
@@ -21,7 +21,7 @@ public final class g implements f {
         m.checkParameterIsNotNull(bVar, "response");
         this.a.f(bVar.a);
         this.a.a(bVar.b);
-        this.a.b(bVar.f1469c);
+        this.a.b(bVar.f1464c);
     }
 
     @Override // c.m.a.g.d.f
diff --git a/app/src/main/java/c/m/a/g/d/i.java b/app/src/main/java/c/m/a/g/d/i.java
index 74284ec2f2..84b332132a 100644
--- a/app/src/main/java/c/m/a/g/d/i.java
+++ b/app/src/main/java/c/m/a/g/d/i.java
@@ -18,7 +18,7 @@ public final class i implements h {
     public final AtomicLong b = new AtomicLong(0);
 
     /* renamed from: c  reason: collision with root package name */
-    public final ExecutorService f1470c = Executors.newSingleThreadExecutor(b.i);
+    public final ExecutorService f1465c = Executors.newSingleThreadExecutor(b.i);
     public final e d;
     public final c.m.a.b e;
     public final f f;
@@ -78,7 +78,7 @@ public final class i implements h {
                             m.checkExpressionValueIsNotNull(d, "response");
                             if (d.a() >= 0) {
                                 iVar.f.a(d);
-                                long j = d.f1469c;
+                                long j = d.f1464c;
                                 long b2 = iVar.e.b() - b;
                                 c.m.a.e eVar2 = iVar.g;
                                 if (eVar2 != null) {
@@ -151,7 +151,7 @@ public final class i implements h {
     public void b() {
         c();
         if (this.a.get() != a.SYNCING) {
-            this.f1470c.submit(new c(this));
+            this.f1465c.submit(new c(this));
         }
     }
 
diff --git a/app/src/main/java/c/n/a/a/b.java b/app/src/main/java/c/n/a/a/b.java
index 765d631504..31026c89a5 100644
--- a/app/src/main/java/c/n/a/a/b.java
+++ b/app/src/main/java/c/n/a/a/b.java
@@ -23,7 +23,7 @@ public interface b extends IInterface {
             }
 
             @Override // c.n.a.a.b
-            public String N(String str, String str2, String str3, a aVar) throws RemoteException {
+            public String O(String str, String str2, String str3, a aVar) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
@@ -75,7 +75,7 @@ public interface b extends IInterface {
         }
     }
 
-    String N(String str, String str2, String str3, a aVar) throws RemoteException;
+    String O(String str, String str2, String str3, a aVar) throws RemoteException;
 
     boolean j0(int i, String str, Bundle bundle) throws RemoteException;
 }
diff --git a/app/src/main/java/c/o/a/b.java b/app/src/main/java/c/o/a/b.java
index f39c62b002..3b97804e89 100644
--- a/app/src/main/java/c/o/a/b.java
+++ b/app/src/main/java/c/o/a/b.java
@@ -13,7 +13,7 @@ public final class b {
     @VisibleForTesting
 
     /* renamed from: c  reason: collision with root package name */
-    public static AbstractC0156b f1471c;
+    public static AbstractC0156b f1466c;
     @NonNull
     public String d;
 
@@ -43,7 +43,7 @@ public final class b {
         CopyOnWriteArraySet copyOnWriteArraySet = new CopyOnWriteArraySet();
         b = copyOnWriteArraySet;
         a aVar = new a();
-        f1471c = aVar;
+        f1466c = aVar;
         copyOnWriteArraySet.add(aVar);
     }
 
diff --git a/app/src/main/java/c/o/a/c.java b/app/src/main/java/c/o/a/c.java
index 9f026c795e..26def553e2 100644
--- a/app/src/main/java/c/o/a/c.java
+++ b/app/src/main/java/c/o/a/c.java
@@ -24,7 +24,7 @@ public abstract class c {
     public Set<e> b = new HashSet(2);
 
     /* renamed from: c  reason: collision with root package name */
-    public Set<f> f1472c = new HashSet(4);
+    public Set<f> f1467c = new HashSet(4);
     public Set<h> d = new HashSet(2);
     public Set<b> e = new HashSet(15);
     public Set<b> f = new HashSet(5);
@@ -47,7 +47,7 @@ public abstract class c {
 
     @NonNull
     public final Collection<f> b() {
-        return Collections.unmodifiableSet(this.f1472c);
+        return Collections.unmodifiableSet(this.f1467c);
     }
 
     public final boolean c(@NonNull c.o.a.m.c cVar) {
diff --git a/app/src/main/java/c/o/a/l.java b/app/src/main/java/c/o/a/l.java
index 6a1b892714..1be421f2e9 100644
--- a/app/src/main/java/c/o/a/l.java
+++ b/app/src/main/java/c/o/a/l.java
@@ -15,7 +15,7 @@ public class l {
         public Location b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f1473c;
+        public int f1468c;
         public b d;
         public e e;
         public byte[] f;
diff --git a/app/src/main/java/c/o/a/n/b.java b/app/src/main/java/c/o/a/n/b.java
index 7f008ffc1a..ba780c4114 100644
--- a/app/src/main/java/c/o/a/n/b.java
+++ b/app/src/main/java/c/o/a/n/b.java
@@ -26,14 +26,14 @@ import java.util.Objects;
 public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback, a.AbstractC0165a {
 
     /* renamed from: c0  reason: collision with root package name */
-    public final c.o.a.n.q.a f1474c0 = c.o.a.n.q.a.a();
+    public final c.o.a.n.q.a f1469c0 = c.o.a.n.q.a.a();
 
     /* renamed from: d0  reason: collision with root package name */
-    public Camera f1475d0;
+    public Camera f1470d0;
     @VisibleForTesting
 
     /* renamed from: e0  reason: collision with root package name */
-    public int f1476e0;
+    public int f1471e0;
 
     /* compiled from: Camera1Engine */
     public class a implements Runnable {
@@ -66,8 +66,8 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
                 @Override // java.lang.Runnable
                 public void run() {
-                    b.this.f1475d0.cancelAutoFocus();
-                    Camera.Parameters parameters = b.this.f1475d0.getParameters();
+                    b.this.f1470d0.cancelAutoFocus();
+                    Camera.Parameters parameters = b.this.f1470d0.getParameters();
                     int maxNumFocusAreas = parameters.getMaxNumFocusAreas();
                     int maxNumMeteringAreas = parameters.getMaxNumMeteringAreas();
                     if (maxNumFocusAreas > 0) {
@@ -77,7 +77,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
                         parameters.setMeteringAreas(null);
                     }
                     b.this.c1(parameters);
-                    b.this.f1475d0.setParameters(parameters);
+                    b.this.f1470d0.setParameters(parameters);
                 }
             }
 
@@ -110,7 +110,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
                 b bVar = b.this;
                 c.o.a.n.s.a aVar = new c.o.a.n.s.a(bVar.K, bVar.n.l());
                 c.o.a.t.b c2 = this.i.c(aVar);
-                Camera.Parameters parameters = b.this.f1475d0.getParameters();
+                Camera.Parameters parameters = b.this.f1470d0.getParameters();
                 int maxNumFocusAreas = parameters.getMaxNumFocusAreas();
                 int maxNumMeteringAreas = parameters.getMaxNumMeteringAreas();
                 if (maxNumFocusAreas > 0) {
@@ -120,12 +120,12 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
                     parameters.setMeteringAreas(c2.b(maxNumMeteringAreas, aVar));
                 }
                 parameters.setFocusMode("auto");
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
                 ((CameraView.b) b.this.l).e(this.j, this.k);
                 b.this.m.e("focus end", 0);
                 b.this.m.c("focus end", true, 2500, new RunnableC0157a());
                 try {
-                    b.this.f1475d0.autoFocus(new C0158b());
+                    b.this.f1470d0.autoFocus(new C0158b());
                 } catch (RuntimeException e) {
                     i.i.a(3, "startAutoFocus:", "Error calling autoFocus", e);
                 }
@@ -144,9 +144,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             if (b.this.e1(parameters, this.i)) {
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
             }
         }
     }
@@ -161,9 +161,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             b.this.g1(parameters);
-            b.this.f1475d0.setParameters(parameters);
+            b.this.f1470d0.setParameters(parameters);
         }
     }
 
@@ -177,9 +177,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             if (b.this.j1(parameters, this.i)) {
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
             }
         }
     }
@@ -194,9 +194,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             if (b.this.f1(parameters, this.i)) {
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
             }
         }
     }
@@ -215,9 +215,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             if (b.this.k1(parameters, this.i)) {
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
                 if (this.j) {
                     b bVar = b.this;
                     ((CameraView.b) bVar.l).f(bVar.C, this.k);
@@ -242,9 +242,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             if (b.this.d1(parameters, this.i)) {
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
                 if (this.j) {
                     b bVar = b.this;
                     ((CameraView.b) bVar.l).c(bVar.D, this.k, this.l);
@@ -277,9 +277,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
         @Override // java.lang.Runnable
         public void run() {
-            Camera.Parameters parameters = b.this.f1475d0.getParameters();
+            Camera.Parameters parameters = b.this.f1470d0.getParameters();
             if (b.this.i1(parameters, this.i)) {
-                b.this.f1475d0.setParameters(parameters);
+                b.this.f1470d0.setParameters(parameters);
             }
         }
     }
@@ -318,9 +318,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         bVar.a(1, "onStartBind:", "Started");
         try {
             if (this.n.j() == SurfaceHolder.class) {
-                this.f1475d0.setPreviewDisplay((SurfaceHolder) this.n.i());
+                this.f1470d0.setPreviewDisplay((SurfaceHolder) this.n.i());
             } else if (this.n.j() == SurfaceTexture.class) {
-                this.f1475d0.setPreviewTexture((SurfaceTexture) this.n.i());
+                this.f1470d0.setPreviewTexture((SurfaceTexture) this.n.i());
             } else {
                 throw new RuntimeException("Unknown CameraPreview output class.");
             }
@@ -338,23 +338,23 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
     @NonNull
     public Task<c.o.a.c> Q() {
         try {
-            Camera open = Camera.open(this.f1476e0);
-            this.f1475d0 = open;
+            Camera open = Camera.open(this.f1471e0);
+            this.f1470d0 = open;
             if (open != null) {
                 open.setErrorCallback(this);
                 c.o.a.b bVar = i.i;
                 bVar.a(1, "onStartEngine:", "Applying default parameters.");
                 try {
-                    Camera.Parameters parameters = this.f1475d0.getParameters();
-                    int i2 = this.f1476e0;
+                    Camera.Parameters parameters = this.f1470d0.getParameters();
+                    int i2 = this.f1471e0;
                     c.o.a.n.t.a aVar = this.K;
                     c.o.a.n.t.b bVar2 = c.o.a.n.t.b.SENSOR;
                     c.o.a.n.t.b bVar3 = c.o.a.n.t.b.VIEW;
                     this.o = new c.o.a.n.u.a(parameters, i2, aVar.b(bVar2, bVar3));
                     b1(parameters);
-                    this.f1475d0.setParameters(parameters);
+                    this.f1470d0.setParameters(parameters);
                     try {
-                        this.f1475d0.setDisplayOrientation(this.K.c(bVar2, bVar3, 1));
+                        this.f1470d0.setDisplayOrientation(this.K.c(bVar2, bVar3, 1));
                         bVar.a(1, "onStartEngine:", "Ended");
                         return c.i.a.f.e.o.c.F(this.o);
                     } catch (Exception unused) {
@@ -386,7 +386,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
             this.n.s(C.i, C.j);
             this.n.r(0);
             try {
-                Camera.Parameters parameters = this.f1475d0.getParameters();
+                Camera.Parameters parameters = this.f1470d0.getParameters();
                 parameters.setPreviewFormat(17);
                 c.o.a.x.b bVar2 = this.r;
                 parameters.setPreviewSize(bVar2.i, bVar2.j);
@@ -400,13 +400,13 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
                     parameters.setPictureSize(Q0.i, Q0.j);
                 }
                 try {
-                    this.f1475d0.setParameters(parameters);
-                    this.f1475d0.setPreviewCallbackWithBuffer(null);
-                    this.f1475d0.setPreviewCallbackWithBuffer(this);
+                    this.f1470d0.setParameters(parameters);
+                    this.f1470d0.setPreviewCallbackWithBuffer(null);
+                    this.f1470d0.setPreviewCallbackWithBuffer(this);
                     l1().e(17, this.r, this.K);
                     bVar.a(1, "onStartPreview", "Starting preview with startPreview().");
                     try {
-                        this.f1475d0.startPreview();
+                        this.f1470d0.startPreview();
                         bVar.a(1, "onStartPreview", "Started preview.");
                         return c.i.a.f.e.o.c.F(null);
                     } catch (Exception e2) {
@@ -433,9 +433,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         this.q = null;
         try {
             if (this.n.j() == SurfaceHolder.class) {
-                this.f1475d0.setPreviewDisplay(null);
+                this.f1470d0.setPreviewDisplay(null);
             } else if (this.n.j() == SurfaceTexture.class) {
-                this.f1475d0.setPreviewTexture(null);
+                this.f1470d0.setPreviewTexture(null);
             } else {
                 throw new RuntimeException("Unknown CameraPreview output class.");
             }
@@ -452,19 +452,19 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         bVar.a(1, "onStopEngine:", "About to clean up.");
         this.m.e("focus reset", 0);
         this.m.e("focus end", 0);
-        if (this.f1475d0 != null) {
+        if (this.f1470d0 != null) {
             try {
                 bVar.a(1, "onStopEngine:", "Clean up.", "Releasing camera.");
-                this.f1475d0.release();
+                this.f1470d0.release();
                 bVar.a(1, "onStopEngine:", "Clean up.", "Released camera.");
             } catch (Exception e2) {
                 i.i.a(2, "onStopEngine:", "Clean up.", "Exception while releasing camera.", e2);
             }
-            this.f1475d0 = null;
+            this.f1470d0 = null;
             this.o = null;
         }
         this.o = null;
-        this.f1475d0 = null;
+        this.f1470d0 = null;
         i.i.a(2, "onStopEngine:", "Clean up.", "Returning.");
         return c.i.a.f.e.o.c.F(null);
     }
@@ -473,7 +473,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
     @NonNull
     public List<c.o.a.x.b> T0() {
         try {
-            List<Camera.Size> supportedPreviewSizes = this.f1475d0.getParameters().getSupportedPreviewSizes();
+            List<Camera.Size> supportedPreviewSizes = this.f1470d0.getParameters().getSupportedPreviewSizes();
             ArrayList arrayList = new ArrayList(supportedPreviewSizes.size());
             for (Camera.Size size : supportedPreviewSizes) {
                 c.o.a.x.b bVar = new c.o.a.x.b(size.width, size.height);
@@ -497,10 +497,10 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         this.p = null;
         l1().d();
         bVar.a(1, "onStopPreview:", "Releasing preview buffers.");
-        this.f1475d0.setPreviewCallbackWithBuffer(null);
+        this.f1470d0.setPreviewCallbackWithBuffer(null);
         try {
             bVar.a(1, "onStopPreview:", "Stopping preview.");
-            this.f1475d0.stopPreview();
+            this.f1470d0.stopPreview();
             bVar.a(1, "onStopPreview:", "Stopped preview.");
         } catch (Exception e2) {
             i.i.a(3, "stopPreview", "Could not stop preview", e2);
@@ -528,9 +528,9 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         c.o.a.n.t.a aVar2 = this.K;
         c.o.a.n.t.b bVar2 = c.o.a.n.t.b.SENSOR;
         c.o.a.n.t.b bVar3 = c.o.a.n.t.b.OUTPUT;
-        aVar.f1473c = aVar2.c(bVar2, bVar3, 2);
+        aVar.f1468c = aVar2.c(bVar2, bVar3, 2);
         aVar.d = w(bVar3);
-        c.o.a.v.a aVar3 = new c.o.a.v.a(aVar, this, this.f1475d0);
+        c.o.a.v.a aVar3 = new c.o.a.v.a(aVar, this, this.f1470d0);
         this.p = aVar3;
         aVar3.c();
         bVar.a(1, "onTakePicture:", "executed.");
@@ -543,11 +543,11 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         c.o.a.n.t.b bVar2 = c.o.a.n.t.b.OUTPUT;
         aVar.d = F(bVar2);
         if (this.n instanceof c.o.a.w.e) {
-            aVar.f1473c = this.K.c(c.o.a.n.t.b.VIEW, bVar2, 1);
-            this.p = new c.o.a.v.g(aVar, this, (c.o.a.w.e) this.n, aVar2, this.f1486b0);
+            aVar.f1468c = this.K.c(c.o.a.n.t.b.VIEW, bVar2, 1);
+            this.p = new c.o.a.v.g(aVar, this, (c.o.a.w.e) this.n, aVar2, this.f1481b0);
         } else {
-            aVar.f1473c = this.K.c(c.o.a.n.t.b.SENSOR, bVar2, 2);
-            this.p = new c.o.a.v.e(aVar, this, this.f1475d0, aVar2);
+            aVar.f1468c = this.K.c(c.o.a.n.t.b.SENSOR, bVar2, 2);
+            this.p = new c.o.a.v.e(aVar, this, this.f1470d0, aVar2);
         }
         this.p.c();
         bVar.a(1, "onTakePictureSnapshot:", "executed.");
@@ -568,7 +568,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
     @Override // c.o.a.n.i
     public boolean c(@NonNull c.o.a.m.e eVar) {
-        Objects.requireNonNull(this.f1474c0);
+        Objects.requireNonNull(this.f1469c0);
         int intValue = c.o.a.n.q.a.d.get(eVar).intValue();
         i.i.a(1, "collectCameraInfo", "Facing:", eVar, "Internal:", Integer.valueOf(intValue), "Cameras:", Integer.valueOf(Camera.getNumberOfCameras()));
         Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
@@ -577,7 +577,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
             Camera.getCameraInfo(i2, cameraInfo);
             if (cameraInfo.facing == intValue) {
                 this.K.f(eVar, cameraInfo.orientation);
-                this.f1476e0 = i2;
+                this.f1471e0 = i2;
                 return true;
             }
         }
@@ -627,7 +627,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
     public final boolean e1(@NonNull Camera.Parameters parameters, @NonNull c.o.a.m.f fVar) {
         if (this.o.c(this.v)) {
-            c.o.a.n.q.a aVar = this.f1474c0;
+            c.o.a.n.q.a aVar = this.f1469c0;
             c.o.a.m.f fVar2 = this.v;
             Objects.requireNonNull(aVar);
             parameters.setFlashMode(c.o.a.n.q.a.b.get(fVar2));
@@ -646,14 +646,14 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
     }
 
     public final boolean f1(@NonNull Camera.Parameters parameters, @NonNull c.o.a.m.h hVar) {
-        if (this.o.c(this.f1490z)) {
-            c.o.a.n.q.a aVar = this.f1474c0;
-            c.o.a.m.h hVar2 = this.f1490z;
+        if (this.o.c(this.f1485z)) {
+            c.o.a.n.q.a aVar = this.f1469c0;
+            c.o.a.m.h hVar2 = this.f1485z;
             Objects.requireNonNull(aVar);
             parameters.setSceneMode(c.o.a.n.q.a.e.get(hVar2));
             return true;
         }
-        this.f1490z = hVar;
+        this.f1485z = hVar;
         return false;
     }
 
@@ -678,10 +678,10 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
     @TargetApi(17)
     public final boolean h1(boolean z2) {
         Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
-        Camera.getCameraInfo(this.f1476e0, cameraInfo);
+        Camera.getCameraInfo(this.f1471e0, cameraInfo);
         if (cameraInfo.canDisableShutterSound) {
             try {
-                return this.f1475d0.enableShutterSound(this.E);
+                return this.f1470d0.enableShutterSound(this.E);
             } catch (RuntimeException unused) {
                 return false;
             }
@@ -729,10 +729,10 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
     public final boolean j1(@NonNull Camera.Parameters parameters, @NonNull m mVar) {
         if (this.o.c(this.w)) {
-            c.o.a.n.q.a aVar = this.f1474c0;
+            c.o.a.n.q.a aVar = this.f1469c0;
             m mVar2 = this.w;
             Objects.requireNonNull(aVar);
-            parameters.setWhiteBalance(c.o.a.n.q.a.f1492c.get(mVar2));
+            parameters.setWhiteBalance(c.o.a.n.q.a.f1487c.get(mVar2));
             parameters.remove("auto-whitebalance-lock");
             return true;
         }
@@ -748,7 +748,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
     public final boolean k1(@NonNull Camera.Parameters parameters, float f2) {
         if (this.o.k) {
             parameters.setZoom((int) (this.C * ((float) parameters.getMaxZoom())));
-            this.f1475d0.setParameters(parameters);
+            this.f1470d0.setParameters(parameters);
             return true;
         }
         this.C = f2;
@@ -757,8 +757,8 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
 
     @Override // c.o.a.n.i
     public void l0(@NonNull c.o.a.m.h hVar) {
-        c.o.a.m.h hVar2 = this.f1490z;
-        this.f1490z = hVar;
+        c.o.a.m.h hVar2 = this.f1485z;
+        this.f1485z = hVar;
         c.o.a.n.v.f fVar = this.m;
         fVar.b("hdr (" + hVar + ")", true, new c.o.a.n.v.h(fVar, c.o.a.n.v.e.ENGINE, new e(hVar2)));
     }
@@ -780,7 +780,7 @@ public class b extends g implements Camera.PreviewCallback, Camera.ErrorCallback
         c.o.a.n.v.e eVar = this.m.f;
         c.o.a.n.v.e eVar2 = c.o.a.n.v.e.ENGINE;
         if (eVar.f(eVar2) && this.m.g.f(eVar2)) {
-            this.f1475d0.addCallbackBuffer(bArr);
+            this.f1470d0.addCallbackBuffer(bArr);
         }
     }
 
diff --git a/app/src/main/java/c/o/a/n/d.java b/app/src/main/java/c/o/a/n/d.java
index 4ebf509808..e1f84ec139 100644
--- a/app/src/main/java/c/o/a/n/d.java
+++ b/app/src/main/java/c/o/a/n/d.java
@@ -47,28 +47,28 @@ import java.util.concurrent.ExecutionException;
 public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.n.o.c {
 
     /* renamed from: c0  reason: collision with root package name */
-    public final CameraManager f1477c0;
+    public final CameraManager f1472c0;
 
     /* renamed from: d0  reason: collision with root package name */
-    public String f1478d0;
+    public String f1473d0;
 
     /* renamed from: e0  reason: collision with root package name */
-    public CameraDevice f1479e0;
+    public CameraDevice f1474e0;
 
     /* renamed from: f0  reason: collision with root package name */
-    public CameraCharacteristics f1480f0;
+    public CameraCharacteristics f1475f0;
 
     /* renamed from: g0  reason: collision with root package name */
-    public CameraCaptureSession f1481g0;
+    public CameraCaptureSession f1476g0;
 
     /* renamed from: h0  reason: collision with root package name */
-    public CaptureRequest.Builder f1482h0;
+    public CaptureRequest.Builder f1477h0;
 
     /* renamed from: i0  reason: collision with root package name */
-    public TotalCaptureResult f1483i0;
+    public TotalCaptureResult f1478i0;
 
     /* renamed from: j0  reason: collision with root package name */
-    public final c.o.a.n.q.b f1484j0;
+    public final c.o.a.n.q.b f1479j0;
     public ImageReader k0;
     public Surface l0;
     public Surface m0;
@@ -90,17 +90,17 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            boolean h1 = dVar.h1(dVar.f1482h0, this.i);
+            boolean h1 = dVar.h1(dVar.f1477h0, this.i);
             d dVar2 = d.this;
             if (dVar2.m.f == c.o.a.n.v.e.PREVIEW) {
                 dVar2.v = c.o.a.m.f.OFF;
-                dVar2.h1(dVar2.f1482h0, this.i);
+                dVar2.h1(dVar2.f1477h0, this.i);
                 try {
                     d dVar3 = d.this;
-                    dVar3.f1481g0.capture(dVar3.f1482h0.build(), null, null);
+                    dVar3.f1476g0.capture(dVar3.f1477h0.build(), null, null);
                     d dVar4 = d.this;
                     dVar4.v = this.j;
-                    dVar4.h1(dVar4.f1482h0, this.i);
+                    dVar4.h1(dVar4.f1477h0, this.i);
                     d.this.k1();
                 } catch (CameraAccessException e) {
                     throw d.this.o1(e);
@@ -122,7 +122,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            CaptureRequest.Builder builder = dVar.f1482h0;
+            CaptureRequest.Builder builder = dVar.f1477h0;
             Location location = dVar.B;
             if (location != null) {
                 builder.set(CaptureRequest.JPEG_GPS_LOCATION, location);
@@ -142,7 +142,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            if (dVar.m1(dVar.f1482h0, this.i)) {
+            if (dVar.m1(dVar.f1477h0, this.i)) {
                 d.this.k1();
             }
         }
@@ -160,7 +160,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            if (dVar.i1(dVar.f1482h0, this.i)) {
+            if (dVar.i1(dVar.f1477h0, this.i)) {
                 d.this.k1();
             }
         }
@@ -183,7 +183,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            if (dVar.n1(dVar.f1482h0, this.i)) {
+            if (dVar.n1(dVar.f1477h0, this.i)) {
                 d.this.k1();
                 if (this.j) {
                     ((CameraView.b) d.this.l).f(this.k, this.l);
@@ -211,7 +211,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            if (dVar.g1(dVar.f1482h0, this.i)) {
+            if (dVar.g1(dVar.f1477h0, this.i)) {
                 d.this.k1();
                 if (this.j) {
                     ((CameraView.b) d.this.l).c(this.k, this.l, this.m);
@@ -231,7 +231,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // java.lang.Runnable
         public void run() {
             d dVar = d.this;
-            if (dVar.j1(dVar.f1482h0, this.i)) {
+            if (dVar.j1(dVar.f1477h0, this.i)) {
                 d.this.k1();
             }
         }
@@ -256,7 +256,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // android.hardware.camera2.CameraCaptureSession.CaptureCallback
         public void onCaptureCompleted(@NonNull CameraCaptureSession cameraCaptureSession, @NonNull CaptureRequest captureRequest, @NonNull TotalCaptureResult totalCaptureResult) {
             d dVar = d.this;
-            dVar.f1483i0 = totalCaptureResult;
+            dVar.f1478i0 = totalCaptureResult;
             for (c.o.a.n.o.a aVar : dVar.o0) {
                 aVar.b(d.this, captureRequest, totalCaptureResult);
             }
@@ -444,11 +444,11 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         @Override // android.hardware.camera2.CameraDevice.StateCallback
         public void onOpened(@NonNull CameraDevice cameraDevice) {
             int i;
-            d.this.f1479e0 = cameraDevice;
+            d.this.f1474e0 = cameraDevice;
             try {
                 i.i.a(1, "onStartEngine:", "Opened camera device.");
                 d dVar = d.this;
-                dVar.f1480f0 = dVar.f1477c0.getCameraCharacteristics(dVar.f1478d0);
+                dVar.f1475f0 = dVar.f1472c0.getCameraCharacteristics(dVar.f1473d0);
                 boolean b = d.this.K.b(c.o.a.n.t.b.SENSOR, c.o.a.n.t.b.VIEW);
                 int ordinal = d.this.A.ordinal();
                 if (ordinal == 0) {
@@ -459,7 +459,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
                     throw new IllegalArgumentException("Unknown format:" + d.this.A);
                 }
                 d dVar2 = d.this;
-                dVar2.o = new c.o.a.n.u.b(dVar2.f1477c0, dVar2.f1478d0, b, i);
+                dVar2.o = new c.o.a.n.u.b(dVar2.f1472c0, dVar2.f1473d0, b, i);
                 d dVar3 = d.this;
                 Objects.requireNonNull(dVar3);
                 dVar3.q1(1);
@@ -502,7 +502,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
 
         @Override // android.hardware.camera2.CameraCaptureSession.StateCallback
         public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
-            d.this.f1481g0 = cameraCaptureSession;
+            d.this.f1476g0 = cameraCaptureSession;
             i.i.a(1, "onStartBind:", "Completed");
             this.a.b(null);
         }
@@ -579,10 +579,10 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         if (c.o.a.n.q.b.a == null) {
             c.o.a.n.q.b.a = new c.o.a.n.q.b();
         }
-        this.f1484j0 = c.o.a.n.q.b.a;
+        this.f1479j0 = c.o.a.n.q.b.a;
         this.o0 = new CopyOnWriteArrayList();
         this.q0 = new i();
-        this.f1477c0 = (CameraManager) ((CameraView.b) this.l).g().getSystemService("camera");
+        this.f1472c0 = (CameraManager) ((CameraView.b) this.l).g().getSystemService("camera");
         new c.o.a.n.o.g().e(this);
     }
 
@@ -697,8 +697,8 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
                     bVar8 = bVar8.f();
                 }
                 bVar7.a(1, "computeFrameProcessingSize:", "result:", bVar8, "flip:", Boolean.valueOf(b2));
-                this.f1487s = bVar8;
-                ImageReader newInstance2 = ImageReader.newInstance(bVar8.i, bVar8.j, this.t, this.f1485a0 + 1);
+                this.f1482s = bVar8;
+                ImageReader newInstance2 = ImageReader.newInstance(bVar8.i, bVar8.j, this.t, this.f1480a0 + 1);
                 this.k0 = newInstance2;
                 handler = null;
                 newInstance2.setOnImageAvailableListener(this, null);
@@ -711,11 +711,11 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         } else {
             handler = null;
             this.k0 = null;
-            this.f1487s = null;
+            this.f1482s = null;
             this.l0 = null;
         }
         try {
-            this.f1479e0.createCaptureSession(arrayList, new o(taskCompletionSource), handler);
+            this.f1474e0.createCaptureSession(arrayList, new o(taskCompletionSource), handler);
             return taskCompletionSource.a;
         } catch (CameraAccessException e3) {
             throw o1(e3);
@@ -728,7 +728,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     public Task<c.o.a.c> Q() {
         TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
         try {
-            this.f1477c0.openCamera(this.f1478d0, new m(taskCompletionSource), (Handler) null);
+            this.f1472c0.openCamera(this.f1473d0, new m(taskCompletionSource), (Handler) null);
             return taskCompletionSource.a;
         } catch (CameraAccessException e2) {
             throw o1(e2);
@@ -747,7 +747,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
             this.n.s(C.i, C.j);
             this.n.r(this.K.c(c.o.a.n.t.b.BASE, bVar2, 1));
             if (this.u) {
-                S0().e(this.t, this.f1487s, this.K);
+                S0().e(this.t, this.f1482s, this.K);
             }
             bVar.a(1, "onStartPreview:", "Starting preview.");
             c1(new Surface[0]);
@@ -769,7 +769,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         this.m0 = null;
         this.r = null;
         this.q = null;
-        this.f1487s = null;
+        this.f1482s = null;
         ImageReader imageReader = this.k0;
         if (imageReader != null) {
             imageReader.close();
@@ -780,8 +780,8 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
             imageReader2.close();
             this.n0 = null;
         }
-        this.f1481g0.close();
-        this.f1481g0 = null;
+        this.f1476g0.close();
+        this.f1476g0 = null;
         bVar.a(1, "onStopBind:", "Returning.");
         return c.i.a.f.e.o.c.F(null);
     }
@@ -792,19 +792,19 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         try {
             c.o.a.b bVar = i.i;
             bVar.a(1, "onStopEngine:", "Clean up.", "Releasing camera.");
-            this.f1479e0.close();
+            this.f1474e0.close();
             bVar.a(1, "onStopEngine:", "Clean up.", "Released camera.");
         } catch (Exception e2) {
             i.i.a(2, "onStopEngine:", "Clean up.", "Exception while releasing camera.", e2);
         }
-        this.f1479e0 = null;
+        this.f1474e0 = null;
         i.i.a(1, "onStopEngine:", "Aborting actions.");
         for (c.o.a.n.o.a aVar : this.o0) {
             aVar.a(this);
         }
-        this.f1480f0 = null;
+        this.f1475f0 = null;
         this.o = null;
-        this.f1482h0 = null;
+        this.f1477h0 = null;
         i.i.a(2, "onStopEngine:", "Returning.");
         return c.i.a.f.e.o.c.F(null);
     }
@@ -813,7 +813,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     @NonNull
     public List<c.o.a.x.b> T0() {
         try {
-            StreamConfigurationMap streamConfigurationMap = (StreamConfigurationMap) this.f1477c0.getCameraCharacteristics(this.f1478d0).get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+            StreamConfigurationMap streamConfigurationMap = (StreamConfigurationMap) this.f1472c0.getCameraCharacteristics(this.f1473d0).get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             if (streamConfigurationMap != null) {
                 Size[] outputSizes = streamConfigurationMap.getOutputSizes(this.n.j());
                 ArrayList arrayList = new ArrayList(outputSizes.length);
@@ -840,12 +840,12 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         if (this.u) {
             S0().d();
         }
-        this.f1482h0.removeTarget(this.m0);
+        this.f1477h0.removeTarget(this.m0);
         Surface surface = this.l0;
         if (surface != null) {
-            this.f1482h0.removeTarget(surface);
+            this.f1477h0.removeTarget(surface);
         }
-        this.f1483i0 = null;
+        this.f1478i0 = null;
         bVar.a(1, "onStopPreview:", "Returning.");
         return c.i.a.f.e.o.c.F(null);
     }
@@ -875,11 +875,11 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         c.o.a.n.t.a aVar2 = this.K;
         c.o.a.n.t.b bVar = c.o.a.n.t.b.SENSOR;
         c.o.a.n.t.b bVar2 = c.o.a.n.t.b.OUTPUT;
-        aVar.f1473c = aVar2.c(bVar, bVar2, 2);
+        aVar.f1468c = aVar2.c(bVar, bVar2, 2);
         aVar.d = w(bVar2);
         try {
-            CaptureRequest.Builder createCaptureRequest = this.f1479e0.createCaptureRequest(2);
-            d1(createCaptureRequest, this.f1482h0);
+            CaptureRequest.Builder createCaptureRequest = this.f1474e0.createCaptureRequest(2);
+            d1(createCaptureRequest, this.f1477h0);
             c.o.a.v.b bVar3 = new c.o.a.v.b(aVar, this, createCaptureRequest, this.n0);
             this.p = bVar3;
             bVar3.c();
@@ -901,7 +901,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         if (this.n instanceof c.o.a.w.e) {
             c.o.a.n.t.b bVar = c.o.a.n.t.b.OUTPUT;
             aVar.d = F(bVar);
-            aVar.f1473c = this.K.c(c.o.a.n.t.b.VIEW, bVar, 1);
+            aVar.f1468c = this.K.c(c.o.a.n.t.b.VIEW, bVar, 1);
             c.o.a.v.f fVar = new c.o.a.v.f(aVar, this, (c.o.a.w.e) this.n, aVar2);
             this.p = fVar;
             fVar.c();
@@ -922,16 +922,16 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
 
     @Override // c.o.a.n.i
     public final boolean c(@NonNull c.o.a.m.e eVar) {
-        Objects.requireNonNull(this.f1484j0);
+        Objects.requireNonNull(this.f1479j0);
         int intValue = c.o.a.n.q.b.b.get(eVar).intValue();
         try {
-            String[] cameraIdList = this.f1477c0.getCameraIdList();
+            String[] cameraIdList = this.f1472c0.getCameraIdList();
             i.i.a(1, "collectCameraInfo", "Facing:", eVar, "Internal:", Integer.valueOf(intValue), "Cameras:", Integer.valueOf(cameraIdList.length));
             for (String str : cameraIdList) {
                 try {
-                    CameraCharacteristics cameraCharacteristics = this.f1477c0.getCameraCharacteristics(str);
+                    CameraCharacteristics cameraCharacteristics = this.f1472c0.getCameraCharacteristics(str);
                     if (intValue == ((Integer) u1(cameraCharacteristics, CameraCharacteristics.LENS_FACING, -99)).intValue()) {
-                        this.f1478d0 = str;
+                        this.f1473d0 = str;
                         this.K.f(eVar, ((Integer) u1(cameraCharacteristics, CameraCharacteristics.SENSOR_ORIENTATION, 0)).intValue());
                         return true;
                     }
@@ -945,14 +945,14 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     }
 
     public final void c1(@NonNull Surface... surfaceArr) {
-        this.f1482h0.addTarget(this.m0);
+        this.f1477h0.addTarget(this.m0);
         Surface surface = this.l0;
         if (surface != null) {
-            this.f1482h0.addTarget(surface);
+            this.f1477h0.addTarget(surface);
         }
         for (Surface surface2 : surfaceArr) {
             if (surface2 != null) {
-                this.f1482h0.addTarget(surface2);
+                this.f1477h0.addTarget(surface2);
             } else {
                 throw new IllegalArgumentException("Should not add a null surface.");
             }
@@ -996,7 +996,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
 
     public void e1(@NonNull c.o.a.n.o.a aVar, @NonNull CaptureRequest.Builder builder) throws CameraAccessException {
         if (this.m.f == c.o.a.n.v.e.PREVIEW && !O()) {
-            this.f1481g0.capture(builder.build(), this.q0, null);
+            this.f1476g0.capture(builder.build(), this.q0, null);
         }
     }
 
@@ -1050,7 +1050,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
             for (int i2 : iArr) {
                 arrayList.add(Integer.valueOf(i2));
             }
-            c.o.a.n.q.b bVar = this.f1484j0;
+            c.o.a.n.q.b bVar = this.f1479j0;
             c.o.a.m.f fVar2 = this.v;
             Objects.requireNonNull(bVar);
             ArrayList arrayList2 = new ArrayList();
@@ -1085,14 +1085,14 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     }
 
     public boolean i1(@NonNull CaptureRequest.Builder builder, @NonNull c.o.a.m.h hVar) {
-        if (this.o.c(this.f1490z)) {
-            c.o.a.n.q.b bVar = this.f1484j0;
-            c.o.a.m.h hVar2 = this.f1490z;
+        if (this.o.c(this.f1485z)) {
+            c.o.a.n.q.b bVar = this.f1479j0;
+            c.o.a.m.h hVar2 = this.f1485z;
             Objects.requireNonNull(bVar);
             builder.set(CaptureRequest.CONTROL_SCENE_MODE, Integer.valueOf(c.o.a.n.q.b.d.get(hVar2).intValue()));
             return true;
         }
-        this.f1490z = hVar;
+        this.f1485z = hVar;
         return false;
     }
 
@@ -1141,8 +1141,8 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
 
     @Override // c.o.a.n.i
     public void l0(@NonNull c.o.a.m.h hVar) {
-        c.o.a.m.h hVar2 = this.f1490z;
-        this.f1490z = hVar;
+        c.o.a.m.h hVar2 = this.f1485z;
+        this.f1485z = hVar;
         c.o.a.n.v.f fVar = this.m;
         fVar.b("hdr (" + hVar + ")", true, new c.o.a.n.v.h(fVar, c.o.a.n.v.e.ENGINE, new RunnableC0161d(hVar2)));
     }
@@ -1150,7 +1150,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     public final void l1(boolean z2, int i2) {
         if ((this.m.f == c.o.a.n.v.e.PREVIEW && !O()) || !z2) {
             try {
-                this.f1481g0.setRepeatingRequest(this.f1482h0.build(), this.q0, null);
+                this.f1476g0.setRepeatingRequest(this.f1477h0.build(), this.q0, null);
             } catch (CameraAccessException e2) {
                 throw new CameraException(e2, i2);
             } catch (IllegalStateException e3) {
@@ -1172,10 +1172,10 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
 
     public boolean m1(@NonNull CaptureRequest.Builder builder, @NonNull c.o.a.m.m mVar) {
         if (this.o.c(this.w)) {
-            c.o.a.n.q.b bVar = this.f1484j0;
+            c.o.a.n.q.b bVar = this.f1479j0;
             c.o.a.m.m mVar2 = this.w;
             Objects.requireNonNull(bVar);
-            builder.set(CaptureRequest.CONTROL_AWB_MODE, Integer.valueOf(c.o.a.n.q.b.f1493c.get(mVar2).intValue()));
+            builder.set(CaptureRequest.CONTROL_AWB_MODE, Integer.valueOf(c.o.a.n.q.b.f1488c.get(mVar2).intValue()));
             return true;
         }
         this.w = mVar;
@@ -1255,7 +1255,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
         if (gVar != null) {
             gVar.a(this);
         }
-        CaptureRequest.Builder builder = this.f1482h0;
+        CaptureRequest.Builder builder = this.f1477h0;
         boolean z2 = false;
         int[] iArr = (int[]) t1(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES, new int[0]);
         ArrayList arrayList = new ArrayList();
@@ -1279,12 +1279,12 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
 
     @NonNull
     public final CaptureRequest.Builder q1(int i2) throws CameraAccessException {
-        CaptureRequest.Builder builder = this.f1482h0;
-        CaptureRequest.Builder createCaptureRequest = this.f1479e0.createCaptureRequest(i2);
-        this.f1482h0 = createCaptureRequest;
+        CaptureRequest.Builder builder = this.f1477h0;
+        CaptureRequest.Builder createCaptureRequest = this.f1474e0.createCaptureRequest(i2);
+        this.f1477h0 = createCaptureRequest;
         createCaptureRequest.setTag(Integer.valueOf(i2));
-        d1(this.f1482h0, builder);
-        return this.f1482h0;
+        d1(this.f1477h0, builder);
+        return this.f1477h0;
     }
 
     @NonNull
@@ -1315,7 +1315,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     @NonNull
     public List<c.o.a.x.b> s1() {
         try {
-            StreamConfigurationMap streamConfigurationMap = (StreamConfigurationMap) this.f1477c0.getCameraCharacteristics(this.f1478d0).get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+            StreamConfigurationMap streamConfigurationMap = (StreamConfigurationMap) this.f1472c0.getCameraCharacteristics(this.f1473d0).get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             if (streamConfigurationMap != null) {
                 Size[] outputSizes = streamConfigurationMap.getOutputSizes(this.t);
                 ArrayList arrayList = new ArrayList(outputSizes.length);
@@ -1342,7 +1342,7 @@ public class d extends g implements ImageReader.OnImageAvailableListener, c.o.a.
     @NonNull
     @VisibleForTesting
     public <T> T t1(@NonNull CameraCharacteristics.Key<T> key, @NonNull T t) {
-        T t2 = (T) this.f1480f0.get(key);
+        T t2 = (T) this.f1475f0.get(key);
         return t2 == null ? t : t2;
     }
 
diff --git a/app/src/main/java/c/o/a/n/f.java b/app/src/main/java/c/o/a/n/f.java
index a1640d46eb..1607b5e86a 100644
--- a/app/src/main/java/c/o/a/n/f.java
+++ b/app/src/main/java/c/o/a/n/f.java
@@ -14,14 +14,14 @@ public class f extends e {
 
     @Override // c.o.a.n.o.e
     public void j(@NonNull c cVar) {
-        this.f1491c = cVar;
-        this.e.f1(((d) cVar).f1482h0);
+        this.f1486c = cVar;
+        this.e.f1(((d) cVar).f1477h0);
         d dVar = (d) cVar;
-        CaptureRequest.Builder builder = dVar.f1482h0;
+        CaptureRequest.Builder builder = dVar.f1477h0;
         CaptureRequest.Key key = CaptureRequest.CONTROL_AE_LOCK;
         Boolean bool = Boolean.FALSE;
         builder.set(key, bool);
-        dVar.f1482h0.set(CaptureRequest.CONTROL_AWB_LOCK, bool);
+        dVar.f1477h0.set(CaptureRequest.CONTROL_AWB_LOCK, bool);
         dVar.k1();
         l(Integer.MAX_VALUE);
     }
diff --git a/app/src/main/java/c/o/a/n/g.java b/app/src/main/java/c/o/a/n/g.java
index be747f9d67..29e0376696 100644
--- a/app/src/main/java/c/o/a/n/g.java
+++ b/app/src/main/java/c/o/a/n/g.java
@@ -50,10 +50,10 @@ public abstract class g extends i {
     public int Z;
 
     /* renamed from: a0  reason: collision with root package name */
-    public int f1485a0;
+    public int f1480a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public c.o.a.u.a f1486b0;
+    public c.o.a.u.a f1481b0;
     public c.o.a.w.a n;
     public c.o.a.c o;
     public c.o.a.v.d p;
@@ -61,20 +61,20 @@ public abstract class g extends i {
     public c.o.a.x.b r;
 
     /* renamed from: s  reason: collision with root package name */
-    public c.o.a.x.b f1487s;
+    public c.o.a.x.b f1482s;
     public int t;
     public boolean u;
     public f v;
     public m w;
 
     /* renamed from: x  reason: collision with root package name */
-    public l f1488x;
+    public l f1483x;
 
     /* renamed from: y  reason: collision with root package name */
-    public c.o.a.m.b f1489y;
+    public c.o.a.m.b f1484y;
 
     /* renamed from: z  reason: collision with root package name */
-    public h f1490z;
+    public h f1485z;
 
     /* compiled from: CameraBaseEngine */
     public class a implements Runnable {
@@ -190,7 +190,7 @@ public abstract class g extends i {
 
     @Override // c.o.a.n.i
     public final void B0(@NonNull c.o.a.m.l lVar) {
-        this.f1488x = lVar;
+        this.f1483x = lVar;
     }
 
     @Override // c.o.a.n.i
@@ -262,7 +262,7 @@ public abstract class g extends i {
     @Override // c.o.a.n.i
     @NonNull
     public final c.o.a.m.l H() {
-        return this.f1488x;
+        return this.f1483x;
     }
 
     @Override // c.o.a.n.i
@@ -382,7 +382,7 @@ public abstract class g extends i {
     @NonNull
     public c.o.a.p.c S0() {
         if (this.J == null) {
-            this.J = V0(this.f1485a0);
+            this.J = V0(this.f1480a0);
         }
         return this.J;
     }
@@ -425,7 +425,7 @@ public abstract class g extends i {
         if (aVar != null) {
             CameraView.b bVar = (CameraView.b) this.l;
             bVar.b.a(1, "dispatchOnPictureTaken", aVar);
-            CameraView.this.f2385s.post(new c.o.a.i(bVar, aVar));
+            CameraView.this.f2391s.post(new c.o.a.i(bVar, aVar));
             return;
         }
         i.i.a(3, "onPictureResult", "result is null: something went wrong.", exc);
@@ -444,7 +444,7 @@ public abstract class g extends i {
 
     @Override // c.o.a.n.i
     public final void b0(@NonNull c.o.a.m.b bVar) {
-        this.f1489y = bVar;
+        this.f1484y = bVar;
     }
 
     @Override // c.o.a.n.i
@@ -482,7 +482,7 @@ public abstract class g extends i {
     @Override // c.o.a.n.i
     @NonNull
     public final c.o.a.m.b h() {
-        return this.f1489y;
+        return this.f1484y;
     }
 
     @Override // c.o.a.n.i
@@ -508,7 +508,7 @@ public abstract class g extends i {
 
     @Override // c.o.a.n.i
     public final void j0(int i) {
-        this.f1485a0 = i;
+        this.f1480a0 = i;
     }
 
     @Override // c.o.a.n.i
@@ -549,7 +549,7 @@ public abstract class g extends i {
 
     @Override // c.o.a.n.i
     public final void o0(@Nullable c.o.a.u.a aVar) {
-        this.f1486b0 = aVar;
+        this.f1481b0 = aVar;
     }
 
     @Override // c.o.a.n.i
@@ -559,7 +559,7 @@ public abstract class g extends i {
 
     @Override // c.o.a.n.i
     public final int q() {
-        return this.f1485a0;
+        return this.f1480a0;
     }
 
     @Override // c.o.a.n.i
@@ -570,7 +570,7 @@ public abstract class g extends i {
     @Override // c.o.a.n.i
     @NonNull
     public final h r() {
-        return this.f1490z;
+        return this.f1485z;
     }
 
     @Override // c.o.a.n.i
diff --git a/app/src/main/java/c/o/a/n/i.java b/app/src/main/java/c/o/a/n/i.java
index b35fa04305..d5a5c9d678 100644
--- a/app/src/main/java/c/o/a/n/i.java
+++ b/app/src/main/java/c/o/a/n/i.java
@@ -242,7 +242,7 @@ public abstract class i implements a.c, d.a {
         boolean z2;
         c.o.a.n.v.f fVar = this.m;
         synchronized (fVar.e) {
-            Iterator<a.c<?>> it = fVar.f1497c.iterator();
+            Iterator<a.c<?>> it = fVar.f1492c.iterator();
             while (true) {
                 if (!it.hasNext()) {
                     z2 = false;
@@ -305,7 +305,7 @@ public abstract class i implements a.c, d.a {
             c.o.a.n.v.f fVar = this.m;
             synchronized (fVar.e) {
                 HashSet hashSet = new HashSet();
-                Iterator<a.c<?>> it = fVar.f1497c.iterator();
+                Iterator<a.c<?>> it = fVar.f1492c.iterator();
                 while (it.hasNext()) {
                     hashSet.add(it.next().a);
                 }
diff --git a/app/src/main/java/c/o/a/n/k.java b/app/src/main/java/c/o/a/n/k.java
index 69e7ab2728..78ad8ec343 100644
--- a/app/src/main/java/c/o/a/n/k.java
+++ b/app/src/main/java/c/o/a/n/k.java
@@ -23,7 +23,7 @@ public class k implements f<c, Void> {
         if (cVar2 != null) {
             CameraView.b bVar = (CameraView.b) this.a.l;
             bVar.b.a(1, "dispatchOnCameraOpened", cVar2);
-            CameraView.this.f2385s.post(new c.o.a.f(bVar, cVar2));
+            CameraView.this.f2391s.post(new c.o.a.f(bVar, cVar2));
             return c.i.a.f.e.o.c.F(null);
         }
         throw new RuntimeException("Null options!");
diff --git a/app/src/main/java/c/o/a/n/m.java b/app/src/main/java/c/o/a/n/m.java
index c92eda34ea..6f23d7f203 100644
--- a/app/src/main/java/c/o/a/n/m.java
+++ b/app/src/main/java/c/o/a/n/m.java
@@ -16,6 +16,6 @@ public class m implements e<Void> {
     public void onSuccess(Void r6) {
         CameraView.b bVar = (CameraView.b) this.a.l;
         bVar.b.a(1, "dispatchOnCameraClosed");
-        CameraView.this.f2385s.post(new g(bVar));
+        CameraView.this.f2391s.post(new g(bVar));
     }
 }
diff --git a/app/src/main/java/c/o/a/n/o/d.java b/app/src/main/java/c/o/a/n/o/d.java
index a459f6925a..ca62ea2780 100644
--- a/app/src/main/java/c/o/a/n/o/d.java
+++ b/app/src/main/java/c/o/a/n/o/d.java
@@ -49,7 +49,7 @@ public abstract class d extends e {
 
     @Override // c.o.a.n.o.e
     public void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         m().f(new a());
         m().j(cVar);
     }
diff --git a/app/src/main/java/c/o/a/n/o/e.java b/app/src/main/java/c/o/a/n/o/e.java
index e5a89e6f2c..8e3f672ba4 100644
--- a/app/src/main/java/c/o/a/n/o/e.java
+++ b/app/src/main/java/c/o/a/n/o/e.java
@@ -17,7 +17,7 @@ public abstract class e implements a {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public c f1491c;
+    public c f1486c;
     public boolean d;
 
     @Override // c.o.a.n.o.a
@@ -49,12 +49,12 @@ public abstract class e implements a {
 
     @Override // c.o.a.n.o.a
     public final void e(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         d dVar = (d) cVar;
         if (!dVar.o0.contains(this)) {
             dVar.o0.add(this);
         }
-        if (((d) cVar).f1483i0 != null) {
+        if (((d) cVar).f1478i0 != null) {
             j(cVar);
         } else {
             this.d = true;
@@ -80,12 +80,12 @@ public abstract class e implements a {
 
     @CallSuper
     public void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
     }
 
     @NonNull
     public <T> T k(@NonNull CameraCharacteristics.Key<T> key, @NonNull T t) {
-        T t2 = (T) ((d) this.f1491c).f1480f0.get(key);
+        T t2 = (T) ((d) this.f1486c).f1475f0.get(key);
         return t2 == null ? t : t2;
     }
 
@@ -96,8 +96,8 @@ public abstract class e implements a {
                 bVar.a(this, this.b);
             }
             if (this.b == Integer.MAX_VALUE) {
-                ((d) this.f1491c).o0.remove(this);
-                i(this.f1491c);
+                ((d) this.f1486c).o0.remove(this);
+                i(this.f1486c);
             }
         }
     }
diff --git a/app/src/main/java/c/o/a/n/o/h.java b/app/src/main/java/c/o/a/n/o/h.java
index f07aee6ab7..17ae708ee2 100644
--- a/app/src/main/java/c/o/a/n/o/h.java
+++ b/app/src/main/java/c/o/a/n/o/h.java
@@ -69,7 +69,7 @@ public class h extends e {
 
     @Override // c.o.a.n.o.e
     public void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         int i = this.f;
         if (i >= 0) {
             this.e.get(i).j(cVar);
@@ -91,7 +91,7 @@ public class h extends e {
         this.f = i2;
         this.e.get(i2).f(new a());
         if (!z3) {
-            this.e.get(this.f).j(this.f1491c);
+            this.e.get(this.f).j(this.f1486c);
         }
     }
 }
diff --git a/app/src/main/java/c/o/a/n/o/j.java b/app/src/main/java/c/o/a/n/o/j.java
index 6b0f2df24c..e5b55ceedb 100644
--- a/app/src/main/java/c/o/a/n/o/j.java
+++ b/app/src/main/java/c/o/a/n/o/j.java
@@ -79,7 +79,7 @@ public class j extends e {
 
     @Override // c.o.a.n.o.e
     public void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         for (e eVar : this.e) {
             if (!eVar.g()) {
                 eVar.j(cVar);
diff --git a/app/src/main/java/c/o/a/n/p/a.java b/app/src/main/java/c/o/a/n/p/a.java
index a72811d190..2b0b9d8551 100644
--- a/app/src/main/java/c/o/a/n/p/a.java
+++ b/app/src/main/java/c/o/a/n/p/a.java
@@ -9,7 +9,7 @@ import c.o.a.n.o.e;
 public abstract class a extends e {
     @Override // c.o.a.n.o.e
     public final void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         boolean n = n(cVar);
         if (!m(cVar) || n) {
             l(Integer.MAX_VALUE);
diff --git a/app/src/main/java/c/o/a/n/p/b.java b/app/src/main/java/c/o/a/n/p/b.java
index bb8f54e360..414e761e5c 100644
--- a/app/src/main/java/c/o/a/n/p/b.java
+++ b/app/src/main/java/c/o/a/n/p/b.java
@@ -26,7 +26,7 @@ public class b extends a {
     @Override // c.o.a.n.p.a
     public boolean m(@NonNull c cVar) {
         boolean z2 = ((Integer) k(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL, -1)).intValue() != 2;
-        Integer num = (Integer) ((d) cVar).f1482h0.get(CaptureRequest.CONTROL_AE_MODE);
+        Integer num = (Integer) ((d) cVar).f1477h0.get(CaptureRequest.CONTROL_AE_MODE);
         boolean z3 = z2 && (num != null && (num.intValue() == 1 || num.intValue() == 3 || num.intValue() == 2 || num.intValue() == 4 || num.intValue() == 5));
         e.a(1, "checkIsSupported:", Boolean.valueOf(z3));
         return z3;
@@ -34,7 +34,7 @@ public class b extends a {
 
     @Override // c.o.a.n.p.a
     public boolean n(@NonNull c cVar) {
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         if (totalCaptureResult != null) {
             Integer num = (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AE_STATE);
             boolean z2 = num != null && num.intValue() == 3;
@@ -47,9 +47,9 @@ public class b extends a {
 
     @Override // c.o.a.n.p.a
     public void o(@NonNull c cVar) {
-        ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, Integer.valueOf(Build.VERSION.SDK_INT >= 23 ? 2 : 0));
+        ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, Integer.valueOf(Build.VERSION.SDK_INT >= 23 ? 2 : 0));
         d dVar = (d) cVar;
-        dVar.f1482h0.set(CaptureRequest.CONTROL_AE_LOCK, Boolean.TRUE);
+        dVar.f1477h0.set(CaptureRequest.CONTROL_AE_LOCK, Boolean.TRUE);
         dVar.k1();
     }
 }
diff --git a/app/src/main/java/c/o/a/n/p/c.java b/app/src/main/java/c/o/a/n/p/c.java
index f91cb91ae2..222c5ec186 100644
--- a/app/src/main/java/c/o/a/n/p/c.java
+++ b/app/src/main/java/c/o/a/n/p/c.java
@@ -38,7 +38,7 @@ public class c extends a {
 
     @Override // c.o.a.n.p.a
     public boolean n(@NonNull c.o.a.n.o.c cVar) {
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         if (totalCaptureResult != null) {
             Integer num = (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AF_STATE);
             boolean z2 = num != null && (num.intValue() == 4 || num.intValue() == 5 || num.intValue() == 0 || num.intValue() == 2 || num.intValue() == 6);
@@ -53,9 +53,9 @@ public class c extends a {
 
     @Override // c.o.a.n.p.a
     public void o(@NonNull c.o.a.n.o.c cVar) {
-        ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AF_MODE, 1);
+        ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AF_MODE, 1);
         d dVar = (d) cVar;
-        dVar.f1482h0.set(CaptureRequest.CONTROL_AF_TRIGGER, 2);
+        dVar.f1477h0.set(CaptureRequest.CONTROL_AF_TRIGGER, 2);
         dVar.k1();
     }
 }
diff --git a/app/src/main/java/c/o/a/n/p/e.java b/app/src/main/java/c/o/a/n/p/e.java
index 019edde8a6..41f0e0386c 100644
--- a/app/src/main/java/c/o/a/n/p/e.java
+++ b/app/src/main/java/c/o/a/n/p/e.java
@@ -26,7 +26,7 @@ public class e extends a {
     @Override // c.o.a.n.p.a
     public boolean m(@NonNull c cVar) {
         boolean z2 = ((Integer) k(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL, -1)).intValue() != 2;
-        Integer num = (Integer) ((d) cVar).f1482h0.get(CaptureRequest.CONTROL_AWB_MODE);
+        Integer num = (Integer) ((d) cVar).f1477h0.get(CaptureRequest.CONTROL_AWB_MODE);
         boolean z3 = z2 && num != null && num.intValue() == 1;
         e.a(1, "checkIsSupported:", Boolean.valueOf(z3));
         return z3;
@@ -34,7 +34,7 @@ public class e extends a {
 
     @Override // c.o.a.n.p.a
     public boolean n(@NonNull c cVar) {
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         if (totalCaptureResult != null) {
             Integer num = (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AWB_STATE);
             boolean z2 = num != null && num.intValue() == 3;
@@ -47,7 +47,7 @@ public class e extends a {
 
     @Override // c.o.a.n.p.a
     public void o(@NonNull c cVar) {
-        ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AWB_LOCK, Boolean.TRUE);
+        ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AWB_LOCK, Boolean.TRUE);
         ((d) cVar).k1();
     }
 }
diff --git a/app/src/main/java/c/o/a/n/q/a.java b/app/src/main/java/c/o/a/n/q/a.java
index 4697a4bd21..62685989c5 100644
--- a/app/src/main/java/c/o/a/n/q/a.java
+++ b/app/src/main/java/c/o/a/n/q/a.java
@@ -15,7 +15,7 @@ public class a {
     public static final Map<f, String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<m, String> f1492c;
+    public static final Map<m, String> f1487c;
     public static final Map<e, Integer> d;
     public static final Map<h, String> e;
 
@@ -23,7 +23,7 @@ public class a {
         HashMap hashMap = new HashMap();
         b = hashMap;
         HashMap hashMap2 = new HashMap();
-        f1492c = hashMap2;
+        f1487c = hashMap2;
         HashMap hashMap3 = new HashMap();
         d = hashMap3;
         HashMap hashMap4 = new HashMap();
diff --git a/app/src/main/java/c/o/a/n/q/b.java b/app/src/main/java/c/o/a/n/q/b.java
index be26e126e9..f82c6b64da 100644
--- a/app/src/main/java/c/o/a/n/q/b.java
+++ b/app/src/main/java/c/o/a/n/q/b.java
@@ -16,14 +16,14 @@ public class b {
     public static final Map<e, Integer> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<m, Integer> f1493c;
+    public static final Map<m, Integer> f1488c;
     public static final Map<h, Integer> d;
 
     static {
         HashMap hashMap = new HashMap();
         b = hashMap;
         HashMap hashMap2 = new HashMap();
-        f1493c = hashMap2;
+        f1488c = hashMap2;
         HashMap hashMap3 = new HashMap();
         d = hashMap3;
         hashMap.put(e.BACK, 1);
diff --git a/app/src/main/java/c/o/a/n/r/a.java b/app/src/main/java/c/o/a/n/r/a.java
index 252c18cd4e..a09109f978 100644
--- a/app/src/main/java/c/o/a/n/r/a.java
+++ b/app/src/main/java/c/o/a/n/r/a.java
@@ -22,7 +22,7 @@ public abstract class a extends e {
 
     @Override // c.o.a.n.o.e
     public final void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         boolean z2 = this.h && n(cVar);
         if (!m(cVar) || z2) {
             e.a(1, "onStart:", "not supported or skipped. Dispatching COMPLETED state.");
diff --git a/app/src/main/java/c/o/a/n/r/b.java b/app/src/main/java/c/o/a/n/r/b.java
index 17414670e3..100bdb7e96 100644
--- a/app/src/main/java/c/o/a/n/r/b.java
+++ b/app/src/main/java/c/o/a/n/r/b.java
@@ -19,7 +19,7 @@ public abstract class b extends e {
 
     @Override // c.o.a.n.o.e
     public final void j(@NonNull c cVar) {
-        this.f1491c = cVar;
+        this.f1486c = cVar;
         MeteringRectangle meteringRectangle = null;
         if (this.e) {
             meteringRectangle = new MeteringRectangle((Rect) k(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE, new Rect()), 0);
diff --git a/app/src/main/java/c/o/a/n/r/c.java b/app/src/main/java/c/o/a/n/r/c.java
index e61881ce88..55248046ba 100644
--- a/app/src/main/java/c/o/a/n/r/c.java
+++ b/app/src/main/java/c/o/a/n/r/c.java
@@ -63,13 +63,13 @@ public class c extends a {
 
     @Override // c.o.a.n.o.e
     public void i(@NonNull c.o.a.n.o.c cVar) {
-        ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, null);
+        ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, null);
     }
 
     @Override // c.o.a.n.r.a
     public boolean m(@NonNull c.o.a.n.o.c cVar) {
         boolean z2 = ((Integer) k(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL, -1)).intValue() == 2;
-        Integer num = (Integer) ((d) cVar).f1482h0.get(CaptureRequest.CONTROL_AE_MODE);
+        Integer num = (Integer) ((d) cVar).f1477h0.get(CaptureRequest.CONTROL_AE_MODE);
         boolean z3 = num != null && (num.intValue() == 1 || num.intValue() == 3 || num.intValue() == 2 || num.intValue() == 4 || num.intValue() == 5);
         this.k = !z2;
         boolean z4 = ((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AE, 0)).intValue() > 0;
@@ -81,7 +81,7 @@ public class c extends a {
 
     @Override // c.o.a.n.r.a
     public boolean n(@NonNull c.o.a.n.o.c cVar) {
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         if (totalCaptureResult != null) {
             Integer num = (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AE_STATE);
             boolean z2 = num != null && num.intValue() == 2;
@@ -96,10 +96,10 @@ public class c extends a {
     public void o(@NonNull c.o.a.n.o.c cVar, @NonNull List<MeteringRectangle> list) {
         i.a(1, "onStarted:", "with areas:", list);
         if (this.j && !list.isEmpty()) {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_REGIONS, list.subList(0, Math.min(((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AE, 0)).intValue(), list.size())).toArray(new MeteringRectangle[0]));
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_REGIONS, list.subList(0, Math.min(((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AE, 0)).intValue(), list.size())).toArray(new MeteringRectangle[0]));
         }
         if (this.k) {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, 1);
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, 1);
         }
         ((d) cVar).k1();
         if (this.k) {
diff --git a/app/src/main/java/c/o/a/n/r/d.java b/app/src/main/java/c/o/a/n/r/d.java
index 91e6b81a50..eb27aecb26 100644
--- a/app/src/main/java/c/o/a/n/r/d.java
+++ b/app/src/main/java/c/o/a/n/r/d.java
@@ -23,7 +23,7 @@ public class d extends b {
     @Override // c.o.a.n.o.e, c.o.a.n.o.a
     public void b(@NonNull c cVar, @NonNull CaptureRequest captureRequest, @NonNull TotalCaptureResult totalCaptureResult) {
         if (this.b == 0) {
-            ((c.o.a.n.d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_LOCK, Boolean.FALSE);
+            ((c.o.a.n.d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_LOCK, Boolean.FALSE);
             ((c.o.a.n.d) cVar).k1();
             l(Integer.MAX_VALUE);
         }
@@ -33,9 +33,9 @@ public class d extends b {
     public void m(@NonNull c cVar, @Nullable MeteringRectangle meteringRectangle) {
         int intValue = ((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AE, 0)).intValue();
         if (meteringRectangle != null && intValue > 0) {
-            ((c.o.a.n.d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[]{meteringRectangle});
+            ((c.o.a.n.d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_REGIONS, new MeteringRectangle[]{meteringRectangle});
         }
-        TotalCaptureResult totalCaptureResult = ((c.o.a.n.d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((c.o.a.n.d) cVar).f1478i0;
         Integer num = totalCaptureResult == null ? null : (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AE_PRECAPTURE_TRIGGER);
         b bVar = f;
         int i = 2;
@@ -45,10 +45,10 @@ public class d extends b {
             if (Build.VERSION.SDK_INT < 23) {
                 i = 0;
             }
-            ((c.o.a.n.d) cVar).f1482h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, Integer.valueOf(i));
+            ((c.o.a.n.d) cVar).f1477h0.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER, Integer.valueOf(i));
         }
         c.o.a.n.d dVar = (c.o.a.n.d) cVar;
-        dVar.f1482h0.set(CaptureRequest.CONTROL_AE_LOCK, Boolean.TRUE);
+        dVar.f1477h0.set(CaptureRequest.CONTROL_AE_LOCK, Boolean.TRUE);
         dVar.k1();
         l(0);
     }
diff --git a/app/src/main/java/c/o/a/n/r/e.java b/app/src/main/java/c/o/a/n/r/e.java
index 7c3ac911ea..c02918dade 100644
--- a/app/src/main/java/c/o/a/n/r/e.java
+++ b/app/src/main/java/c/o/a/n/r/e.java
@@ -38,12 +38,12 @@ public class e extends a {
 
     @Override // c.o.a.n.o.e
     public void i(@NonNull c cVar) {
-        ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AF_TRIGGER, null);
+        ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AF_TRIGGER, null);
     }
 
     @Override // c.o.a.n.r.a
     public boolean m(@NonNull c cVar) {
-        Integer num = (Integer) ((d) cVar).f1482h0.get(CaptureRequest.CONTROL_AF_MODE);
+        Integer num = (Integer) ((d) cVar).f1477h0.get(CaptureRequest.CONTROL_AF_MODE);
         boolean z2 = num != null && (num.intValue() == 1 || num.intValue() == 4 || num.intValue() == 3 || num.intValue() == 2);
         i.a(1, "checkIsSupported:", Boolean.valueOf(z2));
         return z2;
@@ -51,7 +51,7 @@ public class e extends a {
 
     @Override // c.o.a.n.r.a
     public boolean n(@NonNull c cVar) {
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         if (totalCaptureResult != null) {
             Integer num = (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AF_STATE);
             boolean z2 = num != null && (num.intValue() == 4 || num.intValue() == 2);
@@ -65,10 +65,10 @@ public class e extends a {
     @Override // c.o.a.n.r.a
     public void o(@NonNull c cVar, @NonNull List<MeteringRectangle> list) {
         i.a(1, "onStarted:", "with areas:", list);
-        ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AF_TRIGGER, 1);
+        ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AF_TRIGGER, 1);
         int intValue = ((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AF, 0)).intValue();
         if (!list.isEmpty() && intValue > 0) {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AF_REGIONS, list.subList(0, Math.min(intValue, list.size())).toArray(new MeteringRectangle[0]));
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AF_REGIONS, list.subList(0, Math.min(intValue, list.size())).toArray(new MeteringRectangle[0]));
         }
         ((d) cVar).k1();
     }
diff --git a/app/src/main/java/c/o/a/n/r/f.java b/app/src/main/java/c/o/a/n/r/f.java
index 30551c8c23..aecff1d232 100644
--- a/app/src/main/java/c/o/a/n/r/f.java
+++ b/app/src/main/java/c/o/a/n/r/f.java
@@ -28,16 +28,16 @@ public class f extends b {
         if (meteringRectangle == null || intValue <= 0) {
             z2 = false;
         } else {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AF_REGIONS, new MeteringRectangle[]{meteringRectangle});
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AF_REGIONS, new MeteringRectangle[]{meteringRectangle});
             z2 = true;
         }
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         Integer num = totalCaptureResult == null ? null : (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AF_TRIGGER);
         f.a(2, "onStarted:", "last focus trigger is", num);
         if (num == null || num.intValue() != 1) {
             z3 = z2;
         } else {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AF_TRIGGER, 2);
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AF_TRIGGER, 2);
         }
         if (z3) {
             ((d) cVar).k1();
diff --git a/app/src/main/java/c/o/a/n/r/g.java b/app/src/main/java/c/o/a/n/r/g.java
index 170da9498f..eb849b4f99 100644
--- a/app/src/main/java/c/o/a/n/r/g.java
+++ b/app/src/main/java/c/o/a/n/r/g.java
@@ -46,7 +46,7 @@ public class g extends d {
         List arrayList = new ArrayList();
         if (this.h != null) {
             c.o.a.n.d dVar = (c.o.a.n.d) cVar;
-            c.o.a.n.s.b bVar = new c.o.a.n.s.b(this.i.e(), this.i.z().l(), this.i.C(c.o.a.n.t.b.VIEW), this.i.z().d, dVar.f1480f0, dVar.f1482h0);
+            c.o.a.n.s.b bVar = new c.o.a.n.s.b(this.i.e(), this.i.z().l(), this.i.C(c.o.a.n.t.b.VIEW), this.i.z().d, dVar.f1475f0, dVar.f1477h0);
             arrayList = this.h.c(bVar).b(Integer.MAX_VALUE, bVar);
         }
         c cVar2 = new c(arrayList, this.j);
diff --git a/app/src/main/java/c/o/a/n/r/i.java b/app/src/main/java/c/o/a/n/r/i.java
index c8604cac3a..e1b3b6de62 100644
--- a/app/src/main/java/c/o/a/n/r/i.java
+++ b/app/src/main/java/c/o/a/n/r/i.java
@@ -39,7 +39,7 @@ public class i extends a {
     @Override // c.o.a.n.r.a
     public boolean m(@NonNull c cVar) {
         boolean z2 = ((Integer) k(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL, -1)).intValue() != 2;
-        Integer num = (Integer) ((d) cVar).f1482h0.get(CaptureRequest.CONTROL_AWB_MODE);
+        Integer num = (Integer) ((d) cVar).f1477h0.get(CaptureRequest.CONTROL_AWB_MODE);
         boolean z3 = z2 && num != null && num.intValue() == 1;
         i.a(1, "checkIsSupported:", Boolean.valueOf(z3));
         return z3;
@@ -47,7 +47,7 @@ public class i extends a {
 
     @Override // c.o.a.n.r.a
     public boolean n(@NonNull c cVar) {
-        TotalCaptureResult totalCaptureResult = ((d) cVar).f1483i0;
+        TotalCaptureResult totalCaptureResult = ((d) cVar).f1478i0;
         if (totalCaptureResult != null) {
             Integer num = (Integer) totalCaptureResult.get(CaptureResult.CONTROL_AWB_STATE);
             boolean z2 = num != null && num.intValue() == 2;
@@ -63,7 +63,7 @@ public class i extends a {
         i.a(1, "onStarted:", "with areas:", list);
         int intValue = ((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AWB, 0)).intValue();
         if (!list.isEmpty() && intValue > 0) {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AWB_REGIONS, list.subList(0, Math.min(intValue, list.size())).toArray(new MeteringRectangle[0]));
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AWB_REGIONS, list.subList(0, Math.min(intValue, list.size())).toArray(new MeteringRectangle[0]));
             ((d) cVar).k1();
         }
     }
diff --git a/app/src/main/java/c/o/a/n/r/j.java b/app/src/main/java/c/o/a/n/r/j.java
index 068f786375..88e54876d1 100644
--- a/app/src/main/java/c/o/a/n/r/j.java
+++ b/app/src/main/java/c/o/a/n/r/j.java
@@ -23,7 +23,7 @@ public class j extends b {
         f.a(2, "onStarted:", "with area:", meteringRectangle);
         int intValue = ((Integer) k(CameraCharacteristics.CONTROL_MAX_REGIONS_AWB, 0)).intValue();
         if (meteringRectangle != null && intValue > 0) {
-            ((d) cVar).f1482h0.set(CaptureRequest.CONTROL_AWB_REGIONS, new MeteringRectangle[]{meteringRectangle});
+            ((d) cVar).f1477h0.set(CaptureRequest.CONTROL_AWB_REGIONS, new MeteringRectangle[]{meteringRectangle});
             ((d) cVar).k1();
         }
         l(Integer.MAX_VALUE);
diff --git a/app/src/main/java/c/o/a/n/s/a.java b/app/src/main/java/c/o/a/n/s/a.java
index f17c1e367c..299fada6fe 100644
--- a/app/src/main/java/c/o/a/n/s/a.java
+++ b/app/src/main/java/c/o/a/n/s/a.java
@@ -13,11 +13,11 @@ public class a implements c<Camera.Area> {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c.o.a.x.b f1494c;
+    public final c.o.a.x.b f1489c;
 
     public a(@NonNull c.o.a.n.t.a aVar, @NonNull c.o.a.x.b bVar) {
         this.b = -aVar.c(c.o.a.n.t.b.SENSOR, c.o.a.n.t.b.VIEW, 1);
-        this.f1494c = bVar;
+        this.f1489c = bVar;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -34,7 +34,7 @@ public class a implements c<Camera.Area> {
     public PointF b(@NonNull PointF pointF) {
         PointF pointF2 = new PointF();
         float f = pointF.x;
-        c.o.a.x.b bVar = this.f1494c;
+        c.o.a.x.b bVar = this.f1489c;
         pointF2.x = ((f / ((float) bVar.i)) * 2000.0f) - 0.0040893555f;
         pointF2.y = ((pointF.y / ((float) bVar.j)) * 2000.0f) - 0.0040893555f;
         PointF pointF3 = new PointF();
diff --git a/app/src/main/java/c/o/a/n/s/b.java b/app/src/main/java/c/o/a/n/s/b.java
index 6823fbca1c..08aa9c0331 100644
--- a/app/src/main/java/c/o/a/n/s/b.java
+++ b/app/src/main/java/c/o/a/n/s/b.java
@@ -17,7 +17,7 @@ public class b implements c<MeteringRectangle> {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c.o.a.x.b f1495c;
+    public final c.o.a.x.b f1490c;
     public final c.o.a.x.b d;
     public final boolean e;
     public final CameraCharacteristics f;
@@ -25,7 +25,7 @@ public class b implements c<MeteringRectangle> {
 
     public b(@NonNull a aVar, @NonNull c.o.a.x.b bVar, @NonNull c.o.a.x.b bVar2, boolean z2, @NonNull CameraCharacteristics cameraCharacteristics, @NonNull CaptureRequest.Builder builder) {
         this.b = aVar;
-        this.f1495c = bVar;
+        this.f1490c = bVar;
         this.d = bVar2;
         this.e = z2;
         this.f = cameraCharacteristics;
@@ -45,7 +45,7 @@ public class b implements c<MeteringRectangle> {
     @NonNull
     public PointF b(@NonNull PointF pointF) {
         PointF pointF2 = new PointF(pointF.x, pointF.y);
-        c.o.a.x.b bVar = this.f1495c;
+        c.o.a.x.b bVar = this.f1490c;
         c.o.a.x.b bVar2 = this.d;
         int i = bVar.i;
         int i2 = bVar.j;
diff --git a/app/src/main/java/c/o/a/n/t/a.java b/app/src/main/java/c/o/a/n/t/a.java
index ab267ef1a0..45363553ca 100644
--- a/app/src/main/java/c/o/a/n/t/a.java
+++ b/app/src/main/java/c/o/a/n/t/a.java
@@ -11,7 +11,7 @@ public class a {
     @VisibleForTesting
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1496c = 0;
+    public int f1491c = 0;
     @VisibleForTesting
     public int d = 0;
     @VisibleForTesting
@@ -30,7 +30,7 @@ public class a {
         }
         int ordinal = bVar2.ordinal();
         if (ordinal == 1) {
-            return ((360 - this.f1496c) + 360) % 360;
+            return ((360 - this.f1491c) + 360) % 360;
         }
         if (ordinal == 2) {
             return ((360 - this.d) + 360) % 360;
@@ -51,7 +51,7 @@ public class a {
     }
 
     public final void d() {
-        a.a(1, "Angles changed:", "sensorOffset:", Integer.valueOf(this.f1496c), "displayOffset:", Integer.valueOf(this.d), "deviceOrientation:", Integer.valueOf(this.e));
+        a.a(1, "Angles changed:", "sensorOffset:", Integer.valueOf(this.f1491c), "displayOffset:", Integer.valueOf(this.d), "deviceOrientation:", Integer.valueOf(this.e));
     }
 
     public final void e(int i) {
@@ -63,9 +63,9 @@ public class a {
     public void f(@NonNull e eVar, int i) {
         e(i);
         this.b = eVar;
-        this.f1496c = i;
+        this.f1491c = i;
         if (eVar == e.FRONT) {
-            this.f1496c = ((360 - i) + 360) % 360;
+            this.f1491c = ((360 - i) + 360) % 360;
         }
         d();
     }
diff --git a/app/src/main/java/c/o/a/n/u/a.java b/app/src/main/java/c/o/a/n/u/a.java
index e10ff7dbca..0234eb8dc0 100644
--- a/app/src/main/java/c/o/a/n/u/a.java
+++ b/app/src/main/java/c/o/a/n/u/a.java
@@ -33,19 +33,19 @@ public class a extends c {
         List<String> supportedWhiteBalance = parameters.getSupportedWhiteBalance();
         if (supportedWhiteBalance != null) {
             for (String str : supportedWhiteBalance) {
-                m mVar = (m) a.b(c.o.a.n.q.a.f1492c, str);
+                m mVar = (m) a.b(c.o.a.n.q.a.f1487c, str);
                 if (mVar != null) {
                     this.a.add(mVar);
                 }
             }
         }
-        this.f1472c.add(f.OFF);
+        this.f1467c.add(f.OFF);
         List<String> supportedFlashModes = parameters.getSupportedFlashModes();
         if (supportedFlashModes != null) {
             for (String str2 : supportedFlashModes) {
                 f fVar = (f) a.b(c.o.a.n.q.a.b, str2);
                 if (fVar != null) {
-                    this.f1472c.add(fVar);
+                    this.f1467c.add(fVar);
                 }
             }
         }
diff --git a/app/src/main/java/c/o/a/n/u/b.java b/app/src/main/java/c/o/a/n/u/b.java
index 867d979c2b..d3635cae0a 100644
--- a/app/src/main/java/c/o/a/n/u/b.java
+++ b/app/src/main/java/c/o/a/n/u/b.java
@@ -41,12 +41,12 @@ public class b extends c {
             }
         }
         for (int i2 : (int[]) cameraCharacteristics.get(CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES)) {
-            m mVar = (m) bVar.a(c.o.a.n.q.b.f1493c, Integer.valueOf(i2));
+            m mVar = (m) bVar.a(c.o.a.n.q.b.f1488c, Integer.valueOf(i2));
             if (mVar != null) {
                 this.a.add(mVar);
             }
         }
-        this.f1472c.add(fVar);
+        this.f1467c.add(fVar);
         Boolean bool = (Boolean) cameraCharacteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE);
         boolean z3 = true;
         if (bool != null && bool.booleanValue()) {
@@ -66,7 +66,7 @@ public class b extends c {
                     }
                     hashSet.add(f.AUTO);
                 }
-                this.f1472c.addAll(hashSet);
+                this.f1467c.addAll(hashSet);
             }
         }
         this.d.add(h.OFF);
diff --git a/app/src/main/java/c/o/a/n/v/a.java b/app/src/main/java/c/o/a/n/v/a.java
index 82a9d0eba3..2066c75559 100644
--- a/app/src/main/java/c/o/a/n/v/a.java
+++ b/app/src/main/java/c/o/a/n/v/a.java
@@ -16,7 +16,7 @@ public class a {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ArrayDeque<c<?>> f1497c = new ArrayDeque<>();
+    public final ArrayDeque<c<?>> f1492c = new ArrayDeque<>();
     public boolean d = false;
     public final Object e = new Object();
 
@@ -47,13 +47,13 @@ public class a {
         public final TaskCompletionSource<T> b = new TaskCompletionSource<>();
 
         /* renamed from: c  reason: collision with root package name */
-        public final Callable<Task<T>> f1498c;
+        public final Callable<Task<T>> f1493c;
         public final boolean d;
         public final long e;
 
         public c(String str, Callable callable, boolean z2, long j, CallableC0164a aVar) {
             this.a = str;
-            this.f1498c = callable;
+            this.f1493c = callable;
             this.d = z2;
             this.e = j;
         }
@@ -66,7 +66,7 @@ public class a {
     public static void a(a aVar, c cVar) {
         if (aVar.d) {
             aVar.d = false;
-            aVar.f1497c.remove(cVar);
+            aVar.f1492c.remove(cVar);
             g gVar = i.this.j;
             gVar.f.postDelayed(new b(aVar), 0);
             return;
@@ -91,7 +91,7 @@ public class a {
         a.a(1, str.toUpperCase(), "- Scheduling.");
         c<?> cVar = new c<>(str, callable, z2, System.currentTimeMillis() + j, null);
         synchronized (this.e) {
-            this.f1497c.addLast(cVar);
+            this.f1492c.addLast(cVar);
             i.this.j.f.postDelayed(new b(this), j);
         }
         return cVar.b.a;
@@ -100,7 +100,7 @@ public class a {
     public void e(@NonNull String str, int i) {
         synchronized (this.e) {
             ArrayList arrayList = new ArrayList();
-            Iterator<c<?>> it = this.f1497c.iterator();
+            Iterator<c<?>> it = this.f1492c.iterator();
             while (it.hasNext()) {
                 c<?> next = it.next();
                 if (next.a.equals(str)) {
@@ -112,7 +112,7 @@ public class a {
             if (max > 0) {
                 Collections.reverse(arrayList);
                 for (c cVar : arrayList.subList(0, max)) {
-                    this.f1497c.remove(cVar);
+                    this.f1492c.remove(cVar);
                 }
             }
         }
diff --git a/app/src/main/java/c/o/a/n/v/b.java b/app/src/main/java/c/o/a/n/v/b.java
index cc87b6c1da..5c454423a3 100644
--- a/app/src/main/java/c/o/a/n/v/b.java
+++ b/app/src/main/java/c/o/a/n/v/b.java
@@ -19,7 +19,7 @@ public class b implements Runnable {
             cVar = null;
             if (!this.i.d) {
                 long currentTimeMillis = System.currentTimeMillis();
-                Iterator<a.c<?>> it = this.i.f1497c.iterator();
+                Iterator<a.c<?>> it = this.i.f1492c.iterator();
                 while (true) {
                     if (!it.hasNext()) {
                         break;
diff --git a/app/src/main/java/c/o/a/n/v/c.java b/app/src/main/java/c/o/a/n/v/c.java
index feb904287a..b972dc2ddb 100644
--- a/app/src/main/java/c/o/a/n/v/c.java
+++ b/app/src/main/java/c/o/a/n/v/c.java
@@ -51,7 +51,7 @@ public class c implements Runnable {
     public void run() {
         try {
             a.a.a(1, this.i.a.toUpperCase(), "- Executing.");
-            Task task = (Task) this.i.f1498c.call();
+            Task task = (Task) this.i.f1493c.call();
             g gVar = this.j;
             a aVar = new a();
             if (task.o()) {
diff --git a/app/src/main/java/c/o/a/o/a.java b/app/src/main/java/c/o/a/o/a.java
index 006a4a7661..2903bf3d8f 100644
--- a/app/src/main/java/c/o/a/o/a.java
+++ b/app/src/main/java/c/o/a/o/a.java
@@ -20,7 +20,7 @@ public abstract class a implements b {
     public d b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public c.o.b.b.b f1499c = null;
+    public c.o.b.b.b f1494c = null;
     @VisibleForTesting
     public c.o.a.x.b d;
 
@@ -77,7 +77,7 @@ public abstract class a implements b {
         m.checkNotNullParameter(fArr, "<set-?>");
         dVar.e = fArr;
         d dVar2 = this.b;
-        c.o.b.b.b bVar = this.f1499c;
+        c.o.b.b.b bVar = this.f1494c;
         float[] fArr2 = bVar.a;
         Objects.requireNonNull(dVar2);
         m.checkNotNullParameter(bVar, "drawable");
@@ -152,12 +152,12 @@ public abstract class a implements b {
                 c.o.b.a.d.b("glVertexAttribPointer");
             }
             d dVar3 = this.b;
-            c.o.b.b.b bVar5 = this.f1499c;
+            c.o.b.b.b bVar5 = this.f1494c;
             Objects.requireNonNull(dVar3);
             m.checkNotNullParameter(bVar5, "drawable");
             bVar5.a();
             d dVar4 = this.b;
-            c.o.b.b.b bVar6 = this.f1499c;
+            c.o.b.b.b bVar6 = this.f1494c;
             Objects.requireNonNull(dVar4);
             m.checkNotNullParameter(bVar6, "drawable");
             m.checkNotNullParameter(bVar6, "drawable");
@@ -176,7 +176,7 @@ public abstract class a implements b {
     public void f() {
         d dVar = this.b;
         if (!dVar.a) {
-            if (dVar.f1515c) {
+            if (dVar.f1510c) {
                 GLES20.glDeleteProgram(p.m86constructorimpl(dVar.b));
             }
             for (c.o.b.d.c cVar : dVar.d) {
@@ -190,13 +190,13 @@ public abstract class a implements b {
             ((c.o.b.g.a) floatBuffer).dispose();
         }
         this.b = null;
-        this.f1499c = null;
+        this.f1494c = null;
     }
 
     @Override // c.o.a.o.b
     public void j(int i) {
         this.b = new d(i, "aPosition", "uMVPMatrix", "aTextureCoord", "uTexMatrix");
-        this.f1499c = new c.o.b.b.c();
+        this.f1494c = new c.o.b.b.c();
     }
 
     @Override // c.o.a.o.b
diff --git a/app/src/main/java/c/o/a/p/a.java b/app/src/main/java/c/o/a/p/a.java
index 682c756f0a..1596fed881 100644
--- a/app/src/main/java/c/o/a/p/a.java
+++ b/app/src/main/java/c/o/a/p/a.java
@@ -24,7 +24,7 @@ public class a extends c<byte[]> {
     @Override // c.o.a.p.c
     public void c(@NonNull byte[] bArr, boolean z2) {
         byte[] bArr2 = bArr;
-        if (z2 && bArr2.length == this.f1501c) {
+        if (z2 && bArr2.length == this.f1496c) {
             if (this.k == 0) {
                 ((b) this.j).m1(bArr2);
             } else {
@@ -44,7 +44,7 @@ public class a extends c<byte[]> {
     @Override // c.o.a.p.c
     public void e(int i, @NonNull c.o.a.x.b bVar, @NonNull c.o.a.n.t.a aVar) {
         super.e(i, bVar, aVar);
-        int i2 = this.f1501c;
+        int i2 = this.f1496c;
         for (int i3 = 0; i3 < this.b; i3++) {
             if (this.k == 0) {
                 ((b) this.j).m1(new byte[i2]);
diff --git a/app/src/main/java/c/o/a/p/b.java b/app/src/main/java/c/o/a/p/b.java
index 10b5152dc8..e311fbf49d 100644
--- a/app/src/main/java/c/o/a/p/b.java
+++ b/app/src/main/java/c/o/a/p/b.java
@@ -7,7 +7,7 @@ public class b {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Object f1500c = null;
+    public Object f1495c = null;
     public long d = -1;
     public long e = -1;
 
@@ -16,7 +16,7 @@ public class b {
     }
 
     public long a() {
-        if (this.f1500c != null) {
+        if (this.f1495c != null) {
             return this.d;
         }
         a.a(3, "Frame is dead! time:", Long.valueOf(this.d), "lastTime:", Long.valueOf(this.e));
@@ -24,10 +24,10 @@ public class b {
     }
 
     public void b() {
-        if (this.f1500c != null) {
+        if (this.f1495c != null) {
             a.a(0, "Frame with time", Long.valueOf(this.d), "is being released.");
-            Object obj = this.f1500c;
-            this.f1500c = null;
+            Object obj = this.f1495c;
+            this.f1495c = null;
             this.d = -1;
             c cVar = this.b;
             if (cVar.b()) {
diff --git a/app/src/main/java/c/o/a/p/c.java b/app/src/main/java/c/o/a/p/c.java
index fdfaa91fdc..2ed45732a8 100644
--- a/app/src/main/java/c/o/a/p/c.java
+++ b/app/src/main/java/c/o/a/p/c.java
@@ -12,7 +12,7 @@ public abstract class c<T> {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1501c = -1;
+    public int f1496c = -1;
     public c.o.a.x.b d = null;
     public int e = -1;
     public final Class<T> f;
@@ -35,7 +35,7 @@ public abstract class c<T> {
                 c.o.a.n.t.b bVar = c.o.a.n.t.b.SENSOR;
                 aVar.c(bVar, c.o.a.n.t.b.OUTPUT, 2);
                 this.h.c(bVar, c.o.a.n.t.b.VIEW, 2);
-                poll.f1500c = t;
+                poll.f1495c = t;
                 poll.d = j;
                 poll.e = j;
                 return poll;
@@ -60,7 +60,7 @@ public abstract class c<T> {
         }
         a.a(1, "release: Clearing the frame and buffer queue.");
         this.g.clear();
-        this.f1501c = -1;
+        this.f1496c = -1;
         this.d = null;
         this.e = -1;
         this.h = null;
@@ -69,7 +69,7 @@ public abstract class c<T> {
     public void e(int i, @NonNull c.o.a.x.b bVar, @NonNull a aVar) {
         this.d = bVar;
         this.e = i;
-        this.f1501c = (int) Math.ceil(((double) ((long) ((bVar.j * bVar.i) * ImageFormat.getBitsPerPixel(i)))) / 8.0d);
+        this.f1496c = (int) Math.ceil(((double) ((long) ((bVar.j * bVar.i) * ImageFormat.getBitsPerPixel(i)))) / 8.0d);
         for (int i2 = 0; i2 < this.b; i2++) {
             this.g.offer(new b(this));
         }
diff --git a/app/src/main/java/c/o/a/q/c.java b/app/src/main/java/c/o/a/q/c.java
index 2d2b4843fd..ead4f0ac64 100644
--- a/app/src/main/java/c/o/a/q/c.java
+++ b/app/src/main/java/c/o/a/q/c.java
@@ -10,16 +10,16 @@ public abstract class c {
     public a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public PointF[] f1502c;
+    public PointF[] f1497c;
 
     /* compiled from: GestureFinder */
     public interface a {
     }
 
     public c(@NonNull a aVar, int i) {
-        this.f1502c = new PointF[i];
+        this.f1497c = new PointF[i];
         for (int i2 = 0; i2 < i; i2++) {
-            this.f1502c[i2] = new PointF(0.0f, 0.0f);
+            this.f1497c[i2] = new PointF(0.0f, 0.0f);
         }
     }
 
diff --git a/app/src/main/java/c/o/a/q/e.java b/app/src/main/java/c/o/a/q/e.java
index bf54a67b75..77b5e5d86e 100644
--- a/app/src/main/java/c/o/a/q/e.java
+++ b/app/src/main/java/c/o/a/q/e.java
@@ -45,12 +45,12 @@ public class e extends c {
         }
         this.d.onTouchEvent(motionEvent);
         if (this.e) {
-            this.f1502c[0].x = motionEvent.getX(0);
-            this.f1502c[0].y = motionEvent.getY(0);
+            this.f1497c[0].x = motionEvent.getX(0);
+            this.f1497c[0].y = motionEvent.getY(0);
             z2 = true;
             if (motionEvent.getPointerCount() > 1) {
-                this.f1502c[1].x = motionEvent.getX(1);
-                this.f1502c[1].y = motionEvent.getY(1);
+                this.f1497c[1].x = motionEvent.getX(1);
+                this.f1497c[1].y = motionEvent.getY(1);
             }
         }
         return z2;
diff --git a/app/src/main/java/c/o/a/q/f.java b/app/src/main/java/c/o/a/q/f.java
index 3e232cbd0b..c001ad1e3e 100644
--- a/app/src/main/java/c/o/a/q/f.java
+++ b/app/src/main/java/c/o/a/q/f.java
@@ -34,14 +34,14 @@ public class f extends c {
             if (motionEvent == null || motionEvent2 == null) {
                 return false;
             }
-            if (motionEvent.getX() == f.this.f1502c[0].x) {
+            if (motionEvent.getX() == f.this.f1497c[0].x) {
                 float y2 = motionEvent.getY();
                 f fVar = f.this;
-                if (y2 == fVar.f1502c[0].y) {
+                if (y2 == fVar.f1497c[0].y) {
                     if (fVar.b == aVar) {
                         z2 = true;
                     }
-                    f.this.f1502c[1].set(motionEvent2.getX(), motionEvent2.getY());
+                    f.this.f1497c[1].set(motionEvent2.getX(), motionEvent2.getY());
                     f fVar2 = f.this;
                     c.a aVar2 = this.i;
                     fVar2.g = !z2 ? f / ((float) CameraView.this.getWidth()) : f2 / ((float) CameraView.this.getHeight());
@@ -57,9 +57,9 @@ public class f extends c {
                 aVar = a.SCROLL_VERTICAL;
             }
             fVar4.b = aVar;
-            fVar4.f1502c[0].set(motionEvent.getX(), motionEvent.getY());
+            fVar4.f1497c[0].set(motionEvent.getX(), motionEvent.getY());
             z2 = z3;
-            f.this.f1502c[1].set(motionEvent2.getX(), motionEvent2.getY());
+            f.this.f1497c[1].set(motionEvent2.getX(), motionEvent2.getY());
             f fVar2 = f.this;
             c.a aVar2 = this.i;
             fVar2.g = !z2 ? f / ((float) CameraView.this.getWidth()) : f2 / ((float) CameraView.this.getHeight());
diff --git a/app/src/main/java/c/o/a/q/g.java b/app/src/main/java/c/o/a/q/g.java
index ed97f7e1eb..c23746c83d 100644
--- a/app/src/main/java/c/o/a/q/g.java
+++ b/app/src/main/java/c/o/a/q/g.java
@@ -51,8 +51,8 @@ public class g extends c {
         if (!this.e) {
             return false;
         }
-        this.f1502c[0].x = motionEvent.getX();
-        this.f1502c[0].y = motionEvent.getY();
+        this.f1497c[0].x = motionEvent.getX();
+        this.f1497c[0].y = motionEvent.getY();
         return true;
     }
 }
diff --git a/app/src/main/java/c/o/a/r/c.java b/app/src/main/java/c/o/a/r/c.java
index 820f726ece..97ed2aa272 100644
--- a/app/src/main/java/c/o/a/r/c.java
+++ b/app/src/main/java/c/o/a/r/c.java
@@ -15,7 +15,7 @@ public class c {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public c.o.a.o.b f1503c = new c.o.a.o.c();
+    public c.o.a.o.b f1498c = new c.o.a.o.c();
     public c.o.a.o.b d = null;
     public int e = -1;
 
@@ -26,12 +26,12 @@ public class c {
     public void a(long j) {
         if (this.d != null) {
             b();
-            this.f1503c = this.d;
+            this.f1498c = this.d;
             this.d = null;
         }
         if (this.e == -1) {
-            String c2 = this.f1503c.c();
-            String h = this.f1503c.h();
+            String c2 = this.f1498c.c();
+            String h = this.f1498c.h();
             m.checkNotNullParameter(c2, "vertexShaderSource");
             m.checkNotNullParameter(h, "fragmentShaderSource");
             c.o.b.d.c[] cVarArr = {new c.o.b.d.c(f.n, c2), new c.o.b.d.c(f.o, h)};
@@ -50,7 +50,7 @@ public class c {
                 int i3 = f.a;
                 if (i2 == 1) {
                     this.e = r0;
-                    this.f1503c.j(r0);
+                    this.f1498c.j(r0);
                     d.b("program creation");
                 } else {
                     StringBuilder L = a.L("Could not link program: ");
@@ -66,7 +66,7 @@ public class c {
         GLES20.glUseProgram(this.e);
         d.b("glUseProgram(handle)");
         this.a.a();
-        this.f1503c.e(j, this.b);
+        this.f1498c.e(j, this.b);
         this.a.b();
         GLES20.glUseProgram(0);
         d.b("glUseProgram(0)");
@@ -74,7 +74,7 @@ public class c {
 
     public void b() {
         if (this.e != -1) {
-            this.f1503c.f();
+            this.f1498c.f();
             GLES20.glDeleteProgram(this.e);
             this.e = -1;
         }
diff --git a/app/src/main/java/c/o/a/r/f.java b/app/src/main/java/c/o/a/r/f.java
index 0b7035ecb2..b341e4fbf7 100644
--- a/app/src/main/java/c/o/a/r/f.java
+++ b/app/src/main/java/c/o/a/r/f.java
@@ -16,7 +16,7 @@ public class f {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f1504c;
+    public final c f1499c;
     @VisibleForTesting
     public final OrientationEventListener d;
     public int e = -1;
@@ -58,23 +58,23 @@ public class f {
                     fVar = f.this;
                     if (i2 == fVar.e) {
                         fVar.e = i2;
-                        CameraView.b bVar = (CameraView.b) fVar.f1504c;
+                        CameraView.b bVar = (CameraView.b) fVar.f1499c;
                         bVar.b.a(1, "onDeviceOrientationChanged", Integer.valueOf(i2));
                         CameraView cameraView = CameraView.this;
                         int i3 = cameraView.w.g;
                         if (!cameraView.l) {
                             int i4 = (360 - i3) % 360;
-                            c.o.a.n.t.a e = cameraView.f2386x.e();
+                            c.o.a.n.t.a e = cameraView.f2392x.e();
                             e.e(i4);
                             e.e = i4;
                             e.d();
                         } else {
-                            c.o.a.n.t.a e2 = cameraView.f2386x.e();
+                            c.o.a.n.t.a e2 = cameraView.f2392x.e();
                             e2.e(i2);
                             e2.e = i2;
                             e2.d();
                         }
-                        CameraView.this.f2385s.post(new j(bVar, (i2 + i3) % 360));
+                        CameraView.this.f2391s.post(new j(bVar, (i2 + i3) % 360));
                         return;
                     }
                     return;
@@ -104,7 +104,7 @@ public class f {
             if (a != i2) {
                 f.this.g = a;
                 boolean z2 = Math.abs(a - i2) != 180;
-                CameraView.b bVar = (CameraView.b) f.this.f1504c;
+                CameraView.b bVar = (CameraView.b) f.this.f1499c;
                 bVar.b.a(1, "onDisplayOffsetChanged", Integer.valueOf(a), "recreate:", Boolean.valueOf(z2));
                 if (CameraView.this.d() && !z2) {
                     bVar.b.a(2, "onDisplayOffsetChanged", "restarting the camera.");
@@ -125,7 +125,7 @@ public class f {
 
     public f(@NonNull Context context, @NonNull c cVar) {
         this.b = context;
-        this.f1504c = cVar;
+        this.f1499c = cVar;
         this.d = new a(context.getApplicationContext(), 3);
         this.f = new b();
     }
diff --git a/app/src/main/java/c/o/a/r/g.java b/app/src/main/java/c/o/a/r/g.java
index caa859f96e..09cfc4fa8a 100644
--- a/app/src/main/java/c/o/a/r/g.java
+++ b/app/src/main/java/c/o/a/r/g.java
@@ -13,7 +13,7 @@ public class g {
     public static final ConcurrentHashMap<String, WeakReference<g>> b = new ConcurrentHashMap<>(4);
 
     /* renamed from: c  reason: collision with root package name */
-    public static g f1505c;
+    public static g f1500c;
     public String d;
     public HandlerThread e;
     public Handler f = new Handler(this.e.getLooper());
@@ -73,7 +73,7 @@ public class g {
 
     public static void a(@NonNull Runnable runnable) {
         g b2 = b("FallbackCameraThread");
-        f1505c = b2;
+        f1500c = b2;
         b2.f.post(runnable);
     }
 
diff --git a/app/src/main/java/c/o/a/u/b.java b/app/src/main/java/c/o/a/u/b.java
index 0e2698a2d3..e4df1ec147 100644
--- a/app/src/main/java/c/o/a/u/b.java
+++ b/app/src/main/java/c/o/a/u/b.java
@@ -12,7 +12,7 @@ public class b {
     public a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public SurfaceTexture f1506c;
+    public SurfaceTexture f1501c;
     public Surface d;
     @VisibleForTesting
     public c e;
@@ -23,9 +23,9 @@ public class b {
         this.b = aVar;
         this.e = new c(new c.o.b.f.b(33984, 36197, null, 4));
         SurfaceTexture surfaceTexture = new SurfaceTexture(this.e.a.a);
-        this.f1506c = surfaceTexture;
+        this.f1501c = surfaceTexture;
         surfaceTexture.setDefaultBufferSize(bVar.i, bVar.j);
-        this.d = new Surface(this.f1506c);
+        this.d = new Surface(this.f1501c);
         this.f = new e(this.e.a.a);
     }
 }
diff --git a/app/src/main/java/c/o/a/u/c.java b/app/src/main/java/c/o/a/u/c.java
index 437bfd183a..39650cc184 100644
--- a/app/src/main/java/c/o/a/u/c.java
+++ b/app/src/main/java/c/o/a/u/c.java
@@ -26,7 +26,7 @@ public class c extends FrameLayout implements a {
         public boolean b = false;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f1507c = false;
+        public boolean f1502c = false;
 
         public a(@NonNull Context context, @NonNull AttributeSet attributeSet) {
             super(context, attributeSet);
@@ -34,7 +34,7 @@ public class c extends FrameLayout implements a {
             try {
                 this.a = obtainStyledAttributes.getBoolean(R.c.CameraView_Layout_layout_drawOnPreview, false);
                 this.b = obtainStyledAttributes.getBoolean(R.c.CameraView_Layout_layout_drawOnPictureSnapshot, false);
-                this.f1507c = obtainStyledAttributes.getBoolean(R.c.CameraView_Layout_layout_drawOnVideoSnapshot, false);
+                this.f1502c = obtainStyledAttributes.getBoolean(R.c.CameraView_Layout_layout_drawOnVideoSnapshot, false);
             } finally {
                 obtainStyledAttributes.recycle();
             }
@@ -42,7 +42,7 @@ public class c extends FrameLayout implements a {
 
         @VisibleForTesting
         public boolean a(@NonNull a.EnumC0167a aVar) {
-            return (aVar == a.EnumC0167a.PREVIEW && this.a) || (aVar == a.EnumC0167a.VIDEO_SNAPSHOT && this.f1507c) || (aVar == a.EnumC0167a.PICTURE_SNAPSHOT && this.b);
+            return (aVar == a.EnumC0167a.PREVIEW && this.a) || (aVar == a.EnumC0167a.VIDEO_SNAPSHOT && this.f1502c) || (aVar == a.EnumC0167a.PICTURE_SNAPSHOT && this.b);
         }
 
         @Override // java.lang.Object
@@ -54,7 +54,7 @@ public class c extends FrameLayout implements a {
             sb.append(",drawOnPictureSnapshot:");
             sb.append(this.b);
             sb.append(",drawOnVideoSnapshot:");
-            return c.d.b.a.a.G(sb, this.f1507c, "]");
+            return c.d.b.a.a.G(sb, this.f1502c, "]");
         }
     }
 
diff --git a/app/src/main/java/c/o/a/v/a.java b/app/src/main/java/c/o/a/v/a.java
index 0c8b13b278..835e75ae6d 100644
--- a/app/src/main/java/c/o/a/v/a.java
+++ b/app/src/main/java/c/o/a/v/a.java
@@ -56,7 +56,7 @@ public class a extends c {
             }
             l.a aVar = a.this.i;
             aVar.f = bArr;
-            aVar.f1473c = i;
+            aVar.f1468c = i;
             c.l.a(1, "take(): starting preview again. ", Thread.currentThread());
             if (a.this.n.m.f.f(e.PREVIEW)) {
                 camera.setPreviewCallbackWithBuffer(a.this.n);
@@ -79,7 +79,7 @@ public class a extends c {
         this.n = bVar;
         this.m = camera;
         Camera.Parameters parameters = camera.getParameters();
-        parameters.setRotation(this.i.f1473c);
+        parameters.setRotation(this.i.f1468c);
         camera.setParameters(parameters);
     }
 
diff --git a/app/src/main/java/c/o/a/v/b.java b/app/src/main/java/c/o/a/v/b.java
index 387f4456eb..41df63ae38 100644
--- a/app/src/main/java/c/o/a/v/b.java
+++ b/app/src/main/java/c/o/a/v/b.java
@@ -40,10 +40,10 @@ public class b extends c implements ImageReader.OnImageAvailableListener {
             int i;
             b bVar = b.this;
             if (bVar.i.g == j.DNG) {
-                bVar.q = new DngCreator(((d) cVar).f1480f0, totalCaptureResult);
+                bVar.q = new DngCreator(((d) cVar).f1475f0, totalCaptureResult);
                 b bVar2 = b.this;
                 DngCreator dngCreator = bVar2.q;
-                int i2 = bVar2.i.f1473c;
+                int i2 = bVar2.i.f1468c;
                 int i3 = (i2 + 360) % 360;
                 if (i3 == 0) {
                     i = 1;
@@ -80,13 +80,13 @@ public class b extends c implements ImageReader.OnImageAvailableListener {
 
         @Override // c.o.a.n.o.e
         public void j(@NonNull c cVar) {
-            this.f1491c = cVar;
+            this.f1486c = cVar;
             b bVar = b.this;
             bVar.p.addTarget(bVar.o.getSurface());
             b bVar2 = b.this;
             l.a aVar = bVar2.i;
             if (aVar.g == j.JPEG) {
-                bVar2.p.set(CaptureRequest.JPEG_ORIENTATION, Integer.valueOf(aVar.f1473c));
+                bVar2.p.set(CaptureRequest.JPEG_ORIENTATION, Integer.valueOf(aVar.f1468c));
             }
             b.this.p.setTag(2);
             try {
@@ -107,7 +107,7 @@ public class b extends c implements ImageReader.OnImageAvailableListener {
         this.p = builder;
         this.o = imageReader;
         g b = g.b("FallbackCameraThread");
-        g.f1505c = b;
+        g.f1500c = b;
         imageReader.setOnImageAvailableListener(this, b.f);
     }
 
@@ -123,7 +123,7 @@ public class b extends c implements ImageReader.OnImageAvailableListener {
         buffer.get(bArr);
         l.a aVar = this.i;
         aVar.f = bArr;
-        aVar.f1473c = 0;
+        aVar.f1468c = 0;
         try {
             int attributeInt = new ExifInterface(new ByteArrayInputStream(this.i.f)).getAttributeInt("Orientation", 1);
             l.a aVar2 = this.i;
@@ -141,7 +141,7 @@ public class b extends c implements ImageReader.OnImageAvailableListener {
                     i = 270;
                     break;
             }
-            aVar2.f1473c = i;
+            aVar2.f1468c = i;
         } catch (IOException unused) {
         }
     }
diff --git a/app/src/main/java/c/o/a/v/d.java b/app/src/main/java/c/o/a/v/d.java
index 2897e721fd..600851a3be 100644
--- a/app/src/main/java/c/o/a/v/d.java
+++ b/app/src/main/java/c/o/a/v/d.java
@@ -34,12 +34,12 @@ public abstract class d {
             boolean z4 = !z2;
             CameraView.b bVar = (CameraView.b) ((g) aVar).l;
             if (z4 && (z3 = (cameraView = CameraView.this).k) && z3) {
-                if (cameraView.f2388z == null) {
-                    cameraView.f2388z = new MediaActionSound();
+                if (cameraView.f2394z == null) {
+                    cameraView.f2394z = new MediaActionSound();
                 }
-                cameraView.f2388z.play(0);
+                cameraView.f2394z.play(0);
             }
-            CameraView.this.f2385s.post(new h(bVar));
+            CameraView.this.f2391s.post(new h(bVar));
         }
     }
 
diff --git a/app/src/main/java/c/o/a/v/e.java b/app/src/main/java/c/o/a/v/e.java
index 2234e35638..3a73d9ad0c 100644
--- a/app/src/main/java/c/o/a/v/e.java
+++ b/app/src/main/java/c/o/a/v/e.java
@@ -86,7 +86,7 @@ public class e extends i {
                 aVar.f = byteArray;
                 aVar.d = new c.o.a.x.b(v.width(), v.height());
                 e eVar = e.this;
-                eVar.i.f1473c = 0;
+                eVar.i.f1468c = 0;
                 eVar.b();
             }
         }
@@ -99,7 +99,7 @@ public class e extends i {
             e.this.a(false);
             e eVar = e.this;
             l.a aVar = eVar.i;
-            int i = aVar.f1473c;
+            int i = aVar.f1468c;
             c.o.a.x.b bVar = aVar.d;
             c.o.a.x.b C = eVar.m.C(c.o.a.n.t.b.SENSOR);
             if (C != null) {
diff --git a/app/src/main/java/c/o/a/v/f.java b/app/src/main/java/c/o/a/v/f.java
index 30b5b54d09..4b8f2d4612 100644
--- a/app/src/main/java/c/o/a/v/f.java
+++ b/app/src/main/java/c/o/a/v/f.java
@@ -17,7 +17,7 @@ import java.util.Arrays;
 public class f extends g {
 
     /* renamed from: s  reason: collision with root package name */
-    public final c.o.a.n.o.a f1508s;
+    public final c.o.a.n.o.a f1503s;
     public final c.o.a.n.o.c t;
     public final boolean u;
     public Integer v;
@@ -56,11 +56,11 @@ public class f extends g {
 
         @Override // c.o.a.n.o.e
         public void j(@NonNull c.o.a.n.o.c cVar) {
-            this.f1491c = cVar;
+            this.f1486c = cVar;
             i.l.a(1, "FlashAction:", "Parameters locked, opening torch.");
-            ((d) cVar).f1482h0.set(CaptureRequest.FLASH_MODE, 2);
+            ((d) cVar).f1477h0.set(CaptureRequest.FLASH_MODE, 2);
             d dVar = (d) cVar;
-            dVar.f1482h0.set(CaptureRequest.CONTROL_AE_MODE, 1);
+            dVar.f1477h0.set(CaptureRequest.CONTROL_AE_MODE, 1);
             dVar.k1();
         }
     }
@@ -72,10 +72,10 @@ public class f extends g {
 
         @Override // c.o.a.n.o.e
         public void j(@NonNull c.o.a.n.o.c cVar) {
-            this.f1491c = cVar;
+            this.f1486c = cVar;
             try {
                 i.l.a(1, "ResetFlashAction:", "Reverting the flash changes.");
-                CaptureRequest.Builder builder = ((d) cVar).f1482h0;
+                CaptureRequest.Builder builder = ((d) cVar).f1477h0;
                 builder.set(CaptureRequest.CONTROL_AE_MODE, 1);
                 builder.set(CaptureRequest.FLASH_MODE, 0);
                 ((d) cVar).e1(this, builder);
@@ -88,14 +88,14 @@ public class f extends g {
     }
 
     public f(@NonNull l.a aVar, @NonNull d dVar, @NonNull c.o.a.w.e eVar, @NonNull c.o.a.x.a aVar2) {
-        super(aVar, dVar, eVar, aVar2, dVar.f1486b0);
+        super(aVar, dVar, eVar, aVar2, dVar.f1481b0);
         this.t = dVar;
         boolean z2 = false;
         Integer num = null;
         h hVar = new h(Arrays.asList(new i(2500, new c.o.a.n.p.d()), new b(this, null)));
-        this.f1508s = hVar;
+        this.f1503s = hVar;
         hVar.f(new a());
-        TotalCaptureResult totalCaptureResult = dVar.f1483i0;
+        TotalCaptureResult totalCaptureResult = dVar.f1478i0;
         if (totalCaptureResult == null) {
             i.l.a(2, "Picture snapshot requested very early, before the first preview frame.", "Metering might not work as intended.");
         }
@@ -104,8 +104,8 @@ public class f extends g {
             z2 = true;
         }
         this.u = z2;
-        this.v = (Integer) dVar.f1482h0.get(CaptureRequest.CONTROL_AE_MODE);
-        this.w = (Integer) dVar.f1482h0.get(CaptureRequest.FLASH_MODE);
+        this.v = (Integer) dVar.f1477h0.get(CaptureRequest.CONTROL_AE_MODE);
+        this.w = (Integer) dVar.f1477h0.get(CaptureRequest.FLASH_MODE);
     }
 
     public static /* synthetic */ void d(f fVar) {
@@ -126,6 +126,6 @@ public class f extends g {
             return;
         }
         i.l.a(1, "take:", "Engine needs flash. Starting action");
-        this.f1508s.e(this.t);
+        this.f1503s.e(this.t);
     }
 }
diff --git a/app/src/main/java/c/o/a/v/h.java b/app/src/main/java/c/o/a/v/h.java
index 1581351196..0a6c1cf68c 100644
--- a/app/src/main/java/c/o/a/v/h.java
+++ b/app/src/main/java/c/o/a/v/h.java
@@ -65,7 +65,7 @@ public class h implements Runnable {
         surfaceTexture2.setDefaultBufferSize(bVar.i, bVar.j);
         a aVar = new a(eGLContext, 1);
         c.o.b.e.b bVar2 = new c.o.b.e.b(aVar, surfaceTexture2);
-        a aVar2 = bVar2.f1517c;
+        a aVar2 = bVar2.f1512c;
         e eVar = bVar2.d;
         Objects.requireNonNull(aVar2);
         m.checkNotNullParameter(eVar, "eglSurface");
@@ -82,7 +82,7 @@ public class h implements Runnable {
             Matrix.translateM(fArr, 0, (1.0f - f) / 2.0f, (1.0f - f2) / 2.0f, 0.0f);
             Matrix.scaleM(fArr, 0, f, f2, 1.0f);
             Matrix.translateM(fArr, 0, 0.5f, 0.5f, 0.0f);
-            Matrix.rotateM(fArr, 0, (float) (i + gVar.i.f1473c), 0.0f, 0.0f, 1.0f);
+            Matrix.rotateM(fArr, 0, (float) (i + gVar.i.f1468c), 0.0f, 0.0f, 1.0f);
             Matrix.scaleM(fArr, 0, 1.0f, -1.0f, 1.0f);
             Matrix.translateM(fArr, 0, -0.5f, -0.5f, 0.0f);
             if (gVar.p) {
@@ -99,15 +99,15 @@ public class h implements Runnable {
                 }
                 synchronized (bVar4.g) {
                     GLES20.glBindTexture(36197, bVar4.f.a);
-                    bVar4.f1506c.updateTexImage();
+                    bVar4.f1501c.updateTexImage();
                 }
-                bVar4.f1506c.getTransformMatrix(bVar4.e.b);
+                bVar4.f1501c.getTransformMatrix(bVar4.e.b);
                 Matrix.translateM(gVar.q.e.b, 0, 0.5f, 0.5f, 0.0f);
-                Matrix.rotateM(gVar.q.e.b, 0, (float) gVar.i.f1473c, 0.0f, 0.0f, 1.0f);
+                Matrix.rotateM(gVar.q.e.b, 0, (float) gVar.i.f1468c, 0.0f, 0.0f, 1.0f);
                 Matrix.scaleM(gVar.q.e.b, 0, 1.0f, -1.0f, 1.0f);
                 Matrix.translateM(gVar.q.e.b, 0, -0.5f, -0.5f, 0.0f);
             }
-            gVar.i.f1473c = 0;
+            gVar.i.f1468c = 0;
             long timestamp = surfaceTexture.getTimestamp() / 1000;
             i.l.a(1, "takeFrame:", "timestampUs:", Long.valueOf(timestamp));
             gVar.r.a(timestamp);
@@ -131,12 +131,12 @@ public class h implements Runnable {
             m.checkNotNullExpressionValue(byteArray, "it.toByteArray()");
             d0.y.b.closeFinally(byteArrayOutputStream, null);
             aVar4.f = byteArray;
-            c.o.b.a.a aVar5 = bVar2.f1517c;
+            c.o.b.a.a aVar5 = bVar2.f1512c;
             e eVar2 = bVar2.d;
             Objects.requireNonNull(aVar5);
             m.checkNotNullParameter(eVar2, "eglSurface");
             EGL14.eglDestroySurface(aVar5.a.a, eVar2.a);
-            bVar2.d = d.f1512c;
+            bVar2.d = d.f1507c;
             bVar2.b = -1;
             bVar2.a = -1;
             gVar.r.b();
@@ -150,10 +150,10 @@ public class h implements Runnable {
                 } else {
                     r3 = 0;
                 }
-                SurfaceTexture surfaceTexture3 = bVar6.f1506c;
+                SurfaceTexture surfaceTexture3 = bVar6.f1501c;
                 if (surfaceTexture3 != null) {
                     surfaceTexture3.release();
-                    bVar6.f1506c = r3;
+                    bVar6.f1501c = r3;
                 }
                 Surface surface = bVar6.d;
                 if (surface != null) {
diff --git a/app/src/main/java/c/o/a/w/a.java b/app/src/main/java/c/o/a/w/a.java
index 8fcc903f20..3d52ec333e 100644
--- a/app/src/main/java/c/o/a/w/a.java
+++ b/app/src/main/java/c/o/a/w/a.java
@@ -22,7 +22,7 @@ public abstract class a<T extends View, Output> {
     public c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public T f1509c;
+    public T f1504c;
     public boolean d;
     public int e;
     public int f;
@@ -60,7 +60,7 @@ public abstract class a<T extends View, Output> {
     }
 
     public a(@NonNull Context context, @NonNull ViewGroup viewGroup) {
-        this.f1509c = n(context, viewGroup);
+        this.f1504c = n(context, viewGroup);
     }
 
     public void e(@Nullable b bVar) {
diff --git a/app/src/main/java/c/o/a/w/d.java b/app/src/main/java/c/o/a/w/d.java
index b30f38b617..3cb4491e14 100644
--- a/app/src/main/java/c/o/a/w/d.java
+++ b/app/src/main/java/c/o/a/w/d.java
@@ -95,7 +95,7 @@ public class d extends a<GLSurfaceView, SurfaceTexture> implements b, e {
 
             @Override // android.graphics.SurfaceTexture.OnFrameAvailableListener
             public void onFrameAvailable(SurfaceTexture surfaceTexture) {
-                ((GLSurfaceView) d.this.f1509c).requestRender();
+                ((GLSurfaceView) d.this.f1504c).requestRender();
             }
         }
 
@@ -155,7 +155,7 @@ public class d extends a<GLSurfaceView, SurfaceTexture> implements b, e {
             cVar.d = dVar2.q;
             int i = cVar.a.a;
             dVar2.k = new SurfaceTexture(i);
-            ((GLSurfaceView) d.this.f1509c).queueEvent(new a(i));
+            ((GLSurfaceView) d.this.f1504c).queueEvent(new a(i));
             d.this.k.setOnFrameAvailableListener(new b());
         }
     }
@@ -170,12 +170,12 @@ public class d extends a<GLSurfaceView, SurfaceTexture> implements b, e {
         if (m()) {
             bVar.k(this.e, this.f);
         }
-        ((GLSurfaceView) this.f1509c).queueEvent(new b(bVar));
+        ((GLSurfaceView) this.f1504c).queueEvent(new b(bVar));
     }
 
     @Override // c.o.a.w.e
     public void b(@NonNull f fVar) {
-        ((GLSurfaceView) this.f1509c).queueEvent(new a(fVar));
+        ((GLSurfaceView) this.f1504c).queueEvent(new a(fVar));
     }
 
     @Override // c.o.a.w.b
@@ -208,7 +208,7 @@ public class d extends a<GLSurfaceView, SurfaceTexture> implements b, e {
             this.d = f2 > 1.02f || f > 1.02f;
             this.n = 1.0f / f2;
             this.o = 1.0f / f;
-            ((GLSurfaceView) this.f1509c).requestRender();
+            ((GLSurfaceView) this.f1504c).requestRender();
         }
     }
 
@@ -255,11 +255,11 @@ public class d extends a<GLSurfaceView, SurfaceTexture> implements b, e {
 
     @Override // c.o.a.w.a
     public void p() {
-        ((GLSurfaceView) this.f1509c).onPause();
+        ((GLSurfaceView) this.f1504c).onPause();
     }
 
     @Override // c.o.a.w.a
     public void q() {
-        ((GLSurfaceView) this.f1509c).onResume();
+        ((GLSurfaceView) this.f1504c).onResume();
     }
 }
diff --git a/app/src/main/java/c/o/a/w/h.java b/app/src/main/java/c/o/a/w/h.java
index 886d718b13..f186517afb 100644
--- a/app/src/main/java/c/o/a/w/h.java
+++ b/app/src/main/java/c/o/a/w/h.java
@@ -23,7 +23,7 @@ public class h extends a<SurfaceView, SurfaceHolder> {
     @Override // c.o.a.w.a
     @NonNull
     public SurfaceHolder i() {
-        return ((SurfaceView) this.f1509c).getHolder();
+        return ((SurfaceView) this.f1504c).getHolder();
     }
 
     @Override // c.o.a.w.a
diff --git a/app/src/main/java/c/o/a/w/j.java b/app/src/main/java/c/o/a/w/j.java
index d5c099e39d..63d1b0068b 100644
--- a/app/src/main/java/c/o/a/w/j.java
+++ b/app/src/main/java/c/o/a/w/j.java
@@ -50,8 +50,8 @@ public class j extends a<TextureView, SurfaceTexture> {
                 f4 = f3.i() / f2.i();
                 f = 1.0f;
             }
-            ((TextureView) j.this.f1509c).setScaleX(f4);
-            ((TextureView) j.this.f1509c).setScaleY(f);
+            ((TextureView) j.this.f1504c).setScaleX(f4);
+            ((TextureView) j.this.f1504c).setScaleY(f);
             j.this.d = f4 > 1.02f || f > 1.02f;
             c.o.a.b bVar2 = a.a;
             bVar2.a(1, "crop:", "applied scaleX=", Float.valueOf(f4));
@@ -86,7 +86,7 @@ public class j extends a<TextureView, SurfaceTexture> {
                 matrix.postScale(f3, 1.0f / f3, f, f2);
             }
             matrix.postRotate((float) this.i, f, f2);
-            ((TextureView) j.this.f1509c).setTransform(matrix);
+            ((TextureView) j.this.f1504c).setTransform(matrix);
             this.j.a.t(null);
         }
     }
@@ -97,14 +97,14 @@ public class j extends a<TextureView, SurfaceTexture> {
 
     @Override // c.o.a.w.a
     public void e(@Nullable a.b bVar) {
-        ((TextureView) this.f1509c).post(new a(null));
+        ((TextureView) this.f1504c).post(new a(null));
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     @Override // c.o.a.w.a
     @NonNull
     public SurfaceTexture i() {
-        return ((TextureView) this.f1509c).getSurfaceTexture();
+        return ((TextureView) this.f1504c).getSurfaceTexture();
     }
 
     @Override // c.o.a.w.a
@@ -135,7 +135,7 @@ public class j extends a<TextureView, SurfaceTexture> {
     public void r(int i) {
         this.i = i;
         TaskCompletionSource taskCompletionSource = new TaskCompletionSource();
-        ((TextureView) this.f1509c).post(new b(i, taskCompletionSource));
+        ((TextureView) this.f1504c).post(new b(i, taskCompletionSource));
         try {
             c.c(taskCompletionSource.a);
         } catch (InterruptedException | ExecutionException unused) {
diff --git a/app/src/main/java/c/o/b/a/a.java b/app/src/main/java/c/o/b/a/a.java
index c65028d4cf..6b1c21c990 100644
--- a/app/src/main/java/c/o/b/a/a.java
+++ b/app/src/main/java/c/o/b/a/a.java
@@ -18,7 +18,7 @@ public final class a extends c {
         c cVar = this.a;
         c cVar2 = d.b;
         if (cVar != cVar2) {
-            e eVar = d.f1512c;
+            e eVar = d.f1507c;
             b bVar = d.a;
             EGLDisplay eGLDisplay = cVar.a;
             EGLSurface eGLSurface = eVar.a;
@@ -29,7 +29,7 @@ public final class a extends c {
         }
         this.a = cVar2;
         this.b = d.a;
-        this.f1510c = null;
+        this.f1505c = null;
     }
 
     public final void finalize() {
diff --git a/app/src/main/java/c/o/b/a/b.java b/app/src/main/java/c/o/b/a/b.java
index 9418e4e374..ce8f3af958 100644
--- a/app/src/main/java/c/o/b/a/b.java
+++ b/app/src/main/java/c/o/b/a/b.java
@@ -27,7 +27,7 @@ public class b {
         iArr[7] = 8;
         iArr[8] = d.p;
         iArr[9] = d.q | d.r;
-        iArr[10] = d.f1513s;
+        iArr[10] = d.f1508s;
         iArr[11] = i2;
         iArr[12] = z2 ? 12610 : d.e;
         iArr[13] = z2 ? 1 : 0;
diff --git a/app/src/main/java/c/o/b/a/c.java b/app/src/main/java/c/o/b/a/c.java
index 4befc5b2ff..a565dcf661 100644
--- a/app/src/main/java/c/o/b/a/c.java
+++ b/app/src/main/java/c/o/b/a/c.java
@@ -13,7 +13,7 @@ public class c {
     public b b = d.a;
 
     /* renamed from: c  reason: collision with root package name */
-    public a f1510c;
+    public a f1505c;
 
     public c(b bVar, int i) {
         a a;
@@ -32,7 +32,7 @@ public class c {
                 b bVar3 = new b(EGL14.eglCreateContext(this.a.a, a.a, bVar.a, new int[]{d.i, 3, d.e}, 0));
                 try {
                     d.a("eglCreateContext (3)");
-                    this.f1510c = a;
+                    this.f1505c = a;
                     this.b = bVar3;
                 } catch (Exception unused) {
                 }
@@ -42,7 +42,7 @@ public class c {
                 if (a2 != null) {
                     b bVar4 = new b(EGL14.eglCreateContext(this.a.a, a2.a, bVar.a, new int[]{d.i, 2, d.e}, 0));
                     d.a("eglCreateContext (2)");
-                    this.f1510c = a2;
+                    this.f1505c = a2;
                     this.b = bVar4;
                     return;
                 }
diff --git a/app/src/main/java/c/o/b/b/c.java b/app/src/main/java/c/o/b/b/c.java
index c1c43c0e36..7e715cf076 100644
--- a/app/src/main/java/c/o/b/b/c.java
+++ b/app/src/main/java/c/o/b/b/c.java
@@ -8,11 +8,11 @@ import java.nio.FloatBuffer;
 public class c extends a {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final float[] f1511c = {-1.0f, -1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f};
+    public static final float[] f1506c = {-1.0f, -1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f};
     public FloatBuffer d;
 
     public c() {
-        float[] fArr = f1511c;
+        float[] fArr = f1506c;
         FloatBuffer D = c.i.a.f.e.o.c.D(fArr.length);
         D.put(fArr);
         D.clear();
diff --git a/app/src/main/java/c/o/b/c/d.java b/app/src/main/java/c/o/b/c/d.java
index ed33d34cac..2bd5c53aed 100644
--- a/app/src/main/java/c/o/b/c/d.java
+++ b/app/src/main/java/c/o/b/c/d.java
@@ -7,7 +7,7 @@ public final class d {
     public static final c b = new c(EGL14.EGL_NO_DISPLAY);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f1512c = new e(EGL14.EGL_NO_SURFACE);
+    public static final e f1507c = new e(EGL14.EGL_NO_SURFACE);
     public static final int d = 12288;
     public static final int e = 12344;
     public static final int f = 12375;
@@ -25,5 +25,5 @@ public final class d {
     public static final int r = 1;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final int f1513s = 12352;
+    public static final int f1508s = 12352;
 }
diff --git a/app/src/main/java/c/o/b/c/f.java b/app/src/main/java/c/o/b/c/f.java
index c1ef9e2fe6..a2813c493f 100644
--- a/app/src/main/java/c/o/b/c/f.java
+++ b/app/src/main/java/c/o/b/c/f.java
@@ -7,7 +7,7 @@ public final class f {
     public static final int b = p.m86constructorimpl(5);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f1514c = p.m86constructorimpl(33984);
+    public static final int f1509c = p.m86constructorimpl(33984);
     public static final int d = p.m86constructorimpl(36197);
     public static final int e = p.m86constructorimpl(10241);
     public static final int f = p.m86constructorimpl(10240);
diff --git a/app/src/main/java/c/o/b/d/a.java b/app/src/main/java/c/o/b/d/a.java
index 3b66e7d2d1..90eceb2618 100644
--- a/app/src/main/java/c/o/b/d/a.java
+++ b/app/src/main/java/c/o/b/d/a.java
@@ -7,13 +7,13 @@ public class a {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f1515c;
+    public final boolean f1510c;
     public final c[] d;
 
     public a(int i, boolean z2, c... cVarArr) {
         m.checkNotNullParameter(cVarArr, "shaders");
         this.b = i;
-        this.f1515c = z2;
+        this.f1510c = z2;
         this.d = cVarArr;
     }
 }
diff --git a/app/src/main/java/c/o/b/d/b.java b/app/src/main/java/c/o/b/d/b.java
index db00f30516..2105346b01 100644
--- a/app/src/main/java/c/o/b/d/b.java
+++ b/app/src/main/java/c/o/b/d/b.java
@@ -13,11 +13,11 @@ public final class b {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f1516c;
+    public final String f1511c;
 
     public b(int i, int i2, String str, DefaultConstructorMarker defaultConstructorMarker) {
         int i3;
-        this.f1516c = str;
+        this.f1511c = str;
         int h = c.c.a.y.b.h(i2);
         if (h == 0) {
             i3 = GLES20.glGetAttribLocation(p.m86constructorimpl(i), str);
diff --git a/app/src/main/java/c/o/b/e/a.java b/app/src/main/java/c/o/b/e/a.java
index 3130919f7e..d67fa5cbad 100644
--- a/app/src/main/java/c/o/b/e/a.java
+++ b/app/src/main/java/c/o/b/e/a.java
@@ -17,7 +17,7 @@ public abstract class a {
     public int b = -1;
 
     /* renamed from: c  reason: collision with root package name */
-    public c.o.b.a.a f1517c;
+    public c.o.b.a.a f1512c;
     public e d;
 
     public a(c.o.b.a.a aVar, e eVar) {
@@ -25,25 +25,25 @@ public abstract class a {
         m.checkNotNullParameter(eVar, "eglSurface");
         m.checkNotNullParameter(aVar, "eglCore");
         m.checkNotNullParameter(eVar, "eglSurface");
-        this.f1517c = aVar;
+        this.f1512c = aVar;
         this.d = eVar;
     }
 
     public final void a(OutputStream outputStream, Bitmap.CompressFormat compressFormat) {
         m.checkNotNullParameter(outputStream, "stream");
         m.checkNotNullParameter(compressFormat, "format");
-        c.o.b.a.a aVar = this.f1517c;
+        c.o.b.a.a aVar = this.f1512c;
         e eVar = this.d;
         Objects.requireNonNull(aVar);
         m.checkNotNullParameter(eVar, "eglSurface");
         if (m.areEqual(aVar.b, new b(EGL14.eglGetCurrentContext())) && m.areEqual(eVar, new e(EGL14.eglGetCurrentSurface(d.h)))) {
             int i = this.a;
             if (i < 0) {
-                i = this.f1517c.a(this.d, d.f);
+                i = this.f1512c.a(this.d, d.f);
             }
             int i2 = this.b;
             if (i2 < 0) {
-                i2 = this.f1517c.a(this.d, d.g);
+                i2 = this.f1512c.a(this.d, d.g);
             }
             ByteBuffer allocateDirect = ByteBuffer.allocateDirect(i * i2 * 4);
             allocateDirect.order(ByteOrder.LITTLE_ENDIAN);
diff --git a/app/src/main/java/c/o/b/e/b.java b/app/src/main/java/c/o/b/e/b.java
index e2d304c023..46a69d1f8a 100644
--- a/app/src/main/java/c/o/b/e/b.java
+++ b/app/src/main/java/c/o/b/e/b.java
@@ -17,11 +17,11 @@ public class b extends a {
         m.checkNotNullParameter(surfaceTexture, "surface");
         int[] iArr = {d.e};
         c cVar = aVar.a;
-        c.o.b.c.a aVar2 = aVar.f1510c;
+        c.o.b.c.a aVar2 = aVar.f1505c;
         m.checkNotNull(aVar2);
         e eVar = new e(EGL14.eglCreateWindowSurface(cVar.a, aVar2.a, surfaceTexture, iArr, 0));
         c.o.b.a.d.a("eglCreateWindowSurface");
-        if (eVar != d.f1512c) {
+        if (eVar != d.f1507c) {
             m.checkNotNullParameter(aVar, "eglCore");
             m.checkNotNullParameter(eVar, "eglSurface");
             return;
diff --git a/app/src/main/java/c/o/b/f/a.java b/app/src/main/java/c/o/b/f/a.java
index 67e5cce37b..61f6812515 100644
--- a/app/src/main/java/c/o/b/f/a.java
+++ b/app/src/main/java/c/o/b/f/a.java
@@ -25,15 +25,15 @@ public final class a extends o implements Function0<Unit> {
     public Unit mo1invoke() {
         b bVar = this.this$0;
         if (!(bVar.d == null || bVar.e == null || bVar.f == null || this.$internalFormat == null || bVar.g == null)) {
-            GLES20.glTexImage2D(p.m86constructorimpl(bVar.f1518c), 0, this.$internalFormat.intValue(), this.this$0.d.intValue(), this.this$0.e.intValue(), 0, p.m86constructorimpl(this.this$0.f.intValue()), p.m86constructorimpl(this.this$0.g.intValue()), null);
+            GLES20.glTexImage2D(p.m86constructorimpl(bVar.f1513c), 0, this.$internalFormat.intValue(), this.this$0.d.intValue(), this.this$0.e.intValue(), 0, p.m86constructorimpl(this.this$0.f.intValue()), p.m86constructorimpl(this.this$0.g.intValue()), null);
         }
-        GLES20.glTexParameterf(p.m86constructorimpl(this.this$0.f1518c), f.e, f.j);
-        GLES20.glTexParameterf(p.m86constructorimpl(this.this$0.f1518c), f.f, f.k);
-        int r0 = p.m86constructorimpl(this.this$0.f1518c);
+        GLES20.glTexParameterf(p.m86constructorimpl(this.this$0.f1513c), f.e, f.j);
+        GLES20.glTexParameterf(p.m86constructorimpl(this.this$0.f1513c), f.f, f.k);
+        int r0 = p.m86constructorimpl(this.this$0.f1513c);
         int i = f.g;
         int i2 = f.i;
         GLES20.glTexParameteri(r0, i, i2);
-        GLES20.glTexParameteri(p.m86constructorimpl(this.this$0.f1518c), f.h, i2);
+        GLES20.glTexParameteri(p.m86constructorimpl(this.this$0.f1513c), f.h, i2);
         d.b("glTexParameter");
         return Unit.a;
     }
diff --git a/app/src/main/java/c/o/b/f/b.java b/app/src/main/java/c/o/b/f/b.java
index b91a57cb75..c4ad2c4c18 100644
--- a/app/src/main/java/c/o/b/f/b.java
+++ b/app/src/main/java/c/o/b/f/b.java
@@ -12,7 +12,7 @@ public final class b {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f1518c;
+    public final int f1513c;
     public final Integer d;
     public final Integer e;
     public final Integer f;
@@ -21,7 +21,7 @@ public final class b {
     public b(int i, int i2, Integer num) {
         int i3;
         this.b = i;
-        this.f1518c = i2;
+        this.f1513c = i2;
         this.d = null;
         this.e = null;
         this.f = null;
@@ -55,19 +55,19 @@ public final class b {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public b(int i, int i2, Integer num, int i3) {
-        this((i3 & 1) != 0 ? f.f1514c : i, (i3 & 2) != 0 ? f.d : i2, null);
+        this((i3 & 1) != 0 ? f.f1509c : i, (i3 & 2) != 0 ? f.d : i2, null);
         int i4 = i3 & 4;
     }
 
     public void a() {
         GLES20.glActiveTexture(p.m86constructorimpl(this.b));
-        GLES20.glBindTexture(p.m86constructorimpl(this.f1518c), p.m86constructorimpl(this.a));
+        GLES20.glBindTexture(p.m86constructorimpl(this.f1513c), p.m86constructorimpl(this.a));
         d.b("bind");
     }
 
     public void b() {
-        GLES20.glBindTexture(p.m86constructorimpl(this.f1518c), p.m86constructorimpl(0));
-        GLES20.glActiveTexture(f.f1514c);
+        GLES20.glBindTexture(p.m86constructorimpl(this.f1513c), p.m86constructorimpl(0));
+        GLES20.glActiveTexture(f.f1509c);
         d.b("unbind");
     }
 }
diff --git a/app/src/main/java/c/p/a/b.java b/app/src/main/java/c/p/a/b.java
index 481b6847a3..d2913f649e 100644
--- a/app/src/main/java/c/p/a/b.java
+++ b/app/src/main/java/c/p/a/b.java
@@ -70,20 +70,20 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f1519s;
+    public boolean f1514s;
     public Runnable t;
     public boolean u;
     public ArrayList<Button> v;
     public Typeface w;
 
     /* renamed from: x  reason: collision with root package name */
-    public boolean f1520x;
+    public boolean f1515x;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f1521y;
+    public boolean f1516y;
 
     /* renamed from: z  reason: collision with root package name */
-    public Uri f1522z;
+    public Uri f1517z;
 
     /* compiled from: Alert.kt */
     public static final class a implements Animation.AnimationListener {
@@ -139,10 +139,10 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
         this.n = true;
         this.o = true;
         this.r = true;
-        this.f1519s = true;
+        this.f1514s = true;
         this.u = true;
         this.v = new ArrayList<>();
-        this.f1521y = true;
+        this.f1516y = true;
         this.A = 48;
         this.B = g.lazy(new c(this));
         this.C = g.lazy(new d(this));
@@ -272,11 +272,11 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
         m.checkNotNullParameter(animation, "animation");
         if (!isInEditMode()) {
             setVisibility(0);
-            if (this.f1521y) {
+            if (this.f1516y) {
                 performHapticFeedback(1);
             }
-            if (this.f1522z != null) {
-                RingtoneManager.getRingtone(getContext(), this.f1522z).play();
+            if (this.f1517z != null) {
+                RingtoneManager.getRingtone(getContext(), this.f1517z).play();
             }
             if (this.q) {
                 AppCompatImageView appCompatImageView2 = (AppCompatImageView) c(R.d.ivIcon);
@@ -387,8 +387,8 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
         View decorView;
         WindowInsets rootWindowInsets;
         DisplayCutout displayCutout;
-        if (!this.f1520x) {
-            this.f1520x = true;
+        if (!this.f1515x) {
+            this.f1515x = true;
             ViewGroup.LayoutParams layoutParams = getLayoutParams();
             Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams");
             ((ViewGroup.MarginLayoutParams) layoutParams).topMargin = c.J(this, R.c.alerter_alert_negative_margin_top);
@@ -658,7 +658,7 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
     }
 
     public final void setSound(Uri uri) {
-        this.f1522z = uri;
+        this.f1517z = uri;
     }
 
     public final void setText(@StringRes int i) {
@@ -744,7 +744,7 @@ public final class b extends FrameLayout implements View.OnClickListener, Animat
     }
 
     public final void setVibrationEnabled(boolean z2) {
-        this.f1521y = z2;
+        this.f1516y = z2;
     }
 
     @Override // android.view.View
diff --git a/app/src/main/java/c/p/a/l.java b/app/src/main/java/c/p/a/l.java
index 4615b6489b..00ebf55148 100644
--- a/app/src/main/java/c/p/a/l.java
+++ b/app/src/main/java/c/p/a/l.java
@@ -25,7 +25,7 @@ public final class l implements View.OnTouchListener {
     public float r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final View f1523s;
+    public final View f1518s;
     public final a t;
 
     /* compiled from: SwipeDismissTouchListener.kt */
@@ -49,8 +49,8 @@ public final class l implements View.OnTouchListener {
         public void onAnimationEnd(Animator animator) {
             m.checkNotNullParameter(animator, "animation");
             l lVar = this.a;
-            ViewGroup.LayoutParams layoutParams = lVar.f1523s.getLayoutParams();
-            int height = lVar.f1523s.getHeight();
+            ViewGroup.LayoutParams layoutParams = lVar.f1518s.getLayoutParams();
+            int height = lVar.f1518s.getHeight();
             ValueAnimator duration = ValueAnimator.ofInt(height, 1).setDuration(lVar.k);
             duration.addListener(new m(lVar, layoutParams, height));
             duration.addUpdateListener(new n(lVar, layoutParams));
@@ -61,7 +61,7 @@ public final class l implements View.OnTouchListener {
     public l(View view, a aVar) {
         m.checkNotNullParameter(view, "mView");
         m.checkNotNullParameter(aVar, "mCallbacks");
-        this.f1523s = view;
+        this.f1518s = view;
         this.t = aVar;
         ViewConfiguration viewConfiguration = ViewConfiguration.get(view.getContext());
         m.checkNotNullExpressionValue(viewConfiguration, "vc");
@@ -80,7 +80,7 @@ public final class l implements View.OnTouchListener {
         m.checkNotNullParameter(motionEvent, "motionEvent");
         motionEvent.offsetLocation(this.r, 0.0f);
         if (this.l < 2) {
-            this.l = this.f1523s.getWidth();
+            this.l = this.f1518s.getWidth();
         }
         int actionMasked = motionEvent.getActionMasked();
         boolean z3 = true;
@@ -109,9 +109,9 @@ public final class l implements View.OnTouchListener {
                         z3 = z4;
                     }
                     if (z3) {
-                        this.f1523s.animate().translationX((float) (z2 ? this.l : -this.l)).alpha(0.0f).setDuration(this.k).setListener(new b(this, motionEvent, view));
+                        this.f1518s.animate().translationX((float) (z2 ? this.l : -this.l)).alpha(0.0f).setDuration(this.k).setListener(new b(this, motionEvent, view));
                     } else if (this.o) {
-                        this.f1523s.animate().translationX(0.0f).alpha(1.0f).setDuration(this.k).setListener(null);
+                        this.f1518s.animate().translationX(0.0f).alpha(1.0f).setDuration(this.k).setListener(null);
                         this.t.a(view, false);
                     }
                     velocityTracker.recycle();
@@ -130,17 +130,17 @@ public final class l implements View.OnTouchListener {
                     if (Math.abs(rawX2) > ((float) this.i) && Math.abs(rawY) < Math.abs(rawX2) / ((float) 2)) {
                         this.o = true;
                         this.p = rawX2 > ((float) 0) ? this.i : -this.i;
-                        this.f1523s.getParent().requestDisallowInterceptTouchEvent(true);
+                        this.f1518s.getParent().requestDisallowInterceptTouchEvent(true);
                         MotionEvent obtain = MotionEvent.obtain(motionEvent);
                         m.checkNotNullExpressionValue(obtain, "cancelEvent");
                         obtain.setAction((motionEvent.getActionIndex() << 8) | 3);
-                        this.f1523s.onTouchEvent(obtain);
+                        this.f1518s.onTouchEvent(obtain);
                         obtain.recycle();
                     }
                     if (this.o) {
                         this.r = rawX2;
-                        this.f1523s.setTranslationX(rawX2 - ((float) this.p));
-                        this.f1523s.setAlpha(Math.max(0.0f, Math.min(1.0f, 1.0f - ((Math.abs(rawX2) * 2.0f) / ((float) this.l)))));
+                        this.f1518s.setTranslationX(rawX2 - ((float) this.p));
+                        this.f1518s.setAlpha(Math.max(0.0f, Math.min(1.0f, 1.0f - ((Math.abs(rawX2) * 2.0f) / ((float) this.l)))));
                         return true;
                     }
                 }
@@ -150,7 +150,7 @@ public final class l implements View.OnTouchListener {
             } else {
                 VelocityTracker velocityTracker3 = this.q;
                 if (velocityTracker3 != null) {
-                    this.f1523s.animate().translationX(0.0f).alpha(1.0f).setDuration(this.k).setListener(null);
+                    this.f1518s.animate().translationX(0.0f).alpha(1.0f).setDuration(this.k).setListener(null);
                     velocityTracker3.recycle();
                     this.q = null;
                     this.r = 0.0f;
diff --git a/app/src/main/java/c/p/a/m.java b/app/src/main/java/c/p/a/m.java
index 777f2bc3b7..a5be3985fc 100644
--- a/app/src/main/java/c/p/a/m.java
+++ b/app/src/main/java/c/p/a/m.java
@@ -9,23 +9,23 @@ public final class m extends AnimatorListenerAdapter {
     public final /* synthetic */ ViewGroup.LayoutParams b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ int f1524c;
+    public final /* synthetic */ int f1519c;
 
     public m(l lVar, ViewGroup.LayoutParams layoutParams, int i) {
         this.a = lVar;
         this.b = layoutParams;
-        this.f1524c = i;
+        this.f1519c = i;
     }
 
     @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
     public void onAnimationEnd(Animator animator) {
         d0.z.d.m.checkNotNullParameter(animator, "animation");
         l lVar = this.a;
-        lVar.t.onDismiss(lVar.f1523s);
-        this.a.f1523s.setAlpha(1.0f);
-        this.a.f1523s.setTranslationX(0.0f);
+        lVar.t.onDismiss(lVar.f1518s);
+        this.a.f1518s.setAlpha(1.0f);
+        this.a.f1518s.setTranslationX(0.0f);
         ViewGroup.LayoutParams layoutParams = this.b;
-        layoutParams.height = this.f1524c;
-        this.a.f1523s.setLayoutParams(layoutParams);
+        layoutParams.height = this.f1519c;
+        this.a.f1518s.setLayoutParams(layoutParams);
     }
 }
diff --git a/app/src/main/java/c/p/a/n.java b/app/src/main/java/c/p/a/n.java
index 136dcf32ce..9d6507ac2b 100644
--- a/app/src/main/java/c/p/a/n.java
+++ b/app/src/main/java/c/p/a/n.java
@@ -21,6 +21,6 @@ public final class n implements ValueAnimator.AnimatorUpdateListener {
         Object animatedValue = valueAnimator.getAnimatedValue();
         Objects.requireNonNull(animatedValue, "null cannot be cast to non-null type kotlin.Int");
         layoutParams.height = ((Integer) animatedValue).intValue();
-        this.a.f1523s.setLayoutParams(this.b);
+        this.a.f1518s.setLayoutParams(this.b);
     }
 }
diff --git a/app/src/main/java/c/q/a/f.java b/app/src/main/java/c/q/a/f.java
index de7208a845..4980698301 100644
--- a/app/src/main/java/c/q/a/f.java
+++ b/app/src/main/java/c/q/a/f.java
@@ -20,13 +20,13 @@ public class f implements HorizontalProgressWheelView.a {
     public void b(float f, float f2) {
         if (f > 0.0f) {
             GestureCropImageView gestureCropImageView = this.a.v;
-            gestureCropImageView.l((((this.a.v.getMaxScale() - this.a.v.getMinScale()) / 15000.0f) * f) + gestureCropImageView.getCurrentScale(), gestureCropImageView.f1534x.centerX(), gestureCropImageView.f1534x.centerY());
+            gestureCropImageView.l((((this.a.v.getMaxScale() - this.a.v.getMinScale()) / 15000.0f) * f) + gestureCropImageView.getCurrentScale(), gestureCropImageView.f1529x.centerX(), gestureCropImageView.f1529x.centerY());
             return;
         }
         GestureCropImageView gestureCropImageView2 = this.a.v;
         float maxScale = (((this.a.v.getMaxScale() - this.a.v.getMinScale()) / 15000.0f) * f) + gestureCropImageView2.getCurrentScale();
-        float centerX = gestureCropImageView2.f1534x.centerX();
-        float centerY = gestureCropImageView2.f1534x.centerY();
+        float centerX = gestureCropImageView2.f1529x.centerX();
+        float centerY = gestureCropImageView2.f1529x.centerY();
         if (maxScale >= gestureCropImageView2.getMinScale()) {
             gestureCropImageView2.f(maxScale / gestureCropImageView2.getCurrentScale(), centerX, centerY);
         }
diff --git a/app/src/main/java/c/q/a/i/a.java b/app/src/main/java/c/q/a/i/a.java
index 3a1d3bdc2d..a8a06e1597 100644
--- a/app/src/main/java/c/q/a/i/a.java
+++ b/app/src/main/java/c/q/a/i/a.java
@@ -7,7 +7,7 @@ public class a {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Bitmap.CompressFormat f1525c;
+    public Bitmap.CompressFormat f1520c;
     public int d;
     public String e;
     public String f;
@@ -16,7 +16,7 @@ public class a {
     public a(int i, int i2, Bitmap.CompressFormat compressFormat, int i3, String str, String str2, b bVar) {
         this.a = i;
         this.b = i2;
-        this.f1525c = compressFormat;
+        this.f1520c = compressFormat;
         this.d = i3;
         this.e = str;
         this.f = str2;
diff --git a/app/src/main/java/c/q/a/i/b.java b/app/src/main/java/c/q/a/i/b.java
index 4fa37a8d56..ff20c0012e 100644
--- a/app/src/main/java/c/q/a/i/b.java
+++ b/app/src/main/java/c/q/a/i/b.java
@@ -5,12 +5,12 @@ public class b {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1526c;
+    public int f1521c;
 
     public b(int i, int i2, int i3) {
         this.a = i;
         this.b = i2;
-        this.f1526c = i3;
+        this.f1521c = i3;
     }
 
     public boolean equals(Object obj) {
@@ -21,10 +21,10 @@ public class b {
             return false;
         }
         b bVar = (b) obj;
-        return this.a == bVar.a && this.b == bVar.b && this.f1526c == bVar.f1526c;
+        return this.a == bVar.a && this.b == bVar.b && this.f1521c == bVar.f1521c;
     }
 
     public int hashCode() {
-        return (((this.a * 31) + this.b) * 31) + this.f1526c;
+        return (((this.a * 31) + this.b) * 31) + this.f1521c;
     }
 }
diff --git a/app/src/main/java/c/q/a/i/c.java b/app/src/main/java/c/q/a/i/c.java
index c251b0d67f..f0eafe3863 100644
--- a/app/src/main/java/c/q/a/i/c.java
+++ b/app/src/main/java/c/q/a/i/c.java
@@ -7,13 +7,13 @@ public class c {
     public RectF b;
 
     /* renamed from: c  reason: collision with root package name */
-    public float f1527c;
+    public float f1522c;
     public float d;
 
     public c(RectF rectF, RectF rectF2, float f, float f2) {
         this.a = rectF;
         this.b = rectF2;
-        this.f1527c = f;
+        this.f1522c = f;
         this.d = f2;
     }
 }
diff --git a/app/src/main/java/c/q/a/j/a.java b/app/src/main/java/c/q/a/j/a.java
index 13de47016f..362b49c133 100644
--- a/app/src/main/java/c/q/a/j/a.java
+++ b/app/src/main/java/c/q/a/j/a.java
@@ -28,7 +28,7 @@ public class a extends AsyncTask<Void, Void, Throwable> {
     public Bitmap b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final RectF f1528c;
+    public final RectF f1523c;
     public final RectF d;
     public float e;
     public float f;
@@ -47,13 +47,13 @@ public class a extends AsyncTask<Void, Void, Throwable> {
     public a(@NonNull Context context, @Nullable Bitmap bitmap, @NonNull c cVar, @NonNull c.q.a.i.a aVar, @Nullable c.q.a.h.a aVar2) {
         this.a = new WeakReference<>(context);
         this.b = bitmap;
-        this.f1528c = cVar.a;
+        this.f1523c = cVar.a;
         this.d = cVar.b;
-        this.e = cVar.f1527c;
+        this.e = cVar.f1522c;
         this.f = cVar.d;
         this.g = aVar.a;
         this.h = aVar.b;
-        this.i = aVar.f1525c;
+        this.i = aVar.f1520c;
         this.j = aVar.d;
         this.k = aVar.e;
         this.l = aVar.f;
@@ -69,8 +69,8 @@ public class a extends AsyncTask<Void, Void, Throwable> {
         FileChannel fileChannel;
         Throwable th;
         if (this.g > 0 && this.h > 0) {
-            float width = this.f1528c.width() / this.e;
-            float height = this.f1528c.height() / this.e;
+            float width = this.f1523c.width() / this.e;
+            float height = this.f1523c.height() / this.e;
             int i = this.g;
             if (width > ((float) i) || height > ((float) this.h)) {
                 float min = Math.min(((float) i) / width, ((float) this.h) / height);
@@ -95,15 +95,15 @@ public class a extends AsyncTask<Void, Void, Throwable> {
             }
             this.b = createBitmap;
         }
-        this.p = Math.round((this.f1528c.left - this.d.left) / this.e);
-        this.q = Math.round((this.f1528c.top - this.d.top) / this.e);
-        this.n = Math.round(this.f1528c.width() / this.e);
-        int round = Math.round(this.f1528c.height() / this.e);
+        this.p = Math.round((this.f1523c.left - this.d.left) / this.e);
+        this.q = Math.round((this.f1523c.top - this.d.top) / this.e);
+        this.n = Math.round(this.f1523c.width() / this.e);
+        int round = Math.round(this.f1523c.height() / this.e);
         this.o = round;
         int round2 = Math.round(((float) Math.max(this.n, round)) / 1000.0f) + 1;
         if (this.g <= 0 || this.h <= 0) {
             float f = (float) round2;
-            if (Math.abs(this.f1528c.left - this.d.left) <= f && Math.abs(this.f1528c.top - this.d.top) <= f && Math.abs(this.f1528c.bottom - this.d.bottom) <= f && Math.abs(this.f1528c.right - this.d.right) <= f && this.f == 0.0f) {
+            if (Math.abs(this.f1523c.left - this.d.left) <= f && Math.abs(this.f1523c.top - this.d.top) <= f && Math.abs(this.f1523c.bottom - this.d.bottom) <= f && Math.abs(this.f1523c.right - this.d.right) <= f && this.f == 0.0f) {
                 z2 = false;
                 Log.i("BitmapCropTask", "Should crop: " + z2);
                 FileChannel fileChannel2 = null;
diff --git a/app/src/main/java/c/q/a/j/b.java b/app/src/main/java/c/q/a/j/b.java
index 19a8e86f1c..3698a35d20 100644
--- a/app/src/main/java/c/q/a/j/b.java
+++ b/app/src/main/java/c/q/a/j/b.java
@@ -33,7 +33,7 @@ public class b extends AsyncTask<Void, Void, a> {
     public Uri b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Uri f1529c;
+    public Uri f1524c;
     public final int d;
     public final int e;
     public final c.q.a.h.b f;
@@ -44,7 +44,7 @@ public class b extends AsyncTask<Void, Void, a> {
         public c.q.a.i.b b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Exception f1530c;
+        public Exception f1525c;
 
         public a(@NonNull Bitmap bitmap, @NonNull c.q.a.i.b bVar) {
             this.a = bitmap;
@@ -52,14 +52,14 @@ public class b extends AsyncTask<Void, Void, a> {
         }
 
         public a(@NonNull Exception exc) {
-            this.f1530c = exc;
+            this.f1525c = exc;
         }
     }
 
     public b(@NonNull Context context, @NonNull Uri uri, @Nullable Uri uri2, int i, int i2, c.q.a.h.b bVar) {
         this.a = context;
         this.b = uri;
-        this.f1529c = uri2;
+        this.f1524c = uri2;
         this.d = i;
         this.e = i2;
         this.f = bVar;
@@ -96,7 +96,7 @@ public class b extends AsyncTask<Void, Void, a> {
                             inputStream.close();
                         } catch (IOException unused2) {
                         }
-                        this.b = this.f1529c;
+                        this.b = this.f1524c;
                     } catch (Throwable th2) {
                         th = th2;
                         fileOutputStream = fileOutputStream2;
@@ -112,7 +112,7 @@ public class b extends AsyncTask<Void, Void, a> {
                             } catch (IOException unused4) {
                             }
                         }
-                        this.b = this.f1529c;
+                        this.b = this.f1524c;
                         throw th;
                     }
                 } else {
@@ -124,7 +124,7 @@ public class b extends AsyncTask<Void, Void, a> {
                 }
                 if (inputStream != null) {
                 }
-                this.b = this.f1529c;
+                this.b = this.f1524c;
                 throw th;
             }
         } catch (Throwable th4) {
@@ -134,7 +134,7 @@ public class b extends AsyncTask<Void, Void, a> {
             }
             if (inputStream != null) {
             }
-            this.b = this.f1529c;
+            this.b = this.f1524c;
             throw th;
         }
     }
@@ -170,7 +170,7 @@ public class b extends AsyncTask<Void, Void, a> {
                     } catch (IOException unused) {
                     }
                     xVar.l.a();
-                    this.b = this.f1529c;
+                    this.b = this.f1524c;
                     throw th;
                 }
             } catch (Throwable th3) {
@@ -183,7 +183,7 @@ public class b extends AsyncTask<Void, Void, a> {
                 }
                 responseBody.close();
                 xVar.l.a();
-                this.b = this.f1529c;
+                this.b = this.f1524c;
                 throw th;
             }
             try {
@@ -209,7 +209,7 @@ public class b extends AsyncTask<Void, Void, a> {
                             }
                         }
                         xVar.l.a();
-                        this.b = this.f1529c;
+                        this.b = this.f1524c;
                     } catch (Throwable th4) {
                         th = th4;
                         gVar = c2;
@@ -219,7 +219,7 @@ public class b extends AsyncTask<Void, Void, a> {
                         }
                         responseBody.close();
                         xVar.l.a();
-                        this.b = this.f1529c;
+                        this.b = this.f1524c;
                         throw th;
                     }
                 } else {
@@ -245,7 +245,7 @@ public class b extends AsyncTask<Void, Void, a> {
                     responseBody.close();
                 }
                 xVar.l.a();
-                this.b = this.f1529c;
+                this.b = this.f1524c;
                 throw th;
             }
         } catch (Throwable th6) {
@@ -258,7 +258,7 @@ public class b extends AsyncTask<Void, Void, a> {
             }
             responseBody.close();
             xVar.l.a();
-            this.b = this.f1529c;
+            this.b = this.f1524c;
             throw th;
         }
     }
@@ -268,14 +268,14 @@ public class b extends AsyncTask<Void, Void, a> {
         Log.d("BitmapWorkerTask", "Uri scheme: " + scheme);
         if ("http".equals(scheme) || "https".equals(scheme)) {
             try {
-                b(this.b, this.f1529c);
+                b(this.b, this.f1524c);
             } catch (IOException | NullPointerException e) {
                 Log.e("BitmapWorkerTask", "Downloading failed", e);
                 throw e;
             }
         } else if ("content".equals(scheme)) {
             try {
-                a(this.b, this.f1529c);
+                a(this.b, this.f1524c);
             } catch (IOException | NullPointerException e2) {
                 Log.e("BitmapWorkerTask", "Copying failed", e2);
                 throw e2;
@@ -465,13 +465,13 @@ public class b extends AsyncTask<Void, Void, a> {
     @Override // android.os.AsyncTask
     public void onPostExecute(@NonNull a aVar) {
         a aVar2 = aVar;
-        Exception exc = aVar2.f1530c;
+        Exception exc = aVar2.f1525c;
         if (exc == null) {
             c.q.a.h.b bVar = this.f;
             Bitmap bitmap = aVar2.a;
             c.q.a.i.b bVar2 = aVar2.b;
             String path = this.b.getPath();
-            Uri uri = this.f1529c;
+            Uri uri = this.f1524c;
             String path2 = uri == null ? null : uri.getPath();
             c.q.a.l.c cVar = ((c.q.a.l.b) bVar).a;
             cVar.u = path;
diff --git a/app/src/main/java/c/q/a/k/a.java b/app/src/main/java/c/q/a/k/a.java
index de175cc3f6..f7111f5bf5 100644
--- a/app/src/main/java/c/q/a/k/a.java
+++ b/app/src/main/java/c/q/a/k/a.java
@@ -628,7 +628,7 @@ public class a {
     }
 
     public static final void c(f0.f0.f.a aVar, f0.f0.f.c cVar, String str) {
-        d.b bVar = f0.f0.f.d.f2701c;
+        d.b bVar = f0.f0.f.d.f2707c;
         Logger logger = f0.f0.f.d.b;
         StringBuilder sb = new StringBuilder();
         sb.append(cVar.f);
@@ -637,7 +637,7 @@ public class a {
         m.checkExpressionValueIsNotNull(format, "java.lang.String.format(format, *args)");
         sb.append(format);
         sb.append(": ");
-        sb.append(aVar.f2699c);
+        sb.append(aVar.f2705c);
         logger.fine(sb.toString());
     }
 
diff --git a/app/src/main/java/c/q/a/k/b.java b/app/src/main/java/c/q/a/k/b.java
index 90f4e10bb4..d5d29d9734 100644
--- a/app/src/main/java/c/q/a/k/b.java
+++ b/app/src/main/java/c/q/a/k/b.java
@@ -12,7 +12,7 @@ public class b extends Drawable {
     public Bitmap b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1531c = 255;
+    public int f1526c = 255;
     public int d;
     public int e;
 
@@ -37,7 +37,7 @@ public class b extends Drawable {
 
     @Override // android.graphics.drawable.Drawable
     public int getAlpha() {
-        return this.f1531c;
+        return this.f1526c;
     }
 
     @Override // android.graphics.drawable.Drawable
@@ -67,7 +67,7 @@ public class b extends Drawable {
 
     @Override // android.graphics.drawable.Drawable
     public void setAlpha(int i) {
-        this.f1531c = i;
+        this.f1526c = i;
         this.a.setAlpha(i);
     }
 
diff --git a/app/src/main/java/c/q/a/k/c.java b/app/src/main/java/c/q/a/k/c.java
index 6c72081e2c..96b931995e 100644
--- a/app/src/main/java/c/q/a/k/c.java
+++ b/app/src/main/java/c/q/a/k/c.java
@@ -13,7 +13,7 @@ public class c {
     public static final int[] b = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8};
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f1532c;
+    public final a f1527c;
 
     /* compiled from: ImageHeaderParser */
     public interface a {
@@ -33,12 +33,12 @@ public class c {
     }
 
     public c(InputStream inputStream) {
-        this.f1532c = new b(inputStream);
+        this.f1527c = new b(inputStream);
     }
 
     public int a() throws IOException {
         int i;
-        int a2 = ((b) this.f1532c).a();
+        int a2 = ((b) this.f1527c).a();
         if (!((a2 & 65496) == 65496 || a2 == 19789 || a2 == 18761)) {
             if (Log.isLoggable("ImageHeaderParser", 3)) {
                 c.d.b.a.a.d0("Parser doesn't handle magic number: ", a2, "ImageHeaderParser");
@@ -46,18 +46,18 @@ public class c {
             return -1;
         }
         while (true) {
-            short read = (short) (((b) this.f1532c).a.read() & 255);
+            short read = (short) (((b) this.f1527c).a.read() & 255);
             if (read == 255) {
-                short read2 = (short) (((b) this.f1532c).a.read() & 255);
+                short read2 = (short) (((b) this.f1527c).a.read() & 255);
                 if (read2 == 218) {
                     break;
                 } else if (read2 != 217) {
-                    i = ((b) this.f1532c).a() - 2;
+                    i = ((b) this.f1527c).a() - 2;
                     if (read2 == 225) {
                         break;
                     }
                     long j = (long) i;
-                    b bVar = (b) this.f1532c;
+                    b bVar = (b) this.f1527c;
                     Objects.requireNonNull(bVar);
                     long j2 = 0;
                     if (j >= 0) {
@@ -96,7 +96,7 @@ public class c {
             return -1;
         }
         byte[] bArr = new byte[i];
-        b bVar2 = (b) this.f1532c;
+        b bVar2 = (b) this.f1527c;
         Objects.requireNonNull(bVar2);
         int i2 = i;
         while (i2 > 0) {
diff --git a/app/src/main/java/c/q/a/k/d.java b/app/src/main/java/c/q/a/k/d.java
index 87afbd35df..f946f9f104 100644
--- a/app/src/main/java/c/q/a/k/d.java
+++ b/app/src/main/java/c/q/a/k/d.java
@@ -5,7 +5,7 @@ public class d {
     public float b;
 
     /* renamed from: c  reason: collision with root package name */
-    public float f1533c;
+    public float f1528c;
     public float d;
     public int e = -1;
     public int f = -1;
diff --git a/app/src/main/java/c/q/a/l/a.java b/app/src/main/java/c/q/a/l/a.java
index d891aa94aa..3a5624668c 100644
--- a/app/src/main/java/c/q/a/l/a.java
+++ b/app/src/main/java/c/q/a/l/a.java
@@ -25,13 +25,13 @@ public class a extends c {
     public long I;
 
     /* renamed from: x  reason: collision with root package name */
-    public final RectF f1534x;
+    public final RectF f1529x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final Matrix f1535y;
+    public final Matrix f1530y;
 
     /* renamed from: z  reason: collision with root package name */
-    public float f1536z;
+    public float f1531z;
 
     /* compiled from: CropImageView */
     /* renamed from: c.q.a.l.a$a  reason: collision with other inner class name */
@@ -75,7 +75,7 @@ public class a extends c {
                     float[] fArr = aVar.j;
                     aVar.g(f5 - (fArr[0] - this.l), f6 - (fArr[1] - this.m));
                     if (!this.r) {
-                        aVar.l(this.p + A, aVar.f1534x.centerX(), aVar.f1534x.centerY());
+                        aVar.l(this.p + A, aVar.f1529x.centerX(), aVar.f1529x.centerY());
                     }
                     if (!aVar.j(aVar.i)) {
                         aVar.post(this);
@@ -126,8 +126,8 @@ public class a extends c {
 
     public a(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
-        this.f1534x = new RectF();
-        this.f1535y = new Matrix();
+        this.f1529x = new RectF();
+        this.f1530y = new Matrix();
         this.A = 10.0f;
         this.D = null;
         this.G = 0;
@@ -142,28 +142,28 @@ public class a extends c {
         if (drawable != null) {
             float intrinsicWidth = (float) drawable.getIntrinsicWidth();
             float intrinsicHeight = (float) drawable.getIntrinsicHeight();
-            if (this.f1536z == 0.0f) {
-                this.f1536z = intrinsicWidth / intrinsicHeight;
+            if (this.f1531z == 0.0f) {
+                this.f1531z = intrinsicWidth / intrinsicHeight;
             }
             int i = this.m;
             float f = (float) i;
-            float f2 = this.f1536z;
+            float f2 = this.f1531z;
             int i2 = (int) (f / f2);
             int i3 = this.n;
             if (i2 > i3) {
                 float f3 = (float) i3;
                 int i4 = (int) (f2 * f3);
                 int i5 = (i - i4) / 2;
-                this.f1534x.set((float) i5, 0.0f, (float) (i4 + i5), f3);
+                this.f1529x.set((float) i5, 0.0f, (float) (i4 + i5), f3);
             } else {
                 int i6 = (i3 - i2) / 2;
-                this.f1534x.set(0.0f, (float) i6, f, (float) (i2 + i6));
+                this.f1529x.set(0.0f, (float) i6, f, (float) (i2 + i6));
             }
             h(intrinsicWidth, intrinsicHeight);
-            float width = this.f1534x.width();
-            float height = this.f1534x.height();
-            float max = Math.max(this.f1534x.width() / intrinsicWidth, this.f1534x.height() / intrinsicHeight);
-            RectF rectF = this.f1534x;
+            float width = this.f1529x.width();
+            float height = this.f1529x.height();
+            float max = Math.max(this.f1529x.width() / intrinsicWidth, this.f1529x.height() / intrinsicHeight);
+            RectF rectF = this.f1529x;
             float f4 = ((height - (intrinsicHeight * max)) / 2.0f) + rectF.top;
             this.l.reset();
             this.l.postScale(max, max);
@@ -171,7 +171,7 @@ public class a extends c {
             setImageMatrix(this.l);
             c cVar = this.B;
             if (cVar != null) {
-                ((d) cVar).a.j.setTargetAspectRatio(this.f1536z);
+                ((d) cVar).a.j.setTargetAspectRatio(this.f1531z);
             }
             c.a aVar = this.o;
             if (aVar != null) {
@@ -204,11 +204,11 @@ public class a extends c {
     }
 
     public float getTargetAspectRatio() {
-        return this.f1536z;
+        return this.f1531z;
     }
 
     public final void h(float f, float f2) {
-        float min = Math.min(Math.min(this.f1534x.width() / f, this.f1534x.width() / f2), Math.min(this.f1534x.height() / f2, this.f1534x.height() / f));
+        float min = Math.min(Math.min(this.f1529x.width() / f, this.f1529x.width() / f2), Math.min(this.f1529x.height() / f2, this.f1529x.height() / f));
         this.F = min;
         this.E = min * this.A;
     }
@@ -219,17 +219,17 @@ public class a extends c {
     }
 
     public boolean j(float[] fArr) {
-        this.f1535y.reset();
-        this.f1535y.setRotate(-getCurrentAngle());
+        this.f1530y.reset();
+        this.f1530y.setRotate(-getCurrentAngle());
         float[] copyOf = Arrays.copyOf(fArr, fArr.length);
-        this.f1535y.mapPoints(copyOf);
-        float[] s2 = c.q.a.k.a.s(this.f1534x);
-        this.f1535y.mapPoints(s2);
+        this.f1530y.mapPoints(copyOf);
+        float[] s2 = c.q.a.k.a.s(this.f1529x);
+        this.f1530y.mapPoints(s2);
         return c.q.a.k.a.g0(copyOf).contains(c.q.a.k.a.g0(s2));
     }
 
     public void k(float f) {
-        e(f, this.f1534x.centerX(), this.f1534x.centerY());
+        e(f, this.f1529x.centerX(), this.f1529x.centerY());
     }
 
     public void l(float f, float f2, float f3) {
@@ -243,8 +243,8 @@ public class a extends c {
     }
 
     public void setCropRect(RectF rectF) {
-        this.f1536z = rectF.width() / rectF.height();
-        this.f1534x.set(rectF.left - ((float) getPaddingLeft()), rectF.top - ((float) getPaddingTop()), rectF.right - ((float) getPaddingRight()), rectF.bottom - ((float) getPaddingBottom()));
+        this.f1531z = rectF.width() / rectF.height();
+        this.f1529x.set(rectF.left - ((float) getPaddingLeft()), rectF.top - ((float) getPaddingTop()), rectF.right - ((float) getPaddingRight()), rectF.bottom - ((float) getPaddingBottom()));
         Drawable drawable = getDrawable();
         if (drawable != null) {
             h((float) drawable.getIntrinsicWidth(), (float) drawable.getIntrinsicHeight());
@@ -258,27 +258,27 @@ public class a extends c {
         float f2;
         float f3;
         float f4;
-        if (this.f1537s && !j(this.i)) {
+        if (this.f1532s && !j(this.i)) {
             float[] fArr = this.j;
             float f5 = fArr[0];
             float f6 = fArr[1];
             float currentScale = getCurrentScale();
-            float centerX = this.f1534x.centerX() - f5;
-            float centerY = this.f1534x.centerY() - f6;
-            this.f1535y.reset();
-            this.f1535y.setTranslate(centerX, centerY);
+            float centerX = this.f1529x.centerX() - f5;
+            float centerY = this.f1529x.centerY() - f6;
+            this.f1530y.reset();
+            this.f1530y.setTranslate(centerX, centerY);
             float[] fArr2 = this.i;
             float[] copyOf = Arrays.copyOf(fArr2, fArr2.length);
-            this.f1535y.mapPoints(copyOf);
+            this.f1530y.mapPoints(copyOf);
             boolean j = j(copyOf);
             if (j) {
-                this.f1535y.reset();
-                this.f1535y.setRotate(-getCurrentAngle());
+                this.f1530y.reset();
+                this.f1530y.setRotate(-getCurrentAngle());
                 float[] fArr3 = this.i;
                 float[] copyOf2 = Arrays.copyOf(fArr3, fArr3.length);
-                float[] s2 = c.q.a.k.a.s(this.f1534x);
-                this.f1535y.mapPoints(copyOf2);
-                this.f1535y.mapPoints(s2);
+                float[] s2 = c.q.a.k.a.s(this.f1529x);
+                this.f1530y.mapPoints(copyOf2);
+                this.f1530y.mapPoints(s2);
                 RectF g02 = c.q.a.k.a.g0(copyOf2);
                 RectF g03 = c.q.a.k.a.g0(s2);
                 float f7 = g02.left - g03.left;
@@ -302,18 +302,18 @@ public class a extends c {
                     f10 = 0.0f;
                 }
                 fArr4[3] = f10;
-                this.f1535y.reset();
-                this.f1535y.setRotate(getCurrentAngle());
-                this.f1535y.mapPoints(fArr4);
+                this.f1530y.reset();
+                this.f1530y.setRotate(getCurrentAngle());
+                this.f1530y.mapPoints(fArr4);
                 f4 = -(fArr4[0] + fArr4[2]);
                 f3 = -(fArr4[1] + fArr4[3]);
                 f = currentScale;
                 f2 = 0.0f;
             } else {
-                RectF rectF = new RectF(this.f1534x);
-                this.f1535y.reset();
-                this.f1535y.setRotate(getCurrentAngle());
-                this.f1535y.mapRect(rectF);
+                RectF rectF = new RectF(this.f1529x);
+                this.f1530y.reset();
+                this.f1530y.setRotate(getCurrentAngle());
+                this.f1530y.mapRect(rectF);
                 float[] fArr5 = this.i;
                 f = currentScale;
                 float[] fArr6 = {(float) Math.sqrt(Math.pow((double) (fArr5[1] - fArr5[3]), 2.0d) + Math.pow((double) (fArr5[0] - fArr5[2]), 2.0d)), (float) Math.sqrt(Math.pow((double) (fArr5[3] - fArr5[5]), 2.0d) + Math.pow((double) (fArr5[2] - fArr5[4]), 2.0d))};
@@ -329,7 +329,7 @@ public class a extends c {
             }
             g(f4, f3);
             if (!j) {
-                l(f + f2, this.f1534x.centerX(), this.f1534x.centerY());
+                l(f + f2, this.f1529x.centerX(), this.f1529x.centerY());
             }
         }
     }
@@ -357,17 +357,17 @@ public class a extends c {
     public void setTargetAspectRatio(float f) {
         Drawable drawable = getDrawable();
         if (drawable == null) {
-            this.f1536z = f;
+            this.f1531z = f;
             return;
         }
         if (f == 0.0f) {
-            this.f1536z = ((float) drawable.getIntrinsicWidth()) / ((float) drawable.getIntrinsicHeight());
+            this.f1531z = ((float) drawable.getIntrinsicWidth()) / ((float) drawable.getIntrinsicHeight());
         } else {
-            this.f1536z = f;
+            this.f1531z = f;
         }
         c.q.a.h.c cVar = this.B;
         if (cVar != null) {
-            ((d) cVar).a.j.setTargetAspectRatio(this.f1536z);
+            ((d) cVar).a.j.setTargetAspectRatio(this.f1531z);
         }
     }
 }
diff --git a/app/src/main/java/c/q/a/l/c.java b/app/src/main/java/c/q/a/l/c.java
index 09a8927723..c769ca4c4b 100644
--- a/app/src/main/java/c/q/a/l/c.java
+++ b/app/src/main/java/c/q/a/l/c.java
@@ -31,7 +31,7 @@ public class c extends AppCompatImageView {
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f1537s;
+    public boolean f1532s;
     public int t;
     public String u;
     public String v;
@@ -52,7 +52,7 @@ public class c extends AppCompatImageView {
         this.k = new float[9];
         this.l = new Matrix();
         this.r = false;
-        this.f1537s = false;
+        this.f1532s = false;
         this.t = 0;
         c();
     }
@@ -84,7 +84,7 @@ public class c extends AppCompatImageView {
             RectF rectF = new RectF(0.0f, 0.0f, intrinsicWidth, intrinsicHeight);
             this.p = c.q.a.k.a.s(rectF);
             this.q = c.q.a.k.a.q(rectF);
-            this.f1537s = true;
+            this.f1532s = true;
             a aVar = this.o;
             if (aVar != null) {
                 UCropActivity.a aVar2 = (UCropActivity.a) aVar;
@@ -188,7 +188,7 @@ public class c extends AppCompatImageView {
     @Override // android.view.View
     public void onLayout(boolean z2, int i, int i2, int i3, int i4) {
         super.onLayout(z2, i, i2, i3, i4);
-        if (z2 || (this.r && !this.f1537s)) {
+        if (z2 || (this.r && !this.f1532s)) {
             int paddingLeft = getPaddingLeft();
             int paddingTop = getPaddingTop();
             this.m = (getWidth() - getPaddingRight()) - paddingLeft;
diff --git a/app/src/main/java/co/discord/media_engine/ReceiverReport.java b/app/src/main/java/co/discord/media_engine/ReceiverReport.java
index a5bf2da151..d1b71fb39c 100644
--- a/app/src/main/java/co/discord/media_engine/ReceiverReport.java
+++ b/app/src/main/java/co/discord/media_engine/ReceiverReport.java
@@ -8,18 +8,18 @@ public final class ReceiverReport {
     private final float fractionLost;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1538id;
+    private final String f1533id;
 
     public ReceiverReport(String str, float f, float f2) {
         m.checkNotNullParameter(str, "id");
-        this.f1538id = str;
+        this.f1533id = str;
         this.bitrate = f;
         this.fractionLost = f2;
     }
 
     public static /* synthetic */ ReceiverReport copy$default(ReceiverReport receiverReport, String str, float f, float f2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = receiverReport.f1538id;
+            str = receiverReport.f1533id;
         }
         if ((i & 2) != 0) {
             f = receiverReport.bitrate;
@@ -31,7 +31,7 @@ public final class ReceiverReport {
     }
 
     public final String component1() {
-        return this.f1538id;
+        return this.f1533id;
     }
 
     public final float component2() {
@@ -55,7 +55,7 @@ public final class ReceiverReport {
             return false;
         }
         ReceiverReport receiverReport = (ReceiverReport) obj;
-        return m.areEqual(this.f1538id, receiverReport.f1538id) && Float.compare(this.bitrate, receiverReport.bitrate) == 0 && Float.compare(this.fractionLost, receiverReport.fractionLost) == 0;
+        return m.areEqual(this.f1533id, receiverReport.f1533id) && Float.compare(this.bitrate, receiverReport.bitrate) == 0 && Float.compare(this.fractionLost, receiverReport.fractionLost) == 0;
     }
 
     public final float getBitrate() {
@@ -67,17 +67,17 @@ public final class ReceiverReport {
     }
 
     public final String getId() {
-        return this.f1538id;
+        return this.f1533id;
     }
 
     public int hashCode() {
-        String str = this.f1538id;
+        String str = this.f1533id;
         return Float.floatToIntBits(this.fractionLost) + a.b(this.bitrate, (str != null ? str.hashCode() : 0) * 31, 31);
     }
 
     public String toString() {
         StringBuilder L = a.L("ReceiverReport(id=");
-        L.append(this.f1538id);
+        L.append(this.f1533id);
         L.append(", bitrate=");
         L.append(this.bitrate);
         L.append(", fractionLost=");
diff --git a/app/src/main/java/co/discord/media_engine/StatsCodec.java b/app/src/main/java/co/discord/media_engine/StatsCodec.java
index 477fc217d5..f7a581d7be 100644
--- a/app/src/main/java/co/discord/media_engine/StatsCodec.java
+++ b/app/src/main/java/co/discord/media_engine/StatsCodec.java
@@ -6,18 +6,18 @@ import d0.z.d.m;
 public final class StatsCodec {
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f1539id;
+    private final int f1534id;
     private final String name;
 
     public StatsCodec(int i, String str) {
         m.checkNotNullParameter(str, "name");
-        this.f1539id = i;
+        this.f1534id = i;
         this.name = str;
     }
 
     public static /* synthetic */ StatsCodec copy$default(StatsCodec statsCodec, int i, String str, int i2, Object obj) {
         if ((i2 & 1) != 0) {
-            i = statsCodec.f1539id;
+            i = statsCodec.f1534id;
         }
         if ((i2 & 2) != 0) {
             str = statsCodec.name;
@@ -26,7 +26,7 @@ public final class StatsCodec {
     }
 
     public final int component1() {
-        return this.f1539id;
+        return this.f1534id;
     }
 
     public final String component2() {
@@ -46,11 +46,11 @@ public final class StatsCodec {
             return false;
         }
         StatsCodec statsCodec = (StatsCodec) obj;
-        return this.f1539id == statsCodec.f1539id && m.areEqual(this.name, statsCodec.name);
+        return this.f1534id == statsCodec.f1534id && m.areEqual(this.name, statsCodec.name);
     }
 
     public final int getId() {
-        return this.f1539id;
+        return this.f1534id;
     }
 
     public final String getName() {
@@ -58,14 +58,14 @@ public final class StatsCodec {
     }
 
     public int hashCode() {
-        int i = this.f1539id * 31;
+        int i = this.f1534id * 31;
         String str = this.name;
         return i + (str != null ? str.hashCode() : 0);
     }
 
     public String toString() {
         StringBuilder L = a.L("StatsCodec(id=");
-        L.append(this.f1539id);
+        L.append(this.f1534id);
         L.append(", name=");
         return a.D(L, this.name, ")");
     }
diff --git a/app/src/main/java/co/discord/media_engine/internal/Inbound.java b/app/src/main/java/co/discord/media_engine/internal/Inbound.java
index 357443d74e..c05cdeb413 100644
--- a/app/src/main/java/co/discord/media_engine/internal/Inbound.java
+++ b/app/src/main/java/co/discord/media_engine/internal/Inbound.java
@@ -7,14 +7,14 @@ public final class Inbound {
     private final InboundAudio audio;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1540id;
+    private final String f1535id;
     private final InboundPlayout playout;
     private final InboundVideo video;
 
     public Inbound(String str, InboundAudio inboundAudio, InboundVideo inboundVideo, InboundPlayout inboundPlayout) {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(inboundAudio, "audio");
-        this.f1540id = str;
+        this.f1535id = str;
         this.audio = inboundAudio;
         this.video = inboundVideo;
         this.playout = inboundPlayout;
@@ -22,7 +22,7 @@ public final class Inbound {
 
     public static /* synthetic */ Inbound copy$default(Inbound inbound, String str, InboundAudio inboundAudio, InboundVideo inboundVideo, InboundPlayout inboundPlayout, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = inbound.f1540id;
+            str = inbound.f1535id;
         }
         if ((i & 2) != 0) {
             inboundAudio = inbound.audio;
@@ -37,7 +37,7 @@ public final class Inbound {
     }
 
     public final String component1() {
-        return this.f1540id;
+        return this.f1535id;
     }
 
     public final InboundAudio component2() {
@@ -66,7 +66,7 @@ public final class Inbound {
             return false;
         }
         Inbound inbound = (Inbound) obj;
-        return m.areEqual(this.f1540id, inbound.f1540id) && m.areEqual(this.audio, inbound.audio) && m.areEqual(this.video, inbound.video) && m.areEqual(this.playout, inbound.playout);
+        return m.areEqual(this.f1535id, inbound.f1535id) && m.areEqual(this.audio, inbound.audio) && m.areEqual(this.video, inbound.video) && m.areEqual(this.playout, inbound.playout);
     }
 
     public final InboundAudio getAudio() {
@@ -74,7 +74,7 @@ public final class Inbound {
     }
 
     public final String getId() {
-        return this.f1540id;
+        return this.f1535id;
     }
 
     public final InboundPlayout getPlayout() {
@@ -86,7 +86,7 @@ public final class Inbound {
     }
 
     public int hashCode() {
-        String str = this.f1540id;
+        String str = this.f1535id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         InboundAudio inboundAudio = this.audio;
@@ -102,7 +102,7 @@ public final class Inbound {
 
     public String toString() {
         StringBuilder L = a.L("Inbound(id=");
-        L.append(this.f1540id);
+        L.append(this.f1535id);
         L.append(", audio=");
         L.append(this.audio);
         L.append(", video=");
diff --git a/app/src/main/java/co/discord/media_engine/internal/Outbound.java b/app/src/main/java/co/discord/media_engine/internal/Outbound.java
index 21887b2f59..dbb27d6df9 100644
--- a/app/src/main/java/co/discord/media_engine/internal/Outbound.java
+++ b/app/src/main/java/co/discord/media_engine/internal/Outbound.java
@@ -7,20 +7,20 @@ public final class Outbound {
     private final OutboundAudio audio;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1541id;
+    private final String f1536id;
     private final OutboundVideo video;
 
     public Outbound(String str, OutboundAudio outboundAudio, OutboundVideo outboundVideo) {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(outboundAudio, "audio");
-        this.f1541id = str;
+        this.f1536id = str;
         this.audio = outboundAudio;
         this.video = outboundVideo;
     }
 
     public static /* synthetic */ Outbound copy$default(Outbound outbound, String str, OutboundAudio outboundAudio, OutboundVideo outboundVideo, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = outbound.f1541id;
+            str = outbound.f1536id;
         }
         if ((i & 2) != 0) {
             outboundAudio = outbound.audio;
@@ -32,7 +32,7 @@ public final class Outbound {
     }
 
     public final String component1() {
-        return this.f1541id;
+        return this.f1536id;
     }
 
     public final OutboundAudio component2() {
@@ -57,7 +57,7 @@ public final class Outbound {
             return false;
         }
         Outbound outbound = (Outbound) obj;
-        return m.areEqual(this.f1541id, outbound.f1541id) && m.areEqual(this.audio, outbound.audio) && m.areEqual(this.video, outbound.video);
+        return m.areEqual(this.f1536id, outbound.f1536id) && m.areEqual(this.audio, outbound.audio) && m.areEqual(this.video, outbound.video);
     }
 
     public final OutboundAudio getAudio() {
@@ -65,7 +65,7 @@ public final class Outbound {
     }
 
     public final String getId() {
-        return this.f1541id;
+        return this.f1536id;
     }
 
     public final OutboundVideo getVideo() {
@@ -73,7 +73,7 @@ public final class Outbound {
     }
 
     public int hashCode() {
-        String str = this.f1541id;
+        String str = this.f1536id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         OutboundAudio outboundAudio = this.audio;
@@ -87,7 +87,7 @@ public final class Outbound {
 
     public String toString() {
         StringBuilder L = a.L("Outbound(id=");
-        L.append(this.f1541id);
+        L.append(this.f1536id);
         L.append(", audio=");
         L.append(this.audio);
         L.append(", video=");
diff --git a/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 52cc9b95ee..65370d4155 100644
--- a/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/app/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -71,20 +71,20 @@ public class LottieAnimationView extends AppCompatImageView {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f1542s;
+    public boolean f1537s;
     public boolean t;
     public boolean u;
     public boolean v;
     public boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public t f1543x;
+    public t f1538x;
 
     /* renamed from: y  reason: collision with root package name */
-    public Set<n> f1544y;
+    public Set<n> f1539y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f1545z;
+    public int f1540z;
 
     public static class SavedState extends View.BaseSavedState {
         public static final Parcelable.Creator<SavedState> CREATOR = new a();
@@ -190,14 +190,14 @@ public class LottieAnimationView extends AppCompatImageView {
         this.n = 0;
         j jVar = new j();
         this.o = jVar;
-        this.f1542s = false;
+        this.f1537s = false;
         this.t = false;
         this.u = false;
         this.v = false;
         this.w = true;
-        this.f1543x = t.AUTOMATIC;
-        this.f1544y = new HashSet();
-        this.f1545z = 0;
+        this.f1538x = t.AUTOMATIC;
+        this.f1539y = new HashSet();
+        this.f1540z = 0;
         TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(attributeSet, R.b.LottieAnimationView, R.a.lottieAnimationViewStyle, 0);
         if (!isInEditMode()) {
             this.w = obtainStyledAttributes.getBoolean(R.b.LottieAnimationView_lottie_cacheComposition, true);
@@ -313,7 +313,7 @@ public class LottieAnimationView extends AppCompatImageView {
         if (r0 != 1) goto L_0x000c;
      */
     public final void b() {
-        int ordinal = this.f1543x.ordinal();
+        int ordinal = this.f1538x.ordinal();
         int i2 = 2;
         if (ordinal == 0) {
             d dVar = this.B;
@@ -330,12 +330,12 @@ public class LottieAnimationView extends AppCompatImageView {
 
     @Override // android.view.View
     public void buildDrawingCache(boolean z2) {
-        this.f1545z++;
+        this.f1540z++;
         super.buildDrawingCache(z2);
-        if (this.f1545z == 1 && getWidth() > 0 && getHeight() > 0 && getLayerType() == 1 && getDrawingCache(z2) == null) {
+        if (this.f1540z == 1 && getWidth() > 0 && getHeight() > 0 && getLayerType() == 1 && getDrawingCache(z2) == null) {
             setRenderMode(t.HARDWARE);
         }
-        this.f1545z--;
+        this.f1540z--;
         c.c.a.c.a("buildDrawingCache");
     }
 
@@ -346,7 +346,7 @@ public class LottieAnimationView extends AppCompatImageView {
             b();
             return;
         }
-        this.f1542s = true;
+        this.f1537s = true;
     }
 
     @Nullable
@@ -438,7 +438,7 @@ public class LottieAnimationView extends AppCompatImageView {
         if (this.o.i()) {
             this.u = false;
             this.t = false;
-            this.f1542s = false;
+            this.f1537s = false;
             j jVar = this.o;
             jVar.o.clear();
             jVar.k.cancel();
@@ -498,19 +498,19 @@ public class LottieAnimationView extends AppCompatImageView {
                         this.o.k();
                         b();
                     } else {
-                        this.f1542s = false;
+                        this.f1537s = false;
                         this.t = true;
                     }
-                } else if (this.f1542s) {
+                } else if (this.f1537s) {
                     c();
                 }
                 this.t = false;
-                this.f1542s = false;
+                this.f1537s = false;
             } else if (this.o.i()) {
                 this.v = false;
                 this.u = false;
                 this.t = false;
-                this.f1542s = false;
+                this.f1537s = false;
                 j jVar = this.o;
                 jVar.o.clear();
                 jVar.k.m();
@@ -625,7 +625,7 @@ public class LottieAnimationView extends AppCompatImageView {
         if (getDrawable() != this.o || z2) {
             onVisibilityChanged(this, getVisibility());
             requestLayout();
-            for (n nVar : this.f1544y) {
+            for (n nVar : this.f1539y) {
                 nVar.a(dVar);
             }
         }
@@ -720,7 +720,7 @@ public class LottieAnimationView extends AppCompatImageView {
     }
 
     public void setRenderMode(t tVar) {
-        this.f1543x = tVar;
+        this.f1538x = tVar;
         b();
     }
 
diff --git a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
index 2c9192ff3d..8e470d55e9 100644
--- a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
+++ b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
@@ -42,6 +42,7 @@ import c.c.a.a0.q;
 import c.c.a.b0.g;
 import c.c.a.y.k.b;
 import c.c.a.y.k.f;
+import c.f.b.a.c;
 import c.f.d.d.i;
 import c.f.g.e.b0;
 import c.f.g.e.d0;
@@ -54,7 +55,6 @@ import c.f.g.e.v;
 import c.f.g.e.w;
 import c.f.g.e.x;
 import c.f.g.e.z;
-import c.f.g.f.c;
 import c.g.a.a.p;
 import c.g.a.c.c0.e0;
 import c.g.a.c.i0.d;
@@ -158,12 +158,12 @@ public class AnimatableValueParser {
         public final /* synthetic */ int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ Object f1546c;
+        public final /* synthetic */ Object f1541c;
 
         public a(Class cls, int i, Object obj) {
             this.a = cls;
             this.b = i;
-            this.f1546c = obj;
+            this.f1541c = obj;
         }
 
         public boolean equals(Object obj) {
@@ -174,7 +174,7 @@ public class AnimatableValueParser {
                 return false;
             }
             for (int i = 0; i < this.b; i++) {
-                Object obj2 = Array.get(this.f1546c, i);
+                Object obj2 = Array.get(this.f1541c, i);
                 Object obj3 = Array.get(obj, i);
                 if (!(obj2 == obj3 || obj2 == null || obj2.equals(obj3))) {
                     return false;
@@ -198,26 +198,16 @@ public class AnimatableValueParser {
         return z0(channel, context, z2);
     }
 
-    public static final void A1(String str, String str2) {
-        m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
-        Logger.d$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
+    public static final boolean A1(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$isThreaded");
+        return channel.A() == 0 || channel.A() == 5;
     }
 
-    public static long A2(InputStream inputStream, long j) throws IOException {
-        j(Boolean.valueOf(j >= 0));
-        long j2 = j;
-        while (j2 > 0) {
-            long skip = inputStream.skip(j2);
-            if (skip <= 0) {
-                if (inputStream.read() == -1) {
-                    return j - j2;
-                }
-                skip = 1;
-            }
-            j2 -= skip;
+    public static boolean A2(Object obj, Collection<String> collection, Collection<String> collection2) {
+        if (collection == null && collection2 == null) {
+            return false;
         }
-        return j;
+        return collection2 == null ? collection.contains(obj) : collection == null ? !collection2.contains(obj) : !collection2.contains(obj) || collection.contains(obj);
     }
 
     public static void B(boolean z2) {
@@ -234,14 +224,14 @@ public class AnimatableValueParser {
         return context.getResources().getDrawable(resourceId);
     }
 
-    public static final void B1(String str, String str2, Throwable th) {
-        m.checkNotNullParameter(str, "tag");
-        m.checkNotNullParameter(str2, "msg");
-        Logger.e$default(LoggingProvider.INSTANCE.get(), str, str2, th, null, 8, null);
+    public static final boolean B1(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$isVoiceChannel");
+        return channel.A() == 2;
     }
 
-    public static void B2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        parcel.setDataPosition(parcel.dataPosition() + k2(parcel, i));
+    public static final boolean B2(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$shouldPlayJoinLeaveSounds");
+        return B1(channel) || s1(channel);
     }
 
     public static void C(boolean z2, Object obj) {
@@ -264,11 +254,23 @@ public class AnimatableValueParser {
     public static final void C1(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
         m.checkNotNullParameter(str2, "msg");
-        Logger.i$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
+        Logger.d$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
-    public static String C2(@ColorInt int i) {
-        return f0.k("rgba(%d,%d,%d,%.3f)", Integer.valueOf(Color.red(i)), Integer.valueOf(Color.green(i)), Integer.valueOf(Color.blue(i)), Double.valueOf(((double) Color.alpha(i)) / 255.0d));
+    public static long C2(InputStream inputStream, long j) throws IOException {
+        j(Boolean.valueOf(j >= 0));
+        long j2 = j;
+        while (j2 > 0) {
+            long skip = inputStream.skip(j2);
+            if (skip <= 0) {
+                if (inputStream.read() == -1) {
+                    return j - j2;
+                }
+                skip = 1;
+            }
+            j2 -= skip;
+        }
+        return j;
     }
 
     @Pure
@@ -282,14 +284,14 @@ public class AnimatableValueParser {
         return ((((byte) inputStream.read()) << 24) & -16777216) | ((((byte) inputStream.read()) << 16) & 16711680) | ((((byte) inputStream.read()) << 8) & 65280) | (((byte) inputStream.read()) & 255);
     }
 
-    public static final void D1(String str, String str2) {
+    public static final void D1(String str, String str2, Throwable th) {
         m.checkNotNullParameter(str, "tag");
         m.checkNotNullParameter(str2, "msg");
-        Logger.v$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
+        Logger.e$default(LoggingProvider.INSTANCE.get(), str, str2, th, null, 8, null);
     }
 
-    public static i D2(Object obj) {
-        return new i(obj.getClass().getSimpleName(), null);
+    public static void D2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        parcel.setDataPosition(parcel.dataPosition() + m2(parcel, i));
     }
 
     @Pure
@@ -312,13 +314,11 @@ public class AnimatableValueParser {
     public static final void E1(String str, String str2) {
         m.checkNotNullParameter(str, "tag");
         m.checkNotNullParameter(str2, "msg");
-        Logger.w$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
+        Logger.i$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
-    public static void E2(Collection<? extends Node> collection, c.a.u.b.c.a aVar) {
-        for (Node node : collection) {
-            F2(node, aVar);
-        }
+    public static String E2(@ColorInt int i) {
+        return f0.k("rgba(%d,%d,%d,%.3f)", Integer.valueOf(Color.red(i)), Integer.valueOf(Color.green(i)), Integer.valueOf(Color.blue(i)), Double.valueOf(((double) Color.alpha(i)) / 255.0d));
     }
 
     public static void F(@RecentlyNonNull boolean z2) {
@@ -330,12 +330,12 @@ public class AnimatableValueParser {
     public static final PermissionOverwrite F0(Channel channel, long j) {
         boolean z2;
         m.checkNotNullParameter(channel, "$this$getPermissionOverwriteForId");
-        List<PermissionOverwrite> r = channel.r();
+        List<PermissionOverwrite> s2 = channel.s();
         Object obj = null;
-        if (r == null) {
+        if (s2 == null) {
             return null;
         }
-        Iterator<T> it = r.iterator();
+        Iterator<T> it = s2.iterator();
         while (true) {
             if (!it.hasNext()) {
                 break;
@@ -356,30 +356,14 @@ public class AnimatableValueParser {
         return (PermissionOverwrite) obj;
     }
 
-    public static ParameterizedType F1(Type type) {
-        if (type instanceof ParameterizedType) {
-            return (ParameterizedType) type;
-        }
-        if (type instanceof WildcardType) {
-            WildcardType wildcardType = (WildcardType) type;
-            if (wildcardType.getLowerBounds().length != 0) {
-                return null;
-            }
-            Type[] upperBounds = wildcardType.getUpperBounds();
-            if (upperBounds.length == 1) {
-                return F1(upperBounds[0]);
-            }
-        }
-        return null;
+    public static final void F1(String str, String str2) {
+        m.checkNotNullParameter(str, "tag");
+        m.checkNotNullParameter(str2, "msg");
+        Logger.v$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
-    public static void F2(Node node, c.a.u.b.c.a aVar) {
-        if (node.hasChildren()) {
-            for (Node node2 : node.getChildren()) {
-                F2(node2, aVar);
-            }
-        }
-        aVar.processNode(node);
+    public static i F2(Object obj) {
+        return new i(obj.getClass().getSimpleName(), null);
     }
 
     public static void G(@RecentlyNonNull boolean z2, @RecentlyNonNull Object obj) {
@@ -390,40 +374,26 @@ public class AnimatableValueParser {
 
     public static final List<User> G0(Channel channel) {
         m.checkNotNullParameter(channel, "$this$getRecipients");
-        List<com.discord.api.user.User> v = channel.v();
-        if (v == null) {
+        List<com.discord.api.user.User> w = channel.w();
+        if (w == null) {
             return n.emptyList();
         }
-        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(v, 10));
-        for (com.discord.api.user.User user : v) {
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(w, 10));
+        for (com.discord.api.user.User user : w) {
             arrayList.add(new CoreUser(user));
         }
         return arrayList;
     }
 
-    public static TypeVariable<?> G1(Type type) {
-        if (type instanceof TypeVariable) {
-            return (TypeVariable) type;
-        }
-        if (type instanceof WildcardType) {
-            WildcardType wildcardType = (WildcardType) type;
-            if (wildcardType.getLowerBounds().length != 0) {
-                return null;
-            }
-            Type[] upperBounds = wildcardType.getUpperBounds();
-            if (upperBounds.length == 1) {
-                return G1(upperBounds[0]);
-            }
-        }
-        return null;
+    public static final void G1(String str, String str2) {
+        m.checkNotNullParameter(str, "tag");
+        m.checkNotNullParameter(str2, "msg");
+        Logger.w$default(LoggingProvider.INSTANCE.get(), str, str2, null, 4, null);
     }
 
-    public static void G2(Node node, c.a.u.b.c.a aVar) {
-        aVar.processNode(node);
-        if (node.hasChildren()) {
-            for (Node node2 : node.getChildren()) {
-                G2(node2, aVar);
-            }
+    public static void G2(Collection<? extends Node> collection, c.a.u.b.c.a aVar) {
+        for (Node node : collection) {
+            H2(node, aVar);
         }
     }
 
@@ -440,7 +410,130 @@ public class AnimatableValueParser {
         return voiceState == null ? StageRequestToSpeakState.NONE : (!voiceState.l() || voiceState.f() == null) ? (voiceState.l() || voiceState.f() == null) ? !voiceState.l() ? StageRequestToSpeakState.ON_STAGE : StageRequestToSpeakState.NONE : StageRequestToSpeakState.REQUESTED_TO_SPEAK_AND_AWAITING_USER_ACK : StageRequestToSpeakState.REQUESTED_TO_SPEAK;
     }
 
-    public static void H1(MediaFormat mediaFormat, String str, int i) {
+    public static ParameterizedType H1(Type type) {
+        if (type instanceof ParameterizedType) {
+            return (ParameterizedType) type;
+        }
+        if (type instanceof WildcardType) {
+            WildcardType wildcardType = (WildcardType) type;
+            if (wildcardType.getLowerBounds().length != 0) {
+                return null;
+            }
+            Type[] upperBounds = wildcardType.getUpperBounds();
+            if (upperBounds.length == 1) {
+                return H1(upperBounds[0]);
+            }
+        }
+        return null;
+    }
+
+    public static void H2(Node node, c.a.u.b.c.a aVar) {
+        if (node.hasChildren()) {
+            for (Node node2 : node.getChildren()) {
+                H2(node2, aVar);
+            }
+        }
+        aVar.processNode(node);
+    }
+
+    @EnsuresNonNull({"#1"})
+    @Pure
+    public static <T> T I(@Nullable T t, Object obj) {
+        if (t != null) {
+            return t;
+        }
+        throw new IllegalStateException(String.valueOf(obj));
+    }
+
+    public static List<String> I0(CacheKey cacheKey) {
+        try {
+            if (!(cacheKey instanceof c)) {
+                ArrayList arrayList = new ArrayList(1);
+                arrayList.add(cacheKey.a() ? cacheKey.b() : u2(cacheKey));
+                return arrayList;
+            }
+            Objects.requireNonNull((c) cacheKey);
+            throw null;
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static TypeVariable<?> I1(Type type) {
+        if (type instanceof TypeVariable) {
+            return (TypeVariable) type;
+        }
+        if (type instanceof WildcardType) {
+            WildcardType wildcardType = (WildcardType) type;
+            if (wildcardType.getLowerBounds().length != 0) {
+                return null;
+            }
+            Type[] upperBounds = wildcardType.getUpperBounds();
+            if (upperBounds.length == 1) {
+                return I1(upperBounds[0]);
+            }
+        }
+        return null;
+    }
+
+    public static void I2(Node node, c.a.u.b.c.a aVar) {
+        aVar.processNode(node);
+        if (node.hasChildren()) {
+            for (Node node2 : node.getChildren()) {
+                I2(node2, aVar);
+            }
+        }
+    }
+
+    public static boolean J(byte[] bArr, String str) {
+        if (bArr.length != str.length()) {
+            return false;
+        }
+        for (int i = 0; i < bArr.length; i++) {
+            if (str.charAt(i) != bArr[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static ScalingUtils$ScaleType J0(TypedArray typedArray, int i) {
+        switch (typedArray.getInt(i, -2)) {
+            case -1:
+                return null;
+            case 0:
+                ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
+                return z.l;
+            case 1:
+                ScalingUtils$ScaleType scalingUtils$ScaleType2 = ScalingUtils$ScaleType.a;
+                return x.l;
+            case 2:
+                ScalingUtils$ScaleType scalingUtils$ScaleType3 = ScalingUtils$ScaleType.a;
+                return v.l;
+            case 3:
+                ScalingUtils$ScaleType scalingUtils$ScaleType4 = ScalingUtils$ScaleType.a;
+                return w.l;
+            case 4:
+                ScalingUtils$ScaleType scalingUtils$ScaleType5 = ScalingUtils$ScaleType.a;
+                return r.l;
+            case 5:
+                ScalingUtils$ScaleType scalingUtils$ScaleType6 = ScalingUtils$ScaleType.a;
+                return t.l;
+            case 6:
+                ScalingUtils$ScaleType scalingUtils$ScaleType7 = ScalingUtils$ScaleType.a;
+                return s.l;
+            case 7:
+                ScalingUtils$ScaleType scalingUtils$ScaleType8 = ScalingUtils$ScaleType.a;
+                return b0.l;
+            case 8:
+                ScalingUtils$ScaleType scalingUtils$ScaleType9 = ScalingUtils$ScaleType.a;
+                return u.l;
+            default:
+                throw new RuntimeException("XML attribute not specified!");
+        }
+    }
+
+    public static void J1(MediaFormat mediaFormat, String str, int i) {
         if (i != -1) {
             mediaFormat.setInteger(str, i);
         }
@@ -453,7 +546,7 @@ public class AnimatableValueParser {
     /* JADX WARNING: Code restructure failed: missing block: B:156:0x0264, code lost:
         if (r16 != false) goto L_0x0266;
      */
-    public static c.f.g.f.a H2(c.f.g.f.a aVar, Context context, AttributeSet attributeSet) {
+    public static c.f.g.f.a J2(c.f.g.f.a aVar, Context context, AttributeSet attributeSet) {
         int i;
         int i2;
         boolean z2;
@@ -532,7 +625,7 @@ public class AnimatableValueParser {
                                     aVar.b(B0(context2, obtainStyledAttributes, index));
                                 } else if (index == R.a.GenericDraweeHierarchy_roundAsCircle) {
                                     if (aVar.r == null) {
-                                        aVar.r = new c();
+                                        aVar.r = new c.f.g.f.c();
                                     }
                                     aVar.r.b = obtainStyledAttributes.getBoolean(index, false);
                                 } else if (index == R.a.GenericDraweeHierarchy_roundedCornerRadius) {
@@ -561,15 +654,15 @@ public class AnimatableValueParser {
                                                     z16 = obtainStyledAttributes.getBoolean(index, z16);
                                                 } else if (index == R.a.GenericDraweeHierarchy_roundWithOverlayColor) {
                                                     if (aVar.r == null) {
-                                                        aVar.r = new c();
+                                                        aVar.r = new c.f.g.f.c();
                                                     }
                                                     aVar.r.a(obtainStyledAttributes.getColor(index, 0));
                                                 } else {
                                                     if (index == R.a.GenericDraweeHierarchy_roundingBorderWidth) {
                                                         if (aVar.r == null) {
-                                                            aVar.r = new c();
+                                                            aVar.r = new c.f.g.f.c();
                                                         }
-                                                        c cVar = aVar.r;
+                                                        c.f.g.f.c cVar = aVar.r;
                                                         float dimensionPixelSize = (float) obtainStyledAttributes.getDimensionPixelSize(index, 0);
                                                         Objects.requireNonNull(cVar);
                                                         if (dimensionPixelSize >= 0.0f) {
@@ -585,14 +678,14 @@ public class AnimatableValueParser {
                                                         i4 = i7;
                                                         if (index == R.a.GenericDraweeHierarchy_roundingBorderColor) {
                                                             if (aVar.r == null) {
-                                                                aVar.r = new c();
+                                                                aVar.r = new c.f.g.f.c();
                                                             }
                                                             aVar.r.f = obtainStyledAttributes.getColor(index, 0);
                                                         } else if (index == R.a.GenericDraweeHierarchy_roundingBorderPadding) {
                                                             if (aVar.r == null) {
-                                                                aVar.r = new c();
+                                                                aVar.r = new c.f.g.f.c();
                                                             }
-                                                            c cVar2 = aVar.r;
+                                                            c.f.g.f.c cVar2 = aVar.r;
                                                             float dimensionPixelSize2 = (float) obtainStyledAttributes.getDimensionPixelSize(index, 0);
                                                             Objects.requireNonNull(cVar2);
                                                             l(dimensionPixelSize2 >= 0.0f, "the padding cannot be < 0");
@@ -703,9 +796,9 @@ public class AnimatableValueParser {
         }
         if (i2 > 0) {
             if (aVar.r == null) {
-                aVar.r = new c();
+                aVar.r = new c.f.g.f.c();
             }
-            c cVar3 = aVar.r;
+            c.f.g.f.c cVar3 = aVar.r;
             float f = z4 ? (float) i2 : 0.0f;
             float f2 = z5 ? (float) i2 : 0.0f;
             float f3 = z3 ? (float) i2 : 0.0f;
@@ -726,153 +819,6 @@ public class AnimatableValueParser {
         return aVar;
     }
 
-    @EnsuresNonNull({"#1"})
-    @Pure
-    public static <T> T I(@Nullable T t, Object obj) {
-        if (t != null) {
-            return t;
-        }
-        throw new IllegalStateException(String.valueOf(obj));
-    }
-
-    public static List<String> I0(CacheKey cacheKey) {
-        try {
-            if (!(cacheKey instanceof c.f.b.a.c)) {
-                ArrayList arrayList = new ArrayList(1);
-                arrayList.add(cacheKey.a() ? cacheKey.b() : s2(cacheKey));
-                return arrayList;
-            }
-            Objects.requireNonNull((c.f.b.a.c) cacheKey);
-            throw null;
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static String I1(String str, String str2) {
-        int length = str.length() - str2.length();
-        if (length < 0 || length > 1) {
-            throw new IllegalArgumentException("Invalid input received");
-        }
-        StringBuilder sb = new StringBuilder(str2.length() + str.length());
-        for (int i = 0; i < str.length(); i++) {
-            sb.append(str.charAt(i));
-            if (str2.length() > i) {
-                sb.append(str2.charAt(i));
-            }
-        }
-        return sb.toString();
-    }
-
-    @RecentlyNonNull
-    public static int I2(@RecentlyNonNull Parcel parcel) {
-        int readInt = parcel.readInt();
-        int k2 = k2(parcel, readInt);
-        int dataPosition = parcel.dataPosition();
-        if ((65535 & readInt) != 20293) {
-            String valueOf = String.valueOf(Integer.toHexString(readInt));
-            throw new SafeParcelReader$ParseException(valueOf.length() != 0 ? "Expected object header. Got 0x".concat(valueOf) : new String("Expected object header. Got 0x"), parcel);
-        }
-        int i = k2 + dataPosition;
-        if (i >= dataPosition && i <= parcel.dataSize()) {
-            return i;
-        }
-        StringBuilder sb = new StringBuilder(54);
-        sb.append("Size read is invalid start=");
-        sb.append(dataPosition);
-        sb.append(" end=");
-        sb.append(i);
-        throw new SafeParcelReader$ParseException(sb.toString(), parcel);
-    }
-
-    public static boolean J(byte[] bArr, String str) {
-        if (bArr.length != str.length()) {
-            return false;
-        }
-        for (int i = 0; i < bArr.length; i++) {
-            if (str.charAt(i) != bArr[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static ScalingUtils$ScaleType J0(TypedArray typedArray, int i) {
-        switch (typedArray.getInt(i, -2)) {
-            case -1:
-                return null;
-            case 0:
-                ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
-                return z.l;
-            case 1:
-                ScalingUtils$ScaleType scalingUtils$ScaleType2 = ScalingUtils$ScaleType.a;
-                return x.l;
-            case 2:
-                ScalingUtils$ScaleType scalingUtils$ScaleType3 = ScalingUtils$ScaleType.a;
-                return v.l;
-            case 3:
-                ScalingUtils$ScaleType scalingUtils$ScaleType4 = ScalingUtils$ScaleType.a;
-                return w.l;
-            case 4:
-                ScalingUtils$ScaleType scalingUtils$ScaleType5 = ScalingUtils$ScaleType.a;
-                return r.l;
-            case 5:
-                ScalingUtils$ScaleType scalingUtils$ScaleType6 = ScalingUtils$ScaleType.a;
-                return t.l;
-            case 6:
-                ScalingUtils$ScaleType scalingUtils$ScaleType7 = ScalingUtils$ScaleType.a;
-                return s.l;
-            case 7:
-                ScalingUtils$ScaleType scalingUtils$ScaleType8 = ScalingUtils$ScaleType.a;
-                return b0.l;
-            case 8:
-                ScalingUtils$ScaleType scalingUtils$ScaleType9 = ScalingUtils$ScaleType.a;
-                return u.l;
-            default:
-                throw new RuntimeException("XML attribute not specified!");
-        }
-    }
-
-    public static void J1(File file) throws FileUtils$CreateDirectoryException {
-        if (file.exists()) {
-            if (!file.isDirectory()) {
-                if (!file.delete()) {
-                    throw new FileUtils$CreateDirectoryException(file.getAbsolutePath(), new FileUtils$FileDeleteException(file.getAbsolutePath()));
-                }
-            } else {
-                return;
-            }
-        }
-        if (!file.mkdirs() && !file.isDirectory()) {
-            throw new FileUtils$CreateDirectoryException(file.getAbsolutePath());
-        }
-    }
-
-    public static boolean J2(int i, c.i.a.c.i2.w wVar, boolean z2) throws ParserException {
-        if (wVar.a() < 7) {
-            if (z2) {
-                return false;
-            }
-            StringBuilder L = c.d.b.a.a.L("too short header: ");
-            L.append(wVar.a());
-            throw new ParserException(L.toString());
-        } else if (wVar.s() != i) {
-            if (z2) {
-                return false;
-            }
-            StringBuilder L2 = c.d.b.a.a.L("expected header type ");
-            L2.append(Integer.toHexString(i));
-            throw new ParserException(L2.toString());
-        } else if (wVar.s() == 118 && wVar.s() == 111 && wVar.s() == 114 && wVar.s() == 98 && wVar.s() == 105 && wVar.s() == 115) {
-            return true;
-        } else {
-            if (z2) {
-                return false;
-            }
-            throw new ParserException("expected characters 'vorbis'");
-        }
-    }
-
     public static int K(String str, String str2) {
         int glCreateProgram = GLES20.glCreateProgram();
         r();
@@ -895,42 +841,53 @@ public class AnimatableValueParser {
         return new ChannelUtils$getSortByNameAndType$1(companion);
     }
 
-    public static int K1(int i, int i2) {
-        if (i2 == 255) {
-            return i;
+    public static String K1(String str, String str2) {
+        int length = str.length() - str2.length();
+        if (length < 0 || length > 1) {
+            throw new IllegalArgumentException("Invalid input received");
         }
-        if (i2 == 0) {
-            return i & 16777215;
-        }
-        return (i & 16777215) | ((((i >>> 24) * (i2 + (i2 >> 7))) >> 8) << 24);
-    }
-
-    public static void K2(File file, c.f.d.c.a aVar) {
-        aVar.b(file);
-        File[] listFiles = file.listFiles();
-        if (listFiles != null) {
-            for (File file2 : listFiles) {
-                if (file2.isDirectory()) {
-                    K2(file2, aVar);
-                } else {
-                    aVar.a(file2);
-                }
+        StringBuilder sb = new StringBuilder(str2.length() + str.length());
+        for (int i = 0; i < str.length(); i++) {
+            sb.append(str.charAt(i));
+            if (str2.length() > i) {
+                sb.append(str2.charAt(i));
             }
         }
-        aVar.c(file);
+        return sb.toString();
+    }
+
+    @RecentlyNonNull
+    public static int K2(@RecentlyNonNull Parcel parcel) {
+        int readInt = parcel.readInt();
+        int m2 = m2(parcel, readInt);
+        int dataPosition = parcel.dataPosition();
+        if ((65535 & readInt) != 20293) {
+            String valueOf = String.valueOf(Integer.toHexString(readInt));
+            throw new SafeParcelReader$ParseException(valueOf.length() != 0 ? "Expected object header. Got 0x".concat(valueOf) : new String("Expected object header. Got 0x"), parcel);
+        }
+        int i = m2 + dataPosition;
+        if (i >= dataPosition && i <= parcel.dataSize()) {
+            return i;
+        }
+        StringBuilder sb = new StringBuilder(54);
+        sb.append("Size read is invalid start=");
+        sb.append(dataPosition);
+        sb.append(" end=");
+        sb.append(i);
+        throw new SafeParcelReader$ParseException(sb.toString(), parcel);
     }
 
     public static void L(long j, c.i.a.c.i2.w wVar, c.i.a.c.a2.w[] wVarArr) {
         while (true) {
             boolean z2 = true;
             if (wVar.a() > 1) {
-                int g2 = g2(wVar);
-                int g22 = g2(wVar);
-                int i = wVar.b + g22;
-                if (g22 == -1 || g22 > wVar.a()) {
+                int i2 = i2(wVar);
+                int i22 = i2(wVar);
+                int i = wVar.b + i22;
+                if (i22 == -1 || i22 > wVar.a()) {
                     Log.w("CeaUtil", "Skipping remainder of malformed SEI NAL unit.");
                     i = wVar.f908c;
-                } else if (g2 == 4 && g22 >= 8) {
+                } else if (i2 == 4 && i22 >= 8) {
                     int s2 = wVar.s();
                     int x2 = wVar.x();
                     int f = x2 == 49 ? wVar.f() : 0;
@@ -1008,22 +965,43 @@ public class AnimatableValueParser {
         }
     }
 
-    public static final Integer L1(JsonReader jsonReader) {
-        m.checkNotNullParameter(jsonReader, "$this$nextIntOrNull");
-        if (jsonReader.N() != JsonToken.NULL) {
-            return Integer.valueOf(jsonReader.z());
+    public static void L1(File file) throws FileUtils$CreateDirectoryException {
+        if (file.exists()) {
+            if (!file.isDirectory()) {
+                if (!file.delete()) {
+                    throw new FileUtils$CreateDirectoryException(file.getAbsolutePath(), new FileUtils$FileDeleteException(file.getAbsolutePath()));
+                }
+            } else {
+                return;
+            }
+        }
+        if (!file.mkdirs() && !file.isDirectory()) {
+            throw new FileUtils$CreateDirectoryException(file.getAbsolutePath());
         }
-        jsonReader.H();
-        return null;
     }
 
-    public static void L2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Bundle bundle, @RecentlyNonNull boolean z2) {
-        if (bundle != null) {
-            int T2 = T2(parcel, i);
-            parcel.writeBundle(bundle);
-            Y2(parcel, T2);
-        } else if (z2) {
-            W2(parcel, i, 0);
+    public static boolean L2(int i, c.i.a.c.i2.w wVar, boolean z2) throws ParserException {
+        if (wVar.a() < 7) {
+            if (z2) {
+                return false;
+            }
+            StringBuilder L = c.d.b.a.a.L("too short header: ");
+            L.append(wVar.a());
+            throw new ParserException(L.toString());
+        } else if (wVar.s() != i) {
+            if (z2) {
+                return false;
+            }
+            StringBuilder L2 = c.d.b.a.a.L("expected header type ");
+            L2.append(Integer.toHexString(i));
+            throw new ParserException(L2.toString());
+        } else if (wVar.s() == 118 && wVar.s() == 111 && wVar.s() == 114 && wVar.s() == 98 && wVar.s() == 105 && wVar.s() == 115) {
+            return true;
+        } else {
+            if (z2) {
+                return false;
+            }
+            throw new ParserException("expected characters 'vorbis'");
         }
     }
 
@@ -1045,19 +1023,29 @@ public class AnimatableValueParser {
         return Build.VERSION.SDK_INT >= 23 ? SysUtil$MarshmallowSysdeps.getSupportedAbis() : SysUtil$LollipopSysdeps.getSupportedAbis();
     }
 
-    @Nullable
-    public static <T> List<c.c.a.c0.a<T>> M1(c.c.a.a0.h0.c cVar, c.c.a.d dVar, g0<T> g0Var) throws IOException {
-        return q.a(cVar, dVar, 1.0f, g0Var);
+    public static int M1(int i, int i2) {
+        if (i2 == 255) {
+            return i;
+        }
+        if (i2 == 0) {
+            return i & 16777215;
+        }
+        return (i & 16777215) | ((((i >>> 24) * (i2 + (i2 >> 7))) >> 8) << 24);
     }
 
-    public static void M2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull byte[] bArr, @RecentlyNonNull boolean z2) {
-        if (bArr != null) {
-            int T2 = T2(parcel, i);
-            parcel.writeByteArray(bArr);
-            Y2(parcel, T2);
-        } else if (z2) {
-            W2(parcel, i, 0);
+    public static void M2(File file, c.f.d.c.a aVar) {
+        aVar.b(file);
+        File[] listFiles = file.listFiles();
+        if (listFiles != null) {
+            for (File file2 : listFiles) {
+                if (file2.isDirectory()) {
+                    M2(file2, aVar);
+                } else {
+                    aVar.a(file2);
+                }
+            }
         }
+        aVar.c(file);
     }
 
     public static void N(Drawable drawable, Drawable drawable2) {
@@ -1074,17 +1062,22 @@ public class AnimatableValueParser {
         return c.d.b.a.a.u("TransportRuntime.", str);
     }
 
-    public static c.c.a.y.k.a N1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
-        return new c.c.a.y.k.a(M1(cVar, dVar, e.a));
+    public static final Integer N1(JsonReader jsonReader) {
+        m.checkNotNullParameter(jsonReader, "$this$nextIntOrNull");
+        if (jsonReader.N() != JsonToken.NULL) {
+            return Integer.valueOf(jsonReader.z());
+        }
+        jsonReader.H();
+        return null;
     }
 
-    public static void N2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull IBinder iBinder, @RecentlyNonNull boolean z2) {
-        if (iBinder != null) {
-            int T2 = T2(parcel, i);
-            parcel.writeStrongBinder(iBinder);
-            Y2(parcel, T2);
+    public static void N2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Bundle bundle, @RecentlyNonNull boolean z2) {
+        if (bundle != null) {
+            int V2 = V2(parcel, i);
+            parcel.writeBundle(bundle);
+            a3(parcel, V2);
         } else if (z2) {
-            W2(parcel, i, 0);
+            Y2(parcel, i, 0);
         }
     }
 
@@ -1103,29 +1096,30 @@ public class AnimatableValueParser {
         return null;
     }
 
-    public static b O1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
-        return P1(cVar, dVar, true);
+    @Nullable
+    public static <T> List<c.c.a.c0.a<T>> O1(c.c.a.a0.h0.c cVar, c.c.a.d dVar, g0<T> g0Var) throws IOException {
+        return q.a(cVar, dVar, 1.0f, g0Var);
     }
 
-    public static void O2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable parcelable, @RecentlyNonNull int i2, @RecentlyNonNull boolean z2) {
-        if (parcelable != null) {
-            int T2 = T2(parcel, i);
-            parcelable.writeToParcel(parcel, i2);
-            Y2(parcel, T2);
+    public static void O2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull byte[] bArr, @RecentlyNonNull boolean z2) {
+        if (bArr != null) {
+            int V2 = V2(parcel, i);
+            parcel.writeByteArray(bArr);
+            a3(parcel, V2);
         } else if (z2) {
-            W2(parcel, i, 0);
+            Y2(parcel, i, 0);
         }
     }
 
     @RecentlyNonNull
     public static Bundle P(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int k2 = k2(parcel, i);
+        int m2 = m2(parcel, i);
         int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
+        if (m2 == 0) {
             return null;
         }
         Bundle readBundle = parcel.readBundle();
-        parcel.setDataPosition(dataPosition + k2);
+        parcel.setDataPosition(dataPosition + m2);
         return readBundle;
     }
 
@@ -1138,29 +1132,29 @@ public class AnimatableValueParser {
         return new Pair<>(Integer.valueOf(((((byte) inputStream.read()) & 255) | ((read & 63) << 8)) + 1), Integer.valueOf(((((((byte) inputStream.read()) & 255) & 15) << 10) | ((((byte) inputStream.read()) & 255) << 2) | ((read & 192) >> 6)) + 1));
     }
 
-    public static b P1(c.c.a.a0.h0.c cVar, c.c.a.d dVar, boolean z2) throws IOException {
-        return new b(q.a(cVar, dVar, z2 ? g.c() : 1.0f, h.a));
+    public static c.c.a.y.k.a P1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
+        return new c.c.a.y.k.a(O1(cVar, dVar, e.a));
     }
 
-    public static void P2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull String str, @RecentlyNonNull boolean z2) {
-        if (str != null) {
-            int T2 = T2(parcel, i);
-            parcel.writeString(str);
-            Y2(parcel, T2);
+    public static void P2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull IBinder iBinder, @RecentlyNonNull boolean z2) {
+        if (iBinder != null) {
+            int V2 = V2(parcel, i);
+            parcel.writeStrongBinder(iBinder);
+            a3(parcel, V2);
         } else if (z2) {
-            W2(parcel, i, 0);
+            Y2(parcel, i, 0);
         }
     }
 
     @RecentlyNonNull
     public static byte[] Q(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int k2 = k2(parcel, i);
+        int m2 = m2(parcel, i);
         int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
+        if (m2 == 0) {
             return null;
         }
         byte[] createByteArray = parcel.createByteArray();
-        parcel.setDataPosition(dataPosition + k2);
+        parcel.setDataPosition(dataPosition + m2);
         return createByteArray;
     }
 
@@ -1201,17 +1195,17 @@ public class AnimatableValueParser {
         }
     }
 
-    public static c.c.a.y.k.d Q1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
-        return new c.c.a.y.k.d(M1(cVar, dVar, c.c.a.a0.n.a));
+    public static b Q1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
+        return R1(cVar, dVar, true);
     }
 
-    public static void Q2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull String[] strArr, @RecentlyNonNull boolean z2) {
-        if (strArr != null) {
-            int T2 = T2(parcel, i);
-            parcel.writeStringArray(strArr);
-            Y2(parcel, T2);
+    public static void Q2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable parcelable, @RecentlyNonNull int i2, @RecentlyNonNull boolean z2) {
+        if (parcelable != null) {
+            int V2 = V2(parcel, i);
+            parcelable.writeToParcel(parcel, i2);
+            a3(parcel, V2);
         } else if (z2) {
-            W2(parcel, i, 0);
+            Y2(parcel, i, 0);
         }
     }
 
@@ -1225,14 +1219,84 @@ public class AnimatableValueParser {
     }
 
     public static long R0(FileChannel fileChannel, ByteBuffer byteBuffer, long j) throws IOException {
-        a2(fileChannel, byteBuffer, 4, j);
+        c2(fileChannel, byteBuffer, 4, j);
         return ((long) byteBuffer.getInt()) & 4294967295L;
     }
 
+    public static b R1(c.c.a.a0.h0.c cVar, c.c.a.d dVar, boolean z2) throws IOException {
+        return new b(q.a(cVar, dVar, z2 ? g.c() : 1.0f, h.a));
+    }
+
+    public static void R2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull String str, @RecentlyNonNull boolean z2) {
+        if (str != null) {
+            int V2 = V2(parcel, i);
+            parcel.writeString(str);
+            a3(parcel, V2);
+        } else if (z2) {
+            Y2(parcel, i, 0);
+        }
+    }
+
+    @RecentlyNonNull
+    public static <T extends Parcelable> T S(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable.Creator<T> creator) {
+        int m2 = m2(parcel, i);
+        int dataPosition = parcel.dataPosition();
+        if (m2 == 0) {
+            return null;
+        }
+        T createFromParcel = creator.createFromParcel(parcel);
+        parcel.setDataPosition(dataPosition + m2);
+        return createFromParcel;
+    }
+
+    public static final boolean S0(Long l, long j) {
+        return l != null && (l.longValue() & j) == j;
+    }
+
+    public static c.c.a.y.k.d S1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
+        return new c.c.a.y.k.d(O1(cVar, dVar, c.c.a.a0.n.a));
+    }
+
+    public static void S2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull String[] strArr, @RecentlyNonNull boolean z2) {
+        if (strArr != null) {
+            int V2 = V2(parcel, i);
+            parcel.writeStringArray(strArr);
+            a3(parcel, V2);
+        } else if (z2) {
+            Y2(parcel, i, 0);
+        }
+    }
+
+    @RecentlyNonNull
+    public static String T(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        int m2 = m2(parcel, i);
+        int dataPosition = parcel.dataPosition();
+        if (m2 == 0) {
+            return null;
+        }
+        String readString = parcel.readString();
+        parcel.setDataPosition(dataPosition + m2);
+        return readString;
+    }
+
+    public static boolean T0(byte[] bArr, byte[] bArr2, int i) {
+        Objects.requireNonNull(bArr);
+        Objects.requireNonNull(bArr2);
+        if (bArr2.length + i > bArr.length) {
+            return false;
+        }
+        for (int i2 = 0; i2 < bArr2.length; i2++) {
+            if (bArr[i + i2] != bArr2[i2]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /* JADX WARNING: Removed duplicated region for block: B:58:0x01a5  */
     /* JADX WARNING: Removed duplicated region for block: B:66:0x01bc A[SYNTHETIC] */
     @Nullable
-    public static ArrayList<d.a> R1(c.i.a.c.i2.w wVar) {
+    public static ArrayList<d.a> T1(c.i.a.c.i2.w wVar) {
         int i;
         ArrayList<d.a> arrayList;
         ArrayList<d.a> arrayList2;
@@ -1380,47 +1444,48 @@ public class AnimatableValueParser {
         return arrayList3;
     }
 
-    public static <T extends Parcelable> void R2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull T[] tArr, @RecentlyNonNull int i2, @RecentlyNonNull boolean z2) {
+    public static <T extends Parcelable> void T2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull T[] tArr, @RecentlyNonNull int i2, @RecentlyNonNull boolean z2) {
         if (tArr != null) {
-            int T2 = T2(parcel, i);
+            int V2 = V2(parcel, i);
             int length = tArr.length;
             parcel.writeInt(length);
             for (T t : tArr) {
                 if (t == null) {
                     parcel.writeInt(0);
                 } else {
-                    V2(parcel, t, i2);
+                    X2(parcel, t, i2);
                 }
             }
-            Y2(parcel, T2);
+            a3(parcel, V2);
         } else if (z2) {
-            W2(parcel, i, 0);
+            Y2(parcel, i, 0);
         }
     }
 
     @RecentlyNonNull
-    public static <T extends Parcelable> T S(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable.Creator<T> creator) {
-        int k2 = k2(parcel, i);
+    public static String[] U(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        int m2 = m2(parcel, i);
         int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
+        if (m2 == 0) {
             return null;
         }
-        T createFromParcel = creator.createFromParcel(parcel);
-        parcel.setDataPosition(dataPosition + k2);
-        return createFromParcel;
+        String[] createStringArray = parcel.createStringArray();
+        parcel.setDataPosition(dataPosition + m2);
+        return createStringArray;
     }
 
-    public static final boolean S0(Long l, long j) {
-        return l != null && (l.longValue() & j) == j;
+    public static final boolean U0(VoiceState voiceState) {
+        m.checkNotNullParameter(voiceState, "$this$hasVideo");
+        return voiceState.i() || voiceState.j();
     }
 
-    public static f S1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
+    public static f U1(c.c.a.a0.h0.c cVar, c.c.a.d dVar) throws IOException {
         return new f(q.a(cVar, dVar, g.c(), c.c.a.a0.v.a));
     }
 
-    public static <T extends Parcelable> void S2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull List<T> list, @RecentlyNonNull boolean z2) {
+    public static <T extends Parcelable> void U2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull List<T> list, @RecentlyNonNull boolean z2) {
         if (list != null) {
-            int T2 = T2(parcel, i);
+            int V2 = V2(parcel, i);
             int size = list.size();
             parcel.writeInt(size);
             for (int i2 = 0; i2 < size; i2++) {
@@ -1428,43 +1493,33 @@ public class AnimatableValueParser {
                 if (t == null) {
                     parcel.writeInt(0);
                 } else {
-                    V2(parcel, t, 0);
+                    X2(parcel, t, 0);
                 }
             }
-            Y2(parcel, T2);
+            a3(parcel, V2);
         } else if (z2) {
-            W2(parcel, i, 0);
+            Y2(parcel, i, 0);
         }
     }
 
     @RecentlyNonNull
-    public static String T(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int k2 = k2(parcel, i);
+    public static ArrayList<String> V(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        int m2 = m2(parcel, i);
         int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
+        if (m2 == 0) {
             return null;
         }
-        String readString = parcel.readString();
-        parcel.setDataPosition(dataPosition + k2);
-        return readString;
+        ArrayList<String> createStringArrayList = parcel.createStringArrayList();
+        parcel.setDataPosition(dataPosition + m2);
+        return createStringArrayList;
     }
 
-    public static boolean T0(byte[] bArr, byte[] bArr2, int i) {
-        Objects.requireNonNull(bArr);
-        Objects.requireNonNull(bArr2);
-        if (bArr2.length + i > bArr.length) {
-            return false;
-        }
-        for (int i2 = 0; i2 < bArr2.length; i2++) {
-            if (bArr[i + i2] != bArr2[i2]) {
-                return false;
-            }
-        }
-        return true;
+    public static int V0(int i, int i2) {
+        return ((i + 31) * 31) + i2;
     }
 
     @Nullable
-    public static j T1(byte[] bArr) {
+    public static j V1(byte[] bArr) {
         c.i.a.c.i2.w wVar = new c.i.a.c.i2.w(bArr);
         if (wVar.f908c < 32) {
             return null;
@@ -1492,51 +1547,55 @@ public class AnimatableValueParser {
         return new j(uuid, f, bArr2);
     }
 
-    public static int T2(Parcel parcel, int i) {
+    public static int V2(Parcel parcel, int i) {
         parcel.writeInt(i | -65536);
         parcel.writeInt(0);
         return parcel.dataPosition();
     }
 
     @RecentlyNonNull
-    public static String[] U(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int k2 = k2(parcel, i);
+    public static <T> T[] W(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable.Creator<T> creator) {
+        int m2 = m2(parcel, i);
         int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
+        if (m2 == 0) {
             return null;
         }
-        String[] createStringArray = parcel.createStringArray();
-        parcel.setDataPosition(dataPosition + k2);
-        return createStringArray;
+        T[] tArr = (T[]) parcel.createTypedArray(creator);
+        parcel.setDataPosition(dataPosition + m2);
+        return tArr;
     }
 
-    public static final boolean U0(VoiceState voiceState) {
-        m.checkNotNullParameter(voiceState, "$this$hasVideo");
-        return voiceState.i() || voiceState.j();
+    public static int W0(Object obj, Object obj2) {
+        int i = 0;
+        int hashCode = obj == null ? 0 : obj.hashCode();
+        if (obj2 != null) {
+            i = obj2.hashCode();
+        }
+        return V0(hashCode, i);
     }
 
     @Nullable
-    public static byte[] U1(byte[] bArr, UUID uuid) {
-        j T1 = T1(bArr);
-        if (T1 == null) {
+    public static byte[] W1(byte[] bArr, UUID uuid) {
+        j V1 = V1(bArr);
+        if (V1 == null) {
             return null;
         }
-        if (uuid.equals(T1.a)) {
-            return T1.f695c;
+        if (uuid.equals(V1.a)) {
+            return V1.f695c;
         }
-        Log.w("PsshAtomUtil", "UUID mismatch. Expected: " + uuid + ", got: " + T1.a + ".");
+        Log.w("PsshAtomUtil", "UUID mismatch. Expected: " + uuid + ", got: " + V1.a + ".");
         return null;
     }
 
-    public static void U2(Parcel parcel, int i, int i2) {
-        int k2 = k2(parcel, i);
-        if (k2 != i2) {
-            String hexString = Integer.toHexString(k2);
+    public static void W2(Parcel parcel, int i, int i2) {
+        int m2 = m2(parcel, i);
+        if (m2 != i2) {
+            String hexString = Integer.toHexString(m2);
             StringBuilder sb = new StringBuilder(String.valueOf(hexString).length() + 46);
             sb.append("Expected size ");
             sb.append(i2);
             sb.append(" got ");
-            sb.append(k2);
+            sb.append(m2);
             sb.append(" (0x");
             sb.append(hexString);
             sb.append(")");
@@ -1545,23 +1604,23 @@ public class AnimatableValueParser {
     }
 
     @RecentlyNonNull
-    public static ArrayList<String> V(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int k2 = k2(parcel, i);
+    public static <T> ArrayList<T> X(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable.Creator<T> creator) {
+        int m2 = m2(parcel, i);
         int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
+        if (m2 == 0) {
             return null;
         }
-        ArrayList<String> createStringArrayList = parcel.createStringArrayList();
-        parcel.setDataPosition(dataPosition + k2);
-        return createStringArrayList;
+        ArrayList<T> createTypedArrayList = parcel.createTypedArrayList(creator);
+        parcel.setDataPosition(dataPosition + m2);
+        return createTypedArrayList;
     }
 
-    public static int V0(int i, int i2) {
-        return ((i + 31) * 31) + i2;
+    public static void X0(String str, String str2) {
+        Log.i(N0(str), str2);
     }
 
     @Nullable
-    public static c.i.a.c.a2.k0.c V1(c.i.a.c.a2.i iVar) throws IOException {
+    public static c.i.a.c.a2.k0.c X1(c.i.a.c.a2.i iVar) throws IOException {
         byte[] bArr;
         Objects.requireNonNull(iVar);
         c.i.a.c.i2.w wVar = new c.i.a.c.i2.w(16);
@@ -1600,7 +1659,7 @@ public class AnimatableValueParser {
         return new c.i.a.c.a2.k0.c(l, l2, k, k2, l3, l4, bArr);
     }
 
-    public static <T extends Parcelable> void V2(Parcel parcel, T t, int i) {
+    public static <T extends Parcelable> void X2(Parcel parcel, T t, int i) {
         int dataPosition = parcel.dataPosition();
         parcel.writeInt(1);
         int dataPosition2 = parcel.dataPosition();
@@ -1611,29 +1670,21 @@ public class AnimatableValueParser {
         parcel.setDataPosition(dataPosition3);
     }
 
-    @RecentlyNonNull
-    public static <T> T[] W(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable.Creator<T> creator) {
-        int k2 = k2(parcel, i);
-        int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
-            return null;
-        }
-        T[] tArr = (T[]) parcel.createTypedArray(creator);
-        parcel.setDataPosition(dataPosition + k2);
-        return tArr;
+    public static String Y(String str) {
+        return "." + str + ",." + str + " *";
     }
 
-    public static int W0(Object obj, Object obj2) {
-        int i = 0;
-        int hashCode = obj == null ? 0 : obj.hashCode();
-        if (obj2 != null) {
-            i = obj2.hashCode();
+    public static int Y0(int i) {
+        int i2 = 0;
+        while (i > 0) {
+            i2++;
+            i >>>= 1;
         }
-        return V0(hashCode, i);
+        return i2;
     }
 
     @Nullable
-    public static Metadata W1(c.i.a.c.a2.i iVar, boolean z2) throws IOException {
+    public static Metadata Y1(c.i.a.c.a2.i iVar, boolean z2) throws IOException {
         c.i.a.c.c2.k.a aVar;
         if (z2) {
             aVar = null;
@@ -1674,7 +1725,7 @@ public class AnimatableValueParser {
         return metadata;
     }
 
-    public static void W2(Parcel parcel, int i, int i2) {
+    public static void Y2(Parcel parcel, int i, int i2) {
         if (i2 >= 65535) {
             parcel.writeInt(i | -65536);
             parcel.writeInt(i2);
@@ -1683,90 +1734,6 @@ public class AnimatableValueParser {
         parcel.writeInt(i | (i2 << 16));
     }
 
-    @RecentlyNonNull
-    public static <T> ArrayList<T> X(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i, @RecentlyNonNull Parcelable.Creator<T> creator) {
-        int k2 = k2(parcel, i);
-        int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
-            return null;
-        }
-        ArrayList<T> createTypedArrayList = parcel.createTypedArrayList(creator);
-        parcel.setDataPosition(dataPosition + k2);
-        return createTypedArrayList;
-    }
-
-    public static void X0(String str, String str2) {
-        Log.i(N0(str), str2);
-    }
-
-    public static int X1(c.i.a.c.a2.i iVar, byte[] bArr, int i, int i2) throws IOException {
-        int i3 = 0;
-        while (i3 < i2) {
-            int i4 = iVar.i(bArr, i + i3, i2 - i3);
-            if (i4 == -1) {
-                break;
-            }
-            i3 += i4;
-        }
-        return i3;
-    }
-
-    public static void X2(Parcel parcel, int i, int i2) {
-        if (i != i2) {
-            String hexString = Integer.toHexString(i);
-            StringBuilder sb = new StringBuilder(String.valueOf(hexString).length() + 46);
-            sb.append("Expected size ");
-            sb.append(i2);
-            sb.append(" got ");
-            sb.append(i);
-            sb.append(" (0x");
-            sb.append(hexString);
-            sb.append(")");
-            throw new SafeParcelReader$ParseException(sb.toString(), parcel);
-        }
-    }
-
-    public static String Y(String str) {
-        return "." + str + ",." + str + " *";
-    }
-
-    public static int Y0(int i) {
-        int i2 = 0;
-        while (i > 0) {
-            i2++;
-            i >>>= 1;
-        }
-        return i2;
-    }
-
-    public static boolean Y1(e0 e0Var, c.g.a.c.j jVar, Type type) {
-        if (!jVar.B(e0Var.a(type)._class)) {
-            return false;
-        }
-        ParameterizedType F1 = F1(type);
-        if (F1 == null || !Objects.equals(jVar._class, F1.getRawType())) {
-            return true;
-        }
-        Type[] actualTypeArguments = F1.getActualTypeArguments();
-        c.g.a.c.h0.m j = jVar.j();
-        if (j.j() != actualTypeArguments.length) {
-            return false;
-        }
-        for (int i = 0; i < j.j(); i++) {
-            if (!Y1(e0Var, j.f(i), actualTypeArguments[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static void Y2(Parcel parcel, int i) {
-        int dataPosition = parcel.dataPosition();
-        parcel.setDataPosition(i - 4);
-        parcel.writeInt(dataPosition - i);
-        parcel.setDataPosition(dataPosition);
-    }
-
     public static void Z(String str, String str2, Object obj) {
         Log.d(N0(str), String.format(str2, obj));
     }
@@ -1778,19 +1745,31 @@ public class AnimatableValueParser {
         return hVar;
     }
 
-    public static int Z1(InputStream inputStream, byte[] bArr, int i, int i2) throws IOException {
-        if (i2 >= 0) {
-            int i3 = 0;
-            while (i3 < i2) {
-                int read = inputStream.read(bArr, i + i3, i2 - i3);
-                if (read == -1) {
-                    break;
-                }
-                i3 += read;
+    public static int Z1(c.i.a.c.a2.i iVar, byte[] bArr, int i, int i2) throws IOException {
+        int i3 = 0;
+        while (i3 < i2) {
+            int i4 = iVar.i(bArr, i + i3, i2 - i3);
+            if (i4 == -1) {
+                break;
             }
-            return i3;
+            i3 += i4;
+        }
+        return i3;
+    }
+
+    public static void Z2(Parcel parcel, int i, int i2) {
+        if (i != i2) {
+            String hexString = Integer.toHexString(i);
+            StringBuilder sb = new StringBuilder(String.valueOf(hexString).length() + 46);
+            sb.append("Expected size ");
+            sb.append(i2);
+            sb.append(" got ");
+            sb.append(i);
+            sb.append(" (0x");
+            sb.append(hexString);
+            sb.append(")");
+            throw new SafeParcelReader$ParseException(sb.toString(), parcel);
         }
-        throw new IndexOutOfBoundsException("len is negative");
     }
 
     public static float a(float f) {
@@ -2247,18 +2226,32 @@ public class AnimatableValueParser {
         return -1;
     }
 
-    public static void a2(FileChannel fileChannel, ByteBuffer byteBuffer, int i, long j) throws IOException {
-        int read;
-        byteBuffer.position(0);
-        byteBuffer.limit(i);
-        while (byteBuffer.remaining() > 0 && (read = fileChannel.read(byteBuffer, j)) != -1) {
-            j += (long) read;
+    public static boolean a2(e0 e0Var, c.g.a.c.j jVar, Type type) {
+        if (!jVar.B(e0Var.a(type)._class)) {
+            return false;
         }
-        if (byteBuffer.remaining() <= 0) {
-            byteBuffer.position(0);
-            return;
+        ParameterizedType H1 = H1(type);
+        if (H1 == null || !Objects.equals(jVar._class, H1.getRawType())) {
+            return true;
         }
-        throw new c.f.m.h("ELF file truncated");
+        Type[] actualTypeArguments = H1.getActualTypeArguments();
+        c.g.a.c.h0.m j = jVar.j();
+        if (j.j() != actualTypeArguments.length) {
+            return false;
+        }
+        for (int i = 0; i < j.j(); i++) {
+            if (!a2(e0Var, j.f(i), actualTypeArguments[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static void a3(Parcel parcel, int i) {
+        int dataPosition = parcel.dataPosition();
+        parcel.setDataPosition(i - 4);
+        parcel.writeInt(dataPosition - i);
+        parcel.setDataPosition(dataPosition);
     }
 
     public static float b(float f) {
@@ -2325,8 +2318,19 @@ public class AnimatableValueParser {
         return (lastPathSegment.endsWith(".jpg") || lastPathSegment.endsWith(".jpeg")) ? 14 : -1;
     }
 
-    public static int b2(InputStream inputStream) throws IOException {
-        return ((((byte) (inputStream.read() & 255)) << 16) & 16711680) | ((((byte) (inputStream.read() & 255)) << 8) & 65280) | (((byte) (inputStream.read() & 255)) & 255);
+    public static int b2(InputStream inputStream, byte[] bArr, int i, int i2) throws IOException {
+        if (i2 >= 0) {
+            int i3 = 0;
+            while (i3 < i2) {
+                int read = inputStream.read(bArr, i + i3, i2 - i3);
+                if (read == -1) {
+                    break;
+                }
+                i3 += read;
+            }
+            return i3;
+        }
+        throw new IndexOutOfBoundsException("len is negative");
     }
 
     public static void c(Spannable spannable, Object obj, int i, int i2, int i3) {
@@ -2445,10 +2449,18 @@ public class AnimatableValueParser {
         throw new IllegalArgumentException(c.d.b.a.a.u("Unknown library: ", str));
     }
 
-    @RecentlyNonNull
-    public static boolean c2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        U2(parcel, i, 4);
-        return parcel.readInt() != 0;
+    public static void c2(FileChannel fileChannel, ByteBuffer byteBuffer, int i, long j) throws IOException {
+        int read;
+        byteBuffer.position(0);
+        byteBuffer.limit(i);
+        while (byteBuffer.remaining() > 0 && (read = fileChannel.read(byteBuffer, j)) != -1) {
+            j += (long) read;
+        }
+        if (byteBuffer.remaining() <= 0) {
+            byteBuffer.position(0);
+            return;
+        }
+        throw new c.f.m.h("ELF file truncated");
     }
 
     public static void d(int i, String str, int i2) {
@@ -2483,19 +2495,11 @@ public class AnimatableValueParser {
 
     public static final boolean d1(Channel channel) {
         m.checkNotNullParameter(channel, "$this$isAnnouncementChannel");
-        return channel.z() == 5;
+        return channel.A() == 5;
     }
 
-    @RecentlyNonNull
-    public static IBinder d2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int k2 = k2(parcel, i);
-        int dataPosition = parcel.dataPosition();
-        if (k2 == 0) {
-            return null;
-        }
-        IBinder readStrongBinder = parcel.readStrongBinder();
-        parcel.setDataPosition(dataPosition + k2);
-        return readStrongBinder;
+    public static int d2(InputStream inputStream) throws IOException {
+        return ((((byte) (inputStream.read() & 255)) << 16) & 16711680) | ((((byte) (inputStream.read() & 255)) << 8) & 65280) | (((byte) (inputStream.read() & 255)) & 255);
     }
 
     public static int e(int i, int i2, int i3) {
@@ -2508,14 +2512,14 @@ public class AnimatableValueParser {
 
     public static final boolean e1(Channel channel) {
         m.checkNotNullParameter(channel, "$this$isArchivedThread");
-        ThreadMetadata x2 = channel.x();
-        return x2 != null && x2.b();
+        ThreadMetadata y2 = channel.y();
+        return y2 != null && y2.b();
     }
 
     @RecentlyNonNull
-    public static int e2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        U2(parcel, i, 4);
-        return parcel.readInt();
+    public static boolean e2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        W2(parcel, i, 4);
+        return parcel.readInt() != 0;
     }
 
     public static byte[] f(String str) {
@@ -2534,13 +2538,19 @@ public class AnimatableValueParser {
 
     public static final boolean f1(Channel channel) {
         m.checkNotNullParameter(channel, "$this$isCategory");
-        return channel.z() == 4;
+        return channel.A() == 4;
     }
 
     @RecentlyNonNull
-    public static long f2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        U2(parcel, i, 8);
-        return parcel.readLong();
+    public static IBinder f2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        int m2 = m2(parcel, i);
+        int dataPosition = parcel.dataPosition();
+        if (m2 == 0) {
+            return null;
+        }
+        IBinder readStrongBinder = parcel.readStrongBinder();
+        parcel.setDataPosition(dataPosition + m2);
+        return readStrongBinder;
     }
 
     public static void g(String str) {
@@ -2558,21 +2568,14 @@ public class AnimatableValueParser {
         }
     }
 
-    public static final boolean g1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isDM");
-        return channel.z() == 1;
+    public static final boolean g1(int i) {
+        return i == 0 || i == 5 || i == 10 || i == 11 || i == 12 || i == 14;
     }
 
-    public static int g2(c.i.a.c.i2.w wVar) {
-        int i = 0;
-        while (wVar.a() != 0) {
-            int s2 = wVar.s();
-            i += s2;
-            if (s2 != 255) {
-                return i;
-            }
-        }
-        return -1;
+    @RecentlyNonNull
+    public static int g2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        W2(parcel, i, 4);
+        return parcel.readInt();
     }
 
     public static List<byte[]> h(byte[] bArr) {
@@ -2589,28 +2592,15 @@ public class AnimatableValueParser {
         }
     }
 
-    public static boolean h1(XmlPullParser xmlPullParser, String str) throws XmlPullParserException {
-        return (xmlPullParser.getEventType() == 3) && xmlPullParser.getName().equals(str);
+    public static final boolean h1(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$isDM");
+        return channel.A() == 1;
     }
 
-    public static int h2(InputStream inputStream, int i, boolean z2) throws IOException {
-        int i2;
-        int i3 = 0;
-        for (int i4 = 0; i4 < i; i4++) {
-            int read = inputStream.read();
-            if (read != -1) {
-                if (z2) {
-                    i2 = (read & 255) << (i4 * 8);
-                } else {
-                    i3 <<= 8;
-                    i2 = read & 255;
-                }
-                i3 |= i2;
-            } else {
-                throw new IOException("no more bytes");
-            }
-        }
-        return i3;
+    @RecentlyNonNull
+    public static long h2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        W2(parcel, i, 8);
+        return parcel.readLong();
     }
 
     public static byte[] i(long j) {
@@ -2621,29 +2611,20 @@ public class AnimatableValueParser {
         return obj == obj2 || (obj != null && obj.equals(obj2));
     }
 
-    public static final boolean i1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isGroup");
-        return channel.z() == 3;
+    public static boolean i1(XmlPullParser xmlPullParser, String str) throws XmlPullParserException {
+        return (xmlPullParser.getEventType() == 3) && xmlPullParser.getName().equals(str);
     }
 
-    public static long i2(c.i.a.c.i2.w wVar, int i, int i2) {
-        wVar.D(i);
-        if (wVar.a() < 5) {
-            return -9223372036854775807L;
-        }
-        int f = wVar.f();
-        if ((8388608 & f) != 0 || ((2096896 & f) >> 8) != i2) {
-            return -9223372036854775807L;
-        }
-        if (((f & 32) != 0) && wVar.s() >= 7 && wVar.a() >= 7) {
-            if ((wVar.s() & 16) == 16) {
-                byte[] bArr = new byte[6];
-                System.arraycopy(wVar.a, wVar.b, bArr, 0, 6);
-                wVar.b += 6;
-                return ((((long) bArr[0]) & 255) << 25) | ((((long) bArr[1]) & 255) << 17) | ((((long) bArr[2]) & 255) << 9) | ((((long) bArr[3]) & 255) << 1) | ((((long) bArr[4]) & 255) >> 7);
+    public static int i2(c.i.a.c.i2.w wVar) {
+        int i = 0;
+        while (wVar.a() != 0) {
+            int s2 = wVar.s();
+            i += s2;
+            if (s2 != 255) {
+                return i;
             }
         }
-        return -9223372036854775807L;
+        return -1;
     }
 
     public static void j(Boolean bool) {
@@ -2661,35 +2642,28 @@ public class AnimatableValueParser {
     }
 
     public static final boolean j1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isGuildTextyChannel");
-        return channel.z() == 0 || channel.z() == 5 || channel.z() == 10 || channel.z() == 11 || channel.z() == 12 || channel.z() == 14;
+        m.checkNotNullParameter(channel, "$this$isGroup");
+        return channel.A() == 3;
     }
 
-    public static o.a j2(c.i.a.c.i2.w wVar) {
-        wVar.E(1);
-        int u = wVar.u();
-        long j = ((long) wVar.b) + ((long) u);
-        int i = u / 18;
-        long[] jArr = new long[i];
-        long[] jArr2 = new long[i];
-        int i2 = 0;
-        while (true) {
-            if (i2 >= i) {
-                break;
+    public static int j2(InputStream inputStream, int i, boolean z2) throws IOException {
+        int i2;
+        int i3 = 0;
+        for (int i4 = 0; i4 < i; i4++) {
+            int read = inputStream.read();
+            if (read != -1) {
+                if (z2) {
+                    i2 = (read & 255) << (i4 * 8);
+                } else {
+                    i3 <<= 8;
+                    i2 = read & 255;
+                }
+                i3 |= i2;
+            } else {
+                throw new IOException("no more bytes");
             }
-            long m = wVar.m();
-            if (m == -1) {
-                jArr = Arrays.copyOf(jArr, i2);
-                jArr2 = Arrays.copyOf(jArr2, i2);
-                break;
-            }
-            jArr[i2] = m;
-            jArr2[i2] = wVar.m();
-            wVar.E(2);
-            i2++;
         }
-        wVar.E((int) (j - ((long) wVar.b)));
-        return new o.a(jArr, jArr2);
+        return i3;
     }
 
     @Pure
@@ -2719,13 +2693,28 @@ public class AnimatableValueParser {
     }
 
     public static final boolean k1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isGuildVocalChannel");
-        return channel.z() == 2 || channel.z() == 13;
+        m.checkNotNullParameter(channel, "$this$isGuildTextyChannel");
+        return g1(channel.A());
     }
 
-    @RecentlyNonNull
-    public static int k2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        return (i & -65536) != -65536 ? (i >> 16) & 65535 : parcel.readInt();
+    public static long k2(c.i.a.c.i2.w wVar, int i, int i2) {
+        wVar.D(i);
+        if (wVar.a() < 5) {
+            return -9223372036854775807L;
+        }
+        int f = wVar.f();
+        if ((8388608 & f) != 0 || ((2096896 & f) >> 8) != i2) {
+            return -9223372036854775807L;
+        }
+        if (((f & 32) != 0) && wVar.s() >= 7 && wVar.a() >= 7) {
+            if ((wVar.s() & 16) == 16) {
+                byte[] bArr = new byte[6];
+                System.arraycopy(wVar.a, wVar.b, bArr, 0, 6);
+                wVar.b += 6;
+                return ((((long) bArr[0]) & 255) << 25) | ((((long) bArr[1]) & 255) << 17) | ((((long) bArr[2]) & 255) << 9) | ((((long) bArr[3]) & 255) << 1) | ((((long) bArr[4]) & 255) >> 7);
+            }
+        }
+        return -9223372036854775807L;
     }
 
     public static void l(boolean z2, Object obj) {
@@ -2753,32 +2742,32 @@ public class AnimatableValueParser {
         ByteBuffer allocate = ByteBuffer.allocate(8);
         allocate.order(ByteOrder.LITTLE_ENDIAN);
         if (R0(fileChannel, allocate, 0) == 1179403647) {
-            a2(fileChannel, allocate, 1, 4);
+            c2(fileChannel, allocate, 1, 4);
             boolean z2 = ((short) (allocate.get() & 255)) == 1;
-            a2(fileChannel, allocate, 1, 5);
+            c2(fileChannel, allocate, 1, 5);
             if (((short) (allocate.get() & 255)) == 2) {
                 allocate.order(ByteOrder.BIG_ENDIAN);
             }
             if (z2) {
                 j = R0(fileChannel, allocate, 28);
             } else {
-                a2(fileChannel, allocate, 8, 32);
+                c2(fileChannel, allocate, 8, 32);
                 j = allocate.getLong();
             }
             if (z2) {
-                a2(fileChannel, allocate, 2, 44);
+                c2(fileChannel, allocate, 2, 44);
                 j2 = (long) (allocate.getShort() & 65535);
             } else {
-                a2(fileChannel, allocate, 2, 56);
+                c2(fileChannel, allocate, 2, 56);
                 j2 = (long) (allocate.getShort() & 65535);
             }
-            a2(fileChannel, allocate, 2, z2 ? 42 : 54);
+            c2(fileChannel, allocate, 2, z2 ? 42 : 54);
             int i2 = allocate.getShort() & 65535;
             if (j2 == 65535) {
                 if (z2) {
                     j14 = R0(fileChannel, allocate, 32);
                 } else {
-                    a2(fileChannel, allocate, 8, 40);
+                    c2(fileChannel, allocate, 8, 40);
                     j14 = allocate.getLong();
                 }
                 j2 = z2 ? R0(fileChannel, allocate, j14 + 28) : R0(fileChannel, allocate, j14 + 44);
@@ -2796,7 +2785,7 @@ public class AnimatableValueParser {
                 } else if (z2) {
                     j3 = R0(fileChannel, allocate, j15 + 4);
                 } else {
-                    a2(fileChannel, allocate, 8, j15 + 8);
+                    c2(fileChannel, allocate, 8, j15 + 8);
                     j3 = allocate.getLong();
                 }
             }
@@ -2810,7 +2799,7 @@ public class AnimatableValueParser {
                     if (z2) {
                         j4 = R0(fileChannel, allocate, j20);
                     } else {
-                        a2(fileChannel, allocate, i, j20);
+                        c2(fileChannel, allocate, i, j20);
                         j4 = allocate.getLong();
                     }
                     if (j4 == 1) {
@@ -2826,7 +2815,7 @@ public class AnimatableValueParser {
                             if (z2) {
                                 j13 = R0(fileChannel, allocate, j18 + 4);
                             } else {
-                                a2(fileChannel, allocate, 8, j18 + 8);
+                                c2(fileChannel, allocate, 8, j18 + 8);
                                 j13 = allocate.getLong();
                             }
                             j19 = j13;
@@ -2850,7 +2839,7 @@ public class AnimatableValueParser {
                                 if (z2) {
                                     j10 = R0(fileChannel, allocate, j + 8);
                                 } else {
-                                    a2(fileChannel, allocate, 8, j + j21);
+                                    c2(fileChannel, allocate, 8, j + j21);
                                     j10 = allocate.getLong();
                                 }
                                 if (z2) {
@@ -2858,14 +2847,14 @@ public class AnimatableValueParser {
                                     j11 = R0(fileChannel, allocate, j + 20);
                                 } else {
                                     j9 = j2;
-                                    a2(fileChannel, allocate, 8, j + 40);
+                                    c2(fileChannel, allocate, 8, j + 40);
                                     j11 = allocate.getLong();
                                 }
                                 if (j10 <= j19 && j19 < j11 + j10) {
                                     if (z2) {
                                         j12 = R0(fileChannel, allocate, j + 4);
                                     } else {
-                                        a2(fileChannel, allocate, 8, j + 8);
+                                        c2(fileChannel, allocate, 8, j + 8);
                                         j12 = allocate.getLong();
                                     }
                                     j6 = j12 + (j19 - j10);
@@ -2888,21 +2877,21 @@ public class AnimatableValueParser {
                                 if (z2) {
                                     j7 = R0(fileChannel, allocate, j24);
                                 } else {
-                                    a2(fileChannel, allocate, 8, j24);
+                                    c2(fileChannel, allocate, 8, j24);
                                     j7 = allocate.getLong();
                                 }
                                 if (j7 == 1) {
                                     if (z2) {
                                         j8 = R0(fileChannel, allocate, j5 + 4);
                                     } else {
-                                        a2(fileChannel, allocate, 8, j5 + 8);
+                                        c2(fileChannel, allocate, 8, j5 + 8);
                                         j8 = allocate.getLong();
                                     }
                                     long j25 = j8 + j6;
                                     StringBuilder sb = new StringBuilder();
                                     while (true) {
                                         long j26 = j25 + 1;
-                                        a2(fileChannel, allocate, 1, j25);
+                                        c2(fileChannel, allocate, 1, j25);
                                         short s2 = (short) (allocate.get() & 255);
                                         if (s2 == 0) {
                                             break;
@@ -2941,26 +2930,36 @@ public class AnimatableValueParser {
         }
     }
 
-    public static boolean l1(int i, int i2, c.f.j.d.e eVar) {
-        return eVar == null ? ((float) q0(i)) >= 2048.0f && q0(i2) >= 2048 : q0(i) >= eVar.a && q0(i2) >= eVar.b;
+    public static final boolean l1(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$isGuildVocalChannel");
+        return channel.A() == 2 || channel.A() == 13;
     }
 
-    public static y l2(c.i.a.c.i2.w wVar, boolean z2, boolean z3) throws ParserException {
-        if (z2) {
-            J2(3, wVar, false);
+    public static o.a l2(c.i.a.c.i2.w wVar) {
+        wVar.E(1);
+        int u = wVar.u();
+        long j = ((long) wVar.b) + ((long) u);
+        int i = u / 18;
+        long[] jArr = new long[i];
+        long[] jArr2 = new long[i];
+        int i2 = 0;
+        while (true) {
+            if (i2 >= i) {
+                break;
+            }
+            long m = wVar.m();
+            if (m == -1) {
+                jArr = Arrays.copyOf(jArr, i2);
+                jArr2 = Arrays.copyOf(jArr2, i2);
+                break;
+            }
+            jArr[i2] = m;
+            jArr2[i2] = wVar.m();
+            wVar.E(2);
+            i2++;
         }
-        String p = wVar.p((int) wVar.j());
-        long j = wVar.j();
-        String[] strArr = new String[((int) j)];
-        int length = p.length() + 11 + 4;
-        for (int i = 0; ((long) i) < j; i++) {
-            strArr[i] = wVar.p((int) wVar.j());
-            length = length + 4 + strArr[i].length();
-        }
-        if (!z3 || (wVar.s() & 1) != 0) {
-            return new y(p, strArr, length + 1);
-        }
-        throw new ParserException("framing bit expected to be set");
+        wVar.E((int) (j - ((long) wVar.b)));
+        return new o.a(jArr, jArr2);
     }
 
     public static void m(@RecentlyNonNull boolean z2) {
@@ -2994,42 +2993,13 @@ public class AnimatableValueParser {
         return sb.toString();
     }
 
-    public static boolean m1(c.f.j.j.e eVar, c.f.j.d.e eVar2) {
-        if (eVar == null) {
-            return false;
-        }
-        eVar.w();
-        int i = eVar.l;
-        if (i == 90 || i == 270) {
-            eVar.w();
-            int i2 = eVar.o;
-            eVar.w();
-            return l1(i2, eVar.n, eVar2);
-        }
-        eVar.w();
-        int i3 = eVar.n;
-        eVar.w();
-        return l1(i3, eVar.o, eVar2);
+    public static boolean m1(int i, int i2, c.f.j.d.e eVar) {
+        return eVar == null ? ((float) q0(i)) >= 2048.0f && q0(i2) >= 2048 : q0(i) >= eVar.a && q0(i2) >= eVar.b;
     }
 
-    public static void m2(File file, File file2) throws FileUtils$RenameException {
-        Objects.requireNonNull(file);
-        file2.delete();
-        if (!file.renameTo(file2)) {
-            Throwable th = null;
-            if (file2.exists()) {
-                th = new FileUtils$FileDeleteException(file2.getAbsolutePath());
-            } else if (!file.getParentFile().exists()) {
-                th = new FileUtils$ParentDirNotFoundException(file.getAbsolutePath());
-            } else if (!file.exists()) {
-                th = new FileNotFoundException(file.getAbsolutePath());
-            }
-            StringBuilder L = c.d.b.a.a.L("Unknown error renaming ");
-            L.append(file.getAbsolutePath());
-            L.append(" to ");
-            L.append(file2.getAbsolutePath());
-            throw new FileUtils$RenameException(L.toString(), th);
-        }
+    @RecentlyNonNull
+    public static int m2(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
+        return (i & -65536) != -65536 ? (i >> 16) & 65535 : parcel.readInt();
     }
 
     @Pure
@@ -3044,24 +3014,40 @@ public class AnimatableValueParser {
         return status.q != null ? new ResolvableApiException(status) : new ApiException(status);
     }
 
-    public static final boolean n1(Context context) {
-        m.checkNotNullParameter(context, "$this$isLtr");
-        return TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == 0;
+    public static boolean n1(c.f.j.j.e eVar, c.f.j.d.e eVar2) {
+        if (eVar == null) {
+            return false;
+        }
+        eVar.w();
+        int i = eVar.l;
+        if (i == 90 || i == 270) {
+            eVar.w();
+            int i2 = eVar.o;
+            eVar.w();
+            return m1(i2, eVar.n, eVar2);
+        }
+        eVar.w();
+        int i3 = eVar.n;
+        eVar.w();
+        return m1(i3, eVar.o, eVar2);
     }
 
-    public static final RenderContext n2(Function1<? super RenderContext, Unit> function1, Object... objArr) {
-        m.checkNotNullParameter(function1, "init");
-        m.checkNotNullParameter(objArr, "orderedArguments");
-        RenderContext renderContext = new RenderContext();
-        function1.invoke(renderContext);
-        if (!(objArr.length == 0)) {
-            if (!(!renderContext.a.isEmpty())) {
-                renderContext.f2012c = k.toList(objArr);
-            } else {
-                throw new IllegalArgumentException("must provide named arguments OR formatArgs, not both.");
-            }
+    public static y n2(c.i.a.c.i2.w wVar, boolean z2, boolean z3) throws ParserException {
+        if (z2) {
+            L2(3, wVar, false);
         }
-        return renderContext;
+        String p = wVar.p((int) wVar.j());
+        long j = wVar.j();
+        String[] strArr = new String[((int) j)];
+        int length = p.length() + 11 + 4;
+        for (int i = 0; ((long) i) < j; i++) {
+            strArr[i] = wVar.p((int) wVar.j());
+            length = length + 4 + strArr[i].length();
+        }
+        if (!z3 || (wVar.s() & 1) != 0) {
+            return new y(p, strArr, length + 1);
+        }
+        throw new ParserException("framing bit expected to be set");
     }
 
     public static void o(@RecentlyNonNull boolean z2, @RecentlyNonNull String str, @RecentlyNonNull Object... objArr) {
@@ -3102,14 +3088,29 @@ public class AnimatableValueParser {
         }
     }
 
-    public static final boolean o1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isManaged");
-        return channel.b() != 0;
+    public static final boolean o1(Context context) {
+        m.checkNotNullParameter(context, "$this$isLtr");
+        return TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == 0;
     }
 
-    public static /* synthetic */ void o2(AppPermissionsRequests appPermissionsRequests, Function0 function0, Function0 function02, int i, Object obj) {
-        int i2 = i & 1;
-        appPermissionsRequests.requestMicrophone(null, function02);
+    public static void o2(File file, File file2) throws FileUtils$RenameException {
+        Objects.requireNonNull(file);
+        file2.delete();
+        if (!file.renameTo(file2)) {
+            Throwable th = null;
+            if (file2.exists()) {
+                th = new FileUtils$FileDeleteException(file2.getAbsolutePath());
+            } else if (!file.getParentFile().exists()) {
+                th = new FileUtils$ParentDirNotFoundException(file.getAbsolutePath());
+            } else if (!file.exists()) {
+                th = new FileNotFoundException(file.getAbsolutePath());
+            }
+            StringBuilder L = c.d.b.a.a.L("Unknown error renaming ");
+            L.append(file.getAbsolutePath());
+            L.append(" to ");
+            L.append(file2.getAbsolutePath());
+            throw new FileUtils$RenameException(L.toString(), th);
+        }
     }
 
     public static void p(@RecentlyNonNull boolean z2, @RecentlyNonNull Object obj) {
@@ -3123,40 +3124,23 @@ public class AnimatableValueParser {
     }
 
     public static final boolean p1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isMultiUserDM");
-        return channel.z() == 3;
+        m.checkNotNullParameter(channel, "$this$isManaged");
+        return channel.b() != 0;
     }
 
-    @Nullable
-    public static c.i.a.c.e2.s.f p2(@Nullable c.i.a.c.e2.s.f fVar, @Nullable String[] strArr, Map<String, c.i.a.c.e2.s.f> map) {
-        int i = 0;
-        if (fVar == null) {
-            if (strArr == null) {
-                return null;
-            }
-            if (strArr.length == 1) {
-                return map.get(strArr[0]);
-            }
-            if (strArr.length > 1) {
-                c.i.a.c.e2.s.f fVar2 = new c.i.a.c.e2.s.f();
-                int length = strArr.length;
-                while (i < length) {
-                    fVar2.a(map.get(strArr[i]));
-                    i++;
-                }
-                return fVar2;
-            }
-        } else if (strArr != null && strArr.length == 1) {
-            fVar.a(map.get(strArr[0]));
-            return fVar;
-        } else if (strArr != null && strArr.length > 1) {
-            int length2 = strArr.length;
-            while (i < length2) {
-                fVar.a(map.get(strArr[i]));
-                i++;
+    public static final RenderContext p2(Function1<? super RenderContext, Unit> function1, Object... objArr) {
+        m.checkNotNullParameter(function1, "init");
+        m.checkNotNullParameter(objArr, "orderedArguments");
+        RenderContext renderContext = new RenderContext();
+        function1.invoke(renderContext);
+        if (!(objArr.length == 0)) {
+            if (!(!renderContext.a.isEmpty())) {
+                renderContext.f2017c = k.toList(objArr);
+            } else {
+                throw new IllegalArgumentException("must provide named arguments OR formatArgs, not both.");
             }
         }
-        return fVar;
+        return renderContext;
     }
 
     public static void q(int i, int i2, int i3, int i4, int i5) {
@@ -3175,26 +3159,14 @@ public class AnimatableValueParser {
         return (int) (((float) i) * 1.3333334f);
     }
 
-    public static final boolean q1(VoiceState voiceState) {
-        m.checkNotNullParameter(voiceState, "$this$isMutedByAnySource");
-        return voiceState.h() || voiceState.e() || voiceState.l();
+    public static final boolean q1(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$isMultiUserDM");
+        return channel.A() == 3;
     }
 
-    public static float q2(int i, float f, int i2, int i3) {
-        float f2;
-        if (f == -3.4028235E38f) {
-            return -3.4028235E38f;
-        }
-        if (i == 0) {
-            f2 = (float) i3;
-        } else if (i == 1) {
-            f2 = (float) i2;
-        } else if (i != 2) {
-            return -3.4028235E38f;
-        } else {
-            return f;
-        }
-        return f * f2;
+    public static /* synthetic */ void q2(AppPermissionsRequests appPermissionsRequests, Function0 function0, Function0 function02, int i, Object obj) {
+        int i2 = i & 1;
+        appPermissionsRequests.requestMicrophone(null, function02);
     }
 
     public static void r() {
@@ -3233,14 +3205,107 @@ public class AnimatableValueParser {
         return null;
     }
 
-    public static final boolean r1(Channel channel) {
+    public static final boolean r1(VoiceState voiceState) {
+        m.checkNotNullParameter(voiceState, "$this$isMutedByAnySource");
+        return voiceState.h() || voiceState.e() || voiceState.l();
+    }
+
+    @Nullable
+    public static c.i.a.c.e2.s.f r2(@Nullable c.i.a.c.e2.s.f fVar, @Nullable String[] strArr, Map<String, c.i.a.c.e2.s.f> map) {
+        int i = 0;
+        if (fVar == null) {
+            if (strArr == null) {
+                return null;
+            }
+            if (strArr.length == 1) {
+                return map.get(strArr[0]);
+            }
+            if (strArr.length > 1) {
+                c.i.a.c.e2.s.f fVar2 = new c.i.a.c.e2.s.f();
+                int length = strArr.length;
+                while (i < length) {
+                    fVar2.a(map.get(strArr[i]));
+                    i++;
+                }
+                return fVar2;
+            }
+        } else if (strArr != null && strArr.length == 1) {
+            fVar.a(map.get(strArr[0]));
+            return fVar;
+        } else if (strArr != null && strArr.length > 1) {
+            int length2 = strArr.length;
+            while (i < length2) {
+                fVar.a(map.get(strArr[i]));
+                i++;
+            }
+        }
+        return fVar;
+    }
+
+    public static void s(@RecentlyNonNull Handler handler) {
+        Looper myLooper = Looper.myLooper();
+        if (myLooper != handler.getLooper()) {
+            String name = myLooper != null ? myLooper.getThread().getName() : "null current looper";
+            String name2 = handler.getLooper().getThread().getName();
+            StringBuilder K = c.d.b.a.a.K(c.d.b.a.a.m(name, c.d.b.a.a.m(name2, 36)), "Must be called on ", name2, " thread, but got ", name);
+            K.append(".");
+            throw new IllegalStateException(K.toString());
+        }
+    }
+
+    public static Object s0(Object obj) {
+        return new a(obj.getClass(), Array.getLength(obj), obj);
+    }
+
+    public static final boolean s1(Channel channel) {
         m.checkNotNullParameter(channel, "$this$isPrivate");
-        return channel.z() == 1 || channel.z() == 3;
+        return channel.A() == 1 || channel.A() == 3;
+    }
+
+    public static float s2(int i, float f, int i2, int i3) {
+        float f2;
+        if (f == -3.4028235E38f) {
+            return -3.4028235E38f;
+        }
+        if (i == 0) {
+            f2 = (float) i3;
+        } else if (i == 1) {
+            f2 = (float) i2;
+        } else if (i != 2) {
+            return -3.4028235E38f;
+        } else {
+            return f;
+        }
+        return f * f2;
+    }
+
+    @Pure
+    public static int t(int i, int i2, int i3) {
+        if (i >= i2 && i < i3) {
+            return i;
+        }
+        throw new IndexOutOfBoundsException();
+    }
+
+    @Nullable
+    public static String t0(XmlPullParser xmlPullParser, String str) {
+        int attributeCount = xmlPullParser.getAttributeCount();
+        for (int i = 0; i < attributeCount; i++) {
+            if (xmlPullParser.getAttributeName(i).equals(str)) {
+                return xmlPullParser.getAttributeValue(i);
+            }
+        }
+        return null;
+    }
+
+    public static final boolean t1(StageInstance stageInstance) {
+        m.checkNotNullParameter(stageInstance, "$this$isPublic");
+        return stageInstance.e() == StageInstancePrivacyLevel.PUBLIC;
     }
 
     /* JADX WARN: Multi-variable type inference failed */
     /* JADX WARNING: Unknown variable types count: 1 */
-    public static <TInput, TResult, TException extends Throwable> TResult r2(int i, TInput tinput, c.i.a.b.i.b<TInput, TResult, TException> bVar, c.i.a.b.j.s.a<TInput, TResult> aVar) throws Throwable {
+    public static <TInput, TResult, TException extends Throwable> TResult t2(int i, TInput tinput, c.i.a.b.i.b<TInput, TResult, TException> bVar, c.i.a.b.j.s.a<TInput, TResult> aVar) throws Throwable {
         TResult tresult;
         if (i < 1) {
             return (TResult) bVar.a(tinput);
@@ -3264,70 +3329,6 @@ public class AnimatableValueParser {
         return tresult;
     }
 
-    public static void s(@RecentlyNonNull Handler handler) {
-        Looper myLooper = Looper.myLooper();
-        if (myLooper != handler.getLooper()) {
-            String name = myLooper != null ? myLooper.getThread().getName() : "null current looper";
-            String name2 = handler.getLooper().getThread().getName();
-            StringBuilder K = c.d.b.a.a.K(c.d.b.a.a.m(name, c.d.b.a.a.m(name2, 36)), "Must be called on ", name2, " thread, but got ", name);
-            K.append(".");
-            throw new IllegalStateException(K.toString());
-        }
-    }
-
-    public static Object s0(Object obj) {
-        return new a(obj.getClass(), Array.getLength(obj), obj);
-    }
-
-    public static final boolean s1(StageInstance stageInstance) {
-        m.checkNotNullParameter(stageInstance, "$this$isPublic");
-        return stageInstance.e() == StageInstancePrivacyLevel.PUBLIC;
-    }
-
-    public static String s2(CacheKey cacheKey) throws UnsupportedEncodingException {
-        byte[] bytes = cacheKey.b().getBytes("UTF-8");
-        try {
-            MessageDigest instance = MessageDigest.getInstance("SHA-1");
-            instance.update(bytes, 0, bytes.length);
-            return Base64.encodeToString(instance.digest(), 11);
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Pure
-    public static int t(int i, int i2, int i3) {
-        if (i >= i2 && i < i3) {
-            return i;
-        }
-        throw new IndexOutOfBoundsException();
-    }
-
-    @Nullable
-    public static String t0(XmlPullParser xmlPullParser, String str) {
-        int attributeCount = xmlPullParser.getAttributeCount();
-        for (int i = 0; i < attributeCount; i++) {
-            if (xmlPullParser.getAttributeName(i).equals(str)) {
-                return xmlPullParser.getAttributeValue(i);
-            }
-        }
-        return null;
-    }
-
-    public static final boolean t1(VoiceState voiceState) {
-        m.checkNotNullParameter(voiceState, "$this$isRemoveSignal");
-        return voiceState.a() == null;
-    }
-
-    public static void t2(Drawable drawable, Drawable.Callback callback, c.f.g.e.e0 e0Var) {
-        if (drawable != null) {
-            drawable.setCallback(callback);
-            if (drawable instanceof d0) {
-                ((d0) drawable).b(e0Var);
-            }
-        }
-    }
-
     public static void u(@RecentlyNonNull String str) {
         if (!(Looper.getMainLooper() == Looper.myLooper())) {
             throw new IllegalStateException(str);
@@ -3344,14 +3345,19 @@ public class AnimatableValueParser {
         return 90;
     }
 
-    public static final boolean u1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isStageVoiceChannel");
-        return channel.z() == 13;
+    public static final boolean u1(VoiceState voiceState) {
+        m.checkNotNullParameter(voiceState, "$this$isRemoveSignal");
+        return voiceState.a() == null;
     }
 
-    public static void u2(MediaFormat mediaFormat, List<byte[]> list) {
-        for (int i = 0; i < list.size(); i++) {
-            mediaFormat.setByteBuffer(c.d.b.a.a.l("csd-", i), ByteBuffer.wrap(list.get(i)));
+    public static String u2(CacheKey cacheKey) throws UnsupportedEncodingException {
+        byte[] bytes = cacheKey.b().getBytes("UTF-8");
+        try {
+            MessageDigest instance = MessageDigest.getInstance("SHA-1");
+            instance.update(bytes, 0, bytes.length);
+            return Base64.encodeToString(instance.digest(), 11);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -3364,40 +3370,26 @@ public class AnimatableValueParser {
     }
 
     public static final User v0(Channel channel) {
-        List<com.discord.api.user.User> v;
-        List<com.discord.api.user.User> v2;
+        List<com.discord.api.user.User> w;
+        List<com.discord.api.user.User> w2;
         com.discord.api.user.User user;
         m.checkNotNullParameter(channel, "$this$getDMRecipient");
-        if (!g1(channel) || (v = channel.v()) == null || v.size() != 1 || (v2 = channel.v()) == null || (user = (com.discord.api.user.User) d0.t.u.first((List<? extends Object>) v2)) == null) {
+        if (!h1(channel) || (w = channel.w()) == null || w.size() != 1 || (w2 = channel.w()) == null || (user = (com.discord.api.user.User) d0.t.u.first((List<? extends Object>) w2)) == null) {
             return null;
         }
         return new CoreUser(user);
     }
 
-    public static boolean v1(XmlPullParser xmlPullParser, String str) throws XmlPullParserException {
-        return (xmlPullParser.getEventType() == 2) && xmlPullParser.getName().equals(str);
+    public static final boolean v1(Channel channel) {
+        m.checkNotNullParameter(channel, "$this$isStageVoiceChannel");
+        return channel.A() == 13;
     }
 
-    public static void v2(Drawable drawable, c.f.g.e.e eVar) {
-        if (drawable != null && eVar != null) {
-            int i = eVar.a;
-            if (i != -1) {
-                drawable.setAlpha(i);
-            }
-            if (eVar.b) {
-                drawable.setColorFilter(eVar.f381c);
-            }
-            int i2 = eVar.d;
-            boolean z2 = false;
-            if (i2 != -1) {
-                drawable.setDither(i2 != 0);
-            }
-            int i3 = eVar.e;
-            if (i3 != -1) {
-                if (i3 != 0) {
-                    z2 = true;
-                }
-                drawable.setFilterBitmap(z2);
+    public static void v2(Drawable drawable, Drawable.Callback callback, c.f.g.e.e0 e0Var) {
+        if (drawable != null) {
+            drawable.setCallback(callback);
+            if (drawable instanceof d0) {
+                ((d0) drawable).b(e0Var);
             }
         }
     }
@@ -3457,24 +3449,14 @@ public class AnimatableValueParser {
         }
     }
 
-    public static final boolean w1(Channel channel) {
-        com.discord.api.user.User user;
-        m.checkNotNullParameter(channel, "$this$isSystemDM");
-        if (channel.z() == 1) {
-            List<com.discord.api.user.User> v = channel.v();
-            if (m.areEqual((v == null || (user = (com.discord.api.user.User) d0.t.u.firstOrNull(v)) == null) ? null : user.p(), Boolean.TRUE)) {
-                return true;
-            }
-        }
-        return false;
+    public static boolean w1(XmlPullParser xmlPullParser, String str) throws XmlPullParserException {
+        return (xmlPullParser.getEventType() == 2) && xmlPullParser.getName().equals(str);
     }
 
-    public static <TResult> void w2(Status status, @Nullable TResult tresult, TaskCompletionSource<TResult> taskCompletionSource) {
-        if (status.v0()) {
-            taskCompletionSource.a.t(tresult);
-            return;
+    public static void w2(MediaFormat mediaFormat, List<byte[]> list) {
+        for (int i = 0; i < list.size(); i++) {
+            mediaFormat.setByteBuffer(c.d.b.a.a.l("csd-", i), ByteBuffer.wrap(list.get(i)));
         }
-        taskCompletionSource.a.s(new ApiException(status));
     }
 
     public static void x(@RecentlyNonNull String str) {
@@ -3488,24 +3470,42 @@ public class AnimatableValueParser {
         if (f1(channel)) {
             return 2131887203;
         }
-        return r1(channel) ? null : 2131887271;
+        return s1(channel) ? null : 2131887271;
     }
 
     public static final boolean x1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isTextChannel");
-        return r1(channel) || j1(channel);
+        com.discord.api.user.User user;
+        m.checkNotNullParameter(channel, "$this$isSystemDM");
+        if (channel.A() == 1) {
+            List<com.discord.api.user.User> w = channel.w();
+            if (m.areEqual((w == null || (user = (com.discord.api.user.User) d0.t.u.firstOrNull(w)) == null) ? null : user.p(), Boolean.TRUE)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    public static void x2(SQLiteDatabase sQLiteDatabase, int i, String str, int i2) throws DatabaseIOException {
-        try {
-            sQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS ExoPlayerVersions (feature INTEGER NOT NULL,instance_uid TEXT NOT NULL,version INTEGER NOT NULL,PRIMARY KEY (feature, instance_uid))");
-            ContentValues contentValues = new ContentValues();
-            contentValues.put("feature", Integer.valueOf(i));
-            contentValues.put("instance_uid", str);
-            contentValues.put("version", Integer.valueOf(i2));
-            sQLiteDatabase.replaceOrThrow("ExoPlayerVersions", null, contentValues);
-        } catch (SQLException e) {
-            throw new DatabaseIOException(e);
+    public static void x2(Drawable drawable, c.f.g.e.e eVar) {
+        if (drawable != null && eVar != null) {
+            int i = eVar.a;
+            if (i != -1) {
+                drawable.setAlpha(i);
+            }
+            if (eVar.b) {
+                drawable.setColorFilter(eVar.f381c);
+            }
+            int i2 = eVar.d;
+            boolean z2 = false;
+            if (i2 != -1) {
+                drawable.setDither(i2 != 0);
+            }
+            int i3 = eVar.e;
+            if (i3 != -1) {
+                if (i3 != 0) {
+                    z2 = true;
+                }
+                drawable.setFilterBitmap(z2);
+            }
         }
     }
 
@@ -3519,18 +3519,18 @@ public class AnimatableValueParser {
     public static final String y0(Channel channel) {
         String str;
         m.checkNotNullParameter(channel, "$this$getDisplayName");
-        if (r1(channel)) {
-            String l = channel.l();
-            if (l == null || l.length() == 0) {
-                List<com.discord.api.user.User> v = channel.v();
-                str = v != null ? d0.t.u.joinToString$default(v, null, null, null, 0, null, ChannelUtils$getDisplayName$1.INSTANCE, 31, null) : null;
+        if (s1(channel)) {
+            String m = channel.m();
+            if (m == null || m.length() == 0) {
+                List<com.discord.api.user.User> w = channel.w();
+                str = w != null ? d0.t.u.joinToString$default(w, null, null, null, 0, null, ChannelUtils$getDisplayName$1.INSTANCE, 31, null) : null;
                 if (str == null) {
                     return "";
                 }
                 return str;
             }
         }
-        str = channel.l();
+        str = channel.m();
         if (str == null) {
             return "";
         }
@@ -3538,15 +3538,16 @@ public class AnimatableValueParser {
     }
 
     public static final boolean y1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isThread");
-        return channel.z() == 10 || channel.z() == 11 || channel.z() == 12;
+        m.checkNotNullParameter(channel, "$this$isTextChannel");
+        return s1(channel) || k1(channel);
     }
 
-    public static boolean y2(Object obj, Collection<String> collection, Collection<String> collection2) {
-        if (collection == null && collection2 == null) {
-            return false;
+    public static <TResult> void y2(Status status, @Nullable TResult tresult, TaskCompletionSource<TResult> taskCompletionSource) {
+        if (status.v0()) {
+            taskCompletionSource.a.t(tresult);
+            return;
         }
-        return collection2 == null ? collection.contains(obj) : collection == null ? !collection2.contains(obj) : !collection2.contains(obj) || collection.contains(obj);
+        taskCompletionSource.a.s(new ApiException(status));
     }
 
     @NonNull
@@ -3564,12 +3565,12 @@ public class AnimatableValueParser {
         String y0 = y0(channel);
         m.checkNotNullParameter(channel, "$this$isGuildTextChannel");
         boolean z3 = true;
-        if ((channel.z() == 0) || d1(channel)) {
+        if ((channel.A() == 0) || d1(channel)) {
             if (y0.length() != 0) {
                 z3 = false;
             }
             if (z3) {
-                String string = context.getString(2131890470);
+                String string = context.getString(2131890536);
                 m.checkNotNullExpressionValue(string, "context.getString(R.string.invalid_text_channel)");
                 return string;
             } else if (z2) {
@@ -3579,30 +3580,30 @@ public class AnimatableValueParser {
                 sb.append(y0);
                 return sb.toString();
             }
-        } else if (k1(channel)) {
+        } else if (l1(channel)) {
             if (y0.length() != 0) {
                 z3 = false;
             }
             if (z3) {
-                String string2 = context.getString(2131890471);
+                String string2 = context.getString(2131890537);
                 m.checkNotNullExpressionValue(string2, "context.getString(R.string.invalid_voice_channel)");
                 return string2;
             }
-        } else if (i1(channel)) {
+        } else if (j1(channel)) {
             if (y0.length() != 0) {
                 z3 = false;
             }
             if (z3) {
-                String string3 = context.getString(2131894069);
+                String string3 = context.getString(2131894170);
                 m.checkNotNullExpressionValue(string3, "context.getString(R.string.unnamed)");
                 return string3;
             }
-        } else if (g1(channel)) {
+        } else if (h1(channel)) {
             if (y0.length() != 0) {
                 z3 = false;
             }
             if (z3) {
-                String string4 = context.getString(2131888113);
+                String string4 = context.getString(2131888112);
                 m.checkNotNullExpressionValue(string4, "context.getString(R.string.direct_message)");
                 return string4;
             } else if (z2) {
@@ -3617,12 +3618,20 @@ public class AnimatableValueParser {
     }
 
     public static final boolean z1(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$isVoiceChannel");
-        return channel.z() == 2;
+        m.checkNotNullParameter(channel, "$this$isThread");
+        return channel.A() == 10 || channel.A() == 11 || channel.A() == 12;
     }
 
-    public static final boolean z2(Channel channel) {
-        m.checkNotNullParameter(channel, "$this$shouldPlayJoinLeaveSounds");
-        return z1(channel) || r1(channel);
+    public static void z2(SQLiteDatabase sQLiteDatabase, int i, String str, int i2) throws DatabaseIOException {
+        try {
+            sQLiteDatabase.execSQL("CREATE TABLE IF NOT EXISTS ExoPlayerVersions (feature INTEGER NOT NULL,instance_uid TEXT NOT NULL,version INTEGER NOT NULL,PRIMARY KEY (feature, instance_uid))");
+            ContentValues contentValues = new ContentValues();
+            contentValues.put("feature", Integer.valueOf(i));
+            contentValues.put("instance_uid", str);
+            contentValues.put("version", Integer.valueOf(i2));
+            sQLiteDatabase.replaceOrThrow("ExoPlayerVersions", null, contentValues);
+        } catch (SQLException e) {
+            throw new DatabaseIOException(e);
+        }
     }
 }
diff --git a/app/src/main/java/com/android/billingclient/api/BillingFlowParams.java b/app/src/main/java/com/android/billingclient/api/BillingFlowParams.java
index f018ad555f..91a8a5b35f 100644
--- a/app/src/main/java/com/android/billingclient/api/BillingFlowParams.java
+++ b/app/src/main/java/com/android/billingclient/api/BillingFlowParams.java
@@ -9,7 +9,7 @@ public class BillingFlowParams {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public String f1547c;
+    public String f1542c;
     public String d;
     public String e;
     public int f = 0;
@@ -22,7 +22,7 @@ public class BillingFlowParams {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f1548c;
+        public String f1543c;
         public int d = 0;
         public ArrayList<SkuDetails> e;
 
@@ -68,8 +68,8 @@ public class BillingFlowParams {
             billingFlowParams.a = true ^ this.e.get(0).f().isEmpty();
             billingFlowParams.b = this.a;
             billingFlowParams.e = null;
-            billingFlowParams.f1547c = this.b;
-            billingFlowParams.d = this.f1548c;
+            billingFlowParams.f1542c = this.b;
+            billingFlowParams.d = this.f1543c;
             billingFlowParams.f = this.d;
             billingFlowParams.g = this.e;
             billingFlowParams.h = false;
diff --git a/app/src/main/java/com/android/billingclient/api/Purchase.java b/app/src/main/java/com/android/billingclient/api/Purchase.java
index 6546ff2210..89d9cb1b07 100644
--- a/app/src/main/java/com/android/billingclient/api/Purchase.java
+++ b/app/src/main/java/com/android/billingclient/api/Purchase.java
@@ -12,7 +12,7 @@ public class Purchase {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final JSONObject f1549c;
+    public final JSONObject f1544c;
 
     /* compiled from: com.android.billingclient:billing@@3.0.3 */
     public static class a {
@@ -27,22 +27,22 @@ public class Purchase {
     public Purchase(@NonNull String str, @NonNull String str2) throws JSONException {
         this.a = str;
         this.b = str2;
-        this.f1549c = new JSONObject(str);
+        this.f1544c = new JSONObject(str);
     }
 
     @NonNull
     public String a() {
-        JSONObject jSONObject = this.f1549c;
+        JSONObject jSONObject = this.f1544c;
         return jSONObject.optString("token", jSONObject.optString("purchaseToken"));
     }
 
     @NonNull
     public String b() {
-        return this.f1549c.optString("productId");
+        return this.f1544c.optString("productId");
     }
 
     public boolean c() {
-        return this.f1549c.optBoolean("acknowledged", true);
+        return this.f1544c.optBoolean("acknowledged", true);
     }
 
     public boolean equals(@Nullable Object obj) {
diff --git a/app/src/main/java/com/android/installreferrer/api/InstallReferrerClientImpl.java b/app/src/main/java/com/android/installreferrer/api/InstallReferrerClientImpl.java
index acbdb0da5b..aea861d9f9 100644
--- a/app/src/main/java/com/android/installreferrer/api/InstallReferrerClientImpl.java
+++ b/app/src/main/java/com/android/installreferrer/api/InstallReferrerClientImpl.java
@@ -21,7 +21,7 @@ public class InstallReferrerClientImpl extends InstallReferrerClient {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public c.i.a.d.a.a f1550c;
+    public c.i.a.d.a.a f1545c;
     public ServiceConnection d;
 
     @Retention(RetentionPolicy.SOURCE)
@@ -55,7 +55,7 @@ public class InstallReferrerClientImpl extends InstallReferrerClient {
                 IInterface queryLocalInterface = iBinder.queryLocalInterface("com.google.android.finsky.externalreferrer.IGetInstallReferrerService");
                 aVar = queryLocalInterface instanceof c.i.a.d.a.a ? (c.i.a.d.a.a) queryLocalInterface : new a.AbstractBinderC0095a.C0096a(iBinder);
             }
-            installReferrerClientImpl.f1550c = aVar;
+            installReferrerClientImpl.f1545c = aVar;
             InstallReferrerClientImpl.this.a = 2;
             this.i.onInstallReferrerSetupFinished(0);
         }
@@ -64,7 +64,7 @@ public class InstallReferrerClientImpl extends InstallReferrerClient {
         public void onServiceDisconnected(ComponentName componentName) {
             InstallReferrerCommons.logWarn("InstallReferrerClient", "Install Referrer service disconnected.");
             InstallReferrerClientImpl installReferrerClientImpl = InstallReferrerClientImpl.this;
-            installReferrerClientImpl.f1550c = null;
+            installReferrerClientImpl.f1545c = null;
             installReferrerClientImpl.a = 0;
             this.i.onInstallReferrerServiceDisconnected();
         }
@@ -82,7 +82,7 @@ public class InstallReferrerClientImpl extends InstallReferrerClient {
             this.b.unbindService(this.d);
             this.d = null;
         }
-        this.f1550c = null;
+        this.f1545c = null;
     }
 
     @Override // com.android.installreferrer.api.InstallReferrerClient
@@ -91,7 +91,7 @@ public class InstallReferrerClientImpl extends InstallReferrerClient {
             Bundle bundle = new Bundle();
             bundle.putString("package_name", this.b.getPackageName());
             try {
-                return new ReferrerDetails(this.f1550c.B(bundle));
+                return new ReferrerDetails(this.f1545c.C(bundle));
             } catch (RemoteException e) {
                 InstallReferrerCommons.logWarn("InstallReferrerClient", "RemoteException getting install referrer information");
                 this.a = 0;
@@ -104,7 +104,7 @@ public class InstallReferrerClientImpl extends InstallReferrerClient {
 
     @Override // com.android.installreferrer.api.InstallReferrerClient
     public boolean isReady() {
-        return (this.a != 2 || this.f1550c == null || this.d == null) ? false : true;
+        return (this.a != 2 || this.f1545c == null || this.d == null) ? false : true;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:29:0x0085  */
diff --git a/app/src/main/java/com/discord/api/activity/ActivityEmoji.java b/app/src/main/java/com/discord/api/activity/ActivityEmoji.java
index b8e5bdda46..a5bc6b8ee5 100644
--- a/app/src/main/java/com/discord/api/activity/ActivityEmoji.java
+++ b/app/src/main/java/com/discord/api/activity/ActivityEmoji.java
@@ -7,11 +7,11 @@ public final class ActivityEmoji {
     private final boolean animated;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1551id;
+    private final String f1546id;
     private final String name;
 
     public ActivityEmoji(String str, String str2, boolean z2) {
-        this.f1551id = str;
+        this.f1546id = str;
         this.name = str2;
         this.animated = z2;
     }
@@ -21,7 +21,7 @@ public final class ActivityEmoji {
     }
 
     public final String b() {
-        return this.f1551id;
+        return this.f1546id;
     }
 
     public final String c() {
@@ -36,11 +36,11 @@ public final class ActivityEmoji {
             return false;
         }
         ActivityEmoji activityEmoji = (ActivityEmoji) obj;
-        return m.areEqual(this.f1551id, activityEmoji.f1551id) && m.areEqual(this.name, activityEmoji.name) && this.animated == activityEmoji.animated;
+        return m.areEqual(this.f1546id, activityEmoji.f1546id) && m.areEqual(this.name, activityEmoji.name) && this.animated == activityEmoji.animated;
     }
 
     public int hashCode() {
-        String str = this.f1551id;
+        String str = this.f1546id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -60,7 +60,7 @@ public final class ActivityEmoji {
 
     public String toString() {
         StringBuilder L = a.L("ActivityEmoji(id=");
-        L.append(this.f1551id);
+        L.append(this.f1546id);
         L.append(", name=");
         L.append(this.name);
         L.append(", animated=");
diff --git a/app/src/main/java/com/discord/api/activity/ActivityParty.java b/app/src/main/java/com/discord/api/activity/ActivityParty.java
index 3b576e7b74..8e182cf8db 100644
--- a/app/src/main/java/com/discord/api/activity/ActivityParty.java
+++ b/app/src/main/java/com/discord/api/activity/ActivityParty.java
@@ -7,16 +7,16 @@ import java.util.List;
 public final class ActivityParty {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1552id;
+    private final String f1547id;
     private final List<Integer> size;
 
     public ActivityParty(String str, List<Integer> list) {
-        this.f1552id = str;
+        this.f1547id = str;
         this.size = list;
     }
 
     public final String a() {
-        return this.f1552id;
+        return this.f1547id;
     }
 
     public final List<Integer> b() {
@@ -31,11 +31,11 @@ public final class ActivityParty {
             return false;
         }
         ActivityParty activityParty = (ActivityParty) obj;
-        return m.areEqual(this.f1552id, activityParty.f1552id) && m.areEqual(this.size, activityParty.size);
+        return m.areEqual(this.f1547id, activityParty.f1547id) && m.areEqual(this.size, activityParty.size);
     }
 
     public int hashCode() {
-        String str = this.f1552id;
+        String str = this.f1547id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         List<Integer> list = this.size;
@@ -47,7 +47,7 @@ public final class ActivityParty {
 
     public String toString() {
         StringBuilder L = a.L("ActivityParty(id=");
-        L.append(this.f1552id);
+        L.append(this.f1547id);
         L.append(", size=");
         return a.E(L, this.size, ")");
     }
diff --git a/app/src/main/java/com/discord/api/application/Application.java b/app/src/main/java/com/discord/api/application/Application.java
index f3e81dd650..2b988bfe16 100644
--- a/app/src/main/java/com/discord/api/application/Application.java
+++ b/app/src/main/java/com/discord/api/application/Application.java
@@ -14,7 +14,7 @@ public final class Application {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1553id;
+    private final long f1548id;
     private final String name;
     private final String splash;
     private final List<ThirdPartySku> thirdPartySkus;
@@ -23,7 +23,7 @@ public final class Application {
         String removeSuffix;
         String u;
         String str = this.deeplinkUri;
-        return (str == null || (removeSuffix = w.removeSuffix(str, "/")) == null || (u = a.u(removeSuffix, "/_discord")) == null) ? a.A(a.L("dscd"), this.f1553id, "://connect/_discord") : u;
+        return (str == null || (removeSuffix = w.removeSuffix(str, "/")) == null || (u = a.u(removeSuffix, "/_discord")) == null) ? a.A(a.L("dscd"), this.f1548id, "://connect/_discord") : u;
     }
 
     public final String b() {
@@ -67,11 +67,11 @@ public final class Application {
             return false;
         }
         Application application = (Application) obj;
-        return this.f1553id == application.f1553id && m.areEqual(this.name, application.name) && m.areEqual(this.description, application.description) && m.areEqual(this.splash, application.splash) && m.areEqual(this.coverImage, application.coverImage) && m.areEqual(this.icon, application.icon) && m.areEqual(this.thirdPartySkus, application.thirdPartySkus) && m.areEqual(this.deeplinkUri, application.deeplinkUri);
+        return this.f1548id == application.f1548id && m.areEqual(this.name, application.name) && m.areEqual(this.description, application.description) && m.areEqual(this.splash, application.splash) && m.areEqual(this.coverImage, application.coverImage) && m.areEqual(this.icon, application.icon) && m.areEqual(this.thirdPartySkus, application.thirdPartySkus) && m.areEqual(this.deeplinkUri, application.deeplinkUri);
     }
 
     public final long f() {
-        return this.f1553id;
+        return this.f1548id;
     }
 
     public final String g() {
@@ -83,7 +83,7 @@ public final class Application {
     }
 
     public int hashCode() {
-        long j = this.f1553id;
+        long j = this.f1548id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.name;
         int i2 = 0;
@@ -107,7 +107,7 @@ public final class Application {
 
     public String toString() {
         StringBuilder L = a.L("Application(id=");
-        L.append(this.f1553id);
+        L.append(this.f1548id);
         L.append(", name=");
         L.append(this.name);
         L.append(", description=");
diff --git a/app/src/main/java/com/discord/api/application/ThirdPartySku.java b/app/src/main/java/com/discord/api/application/ThirdPartySku.java
index 27bfd22849..55f721a3e5 100644
--- a/app/src/main/java/com/discord/api/application/ThirdPartySku.java
+++ b/app/src/main/java/com/discord/api/application/ThirdPartySku.java
@@ -7,7 +7,7 @@ public final class ThirdPartySku {
     private final String distributor;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1554id;
+    private final String f1549id;
     private final String sku;
 
     public final String a() {
@@ -26,11 +26,11 @@ public final class ThirdPartySku {
             return false;
         }
         ThirdPartySku thirdPartySku = (ThirdPartySku) obj;
-        return m.areEqual(this.f1554id, thirdPartySku.f1554id) && m.areEqual(this.sku, thirdPartySku.sku) && m.areEqual(this.distributor, thirdPartySku.distributor);
+        return m.areEqual(this.f1549id, thirdPartySku.f1549id) && m.areEqual(this.sku, thirdPartySku.sku) && m.areEqual(this.distributor, thirdPartySku.distributor);
     }
 
     public int hashCode() {
-        String str = this.f1554id;
+        String str = this.f1549id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.sku;
@@ -44,7 +44,7 @@ public final class ThirdPartySku {
 
     public String toString() {
         StringBuilder L = a.L("ThirdPartySku(id=");
-        L.append(this.f1554id);
+        L.append(this.f1549id);
         L.append(", sku=");
         L.append(this.sku);
         L.append(", distributor=");
diff --git a/app/src/main/java/com/discord/api/botuikit/ButtonStyleTypeAdapter.java b/app/src/main/java/com/discord/api/botuikit/ButtonStyleTypeAdapter.java
index aae1e1137d..be433aa88e 100644
--- a/app/src/main/java/com/discord/api/botuikit/ButtonStyleTypeAdapter.java
+++ b/app/src/main/java/com/discord/api/botuikit/ButtonStyleTypeAdapter.java
@@ -29,8 +29,8 @@ public final class ButtonStyleTypeAdapter extends TypeAdapter<ButtonStyle> {
     @Override // com.google.gson.TypeAdapter
     public ButtonStyle read(JsonReader jsonReader) {
         m.checkNotNullParameter(jsonReader, "in");
-        Integer L1 = AnimatableValueParser.L1(jsonReader);
-        return (L1 != null && L1.intValue() == 1) ? ButtonStyle.PRIMARY : (L1 != null && L1.intValue() == 2) ? ButtonStyle.SECONDARY : (L1 != null && L1.intValue() == 3) ? ButtonStyle.SUCCESS : (L1 != null && L1.intValue() == 4) ? ButtonStyle.DANGER : (L1 != null && L1.intValue() == 5) ? ButtonStyle.LINK : ButtonStyle.UNKNOWN;
+        Integer N1 = AnimatableValueParser.N1(jsonReader);
+        return (N1 != null && N1.intValue() == 1) ? ButtonStyle.PRIMARY : (N1 != null && N1.intValue() == 2) ? ButtonStyle.SECONDARY : (N1 != null && N1.intValue() == 3) ? ButtonStyle.SUCCESS : (N1 != null && N1.intValue() == 4) ? ButtonStyle.DANGER : (N1 != null && N1.intValue() == 5) ? ButtonStyle.LINK : ButtonStyle.UNKNOWN;
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */
diff --git a/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java b/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java
index cbc4c8a9af..2d55abb3e0 100644
--- a/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java
+++ b/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java
@@ -8,7 +8,7 @@ public final class ComponentEmoji implements Serializable {
     private final Boolean animated;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1555id;
+    private final String f1550id;
     private final String name;
 
     public final Boolean a() {
@@ -16,7 +16,7 @@ public final class ComponentEmoji implements Serializable {
     }
 
     public final String b() {
-        return this.f1555id;
+        return this.f1550id;
     }
 
     public final String c() {
@@ -32,12 +32,12 @@ public final class ComponentEmoji implements Serializable {
             return false;
         }
         ComponentEmoji componentEmoji = (ComponentEmoji) obj;
-        return m.areEqual(this.f1555id, componentEmoji.f1555id) && m.areEqual(this.name, componentEmoji.name) && m.areEqual(this.animated, componentEmoji.animated);
+        return m.areEqual(this.f1550id, componentEmoji.f1550id) && m.areEqual(this.name, componentEmoji.name) && m.areEqual(this.animated, componentEmoji.animated);
     }
 
     @Override // java.lang.Object
     public int hashCode() {
-        String str = this.f1555id;
+        String str = this.f1550id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -52,7 +52,7 @@ public final class ComponentEmoji implements Serializable {
     @Override // java.lang.Object
     public String toString() {
         StringBuilder L = a.L("ComponentEmoji(id=");
-        L.append(this.f1555id);
+        L.append(this.f1550id);
         L.append(", name=");
         L.append(this.name);
         L.append(", animated=");
diff --git a/app/src/main/java/com/discord/api/botuikit/gson/ComponentTypeTypeAdapter.java b/app/src/main/java/com/discord/api/botuikit/gson/ComponentTypeTypeAdapter.java
index fee799be61..9265bb25c4 100644
--- a/app/src/main/java/com/discord/api/botuikit/gson/ComponentTypeTypeAdapter.java
+++ b/app/src/main/java/com/discord/api/botuikit/gson/ComponentTypeTypeAdapter.java
@@ -13,7 +13,7 @@ public final class ComponentTypeTypeAdapter extends TypeAdapter<ComponentType> {
     public ComponentType read(JsonReader jsonReader) {
         ComponentType componentType;
         m.checkNotNullParameter(jsonReader, "in");
-        Integer L1 = AnimatableValueParser.L1(jsonReader);
+        Integer N1 = AnimatableValueParser.N1(jsonReader);
         ComponentType[] values = ComponentType.values();
         int i = 0;
         while (true) {
@@ -22,7 +22,7 @@ public final class ComponentTypeTypeAdapter extends TypeAdapter<ComponentType> {
                 break;
             }
             componentType = values[i];
-            if (L1 != null && componentType.getType() == L1.intValue()) {
+            if (N1 != null && componentType.getType() == N1.intValue()) {
                 break;
             }
             i++;
diff --git a/app/src/main/java/com/discord/api/channel/Channel.java b/app/src/main/java/com/discord/api/channel/Channel.java
index a3f6a0ce28..cff238ef22 100644
--- a/app/src/main/java/com/discord/api/channel/Channel.java
+++ b/app/src/main/java/com/discord/api/channel/Channel.java
@@ -27,12 +27,13 @@ public final class Channel {
     public static final int PUBLIC_THREAD = 11;
     private final long applicationId;
     private final int bitrate;
+    private final Integer defaultAutoArchiveDuration;
     private transient GuildHashes guildHashes;
     private final long guildId;
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1556id;
+    private final long f1551id;
     private final long lastMessageId;
     private final transient ThreadMember member;
     private final transient Integer memberCount;
@@ -65,13 +66,13 @@ public final class Channel {
         }
     }
 
-    public Channel(String str, int i, long j, String str2, long j2, long j3, long j4, List<Long> list, List<User> list2, int i2, List<PermissionOverwrite> list3, int i3, int i4, String str3, long j5, long j6, List<ChannelRecipientNick> list4, boolean z2, long j7, String str4, int i5, String str5, GuildHashes guildHashes, ThreadMetadata threadMetadata, Integer num, Integer num2, List<Long> list5, ThreadMember threadMember) {
+    public Channel(String str, int i, long j, String str2, long j2, long j3, long j4, List<Long> list, List<User> list2, int i2, List<PermissionOverwrite> list3, int i3, int i4, String str3, long j5, long j6, List<ChannelRecipientNick> list4, boolean z2, long j7, String str4, int i5, Integer num, String str5, GuildHashes guildHashes, ThreadMetadata threadMetadata, Integer num2, Integer num3, List<Long> list5, ThreadMember threadMember) {
         this.topic = str;
         this.type = i;
         this.guildId = j;
         this.name = str2;
         this.lastMessageId = j2;
-        this.f1556id = j3;
+        this.f1551id = j3;
         this.ownerId = j4;
         this.recipientIds = list;
         this.recipients = list2;
@@ -87,22 +88,23 @@ public final class Channel {
         this.parentId = j7;
         this.memberListId = str4;
         this.rateLimitPerUser = i5;
+        this.defaultAutoArchiveDuration = num;
         this.rtcRegion = str5;
         this.guildHashes = guildHashes;
         this.threadMetadata = threadMetadata;
-        this.messageCount = num;
-        this.memberCount = num2;
+        this.messageCount = num2;
+        this.memberCount = num3;
         this.memberIdsPreview = list5;
         this.member = threadMember;
     }
 
-    public static Channel a(Channel channel, String str, int i, long j, String str2, long j2, long j3, long j4, List list, List list2, int i2, List list3, int i3, int i4, String str3, long j5, long j6, List list4, boolean z2, long j7, String str4, int i5, String str5, GuildHashes guildHashes, ThreadMetadata threadMetadata, Integer num, Integer num2, List list5, ThreadMember threadMember, int i6) {
+    public static Channel a(Channel channel, String str, int i, long j, String str2, long j2, long j3, long j4, List list, List list2, int i2, List list3, int i3, int i4, String str3, long j5, long j6, List list4, boolean z2, long j7, String str4, int i5, Integer num, String str5, GuildHashes guildHashes, ThreadMetadata threadMetadata, Integer num2, Integer num3, List list5, ThreadMember threadMember, int i6) {
         String str6 = (i6 & 1) != 0 ? channel.topic : null;
         int i7 = (i6 & 2) != 0 ? channel.type : i;
         long j8 = (i6 & 4) != 0 ? channel.guildId : j;
         String str7 = (i6 & 8) != 0 ? channel.name : null;
         long j9 = (i6 & 16) != 0 ? channel.lastMessageId : j2;
-        long j10 = (i6 & 32) != 0 ? channel.f1556id : j3;
+        long j10 = (i6 & 32) != 0 ? channel.f1551id : j3;
         long j11 = (i6 & 64) != 0 ? channel.ownerId : j4;
         List<Long> list6 = (i6 & 128) != 0 ? channel.recipientIds : null;
         List list7 = (i6 & 256) != 0 ? channel.recipients : list2;
@@ -118,18 +120,23 @@ public final class Channel {
         long j14 = (i6 & 262144) != 0 ? channel.parentId : j7;
         String str9 = (i6 & 524288) != 0 ? channel.memberListId : null;
         int i11 = (1048576 & i6) != 0 ? channel.rateLimitPerUser : i5;
-        String str10 = (i6 & 2097152) != 0 ? channel.rtcRegion : null;
-        GuildHashes guildHashes2 = (i6 & 4194304) != 0 ? channel.guildHashes : null;
-        ThreadMetadata threadMetadata2 = (i6 & 8388608) != 0 ? channel.threadMetadata : null;
-        Integer num3 = (i6 & 16777216) != 0 ? channel.messageCount : null;
-        Integer num4 = (i6 & 33554432) != 0 ? channel.memberCount : null;
-        List<Long> list10 = (i6 & 67108864) != 0 ? channel.memberIdsPreview : null;
-        ThreadMember threadMember2 = (i6 & 134217728) != 0 ? channel.member : null;
+        Integer num4 = (i6 & 2097152) != 0 ? channel.defaultAutoArchiveDuration : null;
+        String str10 = (i6 & 4194304) != 0 ? channel.rtcRegion : null;
+        GuildHashes guildHashes2 = (i6 & 8388608) != 0 ? channel.guildHashes : null;
+        ThreadMetadata threadMetadata2 = (i6 & 16777216) != 0 ? channel.threadMetadata : null;
+        Integer num5 = (i6 & 33554432) != 0 ? channel.messageCount : null;
+        Integer num6 = (i6 & 67108864) != 0 ? channel.memberCount : null;
+        List<Long> list10 = (i6 & 134217728) != 0 ? channel.memberIdsPreview : null;
+        ThreadMember threadMember2 = (i6 & 268435456) != 0 ? channel.member : null;
         Objects.requireNonNull(channel);
-        return new Channel(str6, i7, j8, str7, j9, j10, j11, list6, list7, i8, list8, i9, i10, str8, j12, j13, list9, z3, j14, str9, i11, str10, guildHashes2, threadMetadata2, num3, num4, list10, threadMember2);
+        return new Channel(str6, i7, j8, str7, j9, j10, j11, list6, list7, i8, list8, i9, i10, str8, j12, j13, list9, z3, j14, str9, i11, num4, str10, guildHashes2, threadMetadata2, num5, num6, list10, threadMember2);
     }
 
     public final int A() {
+        return this.type;
+    }
+
+    public final int B() {
         return this.userLimit;
     }
 
@@ -141,12 +148,12 @@ public final class Channel {
         return this.bitrate;
     }
 
-    public final GuildHashes d() {
-        return this.guildHashes;
+    public final Integer d() {
+        return this.defaultAutoArchiveDuration;
     }
 
-    public final long e() {
-        return this.guildId;
+    public final GuildHashes e() {
+        return this.guildHashes;
     }
 
     public boolean equals(Object obj) {
@@ -157,19 +164,19 @@ public final class Channel {
             return false;
         }
         Channel channel = (Channel) obj;
-        return m.areEqual(this.topic, channel.topic) && this.type == channel.type && this.guildId == channel.guildId && m.areEqual(this.name, channel.name) && this.lastMessageId == channel.lastMessageId && this.f1556id == channel.f1556id && this.ownerId == channel.ownerId && m.areEqual(this.recipientIds, channel.recipientIds) && m.areEqual(this.recipients, channel.recipients) && this.position == channel.position && m.areEqual(this.permissionOverwrites, channel.permissionOverwrites) && this.userLimit == channel.userLimit && this.bitrate == channel.bitrate && m.areEqual(this.icon, channel.icon) && this.originChannelId == channel.originChannelId && this.applicationId == channel.applicationId && m.areEqual(this.nicks, channel.nicks) && this.nsfw == channel.nsfw && this.parentId == channel.parentId && m.areEqual(this.memberListId, channel.memberListId) && this.rateLimitPerUser == channel.rateLimitPerUser && m.areEqual(this.rtcRegion, channel.rtcRegion) && m.areEqual(this.guildHashes, channel.guildHashes) && m.areEqual(this.threadMetadata, channel.threadMetadata) && m.areEqual(this.messageCount, channel.messageCount) && m.areEqual(this.memberCount, channel.memberCount) && m.areEqual(this.memberIdsPreview, channel.memberIdsPreview) && m.areEqual(this.member, channel.member);
+        return m.areEqual(this.topic, channel.topic) && this.type == channel.type && this.guildId == channel.guildId && m.areEqual(this.name, channel.name) && this.lastMessageId == channel.lastMessageId && this.f1551id == channel.f1551id && this.ownerId == channel.ownerId && m.areEqual(this.recipientIds, channel.recipientIds) && m.areEqual(this.recipients, channel.recipients) && this.position == channel.position && m.areEqual(this.permissionOverwrites, channel.permissionOverwrites) && this.userLimit == channel.userLimit && this.bitrate == channel.bitrate && m.areEqual(this.icon, channel.icon) && this.originChannelId == channel.originChannelId && this.applicationId == channel.applicationId && m.areEqual(this.nicks, channel.nicks) && this.nsfw == channel.nsfw && this.parentId == channel.parentId && m.areEqual(this.memberListId, channel.memberListId) && this.rateLimitPerUser == channel.rateLimitPerUser && m.areEqual(this.defaultAutoArchiveDuration, channel.defaultAutoArchiveDuration) && m.areEqual(this.rtcRegion, channel.rtcRegion) && m.areEqual(this.guildHashes, channel.guildHashes) && m.areEqual(this.threadMetadata, channel.threadMetadata) && m.areEqual(this.messageCount, channel.messageCount) && m.areEqual(this.memberCount, channel.memberCount) && m.areEqual(this.memberIdsPreview, channel.memberIdsPreview) && m.areEqual(this.member, channel.member);
     }
 
-    public final String f() {
+    public final long f() {
+        return this.guildId;
+    }
+
+    public final String g() {
         return this.icon;
     }
 
-    public final long g() {
-        return this.f1556id;
-    }
-
     public final long h() {
-        return this.lastMessageId;
+        return this.f1551id;
     }
 
     public int hashCode() {
@@ -181,7 +188,7 @@ public final class Channel {
         String str2 = this.name;
         int hashCode2 = str2 != null ? str2.hashCode() : 0;
         long j2 = this.lastMessageId;
-        long j3 = this.f1556id;
+        long j3 = this.f1551id;
         long j4 = this.ownerId;
         int i3 = (((((((i2 + hashCode2) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31) + ((int) (j4 ^ (j4 >>> 32)))) * 31;
         List<Long> list = this.recipientIds;
@@ -208,71 +215,73 @@ public final class Channel {
         int i8 = (((hashCode7 + i5) * 31) + ((int) (j7 ^ (j7 >>> 32)))) * 31;
         String str4 = this.memberListId;
         int hashCode8 = (((i8 + (str4 != null ? str4.hashCode() : 0)) * 31) + this.rateLimitPerUser) * 31;
+        Integer num = this.defaultAutoArchiveDuration;
+        int hashCode9 = (hashCode8 + (num != null ? num.hashCode() : 0)) * 31;
         String str5 = this.rtcRegion;
-        int hashCode9 = (hashCode8 + (str5 != null ? str5.hashCode() : 0)) * 31;
+        int hashCode10 = (hashCode9 + (str5 != null ? str5.hashCode() : 0)) * 31;
         GuildHashes guildHashes = this.guildHashes;
-        int hashCode10 = (hashCode9 + (guildHashes != null ? guildHashes.hashCode() : 0)) * 31;
+        int hashCode11 = (hashCode10 + (guildHashes != null ? guildHashes.hashCode() : 0)) * 31;
         ThreadMetadata threadMetadata = this.threadMetadata;
-        int hashCode11 = (hashCode10 + (threadMetadata != null ? threadMetadata.hashCode() : 0)) * 31;
-        Integer num = this.messageCount;
-        int hashCode12 = (hashCode11 + (num != null ? num.hashCode() : 0)) * 31;
-        Integer num2 = this.memberCount;
+        int hashCode12 = (hashCode11 + (threadMetadata != null ? threadMetadata.hashCode() : 0)) * 31;
+        Integer num2 = this.messageCount;
         int hashCode13 = (hashCode12 + (num2 != null ? num2.hashCode() : 0)) * 31;
+        Integer num3 = this.memberCount;
+        int hashCode14 = (hashCode13 + (num3 != null ? num3.hashCode() : 0)) * 31;
         List<Long> list5 = this.memberIdsPreview;
-        int hashCode14 = (hashCode13 + (list5 != null ? list5.hashCode() : 0)) * 31;
+        int hashCode15 = (hashCode14 + (list5 != null ? list5.hashCode() : 0)) * 31;
         ThreadMember threadMember = this.member;
         if (threadMember != null) {
             i = threadMember.hashCode();
         }
-        return hashCode14 + i;
+        return hashCode15 + i;
     }
 
-    public final ThreadMember i() {
+    public final long i() {
+        return this.lastMessageId;
+    }
+
+    public final ThreadMember j() {
         return this.member;
     }
 
-    public final String j() {
+    public final String k() {
         return this.memberListId;
     }
 
-    public final Integer k() {
+    public final Integer l() {
         return this.messageCount;
     }
 
-    public final String l() {
+    public final String m() {
         return this.name;
     }
 
-    public final List<ChannelRecipientNick> m() {
+    public final List<ChannelRecipientNick> n() {
         return this.nicks;
     }
 
-    public final boolean n() {
+    public final boolean o() {
         return this.nsfw;
     }
 
-    public final long o() {
+    public final long p() {
         return this.originChannelId;
     }
 
-    public final long p() {
+    public final long q() {
         return this.ownerId;
     }
 
-    public final long q() {
+    public final long r() {
         return this.parentId;
     }
 
-    public final List<PermissionOverwrite> r() {
+    public final List<PermissionOverwrite> s() {
         return this.permissionOverwrites;
     }
 
-    public final int s() {
-        return this.position;
-    }
-
     public final int t() {
-        return this.rateLimitPerUser;
+        return this.position;
     }
 
     public String toString() {
@@ -287,7 +296,7 @@ public final class Channel {
         L.append(", lastMessageId=");
         L.append(this.lastMessageId);
         L.append(", id=");
-        L.append(this.f1556id);
+        L.append(this.f1551id);
         L.append(", ownerId=");
         L.append(this.ownerId);
         L.append(", recipientIds=");
@@ -318,6 +327,8 @@ public final class Channel {
         L.append(this.memberListId);
         L.append(", rateLimitPerUser=");
         L.append(this.rateLimitPerUser);
+        L.append(", defaultAutoArchiveDuration=");
+        L.append(this.defaultAutoArchiveDuration);
         L.append(", rtcRegion=");
         L.append(this.rtcRegion);
         L.append(", guildHashes=");
@@ -336,27 +347,27 @@ public final class Channel {
         return L.toString();
     }
 
-    public final List<Long> u() {
+    public final int u() {
+        return this.rateLimitPerUser;
+    }
+
+    public final List<Long> v() {
         return this.recipientIds;
     }
 
-    public final List<User> v() {
+    public final List<User> w() {
         return this.recipients;
     }
 
-    public final String w() {
+    public final String x() {
         return this.rtcRegion;
     }
 
-    public final ThreadMetadata x() {
+    public final ThreadMetadata y() {
         return this.threadMetadata;
     }
 
-    public final String y() {
+    public final String z() {
         return this.topic;
     }
-
-    public final int z() {
-        return this.type;
-    }
 }
diff --git a/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java b/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java
index 5551b54220..cd5d3c9bec 100644
--- a/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java
+++ b/app/src/main/java/com/discord/api/channel/ChannelRecipientNick.java
@@ -6,20 +6,24 @@ import d0.z.d.m;
 public final class ChannelRecipientNick {
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1557id;
+    private final long f1552id;
     private final String nick;
 
     public ChannelRecipientNick(long j, String str) {
         m.checkNotNullParameter(str, "nick");
-        this.f1557id = j;
+        this.f1552id = j;
         this.nick = str;
     }
 
     public final long a() {
-        return this.f1557id;
+        return this.f1552id;
     }
 
-    public final String b() {
+    public final long b() {
+        return this.f1552id;
+    }
+
+    public final String c() {
         return this.nick;
     }
 
@@ -31,11 +35,11 @@ public final class ChannelRecipientNick {
             return false;
         }
         ChannelRecipientNick channelRecipientNick = (ChannelRecipientNick) obj;
-        return this.f1557id == channelRecipientNick.f1557id && m.areEqual(this.nick, channelRecipientNick.nick);
+        return this.f1552id == channelRecipientNick.f1552id && m.areEqual(this.nick, channelRecipientNick.nick);
     }
 
     public int hashCode() {
-        long j = this.f1557id;
+        long j = this.f1552id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.nick;
         return i + (str != null ? str.hashCode() : 0);
@@ -43,7 +47,7 @@ public final class ChannelRecipientNick {
 
     public String toString() {
         StringBuilder L = a.L("ChannelRecipientNick(id=");
-        L.append(this.f1557id);
+        L.append(this.f1552id);
         L.append(", nick=");
         return a.D(L, this.nick, ")");
     }
diff --git a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java
index 31c73b30d2..570faadb84 100644
--- a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java
+++ b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java
@@ -14,8 +14,8 @@ public final class ChannelUtils$getSortByMostRecent$1<T> implements Comparator<C
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
     @Override // java.util.Comparator
     public int compare(Channel channel, Channel channel2) {
-        long g = channel.g();
-        long g2 = channel2.g();
-        return MessageUtils.compareMessages(this.$mostRecentMessageIds.containsKey(Long.valueOf(g2)) ? (Long) this.$mostRecentMessageIds.get(Long.valueOf(g2)) : Long.valueOf(g2), this.$mostRecentMessageIds.containsKey(Long.valueOf(g)) ? (Long) this.$mostRecentMessageIds.get(Long.valueOf(g)) : Long.valueOf(g));
+        long h = channel.h();
+        long h2 = channel2.h();
+        return MessageUtils.compareMessages(this.$mostRecentMessageIds.containsKey(Long.valueOf(h2)) ? (Long) this.$mostRecentMessageIds.get(Long.valueOf(h2)) : Long.valueOf(h2), this.$mostRecentMessageIds.containsKey(Long.valueOf(h)) ? (Long) this.$mostRecentMessageIds.get(Long.valueOf(h)) : Long.valueOf(h));
     }
 }
diff --git a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java
index b36ec1ed15..9544c6b9ea 100644
--- a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java
+++ b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java
@@ -24,29 +24,29 @@ public final class ChannelUtils$getSortByNameAndType$1<T> implements Comparator<
             return channel4 == null ? 0 : -1;
         }
         if (channel4 != null) {
-            if (channel3.z() == 4 && channel4.z() == 4) {
-                if (channel3.s() != channel4.s()) {
-                    i2 = channel3.s();
-                    i = channel4.s();
+            if (channel3.A() == 4 && channel4.A() == 4) {
+                if (channel3.t() != channel4.t()) {
+                    i2 = channel3.t();
+                    i = channel4.t();
                 } else {
-                    j2 = channel3.g();
-                    j = channel4.g();
+                    j2 = channel3.h();
+                    j = channel4.h();
                     return (j2 > j ? 1 : (j2 == j ? 0 : -1));
                 }
-            } else if (channel3.z() == 4) {
+            } else if (channel3.A() == 4) {
                 return -1;
             } else {
-                if (channel4.z() != 4) {
-                    if (channel3.z() == 0 && AnimatableValueParser.k1(channel4)) {
+                if (channel4.A() != 4) {
+                    if (channel3.A() == 0 && AnimatableValueParser.l1(channel4)) {
                         return -1;
                     }
-                    if (!AnimatableValueParser.k1(channel3) || channel4.z() != 0) {
-                        if (channel3.s() != channel4.s()) {
-                            i2 = channel3.s();
-                            i = channel4.s();
+                    if (!AnimatableValueParser.l1(channel3) || channel4.A() != 0) {
+                        if (channel3.t() != channel4.t()) {
+                            i2 = channel3.t();
+                            i = channel4.t();
                         } else {
-                            j2 = channel3.g();
-                            j = channel4.g();
+                            j2 = channel3.h();
+                            j = channel4.h();
                             return (j2 > j ? 1 : (j2 == j ? 0 : -1));
                         }
                     }
diff --git a/app/src/main/java/com/discord/api/commands/Application.java b/app/src/main/java/com/discord/api/commands/Application.java
index b0c9ae15f1..0e1804698c 100644
--- a/app/src/main/java/com/discord/api/commands/Application.java
+++ b/app/src/main/java/com/discord/api/commands/Application.java
@@ -9,7 +9,7 @@ public final class Application {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1558id;
+    private final long f1553id;
     private final String name;
 
     public final int a() {
@@ -21,7 +21,7 @@ public final class Application {
     }
 
     public final long c() {
-        return this.f1558id;
+        return this.f1553id;
     }
 
     public final String d() {
diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommand.java b/app/src/main/java/com/discord/api/commands/ApplicationCommand.java
index 402250c877..0238bd5557 100644
--- a/app/src/main/java/com/discord/api/commands/ApplicationCommand.java
+++ b/app/src/main/java/com/discord/api/commands/ApplicationCommand.java
@@ -11,7 +11,7 @@ public final class ApplicationCommand {
     private final String guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1559id;
+    private final long f1554id;
     private final String name;
     private final List<ApplicationCommandOption> options;
     private final List<ApplicationCommandPermission> permissions;
@@ -34,7 +34,7 @@ public final class ApplicationCommand {
     }
 
     public final long e() {
-        return this.f1559id;
+        return this.f1554id;
     }
 
     public boolean equals(Object obj) {
@@ -45,7 +45,7 @@ public final class ApplicationCommand {
             return false;
         }
         ApplicationCommand applicationCommand = (ApplicationCommand) obj;
-        return this.f1559id == applicationCommand.f1559id && this.applicationId == applicationCommand.applicationId && m.areEqual(this.name, applicationCommand.name) && m.areEqual(this.description, applicationCommand.description) && m.areEqual(this.options, applicationCommand.options) && m.areEqual(this.version, applicationCommand.version) && m.areEqual(this.guildId, applicationCommand.guildId) && m.areEqual(this.defaultPermissions, applicationCommand.defaultPermissions) && m.areEqual(this.permissions, applicationCommand.permissions);
+        return this.f1554id == applicationCommand.f1554id && this.applicationId == applicationCommand.applicationId && m.areEqual(this.name, applicationCommand.name) && m.areEqual(this.description, applicationCommand.description) && m.areEqual(this.options, applicationCommand.options) && m.areEqual(this.version, applicationCommand.version) && m.areEqual(this.guildId, applicationCommand.guildId) && m.areEqual(this.defaultPermissions, applicationCommand.defaultPermissions) && m.areEqual(this.permissions, applicationCommand.permissions);
     }
 
     public final String f() {
@@ -61,7 +61,7 @@ public final class ApplicationCommand {
     }
 
     public int hashCode() {
-        long j = this.f1559id;
+        long j = this.f1554id;
         long j2 = this.applicationId;
         int i = ((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         String str = this.name;
@@ -90,7 +90,7 @@ public final class ApplicationCommand {
 
     public String toString() {
         StringBuilder L = a.L("ApplicationCommand(id=");
-        L.append(this.f1559id);
+        L.append(this.f1554id);
         L.append(", applicationId=");
         L.append(this.applicationId);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java b/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java
index 7a6c91d66d..cb7d070786 100644
--- a/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java
+++ b/app/src/main/java/com/discord/api/commands/ApplicationCommandData.java
@@ -8,7 +8,7 @@ public final class ApplicationCommandData {
     private final String guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1560id;
+    private final String f1555id;
     private final String name;
     private final List<ApplicationCommandValue> options;
     private final String version;
@@ -18,7 +18,7 @@ public final class ApplicationCommandData {
         m.checkNotNullParameter(str4, "name");
         this.version = str;
         this.guildId = str2;
-        this.f1560id = str3;
+        this.f1555id = str3;
         this.name = str4;
         this.options = list;
     }
@@ -39,7 +39,7 @@ public final class ApplicationCommandData {
             return false;
         }
         ApplicationCommandData applicationCommandData = (ApplicationCommandData) obj;
-        return m.areEqual(this.version, applicationCommandData.version) && m.areEqual(this.guildId, applicationCommandData.guildId) && m.areEqual(this.f1560id, applicationCommandData.f1560id) && m.areEqual(this.name, applicationCommandData.name) && m.areEqual(this.options, applicationCommandData.options);
+        return m.areEqual(this.version, applicationCommandData.version) && m.areEqual(this.guildId, applicationCommandData.guildId) && m.areEqual(this.f1555id, applicationCommandData.f1555id) && m.areEqual(this.name, applicationCommandData.name) && m.areEqual(this.options, applicationCommandData.options);
     }
 
     public int hashCode() {
@@ -48,7 +48,7 @@ public final class ApplicationCommandData {
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.guildId;
         int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
-        String str3 = this.f1560id;
+        String str3 = this.f1555id;
         int hashCode3 = (hashCode2 + (str3 != null ? str3.hashCode() : 0)) * 31;
         String str4 = this.name;
         int hashCode4 = (hashCode3 + (str4 != null ? str4.hashCode() : 0)) * 31;
@@ -65,7 +65,7 @@ public final class ApplicationCommandData {
         L.append(", guildId=");
         L.append(this.guildId);
         L.append(", id=");
-        L.append(this.f1560id);
+        L.append(this.f1555id);
         L.append(", name=");
         L.append(this.name);
         L.append(", options=");
diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommandPermission.java b/app/src/main/java/com/discord/api/commands/ApplicationCommandPermission.java
index 8563c16a61..b546866fda 100644
--- a/app/src/main/java/com/discord/api/commands/ApplicationCommandPermission.java
+++ b/app/src/main/java/com/discord/api/commands/ApplicationCommandPermission.java
@@ -6,12 +6,12 @@ import d0.z.d.m;
 public final class ApplicationCommandPermission {
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1561id;
+    private final long f1556id;
     private final boolean permission;
     private final ApplicationCommandPermissionType type;
 
     public final long a() {
-        return this.f1561id;
+        return this.f1556id;
     }
 
     public final boolean b() {
@@ -26,11 +26,11 @@ public final class ApplicationCommandPermission {
             return false;
         }
         ApplicationCommandPermission applicationCommandPermission = (ApplicationCommandPermission) obj;
-        return this.f1561id == applicationCommandPermission.f1561id && m.areEqual(this.type, applicationCommandPermission.type) && this.permission == applicationCommandPermission.permission;
+        return this.f1556id == applicationCommandPermission.f1556id && m.areEqual(this.type, applicationCommandPermission.type) && this.permission == applicationCommandPermission.permission;
     }
 
     public int hashCode() {
-        long j = this.f1561id;
+        long j = this.f1556id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         ApplicationCommandPermissionType applicationCommandPermissionType = this.type;
         int hashCode = (i + (applicationCommandPermissionType != null ? applicationCommandPermissionType.hashCode() : 0)) * 31;
@@ -46,7 +46,7 @@ public final class ApplicationCommandPermission {
 
     public String toString() {
         StringBuilder L = a.L("ApplicationCommandPermission(id=");
-        L.append(this.f1561id);
+        L.append(this.f1556id);
         L.append(", type=");
         L.append(this.type);
         L.append(", permission=");
diff --git a/app/src/main/java/com/discord/api/commands/CommandChoice.java b/app/src/main/java/com/discord/api/commands/CommandChoice.java
index e75dff6c57..172d2049f5 100644
--- a/app/src/main/java/com/discord/api/commands/CommandChoice.java
+++ b/app/src/main/java/com/discord/api/commands/CommandChoice.java
@@ -7,6 +7,13 @@ public final class CommandChoice {
     private final String name;
     private final String value;
 
+    public CommandChoice(String str, String str2) {
+        m.checkNotNullParameter(str, "name");
+        m.checkNotNullParameter(str2, "value");
+        this.name = str;
+        this.value = str2;
+    }
+
     public final String a() {
         return this.name;
     }
diff --git a/app/src/main/java/com/discord/api/emoji/GuildEmoji.java b/app/src/main/java/com/discord/api/emoji/GuildEmoji.java
index 51051c8d43..a6192430dd 100644
--- a/app/src/main/java/com/discord/api/emoji/GuildEmoji.java
+++ b/app/src/main/java/com/discord/api/emoji/GuildEmoji.java
@@ -9,7 +9,7 @@ public final class GuildEmoji {
     private final Boolean available;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1562id;
+    private final long f1557id;
     private final boolean managed;
     private final String name;
     private final boolean requireColons;
@@ -17,7 +17,7 @@ public final class GuildEmoji {
 
     public GuildEmoji(long j, String str, List<Long> list, boolean z2, boolean z3, boolean z4, Boolean bool) {
         m.checkNotNullParameter(str, "name");
-        this.f1562id = j;
+        this.f1557id = j;
         this.name = str;
         this.roles = list;
         this.requireColons = z2;
@@ -35,7 +35,7 @@ public final class GuildEmoji {
     }
 
     public final long c() {
-        return this.f1562id;
+        return this.f1557id;
     }
 
     public final boolean d() {
@@ -54,7 +54,7 @@ public final class GuildEmoji {
             return false;
         }
         GuildEmoji guildEmoji = (GuildEmoji) obj;
-        return this.f1562id == guildEmoji.f1562id && m.areEqual(this.name, guildEmoji.name) && m.areEqual(this.roles, guildEmoji.roles) && this.requireColons == guildEmoji.requireColons && this.managed == guildEmoji.managed && this.animated == guildEmoji.animated && m.areEqual(this.available, guildEmoji.available);
+        return this.f1557id == guildEmoji.f1557id && m.areEqual(this.name, guildEmoji.name) && m.areEqual(this.roles, guildEmoji.roles) && this.requireColons == guildEmoji.requireColons && this.managed == guildEmoji.managed && this.animated == guildEmoji.animated && m.areEqual(this.available, guildEmoji.available);
     }
 
     public final boolean f() {
@@ -66,7 +66,7 @@ public final class GuildEmoji {
     }
 
     public int hashCode() {
-        long j = this.f1562id;
+        long j = this.f1557id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.name;
         int i2 = 0;
@@ -104,7 +104,7 @@ public final class GuildEmoji {
 
     public String toString() {
         StringBuilder L = a.L("GuildEmoji(id=");
-        L.append(this.f1562id);
+        L.append(this.f1557id);
         L.append(", name=");
         L.append(this.name);
         L.append(", roles=");
diff --git a/app/src/main/java/com/discord/api/guild/Guild.java b/app/src/main/java/com/discord/api/guild/Guild.java
index a92dc316f5..9c644ad244 100644
--- a/app/src/main/java/com/discord/api/guild/Guild.java
+++ b/app/src/main/java/com/discord/api/guild/Guild.java
@@ -32,7 +32,7 @@ public final class Guild {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1563id;
+    private final long f1558id;
     private final String joinedAt;
     private final GuildMaxVideoChannelUsers maxVideoChannelUsers;
     private final int memberCount;
@@ -73,7 +73,7 @@ public final class Guild {
         this.name = str;
         this.description = str2;
         this.defaultMessageNotifications = num;
-        this.f1563id = j;
+        this.f1558id = j;
         this.region = str3;
         this.ownerId = j2;
         this.icon = str4;
@@ -119,7 +119,7 @@ public final class Guild {
         String str10 = (i9 & 8) != 0 ? guild.name : str;
         String str11 = (i9 & 16) != 0 ? guild.description : str2;
         Integer num3 = (i9 & 32) != 0 ? guild.defaultMessageNotifications : num;
-        long j3 = (i9 & 64) != 0 ? guild.f1563id : j;
+        long j3 = (i9 & 64) != 0 ? guild.f1558id : j;
         String str12 = (i9 & 128) != 0 ? guild.region : str3;
         long j4 = (i9 & 256) != 0 ? guild.ownerId : j2;
         String str13 = (i9 & 512) != 0 ? guild.icon : str4;
@@ -253,7 +253,7 @@ public final class Guild {
             return false;
         }
         Guild guild = (Guild) obj;
-        return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && m.areEqual(this.defaultMessageNotifications, guild.defaultMessageNotifications) && this.f1563id == guild.f1563id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && m.areEqual(this.presences, guild.presences) && m.areEqual(this.channels, guild.channels) && m.areEqual(this.members, guild.members) && m.areEqual(this.voiceStates, guild.voiceStates) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximateMemberCount == guild.approximateMemberCount && this.approximatePresenceCount == guild.approximatePresenceCount && m.areEqual(this.permissions, guild.permissions) && m.areEqual(this.guildHashes, guild.guildHashes) && m.areEqual(this.channelUpdates, guild.channelUpdates) && m.areEqual(this.threads, guild.threads) && this.nsfw == guild.nsfw && m.areEqual(this.stageInstances, guild.stageInstances);
+        return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && m.areEqual(this.defaultMessageNotifications, guild.defaultMessageNotifications) && this.f1558id == guild.f1558id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && m.areEqual(this.presences, guild.presences) && m.areEqual(this.channels, guild.channels) && m.areEqual(this.members, guild.members) && m.areEqual(this.voiceStates, guild.voiceStates) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximateMemberCount == guild.approximateMemberCount && this.approximatePresenceCount == guild.approximatePresenceCount && m.areEqual(this.permissions, guild.permissions) && m.areEqual(this.guildHashes, guild.guildHashes) && m.areEqual(this.channelUpdates, guild.channelUpdates) && m.areEqual(this.threads, guild.threads) && this.nsfw == guild.nsfw && m.areEqual(this.stageInstances, guild.stageInstances);
     }
 
     public final List<Channel> f() {
@@ -282,7 +282,7 @@ public final class Guild {
         int hashCode5 = (hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31;
         Integer num = this.defaultMessageNotifications;
         int hashCode6 = num != null ? num.hashCode() : 0;
-        long j = this.f1563id;
+        long j = this.f1558id;
         int i2 = (((hashCode5 + hashCode6) * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         String str3 = this.region;
         int hashCode7 = str3 != null ? str3.hashCode() : 0;
@@ -380,7 +380,7 @@ public final class Guild {
     }
 
     public final long o() {
-        return this.f1563id;
+        return this.f1558id;
     }
 
     public final String p() {
@@ -417,7 +417,7 @@ public final class Guild {
         L.append(", defaultMessageNotifications=");
         L.append(this.defaultMessageNotifications);
         L.append(", id=");
-        L.append(this.f1563id);
+        L.append(this.f1558id);
         L.append(", region=");
         L.append(this.region);
         L.append(", ownerId=");
diff --git a/app/src/main/java/com/discord/api/guild/GuildFeature.java b/app/src/main/java/com/discord/api/guild/GuildFeature.java
index 3492dc618c..85f6c3b2bf 100644
--- a/app/src/main/java/com/discord/api/guild/GuildFeature.java
+++ b/app/src/main/java/com/discord/api/guild/GuildFeature.java
@@ -16,5 +16,10 @@ public enum GuildFeature {
     COMMUNITY,
     MEMBER_VERIFICATION_GATE_ENABLED,
     PREVIEW_ENABLED,
-    HUB
+    THREAD_DEFAULT_AUTO_ARCHIVE_DURATION,
+    HUB,
+    THREADS_ENABLED,
+    PRIVATE_THREADS,
+    THREE_DAY_THREAD_ARCHIVE,
+    SEVEN_DAY_THREAD_ARCHIVE
 }
diff --git a/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java b/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java
index 6307d538fa..d13180929d 100644
--- a/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java
+++ b/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java
@@ -16,7 +16,7 @@ public final class GuildPreview {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1564id;
+    private final long f1559id;
     private final String name;
     private final String splash;
 
@@ -48,7 +48,7 @@ public final class GuildPreview {
             return false;
         }
         GuildPreview guildPreview = (GuildPreview) obj;
-        return this.f1564id == guildPreview.f1564id && m.areEqual(this.name, guildPreview.name) && m.areEqual(this.description, guildPreview.description) && m.areEqual(this.splash, guildPreview.splash) && m.areEqual(this.banner, guildPreview.banner) && m.areEqual(this.icon, guildPreview.icon) && m.areEqual(this.approximatePresenceCount, guildPreview.approximatePresenceCount) && m.areEqual(this.approximateMemberCount, guildPreview.approximateMemberCount) && m.areEqual(this.emojis, guildPreview.emojis) && m.areEqual(this.features, guildPreview.features);
+        return this.f1559id == guildPreview.f1559id && m.areEqual(this.name, guildPreview.name) && m.areEqual(this.description, guildPreview.description) && m.areEqual(this.splash, guildPreview.splash) && m.areEqual(this.banner, guildPreview.banner) && m.areEqual(this.icon, guildPreview.icon) && m.areEqual(this.approximatePresenceCount, guildPreview.approximatePresenceCount) && m.areEqual(this.approximateMemberCount, guildPreview.approximateMemberCount) && m.areEqual(this.emojis, guildPreview.emojis) && m.areEqual(this.features, guildPreview.features);
     }
 
     public final String f() {
@@ -56,7 +56,7 @@ public final class GuildPreview {
     }
 
     public final long g() {
-        return this.f1564id;
+        return this.f1559id;
     }
 
     public final String h() {
@@ -64,7 +64,7 @@ public final class GuildPreview {
     }
 
     public int hashCode() {
-        long j = this.f1564id;
+        long j = this.f1559id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.name;
         int i2 = 0;
@@ -96,7 +96,7 @@ public final class GuildPreview {
 
     public String toString() {
         StringBuilder L = a.L("GuildPreview(id=");
-        L.append(this.f1564id);
+        L.append(this.f1559id);
         L.append(", name=");
         L.append(this.name);
         L.append(", description=");
diff --git a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java
index 15c3fb0be0..95cc9ce78b 100644
--- a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java
+++ b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java
@@ -14,7 +14,7 @@ public final class GuildScheduledEvent {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1565id;
+    private final long f1560id;
     private final String image;
     private final String name;
     private final StageInstancePrivacyLevel privacyLevel;
@@ -24,7 +24,7 @@ public final class GuildScheduledEvent {
     private final GuildScheduledEventStatus status;
 
     public final long a() {
-        return this.f1565id;
+        return this.f1560id;
     }
 
     public final String b() {
@@ -39,11 +39,11 @@ public final class GuildScheduledEvent {
             return false;
         }
         GuildScheduledEvent guildScheduledEvent = (GuildScheduledEvent) obj;
-        return this.f1565id == guildScheduledEvent.f1565id && this.guildId == guildScheduledEvent.guildId && m.areEqual(this.name, guildScheduledEvent.name) && m.areEqual(this.description, guildScheduledEvent.description) && m.areEqual(this.image, guildScheduledEvent.image) && m.areEqual(this.scheduledStartTime, guildScheduledEvent.scheduledStartTime) && m.areEqual(this.scheduledEndTime, guildScheduledEvent.scheduledEndTime) && m.areEqual(this.privacyLevel, guildScheduledEvent.privacyLevel) && m.areEqual(this.status, guildScheduledEvent.status) && m.areEqual(this.entityType, guildScheduledEvent.entityType) && m.areEqual(this.entityId, guildScheduledEvent.entityId) && m.areEqual(this.entityMetadata, guildScheduledEvent.entityMetadata) && m.areEqual(this.skuIds, guildScheduledEvent.skuIds);
+        return this.f1560id == guildScheduledEvent.f1560id && this.guildId == guildScheduledEvent.guildId && m.areEqual(this.name, guildScheduledEvent.name) && m.areEqual(this.description, guildScheduledEvent.description) && m.areEqual(this.image, guildScheduledEvent.image) && m.areEqual(this.scheduledStartTime, guildScheduledEvent.scheduledStartTime) && m.areEqual(this.scheduledEndTime, guildScheduledEvent.scheduledEndTime) && m.areEqual(this.privacyLevel, guildScheduledEvent.privacyLevel) && m.areEqual(this.status, guildScheduledEvent.status) && m.areEqual(this.entityType, guildScheduledEvent.entityType) && m.areEqual(this.entityId, guildScheduledEvent.entityId) && m.areEqual(this.entityMetadata, guildScheduledEvent.entityMetadata) && m.areEqual(this.skuIds, guildScheduledEvent.skuIds);
     }
 
     public int hashCode() {
-        long j = this.f1565id;
+        long j = this.f1560id;
         long j2 = this.guildId;
         int i = ((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         String str = this.name;
@@ -76,7 +76,7 @@ public final class GuildScheduledEvent {
 
     public String toString() {
         StringBuilder L = a.L("GuildScheduledEvent(id=");
-        L.append(this.f1565id);
+        L.append(this.f1560id);
         L.append(", guildId=");
         L.append(this.guildId);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/api/interaction/Interaction.java b/app/src/main/java/com/discord/api/interaction/Interaction.java
index 3b71dc3dea..96c101adec 100644
--- a/app/src/main/java/com/discord/api/interaction/Interaction.java
+++ b/app/src/main/java/com/discord/api/interaction/Interaction.java
@@ -11,7 +11,7 @@ public final class Interaction {
     public static final int TYPE_INTERACTION_PING = 1;
 
     /* renamed from: id  reason: collision with root package name */
-    private final Long f1566id;
+    private final Long f1561id;
     private final Member member;
     private final String name;
     private final Integer type;
@@ -27,7 +27,7 @@ public final class Interaction {
     }
 
     public Interaction() {
-        this.f1566id = null;
+        this.f1561id = null;
         this.type = null;
         this.name = null;
         this.user = null;
@@ -35,7 +35,7 @@ public final class Interaction {
     }
 
     public Interaction(Long l, Integer num, String str, User user, Member member) {
-        this.f1566id = l;
+        this.f1561id = l;
         this.type = num;
         this.name = str;
         this.user = user;
@@ -43,7 +43,7 @@ public final class Interaction {
     }
 
     public final Long a() {
-        return this.f1566id;
+        return this.f1561id;
     }
 
     public final String b() {
@@ -62,11 +62,11 @@ public final class Interaction {
             return false;
         }
         Interaction interaction = (Interaction) obj;
-        return m.areEqual(this.f1566id, interaction.f1566id) && m.areEqual(this.type, interaction.type) && m.areEqual(this.name, interaction.name) && m.areEqual(this.user, interaction.user) && m.areEqual(this.member, interaction.member);
+        return m.areEqual(this.f1561id, interaction.f1561id) && m.areEqual(this.type, interaction.type) && m.areEqual(this.name, interaction.name) && m.areEqual(this.user, interaction.user) && m.areEqual(this.member, interaction.member);
     }
 
     public int hashCode() {
-        Long l = this.f1566id;
+        Long l = this.f1561id;
         int i = 0;
         int hashCode = (l != null ? l.hashCode() : 0) * 31;
         Integer num = this.type;
@@ -84,7 +84,7 @@ public final class Interaction {
 
     public String toString() {
         StringBuilder L = a.L("Interaction(id=");
-        L.append(this.f1566id);
+        L.append(this.f1561id);
         L.append(", type=");
         L.append(this.type);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/api/interaction/InteractionStateUpdate.java b/app/src/main/java/com/discord/api/interaction/InteractionStateUpdate.java
index 72ef32c5a5..d65c5b9d87 100644
--- a/app/src/main/java/com/discord/api/interaction/InteractionStateUpdate.java
+++ b/app/src/main/java/com/discord/api/interaction/InteractionStateUpdate.java
@@ -6,17 +6,17 @@ import d0.z.d.m;
 public final class InteractionStateUpdate {
 
     /* renamed from: id  reason: collision with root package name */
-    private final Long f1567id;
+    private final Long f1562id;
     private final String nonce;
 
     public InteractionStateUpdate(Long l, String str) {
         m.checkNotNullParameter(str, "nonce");
-        this.f1567id = l;
+        this.f1562id = l;
         this.nonce = str;
     }
 
     public final Long a() {
-        return this.f1567id;
+        return this.f1562id;
     }
 
     public final String b() {
@@ -31,11 +31,11 @@ public final class InteractionStateUpdate {
             return false;
         }
         InteractionStateUpdate interactionStateUpdate = (InteractionStateUpdate) obj;
-        return m.areEqual(this.f1567id, interactionStateUpdate.f1567id) && m.areEqual(this.nonce, interactionStateUpdate.nonce);
+        return m.areEqual(this.f1562id, interactionStateUpdate.f1562id) && m.areEqual(this.nonce, interactionStateUpdate.nonce);
     }
 
     public int hashCode() {
-        Long l = this.f1567id;
+        Long l = this.f1562id;
         int i = 0;
         int hashCode = (l != null ? l.hashCode() : 0) * 31;
         String str = this.nonce;
@@ -47,7 +47,7 @@ public final class InteractionStateUpdate {
 
     public String toString() {
         StringBuilder L = a.L("InteractionStateUpdate(id=");
-        L.append(this.f1567id);
+        L.append(this.f1562id);
         L.append(", nonce=");
         return a.D(L, this.nonce, ")");
     }
diff --git a/app/src/main/java/com/discord/api/message/LocalAttachment.java b/app/src/main/java/com/discord/api/message/LocalAttachment.java
index a1de242864..02bd95123e 100644
--- a/app/src/main/java/com/discord/api/message/LocalAttachment.java
+++ b/app/src/main/java/com/discord/api/message/LocalAttachment.java
@@ -7,13 +7,13 @@ public final class LocalAttachment {
     private final String displayName;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1568id;
+    private final long f1563id;
     private final String uriString;
 
     public LocalAttachment(long j, String str, String str2) {
         m.checkNotNullParameter(str, "uriString");
         m.checkNotNullParameter(str2, "displayName");
-        this.f1568id = j;
+        this.f1563id = j;
         this.uriString = str;
         this.displayName = str2;
     }
@@ -23,7 +23,7 @@ public final class LocalAttachment {
     }
 
     public final long b() {
-        return this.f1568id;
+        return this.f1563id;
     }
 
     public final String c() {
@@ -38,11 +38,11 @@ public final class LocalAttachment {
             return false;
         }
         LocalAttachment localAttachment = (LocalAttachment) obj;
-        return this.f1568id == localAttachment.f1568id && m.areEqual(this.uriString, localAttachment.uriString) && m.areEqual(this.displayName, localAttachment.displayName);
+        return this.f1563id == localAttachment.f1563id && m.areEqual(this.uriString, localAttachment.uriString) && m.areEqual(this.displayName, localAttachment.displayName);
     }
 
     public int hashCode() {
-        long j = this.f1568id;
+        long j = this.f1563id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.uriString;
         int i2 = 0;
@@ -56,7 +56,7 @@ public final class LocalAttachment {
 
     public String toString() {
         StringBuilder L = a.L("LocalAttachment(id=");
-        L.append(this.f1568id);
+        L.append(this.f1563id);
         L.append(", uriString=");
         L.append(this.uriString);
         L.append(", displayName=");
diff --git a/app/src/main/java/com/discord/api/message/Message.java b/app/src/main/java/com/discord/api/message/Message.java
index 7f254779d7..1e1a77ea37 100644
--- a/app/src/main/java/com/discord/api/message/Message.java
+++ b/app/src/main/java/com/discord/api/message/Message.java
@@ -7,7 +7,6 @@ import com.discord.api.channel.Channel;
 import com.discord.api.guildmember.GuildMember;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.message.activity.MessageActivity;
-import com.discord.api.message.allowedmentions.MessageAllowedMentions;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.call.MessageCall;
 import com.discord.api.message.embed.MessageEmbed;
@@ -16,24 +15,15 @@ import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerPartial;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
-import d0.t.h0;
 import d0.z.d.m;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: Message.kt */
 public final class Message {
-    public static final Companion Companion = new Companion(null);
-    private static final Map<String, MessageReaction> EMPTY_REACTIONS = h0.emptyMap();
     private final MessageActivity activity;
-    private final MessageAllowedMentions allowedMentions;
     private final Application application;
     private final Long applicationId;
     private final List<MessageAttachment> attachments;
     private final User author;
-    private Map<String, MessageReaction> cachedReactionsMap;
     private final MessageCall call;
     private final long channelId;
     private final List<Component> components;
@@ -41,23 +31,18 @@ public final class Message {
     private final UtcDateTime editedTimestamp;
     private final List<MessageEmbed> embeds;
     private final Long flags;
-    private final transient Long guildId;
-    private final transient boolean hasLocalUploads;
+    private final Long guildId;
     private final Boolean hit;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1569id;
-    private final Long initialAttemptTimestamp;
+    private final long f1564id;
     private final Interaction interaction;
-    private final Long lastManualAttemptTimestamp;
-    private final List<LocalAttachment> localAttachments;
-    private final transient GuildMember member;
+    private final GuildMember member;
     private final Boolean mentionEveryone;
     private final List<Long> mentionRoles;
     private final List<User> mentions;
     private final MessageReference messageReference;
     private final String nonce;
-    private final Integer numRetries;
     private final Boolean pinned;
     private final List<MessageReaction> reactions;
     private final Message referencedMessage;
@@ -69,219 +54,115 @@ public final class Message {
     private final Integer type;
     private final Long webhookId;
 
-    /* compiled from: Message.kt */
-    public static final class Companion {
-        public Companion() {
-        }
-
-        public Companion(DefaultConstructorMarker defaultConstructorMarker) {
-        }
-    }
-
-    /* JADX DEBUG: Multi-variable search result rejected for r33v0, resolved type: java.util.List<? extends com.discord.api.botuikit.Component> */
-    /* JADX WARN: Multi-variable type inference failed */
-    public Message(long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List<User> list, List<Long> list2, List<MessageAttachment> list3, List<MessageEmbed> list4, List<MessageReaction> list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List<Sticker> list6, List<StickerPartial> list7, Message message, Interaction interaction, Channel channel, List<? extends Component> list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List<LocalAttachment> list9) {
-        this.f1569id = j;
+    public Message(long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List list6, List list7, Message message, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, int i) {
+        User user2 = (i & 4) != 0 ? null : user;
+        String str3 = (i & 8) != 0 ? null : str;
+        UtcDateTime utcDateTime3 = (i & 16) != 0 ? null : utcDateTime;
+        UtcDateTime utcDateTime4 = (i & 32) != 0 ? null : utcDateTime2;
+        Boolean bool5 = (i & 64) != 0 ? null : bool;
+        Boolean bool6 = (i & 128) != 0 ? null : bool2;
+        List list9 = (i & 256) != 0 ? null : list;
+        List list10 = (i & 512) != 0 ? null : list2;
+        List list11 = (i & 1024) != 0 ? null : list3;
+        List list12 = (i & 2048) != 0 ? null : list4;
+        List list13 = (i & 4096) != 0 ? null : list5;
+        String str4 = (i & 8192) != 0 ? null : str2;
+        Boolean bool7 = (i & 16384) != 0 ? null : bool3;
+        Long l5 = (i & 32768) != 0 ? null : l;
+        Integer num2 = (i & 65536) != 0 ? null : num;
+        MessageActivity messageActivity2 = (i & 131072) != 0 ? null : messageActivity;
+        Application application2 = (i & 262144) != 0 ? null : application;
+        Long l6 = (i & 524288) != 0 ? null : l2;
+        MessageReference messageReference2 = (i & 1048576) != 0 ? null : messageReference;
+        Long l7 = (i & 2097152) != 0 ? null : l3;
+        List list14 = (i & 4194304) != 0 ? null : list6;
+        List list15 = (i & 8388608) != 0 ? null : list7;
+        Message message2 = (i & 16777216) != 0 ? null : message;
+        Interaction interaction2 = (i & 33554432) != 0 ? null : interaction;
+        Channel channel2 = (i & 67108864) != 0 ? null : channel;
+        List list16 = (i & 134217728) != 0 ? null : list8;
+        MessageCall messageCall2 = (i & 268435456) != 0 ? null : messageCall;
+        Long l8 = (i & 536870912) != 0 ? null : l4;
+        int i2 = i & 1073741824;
+        int i3 = i & Integer.MIN_VALUE;
+        this.f1564id = j;
         this.channelId = j2;
-        this.author = user;
-        this.content = str;
-        this.timestamp = utcDateTime;
-        this.editedTimestamp = utcDateTime2;
-        this.tts = bool;
-        this.mentionEveryone = bool2;
-        this.mentions = list;
-        this.mentionRoles = list2;
-        this.attachments = list3;
-        this.embeds = list4;
-        this.reactions = list5;
-        this.nonce = str2;
-        this.pinned = bool3;
-        this.webhookId = l;
-        this.type = num;
-        this.activity = messageActivity;
-        this.application = application;
-        this.applicationId = l2;
-        this.messageReference = messageReference;
-        this.flags = l3;
-        this.stickers = list6;
-        this.stickerItems = list7;
-        this.referencedMessage = message;
-        this.interaction = interaction;
-        this.thread = channel;
-        this.components = list8;
-        this.call = messageCall;
-        this.guildId = l4;
-        this.member = guildMember;
-        this.hit = bool4;
-        this.hasLocalUploads = z2;
-        this.allowedMentions = messageAllowedMentions;
-        this.numRetries = num2;
-        this.lastManualAttemptTimestamp = l5;
-        this.initialAttemptTimestamp = l6;
-        this.localAttachments = list9;
+        this.author = user2;
+        this.content = str3;
+        this.timestamp = utcDateTime3;
+        this.editedTimestamp = utcDateTime4;
+        this.tts = bool5;
+        this.mentionEveryone = bool6;
+        this.mentions = list9;
+        this.mentionRoles = list10;
+        this.attachments = list11;
+        this.embeds = list12;
+        this.reactions = list13;
+        this.nonce = str4;
+        this.pinned = bool7;
+        this.webhookId = l5;
+        this.type = num2;
+        this.activity = messageActivity2;
+        this.application = application2;
+        this.applicationId = l6;
+        this.messageReference = messageReference2;
+        this.flags = l7;
+        this.stickers = list14;
+        this.stickerItems = list15;
+        this.referencedMessage = message2;
+        this.interaction = interaction2;
+        this.thread = channel2;
+        this.components = list16;
+        this.call = messageCall2;
+        this.guildId = l8;
+        this.member = null;
+        this.hit = null;
     }
 
-    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ Message(long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List list6, List list7, Message message, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2) {
-        this(j, j2, (i & 4) != 0 ? null : user, (i & 8) != 0 ? null : str, (i & 16) != 0 ? null : utcDateTime, null, (i & 64) != 0 ? null : bool, (i & 128) != 0 ? null : bool2, (i & 256) != 0 ? null : list, (i & 512) != 0 ? null : list2, (i & 1024) != 0 ? null : list3, (i & 2048) != 0 ? null : list4, (i & 4096) != 0 ? null : list5, (i & 8192) != 0 ? null : str2, (i & 16384) != 0 ? null : bool3, null, (65536 & i) != 0 ? null : num, null, null, null, null, (2097152 & i) != 0 ? null : l3, null, null, null, (33554432 & i) != 0 ? null : interaction, null, null, null, null, null, null, (i2 & 1) != 0 ? false : z2, null, null, null, null, (i2 & 32) != 0 ? null : list9);
-        int i3 = i & 32;
-        int i4 = 32768 & i;
-        int i5 = 131072 & i;
-        int i6 = 262144 & i;
-        int i7 = 524288 & i;
-        int i8 = 1048576 & i;
-        int i9 = 4194304 & i;
-        int i10 = 8388608 & i;
-        int i11 = 16777216 & i;
-        int i12 = 67108864 & i;
-        int i13 = 134217728 & i;
-        int i14 = 268435456 & i;
-        int i15 = 536870912 & i;
-        int i16 = 1073741824 & i;
-        int i17 = i & Integer.MIN_VALUE;
-        int i18 = i2 & 2;
-        int i19 = i2 & 4;
-        int i20 = i2 & 8;
-        int i21 = i2 & 16;
-    }
-
-    public static Message a(Message message, long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List list6, List list7, Message message2, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2) {
-        long j3 = (i & 1) != 0 ? message.f1569id : j;
-        long j4 = (i & 2) != 0 ? message.channelId : j2;
-        User user2 = (i & 4) != 0 ? message.author : user;
-        String str3 = (i & 8) != 0 ? message.content : str;
-        UtcDateTime utcDateTime3 = (i & 16) != 0 ? message.timestamp : utcDateTime;
-        UtcDateTime utcDateTime4 = (i & 32) != 0 ? message.editedTimestamp : utcDateTime2;
-        Boolean bool5 = (i & 64) != 0 ? message.tts : bool;
-        Boolean bool6 = (i & 128) != 0 ? message.mentionEveryone : bool2;
-        List list10 = (i & 256) != 0 ? message.mentions : list;
-        List list11 = (i & 512) != 0 ? message.mentionRoles : list2;
-        List list12 = (i & 1024) != 0 ? message.attachments : list3;
-        List list13 = (i & 2048) != 0 ? message.embeds : list4;
-        List list14 = (i & 4096) != 0 ? message.reactions : list5;
-        String str4 = (i & 8192) != 0 ? message.nonce : str2;
-        Boolean bool7 = (i & 16384) != 0 ? message.pinned : bool3;
-        Long l7 = (i & 32768) != 0 ? message.webhookId : l;
-        Integer num3 = (i & 65536) != 0 ? message.type : num;
-        MessageActivity messageActivity2 = (i & 131072) != 0 ? message.activity : messageActivity;
-        Application application2 = (i & 262144) != 0 ? message.application : application;
-        Long l8 = (i & 524288) != 0 ? message.applicationId : l2;
-        MessageReference messageReference2 = (i & 1048576) != 0 ? message.messageReference : messageReference;
-        Long l9 = (i & 2097152) != 0 ? message.flags : l3;
-        List list15 = (i & 4194304) != 0 ? message.stickers : list6;
-        List list16 = (i & 8388608) != 0 ? message.stickerItems : list7;
-        Message message3 = (i & 16777216) != 0 ? message.referencedMessage : message2;
-        Interaction interaction2 = (i & 33554432) != 0 ? message.interaction : interaction;
-        Channel channel2 = (i & 67108864) != 0 ? message.thread : channel;
-        List list17 = (i & 134217728) != 0 ? message.components : list8;
-        MessageCall messageCall2 = (i & 268435456) != 0 ? message.call : messageCall;
-        Boolean bool8 = null;
-        Long l10 = (i & 536870912) != 0 ? message.guildId : null;
-        GuildMember guildMember2 = (i & 1073741824) != 0 ? message.member : null;
-        if ((i & Integer.MIN_VALUE) != 0) {
-            bool8 = message.hit;
-        }
-        boolean z3 = (i2 & 1) != 0 ? message.hasLocalUploads : z2;
-        MessageAllowedMentions messageAllowedMentions2 = (i2 & 2) != 0 ? message.allowedMentions : messageAllowedMentions;
-        Integer num4 = (i2 & 4) != 0 ? message.numRetries : num2;
-        Long l11 = (i2 & 8) != 0 ? message.lastManualAttemptTimestamp : l5;
-        Long l12 = (i2 & 16) != 0 ? message.initialAttemptTimestamp : l6;
-        List list18 = (i2 & 32) != 0 ? message.localAttachments : list9;
-        Objects.requireNonNull(message);
-        return new Message(j3, j4, user2, str3, utcDateTime3, utcDateTime4, bool5, bool6, list10, list11, list12, list13, list14, str4, bool7, l7, num3, messageActivity2, application2, l8, messageReference2, l9, list15, list16, message3, interaction2, channel2, list17, messageCall2, l10, guildMember2, bool8, z3, messageAllowedMentions2, num4, l11, l12, list18);
-    }
-
-    public final MessageReference A() {
-        return this.messageReference;
-    }
-
-    public final String B() {
-        return this.nonce;
-    }
-
-    public final Integer C() {
-        return this.numRetries;
-    }
-
-    public final Boolean D() {
-        return this.pinned;
-    }
-
-    public final List<MessageReaction> E() {
-        return this.reactions;
-    }
-
-    public final synchronized Map<String, MessageReaction> F() {
-        Map<String, MessageReaction> map;
-        map = this.cachedReactionsMap;
-        if (map != null) {
-            m.checkNotNull(map);
-        } else {
-            List<MessageReaction> list = this.reactions;
-            if (list == null || !(!list.isEmpty())) {
-                map = EMPTY_REACTIONS;
-            } else {
-                List<MessageReaction> list2 = this.reactions;
-                LinkedHashMap linkedHashMap = new LinkedHashMap();
-                for (Object obj : list2) {
-                    linkedHashMap.put(((MessageReaction) obj).b().c(), obj);
-                }
-                this.cachedReactionsMap = linkedHashMap;
-                m.checkNotNull(linkedHashMap);
-                map = linkedHashMap;
-            }
-        }
-        return map;
-    }
-
-    public final Message G() {
-        return this.referencedMessage;
-    }
-
-    public final List<StickerPartial> H() {
-        return this.stickerItems;
-    }
-
-    public final List<Sticker> I() {
+    public final List<Sticker> A() {
         return this.stickers;
     }
 
-    public final Channel J() {
+    public final Channel B() {
         return this.thread;
     }
 
-    public final UtcDateTime K() {
+    public final UtcDateTime C() {
         return this.timestamp;
     }
 
-    public final Boolean L() {
+    public final Boolean D() {
         return this.tts;
     }
 
-    public final Integer M() {
+    public final Integer E() {
         return this.type;
     }
 
-    public final Long N() {
+    public final Long F() {
         return this.webhookId;
     }
 
-    public final MessageActivity b() {
+    public final MessageActivity a() {
         return this.activity;
     }
 
-    public final MessageAllowedMentions c() {
-        return this.allowedMentions;
-    }
-
-    public final Application d() {
+    public final Application b() {
         return this.application;
     }
 
-    public final Long e() {
+    public final Long c() {
         return this.applicationId;
     }
 
+    public final List<MessageAttachment> d() {
+        return this.attachments;
+    }
+
+    public final User e() {
+        return this.author;
+    }
+
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -290,23 +171,23 @@ public final class Message {
             return false;
         }
         Message message = (Message) obj;
-        return this.f1569id == message.f1569id && this.channelId == message.channelId && m.areEqual(this.author, message.author) && m.areEqual(this.content, message.content) && m.areEqual(this.timestamp, message.timestamp) && m.areEqual(this.editedTimestamp, message.editedTimestamp) && m.areEqual(this.tts, message.tts) && m.areEqual(this.mentionEveryone, message.mentionEveryone) && m.areEqual(this.mentions, message.mentions) && m.areEqual(this.mentionRoles, message.mentionRoles) && m.areEqual(this.attachments, message.attachments) && m.areEqual(this.embeds, message.embeds) && m.areEqual(this.reactions, message.reactions) && m.areEqual(this.nonce, message.nonce) && m.areEqual(this.pinned, message.pinned) && m.areEqual(this.webhookId, message.webhookId) && m.areEqual(this.type, message.type) && m.areEqual(this.activity, message.activity) && m.areEqual(this.application, message.application) && m.areEqual(this.applicationId, message.applicationId) && m.areEqual(this.messageReference, message.messageReference) && m.areEqual(this.flags, message.flags) && m.areEqual(this.stickers, message.stickers) && m.areEqual(this.stickerItems, message.stickerItems) && m.areEqual(this.referencedMessage, message.referencedMessage) && m.areEqual(this.interaction, message.interaction) && m.areEqual(this.thread, message.thread) && m.areEqual(this.components, message.components) && m.areEqual(this.call, message.call) && m.areEqual(this.guildId, message.guildId) && m.areEqual(this.member, message.member) && m.areEqual(this.hit, message.hit) && this.hasLocalUploads == message.hasLocalUploads && m.areEqual(this.allowedMentions, message.allowedMentions) && m.areEqual(this.numRetries, message.numRetries) && m.areEqual(this.lastManualAttemptTimestamp, message.lastManualAttemptTimestamp) && m.areEqual(this.initialAttemptTimestamp, message.initialAttemptTimestamp) && m.areEqual(this.localAttachments, message.localAttachments);
+        return this.f1564id == message.f1564id && this.channelId == message.channelId && m.areEqual(this.author, message.author) && m.areEqual(this.content, message.content) && m.areEqual(this.timestamp, message.timestamp) && m.areEqual(this.editedTimestamp, message.editedTimestamp) && m.areEqual(this.tts, message.tts) && m.areEqual(this.mentionEveryone, message.mentionEveryone) && m.areEqual(this.mentions, message.mentions) && m.areEqual(this.mentionRoles, message.mentionRoles) && m.areEqual(this.attachments, message.attachments) && m.areEqual(this.embeds, message.embeds) && m.areEqual(this.reactions, message.reactions) && m.areEqual(this.nonce, message.nonce) && m.areEqual(this.pinned, message.pinned) && m.areEqual(this.webhookId, message.webhookId) && m.areEqual(this.type, message.type) && m.areEqual(this.activity, message.activity) && m.areEqual(this.application, message.application) && m.areEqual(this.applicationId, message.applicationId) && m.areEqual(this.messageReference, message.messageReference) && m.areEqual(this.flags, message.flags) && m.areEqual(this.stickers, message.stickers) && m.areEqual(this.stickerItems, message.stickerItems) && m.areEqual(this.referencedMessage, message.referencedMessage) && m.areEqual(this.interaction, message.interaction) && m.areEqual(this.thread, message.thread) && m.areEqual(this.components, message.components) && m.areEqual(this.call, message.call) && m.areEqual(this.guildId, message.guildId) && m.areEqual(this.member, message.member) && m.areEqual(this.hit, message.hit);
     }
 
-    public final List<MessageAttachment> f() {
-        return this.attachments;
-    }
-
-    public final User g() {
-        return this.author;
-    }
-
-    public final MessageCall h() {
+    public final MessageCall f() {
         return this.call;
     }
 
+    public final long g() {
+        return this.channelId;
+    }
+
+    public final List<Component> h() {
+        return this.components;
+    }
+
     public int hashCode() {
-        long j = this.f1569id;
+        long j = this.f1564id;
         long j2 = this.channelId;
         int i = ((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         User user = this.author;
@@ -369,81 +250,63 @@ public final class Message {
         GuildMember guildMember = this.member;
         int hashCode29 = (hashCode28 + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
         Boolean bool4 = this.hit;
-        int hashCode30 = (hashCode29 + (bool4 != null ? bool4.hashCode() : 0)) * 31;
-        boolean z2 = this.hasLocalUploads;
-        if (z2) {
-            z2 = true;
+        if (bool4 != null) {
+            i2 = bool4.hashCode();
         }
-        int i3 = z2 ? 1 : 0;
-        int i4 = z2 ? 1 : 0;
-        int i5 = z2 ? 1 : 0;
-        int i6 = (hashCode30 + i3) * 31;
-        MessageAllowedMentions messageAllowedMentions = this.allowedMentions;
-        int hashCode31 = (i6 + (messageAllowedMentions != null ? messageAllowedMentions.hashCode() : 0)) * 31;
-        Integer num2 = this.numRetries;
-        int hashCode32 = (hashCode31 + (num2 != null ? num2.hashCode() : 0)) * 31;
-        Long l5 = this.lastManualAttemptTimestamp;
-        int hashCode33 = (hashCode32 + (l5 != null ? l5.hashCode() : 0)) * 31;
-        Long l6 = this.initialAttemptTimestamp;
-        int hashCode34 = (hashCode33 + (l6 != null ? l6.hashCode() : 0)) * 31;
-        List<LocalAttachment> list9 = this.localAttachments;
-        if (list9 != null) {
-            i2 = list9.hashCode();
-        }
-        return hashCode34 + i2;
+        return hashCode29 + i2;
     }
 
-    public final long i() {
-        return this.channelId;
-    }
-
-    public final List<Component> j() {
-        return this.components;
-    }
-
-    public final String k() {
+    public final String i() {
         return this.content;
     }
 
-    public final UtcDateTime l() {
+    public final UtcDateTime j() {
         return this.editedTimestamp;
     }
 
-    public final List<MessageEmbed> m() {
+    public final List<MessageEmbed> k() {
         return this.embeds;
     }
 
-    public final Long n() {
+    public final Long l() {
         return this.flags;
     }
 
-    public final Long o() {
+    public final Long m() {
         return this.guildId;
     }
 
-    public final boolean p() {
-        return this.hasLocalUploads;
-    }
-
-    public final Boolean q() {
+    public final Boolean n() {
         return this.hit;
     }
 
-    public final long r() {
-        return this.f1569id;
+    public final long o() {
+        return this.f1564id;
     }
 
-    public final Long s() {
-        return this.initialAttemptTimestamp;
-    }
-
-    public final Interaction t() {
+    public final Interaction p() {
         return this.interaction;
     }
 
+    public final GuildMember q() {
+        return this.member;
+    }
+
+    public final Boolean r() {
+        return this.mentionEveryone;
+    }
+
+    public final List<Long> s() {
+        return this.mentionRoles;
+    }
+
+    public final List<User> t() {
+        return this.mentions;
+    }
+
     public String toString() {
         StringBuilder L = a.L("Message(id=");
-        L.append(this.f1569id);
+        L.append(this.f1564id);
         L.append(", channelId=");
         L.append(this.channelId);
         L.append(", author=");
@@ -506,41 +369,31 @@ public final class Message {
         L.append(this.member);
         L.append(", hit=");
         L.append(this.hit);
-        L.append(", hasLocalUploads=");
-        L.append(this.hasLocalUploads);
-        L.append(", allowedMentions=");
-        L.append(this.allowedMentions);
-        L.append(", numRetries=");
-        L.append(this.numRetries);
-        L.append(", lastManualAttemptTimestamp=");
-        L.append(this.lastManualAttemptTimestamp);
-        L.append(", initialAttemptTimestamp=");
-        L.append(this.initialAttemptTimestamp);
-        L.append(", localAttachments=");
-        return a.E(L, this.localAttachments, ")");
+        L.append(")");
+        return L.toString();
     }
 
-    public final Long u() {
-        return this.lastManualAttemptTimestamp;
+    public final MessageReference u() {
+        return this.messageReference;
     }
 
-    public final List<LocalAttachment> v() {
-        return this.localAttachments;
+    public final String v() {
+        return this.nonce;
     }
 
-    public final GuildMember w() {
-        return this.member;
+    public final Boolean w() {
+        return this.pinned;
     }
 
-    public final Boolean x() {
-        return this.mentionEveryone;
+    public final List<MessageReaction> x() {
+        return this.reactions;
     }
 
-    public final List<Long> y() {
-        return this.mentionRoles;
+    public final Message y() {
+        return this.referencedMessage;
     }
 
-    public final List<User> z() {
-        return this.mentions;
+    public final List<StickerPartial> z() {
+        return this.stickerItems;
     }
 }
diff --git a/app/src/main/java/com/discord/api/message/activity/MessageActivityTypeTypeAdapter.java b/app/src/main/java/com/discord/api/message/activity/MessageActivityTypeTypeAdapter.java
index 4495d8d542..7846d3963c 100644
--- a/app/src/main/java/com/discord/api/message/activity/MessageActivityTypeTypeAdapter.java
+++ b/app/src/main/java/com/discord/api/message/activity/MessageActivityTypeTypeAdapter.java
@@ -11,7 +11,7 @@ public final class MessageActivityTypeTypeAdapter extends TypeAdapter<MessageAct
     @Override // com.google.gson.TypeAdapter
     public MessageActivityType read(JsonReader jsonReader) {
         m.checkNotNullParameter(jsonReader, "in");
-        return MessageActivityType.Companion.a(AnimatableValueParser.L1(jsonReader));
+        return MessageActivityType.Companion.a(AnimatableValueParser.N1(jsonReader));
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */
diff --git a/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java b/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java
index a5fde27220..ce2354edab 100644
--- a/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java
+++ b/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java
@@ -15,7 +15,7 @@ public final class MessageAttachment {
     private final Integer height;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1570id;
+    private final long f1565id;
     private final String proxyUrl;
     private final long size;
     private final String url;
@@ -93,7 +93,7 @@ public final class MessageAttachment {
             return false;
         }
         MessageAttachment messageAttachment = (MessageAttachment) obj;
-        return m.areEqual(this.url, messageAttachment.url) && this.size == messageAttachment.size && this.f1570id == messageAttachment.f1570id && m.areEqual(this.proxyUrl, messageAttachment.proxyUrl) && m.areEqual(this.filename, messageAttachment.filename) && m.areEqual(this.width, messageAttachment.width) && m.areEqual(this.height, messageAttachment.height);
+        return m.areEqual(this.url, messageAttachment.url) && this.size == messageAttachment.size && this.f1565id == messageAttachment.f1565id && m.areEqual(this.proxyUrl, messageAttachment.proxyUrl) && m.areEqual(this.filename, messageAttachment.filename) && m.areEqual(this.width, messageAttachment.width) && m.areEqual(this.height, messageAttachment.height);
     }
 
     public final String f() {
@@ -113,7 +113,7 @@ public final class MessageAttachment {
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
         long j = this.size;
-        long j2 = this.f1570id;
+        long j2 = this.f1565id;
         int i2 = ((((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         String str2 = this.proxyUrl;
         int hashCode2 = (i2 + (str2 != null ? str2.hashCode() : 0)) * 31;
@@ -134,7 +134,7 @@ public final class MessageAttachment {
         L.append(", size=");
         L.append(this.size);
         L.append(", id=");
-        L.append(this.f1570id);
+        L.append(this.f1565id);
         L.append(", proxyUrl=");
         L.append(this.proxyUrl);
         L.append(", filename=");
diff --git a/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java b/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java
index 82dc17c606..7c1eb3aee7 100644
--- a/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java
+++ b/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java
@@ -8,13 +8,13 @@ public final class MessageReaction {
     private final MessageReactionEmoji emoji;
 
     /* renamed from: me  reason: collision with root package name */
-    private final boolean f1571me;
+    private final boolean f1566me;
 
     public MessageReaction(int i, MessageReactionEmoji messageReactionEmoji, boolean z2) {
         m.checkNotNullParameter(messageReactionEmoji, "emoji");
         this.count = i;
         this.emoji = messageReactionEmoji;
-        this.f1571me = z2;
+        this.f1566me = z2;
     }
 
     public final int a() {
@@ -26,7 +26,7 @@ public final class MessageReaction {
     }
 
     public final boolean c() {
-        return this.f1571me;
+        return this.f1566me;
     }
 
     public boolean equals(Object obj) {
@@ -37,14 +37,14 @@ public final class MessageReaction {
             return false;
         }
         MessageReaction messageReaction = (MessageReaction) obj;
-        return this.count == messageReaction.count && m.areEqual(this.emoji, messageReaction.emoji) && this.f1571me == messageReaction.f1571me;
+        return this.count == messageReaction.count && m.areEqual(this.emoji, messageReaction.emoji) && this.f1566me == messageReaction.f1566me;
     }
 
     public int hashCode() {
         int i = this.count * 31;
         MessageReactionEmoji messageReactionEmoji = this.emoji;
         int hashCode = (i + (messageReactionEmoji != null ? messageReactionEmoji.hashCode() : 0)) * 31;
-        boolean z2 = this.f1571me;
+        boolean z2 = this.f1566me;
         if (z2) {
             z2 = true;
         }
@@ -60,6 +60,6 @@ public final class MessageReaction {
         L.append(", emoji=");
         L.append(this.emoji);
         L.append(", me=");
-        return a.G(L, this.f1571me, ")");
+        return a.G(L, this.f1566me, ")");
     }
 }
diff --git a/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java b/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java
index 63df974ba0..8246bd352f 100644
--- a/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java
+++ b/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java
@@ -7,7 +7,7 @@ public final class MessageReactionEmoji {
     private final boolean animated;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f1572id;
+    private final String f1567id;
     private final String name;
 
     public final boolean a() {
@@ -15,11 +15,11 @@ public final class MessageReactionEmoji {
     }
 
     public final String b() {
-        return this.f1572id;
+        return this.f1567id;
     }
 
     public final String c() {
-        String str = this.f1572id;
+        String str = this.f1567id;
         if (str != null) {
             return str;
         }
@@ -33,7 +33,7 @@ public final class MessageReactionEmoji {
     }
 
     public final boolean e() {
-        return this.f1572id != null;
+        return this.f1567id != null;
     }
 
     public boolean equals(Object obj) {
@@ -44,11 +44,11 @@ public final class MessageReactionEmoji {
             return false;
         }
         MessageReactionEmoji messageReactionEmoji = (MessageReactionEmoji) obj;
-        return m.areEqual(this.f1572id, messageReactionEmoji.f1572id) && m.areEqual(this.name, messageReactionEmoji.name) && this.animated == messageReactionEmoji.animated;
+        return m.areEqual(this.f1567id, messageReactionEmoji.f1567id) && m.areEqual(this.name, messageReactionEmoji.name) && this.animated == messageReactionEmoji.animated;
     }
 
     public int hashCode() {
-        String str = this.f1572id;
+        String str = this.f1567id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -68,7 +68,7 @@ public final class MessageReactionEmoji {
 
     public String toString() {
         StringBuilder L = a.L("MessageReactionEmoji(id=");
-        L.append(this.f1572id);
+        L.append(this.f1567id);
         L.append(", name=");
         L.append(this.name);
         L.append(", animated=");
diff --git a/app/src/main/java/com/discord/api/permission/Permission.java b/app/src/main/java/com/discord/api/permission/Permission.java
index 7fb70feea0..19404cb4b2 100644
--- a/app/src/main/java/com/discord/api/permission/Permission.java
+++ b/app/src/main/java/com/discord/api/permission/Permission.java
@@ -17,7 +17,7 @@ public final class Permission {
     public static final long KICK_MEMBERS = 2;
     public static final long MANAGEMENT_PERMISSIONS = 10615783486L;
     public static final long MANAGE_CHANNELS = 16;
-    public static final long MANAGE_EMOJIS = 1073741824;
+    public static final long MANAGE_EMOJIS_AND_STICKERS = 1073741824;
     public static final long MANAGE_EVENTS = 8589934592L;
     public static final long MANAGE_GUILD = 32;
     public static final long MANAGE_MESSAGES = 8192;
diff --git a/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java b/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java
index 830e3ce56f..98ab828498 100644
--- a/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java
+++ b/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java
@@ -8,7 +8,7 @@ public final class PermissionOverwrite {
     private final long deny;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1573id;
+    private final long f1568id;
     private final Type type;
 
     /* compiled from: PermissionOverwrite.kt */
@@ -19,14 +19,14 @@ public final class PermissionOverwrite {
 
     public PermissionOverwrite(long j, Type type, long j2, long j3) {
         m.checkNotNullParameter(type, "type");
-        this.f1573id = j;
+        this.f1568id = j;
         this.type = type;
         this.allow = j2;
         this.deny = j3;
     }
 
     public static PermissionOverwrite b(PermissionOverwrite permissionOverwrite, long j, Type type, long j2, long j3, int i) {
-        long j4 = (i & 1) != 0 ? permissionOverwrite.f1573id : j;
+        long j4 = (i & 1) != 0 ? permissionOverwrite.f1568id : j;
         Type type2 = (i & 2) != 0 ? permissionOverwrite.type : null;
         long j5 = (i & 4) != 0 ? permissionOverwrite.allow : j2;
         long j6 = (i & 8) != 0 ? permissionOverwrite.deny : j3;
@@ -35,7 +35,7 @@ public final class PermissionOverwrite {
     }
 
     public final long a() {
-        return this.f1573id;
+        return this.f1568id;
     }
 
     public final long c() {
@@ -47,7 +47,7 @@ public final class PermissionOverwrite {
     }
 
     public final long e() {
-        return this.f1573id;
+        return this.f1568id;
     }
 
     public boolean equals(Object obj) {
@@ -58,7 +58,7 @@ public final class PermissionOverwrite {
             return false;
         }
         PermissionOverwrite permissionOverwrite = (PermissionOverwrite) obj;
-        return this.f1573id == permissionOverwrite.f1573id && m.areEqual(this.type, permissionOverwrite.type) && this.allow == permissionOverwrite.allow && this.deny == permissionOverwrite.deny;
+        return this.f1568id == permissionOverwrite.f1568id && m.areEqual(this.type, permissionOverwrite.type) && this.allow == permissionOverwrite.allow && this.deny == permissionOverwrite.deny;
     }
 
     public final Type f() {
@@ -66,7 +66,7 @@ public final class PermissionOverwrite {
     }
 
     public int hashCode() {
-        long j = this.f1573id;
+        long j = this.f1568id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         Type type = this.type;
         int hashCode = type != null ? type.hashCode() : 0;
@@ -77,7 +77,7 @@ public final class PermissionOverwrite {
 
     public String toString() {
         StringBuilder L = a.L("PermissionOverwrite(id=");
-        L.append(this.f1573id);
+        L.append(this.f1568id);
         L.append(", type=");
         L.append(this.type);
         L.append(", allow=");
diff --git a/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java b/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java
index 9390372c48..726347b1aa 100644
--- a/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java
+++ b/app/src/main/java/com/discord/api/premium/ClaimedOutboundPromotion.java
@@ -3,26 +3,15 @@ package com.discord.api.premium;
 import c.d.b.a.a;
 import com.discord.api.utcdatetime.UtcDateTime;
 import d0.z.d.m;
-import java.util.concurrent.TimeUnit;
 /* compiled from: ClaimedOutboundPromotion.kt */
 public final class ClaimedOutboundPromotion {
     private final UtcDateTime claimedAt;
     private final String code;
     private final OutboundPromotion promotion;
     private final UtcDateTime redeemByDate;
+    private final String redemptionLink;
     private final long userId;
 
-    public ClaimedOutboundPromotion(String str, long j, UtcDateTime utcDateTime, OutboundPromotion outboundPromotion) {
-        m.checkNotNullParameter(str, "code");
-        m.checkNotNullParameter(utcDateTime, "claimedAt");
-        m.checkNotNullParameter(outboundPromotion, "promotion");
-        this.code = str;
-        this.userId = j;
-        this.claimedAt = utcDateTime;
-        this.promotion = outboundPromotion;
-        this.redeemByDate = new UtcDateTime(TimeUnit.DAYS.toMillis(30) + outboundPromotion.a().f());
-    }
-
     public final String a() {
         return this.code;
     }
@@ -35,6 +24,10 @@ public final class ClaimedOutboundPromotion {
         return this.redeemByDate;
     }
 
+    public final String d() {
+        return this.redemptionLink;
+    }
+
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
diff --git a/app/src/main/java/com/discord/api/premium/OutboundPromotion.java b/app/src/main/java/com/discord/api/premium/OutboundPromotion.java
index e61517b390..e7e0b7b5f4 100644
--- a/app/src/main/java/com/discord/api/premium/OutboundPromotion.java
+++ b/app/src/main/java/com/discord/api/premium/OutboundPromotion.java
@@ -8,34 +8,19 @@ public final class OutboundPromotion {
     private final UtcDateTime endDate;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1574id;
+    private final long f1569id;
     private final String outboundRedemptionModalBody;
     private final String outboundRedemptionPageLink;
     private final String outboundRedemptionUrlFormat;
     private final String outboundTermsAndConditions;
     private final String outboundTitle;
 
-    public OutboundPromotion(long j, UtcDateTime utcDateTime, String str, String str2, String str3, String str4, String str5) {
-        m.checkNotNullParameter(utcDateTime, "endDate");
-        m.checkNotNullParameter(str, "outboundTitle");
-        m.checkNotNullParameter(str2, "outboundRedemptionModalBody");
-        m.checkNotNullParameter(str3, "outboundRedemptionPageLink");
-        m.checkNotNullParameter(str5, "outboundTermsAndConditions");
-        this.f1574id = j;
-        this.endDate = utcDateTime;
-        this.outboundTitle = str;
-        this.outboundRedemptionModalBody = str2;
-        this.outboundRedemptionPageLink = str3;
-        this.outboundRedemptionUrlFormat = str4;
-        this.outboundTermsAndConditions = str5;
-    }
-
     public final UtcDateTime a() {
         return this.endDate;
     }
 
     public final long b() {
-        return this.f1574id;
+        return this.f1569id;
     }
 
     public final String c() {
@@ -58,7 +43,7 @@ public final class OutboundPromotion {
             return false;
         }
         OutboundPromotion outboundPromotion = (OutboundPromotion) obj;
-        return this.f1574id == outboundPromotion.f1574id && m.areEqual(this.endDate, outboundPromotion.endDate) && m.areEqual(this.outboundTitle, outboundPromotion.outboundTitle) && m.areEqual(this.outboundRedemptionModalBody, outboundPromotion.outboundRedemptionModalBody) && m.areEqual(this.outboundRedemptionPageLink, outboundPromotion.outboundRedemptionPageLink) && m.areEqual(this.outboundRedemptionUrlFormat, outboundPromotion.outboundRedemptionUrlFormat) && m.areEqual(this.outboundTermsAndConditions, outboundPromotion.outboundTermsAndConditions);
+        return this.f1569id == outboundPromotion.f1569id && m.areEqual(this.endDate, outboundPromotion.endDate) && m.areEqual(this.outboundTitle, outboundPromotion.outboundTitle) && m.areEqual(this.outboundRedemptionModalBody, outboundPromotion.outboundRedemptionModalBody) && m.areEqual(this.outboundRedemptionPageLink, outboundPromotion.outboundRedemptionPageLink) && m.areEqual(this.outboundRedemptionUrlFormat, outboundPromotion.outboundRedemptionUrlFormat) && m.areEqual(this.outboundTermsAndConditions, outboundPromotion.outboundTermsAndConditions);
     }
 
     public final String f() {
@@ -66,7 +51,7 @@ public final class OutboundPromotion {
     }
 
     public int hashCode() {
-        long j = this.f1574id;
+        long j = this.f1569id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         UtcDateTime utcDateTime = this.endDate;
         int i2 = 0;
@@ -88,7 +73,7 @@ public final class OutboundPromotion {
 
     public String toString() {
         StringBuilder L = a.L("OutboundPromotion(id=");
-        L.append(this.f1574id);
+        L.append(this.f1569id);
         L.append(", endDate=");
         L.append(this.endDate);
         L.append(", outboundTitle=");
diff --git a/app/src/main/java/com/discord/api/premium/PremiumTierTypeAdapter.java b/app/src/main/java/com/discord/api/premium/PremiumTierTypeAdapter.java
index 011293d2b8..f11adf3461 100644
--- a/app/src/main/java/com/discord/api/premium/PremiumTierTypeAdapter.java
+++ b/app/src/main/java/com/discord/api/premium/PremiumTierTypeAdapter.java
@@ -27,8 +27,8 @@ public final class PremiumTierTypeAdapter extends TypeAdapter<PremiumTier> {
     @Override // com.google.gson.TypeAdapter
     public PremiumTier read(JsonReader jsonReader) {
         m.checkNotNullParameter(jsonReader, "in");
-        Integer L1 = AnimatableValueParser.L1(jsonReader);
-        return (L1 != null && L1.intValue() == 0) ? PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY : (L1 != null && L1.intValue() == 1) ? PremiumTier.TIER_1 : (L1 != null && L1.intValue() == 2) ? PremiumTier.TIER_2 : PremiumTier.NONE;
+        Integer N1 = AnimatableValueParser.N1(jsonReader);
+        return (N1 != null && N1.intValue() == 0) ? PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY : (N1 != null && N1.intValue() == 1) ? PremiumTier.TIER_1 : (N1 != null && N1.intValue() == 2) ? PremiumTier.TIER_2 : PremiumTier.NONE;
     }
 
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */
diff --git a/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java b/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java
index dc7a340b1d..9fedb37b1f 100644
--- a/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java
+++ b/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java
@@ -6,13 +6,13 @@ import d0.z.d.m;
 public final class SubscriptionPlan {
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1575id;
+    private final long f1570id;
     private final SubscriptionInterval interval;
     private final int intervalCount;
     private final String name;
 
     public final long a() {
-        return this.f1575id;
+        return this.f1570id;
     }
 
     public final SubscriptionInterval b() {
@@ -31,11 +31,11 @@ public final class SubscriptionPlan {
             return false;
         }
         SubscriptionPlan subscriptionPlan = (SubscriptionPlan) obj;
-        return this.f1575id == subscriptionPlan.f1575id && this.intervalCount == subscriptionPlan.intervalCount && m.areEqual(this.interval, subscriptionPlan.interval) && m.areEqual(this.name, subscriptionPlan.name);
+        return this.f1570id == subscriptionPlan.f1570id && this.intervalCount == subscriptionPlan.intervalCount && m.areEqual(this.interval, subscriptionPlan.interval) && m.areEqual(this.name, subscriptionPlan.name);
     }
 
     public int hashCode() {
-        long j = this.f1575id;
+        long j = this.f1570id;
         int i = ((((int) (j ^ (j >>> 32))) * 31) + this.intervalCount) * 31;
         SubscriptionInterval subscriptionInterval = this.interval;
         int i2 = 0;
@@ -49,7 +49,7 @@ public final class SubscriptionPlan {
 
     public String toString() {
         StringBuilder L = a.L("SubscriptionPlan(id=");
-        L.append(this.f1575id);
+        L.append(this.f1570id);
         L.append(", intervalCount=");
         L.append(this.intervalCount);
         L.append(", interval=");
diff --git a/app/src/main/java/com/discord/api/report/ReportNode.java b/app/src/main/java/com/discord/api/report/ReportNode.java
index ca98abd37e..3d2726021c 100644
--- a/app/src/main/java/com/discord/api/report/ReportNode.java
+++ b/app/src/main/java/com/discord/api/report/ReportNode.java
@@ -12,7 +12,7 @@ public final class ReportNode {
     private final String header;
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f1576id;
+    private final int f1571id;
     private final String info;
     private final String menu_name;
     private final String subheader;
@@ -34,7 +34,7 @@ public final class ReportNode {
     }
 
     public final int e() {
-        return this.f1576id;
+        return this.f1571id;
     }
 
     public boolean equals(Object obj) {
@@ -45,7 +45,7 @@ public final class ReportNode {
             return false;
         }
         ReportNode reportNode = (ReportNode) obj;
-        return this.f1576id == reportNode.f1576id && m.areEqual(this.menu_name, reportNode.menu_name) && m.areEqual(this.header, reportNode.header) && m.areEqual(this.subheader, reportNode.subheader) && m.areEqual(this.info, reportNode.info) && m.areEqual(this.description, reportNode.description) && m.areEqual(this.children, reportNode.children) && m.areEqual(this.elements, reportNode.elements) && m.areEqual(this.button, reportNode.button);
+        return this.f1571id == reportNode.f1571id && m.areEqual(this.menu_name, reportNode.menu_name) && m.areEqual(this.header, reportNode.header) && m.areEqual(this.subheader, reportNode.subheader) && m.areEqual(this.info, reportNode.info) && m.areEqual(this.description, reportNode.description) && m.areEqual(this.children, reportNode.children) && m.areEqual(this.elements, reportNode.elements) && m.areEqual(this.button, reportNode.button);
     }
 
     public final String f() {
@@ -57,7 +57,7 @@ public final class ReportNode {
     }
 
     public int hashCode() {
-        int i = this.f1576id * 31;
+        int i = this.f1571id * 31;
         String str = this.menu_name;
         int i2 = 0;
         int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31;
@@ -82,7 +82,7 @@ public final class ReportNode {
 
     public String toString() {
         StringBuilder L = a.L("ReportNode(id=");
-        L.append(this.f1576id);
+        L.append(this.f1571id);
         L.append(", menu_name=");
         L.append(this.menu_name);
         L.append(", header=");
diff --git a/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java b/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java
index 67a94d28e3..6ede10e191 100644
--- a/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java
+++ b/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java
@@ -14,7 +14,7 @@ public final class ReportSubmissionBody {
     private final Long guild_id;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1577id;
+    private final long f1572id;
     private final String language;
     private final Long message_id;
     private final String name;
@@ -39,7 +39,7 @@ public final class ReportSubmissionBody {
         m.checkNotNullParameter(str4, "version");
         m.checkNotNullParameter(list, "breadcrumbs");
         m.checkNotNullParameter(map, "elements");
-        this.f1577id = j;
+        this.f1572id = j;
         this.message_id = l;
         this.channel_id = j2;
         this.guild_id = l2;
@@ -59,11 +59,11 @@ public final class ReportSubmissionBody {
             return false;
         }
         ReportSubmissionBody reportSubmissionBody = (ReportSubmissionBody) obj;
-        return this.f1577id == reportSubmissionBody.f1577id && m.areEqual(this.message_id, reportSubmissionBody.message_id) && this.channel_id == reportSubmissionBody.channel_id && m.areEqual(this.guild_id, reportSubmissionBody.guild_id) && m.areEqual(this.language, reportSubmissionBody.language) && m.areEqual(this.variant, reportSubmissionBody.variant) && m.areEqual(this.name, reportSubmissionBody.name) && m.areEqual(this.version, reportSubmissionBody.version) && m.areEqual(this.breadcrumbs, reportSubmissionBody.breadcrumbs) && m.areEqual(this.elements, reportSubmissionBody.elements);
+        return this.f1572id == reportSubmissionBody.f1572id && m.areEqual(this.message_id, reportSubmissionBody.message_id) && this.channel_id == reportSubmissionBody.channel_id && m.areEqual(this.guild_id, reportSubmissionBody.guild_id) && m.areEqual(this.language, reportSubmissionBody.language) && m.areEqual(this.variant, reportSubmissionBody.variant) && m.areEqual(this.name, reportSubmissionBody.name) && m.areEqual(this.version, reportSubmissionBody.version) && m.areEqual(this.breadcrumbs, reportSubmissionBody.breadcrumbs) && m.areEqual(this.elements, reportSubmissionBody.elements);
     }
 
     public int hashCode() {
-        long j = this.f1577id;
+        long j = this.f1572id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         Long l = this.message_id;
         int i2 = 0;
@@ -91,7 +91,7 @@ public final class ReportSubmissionBody {
 
     public String toString() {
         StringBuilder L = a.L("ReportSubmissionBody(id=");
-        L.append(this.f1577id);
+        L.append(this.f1572id);
         L.append(", message_id=");
         L.append(this.message_id);
         L.append(", channel_id=");
diff --git a/app/src/main/java/com/discord/api/role/GuildRole.java b/app/src/main/java/com/discord/api/role/GuildRole.java
index c8d6e4e996..4123938123 100644
--- a/app/src/main/java/com/discord/api/role/GuildRole.java
+++ b/app/src/main/java/com/discord/api/role/GuildRole.java
@@ -9,7 +9,7 @@ public final class GuildRole implements Serializable {
     private final boolean hoist;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1578id;
+    private final long f1573id;
     private final boolean managed;
     private final boolean mentionable;
     private final String name;
@@ -17,7 +17,7 @@ public final class GuildRole implements Serializable {
     private final int position;
 
     public final long a() {
-        return this.f1578id;
+        return this.f1573id;
     }
 
     public final int b() {
@@ -45,7 +45,7 @@ public final class GuildRole implements Serializable {
             return false;
         }
         GuildRole guildRole = (GuildRole) obj;
-        return this.position == guildRole.position && m.areEqual(this.name, guildRole.name) && this.f1578id == guildRole.f1578id && this.color == guildRole.color && this.hoist == guildRole.hoist && this.permissions == guildRole.permissions && this.mentionable == guildRole.mentionable && this.managed == guildRole.managed;
+        return this.position == guildRole.position && m.areEqual(this.name, guildRole.name) && this.f1573id == guildRole.f1573id && this.color == guildRole.color && this.hoist == guildRole.hoist && this.permissions == guildRole.permissions && this.mentionable == guildRole.mentionable && this.managed == guildRole.managed;
     }
 
     public final String f() {
@@ -57,7 +57,7 @@ public final class GuildRole implements Serializable {
     }
 
     public final long getId() {
-        return this.f1578id;
+        return this.f1573id;
     }
 
     public final int h() {
@@ -69,7 +69,7 @@ public final class GuildRole implements Serializable {
         int i = this.position * 31;
         String str = this.name;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j = this.f1578id;
+        long j = this.f1573id;
         int i2 = (((((i + hashCode) * 31) + ((int) (j ^ (j >>> 32)))) * 31) + this.color) * 31;
         boolean z2 = this.hoist;
         int i3 = 1;
@@ -103,7 +103,7 @@ public final class GuildRole implements Serializable {
         L.append(", name=");
         L.append(this.name);
         L.append(", id=");
-        L.append(this.f1578id);
+        L.append(this.f1573id);
         L.append(", color=");
         L.append(this.color);
         L.append(", hoist=");
diff --git a/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java b/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java
index 2558e57e41..149c043bdc 100644
--- a/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java
+++ b/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java
@@ -10,7 +10,7 @@ public final class RecommendedStageInstanceGuild {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1579id;
+    private final long f1574id;
     private final String name;
 
     public final Set<GuildFeature> a() {
@@ -22,7 +22,7 @@ public final class RecommendedStageInstanceGuild {
     }
 
     public final long c() {
-        return this.f1579id;
+        return this.f1574id;
     }
 
     public final String d() {
@@ -37,11 +37,11 @@ public final class RecommendedStageInstanceGuild {
             return false;
         }
         RecommendedStageInstanceGuild recommendedStageInstanceGuild = (RecommendedStageInstanceGuild) obj;
-        return this.f1579id == recommendedStageInstanceGuild.f1579id && m.areEqual(this.name, recommendedStageInstanceGuild.name) && m.areEqual(this.icon, recommendedStageInstanceGuild.icon) && m.areEqual(this.features, recommendedStageInstanceGuild.features);
+        return this.f1574id == recommendedStageInstanceGuild.f1574id && m.areEqual(this.name, recommendedStageInstanceGuild.name) && m.areEqual(this.icon, recommendedStageInstanceGuild.icon) && m.areEqual(this.features, recommendedStageInstanceGuild.features);
     }
 
     public int hashCode() {
-        long j = this.f1579id;
+        long j = this.f1574id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.name;
         int i2 = 0;
@@ -57,7 +57,7 @@ public final class RecommendedStageInstanceGuild {
 
     public String toString() {
         StringBuilder L = a.L("RecommendedStageInstanceGuild(id=");
-        L.append(this.f1579id);
+        L.append(this.f1574id);
         L.append(", name=");
         L.append(this.name);
         L.append(", icon=");
diff --git a/app/src/main/java/com/discord/api/stageinstance/StageInstance.java b/app/src/main/java/com/discord/api/stageinstance/StageInstance.java
index b98ca7b7f0..4a7d2b0cde 100644
--- a/app/src/main/java/com/discord/api/stageinstance/StageInstance.java
+++ b/app/src/main/java/com/discord/api/stageinstance/StageInstance.java
@@ -8,7 +8,7 @@ public final class StageInstance {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1580id;
+    private final long f1575id;
     private final String inviteCode;
     private final StageInstancePrivacyLevel privacyLevel;
     private final String topic;
@@ -22,7 +22,7 @@ public final class StageInstance {
     }
 
     public final long c() {
-        return this.f1580id;
+        return this.f1575id;
     }
 
     public final String d() {
@@ -41,7 +41,7 @@ public final class StageInstance {
             return false;
         }
         StageInstance stageInstance = (StageInstance) obj;
-        return this.f1580id == stageInstance.f1580id && this.guildId == stageInstance.guildId && this.channelId == stageInstance.channelId && m.areEqual(this.topic, stageInstance.topic) && m.areEqual(this.privacyLevel, stageInstance.privacyLevel) && m.areEqual(this.inviteCode, stageInstance.inviteCode);
+        return this.f1575id == stageInstance.f1575id && this.guildId == stageInstance.guildId && this.channelId == stageInstance.channelId && m.areEqual(this.topic, stageInstance.topic) && m.areEqual(this.privacyLevel, stageInstance.privacyLevel) && m.areEqual(this.inviteCode, stageInstance.inviteCode);
     }
 
     public final String f() {
@@ -49,7 +49,7 @@ public final class StageInstance {
     }
 
     public int hashCode() {
-        long j = this.f1580id;
+        long j = this.f1575id;
         long j2 = this.guildId;
         long j3 = this.channelId;
         int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31;
@@ -67,7 +67,7 @@ public final class StageInstance {
 
     public String toString() {
         StringBuilder L = a.L("StageInstance(id=");
-        L.append(this.f1580id);
+        L.append(this.f1575id);
         L.append(", guildId=");
         L.append(this.guildId);
         L.append(", channelId=");
diff --git a/app/src/main/java/com/discord/api/sticker/GuildStickerUpdate.java b/app/src/main/java/com/discord/api/sticker/GuildStickersUpdate.java
similarity index 73%
rename from app/src/main/java/com/discord/api/sticker/GuildStickerUpdate.java
rename to app/src/main/java/com/discord/api/sticker/GuildStickersUpdate.java
index bf9f820693..eb3331b91a 100644
--- a/app/src/main/java/com/discord/api/sticker/GuildStickerUpdate.java
+++ b/app/src/main/java/com/discord/api/sticker/GuildStickersUpdate.java
@@ -4,8 +4,8 @@ import c.d.b.a.a;
 import com.discord.api.guildhash.GuildHashes;
 import d0.z.d.m;
 import java.util.List;
-/* compiled from: GuildStickerUpdate.kt */
-public final class GuildStickerUpdate {
+/* compiled from: GuildStickersUpdate.kt */
+public final class GuildStickersUpdate {
     private final GuildHashes guildHashes;
     private final long guildId;
     private final List<Sticker> stickers;
@@ -26,11 +26,11 @@ public final class GuildStickerUpdate {
         if (this == obj) {
             return true;
         }
-        if (!(obj instanceof GuildStickerUpdate)) {
+        if (!(obj instanceof GuildStickersUpdate)) {
             return false;
         }
-        GuildStickerUpdate guildStickerUpdate = (GuildStickerUpdate) obj;
-        return this.guildId == guildStickerUpdate.guildId && m.areEqual(this.stickers, guildStickerUpdate.stickers) && m.areEqual(this.guildHashes, guildStickerUpdate.guildHashes);
+        GuildStickersUpdate guildStickersUpdate = (GuildStickersUpdate) obj;
+        return this.guildId == guildStickersUpdate.guildId && m.areEqual(this.stickers, guildStickersUpdate.stickers) && m.areEqual(this.guildHashes, guildStickersUpdate.guildHashes);
     }
 
     public int hashCode() {
@@ -47,7 +47,7 @@ public final class GuildStickerUpdate {
     }
 
     public String toString() {
-        StringBuilder L = a.L("GuildStickerUpdate(guildId=");
+        StringBuilder L = a.L("GuildStickersUpdate(guildId=");
         L.append(this.guildId);
         L.append(", stickers=");
         L.append(this.stickers);
diff --git a/app/src/main/java/com/discord/api/sticker/Sticker.java b/app/src/main/java/com/discord/api/sticker/Sticker.java
index 12e05d44dd..0a26352600 100644
--- a/app/src/main/java/com/discord/api/sticker/Sticker.java
+++ b/app/src/main/java/com/discord/api/sticker/Sticker.java
@@ -6,12 +6,13 @@ import java.io.Serializable;
 import kotlin.NoWhenBranchMatchedException;
 /* compiled from: Sticker.kt */
 public final class Sticker implements Serializable, BaseSticker {
+    private final Boolean available = null;
     private final String description;
     private final StickerFormatType formatType;
     private final Long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1581id;
+    private final long f1576id;
     private final String name;
     private final Long packId;
     private final String tags;
@@ -31,13 +32,14 @@ public final class Sticker implements Serializable, BaseSticker {
         }
     }
 
-    public Sticker(long j, Long l, Long l2, String str, String str2, StickerFormatType stickerFormatType, String str3, StickerType stickerType) {
+    public Sticker(long j, Long l, Long l2, String str, String str2, StickerFormatType stickerFormatType, String str3, StickerType stickerType, Boolean bool, int i) {
+        int i2 = i & 256;
         m.checkNotNullParameter(str, "name");
         m.checkNotNullParameter(str2, "description");
         m.checkNotNullParameter(stickerFormatType, "formatType");
         m.checkNotNullParameter(str3, "tags");
         m.checkNotNullParameter(stickerType, "type");
-        this.f1581id = j;
+        this.f1576id = j;
         this.packId = l;
         this.guildId = l2;
         this.name = str;
@@ -69,15 +71,15 @@ public final class Sticker implements Serializable, BaseSticker {
 
     @Override // com.discord.api.sticker.BaseSticker
     public long c() {
-        return this.f1581id;
+        return this.f1576id;
     }
 
     public final StickerPartial d() {
-        return new StickerPartial(this.f1581id, this.formatType, this.name);
+        return new StickerPartial(this.f1576id, this.formatType, this.name);
     }
 
-    public final String e() {
-        return this.description;
+    public final Boolean e() {
+        return this.available;
     }
 
     @Override // java.lang.Object
@@ -89,28 +91,28 @@ public final class Sticker implements Serializable, BaseSticker {
             return false;
         }
         Sticker sticker = (Sticker) obj;
-        return this.f1581id == sticker.f1581id && m.areEqual(this.packId, sticker.packId) && m.areEqual(this.guildId, sticker.guildId) && m.areEqual(this.name, sticker.name) && m.areEqual(this.description, sticker.description) && m.areEqual(this.formatType, sticker.formatType) && m.areEqual(this.tags, sticker.tags) && m.areEqual(this.type, sticker.type);
+        return this.f1576id == sticker.f1576id && m.areEqual(this.packId, sticker.packId) && m.areEqual(this.guildId, sticker.guildId) && m.areEqual(this.name, sticker.name) && m.areEqual(this.description, sticker.description) && m.areEqual(this.formatType, sticker.formatType) && m.areEqual(this.tags, sticker.tags) && m.areEqual(this.type, sticker.type) && m.areEqual(this.available, sticker.available);
     }
 
-    public final Long f() {
+    public final String f() {
+        return this.description;
+    }
+
+    public final Long g() {
         return this.guildId;
     }
 
-    public final String g() {
-        return this.name;
-    }
-
     public final long getId() {
-        return this.f1581id;
+        return this.f1576id;
     }
 
-    public final Long h() {
-        return this.packId;
+    public final String h() {
+        return this.name;
     }
 
     @Override // java.lang.Object
     public int hashCode() {
-        long j = this.f1581id;
+        long j = this.f1576id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         Long l = this.packId;
         int i2 = 0;
@@ -126,21 +128,27 @@ public final class Sticker implements Serializable, BaseSticker {
         String str3 = this.tags;
         int hashCode6 = (hashCode5 + (str3 != null ? str3.hashCode() : 0)) * 31;
         StickerType stickerType = this.type;
-        if (stickerType != null) {
-            i2 = stickerType.hashCode();
+        int hashCode7 = (hashCode6 + (stickerType != null ? stickerType.hashCode() : 0)) * 31;
+        Boolean bool = this.available;
+        if (bool != null) {
+            i2 = bool.hashCode();
         }
-        return hashCode6 + i2;
+        return hashCode7 + i2;
     }
 
-    public final String i() {
+    public final Long i() {
+        return this.packId;
+    }
+
+    public final String j() {
         return this.tags;
     }
 
-    public final StickerType j() {
+    public final StickerType k() {
         return this.type;
     }
 
-    public final boolean k() {
+    public final boolean l() {
         StickerFormatType stickerFormatType = this.formatType;
         return stickerFormatType == StickerFormatType.APNG || stickerFormatType == StickerFormatType.LOTTIE;
     }
@@ -148,7 +156,7 @@ public final class Sticker implements Serializable, BaseSticker {
     @Override // java.lang.Object
     public String toString() {
         StringBuilder L = a.L("Sticker(id=");
-        L.append(this.f1581id);
+        L.append(this.f1576id);
         L.append(", packId=");
         L.append(this.packId);
         L.append(", guildId=");
@@ -163,6 +171,8 @@ public final class Sticker implements Serializable, BaseSticker {
         L.append(this.tags);
         L.append(", type=");
         L.append(this.type);
+        L.append(", available=");
+        L.append(this.available);
         L.append(")");
         return L.toString();
     }
diff --git a/app/src/main/java/com/discord/api/sticker/StickerPartial.java b/app/src/main/java/com/discord/api/sticker/StickerPartial.java
index 5b91d3a935..2906ca449e 100644
--- a/app/src/main/java/com/discord/api/sticker/StickerPartial.java
+++ b/app/src/main/java/com/discord/api/sticker/StickerPartial.java
@@ -9,7 +9,7 @@ public final class StickerPartial implements Serializable, BaseSticker {
     private final StickerFormatType formatType;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1582id;
+    private final long f1577id;
     private final String name;
 
     public final /* synthetic */ class WhenMappings {
@@ -29,7 +29,7 @@ public final class StickerPartial implements Serializable, BaseSticker {
     public StickerPartial(long j, StickerFormatType stickerFormatType, String str) {
         m.checkNotNullParameter(stickerFormatType, "formatType");
         m.checkNotNullParameter(str, "name");
-        this.f1582id = j;
+        this.f1577id = j;
         this.formatType = stickerFormatType;
         this.name = str;
     }
@@ -56,7 +56,7 @@ public final class StickerPartial implements Serializable, BaseSticker {
 
     @Override // com.discord.api.sticker.BaseSticker
     public long c() {
-        return this.f1582id;
+        return this.f1577id;
     }
 
     public final String d() {
@@ -72,16 +72,16 @@ public final class StickerPartial implements Serializable, BaseSticker {
             return false;
         }
         StickerPartial stickerPartial = (StickerPartial) obj;
-        return this.f1582id == stickerPartial.f1582id && m.areEqual(this.formatType, stickerPartial.formatType) && m.areEqual(this.name, stickerPartial.name);
+        return this.f1577id == stickerPartial.f1577id && m.areEqual(this.formatType, stickerPartial.formatType) && m.areEqual(this.name, stickerPartial.name);
     }
 
     public final long getId() {
-        return this.f1582id;
+        return this.f1577id;
     }
 
     @Override // java.lang.Object
     public int hashCode() {
-        long j = this.f1582id;
+        long j = this.f1577id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         StickerFormatType stickerFormatType = this.formatType;
         int i2 = 0;
@@ -96,7 +96,7 @@ public final class StickerPartial implements Serializable, BaseSticker {
     @Override // java.lang.Object
     public String toString() {
         StringBuilder L = a.L("StickerPartial(id=");
-        L.append(this.f1582id);
+        L.append(this.f1577id);
         L.append(", formatType=");
         L.append(this.formatType);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/api/thread/AugmentedThreadMember.java b/app/src/main/java/com/discord/api/thread/AugmentedThreadMember.java
new file mode 100644
index 0000000000..f746b63ac3
--- /dev/null
+++ b/app/src/main/java/com/discord/api/thread/AugmentedThreadMember.java
@@ -0,0 +1,36 @@
+package com.discord.api.thread;
+
+import com.discord.api.guildmember.GuildMember;
+import com.discord.api.presence.Presence;
+import com.discord.api.utcdatetime.UtcDateTime;
+/* compiled from: AugmentedThreadMember.kt */
+public final class AugmentedThreadMember {
+    private final int flags;
+
+    /* renamed from: id  reason: collision with root package name */
+    private final long f1578id;
+    private final UtcDateTime joinTimestamp;
+    private final GuildMember member;
+    private final Presence presence;
+    private final long userId;
+
+    public final int a() {
+        return this.flags;
+    }
+
+    public final UtcDateTime b() {
+        return this.joinTimestamp;
+    }
+
+    public final GuildMember c() {
+        return this.member;
+    }
+
+    public final Presence d() {
+        return this.presence;
+    }
+
+    public final long e() {
+        return this.userId;
+    }
+}
diff --git a/app/src/main/java/com/discord/api/thread/ThreadListMember.java b/app/src/main/java/com/discord/api/thread/ThreadListMember.java
new file mode 100644
index 0000000000..866fdc65d2
--- /dev/null
+++ b/app/src/main/java/com/discord/api/thread/ThreadListMember.java
@@ -0,0 +1,59 @@
+package com.discord.api.thread;
+
+import c.d.b.a.a;
+import com.discord.api.guildmember.GuildMember;
+import com.discord.api.presence.Presence;
+import d0.z.d.m;
+/* compiled from: ThreadListMember.kt */
+public final class ThreadListMember {
+    private final GuildMember member;
+    private final Presence presence;
+    private final long userId;
+
+    public final GuildMember a() {
+        return this.member;
+    }
+
+    public final Presence b() {
+        return this.presence;
+    }
+
+    public final long c() {
+        return this.userId;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof ThreadListMember)) {
+            return false;
+        }
+        ThreadListMember threadListMember = (ThreadListMember) obj;
+        return this.userId == threadListMember.userId && m.areEqual(this.member, threadListMember.member) && m.areEqual(this.presence, threadListMember.presence);
+    }
+
+    public int hashCode() {
+        long j = this.userId;
+        int i = ((int) (j ^ (j >>> 32))) * 31;
+        GuildMember guildMember = this.member;
+        int i2 = 0;
+        int hashCode = (i + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
+        Presence presence = this.presence;
+        if (presence != null) {
+            i2 = presence.hashCode();
+        }
+        return hashCode + i2;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ThreadListMember(userId=");
+        L.append(this.userId);
+        L.append(", member=");
+        L.append(this.member);
+        L.append(", presence=");
+        L.append(this.presence);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/api/thread/ThreadMember.java b/app/src/main/java/com/discord/api/thread/ThreadMember.java
index b68a764c46..52c8ebfdd3 100644
--- a/app/src/main/java/com/discord/api/thread/ThreadMember.java
+++ b/app/src/main/java/com/discord/api/thread/ThreadMember.java
@@ -1,87 +1,37 @@
 package com.discord.api.thread;
 
-import c.d.b.a.a;
 import com.discord.api.utcdatetime.UtcDateTime;
 import d0.z.d.m;
-import java.util.Objects;
 /* compiled from: ThreadMember.kt */
-public final class ThreadMember {
+public class ThreadMember {
     private final int flags;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1583id;
+    private final long f1579id;
     private final UtcDateTime joinTimestamp;
     private final long userId;
 
     public ThreadMember(long j, long j2, int i, UtcDateTime utcDateTime) {
         m.checkNotNullParameter(utcDateTime, "joinTimestamp");
-        this.f1583id = j;
+        this.f1579id = j;
         this.userId = j2;
         this.flags = i;
         this.joinTimestamp = utcDateTime;
     }
 
-    public static ThreadMember a(ThreadMember threadMember, long j, long j2, int i, UtcDateTime utcDateTime, int i2) {
-        if ((i2 & 1) != 0) {
-            j = threadMember.f1583id;
-        }
-        if ((i2 & 2) != 0) {
-            j2 = threadMember.userId;
-        }
-        if ((i2 & 4) != 0) {
-            i = threadMember.flags;
-        }
-        UtcDateTime utcDateTime2 = (i2 & 8) != 0 ? threadMember.joinTimestamp : null;
-        Objects.requireNonNull(threadMember);
-        m.checkNotNullParameter(utcDateTime2, "joinTimestamp");
-        return new ThreadMember(j, j2, i, utcDateTime2);
-    }
-
-    public final int b() {
+    public int a() {
         return this.flags;
     }
 
-    public final long c() {
-        return this.f1583id;
+    public long b() {
+        return this.f1579id;
     }
 
-    public final UtcDateTime d() {
+    public UtcDateTime c() {
         return this.joinTimestamp;
     }
 
-    public final long e() {
+    public long d() {
         return this.userId;
     }
-
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof ThreadMember)) {
-            return false;
-        }
-        ThreadMember threadMember = (ThreadMember) obj;
-        return this.f1583id == threadMember.f1583id && this.userId == threadMember.userId && this.flags == threadMember.flags && m.areEqual(this.joinTimestamp, threadMember.joinTimestamp);
-    }
-
-    public int hashCode() {
-        long j = this.f1583id;
-        long j2 = this.userId;
-        int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.flags) * 31;
-        UtcDateTime utcDateTime = this.joinTimestamp;
-        return i + (utcDateTime != null ? utcDateTime.hashCode() : 0);
-    }
-
-    public String toString() {
-        StringBuilder L = a.L("ThreadMember(id=");
-        L.append(this.f1583id);
-        L.append(", userId=");
-        L.append(this.userId);
-        L.append(", flags=");
-        L.append(this.flags);
-        L.append(", joinTimestamp=");
-        L.append(this.joinTimestamp);
-        L.append(")");
-        return L.toString();
-    }
 }
diff --git a/app/src/main/java/com/discord/api/thread/ThreadMemberListUpdate.java b/app/src/main/java/com/discord/api/thread/ThreadMemberListUpdate.java
new file mode 100644
index 0000000000..ffd58ef496
--- /dev/null
+++ b/app/src/main/java/com/discord/api/thread/ThreadMemberListUpdate.java
@@ -0,0 +1,51 @@
+package com.discord.api.thread;
+
+import c.d.b.a.a;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: ThreadMemberListUpdate.kt */
+public final class ThreadMemberListUpdate {
+    private final long guildId;
+    private final List<ThreadListMember> members;
+    private final long threadId;
+
+    public final long a() {
+        return this.guildId;
+    }
+
+    public final List<ThreadListMember> b() {
+        return this.members;
+    }
+
+    public final long c() {
+        return this.threadId;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof ThreadMemberListUpdate)) {
+            return false;
+        }
+        ThreadMemberListUpdate threadMemberListUpdate = (ThreadMemberListUpdate) obj;
+        return this.guildId == threadMemberListUpdate.guildId && this.threadId == threadMemberListUpdate.threadId && m.areEqual(this.members, threadMemberListUpdate.members);
+    }
+
+    public int hashCode() {
+        long j = this.guildId;
+        long j2 = this.threadId;
+        int i = ((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
+        List<ThreadListMember> list = this.members;
+        return i + (list != null ? list.hashCode() : 0);
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ThreadMemberListUpdate(guildId=");
+        L.append(this.guildId);
+        L.append(", threadId=");
+        L.append(this.threadId);
+        L.append(", members=");
+        return a.E(L, this.members, ")");
+    }
+}
diff --git a/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java b/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java
index d6dcfd3a92..5defb65d5e 100644
--- a/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java
+++ b/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java
@@ -9,7 +9,7 @@ public final class ThreadMemberUpdate {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1584id;
+    private final long f1580id;
     private final UtcDateTime joinTimestamp;
     private final long userId;
 
@@ -22,7 +22,7 @@ public final class ThreadMemberUpdate {
     }
 
     public final long c() {
-        return this.f1584id;
+        return this.f1580id;
     }
 
     public final UtcDateTime d() {
@@ -41,11 +41,11 @@ public final class ThreadMemberUpdate {
             return false;
         }
         ThreadMemberUpdate threadMemberUpdate = (ThreadMemberUpdate) obj;
-        return this.f1584id == threadMemberUpdate.f1584id && this.guildId == threadMemberUpdate.guildId && this.userId == threadMemberUpdate.userId && this.flags == threadMemberUpdate.flags && m.areEqual(this.joinTimestamp, threadMemberUpdate.joinTimestamp);
+        return this.f1580id == threadMemberUpdate.f1580id && this.guildId == threadMemberUpdate.guildId && this.userId == threadMemberUpdate.userId && this.flags == threadMemberUpdate.flags && m.areEqual(this.joinTimestamp, threadMemberUpdate.joinTimestamp);
     }
 
     public int hashCode() {
-        long j = this.f1584id;
+        long j = this.f1580id;
         long j2 = this.guildId;
         long j3 = this.userId;
         int i = ((((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31) + this.flags) * 31;
@@ -55,7 +55,7 @@ public final class ThreadMemberUpdate {
 
     public String toString() {
         StringBuilder L = a.L("ThreadMemberUpdate(id=");
-        L.append(this.f1584id);
+        L.append(this.f1580id);
         L.append(", guildId=");
         L.append(this.guildId);
         L.append(", userId=");
diff --git a/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java b/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java
index 4873626cb6..348f8b3d78 100644
--- a/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java
+++ b/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java
@@ -5,16 +5,16 @@ import d0.z.d.m;
 import java.util.List;
 /* compiled from: ThreadMembersUpdate.kt */
 public final class ThreadMembersUpdate {
-    private final List<ThreadMember> addedMembers;
+    private final List<AugmentedThreadMember> addedMembers;
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1585id;
+    private final long f1581id;
     private final int memberCount;
     private final List<Long> memberIdsPreview;
     private final List<Long> removedMemberIds;
 
-    public final List<ThreadMember> a() {
+    public final List<AugmentedThreadMember> a() {
         return this.addedMembers;
     }
 
@@ -23,7 +23,7 @@ public final class ThreadMembersUpdate {
     }
 
     public final long c() {
-        return this.f1585id;
+        return this.f1581id;
     }
 
     public final List<Long> d() {
@@ -38,11 +38,11 @@ public final class ThreadMembersUpdate {
             return false;
         }
         ThreadMembersUpdate threadMembersUpdate = (ThreadMembersUpdate) obj;
-        return this.f1585id == threadMembersUpdate.f1585id && this.guildId == threadMembersUpdate.guildId && this.memberCount == threadMembersUpdate.memberCount && m.areEqual(this.removedMemberIds, threadMembersUpdate.removedMemberIds) && m.areEqual(this.memberIdsPreview, threadMembersUpdate.memberIdsPreview) && m.areEqual(this.addedMembers, threadMembersUpdate.addedMembers);
+        return this.f1581id == threadMembersUpdate.f1581id && this.guildId == threadMembersUpdate.guildId && this.memberCount == threadMembersUpdate.memberCount && m.areEqual(this.removedMemberIds, threadMembersUpdate.removedMemberIds) && m.areEqual(this.memberIdsPreview, threadMembersUpdate.memberIdsPreview) && m.areEqual(this.addedMembers, threadMembersUpdate.addedMembers);
     }
 
     public int hashCode() {
-        long j = this.f1585id;
+        long j = this.f1581id;
         long j2 = this.guildId;
         int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.memberCount) * 31;
         List<Long> list = this.removedMemberIds;
@@ -50,7 +50,7 @@ public final class ThreadMembersUpdate {
         int hashCode = (i + (list != null ? list.hashCode() : 0)) * 31;
         List<Long> list2 = this.memberIdsPreview;
         int hashCode2 = (hashCode + (list2 != null ? list2.hashCode() : 0)) * 31;
-        List<ThreadMember> list3 = this.addedMembers;
+        List<AugmentedThreadMember> list3 = this.addedMembers;
         if (list3 != null) {
             i2 = list3.hashCode();
         }
@@ -59,7 +59,7 @@ public final class ThreadMembersUpdate {
 
     public String toString() {
         StringBuilder L = a.L("ThreadMembersUpdate(id=");
-        L.append(this.f1585id);
+        L.append(this.f1581id);
         L.append(", guildId=");
         L.append(this.guildId);
         L.append(", memberCount=");
diff --git a/app/src/main/java/com/discord/api/user/PatchUserBody.java b/app/src/main/java/com/discord/api/user/PatchUserBody.java
new file mode 100644
index 0000000000..e3b1dba393
--- /dev/null
+++ b/app/src/main/java/com/discord/api/user/PatchUserBody.java
@@ -0,0 +1,58 @@
+package com.discord.api.user;
+
+import c.d.b.a.a;
+import com.discord.nullserializable.NullSerializable;
+import d0.z.d.m;
+/* compiled from: PatchUserBody.kt */
+public final class PatchUserBody {
+    private final NullSerializable<String> avatar;
+    private final NullSerializable<String> banner;
+    private final NullSerializable<String> bio;
+
+    public PatchUserBody() {
+        this.avatar = null;
+        this.banner = null;
+        this.bio = null;
+    }
+
+    public PatchUserBody(NullSerializable<String> nullSerializable, NullSerializable<String> nullSerializable2, NullSerializable<String> nullSerializable3) {
+        this.avatar = nullSerializable;
+        this.banner = nullSerializable2;
+        this.bio = nullSerializable3;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof PatchUserBody)) {
+            return false;
+        }
+        PatchUserBody patchUserBody = (PatchUserBody) obj;
+        return m.areEqual(this.avatar, patchUserBody.avatar) && m.areEqual(this.banner, patchUserBody.banner) && m.areEqual(this.bio, patchUserBody.bio);
+    }
+
+    public int hashCode() {
+        NullSerializable<String> nullSerializable = this.avatar;
+        int i = 0;
+        int hashCode = (nullSerializable != null ? nullSerializable.hashCode() : 0) * 31;
+        NullSerializable<String> nullSerializable2 = this.banner;
+        int hashCode2 = (hashCode + (nullSerializable2 != null ? nullSerializable2.hashCode() : 0)) * 31;
+        NullSerializable<String> nullSerializable3 = this.bio;
+        if (nullSerializable3 != null) {
+            i = nullSerializable3.hashCode();
+        }
+        return hashCode2 + i;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("PatchUserBody(avatar=");
+        L.append(this.avatar);
+        L.append(", banner=");
+        L.append(this.banner);
+        L.append(", bio=");
+        L.append(this.bio);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/api/user/User.java b/app/src/main/java/com/discord/api/user/User.java
index ab13f0269d..ee1fd761ed 100644
--- a/app/src/main/java/com/discord/api/user/User.java
+++ b/app/src/main/java/com/discord/api/user/User.java
@@ -12,14 +12,14 @@ public final class User {
     private final NullSerializable<String> avatar;
     private final NullSerializable<String> banner;
     private final String bannerColor;
-    private final String bio;
+    private final NullSerializable<String> bio;
     private final Boolean bot;
     private final String discriminator;
     private final String email;
     private final Integer flags;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f1586id;
+    private final long f1582id;
     private final String locale;
     private final GuildMember member;
     private final Boolean mfaEnabled;
@@ -32,10 +32,10 @@ public final class User {
     private final String username;
     private final Boolean verified;
 
-    public User(long j, String str, NullSerializable<String> nullSerializable, NullSerializable<String> nullSerializable2, String str2, Integer num, Integer num2, Boolean bool, Boolean bool2, String str3, String str4, Boolean bool3, String str5, NsfwAllowance nsfwAllowance, Boolean bool4, Phone phone, String str6, PremiumTier premiumTier, Integer num3, GuildMember guildMember, String str7, String str8) {
+    public User(long j, String str, NullSerializable<String> nullSerializable, NullSerializable<String> nullSerializable2, String str2, Integer num, Integer num2, Boolean bool, Boolean bool2, String str3, String str4, Boolean bool3, String str5, NsfwAllowance nsfwAllowance, Boolean bool4, Phone phone, String str6, PremiumTier premiumTier, Integer num3, GuildMember guildMember, NullSerializable<String> nullSerializable3, String str7) {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(str2, "discriminator");
-        this.f1586id = j;
+        this.f1582id = j;
         this.username = str;
         this.avatar = nullSerializable;
         this.banner = nullSerializable2;
@@ -55,12 +55,12 @@ public final class User {
         this.premiumType = premiumTier;
         this.approximateGuildCount = num3;
         this.member = guildMember;
-        this.bio = str7;
-        this.bannerColor = str8;
+        this.bio = nullSerializable3;
+        this.bannerColor = str7;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ User(long j, String str, NullSerializable nullSerializable, NullSerializable nullSerializable2, String str2, Integer num, Integer num2, Boolean bool, Boolean bool2, String str3, String str4, Boolean bool3, String str5, NsfwAllowance nsfwAllowance, Boolean bool4, Phone phone, String str6, PremiumTier premiumTier, Integer num3, GuildMember guildMember, String str7, String str8, int i) {
+    public /* synthetic */ User(long j, String str, NullSerializable nullSerializable, NullSerializable nullSerializable2, String str2, Integer num, Integer num2, Boolean bool, Boolean bool2, String str3, String str4, Boolean bool3, String str5, NsfwAllowance nsfwAllowance, Boolean bool4, Phone phone, String str6, PremiumTier premiumTier, Integer num3, GuildMember guildMember, NullSerializable nullSerializable3, String str7, int i) {
         this(j, str, (i & 4) != 0 ? null : nullSerializable, null, (i & 16) != 0 ? "0000" : str2, (i & 32) != 0 ? null : num, (i & 64) != 0 ? null : num2, (i & 128) != 0 ? null : bool, (i & 256) != 0 ? null : bool2, null, null, null, null, null, null, null, null, null, null, null, null, null);
         int i2 = i & 8;
         int i3 = i & 512;
@@ -90,7 +90,7 @@ public final class User {
         return this.bannerColor;
     }
 
-    public final String d() {
+    public final NullSerializable<String> d() {
         return this.bio;
     }
 
@@ -106,7 +106,7 @@ public final class User {
             return false;
         }
         User user = (User) obj;
-        return this.f1586id == user.f1586id && m.areEqual(this.username, user.username) && m.areEqual(this.avatar, user.avatar) && m.areEqual(this.banner, user.banner) && m.areEqual(this.discriminator, user.discriminator) && m.areEqual(this.publicFlags, user.publicFlags) && m.areEqual(this.flags, user.flags) && m.areEqual(this.bot, user.bot) && m.areEqual(this.system, user.system) && m.areEqual(this.token, user.token) && m.areEqual(this.email, user.email) && m.areEqual(this.verified, user.verified) && m.areEqual(this.locale, user.locale) && m.areEqual(this.nsfwAllowed, user.nsfwAllowed) && m.areEqual(this.mfaEnabled, user.mfaEnabled) && m.areEqual(this.phone, user.phone) && m.areEqual(this.analyticsToken, user.analyticsToken) && m.areEqual(this.premiumType, user.premiumType) && m.areEqual(this.approximateGuildCount, user.approximateGuildCount) && m.areEqual(this.member, user.member) && m.areEqual(this.bio, user.bio) && m.areEqual(this.bannerColor, user.bannerColor);
+        return this.f1582id == user.f1582id && m.areEqual(this.username, user.username) && m.areEqual(this.avatar, user.avatar) && m.areEqual(this.banner, user.banner) && m.areEqual(this.discriminator, user.discriminator) && m.areEqual(this.publicFlags, user.publicFlags) && m.areEqual(this.flags, user.flags) && m.areEqual(this.bot, user.bot) && m.areEqual(this.system, user.system) && m.areEqual(this.token, user.token) && m.areEqual(this.email, user.email) && m.areEqual(this.verified, user.verified) && m.areEqual(this.locale, user.locale) && m.areEqual(this.nsfwAllowed, user.nsfwAllowed) && m.areEqual(this.mfaEnabled, user.mfaEnabled) && m.areEqual(this.phone, user.phone) && m.areEqual(this.analyticsToken, user.analyticsToken) && m.areEqual(this.premiumType, user.premiumType) && m.areEqual(this.approximateGuildCount, user.approximateGuildCount) && m.areEqual(this.member, user.member) && m.areEqual(this.bio, user.bio) && m.areEqual(this.bannerColor, user.bannerColor);
     }
 
     public final String f() {
@@ -122,7 +122,7 @@ public final class User {
     }
 
     public int hashCode() {
-        long j = this.f1586id;
+        long j = this.f1582id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.username;
         int i2 = 0;
@@ -163,17 +163,17 @@ public final class User {
         int hashCode18 = (hashCode17 + (num3 != null ? num3.hashCode() : 0)) * 31;
         GuildMember guildMember = this.member;
         int hashCode19 = (hashCode18 + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
-        String str7 = this.bio;
-        int hashCode20 = (hashCode19 + (str7 != null ? str7.hashCode() : 0)) * 31;
-        String str8 = this.bannerColor;
-        if (str8 != null) {
-            i2 = str8.hashCode();
+        NullSerializable<String> nullSerializable3 = this.bio;
+        int hashCode20 = (hashCode19 + (nullSerializable3 != null ? nullSerializable3.hashCode() : 0)) * 31;
+        String str7 = this.bannerColor;
+        if (str7 != null) {
+            i2 = str7.hashCode();
         }
         return hashCode20 + i2;
     }
 
     public final long i() {
-        return this.f1586id;
+        return this.f1582id;
     }
 
     public final GuildMember j() {
@@ -218,7 +218,7 @@ public final class User {
 
     public String toString() {
         StringBuilder L = a.L("User(id=");
-        L.append(this.f1586id);
+        L.append(this.f1582id);
         L.append(", username=");
         L.append(this.username);
         L.append(", avatar=");
diff --git a/app/src/main/java/com/discord/app/App.java b/app/src/main/java/com/discord/app/App.java
index a2c1531ba7..a8921c5534 100644
--- a/app/src/main/java/com/discord/app/App.java
+++ b/app/src/main/java/com/discord/app/App.java
@@ -166,13 +166,13 @@ public class App extends Application {
         m.checkNotNullParameter(this, "application");
         AppLog.b = true;
         AppLog.a = 0;
-        AppLog.f1592c = PreferenceManager.getDefaultSharedPreferences(this);
+        AppLog.f1588c = PreferenceManager.getDefaultSharedPreferences(this);
         LoggingProvider loggingProvider = LoggingProvider.INSTANCE;
         AppLog appLog = AppLog.g;
         loggingProvider.init(appLog);
         c.i.c.c.e(this);
         String str = null;
-        if (BuildUtils.INSTANCE.isValidBuildVersionName("81.14 - Stable")) {
+        if (BuildUtils.INSTANCE.isValidBuildVersionName("82.19 - Stable")) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
         } else {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);
@@ -209,7 +209,7 @@ public class App extends Application {
         m.checkNotNullParameter(dVar4, "defaultUrlOnClick");
         c.a.l.a.a = dVar3;
         c.a.l.a.b = cVar;
-        c.a.l.a.f195c = dVar4;
+        c.a.l.a.f196c = dVar4;
         RestAPI.Companion.init(this);
         NotificationClient.INSTANCE.init(this);
         MGImagesConfig.INSTANCE.init(this);
@@ -221,7 +221,7 @@ public class App extends Application {
         m.checkNotNullParameter(this, "context");
         synchronized (o0.d) {
             m.checkNotNullParameter(appLog, "logger");
-            if (!o0.f46c) {
+            if (!o0.f45c) {
                 for (String str2 : o0.a) {
                     try {
                         System.loadLibrary(str2);
@@ -234,7 +234,7 @@ public class App extends Application {
                 if (o0.b.size() != o0.a.size()) {
                     Logger.e$default(appLog, "NativeLoader", "Failed to load all native libs", null, null, 12, null);
                 } else {
-                    o0.f46c = true;
+                    o0.f45c = true;
                 }
             }
         }
diff --git a/app/src/main/java/com/discord/app/AppActivity.java b/app/src/main/java/com/discord/app/AppActivity.java
index 372c8a8347..2749a9adab 100644
--- a/app/src/main/java/com/discord/app/AppActivity.java
+++ b/app/src/main/java/com/discord/app/AppActivity.java
@@ -86,7 +86,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     public boolean r = true;
 
     /* renamed from: s  reason: collision with root package name */
-    public final Subject<Void, Void> f1587s;
+    public final Subject<Void, Void> f1583s;
     public Toolbar t;
     public final Lazy u;
     public Intent v;
@@ -96,7 +96,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     public static final class AppAction extends AppActivity {
 
         /* renamed from: x  reason: collision with root package name */
-        public final Lazy f1588x = d0.g.lazy(new a(this));
+        public final Lazy f1584x = d0.g.lazy(new a(this));
 
         /* compiled from: AppActivity.kt */
         public static final class a extends o implements Function0<Class<? extends AppFragment>> {
@@ -120,7 +120,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
 
         @Override // com.discord.app.AppActivity
         public Class<? extends AppComponent> d() {
-            return (Class) this.f1588x.getValue();
+            return (Class) this.f1584x.getValue();
         }
 
         @Override // com.discord.app.AppActivity, androidx.appcompat.app.AppCompatActivity, androidx.fragment.app.FragmentActivity, androidx.activity.ComponentActivity, androidx.core.app.ComponentActivity, android.app.Activity
@@ -136,11 +136,11 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     public static final class Call extends AppActivity {
 
         /* renamed from: x  reason: collision with root package name */
-        public final Class<? extends AppComponent> f1589x = WidgetCallFullscreen.class;
+        public final Class<? extends AppComponent> f1585x = WidgetCallFullscreen.class;
 
         @Override // com.discord.app.AppActivity
         public Class<? extends AppComponent> d() {
-            return this.f1589x;
+            return this.f1585x;
         }
     }
 
@@ -148,11 +148,11 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     public static final class IncomingCall extends AppActivity {
 
         /* renamed from: x  reason: collision with root package name */
-        public final Class<? extends AppComponent> f1590x = WidgetVoiceCallIncoming.SystemCallIncoming.class;
+        public final Class<? extends AppComponent> f1586x = WidgetVoiceCallIncoming.SystemCallIncoming.class;
 
         @Override // com.discord.app.AppActivity
         public Class<? extends AppComponent> d() {
-            return this.f1590x;
+            return this.f1586x;
         }
     }
 
@@ -420,9 +420,9 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     }
 
     public AppActivity() {
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.f1587s = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.f1583s = k0;
         this.u = d0.g.lazy(new e(this));
         this.v = m;
         int i = AppPermissionsRequests.a;
@@ -438,7 +438,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
             appActivity.finish();
             if (z2) {
                 AppTransitionActivity.Transition transition = AppTransitionActivity.Transition.TYPE_FADE;
-                appActivity.overridePendingTransition(transition.getAnimations().f1593c, transition.getAnimations().d);
+                appActivity.overridePendingTransition(transition.getAnimations().f1589c, transition.getAnimations().d);
                 appActivity.getIntent().putExtra("transition", transition);
             }
             l.d(appActivity, appActivity.d(), appActivity.getIntent());
@@ -576,7 +576,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
 
     @Override // com.discord.app.AppComponent
     public Subject<Void, Void> getUnsubscribeSignal() {
-        return this.f1587s;
+        return this.f1583s;
     }
 
     public final boolean h(d0.e0.c<? extends AppComponent> cVar) {
@@ -630,7 +630,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
         if (e2 == null) {
             return null;
         }
-        TextView textView = e2.i.f131c;
+        TextView textView = e2.i.f147c;
         m.checkNotNullExpressionValue(textView, "binding.toolbarTitle");
         textView.setText(charSequence);
         if (num != null) {
@@ -638,9 +638,9 @@ public class AppActivity extends c.a.d.d implements AppComponent {
             int intValue = num.intValue();
             Context context = e2.getContext();
             m.checkNotNullExpressionValue(context, "context");
-            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(e2.i.f131c, ResourcesCompat.getDrawable(resources, intValue, context.getTheme()), (Drawable) null, (Drawable) null, (Drawable) null);
+            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(e2.i.f147c, ResourcesCompat.getDrawable(resources, intValue, context.getTheme()), (Drawable) null, (Drawable) null, (Drawable) null);
         } else {
-            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(e2.i.f131c, (Drawable) null, (Drawable) null, (Drawable) null, (Drawable) null);
+            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(e2.i.f147c, (Drawable) null, (Drawable) null, (Drawable) null, (Drawable) null);
         }
         return Unit.a;
     }
@@ -760,7 +760,7 @@ public class AppActivity extends c.a.d.d implements AppComponent {
     @Override // com.discord.app.AppTransitionActivity, androidx.fragment.app.FragmentActivity, android.app.Activity
     public void onPause() {
         super.onPause();
-        this.f1587s.onNext(null);
+        this.f1583s.onNext(null);
     }
 
     @Override // com.discord.app.AppTransitionActivity, androidx.fragment.app.FragmentActivity, android.app.Activity
diff --git a/app/src/main/java/com/discord/app/AppBottomSheet.java b/app/src/main/java/com/discord/app/AppBottomSheet.java
index 799eb68a5b..719b525b76 100644
--- a/app/src/main/java/com/discord/app/AppBottomSheet.java
+++ b/app/src/main/java/com/discord/app/AppBottomSheet.java
@@ -49,15 +49,15 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
         public static final a b = new a(1);
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ int f1591c;
+        public final /* synthetic */ int f1587c;
 
         public a(int i) {
-            this.f1591c = i;
+            this.f1587c = i;
         }
 
         @Override // androidx.core.view.OnApplyWindowInsetsListener
         public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
-            int i = this.f1591c;
+            int i = this.f1587c;
             if (i == 0) {
                 m.checkNotNullParameter(view, "v");
                 m.checkNotNullParameter(windowInsetsCompat, "insets");
@@ -165,7 +165,7 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
 
         @Override // android.content.DialogInterface.OnShowListener
         public final void onShow(DialogInterface dialogInterface) {
-            BottomSheetBehavior from = BottomSheetBehavior.from(this.a.findViewById(2131362849));
+            BottomSheetBehavior from = BottomSheetBehavior.from(this.a.findViewById(2131362874));
             m.checkNotNullExpressionValue(from, "BottomSheetBehavior.from(bottomSheet)");
             from.setSkipCollapsed(true);
             from.setState(3);
@@ -197,9 +197,9 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
 
     public AppBottomSheet(boolean z2) {
         this.shouldAvoidKeyboard = z2;
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
         this.peekLayoutListener = new d(this);
     }
 
@@ -211,9 +211,9 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement
     private final void fixWindowInsetHandling() {
         View findViewById;
         View view = getView();
-        if (view != null && (findViewById = view.getRootView().findViewById(2131362748)) != null) {
+        if (view != null && (findViewById = view.getRootView().findViewById(2131362772)) != null) {
             ViewCompat.setOnApplyWindowInsetsListener(findViewById, a.a);
-            View findViewById2 = view.getRootView().findViewById(2131362849);
+            View findViewById2 = view.getRootView().findViewById(2131362874);
             m.checkNotNullExpressionValue(findViewById2, "designBottomSheet");
             findViewById2.setFitsSystemWindows(true);
             ViewCompat.setOnApplyWindowInsetsListener(findViewById2, DisplayUtils.getNO_OP_WINDOW_INSETS_LISTENER());
diff --git a/app/src/main/java/com/discord/app/AppDialog.java b/app/src/main/java/com/discord/app/AppDialog.java
index 82a037f04f..a65f31b522 100644
--- a/app/src/main/java/com/discord/app/AppDialog.java
+++ b/app/src/main/java/com/discord/app/AppDialog.java
@@ -45,16 +45,16 @@ public abstract class AppDialog extends DialogFragment implements AppComponent {
     }
 
     public AppDialog() {
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public AppDialog(@LayoutRes int i) {
         super(i);
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public static /* synthetic */ void hideKeyboard$default(AppDialog appDialog, View view, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/app/AppFragment.java b/app/src/main/java/com/discord/app/AppFragment.java
index 69edd52a5d..24a0aa8396 100644
--- a/app/src/main/java/com/discord/app/AppFragment.java
+++ b/app/src/main/java/com/discord/app/AppFragment.java
@@ -79,7 +79,7 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
         @Override // com.discord.media_picker.MediaPicker.a
         public void a(Exception exc) {
             m.checkNotNullParameter(exc, "e");
-            c.a.d.o.h(this.a.getContext(), c.a.l.b.j(this.a, 2131894139, new Object[]{exc.getMessage()}, null, 4), 0, null, 12);
+            c.a.d.o.h(this.a.getContext(), c.a.l.b.j(this.a, 2131894240, new Object[]{exc.getMessage()}, null, 4), 0, null, 12);
         }
 
         @Override // com.discord.media_picker.MediaPicker.a
@@ -156,16 +156,16 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP
     }
 
     public AppFragment() {
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public AppFragment(@LayoutRes int i) {
         super(i);
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     private final Unit bindToolbar(AppActivity appActivity, View view) {
diff --git a/app/src/main/java/com/discord/app/AppLog.java b/app/src/main/java/com/discord/app/AppLog.java
index a7225b767e..5911e7f1b1 100644
--- a/app/src/main/java/com/discord/app/AppLog.java
+++ b/app/src/main/java/com/discord/app/AppLog.java
@@ -35,7 +35,7 @@ public final class AppLog extends Logger {
     public static boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static SharedPreferences f1592c;
+    public static SharedPreferences f1588c;
     public static final SerializedSubject<LoggedItem, LoggedItem> d = new SerializedSubject<>(new j0.q.a(new a.d(new a.c(5000))));
     public static boolean e;
     public static final String[] f = {"com.discord", "co.discord"};
@@ -349,7 +349,7 @@ public final class AppLog extends Logger {
     public static final void g(Long l, String str, String str2) {
         String str3;
         if (b) {
-            SharedPreferences sharedPreferences = f1592c;
+            SharedPreferences sharedPreferences = f1588c;
             if (sharedPreferences != null) {
                 SharedPreferences.Editor edit = sharedPreferences.edit();
                 m.checkExpressionValueIsNotNull(edit, "editor");
diff --git a/app/src/main/java/com/discord/app/AppTransitionActivity.java b/app/src/main/java/com/discord/app/AppTransitionActivity.java
index 71e4bf6769..d97170f0ba 100644
--- a/app/src/main/java/com/discord/app/AppTransitionActivity.java
+++ b/app/src/main/java/com/discord/app/AppTransitionActivity.java
@@ -49,13 +49,13 @@ public abstract class AppTransitionActivity extends AppCompatActivity {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f1593c;
+        public final int f1589c;
         public final int d;
 
         public a(@AnimRes int i, @AnimRes int i2, @AnimRes int i3, @AnimRes int i4) {
             this.a = i;
             this.b = i2;
-            this.f1593c = i3;
+            this.f1589c = i3;
             this.d = i4;
         }
     }
@@ -66,7 +66,7 @@ public abstract class AppTransitionActivity extends AppCompatActivity {
             return;
         }
         if ((z2 || z3) && (aVar = this.j) != null) {
-            overridePendingTransition(z3 ? aVar.a : aVar.f1593c, z3 ? aVar.b : aVar.d);
+            overridePendingTransition(z3 ? aVar.a : aVar.f1589c, z3 ? aVar.b : aVar.d);
         }
     }
 
diff --git a/app/src/main/java/com/discord/app/AppViewModel.java b/app/src/main/java/com/discord/app/AppViewModel.java
index fc872ee81a..dcd8ac048c 100644
--- a/app/src/main/java/com/discord/app/AppViewModel.java
+++ b/app/src/main/java/com/discord/app/AppViewModel.java
@@ -18,13 +18,13 @@ public abstract class AppViewModel<V> extends ViewModel implements AppComponent
     }
 
     public AppViewModel(V v) {
-        BehaviorSubject<V> l0 = BehaviorSubject.l0();
-        this.viewStateSubject = l0;
-        PublishSubject l02 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l02, "PublishSubject.create()");
-        this.unsubscribeSignal = l02;
+        BehaviorSubject<V> k0 = BehaviorSubject.k0();
+        this.viewStateSubject = k0;
+        PublishSubject k02 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k02, "PublishSubject.create()");
+        this.unsubscribeSignal = k02;
         if (v != null) {
-            l0.onNext(v);
+            k0.onNext(v);
         }
     }
 
@@ -41,7 +41,7 @@ public abstract class AppViewModel<V> extends ViewModel implements AppComponent
     public final V getViewState() {
         BehaviorSubject<V> behaviorSubject = this.viewStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "viewStateSubject");
-        return behaviorSubject.o0();
+        return behaviorSubject.n0();
     }
 
     public V modifyPendingViewState(V v, V v2) {
diff --git a/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java b/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java
index 8786094ad5..5b5e6ead06 100644
--- a/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java
+++ b/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java
@@ -13,7 +13,7 @@ public final class AudioManagerFeatureFlag {
     public static final AudioManagerFeatureFlag b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f1594c;
+    public int f1590c;
     public final SharedPreferences d;
 
     /* compiled from: AudioManagerFeatureFlag.kt */
@@ -40,10 +40,10 @@ public final class AudioManagerFeatureFlag {
         SharedPreferences sharedPreferences2 = (i & 1) != 0 ? SharedPreferencesProvider.INSTANCE.get() : null;
         m.checkNotNullParameter(sharedPreferences2, "sharedPreferences");
         this.d = sharedPreferences2;
-        this.f1594c = -1;
+        this.f1590c = -1;
         int i2 = sharedPreferences2.getInt("CACHE_KEY_AUDIO_MANAGER_V2_EXPERIMENT_BUCKET", -1);
         if (i2 != -1) {
-            this.f1594c = i2;
+            this.f1590c = i2;
         }
     }
 
@@ -52,7 +52,7 @@ public final class AudioManagerFeatureFlag {
     }
 
     public final boolean b() {
-        int i = this.f1594c;
+        int i = this.f1590c;
         return i == 2 || i == 3;
     }
 }
diff --git a/app/src/main/java/com/discord/app/DiscordConnectService.java b/app/src/main/java/com/discord/app/DiscordConnectService.java
index 6b76e7da0e..5faae7f38f 100644
--- a/app/src/main/java/com/discord/app/DiscordConnectService.java
+++ b/app/src/main/java/com/discord/app/DiscordConnectService.java
@@ -153,8 +153,8 @@ public final class DiscordConnectService extends Service {
         String simpleName = DiscordConnectService.class.getSimpleName();
         m.checkNotNullExpressionValue(simpleName, "DiscordConnectService::class.java.simpleName");
         Logger.i$default(appLog, simpleName, "onCreate", null, 4, null);
-        n.f45c.a(this);
-        startForeground(100, new NotificationCompat.Builder(this, "Social").setAutoCancel(true).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231791).setColor(ColorCompat.getThemedColor(this, 2130969007)).setContentTitle(getString(2131887524)).setContentText(getString(2131887531)).build());
+        n.f44c.a(this);
+        startForeground(100, new NotificationCompat.Builder(this, "Social").setAutoCancel(true).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231799).setColor(ColorCompat.getThemedColor(this, 2130969007)).setContentTitle(getString(2131887524)).setContentText(getString(2131887531)).build());
         StoreStream.Companion companion = StoreStream.Companion;
         Application application = getApplication();
         m.checkNotNullExpressionValue(application, "application");
@@ -171,7 +171,7 @@ public final class DiscordConnectService extends Service {
         String simpleName = DiscordConnectService.class.getSimpleName();
         m.checkNotNullExpressionValue(simpleName, "DiscordConnectService::class.java.simpleName");
         Logger.i$default(appLog, simpleName, "onDestroy", null, 4, null);
-        n.f45c.b(this);
+        n.f44c.b(this);
         super.onDestroy();
     }
 
@@ -198,12 +198,12 @@ public final class DiscordConnectService extends Service {
         StoreStream.Companion companion = StoreStream.Companion;
         String authToken$app_productionGoogleRelease = companion.getAuthentication().getAuthToken$app_productionGoogleRelease();
         if (authToken$app_productionGoogleRelease == null || t.isBlank(authToken$app_productionGoogleRelease)) {
-            c.a.d.o.g(this, 2131891730, 0, null, 12);
-            observable2 = Observable.x(new IllegalStateException("UNAUTHED"));
+            c.a.d.o.g(this, 2131891802, 0, null, 12);
+            observable2 = Observable.w(new IllegalStateException("UNAUTHED"));
             m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…ateException(\"UNAUTHED\"))");
         } else {
             c.a.d.r0.b bVar = c.a.d.r0.b.F;
-            Regex regex = c.a.d.r0.b.f48s;
+            Regex regex = c.a.d.r0.b.f47s;
             String path = data.getPath();
             if (path == null) {
                 path = "";
@@ -215,8 +215,8 @@ public final class DiscordConnectService extends Service {
             }
             if (longOrNull != null) {
                 if (ContextCompat.checkSelfPermission(this, "android.permission.RECORD_AUDIO") != 0) {
-                    c.a.d.o.g(this, 2131891855, 0, null, 12);
-                    observable2 = Observable.x(new IllegalStateException("Do not have microphone permissions, go to main app"));
+                    c.a.d.o.g(this, 2131891927, 0, null, 12);
+                    observable2 = Observable.w(new IllegalStateException("Do not have microphone permissions, go to main app"));
                     m.checkNotNullExpressionValue(observable2, "Observable.error(\n      …to main app\")\n          )");
                 } else {
                     long longValue = longOrNull.longValue();
@@ -224,9 +224,9 @@ public final class DiscordConnectService extends Service {
                     m.checkNotNullExpressionValue(simpleName3, "DiscordConnectService::class.java.simpleName");
                     Logger.i$default(appLog, simpleName3, "Try joining voice channel", null, 4, null);
                     companion.getVoiceChannelSelected().selectVoiceChannel(longValue);
-                    Observable y2 = StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null).y(l0.i);
-                    m.checkNotNullExpressionValue(y2, "StoreStream\n        .get…()\n        .filter { it }");
-                    observable2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 10000, false, 2, null).Z(n0.i);
+                    Observable x2 = StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null).x(l0.i);
+                    m.checkNotNullExpressionValue(x2, "StoreStream\n        .get…()\n        .filter { it }");
+                    observable2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 10000, false, 2, null).Y(n0.i);
                     m.checkNotNullExpressionValue(observable2, "isConnectedObs.switchMap…nnected\n          }\n    }");
                 }
             } else if (matchEntire != null) {
@@ -236,7 +236,7 @@ public final class DiscordConnectService extends Service {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(observable, 10000, false, 2, null), DiscordConnectService.class, (Context) null, (Function1) null, new d(this, i3), new c(this, i3), (Function0) null, b.i, 38, (Object) null);
                 return 2;
             } else {
-                observable2 = Observable.x(new IllegalArgumentException("Invalid Request: " + data));
+                observable2 = Observable.w(new IllegalArgumentException("Invalid Request: " + data));
                 m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…\"Invalid Request: $uri\"))");
             }
         }
diff --git a/app/src/main/java/com/discord/app/RebrandFeatureFlag.java b/app/src/main/java/com/discord/app/RebrandFeatureFlag.java
index 03d3e3e614..2f095b9d7d 100644
--- a/app/src/main/java/com/discord/app/RebrandFeatureFlag.java
+++ b/app/src/main/java/com/discord/app/RebrandFeatureFlag.java
@@ -18,7 +18,7 @@ public final class RebrandFeatureFlag {
     public static boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final RebrandFeatureFlag f1595c = null;
+    public static final RebrandFeatureFlag f1591c = null;
     public int d;
     public final SharedPreferences e;
 
@@ -64,7 +64,7 @@ public final class RebrandFeatureFlag {
             Experiment experiment2 = experiment;
             if (experiment2 != null) {
                 this.i.d = experiment2.getBucket();
-                RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c;
+                RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1591c;
                 RebrandFeatureFlag rebrandFeatureFlag2 = this.i;
                 boolean z2 = true;
                 if (rebrandFeatureFlag2.d < 1) {
@@ -98,8 +98,8 @@ public final class RebrandFeatureFlag {
     }
 
     public final Observable<Experiment> b(StoreExperiments storeExperiments) {
-        Observable<Experiment> u = storeExperiments.observeUserExperiment("2021-04_product_rebrand", true).y(b.i).a0(1).u(new c(this));
-        m.checkNotNullExpressionValue(u, "storeExperiments.observe…nt)\n          }\n        }");
-        return ObservableExtensionsKt.computationLatest(u);
+        Observable<Experiment> t = storeExperiments.observeUserExperiment("2021-04_product_rebrand", true).x(b.i).Z(1).t(new c(this));
+        m.checkNotNullExpressionValue(t, "storeExperiments.observe…nt)\n          }\n        }");
+        return ObservableExtensionsKt.computationLatest(t);
     }
 }
diff --git a/app/src/main/java/com/discord/chips_view/ChipsView.java b/app/src/main/java/com/discord/chips_view/ChipsView.java
index 2a2eac105c..5300da4da2 100644
--- a/app/src/main/java/com/discord/chips_view/ChipsView.java
+++ b/app/src/main/java/com/discord/chips_view/ChipsView.java
@@ -65,20 +65,20 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f1596s;
+    public int f1592s;
     public int t;
     public int u;
     public float v;
     public int w;
 
     /* renamed from: x  reason: collision with root package name */
-    public int f1597x;
+    public int f1593x;
 
     /* renamed from: y  reason: collision with root package name */
-    public float f1598y;
+    public float f1594y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final RelativeLayout f1599z;
+    public final RelativeLayout f1595z;
 
     /* compiled from: ChipsView.kt */
     public interface a {
@@ -181,9 +181,9 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
         m.checkNotNullParameter(attributeSet, "attrs");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        this.f1598y = resources.getDisplayMetrics().density;
+        this.f1594y = resources.getDisplayMetrics().density;
         RelativeLayout relativeLayout = new RelativeLayout(getContext());
-        this.f1599z = relativeLayout;
+        this.f1595z = relativeLayout;
         addView(relativeLayout);
         LinearLayout linearLayout = new LinearLayout(getContext());
         linearLayout.setLayoutParams(new ViewGroup.LayoutParams(0, 0));
@@ -198,26 +198,26 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
         m.checkNotNullExpressionValue(obtainStyledAttributes, "context.theme.obtainStyl…tyleable.ChipsView, 0, 0)");
         try {
             this.k = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_max_height, -1);
-            this.l = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_vertical_spacing, (int) (((float) 1) * this.f1598y));
-            this.m = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_height, (int) (((float) 24) * this.f1598y));
+            this.l = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_vertical_spacing, (int) (((float) 1) * this.f1594y));
+            this.m = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_height, (int) (((float) 24) * this.f1594y));
             this.n = obtainStyledAttributes.getColor(R.e.ChipsView_cv_color, ContextCompat.getColor(context, 17170432));
             this.o = obtainStyledAttributes.getColor(R.e.ChipsView_cv_color_clicked, ContextCompat.getColor(context, 17170443));
             this.p = obtainStyledAttributes.getColor(R.e.ChipsView_cv_bg_color, ContextCompat.getColor(context, 17170443));
             this.j = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_chip_bg_res, 0);
             this.q = obtainStyledAttributes.getColor(R.e.ChipsView_cv_bg_color_clicked, ContextCompat.getColor(context, 17170451));
             this.r = obtainStyledAttributes.getColor(R.e.ChipsView_cv_text_color, -16777216);
-            this.f1596s = obtainStyledAttributes.getColor(R.e.ChipsView_cv_text_color_clicked, -1);
+            this.f1592s = obtainStyledAttributes.getColor(R.e.ChipsView_cv_text_color_clicked, -1);
             this.w = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_hint, 0);
             obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_icon_placeholder, 0);
             this.t = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_icon_delete, 0);
             this.u = obtainStyledAttributes.getColor(R.e.ChipsView_cv_search_text_color, -16777216);
             this.v = (float) obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_search_text_size, 49);
-            this.f1597x = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_chip_layout, R.d.view_chip_default);
+            this.f1593x = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_chip_layout, R.d.view_chip_default);
             obtainStyledAttributes.recycle();
             int i2 = this.m + this.l;
             RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(-1, i2);
             float f = (float) 4;
-            layoutParams.leftMargin = (int) (this.f1598y * f);
+            layoutParams.leftMargin = (int) (this.f1594y * f);
             layoutParams.addRule(12, -1);
             dVar.setLayoutParams(layoutParams);
             dVar.setPadding(0, 0, 0, this.l);
@@ -232,7 +232,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
             e eVar = new e(context3, i2);
             eVar.setOrientation(1);
             eVar.setLayoutParams(new ViewGroup.LayoutParams(-1, -2));
-            eVar.setPadding(0, (int) (f * this.f1598y), 0, 0);
+            eVar.setPadding(0, (int) (f * this.f1594y), 0, 0);
             this.B = eVar;
             relativeLayout.addView(eVar);
             relativeLayout.setOnClickListener(new h(this));
@@ -253,7 +253,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
     public final void b(String str, Uri uri, K k, V v) {
         if (!this.C.containsKey(k)) {
             this.A.setText("");
-            c.a.f.a<K, V> aVar = new c.a.f.a<>(str, uri, k, v, false, new a.C0023a(this.q, this.f1598y, this.j, this.p, this.r, this.t, this.f1596s, this.o, this.n, this.m, this.f1597x), this);
+            c.a.f.a<K, V> aVar = new c.a.f.a<>(str, uri, k, v, false, new a.C0023a(this.q, this.f1594y, this.j, this.p, this.r, this.t, this.f1592s, this.o, this.n, this.m, this.f1593x), this);
             this.C.put(k, aVar);
             Function1<? super V, Unit> function1 = this.E;
             if (function1 != null) {
@@ -357,7 +357,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
                                 }
                                 c.a.f.i.a aVar3 = next.i;
                                 if (!(aVar3 == null || (relativeLayout5 = aVar3.a) == null)) {
-                                    relativeLayout5.setBackgroundResource(next.p.f53c);
+                                    relativeLayout5.setBackgroundResource(next.p.f52c);
                                     relativeLayout5.post(new c.a.f.b(relativeLayout5, next));
                                     relativeLayout5.setOnClickListener(next);
                                 }
@@ -367,7 +367,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
                                     simpleDraweeView3.setOnClickListener(next);
                                 }
                                 c.a.f.i.a aVar5 = next.i;
-                                if (!(aVar5 == null || (textView4 = aVar5.f54c) == null)) {
+                                if (!(aVar5 == null || (textView4 = aVar5.f53c) == null)) {
                                     textView4.setTextColor(next.p.e);
                                 }
                             }
@@ -375,7 +375,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
                         throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i4)));
                     }
                     c.a.f.i.a aVar6 = next.i;
-                    if (!(aVar6 == null || (textView3 = aVar6.f54c) == null)) {
+                    if (!(aVar6 == null || (textView3 = aVar6.f53c) == null)) {
                         textView3.setText(next.k);
                     }
                     c.a.f.i.a aVar7 = next.i;
@@ -402,7 +402,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
                             relativeLayout = null;
                             b2.f = !w.contains$default(uri2, "gif", false, 2, null) && i5 <= 200 && i5 <= 200 ? ImageRequest.b.SMALL : ImageRequest.b.DEFAULT;
                             if (i5 > 0 && i5 > 0) {
-                                b2.f2178c = new c.f.j.d.e(i5, i5);
+                                b2.f2184c = new c.f.j.d.e(i5, i5);
                             }
                             m.checkNotNullExpressionValue(b2, "request");
                             f.h = b2.a();
@@ -413,7 +413,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
                                     background3.setColorFilter(next.p.a, PorterDuff.Mode.SRC_ATOP);
                                 }
                                 c.a.f.i.a aVar9 = next.i;
-                                if (!(aVar9 == null || (textView2 = aVar9.f54c) == null)) {
+                                if (!(aVar9 == null || (textView2 = aVar9.f53c) == null)) {
                                     textView2.setTextColor(next.p.g);
                                 }
                                 c.a.f.i.a aVar10 = next.i;
@@ -432,7 +432,7 @@ public final class ChipsView<K, V extends a> extends ScrollView implements d.a {
                                     background2.setColorFilter(next.p.d, PorterDuff.Mode.SRC_ATOP);
                                 }
                                 c.a.f.i.a aVar12 = next.i;
-                                if (!(aVar12 == null || (textView = aVar12.f54c) == null)) {
+                                if (!(aVar12 == null || (textView = aVar12.f53c) == null)) {
                                     textView.setTextColor(next.p.e);
                                 }
                                 c.a.f.i.a aVar13 = next.i;
diff --git a/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java b/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java
index d5892aea6b..15ae998918 100644
--- a/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java
@@ -14,7 +14,7 @@ public final class AnchoredVoiceControlsViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1600c;
+    public final ImageView f1596c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class AnchoredVoiceControlsViewBinding implements ViewBinding {
     public AnchoredVoiceControlsViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton, @NonNull ImageView imageView4, @NonNull ImageView imageView5) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1600c = imageView2;
+        this.f1596c = imageView2;
         this.d = imageView3;
         this.e = materialButton;
         this.f = imageView4;
diff --git a/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java b/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java
index 2a0f20a3a8..2dd563fdf3 100644
--- a/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java
@@ -14,12 +14,12 @@ public final class CommandCategoryItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f1601c;
+    public final n f1597c;
 
     public CommandCategoryItemBinding(@NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull n nVar) {
         this.a = frameLayout;
         this.b = simpleDraweeView;
-        this.f1601c = nVar;
+        this.f1597c = nVar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java b/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java
index 249bab6c40..1f8834b0f8 100644
--- a/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java
@@ -15,14 +15,14 @@ public final class ConfirmRemovePermissionDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1602c;
+    public final MaterialButton f1598c;
     @NonNull
     public final LoadingButton d;
 
     public ConfirmRemovePermissionDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1602c = materialButton;
+        this.f1598c = materialButton;
         this.d = loadingButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java b/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java
index 98902b1d4b..9439f9c896 100644
--- a/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java
@@ -15,7 +15,7 @@ public final class ContactSyncPermissionsSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1603c;
+    public final CheckedSetting f1599c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class ContactSyncPermissionsSheetBinding implements ViewBinding {
     public ContactSyncPermissionsSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView3) {
         this.a = constraintLayout;
         this.b = checkedSetting;
-        this.f1603c = checkedSetting2;
+        this.f1599c = checkedSetting2;
         this.d = linkifiedTextView;
         this.e = checkedSetting3;
     }
diff --git a/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java b/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java
index 669e997066..2c971389e5 100644
--- a/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java
@@ -16,14 +16,14 @@ public final class ContactSyncUpsellSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1604c;
+    public final MaterialButton f1600c;
     @NonNull
     public final g0 d;
 
     public ContactSyncUpsellSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull g0 g0Var) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f1604c = materialButton2;
+        this.f1600c = materialButton2;
         this.d = g0Var;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java b/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java
index 1728b016a5..2ae49c4965 100644
--- a/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java
+++ b/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java
@@ -14,12 +14,12 @@ public final class EmojiCategoryItemGuildBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f1605c;
+    public final n f1601c;
 
     public EmojiCategoryItemGuildBinding(@NonNull FrameLayout frameLayout, @NonNull GuildIcon guildIcon, @NonNull n nVar) {
         this.a = frameLayout;
         this.b = guildIcon;
-        this.f1605c = nVar;
+        this.f1601c = nVar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java b/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java
index e4face7cbd..9364d4c647 100644
--- a/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java
+++ b/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java
@@ -14,12 +14,12 @@ public final class EmojiCategoryItemStandardBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f1606c;
+    public final n f1602c;
 
     public EmojiCategoryItemStandardBinding(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull n nVar) {
         this.a = frameLayout;
         this.b = imageView;
-        this.f1606c = nVar;
+        this.f1602c = nVar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java b/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java
index 6d0ed295f8..20cff224a8 100644
--- a/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java
@@ -16,31 +16,31 @@ public final class EmptyFriendsStateContactSyncViewBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1607c;
+    public final MaterialButton f1603c;
     @NonNull
     public final TextView d;
 
     public EmptyFriendsStateContactSyncViewBinding(@NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull TextView textView2) {
         this.a = view;
         this.b = textView;
-        this.f1607c = materialButton;
+        this.f1603c = materialButton;
         this.d = textView2;
     }
 
     @NonNull
     public static EmptyFriendsStateContactSyncViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
         layoutInflater.inflate(2131558485, viewGroup);
-        int i = 2131362824;
-        TextView textView = (TextView) viewGroup.findViewById(2131362824);
+        int i = 2131362849;
+        TextView textView = (TextView) viewGroup.findViewById(2131362849);
         if (textView != null) {
-            i = 2131363028;
-            MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363028);
+            i = 2131363053;
+            MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363053);
             if (materialButton != null) {
-                i = 2131363029;
-                ImageView imageView = (ImageView) viewGroup.findViewById(2131363029);
+                i = 2131363054;
+                ImageView imageView = (ImageView) viewGroup.findViewById(2131363054);
                 if (imageView != null) {
-                    i = 2131363030;
-                    TextView textView2 = (TextView) viewGroup.findViewById(2131363030);
+                    i = 2131363055;
+                    TextView textView2 = (TextView) viewGroup.findViewById(2131363055);
                     if (textView2 != null) {
                         return new EmptyFriendsStateContactSyncViewBinding(viewGroup, textView, materialButton, imageView, textView2);
                     }
diff --git a/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java b/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java
index dda2e9ff0c..6087faf342 100644
--- a/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java
@@ -17,26 +17,26 @@ public final class EmptyFriendsStateViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1608c;
+    public final TextView f1604c;
 
     public EmptyFriendsStateViewBinding(@NonNull View view, @NonNull MaterialButton materialButton, @Nullable ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = view;
         this.b = materialButton;
-        this.f1608c = textView;
+        this.f1604c = textView;
     }
 
     @NonNull
     public static EmptyFriendsStateViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
         layoutInflater.inflate(2131558486, viewGroup);
-        int i = 2131363027;
-        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363027);
+        int i = 2131363052;
+        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363052);
         if (materialButton != null) {
-            ImageView imageView = (ImageView) viewGroup.findViewById(2131363031);
-            i = 2131363032;
-            TextView textView = (TextView) viewGroup.findViewById(2131363032);
+            ImageView imageView = (ImageView) viewGroup.findViewById(2131363056);
+            i = 2131363057;
+            TextView textView = (TextView) viewGroup.findViewById(2131363057);
             if (textView != null) {
-                i = 2131365133;
-                TextView textView2 = (TextView) viewGroup.findViewById(2131365133);
+                i = 2131365188;
+                TextView textView2 = (TextView) viewGroup.findViewById(2131365188);
                 if (textView2 != null) {
                     return new EmptyFriendsStateViewBinding(viewGroup, materialButton, imageView, textView, textView2);
                 }
diff --git a/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java b/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java
index 8e2b57a192..c774cbc892 100644
--- a/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java
@@ -18,7 +18,7 @@ public final class FeedbackViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1609c;
+    public final TextView f1605c;
     @NonNull
     public final CardView d;
     @NonNull
@@ -35,7 +35,7 @@ public final class FeedbackViewBinding implements ViewBinding {
     public FeedbackViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageButton imageButton, @NonNull TextView textView, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull ImageButton imageButton2, @NonNull ConstraintLayout constraintLayout, @NonNull TextView textView2, @NonNull ImageView imageView) {
         this.a = linearLayout;
         this.b = imageButton;
-        this.f1609c = textView;
+        this.f1605c = textView;
         this.d = cardView;
         this.e = recyclerView;
         this.f = imageButton2;
diff --git a/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java b/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java
index 7aa5dc28c0..46c4b4f74a 100644
--- a/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java
@@ -15,14 +15,14 @@ public final class GifCategoryItemViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1610c;
+    public final SimpleDraweeView f1606c;
     @NonNull
     public final TextView d;
 
     public GifCategoryItemViewBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = cardView;
         this.b = imageView;
-        this.f1610c = simpleDraweeView;
+        this.f1606c = simpleDraweeView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java b/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java
index b215e61d26..7a406415e4 100644
--- a/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java
@@ -14,12 +14,12 @@ public final class GifSuggestedTermViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1611c;
+    public final TextView f1607c;
 
     public GifSuggestedTermViewBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull FlexboxLayout flexboxLayout, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = flexboxLayout;
-        this.f1611c = textView;
+        this.f1607c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java
index c56ad25fbe..d3cda0e9b6 100644
--- a/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java
@@ -15,7 +15,7 @@ public final class GroupInviteFriendsBottomSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1612c;
+    public final RecyclerView f1608c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
@@ -24,7 +24,7 @@ public final class GroupInviteFriendsBottomSheetBinding implements ViewBinding {
     public GroupInviteFriendsBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ChipsView chipsView, @NonNull RecyclerView recyclerView, @NonNull ConstraintLayout constraintLayout2, @NonNull AppCompatImageView appCompatImageView) {
         this.a = constraintLayout;
         this.b = chipsView;
-        this.f1612c = recyclerView;
+        this.f1608c = recyclerView;
         this.d = constraintLayout2;
         this.e = appCompatImageView;
     }
diff --git a/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java b/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java
index 8a76babcca..b3dca9814c 100644
--- a/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java
@@ -15,14 +15,14 @@ public final class GroupInviteFriendsSheetItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1613c;
+    public final TextView f1609c;
     @NonNull
     public final MaterialCheckBox d;
 
     public GroupInviteFriendsSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialCheckBox materialCheckBox) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1613c = textView;
+        this.f1609c = textView;
         this.d = materialCheckBox;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java b/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java
index b376394ace..c483481dd8 100644
--- a/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java
@@ -14,12 +14,12 @@ public final class GuildTemplateChannelsItemViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1614c;
+    public final TextView f1610c;
 
     public GuildTemplateChannelsItemViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1614c = textView;
+        this.f1610c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java b/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java
index d957c08812..d8ab945e8c 100644
--- a/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java
@@ -17,7 +17,7 @@ public final class InlineMediaViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1615c;
+    public final SimpleDraweeView f1611c;
     @NonNull
     public final ProgressBar d;
     @NonNull
@@ -30,7 +30,7 @@ public final class InlineMediaViewBinding implements ViewBinding {
     public InlineMediaViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ProgressBar progressBar, @NonNull ImageView imageView2, @NonNull PlayerView playerView, @NonNull ImageView imageView3) {
         this.a = view;
         this.b = imageView;
-        this.f1615c = simpleDraweeView;
+        this.f1611c = simpleDraweeView;
         this.d = progressBar;
         this.e = imageView2;
         this.f = playerView;
@@ -40,23 +40,23 @@ public final class InlineMediaViewBinding implements ViewBinding {
     @NonNull
     public static InlineMediaViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
         layoutInflater.inflate(2131558526, viewGroup);
-        int i = 2131363578;
-        ImageView imageView = (ImageView) viewGroup.findViewById(2131363578);
+        int i = 2131363619;
+        ImageView imageView = (ImageView) viewGroup.findViewById(2131363619);
         if (imageView != null) {
-            i = 2131363579;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363579);
+            i = 2131363620;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363620);
             if (simpleDraweeView != null) {
-                i = 2131363580;
-                ProgressBar progressBar = (ProgressBar) viewGroup.findViewById(2131363580);
+                i = 2131363621;
+                ProgressBar progressBar = (ProgressBar) viewGroup.findViewById(2131363621);
                 if (progressBar != null) {
-                    i = 2131363581;
-                    ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363581);
+                    i = 2131363622;
+                    ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363622);
                     if (imageView2 != null) {
-                        i = 2131363582;
-                        PlayerView playerView = (PlayerView) viewGroup.findViewById(2131363582);
+                        i = 2131363623;
+                        PlayerView playerView = (PlayerView) viewGroup.findViewById(2131363623);
                         if (playerView != null) {
-                            i = 2131363583;
-                            ImageView imageView3 = (ImageView) viewGroup.findViewById(2131363583);
+                            i = 2131363624;
+                            ImageView imageView3 = (ImageView) viewGroup.findViewById(2131363624);
                             if (imageView3 != null) {
                                 return new InlineMediaViewBinding(viewGroup, imageView, simpleDraweeView, progressBar, imageView2, playerView, imageView3);
                             }
diff --git a/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java b/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java
index eec5931aa1..6a33cf9101 100644
--- a/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java
+++ b/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java
@@ -14,12 +14,12 @@ public final class LayoutUnhandledUriBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1616c;
+    public final MaterialButton f1612c;
 
     public LayoutUnhandledUriBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1616c = materialButton;
+        this.f1612c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java b/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java
index b9588eb603..3760b9111c 100644
--- a/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java
@@ -15,7 +15,7 @@ public final class LeaveGuildDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f1617c;
+    public final LoadingButton f1613c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class LeaveGuildDialogBinding implements ViewBinding {
     public LeaveGuildDialogBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1617c = loadingButton;
+        this.f1613c = loadingButton;
         this.d = textView;
         this.e = textView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java b/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java
index 455d373748..88b196a0fe 100644
--- a/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java
@@ -13,14 +13,14 @@ public final class NotificationMuteSettingsViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1618c;
+    public final TextView f1614c;
     @NonNull
     public final TextView d;
 
     public NotificationMuteSettingsViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1618c = textView2;
+        this.f1614c = textView2;
         this.d = textView3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java b/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java
index dc8c74fb7f..3ef94e0d26 100644
--- a/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java
@@ -14,12 +14,12 @@ public final class OauthTokenPermissionDetailedListItemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1619c;
+    public final TextView f1615c;
 
     public OauthTokenPermissionDetailedListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f1619c = textView;
+        this.f1615c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java b/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java
index dfddc85b4d..a172e1376c 100644
--- a/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java
@@ -14,12 +14,12 @@ public final class PaymentMethodListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final PaymentSourceView f1620c;
+    public final PaymentSourceView f1616c;
 
     public PaymentMethodListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull PaymentSourceView paymentSourceView) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f1620c = paymentSourceView;
+        this.f1616c = paymentSourceView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java b/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java
index 91d02bed14..08a778b88d 100644
--- a/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java
@@ -14,7 +14,7 @@ public final class PaymentSourceViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1621c;
+    public final TextView f1617c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class PaymentSourceViewBinding implements ViewBinding {
     public PaymentSourceViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = view;
         this.b = imageView;
-        this.f1621c = textView;
+        this.f1617c = textView;
         this.d = imageView2;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java b/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java
index 1667195272..0b7545af4d 100644
--- a/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java
@@ -14,7 +14,7 @@ public final class PublishMessageDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1622c;
+    public final MaterialButton f1618c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class PublishMessageDialogBinding implements ViewBinding {
     public PublishMessageDialogBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1622c = materialButton;
+        this.f1618c = materialButton;
         this.d = textView2;
         this.e = linearLayout3;
         this.f = materialButton2;
diff --git a/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java b/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java
index a8e4fab808..5fb2e03f6c 100644
--- a/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java
@@ -14,12 +14,12 @@ public final class RemovablePermissionOwnerViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1623c;
+    public final ImageView f1619c;
 
     public RemovablePermissionOwnerViewBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ChannelPermissionOwnerView channelPermissionOwnerView, @NonNull ImageView imageView) {
         this.a = constraintLayout;
         this.b = channelPermissionOwnerView;
-        this.f1623c = imageView;
+        this.f1619c = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java b/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java
index bb1c4f2856..1f4503ff3f 100644
--- a/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java
@@ -14,12 +14,12 @@ public final class SettingsChannelListCategoryItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1624c;
+    public final TextView f1620c;
 
     public SettingsChannelListCategoryItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1624c = textView;
+        this.f1620c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java b/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java
index a62aa19035..436d2a52ac 100644
--- a/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java
@@ -14,7 +14,7 @@ public final class SettingsChannelListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1625c;
+    public final ImageView f1621c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class SettingsChannelListItemBinding implements ViewBinding {
     public SettingsChannelListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull View view) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1625c = imageView2;
+        this.f1621c = imageView2;
         this.d = textView;
         this.e = view;
     }
diff --git a/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java b/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java
index 9b2f992175..66cdfcdfe3 100644
--- a/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java
@@ -14,12 +14,12 @@ public final class SimpleMemberListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1626c;
+    public final TextView f1622c;
 
     public SimpleMemberListItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = simpleDraweeView;
-        this.f1626c = textView;
+        this.f1622c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java
index 11b9e68633..28ae06bd30 100644
--- a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java
@@ -13,12 +13,12 @@ public final class StageAudienceBlockedBottomSheetHeaderItemBinding implements V
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialTextView f1627c;
+    public final MaterialTextView f1623c;
 
     public StageAudienceBlockedBottomSheetHeaderItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialTextView materialTextView, @NonNull MaterialTextView materialTextView2) {
         this.a = constraintLayout;
         this.b = materialTextView;
-        this.f1627c = materialTextView2;
+        this.f1623c = materialTextView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java
index d4f89635bd..1acfbd43f4 100644
--- a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java
@@ -16,7 +16,7 @@ public final class StageAudienceBlockedBottomSheetItemBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CutoutView f1628c;
+    public final CutoutView f1624c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class StageAudienceBlockedBottomSheetItemBinding implements ViewBin
     public StageAudienceBlockedBottomSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CutoutView cutoutView, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull View view, @NonNull TextView textView3) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1628c = cutoutView;
+        this.f1624c = cutoutView;
         this.d = textView;
         this.e = imageView;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java b/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java
index 25b227b169..ddc321190a 100644
--- a/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java
@@ -15,7 +15,7 @@ public final class StageRaisedHandsItemUserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1629c;
+    public final ImageView f1625c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class StageRaisedHandsItemUserBinding implements ViewBinding {
     public StageRaisedHandsItemUserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f1629c = imageView2;
+        this.f1625c = imageView2;
         this.d = textView;
         this.e = simpleDraweeView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/StickerCategoryItemGuildBinding.java b/app/src/main/java/com/discord/databinding/StickerCategoryItemGuildBinding.java
new file mode 100644
index 0000000000..d8bdd9c6f0
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/StickerCategoryItemGuildBinding.java
@@ -0,0 +1,30 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import c.a.i.n;
+import com.discord.widgets.chat.input.emoji.GuildIcon;
+public final class StickerCategoryItemGuildBinding implements ViewBinding {
+    @NonNull
+    public final FrameLayout a;
+    @NonNull
+    public final n b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final GuildIcon f1626c;
+
+    public StickerCategoryItemGuildBinding(@NonNull FrameLayout frameLayout, @NonNull n nVar, @NonNull GuildIcon guildIcon) {
+        this.a = frameLayout;
+        this.b = nVar;
+        this.f1626c = guildIcon;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java b/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java
index 4418356fb1..fbe97d5c27 100644
--- a/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java
+++ b/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java
@@ -14,12 +14,12 @@ public final class StickerCategoryItemPackBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final StickerView f1630c;
+    public final StickerView f1627c;
 
     public StickerCategoryItemPackBinding(@NonNull FrameLayout frameLayout, @NonNull n nVar, @NonNull StickerView stickerView) {
         this.a = frameLayout;
         this.b = nVar;
-        this.f1630c = stickerView;
+        this.f1627c = stickerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java b/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java
index 50dd558a36..0b3ea2213c 100644
--- a/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java
@@ -13,7 +13,7 @@ public final class StickerPackDetailsDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1631c;
+    public final TextView f1628c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class StickerPackDetailsDialogBinding implements ViewBinding {
     public StickerPackDetailsDialogBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) {
         this.a = frameLayout;
         this.b = textView;
-        this.f1631c = textView2;
+        this.f1628c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
diff --git a/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java
index cc58283036..c5cf92ebdb 100644
--- a/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java
@@ -16,7 +16,7 @@ public final class StickerStoreHeaderItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1632c;
+    public final RelativeLayout f1629c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class StickerStoreHeaderItemBinding implements ViewBinding {
     public StickerStoreHeaderItemBinding(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull Chip chip, @NonNull FrameLayout frameLayout2, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = frameLayout;
-        this.f1632c = relativeLayout;
+        this.f1629c = relativeLayout;
         this.d = textView;
         this.e = frameLayout2;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java b/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java
index 1249946a9d..ca18008346 100644
--- a/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java
@@ -14,7 +14,7 @@ public final class SuggestedFriendViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppCompatImageView f1633c;
+    public final AppCompatImageView f1630c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class SuggestedFriendViewBinding implements ViewBinding {
     public SuggestedFriendViewBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView2) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f1633c = appCompatImageView;
+        this.f1630c = appCompatImageView;
         this.d = textView;
         this.e = appCompatImageView2;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java b/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java
index 39a04d1b34..9bc6096a1f 100644
--- a/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java
@@ -20,7 +20,7 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f1634c;
+    public final ConstraintLayout f1631c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -51,7 +51,7 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding {
     public TabsHostBottomNavigationViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView4, @NonNull FrameLayout frameLayout2, @NonNull ImageView imageView5, @NonNull FrameLayout frameLayout3, @NonNull LinearLayout linearLayout2, @NonNull UserAvatarPresenceView userAvatarPresenceView, @NonNull FrameLayout frameLayout4) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1634c = constraintLayout;
+        this.f1631c = constraintLayout;
         this.d = textView;
         this.e = imageView2;
         this.f = constraintLayout2;
@@ -73,50 +73,50 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding {
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131365172;
-        ImageView imageView = (ImageView) inflate.findViewById(2131365172);
+        int i = 2131365227;
+        ImageView imageView = (ImageView) inflate.findViewById(2131365227);
         if (imageView != null) {
-            i = 2131365173;
-            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131365173);
+            i = 2131365228;
+            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131365228);
             if (constraintLayout != null) {
-                i = 2131365174;
-                TextView textView = (TextView) inflate.findViewById(2131365174);
+                i = 2131365229;
+                TextView textView = (TextView) inflate.findViewById(2131365229);
                 if (textView != null) {
-                    i = 2131365175;
-                    ImageView imageView2 = (ImageView) inflate.findViewById(2131365175);
+                    i = 2131365230;
+                    ImageView imageView2 = (ImageView) inflate.findViewById(2131365230);
                     if (imageView2 != null) {
-                        i = 2131365176;
-                        ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131365176);
+                        i = 2131365231;
+                        ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131365231);
                         if (constraintLayout2 != null) {
-                            i = 2131365177;
-                            TextView textView2 = (TextView) inflate.findViewById(2131365177);
+                            i = 2131365232;
+                            TextView textView2 = (TextView) inflate.findViewById(2131365232);
                             if (textView2 != null) {
-                                i = 2131365178;
-                                ImageView imageView3 = (ImageView) inflate.findViewById(2131365178);
+                                i = 2131365233;
+                                ImageView imageView3 = (ImageView) inflate.findViewById(2131365233);
                                 if (imageView3 != null) {
-                                    i = 2131365179;
-                                    FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131365179);
+                                    i = 2131365234;
+                                    FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131365234);
                                     if (frameLayout != null) {
-                                        i = 2131365180;
-                                        ImageView imageView4 = (ImageView) inflate.findViewById(2131365180);
+                                        i = 2131365235;
+                                        ImageView imageView4 = (ImageView) inflate.findViewById(2131365235);
                                         if (imageView4 != null) {
-                                            i = 2131365181;
-                                            FrameLayout frameLayout2 = (FrameLayout) inflate.findViewById(2131365181);
+                                            i = 2131365236;
+                                            FrameLayout frameLayout2 = (FrameLayout) inflate.findViewById(2131365236);
                                             if (frameLayout2 != null) {
-                                                i = 2131365182;
-                                                ImageView imageView5 = (ImageView) inflate.findViewById(2131365182);
+                                                i = 2131365237;
+                                                ImageView imageView5 = (ImageView) inflate.findViewById(2131365237);
                                                 if (imageView5 != null) {
-                                                    i = 2131365183;
-                                                    FrameLayout frameLayout3 = (FrameLayout) inflate.findViewById(2131365183);
+                                                    i = 2131365238;
+                                                    FrameLayout frameLayout3 = (FrameLayout) inflate.findViewById(2131365238);
                                                     if (frameLayout3 != null) {
-                                                        i = 2131365184;
-                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365184);
+                                                        i = 2131365239;
+                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365239);
                                                         if (linearLayout != null) {
-                                                            i = 2131365185;
-                                                            UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131365185);
+                                                            i = 2131365240;
+                                                            UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131365240);
                                                             if (userAvatarPresenceView != null) {
-                                                                i = 2131365186;
-                                                                FrameLayout frameLayout4 = (FrameLayout) inflate.findViewById(2131365186);
+                                                                i = 2131365241;
+                                                                FrameLayout frameLayout4 = (FrameLayout) inflate.findViewById(2131365241);
                                                                 if (frameLayout4 != null) {
                                                                     return new TabsHostBottomNavigationViewBinding((LinearLayout) inflate, imageView, constraintLayout, textView, imageView2, constraintLayout2, textView2, imageView3, frameLayout, imageView4, frameLayout2, imageView5, frameLayout3, linearLayout, userAvatarPresenceView, frameLayout4);
                                                                 }
diff --git a/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java b/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java
index 573c2ef02f..f3016c999e 100644
--- a/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java
@@ -16,7 +16,7 @@ public final class ThreadBrowserThreadViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1635c;
+    public final ImageView f1632c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class ThreadBrowserThreadViewBinding implements ViewBinding {
     public ThreadBrowserThreadViewBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f1635c = imageView;
+        this.f1632c = imageView;
         this.d = simpleDraweeSpanTextView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java
index e36ab1dd79..688a954bd4 100644
--- a/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java
@@ -13,7 +13,7 @@ public final class UserProfileAdminViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1636c;
+    public final TextView f1633c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class UserProfileAdminViewBinding implements ViewBinding {
     public UserProfileAdminViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1636c = textView2;
+        this.f1633c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
diff --git a/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java
index 49e41ee95b..cc77ce22d8 100644
--- a/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java
@@ -14,14 +14,14 @@ public final class UserProfileConnectionsViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1637c;
+    public final TextView f1634c;
     @NonNull
     public final RecyclerView d;
 
     public UserProfileConnectionsViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1637c = textView2;
+        this.f1634c = textView2;
         this.d = recyclerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java
index 5f8f575a5a..489a961d5d 100644
--- a/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java
@@ -16,31 +16,37 @@ public final class UserProfileHeaderViewBinding implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
     @NonNull
-    public final SimpleDraweeView b;
+    public final CardView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CardView f1638c;
+    public final SimpleDraweeView f1635c;
     @NonNull
-    public final UserAvatarPresenceView d;
+    public final CardView d;
     @NonNull
-    public final RecyclerView e;
+    public final CardView e;
     @NonNull
-    public final SimpleDraweeSpanTextView f;
+    public final UserAvatarPresenceView f;
     @NonNull
-    public final UsernameView g;
+    public final RecyclerView g;
     @NonNull
     public final SimpleDraweeSpanTextView h;
+    @NonNull
+    public final UsernameView i;
+    @NonNull
+    public final SimpleDraweeSpanTextView j;
 
-    public UserProfileHeaderViewBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CardView cardView, @NonNull UserAvatarPresenceView userAvatarPresenceView, @NonNull Barrier barrier, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull LinearLayout linearLayout, @NonNull UsernameView usernameView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView2, @NonNull ConstraintLayout constraintLayout2) {
+    public UserProfileHeaderViewBinding(@NonNull ConstraintLayout constraintLayout, @NonNull CardView cardView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CardView cardView2, @NonNull CardView cardView3, @NonNull UserAvatarPresenceView userAvatarPresenceView, @NonNull Barrier barrier, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull LinearLayout linearLayout, @NonNull UsernameView usernameView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView2, @NonNull ConstraintLayout constraintLayout2) {
         this.a = constraintLayout;
-        this.b = simpleDraweeView;
-        this.f1638c = cardView;
-        this.d = userAvatarPresenceView;
-        this.e = recyclerView;
-        this.f = simpleDraweeSpanTextView;
-        this.g = usernameView;
-        this.h = simpleDraweeSpanTextView2;
+        this.b = cardView;
+        this.f1635c = simpleDraweeView;
+        this.d = cardView2;
+        this.e = cardView3;
+        this.f = userAvatarPresenceView;
+        this.g = recyclerView;
+        this.h = simpleDraweeSpanTextView;
+        this.i = usernameView;
+        this.j = simpleDraweeSpanTextView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java
index 0cb3512e02..03cce5724b 100644
--- a/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java
@@ -13,12 +13,12 @@ public final class UserProfileStageActionsViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1639c;
+    public final TextView f1636c;
 
     public UserProfileStageActionsViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1639c = textView2;
+        this.f1636c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java
index 8778f0533c..1cc6366ea2 100644
--- a/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java
@@ -15,7 +15,7 @@ public final class UserProfileVoiceSettingsViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SwitchMaterial f1640c;
+    public final SwitchMaterial f1637c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class UserProfileVoiceSettingsViewBinding implements ViewBinding {
     public UserProfileVoiceSettingsViewBinding(@NonNull LinearLayout linearLayout, @NonNull SwitchMaterial switchMaterial, @NonNull SwitchMaterial switchMaterial2, @NonNull TextView textView, @NonNull VolumeSliderView volumeSliderView) {
         this.a = linearLayout;
         this.b = switchMaterial;
-        this.f1640c = switchMaterial2;
+        this.f1637c = switchMaterial2;
         this.d = textView;
         this.e = volumeSliderView;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java b/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java
index 9d84f2fd2b..d1c41ae28b 100644
--- a/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java
@@ -24,11 +24,11 @@ public final class ViewAddPermissionOwnerBinding implements ViewBinding {
         int i = 2131361917;
         ImageView imageView = (ImageView) viewGroup.findViewById(2131361917);
         if (imageView != null) {
-            i = 2131363730;
-            TextView textView = (TextView) viewGroup.findViewById(2131363730);
+            i = 2131363771;
+            TextView textView = (TextView) viewGroup.findViewById(2131363771);
             if (textView != null) {
-                i = 2131363958;
-                ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363958);
+                i = 2131363999;
+                ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363999);
                 if (imageView2 != null) {
                     return new ViewAddPermissionOwnerBinding(viewGroup, imageView, textView, imageView2);
                 }
diff --git a/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java b/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java
index 3f28d34268..62efbd55aa 100644
--- a/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java
@@ -14,12 +14,12 @@ public final class ViewAppcommandsOptiontitleListitemBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1641c;
+    public final SimpleDraweeView f1638c;
 
     public ViewAppcommandsOptiontitleListitemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f1641c = simpleDraweeView;
+        this.f1638c = simpleDraweeView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java b/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java
index 657ade8301..286816c3eb 100644
--- a/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java
@@ -16,7 +16,7 @@ public final class ViewAuthInviteInfoBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1642c;
+    public final TextView f1639c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class ViewAuthInviteInfoBinding implements ViewBinding {
     public ViewAuthInviteInfoBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f1642c = textView;
+        this.f1639c = textView;
         this.d = textView2;
         this.e = imageView;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java b/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java
index a2eaef41f0..3e57d5f0ba 100644
--- a/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java
@@ -15,12 +15,12 @@ public final class ViewCategoryOverrideItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1643c;
+    public final TextView f1640c;
 
     public ViewCategoryOverrideItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull Guideline guideline, @NonNull ImageView imageView) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f1643c = textView2;
+        this.f1640c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java b/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java
index 5b8efdfaab..b71f942c80 100644
--- a/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java
@@ -15,14 +15,14 @@ public final class ViewChannelOverrideItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1644c;
+    public final TextView f1641c;
     @NonNull
     public final TextView d;
 
     public ViewChannelOverrideItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull Guideline guideline, @NonNull ImageView imageView) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f1644c = textView2;
+        this.f1641c = textView2;
         this.d = textView3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java b/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java
index e8a1b0ae7d..5e95df0a26 100644
--- a/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java
@@ -18,7 +18,7 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1645c;
+    public final TextView f1642c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -35,7 +35,7 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding {
     public ViewChatEmbedGameInviteBinding(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView3, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull TextView textView3) {
         this.a = view;
         this.b = materialButton;
-        this.f1645c = textView;
+        this.f1642c = textView;
         this.d = simpleDraweeView;
         this.e = simpleDraweeView2;
         this.f = simpleDraweeView3;
@@ -47,32 +47,32 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding {
     @NonNull
     public static ViewChatEmbedGameInviteBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
         layoutInflater.inflate(2131558727, viewGroup);
-        int i = 2131363650;
-        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363650);
+        int i = 2131363691;
+        MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363691);
         if (materialButton != null) {
-            i = 2131363651;
-            TextView textView = (TextView) viewGroup.findViewById(2131363651);
+            i = 2131363692;
+            TextView textView = (TextView) viewGroup.findViewById(2131363692);
             if (textView != null) {
-                i = 2131363652;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363652);
+                i = 2131363693;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363693);
                 if (simpleDraweeView != null) {
-                    i = 2131363653;
-                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) viewGroup.findViewById(2131363653);
+                    i = 2131363694;
+                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) viewGroup.findViewById(2131363694);
                     if (simpleDraweeView2 != null) {
-                        i = 2131363654;
-                        Barrier barrier = (Barrier) viewGroup.findViewById(2131363654);
+                        i = 2131363695;
+                        Barrier barrier = (Barrier) viewGroup.findViewById(2131363695);
                         if (barrier != null) {
-                            i = 2131363655;
-                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) viewGroup.findViewById(2131363655);
+                            i = 2131363696;
+                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) viewGroup.findViewById(2131363696);
                             if (simpleDraweeView3 != null) {
-                                i = 2131363656;
-                                TextView textView2 = (TextView) viewGroup.findViewById(2131363656);
+                                i = 2131363697;
+                                TextView textView2 = (TextView) viewGroup.findViewById(2131363697);
                                 if (textView2 != null) {
-                                    i = 2131363657;
-                                    RecyclerView recyclerView = (RecyclerView) viewGroup.findViewById(2131363657);
+                                    i = 2131363698;
+                                    RecyclerView recyclerView = (RecyclerView) viewGroup.findViewById(2131363698);
                                     if (recyclerView != null) {
-                                        i = 2131363658;
-                                        TextView textView3 = (TextView) viewGroup.findViewById(2131363658);
+                                        i = 2131363699;
+                                        TextView textView3 = (TextView) viewGroup.findViewById(2131363699);
                                         if (textView3 != null) {
                                             return new ViewChatEmbedGameInviteBinding(viewGroup, materialButton, textView, simpleDraweeView, simpleDraweeView2, barrier, simpleDraweeView3, textView2, recyclerView, textView3);
                                         }
diff --git a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java
index 1d42233cbd..ba03036518 100644
--- a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java
@@ -13,12 +13,12 @@ public final class ViewCommunityGetStartedHeaderBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1646c;
+    public final TextView f1643c;
 
     public ViewCommunityGetStartedHeaderBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = view;
         this.b = imageView;
-        this.f1646c = textView;
+        this.f1643c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java
index 5a08975f5c..8c86ae2b7f 100644
--- a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java
@@ -16,14 +16,14 @@ public final class ViewCommunityGetStartedInformationBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1647c;
+    public final ImageView f1644c;
     @NonNull
     public final TextView d;
 
     public ViewCommunityGetStartedInformationBinding(@NonNull View view, @NonNull Guideline guideline, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2) {
         this.a = view;
         this.b = textView;
-        this.f1647c = imageView;
+        this.f1644c = imageView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java b/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java
index 2a90ad3f15..e61cfc9738 100644
--- a/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java
@@ -15,7 +15,7 @@ public final class ViewConnectionGuildIntegrationBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1648c;
+    public final SimpleDraweeView f1645c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class ViewConnectionGuildIntegrationBinding implements ViewBinding
     public ViewConnectionGuildIntegrationBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton) {
         this.a = cardView;
         this.b = textView;
-        this.f1648c = simpleDraweeView;
+        this.f1645c = simpleDraweeView;
         this.d = textView2;
         this.e = textView3;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java b/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java
index 0e1882e471..7031ccb6d2 100644
--- a/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java
@@ -14,7 +14,7 @@ public final class ViewDialogConfirmationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1649c;
+    public final MaterialButton f1646c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,24 +23,24 @@ public final class ViewDialogConfirmationBinding implements ViewBinding {
     public ViewDialogConfirmationBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1649c = materialButton2;
+        this.f1646c = materialButton2;
         this.d = textView;
         this.e = textView2;
     }
 
     @NonNull
     public static ViewDialogConfirmationBinding a(@NonNull View view) {
-        int i = 2131365489;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365489);
+        int i = 2131365550;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365550);
         if (materialButton != null) {
-            i = 2131365490;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365490);
+            i = 2131365551;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365551);
             if (materialButton2 != null) {
-                i = 2131365491;
-                TextView textView = (TextView) view.findViewById(2131365491);
+                i = 2131365552;
+                TextView textView = (TextView) view.findViewById(2131365552);
                 if (textView != null) {
-                    i = 2131365492;
-                    TextView textView2 = (TextView) view.findViewById(2131365492);
+                    i = 2131365553;
+                    TextView textView2 = (TextView) view.findViewById(2131365553);
                     if (textView2 != null) {
                         return new ViewDialogConfirmationBinding((LinearLayout) view, materialButton, materialButton2, textView, textView2);
                     }
diff --git a/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java
index 5d4e8d88e7..549e4eafc3 100644
--- a/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java
@@ -17,7 +17,7 @@ public final class ViewGiftEntitlementListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1650c;
+    public final RelativeLayout f1647c;
     @NonNull
     public final FrameLayout d;
     @NonNull
@@ -34,7 +34,7 @@ public final class ViewGiftEntitlementListItemBinding implements ViewBinding {
     public ViewGiftEntitlementListItemBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout, @NonNull FrameLayout frameLayout2, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull AppViewFlipper appViewFlipper, @NonNull MaterialButton materialButton2, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = frameLayout;
         this.b = textView;
-        this.f1650c = relativeLayout;
+        this.f1647c = relativeLayout;
         this.d = frameLayout2;
         this.e = materialButton;
         this.f = view;
diff --git a/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java
index 7fb2b431d5..08aa3dfd96 100644
--- a/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java
@@ -15,7 +15,7 @@ public final class ViewGiftOutboundPromoListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1651c;
+    public final TextView f1648c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class ViewGiftOutboundPromoListItemBinding implements ViewBinding {
     public ViewGiftOutboundPromoListItemBinding(@NonNull MaterialCardView materialCardView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = materialCardView;
         this.b = materialButton;
-        this.f1651c = textView;
+        this.f1648c = textView;
         this.d = simpleDraweeView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java
index c242ed8aef..9a53a9f9a6 100644
--- a/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java
@@ -15,7 +15,7 @@ public final class ViewGiftSkuListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1652c;
+    public final TextView f1649c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class ViewGiftSkuListItemBinding implements ViewBinding {
     public ViewGiftSkuListItemBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2) {
         this.a = cardView;
         this.b = imageView;
-        this.f1652c = textView;
+        this.f1649c = textView;
         this.d = simpleDraweeView;
         this.e = textView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java
index 83371fae2c..833031e96a 100644
--- a/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java
@@ -15,7 +15,7 @@ public final class ViewGlobalSearchItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1653c;
+    public final TextView f1650c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class ViewGlobalSearchItemBinding implements ViewBinding {
     public ViewGlobalSearchItemBinding(@NonNull View view, @NonNull Guideline guideline, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView) {
         this.a = view;
         this.b = textView;
-        this.f1653c = textView2;
+        this.f1650c = textView2;
         this.d = simpleDraweeView;
         this.e = textView3;
         this.f = textView4;
diff --git a/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java
index b21540f07a..c66174bcaa 100644
--- a/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java
@@ -17,7 +17,7 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RadioGroup f1654c;
+    public final RadioGroup f1651c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -28,7 +28,7 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding {
     public ViewGuildInviteBottomSheetBinding(@NonNull View view, @NonNull Spinner spinner, @NonNull RadioGroup radioGroup, @NonNull MaterialButton materialButton, @NonNull RadioGroup radioGroup2, @NonNull CheckedSetting checkedSetting) {
         this.a = view;
         this.b = spinner;
-        this.f1654c = radioGroup;
+        this.f1651c = radioGroup;
         this.d = materialButton;
         this.e = radioGroup2;
         this.f = checkedSetting;
@@ -37,20 +37,20 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding {
     @NonNull
     public static ViewGuildInviteBottomSheetBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
         layoutInflater.inflate(2131558754, viewGroup);
-        int i = 2131363368;
-        Spinner spinner = (Spinner) viewGroup.findViewById(2131363368);
+        int i = 2131363394;
+        Spinner spinner = (Spinner) viewGroup.findViewById(2131363394);
         if (spinner != null) {
-            i = 2131363374;
-            RadioGroup radioGroup = (RadioGroup) viewGroup.findViewById(2131363374);
+            i = 2131363400;
+            RadioGroup radioGroup = (RadioGroup) viewGroup.findViewById(2131363400);
             if (radioGroup != null) {
-                i = 2131363375;
-                MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363375);
+                i = 2131363401;
+                MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363401);
                 if (materialButton != null) {
-                    i = 2131363378;
-                    RadioGroup radioGroup2 = (RadioGroup) viewGroup.findViewById(2131363378);
+                    i = 2131363404;
+                    RadioGroup radioGroup2 = (RadioGroup) viewGroup.findViewById(2131363404);
                     if (radioGroup2 != null) {
-                        i = 2131363387;
-                        CheckedSetting checkedSetting = (CheckedSetting) viewGroup.findViewById(2131363387);
+                        i = 2131363413;
+                        CheckedSetting checkedSetting = (CheckedSetting) viewGroup.findViewById(2131363413);
                         if (checkedSetting != null) {
                             return new ViewGuildInviteBottomSheetBinding(viewGroup, spinner, radioGroup, materialButton, radioGroup2, checkedSetting);
                         }
diff --git a/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java b/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java
index 9f82badb89..55489ec0e4 100644
--- a/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java
@@ -14,7 +14,7 @@ public final class ViewMemberVerificationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1655c;
+    public final MaterialButton f1652c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class ViewMemberVerificationBinding implements ViewBinding {
     public ViewMemberVerificationBinding(@NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull TextView textView2) {
         this.a = view;
         this.b = textView;
-        this.f1655c = materialButton;
+        this.f1652c = materialButton;
         this.d = imageView;
         this.e = textView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java b/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java
index 651b3f98a2..cd2ed960aa 100644
--- a/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
+import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
 public final class ViewMobileReportsBottomButtonBinding implements ViewBinding {
@@ -14,18 +15,18 @@ public final class ViewMobileReportsBottomButtonBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1656c;
+    public final MaterialButton f1653c;
     @NonNull
-    public final TextView d;
+    public final LinkifiedTextView d;
     @NonNull
     public final TextView e;
 
-    public ViewMobileReportsBottomButtonBinding(@NonNull View view, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2) {
+    public ViewMobileReportsBottomButtonBinding(@NonNull View view, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) {
         this.a = view;
         this.b = loadingButton;
-        this.f1656c = materialButton;
-        this.d = textView;
-        this.e = textView2;
+        this.f1653c = materialButton;
+        this.d = linkifiedTextView;
+        this.e = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java b/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java
index 9a6a5bdef2..af8c57533e 100644
--- a/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java
@@ -20,7 +20,7 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1657c;
+    public final RecyclerView f1654c;
     @NonNull
     public final RelativeLayout d;
     @NonNull
@@ -33,7 +33,7 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding {
     public ViewNitroBoostPerksBinding(@NonNull CardView cardView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2, @NonNull FrameLayout frameLayout, @NonNull TextView textView3, @NonNull CardView cardView2) {
         this.a = cardView;
         this.b = textView;
-        this.f1657c = recyclerView;
+        this.f1654c = recyclerView;
         this.d = relativeLayout;
         this.e = textView2;
         this.f = textView3;
@@ -46,29 +46,29 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding {
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131362748;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362748);
+        int i = 2131362772;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362772);
         if (linearLayout != null) {
-            i = 2131364194;
-            TextView textView = (TextView) inflate.findViewById(2131364194);
+            i = 2131364238;
+            TextView textView = (TextView) inflate.findViewById(2131364238);
             if (textView != null) {
-                i = 2131364195;
-                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364195);
+                i = 2131364239;
+                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364239);
                 if (recyclerView != null) {
-                    i = 2131364196;
-                    RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131364196);
+                    i = 2131364240;
+                    RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131364240);
                     if (relativeLayout != null) {
-                        i = 2131364197;
-                        TextView textView2 = (TextView) inflate.findViewById(2131364197);
+                        i = 2131364241;
+                        TextView textView2 = (TextView) inflate.findViewById(2131364241);
                         if (textView2 != null) {
-                            i = 2131364198;
-                            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131364198);
+                            i = 2131364242;
+                            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131364242);
                             if (frameLayout != null) {
-                                i = 2131364199;
-                                TextView textView3 = (TextView) inflate.findViewById(2131364199);
+                                i = 2131364243;
+                                TextView textView3 = (TextView) inflate.findViewById(2131364243);
                                 if (textView3 != null) {
-                                    i = 2131364200;
-                                    CardView cardView = (CardView) inflate.findViewById(2131364200);
+                                    i = 2131364244;
+                                    CardView cardView = (CardView) inflate.findViewById(2131364244);
                                     if (cardView != null) {
                                         return new ViewNitroBoostPerksBinding((CardView) inflate, linearLayout, textView, recyclerView, relativeLayout, textView2, frameLayout, textView3, cardView);
                                     }
diff --git a/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java b/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java
index c840a467bd..d0a803adfa 100644
--- a/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java
@@ -11,9 +11,9 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.c2;
-import c.a.i.d2;
-import c.a.i.i4;
+import c.a.i.e2;
+import c.a.i.f2;
+import c.a.i.l4;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.widgets.mobile_reports.MobileReportsBottomButton;
 import com.discord.widgets.mobile_reports.MobileReportsBreadcrumbs;
@@ -24,15 +24,15 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
     @NonNull
-    public final d2 b;
+    public final f2 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final i4 f1658c;
+    public final l4 f1655c;
     @NonNull
     public final LinearLayout d;
     @NonNull
-    public final c2 e;
+    public final e2 e;
     @NonNull
     public final MobileReportsBottomButton f;
     @NonNull
@@ -52,12 +52,12 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding {
     @NonNull
     public final ImageView n;
 
-    public ViewReportsMenuNodeBinding(@NonNull ConstraintLayout constraintLayout, @NonNull d2 d2Var, @NonNull i4 i4Var, @NonNull LinearLayout linearLayout, @NonNull c2 c2Var, @NonNull MobileReportsBottomButton mobileReportsBottomButton, @NonNull MobileReportsBreadcrumbs mobileReportsBreadcrumbs, @NonNull MaterialCardView materialCardView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView2, @NonNull MaterialCardView materialCardView3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ImageView imageView) {
+    public ViewReportsMenuNodeBinding(@NonNull ConstraintLayout constraintLayout, @NonNull f2 f2Var, @NonNull l4 l4Var, @NonNull LinearLayout linearLayout, @NonNull e2 e2Var, @NonNull MobileReportsBottomButton mobileReportsBottomButton, @NonNull MobileReportsBreadcrumbs mobileReportsBreadcrumbs, @NonNull MaterialCardView materialCardView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView2, @NonNull MaterialCardView materialCardView3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ImageView imageView) {
         this.a = constraintLayout;
-        this.b = d2Var;
-        this.f1658c = i4Var;
+        this.b = f2Var;
+        this.f1655c = l4Var;
         this.d = linearLayout;
-        this.e = c2Var;
+        this.e = e2Var;
         this.f = mobileReportsBottomButton;
         this.g = mobileReportsBreadcrumbs;
         this.h = materialCardView;
@@ -75,109 +75,109 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding {
         if (z2) {
             viewGroup.addView(inflate);
         }
-        int i = 2131363927;
-        View findViewById = inflate.findViewById(2131363927);
+        int i = 2131363968;
+        View findViewById = inflate.findViewById(2131363968);
         if (findViewById != null) {
-            int i2 = 2131363928;
-            Guideline guideline = (Guideline) findViewById.findViewById(2131363928);
+            int i2 = 2131363969;
+            Guideline guideline = (Guideline) findViewById.findViewById(2131363969);
             if (guideline != null) {
-                i2 = 2131363929;
-                TextView textView = (TextView) findViewById.findViewById(2131363929);
+                i2 = 2131363970;
+                TextView textView = (TextView) findViewById.findViewById(2131363970);
                 if (textView != null) {
-                    i2 = 2131363930;
-                    Guideline guideline2 = (Guideline) findViewById.findViewById(2131363930);
+                    i2 = 2131363971;
+                    Guideline guideline2 = (Guideline) findViewById.findViewById(2131363971);
                     if (guideline2 != null) {
-                        i2 = 2131363931;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131363931);
+                        i2 = 2131363972;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131363972);
                         if (simpleDraweeView != null) {
-                            i2 = 2131363932;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131363932);
+                            i2 = 2131363973;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131363973);
                             if (linkifiedTextView != null) {
-                                i2 = 2131363933;
-                                Guideline guideline3 = (Guideline) findViewById.findViewById(2131363933);
+                                i2 = 2131363974;
+                                Guideline guideline3 = (Guideline) findViewById.findViewById(2131363974);
                                 if (guideline3 != null) {
-                                    i2 = 2131363934;
-                                    Guideline guideline4 = (Guideline) findViewById.findViewById(2131363934);
+                                    i2 = 2131363975;
+                                    Guideline guideline4 = (Guideline) findViewById.findViewById(2131363975);
                                     if (guideline4 != null) {
-                                        d2 d2Var = new d2((ConstraintLayout) findViewById, guideline, textView, guideline2, simpleDraweeView, linkifiedTextView, guideline3, guideline4);
-                                        i = 2131363937;
-                                        View findViewById2 = inflate.findViewById(2131363937);
+                                        f2 f2Var = new f2((ConstraintLayout) findViewById, guideline, textView, guideline2, simpleDraweeView, linkifiedTextView, guideline3, guideline4);
+                                        i = 2131363978;
+                                        View findViewById2 = inflate.findViewById(2131363978);
                                         if (findViewById2 != null) {
-                                            int i3 = 2131362512;
-                                            ImageView imageView = (ImageView) findViewById2.findViewById(2131362512);
+                                            int i3 = 2131362525;
+                                            ImageView imageView = (ImageView) findViewById2.findViewById(2131362525);
                                             if (imageView != null) {
-                                                i3 = 2131362529;
-                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById2.findViewById(2131362529);
+                                                i3 = 2131362542;
+                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById2.findViewById(2131362542);
                                                 if (linkifiedTextView2 != null) {
-                                                    i3 = 2131362530;
-                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById2.findViewById(2131362530);
+                                                    i3 = 2131362543;
+                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById2.findViewById(2131362543);
                                                     if (simpleDraweeView2 != null) {
-                                                        i3 = 2131362541;
-                                                        TextView textView2 = (TextView) findViewById2.findViewById(2131362541);
+                                                        i3 = 2131362554;
+                                                        TextView textView2 = (TextView) findViewById2.findViewById(2131362554);
                                                         if (textView2 != null) {
-                                                            i3 = 2131364414;
-                                                            Guideline guideline5 = (Guideline) findViewById2.findViewById(2131364414);
+                                                            i3 = 2131364452;
+                                                            Guideline guideline5 = (Guideline) findViewById2.findViewById(2131364452);
                                                             if (guideline5 != null) {
-                                                                i3 = 2131364415;
-                                                                Guideline guideline6 = (Guideline) findViewById2.findViewById(2131364415);
+                                                                i3 = 2131364453;
+                                                                Guideline guideline6 = (Guideline) findViewById2.findViewById(2131364453);
                                                                 if (guideline6 != null) {
-                                                                    i3 = 2131364416;
-                                                                    Guideline guideline7 = (Guideline) findViewById2.findViewById(2131364416);
+                                                                    i3 = 2131364454;
+                                                                    Guideline guideline7 = (Guideline) findViewById2.findViewById(2131364454);
                                                                     if (guideline7 != null) {
-                                                                        i4 i4Var = new i4((ConstraintLayout) findViewById2, imageView, linkifiedTextView2, simpleDraweeView2, textView2, guideline5, guideline6, guideline7);
-                                                                        i = 2131363938;
-                                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363938);
+                                                                        l4 l4Var = new l4((ConstraintLayout) findViewById2, imageView, linkifiedTextView2, simpleDraweeView2, textView2, guideline5, guideline6, guideline7);
+                                                                        i = 2131363979;
+                                                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363979);
                                                                         if (linearLayout != null) {
-                                                                            i = 2131363939;
-                                                                            View findViewById3 = inflate.findViewById(2131363939);
+                                                                            i = 2131363980;
+                                                                            View findViewById3 = inflate.findViewById(2131363980);
                                                                             if (findViewById3 != null) {
-                                                                                int i4 = 2131363922;
-                                                                                SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById3.findViewById(2131363922);
+                                                                                int i4 = 2131363963;
+                                                                                SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById3.findViewById(2131363963);
                                                                                 if (simpleDraweeView3 != null) {
-                                                                                    i4 = 2131363923;
-                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131363923);
+                                                                                    i4 = 2131363964;
+                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131363964);
                                                                                     if (materialButton != null) {
-                                                                                        i4 = 2131363924;
-                                                                                        TextView textView3 = (TextView) findViewById3.findViewById(2131363924);
+                                                                                        i4 = 2131363965;
+                                                                                        TextView textView3 = (TextView) findViewById3.findViewById(2131363965);
                                                                                         if (textView3 != null) {
-                                                                                            i4 = 2131363925;
-                                                                                            TextView textView4 = (TextView) findViewById3.findViewById(2131363925);
+                                                                                            i4 = 2131363966;
+                                                                                            TextView textView4 = (TextView) findViewById3.findViewById(2131363966);
                                                                                             if (textView4 != null) {
-                                                                                                i4 = 2131363926;
-                                                                                                TextView textView5 = (TextView) findViewById3.findViewById(2131363926);
+                                                                                                i4 = 2131363967;
+                                                                                                TextView textView5 = (TextView) findViewById3.findViewById(2131363967);
                                                                                                 if (textView5 != null) {
-                                                                                                    c2 c2Var = new c2((LinearLayout) findViewById3, simpleDraweeView3, materialButton, textView3, textView4, textView5);
-                                                                                                    i = 2131363940;
-                                                                                                    MobileReportsBottomButton mobileReportsBottomButton = (MobileReportsBottomButton) inflate.findViewById(2131363940);
+                                                                                                    e2 e2Var = new e2((LinearLayout) findViewById3, simpleDraweeView3, materialButton, textView3, textView4, textView5);
+                                                                                                    i = 2131363981;
+                                                                                                    MobileReportsBottomButton mobileReportsBottomButton = (MobileReportsBottomButton) inflate.findViewById(2131363981);
                                                                                                     if (mobileReportsBottomButton != null) {
-                                                                                                        i = 2131363941;
-                                                                                                        MobileReportsBreadcrumbs mobileReportsBreadcrumbs = (MobileReportsBreadcrumbs) inflate.findViewById(2131363941);
+                                                                                                        i = 2131363982;
+                                                                                                        MobileReportsBreadcrumbs mobileReportsBreadcrumbs = (MobileReportsBreadcrumbs) inflate.findViewById(2131363982);
                                                                                                         if (mobileReportsBreadcrumbs != null) {
-                                                                                                            i = 2131363942;
-                                                                                                            MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(2131363942);
+                                                                                                            i = 2131363983;
+                                                                                                            MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(2131363983);
                                                                                                             if (materialCardView != null) {
-                                                                                                                i = 2131363943;
-                                                                                                                LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131363943);
+                                                                                                                i = 2131363984;
+                                                                                                                LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131363984);
                                                                                                                 if (linearLayout2 != null) {
-                                                                                                                    i = 2131363944;
-                                                                                                                    TextView textView6 = (TextView) inflate.findViewById(2131363944);
+                                                                                                                    i = 2131363985;
+                                                                                                                    TextView textView6 = (TextView) inflate.findViewById(2131363985);
                                                                                                                     if (textView6 != null) {
-                                                                                                                        i = 2131363945;
-                                                                                                                        MaterialCardView materialCardView2 = (MaterialCardView) inflate.findViewById(2131363945);
+                                                                                                                        i = 2131363986;
+                                                                                                                        MaterialCardView materialCardView2 = (MaterialCardView) inflate.findViewById(2131363986);
                                                                                                                         if (materialCardView2 != null) {
-                                                                                                                            i = 2131363946;
-                                                                                                                            TextView textView7 = (TextView) inflate.findViewById(2131363946);
+                                                                                                                            i = 2131363987;
+                                                                                                                            TextView textView7 = (TextView) inflate.findViewById(2131363987);
                                                                                                                             if (textView7 != null) {
-                                                                                                                                i = 2131363947;
-                                                                                                                                MaterialCardView materialCardView3 = (MaterialCardView) inflate.findViewById(2131363947);
+                                                                                                                                i = 2131363988;
+                                                                                                                                MaterialCardView materialCardView3 = (MaterialCardView) inflate.findViewById(2131363988);
                                                                                                                                 if (materialCardView3 != null) {
-                                                                                                                                    i = 2131363948;
-                                                                                                                                    LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363948);
+                                                                                                                                    i = 2131363989;
+                                                                                                                                    LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363989);
                                                                                                                                     if (linkifiedTextView3 != null) {
-                                                                                                                                        i = 2131363949;
-                                                                                                                                        ImageView imageView2 = (ImageView) inflate.findViewById(2131363949);
+                                                                                                                                        i = 2131363990;
+                                                                                                                                        ImageView imageView2 = (ImageView) inflate.findViewById(2131363990);
                                                                                                                                         if (imageView2 != null) {
-                                                                                                                                            return new ViewReportsMenuNodeBinding((ConstraintLayout) inflate, d2Var, i4Var, linearLayout, c2Var, mobileReportsBottomButton, mobileReportsBreadcrumbs, materialCardView, linearLayout2, textView6, materialCardView2, textView7, materialCardView3, linkifiedTextView3, imageView2);
+                                                                                                                                            return new ViewReportsMenuNodeBinding((ConstraintLayout) inflate, f2Var, l4Var, linearLayout, e2Var, mobileReportsBottomButton, mobileReportsBreadcrumbs, materialCardView, linearLayout2, textView6, materialCardView2, textView7, materialCardView3, linkifiedTextView3, imageView2);
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                 }
diff --git a/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java b/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java
index a72ec6e7bb..616d667b43 100644
--- a/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java
@@ -15,7 +15,7 @@ public final class ViewSelectableFriendSuggestionBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f1659c;
+    public final ConstraintLayout f1656c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class ViewSelectableFriendSuggestionBinding implements ViewBinding
     public ViewSelectableFriendSuggestionBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialCheckBox materialCheckBox) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1659c = constraintLayout2;
+        this.f1656c = constraintLayout2;
         this.d = textView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java b/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java
index 2ee42be546..40214ff688 100644
--- a/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java
@@ -13,7 +13,7 @@ public final class ViewServerSettingsCommunitySettingSelectorBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1660c;
+    public final ImageView f1657c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class ViewServerSettingsCommunitySettingSelectorBinding implements
     public ViewServerSettingsCommunitySettingSelectorBinding(@NonNull View view, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = view;
         this.b = textView;
-        this.f1660c = imageView;
+        this.f1657c = imageView;
         this.d = textView2;
         this.e = textView3;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java
index 33c9d2969e..4ca7ed4676 100644
--- a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java
@@ -14,7 +14,7 @@ public final class ViewSettingsBoostedBoostListitemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1661c;
+    public final ImageView f1658c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class ViewSettingsBoostedBoostListitemBinding implements ViewBindin
     public ViewSettingsBoostedBoostListitemBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f1661c = imageView;
+        this.f1658c = imageView;
         this.d = textView2;
         this.e = textView3;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java
index d4ff031a2a..e3ced21242 100644
--- a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java
@@ -15,7 +15,7 @@ public final class ViewSettingsBoostedGuildListitemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f1662c;
+    public final View f1659c;
     @NonNull
     public final PremiumGuildProgressView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class ViewSettingsBoostedGuildListitemBinding implements ViewBindin
     public ViewSettingsBoostedGuildListitemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull View view, @NonNull PremiumGuildProgressView premiumGuildProgressView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = simpleDraweeView;
-        this.f1662c = view;
+        this.f1659c = view;
         this.d = premiumGuildProgressView;
         this.e = textView;
         this.f = simpleDraweeView2;
diff --git a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java
index adda72705e..7f9e30d298 100644
--- a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java
@@ -15,7 +15,7 @@ public final class ViewSettingsBoostedSampleGuildBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1663c;
+    public final SimpleDraweeView f1660c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class ViewSettingsBoostedSampleGuildBinding implements ViewBinding
     public ViewSettingsBoostedSampleGuildBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull PremiumGuildProgressView premiumGuildProgressView) {
         this.a = cardView;
         this.b = textView;
-        this.f1663c = simpleDraweeView;
+        this.f1660c = simpleDraweeView;
         this.d = textView2;
         this.e = premiumGuildProgressView;
     }
diff --git a/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java b/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java
index a93dc7d1d1..ed687a70df 100644
--- a/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java
+++ b/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java
@@ -15,14 +15,14 @@ public final class ViewUserStatusPresenceCustomBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1664c;
+    public final SimpleDraweeView f1661c;
     @NonNull
     public final TextView d;
 
     public ViewUserStatusPresenceCustomBinding(@NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = appCompatImageView;
-        this.f1664c = simpleDraweeView;
+        this.f1661c = simpleDraweeView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java b/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java
index 01aef2c611..5e93cc4d4d 100644
--- a/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java
+++ b/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java
@@ -22,7 +22,7 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1665c;
+    public final FrameLayout f1662c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -56,7 +56,7 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final MaterialTextView f1666s;
+    public final MaterialTextView f1663s;
     @NonNull
     public final ImageView t;
     @NonNull
@@ -69,7 +69,7 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
     public VoiceControlsSheetViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull View view2, @NonNull ImageView imageView4, @NonNull TextView textView3, @NonNull ImageView imageView5, @NonNull ImageView imageView6, @NonNull LinearLayout linearLayout, @NonNull Button button, @NonNull NumericBadgingView numericBadgingView, @NonNull ImageView imageView7, @NonNull ImageView imageView8, @NonNull TextView textView4, @NonNull CardView cardView, @NonNull MaterialTextView materialTextView, @NonNull ImageView imageView9, @NonNull TextView textView5, @NonNull VolumeSliderView volumeSliderView, @NonNull ImageView imageView10) {
         this.a = view;
         this.b = imageView;
-        this.f1665c = frameLayout;
+        this.f1662c = frameLayout;
         this.d = imageView2;
         this.e = textView;
         this.f = textView2;
@@ -85,7 +85,7 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
         this.p = imageView8;
         this.q = textView4;
         this.r = cardView;
-        this.f1666s = materialTextView;
+        this.f1663s = materialTextView;
         this.t = imageView9;
         this.u = textView5;
         this.v = volumeSliderView;
@@ -94,7 +94,7 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
 
     @NonNull
     public static VoiceControlsSheetViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) {
-        layoutInflater.inflate(2131558828, viewGroup);
+        layoutInflater.inflate(2131558831, viewGroup);
         int i = 2131361985;
         ImageView imageView = (ImageView) viewGroup.findViewById(2131361985);
         if (imageView != null) {
@@ -107,62 +107,62 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding {
                     i = 2131361988;
                     TextView textView = (TextView) viewGroup.findViewById(2131361988);
                     if (textView != null) {
-                        i = 2131362834;
-                        TextView textView2 = (TextView) viewGroup.findViewById(2131362834);
+                        i = 2131362859;
+                        TextView textView2 = (TextView) viewGroup.findViewById(2131362859);
                         if (textView2 != null) {
-                            i = 2131362910;
-                            ImageView imageView3 = (ImageView) viewGroup.findViewById(2131362910);
+                            i = 2131362935;
+                            ImageView imageView3 = (ImageView) viewGroup.findViewById(2131362935);
                             if (imageView3 != null) {
-                                i = 2131363502;
-                                View findViewById = viewGroup.findViewById(2131363502);
+                                i = 2131363543;
+                                View findViewById = viewGroup.findViewById(2131363543);
                                 if (findViewById != null) {
-                                    i = 2131363614;
-                                    ImageView imageView4 = (ImageView) viewGroup.findViewById(2131363614);
+                                    i = 2131363655;
+                                    ImageView imageView4 = (ImageView) viewGroup.findViewById(2131363655);
                                     if (imageView4 != null) {
-                                        i = 2131363631;
-                                        TextView textView3 = (TextView) viewGroup.findViewById(2131363631);
+                                        i = 2131363672;
+                                        TextView textView3 = (TextView) viewGroup.findViewById(2131363672);
                                         if (textView3 != null) {
-                                            i = 2131363960;
-                                            ImageView imageView5 = (ImageView) viewGroup.findViewById(2131363960);
+                                            i = 2131364001;
+                                            ImageView imageView5 = (ImageView) viewGroup.findViewById(2131364001);
                                             if (imageView5 != null) {
-                                                i = 2131363985;
-                                                ImageView imageView6 = (ImageView) viewGroup.findViewById(2131363985);
+                                                i = 2131364026;
+                                                ImageView imageView6 = (ImageView) viewGroup.findViewById(2131364026);
                                                 if (imageView6 != null) {
-                                                    i = 2131364188;
-                                                    LinearLayout linearLayout = (LinearLayout) viewGroup.findViewById(2131364188);
+                                                    i = 2131364231;
+                                                    LinearLayout linearLayout = (LinearLayout) viewGroup.findViewById(2131364231);
                                                     if (linearLayout != null) {
-                                                        i = 2131364384;
-                                                        Button button = (Button) viewGroup.findViewById(2131364384);
+                                                        i = 2131364422;
+                                                        Button button = (Button) viewGroup.findViewById(2131364422);
                                                         if (button != null) {
-                                                            i = 2131364388;
-                                                            NumericBadgingView numericBadgingView = (NumericBadgingView) viewGroup.findViewById(2131364388);
+                                                            i = 2131364426;
+                                                            NumericBadgingView numericBadgingView = (NumericBadgingView) viewGroup.findViewById(2131364426);
                                                             if (numericBadgingView != null) {
-                                                                i = 2131364389;
-                                                                ImageView imageView7 = (ImageView) viewGroup.findViewById(2131364389);
+                                                                i = 2131364427;
+                                                                ImageView imageView7 = (ImageView) viewGroup.findViewById(2131364427);
                                                                 if (imageView7 != null) {
-                                                                    i = 2131364517;
-                                                                    ImageView imageView8 = (ImageView) viewGroup.findViewById(2131364517);
+                                                                    i = 2131364556;
+                                                                    ImageView imageView8 = (ImageView) viewGroup.findViewById(2131364556);
                                                                     if (imageView8 != null) {
-                                                                        i = 2131364520;
-                                                                        TextView textView4 = (TextView) viewGroup.findViewById(2131364520);
+                                                                        i = 2131364559;
+                                                                        TextView textView4 = (TextView) viewGroup.findViewById(2131364559);
                                                                         if (textView4 != null) {
-                                                                            i = 2131364559;
-                                                                            CardView cardView = (CardView) viewGroup.findViewById(2131364559);
+                                                                            i = 2131364598;
+                                                                            CardView cardView = (CardView) viewGroup.findViewById(2131364598);
                                                                             if (cardView != null) {
-                                                                                i = 2131364999;
-                                                                                MaterialTextView materialTextView = (MaterialTextView) viewGroup.findViewById(2131364999);
+                                                                                i = 2131365049;
+                                                                                MaterialTextView materialTextView = (MaterialTextView) viewGroup.findViewById(2131365049);
                                                                                 if (materialTextView != null) {
-                                                                                    i = 2131365122;
-                                                                                    ImageView imageView9 = (ImageView) viewGroup.findViewById(2131365122);
+                                                                                    i = 2131365177;
+                                                                                    ImageView imageView9 = (ImageView) viewGroup.findViewById(2131365177);
                                                                                     if (imageView9 != null) {
-                                                                                        i = 2131365127;
-                                                                                        TextView textView5 = (TextView) viewGroup.findViewById(2131365127);
+                                                                                        i = 2131365182;
+                                                                                        TextView textView5 = (TextView) viewGroup.findViewById(2131365182);
                                                                                         if (textView5 != null) {
-                                                                                            i = 2131365128;
-                                                                                            VolumeSliderView volumeSliderView = (VolumeSliderView) viewGroup.findViewById(2131365128);
+                                                                                            i = 2131365183;
+                                                                                            VolumeSliderView volumeSliderView = (VolumeSliderView) viewGroup.findViewById(2131365183);
                                                                                             if (volumeSliderView != null) {
-                                                                                                i = 2131365487;
-                                                                                                ImageView imageView10 = (ImageView) viewGroup.findViewById(2131365487);
+                                                                                                i = 2131365548;
+                                                                                                ImageView imageView10 = (ImageView) viewGroup.findViewById(2131365548);
                                                                                                 if (imageView10 != null) {
                                                                                                     return new VoiceControlsSheetViewBinding(viewGroup, imageView, frameLayout, imageView2, textView, textView2, imageView3, findViewById, imageView4, textView3, imageView5, imageView6, linearLayout, button, numericBadgingView, imageView7, imageView8, textView4, cardView, materialTextView, imageView9, textView5, volumeSliderView, imageView10);
                                                                                                 }
diff --git a/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java b/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java
index 8b9e6c9d52..c60c4ad0a5 100644
--- a/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java
@@ -17,7 +17,7 @@ public final class VoiceUserListItemUserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1667c;
+    public final TextView f1664c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -36,7 +36,7 @@ public final class VoiceUserListItemUserBinding implements ViewBinding {
     public VoiceUserListItemUserBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton, @NonNull VoiceUserView voiceUserView, @NonNull TextView textView2, @NonNull StreamPreviewView streamPreviewView, @NonNull ImageView imageView4) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1667c = textView;
+        this.f1664c = textView;
         this.d = imageView2;
         this.e = imageView3;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java
index 73c7516da7..006731a0a0 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java
@@ -17,7 +17,7 @@ public final class WidgetAddFriendUserListItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppCompatImageView f1668c;
+    public final AppCompatImageView f1665c;
     @NonNull
     public final AppCompatImageView d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetAddFriendUserListItemBinding implements ViewBinding {
     public WidgetAddFriendUserListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull AppCompatImageView appCompatImageView2, @NonNull AppCompatImageView appCompatImageView3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2, @NonNull AppCompatImageView appCompatImageView4) {
         this.a = constraintLayout;
         this.b = appCompatImageView;
-        this.f1668c = appCompatImageView2;
+        this.f1665c = appCompatImageView2;
         this.d = appCompatImageView3;
         this.e = simpleDraweeView;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java
index fa14df97b9..fe440f3bf7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java
@@ -16,7 +16,7 @@ public final class WidgetAgeVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final z f1669c;
+    public final z f1666c;
     @NonNull
     public final a0 d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetAgeVerifyBinding implements ViewBinding {
     public WidgetAgeVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull z zVar, @NonNull a0 a0Var, @NonNull y yVar) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f1669c = zVar;
+        this.f1666c = zVar;
         this.d = a0Var;
         this.e = yVar;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java
index 4908190a20..3e71b6f004 100644
--- a/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetApplicationCommandBottomSheetBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1670c;
+    public final TextView f1667c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetApplicationCommandBottomSheetBinding implements ViewBin
     public WidgetApplicationCommandBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ProgressBar progressBar, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1670c = textView;
+        this.f1667c = textView;
         this.d = materialButton;
         this.e = progressBar;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java
index d4cf2444ad..8309d9c68a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetAuditLogFilterSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1671c;
+    public final RecyclerView f1668c;
 
     public WidgetAuditLogFilterSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView) {
         this.a = linearLayout;
         this.b = textInputLayout;
-        this.f1671c = recyclerView;
+        this.f1668c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java
index c8a190543f..ffbb92dd99 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java
@@ -18,7 +18,7 @@ public final class WidgetAuthBirthdayBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1672c;
+    public final TextInputLayout f1669c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetAuthBirthdayBinding implements ViewBinding {
     public WidgetAuthBirthdayBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull MaterialCheckBox materialCheckBox, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = linkifiedTextView;
-        this.f1672c = textInputLayout;
+        this.f1669c = textInputLayout;
         this.d = materialButton;
         this.e = materialCheckBox;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java
index deb224248d..5daa15cd76 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java
@@ -15,14 +15,14 @@ public final class WidgetAuthCaptchaBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1673c;
+    public final MaterialButton f1670c;
     @NonNull
     public final ScreenTitleView d;
 
     public WidgetAuthCaptchaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ScreenTitleView screenTitleView) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1673c = materialButton;
+        this.f1670c = materialButton;
         this.d = screenTitleView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java
index 896486cb9d..679b4588fa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java
@@ -18,7 +18,7 @@ public final class WidgetAuthLandingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1674c;
+    public final MaterialButton f1671c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetAuthLandingBinding implements ViewBinding {
     public WidgetAuthLandingBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull AuthInviteInfoView authInviteInfoView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull MaterialButton materialButton2, @NonNull AppViewFlipper appViewFlipper, @NonNull ScreenTitleView screenTitleView) {
         this.a = relativeLayout;
         this.b = authInviteInfoView;
-        this.f1674c = materialButton;
+        this.f1671c = materialButton;
         this.d = materialButton2;
         this.e = appViewFlipper;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java
index 550b146fdb..0ccf0035bd 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java
@@ -18,7 +18,7 @@ public final class WidgetAuthLoginBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1675c;
+    public final LinearLayout f1672c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetAuthLoginBinding implements ViewBinding {
     public WidgetAuthLoginBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1675c = linearLayout;
+        this.f1672c = linearLayout;
         this.d = textView;
         this.e = phoneOrEmailInputView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java
index e36e0d6a28..6cffaf9451 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java
@@ -15,14 +15,14 @@ public final class WidgetAuthMfaBackupCodesBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1676c;
+    public final TextInputLayout f1673c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetAuthMfaBackupCodesBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1676c = textInputLayout;
+        this.f1673c = textInputLayout;
         this.d = materialButton2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java
index bbe84e90d6..4a55205407 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java
@@ -15,12 +15,12 @@ public final class WidgetAuthMfaBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final DimmerView f1677c;
+    public final DimmerView f1674c;
 
     public WidgetAuthMfaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull CodeVerificationView codeVerificationView, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = codeVerificationView;
-        this.f1677c = dimmerView;
+        this.f1674c = dimmerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java
index 79ef247b11..b8e45d3408 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java
@@ -15,27 +15,30 @@ public final class WidgetAuthPhoneVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1678c;
+    public final TextView f1675c;
     @NonNull
-    public final CodeVerificationView d;
+    public final TextView d;
     @NonNull
-    public final TextView e;
+    public final CodeVerificationView e;
     @NonNull
     public final TextView f;
     @NonNull
     public final TextView g;
     @NonNull
-    public final DimmerView h;
+    public final TextView h;
+    @NonNull
+    public final DimmerView i;
 
-    public WidgetAuthPhoneVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CodeVerificationView codeVerificationView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull DimmerView dimmerView) {
+    public WidgetAuthPhoneVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull CodeVerificationView codeVerificationView, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1678c = textView2;
-        this.d = codeVerificationView;
-        this.e = textView3;
+        this.f1675c = textView2;
+        this.d = textView3;
+        this.e = codeVerificationView;
         this.f = textView4;
         this.g = textView5;
-        this.h = dimmerView;
+        this.h = textView6;
+        this.i = dimmerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java
index 16d5bd1b13..4863744a00 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java
@@ -16,7 +16,7 @@ public final class WidgetAuthRegisterAccountInformationBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f1679c;
+    public final LoadingButton f1676c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetAuthRegisterAccountInformationBinding implements ViewBi
     public WidgetAuthRegisterAccountInformationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull MaterialCheckBox materialCheckBox) {
         this.a = coordinatorLayout;
         this.b = linkifiedTextView;
-        this.f1679c = loadingButton;
+        this.f1676c = loadingButton;
         this.d = textInputLayout;
         this.e = textInputLayout2;
         this.f = materialCheckBox;
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java
index 4a7971a83b..eceafc9781 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java
@@ -18,7 +18,7 @@ public final class WidgetAuthRegisterIdentityBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CardSegment f1680c;
+    public final CardSegment f1677c;
     @NonNull
     public final PhoneOrEmailInputView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetAuthRegisterIdentityBinding implements ViewBinding {
     public WidgetAuthRegisterIdentityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull CardSegment cardSegment, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CardSegment cardSegment2, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1680c = cardSegment;
+        this.f1677c = cardSegment;
         this.d = phoneOrEmailInputView;
         this.e = linkifiedTextView;
         this.f = cardSegment2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java
index 963159d4d8..efed2adc16 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java
@@ -13,12 +13,12 @@ public final class WidgetAuthResetPasswordBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1681c;
+    public final MaterialButton f1678c;
 
     public WidgetAuthResetPasswordBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1681c = materialButton2;
+        this.f1678c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java
index 719ef06994..d818492676 100644
--- a/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java
@@ -14,14 +14,14 @@ public final class WidgetAuthUndeleteAccountBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1682c;
+    public final MaterialButton f1679c;
     @NonNull
     public final ScreenTitleView d;
 
     public WidgetAuthUndeleteAccountBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull ScreenTitleView screenTitleView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1682c = materialButton2;
+        this.f1679c = materialButton2;
         this.d = screenTitleView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java
index ce8bc9be7c..c0c26e93ea 100644
--- a/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java
@@ -16,7 +16,7 @@ public final class WidgetBanUserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1683c;
+    public final MaterialButton f1680c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetBanUserBinding implements ViewBinding {
     public WidgetBanUserBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1683c = materialButton;
+        this.f1680c = materialButton;
         this.d = materialButton2;
         this.e = checkedSetting;
         this.f = checkedSetting2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java b/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java
index 8fe220f481..c88367f110 100644
--- a/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java
@@ -21,7 +21,7 @@ public final class WidgetBugReportBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1684c;
+    public final TextInputLayout f1681c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -50,7 +50,7 @@ public final class WidgetBugReportBinding implements ViewBinding {
     public WidgetBugReportBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull MaterialTextView materialTextView, @NonNull TextInputLayout textInputLayout3, @NonNull MaterialCardView materialCardView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppCompatImageView appCompatImageView2, @NonNull ImageView imageView, @NonNull StickerView stickerView, @NonNull MaterialTextView materialTextView2, @NonNull MaterialButton materialButton, @NonNull AppViewFlipper appViewFlipper, @NonNull MaterialButton materialButton2, @NonNull MaterialTextView materialTextView3, @NonNull View view) {
         this.a = coordinatorLayout;
         this.b = appCompatImageView;
-        this.f1684c = textInputLayout;
+        this.f1681c = textInputLayout;
         this.d = textInputLayout2;
         this.e = materialTextView;
         this.f = textInputLayout3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java b/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java
index fb3a0c8c9f..4f303a87fa 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java
@@ -14,8 +14,8 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.a4;
-import c.a.i.z3;
+import c.a.i.c4;
+import c.a.i.d4;
 import com.discord.views.calls.StageCallVisitCommunityView;
 import com.discord.views.calls.VideoCallParticipantView;
 import com.discord.views.user.UserSummaryView;
@@ -31,11 +31,11 @@ public final class WidgetCallFullscreenBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppBarLayout f1685c;
+    public final AppBarLayout f1682c;
     @NonNull
     public final RelativeLayout d;
     @NonNull
-    public final z3 e;
+    public final c4 e;
     @NonNull
     public final CoordinatorLayout f;
     @NonNull
@@ -61,11 +61,11 @@ public final class WidgetCallFullscreenBinding implements ViewBinding {
     @NonNull
     public final StageCallVisitCommunityView q;
     @NonNull
-    public final a4 r;
+    public final d4 r;
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final ConstraintLayout f1686s;
+    public final ConstraintLayout f1683s;
     @NonNull
     public final UserSummaryView t;
     @NonNull
@@ -75,12 +75,12 @@ public final class WidgetCallFullscreenBinding implements ViewBinding {
     @NonNull
     public final VoiceControlsSheetView w;
 
-    public WidgetCallFullscreenBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Toolbar toolbar, @NonNull AppBarLayout appBarLayout, @NonNull RelativeLayout relativeLayout, @NonNull z3 z3Var, @NonNull Barrier barrier, @NonNull ConstraintLayout constraintLayout2, @NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout3, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton2, @NonNull VideoCallParticipantView videoCallParticipantView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton3, @NonNull ConstraintLayout constraintLayout4, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView2, @NonNull StageCallVisitCommunityView stageCallVisitCommunityView, @NonNull a4 a4Var, @NonNull ConstraintLayout constraintLayout5, @NonNull UserSummaryView userSummaryView, @NonNull MaterialTextView materialTextView, @NonNull ViewStub viewStub, @NonNull Barrier barrier2, @NonNull VoiceControlsSheetView voiceControlsSheetView, @NonNull FragmentContainerView fragmentContainerView) {
+    public WidgetCallFullscreenBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Toolbar toolbar, @NonNull AppBarLayout appBarLayout, @NonNull RelativeLayout relativeLayout, @NonNull c4 c4Var, @NonNull Barrier barrier, @NonNull ConstraintLayout constraintLayout2, @NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout3, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton2, @NonNull VideoCallParticipantView videoCallParticipantView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton3, @NonNull ConstraintLayout constraintLayout4, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView2, @NonNull StageCallVisitCommunityView stageCallVisitCommunityView, @NonNull d4 d4Var, @NonNull ConstraintLayout constraintLayout5, @NonNull UserSummaryView userSummaryView, @NonNull MaterialTextView materialTextView, @NonNull ViewStub viewStub, @NonNull Barrier barrier2, @NonNull VoiceControlsSheetView voiceControlsSheetView, @NonNull FragmentContainerView fragmentContainerView) {
         this.a = constraintLayout;
         this.b = toolbar;
-        this.f1685c = appBarLayout;
+        this.f1682c = appBarLayout;
         this.d = relativeLayout;
-        this.e = z3Var;
+        this.e = c4Var;
         this.f = coordinatorLayout;
         this.g = materialButton;
         this.h = textView;
@@ -93,8 +93,8 @@ public final class WidgetCallFullscreenBinding implements ViewBinding {
         this.o = constraintLayout4;
         this.p = recyclerView2;
         this.q = stageCallVisitCommunityView;
-        this.r = a4Var;
-        this.f1686s = constraintLayout5;
+        this.r = d4Var;
+        this.f1683s = constraintLayout5;
         this.t = userSummaryView;
         this.u = materialTextView;
         this.v = viewStub;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java b/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java
index 136098068c..45ffcb2e75 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChangeLogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppCompatImageButton f1687c;
+    public final AppCompatImageButton f1684c;
     @NonNull
     public final AppCompatImageButton d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetChangeLogBinding implements ViewBinding {
     public WidgetChangeLogBinding(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout2, @NonNull AppCompatImageButton appCompatImageButton, @NonNull AppCompatImageButton appCompatImageButton2, @NonNull NestedScrollView nestedScrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppCompatImageButton appCompatImageButton3, @NonNull VideoView videoView, @NonNull SimpleDraweeView simpleDraweeView2) {
         this.a = linearLayout;
         this.b = linkifiedTextView;
-        this.f1687c = appCompatImageButton;
+        this.f1684c = appCompatImageButton;
         this.d = appCompatImageButton2;
         this.e = nestedScrollView;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java b/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java
index b1abc79335..39a0d394d5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java
@@ -20,7 +20,7 @@ public final class WidgetChangeLogSpecialBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageButton f1688c;
+    public final ImageButton f1685c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -41,7 +41,7 @@ public final class WidgetChangeLogSpecialBinding implements ViewBinding {
     public WidgetChangeLogSpecialBinding(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ImageButton imageButton, @NonNull MaterialButton materialButton, @NonNull ImageButton imageButton2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull NestedScrollView nestedScrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull VideoView videoView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView, @NonNull CardView cardView2) {
         this.a = linearLayout;
         this.b = linkifiedTextView;
-        this.f1688c = imageButton;
+        this.f1685c = imageButton;
         this.d = materialButton;
         this.e = imageButton2;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java
index f47109875e..62984fa6cb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java
@@ -18,7 +18,7 @@ public final class WidgetChannelFollowSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1689c;
+    public final TextView f1686c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetChannelFollowSheetBinding implements ViewBinding {
     public WidgetChannelFollowSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCardView materialCardView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull AppViewFlipper appViewFlipper) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1689c = textView2;
+        this.f1686c = textView2;
         this.d = simpleDraweeView;
         this.e = materialCardView;
         this.f = materialCardView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java
index ad16123476..1e8de67c5e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java
@@ -15,14 +15,14 @@ public final class WidgetChannelFollowSuccessDialogBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1690c;
+    public final SimpleDraweeView f1687c;
     @NonNull
     public final TextView d;
 
     public WidgetChannelFollowSuccessDialogBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = nestedScrollView;
         this.b = materialButton;
-        this.f1690c = simpleDraweeView;
+        this.f1687c = simpleDraweeView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java
index 794c1a2019..205ac03b0f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java
@@ -18,7 +18,7 @@ public final class WidgetChannelGroupDmSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1691c;
+    public final FloatingActionButton f1688c;
     @NonNull
     public final NotificationMuteSettingsView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetChannelGroupDmSettingsBinding implements ViewBinding {
     public WidgetChannelGroupDmSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull NestedScrollView nestedScrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1691c = floatingActionButton;
+        this.f1688c = floatingActionButton;
         this.d = notificationMuteSettingsView;
         this.e = nestedScrollView;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java
index ccdc8f0181..75e2e4eb8a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemHeaderBinding.java
@@ -21,15 +21,15 @@ public final class WidgetChannelMembersListItemHeaderBinding implements ViewBind
 
     @NonNull
     public static WidgetChannelMembersListItemHeaderBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558867, viewGroup, false);
+        View inflate = layoutInflater.inflate(2131558870, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        TextView textView = (TextView) inflate.findViewById(2131362275);
+        TextView textView = (TextView) inflate.findViewById(2131362286);
         if (textView != null) {
             return new WidgetChannelMembersListItemHeaderBinding((FrameLayout) inflate, textView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362275)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362286)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java
index 24fea7f6b0..4a2fed789b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemPlaceholderHeaderBinding.java
@@ -17,15 +17,15 @@ public final class WidgetChannelMembersListItemPlaceholderHeaderBinding implemen
 
     @NonNull
     public static WidgetChannelMembersListItemPlaceholderHeaderBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
-        View inflate = layoutInflater.inflate(2131558869, viewGroup, false);
+        View inflate = layoutInflater.inflate(2131558872, viewGroup, false);
         if (z2) {
             viewGroup.addView(inflate);
         }
-        View findViewById = inflate.findViewById(2131362274);
+        View findViewById = inflate.findViewById(2131362285);
         if (findViewById != null) {
             return new WidgetChannelMembersListItemPlaceholderHeaderBinding((FrameLayout) inflate, findViewById);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362274)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362285)));
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java
index b3ba891bc3..b45160b787 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChannelMembersListItemUserBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1692c;
+    public final ImageView f1689c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetChannelMembersListItemUserBinding implements ViewBindin
     public WidgetChannelMembersListItemUserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ImageView imageView2, @NonNull UsernameView usernameView, @NonNull StatusView statusView, @NonNull ImageView imageView3) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1692c = imageView;
+        this.f1689c = imageView;
         this.d = simpleDraweeSpanTextView;
         this.e = imageView2;
         this.f = usernameView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java
index fe74da804a..b85d0aa427 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChannelNotificationSettingsBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final NotificationMuteSettingsView f1693c;
+    public final NotificationMuteSettingsView f1690c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChannelNotificationSettingsBinding implements ViewBindi
     public WidgetChannelNotificationSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout2, @NonNull NestedScrollView nestedScrollView) {
         this.a = coordinatorLayout;
         this.b = linearLayout;
-        this.f1693c = notificationMuteSettingsView;
+        this.f1690c = notificationMuteSettingsView;
         this.d = checkedSetting;
         this.e = checkedSetting2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java
index 10465bfbae..38be2768cc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChannelSettingsAddMemberBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SearchInputView f1694c;
+    public final SearchInputView f1691c;
 
     public WidgetChannelSettingsAddMemberBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull SearchInputView searchInputView) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1694c = searchInputView;
+        this.f1691c = searchInputView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java
index 0bef6f0e73..a1a6e9cb47 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java
@@ -15,14 +15,14 @@ public final class WidgetChannelSettingsAddMemberItemBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialCheckBox f1695c;
+    public final MaterialCheckBox f1692c;
     @NonNull
     public final ConstraintLayout d;
 
     public WidgetChannelSettingsAddMemberItemBinding(@NonNull FrameLayout frameLayout, @NonNull ChannelPermissionOwnerView channelPermissionOwnerView, @NonNull MaterialCheckBox materialCheckBox, @NonNull ConstraintLayout constraintLayout) {
         this.a = frameLayout;
         this.b = channelPermissionOwnerView;
-        this.f1695c = materialCheckBox;
+        this.f1692c = materialCheckBox;
         this.d = constraintLayout;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java
index 826dbc7451..dcf35bd3fc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChannelSettingsAddMemberSheetBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FragmentContainerView f1696c;
+    public final FragmentContainerView f1693c;
     @NonNull
     public final TextView d;
 
     public WidgetChannelSettingsAddMemberSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull FragmentContainerView fragmentContainerView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1696c = fragmentContainerView;
+        this.f1693c = fragmentContainerView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java
index 03d50f7f31..8908b5b641 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java
@@ -31,7 +31,7 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TernaryCheckBox f1697c;
+    public final TernaryCheckBox f1694c;
     @NonNull
     public final TernaryCheckBox d;
     @NonNull
@@ -65,7 +65,7 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final TernaryCheckBox f1698s;
+    public final TernaryCheckBox f1695s;
     @NonNull
     public final TernaryCheckBox t;
     @NonNull
@@ -77,20 +77,20 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TernaryCheckBox f1699x;
+    public final TernaryCheckBox f1696x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TernaryCheckBox f1700y;
+    public final TernaryCheckBox f1697y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final SimpleDraweeView f1701z;
+    public final SimpleDraweeView f1698z;
 
     public WidgetChannelSettingsEditPermissionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TernaryCheckBox ternaryCheckBox, @NonNull TernaryCheckBox ternaryCheckBox2, @NonNull TernaryCheckBox ternaryCheckBox3, @NonNull TernaryCheckBox ternaryCheckBox4, @NonNull TernaryCheckBox ternaryCheckBox5, @NonNull TernaryCheckBox ternaryCheckBox6, @NonNull TernaryCheckBox ternaryCheckBox7, @NonNull TernaryCheckBox ternaryCheckBox8, @NonNull TernaryCheckBox ternaryCheckBox9, @NonNull TernaryCheckBox ternaryCheckBox10, @NonNull TernaryCheckBox ternaryCheckBox11, @NonNull TernaryCheckBox ternaryCheckBox12, @NonNull TernaryCheckBox ternaryCheckBox13, @NonNull TernaryCheckBox ternaryCheckBox14, @NonNull TernaryCheckBox ternaryCheckBox15, @NonNull TernaryCheckBox ternaryCheckBox16, @NonNull TernaryCheckBox ternaryCheckBox17, @NonNull TernaryCheckBox ternaryCheckBox18, @NonNull TernaryCheckBox ternaryCheckBox19, @NonNull TernaryCheckBox ternaryCheckBox20, @NonNull TernaryCheckBox ternaryCheckBox21, @NonNull TernaryCheckBox ternaryCheckBox22, @NonNull TernaryCheckBox ternaryCheckBox23, @NonNull TernaryCheckBox ternaryCheckBox24, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView3) {
         this.a = coordinatorLayout;
         this.b = ternaryCheckBox;
-        this.f1697c = ternaryCheckBox2;
+        this.f1694c = ternaryCheckBox2;
         this.d = ternaryCheckBox3;
         this.e = ternaryCheckBox4;
         this.f = ternaryCheckBox5;
@@ -106,14 +106,14 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi
         this.p = ternaryCheckBox15;
         this.q = ternaryCheckBox16;
         this.r = ternaryCheckBox17;
-        this.f1698s = ternaryCheckBox18;
+        this.f1695s = ternaryCheckBox18;
         this.t = ternaryCheckBox19;
         this.u = ternaryCheckBox20;
         this.v = ternaryCheckBox21;
         this.w = ternaryCheckBox22;
-        this.f1699x = ternaryCheckBox23;
-        this.f1700y = ternaryCheckBox24;
-        this.f1701z = simpleDraweeView;
+        this.f1696x = ternaryCheckBox23;
+        this.f1697y = ternaryCheckBox24;
+        this.f1698z = simpleDraweeView;
         this.A = textView;
         this.B = floatingActionButton;
         this.C = linearLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java
index e6c236cef1..55d831ca81 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChannelSettingsPermissionsAdvancedBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1702c;
+    public final TextView f1699c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetChannelSettingsPermissionsAdvancedBinding implements Vi
     public WidgetChannelSettingsPermissionsAdvancedBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout2, @NonNull RecyclerView recyclerView2) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1702c = textView2;
+        this.f1699c = textView2;
         this.d = linearLayout;
         this.e = recyclerView;
         this.f = linearLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java
index a27874e857..c2b17172ad 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java
@@ -15,12 +15,12 @@ public final class WidgetChannelSettingsPermissionsOverviewBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SegmentedControlContainer f1703c;
+    public final SegmentedControlContainer f1700c;
 
     public WidgetChannelSettingsPermissionsOverviewBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull AppViewFlipper appViewFlipper, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull FragmentContainerView fragmentContainerView2) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f1703c = segmentedControlContainer;
+        this.f1700c = segmentedControlContainer;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java
index dbbbb174dd..b67c89bd3e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChannelSidebarActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final PrivateChannelSideBarActionsView f1704c;
+    public final PrivateChannelSideBarActionsView f1701c;
 
     public WidgetChannelSidebarActionsBinding(@NonNull FrameLayout frameLayout, @NonNull GuildChannelSideBarActionsView guildChannelSideBarActionsView, @NonNull PrivateChannelSideBarActionsView privateChannelSideBarActionsView) {
         this.a = frameLayout;
         this.b = guildChannelSideBarActionsView;
-        this.f1704c = privateChannelSideBarActionsView;
+        this.f1701c = privateChannelSideBarActionsView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java
index 4bc076b4cc..f3def97d7c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChannelTopicBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1705c;
+    public final ImageView f1702c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetChannelTopicBinding implements ViewBinding {
     public WidgetChannelTopicBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = linearLayout;
         this.b = simpleDraweeView;
-        this.f1705c = imageView;
+        this.f1702c = imageView;
         this.d = imageView2;
         this.e = textView;
         this.f = linkifiedTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java
index 0c78c664bd..7939fd3669 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChannelsListActionsChangeNicknameBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1706c;
+    public final TextInputLayout f1703c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetChannelsListActionsChangeNicknameBinding implements Vie
     public WidgetChannelsListActionsChangeNicknameBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1706c = textInputLayout;
+        this.f1703c = textInputLayout;
         this.d = textView;
         this.e = materialButton2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java
index 4f93beb78a..239f849185 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java
@@ -25,7 +25,7 @@ public final class WidgetChannelsListBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1707c;
+    public final RecyclerView f1704c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -58,7 +58,7 @@ public final class WidgetChannelsListBinding implements ViewBinding {
     public WidgetChannelsListBinding(@NonNull RoundedCoordinatorLayout roundedCoordinatorLayout, @NonNull CustomAppBarLayout customAppBarLayout, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull Toolbar toolbar, @NonNull TextView textView5, @NonNull AppCompatImageView appCompatImageView, @NonNull View view, @NonNull View view2, @NonNull ViewStub viewStub, @NonNull Toolbar toolbar2, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull RoundedCoordinatorLayout roundedCoordinatorLayout2, @NonNull EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView, @NonNull EmptyFriendsStateView emptyFriendsStateView) {
         this.a = roundedCoordinatorLayout;
         this.b = customAppBarLayout;
-        this.f1707c = recyclerView;
+        this.f1704c = recyclerView;
         this.d = simpleDraweeView;
         this.e = frameLayout;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java
index 792a5011fa..a6dc7fb32c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java
@@ -17,7 +17,7 @@ public final class WidgetChannelsListItemActiveStageEventBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1708c;
+    public final MaterialButton f1705c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetChannelsListItemActiveStageEventBinding implements View
     public WidgetChannelsListItemActiveStageEventBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull UserSummaryView userSummaryView, @NonNull MaterialTextView materialTextView) {
         this.a = constraintLayout;
         this.b = textView2;
-        this.f1708c = materialButton;
+        this.f1705c = materialButton;
         this.d = textView3;
         this.e = textView4;
         this.f = userSummaryView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java
index c618c4872e..8ba9f8dcde 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChannelsListItemCategoryBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1709c;
+    public final ImageView f1706c;
     @NonNull
     public final TextView d;
 
     public WidgetChannelsListItemCategoryBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1709c = imageView2;
+        this.f1706c = imageView2;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java
index 53d4a88160..725e27d9fc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChannelsListItemChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1710c;
+    public final TextView f1707c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetChannelsListItemChannelBinding implements ViewBinding {
     public WidgetChannelsListItemChannelBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1710c = textView;
+        this.f1707c = textView;
         this.d = textView2;
         this.e = imageView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java
index 314d552b82..f0def0d80a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChannelsListItemChannelPrivateBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1711c;
+    public final SimpleDraweeView f1708c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChannelsListItemChannelPrivateBinding implements ViewBi
     public WidgetChannelsListItemChannelPrivateBinding(@NonNull RelativeLayout relativeLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = relativeLayout;
         this.b = statusView;
-        this.f1711c = simpleDraweeView;
+        this.f1708c = simpleDraweeView;
         this.d = simpleDraweeSpanTextView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java
index 770e940198..2fe9fa36de 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java
@@ -14,14 +14,14 @@ public final class WidgetChannelsListItemChannelStageVoiceBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1712c;
+    public final TextView f1709c;
     @NonNull
     public final TextView d;
 
     public WidgetChannelsListItemChannelStageVoiceBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1712c = textView;
+        this.f1709c = textView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java
index f7c54f8dae..04d39d0b21 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java
@@ -15,14 +15,14 @@ public final class WidgetChannelsListItemChannelVoiceBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1713c;
+    public final ImageView f1710c;
     @NonNull
     public final VoiceUserLimitView d;
 
     public WidgetChannelsListItemChannelVoiceBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull VoiceUserLimitView voiceUserLimitView) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f1713c = imageView;
+        this.f1710c = imageView;
         this.d = voiceUserLimitView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java
index 78486cabd0..3098068c28 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChannelsListItemHeaderBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1714c;
+    public final ImageView f1711c;
 
     public WidgetChannelsListItemHeaderBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f1714c = imageView;
+        this.f1711c = imageView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java
index 1b49007269..30c768c843 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChannelsListItemTextActionsBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1715c;
+    public final TextView f1712c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetChannelsListItemTextActionsBinding implements ViewBindi
     public WidgetChannelsListItemTextActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1715c = textView2;
+        this.f1712c = textView2;
         this.d = textView3;
         this.e = view;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java
index 23a9409ca8..075de32ab2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetChannelsListItemThreadActionsBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1716c;
+    public final TextView f1713c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -40,7 +40,7 @@ public final class WidgetChannelsListItemThreadActionsBinding implements ViewBin
     public WidgetChannelsListItemThreadActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull View view, @NonNull View view2, @NonNull TextView textView5, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9) {
         this.a = nestedScrollView;
         this.b = linearLayout;
-        this.f1716c = textView2;
+        this.f1713c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = view;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java
index 7c780f4a3a..ca00c75b6f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java
@@ -14,7 +14,7 @@ public final class WidgetChannelsListItemThreadBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1717c;
+    public final TextView f1714c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetChannelsListItemThreadBinding implements ViewBinding {
     public WidgetChannelsListItemThreadBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f1717c = textView;
+        this.f1714c = textView;
         this.d = textView2;
         this.e = imageView;
         this.f = imageView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java
index 17d29d4546..0c27988dc7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java
@@ -16,7 +16,7 @@ public final class WidgetChannelsListItemVoiceUserBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1718c;
+    public final ImageView f1715c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetChannelsListItemVoiceUserBinding implements ViewBinding
     public WidgetChannelsListItemVoiceUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull LinearLayout linearLayout) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f1718c = imageView;
+        this.f1715c = imageView;
         this.d = imageView2;
         this.e = textView;
         this.f = imageView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java
index c7e1d38c9d..956f16c75f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChannelsListUnreadsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1719c;
+    public final RelativeLayout f1716c;
 
     public WidgetChannelsListUnreadsBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout) {
         this.a = frameLayout;
         this.b = textView;
-        this.f1719c = relativeLayout;
+        this.f1716c = relativeLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java
index 01564d448a..1154fb2717 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetChatInputApplicationCommandsBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1720c;
+    public final RecyclerView f1717c;
 
     public WidgetChatInputApplicationCommandsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull View view) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f1720c = recyclerView;
+        this.f1717c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java
new file mode 100644
index 0000000000..b2bf09ef5d
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputAutocompleteItemBinding.java
@@ -0,0 +1,45 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.Barrier;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.viewbinding.ViewBinding;
+import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
+import com.discord.views.StatusView;
+import com.facebook.drawee.view.SimpleDraweeView;
+public final class WidgetChatInputAutocompleteItemBinding implements ViewBinding {
+    @NonNull
+    public final ConstraintLayout a;
+    @NonNull
+    public final SimpleDraweeView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f1718c;
+    @NonNull
+    public final SimpleDraweeSpanTextView d;
+    @NonNull
+    public final TextView e;
+    @NonNull
+    public final TextView f;
+    @NonNull
+    public final StatusView g;
+
+    public WidgetChatInputAutocompleteItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull View view, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull StatusView statusView) {
+        this.a = constraintLayout;
+        this.b = simpleDraweeView;
+        this.f1718c = textView;
+        this.d = simpleDraweeSpanTextView;
+        this.e = textView2;
+        this.f = textView3;
+        this.g = statusView;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java
index 03d19fb8b2..6ca0bd00d1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java
@@ -10,8 +10,8 @@ import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.d4;
-import c.a.i.e4;
+import c.a.i.g4;
+import c.a.i.h4;
 public final class WidgetChatInputBinding implements ViewBinding {
     @NonNull
     public final LinearLayout a;
@@ -20,7 +20,7 @@ public final class WidgetChatInputBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1721c;
+    public final RecyclerView f1719c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -50,16 +50,16 @@ public final class WidgetChatInputBinding implements ViewBinding {
     @NonNull
     public final LinearLayout q;
     @NonNull
-    public final d4 r;
+    public final g4 r;
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final e4 f1722s;
+    public final h4 f1720s;
 
-    public WidgetChatInputBinding(@NonNull LinearLayout linearLayout, @NonNull WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageButton appCompatImageButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView2, @NonNull LinearLayout linearLayout4, @NonNull TextView textView4, @NonNull RecyclerView recyclerView3, @NonNull FragmentContainerView fragmentContainerView, @NonNull LinearLayout linearLayout5, @NonNull d4 d4Var, @NonNull e4 e4Var) {
+    public WidgetChatInputBinding(@NonNull LinearLayout linearLayout, @NonNull WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageButton appCompatImageButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView2, @NonNull LinearLayout linearLayout4, @NonNull TextView textView4, @NonNull RecyclerView recyclerView3, @NonNull FragmentContainerView fragmentContainerView, @NonNull LinearLayout linearLayout5, @NonNull g4 g4Var, @NonNull h4 h4Var) {
         this.a = linearLayout;
         this.b = widgetChatInputApplicationCommandsBinding;
-        this.f1721c = recyclerView;
+        this.f1719c = recyclerView;
         this.d = linearLayout2;
         this.e = relativeLayout;
         this.f = appCompatImageButton;
@@ -74,8 +74,8 @@ public final class WidgetChatInputBinding implements ViewBinding {
         this.o = recyclerView3;
         this.p = fragmentContainerView;
         this.q = linearLayout5;
-        this.r = d4Var;
-        this.f1722s = e4Var;
+        this.r = g4Var;
+        this.f1720s = h4Var;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
new file mode 100644
index 0000000000..4004ea8772
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputCommandApplicationHeaderItemBinding.java
@@ -0,0 +1,51 @@
+package com.discord.databinding;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.viewbinding.ViewBinding;
+public final class WidgetChatInputCommandApplicationHeaderItemBinding implements ViewBinding {
+    @NonNull
+    public final ConstraintLayout a;
+    @NonNull
+    public final ImageView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f1721c;
+
+    public WidgetChatInputCommandApplicationHeaderItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
+        this.a = constraintLayout;
+        this.b = imageView;
+        this.f1721c = textView;
+    }
+
+    @NonNull
+    public static WidgetChatInputCommandApplicationHeaderItemBinding a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) {
+        View inflate = layoutInflater.inflate(2131558916, viewGroup, false);
+        if (z2) {
+            viewGroup.addView(inflate);
+        }
+        int i = 2131362460;
+        ImageView imageView = (ImageView) inflate.findViewById(2131362460);
+        if (imageView != null) {
+            i = 2131362463;
+            TextView textView = (TextView) inflate.findViewById(2131362463);
+            if (textView != null) {
+                return new WidgetChatInputCommandApplicationHeaderItemBinding((ConstraintLayout) inflate, imageView, textView);
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java
new file mode 100644
index 0000000000..6650c2014a
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputEmojiAutocompleteUpsellItemBinding.java
@@ -0,0 +1,30 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.discord.views.PileView;
+public final class WidgetChatInputEmojiAutocompleteUpsellItemBinding implements ViewBinding {
+    @NonNull
+    public final LinearLayout a;
+    @NonNull
+    public final PileView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f1722c;
+
+    public WidgetChatInputEmojiAutocompleteUpsellItemBinding(@NonNull LinearLayout linearLayout, @NonNull PileView pileView, @NonNull TextView textView) {
+        this.a = linearLayout;
+        this.b = pileView;
+        this.f1722c = textView;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputSlashLoadingItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputSlashLoadingItemBinding.java
new file mode 100644
index 0000000000..520dc6ed4d
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetChatInputSlashLoadingItemBinding.java
@@ -0,0 +1,21 @@
+package com.discord.databinding;
+
+import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
+import androidx.viewbinding.ViewBinding;
+public final class WidgetChatInputSlashLoadingItemBinding implements ViewBinding {
+    @NonNull
+    public final ConstraintLayout a;
+
+    public WidgetChatInputSlashLoadingItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull Guideline guideline, @NonNull View view2, @NonNull Guideline guideline2, @NonNull View view3, @NonNull Guideline guideline3) {
+        this.a = constraintLayout;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java
index 72cc83145e..42ef9288e1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java
@@ -1,12 +1,11 @@
 package com.discord.databinding;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
+import c.a.i.x2;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
 public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding {
@@ -29,21 +28,13 @@ public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding
     @NonNull
     public final View h;
     @NonNull
-    public final LinearLayout i;
+    public final x2 i;
     @NonNull
     public final MaterialButton j;
     @NonNull
     public final TextView k;
-    @NonNull
-    public final ImageView l;
-    @NonNull
-    public final TextView m;
-    @NonNull
-    public final ImageView n;
-    @NonNull
-    public final TextView o;
 
-    public WidgetChatListAdapterItemInviteBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull View view, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton3, @NonNull TextView textView4, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull ImageView imageView2, @NonNull TextView textView6, @NonNull ConstraintLayout constraintLayout2) {
+    public WidgetChatListAdapterItemInviteBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull View view, @NonNull x2 x2Var, @NonNull MaterialButton materialButton3, @NonNull TextView textView4, @NonNull ConstraintLayout constraintLayout2) {
         this.a = constraintLayout;
         this.b = textView;
         this.f1735c = textView2;
@@ -52,13 +43,9 @@ public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding
         this.f = materialButton;
         this.g = materialButton2;
         this.h = view;
-        this.i = linearLayout;
+        this.i = x2Var;
         this.j = materialButton3;
         this.k = textView4;
-        this.l = imageView;
-        this.m = textView5;
-        this.n = imageView2;
-        this.o = textView6;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
index b57024c2b8..c9f409eb5f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java
@@ -26,14 +26,14 @@ public final class WidgetChatListAdapterItemTextDividerBinding implements ViewBi
 
     @NonNull
     public static WidgetChatListAdapterItemTextDividerBinding a(@NonNull View view) {
-        int i = 2131362941;
-        View findViewById = view.findViewById(2131362941);
+        int i = 2131362966;
+        View findViewById = view.findViewById(2131362966);
         if (findViewById != null) {
-            i = 2131362942;
-            View findViewById2 = view.findViewById(2131362942);
+            i = 2131362967;
+            View findViewById2 = view.findViewById(2131362967);
             if (findViewById2 != null) {
-                i = 2131362943;
-                TextView textView = (TextView) view.findViewById(2131362943);
+                i = 2131362968;
+                TextView textView = (TextView) view.findViewById(2131362968);
                 if (textView != null) {
                     return new WidgetChatListAdapterItemTextDividerBinding((RelativeLayout) view, findViewById, findViewById2, textView);
                 }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
index 7f47a63ae4..7f2e81ee5a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java
@@ -36,20 +36,20 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind
 
     @NonNull
     public static WidgetChatListBotUiButtonComponentBinding a(@NonNull View view) {
-        int i = 2131362183;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362183);
+        int i = 2131362194;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362194);
         if (materialButton != null) {
-            i = 2131363003;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363003);
+            i = 2131363028;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363028);
             if (simpleDraweeView != null) {
-                i = 2131363730;
-                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131363730);
+                i = 2131363771;
+                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131363771);
                 if (materialTextView != null) {
-                    i = 2131363756;
-                    AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363756);
+                    i = 2131363797;
+                    AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363797);
                     if (appCompatImageView != null) {
-                        i = 2131363769;
-                        TypingDots typingDots = (TypingDots) view.findViewById(2131363769);
+                        i = 2131363810;
+                        TypingDots typingDots = (TypingDots) view.findViewById(2131363810);
                         if (typingDots != null) {
                             return new WidgetChatListBotUiButtonComponentBinding((ButtonComponentView) view, materialButton, simpleDraweeView, materialTextView, appCompatImageView, typingDots);
                         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java
index 933035a45f..fe68c9160c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java
@@ -7,7 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.g4;
+import c.a.i.j4;
 import com.discord.views.typing.TypingDots;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 public final class WidgetChatOverlayBinding implements ViewBinding {
@@ -28,9 +28,9 @@ public final class WidgetChatOverlayBinding implements ViewBinding {
     @NonNull
     public final TextView g;
     @NonNull
-    public final g4 h;
+    public final j4 h;
 
-    public WidgetChatOverlayBinding(@NonNull ConstraintLayout constraintLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull RelativeLayout relativeLayout, @NonNull TypingDots typingDots, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull g4 g4Var) {
+    public WidgetChatOverlayBinding(@NonNull ConstraintLayout constraintLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull RelativeLayout relativeLayout, @NonNull TypingDots typingDots, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull j4 j4Var) {
         this.a = constraintLayout;
         this.b = floatingActionButton;
         this.f1751c = relativeLayout;
@@ -38,7 +38,7 @@ public final class WidgetChatOverlayBinding implements ViewBinding {
         this.e = textView;
         this.f = imageView;
         this.g = textView2;
-        this.h = g4Var;
+        this.h = j4Var;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
index edd64b1384..dd4581ef40 100644
--- a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java
@@ -36,21 +36,21 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding
 
     @NonNull
     public static WidgetChoosePlanAdapterPlanItemBinding a(@NonNull View view) {
-        int i = 2131364223;
-        ImageView imageView = (ImageView) view.findViewById(2131364223);
+        int i = 2131364267;
+        ImageView imageView = (ImageView) view.findViewById(2131364267);
         if (imageView != null) {
             MaterialCardView materialCardView = (MaterialCardView) view;
-            i = 2131364225;
-            TextView textView = (TextView) view.findViewById(2131364225);
+            i = 2131364269;
+            TextView textView = (TextView) view.findViewById(2131364269);
             if (textView != null) {
-                i = 2131364226;
-                ImageView imageView2 = (ImageView) view.findViewById(2131364226);
+                i = 2131364270;
+                ImageView imageView2 = (ImageView) view.findViewById(2131364270);
                 if (imageView2 != null) {
-                    i = 2131364227;
-                    TextView textView2 = (TextView) view.findViewById(2131364227);
+                    i = 2131364271;
+                    TextView textView2 = (TextView) view.findViewById(2131364271);
                     if (textView2 != null) {
-                        i = 2131364228;
-                        TextView textView3 = (TextView) view.findViewById(2131364228);
+                        i = 2131364272;
+                        TextView textView3 = (TextView) view.findViewById(2131364272);
                         if (textView3 != null) {
                             return new WidgetChoosePlanAdapterPlanItemBinding(materialCardView, imageView, materialCardView, textView, imageView2, textView2, textView3);
                         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java b/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java
new file mode 100644
index 0000000000..c75479d6f9
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetClaimOutboundPromoBinding.java
@@ -0,0 +1,51 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.viewbinding.ViewBinding;
+import com.discord.app.AppViewFlipper;
+import com.google.android.material.button.MaterialButton;
+public final class WidgetClaimOutboundPromoBinding implements ViewBinding {
+    @NonNull
+    public final LinearLayoutCompat a;
+    @NonNull
+    public final TextView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f1755c;
+    @NonNull
+    public final LinearLayout d;
+    @NonNull
+    public final MaterialButton e;
+    @NonNull
+    public final MaterialButton f;
+    @NonNull
+    public final AppViewFlipper g;
+    @NonNull
+    public final MaterialButton h;
+    @NonNull
+    public final MaterialButton i;
+
+    public WidgetClaimOutboundPromoBinding(@NonNull LinearLayoutCompat linearLayoutCompat, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayoutCompat linearLayoutCompat2, @NonNull MaterialButton materialButton2, @NonNull AppViewFlipper appViewFlipper, @NonNull FrameLayout frameLayout, @NonNull MaterialButton materialButton3, @NonNull MaterialButton materialButton4, @NonNull LinearLayoutCompat linearLayoutCompat3) {
+        this.a = linearLayoutCompat;
+        this.b = textView;
+        this.f1755c = textView2;
+        this.d = linearLayout;
+        this.e = materialButton;
+        this.f = materialButton2;
+        this.g = appViewFlipper;
+        this.h = materialButton3;
+        this.i = materialButton4;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java
index 4d66100971..59c3d5cd9f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java
@@ -14,12 +14,12 @@ public final class WidgetCollapsedVoiceUserListItemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1755c;
+    public final SimpleDraweeView f1756c;
 
     public WidgetCollapsedVoiceUserListItemBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView) {
         this.a = frameLayout;
         this.b = textView;
-        this.f1755c = simpleDraweeView;
+        this.f1756c = simpleDraweeView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java
index abc74375e5..2df7db3a68 100644
--- a/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java
@@ -14,12 +14,12 @@ public final class WidgetConfirmRemoveCommunityDialogBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1756c;
+    public final MaterialButton f1757c;
 
     public WidgetConfirmRemoveCommunityDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1756c = materialButton2;
+        this.f1757c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java b/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java
index 40299e1c06..00abb8d30c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java
@@ -15,14 +15,14 @@ public final class WidgetConnectionsAddXboxBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1757c;
+    public final LinearLayout f1758c;
     @NonNull
     public final DimmerView d;
 
     public WidgetConnectionsAddXboxBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CodeVerificationView codeVerificationView, @NonNull LinearLayout linearLayout, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = codeVerificationView;
-        this.f1757c = linearLayout;
+        this.f1758c = linearLayout;
         this.d = dimmerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java b/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java
index 8627447215..78c132d1d8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java
@@ -19,7 +19,7 @@ public final class WidgetContactSyncBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final e0 f1758c;
+    public final e0 f1759c;
     @NonNull
     public final f0 d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetContactSyncBinding implements ViewBinding {
     public WidgetContactSyncBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull b0 b0Var, @NonNull e0 e0Var, @NonNull f0 f0Var, @NonNull c0 c0Var, @NonNull d0 d0Var, @NonNull h0 h0Var, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = b0Var;
-        this.f1758c = e0Var;
+        this.f1759c = e0Var;
         this.d = f0Var;
         this.e = c0Var;
         this.f = d0Var;
diff --git a/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java
index 7d0135fc6b..bd75798574 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java
@@ -21,7 +21,7 @@ public final class WidgetCreateChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RadioButton f1759c;
+    public final RadioButton f1760c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -56,7 +56,7 @@ public final class WidgetCreateChannelBinding implements ViewBinding {
     public WidgetCreateChannelBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull RadioButton radioButton, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2, @NonNull SwitchCompat switchCompat, @NonNull TextView textView3, @NonNull RecyclerView recyclerView, @NonNull View view, @NonNull TextView textView4, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView2, @NonNull RadioButton radioButton2, @NonNull TextView textView5, @NonNull ConstraintLayout constraintLayout3, @NonNull ImageView imageView3, @NonNull RadioButton radioButton3, @NonNull TextView textView6, @NonNull LinearLayout linearLayout, @NonNull ConstraintLayout constraintLayout4, @NonNull ImageView imageView4, @NonNull RadioButton radioButton4, @NonNull TextView textView7) {
         this.a = coordinatorLayout;
         this.b = constraintLayout;
-        this.f1759c = radioButton;
+        this.f1760c = radioButton;
         this.d = textInputLayout;
         this.e = relativeLayout;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java b/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java
index 22d070ddf3..d528e80be2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java
@@ -15,7 +15,7 @@ public final class WidgetCreationIntentBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1760c;
+    public final TextView f1761c;
     @NonNull
     public final MaterialCardView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetCreationIntentBinding implements ViewBinding {
     public WidgetCreationIntentBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialCardView materialCardView, @NonNull TextView textView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView2, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = materialCardView;
-        this.f1760c = textView;
+        this.f1761c = textView;
         this.d = materialCardView2;
         this.e = textView2;
         this.f = linkifiedTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java
index 82126da52a..18bbcb8fb5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java
@@ -16,7 +16,7 @@ public final class WidgetDisableDeleteAccountDialogBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1761c;
+    public final MaterialButton f1762c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetDisableDeleteAccountDialogBinding implements ViewBindin
     public WidgetDisableDeleteAccountDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1761c = materialButton;
+        this.f1762c = materialButton;
         this.d = textInputLayout;
         this.e = loadingButton;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java b/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java
index adad30c09d..373369c4fb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java
@@ -16,7 +16,7 @@ public final class WidgetDiscoveryBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1762c;
+    public final RecyclerView f1763c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetDiscoveryBinding implements ViewBinding {
     public WidgetDiscoveryBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull SwipeRefreshLayout swipeRefreshLayout) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f1762c = recyclerView;
+        this.f1763c = recyclerView;
         this.d = textView3;
         this.e = swipeRefreshLayout;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java b/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java
index 8122562cd3..2034534143 100644
--- a/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java
@@ -16,7 +16,7 @@ public final class WidgetDiscoveryStageCardBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final DiscoveryStageCardBodyView f1763c;
+    public final DiscoveryStageCardBodyView f1764c;
     @NonNull
     public final DiscoveryStageCardControlsView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetDiscoveryStageCardBinding implements ViewBinding {
     public WidgetDiscoveryStageCardBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull DiscoveryStageCardBodyView discoveryStageCardBodyView, @NonNull DiscoveryStageCardControlsView discoveryStageCardControlsView, @NonNull TextView textView, @NonNull DiscoveryStageCardTopHatView discoveryStageCardTopHatView, @NonNull View view, @NonNull View view2) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f1763c = discoveryStageCardBodyView;
+        this.f1764c = discoveryStageCardBodyView;
         this.d = discoveryStageCardControlsView;
         this.e = textView;
         this.f = discoveryStageCardTopHatView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java b/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java
index 83884ceedd..3fc8c252e4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java
@@ -50,7 +50,7 @@ public final class WidgetEditRoleBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1764c;
+    public final FloatingActionButton f1765c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -84,7 +84,7 @@ public final class WidgetEditRoleBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final CheckedSetting f1765s;
+    public final CheckedSetting f1766s;
     @NonNull
     public final CheckedSetting t;
     @NonNull
@@ -96,20 +96,20 @@ public final class WidgetEditRoleBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final CheckedSetting f1766x;
+    public final CheckedSetting f1767x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final CheckedSetting f1767y;
+    public final CheckedSetting f1768y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final CheckedSetting f1768z;
+    public final CheckedSetting f1769z;
 
     public WidgetEditRoleBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull View view, @NonNull RelativeLayout relativeLayout, @NonNull CheckedSetting checkedSetting6, @NonNull View view2, @NonNull View view3, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull CheckedSetting checkedSetting11, @NonNull CheckedSetting checkedSetting12, @NonNull CheckedSetting checkedSetting13, @NonNull CheckedSetting checkedSetting14, @NonNull CheckedSetting checkedSetting15, @NonNull CheckedSetting checkedSetting16, @NonNull CheckedSetting checkedSetting17, @NonNull CheckedSetting checkedSetting18, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting19, @NonNull CheckedSetting checkedSetting20, @NonNull CheckedSetting checkedSetting21, @NonNull CheckedSetting checkedSetting22, @NonNull CheckedSetting checkedSetting23, @NonNull CheckedSetting checkedSetting24, @NonNull CheckedSetting checkedSetting25, @NonNull CheckedSetting checkedSetting26, @NonNull CheckedSetting checkedSetting27, @NonNull CheckedSetting checkedSetting28, @NonNull CheckedSetting checkedSetting29, @NonNull CheckedSetting checkedSetting30, @NonNull CheckedSetting checkedSetting31, @NonNull CheckedSetting checkedSetting32, @NonNull CheckedSetting checkedSetting33, @NonNull CheckedSetting checkedSetting34, @NonNull CheckedSetting checkedSetting35, @NonNull View view4, @NonNull TextView textView) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1764c = floatingActionButton;
+        this.f1765c = floatingActionButton;
         this.d = checkedSetting;
         this.e = checkedSetting2;
         this.f = checkedSetting3;
@@ -125,14 +125,14 @@ public final class WidgetEditRoleBinding implements ViewBinding {
         this.p = checkedSetting9;
         this.q = checkedSetting10;
         this.r = checkedSetting11;
-        this.f1765s = checkedSetting12;
+        this.f1766s = checkedSetting12;
         this.t = checkedSetting13;
         this.u = checkedSetting14;
         this.v = checkedSetting15;
         this.w = checkedSetting16;
-        this.f1766x = checkedSetting17;
-        this.f1767y = checkedSetting18;
-        this.f1768z = checkedSetting19;
+        this.f1767x = checkedSetting17;
+        this.f1768y = checkedSetting18;
+        this.f1769z = checkedSetting19;
         this.A = checkedSetting20;
         this.B = checkedSetting21;
         this.C = checkedSetting22;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java
index 4444b1e673..f745cd2180 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java
@@ -22,7 +22,7 @@ public final class WidgetEmojiPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f1769c;
+    public final AppViewFlipper f1770c;
     @NonNull
     public final AppBarLayout d;
     @NonNull
@@ -49,7 +49,7 @@ public final class WidgetEmojiPickerBinding implements ViewBinding {
     public WidgetEmojiPickerBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull AppBarLayout appBarLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull Barrier barrier, @NonNull RecyclerView recyclerView2, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull ImageView imageView2, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView3, @NonNull TextInputEditText textInputEditText, @NonNull Toolbar toolbar) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1769c = appViewFlipper;
+        this.f1770c = appViewFlipper;
         this.d = appBarLayout;
         this.e = textView;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java
index bfa56d6447..0a42a2cf10 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetEmojiSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1770c;
+    public final TextView f1771c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -50,7 +50,7 @@ public final class WidgetEmojiSheetBinding implements ViewBinding {
     public WidgetEmojiSheetBinding(@NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView, @NonNull FrameLayout frameLayout, @NonNull View view, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppViewFlipper appViewFlipper2, @NonNull MaterialButton materialButton, @NonNull FrameLayout frameLayout2, @NonNull MaterialButton materialButton2, @NonNull TextView textView3, @NonNull FrameLayout frameLayout3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView5, @NonNull MaterialButton materialButton3, @NonNull TextView textView6, @NonNull MaterialButton materialButton4) {
         this.a = appViewFlipper;
         this.b = frameLayout;
-        this.f1770c = textView2;
+        this.f1771c = textView2;
         this.d = simpleDraweeView;
         this.e = appViewFlipper2;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java b/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java
index f78a1e552a..6a9a55b938 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetEnableMfaStepsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final StepsView f1771c;
+    public final StepsView f1772c;
 
     public WidgetEnableMfaStepsBinding(@NonNull FrameLayout frameLayout, @NonNull DimmerView dimmerView, @NonNull StepsView stepsView) {
         this.a = frameLayout;
         this.b = dimmerView;
-        this.f1771c = stepsView;
+        this.f1772c = stepsView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java
index fe55021aec..72dcddb082 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java
@@ -16,7 +16,7 @@ public final class WidgetEnableSmsBackupDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1772c;
+    public final MaterialButton f1773c;
     @NonNull
     public final LoadingButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetEnableSmsBackupDialogBinding implements ViewBinding {
     public WidgetEnableSmsBackupDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1772c = materialButton;
+        this.f1773c = materialButton;
         this.d = loadingButton;
         this.e = textView2;
         this.f = textInputLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java
index 17fe8834fe..0389e69f07 100644
--- a/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java
@@ -13,12 +13,12 @@ public final class WidgetEndStageBottomSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1773c;
+    public final MaterialButton f1774c;
 
     public WidgetEndStageBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = nestedScrollView;
         this.b = materialButton;
-        this.f1773c = materialButton2;
+        this.f1774c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java b/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java
index 8c4b24491b..ef86f1b6d4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java
@@ -21,7 +21,7 @@ public final class WidgetExpressionTrayBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1774c;
+    public final FrameLayout f1775c;
     @NonNull
     public final FragmentContainerView d;
     @NonNull
@@ -46,7 +46,7 @@ public final class WidgetExpressionTrayBinding implements ViewBinding {
     public WidgetExpressionTrayBinding(@NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull FrameLayout frameLayout3, @NonNull FragmentContainerView fragmentContainerView, @NonNull CardSegment cardSegment, @NonNull FragmentContainerView fragmentContainerView2, @NonNull CardSegment cardSegment2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout, @NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull CardSegment cardSegment3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull AppBarLayout appBarLayout) {
         this.a = frameLayout;
         this.b = frameLayout2;
-        this.f1774c = frameLayout3;
+        this.f1775c = frameLayout3;
         this.d = fragmentContainerView;
         this.e = fragmentContainerView2;
         this.f = fragmentContainerView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java b/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java
index 6246ceae3b..8b9da7ca33 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java
@@ -15,7 +15,7 @@ public final class WidgetFatalCrashBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1775c;
+    public final TextView f1776c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetFatalCrashBinding implements ViewBinding {
     public WidgetFatalCrashBinding(@NonNull ScrollView scrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView5) {
         this.a = scrollView;
         this.b = textView;
-        this.f1775c = textView2;
+        this.f1776c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = linkifiedTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java
index 33134c30f3..3a14c3d854 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java
@@ -15,7 +15,7 @@ public final class WidgetFeedbackSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final NestedScrollView f1776c;
+    public final NestedScrollView f1777c;
     @NonNull
     public final FeedbackView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetFeedbackSheetBinding implements ViewBinding {
     public WidgetFeedbackSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull ImageView imageView, @NonNull NestedScrollView nestedScrollView2, @NonNull FeedbackView feedbackView, @NonNull TextView textView) {
         this.a = nestedScrollView;
         this.b = imageView;
-        this.f1776c = nestedScrollView2;
+        this.f1777c = nestedScrollView2;
         this.d = feedbackView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
index a17258b6f8..6695cff25b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java
@@ -13,7 +13,7 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1777c;
+    public final TextView f1778c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding {
     public WidgetFolderContextMenuBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = cardView;
         this.b = cardView2;
-        this.f1777c = textView;
+        this.f1778c = textView;
         this.d = textView2;
         this.e = textView3;
     }
@@ -30,17 +30,17 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding {
     @NonNull
     public static WidgetFolderContextMenuBinding a(@NonNull View view) {
         CardView cardView = (CardView) view;
-        int i = 2131363218;
-        TextView textView = (TextView) view.findViewById(2131363218);
+        int i = 2131363243;
+        TextView textView = (TextView) view.findViewById(2131363243);
         if (textView != null) {
-            i = 2131363219;
-            View findViewById = view.findViewById(2131363219);
+            i = 2131363244;
+            View findViewById = view.findViewById(2131363244);
             if (findViewById != null) {
-                i = 2131363220;
-                TextView textView2 = (TextView) view.findViewById(2131363220);
+                i = 2131363245;
+                TextView textView2 = (TextView) view.findViewById(2131363245);
                 if (textView2 != null) {
-                    i = 2131363221;
-                    TextView textView3 = (TextView) view.findViewById(2131363221);
+                    i = 2131363246;
+                    TextView textView3 = (TextView) view.findViewById(2131363246);
                     if (textView3 != null) {
                         return new WidgetFolderContextMenuBinding((CardView) view, cardView, textView, findViewById, textView2, textView3);
                     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java
index 8ea58409cc..e309cdd6ef 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java
@@ -16,7 +16,7 @@ public final class WidgetFriendsAddByIdBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1778c;
+    public final LinearLayout f1779c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetFriendsAddByIdBinding implements ViewBinding {
     public WidgetFriendsAddByIdBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1778c = linearLayout;
+        this.f1779c = linearLayout;
         this.d = materialButton;
         this.e = textInputLayout;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java
index 0b2c62fb76..2984fab967 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java
@@ -18,7 +18,7 @@ public final class WidgetFriendsListAdapterItemFriendBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1779c;
+    public final SimpleDraweeView f1780c;
     @NonNull
     public final AppCompatImageView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetFriendsListAdapterItemFriendBinding implements ViewBind
     public WidgetFriendsListAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2) {
         this.a = relativeLayout;
         this.b = simpleDraweeSpanTextView;
-        this.f1779c = simpleDraweeView;
+        this.f1780c = simpleDraweeView;
         this.d = appCompatImageView;
         this.e = appCompatImageView2;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java
index fc63e3f05f..d582771e58 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java
@@ -18,7 +18,7 @@ public final class WidgetFriendsListAdapterItemPendingBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeSpanTextView f1780c;
+    public final SimpleDraweeSpanTextView f1781c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetFriendsListAdapterItemPendingBinding implements ViewBin
     public WidgetFriendsListAdapterItemPendingBinding(@NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2) {
         this.a = relativeLayout;
         this.b = appCompatImageView;
-        this.f1780c = simpleDraweeSpanTextView;
+        this.f1781c = simpleDraweeSpanTextView;
         this.d = simpleDraweeView;
         this.e = appCompatImageView2;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java
index 6aaee6d420..46a2a0dac4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java
@@ -16,7 +16,7 @@ public final class WidgetFriendsListBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final EmptyFriendsStateView f1781c;
+    public final EmptyFriendsStateView f1782c;
     @NonNull
     public final AppViewFlipper d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetFriendsListBinding implements ViewBinding {
     public WidgetFriendsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView, @NonNull EmptyFriendsStateView emptyFriendsStateView, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) {
         this.a = relativeLayout;
         this.b = emptyFriendsStateContactSyncView;
-        this.f1781c = emptyFriendsStateView;
+        this.f1782c = emptyFriendsStateView;
         this.d = appViewFlipper;
         this.e = recyclerView;
         this.f = recyclerView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
index 5c5c0a78bc..6d12352417 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java
@@ -13,21 +13,21 @@ public final class WidgetFriendsListExpandableHeaderBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1782c;
+    public final TextView f1783c;
 
     public WidgetFriendsListExpandableHeaderBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = frameLayout;
         this.b = textView;
-        this.f1782c = textView2;
+        this.f1783c = textView2;
     }
 
     @NonNull
     public static WidgetFriendsListExpandableHeaderBinding a(@NonNull View view) {
-        int i = 2131363244;
-        TextView textView = (TextView) view.findViewById(2131363244);
+        int i = 2131363269;
+        TextView textView = (TextView) view.findViewById(2131363269);
         if (textView != null) {
-            i = 2131363261;
-            TextView textView2 = (TextView) view.findViewById(2131363261);
+            i = 2131363286;
+            TextView textView2 = (TextView) view.findViewById(2131363286);
             if (textView2 != null) {
                 return new WidgetFriendsListExpandableHeaderBinding((FrameLayout) view, textView, textView2);
             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java
index c877eb1e25..0ec9b94c2f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java
@@ -16,7 +16,7 @@ public final class WidgetFriendsNearbyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1783c;
+    public final TextView f1784c;
     @NonNull
     public final RecyclerView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetFriendsNearbyBinding implements ViewBinding {
     public WidgetFriendsNearbyBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull TextView textView2, @NonNull RLottieImageView rLottieImageView, @NonNull TextView textView3) {
         this.a = nestedScrollView;
         this.b = materialButton;
-        this.f1783c = textView;
+        this.f1784c = textView;
         this.d = recyclerView;
         this.e = textView2;
         this.f = rLottieImageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java
index ad75512d57..383a2cce9c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGifCategoryBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1784c;
+    public final RecyclerView f1785c;
     @NonNull
     public final GifLoadingView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetGifCategoryBinding implements ViewBinding {
     public WidgetGifCategoryBinding(@NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout, @NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout2, @NonNull RecyclerView recyclerView, @NonNull GifLoadingView gifLoadingView, @NonNull TextView textView) {
         this.a = contentResizingCoordinatorLayout;
         this.b = contentResizingCoordinatorLayout2;
-        this.f1784c = recyclerView;
+        this.f1785c = recyclerView;
         this.d = gifLoadingView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java
index 945e51d81e..2c280ae079 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java
@@ -14,14 +14,14 @@ public final class WidgetGifPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1785c;
+    public final FrameLayout f1786c;
     @NonNull
     public final GifLoadingView d;
 
     public WidgetGifPickerBinding(@NonNull FrameLayout frameLayout, @NonNull RecyclerView recyclerView, @NonNull FrameLayout frameLayout2, @NonNull GifLoadingView gifLoadingView) {
         this.a = frameLayout;
         this.b = recyclerView;
-        this.f1785c = frameLayout2;
+        this.f1786c = frameLayout2;
         this.d = gifLoadingView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java
index 64417cd345..f5e71b2910 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGifPickerSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final GifLoadingView f1786c;
+    public final GifLoadingView f1787c;
     @NonNull
     public final AppViewFlipper d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGifPickerSearchBinding implements ViewBinding {
     public WidgetGifPickerSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout appBarLayout, @NonNull RecyclerView recyclerView, @NonNull GifLoadingView gifLoadingView, @NonNull Toolbar toolbar, @NonNull AppViewFlipper appViewFlipper, @NonNull SearchInputView searchInputView) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1786c = gifLoadingView;
+        this.f1787c = gifLoadingView;
         this.d = appViewFlipper;
         this.e = searchInputView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java
index cdcc9cd341..ec9c0b9722 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java
@@ -17,7 +17,7 @@ public final class WidgetGlobalSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1787c;
+    public final TextInputLayout f1788c;
     @NonNull
     public final TextInputEditText d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetGlobalSearchBinding implements ViewBinding {
     public WidgetGlobalSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputEditText textInputEditText, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton2, @NonNull RecyclerView recyclerView2, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1787c = textInputLayout;
+        this.f1788c = textInputLayout;
         this.d = textInputEditText;
         this.e = recyclerView;
         this.f = materialButton2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java
index f0397a570d..b81bb65c54 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java
@@ -13,12 +13,12 @@ public final class WidgetGlobalSearchItemGuildBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1788c;
+    public final ImageView f1789c;
 
     public WidgetGlobalSearchItemGuildBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1788c = imageView2;
+        this.f1789c = imageView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java
index 9b819135eb..9a28fed0dc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGlobalStatusIndicatorBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1789c;
+    public final LinearLayout f1790c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetGlobalStatusIndicatorBinding implements ViewBinding {
     public WidgetGlobalStatusIndicatorBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull MaterialButton materialButton2, @NonNull ImageView imageView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1789c = linearLayout2;
+        this.f1790c = linearLayout2;
         this.d = materialButton;
         this.e = linearLayout3;
         this.f = linearLayout4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java
index 3240354e93..6119246a33 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGroupInviteFriendsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1790c;
+    public final RelativeLayout f1791c;
     @NonNull
     public final RecyclerView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetGroupInviteFriendsBinding implements ViewBinding {
     public WidgetGroupInviteFriendsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull ChipsView chipsView, @NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = chipsView;
-        this.f1790c = relativeLayout;
+        this.f1791c = relativeLayout;
         this.d = recyclerView;
         this.e = floatingActionButton;
         this.f = appViewFlipper;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java
index 6d51df87f8..df5d8d647e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java
@@ -18,7 +18,7 @@ public final class WidgetGroupInviteFriendsItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1791c;
+    public final SimpleDraweeView f1792c;
     @NonNull
     public final SimpleDraweeSpanTextView d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetGroupInviteFriendsItemBinding implements ViewBinding {
     public WidgetGroupInviteFriendsItemBinding(@NonNull LinearLayout linearLayout, @NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull CheckBox checkBox) {
         this.a = linearLayout;
         this.b = relativeLayout;
-        this.f1791c = simpleDraweeView;
+        this.f1792c = simpleDraweeView;
         this.d = simpleDraweeSpanTextView;
         this.e = textView;
         this.f = statusView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java
index 2279e73698..f07d9d5998 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java
@@ -22,7 +22,7 @@ public final class WidgetGuildCloneBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f1792c;
+    public final AppViewFlipper f1793c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -41,7 +41,7 @@ public final class WidgetGuildCloneBinding implements ViewBinding {
     public WidgetGuildCloneBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull i0 i0Var, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull GuildTemplateChannelsView guildTemplateChannelsView, @NonNull RolesListView rolesListView, @NonNull LinearLayout linearLayout, @NonNull ProgressBar progressBar) {
         this.a = coordinatorLayout;
         this.b = loadingButton;
-        this.f1792c = appViewFlipper;
+        this.f1793c = appViewFlipper;
         this.d = linkifiedTextView;
         this.e = i0Var;
         this.f = textInputLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
index 2cee684bc0..7218286a6d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java
@@ -13,7 +13,7 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1793c;
+    public final TextView f1794c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding {
     public WidgetGuildContextMenuBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) {
         this.a = cardView;
         this.b = cardView2;
-        this.f1793c = textView;
+        this.f1794c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = textView4;
@@ -36,23 +36,23 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding {
     @NonNull
     public static WidgetGuildContextMenuBinding a(@NonNull View view) {
         CardView cardView = (CardView) view;
-        int i = 2131363347;
-        TextView textView = (TextView) view.findViewById(2131363347);
+        int i = 2131363373;
+        TextView textView = (TextView) view.findViewById(2131363373);
         if (textView != null) {
-            i = 2131363348;
-            View findViewById = view.findViewById(2131363348);
+            i = 2131363374;
+            View findViewById = view.findViewById(2131363374);
             if (findViewById != null) {
-                i = 2131363349;
-                TextView textView2 = (TextView) view.findViewById(2131363349);
+                i = 2131363375;
+                TextView textView2 = (TextView) view.findViewById(2131363375);
                 if (textView2 != null) {
-                    i = 2131363350;
-                    TextView textView3 = (TextView) view.findViewById(2131363350);
+                    i = 2131363376;
+                    TextView textView3 = (TextView) view.findViewById(2131363376);
                     if (textView3 != null) {
-                        i = 2131363351;
-                        TextView textView4 = (TextView) view.findViewById(2131363351);
+                        i = 2131363377;
+                        TextView textView4 = (TextView) view.findViewById(2131363377);
                         if (textView4 != null) {
-                            i = 2131363352;
-                            TextView textView5 = (TextView) view.findViewById(2131363352);
+                            i = 2131363378;
+                            TextView textView5 = (TextView) view.findViewById(2131363378);
                             if (textView5 != null) {
                                 return new WidgetGuildContextMenuBinding((CardView) view, cardView, textView, findViewById, textView2, textView3, textView4, textView5);
                             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java
index aabfd964b8..7928045bd5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java
@@ -17,7 +17,7 @@ public final class WidgetGuildCreateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f1794c;
+    public final LinkifiedTextView f1795c;
     @NonNull
     public final i0 d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetGuildCreateBinding implements ViewBinding {
     public WidgetGuildCreateBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull i0 i0Var, @NonNull TextInputLayout textInputLayout, @NonNull ScreenTitleView screenTitleView) {
         this.a = coordinatorLayout;
         this.b = loadingButton;
-        this.f1794c = linkifiedTextView;
+        this.f1795c = linkifiedTextView;
         this.d = i0Var;
         this.e = textInputLayout;
         this.f = screenTitleView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java
index 22bbdeec86..3ca509984f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildFolderSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1795c;
+    public final TextView f1796c;
     @NonNull
     public final RelativeLayout d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildFolderSettingsBinding implements ViewBinding {
     public WidgetGuildFolderSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1795c = textView;
+        this.f1796c = textView;
         this.d = relativeLayout;
         this.e = view;
         this.f = floatingActionButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java
index 7f29986680..8bc3795d75 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGuildInviteBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1796c;
+    public final MaterialButton f1797c;
     @NonNull
     public final WidgetInviteInfo d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetGuildInviteBinding implements ViewBinding {
     public WidgetGuildInviteBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull MaterialButton materialButton2, @NonNull WidgetInviteInfo widgetInviteInfo, @NonNull SimpleDraweeView simpleDraweeView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1796c = materialButton2;
+        this.f1797c = materialButton2;
         this.d = widgetInviteInfo;
         this.e = simpleDraweeView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java
index b4f770bf67..f808c432a0 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java
@@ -17,7 +17,7 @@ public final class WidgetGuildInviteInfoBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1797c;
+    public final SimpleDraweeView f1798c;
     @NonNull
     public final CardView d;
     @NonNull
@@ -44,7 +44,7 @@ public final class WidgetGuildInviteInfoBinding implements ViewBinding {
     public WidgetGuildInviteInfoBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView, @NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull CardView cardView2, @NonNull TextView textView2, @NonNull CardView cardView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f1797c = simpleDraweeView2;
+        this.f1798c = simpleDraweeView2;
         this.d = cardView;
         this.e = relativeLayout;
         this.f = relativeLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java
index 4e6297bf0d..3598d00dd2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildInviteSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RadioGroup f1798c;
+    public final RadioGroup f1799c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildInviteSettingsBinding implements ViewBinding {
     public WidgetGuildInviteSettingsBinding(@NonNull LinearLayout linearLayout, @NonNull Spinner spinner, @NonNull RadioGroup radioGroup, @NonNull MaterialButton materialButton, @NonNull RadioGroup radioGroup2, @NonNull CheckedSetting checkedSetting) {
         this.a = linearLayout;
         this.b = spinner;
-        this.f1798c = radioGroup;
+        this.f1799c = radioGroup;
         this.d = materialButton;
         this.e = radioGroup2;
         this.f = checkedSetting;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java
index de4d31e4ff..38645a4f4c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java
@@ -20,7 +20,7 @@ public final class WidgetGuildInviteShareBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1799c;
+    public final TextView f1800c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -41,7 +41,7 @@ public final class WidgetGuildInviteShareBinding implements ViewBinding {
     public WidgetGuildInviteShareBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) {
         this.a = coordinatorLayout;
         this.b = view;
-        this.f1799c = textView;
+        this.f1800c = textView;
         this.d = textView2;
         this.e = checkedSetting;
         this.f = imageView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java
index 6a29360a88..30451fad39 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java
@@ -19,7 +19,7 @@ public final class WidgetGuildInviteShareCompactBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1800c;
+    public final TextView f1801c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -38,7 +38,7 @@ public final class WidgetGuildInviteShareCompactBinding implements ViewBinding {
     public WidgetGuildInviteShareCompactBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) {
         this.a = coordinatorLayout;
         this.b = view;
-        this.f1800c = textView;
+        this.f1801c = textView;
         this.d = textView2;
         this.e = imageView;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java
index 223885f0cc..06ccc25d71 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildInviteShareEmptySuggestionsBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1801c;
+    public final TextView f1802c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetGuildInviteShareEmptySuggestionsBinding implements View
     public WidgetGuildInviteShareEmptySuggestionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageButton imageButton, @NonNull TextView textView2, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) {
         this.a = coordinatorLayout;
         this.b = view;
-        this.f1801c = textView;
+        this.f1802c = textView;
         this.d = materialButton;
         this.e = imageButton;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java
index 0ed3acdba5..1ce3962ea0 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1802c;
+    public final MaterialButton f1803c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,24 +24,24 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding {
     public WidgetGuildInviteShareItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = simpleDraweeView;
-        this.f1802c = materialButton;
+        this.f1803c = materialButton;
         this.d = textView;
         this.e = materialButton2;
     }
 
     @NonNull
     public static WidgetGuildInviteShareItemBinding a(@NonNull View view) {
-        int i = 2131363682;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363682);
+        int i = 2131363723;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363723);
         if (simpleDraweeView != null) {
-            i = 2131363683;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363683);
+            i = 2131363724;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363724);
             if (materialButton != null) {
-                i = 2131363711;
-                TextView textView = (TextView) view.findViewById(2131363711);
+                i = 2131363752;
+                TextView textView = (TextView) view.findViewById(2131363752);
                 if (textView != null) {
-                    i = 2131363712;
-                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363712);
+                    i = 2131363753;
+                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363753);
                     if (materialButton2 != null) {
                         return new WidgetGuildInviteShareItemBinding((LinearLayout) view, simpleDraweeView, materialButton, textView, materialButton2);
                     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java
index 27493f004c..072b1dab85 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java
@@ -23,7 +23,7 @@ public final class WidgetGuildInviteShareSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1803c;
+    public final TextView f1804c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -50,7 +50,7 @@ public final class WidgetGuildInviteShareSheetBinding implements ViewBinding {
     public WidgetGuildInviteShareSheetBinding(@NonNull FrameLayout frameLayout, @NonNull ConstraintLayout constraintLayout, @NonNull FrameLayout frameLayout2, @NonNull Barrier barrier, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull TextView textView4, @NonNull ImageButton imageButton, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView5, @NonNull MaterialButton materialButton, @NonNull TextView textView6, @NonNull FrameLayout frameLayout3, @NonNull TextView textView7, @NonNull Barrier barrier2, @NonNull FrameLayout frameLayout4, @NonNull Barrier barrier3, @NonNull SearchInputView searchInputView, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = frameLayout;
         this.b = constraintLayout;
-        this.f1803c = textView;
+        this.f1804c = textView;
         this.d = textView4;
         this.e = imageButton;
         this.f = nestedScrollView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java
index 51cbf6fc84..c6f6234af8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java
@@ -14,12 +14,12 @@ public final class WidgetGuildJoinBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1804c;
+    public final TextInputLayout f1805c;
 
     public WidgetGuildJoinBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1804c = textInputLayout;
+        this.f1805c = textInputLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java
index 5373cf48a1..9422464fe9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java
@@ -57,7 +57,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1805c;
+    public final CheckedSetting f1806c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -91,7 +91,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final AppViewFlipper f1806s;
+    public final AppViewFlipper f1807s;
     @NonNull
     public final ImageView t;
     @NonNull
@@ -103,20 +103,20 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f1807x;
+    public final TextView f1808x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final MaterialButton f1808y;
+    public final MaterialButton f1809y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final MaterialButton f1809z;
+    public final MaterialButton f1810z;
 
     public WidgetGuildProfileSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull CheckedSetting checkedSetting, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout5, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull CardView cardView2, @NonNull TextView textView5, @NonNull AppViewFlipper appViewFlipper, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting2, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView3, @NonNull TextView textView6, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull CardView cardView4, @NonNull LinearLayout linearLayout6, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull MaterialButton materialButton4, @NonNull LinearLayout linearLayout7, @NonNull TextView textView12, @NonNull ImageView imageView2, @NonNull TextView textView13, @NonNull CardView cardView5, @NonNull CardView cardView6, @NonNull MaterialButton materialButton5, @NonNull LinearLayout linearLayout8, @NonNull MaterialButton materialButton6, @NonNull MaterialButton materialButton7) {
         this.a = nestedScrollView;
         this.b = linearLayout;
-        this.f1805c = checkedSetting;
+        this.f1806c = checkedSetting;
         this.d = simpleDraweeView;
         this.e = materialButton;
         this.f = linearLayout2;
@@ -132,14 +132,14 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding {
         this.p = recyclerView;
         this.q = cardView2;
         this.r = textView5;
-        this.f1806s = appViewFlipper;
+        this.f1807s = appViewFlipper;
         this.t = imageView;
         this.u = checkedSetting2;
         this.v = simpleDraweeView2;
         this.w = cardView3;
-        this.f1807x = textView6;
-        this.f1808y = materialButton2;
-        this.f1809z = materialButton3;
+        this.f1808x = textView6;
+        this.f1809y = materialButton2;
+        this.f1810z = materialButton3;
         this.A = textView7;
         this.B = textView8;
         this.C = cardView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java
index a1e4b63c21..d56d92ea64 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGuildSelectorItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1810c;
+    public final SimpleDraweeView f1811c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetGuildSelectorItemBinding implements ViewBinding {
     public WidgetGuildSelectorItemBinding(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = frameLayout;
-        this.f1810c = simpleDraweeView;
+        this.f1811c = simpleDraweeView;
         this.d = textView;
         this.e = textView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java
new file mode 100644
index 0000000000..b079a4a037
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java
@@ -0,0 +1,67 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.discord.app.AppViewFlipper;
+import com.discord.views.sticker.StickerView;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
+public final class WidgetGuildStickerSheetBinding implements ViewBinding {
+    @NonNull
+    public final AppViewFlipper a;
+    @NonNull
+    public final FrameLayout b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f1812c;
+    @NonNull
+    public final AppViewFlipper d;
+    @NonNull
+    public final LinearLayout e;
+    @NonNull
+    public final SimpleDraweeView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final FrameLayout h;
+    @NonNull
+    public final TextView i;
+    @NonNull
+    public final TextView j;
+    @NonNull
+    public final MaterialButton k;
+    @NonNull
+    public final MaterialButton l;
+    @NonNull
+    public final StickerView m;
+    @NonNull
+    public final TextView n;
+
+    public WidgetGuildStickerSheetBinding(@NonNull AppViewFlipper appViewFlipper, @NonNull View view, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper2, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull FrameLayout frameLayout2, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull StickerView stickerView, @NonNull TextView textView6) {
+        this.a = appViewFlipper;
+        this.b = frameLayout;
+        this.f1812c = textView;
+        this.d = appViewFlipper2;
+        this.e = linearLayout;
+        this.f = simpleDraweeView;
+        this.g = textView3;
+        this.h = frameLayout2;
+        this.i = textView4;
+        this.j = textView5;
+        this.k = materialButton;
+        this.l = materialButton2;
+        this.m = stickerView;
+        this.n = textView6;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java
index dc9e75244c..d30e7b0597 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGuildTransferOwnershipBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1811c;
+    public final MaterialButton f1813c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetGuildTransferOwnershipBinding implements ViewBinding {
     public WidgetGuildTransferOwnershipBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2) {
         this.a = linearLayout;
         this.b = checkedSetting;
-        this.f1811c = materialButton;
+        this.f1813c = materialButton;
         this.d = materialButton2;
         this.e = textInputLayout;
         this.f = linearLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java
index 5e84869fbc..e7ceb9ebac 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildWelcomeChannelBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1812c;
+    public final TextView f1814c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetGuildWelcomeChannelBinding implements ViewBinding {
     public WidgetGuildWelcomeChannelBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView3) {
         this.a = cardView;
         this.b = cardView2;
-        this.f1812c = textView;
+        this.f1814c = textView;
         this.d = simpleDraweeView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java
index cf7e08a1b4..9bc0f6a49b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetGuildWelcomeSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1813c;
+    public final TextView f1815c;
     @NonNull
     public final AppViewFlipper d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetGuildWelcomeSheetBinding implements ViewBinding {
     public WidgetGuildWelcomeSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CardView cardView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = nestedScrollView;
         this.b = recyclerView;
-        this.f1813c = textView;
+        this.f1815c = textView;
         this.d = appViewFlipper;
         this.e = simpleDraweeView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java
index 440e29845f..b5b5ec3834 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java
@@ -14,12 +14,12 @@ public final class WidgetGuildsListBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ViewStub f1814c;
+    public final ViewStub f1816c;
 
     public WidgetGuildsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull ViewStub viewStub) {
         this.a = relativeLayout;
         this.b = recyclerView;
-        this.f1814c = viewStub;
+        this.f1816c = viewStub;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java
index 4be23685d2..948d47f947 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java
@@ -13,21 +13,21 @@ public final class WidgetGuildsListItemDmBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1815c;
+    public final TextView f1817c;
 
     public WidgetGuildsListItemDmBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = view;
         this.b = simpleDraweeView;
-        this.f1815c = textView;
+        this.f1817c = textView;
     }
 
     @NonNull
     public static WidgetGuildsListItemDmBinding a(@NonNull View view) {
-        int i = 2131363488;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363488);
+        int i = 2131363529;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363529);
         if (simpleDraweeView != null) {
-            i = 2131363489;
-            TextView textView = (TextView) view.findViewById(2131363489);
+            i = 2131363530;
+            TextView textView = (TextView) view.findViewById(2131363530);
             if (textView != null) {
                 return new WidgetGuildsListItemDmBinding(view, simpleDraweeView, textView);
             }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java
index 60e73f6caa..5f1767f782 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java
@@ -16,7 +16,7 @@ public final class WidgetGuildsListItemFolderBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1816c;
+    public final FrameLayout f1818c;
     @NonNull
     public final View d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetGuildsListItemFolderBinding implements ViewBinding {
     public WidgetGuildsListItemFolderBinding(@NonNull RelativeLayout relativeLayout, @NonNull ServerFolderView serverFolderView, @NonNull FrameLayout frameLayout, @NonNull View view, @NonNull TextView textView, @NonNull View view2, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = serverFolderView;
-        this.f1816c = frameLayout;
+        this.f1818c = frameLayout;
         this.d = view;
         this.e = textView;
         this.f = view2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java
index 0ed7c21d62..7e86f82c4f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java
@@ -15,7 +15,7 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1817c;
+    public final ImageView f1819c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding {
     public WidgetGuildsListItemGuildBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull FrameLayout frameLayout, @NonNull TextView textView2, @NonNull ImageView imageView3) {
         this.a = view;
         this.b = imageView;
-        this.f1817c = imageView2;
+        this.f1819c = imageView2;
         this.d = simpleDraweeView;
         this.e = textView;
         this.f = frameLayout;
@@ -40,26 +40,26 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding {
 
     @NonNull
     public static WidgetGuildsListItemGuildBinding a(@NonNull View view) {
-        int i = 2131363483;
-        ImageView imageView = (ImageView) view.findViewById(2131363483);
+        int i = 2131363524;
+        ImageView imageView = (ImageView) view.findViewById(2131363524);
         if (imageView != null) {
-            i = 2131363484;
-            ImageView imageView2 = (ImageView) view.findViewById(2131363484);
+            i = 2131363525;
+            ImageView imageView2 = (ImageView) view.findViewById(2131363525);
             if (imageView2 != null) {
-                i = 2131363485;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363485);
+                i = 2131363526;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363526);
                 if (simpleDraweeView != null) {
-                    i = 2131363486;
-                    TextView textView = (TextView) view.findViewById(2131363486);
+                    i = 2131363527;
+                    TextView textView = (TextView) view.findViewById(2131363527);
                     if (textView != null) {
-                        i = 2131363487;
-                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363487);
+                        i = 2131363528;
+                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363528);
                         if (frameLayout != null) {
-                            i = 2131363493;
-                            TextView textView2 = (TextView) view.findViewById(2131363493);
+                            i = 2131363534;
+                            TextView textView2 = (TextView) view.findViewById(2131363534);
                             if (textView2 != null) {
-                                i = 2131363499;
-                                ImageView imageView3 = (ImageView) view.findViewById(2131363499);
+                                i = 2131363540;
+                                ImageView imageView3 = (ImageView) view.findViewById(2131363540);
                                 if (imageView3 != null) {
                                     return new WidgetGuildsListItemGuildBinding(view, imageView, imageView2, simpleDraweeView, textView, frameLayout, textView2, imageView3);
                                 }
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java
index dd414b28cb..682432140e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java
@@ -13,12 +13,12 @@ public final class WidgetGuildsListItemGuildVerticalBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1818c;
+    public final ImageView f1820c;
 
     public WidgetGuildsListItemGuildVerticalBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1818c = imageView2;
+        this.f1820c = imageView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemHubVerificationBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemHubVerificationBinding.java
new file mode 100644
index 0000000000..abf3f6d94e
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemHubVerificationBinding.java
@@ -0,0 +1,24 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.discord.tooltips.SparkleView;
+public final class WidgetGuildsListItemHubVerificationBinding implements ViewBinding {
+    @NonNull
+    public final FrameLayout a;
+    @NonNull
+    public final SparkleView b;
+
+    public WidgetGuildsListItemHubVerificationBinding(@NonNull FrameLayout frameLayout, @NonNull SparkleView sparkleView) {
+        this.a = frameLayout;
+        this.b = sparkleView;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java
index 5f3a93a897..663afa8d89 100644
--- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java
@@ -14,14 +14,14 @@ public final class WidgetGuildsListItemProfileBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1819c;
+    public final FrameLayout f1821c;
     @NonNull
     public final ImageView d;
 
     public WidgetGuildsListItemProfileBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1819c = frameLayout;
+        this.f1821c = frameLayout;
         this.d = imageView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java
index a2b50f11bd..957036ff0a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java
@@ -2,39 +2,43 @@ package com.discord.databinding;
 
 import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.q4;
-import c.a.i.s4;
 import c.a.i.t4;
-import c.a.i.u4;
+import c.a.i.v4;
+import c.a.i.w4;
+import c.a.i.x4;
 import com.discord.widgets.home.HomePanelsLayout;
 public final class WidgetHomeBinding implements ViewBinding {
     @NonNull
     public final FrameLayout a;
     @NonNull
-    public final t4 b;
+    public final w4 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final HomePanelsLayout f1820c;
+    public final HomePanelsLayout f1822c;
     @NonNull
-    public final q4 d;
+    public final t4 d;
     @NonNull
-    public final s4 e;
+    public final v4 e;
     @NonNull
-    public final u4 f;
+    public final x4 f;
     @NonNull
-    public final FrameLayout g;
+    public final ImageView g;
+    @NonNull
+    public final FrameLayout h;
 
-    public WidgetHomeBinding(@NonNull FrameLayout frameLayout, @NonNull t4 t4Var, @NonNull HomePanelsLayout homePanelsLayout, @NonNull q4 q4Var, @NonNull s4 s4Var, @NonNull u4 u4Var, @NonNull FrameLayout frameLayout2) {
+    public WidgetHomeBinding(@NonNull FrameLayout frameLayout, @NonNull w4 w4Var, @NonNull HomePanelsLayout homePanelsLayout, @NonNull t4 t4Var, @NonNull v4 v4Var, @NonNull x4 x4Var, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout2) {
         this.a = frameLayout;
-        this.b = t4Var;
-        this.f1820c = homePanelsLayout;
-        this.d = q4Var;
-        this.e = s4Var;
-        this.f = u4Var;
-        this.g = frameLayout2;
+        this.b = w4Var;
+        this.f1822c = homePanelsLayout;
+        this.d = t4Var;
+        this.e = v4Var;
+        this.f = x4Var;
+        this.g = imageView;
+        this.h = frameLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java
index 666927c4ed..3b474ebc20 100644
--- a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java
@@ -16,7 +16,7 @@ public final class WidgetHomePanelCenterNsfwBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1821c;
+    public final MaterialButton f1823c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetHomePanelCenterNsfwBinding implements ViewBinding {
     public WidgetHomePanelCenterNsfwBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1821c = materialButton;
+        this.f1823c = materialButton;
         this.d = materialButton2;
         this.e = linkifiedTextView;
         this.f = textView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java b/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java
index 7b8b16ae74..e703c850d6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java
@@ -21,7 +21,7 @@ public final class WidgetIncomingShareBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ViewEmbedGameInvite f1822c;
+    public final ViewEmbedGameInvite f1824c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -46,7 +46,7 @@ public final class WidgetIncomingShareBinding implements ViewBinding {
     public WidgetIncomingShareBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull ViewEmbedGameInvite viewEmbedGameInvite, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull CardView cardView, @NonNull TextInputLayout textInputLayout2, @NonNull RecyclerView recyclerView2, @NonNull ImageView imageView, @NonNull AppViewFlipper appViewFlipper, @NonNull NestedScrollView nestedScrollView, @NonNull AppViewFlipper appViewFlipper2, @NonNull ViewGlobalSearchItem viewGlobalSearchItem, @NonNull ImageView imageView2) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1822c = viewEmbedGameInvite;
+        this.f1824c = viewEmbedGameInvite;
         this.d = textInputLayout;
         this.e = recyclerView;
         this.f = cardView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java b/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java
index 47dec221ab..c9cfe0fff9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java
@@ -15,14 +15,14 @@ public final class WidgetIssueDetailsFormBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1823c;
+    public final TextInputLayout f1825c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetIssueDetailsFormBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton) {
         this.a = nestedScrollView;
         this.b = linkifiedTextView;
-        this.f1823c = textInputLayout;
+        this.f1825c = textInputLayout;
         this.d = materialButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java
index 2836e5e4ba..5e7ca1151d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java
@@ -15,7 +15,7 @@ public final class WidgetKickUserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1824c;
+    public final MaterialButton f1826c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetKickUserBinding implements ViewBinding {
     public WidgetKickUserBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1824c = materialButton;
+        this.f1826c = materialButton;
         this.d = materialButton2;
         this.e = textInputLayout;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java
index 200f6ecd7c..2a73f17b1e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java
@@ -13,12 +13,12 @@ public final class WidgetManageReactionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1825c;
+    public final RecyclerView f1827c;
 
     public WidgetManageReactionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1825c = recyclerView2;
+        this.f1827c = recyclerView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java
index 46124425cc..98bf4e160d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java
@@ -15,14 +15,14 @@ public final class WidgetManageReactionsEmojiBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeSpanTextView f1826c;
+    public final SimpleDraweeSpanTextView f1828c;
     @NonNull
     public final View d;
 
     public WidgetManageReactionsEmojiBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull View view) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f1826c = simpleDraweeSpanTextView;
+        this.f1828c = simpleDraweeSpanTextView;
         this.d = view;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java
index e94dafc171..36a7e7558f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java
@@ -15,14 +15,14 @@ public final class WidgetManageReactionsResultUserBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1827c;
+    public final SimpleDraweeView f1829c;
     @NonNull
     public final TextView d;
 
     public WidgetManageReactionsResultUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1827c = simpleDraweeView;
+        this.f1829c = simpleDraweeView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java b/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java
index f819654554..7ccd38b8b3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java
@@ -17,7 +17,7 @@ public final class WidgetMediaBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1828c;
+    public final FrameLayout f1830c;
     @NonNull
     public final ZoomableDraweeView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetMediaBinding implements ViewBinding {
     public WidgetMediaBinding(@NonNull FrameLayout frameLayout, @NonNull AppBarLayout appBarLayout, @NonNull FrameLayout frameLayout2, @NonNull ZoomableDraweeView zoomableDraweeView, @NonNull ProgressBar progressBar, @NonNull PlayerControlView playerControlView, @NonNull PlayerView playerView) {
         this.a = frameLayout;
         this.b = appBarLayout;
-        this.f1828c = frameLayout2;
+        this.f1830c = frameLayout2;
         this.d = zoomableDraweeView;
         this.e = progressBar;
         this.f = playerControlView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java
index ce53443c6e..84a9b118c4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java
@@ -21,7 +21,7 @@ public final class WidgetMemberVerificationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1829c;
+    public final SimpleDraweeView f1831c;
     @NonNull
     public final MemberVerificationView d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetMemberVerificationBinding implements ViewBinding {
     public WidgetMemberVerificationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CustomAppBarLayout customAppBarLayout, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull DimmerView dimmerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MemberVerificationView memberVerificationView, @NonNull MemberVerificationAvatarView memberVerificationAvatarView, @NonNull LoadingButton loadingButton, @NonNull RecyclerView recyclerView, @NonNull NestedScrollView nestedScrollView) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1829c = simpleDraweeView;
+        this.f1831c = simpleDraweeView;
         this.d = memberVerificationView;
         this.e = memberVerificationAvatarView;
         this.f = loadingButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java
index 280d9d718a..3bf4d12ecf 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java
@@ -15,7 +15,7 @@ public final class WidgetMemberVerificationPendingDialogBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1830c;
+    public final MaterialButton f1832c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetMemberVerificationPendingDialogBinding implements ViewB
     public WidgetMemberVerificationPendingDialogBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1830c = materialButton;
+        this.f1832c = materialButton;
         this.d = materialButton2;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java
index 2fae1e3482..b65e12558e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetMemberVerificationRuleItemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f1831c;
+    public final View f1833c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetMemberVerificationRuleItemBinding implements ViewBindin
     public WidgetMemberVerificationRuleItemBinding(@NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull View view, @NonNull TextView textView, @NonNull RoundedRelativeLayout roundedRelativeLayout2) {
         this.a = roundedRelativeLayout;
         this.b = simpleDraweeSpanTextView;
-        this.f1831c = view;
+        this.f1833c = view;
         this.d = textView;
         this.e = roundedRelativeLayout2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java
index cded189915..6c62b90e08 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java
@@ -15,12 +15,12 @@ public final class WidgetMemberVerificationSuccessBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1832c;
+    public final TextView f1834c;
 
     public WidgetMemberVerificationSuccessBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull CardView cardView) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f1832c = textView;
+        this.f1834c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java b/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java
index 7a27b5c55b..346d971c56 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetMobileReportsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ProgressBar f1833c;
+    public final ProgressBar f1835c;
 
     public WidgetMobileReportsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FrameLayout frameLayout, @NonNull ProgressBar progressBar) {
         this.a = coordinatorLayout;
         this.b = frameLayout;
-        this.f1833c = progressBar;
+        this.f1835c = progressBar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java
index 5c4839cb27..b1e7684b46 100644
--- a/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java
@@ -15,7 +15,7 @@ public final class WidgetMuteSettingsSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1834c;
+    public final LinearLayout f1836c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -48,7 +48,7 @@ public final class WidgetMuteSettingsSheetBinding implements ViewBinding {
     public WidgetMuteSettingsSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull FrameLayout frameLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout3, @NonNull TextView textView11, @NonNull TextView textView12) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1834c = linearLayout;
+        this.f1836c = linearLayout;
         this.d = linearLayout2;
         this.e = frameLayout;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java b/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java
index df2f65e7b5..68fbbdde4e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java
@@ -15,14 +15,14 @@ public final class WidgetNavigationHelpBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TabLayout f1835c;
+    public final TabLayout f1837c;
     @NonNull
     public final ViewPager2 d;
 
     public WidgetNavigationHelpBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TabLayout tabLayout, @NonNull ViewPager2 viewPager2) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1835c = tabLayout;
+        this.f1837c = tabLayout;
         this.d = viewPager2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java
index 8a0e098796..fe8b446cc4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java
@@ -15,7 +15,7 @@ public final class WidgetNoticeDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f1836c;
+    public final LinkifiedTextView f1838c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetNoticeDialogBinding implements ViewBinding {
     public WidgetNoticeDialogBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f1836c = linkifiedTextView;
+        this.f1838c = linkifiedTextView;
         this.d = materialButton;
         this.e = textView;
         this.f = linearLayout3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java
index 5b0b3ad7f0..c6c194776a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java
@@ -13,12 +13,12 @@ public final class WidgetNoticeNuxOverlayBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1837c;
+    public final MaterialButton f1839c;
 
     public WidgetNoticeNuxOverlayBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1837c = materialButton2;
+        this.f1839c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java
index c55d5529bf..edb009b447 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java
@@ -13,12 +13,12 @@ public final class WidgetNoticeNuxSamsungLinkBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1838c;
+    public final MaterialButton f1840c;
 
     public WidgetNoticeNuxSamsungLinkBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1838c = materialButton2;
+        this.f1840c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java
index 29d02f6cc9..115e1bd0da 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java
@@ -17,7 +17,7 @@ public final class WidgetNoticePopupBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeSpanTextView f1839c;
+    public final SimpleDraweeSpanTextView f1841c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetNoticePopupBinding implements ViewBinding {
     public WidgetNoticePopupBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull StickerView stickerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RelativeLayout relativeLayout2) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f1839c = simpleDraweeSpanTextView;
+        this.f1841c = simpleDraweeSpanTextView;
         this.d = imageView;
         this.e = simpleDraweeView2;
         this.f = stickerView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java b/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java
index b0c90340c5..2a2c37f69a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java
@@ -17,7 +17,7 @@ public final class WidgetNuxChannelPromptBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1840c;
+    public final SimpleDraweeView f1842c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetNuxChannelPromptBinding implements ViewBinding {
     public WidgetNuxChannelPromptBinding(@NonNull RelativeLayout relativeLayout, @NonNull LoadingButton loadingButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextInputLayout textInputLayout, @NonNull Toolbar toolbar) {
         this.a = relativeLayout;
         this.b = loadingButton;
-        this.f1840c = simpleDraweeView;
+        this.f1842c = simpleDraweeView;
         this.d = textView;
         this.e = textView2;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java b/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java
index 48712f4f3f..84acb4733f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java
@@ -16,7 +16,7 @@ public final class WidgetNuxGuildTemplateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialCardView f1841c;
+    public final MaterialCardView f1843c;
     @NonNull
     public final MaterialCardView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetNuxGuildTemplateBinding implements ViewBinding {
     public WidgetNuxGuildTemplateBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialCardView materialCardView, @NonNull MaterialCardView materialCardView2, @NonNull MaterialCardView materialCardView3, @NonNull MaterialCardView materialCardView4, @NonNull MaterialCardView materialCardView5, @NonNull MaterialCardView materialCardView6, @NonNull MaterialButton materialButton, @NonNull MaterialCardView materialCardView7, @NonNull LinearLayout linearLayout2, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout3) {
         this.a = linearLayout;
         this.b = materialCardView;
-        this.f1841c = materialCardView2;
+        this.f1843c = materialCardView2;
         this.d = materialCardView3;
         this.e = materialCardView4;
         this.f = materialCardView5;
diff --git a/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java b/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java
index 9294874441..d11c2b973d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java
@@ -19,7 +19,7 @@ public final class WidgetOauthAuthorizeBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1842c;
+    public final SimpleDraweeView f1844c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -50,7 +50,7 @@ public final class WidgetOauthAuthorizeBinding implements ViewBinding {
     public WidgetOauthAuthorizeBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull MaterialCardView materialCardView, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton3, @NonNull ImageView imageView2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView, @NonNull TextView textView5, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton4, @NonNull MaterialButton materialButton5, @NonNull SimpleDraweeView simpleDraweeView2) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1842c = simpleDraweeView;
+        this.f1844c = simpleDraweeView;
         this.d = textView2;
         this.e = linearLayout;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java
similarity index 60%
rename from app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java
rename to app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java
index 1d6fa8f206..c7bd8e75f6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java
@@ -5,7 +5,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-public final class WidgetOutboundPromoTermsSheetBinding implements ViewBinding {
+import com.discord.utilities.view.text.LinkifiedTextView;
+public final class WidgetOutboundPromoTermsBinding implements ViewBinding {
     @NonNull
     public final LinearLayout a;
     @NonNull
@@ -13,12 +14,12 @@ public final class WidgetOutboundPromoTermsSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1843c;
+    public final LinkifiedTextView f1845c;
 
-    public WidgetOutboundPromoTermsSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) {
+    public WidgetOutboundPromoTermsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1843c = textView2;
+        this.f1845c = linkifiedTextView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java
index 35dc757a95..5a209972dd 100644
--- a/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java
@@ -19,7 +19,7 @@ public final class WidgetPaymentSourceEditDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1844c;
+    public final MaterialButton f1846c;
     @NonNull
     public final LoadingButton d;
     @NonNull
@@ -48,7 +48,7 @@ public final class WidgetPaymentSourceEditDialogBinding implements ViewBinding {
     public WidgetPaymentSourceEditDialogBinding(@NonNull LinearLayout linearLayout, @NonNull Toolbar toolbar, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull TextInputLayout textInputLayout3, @NonNull TextInputLayout textInputLayout4, @NonNull CheckBox checkBox, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout5, @NonNull TextInputLayout textInputLayout6, @NonNull TextInputLayout textInputLayout7, @NonNull PaymentSourceView paymentSourceView) {
         this.a = linearLayout;
         this.b = toolbar;
-        this.f1844c = materialButton;
+        this.f1846c = materialButton;
         this.d = loadingButton;
         this.e = textInputLayout;
         this.f = textInputLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java
index 8b0c009679..b80cb17ff9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetPhoneCountryCodeBottomSheetBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1845c;
+    public final TextInputLayout f1847c;
 
     public WidgetPhoneCountryCodeBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) {
         this.a = linearLayout;
         this.b = recyclerView;
-        this.f1845c = textInputLayout;
+        this.f1847c = textInputLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java
index 7d71a89941..d07f6300c2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java
@@ -13,14 +13,14 @@ public final class WidgetPhoneCountryCodeListItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f1846c;
+    public final ConstraintLayout f1848c;
     @NonNull
     public final TextView d;
 
     public WidgetPhoneCountryCodeListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f1846c = constraintLayout2;
+        this.f1848c = constraintLayout2;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java b/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java
index b89f6e4655..1f294dbe47 100644
--- a/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java
@@ -16,7 +16,7 @@ public final class WidgetPremiumGuildTransferBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1847c;
+    public final TextView f1849c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetPremiumGuildTransferBinding implements ViewBinding {
     public WidgetPremiumGuildTransferBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView2, @NonNull TextView textView4) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1847c = textView;
+        this.f1849c = textView;
         this.d = textView2;
         this.e = premiumGuildConfirmationView;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java b/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java
index a275c96f67..e02ed3443d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java
@@ -16,7 +16,7 @@ public final class WidgetPruneUsersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1848c;
+    public final TextView f1850c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetPruneUsersBinding implements ViewBinding {
     public WidgetPruneUsersBinding(@NonNull ScrollView scrollView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull ProgressBar progressBar) {
         this.a = scrollView;
         this.b = materialButton;
-        this.f1848c = textView;
+        this.f1850c = textView;
         this.d = materialButton2;
         this.e = textView2;
         this.f = checkedSetting;
diff --git a/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java b/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java
index 96871adec8..011f29f2f4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java
@@ -14,12 +14,12 @@ public final class WidgetQrScannerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Chip f1849c;
+    public final Chip f1851c;
 
     public WidgetQrScannerBinding(@NonNull FrameLayout frameLayout, @NonNull ZXingScannerView zXingScannerView, @NonNull Chip chip) {
         this.a = frameLayout;
         this.b = zXingScannerView;
-        this.f1849c = chip;
+        this.f1851c = chip;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java
index 833b8a6797..bdc1a9e8d4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java
@@ -14,12 +14,12 @@ public final class WidgetQuickMentionsDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TabLayout f1850c;
+    public final TabLayout f1852c;
 
     public WidgetQuickMentionsDialogBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ViewPager2 viewPager2, @NonNull TabLayout tabLayout) {
         this.a = constraintLayout;
         this.b = viewPager2;
-        this.f1850c = tabLayout;
+        this.f1852c = tabLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java b/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java
index fa30bcfa5c..3ea791917e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java
@@ -4,29 +4,29 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.a5;
-import c.a.i.b5;
-import c.a.i.c5;
+import c.a.i.d5;
+import c.a.i.e5;
+import c.a.i.f5;
 import com.discord.app.AppViewFlipper;
 public final class WidgetRemoteAuthBinding implements ViewBinding {
     @NonNull
     public final RelativeLayout a;
     @NonNull
-    public final c5 b;
+    public final f5 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final a5 f1851c;
+    public final d5 f1853c;
     @NonNull
-    public final b5 d;
+    public final e5 d;
     @NonNull
     public final AppViewFlipper e;
 
-    public WidgetRemoteAuthBinding(@NonNull RelativeLayout relativeLayout, @NonNull c5 c5Var, @NonNull a5 a5Var, @NonNull b5 b5Var, @NonNull AppViewFlipper appViewFlipper) {
+    public WidgetRemoteAuthBinding(@NonNull RelativeLayout relativeLayout, @NonNull f5 f5Var, @NonNull d5 d5Var, @NonNull e5 e5Var, @NonNull AppViewFlipper appViewFlipper) {
         this.a = relativeLayout;
-        this.b = c5Var;
-        this.f1851c = a5Var;
-        this.d = b5Var;
+        this.b = f5Var;
+        this.f1853c = d5Var;
+        this.d = e5Var;
         this.e = appViewFlipper;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java
index 6fe94eb7e9..75d6d5ee7d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetScreenShareNfxSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1852c;
+    public final MaterialButton f1854c;
 
     public WidgetScreenShareNfxSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull MaterialButton materialButton) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1852c = materialButton;
+        this.f1854c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java
index d107882e94..6a5547172d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSearchBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1853c;
+    public final TextInputLayout f1855c;
     @NonNull
     public final FragmentContainerView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetSearchBinding implements ViewBinding {
     public WidgetSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2) {
         this.a = coordinatorLayout;
         this.b = floatingActionButton;
-        this.f1853c = textInputLayout;
+        this.f1855c = textInputLayout;
         this.d = fragmentContainerView;
         this.e = fragmentContainerView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java
index aad15102ab..42d22c67c7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSearchSuggestionsItemChannelBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1854c;
+    public final TextView f1856c;
 
     public WidgetSearchSuggestionsItemChannelBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f1854c = textView;
+        this.f1856c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java
index 80d03498b1..e18b686048 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java
@@ -14,14 +14,14 @@ public final class WidgetSearchSuggestionsItemHasBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1855c;
+    public final ImageView f1857c;
     @NonNull
     public final TextView d;
 
     public WidgetSearchSuggestionsItemHasBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f1855c = imageView;
+        this.f1857c = imageView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java
index f85b9ab838..8e62e2f13b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSearchSuggestionsItemRecentQueryBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1856c;
+    public final TextView f1858c;
 
     public WidgetSearchSuggestionsItemRecentQueryBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f1856c = textView;
+        this.f1858c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java
index 398bbb6a21..fbe30079e5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSearchSuggestionsItemSuggestionBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1857c;
+    public final RelativeLayout f1859c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetSearchSuggestionsItemSuggestionBinding implements ViewB
     public WidgetSearchSuggestionsItemSuggestionBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout2, @NonNull TextView textView2, @NonNull ImageView imageView) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f1857c = relativeLayout2;
+        this.f1859c = relativeLayout2;
         this.d = textView2;
         this.e = imageView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java
index 59618d86e3..828f56e1c4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSelectComponentBottomSheetBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f1858c;
+    public final MaxHeightRecyclerView f1860c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetSelectComponentBottomSheetBinding implements ViewBindin
     public WidgetSelectComponentBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = constraintLayout;
         this.b = textView;
-        this.f1858c = maxHeightRecyclerView;
+        this.f1860c = maxHeightRecyclerView;
         this.d = textView2;
         this.e = textView3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java
index 5da429af08..673967d633 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSelectComponentBottomSheetItemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f1859c;
+    public final View f1861c;
     @NonNull
     public final View d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetSelectComponentBottomSheetItemBinding implements ViewBi
     public WidgetSelectComponentBottomSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialTextView materialTextView, @NonNull View view, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCheckBox materialCheckBox, @NonNull MaterialTextView materialTextView2) {
         this.a = constraintLayout;
         this.b = materialTextView;
-        this.f1859c = view;
+        this.f1861c = view;
         this.d = view2;
         this.e = simpleDraweeView;
         this.f = materialCheckBox;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java
index a55d4351ce..978e3a717b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerBoostConfirmationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1860c;
+    public final TextView f1862c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetServerBoostConfirmationBinding implements ViewBinding {
     public WidgetServerBoostConfirmationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = premiumGuildConfirmationView;
-        this.f1860c = textView;
+        this.f1862c = textView;
         this.d = textView2;
         this.e = materialButton;
         this.f = dimmerView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java
index 4df05b9eb6..0175a13233 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java
@@ -5,7 +5,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.l2;
+import c.a.i.n2;
 import com.discord.app.AppViewFlipper;
 import com.discord.utilities.simple_pager.SimplePager;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -20,7 +20,7 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f1861c;
+    public final LinkifiedTextView f1863c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -38,12 +38,12 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding {
     @NonNull
     public final SimplePager k;
     @NonNull
-    public final l2 l;
+    public final n2 l;
 
-    public WidgetServerBoostStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull SimplePager simplePager, @NonNull l2 l2Var) {
+    public WidgetServerBoostStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull SimplePager simplePager, @NonNull n2 n2Var) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f1861c = linkifiedTextView;
+        this.f1863c = linkifiedTextView;
         this.d = textView;
         this.e = premiumSubscriptionMarketingView;
         this.f = premiumGuildSubscriptionUpsellView;
@@ -52,7 +52,7 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding {
         this.i = materialButton2;
         this.j = materialButton3;
         this.k = simplePager;
-        this.l = l2Var;
+        this.l = n2Var;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java
index a7c0c0c12b..85afe85d08 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerDeleteDialogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1862c;
+    public final MaterialButton f1864c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -28,7 +28,7 @@ public final class WidgetServerDeleteDialogBinding implements ViewBinding {
     public WidgetServerDeleteDialogBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1862c = materialButton2;
+        this.f1864c = materialButton2;
         this.d = textView;
         this.e = textInputLayout;
         this.f = linearLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java
index 91fbb69778..eb8ff29857 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerNotificationOverrideSelectorBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1863c;
+    public final TextInputLayout f1865c;
 
     public WidgetServerNotificationOverrideSelectorBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1863c = textInputLayout;
+        this.f1865c = textInputLayout;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java
index 3b6684b07f..41511fec0d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java
@@ -6,18 +6,18 @@ import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.p1;
+import c.a.i.r1;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.servers.NotificationMuteSettingsView;
 public final class WidgetServerNotificationsBinding implements ViewBinding {
     @NonNull
     public final CoordinatorLayout a;
     @NonNull
-    public final p1 b;
+    public final r1 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1864c;
+    public final RecyclerView f1866c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -37,10 +37,10 @@ public final class WidgetServerNotificationsBinding implements ViewBinding {
     @NonNull
     public final CheckedSetting l;
 
-    public WidgetServerNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull p1 p1Var, @NonNull RecyclerView recyclerView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull View view, @NonNull LinearLayout linearLayout, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
+    public WidgetServerNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull r1 r1Var, @NonNull RecyclerView recyclerView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull View view, @NonNull LinearLayout linearLayout, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
         this.a = coordinatorLayout;
-        this.b = p1Var;
-        this.f1864c = recyclerView;
+        this.b = r1Var;
+        this.f1866c = recyclerView;
         this.d = checkedSetting;
         this.e = checkedSetting2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java
index 36a08c4bbd..eb6dc87e11 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsAuditLogBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1865c;
+    public final RecyclerView f1867c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsAuditLogBinding implements ViewBinding {
     public WidgetServerSettingsAuditLogBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull AppViewFlipper appViewFlipper, @NonNull AppViewFlipper appViewFlipper2) {
         this.a = coordinatorLayout;
         this.b = textView3;
-        this.f1865c = recyclerView;
+        this.f1867c = recyclerView;
         this.d = textView4;
         this.e = appViewFlipper;
         this.f = appViewFlipper2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java
index bc059c98cb..abf8aef36e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsAuditLogFilterActionListitemBinding imple
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1866c;
+    public final ImageView f1868c;
     @NonNull
     public final ImageView d;
 
     public WidgetServerSettingsAuditLogFilterActionListitemBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2) {
         this.a = linearLayout;
         this.b = checkedSetting;
-        this.f1866c = imageView;
+        this.f1868c = imageView;
         this.d = imageView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java
index 92b1615d71..7805ebe7b5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java
@@ -16,14 +16,14 @@ public final class WidgetServerSettingsAuditLogFilterUserListitemBinding impleme
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1867c;
+    public final CheckedSetting f1869c;
     @NonNull
     public final ImageView d;
 
     public WidgetServerSettingsAuditLogFilterUserListitemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout) {
         this.a = linearLayout;
         this.b = simpleDraweeView;
-        this.f1867c = checkedSetting;
+        this.f1869c = checkedSetting;
         this.d = imageView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java
index ac77c71165..f48fd5977d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerSettingsAuditLogListitemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1868c;
+    public final ImageView f1870c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetServerSettingsAuditLogListitemBinding implements ViewBi
     public WidgetServerSettingsAuditLogListitemBinding(@NonNull CardView cardView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView3, @NonNull RelativeLayout relativeLayout) {
         this.a = cardView;
         this.b = imageView;
-        this.f1868c = imageView2;
+        this.f1870c = imageView2;
         this.d = simpleDraweeView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java
index 7480cdc7e9..e543b55f88 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java
@@ -14,14 +14,14 @@ public final class WidgetServerSettingsBanListItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimpleDraweeView f1869c;
+    public final SimpleDraweeView f1871c;
     @NonNull
     public final TextView d;
 
     public WidgetServerSettingsBanListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f1869c = simpleDraweeView;
+        this.f1871c = simpleDraweeView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java
index 744976c979..618b80e5c4 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java
@@ -16,14 +16,14 @@ public final class WidgetServerSettingsBansBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1870c;
+    public final TextInputLayout f1872c;
     @NonNull
     public final AppViewFlipper d;
 
     public WidgetServerSettingsBansBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1870c = textInputLayout;
+        this.f1872c = textInputLayout;
         this.d = appViewFlipper;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java
index a8f089795a..300f77706d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1871c;
+    public final TextView f1873c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -49,7 +49,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final View f1872s;
+    public final View f1874s;
     @NonNull
     public final SimpleDraweeView t;
     @NonNull
@@ -60,7 +60,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
     public WidgetServerSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView15, @NonNull TextView textView16) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1871c = textView2;
+        this.f1873c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
@@ -76,7 +76,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding {
         this.p = linearLayout;
         this.q = linearLayout2;
         this.r = linearLayout3;
-        this.f1872s = view2;
+        this.f1874s = view2;
         this.t = simpleDraweeView;
         this.u = textView15;
         this.v = textView16;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java
index 8c6466025d..0c923f6be1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java
@@ -16,14 +16,14 @@ public final class WidgetServerSettingsChannelsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1873c;
+    public final FloatingActionButton f1875c;
     @NonNull
     public final RecyclerView d;
 
     public WidgetServerSettingsChannelsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull FloatingActionButton floatingActionButton, @NonNull RecyclerView recyclerView, @NonNull FrameLayout frameLayout) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1873c = floatingActionButton;
+        this.f1875c = floatingActionButton;
         this.d = recyclerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java
index cd9b1b3c2d..822fb3149e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java
@@ -13,14 +13,14 @@ public final class WidgetServerSettingsChannelsSortActionsBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1874c;
+    public final TextView f1876c;
     @NonNull
     public final TextView d;
 
     public WidgetServerSettingsChannelsSortActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = nestedScrollView;
         this.b = textView2;
-        this.f1874c = textView3;
+        this.f1876c = textView3;
         this.d = textView4;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java
index 32ed6da931..5eb716f396 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsChannelsSortFabMenuBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TableLayout f1875c;
+    public final TableLayout f1877c;
 
     public WidgetServerSettingsChannelsSortFabMenuBinding(@NonNull TableLayout tableLayout, @NonNull TableRow tableRow, @NonNull TableRow tableRow2, @NonNull TableRow tableRow3, @NonNull TableRow tableRow4, @NonNull FloatingActionButton floatingActionButton, @NonNull TableLayout tableLayout2) {
         this.a = tableLayout;
         this.b = floatingActionButton;
-        this.f1875c = tableLayout2;
+        this.f1877c = tableLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java
index 0b98a0ce10..9ff6e54aeb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsCommunityOverviewBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CommunitySelectorView f1876c;
+    public final CommunitySelectorView f1878c;
     @NonNull
     public final CommunitySelectorView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetServerSettingsCommunityOverviewBinding implements ViewB
     public WidgetServerSettingsCommunityOverviewBinding(@NonNull LinearLayout linearLayout, @NonNull CommunitySelectorView communitySelectorView, @NonNull CommunitySelectorView communitySelectorView2, @NonNull CommunitySelectorView communitySelectorView3, @NonNull ScrollView scrollView, @NonNull LoadingButton loadingButton, @NonNull CommunitySelectorView communitySelectorView4) {
         this.a = linearLayout;
         this.b = communitySelectorView;
-        this.f1876c = communitySelectorView2;
+        this.f1878c = communitySelectorView2;
         this.d = communitySelectorView3;
         this.e = loadingButton;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java
index ecb7d1a05c..b40dc875f7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsCommunitySetupFirstStepBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1877c;
+    public final CheckedSetting f1879c;
 
     public WidgetServerSettingsCommunitySetupFirstStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull ScreenTitleView screenTitleView) {
         this.a = scrollView;
         this.b = checkedSetting;
-        this.f1877c = checkedSetting2;
+        this.f1879c = checkedSetting2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java
index aa61fe5d9f..015470a726 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsCommunitySetupSecondStepBinding implement
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CommunitySelectorView f1878c;
+    public final CommunitySelectorView f1880c;
 
     public WidgetServerSettingsCommunitySetupSecondStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CommunitySelectorView communitySelectorView, @NonNull ScreenTitleView screenTitleView, @NonNull CommunitySelectorView communitySelectorView2) {
         this.a = scrollView;
         this.b = communitySelectorView;
-        this.f1878c = communitySelectorView2;
+        this.f1880c = communitySelectorView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java
index ee54eccafc..151e743db2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsCommunitySetupThirdStepBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f1879c;
+    public final LinkifiedTextView f1881c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetServerSettingsCommunitySetupThirdStepBinding implements
     public WidgetServerSettingsCommunitySetupThirdStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull ScreenTitleView screenTitleView) {
         this.a = scrollView;
         this.b = checkedSetting;
-        this.f1879c = linkifiedTextView;
+        this.f1881c = linkifiedTextView;
         this.d = checkedSetting2;
         this.e = checkedSetting3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java
index ac70450905..d730cfca23 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java
@@ -20,7 +20,7 @@ public final class WidgetServerSettingsEditIntegrationBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1880c;
+    public final LinearLayout f1882c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -51,7 +51,7 @@ public final class WidgetServerSettingsEditIntegrationBinding implements ViewBin
     public WidgetServerSettingsEditIntegrationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout4, @NonNull TextView textView2, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout5, @NonNull LinearLayout linearLayout6, @NonNull v vVar) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1880c = linearLayout;
+        this.f1882c = linearLayout;
         this.d = checkedSetting;
         this.e = checkedSetting2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java
index 2971ae4125..e4f792d544 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerSettingsEditMemberBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1881c;
+    public final TextView f1883c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetServerSettingsEditMemberBinding implements ViewBinding
     public WidgetServerSettingsEditMemberBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView3) {
         this.a = coordinatorLayout;
         this.b = linearLayout;
-        this.f1881c = textView;
+        this.f1883c = textView;
         this.d = textView2;
         this.e = textInputLayout;
         this.f = linearLayout2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java
index 1e0af3748b..af3cda6b78 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f1882c;
+    public final AppViewFlipper f1884c;
 
     public WidgetServerSettingsEmojisBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1882c = appViewFlipper;
+        this.f1884c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java
index 0fc12eaff3..dafaf5f9ae 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisEditBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1883c;
+    public final FloatingActionButton f1885c;
 
     public WidgetServerSettingsEmojisEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1883c = floatingActionButton;
+        this.f1885c = floatingActionButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java
index bef8784e78..79a6df9d17 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisHeaderBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1884c;
+    public final TextView f1886c;
 
     public WidgetServerSettingsEmojisHeaderBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1884c = textView;
+        this.f1886c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java
index 47abd5bea1..8f8695dae8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetServerSettingsEmojisItemBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1885c;
+    public final LinearLayout f1887c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetServerSettingsEmojisItemBinding implements ViewBinding
     public WidgetServerSettingsEmojisItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView2) {
         this.a = linearLayout;
         this.b = simpleDraweeView;
-        this.f1885c = linearLayout2;
+        this.f1887c = linearLayout2;
         this.d = textView;
         this.e = textView2;
         this.f = simpleDraweeView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java
index 3f76ef9063..a6079e9e1a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java
@@ -13,7 +13,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1886c;
+    public final TextView f1888c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi
     public WidgetServerSettingsInstantInviteActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1886c = textView2;
+        this.f1888c = textView2;
         this.d = textView3;
         this.e = textView4;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java
index 95f14f0ab2..a517b5c813 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1887c;
+    public final TextView f1889c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V
     public WidgetServerSettingsInstantInviteListItemBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7) {
         this.a = cardView;
         this.b = textView;
-        this.f1887c = textView2;
+        this.f1889c = textView2;
         this.d = linearLayout;
         this.e = textView3;
         this.f = simpleDraweeView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java
index cd54a5d93f..94a77b1347 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsInstantInvitesBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f1888c;
+    public final AppViewFlipper f1890c;
 
     public WidgetServerSettingsInstantInvitesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1888c = appViewFlipper;
+        this.f1890c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java
index b17e1682ec..2a403f855c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f1889c;
+    public final View f1891c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie
     public WidgetServerSettingsIntegrationListItemBinding(@NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull CheckedSetting checkedSetting, @NonNull ProgressBar progressBar) {
         this.a = frameLayout;
         this.b = relativeLayout;
-        this.f1889c = view;
+        this.f1891c = view;
         this.d = imageView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java
index 3b91ff8889..48ac68cbc9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java
@@ -15,12 +15,12 @@ public final class WidgetServerSettingsIntegrationsBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f1890c;
+    public final AppViewFlipper f1892c;
 
     public WidgetServerSettingsIntegrationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f1890c = appViewFlipper;
+        this.f1892c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java
index af56cf4687..a9264f14cc 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java
@@ -16,7 +16,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f1891c;
+    public final ConstraintLayout f1893c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind
     public WidgetServerSettingsMemberListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull UsernameView usernameView, @NonNull ImageView imageView2, @NonNull RolesListView rolesListView) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1891c = constraintLayout2;
+        this.f1893c = constraintLayout2;
         this.d = imageView;
         this.e = usernameView;
         this.f = imageView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java
index 1c4f195cb4..e940cf365e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1892c;
+    public final RecyclerView f1894c;
     @NonNull
     public final Spinner d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding {
     public WidgetServerSettingsMembersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull Spinner spinner, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1892c = recyclerView;
+        this.f1894c = recyclerView;
         this.d = spinner;
         this.e = appViewFlipper;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java
index 3280d4c803..3c5cc1c131 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java
@@ -14,7 +14,7 @@ public final class WidgetServerSettingsModerationBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1893c;
+    public final CheckedSetting f1895c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetServerSettingsModerationBinding implements ViewBinding
     public WidgetServerSettingsModerationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull TextView textView2) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1893c = checkedSetting2;
+        this.f1895c = checkedSetting2;
         this.d = checkedSetting3;
         this.e = textView;
         this.f = checkedSetting4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java
index 6e9993a722..067195fa8c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java
@@ -13,7 +13,7 @@ public final class WidgetServerSettingsOverviewAfkTimeoutBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1894c;
+    public final TextView f1896c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetServerSettingsOverviewAfkTimeoutBinding implements View
     public WidgetServerSettingsOverviewAfkTimeoutBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) {
         this.a = nestedScrollView;
         this.b = textView2;
-        this.f1894c = textView3;
+        this.f1896c = textView3;
         this.d = textView4;
         this.e = textView5;
         this.f = textView6;
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java
index c71a86cf99..c4092f8147 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java
@@ -7,10 +7,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.viewbinding.ViewBinding;
 import c.a.i.a3;
 import c.a.i.b3;
-import c.a.i.e5;
-import c.a.i.v2;
-import c.a.i.w2;
-import c.a.i.x2;
+import c.a.i.c3;
+import c.a.i.d3;
+import c.a.i.e3;
+import c.a.i.h5;
 import c.a.i.y2;
 import c.a.i.z2;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -18,40 +18,40 @@ public final class WidgetServerSettingsOverviewBinding implements ViewBinding {
     @NonNull
     public final CoordinatorLayout a;
     @NonNull
-    public final e5 b;
+    public final h5 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final v2 f1895c;
+    public final y2 f1897c;
     @NonNull
-    public final w2 d;
+    public final z2 d;
     @NonNull
-    public final x2 e;
+    public final a3 e;
     @NonNull
-    public final y2 f;
+    public final b3 f;
     @NonNull
     public final FloatingActionButton g;
     @NonNull
     public final ScrollView h;
     @NonNull
-    public final z2 i;
+    public final c3 i;
     @NonNull
-    public final a3 j;
+    public final d3 j;
     @NonNull
-    public final b3 k;
+    public final e3 k;
 
-    public WidgetServerSettingsOverviewBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull e5 e5Var, @NonNull v2 v2Var, @NonNull w2 w2Var, @NonNull x2 x2Var, @NonNull y2 y2Var, @NonNull FloatingActionButton floatingActionButton, @NonNull ScrollView scrollView, @NonNull z2 z2Var, @NonNull a3 a3Var, @NonNull b3 b3Var) {
+    public WidgetServerSettingsOverviewBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull h5 h5Var, @NonNull y2 y2Var, @NonNull z2 z2Var, @NonNull a3 a3Var, @NonNull b3 b3Var, @NonNull FloatingActionButton floatingActionButton, @NonNull ScrollView scrollView, @NonNull c3 c3Var, @NonNull d3 d3Var, @NonNull e3 e3Var) {
         this.a = coordinatorLayout;
-        this.b = e5Var;
-        this.f1895c = v2Var;
-        this.d = w2Var;
-        this.e = x2Var;
-        this.f = y2Var;
+        this.b = h5Var;
+        this.f1897c = y2Var;
+        this.d = z2Var;
+        this.e = a3Var;
+        this.f = b3Var;
         this.g = floatingActionButton;
         this.h = scrollView;
-        this.i = z2Var;
-        this.j = a3Var;
-        this.k = b3Var;
+        this.i = c3Var;
+        this.j = d3Var;
+        this.k = e3Var;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java
index 0c1ddcf64e..394d922c88 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsOverviewRegionBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f1896c;
+    public final MaxHeightRecyclerView f1898c;
 
     public WidgetServerSettingsOverviewRegionBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaxHeightRecyclerView maxHeightRecyclerView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1896c = maxHeightRecyclerView;
+        this.f1898c = maxHeightRecyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java
index 8361d68b99..61fa8c30a7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java
@@ -14,14 +14,14 @@ public final class WidgetServerSettingsRoleItemBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1897c;
+    public final ImageView f1899c;
     @NonNull
     public final TextView d;
 
     public WidgetServerSettingsRoleItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull View view2, @NonNull View view3, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = view3;
-        this.f1897c = imageView;
+        this.f1899c = imageView;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java
index 73263a55a3..d46e14d280 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsRolesListBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1898c;
+    public final FloatingActionButton f1900c;
     @NonNull
     public final RecyclerView d;
 
     public WidgetServerSettingsRolesListBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull FloatingActionButton floatingActionButton, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1898c = floatingActionButton;
+        this.f1900c = floatingActionButton;
         this.d = recyclerView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java
index bb05f45145..63eb7a2963 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java
@@ -14,12 +14,12 @@ public final class WidgetServerSettingsSecurityBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1899c;
+    public final MaterialButton f1901c;
 
     public WidgetServerSettingsSecurityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1899c = materialButton;
+        this.f1901c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java
index 101ae0a408..fb26a18ee9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java
@@ -15,14 +15,14 @@ public final class WidgetServerSettingsSecurityDialogBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1900c;
+    public final MaterialButton f1902c;
     @NonNull
     public final TextInputLayout d;
 
     public WidgetServerSettingsSecurityDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f1900c = materialButton2;
+        this.f1902c = materialButton2;
         this.d = textInputLayout;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java
index 9950326ce5..82a6dc9577 100644
--- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java
@@ -17,7 +17,7 @@ public final class WidgetServerSettingsVanityUrlBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1901c;
+    public final TextView f1903c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetServerSettingsVanityUrlBinding implements ViewBinding {
     public WidgetServerSettingsVanityUrlBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RelativeLayout relativeLayout, @NonNull ProgressBar progressBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1901c = textView;
+        this.f1903c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = relativeLayout;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java
index 2e6652ec6a..8328496557 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAccessibilityBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1902c;
+    public final CheckedSetting f1904c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetSettingsAccessibilityBinding implements ViewBinding {
     public WidgetSettingsAccessibilityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull View view, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1902c = checkedSetting2;
+        this.f1904c = checkedSetting2;
         this.d = textView;
         this.e = linkifiedTextView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java
index a1da3abd8e..638ecdf39e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAccountBackupCodesBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1903c;
+    public final MaterialButton f1905c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetSettingsAccountBackupCodesBinding implements ViewBindin
     public WidgetSettingsAccountBackupCodesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1903c = materialButton;
+        this.f1905c = materialButton;
         this.d = textView;
         this.e = recyclerView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java
index 1421e17859..74a638af49 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java
@@ -19,131 +19,137 @@ import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 public final class WidgetSettingsAccountBinding implements ViewBinding {
     @NonNull
-    public final FloatingActionButton A;
+    public final TextView A;
     @NonNull
-    public final NestedScrollView B;
+    public final TextView B;
     @NonNull
-    public final CheckedSetting C;
+    public final FloatingActionButton C;
     @NonNull
-    public final TextView D;
+    public final NestedScrollView D;
     @NonNull
-    public final TextView E;
+    public final CheckedSetting E;
     @NonNull
-    public final LinearLayout F;
+    public final TextView F;
     @NonNull
     public final TextView G;
     @NonNull
-    public final RelativeLayout H;
+    public final LinearLayout H;
     @NonNull
-    public final MaterialButton I;
+    public final TextView I;
     @NonNull
-    public final TextView J;
+    public final RelativeLayout J;
     @NonNull
-    public final TextView K;
+    public final MaterialButton K;
     @NonNull
     public final TextView L;
     @NonNull
+    public final TextView M;
+    @NonNull
+    public final TextView N;
+    @NonNull
     public final CoordinatorLayout a;
     @NonNull
-    public final DimmerView b;
+    public final RelativeLayout b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1904c;
+    public final View f1906c;
     @NonNull
-    public final SimpleDraweeView d;
+    public final DimmerView d;
     @NonNull
-    public final FrameLayout e;
+    public final TextView e;
     @NonNull
-    public final TextView f;
+    public final SimpleDraweeView f;
     @NonNull
-    public final LinearLayout g;
+    public final FrameLayout g;
     @NonNull
     public final TextView h;
     @NonNull
-    public final TextView i;
+    public final LinearLayout i;
     @NonNull
     public final TextView j;
     @NonNull
-    public final LinearLayout k;
+    public final TextView k;
     @NonNull
-    public final MaterialButton l;
+    public final TextView l;
     @NonNull
     public final LinearLayout m;
     @NonNull
-    public final TextView n;
+    public final MaterialButton n;
     @NonNull
-    public final AppViewFlipper o;
+    public final LinearLayout o;
     @NonNull
-    public final LottieAnimationView p;
+    public final TextView p;
     @NonNull
-    public final TextView q;
+    public final AppViewFlipper q;
     @NonNull
-    public final LinearLayout r;
+    public final LottieAnimationView r;
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final TextView f1905s;
+    public final TextView f1907s;
     @NonNull
     public final LinearLayout t;
     @NonNull
     public final TextView u;
     @NonNull
-    public final TextView v;
+    public final LinearLayout v;
     @NonNull
     public final TextView w;
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final LinearLayout f1906x;
+    public final TextView f1908x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextView f1907y;
+    public final TextView f1909y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final TextView f1908z;
+    public final LinearLayout f1910z;
 
-    public WidgetSettingsAccountBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout6, @NonNull TextView textView7, @NonNull AppViewFlipper appViewFlipper, @NonNull LottieAnimationView lottieAnimationView, @NonNull TextView textView8, @NonNull LinearLayout linearLayout7, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout8, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull LinearLayout linearLayout9, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView17, @NonNull TextView textView18, @NonNull LinearLayout linearLayout10, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton2, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull TextView textView23) {
+    public WidgetSettingsAccountBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout6, @NonNull TextView textView7, @NonNull AppViewFlipper appViewFlipper, @NonNull LottieAnimationView lottieAnimationView, @NonNull TextView textView8, @NonNull LinearLayout linearLayout7, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout8, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull LinearLayout linearLayout9, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView17, @NonNull TextView textView18, @NonNull LinearLayout linearLayout10, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull RelativeLayout relativeLayout2, @NonNull MaterialButton materialButton2, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull TextView textView23) {
         this.a = coordinatorLayout;
-        this.b = dimmerView;
-        this.f1904c = textView;
-        this.d = simpleDraweeView;
-        this.e = frameLayout;
-        this.f = textView2;
-        this.g = linearLayout2;
-        this.h = textView4;
-        this.i = textView5;
-        this.j = textView6;
-        this.k = linearLayout5;
-        this.l = materialButton;
-        this.m = linearLayout6;
-        this.n = textView7;
-        this.o = appViewFlipper;
-        this.p = lottieAnimationView;
-        this.q = textView8;
-        this.r = linearLayout7;
-        this.f1905s = textView10;
-        this.t = linearLayout8;
-        this.u = textView12;
-        this.v = textView13;
-        this.w = textView14;
-        this.f1906x = linearLayout9;
-        this.f1907y = textView15;
-        this.f1908z = textView16;
-        this.A = floatingActionButton;
-        this.B = nestedScrollView;
-        this.C = checkedSetting;
-        this.D = textView17;
-        this.E = textView18;
-        this.F = linearLayout10;
-        this.G = textView20;
-        this.H = relativeLayout;
-        this.I = materialButton2;
-        this.J = textView21;
-        this.K = textView22;
-        this.L = textView23;
+        this.b = relativeLayout;
+        this.f1906c = view;
+        this.d = dimmerView;
+        this.e = textView;
+        this.f = simpleDraweeView;
+        this.g = frameLayout;
+        this.h = textView2;
+        this.i = linearLayout2;
+        this.j = textView4;
+        this.k = textView5;
+        this.l = textView6;
+        this.m = linearLayout5;
+        this.n = materialButton;
+        this.o = linearLayout6;
+        this.p = textView7;
+        this.q = appViewFlipper;
+        this.r = lottieAnimationView;
+        this.f1907s = textView8;
+        this.t = linearLayout7;
+        this.u = textView10;
+        this.v = linearLayout8;
+        this.w = textView12;
+        this.f1908x = textView13;
+        this.f1909y = textView14;
+        this.f1910z = linearLayout9;
+        this.A = textView15;
+        this.B = textView16;
+        this.C = floatingActionButton;
+        this.D = nestedScrollView;
+        this.E = checkedSetting;
+        this.F = textView17;
+        this.G = textView18;
+        this.H = linearLayout10;
+        this.I = textView20;
+        this.J = relativeLayout2;
+        this.K = materialButton2;
+        this.L = textView21;
+        this.M = textView22;
+        this.N = textView23;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java
index ae339792a2..693b5a2c78 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java
@@ -15,7 +15,7 @@ public final class WidgetSettingsAccountChangePasswordBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1909c;
+    public final TextInputLayout f1911c;
     @NonNull
     public final FloatingActionButton d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetSettingsAccountChangePasswordBinding implements ViewBin
     public WidgetSettingsAccountChangePasswordBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout3, @NonNull DimmerView dimmerView) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1909c = textInputLayout2;
+        this.f1911c = textInputLayout2;
         this.d = floatingActionButton;
         this.e = textInputLayout3;
         this.f = dimmerView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java
index 3974312a4f..11dfa48614 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsAccountContactsNameEditBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1910c;
+    public final MaterialButton f1912c;
     @NonNull
     public final FloatingActionButton d;
 
     public WidgetSettingsAccountContactsNameEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1910c = materialButton;
+        this.f1912c = materialButton;
         this.d = floatingActionButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java
index a5007f5b1e..a48bcb799c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java
@@ -16,14 +16,14 @@ public final class WidgetSettingsAccountEditBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1911c;
+    public final TextInputLayout f1913c;
     @NonNull
     public final FloatingActionButton d;
 
     public WidgetSettingsAccountEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextInputLayout textInputLayout2, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1911c = textInputLayout2;
+        this.f1913c = textInputLayout2;
         this.d = floatingActionButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java
index 72e85e43dd..0a2b17b6d7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsAccountEmailEditBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1912c;
+    public final FloatingActionButton f1914c;
 
     public WidgetSettingsAccountEmailEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1912c = floatingActionButton;
+        this.f1914c = floatingActionButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java
index 58d84f86b3..adadad4f4d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java
@@ -7,17 +7,17 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.j4;
+import c.a.i.m4;
 import com.discord.views.CheckedSetting;
 public final class WidgetSettingsAppearanceBinding implements ViewBinding {
     @NonNull
     public final CoordinatorLayout a;
     @NonNull
-    public final j4 b;
+    public final m4 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1913c;
+    public final TextView f1915c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -39,10 +39,10 @@ public final class WidgetSettingsAppearanceBinding implements ViewBinding {
     @NonNull
     public final CheckedSetting m;
 
-    public WidgetSettingsAppearanceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull j4 j4Var, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull View view, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4) {
+    public WidgetSettingsAppearanceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull m4 m4Var, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull View view, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4) {
         this.a = coordinatorLayout;
-        this.b = j4Var;
-        this.f1913c = textView;
+        this.b = m4Var;
+        this.f1915c = textView;
         this.d = textView2;
         this.e = textView3;
         this.f = seekBar;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java
index 5f7ab9581a..75f7e9599b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAuthorizedAppsListItemBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1914c;
+    public final TextView f1916c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetSettingsAuthorizedAppsListItemBinding implements ViewBi
     public WidgetSettingsAuthorizedAppsListItemBinding(@NonNull MaterialCardView materialCardView, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView) {
         this.a = materialCardView;
         this.b = appCompatImageView;
-        this.f1914c = textView;
+        this.f1916c = textView;
         this.d = textView2;
         this.e = simpleDraweeView;
         this.f = materialCardView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java
index 017654237d..9b6b7e6c45 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSettingsBehaviorBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1915c;
+    public final TextView f1917c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetSettingsBehaviorBinding implements ViewBinding {
     public WidgetSettingsBehaviorBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1915c = textView;
+        this.f1917c = textView;
         this.d = checkedSetting2;
         this.e = textView2;
         this.f = checkedSetting3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java
index 77a1e49e10..d94c99ae56 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java
@@ -10,27 +10,31 @@ import com.discord.views.StatusView;
 import com.discord.widgets.user.profile.UserProfileHeaderView;
 public final class WidgetSettingsBinding implements ViewBinding {
     @NonNull
-    public final StatusView A;
+    public final TextView A;
     @NonNull
     public final TextView B;
     @NonNull
-    public final TextView C;
+    public final StatusView C;
     @NonNull
     public final TextView D;
     @NonNull
     public final TextView E;
     @NonNull
-    public final UserProfileHeaderView F;
+    public final TextView F;
     @NonNull
     public final TextView G;
     @NonNull
+    public final UserProfileHeaderView H;
+    @NonNull
+    public final TextView I;
+    @NonNull
     public final CoordinatorLayout a;
     @NonNull
     public final TextView b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1916c;
+    public final TextView f1918c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -64,11 +68,11 @@ public final class WidgetSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final TextView f1917s;
+    public final LinearLayout f1919s;
     @NonNull
-    public final LinearLayout t;
+    public final TextView t;
     @NonNull
-    public final TextView u;
+    public final LinearLayout u;
     @NonNull
     public final TextView v;
     @NonNull
@@ -76,20 +80,20 @@ public final class WidgetSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final LinearLayout f1918x;
+    public final TextView f1920x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextView f1919y;
+    public final TextView f1921y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final TextView f1920z;
+    public final LinearLayout f1922z;
 
-    public WidgetSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull View view, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull LinearLayout linearLayout, @NonNull TextView textView18, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull LinearLayout linearLayout2, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull TextView textView23, @NonNull StatusView statusView, @NonNull TextView textView24, @NonNull TextView textView25, @NonNull TextView textView26, @NonNull TextView textView27, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull TextView textView28) {
+    public WidgetSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull View view, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull LinearLayout linearLayout, @NonNull TextView textView18, @NonNull LinearLayout linearLayout2, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull LinearLayout linearLayout3, @NonNull TextView textView23, @NonNull TextView textView24, @NonNull TextView textView25, @NonNull StatusView statusView, @NonNull TextView textView26, @NonNull TextView textView27, @NonNull TextView textView28, @NonNull TextView textView29, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull TextView textView30) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1916c = textView2;
+        this.f1918c = textView2;
         this.d = textView3;
         this.e = textView4;
         this.f = textView5;
@@ -104,22 +108,24 @@ public final class WidgetSettingsBinding implements ViewBinding {
         this.o = textView13;
         this.p = textView14;
         this.q = textView15;
-        this.r = textView16;
-        this.f1917s = textView17;
-        this.t = linearLayout;
-        this.u = textView18;
+        this.r = textView17;
+        this.f1919s = linearLayout;
+        this.t = textView18;
+        this.u = linearLayout2;
         this.v = textView19;
         this.w = textView20;
-        this.f1918x = linearLayout2;
-        this.f1919y = textView22;
-        this.f1920z = textView23;
-        this.A = statusView;
-        this.B = textView24;
-        this.C = textView25;
+        this.f1920x = textView21;
+        this.f1921y = textView22;
+        this.f1922z = linearLayout3;
+        this.A = textView24;
+        this.B = textView25;
+        this.C = statusView;
         this.D = textView26;
         this.E = textView27;
-        this.F = userProfileHeaderView;
-        this.G = textView28;
+        this.F = textView28;
+        this.G = textView29;
+        this.H = userProfileHeaderView;
+        this.I = textView30;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java
index b378bad155..a497c57779 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java
@@ -15,12 +15,12 @@ public final class WidgetSettingsBlockedUsersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1921c;
+    public final RecyclerView f1923c;
 
     public WidgetSettingsBlockedUsersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull ImageView imageView) {
         this.a = coordinatorLayout;
         this.b = appViewFlipper;
-        this.f1921c = recyclerView;
+        this.f1923c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java
index c84a933067..57a8c6e1ab 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.g3;
+import c.a.i.j3;
 import com.discord.app.AppViewFlipper;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.premiumguild.PremiumGuildSubscriptionUpsellView;
@@ -16,11 +16,11 @@ public final class WidgetSettingsBoostBinding implements ViewBinding {
     @NonNull
     public final CoordinatorLayout a;
     @NonNull
-    public final g3 b;
+    public final j3 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f1922c;
+    public final AppViewFlipper f1924c;
     @NonNull
     public final PremiumSubscriptionMarketingView d;
     @NonNull
@@ -36,10 +36,10 @@ public final class WidgetSettingsBoostBinding implements ViewBinding {
     @NonNull
     public final PremiumGuildSubscriptionUpsellView j;
 
-    public WidgetSettingsBoostBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull g3 g3Var, @NonNull AppViewFlipper appViewFlipper, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton, @NonNull RecyclerView recyclerView2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView) {
+    public WidgetSettingsBoostBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull j3 j3Var, @NonNull AppViewFlipper appViewFlipper, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton, @NonNull RecyclerView recyclerView2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView) {
         this.a = coordinatorLayout;
-        this.b = g3Var;
-        this.f1922c = appViewFlipper;
+        this.b = j3Var;
+        this.f1924c = appViewFlipper;
         this.d = premiumSubscriptionMarketingView;
         this.e = recyclerView;
         this.f = materialButton;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java
index 0a559dd521..f99105a713 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsConnectionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1923c;
+    public final RecyclerView f1925c;
 
     public WidgetSettingsConnectionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1923c = recyclerView;
+        this.f1925c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java
index 4619917b80..0fbe6f0b60 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsDeveloperBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1924c;
+    public final MaterialButton f1926c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -31,7 +31,7 @@ public final class WidgetSettingsDeveloperBinding implements ViewBinding {
     public WidgetSettingsDeveloperBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2, @NonNull MaterialButton materialButton4, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1924c = materialButton2;
+        this.f1926c = materialButton2;
         this.d = materialButton3;
         this.e = recyclerView;
         this.f = recyclerView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java
index a02175ebe8..8472333a53 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java
@@ -13,14 +13,14 @@ public final class WidgetSettingsEnableMfaKeyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1925c;
+    public final TextView f1927c;
     @NonNull
     public final TextView d;
 
     public WidgetSettingsEnableMfaKeyBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1925c = textView2;
+        this.f1927c = textView2;
         this.d = textView3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java
index 31d7b897c0..2e1df88abf 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java
@@ -22,7 +22,7 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final GiftSelectView f1926c;
+    public final GiftSelectView f1928c;
     @NonNull
     public final GiftSelectView d;
     @NonNull
@@ -56,12 +56,12 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final RecyclerView f1927s;
+    public final RecyclerView f1929s;
 
     public WidgetSettingsGiftingBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull GiftSelectView giftSelectView, @NonNull GiftSelectView giftSelectView2, @NonNull GiftSelectView giftSelectView3, @NonNull GiftSelectView giftSelectView4, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull AppViewFlipper appViewFlipper, @NonNull ProgressBar progressBar, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull RecyclerView recyclerView2) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1926c = giftSelectView;
+        this.f1928c = giftSelectView;
         this.d = giftSelectView2;
         this.e = giftSelectView3;
         this.f = giftSelectView4;
@@ -77,7 +77,7 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding {
         this.p = textView3;
         this.q = textView4;
         this.r = textView5;
-        this.f1927s = recyclerView2;
+        this.f1929s = recyclerView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java
index 2e4f1ba9ba..710c204d1f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsItemAddConnectedAccountBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1928c;
+    public final TextView f1930c;
 
     public WidgetSettingsItemAddConnectedAccountBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1928c = textView;
+        this.f1930c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java
index 3e7f0fc133..9f3181c1c9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsItemBlockedUserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1929c;
+    public final TextView f1931c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetSettingsItemBlockedUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f1929c = textView;
+        this.f1931c = textView;
         this.d = materialButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java
index 918c981cd0..2cec393482 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsItemConnectedAccountBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1930c;
+    public final ImageView f1932c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -33,7 +33,7 @@ public final class WidgetSettingsItemConnectedAccountBinding implements ViewBind
     public WidgetSettingsItemConnectedAccountBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull View view, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull SwitchMaterial switchMaterial, @NonNull SwitchMaterial switchMaterial2, @NonNull View view2, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SwitchMaterial switchMaterial3) {
         this.a = cardView;
         this.b = imageView;
-        this.f1930c = imageView2;
+        this.f1932c = imageView2;
         this.d = textView;
         this.e = switchMaterial;
         this.f = switchMaterial2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java
index d5dfc1254c..4a05d2f2ea 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsLanguageBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1931c;
+    public final ImageView f1933c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetSettingsLanguageBinding implements ViewBinding {
     public WidgetSettingsLanguageBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView3) {
         this.a = coordinatorLayout;
         this.b = relativeLayout;
-        this.f1931c = imageView;
+        this.f1933c = imageView;
         this.d = textView;
         this.e = textView2;
         this.f = checkedSetting;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java
index c04d62b144..a349d0bd69 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsLanguageSelectItemBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1932c;
+    public final TextView f1934c;
     @NonNull
     public final TextView d;
 
     public WidgetSettingsLanguageSelectItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull Barrier barrier, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f1932c = textView;
+        this.f1934c = textView;
         this.d = textView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java
index 8a3b6317a6..0dcb71f42c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsMediaBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1933c;
+    public final CheckedSetting f1935c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -43,7 +43,7 @@ public final class WidgetSettingsMediaBinding implements ViewBinding {
     public WidgetSettingsMediaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1933c = checkedSetting2;
+        this.f1935c = checkedSetting2;
         this.d = linkifiedTextView;
         this.e = textView;
         this.f = textView2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java
index 3925d55ee4..0ee8fbec90 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java
@@ -15,14 +15,14 @@ public final class WidgetSettingsNotificationOsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1934c;
+    public final RelativeLayout f1936c;
     @NonNull
     public final CheckedSetting d;
 
     public WidgetSettingsNotificationOsBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting2) {
         this.a = linearLayout;
         this.b = checkedSetting;
-        this.f1934c = relativeLayout;
+        this.f1936c = relativeLayout;
         this.d = checkedSetting2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java
index 7d14df2662..ce81955ca6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java
@@ -14,7 +14,7 @@ public final class WidgetSettingsNotificationsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1935c;
+    public final CheckedSetting f1937c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetSettingsNotificationsBinding implements ViewBinding {
     public WidgetSettingsNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull LinearLayout linearLayout) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1935c = checkedSetting2;
+        this.f1937c = checkedSetting2;
         this.d = checkedSetting3;
         this.e = checkedSetting4;
         this.f = checkedSetting5;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java
index eae70721b8..5a72b8a929 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java
@@ -10,9 +10,9 @@ import androidx.cardview.widget.CardView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.viewbinding.ViewBinding;
 import c.a.i.j0;
-import c.a.i.o2;
-import c.a.i.p2;
 import c.a.i.q2;
+import c.a.i.r2;
+import c.a.i.s2;
 import c.a.i.x;
 import com.discord.app.AppViewFlipper;
 import com.discord.views.ActiveSubscriptionView;
@@ -25,9 +25,9 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final j0 f1936c;
+    public final j0 f1938c;
     @NonNull
-    public final o2 d;
+    public final q2 d;
     @NonNull
     public final ActiveSubscriptionView e;
     @NonNull
@@ -59,15 +59,15 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final p2 f1937s;
+    public final r2 f1939s;
     @NonNull
-    public final q2 t;
+    public final s2 t;
 
-    public WidgetSettingsPremiumBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull x xVar, @NonNull j0 j0Var, @NonNull o2 o2Var, @NonNull ActiveSubscriptionView activeSubscriptionView, @NonNull ActiveSubscriptionView activeSubscriptionView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull ScrollView scrollView, @NonNull Button button, @NonNull CardView cardView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull AppViewFlipper appViewFlipper, @NonNull p2 p2Var, @NonNull q2 q2Var) {
+    public WidgetSettingsPremiumBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull x xVar, @NonNull j0 j0Var, @NonNull q2 q2Var, @NonNull ActiveSubscriptionView activeSubscriptionView, @NonNull ActiveSubscriptionView activeSubscriptionView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull ScrollView scrollView, @NonNull Button button, @NonNull CardView cardView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull AppViewFlipper appViewFlipper, @NonNull r2 r2Var, @NonNull s2 s2Var) {
         this.a = coordinatorLayout;
         this.b = xVar;
-        this.f1936c = j0Var;
-        this.d = o2Var;
+        this.f1938c = j0Var;
+        this.d = q2Var;
         this.e = activeSubscriptionView;
         this.f = activeSubscriptionView2;
         this.g = linearLayout;
@@ -82,8 +82,8 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding {
         this.p = linearLayout2;
         this.q = textView5;
         this.r = appViewFlipper;
-        this.f1937s = p2Var;
-        this.t = q2Var;
+        this.f1939s = r2Var;
+        this.t = s2Var;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java
index 6543c88f46..ecef5f4206 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java
@@ -17,7 +17,7 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1938c;
+    public final CheckedSetting f1940c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -51,7 +51,7 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final CheckedSetting f1939s;
+    public final CheckedSetting f1941s;
     @NonNull
     public final CheckedSetting t;
     @NonNull
@@ -63,20 +63,20 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f1940x;
+    public final TextView f1942x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final CheckedSetting f1941y;
+    public final CheckedSetting f1943y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final CheckedSetting f1942z;
+    public final CheckedSetting f1944z;
 
     public WidgetSettingsPrivacyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull DimmerView dimmerView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting5, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull LinearLayout linearLayout2, @NonNull TextView textView4, @NonNull CheckedSetting checkedSetting6, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull CheckedSetting checkedSetting11, @NonNull CheckedSetting checkedSetting12, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting13, @NonNull MaterialButton materialButton, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting14, @NonNull CheckedSetting checkedSetting15) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1938c = checkedSetting2;
+        this.f1940c = checkedSetting2;
         this.d = textView;
         this.e = checkedSetting3;
         this.f = checkedSetting4;
@@ -92,14 +92,14 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding {
         this.p = checkedSetting8;
         this.q = checkedSetting9;
         this.r = checkedSetting10;
-        this.f1939s = checkedSetting11;
+        this.f1941s = checkedSetting11;
         this.t = checkedSetting12;
         this.u = textView6;
         this.v = checkedSetting13;
         this.w = materialButton;
-        this.f1940x = textView7;
-        this.f1941y = checkedSetting14;
-        this.f1942z = checkedSetting15;
+        this.f1942x = textView7;
+        this.f1943y = checkedSetting14;
+        this.f1944z = checkedSetting15;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java
new file mode 100644
index 0000000000..d80c86ba7e
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsUserProfileBinding.java
@@ -0,0 +1,56 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.core.widget.NestedScrollView;
+import androidx.viewbinding.ViewBinding;
+import com.discord.utilities.dimmer.DimmerView;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.discord.widgets.settings.profile.TouchInterceptingCoordinatorLayout;
+import com.discord.widgets.user.profile.UserProfileHeaderView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+public final class WidgetSettingsUserProfileBinding implements ViewBinding {
+    @NonNull
+    public final TouchInterceptingCoordinatorLayout a;
+    @NonNull
+    public final CardView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextInputEditText f1945c;
+    @NonNull
+    public final TextInputLayout d;
+    @NonNull
+    public final CardView e;
+    @NonNull
+    public final LinkifiedTextView f;
+    @NonNull
+    public final DimmerView g;
+    @NonNull
+    public final FloatingActionButton h;
+    @NonNull
+    public final UserProfileHeaderView i;
+
+    public WidgetSettingsUserProfileBinding(@NonNull TouchInterceptingCoordinatorLayout touchInterceptingCoordinatorLayout, @NonNull CardView cardView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull CardView cardView2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull DimmerView dimmerView, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull UserProfileHeaderView userProfileHeaderView) {
+        this.a = touchInterceptingCoordinatorLayout;
+        this.b = cardView;
+        this.f1945c = textInputEditText;
+        this.d = textInputLayout;
+        this.e = cardView2;
+        this.f = linkifiedTextView;
+        this.g = dimmerView;
+        this.h = floatingActionButton;
+        this.i = userProfileHeaderView;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java
index 394d992fe7..afdbb6381b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java
@@ -27,7 +27,7 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1943c;
+    public final CheckedSetting f1946c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -61,7 +61,7 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final SeekBar f1944s;
+    public final SeekBar f1947s;
     @NonNull
     public final TextView t;
     @NonNull
@@ -73,20 +73,20 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f1945x;
+    public final TextView f1948x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final SeekBar f1946y;
+    public final SeekBar f1949y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final MaterialButton f1947z;
+    public final MaterialButton f1950z;
 
     public WidgetSettingsVoiceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting5, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull SeekBar seekBar, @NonNull LinearLayout linearLayout, @NonNull TextView textView8, @NonNull CheckedSetting checkedSetting11, @NonNull TextView textView9, @NonNull View view, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull SeekBar seekBar2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView12, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1943c = checkedSetting2;
+        this.f1946c = checkedSetting2;
         this.d = checkedSetting3;
         this.e = checkedSetting4;
         this.f = textView;
@@ -102,14 +102,14 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding {
         this.p = checkedSetting10;
         this.q = textView6;
         this.r = textView7;
-        this.f1944s = seekBar;
+        this.f1947s = seekBar;
         this.t = textView8;
         this.u = checkedSetting11;
         this.v = textView9;
         this.w = view;
-        this.f1945x = textView11;
-        this.f1946y = seekBar2;
-        this.f1947z = materialButton;
+        this.f1948x = textView11;
+        this.f1949y = seekBar2;
+        this.f1950z = materialButton;
         this.A = linearLayout2;
         this.B = relativeLayout2;
         this.C = textView12;
diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java
index 215f54c688..86d62bc27e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java
@@ -14,12 +14,12 @@ public final class WidgetSettingsVoiceInputModeBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1948c;
+    public final LinearLayout f1951c;
 
     public WidgetSettingsVoiceInputModeBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2) {
         this.a = nestedScrollView;
         this.b = linearLayout;
-        this.f1948c = linearLayout2;
+        this.f1951c = linearLayout2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java
index 9aaf729670..33b1775820 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java
@@ -14,14 +14,14 @@ public final class WidgetStageAudienceBlockedBottomSheetBinding implements ViewB
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaxHeightRecyclerView f1949c;
+    public final MaxHeightRecyclerView f1952c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetStageAudienceBlockedBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull MaterialButton materialButton2) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f1949c = maxHeightRecyclerView;
+        this.f1952c = maxHeightRecyclerView;
         this.d = materialButton2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java
index a07e3c254c..3af58d47a1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java
@@ -16,14 +16,14 @@ public final class WidgetStageAudienceNoticeBottomSheetBinding implements ViewBi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1950c;
+    public final TextView f1953c;
     @NonNull
     public final MaterialButton d;
 
     public WidgetStageAudienceNoticeBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Barrier barrier, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull TextView textView3, @NonNull ImageView imageView4, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull ImageView imageView5, @NonNull TextView textView5) {
         this.a = coordinatorLayout;
         this.b = imageView4;
-        this.f1950c = textView4;
+        this.f1953c = textView4;
         this.d = materialButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java
index 3195c5f95b..893428e8fe 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java
@@ -16,7 +16,7 @@ public final class WidgetStageChannelAudienceBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CutoutView f1951c;
+    public final CutoutView f1954c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetStageChannelAudienceBinding implements ViewBinding {
     public WidgetStageChannelAudienceBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CutoutView cutoutView, @NonNull TextView textView, @NonNull ImageView imageView) {
         this.a = constraintLayout;
         this.b = simpleDraweeView;
-        this.f1951c = cutoutView;
+        this.f1954c = cutoutView;
         this.d = textView;
         this.e = imageView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java
index d836024894..e21a163a1c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java
@@ -14,7 +14,7 @@ public final class WidgetStageChannelDetailsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1952c;
+    public final ImageView f1955c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetStageChannelDetailsBinding implements ViewBinding {
     public WidgetStageChannelDetailsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull TextView textView3, @NonNull ImageView imageView5, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull ImageView imageView6, @NonNull TextView textView6) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f1952c = imageView2;
+        this.f1955c = imageView2;
         this.d = textView;
         this.e = textView2;
         this.f = imageView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java
index fde8209fc1..bde4f10cb9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java
@@ -14,14 +14,14 @@ public final class WidgetStageChannelModeratorPermissionsBinding implements View
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final PermissionOwnerListView f1953c;
+    public final PermissionOwnerListView f1956c;
     @NonNull
     public final PermissionOwnerListView d;
 
     public WidgetStageChannelModeratorPermissionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AddPermissionOwnerView addPermissionOwnerView, @NonNull PermissionOwnerListView permissionOwnerListView, @NonNull PermissionOwnerListView permissionOwnerListView2) {
         this.a = coordinatorLayout;
         this.b = addPermissionOwnerView;
-        this.f1953c = permissionOwnerListView;
+        this.f1956c = permissionOwnerListView;
         this.d = permissionOwnerListView2;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java
index 4c4811ac38..e351791e4d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java
@@ -15,12 +15,12 @@ public final class WidgetStageModeratorJoinBottomSheetBinding implements ViewBin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1954c;
+    public final MaterialButton f1957c;
 
     public WidgetStageModeratorJoinBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1954c = materialButton2;
+        this.f1957c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java
index 4b0c9feae0..c0c916d922 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java
@@ -17,14 +17,14 @@ public final class WidgetStagePublicNoticeBottomSheetBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1955c;
+    public final MaterialButton f1958c;
     @NonNull
     public final LinkifiedTextView d;
 
     public WidgetStagePublicNoticeBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull AppCompatImageView appCompatImageView, @NonNull LinearLayout linearLayout, @NonNull ScreenTitleView screenTitleView, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = materialButton;
-        this.f1955c = materialButton2;
+        this.f1958c = materialButton2;
         this.d = linkifiedTextView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java
index 61d6c6374f..c22e50d41b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetStageRaisedHandsBottomSheetBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Group f1956c;
+    public final Group f1959c;
     @NonNull
     public final SwitchMaterial d;
     @NonNull
@@ -32,7 +32,7 @@ public final class WidgetStageRaisedHandsBottomSheetBinding implements ViewBindi
     public WidgetStageRaisedHandsBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull MaterialTextView materialTextView, @NonNull Group group, @NonNull ImageView imageView, @NonNull MaterialTextView materialTextView2, @NonNull MaterialTextView materialTextView3, @NonNull SwitchMaterial switchMaterial, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull MaterialTextView materialTextView4, @NonNull MaterialTextView materialTextView5, @NonNull MaterialTextView materialTextView6, @NonNull Group group2, @NonNull ImageView imageView2) {
         this.a = coordinatorLayout;
         this.b = materialTextView;
-        this.f1956c = group;
+        this.f1959c = group;
         this.d = switchMaterial;
         this.e = maxHeightRecyclerView;
         this.f = materialTextView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java
index 774983a06f..2a76057f2c 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java
@@ -21,7 +21,7 @@ public final class WidgetStageSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f1957c;
+    public final LinkifiedTextView f1960c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -40,7 +40,7 @@ public final class WidgetStageSettingsBinding implements ViewBinding {
     public WidgetStageSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull CheckedSetting checkedSetting2, @NonNull ScreenTitleView screenTitleView, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull Space space, @NonNull TextInputEditText textInputEditText) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1957c = linkifiedTextView;
+        this.f1960c = linkifiedTextView;
         this.d = checkedSetting;
         this.e = linkifiedTextView2;
         this.f = checkedSetting2;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java
index ac5b343f44..b0d66556ff 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java
@@ -17,7 +17,7 @@ public final class WidgetStageStartEventBottomSheetBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1958c;
+    public final MaterialButton f1961c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetStageStartEventBottomSheetBinding implements ViewBindin
     public WidgetStageStartEventBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextInputEditText textInputEditText, @NonNull TextView textView4, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = textView;
-        this.f1958c = materialButton;
+        this.f1961c = materialButton;
         this.d = textView2;
         this.e = textView3;
         this.f = textInputEditText;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java
index 8bedbb4661..443165523e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java
@@ -13,12 +13,12 @@ public final class WidgetStartCallSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1959c;
+    public final TextView f1962c;
 
     public WidgetStartCallSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1959c = textView2;
+        this.f1962c = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageBinding.java
new file mode 100644
index 0000000000..1807b7247d
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetStartStageBinding.java
@@ -0,0 +1,26 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.viewbinding.ViewBinding;
+import c.a.i.j1;
+public final class WidgetStartStageBinding implements ViewBinding {
+    @NonNull
+    public final ConstraintLayout a;
+    @NonNull
+    public final j1 b;
+
+    public WidgetStartStageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull j1 j1Var, @NonNull TextView textView, @NonNull TextView textView2) {
+        this.a = constraintLayout;
+        this.b = j1Var;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java
index 75c036e11e..bb9863acb9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java
@@ -16,7 +16,7 @@ public final class WidgetStartStageServerSelectionBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1960c;
+    public final RecyclerView f1963c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetStartStageServerSelectionBinding implements ViewBinding
     public WidgetStartStageServerSelectionBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView, @NonNull ImageView imageView2, @NonNull Button button, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) {
         this.a = constraintLayout;
         this.b = imageView;
-        this.f1960c = recyclerView;
+        this.f1963c = recyclerView;
         this.d = imageView2;
         this.e = button;
         this.f = textView3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java
index deb41cb507..8c2632b5b9 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java
@@ -14,7 +14,7 @@ public final class WidgetStartStageServerSelectionBulletItemBinding implements V
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1961c;
+    public final ImageView f1964c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetStartStageServerSelectionBulletItemBinding implements V
     public WidgetStartStageServerSelectionBulletItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f1961c = imageView;
+        this.f1964c = imageView;
         this.d = imageView2;
         this.e = linkifiedTextView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java
index b61c4cbd40..bdd73121d8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java
@@ -15,7 +15,7 @@ public final class WidgetStartStageServerSelectionGuildItemBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f1962c;
+    public final ImageView f1965c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetStartStageServerSelectionGuildItemBinding implements Vi
     public WidgetStartStageServerSelectionGuildItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f1962c = imageView2;
+        this.f1965c = imageView2;
         this.d = simpleDraweeView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java
index 0bd577496b..c690171f34 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java
@@ -16,7 +16,7 @@ public final class WidgetStickerPackStoreSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1963c;
+    public final RecyclerView f1966c;
     @NonNull
     public final SimpleDraweeView d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetStickerPackStoreSheetBinding implements ViewBinding {
     public WidgetStickerPackStoreSheetBinding(@NonNull RelativeLayout relativeLayout, @NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout2, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LoadingButton loadingButton) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f1963c = recyclerView;
+        this.f1966c = recyclerView;
         this.d = simpleDraweeView;
         this.e = loadingButton;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java
index 0ead31df63..2fce9b6bc5 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java
@@ -24,7 +24,7 @@ public final class WidgetStickerPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinkifiedTextView f1964c;
+    public final LinkifiedTextView f1967c;
     @NonNull
     public final StickerView d;
     @NonNull
@@ -58,12 +58,12 @@ public final class WidgetStickerPickerBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final Toolbar f1965s;
+    public final Toolbar f1968s;
 
     public WidgetStickerPickerBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull AppBarLayout appBarLayout, @NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull RecyclerView recyclerView2, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull SearchInputView searchInputView, @NonNull Toolbar toolbar) {
         this.a = coordinatorLayout;
         this.b = imageView;
-        this.f1964c = linkifiedTextView;
+        this.f1967c = linkifiedTextView;
         this.d = stickerView;
         this.e = stickerView2;
         this.f = stickerView3;
@@ -79,7 +79,7 @@ public final class WidgetStickerPickerBinding implements ViewBinding {
         this.p = recyclerView2;
         this.q = coordinatorLayout2;
         this.r = searchInputView;
-        this.f1965s = toolbar;
+        this.f1968s = toolbar;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java
index 9c4687786b..10743c64bf 100644
--- a/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java
@@ -18,7 +18,7 @@ public final class WidgetStickerSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1966c;
+    public final TextView f1969c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -39,7 +39,7 @@ public final class WidgetStickerSheetBinding implements ViewBinding {
     public WidgetStickerSheetBinding(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull Chip chip, @NonNull RelativeLayout relativeLayout, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4) {
         this.a = linearLayout;
         this.b = loadingButton;
-        this.f1966c = textView;
+        this.f1969c = textView;
         this.d = textView2;
         this.e = materialButton;
         this.f = chip;
diff --git a/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java b/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java
index 158ca71e63..f65e41b6d6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java
@@ -15,7 +15,7 @@ public final class WidgetTabsHostBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConstraintLayout f1967c;
+    public final ConstraintLayout f1970c;
     @NonNull
     public final FragmentContainerView d;
     @NonNull
@@ -34,7 +34,7 @@ public final class WidgetTabsHostBinding implements ViewBinding {
     public WidgetTabsHostBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TabsHostBottomNavigationView tabsHostBottomNavigationView, @NonNull ConstraintLayout constraintLayout2, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull FragmentContainerView fragmentContainerView5, @NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull FragmentContainerView fragmentContainerView6) {
         this.a = constraintLayout;
         this.b = tabsHostBottomNavigationView;
-        this.f1967c = constraintLayout2;
+        this.f1970c = constraintLayout2;
         this.d = fragmentContainerView;
         this.e = fragmentContainerView2;
         this.f = fragmentContainerView4;
diff --git a/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java
index 8b2415fa4a..807e5ae3b7 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java
@@ -19,51 +19,62 @@ public final class WidgetTextChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1968c;
+    public final TextView f1971c;
     @NonNull
-    public final TextInputLayout d;
+    public final SeekBar d;
     @NonNull
-    public final LinearLayout e;
+    public final TextInputLayout e;
     @NonNull
-    public final CheckedSetting f;
+    public final TextInputLayout f;
     @NonNull
-    public final TextView g;
+    public final LinearLayout g;
     @NonNull
-    public final TextView h;
+    public final CheckedSetting h;
     @NonNull
-    public final LinearLayout i;
+    public final TextView i;
     @NonNull
-    public final View j;
+    public final TextView j;
     @NonNull
-    public final FloatingActionButton k;
+    public final LinearLayout k;
     @NonNull
-    public final LinearLayout l;
+    public final View l;
     @NonNull
-    public final LinearLayout m;
+    public final FloatingActionButton m;
     @NonNull
     public final LinearLayout n;
     @NonNull
-    public final TextView o;
+    public final LinearLayout o;
+    @NonNull
+    public final LinearLayout p;
+    @NonNull
+    public final LinearLayout q;
+    @NonNull
+    public final TextView r;
     @NonNull
-    public final SeekBar p;
 
-    public WidgetTextChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull NestedScrollView nestedScrollView) {
+    /* renamed from: s  reason: collision with root package name */
+    public final SeekBar f1972s;
+
+    public WidgetTextChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView, @NonNull SeekBar seekBar, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull LinearLayout linearLayout6, @NonNull TextView textView5, @NonNull SeekBar seekBar2, @NonNull TextView textView6, @NonNull NestedScrollView nestedScrollView) {
         this.a = coordinatorLayout;
         this.b = checkedSetting;
-        this.f1968c = textInputLayout;
-        this.d = textInputLayout2;
-        this.e = linearLayout;
-        this.f = checkedSetting2;
-        this.g = textView;
-        this.h = textView2;
-        this.i = linearLayout2;
-        this.j = view;
-        this.k = floatingActionButton;
-        this.l = linearLayout3;
-        this.m = linearLayout4;
-        this.n = linearLayout5;
-        this.o = textView3;
-        this.p = seekBar;
+        this.f1971c = textView;
+        this.d = seekBar;
+        this.e = textInputLayout;
+        this.f = textInputLayout2;
+        this.g = linearLayout;
+        this.h = checkedSetting2;
+        this.i = textView3;
+        this.j = textView4;
+        this.k = linearLayout2;
+        this.l = view;
+        this.m = floatingActionButton;
+        this.n = linearLayout3;
+        this.o = linearLayout4;
+        this.p = linearLayout5;
+        this.q = linearLayout6;
+        this.r = textView5;
+        this.f1972s = seekBar2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
index 428d0f6e01..27cd0734d2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java
@@ -14,7 +14,7 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LinearLayout f1969c;
+    public final LinearLayout f1973c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
     public WidgetThreadArchiveActionsSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f1969c = linearLayout;
+        this.f1973c = linearLayout;
         this.d = textView2;
         this.e = textView3;
         this.f = textView4;
@@ -42,29 +42,29 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding
         int i = 2131361978;
         TextView textView = (TextView) view.findViewById(2131361978);
         if (textView != null) {
-            i = 2131362071;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362071);
+            i = 2131362072;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362072);
             if (linearLayout != null) {
-                i = 2131362072;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362072);
+                i = 2131362073;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362073);
                 if (linearLayout2 != null) {
-                    i = 2131364104;
-                    TextView textView2 = (TextView) view.findViewById(2131364104);
+                    i = 2131364147;
+                    TextView textView2 = (TextView) view.findViewById(2131364147);
                     if (textView2 != null) {
-                        i = 2131364105;
-                        TextView textView3 = (TextView) view.findViewById(2131364105);
+                        i = 2131364148;
+                        TextView textView3 = (TextView) view.findViewById(2131364148);
                         if (textView3 != null) {
-                            i = 2131364106;
-                            TextView textView4 = (TextView) view.findViewById(2131364106);
+                            i = 2131364149;
+                            TextView textView4 = (TextView) view.findViewById(2131364149);
                             if (textView4 != null) {
-                                i = 2131364107;
-                                TextView textView5 = (TextView) view.findViewById(2131364107);
+                                i = 2131364150;
+                                TextView textView5 = (TextView) view.findViewById(2131364150);
                                 if (textView5 != null) {
-                                    i = 2131365133;
-                                    TextView textView6 = (TextView) view.findViewById(2131365133);
+                                    i = 2131365188;
+                                    TextView textView6 = (TextView) view.findViewById(2131365188);
                                     if (textView6 != null) {
-                                        i = 2131365286;
-                                        TextView textView7 = (TextView) view.findViewById(2131365286);
+                                        i = 2131365341;
+                                        TextView textView7 = (TextView) view.findViewById(2131365341);
                                         if (textView7 != null) {
                                             return new WidgetThreadArchiveActionsSheetBinding((NestedScrollView) view, textView, linearLayout, linearLayout2, textView2, textView3, textView4, textView5, textView6, textView7);
                                         }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java
index e7a93158bd..3f30779c2e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java
@@ -5,21 +5,21 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.i1;
+import c.a.i.k1;
 public final class WidgetThreadBrowserActiveBinding implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
     @NonNull
-    public final i1 b;
+    public final k1 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1970c;
+    public final RecyclerView f1974c;
 
-    public WidgetThreadBrowserActiveBinding(@NonNull ConstraintLayout constraintLayout, @NonNull i1 i1Var, @NonNull RecyclerView recyclerView) {
+    public WidgetThreadBrowserActiveBinding(@NonNull ConstraintLayout constraintLayout, @NonNull k1 k1Var, @NonNull RecyclerView recyclerView) {
         this.a = constraintLayout;
-        this.b = i1Var;
-        this.f1970c = recyclerView;
+        this.b = k1Var;
+        this.f1974c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java
index dc23600313..35a248e09f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java
@@ -6,26 +6,26 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.i1;
+import c.a.i.k1;
 import com.google.android.material.button.MaterialButton;
 public final class WidgetThreadBrowserArchivedBinding implements ViewBinding {
     @NonNull
     public final ConstraintLayout a;
     @NonNull
-    public final i1 b;
+    public final k1 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1971c;
+    public final RecyclerView f1975c;
     @NonNull
     public final ConstraintLayout d;
     @NonNull
     public final MaterialButton e;
 
-    public WidgetThreadBrowserArchivedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull i1 i1Var, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton) {
+    public WidgetThreadBrowserArchivedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull k1 k1Var, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton) {
         this.a = constraintLayout;
-        this.b = i1Var;
-        this.f1971c = recyclerView;
+        this.b = k1Var;
+        this.f1975c = recyclerView;
         this.d = constraintLayout2;
         this.e = materialButton;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java
index 9a7ff2f6c4..40065a511d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java
@@ -15,12 +15,12 @@ public final class WidgetThreadBrowserBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SimplePager f1972c;
+    public final SimplePager f1976c;
 
     public WidgetThreadBrowserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TabLayout tabLayout, @NonNull AppBarLayout appBarLayout, @NonNull SimplePager simplePager) {
         this.a = constraintLayout;
         this.b = tabLayout;
-        this.f1972c = simplePager;
+        this.f1976c = simplePager;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java
index 9bf12d2678..d6f07856fb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java
@@ -15,7 +15,7 @@ public final class WidgetThreadBrowserFilterSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CardView f1973c;
+    public final CardView f1977c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetThreadBrowserFilterSheetBinding implements ViewBinding
     public WidgetThreadBrowserFilterSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting, @NonNull CardView cardView, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView2) {
         this.a = nestedScrollView;
         this.b = checkedSetting;
-        this.f1973c = cardView;
+        this.f1977c = cardView;
         this.d = checkedSetting2;
         this.e = checkedSetting3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java
index 9458a253b1..1ce83ce787 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java
@@ -15,7 +15,7 @@ public final class WidgetThreadNotificationSettingsBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1974c;
+    public final CheckedSetting f1978c;
     @NonNull
     public final CheckedSetting d;
     @NonNull
@@ -24,7 +24,7 @@ public final class WidgetThreadNotificationSettingsBinding implements ViewBindin
     public WidgetThreadNotificationSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3) {
         this.a = coordinatorLayout;
         this.b = linearLayout;
-        this.f1974c = checkedSetting;
+        this.f1978c = checkedSetting;
         this.d = checkedSetting2;
         this.e = checkedSetting3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java
index 28aeb69f81..fb40c7a9a3 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java
@@ -16,12 +16,12 @@ public final class WidgetThreadSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f1975c;
+    public final FloatingActionButton f1979c;
 
     public WidgetThreadSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull NestedScrollView nestedScrollView, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f1975c = floatingActionButton;
+        this.f1979c = floatingActionButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java
index 7acef18aef..7c0f1aab2a 100644
--- a/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java
@@ -14,14 +14,14 @@ public final class WidgetThreadStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final LoadingButton f1976c;
+    public final LoadingButton f1980c;
     @NonNull
     public final TextView d;
 
     public WidgetThreadStatusBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull LoadingButton loadingButton, @NonNull TextView textView) {
         this.a = constraintLayout;
         this.b = constraintLayout2;
-        this.f1976c = loadingButton;
+        this.f1980c = loadingButton;
         this.d = textView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java
index 2a533346c0..bea08ed382 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java
@@ -17,7 +17,7 @@ public final class WidgetTosAcceptBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1977c;
+    public final MaterialButton f1981c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetTosAcceptBinding implements ViewBinding {
     public WidgetTosAcceptBinding(@NonNull RelativeLayout relativeLayout, @NonNull CheckBox checkBox, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull TextView textView, @NonNull TextView textView2) {
         this.a = relativeLayout;
         this.b = checkBox;
-        this.f1977c = materialButton;
+        this.f1981c = materialButton;
         this.d = linkifiedTextView;
         this.e = linkifiedTextView2;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java
index 151b7f78f4..30f60819a1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java
@@ -17,7 +17,7 @@ public final class WidgetTosReportViolationBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1978c;
+    public final TextView f1982c;
     @NonNull
     public final LinearLayout d;
     @NonNull
@@ -30,7 +30,7 @@ public final class WidgetTosReportViolationBinding implements ViewBinding {
     public WidgetTosReportViolationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ProgressBar progressBar, @NonNull LinkifiedTextView linkifiedTextView) {
         this.a = coordinatorLayout;
         this.b = loadingButton;
-        this.f1978c = textView;
+        this.f1982c = textView;
         this.d = linearLayout;
         this.e = textView2;
         this.f = progressBar;
diff --git a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java
index 82e370f868..992b7cece6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java
@@ -14,14 +14,14 @@ public final class WidgetTosReportViolationReasonBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1979c;
+    public final TextView f1983c;
     @NonNull
     public final MaterialRadioButton d;
 
     public WidgetTosReportViolationReasonBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialRadioButton materialRadioButton) {
         this.a = relativeLayout;
         this.b = textView;
-        this.f1979c = textView2;
+        this.f1983c = textView2;
         this.d = materialRadioButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java
new file mode 100644
index 0000000000..6d062c97ab
--- /dev/null
+++ b/app/src/main/java/com/discord/databinding/WidgetUnknownStickerSheetBinding.java
@@ -0,0 +1,30 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.discord.views.sticker.StickerView;
+public final class WidgetUnknownStickerSheetBinding implements ViewBinding {
+    @NonNull
+    public final LinearLayout a;
+    @NonNull
+    public final StickerView b;
+    @NonNull
+
+    /* renamed from: c  reason: collision with root package name */
+    public final TextView f1984c;
+
+    public WidgetUnknownStickerSheetBinding(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull TextView textView) {
+        this.a = linearLayout;
+        this.b = stickerView;
+        this.f1984c = textView;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}
diff --git a/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java
index 2dd6ade4ff..d79152732b 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java
@@ -13,7 +13,7 @@ public final class WidgetUrlActionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1980c;
+    public final TextView f1985c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class WidgetUrlActionsBinding implements ViewBinding {
     public WidgetUrlActionsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = linearLayout;
         this.b = textView;
-        this.f1980c = textView2;
+        this.f1985c = textView2;
         this.d = textView3;
         this.e = textView4;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java
index 3cd80dd504..3396eb0409 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java
@@ -14,7 +14,7 @@ public final class WidgetUserAccountVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RelativeLayout f1981c;
+    public final RelativeLayout f1986c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetUserAccountVerifyBinding implements ViewBinding {
     public WidgetUserAccountVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull RelativeLayout relativeLayout3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) {
         this.a = relativeLayout;
         this.b = relativeLayout2;
-        this.f1981c = relativeLayout3;
+        this.f1986c = relativeLayout3;
         this.d = linkifiedTextView;
         this.e = textView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java
index c87ea97b85..6ab220b78f 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java
@@ -16,7 +16,7 @@ public final class WidgetUserEmailUpdateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1982c;
+    public final TextInputLayout f1987c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -25,7 +25,7 @@ public final class WidgetUserEmailUpdateBinding implements ViewBinding {
     public WidgetUserEmailUpdateBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull DimmerView dimmerView) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f1982c = textInputLayout;
+        this.f1987c = textInputLayout;
         this.d = textInputLayout2;
         this.e = dimmerView;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java
index 58587da436..ef95ba5073 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUserEmailVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f1983c;
+    public final MaterialButton f1988c;
 
     public WidgetUserEmailVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) {
         this.a = relativeLayout;
         this.b = materialButton;
-        this.f1983c = materialButton2;
+        this.f1988c = materialButton2;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java
index 7b03cb6a7a..f606f9fc0e 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUserMentionsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f1984c;
+    public final RecyclerView f1989c;
 
     public WidgetUserMentionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Toolbar toolbar, @NonNull RecyclerView recyclerView) {
         this.a = coordinatorLayout;
         this.b = toolbar;
-        this.f1984c = recyclerView;
+        this.f1989c = recyclerView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java
index 51e839a76a..f9c61c9143 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java
@@ -13,14 +13,14 @@ public final class WidgetUserMentionsFilterBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final CheckedSetting f1985c;
+    public final CheckedSetting f1990c;
     @NonNull
     public final CheckedSetting d;
 
     public WidgetUserMentionsFilterBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3) {
         this.a = nestedScrollView;
         this.b = checkedSetting;
-        this.f1985c = checkedSetting2;
+        this.f1990c = checkedSetting2;
         this.d = checkedSetting3;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java
index 2a50e0dfaa..3bc3e1ac35 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java
@@ -15,14 +15,14 @@ public final class WidgetUserPasswordVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f1986c;
+    public final TextInputLayout f1991c;
     @NonNull
     public final FloatingActionButton d;
 
     public WidgetUserPasswordVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) {
         this.a = coordinatorLayout;
         this.b = dimmerView;
-        this.f1986c = textInputLayout;
+        this.f1991c = textInputLayout;
         this.d = floatingActionButton;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java
index 8da6dbef65..6a641de1b2 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java
@@ -16,7 +16,7 @@ public final class WidgetUserPhoneManageBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1987c;
+    public final TextView f1992c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -29,7 +29,7 @@ public final class WidgetUserPhoneManageBinding implements ViewBinding {
     public WidgetUserPhoneManageBinding(@NonNull FrameLayout frameLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull TextView textView3) {
         this.a = frameLayout;
         this.b = dimmerView;
-        this.f1987c = textView;
+        this.f1992c = textView;
         this.d = textView2;
         this.e = materialButton;
         this.f = phoneOrEmailInputView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java
index aadf960d3b..31e6793e8d 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java
@@ -15,14 +15,14 @@ public final class WidgetUserPhoneVerifyBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final DimmerView f1988c;
+    public final DimmerView f1993c;
     @NonNull
     public final CodeVerificationView d;
 
     public WidgetUserPhoneVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull DimmerView dimmerView, @NonNull CodeVerificationView codeVerificationView) {
         this.a = relativeLayout;
         this.b = imageView;
-        this.f1988c = dimmerView;
+        this.f1993c = dimmerView;
         this.d = codeVerificationView;
     }
 
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java
index 87aecdb174..e65d8501ca 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java
@@ -14,12 +14,12 @@ public final class WidgetUserProfileAdapterItemEmptyBinding implements ViewBindi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1989c;
+    public final TextView f1994c;
 
     public WidgetUserProfileAdapterItemEmptyBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = imageView;
-        this.f1989c = textView;
+        this.f1994c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java
index 6cbf4a1683..adea2931d8 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java
@@ -6,7 +6,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.j5;
+import c.a.i.m5;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
 import com.discord.views.StatusView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -14,15 +14,15 @@ public final class WidgetUserProfileAdapterItemFriendBinding implements ViewBind
     @NonNull
     public final RelativeLayout a;
     @NonNull
-    public final j5 b;
+    public final m5 b;
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final j5 f1990c;
+    public final m5 f1995c;
     @NonNull
-    public final j5 d;
+    public final m5 d;
     @NonNull
-    public final j5 e;
+    public final m5 e;
     @NonNull
     public final SimpleDraweeView f;
     @NonNull
@@ -32,12 +32,12 @@ public final class WidgetUserProfileAdapterItemFriendBinding implements ViewBind
     @NonNull
     public final TextView i;
 
-    public WidgetUserProfileAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull j5 j5Var, @NonNull j5 j5Var2, @NonNull j5 j5Var3, @NonNull j5 j5Var4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView) {
+    public WidgetUserProfileAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull m5 m5Var, @NonNull m5 m5Var2, @NonNull m5 m5Var3, @NonNull m5 m5Var4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView) {
         this.a = relativeLayout;
-        this.b = j5Var;
-        this.f1990c = j5Var2;
-        this.d = j5Var3;
-        this.e = j5Var4;
+        this.b = m5Var;
+        this.f1995c = m5Var2;
+        this.d = m5Var3;
+        this.e = m5Var4;
         this.f = simpleDraweeView;
         this.g = statusView;
         this.h = simpleDraweeSpanTextView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java
index 22bbc3e1b3..f9e1aeae56 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java
@@ -14,7 +14,7 @@ public final class WidgetUserProfileAdapterItemServerBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1991c;
+    public final TextView f1996c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -23,7 +23,7 @@ public final class WidgetUserProfileAdapterItemServerBinding implements ViewBind
     public WidgetUserProfileAdapterItemServerBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RelativeLayout relativeLayout2) {
         this.a = relativeLayout;
         this.b = simpleDraweeView;
-        this.f1991c = textView;
+        this.f1996c = textView;
         this.d = textView2;
         this.e = textView3;
     }
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java
index 321c6733fc..8ea7e80795 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java
@@ -18,7 +18,7 @@ public final class WidgetUserSetCustomStatusBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FrameLayout f1992c;
+    public final FrameLayout f1997c;
     @NonNull
     public final MaterialRadioButton d;
     @NonNull
@@ -37,7 +37,7 @@ public final class WidgetUserSetCustomStatusBinding implements ViewBinding {
     public WidgetUserSetCustomStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull RadioGroup radioGroup, @NonNull MaterialRadioButton materialRadioButton, @NonNull MaterialRadioButton materialRadioButton2, @NonNull MaterialRadioButton materialRadioButton3, @NonNull MaterialRadioButton materialRadioButton4, @NonNull MaterialRadioButton materialRadioButton5, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout) {
         this.a = coordinatorLayout;
         this.b = simpleDraweeView;
-        this.f1992c = frameLayout;
+        this.f1997c = frameLayout;
         this.d = materialRadioButton;
         this.e = materialRadioButton2;
         this.f = materialRadioButton3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java
index ce30909be2..f2f29a36ab 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java
@@ -51,7 +51,7 @@ public final class WidgetUserSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f1993c;
+    public final TextView f1998c;
     @NonNull
     public final LinkifiedTextView d;
     @NonNull
@@ -85,7 +85,7 @@ public final class WidgetUserSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final TextView f1994s;
+    public final TextView f1999s;
     @NonNull
     public final TextView t;
     @NonNull
@@ -97,20 +97,20 @@ public final class WidgetUserSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: x  reason: collision with root package name */
-    public final TextView f1995x;
+    public final TextView f2000x;
     @NonNull
 
     /* renamed from: y  reason: collision with root package name */
-    public final TextInputEditText f1996y;
+    public final TextInputEditText f2001y;
     @NonNull
 
     /* renamed from: z  reason: collision with root package name */
-    public final TextInputLayout f1997z;
+    public final TextInputLayout f2002z;
 
     public WidgetUserSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ContentLoadingProgressBar contentLoadingProgressBar, @NonNull FrameLayout frameLayout, @NonNull Button button, @NonNull CardView cardView2, @NonNull UserProfileAdminView userProfileAdminView, @NonNull Button button2, @NonNull TextView textView2, @NonNull UserProfileConnectionsView userProfileConnectionsView, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull FrameLayout frameLayout2, @NonNull Button button3, @NonNull ImageView imageView, @NonNull TextView textView7, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull Button button4, @NonNull LinearLayout linearLayout4, @NonNull View view, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull CardView cardView3, @NonNull UserProfileStageActionsView userProfileStageActionsView, @NonNull TextView textView8, @NonNull UserProfileVoiceSettingsView userProfileVoiceSettingsView, @NonNull RolesListView rolesListView, @NonNull Button button5, @NonNull CardView cardView4) {
         this.a = nestedScrollView;
         this.b = cardView;
-        this.f1993c = textView;
+        this.f1998c = textView;
         this.d = linkifiedTextView;
         this.e = contentLoadingProgressBar;
         this.f = frameLayout;
@@ -126,14 +126,14 @@ public final class WidgetUserSheetBinding implements ViewBinding {
         this.p = materialButton2;
         this.q = linearLayout2;
         this.r = linearLayout3;
-        this.f1994s = textView5;
+        this.f1999s = textView5;
         this.t = textView6;
         this.u = frameLayout2;
         this.v = button3;
         this.w = imageView;
-        this.f1995x = textView7;
-        this.f1996y = textInputEditText;
-        this.f1997z = textInputLayout;
+        this.f2000x = textView7;
+        this.f2001y = textInputEditText;
+        this.f2002z = textInputLayout;
         this.A = button4;
         this.B = linearLayout4;
         this.C = view;
diff --git a/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java
index ad6a7001d6..9562c6afee 100644
--- a/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java
@@ -5,7 +5,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.widget.NestedScrollView;
 import androidx.viewbinding.ViewBinding;
-import c.a.i.q3;
+import c.a.i.t3;
 import com.discord.widgets.user.profile.UserStatusPresenceCustomView;
 public final class WidgetUserStatusUpdateBinding implements ViewBinding {
     @NonNull
@@ -15,21 +15,21 @@ public final class WidgetUserStatusUpdateBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final q3 f1998c;
+    public final t3 f2003c;
     @NonNull
-    public final q3 d;
+    public final t3 d;
     @NonNull
-    public final q3 e;
+    public final t3 e;
     @NonNull
-    public final q3 f;
+    public final t3 f;
 
-    public WidgetUserStatusUpdateBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull UserStatusPresenceCustomView userStatusPresenceCustomView, @NonNull q3 q3Var, @NonNull q3 q3Var2, @NonNull q3 q3Var3, @NonNull q3 q3Var4) {
+    public WidgetUserStatusUpdateBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull UserStatusPresenceCustomView userStatusPresenceCustomView, @NonNull t3 t3Var, @NonNull t3 t3Var2, @NonNull t3 t3Var3, @NonNull t3 t3Var4) {
         this.a = nestedScrollView;
         this.b = userStatusPresenceCustomView;
-        this.f1998c = q3Var;
-        this.d = q3Var2;
-        this.e = q3Var3;
-        this.f = q3Var4;
+        this.f2003c = t3Var;
+        this.d = t3Var2;
+        this.e = t3Var3;
+        this.f = t3Var4;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java
index 7e90d02f5f..de338a7ecb 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java
@@ -19,7 +19,7 @@ public final class WidgetVoiceBottomSheetBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final l0 f1999c;
+    public final l0 f2004c;
     @NonNull
     public final MaterialButton d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetVoiceBottomSheetBinding implements ViewBinding {
     public WidgetVoiceBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull k0 k0Var, @NonNull l0 l0Var, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull RelativeLayout relativeLayout, @NonNull AnchoredVoiceControlsView anchoredVoiceControlsView, @NonNull MaterialButton materialButton2, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull CoordinatorLayout coordinatorLayout2) {
         this.a = coordinatorLayout;
         this.b = k0Var;
-        this.f1999c = l0Var;
+        this.f2004c = l0Var;
         this.d = materialButton;
         this.e = relativeLayout;
         this.f = anchoredVoiceControlsView;
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java
index 0b416683b1..ee1fdf6bd1 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java
@@ -18,7 +18,7 @@ public final class WidgetVoiceCallIncomingBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final FloatingActionButton f2000c;
+    public final FloatingActionButton f2005c;
     @NonNull
     public final FloatingActionButton d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetVoiceCallIncomingBinding implements ViewBinding {
     public WidgetVoiceCallIncomingBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull FloatingActionButton floatingActionButton2, @NonNull PrivateCallBlurredGridView privateCallBlurredGridView, @NonNull FloatingActionButton floatingActionButton3, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull Guideline guideline, @NonNull PrivateCallGridView privateCallGridView) {
         this.a = constraintLayout;
         this.b = linearLayout;
-        this.f2000c = floatingActionButton;
+        this.f2005c = floatingActionButton;
         this.d = floatingActionButton2;
         this.e = privateCallBlurredGridView;
         this.f = floatingActionButton3;
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java
index 1c84766173..c9be941252 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java
@@ -13,12 +13,12 @@ public final class WidgetVoiceCallInlineBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final MaterialButton f2001c;
+    public final MaterialButton f2006c;
 
     public WidgetVoiceCallInlineBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton) {
         this.a = linearLayout;
         this.b = linearLayout2;
-        this.f2001c = materialButton;
+        this.f2006c = materialButton;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java
index 5523303cbe..b6a4746cc6 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java
@@ -17,7 +17,7 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextInputLayout f2002c;
+    public final TextInputLayout f2007c;
     @NonNull
     public final TextInputLayout d;
     @NonNull
@@ -51,12 +51,12 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: s  reason: collision with root package name */
-    public final TextView f2003s;
+    public final TextView f2008s;
 
     public WidgetVoiceChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull SeekBar seekBar, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull View view2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView7, @NonNull LinearLayout linearLayout4, @NonNull TextView textView8, @NonNull View view3, @NonNull SeekBar seekBar2, @NonNull TextView textView9) {
         this.a = coordinatorLayout;
         this.b = seekBar;
-        this.f2002c = textInputLayout;
+        this.f2007c = textInputLayout;
         this.d = textInputLayout2;
         this.e = textView2;
         this.f = textView3;
@@ -72,7 +72,7 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding {
         this.p = textView8;
         this.q = view3;
         this.r = seekBar2;
-        this.f2003s = textView9;
+        this.f2008s = textView9;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java
index abf4bee29f..894d93ae22 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java
@@ -14,12 +14,12 @@ public final class WidgetVoiceNoiseCancellationBottomSheetBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2004c;
+    public final TextView f2009c;
 
     public WidgetVoiceNoiseCancellationBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) {
         this.a = linearLayout;
         this.b = materialButton;
-        this.f2004c = textView;
+        this.f2009c = textView;
     }
 
     @Override // androidx.viewbinding.ViewBinding
diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java
index d99dfc2e5d..4b659cffcf 100644
--- a/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java
+++ b/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java
@@ -14,7 +14,7 @@ public final class WidgetVoiceSettingsBottomSheetBinding implements ViewBinding
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final SwitchMaterial f2005c;
+    public final SwitchMaterial f2010c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetVoiceSettingsBottomSheetBinding implements ViewBinding
     public WidgetVoiceSettingsBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull SwitchMaterial switchMaterial, @NonNull TextView textView2, @NonNull NestedScrollView nestedScrollView2, @NonNull TextView textView3, @NonNull SwitchMaterial switchMaterial2, @NonNull TextView textView4) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2005c = switchMaterial;
+        this.f2010c = switchMaterial;
         this.d = textView2;
         this.e = textView3;
         this.f = switchMaterial2;
diff --git a/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java b/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java
index dbb514660e..08e2405f7e 100644
--- a/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java
+++ b/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java
@@ -74,7 +74,7 @@ public final class ImageUploadDialog extends AppDialog {
                 if (uri == null) {
                     m.throwUninitializedPropertyAccessException("uri");
                 }
-                MGImages.requestAvatarCrop(context, provider, uri);
+                MGImages.requestImageCrop$default(context, provider, uri, 0.0f, 0.0f, 0, 56, null);
                 ((ImageUploadDialog) this.j).dismiss();
             } else if (i == 1) {
                 ((ImageUploadDialog) this.j).dismiss();
@@ -104,17 +104,17 @@ public final class ImageUploadDialog extends AppDialog {
         public t invoke(View view) {
             View view2 = view;
             m.checkNotNullParameter(view2, "p1");
-            int i2 = 2131364027;
-            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364027);
+            int i2 = 2131364070;
+            MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364070);
             if (materialButton != null) {
-                i2 = 2131364028;
-                TextView textView = (TextView) view2.findViewById(2131364028);
+                i2 = 2131364071;
+                TextView textView = (TextView) view2.findViewById(2131364071);
                 if (textView != null) {
-                    i2 = 2131364031;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131364031);
+                    i2 = 2131364074;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131364074);
                     if (simpleDraweeView != null) {
-                        i2 = 2131364033;
-                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364033);
+                        i2 = 2131364076;
+                        MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364076);
                         if (materialButton2 != null) {
                             return new t((LinearLayout) view2, materialButton, textView, simpleDraweeView, materialButton2);
                         }
@@ -167,11 +167,11 @@ public final class ImageUploadDialog extends AppDialog {
         }
         boolean areEqual = m.areEqual(str, "image/gif");
         g().e.setOnClickListener(new d(this, str));
-        TextView textView = g().f152c;
+        TextView textView = g().f155c;
         m.checkNotNullExpressionValue(textView, "binding.noticeCrop");
         textView.setVisibility(areEqual ? 4 : 0);
         if (!areEqual) {
-            g().f152c.setOnClickListener(new a(0, this));
+            g().f155c.setOnClickListener(new a(0, this));
         }
         g().b.setOnClickListener(new a(1, this));
         int dimensionPixelSize = getResources().getDimensionPixelSize(previewType.getPreviewSizeDimenId());
diff --git a/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java b/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java
index 95370138d2..088d3830fa 100644
--- a/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java
+++ b/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java
@@ -8,12 +8,12 @@ public final class RenderableEmbedMedia {
     public final Integer b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Integer f2006c;
+    public final Integer f2011c;
 
     public RenderableEmbedMedia(String str, Integer num, Integer num2) {
         this.a = str;
         this.b = num;
-        this.f2006c = num2;
+        this.f2011c = num2;
     }
 
     public boolean equals(Object obj) {
@@ -24,7 +24,7 @@ public final class RenderableEmbedMedia {
             return false;
         }
         RenderableEmbedMedia renderableEmbedMedia = (RenderableEmbedMedia) obj;
-        return m.areEqual(this.a, renderableEmbedMedia.a) && m.areEqual(this.b, renderableEmbedMedia.b) && m.areEqual(this.f2006c, renderableEmbedMedia.f2006c);
+        return m.areEqual(this.a, renderableEmbedMedia.a) && m.areEqual(this.b, renderableEmbedMedia.b) && m.areEqual(this.f2011c, renderableEmbedMedia.f2011c);
     }
 
     public int hashCode() {
@@ -33,7 +33,7 @@ public final class RenderableEmbedMedia {
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         Integer num = this.b;
         int hashCode2 = (hashCode + (num != null ? num.hashCode() : 0)) * 31;
-        Integer num2 = this.f2006c;
+        Integer num2 = this.f2011c;
         if (num2 != null) {
             i = num2.hashCode();
         }
@@ -46,6 +46,6 @@ public final class RenderableEmbedMedia {
         L.append(", width=");
         L.append(this.b);
         L.append(", height=");
-        return a.B(L, this.f2006c, ")");
+        return a.B(L, this.f2011c, ")");
     }
 }
diff --git a/app/src/main/java/com/discord/gateway/GatewayDiscovery.java b/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
index 8f485cbc99..5517b57d7c 100644
--- a/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
+++ b/app/src/main/java/com/discord/gateway/GatewayDiscovery.java
@@ -96,7 +96,7 @@ public final class GatewayDiscovery {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            this.gatewayUrlDiscoverySubscription = this.gatewayUrlProvider.J(this.scheduler).X(new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$3(gatewayDiscovery$discoverGatewayUrl$2)), new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$4(gatewayDiscovery$discoverGatewayUrl$1)));
+            this.gatewayUrlDiscoverySubscription = this.gatewayUrlProvider.I(this.scheduler).W(new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$3(gatewayDiscovery$discoverGatewayUrl$2)), new GatewayDiscovery$sam$rx_functions_Action1$0(new GatewayDiscovery$discoverGatewayUrl$4(gatewayDiscovery$discoverGatewayUrl$1)));
             return;
         }
         Function1<String, Unit> function13 = this.log;
diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket.java b/app/src/main/java/com/discord/gateway/GatewaySocket.java
index 0cb70c14e3..cb8b3c79ac 100644
--- a/app/src/main/java/com/discord/gateway/GatewaySocket.java
+++ b/app/src/main/java/com/discord/gateway/GatewaySocket.java
@@ -344,14 +344,14 @@ public final class GatewaySocket {
         public final void postInterval(Function0<Unit> function0, long j) {
             m.checkNotNullParameter(function0, "callback");
             cancel();
-            this.subscription = Observable.F(j, j, TimeUnit.MILLISECONDS, j0.p.a.a()).J(this.scheduler).X(new GatewaySocket$Timer$postInterval$1(function0), GatewaySocket$Timer$postInterval$2.INSTANCE);
+            this.subscription = Observable.E(j, j, TimeUnit.MILLISECONDS, j0.p.a.a()).I(this.scheduler).W(new GatewaySocket$Timer$postInterval$1(function0), GatewaySocket$Timer$postInterval$2.INSTANCE);
         }
 
         @Override // com.discord.utilities.networking.Backoff.Scheduler
         public void schedule(Function0<Unit> function0, long j) {
             m.checkNotNullParameter(function0, "action");
             cancel();
-            this.subscription = Observable.e0(j, TimeUnit.MILLISECONDS).J(this.scheduler).X(new GatewaySocket$Timer$schedule$1(this, function0), GatewaySocket$Timer$schedule$2.INSTANCE);
+            this.subscription = Observable.d0(j, TimeUnit.MILLISECONDS).I(this.scheduler).W(new GatewaySocket$Timer$schedule$1(this, function0), GatewaySocket$Timer$schedule$2.INSTANCE);
         }
     }
 
@@ -381,11 +381,11 @@ public final class GatewaySocket {
         e eVar = new e();
         eVar.g = true;
         c cVar = c.LOWER_CASE_WITH_UNDERSCORES;
-        eVar.f1387c = cVar;
+        eVar.f1382c = cVar;
         eVar.b(ActivityType.class, new ActivityTypeTypeAdapter());
         gsonIncludeNulls = eVar.a();
         e eVar2 = new e();
-        eVar2.f1387c = cVar;
+        eVar2.f1382c = cVar;
         gsonOmitNulls = eVar2.a();
     }
 
@@ -422,8 +422,8 @@ public final class GatewaySocket {
         RestClient restClient = RestClient.INSTANCE;
         restClient.init(restConfig, context);
         this.gatewayDiscovery = new GatewayDiscovery(context, scheduler, backoff, new AnonymousClass1(this), restClient.getGateway());
-        Observable<Boolean> J = networkMonitor.observeIsConnected().J(scheduler);
-        Observable.i0(new r(J.i, new w1(new v1(AnonymousClass2.INSTANCE)))).X(new AnonymousClass3(this), new AnonymousClass4(this));
+        Observable<Boolean> I = networkMonitor.observeIsConnected().I(scheduler);
+        Observable.h0(new r(I.i, new w1(new v1(AnonymousClass2.INSTANCE)))).W(new AnonymousClass3(this), new AnonymousClass4(this));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -850,7 +850,7 @@ public final class GatewaySocket {
         } else if (u.contains(EXPECTED_NULL_DATA_EVENTS, str)) {
             this.eventHandler.handleDispatch(str, Unit.a);
         } else if ((!m.areEqual(str, "READY")) && (!m.areEqual(str, "RESUMED"))) {
-            Logger.e$default(this.logger, a.v("handleDispatch() ", str, " is unhandled!"), null, null, 6, null);
+            Logger.w$default(this.logger, a.v("handleDispatch() ", str, " is unhandled!"), null, 2, null);
         }
     }
 
@@ -1040,7 +1040,7 @@ public final class GatewaySocket {
     }
 
     private final void schedule(Function0<Unit> function0) {
-        new j(function0).Y(this.scheduler).X(GatewaySocket$schedule$1.INSTANCE, GatewaySocket$schedule$2.INSTANCE);
+        new j(function0).X(this.scheduler).W(GatewaySocket$schedule$1.INSTANCE, GatewaySocket$schedule$2.INSTANCE);
     }
 
     private final void send(Outgoing outgoing, boolean z2, Gson gson) {
@@ -1105,7 +1105,7 @@ public final class GatewaySocket {
             if (g != null) {
                 for (Channel channel : g) {
                     i4++;
-                    if (channel.z() == 4) {
+                    if (channel.A() == 4) {
                         i5++;
                     }
                 }
@@ -1225,7 +1225,7 @@ public final class GatewaySocket {
         Boolean typing = guildSubscriptions.getTyping();
         Boolean activities = guildSubscriptions.getActivities();
         List<Long> members = guildSubscriptions.getMembers();
-        Outgoing outgoing = new Outgoing(opcode, new OutgoingPayload.GuildSubscriptionsUpdate(j, typing, activities, members != null ? u.toList(members) : null, guildSubscriptions.getChannels(), guildSubscriptions.getThreads()));
+        Outgoing outgoing = new Outgoing(opcode, new OutgoingPayload.GuildSubscriptionsUpdate(j, typing, activities, members != null ? u.toList(members) : null, guildSubscriptions.getChannels(), guildSubscriptions.getThreads(), guildSubscriptions.getThreadMemberLists()));
         Gson gson = gsonOmitNulls;
         m.checkNotNullExpressionValue(gson, "gsonOmitNulls");
         send$default(this, outgoing, false, gson, 2, null);
diff --git a/app/src/main/java/com/discord/gateway/io/IncomingParser.java b/app/src/main/java/com/discord/gateway/io/IncomingParser.java
index a0a1cfa94d..b2a778a86d 100644
--- a/app/src/main/java/com/discord/gateway/io/IncomingParser.java
+++ b/app/src/main/java/com/discord/gateway/io/IncomingParser.java
@@ -12,6 +12,8 @@ import com.discord.api.requiredaction.UserRequiredActionUpdate;
 import com.discord.api.role.GuildRoleCreate;
 import com.discord.api.role.GuildRoleDelete;
 import com.discord.api.role.GuildRoleUpdate;
+import com.discord.api.sticker.GuildStickersUpdate;
+import com.discord.api.thread.ThreadMemberListUpdate;
 import com.discord.api.thread.ThreadMemberUpdate;
 import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.TypingUser;
@@ -133,7 +135,7 @@ public final class IncomingParser implements Model {
         r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.interaction.InteractionStateUpdate.class);
      */
     /* JADX WARNING: Code restructure failed: missing block: B:184:0x0439, code lost:
-        if (r1.equals("MESSAGE_REACTION_ADD") != false) goto L_0x0517;
+        if (r1.equals("MESSAGE_REACTION_ADD") != false) goto L_0x053c;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:186:0x0443, code lost:
         if (r1.equals("STAGE_INSTANCE_DELETE") != false) goto L_0x0475;
@@ -162,74 +164,74 @@ public final class IncomingParser implements Model {
     /* JADX WARNING: Code restructure failed: missing block: B:198:0x0487, code lost:
         r5.data = r6.parse(new com.discord.models.domain.ModelUserRelationship());
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:203:0x04ac, code lost:
-        if (r1.equals("MESSAGE_REACTION_REMOVE_ALL") != false) goto L_0x0517;
+    /* JADX WARNING: Code restructure failed: missing block: B:206:0x04be, code lost:
+        if (r1.equals("MESSAGE_REACTION_REMOVE_ALL") != false) goto L_0x053c;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:205:0x04b5, code lost:
-        if (r1.equals("GUILD_JOIN_REQUEST_UPDATE") != false) goto L_0x0506;
+    /* JADX WARNING: Code restructure failed: missing block: B:208:0x04c8, code lost:
+        if (r1.equals("GUILD_JOIN_REQUEST_UPDATE") != false) goto L_0x052b;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:210:0x04cf, code lost:
-        if (r1.equals("USER_CONNECTIONS_INTEGRATION_JOINING") != false) goto L_0x04d1;
+    /* JADX WARNING: Code restructure failed: missing block: B:216:0x04f4, code lost:
+        if (r1.equals("USER_CONNECTIONS_INTEGRATION_JOINING") != false) goto L_0x04f6;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:211:0x04d1, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:217:0x04f6, code lost:
         r6.skipValue();
         r5.data = kotlin.Unit.a;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:219:0x0504, code lost:
-        if (r1.equals("GUILD_JOIN_REQUEST_CREATE") != false) goto L_0x0506;
+    /* JADX WARNING: Code restructure failed: missing block: B:225:0x0529, code lost:
+        if (r1.equals("GUILD_JOIN_REQUEST_CREATE") != false) goto L_0x052b;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:220:0x0506, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:226:0x052b, code lost:
         r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.guildjoinrequest.GuildJoinRequestCreateOrUpdate.class);
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:222:0x0515, code lost:
-        if (r1.equals("MESSAGE_REACTION_REMOVE_EMOJI") != false) goto L_0x0517;
+    /* JADX WARNING: Code restructure failed: missing block: B:228:0x053a, code lost:
+        if (r1.equals("MESSAGE_REACTION_REMOVE_EMOJI") != false) goto L_0x053c;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:223:0x0517, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:229:0x053c, code lost:
         r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.message.reaction.MessageReactionUpdate.class);
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:246:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:252:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:247:?, code lost:
-        return;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:254:?, code lost:
-        return;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:257:?, code lost:
-        return;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:258:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:253:?, code lost:
         return;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:260:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:261:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:263:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:265:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:264:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:269:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:266:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:270:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:267:?, code lost:
         return;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:271:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:272:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:275:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:275:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:276:?, code lost:
+        return;
+     */
+    /* JADX WARNING: Code restructure failed: missing block: B:277:?, code lost:
         return;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:278:?, code lost:
         return;
      */
-    /* JADX WARNING: Code restructure failed: missing block: B:279:?, code lost:
+    /* JADX WARNING: Code restructure failed: missing block: B:283:?, code lost:
+        return;
+     */
+    /* JADX WARNING: Code restructure failed: missing block: B:286:?, code lost:
+        return;
+     */
+    /* JADX WARNING: Code restructure failed: missing block: B:287:?, code lost:
         return;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:50:0x00ff, code lost:
@@ -245,7 +247,7 @@ public final class IncomingParser implements Model {
         if (r1.equals("MESSAGE_UPDATE") != false) goto L_0x0212;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:73:0x0184, code lost:
-        if (r1.equals("USER_CONNECTIONS_UPDATE") != false) goto L_0x04d1;
+        if (r1.equals("USER_CONNECTIONS_UPDATE") != false) goto L_0x04f6;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:81:0x01b5, code lost:
         if (r1.equals("THREAD_DELETE") != false) goto L_0x01e4;
@@ -257,7 +259,7 @@ public final class IncomingParser implements Model {
         r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.channel.Channel.class);
      */
     /* JADX WARNING: Code restructure failed: missing block: B:92:0x01f2, code lost:
-        if (r1.equals("MESSAGE_REACTION_REMOVE") != false) goto L_0x0517;
+        if (r1.equals("MESSAGE_REACTION_REMOVE") != false) goto L_0x053c;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:94:0x01fc, code lost:
         if (r1.equals("CHANNEL_RECIPIENT_ADD") != false) goto L_0x0378;
@@ -320,6 +322,12 @@ public final class IncomingParser implements Model {
                                 break;
                             case -1893369777:
                                 break;
+                            case -1862771270:
+                                if (str.equals("THREAD_MEMBER_LIST_UPDATE")) {
+                                    this.data = InboundGatewayGsonParser.fromJson(jsonReader, ThreadMemberListUpdate.class);
+                                    return;
+                                }
+                                break;
                             case -1825641445:
                                 if (str.equals("GUILD_MEMBERS_CHUNK")) {
                                     this.data = InboundGatewayGsonParser.fromJson(jsonReader, GuildMembersChunk.class);
@@ -336,6 +344,12 @@ public final class IncomingParser implements Model {
                                     return;
                                 }
                                 break;
+                            case -1446088218:
+                                if (str.equals("GUILD_STICKERS_UPDATE")) {
+                                    this.data = InboundGatewayGsonParser.fromJson(jsonReader, GuildStickersUpdate.class);
+                                    return;
+                                }
+                                break;
                             case -1327124998:
                                 break;
                             case -1263316859:
diff --git a/app/src/main/java/com/discord/gateway/io/OutgoingPayload.java b/app/src/main/java/com/discord/gateway/io/OutgoingPayload.java
index 0d0609b463..b540b8770c 100644
--- a/app/src/main/java/com/discord/gateway/io/OutgoingPayload.java
+++ b/app/src/main/java/com/discord/gateway/io/OutgoingPayload.java
@@ -247,27 +247,25 @@ public abstract class OutgoingPayload {
         private final Boolean activities;
         private final Map<Long, List<List<Integer>>> channels;
         private final List<Long> members;
+        private final List<Long> threadMemberLists;
         private final Boolean threads;
         private final Boolean typing;
 
-        public GuildSubscriptions() {
-            this(null, null, null, null, null, 31, null);
-        }
-
         /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.List<? extends java.util.List<java.lang.Integer>>> */
         /* JADX WARN: Multi-variable type inference failed */
-        public GuildSubscriptions(Map<Long, ? extends List<? extends List<Integer>>> map, Boolean bool, Boolean bool2, List<Long> list, Boolean bool3) {
+        public GuildSubscriptions(Map<Long, ? extends List<? extends List<Integer>>> map, Boolean bool, Boolean bool2, List<Long> list, Boolean bool3, List<Long> list2) {
             super(null);
             this.channels = map;
             this.typing = bool;
             this.activities = bool2;
             this.members = list;
             this.threads = bool3;
+            this.threadMemberLists = list2;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ GuildSubscriptions(Map map, Boolean bool, Boolean bool2, List list, Boolean bool3, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this((i & 1) != 0 ? null : map, (i & 2) != 0 ? null : bool, (i & 4) != 0 ? null : bool2, (i & 8) != 0 ? null : list, (i & 16) != 0 ? null : bool3);
+        public /* synthetic */ GuildSubscriptions(Map map, Boolean bool, Boolean bool2, List list, Boolean bool3, List list2, int i, DefaultConstructorMarker defaultConstructorMarker) {
+            this((i & 1) != 0 ? null : map, (i & 2) != 0 ? null : bool, (i & 4) != 0 ? null : bool2, (i & 8) != 0 ? null : list, (i & 16) != 0 ? null : bool3, list2);
         }
 
         public final Boolean getActivities() {
@@ -282,6 +280,10 @@ public abstract class OutgoingPayload {
             return this.members;
         }
 
+        public final List<Long> getThreadMemberLists() {
+            return this.threadMemberLists;
+        }
+
         public final Boolean getThreads() {
             return this.threads;
         }
@@ -297,12 +299,13 @@ public abstract class OutgoingPayload {
         private final Map<Long, List<List<Integer>>> channels;
         private final long guildId;
         private final List<Long> members;
+        private final List<Long> threadMemberLists;
         private final Boolean threads;
         private final Boolean typing;
 
         /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.List<? extends java.util.List<java.lang.Integer>>> */
         /* JADX WARN: Multi-variable type inference failed */
-        public GuildSubscriptionsUpdate(long j, Boolean bool, Boolean bool2, List<Long> list, Map<Long, ? extends List<? extends List<Integer>>> map, Boolean bool3) {
+        public GuildSubscriptionsUpdate(long j, Boolean bool, Boolean bool2, List<Long> list, Map<Long, ? extends List<? extends List<Integer>>> map, Boolean bool3, List<Long> list2) {
             super(null);
             this.guildId = j;
             this.typing = bool;
@@ -310,6 +313,7 @@ public abstract class OutgoingPayload {
             this.members = list;
             this.channels = map;
             this.threads = bool3;
+            this.threadMemberLists = list2;
         }
 
         public final Boolean getActivities() {
@@ -328,6 +332,10 @@ public abstract class OutgoingPayload {
             return this.members;
         }
 
+        public final List<Long> getThreadMemberLists() {
+            return this.threadMemberLists;
+        }
+
         public final Boolean getThreads() {
             return this.threads;
         }
diff --git a/app/src/main/java/com/discord/gateway/rest/RestClient.java b/app/src/main/java/com/discord/gateway/rest/RestClient.java
index 4cd59db4dc..791099c91e 100644
--- a/app/src/main/java/com/discord/gateway/rest/RestClient.java
+++ b/app/src/main/java/com/discord/gateway/rest/RestClient.java
@@ -30,11 +30,11 @@ public final class RestClient {
         if (restApi2 == null) {
             m.throwUninitializedPropertyAccessException("restApi");
         }
-        Observable<ModelGateway> Y = restApi2.getGateway().Y(a.c());
-        m.checkNotNullExpressionValue(Y, "restApi\n          .getGa…scribeOn(Schedulers.io())");
-        Observable<String> G = RetryWithDelay.restRetry$default(retryWithDelay, Y, 0, null, null, 7, null).G(RestClient$getGateway$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "restApi\n          .getGa…          .map { it.url }");
-        return G;
+        Observable<ModelGateway> X = restApi2.getGateway().X(a.c());
+        m.checkNotNullExpressionValue(X, "restApi\n          .getGa…scribeOn(Schedulers.io())");
+        Observable<String> F = RetryWithDelay.restRetry$default(retryWithDelay, X, 0, null, null, 7, null).F(RestClient$getGateway$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restApi\n          .getGa…          .map { it.url }");
+        return F;
     }
 
     public final void init(RestConfig restConfig, Context context) {
diff --git a/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java b/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java
index b25442cf77..c28994a3fe 100644
--- a/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java
+++ b/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java
@@ -10,7 +10,7 @@ public final class BuildInfo {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2008c;
+    public final String f2013c;
     public final String d;
     public final String e;
     public final String f;
@@ -74,7 +74,7 @@ public final class BuildInfo {
         m.checkNotNullParameter(str12, "device_supported_abis");
         this.a = str7;
         this.b = str8;
-        this.f2008c = str9;
+        this.f2013c = str9;
         this.d = str10;
         this.e = str11;
         this.f = str12;
@@ -89,7 +89,7 @@ public final class BuildInfo {
             return false;
         }
         BuildInfo buildInfo = (BuildInfo) obj;
-        return m.areEqual(this.a, buildInfo.a) && m.areEqual(this.b, buildInfo.b) && m.areEqual(this.f2008c, buildInfo.f2008c) && m.areEqual(this.d, buildInfo.d) && m.areEqual(this.e, buildInfo.e) && m.areEqual(this.f, buildInfo.f) && this.g == buildInfo.g;
+        return m.areEqual(this.a, buildInfo.a) && m.areEqual(this.b, buildInfo.b) && m.areEqual(this.f2013c, buildInfo.f2013c) && m.areEqual(this.d, buildInfo.d) && m.areEqual(this.e, buildInfo.e) && m.areEqual(this.f, buildInfo.f) && this.g == buildInfo.g;
     }
 
     public int hashCode() {
@@ -98,7 +98,7 @@ public final class BuildInfo {
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.b;
         int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
-        String str3 = this.f2008c;
+        String str3 = this.f2013c;
         int hashCode3 = (hashCode2 + (str3 != null ? str3.hashCode() : 0)) * 31;
         String str4 = this.d;
         int hashCode4 = (hashCode3 + (str4 != null ? str4.hashCode() : 0)) * 31;
@@ -125,7 +125,7 @@ public final class BuildInfo {
         L.append(", device_brand=");
         L.append(this.b);
         L.append(", device_manufacturer=");
-        L.append(this.f2008c);
+        L.append(this.f2013c);
         L.append(", device_model=");
         L.append(this.d);
         L.append(", device_product=");
diff --git a/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java b/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java
index ef55a0b801..e68e06832b 100644
--- a/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java
+++ b/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java
@@ -7,7 +7,7 @@ public final class DecoderCountInfo {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2009c;
+    public int f2014c;
     public int d;
     public int e;
     public int f;
@@ -20,7 +20,7 @@ public final class DecoderCountInfo {
     public DecoderCountInfo(int i, int i2, int i3, int i4, int i5, int i6, int i7) {
         this.a = i;
         this.b = i2;
-        this.f2009c = i3;
+        this.f2014c = i3;
         this.d = i4;
         this.e = i5;
         this.f = i6;
@@ -37,7 +37,7 @@ public final class DecoderCountInfo {
         i7 = (i8 & 64) != 0 ? -1 : i7;
         this.a = i;
         this.b = i2;
-        this.f2009c = i3;
+        this.f2014c = i3;
         this.d = i4;
         this.e = i5;
         this.f = i6;
@@ -52,11 +52,11 @@ public final class DecoderCountInfo {
             return false;
         }
         DecoderCountInfo decoderCountInfo = (DecoderCountInfo) obj;
-        return this.a == decoderCountInfo.a && this.b == decoderCountInfo.b && this.f2009c == decoderCountInfo.f2009c && this.d == decoderCountInfo.d && this.e == decoderCountInfo.e && this.f == decoderCountInfo.f && this.g == decoderCountInfo.g;
+        return this.a == decoderCountInfo.a && this.b == decoderCountInfo.b && this.f2014c == decoderCountInfo.f2014c && this.d == decoderCountInfo.d && this.e == decoderCountInfo.e && this.f == decoderCountInfo.f && this.g == decoderCountInfo.g;
     }
 
     public int hashCode() {
-        return (((((((((((this.a * 31) + this.b) * 31) + this.f2009c) * 31) + this.d) * 31) + this.e) * 31) + this.f) * 31) + this.g;
+        return (((((((((((this.a * 31) + this.b) * 31) + this.f2014c) * 31) + this.d) * 31) + this.e) * 31) + this.f) * 31) + this.g;
     }
 
     public String toString() {
@@ -65,7 +65,7 @@ public final class DecoderCountInfo {
         L.append(", nHardwareDecoders720=");
         L.append(this.b);
         L.append(", nHardwareDecoders480=");
-        L.append(this.f2009c);
+        L.append(this.f2014c);
         L.append(", nDecoders1080=");
         L.append(this.d);
         L.append(", nDecoders720=");
diff --git a/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java b/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java
index ec1de6acba..4ce2688ac7 100644
--- a/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java
+++ b/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java
@@ -117,7 +117,7 @@ public final class HardwareSurveyService extends RemoteIntentService {
                 if (aVar5.d) {
                     int ordinal = aVar5.a.ordinal();
                     if (ordinal == 0) {
-                        decoderCountInfo.f2009c = intValue;
+                        decoderCountInfo.f2014c = intValue;
                     } else if (ordinal == 1) {
                         decoderCountInfo.b = intValue;
                     } else if (ordinal == 2) {
@@ -141,7 +141,7 @@ public final class HardwareSurveyService extends RemoteIntentService {
             decoderCountInfo.g = (int) (System.currentTimeMillis() - currentTimeMillis);
             Bundle bundle = new Bundle();
             m.checkNotNullParameter(bundle, "bundle");
-            bundle.putIntegerArrayList("com.discord.hardware_analytics.DecoderCountInfo", n.arrayListOf(Integer.valueOf(decoderCountInfo.a), Integer.valueOf(decoderCountInfo.b), Integer.valueOf(decoderCountInfo.f2009c), Integer.valueOf(decoderCountInfo.d), Integer.valueOf(decoderCountInfo.e), Integer.valueOf(decoderCountInfo.f), Integer.valueOf(decoderCountInfo.g)));
+            bundle.putIntegerArrayList("com.discord.hardware_analytics.DecoderCountInfo", n.arrayListOf(Integer.valueOf(decoderCountInfo.a), Integer.valueOf(decoderCountInfo.b), Integer.valueOf(decoderCountInfo.f2014c), Integer.valueOf(decoderCountInfo.d), Integer.valueOf(decoderCountInfo.e), Integer.valueOf(decoderCountInfo.f), Integer.valueOf(decoderCountInfo.g)));
             return bundle;
         }
         throw new IllegalStateException("Check failed.".toString());
diff --git a/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java b/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java
index 9a19336726..42a38bbc82 100644
--- a/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java
+++ b/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java
@@ -11,7 +11,7 @@ public final class MemoryInfo {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2010c;
+    public final int f2015c;
     public final int d;
     public final ActivityManager.MemoryInfo e;
 
@@ -29,7 +29,7 @@ public final class MemoryInfo {
         Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.app.ActivityManager");
         ActivityManager activityManager = (ActivityManager) systemService;
         this.b = activityManager.isLowRamDevice();
-        this.f2010c = activityManager.getMemoryClass();
+        this.f2015c = activityManager.getMemoryClass();
         this.d = activityManager.getLargeMemoryClass();
         m.checkNotNullParameter(context, "context");
         Object systemService2 = context.getSystemService("activity");
@@ -41,7 +41,7 @@ public final class MemoryInfo {
         StringBuilder L = c.d.b.a.a.L("MemoryObserver(isLowRamDevice=");
         L.append(this.b);
         L.append(", memoryClass=");
-        L.append(this.f2010c);
+        L.append(this.f2015c);
         L.append(", ");
         L.append("largeMemoryClass=");
         L.append(this.d);
diff --git a/app/src/main/java/com/discord/i18n/Hook.java b/app/src/main/java/com/discord/i18n/Hook.java
index 6c4ca1b444..29254e7e94 100644
--- a/app/src/main/java/com/discord/i18n/Hook.java
+++ b/app/src/main/java/com/discord/i18n/Hook.java
@@ -14,7 +14,7 @@ public final class Hook {
     public String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public a f2011c;
+    public a f2016c;
 
     /* compiled from: Hook.kt */
     public static final class a {
diff --git a/app/src/main/java/com/discord/i18n/RenderContext.java b/app/src/main/java/com/discord/i18n/RenderContext.java
index ee28cf5b3c..bb9c4b0696 100644
--- a/app/src/main/java/com/discord/i18n/RenderContext.java
+++ b/app/src/main/java/com/discord/i18n/RenderContext.java
@@ -18,7 +18,7 @@ public final class RenderContext {
     public final Map<String, Hook> b = new HashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public List<? extends Object> f2012c;
+    public List<? extends Object> f2017c;
     @ColorInt
     public Integer d;
     @ColorInt
@@ -45,7 +45,7 @@ public final class RenderContext {
             d dVar = new d(this);
             Objects.requireNonNull(hook2);
             m.checkNotNullParameter(dVar, "onClick");
-            hook2.f2011c = new Hook.a(null, dVar);
+            hook2.f2016c = new Hook.a(null, dVar);
             return Unit.a;
         }
     }
diff --git a/app/src/main/java/com/discord/models/application/Unread.java b/app/src/main/java/com/discord/models/application/Unread.java
index 7c77b0f3ea..0612a6cdee 100644
--- a/app/src/main/java/com/discord/models/application/Unread.java
+++ b/app/src/main/java/com/discord/models/application/Unread.java
@@ -2,7 +2,7 @@ package com.discord.models.application;
 
 import a0.a.a.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.t.s;
 import d0.z.d.m;
 import java.util.List;
@@ -30,9 +30,9 @@ public final class Unread {
             int i = 0;
             if (!list.isEmpty() && marker.getMessageId() != null) {
                 for (Message message : s.asReversed(list)) {
-                    long r = message.r();
+                    long id2 = message.getId();
                     Long messageId = marker.getMessageId();
-                    if (messageId != null && r == messageId.longValue()) {
+                    if (messageId != null && id2 == messageId.longValue()) {
                         return i;
                     }
                     i++;
diff --git a/app/src/main/java/com/discord/models/commands/Application.java b/app/src/main/java/com/discord/models/commands/Application.java
index e0b8b44414..17737b4514 100644
--- a/app/src/main/java/com/discord/models/commands/Application.java
+++ b/app/src/main/java/com/discord/models/commands/Application.java
@@ -14,12 +14,12 @@ public final class Application {
     private final Integer iconRes;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2013id;
+    private final long f2018id;
     private final String name;
 
     public Application(long j, String str, String str2, Integer num, int i, User user, boolean z2) {
         m.checkNotNullParameter(str, "name");
-        this.f2013id = j;
+        this.f2018id = j;
         this.name = str;
         this.icon = str2;
         this.iconRes = num;
@@ -34,11 +34,11 @@ public final class Application {
     }
 
     public static /* synthetic */ Application copy$default(Application application, long j, String str, String str2, Integer num, int i, User user, boolean z2, int i2, Object obj) {
-        return application.copy((i2 & 1) != 0 ? application.f2013id : j, (i2 & 2) != 0 ? application.name : str, (i2 & 4) != 0 ? application.icon : str2, (i2 & 8) != 0 ? application.iconRes : num, (i2 & 16) != 0 ? application.commandCount : i, (i2 & 32) != 0 ? application.bot : user, (i2 & 64) != 0 ? application.builtIn : z2);
+        return application.copy((i2 & 1) != 0 ? application.f2018id : j, (i2 & 2) != 0 ? application.name : str, (i2 & 4) != 0 ? application.icon : str2, (i2 & 8) != 0 ? application.iconRes : num, (i2 & 16) != 0 ? application.commandCount : i, (i2 & 32) != 0 ? application.bot : user, (i2 & 64) != 0 ? application.builtIn : z2);
     }
 
     public final long component1() {
-        return this.f2013id;
+        return this.f2018id;
     }
 
     public final String component2() {
@@ -78,7 +78,7 @@ public final class Application {
             return false;
         }
         Application application = (Application) obj;
-        return this.f2013id == application.f2013id && m.areEqual(this.name, application.name) && m.areEqual(this.icon, application.icon) && m.areEqual(this.iconRes, application.iconRes) && this.commandCount == application.commandCount && m.areEqual(this.bot, application.bot) && this.builtIn == application.builtIn;
+        return this.f2018id == application.f2018id && m.areEqual(this.name, application.name) && m.areEqual(this.icon, application.icon) && m.areEqual(this.iconRes, application.iconRes) && this.commandCount == application.commandCount && m.areEqual(this.bot, application.bot) && this.builtIn == application.builtIn;
     }
 
     public final User getBot() {
@@ -102,7 +102,7 @@ public final class Application {
     }
 
     public final long getId() {
-        return this.f2013id;
+        return this.f2018id;
     }
 
     public final String getName() {
@@ -110,7 +110,7 @@ public final class Application {
     }
 
     public int hashCode() {
-        int a = b.a(this.f2013id) * 31;
+        int a = b.a(this.f2018id) * 31;
         String str = this.name;
         int i = 0;
         int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
@@ -135,7 +135,7 @@ public final class Application {
 
     public String toString() {
         StringBuilder L = a.L("Application(id=");
-        L.append(this.f2013id);
+        L.append(this.f2018id);
         L.append(", name=");
         L.append(this.name);
         L.append(", icon=");
diff --git a/app/src/main/java/com/discord/models/commands/ApplicationCommand.java b/app/src/main/java/com/discord/models/commands/ApplicationCommand.java
index 083ed9bed4..cf020aeef0 100644
--- a/app/src/main/java/com/discord/models/commands/ApplicationCommand.java
+++ b/app/src/main/java/com/discord/models/commands/ApplicationCommand.java
@@ -15,7 +15,7 @@ public abstract class ApplicationCommand {
     private final Long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2014id;
+    private final String f2019id;
     private final String name;
     private final List<ApplicationCommandOption> options;
     private final Map<Long, Boolean> permissions;
@@ -24,7 +24,7 @@ public abstract class ApplicationCommand {
     /* JADX DEBUG: Multi-variable search result rejected for r13v0, resolved type: kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String, ? extends java.lang.Object>, java.lang.String> */
     /* JADX WARN: Multi-variable type inference failed */
     private ApplicationCommand(String str, long j, String str2, String str3, Integer num, List<ApplicationCommandOption> list, boolean z2, Long l, String str4, Boolean bool, Map<Long, Boolean> map, Function1<? super Map<String, ? extends Object>, String> function1) {
-        this.f2014id = str;
+        this.f2019id = str;
         this.applicationId = j;
         this.name = str2;
         this.description = str3;
@@ -72,7 +72,7 @@ public abstract class ApplicationCommand {
     }
 
     public final String getId() {
-        return this.f2014id;
+        return this.f2019id;
     }
 
     public final String getName() {
diff --git a/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendData.java b/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendData.java
index 01ea2d40bb..a522d18a26 100644
--- a/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendData.java
+++ b/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendData.java
@@ -4,7 +4,7 @@ import a0.a.a.b;
 import c.d.b.a.a;
 import com.discord.api.commands.ApplicationCommandData;
 import com.discord.restapi.RestAPIParams;
-import com.discord.widgets.chat.input.ApplicationCommandValue;
+import com.discord.widgets.chat.input.models.ApplicationCommandValue;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
diff --git a/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendDataKt.java b/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendDataKt.java
index 9e888df991..d7d35c344a 100644
--- a/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendDataKt.java
+++ b/app/src/main/java/com/discord/models/commands/ApplicationCommandLocalSendDataKt.java
@@ -10,16 +10,16 @@ public final class ApplicationCommandLocalSendDataKt {
         return toRestParams(list);
     }
 
-    private static final ApplicationCommandValue toRestParam(com.discord.widgets.chat.input.ApplicationCommandValue applicationCommandValue) {
+    private static final ApplicationCommandValue toRestParam(com.discord.widgets.chat.input.models.ApplicationCommandValue applicationCommandValue) {
         String name = applicationCommandValue.getName();
         Object valueOf = applicationCommandValue.getValue() instanceof Double ? Integer.valueOf((int) ((Number) applicationCommandValue.getValue()).doubleValue()) : applicationCommandValue.getValue();
-        List<com.discord.widgets.chat.input.ApplicationCommandValue> options = applicationCommandValue.getOptions();
+        List<com.discord.widgets.chat.input.models.ApplicationCommandValue> options = applicationCommandValue.getOptions();
         return new ApplicationCommandValue(name, valueOf, applicationCommandValue.getType(), options != null ? toRestParams(options) : null);
     }
 
-    private static final List<ApplicationCommandValue> toRestParams(List<com.discord.widgets.chat.input.ApplicationCommandValue> list) {
+    private static final List<ApplicationCommandValue> toRestParams(List<com.discord.widgets.chat.input.models.ApplicationCommandValue> list) {
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
-        for (com.discord.widgets.chat.input.ApplicationCommandValue applicationCommandValue : list) {
+        for (com.discord.widgets.chat.input.models.ApplicationCommandValue applicationCommandValue : list) {
             arrayList.add(toRestParam(applicationCommandValue));
         }
         return arrayList;
diff --git a/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java b/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java
index cd2a21951c..22fb1e001d 100644
--- a/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java
+++ b/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java
@@ -15,7 +15,7 @@ public final class InboundGatewayGsonParser {
     static {
         e eVar = new e();
         eVar.a = eVar.a.j(8);
-        eVar.f1387c = c.LOWER_CASE_WITH_UNDERSCORES;
+        eVar.f1382c = c.LOWER_CASE_WITH_UNDERSCORES;
         m.checkNotNullExpressionValue(eVar, "GsonBuilder()\n          …ER_CASE_WITH_UNDERSCORES)");
         a.a(eVar);
         gatewayGsonInstance = eVar.a();
diff --git a/app/src/main/java/com/discord/models/domain/Harvest.java b/app/src/main/java/com/discord/models/domain/Harvest.java
index 55a758bb8e..faed936b58 100644
--- a/app/src/main/java/com/discord/models/domain/Harvest.java
+++ b/app/src/main/java/com/discord/models/domain/Harvest.java
@@ -10,13 +10,13 @@ public final class Harvest {
     private final String createdAt;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2015id;
+    private final String f2020id;
     private final long userId;
 
     public Harvest(String str, long j, String str2, String str3) {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(str2, "createdAt");
-        this.f2015id = str;
+        this.f2020id = str;
         this.userId = j;
         this.createdAt = str2;
         this.completedAt = str3;
@@ -31,7 +31,7 @@ public final class Harvest {
 
     public static /* synthetic */ Harvest copy$default(Harvest harvest, String str, long j, String str2, String str3, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = harvest.f2015id;
+            str = harvest.f2020id;
         }
         if ((i & 2) != 0) {
             j = harvest.userId;
@@ -54,7 +54,7 @@ public final class Harvest {
     }
 
     public final String component1() {
-        return this.f2015id;
+        return this.f2020id;
     }
 
     public final long component2() {
@@ -83,7 +83,7 @@ public final class Harvest {
             return false;
         }
         Harvest harvest = (Harvest) obj;
-        return m.areEqual(this.f2015id, harvest.f2015id) && this.userId == harvest.userId && m.areEqual(this.createdAt, harvest.createdAt) && m.areEqual(this.completedAt, harvest.completedAt);
+        return m.areEqual(this.f2020id, harvest.f2020id) && this.userId == harvest.userId && m.areEqual(this.createdAt, harvest.createdAt) && m.areEqual(this.completedAt, harvest.completedAt);
     }
 
     public final String getCompletedAt() {
@@ -95,7 +95,7 @@ public final class Harvest {
     }
 
     public final String getId() {
-        return this.f2015id;
+        return this.f2020id;
     }
 
     public final long getUserId() {
@@ -103,7 +103,7 @@ public final class Harvest {
     }
 
     public int hashCode() {
-        String str = this.f2015id;
+        String str = this.f2020id;
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
         long j = this.userId;
@@ -123,7 +123,7 @@ public final class Harvest {
 
     public String toString() {
         StringBuilder L = a.L("Harvest(id=");
-        L.append(this.f2015id);
+        L.append(this.f2020id);
         L.append(", userId=");
         L.append(this.userId);
         L.append(", createdAt=");
diff --git a/app/src/main/java/com/discord/models/domain/HasSubscriptionItems.java b/app/src/main/java/com/discord/models/domain/HasSubscriptionItems.java
new file mode 100644
index 0000000000..a9e89d2aca
--- /dev/null
+++ b/app/src/main/java/com/discord/models/domain/HasSubscriptionItems.java
@@ -0,0 +1,42 @@
+package com.discord.models.domain;
+
+import com.discord.api.premium.SubscriptionInterval;
+import com.discord.models.domain.ModelSubscription;
+import com.discord.models.domain.premium.SubscriptionPlanType;
+import d0.t.o;
+import d0.t.u;
+import java.util.ArrayList;
+import java.util.List;
+/* compiled from: ModelSubscription.kt */
+public abstract class HasSubscriptionItems {
+    public abstract List<ModelSubscription.SubscriptionItem> getItems();
+
+    public final List<ModelSubscription.SubscriptionAdditionalPlan> getPremiumAdditionalPlans() {
+        List<ModelSubscription.SubscriptionItem> items = getItems();
+        ArrayList<ModelSubscription.SubscriptionItem> arrayList = new ArrayList();
+        for (Object obj : items) {
+            if (((ModelSubscription.SubscriptionItem) obj).getPlanId() != getPremiumBasePlanId()) {
+                arrayList.add(obj);
+            }
+        }
+        ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10));
+        for (ModelSubscription.SubscriptionItem subscriptionItem : arrayList) {
+            arrayList2.add(new ModelSubscription.SubscriptionAdditionalPlan(subscriptionItem.getPlanId(), subscriptionItem.getQuantity()));
+        }
+        return arrayList2;
+    }
+
+    public final long getPremiumBasePlanId() {
+        ModelSubscription.SubscriptionItem subscriptionItem = (ModelSubscription.SubscriptionItem) u.firstOrNull((List<? extends Object>) getItems());
+        Long valueOf = subscriptionItem != null ? Long.valueOf(subscriptionItem.getPlanId()) : null;
+        return SubscriptionPlanType.Companion.getBasePlanFromSubscriptionItems(getItems(), valueOf != null ? SubscriptionPlanType.Companion.from(valueOf.longValue()).getInterval() : SubscriptionInterval.MONTHLY).getPlanId();
+    }
+
+    public final Long getPremiumGuildPlanId() {
+        ModelSubscription.SubscriptionAdditionalPlan subscriptionAdditionalPlan = (ModelSubscription.SubscriptionAdditionalPlan) u.firstOrNull((List<? extends Object>) getPremiumAdditionalPlans());
+        if (subscriptionAdditionalPlan != null) {
+            return Long.valueOf(subscriptionAdditionalPlan.getPlanId());
+        }
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
index 43f8d29bab..52eb2069e1 100644
--- a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
+++ b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java
@@ -118,7 +118,7 @@ public class ModelAuditLogEntry implements Model {
     private Long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2016id;
+    private long f2021id;
     private Options options;
     private String reason;
     private long targetId;
@@ -287,7 +287,7 @@ public class ModelAuditLogEntry implements Model {
     public static class ChangeNameId implements Model {
 
         /* renamed from: id  reason: collision with root package name */
-        private long f2017id;
+        private long f2022id;
         private String name;
 
         @Override // com.discord.models.domain.Model
@@ -295,7 +295,7 @@ public class ModelAuditLogEntry implements Model {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
             if (nextName.equals("id")) {
-                this.f2017id = jsonReader.nextLong(this.f2017id);
+                this.f2022id = jsonReader.nextLong(this.f2022id);
             } else if (!nextName.equals("name")) {
                 jsonReader.skipValue();
             } else {
@@ -324,7 +324,7 @@ public class ModelAuditLogEntry implements Model {
         }
 
         public long getId() {
-            return this.f2017id;
+            return this.f2022id;
         }
 
         public String getName() {
@@ -353,7 +353,7 @@ public class ModelAuditLogEntry implements Model {
         private int deleteMemberDays;
 
         /* renamed from: id  reason: collision with root package name */
-        private long f2018id;
+        private long f2023id;
         private int membersRemoved;
         private String roleName;
         private int type;
@@ -421,7 +421,7 @@ public class ModelAuditLogEntry implements Model {
                     this.deleteMemberDays = jsonReader.nextInt(this.deleteMemberDays);
                     return;
                 case 3:
-                    this.f2018id = jsonReader.nextLong(this.f2018id);
+                    this.f2023id = jsonReader.nextLong(this.f2023id);
                     return;
                 case 4:
                     this.type = jsonReader.nextInt(this.type);
@@ -471,7 +471,7 @@ public class ModelAuditLogEntry implements Model {
         }
 
         public long getId() {
-            return this.f2018id;
+            return this.f2023id;
         }
 
         public int getMembersRemoved() {
@@ -560,7 +560,7 @@ public class ModelAuditLogEntry implements Model {
     }
 
     public ModelAuditLogEntry(long j, int i, long j2, long j3, List<Change> list, Options options, long j4, Long l) {
-        this.f2016id = j;
+        this.f2021id = j;
         this.actionTypeId = i;
         this.targetId = j2;
         this.userId = j3;
@@ -739,7 +739,7 @@ public class ModelAuditLogEntry implements Model {
                 this.userId = jsonReader.nextLong(this.userId);
                 return;
             case 4:
-                this.f2016id = jsonReader.nextLong(this.f2016id);
+                this.f2021id = jsonReader.nextLong(this.f2021id);
                 return;
             case 5:
                 this.changes = jsonReader.nextList(new g(jsonReader));
@@ -810,7 +810,7 @@ public class ModelAuditLogEntry implements Model {
     }
 
     public long getId() {
-        return this.f2016id;
+        return this.f2021id;
     }
 
     public Options getOptions() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
index 302e950f4e..d7308d4f52 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java
@@ -14,7 +14,7 @@ public final class ModelConnectedAccount implements Model {
     @NonNull
 
     /* renamed from: id  reason: collision with root package name */
-    private String f2019id;
+    private String f2024id;
     private List<ModelConnectedAccountIntegration> integrations;
     private boolean revoked;
     private boolean showActivity;
@@ -97,7 +97,7 @@ public final class ModelConnectedAccount implements Model {
                 this.verified = jsonReader.nextBoolean(this.verified);
                 return;
             case 1:
-                this.f2019id = jsonReader.nextString(this.f2019id);
+                this.f2024id = jsonReader.nextString(this.f2024id);
                 return;
             case 2:
                 this.username = jsonReader.nextString(this.username);
@@ -159,7 +159,7 @@ public final class ModelConnectedAccount implements Model {
 
     @NonNull
     public String getId() {
-        return this.f2019id;
+        return this.f2024id;
     }
 
     public List<ModelConnectedAccountIntegration> getIntegrations() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
index 93fba2a974..68ed64de06 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java
@@ -20,7 +20,7 @@ public final class ModelConnectedAccountIntegration {
     private final ModelConnectedIntegrationGuild guild;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2020id;
+    private final String f2025id;
     private final String type;
 
     /* compiled from: ModelConnectedAccountIntegration.kt */
@@ -59,7 +59,7 @@ public final class ModelConnectedAccountIntegration {
 
     public ModelConnectedAccountIntegration(String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild) {
         m.checkNotNullParameter(str, "id");
-        this.f2020id = str;
+        this.f2025id = str;
         this.type = str2;
         this.account = modelConnectedIntegrationAccount;
         this.guild = modelConnectedIntegrationGuild;
@@ -67,7 +67,7 @@ public final class ModelConnectedAccountIntegration {
 
     public static /* synthetic */ ModelConnectedAccountIntegration copy$default(ModelConnectedAccountIntegration modelConnectedAccountIntegration, String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelConnectedAccountIntegration.f2020id;
+            str = modelConnectedAccountIntegration.f2025id;
         }
         if ((i & 2) != 0) {
             str2 = modelConnectedAccountIntegration.type;
@@ -82,7 +82,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public final String component1() {
-        return this.f2020id;
+        return this.f2025id;
     }
 
     public final String component2() {
@@ -110,7 +110,7 @@ public final class ModelConnectedAccountIntegration {
             return false;
         }
         ModelConnectedAccountIntegration modelConnectedAccountIntegration = (ModelConnectedAccountIntegration) obj;
-        return m.areEqual(this.f2020id, modelConnectedAccountIntegration.f2020id) && m.areEqual(this.type, modelConnectedAccountIntegration.type) && m.areEqual(this.account, modelConnectedAccountIntegration.account) && m.areEqual(this.guild, modelConnectedAccountIntegration.guild);
+        return m.areEqual(this.f2025id, modelConnectedAccountIntegration.f2025id) && m.areEqual(this.type, modelConnectedAccountIntegration.type) && m.areEqual(this.account, modelConnectedAccountIntegration.account) && m.areEqual(this.guild, modelConnectedAccountIntegration.guild);
     }
 
     public final ModelConnectedIntegrationAccount getAccount() {
@@ -149,7 +149,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public final String getId() {
-        return this.f2020id;
+        return this.f2025id;
     }
 
     public final String getType() {
@@ -157,7 +157,7 @@ public final class ModelConnectedAccountIntegration {
     }
 
     public int hashCode() {
-        String str = this.f2020id;
+        String str = this.f2025id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.type;
@@ -173,7 +173,7 @@ public final class ModelConnectedAccountIntegration {
 
     public String toString() {
         StringBuilder L = c.d.b.a.a.L("ModelConnectedAccountIntegration(id=");
-        L.append(this.f2020id);
+        L.append(this.f2025id);
         L.append(", type=");
         L.append(this.type);
         L.append(", account=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
index 8512c55b33..20101f73b3 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java
@@ -11,7 +11,7 @@ import kotlin.reflect.KProperty;
 public final class ModelConnectedIntegrationAccount {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2021id;
+    private final String f2026id;
     private final String name;
 
     /* compiled from: ModelConnectedIntegrationAccount.kt */
@@ -39,13 +39,13 @@ public final class ModelConnectedIntegrationAccount {
     public ModelConnectedIntegrationAccount(String str, String str2) {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(str2, "name");
-        this.f2021id = str;
+        this.f2026id = str;
         this.name = str2;
     }
 
     public static /* synthetic */ ModelConnectedIntegrationAccount copy$default(ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, String str, String str2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelConnectedIntegrationAccount.f2021id;
+            str = modelConnectedIntegrationAccount.f2026id;
         }
         if ((i & 2) != 0) {
             str2 = modelConnectedIntegrationAccount.name;
@@ -54,7 +54,7 @@ public final class ModelConnectedIntegrationAccount {
     }
 
     public final String component1() {
-        return this.f2021id;
+        return this.f2026id;
     }
 
     public final String component2() {
@@ -75,11 +75,11 @@ public final class ModelConnectedIntegrationAccount {
             return false;
         }
         ModelConnectedIntegrationAccount modelConnectedIntegrationAccount = (ModelConnectedIntegrationAccount) obj;
-        return m.areEqual(this.f2021id, modelConnectedIntegrationAccount.f2021id) && m.areEqual(this.name, modelConnectedIntegrationAccount.name);
+        return m.areEqual(this.f2026id, modelConnectedIntegrationAccount.f2026id) && m.areEqual(this.name, modelConnectedIntegrationAccount.name);
     }
 
     public final String getId() {
-        return this.f2021id;
+        return this.f2026id;
     }
 
     public final String getName() {
@@ -87,7 +87,7 @@ public final class ModelConnectedIntegrationAccount {
     }
 
     public int hashCode() {
-        String str = this.f2021id;
+        String str = this.f2026id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -99,7 +99,7 @@ public final class ModelConnectedIntegrationAccount {
 
     public String toString() {
         StringBuilder L = c.d.b.a.a.L("ModelConnectedIntegrationAccount(id=");
-        L.append(this.f2021id);
+        L.append(this.f2026id);
         L.append(", name=");
         return c.d.b.a.a.D(L, this.name, ")");
     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
index a093a587e2..9780715b38 100644
--- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
+++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java
@@ -14,7 +14,7 @@ public final class ModelConnectedIntegrationGuild {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2022id;
+    private final long f2027id;
     private final String name;
 
     /* compiled from: ModelConnectedIntegrationGuild.kt */
@@ -40,7 +40,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public ModelConnectedIntegrationGuild(long j, String str, String str2) {
-        this.f2022id = j;
+        this.f2027id = j;
         this.icon = str;
         this.name = str2;
     }
@@ -52,7 +52,7 @@ public final class ModelConnectedIntegrationGuild {
 
     public static /* synthetic */ ModelConnectedIntegrationGuild copy$default(ModelConnectedIntegrationGuild modelConnectedIntegrationGuild, long j, String str, String str2, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelConnectedIntegrationGuild.f2022id;
+            j = modelConnectedIntegrationGuild.f2027id;
         }
         if ((i & 2) != 0) {
             str = modelConnectedIntegrationGuild.icon;
@@ -64,7 +64,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public final long component1() {
-        return this.f2022id;
+        return this.f2027id;
     }
 
     public final String component2() {
@@ -87,7 +87,7 @@ public final class ModelConnectedIntegrationGuild {
             return false;
         }
         ModelConnectedIntegrationGuild modelConnectedIntegrationGuild = (ModelConnectedIntegrationGuild) obj;
-        return this.f2022id == modelConnectedIntegrationGuild.f2022id && m.areEqual(this.icon, modelConnectedIntegrationGuild.icon) && m.areEqual(this.name, modelConnectedIntegrationGuild.name);
+        return this.f2027id == modelConnectedIntegrationGuild.f2027id && m.areEqual(this.icon, modelConnectedIntegrationGuild.icon) && m.areEqual(this.name, modelConnectedIntegrationGuild.name);
     }
 
     public final String getIcon() {
@@ -95,7 +95,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public final long getId() {
-        return this.f2022id;
+        return this.f2027id;
     }
 
     public final String getName() {
@@ -103,7 +103,7 @@ public final class ModelConnectedIntegrationGuild {
     }
 
     public int hashCode() {
-        long j = this.f2022id;
+        long j = this.f2027id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.icon;
         int i2 = 0;
@@ -117,7 +117,7 @@ public final class ModelConnectedIntegrationGuild {
 
     public String toString() {
         StringBuilder L = c.d.b.a.a.L("ModelConnectedIntegrationGuild(id=");
-        L.append(this.f2022id);
+        L.append(this.f2027id);
         L.append(", icon=");
         L.append(this.icon);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelEntitlement.java b/app/src/main/java/com/discord/models/domain/ModelEntitlement.java
index 9cf69167d3..e515613e12 100644
--- a/app/src/main/java/com/discord/models/domain/ModelEntitlement.java
+++ b/app/src/main/java/com/discord/models/domain/ModelEntitlement.java
@@ -9,7 +9,7 @@ public final class ModelEntitlement {
     private final Boolean consumed;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2023id;
+    private final long f2028id;
     private final Long parentId;
     private final Long promotionId;
     private final ModelSku sku;
@@ -20,7 +20,7 @@ public final class ModelEntitlement {
 
     public ModelEntitlement(long j, long j2, int i, long j3, long j4, ModelSku modelSku, SubscriptionPlan subscriptionPlan, Long l, Boolean bool, Long l2) {
         m.checkNotNullParameter(modelSku, "sku");
-        this.f2023id = j;
+        this.f2028id = j;
         this.applicationId = j2;
         this.type = i;
         this.userId = j3;
@@ -33,11 +33,11 @@ public final class ModelEntitlement {
     }
 
     public static /* synthetic */ ModelEntitlement copy$default(ModelEntitlement modelEntitlement, long j, long j2, int i, long j3, long j4, ModelSku modelSku, SubscriptionPlan subscriptionPlan, Long l, Boolean bool, Long l2, int i2, Object obj) {
-        return modelEntitlement.copy((i2 & 1) != 0 ? modelEntitlement.f2023id : j, (i2 & 2) != 0 ? modelEntitlement.applicationId : j2, (i2 & 4) != 0 ? modelEntitlement.type : i, (i2 & 8) != 0 ? modelEntitlement.userId : j3, (i2 & 16) != 0 ? modelEntitlement.skuId : j4, (i2 & 32) != 0 ? modelEntitlement.sku : modelSku, (i2 & 64) != 0 ? modelEntitlement.subscriptionPlan : subscriptionPlan, (i2 & 128) != 0 ? modelEntitlement.parentId : l, (i2 & 256) != 0 ? modelEntitlement.consumed : bool, (i2 & 512) != 0 ? modelEntitlement.promotionId : l2);
+        return modelEntitlement.copy((i2 & 1) != 0 ? modelEntitlement.f2028id : j, (i2 & 2) != 0 ? modelEntitlement.applicationId : j2, (i2 & 4) != 0 ? modelEntitlement.type : i, (i2 & 8) != 0 ? modelEntitlement.userId : j3, (i2 & 16) != 0 ? modelEntitlement.skuId : j4, (i2 & 32) != 0 ? modelEntitlement.sku : modelSku, (i2 & 64) != 0 ? modelEntitlement.subscriptionPlan : subscriptionPlan, (i2 & 128) != 0 ? modelEntitlement.parentId : l, (i2 & 256) != 0 ? modelEntitlement.consumed : bool, (i2 & 512) != 0 ? modelEntitlement.promotionId : l2);
     }
 
     public final long component1() {
-        return this.f2023id;
+        return this.f2028id;
     }
 
     public final Long component10() {
@@ -89,7 +89,7 @@ public final class ModelEntitlement {
             return false;
         }
         ModelEntitlement modelEntitlement = (ModelEntitlement) obj;
-        return this.f2023id == modelEntitlement.f2023id && this.applicationId == modelEntitlement.applicationId && this.type == modelEntitlement.type && this.userId == modelEntitlement.userId && this.skuId == modelEntitlement.skuId && m.areEqual(this.sku, modelEntitlement.sku) && m.areEqual(this.subscriptionPlan, modelEntitlement.subscriptionPlan) && m.areEqual(this.parentId, modelEntitlement.parentId) && m.areEqual(this.consumed, modelEntitlement.consumed) && m.areEqual(this.promotionId, modelEntitlement.promotionId);
+        return this.f2028id == modelEntitlement.f2028id && this.applicationId == modelEntitlement.applicationId && this.type == modelEntitlement.type && this.userId == modelEntitlement.userId && this.skuId == modelEntitlement.skuId && m.areEqual(this.sku, modelEntitlement.sku) && m.areEqual(this.subscriptionPlan, modelEntitlement.subscriptionPlan) && m.areEqual(this.parentId, modelEntitlement.parentId) && m.areEqual(this.consumed, modelEntitlement.consumed) && m.areEqual(this.promotionId, modelEntitlement.promotionId);
     }
 
     public final long getApplicationId() {
@@ -101,7 +101,7 @@ public final class ModelEntitlement {
     }
 
     public final long getId() {
-        return this.f2023id;
+        return this.f2028id;
     }
 
     public final Long getParentId() {
@@ -133,7 +133,7 @@ public final class ModelEntitlement {
     }
 
     public int hashCode() {
-        long j = this.f2023id;
+        long j = this.f2028id;
         long j2 = this.applicationId;
         long j3 = this.userId;
         long j4 = this.skuId;
@@ -156,7 +156,7 @@ public final class ModelEntitlement {
 
     public String toString() {
         StringBuilder L = a.L("ModelEntitlement(id=");
-        L.append(this.f2023id);
+        L.append(this.f2028id);
         L.append(", applicationId=");
         L.append(this.applicationId);
         L.append(", type=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java b/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java
index f0de6e138f..b738b3a5ed 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java
@@ -12,7 +12,7 @@ public final class ModelGuildFolder {
     private final List<Long> guildIds;
 
     /* renamed from: id  reason: collision with root package name */
-    private final Long f2024id;
+    private final Long f2029id;
     private final String name;
 
     /* compiled from: ModelGuildFolder.kt */
@@ -41,7 +41,7 @@ public final class ModelGuildFolder {
 
     public ModelGuildFolder(Long l, List<Long> list, Integer num, String str) {
         m.checkNotNullParameter(list, "guildIds");
-        this.f2024id = l;
+        this.f2029id = l;
         this.guildIds = list;
         this.color = num;
         this.name = str;
@@ -56,7 +56,7 @@ public final class ModelGuildFolder {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelGuildFolder copy$default(ModelGuildFolder modelGuildFolder, Long l, List list, Integer num, String str, int i, Object obj) {
         if ((i & 1) != 0) {
-            l = modelGuildFolder.f2024id;
+            l = modelGuildFolder.f2029id;
         }
         if ((i & 2) != 0) {
             list = modelGuildFolder.guildIds;
@@ -71,7 +71,7 @@ public final class ModelGuildFolder {
     }
 
     public final Long component1() {
-        return this.f2024id;
+        return this.f2029id;
     }
 
     public final List<Long> component2() {
@@ -99,7 +99,7 @@ public final class ModelGuildFolder {
             return false;
         }
         ModelGuildFolder modelGuildFolder = (ModelGuildFolder) obj;
-        return m.areEqual(this.f2024id, modelGuildFolder.f2024id) && m.areEqual(this.guildIds, modelGuildFolder.guildIds) && m.areEqual(this.color, modelGuildFolder.color) && m.areEqual(this.name, modelGuildFolder.name);
+        return m.areEqual(this.f2029id, modelGuildFolder.f2029id) && m.areEqual(this.guildIds, modelGuildFolder.guildIds) && m.areEqual(this.color, modelGuildFolder.color) && m.areEqual(this.name, modelGuildFolder.name);
     }
 
     public final Integer getColor() {
@@ -111,7 +111,7 @@ public final class ModelGuildFolder {
     }
 
     public final Long getId() {
-        return this.f2024id;
+        return this.f2029id;
     }
 
     public final String getName() {
@@ -119,7 +119,7 @@ public final class ModelGuildFolder {
     }
 
     public int hashCode() {
-        Long l = this.f2024id;
+        Long l = this.f2029id;
         int i = 0;
         int hashCode = (l != null ? l.hashCode() : 0) * 31;
         List<Long> list = this.guildIds;
@@ -135,7 +135,7 @@ public final class ModelGuildFolder {
 
     public String toString() {
         StringBuilder L = a.L("ModelGuildFolder(id=");
-        L.append(this.f2024id);
+        L.append(this.f2029id);
         L.append(", guildIds=");
         L.append(this.guildIds);
         L.append(", color=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
index a1520278a1..33c2f5ccd9 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java
@@ -17,7 +17,7 @@ public class ModelGuildIntegration implements Model {
     private int expireGracePeriod;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2025id;
+    private long f2030id;
     private String name;
     private long roleId;
     private int subscriberCount;
@@ -29,7 +29,7 @@ public class ModelGuildIntegration implements Model {
     public static class IntegrationAccount implements Model {
 
         /* renamed from: id  reason: collision with root package name */
-        private String f2026id;
+        private String f2031id;
         private String name;
 
         @Override // com.discord.models.domain.Model
@@ -37,7 +37,7 @@ public class ModelGuildIntegration implements Model {
             String nextName = jsonReader.nextName();
             nextName.hashCode();
             if (nextName.equals("id")) {
-                this.f2026id = jsonReader.nextString(this.f2026id);
+                this.f2031id = jsonReader.nextString(this.f2031id);
             } else if (!nextName.equals("name")) {
                 jsonReader.skipValue();
             } else {
@@ -71,7 +71,7 @@ public class ModelGuildIntegration implements Model {
         }
 
         public String getId() {
-            return this.f2026id;
+            return this.f2031id;
         }
 
         public String getName() {
@@ -248,7 +248,7 @@ public class ModelGuildIntegration implements Model {
                 this.expireBehavior = jsonReader.nextInt(this.expireBehavior);
                 return;
             case 5:
-                this.f2025id = jsonReader.nextLong(this.f2025id);
+                this.f2030id = jsonReader.nextLong(this.f2030id);
                 return;
             case 6:
                 this.name = jsonReader.nextString(this.name);
@@ -339,7 +339,7 @@ public class ModelGuildIntegration implements Model {
     }
 
     public long getId() {
-        return this.f2025id;
+        return this.f2030id;
     }
 
     public String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
index 2002d7f1c6..22839f6d88 100644
--- a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
+++ b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java
@@ -17,7 +17,7 @@ public final class ModelGuildMemberListUpdate {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2027id;
+    private final String f2032id;
     private final List<Operation> operations;
 
     /* compiled from: ModelGuildMemberListUpdate.kt */
@@ -35,7 +35,7 @@ public final class ModelGuildMemberListUpdate {
         private final int count;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2028id;
+        private final String f2033id;
         private final Type type;
 
         /* compiled from: ModelGuildMemberListUpdate.kt */
@@ -67,7 +67,7 @@ public final class ModelGuildMemberListUpdate {
         public Group(String str, int i) {
             Type type;
             m.checkNotNullParameter(str, "id");
-            this.f2028id = str;
+            this.f2033id = str;
             this.count = i;
             int hashCode = str.hashCode();
             if (hashCode != -1548612125) {
@@ -85,7 +85,7 @@ public final class ModelGuildMemberListUpdate {
 
         public static /* synthetic */ Group copy$default(Group group, String str, int i, int i2, Object obj) {
             if ((i2 & 1) != 0) {
-                str = group.f2028id;
+                str = group.f2033id;
             }
             if ((i2 & 2) != 0) {
                 i = group.count;
@@ -94,7 +94,7 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public final String component1() {
-            return this.f2028id;
+            return this.f2033id;
         }
 
         public final int component2() {
@@ -114,7 +114,7 @@ public final class ModelGuildMemberListUpdate {
                 return false;
             }
             Group group = (Group) obj;
-            return m.areEqual(this.f2028id, group.f2028id) && this.count == group.count;
+            return m.areEqual(this.f2033id, group.f2033id) && this.count == group.count;
         }
 
         public final int getCount() {
@@ -122,7 +122,7 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public final String getId() {
-            return this.f2028id;
+            return this.f2033id;
         }
 
         public final Type getType() {
@@ -130,13 +130,13 @@ public final class ModelGuildMemberListUpdate {
         }
 
         public int hashCode() {
-            String str = this.f2028id;
+            String str = this.f2033id;
             return ((str != null ? str.hashCode() : 0) * 31) + this.count;
         }
 
         public String toString() {
             StringBuilder L = a.L("Group(id=");
-            L.append(this.f2028id);
+            L.append(this.f2033id);
             L.append(", count=");
             return a.z(L, this.count, ")");
         }
@@ -756,7 +756,7 @@ public final class ModelGuildMemberListUpdate {
         m.checkNotNullParameter(list, "operations");
         m.checkNotNullParameter(list2, "groups");
         this.guildId = j;
-        this.f2027id = str;
+        this.f2032id = str;
         this.operations = list;
         this.groups = list2;
     }
@@ -768,7 +768,7 @@ public final class ModelGuildMemberListUpdate {
             j = modelGuildMemberListUpdate.guildId;
         }
         if ((i & 2) != 0) {
-            str = modelGuildMemberListUpdate.f2027id;
+            str = modelGuildMemberListUpdate.f2032id;
         }
         if ((i & 4) != 0) {
             list = modelGuildMemberListUpdate.operations;
@@ -784,7 +784,7 @@ public final class ModelGuildMemberListUpdate {
     }
 
     public final String component2() {
-        return this.f2027id;
+        return this.f2032id;
     }
 
     public final List<Operation> component3() {
@@ -810,7 +810,7 @@ public final class ModelGuildMemberListUpdate {
             return false;
         }
         ModelGuildMemberListUpdate modelGuildMemberListUpdate = (ModelGuildMemberListUpdate) obj;
-        return this.guildId == modelGuildMemberListUpdate.guildId && m.areEqual(this.f2027id, modelGuildMemberListUpdate.f2027id) && m.areEqual(this.operations, modelGuildMemberListUpdate.operations) && m.areEqual(this.groups, modelGuildMemberListUpdate.groups);
+        return this.guildId == modelGuildMemberListUpdate.guildId && m.areEqual(this.f2032id, modelGuildMemberListUpdate.f2032id) && m.areEqual(this.operations, modelGuildMemberListUpdate.operations) && m.areEqual(this.groups, modelGuildMemberListUpdate.groups);
     }
 
     public final List<Group> getGroups() {
@@ -822,7 +822,7 @@ public final class ModelGuildMemberListUpdate {
     }
 
     public final String getId() {
-        return this.f2027id;
+        return this.f2032id;
     }
 
     public final List<Operation> getOperations() {
@@ -832,7 +832,7 @@ public final class ModelGuildMemberListUpdate {
     public int hashCode() {
         long j = this.guildId;
         int i = ((int) (j ^ (j >>> 32))) * 31;
-        String str = this.f2027id;
+        String str = this.f2032id;
         int i2 = 0;
         int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31;
         List<Operation> list = this.operations;
@@ -848,7 +848,7 @@ public final class ModelGuildMemberListUpdate {
         StringBuilder L = a.L("ModelGuildMemberListUpdate(guildId=");
         L.append(this.guildId);
         L.append(", id=");
-        L.append(this.f2027id);
+        L.append(this.f2032id);
         L.append(", operations=");
         L.append(this.operations);
         L.append(", groups=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java b/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java
index 9e0cd99dcc..265526c5fb 100644
--- a/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java
+++ b/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java
@@ -10,7 +10,7 @@ public final class ModelOAuth2Token {
     private final Application application;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2029id;
+    private final long f2034id;
     private final List<OAuthScope> scopes;
 
     /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List<? extends com.discord.api.auth.OAuthScope> */
@@ -18,7 +18,7 @@ public final class ModelOAuth2Token {
     public ModelOAuth2Token(long j, List<? extends OAuthScope> list, Application application) {
         m.checkNotNullParameter(list, "scopes");
         m.checkNotNullParameter(application, "application");
-        this.f2029id = j;
+        this.f2034id = j;
         this.scopes = list;
         this.application = application;
     }
@@ -27,7 +27,7 @@ public final class ModelOAuth2Token {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelOAuth2Token copy$default(ModelOAuth2Token modelOAuth2Token, long j, List list, Application application, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelOAuth2Token.f2029id;
+            j = modelOAuth2Token.f2034id;
         }
         if ((i & 2) != 0) {
             list = modelOAuth2Token.scopes;
@@ -39,7 +39,7 @@ public final class ModelOAuth2Token {
     }
 
     public final long component1() {
-        return this.f2029id;
+        return this.f2034id;
     }
 
     public final List<OAuthScope> component2() {
@@ -64,7 +64,7 @@ public final class ModelOAuth2Token {
             return false;
         }
         ModelOAuth2Token modelOAuth2Token = (ModelOAuth2Token) obj;
-        return this.f2029id == modelOAuth2Token.f2029id && m.areEqual(this.scopes, modelOAuth2Token.scopes) && m.areEqual(this.application, modelOAuth2Token.application);
+        return this.f2034id == modelOAuth2Token.f2034id && m.areEqual(this.scopes, modelOAuth2Token.scopes) && m.areEqual(this.application, modelOAuth2Token.application);
     }
 
     public final Application getApplication() {
@@ -72,7 +72,7 @@ public final class ModelOAuth2Token {
     }
 
     public final long getId() {
-        return this.f2029id;
+        return this.f2034id;
     }
 
     public final List<OAuthScope> getScopes() {
@@ -80,7 +80,7 @@ public final class ModelOAuth2Token {
     }
 
     public int hashCode() {
-        long j = this.f2029id;
+        long j = this.f2034id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         List<OAuthScope> list = this.scopes;
         int i2 = 0;
@@ -94,7 +94,7 @@ public final class ModelOAuth2Token {
 
     public String toString() {
         StringBuilder L = a.L("ModelOAuth2Token(id=");
-        L.append(this.f2029id);
+        L.append(this.f2034id);
         L.append(", scopes=");
         L.append(this.scopes);
         L.append(", application=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelPayload.java b/app/src/main/java/com/discord/models/domain/ModelPayload.java
index 7b4a38c52b..8014f2b001 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPayload.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPayload.java
@@ -49,7 +49,7 @@ public class ModelPayload implements Model {
     private List<Guild> guilds;
 
     /* renamed from: me  reason: collision with root package name */
-    private User f2030me;
+    private User f2035me;
     private List<Presence> presences;
     private List<Channel> privateChannels;
     private VersionedReadStates readState;
@@ -329,7 +329,7 @@ public class ModelPayload implements Model {
 
     public ModelPayload(ModelPayload modelPayload) {
         this.v = modelPayload.v;
-        this.f2030me = modelPayload.f2030me;
+        this.f2035me = modelPayload.f2035me;
         this.userSettings = modelPayload.userSettings;
         this.userGuildSettings = modelPayload.userGuildSettings;
         this.sessionId = modelPayload.sessionId;
@@ -548,7 +548,7 @@ public class ModelPayload implements Model {
                 this.v = jsonReader.nextInt(this.v);
                 return;
             case '\n':
-                this.f2030me = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class);
+                this.f2035me = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class);
                 return;
             case 11:
                 this.users = jsonReader.nextList(new w(jsonReader));
@@ -762,7 +762,7 @@ public class ModelPayload implements Model {
     }
 
     public User getMe() {
-        return this.f2030me;
+        return this.f2035me;
     }
 
     public List<Presence> getPresences() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
index 72f933c765..61c90a6312 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java
@@ -15,7 +15,7 @@ public abstract class ModelPaymentSource {
     private final boolean f4default;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2031id;
+    private final String f2036id;
     private final boolean invalid;
 
     /* compiled from: ModelPaymentSource.kt */
@@ -61,7 +61,7 @@ public abstract class ModelPaymentSource {
         private final int expiresYear;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2032id;
+        private final String f2037id;
         private final boolean invalid;
         private final String last4;
 
@@ -76,7 +76,7 @@ public abstract class ModelPaymentSource {
             this.last4 = str2;
             this.expiresMonth = i;
             this.expiresYear = i2;
-            this.f2032id = str3;
+            this.f2037id = str3;
             this.invalid = z2;
             this.billingAddress = modelBillingAddress;
             this.f5default = z3;
@@ -161,7 +161,7 @@ public abstract class ModelPaymentSource {
 
         @Override // com.discord.models.domain.ModelPaymentSource
         public String getId() {
-            return this.f2032id;
+            return this.f2037id;
         }
 
         @Override // com.discord.models.domain.ModelPaymentSource
@@ -233,7 +233,7 @@ public abstract class ModelPaymentSource {
         private final String email;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2033id;
+        private final String f2038id;
         private final boolean invalid;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -243,7 +243,7 @@ public abstract class ModelPaymentSource {
             m.checkNotNullParameter(str2, "id");
             m.checkNotNullParameter(modelBillingAddress, "billingAddress");
             this.email = str;
-            this.f2033id = str2;
+            this.f2038id = str2;
             this.invalid = z2;
             this.billingAddress = modelBillingAddress;
             this.f6default = z3;
@@ -322,7 +322,7 @@ public abstract class ModelPaymentSource {
 
         @Override // com.discord.models.domain.ModelPaymentSource
         public String getId() {
-            return this.f2033id;
+            return this.f2038id;
         }
 
         @Override // com.discord.models.domain.ModelPaymentSource
@@ -383,7 +383,7 @@ public abstract class ModelPaymentSource {
     }
 
     private ModelPaymentSource(String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3) {
-        this.f2031id = str;
+        this.f2036id = str;
         this.invalid = z2;
         this.billingAddress = modelBillingAddress;
         this.f4default = z3;
@@ -402,7 +402,7 @@ public abstract class ModelPaymentSource {
     }
 
     public String getId() {
-        return this.f2031id;
+        return this.f2036id;
     }
 
     public boolean getInvalid() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java
index 46c9aecf56..60da832eb6 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java
@@ -6,18 +6,18 @@ public final class ModelPremiumGuildSubscription {
     private final long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2034id;
+    private final long f2039id;
     private final long userId;
 
     public ModelPremiumGuildSubscription(long j, long j2, long j3) {
-        this.f2034id = j;
+        this.f2039id = j;
         this.guildId = j2;
         this.userId = j3;
     }
 
     public static /* synthetic */ ModelPremiumGuildSubscription copy$default(ModelPremiumGuildSubscription modelPremiumGuildSubscription, long j, long j2, long j3, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelPremiumGuildSubscription.f2034id;
+            j = modelPremiumGuildSubscription.f2039id;
         }
         if ((i & 2) != 0) {
             j2 = modelPremiumGuildSubscription.guildId;
@@ -29,7 +29,7 @@ public final class ModelPremiumGuildSubscription {
     }
 
     public final long component1() {
-        return this.f2034id;
+        return this.f2039id;
     }
 
     public final long component2() {
@@ -52,7 +52,7 @@ public final class ModelPremiumGuildSubscription {
             return false;
         }
         ModelPremiumGuildSubscription modelPremiumGuildSubscription = (ModelPremiumGuildSubscription) obj;
-        return this.f2034id == modelPremiumGuildSubscription.f2034id && this.guildId == modelPremiumGuildSubscription.guildId && this.userId == modelPremiumGuildSubscription.userId;
+        return this.f2039id == modelPremiumGuildSubscription.f2039id && this.guildId == modelPremiumGuildSubscription.guildId && this.userId == modelPremiumGuildSubscription.userId;
     }
 
     public final long getGuildId() {
@@ -60,7 +60,7 @@ public final class ModelPremiumGuildSubscription {
     }
 
     public final long getId() {
-        return this.f2034id;
+        return this.f2039id;
     }
 
     public final long getUserId() {
@@ -68,7 +68,7 @@ public final class ModelPremiumGuildSubscription {
     }
 
     public int hashCode() {
-        long j = this.f2034id;
+        long j = this.f2039id;
         long j2 = this.guildId;
         long j3 = this.userId;
         return (((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)));
@@ -76,7 +76,7 @@ public final class ModelPremiumGuildSubscription {
 
     public String toString() {
         StringBuilder L = a.L("ModelPremiumGuildSubscription(id=");
-        L.append(this.f2034id);
+        L.append(this.f2039id);
         L.append(", guildId=");
         L.append(this.guildId);
         L.append(", userId=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java
index 9363049aad..595a2836bd 100644
--- a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java
+++ b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java
@@ -9,13 +9,13 @@ public final class ModelPremiumGuildSubscriptionSlot {
     private final String cooldownEndsAt;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2035id;
+    private final long f2040id;
     private final ModelPremiumGuildSubscription premiumGuildSubscription;
     private final long subscriptionId;
 
     public ModelPremiumGuildSubscriptionSlot(String str, long j, long j2, ModelPremiumGuildSubscription modelPremiumGuildSubscription, boolean z2) {
         this.cooldownEndsAt = str;
-        this.f2035id = j;
+        this.f2040id = j;
         this.subscriptionId = j2;
         this.premiumGuildSubscription = modelPremiumGuildSubscription;
         this.canceled = z2;
@@ -30,7 +30,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
             str = modelPremiumGuildSubscriptionSlot.cooldownEndsAt;
         }
         if ((i & 2) != 0) {
-            j = modelPremiumGuildSubscriptionSlot.f2035id;
+            j = modelPremiumGuildSubscriptionSlot.f2040id;
         }
         if ((i & 4) != 0) {
             j2 = modelPremiumGuildSubscriptionSlot.subscriptionId;
@@ -45,7 +45,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
     }
 
     public final long component2() {
-        return this.f2035id;
+        return this.f2040id;
     }
 
     public final long component3() {
@@ -72,7 +72,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
             return false;
         }
         ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot = (ModelPremiumGuildSubscriptionSlot) obj;
-        return m.areEqual(this.cooldownEndsAt, modelPremiumGuildSubscriptionSlot.cooldownEndsAt) && this.f2035id == modelPremiumGuildSubscriptionSlot.f2035id && this.subscriptionId == modelPremiumGuildSubscriptionSlot.subscriptionId && m.areEqual(this.premiumGuildSubscription, modelPremiumGuildSubscriptionSlot.premiumGuildSubscription) && this.canceled == modelPremiumGuildSubscriptionSlot.canceled;
+        return m.areEqual(this.cooldownEndsAt, modelPremiumGuildSubscriptionSlot.cooldownEndsAt) && this.f2040id == modelPremiumGuildSubscriptionSlot.f2040id && this.subscriptionId == modelPremiumGuildSubscriptionSlot.subscriptionId && m.areEqual(this.premiumGuildSubscription, modelPremiumGuildSubscriptionSlot.premiumGuildSubscription) && this.canceled == modelPremiumGuildSubscriptionSlot.canceled;
     }
 
     public final boolean getCanceled() {
@@ -84,7 +84,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
     }
 
     public final long getId() {
-        return this.f2035id;
+        return this.f2040id;
     }
 
     public final ModelPremiumGuildSubscription getPremiumGuildSubscription() {
@@ -99,7 +99,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
         String str = this.cooldownEndsAt;
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j = this.f2035id;
+        long j = this.f2040id;
         long j2 = this.subscriptionId;
         int i2 = ((((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         ModelPremiumGuildSubscription modelPremiumGuildSubscription = this.premiumGuildSubscription;
@@ -121,7 +121,7 @@ public final class ModelPremiumGuildSubscriptionSlot {
         StringBuilder L = a.L("ModelPremiumGuildSubscriptionSlot(cooldownEndsAt=");
         L.append(this.cooldownEndsAt);
         L.append(", id=");
-        L.append(this.f2035id);
+        L.append(this.f2040id);
         L.append(", subscriptionId=");
         L.append(this.subscriptionId);
         L.append(", premiumGuildSubscription=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java b/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java
index 4e4706a659..5cfdfdc6d7 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java
@@ -36,9 +36,9 @@ public final class ModelSearchResponse$hits$2 extends o implements Function0<Lis
                         break;
                     }
                     obj = it2.next();
-                    Boolean q = ((Message) obj).q();
-                    if (q != null) {
-                        z2 = q.booleanValue();
+                    Boolean n = ((Message) obj).n();
+                    if (n != null) {
+                        z2 = n.booleanValue();
                         continue;
                     } else {
                         z2 = false;
diff --git a/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java b/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java
index 2103c1efc2..ca77cf16c2 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java
@@ -28,8 +28,9 @@ public final class ModelSearchResponse {
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List<? extends java.util.List<com.discord.api.message.Message>> */
+    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List<? extends com.discord.api.thread.ThreadMember> */
     /* JADX WARN: Multi-variable type inference failed */
-    public ModelSearchResponse(int i, List<? extends List<Message>> list, List<Channel> list2, List<ThreadMember> list3, String str, String str2, Integer num, Integer num2, Integer num3) {
+    public ModelSearchResponse(int i, List<? extends List<Message>> list, List<Channel> list2, List<? extends ThreadMember> list3, String str, String str2, Integer num, Integer num2, Integer num3) {
         this.totalResults = i;
         this.messages = list;
         this.threads = list2;
@@ -88,7 +89,7 @@ public final class ModelSearchResponse {
         return this.documentIndexed;
     }
 
-    public final ModelSearchResponse copy(int i, List<? extends List<Message>> list, List<Channel> list2, List<ThreadMember> list3, String str, String str2, Integer num, Integer num2, Integer num3) {
+    public final ModelSearchResponse copy(int i, List<? extends List<Message>> list, List<Channel> list2, List<? extends ThreadMember> list3, String str, String str2, Integer num, Integer num2, Integer num3) {
         return new ModelSearchResponse(i, list, list2, list3, str, str2, num, num2, num3);
     }
 
diff --git a/app/src/main/java/com/discord/models/domain/ModelSku.java b/app/src/main/java/com/discord/models/domain/ModelSku.java
index 2e8ab9c05c..f339b44b06 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSku.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSku.java
@@ -16,7 +16,7 @@ public final class ModelSku {
     private final int flags;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2036id;
+    private final long f2041id;
     private final String name;
     private final boolean premium;
     private final Price price;
@@ -359,7 +359,7 @@ public final class ModelSku {
         m.checkNotNullParameter(str, "name");
         this.applicationId = j;
         this.name = str;
-        this.f2036id = j2;
+        this.f2041id = j2;
         this.application = application;
         this.premium = z2;
         this.type = i;
@@ -369,7 +369,7 @@ public final class ModelSku {
     }
 
     public static /* synthetic */ ModelSku copy$default(ModelSku modelSku, long j, String str, long j2, Application application, boolean z2, int i, Price price, int i2, Map map, int i3, Object obj) {
-        return modelSku.copy((i3 & 1) != 0 ? modelSku.applicationId : j, (i3 & 2) != 0 ? modelSku.name : str, (i3 & 4) != 0 ? modelSku.f2036id : j2, (i3 & 8) != 0 ? modelSku.application : application, (i3 & 16) != 0 ? modelSku.premium : z2, (i3 & 32) != 0 ? modelSku.type : i, (i3 & 64) != 0 ? modelSku.price : price, (i3 & 128) != 0 ? modelSku.flags : i2, (i3 & 256) != 0 ? modelSku.externalSkuStrategies : map);
+        return modelSku.copy((i3 & 1) != 0 ? modelSku.applicationId : j, (i3 & 2) != 0 ? modelSku.name : str, (i3 & 4) != 0 ? modelSku.f2041id : j2, (i3 & 8) != 0 ? modelSku.application : application, (i3 & 16) != 0 ? modelSku.premium : z2, (i3 & 32) != 0 ? modelSku.type : i, (i3 & 64) != 0 ? modelSku.price : price, (i3 & 128) != 0 ? modelSku.flags : i2, (i3 & 256) != 0 ? modelSku.externalSkuStrategies : map);
     }
 
     public final long component1() {
@@ -381,7 +381,7 @@ public final class ModelSku {
     }
 
     public final long component3() {
-        return this.f2036id;
+        return this.f2041id;
     }
 
     public final Application component4() {
@@ -421,7 +421,7 @@ public final class ModelSku {
             return false;
         }
         ModelSku modelSku = (ModelSku) obj;
-        return this.applicationId == modelSku.applicationId && m.areEqual(this.name, modelSku.name) && this.f2036id == modelSku.f2036id && m.areEqual(this.application, modelSku.application) && this.premium == modelSku.premium && this.type == modelSku.type && m.areEqual(this.price, modelSku.price) && this.flags == modelSku.flags && m.areEqual(this.externalSkuStrategies, modelSku.externalSkuStrategies);
+        return this.applicationId == modelSku.applicationId && m.areEqual(this.name, modelSku.name) && this.f2041id == modelSku.f2041id && m.areEqual(this.application, modelSku.application) && this.premium == modelSku.premium && this.type == modelSku.type && m.areEqual(this.price, modelSku.price) && this.flags == modelSku.flags && m.areEqual(this.externalSkuStrategies, modelSku.externalSkuStrategies);
     }
 
     public final Application getApplication() {
@@ -441,7 +441,7 @@ public final class ModelSku {
     }
 
     public final long getId() {
-        return this.f2036id;
+        return this.f2041id;
     }
 
     public final String getName() {
@@ -457,7 +457,7 @@ public final class ModelSku {
     }
 
     public final SkuCategory getSkuCategory() {
-        long j = this.f2036id;
+        long j = this.f2041id;
         return j == ModelSkuKt.getPREMIUM_TIER_1_SKU_ID() ? SkuCategory.NITRO_CLASSIC : j == ModelSkuKt.getPREMIUM_TIER_2_SKU_ID() ? SkuCategory.NITRO : SkuCategory.GAME;
     }
 
@@ -471,7 +471,7 @@ public final class ModelSku {
         String str = this.name;
         int i2 = 0;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j2 = this.f2036id;
+        long j2 = this.f2041id;
         int i3 = (((i + hashCode) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31;
         Application application = this.application;
         int hashCode2 = (i3 + (application != null ? application.hashCode() : 0)) * 31;
@@ -506,7 +506,7 @@ public final class ModelSku {
         L.append(", name=");
         L.append(this.name);
         L.append(", id=");
-        L.append(this.f2036id);
+        L.append(this.f2041id);
         L.append(", application=");
         L.append(this.application);
         L.append(", premium=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelStoreListing.java b/app/src/main/java/com/discord/models/domain/ModelStoreListing.java
index ae30113e5c..18a68b3ab7 100644
--- a/app/src/main/java/com/discord/models/domain/ModelStoreListing.java
+++ b/app/src/main/java/com/discord/models/domain/ModelStoreListing.java
@@ -8,7 +8,7 @@ import kotlin.jvm.internal.Ref$ObjectRef;
 public final class ModelStoreListing {
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2037id;
+    private final long f2042id;
     private final ModelSku sku;
 
     /* compiled from: ModelStoreListing.kt */
@@ -35,7 +35,7 @@ public final class ModelStoreListing {
     public ModelStoreListing(ModelSku modelSku, long j) {
         m.checkNotNullParameter(modelSku, "sku");
         this.sku = modelSku;
-        this.f2037id = j;
+        this.f2042id = j;
     }
 
     public static /* synthetic */ ModelStoreListing copy$default(ModelStoreListing modelStoreListing, ModelSku modelSku, long j, int i, Object obj) {
@@ -43,7 +43,7 @@ public final class ModelStoreListing {
             modelSku = modelStoreListing.sku;
         }
         if ((i & 2) != 0) {
-            j = modelStoreListing.f2037id;
+            j = modelStoreListing.f2042id;
         }
         return modelStoreListing.copy(modelSku, j);
     }
@@ -53,7 +53,7 @@ public final class ModelStoreListing {
     }
 
     public final long component2() {
-        return this.f2037id;
+        return this.f2042id;
     }
 
     public final ModelStoreListing copy(ModelSku modelSku, long j) {
@@ -69,11 +69,11 @@ public final class ModelStoreListing {
             return false;
         }
         ModelStoreListing modelStoreListing = (ModelStoreListing) obj;
-        return m.areEqual(this.sku, modelStoreListing.sku) && this.f2037id == modelStoreListing.f2037id;
+        return m.areEqual(this.sku, modelStoreListing.sku) && this.f2042id == modelStoreListing.f2042id;
     }
 
     public final long getId() {
-        return this.f2037id;
+        return this.f2042id;
     }
 
     public final ModelSku getSku() {
@@ -83,7 +83,7 @@ public final class ModelStoreListing {
     public int hashCode() {
         ModelSku modelSku = this.sku;
         int hashCode = modelSku != null ? modelSku.hashCode() : 0;
-        long j = this.f2037id;
+        long j = this.f2042id;
         return (hashCode * 31) + ((int) (j ^ (j >>> 32)));
     }
 
@@ -91,6 +91,6 @@ public final class ModelStoreListing {
         StringBuilder L = a.L("ModelStoreListing(sku=");
         L.append(this.sku);
         L.append(", id=");
-        return a.A(L, this.f2037id, ")");
+        return a.A(L, this.f2042id, ")");
     }
 }
diff --git a/app/src/main/java/com/discord/models/domain/ModelSubscription.java b/app/src/main/java/com/discord/models/domain/ModelSubscription.java
index cbd19fae34..b0bbec2dc1 100644
--- a/app/src/main/java/com/discord/models/domain/ModelSubscription.java
+++ b/app/src/main/java/com/discord/models/domain/ModelSubscription.java
@@ -1,33 +1,26 @@
 package com.discord.models.domain;
 
 import c.d.b.a.a;
-import com.discord.api.premium.SubscriptionInterval;
 import com.discord.models.domain.premium.SubscriptionPlanType;
 import com.discord.utilities.time.TimeUtils;
-import d0.t.n;
-import d0.t.o;
 import d0.z.d.m;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: ModelSubscription.kt */
-public final class ModelSubscription {
-    private final List<SubscriptionAdditionalPlan> additionalPlans;
+public final class ModelSubscription extends HasSubscriptionItems {
     private final String canceledAt;
     private final String createdAt;
     private final String currentPeriodEnd;
     private final String currentPeriodStart;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2038id;
+    private final String f2043id;
     private final List<SubscriptionItem> items;
     private final Integer paymentGateway;
     private final String paymentGatewayPlanId;
     private final String paymentSourceId;
-    private final long planId;
     private final SubscriptionRenewalMutations renewalMutations;
     private final int status;
     private final String trialEndsAt;
@@ -209,19 +202,19 @@ public final class ModelSubscription {
     public static final class SubscriptionItem {
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2039id;
+        private final long f2044id;
         private final long planId;
         private final int quantity;
 
         public SubscriptionItem(long j, long j2, int i) {
-            this.f2039id = j;
+            this.f2044id = j;
             this.planId = j2;
             this.quantity = i;
         }
 
         public static /* synthetic */ SubscriptionItem copy$default(SubscriptionItem subscriptionItem, long j, long j2, int i, int i2, Object obj) {
             if ((i2 & 1) != 0) {
-                j = subscriptionItem.f2039id;
+                j = subscriptionItem.f2044id;
             }
             if ((i2 & 2) != 0) {
                 j2 = subscriptionItem.planId;
@@ -233,7 +226,7 @@ public final class ModelSubscription {
         }
 
         public final long component1() {
-            return this.f2039id;
+            return this.f2044id;
         }
 
         public final long component2() {
@@ -256,11 +249,11 @@ public final class ModelSubscription {
                 return false;
             }
             SubscriptionItem subscriptionItem = (SubscriptionItem) obj;
-            return this.f2039id == subscriptionItem.f2039id && this.planId == subscriptionItem.planId && this.quantity == subscriptionItem.quantity;
+            return this.f2044id == subscriptionItem.f2044id && this.planId == subscriptionItem.planId && this.quantity == subscriptionItem.quantity;
         }
 
         public final long getId() {
-            return this.f2039id;
+            return this.f2044id;
         }
 
         public final long getPlanId() {
@@ -272,14 +265,14 @@ public final class ModelSubscription {
         }
 
         public int hashCode() {
-            long j = this.f2039id;
+            long j = this.f2044id;
             long j2 = this.planId;
             return (((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.quantity;
         }
 
         public String toString() {
             StringBuilder L = a.L("SubscriptionItem(id=");
-            L.append(this.f2039id);
+            L.append(this.f2044id);
             L.append(", planId=");
             L.append(this.planId);
             L.append(", quantity=");
@@ -288,11 +281,9 @@ public final class ModelSubscription {
     }
 
     /* compiled from: ModelSubscription.kt */
-    public static final class SubscriptionRenewalMutations {
-        private List<SubscriptionAdditionalPlan> additionalPlans = n.emptyList();
+    public static final class SubscriptionRenewalMutations extends HasSubscriptionItems {
         private final List<SubscriptionItem> items;
         private final String paymentGatewayPlanId;
-        private long planId;
 
         public SubscriptionRenewalMutations(List<SubscriptionItem> list, String str) {
             m.checkNotNullParameter(list, "items");
@@ -304,7 +295,7 @@ public final class ModelSubscription {
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ SubscriptionRenewalMutations copy$default(SubscriptionRenewalMutations subscriptionRenewalMutations, List list, String str, int i, Object obj) {
             if ((i & 1) != 0) {
-                list = subscriptionRenewalMutations.items;
+                list = subscriptionRenewalMutations.getItems();
             }
             if ((i & 2) != 0) {
                 str = subscriptionRenewalMutations.paymentGatewayPlanId;
@@ -312,14 +303,8 @@ public final class ModelSubscription {
             return subscriptionRenewalMutations.copy(list, str);
         }
 
-        public static /* synthetic */ void getAdditionalPlans$annotations() {
-        }
-
-        public static /* synthetic */ void getPlanId$annotations() {
-        }
-
         public final List<SubscriptionItem> component1() {
-            return this.items;
+            return getItems();
         }
 
         public final String component2() {
@@ -339,14 +324,11 @@ public final class ModelSubscription {
                 return false;
             }
             SubscriptionRenewalMutations subscriptionRenewalMutations = (SubscriptionRenewalMutations) obj;
-            return m.areEqual(this.items, subscriptionRenewalMutations.items) && m.areEqual(this.paymentGatewayPlanId, subscriptionRenewalMutations.paymentGatewayPlanId);
+            return m.areEqual(getItems(), subscriptionRenewalMutations.getItems()) && m.areEqual(this.paymentGatewayPlanId, subscriptionRenewalMutations.paymentGatewayPlanId);
         }
 
-        public final List<SubscriptionAdditionalPlan> getAdditionalPlans() {
-            return this.additionalPlans;
-        }
-
-        public final List<SubscriptionItem> getItems() {
+        @Override // com.discord.models.domain.HasSubscriptionItems
+        public List<SubscriptionItem> getItems() {
             return this.items;
         }
 
@@ -354,14 +336,10 @@ public final class ModelSubscription {
             return this.paymentGatewayPlanId;
         }
 
-        public final long getPlanId() {
-            return this.planId;
-        }
-
         public int hashCode() {
-            List<SubscriptionItem> list = this.items;
+            List<SubscriptionItem> items = getItems();
             int i = 0;
-            int hashCode = (list != null ? list.hashCode() : 0) * 31;
+            int hashCode = (items != null ? items.hashCode() : 0) * 31;
             String str = this.paymentGatewayPlanId;
             if (str != null) {
                 i = str.hashCode();
@@ -369,18 +347,9 @@ public final class ModelSubscription {
             return hashCode + i;
         }
 
-        public final void setAdditionalPlans(List<SubscriptionAdditionalPlan> list) {
-            m.checkNotNullParameter(list, "<set-?>");
-            this.additionalPlans = list;
-        }
-
-        public final void setPlanId(long j) {
-            this.planId = j;
-        }
-
         public String toString() {
             StringBuilder L = a.L("SubscriptionRenewalMutations(items=");
-            L.append(this.items);
+            L.append(getItems());
             L.append(", paymentGatewayPlanId=");
             return a.D(L, this.paymentGatewayPlanId, ")");
         }
@@ -388,7 +357,8 @@ public final class ModelSubscription {
 
     /* compiled from: ModelSubscription.kt */
     public enum Type {
-        PREMIUM;
+        PREMIUM,
+        GUILD;
         
         public static final Companion Companion = new Companion(null);
 
@@ -405,6 +375,9 @@ public final class ModelSubscription {
                 if (i == 1) {
                     return Type.PREMIUM;
                 }
+                if (i == 2) {
+                    return Type.GUILD;
+                }
                 throw new IllegalArgumentException(a.l("unsupported subscription type: ", i));
             }
         }
@@ -416,7 +389,7 @@ public final class ModelSubscription {
         m.checkNotNullParameter(str4, "currentPeriodStart");
         m.checkNotNullParameter(str5, "currentPeriodEnd");
         m.checkNotNullParameter(list, "items");
-        this.f2038id = str;
+        this.f2043id = str;
         this.createdAt = str2;
         this.canceledAt = str3;
         this.currentPeriodStart = str4;
@@ -430,43 +403,6 @@ public final class ModelSubscription {
         this.paymentGatewayPlanId = str9;
         this.status = i;
         this.type = i2;
-        SubscriptionPlanType.Companion companion = SubscriptionPlanType.Companion;
-        SubscriptionInterval interval = companion.from(list.get(0).getPlanId()).getInterval();
-        this.planId = companion.getBasePlanFromSubscriptionItems(list, interval).getPlanId();
-        ArrayList<SubscriptionItem> arrayList = new ArrayList();
-        Iterator<T> it = list.iterator();
-        while (true) {
-            boolean z2 = true;
-            if (!it.hasNext()) {
-                break;
-            }
-            Object next = it.next();
-            if (((SubscriptionItem) next).getPlanId() == this.planId ? false : z2) {
-                arrayList.add(next);
-            }
-        }
-        ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10));
-        for (SubscriptionItem subscriptionItem : arrayList) {
-            arrayList2.add(new SubscriptionAdditionalPlan(subscriptionItem.getPlanId(), subscriptionItem.getQuantity()));
-        }
-        this.additionalPlans = arrayList2;
-        SubscriptionRenewalMutations subscriptionRenewalMutations2 = this.renewalMutations;
-        if (subscriptionRenewalMutations2 != null) {
-            subscriptionRenewalMutations2.setPlanId(SubscriptionPlanType.Companion.getBasePlanFromSubscriptionItems(subscriptionRenewalMutations2.getItems(), interval).getPlanId());
-            SubscriptionRenewalMutations subscriptionRenewalMutations3 = this.renewalMutations;
-            List<SubscriptionItem> items = subscriptionRenewalMutations3.getItems();
-            ArrayList<SubscriptionItem> arrayList3 = new ArrayList();
-            for (Object obj : items) {
-                if (((SubscriptionItem) obj).getPlanId() != this.renewalMutations.getPlanId()) {
-                    arrayList3.add(obj);
-                }
-            }
-            ArrayList arrayList4 = new ArrayList(o.collectionSizeOrDefault(arrayList3, 10));
-            for (SubscriptionItem subscriptionItem2 : arrayList3) {
-                arrayList4.add(new SubscriptionAdditionalPlan(subscriptionItem2.getPlanId(), subscriptionItem2.getQuantity()));
-            }
-            subscriptionRenewalMutations3.setAdditionalPlans(arrayList4);
-        }
     }
 
     private final int component13() {
@@ -478,17 +414,11 @@ public final class ModelSubscription {
     }
 
     public static /* synthetic */ ModelSubscription copy$default(ModelSubscription modelSubscription, String str, String str2, String str3, String str4, String str5, String str6, Integer num, String str7, String str8, SubscriptionRenewalMutations subscriptionRenewalMutations, List list, String str9, int i, int i2, int i3, Object obj) {
-        return modelSubscription.copy((i3 & 1) != 0 ? modelSubscription.f2038id : str, (i3 & 2) != 0 ? modelSubscription.createdAt : str2, (i3 & 4) != 0 ? modelSubscription.canceledAt : str3, (i3 & 8) != 0 ? modelSubscription.currentPeriodStart : str4, (i3 & 16) != 0 ? modelSubscription.currentPeriodEnd : str5, (i3 & 32) != 0 ? modelSubscription.paymentSourceId : str6, (i3 & 64) != 0 ? modelSubscription.paymentGateway : num, (i3 & 128) != 0 ? modelSubscription.trialId : str7, (i3 & 256) != 0 ? modelSubscription.trialEndsAt : str8, (i3 & 512) != 0 ? modelSubscription.renewalMutations : subscriptionRenewalMutations, (i3 & 1024) != 0 ? modelSubscription.items : list, (i3 & 2048) != 0 ? modelSubscription.paymentGatewayPlanId : str9, (i3 & 4096) != 0 ? modelSubscription.status : i, (i3 & 8192) != 0 ? modelSubscription.type : i2);
-    }
-
-    public static /* synthetic */ void getAdditionalPlans$annotations() {
-    }
-
-    public static /* synthetic */ void getPlanId$annotations() {
+        return modelSubscription.copy((i3 & 1) != 0 ? modelSubscription.f2043id : str, (i3 & 2) != 0 ? modelSubscription.createdAt : str2, (i3 & 4) != 0 ? modelSubscription.canceledAt : str3, (i3 & 8) != 0 ? modelSubscription.currentPeriodStart : str4, (i3 & 16) != 0 ? modelSubscription.currentPeriodEnd : str5, (i3 & 32) != 0 ? modelSubscription.paymentSourceId : str6, (i3 & 64) != 0 ? modelSubscription.paymentGateway : num, (i3 & 128) != 0 ? modelSubscription.trialId : str7, (i3 & 256) != 0 ? modelSubscription.trialEndsAt : str8, (i3 & 512) != 0 ? modelSubscription.renewalMutations : subscriptionRenewalMutations, (i3 & 1024) != 0 ? modelSubscription.getItems() : list, (i3 & 2048) != 0 ? modelSubscription.paymentGatewayPlanId : str9, (i3 & 4096) != 0 ? modelSubscription.status : i, (i3 & 8192) != 0 ? modelSubscription.type : i2);
     }
 
     public final String component1() {
-        return this.f2038id;
+        return this.f2043id;
     }
 
     public final SubscriptionRenewalMutations component10() {
@@ -496,7 +426,7 @@ public final class ModelSubscription {
     }
 
     public final List<SubscriptionItem> component11() {
-        return this.items;
+        return getItems();
     }
 
     public final String component12() {
@@ -552,17 +482,13 @@ public final class ModelSubscription {
             return false;
         }
         ModelSubscription modelSubscription = (ModelSubscription) obj;
-        return m.areEqual(this.f2038id, modelSubscription.f2038id) && m.areEqual(this.createdAt, modelSubscription.createdAt) && m.areEqual(this.canceledAt, modelSubscription.canceledAt) && m.areEqual(this.currentPeriodStart, modelSubscription.currentPeriodStart) && m.areEqual(this.currentPeriodEnd, modelSubscription.currentPeriodEnd) && m.areEqual(this.paymentSourceId, modelSubscription.paymentSourceId) && m.areEqual(this.paymentGateway, modelSubscription.paymentGateway) && m.areEqual(this.trialId, modelSubscription.trialId) && m.areEqual(this.trialEndsAt, modelSubscription.trialEndsAt) && m.areEqual(this.renewalMutations, modelSubscription.renewalMutations) && m.areEqual(this.items, modelSubscription.items) && m.areEqual(this.paymentGatewayPlanId, modelSubscription.paymentGatewayPlanId) && this.status == modelSubscription.status && this.type == modelSubscription.type;
+        return m.areEqual(this.f2043id, modelSubscription.f2043id) && m.areEqual(this.createdAt, modelSubscription.createdAt) && m.areEqual(this.canceledAt, modelSubscription.canceledAt) && m.areEqual(this.currentPeriodStart, modelSubscription.currentPeriodStart) && m.areEqual(this.currentPeriodEnd, modelSubscription.currentPeriodEnd) && m.areEqual(this.paymentSourceId, modelSubscription.paymentSourceId) && m.areEqual(this.paymentGateway, modelSubscription.paymentGateway) && m.areEqual(this.trialId, modelSubscription.trialId) && m.areEqual(this.trialEndsAt, modelSubscription.trialEndsAt) && m.areEqual(this.renewalMutations, modelSubscription.renewalMutations) && m.areEqual(getItems(), modelSubscription.getItems()) && m.areEqual(this.paymentGatewayPlanId, modelSubscription.paymentGatewayPlanId) && this.status == modelSubscription.status && this.type == modelSubscription.type;
     }
 
     public final long getAccountHoldEstimatedExpirationTimestamp() {
         return TimeUtils.addDaysToDate(this.currentPeriodEnd, 30);
     }
 
-    public final List<SubscriptionAdditionalPlan> getAdditionalPlans() {
-        return this.additionalPlans;
-    }
-
     public final String getCanceledAt() {
         return this.canceledAt;
     }
@@ -580,10 +506,11 @@ public final class ModelSubscription {
     }
 
     public final String getId() {
-        return this.f2038id;
+        return this.f2043id;
     }
 
-    public final List<SubscriptionItem> getItems() {
+    @Override // com.discord.models.domain.HasSubscriptionItems
+    public List<SubscriptionItem> getItems() {
         return this.items;
     }
 
@@ -599,12 +526,8 @@ public final class ModelSubscription {
         return this.paymentSourceId;
     }
 
-    public final long getPlanId() {
-        return this.planId;
-    }
-
     public final SubscriptionPlanType getPlanType() {
-        return SubscriptionPlanType.Companion.from(this.planId);
+        return SubscriptionPlanType.Companion.from(getPremiumBasePlanId());
     }
 
     public final SubscriptionRenewalMutations getRenewalMutations() {
@@ -629,11 +552,11 @@ public final class ModelSubscription {
 
     public final boolean hasAnyOfPlans(Set<Long> set) {
         m.checkNotNullParameter(set, "planIds");
-        List<SubscriptionItem> list = this.items;
-        if ((list instanceof Collection) && list.isEmpty()) {
+        List<SubscriptionItem> items = getItems();
+        if ((items instanceof Collection) && items.isEmpty()) {
             return false;
         }
-        for (SubscriptionItem subscriptionItem : list) {
+        for (SubscriptionItem subscriptionItem : items) {
             if (set.contains(Long.valueOf(subscriptionItem.getPlanId()))) {
                 return true;
             }
@@ -641,8 +564,28 @@ public final class ModelSubscription {
         return false;
     }
 
+    public final boolean hasPlan(long j) {
+        boolean z2;
+        List<SubscriptionItem> items = getItems();
+        if (!(items instanceof Collection) || !items.isEmpty()) {
+            for (SubscriptionItem subscriptionItem : items) {
+                if (subscriptionItem.getPlanId() == j) {
+                    z2 = true;
+                    continue;
+                } else {
+                    z2 = false;
+                    continue;
+                }
+                if (z2) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     public int hashCode() {
-        String str = this.f2038id;
+        String str = this.f2043id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.createdAt;
@@ -663,8 +606,8 @@ public final class ModelSubscription {
         int hashCode9 = (hashCode8 + (str8 != null ? str8.hashCode() : 0)) * 31;
         SubscriptionRenewalMutations subscriptionRenewalMutations = this.renewalMutations;
         int hashCode10 = (hashCode9 + (subscriptionRenewalMutations != null ? subscriptionRenewalMutations.hashCode() : 0)) * 31;
-        List<SubscriptionItem> list = this.items;
-        int hashCode11 = (hashCode10 + (list != null ? list.hashCode() : 0)) * 31;
+        List<SubscriptionItem> items = getItems();
+        int hashCode11 = (hashCode10 + (items != null ? items.hashCode() : 0)) * 31;
         String str9 = this.paymentGatewayPlanId;
         if (str9 != null) {
             i = str9.hashCode();
@@ -686,7 +629,7 @@ public final class ModelSubscription {
 
     public String toString() {
         StringBuilder L = a.L("ModelSubscription(id=");
-        L.append(this.f2038id);
+        L.append(this.f2043id);
         L.append(", createdAt=");
         L.append(this.createdAt);
         L.append(", canceledAt=");
@@ -706,7 +649,7 @@ public final class ModelSubscription {
         L.append(", renewalMutations=");
         L.append(this.renewalMutations);
         L.append(", items=");
-        L.append(this.items);
+        L.append(getItems());
         L.append(", paymentGatewayPlanId=");
         L.append(this.paymentGatewayPlanId);
         L.append(", status=");
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserNote.java b/app/src/main/java/com/discord/models/domain/ModelUserNote.java
index 4c86fb8557..c0f4ecb5b0 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserNote.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserNote.java
@@ -14,7 +14,7 @@ public final class ModelUserNote {
     public static final class Update {
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2040id;
+        private final long f2045id;
         private final String note;
 
         /* compiled from: ModelUserNote.kt */
@@ -38,13 +38,13 @@ public final class ModelUserNote {
 
         public Update(long j, String str) {
             m.checkNotNullParameter(str, "note");
-            this.f2040id = j;
+            this.f2045id = j;
             this.note = str;
         }
 
         public static /* synthetic */ Update copy$default(Update update, long j, String str, int i, Object obj) {
             if ((i & 1) != 0) {
-                j = update.f2040id;
+                j = update.f2045id;
             }
             if ((i & 2) != 0) {
                 str = update.note;
@@ -53,7 +53,7 @@ public final class ModelUserNote {
         }
 
         public final long component1() {
-            return this.f2040id;
+            return this.f2045id;
         }
 
         public final String component2() {
@@ -73,11 +73,11 @@ public final class ModelUserNote {
                 return false;
             }
             Update update = (Update) obj;
-            return this.f2040id == update.f2040id && m.areEqual(this.note, update.note);
+            return this.f2045id == update.f2045id && m.areEqual(this.note, update.note);
         }
 
         public final long getId() {
-            return this.f2040id;
+            return this.f2045id;
         }
 
         public final String getNote() {
@@ -85,7 +85,7 @@ public final class ModelUserNote {
         }
 
         public int hashCode() {
-            long j = this.f2040id;
+            long j = this.f2045id;
             int i = ((int) (j ^ (j >>> 32))) * 31;
             String str = this.note;
             return i + (str != null ? str.hashCode() : 0);
@@ -93,7 +93,7 @@ public final class ModelUserNote {
 
         public String toString() {
             StringBuilder L = a.L("Update(id=");
-            L.append(this.f2040id);
+            L.append(this.f2045id);
             L.append(", note=");
             return a.D(L, this.note, ")");
         }
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserProfile.java b/app/src/main/java/com/discord/models/domain/ModelUserProfile.java
index 6dcd65cd05..27d9a29400 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserProfile.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserProfile.java
@@ -97,6 +97,18 @@ public class ModelUserProfile implements Model {
         this.connectedAccounts = list;
     }
 
+    public ModelUserProfile(List<ModelConnectedAccount> list, Map<Long, GuildReference> map, User user, String str, String str2) {
+        NullSerializable.a aVar = new NullSerializable.a(null);
+        NullSerializable.a aVar2 = new NullSerializable.a(null);
+        Boolean bool = Boolean.FALSE;
+        this.user = new User(0, "", aVar, aVar2, "0001", 0, 0, bool, bool, "", "", bool, "", NsfwAllowance.UNKNOWN, bool, null, null, PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY, 0, null, null, null);
+        this.connectedAccounts = list;
+        this.mutualGuilds = map;
+        this.user = user;
+        this.premiumSince = str;
+        this.premiumGuildSince = str2;
+    }
+
     public static ModelUserProfile createForTesting(List<ModelConnectedAccount> list) {
         return new ModelUserProfile(list);
     }
diff --git a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
index 2f71ed5c98..0255a3378a 100644
--- a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
+++ b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java
@@ -14,7 +14,7 @@ public class ModelUserRelationship implements Model {
     public static final int TYPE_NONE = 0;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2041id;
+    private long f2046id;
     private int type;
     private User user;
     private Long userId;
@@ -23,14 +23,14 @@ public class ModelUserRelationship implements Model {
     }
 
     public ModelUserRelationship(long j, int i, User user, Long l) {
-        this.f2041id = j;
+        this.f2046id = j;
         this.type = i;
         this.user = user;
         this.userId = l;
     }
 
     public ModelUserRelationship(ModelUserRelationship modelUserRelationship) {
-        this(modelUserRelationship.f2041id, modelUserRelationship.type, modelUserRelationship.user, modelUserRelationship.userId);
+        this(modelUserRelationship.f2046id, modelUserRelationship.type, modelUserRelationship.user, modelUserRelationship.userId);
     }
 
     public static int getType(Integer num) {
@@ -80,7 +80,7 @@ public class ModelUserRelationship implements Model {
                 this.userId = jsonReader.nextLongOrNull();
                 return;
             case 1:
-                this.f2041id = jsonReader.nextLong(this.f2041id);
+                this.f2046id = jsonReader.nextLong(this.f2046id);
                 return;
             case 2:
                 this.type = jsonReader.nextInt(this.type);
@@ -120,7 +120,7 @@ public class ModelUserRelationship implements Model {
     }
 
     public long getId() {
-        return this.f2041id;
+        return this.f2046id;
     }
 
     public int getType() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
index 7e74bdd9c7..636c299f5f 100644
--- a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
+++ b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java
@@ -7,7 +7,7 @@ public class ModelVoiceRegion implements Model {
     private boolean deprecated;
 
     /* renamed from: id  reason: collision with root package name */
-    private String f2042id;
+    private String f2047id;
     private String name;
     private boolean optimal;
     private String sampleHostname;
@@ -64,7 +64,7 @@ public class ModelVoiceRegion implements Model {
                 this.optimal = jsonReader.nextBoolean(this.optimal);
                 return;
             case 2:
-                this.f2042id = jsonReader.nextString(this.f2042id);
+                this.f2047id = jsonReader.nextString(this.f2047id);
                 return;
             case 3:
                 this.name = jsonReader.nextString(this.name);
@@ -112,7 +112,7 @@ public class ModelVoiceRegion implements Model {
     }
 
     public String getId() {
-        return this.f2042id;
+        return this.f2047id;
     }
 
     public String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/ModelWebhook.java b/app/src/main/java/com/discord/models/domain/ModelWebhook.java
index 058d4a1cfc..3ba04004f2 100644
--- a/app/src/main/java/com/discord/models/domain/ModelWebhook.java
+++ b/app/src/main/java/com/discord/models/domain/ModelWebhook.java
@@ -9,7 +9,7 @@ public class ModelWebhook implements Model {
     private long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2043id;
+    private long f2048id;
     private String name;
 
     @Override // com.discord.models.domain.Model
@@ -60,7 +60,7 @@ public class ModelWebhook implements Model {
                 this.guildId = jsonReader.nextLong(this.guildId);
                 return;
             case 3:
-                this.f2043id = jsonReader.nextLong(this.f2043id);
+                this.f2048id = jsonReader.nextLong(this.f2048id);
                 return;
             case 4:
                 this.name = jsonReader.nextString(this.name);
@@ -109,7 +109,7 @@ public class ModelWebhook implements Model {
     }
 
     public long getId() {
-        return this.f2043id;
+        return this.f2048id;
     }
 
     public String getName() {
diff --git a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
index 52e4040c24..c5355fd002 100644
--- a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
+++ b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java
@@ -15,7 +15,7 @@ public final class PaymentSourceRaw {
     private final int expiresYear;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2044id;
+    private final String f2049id;
     private final boolean invalid;
     private final String last_4;
     private final int type;
@@ -24,7 +24,7 @@ public final class PaymentSourceRaw {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(modelBillingAddress, "billingAddress");
         this.type = i;
-        this.f2044id = str;
+        this.f2049id = str;
         this.invalid = z2;
         this.billingAddress = modelBillingAddress;
         this.f8default = z3;
@@ -36,7 +36,7 @@ public final class PaymentSourceRaw {
     }
 
     public static /* synthetic */ PaymentSourceRaw copy$default(PaymentSourceRaw paymentSourceRaw, int i, String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3, String str2, String str3, String str4, int i2, int i3, int i4, Object obj) {
-        return paymentSourceRaw.copy((i4 & 1) != 0 ? paymentSourceRaw.type : i, (i4 & 2) != 0 ? paymentSourceRaw.f2044id : str, (i4 & 4) != 0 ? paymentSourceRaw.invalid : z2, (i4 & 8) != 0 ? paymentSourceRaw.billingAddress : modelBillingAddress, (i4 & 16) != 0 ? paymentSourceRaw.f8default : z3, (i4 & 32) != 0 ? paymentSourceRaw.email : str2, (i4 & 64) != 0 ? paymentSourceRaw.brand : str3, (i4 & 128) != 0 ? paymentSourceRaw.last_4 : str4, (i4 & 256) != 0 ? paymentSourceRaw.expiresMonth : i2, (i4 & 512) != 0 ? paymentSourceRaw.expiresYear : i3);
+        return paymentSourceRaw.copy((i4 & 1) != 0 ? paymentSourceRaw.type : i, (i4 & 2) != 0 ? paymentSourceRaw.f2049id : str, (i4 & 4) != 0 ? paymentSourceRaw.invalid : z2, (i4 & 8) != 0 ? paymentSourceRaw.billingAddress : modelBillingAddress, (i4 & 16) != 0 ? paymentSourceRaw.f8default : z3, (i4 & 32) != 0 ? paymentSourceRaw.email : str2, (i4 & 64) != 0 ? paymentSourceRaw.brand : str3, (i4 & 128) != 0 ? paymentSourceRaw.last_4 : str4, (i4 & 256) != 0 ? paymentSourceRaw.expiresMonth : i2, (i4 & 512) != 0 ? paymentSourceRaw.expiresYear : i3);
     }
 
     public final int component1() {
@@ -48,7 +48,7 @@ public final class PaymentSourceRaw {
     }
 
     public final String component2() {
-        return this.f2044id;
+        return this.f2049id;
     }
 
     public final boolean component3() {
@@ -93,7 +93,7 @@ public final class PaymentSourceRaw {
             return false;
         }
         PaymentSourceRaw paymentSourceRaw = (PaymentSourceRaw) obj;
-        return this.type == paymentSourceRaw.type && m.areEqual(this.f2044id, paymentSourceRaw.f2044id) && this.invalid == paymentSourceRaw.invalid && m.areEqual(this.billingAddress, paymentSourceRaw.billingAddress) && this.f8default == paymentSourceRaw.f8default && m.areEqual(this.email, paymentSourceRaw.email) && m.areEqual(this.brand, paymentSourceRaw.brand) && m.areEqual(this.last_4, paymentSourceRaw.last_4) && this.expiresMonth == paymentSourceRaw.expiresMonth && this.expiresYear == paymentSourceRaw.expiresYear;
+        return this.type == paymentSourceRaw.type && m.areEqual(this.f2049id, paymentSourceRaw.f2049id) && this.invalid == paymentSourceRaw.invalid && m.areEqual(this.billingAddress, paymentSourceRaw.billingAddress) && this.f8default == paymentSourceRaw.f8default && m.areEqual(this.email, paymentSourceRaw.email) && m.areEqual(this.brand, paymentSourceRaw.brand) && m.areEqual(this.last_4, paymentSourceRaw.last_4) && this.expiresMonth == paymentSourceRaw.expiresMonth && this.expiresYear == paymentSourceRaw.expiresYear;
     }
 
     public final ModelBillingAddress getBillingAddress() {
@@ -121,7 +121,7 @@ public final class PaymentSourceRaw {
     }
 
     public final String getId() {
-        return this.f2044id;
+        return this.f2049id;
     }
 
     public final boolean getInvalid() {
@@ -138,7 +138,7 @@ public final class PaymentSourceRaw {
 
     public int hashCode() {
         int i = this.type * 31;
-        String str = this.f2044id;
+        String str = this.f2049id;
         int i2 = 0;
         int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31;
         boolean z2 = this.invalid;
@@ -172,7 +172,7 @@ public final class PaymentSourceRaw {
         StringBuilder L = a.L("PaymentSourceRaw(type=");
         L.append(this.type);
         L.append(", id=");
-        L.append(this.f2044id);
+        L.append(this.f2049id);
         L.append(", invalid=");
         L.append(this.invalid);
         L.append(", billingAddress=");
diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java b/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java
index 041ef83a75..db6060b43b 100644
--- a/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java
+++ b/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java
@@ -9,7 +9,7 @@ public final class ModelInvoiceItem {
     private final List<ModelInvoiceDiscount> discount;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2045id;
+    private final long f2050id;
     private final boolean proration;
     private final int quantity;
     private final long subscriptionPlanId;
@@ -19,7 +19,7 @@ public final class ModelInvoiceItem {
         m.checkNotNullParameter(list, "discount");
         this.amount = i;
         this.discount = list;
-        this.f2045id = j;
+        this.f2050id = j;
         this.proration = z2;
         this.quantity = i2;
         this.subscriptionPlanId = j2;
@@ -27,7 +27,7 @@ public final class ModelInvoiceItem {
     }
 
     public static /* synthetic */ ModelInvoiceItem copy$default(ModelInvoiceItem modelInvoiceItem, int i, List list, long j, boolean z2, int i2, long j2, int i3, int i4, Object obj) {
-        return modelInvoiceItem.copy((i4 & 1) != 0 ? modelInvoiceItem.amount : i, (i4 & 2) != 0 ? modelInvoiceItem.discount : list, (i4 & 4) != 0 ? modelInvoiceItem.f2045id : j, (i4 & 8) != 0 ? modelInvoiceItem.proration : z2, (i4 & 16) != 0 ? modelInvoiceItem.quantity : i2, (i4 & 32) != 0 ? modelInvoiceItem.subscriptionPlanId : j2, (i4 & 64) != 0 ? modelInvoiceItem.subscriptionPlanPrice : i3);
+        return modelInvoiceItem.copy((i4 & 1) != 0 ? modelInvoiceItem.amount : i, (i4 & 2) != 0 ? modelInvoiceItem.discount : list, (i4 & 4) != 0 ? modelInvoiceItem.f2050id : j, (i4 & 8) != 0 ? modelInvoiceItem.proration : z2, (i4 & 16) != 0 ? modelInvoiceItem.quantity : i2, (i4 & 32) != 0 ? modelInvoiceItem.subscriptionPlanId : j2, (i4 & 64) != 0 ? modelInvoiceItem.subscriptionPlanPrice : i3);
     }
 
     public final int component1() {
@@ -39,7 +39,7 @@ public final class ModelInvoiceItem {
     }
 
     public final long component3() {
-        return this.f2045id;
+        return this.f2050id;
     }
 
     public final boolean component4() {
@@ -71,7 +71,7 @@ public final class ModelInvoiceItem {
             return false;
         }
         ModelInvoiceItem modelInvoiceItem = (ModelInvoiceItem) obj;
-        return this.amount == modelInvoiceItem.amount && m.areEqual(this.discount, modelInvoiceItem.discount) && this.f2045id == modelInvoiceItem.f2045id && this.proration == modelInvoiceItem.proration && this.quantity == modelInvoiceItem.quantity && this.subscriptionPlanId == modelInvoiceItem.subscriptionPlanId && this.subscriptionPlanPrice == modelInvoiceItem.subscriptionPlanPrice;
+        return this.amount == modelInvoiceItem.amount && m.areEqual(this.discount, modelInvoiceItem.discount) && this.f2050id == modelInvoiceItem.f2050id && this.proration == modelInvoiceItem.proration && this.quantity == modelInvoiceItem.quantity && this.subscriptionPlanId == modelInvoiceItem.subscriptionPlanId && this.subscriptionPlanPrice == modelInvoiceItem.subscriptionPlanPrice;
     }
 
     public final int getAmount() {
@@ -83,7 +83,7 @@ public final class ModelInvoiceItem {
     }
 
     public final long getId() {
-        return this.f2045id;
+        return this.f2050id;
     }
 
     public final boolean getProration() {
@@ -106,7 +106,7 @@ public final class ModelInvoiceItem {
         int i = this.amount * 31;
         List<ModelInvoiceDiscount> list = this.discount;
         int hashCode = list != null ? list.hashCode() : 0;
-        long j = this.f2045id;
+        long j = this.f2050id;
         int i2 = (((i + hashCode) * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         boolean z2 = this.proration;
         if (z2) {
@@ -125,7 +125,7 @@ public final class ModelInvoiceItem {
         L.append(", discount=");
         L.append(this.discount);
         L.append(", id=");
-        L.append(this.f2045id);
+        L.append(this.f2050id);
         L.append(", proration=");
         L.append(this.proration);
         L.append(", quantity=");
diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java b/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java
index 1fa7fdae6b..9eed7ad323 100644
--- a/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java
+++ b/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java
@@ -8,7 +8,7 @@ public final class ModelInvoicePreview {
     private final String currency;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2046id;
+    private final long f2051id;
     private final List<ModelInvoiceItem> invoiceItems;
     private final String subscriptionPeriodEnd;
     private final String subscriptionPeriodStart;
@@ -23,7 +23,7 @@ public final class ModelInvoicePreview {
         m.checkNotNullParameter(str2, "subscriptionPeriodEnd");
         m.checkNotNullParameter(str3, "subscriptionPeriodStart");
         this.currency = str;
-        this.f2046id = j;
+        this.f2051id = j;
         this.invoiceItems = list;
         this.subscriptionPeriodEnd = str2;
         this.subscriptionPeriodStart = str3;
@@ -34,7 +34,7 @@ public final class ModelInvoicePreview {
     }
 
     public static /* synthetic */ ModelInvoicePreview copy$default(ModelInvoicePreview modelInvoicePreview, String str, long j, List list, String str2, String str3, int i, int i2, boolean z2, int i3, int i4, Object obj) {
-        return modelInvoicePreview.copy((i4 & 1) != 0 ? modelInvoicePreview.currency : str, (i4 & 2) != 0 ? modelInvoicePreview.f2046id : j, (i4 & 4) != 0 ? modelInvoicePreview.invoiceItems : list, (i4 & 8) != 0 ? modelInvoicePreview.subscriptionPeriodEnd : str2, (i4 & 16) != 0 ? modelInvoicePreview.subscriptionPeriodStart : str3, (i4 & 32) != 0 ? modelInvoicePreview.subtotal : i, (i4 & 64) != 0 ? modelInvoicePreview.tax : i2, (i4 & 128) != 0 ? modelInvoicePreview.taxInclusive : z2, (i4 & 256) != 0 ? modelInvoicePreview.total : i3);
+        return modelInvoicePreview.copy((i4 & 1) != 0 ? modelInvoicePreview.currency : str, (i4 & 2) != 0 ? modelInvoicePreview.f2051id : j, (i4 & 4) != 0 ? modelInvoicePreview.invoiceItems : list, (i4 & 8) != 0 ? modelInvoicePreview.subscriptionPeriodEnd : str2, (i4 & 16) != 0 ? modelInvoicePreview.subscriptionPeriodStart : str3, (i4 & 32) != 0 ? modelInvoicePreview.subtotal : i, (i4 & 64) != 0 ? modelInvoicePreview.tax : i2, (i4 & 128) != 0 ? modelInvoicePreview.taxInclusive : z2, (i4 & 256) != 0 ? modelInvoicePreview.total : i3);
     }
 
     public final String component1() {
@@ -42,7 +42,7 @@ public final class ModelInvoicePreview {
     }
 
     public final long component2() {
-        return this.f2046id;
+        return this.f2051id;
     }
 
     public final List<ModelInvoiceItem> component3() {
@@ -89,7 +89,7 @@ public final class ModelInvoicePreview {
             return false;
         }
         ModelInvoicePreview modelInvoicePreview = (ModelInvoicePreview) obj;
-        return m.areEqual(this.currency, modelInvoicePreview.currency) && this.f2046id == modelInvoicePreview.f2046id && m.areEqual(this.invoiceItems, modelInvoicePreview.invoiceItems) && m.areEqual(this.subscriptionPeriodEnd, modelInvoicePreview.subscriptionPeriodEnd) && m.areEqual(this.subscriptionPeriodStart, modelInvoicePreview.subscriptionPeriodStart) && this.subtotal == modelInvoicePreview.subtotal && this.tax == modelInvoicePreview.tax && this.taxInclusive == modelInvoicePreview.taxInclusive && this.total == modelInvoicePreview.total;
+        return m.areEqual(this.currency, modelInvoicePreview.currency) && this.f2051id == modelInvoicePreview.f2051id && m.areEqual(this.invoiceItems, modelInvoicePreview.invoiceItems) && m.areEqual(this.subscriptionPeriodEnd, modelInvoicePreview.subscriptionPeriodEnd) && m.areEqual(this.subscriptionPeriodStart, modelInvoicePreview.subscriptionPeriodStart) && this.subtotal == modelInvoicePreview.subtotal && this.tax == modelInvoicePreview.tax && this.taxInclusive == modelInvoicePreview.taxInclusive && this.total == modelInvoicePreview.total;
     }
 
     public final String getCurrency() {
@@ -97,7 +97,7 @@ public final class ModelInvoicePreview {
     }
 
     public final long getId() {
-        return this.f2046id;
+        return this.f2051id;
     }
 
     public final List<ModelInvoiceItem> getInvoiceItems() {
@@ -132,7 +132,7 @@ public final class ModelInvoicePreview {
         String str = this.currency;
         int i = 0;
         int hashCode = str != null ? str.hashCode() : 0;
-        long j = this.f2046id;
+        long j = this.f2051id;
         int i2 = ((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         List<ModelInvoiceItem> list = this.invoiceItems;
         int hashCode2 = (i2 + (list != null ? list.hashCode() : 0)) * 31;
@@ -157,7 +157,7 @@ public final class ModelInvoicePreview {
         StringBuilder L = a.L("ModelInvoicePreview(currency=");
         L.append(this.currency);
         L.append(", id=");
-        L.append(this.f2046id);
+        L.append(this.f2051id);
         L.append(", invoiceItems=");
         L.append(this.invoiceItems);
         L.append(", subscriptionPeriodEnd=");
diff --git a/app/src/main/java/com/discord/models/domain/emoji/Emoji.java b/app/src/main/java/com/discord/models/domain/emoji/Emoji.java
index 7bbe991526..81acc34901 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/Emoji.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/Emoji.java
@@ -27,4 +27,6 @@ public interface Emoji extends Parcelable {
     boolean isAvailable();
 
     boolean isUsable();
+
+    boolean requiresColons();
 }
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
index 1555946687..bc6ef71320 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java
@@ -22,7 +22,7 @@ public class ModelEmojiCustom implements Emoji {
     private long guildId;
 
     /* renamed from: id  reason: collision with root package name */
-    private long f2047id;
+    private long f2052id;
     private String idStr;
     private boolean isAnimated;
     private transient boolean isUsable;
@@ -59,7 +59,7 @@ public class ModelEmojiCustom implements Emoji {
 
     public ModelEmojiCustom(long j, String str, List<Long> list, boolean z2, boolean z3, int i, String str2, boolean z4, boolean z5, boolean z6, long j2) {
         this.idStr = "0";
-        this.f2047id = j;
+        this.f2052id = j;
         this.idStr = String.valueOf(j);
         this.name = str;
         this.roles = list;
@@ -77,7 +77,7 @@ public class ModelEmojiCustom implements Emoji {
         this.idStr = "0";
         boolean z2 = true;
         this.isUsable = true;
-        this.f2047id = guildEmoji.c();
+        this.f2052id = guildEmoji.c();
         this.name = guildEmoji.e();
         this.idStr = String.valueOf(guildEmoji.c());
         this.roles = guildEmoji.g() != null ? guildEmoji.g() : new ArrayList<>();
@@ -90,7 +90,7 @@ public class ModelEmojiCustom implements Emoji {
 
     public ModelEmojiCustom(ModelEmojiCustom modelEmojiCustom, int i, boolean z2) {
         this.idStr = "0";
-        this.f2047id = modelEmojiCustom.f2047id;
+        this.f2052id = modelEmojiCustom.f2052id;
         this.idStr = modelEmojiCustom.idStr;
         this.roles = modelEmojiCustom.getRoles();
         this.requireColons = modelEmojiCustom.requireColons;
@@ -206,7 +206,7 @@ public class ModelEmojiCustom implements Emoji {
     }
 
     public long getId() {
-        return this.f2047id;
+        return this.f2052id;
     }
 
     public String getIdStr() {
@@ -215,7 +215,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // com.discord.models.domain.emoji.Emoji
     public String getImageUri(boolean z2, int i, Context context) {
-        return getImageUri(this.f2047id, this.isAnimated && z2, i);
+        return getImageUri(this.f2052id, this.isAnimated && z2, i);
     }
 
     @Override // com.discord.models.domain.emoji.Emoji
@@ -232,7 +232,7 @@ public class ModelEmojiCustom implements Emoji {
         sb.append(str);
         sb.append(this.name);
         sb.append(':');
-        sb.append(this.f2047id);
+        sb.append(this.f2052id);
         sb.append('>');
         return sb.toString();
     }
@@ -248,7 +248,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // com.discord.models.domain.emoji.Emoji
     public String getReactionKey() {
-        return this.name + ':' + this.f2047id;
+        return this.name + ':' + this.f2052id;
     }
 
     @Override // com.discord.models.domain.emoji.Emoji
@@ -328,8 +328,13 @@ public class ModelEmojiCustom implements Emoji {
         return this.isUsable;
     }
 
+    @Override // com.discord.models.domain.emoji.Emoji
+    public boolean requiresColons() {
+        return true;
+    }
+
     public GuildEmoji toApiEmoji() {
-        return new GuildEmoji(this.f2047id, this.name, this.roles, this.requireColons, this.managed, this.isAnimated, this.available);
+        return new GuildEmoji(this.f2052id, this.name, this.roles, this.requireColons, this.managed, this.isAnimated, this.available);
     }
 
     @Override // java.lang.Object
@@ -364,7 +369,7 @@ public class ModelEmojiCustom implements Emoji {
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeLong(this.f2047id);
+        parcel.writeLong(this.f2052id);
         parcel.writeString(this.name);
         parcel.writeList(this.roles);
         parcel.writeInt(this.requireColons ? 1 : 0);
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
index 40b3c41f55..3003c44885 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java
@@ -10,7 +10,7 @@ public final class ModelEmojiGuild {
     private final boolean available;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2048id;
+    private final long f2053id;
     private final boolean managed;
     private final String name;
     private final boolean requiredColons;
@@ -21,7 +21,7 @@ public final class ModelEmojiGuild {
         m.checkNotNullParameter(str, "name");
         m.checkNotNullParameter(list, "roles");
         m.checkNotNullParameter(user, "user");
-        this.f2048id = j;
+        this.f2053id = j;
         this.name = str;
         this.managed = z2;
         this.roles = list;
@@ -32,11 +32,11 @@ public final class ModelEmojiGuild {
     }
 
     public static /* synthetic */ ModelEmojiGuild copy$default(ModelEmojiGuild modelEmojiGuild, long j, String str, boolean z2, List list, boolean z3, User user, boolean z4, boolean z5, int i, Object obj) {
-        return modelEmojiGuild.copy((i & 1) != 0 ? modelEmojiGuild.f2048id : j, (i & 2) != 0 ? modelEmojiGuild.name : str, (i & 4) != 0 ? modelEmojiGuild.managed : z2, (i & 8) != 0 ? modelEmojiGuild.roles : list, (i & 16) != 0 ? modelEmojiGuild.requiredColons : z3, (i & 32) != 0 ? modelEmojiGuild.user : user, (i & 64) != 0 ? modelEmojiGuild.animated : z4, (i & 128) != 0 ? modelEmojiGuild.available : z5);
+        return modelEmojiGuild.copy((i & 1) != 0 ? modelEmojiGuild.f2053id : j, (i & 2) != 0 ? modelEmojiGuild.name : str, (i & 4) != 0 ? modelEmojiGuild.managed : z2, (i & 8) != 0 ? modelEmojiGuild.roles : list, (i & 16) != 0 ? modelEmojiGuild.requiredColons : z3, (i & 32) != 0 ? modelEmojiGuild.user : user, (i & 64) != 0 ? modelEmojiGuild.animated : z4, (i & 128) != 0 ? modelEmojiGuild.available : z5);
     }
 
     public final long component1() {
-        return this.f2048id;
+        return this.f2053id;
     }
 
     public final String component2() {
@@ -82,7 +82,7 @@ public final class ModelEmojiGuild {
             return false;
         }
         ModelEmojiGuild modelEmojiGuild = (ModelEmojiGuild) obj;
-        return this.f2048id == modelEmojiGuild.f2048id && m.areEqual(this.name, modelEmojiGuild.name) && this.managed == modelEmojiGuild.managed && m.areEqual(this.roles, modelEmojiGuild.roles) && this.requiredColons == modelEmojiGuild.requiredColons && m.areEqual(this.user, modelEmojiGuild.user) && this.animated == modelEmojiGuild.animated && this.available == modelEmojiGuild.available;
+        return this.f2053id == modelEmojiGuild.f2053id && m.areEqual(this.name, modelEmojiGuild.name) && this.managed == modelEmojiGuild.managed && m.areEqual(this.roles, modelEmojiGuild.roles) && this.requiredColons == modelEmojiGuild.requiredColons && m.areEqual(this.user, modelEmojiGuild.user) && this.animated == modelEmojiGuild.animated && this.available == modelEmojiGuild.available;
     }
 
     public final boolean getAnimated() {
@@ -94,7 +94,7 @@ public final class ModelEmojiGuild {
     }
 
     public final long getId() {
-        return this.f2048id;
+        return this.f2053id;
     }
 
     public final boolean getManaged() {
@@ -118,7 +118,7 @@ public final class ModelEmojiGuild {
     }
 
     public int hashCode() {
-        long j = this.f2048id;
+        long j = this.f2053id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         String str = this.name;
         int i2 = 0;
@@ -164,7 +164,7 @@ public final class ModelEmojiGuild {
 
     public String toString() {
         StringBuilder L = a.L("ModelEmojiGuild(id=");
-        L.append(this.f2048id);
+        L.append(this.f2053id);
         L.append(", name=");
         L.append(this.name);
         L.append(", managed=");
diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java
index 32988d41a8..837f4b2b01 100644
--- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java
+++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java
@@ -402,6 +402,11 @@ public class ModelEmojiUnicode implements Model, Emoji {
         return true;
     }
 
+    @Override // com.discord.models.domain.emoji.Emoji
+    public boolean requiresColons() {
+        return true;
+    }
+
     @Override // java.lang.Object
     public String toString() {
         StringBuilder L = c.d.b.a.a.L("ModelEmojiUnicode(names=");
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
index a5f8eea8f4..d7ef165a0e 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java
@@ -8,7 +8,7 @@ public final class ModelSpotifyAlbum {
     private final String albumType;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2049id;
+    private final String f2054id;
     private final List<AlbumImage> images;
     private final String name;
 
@@ -65,7 +65,7 @@ public final class ModelSpotifyAlbum {
         m.checkNotNullParameter(list, "images");
         m.checkNotNullParameter(str3, "name");
         this.albumType = str;
-        this.f2049id = str2;
+        this.f2054id = str2;
         this.images = list;
         this.name = str3;
     }
@@ -77,7 +77,7 @@ public final class ModelSpotifyAlbum {
             str = modelSpotifyAlbum.albumType;
         }
         if ((i & 2) != 0) {
-            str2 = modelSpotifyAlbum.f2049id;
+            str2 = modelSpotifyAlbum.f2054id;
         }
         if ((i & 4) != 0) {
             list = modelSpotifyAlbum.images;
@@ -93,7 +93,7 @@ public final class ModelSpotifyAlbum {
     }
 
     public final String component2() {
-        return this.f2049id;
+        return this.f2054id;
     }
 
     public final List<AlbumImage> component3() {
@@ -120,7 +120,7 @@ public final class ModelSpotifyAlbum {
             return false;
         }
         ModelSpotifyAlbum modelSpotifyAlbum = (ModelSpotifyAlbum) obj;
-        return m.areEqual(this.albumType, modelSpotifyAlbum.albumType) && m.areEqual(this.f2049id, modelSpotifyAlbum.f2049id) && m.areEqual(this.images, modelSpotifyAlbum.images) && m.areEqual(this.name, modelSpotifyAlbum.name);
+        return m.areEqual(this.albumType, modelSpotifyAlbum.albumType) && m.areEqual(this.f2054id, modelSpotifyAlbum.f2054id) && m.areEqual(this.images, modelSpotifyAlbum.images) && m.areEqual(this.name, modelSpotifyAlbum.name);
     }
 
     public final String getAlbumType() {
@@ -128,7 +128,7 @@ public final class ModelSpotifyAlbum {
     }
 
     public final String getId() {
-        return this.f2049id;
+        return this.f2054id;
     }
 
     public final List<AlbumImage> getImages() {
@@ -143,7 +143,7 @@ public final class ModelSpotifyAlbum {
         String str = this.albumType;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
-        String str2 = this.f2049id;
+        String str2 = this.f2054id;
         int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
         List<AlbumImage> list = this.images;
         int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31;
@@ -158,7 +158,7 @@ public final class ModelSpotifyAlbum {
         StringBuilder L = a.L("ModelSpotifyAlbum(albumType=");
         L.append(this.albumType);
         L.append(", id=");
-        L.append(this.f2049id);
+        L.append(this.f2054id);
         L.append(", images=");
         L.append(this.images);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
index a3fe4b8284..dc92e3b330 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java
@@ -6,19 +6,19 @@ import d0.z.d.m;
 public final class ModelSpotifyArtist {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2050id;
+    private final String f2055id;
     private final String name;
 
     public ModelSpotifyArtist(String str, String str2) {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(str2, "name");
-        this.f2050id = str;
+        this.f2055id = str;
         this.name = str2;
     }
 
     public static /* synthetic */ ModelSpotifyArtist copy$default(ModelSpotifyArtist modelSpotifyArtist, String str, String str2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelSpotifyArtist.f2050id;
+            str = modelSpotifyArtist.f2055id;
         }
         if ((i & 2) != 0) {
             str2 = modelSpotifyArtist.name;
@@ -27,7 +27,7 @@ public final class ModelSpotifyArtist {
     }
 
     public final String component1() {
-        return this.f2050id;
+        return this.f2055id;
     }
 
     public final String component2() {
@@ -48,11 +48,11 @@ public final class ModelSpotifyArtist {
             return false;
         }
         ModelSpotifyArtist modelSpotifyArtist = (ModelSpotifyArtist) obj;
-        return m.areEqual(this.f2050id, modelSpotifyArtist.f2050id) && m.areEqual(this.name, modelSpotifyArtist.name);
+        return m.areEqual(this.f2055id, modelSpotifyArtist.f2055id) && m.areEqual(this.name, modelSpotifyArtist.name);
     }
 
     public final String getId() {
-        return this.f2050id;
+        return this.f2055id;
     }
 
     public final String getName() {
@@ -60,7 +60,7 @@ public final class ModelSpotifyArtist {
     }
 
     public int hashCode() {
-        String str = this.f2050id;
+        String str = this.f2055id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -72,7 +72,7 @@ public final class ModelSpotifyArtist {
 
     public String toString() {
         StringBuilder L = a.L("ModelSpotifyArtist(id=");
-        L.append(this.f2050id);
+        L.append(this.f2055id);
         L.append(", name=");
         return a.D(L, this.name, ")");
     }
diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
index 745d1bbdbe..b717919b35 100644
--- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
+++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java
@@ -10,7 +10,7 @@ public final class ModelSpotifyTrack {
     private final long durationMs;
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2051id;
+    private final String f2056id;
     private final boolean isLocal;
     private final String name;
 
@@ -18,7 +18,7 @@ public final class ModelSpotifyTrack {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(str2, "name");
         m.checkNotNullParameter(list, "artists");
-        this.f2051id = str;
+        this.f2056id = str;
         this.name = str2;
         this.durationMs = j;
         this.album = modelSpotifyAlbum;
@@ -30,7 +30,7 @@ public final class ModelSpotifyTrack {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelSpotifyTrack copy$default(ModelSpotifyTrack modelSpotifyTrack, String str, String str2, long j, ModelSpotifyAlbum modelSpotifyAlbum, List list, boolean z2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = modelSpotifyTrack.f2051id;
+            str = modelSpotifyTrack.f2056id;
         }
         if ((i & 2) != 0) {
             str2 = modelSpotifyTrack.name;
@@ -51,7 +51,7 @@ public final class ModelSpotifyTrack {
     }
 
     public final String component1() {
-        return this.f2051id;
+        return this.f2056id;
     }
 
     public final String component2() {
@@ -89,7 +89,7 @@ public final class ModelSpotifyTrack {
             return false;
         }
         ModelSpotifyTrack modelSpotifyTrack = (ModelSpotifyTrack) obj;
-        return m.areEqual(this.f2051id, modelSpotifyTrack.f2051id) && m.areEqual(this.name, modelSpotifyTrack.name) && this.durationMs == modelSpotifyTrack.durationMs && m.areEqual(this.album, modelSpotifyTrack.album) && m.areEqual(this.artists, modelSpotifyTrack.artists) && this.isLocal == modelSpotifyTrack.isLocal;
+        return m.areEqual(this.f2056id, modelSpotifyTrack.f2056id) && m.areEqual(this.name, modelSpotifyTrack.name) && this.durationMs == modelSpotifyTrack.durationMs && m.areEqual(this.album, modelSpotifyTrack.album) && m.areEqual(this.artists, modelSpotifyTrack.artists) && this.isLocal == modelSpotifyTrack.isLocal;
     }
 
     public final ModelSpotifyAlbum getAlbum() {
@@ -105,7 +105,7 @@ public final class ModelSpotifyTrack {
     }
 
     public final String getId() {
-        return this.f2051id;
+        return this.f2056id;
     }
 
     public final String getName() {
@@ -113,7 +113,7 @@ public final class ModelSpotifyTrack {
     }
 
     public int hashCode() {
-        String str = this.f2051id;
+        String str = this.f2056id;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
         String str2 = this.name;
@@ -143,7 +143,7 @@ public final class ModelSpotifyTrack {
 
     public String toString() {
         StringBuilder L = a.L("ModelSpotifyTrack(id=");
-        L.append(this.f2051id);
+        L.append(this.f2056id);
         L.append(", name=");
         L.append(this.name);
         L.append(", durationMs=");
diff --git a/app/src/main/java/com/discord/models/guild/Guild.java b/app/src/main/java/com/discord/models/guild/Guild.java
index f2ebf3b1af..4026ab663b 100644
--- a/app/src/main/java/com/discord/models/guild/Guild.java
+++ b/app/src/main/java/com/discord/models/guild/Guild.java
@@ -33,7 +33,7 @@ public final class Guild {
     private final String icon;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2052id;
+    private final long f2057id;
     private final String joinedAt;
     private final GuildMaxVideoChannelUsers maxVideoChannelUsers;
     private final int memberCount;
@@ -119,7 +119,7 @@ public final class Guild {
         this.name = str;
         this.description = str2;
         this.defaultMessageNotifications = i;
-        this.f2052id = j;
+        this.f2057id = j;
         this.region = str3;
         this.ownerId = j2;
         this.icon = str4;
@@ -155,7 +155,7 @@ public final class Guild {
     }
 
     public static /* synthetic */ Guild copy$default(Guild guild, List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, Object obj) {
-        return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2052id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & 1073741824) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3);
+        return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2057id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & 1073741824) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3);
     }
 
     public final boolean canHaveBanner() {
@@ -291,7 +291,7 @@ public final class Guild {
     }
 
     public final long component7() {
-        return this.f2052id;
+        return this.f2057id;
     }
 
     public final String component8() {
@@ -322,7 +322,7 @@ public final class Guild {
             return false;
         }
         Guild guild = (Guild) obj;
-        return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2052id == guild.f2052id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw;
+        return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2057id == guild.f2057id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw;
     }
 
     public final Long getAfkChannelId() {
@@ -366,7 +366,7 @@ public final class Guild {
     }
 
     public final long getId() {
-        return this.f2052id;
+        return this.f2057id;
     }
 
     public final String getJoinedAt() {
@@ -482,7 +482,7 @@ public final class Guild {
         String str = this.name;
         int hashCode4 = (hashCode3 + (str != null ? str.hashCode() : 0)) * 31;
         String str2 = this.description;
-        int a = (b.a(this.f2052id) + ((((hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.defaultMessageNotifications) * 31)) * 31;
+        int a = (b.a(this.f2057id) + ((((hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.defaultMessageNotifications) * 31)) * 31;
         String str3 = this.region;
         int a2 = (b.a(this.ownerId) + ((a + (str3 != null ? str3.hashCode() : 0)) * 31)) * 31;
         String str4 = this.icon;
@@ -552,7 +552,7 @@ public final class Guild {
         }
         Integer h = guild.h();
         int intValue = h != null ? h.intValue() : this.defaultMessageNotifications;
-        long o = guild.o() != 0 ? guild.o() : this.f2052id;
+        long o = guild.o() != 0 ? guild.o() : this.f2057id;
         String C = guild.C();
         if (C == null) {
             C = this.region;
@@ -629,7 +629,7 @@ public final class Guild {
         L.append(", defaultMessageNotifications=");
         L.append(this.defaultMessageNotifications);
         L.append(", id=");
-        L.append(this.f2052id);
+        L.append(this.f2057id);
         L.append(", region=");
         L.append(this.region);
         L.append(", ownerId=");
diff --git a/app/src/main/java/com/discord/models/member/GuildMember.java b/app/src/main/java/com/discord/models/member/GuildMember.java
index d743ed542d..039e573d9a 100644
--- a/app/src/main/java/com/discord/models/member/GuildMember.java
+++ b/app/src/main/java/com/discord/models/member/GuildMember.java
@@ -93,13 +93,13 @@ public final class GuildMember {
 
         public final String getNickOrUsername(User user, GuildMember guildMember, Channel channel, List<ChannelRecipientNick> list) {
             ChannelRecipientNick channelRecipientNick;
-            String b;
+            String c2;
             Object obj;
             boolean z2;
             m.checkNotNullParameter(user, "user");
             String str = null;
             if (list == null) {
-                list = channel != null ? channel.m() : null;
+                list = channel != null ? channel.n() : null;
             }
             if (list != null) {
                 Iterator<T> it = list.iterator();
@@ -109,7 +109,7 @@ public final class GuildMember {
                         break;
                     }
                     obj = it.next();
-                    if (((ChannelRecipientNick) obj).a() == user.getId()) {
+                    if (((ChannelRecipientNick) obj).b() == user.getId()) {
                         z2 = true;
                         continue;
                     } else {
@@ -124,8 +124,8 @@ public final class GuildMember {
             } else {
                 channelRecipientNick = null;
             }
-            if (channelRecipientNick != null && (b = channelRecipientNick.b()) != null) {
-                str = b;
+            if (channelRecipientNick != null && (c2 = channelRecipientNick.c()) != null) {
+                str = c2;
             } else if (guildMember != null) {
                 str = guildMember.getNick();
             }
diff --git a/app/src/main/java/com/discord/models/message/Message.java b/app/src/main/java/com/discord/models/message/Message.java
new file mode 100644
index 0000000000..2073b0a6db
--- /dev/null
+++ b/app/src/main/java/com/discord/models/message/Message.java
@@ -0,0 +1,876 @@
+package com.discord.models.message;
+
+import a0.a.a.b;
+import c.d.b.a.a;
+import com.discord.api.application.Application;
+import com.discord.api.botuikit.Component;
+import com.discord.api.channel.Channel;
+import com.discord.api.interaction.Interaction;
+import com.discord.api.message.LocalAttachment;
+import com.discord.api.message.MessageReference;
+import com.discord.api.message.activity.MessageActivity;
+import com.discord.api.message.activity.MessageActivityType;
+import com.discord.api.message.allowedmentions.MessageAllowedMentions;
+import com.discord.api.message.attachment.MessageAttachment;
+import com.discord.api.message.call.MessageCall;
+import com.discord.api.message.embed.MessageEmbed;
+import com.discord.api.message.reaction.MessageReaction;
+import com.discord.api.sticker.Sticker;
+import com.discord.api.sticker.StickerPartial;
+import com.discord.api.user.User;
+import com.discord.api.utcdatetime.UtcDateTime;
+import d0.g0.w;
+import d0.t.h0;
+import d0.z.d.m;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: Message.kt */
+public final class Message {
+    public static final Companion Companion = new Companion(null);
+    private static final Map<String, MessageReaction> EMPTY_REACTIONS = h0.emptyMap();
+    private final MessageActivity activity;
+    private final MessageAllowedMentions allowedMentions;
+    private final Application application;
+    private final Long applicationId;
+    private final List<MessageAttachment> attachments;
+    private final User author;
+    private Map<String, MessageReaction> cachedReactionsMap;
+    private final MessageCall call;
+    private final long channelId;
+    private final List<Component> components;
+    private final String content;
+    private final UtcDateTime editedTimestamp;
+    private final List<MessageEmbed> embeds;
+    private final Long flags;
+    private final Long guildId;
+    private final transient boolean hasLocalUploads;
+    private final Boolean hit;
+
+    /* renamed from: id  reason: collision with root package name */
+    private final long f2058id;
+    private final Long initialAttemptTimestamp;
+    private final Interaction interaction;
+    private final Long lastManualAttemptTimestamp;
+    private final List<LocalAttachment> localAttachments;
+    private final Boolean mentionEveryone;
+    private final List<Long> mentionRoles;
+    private final List<User> mentions;
+    private final MessageReference messageReference;
+    private final String nonce;
+    private final Integer numRetries;
+    private final Boolean pinned;
+    private final List<MessageReaction> reactions;
+    private final com.discord.api.message.Message referencedMessage;
+    private final List<StickerPartial> stickerItems;
+    private final List<Sticker> stickers;
+    private final Channel thread;
+    private final UtcDateTime timestamp;
+    private final Boolean tts;
+    private final Integer type;
+    private final Long webhookId;
+
+    /* compiled from: Message.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    /* JADX DEBUG: Multi-variable search result rejected for r34v0, resolved type: java.util.List<? extends com.discord.api.botuikit.Component> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public Message(long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List<User> list, List<Long> list2, List<MessageAttachment> list3, List<MessageEmbed> list4, List<MessageReaction> list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List<Sticker> list6, List<StickerPartial> list7, com.discord.api.message.Message message, Interaction interaction, Channel channel, List<? extends Component> list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List<LocalAttachment> list9) {
+        this.f2058id = j;
+        this.channelId = j2;
+        this.guildId = l;
+        this.author = user;
+        this.content = str;
+        this.timestamp = utcDateTime;
+        this.editedTimestamp = utcDateTime2;
+        this.tts = bool;
+        this.mentionEveryone = bool2;
+        this.mentions = list;
+        this.mentionRoles = list2;
+        this.attachments = list3;
+        this.embeds = list4;
+        this.reactions = list5;
+        this.nonce = str2;
+        this.pinned = bool3;
+        this.webhookId = l2;
+        this.type = num;
+        this.activity = messageActivity;
+        this.application = application;
+        this.applicationId = l3;
+        this.messageReference = messageReference;
+        this.flags = l4;
+        this.stickers = list6;
+        this.stickerItems = list7;
+        this.referencedMessage = message;
+        this.interaction = interaction;
+        this.thread = channel;
+        this.components = list8;
+        this.call = messageCall;
+        this.hit = bool4;
+        this.hasLocalUploads = z2;
+        this.allowedMentions = messageAllowedMentions;
+        this.numRetries = num2;
+        this.lastManualAttemptTimestamp = l5;
+        this.initialAttemptTimestamp = l6;
+        this.localAttachments = list9;
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ Message(long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List list6, List list7, com.discord.api.message.Message message, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
+        this(j, j2, (i & 4) != 0 ? null : l, (i & 8) != 0 ? null : user, (i & 16) != 0 ? null : str, (i & 32) != 0 ? null : utcDateTime, (i & 64) != 0 ? null : utcDateTime2, (i & 128) != 0 ? null : bool, (i & 256) != 0 ? null : bool2, (i & 512) != 0 ? null : list, (i & 1024) != 0 ? null : list2, (i & 2048) != 0 ? null : list3, (i & 4096) != 0 ? null : list4, (i & 8192) != 0 ? null : list5, (i & 16384) != 0 ? null : str2, (32768 & i) != 0 ? null : bool3, (65536 & i) != 0 ? null : l2, (131072 & i) != 0 ? null : num, (262144 & i) != 0 ? null : messageActivity, (524288 & i) != 0 ? null : application, (1048576 & i) != 0 ? null : l3, (2097152 & i) != 0 ? null : messageReference, (4194304 & i) != 0 ? null : l4, (8388608 & i) != 0 ? null : list6, (16777216 & i) != 0 ? null : list7, (33554432 & i) != 0 ? null : message, (67108864 & i) != 0 ? null : interaction, (134217728 & i) != 0 ? null : channel, (268435456 & i) != 0 ? null : list8, (536870912 & i) != 0 ? null : messageCall, (1073741824 & i) != 0 ? null : bool4, (i & Integer.MIN_VALUE) != 0 ? false : z2, (i2 & 1) != 0 ? null : messageAllowedMentions, (i2 & 2) != 0 ? null : num2, (i2 & 4) != 0 ? null : l5, (i2 & 8) != 0 ? null : l6, (i2 & 16) != 0 ? null : list9);
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public Message(com.discord.api.message.Message message) {
+        this(message.o(), message.g(), message.m(), message.e(), message.i(), message.C(), message.j(), message.D(), message.r(), message.t(), message.s(), message.d(), message.k(), message.x(), message.v(), message.w(), message.F(), message.E(), message.a(), message.b(), message.c(), message.u(), message.l(), message.A(), message.z(), message.y(), message.p(), message.B(), message.h(), message.f(), message.n(), false, null, null, null, null, null, Integer.MIN_VALUE, 31, null);
+        m.checkNotNullParameter(message, "message");
+    }
+
+    public static /* synthetic */ Message copy$default(Message message, long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List list6, List list7, com.discord.api.message.Message message2, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2, Object obj) {
+        return message.copy((i & 1) != 0 ? message.f2058id : j, (i & 2) != 0 ? message.channelId : j2, (i & 4) != 0 ? message.guildId : l, (i & 8) != 0 ? message.author : user, (i & 16) != 0 ? message.content : str, (i & 32) != 0 ? message.timestamp : utcDateTime, (i & 64) != 0 ? message.editedTimestamp : utcDateTime2, (i & 128) != 0 ? message.tts : bool, (i & 256) != 0 ? message.mentionEveryone : bool2, (i & 512) != 0 ? message.mentions : list, (i & 1024) != 0 ? message.mentionRoles : list2, (i & 2048) != 0 ? message.attachments : list3, (i & 4096) != 0 ? message.embeds : list4, (i & 8192) != 0 ? message.reactions : list5, (i & 16384) != 0 ? message.nonce : str2, (i & 32768) != 0 ? message.pinned : bool3, (i & 65536) != 0 ? message.webhookId : l2, (i & 131072) != 0 ? message.type : num, (i & 262144) != 0 ? message.activity : messageActivity, (i & 524288) != 0 ? message.application : application, (i & 1048576) != 0 ? message.applicationId : l3, (i & 2097152) != 0 ? message.messageReference : messageReference, (i & 4194304) != 0 ? message.flags : l4, (i & 8388608) != 0 ? message.stickers : list6, (i & 16777216) != 0 ? message.stickerItems : list7, (i & 33554432) != 0 ? message.referencedMessage : message2, (i & 67108864) != 0 ? message.interaction : interaction, (i & 134217728) != 0 ? message.thread : channel, (i & 268435456) != 0 ? message.components : list8, (i & 536870912) != 0 ? message.call : messageCall, (i & 1073741824) != 0 ? message.hit : bool4, (i & Integer.MIN_VALUE) != 0 ? message.hasLocalUploads : z2, (i2 & 1) != 0 ? message.allowedMentions : messageAllowedMentions, (i2 & 2) != 0 ? message.numRetries : num2, (i2 & 4) != 0 ? message.lastManualAttemptTimestamp : l5, (i2 & 8) != 0 ? message.initialAttemptTimestamp : l6, (i2 & 16) != 0 ? message.localAttachments : list9);
+    }
+
+    public final boolean canResend() {
+        Integer num = this.type;
+        return num != null && num.intValue() == -2;
+    }
+
+    public final long component1() {
+        return this.f2058id;
+    }
+
+    public final List<User> component10() {
+        return this.mentions;
+    }
+
+    public final List<Long> component11() {
+        return this.mentionRoles;
+    }
+
+    public final List<MessageAttachment> component12() {
+        return this.attachments;
+    }
+
+    public final List<MessageEmbed> component13() {
+        return this.embeds;
+    }
+
+    public final List<MessageReaction> component14() {
+        return this.reactions;
+    }
+
+    public final String component15() {
+        return this.nonce;
+    }
+
+    public final Boolean component16() {
+        return this.pinned;
+    }
+
+    public final Long component17() {
+        return this.webhookId;
+    }
+
+    public final Integer component18() {
+        return this.type;
+    }
+
+    public final MessageActivity component19() {
+        return this.activity;
+    }
+
+    public final long component2() {
+        return this.channelId;
+    }
+
+    public final Application component20() {
+        return this.application;
+    }
+
+    public final Long component21() {
+        return this.applicationId;
+    }
+
+    public final MessageReference component22() {
+        return this.messageReference;
+    }
+
+    public final Long component23() {
+        return this.flags;
+    }
+
+    public final List<Sticker> component24() {
+        return this.stickers;
+    }
+
+    public final List<StickerPartial> component25() {
+        return this.stickerItems;
+    }
+
+    public final com.discord.api.message.Message component26() {
+        return this.referencedMessage;
+    }
+
+    public final Interaction component27() {
+        return this.interaction;
+    }
+
+    public final Channel component28() {
+        return this.thread;
+    }
+
+    public final List<Component> component29() {
+        return this.components;
+    }
+
+    public final Long component3() {
+        return this.guildId;
+    }
+
+    public final MessageCall component30() {
+        return this.call;
+    }
+
+    public final Boolean component31() {
+        return this.hit;
+    }
+
+    public final boolean component32() {
+        return this.hasLocalUploads;
+    }
+
+    public final MessageAllowedMentions component33() {
+        return this.allowedMentions;
+    }
+
+    public final Integer component34() {
+        return this.numRetries;
+    }
+
+    public final Long component35() {
+        return this.lastManualAttemptTimestamp;
+    }
+
+    public final Long component36() {
+        return this.initialAttemptTimestamp;
+    }
+
+    public final List<LocalAttachment> component37() {
+        return this.localAttachments;
+    }
+
+    public final User component4() {
+        return this.author;
+    }
+
+    public final String component5() {
+        return this.content;
+    }
+
+    public final UtcDateTime component6() {
+        return this.timestamp;
+    }
+
+    public final UtcDateTime component7() {
+        return this.editedTimestamp;
+    }
+
+    public final Boolean component8() {
+        return this.tts;
+    }
+
+    public final Boolean component9() {
+        return this.mentionEveryone;
+    }
+
+    public final Message copy(long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List<User> list, List<Long> list2, List<MessageAttachment> list3, List<MessageEmbed> list4, List<MessageReaction> list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List<Sticker> list6, List<StickerPartial> list7, com.discord.api.message.Message message, Interaction interaction, Channel channel, List<? extends Component> list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List<LocalAttachment> list9) {
+        return new Message(j, j2, l, user, str, utcDateTime, utcDateTime2, bool, bool2, list, list2, list3, list4, list5, str2, bool3, l2, num, messageActivity, application, l3, messageReference, l4, list6, list7, message, interaction, channel, list8, messageCall, bool4, z2, messageAllowedMentions, num2, l5, l6, list9);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof Message)) {
+            return false;
+        }
+        Message message = (Message) obj;
+        return this.f2058id == message.f2058id && this.channelId == message.channelId && m.areEqual(this.guildId, message.guildId) && m.areEqual(this.author, message.author) && m.areEqual(this.content, message.content) && m.areEqual(this.timestamp, message.timestamp) && m.areEqual(this.editedTimestamp, message.editedTimestamp) && m.areEqual(this.tts, message.tts) && m.areEqual(this.mentionEveryone, message.mentionEveryone) && m.areEqual(this.mentions, message.mentions) && m.areEqual(this.mentionRoles, message.mentionRoles) && m.areEqual(this.attachments, message.attachments) && m.areEqual(this.embeds, message.embeds) && m.areEqual(this.reactions, message.reactions) && m.areEqual(this.nonce, message.nonce) && m.areEqual(this.pinned, message.pinned) && m.areEqual(this.webhookId, message.webhookId) && m.areEqual(this.type, message.type) && m.areEqual(this.activity, message.activity) && m.areEqual(this.application, message.application) && m.areEqual(this.applicationId, message.applicationId) && m.areEqual(this.messageReference, message.messageReference) && m.areEqual(this.flags, message.flags) && m.areEqual(this.stickers, message.stickers) && m.areEqual(this.stickerItems, message.stickerItems) && m.areEqual(this.referencedMessage, message.referencedMessage) && m.areEqual(this.interaction, message.interaction) && m.areEqual(this.thread, message.thread) && m.areEqual(this.components, message.components) && m.areEqual(this.call, message.call) && m.areEqual(this.hit, message.hit) && this.hasLocalUploads == message.hasLocalUploads && m.areEqual(this.allowedMentions, message.allowedMentions) && m.areEqual(this.numRetries, message.numRetries) && m.areEqual(this.lastManualAttemptTimestamp, message.lastManualAttemptTimestamp) && m.areEqual(this.initialAttemptTimestamp, message.initialAttemptTimestamp) && m.areEqual(this.localAttachments, message.localAttachments);
+    }
+
+    public final MessageActivity getActivity() {
+        return this.activity;
+    }
+
+    public final MessageAllowedMentions getAllowedMentions() {
+        return this.allowedMentions;
+    }
+
+    public final Application getApplication() {
+        return this.application;
+    }
+
+    public final Long getApplicationId() {
+        return this.applicationId;
+    }
+
+    public final List<MessageAttachment> getAttachments() {
+        return this.attachments;
+    }
+
+    public final User getAuthor() {
+        return this.author;
+    }
+
+    public final MessageCall getCall() {
+        return this.call;
+    }
+
+    public final long getCallDuration() {
+        UtcDateTime a;
+        UtcDateTime utcDateTime;
+        MessageCall messageCall = this.call;
+        if (messageCall == null || (a = messageCall.a()) == null || (utcDateTime = this.timestamp) == null) {
+            return 0;
+        }
+        return a.f() - utcDateTime.f();
+    }
+
+    public final long getChannelId() {
+        return this.channelId;
+    }
+
+    public final List<Component> getComponents() {
+        return this.components;
+    }
+
+    public final String getContent() {
+        return this.content;
+    }
+
+    public final UtcDateTime getEditedTimestamp() {
+        return this.editedTimestamp;
+    }
+
+    public final List<MessageEmbed> getEmbeds() {
+        return this.embeds;
+    }
+
+    public final Long getFlags() {
+        return this.flags;
+    }
+
+    public final Long getGuildId() {
+        return this.guildId;
+    }
+
+    public final boolean getHasLocalUploads() {
+        return this.hasLocalUploads;
+    }
+
+    public final Boolean getHit() {
+        return this.hit;
+    }
+
+    public final long getId() {
+        return this.f2058id;
+    }
+
+    public final Long getInitialAttemptTimestamp() {
+        return this.initialAttemptTimestamp;
+    }
+
+    public final Interaction getInteraction() {
+        return this.interaction;
+    }
+
+    public final Long getLastManualAttemptTimestamp() {
+        return this.lastManualAttemptTimestamp;
+    }
+
+    public final List<LocalAttachment> getLocalAttachments() {
+        return this.localAttachments;
+    }
+
+    public final Boolean getMentionEveryone() {
+        return this.mentionEveryone;
+    }
+
+    public final List<Long> getMentionRoles() {
+        return this.mentionRoles;
+    }
+
+    public final List<User> getMentions() {
+        return this.mentions;
+    }
+
+    public final MessageReference getMessageReference() {
+        return this.messageReference;
+    }
+
+    public final String getNonce() {
+        return this.nonce;
+    }
+
+    public final Integer getNumRetries() {
+        return this.numRetries;
+    }
+
+    public final Boolean getPinned() {
+        return this.pinned;
+    }
+
+    public final List<MessageReaction> getReactions() {
+        return this.reactions;
+    }
+
+    public final Map<String, MessageReaction> getReactionsMap() {
+        Map<String, MessageReaction> map = this.cachedReactionsMap;
+        if (map != null) {
+            m.checkNotNull(map);
+        } else {
+            List<MessageReaction> list = this.reactions;
+            if (list == null || !(!list.isEmpty())) {
+                map = EMPTY_REACTIONS;
+            } else {
+                List<MessageReaction> list2 = this.reactions;
+                LinkedHashMap linkedHashMap = new LinkedHashMap();
+                for (Object obj : list2) {
+                    linkedHashMap.put(((MessageReaction) obj).b().c(), obj);
+                }
+                map = linkedHashMap;
+            }
+            this.cachedReactionsMap = map;
+        }
+        return map;
+    }
+
+    public final com.discord.api.message.Message getReferencedMessage() {
+        return this.referencedMessage;
+    }
+
+    public final List<StickerPartial> getStickerItems() {
+        return this.stickerItems;
+    }
+
+    public final List<Sticker> getStickers() {
+        return this.stickers;
+    }
+
+    public final Channel getThread() {
+        return this.thread;
+    }
+
+    public final UtcDateTime getTimestamp() {
+        return this.timestamp;
+    }
+
+    public final Boolean getTts() {
+        return this.tts;
+    }
+
+    public final Integer getType() {
+        return this.type;
+    }
+
+    public final Long getWebhookId() {
+        return this.webhookId;
+    }
+
+    public final boolean hasAttachments() {
+        List<MessageAttachment> list = this.attachments;
+        return !(list == null || list.isEmpty());
+    }
+
+    public final boolean hasEmbeds() {
+        List<MessageEmbed> list = this.embeds;
+        return !(list == null || list.isEmpty());
+    }
+
+    public final boolean hasFlag(long j) {
+        Long l = this.flags;
+        return ((l != null ? l.longValue() : 0) & j) == j;
+    }
+
+    public final boolean hasStickers() {
+        List<Sticker> list = this.stickers;
+        if (list == null || list.isEmpty()) {
+            List<StickerPartial> list2 = this.stickerItems;
+            if (list2 == null || list2.isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public final boolean hasThread() {
+        return hasFlag(32);
+    }
+
+    public int hashCode() {
+        int a = (b.a(this.channelId) + (b.a(this.f2058id) * 31)) * 31;
+        Long l = this.guildId;
+        int i = 0;
+        int hashCode = (a + (l != null ? l.hashCode() : 0)) * 31;
+        User user = this.author;
+        int hashCode2 = (hashCode + (user != null ? user.hashCode() : 0)) * 31;
+        String str = this.content;
+        int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31;
+        UtcDateTime utcDateTime = this.timestamp;
+        int hashCode4 = (hashCode3 + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31;
+        UtcDateTime utcDateTime2 = this.editedTimestamp;
+        int hashCode5 = (hashCode4 + (utcDateTime2 != null ? utcDateTime2.hashCode() : 0)) * 31;
+        Boolean bool = this.tts;
+        int hashCode6 = (hashCode5 + (bool != null ? bool.hashCode() : 0)) * 31;
+        Boolean bool2 = this.mentionEveryone;
+        int hashCode7 = (hashCode6 + (bool2 != null ? bool2.hashCode() : 0)) * 31;
+        List<User> list = this.mentions;
+        int hashCode8 = (hashCode7 + (list != null ? list.hashCode() : 0)) * 31;
+        List<Long> list2 = this.mentionRoles;
+        int hashCode9 = (hashCode8 + (list2 != null ? list2.hashCode() : 0)) * 31;
+        List<MessageAttachment> list3 = this.attachments;
+        int hashCode10 = (hashCode9 + (list3 != null ? list3.hashCode() : 0)) * 31;
+        List<MessageEmbed> list4 = this.embeds;
+        int hashCode11 = (hashCode10 + (list4 != null ? list4.hashCode() : 0)) * 31;
+        List<MessageReaction> list5 = this.reactions;
+        int hashCode12 = (hashCode11 + (list5 != null ? list5.hashCode() : 0)) * 31;
+        String str2 = this.nonce;
+        int hashCode13 = (hashCode12 + (str2 != null ? str2.hashCode() : 0)) * 31;
+        Boolean bool3 = this.pinned;
+        int hashCode14 = (hashCode13 + (bool3 != null ? bool3.hashCode() : 0)) * 31;
+        Long l2 = this.webhookId;
+        int hashCode15 = (hashCode14 + (l2 != null ? l2.hashCode() : 0)) * 31;
+        Integer num = this.type;
+        int hashCode16 = (hashCode15 + (num != null ? num.hashCode() : 0)) * 31;
+        MessageActivity messageActivity = this.activity;
+        int hashCode17 = (hashCode16 + (messageActivity != null ? messageActivity.hashCode() : 0)) * 31;
+        Application application = this.application;
+        int hashCode18 = (hashCode17 + (application != null ? application.hashCode() : 0)) * 31;
+        Long l3 = this.applicationId;
+        int hashCode19 = (hashCode18 + (l3 != null ? l3.hashCode() : 0)) * 31;
+        MessageReference messageReference = this.messageReference;
+        int hashCode20 = (hashCode19 + (messageReference != null ? messageReference.hashCode() : 0)) * 31;
+        Long l4 = this.flags;
+        int hashCode21 = (hashCode20 + (l4 != null ? l4.hashCode() : 0)) * 31;
+        List<Sticker> list6 = this.stickers;
+        int hashCode22 = (hashCode21 + (list6 != null ? list6.hashCode() : 0)) * 31;
+        List<StickerPartial> list7 = this.stickerItems;
+        int hashCode23 = (hashCode22 + (list7 != null ? list7.hashCode() : 0)) * 31;
+        com.discord.api.message.Message message = this.referencedMessage;
+        int hashCode24 = (hashCode23 + (message != null ? message.hashCode() : 0)) * 31;
+        Interaction interaction = this.interaction;
+        int hashCode25 = (hashCode24 + (interaction != null ? interaction.hashCode() : 0)) * 31;
+        Channel channel = this.thread;
+        int hashCode26 = (hashCode25 + (channel != null ? channel.hashCode() : 0)) * 31;
+        List<Component> list8 = this.components;
+        int hashCode27 = (hashCode26 + (list8 != null ? list8.hashCode() : 0)) * 31;
+        MessageCall messageCall = this.call;
+        int hashCode28 = (hashCode27 + (messageCall != null ? messageCall.hashCode() : 0)) * 31;
+        Boolean bool4 = this.hit;
+        int hashCode29 = (hashCode28 + (bool4 != null ? bool4.hashCode() : 0)) * 31;
+        boolean z2 = this.hasLocalUploads;
+        if (z2) {
+            z2 = true;
+        }
+        int i2 = z2 ? 1 : 0;
+        int i3 = z2 ? 1 : 0;
+        int i4 = z2 ? 1 : 0;
+        int i5 = (hashCode29 + i2) * 31;
+        MessageAllowedMentions messageAllowedMentions = this.allowedMentions;
+        int hashCode30 = (i5 + (messageAllowedMentions != null ? messageAllowedMentions.hashCode() : 0)) * 31;
+        Integer num2 = this.numRetries;
+        int hashCode31 = (hashCode30 + (num2 != null ? num2.hashCode() : 0)) * 31;
+        Long l5 = this.lastManualAttemptTimestamp;
+        int hashCode32 = (hashCode31 + (l5 != null ? l5.hashCode() : 0)) * 31;
+        Long l6 = this.initialAttemptTimestamp;
+        int hashCode33 = (hashCode32 + (l6 != null ? l6.hashCode() : 0)) * 31;
+        List<LocalAttachment> list9 = this.localAttachments;
+        if (list9 != null) {
+            i = list9.hashCode();
+        }
+        return hashCode33 + i;
+    }
+
+    public final boolean isCrosspost() {
+        return hasFlag(2);
+    }
+
+    public final boolean isCrossposted() {
+        return hasFlag(1);
+    }
+
+    public final boolean isEmbeddedMessageType() {
+        Integer num;
+        Integer num2 = this.type;
+        return (num2 != null && num2.intValue() == 19) || ((num = this.type) != null && num.intValue() == 21);
+    }
+
+    public final boolean isEphemeralMessage() {
+        return hasFlag(64);
+    }
+
+    public final boolean isFailed() {
+        Integer num;
+        Integer num2;
+        Integer num3 = this.type;
+        return (num3 != null && num3.intValue() == -3) || ((num = this.type) != null && num.intValue() == -2) || ((num2 = this.type) != null && num2.intValue() == -4);
+    }
+
+    public final boolean isInteraction() {
+        Integer num;
+        Integer num2 = this.type;
+        return (num2 != null && num2.intValue() == -5) || ((num = this.type) != null && num.intValue() == -4) || this.interaction != null;
+    }
+
+    public final boolean isLoading() {
+        return hasFlag(128);
+    }
+
+    public final boolean isLocal() {
+        Integer num;
+        Integer num2;
+        Integer num3 = this.type;
+        return (num3 != null && num3.intValue() == -1) || ((num = this.type) != null && num.intValue() == -2) || (((num2 = this.type) != null && num2.intValue() == -3) || isLocalApplicationCommand());
+    }
+
+    public final boolean isLocalApplicationCommand() {
+        Integer num;
+        Integer num2 = this.type;
+        return (num2 != null && num2.intValue() == -5) || ((num = this.type) != null && num.intValue() == -4);
+    }
+
+    public final boolean isSourceDeleted() {
+        return hasFlag(8);
+    }
+
+    public final boolean isSpotifyListeningActivity() {
+        MessageActivity messageActivity = this.activity;
+        return messageActivity != null && messageActivity.b() == MessageActivityType.LISTEN && w.contains$default(messageActivity.a(), "spotify", false, 2, null);
+    }
+
+    public final boolean isSystemMessage() {
+        return !isUserMessage();
+    }
+
+    public final boolean isUrgent() {
+        return hasFlag(16);
+    }
+
+    public final boolean isUserMessage() {
+        Integer num;
+        Integer num2 = this.type;
+        return (num2 != null && num2.intValue() == 0) || ((num = this.type) != null && num.intValue() == 19);
+    }
+
+    public final boolean isWebhook() {
+        return this.webhookId != null;
+    }
+
+    public final Message merge(com.discord.api.message.Message message) {
+        m.checkNotNullParameter(message, "new");
+        long o = message.o();
+        long g = message.g() != 0 ? message.g() : this.channelId;
+        Long m = message.m();
+        if (m == null) {
+            m = this.guildId;
+        }
+        User e = message.e();
+        if (e == null) {
+            e = this.author;
+        }
+        String i = message.i();
+        if (i == null) {
+            i = this.content;
+        }
+        UtcDateTime C = message.C();
+        if (C == null) {
+            C = this.timestamp;
+        }
+        UtcDateTime j = message.j();
+        if (j == null) {
+            j = this.editedTimestamp;
+        }
+        List<MessageAttachment> d = message.d();
+        if (d == null) {
+            d = this.attachments;
+        }
+        List<MessageEmbed> k = message.k();
+        if (k == null) {
+            k = this.embeds;
+        }
+        Boolean D = message.D();
+        if (D == null) {
+            D = this.tts;
+        }
+        Boolean r = message.r();
+        if (r == null) {
+            r = this.mentionEveryone;
+        }
+        List<User> t = message.t();
+        if (t == null) {
+            t = this.mentions;
+        }
+        List<Long> s2 = message.s();
+        if (s2 == null) {
+            s2 = this.mentionRoles;
+        }
+        List<MessageReaction> x2 = message.x();
+        if (x2 == null) {
+            x2 = this.reactions;
+        }
+        String v = message.v();
+        if (v == null) {
+            v = this.nonce;
+        }
+        Boolean w = message.w();
+        if (w == null) {
+            w = this.pinned;
+        }
+        Long F = message.F();
+        if (F == null) {
+            F = this.webhookId;
+        }
+        Integer E = message.E();
+        if (E == null) {
+            E = this.type;
+        }
+        MessageActivity a = message.a();
+        if (a == null) {
+            a = this.activity;
+        }
+        Application b = message.b();
+        if (b == null) {
+            b = this.application;
+        }
+        Long c2 = message.c();
+        if (c2 == null) {
+            c2 = this.applicationId;
+        }
+        MessageReference u = message.u();
+        if (u == null) {
+            u = this.messageReference;
+        }
+        Long l = message.l();
+        if (l == null) {
+            l = this.flags;
+        }
+        List<Sticker> A = message.A();
+        if (A == null) {
+            A = this.stickers;
+        }
+        List<StickerPartial> z2 = message.z();
+        if (z2 == null) {
+            z2 = this.stickerItems;
+        }
+        com.discord.api.message.Message y2 = message.y();
+        if (y2 == null) {
+            y2 = this.referencedMessage;
+        }
+        Interaction p = message.p();
+        if (p == null) {
+            p = this.interaction;
+        }
+        Channel B = message.B();
+        if (B == null) {
+            B = this.thread;
+        }
+        List<Component> h = message.h();
+        if (h == null) {
+            h = this.components;
+        }
+        MessageCall f = message.f();
+        if (f == null) {
+            f = this.call;
+        }
+        return copy$default(this, o, g, m, e, i, C, j, D, r, t, s2, d, k, x2, v, w, F, E, a, b, c2, u, l, A, z2, y2, p, B, h, f, null, false, null, null, null, null, null, -1073741824, 31, null);
+    }
+
+    public final com.discord.api.message.Message synthesizeApiMessage() {
+        return new com.discord.api.message.Message(this.f2058id, this.channelId, this.author, this.content, this.timestamp, this.editedTimestamp, this.tts, this.mentionEveryone, this.mentions, this.mentionRoles, this.attachments, this.embeds, this.reactions, this.nonce, this.pinned, this.webhookId, this.type, this.activity, this.application, this.applicationId, this.messageReference, this.flags, this.stickers, this.stickerItems, this.referencedMessage, this.interaction, this.thread, this.components, this.call, this.guildId, null, null, -1073741824);
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("Message(id=");
+        L.append(this.f2058id);
+        L.append(", channelId=");
+        L.append(this.channelId);
+        L.append(", guildId=");
+        L.append(this.guildId);
+        L.append(", author=");
+        L.append(this.author);
+        L.append(", content=");
+        L.append(this.content);
+        L.append(", timestamp=");
+        L.append(this.timestamp);
+        L.append(", editedTimestamp=");
+        L.append(this.editedTimestamp);
+        L.append(", tts=");
+        L.append(this.tts);
+        L.append(", mentionEveryone=");
+        L.append(this.mentionEveryone);
+        L.append(", mentions=");
+        L.append(this.mentions);
+        L.append(", mentionRoles=");
+        L.append(this.mentionRoles);
+        L.append(", attachments=");
+        L.append(this.attachments);
+        L.append(", embeds=");
+        L.append(this.embeds);
+        L.append(", reactions=");
+        L.append(this.reactions);
+        L.append(", nonce=");
+        L.append(this.nonce);
+        L.append(", pinned=");
+        L.append(this.pinned);
+        L.append(", webhookId=");
+        L.append(this.webhookId);
+        L.append(", type=");
+        L.append(this.type);
+        L.append(", activity=");
+        L.append(this.activity);
+        L.append(", application=");
+        L.append(this.application);
+        L.append(", applicationId=");
+        L.append(this.applicationId);
+        L.append(", messageReference=");
+        L.append(this.messageReference);
+        L.append(", flags=");
+        L.append(this.flags);
+        L.append(", stickers=");
+        L.append(this.stickers);
+        L.append(", stickerItems=");
+        L.append(this.stickerItems);
+        L.append(", referencedMessage=");
+        L.append(this.referencedMessage);
+        L.append(", interaction=");
+        L.append(this.interaction);
+        L.append(", thread=");
+        L.append(this.thread);
+        L.append(", components=");
+        L.append(this.components);
+        L.append(", call=");
+        L.append(this.call);
+        L.append(", hit=");
+        L.append(this.hit);
+        L.append(", hasLocalUploads=");
+        L.append(this.hasLocalUploads);
+        L.append(", allowedMentions=");
+        L.append(this.allowedMentions);
+        L.append(", numRetries=");
+        L.append(this.numRetries);
+        L.append(", lastManualAttemptTimestamp=");
+        L.append(this.lastManualAttemptTimestamp);
+        L.append(", initialAttemptTimestamp=");
+        L.append(this.initialAttemptTimestamp);
+        L.append(", localAttachments=");
+        return a.E(L, this.localAttachments, ")");
+    }
+}
diff --git a/app/src/main/java/com/discord/models/message/MessageKt.java b/app/src/main/java/com/discord/models/message/MessageKt.java
new file mode 100644
index 0000000000..660c9688ea
--- /dev/null
+++ b/app/src/main/java/com/discord/models/message/MessageKt.java
@@ -0,0 +1,4 @@
+package com.discord.models.message;
+/* compiled from: Message.kt */
+public final class MessageKt {
+}
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
index 25b5e82fbd..d56de78951 100644
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
+++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java
@@ -14,7 +14,7 @@ public final class ModelStickerPack {
     private final String description;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2053id;
+    private final long f2059id;
     private final String name;
     private final long skuId;
     private final List<Sticker> stickers;
@@ -23,7 +23,7 @@ public final class ModelStickerPack {
     public ModelStickerPack(long j, List<Sticker> list, String str, ModelStickerPackStoreListing modelStickerPackStoreListing, long j2, Long l, String str2, Long l2) {
         m.checkNotNullParameter(list, "stickers");
         m.checkNotNullParameter(str, "name");
-        this.f2053id = j;
+        this.f2059id = j;
         this.stickers = list;
         this.name = str;
         this.storeListing = modelStickerPackStoreListing;
@@ -34,7 +34,7 @@ public final class ModelStickerPack {
     }
 
     public static /* synthetic */ ModelStickerPack copy$default(ModelStickerPack modelStickerPack, long j, List list, String str, ModelStickerPackStoreListing modelStickerPackStoreListing, long j2, Long l, String str2, Long l2, int i, Object obj) {
-        return modelStickerPack.copy((i & 1) != 0 ? modelStickerPack.f2053id : j, (i & 2) != 0 ? modelStickerPack.stickers : list, (i & 4) != 0 ? modelStickerPack.name : str, (i & 8) != 0 ? modelStickerPack.storeListing : modelStickerPackStoreListing, (i & 16) != 0 ? modelStickerPack.skuId : j2, (i & 32) != 0 ? modelStickerPack.coverStickerId : l, (i & 64) != 0 ? modelStickerPack.description : str2, (i & 128) != 0 ? modelStickerPack.bannerAssetId : l2);
+        return modelStickerPack.copy((i & 1) != 0 ? modelStickerPack.f2059id : j, (i & 2) != 0 ? modelStickerPack.stickers : list, (i & 4) != 0 ? modelStickerPack.name : str, (i & 8) != 0 ? modelStickerPack.storeListing : modelStickerPackStoreListing, (i & 16) != 0 ? modelStickerPack.skuId : j2, (i & 32) != 0 ? modelStickerPack.coverStickerId : l, (i & 64) != 0 ? modelStickerPack.description : str2, (i & 128) != 0 ? modelStickerPack.bannerAssetId : l2);
     }
 
     public final boolean canBePurchased() {
@@ -43,7 +43,7 @@ public final class ModelStickerPack {
     }
 
     public final long component1() {
-        return this.f2053id;
+        return this.f2059id;
     }
 
     public final List<Sticker> component2() {
@@ -88,7 +88,7 @@ public final class ModelStickerPack {
             return false;
         }
         ModelStickerPack modelStickerPack = (ModelStickerPack) obj;
-        return this.f2053id == modelStickerPack.f2053id && m.areEqual(this.stickers, modelStickerPack.stickers) && m.areEqual(this.name, modelStickerPack.name) && m.areEqual(this.storeListing, modelStickerPack.storeListing) && this.skuId == modelStickerPack.skuId && m.areEqual(this.coverStickerId, modelStickerPack.coverStickerId) && m.areEqual(this.description, modelStickerPack.description) && m.areEqual(this.bannerAssetId, modelStickerPack.bannerAssetId);
+        return this.f2059id == modelStickerPack.f2059id && m.areEqual(this.stickers, modelStickerPack.stickers) && m.areEqual(this.name, modelStickerPack.name) && m.areEqual(this.storeListing, modelStickerPack.storeListing) && this.skuId == modelStickerPack.skuId && m.areEqual(this.coverStickerId, modelStickerPack.coverStickerId) && m.areEqual(this.description, modelStickerPack.description) && m.areEqual(this.bannerAssetId, modelStickerPack.bannerAssetId);
     }
 
     public final Long getBannerAssetId() {
@@ -131,7 +131,7 @@ public final class ModelStickerPack {
     }
 
     public final long getId() {
-        return this.f2053id;
+        return this.f2059id;
     }
 
     public final String getName() {
@@ -151,7 +151,7 @@ public final class ModelStickerPack {
     }
 
     public int hashCode() {
-        long j = this.f2053id;
+        long j = this.f2059id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         List<Sticker> list = this.stickers;
         int i2 = 0;
@@ -179,7 +179,7 @@ public final class ModelStickerPack {
             return false;
         }
         for (Sticker sticker : list) {
-            if (sticker.k()) {
+            if (sticker.l()) {
                 return true;
             }
         }
@@ -202,7 +202,7 @@ public final class ModelStickerPack {
 
     public String toString() {
         StringBuilder L = a.L("ModelStickerPack(id=");
-        L.append(this.f2053id);
+        L.append(this.f2059id);
         L.append(", stickers=");
         L.append(this.stickers);
         L.append(", name=");
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
index 5702d8ff1b..67f4f6912f 100644
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
+++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPackStoreListing.java
@@ -10,7 +10,7 @@ public final class ModelStickerPackStoreListing {
     private final String description;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2054id;
+    private final long f2060id;
     private final ModelSku sku;
     private final ModelStoreAsset thumbnail;
     private final String unpublishedAt;
@@ -19,7 +19,7 @@ public final class ModelStickerPackStoreListing {
         m.checkNotNullParameter(modelSku, "sku");
         m.checkNotNullParameter(str, "description");
         this.sku = modelSku;
-        this.f2054id = j;
+        this.f2060id = j;
         this.description = str;
         this.unpublishedAt = str2;
         this.thumbnail = modelStoreAsset;
@@ -30,7 +30,7 @@ public final class ModelStickerPackStoreListing {
             modelSku = modelStickerPackStoreListing.sku;
         }
         if ((i & 2) != 0) {
-            j = modelStickerPackStoreListing.f2054id;
+            j = modelStickerPackStoreListing.f2060id;
         }
         if ((i & 4) != 0) {
             str = modelStickerPackStoreListing.description;
@@ -49,7 +49,7 @@ public final class ModelStickerPackStoreListing {
     }
 
     public final long component2() {
-        return this.f2054id;
+        return this.f2060id;
     }
 
     public final String component3() {
@@ -78,7 +78,7 @@ public final class ModelStickerPackStoreListing {
             return false;
         }
         ModelStickerPackStoreListing modelStickerPackStoreListing = (ModelStickerPackStoreListing) obj;
-        return m.areEqual(this.sku, modelStickerPackStoreListing.sku) && this.f2054id == modelStickerPackStoreListing.f2054id && m.areEqual(this.description, modelStickerPackStoreListing.description) && m.areEqual(this.unpublishedAt, modelStickerPackStoreListing.unpublishedAt) && m.areEqual(this.thumbnail, modelStickerPackStoreListing.thumbnail);
+        return m.areEqual(this.sku, modelStickerPackStoreListing.sku) && this.f2060id == modelStickerPackStoreListing.f2060id && m.areEqual(this.description, modelStickerPackStoreListing.description) && m.areEqual(this.unpublishedAt, modelStickerPackStoreListing.unpublishedAt) && m.areEqual(this.thumbnail, modelStickerPackStoreListing.thumbnail);
     }
 
     public final String getDescription() {
@@ -86,7 +86,7 @@ public final class ModelStickerPackStoreListing {
     }
 
     public final long getId() {
-        return this.f2054id;
+        return this.f2060id;
     }
 
     public final ModelSku getSku() {
@@ -109,7 +109,7 @@ public final class ModelStickerPackStoreListing {
         ModelSku modelSku = this.sku;
         int i = 0;
         int hashCode = modelSku != null ? modelSku.hashCode() : 0;
-        long j = this.f2054id;
+        long j = this.f2060id;
         int i2 = ((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31;
         String str = this.description;
         int hashCode2 = (i2 + (str != null ? str.hashCode() : 0)) * 31;
@@ -126,7 +126,7 @@ public final class ModelStickerPackStoreListing {
         StringBuilder L = a.L("ModelStickerPackStoreListing(sku=");
         L.append(this.sku);
         L.append(", id=");
-        L.append(this.f2054id);
+        L.append(this.f2060id);
         L.append(", description=");
         L.append(this.description);
         L.append(", unpublishedAt=");
diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelUserStickerPack.java b/app/src/main/java/com/discord/models/sticker/dto/ModelUserStickerPack.java
deleted file mode 100644
index 3d01cb43c6..0000000000
--- a/app/src/main/java/com/discord/models/sticker/dto/ModelUserStickerPack.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.discord.models.sticker.dto;
-
-import c.d.b.a.a;
-import d0.z.d.m;
-/* compiled from: ModelUserStickerPack.kt */
-public final class ModelUserStickerPack {
-    private final long entitlementId;
-    private final boolean hasAccess;
-    private final long packId;
-    private final Integer premiumTypeRequired;
-    private final ModelStickerPack stickerPack;
-    private final long userId;
-
-    public ModelUserStickerPack(long j, long j2, long j3, boolean z2, Integer num, ModelStickerPack modelStickerPack) {
-        this.userId = j;
-        this.packId = j2;
-        this.entitlementId = j3;
-        this.hasAccess = z2;
-        this.premiumTypeRequired = num;
-        this.stickerPack = modelStickerPack;
-    }
-
-    public static /* synthetic */ ModelUserStickerPack copy$default(ModelUserStickerPack modelUserStickerPack, long j, long j2, long j3, boolean z2, Integer num, ModelStickerPack modelStickerPack, int i, Object obj) {
-        return modelUserStickerPack.copy((i & 1) != 0 ? modelUserStickerPack.userId : j, (i & 2) != 0 ? modelUserStickerPack.packId : j2, (i & 4) != 0 ? modelUserStickerPack.entitlementId : j3, (i & 8) != 0 ? modelUserStickerPack.hasAccess : z2, (i & 16) != 0 ? modelUserStickerPack.premiumTypeRequired : num, (i & 32) != 0 ? modelUserStickerPack.stickerPack : modelStickerPack);
-    }
-
-    public final long component1() {
-        return this.userId;
-    }
-
-    public final long component2() {
-        return this.packId;
-    }
-
-    public final long component3() {
-        return this.entitlementId;
-    }
-
-    public final boolean component4() {
-        return this.hasAccess;
-    }
-
-    public final Integer component5() {
-        return this.premiumTypeRequired;
-    }
-
-    public final ModelStickerPack component6() {
-        return this.stickerPack;
-    }
-
-    public final ModelUserStickerPack copy(long j, long j2, long j3, boolean z2, Integer num, ModelStickerPack modelStickerPack) {
-        return new ModelUserStickerPack(j, j2, j3, z2, num, modelStickerPack);
-    }
-
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof ModelUserStickerPack)) {
-            return false;
-        }
-        ModelUserStickerPack modelUserStickerPack = (ModelUserStickerPack) obj;
-        return this.userId == modelUserStickerPack.userId && this.packId == modelUserStickerPack.packId && this.entitlementId == modelUserStickerPack.entitlementId && this.hasAccess == modelUserStickerPack.hasAccess && m.areEqual(this.premiumTypeRequired, modelUserStickerPack.premiumTypeRequired) && m.areEqual(this.stickerPack, modelUserStickerPack.stickerPack);
-    }
-
-    public final long getEntitlementId() {
-        return this.entitlementId;
-    }
-
-    public final boolean getHasAccess() {
-        return this.hasAccess;
-    }
-
-    public final long getPackId() {
-        return this.packId;
-    }
-
-    public final Integer getPremiumTypeRequired() {
-        return this.premiumTypeRequired;
-    }
-
-    public final ModelStickerPack getStickerPack() {
-        return this.stickerPack;
-    }
-
-    public final long getUserId() {
-        return this.userId;
-    }
-
-    public int hashCode() {
-        long j = this.userId;
-        long j2 = this.packId;
-        long j3 = this.entitlementId;
-        int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31;
-        boolean z2 = this.hasAccess;
-        if (z2) {
-            z2 = true;
-        }
-        int i2 = z2 ? 1 : 0;
-        int i3 = z2 ? 1 : 0;
-        int i4 = z2 ? 1 : 0;
-        int i5 = (i + i2) * 31;
-        Integer num = this.premiumTypeRequired;
-        int i6 = 0;
-        int hashCode = (i5 + (num != null ? num.hashCode() : 0)) * 31;
-        ModelStickerPack modelStickerPack = this.stickerPack;
-        if (modelStickerPack != null) {
-            i6 = modelStickerPack.hashCode();
-        }
-        return hashCode + i6;
-    }
-
-    public String toString() {
-        StringBuilder L = a.L("ModelUserStickerPack(userId=");
-        L.append(this.userId);
-        L.append(", packId=");
-        L.append(this.packId);
-        L.append(", entitlementId=");
-        L.append(this.entitlementId);
-        L.append(", hasAccess=");
-        L.append(this.hasAccess);
-        L.append(", premiumTypeRequired=");
-        L.append(this.premiumTypeRequired);
-        L.append(", stickerPack=");
-        L.append(this.stickerPack);
-        L.append(")");
-        return L.toString();
-    }
-}
diff --git a/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java b/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java
index ecfb5072d2..0154d93f83 100644
--- a/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java
+++ b/app/src/main/java/com/discord/models/store/dto/ModelStoreAsset.java
@@ -9,14 +9,14 @@ public final class ModelStoreAsset implements Serializable {
     private final Integer height;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2055id;
+    private final long f2061id;
     private final String mimeType;
     private final int size;
     private final Integer width;
 
     public ModelStoreAsset(long j, int i, String str, String str2, Integer num, Integer num2) {
         m.checkNotNullParameter(str, "mimeType");
-        this.f2055id = j;
+        this.f2061id = j;
         this.size = i;
         this.mimeType = str;
         this.filename = str2;
@@ -25,11 +25,11 @@ public final class ModelStoreAsset implements Serializable {
     }
 
     public static /* synthetic */ ModelStoreAsset copy$default(ModelStoreAsset modelStoreAsset, long j, int i, String str, String str2, Integer num, Integer num2, int i2, Object obj) {
-        return modelStoreAsset.copy((i2 & 1) != 0 ? modelStoreAsset.f2055id : j, (i2 & 2) != 0 ? modelStoreAsset.size : i, (i2 & 4) != 0 ? modelStoreAsset.mimeType : str, (i2 & 8) != 0 ? modelStoreAsset.filename : str2, (i2 & 16) != 0 ? modelStoreAsset.width : num, (i2 & 32) != 0 ? modelStoreAsset.height : num2);
+        return modelStoreAsset.copy((i2 & 1) != 0 ? modelStoreAsset.f2061id : j, (i2 & 2) != 0 ? modelStoreAsset.size : i, (i2 & 4) != 0 ? modelStoreAsset.mimeType : str, (i2 & 8) != 0 ? modelStoreAsset.filename : str2, (i2 & 16) != 0 ? modelStoreAsset.width : num, (i2 & 32) != 0 ? modelStoreAsset.height : num2);
     }
 
     public final long component1() {
-        return this.f2055id;
+        return this.f2061id;
     }
 
     public final int component2() {
@@ -66,7 +66,7 @@ public final class ModelStoreAsset implements Serializable {
             return false;
         }
         ModelStoreAsset modelStoreAsset = (ModelStoreAsset) obj;
-        return this.f2055id == modelStoreAsset.f2055id && this.size == modelStoreAsset.size && m.areEqual(this.mimeType, modelStoreAsset.mimeType) && m.areEqual(this.filename, modelStoreAsset.filename) && m.areEqual(this.width, modelStoreAsset.width) && m.areEqual(this.height, modelStoreAsset.height);
+        return this.f2061id == modelStoreAsset.f2061id && this.size == modelStoreAsset.size && m.areEqual(this.mimeType, modelStoreAsset.mimeType) && m.areEqual(this.filename, modelStoreAsset.filename) && m.areEqual(this.width, modelStoreAsset.width) && m.areEqual(this.height, modelStoreAsset.height);
     }
 
     public final String getFilename() {
@@ -78,7 +78,7 @@ public final class ModelStoreAsset implements Serializable {
     }
 
     public final long getId() {
-        return this.f2055id;
+        return this.f2061id;
     }
 
     public final String getMimeType() {
@@ -95,7 +95,7 @@ public final class ModelStoreAsset implements Serializable {
 
     @Override // java.lang.Object
     public int hashCode() {
-        long j = this.f2055id;
+        long j = this.f2061id;
         int i = ((((int) (j ^ (j >>> 32))) * 31) + this.size) * 31;
         String str = this.mimeType;
         int i2 = 0;
@@ -114,7 +114,7 @@ public final class ModelStoreAsset implements Serializable {
     @Override // java.lang.Object
     public String toString() {
         StringBuilder L = a.L("ModelStoreAsset(id=");
-        L.append(this.f2055id);
+        L.append(this.f2061id);
         L.append(", size=");
         L.append(this.size);
         L.append(", mimeType=");
diff --git a/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java b/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java
index 761fcbe89f..089171c2d9 100644
--- a/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java
+++ b/app/src/main/java/com/discord/models/store/dto/ModelStoreDirectoryLayout.java
@@ -8,11 +8,11 @@ public final class ModelStoreDirectoryLayout {
     private final List<Long> allSkus;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2056id;
+    private final long f2062id;
 
     public ModelStoreDirectoryLayout(long j, List<Long> list) {
         m.checkNotNullParameter(list, "allSkus");
-        this.f2056id = j;
+        this.f2062id = j;
         this.allSkus = list;
     }
 
@@ -20,7 +20,7 @@ public final class ModelStoreDirectoryLayout {
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ModelStoreDirectoryLayout copy$default(ModelStoreDirectoryLayout modelStoreDirectoryLayout, long j, List list, int i, Object obj) {
         if ((i & 1) != 0) {
-            j = modelStoreDirectoryLayout.f2056id;
+            j = modelStoreDirectoryLayout.f2062id;
         }
         if ((i & 2) != 0) {
             list = modelStoreDirectoryLayout.allSkus;
@@ -29,7 +29,7 @@ public final class ModelStoreDirectoryLayout {
     }
 
     public final long component1() {
-        return this.f2056id;
+        return this.f2062id;
     }
 
     public final List<Long> component2() {
@@ -49,7 +49,7 @@ public final class ModelStoreDirectoryLayout {
             return false;
         }
         ModelStoreDirectoryLayout modelStoreDirectoryLayout = (ModelStoreDirectoryLayout) obj;
-        return this.f2056id == modelStoreDirectoryLayout.f2056id && m.areEqual(this.allSkus, modelStoreDirectoryLayout.allSkus);
+        return this.f2062id == modelStoreDirectoryLayout.f2062id && m.areEqual(this.allSkus, modelStoreDirectoryLayout.allSkus);
     }
 
     public final List<Long> getAllSkus() {
@@ -57,11 +57,11 @@ public final class ModelStoreDirectoryLayout {
     }
 
     public final long getId() {
-        return this.f2056id;
+        return this.f2062id;
     }
 
     public int hashCode() {
-        long j = this.f2056id;
+        long j = this.f2062id;
         int i = ((int) (j ^ (j >>> 32))) * 31;
         List<Long> list = this.allSkus;
         return i + (list != null ? list.hashCode() : 0);
@@ -69,7 +69,7 @@ public final class ModelStoreDirectoryLayout {
 
     public String toString() {
         StringBuilder L = a.L("ModelStoreDirectoryLayout(id=");
-        L.append(this.f2056id);
+        L.append(this.f2062id);
         L.append(", allSkus=");
         return a.E(L, this.allSkus, ")");
     }
diff --git a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java
index 8a0cadb88e..aee4057d3a 100644
--- a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java
+++ b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java
@@ -58,8 +58,9 @@ public final class ModelThreadListSync$Parser$parse$1<T> implements Action1<Stri
         }
 
         public final void call(String str) {
+            ThreadMember threadMember = (ThreadMember) InboundGatewayGsonParser.fromJson(this.this$0.$reader, ThreadMember.class);
             m.checkNotNullExpressionValue(str, "threadId");
-            this.this$0.$members.element.add(ThreadMember.a((ThreadMember) InboundGatewayGsonParser.fromJson(this.this$0.$reader, ThreadMember.class), Long.parseLong(str), 0, 0, null, 14));
+            this.this$0.$members.element.add(new ThreadMember(Long.parseLong(str), threadMember.d(), threadMember.a(), threadMember.c()));
         }
     }
 
diff --git a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync.java b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync.java
index b0bf012354..52b679ca95 100644
--- a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync.java
+++ b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync.java
@@ -47,7 +47,9 @@ public final class ModelThreadListSync {
         }
     }
 
-    public ModelThreadListSync(long j, List<Channel> list, List<ThreadMember> list2, List<Message> list3) {
+    /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: java.util.List<? extends com.discord.api.thread.ThreadMember> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public ModelThreadListSync(long j, List<Channel> list, List<? extends ThreadMember> list2, List<Message> list3) {
         m.checkNotNullParameter(list, "threads");
         this.guildId = j;
         this.threads = list;
@@ -89,7 +91,7 @@ public final class ModelThreadListSync {
         return this.mostRecentMessages;
     }
 
-    public final ModelThreadListSync copy(long j, List<Channel> list, List<ThreadMember> list2, List<Message> list3) {
+    public final ModelThreadListSync copy(long j, List<Channel> list, List<? extends ThreadMember> list2, List<Message> list3) {
         m.checkNotNullParameter(list, "threads");
         return new ModelThreadListSync(j, list, list2, list3);
     }
diff --git a/app/src/main/java/com/discord/models/user/CoreUser.java b/app/src/main/java/com/discord/models/user/CoreUser.java
index f0a2fe7dd3..6e214b07aa 100644
--- a/app/src/main/java/com/discord/models/user/CoreUser.java
+++ b/app/src/main/java/com/discord/models/user/CoreUser.java
@@ -7,9 +7,11 @@ import com.discord.api.user.User;
 import com.discord.nullserializable.NullSerializable;
 import d0.g0.s;
 import d0.z.d.m;
+import kotlin.NoWhenBranchMatchedException;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: CoreUser.kt */
 public final class CoreUser implements User {
+    public static final Companion Companion = new Companion(null);
     private final String avatar;
     private final String banner;
     private final String bannerColor;
@@ -18,17 +20,89 @@ public final class CoreUser implements User {
     private final int flags;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2057id;
+    private final long f2063id;
     private final boolean isBot;
     private final boolean isSystemUser;
     private final PremiumTier premiumTier;
     private final int publicFlags;
     private final String username;
 
+    /* compiled from: CoreUser.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        /* JADX WARNING: Removed duplicated region for block: B:50:0x00cf  */
+        /* JADX WARNING: Removed duplicated region for block: B:51:0x00d1  */
+        public final CoreUser merge(CoreUser coreUser, User user) {
+            String str;
+            String str2;
+            String str3;
+            String bio;
+            m.checkNotNullParameter(coreUser, "oldUser");
+            m.checkNotNullParameter(user, "newUser");
+            long i = user.i();
+            String r = user.r();
+            NullSerializable<String> a = user.a();
+            if (a instanceof NullSerializable.b) {
+                str = ((NullSerializable.b) a).b;
+            } else if (a instanceof NullSerializable.a) {
+                str = null;
+            } else if (a == null) {
+                str = coreUser.getAvatar();
+            } else {
+                throw new NoWhenBranchMatchedException();
+            }
+            NullSerializable<String> b = user.b();
+            if (b instanceof NullSerializable.b) {
+                str2 = ((NullSerializable.b) b).b;
+            } else if (b instanceof NullSerializable.a) {
+                str2 = null;
+            } else if (b == null) {
+                str2 = coreUser.getBanner();
+            } else {
+                throw new NoWhenBranchMatchedException();
+            }
+            Boolean e = user.e();
+            boolean booleanValue = e != null ? e.booleanValue() : coreUser.isBot();
+            Boolean p = user.p();
+            boolean booleanValue2 = p != null ? p.booleanValue() : coreUser.isSystemUser();
+            Integer intOrNull = s.toIntOrNull(user.f());
+            int intValue = intOrNull != null ? intOrNull.intValue() : coreUser.getDiscriminator();
+            PremiumTier n = user.n();
+            if (n == null) {
+                n = coreUser.getPremiumTier();
+            }
+            Integer h = user.h();
+            int intValue2 = h != null ? h.intValue() : coreUser.getFlags();
+            Integer o = user.o();
+            int intValue3 = o != null ? o.intValue() : coreUser.getPublicFlags();
+            NullSerializable<String> d = user.d();
+            if (d instanceof NullSerializable.b) {
+                bio = ((NullSerializable.b) d).b;
+            } else if (d instanceof NullSerializable.a) {
+                str3 = null;
+                String c2 = user.c();
+                return new CoreUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, intValue2, intValue3, str3, c2 == null ? c2 : coreUser.getBannerColor());
+            } else if (d == null) {
+                bio = coreUser.getBio();
+            } else {
+                throw new NoWhenBranchMatchedException();
+            }
+            str3 = bio;
+            String c2 = user.c();
+            return new CoreUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, intValue2, intValue3, str3, c2 == null ? c2 : coreUser.getBannerColor());
+        }
+    }
+
     public CoreUser(long j, String str, String str2, String str3, boolean z2, boolean z3, int i, PremiumTier premiumTier, int i2, int i3, String str4, String str5) {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(premiumTier, "premiumTier");
-        this.f2057id = j;
+        this.f2063id = j;
         this.username = str;
         this.avatar = str2;
         this.banner = str3;
@@ -49,7 +123,7 @@ public final class CoreUser implements User {
 
     /* JADX WARNING: Illegal instructions before constructor call */
     public CoreUser(User user) {
-        this(r2, r4, r0, r5, r8, r9, r10, r5, r12, r5 != null ? r5.intValue() : 0, user.d(), user.c());
+        this(r2, r4, r0, r6, r7, r9, r10, r11, r12, r13, r8 != null ? r8.a() : r5, user.c());
         m.checkNotNullParameter(user, "user");
         long i = user.i();
         String r = user.r();
@@ -57,7 +131,7 @@ public final class CoreUser implements User {
         String str = null;
         String a2 = a != null ? a.a() : null;
         NullSerializable<String> b = user.b();
-        str = b != null ? b.a() : str;
+        String a3 = b != null ? b.a() : null;
         Boolean e = user.e();
         boolean booleanValue = e != null ? e.booleanValue() : false;
         Boolean p = user.p();
@@ -69,6 +143,8 @@ public final class CoreUser implements User {
         Integer h = user.h();
         int intValue2 = h != null ? h.intValue() : 0;
         Integer o = user.o();
+        int intValue3 = o != null ? o.intValue() : 0;
+        NullSerializable<String> d = user.d();
     }
 
     public static /* synthetic */ CoreUser copy$default(CoreUser coreUser, long j, String str, String str2, String str3, boolean z2, boolean z3, int i, PremiumTier premiumTier, int i2, int i3, String str4, String str5, int i4, Object obj) {
@@ -173,7 +249,7 @@ public final class CoreUser implements User {
 
     @Override // com.discord.models.user.User
     public long getId() {
-        return this.f2057id;
+        return this.f2063id;
     }
 
     @Override // com.discord.models.user.User
diff --git a/app/src/main/java/com/discord/models/user/MeUser.java b/app/src/main/java/com/discord/models/user/MeUser.java
index bfc5de466e..2b1f56af97 100644
--- a/app/src/main/java/com/discord/models/user/MeUser.java
+++ b/app/src/main/java/com/discord/models/user/MeUser.java
@@ -25,7 +25,7 @@ public final class MeUser implements User {
     private final boolean hasBirthday;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2058id;
+    private final long f2064id;
     private final boolean isBot;
     private final boolean isSystemUser;
     private final boolean isVerified;
@@ -47,15 +47,18 @@ public final class MeUser implements User {
         }
 
         /* JADX WARNING: Removed duplicated region for block: B:64:0x0112  */
-        /* JADX WARNING: Removed duplicated region for block: B:67:0x011f  */
-        /* JADX WARNING: Removed duplicated region for block: B:70:0x012c  */
+        /* JADX WARNING: Removed duplicated region for block: B:67:0x0120  */
+        /* JADX WARNING: Removed duplicated region for block: B:69:0x0129  */
+        /* JADX WARNING: Removed duplicated region for block: B:76:0x013e  */
         public final MeUser merge(MeUser meUser, User user) {
             String str;
             String str2;
             String str3;
             NsfwAllowance l;
-            String d;
+            NullSerializable<String> d;
+            String str4;
             String c2;
+            String bio;
             String phoneNumber;
             m.checkNotNullParameter(meUser, "oldUser");
             m.checkNotNullParameter(user, "newUser");
@@ -119,14 +122,25 @@ public final class MeUser implements User {
                     l = meUser.getNsfwAllowance();
                 }
                 d = user.d();
-                if (d == null) {
-                    d = meUser.getBio();
+                if (!(d instanceof NullSerializable.b)) {
+                    bio = ((NullSerializable.b) d).b;
+                } else if (d instanceof NullSerializable.a) {
+                    str4 = null;
+                    c2 = user.c();
+                    if (c2 == null) {
+                        c2 = meUser.getBannerColor();
+                    }
+                    return new MeUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, g, booleanValue3, booleanValue4, q, intValue2, intValue3, str3, l, str4, c2);
+                } else if (d == null) {
+                    bio = meUser.getBio();
+                } else {
+                    throw new NoWhenBranchMatchedException();
                 }
+                str4 = bio;
                 c2 = user.c();
                 if (c2 == null) {
-                    c2 = meUser.getBannerColor();
                 }
-                return new MeUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, g, booleanValue3, booleanValue4, q, intValue2, intValue3, str3, l, d, c2);
+                return new MeUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, g, booleanValue3, booleanValue4, q, intValue2, intValue3, str3, l, str4, c2);
             } else if (m == null) {
                 phoneNumber = meUser.getPhoneNumber();
             } else {
@@ -137,12 +151,13 @@ public final class MeUser implements User {
             if (l == null) {
             }
             d = user.d();
-            if (d == null) {
+            if (!(d instanceof NullSerializable.b)) {
             }
+            str4 = bio;
             c2 = user.c();
             if (c2 == null) {
             }
-            return new MeUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, g, booleanValue3, booleanValue4, q, intValue2, intValue3, str3, l, d, c2);
+            return new MeUser(i, r, str, str2, booleanValue, booleanValue2, intValue, n, g, booleanValue3, booleanValue4, q, intValue2, intValue3, str3, l, str4, c2);
         }
     }
 
@@ -150,7 +165,7 @@ public final class MeUser implements User {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(premiumTier, "premiumTier");
         m.checkNotNullParameter(nsfwAllowance, "nsfwAllowance");
-        this.f2058id = j;
+        this.f2064id = j;
         this.username = str;
         this.avatar = str2;
         this.banner = str3;
@@ -178,7 +193,7 @@ public final class MeUser implements User {
 
     /* JADX WARNING: Illegal instructions before constructor call */
     public MeUser(User user) {
-        this(r3, r5, r6, r7, r0, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r2 == null ? NsfwAllowance.UNKNOWN : r2, user.d(), user.c());
+        this(r2, r4, r0, r6, r7, r9, r10, r11, r12, r13, r14, r15, r16, r17, r19, r5, r5 != null ? r5.a() : null, user.c());
         String str;
         m.checkNotNullParameter(user, "user");
         long i = user.i();
@@ -216,6 +231,8 @@ public final class MeUser implements User {
             str = null;
         }
         NsfwAllowance l = user.l();
+        l = l == null ? NsfwAllowance.UNKNOWN : l;
+        NullSerializable<String> d = user.d();
     }
 
     public static /* synthetic */ MeUser copy$default(MeUser meUser, long j, String str, String str2, String str3, boolean z2, boolean z3, int i, PremiumTier premiumTier, String str4, boolean z4, boolean z5, String str5, int i2, int i3, String str6, NsfwAllowance nsfwAllowance, String str7, String str8, int i4, Object obj) {
@@ -353,7 +370,7 @@ public final class MeUser implements User {
 
     @Override // com.discord.models.user.User
     public long getId() {
-        return this.f2058id;
+        return this.f2064id;
     }
 
     public final boolean getMfaEnabled() {
diff --git a/app/src/main/java/com/discord/nullserializable/NullSerializableTypeAdapter.java b/app/src/main/java/com/discord/nullserializable/NullSerializableTypeAdapter.java
index f74dbc29d8..e11ff1470e 100644
--- a/app/src/main/java/com/discord/nullserializable/NullSerializableTypeAdapter.java
+++ b/app/src/main/java/com/discord/nullserializable/NullSerializableTypeAdapter.java
@@ -38,15 +38,15 @@ public final class NullSerializableTypeAdapter<T> extends TypeAdapter<NullSerial
             Objects.requireNonNull(i, "null cannot be cast to non-null type com.google.gson.TypeAdapter<T>");
             i.write(jsonWriter, a);
         } else if (nullSerializable instanceof NullSerializable.a) {
-            boolean z2 = jsonWriter.f2366s;
-            jsonWriter.f2366s = true;
+            boolean z2 = jsonWriter.f2372s;
+            jsonWriter.f2372s = true;
             jsonWriter.s();
-            jsonWriter.f2366s = z2;
+            jsonWriter.f2372s = z2;
         } else if (nullSerializable == null) {
-            boolean z3 = jsonWriter.f2366s;
-            jsonWriter.f2366s = false;
+            boolean z3 = jsonWriter.f2372s;
+            jsonWriter.f2372s = false;
             jsonWriter.s();
-            jsonWriter.f2366s = z3;
+            jsonWriter.f2372s = z3;
         }
     }
 }
diff --git a/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java b/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java
index 8627c40799..20d54679c0 100644
--- a/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java
+++ b/app/src/main/java/com/discord/overlay/views/OverlayBubbleWrap.java
@@ -41,7 +41,7 @@ public class OverlayBubbleWrap extends FrameLayout {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final SpringAnimation f2059s;
+    public final SpringAnimation f2065s;
     public final SpringAnimation t;
     public Point u;
     public Point v;
@@ -117,7 +117,7 @@ public class OverlayBubbleWrap extends FrameLayout {
         SpringForce spring2 = springAnimation.getSpring();
         m.checkNotNullExpressionValue(spring2, "spring");
         spring2.setDampingRatio(0.75f);
-        this.f2059s = springAnimation;
+        this.f2065s = springAnimation;
         SpringAnimation springAnimation2 = new SpringAnimation(this, DynamicAnimation.Y, 0.0f);
         springAnimation2.setStartVelocity(50.0f);
         SpringForce spring3 = springAnimation2.getSpring();
@@ -142,7 +142,7 @@ public class OverlayBubbleWrap extends FrameLayout {
         }
         m.checkNotNullParameter(rect2, "screenBounds");
         int min = Math.min(Math.max(rect2.left, i2), rect2.right - overlayBubbleWrap.getWidth());
-        SpringAnimation springAnimation = overlayBubbleWrap.f2059s;
+        SpringAnimation springAnimation = overlayBubbleWrap.f2065s;
         m.checkNotNullParameter(springAnimation, "$this$animateTo");
         springAnimation.cancel();
         springAnimation.setStartValue((float) overlayBubbleWrap.k.x);
@@ -169,7 +169,7 @@ public class OverlayBubbleWrap extends FrameLayout {
         L.append(this.u);
         Log.d(simpleName, L.toString());
         this.v = null;
-        this.f2059s.cancel();
+        this.f2065s.cancel();
         this.t.cancel();
         if (z2) {
             Point point = this.u;
@@ -292,7 +292,7 @@ public class OverlayBubbleWrap extends FrameLayout {
     }
 
     public final SpringAnimation getSpringAnimationX() {
-        return this.f2059s;
+        return this.f2065s;
     }
 
     public final SpringAnimation getSpringAnimationY() {
diff --git a/app/src/main/java/com/discord/player/AppMediaPlayer.java b/app/src/main/java/com/discord/player/AppMediaPlayer.java
index 230305fbdb..b8a455ec9c 100644
--- a/app/src/main/java/com/discord/player/AppMediaPlayer.java
+++ b/app/src/main/java/com/discord/player/AppMediaPlayer.java
@@ -60,7 +60,7 @@ public final class AppMediaPlayer {
     public Subscription b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final CompositeSubscription f2060c;
+    public final CompositeSubscription f2066c;
     public final BehaviorSubject<Float> d;
     public MediaSource e;
     public final p1 f;
@@ -160,25 +160,25 @@ public final class AppMediaPlayer {
         this.h = aVar;
         this.i = scheduler;
         this.j = logger;
-        PublishSubject<Event> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.a = l0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.a = k0;
         CompositeSubscription compositeSubscription = new CompositeSubscription();
-        this.f2060c = compositeSubscription;
-        BehaviorSubject<Float> m0 = BehaviorSubject.m0(Float.valueOf(p1Var.B));
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(exoPlayer.volume)");
-        this.d = m0;
+        this.f2066c = compositeSubscription;
+        BehaviorSubject<Float> l0 = BehaviorSubject.l0(Float.valueOf(p1Var.B));
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(exoPlayer.volume)");
+        this.d = l0;
         PublishSubject<k.c> publishSubject = kVar.i;
         m.checkNotNullExpressionValue(publishSubject, "playerStateChangeSubject");
-        compositeSubscription.a(publishSubject.K().X(new e(this), new f(this)));
+        compositeSubscription.a(publishSubject.J().W(new e(this), new f(this)));
         PublishSubject<k.a> publishSubject2 = kVar.j;
         m.checkNotNullExpressionValue(publishSubject2, "isPlayingChangeSubject");
-        compositeSubscription.a(publishSubject2.L().X(new a(this), new b(this)));
+        compositeSubscription.a(publishSubject2.K().W(new a(this), new b(this)));
         MediaSource mediaSource = this.e;
         String str = (mediaSource == null || (str = mediaSource.j) == null) ? "" : str;
         PublishSubject<k.b> publishSubject3 = kVar.k;
         m.checkNotNullExpressionValue(publishSubject3, "playerErrorSubject");
-        compositeSubscription.a(publishSubject3.K().X(new c(this, str), new d(this)));
+        compositeSubscription.a(publishSubject3.J().W(new c(this, str), new d(this)));
     }
 
     public static /* synthetic */ void b(AppMediaPlayer appMediaPlayer, MediaSource mediaSource, boolean z2, boolean z3, long j, PlayerView playerView, PlayerControlView playerControlView, int i) {
@@ -286,7 +286,7 @@ public final class AppMediaPlayer {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        this.f2060c.unsubscribe();
+        this.f2066c.unsubscribe();
         p1 p1Var = this.f;
         p1Var.Z();
         if (f0.a < 21 && (audioTrack = p1Var.r) != null) {
diff --git a/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java b/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java
index 750be48faf..11e198ef5d 100644
--- a/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/BreadcrumbInterceptor.java
@@ -19,7 +19,7 @@ public final class BreadcrumbInterceptor implements Interceptor {
     public Response intercept(Interceptor.Chain chain) {
         m.checkNotNullParameter(chain, "chain");
         z c2 = chain.c();
-        String str = c2.f2767c;
+        String str = c2.f2773c;
         w wVar = c2.b;
         Logger logger = this.logger;
         logger.recordBreadcrumb("HTTP[" + str + "] - " + wVar, "http");
diff --git a/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java b/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
index 49eec1b37f..4de1460671 100644
--- a/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/RequiredHeadersInterceptor.java
@@ -46,7 +46,7 @@ public final class RequiredHeadersInterceptor implements Interceptor {
         m.checkParameterIsNotNull(c2, "request");
         new LinkedHashMap();
         w wVar = c2.b;
-        String str = c2.f2767c;
+        String str = c2.f2773c;
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
diff --git a/app/src/main/java/com/discord/restapi/RestAPIBuilder.java b/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
index 1a5b0269e6..2d4b796495 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIBuilder.java
@@ -99,7 +99,7 @@ public final class RestAPIBuilder {
         String str3;
         String str4;
         e eVar = new e();
-        eVar.f1387c = c.LOWER_CASE_WITH_UNDERSCORES;
+        eVar.f1382c = c.LOWER_CASE_WITH_UNDERSCORES;
         m.checkNotNullExpressionValue(eVar, "GsonBuilder()\n        .s…ER_CASE_WITH_UNDERSCORES)");
         a.a(eVar);
         eVar.e.add(new Model.TypeAdapterFactory());
@@ -185,7 +185,7 @@ public final class RestAPIBuilder {
         if (list != null) {
             for (Interceptor interceptor : list) {
                 m.checkParameterIsNotNull(interceptor, "interceptor");
-                aVar.f2762c.add(interceptor);
+                aVar.f2768c.add(interceptor);
             }
         }
         if (l != null) {
@@ -194,10 +194,10 @@ public final class RestAPIBuilder {
             aVar.a(longValue, timeUnit);
             long longValue2 = l.longValue();
             m.checkParameterIsNotNull(timeUnit, "unit");
-            aVar.f2766z = f0.f0.c.b("timeout", longValue2, timeUnit);
+            aVar.f2772z = f0.f0.c.b("timeout", longValue2, timeUnit);
             long longValue3 = l.longValue();
             m.checkParameterIsNotNull(timeUnit, "unit");
-            aVar.f2764x = f0.f0.c.b("timeout", longValue3, timeUnit);
+            aVar.f2770x = f0.f0.c.b("timeout", longValue3, timeUnit);
         }
         p pVar = this.cookieJar;
         m.checkParameterIsNotNull(pVar, "cookieJar");
diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java
index 100dda72c7..3658d2fb70 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java
@@ -34,6 +34,7 @@ import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.thread.ThreadListing;
 import com.discord.api.thread.ThreadMember;
+import com.discord.api.user.PatchUserBody;
 import com.discord.api.user.User;
 import com.discord.api.user.UserSurveyFetchResponse;
 import com.discord.models.domain.Consents;
@@ -244,8 +245,8 @@ public interface RestAPIInterface {
     @n("guilds/{guildId}/members/@me/nick")
     Observable<Void> changeGuildNickname(@s("guildId") long j, @a RestAPIParams.Nick nick);
 
-    @i0.g0.o("users/@me/promotions/{promoId}/claim-outbound")
-    Observable<Void> claimOutboundPromotion();
+    @i0.g0.o("outbound-promotions/{promotionId}/claim")
+    Observable<ClaimedOutboundPromotion> claimOutboundPromotion(@s("promotionId") long j);
 
     @i0.g0.o("store/skus/{skuId}/purchase")
     Observable<Unit> claimSku(@s("skuId") long j, @a RestAPIParams.EmptyBody emptyBody);
@@ -415,7 +416,7 @@ public interface RestAPIInterface {
     @f("channels/{channelId}/pins")
     Observable<List<Message>> getChannelPins(@s("channelId") long j);
 
-    @f("/users/@me/outbound-promotions/codes")
+    @f("users/@me/outbound-promotions/codes")
     Observable<List<ClaimedOutboundPromotion>> getClaimedOutboundPromotions();
 
     @f("users/@me/connections/{platformType}/{accountId}/access-token")
@@ -541,6 +542,9 @@ public interface RestAPIInterface {
     @f("stickers/{stickerId}")
     Observable<Sticker> getSticker(@s("stickerId") long j);
 
+    @f("stickers/{stickerId}/guild")
+    Observable<Guild> getStickerGuild(@s("stickerId") long j);
+
     @f("sticker-packs/{packId}")
     Observable<ModelStickerPack> getStickerPack(@s("packId") long j);
 
@@ -607,6 +611,9 @@ public interface RestAPIInterface {
     @n("guilds/{guildId}/emojis/{emojiId}")
     Observable<ModelEmojiGuild> patchGuildEmoji(@s("guildId") long j, @s("emojiId") long j2, @a RestAPIParams.PatchGuildEmoji patchGuildEmoji);
 
+    @n("users/@me")
+    Observable<User> patchUser(@a PatchUserBody patchUserBody);
+
     @n("users/@me")
     Observable<User> patchUser(@a RestAPIParams.UserInfo userInfo);
 
diff --git a/app/src/main/java/com/discord/restapi/RestAPIParams.java b/app/src/main/java/com/discord/restapi/RestAPIParams.java
index 70c2370184..dd8137cc2d 100644
--- a/app/src/main/java/com/discord/restapi/RestAPIParams.java
+++ b/app/src/main/java/com/discord/restapi/RestAPIParams.java
@@ -319,7 +319,7 @@ public final class RestAPIParams {
         private final Long deny;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2061id;
+        private final String f2067id;
         private final Integer type;
 
         /* compiled from: RestAPIParams.kt */
@@ -367,7 +367,7 @@ public final class RestAPIParams {
 
         private ChannelPermissionOverwrites(Integer num, String str, Long l, Long l2) {
             this.type = num;
-            this.f2061id = str;
+            this.f2067id = str;
             this.allow = l;
             this.deny = l2;
         }
@@ -391,7 +391,7 @@ public final class RestAPIParams {
         public static final long PARENT_ID_NONE = -1;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2062id;
+        private final long f2068id;
         private final Long parentId;
         private final int position;
 
@@ -428,13 +428,13 @@ public final class RestAPIParams {
         }
 
         public ChannelPosition(long j, int i, Long l) {
-            this.f2062id = j;
+            this.f2068id = j;
             this.position = i;
             this.parentId = l;
         }
 
         public final long getId() {
-            return this.f2062id;
+            return this.f2068id;
         }
 
         public final Long getParentId() {
@@ -928,7 +928,7 @@ public final class RestAPIParams {
         private final boolean friend_sync;
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2063id;
+        private final String f2069id;
         private final String name;
         private final boolean revoked;
         private final boolean show_activity;
@@ -961,7 +961,7 @@ public final class RestAPIParams {
             m.checkNotNullParameter(str, "id");
             m.checkNotNullParameter(str3, "type");
             this.friend_sync = z2;
-            this.f2063id = str;
+            this.f2069id = str;
             this.name = str2;
             this.revoked = z3;
             this.show_activity = z4;
@@ -1188,7 +1188,7 @@ public final class RestAPIParams {
     public static final class CreateGuildChannel {
 
         /* renamed from: id  reason: collision with root package name */
-        private final Long f2064id;
+        private final Long f2070id;
         private final String name;
         private final Long parentId;
         private final List<ChannelPermissionOverwrites> permissionOverwrites;
@@ -1197,7 +1197,7 @@ public final class RestAPIParams {
 
         public CreateGuildChannel(int i, Long l, String str, Long l2, List<ChannelPermissionOverwrites> list, String str2) {
             this.type = i;
-            this.f2064id = l;
+            this.f2070id = l;
             this.name = str;
             this.parentId = l2;
             this.permissionOverwrites = list;
@@ -1352,12 +1352,12 @@ public final class RestAPIParams {
     public static final class EnableIntegration {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2065id;
+        private final String f2071id;
         private final String type;
 
         public EnableIntegration(String str, String str2) {
             this.type = str;
-            this.f2065id = str2;
+            this.f2071id = str2;
         }
     }
 
@@ -2282,7 +2282,7 @@ public final class RestAPIParams {
         private Boolean hoist;
 
         /* renamed from: id  reason: collision with root package name */
-        private long f2066id;
+        private long f2072id;
         private Boolean mentionable;
         private String name;
         private Long permissions;
@@ -2318,7 +2318,7 @@ public final class RestAPIParams {
             this.color = num;
             this.position = num2;
             this.permissions = l;
-            this.f2066id = j;
+            this.f2072id = j;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -2343,7 +2343,7 @@ public final class RestAPIParams {
         }
 
         public final long getId() {
-            return this.f2066id;
+            return this.f2072id;
         }
 
         public final Boolean getMentionable() {
@@ -2371,7 +2371,7 @@ public final class RestAPIParams {
         }
 
         public final void setId(long j) {
-            this.f2066id = j;
+            this.f2072id = j;
         }
 
         public final void setMentionable(Boolean bool) {
@@ -2573,18 +2573,20 @@ public final class RestAPIParams {
 
     /* compiled from: RestAPIParams.kt */
     public static final class TextChannel {
+        private final Integer defaultAutoArchiveDuration;
         private final String name;
         private final Boolean nsfw;
         private final Integer rateLimitPerUser;
         private final String topic;
         private final Integer type;
 
-        public TextChannel(String str, Integer num, String str2, Boolean bool, Integer num2) {
+        public TextChannel(String str, Integer num, String str2, Boolean bool, Integer num2, Integer num3) {
             this.name = str;
             this.type = num;
             this.topic = str2;
             this.nsfw = bool;
             this.rateLimitPerUser = num2;
+            this.defaultAutoArchiveDuration = num3;
         }
     }
 
@@ -2592,39 +2594,48 @@ public final class RestAPIParams {
     public static final class ThreadCreationSettings {
         private final Integer autoArchiveDuration;
         private final String name;
+        private final int type;
 
-        public ThreadCreationSettings(String str, Integer num) {
+        public ThreadCreationSettings(String str, int i, Integer num) {
             m.checkNotNullParameter(str, "name");
             this.name = str;
+            this.type = i;
             this.autoArchiveDuration = num;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ ThreadCreationSettings(String str, Integer num, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this(str, (i & 2) != 0 ? null : num);
+        public /* synthetic */ ThreadCreationSettings(String str, int i, Integer num, int i2, DefaultConstructorMarker defaultConstructorMarker) {
+            this(str, i, (i2 & 4) != 0 ? null : num);
         }
 
         private final String component1() {
             return this.name;
         }
 
-        private final Integer component2() {
+        private final int component2() {
+            return this.type;
+        }
+
+        private final Integer component3() {
             return this.autoArchiveDuration;
         }
 
-        public static /* synthetic */ ThreadCreationSettings copy$default(ThreadCreationSettings threadCreationSettings, String str, Integer num, int i, Object obj) {
-            if ((i & 1) != 0) {
+        public static /* synthetic */ ThreadCreationSettings copy$default(ThreadCreationSettings threadCreationSettings, String str, int i, Integer num, int i2, Object obj) {
+            if ((i2 & 1) != 0) {
                 str = threadCreationSettings.name;
             }
-            if ((i & 2) != 0) {
+            if ((i2 & 2) != 0) {
+                i = threadCreationSettings.type;
+            }
+            if ((i2 & 4) != 0) {
                 num = threadCreationSettings.autoArchiveDuration;
             }
-            return threadCreationSettings.copy(str, num);
+            return threadCreationSettings.copy(str, i, num);
         }
 
-        public final ThreadCreationSettings copy(String str, Integer num) {
+        public final ThreadCreationSettings copy(String str, int i, Integer num) {
             m.checkNotNullParameter(str, "name");
-            return new ThreadCreationSettings(str, num);
+            return new ThreadCreationSettings(str, i, num);
         }
 
         public boolean equals(Object obj) {
@@ -2635,13 +2646,13 @@ public final class RestAPIParams {
                 return false;
             }
             ThreadCreationSettings threadCreationSettings = (ThreadCreationSettings) obj;
-            return m.areEqual(this.name, threadCreationSettings.name) && m.areEqual(this.autoArchiveDuration, threadCreationSettings.autoArchiveDuration);
+            return m.areEqual(this.name, threadCreationSettings.name) && this.type == threadCreationSettings.type && m.areEqual(this.autoArchiveDuration, threadCreationSettings.autoArchiveDuration);
         }
 
         public int hashCode() {
             String str = this.name;
             int i = 0;
-            int hashCode = (str != null ? str.hashCode() : 0) * 31;
+            int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.type) * 31;
             Integer num = this.autoArchiveDuration;
             if (num != null) {
                 i = num.hashCode();
@@ -2652,6 +2663,8 @@ public final class RestAPIParams {
         public String toString() {
             StringBuilder L = a.L("ThreadCreationSettings(name=");
             L.append(this.name);
+            L.append(", type=");
+            L.append(this.type);
             L.append(", autoArchiveDuration=");
             return a.B(L, this.autoArchiveDuration, ")");
         }
diff --git a/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java b/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
index 91020449e1..e11210f5f3 100644
--- a/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
+++ b/app/src/main/java/com/discord/restapi/SpotifyTokenInterceptor.java
@@ -31,7 +31,7 @@ public final class SpotifyTokenInterceptor implements Interceptor {
         m.checkParameterIsNotNull(c2, "request");
         new LinkedHashMap();
         w wVar = c2.b;
-        String str = c2.f2767c;
+        String str = c2.f2773c;
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
diff --git a/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java b/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java
index 46ff4ef11e..b3fdd75669 100644
--- a/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java
+++ b/app/src/main/java/com/discord/restapi/utils/CountingRequestBody.java
@@ -51,7 +51,7 @@ public final class CountingRequestBody extends RequestBody {
         m.checkNotNullParameter(requestBody, "delegate");
         this.delegate = requestBody;
         this.ignoreWriteToCount = i;
-        this.bytesWrittenSubject = BehaviorSubject.m0(0L);
+        this.bytesWrittenSubject = BehaviorSubject.l0(0L);
         this.estimatedContentLength = requestBody.contentLength();
     }
 
@@ -81,9 +81,9 @@ public final class CountingRequestBody extends RequestBody {
     }
 
     public final Observable<Long> getBytesWrittenObservable() {
-        Observable<Long> L = this.bytesWrittenSubject.s().L();
-        m.checkNotNullExpressionValue(L, "bytesWrittenSubject.dist…().onBackpressureLatest()");
-        return L;
+        Observable<Long> K = this.bytesWrittenSubject.r().K();
+        m.checkNotNullExpressionValue(K, "bytesWrittenSubject.dist…().onBackpressureLatest()");
+        return K;
     }
 
     public final long getEstimatedContentLength() {
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
index 80980694ef..69aca6d22a 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$restRetry$1.java
@@ -33,7 +33,7 @@ public final class RetryWithDelay$restRetry$1 extends o implements Function1<Thr
             HttpException httpException = (HttpException) th;
             int a = httpException.a();
             x<?> xVar = httpException.i;
-            if (!(xVar == null || (response = xVar.a) == null || (zVar = response.i) == null || (str = zVar.f2767c) == null || !(!m.areEqual(str, "GET"))) || a == 401 || a == 429 || a == 503 || a == 403 || a == 404) {
+            if (!(xVar == null || (response = xVar.a) == null || (zVar = response.i) == null || (str = zVar.f2773c) == null || !(!m.areEqual(str, "GET"))) || a == 401 || a == 429 || a == 503 || a == 403 || a == 404) {
                 return false;
             }
         } else if (th instanceof TimeoutException) {
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java
index 42bd100d94..0cc8ac6b93 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay$retryWithDelay$1.java
@@ -40,9 +40,9 @@ public final class RetryWithDelay$retryWithDelay$1<T, R> implements b<Throwable,
                 if (i2 < this.$maxHalfLives && i3 > 1) {
                     this.$currentDelayMillis.element *= (long) 2;
                 }
-                return Observable.e0(this.$currentDelayMillis.element, TimeUnit.MILLISECONDS);
+                return Observable.d0(this.$currentDelayMillis.element, TimeUnit.MILLISECONDS);
             }
         }
-        return Observable.x(th);
+        return Observable.w(th);
     }
 }
diff --git a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java
index 4e938f55bf..bb0a55dcc8 100644
--- a/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java
+++ b/app/src/main/java/com/discord/restapi/utils/RetryWithDelay.java
@@ -51,24 +51,24 @@ public final class RetryWithDelay {
         ref$IntRef2.element = 0;
         Ref$LongRef ref$LongRef = new Ref$LongRef();
         ref$LongRef.element = j;
-        Observable<R> A = observable.A(new RetryWithDelay$retryWithDelay$1(intValue, ref$IntRef, function1, intValue2, ref$IntRef2, ref$LongRef));
-        m.checkNotNullExpressionValue(A, "flatMap {\n      if (curr…able.error<Any>(it)\n    }");
-        return A;
+        Observable<R> z2 = observable.z(new RetryWithDelay$retryWithDelay$1(intValue, ref$IntRef, function1, intValue2, ref$IntRef2, ref$LongRef));
+        m.checkNotNullExpressionValue(z2, "flatMap {\n      if (curr…able.error<Any>(it)\n    }");
+        return z2;
     }
 
     public final <T> Observable<T> restRetry(Observable<T> observable, long j, Integer num, Integer num2) {
         m.checkNotNullParameter(observable, "$this$restRetry");
         RetryWithDelay$restRetry$1 retryWithDelay$restRetry$1 = RetryWithDelay$restRetry$1.INSTANCE;
-        Observable<T> O = observable.O(new RetryWithDelay$restRetry$2(j, num, num2));
-        m.checkNotNullExpressionValue(O, "retryWhen { it.retryWith…ries, ::isNetworkError) }");
-        return O;
+        Observable<T> N = observable.N(new RetryWithDelay$restRetry$2(j, num, num2));
+        m.checkNotNullExpressionValue(N, "retryWhen { it.retryWith…ries, ::isNetworkError) }");
+        return N;
     }
 
     public final <T> Observable<T> restRetry(Observable<T> observable, long j, Integer num, Integer num2, Function1<? super Throwable, Boolean> function1) {
         m.checkNotNullParameter(observable, "$this$restRetry");
         m.checkNotNullParameter(function1, "predicate");
-        Observable<T> O = observable.O(new RetryWithDelay$restRetry$3(j, num, num2, function1));
-        m.checkNotNullExpressionValue(O, "retryWhen { it.retryWith… maxRetries, predicate) }");
-        return O;
+        Observable<T> N = observable.N(new RetryWithDelay$restRetry$3(j, num, num2, function1));
+        m.checkNotNullExpressionValue(N, "retryWhen { it.retryWith… maxRetries, predicate) }");
+        return N;
     }
 }
diff --git a/app/src/main/java/com/discord/rlottie/RLottieDrawable.java b/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
index f877f21a29..1e74595dce 100644
--- a/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
+++ b/app/src/main/java/com/discord/rlottie/RLottieDrawable.java
@@ -66,20 +66,20 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Integer[] f2067s;
+    public Integer[] f2073s;
     public final HashMap<String, Integer> t;
     public volatile HashMap<String, Integer> u;
     public PlaybackMode v;
     public int w;
 
     /* renamed from: x  reason: collision with root package name */
-    public long f2068x;
+    public long f2074x;
 
     /* renamed from: y  reason: collision with root package name */
-    public volatile boolean f2069y;
+    public volatile boolean f2075y;
 
     /* renamed from: z  reason: collision with root package name */
-    public Runnable f2070z;
+    public Runnable f2076z;
 
     /* compiled from: RLottieDrawable.kt */
     public static final class Companion {
@@ -92,7 +92,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
 
         public final native long createWithJson(String str, String str2, int[] iArr, int[] iArr2);
 
-        public final native int getFrame(long j, int i, Bitmap bitmap, int i2, int i3, int i4);
+        public final native int getFrame(long j, int i, Bitmap bitmap, int i2, int i3, int i4, boolean z2);
 
         public final native void replaceColors(long j, int[] iArr);
 
@@ -145,12 +145,12 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                         } catch (Exception unused) {
                         }
                         RLottieDrawable rLottieDrawable2 = (RLottieDrawable) this.j;
-                        Integer[] numArr = rLottieDrawable2.f2067s;
+                        Integer[] numArr = rLottieDrawable2.f2073s;
                         if (numArr != null) {
                             RLottieDrawable.n.replaceColors(rLottieDrawable2.P, k.toIntArray(numArr));
                         }
                         RLottieDrawable rLottieDrawable3 = (RLottieDrawable) this.j;
-                        rLottieDrawable3.f2067s = null;
+                        rLottieDrawable3.f2073s = null;
                         try {
                             Companion companion = RLottieDrawable.n;
                             long j = rLottieDrawable3.P;
@@ -163,7 +163,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                             int i3 = rLottieDrawable5.p;
                             Bitmap bitmap2 = rLottieDrawable5.D;
                             m.checkNotNull(bitmap2);
-                            if (companion.getFrame(j, i, bitmap, i2, i3, bitmap2.getRowBytes()) == -1) {
+                            if (companion.getFrame(j, i, bitmap, i2, i3, bitmap2.getRowBytes(), true) == -1) {
                                 RLottieDrawable.i.post(((RLottieDrawable) this.j).R);
                                 return;
                             }
@@ -184,20 +184,20 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                                 PlaybackMode playbackMode = rLottieDrawable8.v;
                                 if (playbackMode == PlaybackMode.LOOP) {
                                     rLottieDrawable8.H = 0;
-                                    rLottieDrawable8.f2069y = false;
+                                    rLottieDrawable8.f2075y = false;
                                 } else if (playbackMode == PlaybackMode.ONCE) {
                                     rLottieDrawable8.H = 0;
-                                    rLottieDrawable8.f2069y = true;
+                                    rLottieDrawable8.f2075y = true;
                                     ((RLottieDrawable) this.j).w++;
                                 } else {
-                                    rLottieDrawable8.f2069y = true;
+                                    rLottieDrawable8.f2075y = true;
                                 }
                             } else if (rLottieDrawable8.v == PlaybackMode.FREEZE) {
-                                rLottieDrawable8.f2069y = true;
+                                rLottieDrawable8.f2075y = true;
                                 ((RLottieDrawable) this.j).w++;
                             } else {
                                 rLottieDrawable8.H = i5;
-                                rLottieDrawable8.f2069y = false;
+                                rLottieDrawable8.f2075y = false;
                             }
                         } catch (Exception e) {
                             Log.e("RLottieDrawable", "Error loading frame", e);
@@ -213,7 +213,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                     return;
                 case 2:
                     RLottieDrawable rLottieDrawable10 = (RLottieDrawable) this.j;
-                    rLottieDrawable10.f2070z = null;
+                    rLottieDrawable10.f2076z = null;
                     RLottieDrawable.a(rLottieDrawable10);
                     return;
                 case 3:
@@ -222,14 +222,14 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                     if (!(((RLottieDrawable) this.j).P == 0 || (threadPoolExecutor = RLottieDrawable.m) == null)) {
                         RLottieDrawable rLottieDrawable11 = (RLottieDrawable) this.j;
                         Runnable runnable = rLottieDrawable11.U;
-                        rLottieDrawable11.f2070z = runnable;
+                        rLottieDrawable11.f2076z = runnable;
                         threadPoolExecutor.execute(runnable);
                     }
                     RLottieDrawable.a((RLottieDrawable) this.j);
                     return;
                 case 4:
                     RLottieDrawable rLottieDrawable12 = (RLottieDrawable) this.j;
-                    if (rLottieDrawable12.f2070z != null) {
+                    if (rLottieDrawable12.f2076z != null) {
                         Companion companion2 = RLottieDrawable.n;
                         long j2 = rLottieDrawable12.P;
                         RLottieDrawable rLottieDrawable13 = (RLottieDrawable) this.j;
@@ -434,7 +434,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
         m.checkNotNullParameter(canvas, "canvas");
         if (this.P != 0) {
             long elapsedRealtime = SystemClock.elapsedRealtime();
-            long abs = Math.abs(elapsedRealtime - this.f2068x);
+            long abs = Math.abs(elapsedRealtime - this.f2074x);
             float f = (float) 60;
             int i2 = this.J <= f ? this.r - 6 : this.r;
             if (this.O) {
@@ -458,7 +458,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                     if (z2) {
                         this.D = this.B;
                         this.B = this.C;
-                        if (this.f2069y) {
+                        if (this.f2075y) {
                             this.O = false;
                         }
                         this.A = null;
@@ -467,7 +467,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                         if (this.J > f) {
                             elapsedRealtime -= Math.min(16L, abs - ((long) i2));
                         }
-                        this.f2068x = elapsedRealtime;
+                        this.f2074x = elapsedRealtime;
                         d();
                     }
                 }
@@ -480,7 +480,7 @@ public final class RLottieDrawable extends BitmapDrawable implements Animatable
                 if (this.J > f) {
                     elapsedRealtime -= Math.min(16L, abs - ((long) i2));
                 }
-                this.f2068x = elapsedRealtime;
+                this.f2074x = elapsedRealtime;
                 if (this.G) {
                     this.F = false;
                     this.G = false;
diff --git a/app/src/main/java/com/discord/rlottie/RLottieImageView.java b/app/src/main/java/com/discord/rlottie/RLottieImageView.java
index 88e187a116..1f53bd0d0f 100644
--- a/app/src/main/java/com/discord/rlottie/RLottieImageView.java
+++ b/app/src/main/java/com/discord/rlottie/RLottieImageView.java
@@ -65,7 +65,7 @@ public final class RLottieImageView extends AppCompatImageView {
                 f = 1.0f;
             }
             rLottieDrawable.H = (int) (((float) rLottieDrawable.q[0]) * f);
-            rLottieDrawable.f2069y = false;
+            rLottieDrawable.f2075y = false;
             rLottieDrawable.F = false;
             if (!rLottieDrawable.d()) {
                 rLottieDrawable.G = true;
diff --git a/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java b/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java
index d89cf411b0..ff4e62a308 100644
--- a/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java
+++ b/app/src/main/java/com/discord/rtcconnection/KrispOveruseDetector.java
@@ -10,7 +10,7 @@ public final class KrispOveruseDetector {
     public OutboundRtpAudio b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2071c;
+    public int f2077c;
     public final MediaEngineConnection d;
 
     /* compiled from: KrispOveruseDetector.kt */
diff --git a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java
index ad6d2e90e0..a8f84962c4 100644
--- a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java
+++ b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java
@@ -30,7 +30,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
     public final Map<Long, List<b>> b = new LinkedHashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<Long> f2072c;
+    public final Set<Long> f2078c;
     public MediaEngineConnection d;
     public Long e;
     public final BehaviorSubject<Map<String, EncodeQuality>> f;
@@ -75,13 +75,13 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final VideoMetadata f2073c;
+        public final VideoMetadata f2079c;
 
         public b(EncodeQuality encodeQuality, int i, VideoMetadata videoMetadata) {
             m.checkNotNullParameter(encodeQuality, "encodeQuality");
             this.a = encodeQuality;
             this.b = i;
-            this.f2073c = videoMetadata;
+            this.f2079c = videoMetadata;
         }
 
         public boolean equals(Object obj) {
@@ -92,14 +92,14 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
                 return false;
             }
             b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && this.b == bVar.b && m.areEqual(this.f2073c, bVar.f2073c);
+            return m.areEqual(this.a, bVar.a) && this.b == bVar.b && m.areEqual(this.f2079c, bVar.f2079c);
         }
 
         public int hashCode() {
             EncodeQuality encodeQuality = this.a;
             int i = 0;
             int hashCode = (((encodeQuality != null ? encodeQuality.hashCode() : 0) * 31) + this.b) * 31;
-            VideoMetadata videoMetadata = this.f2073c;
+            VideoMetadata videoMetadata = this.f2079c;
             if (videoMetadata != null) {
                 i = videoMetadata.hashCode();
             }
@@ -112,7 +112,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
             L.append(", ssrc=");
             L.append(this.b);
             L.append(", metadata=");
-            L.append(this.f2073c);
+            L.append(this.f2079c);
             L.append(")");
             return L.toString();
         }
@@ -157,8 +157,8 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
         this.k = logger;
         this.l = aVar;
         new LinkedHashMap();
-        this.f2072c = new LinkedHashSet();
-        this.f = BehaviorSubject.m0(g0.mapOf(d0.o.to("any", EncodeQuality.Hundred)));
+        this.f2078c = new LinkedHashSet();
+        this.f = BehaviorSubject.l0(g0.mapOf(d0.o.to("any", EncodeQuality.Hundred)));
         this.g = h0.emptyMap();
     }
 
@@ -200,7 +200,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
             e eVar = this.j;
             int i2 = 1;
             if (mediaEngineConnection != null) {
-                Set<Long> set = this.f2072c;
+                Set<Long> set = this.f2078c;
                 if (!(set instanceof Collection) || !set.isEmpty()) {
                     i = 0;
                     for (Number number : set) {
@@ -235,7 +235,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
                         if (cVar2 == null) {
                             cVar2 = (e.c) u.first((List<? extends Object>) eVar.d);
                         }
-                        encodeQuality = cVar2.f202c;
+                        encodeQuality = cVar2.f203c;
                     }
                     Map<String, EncodeQuality> mutableMapOf = h0.mutableMapOf(d0.o.to("any", encodeQuality));
                     for (Map.Entry<Long, List<b>> entry : this.b.entrySet()) {
@@ -284,7 +284,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
                                         Integer num = this.a.get(Long.valueOf(longValue));
                                         if (num != null) {
                                             j = longValue;
-                                            this.l.a(longValue, num.intValue(), bVar.b, bVar.f2073c);
+                                            this.l.a(longValue, num.intValue(), bVar.b, bVar.f2079c);
                                         } else {
                                             j = longValue;
                                             a("Missing audioSsrc for user " + j + ", can't update video ssrc!");
@@ -351,7 +351,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c {
     }
 
     @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c
-    public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List<c.a.r.j0.a> list) {
+    public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List<c.a.r.k0.a> list) {
         m.checkNotNullParameter(mediaEngineConnection, "connection");
         m.checkNotNullParameter(transportInfo, "transportInfo");
         m.checkNotNullParameter(list, "supportedVideoCodecs");
diff --git a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
index 1eed5540fe..51ccec9df8 100644
--- a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
+++ b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java
@@ -49,60 +49,61 @@ import rx.Subscription;
 import rx.subjects.BehaviorSubject;
 /* compiled from: RtcConnection.kt */
 public final class RtcConnection implements DebugPrintable, MediaSinkWantsManager.a {
-    public static int a;
-    public static final a b = new a(null);
-    public final d0 A;
-    public final a0 B;
-    public final Long C;
-    public final long D;
-    public String E;
-    public final boolean F;
-    public final String G;
-    public final long H;
-    public final MediaEngine I;
-    public final Logger J;
-    public final Clock K;
-    public final d L;
-    public final Map<Long, Boolean> M;
-    public final Map<Long, Float> N;
-    public final String O;
-    public final boolean P;
-    public final String Q;
-    public final String R;
+    public static int i;
+    public static final a j = new a(null);
+    public Long A;
+    public Long B;
+    public int C;
+    public Subscription D;
+    public final MediaSinkWantsManager E;
+    public final Subscription F;
+    public boolean G;
+    public String H;
+    public int I;
+    public final d0 J;
+    public final a0 K;
+    public final Long L;
+    public final long M;
+    public String N;
+    public final boolean O;
+    public final String P;
+    public final long Q;
+    public final MediaEngine R;
+    public final Logger S;
+    public final Clock T;
+    public final d U;
+    public final Map<Long, Boolean> V;
+    public final Map<Long, Float> W;
+    public final String X;
+    public final boolean Y;
+    public final String Z;
 
-    /* renamed from: c  reason: collision with root package name */
-    public final String f2074c;
-    public final String d;
-    public final List<c> e;
-    public c.a.r.l0.d f;
-    public final Backoff g;
-    public MediaEngineConnection.TransportInfo h;
-    public StateChange i;
-    public BehaviorSubject<StateChange> j;
-    public boolean k;
-    public List<Long> l;
-    public c.a.r.k0.a m;
-    public MediaEngineConnection n;
-    public String o;
-    public Integer p;
-    public int q;
-    public Long r;
+    /* renamed from: a0  reason: collision with root package name */
+    public final String f2080a0;
+    public final String k;
+    public final String l;
+    public final List<c> m;
+    public c.a.r.m0.d n;
+    public boolean o;
+    public final Backoff p;
+    public MediaEngineConnection.TransportInfo q;
+    public StateChange r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Long f2075s;
-    public int t;
-    public Subscription u;
-    public final MediaSinkWantsManager v;
-    public final Subscription w;
+    public BehaviorSubject<StateChange> f2081s;
+    public boolean t;
+    public List<Long> u;
+    public c.a.r.l0.a v;
+    public MediaEngineConnection w;
 
     /* renamed from: x  reason: collision with root package name */
-    public boolean f2076x;
+    public String f2082x;
 
     /* renamed from: y  reason: collision with root package name */
-    public String f2077y;
+    public Integer f2083y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2078z;
+    public int f2084z;
 
     /* compiled from: RtcConnection.kt */
     public enum AnalyticsEvent {
@@ -119,7 +120,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         public final String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Long f2079c;
+        public final Long f2085c;
         public final Long d;
         public final String e;
 
@@ -127,7 +128,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             m.checkNotNullParameter(str, "rtcConnectionId");
             this.a = str;
             this.b = str2;
-            this.f2079c = l;
+            this.f2085c = l;
             this.d = l2;
             this.e = str3;
         }
@@ -140,7 +141,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
                 return false;
             }
             Metadata metadata = (Metadata) obj;
-            return m.areEqual(this.a, metadata.a) && m.areEqual(this.b, metadata.b) && m.areEqual(this.f2079c, metadata.f2079c) && m.areEqual(this.d, metadata.d) && m.areEqual(this.e, metadata.e);
+            return m.areEqual(this.a, metadata.a) && m.areEqual(this.b, metadata.b) && m.areEqual(this.f2085c, metadata.f2085c) && m.areEqual(this.d, metadata.d) && m.areEqual(this.e, metadata.e);
         }
 
         public int hashCode() {
@@ -149,7 +150,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.b;
             int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
-            Long l = this.f2079c;
+            Long l = this.f2085c;
             int hashCode3 = (hashCode2 + (l != null ? l.hashCode() : 0)) * 31;
             Long l2 = this.d;
             int hashCode4 = (hashCode3 + (l2 != null ? l2.hashCode() : 0)) * 31;
@@ -166,7 +167,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             L.append(", mediaSessionId=");
             L.append(this.b);
             L.append(", channelId=");
-            L.append(this.f2079c);
+            L.append(this.f2085c);
             L.append(", guildId=");
             L.append(this.d);
             L.append(", streamKey=");
@@ -472,13 +473,13 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         }
     }
 
-    public RtcConnection(Long l, long j, String str, boolean z2, String str2, long j2, MediaEngine mediaEngine, Logger logger, Clock clock, d dVar, NetworkMonitor networkMonitor, Map map, Map map2, String str3, boolean z3, String str4, String str5, int i) {
-        d dVar2 = (i & 512) != 0 ? d.a.a : dVar;
-        Map linkedHashMap = (i & 2048) != 0 ? new LinkedHashMap() : map;
-        LinkedHashMap linkedHashMap2 = (i & 4096) != 0 ? new LinkedHashMap() : null;
-        String str6 = (i & 8192) != 0 ? null : str3;
-        boolean z4 = (i & 16384) != 0 ? false : z3;
-        String str7 = (i & 65536) != 0 ? null : str5;
+    public RtcConnection(Long l, long j2, String str, boolean z2, String str2, long j3, MediaEngine mediaEngine, Logger logger, Clock clock, d dVar, NetworkMonitor networkMonitor, Map map, Map map2, String str3, boolean z3, String str4, String str5, int i2) {
+        d dVar2 = (i2 & 512) != 0 ? d.a.a : dVar;
+        Map linkedHashMap = (i2 & 2048) != 0 ? new LinkedHashMap() : map;
+        LinkedHashMap linkedHashMap2 = (i2 & 4096) != 0 ? new LinkedHashMap() : null;
+        String str6 = (i2 & 8192) != 0 ? null : str3;
+        boolean z4 = (i2 & 16384) != 0 ? false : z3;
+        String str7 = (i2 & 65536) != 0 ? null : str5;
         m.checkNotNullParameter(str, "sessionId");
         m.checkNotNullParameter(str2, "rtcServerId");
         m.checkNotNullParameter(mediaEngine, "mediaEngine");
@@ -489,107 +490,108 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
         m.checkNotNullParameter(linkedHashMap, "mutedUsers");
         m.checkNotNullParameter(linkedHashMap2, "userVolumes");
         m.checkNotNullParameter(str4, "loggingTagPrefix");
-        this.C = l;
-        this.D = j;
-        this.E = str;
-        this.F = z2;
-        this.G = str2;
-        this.H = j2;
-        this.I = mediaEngine;
-        this.J = logger;
-        this.K = clock;
-        this.L = dVar2;
-        this.M = linkedHashMap;
-        this.N = linkedHashMap2;
-        this.O = str6;
-        this.P = z4;
-        this.Q = str4;
-        this.R = str7;
+        this.L = l;
+        this.M = j2;
+        this.N = str;
+        this.O = z2;
+        this.P = str2;
+        this.Q = j3;
+        this.R = mediaEngine;
+        this.S = logger;
+        this.T = clock;
+        this.U = dVar2;
+        this.V = linkedHashMap;
+        this.W = linkedHashMap2;
+        this.X = str6;
+        this.Y = z4;
+        this.Z = str4;
+        this.f2080a0 = str7;
         StringBuilder P = c.d.b.a.a.P(str4, "->RtcConnection ");
-        int i2 = a + 1;
-        a = i2;
-        P.append(i2);
-        this.f2074c = P.toString();
+        int i3 = i + 1;
+        i = i3;
+        P.append(i3);
+        this.k = P.toString();
         String uuid = UUID.randomUUID().toString();
         m.checkNotNullExpressionValue(uuid, "UUID.randomUUID().toString()");
-        this.d = uuid;
+        this.l = uuid;
         ArrayList arrayList = new ArrayList();
-        this.e = arrayList;
-        this.g = new Backoff(1000, 10000, 0, false, null, 28, null);
+        this.m = arrayList;
+        this.p = new Backoff(1000, 10000, 0, false, null, 28, null);
         Subscription subscription = null;
         StateChange stateChange = new StateChange(new State.d(false), null);
-        this.i = stateChange;
-        this.j = BehaviorSubject.m0(stateChange);
-        this.l = new ArrayList();
-        MediaSinkWantsManager mediaSinkWantsManager = z4 ? new MediaSinkWantsManager(j2, mediaEngine.c(), new c.a.r.e(null, 1), logger, this) : null;
-        this.v = mediaSinkWantsManager;
+        this.r = stateChange;
+        this.f2081s = BehaviorSubject.l0(stateChange);
+        this.u = new ArrayList();
+        MediaSinkWantsManager mediaSinkWantsManager = z4 ? new MediaSinkWantsManager(j3, mediaEngine.c(), new c.a.r.e(null, 1), logger, this) : null;
+        this.E = mediaSinkWantsManager;
         if (z4) {
             m.checkNotNull(mediaSinkWantsManager);
-            Observable<Map<String, EncodeQuality>> s2 = mediaSinkWantsManager.f.s();
-            m.checkNotNullExpressionValue(s2, "mediaSinkWantsSubject.distinctUntilChanged()");
-            subscription = Observable.j(s2, this.j, y.i).W(new f0(new z(this)));
+            Observable<Map<String, EncodeQuality>> r = mediaSinkWantsManager.f.r();
+            m.checkNotNullExpressionValue(r, "mediaSinkWantsSubject.distinctUntilChanged()");
+            subscription = Observable.j(r, this.f2081s, y.i).V(new f0(new z(this)));
         }
-        this.w = subscription;
-        r("Created RtcConnection. GuildID: " + l + " ChannelID: " + j);
-        networkMonitor.observeIsConnected().T(1).X(new p(this), new q(this));
+        this.F = subscription;
+        r("Created RtcConnection. GuildID: " + l + " ChannelID: " + j2);
+        networkMonitor.observeIsConnected().S(1).W(new p(this), new q(this));
         arrayList.add(new r(this));
-        this.A = new d0(this);
-        this.B = new a0(this);
+        this.J = new d0(this);
+        this.K = new a0(this);
     }
 
-    public static void j(RtcConnection rtcConnection, boolean z2, String str, Throwable th, boolean z3, int i) {
-        if ((i & 4) != 0) {
+    public static void j(RtcConnection rtcConnection, boolean z2, String str, Throwable th, boolean z3, int i2) {
+        if ((i2 & 4) != 0) {
             th = null;
         }
-        if ((i & 8) != 0) {
+        if ((i2 & 8) != 0) {
             z3 = true;
         }
         if (z3) {
             o(rtcConnection, str, th, null, 4);
         } else {
-            rtcConnection.J.i(rtcConnection.f2074c, str, th);
+            rtcConnection.S.i(rtcConnection.k, str, th);
         }
-        c.a.r.l0.d dVar = rtcConnection.f;
+        c.a.r.m0.d dVar = rtcConnection.n;
         if (dVar != null) {
             dVar.a();
         }
-        rtcConnection.f = null;
-        MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+        rtcConnection.n = null;
+        MediaEngineConnection mediaEngineConnection = rtcConnection.w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.destroy();
         }
-        rtcConnection.n = null;
-        rtcConnection.g.cancel();
+        rtcConnection.w = null;
+        rtcConnection.o = false;
+        rtcConnection.p.cancel();
         rtcConnection.u(new State.d(z2));
         if (z2) {
             rtcConnection.q();
             return;
         }
-        for (c cVar : rtcConnection.e) {
+        for (c cVar : rtcConnection.m) {
             cVar.onFatalClose();
         }
         rtcConnection.f(str);
     }
 
-    public static void o(RtcConnection rtcConnection, String str, Throwable th, Map map, int i) {
-        if ((i & 2) != 0) {
+    public static void o(RtcConnection rtcConnection, String str, Throwable th, Map map, int i2) {
+        if ((i2 & 2) != 0) {
             th = null;
         }
-        int i2 = i & 4;
-        rtcConnection.J.e(rtcConnection.f2074c, str, th, null);
+        int i3 = i2 & 4;
+        rtcConnection.S.e(rtcConnection.k, str, th, null);
     }
 
     @Override // com.discord.rtcconnection.MediaSinkWantsManager.a
-    public void a(long j, int i, int i2, VideoMetadata videoMetadata) {
-        d(j, i, i2, videoMetadata);
+    public void a(long j2, int i2, int i3, VideoMetadata videoMetadata) {
+        d(j2, i2, i3, videoMetadata);
     }
 
     public final Map<String, Object> b(Map<String, Object> map) {
-        String str = this.o;
+        String str = this.f2082x;
         if (str != null) {
             map.put("hostname", str);
         }
-        Integer num = this.p;
+        Integer num = this.f2083y;
         if (num != null) {
             map.put("port", Integer.valueOf(num.intValue()));
         }
@@ -598,19 +600,19 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
 
     public final void c(c cVar) {
         m.checkNotNullParameter(cVar, "listener");
-        this.e.add(cVar);
+        this.m.add(cVar);
     }
 
-    public final void d(long j, int i, int i2, VideoMetadata videoMetadata) {
-        MediaEngineConnection mediaEngineConnection = this.n;
+    public final void d(long j2, int i2, int i3, VideoMetadata videoMetadata) {
+        MediaEngineConnection mediaEngineConnection = this.w;
         if (mediaEngineConnection != null) {
-            mediaEngineConnection.s(j, i, Integer.valueOf(i2), g(j), h(j));
+            mediaEngineConnection.s(j2, i2, Integer.valueOf(i3), g(j2), h(j2));
         }
-        for (c cVar : this.e) {
-            cVar.onUserCreated(this, j);
+        for (c cVar : this.m) {
+            cVar.onUserCreated(this, j2);
         }
         if (videoMetadata != null) {
-            for (c cVar2 : this.e) {
+            for (c cVar2 : this.m) {
                 cVar2.onVideoMetadata(videoMetadata);
             }
         }
@@ -619,19 +621,20 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     @Override // com.discord.utilities.debug.DebugPrintable
     public void debugPrint(DebugPrintBuilder debugPrintBuilder) {
         m.checkNotNullParameter(debugPrintBuilder, "dp");
-        debugPrintBuilder.appendKeyValue("id", this.d);
-        debugPrintBuilder.appendKeyValue("mediaSessionId", this.f2077y);
-        debugPrintBuilder.appendKeyValue("parentMediaSessionId", this.O);
-        debugPrintBuilder.appendKeyValue("hostname", this.o);
-        debugPrintBuilder.appendKeyValue("channelId", Long.valueOf(this.D));
-        debugPrintBuilder.appendKeyValue("guildId", this.C);
-        debugPrintBuilder.appendKeyValue("streamKey", this.R);
-        debugPrintBuilder.appendKeyValue("isVideoEnabled", Boolean.valueOf(this.F));
-        debugPrintBuilder.appendKeyValue("rtcServerId", this.G);
-        debugPrintBuilder.appendKeyValue("userId", Long.valueOf(this.H));
-        debugPrintBuilder.appendKeyValue("rtcConnectionType", this.L);
-        debugPrintBuilder.appendKeyValue("enableMediaSinkWants", Boolean.valueOf(this.P));
-        debugPrintBuilder.appendKeyValue("socket", (DebugPrintable) this.m);
+        debugPrintBuilder.appendKeyValue("id", this.l);
+        debugPrintBuilder.appendKeyValue("mediaSessionId", this.H);
+        debugPrintBuilder.appendKeyValue("parentMediaSessionId", this.X);
+        debugPrintBuilder.appendKeyValue("hostname", this.f2082x);
+        debugPrintBuilder.appendKeyValue("channelId", Long.valueOf(this.M));
+        debugPrintBuilder.appendKeyValue("guildId", this.L);
+        debugPrintBuilder.appendKeyValue("streamKey", this.f2080a0);
+        debugPrintBuilder.appendKeyValue("isVideoEnabled", Boolean.valueOf(this.O));
+        debugPrintBuilder.appendKeyValue("rtcServerId", this.P);
+        debugPrintBuilder.appendKeyValue("userId", Long.valueOf(this.Q));
+        debugPrintBuilder.appendKeyValue("rtcConnectionType", this.U);
+        debugPrintBuilder.appendKeyValue("enableMediaSinkWants", Boolean.valueOf(this.Y));
+        debugPrintBuilder.appendKeyValue("socket", (DebugPrintable) this.v);
+        debugPrintBuilder.appendKeyValue("sentVideo", Boolean.valueOf(this.o));
     }
 
     public final void e() {
@@ -639,64 +642,67 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final void f(String str) {
-        c.a.r.l0.e eVar;
-        c.a.r.l0.e eVar2;
+        c.a.r.m0.e eVar;
+        c.a.r.m0.e eVar2;
         Map<String, Object> b2;
-        this.g.cancel();
-        c.a.r.k0.a aVar = this.m;
+        this.p.cancel();
+        c.a.r.l0.a aVar = this.v;
         if (aVar != null) {
-            aVar.g.clear();
+            aVar.p.clear();
             aVar.e();
         }
-        this.m = null;
-        if (!(this.i.a instanceof State.d)) {
+        this.v = null;
+        if (!(this.r.a instanceof State.d)) {
             n(false, str);
-            d dVar = this.L;
+            d dVar = this.U;
             if (dVar instanceof d.b) {
-                long j = ((d.b) dVar).a;
-                c.a.r.l0.d dVar2 = this.f;
-                if (!(dVar2 == null || (eVar2 = dVar2.g) == null || (b2 = eVar2.b(String.valueOf(j))) == null)) {
-                    l(((d.b) this.L).a, b2);
+                long j2 = ((d.b) dVar).a;
+                c.a.r.m0.d dVar2 = this.n;
+                if (!(dVar2 == null || (eVar2 = dVar2.g) == null || (b2 = eVar2.b(String.valueOf(j2))) == null)) {
+                    l(((d.b) this.U).a, b2);
+                }
+                if (this.o) {
+                    long j3 = this.Q;
+                    c.a.r.m0.d dVar3 = this.n;
+                    m(j3, (dVar3 == null || (eVar = dVar3.g) == null) ? null : eVar.c());
                 }
-                long j2 = this.H;
-                c.a.r.l0.d dVar3 = this.f;
-                m(j2, (dVar3 == null || (eVar = dVar3.g) == null) ? null : eVar.c());
             }
         }
-        MediaSinkWantsManager mediaSinkWantsManager = this.v;
+        MediaSinkWantsManager mediaSinkWantsManager = this.E;
         if (mediaSinkWantsManager != null) {
             mediaSinkWantsManager.b(new g(mediaSinkWantsManager));
         }
-        Subscription subscription = this.w;
+        Subscription subscription = this.F;
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        Subscription subscription2 = this.u;
+        Subscription subscription2 = this.D;
         if (subscription2 != null) {
             subscription2.unsubscribe();
         }
-        this.u = null;
-        MediaEngineConnection mediaEngineConnection = this.n;
+        this.D = null;
+        MediaEngineConnection mediaEngineConnection = this.w;
         if (mediaEngineConnection != null) {
             mediaEngineConnection.destroy();
         }
-        this.n = null;
+        this.w = null;
         u(new State.d(false));
         r("Destroy internal RTC connection: " + str);
-        this.e.clear();
-        this.k = true;
+        this.m.clear();
+        this.o = false;
+        this.t = true;
     }
 
-    public final boolean g(long j) {
-        Boolean bool = this.M.get(Long.valueOf(j));
+    public final boolean g(long j2) {
+        Boolean bool = this.V.get(Long.valueOf(j2));
         if (bool != null) {
             return bool.booleanValue();
         }
         return false;
     }
 
-    public final float h(long j) {
-        Float f = this.N.get(Long.valueOf(j));
+    public final float h(long j2) {
+        Float f = this.W.get(Long.valueOf(j2));
         if (f != null) {
             return f.floatValue();
         }
@@ -704,70 +710,70 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final Metadata i() {
-        return new Metadata(this.d, this.f2077y, Long.valueOf(this.D), this.C, this.R);
+        return new Metadata(this.l, this.H, Long.valueOf(this.M), this.L, this.f2080a0);
     }
 
-    public final void k(long j, Map<String, ? extends Object> map) {
+    public final void k(long j2, Map<String, ? extends Object> map) {
         HashMap hashMap = new HashMap();
-        Long l = this.C;
+        Long l = this.L;
         if (l != null) {
             l.longValue();
-            hashMap.put("guild_id", this.C);
+            hashMap.put("guild_id", this.L);
         }
-        hashMap.put("channel_id", Long.valueOf(this.D));
-        hashMap.put("sender_user_id", Long.valueOf(j));
+        hashMap.put("channel_id", Long.valueOf(this.M));
+        hashMap.put("sender_user_id", Long.valueOf(j2));
         hashMap.putAll(map);
         p(AnalyticsEvent.VIDEO_STREAM_ENDED, hashMap);
     }
 
-    public final void l(long j, Map<String, ? extends Object> map) {
+    public final void l(long j2, Map<String, ? extends Object> map) {
         if (map != null) {
-            k(j, h0.plus(map, g0.mapOf(d0.o.to("participant_type", "receiver"))));
+            k(j2, h0.plus(map, g0.mapOf(d0.o.to("participant_type", "receiver"))));
         }
     }
 
-    public final void m(long j, Map<String, ? extends Object> map) {
+    public final void m(long j2, Map<String, ? extends Object> map) {
         if (map != null) {
-            k(j, h0.plus(map, g0.mapOf(d0.o.to("participant_type", this.L instanceof d.b ? "streamer" : "sender"))));
+            k(j2, h0.plus(map, g0.mapOf(d0.o.to("participant_type", this.U instanceof d.b ? "streamer" : "sender"))));
         }
     }
 
     public final void n(boolean z2, String str) {
-        c.a.r.l0.d dVar;
-        c.a.r.l0.e eVar;
+        c.a.r.m0.d dVar;
+        c.a.r.m0.e eVar;
         String str2;
         Stats stats;
         VoiceQuality voiceQuality;
-        int i = 0;
-        Map<String, Object> mutableMapOf = h0.mutableMapOf(d0.o.to("ping_bad_count", Integer.valueOf(this.q)), d0.o.to("connect_count", Integer.valueOf(this.t)), d0.o.to("channel_count", 1));
+        int i2 = 0;
+        Map<String, Object> mutableMapOf = h0.mutableMapOf(d0.o.to("ping_bad_count", Integer.valueOf(this.f2084z)), d0.o.to("connect_count", Integer.valueOf(this.C)), d0.o.to("channel_count", 1));
         b(mutableMapOf);
         mutableMapOf.put("reconnect", Boolean.valueOf(z2));
         if (str != null) {
             mutableMapOf.put("reason", str);
         }
-        double averageOfLong = u.averageOfLong(this.l);
+        double averageOfLong = u.averageOfLong(this.u);
         if (!Double.isNaN(averageOfLong)) {
             mutableMapOf.put("ping_average", Integer.valueOf(d0.a0.a.roundToInt(averageOfLong)));
         }
-        String str3 = this.f2077y;
+        String str3 = this.H;
         if (str3 != null) {
             mutableMapOf.put("media_session_id", str3);
         }
-        c.a.r.l0.d dVar2 = this.f;
+        c.a.r.m0.d dVar2 = this.n;
         if (!(dVar2 == null || (stats = (Stats) u.lastOrNull(dVar2.a)) == null)) {
             OutboundRtpAudio outboundRtpAudio = stats.getOutboundRtpAudio();
             if (outboundRtpAudio != null) {
                 mutableMapOf.put("packets_sent", Integer.valueOf(outboundRtpAudio.getPacketsSent()));
                 mutableMapOf.put("packets_sent_lost", Integer.valueOf(outboundRtpAudio.getPacketsLost()));
             }
-            int i2 = 0;
+            int i3 = 0;
             for (InboundRtpAudio inboundRtpAudio : stats.getInboundRtpAudio().values()) {
-                i2 += inboundRtpAudio.getPacketsLost();
-                i += inboundRtpAudio.getPacketsReceived();
+                i3 += inboundRtpAudio.getPacketsLost();
+                i2 += inboundRtpAudio.getPacketsReceived();
             }
-            mutableMapOf.put("packets_received", Integer.valueOf(i));
-            mutableMapOf.put("packets_received_lost", Integer.valueOf(i2));
-            c.a.r.l0.d dVar3 = this.f;
+            mutableMapOf.put("packets_received", Integer.valueOf(i2));
+            mutableMapOf.put("packets_received_lost", Integer.valueOf(i3));
+            c.a.r.m0.d dVar3 = this.n;
             if (!(dVar3 == null || (voiceQuality = dVar3.f) == null)) {
                 voiceQuality.getDurationStats(mutableMapOf);
                 voiceQuality.getMosStats(mutableMapOf);
@@ -776,15 +782,15 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
                 voiceQuality.getFrameOpStats(mutableMapOf);
             }
         }
-        Long l = this.f2075s;
+        Long l = this.B;
         MediaEngineConnection.TransportInfo.Protocol protocol = null;
-        Long valueOf = l != null ? Long.valueOf(this.K.currentTimeMillis() - l.longValue()) : null;
+        Long valueOf = l != null ? Long.valueOf(this.T.currentTimeMillis() - l.longValue()) : null;
         if (valueOf != null) {
             mutableMapOf.put("duration", Long.valueOf(valueOf.longValue()));
         }
-        MediaEngineConnection.TransportInfo transportInfo = this.h;
+        MediaEngineConnection.TransportInfo transportInfo = this.q;
         if (transportInfo != null) {
-            protocol = transportInfo.f2090c;
+            protocol = transportInfo.f2096c;
         }
         if (protocol != null) {
             int ordinal = protocol.ordinal();
@@ -798,21 +804,23 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             mutableMapOf.put("protocol", str2);
         }
         p(AnalyticsEvent.VOICE_DISCONNECT, mutableMapOf);
-        if (!(!(this.L instanceof d.a) || (dVar = this.f) == null || (eVar = dVar.g) == null)) {
+        if (!(!(this.U instanceof d.a) || (dVar = this.n) == null || (eVar = dVar.g) == null)) {
             for (String str4 : u.toList(eVar.j.keySet())) {
                 Long longOrNull = s.toLongOrNull(str4);
                 if (longOrNull != null) {
                     l(longOrNull.longValue(), eVar.b(str4));
                 }
             }
-            m(this.H, eVar.c());
+            if (this.o) {
+                m(this.Q, eVar.c());
+            }
         }
     }
 
     public final void p(AnalyticsEvent analyticsEvent, Map<String, Object> map) {
         String str;
-        map.put("rtc_connection_id", this.d);
-        d dVar = this.L;
+        map.put("rtc_connection_id", this.l);
+        d dVar = this.U;
         if (m.areEqual(dVar, d.a.a)) {
             str = "default";
         } else if (dVar instanceof d.b) {
@@ -821,26 +829,26 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
             throw new NoWhenBranchMatchedException();
         }
         map.put("context", str);
-        String str2 = this.f2077y;
+        String str2 = this.H;
         if (str2 != null) {
             map.put("media_session_id", str2);
         }
-        String str3 = this.O;
+        String str3 = this.X;
         if (str3 != null) {
             map.put("parent_media_session_id", str3);
         }
-        for (c cVar : this.e) {
+        for (c cVar : this.m) {
             cVar.onAnalyticsEvent(analyticsEvent, map);
         }
     }
 
     public final void q() {
-        this.J.recordBreadcrumb("reconnect", this.f2074c);
-        if (this.f2076x) {
-            this.r = Long.valueOf(this.K.currentTimeMillis());
+        this.S.recordBreadcrumb("reconnect", this.k);
+        if (this.G) {
+            this.A = Long.valueOf(this.T.currentTimeMillis());
         }
-        this.t++;
-        c.a.r.k0.a aVar = this.m;
+        this.C++;
+        c.a.r.l0.a aVar = this.v;
         if (aVar != null) {
             aVar.e();
             aVar.f();
@@ -848,13 +856,13 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final void r(String str) {
-        this.J.recordBreadcrumb(str, this.f2074c);
+        this.S.recordBreadcrumb(str, this.k);
     }
 
     /* JADX WARN: Multi-variable type inference failed */
     /* JADX WARNING: Unknown variable types count: 1 */
     public final Future<?> s(Function0<Unit> function0) {
-        c.a.r.c c2 = this.I.c();
+        c.a.r.c c2 = this.R.c();
         if (function0 != null) {
             function0 = new e0(function0);
         }
@@ -862,9 +870,9 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final void t(Intent intent, ThumbnailEmitter thumbnailEmitter) {
-        if (this.L instanceof d.b) {
-            r("Setting screenshare " + intent + ' ' + this.n);
-            MediaEngineConnection mediaEngineConnection = this.n;
+        if (this.U instanceof d.b) {
+            r("Setting screenshare " + intent + ' ' + this.w);
+            MediaEngineConnection mediaEngineConnection = this.w;
             if (mediaEngineConnection == null) {
                 Log.e("RtcConnection", "MediaEngine not connected for setScreenshare.");
             } else if (intent != null) {
@@ -876,25 +884,25 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
     }
 
     public final void u(State state) {
-        if (!m.areEqual(this.i.a, state)) {
+        if (!m.areEqual(this.r.a, state)) {
             StateChange stateChange = new StateChange(state, i());
-            this.i = stateChange;
-            for (c cVar : this.e) {
+            this.r = stateChange;
+            for (c cVar : this.m) {
                 cVar.onStateChange(stateChange);
             }
         }
     }
 
-    public final void v(long j, float f) {
-        this.N.put(Long.valueOf(j), Float.valueOf(f));
-        MediaEngineConnection mediaEngineConnection = this.n;
+    public final void v(long j2, float f) {
+        this.W.put(Long.valueOf(j2), Float.valueOf(f));
+        MediaEngineConnection mediaEngineConnection = this.w;
         if (mediaEngineConnection != null) {
-            mediaEngineConnection.e(j, f);
+            mediaEngineConnection.e(j2, f);
         }
     }
 
     public final void w(Long l) {
-        MediaSinkWantsManager mediaSinkWantsManager = this.v;
+        MediaSinkWantsManager mediaSinkWantsManager = this.E;
         if (mediaSinkWantsManager != null) {
             mediaSinkWantsManager.b(new j(mediaSinkWantsManager, l));
         }
diff --git a/app/src/main/java/com/discord/rtcconnection/ThermalDetector.java b/app/src/main/java/com/discord/rtcconnection/ThermalDetector.java
deleted file mode 100644
index bdb526fa38..0000000000
--- a/app/src/main/java/com/discord/rtcconnection/ThermalDetector.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.discord.rtcconnection;
-
-import android.os.PowerManager;
-import androidx.annotation.RequiresApi;
-import com.airbnb.lottie.parser.AnimatableValueParser;
-import com.discord.rtcconnection.enums.ThermalStatus;
-import com.discord.utilities.logging.LoggingProvider;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
-/* compiled from: ThermalDetector.kt */
-@RequiresApi(29)
-public final class ThermalDetector implements PowerManager.OnThermalStatusChangedListener {
-    public final AtomicBoolean a = new AtomicBoolean();
-
-    @Override // android.os.PowerManager.OnThermalStatusChangedListener
-    public void onThermalStatusChanged(int i) {
-        ThermalStatus thermalStatus;
-        Objects.requireNonNull(ThermalStatus.Companion);
-        ThermalStatus[] values = ThermalStatus.values();
-        int i2 = 0;
-        while (true) {
-            if (i2 >= 7) {
-                thermalStatus = null;
-                break;
-            }
-            thermalStatus = values[i2];
-            if (thermalStatus.getValue() == i) {
-                break;
-            }
-            i2++;
-        }
-        if (thermalStatus != null) {
-            AnimatableValueParser.C1("ThermalDetector", "onThermalStatusChanged: " + thermalStatus);
-            switch (thermalStatus.ordinal()) {
-                case 0:
-                    if (this.a.compareAndSet(true, false)) {
-                        AnimatableValueParser.C1("ThermalDetector", "no longer in thermal trouble.");
-                        return;
-                    } else {
-                        AnimatableValueParser.A1("ThermalDetector", "ignoring low priority thermal messages.");
-                        return;
-                    }
-                case 1:
-                case 2:
-                case 3:
-                    if (this.a.get()) {
-                        AnimatableValueParser.C1("ThermalDetector", "starting to cool down.");
-                        return;
-                    } else {
-                        AnimatableValueParser.A1("ThermalDetector", "ignoring medium priority thermal messages.");
-                        return;
-                    }
-                case 4:
-                case 5:
-                case 6:
-                    this.a.set(true);
-                    if (this.a.get()) {
-                        AnimatableValueParser.C1("ThermalDetector", "Thermal status is normal");
-                    } else {
-                        AnimatableValueParser.E1("ThermalDetector", "In thermal trouble");
-                    }
-                    String str = "Very bad thermal issues: thermalStatus = " + thermalStatus;
-                    if (thermalStatus == ThermalStatus.Shutdown) {
-                        AnimatableValueParser.B1("ThermalDetector", str, new RuntimeException(str));
-                    } else {
-                        AnimatableValueParser.E1("ThermalDetector", str);
-                    }
-                    LoggingProvider.INSTANCE.get().recordBreadcrumb(str, "thermal");
-                    return;
-                default:
-                    return;
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java b/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java
index c00914063e..6399fa23be 100644
--- a/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java
+++ b/app/src/main/java/com/discord/rtcconnection/VideoMetadata.java
@@ -10,7 +10,7 @@ public final class VideoMetadata {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2080c;
+    public final int f2086c;
     public final Integer d;
     public final Payloads.ResolutionType e;
 
@@ -18,7 +18,7 @@ public final class VideoMetadata {
         m.checkNotNullParameter(resolutionType, "type");
         this.a = j;
         this.b = i;
-        this.f2080c = i2;
+        this.f2086c = i2;
         this.d = num;
         this.e = resolutionType;
     }
@@ -31,11 +31,11 @@ public final class VideoMetadata {
             return false;
         }
         VideoMetadata videoMetadata = (VideoMetadata) obj;
-        return this.a == videoMetadata.a && this.b == videoMetadata.b && this.f2080c == videoMetadata.f2080c && m.areEqual(this.d, videoMetadata.d) && m.areEqual(this.e, videoMetadata.e);
+        return this.a == videoMetadata.a && this.b == videoMetadata.b && this.f2086c == videoMetadata.f2086c && m.areEqual(this.d, videoMetadata.d) && m.areEqual(this.e, videoMetadata.e);
     }
 
     public int hashCode() {
-        int a = ((((b.a(this.a) * 31) + this.b) * 31) + this.f2080c) * 31;
+        int a = ((((b.a(this.a) * 31) + this.b) * 31) + this.f2086c) * 31;
         Integer num = this.d;
         int i = 0;
         int hashCode = (a + (num != null ? num.hashCode() : 0)) * 31;
@@ -52,7 +52,7 @@ public final class VideoMetadata {
         L.append(", maxWidth=");
         L.append(this.b);
         L.append(", maxHeight=");
-        L.append(this.f2080c);
+        L.append(this.f2086c);
         L.append(", maxFrameRate=");
         L.append(this.d);
         L.append(", type=");
diff --git a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
index 2304e6b43a..b657e2ab03 100644
--- a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
+++ b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java
@@ -13,8 +13,8 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.MainThread;
-import c.a.r.h0.f;
-import c.a.r.i0.a;
+import c.a.r.i0.f;
+import c.a.r.j0.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.rtcconnection.enums.AudioManagerBroadcastAction;
 import com.discord.rtcconnection.enums.BluetoothBroadcastAction;
@@ -45,7 +45,7 @@ public final class DiscordAudioManager {
     public static final AudioDevice b = new AudioDevice(null, false, null, null, 15);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final List<DeviceTypes> f2081c = n.listOf((Object[]) new DeviceTypes[]{DeviceTypes.EARPIECE, DeviceTypes.SPEAKERPHONE, DeviceTypes.BLUETOOTH_HEADSET, DeviceTypes.WIRED_HEADSET});
+    public static final List<DeviceTypes> f2087c = n.listOf((Object[]) new DeviceTypes[]{DeviceTypes.EARPIECE, DeviceTypes.SPEAKERPHONE, DeviceTypes.BLUETOOTH_HEADSET, DeviceTypes.WIRED_HEADSET});
     public static final DiscordAudioManager d = null;
     public final AudioManager e;
     public final BluetoothManager f;
@@ -53,8 +53,8 @@ public final class DiscordAudioManager {
     public final boolean h;
     public final Object i = this;
     public final long j;
-    public final c.a.r.h0.c k;
-    public final c.a.r.h0.a l;
+    public final c.a.r.i0.c k;
+    public final c.a.r.i0.a l;
     public BluetoothHeadset m;
     public BluetoothScoState n;
     public AudioManager.OnAudioFocusChangeListener o;
@@ -63,20 +63,20 @@ public final class DiscordAudioManager {
     public final SerializedSubject<List<AudioDevice>, List<AudioDevice>> r;
 
     /* renamed from: s  reason: collision with root package name */
-    public DeviceTypes f2082s;
+    public DeviceTypes f2088s;
     public final SerializedSubject<DeviceTypes, DeviceTypes> t;
     public DeviceTypes u;
     public boolean v;
     public boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public boolean f2083x;
+    public boolean f2089x;
 
     /* renamed from: y  reason: collision with root package name */
-    public List<? extends DeviceTypes> f2084y;
+    public List<? extends DeviceTypes> f2090y;
 
     /* renamed from: z  reason: collision with root package name */
-    public boolean f2085z;
+    public boolean f2091z;
 
     /* compiled from: DiscordAudioManager.kt */
     public static final class AudioDevice {
@@ -84,7 +84,7 @@ public final class DiscordAudioManager {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f2086c;
+        public final String f2092c;
         public final String d;
 
         public AudioDevice() {
@@ -95,7 +95,7 @@ public final class DiscordAudioManager {
             m.checkNotNullParameter(deviceTypes, "type");
             this.a = deviceTypes;
             this.b = z2;
-            this.f2086c = str;
+            this.f2092c = str;
             this.d = str2;
         }
 
@@ -107,7 +107,7 @@ public final class DiscordAudioManager {
             m.checkNotNullParameter(deviceTypes, "type");
             this.a = deviceTypes;
             this.b = z2;
-            this.f2086c = null;
+            this.f2092c = null;
             this.d = null;
         }
 
@@ -117,7 +117,7 @@ public final class DiscordAudioManager {
                 z2 = audioDevice.b;
             }
             if ((i & 4) != 0) {
-                str = audioDevice.f2086c;
+                str = audioDevice.f2092c;
             }
             if ((i & 8) != 0) {
                 str2 = audioDevice.d;
@@ -135,7 +135,7 @@ public final class DiscordAudioManager {
                 return false;
             }
             AudioDevice audioDevice = (AudioDevice) obj;
-            return m.areEqual(this.a, audioDevice.a) && this.b == audioDevice.b && m.areEqual(this.f2086c, audioDevice.f2086c) && m.areEqual(this.d, audioDevice.d);
+            return m.areEqual(this.a, audioDevice.a) && this.b == audioDevice.b && m.areEqual(this.f2092c, audioDevice.f2092c) && m.areEqual(this.d, audioDevice.d);
         }
 
         public int hashCode() {
@@ -150,7 +150,7 @@ public final class DiscordAudioManager {
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
             int i5 = (hashCode + i2) * 31;
-            String str = this.f2086c;
+            String str = this.f2092c;
             int hashCode2 = (i5 + (str != null ? str.hashCode() : 0)) * 31;
             String str2 = this.d;
             if (str2 != null) {
@@ -165,7 +165,7 @@ public final class DiscordAudioManager {
             L.append(", isAvailable=");
             L.append(this.b);
             L.append(", id=");
-            L.append(this.f2086c);
+            L.append(this.f2092c);
             L.append(", name=");
             return c.d.b.a.a.D(L, this.d, ")");
         }
@@ -221,32 +221,32 @@ public final class DiscordAudioManager {
         @Override // java.lang.Runnable
         public final void run() {
             DiscordAudioManager discordAudioManager = this.i;
-            c.a.r.h0.a aVar = discordAudioManager.l;
+            c.a.r.i0.a aVar = discordAudioManager.l;
             Objects.requireNonNull(aVar);
             ThreadUtils.checkIsOnMainThread();
             boolean z2 = false;
             List<AudioManagerBroadcastAction> listOf = n.listOf((Object[]) new AudioManagerBroadcastAction[]{AudioManagerBroadcastAction.HeadsetPlug, AudioManagerBroadcastAction.ScoAudioStateUpdated});
-            AnimatableValueParser.A1("AudioManagerBroadcastReceiver", "registering for broadcasts with actions: " + listOf);
+            AnimatableValueParser.C1("AudioManagerBroadcastReceiver", "registering for broadcasts with actions: " + listOf);
             IntentFilter intentFilter = new IntentFilter();
             for (AudioManagerBroadcastAction audioManagerBroadcastAction : listOf) {
                 intentFilter.addAction(audioManagerBroadcastAction.getAction());
             }
             aVar.b.registerReceiver(aVar, intentFilter);
-            c.a.r.h0.c cVar = discordAudioManager.k;
+            c.a.r.i0.c cVar = discordAudioManager.k;
             Objects.requireNonNull(cVar);
             ThreadUtils.checkIsOnMainThread();
             if (!cVar.k) {
                 StringBuilder L = c.d.b.a.a.L("registering for broadcasts with actions: ");
-                Set<BluetoothBroadcastAction> set = c.a.r.h0.c.i;
+                Set<BluetoothBroadcastAction> set = c.a.r.i0.c.i;
                 L.append(set);
-                AnimatableValueParser.A1("BluetoothBroadcastReceiver", L.toString());
+                AnimatableValueParser.C1("BluetoothBroadcastReceiver", L.toString());
                 IntentFilter intentFilter2 = new IntentFilter();
                 for (BluetoothBroadcastAction bluetoothBroadcastAction : set) {
                     intentFilter2.addAction(bluetoothBroadcastAction.getAction());
                 }
                 cVar.m.registerReceiver(cVar, intentFilter2);
-                c.a.r.h0.d dVar = c.a.r.h0.d.f206c;
-                Lazy lazy = c.a.r.h0.d.a;
+                c.a.r.i0.d dVar = c.a.r.i0.d.f207c;
+                Lazy lazy = c.a.r.i0.d.a;
                 if (((String) lazy.getValue()) != null) {
                     Context context = cVar.m;
                     m.checkNotNullParameter(context, "context");
@@ -264,13 +264,13 @@ public final class DiscordAudioManager {
                     z2 = defaultAdapter.getProfileProxy(cVar.m, cVar, 1);
                 }
                 if (z2) {
-                    AnimatableValueParser.A1("BluetoothBroadcastReceiver", "listening for HeadsetProfile proxy");
+                    AnimatableValueParser.C1("BluetoothBroadcastReceiver", "listening for HeadsetProfile proxy");
                 } else {
-                    AnimatableValueParser.B1("BluetoothBroadcastReceiver", "listening for HeadsetProfile proxy failed", null);
+                    AnimatableValueParser.D1("BluetoothBroadcastReceiver", "listening for HeadsetProfile proxy failed", null);
                 }
                 cVar.k = true;
             }
-            c.a.r.h0.e eVar = new c.a.r.h0.e(discordAudioManager);
+            c.a.r.i0.e eVar = new c.a.r.i0.e(discordAudioManager);
             synchronized (discordAudioManager.i) {
                 discordAudioManager.o = eVar;
             }
@@ -282,13 +282,13 @@ public final class DiscordAudioManager {
         public b() {
         }
 
-        @Override // c.a.r.h0.f
+        @Override // c.a.r.i0.f
         public void a(Context context, boolean z2) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(context, "context");
         }
 
-        @Override // c.a.r.h0.f
+        @Override // c.a.r.i0.f
         @MainThread
         public void b(Context context, ScoAudioState.b bVar) {
             boolean z2;
@@ -296,24 +296,24 @@ public final class DiscordAudioManager {
             m.checkNotNullParameter(bVar, "scoAudioStateUpdate");
             int ordinal = bVar.a.ordinal();
             if (ordinal == 0) {
-                AnimatableValueParser.A1("AudioManager", "[onScoAudioStateUpdate] scoAudioStateUpdate = " + bVar);
+                AnimatableValueParser.C1("AudioManager", "[onScoAudioStateUpdate] scoAudioStateUpdate = " + bVar);
                 DiscordAudioManager discordAudioManager = DiscordAudioManager.this;
                 BluetoothScoState bluetoothScoState = discordAudioManager.n;
                 discordAudioManager.k();
                 int ordinal2 = bluetoothScoState.ordinal();
                 if (ordinal2 == 2) {
                     synchronized (DiscordAudioManager.this.i) {
-                        z2 = DiscordAudioManager.this.f2085z;
+                        z2 = DiscordAudioManager.this.f2091z;
                     }
                     if (z2) {
-                        AnimatableValueParser.A1("AudioManager", "SCO off detected directly from ON. Refreshing Bluetooth device");
+                        AnimatableValueParser.C1("AudioManager", "SCO off detected directly from ON. Refreshing Bluetooth device");
                         DiscordAudioManager.this.j();
                         DiscordAudioManager.this.l();
                     }
                 } else if (ordinal2 == 3) {
                     StringBuilder L = c.d.b.a.a.L("Unable to turn on SCO. Clearing Bluetooth device. mode: ");
                     L.append(DiscordAudioManager.this.e.getMode());
-                    AnimatableValueParser.A1("AudioManager", L.toString());
+                    AnimatableValueParser.C1("AudioManager", L.toString());
                     synchronized (DiscordAudioManager.this.i) {
                         DiscordAudioManager discordAudioManager2 = DiscordAudioManager.this;
                         List<AudioDevice> list = discordAudioManager2.q;
@@ -328,29 +328,29 @@ public final class DiscordAudioManager {
                     discordAudioManager3.a(discordAudioManager3.q);
                 }
             } else if (ordinal == 1) {
-                AnimatableValueParser.A1("AudioManager", "[onScoAudioStateUpdate] scoAudioStateUpdate = " + bVar);
+                AnimatableValueParser.C1("AudioManager", "[onScoAudioStateUpdate] scoAudioStateUpdate = " + bVar);
                 DiscordAudioManager.this.j();
             }
         }
 
-        @Override // c.a.r.h0.f
+        @Override // c.a.r.i0.f
         public void c(Context context) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(context, "context");
         }
 
-        @Override // c.a.r.h0.f
+        @Override // c.a.r.i0.f
         public void d(Context context, boolean z2) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(context, "context");
         }
 
-        @Override // c.a.r.h0.f
+        @Override // c.a.r.i0.f
         @MainThread
-        public void e(Context context, c.a.r.i0.a aVar) {
+        public void e(Context context, c.a.r.j0.a aVar) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(aVar, "wiredHeadsetState");
-            AnimatableValueParser.A1("AudioManager", "[onWiredHeadsetPlug] wiredHeadsetState = " + aVar);
+            AnimatableValueParser.C1("AudioManager", "[onWiredHeadsetPlug] wiredHeadsetState = " + aVar);
             if (m.areEqual(aVar, a.b.a)) {
                 synchronized (DiscordAudioManager.this.i) {
                     DiscordAudioManager discordAudioManager = DiscordAudioManager.this;
@@ -381,11 +381,11 @@ public final class DiscordAudioManager {
     }
 
     /* compiled from: DiscordAudioManager.kt */
-    public final class c implements c.a.r.h0.g {
+    public final class c implements c.a.r.i0.g {
         public c() {
         }
 
-        @Override // c.a.r.h0.g
+        @Override // c.a.r.i0.g
         @MainThread
         public void a(Context context, BluetoothHeadsetAudioState.b bVar) {
             m.checkNotNullParameter(context, "context");
@@ -394,13 +394,13 @@ public final class DiscordAudioManager {
             if (bluetoothHeadsetAudioState == null) {
                 bluetoothHeadsetAudioState = BluetoothHeadsetAudioState.Disconnected;
             }
-            BluetoothDevice bluetoothDevice = bVar.f2087c;
+            BluetoothDevice bluetoothDevice = bVar.f2093c;
             StringBuilder sb = new StringBuilder();
             sb.append("[onHeadsetAudioStateChanged] state: ");
             sb.append(bluetoothHeadsetAudioState);
             sb.append(", device: ");
             sb.append(bluetoothDevice != null ? bluetoothDevice.getName() : null);
-            AnimatableValueParser.A1("AudioManager", sb.toString());
+            AnimatableValueParser.C1("AudioManager", sb.toString());
             int ordinal = bluetoothHeadsetAudioState.ordinal();
             if (ordinal == 0) {
                 DiscordAudioManager.this.l();
@@ -418,24 +418,24 @@ public final class DiscordAudioManager {
             }
         }
 
-        @Override // c.a.r.h0.g
+        @Override // c.a.r.i0.g
         @MainThread
         public void b(BluetoothDevice bluetoothDevice) {
-            c.a.r.h0.d dVar = c.a.r.h0.d.f206c;
-            if (!(((String) c.a.r.h0.d.a.getValue()) != null)) {
+            c.a.r.i0.d dVar = c.a.r.i0.d.f207c;
+            if (!(((String) c.a.r.i0.d.a.getValue()) != null)) {
                 throw new IllegalStateException("Check failed.".toString());
             } else if (bluetoothDevice != null) {
                 DiscordAudioManager.this.l();
             }
         }
 
-        @Override // c.a.r.h0.g
+        @Override // c.a.r.i0.g
         @MainThread
         public void c(BluetoothHeadset bluetoothHeadset) {
             DiscordAudioManager.this.m = bluetoothHeadset;
         }
 
-        @Override // c.a.r.h0.g
+        @Override // c.a.r.i0.g
         @MainThread
         public void d(Context context, BluetoothProfileConnectionState.b bVar) {
             ArrayList arrayList;
@@ -447,21 +447,21 @@ public final class DiscordAudioManager {
             if (bluetoothProfileConnectionState == null) {
                 bluetoothProfileConnectionState = BluetoothProfileConnectionState.Disconnected;
             }
-            BluetoothDevice bluetoothDevice = bVar.f2088c;
+            BluetoothDevice bluetoothDevice = bVar.f2094c;
             StringBuilder sb = new StringBuilder();
             sb.append("[onHeadsetConnectionStateChanged] state: ");
             sb.append(bluetoothProfileConnectionState);
             sb.append(", device: ");
             String str = null;
             sb.append(bluetoothDevice != null ? bluetoothDevice.getName() : null);
-            AnimatableValueParser.A1("AudioManager", sb.toString());
+            AnimatableValueParser.C1("AudioManager", sb.toString());
             int ordinal = bluetoothProfileConnectionState.ordinal();
             if (ordinal != 0) {
                 if (ordinal != 1) {
                     if (ordinal == 2) {
                         synchronized (DiscordAudioManager.this.i) {
                             discordAudioManager = DiscordAudioManager.this;
-                            deviceTypes = discordAudioManager.f2082s;
+                            deviceTypes = discordAudioManager.f2088s;
                         }
                         if (deviceTypes == DeviceTypes.BLUETOOTH_HEADSET) {
                             discordAudioManager.g();
@@ -474,7 +474,7 @@ public final class DiscordAudioManager {
                         return;
                     }
                 }
-                AnimatableValueParser.A1("AudioManager", "[onHeadsetConnectionStateChanged] " + bluetoothProfileConnectionState + "...");
+                AnimatableValueParser.C1("AudioManager", "[onHeadsetConnectionStateChanged] " + bluetoothProfileConnectionState + "...");
                 return;
             }
             synchronized (DiscordAudioManager.this.i) {
@@ -485,11 +485,11 @@ public final class DiscordAudioManager {
                 }
             }
             DeviceTypes deviceTypes2 = DeviceTypes.BLUETOOTH_HEADSET;
-            if (((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2086c != null) {
+            if (((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2092c != null) {
                 if (bluetoothDevice != null) {
                     str = bluetoothDevice.getAddress();
                 }
-                if (m.areEqual(str, ((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2086c)) {
+                if (m.areEqual(str, ((AudioDevice) arrayList.get(deviceTypes2.getValue())).f2092c)) {
                     DiscordAudioManager.this.l();
                 }
             }
@@ -513,7 +513,7 @@ public final class DiscordAudioManager {
     }
 
     /* compiled from: DiscordAudioManager.kt */
-    public static final class e extends d0.z.d.o implements Function0<c.a.r.h0.b> {
+    public static final class e extends d0.z.d.o implements Function0<c.a.r.i0.b> {
         public final /* synthetic */ Context $context;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -525,8 +525,8 @@ public final class DiscordAudioManager {
         /* Return type fixed from 'java.lang.Object' to match base method */
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
-        public c.a.r.h0.b mo1invoke() {
-            return new c.a.r.h0.b(this.$context);
+        public c.a.r.i0.b mo1invoke() {
+            return new c.a.r.i0.b(this.$context);
         }
     }
 
@@ -544,8 +544,8 @@ public final class DiscordAudioManager {
         Thread currentThread = Thread.currentThread();
         m.checkNotNullExpressionValue(currentThread, "Thread.currentThread()");
         this.j = currentThread.getId();
-        this.k = new c.a.r.h0.c(context, new c());
-        this.l = new c.a.r.h0.a(context, new b());
+        this.k = new c.a.r.i0.c(context, new c());
+        this.l = new c.a.r.i0.a(context, new b());
         new Handler(Looper.getMainLooper()).post(new a(this));
         this.n = BluetoothScoState.INVALID;
         List<AudioDevice> listOf = n.listOf((Object[]) new AudioDevice[]{new AudioDevice(DeviceTypes.SPEAKERPHONE, false, null, null, 14), new AudioDevice(DeviceTypes.WIRED_HEADSET, false, null, null, 14), new AudioDevice(DeviceTypes.EARPIECE, false, null, null, 14), new AudioDevice(DeviceTypes.BLUETOOTH_HEADSET, false, null, null, 14)});
@@ -570,12 +570,12 @@ public final class DiscordAudioManager {
             }
         }
         this.q = arrayList;
-        this.r = new SerializedSubject<>(BehaviorSubject.m0(arrayList));
+        this.r = new SerializedSubject<>(BehaviorSubject.l0(arrayList));
         DeviceTypes deviceTypes = DeviceTypes.INVALID;
-        this.f2082s = deviceTypes;
-        this.t = new SerializedSubject<>(BehaviorSubject.m0(deviceTypes));
+        this.f2088s = deviceTypes;
+        this.t = new SerializedSubject<>(BehaviorSubject.l0(deviceTypes));
         this.u = DeviceTypes.DEFAULT;
-        this.f2084y = f2081c;
+        this.f2090y = f2087c;
     }
 
     public static final DiscordAudioManager d() {
@@ -590,7 +590,7 @@ public final class DiscordAudioManager {
         Object obj;
         DeviceTypes deviceTypes;
         synchronized (this.i) {
-            List<? extends DeviceTypes> list2 = this.f2084y;
+            List<? extends DeviceTypes> list2 = this.f2090y;
             ListIterator<? extends DeviceTypes> listIterator = list2.listIterator(list2.size());
             while (true) {
                 if (!listIterator.hasPrevious()) {
@@ -607,7 +607,7 @@ public final class DiscordAudioManager {
                 deviceTypes = DeviceTypes.SPEAKERPHONE;
             }
         }
-        AnimatableValueParser.A1("AudioManager", "Default device to activate: " + deviceTypes);
+        AnimatableValueParser.C1("AudioManager", "Default device to activate: " + deviceTypes);
         b(deviceTypes);
     }
 
@@ -616,10 +616,10 @@ public final class DiscordAudioManager {
         boolean z3;
         synchronized (this.i) {
             z2 = true;
-            z3 = !this.f2085z;
+            z3 = !this.f2091z;
         }
         if (z3) {
-            AnimatableValueParser.E1("AudioManager", "Unable to activate audio output outside Discord-requested communication mode");
+            AnimatableValueParser.G1("AudioManager", "Unable to activate audio output outside Discord-requested communication mode");
             return;
         }
         if (deviceTypes == DeviceTypes.BLUETOOTH_HEADSET) {
@@ -634,10 +634,10 @@ public final class DiscordAudioManager {
             this.e.setSpeakerphoneOn(z2);
         }
         synchronized (this.i) {
-            this.f2082s = deviceTypes;
+            this.f2088s = deviceTypes;
             this.t.j.onNext(deviceTypes);
         }
-        AnimatableValueParser.A1("AudioManager", "Activated device: " + deviceTypes);
+        AnimatableValueParser.C1("AudioManager", "Activated device: " + deviceTypes);
     }
 
     public final void c() {
@@ -648,8 +648,8 @@ public final class DiscordAudioManager {
         }
     }
 
-    public final c.a.r.h0.b e() {
-        return (c.a.r.h0.b) this.g.getValue();
+    public final c.a.r.i0.b e() {
+        return (c.a.r.i0.b) this.g.getValue();
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:33:0x006c  */
@@ -663,7 +663,7 @@ public final class DiscordAudioManager {
         boolean z2;
         boolean z3;
         if (!e().d) {
-            AnimatableValueParser.E1("AudioManager", "refreshBluetoothHeadset() requires BLUETOOTH permission");
+            AnimatableValueParser.G1("AudioManager", "refreshBluetoothHeadset() requires BLUETOOTH permission");
             return;
         }
         BluetoothHeadset bluetoothHeadset = this.m;
@@ -693,10 +693,10 @@ public final class DiscordAudioManager {
         BluetoothDevice bluetoothDevice3 = (BluetoothDevice) obj;
         BluetoothHeadset bluetoothHeadset3 = this.m;
         if (bluetoothHeadset3 != null) {
-            c.a.r.h0.d dVar = c.a.r.h0.d.f206c;
+            c.a.r.i0.d dVar = c.a.r.i0.d.f207c;
             m.checkNotNullParameter(bluetoothHeadset3, "headsetProfile");
             try {
-                Method method = (Method) c.a.r.h0.d.b.getValue();
+                Method method = (Method) c.a.r.i0.d.b.getValue();
                 Object invoke = method != null ? method.invoke(bluetoothHeadset3, new Object[0]) : null;
                 if (!(invoke instanceof BluetoothDevice)) {
                     invoke = null;
@@ -708,7 +708,7 @@ public final class DiscordAudioManager {
                 bluetoothDevice3 = bluetoothDevice;
             }
             if (e().d) {
-                AnimatableValueParser.E1("AudioManager", "hasBluetoothHeadset() requires BLUETOOTH permission");
+                AnimatableValueParser.G1("AudioManager", "hasBluetoothHeadset() requires BLUETOOTH permission");
             } else {
                 BluetoothAdapter adapter = this.f.getAdapter();
                 if (adapter != null) {
@@ -719,7 +719,7 @@ public final class DiscordAudioManager {
                             List<AudioDevice> list2 = this.q;
                             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list2, 10));
                             for (AudioDevice audioDevice : list2) {
-                                arrayList.add(audioDevice.a.ordinal() != 5 ? AudioDevice.a(audioDevice, null, false, null, null, 15) : AudioDevice.a(audioDevice, null, (!this.f2085z || this.f2082s != DeviceTypes.BLUETOOTH_HEADSET) ? z2 : bluetoothDevice3 != null, bluetoothDevice3 != null ? bluetoothDevice3.getAddress() : null, bluetoothDevice3 != null ? bluetoothDevice3.getName() : null, 1));
+                                arrayList.add(audioDevice.a.ordinal() != 5 ? AudioDevice.a(audioDevice, null, false, null, null, 15) : AudioDevice.a(audioDevice, null, (!this.f2091z || this.f2088s != DeviceTypes.BLUETOOTH_HEADSET) ? z2 : bluetoothDevice3 != null, bluetoothDevice3 != null ? bluetoothDevice3.getAddress() : null, bluetoothDevice3 != null ? bluetoothDevice3.getName() : null, 1));
                             }
                             this.q = arrayList;
                             this.r.j.onNext(arrayList);
@@ -766,14 +766,14 @@ public final class DiscordAudioManager {
         AudioFocusRequest audioFocusRequest;
         c();
         if (!e().b) {
-            AnimatableValueParser.E1("AudioManager", "MODIFY_AUDIO_SETTINGS is missing. Client will run with reduced functionality");
+            AnimatableValueParser.G1("AudioManager", "MODIFY_AUDIO_SETTINGS is missing. Client will run with reduced functionality");
             return;
         }
         boolean z5 = false;
         if (z2) {
             this.v = this.e.isSpeakerphoneOn();
             this.w = this.e.isMicrophoneMute();
-            this.f2083x = this.e.isBluetoothScoOn();
+            this.f2089x = this.e.isBluetoothScoOn();
             i(true);
             synchronized (this.i) {
                 AudioManager.OnAudioFocusChangeListener onAudioFocusChangeListener = this.o;
@@ -793,9 +793,9 @@ public final class DiscordAudioManager {
                     }
                     z5 = true;
                     if (z5) {
-                        AnimatableValueParser.A1("AudioManager", "Successful requestAudioFocus()");
+                        AnimatableValueParser.C1("AudioManager", "Successful requestAudioFocus()");
                     } else {
-                        AnimatableValueParser.E1("AudioManager", "Unable to requestAudioFocus()");
+                        AnimatableValueParser.G1("AudioManager", "Unable to requestAudioFocus()");
                     }
                 }
             }
@@ -814,9 +814,9 @@ public final class DiscordAudioManager {
             if (audioFocusRequest != null) {
             }
             if (!z5) {
-                AnimatableValueParser.A1("AudioManager", "Successful releaseAudioFocus()");
+                AnimatableValueParser.C1("AudioManager", "Successful releaseAudioFocus()");
             } else {
-                AnimatableValueParser.E1("AudioManager", "Unable to releaseAudioFocus()");
+                AnimatableValueParser.G1("AudioManager", "Unable to releaseAudioFocus()");
             }
             z3 = this.w;
             if (this.e.isMicrophoneMute() != z3) {
@@ -826,7 +826,7 @@ public final class DiscordAudioManager {
             if (this.e.isSpeakerphoneOn() != z4) {
                 this.e.setSpeakerphoneOn(z4);
             }
-            if (this.f2083x) {
+            if (this.f2089x) {
                 j();
                 return;
             }
@@ -843,7 +843,7 @@ public final class DiscordAudioManager {
         z4 = this.v;
         if (this.e.isSpeakerphoneOn() != z4) {
         }
-        if (this.f2083x) {
+        if (this.f2089x) {
         }
         z5 = true;
         if (!z5) {
@@ -854,7 +854,7 @@ public final class DiscordAudioManager {
         z4 = this.v;
         if (this.e.isSpeakerphoneOn() != z4) {
         }
-        if (this.f2083x) {
+        if (this.f2089x) {
         }
     }
 
@@ -864,7 +864,7 @@ public final class DiscordAudioManager {
         } catch (SecurityException unused) {
         }
         synchronized (this.i) {
-            this.f2085z = z2;
+            this.f2091z = z2;
         }
     }
 
diff --git a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java
index 734a7d81de..bc230a8c7d 100644
--- a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java
+++ b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothHeadsetAudioState.java
@@ -54,12 +54,12 @@ public enum BluetoothHeadsetAudioState {
         public final BluetoothHeadsetAudioState b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final BluetoothDevice f2087c;
+        public final BluetoothDevice f2093c;
 
         public b(BluetoothHeadsetAudioState bluetoothHeadsetAudioState, BluetoothHeadsetAudioState bluetoothHeadsetAudioState2, BluetoothDevice bluetoothDevice) {
             this.a = bluetoothHeadsetAudioState;
             this.b = bluetoothHeadsetAudioState2;
-            this.f2087c = bluetoothDevice;
+            this.f2093c = bluetoothDevice;
         }
 
         public boolean equals(Object obj) {
@@ -70,7 +70,7 @@ public enum BluetoothHeadsetAudioState {
                 return false;
             }
             b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2087c, bVar.f2087c);
+            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2093c, bVar.f2093c);
         }
 
         public int hashCode() {
@@ -79,7 +79,7 @@ public enum BluetoothHeadsetAudioState {
             int hashCode = (bluetoothHeadsetAudioState != null ? bluetoothHeadsetAudioState.hashCode() : 0) * 31;
             BluetoothHeadsetAudioState bluetoothHeadsetAudioState2 = this.b;
             int hashCode2 = (hashCode + (bluetoothHeadsetAudioState2 != null ? bluetoothHeadsetAudioState2.hashCode() : 0)) * 31;
-            BluetoothDevice bluetoothDevice = this.f2087c;
+            BluetoothDevice bluetoothDevice = this.f2093c;
             if (bluetoothDevice != null) {
                 i = bluetoothDevice.hashCode();
             }
@@ -92,7 +92,7 @@ public enum BluetoothHeadsetAudioState {
             L.append(", previous=");
             L.append(this.b);
             L.append(", device=");
-            L.append(this.f2087c);
+            L.append(this.f2093c);
             L.append(")");
             return L.toString();
         }
diff --git a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java
index 7ab671072e..941024d1f0 100644
--- a/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java
+++ b/app/src/main/java/com/discord/rtcconnection/enums/BluetoothProfileConnectionState.java
@@ -53,12 +53,12 @@ public enum BluetoothProfileConnectionState {
         public final BluetoothProfileConnectionState b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final BluetoothDevice f2088c;
+        public final BluetoothDevice f2094c;
 
         public b(BluetoothProfileConnectionState bluetoothProfileConnectionState, BluetoothProfileConnectionState bluetoothProfileConnectionState2, BluetoothDevice bluetoothDevice) {
             this.a = bluetoothProfileConnectionState;
             this.b = bluetoothProfileConnectionState2;
-            this.f2088c = bluetoothDevice;
+            this.f2094c = bluetoothDevice;
         }
 
         public boolean equals(Object obj) {
@@ -69,7 +69,7 @@ public enum BluetoothProfileConnectionState {
                 return false;
             }
             b bVar = (b) obj;
-            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2088c, bVar.f2088c);
+            return m.areEqual(this.a, bVar.a) && m.areEqual(this.b, bVar.b) && m.areEqual(this.f2094c, bVar.f2094c);
         }
 
         public int hashCode() {
@@ -78,7 +78,7 @@ public enum BluetoothProfileConnectionState {
             int hashCode = (bluetoothProfileConnectionState != null ? bluetoothProfileConnectionState.hashCode() : 0) * 31;
             BluetoothProfileConnectionState bluetoothProfileConnectionState2 = this.b;
             int hashCode2 = (hashCode + (bluetoothProfileConnectionState2 != null ? bluetoothProfileConnectionState2.hashCode() : 0)) * 31;
-            BluetoothDevice bluetoothDevice = this.f2088c;
+            BluetoothDevice bluetoothDevice = this.f2094c;
             if (bluetoothDevice != null) {
                 i = bluetoothDevice.hashCode();
             }
@@ -91,7 +91,7 @@ public enum BluetoothProfileConnectionState {
             L.append(", current=");
             L.append(this.b);
             L.append(", device=");
-            L.append(this.f2088c);
+            L.append(this.f2094c);
             L.append(")");
             return L.toString();
         }
diff --git a/app/src/main/java/com/discord/rtcconnection/enums/ThermalStatus.java b/app/src/main/java/com/discord/rtcconnection/enums/ThermalStatus.java
index e91aa48af0..d2b90dc341 100644
--- a/app/src/main/java/com/discord/rtcconnection/enums/ThermalStatus.java
+++ b/app/src/main/java/com/discord/rtcconnection/enums/ThermalStatus.java
@@ -20,6 +20,24 @@ public enum ThermalStatus {
     public static final class a {
         public a(DefaultConstructorMarker defaultConstructorMarker) {
         }
+
+        public final ThermalStatus a(int i) {
+            ThermalStatus thermalStatus;
+            ThermalStatus[] values = ThermalStatus.values();
+            int i2 = 0;
+            while (true) {
+                if (i2 >= 7) {
+                    thermalStatus = null;
+                    break;
+                }
+                thermalStatus = values[i2];
+                if (thermalStatus.getValue() == i) {
+                    break;
+                }
+                i2++;
+            }
+            return thermalStatus != null ? thermalStatus : ThermalStatus.None;
+        }
     }
 
     private ThermalStatus(int i) {
diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java
index a2374ca379..480ce3169c 100644
--- a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java
+++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngine.java
@@ -115,13 +115,13 @@ public interface MediaEngine {
         public final String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2089c;
+        public final int f2095c;
 
         public a(int i, String str, int i2) {
             m.checkNotNullParameter(str, "ip");
             this.a = i;
             this.b = str;
-            this.f2089c = i2;
+            this.f2095c = i2;
         }
 
         public boolean equals(Object obj) {
@@ -132,13 +132,13 @@ public interface MediaEngine {
                 return false;
             }
             a aVar = (a) obj;
-            return this.a == aVar.a && m.areEqual(this.b, aVar.b) && this.f2089c == aVar.f2089c;
+            return this.a == aVar.a && m.areEqual(this.b, aVar.b) && this.f2095c == aVar.f2095c;
         }
 
         public int hashCode() {
             int i = this.a * 31;
             String str = this.b;
-            return ((i + (str != null ? str.hashCode() : 0)) * 31) + this.f2089c;
+            return ((i + (str != null ? str.hashCode() : 0)) * 31) + this.f2095c;
         }
 
         public String toString() {
@@ -147,7 +147,7 @@ public interface MediaEngine {
             L.append(", ip=");
             L.append(this.b);
             L.append(", port=");
-            return c.d.b.a.a.z(L, this.f2089c, ")");
+            return c.d.b.a.a.z(L, this.f2095c, ")");
         }
     }
 
diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java
index 8a96264716..ed16b79c6c 100644
--- a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java
+++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java
@@ -82,7 +82,7 @@ public interface MediaEngineConnection {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Protocol f2090c;
+        public final Protocol f2096c;
 
         /* compiled from: MediaEngineConnection.kt */
         public enum Protocol {
@@ -95,7 +95,7 @@ public interface MediaEngineConnection {
             m.checkNotNullParameter(protocol, "protocol");
             this.a = str;
             this.b = i;
-            this.f2090c = protocol;
+            this.f2096c = protocol;
         }
 
         public boolean equals(Object obj) {
@@ -106,14 +106,14 @@ public interface MediaEngineConnection {
                 return false;
             }
             TransportInfo transportInfo = (TransportInfo) obj;
-            return m.areEqual(this.a, transportInfo.a) && this.b == transportInfo.b && m.areEqual(this.f2090c, transportInfo.f2090c);
+            return m.areEqual(this.a, transportInfo.a) && this.b == transportInfo.b && m.areEqual(this.f2096c, transportInfo.f2096c);
         }
 
         public int hashCode() {
             String str = this.a;
             int i = 0;
             int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.b) * 31;
-            Protocol protocol = this.f2090c;
+            Protocol protocol = this.f2096c;
             if (protocol != null) {
                 i = protocol.hashCode();
             }
@@ -126,7 +126,7 @@ public interface MediaEngineConnection {
             L.append(", port=");
             L.append(this.b);
             L.append(", protocol=");
-            L.append(this.f2090c);
+            L.append(this.f2096c);
             L.append(")");
             return L.toString();
         }
@@ -144,7 +144,7 @@ public interface MediaEngineConnection {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2091c;
+        public final int f2097c;
         public final int d;
         public final int e;
         public final int f;
@@ -152,7 +152,7 @@ public interface MediaEngineConnection {
         public a(int i, int i2, int i3, int i4, int i5, int i6) {
             this.a = i;
             this.b = i2;
-            this.f2091c = i3;
+            this.f2097c = i3;
             this.d = i4;
             this.e = i5;
             this.f = i6;
@@ -166,11 +166,11 @@ public interface MediaEngineConnection {
                 return false;
             }
             a aVar = (a) obj;
-            return this.a == aVar.a && this.b == aVar.b && this.f2091c == aVar.f2091c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f;
+            return this.a == aVar.a && this.b == aVar.b && this.f2097c == aVar.f2097c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f;
         }
 
         public int hashCode() {
-            return (((((((((this.a * 31) + this.b) * 31) + this.f2091c) * 31) + this.d) * 31) + this.e) * 31) + this.f;
+            return (((((((((this.a * 31) + this.b) * 31) + this.f2097c) * 31) + this.d) * 31) + this.e) * 31) + this.f;
         }
 
         public String toString() {
@@ -179,7 +179,7 @@ public interface MediaEngineConnection {
             L.append(", maxBitrate=");
             L.append(this.b);
             L.append(", width=");
-            L.append(this.f2091c);
+            L.append(this.f2097c);
             L.append(", height=");
             L.append(this.d);
             L.append(", mutedFramerate=");
@@ -195,7 +195,7 @@ public interface MediaEngineConnection {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2092c;
+        public final int f2098c;
         public final boolean d;
         public final boolean e;
         public final int f;
@@ -207,7 +207,7 @@ public interface MediaEngineConnection {
         public b(int i, int i2, int i3, boolean z2, boolean z3, int i4) {
             this.a = i;
             this.b = i2;
-            this.f2092c = i3;
+            this.f2098c = i3;
             this.d = z2;
             this.e = z3;
             this.f = i4;
@@ -222,7 +222,7 @@ public interface MediaEngineConnection {
             i4 = (i5 & 32) != 0 ? 5 : i4;
             this.a = i;
             this.b = i2;
-            this.f2092c = i3;
+            this.f2098c = i3;
             this.d = z2;
             this.e = z3;
             this.f = i4;
@@ -236,11 +236,11 @@ public interface MediaEngineConnection {
                 return false;
             }
             b bVar = (b) obj;
-            return this.a == bVar.a && this.b == bVar.b && this.f2092c == bVar.f2092c && this.d == bVar.d && this.e == bVar.e && this.f == bVar.f;
+            return this.a == bVar.a && this.b == bVar.b && this.f2098c == bVar.f2098c && this.d == bVar.d && this.e == bVar.e && this.f == bVar.f;
         }
 
         public int hashCode() {
-            int i = ((((this.a * 31) + this.b) * 31) + this.f2092c) * 31;
+            int i = ((((this.a * 31) + this.b) * 31) + this.f2098c) * 31;
             boolean z2 = this.d;
             int i2 = 1;
             if (z2) {
@@ -263,7 +263,7 @@ public interface MediaEngineConnection {
             L.append(", vadLeadingFrames=");
             L.append(this.b);
             L.append(", vadTrailingFrames=");
-            L.append(this.f2092c);
+            L.append(this.f2098c);
             L.append(", vadAutoThreshold=");
             L.append(this.d);
             L.append(", vadUseKrisp=");
@@ -275,7 +275,7 @@ public interface MediaEngineConnection {
 
     /* compiled from: MediaEngineConnection.kt */
     public interface c {
-        void onConnected(MediaEngineConnection mediaEngineConnection, TransportInfo transportInfo, List<c.a.r.j0.a> list);
+        void onConnected(MediaEngineConnection mediaEngineConnection, TransportInfo transportInfo, List<c.a.r.k0.a> list);
 
         void onConnectionStateChange(MediaEngineConnection mediaEngineConnection, ConnectionState connectionState);
 
diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java
index d4406598f0..a9fed6a9bc 100644
--- a/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java
+++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/ThumbnailEmitter.java
@@ -22,7 +22,7 @@ public final class ThumbnailEmitter {
     public final ByteBuffer b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final GlRectDrawer f2093c;
+    public final GlRectDrawer f2099c;
     public final VideoFrameDrawer d;
     public final long e;
     public final Matrix f;
@@ -47,7 +47,7 @@ public final class ThumbnailEmitter {
         long j3 = (long) 1000;
         this.a = -(j * j3 * j3);
         this.b = JniCommon.nativeAllocateByteBuffer(i * i2 * 4);
-        this.f2093c = new GlRectDrawer();
+        this.f2099c = new GlRectDrawer();
         this.d = new VideoFrameDrawer();
         this.e = clock2.currentTimeMillis();
         Matrix matrix = new Matrix();
@@ -66,10 +66,10 @@ public final class ThumbnailEmitter {
         GLES20.glClear(16384);
         if (((float) videoFrame.getRotatedWidth()) / ((float) videoFrame.getRotatedHeight()) < ((float) this.g) / ((float) this.h)) {
             float rotatedHeight = (((float) this.h) / ((float) videoFrame.getRotatedHeight())) * ((float) videoFrame.getRotatedWidth());
-            this.d.drawFrame(videoFrame, this.f2093c, this.f, a.roundToInt((((float) this.g) - rotatedHeight) / 2.0f), 0, a.roundToInt(rotatedHeight), this.h);
+            this.d.drawFrame(videoFrame, this.f2099c, this.f, a.roundToInt((((float) this.g) - rotatedHeight) / 2.0f), 0, a.roundToInt(rotatedHeight), this.h);
         } else {
             float rotatedWidth = (((float) this.g) / ((float) videoFrame.getRotatedWidth())) * ((float) videoFrame.getRotatedHeight());
-            this.d.drawFrame(videoFrame, this.f2093c, this.f, 0, a.roundToInt((((float) this.h) - rotatedWidth) / 2.0f), this.g, a.roundToInt(rotatedWidth));
+            this.d.drawFrame(videoFrame, this.f2099c, this.f, 0, a.roundToInt((((float) this.h) - rotatedWidth) / 2.0f), this.g, a.roundToInt(rotatedWidth));
         }
         this.b.rewind();
         GLES20.glReadPixels(0, 0, glTextureFrameBuffer.getWidth(), glTextureFrameBuffer.getHeight(), 6408, 5121, this.b);
diff --git a/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java b/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java
index 22800e9186..1693f88fe7 100644
--- a/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java
+++ b/app/src/main/java/com/discord/samsung/SamsungConnectActivity.java
@@ -150,9 +150,9 @@ public final class SamsungConnectActivity extends AppCompatActivity {
                 if (aVar == null) {
                     m.throwUninitializedPropertyAccessException("samsungAccountServiceCallback");
                 }
-                String N = bVar.N("97t47j218f", "dummy", "com.discord", aVar);
-                Log.i("Discord", "Samsung Account service connection established: " + N);
-                if (N == null) {
+                String O = bVar.O("97t47j218f", "dummy", "com.discord", aVar);
+                Log.i("Discord", "Samsung Account service connection established: " + O);
+                if (O == null) {
                     SamsungConnectActivity samsungConnectActivity = this.i;
                     samsungConnectActivity.setResult(500, new Intent().putExtra("com.discord.samsung.intent.extra.ATTEMPT_COUNT", samsungConnectActivity.getIntent().getIntExtra("com.discord.samsung.intent.extra.ATTEMPT_COUNT", 0) + 1));
                     samsungConnectActivity.finish();
@@ -160,7 +160,7 @@ public final class SamsungConnectActivity extends AppCompatActivity {
                 }
                 Bundle bundle = new Bundle();
                 bundle.putStringArray("additional", new String[]{"api_server_url", "auth_server_url"});
-                boolean j02 = bVar.j0(1221, N, bundle);
+                boolean j02 = bVar.j0(1221, O, bundle);
                 Log.i("Discord", "Samsung Account service connection established: isReqSucc? " + j02);
                 if (!j02) {
                     throw new Exception("Call Samsung.requestAuthCode failed");
diff --git a/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java b/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
index e59905d131..528e72cbad 100644
--- a/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
+++ b/app/src/main/java/com/discord/screenshot_detection/ScreenshotDetector.java
@@ -17,7 +17,7 @@ public final class ScreenshotDetector {
     public final PublishSubject<Screenshot> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b f2094c;
+    public final b f2100c;
     public final c.a.t.a d;
     public boolean e;
     public final Logger f;
@@ -98,13 +98,13 @@ public final class ScreenshotDetector {
         m.checkNotNullParameter(sharedPreferences, "cache");
         this.f = logger;
         this.g = sharedPreferences;
-        PublishSubject<Screenshot> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.b = l0;
+        PublishSubject<Screenshot> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.b = k0;
         ContentResolver contentResolver = application.getContentResolver();
         m.checkNotNullExpressionValue(contentResolver, "applicationContext.contentResolver");
         b bVar = new b(logger, contentResolver, null, new a(this), 4);
-        this.f2094c = bVar;
+        this.f2100c = bVar;
         c.a.t.a aVar = new c.a.t.a(bVar);
         this.d = aVar;
         a(sharedPreferences.getBoolean("screenshot_detection_enabled", false));
diff --git a/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java b/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java
index 47dd087cdb..e304ea1128 100644
--- a/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java
+++ b/app/src/main/java/com/discord/simpleast/core/parser/ParseSpec.java
@@ -8,20 +8,20 @@ public final class ParseSpec<R, S> {
     public final boolean b = true;
 
     /* renamed from: c  reason: collision with root package name */
-    public final S f2095c;
+    public final S f2101c;
     public int d;
     public int e;
 
     public ParseSpec(Node<R> node, S s2) {
         m.checkNotNullParameter(node, "root");
         this.a = node;
-        this.f2095c = s2;
+        this.f2101c = s2;
     }
 
     public ParseSpec(Node<R> node, S s2, int i, int i2) {
         m.checkNotNullParameter(node, "root");
         this.a = node;
-        this.f2095c = s2;
+        this.f2101c = s2;
         this.d = i;
         this.e = i2;
     }
diff --git a/app/src/main/java/com/discord/simpleast/core/parser/Parser.java b/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
index 461a2331b3..4ab0ebcad7 100644
--- a/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
+++ b/app/src/main/java/com/discord/simpleast/core/parser/Parser.java
@@ -136,7 +136,7 @@ public class Parser<R, T extends Node<R>, S> {
                     break;
                 }
                 Rule<R, T, S> rule = (Rule) it.next();
-                Matcher match = rule.match(subSequence, str, parseSpec.f2095c);
+                Matcher match = rule.match(subSequence, str, parseSpec.f2101c);
                 if (match == null) {
                     logMiss(rule, subSequence);
                     pair = null;
@@ -153,12 +153,12 @@ public class Parser<R, T extends Node<R>, S> {
             if (pair != null) {
                 Matcher matcher = (Matcher) pair.component2();
                 int end = matcher.end() + i3;
-                ParseSpec<R, S> parse = ((Rule) pair.component1()).parse(matcher, this, parseSpec.f2095c);
+                ParseSpec<R, S> parse = ((Rule) pair.component1()).parse(matcher, this, parseSpec.f2101c);
                 Node<R> node2 = parseSpec.a;
                 node2.addChild(parse.a);
                 int i4 = parseSpec.e;
                 if (end != i4) {
-                    S s3 = parseSpec.f2095c;
+                    S s3 = parseSpec.f2101c;
                     m.checkNotNullParameter(node2, "node");
                     stack.push(new ParseSpec(node2, s3, end, i4));
                 }
diff --git a/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java b/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java
index fa08e5b1df..40d1f21eff 100644
--- a/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java
+++ b/app/src/main/java/com/discord/stores/ArchivedThreadsStore.java
@@ -174,9 +174,9 @@ public final class ArchivedThreadsStore extends StoreV2 {
                 try {
                     return RestAPI.Companion.getApi().getAllPrivateArchivedThreads(j, Companion.access$getLastArchiveTimestamp(ThreadListingType.Companion, list));
                 } catch (IllegalStateException e) {
-                    Observable<ThreadListing> x2 = Observable.x(e);
-                    m.checkNotNullExpressionValue(x2, "Observable.error(e)");
-                    return x2;
+                    Observable<ThreadListing> w = Observable.w(e);
+                    m.checkNotNullExpressionValue(w, "Observable.error(e)");
+                    return w;
                 }
             }
         }
@@ -193,9 +193,9 @@ public final class ArchivedThreadsStore extends StoreV2 {
                 try {
                     return RestAPI.Companion.getApi().getAllPublicArchivedThreads(j, Companion.access$getLastArchiveTimestamp(ThreadListingType.Companion, list));
                 } catch (IllegalStateException e) {
-                    Observable<ThreadListing> x2 = Observable.x(e);
-                    m.checkNotNullExpressionValue(x2, "Observable.error(e)");
-                    return x2;
+                    Observable<ThreadListing> w = Observable.w(e);
+                    m.checkNotNullExpressionValue(w, "Observable.error(e)");
+                    return w;
                 }
             }
         }
@@ -218,8 +218,8 @@ public final class ArchivedThreadsStore extends StoreV2 {
                 if (list.isEmpty()) {
                     return null;
                 }
-                ThreadMetadata x2 = ((Channel) u.last((List<? extends Object>) list)).x();
-                if (x2 != null && (a = x2.a()) != null) {
+                ThreadMetadata y2 = ((Channel) u.last((List<? extends Object>) list)).y();
+                if (y2 != null && (a = y2.a()) != null) {
                     return a;
                 }
                 throw new IllegalStateException("Thread missing threadMetadata");
@@ -236,7 +236,7 @@ public final class ArchivedThreadsStore extends StoreV2 {
             public Observable<ThreadListing> fetchNext(long j, List<Channel> list) {
                 m.checkNotNullParameter(list, "threads");
                 Channel channel = (Channel) u.lastOrNull((List<? extends Object>) list);
-                return RestAPI.Companion.getApi().getMyPrivateArchivedThreads(j, channel != null ? Long.valueOf(channel.g()) : null);
+                return RestAPI.Companion.getApi().getMyPrivateArchivedThreads(j, channel != null ? Long.valueOf(channel.h()) : null);
             }
         }
 
@@ -342,9 +342,9 @@ public final class ArchivedThreadsStore extends StoreV2 {
     public final Observable<ThreadListingState> loadAndObserveThreadListing(long j, ThreadListingType threadListingType) {
         m.checkNotNullParameter(threadListingType, "threadListingType");
         fetchListing(j, threadListingType, true);
-        Observable<ThreadListingState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new ArchivedThreadsStore$loadAndObserveThreadListing$1(this, j, threadListingType), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<ThreadListingState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new ArchivedThreadsStore$loadAndObserveThreadListing$1(this, j, threadListingType), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/BuiltInCommands.java b/app/src/main/java/com/discord/stores/BuiltInCommands.java
index e1ded62e16..5a2b510957 100644
--- a/app/src/main/java/com/discord/stores/BuiltInCommands.java
+++ b/app/src/main/java/com/discord/stores/BuiltInCommands.java
@@ -29,7 +29,7 @@ public final class BuiltInCommands implements BuiltInCommandsProvider {
     public BuiltInCommands() {
         List<ApplicationCommand> listOf = n.listOf((Object[]) new ApplicationCommand[]{createAppendToEndSlashCommand(-1, "shrug", 2131887441, 2131887442, "¯\\\\_(ツ)\\_/¯"), createAppendToEndSlashCommand(-2, "tableflip", 2131887445, 2131887446, "(╯°□°）╯︵ ┻━┻"), createAppendToEndSlashCommand(-3, "unflip", 2131887447, 2131887448, "┬─┬ ノ( ゜-゜ノ)"), createWrappedSlashCommand(-5, "me", 2131887432, 2131887433, "_"), createWrappedSlashCommand(-6, "spoiler", 2131887443, 2131887444, "||")});
         this.builtInCommands = listOf;
-        this.builtInApplication = new Application(-1, "Built-In", null, 2131231929, listOf.size(), null, true, 36, null);
+        this.builtInApplication = new Application(-1, "Built-In", null, 2131231937, listOf.size(), null, true, 36, null);
     }
 
     private final ApplicationCommand createAppendToEndSlashCommand(long j, String str, Integer num, Integer num2, String str2) {
diff --git a/app/src/main/java/com/discord/stores/NotificationTextUtils.java b/app/src/main/java/com/discord/stores/NotificationTextUtils.java
index a215cd2f60..59a62af3e1 100644
--- a/app/src/main/java/com/discord/stores/NotificationTextUtils.java
+++ b/app/src/main/java/com/discord/stores/NotificationTextUtils.java
@@ -29,9 +29,9 @@ public final class NotificationTextUtils {
         if (!modelNotificationSettings.isMobilePush() || isGuildOrCategoryOrChannelMuted(modelNotificationSettings, channel)) {
             return false;
         }
-        Integer messageNotifications = messageNotifications(modelNotificationSettings, channel.g());
+        Integer messageNotifications = messageNotifications(modelNotificationSettings, channel.h());
         if (messageNotifications == null) {
-            messageNotifications = messageNotifications(modelNotificationSettings, channel.q());
+            messageNotifications = messageNotifications(modelNotificationSettings, channel.r());
         }
         Integer num2 = null;
         if (messageNotifications == null) {
@@ -67,11 +67,11 @@ public final class NotificationTextUtils {
             if (computeThreadNotificationSetting == 8) {
                 return false;
             }
-            if (!m.areEqual(message.x(), Boolean.TRUE)) {
-                List<com.discord.api.user.User> z5 = message.z();
-                if (z5 != null) {
-                    if (!z5.isEmpty()) {
-                        Iterator<T> it = z5.iterator();
+            if (!m.areEqual(message.r(), Boolean.TRUE)) {
+                List<com.discord.api.user.User> t = message.t();
+                if (t != null) {
+                    if (!t.isEmpty()) {
+                        Iterator<T> it = t.iterator();
                         while (true) {
                             if (!it.hasNext()) {
                                 break;
@@ -91,12 +91,12 @@ public final class NotificationTextUtils {
                     }
                     z3 = false;
                 }
-                List<Long> y2 = message.y();
-                if (y2 == null) {
+                List<Long> s2 = message.s();
+                if (s2 == null) {
                     return false;
                 }
-                if (!y2.isEmpty()) {
-                    Iterator<T> it2 = y2.iterator();
+                if (!s2.isEmpty()) {
+                    Iterator<T> it2 = s2.iterator();
                     while (true) {
                         if (it2.hasNext()) {
                             if (collection.contains(Long.valueOf(((Number) it2.next()).longValue()))) {
@@ -136,7 +136,7 @@ public final class NotificationTextUtils {
      */
     /* JADX WARNING: Removed duplicated region for block: B:52:? A[RETURN, SYNTHETIC] */
     private final boolean shouldNotifyForLevel(Integer num, User user, Collection<Long> collection, Message message, boolean z2, boolean z3) {
-        List<Long> y2;
+        List<Long> s2;
         boolean z4;
         boolean z5;
         boolean z6;
@@ -147,11 +147,11 @@ public final class NotificationTextUtils {
                 return false;
             }
             int i3 = ModelNotificationSettings.FREQUENCY_MENTIONS;
-            if (num != null && num.intValue() == i3 && (!m.areEqual(message.x(), Boolean.TRUE) || z2)) {
-                List<com.discord.api.user.User> z7 = message.z();
-                if (z7 != null) {
-                    if (!z7.isEmpty()) {
-                        Iterator<T> it = z7.iterator();
+            if (num != null && num.intValue() == i3 && (!m.areEqual(message.r(), Boolean.TRUE) || z2)) {
+                List<com.discord.api.user.User> t = message.t();
+                if (t != null) {
+                    if (!t.isEmpty()) {
+                        Iterator<T> it = t.iterator();
                         while (true) {
                             if (!it.hasNext()) {
                                 break;
@@ -171,11 +171,11 @@ public final class NotificationTextUtils {
                     }
                     z5 = false;
                 }
-                if (z3 || (y2 = message.y()) == null) {
+                if (z3 || (s2 = message.s()) == null) {
                     return false;
                 }
-                if (!y2.isEmpty()) {
-                    Iterator<T> it2 = y2.iterator();
+                if (!s2.isEmpty()) {
+                    Iterator<T> it2 = s2.iterator();
                     while (true) {
                         if (it2.hasNext()) {
                             if (collection.contains(Long.valueOf(((Number) it2.next()).longValue()))) {
@@ -212,16 +212,16 @@ public final class NotificationTextUtils {
         if (channel == null) {
             return false;
         }
-        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(channel.q());
+        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(channel.r());
         if (channelOverride != null && channelOverride.isMuted()) {
             return true;
         }
-        ModelNotificationSettings.ChannelOverride channelOverride2 = modelNotificationSettings.getChannelOverride(channel.g());
+        ModelNotificationSettings.ChannelOverride channelOverride2 = modelNotificationSettings.getChannelOverride(channel.h());
         return channelOverride2 != null && channelOverride2.isMuted();
     }
 
     public final boolean shouldNotifyInAppPopup(User user, Message message, Channel channel, Map<Long, Integer> map, Channel channel2, Guild guild, Map<Long, ? extends Map<Long, GuildMember>> map2, Map<Long, ? extends ModelNotificationSettings> map3, Map<Long, StoreThreadsJoined.JoinedThread> map4) {
-        com.discord.api.user.User g;
+        com.discord.api.user.User e;
         List<Long> list;
         m.checkNotNullParameter(user, "me");
         m.checkNotNullParameter(message, "msg");
@@ -230,11 +230,11 @@ public final class NotificationTextUtils {
         m.checkNotNullParameter(map2, "guildMembers");
         m.checkNotNullParameter(map3, "guildSettings");
         m.checkNotNullParameter(map4, "joinedThreads");
-        if (AnimatableValueParser.o1(channel) || (g = message.g()) == null || g.i() == 0 || g.i() == user.getId() || map.containsKey(Long.valueOf(g.i()))) {
+        if (AnimatableValueParser.p1(channel) || (e = message.e()) == null || e.i() == 0 || e.i() == user.getId() || map.containsKey(Long.valueOf(e.i()))) {
             return false;
         }
-        Integer M = message.M();
-        if (M != null && M.intValue() == 3) {
+        Integer E = message.E();
+        if (E != null && E.intValue() == 3) {
             return false;
         }
         Map map5 = (Map) a.c(channel, map2);
@@ -244,7 +244,7 @@ public final class NotificationTextUtils {
             list = n.emptyList();
         }
         ModelNotificationSettings modelNotificationSettings = (ModelNotificationSettings) a.c(channel, map3);
-        if (AnimatableValueParser.y1(channel)) {
+        if (AnimatableValueParser.z1(channel)) {
             return isThreadNotificationAllowed(user, list, message, (StoreThreadsJoined.JoinedThread) a.d(channel, map4), modelNotificationSettings, channel2);
         }
         if (modelNotificationSettings != null) {
diff --git a/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java b/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java
index 0d4453f751..696d50b256 100644
--- a/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java
+++ b/app/src/main/java/com/discord/stores/ReadyPayloadUtils.java
@@ -319,22 +319,22 @@ public final class ReadyPayloadUtils {
     }
 
     private final Channel hydrate(Channel channel, Channel channel2) {
-        return (channel2 == null || channel2.h() == 0) ? channel : Channel.a(channel, null, 0, 0, null, channel2.h(), 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435439);
+        return (channel2 == null || channel2.i() == 0) ? channel : Channel.a(channel, null, 0, 0, null, channel2.i(), 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870895);
     }
 
     private final Channel hydrate(Channel channel, Map<Long, User> map) {
-        List<Long> u = channel.u();
-        if (u == null) {
+        List<Long> v = channel.v();
+        if (v == null) {
             return channel;
         }
         ArrayList arrayList = new ArrayList();
-        for (Number number : u) {
+        for (Number number : v) {
             User user = map.get(Long.valueOf(number.longValue()));
             if (user != null) {
                 arrayList.add(user);
             }
         }
-        return Channel.a(channel, null, 0, 0, null, 0, 0, 0, null, arrayList, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435071);
+        return Channel.a(channel, null, 0, 0, null, 0, 0, 0, null, arrayList, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870527);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: com.discord.stores.ReadyPayloadUtils */
@@ -398,13 +398,13 @@ public final class ReadyPayloadUtils {
                 List<Channel> f = guild5.f();
                 m.checkNotNull(f);
                 for (Channel channel : f) {
-                    hashMap.put(Long.valueOf(channel.g()), channel);
+                    hashMap.put(Long.valueOf(channel.h()), channel);
                 }
                 guild5 = Guild.a(guild5, null, null, null, null, null, null, 0, null, 0, null, null, null, null, null, null, null, false, 0, 0, null, null, null, 0, null, null, 0, 0, 0, null, null, null, null, null, null, null, 0, 0, null, null, null, null, false, null, -1, 1919);
             }
             ArrayList arrayList = new ArrayList();
             for (Channel channel2 : list3) {
-                Channel channel3 = (Channel) hashMap.get(Long.valueOf(channel2.g()));
+                Channel channel3 = (Channel) hashMap.get(Long.valueOf(channel2.h()));
                 if (channel3 != null) {
                     arrayList.add(function2.invoke(channel2, channel3));
                 } else {
diff --git a/app/src/main/java/com/discord/stores/StageChannelRoleContext.java b/app/src/main/java/com/discord/stores/StageChannelRoleContext.java
index 878472e49e..1089f1444c 100644
--- a/app/src/main/java/com/discord/stores/StageChannelRoleContext.java
+++ b/app/src/main/java/com/discord/stores/StageChannelRoleContext.java
@@ -36,11 +36,11 @@ public final class StageChannelRoleContext {
         long id2 = this.guild.getId();
         long ownerId = this.guild.getOwnerId();
         Map<Long, GuildRole> map = this.guildRolesMap;
-        List<PermissionOverwrite> r = this.channel.r();
-        if (r == null) {
-            r = n.emptyList();
+        List<PermissionOverwrite> s2 = this.channel.s();
+        if (s2 == null) {
+            s2 = n.emptyList();
         }
-        return PermissionUtils.can(j, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j2, id2, ownerId, guildMember, map, r)));
+        return PermissionUtils.can(j, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j2, id2, ownerId, guildMember, map, s2)));
     }
 
     private final boolean isSpeaker(long j, GuildMember guildMember) {
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$ackMessage$1.java b/app/src/main/java/com/discord/stores/StoreAnalytics$ackMessage$1.java
index 8b1435835c..f57a7a15ff 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$ackMessage$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$ackMessage$1.java
@@ -43,7 +43,7 @@ public final class StoreAnalytics$ackMessage$1 extends o implements Function0<Un
     public final void mo1invoke() {
         Channel findChannelByIdInternal$app_productionGoogleRelease = StoreAnalytics.access$getStores$p(this.this$0).getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.$channelId);
         if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-            AnalyticsTracker.INSTANCE.ackMessage(findChannelByIdInternal$app_productionGoogleRelease, new AnonymousClass1(h0.plus(StoreAnalytics.access$getGuildAnalyticsPropertiesInternal(this.this$0, findChannelByIdInternal$app_productionGoogleRelease.e()), StoreAnalytics.getChannelSnapshotAnalyticsProperties$default(this.this$0, findChannelByIdInternal$app_productionGoogleRelease, false, 2, (Object) null))));
+            AnalyticsTracker.INSTANCE.ackMessage(findChannelByIdInternal$app_productionGoogleRelease, new AnonymousClass1(h0.plus(StoreAnalytics.access$getGuildAnalyticsPropertiesInternal(this.this$0, findChannelByIdInternal$app_productionGoogleRelease.f()), StoreAnalytics.getChannelSnapshotAnalyticsProperties$default(this.this$0, findChannelByIdInternal$app_productionGoogleRelease, false, 2, (Object) null))));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java b/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java
index 43be4b394b..842e892b42 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$init$3.java
@@ -26,6 +26,6 @@ public final class StoreAnalytics$init$3<T, R> implements b<StoreAnalytics.Scree
     }
 
     public final Observable<? extends StoreAnalytics.ScreenViewed> call(StoreAnalytics.ScreenViewed screenViewed) {
-        return m.areEqual(screenViewed.getScreen(), WidgetHome.class) ? Observable.e0(2, TimeUnit.SECONDS).G(new AnonymousClass1(screenViewed)) : new j(screenViewed);
+        return m.areEqual(screenViewed.getScreen(), WidgetHome.class) ? Observable.d0(2, TimeUnit.SECONDS).F(new AnonymousClass1(screenViewed)) : new j(screenViewed);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.java b/app/src/main/java/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.java
index 7e57075b6f..daa422d26c 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$onOverlayVoiceEvent$1.java
@@ -32,7 +32,7 @@ public final class StoreAnalytics$onOverlayVoiceEvent$1 extends o implements Fun
         if (this.$isActive) {
             Channel access$getSelectedVoiceChannel$p = StoreAnalytics.access$getSelectedVoiceChannel$p(this.this$0);
             Map<String, Object> map2 = null;
-            Map access$getGuildAnalyticsPropertiesInternal = access$getSelectedVoiceChannel$p != null ? StoreAnalytics.access$getGuildAnalyticsPropertiesInternal(this.this$0, access$getSelectedVoiceChannel$p.e()) : null;
+            Map access$getGuildAnalyticsPropertiesInternal = access$getSelectedVoiceChannel$p != null ? StoreAnalytics.access$getGuildAnalyticsPropertiesInternal(this.this$0, access$getSelectedVoiceChannel$p.f()) : null;
             if (access$getGuildAnalyticsPropertiesInternal == null) {
                 access$getGuildAnalyticsPropertiesInternal = h0.emptyMap();
             }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$onThreadNotificationSettingsUpdated$1.java b/app/src/main/java/com/discord/stores/StoreAnalytics$onThreadNotificationSettingsUpdated$1.java
index ded4cec1fa..853d765fe4 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$onThreadNotificationSettingsUpdated$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$onThreadNotificationSettingsUpdated$1.java
@@ -34,9 +34,9 @@ public final class StoreAnalytics$onThreadNotificationSettingsUpdated$1 extends
         Channel findChannelByIdInternal$app_productionGoogleRelease2 = StoreAnalytics.access$getStores$p(this.this$0).getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.$channelId);
         if (findChannelByIdInternal$app_productionGoogleRelease2 != null && (findChannelByIdInternal$app_productionGoogleRelease = StoreAnalytics.access$getStores$p(this.this$0).getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.$parentChannelId)) != null) {
             boolean z2 = (this.$oldFlags & 1) != 0;
-            long e = findChannelByIdInternal$app_productionGoogleRelease2.e();
-            Guild guild = StoreAnalytics.access$getStores$p(this.this$0).getGuilds$app_productionGoogleRelease().getGuild(e);
-            if (guild != null && (modelNotificationSettings = StoreAnalytics.access$getStores$p(this.this$0).getGuildSettings$app_productionGoogleRelease().getGuildSettingsInternal$app_productionGoogleRelease().get(Long.valueOf(e))) != null) {
+            long f = findChannelByIdInternal$app_productionGoogleRelease2.f();
+            Guild guild = StoreAnalytics.access$getStores$p(this.this$0).getGuilds$app_productionGoogleRelease().getGuild(f);
+            if (guild != null && (modelNotificationSettings = StoreAnalytics.access$getStores$p(this.this$0).getGuildSettings$app_productionGoogleRelease().getGuildSettingsInternal$app_productionGoogleRelease().get(Long.valueOf(f))) != null) {
                 AnalyticsTracker.INSTANCE.threadNotificationSettingsUpdated(StoreAnalytics.access$getThreadSnapshotAnalyticsProperties(this.this$0, findChannelByIdInternal$app_productionGoogleRelease2), z2, NotificationTextUtils.INSTANCE.isGuildOrCategoryOrChannelMuted(modelNotificationSettings, findChannelByIdInternal$app_productionGoogleRelease), ChannelNotificationSettingsUtils.INSTANCE.computeNotificationSetting(guild, findChannelByIdInternal$app_productionGoogleRelease2, modelNotificationSettings), this.$oldFlags, this.$flags);
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.java
index a661a361c3..4d0dcffda6 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1.java
@@ -29,7 +29,7 @@ public final class StoreAnalytics$trackChannelOpened$$inlined$let$lambda$1 exten
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Map<String, ? extends Object> mo1invoke() {
-        Map<String, ? extends Object> plus = h0.plus(AnimatableValueParser.y1(this.$channel) ? StoreAnalytics.access$getThreadSnapshotAnalyticsProperties(this.this$0, this.$channel) : StoreAnalytics.access$getChannelSnapshotAnalyticsProperties(this.this$0, this.$channel, true), g0.mapOf(d0.o.to("channel_view", this.$channelView$inlined.getAnalyticsValue())));
+        Map<String, ? extends Object> plus = h0.plus(AnimatableValueParser.z1(this.$channel) ? StoreAnalytics.access$getThreadSnapshotAnalyticsProperties(this.this$0, this.$channel) : StoreAnalytics.access$getChannelSnapshotAnalyticsProperties(this.this$0, this.$channel, true), g0.mapOf(d0.o.to("channel_view", this.$channelView$inlined.getAnalyticsValue())));
         SelectedChannelAnalyticsLocation selectedChannelAnalyticsLocation = this.$analyticsLocation$inlined;
         return selectedChannelAnalyticsLocation != null ? h0.plus(plus, g0.mapOf(d0.o.to("location", selectedChannelAnalyticsLocation.getAnalyticsValue()))) : plus;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.java b/app/src/main/java/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.java
index 59702b1f67..62d9af578d 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics$trackShowCallFeedbackSheet$1.java
@@ -22,7 +22,7 @@ public final class StoreAnalytics$trackShowCallFeedbackSheet$1 extends o impleme
     public final void mo1invoke() {
         Channel findChannelByIdInternal$app_productionGoogleRelease = StoreAnalytics.access$getStores$p(this.this$0).getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.$channelId);
         if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-            AnalyticsTracker.INSTANCE.openCallFeedbackSheet(findChannelByIdInternal$app_productionGoogleRelease.e(), findChannelByIdInternal$app_productionGoogleRelease.g(), findChannelByIdInternal$app_productionGoogleRelease.z());
+            AnalyticsTracker.INSTANCE.openCallFeedbackSheet(findChannelByIdInternal$app_productionGoogleRelease.f(), findChannelByIdInternal$app_productionGoogleRelease.h(), findChannelByIdInternal$app_productionGoogleRelease.A());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics.java b/app/src/main/java/com/discord/stores/StoreAnalytics.java
index 9e3489cea1..c0067f1085 100644
--- a/app/src/main/java/com/discord/stores/StoreAnalytics.java
+++ b/app/src/main/java/com/discord/stores/StoreAnalytics.java
@@ -65,7 +65,7 @@ public final class StoreAnalytics extends Store {
     private String fingerprint;
     private AtomicBoolean hasTrackedAppUiShown = new AtomicBoolean(false);
     private String inputMode;
-    private final PublishSubject<ScreenViewed> screenViewedSubject = PublishSubject.l0();
+    private final PublishSubject<ScreenViewed> screenViewedSubject = PublishSubject.k0();
     private Channel selectedVoiceChannel;
     private final StoreStream stores;
 
@@ -211,7 +211,7 @@ public final class StoreAnalytics extends Store {
         int ordinal = emojiPickerContextType.ordinal();
         if (ordinal == 0) {
             Channel channel = this.stores.getChannels$app_productionGoogleRelease().getChannel(this.stores.getChannelsSelected$app_productionGoogleRelease().getId());
-            str = (channel == null || channel.e() != 0) ? "Guild Channel" : "DM Channel";
+            str = (channel == null || channel.f() != 0) ? "Guild Channel" : "DM Channel";
         } else if (ordinal == 1) {
             str = "Custom Status Modal";
         } else {
@@ -240,17 +240,17 @@ public final class StoreAnalytics extends Store {
         Object obj;
         boolean z3;
         Long l = (Long) a.d(channel, this.stores.getPermissions$app_productionGoogleRelease().getPermissionsByChannel());
-        List<PermissionOverwrite> r = channel.r();
+        List<PermissionOverwrite> s2 = channel.s();
         Boolean bool = null;
-        if (r != null) {
-            Iterator<T> it = r.iterator();
+        if (s2 != null) {
+            Iterator<T> it = s2.iterator();
             while (true) {
                 if (!it.hasNext()) {
                     obj = null;
                     break;
                 }
                 obj = it.next();
-                if (((PermissionOverwrite) obj).e() == channel.e()) {
+                if (((PermissionOverwrite) obj).e() == channel.f()) {
                     z3 = true;
                     continue;
                 } else {
@@ -268,7 +268,7 @@ public final class StoreAnalytics extends Store {
         if (permissionOverwrite != null) {
             bool = Boolean.valueOf(PermissionOverwriteUtilsKt.denies(permissionOverwrite, 1024));
         }
-        return h0.plus(h0.plus(AnalyticsUtils.INSTANCE.getProperties$app_productionGoogleRelease(channel), h0.mapOf(o.to("channel_member_perms", l), o.to("channel_hidden", bool))), z2 ? g0.mapOf(o.to("channel_is_nsfw", Boolean.valueOf(channel.n()))) : h0.emptyMap());
+        return h0.plus(h0.plus(AnalyticsUtils.INSTANCE.getProperties$app_productionGoogleRelease(channel), h0.mapOf(o.to("channel_member_perms", l), o.to("channel_hidden", bool))), z2 ? g0.mapOf(o.to("channel_is_nsfw", Boolean.valueOf(channel.o()))) : h0.emptyMap());
     }
 
     public static /* synthetic */ Map getChannelSnapshotAnalyticsProperties$default(StoreAnalytics storeAnalytics, long j, boolean z2, int i, Object obj) {
@@ -312,7 +312,7 @@ public final class StoreAnalytics extends Store {
         Channel channel = this.stores.getChannels$app_productionGoogleRelease().getChannel(j);
         Map<String, Object> map = null;
         if (channel != null) {
-            map = h0.plus(getGuildSnapshotAnalyticsProperties(channel.e()), getChannelSnapshotAnalyticsProperties$default(this, channel, false, 2, (Object) null));
+            map = h0.plus(getGuildSnapshotAnalyticsProperties(channel.f()), getChannelSnapshotAnalyticsProperties$default(this, channel, false, 2, (Object) null));
         }
         return map != null ? map : h0.emptyMap();
     }
@@ -376,25 +376,25 @@ public final class StoreAnalytics extends Store {
      type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
      */
     private final Map<String, Object> getThreadSnapshotAnalyticsProperties(Channel channel) {
-        Integer threadMessageCount = this.stores.getThreadMessages$app_productionGoogleRelease().getThreadMessageCount(channel.g());
+        Integer threadMessageCount = this.stores.getThreadMessages$app_productionGoogleRelease().getThreadMessageCount(channel.h());
         boolean z2 = false;
         int intValue = threadMessageCount != null ? threadMessageCount.intValue() : 0;
         Pair[] pairArr = new Pair[9];
-        pairArr[0] = o.to("channel_id", Long.valueOf(channel.g()));
-        pairArr[1] = o.to("guild_id", Long.valueOf(channel.e()));
-        pairArr[2] = o.to("parent_id", Long.valueOf(channel.q()));
-        pairArr[3] = o.to("channel_type", Integer.valueOf(channel.z()));
+        pairArr[0] = o.to("channel_id", Long.valueOf(channel.h()));
+        pairArr[1] = o.to("guild_id", Long.valueOf(channel.f()));
+        pairArr[2] = o.to("parent_id", Long.valueOf(channel.r()));
+        pairArr[3] = o.to("channel_type", Integer.valueOf(channel.A()));
         pairArr[4] = o.to("thread_approximate_message_count", Integer.valueOf(f.coerceAtMost(intValue, 50)));
-        ThreadMetadata x2 = channel.x();
-        pairArr[5] = o.to("thread_archived", Boolean.valueOf(x2 != null && x2.b()));
-        ThreadMetadata x3 = channel.x();
-        if (x3 != null && x3.d()) {
+        ThreadMetadata y2 = channel.y();
+        pairArr[5] = o.to("thread_archived", Boolean.valueOf(y2 != null && y2.b()));
+        ThreadMetadata y3 = channel.y();
+        if (y3 != null && y3.d()) {
             z2 = true;
         }
         pairArr[6] = o.to("thread_locked", Boolean.valueOf(z2));
-        ThreadMetadata x4 = channel.x();
-        pairArr[7] = o.to("thread_auto_archive_duration_minutes", x4 != null ? Integer.valueOf(x4.c()) : null);
-        pairArr[8] = o.to("thread_approximate_creation_date", Long.valueOf((channel.g() >>> 22) + 1420070400000L));
+        ThreadMetadata y4 = channel.y();
+        pairArr[7] = o.to("thread_auto_archive_duration_minutes", y4 != null ? Integer.valueOf(y4.c()) : null);
+        pairArr[8] = o.to("thread_approximate_creation_date", Long.valueOf((channel.h() >>> 22) + 1420070400000L));
         return h0.mapOf(pairArr);
     }
 
@@ -418,7 +418,7 @@ public final class StoreAnalytics extends Store {
         } else {
             i4 = 0;
             for (Channel channel : collection) {
-                if (AnimatableValueParser.j1(channel) && (i4 = i4 + 1) < 0) {
+                if (AnimatableValueParser.k1(channel) && (i4 = i4 + 1) < 0) {
                     n.throwCountOverflow();
                 }
             }
@@ -426,7 +426,7 @@ public final class StoreAnalytics extends Store {
         pairArr[3] = o.to("guild_num_text_channels", Integer.valueOf(i4));
         if (!collection.isEmpty()) {
             for (Channel channel2 : collection) {
-                if (AnimatableValueParser.k1(channel2) && (i5 = i5 + 1) < 0) {
+                if (AnimatableValueParser.l1(channel2) && (i5 = i5 + 1) < 0) {
                     n.throwCountOverflow();
                 }
             }
@@ -443,7 +443,7 @@ public final class StoreAnalytics extends Store {
     private final void handleVideoInputUpdate(VideoInputDeviceDescription videoInputDeviceDescription, boolean z2) {
         Channel channel = this.selectedVoiceChannel;
         if (channel != null) {
-            Map<Long, VoiceState> map = this.stores.getVoiceStates$app_productionGoogleRelease().get().get(Long.valueOf(channel.e()));
+            Map<Long, VoiceState> map = this.stores.getVoiceStates$app_productionGoogleRelease().get().get(Long.valueOf(channel.f()));
             if (map == null) {
                 map = h0.emptyMap();
             }
@@ -587,7 +587,7 @@ public final class StoreAnalytics extends Store {
 
     public final Traits.Location getEmojiPickerUpsellLocation() {
         Channel channel = this.stores.getChannels$app_productionGoogleRelease().getChannel(this.stores.getChannelsSelected$app_productionGoogleRelease().getId());
-        return new Traits.Location((channel == null || channel.e() != 0) ? "Guild Channel" : "DM Channel", "Emoji Picker Popout", null, null, null, 28, null);
+        return new Traits.Location((channel == null || channel.f() != 0) ? "Guild Channel" : "DM Channel", "Emoji Picker Popout", null, null, null, 28, null);
     }
 
     @StoreThread
@@ -654,9 +654,9 @@ public final class StoreAnalytics extends Store {
         super.init(context);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(this.stores.getMediaSettings$app_productionGoogleRelease().getInputMode()), StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(this.stores.getVoiceChannelSelected$app_productionGoogleRelease().observeSelectedChannel()), StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$2(this), 62, (Object) null);
-        Observable z2 = this.screenViewedSubject.Z(StoreAnalytics$init$3.INSTANCE).z();
-        m.checkNotNullExpressionValue(z2, "screenViewedSubject\n    … }\n      }\n      .first()");
-        ObservableExtensionsKt.appSubscribe$default(z2, StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$4(this), 62, (Object) null);
+        Observable y2 = this.screenViewedSubject.Y(StoreAnalytics$init$3.INSTANCE).y();
+        m.checkNotNullExpressionValue(y2, "screenViewedSubject\n    … }\n      }\n      .first()");
+        ObservableExtensionsKt.appSubscribe$default(y2, StoreAnalytics.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAnalytics$init$4(this), 62, (Object) null);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0041: APUT  
@@ -671,14 +671,14 @@ public final class StoreAnalytics extends Store {
         m.checkNotNullParameter(str, "location");
         Pair[] pairArr = new Pair[4];
         pairArr[0] = o.to("location", str);
-        pairArr[1] = o.to("message_id", Long.valueOf(message.r()));
+        pairArr[1] = o.to("message_id", Long.valueOf(message.o()));
         Long l = null;
         pairArr[2] = o.to("invite_guild_id", (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.o()));
         if (!(modelInvite == null || (channel = modelInvite.getChannel()) == null)) {
-            l = Long.valueOf(channel.g());
+            l = Long.valueOf(channel.h());
         }
         pairArr[3] = o.to("invite_channel_id", l);
-        AnalyticsTracker.INSTANCE.inviteSent(modelInvite, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(message.i())));
+        AnalyticsTracker.INSTANCE.inviteSent(modelInvite, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(message.g())));
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0037: APUT  
@@ -691,14 +691,14 @@ public final class StoreAnalytics extends Store {
         m.checkNotNullParameter(str, "location");
         Pair[] pairArr = new Pair[4];
         pairArr[0] = o.to("location", str);
-        pairArr[1] = o.to("message_id", Long.valueOf(message.r()));
+        pairArr[1] = o.to("message_id", Long.valueOf(message.o()));
         Long l = null;
         pairArr[2] = o.to("invite_guild_id", guildInvite != null ? guildInvite.getGuildId() : null);
         if (guildInvite != null) {
             l = guildInvite.getChannelId();
         }
         pairArr[3] = o.to("invite_channel_id", l);
-        AnalyticsTracker.INSTANCE.inviteSent(guildInvite, channel, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(message.i())));
+        AnalyticsTracker.INSTANCE.inviteSent(guildInvite, channel, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(message.g())));
     }
 
     public final void inviteSuggestionOpened(long j, List<Channel> list, List<? extends User> list2) {
@@ -732,12 +732,12 @@ public final class StoreAnalytics extends Store {
 
     public final void openCustomEmojiPopout(Channel channel, long j, boolean z2, boolean z3, boolean z4) {
         m.checkNotNullParameter(channel, "channel");
-        AnalyticsTracker.INSTANCE.openCustomEmojiPopout(channel.e(), j, z2, z3, z4, CollectionExtensionsKt.filterNonNullValues(getChannelSnapshotAnalyticsProperties$default(this, channel, false, 2, (Object) null)));
+        AnalyticsTracker.INSTANCE.openCustomEmojiPopout(channel.f(), j, z2, z3, z4, CollectionExtensionsKt.filterNonNullValues(getChannelSnapshotAnalyticsProperties$default(this, channel, false, 2, (Object) null)));
     }
 
     public final void openUnicodeEmojiPopout(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        AnalyticsTracker.INSTANCE.openUnicodeEmojiPopout(channel.e(), CollectionExtensionsKt.filterNonNullValues(getChannelSnapshotAnalyticsProperties$default(this, channel, false, 2, (Object) null)));
+        AnalyticsTracker.INSTANCE.openUnicodeEmojiPopout(channel.f(), CollectionExtensionsKt.filterNonNullValues(getChannelSnapshotAnalyticsProperties$default(this, channel, false, 2, (Object) null)));
     }
 
     public final void streamQualityIndicatorViewed(boolean z2, Boolean bool) {
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
index 71070a90bd..12782ca0d6 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
@@ -473,7 +473,7 @@ public final class StoreApplicationCommands extends StoreV2 {
     }
 
     public final Observable<DiscoverCommands> observeDiscoverCommands(long j) {
-        Observable<DiscoverCommands> j2 = Observable.j(ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{DiscoverCommandsUpdate}, false, null, null, new StoreApplicationCommands$observeDiscoverCommands$1(this), 14, null).s(), this.storePermissions.observePermissionsForChannel(j), new StoreApplicationCommands$observeDiscoverCommands$2(this));
+        Observable<DiscoverCommands> j2 = Observable.j(ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{DiscoverCommandsUpdate}, false, null, null, new StoreApplicationCommands$observeDiscoverCommands$1(this), 14, null).r(), this.storePermissions.observePermissionsForChannel(j), new StoreApplicationCommands$observeDiscoverCommands$2(this));
         m.checkNotNullExpressionValue(j2, "Observable\n        .comb…  )\n          }\n        }");
         return j2;
     }
@@ -483,9 +483,9 @@ public final class StoreApplicationCommands extends StoreV2 {
     }
 
     public final Observable<List<ApplicationCommand>> observeQueryCommands(long j) {
-        Observable<List<ApplicationCommand>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{QueryCommandsUpdate, this.storePermissions}, false, null, null, new StoreApplicationCommands$observeQueryCommands$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<List<ApplicationCommand>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{QueryCommandsUpdate, this.storePermissions}, false, null, null, new StoreApplicationCommands$observeQueryCommands$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void requestApplicationCommandsQuery(Long l, String str) {
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java
index de0f8a47bc..89a2a95372 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java
@@ -10,6 +10,7 @@ import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ApplicationCommandOption;
 import com.discord.models.commands.ApplicationSubCommand;
 import com.discord.models.commands.RemoteApplicationCommand;
+import d0.g0.t;
 import d0.t.n;
 import d0.t.o;
 import d0.z.d.m;
@@ -83,11 +84,18 @@ public final class StoreApplicationCommandsKt {
     }
 
     public static final String getDescriptionText(ApplicationCommand applicationCommand, Resources resources) {
-        String string;
         m.checkNotNullParameter(applicationCommand, "$this$getDescriptionText");
         m.checkNotNullParameter(resources, "resources");
         Integer descriptionRes = applicationCommand.getDescriptionRes();
-        return (descriptionRes == null || (string = resources.getString(descriptionRes.intValue())) == null) ? applicationCommand.getDescription() : string;
+        if (descriptionRes != null) {
+            String string = resources.getString(descriptionRes.intValue());
+            m.checkNotNullExpressionValue(string, "resources.getString(it)");
+            String replace$default = t.replace$default(string, "¯_(ツ)_/¯", "¯\\_(ツ)_/¯", false, 4, (Object) null);
+            if (replace$default != null) {
+                return replace$default;
+            }
+        }
+        return applicationCommand.getDescription();
     }
 
     public static final String getDescriptionText(ApplicationCommandOption applicationCommandOption, Resources resources) {
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java
index b4ed1de107..dd25d500b8 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java
@@ -1,7 +1,7 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
 import com.discord.models.commands.ApplicationCommandLocalSendData;
+import com.discord.models.message.Message;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -24,7 +24,7 @@ public final class StoreApplicationInteractions$resendApplicationCommand$1 exten
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        StoreApplicationInteractions.access$getStoreMessages$p(this.this$0).deleteLocalMessage(this.$message.i(), this.$nonce);
+        StoreApplicationInteractions.access$getStoreMessages$p(this.this$0).deleteLocalMessage(this.$message.getChannelId(), this.$nonce);
         StoreApplicationInteractions.handleSendApplicationCommandRequest$default(this.this$0, this.$updatedSendData, null, null, 6, null);
         StoreApplicationInteractions.access$removeApplicationCommandSendData(this.this$0, this.$nonce);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java
index d63e5498ca..d519921b63 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java
@@ -8,12 +8,12 @@ import c.i.d.e;
 import com.discord.api.commands.ApplicationCommandData;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.interaction.InteractionStateUpdate;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.app.AppLog;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommandLocalSendData;
 import com.discord.models.domain.NonceGenerator;
+import com.discord.models.message.Message;
 import com.discord.nullserializable.NullSerializable;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.updates.ObservationDeck;
@@ -658,20 +658,20 @@ public final class StoreApplicationInteractions extends StoreV2 {
     @StoreThread
     public final void handleLocalMessageDelete(Message message) {
         m.checkNotNullParameter(message, "message");
-        String B = message.B();
-        if (B != null) {
-            removeApplicationCommandSendData(B);
+        String nonce = message.getNonce();
+        if (nonce != null) {
+            removeApplicationCommandSendData(nonce);
         }
     }
 
     @StoreThread
-    public final void handleMessageCreate(Message message) {
+    public final void handleMessageCreate(com.discord.api.message.Message message) {
         m.checkNotNullParameter(message, "message");
-        handleMessagesCreateOrLoad(d0.t.m.listOf(message));
+        handleMessagesCreateOrLoad(d0.t.m.listOf(new Message(message)));
     }
 
     @StoreThread
-    public final void handleMessageUpdate(Message message) {
+    public final void handleMessageUpdate(com.discord.api.message.Message message) {
         boolean z2;
         boolean z3;
         m.checkNotNullParameter(message, "message");
@@ -682,7 +682,7 @@ public final class StoreApplicationInteractions extends StoreV2 {
                 if (!it.hasNext()) {
                     break;
                 }
-                if (it.next().getValue().getMessageId() == message.r()) {
+                if (it.next().getValue().getMessageId() == message.o()) {
                     z3 = true;
                     continue;
                 } else {
@@ -697,11 +697,11 @@ public final class StoreApplicationInteractions extends StoreV2 {
         }
         z2 = false;
         if (z2) {
-            this.storeLocalActionComponentState.clearState(message.r(), null);
+            this.storeLocalActionComponentState.clearState(message.o(), null);
             Map<String, ComponentLocation> map2 = this.componentInteractions;
             LinkedHashMap linkedHashMap = new LinkedHashMap();
             for (Map.Entry<String, ComponentLocation> entry : map2.entrySet()) {
-                if (entry.getValue().getMessageId() == message.r()) {
+                if (entry.getValue().getMessageId() == message.o()) {
                     linkedHashMap.put(entry.getKey(), entry.getValue());
                 }
             }
@@ -710,8 +710,8 @@ public final class StoreApplicationInteractions extends StoreV2 {
             }
             markChanged(ComponentStateUpdate);
         }
-        if (this.interactionComponentSendState.containsKey(Long.valueOf(message.r()))) {
-            this.interactionComponentSendState.remove(Long.valueOf(message.r()));
+        if (this.interactionComponentSendState.containsKey(Long.valueOf(message.o()))) {
+            this.interactionComponentSendState.remove(Long.valueOf(message.o()));
             markChanged(ComponentStateUpdate);
         }
     }
@@ -722,13 +722,13 @@ public final class StoreApplicationInteractions extends StoreV2 {
     public final void handleMessagesCreateOrLoad(List<Message> list) {
         m.checkNotNullParameter(list, "messagesList");
         for (Message message : list) {
-            String B = message.B();
-            if (B == null || !this.componentInteractions.containsKey(B)) {
-                Interaction t = message.t();
+            String nonce = message.getNonce();
+            if (nonce == null || !this.componentInteractions.containsKey(nonce)) {
+                Interaction interaction = message.getInteraction();
                 ApplicationCommandLocalSendData applicationCommandLocalSendData = null;
-                Long a = t != null ? t.a() : null;
-                if (!(B == null || t.isBlank(B)) && this.applicationCommandLocalSendDataSet.containsKey(B)) {
-                    applicationCommandLocalSendData = this.applicationCommandLocalSendDataSet.get(B);
+                Long a = interaction != null ? interaction.a() : null;
+                if (!(nonce == null || t.isBlank(nonce)) && this.applicationCommandLocalSendDataSet.containsKey(nonce)) {
+                    applicationCommandLocalSendData = this.applicationCommandLocalSendDataSet.get(nonce);
                 } else if (a != null) {
                     Iterator<T> it = this.applicationCommandLocalSendDataSet.values().iterator();
                     while (true) {
@@ -748,10 +748,10 @@ public final class StoreApplicationInteractions extends StoreV2 {
                     this.storeMessages.deleteLocalMessage(applicationCommandLocalSendData.getChannelId(), applicationCommandLocalSendData.getNonceString());
                 }
             } else {
-                ComponentLocation componentLocation = this.componentInteractions.get(B);
+                ComponentLocation componentLocation = this.componentInteractions.get(nonce);
                 if (componentLocation != null) {
                     handleComponentInteractionMessage(componentLocation);
-                    this.componentInteractions.remove(B);
+                    this.componentInteractions.remove(nonce);
                 } else {
                     return;
                 }
@@ -774,28 +774,28 @@ public final class StoreApplicationInteractions extends StoreV2 {
     }
 
     public final Observable<Map<Long, Map<Integer, InteractionSendState>>> observeComponentInteractionState() {
-        Observable<Map<Long, Map<Integer, InteractionSendState>>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{ComponentStateUpdate}, false, null, null, new StoreApplicationInteractions$observeComponentInteractionState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Map<Integer, InteractionSendState>>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{ComponentStateUpdate}, false, null, null, new StoreApplicationInteractions$observeComponentInteractionState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<State> observeInteractionData(long j) {
-        Observable<State> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationInteractions$observeInteractionData$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<State> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationInteractions$observeInteractionData$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void resendApplicationCommand(Message message) {
-        String B;
+        String nonce;
         ApplicationCommandLocalSendData applicationCommandLocalSendData;
         m.checkNotNullParameter(message, "message");
-        Integer M = message.M();
-        if (M != null && M.intValue() == -4 && (B = message.B()) != null && (applicationCommandLocalSendData = this.applicationCommandLocalSendDataSnapshot.get(B)) != null) {
-            this.dispatcher.schedule(new StoreApplicationInteractions$resendApplicationCommand$1(this, message, B, ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, NonceGenerator.Companion.computeNonce$default(NonceGenerator.Companion, null, 1, null), 0, null, null, null, null, null, null, null, null, 510, null)));
+        Integer type = message.getType();
+        if (type != null && type.intValue() == -4 && (nonce = message.getNonce()) != null && (applicationCommandLocalSendData = this.applicationCommandLocalSendDataSnapshot.get(nonce)) != null) {
+            this.dispatcher.schedule(new StoreApplicationInteractions$resendApplicationCommand$1(this, message, nonce, ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, NonceGenerator.Companion.computeNonce$default(NonceGenerator.Companion, null, 1, null), 0, null, null, null, null, null, null, null, null, 510, null)));
         }
     }
 
-    public final void sendApplicationCommand(long j, Long l, String str, com.discord.widgets.chat.input.ApplicationCommandData applicationCommandData, Function0<Unit> function0, Function1<? super Error, Unit> function1) {
+    public final void sendApplicationCommand(long j, Long l, String str, com.discord.widgets.chat.input.models.ApplicationCommandData applicationCommandData, Function0<Unit> function0, Function1<? super Error, Unit> function1) {
         m.checkNotNullParameter(applicationCommandData, "data");
         m.checkNotNullParameter(function0, "onSuccess");
         m.checkNotNullParameter(function1, "onFail");
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java
index 6f5dbe2f7b..40d6d1ea8e 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationStreamPreviews.java
@@ -212,9 +212,9 @@ public final class StoreApplicationStreamPreviews extends StoreV2 {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            Observable<Long> e02 = Observable.e0(l.longValue(), TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable.timer(retryAf…s, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(e02, StoreApplicationStreamPreviews.class, (Context) null, new StoreApplicationStreamPreviews$handleFetchFailed$1(this, str), (Function1) null, new StoreApplicationStreamPreviews$handleFetchFailed$2(this, str), (Function0) null, new StoreApplicationStreamPreviews$handleFetchFailed$3(this, str), 42, (Object) null);
+            Observable<Long> d02 = Observable.d0(l.longValue(), TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(retryAf…s, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, StoreApplicationStreamPreviews.class, (Context) null, new StoreApplicationStreamPreviews$handleFetchFailed$1(this, str), (Function1) null, new StoreApplicationStreamPreviews$handleFetchFailed$2(this, str), (Function0) null, new StoreApplicationStreamPreviews$handleFetchFailed$3(this, str), 42, (Object) null);
         }
         this.fetchAttempts.put(str, Integer.valueOf(intValue));
         markChanged();
@@ -243,9 +243,9 @@ public final class StoreApplicationStreamPreviews extends StoreV2 {
 
     public final Observable<StreamPreview> observeStreamPreview(String str) {
         m.checkNotNullParameter(str, "streamKey");
-        Observable<StreamPreview> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreamPreviews$observeStreamPreview$1(this, str), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<StreamPreview> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreamPreviews$observeStreamPreview$1(this, str), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreaming$createStream$1.java b/app/src/main/java/com/discord/stores/StoreApplicationStreaming$createStream$1.java
index f1949e197c..5f295067cc 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationStreaming$createStream$1.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationStreaming$createStream$1.java
@@ -35,18 +35,18 @@ public final class StoreApplicationStreaming$createStream$1 extends o implements
         RtcConnection rtcConnection$app_productionGoogleRelease = StoreApplicationStreaming.access$getRtcConnectionStore$p(this.this$0).getRtcConnection$app_productionGoogleRelease();
         Object obj = null;
         boolean z2 = false;
-        if (rtcConnection$app_productionGoogleRelease == null || rtcConnection$app_productionGoogleRelease.D != this.$channelId || (!m.areEqual(rtcConnection$app_productionGoogleRelease.C, this.$guildId))) {
+        if (rtcConnection$app_productionGoogleRelease == null || rtcConnection$app_productionGoogleRelease.M != this.$channelId || (!m.areEqual(rtcConnection$app_productionGoogleRelease.L, this.$guildId))) {
             AppLog appLog = AppLog.g;
             StringBuilder L = a.L("\n                Failed to start stream.\n                rtcConnection == null: ");
             L.append(rtcConnection$app_productionGoogleRelease == null);
             L.append("\n                rtcConnection.channelId != channelId: ");
-            if (rtcConnection$app_productionGoogleRelease == null || rtcConnection$app_productionGoogleRelease.D != this.$channelId) {
+            if (rtcConnection$app_productionGoogleRelease == null || rtcConnection$app_productionGoogleRelease.M != this.$channelId) {
                 z2 = true;
             }
             L.append(z2);
             L.append("\n                rtcConnection.guildId != guildId: ");
             if (rtcConnection$app_productionGoogleRelease != null) {
-                obj = rtcConnection$app_productionGoogleRelease.C;
+                obj = rtcConnection$app_productionGoogleRelease.L;
             }
             L.append(!m.areEqual(obj, this.$guildId));
             L.append("\n              ");
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java b/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java
index 9e5a550ef7..f9fd9fa04a 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationStreaming.java
@@ -502,27 +502,27 @@ public final class StoreApplicationStreaming extends StoreV2 {
     }
 
     public final Observable<Map<String, List<Long>>> observeStreamSpectators() {
-        Observable<Map<String, List<Long>>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamSpectators$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<String, List<Long>>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamSpectators$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, ModelApplicationStream>> observeStreamsByUser() {
-        Observable<Map<Long, ModelApplicationStream>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamsByUser$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, ModelApplicationStream>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamsByUser$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, ModelApplicationStream>> observeStreamsForGuild(long j) {
-        Observable<Map<Long, ModelApplicationStream>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamsForGuild$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, ModelApplicationStream>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamsForGuild$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<ModelApplicationStream> observeStreamsForUser(long j) {
-        Observable<ModelApplicationStream> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamsForUser$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelApplicationStream> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreApplicationStreaming$observeStreamsForUser$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreAudioDevices.java b/app/src/main/java/com/discord/stores/StoreAudioDevices.java
index 5d15ab468e..768057ebf4 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioDevices.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioDevices.java
@@ -287,7 +287,7 @@ public final class StoreAudioDevices extends StoreV2 {
         @StoreThread
         private final Map<Long, VoiceState> getVoiceStatesForChannel(long j) {
             Channel findChannelByIdInternal$app_productionGoogleRelease = this.channelsStore.findChannelByIdInternal$app_productionGoogleRelease(j);
-            Map<Long, VoiceState> map = this.voiceStatesStore.getInternal$app_productionGoogleRelease().get(findChannelByIdInternal$app_productionGoogleRelease != null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.e()) : null);
+            Map<Long, VoiceState> map = this.voiceStatesStore.getInternal$app_productionGoogleRelease().get(findChannelByIdInternal$app_productionGoogleRelease != null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.f()) : null);
             if (map == null) {
                 return h0.emptyMap();
             }
@@ -411,7 +411,7 @@ public final class StoreAudioDevices extends StoreV2 {
             outputDevice = OutputDevice.Speaker.INSTANCE;
         } else {
             Channel channel = this.channelsStore.getChannel(selectedVoiceChannelId);
-            outputDevice = (channel == null || !AnimatableValueParser.u1(channel)) ? OutputDevice.Earpiece.INSTANCE : OutputDevice.Speaker.INSTANCE;
+            outputDevice = (channel == null || !AnimatableValueParser.v1(channel)) ? OutputDevice.Earpiece.INSTANCE : OutputDevice.Speaker.INSTANCE;
         }
         updateSelectedOutputDevice(outputDevice);
     }
@@ -535,9 +535,9 @@ public final class StoreAudioDevices extends StoreV2 {
     }
 
     public final Observable<AudioDevicesState> observeAudioDevicesState() {
-        Observable<AudioDevicesState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAudioDevices$observeAudioDevicesState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<AudioDevicesState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAudioDevices$observeAudioDevicesState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void selectAudioOutput(OutputDevice outputDevice) {
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManager.java b/app/src/main/java/com/discord/stores/StoreAudioManager.java
index b4346dde71..af8ef5e927 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManager.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManager.java
@@ -339,9 +339,9 @@ public final class StoreAudioManager extends Store {
             }
             Observable j = Observable.j(connectionState, observeAudioDevicesState, (Func2) storeAudioManager$init$1);
             m.checkNotNullExpressionValue(j, "Observable\n        .comb…::Configuration\n        )");
-            Observable s2 = ObservableExtensionsKt.leadingEdgeThrottle(j, 500, TimeUnit.MILLISECONDS).s();
-            m.checkNotNullExpressionValue(s2, "Observable\n        .comb…  .distinctUntilChanged()");
-            ObservableExtensionsKt.appSubscribe$default(s2, StoreAudioManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAudioManager$init$2(mediaEngineAudioManager), 62, (Object) null);
+            Observable r = ObservableExtensionsKt.leadingEdgeThrottle(j, 500, TimeUnit.MILLISECONDS).r();
+            m.checkNotNullExpressionValue(r, "Observable\n        .comb…  .distinctUntilChanged()");
+            ObservableExtensionsKt.appSubscribe$default(r, StoreAudioManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAudioManager$init$2(mediaEngineAudioManager), 62, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java
index c27027f5df..4e947ac127 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$init$1.java
@@ -111,11 +111,11 @@ public final class StoreAudioManagerV2$init$1 implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         DiscordAudioManager discordAudioManager = DiscordAudioManager.d;
-        Observable<List<DiscordAudioManager.AudioDevice>> s2 = DiscordAudioManager.d().r.s();
-        m.checkNotNullExpressionValue(s2, "audioDevicesSubject.distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        Observable<DiscordAudioManager.DeviceTypes> s3 = DiscordAudioManager.d().t.s();
-        m.checkNotNullExpressionValue(s3, "activeAudioDeviceSubject.distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s3, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable<List<DiscordAudioManager.AudioDevice>> r = DiscordAudioManager.d().r.r();
+        m.checkNotNullExpressionValue(r, "audioDevicesSubject.distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<DiscordAudioManager.DeviceTypes> r2 = DiscordAudioManager.d().t.r();
+        m.checkNotNullExpressionValue(r2, "activeAudioDeviceSubject.distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r2, this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java
index 053e687dbf..15df0553ca 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java
@@ -27,11 +27,11 @@ public final class StoreAudioManagerV2$selectOutputDevice$1 implements Runnable
         Objects.requireNonNull(d);
         m.checkNotNullParameter(deviceTypes, "deviceType");
         d.c();
-        if (!d.e().b || !d.e().f205c) {
-            AnimatableValueParser.E1("AudioManager", "Requires MODIFY_AUDIO_SETTINGS and RECORD_AUDIO. Selected device will not be available for recording");
+        if (!d.e().b || !d.e().f206c) {
+            AnimatableValueParser.G1("AudioManager", "Requires MODIFY_AUDIO_SETTINGS and RECORD_AUDIO. Selected device will not be available for recording");
             return;
         }
-        AnimatableValueParser.A1("AudioManager", "setDevice(deviceType=" + deviceTypes + ')');
+        AnimatableValueParser.C1("AudioManager", "setDevice(deviceType=" + deviceTypes + ')');
         synchronized (d.i) {
             List<DiscordAudioManager.AudioDevice> list = d.q;
             arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java
index 17a04ae850..6885bf30de 100644
--- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java
+++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2.java
@@ -299,7 +299,7 @@ public final class StoreAudioManagerV2 extends StoreV2 {
     private final boolean prioritizeEarpieceOverSpeaker() {
         long selectedVoiceChannelId = this.voiceChannelSelectedStore.getSelectedVoiceChannelId();
         Channel channel = this.channelsStore.getChannel(selectedVoiceChannelId);
-        return channel != null && !AnimatableValueParser.u1(channel) && !this.videoUseDetector.isAnyoneUsingVideoInChannel(selectedVoiceChannelId);
+        return channel != null && !AnimatableValueParser.v1(channel) && !this.videoUseDetector.isAnyoneUsingVideoInChannel(selectedVoiceChannelId);
     }
 
     @StoreThread
@@ -341,8 +341,8 @@ public final class StoreAudioManagerV2 extends StoreV2 {
                     List<DiscordAudioManager.DeviceTypes> list = VOICE_ONLY_DEVICE_PRIORITIZATION;
                     synchronized (d) {
                         m.checkNotNullParameter(list, "newPrioritization");
-                        if (!m.areEqual(list, d.f2084y)) {
-                            d.f2084y = list;
+                        if (!m.areEqual(list, d.f2090y)) {
+                            d.f2090y = list;
                             d.l();
                         }
                     }
@@ -350,10 +350,10 @@ public final class StoreAudioManagerV2 extends StoreV2 {
                     DiscordAudioManager discordAudioManager2 = DiscordAudioManager.d;
                     DiscordAudioManager d2 = DiscordAudioManager.d();
                     synchronized (d2) {
-                        List<? extends DiscordAudioManager.DeviceTypes> list2 = d2.f2084y;
-                        List<DiscordAudioManager.DeviceTypes> list3 = DiscordAudioManager.f2081c;
+                        List<? extends DiscordAudioManager.DeviceTypes> list2 = d2.f2090y;
+                        List<DiscordAudioManager.DeviceTypes> list3 = DiscordAudioManager.f2087c;
                         if (!m.areEqual(list2, list3)) {
-                            d2.f2084y = list3;
+                            d2.f2090y = list3;
                             d2.l();
                         }
                     }
diff --git a/app/src/main/java/com/discord/stores/StoreAuditLog.java b/app/src/main/java/com/discord/stores/StoreAuditLog.java
index c033d08fad..b19683be64 100644
--- a/app/src/main/java/com/discord/stores/StoreAuditLog.java
+++ b/app/src/main/java/com/discord/stores/StoreAuditLog.java
@@ -575,11 +575,11 @@ public final class StoreAuditLog extends StoreV2 {
     }
 
     public final Observable<AuditLogState> observeAuditLogState(long j) {
-        Observable u = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAuditLog$observeAuditLogState$1(this, j), 14, null).s().u(new StoreAuditLog$observeAuditLogState$2(this, j));
-        m.checkNotNullExpressionValue(u, "observationDeck.connectR…ditLogIfNeeded(guildId) }");
-        Observable<AuditLogState> G = u.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        return G;
+        Observable t = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAuditLog$observeAuditLogState$1(this, j), 14, null).r().t(new StoreAuditLog$observeAuditLogState$2(this, j));
+        m.checkNotNullExpressionValue(t, "observationDeck.connectR…ditLogIfNeeded(guildId) }");
+        Observable<AuditLogState> F = t.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return F;
     }
 
     public final void setAuditLogFilterActionId(int i) {
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java
index 26a54b686b..2e96f4cd47 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$getFingerprintSnapshotOrGenerate$1.java
@@ -22,6 +22,6 @@ public final class StoreAuthentication$getFingerprintSnapshotOrGenerate$1<T, R>
     }
 
     public final Observable<? extends String> call(String str) {
-        return str != null ? new j(str) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthFingerprint(new RestAPIParams.EmptyBody()), false, 1, null).G(AnonymousClass2.INSTANCE);
+        return str != null ? new j(str) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthFingerprint(new RestAPIParams.EmptyBody()), false, 1, null).F(AnonymousClass2.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java
index 5eb951e1fa..11693e06c1 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.java
@@ -14,7 +14,7 @@ public final class StoreAuthentication$getShouldShowAgeGate$1<T1, T2, T3, R> imp
         if (!meUser.getHasBirthday() && (meUser.getId() >>> 22) + 1420070400000L > parseUTCDate) {
             return StoreNavigation.AgeGate.REGISTER_AGE_GATE;
         }
-        if (str != null || meUser.getHasBirthday() || channel == null || !channel.n()) {
+        if (str != null || meUser.getHasBirthday() || channel == null || !channel.o()) {
             return null;
         }
         return StoreNavigation.AgeGate.NSFW_CHANNEL_AGE_GATE;
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java
index 69c6a2bfe2..c245850f72 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java
@@ -116,8 +116,8 @@ public final class StoreAuthentication$register$1<T, R> implements b<String, Obs
         }
         Observable j = Observable.j(inviteCode, observeDynamicLinkGuildTemplateCode, (Func2) r2);
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…RequestParams\n          )");
-        Observable<R> A = ObservableExtensionsKt.takeSingleUntilTimeout$default(j, 500, false, 2, null).A(new AnonymousClass2(this, str));
-        m.checkNotNullExpressionValue(A, "Observable.combineLatest…        )\n              }");
-        return ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn$default(A, false, 1, null), 0, false, 3, null).u(new AnonymousClass3(this));
+        Observable<R> z2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j, 500, false, 2, null).z(new AnonymousClass2(this, str));
+        m.checkNotNullExpressionValue(z2, "Observable.combineLatest…        )\n              }");
+        return ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null), 0, false, 3, null).t(new AnonymousClass3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication.java b/app/src/main/java/com/discord/stores/StoreAuthentication.java
index ecec65f700..c02b0926d8 100644
--- a/app/src/main/java/com/discord/stores/StoreAuthentication.java
+++ b/app/src/main/java/com/discord/stores/StoreAuthentication.java
@@ -40,13 +40,13 @@ public final class StoreAuthentication extends Store {
     private String authToken;
     private final Dispatcher dispatcher;
     private String fingerprint;
-    private final SerializedSubject<String, String> fingerprintSubject = new SerializedSubject<>(BehaviorSubject.l0());
+    private final SerializedSubject<String, String> fingerprintSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private Subscription isConsentRequiredSubscription;
     private final SerializedSubject<Uri, Uri> oauthUriSubject;
     private String savedLogin;
     private final StoreStream storeStream;
-    private final SerializedSubject<String, String> tokenSubject = new SerializedSubject<>(BehaviorSubject.l0());
-    private final PublishSubject<Boolean> userInitiatedAuthEventSubject = PublishSubject.l0();
+    private final SerializedSubject<String, String> tokenSubject = new SerializedSubject<>(BehaviorSubject.k0());
+    private final PublishSubject<Boolean> userInitiatedAuthEventSubject = PublishSubject.k0();
 
     /* compiled from: StoreAuthentication.kt */
     public static final class AuthRequestParams {
@@ -166,10 +166,10 @@ public final class StoreAuthentication extends Store {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         this.storeStream = storeStream;
         this.dispatcher = dispatcher;
-        BehaviorSubject<String> l0 = BehaviorSubject.l0();
-        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create()");
-        this.ageGateError = l0;
-        this.oauthUriSubject = new SerializedSubject<>(BehaviorSubject.m0(Uri.EMPTY));
+        BehaviorSubject<String> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.ageGateError = k0;
+        this.oauthUriSubject = new SerializedSubject<>(BehaviorSubject.l0(Uri.EMPTY));
     }
 
     public static final /* synthetic */ void access$dispatchLogin(StoreAuthentication storeAuthentication, ModelLoginResult modelLoginResult) {
@@ -205,9 +205,9 @@ public final class StoreAuthentication extends Store {
     }
 
     private final Observable<String> getFingerprintSnapshotOrGenerate() {
-        Observable<String> u = this.fingerprintSubject.a0(1).Z(StoreAuthentication$getFingerprintSnapshotOrGenerate$1.INSTANCE).u(new StoreAuthentication$getFingerprintSnapshotOrGenerate$2(this));
-        m.checkNotNullExpressionValue(u, "fingerprintSubject\n     …int(fingerprint, false) }");
-        return u;
+        Observable<String> t = this.fingerprintSubject.Z(1).Y(StoreAuthentication$getFingerprintSnapshotOrGenerate$1.INSTANCE).t(new StoreAuthentication$getFingerprintSnapshotOrGenerate$2(this));
+        m.checkNotNullExpressionValue(t, "fingerprintSubject\n     …int(fingerprint, false) }");
+        return t;
     }
 
     public static /* synthetic */ Observable login$default(StoreAuthentication storeAuthentication, String str, String str2, String str3, boolean z2, String str4, int i, Object obj) {
@@ -243,9 +243,9 @@ public final class StoreAuthentication extends Store {
     public final Observable<ModelLoginResult> authMFA(String str, String str2) {
         m.checkNotNullParameter(str, "code");
         m.checkNotNullParameter(str2, "ticket");
-        Observable<ModelLoginResult> u = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postMFACode(new RestAPIParams.MFALogin(str2, str)), false, 1, null).u(new StoreAuthentication$authMFA$1(this));
-        m.checkNotNullExpressionValue(u, "RestAPI\n        .api\n   …in(loginResult)\n        }");
-        return u;
+        Observable<ModelLoginResult> t = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postMFACode(new RestAPIParams.MFALogin(str2, str)), false, 1, null).t(new StoreAuthentication$authMFA$1(this));
+        m.checkNotNullExpressionValue(t, "RestAPI\n        .api\n   …in(loginResult)\n        }");
+        return t;
     }
 
     public final Observable<Void> authorizeIP(String str) {
@@ -259,9 +259,9 @@ public final class StoreAuthentication extends Store {
     }
 
     public final Observable<String> getAgeGateError() {
-        Observable<String> s2 = this.ageGateError.s();
-        m.checkNotNullExpressionValue(s2, "ageGateError.distinctUntilChanged()");
-        return s2;
+        Observable<String> r = this.ageGateError.r();
+        m.checkNotNullExpressionValue(r, "ageGateError.distinctUntilChanged()");
+        return r;
     }
 
     public final String getAuthToken$app_productionGoogleRelease() {
@@ -269,15 +269,15 @@ public final class StoreAuthentication extends Store {
     }
 
     public final Observable<String> getAuthedToken$app_productionGoogleRelease() {
-        Observable<String> s2 = this.tokenSubject.s();
-        m.checkNotNullExpressionValue(s2, "tokenSubject.distinctUntilChanged()");
-        return s2;
+        Observable<String> r = this.tokenSubject.r();
+        m.checkNotNullExpressionValue(r, "tokenSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<String> getFingerPrint$app_productionGoogleRelease() {
-        Observable<String> s2 = this.fingerprintSubject.s();
-        m.checkNotNullExpressionValue(s2, "fingerprintSubject.distinctUntilChanged()");
-        return s2;
+        Observable<String> r = this.fingerprintSubject.r();
+        m.checkNotNullExpressionValue(r, "fingerprintSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final String getFingerprint$app_productionGoogleRelease() {
@@ -285,15 +285,15 @@ public final class StoreAuthentication extends Store {
     }
 
     public final Observable<Uri> getOAuthUriObservable() {
-        Observable<Uri> s2 = this.oauthUriSubject.s();
-        m.checkNotNullExpressionValue(s2, "oauthUriSubject.distinctUntilChanged()");
-        return s2;
+        Observable<Uri> r = this.oauthUriSubject.r();
+        m.checkNotNullExpressionValue(r, "oauthUriSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> getPreLogoutSignal$app_productionGoogleRelease() {
-        Observable<Boolean> y2 = this.userInitiatedAuthEventSubject.y(StoreAuthentication$getPreLogoutSignal$1.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "userInitiatedAuthEventSu…LoggedIn -> !isLoggedIn }");
-        return y2;
+        Observable<Boolean> x2 = this.userInitiatedAuthEventSubject.x(StoreAuthentication$getPreLogoutSignal$1.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "userInitiatedAuthEventSu…LoggedIn -> !isLoggedIn }");
+        return x2;
     }
 
     public final String getSavedLogin() {
@@ -301,9 +301,9 @@ public final class StoreAuthentication extends Store {
     }
 
     public final Observable<StoreNavigation.AgeGate> getShouldShowAgeGate() {
-        Observable<StoreNavigation.AgeGate> s2 = Observable.i(this.storeStream.getUsers$app_productionGoogleRelease().observeMe(true), this.storeStream.getAuthentication$app_productionGoogleRelease().getAgeGateError(), this.storeStream.getChannelsSelected$app_productionGoogleRelease().observeSelectedChannel(), StoreAuthentication$getShouldShowAgeGate$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-        return s2;
+        Observable<StoreNavigation.AgeGate> r = Observable.i(this.storeStream.getUsers$app_productionGoogleRelease().observeMe(true), this.storeStream.getAuthentication$app_productionGoogleRelease().getAgeGateError(), this.storeStream.getChannelsSelected$app_productionGoogleRelease().observeSelectedChannel(), StoreAuthentication$getShouldShowAgeGate$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+        return r;
     }
 
     @StoreThread
@@ -357,9 +357,9 @@ public final class StoreAuthentication extends Store {
         setAuthed(string2);
         handleAgeGateError(null);
         setSavedLogin(getPrefsSessionDurable().getString("STORE_AUTHED_LOGIN", Companion.access$getDeviceEmail(Companion, context)));
-        Observable<Boolean> s2 = this.userInitiatedAuthEventSubject.s();
-        m.checkNotNullExpressionValue(s2, "userInitiatedAuthEventSu…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(s2)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAuthentication$init$1(context), 62, (Object) null);
+        Observable<Boolean> r = this.userInitiatedAuthEventSubject.r();
+        m.checkNotNullExpressionValue(r, "userInitiatedAuthEventSu…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(r)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreAuthentication$init$1(context), 62, (Object) null);
     }
 
     public final boolean isAuthed() {
@@ -376,32 +376,32 @@ public final class StoreAuthentication extends Store {
         m.checkNotNullParameter(str, "login");
         m.checkNotNullParameter(str2, "password");
         setSavedLogin(str);
-        Observable<ModelLoginResult> u = getFingerprintSnapshotOrGenerate().A(new StoreAuthentication$login$1(str, str2, str3, z2, str4)).u(new StoreAuthentication$login$2(this));
-        m.checkNotNullExpressionValue(u, "getFingerprintSnapshotOr…lt)\n          }\n        }");
-        return u;
+        Observable<ModelLoginResult> t = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$login$1(str, str2, str3, z2, str4)).t(new StoreAuthentication$login$2(this));
+        m.checkNotNullExpressionValue(t, "getFingerprintSnapshotOr…lt)\n          }\n        }");
+        return t;
     }
 
     public final void logout() {
         PublishSubject<Boolean> publishSubject = this.userInitiatedAuthEventSubject;
         publishSubject.j.onNext(Boolean.FALSE);
-        Observable A = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().logout(new RestAPIParams.UserDevices(StoreStream.Companion.getNotifications().getPushToken())), false, 1, null).A(new StoreAuthentication$logout$1(this));
-        m.checkNotNullExpressionValue(A, "RestAPI\n        .api\n   …intSnapshotOrGenerate() }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(A, 0, false, 3, null), (Context) null, "logout", (Function1) null, new StoreAuthentication$logout$2(this), new StoreAuthentication$logout$3(this), (Function0) null, (Function0) null, 101, (Object) null);
+        Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().logout(new RestAPIParams.UserDevices(StoreStream.Companion.getNotifications().getPushToken())), false, 1, null).z(new StoreAuthentication$logout$1(this));
+        m.checkNotNullExpressionValue(z2, "RestAPI\n        .api\n   …intSnapshotOrGenerate() }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(z2, 0, false, 3, null), (Context) null, "logout", (Function1) null, new StoreAuthentication$logout$2(this), new StoreAuthentication$logout$3(this), (Function0) null, (Function0) null, 101, (Object) null);
     }
 
     public final Observable<Boolean> observeIsAuthed$app_productionGoogleRelease() {
-        Observable<R> G = getAuthedToken$app_productionGoogleRelease().G(StoreAuthentication$observeIsAuthed$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "getAuthedToken()\n      .… -> authedToken != null }");
-        return G;
+        Observable<R> F = getAuthedToken$app_productionGoogleRelease().F(StoreAuthentication$observeIsAuthed$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "getAuthedToken()\n      .… -> authedToken != null }");
+        return F;
     }
 
     public final Observable<RegisterResponse> register(String str, String str2, String str3, String str4, String str5, boolean z2, String str6) {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(str4, "password");
         setSavedLogin(str2);
-        Observable<R> A = getFingerprintSnapshotOrGenerate().A(new StoreAuthentication$register$1(this, str, str2, str3, str4, str5, z2, str6));
-        m.checkNotNullExpressionValue(A, "getFingerprintSnapshotOr…              }\n        }");
-        return A;
+        Observable<R> z3 = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$register$1(this, str, str2, str3, str4, str5, z2, str6));
+        m.checkNotNullExpressionValue(z3, "getFingerprintSnapshotOr…              }\n        }");
+        return z3;
     }
 
     public final synchronized void requestConsentRequired() {
diff --git a/app/src/main/java/com/discord/stores/StoreAutocomplete.java b/app/src/main/java/com/discord/stores/StoreAutocomplete.java
index 3e0b09c80e..63f004fc2a 100644
--- a/app/src/main/java/com/discord/stores/StoreAutocomplete.java
+++ b/app/src/main/java/com/discord/stores/StoreAutocomplete.java
@@ -25,9 +25,9 @@ public final class StoreAutocomplete extends StoreV2 {
     }
 
     public final Observable<Boolean> observeAutocompleteVisibility() {
-        Observable<Boolean> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAutocomplete$observeAutocompleteVisibility$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreAutocomplete$observeAutocompleteVisibility$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void setAutocompleteVisible(boolean z2) {
diff --git a/app/src/main/java/com/discord/stores/StoreCalls$call$2.java b/app/src/main/java/com/discord/stores/StoreCalls$call$2.java
index eafac9d0f2..a8fa86532d 100644
--- a/app/src/main/java/com/discord/stores/StoreCalls$call$2.java
+++ b/app/src/main/java/com/discord/stores/StoreCalls$call$2.java
@@ -47,7 +47,7 @@ public final class StoreCalls$call$2 extends o implements Function1<Long, Unit>
         }
 
         public final Observable<? extends Boolean> call(Integer num) {
-            return (num != null && num.intValue() == 1) ? new j(Boolean.TRUE) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().call(this.this$0.$channelId), false, 1, null).G(AnonymousClass1.INSTANCE);
+            return (num != null && num.intValue() == 1) ? new j(Boolean.TRUE) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().call(this.this$0.$channelId), false, 1, null).F(AnonymousClass1.INSTANCE);
         }
     }
 
@@ -134,9 +134,9 @@ public final class StoreCalls$call$2 extends o implements Function1<Long, Unit>
     }
 
     public final void invoke(long j) {
-        Observable<R> A = StoreStream.Companion.getUserRelationships().observe(j).A(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(A, "StoreStream\n          .g…            }\n          }");
-        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(A, 0, false, 3, null), this.$appComponent, null, 2, null);
+        Observable<R> z2 = StoreStream.Companion.getUserRelationships().observe(j).z(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(z2, "StoreStream\n          .g…            }\n          }");
+        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(z2, 0, false, 3, null), this.$appComponent, null, 2, null);
         Context context = this.$context;
         ObservableExtensionsKt.appSubscribe$default(ui$default, this.this$0.getClass(), context, (Function1) null, new AnonymousClass3(this, j), (Function0) null, (Function0) null, new AnonymousClass2(this), 52, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreCalls.java b/app/src/main/java/com/discord/stores/StoreCalls.java
index 98cf2b3ece..a31a431cfd 100644
--- a/app/src/main/java/com/discord/stores/StoreCalls.java
+++ b/app/src/main/java/com/discord/stores/StoreCalls.java
@@ -20,7 +20,7 @@ import rx.subjects.SerializedSubject;
 /* compiled from: StoreCalls.kt */
 public final class StoreCalls {
     private final HashMap<Long, ModelCall> calls = new HashMap<>();
-    private final SerializedSubject<HashMap<Long, ModelCall>, HashMap<Long, ModelCall>> callsSubject = new SerializedSubject<>(BehaviorSubject.l0());
+    private final SerializedSubject<HashMap<Long, ModelCall>, HashMap<Long, ModelCall>> callsSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private boolean connectionReady;
     private long selectedChannelId;
     private long selectedGuildId;
@@ -99,17 +99,17 @@ public final class StoreCalls {
         StoreCalls$call$1 storeCalls$call$1 = new StoreCalls$call$1(this, j);
         StoreCalls$call$2 storeCalls$call$2 = new StoreCalls$call$2(this, j, appComponent, context, storeCalls$call$1, function0, fragmentManager);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable a02 = Observable.k0(companion.getChannels().observeChannel(j).k(q.c(StoreCalls$call$3.INSTANCE, null, 5000, TimeUnit.MILLISECONDS)), companion.getVoiceStates().observeForPrivateChannels(j), StoreCalls$call$4.INSTANCE).a0(1);
-        m.checkNotNullExpressionValue(a02, "Observable\n        .zip(…tates) }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, StoreCalls.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreCalls$call$5(storeCalls$call$2, storeCalls$call$1), 62, (Object) null);
+        Observable Z = Observable.j0(companion.getChannels().observeChannel(j).k(q.c(StoreCalls$call$3.INSTANCE, null, 5000, TimeUnit.MILLISECONDS)), companion.getVoiceStates().observeForPrivateChannels(j), StoreCalls$call$4.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable\n        .zip(…tates) }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StoreCalls.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreCalls$call$5(storeCalls$call$2, storeCalls$call$1), 62, (Object) null);
     }
 
     public final Observable<ModelCall> get(long j) {
-        Observable<HashMap<Long, ModelCall>> G = this.callsSubject.G(new StoreCalls$get$1(j));
-        m.checkNotNullExpressionValue(G, "callsSubject\n          .…lls -> calls[channelId] }");
-        Observable<ModelCall> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "callsSubject\n          .…  .distinctUntilChanged()");
-        return s2;
+        Observable<HashMap<Long, ModelCall>> F = this.callsSubject.F(new StoreCalls$get$1(j));
+        m.checkNotNullExpressionValue(F, "callsSubject\n          .…lls -> calls[channelId] }");
+        Observable<ModelCall> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "callsSubject\n          .…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void handleCallCreateOrUpdate(ModelCall modelCall) {
diff --git a/app/src/main/java/com/discord/stores/StoreCallsIncoming.java b/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
index 1197a09303..14b8b59e42 100644
--- a/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
+++ b/app/src/main/java/com/discord/stores/StoreCallsIncoming.java
@@ -63,15 +63,15 @@ public final class StoreCallsIncoming extends StoreV2 {
     }
 
     public final Observable<Boolean> observeHasIncoming() {
-        Observable<Boolean> s2 = observeIncoming().G(StoreCallsIncoming$observeHasIncoming$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeIncoming()\n      …  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = observeIncoming().F(StoreCallsIncoming$observeHasIncoming$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeIncoming()\n      …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Set<Long>> observeIncoming() {
-        Observable<Set<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreCallsIncoming$observeIncoming$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreCallsIncoming$observeIncoming$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final void removeIncomingCall(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreChannelConversions.java b/app/src/main/java/com/discord/stores/StoreChannelConversions.java
index 2811aed695..3a5faa2ee1 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelConversions.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelConversions.java
@@ -9,10 +9,10 @@ public final class StoreChannelConversions extends StoreV2 {
     @StoreThread
     public final void handleChannelCreateOrUpdate(Channel channel) {
         if (channel != null) {
-            long g = channel.g();
-            long o = channel.o();
-            if (o != 0 && this.selectedChannelId == o) {
-                ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, g, null, null, 12, null);
+            long h = channel.h();
+            long p = channel.p();
+            if (p != 0 && this.selectedChannelId == p) {
+                ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, h, null, null, 12, null);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelFollowerStats.java b/app/src/main/java/com/discord/stores/StoreChannelFollowerStats.java
index 633cce9b0b..ce98ae31f9 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelFollowerStats.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelFollowerStats.java
@@ -200,9 +200,9 @@ public final class StoreChannelFollowerStats extends StoreV2 {
     }
 
     public final Observable<ModelChannelFollowerStats> observeChannelFollowerStats(long j) {
-        Observable<ModelChannelFollowerStats> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannelFollowerStats$observeChannelFollowerStats$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelChannelFollowerStats> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannelFollowerStats$observeChannelFollowerStats$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.java b/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.java
index 4ee1eb8c0b..8580766c9d 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildMemberListUpdate$2.java
@@ -1,12 +1,12 @@
 package com.discord.stores;
 
 import com.discord.models.domain.ModelGuildMemberListUpdate;
-import com.discord.utilities.lazy.memberlist.ChannelMemberList;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreChannelMembers.kt */
-public final class StoreChannelMembers$handleGuildMemberListUpdate$2 extends o implements Function1<ModelGuildMemberListUpdate.Group, ChannelMemberList.Row> {
+public final class StoreChannelMembers$handleGuildMemberListUpdate$2 extends o implements Function1<ModelGuildMemberListUpdate.Group, MemberListRow> {
     public final /* synthetic */ long $guildId;
     public final /* synthetic */ StoreChannelMembers this$0;
 
@@ -17,7 +17,7 @@ public final class StoreChannelMembers$handleGuildMemberListUpdate$2 extends o i
         this.$guildId = j;
     }
 
-    public final ChannelMemberList.Row invoke(ModelGuildMemberListUpdate.Group group) {
+    public final MemberListRow invoke(ModelGuildMemberListUpdate.Group group) {
         m.checkNotNullParameter(group, "it");
         return StoreChannelMembers.access$makeGroup(this.this$0, this.$guildId, group);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$forEach$lambda$1.java
index aa965836ba..2a7944a7b5 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$forEach$lambda$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$forEach$lambda$1.java
@@ -1,10 +1,10 @@
 package com.discord.stores;
 
-import com.discord.utilities.lazy.memberlist.ChannelMemberList;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
 import d0.z.d.o;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreChannelMembers.kt */
-public final class StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$forEach$lambda$1 extends o implements Function1<Long, ChannelMemberList.Row> {
+public final class StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$forEach$lambda$1 extends o implements Function1<Long, MemberListRow> {
     public final /* synthetic */ boolean $allowOwnerIndicator$inlined;
     public final /* synthetic */ long $guildId$inlined;
     public final /* synthetic */ StoreChannelMembers this$0;
@@ -17,14 +17,14 @@ public final class StoreChannelMembers$handleGuildRoleCreateOrUpdate$$inlined$fo
         this.$allowOwnerIndicator$inlined = z2;
     }
 
-    public final ChannelMemberList.Row invoke(long j) {
-        return StoreChannelMembers.access$makeMember(this.this$0, this.$guildId$inlined, j, this.$allowOwnerIndicator$inlined);
+    public final MemberListRow invoke(long j) {
+        return StoreChannelMembers.access$makeRowMember(this.this$0, this.$guildId$inlined, j, this.$allowOwnerIndicator$inlined);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ ChannelMemberList.Row invoke(Long l) {
+    public /* bridge */ /* synthetic */ MemberListRow invoke(Long l) {
         return invoke(l.longValue());
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelMembers.java b/app/src/main/java/com/discord/stores/StoreChannelMembers.java
index 4144ec2924..75472257c1 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelMembers.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelMembers.java
@@ -2,7 +2,6 @@ package com.discord.stores;
 
 import android.content.Context;
 import c.d.b.a.a;
-import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.permission.PermissionOverwrite;
 import com.discord.api.role.GuildRole;
@@ -16,6 +15,7 @@ import com.discord.stores.updates.ObservationDeck;
 import com.discord.utilities.PermissionOverwriteUtilsKt;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.lazy.memberlist.ChannelMemberList;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -38,11 +38,13 @@ import kotlin.NoWhenBranchMatchedException;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.ranges.IntRange;
 import rx.Observable;
 import rx.subjects.PublishSubject;
 /* compiled from: StoreChannelMembers.kt */
 public final class StoreChannelMembers extends StoreV2 {
+    public static final Companion Companion = new Companion(null);
     private final Dispatcher dispatcher;
     private final Function1<Long, Channel> getChannel;
     private final Function1<Long, Integer> getGuildMemberCount;
@@ -97,6 +99,30 @@ public final class StoreChannelMembers extends StoreV2 {
         }
     }
 
+    /* compiled from: StoreChannelMembers.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final MemberListRow.Member makeRowMember(long j, Map<Long, GuildMember> map, Map<Long, ? extends User> map2, Presence presence, boolean z2, boolean z3) {
+            m.checkNotNullParameter(map2, "users");
+            Integer num = null;
+            GuildMember guildMember = map != null ? map.get(Long.valueOf(j)) : null;
+            User user = (User) map2.get(Long.valueOf(j));
+            if (user == null || guildMember == null) {
+                return null;
+            }
+            if (guildMember.getColor() != -16777216) {
+                num = Integer.valueOf(guildMember.getColor());
+            }
+            return new MemberListRow.Member(j, GuildMember.Companion.getNickOrUsername(guildMember, user), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893822 : 2131887051), UserUtils.INSTANCE.isVerifiedBot(user), presence, num, IconUtils.getForGuildMemberOrUser$default(IconUtils.INSTANCE, user, guildMember, null, 4, null), z3, guildMember.getPremiumSince(), z2);
+        }
+    }
+
     /* compiled from: StoreChannelMembers.kt */
     public static final class MemberListIdCalculator {
         public static final MemberListIdCalculator INSTANCE = new MemberListIdCalculator();
@@ -141,17 +167,17 @@ public final class StoreChannelMembers extends StoreV2 {
             m.checkNotNullParameter(function1, "channelsProvider");
             m.checkNotNullParameter(storeGuilds, "storeGuilds");
             Channel invoke = function1.invoke(Long.valueOf(j));
-            String j2 = invoke != null ? invoke.j() : null;
+            String k = invoke != null ? invoke.k() : null;
             if (invoke != null) {
-                if (j2 != null) {
-                    return j2;
+                if (k != null) {
+                    return k;
                 }
                 Map map = (Map) a.c(invoke, storeGuilds.getRoles());
                 if (map == null) {
                     map = h0.emptyMap();
                 }
-                if (!AnimatableValueParser.y1(invoke) && !PermissionUtils.canEveryone(1024, invoke, null, map)) {
-                    return computeIdFromOverwrites(invoke.r());
+                if (!PermissionUtils.canEveryone(1024, invoke, null, map)) {
+                    return computeIdFromOverwrites(invoke.s());
                 }
             }
             return "everyone";
@@ -281,22 +307,22 @@ public final class StoreChannelMembers extends StoreV2 {
         this.getGuildMemberCount = function12;
         this.getPresence = function13;
         this.isUserStreaming = function14;
-        PublishSubject<Unit> l0 = PublishSubject.l0();
-        this.markChangedTrigger = l0;
-        m.checkNotNullExpressionValue(l0, "markChangedTrigger");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.leadingEdgeThrottle(l0, 1, TimeUnit.SECONDS), StoreChannelMembers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        PublishSubject<Unit> k0 = PublishSubject.k0();
+        this.markChangedTrigger = k0;
+        m.checkNotNullExpressionValue(k0, "markChangedTrigger");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.leadingEdgeThrottle(k0, 1, TimeUnit.SECONDS), StoreChannelMembers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     public static final /* synthetic */ Dispatcher access$getDispatcher$p(StoreChannelMembers storeChannelMembers) {
         return storeChannelMembers.dispatcher;
     }
 
-    public static final /* synthetic */ ChannelMemberList.Row access$makeGroup(StoreChannelMembers storeChannelMembers, long j, ModelGuildMemberListUpdate.Group group) {
+    public static final /* synthetic */ MemberListRow access$makeGroup(StoreChannelMembers storeChannelMembers, long j, ModelGuildMemberListUpdate.Group group) {
         return storeChannelMembers.makeGroup(j, group);
     }
 
-    public static final /* synthetic */ ChannelMemberList.Row access$makeMember(StoreChannelMembers storeChannelMembers, long j, long j2, boolean z2) {
-        return storeChannelMembers.makeMember(j, j2, z2);
+    public static final /* synthetic */ MemberListRow access$makeRowMember(StoreChannelMembers storeChannelMembers, long j, long j2, boolean z2) {
+        return storeChannelMembers.makeRowMember(j, j2, z2);
     }
 
     @StoreThread
@@ -365,7 +391,7 @@ public final class StoreChannelMembers extends StoreV2 {
 
     @StoreThread
     private final void handleSync(String str, ModelGuildMemberListUpdate.Operation.Sync sync, long j) {
-        ChannelMemberList.Row row;
+        MemberListRow memberListRow;
         Map<String, ChannelMemberList> map = this.memberLists.get(Long.valueOf(j));
         if (map == null) {
             map = new HashMap<>();
@@ -383,13 +409,13 @@ public final class StoreChannelMembers extends StoreV2 {
         ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(items, 10));
         for (ModelGuildMemberListUpdate.Operation.Item item : items) {
             if (item instanceof ModelGuildMemberListUpdate.Operation.Item.MemberItem) {
-                row = makeMember(j, ((ModelGuildMemberListUpdate.Operation.Item.MemberItem) item).getMember().j().i(), allowOwnerIndicator);
+                memberListRow = makeRowMember(j, ((ModelGuildMemberListUpdate.Operation.Item.MemberItem) item).getMember().j().i(), allowOwnerIndicator);
             } else if (item instanceof ModelGuildMemberListUpdate.Operation.Item.GroupItem) {
-                row = makeGroup(j, ((ModelGuildMemberListUpdate.Operation.Item.GroupItem) item).getGroup());
+                memberListRow = makeGroup(j, ((ModelGuildMemberListUpdate.Operation.Item.GroupItem) item).getGroup());
             } else {
                 throw new NoWhenBranchMatchedException();
             }
-            arrayList.add(row);
+            arrayList.add(memberListRow);
         }
         channelMemberList.sync(((Number) u.first(sync.getRange())).intValue(), arrayList);
     }
@@ -403,7 +429,7 @@ public final class StoreChannelMembers extends StoreV2 {
     }
 
     @StoreThread
-    private final ChannelMemberList.Row makeGroup(long j, ModelGuildMemberListUpdate.Group group) {
+    private final MemberListRow makeGroup(long j, ModelGuildMemberListUpdate.Group group) {
         String str;
         GuildRole guildRole;
         String id2 = group.getId();
@@ -414,37 +440,21 @@ public final class StoreChannelMembers extends StoreV2 {
             if (map == null || (guildRole = map.get(Long.valueOf(parseLong))) == null || (str = guildRole.f()) == null) {
                 str = "";
             }
-            return new ChannelMemberList.Row.RoleHeader(parseLong, str, group.getCount());
+            return new MemberListRow.RoleHeader(parseLong, str, group.getCount());
         } else if (ordinal == 1) {
-            return new ChannelMemberList.Row.StatusHeader(id2, ChannelMemberList.Row.StatusHeader.Type.OFFLINE, group.getCount());
+            return new MemberListRow.StatusHeader(id2, MemberListRow.StatusHeader.Type.OFFLINE, group.getCount());
         } else {
             if (ordinal == 2) {
-                return new ChannelMemberList.Row.StatusHeader(id2, ChannelMemberList.Row.StatusHeader.Type.ONLINE, group.getCount());
+                return new MemberListRow.StatusHeader(id2, MemberListRow.StatusHeader.Type.ONLINE, group.getCount());
             }
             throw new NoWhenBranchMatchedException();
         }
     }
 
     @StoreThread
-    private final ChannelMemberList.Row makeMember(long j, long j2, boolean z2) {
-        Guild guild = this.storeGuilds.getGuildsInternal$app_productionGoogleRelease().get(Long.valueOf(j));
-        Map<Long, GuildMember> map = this.storeGuilds.getGuildMembersComputedInternal$app_productionGoogleRelease().get(Long.valueOf(j));
-        Integer num = null;
-        GuildMember guildMember = map != null ? map.get(Long.valueOf(j2)) : null;
-        User user = this.storeUser.getUsersInternal$app_productionGoogleRelease().get(Long.valueOf(j2));
-        if (user == null || guildMember == null) {
-            return null;
-        }
-        if (guildMember.getColor() != -16777216) {
-            num = Integer.valueOf(guildMember.getColor());
-        }
-        return new ChannelMemberList.Row.Member(j2, GuildMember.Companion.getNickOrUsername(guildMember, user), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893725 : 2131887051), UserUtils.INSTANCE.isVerifiedBot(user), this.getPresence.invoke(Long.valueOf(j2)), num, IconUtils.getForGuildMemberOrUser$default(IconUtils.INSTANCE, user, guildMember, null, 4, null), z2 && guild != null && guild.getOwnerId() == j2, guildMember.getPremiumSince(), this.isUserStreaming.invoke(Long.valueOf(j2)).booleanValue());
-    }
-
-    @StoreThread
-    private final ChannelMemberList.Row makeRow(long j, ModelGuildMemberListUpdate.Operation.Item item) {
+    private final MemberListRow makeRow(long j, ModelGuildMemberListUpdate.Operation.Item item) {
         if (item instanceof ModelGuildMemberListUpdate.Operation.Item.MemberItem) {
-            return makeMember(j, ((ModelGuildMemberListUpdate.Operation.Item.MemberItem) item).getMember().j().i(), allowOwnerIndicator(j));
+            return makeRowMember(j, ((ModelGuildMemberListUpdate.Operation.Item.MemberItem) item).getMember().j().i(), allowOwnerIndicator(j));
         }
         if (item instanceof ModelGuildMemberListUpdate.Operation.Item.GroupItem) {
             return makeGroup(j, ((ModelGuildMemberListUpdate.Operation.Item.GroupItem) item).getGroup());
@@ -452,6 +462,12 @@ public final class StoreChannelMembers extends StoreV2 {
         throw new NoWhenBranchMatchedException();
     }
 
+    @StoreThread
+    private final MemberListRow makeRowMember(long j, long j2, boolean z2) {
+        Guild guild;
+        return Companion.makeRowMember(j2, this.storeGuilds.getGuildMembersComputedInternal$app_productionGoogleRelease().get(Long.valueOf(j)), this.storeUser.getUsersInternal$app_productionGoogleRelease(), this.getPresence.invoke(Long.valueOf(j2)), this.isUserStreaming.invoke(Long.valueOf(j2)).booleanValue(), z2 && (guild = this.storeGuilds.getGuildsInternal$app_productionGoogleRelease().get(Long.valueOf(j))) != null && guild.getOwnerId() == j2);
+    }
+
     private final void throttleMarkChanged() {
         PublishSubject<Unit> publishSubject = this.markChangedTrigger;
         publishSubject.j.onNext(Unit.a);
@@ -517,9 +533,9 @@ public final class StoreChannelMembers extends StoreV2 {
     }
 
     public final Observable<ChannelMemberList> observeChannelMemberList(long j, long j2) {
-        Observable<ChannelMemberList> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannelMembers$observeChannelMemberList$1(this, j, j2), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<ChannelMemberList> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannelMembers$observeChannelMemberList$1(this, j, j2), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java b/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java
index dbbb1e0d43..7af0c7f17e 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$handleGuildRemove$2.java
@@ -24,6 +24,6 @@ public final class StoreChannels$handleGuildRemove$2 extends o implements Functi
 
     public final boolean invoke(Channel channel) {
         m.checkNotNullParameter(channel, "thread");
-        return channel.e() == this.$guild.o();
+        return channel.f() == this.$guild.o();
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeChannelsForGuild$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeChannelsForGuild$1.java
index 464c24826d..826fd1a0d4 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeChannelsForGuild$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeChannelsForGuild$1.java
@@ -35,9 +35,9 @@ public final class StoreChannels$observeChannelsForGuild$1<T, R> implements b<Ma
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry<Long, Channel> entry : map.entrySet()) {
             Channel value = entry.getValue();
-            if (value.e() == this.$guildId) {
+            if (value.f() == this.$guildId) {
                 if (this.$type != null) {
-                    int z3 = value.z();
+                    int A = value.A();
                     Integer num = this.$type;
                     if (num != null) {
                     }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeDMs$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeDMs$1.java
index 57fdee8ad5..10c1e92a1d 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeDMs$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeDMs$1.java
@@ -22,7 +22,7 @@ public final class StoreChannels$observeDMs$1<T, R> implements b<Map<Long, ? ext
         Collection<Channel> values = map.values();
         ArrayList arrayList = new ArrayList();
         for (T t : values) {
-            if (AnimatableValueParser.g1(t)) {
+            if (AnimatableValueParser.h1(t)) {
                 arrayList.add(t);
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
index c868d5e9e0..7244be40ca 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeDefaultChannel$1.java
@@ -75,6 +75,6 @@ public final class StoreChannels$observeDefaultChannel$1<T, R> implements b<Map<
     }
 
     public final Observable<? extends Channel> call(Map<Long, Long> map) {
-        return this.this$0.observeChannelsForGuild(this.$guildId, 0).G(new AnonymousClass1(map));
+        return this.this$0.observeChannelsForGuild(this.$guildId, 0).F(new AnonymousClass1(map));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeDirectShareCandidates$2.java b/app/src/main/java/com/discord/stores/StoreChannels$observeDirectShareCandidates$2.java
index 57dc911b99..4ad8014e10 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeDirectShareCandidates$2.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeDirectShareCandidates$2.java
@@ -37,7 +37,7 @@ public final class StoreChannels$observeDirectShareCandidates$2<T, R> implements
         }
         ArrayList arrayList2 = new ArrayList();
         for (T t2 : arrayList) {
-            if (AnimatableValueParser.g1(t2)) {
+            if (AnimatableValueParser.h1(t2)) {
                 arrayList2.add(t2);
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeIds$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeIds$1.java
index 0c18a865a7..7d2a5e59bb 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeIds$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeIds$1.java
@@ -24,7 +24,7 @@ public final class StoreChannels$observeIds$1<T, R> implements b<Map<Long, ? ext
         Collection<Channel> values = map.values();
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (T t : values) {
-            Long valueOf = Long.valueOf(t.e());
+            Long valueOf = Long.valueOf(t.f());
             Object obj = linkedHashMap.get(valueOf);
             if (obj == null) {
                 obj = new ArrayList();
@@ -38,7 +38,7 @@ public final class StoreChannels$observeIds$1<T, R> implements b<Map<Long, ? ext
             List<T> list = (List) t2.getValue();
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
             for (T t3 : list) {
-                arrayList.add(Long.valueOf(t3.g()));
+                arrayList.add(Long.valueOf(t3.h()));
             }
             linkedHashMap2.put(key, arrayList);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java
index bd871eefb8..810c9527a9 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java
@@ -1,8 +1,7 @@
 package com.discord.stores;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
-import com.discord.utilities.message.MessageUtils;
+import com.discord.models.message.Message;
 import d0.d0.f;
 import d0.t.g0;
 import d0.z.d.o;
@@ -30,20 +29,20 @@ public final class StoreChannels$observeThreadsFromMessages$1 extends o implemen
         List list = this.$messages;
         ArrayList<Message> arrayList = new ArrayList();
         for (Object obj : list) {
-            if (MessageUtils.INSTANCE.hasThread((Message) obj)) {
+            if (((Message) obj).hasThread()) {
                 arrayList.add(obj);
             }
         }
         ArrayList arrayList2 = new ArrayList();
         for (Message message : arrayList) {
-            Channel channel = this.this$0.getChannel(message.r());
+            Channel channel = this.this$0.getChannel(message.getId());
             if (channel != null) {
                 arrayList2.add(channel);
             }
         }
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(d0.t.o.collectionSizeOrDefault(arrayList2, 10)), 16));
         for (Object obj2 : arrayList2) {
-            linkedHashMap.put(Long.valueOf(((Channel) obj2).g()), obj2);
+            linkedHashMap.put(Long.valueOf(((Channel) obj2).h()), obj2);
         }
         return linkedHashMap;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreChannels.java b/app/src/main/java/com/discord/stores/StoreChannels.java
index 954c841f1a..c03f8dd85c 100644
--- a/app/src/main/java/com/discord/stores/StoreChannels.java
+++ b/app/src/main/java/com/discord/stores/StoreChannels.java
@@ -8,9 +8,9 @@ import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipient;
 import com.discord.api.channel.ChannelRecipientNick;
 import com.discord.api.guild.Guild;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.models.domain.ModelPayload;
+import com.discord.models.message.Message;
 import com.discord.models.thread.dto.ModelThreadListSync;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.utilities.persister.Persister;
@@ -184,7 +184,7 @@ public final class StoreChannels extends StoreV2 {
         }
         ArrayList arrayList = new ArrayList();
         for (Object obj : values) {
-            if (((Channel) obj).q() == j2) {
+            if (((Channel) obj).r() == j2) {
                 arrayList.add(obj);
             }
         }
@@ -227,7 +227,7 @@ public final class StoreChannels extends StoreV2 {
         }
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList, 10)), 16));
         for (Object obj : arrayList) {
-            linkedHashMap.put(Long.valueOf(((Channel) obj).g()), obj);
+            linkedHashMap.put(Long.valueOf(((Channel) obj).h()), obj);
         }
         return linkedHashMap;
     }
@@ -265,7 +265,7 @@ public final class StoreChannels extends StoreV2 {
         Collection<Channel> values = this.threadsById.values();
         ArrayList arrayList = new ArrayList();
         for (Object obj : values) {
-            if (((Channel) obj).q() == j) {
+            if (((Channel) obj).r() == j) {
                 arrayList.add(obj);
             }
         }
@@ -277,7 +277,7 @@ public final class StoreChannels extends StoreV2 {
         Collection<Channel> values = this.threadsById.values();
         ArrayList arrayList = new ArrayList();
         for (Object obj : values) {
-            if (((Channel) obj).e() == j) {
+            if (((Channel) obj).f() == j) {
                 arrayList.add(obj);
             }
         }
@@ -287,35 +287,35 @@ public final class StoreChannels extends StoreV2 {
     @StoreThread
     public final void handleChannelOrThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (!AnimatableValueParser.o1(channel)) {
-            long e = !AnimatableValueParser.r1(channel) ? channel.e() : 0;
-            long g = channel.g();
-            if (AnimatableValueParser.y1(channel)) {
-                storeThread$app_productionGoogleRelease$default(this, channel, e, null, 4, null);
+        if (!AnimatableValueParser.p1(channel)) {
+            long f = !AnimatableValueParser.s1(channel) ? channel.f() : 0;
+            long h = channel.h();
+            if (AnimatableValueParser.z1(channel)) {
+                storeThread$app_productionGoogleRelease$default(this, channel, f, null, 4, null);
             } else {
                 Map<Long, Map<Long, Channel>> map = this.channelsByGuild;
-                Long valueOf = Long.valueOf(e);
+                Long valueOf = Long.valueOf(f);
                 Map<Long, Channel> map2 = map.get(valueOf);
                 if (map2 == null) {
                     map2 = new HashMap<>();
                     map.put(valueOf, map2);
                 }
                 Map<Long, Channel> map3 = map2;
-                Channel channel2 = map3.get(Long.valueOf(g));
+                Channel channel2 = map3.get(Long.valueOf(h));
                 if (!m.areEqual(channel, channel2)) {
                     if (channel2 != null) {
-                        map3.put(Long.valueOf(g), Channel.a(channel, null, 0, channel.e() != 0 ? channel.e() : e, null, 0, 0, 0, null, channel2.v(), 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435195));
+                        map3.put(Long.valueOf(h), Channel.a(channel, null, 0, channel.f() != 0 ? channel.f() : f, null, 0, 0, 0, null, channel2.w(), 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870651));
                     } else {
-                        map3.put(Long.valueOf(g), Channel.a(channel, null, 0, channel.e() != 0 ? channel.e() : e, null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435451));
+                        map3.put(Long.valueOf(h), Channel.a(channel, null, 0, channel.f() != 0 ? channel.f() : f, null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907));
                     }
                 }
-                boolean n = channel.n();
-                if (channel2 == null || n != channel2.n()) {
-                    for (Channel channel3 : getThreadsForChannelInternal$app_productionGoogleRelease(channel.g())) {
-                        storeThread$app_productionGoogleRelease(channel3, e, channel);
+                boolean o = channel.o();
+                if (channel2 == null || o != channel2.o()) {
+                    for (Channel channel3 : getThreadsForChannelInternal$app_productionGoogleRelease(channel.h())) {
+                        storeThread$app_productionGoogleRelease(channel3, f, channel);
                     }
                 }
-                this.channelNames.put(Long.valueOf(g), AnimatableValueParser.y0(channel));
+                this.channelNames.put(Long.valueOf(h), AnimatableValueParser.y0(channel));
             }
             markChanged();
         }
@@ -325,21 +325,21 @@ public final class StoreChannels extends StoreV2 {
     public final void handleChannelOrThreadDelete(Channel channel) {
         Map<Long, Channel> map;
         m.checkNotNullParameter(channel, "channel");
-        long e = !AnimatableValueParser.r1(channel) ? channel.e() : 0;
-        long g = channel.g();
-        if (this.channelsByGuild.containsKey(Long.valueOf(e)) && (map = this.channelsByGuild.get(Long.valueOf(e))) != null && map.containsKey(Long.valueOf(g))) {
-            Map<Long, Channel> map2 = this.channelsByGuild.get(Long.valueOf(e));
+        long f = !AnimatableValueParser.s1(channel) ? channel.f() : 0;
+        long h = channel.h();
+        if (this.channelsByGuild.containsKey(Long.valueOf(f)) && (map = this.channelsByGuild.get(Long.valueOf(f))) != null && map.containsKey(Long.valueOf(h))) {
+            Map<Long, Channel> map2 = this.channelsByGuild.get(Long.valueOf(f));
             if (map2 != null) {
-                map2.remove(Long.valueOf(g));
+                map2.remove(Long.valueOf(h));
             }
             markChanged();
         }
-        if (this.channelNames.containsKey(Long.valueOf(g))) {
-            this.channelNames.remove(Long.valueOf(g));
+        if (this.channelNames.containsKey(Long.valueOf(h))) {
+            this.channelNames.remove(Long.valueOf(h));
             markChanged();
         }
-        if (this.threadsById.containsKey(Long.valueOf(g))) {
-            this.threadsById.remove(Long.valueOf(g));
+        if (this.threadsById.containsKey(Long.valueOf(h))) {
+            this.threadsById.remove(Long.valueOf(h));
             markChanged();
         }
     }
@@ -370,12 +370,12 @@ public final class StoreChannels extends StoreV2 {
         for (Object obj : privateChannels) {
             Channel channel = (Channel) obj;
             m.checkNotNullExpressionValue(channel, "it");
-            if (!AnimatableValueParser.o1(channel)) {
+            if (!AnimatableValueParser.p1(channel)) {
                 S.add(obj);
             }
         }
         for (Channel channel2 : S) {
-            Long valueOf = Long.valueOf(channel2.g());
+            Long valueOf = Long.valueOf(channel2.h());
             m.checkNotNullExpressionValue(channel2, "privateChannel");
             map3.put(valueOf, channel2);
         }
@@ -393,21 +393,21 @@ public final class StoreChannels extends StoreV2 {
             List<Channel> g = guild.g();
             if (g != null) {
                 for (Channel channel3 : g) {
-                    map6.put(Long.valueOf(channel3.g()), Channel.a(channel3, null, 0, channel3.e() != 0 ? channel3.e() : guild.o(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435451));
+                    map6.put(Long.valueOf(channel3.h()), Channel.a(channel3, null, 0, channel3.f() != 0 ? channel3.f() : guild.o(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907));
                 }
             }
             List<Channel> K = guild.K();
             if (K != null) {
                 for (Channel channel4 : K) {
-                    if (AnimatableValueParser.y1(channel4)) {
+                    if (AnimatableValueParser.z1(channel4)) {
                         storeThread$app_productionGoogleRelease$default(this, channel4, guild.o(), null, 4, null);
                     }
                 }
             }
         }
         for (Channel channel5 : this.preloadedThreads.values()) {
-            if (!this.threadsById.containsKey(Long.valueOf(channel5.g()))) {
-                storeThread$app_productionGoogleRelease$default(this, channel5, channel5.e(), null, 4, null);
+            if (!this.threadsById.containsKey(Long.valueOf(channel5.h()))) {
+                storeThread$app_productionGoogleRelease$default(this, channel5, channel5.f(), null, 4, null);
             }
         }
         this.preloadedThreads.clear();
@@ -424,7 +424,7 @@ public final class StoreChannels extends StoreV2 {
         markChanged();
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:42:0x012b  */
+    /* JADX WARNING: Removed duplicated region for block: B:42:0x012d  */
     @StoreThread
     public final void handleGroupDMRecipient(ChannelRecipient channelRecipient, boolean z2) {
         ArrayList arrayList;
@@ -437,33 +437,33 @@ public final class StoreChannels extends StoreV2 {
             long a = channelRecipient.a();
             Channel channel = map2.get(Long.valueOf(a));
             if (channel != null) {
-                long e = channel.e();
+                long f = channel.f();
                 if (z2) {
-                    List<User> v = channel.v();
-                    ArrayList arrayList4 = v != null ? new ArrayList(v) : new ArrayList();
+                    List<User> w = channel.w();
+                    ArrayList arrayList4 = w != null ? new ArrayList(w) : new ArrayList();
                     arrayList4.add(channelRecipient.c());
                     arrayList = arrayList4;
                 } else {
                     ArrayList arrayList5 = new ArrayList();
-                    List<User> v2 = channel.v();
-                    if (v2 == null) {
-                        v2 = n.emptyList();
+                    List<User> w2 = channel.w();
+                    if (w2 == null) {
+                        w2 = n.emptyList();
                     }
-                    for (User user : v2) {
+                    for (User user : w2) {
                         if (user.i() != channelRecipient.c().i()) {
                             arrayList5.add(user);
                         }
                     }
                     arrayList = arrayList5;
                 }
-                long e2 = channel.e() != 0 ? channel.e() : e;
+                long f2 = channel.f() != 0 ? channel.f() : f;
                 String b = channelRecipient.b();
                 if (b != null) {
-                    List<ChannelRecipientNick> m = channel.m();
-                    if (m != null) {
-                        arrayList3 = new ArrayList(o.collectionSizeOrDefault(m, 10));
-                        for (ChannelRecipientNick channelRecipientNick : m) {
-                            if (channelRecipientNick.a() == channelRecipient.c().i()) {
+                    List<ChannelRecipientNick> n = channel.n();
+                    if (n != null) {
+                        arrayList3 = new ArrayList(o.collectionSizeOrDefault(n, 10));
+                        for (ChannelRecipientNick channelRecipientNick : n) {
+                            if (channelRecipientNick.b() == channelRecipient.c().i()) {
                                 channelRecipientNick = new ChannelRecipientNick(channelRecipient.c().i(), b);
                             }
                             arrayList3.add(channelRecipientNick);
@@ -473,17 +473,17 @@ public final class StoreChannels extends StoreV2 {
                     }
                     if (arrayList3 != null) {
                         arrayList2 = arrayList3;
-                        Channel a2 = Channel.a(channel, null, 0, e2, null, 0, 0, 0, null, arrayList, 0, null, 0, 0, null, 0, 0, arrayList2, false, 0, null, 0, null, null, null, null, null, null, null, 268369659);
-                        map = this.channelsByGuild.get(Long.valueOf(e));
+                        Channel a2 = Channel.a(channel, null, 0, f2, null, 0, 0, 0, null, arrayList, 0, null, 0, 0, null, 0, 0, arrayList2, false, 0, null, 0, null, null, null, null, null, null, null, null, 536805115);
+                        map = this.channelsByGuild.get(Long.valueOf(f));
                         if (map != null) {
                             map.put(Long.valueOf(a), a2);
                         }
                         markChanged();
                     }
                 }
-                arrayList2 = channel.m();
-                Channel a2 = Channel.a(channel, null, 0, e2, null, 0, 0, 0, null, arrayList, 0, null, 0, 0, null, 0, 0, arrayList2, false, 0, null, 0, null, null, null, null, null, null, null, 268369659);
-                map = this.channelsByGuild.get(Long.valueOf(e));
+                arrayList2 = channel.n();
+                Channel a2 = Channel.a(channel, null, 0, f2, null, 0, 0, 0, null, arrayList, 0, null, 0, 0, null, 0, 0, arrayList2, false, 0, null, 0, null, null, null, null, null, null, null, null, 536805115);
+                map = this.channelsByGuild.get(Long.valueOf(f));
                 if (map != null) {
                 }
                 markChanged();
@@ -505,14 +505,14 @@ public final class StoreChannels extends StoreV2 {
         List<Channel> g = guild.g();
         if (g != null) {
             for (Channel channel : g) {
-                map3.put(Long.valueOf(channel.g()), Channel.a(channel, null, 0, channel.e() != 0 ? channel.e() : guild.o(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435451));
-                this.channelNames.put(Long.valueOf(channel.g()), AnimatableValueParser.y0(channel));
+                map3.put(Long.valueOf(channel.h()), Channel.a(channel, null, 0, channel.f() != 0 ? channel.f() : guild.o(), null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870907));
+                this.channelNames.put(Long.valueOf(channel.h()), AnimatableValueParser.y0(channel));
             }
         }
         List<Channel> K = guild.K();
         if (K != null) {
             for (Channel channel2 : K) {
-                if (AnimatableValueParser.y1(channel2)) {
+                if (AnimatableValueParser.z1(channel2)) {
                     storeThread$app_productionGoogleRelease$default(this, channel2, guild.o(), null, 4, null);
                 }
             }
@@ -542,14 +542,14 @@ public final class StoreChannels extends StoreV2 {
     public final void handleMessagesLoaded(List<Message> list) {
         m.checkNotNullParameter(list, "messages");
         for (Message message : list) {
-            Channel J = message.J();
-            if (J != null) {
-                if (!this.threadsById.containsKey(Long.valueOf(J.g())) && AnimatableValueParser.y1(J)) {
-                    storeThread$app_productionGoogleRelease$default(this, J, 0, null, 6, null);
+            Channel thread = message.getThread();
+            if (thread != null) {
+                if (!this.threadsById.containsKey(Long.valueOf(thread.h())) && AnimatableValueParser.z1(thread)) {
+                    storeThread$app_productionGoogleRelease$default(this, thread, 0, null, 6, null);
                     markChanged();
                 }
                 if (!this.isConnectionOpen) {
-                    this.preloadedThreads.put(Long.valueOf(J.g()), J);
+                    this.preloadedThreads.put(Long.valueOf(thread.h()), thread);
                 }
             }
         }
@@ -561,7 +561,7 @@ public final class StoreChannels extends StoreV2 {
         List<Channel> threads = searchState.getThreads();
         if (threads != null) {
             for (Channel channel : threads) {
-                if (!this.threadsById.containsKey(Long.valueOf(channel.g())) && AnimatableValueParser.y1(channel)) {
+                if (!this.threadsById.containsKey(Long.valueOf(channel.h())) && AnimatableValueParser.z1(channel)) {
                     storeThread$app_productionGoogleRelease$default(this, channel, 0, null, 6, null);
                     markChanged();
                 }
@@ -570,9 +570,9 @@ public final class StoreChannels extends StoreV2 {
         List<Message> hits = searchState.getHits();
         if (hits != null) {
             for (Message message : hits) {
-                Channel J = message.J();
-                if (J != null && !this.threadsById.containsKey(Long.valueOf(J.g())) && AnimatableValueParser.y1(J)) {
-                    storeThread$app_productionGoogleRelease$default(this, J, 0, null, 6, null);
+                Channel thread = message.getThread();
+                if (thread != null && !this.threadsById.containsKey(Long.valueOf(thread.h())) && AnimatableValueParser.z1(thread)) {
+                    storeThread$app_productionGoogleRelease$default(this, thread, 0, null, 6, null);
                     markChanged();
                 }
             }
@@ -588,7 +588,7 @@ public final class StoreChannels extends StoreV2 {
     @StoreThread
     public final void handleThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (AnimatableValueParser.y1(channel)) {
+        if (AnimatableValueParser.z1(channel)) {
             handleChannelOrThreadCreateOrUpdate(channel);
         }
     }
@@ -598,7 +598,7 @@ public final class StoreChannels extends StoreV2 {
         m.checkNotNullParameter(modelThreadListSync, "payload");
         if (!modelThreadListSync.getThreads().isEmpty()) {
             for (Channel channel : modelThreadListSync.getThreads()) {
-                if (AnimatableValueParser.y1(channel)) {
+                if (AnimatableValueParser.z1(channel)) {
                     storeThread$app_productionGoogleRelease$default(this, channel, modelThreadListSync.getGuildId(), null, 4, null);
                 }
             }
@@ -612,7 +612,7 @@ public final class StoreChannels extends StoreV2 {
         Map<Long, Map<Long, Channel>> map = this.channelsByGuild;
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Object obj : filterNotNull) {
-            Long valueOf = Long.valueOf(((Channel) obj).e());
+            Long valueOf = Long.valueOf(((Channel) obj).f());
             Object obj2 = linkedHashMap.get(valueOf);
             if (obj2 == null) {
                 obj2 = new ArrayList();
@@ -625,7 +625,7 @@ public final class StoreChannels extends StoreV2 {
             Object key = entry.getKey();
             HashMap hashMap = new HashMap();
             for (Object obj3 : (List) entry.getValue()) {
-                hashMap.put(Long.valueOf(((Channel) obj3).g()), obj3);
+                hashMap.put(Long.valueOf(((Channel) obj3).h()), obj3);
             }
             linkedHashMap2.put(key, hashMap);
         }
@@ -639,15 +639,15 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Channel> observeChannel(long j) {
-        Observable<Channel> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeChannel$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Channel> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeChannel$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<List<Channel>> observeChannelCategories(long j) {
-        Observable<List<Channel>> s2 = observeChannelsForGuild$default(this, j, null, 2, null).G(StoreChannels$observeChannelCategories$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeChannelsForGuild(…  .distinctUntilChanged()");
-        return s2;
+        Observable<List<Channel>> r = observeChannelsForGuild$default(this, j, null, 2, null).F(StoreChannels$observeChannelCategories$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeChannelsForGuild(…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Channel>> observeChannelsForGuild(long j) {
@@ -655,28 +655,28 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, Channel>> observeChannelsForGuild(long j, Integer num) {
-        Observable<Map<Long, Channel>> s2 = observeGuildAndPrivateChannels().Z(new StoreChannels$observeChannelsForGuild$1(j, num)).s();
-        m.checkNotNullExpressionValue(s2, "observeGuildAndPrivateCh…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Channel>> r = observeGuildAndPrivateChannels().Y(new StoreChannels$observeChannelsForGuild$1(j, num)).r();
+        m.checkNotNullExpressionValue(r, "observeGuildAndPrivateCh…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<List<Channel>> observeDMs() {
-        Observable<R> G = observePrivateChannels().G(StoreChannels$observeDMs$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "observePrivateChannels()…nel -> channel.isDM() } }");
-        return G;
+        Observable<R> F = observePrivateChannels().F(StoreChannels$observeDMs$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "observePrivateChannels()…nel -> channel.isDM() } }");
+        return F;
     }
 
     public final Observable<Channel> observeDefaultChannel(long j) {
-        Observable<Channel> s2 = this.observeChannelPermissionsForGuild.invoke(Long.valueOf(j)).Z(new StoreChannels$observeDefaultChannel$1(this, j)).s();
-        m.checkNotNullExpressionValue(s2, "observeChannelPermission…  .distinctUntilChanged()");
-        return s2;
+        Observable<Channel> r = this.observeChannelPermissionsForGuild.invoke(Long.valueOf(j)).Y(new StoreChannels$observeDefaultChannel$1(this, j)).r();
+        m.checkNotNullExpressionValue(r, "observeChannelPermission…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<List<Channel>> observeDirectShareCandidates(Context context) {
         m.checkNotNullParameter(context, "context");
-        Observable<R> G = observeGuildAndPrivateChannels().y(StoreChannels$observeDirectShareCandidates$1.INSTANCE).G(new StoreChannels$observeDirectShareCandidates$2(context));
-        m.checkNotNullExpressionValue(G, "observeGuildAndPrivateCh…ity(context))\n          }");
-        return G;
+        Observable<R> F = observeGuildAndPrivateChannels().x(StoreChannels$observeDirectShareCandidates$1.INSTANCE).F(new StoreChannels$observeDirectShareCandidates$2(context));
+        m.checkNotNullExpressionValue(F, "observeGuildAndPrivateCh…ity(context))\n          }");
+        return F;
     }
 
     public final Observable<Map<Long, Channel>> observeGuildAndPrivateChannels() {
@@ -684,9 +684,9 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, List<Long>>> observeIds(boolean z2) {
-        Observable<Map<Long, List<Long>>> s2 = (z2 ? observeAllChannels() : observeGuildAndPrivateChannels()).G(StoreChannels$observeIds$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "channelsObservable\n     …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, List<Long>>> r = (z2 ? observeAllChannels() : observeGuildAndPrivateChannels()).F(StoreChannels$observeIds$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "channelsObservable\n     …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeInitializedForAuthedUser() {
@@ -694,9 +694,9 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, String>> observeNames() {
-        Observable<Map<Long, String>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeNames$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, String>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeNames$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, String>> observeNames(Collection<Long> collection) {
@@ -707,9 +707,9 @@ public final class StoreChannels extends StoreV2 {
     }
 
     public final Observable<Channel> observePrivateChannel(long j) {
-        Observable<Channel> s2 = observePrivateChannels().G(new StoreChannels$observePrivateChannel$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "observePrivateChannels()…  .distinctUntilChanged()");
-        return s2;
+        Observable<Channel> r = observePrivateChannels().F(new StoreChannels$observePrivateChannel$1(j)).r();
+        m.checkNotNullExpressionValue(r, "observePrivateChannels()…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Channel>> observePrivateChannels() {
@@ -718,9 +718,9 @@ public final class StoreChannels extends StoreV2 {
 
     public final Observable<Map<Long, Channel>> observeThreadsFromMessages(List<Message> list) {
         m.checkNotNullParameter(list, "messages");
-        Observable<Map<Long, Channel>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeThreadsFromMessages$1(this, list), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Channel>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeThreadsFromMessages$1(this, list), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final void onGroupCreated(Channel channel) {
@@ -760,14 +760,14 @@ public final class StoreChannels extends StoreV2 {
         Persister<List<Channel>> persister = this.channelsCache;
         ArrayList arrayList3 = new ArrayList();
         for (Object obj : arrayList) {
-            if (!flatten.contains(Long.valueOf(((Channel) obj).g()))) {
+            if (!flatten.contains(Long.valueOf(((Channel) obj).h()))) {
                 arrayList3.add(obj);
             }
         }
         Persister.set$default(persister, arrayList3, false, 2, null);
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList, 10)), 16));
         for (Object obj2 : arrayList) {
-            linkedHashMap.put(Long.valueOf(((Channel) obj2).g()), obj2);
+            linkedHashMap.put(Long.valueOf(((Channel) obj2).h()), obj2);
         }
         this.channelsByIdSnapshot = linkedHashMap;
         Map<Long, Map<Long, Channel>> map2 = this.channelsByGuild;
@@ -787,23 +787,23 @@ public final class StoreChannels extends StoreV2 {
     @StoreThread
     public final void storeThread$app_productionGoogleRelease(Channel channel, long j, Channel channel2) {
         Boolean bool;
-        boolean n;
+        boolean o;
         m.checkNotNullParameter(channel, "thread");
-        long e = channel.e() != 0 ? channel.e() : j;
+        long f = channel.f() != 0 ? channel.f() : j;
         if (channel2 != null) {
-            n = channel2.n();
+            o = channel2.o();
         } else {
-            Channel channelInternal$app_productionGoogleRelease = getChannelInternal$app_productionGoogleRelease(channel.e(), channel.q());
+            Channel channelInternal$app_productionGoogleRelease = getChannelInternal$app_productionGoogleRelease(channel.f(), channel.r());
             if (channelInternal$app_productionGoogleRelease != null) {
-                n = channelInternal$app_productionGoogleRelease.n();
+                o = channelInternal$app_productionGoogleRelease.o();
             } else {
                 bool = null;
-                this.threadsById.put(Long.valueOf(channel.g()), Channel.a(channel, null, 0, e, null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, bool == null ? bool.booleanValue() : channel.n(), 0, null, 0, null, null, null, null, null, null, null, 268304379));
-                this.channelNames.put(Long.valueOf(channel.g()), AnimatableValueParser.y0(channel));
+                this.threadsById.put(Long.valueOf(channel.h()), Channel.a(channel, null, 0, f, null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, bool == null ? bool.booleanValue() : channel.o(), 0, null, 0, null, null, null, null, null, null, null, null, 536739835));
+                this.channelNames.put(Long.valueOf(channel.h()), AnimatableValueParser.y0(channel));
             }
         }
-        bool = Boolean.valueOf(n);
-        this.threadsById.put(Long.valueOf(channel.g()), Channel.a(channel, null, 0, e, null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, bool == null ? bool.booleanValue() : channel.n(), 0, null, 0, null, null, null, null, null, null, null, 268304379));
-        this.channelNames.put(Long.valueOf(channel.g()), AnimatableValueParser.y0(channel));
+        bool = Boolean.valueOf(o);
+        this.threadsById.put(Long.valueOf(channel.h()), Channel.a(channel, null, 0, f, null, 0, 0, 0, null, null, 0, null, 0, 0, null, 0, 0, null, bool == null ? bool.booleanValue() : channel.o(), 0, null, 0, null, null, null, null, null, null, null, null, 536739835));
+        this.channelNames.put(Long.valueOf(channel.h()), AnimatableValueParser.y0(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
index 0e07cce83e..575af3967e 100644
--- a/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
+++ b/app/src/main/java/com/discord/stores/StoreChannelsSelected.java
@@ -294,7 +294,7 @@ public final class StoreChannelsSelected extends StoreV2 {
 
         public final long getId() {
             if (this instanceof Channel) {
-                return ((Channel) this).getChannel().g();
+                return ((Channel) this).getChannel().h();
             }
             if (this instanceof ThreadDraft) {
                 return -3;
@@ -612,7 +612,7 @@ public final class StoreChannelsSelected extends StoreV2 {
         ArrayList arrayList = new ArrayList();
         for (Object obj : values) {
             Channel channel = (Channel) obj;
-            if (channel.e() == j && AnimatableValueParser.j1(channel) && PermissionUtils.hasAccess(channel, map2)) {
+            if (channel.f() == j && AnimatableValueParser.k1(channel) && PermissionUtils.hasAccess(channel, map2)) {
                 arrayList.add(obj);
             }
         }
@@ -620,7 +620,7 @@ public final class StoreChannelsSelected extends StoreV2 {
     }
 
     private final boolean isValidResolution(Channel channel, long j, Map<Long, Long> map) {
-        return channel.e() == j && AnimatableValueParser.x1(channel) && PermissionUtils.hasAccess(channel, map);
+        return channel.f() == j && AnimatableValueParser.y1(channel) && PermissionUtils.hasAccess(channel, map);
     }
 
     @StoreThread
@@ -643,8 +643,8 @@ public final class StoreChannelsSelected extends StoreV2 {
         boolean z2 = resolvedSelectedChannel instanceof ResolvedSelectedChannel.Channel;
         if (z2) {
             ResolvedSelectedChannel.Channel channel = (ResolvedSelectedChannel.Channel) resolvedSelectedChannel;
-            this.userChannelSelections.put(Long.valueOf(channel.getChannel().e()), new UserChannelSelection.SelectedChannel(channel.getChannel().g(), null, null, 6, null));
-            FrecencyTracker.track$default(this.frecency, Long.valueOf(channel.getChannel().g()), 0, 2, null);
+            this.userChannelSelections.put(Long.valueOf(channel.getChannel().f()), new UserChannelSelection.SelectedChannel(channel.getChannel().h(), null, null, 6, null));
+            FrecencyTracker.track$default(this.frecency, Long.valueOf(channel.getChannel().h()), 0, 2, null);
         }
         if (z2) {
             ResolvedSelectedChannel.Channel channel2 = (ResolvedSelectedChannel.Channel) resolvedSelectedChannel;
@@ -689,9 +689,9 @@ public final class StoreChannelsSelected extends StoreV2 {
         Map<Long, Channel> channelsByIdInternal$app_productionGoogleRelease = this.storeChannels.getChannelsByIdInternal$app_productionGoogleRelease();
         boolean initializedForAuthedUser$app_productionGoogleRelease = this.storeChannels.getInitializedForAuthedUser$app_productionGoogleRelease();
         long selectedGuildIdInternal$app_productionGoogleRelease = this.storeGuildSelected.getSelectedGuildIdInternal$app_productionGoogleRelease();
-        Observable s2 = ObservableExtensionsKt.computationLatest(ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeGuildSelected, this.storeChannels, this.storePermissions}, false, null, null, new StoreChannelsSelected$validateSelectedChannel$1(this, this.userChannelSelections.get(Long.valueOf(selectedGuildIdInternal$app_productionGoogleRelease)), channelsByIdInternal$app_productionGoogleRelease, selectedGuildIdInternal$app_productionGoogleRelease, this.storePermissions.getPermissionsByChannelInternal$app_productionGoogleRelease(selectedGuildIdInternal$app_productionGoogleRelease), initializedForAuthedUser$app_productionGoogleRelease), 14, null)).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, StoreChannelsSelected.class, (Context) null, new StoreChannelsSelected$validateSelectedChannel$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreChannelsSelected$validateSelectedChannel$3(this), 58, (Object) null);
+        Observable r = ObservableExtensionsKt.computationLatest(ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeGuildSelected, this.storeChannels, this.storePermissions}, false, null, null, new StoreChannelsSelected$validateSelectedChannel$1(this, this.userChannelSelections.get(Long.valueOf(selectedGuildIdInternal$app_productionGoogleRelease)), channelsByIdInternal$app_productionGoogleRelease, selectedGuildIdInternal$app_productionGoogleRelease, this.storePermissions.getPermissionsByChannelInternal$app_productionGoogleRelease(selectedGuildIdInternal$app_productionGoogleRelease), initializedForAuthedUser$app_productionGoogleRelease), 14, null)).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, StoreChannelsSelected.class, (Context) null, new StoreChannelsSelected$validateSelectedChannel$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreChannelsSelected$validateSelectedChannel$3(this), 58, (Object) null);
     }
 
     @StoreThread
@@ -703,7 +703,7 @@ public final class StoreChannelsSelected extends StoreV2 {
         ResolvedSelectedChannel.ThreadDraft threadDraft = (ResolvedSelectedChannel.ThreadDraft) resolvedSelectedChannel;
         if (threadDraft != null) {
             Channel parentChannel = threadDraft.getParentChannel();
-            this.userChannelSelections.put(Long.valueOf(parentChannel.e()), new UserChannelSelection.SelectedChannel(parentChannel.g(), null, null, 6, null));
+            this.userChannelSelections.put(Long.valueOf(parentChannel.f()), new UserChannelSelection.SelectedChannel(parentChannel.h(), null, null, 6, null));
             validateSelectedChannel();
         }
     }
@@ -731,7 +731,7 @@ public final class StoreChannelsSelected extends StoreV2 {
     @StoreThread
     public final void handleChannelOrThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (channel.g() == this.selectedChannel.getId()) {
+        if (channel.h() == this.selectedChannel.getId()) {
             validateSelectedChannel();
         }
     }
@@ -739,7 +739,7 @@ public final class StoreChannelsSelected extends StoreV2 {
     @StoreThread
     public final void handleChannelOrThreadDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (channel.g() == this.selectedChannel.getId()) {
+        if (channel.h() == this.selectedChannel.getId()) {
             validateSelectedChannel();
         }
     }
@@ -803,9 +803,9 @@ public final class StoreChannelsSelected extends StoreV2 {
     }
 
     public final Observable<Boolean> observeInitializedForAuthedUser() {
-        Observable<R> Z = this.storeChannels.observeInitializedForAuthedUser().Z(new StoreChannelsSelected$observeInitializedForAuthedUser$1(this));
-        m.checkNotNullExpressionValue(Z, "storeChannels.observeIni…            }\n          }");
-        return Z;
+        Observable<R> Y = this.storeChannels.observeInitializedForAuthedUser().Y(new StoreChannelsSelected$observeInitializedForAuthedUser$1(this));
+        m.checkNotNullExpressionValue(Y, "storeChannels.observeIni…            }\n          }");
+        return Y;
     }
 
     public final Observable<Long> observePreviousId() {
diff --git a/app/src/main/java/com/discord/stores/StoreChat.java b/app/src/main/java/com/discord/stores/StoreChat.java
index 06f579f023..b8bf1ab5b9 100644
--- a/app/src/main/java/com/discord/stores/StoreChat.java
+++ b/app/src/main/java/com/discord/stores/StoreChat.java
@@ -3,7 +3,7 @@ package com.discord.stores;
 import a0.a.a.b;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
@@ -389,7 +389,7 @@ public final class StoreChat extends StoreV2 {
         this.observationDeck = observationDeck;
         this.expandedBlockedMessageGroups = new ArrayList();
         this.expandedBlockedMessageGroupsSnapshot = n.emptyList();
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -444,9 +444,9 @@ public final class StoreChat extends StoreV2 {
     }
 
     public final Observable<EditingMessage> observeEditingMessage() {
-        Observable<EditingMessage> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeEditingMessage$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<EditingMessage> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeEditingMessage$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Event> observeEvents() {
@@ -456,17 +456,17 @@ public final class StoreChat extends StoreV2 {
     }
 
     public final Observable<List<Long>> observeExpandedBlockedMessageIds() {
-        Observable<List<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeExpandedBlockedMessageIds$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<List<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeExpandedBlockedMessageIds$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<InteractionState> observeInteractionState() {
-        Observable G = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeInteractionState$1(this), 14, null).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable<InteractionState> s2 = G.s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable F = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChat$observeInteractionState$1(this), 14, null).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable<InteractionState> r = F.r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void replaceChatText(String str) {
diff --git a/app/src/main/java/com/discord/stores/StoreClientDataState.java b/app/src/main/java/com/discord/stores/StoreClientDataState.java
index 87828328b3..42a05487b6 100644
--- a/app/src/main/java/com/discord/stores/StoreClientDataState.java
+++ b/app/src/main/java/com/discord/stores/StoreClientDataState.java
@@ -8,7 +8,7 @@ import com.discord.api.guild.Guild;
 import com.discord.api.guildhash.GuildHash;
 import com.discord.api.guildhash.GuildHashes;
 import com.discord.api.message.Message;
-import com.discord.api.sticker.GuildStickerUpdate;
+import com.discord.api.sticker.GuildStickersUpdate;
 import com.discord.gateway.io.OutgoingPayload;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.models.domain.ModelPayload;
@@ -237,13 +237,13 @@ public final class StoreClientDataState extends StoreV2 {
     @StoreThread
     public final void handleChannelCreateOrUpdateOrDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        GuildHashes d = channel.d();
-        if (d != null && GuildHashUtilsKt.isSupported(d)) {
+        GuildHashes e = channel.e();
+        if (e != null && GuildHashUtilsKt.isSupported(e)) {
             Map<Long, GuildHashes> map = this.guildHashes;
-            Long valueOf = Long.valueOf(channel.e());
-            GuildHashes d2 = channel.d();
-            m.checkNotNull(d2);
-            map.put(valueOf, d2);
+            Long valueOf = Long.valueOf(channel.f());
+            GuildHashes e2 = channel.e();
+            m.checkNotNull(e2);
+            map.put(valueOf, e2);
             markChanged();
         }
     }
@@ -258,12 +258,12 @@ public final class StoreClientDataState extends StoreV2 {
             List<Channel> g = guild.g();
             if (g != null) {
                 for (Channel channel : g) {
-                    updateHighestLastMessageId(channel.h());
+                    updateHighestLastMessageId(channel.i());
                 }
             }
         }
         for (Channel channel2 : modelPayload.getPrivateChannels()) {
-            updateHighestLastMessageId(channel2.h());
+            updateHighestLastMessageId(channel2.i());
         }
         ModelPayload.VersionedReadStates readState = modelPayload.getReadState();
         m.checkNotNullExpressionValue(readState, "payload.readState");
@@ -318,7 +318,7 @@ public final class StoreClientDataState extends StoreV2 {
     @StoreThread
     public final void handleMessageCreate(Message message) {
         m.checkNotNullParameter(message, "message");
-        updateHighestLastMessageId(message.r());
+        updateHighestLastMessageId(message.o());
         markChanged();
     }
 
@@ -331,10 +331,10 @@ public final class StoreClientDataState extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleStickersUpdate(GuildStickerUpdate guildStickerUpdate) {
-        m.checkNotNullParameter(guildStickerUpdate, "payload");
-        if (GuildHashUtilsKt.isSupported(guildStickerUpdate.a())) {
-            this.guildHashes.put(Long.valueOf(guildStickerUpdate.b()), guildStickerUpdate.a());
+    public final void handleStickersUpdate(GuildStickersUpdate guildStickersUpdate) {
+        m.checkNotNullParameter(guildStickersUpdate, "payload");
+        if (GuildHashUtilsKt.isSupported(guildStickersUpdate.a())) {
+            this.guildHashes.put(Long.valueOf(guildStickersUpdate.b()), guildStickersUpdate.a());
             markChanged();
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java
index 559cef62a3..e526eb5158 100644
--- a/app/src/main/java/com/discord/stores/StoreClientVersion.java
+++ b/app/src/main/java/com/discord/stores/StoreClientVersion.java
@@ -14,8 +14,8 @@ import rx.subjects.SerializedSubject;
 public final class StoreClientVersion extends Store {
     private int clientMinVersion;
     private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY";
-    private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE));
-    private final int clientVersion = 81014;
+    private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
+    private final int clientVersion = 82019;
 
     public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
         storeClientVersion.setClientMinVersion(i);
@@ -33,9 +33,9 @@ public final class StoreClientVersion extends Store {
     }
 
     public final Observable<Boolean> getClientOutdated() {
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationLatest(this.clientOutdatedSubject).s();
-        m.checkNotNullExpressionValue(s2, "clientOutdatedSubject\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservableExtensionsKt.computationLatest(this.clientOutdatedSubject).r();
+        m.checkNotNullExpressionValue(r, "clientOutdatedSubject\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.Store
@@ -45,8 +45,8 @@ public final class StoreClientVersion extends Store {
         int i = getPrefs().getInt(this.clientMinVersionKey, 0);
         this.clientMinVersion = i;
         setClientMinVersion(i);
-        Observable<R> A = Observable.E(0, 1, TimeUnit.HOURS).A(StoreClientVersion$init$1.INSTANCE);
-        m.checkNotNullExpressionValue(A, "Observable\n        .inte…ClientVersion()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(A), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreClientVersion$init$2(this), 62, (Object) null);
+        Observable<R> z2 = Observable.D(0, 1, TimeUnit.HOURS).z(StoreClientVersion$init$1.INSTANCE);
+        m.checkNotNullExpressionValue(z2, "Observable\n        .inte…ClientVersion()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(z2), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreClientVersion$init$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java
index 61053d2f87..af24f64323 100644
--- a/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java
+++ b/app/src/main/java/com/discord/stores/StoreCollapsedChannelCategories.java
@@ -102,7 +102,7 @@ public final class StoreCollapsedChannelCategories extends StoreV2 {
                 List<Channel> g = guild.g();
                 if (g != null) {
                     for (Channel channel : g) {
-                        hashSet2.remove(Long.valueOf(channel.g()));
+                        hashSet2.remove(Long.valueOf(channel.h()));
                     }
                 }
                 for (Long l : hashSet2) {
@@ -129,9 +129,9 @@ public final class StoreCollapsedChannelCategories extends StoreV2 {
     }
 
     public final Observable<Set<Long>> observeCollapsedCategories(long j) {
-        Observable<Set<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreCollapsedChannelCategories$observeCollapsedCategories$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreCollapsedChannelCategories$observeCollapsedCategories$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setCollapsedCategory(long j, long j2, boolean z2) {
diff --git a/app/src/main/java/com/discord/stores/StoreConnectivity.java b/app/src/main/java/com/discord/stores/StoreConnectivity.java
index 885848193c..3d42802a10 100644
--- a/app/src/main/java/com/discord/stores/StoreConnectivity.java
+++ b/app/src/main/java/com/discord/stores/StoreConnectivity.java
@@ -285,8 +285,8 @@ public final class StoreConnectivity extends StoreV2 {
     }
 
     public final Observable<DelayedState> observeState() {
-        Observable<DelayedState> s2 = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreConnectivity$observeState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "ObservationDeckProvider\n…  .distinctUntilChanged()");
-        return s2;
+        Observable<DelayedState> r = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreConnectivity$observeState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "ObservationDeckProvider\n…  .distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreContactSync.java b/app/src/main/java/com/discord/stores/StoreContactSync.java
index 5c42345eb9..57991b00ee 100644
--- a/app/src/main/java/com/discord/stores/StoreContactSync.java
+++ b/app/src/main/java/com/discord/stores/StoreContactSync.java
@@ -94,10 +94,6 @@ public final class StoreContactSync extends StoreV2 {
         return m.areEqual(this.dismissState.get("CONTACT_SYNC_DISMISS_FRIENDS_UPSELL"), Boolean.TRUE);
     }
 
-    public final boolean getShouldTryUploadContacts() {
-        return this.shouldTryUploadContacts;
-    }
-
     @StoreThread
     public final void handleConnectionOpen() {
         this.dispatcher.schedule(new StoreContactSync$handleConnectionOpen$1(this));
diff --git a/app/src/main/java/com/discord/stores/StoreDynamicLink.java b/app/src/main/java/com/discord/stores/StoreDynamicLink.java
index 51ada24414..daf5cb6028 100644
--- a/app/src/main/java/com/discord/stores/StoreDynamicLink.java
+++ b/app/src/main/java/com/discord/stores/StoreDynamicLink.java
@@ -174,9 +174,9 @@ public final class StoreDynamicLink {
     private final Observable<Uri> getDynamicLinkObservable(Intent intent) {
         Observable n = Observable.n(new StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1(intent), Emitter.BackpressureMode.BUFFER);
         m.checkNotNullExpressionValue(n, "Observable.create({\n    ….BackpressureMode.BUFFER)");
-        Observable<Uri> M = Observable.I(new j(Uri.EMPTY).q(1000, TimeUnit.MILLISECONDS), n).M(StoreDynamicLink$getDynamicLinkObservable$1.INSTANCE);
-        m.checkNotNullExpressionValue(M, "Observable\n        .merg…ErrorReturn { Uri.EMPTY }");
-        return M;
+        Observable<Uri> L = Observable.H(new j(Uri.EMPTY).q(1000, TimeUnit.MILLISECONDS), n).L(StoreDynamicLink$getDynamicLinkObservable$1.INSTANCE);
+        m.checkNotNullExpressionValue(L, "Observable\n        .merg…ErrorReturn { Uri.EMPTY }");
+        return L;
     }
 
     private final void handleDataReceived(DynamicLinkData dynamicLinkData, Context context) {
@@ -199,10 +199,10 @@ public final class StoreDynamicLink {
     public final void storeLinkIfExists(Intent intent, Context context) {
         m.checkNotNullParameter(intent, "intent");
         m.checkNotNullParameter(context, "context");
-        Observable<R> G = getDynamicLinkObservable(intent).G(StoreDynamicLink$storeLinkIfExists$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "getDynamicLinkObservable…ode, authToken)\n        }");
-        Observable u = ObservableExtensionsKt.computationBuffered(G).s().u(StoreDynamicLink$storeLinkIfExists$2.INSTANCE);
-        m.checkNotNullExpressionValue(u, "getDynamicLinkObservable…  )\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(u, StoreDynamicLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreDynamicLink$storeLinkIfExists$3(this, context), 62, (Object) null);
+        Observable<R> F = getDynamicLinkObservable(intent).F(StoreDynamicLink$storeLinkIfExists$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "getDynamicLinkObservable…ode, authToken)\n        }");
+        Observable t = ObservableExtensionsKt.computationBuffered(F).r().t(StoreDynamicLink$storeLinkIfExists$2.INSTANCE);
+        m.checkNotNullExpressionValue(t, "getDynamicLinkObservable…  )\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(t, StoreDynamicLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreDynamicLink$storeLinkIfExists$3(this, context), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java b/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java
index 885b6fbdd4..e3602673a5 100644
--- a/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java
+++ b/app/src/main/java/com/discord/stores/StoreEmoji$getEmojiSet$4.java
@@ -71,6 +71,6 @@ public final class StoreEmoji$getEmojiSet$4<T, R> implements b<Quad<? extends Bo
     }
 
     public final Observable<? extends EmojiSet> call(Quad<Boolean, Boolean, ? extends List<Long>, ? extends Set<? extends StoreMediaFavorites.Favorite>> quad) {
-        return StoreEmoji.access$getCustomEmojiStore$p(this.this$0).observeAllowedGuildEmoji().G(new AnonymousClass1(this, (List) quad.component3(), quad.component1(), quad.component2(), (Set) quad.component4()));
+        return StoreEmoji.access$getCustomEmojiStore$p(this.this$0).observeAllowedGuildEmoji().F(new AnonymousClass1(this, (List) quad.component3(), quad.component1(), quad.component2(), (Set) quad.component4()));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreEmoji.java b/app/src/main/java/com/discord/stores/StoreEmoji.java
index fe7fcd3095..8fb683fe26 100644
--- a/app/src/main/java/com/discord/stores/StoreEmoji.java
+++ b/app/src/main/java/com/discord/stores/StoreEmoji.java
@@ -201,7 +201,7 @@ public final class StoreEmoji implements Rules.EmojiDataProvider {
         this.permissionsStore = storePermissions;
         this.sortedGuildsStore = storeGuildsSorted;
         this.mediaFavoritesStore = storeMediaFavorites;
-        Persister<MediaFrecencyTracker> persister = new Persister<>("EMOJI_HISTORY_V4", new MediaFrecencyTracker());
+        Persister<MediaFrecencyTracker> persister = new Persister<>("EMOJI_HISTORY_V4", new MediaFrecencyTracker(0, 0, 3, null));
         this.frecencyCache = persister;
         this.frecency = persister.get();
     }
@@ -416,16 +416,16 @@ public final class StoreEmoji implements Rules.EmojiDataProvider {
         if (emojiContext instanceof EmojiContext.Chat) {
             EmojiContext.Chat chat = (EmojiContext.Chat) emojiContext;
             if (chat.getGuildId() != 0) {
-                observable = this.permissionsStore.observePermissionsForChannel(chat.getChannelId()).G(StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.INSTANCE);
-                Observable<EmojiSet> Z = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).G(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().G(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).s().Z(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
-                m.checkNotNullExpressionValue(Z, "Observable\n        .comb…              }\n        }");
-                return Z;
+                observable = this.permissionsStore.observePermissionsForChannel(chat.getChannelId()).F(StoreEmoji$getEmojiSet$hasExternalEmojiPermissionObservable$1.INSTANCE);
+                Observable<EmojiSet> Y = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).F(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().F(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).r().Y(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
+                m.checkNotNullExpressionValue(Y, "Observable\n        .comb…              }\n        }");
+                return Y;
             }
         }
         observable = new j(Boolean.TRUE);
-        Observable<EmojiSet> Z = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).G(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().G(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).s().Z(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
-        m.checkNotNullExpressionValue(Z, "Observable\n        .comb…              }\n        }");
-        return Z;
+        Observable<EmojiSet> Y = Observable.h(StoreUser.observeMe$default(this.userStore, false, 1, null).F(StoreEmoji$getEmojiSet$1.INSTANCE), observable, this.sortedGuildsStore.observeOrderedGuilds().F(StoreEmoji$getEmojiSet$2.INSTANCE), this.mediaFavoritesStore.observeFavorites(StoreMediaFavorites.Favorite.Companion.getEmojiTypes()), StoreEmoji$getEmojiSet$3.INSTANCE).r().Y(new StoreEmoji$getEmojiSet$4(this, emojiContext, z3, z2));
+        m.checkNotNullExpressionValue(Y, "Observable\n        .comb…              }\n        }");
+        return Y;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map<java.lang.String, ? extends com.discord.models.domain.emoji.ModelEmojiUnicode>, java.util.Map<java.lang.String, com.discord.models.domain.emoji.ModelEmojiUnicode> */
diff --git a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java
index b312da98f6..d919df4441 100644
--- a/app/src/main/java/com/discord/stores/StoreEmojiCustom.java
+++ b/app/src/main/java/com/discord/stores/StoreEmojiCustom.java
@@ -33,7 +33,7 @@ public final class StoreEmojiCustom extends StoreV2 {
     private final Map<Long, Map<Long, Map<Long, ModelEmojiCustom>>> allowedGuildEmojis = new LinkedHashMap();
 
     /* renamed from: me  reason: collision with root package name */
-    private long f2096me;
+    private long f2102me;
     private final StoreStream stream;
 
     /* compiled from: StoreEmojiCustom.kt */
@@ -125,7 +125,7 @@ public final class StoreEmojiCustom extends StoreV2 {
     @StoreThread
     public final void handleConnectionOpen(ModelPayload modelPayload) {
         m.checkNotNullParameter(modelPayload, "payload");
-        this.f2096me = modelPayload.getMe().i();
+        this.f2102me = modelPayload.getMe().i();
         for (Guild guild : modelPayload.getGuilds()) {
             m.checkNotNullExpressionValue(guild, "guild");
             handleGuildAdd(guild);
@@ -143,7 +143,7 @@ public final class StoreEmojiCustom extends StoreV2 {
         for (GuildEmoji guildEmoji : a) {
             arrayList.add(new ModelEmojiCustom(guildEmoji, c2));
         }
-        if (!(map == null || (guildMember = map.get(Long.valueOf(this.f2096me))) == null)) {
+        if (!(map == null || (guildMember = map.get(Long.valueOf(this.f2102me))) == null)) {
             updateGlobalEmojis(c2, arrayList);
             updateAllowedGuildEmojis(c2, guildMember.getRoles(), arrayList);
         }
@@ -166,7 +166,7 @@ public final class StoreEmojiCustom extends StoreV2 {
                 break;
             }
             obj = it.next();
-            if (((com.discord.api.guildmember.GuildMember) obj).j().i() == this.f2096me) {
+            if (((com.discord.api.guildmember.GuildMember) obj).j().i() == this.f2102me) {
                 z2 = true;
                 continue;
             } else {
@@ -200,7 +200,7 @@ public final class StoreEmojiCustom extends StoreV2 {
     public final void handleGuildMemberAdd(com.discord.api.guildmember.GuildMember guildMember) {
         Collection<ModelEmojiCustom> values;
         m.checkNotNullParameter(guildMember, "member");
-        if (guildMember.j().i() == this.f2096me) {
+        if (guildMember.j().i() == this.f2102me) {
             long c2 = guildMember.c();
             Map<Long, ModelEmojiCustom> map = this.allGuildEmoji.get(Long.valueOf(c2));
             if (map != null && (values = map.values()) != null) {
diff --git a/app/src/main/java/com/discord/stores/StoreEmojiGuild.java b/app/src/main/java/com/discord/stores/StoreEmojiGuild.java
index 7c41f7121f..c3905857e3 100644
--- a/app/src/main/java/com/discord/stores/StoreEmojiGuild.java
+++ b/app/src/main/java/com/discord/stores/StoreEmojiGuild.java
@@ -85,9 +85,9 @@ public final class StoreEmojiGuild extends StoreV2 {
     }
 
     public final Observable<List<ModelEmojiGuild>> observeGuildEmoji(long j) {
-        Observable<List<ModelEmojiGuild>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreEmojiGuild$observeGuildEmoji$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<List<ModelEmojiGuild>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreEmojiGuild$observeGuildEmoji$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreExperiments.java b/app/src/main/java/com/discord/stores/StoreExperiments.java
index b73cbea9c3..ad2b3a6bb6 100644
--- a/app/src/main/java/com/discord/stores/StoreExperiments.java
+++ b/app/src/main/java/com/discord/stores/StoreExperiments.java
@@ -349,9 +349,9 @@ public final class StoreExperiments extends StoreV2 {
                 setInitialized();
                 return;
             }
-            Observable d02 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getExperiments(), false, 1, null).d0(2000, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(d02, "RestAPI\n          .api\n …0, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(d02, StoreExperiments.class, (Context) null, (Function1) null, new StoreExperiments$tryInitializeExperiments$2(this), (Function0) null, (Function0) null, new StoreExperiments$tryInitializeExperiments$1(this), 54, (Object) null);
+            Observable c02 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getExperiments(), false, 1, null).c0(2000, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(c02, "RestAPI\n          .api\n …0, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(c02, StoreExperiments.class, (Context) null, (Function1) null, new StoreExperiments$tryInitializeExperiments$2(this), (Function0) null, (Function0) null, new StoreExperiments$tryInitializeExperiments$1(this), 54, (Object) null);
         }
     }
 
@@ -482,9 +482,9 @@ public final class StoreExperiments extends StoreV2 {
 
     public final Observable<Experiment> observeUserExperiment(String str, boolean z2) {
         m.checkNotNullParameter(str, "name");
-        Observable<Experiment> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExperiments$observeUserExperiment$1(this, str, z2), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Experiment> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExperiments$observeUserExperiment$1(this, str, z2), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setOverride(String str, int i) {
diff --git a/app/src/main/java/com/discord/stores/StoreExpressionPickerNavigation.java b/app/src/main/java/com/discord/stores/StoreExpressionPickerNavigation.java
index ecd0a08dc1..9914c72add 100644
--- a/app/src/main/java/com/discord/stores/StoreExpressionPickerNavigation.java
+++ b/app/src/main/java/com/discord/stores/StoreExpressionPickerNavigation.java
@@ -31,9 +31,9 @@ public final class StoreExpressionPickerNavigation extends StoreV2 {
     }
 
     public final Observable<ExpressionTrayTab> observeSelectedTab() {
-        Observable<ExpressionTrayTab> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExpressionPickerNavigation$observeSelectedTab$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<ExpressionTrayTab> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExpressionPickerNavigation$observeSelectedTab$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void onSelectTab(ExpressionTrayTab expressionTrayTab) {
diff --git a/app/src/main/java/com/discord/stores/StoreExpressionSuggestions.java b/app/src/main/java/com/discord/stores/StoreExpressionSuggestions.java
index 10867b03d7..06741f1c0d 100644
--- a/app/src/main/java/com/discord/stores/StoreExpressionSuggestions.java
+++ b/app/src/main/java/com/discord/stores/StoreExpressionSuggestions.java
@@ -57,9 +57,9 @@ public final class StoreExpressionSuggestions extends StoreV2 {
     }
 
     public final Observable<Boolean> observeSuggestionsEnabled() {
-        Observable<Boolean> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExpressionSuggestions$observeSuggestionsEnabled$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreExpressionSuggestions$observeSuggestionsEnabled$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void setExpressionSuggestionsEnabled(boolean z2) {
diff --git a/app/src/main/java/com/discord/stores/StoreGameParty.java b/app/src/main/java/com/discord/stores/StoreGameParty.java
index 8d27855c4d..9f8db3f9fc 100644
--- a/app/src/main/java/com/discord/stores/StoreGameParty.java
+++ b/app/src/main/java/com/discord/stores/StoreGameParty.java
@@ -5,11 +5,16 @@ import com.discord.api.activity.ActivityParty;
 import com.discord.api.guild.Guild;
 import com.discord.api.presence.ClientStatus;
 import com.discord.api.presence.Presence;
+import com.discord.api.thread.AugmentedThreadMember;
+import com.discord.api.thread.ThreadListMember;
+import com.discord.api.thread.ThreadMemberListUpdate;
+import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.User;
 import com.discord.models.domain.ModelPayload;
 import com.discord.stores.updates.ObservationDeck;
 import d0.t.n;
 import d0.z.d.m;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -208,10 +213,46 @@ public final class StoreGameParty extends StoreV2 {
         updateParty(presence, j);
     }
 
+    @StoreThread
+    public final void handleThreadMemberListUpdate(ThreadMemberListUpdate threadMemberListUpdate) {
+        m.checkNotNullParameter(threadMemberListUpdate, "threadMemberListUpdate");
+        List<ThreadListMember> b = threadMemberListUpdate.b();
+        if (b != null) {
+            ArrayList<Presence> arrayList = new ArrayList();
+            for (ThreadListMember threadListMember : b) {
+                Presence b2 = threadListMember.b();
+                if (b2 != null) {
+                    arrayList.add(b2);
+                }
+            }
+            for (Presence presence : arrayList) {
+                updateParty(presence, threadMemberListUpdate.a());
+            }
+        }
+    }
+
+    @StoreThread
+    public final void handleThreadMembersUpdate(ThreadMembersUpdate threadMembersUpdate) {
+        m.checkNotNullParameter(threadMembersUpdate, "threadMembersUpdate");
+        List<AugmentedThreadMember> a = threadMembersUpdate.a();
+        if (a != null) {
+            ArrayList<Presence> arrayList = new ArrayList();
+            for (AugmentedThreadMember augmentedThreadMember : a) {
+                Presence d = augmentedThreadMember.d();
+                if (d != null) {
+                    arrayList.add(d);
+                }
+            }
+            for (Presence presence : arrayList) {
+                updateParty(presence, threadMembersUpdate.b());
+            }
+        }
+    }
+
     public final Observable<Map<Long, com.discord.models.user.User>> observeUsersForPartyId(String str) {
-        Observable<Map<Long, com.discord.models.user.User>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, StoreUser.Companion.getUsersUpdate()}, false, null, null, new StoreGameParty$observeUsersForPartyId$1(this, str), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, com.discord.models.user.User>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, StoreUser.Companion.getUsersUpdate()}, false, null, null, new StoreGameParty$observeUsersForPartyId$1(this, str), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
index e64c54dc0f..eff9dd279f 100644
--- a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java
@@ -26,7 +26,8 @@ import com.discord.api.role.GuildRoleCreate;
 import com.discord.api.role.GuildRoleDelete;
 import com.discord.api.role.GuildRoleUpdate;
 import com.discord.api.stageinstance.StageInstance;
-import com.discord.api.sticker.GuildStickerUpdate;
+import com.discord.api.sticker.GuildStickersUpdate;
+import com.discord.api.thread.ThreadMemberListUpdate;
 import com.discord.api.thread.ThreadMemberUpdate;
 import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.TypingUser;
@@ -124,7 +125,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
     private final SerializedSubject<GuildRoleCreate, GuildRoleCreate> guildRoleCreate;
     private final SerializedSubject<GuildRoleDelete, GuildRoleDelete> guildRoleDelete;
     private final SerializedSubject<GuildRoleUpdate, GuildRoleUpdate> guildRoleUpdate;
-    private final SerializedSubject<GuildStickerUpdate, GuildStickerUpdate> guildStickersUpdate;
+    private final SerializedSubject<GuildStickersUpdate, GuildStickersUpdate> guildStickersUpdate;
     private final SerializedSubject<Guild, Guild> guildUpdate;
     private final SerializedSubject<InteractionStateUpdate, InteractionStateUpdate> interactionCreate;
     private final SerializedSubject<InteractionStateUpdate, InteractionStateUpdate> interactionFailure;
@@ -156,6 +157,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
     private final SerializedSubject<Channel, Channel> threadCreateOrUpdate;
     private final SerializedSubject<Channel, Channel> threadDelete;
     private final SerializedSubject<ModelThreadListSync, ModelThreadListSync> threadListSync;
+    private final SerializedSubject<ThreadMemberListUpdate, ThreadMemberListUpdate> threadMemberListUpdate;
     private final SerializedSubject<ThreadMemberUpdate, ThreadMemberUpdate> threadMemberUpdate;
     private final SerializedSubject<ThreadMembersUpdate, ThreadMembersUpdate> threadMembersUpdate;
     private final SerializedSubject<TypingUser, TypingUser> typingStart;
@@ -205,14 +207,14 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
                 Observable<Boolean> a = d.d.a();
                 Observable<String> authedToken$app_productionGoogleRelease = storeStream.getAuthentication$app_productionGoogleRelease().getAuthedToken$app_productionGoogleRelease();
                 Observable<Long> observeSelectedVoiceChannelId = storeStream.getVoiceChannelSelected$app_productionGoogleRelease().observeSelectedVoiceChannelId();
-                n nVar = n.f45c;
-                Observable s2 = n.b.G(c.a.d.m.i).s();
-                m.checkNotNullExpressionValue(s2, "numGatewayConnectionCons…  .distinctUntilChanged()");
-                Observable g = Observable.g(a, authedToken$app_productionGoogleRelease, observeSelectedVoiceChannelId, s2, storeStream.getClientDataState$app_productionGoogleRelease().observeClientState(), new StoreGatewayConnection$sam$rx_functions_Func5$0(new StoreGatewayConnection$ClientState$Companion$initialize$1(this)));
+                n nVar = n.f44c;
+                Observable r = n.b.F(c.a.d.m.i).r();
+                m.checkNotNullExpressionValue(r, "numGatewayConnectionCons…  .distinctUntilChanged()");
+                Observable g = Observable.g(a, authedToken$app_productionGoogleRelease, observeSelectedVoiceChannelId, r, storeStream.getClientDataState$app_productionGoogleRelease().observeClientState(), new StoreGatewayConnection$sam$rx_functions_Func5$0(new StoreGatewayConnection$ClientState$Companion$initialize$1(this)));
                 m.checkNotNullExpressionValue(g, "Observable\n            .…   ::create\n            )");
-                Observable J = ObservableExtensionsKt.computationLatest(g).J(scheduler);
-                m.checkNotNullExpressionValue(J, "Observable\n            .…    .observeOn(scheduler)");
-                ObservableExtensionsKt.appSubscribe$default(J, (Context) null, "clientState", (Function1) null, function1, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+                Observable I = ObservableExtensionsKt.computationLatest(g).I(scheduler);
+                m.checkNotNullExpressionValue(I, "Observable\n            .…    .observeOn(scheduler)");
+                ObservableExtensionsKt.appSubscribe$default(I, (Context) null, "clientState", (Function1) null, function1, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
             }
         }
 
@@ -339,74 +341,75 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
         BatchManager batchManager = new BatchManager(v0Var, null, 2, null);
         this.batches = batchManager;
         Boolean bool = Boolean.FALSE;
-        this.connected = new SerializedSubject<>(BehaviorSubject.m0(bool));
-        this.connectionReady = new SerializedSubject<>(BehaviorSubject.m0(bool));
-        this.callCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.callDelete = new SerializedSubject<>(BehaviorSubject.l0());
-        this.channelCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.channelDeleted = new SerializedSubject<>(BehaviorSubject.l0());
-        this.channelRecipientAdd = new SerializedSubject<>(BehaviorSubject.l0());
-        this.channelRecipientRemove = new SerializedSubject<>(BehaviorSubject.l0());
-        this.channelUnreadUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildApplicationCommands = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildBanAdd = new SerializedSubject<>(PublishSubject.l0());
-        this.guildBanRemove = new SerializedSubject<>(PublishSubject.l0());
-        this.guildCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildEmojisUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildStickersUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildDeleted = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildMembersAdd = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildMembersChunk = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildMemberRemove = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildJoinRequestCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildRoleCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildRoleUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildRoleDelete = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildIntegrationsUpdate = new SerializedSubject<>(PublishSubject.l0());
-        this.messageAck = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageDelete = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageReactionAdd = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageReactionRemove = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageReactionRemoveEmoji = new SerializedSubject<>(BehaviorSubject.l0());
-        this.messageReactionRemoveAll = new SerializedSubject<>(BehaviorSubject.l0());
-        this.presenceUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.presenceReplace = new SerializedSubject<>(BehaviorSubject.l0());
-        this.ready = new SerializedSubject<>(BehaviorSubject.l0());
-        this.relationshipAdd = new SerializedSubject<>(BehaviorSubject.l0());
-        this.relationshipRemove = new SerializedSubject<>(BehaviorSubject.l0());
-        this.typingStart = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userConnectionUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userSettingsUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userGuildSettingsUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userNoteUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userRequiredActionUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.sessionsReplace = new SerializedSubject<>(BehaviorSubject.l0());
+        this.connected = new SerializedSubject<>(BehaviorSubject.l0(bool));
+        this.connectionReady = new SerializedSubject<>(BehaviorSubject.l0(bool));
+        this.callCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.callDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelDeleted = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelRecipientAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelRecipientRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.channelUnreadUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildApplicationCommands = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildBanAdd = new SerializedSubject<>(PublishSubject.k0());
+        this.guildBanRemove = new SerializedSubject<>(PublishSubject.k0());
+        this.guildCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildEmojisUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildStickersUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildDeleted = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMembersAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMembersChunk = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMemberRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildJoinRequestCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildRoleCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildRoleUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildRoleDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildIntegrationsUpdate = new SerializedSubject<>(PublishSubject.k0());
+        this.messageAck = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionRemoveEmoji = new SerializedSubject<>(BehaviorSubject.k0());
+        this.messageReactionRemoveAll = new SerializedSubject<>(BehaviorSubject.k0());
+        this.presenceUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.presenceReplace = new SerializedSubject<>(BehaviorSubject.k0());
+        this.ready = new SerializedSubject<>(BehaviorSubject.k0());
+        this.relationshipAdd = new SerializedSubject<>(BehaviorSubject.k0());
+        this.relationshipRemove = new SerializedSubject<>(BehaviorSubject.k0());
+        this.typingStart = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userConnectionUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userSettingsUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userGuildSettingsUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userNoteUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userRequiredActionUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.sessionsReplace = new SerializedSubject<>(BehaviorSubject.k0());
         this.voiceStateUpdate = BatchManager.createBatched$default(batchManager, "VOICE_STATE_UPDATE", 0, 0, 6, null);
-        this.voiceServerUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.guildMemberListUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userPaymentSourcesUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.userSubscriptionsUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.streamCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.streamUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.streamServerUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.streamDelete = new SerializedSubject<>(BehaviorSubject.l0());
-        this.threadCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.threadDelete = new SerializedSubject<>(BehaviorSubject.l0());
-        this.threadListSync = new SerializedSubject<>(BehaviorSubject.l0());
-        this.threadMemberUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.threadMembersUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.interactionCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.interactionSuccess = new SerializedSubject<>(BehaviorSubject.l0());
-        this.interactionFailure = new SerializedSubject<>(BehaviorSubject.l0());
-        this.stageInstanceCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.stageInstanceUpdate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.stageInstanceDelete = new SerializedSubject<>(BehaviorSubject.l0());
-        this.friendSuggestionCreate = new SerializedSubject<>(BehaviorSubject.l0());
-        this.friendSuggestionDelete = new SerializedSubject<>(BehaviorSubject.l0());
+        this.voiceServerUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.guildMemberListUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userPaymentSourcesUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.userSubscriptionsUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamServerUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.streamDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadCreateOrUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadListSync = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadMemberUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadMembersUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.threadMemberListUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.interactionCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.interactionSuccess = new SerializedSubject<>(BehaviorSubject.k0());
+        this.interactionFailure = new SerializedSubject<>(BehaviorSubject.k0());
+        this.stageInstanceCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.stageInstanceUpdate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.stageInstanceDelete = new SerializedSubject<>(BehaviorSubject.k0());
+        this.friendSuggestionCreate = new SerializedSubject<>(BehaviorSubject.k0());
+        this.friendSuggestionDelete = new SerializedSubject<>(BehaviorSubject.k0());
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -556,15 +559,15 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
     }
 
     public final Observable<Boolean> getConnected() {
-        Observable<Boolean> s2 = this.connected.s();
-        m.checkNotNullExpressionValue(s2, "connected.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = this.connected.r();
+        m.checkNotNullExpressionValue(r, "connected.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> getConnectionReady() {
-        Observable<Boolean> s2 = this.connectionReady.s();
-        m.checkNotNullExpressionValue(s2, "connectionReady.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = this.connectionReady.r();
+        m.checkNotNullExpressionValue(r, "connectionReady.distinctUntilChanged()");
+        return r;
     }
 
     public final ExecutorCoroutineDispatcher getCoroutineDispatcher() {
@@ -639,7 +642,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
         return this.guildRoleUpdate;
     }
 
-    public final SerializedSubject<GuildStickerUpdate, GuildStickerUpdate> getGuildStickersUpdate() {
+    public final SerializedSubject<GuildStickersUpdate, GuildStickersUpdate> getGuildStickersUpdate() {
         return this.guildStickersUpdate;
     }
 
@@ -755,6 +758,10 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
         return this.threadListSync;
     }
 
+    public final SerializedSubject<ThreadMemberListUpdate, ThreadMemberListUpdate> getThreadMemberListUpdate() {
+        return this.threadMemberListUpdate;
+    }
+
     public final SerializedSubject<ThreadMemberUpdate, ThreadMemberUpdate> getThreadMemberUpdate() {
         return this.threadMemberUpdate;
     }
@@ -856,6 +863,12 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
                         return;
                     }
                     return;
+                case -1862771270:
+                    if (str.equals("THREAD_MEMBER_LIST_UPDATE")) {
+                        this.threadMemberListUpdate.j.onNext(obj);
+                        return;
+                    }
+                    return;
                 case -1825641445:
                     if (str.equals("GUILD_MEMBERS_CHUNK")) {
                         this.guildMembersChunk.j.onNext(obj);
@@ -1361,7 +1374,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler {
         Boolean activities = guildSubscriptions.getActivities();
         Boolean threads = guildSubscriptions.getThreads();
         Set<Long> members = guildSubscriptions.getMembers();
-        return requestIfSessionEstablished(new StoreGatewayConnection$updateGuildSubscriptions$1(j, new OutgoingPayload.GuildSubscriptions(serializedRanges, typing, activities, members != null ? u.toList(members) : null, threads)));
+        return requestIfSessionEstablished(new StoreGatewayConnection$updateGuildSubscriptions$1(j, new OutgoingPayload.GuildSubscriptions(serializedRanges, typing, activities, members != null ? u.toList(members) : null, threads, guildSubscriptions.getThreadMemberLists())));
     }
 
     public final boolean voiceStateUpdate(Long l, Long l2, boolean z2, boolean z3, boolean z4, String str, boolean z5) {
diff --git a/app/src/main/java/com/discord/stores/StoreGifPicker.java b/app/src/main/java/com/discord/stores/StoreGifPicker.java
index 0ea97a1c10..8d4e7f99e0 100644
--- a/app/src/main/java/com/discord/stores/StoreGifPicker.java
+++ b/app/src/main/java/com/discord/stores/StoreGifPicker.java
@@ -286,24 +286,24 @@ public final class StoreGifPicker extends StoreV2 {
     }
 
     private final void fetchGifsForSearchQuery(String str) {
-        Observable<R> G = this.restAPI.getGifSearchResults(str, "tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).G(StoreGifPicker$fetchGifsForSearchQuery$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "restAPI.getGifSearchResu…to)\n          }\n        }");
-        Observable t = ObservableExtensionsKt.restSubscribeOn$default(G, false, 1, null).t(new StoreGifPicker$fetchGifsForSearchQuery$2(this, str));
-        m.checkNotNullExpressionValue(t, "restAPI.getGifSearchResu…y, emptyList())\n        }");
-        ObservableExtensionsKt.appSubscribe$default(t, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchGifsForSearchQuery$3(this, str), 62, (Object) null);
+        Observable<R> F = this.restAPI.getGifSearchResults(str, "tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).F(StoreGifPicker$fetchGifsForSearchQuery$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restAPI.getGifSearchResu…to)\n          }\n        }");
+        Observable s2 = ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null).s(new StoreGifPicker$fetchGifsForSearchQuery$2(this, str));
+        m.checkNotNullExpressionValue(s2, "restAPI.getGifSearchResu…y, emptyList())\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s2, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchGifsForSearchQuery$3(this, str), 62, (Object) null);
     }
 
     private final void fetchSuggestedSearchTerms(String str) {
-        Observable t = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGifSuggestedSearchTerms("tenor", str, this.storeUserSettingsSystem.getLocale(), 5), false, 1, null).t(new StoreGifPicker$fetchSuggestedSearchTerms$1(this, str));
-        m.checkNotNullExpressionValue(t, "restAPI.getGifSuggestedS…y, emptyList())\n        }");
-        ObservableExtensionsKt.appSubscribe$default(t, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchSuggestedSearchTerms$2(this, str), 62, (Object) null);
+        Observable s2 = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGifSuggestedSearchTerms("tenor", str, this.storeUserSettingsSystem.getLocale(), 5), false, 1, null).s(new StoreGifPicker$fetchSuggestedSearchTerms$1(this, str));
+        m.checkNotNullExpressionValue(s2, "restAPI.getGifSuggestedS…y, emptyList())\n        }");
+        ObservableExtensionsKt.appSubscribe$default(s2, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchSuggestedSearchTerms$2(this, str), 62, (Object) null);
     }
 
     private final void fetchTrendingCategoryGifs() {
         this.isFetchingTrendingCategoryGifs = true;
-        Observable<R> G = this.restAPI.getTrendingGifCategory("tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).G(StoreGifPicker$fetchTrendingCategoryGifs$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "restAPI.getTrendingGifCa…to)\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(G, false, 1, null), StoreGifPicker.class, (Context) null, (Function1) null, new StoreGifPicker$fetchTrendingCategoryGifs$2(this), (Function0) null, (Function0) null, new StoreGifPicker$fetchTrendingCategoryGifs$3(this), 54, (Object) null);
+        Observable<R> F = this.restAPI.getTrendingGifCategory("tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).F(StoreGifPicker$fetchTrendingCategoryGifs$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "restAPI.getTrendingGifCa…to)\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null), StoreGifPicker.class, (Context) null, (Function1) null, new StoreGifPicker$fetchTrendingCategoryGifs$2(this), (Function0) null, (Function0) null, new StoreGifPicker$fetchTrendingCategoryGifs$3(this), 54, (Object) null);
     }
 
     private final List<ModelGifCategory> getGifCategories() {
@@ -427,21 +427,21 @@ public final class StoreGifPicker extends StoreV2 {
     public final Observable<List<ModelGif>> observeGifsForSearchQuery(String str) {
         m.checkNotNullParameter(str, "query");
         this.dispatcher.schedule(new StoreGifPicker$observeGifsForSearchQuery$1(this, str));
-        Observable<R> G = observeSearchHistory().G(new StoreGifPicker$observeGifsForSearchQuery$2(str));
-        m.checkNotNullExpressionValue(G, "observeSearchHistory().m…gifSearchHistory[query] }");
-        Observable<List<ModelGif>> G2 = G.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G2, "filter { it != null }.map { it!! }");
-        return G2;
+        Observable<R> F = observeSearchHistory().F(new StoreGifPicker$observeGifsForSearchQuery$2(str));
+        m.checkNotNullExpressionValue(F, "observeSearchHistory().m…gifSearchHistory[query] }");
+        Observable<List<ModelGif>> F2 = F.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "filter { it != null }.map { it!! }");
+        return F2;
     }
 
     public final Observable<List<String>> observeSuggestedSearchTerms(String str) {
         m.checkNotNullParameter(str, "query");
         this.dispatcher.schedule(new StoreGifPicker$observeSuggestedSearchTerms$2(this, str));
-        Observable<R> G = observeSuggestedSearchTerms().G(new StoreGifPicker$observeSuggestedSearchTerms$3(str));
-        m.checkNotNullExpressionValue(G, "observeSuggestedSearchTe…archTermsHistory[query] }");
-        Observable<List<String>> G2 = G.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G2, "filter { it != null }.map { it!! }");
-        return G2;
+        Observable<R> F = observeSuggestedSearchTerms().F(new StoreGifPicker$observeSuggestedSearchTerms$3(str));
+        m.checkNotNullExpressionValue(F, "observeSuggestedSearchTe…archTermsHistory[query] }");
+        Observable<List<String>> F2 = F.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "filter { it != null }.map { it!! }");
+        return F2;
     }
 
     public final Observable<List<ModelGif>> observeTrendingCategoryGifs() {
diff --git a/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java b/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
index 6cf1b89328..c2aad06e56 100644
--- a/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGifting$acceptGift$1.java
@@ -147,8 +147,8 @@ public final class StoreGifting$acceptGift$1 extends o implements Function0<Unit
     /* renamed from: invoke */
     public final void mo1invoke() {
         StoreGifting.access$setGifts(this.this$0, this.$gift.getCode(), new StoreGifting.GiftState.Redeeming(this.$gift));
-        Observable<Void> Y = RestAPI.Companion.getApi().acceptGift(this.$gift.getCode()).Y(a.c());
-        m.checkNotNullExpressionValue(Y, "RestAPI\n        .api\n   …scribeOn(Schedulers.io())");
-        ObservableExtensionsKt.appSubscribe$default(Y, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass1(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
+        Observable<Void> X = RestAPI.Companion.getApi().acceptGift(this.$gift.getCode()).X(a.c());
+        m.checkNotNullExpressionValue(X, "RestAPI\n        .api\n   …scribeOn(Schedulers.io())");
+        ObservableExtensionsKt.appSubscribe$default(X, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass1(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGifting.java b/app/src/main/java/com/discord/stores/StoreGifting.java
index e60f723696..9d3c49dc20 100644
--- a/app/src/main/java/com/discord/stores/StoreGifting.java
+++ b/app/src/main/java/com/discord/stores/StoreGifting.java
@@ -25,7 +25,7 @@ public final class StoreGifting {
     public static final Companion Companion = new Companion(null);
     private final Dispatcher dispatcher;
     private HashMap<String, GiftState> knownGifts = new HashMap<>();
-    private final BehaviorSubject<Map<String, GiftState>> knownGiftsSubject = BehaviorSubject.m0(h0.emptyMap());
+    private final BehaviorSubject<Map<String, GiftState>> knownGiftsSubject = BehaviorSubject.l0(h0.emptyMap());
 
     /* compiled from: StoreGifting.kt */
     public static final class Companion {
@@ -474,9 +474,9 @@ public final class StoreGifting {
     }
 
     public final Observable<List<ModelGift>> getMyResolvedGifts(long j) {
-        Observable<R> G = this.knownGiftsSubject.G(new StoreGifting$getMyResolvedGifts$1(j));
-        m.checkNotNullExpressionValue(G, "knownGiftsSubject\n      …              }\n        }");
-        return G;
+        Observable<R> F = this.knownGiftsSubject.F(new StoreGifting$getMyResolvedGifts$1(j));
+        m.checkNotNullExpressionValue(F, "knownGiftsSubject\n      …              }\n        }");
+        return F;
     }
 
     @StoreThread
@@ -487,9 +487,9 @@ public final class StoreGifting {
     public final Observable<GiftState> requestGift(String str) {
         m.checkNotNullParameter(str, "giftCode");
         this.dispatcher.schedule(new StoreGifting$requestGift$1(this, str));
-        Observable<GiftState> s2 = this.knownGiftsSubject.G(new StoreGifting$requestGift$2(str)).s();
-        m.checkNotNullExpressionValue(s2, "knownGiftsSubject\n      …  .distinctUntilChanged()");
-        return s2;
+        Observable<GiftState> r = this.knownGiftsSubject.F(new StoreGifting$requestGift$2(str)).r();
+        m.checkNotNullExpressionValue(r, "knownGiftsSubject\n      …  .distinctUntilChanged()");
+        return r;
     }
 
     public final void revokeGiftCode(ModelGift modelGift) {
diff --git a/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java b/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
index b62c3f41fc..0990656e2e 100644
--- a/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
+++ b/app/src/main/java/com/discord/stores/StoreGooglePlayPurchases.java
@@ -37,7 +37,7 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
     private final AnalyticsTracker analyticsTracker;
     private final Clock clock;
     private final Dispatcher dispatcher;
-    private final PublishSubject<Event> eventSubject = PublishSubject.l0();
+    private final PublishSubject<Event> eventSubject = PublishSubject.k0();
     private final Gson gson;
     private final ObservationDeck observationDeck;
     private QueryState queryState;
@@ -636,9 +636,9 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
         String component3 = pendingDowngrade.component3();
         RestAPIParams.DowngradeSubscriptionBody downgradeSubscriptionBody = new RestAPIParams.DowngradeSubscriptionBody(component2, component1, component3);
         RetryWithDelay retryWithDelay = RetryWithDelay.INSTANCE;
-        Observable<Object> Y = this.restAPI.downgradeSubscription(downgradeSubscriptionBody).Y(j0.p.a.c());
-        m.checkNotNullExpressionValue(Y, "restAPI\n        .downgra…scribeOn(Schedulers.io())");
-        ObservableExtensionsKt.appSubscribe$default(RetryWithDelay.restRetry$default(retryWithDelay, Y, 0, null, null, new StoreGooglePlayPurchases$doDowngrade$1(this), 1, null), StoreGooglePlayPurchases.class, (Context) null, (Function1) null, new StoreGooglePlayPurchases$doDowngrade$3(this, component3), (Function0) null, (Function0) null, new StoreGooglePlayPurchases$doDowngrade$2(this, component3), 54, (Object) null);
+        Observable<Object> X = this.restAPI.downgradeSubscription(downgradeSubscriptionBody).X(j0.p.a.c());
+        m.checkNotNullExpressionValue(X, "restAPI\n        .downgra…scribeOn(Schedulers.io())");
+        ObservableExtensionsKt.appSubscribe$default(RetryWithDelay.restRetry$default(retryWithDelay, X, 0, null, null, new StoreGooglePlayPurchases$doDowngrade$1(this), 1, null), StoreGooglePlayPurchases.class, (Context) null, (Function1) null, new StoreGooglePlayPurchases$doDowngrade$3(this, component3), (Function0) null, (Function0) null, new StoreGooglePlayPurchases$doDowngrade$2(this, component3), 54, (Object) null);
     }
 
     private final Map<String, AnalyticsTrait> getCachedAnalyticsTraitsMap() {
@@ -757,15 +757,15 @@ public final class StoreGooglePlayPurchases extends StoreV2 {
     }
 
     public final Observable<QueryState> observeQueryState() {
-        Observable<QueryState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGooglePlayPurchases$observeQueryState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<QueryState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGooglePlayPurchases$observeQueryState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<State> observeState() {
-        Observable<State> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGooglePlayPurchases$observeState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<State> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGooglePlayPurchases$observeState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void onVerificationFailure(VerificationResult verificationResult) {
diff --git a/app/src/main/java/com/discord/stores/StoreGooglePlaySkuDetails.java b/app/src/main/java/com/discord/stores/StoreGooglePlaySkuDetails.java
index d7d50b38cc..be423de956 100644
--- a/app/src/main/java/com/discord/stores/StoreGooglePlaySkuDetails.java
+++ b/app/src/main/java/com/discord/stores/StoreGooglePlaySkuDetails.java
@@ -155,9 +155,9 @@ public final class StoreGooglePlaySkuDetails extends StoreV2 {
     }
 
     public final Observable<State> observeState() {
-        Observable<State> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGooglePlaySkuDetails$observeState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<State> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGooglePlaySkuDetails$observeState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java b/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java
index 9fd767fb1e..64859a4f00 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildIntegrations.java
@@ -21,7 +21,7 @@ public final class StoreGuildIntegrations {
     private final HashMap<Long, Map<Long, ModelGuildIntegration>> allIntegrations = new HashMap<>();
     private Subscription closeIntegrationScreenSubscription;
     private final Dispatcher dispatcher;
-    private final BehaviorSubject<Map<Long, Map<Long, ModelGuildIntegration>>> integrationsSubject = BehaviorSubject.m0(new HashMap());
+    private final BehaviorSubject<Map<Long, Map<Long, ModelGuildIntegration>>> integrationsSubject = BehaviorSubject.l0(new HashMap());
     private boolean isOnIntegrationsScreen;
 
     public StoreGuildIntegrations(Dispatcher dispatcher) {
@@ -83,15 +83,15 @@ public final class StoreGuildIntegrations {
     }
 
     public final Observable<Map<Long, ModelGuildIntegration>> get(long j) {
-        Observable<Map<Long, ModelGuildIntegration>> s2 = this.integrationsSubject.G(new StoreGuildIntegrations$get$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "integrationsSubject\n    …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, ModelGuildIntegration>> r = this.integrationsSubject.F(new StoreGuildIntegrations$get$1(j)).r();
+        m.checkNotNullExpressionValue(r, "integrationsSubject\n    …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<ModelGuildIntegration> get(long j, long j2) {
-        Observable<ModelGuildIntegration> s2 = get(j).G(new StoreGuildIntegrations$get$2(j2)).s();
-        m.checkNotNullExpressionValue(s2, "get(guildId)\n          .…  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelGuildIntegration> r = get(j).F(new StoreGuildIntegrations$get$2(j2)).r();
+        m.checkNotNullExpressionValue(r, "get(guildId)\n          .…  .distinctUntilChanged()");
+        return r;
     }
 
     @StoreThread
@@ -106,9 +106,9 @@ public final class StoreGuildIntegrations {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        Observable<Long> e02 = Observable.e0(1000, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(e02, getClass(), (Context) null, new StoreGuildIntegrations$onIntegrationScreenClosed$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreGuildIntegrations$onIntegrationScreenClosed$1(this), 58, (Object) null);
+        Observable<Long> d02 = Observable.d0(1000, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…S, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(d02, getClass(), (Context) null, new StoreGuildIntegrations$onIntegrationScreenClosed$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreGuildIntegrations$onIntegrationScreenClosed$1(this), 58, (Object) null);
     }
 
     public final synchronized void onIntegrationScreenOpened(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreGuildJoinRequest.java b/app/src/main/java/com/discord/stores/StoreGuildJoinRequest.java
index f6687c0a98..2c6d4806cd 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildJoinRequest.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildJoinRequest.java
@@ -108,21 +108,21 @@ public final class StoreGuildJoinRequest extends StoreV2 {
     }
 
     public final Observable<GuildJoinRequest> observeGuildJoinRequest(long j) {
-        Observable<GuildJoinRequest> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildJoinRequest$observeGuildJoinRequest$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<GuildJoinRequest> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildJoinRequest$observeGuildJoinRequest$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, GuildJoinRequest>> observeGuildJoinRequests() {
-        Observable<Map<Long, GuildJoinRequest>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildJoinRequest$observeGuildJoinRequests$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, GuildJoinRequest>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildJoinRequest$observeGuildJoinRequests$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Guild>> observePendingGuilds() {
-        Observable<Map<Long, Guild>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildJoinRequest$observePendingGuilds$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Guild>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildJoinRequest$observePendingGuilds$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java b/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java
index 92f37ffd5d..1c2951141c 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildMemberCounts.java
@@ -79,9 +79,9 @@ public final class StoreGuildMemberCounts extends StoreV2 {
     }
 
     public final Observable<Integer> observeApproximateMemberCount(long j) {
-        Observable<Integer> s2 = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildMemberCounts$observeApproximateMemberCount$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "ObservationDeckProvider.… }.distinctUntilChanged()");
-        return s2;
+        Observable<Integer> r = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildMemberCounts$observeApproximateMemberCount$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "ObservationDeckProvider.… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java b/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java
index 06cc7227fb..245046cb86 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java
@@ -2,9 +2,9 @@ package com.discord.stores;
 
 import com.discord.api.channel.Channel;
 import com.discord.api.guildmember.GuildMembersChunk;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.utilities.lazy.requester.GuildMemberRequestManager;
 import d0.t.o;
 import d0.z.d.m;
@@ -50,13 +50,13 @@ public final class StoreGuildMemberRequester extends Store {
     @StoreThread
     private final void requestForMessages(long j, Iterable<Message> iterable) {
         for (Message message : iterable) {
-            User g = message.g();
-            if (g != null) {
-                this.requestManager.queueRequest(j, g.i());
+            User author = message.getAuthor();
+            if (author != null) {
+                this.requestManager.queueRequest(j, author.i());
             }
-            List<User> z2 = message.z();
-            if (z2 != null) {
-                for (User user : z2) {
+            List<User> mentions = message.getMentions();
+            if (mentions != null) {
+                for (User user : mentions) {
                     this.requestManager.queueRequest(j, user.i());
                 }
             }
@@ -113,7 +113,7 @@ public final class StoreGuildMemberRequester extends Store {
         if (this.isConnected) {
             Channel findChannelByIdInternal$app_productionGoogleRelease = this.collector.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(j);
             if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-                Long valueOf = Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.e());
+                Long valueOf = Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.f());
                 if (!(valueOf.longValue() > 0)) {
                     valueOf = null;
                 }
@@ -131,7 +131,7 @@ public final class StoreGuildMemberRequester extends Store {
             map = new HashMap<>(collection.size());
         }
         for (?? r1 : collection) {
-            map.put(Long.valueOf(((Message) r1).r()), r1);
+            map.put(Long.valueOf(((Message) r1).getId()), r1);
         }
         this.channelPendingMessages.put(Long.valueOf(j), map);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreGuildMemberVerificationForm.java b/app/src/main/java/com/discord/stores/StoreGuildMemberVerificationForm.java
index 3f05c3e937..c24bb06b82 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildMemberVerificationForm.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildMemberVerificationForm.java
@@ -167,9 +167,9 @@ public final class StoreGuildMemberVerificationForm extends StoreV2 {
     }
 
     public final Observable<MemberVerificationFormData> observeMemberVerificationFormData(long j) {
-        Observable<MemberVerificationFormData> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildMemberVerificationForm$observeMemberVerificationFormData$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<MemberVerificationFormData> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildMemberVerificationForm$observeMemberVerificationFormData$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildProfiles.java b/app/src/main/java/com/discord/stores/StoreGuildProfiles.java
index 4825e75a8c..09d0ee228c 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildProfiles.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildProfiles.java
@@ -167,9 +167,9 @@ public final class StoreGuildProfiles extends StoreV2 {
 
     public final Observable<GuildProfileData> observeGuildProfile(long j) {
         this.dispatcher.schedule(new StoreGuildProfiles$observeGuildProfile$1(this, j));
-        Observable<GuildProfileData> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildProfiles$observeGuildProfile$2(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<GuildProfileData> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildProfiles$observeGuildProfile$2(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildSelected.java b/app/src/main/java/com/discord/stores/StoreGuildSelected.java
index aeb6b1b8bc..23a4ef8786 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildSelected.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildSelected.java
@@ -131,21 +131,21 @@ public final class StoreGuildSelected extends StoreV2 {
     }
 
     public final Observable<List<Long>> observeRecentSelectedGuildIds() {
-        Observable<List<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildSelected$observeRecentSelectedGuildIds$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<List<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildSelected$observeRecentSelectedGuildIds$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<com.discord.models.guild.Guild> observeSelectedGuild() {
-        Observable<com.discord.models.guild.Guild> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, this.guildStore}, false, null, null, new StoreGuildSelected$observeSelectedGuild$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<com.discord.models.guild.Guild> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, this.guildStore}, false, null, null, new StoreGuildSelected$observeSelectedGuild$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Long> observeSelectedGuildId() {
-        Observable<Long> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildSelected$observeSelectedGuildId$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Long> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildSelected$observeSelectedGuildId$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void set(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreGuildStickers$observeGuildStickers$1.java b/app/src/main/java/com/discord/stores/StoreGuildStickers$observeGuildStickers$1.java
new file mode 100644
index 0000000000..1800e0acf6
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreGuildStickers$observeGuildStickers$1.java
@@ -0,0 +1,23 @@
+package com.discord.stores;
+
+import com.discord.api.sticker.Sticker;
+import d0.z.d.o;
+import java.util.Map;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreGuildStickers.kt */
+public final class StoreGuildStickers$observeGuildStickers$1 extends o implements Function0<Map<Long, ? extends Map<Long, ? extends Sticker>>> {
+    public final /* synthetic */ StoreGuildStickers this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreGuildStickers$observeGuildStickers$1(StoreGuildStickers storeGuildStickers) {
+        super(0);
+        this.this$0 = storeGuildStickers;
+    }
+
+    /* Return type fixed from 'java.util.Map<java.lang.Long, java.util.Map<java.lang.Long, com.discord.api.sticker.Sticker>>' to match base method */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final Map<Long, ? extends Map<Long, ? extends Sticker>> mo1invoke() {
+        return StoreGuildStickers.access$getAllGuildStickersSnapshot$p(this.this$0);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreGuildStickers.java b/app/src/main/java/com/discord/stores/StoreGuildStickers.java
index 2bc3dc0f7f..819415a94d 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildStickers.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildStickers.java
@@ -2,40 +2,73 @@ package com.discord.stores;
 
 import com.discord.api.guild.Guild;
 import com.discord.api.guildmember.GuildMember;
-import com.discord.api.sticker.GuildStickerUpdate;
+import com.discord.api.sticker.GuildStickersUpdate;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerType;
 import com.discord.models.domain.ModelPayload;
+import com.discord.stores.updates.ObservationDeck;
+import com.discord.stores.updates.ObservationDeckProvider;
 import d0.d0.f;
 import d0.t.g0;
 import d0.t.h0;
 import d0.t.n;
 import d0.t.o;
+import d0.t.u;
 import d0.z.d.m;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
 /* compiled from: StoreGuildStickers.kt */
 public final class StoreGuildStickers extends StoreV2 {
-    private final Map<Long, Map<Long, Sticker>> allGuildStickers = new LinkedHashMap();
-    private Map<Long, ? extends Map<Long, Sticker>> allGuildStickersSnapshot = h0.emptyMap();
+    private final Map<Long, Map<Long, Sticker>> allGuildStickers;
+    private List<Sticker> allGuildStickersFlattenedSnapshot;
+    private Map<Long, ? extends Map<Long, Sticker>> allGuildStickersSnapshot;
     private final Dispatcher dispatcher;
 
     /* renamed from: me  reason: collision with root package name */
-    private long f2097me;
+    private long f2103me;
+    private final ObservationDeck observationDeck;
+    private final Function1<List<Long>, Unit> onStickersDeleted;
 
-    public StoreGuildStickers(Dispatcher dispatcher) {
+    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: kotlin.jvm.functions.Function1<? super java.util.List<java.lang.Long>, kotlin.Unit> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public StoreGuildStickers(Dispatcher dispatcher, ObservationDeck observationDeck, Function1<? super List<Long>, Unit> function1) {
         m.checkNotNullParameter(dispatcher, "dispatcher");
+        m.checkNotNullParameter(observationDeck, "observationDeck");
+        m.checkNotNullParameter(function1, "onStickersDeleted");
         this.dispatcher = dispatcher;
+        this.observationDeck = observationDeck;
+        this.onStickersDeleted = function1;
+        this.allGuildStickers = new LinkedHashMap();
+        this.allGuildStickersSnapshot = h0.emptyMap();
+        this.allGuildStickersFlattenedSnapshot = n.emptyList();
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ StoreGuildStickers(Dispatcher dispatcher, ObservationDeck observationDeck, Function1 function1, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(dispatcher, (i & 2) != 0 ? ObservationDeckProvider.get() : observationDeck, function1);
     }
 
     public static final /* synthetic */ Map access$getAllGuildStickers$p(StoreGuildStickers storeGuildStickers) {
         return storeGuildStickers.allGuildStickers;
     }
 
+    public static final /* synthetic */ Map access$getAllGuildStickersSnapshot$p(StoreGuildStickers storeGuildStickers) {
+        return storeGuildStickers.allGuildStickersSnapshot;
+    }
+
+    public static final /* synthetic */ void access$setAllGuildStickersSnapshot$p(StoreGuildStickers storeGuildStickers, Map map) {
+        storeGuildStickers.allGuildStickersSnapshot = map;
+    }
+
     private final void updateStickers(long j, Collection<Sticker> collection) {
         if (collection.isEmpty()) {
             this.allGuildStickers.remove(Long.valueOf(j));
@@ -56,6 +89,10 @@ public final class StoreGuildStickers extends StoreV2 {
         return this.allGuildStickersSnapshot;
     }
 
+    public final List<Sticker> getAllGuildStickersFlattened() {
+        return this.allGuildStickersFlattenedSnapshot;
+    }
+
     @StoreThread
     public final Map<Long, Map<Long, Sticker>> getAllGuildStickersInternal() {
         return this.allGuildStickers;
@@ -94,7 +131,7 @@ public final class StoreGuildStickers extends StoreV2 {
     @StoreThread
     public final void handleConnectionOpen(ModelPayload modelPayload) {
         m.checkNotNullParameter(modelPayload, "payload");
-        this.f2097me = modelPayload.getMe().i();
+        this.f2103me = modelPayload.getMe().i();
         for (Guild guild : modelPayload.getGuilds()) {
             m.checkNotNullExpressionValue(guild, "guild");
             handleGuildCreateOrUpdate(guild);
@@ -102,9 +139,9 @@ public final class StoreGuildStickers extends StoreV2 {
     }
 
     public final void handleFetchedSticker(Sticker sticker) {
-        Long f;
-        if (sticker != null && sticker.j() == StickerType.GUILD && (f = sticker.f()) != null) {
-            this.dispatcher.schedule(new StoreGuildStickers$handleFetchedSticker$1(this, f.longValue(), sticker));
+        Long g;
+        if (sticker != null && sticker.k() == StickerType.GUILD && (g = sticker.g()) != null) {
+            this.dispatcher.schedule(new StoreGuildStickers$handleFetchedSticker$1(this, g.longValue(), sticker));
         }
     }
 
@@ -124,7 +161,7 @@ public final class StoreGuildStickers extends StoreV2 {
                 break;
             }
             obj = it.next();
-            if (((GuildMember) obj).j().i() == this.f2097me) {
+            if (((GuildMember) obj).j().i() == this.f2103me) {
                 z2 = true;
                 continue;
             } else {
@@ -156,18 +193,53 @@ public final class StoreGuildStickers extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleStickerUpdate(GuildStickerUpdate guildStickerUpdate) {
-        m.checkNotNullParameter(guildStickerUpdate, "stickersUpdate");
-        updateStickers(guildStickerUpdate.b(), guildStickerUpdate.c());
+    public final void handleStickerUpdate(GuildStickersUpdate guildStickersUpdate) {
+        Collection collection;
+        m.checkNotNullParameter(guildStickersUpdate, "stickersUpdate");
+        long b = guildStickersUpdate.b();
+        List<Sticker> c2 = guildStickersUpdate.c();
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(c2, 10));
+        for (Sticker sticker : c2) {
+            arrayList.add(Long.valueOf(sticker.getId()));
+        }
+        Set set = u.toSet(arrayList);
+        Map map = (Map) this.allGuildStickersSnapshot.get(Long.valueOf(b));
+        if (map != null) {
+            collection = new ArrayList(map.size());
+            for (Map.Entry entry : map.entrySet()) {
+                collection.add(Long.valueOf(((Number) entry.getKey()).longValue()));
+            }
+        } else {
+            collection = n.emptyList();
+        }
+        ArrayList arrayList2 = new ArrayList();
+        for (Object obj : collection) {
+            if (!set.contains(Long.valueOf(((Number) obj).longValue()))) {
+                arrayList2.add(obj);
+            }
+        }
+        updateStickers(b, c2);
+        this.onStickersDeleted.invoke(arrayList2);
+    }
+
+    public final Observable<Map<Long, Map<Long, Sticker>>> observeGuildStickers() {
+        Observable<Map<Long, Map<Long, Sticker>>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildStickers$observeGuildStickers$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
     public void snapshotData() {
         super.snapshotData();
+        ArrayList arrayList = new ArrayList();
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry<Long, Map<Long, Sticker>> entry : this.allGuildStickers.entrySet()) {
-            linkedHashMap.put(Long.valueOf(entry.getKey().longValue()), h0.toMap(entry.getValue()));
+            long longValue = entry.getKey().longValue();
+            Map<Long, Sticker> value = entry.getValue();
+            linkedHashMap.put(Long.valueOf(longValue), h0.toMap(value));
+            arrayList.addAll(value.values());
         }
         this.allGuildStickersSnapshot = linkedHashMap;
+        this.allGuildStickersFlattenedSnapshot = u.toList(arrayList);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGuildSubscriptions$subscribeThread$1.java b/app/src/main/java/com/discord/stores/StoreGuildSubscriptions$subscribeThread$1.java
new file mode 100644
index 0000000000..3ed5e4429c
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreGuildSubscriptions$subscribeThread$1.java
@@ -0,0 +1,26 @@
+package com.discord.stores;
+
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreGuildSubscriptions.kt */
+public final class StoreGuildSubscriptions$subscribeThread$1 extends o implements Function0<Unit> {
+    public final /* synthetic */ long $channelId;
+    public final /* synthetic */ long $guildId;
+    public final /* synthetic */ StoreGuildSubscriptions this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreGuildSubscriptions$subscribeThread$1(StoreGuildSubscriptions storeGuildSubscriptions, long j, long j2) {
+        super(0);
+        this.this$0 = storeGuildSubscriptions;
+        this.$guildId = j;
+        this.$channelId = j2;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+        StoreGuildSubscriptions.access$getSubscriptionsManager$p(this.this$0).subscribeThread(this.$guildId, this.$channelId);
+        this.this$0.markChanged();
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreGuildSubscriptions.java b/app/src/main/java/com/discord/stores/StoreGuildSubscriptions.java
index 90d196ceed..4b071e3177 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildSubscriptions.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildSubscriptions.java
@@ -136,6 +136,12 @@ public final class StoreGuildSubscriptions extends StoreV2 {
         }
     }
 
+    public final void subscribeThread(long j, long j2) {
+        if (j > 0 && j2 > 0) {
+            this.dispatcher.schedule(new StoreGuildSubscriptions$subscribeThread$1(this, j, j2));
+        }
+    }
+
     public final void subscribeUser(long j, long j2) {
         this.dispatcher.schedule(new StoreGuildSubscriptions$subscribeUser$1(this, j, j2));
     }
diff --git a/app/src/main/java/com/discord/stores/StoreGuildTemplates.java b/app/src/main/java/com/discord/stores/StoreGuildTemplates.java
index 1d5f69bbfd..a38b45ea1a 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildTemplates.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildTemplates.java
@@ -219,16 +219,16 @@ public final class StoreGuildTemplates extends StoreV2 {
     }
 
     public final Observable<String> observeDynamicLinkGuildTemplateCode() {
-        Observable<String> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildTemplates$observeDynamicLinkGuildTemplateCode$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<String> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildTemplates$observeDynamicLinkGuildTemplateCode$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<GuildTemplateState> observeGuildTemplate(String str) {
         m.checkNotNullParameter(str, "guildTemplateCode");
-        Observable<GuildTemplateState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildTemplates$observeGuildTemplate$1(this, str), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<GuildTemplateState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildTemplates$observeGuildTemplate$1(this, str), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void setDynamicLinkGuildTemplateCode(String str) {
diff --git a/app/src/main/java/com/discord/stores/StoreGuildVoiceRegions.java b/app/src/main/java/com/discord/stores/StoreGuildVoiceRegions.java
index e27b42bed1..876ecbb394 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildVoiceRegions.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildVoiceRegions.java
@@ -167,9 +167,9 @@ public final class StoreGuildVoiceRegions extends StoreV2 {
     }
 
     public final Observable<List<ModelVoiceRegion>> observeGuildVoiceRegions(long j) {
-        Observable<List<ModelVoiceRegion>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildVoiceRegions$observeGuildVoiceRegions$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<List<ModelVoiceRegion>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildVoiceRegions$observeGuildVoiceRegions$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildWelcomeScreens.java b/app/src/main/java/com/discord/stores/StoreGuildWelcomeScreens.java
index d08f9285f5..5e0e28f5e0 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildWelcomeScreens.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildWelcomeScreens.java
@@ -181,9 +181,9 @@ public final class StoreGuildWelcomeScreens extends StoreV2 {
     }
 
     public final Observable<State> observeGuildWelcomeScreen(long j) {
-        Observable<State> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<State> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildWelcomeScreens$observeGuildWelcomeScreen$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java b/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java
index 02029bebf5..4c3f2d7674 100644
--- a/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java
+++ b/app/src/main/java/com/discord/stores/StoreGuilds$Actions$requestMembers$3.java
@@ -25,6 +25,6 @@ public final class StoreGuilds$Actions$requestMembers$3<T, R> implements b<Strin
     }
 
     public final Observable<? extends Long> call(String str) {
-        return StoreStream.Companion.getGuildSelected().observeSelectedGuildId().u(new AnonymousClass1(str));
+        return StoreStream.Companion.getGuildSelected().observeSelectedGuildId().t(new AnonymousClass1(str));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGuilds$observeFromChannelId$1.java b/app/src/main/java/com/discord/stores/StoreGuilds$observeFromChannelId$1.java
index 1e7adeccf9..c816505d87 100644
--- a/app/src/main/java/com/discord/stores/StoreGuilds$observeFromChannelId$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGuilds$observeFromChannelId$1.java
@@ -14,6 +14,6 @@ public final class StoreGuilds$observeFromChannelId$1<T, R> implements b<Channel
     }
 
     public final Observable<? extends Guild> call(Channel channel) {
-        return channel != null ? this.this$0.observeGuild(channel.e()) : new j(null);
+        return channel != null ? this.this$0.observeGuild(channel.f()) : new j(null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreGuilds.java b/app/src/main/java/com/discord/stores/StoreGuilds.java
index 8e0dea9782..3edd072d0d 100644
--- a/app/src/main/java/com/discord/stores/StoreGuilds.java
+++ b/app/src/main/java/com/discord/stores/StoreGuilds.java
@@ -5,6 +5,10 @@ import c.a.d.q;
 import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.api.guildmember.GuildMembersChunk;
 import com.discord.api.role.GuildRole;
+import com.discord.api.thread.AugmentedThreadMember;
+import com.discord.api.thread.ThreadListMember;
+import com.discord.api.thread.ThreadMemberListUpdate;
+import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.app.AppComponent;
 import com.discord.models.domain.ModelPayload;
@@ -21,6 +25,7 @@ import d0.t.g0;
 import d0.t.h0;
 import d0.t.n0;
 import d0.z.d.m;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -69,9 +74,9 @@ public final class StoreGuilds extends StoreV2 {
         public static final void requestMembers(AppComponent appComponent, Observable<String> observable, boolean z2) {
             m.checkNotNullParameter(appComponent, "fragment");
             m.checkNotNullParameter(observable, "partialUserNameTokenEmitted");
-            Observable Z = observable.o(1000, TimeUnit.MILLISECONDS).G(new StoreGuilds$Actions$requestMembers$1(z2)).y(StoreGuilds$Actions$requestMembers$2.INSTANCE).s().Z(StoreGuilds$Actions$requestMembers$3.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "partialUserNameTokenEmit…            }\n          }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Z), appComponent, null, 2, null), (Context) null, "requestGuildMembers", (Function1) null, StoreGuilds$Actions$requestMembers$4.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+            Observable Y = observable.o(1000, TimeUnit.MILLISECONDS).F(new StoreGuilds$Actions$requestMembers$1(z2)).x(StoreGuilds$Actions$requestMembers$2.INSTANCE).r().Y(StoreGuilds$Actions$requestMembers$3.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "partialUserNameTokenEmit…            }\n          }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Y), appComponent, null, 2, null), (Context) null, "requestGuildMembers", (Function1) null, StoreGuilds$Actions$requestMembers$4.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
         }
     }
 
@@ -405,6 +410,48 @@ public final class StoreGuilds extends StoreV2 {
         handleHasRoleAndJoinedAt(j2, this.guildMembers.get(Long.valueOf(j2)));
     }
 
+    @StoreThread
+    public final void handleThreadMemberListUpdate(ThreadMemberListUpdate threadMemberListUpdate) {
+        ArrayList arrayList;
+        m.checkNotNullParameter(threadMemberListUpdate, "threadMemberListUpdate");
+        long a = threadMemberListUpdate.a();
+        List<ThreadListMember> b = threadMemberListUpdate.b();
+        if (b != null) {
+            ArrayList arrayList2 = new ArrayList();
+            for (ThreadListMember threadListMember : b) {
+                com.discord.api.guildmember.GuildMember a2 = threadListMember.a();
+                if (a2 != null) {
+                    arrayList2.add(a2);
+                }
+            }
+            arrayList = arrayList2;
+        } else {
+            arrayList = null;
+        }
+        handleGuildMembers(a, 0, arrayList, false);
+    }
+
+    @StoreThread
+    public final void handleThreadMembersUpdate(ThreadMembersUpdate threadMembersUpdate) {
+        ArrayList arrayList;
+        m.checkNotNullParameter(threadMembersUpdate, "threadMembersUpdate");
+        long b = threadMembersUpdate.b();
+        List<AugmentedThreadMember> a = threadMembersUpdate.a();
+        if (a != null) {
+            ArrayList arrayList2 = new ArrayList();
+            for (AugmentedThreadMember augmentedThreadMember : a) {
+                com.discord.api.guildmember.GuildMember c2 = augmentedThreadMember.c();
+                if (c2 != null) {
+                    arrayList2.add(c2);
+                }
+            }
+            arrayList = arrayList2;
+        } else {
+            arrayList = null;
+        }
+        handleGuildMembers(b, 0, arrayList, false);
+    }
+
     @Override // com.discord.stores.Store
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
@@ -436,9 +483,9 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Map<Long, GuildMember>> observeComputed(long j) {
-        Observable<Map<Long, GuildMember>> s2 = observeComputed().G(new StoreGuilds$observeComputed$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeComputed()\n      …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, GuildMember>> r = observeComputed().F(new StoreGuilds$observeComputed$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observeComputed()\n      …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, GuildMember>> observeComputed(long j, Collection<Long> collection) {
@@ -453,29 +500,29 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Guild> observeFromChannelId(long j) {
-        Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new StoreGuilds$observeFromChannelId$1(this));
-        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…ll)\n          }\n        }");
-        return Z;
+        Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new StoreGuilds$observeFromChannelId$1(this));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…ll)\n          }\n        }");
+        return Y;
     }
 
     public final Observable<Guild> observeGuild(long j) {
-        Observable<Guild> s2 = observeGuilds().G(new StoreGuilds$observeGuild$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeGuilds()\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Guild> r = observeGuilds().F(new StoreGuilds$observeGuild$1(j)).r();
+        m.checkNotNullExpressionValue(r, "observeGuilds()\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Set<Long>> observeGuildIds() {
-        Observable<Set<Long>> s2 = observeGuilds().Z(StoreGuilds$observeGuildIds$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeGuilds()\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = observeGuilds().Y(StoreGuilds$observeGuildIds$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeGuilds()\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<GuildMember> observeGuildMember(long j, long j2) {
-        return observeComputed().G(new StoreGuilds$observeGuildMember$1(j, j2)).s();
+        return observeComputed().F(new StoreGuilds$observeGuildMember$1(j, j2)).r();
     }
 
     public final Observable<Map<Long, GuildMember>> observeGuildMembers(long j) {
-        return observeComputed().G(new StoreGuilds$observeGuildMembers$1(j)).s();
+        return observeComputed().F(new StoreGuilds$observeGuildMembers$1(j)).r();
     }
 
     public final Observable<Map<Long, Guild>> observeGuilds() {
@@ -483,15 +530,15 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Map<Long, Long>> observeJoinedAt() {
-        Observable<Map<Long, Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{GuildsUpdate}, false, null, null, new StoreGuilds$observeJoinedAt$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{GuildsUpdate}, false, null, null, new StoreGuilds$observeJoinedAt$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Long> observeJoinedAt(long j) {
-        Observable<Long> s2 = observeJoinedAt().G(new StoreGuilds$observeJoinedAt$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeJoinedAt()\n      …  .distinctUntilChanged()");
-        return s2;
+        Observable<Long> r = observeJoinedAt().F(new StoreGuilds$observeJoinedAt$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observeJoinedAt()\n      …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Map<Long, GuildRole>>> observeRoles() {
@@ -499,9 +546,9 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<Map<Long, GuildRole>> observeRoles(long j) {
-        Observable<Map<Long, GuildRole>> s2 = observeRoles().G(new StoreGuilds$observeRoles$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeRoles()\n        .…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, GuildRole>> r = observeRoles().F(new StoreGuilds$observeRoles$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observeRoles()\n        .…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, GuildRole>> observeRoles(long j, Collection<Long> collection) {
@@ -512,21 +559,21 @@ public final class StoreGuilds extends StoreV2 {
     }
 
     public final Observable<List<GuildRole>> observeSortedRoles(long j) {
-        Observable<List<GuildRole>> s2 = observeRoles(j).Z(StoreGuilds$observeSortedRoles$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeRoles(guildId)\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<List<GuildRole>> r = observeRoles(j).Y(StoreGuilds$observeSortedRoles$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeRoles(guildId)\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Set<Long>> observeUnavailableGuilds() {
-        Observable<Set<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{GuildsUpdate}, false, null, null, new StoreGuilds$observeUnavailableGuilds$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{GuildsUpdate}, false, null, null, new StoreGuilds$observeUnavailableGuilds$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<GuildVerificationLevel> observeVerificationLevel(long j) {
-        Observable<GuildVerificationLevel> s2 = observeGuild(j).G(StoreGuilds$observeVerificationLevel$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeGuild(guildId)\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<GuildVerificationLevel> r = observeGuild(j).F(StoreGuilds$observeVerificationLevel$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeGuild(guildId)\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreGuildsNsfw$deny$1.java b/app/src/main/java/com/discord/stores/StoreGuildsNsfw$deny$1.java
index da81d6a947..c3a8ba1035 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildsNsfw$deny$1.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildsNsfw$deny$1.java
@@ -22,7 +22,7 @@ public final class StoreGuildsNsfw$deny$1 extends o implements Function1<Channel
     }
 
     public final void invoke(Channel channel) {
-        if (channel == null || channel.n()) {
+        if (channel == null || channel.o()) {
             ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, 0, null, null, 12, null);
         } else {
             ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel, null, null, 6, null);
diff --git a/app/src/main/java/com/discord/stores/StoreGuildsSorted.java b/app/src/main/java/com/discord/stores/StoreGuildsSorted.java
index f6b8692107..d5cf74d6dd 100644
--- a/app/src/main/java/com/discord/stores/StoreGuildsSorted.java
+++ b/app/src/main/java/com/discord/stores/StoreGuildsSorted.java
@@ -43,14 +43,14 @@ public final class StoreGuildsSorted extends StoreV2 {
             private final List<Guild> guilds;
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2098id;
+            private final long f2104id;
             private final String name;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Folder(long j, List<Guild> list, Integer num, String str) {
                 super(null);
                 m.checkNotNullParameter(list, "guilds");
-                this.f2098id = j;
+                this.f2104id = j;
                 this.guilds = list;
                 this.color = num;
                 this.name = str;
@@ -60,7 +60,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             /* JADX WARN: Multi-variable type inference failed */
             public static /* synthetic */ Folder copy$default(Folder folder, long j, List list, Integer num, String str, int i, Object obj) {
                 if ((i & 1) != 0) {
-                    j = folder.f2098id;
+                    j = folder.f2104id;
                 }
                 if ((i & 2) != 0) {
                     list = folder.guilds;
@@ -76,7 +76,7 @@ public final class StoreGuildsSorted extends StoreV2 {
 
             @Override // com.discord.stores.StoreGuildsSorted.Entry
             public ModelGuildFolder asModelGuildFolder() {
-                Long valueOf = Long.valueOf(this.f2098id);
+                Long valueOf = Long.valueOf(this.f2104id);
                 List<Guild> list = this.guilds;
                 ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
                 for (Guild guild : list) {
@@ -86,7 +86,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             }
 
             public final long component1() {
-                return this.f2098id;
+                return this.f2104id;
             }
 
             public final List<Guild> component2() {
@@ -114,7 +114,7 @@ public final class StoreGuildsSorted extends StoreV2 {
                     return false;
                 }
                 Folder folder = (Folder) obj;
-                return this.f2098id == folder.f2098id && m.areEqual(this.guilds, folder.guilds) && m.areEqual(this.color, folder.color) && m.areEqual(this.name, folder.name);
+                return this.f2104id == folder.f2104id && m.areEqual(this.guilds, folder.guilds) && m.areEqual(this.color, folder.color) && m.areEqual(this.name, folder.name);
             }
 
             public final Integer getColor() {
@@ -126,7 +126,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             }
 
             public final long getId() {
-                return this.f2098id;
+                return this.f2104id;
             }
 
             public final String getName() {
@@ -134,7 +134,7 @@ public final class StoreGuildsSorted extends StoreV2 {
             }
 
             public int hashCode() {
-                int a = b.a(this.f2098id) * 31;
+                int a = b.a(this.f2104id) * 31;
                 List<Guild> list = this.guilds;
                 int i = 0;
                 int hashCode = (a + (list != null ? list.hashCode() : 0)) * 31;
@@ -149,7 +149,7 @@ public final class StoreGuildsSorted extends StoreV2 {
 
             public String toString() {
                 StringBuilder L = a.L("Folder(id=");
-                L.append(this.f2098id);
+                L.append(this.f2104id);
                 L.append(", guilds=");
                 L.append(this.guilds);
                 L.append(", color=");
@@ -415,7 +415,7 @@ public final class StoreGuildsSorted extends StoreV2 {
 
     private final Observable<State> observeStores() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<State> h = Observable.h(companion.getGuilds().observeGuilds(), companion.getUserGuildSettings().observeMutedGuildIds().G(StoreGuildsSorted$observeStores$1.INSTANCE), companion.getGuilds().observeJoinedAt(), companion.getUserSettings().observeGuildFolders(), StoreGuildsSorted$observeStores$2.INSTANCE);
+        Observable<State> h = Observable.h(companion.getGuilds().observeGuilds(), companion.getUserGuildSettings().observeMutedGuildIds().F(StoreGuildsSorted$observeStores$1.INSTANCE), companion.getGuilds().observeJoinedAt(), companion.getUserSettings().observeGuildFolders(), StoreGuildsSorted$observeStores$2.INSTANCE);
         m.checkNotNullExpressionValue(h, "Observable.combineLatest…lds, joinedAt, folders) }");
         return h;
     }
@@ -489,15 +489,15 @@ public final class StoreGuildsSorted extends StoreV2 {
     }
 
     public final Observable<List<Entry>> observeEntries() {
-        Observable<List<Entry>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildsSorted$observeEntries$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<List<Entry>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildsSorted$observeEntries$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<LinkedHashMap<Long, Guild>> observeOrderedGuilds() {
-        Observable<LinkedHashMap<Long, Guild>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildsSorted$observeOrderedGuilds$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<LinkedHashMap<Long, Guild>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreGuildsSorted$observeOrderedGuilds$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setPositions(List<? extends Entry> list) {
diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java b/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java
index c153922a90..30329fdb0b 100644
--- a/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java
+++ b/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java
@@ -14,7 +14,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreInstantInvites.kt */
 public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implements Function0<Unit> {
     public final /* synthetic */ String $inviteCode;
-    public final /* synthetic */ String $source;
+    public final /* synthetic */ String $location;
     public final /* synthetic */ StoreInstantInvites this$0;
 
     /* compiled from: StoreInstantInvites.kt */
@@ -60,7 +60,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem
         public final void invoke(ModelInvite modelInvite) {
             m.checkNotNullParameter(modelInvite, "it");
             StoreInstantInvites.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, modelInvite));
-            String str = this.this$0.$source;
+            String str = this.this$0.$location;
             if (str != null) {
                 AnalyticsTracker.INSTANCE.inviteResolved(modelInvite, str);
             }
@@ -131,7 +131,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem
                 error.setShowErrorToasts(false);
                 StoreInstantInvites.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this));
                 StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1 = this.this$0;
-                String str = storeInstantInvites$fetchInviteIfNotLoaded$1.$source;
+                String str = storeInstantInvites$fetchInviteIfNotLoaded$1.$location;
                 if (str != null) {
                     String str2 = storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteCode;
                     Error.Response response = error.getResponse();
@@ -152,7 +152,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem
         super(0);
         this.this$0 = storeInstantInvites;
         this.$inviteCode = str;
-        this.$source = str2;
+        this.$location = str2;
     }
 
     @Override // kotlin.jvm.functions.Function0
diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites.java b/app/src/main/java/com/discord/stores/StoreInstantInvites.java
index 5307b76069..d5d5aff7e1 100644
--- a/app/src/main/java/com/discord/stores/StoreInstantInvites.java
+++ b/app/src/main/java/com/discord/stores/StoreInstantInvites.java
@@ -246,21 +246,21 @@ public final class StoreInstantInvites extends StoreV2 {
 
     public final Observable<InviteState> observeInvite(String str) {
         m.checkNotNullParameter(str, "inviteCode");
-        Observable<InviteState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvite$1(this), 14, null).G(new StoreInstantInvites$observeInvite$2(str)).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<InviteState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvite$1(this), 14, null).F(new StoreInstantInvites$observeInvite$2(str)).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<String, ModelInvite>> observeInvites(long j) {
-        Observable<Map<String, ModelInvite>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvites$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<String, ModelInvite>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvites$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<String, InviteState>> observeKnownInvites() {
-        Observable<Map<String, InviteState>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeKnownInvites$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<String, InviteState>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeKnownInvites$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void onInviteRemoved(ModelInvite modelInvite) {
diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.java b/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.java
index 08f8072d48..2b9426fd18 100644
--- a/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.java
+++ b/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$3.java
@@ -13,7 +13,7 @@ public final class StoreInviteSettings$generateInviteDefaultChannel$3<T, R> impl
         m.checkNotNullExpressionValue(list, "it");
         Channel channel = (Channel) u.firstOrNull((List<? extends Object>) list);
         if (channel != null) {
-            return Long.valueOf(channel.g());
+            return Long.valueOf(channel.h());
         }
         return null;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.java b/app/src/main/java/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.java
index d93f5ca5db..6dc8838058 100644
--- a/app/src/main/java/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.java
+++ b/app/src/main/java/com/discord/stores/StoreInviteSettings$getInvitableChannels$1.java
@@ -32,7 +32,7 @@ public final class StoreInviteSettings$getInvitableChannels$1<T1, T2, R> impleme
                 Channel channel = map.get(Long.valueOf(longValue));
                 if (channel != null) {
                     m.checkNotNullParameter(channel, "$this$isInvitableChannel");
-                    if ((AnimatableValueParser.j1(channel) || AnimatableValueParser.k1(channel)) && PermissionUtils.INSTANCE.hasAccess(channel, Long.valueOf(longValue2)) && PermissionUtils.can(1, Long.valueOf(longValue2))) {
+                    if ((AnimatableValueParser.k1(channel) || AnimatableValueParser.l1(channel)) && PermissionUtils.INSTANCE.hasAccess(channel, Long.valueOf(longValue2)) && PermissionUtils.can(1, Long.valueOf(longValue2))) {
                         hashMap.put(Long.valueOf(longValue), channel);
                     }
                 }
diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings.java b/app/src/main/java/com/discord/stores/StoreInviteSettings.java
index 88c57c7f46..aa39ac4a4a 100644
--- a/app/src/main/java/com/discord/stores/StoreInviteSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreInviteSettings.java
@@ -23,8 +23,8 @@ public final class StoreInviteSettings extends Store {
     public static final String LOCATION_DEEPLINK = "Deeplink";
     public static final String LOCATION_JOIN = "Join Guild Modal";
     private ModelInvite.Settings inviteSettings = new ModelInvite.Settings(86400);
-    private final BehaviorSubject<ModelInvite.Settings> inviteSettingsSubject = BehaviorSubject.m0(this.inviteSettings);
-    private final BehaviorSubject<InviteCode> pendingInviteCodeSubject = BehaviorSubject.m0(null);
+    private final BehaviorSubject<ModelInvite.Settings> inviteSettingsSubject = BehaviorSubject.l0(this.inviteSettings);
+    private final BehaviorSubject<InviteCode> pendingInviteCodeSubject = BehaviorSubject.l0(null);
 
     /* compiled from: StoreInviteSettings.kt */
     public static final class Companion {
@@ -138,9 +138,9 @@ public final class StoreInviteSettings extends Store {
     }
 
     public final Observable<ModelInvite> generateInviteDefaultChannel(long j) {
-        Observable<ModelInvite> A = getInvitableChannels(j).G(StoreInviteSettings$generateInviteDefaultChannel$1.INSTANCE).G(StoreInviteSettings$generateInviteDefaultChannel$2.INSTANCE).G(StoreInviteSettings$generateInviteDefaultChannel$3.INSTANCE).a0(1).A(new StoreInviteSettings$generateInviteDefaultChannel$4(this, j));
-        m.checkNotNullExpressionValue(A, "getInvitableChannels(gui…le.just(null)\n          }");
-        return A;
+        Observable<ModelInvite> z2 = getInvitableChannels(j).F(StoreInviteSettings$generateInviteDefaultChannel$1.INSTANCE).F(StoreInviteSettings$generateInviteDefaultChannel$2.INSTANCE).F(StoreInviteSettings$generateInviteDefaultChannel$3.INSTANCE).Z(1).z(new StoreInviteSettings$generateInviteDefaultChannel$4(this, j));
+        m.checkNotNullExpressionValue(z2, "getInvitableChannels(gui…le.just(null)\n          }");
+        return z2;
     }
 
     public final Observable<Map<Long, Channel>> getInvitableChannels(long j) {
@@ -151,15 +151,15 @@ public final class StoreInviteSettings extends Store {
     }
 
     public final Observable<ModelInvite> getInvite() {
-        Observable<ModelInvite> G = getInviteCode().A(StoreInviteSettings$getInvite$1.INSTANCE).G(StoreInviteSettings$getInvite$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "getInviteCode()\n      .f…-> null\n        }\n      }");
-        return G;
+        Observable<ModelInvite> F = getInviteCode().z(StoreInviteSettings$getInvite$1.INSTANCE).F(StoreInviteSettings$getInvite$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "getInviteCode()\n      .f…-> null\n        }\n      }");
+        return F;
     }
 
     public final Observable<InviteCode> getInviteCode() {
-        Observable<InviteCode> s2 = this.pendingInviteCodeSubject.s();
-        m.checkNotNullExpressionValue(s2, "pendingInviteCodeSubject.distinctUntilChanged()");
-        return s2;
+        Observable<InviteCode> r = this.pendingInviteCodeSubject.r();
+        m.checkNotNullExpressionValue(r, "pendingInviteCodeSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final Experiment getInviteGuildExperiment(long j, boolean z2) {
@@ -174,9 +174,9 @@ public final class StoreInviteSettings extends Store {
     public final Observable<ModelInvite.Settings> getInviteSettings() {
         BehaviorSubject<ModelInvite.Settings> behaviorSubject = this.inviteSettingsSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "inviteSettingsSubject");
-        Observable<ModelInvite.Settings> s2 = ObservableExtensionsKt.computationLatest(behaviorSubject).s();
-        m.checkNotNullExpressionValue(s2, "inviteSettingsSubject\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelInvite.Settings> r = ObservableExtensionsKt.computationLatest(behaviorSubject).r();
+        m.checkNotNullExpressionValue(r, "inviteSettingsSubject\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     public final void handleGuildSelected(long j) {
@@ -198,8 +198,8 @@ public final class StoreInviteSettings extends Store {
     public final void trackWithInvite$app_productionGoogleRelease(Class<?> cls, Function1<? super ModelInvite, Unit> function1) {
         m.checkNotNullParameter(cls, "clazz");
         m.checkNotNullParameter(function1, "trackBlock");
-        Observable<ModelInvite> y2 = getInvite().y(StoreInviteSettings$trackWithInvite$1.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "getInvite()\n        .filter { it != null }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 250, false, 2, null)), cls, (Context) null, (Function1) null, new StoreInviteSettings$trackWithInvite$2(function1), (Function0) null, (Function0) null, function1, 54, (Object) null);
+        Observable<ModelInvite> x2 = getInvite().x(StoreInviteSettings$trackWithInvite$1.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "getInvite()\n        .filter { it != null }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 250, false, 2, null)), cls, (Context) null, (Function1) null, new StoreInviteSettings$trackWithInvite$2(function1), (Function0) null, (Function0) null, function1, 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreLocalActionComponentState.java b/app/src/main/java/com/discord/stores/StoreLocalActionComponentState.java
index 7ed5f5f998..cbd61c95aa 100644
--- a/app/src/main/java/com/discord/stores/StoreLocalActionComponentState.java
+++ b/app/src/main/java/com/discord/stores/StoreLocalActionComponentState.java
@@ -74,9 +74,9 @@ public final class StoreLocalActionComponentState extends StoreV2 {
     }
 
     public final Observable<Map<Long, Map<Integer, List<SelectItem>>>> observeSelectComponentSelections() {
-        Observable<Map<Long, Map<Integer, List<SelectItem>>>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreLocalActionComponentState$observeSelectComponentSelections$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Map<Integer, List<SelectItem>>>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreLocalActionComponentState$observeSelectComponentSelections$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void setSelectComponentSelection(long j, int i, List<SelectItem> list) {
diff --git a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java
index 2752a8b106..7731b73365 100644
--- a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java
+++ b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.google.gson.reflect.TypeToken;
 import java.util.List;
 import java.util.Map;
diff --git a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java
index cdb4a0acaf..94490de4c0 100644
--- a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java
+++ b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java
@@ -3,8 +3,8 @@ package com.discord.stores;
 import android.content.SharedPreferences;
 import c.a.b.a;
 import c.i.d.e;
-import com.discord.api.message.Message;
 import com.discord.app.AppLog;
+import com.discord.models.message.Message;
 import com.discord.utilities.cache.SharedPreferencesProvider;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.message.MessageUtils;
@@ -33,7 +33,7 @@ public final class StoreLocalMessagesHolder {
     private Map<Long, ? extends List<Message>> cacheSnapshot = h0.emptyMap();
     private final Gson gson;
     private final HashMap<Long, TreeMap<Long, Message>> messages = new HashMap<>();
-    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.l0());
+    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.k0());
     private Map<Long, ? extends List<Message>> messagesSnapshot = h0.emptyMap();
     private SharedPreferences sharedPreferences;
     private final Set<Long> updatedChannels = new HashSet();
@@ -68,7 +68,7 @@ public final class StoreLocalMessagesHolder {
                 if (sharedPreferences == null) {
                     m.throwUninitializedPropertyAccessException("sharedPreferences");
                 }
-                sharedPreferences.edit().putString("STORE_LOCAL_MESSAGES_CACHE_V10", m).apply();
+                sharedPreferences.edit().putString("STORE_LOCAL_MESSAGES_CACHE_V11", m).apply();
             }
         }
     }
@@ -103,14 +103,14 @@ public final class StoreLocalMessagesHolder {
     @StoreThread
     public final void addMessage(Message message) {
         m.checkNotNullParameter(message, "message");
-        long i = message.i();
-        TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(i));
+        long channelId = message.getChannelId();
+        TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(channelId));
         if (treeMap == null) {
             treeMap = new TreeMap<>();
         }
-        treeMap.put(Long.valueOf(message.r()), message);
-        this.messages.put(Long.valueOf(i), treeMap);
-        this.updatedChannels.add(Long.valueOf(i));
+        treeMap.put(Long.valueOf(message.getId()), message);
+        this.messages.put(Long.valueOf(channelId), treeMap);
+        this.updatedChannels.add(Long.valueOf(channelId));
         publishIfUpdated$default(this, false, 1, null);
     }
 
@@ -142,7 +142,7 @@ public final class StoreLocalMessagesHolder {
                     break;
                 }
                 obj = it.next();
-                if (m.areEqual(((Message) obj).B(), str)) {
+                if (m.areEqual(((Message) obj).getNonce(), str)) {
                     break;
                 }
             }
@@ -157,16 +157,16 @@ public final class StoreLocalMessagesHolder {
     @StoreThread
     public final void deleteMessage(Message message) {
         m.checkNotNullParameter(message, "message");
-        long r = message.r();
-        long i = message.i();
-        TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(i));
+        long id2 = message.getId();
+        long channelId = message.getChannelId();
+        TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(channelId));
         if (treeMap != null) {
             m.checkNotNullExpressionValue(treeMap, "messages[channelId] ?: return");
-            if (treeMap.containsKey(Long.valueOf(r))) {
-                treeMap.remove(Long.valueOf(r));
-                this.updatedChannels.add(Long.valueOf(i));
+            if (treeMap.containsKey(Long.valueOf(id2))) {
+                treeMap.remove(Long.valueOf(id2));
+                this.updatedChannels.add(Long.valueOf(channelId));
                 if (treeMap.isEmpty()) {
-                    this.messages.remove(Long.valueOf(i));
+                    this.messages.remove(Long.valueOf(channelId));
                 }
             }
             publishIfUpdated$default(this, false, 1, null);
@@ -193,7 +193,7 @@ public final class StoreLocalMessagesHolder {
                 break;
             }
             Object next = it.next();
-            if (m.areEqual(((Message) next).B(), str)) {
+            if (m.areEqual(((Message) next).getNonce(), str)) {
                 obj = next;
                 break;
             }
@@ -214,7 +214,7 @@ public final class StoreLocalMessagesHolder {
                 if (sharedPreferences == null) {
                     m.throwUninitializedPropertyAccessException("sharedPreferences");
                 }
-                String string = sharedPreferences.getString("STORE_LOCAL_MESSAGES_CACHE_V10", null);
+                String string = sharedPreferences.getString("STORE_LOCAL_MESSAGES_CACHE_V11", null);
                 for (Map.Entry entry : (string != null ? (Map) this.gson.g(string, new StoreLocalMessagesHolder$init$type$1().getType()) : h0.emptyMap()).entrySet()) {
                     long longValue = ((Number) entry.getKey()).longValue();
                     this.messages.put(Long.valueOf(longValue), new TreeMap<>(MessageUtils.getSORT_BY_IDS_COMPARATOR()));
@@ -223,7 +223,7 @@ public final class StoreLocalMessagesHolder {
                         treeMap = new TreeMap<>();
                     }
                     for (Message message : (List) entry.getValue()) {
-                        treeMap.put(Long.valueOf(message.r()), message);
+                        treeMap.put(Long.valueOf(message.getId()), message);
                     }
                     this.messages.put(Long.valueOf(longValue), treeMap);
                     this.updatedChannels.add(Long.valueOf(longValue));
diff --git a/app/src/main/java/com/discord/stores/StoreLurking.java b/app/src/main/java/com/discord/stores/StoreLurking.java
index fa7cd6d6ca..34f96852b0 100644
--- a/app/src/main/java/com/discord/stores/StoreLurking.java
+++ b/app/src/main/java/com/discord/stores/StoreLurking.java
@@ -30,7 +30,7 @@ public final class StoreLurking {
     private final StoreGuilds guildsStore;
     private LurkRequest lurkRequest;
     private final Map<Long, LurkContext> lurkedGuilds = new LinkedHashMap();
-    private final BehaviorSubject<Map<Long, LurkContext>> lurkedGuildsSubject = BehaviorSubject.m0(new LinkedHashMap());
+    private final BehaviorSubject<Map<Long, LurkContext>> lurkedGuildsSubject = BehaviorSubject.l0(new LinkedHashMap());
     private String sessionId;
     private final StoreStream stream;
 
@@ -310,9 +310,9 @@ public final class StoreLurking {
     }
 
     public final Observable<Set<Long>> getLurkingGuildIds() {
-        Observable<R> G = this.lurkedGuildsSubject.G(StoreLurking$getLurkingGuildIds$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "lurkedGuildsSubject.map { it.keys }");
-        return G;
+        Observable<R> F = this.lurkedGuildsSubject.F(StoreLurking$getLurkingGuildIds$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "lurkedGuildsSubject.map { it.keys }");
+        return F;
     }
 
     public final Set<Long> getLurkingGuildIdsSync() {
@@ -366,7 +366,7 @@ public final class StoreLurking {
         Set<Long> keySet = this.lurkedGuilds.keySet();
         ArrayList<Number> arrayList = new ArrayList();
         for (Object obj : keySet) {
-            if (channel == null || ((Number) obj).longValue() != channel.e()) {
+            if (channel == null || ((Number) obj).longValue() != channel.f()) {
                 arrayList.add(obj);
             }
         }
@@ -391,9 +391,9 @@ public final class StoreLurking {
     }
 
     public final Observable<Boolean> isLurkingObs(long j) {
-        Observable<Boolean> s2 = Observable.j(getLurkingGuildIds(), this.stream.getGuilds$app_productionGoogleRelease().observeGuild(j), StoreLurking$isLurkingObs$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = Observable.j(getLurkingGuildIds(), this.stream.getGuilds$app_productionGoogleRelease().observeGuild(j), StoreLurking$isLurkingObs$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void postJoinGuildAsMember(long j) {
@@ -402,7 +402,7 @@ public final class StoreLurking {
 
     public final void removeOldLurkingGuilds(long j) {
         Channel channel = this.stream.getChannels$app_productionGoogleRelease().getChannel(this.stream.getVoiceChannelSelected$app_productionGoogleRelease().getSelectedVoiceChannelId());
-        Long valueOf = channel != null ? Long.valueOf(channel.e()) : null;
+        Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
         Set<Long> keySet = this.lurkedGuilds.keySet();
         ArrayList<Number> arrayList = new ArrayList();
         for (Object obj : keySet) {
diff --git a/app/src/main/java/com/discord/stores/StoreMFA.java b/app/src/main/java/com/discord/stores/StoreMFA.java
index 7661201517..8ee6890d7c 100644
--- a/app/src/main/java/com/discord/stores/StoreMFA.java
+++ b/app/src/main/java/com/discord/stores/StoreMFA.java
@@ -120,9 +120,9 @@ public final class StoreMFA extends StoreV2 {
     }
 
     public final Observable<State> observeState() {
-        Observable<State> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMFA$observeState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<State> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMFA$observeState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void togglingSMSBackup() {
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java
index bf4196719e..f8cf903b80 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java
@@ -4,7 +4,7 @@ import d0.w.h.a.d;
 import d0.w.h.a.e;
 import kotlin.coroutines.Continuation;
 /* compiled from: StoreMediaEngine.kt */
-@e(c = "com.discord.stores.StoreMediaEngine", f = "StoreMediaEngine.kt", l = {193}, m = "getDefaultVideoDeviceGUID")
+@e(c = "com.discord.stores.StoreMediaEngine", f = "StoreMediaEngine.kt", l = {194}, m = "getDefaultVideoDeviceGUID")
 public final class StoreMediaEngine$getDefaultVideoDeviceGUID$1 extends d {
     public Object L$0;
     public int label;
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java
index d05fe31868..f950ce95b1 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import c.a.r.j0.a;
+import c.a.r.k0.a;
 import com.discord.app.AppLog;
 import com.discord.rtcconnection.KrispOveruseDetector;
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java
index cee6f2ffc4..e615d9273f 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDevice$1.java
@@ -12,7 +12,7 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.functions.Function2;
 import kotlinx.coroutines.CoroutineScope;
 /* compiled from: StoreMediaEngine.kt */
-@e(c = "com.discord.stores.StoreMediaEngine$selectDefaultVideoDevice$1", f = "StoreMediaEngine.kt", l = {173}, m = "invokeSuspend")
+@e(c = "com.discord.stores.StoreMediaEngine$selectDefaultVideoDevice$1", f = "StoreMediaEngine.kt", l = {174}, m = "invokeSuspend")
 public final class StoreMediaEngine$selectDefaultVideoDevice$1 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
     public final /* synthetic */ Function1 $onSelected;
     public int label;
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java
index 60f845d112..981c0dd2bc 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java
@@ -4,7 +4,7 @@ import d0.w.h.a.d;
 import d0.w.h.a.e;
 import kotlin.coroutines.Continuation;
 /* compiled from: StoreMediaEngine.kt */
-@e(c = "com.discord.stores.StoreMediaEngine", f = "StoreMediaEngine.kt", l = {186}, m = "selectDefaultVideoDeviceAsync")
+@e(c = "com.discord.stores.StoreMediaEngine", f = "StoreMediaEngine.kt", l = {187}, m = "selectDefaultVideoDeviceAsync")
 public final class StoreMediaEngine$selectDefaultVideoDeviceAsync$1 extends d {
     public Object L$0;
     public int label;
diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine.java b/app/src/main/java/com/discord/stores/StoreMediaEngine.java
index 8bb2897090..1172d1c7b5 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaEngine.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaEngine.java
@@ -4,17 +4,19 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
+import android.os.Handler;
 import android.os.PowerManager;
+import c.a.r.g0;
 import c.q.a.k.a;
 import co.discord.media_engine.RtcRegion;
 import co.discord.media_engine.VideoInputDeviceDescription;
 import co.discord.media_engine.VideoInputDeviceFacing;
+import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.app.AppLog;
 import com.discord.models.domain.ModelPayload;
 import com.discord.models.domain.ModelRtcLatencyRegion;
 import com.discord.rtcconnection.KrispOveruseDetector;
 import com.discord.rtcconnection.LowMemoryDetector;
-import com.discord.rtcconnection.ThermalDetector;
 import com.discord.rtcconnection.mediaengine.MediaEngine;
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import com.discord.stores.StoreMediaSettings;
@@ -23,6 +25,7 @@ import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
+import com.discord.utilities.systemlog.SystemLogUtils;
 import com.hammerandchisel.libdiscord.Discord;
 import d0.l;
 import d0.t.j;
@@ -73,7 +76,7 @@ public final class StoreMediaEngine extends Store {
     private Long previousVoiceChannelId;
     private final SerializedSubject<Boolean, Boolean> pttActiveSubject;
     private VideoInputDeviceDescription selectedVideoInputDevice;
-    private final BehaviorSubject<VideoInputDeviceDescription> selectedVideoInputDeviceSubject = BehaviorSubject.m0(this.selectedVideoInputDevice);
+    private final BehaviorSubject<VideoInputDeviceDescription> selectedVideoInputDeviceSubject = BehaviorSubject.l0(this.selectedVideoInputDevice);
     private final StoreStream storeStream;
     private long userId;
     private VideoInputDeviceDescription[] videoInputDevices;
@@ -111,8 +114,8 @@ public final class StoreMediaEngine extends Store {
 
     /* compiled from: StoreMediaEngine.kt */
     public final class EngineListener implements MediaEngine.b {
+        private long debugPrintableId = -1;
         private final LowMemoryDetector lowMemoryDetector = new LowMemoryDetector();
-        private ThermalDetector thermalDetector;
 
         public EngineListener() {
         }
@@ -121,19 +124,26 @@ public final class StoreMediaEngine extends Store {
             return ApplicationProvider.INSTANCE.get();
         }
 
-        private final PowerManager getPowerManager() {
-            Object systemService = getContext().getSystemService("power");
-            Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.os.PowerManager");
-            return (PowerManager) systemService;
-        }
-
         public void onDestroy() {
             getContext().unregisterComponentCallbacks(this.lowMemoryDetector);
             if (Build.VERSION.SDK_INT >= 29) {
-                PowerManager powerManager = getPowerManager();
-                ThermalDetector thermalDetector = this.thermalDetector;
-                m.checkNotNull(thermalDetector);
-                powerManager.removeThermalStatusListener(thermalDetector);
+                g0 g0Var = g0.m;
+                synchronized (g0Var) {
+                    if (g0.j) {
+                        AnimatableValueParser.C1("ThermalDetector", "unregister");
+                        Object systemService = ApplicationProvider.INSTANCE.get().getSystemService("power");
+                        Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.os.PowerManager");
+                        ((PowerManager) systemService).removeThermalStatusListener(g0Var);
+                        g0.j = false;
+                        g0.k = false;
+                        if (g0.l) {
+                            ((Handler) g0.i.getValue()).removeCallbacks(g0Var);
+                            g0.l = false;
+                        }
+                    }
+                }
+                SystemLogUtils.INSTANCE.getDebugPrintables$app_productionGoogleRelease().remove(this.debugPrintableId);
+                this.debugPrintableId = -1;
             }
         }
 
@@ -141,11 +151,17 @@ public final class StoreMediaEngine extends Store {
         public void onNativeEngineInitialized() {
             getContext().registerComponentCallbacks(this.lowMemoryDetector);
             if (Build.VERSION.SDK_INT >= 29) {
-                this.thermalDetector = new ThermalDetector();
-                PowerManager powerManager = getPowerManager();
-                ThermalDetector thermalDetector = this.thermalDetector;
-                m.checkNotNull(thermalDetector);
-                powerManager.addThermalStatusListener(thermalDetector);
+                g0 g0Var = g0.m;
+                synchronized (g0Var) {
+                    if (!g0.j) {
+                        AnimatableValueParser.C1("ThermalDetector", "register");
+                        Object systemService = ApplicationProvider.INSTANCE.get().getSystemService("power");
+                        Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.os.PowerManager");
+                        ((PowerManager) systemService).addThermalStatusListener(g0Var);
+                        g0.j = true;
+                    }
+                }
+                this.debugPrintableId = SystemLogUtils.INSTANCE.getDebugPrintables$app_productionGoogleRelease().add(g0Var, "ThermalDetector");
             }
             StoreMediaEngine.access$handleNativeEngineInitialized(StoreMediaEngine.this);
         }
@@ -183,21 +199,21 @@ public final class StoreMediaEngine extends Store {
         this.mediaSettingsStore = storeMediaSettings;
         this.storeStream = storeStream;
         this.dispatcher = dispatcher;
-        SerializedSubject<MediaEngine.LocalVoiceStatus, MediaEngine.LocalVoiceStatus> serializedSubject = new SerializedSubject<>(BehaviorSubject.m0(LOCAL_VOICE_STATUS_DEFAULT));
+        SerializedSubject<MediaEngine.LocalVoiceStatus, MediaEngine.LocalVoiceStatus> serializedSubject = new SerializedSubject<>(BehaviorSubject.l0(LOCAL_VOICE_STATUS_DEFAULT));
         this.localVoiceStatusSubject = serializedSubject;
         Boolean bool = Boolean.FALSE;
-        this.pttActiveSubject = new SerializedSubject<>(BehaviorSubject.m0(bool));
+        this.pttActiveSubject = new SerializedSubject<>(BehaviorSubject.l0(bool));
         VideoInputDeviceDescription[] videoInputDeviceDescriptionArr = new VideoInputDeviceDescription[0];
         this.videoInputDevices = videoInputDeviceDescriptionArr;
-        this.videoInputDevicesSubject = BehaviorSubject.m0(j.asList(videoInputDeviceDescriptionArr));
-        this.openSLESConfigSubject = new SerializedSubject<>(BehaviorSubject.l0());
-        this.isNativeEngineInitializedSubject = new SerializedSubject<>(BehaviorSubject.m0(bool));
+        this.videoInputDevicesSubject = BehaviorSubject.l0(j.asList(videoInputDeviceDescriptionArr));
+        this.openSLESConfigSubject = new SerializedSubject<>(BehaviorSubject.k0());
+        this.isNativeEngineInitializedSubject = new SerializedSubject<>(BehaviorSubject.l0(bool));
         this.userId = -1;
         this.hasNativeEngineEverInitializedCache = new Persister<>("CACHE_KEY_NATIVE_ENGINE_EVER_INITIALIZED", Boolean.valueOf(this.hasNativeEngineEverInitialized));
-        this.onKrispStatusSubject = PublishSubject.l0();
-        Observable<MediaEngine.LocalVoiceStatus> R = ObservableExtensionsKt.computationLatest(serializedSubject).s().v(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$1(this))).w(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$2(this))).R();
-        m.checkNotNullExpressionValue(R, "localVoiceStatusSubject\n…ening)\n          .share()");
-        this.localVoiceStatus = R;
+        this.onKrispStatusSubject = PublishSubject.k0();
+        Observable<MediaEngine.LocalVoiceStatus> Q = ObservableExtensionsKt.computationLatest(serializedSubject).r().u(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$1(this))).v(new StoreMediaEngine$sam$rx_functions_Action0$0(new StoreMediaEngine$localVoiceStatus$2(this))).Q();
+        m.checkNotNullExpressionValue(Q, "localVoiceStatusSubject\n…ening)\n          .share()");
+        this.localVoiceStatus = Q;
     }
 
     public static final /* synthetic */ void access$disableLocalVoiceStatusListening(StoreMediaEngine storeMediaEngine) {
@@ -555,9 +571,9 @@ public final class StoreMediaEngine extends Store {
     }
 
     public final Observable<VideoInputDeviceDescription> getSelectedVideoInputDevice() {
-        Observable<VideoInputDeviceDescription> s2 = this.selectedVideoInputDeviceSubject.s();
-        m.checkNotNullExpressionValue(s2, "selectedVideoInputDevice…  .distinctUntilChanged()");
-        return s2;
+        Observable<VideoInputDeviceDescription> r = this.selectedVideoInputDeviceSubject.r();
+        m.checkNotNullExpressionValue(r, "selectedVideoInputDevice…  .distinctUntilChanged()");
+        return r;
     }
 
     public final VideoInputDeviceDescription getSelectedVideoInputDeviceBlocking() {
@@ -565,9 +581,9 @@ public final class StoreMediaEngine extends Store {
     }
 
     public final Observable<List<VideoInputDeviceDescription>> getVideoInputDevices() {
-        Observable<List<VideoInputDeviceDescription>> s2 = this.videoInputDevicesSubject.s();
-        m.checkNotNullExpressionValue(s2, "videoInputDevicesSubject…  .distinctUntilChanged()");
-        return s2;
+        Observable<List<VideoInputDeviceDescription>> r = this.videoInputDevicesSubject.r();
+        m.checkNotNullExpressionValue(r, "videoInputDevicesSubject…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Object getVideoInputDevicesNativeAsync(Continuation<? super VideoInputDeviceDescription[]> continuation) {
@@ -596,9 +612,9 @@ public final class StoreMediaEngine extends Store {
     }
 
     public final void handleMicrophonePermissionGranted() {
-        Observable<Boolean> a02 = this.isNativeEngineInitializedSubject.a0(1);
-        m.checkNotNullExpressionValue(a02, "isNativeEngineInitializedSubject\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$handleMicrophonePermissionGranted$1(this), 62, (Object) null);
+        Observable<Boolean> Z = this.isNativeEngineInitializedSubject.Z(1);
+        m.checkNotNullExpressionValue(Z, "isNativeEngineInitializedSubject\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$handleMicrophonePermissionGranted$1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:8:0x0010, code lost:
@@ -642,16 +658,16 @@ public final class StoreMediaEngine extends Store {
         m.checkNotNullParameter(newSingleThreadExecutor, "singleThreadExecutorService");
         m.checkNotNullParameter(valueOf, "openSLESConfig");
         m.checkNotNullParameter(appLog, "logger");
-        c.a.r.j0.c.j jVar = new c.a.r.j0.c.j(context, new c.a.r.c(newSingleThreadExecutor, false), valueOf, appLog, null, null, 48);
+        c.a.r.k0.c.j jVar = new c.a.r.k0.c.j(context, new c.a.r.c(newSingleThreadExecutor, false), valueOf, appLog, null, null, 48);
         EngineListener engineListener = new EngineListener();
         m.checkNotNullParameter(engineListener, "listener");
         jVar.e.add(engineListener);
         this.mediaEngine = jVar;
-        Observable<R> G = this.storeStream.getExperiments$app_productionGoogleRelease().observeUserExperiment("2021-05_opensl_default_enable_android", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable a02 = G.a0(1);
-        m.checkNotNullExpressionValue(a02, "storeStream.experiments.…erNull()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(a02), StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$init$2(this), 62, (Object) null);
+        Observable<R> F = this.storeStream.getExperiments$app_productionGoogleRelease().observeUserExperiment("2021-05_opensl_default_enable_android", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "storeStream.experiments.…erNull()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(Z), StoreMediaEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaEngine$init$2(this), 62, (Object) null);
     }
 
     public final Observable<KrispOveruseDetector.Status> onKrispStatusEvent() {
diff --git a/app/src/main/java/com/discord/stores/StoreMediaFavorites.java b/app/src/main/java/com/discord/stores/StoreMediaFavorites.java
index e601919af2..860479cfb7 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaFavorites.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaFavorites.java
@@ -268,9 +268,9 @@ public final class StoreMediaFavorites extends StoreV2 {
 
     public final Observable<Set<Favorite>> observeFavorites(Set<? extends c<? extends Favorite>> set) {
         m.checkNotNullParameter(set, "types");
-        Observable<Set<Favorite>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMediaFavorites$observeFavorites$1(this, set), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Favorite>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMediaFavorites$observeFavorites$1(this, set), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void removeFavorite(Favorite favorite) {
diff --git a/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java b/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
index 9c23862a7a..3d75edaef4 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaSettings$init$1.java
@@ -33,13 +33,13 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
         }
 
         public final Observable<? extends Boolean> call(Channel channel) {
-            if (channel == null || AnimatableValueParser.r1(channel) || AnimatableValueParser.u1(channel)) {
+            if (channel == null || AnimatableValueParser.s1(channel) || AnimatableValueParser.v1(channel)) {
                 return new j(Boolean.TRUE);
             }
             StorePermissions access$getStorePermissions$p = StoreMediaSettings.access$getStorePermissions$p(this.this$0.this$0);
             Long l = this.$id;
             m.checkNotNullExpressionValue(l, "id");
-            return access$getStorePermissions$p.observePermissionsForChannel(l.longValue()).G(AnonymousClass1.INSTANCE);
+            return access$getStorePermissions$p.observePermissionsForChannel(l.longValue()).F(AnonymousClass1.INSTANCE);
         }
     }
 
@@ -50,6 +50,6 @@ public final class StoreMediaSettings$init$1<T, R> implements b<Long, Observable
     public final Observable<? extends Boolean> call(Long l) {
         StoreChannels access$getStoreChannels$p = StoreMediaSettings.access$getStoreChannels$p(this.this$0);
         m.checkNotNullExpressionValue(l, "id");
-        return access$getStoreChannels$p.observeChannel(l.longValue()).Z(new AnonymousClass1(this, l));
+        return access$getStoreChannels$p.observeChannel(l.longValue()).Y(new AnonymousClass1(this, l));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMediaSettings.java b/app/src/main/java/com/discord/stores/StoreMediaSettings.java
index ab36473d49..431d9058e8 100644
--- a/app/src/main/java/com/discord/stores/StoreMediaSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreMediaSettings.java
@@ -420,7 +420,7 @@ public final class StoreMediaSettings extends Store {
         this.appSoundManager = appSoundManager;
         VoiceConfiguration default_voice_config = VoiceConfiguration.Companion.getDEFAULT_VOICE_CONFIG();
         this.voiceConfiguration = default_voice_config;
-        this.voiceConfigurationSubject = new SerializedSubject<>(BehaviorSubject.m0(default_voice_config));
+        this.voiceConfigurationSubject = new SerializedSubject<>(BehaviorSubject.l0(default_voice_config));
         this.canUseVad = true;
     }
 
@@ -463,11 +463,11 @@ public final class StoreMediaSettings extends Store {
     }
 
     public final Observable<MediaEngineConnection.InputMode> getInputMode() {
-        Observable<VoiceConfiguration> G = this.voiceConfigurationSubject.G(StoreMediaSettings$getInputMode$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "voiceConfigurationSubjec…    .map { it.inputMode }");
-        Observable<MediaEngineConnection.InputMode> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getInputMode$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…    .map { it.inputMode }");
+        Observable<MediaEngineConnection.InputMode> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final synchronized Map<Long, Boolean> getMutedUsers() {
@@ -475,27 +475,27 @@ public final class StoreMediaSettings extends Store {
     }
 
     public final Observable<Map<Long, Boolean>> getUsersMuted() {
-        Observable<VoiceConfiguration> G = this.voiceConfigurationSubject.G(StoreMediaSettings$getUsersMuted$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "voiceConfigurationSubjec…   .map { it.mutedUsers }");
-        Observable<Map<Long, Boolean>> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getUsersMuted$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…   .map { it.mutedUsers }");
+        Observable<Map<Long, Boolean>> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Boolean>> getUsersOffScreen() {
-        Observable<VoiceConfiguration> G = this.voiceConfigurationSubject.G(StoreMediaSettings$getUsersOffScreen$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "voiceConfigurationSubjec…map { it.offScreenUsers }");
-        Observable<Map<Long, Boolean>> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getUsersOffScreen$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…map { it.offScreenUsers }");
+        Observable<Map<Long, Boolean>> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Float>> getUsersVolume() {
-        Observable<VoiceConfiguration> G = this.voiceConfigurationSubject.G(StoreMediaSettings$getUsersVolume$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "voiceConfigurationSubjec… { it.userOutputVolumes }");
-        Observable<Map<Long, Float>> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$getUsersVolume$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec… { it.userOutputVolumes }");
+        Observable<Map<Long, Float>> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final synchronized boolean getVideoHardwareScalingBlocking() {
@@ -503,9 +503,9 @@ public final class StoreMediaSettings extends Store {
     }
 
     public final Observable<VoiceConfiguration> getVoiceConfig() {
-        Observable<VoiceConfiguration> s2 = ObservableExtensionsKt.computationLatest(this.voiceConfigurationSubject).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> r = ObservableExtensionsKt.computationLatest(this.voiceConfigurationSubject).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<VoiceConfiguration> getVoiceConfiguration() {
@@ -519,32 +519,32 @@ public final class StoreMediaSettings extends Store {
     @StoreThread
     public final void handleVoiceChannelSelected(long j) {
         Channel findChannelByIdInternal$app_productionGoogleRelease = this.storeChannels.findChannelByIdInternal$app_productionGoogleRelease(j);
-        if (findChannelByIdInternal$app_productionGoogleRelease != null && AnimatableValueParser.r1(findChannelByIdInternal$app_productionGoogleRelease)) {
+        if (findChannelByIdInternal$app_productionGoogleRelease != null && AnimatableValueParser.s1(findChannelByIdInternal$app_productionGoogleRelease)) {
             setSelfDeafen(false);
         }
     }
 
     public final void init() {
         setVoiceConfiguration(this.voiceConfigurationCache.read());
-        Observable<R> Z = this.storeVoiceChannelSelected.observeSelectedVoiceChannelId().Z(new StoreMediaSettings$init$1(this));
-        m.checkNotNullExpressionValue(Z, "storeVoiceChannelSelecte…              }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(Z, StoreMediaSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaSettings$init$2(this), 62, (Object) null);
+        Observable<R> Y = this.storeVoiceChannelSelected.observeSelectedVoiceChannelId().Y(new StoreMediaSettings$init$1(this));
+        m.checkNotNullExpressionValue(Y, "storeVoiceChannelSelecte…              }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(Y, StoreMediaSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMediaSettings$init$2(this), 62, (Object) null);
     }
 
     public final Observable<Boolean> isSelfDeafened() {
-        Observable<VoiceConfiguration> G = this.voiceConfigurationSubject.G(StoreMediaSettings$isSelfDeafened$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "voiceConfigurationSubjec…map { it.isSelfDeafened }");
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$isSelfDeafened$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec…map { it.isSelfDeafened }");
+        Observable<Boolean> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> isSelfMuted() {
-        Observable<VoiceConfiguration> G = this.voiceConfigurationSubject.G(StoreMediaSettings$isSelfMuted$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "voiceConfigurationSubjec….map { it.isSelfMuted() }");
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "voiceConfigurationSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<VoiceConfiguration> F = this.voiceConfigurationSubject.F(StoreMediaSettings$isSelfMuted$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "voiceConfigurationSubjec….map { it.isSelfMuted() }");
+        Observable<Boolean> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "voiceConfigurationSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final synchronized void revertTemporaryDisableKrisp() {
diff --git a/app/src/main/java/com/discord/stores/StoreMentions.java b/app/src/main/java/com/discord/stores/StoreMentions.java
index 4a75dabac5..d9b614efeb 100644
--- a/app/src/main/java/com/discord/stores/StoreMentions.java
+++ b/app/src/main/java/com/discord/stores/StoreMentions.java
@@ -5,19 +5,19 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
 import com.discord.api.guildmember.GuildMember;
-import com.discord.api.message.Message;
 import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.User;
+import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.domain.ModelMessageDelete;
 import com.discord.models.domain.ModelNotificationSettings;
 import com.discord.models.domain.ModelPayload;
 import com.discord.models.domain.ModelReadState;
 import com.discord.models.domain.ModelUserRelationship;
+import com.discord.models.message.Message;
 import com.discord.models.thread.dto.ModelThreadListSync;
 import com.discord.stores.StoreMessageAck;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.persister.Persister;
 import d0.t.h0;
@@ -111,13 +111,13 @@ public final class StoreMentions extends StoreV2 {
             }
         }
         for (Message message : this.mentionedMessages.values()) {
-            long i = message.i();
-            User g = message.g();
-            if (!ModelUserRelationship.isType(this.storeUserRelationships.getRelationships().get(g != null ? Long.valueOf(g.i()) : null), 2) && isMentionableChannel(i)) {
-                StoreMessageAck.Ack ack2 = allInternal.get(Long.valueOf(i));
-                if (ack2 == null || ack2.component1() < message.r()) {
-                    Long valueOf2 = Long.valueOf(i);
-                    Integer num2 = (Integer) hashMap.get(Long.valueOf(i));
+            long channelId = message.getChannelId();
+            User author = message.getAuthor();
+            if (!ModelUserRelationship.isType(this.storeUserRelationships.getRelationships().get(author != null ? Long.valueOf(author.i()) : null), 2) && isMentionableChannel(channelId)) {
+                StoreMessageAck.Ack ack2 = allInternal.get(Long.valueOf(channelId));
+                if (ack2 == null || ack2.component1() < message.getId()) {
+                    Long valueOf2 = Long.valueOf(channelId);
+                    Integer num2 = (Integer) hashMap.get(Long.valueOf(channelId));
                     if (num2 == null) {
                         num2 = 0;
                     }
@@ -128,69 +128,78 @@ public final class StoreMentions extends StoreV2 {
         return hashMap;
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:34:0x009f A[RETURN] */
+    /* JADX WARNING: Removed duplicated region for block: B:36:0x008f A[RETURN] */
     @StoreThread
-    private final boolean hasMention(Message message) {
-        List<Long> list;
-        List<Long> y2;
+    private final boolean hasMention(long j, User user, UtcDateTime utcDateTime, List<User> list, List<Long> list2, Boolean bool) {
+        List<Long> list3;
         boolean z2;
         boolean z3;
         ModelNotificationSettings modelNotificationSettings;
         ModelNotificationSettings.ChannelOverride channelOverride;
-        Long l = this.channelGuildIds.get(Long.valueOf(message.i()));
+        Long l = this.channelGuildIds.get(Long.valueOf(j));
         if (l == null) {
             l = 0L;
         }
         m.checkNotNullExpressionValue(l, "channelGuildIds[channelId] ?: 0");
         long longValue = l.longValue();
-        User g = message.g();
-        if ((g != null && g.i() == this.myId) || MessageUtils.INSTANCE.getEditedTimestampMillis(message) > 0) {
-            return false;
-        }
-        Map<Long, ModelNotificationSettings> guildSettingsInternal$app_productionGoogleRelease = this.storeUserGuildSettings.getGuildSettingsInternal$app_productionGoogleRelease();
-        if (this.privateChannels.contains(Long.valueOf(message.i())) && ((modelNotificationSettings = guildSettingsInternal$app_productionGoogleRelease.get(0L)) == null || (channelOverride = modelNotificationSettings.getChannelOverride(message.i())) == null || !channelOverride.isMuted())) {
-            return true;
-        }
-        List<User> z4 = message.z();
-        if (z4 != null) {
-            if (!z4.isEmpty()) {
-                Iterator<T> it = z4.iterator();
-                while (true) {
-                    if (!it.hasNext()) {
-                        break;
-                    }
-                    if (((User) it.next()).i() == this.myId) {
-                        z3 = true;
-                        continue;
-                    } else {
-                        z3 = false;
-                        continue;
-                    }
-                    if (z3) {
-                        z2 = true;
-                        break;
-                    }
-                }
-                if (z2) {
+        if (user == null || user.i() != this.myId) {
+            if ((utcDateTime != null ? utcDateTime.f() : 0) <= 0) {
+                Map<Long, ModelNotificationSettings> guildSettingsInternal$app_productionGoogleRelease = this.storeUserGuildSettings.getGuildSettingsInternal$app_productionGoogleRelease();
+                if (this.privateChannels.contains(Long.valueOf(j)) && ((modelNotificationSettings = guildSettingsInternal$app_productionGoogleRelease.get(0L)) == null || (channelOverride = modelNotificationSettings.getChannelOverride(j)) == null || !channelOverride.isMuted())) {
                     return true;
                 }
-            }
-            z2 = false;
-            if (z2) {
+                if (list != null) {
+                    if (!list.isEmpty()) {
+                        Iterator<T> it = list.iterator();
+                        while (true) {
+                            if (!it.hasNext()) {
+                                break;
+                            }
+                            if (((User) it.next()).i() == this.myId) {
+                                z3 = true;
+                                continue;
+                            } else {
+                                z3 = false;
+                                continue;
+                            }
+                            if (z3) {
+                                z2 = true;
+                                break;
+                            }
+                        }
+                        if (z2) {
+                            return true;
+                        }
+                    }
+                    z2 = false;
+                    if (z2) {
+                    }
+                }
+                ModelNotificationSettings modelNotificationSettings2 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue));
+                if (!((modelNotificationSettings2 != null && modelNotificationSettings2.isSuppressRoles()) || (list3 = this.myRoleIds.get(Long.valueOf(longValue))) == null || list2 == null)) {
+                    Iterator<T> it2 = list2.iterator();
+                    if (it2.hasNext()) {
+                        return list3.contains(Long.valueOf(((Number) it2.next()).longValue()));
+                    }
+                }
+                if (!m.areEqual(bool, Boolean.TRUE)) {
+                    return false;
+                }
+                ModelNotificationSettings modelNotificationSettings3 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue));
+                return modelNotificationSettings3 == null || !modelNotificationSettings3.isSuppressEveryone();
             }
         }
-        ModelNotificationSettings modelNotificationSettings2 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue));
-        if (!((modelNotificationSettings2 != null && modelNotificationSettings2.isSuppressRoles()) || (list = this.myRoleIds.get(Long.valueOf(longValue))) == null || (y2 = message.y()) == null)) {
-            Iterator<T> it2 = y2.iterator();
-            if (it2.hasNext()) {
-                return list.contains(Long.valueOf(((Number) it2.next()).longValue()));
-            }
-        }
-        if (!m.areEqual(message.x(), Boolean.TRUE)) {
-            return false;
-        }
-        ModelNotificationSettings modelNotificationSettings3 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue));
-        return modelNotificationSettings3 == null || !modelNotificationSettings3.isSuppressEveryone();
+        return false;
+    }
+
+    @StoreThread
+    private final boolean hasMention(com.discord.api.message.Message message) {
+        return hasMention(message.g(), message.e(), message.j(), message.t(), message.s(), message.r());
+    }
+
+    @StoreThread
+    private final boolean hasMention(Message message) {
+        return hasMention(message.getChannelId(), message.getAuthor(), message.getEditedTimestamp(), message.getMentions(), message.getMentionRoles(), message.getMentionEveryone());
     }
 
     @StoreThread
@@ -208,7 +217,7 @@ public final class StoreMentions extends StoreV2 {
         HashMap<Long, Message> hashMap = this.mentionedMessages;
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry<Long, Message> entry : hashMap.entrySet()) {
-            if (entry.getValue().i() == j) {
+            if (entry.getValue().getChannelId() == j) {
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }
@@ -225,18 +234,18 @@ public final class StoreMentions extends StoreV2 {
     @StoreThread
     public final void handleChannelOrThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        this.channelGuildIds.put(Long.valueOf(channel.g()), Long.valueOf(channel.e()));
-        if (AnimatableValueParser.r1(channel) && !AnimatableValueParser.o1(channel)) {
-            this.privateChannels.add(Long.valueOf(channel.g()));
+        this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(channel.f()));
+        if (AnimatableValueParser.s1(channel) && !AnimatableValueParser.p1(channel)) {
+            this.privateChannels.add(Long.valueOf(channel.h()));
         }
     }
 
     @StoreThread
     public final void handleChannelOrThreadDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        this.channelGuildIds.remove(Long.valueOf(channel.g()));
-        this.privateChannels.remove(Long.valueOf(channel.g()));
-        removeAllMessagesForChannel(channel.g());
+        this.channelGuildIds.remove(Long.valueOf(channel.h()));
+        this.privateChannels.remove(Long.valueOf(channel.h()));
+        removeAllMessagesForChannel(channel.h());
     }
 
     @StoreThread
@@ -263,13 +272,13 @@ public final class StoreMentions extends StoreV2 {
         for (Object obj : privateChannels) {
             Channel channel = (Channel) obj;
             m.checkNotNullExpressionValue(channel, "it");
-            if (!AnimatableValueParser.o1(channel)) {
+            if (!AnimatableValueParser.p1(channel)) {
                 S.add(obj);
             }
         }
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(S, 10));
         for (Channel channel2 : S) {
-            arrayList.add(Long.valueOf(channel2.g()));
+            arrayList.add(Long.valueOf(channel2.h()));
         }
         hashSet.addAll(arrayList);
         ModelPayload.VersionedReadStates readState = modelPayload.getReadState();
@@ -336,13 +345,13 @@ public final class StoreMentions extends StoreV2 {
         List<Channel> g = guild.g();
         if (g != null) {
             for (Channel channel : g) {
-                this.channelGuildIds.put(Long.valueOf(channel.g()), Long.valueOf(guild.o()));
+                this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(guild.o()));
             }
         }
         List<Channel> K = guild.K();
         if (K != null) {
             for (Channel channel2 : K) {
-                this.channelGuildIds.put(Long.valueOf(channel2.g()), Long.valueOf(guild.o()));
+                this.channelGuildIds.put(Long.valueOf(channel2.h()), Long.valueOf(guild.o()));
             }
         }
     }
@@ -365,10 +374,10 @@ public final class StoreMentions extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleMessageCreateOrUpdate(Message message) {
+    public final void handleMessageCreateOrUpdate(com.discord.api.message.Message message) {
         m.checkNotNullParameter(message, "message");
         if (hasMention(message)) {
-            this.mentionedMessages.put(Long.valueOf(message.r()), message);
+            this.mentionedMessages.put(Long.valueOf(message.o()), new Message(message));
             markChanged();
         }
     }
@@ -392,7 +401,7 @@ public final class StoreMentions extends StoreV2 {
     public final void handleThreadListSync(ModelThreadListSync modelThreadListSync) {
         m.checkNotNullParameter(modelThreadListSync, "payload");
         for (Channel channel : modelThreadListSync.getThreads()) {
-            this.channelGuildIds.put(Long.valueOf(channel.g()), Long.valueOf(modelThreadListSync.getGuildId()));
+            this.channelGuildIds.put(Long.valueOf(channel.h()), Long.valueOf(modelThreadListSync.getGuildId()));
         }
     }
 
@@ -406,15 +415,15 @@ public final class StoreMentions extends StoreV2 {
     }
 
     public final Observable<Map<Long, Integer>> observeMentionCounts() {
-        Observable<Map<Long, Integer>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMentions$observeMentionCounts$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Integer>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMentions$observeMentionCounts$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Integer> observeTotalMentions() {
-        Observable<R> G = observeMentionCounts().G(StoreMentions$observeTotalMentions$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "observeMentionCounts()\n … .map { it.values.sum() }");
-        return G;
+        Observable<R> F = observeMentionCounts().F(StoreMentions$observeTotalMentions$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "observeMentionCounts()\n … .map { it.values.sum() }");
+        return F;
     }
 
     @StoreThread
@@ -422,8 +431,8 @@ public final class StoreMentions extends StoreV2 {
         m.checkNotNullParameter(list, "messagesAfter");
         int i = 0;
         for (Message message : list) {
-            if (!this.mentionedMessages.containsKey(Long.valueOf(message.r())) && hasMention(message)) {
-                this.mentionedMessages.put(Long.valueOf(message.r()), message);
+            if (!this.mentionedMessages.containsKey(Long.valueOf(message.getId())) && hasMention(message)) {
+                this.mentionedMessages.put(Long.valueOf(message.getId()), message);
                 i++;
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$ack$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$ack$1.java
index 51ae01cbce..9bdeac551a 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$ack$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$ack$1.java
@@ -27,11 +27,11 @@ public final class StoreMessageAck$ack$1 extends o implements Function0<Unit> {
         if (findChannelByIdInternal$app_productionGoogleRelease == null) {
             return;
         }
-        if (findChannelByIdInternal$app_productionGoogleRelease.z() != 4) {
+        if (findChannelByIdInternal$app_productionGoogleRelease.A() != 4) {
             StoreMessageAck.access$internalAck(this.this$0, findChannelByIdInternal$app_productionGoogleRelease, this.$isLockedAck, this.$clearLock);
             return;
         }
-        for (Channel channel : StoreMessageAck.access$getStream$p(this.this$0).getChannels$app_productionGoogleRelease().findChannelsByCategoryInternal$app_productionGoogleRelease(findChannelByIdInternal$app_productionGoogleRelease.e(), findChannelByIdInternal$app_productionGoogleRelease.g())) {
+        for (Channel channel : StoreMessageAck.access$getStream$p(this.this$0).getChannels$app_productionGoogleRelease().findChannelsByCategoryInternal$app_productionGoogleRelease(findChannelByIdInternal$app_productionGoogleRelease.f(), findChannelByIdInternal$app_productionGoogleRelease.h())) {
             StoreMessageAck.access$internalAck(this.this$0, channel, this.$isLockedAck, this.$clearLock);
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java
index d48c8f65e7..988fd3786e 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$init$1.java
@@ -73,6 +73,6 @@ public final class StoreMessageAck$init$1<T, R> implements b<Long, Observable<?
         Observable<Set<Long>> o = StoreMessageAck.access$getStream$p(this.this$0).getMessages$app_productionGoogleRelease().getAllDetached().o(50, TimeUnit.MILLISECONDS);
         StoreMessagesLoader messagesLoader$app_productionGoogleRelease = StoreMessageAck.access$getStream$p(this.this$0).getMessagesLoader$app_productionGoogleRelease();
         m.checkNotNullExpressionValue(l, "selectedChannelId");
-        return Observable.h(o, messagesLoader$app_productionGoogleRelease.getMessagesLoadedState(l.longValue()).G(AnonymousClass1.INSTANCE).s(), StoreMessageAck.access$getStream$p(this.this$0).getChat$app_productionGoogleRelease().observeInteractionState().y(new AnonymousClass2(l)), StoreMessageAck.access$getStream$p(this.this$0).getMessageAck$app_productionGoogleRelease().observeForChannel(l.longValue()), AnonymousClass3.INSTANCE);
+        return Observable.h(o, messagesLoader$app_productionGoogleRelease.getMessagesLoadedState(l.longValue()).F(AnonymousClass1.INSTANCE).r(), StoreMessageAck.access$getStream$p(this.this$0).getChat$app_productionGoogleRelease().observeInteractionState().x(new AnonymousClass2(l)), StoreMessageAck.access$getStream$p(this.this$0).getMessageAck$app_productionGoogleRelease().observeForChannel(l.longValue()), AnonymousClass3.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java
index f33a904f3a..0a163d9934 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import j0.k.b;
 import java.util.List;
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java
index 670b67486c..cf698b80f1 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageAck;
 import java.util.List;
 import kotlin.Pair;
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java
index 8b4bdf67c2..0d7363a56b 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java
@@ -1,7 +1,7 @@
 package com.discord.stores;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageAck;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -46,7 +46,7 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1<P
                     break;
                 }
                 Object next = it.next();
-                if (((Message) next).r() >= this.this$0.$messageId) {
+                if (((Message) next).getId() >= this.this$0.$messageId) {
                     z2 = false;
                 }
                 if (z2) {
@@ -59,13 +59,13 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1<P
             } else {
                 Object next2 = it2.next();
                 if (it2.hasNext()) {
-                    long r = ((Message) next2).r();
+                    long id2 = ((Message) next2).getId();
                     do {
                         Object next3 = it2.next();
-                        long r2 = ((Message) next3).r();
-                        if (r < r2) {
+                        long id3 = ((Message) next3).getId();
+                        if (id2 < id3) {
                             next2 = next3;
-                            r = r2;
+                            id2 = id3;
                         }
                     } while (it2.hasNext());
                 }
@@ -75,11 +75,11 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1<P
             List list2 = this.$channelMessages;
             ArrayList S2 = a.S(list2, "channelMessages");
             for (Object obj : list2) {
-                if (((Message) obj).r() >= this.this$0.$messageId) {
+                if (((Message) obj).getId() >= this.this$0.$messageId) {
                     S2.add(obj);
                 }
             }
-            StoreMessageAck.Ack ack = new StoreMessageAck.Ack(message2 != null ? message2.r() : (((this.this$0.$messageId >>> 22) - 1) - 1420070400000L) << 22, false, true);
+            StoreMessageAck.Ack ack = new StoreMessageAck.Ack(message2 != null ? message2.getId() : (((this.this$0.$messageId >>> 22) - 1) - 1420070400000L) << 22, false, true);
             StoreMessageAck$markUnread$3 storeMessageAck$markUnread$3 = this.this$0;
             StoreMessageAck.access$updateAcks(storeMessageAck$markUnread$3.this$0, storeMessageAck$markUnread$3.$channelId, ack);
             int processMarkUnread$app_productionGoogleRelease = StoreStream.Companion.getMentions().processMarkUnread$app_productionGoogleRelease(this.this$0.$channelId, S2);
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java
index c36c8a40e3..c8a325b62e 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$observeThreadState$1.java
@@ -42,6 +42,6 @@ public final class StoreMessageAck$observeThreadState$1<T, R> implements b<Chann
     }
 
     public final Observable<? extends StoreMessageAck.ThreadState> call(Channel channel) {
-        return (channel == null || !AnimatableValueParser.y1(channel)) ? new j(StoreMessageAck.ThreadState.NotThread.INSTANCE) : StoreMessageAck.access$getStream$p(this.this$0).getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().G(new AnonymousClass1(this));
+        return (channel == null || !AnimatableValueParser.z1(channel)) ? new j(StoreMessageAck.ThreadState.NotThread.INSTANCE) : StoreMessageAck.access$getStream$p(this.this$0).getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().F(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java
index 8554391ce9..a609aeabf6 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck$postPendingAck$1.java
@@ -93,8 +93,8 @@ public final class StoreMessageAck$postPendingAck$1 extends o implements Functio
         long component1 = pendingAck.component1();
         StoreMessageAck.Ack component2 = pendingAck.component2();
         StoreMessageAck.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, component1, component2));
-        Observable u = ObservableExtensionsKt.restSubscribeOn$default(StoreMessageAck.access$getRestAPI$p(this.this$0).postChannelMessagesAck(component1, Long.valueOf(component2.getMessageId()), new RestAPIParams.ChannelMessagesAck(Boolean.valueOf(component2.isLockedAck()), Integer.valueOf(this.$mentionCount))), false, 1, null).u(new AnonymousClass2(component1));
-        m.checkNotNullExpressionValue(u, "restAPI\n          .postC…).ackMessage(channelId) }");
-        ObservableExtensionsKt.appSubscribe$default(u, (Context) null, "REST: ack", (Function1) null, AnonymousClass3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable t = ObservableExtensionsKt.restSubscribeOn$default(StoreMessageAck.access$getRestAPI$p(this.this$0).postChannelMessagesAck(component1, Long.valueOf(component2.getMessageId()), new RestAPIParams.ChannelMessagesAck(Boolean.valueOf(component2.isLockedAck()), Integer.valueOf(this.$mentionCount))), false, 1, null).t(new AnonymousClass2(component1));
+        m.checkNotNullExpressionValue(t, "restAPI\n          .postC…).ackMessage(channelId) }");
+        ObservableExtensionsKt.appSubscribe$default(t, (Context) null, "REST: ack", (Function1) null, AnonymousClass3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java
index 13bc8c9b0b..d25071cfeb 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageAck.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java
@@ -19,6 +19,7 @@ import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.threads.ThreadUtils;
+import d0.d0.f;
 import d0.o;
 import d0.t.n0;
 import d0.t.o0;
@@ -380,9 +381,9 @@ public final class StoreMessageAck extends StoreV2 {
     }
 
     private final Observable<PendingAck> getPendingAck(Observable<Long> observable, boolean z2, boolean z3) {
-        Observable<R> Z = observable.Z(new StoreMessageAck$getPendingAck$2(this, z2, new StoreMessageAck$getPendingAck$1(z3)));
-        m.checkNotNullExpressionValue(Z, "switchMap { channelId ->…gAck.EMPTY)\n      }\n    }");
-        return Z;
+        Observable<R> Y = observable.Y(new StoreMessageAck$getPendingAck$2(this, z2, new StoreMessageAck$getPendingAck$1(z3)));
+        m.checkNotNullExpressionValue(Y, "switchMap { channelId ->…gAck.EMPTY)\n      }\n    }");
+        return Y;
     }
 
     @StoreThread
@@ -391,28 +392,28 @@ public final class StoreMessageAck extends StoreV2 {
     }
 
     private final void internalAck(Channel channel, boolean z2, boolean z3) {
-        j jVar = new j(Long.valueOf(channel.g()));
+        j jVar = new j(Long.valueOf(channel.h()));
         m.checkNotNullExpressionValue(jVar, "Observable.just(channel.id)");
         postPendingAck$default(this, ObservableExtensionsKt.takeSingleUntilTimeout$default(getPendingAck(jVar, z2, z3), 0, false, 1, null), 0, 1, null);
     }
 
     private final Observable<Pair<Set<Long>, Set<Long>>> observeActiveJoinedThreadIdsWithPrevious() {
-        Observable<Pair<Set<Long>, Set<Long>>> Q = this.stream.getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().G(StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$1.INSTANCE).s().Q(new Pair(n0.emptySet(), n0.emptySet()), StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$2.INSTANCE);
-        m.checkNotNullExpressionValue(Q, "stream\n        .threadsA…oinedThreadIds)\n        }");
-        return Q;
+        Observable<Pair<Set<Long>, Set<Long>>> P = this.stream.getThreadsActiveJoined$app_productionGoogleRelease().observeAllActiveJoinedThreadsById().F(StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$1.INSTANCE).r().P(new Pair(n0.emptySet(), n0.emptySet()), StoreMessageAck$observeActiveJoinedThreadIdsWithPrevious$2.INSTANCE);
+        m.checkNotNullExpressionValue(P, "stream\n        .threadsA…oinedThreadIds)\n        }");
+        return P;
     }
 
     private final Observable<ThreadState> observeThreadState(long j) {
-        Observable<ThreadState> s2 = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j).Z(new StoreMessageAck$observeThreadState$1(this, j)).s();
-        m.checkNotNullExpressionValue(s2, "stream\n          .channe…  .distinctUntilChanged()");
-        return s2;
+        Observable<ThreadState> r = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j).Y(new StoreMessageAck$observeThreadState$1(this, j)).r();
+        m.checkNotNullExpressionValue(r, "stream\n          .channe…  .distinctUntilChanged()");
+        return r;
     }
 
     private final void postPendingAck(Observable<PendingAck> observable, int i) {
         StoreMessageAck$postPendingAck$1 storeMessageAck$postPendingAck$1 = new StoreMessageAck$postPendingAck$1(this, i);
-        Observable<PendingAck> y2 = observable.y(StoreMessageAck$postPendingAck$2.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "filter { it != PendingAck.EMPTY }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(y2), observable.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessageAck$postPendingAck$3(storeMessageAck$postPendingAck$1), 62, (Object) null);
+        Observable<PendingAck> x2 = observable.x(StoreMessageAck$postPendingAck$2.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "filter { it != PendingAck.EMPTY }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(x2), observable.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessageAck$postPendingAck$3(storeMessageAck$postPendingAck$1), 62, (Object) null);
     }
 
     public static /* synthetic */ void postPendingAck$default(StoreMessageAck storeMessageAck, Observable observable, int i, int i2, Object obj) {
@@ -475,7 +476,7 @@ public final class StoreMessageAck extends StoreV2 {
         for (Number number2 : o0.minus((Set) set2, (Iterable) set)) {
             long longValue2 = number2.longValue();
             if (!this.acks.containsKey(Long.valueOf(longValue2)) && (activeJoinedThread = activeJoinedThreadsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue2))) != null) {
-                this.acks.put(Long.valueOf(longValue2), new Ack((ThreadUtils.getThreadAckMessageTimestamp$default(ThreadUtils.INSTANCE, activeJoinedThread.getChannel(), guildsJoinedAtInternal$app_productionGoogleRelease.get(Long.valueOf(activeJoinedThread.getChannel().e())), Long.valueOf(activeJoinedThread.getJoinTimestamp().f()), null, 4, null) - 1420070400000L) << 22, false, false));
+                this.acks.put(Long.valueOf(longValue2), new Ack((ThreadUtils.getThreadAckMessageTimestamp$default(ThreadUtils.INSTANCE, activeJoinedThread.getChannel(), guildsJoinedAtInternal$app_productionGoogleRelease.get(Long.valueOf(activeJoinedThread.getChannel().f())), Long.valueOf(activeJoinedThread.getJoinTimestamp().f()), null, 4, null) - 1420070400000L) << 22, false, false));
                 markChanged();
             }
         }
@@ -568,18 +569,18 @@ public final class StoreMessageAck extends StoreV2 {
                         ArrayList arrayList = new ArrayList();
                         for (Object obj2 : g) {
                             Channel channel = (Channel) obj2;
-                            if (AnimatableValueParser.j1(channel) && !this.acks.containsKey(Long.valueOf(channel.g()))) {
+                            if (AnimatableValueParser.k1(channel) && !this.acks.containsKey(Long.valueOf(channel.h()))) {
                                 arrayList.add(obj2);
                             }
                         }
                         ArrayList<Channel> arrayList2 = new ArrayList();
                         for (Object obj3 : arrayList) {
-                            if ((((Channel) obj3).h() >>> 22) + 1420070400000L < j) {
+                            if ((((Channel) obj3).i() >>> 22) + 1420070400000L < j) {
                                 arrayList2.add(obj3);
                             }
                         }
                         for (Channel channel2 : arrayList2) {
-                            this.acks.put(Long.valueOf(channel2.g()), new Ack(channel2.h(), false, false));
+                            this.acks.put(Long.valueOf(channel2.h()), new Ack(channel2.i(), false, false));
                         }
                     }
                 }
@@ -612,9 +613,9 @@ public final class StoreMessageAck extends StoreV2 {
     @StoreThread
     public final void handleMessageCreate(Message message) {
         m.checkNotNullParameter(message, "message");
-        User g = message.g();
-        if (g != null && g.i() == this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId()) {
-            updateAcks(message.i(), new Ack(message.r(), false, false));
+        User e = message.e();
+        if (e != null && e.i() == this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId()) {
+            updateAcks(message.g(), new Ack(message.o(), false, false));
         }
     }
 
@@ -631,35 +632,36 @@ public final class StoreMessageAck extends StoreV2 {
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        Observable<R> Z = StoreStream.Companion.getChannelsSelected().observeId().s().Z(new StoreMessageAck$init$1(this));
-        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get… 0L\n          }\n        }");
-        Observable<Long> o = ObservableExtensionsKt.computationLatest(Z).o(500, TimeUnit.MILLISECONDS);
+        Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeId().r().Y(new StoreMessageAck$init$1(this));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get… 0L\n          }\n        }");
+        Observable<Long> o = ObservableExtensionsKt.computationLatest(Y).o(500, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "StoreStream\n        .get…0, TimeUnit.MILLISECONDS)");
         postPendingAck$default(this, getPendingAck(o, false, false), 0, 1, null);
     }
 
     public final void markUnread(long j, long j2) {
-        Observable j3 = Observable.j(this.stream.getMessages$app_productionGoogleRelease().observeMessagesForChannel(j).y(StoreMessageAck$markUnread$1.INSTANCE), observeThreadState(j), StoreMessageAck$markUnread$2.INSTANCE);
+        Observable j3 = Observable.j(this.stream.getMessages$app_productionGoogleRelease().observeMessagesForChannel(j).x(StoreMessageAck$markUnread$1.INSTANCE), observeThreadState(j), StoreMessageAck$markUnread$2.INSTANCE);
         m.checkNotNullExpressionValue(j3, "Observable\n        .comb…lMessages, threadState) }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout(j3, 10, false), StoreMessageAck.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessageAck$markUnread$3(this, j2, j), 62, (Object) null);
     }
 
     public final Observable<Map<Long, Ack>> observeAll() {
-        Observable<Map<Long, Ack>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageAck$observeAll$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Ack>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageAck$observeAll$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Ack> observeForChannel(long j) {
-        Observable<Ack> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageAck$observeForChannel$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Ack> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageAck$observeForChannel$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
     public void snapshotData() {
         super.snapshotData();
-        HashMap hashMap = new HashMap(this.acks);
+        HashMap hashMap = new HashMap(f.coerceAtLeast(this.acks.size(), 1), 0.75f);
+        hashMap.putAll(this.acks);
         this.acksSnapshot = hashMap;
         Persister.set$default(this.acksPersister, hashMap, false, 2, null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMessageReactions.java b/app/src/main/java/com/discord/stores/StoreMessageReactions.java
index 26ca23033b..4377e56ffc 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageReactions.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageReactions.java
@@ -424,9 +424,9 @@ public final class StoreMessageReactions extends StoreV2 {
     public final Observable<EmojiResults> observeMessageReactions(long j, long j2, MessageReactionEmoji messageReactionEmoji) {
         m.checkNotNullParameter(messageReactionEmoji, "emoji");
         this.dispatcher.schedule(new StoreMessageReactions$observeMessageReactions$1(this, j, j2, messageReactionEmoji));
-        Observable<EmojiResults> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageReactions$observeMessageReactions$2(this, j2, messageReactionEmoji), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<EmojiResults> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageReactions$observeMessageReactions$2(this, j2, messageReactionEmoji), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreMessageReplies.java b/app/src/main/java/com/discord/stores/StoreMessageReplies.java
index f970d3fed9..dc1e31c917 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageReplies.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageReplies.java
@@ -1,12 +1,11 @@
 package com.discord.stores;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.models.domain.ModelMessageDelete;
+import com.discord.models.message.Message;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
-import com.discord.utilities.message.MessageUtils;
 import d0.d0.f;
 import d0.t.g0;
 import d0.t.h0;
@@ -210,27 +209,32 @@ public final class StoreMessageReplies extends StoreV2 {
         return map != null ? map : NO_RESULTS;
     }
 
+    @StoreThread
+    private final boolean processMessage(com.discord.api.message.Message message) {
+        return processMessage(new Message(message));
+    }
+
     @StoreThread
     private final boolean processMessage(Message message) {
         boolean z2;
-        if (this.repliedMessagesCache.containsKey(Long.valueOf(message.r()))) {
-            updateCache(message.r(), message.i(), new MessageState.Loaded(message));
+        if (this.repliedMessagesCache.containsKey(Long.valueOf(message.getId()))) {
+            updateCache(message.getId(), message.getChannelId(), new MessageState.Loaded(message));
             z2 = true;
         } else {
             z2 = false;
         }
-        if (!MessageUtils.INSTANCE.isEmbeddedMessageType(message)) {
+        if (!message.isEmbeddedMessageType()) {
             return z2;
         }
-        MessageReference A = message.A();
-        if (A == null) {
+        MessageReference messageReference = message.getMessageReference();
+        if (messageReference == null) {
             return z2;
         }
-        Message G = message.G();
-        Long a = A.a();
-        Long c2 = A.c();
-        if (G != null) {
-            processReferencedMessage(G);
+        com.discord.api.message.Message referencedMessage = message.getReferencedMessage();
+        Long a = messageReference.a();
+        Long c2 = messageReference.c();
+        if (referencedMessage != null) {
+            processReferencedMessage(new Message(referencedMessage));
             return true;
         } else if (a == null || c2 == null) {
             return true;
@@ -246,9 +250,9 @@ public final class StoreMessageReplies extends StoreV2 {
     }
 
     private final void processReferencedMessage(Message message) {
-        updateCache(message.r(), message.i(), new MessageState.Loaded(message));
-        Integer M = message.M();
-        if (M != null && M.intValue() == 19) {
+        updateCache(message.getId(), message.getChannelId(), new MessageState.Loaded(message));
+        Integer type = message.getType();
+        if (type != null && type.intValue() == 19) {
             processMessage(message);
         }
     }
@@ -310,7 +314,7 @@ public final class StoreMessageReplies extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleMessageCreate(Message message) {
+    public final void handleMessageCreate(com.discord.api.message.Message message) {
         m.checkNotNullParameter(message, "message");
         if (processMessage(message)) {
             markChanged();
@@ -344,20 +348,20 @@ public final class StoreMessageReplies extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleMessageUpdate(Message message) {
+    public final void handleMessageUpdate(com.discord.api.message.Message message) {
         MessageState messageState;
         m.checkNotNullParameter(message, "message");
-        if (this.repliedMessagesCache.containsKey(Long.valueOf(message.r())) && (messageState = this.repliedMessagesCache.get(Long.valueOf(message.r()))) != null && (messageState instanceof MessageState.Loaded)) {
-            Message merge = MessageUtils.merge(((MessageState.Loaded) messageState).getMessage(), message);
-            updateCache(merge.r(), merge.i(), new MessageState.Loaded(merge));
+        if (this.repliedMessagesCache.containsKey(Long.valueOf(message.o())) && (messageState = this.repliedMessagesCache.get(Long.valueOf(message.o()))) != null && (messageState instanceof MessageState.Loaded)) {
+            Message merge = ((MessageState.Loaded) messageState).getMessage().merge(message);
+            updateCache(merge.getId(), merge.getChannelId(), new MessageState.Loaded(merge));
             markChanged();
         }
     }
 
     public final Observable<Map<Long, MessageState>> observeMessageReferencesForChannel(long j) {
-        Observable<Map<Long, MessageState>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageReplies$observeMessageReferencesForChannel$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, MessageState>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreMessageReplies$observeMessageReferencesForChannel$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreMessageState.java b/app/src/main/java/com/discord/stores/StoreMessageState.java
index ac41174b08..ccfaccb7d6 100644
--- a/app/src/main/java/com/discord/stores/StoreMessageState.java
+++ b/app/src/main/java/com/discord/stores/StoreMessageState.java
@@ -110,9 +110,9 @@ public final class StoreMessageState {
     public StoreMessageState(Dispatcher dispatcher) {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         this.dispatcher = dispatcher;
-        BehaviorSubject<Map<Long, State>> m0 = BehaviorSubject.m0(h0.emptyMap());
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(emptyMap())");
-        this.messageStateSubject = m0;
+        BehaviorSubject<Map<Long, State>> l0 = BehaviorSubject.l0(h0.emptyMap());
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(emptyMap())");
+        this.messageStateSubject = l0;
     }
 
     public static final /* synthetic */ void access$updateState(StoreMessageState storeMessageState, long j, Function1 function1) {
@@ -121,38 +121,38 @@ public final class StoreMessageState {
 
     @StoreThread
     private final void resetState(List<Long> list) {
-        Map<Long, State> o0 = this.messageStateSubject.o0();
+        Map<Long, State> n0 = this.messageStateSubject.n0();
         ArrayList arrayList = new ArrayList();
         for (Object obj : list) {
             long longValue = ((Number) obj).longValue();
-            m.checkNotNullExpressionValue(o0, "messageStateMap");
-            if (o0.containsKey(Long.valueOf(longValue))) {
+            m.checkNotNullExpressionValue(n0, "messageStateMap");
+            if (n0.containsKey(Long.valueOf(longValue))) {
                 arrayList.add(obj);
             }
         }
         if (!arrayList.isEmpty()) {
             BehaviorSubject<Map<Long, State>> behaviorSubject = this.messageStateSubject;
-            m.checkNotNullExpressionValue(o0, "messageStateMap");
-            behaviorSubject.onNext(h0.minus((Map) o0, (Iterable) arrayList));
+            m.checkNotNullExpressionValue(n0, "messageStateMap");
+            behaviorSubject.onNext(h0.minus((Map) n0, (Iterable) arrayList));
         }
     }
 
     @StoreThread
     private final void updateState(long j, Function1<? super State, State> function1) {
-        Map<Long, State> o0 = this.messageStateSubject.o0();
-        State state = o0.get(Long.valueOf(j));
+        Map<Long, State> n0 = this.messageStateSubject.n0();
+        State state = n0.get(Long.valueOf(j));
         if (state == null) {
             state = new State(null, null, 3, null);
         }
         BehaviorSubject<Map<Long, State>> behaviorSubject = this.messageStateSubject;
-        m.checkNotNullExpressionValue(o0, "messageStateMap");
-        behaviorSubject.onNext(h0.plus(o0, o.to(Long.valueOf(j), function1.invoke(state))));
+        m.checkNotNullExpressionValue(n0, "messageStateMap");
+        behaviorSubject.onNext(h0.plus(n0, o.to(Long.valueOf(j), function1.invoke(state))));
     }
 
     public final Observable<Map<Long, State>> getMessageState() {
-        Observable<Map<Long, State>> s2 = this.messageStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "messageStateSubject.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, State>> r = this.messageStateSubject.r();
+        m.checkNotNullExpressionValue(r, "messageStateSubject.distinctUntilChanged()");
+        return r;
     }
 
     @StoreThread
@@ -171,7 +171,7 @@ public final class StoreMessageState {
     @StoreThread
     public final void handleMessageUpdate(Message message) {
         m.checkNotNullParameter(message, "message");
-        resetState(d0.t.m.listOf(Long.valueOf(message.r())));
+        resetState(d0.t.m.listOf(Long.valueOf(message.o())));
     }
 
     public final void revealSpoiler(long j, int i) {
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java
index 6e82c9f54e..b35da4f281 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java
@@ -1,8 +1,7 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
 import com.discord.models.domain.ModelMessageDelete;
-import com.discord.utilities.message.MessageUtils;
+import com.discord.models.message.Message;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -25,17 +24,17 @@ public final class StoreMessages$deleteMessage$2 extends o implements Function0<
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        if (MessageUtils.isLocal(this.$message)) {
-            String B = this.$message.B();
-            if (B != null) {
-                StoreMessages.access$getMessageQueue(this.this$0, this.$channelId).cancel(B);
+        if (this.$message.isLocal()) {
+            String nonce = this.$message.getNonce();
+            if (nonce != null) {
+                StoreMessages.access$getMessageQueue(this.this$0, this.$channelId).cancel(nonce);
             }
             StoreMessages.access$handleLocalMessageDelete(this.this$0, this.$message);
-            Integer M = this.$message.M();
-            if (M != null && M.intValue() == -2) {
+            Integer type = this.$message.getType();
+            if (type != null && type.intValue() == -2) {
                 StoreMessages.access$trackFailedLocalMessageResolved(this.this$0, this.$message, FailedMessageResolutionType.DELETED);
             }
-        } else if (MessageUtils.INSTANCE.isEphemeralMessage(this.$message)) {
+        } else if (this.$message.isEphemeralMessage()) {
             this.this$0.handleMessageDelete(new ModelMessageDelete(this.$channelId, this.$messageId));
         }
         StoreMessages.access$getStream$p(this.this$0).handleLocalMessageDelete(this.$message);
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java
index 276908b91c..9860509191 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.t.n;
 import j0.k.b;
 import java.util.List;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java
index 439ee3085d..273a3b4a1c 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import java.util.List;
 import rx.functions.Func2;
 /* compiled from: StoreMessages.kt */
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java
index 67f550e228..139f9db513 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.t.u;
 import d0.z.d.m;
 import java.util.Collection;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java
index 4cae8e56a3..9c538a69c4 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import j0.k.b;
 import java.util.Iterator;
@@ -24,7 +24,7 @@ public final class StoreMessages$observeMessagesForChannel$2<T, R> implements b<
                 break;
             }
             t = it.next();
-            if (t.r() == this.$messageId) {
+            if (t.getId() == this.$messageId) {
                 z2 = true;
                 continue;
             } else {
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java
index 4d511d0381..4e727c710a 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.t.n;
 import j0.k.b;
 import java.util.List;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java
index 905ffce654..5f74ccf551 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import java.util.List;
 import rx.functions.Func2;
 /* compiled from: StoreMessages.kt */
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java b/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java
index 5a2e214386..fc27ac4437 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java
index acd70f6ddf..b9d6816968 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java
index fc25b40e2b..ed42a5c822 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java
index 84318cef0d..c461f4d002 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java
@@ -6,7 +6,7 @@ import androidx.work.ExistingWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
 import androidx.work.WorkManager;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.workers.BackgroundMessageSendWorker;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java
index 183998cc50..9d657f7042 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java
@@ -1,8 +1,8 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.commands.ApplicationCommandLocalSendData;
+import com.discord.models.message.Message;
 import com.discord.utilities.messagesend.MessageRequest;
 import com.discord.utilities.messagesend.MessageResult;
 import rx.Emitter;
@@ -20,9 +20,9 @@ public final class StoreMessages$sendMessage$7<T> implements Action1<Emitter<Mes
     }
 
     public final void call(Emitter<MessageResult> emitter) {
-        Message message = this.$message;
+        com.discord.api.message.Message synthesizeApiMessage = this.$message.synthesizeApiMessage();
         ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$applicationCommandLocalSendData;
-        UtcDateTime K = message.K();
-        StoreMessages.access$getMessageQueue(this.this$0, this.$message.i()).enqueue(new MessageRequest.SendApplicationCommand(message, applicationCommandLocalSendData, new StoreMessages$sendMessage$7$request$1(this, emitter), K != null ? K.f() : 0));
+        UtcDateTime timestamp = this.$message.getTimestamp();
+        StoreMessages.access$getMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, new StoreMessages$sendMessage$7$request$1(this, emitter), timestamp != null ? timestamp.f() : 0));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java
index 8e5b0333a6..f5ed04da9b 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java
@@ -1,7 +1,7 @@
 package com.discord.stores;
 
 import com.discord.api.activity.Activity;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessages;
 import com.discord.utilities.messagesend.MessageRequest;
 import com.discord.utilities.messagesend.MessageResult;
@@ -52,17 +52,17 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func
                 }
                 MessageResult messageResult = this.$result;
                 if (messageResult instanceof MessageResult.Success) {
-                    StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onMessageSent(((MessageResult.Success) this.$result).getMessage().i());
+                    StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onMessageSent(((MessageResult.Success) this.$result).getMessage().g());
                     this.this$0.this$0.this$0.handleMessageCreate(m.listOf(((MessageResult.Success) this.$result).getMessage()));
-                    Integer C = this.this$0.this$0.$localMessage.C();
-                    if ((C != null ? C.intValue() : 0) > 0) {
+                    Integer numRetries = this.this$0.this$0.$localMessage.getNumRetries();
+                    if ((numRetries != null ? numRetries.intValue() : 0) > 0) {
                         StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$1 = this.this$0.this$0;
                         StoreMessages.access$trackFailedLocalMessageResolved(storeMessages$sendMessage$request$1.this$0, storeMessages$sendMessage$request$1.$localMessage, FailedMessageResolutionType.RESENT);
                     }
                 } else if (messageResult instanceof MessageResult.Slowmode) {
                     StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$12 = this.this$0.this$0;
                     StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$12.this$0, storeMessages$sendMessage$request$12.$localMessage);
-                    StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onCooldown(this.this$0.this$0.$localMessage.i(), ((MessageResult.Slowmode) this.$result).getCooldownMs());
+                    StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onCooldown(this.this$0.this$0.$localMessage.getChannelId(), ((MessageResult.Slowmode) this.$result).getCooldownMs());
                 } else if (!(messageResult instanceof MessageResult.RateLimited)) {
                     if (messageResult instanceof MessageResult.UserCancelled) {
                         StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$13 = this.this$0.this$0;
@@ -130,9 +130,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func
             /* renamed from: invoke */
             public final void mo1invoke() {
                 StoreMessageUploads messageUploads$app_productionGoogleRelease = StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionGoogleRelease();
-                String B = this.this$0.this$0.$localMessage.B();
-                d0.z.d.m.checkNotNull(B);
-                messageUploads$app_productionGoogleRelease.onPreprocessing(B, this.$numFiles, this.$displayName, this.$mimeType);
+                String nonce = this.this$0.this$0.$localMessage.getNonce();
+                d0.z.d.m.checkNotNull(nonce);
+                messageUploads$app_productionGoogleRelease.onPreprocessing(nonce, this.$numFiles, this.$displayName, this.$mimeType);
             }
         }
 
@@ -178,9 +178,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func
             /* renamed from: invoke */
             public final void mo1invoke() {
                 StoreMessageUploads messageUploads$app_productionGoogleRelease = StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionGoogleRelease();
-                String B = this.this$0.this$0.$localMessage.B();
-                d0.z.d.m.checkNotNull(B);
-                messageUploads$app_productionGoogleRelease.bindUpload(B, this.$uploads);
+                String nonce = this.this$0.this$0.$localMessage.getNonce();
+                d0.z.d.m.checkNotNull(nonce);
+                messageUploads$app_productionGoogleRelease.bindUpload(nonce, this.$uploads);
             }
         }
 
diff --git a/app/src/main/java/com/discord/stores/StoreMessages.java b/app/src/main/java/com/discord/stores/StoreMessages.java
index 265bb44158..589344cc55 100644
--- a/app/src/main/java/com/discord/stores/StoreMessages.java
+++ b/app/src/main/java/com/discord/stores/StoreMessages.java
@@ -9,7 +9,6 @@ import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.interaction.InteractionStateUpdate;
 import com.discord.api.message.LocalAttachment;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.message.activity.MessageActivity;
 import com.discord.api.message.allowedmentions.MessageAllowedMentions;
@@ -20,12 +19,12 @@ import com.discord.app.AppLog;
 import com.discord.models.commands.ApplicationCommandLocalSendData;
 import com.discord.models.domain.ModelMessageDelete;
 import com.discord.models.domain.ModelPayload;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.stores.StoreMessagesLoader;
 import com.discord.utilities.attachments.AttachmentUtilsKt;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.message.LocalMessageCreatorsKt;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.messagesend.MessageQueue;
 import com.discord.utilities.messagesend.MessageRequest;
 import com.discord.utilities.messagesend.MessageResult;
@@ -68,7 +67,7 @@ public final class StoreMessages extends Store {
     private Context context;
     private final Dispatcher dispatcher;
     private final StoreMessagesHolder holder = new StoreMessagesHolder();
-    private final BehaviorSubject<Boolean> initResendFinished = BehaviorSubject.m0(Boolean.FALSE);
+    private final BehaviorSubject<Boolean> initResendFinished = BehaviorSubject.l0(Boolean.FALSE);
     private final StoreLocalMessagesHolder localMessagesHolder = new StoreLocalMessagesHolder();
     private final HashMap<Long, MessageQueue> messageQueues = new HashMap<>();
     private final ExecutorService queueExecutor = Executors.newSingleThreadExecutor();
@@ -210,14 +209,14 @@ public final class StoreMessages extends Store {
     @StoreThread
     private final void handleSendMessageFailure(Message message) {
         deleteMessage(message);
-        String k = message.k();
-        if (k == null) {
-            k = "";
+        String content = message.getContent();
+        if (content == null) {
+            content = "";
         }
-        long i = message.i();
-        User g = message.g();
-        m.checkNotNull(g);
-        handleLocalMessageCreate(LocalMessageCreatorsKt.createLocalMessage(k, i, g, message.z(), true, message.p(), message.d(), message.b(), this.clock, message.v(), message.u(), message.s(), message.C(), message.I(), message.A(), message.c()));
+        long channelId = message.getChannelId();
+        User author = message.getAuthor();
+        m.checkNotNull(author);
+        handleLocalMessageCreate(LocalMessageCreatorsKt.createLocalMessage(content, channelId, author, message.getMentions(), true, message.getHasLocalUploads(), message.getApplication(), message.getActivity(), this.clock, message.getLocalAttachments(), message.getLastManualAttemptTimestamp(), message.getInitialAttemptTimestamp(), message.getNumRetries(), message.getStickers(), message.getMessageReference(), message.getAllowedMentions()));
     }
 
     private final void handleSendMessageValidationError(Message message, String str) {
@@ -226,21 +225,21 @@ public final class StoreMessages extends Store {
     }
 
     private final Observable<List<Message>> observeLocalMessagesForChannel(long j) {
-        Observable<R> G = this.localMessagesHolder.getMessagesPublisher().G(new StoreMessages$observeLocalMessagesForChannel$1(j));
-        m.checkNotNullExpressionValue(G, "localMessagesHolder\n    …annelId] ?: emptyList() }");
-        Observable computationBuffered = ObservableExtensionsKt.computationBuffered(G);
-        Observable<List<Message>> i02 = Observable.i0(new r(computationBuffered.i, new u0(StoreMessages$observeLocalMessagesForChannel$2.INSTANCE)));
-        m.checkNotNullExpressionValue(i02, "localMessagesHolder\n    …messages1 === messages2 }");
-        return i02;
+        Observable<R> F = this.localMessagesHolder.getMessagesPublisher().F(new StoreMessages$observeLocalMessagesForChannel$1(j));
+        m.checkNotNullExpressionValue(F, "localMessagesHolder\n    …annelId] ?: emptyList() }");
+        Observable computationBuffered = ObservableExtensionsKt.computationBuffered(F);
+        Observable<List<Message>> h02 = Observable.h0(new r(computationBuffered.i, new u0(StoreMessages$observeLocalMessagesForChannel$2.INSTANCE)));
+        m.checkNotNullExpressionValue(h02, "localMessagesHolder\n    …messages1 === messages2 }");
+        return h02;
     }
 
     private final Observable<List<Message>> observeSyncedMessagesForChannel(long j) {
-        Observable<R> G = this.holder.getMessagesPublisher().G(new StoreMessages$observeSyncedMessagesForChannel$1(j));
-        m.checkNotNullExpressionValue(G, "holder\n          .messag…annelId] ?: emptyList() }");
-        Observable computationBuffered = ObservableExtensionsKt.computationBuffered(G);
-        Observable<List<Message>> i02 = Observable.i0(new r(computationBuffered.i, new u0(StoreMessages$observeSyncedMessagesForChannel$2.INSTANCE)));
-        m.checkNotNullExpressionValue(i02, "holder\n          .messag…messages1 === messages2 }");
-        return i02;
+        Observable<R> F = this.holder.getMessagesPublisher().F(new StoreMessages$observeSyncedMessagesForChannel$1(j));
+        m.checkNotNullExpressionValue(F, "holder\n          .messag…annelId] ?: emptyList() }");
+        Observable computationBuffered = ObservableExtensionsKt.computationBuffered(F);
+        Observable<List<Message>> h02 = Observable.h0(new r(computationBuffered.i, new u0(StoreMessages$observeSyncedMessagesForChannel$2.INSTANCE)));
+        m.checkNotNullExpressionValue(h02, "holder\n          .messag…messages1 === messages2 }");
+        return h02;
     }
 
     @StoreThread
@@ -254,8 +253,8 @@ public final class StoreMessages extends Store {
                 break;
             }
             Object next = it.next();
-            Integer M = ((Message) next).M();
-            if (M == null || M.intValue() != -1) {
+            Integer type = ((Message) next).getType();
+            if (type == null || type.intValue() != -1) {
                 z2 = false;
             }
             if (z2) {
@@ -266,10 +265,10 @@ public final class StoreMessages extends Store {
         for (Message message : arrayList) {
             arrayList2.add(resendMessage(message, true));
         }
-        Observable i02 = Observable.i0(new q(arrayList2));
-        Observable i03 = Observable.i0(new r(i02.i, x0.a.a));
-        m.checkNotNullExpressionValue(i03, "Observable\n        .mergeDelayError(observables)");
-        ObservableExtensionsKt.appSubscribe$default(i03, StoreMessages.class, (Context) null, (Function1) null, (Function1) null, new StoreMessages$resendAllLocalMessages$1(this), (Function0) null, StoreMessages$resendAllLocalMessages$2.INSTANCE, 46, (Object) null);
+        Observable h02 = Observable.h0(new q(arrayList2));
+        Observable h03 = Observable.h0(new r(h02.i, x0.a.a));
+        m.checkNotNullExpressionValue(h03, "Observable\n        .mergeDelayError(observables)");
+        ObservableExtensionsKt.appSubscribe$default(h03, StoreMessages.class, (Context) null, (Function1) null, (Function1) null, new StoreMessages$resendAllLocalMessages$1(this), (Function0) null, StoreMessages$resendAllLocalMessages$2.INSTANCE, 46, (Object) null);
     }
 
     public static /* synthetic */ Observable resendMessage$default(StoreMessages storeMessages, Message message, boolean z2, int i, Object obj) {
@@ -297,17 +296,17 @@ public final class StoreMessages extends Store {
     /* JADX WARNING: Removed duplicated region for block: B:63:0x010a  */
     private final void trackFailedLocalMessageResolved(Message message, FailedMessageResolutionType failedMessageResolutionType) {
         boolean z2;
-        List<LocalAttachment> v;
+        List<LocalAttachment> localAttachments;
         boolean z3;
-        List<LocalAttachment> v2;
+        List<LocalAttachment> localAttachments2;
         ArrayList arrayList;
         Long l;
         boolean z4;
         boolean z5;
-        List<LocalAttachment> v3 = message.v();
-        if (v3 != null) {
-            if (!v3.isEmpty()) {
-                Iterator<T> it = v3.iterator();
+        List<LocalAttachment> localAttachments3 = message.getLocalAttachments();
+        if (localAttachments3 != null) {
+            if (!localAttachments3.isEmpty()) {
+                Iterator<T> it = localAttachments3.iterator();
                 while (true) {
                     if (!it.hasNext()) {
                         break;
@@ -328,10 +327,10 @@ public final class StoreMessages extends Store {
             z5 = false;
             if (z5) {
                 z2 = true;
-                v = message.v();
-                if (v != null) {
-                    if (!v.isEmpty()) {
-                        Iterator<T> it2 = v.iterator();
+                localAttachments = message.getLocalAttachments();
+                if (localAttachments != null) {
+                    if (!localAttachments.isEmpty()) {
+                        Iterator<T> it2 = localAttachments.iterator();
                         while (true) {
                             if (!it2.hasNext()) {
                                 break;
@@ -352,10 +351,10 @@ public final class StoreMessages extends Store {
                     z4 = false;
                     if (z4) {
                         z3 = true;
-                        v2 = message.v();
-                        if (v2 != null) {
-                            arrayList = new ArrayList(o.collectionSizeOrDefault(v2, 10));
-                            for (LocalAttachment localAttachment3 : v2) {
+                        localAttachments2 = message.getLocalAttachments();
+                        if (localAttachments2 != null) {
+                            arrayList = new ArrayList(o.collectionSizeOrDefault(localAttachments2, 10));
+                            for (LocalAttachment localAttachment3 : localAttachments2) {
                                 Uri parse = Uri.parse(localAttachment3.c());
                                 m.checkNotNullExpressionValue(parse, "Uri.parse(localAttachment.uriString)");
                                 Context context3 = this.context;
@@ -372,54 +371,54 @@ public final class StoreMessages extends Store {
                         int longValue = (arrayList != null || (l = (Long) u.maxOrNull(arrayList)) == null) ? 0 : (int) l.longValue();
                         int sumOfLong = arrayList != null ? (int) u.sumOfLong(arrayList) : 0;
                         StoreAnalytics analytics = StoreStream.Companion.getAnalytics();
-                        List<LocalAttachment> v4 = message.v();
-                        int size = v4 != null ? v4.size() : 0;
-                        Long s2 = message.s();
-                        long longValue2 = s2 != null ? s2.longValue() : 0;
-                        Integer C = message.C();
-                        analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, C != null ? C.intValue() : 0, message.i());
+                        List<LocalAttachment> localAttachments4 = message.getLocalAttachments();
+                        int size = localAttachments4 != null ? localAttachments4.size() : 0;
+                        Long initialAttemptTimestamp = message.getInitialAttemptTimestamp();
+                        long longValue2 = initialAttemptTimestamp != null ? initialAttemptTimestamp.longValue() : 0;
+                        Integer numRetries = message.getNumRetries();
+                        analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, numRetries != null ? numRetries.intValue() : 0, message.getChannelId());
                     }
                 }
                 z3 = false;
-                v2 = message.v();
-                if (v2 != null) {
+                localAttachments2 = message.getLocalAttachments();
+                if (localAttachments2 != null) {
                 }
                 if (arrayList != null) {
                 }
                 if (arrayList != null) {
                 }
                 StoreAnalytics analytics = StoreStream.Companion.getAnalytics();
-                List<LocalAttachment> v4 = message.v();
-                if (v4 != null) {
+                List<LocalAttachment> localAttachments4 = message.getLocalAttachments();
+                if (localAttachments4 != null) {
                 }
-                Long s2 = message.s();
-                if (s2 != null) {
+                Long initialAttemptTimestamp = message.getInitialAttemptTimestamp();
+                if (initialAttemptTimestamp != null) {
                 }
-                Integer C = message.C();
-                analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, C != null ? C.intValue() : 0, message.i());
+                Integer numRetries = message.getNumRetries();
+                analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, numRetries != null ? numRetries.intValue() : 0, message.getChannelId());
             }
         }
         z2 = false;
-        v = message.v();
-        if (v != null) {
+        localAttachments = message.getLocalAttachments();
+        if (localAttachments != null) {
         }
         z3 = false;
-        v2 = message.v();
-        if (v2 != null) {
+        localAttachments2 = message.getLocalAttachments();
+        if (localAttachments2 != null) {
         }
         if (arrayList != null) {
         }
         if (arrayList != null) {
         }
         StoreAnalytics analytics = StoreStream.Companion.getAnalytics();
-        List<LocalAttachment> v4 = message.v();
-        if (v4 != null) {
+        List<LocalAttachment> localAttachments4 = message.getLocalAttachments();
+        if (localAttachments4 != null) {
         }
-        Long s2 = message.s();
-        if (s2 != null) {
+        Long initialAttemptTimestamp = message.getInitialAttemptTimestamp();
+        if (initialAttemptTimestamp != null) {
         }
-        Integer C = message.C();
-        analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, C != null ? C.intValue() : 0, message.i());
+        Integer numRetries = message.getNumRetries();
+        analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, numRetries != null ? numRetries.intValue() : 0, message.getChannelId());
     }
 
     public final void cancelMessageSend(long j, String str) {
@@ -436,12 +435,12 @@ public final class StoreMessages extends Store {
 
     public final void deleteMessage(Message message) {
         if (message != null) {
-            long r = message.r();
-            long i = message.i();
-            if (MessageUtils.isLocal(message) || MessageUtils.INSTANCE.isEphemeralMessage(message)) {
-                this.dispatcher.schedule(new StoreMessages$deleteMessage$2(this, message, i, r));
+            long id2 = message.getId();
+            long channelId = message.getChannelId();
+            if (message.isLocal() || message.isEphemeralMessage()) {
+                this.dispatcher.schedule(new StoreMessages$deleteMessage$2(this, message, channelId, id2));
             } else {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteMessage(i, r), false, 1, null), (Context) null, "deleteMessage", (Function1) null, StoreMessages$deleteMessage$1.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteMessage(channelId, id2), false, 1, null), (Context) null, "deleteMessage", (Function1) null, StoreMessages$deleteMessage$1.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
             }
         }
     }
@@ -499,15 +498,20 @@ public final class StoreMessages extends Store {
         handleInteractionStateUpdate$default(this, interactionStateUpdate, true, false, 4, null);
     }
 
-    public final void handleMessageCreate(List<Message> list) {
+    public final void handleMessageCreate(List<com.discord.api.message.Message> list) {
         m.checkNotNullParameter(list, "messagesList");
-        for (Message message : list) {
-            String B = message.B();
-            if (B != null) {
-                this.localMessagesHolder.deleteMessage(message.i(), B);
+        for (com.discord.api.message.Message message : list) {
+            String v = message.v();
+            if (v != null) {
+                this.localMessagesHolder.deleteMessage(message.g(), v);
             }
         }
-        this.holder.addMessages(list);
+        StoreMessagesHolder storeMessagesHolder = this.holder;
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
+        for (com.discord.api.message.Message message2 : list) {
+            arrayList.add(new Message(message2));
+        }
+        storeMessagesHolder.addMessages(arrayList);
     }
 
     public final void handleMessageDelete(ModelMessageDelete modelMessageDelete) {
@@ -518,7 +522,7 @@ public final class StoreMessages extends Store {
         handleMessageDelete(channelId, messageIds);
     }
 
-    public final void handleMessageUpdate(Message message) {
+    public final void handleMessageUpdate(com.discord.api.message.Message message) {
         m.checkNotNullParameter(message, "message");
         this.holder.updateMessages(message);
     }
@@ -564,9 +568,9 @@ public final class StoreMessages extends Store {
     }
 
     public final Observable<Boolean> observeIsDetached(long j) {
-        Observable<Boolean> s2 = getAllDetached().G(new StoreMessages$observeIsDetached$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "allDetached\n          .m…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = getAllDetached().F(new StoreMessages$observeIsDetached$1(j)).r();
+        m.checkNotNullExpressionValue(r, "allDetached\n          .m…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<List<Message>> observeMessagesForChannel(long j) {
@@ -576,42 +580,42 @@ public final class StoreMessages extends Store {
     }
 
     public final Observable<Message> observeMessagesForChannel(long j, long j2) {
-        Observable<Message> s2 = observeMessagesForChannel(j).G(new StoreMessages$observeMessagesForChannel$2(j2)).s();
-        m.checkNotNullExpressionValue(s2, "observeMessagesForChanne…  .distinctUntilChanged()");
-        return s2;
+        Observable<Message> r = observeMessagesForChannel(j).F(new StoreMessages$observeMessagesForChannel$2(j2)).r();
+        m.checkNotNullExpressionValue(r, "observeMessagesForChanne…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<MessageResult> resendMessage(Message message, boolean z2) {
         ArrayList arrayList;
         ArrayList arrayList2;
-        Integer M;
-        Integer M2;
+        Integer type;
+        Integer type2;
         m.checkNotNullParameter(message, "message");
-        if ((!z2 || ((M2 = message.M()) != null && M2.intValue() == -1)) && (z2 || ((M = message.M()) != null && M.intValue() == -2))) {
+        if ((!z2 || ((type2 = message.getType()) != null && type2.intValue() == -1)) && (z2 || ((type = message.getType()) != null && type.intValue() == -2))) {
             this.dispatcher.schedule(new StoreMessages$resendMessage$1(this, message));
-            Integer C = message.C();
-            int intValue = C != null ? C.intValue() : 0;
-            long i = message.i();
-            User g = message.g();
-            m.checkNotNull(g);
-            CoreUser coreUser = new CoreUser(g);
-            String k = message.k();
-            if (k == null) {
-                k = "";
+            Integer numRetries = message.getNumRetries();
+            int intValue = numRetries != null ? numRetries.intValue() : 0;
+            long channelId = message.getChannelId();
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            CoreUser coreUser = new CoreUser(author);
+            String content = message.getContent();
+            if (content == null) {
+                content = "";
             }
-            List<User> z3 = message.z();
-            if (z3 != null) {
-                arrayList = new ArrayList(o.collectionSizeOrDefault(z3, 10));
-                for (User user : z3) {
+            List<User> mentions = message.getMentions();
+            if (mentions != null) {
+                arrayList = new ArrayList(o.collectionSizeOrDefault(mentions, 10));
+                for (User user : mentions) {
                     arrayList.add(new CoreUser(user));
                 }
             } else {
                 arrayList = null;
             }
-            List<LocalAttachment> v = message.v();
-            if (v != null) {
-                arrayList2 = new ArrayList(o.collectionSizeOrDefault(v, 10));
-                for (LocalAttachment localAttachment : v) {
+            List<LocalAttachment> localAttachments = message.getLocalAttachments();
+            if (localAttachments != null) {
+                arrayList2 = new ArrayList(o.collectionSizeOrDefault(localAttachments, 10));
+                for (LocalAttachment localAttachment : localAttachments) {
                     Uri parse = Uri.parse(localAttachment.c());
                     long b = localAttachment.b();
                     m.checkNotNullExpressionValue(parse, "contentUri");
@@ -620,9 +624,9 @@ public final class StoreMessages extends Store {
             } else {
                 arrayList2 = null;
             }
-            return sendMessage$default(this, i, coreUser, k, arrayList, arrayList2, null, message.A(), message.c(), null, null, null, z2 ? message.u() : null, message.s(), Integer.valueOf(intValue + 1), 1824, null);
+            return sendMessage$default(this, channelId, coreUser, content, arrayList, arrayList2, null, message.getMessageReference(), message.getAllowedMentions(), null, null, null, z2 ? message.getLastManualAttemptTimestamp() : null, message.getInitialAttemptTimestamp(), Integer.valueOf(intValue + 1), 1824, null);
         }
-        throw new IllegalArgumentException("Incorrect " + z2 + " auto attempt and message type " + message.M());
+        throw new IllegalArgumentException("Incorrect " + z2 + " auto attempt and message type " + message.getType());
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r31v0, resolved type: java.util.List<? extends com.lytefast.flexinput.model.Attachment<?>> */
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java
index fcfd1bfee2..a9e0e804f5 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java
@@ -4,10 +4,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import c.a.v.a;
 import c.a.v.b;
-import com.discord.api.message.Message;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.api.message.reaction.MessageReactionEmoji;
 import com.discord.api.message.reaction.MessageReactionUpdate;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessagesLoader;
 import com.discord.utilities.message.LocalMessageCreatorsKt;
 import com.discord.utilities.message.MessageUtils;
@@ -39,7 +39,7 @@ public class StoreMessagesHolder {
     private static final int MAX_MESSAGES_PER_CHANNEL_TRIM = 100;
     private final Object $lock = new Object[0];
     private final Set<Long> activeChannels = new HashSet();
-    private final Persister<Map<Long, List<Message>>> cache = new Persister<>("STORE_MESSAGES_CACHE_V35", new HashMap());
+    private final Persister<Map<Long, List<Message>>> cache = new Persister<>("STORE_MESSAGES_CACHE_V36", new HashMap());
     private boolean cacheEnabled;
     private Subscription cachePersistSubscription;
     private long cachePersistedAt = ClockFactory.get().currentTimeMillis();
@@ -48,7 +48,7 @@ public class StoreMessagesHolder {
     private Subject<Set<Long>, Set<Long>> detachedChannelsSubject;
     private final Map<String, Long> messageNonceIds = new HashMap();
     private final LinkedHashMap<Long, TreeMap<Long, Message>> messages = new LinkedHashMap<>();
-    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.l0());
+    private final Subject<Map<Long, List<Message>>, Map<Long, List<Message>>> messagesPublisher = new SerializedSubject(BehaviorSubject.k0());
     private Map<Long, List<Message>> messagesSnapshot = Collections.emptyMap();
     private long myUserId;
     private long selectedChannelId;
@@ -58,19 +58,19 @@ public class StoreMessagesHolder {
     public StoreMessagesHolder() {
         HashSet hashSet = new HashSet();
         this.detachedChannels = hashSet;
-        this.detachedChannelsSubject = new SerializedSubject(BehaviorSubject.m0(new HashSet(hashSet)));
+        this.detachedChannelsSubject = new SerializedSubject(BehaviorSubject.l0(new HashSet(hashSet)));
     }
 
     private static Message addReaction(Message message, MessageReactionEmoji messageReactionEmoji, boolean z2) {
         MessageReaction messageReaction;
-        Map<String, MessageReaction> F = message.F();
+        Map<String, MessageReaction> reactionsMap = message.getReactionsMap();
         String c2 = messageReactionEmoji.c();
-        if (z2 && F.containsKey(c2) && F.get(c2).c()) {
+        if (z2 && reactionsMap.containsKey(c2) && reactionsMap.get(c2).c()) {
             return message;
         }
-        LinkedHashMap linkedHashMap = new LinkedHashMap(F);
+        LinkedHashMap linkedHashMap = new LinkedHashMap(reactionsMap);
         boolean z3 = true;
-        if (F.containsKey(c2)) {
+        if (reactionsMap.containsKey(c2)) {
             MessageReaction messageReaction2 = (MessageReaction) linkedHashMap.get(messageReactionEmoji.c());
             int a = messageReaction2.a() + 1;
             MessageReactionEmoji b = messageReaction2.b();
@@ -131,7 +131,7 @@ public class StoreMessagesHolder {
                     if (subscription != null) {
                         subscription.unsubscribe();
                     }
-                    this.cachePersistSubscription = new j(null).q(j2, TimeUnit.MILLISECONDS).X(new b(this), a.i);
+                    this.cachePersistSubscription = new j(null).q(j2, TimeUnit.MILLISECONDS).W(new b(this), a.i);
                 }
             }
         }
@@ -162,15 +162,15 @@ public class StoreMessagesHolder {
     }
 
     private static Message removeReaction(Message message, MessageReactionEmoji messageReactionEmoji, boolean z2) {
-        Map<String, MessageReaction> F = message.F();
+        Map<String, MessageReaction> reactionsMap = message.getReactionsMap();
         String c2 = messageReactionEmoji.c();
-        if (!F.containsKey(c2)) {
+        if (!reactionsMap.containsKey(c2)) {
             return message;
         }
-        if (z2 && !F.get(c2).c()) {
+        if (z2 && !reactionsMap.get(c2).c()) {
             return message;
         }
-        LinkedHashMap linkedHashMap = new LinkedHashMap(F);
+        LinkedHashMap linkedHashMap = new LinkedHashMap(reactionsMap);
         MessageReaction messageReaction = (MessageReaction) linkedHashMap.get(c2);
         boolean z3 = true;
         if (messageReaction.a() == 1) {
@@ -227,31 +227,31 @@ public class StoreMessagesHolder {
         boolean z2;
         synchronized (this.$lock) {
             for (Message message : list) {
-                long i = message.i();
-                TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(i));
-                if (isChannelActive(i) && !isChannelDetached(i)) {
-                    String B = message.B();
-                    if (MessageUtils.isLocal(message)) {
-                        this.messageNonceIds.put(B, Long.valueOf(message.r()));
+                long channelId = message.getChannelId();
+                TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(channelId));
+                if (isChannelActive(channelId) && !isChannelDetached(channelId)) {
+                    String nonce = message.getNonce();
+                    if (message.isLocal()) {
+                        this.messageNonceIds.put(nonce, Long.valueOf(message.getId()));
                     } else {
-                        Long l = this.messageNonceIds.get(B);
+                        Long l = this.messageNonceIds.get(nonce);
                         if (l != null) {
-                            this.messageNonceIds.remove(B);
+                            this.messageNonceIds.remove(nonce);
                             if (treeMap.containsKey(l)) {
                                 treeMap.remove(l);
                                 z2 = true;
-                                treeMap.put(Long.valueOf(message.r()), message);
-                                if (!updateDetachedState(i, treeMap, false, true, false) || !z2) {
-                                    this.updatedChannels.add(Long.valueOf(i));
+                                treeMap.put(Long.valueOf(message.getId()), message);
+                                if (!updateDetachedState(channelId, treeMap, false, true, false) || !z2) {
+                                    this.updatedChannels.add(Long.valueOf(channelId));
                                 }
                             }
                         }
                     }
                     z2 = false;
-                    treeMap.put(Long.valueOf(message.r()), message);
-                    if (!updateDetachedState(i, treeMap, false, true, false)) {
+                    treeMap.put(Long.valueOf(message.getId()), message);
+                    if (!updateDetachedState(channelId, treeMap, false, true, false)) {
                     }
-                    this.updatedChannels.add(Long.valueOf(i));
+                    this.updatedChannels.add(Long.valueOf(channelId));
                 }
             }
             publishIfUpdated();
@@ -303,8 +303,8 @@ public class StoreMessagesHolder {
                             this.messages.put(Long.valueOf(longValue), new TreeMap<>(MessageUtils.getSORT_BY_IDS_COMPARATOR()));
                             TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(longValue));
                             for (Message message : entry.getValue()) {
-                                this.staleMessages.add(Long.valueOf(message.r()));
-                                treeMap.put(Long.valueOf(message.r()), message);
+                                this.staleMessages.add(Long.valueOf(message.getId()));
+                                treeMap.put(Long.valueOf(message.getId()), message);
                             }
                             this.updatedChannels.add(Long.valueOf(longValue));
                         }
@@ -320,7 +320,7 @@ public class StoreMessagesHolder {
         synchronized (this.$lock) {
             for (Map.Entry<Long, TreeMap<Long, Message>> entry : this.messages.entrySet()) {
                 for (Map.Entry<Long, Message> entry2 : entry.getValue().entrySet()) {
-                    this.staleMessages.add(Long.valueOf(entry2.getValue().r()));
+                    this.staleMessages.add(Long.valueOf(entry2.getValue().getId()));
                 }
             }
             this.activeChannels.clear();
@@ -342,7 +342,7 @@ public class StoreMessagesHolder {
                     if (isInitial || isJump) {
                         Iterator<Map.Entry<Long, Message>> it = treeMap.entrySet().iterator();
                         while (it.hasNext()) {
-                            Long valueOf = Long.valueOf(it.next().getValue().r());
+                            Long valueOf = Long.valueOf(it.next().getValue().getId());
                             if (this.staleMessages.contains(valueOf) || isChannelDetached || isJump) {
                                 it.remove();
                                 this.staleMessages.remove(valueOf);
@@ -350,7 +350,7 @@ public class StoreMessagesHolder {
                         }
                     }
                     for (Message message : messages) {
-                        treeMap.put(Long.valueOf(message.r()), message);
+                        treeMap.put(Long.valueOf(message.getId()), message);
                     }
                     updateDetachedState(channelId, treeMap, channelChunk.isAppendingTop(), isPresent, isJump);
                     this.updatedChannels.add(Long.valueOf(channelId));
@@ -385,10 +385,10 @@ public class StoreMessagesHolder {
                 Message message = treeMap.get(Long.valueOf(c2));
                 if (message != null) {
                     String c3 = messageReactionUpdate.b().c();
-                    Map<String, MessageReaction> F = message.F();
-                    if (F.containsKey(c3)) {
+                    Map<String, MessageReaction> reactionsMap = message.getReactionsMap();
+                    if (reactionsMap.containsKey(c3)) {
                         LinkedHashMap linkedHashMap = new LinkedHashMap();
-                        for (Map.Entry<String, MessageReaction> entry : F.entrySet()) {
+                        for (Map.Entry<String, MessageReaction> entry : reactionsMap.entrySet()) {
                             String key = entry.getKey();
                             if (!key.equals(c3)) {
                                 linkedHashMap.put(key, entry.getValue());
@@ -421,16 +421,16 @@ public class StoreMessagesHolder {
         }
     }
 
-    public void updateMessages(@NonNull Message message) {
+    public void updateMessages(@NonNull com.discord.api.message.Message message) {
         synchronized (this.$lock) {
-            long i = message.i();
-            TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(i));
-            if (isChannelActive(i)) {
-                Message message2 = treeMap.get(Long.valueOf(message.r()));
-                if (!isChannelDetached(i)) {
+            long g = message.g();
+            TreeMap<Long, Message> treeMap = this.messages.get(Long.valueOf(g));
+            if (isChannelActive(g)) {
+                Message message2 = treeMap.get(Long.valueOf(message.o()));
+                if (!isChannelDetached(g)) {
                     if (message2 != null) {
-                        treeMap.put(Long.valueOf(message.r()), MessageUtils.merge(message2, message));
-                        this.updatedChannels.add(Long.valueOf(i));
+                        treeMap.put(Long.valueOf(message.o()), message2.merge(message));
+                        this.updatedChannels.add(Long.valueOf(g));
                     }
                 }
                 return;
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesKt.java b/app/src/main/java/com/discord/stores/StoreMessagesKt.java
new file mode 100644
index 0000000000..a0ce82603a
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreMessagesKt.java
@@ -0,0 +1,4 @@
+package com.discord.stores;
+/* compiled from: StoreMessages.kt */
+public final class StoreMessagesKt {
+}
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java
index 53e62f5e5b..053716020f 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java
@@ -1,7 +1,7 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessagesLoader;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -41,8 +41,8 @@ public final class StoreMessagesLoader$handleLoadedMessages$1 extends o implemen
                 break;
             }
             obj = it.next();
-            User g = ((Message) obj).g();
-            if (g == null || g.i() != StoreMessagesLoader.access$getStream$p(this.this$0).getUsers$app_productionGoogleRelease().getMe().getId()) {
+            User author = ((Message) obj).getAuthor();
+            if (author == null || author.i() != StoreMessagesLoader.access$getStream$p(this.this$0).getUsers$app_productionGoogleRelease().getMe().getId()) {
                 z2 = false;
                 continue;
             } else {
@@ -55,7 +55,7 @@ public final class StoreMessagesLoader$handleLoadedMessages$1 extends o implemen
         }
         Message message = (Message) obj;
         if (message != null) {
-            l = Long.valueOf(message.r());
+            l = Long.valueOf(message.getId());
         }
         return StoreMessagesLoader.ChannelLoadedState.copy$default(channelLoadedState, isInitialMessagesLoaded, isOldestMessagesLoaded, false, false, l, 8, null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java
index 2653ff7b42..008111ef1c 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessagesLoader;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -47,7 +47,7 @@ public final class StoreMessagesLoader$jumpToMessage$1 extends o implements Func
     public final synchronized void invoke(Message message) {
         if (message != null) {
             SerializedSubject access$getScrollToSubject$p = StoreMessagesLoader.access$getScrollToSubject$p(this.this$0);
-            access$getScrollToSubject$p.j.onNext(Long.valueOf(message.r()));
+            access$getScrollToSubject$p.j.onNext(Long.valueOf(message.getId()));
         } else {
             StoreMessagesLoader.access$channelLoadedStateUpdate(this.this$0, this.$channelId, AnonymousClass1.INSTANCE);
             StoreMessagesLoader.tryLoadMessages$default(this.this$0, 0, true, false, false, Long.valueOf(this.$channelId), Long.valueOf(this.$messageId), 9, null);
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.java
index 5d402fa8e8..50f0e2133b 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$2.java
@@ -44,7 +44,7 @@ public final class StoreMessagesLoader$jumpToMessage$2 extends o implements Func
 
     public final synchronized void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (channel.g() != StoreMessagesLoader.access$getSelectedChannelId$p(this.this$0)) {
+        if (channel.h() != StoreMessagesLoader.access$getSelectedChannelId$p(this.this$0)) {
             StoreMessagesLoader.access$channelLoadedStateUpdate(this.this$0, this.$channelId, AnonymousClass1.INSTANCE);
             ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel, null, null, 6, null);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java
index a803dc75f0..619ad2b696 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import j0.k.b;
 import rx.Observable;
 /* compiled from: StoreMessagesLoader.kt */
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java
index 780c51ab48..8f97d35d24 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java
index ef90dd144f..68da2b109b 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.java
@@ -20,8 +20,8 @@ public final class StoreMessagesLoader$jumpToMessage$6<T, R> implements b<Boolea
     public final Observable<? extends Channel> call(Boolean bool) {
         m.checkNotNullExpressionValue(bool, "isConnected");
         int i = bool.booleanValue() ? 1 : 3;
-        Observable<R> G = StoreMessagesLoader.access$getStream$p(this.this$0).getChannels$app_productionGoogleRelease().observeChannel(this.$channelId).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        return ObservableExtensionsKt.takeSingleUntilTimeout$default(G, 1000 * ((long) i), false, 2, null);
+        Observable<R> F = StoreMessagesLoader.access$getStream$p(this.this$0).getChannels$app_productionGoogleRelease().observeChannel(this.$channelId).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 1000 * ((long) i), false, 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java
index 8d4001802d..0cf5a83633 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessagesLoader;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java
index 92890720d7..06e75dd151 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java
@@ -8,6 +8,9 @@ import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.m;
 import d0.z.d.o;
+import j0.k.b;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -37,7 +40,30 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
 
     /* compiled from: StoreMessagesLoader.kt */
     /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$2  reason: invalid class name */
-    public static final class AnonymousClass2 extends o implements Function1<List<? extends Message>, Unit> {
+    public static final class AnonymousClass2<T, R> implements b<List<? extends Message>, List<? extends com.discord.models.message.Message>> {
+        public static final AnonymousClass2 INSTANCE = new AnonymousClass2();
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // j0.k.b
+        public /* bridge */ /* synthetic */ List<? extends com.discord.models.message.Message> call(List<? extends Message> list) {
+            return call((List<Message>) list);
+        }
+
+        public final List<com.discord.models.message.Message> call(List<Message> list) {
+            m.checkNotNullExpressionValue(list, "messages");
+            ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(list, 10));
+            Iterator<T> it = list.iterator();
+            while (it.hasNext()) {
+                arrayList.add(new com.discord.models.message.Message(it.next()));
+            }
+            return arrayList;
+        }
+    }
+
+    /* compiled from: StoreMessagesLoader.kt */
+    /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$3  reason: invalid class name */
+    public static final class AnonymousClass3 extends o implements Function1<List<? extends com.discord.models.message.Message>, Unit> {
         public final /* synthetic */ Long $after;
         public final /* synthetic */ Long $before;
         public final /* synthetic */ long $channelId;
@@ -45,7 +71,7 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
         public final /* synthetic */ StoreMessagesLoader$tryLoadMessages$3 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass2(StoreMessagesLoader$tryLoadMessages$3 storeMessagesLoader$tryLoadMessages$3, long j, Long l, Long l2, Long l3) {
+        public AnonymousClass3(StoreMessagesLoader$tryLoadMessages$3 storeMessagesLoader$tryLoadMessages$3, long j, Long l, Long l2, Long l3) {
             super(1);
             this.this$0 = storeMessagesLoader$tryLoadMessages$3;
             this.$channelId = j;
@@ -57,14 +83,14 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(List<? extends Message> list) {
-            invoke((List<Message>) list);
+        public /* bridge */ /* synthetic */ Unit invoke(List<? extends com.discord.models.message.Message> list) {
+            invoke((List<com.discord.models.message.Message>) list);
             return Unit.a;
         }
 
-        public final void invoke(List<Message> list) {
-            m.checkNotNullParameter(list, "it");
+        public final void invoke(List<com.discord.models.message.Message> list) {
             StoreMessagesLoader storeMessagesLoader = this.this$0.this$0;
+            m.checkNotNullExpressionValue(list, "it");
             long j = this.$channelId;
             Long l = this.$messageId;
             StoreMessagesLoader.access$handleLoadedMessages(storeMessagesLoader, list, j, l != null ? l.longValue() : 0, this.$before, this.$after);
@@ -72,13 +98,13 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
     }
 
     /* compiled from: StoreMessagesLoader.kt */
-    /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$3  reason: invalid class name */
-    public static final class AnonymousClass3 extends o implements Function1<Error, Unit> {
+    /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$4  reason: invalid class name */
+    public static final class AnonymousClass4 extends o implements Function1<Error, Unit> {
         public final /* synthetic */ long $channelId;
         public final /* synthetic */ StoreMessagesLoader$tryLoadMessages$3 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass3(StoreMessagesLoader$tryLoadMessages$3 storeMessagesLoader$tryLoadMessages$3, long j) {
+        public AnonymousClass4(StoreMessagesLoader$tryLoadMessages$3 storeMessagesLoader$tryLoadMessages$3, long j) {
             super(1);
             this.this$0 = storeMessagesLoader$tryLoadMessages$3;
             this.$channelId = j;
@@ -99,12 +125,12 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
     }
 
     /* compiled from: StoreMessagesLoader.kt */
-    /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$4  reason: invalid class name */
-    public static final class AnonymousClass4 extends o implements Function1<Subscription, Unit> {
+    /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$5  reason: invalid class name */
+    public static final class AnonymousClass5 extends o implements Function1<Subscription, Unit> {
         public final /* synthetic */ StoreMessagesLoader$tryLoadMessages$3 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass4(StoreMessagesLoader$tryLoadMessages$3 storeMessagesLoader$tryLoadMessages$3) {
+        public AnonymousClass5(StoreMessagesLoader$tryLoadMessages$3 storeMessagesLoader$tryLoadMessages$3) {
             super(1);
             this.this$0 = storeMessagesLoader$tryLoadMessages$3;
         }
@@ -149,10 +175,12 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
                 observable = RestAPI.Companion.getApi().getChannelMessages(j, l2, l3, Integer.valueOf(StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0)));
                 SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
                 access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-                Observable computationLatest = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn(observable, false));
+                Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+                Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
                 Class<?> cls = this.this$0.getClass();
-                AnonymousClass2 r16 = new AnonymousClass2(this, j, l, l2, l3);
-                ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass4(this), new AnonymousClass3(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
+                AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
+                ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
             }
         }
         if (l != null) {
@@ -160,27 +188,33 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu
                 observable = RestAPI.Companion.getApi().getChannelMessages(j, l2, l3, Integer.valueOf(StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0)));
                 SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
                 access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-                Observable computationLatest = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn(observable, false));
+                Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+                Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
                 Class<?> cls = this.this$0.getClass();
-                AnonymousClass2 r16 = new AnonymousClass2(this, j, l, l2, l3);
-                ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass4(this), new AnonymousClass3(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
+                AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
+                ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
             }
         }
         if (l != null) {
             observable = RestAPI.Companion.getApi().getChannelMessagesAround(j, StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0), l.longValue());
             SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
             access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-            Observable computationLatest = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn(observable, false));
+            Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+            Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
             Class<?> cls = this.this$0.getClass();
-            AnonymousClass2 r16 = new AnonymousClass2(this, j, l, l2, l3);
-            ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass4(this), new AnonymousClass3(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
+            AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
+            ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
         }
         observable = RestAPI.Companion.getApi().getChannelMessages(j, l2, l3, Integer.valueOf(StoreMessagesLoader.access$getMessageRequestSize$p(this.this$0)));
         SerializedSubject access$getChannelMessagesLoadingSubject$p = StoreMessagesLoader.access$getChannelMessagesLoadingSubject$p(this.this$0);
         access$getChannelMessagesLoadingSubject$p.j.onNext(Boolean.TRUE);
-        Observable computationLatest = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn(observable, false));
+        Observable F = ObservableExtensionsKt.restSubscribeOn(observable, false).F(AnonymousClass2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "messagesRequest\n        …messages.map(::Message) }");
+        Observable computationLatest = ObservableExtensionsKt.computationLatest(F);
         Class<?> cls = this.this$0.getClass();
-        AnonymousClass2 r16 = new AnonymousClass2(this, j, l, l2, l3);
-        ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass4(this), new AnonymousClass3(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
+        AnonymousClass3 r16 = new AnonymousClass3(this, j, l, l2, l3);
+        ObservableExtensionsKt.appSubscribe$default(computationLatest, cls, (Context) null, new AnonymousClass5(this), new AnonymousClass4(this, j), (Function0) null, (Function0) null, r16, 50, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java
index 52cfe10562..444782ed88 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessagesLoader;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -50,9 +50,9 @@ public final class StoreMessagesLoader$tryLoadMessages$4 extends o implements Fu
             return;
         }
         if (z2) {
-            StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, Long.valueOf(list.get(0).r()), null, 10, null);
+            StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, Long.valueOf(list.get(0).getId()), null, 10, null);
         } else if (z3) {
-            StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, null, Long.valueOf(list.get(list.size() - 1).r()), 6, null);
+            StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, null, Long.valueOf(list.get(list.size() - 1).getId()), 6, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader.java
index 36873bc971..95753f7b26 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesLoader.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader.java
@@ -4,8 +4,8 @@ import a0.a.a.b;
 import android.content.Context;
 import c.a.d.q;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.app.AppLog;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreChat;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
@@ -35,7 +35,7 @@ public final class StoreMessagesLoader extends Store {
     private boolean backgrounded;
     private final SerializedSubject<Map<Long, ChannelLoadedState>, Map<Long, ChannelLoadedState>> channelLoadedStateSubject;
     private final HashMap<Long, ChannelLoadedState> channelLoadedStates;
-    private final SerializedSubject<ChannelChunk, ChannelChunk> channelMessageChunksSubject = new SerializedSubject<>(BehaviorSubject.l0());
+    private final SerializedSubject<ChannelChunk, ChannelChunk> channelMessageChunksSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final SerializedSubject<Boolean, Boolean> channelMessagesLoadingSubject;
     private Subscription delayLoadingMessagesSubscription;
     private Set<Long> detachedChannels;
@@ -360,9 +360,9 @@ public final class StoreMessagesLoader extends Store {
         this.dispatcher = dispatcher;
         HashMap<Long, ChannelLoadedState> hashMap = new HashMap<>();
         this.channelLoadedStates = hashMap;
-        this.channelLoadedStateSubject = new SerializedSubject<>(BehaviorSubject.m0(new HashMap(hashMap)));
-        this.scrollToSubject = new SerializedSubject<>(BehaviorSubject.m0(null));
-        this.channelMessagesLoadingSubject = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE));
+        this.channelLoadedStateSubject = new SerializedSubject<>(BehaviorSubject.l0(new HashMap(hashMap)));
+        this.scrollToSubject = new SerializedSubject<>(BehaviorSubject.l0(null));
+        this.channelMessagesLoadingSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
         this.detachedChannels = n0.emptySet();
         this.backgrounded = true;
         this.loadingMessagesRetryDelayDefault = 1500;
@@ -522,7 +522,7 @@ public final class StoreMessagesLoader extends Store {
                                     break;
                                 }
                                 obj = it.next();
-                                if (((Message) obj).r() == j2) {
+                                if (((Message) obj).getId() == j2) {
                                     z4 = true;
                                     continue;
                                 } else {
@@ -537,7 +537,7 @@ public final class StoreMessagesLoader extends Store {
                             if (message == null) {
                                 StoreStream.Companion.getReadStates().markAsRead(Long.valueOf(j));
                             } else {
-                                this.scrollToSubject.j.onNext(Long.valueOf(message.r()));
+                                this.scrollToSubject.j.onNext(Long.valueOf(message.getId()));
                             }
                         }
                         if (!z8 && !z3) {
@@ -594,9 +594,9 @@ public final class StoreMessagesLoader extends Store {
             return;
         }
         if (j > 0) {
-            Observable<Long> e02 = Observable.e0(j, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable\n          .ti…y, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(e02), getClass(), (Context) null, new StoreMessagesLoader$tryLoadMessages$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$tryLoadMessages$1(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(j, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…y, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(d02), getClass(), (Context) null, new StoreMessagesLoader$tryLoadMessages$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$tryLoadMessages$1(this), 58, (Object) null);
             return;
         }
         if (z3) {
@@ -659,17 +659,17 @@ public final class StoreMessagesLoader extends Store {
     }
 
     public final Observable<ChannelLoadedState> getMessagesLoadedState(long j) {
-        Observable<Map<Long, ChannelLoadedState>> G = this.channelLoadedStateSubject.G(new StoreMessagesLoader$getMessagesLoadedState$1(j));
-        m.checkNotNullExpressionValue(G, "channelLoadedStateSubjec…?: ChannelLoadedState() }");
-        Observable<ChannelLoadedState> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "channelLoadedStateSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, ChannelLoadedState>> F = this.channelLoadedStateSubject.F(new StoreMessagesLoader$getMessagesLoadedState$1(j));
+        m.checkNotNullExpressionValue(F, "channelLoadedStateSubjec…?: ChannelLoadedState() }");
+        Observable<ChannelLoadedState> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "channelLoadedStateSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Long> getScrollTo() {
-        Observable<R> G = this.scrollToSubject.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        return ObservableExtensionsKt.computationLatest(G);
+        Observable<R> F = this.scrollToSubject.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return ObservableExtensionsKt.computationLatest(F);
     }
 
     public final synchronized void handleAuthToken(String str) {
@@ -710,19 +710,19 @@ public final class StoreMessagesLoader extends Store {
         if (j2 > 0) {
             StoreMessagesLoader$jumpToMessage$1 storeMessagesLoader$jumpToMessage$1 = new StoreMessagesLoader$jumpToMessage$1(this, j, j2);
             StoreMessagesLoader$jumpToMessage$2 storeMessagesLoader$jumpToMessage$2 = new StoreMessagesLoader$jumpToMessage$2(this, j);
-            Observable Z = this.stream.getChannelsSelected$app_productionGoogleRelease().observeId().k(q.c(new StoreMessagesLoader$jumpToMessage$3(j), -1L, 1000, TimeUnit.MILLISECONDS)).Z(new StoreMessagesLoader$jumpToMessage$4(this, j, j2));
-            m.checkNotNullExpressionValue(Z, "stream\n        .channels…lId, messageId)\n        }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(Z, 0, false, 3, null)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$5(this, storeMessagesLoader$jumpToMessage$1), 62, (Object) null);
-            Observable A = StoreConnectionOpen.observeConnectionOpen$default(this.stream.getConnectionOpen$app_productionGoogleRelease(), false, 1, null).a0(1).A(new StoreMessagesLoader$jumpToMessage$6(this, j));
-            m.checkNotNullExpressionValue(A, "stream\n        .connecti…mes.ONE_SECOND)\n        }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(A), getClass(), (Context) null, (Function1) null, StoreMessagesLoader$jumpToMessage$7.INSTANCE, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$8(storeMessagesLoader$jumpToMessage$2), 54, (Object) null);
+            Observable Y = this.stream.getChannelsSelected$app_productionGoogleRelease().observeId().k(q.c(new StoreMessagesLoader$jumpToMessage$3(j), -1L, 1000, TimeUnit.MILLISECONDS)).Y(new StoreMessagesLoader$jumpToMessage$4(this, j, j2));
+            m.checkNotNullExpressionValue(Y, "stream\n        .channels…lId, messageId)\n        }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null)), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$5(this, storeMessagesLoader$jumpToMessage$1), 62, (Object) null);
+            Observable z2 = StoreConnectionOpen.observeConnectionOpen$default(this.stream.getConnectionOpen$app_productionGoogleRelease(), false, 1, null).Z(1).z(new StoreMessagesLoader$jumpToMessage$6(this, j));
+            m.checkNotNullExpressionValue(z2, "stream\n        .connecti…mes.ONE_SECOND)\n        }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(z2), getClass(), (Context) null, (Function1) null, StoreMessagesLoader$jumpToMessage$7.INSTANCE, (Function0) null, (Function0) null, new StoreMessagesLoader$jumpToMessage$8(storeMessagesLoader$jumpToMessage$2), 54, (Object) null);
         }
     }
 
     public final Observable<Boolean> observeChannelMessagesLoading() {
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationBuffered(this.channelMessagesLoadingSubject).s();
-        m.checkNotNullExpressionValue(s2, "channelMessagesLoadingSu…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservableExtensionsKt.computationBuffered(this.channelMessagesLoadingSubject).r();
+        m.checkNotNullExpressionValue(r, "channelMessagesLoadingSu…  .distinctUntilChanged()");
+        return r;
     }
 
     public final synchronized void requestNewestMessages() {
diff --git a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java
index a53aab898d..12d96ba38b 100644
--- a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java
+++ b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java
@@ -58,7 +58,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
     @StoreThread
     private final void mostRecentIdsUpdateFromChannels(Collection<Channel> collection) {
         for (Channel channel : collection) {
-            if (AnimatableValueParser.x1(channel) && updateMostRecentIds(channel.g(), channel.h())) {
+            if (AnimatableValueParser.y1(channel) && updateMostRecentIds(channel.h(), channel.i())) {
                 markChanged();
             }
         }
@@ -66,7 +66,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
 
     @StoreThread
     private final void mostRecentIdsUpdateFromMessage(Message message) {
-        if (updateMostRecentIds(message.i(), message.r())) {
+        if (updateMostRecentIds(message.g(), message.o())) {
             markChanged();
         }
     }
@@ -113,7 +113,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
             if (K != null) {
                 Collection<Channel> arrayList = new ArrayList<>();
                 for (Channel channel : K) {
-                    if (AnimatableValueParser.y1(channel)) {
+                    if (AnimatableValueParser.z1(channel)) {
                         arrayList.add(channel);
                     }
                 }
@@ -134,7 +134,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
         if (K != null) {
             Collection<Channel> arrayList = new ArrayList<>();
             for (Channel channel : K) {
-                if (AnimatableValueParser.y1(channel)) {
+                if (AnimatableValueParser.z1(channel)) {
                     arrayList.add(channel);
                 }
             }
@@ -151,7 +151,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
     @StoreThread
     public final void handleThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (AnimatableValueParser.y1(channel)) {
+        if (AnimatableValueParser.z1(channel)) {
             mostRecentIdsUpdateFromChannels(d0.t.m.listOf(channel));
         }
     }
@@ -162,7 +162,7 @@ public final class StoreMessagesMostRecent extends StoreV2 {
         List<Channel> threads = modelThreadListSync.getThreads();
         Collection<Channel> arrayList = new ArrayList<>();
         for (Channel channel : threads) {
-            if (AnimatableValueParser.y1(channel)) {
+            if (AnimatableValueParser.z1(channel)) {
                 arrayList.add(channel);
             }
         }
@@ -174,9 +174,9 @@ public final class StoreMessagesMostRecent extends StoreV2 {
     }
 
     public final Observable<Long> observeRecentMessageIds(long j) {
-        Observable<Long> s2 = observeRecentMessageIds().G(new StoreMessagesMostRecent$observeRecentMessageIds$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeRecentMessageIds(…  .distinctUntilChanged()");
-        return s2;
+        Observable<Long> r = observeRecentMessageIds().F(new StoreMessagesMostRecent$observeRecentMessageIds$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observeRecentMessageIds(…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java
index 5273493d92..e8a0f7a787 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthStateHandler$1.java
@@ -31,7 +31,7 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$oAuthSta
         Uri oAuthUri = modelGlobalNavigation.getOAuthUri();
         if (!m.areEqual(oAuthUri, Uri.EMPTY)) {
             l lVar = l.g;
-            if (!appActivity.g(l.f44c)) {
+            if (!appActivity.g(l.f43c)) {
                 WidgetOauth2Authorize.Companion.launch(appActivity, oAuthUri);
                 StoreAuthentication authentication$app_productionGoogleRelease = StoreNavigation.ActivityNavigationLifecycleCallbacks.access$getStream$p(this.this$0).getAuthentication$app_productionGoogleRelease();
                 Uri uri = Uri.EMPTY;
diff --git a/app/src/main/java/com/discord/stores/StoreNavigation.java b/app/src/main/java/com/discord/stores/StoreNavigation.java
index 27018d6cd5..7d859e4745 100644
--- a/app/src/main/java/com/discord/stores/StoreNavigation.java
+++ b/app/src/main/java/com/discord/stores/StoreNavigation.java
@@ -31,7 +31,7 @@ import rx.subjects.SerializedSubject;
 /* compiled from: StoreNavigation.kt */
 public final class StoreNavigation {
     private final BehaviorSubject<PanelState> leftPanelStateSubject;
-    private final SerializedSubject<PanelAction, PanelAction> navigationPanelActionSubject = new SerializedSubject<>(BehaviorSubject.m0(PanelAction.NOOP));
+    private final SerializedSubject<PanelAction, PanelAction> navigationPanelActionSubject = new SerializedSubject<>(BehaviorSubject.l0(PanelAction.NOOP));
     private final BehaviorSubject<PanelState> rightPanelStateSubject;
     private final StoreStream stream;
 
@@ -346,11 +346,11 @@ public final class StoreNavigation {
             Observable<AgeGate> shouldShowAgeGate = this.stream.getAuthentication$app_productionGoogleRelease().getShouldShowAgeGate();
             Observable<Uri> oAuthUriObservable = this.stream.getAuthentication$app_productionGoogleRelease().getOAuthUriObservable();
             Observable<NavigationTab> observeSelectedTab = this.stream.getTabsNavigation$app_productionGoogleRelease().observeSelectedTab();
-            Observable<R> G = this.stream.getUsers$app_productionGoogleRelease().observeMe(true).G(StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "stream\n              .us….hasPhone\n              }");
-            Observable<ModelGlobalNavigation> s2 = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(ObservableCombineLatestOverloadsKt.combineLatest(nuxState, isInitializedObservable, authedToken$app_productionGoogleRelease, observeInitializedForAuthedUser, observeHasIncoming, observeUserRequiredAction, clientOutdated, inviteCode, observeDynamicLinkGuildTemplateCode, notices, shouldShowAgeGate, oAuthUriObservable, observeSelectedTab, G, StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$2.INSTANCE), 500, TimeUnit.MILLISECONDS)).s();
-            m.checkNotNullExpressionValue(s2, "combineLatest(\n         …  .distinctUntilChanged()");
-            return s2;
+            Observable<R> F = this.stream.getUsers$app_productionGoogleRelease().observeMe(true).F(StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "stream\n              .us….hasPhone\n              }");
+            Observable<ModelGlobalNavigation> r = ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.leadingEdgeThrottle(ObservableCombineLatestOverloadsKt.combineLatest(nuxState, isInitializedObservable, authedToken$app_productionGoogleRelease, observeInitializedForAuthedUser, observeHasIncoming, observeUserRequiredAction, clientOutdated, inviteCode, observeDynamicLinkGuildTemplateCode, notices, shouldShowAgeGate, oAuthUriObservable, observeSelectedTab, F, StoreNavigation$ActivityNavigationLifecycleCallbacks$getGlobalNavigationData$2.INSTANCE), 500, TimeUnit.MILLISECONDS)).r();
+            m.checkNotNullExpressionValue(r, "combineLatest(\n         …  .distinctUntilChanged()");
+            return r;
         }
 
         private final void handleGlobalNavigationData(AppActivity appActivity, ModelGlobalNavigation modelGlobalNavigation) {
@@ -464,8 +464,8 @@ public final class StoreNavigation {
         m.checkNotNullParameter(storeStream, "stream");
         this.stream = storeStream;
         PanelState.a aVar = PanelState.a.a;
-        this.leftPanelStateSubject = BehaviorSubject.m0(aVar);
-        this.rightPanelStateSubject = BehaviorSubject.m0(aVar);
+        this.leftPanelStateSubject = BehaviorSubject.l0(aVar);
+        this.rightPanelStateSubject = BehaviorSubject.l0(aVar);
     }
 
     public static /* synthetic */ void setNavigationPanelAction$default(StoreNavigation storeNavigation, PanelAction panelAction, PanelLayout panelLayout, int i, Object obj) {
@@ -476,9 +476,9 @@ public final class StoreNavigation {
     }
 
     public final Observable<PanelAction> getNavigationPanelAction() {
-        Observable<PanelAction> s2 = ObservableExtensionsKt.computationLatest(this.navigationPanelActionSubject).s();
-        m.checkNotNullExpressionValue(s2, "navigationPanelActionSub…  .distinctUntilChanged()");
-        return s2;
+        Observable<PanelAction> r = ObservableExtensionsKt.computationLatest(this.navigationPanelActionSubject).r();
+        m.checkNotNullExpressionValue(r, "navigationPanelActionSub…  .distinctUntilChanged()");
+        return r;
     }
 
     @StoreThread
@@ -502,15 +502,15 @@ public final class StoreNavigation {
     }
 
     public final Observable<PanelState> observeLeftPanelState() {
-        Observable<PanelState> s2 = this.leftPanelStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "leftPanelStateSubject.distinctUntilChanged()");
-        return s2;
+        Observable<PanelState> r = this.leftPanelStateSubject.r();
+        m.checkNotNullExpressionValue(r, "leftPanelStateSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<PanelState> observeRightPanelState() {
-        Observable<PanelState> s2 = this.rightPanelStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "rightPanelStateSubject.distinctUntilChanged()");
-        return s2;
+        Observable<PanelState> r = this.rightPanelStateSubject.r();
+        m.checkNotNullExpressionValue(r, "rightPanelStateSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final void setLeftPanelState(PanelState panelState) {
diff --git a/app/src/main/java/com/discord/stores/StoreNotices$init$1.java b/app/src/main/java/com/discord/stores/StoreNotices$init$1.java
index d92f49a8f6..0016258845 100644
--- a/app/src/main/java/com/discord/stores/StoreNotices$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNotices$init$1.java
@@ -13,6 +13,6 @@ public final class StoreNotices$init$1<T, R> implements b<Unit, Observable<? ext
     }
 
     public final Observable<? extends Long> call(Unit unit) {
-        return Observable.E(0, StoreNotices.access$getPollRateMs$p(this.this$0), TimeUnit.MILLISECONDS);
+        return Observable.D(0, StoreNotices.access$getPollRateMs$p(this.this$0), TimeUnit.MILLISECONDS);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreNotices.java b/app/src/main/java/com/discord/stores/StoreNotices.java
index 3a930a9952..27642eab25 100644
--- a/app/src/main/java/com/discord/stores/StoreNotices.java
+++ b/app/src/main/java/com/discord/stores/StoreNotices.java
@@ -336,12 +336,12 @@ public final class StoreNotices extends Store {
         m.checkNotNullParameter(storeStream, "stream");
         this.clock = clock;
         this.stream = storeStream;
-        BehaviorSubject<Unit> l0 = BehaviorSubject.l0();
-        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create()");
-        this.processTrigger = l0;
-        BehaviorSubject<Notice> m0 = BehaviorSubject.m0(null);
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(null as Notice?)");
-        this.noticePublisher = m0;
+        BehaviorSubject<Unit> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.processTrigger = k0;
+        BehaviorSubject<Notice> l0 = BehaviorSubject.l0(null);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(null as Notice?)");
+        this.noticePublisher = l0;
         this.firstUseTimestamp$delegate = g.lazy(new StoreNotices$firstUseTimestamp$2(this));
     }
 
@@ -402,9 +402,9 @@ public final class StoreNotices extends Store {
     }
 
     public final Observable<Notice> getNotices() {
-        Observable<Notice> s2 = this.noticePublisher.s();
-        m.checkNotNullExpressionValue(s2, "noticePublisher.distinctUntilChanged()");
-        return s2;
+        Observable<Notice> r = this.noticePublisher.r();
+        m.checkNotNullExpressionValue(r, "noticePublisher.distinctUntilChanged()");
+        return r;
     }
 
     public final StoreStream getStream() {
@@ -418,7 +418,7 @@ public final class StoreNotices extends Store {
         AppLog appLog = AppLog.g;
         Logger.d$default(appLog, "Notices init", null, 2, null);
         Logger.d$default(appLog, "Notices prev seen: " + this.noticesSeenCache.get().entrySet(), null, 2, null);
-        Observable o = this.processTrigger.Z(new StoreNotices$init$1(this)).o(50, TimeUnit.MILLISECONDS);
+        Observable o = this.processTrigger.Y(new StoreNotices$init$1(this)).o(50, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "processTrigger\n        .…S, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(o), StoreNotices.class, (Context) null, (Function1) null, new StoreNotices$init$3(this), (Function0) null, (Function0) null, new StoreNotices$init$2(this), 54, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java b/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java
index a54e61ee1e..6847209213 100644
--- a/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java
+++ b/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.view.View;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.utilities.intent.IntentUtils;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -32,7 +32,7 @@ public final class StoreNotifications$displayPopup$1 extends o implements Functi
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        Intent selectChannel = IntentUtils.RouteBuilders.selectChannel(this.$channel.g(), this.$channel.e(), Long.valueOf(this.$message.r()));
+        Intent selectChannel = IntentUtils.RouteBuilders.selectChannel(this.$channel.h(), this.$channel.f(), Long.valueOf(this.$message.getId()));
         selectChannel.putExtra("com.discord.intent.ORIGIN_SOURCE", "com.discord.intent.ORIGIN_NOTIF_INAPP");
         IntentUtils intentUtils = IntentUtils.INSTANCE;
         Context context = view.getContext();
diff --git a/app/src/main/java/com/discord/stores/StoreNotifications.java b/app/src/main/java/com/discord/stores/StoreNotifications.java
index 24b5d213e1..81ab7b229c 100644
--- a/app/src/main/java/com/discord/stores/StoreNotifications.java
+++ b/app/src/main/java/com/discord/stores/StoreNotifications.java
@@ -6,9 +6,9 @@ import c.a.d.q;
 import c.a.e.d;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.presence.ClientStatus;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
@@ -88,19 +88,19 @@ public final class StoreNotifications extends Store {
         NotificationClient.INSTANCE.setRegistrationIdReceived(new StoreNotifications$configureNotificationClient$1(this));
         Observable<NotificationClient.SettingsV2> settings = getSettings();
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable j = Observable.j(Observable.h(settings, companion.getAuthentication().getAuthedToken$app_productionGoogleRelease(), companion.getUserSettingsSystem().observeSettings(false), ObservableExtensionsKt.leadingEdgeThrottle(companion.getPermissions().observePermissionsForAllChannels(), 1, TimeUnit.SECONDS).G(StoreNotifications$configureNotificationClient$completedSettings$1.INSTANCE), StoreNotifications$configureNotificationClient$completedSettings$2.INSTANCE).s(), d.d.a(), StoreNotifications$configureNotificationClient$2.INSTANCE);
+        Observable j = Observable.j(Observable.h(settings, companion.getAuthentication().getAuthedToken$app_productionGoogleRelease(), companion.getUserSettingsSystem().observeSettings(false), ObservableExtensionsKt.leadingEdgeThrottle(companion.getPermissions().observePermissionsForAllChannels(), 1, TimeUnit.SECONDS).F(StoreNotifications$configureNotificationClient$completedSettings$1.INSTANCE), StoreNotifications$configureNotificationClient$completedSettings$2.INSTANCE).r(), d.d.a(), StoreNotifications$configureNotificationClient$2.INSTANCE);
         m.checkNotNullExpressionValue(j, "Observable\n        .comb… isBackgrounded\n        }");
-        Observable s2 = ObservableExtensionsKt.computationBuffered(j).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n        .comb…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, (Context) null, "nsClient", (Function1) null, StoreNotifications$configureNotificationClient$3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable r = ObservableExtensionsKt.computationBuffered(j).r();
+        m.checkNotNullExpressionValue(r, "Observable\n        .comb…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, (Context) null, "nsClient", (Function1) null, StoreNotifications$configureNotificationClient$3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final void displayPopup(Message message, Channel channel) {
         Context context;
-        if ((message.r() >>> 22) + 1420070400000L + 10000 > this.clock.currentTimeMillis() && (context = this.context) != null) {
+        if ((message.getId() >>> 22) + 1420070400000L + 10000 > this.clock.currentTimeMillis() && (context = this.context) != null) {
             NoticePopupChannel noticePopupChannel = NoticePopupChannel.INSTANCE;
             StringBuilder L = a.L("{InAppNotif}#");
-            L.append(message.i());
+            L.append(message.getChannelId());
             noticePopupChannel.enqueue(context, L.toString(), message, new StoreNotifications$displayPopup$1(channel, message));
         }
     }
@@ -152,7 +152,7 @@ public final class StoreNotifications extends Store {
     /* JADX WARNING: Removed duplicated region for block: B:29:0x00ce  */
     /* JADX WARNING: Removed duplicated region for block: B:41:? A[RETURN, SYNTHETIC] */
     @StoreThread
-    public final void handleMessageCreate(Message message) {
+    public final void handleMessageCreate(com.discord.api.message.Message message) {
         Channel channel;
         m.checkNotNullParameter(message, "message");
         if (this.notificationSettings.get().isEnabledInApp() && this.stream.getPresences$app_productionGoogleRelease().getLocalPresence$app_productionGoogleRelease().getStatus() != ClientStatus.DND) {
@@ -163,19 +163,19 @@ public final class StoreNotifications extends Store {
                     linkedHashMap.put(entry.getKey(), entry.getValue());
                 }
             }
-            if (message.i() != this.stream.getChannelsSelected$app_productionGoogleRelease().getId()) {
+            if (message.g() != this.stream.getChannelsSelected$app_productionGoogleRelease().getId()) {
                 Map<Long, Map<Long, Channel>> channelsByGuildInternal$app_productionGoogleRelease = this.stream.getChannels$app_productionGoogleRelease().getChannelsByGuildInternal$app_productionGoogleRelease();
-                Long o = message.o();
-                Map<Long, Channel> map = channelsByGuildInternal$app_productionGoogleRelease.get(Long.valueOf(o != null ? o.longValue() : 0));
-                Channel channel2 = this.stream.getChannels$app_productionGoogleRelease().getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(message.i()));
+                Long m = message.m();
+                Map<Long, Channel> map = channelsByGuildInternal$app_productionGoogleRelease.get(Long.valueOf(m != null ? m.longValue() : 0));
+                Channel channel2 = this.stream.getChannels$app_productionGoogleRelease().getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(message.g()));
                 if (channel2 == null) {
                     if (map != null) {
-                        channel2 = map.get(Long.valueOf(message.i()));
+                        channel2 = map.get(Long.valueOf(message.g()));
                     } else {
                         channel = null;
                         if (channel == null) {
-                            if (NotificationTextUtils.INSTANCE.shouldNotifyInAppPopup(this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease(), message, channel, linkedHashMap, map != null ? map.get(Long.valueOf(channel.q())) : null, (Guild) a.c(channel, this.stream.getGuilds$app_productionGoogleRelease().getGuildsInternal$app_productionGoogleRelease()), this.stream.getGuilds$app_productionGoogleRelease().getGuildMembersComputedInternal$app_productionGoogleRelease(), this.stream.getGuildSettings$app_productionGoogleRelease().getGuildSettingsInternal$app_productionGoogleRelease(), this.stream.getThreadsJoined$app_productionGoogleRelease().getAllJoinedThreadsInternal$app_productionGoogleRelease())) {
-                                displayPopup(message, channel);
+                            if (NotificationTextUtils.INSTANCE.shouldNotifyInAppPopup(this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease(), message, channel, linkedHashMap, map != null ? map.get(Long.valueOf(channel.r())) : null, (Guild) a.c(channel, this.stream.getGuilds$app_productionGoogleRelease().getGuildsInternal$app_productionGoogleRelease()), this.stream.getGuilds$app_productionGoogleRelease().getGuildMembersComputedInternal$app_productionGoogleRelease(), this.stream.getGuildSettings$app_productionGoogleRelease().getGuildSettingsInternal$app_productionGoogleRelease(), this.stream.getThreadsJoined$app_productionGoogleRelease().getAllJoinedThreadsInternal$app_productionGoogleRelease())) {
+                                displayPopup(new Message(message), channel);
                                 return;
                             }
                             return;
diff --git a/app/src/main/java/com/discord/stores/StoreNux.java b/app/src/main/java/com/discord/stores/StoreNux.java
index afcdb508e1..c4c560a1f3 100644
--- a/app/src/main/java/com/discord/stores/StoreNux.java
+++ b/app/src/main/java/com/discord/stores/StoreNux.java
@@ -188,7 +188,7 @@ public final class StoreNux extends Store {
         this.dispatcher = dispatcher;
         NuxState nuxState = new NuxState(false, false, false, false, false, null, 63, null);
         this.nuxState = nuxState;
-        this.nuxStateSubject = BehaviorSubject.m0(nuxState);
+        this.nuxStateSubject = BehaviorSubject.l0(nuxState);
     }
 
     public static final /* synthetic */ NuxState access$getNuxState$p(StoreNux storeNux) {
@@ -212,9 +212,9 @@ public final class StoreNux extends Store {
     }
 
     public final Observable<NuxState> getNuxState() {
-        Observable<NuxState> s2 = this.nuxStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "nuxStateSubject.distinctUntilChanged()");
-        return s2;
+        Observable<NuxState> r = this.nuxStateSubject.r();
+        m.checkNotNullExpressionValue(r, "nuxStateSubject.distinctUntilChanged()");
+        return r;
     }
 
     @StoreThread
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$fetchClaimedOutboundPromotions$1.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$fetchClaimedOutboundPromotions$1.java
deleted file mode 100644
index 8a33f2a116..0000000000
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$fetchClaimedOutboundPromotions$1.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.discord.stores;
-
-import com.discord.api.premium.ClaimedOutboundPromotion;
-import d0.t.n;
-import java.util.List;
-import java.util.concurrent.Callable;
-/* compiled from: StoreOutboundPromotions.kt */
-public final class StoreOutboundPromotions$fetchClaimedOutboundPromotions$1<V> implements Callable<List<? extends ClaimedOutboundPromotion>> {
-    public final /* synthetic */ StoreOutboundPromotions this$0;
-
-    public StoreOutboundPromotions$fetchClaimedOutboundPromotions$1(StoreOutboundPromotions storeOutboundPromotions) {
-        this.this$0 = storeOutboundPromotions;
-    }
-
-    /* Return type fixed from 'java.util.List<com.discord.api.premium.ClaimedOutboundPromotion>' to match base method */
-    @Override // java.util.concurrent.Callable
-    public final List<? extends ClaimedOutboundPromotion> call() {
-        return n.emptyList();
-    }
-}
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$1.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$1.java
index aeb1dc8087..c185bdbfa8 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$1.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$1.java
@@ -1,19 +1,145 @@
 package com.discord.stores;
 
+import android.content.SharedPreferences;
+import c.d.b.a.a;
 import com.discord.api.premium.OutboundPromotion;
+import com.discord.models.domain.ModelEntitlement;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import d0.z.d.m;
+import j0.k.b;
+import j0.l.e.j;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Callable;
+import rx.Observable;
+import rx.functions.Action1;
 /* compiled from: StoreOutboundPromotions.kt */
-public final class StoreOutboundPromotions$handleConnectionOpen$1<V> implements Callable<List<? extends OutboundPromotion>> {
+public final class StoreOutboundPromotions$handleConnectionOpen$1<T, R> implements b<List<? extends OutboundPromotion>, Observable<? extends List<? extends OutboundPromotion>>> {
     public final /* synthetic */ StoreOutboundPromotions this$0;
 
+    /* compiled from: StoreOutboundPromotions.kt */
+    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$1$1  reason: invalid class name */
+    public static final class AnonymousClass1<V> implements Callable<List<? extends OutboundPromotion>> {
+        public final /* synthetic */ List $activePromos;
+        public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$1 this$0;
+
+        public AnonymousClass1(StoreOutboundPromotions$handleConnectionOpen$1 storeOutboundPromotions$handleConnectionOpen$1, List list) {
+            this.this$0 = storeOutboundPromotions$handleConnectionOpen$1;
+            this.$activePromos = list;
+        }
+
+        /* Return type fixed from 'java.util.List<com.discord.api.premium.OutboundPromotion>' to match base method */
+        @Override // java.util.concurrent.Callable
+        public final List<? extends OutboundPromotion> call() {
+            long j = this.this$0.this$0.getPrefs().getLong("CONSUMED_ENTITLEMENT_CODE", -1);
+            List list = this.$activePromos;
+            ArrayList S = a.S(list, "activePromos");
+            for (T t : list) {
+                if (t.b() != j) {
+                    S.add(t);
+                }
+            }
+            return S;
+        }
+    }
+
+    /* compiled from: StoreOutboundPromotions.kt */
+    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$1$2  reason: invalid class name */
+    public static final class AnonymousClass2<T, R> implements b<List<? extends ModelEntitlement>, Long> {
+        public static final AnonymousClass2 INSTANCE = new AnonymousClass2();
+
+        public final Long call(List<ModelEntitlement> list) {
+            T t;
+            Long promotionId;
+            boolean z2;
+            m.checkNotNullExpressionValue(list, "entitlements");
+            Iterator<T> it = list.iterator();
+            while (true) {
+                if (!it.hasNext()) {
+                    t = null;
+                    break;
+                }
+                t = it.next();
+                T t2 = t;
+                if (!m.areEqual(t2.getConsumed(), Boolean.TRUE) || t2.getPromotionId() == null) {
+                    z2 = false;
+                    continue;
+                } else {
+                    z2 = true;
+                    continue;
+                }
+                if (z2) {
+                    break;
+                }
+            }
+            T t3 = t;
+            return Long.valueOf((t3 == null || (promotionId = t3.getPromotionId()) == null) ? -1 : promotionId.longValue());
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // j0.k.b
+        public /* bridge */ /* synthetic */ Long call(List<? extends ModelEntitlement> list) {
+            return call((List<ModelEntitlement>) list);
+        }
+    }
+
+    /* compiled from: StoreOutboundPromotions.kt */
+    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$1$3  reason: invalid class name */
+    public static final class AnonymousClass3<T> implements Action1<Long> {
+        public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$1 this$0;
+
+        public AnonymousClass3(StoreOutboundPromotions$handleConnectionOpen$1 storeOutboundPromotions$handleConnectionOpen$1) {
+            this.this$0 = storeOutboundPromotions$handleConnectionOpen$1;
+        }
+
+        public final void call(Long l) {
+            SharedPreferences.Editor edit = this.this$0.this$0.getPrefs().edit();
+            m.checkExpressionValueIsNotNull(edit, "editor");
+            m.checkNotNullExpressionValue(l, "consumedPromoId");
+            edit.putLong("CONSUMED_ENTITLEMENT_CODE", l.longValue());
+            edit.apply();
+        }
+    }
+
+    /* compiled from: StoreOutboundPromotions.kt */
+    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$1$4  reason: invalid class name */
+    public static final class AnonymousClass4<T, R> implements b<Long, List<? extends OutboundPromotion>> {
+        public final /* synthetic */ List $activePromos;
+
+        public AnonymousClass4(List list) {
+            this.$activePromos = list;
+        }
+
+        public final List<OutboundPromotion> call(Long l) {
+            List list = this.$activePromos;
+            ArrayList S = a.S(list, "activePromos");
+            for (T t : list) {
+                if (l == null || t.b() != l.longValue()) {
+                    S.add(t);
+                }
+            }
+            return S;
+        }
+    }
+
     public StoreOutboundPromotions$handleConnectionOpen$1(StoreOutboundPromotions storeOutboundPromotions) {
         this.this$0 = storeOutboundPromotions;
     }
 
-    /* Return type fixed from 'java.util.List<com.discord.api.premium.OutboundPromotion>' to match base method */
-    @Override // java.util.concurrent.Callable
-    public final List<? extends OutboundPromotion> call() {
-        return StoreOutboundPromotions.access$getStubActivePromos$p(this.this$0);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // j0.k.b
+    public /* bridge */ /* synthetic */ Observable<? extends List<? extends OutboundPromotion>> call(List<? extends OutboundPromotion> list) {
+        return call((List<OutboundPromotion>) list);
+    }
+
+    public final Observable<? extends List<OutboundPromotion>> call(List<OutboundPromotion> list) {
+        if (this.this$0.getPrefs().contains("CONSUMED_ENTITLEMENT_CODE")) {
+            return Observable.C(new AnonymousClass1(this, list));
+        }
+        m.checkNotNullExpressionValue(list, "activePromos");
+        return list.isEmpty() ^ true ? ObservableExtensionsKt.restSubscribeOn$default(StoreOutboundPromotions.access$getRestAPI$p(this.this$0).getMyEntitlements(521842831262875670L, false), false, 1, null).F(AnonymousClass2.INSTANCE).t(new AnonymousClass3(this)).F(new AnonymousClass4(list)) : new j(list);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java
index 064afef6d0..176ba5df58 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$2.java
@@ -1,120 +1,51 @@
 package com.discord.stores;
 
-import android.content.SharedPreferences;
-import c.d.b.a.a;
-import com.discord.api.premium.OutboundPromotion;
-import d0.c0.c;
-import d0.d0.f;
+import com.discord.stores.StoreOutboundPromotions;
+import com.discord.utilities.error.Error;
 import d0.z.d.m;
-import j0.k.b;
-import j0.l.e.j;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-import kotlin.ranges.LongRange;
-import rx.Observable;
-import rx.functions.Action1;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
 /* compiled from: StoreOutboundPromotions.kt */
-public final class StoreOutboundPromotions$handleConnectionOpen$2<T, R> implements b<List<? extends OutboundPromotion>, Observable<? extends List<? extends OutboundPromotion>>> {
+public final class StoreOutboundPromotions$handleConnectionOpen$2 extends o implements Function1<Error, Unit> {
     public final /* synthetic */ StoreOutboundPromotions this$0;
 
     /* compiled from: StoreOutboundPromotions.kt */
     /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$2$1  reason: invalid class name */
-    public static final class AnonymousClass1<V> implements Callable<List<? extends OutboundPromotion>> {
-        public final /* synthetic */ List $activePromos;
+    public static final class AnonymousClass1 extends o implements Function0<Unit> {
         public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$2 this$0;
 
-        public AnonymousClass1(StoreOutboundPromotions$handleConnectionOpen$2 storeOutboundPromotions$handleConnectionOpen$2, List list) {
-            this.this$0 = storeOutboundPromotions$handleConnectionOpen$2;
-            this.$activePromos = list;
-        }
-
-        /* Return type fixed from 'java.util.List<com.discord.api.premium.OutboundPromotion>' to match base method */
-        @Override // java.util.concurrent.Callable
-        public final List<? extends OutboundPromotion> call() {
-            long j = this.this$0.this$0.getPrefs().getLong("CONSUMED_ENTITLEMENT_CODE", -1);
-            List list = this.$activePromos;
-            ArrayList S = a.S(list, "activePromos");
-            for (T t : list) {
-                if (t.b() != j) {
-                    S.add(t);
-                }
-            }
-            return S;
-        }
-    }
-
-    /* compiled from: StoreOutboundPromotions.kt */
-    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$2$2  reason: invalid class name */
-    public static final class AnonymousClass2<V> implements Callable<Long> {
-        public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$2 this$0;
-
-        public AnonymousClass2(StoreOutboundPromotions$handleConnectionOpen$2 storeOutboundPromotions$handleConnectionOpen$2) {
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(StoreOutboundPromotions$handleConnectionOpen$2 storeOutboundPromotions$handleConnectionOpen$2) {
+            super(0);
             this.this$0 = storeOutboundPromotions$handleConnectionOpen$2;
         }
 
-        @Override // java.util.concurrent.Callable
-        public final Long call() {
-            return Long.valueOf(StoreOutboundPromotions.access$getStubConsumedPromoId$p(this.this$0.this$0));
-        }
-    }
-
-    /* compiled from: StoreOutboundPromotions.kt */
-    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$2$3  reason: invalid class name */
-    public static final class AnonymousClass3<T> implements Action1<Long> {
-        public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$2 this$0;
-
-        public AnonymousClass3(StoreOutboundPromotions$handleConnectionOpen$2 storeOutboundPromotions$handleConnectionOpen$2) {
-            this.this$0 = storeOutboundPromotions$handleConnectionOpen$2;
-        }
-
-        public final void call(Long l) {
-            SharedPreferences.Editor edit = this.this$0.this$0.getPrefs().edit();
-            m.checkExpressionValueIsNotNull(edit, "editor");
-            m.checkNotNullExpressionValue(l, "consumedPromoId");
-            edit.putLong("CONSUMED_ENTITLEMENT_CODE", l.longValue());
-            edit.apply();
-        }
-    }
-
-    /* compiled from: StoreOutboundPromotions.kt */
-    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$2$4  reason: invalid class name */
-    public static final class AnonymousClass4<T, R> implements b<Long, List<? extends OutboundPromotion>> {
-        public final /* synthetic */ List $activePromos;
-
-        public AnonymousClass4(List list) {
-            this.$activePromos = list;
-        }
-
-        public final List<OutboundPromotion> call(Long l) {
-            List list = this.$activePromos;
-            ArrayList S = a.S(list, "activePromos");
-            for (T t : list) {
-                if (l == null || t.b() != l.longValue()) {
-                    S.add(t);
-                }
-            }
-            return S;
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public final void mo1invoke() {
+            StoreOutboundPromotions.access$setState$p(this.this$0.this$0, StoreOutboundPromotions.State.Failed.INSTANCE);
+            this.this$0.this$0.markChanged();
         }
     }
 
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StoreOutboundPromotions$handleConnectionOpen$2(StoreOutboundPromotions storeOutboundPromotions) {
+        super(1);
         this.this$0 = storeOutboundPromotions;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // j0.k.b
-    public /* bridge */ /* synthetic */ Observable<? extends List<? extends OutboundPromotion>> call(List<? extends OutboundPromotion> list) {
-        return call((List<OutboundPromotion>) list);
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
+        invoke(error);
+        return Unit.a;
     }
 
-    public final Observable<? extends List<OutboundPromotion>> call(List<OutboundPromotion> list) {
-        if (this.this$0.getPrefs().contains("CONSUMED_ENTITLEMENT_CODE")) {
-            return Observable.D(new AnonymousClass1(this, list));
-        }
-        m.checkNotNullExpressionValue(list, "activePromos");
-        return list.isEmpty() ^ true ? Observable.D(new AnonymousClass2(this)).r(f.random(new LongRange(0, 2000), c.b), TimeUnit.MILLISECONDS, j0.p.a.a()).Y(j0.p.a.a()).u(new AnonymousClass3(this)).G(new AnonymousClass4(list)) : new j(list);
+    public final void invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        StoreOutboundPromotions.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$3.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$3.java
index 2417868cf9..1918060a82 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$3.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$3.java
@@ -1,31 +1,37 @@
 package com.discord.stores;
 
+import com.discord.api.premium.OutboundPromotion;
 import com.discord.stores.StoreOutboundPromotions;
-import com.discord.utilities.error.Error;
 import d0.z.d.m;
 import d0.z.d.o;
+import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreOutboundPromotions.kt */
-public final class StoreOutboundPromotions$handleConnectionOpen$3 extends o implements Function1<Error, Unit> {
+public final class StoreOutboundPromotions$handleConnectionOpen$3 extends o implements Function1<List<? extends OutboundPromotion>, Unit> {
     public final /* synthetic */ StoreOutboundPromotions this$0;
 
     /* compiled from: StoreOutboundPromotions.kt */
     /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$3$1  reason: invalid class name */
     public static final class AnonymousClass1 extends o implements Function0<Unit> {
+        public final /* synthetic */ List $validActivePromos;
         public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$3 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(StoreOutboundPromotions$handleConnectionOpen$3 storeOutboundPromotions$handleConnectionOpen$3) {
+        public AnonymousClass1(StoreOutboundPromotions$handleConnectionOpen$3 storeOutboundPromotions$handleConnectionOpen$3, List list) {
             super(0);
             this.this$0 = storeOutboundPromotions$handleConnectionOpen$3;
+            this.$validActivePromos = list;
         }
 
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            StoreOutboundPromotions.access$setState$p(this.this$0.this$0, StoreOutboundPromotions.State.Failed.INSTANCE);
+            StoreOutboundPromotions storeOutboundPromotions = this.this$0.this$0;
+            List list = this.$validActivePromos;
+            m.checkNotNullExpressionValue(list, "validActivePromos");
+            StoreOutboundPromotions.access$setState$p(storeOutboundPromotions, new StoreOutboundPromotions.State.Loaded(list));
             this.this$0.this$0.markChanged();
         }
     }
@@ -39,13 +45,12 @@ public final class StoreOutboundPromotions$handleConnectionOpen$3 extends o impl
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
-        invoke(error);
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends OutboundPromotion> list) {
+        invoke((List<OutboundPromotion>) list);
         return Unit.a;
     }
 
-    public final void invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
-        StoreOutboundPromotions.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this));
+    public final void invoke(List<OutboundPromotion> list) {
+        StoreOutboundPromotions.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, list));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$4.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$4.java
deleted file mode 100644
index 32e5339a95..0000000000
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions$handleConnectionOpen$4.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.discord.stores;
-
-import com.discord.api.premium.OutboundPromotion;
-import com.discord.stores.StoreOutboundPromotions;
-import d0.z.d.m;
-import d0.z.d.o;
-import java.util.List;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-/* compiled from: StoreOutboundPromotions.kt */
-public final class StoreOutboundPromotions$handleConnectionOpen$4 extends o implements Function1<List<? extends OutboundPromotion>, Unit> {
-    public final /* synthetic */ StoreOutboundPromotions this$0;
-
-    /* compiled from: StoreOutboundPromotions.kt */
-    /* renamed from: com.discord.stores.StoreOutboundPromotions$handleConnectionOpen$4$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function0<Unit> {
-        public final /* synthetic */ List $validActivePromos;
-        public final /* synthetic */ StoreOutboundPromotions$handleConnectionOpen$4 this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(StoreOutboundPromotions$handleConnectionOpen$4 storeOutboundPromotions$handleConnectionOpen$4, List list) {
-            super(0);
-            this.this$0 = storeOutboundPromotions$handleConnectionOpen$4;
-            this.$validActivePromos = list;
-        }
-
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public final void mo1invoke() {
-            StoreOutboundPromotions storeOutboundPromotions = this.this$0.this$0;
-            List list = this.$validActivePromos;
-            m.checkNotNullExpressionValue(list, "validActivePromos");
-            StoreOutboundPromotions.access$setState$p(storeOutboundPromotions, new StoreOutboundPromotions.State.Loaded(list));
-            this.this$0.this$0.markChanged();
-        }
-    }
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public StoreOutboundPromotions$handleConnectionOpen$4(StoreOutboundPromotions storeOutboundPromotions) {
-        super(1);
-        this.this$0 = storeOutboundPromotions;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(List<? extends OutboundPromotion> list) {
-        invoke((List<OutboundPromotion>) list);
-        return Unit.a;
-    }
-
-    public final void invoke(List<OutboundPromotion> list) {
-        StoreOutboundPromotions.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, list));
-    }
-}
diff --git a/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java b/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
index a47d180773..791f21be6e 100644
--- a/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
+++ b/app/src/main/java/com/discord/stores/StoreOutboundPromotions.java
@@ -5,26 +5,20 @@ import c.d.b.a.a;
 import com.discord.api.premium.ClaimedOutboundPromotion;
 import com.discord.api.premium.OutboundPromotion;
 import com.discord.api.user.User;
-import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.domain.ModelPayload;
 import com.discord.models.user.MeUser;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.user.UserUtils;
-import d0.c0.c;
-import d0.d0.f;
 import d0.t.n;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.ranges.LongRange;
 import rx.Observable;
 /* compiled from: StoreOutboundPromotions.kt */
 public final class StoreOutboundPromotions extends StoreV2 {
@@ -37,9 +31,6 @@ public final class StoreOutboundPromotions extends StoreV2 {
     private final RestAPI restAPI;
     private State state;
     private State stateSnapshot;
-    private final List<OutboundPromotion> stubActivePromos;
-    private final List<ClaimedOutboundPromotion> stubClaimedPromos;
-    private final long stubConsumedPromoId;
 
     /* compiled from: StoreOutboundPromotions.kt */
     public static final class Companion {
@@ -153,12 +144,6 @@ public final class StoreOutboundPromotions extends StoreV2 {
         State.Loading loading = State.Loading.INSTANCE;
         this.state = loading;
         this.stateSnapshot = loading;
-        long currentTimeMillis = ClockFactory.get().currentTimeMillis();
-        TimeUnit timeUnit = TimeUnit.DAYS;
-        List<OutboundPromotion> listOf = n.listOf((Object[]) new OutboundPromotion[]{new OutboundPromotion(100, new UtcDateTime(timeUnit.toMillis(5) + currentTimeMillis), "Unclaimed promo 1 title", "This is unclaimed 1", "https://www.google.com", "https://www.google.com/{code}", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis in pharetra nibh."), new OutboundPromotion(101, new UtcDateTime(timeUnit.toMillis(5) + ClockFactory.get().currentTimeMillis()), "Unclaimed promo 2 title", "This is unclaimed 2", "https://www.google.com", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis in pharetra nibh."), new OutboundPromotion(103, new UtcDateTime(timeUnit.toMillis(3) + ClockFactory.get().currentTimeMillis()), "Claimed promo 1 title", "Claimed promo 1 body", "https://www.google.com", "https://www.google.com/{code}", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis in pharetra nibh."), new OutboundPromotion(104, new UtcDateTime(timeUnit.toMillis(3) + ClockFactory.get().currentTimeMillis()), "Claimed promo 2 title", "Claimed promo 2 body", "https://www.google.com", null, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis in pharetra nibh."), new OutboundPromotion(105, new UtcDateTime(timeUnit.toMillis(5) + ClockFactory.get().currentTimeMillis()), "Consumed promo 1 title", "Consumed promo 1 body", "https://www.google.com", "https://www.google.com/{code}", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis in pharetra nibh.")});
-        this.stubActivePromos = listOf;
-        this.stubClaimedPromos = n.listOf((Object[]) new ClaimedOutboundPromotion[]{new ClaimedOutboundPromotion("PROMO CODE HERE", 999, new UtcDateTime(ClockFactory.get().currentTimeMillis() - timeUnit.toMillis(2)), listOf.get(2)), new ClaimedOutboundPromotion("PROMO CODE HERE", 999, new UtcDateTime(ClockFactory.get().currentTimeMillis() - timeUnit.toMillis(1)), listOf.get(3))});
-        this.stubConsumedPromoId = 105;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -170,30 +155,24 @@ public final class StoreOutboundPromotions extends StoreV2 {
         return storeOutboundPromotions.dispatcher;
     }
 
+    public static final /* synthetic */ RestAPI access$getRestAPI$p(StoreOutboundPromotions storeOutboundPromotions) {
+        return storeOutboundPromotions.restAPI;
+    }
+
     public static final /* synthetic */ State access$getState$p(StoreOutboundPromotions storeOutboundPromotions) {
         return storeOutboundPromotions.state;
     }
 
-    public static final /* synthetic */ List access$getStubActivePromos$p(StoreOutboundPromotions storeOutboundPromotions) {
-        return storeOutboundPromotions.stubActivePromos;
-    }
-
-    public static final /* synthetic */ List access$getStubClaimedPromos$p(StoreOutboundPromotions storeOutboundPromotions) {
-        return storeOutboundPromotions.stubClaimedPromos;
-    }
-
-    public static final /* synthetic */ long access$getStubConsumedPromoId$p(StoreOutboundPromotions storeOutboundPromotions) {
-        return storeOutboundPromotions.stubConsumedPromoId;
-    }
-
     public static final /* synthetic */ void access$setState$p(StoreOutboundPromotions storeOutboundPromotions, State state) {
         storeOutboundPromotions.state = state;
     }
 
+    public final Observable<ClaimedOutboundPromotion> claimOutboundPromotion(long j) {
+        return this.restAPI.claimOutboundPromotion(j);
+    }
+
     public final Observable<List<ClaimedOutboundPromotion>> fetchClaimedOutboundPromotions() {
-        Observable<List<ClaimedOutboundPromotion>> r = Observable.D(new StoreOutboundPromotions$fetchClaimedOutboundPromotions$1(this)).r(f.random(new LongRange(0, 2000), c.b), TimeUnit.MILLISECONDS, j0.p.a.a());
-        m.checkNotNullExpressionValue(r, "Observable.fromCallable …Schedulers.computation())");
-        return r;
+        return this.restAPI.getClaimedOutboundPromotions();
     }
 
     public final State getState() {
@@ -210,9 +189,9 @@ public final class StoreOutboundPromotions extends StoreV2 {
             if (userUtils.isPremium(new MeUser(me2))) {
                 this.state = State.Loading.INSTANCE;
                 markChanged();
-                Observable A = Observable.D(new StoreOutboundPromotions$handleConnectionOpen$1(this)).r(f.random(new LongRange(0, 2000), c.b), TimeUnit.MILLISECONDS, j0.p.a.a()).Y(j0.p.a.a()).A(new StoreOutboundPromotions$handleConnectionOpen$2(this));
-                m.checkNotNullExpressionValue(A, "Observable.fromCallable …            }\n          }");
-                ObservableExtensionsKt.appSubscribe$default(A, StoreOutboundPromotions.class, (Context) null, (Function1) null, new StoreOutboundPromotions$handleConnectionOpen$3(this), (Function0) null, (Function0) null, new StoreOutboundPromotions$handleConnectionOpen$4(this), 54, (Object) null);
+                Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getAllActiveOutboundPromotions(), false, 1, null).z(new StoreOutboundPromotions$handleConnectionOpen$1(this));
+                m.checkNotNullExpressionValue(z2, "restAPI\n          .getAl…            }\n          }");
+                ObservableExtensionsKt.appSubscribe$default(z2, StoreOutboundPromotions.class, (Context) null, (Function1) null, new StoreOutboundPromotions$handleConnectionOpen$2(this), (Function0) null, (Function0) null, new StoreOutboundPromotions$handleConnectionOpen$3(this), 54, (Object) null);
                 return;
             }
         }
@@ -221,9 +200,9 @@ public final class StoreOutboundPromotions extends StoreV2 {
     }
 
     public final Observable<State> observeState() {
-        Observable<State> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreOutboundPromotions$observeState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<State> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreOutboundPromotions$observeState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java b/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java
index eead43a983..dfc1d5b7b5 100644
--- a/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java
+++ b/app/src/main/java/com/discord/stores/StorePaymentSources$fetchPaymentSources$1.java
@@ -142,9 +142,9 @@ public final class StorePaymentSources$fetchPaymentSources$1 extends o implement
     public final void mo1invoke() {
         if (!(StorePaymentSources.access$getPaymentSourcesState$p(this.this$0) instanceof StorePaymentSources.PaymentSourcesState.Loading)) {
             StorePaymentSources.access$handlePaymentSourcesFetchStart(this.this$0);
-            Observable G = ObservableExtensionsKt.restSubscribeOn$default(StorePaymentSources.access$getRestAPI$p(this.this$0).getPaymentSources(), false, 1, null).G(new AnonymousClass1(this));
-            m.checkNotNullExpressionValue(G, "restAPI\n          .getPa…efaultPaymentSource(it) }");
-            ObservableExtensionsKt.appSubscribe$default(G, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
+            Observable F = ObservableExtensionsKt.restSubscribeOn$default(StorePaymentSources.access$getRestAPI$p(this.this$0).getPaymentSources(), false, 1, null).F(new AnonymousClass1(this));
+            m.checkNotNullExpressionValue(F, "restAPI\n          .getPa…efaultPaymentSource(it) }");
+            ObservableExtensionsKt.appSubscribe$default(F, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StorePaymentSources.java b/app/src/main/java/com/discord/stores/StorePaymentSources.java
index 9b36b97f2e..bb6e4c6e0c 100644
--- a/app/src/main/java/com/discord/stores/StorePaymentSources.java
+++ b/app/src/main/java/com/discord/stores/StorePaymentSources.java
@@ -217,9 +217,9 @@ public final class StorePaymentSources extends StoreV2 {
     }
 
     public final Observable<PaymentSourcesState> observePaymentSourcesState() {
-        Observable<PaymentSourcesState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePaymentSources$observePaymentSourcesState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<PaymentSourcesState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePaymentSources$observePaymentSourcesState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java b/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java
index 3ed558faf5..effc5214ac 100644
--- a/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java
+++ b/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java
@@ -2,8 +2,8 @@ package com.discord.stores;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
+import com.discord.models.message.Message;
 import com.discord.stores.StorePendingReplies;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -29,7 +29,7 @@ public final class StorePendingReplies$onCreatePendingReply$1 extends o implemen
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        StorePendingReplies.access$getPendingReplies$p(this.this$0).put(Long.valueOf(this.$channel.g()), new StorePendingReplies.PendingReply(new MessageReference(AnimatableValueParser.r1(this.$channel) ? null : Long.valueOf(this.$channel.e()), Long.valueOf(this.$channel.g()), Long.valueOf(this.$message.r())), this.$message, this.$shouldMention, this.$showMentionToggle));
+        StorePendingReplies.access$getPendingReplies$p(this.this$0).put(Long.valueOf(this.$channel.h()), new StorePendingReplies.PendingReply(new MessageReference(AnimatableValueParser.s1(this.$channel) ? null : Long.valueOf(this.$channel.f()), Long.valueOf(this.$channel.h()), Long.valueOf(this.$message.getId())), this.$message, this.$shouldMention, this.$showMentionToggle));
         this.this$0.markChanged();
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StorePendingReplies.java b/app/src/main/java/com/discord/stores/StorePendingReplies.java
index 72eafa7129..829e92fa46 100644
--- a/app/src/main/java/com/discord/stores/StorePendingReplies.java
+++ b/app/src/main/java/com/discord/stores/StorePendingReplies.java
@@ -2,9 +2,9 @@ package com.discord.stores;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.models.domain.ModelMessageDelete;
+import com.discord.models.message.Message;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.utilities.collections.SnowflakePartitionMap;
diff --git a/app/src/main/java/com/discord/stores/StorePermissions.java b/app/src/main/java/com/discord/stores/StorePermissions.java
index b41428ba17..4f90294b02 100644
--- a/app/src/main/java/com/discord/stores/StorePermissions.java
+++ b/app/src/main/java/com/discord/stores/StorePermissions.java
@@ -2,14 +2,14 @@ package com.discord.stores;
 
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.api.stageinstance.StageInstance;
-import com.discord.api.thread.ThreadMember;
+import com.discord.api.thread.AugmentedThreadMember;
 import com.discord.api.thread.ThreadMemberUpdate;
 import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.thread.dto.ModelThreadListSync;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.utilities.permissions.PermissionUtils;
@@ -94,8 +94,8 @@ public final class StorePermissions extends StoreV2 {
         Map<Long, StageInstance> stageInstancesForGuildInternal = this.storeStageInstances.getStageInstancesForGuildInternal(j);
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(iterable, 10)), 16));
         for (Channel channel : iterable) {
-            boolean hasJoinedInternal = this.storeThreadsJoined.hasJoinedInternal(channel.g());
-            Pair pair = d0.o.to(Long.valueOf(channel.g()), Long.valueOf(AnimatableValueParser.r1(channel) ? 137438428927L : PermissionUtils.computePermissions(getMeId(), channel, this.storeChannels.getGuildChannelInternal$app_productionGoogleRelease(channel.e(), channel.q()), guild.getOwnerId(), map != null ? map.get(Long.valueOf(getMeId())) : null, map2, stageInstancesForGuildInternal, hasJoinedInternal)));
+            boolean hasJoinedInternal = this.storeThreadsJoined.hasJoinedInternal(channel.h());
+            Pair pair = d0.o.to(Long.valueOf(channel.h()), Long.valueOf(AnimatableValueParser.s1(channel) ? 137438428927L : PermissionUtils.computePermissions(getMeId(), channel, this.storeChannels.getGuildChannelInternal$app_productionGoogleRelease(channel.f(), channel.r()), guild.getOwnerId(), map != null ? map.get(Long.valueOf(getMeId())) : null, map2, stageInstancesForGuildInternal, hasJoinedInternal)));
             linkedHashMap.put(pair.getFirst(), pair.getSecond());
         }
         return linkedHashMap;
@@ -112,7 +112,7 @@ public final class StorePermissions extends StoreV2 {
         Collection<Channel> values = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().values();
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Object obj : values) {
-            Long valueOf = Long.valueOf(((Channel) obj).e());
+            Long valueOf = Long.valueOf(((Channel) obj).f());
             Object obj2 = linkedHashMap.get(valueOf);
             if (obj2 == null) {
                 obj2 = new ArrayList();
@@ -146,12 +146,12 @@ public final class StorePermissions extends StoreV2 {
     @StoreThread
     private final void updateChannelPermissions(Channel channel) {
         if (getMeId() != 0) {
-            long e = channel.e();
-            Map<Long, Long> map = this.permissionsForChannels.get(Long.valueOf(e));
+            long f = channel.f();
+            Map<Long, Long> map = this.permissionsForChannels.get(Long.valueOf(f));
             if (map == null) {
                 map = h0.emptyMap();
             }
-            this.permissionsForChannels.put(Long.valueOf(e), h0.plus(map, computeChannelPermissions(e, d0.t.m.listOf(channel))));
+            this.permissionsForChannels.put(Long.valueOf(f), h0.plus(map, computeChannelPermissions(f, d0.t.m.listOf(channel))));
             markChanged();
         }
     }
@@ -199,12 +199,12 @@ public final class StorePermissions extends StoreV2 {
     @StoreThread
     public final void handleChannelOrThreadDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        long e = channel.e();
-        Map<Long, Long> map = this.permissionsForChannels.get(Long.valueOf(e));
+        long f = channel.f();
+        Map<Long, Long> map = this.permissionsForChannels.get(Long.valueOf(f));
         if (map == null) {
             map = h0.emptyMap();
         }
-        this.permissionsForChannels.put(Long.valueOf(e), h0.minus(map, Long.valueOf(channel.g())));
+        this.permissionsForChannels.put(Long.valueOf(f), h0.minus(map, Long.valueOf(channel.h())));
         markChanged();
     }
 
@@ -248,13 +248,13 @@ public final class StorePermissions extends StoreV2 {
         if (getMeId() != 0) {
             ArrayList arrayList = new ArrayList();
             for (Message message : list) {
-                Channel J = message.J();
-                if (J != null) {
-                    arrayList.add(J);
+                Channel thread = message.getThread();
+                if (thread != null) {
+                    arrayList.add(thread);
                 }
             }
             Channel channel = (Channel) u.firstOrNull((List<? extends Object>) arrayList);
-            Long valueOf = channel != null ? Long.valueOf(channel.e()) : null;
+            Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
             if (valueOf != null) {
                 updateGuildPermissions(valueOf.longValue(), this.storeChannels.getThreadsForGuildInternal$app_productionGoogleRelease(valueOf.longValue()));
             }
@@ -272,11 +272,11 @@ public final class StorePermissions extends StoreV2 {
             if (hits != null) {
                 ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(hits, 10));
                 for (Message message : hits) {
-                    arrayList.add(message.J());
+                    arrayList.add(message.getThread());
                 }
                 Channel channel = (Channel) u.firstOrNull((List<? extends Object>) arrayList);
                 if (channel != null) {
-                    l = Long.valueOf(channel.e());
+                    l = Long.valueOf(channel.f());
                     if (l == null) {
                         updateGuildPermissions(l.longValue(), this.storeChannels.getThreadsForGuildInternal$app_productionGoogleRelease(l.longValue()));
                         return;
@@ -323,7 +323,7 @@ public final class StorePermissions extends StoreV2 {
         boolean z2;
         m.checkNotNullParameter(threadMembersUpdate, "threadMembersUpdate");
         if (getMeId() != 0 && (guildChannelInternal$app_productionGoogleRelease = this.storeChannels.getGuildChannelInternal$app_productionGoogleRelease(threadMembersUpdate.b(), threadMembersUpdate.c())) != null) {
-            List<ThreadMember> a = threadMembersUpdate.a();
+            List<AugmentedThreadMember> a = threadMembersUpdate.a();
             Boolean bool2 = null;
             if (a != null) {
                 boolean z3 = true;
@@ -333,7 +333,7 @@ public final class StorePermissions extends StoreV2 {
                         if (!it.hasNext()) {
                             break;
                         }
-                        if (((ThreadMember) it.next()).e() == getMeId()) {
+                        if (((AugmentedThreadMember) it.next()).e() == getMeId()) {
                             z2 = true;
                             continue;
                         } else {
@@ -372,15 +372,15 @@ public final class StorePermissions extends StoreV2 {
     }
 
     public final Observable<Map<Long, Long>> observeChannelPermissionsForGuild(long j) {
-        Observable<Map<Long, Long>> s2 = observeAllPermissions().G(new StorePermissions$observeChannelPermissionsForGuild$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeAllPermissions()\n…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Long>> r = observeAllPermissions().F(new StorePermissions$observeChannelPermissionsForGuild$1(j)).r();
+        m.checkNotNullExpressionValue(r, "observeAllPermissions()\n…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Long>> observePermissionsForAllChannels() {
-        Observable<Map<Long, Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePermissions$observePermissionsForAllChannels$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePermissions$observePermissionsForAllChannels$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Long> observePermissionsForChannel(long j) {
@@ -388,9 +388,9 @@ public final class StorePermissions extends StoreV2 {
     }
 
     public final Observable<Long> observePermissionsForGuild(long j) {
-        Observable<Long> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePermissions$observePermissionsForGuild$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Long> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePermissions$observePermissionsForGuild$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java
index a366f707f9..17266ea967 100644
--- a/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java
+++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java
@@ -1,55 +1,30 @@
 package com.discord.stores;
 
 import com.discord.api.message.Message;
+import d0.t.o;
 import d0.z.d.m;
-import d0.z.d.o;
+import j0.k.b;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
 /* compiled from: StorePinnedMessages.kt */
-public final class StorePinnedMessages$loadPinnedMessages$1 extends o implements Function1<List<? extends Message>, Unit> {
-    public final /* synthetic */ long $channelId;
-    public final /* synthetic */ StorePinnedMessages this$0;
-
-    /* compiled from: StorePinnedMessages.kt */
-    /* renamed from: com.discord.stores.StorePinnedMessages$loadPinnedMessages$1$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function0<Unit> {
-        public final /* synthetic */ List $it;
-        public final /* synthetic */ StorePinnedMessages$loadPinnedMessages$1 this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(StorePinnedMessages$loadPinnedMessages$1 storePinnedMessages$loadPinnedMessages$1, List list) {
-            super(0);
-            this.this$0 = storePinnedMessages$loadPinnedMessages$1;
-            this.$it = list;
-        }
-
-        @Override // kotlin.jvm.functions.Function0
-        /* renamed from: invoke */
-        public final void mo1invoke() {
-            StorePinnedMessages$loadPinnedMessages$1 storePinnedMessages$loadPinnedMessages$1 = this.this$0;
-            StorePinnedMessages.access$handlePinnedMessagesLoaded(storePinnedMessages$loadPinnedMessages$1.this$0, storePinnedMessages$loadPinnedMessages$1.$channelId, this.$it);
-        }
-    }
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public StorePinnedMessages$loadPinnedMessages$1(StorePinnedMessages storePinnedMessages, long j) {
-        super(1);
-        this.this$0 = storePinnedMessages;
-        this.$channelId = j;
-    }
+public final class StorePinnedMessages$loadPinnedMessages$1<T, R> implements b<List<? extends Message>, List<? extends com.discord.models.message.Message>> {
+    public static final StorePinnedMessages$loadPinnedMessages$1 INSTANCE = new StorePinnedMessages$loadPinnedMessages$1();
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Message> list) {
-        invoke((List<Message>) list);
-        return Unit.a;
+    @Override // j0.k.b
+    public /* bridge */ /* synthetic */ List<? extends com.discord.models.message.Message> call(List<? extends Message> list) {
+        return call((List<Message>) list);
     }
 
-    public final void invoke(List<Message> list) {
-        m.checkNotNullParameter(list, "it");
-        this.this$0.getDispatcher().schedule(new AnonymousClass1(this, list));
+    public final List<com.discord.models.message.Message> call(List<Message> list) {
+        m.checkNotNullExpressionValue(list, "messages");
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
+        Iterator<T> it = list.iterator();
+        while (it.hasNext()) {
+            arrayList.add(new com.discord.models.message.Message(it.next()));
+        }
+        return arrayList;
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$2.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$2.java
new file mode 100644
index 0000000000..0a1943fcec
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$2.java
@@ -0,0 +1,58 @@
+package com.discord.stores;
+
+import com.discord.models.message.Message;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+/* compiled from: StorePinnedMessages.kt */
+public final class StorePinnedMessages$loadPinnedMessages$2 extends o implements Function1<List<? extends Message>, Unit> {
+    public final /* synthetic */ long $channelId;
+    public final /* synthetic */ StorePinnedMessages this$0;
+
+    /* compiled from: StorePinnedMessages.kt */
+    /* renamed from: com.discord.stores.StorePinnedMessages$loadPinnedMessages$2$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends o implements Function0<Unit> {
+        public final /* synthetic */ List $it;
+        public final /* synthetic */ StorePinnedMessages$loadPinnedMessages$2 this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(StorePinnedMessages$loadPinnedMessages$2 storePinnedMessages$loadPinnedMessages$2, List list) {
+            super(0);
+            this.this$0 = storePinnedMessages$loadPinnedMessages$2;
+            this.$it = list;
+        }
+
+        @Override // kotlin.jvm.functions.Function0
+        /* renamed from: invoke */
+        public final void mo1invoke() {
+            StorePinnedMessages$loadPinnedMessages$2 storePinnedMessages$loadPinnedMessages$2 = this.this$0;
+            StorePinnedMessages storePinnedMessages = storePinnedMessages$loadPinnedMessages$2.this$0;
+            long j = storePinnedMessages$loadPinnedMessages$2.$channelId;
+            List list = this.$it;
+            m.checkNotNullExpressionValue(list, "it");
+            StorePinnedMessages.access$handlePinnedMessagesLoaded(storePinnedMessages, j, list);
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StorePinnedMessages$loadPinnedMessages$2(StorePinnedMessages storePinnedMessages, long j) {
+        super(1);
+        this.this$0 = storePinnedMessages;
+        this.$channelId = j;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Message> list) {
+        invoke((List<Message>) list);
+        return Unit.a;
+    }
+
+    public final void invoke(List<Message> list) {
+        this.this$0.getDispatcher().schedule(new AnonymousClass1(this, list));
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java
index 6c7223d3f6..c588c566a2 100644
--- a/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java
+++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.t.n;
 import d0.z.d.o;
 import java.util.List;
@@ -17,7 +17,7 @@ public final class StorePinnedMessages$observeForChannel$1 extends o implements
         this.$channelId = j;
     }
 
-    /* Return type fixed from 'java.util.List<com.discord.api.message.Message>' to match base method */
+    /* Return type fixed from 'java.util.List<com.discord.models.message.Message>' to match base method */
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final List<? extends Message> mo1invoke() {
diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java
index 458bcdf0f4..5e6a779a15 100644
--- a/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java
+++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java
@@ -1,6 +1,6 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StorePinnedMessages;
 import d0.t.n;
 import d0.z.d.o;
diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages.java b/app/src/main/java/com/discord/stores/StorePinnedMessages.java
index baa8689798..fc79ff7c33 100644
--- a/app/src/main/java/com/discord/stores/StorePinnedMessages.java
+++ b/app/src/main/java/com/discord/stores/StorePinnedMessages.java
@@ -1,10 +1,9 @@
 package com.discord.stores;
 
 import android.content.Context;
-import com.discord.api.message.Message;
 import com.discord.api.utcdatetime.UtcDateTime;
+import com.discord.models.message.Message;
 import com.discord.stores.updates.ObservationDeck;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.t.n;
@@ -60,7 +59,7 @@ public final class StorePinnedMessages extends StoreV2 {
                     break;
                 }
                 Object next = it.next();
-                if (((Message) next).r() == j) {
+                if (((Message) next).getId() == j) {
                     z2 = true;
                     continue;
                 } else {
@@ -78,7 +77,7 @@ public final class StorePinnedMessages extends StoreV2 {
         private final int getMessageIndex(List<Message> list, long j) {
             int i = 0;
             for (Message message : list) {
-                if (message.r() == j) {
+                if (message.getId() == j) {
                     return i;
                 }
                 i++;
@@ -111,7 +110,9 @@ public final class StorePinnedMessages extends StoreV2 {
 
     private final void loadPinnedMessages(long j) {
         if (!this.pinnedMessagesSnapshot.containsKey(Long.valueOf(j))) {
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getChannelPins(j), false, 1, null), StorePinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StorePinnedMessages$loadPinnedMessages$1(this, j), 62, (Object) null);
+            Observable F = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getChannelPins(j), false, 1, null).F(StorePinnedMessages$loadPinnedMessages$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "api\n        .getChannelP…messages.map(::Message) }");
+            ObservableExtensionsKt.appSubscribe$default(F, StorePinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StorePinnedMessages$loadPinnedMessages$2(this, j), 62, (Object) null);
         }
     }
 
@@ -130,7 +131,7 @@ public final class StorePinnedMessages extends StoreV2 {
         if (list != null) {
             Iterator<Message> it = list.iterator();
             while (it.hasNext()) {
-                if (collection.contains(Long.valueOf(it.next().r()))) {
+                if (collection.contains(Long.valueOf(it.next().getId()))) {
                     it.remove();
                     this.updatedChannelIds.add(Long.valueOf(j));
                 }
@@ -142,36 +143,36 @@ public final class StorePinnedMessages extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleMessageUpdate(Message message) {
-        UtcDateTime K;
+    public final void handleMessageUpdate(com.discord.api.message.Message message) {
+        UtcDateTime timestamp;
         m.checkNotNullParameter(message, "updatedMessage");
-        long i = message.i();
-        long r = message.r();
-        boolean areEqual = m.areEqual(message.D(), Boolean.TRUE);
-        List<Message> list = this.pinnedMessages.get(Long.valueOf(i));
+        long g = message.g();
+        long o = message.o();
+        boolean areEqual = m.areEqual(message.w(), Boolean.TRUE);
+        List<Message> list = this.pinnedMessages.get(Long.valueOf(g));
         if (list != null) {
-            int access$getMessageIndex = Companion.access$getMessageIndex(Companion, list, r);
+            int access$getMessageIndex = Companion.access$getMessageIndex(Companion, list, o);
             if (access$getMessageIndex != -1) {
                 if (!areEqual) {
                     list.remove(access$getMessageIndex);
                 } else {
-                    list.set(access$getMessageIndex, MessageUtils.merge(list.get(access$getMessageIndex), message));
+                    list.set(access$getMessageIndex, list.get(access$getMessageIndex).merge(message));
                 }
-                this.updatedChannelIds.add(Long.valueOf(i));
+                this.updatedChannelIds.add(Long.valueOf(g));
                 markChanged();
             } else if (areEqual) {
-                UtcDateTime K2 = message.K();
+                UtcDateTime C = message.C();
                 long j = 0;
-                long f = K2 != null ? K2.f() : 0;
-                int i2 = 0;
-                if (list.size() > 0 && (K = list.get(0).K()) != null) {
-                    j = K.f();
+                long f = C != null ? C.f() : 0;
+                int i = 0;
+                if (list.size() > 0 && (timestamp = list.get(0).getTimestamp()) != null) {
+                    j = timestamp.f();
                 }
-                while (i2 < list.size() && f < j) {
-                    i2++;
+                while (i < list.size() && f < j) {
+                    i++;
                 }
-                list.add(i2, message);
-                this.updatedChannelIds.add(Long.valueOf(i));
+                list.add(i, new Message(message));
+                this.updatedChannelIds.add(Long.valueOf(g));
                 markChanged();
             }
         }
@@ -183,9 +184,9 @@ public final class StorePinnedMessages extends StoreV2 {
     }
 
     public final Observable<Message> observePinnedMessage(long j, long j2) {
-        Observable<Message> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePinnedMessages$observePinnedMessage$1(this, j, j2), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Message> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePinnedMessages$observePinnedMessage$1(this, j, j2), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java
index 5c6975263f..515c9a653d 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$1.java
@@ -82,6 +82,6 @@ public final class StoreReadStates$computeUnreadMarker$1 extends o implements Fu
 
     public final Observable<Unread.Marker> invoke(long j) {
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(companion.getMessageAck().observeAll().G(new AnonymousClass1(j)).a0(1), companion.getMessageAck().observeAll().G(new AnonymousClass2(j)), companion.getMessagesMostRecent().observeRecentMessageIds(j).a0(1), new AnonymousClass3(j));
+        return Observable.i(companion.getMessageAck().observeAll().F(new AnonymousClass1(j)).Z(1), companion.getMessageAck().observeAll().F(new AnonymousClass2(j)), companion.getMessagesMostRecent().observeRecentMessageIds(j).Z(1), new AnonymousClass3(j));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java
index c1ebb01a41..ca9480f2b0 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java
@@ -1,7 +1,7 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
 import com.discord.models.application.Unread;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import j0.k.a;
 import j0.k.b;
@@ -67,9 +67,9 @@ public final class StoreReadStates$computeUnreadMarker$4<T, R> implements b<Unre
 
     public final Observable<? extends Unread> call(Unread.Marker marker) {
         m.checkNotNullParameter(marker, "marker");
-        Observable<R> b02 = StoreStream.Companion.getMessages().observeMessagesForChannel(marker.getChannelId()).G(new AnonymousClass1(marker)).b0(StoreReadStates.access$getMarkAsRead$p(this.this$0).y(AnonymousClass2.INSTANCE));
+        Observable<R> a02 = StoreStream.Companion.getMessages().observeMessagesForChannel(marker.getChannelId()).F(new AnonymousClass1(marker)).a0(StoreReadStates.access$getMarkAsRead$p(this.this$0).x(AnonymousClass2.INSTANCE));
         AnonymousClass3 r0 = new AnonymousClass3(this);
         a.C0318a aVar = a.a;
-        return Observable.i0(new k(b02, new j0.l.e.a(aVar, aVar, r0)));
+        return Observable.h0(new k(a02, new j0.l.e.a(aVar, aVar, r0)));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreReadStates.java b/app/src/main/java/com/discord/stores/StoreReadStates.java
index 85130e7f07..37c2b5148d 100644
--- a/app/src/main/java/com/discord/stores/StoreReadStates.java
+++ b/app/src/main/java/com/discord/stores/StoreReadStates.java
@@ -31,9 +31,9 @@ import rx.subjects.SerializedSubject;
 /* compiled from: StoreReadStates.kt */
 public final class StoreReadStates extends Store {
     private final Clock clock;
-    private final SerializedSubject<Boolean, Boolean> markAsRead = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE));
-    private final SerializedSubject<Set<Long>, Set<Long>> unreadChannelIds = new SerializedSubject<>(BehaviorSubject.m0(new HashSet()));
-    private final SerializedSubject<Set<Long>, Set<Long>> unreadGuildIds = new SerializedSubject<>(BehaviorSubject.m0(new HashSet()));
+    private final SerializedSubject<Boolean, Boolean> markAsRead = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
+    private final SerializedSubject<Set<Long>, Set<Long>> unreadChannelIds = new SerializedSubject<>(BehaviorSubject.l0(new HashSet()));
+    private final SerializedSubject<Set<Long>, Set<Long>> unreadGuildIds = new SerializedSubject<>(BehaviorSubject.l0(new HashSet()));
     private final Persister<Unread> unreadMessageMarker = new Persister<>("UNREAD_MESSAGE_MARKER_V3", new Unread(null, 0, 3, null));
 
     public StoreReadStates(Clock clock) {
@@ -66,9 +66,9 @@ public final class StoreReadStates extends Store {
     }
 
     private final void clearMarker() {
-        Observable a02 = this.unreadMessageMarker.getObservable().G(StoreReadStates$clearMarker$1.INSTANCE).a0(1);
-        m.checkNotNullExpressionValue(a02, "unreadMessageMarker\n    …ount() }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$clearMarker$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable Z = this.unreadMessageMarker.getObservable().F(StoreReadStates$clearMarker$1.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "unreadMessageMarker\n    …ount() }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$clearMarker$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final void computeUnreadChannelIds() {
@@ -82,9 +82,9 @@ public final class StoreReadStates extends Store {
         TimeUnit timeUnit = TimeUnit.SECONDS;
         Observable combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(observePermissionsForAllChannels, observeGuildAndPrivateChannels, observeJoinedAt, observeGuildSettings, observeAll, ObservableExtensionsKt.leadingEdgeThrottle(observeRecentMessageIds, 3, timeUnit), companion.getThreadsActiveJoined().observeAllActiveJoinedThreadsById(), new StoreReadStates$sam$rx_functions_Func7$0(new StoreReadStates$computeUnreadChannelIds$1(this)), 1, timeUnit);
         m.checkNotNullExpressionValue(combineLatest, "ObservableWithLeadingEdg…imeUnit.SECONDS\n        )");
-        Observable s2 = ObservableExtensionsKt.computationLatest(combineLatest).s();
-        m.checkNotNullExpressionValue(s2, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, (Context) null, "computeUnreadChannelIds", (Function1) null, new StoreReadStates$computeUnreadChannelIds$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable r = ObservableExtensionsKt.computationLatest(combineLatest).r();
+        m.checkNotNullExpressionValue(r, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, (Context) null, "computeUnreadChannelIds", (Function1) null, new StoreReadStates$computeUnreadChannelIds$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final Pair<Set<Long>, Set<Long>> computeUnreadIds(Map<Long, Long> map, Map<Long, Channel> map2, Map<Long, Long> map3, Map<Long, ? extends ModelNotificationSettings> map4, Map<Long, StoreMessageAck.Ack> map5, Map<Long, Long> map6, Map<Long, StoreThreadsActiveJoined.ActiveJoinedThread> map7) {
@@ -100,10 +100,10 @@ public final class StoreReadStates extends Store {
                 StoreThreadsActiveJoined.ActiveJoinedThread activeJoinedThread2 = map7.get(Long.valueOf(longValue));
                 channel = activeJoinedThread2 != null ? activeJoinedThread2.getChannel() : null;
             }
-            if (channel != null && !AnimatableValueParser.r1(channel) && (!AnimatableValueParser.y1(channel) || activeJoinedThread != null)) {
+            if (channel != null && !AnimatableValueParser.s1(channel) && (!AnimatableValueParser.z1(channel) || activeJoinedThread != null)) {
                 if (PermissionUtils.INSTANCE.hasAccess(channel, map.get(Long.valueOf(longValue))) && !isChannelMuted(channel, map4)) {
                     StoreMessageAck.Ack ack = map5.get(Long.valueOf(longValue));
-                    if (ack != null || !AnimatableValueParser.y1(channel)) {
+                    if (ack != null || !AnimatableValueParser.z1(channel)) {
                         if (ack != null) {
                             j = ack.getMessageId();
                         } else {
@@ -112,13 +112,13 @@ public final class StoreReadStates extends Store {
                         }
                         if (MessageUtils.isNewer(Long.valueOf(j), Long.valueOf(longValue2))) {
                             hashSet.add(Long.valueOf(longValue));
-                            Channel channel2 = map2.get(Long.valueOf(channel.q()));
+                            Channel channel2 = map2.get(Long.valueOf(channel.r()));
                             boolean isChannelMuted = isChannelMuted(channel2, map4);
-                            if (!isChannelMuted && AnimatableValueParser.y1(channel) && channel2 != null) {
-                                isChannelMuted = isChannelMuted(map2.get(Long.valueOf(channel2.q())), map4);
+                            if (!isChannelMuted && AnimatableValueParser.z1(channel) && channel2 != null) {
+                                isChannelMuted = isChannelMuted(map2.get(Long.valueOf(channel2.r())), map4);
                             }
                             if (!isChannelMuted) {
-                                hashSet2.add(Long.valueOf(channel.e()));
+                                hashSet2.add(Long.valueOf(channel.f()));
                             }
                         }
                     }
@@ -140,25 +140,25 @@ public final class StoreReadStates extends Store {
         m.checkNotNullParameter(storeReadStates$computeUnreadMarker$2, "observableCondition");
         m.checkNotNullParameter(d0Var, "switchedObservableFunc");
         m.checkNotNullParameter(storeReadStates$computeUnreadMarker$3, "defaultObservableFunc");
-        Observable Z = observeId.k(new c0(storeReadStates$computeUnreadMarker$2, d0Var, storeReadStates$computeUnreadMarker$3)).Z(new StoreReadStates$computeUnreadMarker$4(this));
-        m.checkNotNullExpressionValue(Z, "getChannelsSelected()\n  …clearMarker() }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(Z, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$computeUnreadMarker$5(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable Y = observeId.k(new c0(storeReadStates$computeUnreadMarker$2, d0Var, storeReadStates$computeUnreadMarker$3)).Y(new StoreReadStates$computeUnreadMarker$4(this));
+        m.checkNotNullExpressionValue(Y, "getChannelsSelected()\n  …clearMarker() }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(Y, (Context) null, "unreadMessageMarker", (Function1) null, new StoreReadStates$computeUnreadMarker$5(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final boolean isChannelMuted(Channel channel, Map<Long, ? extends ModelNotificationSettings> map) {
         if (channel == null) {
             return false;
         }
-        long g = channel.g();
+        long h = channel.h();
         ModelNotificationSettings modelNotificationSettings = (ModelNotificationSettings) a.c(channel, map);
-        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings != null ? modelNotificationSettings.getChannelOverride(g) : null;
+        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings != null ? modelNotificationSettings.getChannelOverride(h) : null;
         return channelOverride != null && channelOverride.isMuted();
     }
 
     public final Observable<Boolean> getIsUnread(long j) {
-        Observable<Boolean> s2 = getUnreadGuildIds().G(new StoreReadStates$getIsUnread$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "getUnreadGuildIds()\n    …  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = getUnreadGuildIds().F(new StoreReadStates$getIsUnread$1(j)).r();
+        m.checkNotNullExpressionValue(r, "getUnreadGuildIds()\n    …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Set<Long>> getUnreadChannelIds() {
@@ -170,15 +170,15 @@ public final class StoreReadStates extends Store {
     }
 
     public final Observable<Unread> getUnreadMarker(long j) {
-        Observable<Unread> s2 = getUnreadMarkerForSelectedChannel().y(new StoreReadStates$getUnreadMarker$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "unreadMarkerForSelectedC…  .distinctUntilChanged()");
-        return s2;
+        Observable<Unread> r = getUnreadMarkerForSelectedChannel().x(new StoreReadStates$getUnreadMarker$1(j)).r();
+        m.checkNotNullExpressionValue(r, "unreadMarkerForSelectedC…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Unread> getUnreadMarkerForSelectedChannel() {
-        Observable<Unread> s2 = ObservableExtensionsKt.computationLatest(this.unreadMessageMarker.getObservable()).s();
-        m.checkNotNullExpressionValue(s2, "unreadMessageMarker\n    …  .distinctUntilChanged()");
-        return s2;
+        Observable<Unread> r = ObservableExtensionsKt.computationLatest(this.unreadMessageMarker.getObservable()).r();
+        m.checkNotNullExpressionValue(r, "unreadMessageMarker\n    …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.Store
diff --git a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java
index d6c58b5a63..be37d7c008 100644
--- a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java
+++ b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java
@@ -242,15 +242,15 @@ public final class StoreRequestedStageChannels extends StoreV2 {
     }
 
     public final Observable<StageInstanceState> observeRequestedStageChannel(long j) {
-        Observable<R> G = observeRequestedStageChannels().G(new StoreRequestedStageChannels$observeRequestedStageChannel$1(j));
-        m.checkNotNullExpressionValue(G, "observeRequestedStageCha…s().map { it[channelId] }");
-        return G;
+        Observable<R> F = observeRequestedStageChannels().F(new StoreRequestedStageChannels$observeRequestedStageChannel$1(j));
+        m.checkNotNullExpressionValue(F, "observeRequestedStageCha…s().map { it[channelId] }");
+        return F;
     }
 
     public final Observable<Map<Long, StageInstanceState>> observeRequestedStageChannels() {
-        Observable<Map<Long, StageInstanceState>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreRequestedStageChannels$observeRequestedStageChannels$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, StageInstanceState>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreRequestedStageChannels$observeRequestedStageChannels$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreRtcConnection.java b/app/src/main/java/com/discord/stores/StoreRtcConnection.java
index 85c729b6de..dca8c55103 100644
--- a/app/src/main/java/com/discord/stores/StoreRtcConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreRtcConnection.java
@@ -196,26 +196,26 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         this.storeVoiceStates = storeVoiceStates;
         this.logger = logger;
         this.dpc = debugPrintableCollection;
-        PublishSubject<SpeakingUserUpdate> l0 = PublishSubject.l0();
-        this.speakingUsersSubject = l0;
-        BehaviorSubject<RtcConnection.Quality> m0 = BehaviorSubject.m0(RtcConnection.Quality.UNKNOWN);
-        this.qualitySubject = m0;
+        PublishSubject<SpeakingUserUpdate> k0 = PublishSubject.k0();
+        this.speakingUsersSubject = k0;
+        BehaviorSubject<RtcConnection.Quality> l0 = BehaviorSubject.l0(RtcConnection.Quality.UNKNOWN);
+        this.qualitySubject = l0;
         this.currentVoiceState = new OutgoingPayload.VoiceStateUpdate(null, null, false, false, false, null, 32, null);
-        SerializedSubject<RtcConnection.StateChange, RtcConnection.StateChange> serializedSubject = new SerializedSubject<>(BehaviorSubject.m0(new RtcConnection.StateChange(new RtcConnection.State.d(false), null)));
+        SerializedSubject<RtcConnection.StateChange, RtcConnection.StateChange> serializedSubject = new SerializedSubject<>(BehaviorSubject.l0(new RtcConnection.StateChange(new RtcConnection.State.d(false), null)));
         this.connectionStateSubject = serializedSubject;
-        this.rtcConnectionMetadataSubject = BehaviorSubject.m0(null);
-        Observable<RtcConnection.StateChange> s2 = ObservableExtensionsKt.computationLatest(serializedSubject).s();
-        m.checkNotNullExpressionValue(s2, "connectionStateSubject\n …  .distinctUntilChanged()");
-        this.connectionState = s2;
-        m.checkNotNullExpressionValue(m0, "qualitySubject");
-        Observable<RtcConnection.Quality> s3 = ObservableExtensionsKt.computationLatest(m0).s();
-        m.checkNotNullExpressionValue(s3, "qualitySubject\n         …  .distinctUntilChanged()");
-        this.quality = s3;
-        Observable<List<SpeakingUserUpdate>> a = l0.a(300, TimeUnit.MILLISECONDS);
+        this.rtcConnectionMetadataSubject = BehaviorSubject.l0(null);
+        Observable<RtcConnection.StateChange> r = ObservableExtensionsKt.computationLatest(serializedSubject).r();
+        m.checkNotNullExpressionValue(r, "connectionStateSubject\n …  .distinctUntilChanged()");
+        this.connectionState = r;
+        m.checkNotNullExpressionValue(l0, "qualitySubject");
+        Observable<RtcConnection.Quality> r2 = ObservableExtensionsKt.computationLatest(l0).r();
+        m.checkNotNullExpressionValue(r2, "qualitySubject\n         …  .distinctUntilChanged()");
+        this.quality = r2;
+        Observable<List<SpeakingUserUpdate>> a = k0.a(300, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(a, "speakingUsersSubject\n   …S, TimeUnit.MILLISECONDS)");
-        Observable<List<SpeakingUserUpdate>> s4 = ObservableExtensionsKt.computationLatest(a).s();
-        m.checkNotNullExpressionValue(s4, "speakingUsersSubject\n   …  .distinctUntilChanged()");
-        this.speakingUpdates = s4;
+        Observable<List<SpeakingUserUpdate>> r3 = ObservableExtensionsKt.computationLatest(a).r();
+        m.checkNotNullExpressionValue(r3, "speakingUsersSubject\n   …  .distinctUntilChanged()");
+        this.speakingUpdates = r3;
         StringBuilder L = a.L("StoreRtcConnection ");
         int i = instanceCounter + 1;
         instanceCounter = i;
@@ -291,8 +291,8 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             long longValue2 = entry2.getKey().longValue();
             boolean booleanValue = entry2.getValue().booleanValue();
             if (l == null || longValue2 == l.longValue()) {
-                rtcConnection.M.put(Long.valueOf(longValue2), Boolean.valueOf(booleanValue));
-                MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+                rtcConnection.V.put(Long.valueOf(longValue2), Boolean.valueOf(booleanValue));
+                MediaEngineConnection mediaEngineConnection = rtcConnection.w;
                 if (mediaEngineConnection != null) {
                     mediaEngineConnection.w(longValue2, booleanValue);
                 }
@@ -302,7 +302,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             long longValue3 = entry3.getKey().longValue();
             boolean booleanValue2 = entry3.getValue().booleanValue();
             if (l == null || longValue3 == l.longValue()) {
-                MediaEngineConnection mediaEngineConnection2 = rtcConnection.n;
+                MediaEngineConnection mediaEngineConnection2 = rtcConnection.w;
                 if (mediaEngineConnection2 == null) {
                     Log.e("RtcConnection", "MediaEngine not connected for setLocalVideoOffscreen.");
                 } else {
@@ -325,10 +325,10 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         RtcConnection rtcConnection = this.rtcConnection;
         VoiceServer voiceServer = this.voiceServer;
         if (rtcConnection != null && voiceServer != null) {
-            if (voiceServer.c() == null || !(!m.areEqual(voiceServer.c(), rtcConnection.C))) {
+            if (voiceServer.c() == null || !(!m.areEqual(voiceServer.c(), rtcConnection.L))) {
                 if (voiceServer.a() != null) {
                     Long a = voiceServer.a();
-                    long j = rtcConnection.D;
+                    long j = rtcConnection.M;
                     if (a == null || a.longValue() != j) {
                         return;
                     }
@@ -358,18 +358,18 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         long j = 0;
         String str2 = null;
         if (channel != null) {
-            Long valueOf = Long.valueOf(channel.e());
+            Long valueOf = Long.valueOf(channel.f());
             if (valueOf.longValue() > 0) {
                 l = valueOf;
                 Channel channel2 = this.selectedVoiceChannel;
-                Long valueOf2 = channel2 == null ? Long.valueOf(channel2.g()) : null;
+                Long valueOf2 = channel2 == null ? Long.valueOf(channel2.h()) : null;
                 MediaEngine mediaEngine = StoreStream.Companion.getMediaEngine().getMediaEngine();
                 if (str != null && valueOf2 != null) {
                     RtcConnection rtcConnection = this.rtcConnection;
-                    if (m.areEqual(rtcConnection != null ? Long.valueOf(rtcConnection.D) : null, valueOf2)) {
+                    if (m.areEqual(rtcConnection != null ? Long.valueOf(rtcConnection.M) : null, valueOf2)) {
                         RtcConnection rtcConnection2 = this.rtcConnection;
                         if (rtcConnection2 != null) {
-                            str2 = rtcConnection2.E;
+                            str2 = rtcConnection2.N;
                         }
                         if (m.areEqual(str2, str)) {
                             return;
@@ -425,7 +425,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
     private final void handleMediaSessionIdReceived() {
         AppLog appLog = AppLog.g;
         RtcConnection rtcConnection = this.rtcConnection;
-        String str = rtcConnection != null ? rtcConnection.f2077y : null;
+        String str = rtcConnection != null ? rtcConnection.H : null;
         Objects.requireNonNull(appLog);
         FirebaseCrashlytics instance = FirebaseCrashlytics.getInstance();
         if (str == null) {
@@ -460,8 +460,8 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             boolean booleanValue = entry.getValue().booleanValue();
             RtcConnection rtcConnection = this.rtcConnection;
             if (rtcConnection != null) {
-                rtcConnection.M.put(Long.valueOf(longValue), Boolean.valueOf(booleanValue));
-                MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+                rtcConnection.V.put(Long.valueOf(longValue), Boolean.valueOf(booleanValue));
+                MediaEngineConnection mediaEngineConnection = rtcConnection.w;
                 if (mediaEngineConnection != null) {
                     mediaEngineConnection.w(longValue, booleanValue);
                 }
@@ -476,7 +476,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             boolean booleanValue = entry.getValue().booleanValue();
             RtcConnection rtcConnection = this.rtcConnection;
             if (rtcConnection != null) {
-                MediaEngineConnection mediaEngineConnection = rtcConnection.n;
+                MediaEngineConnection mediaEngineConnection = rtcConnection.w;
                 if (mediaEngineConnection == null) {
                     Log.e("RtcConnection", "MediaEngine not connected for setLocalVideoOffscreen.");
                 } else {
@@ -503,8 +503,8 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         String str;
         long id2 = this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId();
         RtcConnection rtcConnection = this.rtcConnection;
-        if (rtcConnection != null && (str = rtcConnection.d) != null) {
-            StageInstance stageInstanceForChannel = this.stream.getStageInstances$app_productionGoogleRelease().getStageInstanceForChannel(channel.g());
+        if (rtcConnection != null && (str = rtcConnection.l) != null) {
+            StageInstance stageInstanceForChannel = this.stream.getStageInstances$app_productionGoogleRelease().getStageInstanceForChannel(channel.h());
             Long valueOf = stageInstanceForChannel != null ? Long.valueOf(stageInstanceForChannel.c()) : null;
             AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
             Map<Long, VoiceState> map = (Map) a.c(channel, this.stream.getVoiceStates$app_productionGoogleRelease().get());
@@ -526,10 +526,10 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         String str;
         long id2 = this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId();
         RtcConnection rtcConnection = this.rtcConnection;
-        if (rtcConnection != null && (str = rtcConnection.d) != null) {
+        if (rtcConnection != null && (str = rtcConnection.l) != null) {
             Long l = null;
-            String str2 = rtcConnection != null ? rtcConnection.f2077y : null;
-            StageInstance stageInstanceForChannel = this.stream.getStageInstances$app_productionGoogleRelease().getStageInstanceForChannel(channel.g());
+            String str2 = rtcConnection != null ? rtcConnection.H : null;
+            StageInstance stageInstanceForChannel = this.stream.getStageInstances$app_productionGoogleRelease().getStageInstanceForChannel(channel.h());
             Long valueOf = stageInstanceForChannel != null ? Long.valueOf(stageInstanceForChannel.c()) : null;
             LinkedHashMap linkedHashMap = new LinkedHashMap();
             VoicePropsTracker voicePropsTracker = this.voicePropsTracker;
@@ -631,7 +631,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
     public final long getConnectedGuildId() {
         Long l;
         RtcConnection rtcConnection = this.rtcConnection;
-        if (rtcConnection == null || (l = rtcConnection.C) == null) {
+        if (rtcConnection == null || (l = rtcConnection.L) == null) {
             return 0;
         }
         return l.longValue();
@@ -667,7 +667,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             String sessionId = modelPayload.getSessionId();
             m.checkNotNullExpressionValue(sessionId, "payload.sessionId");
             m.checkNotNullParameter(sessionId, "<set-?>");
-            rtcConnection.E = sessionId;
+            rtcConnection.N = sessionId;
         }
     }
 
@@ -675,7 +675,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
     public final void handleConnectionReady(boolean z2) {
         if (z2) {
             Channel channel = this.selectedVoiceChannel;
-            handleVoiceChannelSelected(Long.valueOf(channel != null ? channel.g() : 0));
+            handleVoiceChannelSelected(Long.valueOf(channel != null ? channel.h() : 0));
         }
     }
 
@@ -687,7 +687,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
     public final void handleVoiceChannelSelected(Long l) {
         Long l2;
         Channel channel = this.selectedVoiceChannel;
-        if (!m.areEqual(l, channel != null ? Long.valueOf(channel.g()) : null)) {
+        if (!m.areEqual(l, channel != null ? Long.valueOf(channel.h()) : null)) {
             Channel channel2 = this.selectedVoiceChannel;
             if (channel2 != null) {
                 logChannelLeave(channel2);
@@ -698,17 +698,17 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             sb.append(l);
             sb.append(" != ");
             Channel channel3 = this.selectedVoiceChannel;
-            sb.append(channel3 != null ? Long.valueOf(channel3.g()) : null);
+            sb.append(channel3 != null ? Long.valueOf(channel3.h()) : null);
             destroyRtcConnection(sb.toString());
         }
         Channel findChannelByIdInternal$app_productionGoogleRelease = l != null ? this.stream.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(l.longValue()) : null;
         this.selectedVoiceChannel = findChannelByIdInternal$app_productionGoogleRelease;
         OutgoingPayload.VoiceStateUpdate voiceStateUpdate = this.currentVoiceState;
         if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-            Long valueOf = Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.e());
+            Long valueOf = Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.f());
             if (valueOf.longValue() > 0) {
                 l2 = valueOf;
-                this.currentVoiceState = OutgoingPayload.VoiceStateUpdate.copy$default(voiceStateUpdate, l2, findChannelByIdInternal$app_productionGoogleRelease == null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.g()) : null, false, false, false, null, 60, null);
+                this.currentVoiceState = OutgoingPayload.VoiceStateUpdate.copy$default(voiceStateUpdate, l2, findChannelByIdInternal$app_productionGoogleRelease == null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.h()) : null, false, false, false, null, 60, null);
                 if (findChannelByIdInternal$app_productionGoogleRelease == null) {
                     this.hasSelectedVoiceChannel = true;
                     createRtcConnection();
@@ -721,7 +721,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
             }
         }
         l2 = null;
-        this.currentVoiceState = OutgoingPayload.VoiceStateUpdate.copy$default(voiceStateUpdate, l2, findChannelByIdInternal$app_productionGoogleRelease == null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.g()) : null, false, false, false, null, 60, null);
+        this.currentVoiceState = OutgoingPayload.VoiceStateUpdate.copy$default(voiceStateUpdate, l2, findChannelByIdInternal$app_productionGoogleRelease == null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.h()) : null, false, false, false, null, 60, null);
         if (findChannelByIdInternal$app_productionGoogleRelease == null) {
         }
         onVoiceStateUpdated();
@@ -753,9 +753,9 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr
         StoreStream.Companion companion = StoreStream.Companion;
         ObservableExtensionsKt.appSubscribe$default(companion.getMediaSettings().isSelfMuted(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(companion.getMediaSettings().isSelfDeafened(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$2(this), 62, (Object) null);
-        Observable<R> G = companion.getMediaEngine().getSelectedVideoInputDevice().G(StoreRtcConnection$init$3.INSTANCE);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get…viceDescription != null }");
-        ObservableExtensionsKt.appSubscribe$default(G, StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$4(this), 62, (Object) null);
+        Observable<R> F = companion.getMediaEngine().getSelectedVideoInputDevice().F(StoreRtcConnection$init$3.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…viceDescription != null }");
+        ObservableExtensionsKt.appSubscribe$default(F, StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$4(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(this.stream.getMediaSettings$app_productionGoogleRelease().getUsersVolume(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$5(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(this.stream.getMediaSettings$app_productionGoogleRelease().getUsersMuted(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$6(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(this.stream.getMediaSettings$app_productionGoogleRelease().getUsersOffScreen(), StoreRtcConnection.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcConnection$init$7(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/stores/StoreRtcRegion.java b/app/src/main/java/com/discord/stores/StoreRtcRegion.java
index 18f15c09b8..565b2cc1b2 100644
--- a/app/src/main/java/com/discord/stores/StoreRtcRegion.java
+++ b/app/src/main/java/com/discord/stores/StoreRtcRegion.java
@@ -105,11 +105,11 @@ public final class StoreRtcRegion {
 
     private final void fetchRtcLatencyTestRegionsIps() {
         if (this.storeMediaEngine.hasNativeEngineEverInitialized()) {
-            Observable<R> G = this.storeExperiments.observeUserExperiment("2020-08_rtc_latency_test_experiment", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            Observable Z = G.a0(1).G(StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1.INSTANCE).Z(new StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2(this));
-            m.checkNotNullExpressionValue(Z, "storeExperiments.observe…            }\n          }");
-            ObservableExtensionsKt.appSubscribe$default(Z, StoreRtcRegion.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3(this), 62, (Object) null);
+            Observable<R> F = this.storeExperiments.observeUserExperiment("2020-08_rtc_latency_test_experiment", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable Y = F.Z(1).F(StoreRtcRegion$fetchRtcLatencyTestRegionsIps$1.INSTANCE).Y(new StoreRtcRegion$fetchRtcLatencyTestRegionsIps$2(this));
+            m.checkNotNullExpressionValue(Y, "storeExperiments.observe…            }\n          }");
+            ObservableExtensionsKt.appSubscribe$default(Y, StoreRtcRegion.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcRegion$fetchRtcLatencyTestRegionsIps$3(this), 62, (Object) null);
         }
     }
 
@@ -136,9 +136,9 @@ public final class StoreRtcRegion {
 
     @StoreThread
     public final void handleConnectionOpen$app_productionGoogleRelease() {
-        Observable<Long> e02 = Observable.e0((long) (new Random().nextInt(29000) + 1000), TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable.timer(fetchJi…), TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(e02, StoreRtcRegion.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcRegion$handleConnectionOpen$1(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0((long) (new Random().nextInt(29000) + 1000), TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable.timer(fetchJi…), TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(d02, StoreRtcRegion.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreRtcRegion$handleConnectionOpen$1(this), 62, (Object) null);
     }
 
     public final void init() {
diff --git a/app/src/main/java/com/discord/stores/StoreSearch.java b/app/src/main/java/com/discord/stores/StoreSearch.java
index 5e66654e12..7378b2232f 100644
--- a/app/src/main/java/com/discord/stores/StoreSearch.java
+++ b/app/src/main/java/com/discord/stores/StoreSearch.java
@@ -47,7 +47,7 @@ public final class StoreSearch {
     public static final class SearchTarget {
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2099id;
+        private final long f2105id;
         private final Type type;
 
         /* compiled from: StoreSearch.kt */
@@ -59,7 +59,7 @@ public final class StoreSearch {
         public SearchTarget(Type type, long j) {
             m.checkNotNullParameter(type, "type");
             this.type = type;
-            this.f2099id = j;
+            this.f2105id = j;
         }
 
         public static /* synthetic */ SearchTarget copy$default(SearchTarget searchTarget, Type type, long j, int i, Object obj) {
@@ -67,7 +67,7 @@ public final class StoreSearch {
                 type = searchTarget.type;
             }
             if ((i & 2) != 0) {
-                j = searchTarget.f2099id;
+                j = searchTarget.f2105id;
             }
             return searchTarget.copy(type, j);
         }
@@ -77,7 +77,7 @@ public final class StoreSearch {
         }
 
         public final long component2() {
-            return this.f2099id;
+            return this.f2105id;
         }
 
         public final SearchTarget copy(Type type, long j) {
@@ -93,11 +93,11 @@ public final class StoreSearch {
                 return false;
             }
             SearchTarget searchTarget = (SearchTarget) obj;
-            return m.areEqual(this.type, searchTarget.type) && this.f2099id == searchTarget.f2099id;
+            return m.areEqual(this.type, searchTarget.type) && this.f2105id == searchTarget.f2105id;
         }
 
         public final long getId() {
-            return this.f2099id;
+            return this.f2105id;
         }
 
         public final Type getType() {
@@ -106,14 +106,14 @@ public final class StoreSearch {
 
         public int hashCode() {
             Type type = this.type;
-            return b.a(this.f2099id) + ((type != null ? type.hashCode() : 0) * 31);
+            return b.a(this.f2105id) + ((type != null ? type.hashCode() : 0) * 31);
         }
 
         public String toString() {
             StringBuilder L = a.L("SearchTarget(type=");
             L.append(this.type);
             L.append(", id=");
-            return a.A(L, this.f2099id, ")");
+            return a.A(L, this.f2105id, ")");
         }
     }
 
@@ -146,8 +146,8 @@ public final class StoreSearch {
         this.storeGuildsNsfw = storeGuildsNsfw;
         this.storeUser = storeUser;
         this.historyCache = searchHistoryCache;
-        this.displayStateSubject = new SerializedSubject<>(BehaviorSubject.m0(DisplayState.SUGGESTIONS));
-        this.searchTargetSubject = new SerializedSubject<>(BehaviorSubject.l0());
+        this.displayStateSubject = new SerializedSubject<>(BehaviorSubject.l0(DisplayState.SUGGESTIONS));
+        this.searchTargetSubject = new SerializedSubject<>(BehaviorSubject.k0());
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -209,9 +209,9 @@ public final class StoreSearch {
             updateTarget(searchTarget);
             this.storeSearchData.init(searchTarget);
             this.storeSearchInput.init(searchStringProvider);
-            Observable I = Observable.I(this.storeSearchQuery.getState().y(StoreSearch$init$1.INSTANCE).G(StoreSearch$init$2.INSTANCE), this.storeSearchInput.getCurrentParsedInput().G(StoreSearch$init$3.INSTANCE));
-            m.checkNotNullExpressionValue(I, "Observable\n        .merg…splayState.SUGGESTIONS })");
-            ObservableExtensionsKt.appSubscribe$default(I, getClass(), (Context) null, new StoreSearch$init$4(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearch$init$5(this), 58, (Object) null);
+            Observable H = Observable.H(this.storeSearchQuery.getState().x(StoreSearch$init$1.INSTANCE).F(StoreSearch$init$2.INSTANCE), this.storeSearchInput.getCurrentParsedInput().F(StoreSearch$init$3.INSTANCE));
+            m.checkNotNullExpressionValue(H, "Observable\n        .merg…splayState.SUGGESTIONS })");
+            ObservableExtensionsKt.appSubscribe$default(H, getClass(), (Context) null, new StoreSearch$init$4(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearch$init$5(this), 58, (Object) null);
             ObservableExtensionsKt.appSubscribe$default(this.storeSearchQuery.getState(), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreSearch$init$6(this), 62, (Object) null);
         }
     }
@@ -243,15 +243,15 @@ public final class StoreSearch {
     }
 
     public final Observable<DisplayState> getDisplayState() {
-        Observable<DisplayState> s2 = ObservableExtensionsKt.computationLatest(this.displayStateSubject).s();
-        m.checkNotNullExpressionValue(s2, "displayStateSubject\n    …  .distinctUntilChanged()");
-        return s2;
+        Observable<DisplayState> r = ObservableExtensionsKt.computationLatest(this.displayStateSubject).r();
+        m.checkNotNullExpressionValue(r, "displayStateSubject\n    …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Collection<List<QueryNode>>> getHistory() {
-        Observable<R> Z = this.searchTargetSubject.Z(new StoreSearch$getHistory$1(this));
-        m.checkNotNullExpressionValue(Z, "searchTargetSubject\n    …())\n          }\n        }");
-        return Z;
+        Observable<R> Y = this.searchTargetSubject.Y(new StoreSearch$getHistory$1(this));
+        m.checkNotNullExpressionValue(Y, "searchTargetSubject\n    …())\n          }\n        }");
+        return Y;
     }
 
     public final StoreSearchData getStoreSearchData() {
diff --git a/app/src/main/java/com/discord/stores/StoreSearchData$getChannelSearchData$1.java b/app/src/main/java/com/discord/stores/StoreSearchData$getChannelSearchData$1.java
index bda0c67637..82b1bc21e9 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchData$getChannelSearchData$1.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchData$getChannelSearchData$1.java
@@ -25,7 +25,7 @@ public final class StoreSearchData$getChannelSearchData$1 extends o implements F
     public final SearchData mo1invoke() {
         Channel channel = StoreSearchData.access$getStoreChannels$p(this.this$0).getChannel(this.$channelId);
         MeUser me2 = StoreSearchData.access$getStoreUser$p(this.this$0).getMe();
-        Map<Long, GuildMember> map = StoreSearchData.access$getStoreGuilds$p(this.this$0).getMembers().get(channel != null ? Long.valueOf(channel.e()) : null);
+        Map<Long, GuildMember> map = StoreSearchData.access$getStoreGuilds$p(this.this$0).getMembers().get(channel != null ? Long.valueOf(channel.f()) : null);
         if (map == null) {
             map = h0.emptyMap();
         }
diff --git a/app/src/main/java/com/discord/stores/StoreSearchData$getGuildSearchData$1.java b/app/src/main/java/com/discord/stores/StoreSearchData$getGuildSearchData$1.java
index 49bc86bcf9..599a5c9ebb 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchData$getGuildSearchData$1.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchData$getGuildSearchData$1.java
@@ -21,7 +21,7 @@ public final class StoreSearchData$getGuildSearchData$1<T, R> implements b<Map<L
         m.checkNotNullExpressionValue(map, "guildChannels");
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry<Long, Channel> entry : map.entrySet()) {
-            if (AnimatableValueParser.j1(entry.getValue())) {
+            if (AnimatableValueParser.k1(entry.getValue())) {
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }
diff --git a/app/src/main/java/com/discord/stores/StoreSearchData.java b/app/src/main/java/com/discord/stores/StoreSearchData.java
index 192b9ed01a..1983bdd94c 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchData.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchData.java
@@ -46,9 +46,9 @@ public final class StoreSearchData {
         this.storeChannels = storeChannels;
         this.storeUser = storeUser;
         this.storeGuilds = storeGuilds;
-        BehaviorSubject m0 = BehaviorSubject.m0(new SearchData(null, null, null, null, null, 31, null));
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(SearchData())");
-        this.searchDataSubject = m0;
+        BehaviorSubject l0 = BehaviorSubject.l0(new SearchData(null, null, null, null, null, 31, null));
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(SearchData())");
+        this.searchDataSubject = l0;
     }
 
     public static final /* synthetic */ StoreChannels access$getStoreChannels$p(StoreSearchData storeSearchData) {
@@ -77,7 +77,7 @@ public final class StoreSearchData {
 
     private final Observable<SearchData> getGuildSearchData(long j) {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<SearchData> combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getGuilds().observeComputed(j), companion.getUsers().observeAllUsers(), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null).G(StoreSearchData$getGuildSearchData$1.INSTANCE), companion.getPermissions().observeChannelPermissionsForGuild(j), new StoreSearchData$sam$rx_functions_Func4$0(new StoreSearchData$getGuildSearchData$2(new SearchData.Builder())), 3, TimeUnit.SECONDS);
+        Observable<SearchData> combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getGuilds().observeComputed(j), companion.getUsers().observeAllUsers(), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null).F(StoreSearchData$getGuildSearchData$1.INSTANCE), companion.getPermissions().observeChannelPermissionsForGuild(j), new StoreSearchData$sam$rx_functions_Func4$0(new StoreSearchData$getGuildSearchData$2(new SearchData.Builder())), 3, TimeUnit.SECONDS);
         m.checkNotNullExpressionValue(combineLatest, "ObservableWithLeadingEdg…3, TimeUnit.SECONDS\n    )");
         return combineLatest;
     }
@@ -114,8 +114,8 @@ public final class StoreSearchData {
         } else {
             throw new NoWhenBranchMatchedException();
         }
-        Observable s2 = ObservableExtensionsKt.computationBuffered(observable).s();
-        m.checkNotNullExpressionValue(s2, "searchDataObservable\n   …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, StoreSearchData.class, (Context) null, new StoreSearchData$init$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearchData$init$2(this), 58, (Object) null);
+        Observable r = ObservableExtensionsKt.computationBuffered(observable).r();
+        m.checkNotNullExpressionValue(r, "searchDataObservable\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, StoreSearchData.class, (Context) null, new StoreSearchData$init$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearchData$init$2(this), 58, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSearchInput.java b/app/src/main/java/com/discord/stores/StoreSearchInput.java
index e51c4de120..ce5a42a37d 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchInput.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchInput.java
@@ -40,7 +40,7 @@ public final class StoreSearchInput {
     private final Observable<List<QueryNode>> currentParsedInput;
     private final Observable<List<QueryNode>> forcedInput;
     private final PublishSubject<List<QueryNode>> forcedInputSubject;
-    private final SerializedSubject<String, String> inputSubject = new SerializedSubject<>(BehaviorSubject.m0(""));
+    private final SerializedSubject<String, String> inputSubject = new SerializedSubject<>(BehaviorSubject.l0(""));
     private Subscription inputSubscription;
     private final Observable<Boolean> isInputValid;
     private final SerializedSubject<Boolean, Boolean> isInputValidSubject;
@@ -109,19 +109,19 @@ public final class StoreSearchInput {
     }
 
     public StoreSearchInput() {
-        SerializedSubject<List<QueryNode>, List<QueryNode>> serializedSubject = new SerializedSubject<>(BehaviorSubject.l0());
+        SerializedSubject<List<QueryNode>, List<QueryNode>> serializedSubject = new SerializedSubject<>(BehaviorSubject.k0());
         this.astSubject = serializedSubject;
-        SerializedSubject<Boolean, Boolean> serializedSubject2 = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE));
+        SerializedSubject<Boolean, Boolean> serializedSubject2 = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
         this.isInputValidSubject = serializedSubject2;
-        PublishSubject<List<QueryNode>> l0 = PublishSubject.l0();
-        this.forcedInputSubject = l0;
+        PublishSubject<List<QueryNode>> k0 = PublishSubject.k0();
+        this.forcedInputSubject = k0;
         this.isInputValid = serializedSubject2;
         this.currentParsedInput = serializedSubject;
-        m.checkNotNullExpressionValue(l0, "forcedInputSubject");
-        this.forcedInput = l0;
-        Observable Y = ObservableExtensionsKt.leadingEdgeThrottle(serializedSubject, 50, TimeUnit.MILLISECONDS).G(AnonymousClass1.INSTANCE).Y(a.a());
-        m.checkNotNullExpressionValue(Y, "astSubject\n        .lead…Schedulers.computation())");
-        ObservableExtensionsKt.appSubscribe$default(Y, (Context) null, "validateSearchInput", (Function1) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        m.checkNotNullExpressionValue(k0, "forcedInputSubject");
+        this.forcedInput = k0;
+        Observable X = ObservableExtensionsKt.leadingEdgeThrottle(serializedSubject, 50, TimeUnit.MILLISECONDS).F(AnonymousClass1.INSTANCE).X(a.a());
+        m.checkNotNullExpressionValue(X, "astSubject\n        .lead…Schedulers.computation())");
+        ObservableExtensionsKt.appSubscribe$default(X, (Context) null, "validateSearchInput", (Function1) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     public static final /* synthetic */ void access$handleInputSubscription(StoreSearchInput storeSearchInput, Subscription subscription) {
@@ -180,9 +180,9 @@ public final class StoreSearchInput {
 
     public final void init(SearchStringProvider searchStringProvider) {
         m.checkNotNullParameter(searchStringProvider, "searchStringProvider");
-        Observable Y = ObservableExtensionsKt.leadingEdgeThrottle(this.inputSubject, 100, TimeUnit.MILLISECONDS).s().G(new StoreSearchInput$init$1(new QueryParser(searchStringProvider))).Y(a.a());
-        m.checkNotNullExpressionValue(Y, "inputSubject\n        .le…Schedulers.computation())");
-        ObservableExtensionsKt.appSubscribe$default(Y, StoreSearchInput.class, (Context) null, new StoreSearchInput$init$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearchInput$init$3(this.astSubject), 58, (Object) null);
+        Observable X = ObservableExtensionsKt.leadingEdgeThrottle(this.inputSubject, 100, TimeUnit.MILLISECONDS).r().F(new StoreSearchInput$init$1(new QueryParser(searchStringProvider))).X(a.a());
+        m.checkNotNullExpressionValue(X, "inputSubject\n        .le…Schedulers.computation())");
+        ObservableExtensionsKt.appSubscribe$default(X, StoreSearchInput.class, (Context) null, new StoreSearchInput$init$2(this), (Function1) null, (Function0) null, (Function0) null, new StoreSearchInput$init$3(this.astSubject), 58, (Object) null);
     }
 
     public final Observable<Boolean> isInputValid() {
diff --git a/app/src/main/java/com/discord/stores/StoreSearchQuery.java b/app/src/main/java/com/discord/stores/StoreSearchQuery.java
index 965765a032..6bc3ad750e 100644
--- a/app/src/main/java/com/discord/stores/StoreSearchQuery.java
+++ b/app/src/main/java/com/discord/stores/StoreSearchQuery.java
@@ -2,8 +2,8 @@ package com.discord.stores;
 
 import android.content.Context;
 import c.a.d.q;
-import com.discord.api.message.Message;
 import com.discord.models.domain.ModelSearchResponse;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreSearch;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.search.network.SearchFetcher;
@@ -12,6 +12,7 @@ import com.discord.utilities.search.network.state.QueryFetchState;
 import com.discord.utilities.search.network.state.SearchState;
 import com.discord.utilities.search.strings.SearchStringProvider;
 import d0.g0.t;
+import d0.t.o;
 import d0.t.u;
 import d0.z.d.m;
 import j0.l.e.j;
@@ -49,7 +50,7 @@ public final class StoreSearchQuery {
         m.checkNotNullParameter(searchFetcher, "searchFetcher");
         this.searchFetcher = searchFetcher;
         SearchState searchState = SEARCH_STATE_NONE;
-        this.searchStateSubject = new SerializedSubject<>(BehaviorSubject.m0(searchState));
+        this.searchStateSubject = new SerializedSubject<>(BehaviorSubject.l0(searchState));
         this.currentSearchState = searchState;
     }
 
@@ -93,7 +94,12 @@ public final class StoreSearchQuery {
                     arrayList = new ArrayList();
                 }
             }
-            arrayList.addAll(modelSearchResponse.getHits());
+            List<com.discord.api.message.Message> hits2 = modelSearchResponse.getHits();
+            ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(hits2, 10));
+            for (com.discord.api.message.Message message : hits2) {
+                arrayList2.add(new Message(message));
+            }
+            arrayList.addAll(arrayList2);
             searchState = new SearchState(QueryFetchState.COMPLETED, searchQuery, modelSearchResponse.getThreads(), modelSearchResponse.getMembers(), arrayList, totalResults > arrayList.size(), totalResults);
         } else {
             searchState = errorCode.intValue() == 111000 ? new SearchState(QueryFetchState.INDEXING, searchQuery, null, null, null, false, 0, 124, null) : new SearchState(QueryFetchState.FAILED, searchQuery, null, null, null, false, 0, 124, null);
@@ -138,9 +144,9 @@ public final class StoreSearchQuery {
     }
 
     public final Observable<SearchState> getState() {
-        Observable<SearchState> s2 = this.searchStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "searchStateSubject\n        .distinctUntilChanged()");
-        return s2;
+        Observable<SearchState> r = this.searchStateSubject.r();
+        m.checkNotNullExpressionValue(r, "searchStateSubject\n        .distinctUntilChanged()");
+        return r;
     }
 
     public final synchronized void loadMore(StoreSearch.SearchTarget searchTarget, long j) {
@@ -166,9 +172,9 @@ public final class StoreSearchQuery {
         unsubscribe();
         if (!t.isBlank(str)) {
             updateAndPublish(new SearchState(QueryFetchState.IN_PROGRESS, null, null, null, null, false, 0, 126, null));
-            Observable a02 = Observable.k0(new j(str).G(new StoreSearchQuery$parseAndQuery$1(searchStringProvider)), storeSearch.getStoreSearchData().get(), new StoreSearchQuery$parseAndQuery$2(storeSearch, searchTarget, z2)).k(q.c(StoreSearchQuery$parseAndQuery$3.INSTANCE, null, 1, TimeUnit.SECONDS)).a0(1);
-            m.checkNotNullExpressionValue(a02, "Observable\n            .…   )\n            .take(1)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(a02), (Context) null, "parseAndQuery", (Function1) null, new StoreSearchQuery$parseAndQuery$4(this, searchTarget), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+            Observable Z = Observable.j0(new j(str).F(new StoreSearchQuery$parseAndQuery$1(searchStringProvider)), storeSearch.getStoreSearchData().get(), new StoreSearchQuery$parseAndQuery$2(storeSearch, searchTarget, z2)).k(q.c(StoreSearchQuery$parseAndQuery$3.INSTANCE, null, 1, TimeUnit.SECONDS)).Z(1);
+            m.checkNotNullExpressionValue(Z, "Observable\n            .…   )\n            .take(1)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(Z), (Context) null, "parseAndQuery", (Function1) null, new StoreSearchQuery$parseAndQuery$4(this, searchTarget), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
             return;
         }
         updateAndPublish(new SearchState(QueryFetchState.NONE, null, null, null, null, false, 0, 126, null));
diff --git a/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java b/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java
index 61e442b50c..deac5e2901 100644
--- a/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java
+++ b/app/src/main/java/com/discord/stores/StoreSlowMode$getChannelCooldownObservable$newObservable$2.java
@@ -67,8 +67,8 @@ public final class StoreSlowMode$getChannelCooldownObservable$newObservable$2<T,
             if (l == null || l.longValue() <= currentTimeMillis) {
                 return new j(0L);
             }
-            Observable<R> G = Observable.E(0, 1, TimeUnit.SECONDS).G(new AnonymousClass1(l, currentTimeMillis));
-            return Observable.i0(new r(G.i, new i2(AnonymousClass2.INSTANCE)));
+            Observable<R> F = Observable.D(0, 1, TimeUnit.SECONDS).F(new AnonymousClass1(l, currentTimeMillis));
+            return Observable.h0(new r(F.i, new i2(AnonymousClass2.INSTANCE)));
         }
     }
 
@@ -79,6 +79,6 @@ public final class StoreSlowMode$getChannelCooldownObservable$newObservable$2<T,
 
     public final Observable<? extends Long> call(Boolean bool) {
         m.checkNotNullExpressionValue(bool, "shouldOverrideCooldown");
-        return bool.booleanValue() ? new j(0L) : StoreSlowMode.access$getNextSendTimesSubject$p(this.this$0).G(new AnonymousClass1(this)).Z(new AnonymousClass2(this));
+        return bool.booleanValue() ? new j(0L) : StoreSlowMode.access$getNextSendTimesSubject$p(this.this$0).F(new AnonymousClass1(this)).Y(new AnonymousClass2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSlowMode.java b/app/src/main/java/com/discord/stores/StoreSlowMode.java
index afbff16288..ba65080cf0 100644
--- a/app/src/main/java/com/discord/stores/StoreSlowMode.java
+++ b/app/src/main/java/com/discord/stores/StoreSlowMode.java
@@ -38,7 +38,7 @@ public final class StoreSlowMode extends Store {
         this.stream = storeStream;
         HashMap<Long, Long> hashMap = new HashMap<>();
         this.nextSendTimes = hashMap;
-        this.nextSendTimesSubject = BehaviorSubject.m0(new HashMap(hashMap));
+        this.nextSendTimesSubject = BehaviorSubject.l0(new HashMap(hashMap));
     }
 
     public static final /* synthetic */ Clock access$getClock$p(StoreSlowMode storeSlowMode) {
@@ -58,12 +58,12 @@ public final class StoreSlowMode extends Store {
         if (observable != null) {
             return observable;
         }
-        Observable<Integer> i02 = Observable.i0(new c0(this.stream.getPermissions$app_productionGoogleRelease().observePermissionsForChannel(j).G(new StoreSlowMode$sam$rx_functions_Func1$0(new StoreSlowMode$getChannelCooldownObservable$newObservable$1(PermissionUtils.INSTANCE))).s().Z(new StoreSlowMode$getChannelCooldownObservable$newObservable$2(this, j)).G(StoreSlowMode$getChannelCooldownObservable$newObservable$3.INSTANCE).w(new StoreSlowMode$getChannelCooldownObservable$newObservable$4(this, j)).N(1)));
+        Observable<Integer> h02 = Observable.h0(new c0(this.stream.getPermissions$app_productionGoogleRelease().observePermissionsForChannel(j).F(new StoreSlowMode$sam$rx_functions_Func1$0(new StoreSlowMode$getChannelCooldownObservable$newObservable$1(PermissionUtils.INSTANCE))).r().Y(new StoreSlowMode$getChannelCooldownObservable$newObservable$2(this, j)).F(StoreSlowMode$getChannelCooldownObservable$newObservable$3.INSTANCE).v(new StoreSlowMode$getChannelCooldownObservable$newObservable$4(this, j)).M(1)));
         HashMap<Long, Observable<Integer>> hashMap = this.channelCooldownObservables;
         Long valueOf = Long.valueOf(j);
-        m.checkNotNullExpressionValue(i02, "newObservable");
-        hashMap.put(valueOf, i02);
-        return i02;
+        m.checkNotNullExpressionValue(h02, "newObservable");
+        hashMap.put(valueOf, h02);
+        return h02;
     }
 
     @StoreThread
@@ -93,9 +93,9 @@ public final class StoreSlowMode extends Store {
     @StoreThread
     public final void onMessageSent(long j) {
         Channel findChannelByIdInternal$app_productionGoogleRelease = this.stream.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(j);
-        int t = findChannelByIdInternal$app_productionGoogleRelease != null ? findChannelByIdInternal$app_productionGoogleRelease.t() : 0;
-        if (t > 0) {
-            onCooldownInternal(j, ((long) t) * 1000);
+        int u = findChannelByIdInternal$app_productionGoogleRelease != null ? findChannelByIdInternal$app_productionGoogleRelease.u() : 0;
+        if (u > 0) {
+            onCooldownInternal(j, ((long) u) * 1000);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java b/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java
index 12ff20b699..fa11000a77 100644
--- a/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java
+++ b/app/src/main/java/com/discord/stores/StoreSpotify$init$1.java
@@ -20,6 +20,6 @@ public final class StoreSpotify$init$1<T, R> implements b<ModelSpotifyTrack, Obs
     }
 
     public final Observable<? extends ModelSpotifyTrack> call(ModelSpotifyTrack modelSpotifyTrack) {
-        return modelSpotifyTrack != null ? new j(modelSpotifyTrack) : Observable.e0(1, TimeUnit.SECONDS).G(AnonymousClass1.INSTANCE);
+        return modelSpotifyTrack != null ? new j(modelSpotifyTrack) : Observable.d0(1, TimeUnit.SECONDS).F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreSpotify.java b/app/src/main/java/com/discord/stores/StoreSpotify.java
index 32cdb7f55b..f89a2ad3e3 100644
--- a/app/src/main/java/com/discord/stores/StoreSpotify.java
+++ b/app/src/main/java/com/discord/stores/StoreSpotify.java
@@ -35,7 +35,7 @@ public final class StoreSpotify {
     private final Clock clock;
     private final Dispatcher dispatcher;
     private Subscription expireStateSub;
-    private final BehaviorSubject<Unit> publishStateTrigger = BehaviorSubject.l0();
+    private final BehaviorSubject<Unit> publishStateTrigger = BehaviorSubject.k0();
     private final SpotifyApiClient spotifyApiClient;
     private SpotifyState spotifyState;
     private final StoreStream stream;
@@ -280,9 +280,9 @@ public final class StoreSpotify {
 
     @StoreThread
     private final void startStateExpiration(long j) {
-        Observable<Long> e02 = Observable.e0(j + 5000, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable\n        .time…), TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(e02, StoreSpotify.class, (Context) null, new StoreSpotify$startStateExpiration$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreSpotify$startStateExpiration$2(this), 58, (Object) null);
+        Observable<Long> d02 = Observable.d0(j + 5000, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…), TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(d02, StoreSpotify.class, (Context) null, new StoreSpotify$startStateExpiration$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreSpotify$startStateExpiration$2(this), 58, (Object) null);
     }
 
     @StoreThread
@@ -334,7 +334,7 @@ public final class StoreSpotify {
     public final void init(Context context) {
         m.checkNotNullParameter(context, "context");
         SpotifyHelper.registerSpotifyBroadcastReceivers(context);
-        Observable o = Observable.j(this.publishStateTrigger, this.spotifyApiClient.getSpotifyTrack().Z(StoreSpotify$init$1.INSTANCE).s(), StoreSpotify$init$2.INSTANCE).o(2, TimeUnit.SECONDS);
+        Observable o = Observable.j(this.publishStateTrigger, this.spotifyApiClient.getSpotifyTrack().Y(StoreSpotify$init$1.INSTANCE).r(), StoreSpotify$init$2.INSTANCE).o(2, TimeUnit.SECONDS);
         m.checkNotNullExpressionValue(o, "Observable.combineLatest…unce(2, TimeUnit.SECONDS)");
         ObservableExtensionsKt.appSubscribe$default(o, StoreSpotify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreSpotify$init$3(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java b/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java
index d182cf1894..b737a9d3a1 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannelSelfPresence.java
@@ -40,9 +40,9 @@ public final class StoreStageChannelSelfPresence extends StoreV2 {
         this.voiceChannelSelected = storeVoiceChannelSelected;
         this.userSettings = storeUserSettings;
         this.dispatcher = dispatcher;
-        BehaviorSubject<Unit> l0 = BehaviorSubject.l0();
-        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create()");
-        this.publishStateTrigger = l0;
+        BehaviorSubject<Unit> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.publishStateTrigger = k0;
     }
 
     @StoreThread
@@ -132,9 +132,9 @@ public final class StoreStageChannelSelfPresence extends StoreV2 {
     }
 
     public final void init() {
-        Observable Z = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stageChannels, this.voiceChannelSelected}, false, null, null, new StoreStageChannelSelfPresence$init$1(this), 14, null).s().Z(new StoreStageChannelSelfPresence$init$2(this));
-        m.checkNotNullExpressionValue(Z, "observationDeck.connectR…bled -> isEnabled }\n    }");
-        ObservableExtensionsKt.appSubscribe$default(Z, StoreStageChannelSelfPresence.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStageChannelSelfPresence$init$3(this), 62, (Object) null);
+        Observable Y = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stageChannels, this.voiceChannelSelected}, false, null, null, new StoreStageChannelSelfPresence$init$1(this), 14, null).r().Y(new StoreStageChannelSelfPresence$init$2(this));
+        m.checkNotNullExpressionValue(Y, "observationDeck.connectR…bled -> isEnabled }\n    }");
+        ObservableExtensionsKt.appSubscribe$default(Y, StoreStageChannelSelfPresence.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStageChannelSelfPresence$init$3(this), 62, (Object) null);
     }
 
     public final void setStageChannelActivity(Activity activity) {
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels$observeMyRoles$1.java b/app/src/main/java/com/discord/stores/StoreStageChannels$observeMyRoles$1.java
index ed855d9d15..2224a6914a 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannels$observeMyRoles$1.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannels$observeMyRoles$1.java
@@ -21,7 +21,7 @@ public final class StoreStageChannels$observeMyRoles$1 extends o implements Func
     public final StageRoles mo1invoke() {
         Channel channel = StoreStageChannels.access$getChannelsStore$p(this.this$0).getChannel(this.$channelId);
         if (channel != null) {
-            return this.this$0.m10getMyRolesvisDeB4(channel.g());
+            return this.this$0.m10getMyRolesvisDeB4(channel.h());
         }
         return null;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels$observeUserRoles$1.java b/app/src/main/java/com/discord/stores/StoreStageChannels$observeUserRoles$1.java
index 606467f21d..def2170d09 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannels$observeUserRoles$1.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannels$observeUserRoles$1.java
@@ -23,7 +23,7 @@ public final class StoreStageChannels$observeUserRoles$1 extends o implements Fu
     public final StageRoles mo1invoke() {
         Channel channel = StoreStageChannels.access$getChannelsStore$p(this.this$0).getChannel(this.$channelId);
         if (channel != null) {
-            return this.this$0.m12getUserRolesuOBN1zc(this.$userId, channel.g());
+            return this.this$0.m12getUserRolesuOBN1zc(this.$userId, channel.h());
         }
         return null;
     }
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels$stageChannelIdsInGuildForDispatch$1.java b/app/src/main/java/com/discord/stores/StoreStageChannels$stageChannelIdsInGuildForDispatch$1.java
index 0a3d248805..e4a7cb801b 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannels$stageChannelIdsInGuildForDispatch$1.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannels$stageChannelIdsInGuildForDispatch$1.java
@@ -15,9 +15,9 @@ public final class StoreStageChannels$stageChannelIdsInGuildForDispatch$1 extend
 
     public final Long invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        Long valueOf = Long.valueOf(channel.g());
+        Long valueOf = Long.valueOf(channel.h());
         valueOf.longValue();
-        if (AnimatableValueParser.u1(channel)) {
+        if (AnimatableValueParser.v1(channel)) {
             return valueOf;
         }
         return null;
diff --git a/app/src/main/java/com/discord/stores/StoreStageChannels.java b/app/src/main/java/com/discord/stores/StoreStageChannels.java
index ef007cbe4c..07259c387f 100644
--- a/app/src/main/java/com/discord/stores/StoreStageChannels.java
+++ b/app/src/main/java/com/discord/stores/StoreStageChannels.java
@@ -251,19 +251,19 @@ public final class StoreStageChannels extends StoreV2 {
             Map<Long, StageEventActivationState> map = (Map) a.c(channel, this.stageEventStates);
             if (map == null) {
                 map = new LinkedHashMap<>();
-                this.stageEventStates.put(Long.valueOf(channel.e()), map);
+                this.stageEventStates.put(Long.valueOf(channel.f()), map);
             }
             StageEventActivationState stageEventActivationState = (StageEventActivationState) a.d(channel, map);
             boolean z2 = true;
             if (stageEventActivationState == null) {
                 stageEventActivationState = new StageEventActivationState(null, 1, null);
-                map.put(Long.valueOf(channel.g()), stageEventActivationState);
+                map.put(Long.valueOf(channel.h()), stageEventActivationState);
             }
             if (!StageRoles.m25isModeratorimpl(i) || stageEventActivationState.getModerators().contains(Long.valueOf(j))) {
                 z2 = false;
             }
             if (z2) {
-                map.put(Long.valueOf(channel.g()), stageEventActivationState.copy(z2 ? o0.plus(stageEventActivationState.getModerators(), Long.valueOf(j)) : stageEventActivationState.getModerators()));
+                map.put(Long.valueOf(channel.h()), stageEventActivationState.copy(z2 ? o0.plus(stageEventActivationState.getModerators(), Long.valueOf(j)) : stageEventActivationState.getModerators()));
                 markStageEventDirty();
             }
         }
@@ -276,7 +276,7 @@ public final class StoreStageChannels extends StoreV2 {
         if ((StageRoles.m25isModeratorimpl(i) || StageRoles.m26isSpeakerimpl(i)) && (map = (Map) a.c(channel, this.stageEventStates)) != null && (stageEventActivationState = (StageEventActivationState) a.d(channel, map)) != null) {
             boolean z2 = !StageRoles.m25isModeratorimpl(i2) && StageRoles.m25isModeratorimpl(i) && stageEventActivationState.getModerators().contains(Long.valueOf(j));
             if (z2) {
-                map.put(Long.valueOf(channel.g()), stageEventActivationState.copy(z2 ? o0.minus(stageEventActivationState.getModerators(), Long.valueOf(j)) : stageEventActivationState.getModerators()));
+                map.put(Long.valueOf(channel.h()), stageEventActivationState.copy(z2 ? o0.minus(stageEventActivationState.getModerators(), Long.valueOf(j)) : stageEventActivationState.getModerators()));
                 markStageEventDirty();
             }
         }
@@ -302,7 +302,7 @@ public final class StoreStageChannels extends StoreV2 {
             return;
         }
         if (stageRoles != null && !StageRoles.m24isInvitedToSpeakimpl(stageRoles.m28unboximpl()) && StageRoles.m24isInvitedToSpeakimpl(i)) {
-            StageChannelNotifications.Companion.getINSTANCE().onInvitedToSpeak(channel.g());
+            StageChannelNotifications.Companion.getINSTANCE().onInvitedToSpeak(channel.h());
         } else if (stageRoles != null && StageRoles.m24isInvitedToSpeakimpl(stageRoles.m28unboximpl()) && !StageRoles.m24isInvitedToSpeakimpl(i)) {
             StageChannelNotifications.Companion.getINSTANCE().onInviteToSpeakRescinded();
         }
@@ -320,7 +320,7 @@ public final class StoreStageChannels extends StoreV2 {
             return null;
         }
         if (map == null) {
-            map = this.voiceStatesStore.getForChannel(guild.getId(), channel.g());
+            map = this.voiceStatesStore.getForChannel(guild.getId(), channel.h());
         }
         if (map2 == null) {
             map2 = getRolesMap(guild);
@@ -406,7 +406,7 @@ public final class StoreStageChannels extends StoreV2 {
                 }
                 ArrayList<User> arrayList4 = new ArrayList();
                 for (Object obj : arrayList3) {
-                    StageRoles r11 = storeStageChannels.m12getUserRolesuOBN1zc(((User) obj).getId(), channel.g());
+                    StageRoles r11 = storeStageChannels.m12getUserRolesuOBN1zc(((User) obj).getId(), channel.h());
                     if (r11 != null && StageRoles.m26isSpeakerimpl(r11.m28unboximpl())) {
                         arrayList4.add(obj);
                     }
@@ -432,11 +432,11 @@ public final class StoreStageChannels extends StoreV2 {
                 }
                 it = it2;
                 arrayList = arrayList2;
-                StageRoles r9 = storeStageChannels.m10getMyRolesvisDeB4(channel.g());
-                StageInstance stageInstanceForChannel = storeStageChannels.stageInstancesStore.getStageInstanceForChannel(channel.g());
+                StageRoles r9 = storeStageChannels.m10getMyRolesvisDeB4(channel.h());
+                StageInstance stageInstanceForChannel = storeStageChannels.stageInstancesStore.getStageInstanceForChannel(channel.h());
                 VoiceState voiceState = map3.get(Long.valueOf(j2));
                 Long a = voiceState != null ? voiceState.a() : null;
-                stageChannel = new StageChannel(channel, arrayList3, r9, set, arrayList7, size, stageInstanceForChannel, z2, a != null && a.longValue() == channel.g(), null);
+                stageChannel = new StageChannel(channel, arrayList3, r9, set, arrayList7, size, stageInstanceForChannel, z2, a != null && a.longValue() == channel.h(), null);
             } else {
                 it = it2;
                 arrayList = arrayList2;
@@ -457,7 +457,7 @@ public final class StoreStageChannels extends StoreV2 {
         }
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList2, 10)), 16));
         for (Object obj3 : arrayList2) {
-            linkedHashMap.put(Long.valueOf(((StageChannel) obj3).getChannel().g()), obj3);
+            linkedHashMap.put(Long.valueOf(((StageChannel) obj3).getChannel().h()), obj3);
         }
         return linkedHashMap;
     }
@@ -485,13 +485,13 @@ public final class StoreStageChannels extends StoreV2 {
     @StoreThread
     public final void handleChannelDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (AnimatableValueParser.u1(channel)) {
-            if (this.stageRolesByChannel.remove(Long.valueOf(channel.g())) != null) {
-                this.dirtyChannelIds.add(Long.valueOf(channel.g()));
+        if (AnimatableValueParser.v1(channel)) {
+            if (this.stageRolesByChannel.remove(Long.valueOf(channel.h())) != null) {
+                this.dirtyChannelIds.add(Long.valueOf(channel.h()));
                 markChanged();
             }
             Map map = (Map) a.c(channel, this.stageEventStates);
-            if (map != null && ((StageEventActivationState) map.remove(Long.valueOf(channel.g()))) != null) {
+            if (map != null && ((StageEventActivationState) map.remove(Long.valueOf(channel.h()))) != null) {
                 markStageEventDirty();
             }
         }
@@ -590,7 +590,7 @@ public final class StoreStageChannels extends StoreV2 {
         long longValue = (voiceState == null || (a2 = voiceState.a()) == null) ? j2 : a2.longValue();
         Channel channelInternal$app_productionGoogleRelease = this.channelsStore.getChannelInternal$app_productionGoogleRelease(j, longValue);
         Channel channelInternal$app_productionGoogleRelease2 = this.channelsStore.getChannelInternal$app_productionGoogleRelease(j, j2);
-        if (channelInternal$app_productionGoogleRelease2 != null && AnimatableValueParser.u1(channelInternal$app_productionGoogleRelease2) && (voiceState == null || (a = voiceState.a()) == null || a.longValue() != j2)) {
+        if (channelInternal$app_productionGoogleRelease2 != null && AnimatableValueParser.v1(channelInternal$app_productionGoogleRelease2) && (voiceState == null || (a = voiceState.a()) == null || a.longValue() != j2)) {
             Map<Long, StageRoles> map2 = this.stageRolesByChannel.get(Long.valueOf(j2));
             if (map2 != null) {
                 stageRoles = map2.remove(Long.valueOf(j3));
@@ -600,7 +600,7 @@ public final class StoreStageChannels extends StoreV2 {
                 m8handleUserLeftStageOrLostRolesGM3QuyE$default(this, channelInternal$app_productionGoogleRelease2, j3, stageRoles.m28unboximpl(), 0, 8, null);
                 this.dirtyChannelIds.add(Long.valueOf(j2));
                 markChanged();
-                if (voiceState != null && channelInternal$app_productionGoogleRelease != null && AnimatableValueParser.u1(channelInternal$app_productionGoogleRelease) == z2) {
+                if (voiceState != null && channelInternal$app_productionGoogleRelease != null && AnimatableValueParser.v1(channelInternal$app_productionGoogleRelease) == z2) {
                     Map<Long, StageRoles> map3 = this.stageRolesByChannel.get(Long.valueOf(longValue));
                     if (map3 == null) {
                         map3 = new LinkedHashMap<>();
@@ -626,9 +626,9 @@ public final class StoreStageChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, StageChannel>> observeGuildStageChannels(long j) {
-        Observable<Map<Long, StageChannel>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, this.channelsStore, this.userStore, this.voiceStatesStore, this.stageInstancesStore}, false, null, null, new StoreStageChannels$observeGuildStageChannels$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, StageChannel>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, this.channelsStore, this.userStore, this.voiceStatesStore, this.stageInstancesStore}, false, null, null, new StoreStageChannels$observeGuildStageChannels$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<StageRequestToSpeakState> observeMyRequestToSpeakState(long j) {
@@ -644,9 +644,9 @@ public final class StoreStageChannels extends StoreV2 {
     }
 
     public final Observable<Map<Long, StageChannel>> observeStageChannels() {
-        Observable<Map<Long, StageChannel>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, this.channelsStore, this.guildsStore, this.userStore, this.voiceStatesStore, this.stageInstancesStore}, false, null, null, new StoreStageChannels$observeStageChannels$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, StageChannel>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this, this.channelsStore, this.guildsStore, this.userStore, this.voiceStatesStore, this.stageInstancesStore}, false, null, null, new StoreStageChannels$observeStageChannels$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, StageRoles>> observeStageRolesByChannel(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreStageInstances.java b/app/src/main/java/com/discord/stores/StoreStageInstances.java
index 396bacb4a3..975d12f4e2 100644
--- a/app/src/main/java/com/discord/stores/StoreStageInstances.java
+++ b/app/src/main/java/com/discord/stores/StoreStageInstances.java
@@ -95,7 +95,7 @@ public final class StoreStageInstances extends StoreV2 {
     @StoreThread
     public final void handleChannelDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        handleDelete(Long.valueOf(channel.e()), channel.g());
+        handleDelete(Long.valueOf(channel.f()), channel.h());
     }
 
     @StoreThread
diff --git a/app/src/main/java/com/discord/stores/StoreStickers$fetchEnabledStickerDirectory$1.java b/app/src/main/java/com/discord/stores/StoreStickers$fetchEnabledStickerDirectory$1.java
index 5332a01adc..92216b0c3a 100644
--- a/app/src/main/java/com/discord/stores/StoreStickers$fetchEnabledStickerDirectory$1.java
+++ b/app/src/main/java/com/discord/stores/StoreStickers$fetchEnabledStickerDirectory$1.java
@@ -26,6 +26,8 @@ public final class StoreStickers$fetchEnabledStickerDirectory$1 extends o implem
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
+            StoreStickers storeStickers = this.this$0.this$0;
+            StoreStickers.access$setLastFetchedEnabledPacks$p(storeStickers, StoreStickers.access$getClock$p(storeStickers).currentTimeMillis());
             this.this$0.this$0.handleNewEnabledStickerDirectory(this.$directory.getStickerPacks());
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreStickers$handleDeletedStickers$1.java b/app/src/main/java/com/discord/stores/StoreStickers$handleDeletedStickers$1.java
new file mode 100644
index 0000000000..2eefc1d3ea
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreStickers$handleDeletedStickers$1.java
@@ -0,0 +1,27 @@
+package com.discord.stores;
+
+import d0.z.d.o;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreStickers.kt */
+public final class StoreStickers$handleDeletedStickers$1 extends o implements Function0<Unit> {
+    public final /* synthetic */ List $stickerIds;
+    public final /* synthetic */ StoreStickers this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreStickers$handleDeletedStickers$1(StoreStickers storeStickers, List list) {
+        super(0);
+        this.this$0 = storeStickers;
+        this.$stickerIds = list;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+        for (Number number : this.$stickerIds) {
+            StoreStickers.access$getFrecency$p(this.this$0).removeEntry(String.valueOf(number.longValue()));
+        }
+        StoreStickers.access$getFrecencyCache$p(this.this$0).set(StoreStickers.access$getFrecency$p(this.this$0), true);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreStickers$observeFrequentlyUsedStickerIds$1.java b/app/src/main/java/com/discord/stores/StoreStickers$observeFrequentlyUsedStickerIds$1.java
new file mode 100644
index 0000000000..71638b1230
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreStickers$observeFrequentlyUsedStickerIds$1.java
@@ -0,0 +1,22 @@
+package com.discord.stores;
+
+import com.discord.utilities.frecency.FrecencyTracker;
+import com.discord.utilities.media.MediaFrecencyTracker;
+import d0.t.o;
+import j0.k.b;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+/* compiled from: StoreStickers.kt */
+public final class StoreStickers$observeFrequentlyUsedStickerIds$1<T, R> implements b<MediaFrecencyTracker, List<? extends Long>> {
+    public static final StoreStickers$observeFrequentlyUsedStickerIds$1 INSTANCE = new StoreStickers$observeFrequentlyUsedStickerIds$1();
+
+    public final List<Long> call(MediaFrecencyTracker mediaFrecencyTracker) {
+        Collection<T> sortedKeys$default = FrecencyTracker.getSortedKeys$default(mediaFrecencyTracker, 0, 1, null);
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(sortedKeys$default, 10));
+        for (T t : sortedKeys$default) {
+            arrayList.add(Long.valueOf(Long.parseLong(t)));
+        }
+        return arrayList;
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreStickers$observeFrequentlyUsedStickers$1.java b/app/src/main/java/com/discord/stores/StoreStickers$observeFrequentlyUsedStickers$1.java
deleted file mode 100644
index 9cc86cb501..0000000000
--- a/app/src/main/java/com/discord/stores/StoreStickers$observeFrequentlyUsedStickers$1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.discord.stores;
-
-import com.discord.api.sticker.Sticker;
-import com.discord.utilities.frecency.FrecencyTracker;
-import d0.t.u;
-import d0.z.d.o;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import kotlin.jvm.functions.Function0;
-/* compiled from: StoreStickers.kt */
-public final class StoreStickers$observeFrequentlyUsedStickers$1 extends o implements Function0<List<? extends Sticker>> {
-    public final /* synthetic */ StoreStickers this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public StoreStickers$observeFrequentlyUsedStickers$1(StoreStickers storeStickers) {
-        super(0);
-        this.this$0 = storeStickers;
-    }
-
-    /* Return type fixed from 'java.util.List<com.discord.api.sticker.Sticker>' to match base method */
-    @Override // kotlin.jvm.functions.Function0
-    /* renamed from: invoke */
-    public final List<? extends Sticker> mo1invoke() {
-        Collection<String> sortedKeys$default = FrecencyTracker.getSortedKeys$default(StoreStickers.access$getFrecency$p(this.this$0), 0, 1, null);
-        ArrayList arrayList = new ArrayList();
-        for (String str : sortedKeys$default) {
-            Sticker sticker = (Sticker) StoreStickers.access$getStickersSnapshot$p(this.this$0).get(Long.valueOf(Long.parseLong(str)));
-            if (sticker != null) {
-                arrayList.add(sticker);
-            }
-        }
-        return u.take(arrayList, 20);
-    }
-}
diff --git a/app/src/main/java/com/discord/stores/StoreStickers.java b/app/src/main/java/com/discord/stores/StoreStickers.java
index 4b8ab05524..98a8a9bfae 100644
--- a/app/src/main/java/com/discord/stores/StoreStickers.java
+++ b/app/src/main/java/com/discord/stores/StoreStickers.java
@@ -11,6 +11,8 @@ import com.discord.utilities.media.MediaFrecencyTracker;
 import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.time.Clock;
+import com.discord.utilities.time.ClockFactory;
 import com.discord.widgets.chat.input.sticker.StickerPickerFeatureFlag;
 import d0.t.h0;
 import d0.t.n;
@@ -29,13 +31,17 @@ import rx.Observable;
 /* compiled from: StoreStickers.kt */
 public final class StoreStickers extends StoreV2 {
     public static final Companion Companion = new Companion(null);
+    private static final long FETCH_ENABLED_STICKER_PACKS_DELAY = 300000;
     private static final int MAX_FREQUENTLY_USED_STICKERS = 20;
     private final RestAPI api;
+    private final Clock clock;
     private final Dispatcher dispatcher;
     private List<ModelStickerPack> enabledStickerPacks;
     private List<ModelStickerPack> enabledStickerPacksSnapshot;
+    private List<Sticker> enabledStickerPacksStickersSnapshot;
     private final MediaFrecencyTracker frecency;
     private final Persister<MediaFrecencyTracker> frecencyCache;
+    private long lastFetchedEnabledPacks;
     private final ObservationDeck observationDeck;
     private Map<Long, ? extends StickerPackState> stickerPacks;
     private Map<Long, ? extends StickerPackState> stickerPacksSnapshot;
@@ -134,32 +140,39 @@ public final class StoreStickers extends StoreV2 {
         }
     }
 
-    public StoreStickers(Dispatcher dispatcher, RestAPI restAPI, ObservationDeck observationDeck) {
+    public StoreStickers(Dispatcher dispatcher, RestAPI restAPI, ObservationDeck observationDeck, Clock clock) {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         m.checkNotNullParameter(restAPI, "api");
         m.checkNotNullParameter(observationDeck, "observationDeck");
+        m.checkNotNullParameter(clock, "clock");
         this.dispatcher = dispatcher;
         this.api = restAPI;
         this.observationDeck = observationDeck;
+        this.clock = clock;
         this.stickerPacks = h0.emptyMap();
         this.stickerPacksSnapshot = h0.emptyMap();
         this.stickersSnapshot = h0.emptyMap();
-        Persister<MediaFrecencyTracker> persister = new Persister<>("STICKER_HISTORY_V1", new MediaFrecencyTracker());
+        Persister<MediaFrecencyTracker> persister = new Persister<>("STICKER_HISTORY_V1", new MediaFrecencyTracker(20, 1));
         this.frecencyCache = persister;
         this.frecency = persister.get();
         this.enabledStickerPacks = n.emptyList();
         this.enabledStickerPacksSnapshot = n.emptyList();
+        this.enabledStickerPacksStickersSnapshot = n.emptyList();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ StoreStickers(Dispatcher dispatcher, RestAPI restAPI, ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(dispatcher, (i & 2) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 4) != 0 ? ObservationDeckProvider.get() : observationDeck);
+    public /* synthetic */ StoreStickers(Dispatcher dispatcher, RestAPI restAPI, ObservationDeck observationDeck, Clock clock, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(dispatcher, (i & 2) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 4) != 0 ? ObservationDeckProvider.get() : observationDeck, (i & 8) != 0 ? ClockFactory.get() : clock);
     }
 
     public static final /* synthetic */ RestAPI access$getApi$p(StoreStickers storeStickers) {
         return storeStickers.api;
     }
 
+    public static final /* synthetic */ Clock access$getClock$p(StoreStickers storeStickers) {
+        return storeStickers.clock;
+    }
+
     public static final /* synthetic */ Dispatcher access$getDispatcher$p(StoreStickers storeStickers) {
         return storeStickers.dispatcher;
     }
@@ -176,28 +189,30 @@ public final class StoreStickers extends StoreV2 {
         return storeStickers.frecencyCache;
     }
 
-    public static final /* synthetic */ Map access$getStickerPacks$p(StoreStickers storeStickers) {
-        return storeStickers.stickerPacks;
+    public static final /* synthetic */ long access$getLastFetchedEnabledPacks$p(StoreStickers storeStickers) {
+        return storeStickers.lastFetchedEnabledPacks;
     }
 
-    public static final /* synthetic */ Map access$getStickersSnapshot$p(StoreStickers storeStickers) {
-        return storeStickers.stickersSnapshot;
+    public static final /* synthetic */ Map access$getStickerPacks$p(StoreStickers storeStickers) {
+        return storeStickers.stickerPacks;
     }
 
     public static final /* synthetic */ void access$setEnabledStickerPacksSnapshot$p(StoreStickers storeStickers, List list) {
         storeStickers.enabledStickerPacksSnapshot = list;
     }
 
+    public static final /* synthetic */ void access$setLastFetchedEnabledPacks$p(StoreStickers storeStickers, long j) {
+        storeStickers.lastFetchedEnabledPacks = j;
+    }
+
     public static final /* synthetic */ void access$setStickerPacks$p(StoreStickers storeStickers, Map map) {
         storeStickers.stickerPacks = map;
     }
 
-    public static final /* synthetic */ void access$setStickersSnapshot$p(StoreStickers storeStickers, Map map) {
-        storeStickers.stickersSnapshot = map;
-    }
-
     public final void fetchEnabledStickerDirectory() {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.api.getStickerPacks(), false, 1, null), StoreStickers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStickers$fetchEnabledStickerDirectory$1(this), 62, (Object) null);
+        if (this.lastFetchedEnabledPacks + 300000 < this.clock.currentTimeMillis()) {
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.api.getStickerPacks(), false, 1, null), StoreStickers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStickers$fetchEnabledStickerDirectory$1(this), 62, (Object) null);
+        }
     }
 
     public final void fetchStickerPack(long j) {
@@ -208,6 +223,10 @@ public final class StoreStickers extends StoreV2 {
         return this.enabledStickerPacksSnapshot;
     }
 
+    public final List<Sticker> getEnabledStickers() {
+        return this.enabledStickerPacksStickersSnapshot;
+    }
+
     public final StickerPackState getStickerPack(long j) {
         return (StickerPackState) this.stickerPacksSnapshot.get(Long.valueOf(j));
     }
@@ -221,11 +240,16 @@ public final class StoreStickers extends StoreV2 {
         return this.stickersSnapshot;
     }
 
+    public final void handleDeletedStickers(List<Long> list) {
+        m.checkNotNullParameter(list, "stickerIds");
+        this.dispatcher.schedule(new StoreStickers$handleDeletedStickers$1(this, list));
+    }
+
     public final void handleFetchedSticker(Sticker sticker) {
-        if (sticker != null && sticker.j() == StickerType.STANDARD) {
-            Long h = sticker.h();
-            m.checkNotNull(h);
-            fetchStickerPack(h.longValue());
+        if (sticker != null && sticker.k() == StickerType.STANDARD) {
+            Long i = sticker.i();
+            m.checkNotNull(i);
+            fetchStickerPack(i.longValue());
         }
     }
 
@@ -277,10 +301,10 @@ public final class StoreStickers extends StoreV2 {
         return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreStickers$observeEnabledStickerPacks$1(this), 14, null);
     }
 
-    public final Observable<List<Sticker>> observeFrequentlyUsedStickers() {
-        Observable<List<Sticker>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreStickers$observeFrequentlyUsedStickers$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+    public final Observable<List<Long>> observeFrequentlyUsedStickerIds() {
+        Observable<R> F = this.frecencyCache.getObservable().F(StoreStickers$observeFrequentlyUsedStickerIds$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "frecencyCache.getObserva…ckerId.toLong() }\n      }");
+        return F;
     }
 
     public final Observable<StickerPackState> observeStickerPack(long j) {
@@ -320,5 +344,11 @@ public final class StoreStickers extends StoreV2 {
         }
         this.stickersSnapshot = linkedHashMap;
         this.enabledStickerPacksSnapshot = new ArrayList(this.enabledStickerPacks);
+        List<ModelStickerPack> list = this.enabledStickerPacks;
+        ArrayList arrayList3 = new ArrayList(o.collectionSizeOrDefault(list, 10));
+        for (ModelStickerPack modelStickerPack : list) {
+            arrayList3.add(modelStickerPack.getStickers());
+        }
+        this.enabledStickerPacksStickersSnapshot = new ArrayList(o.flatten(arrayList3));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java b/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java
index 091213f164..9915c57b58 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java
@@ -305,7 +305,7 @@ public final class StoreStream$deferredInit$1 extends o implements Function0<Uni
         ContactsFetcher contactsFetcher = new ContactsFetcher(this.$context);
         StoreStream.access$startStoreInitializationTimer(this.this$0, networkMonitor);
         this.this$0.getExperiments$app_productionGoogleRelease().init(this.$context);
-        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c;
+        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1591c;
         RebrandFeatureFlag a = RebrandFeatureFlag.a();
         StoreExperiments experiments$app_productionGoogleRelease = this.this$0.getExperiments$app_productionGoogleRelease();
         Objects.requireNonNull(a);
@@ -316,11 +316,11 @@ public final class StoreStream$deferredInit$1 extends o implements Function0<Uni
         StoreExperiments experiments$app_productionGoogleRelease2 = this.this$0.getExperiments$app_productionGoogleRelease();
         Objects.requireNonNull(a2);
         m.checkNotNullParameter(experiments$app_productionGoogleRelease2, "storeExperiments");
-        Observable<R> G = experiments$app_productionGoogleRelease2.observeUserExperiment("2021-05_opensl_default_enable_android", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable a02 = G.a0(1);
-        m.checkNotNullExpressionValue(a02, "storeExperiments.observe…erNull()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(a02), AudioManagerFeatureFlag.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new k0(a2), 62, (Object) null);
+        Observable<R> F = experiments$app_productionGoogleRelease2.observeUserExperiment("2021-05_opensl_default_enable_android", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "storeExperiments.observe…erNull()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(Z), AudioManagerFeatureFlag.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new k0(a2), 62, (Object) null);
         this.this$0.getMediaEngine$app_productionGoogleRelease().init(this.$context);
         this.this$0.getAccessibility$app_productionGoogleRelease().init(this.$context);
         this.this$0.getGatewaySocket$app_productionGoogleRelease().init(this.$context, networkMonitor);
@@ -395,7 +395,7 @@ public final class StoreStream$deferredInit$1 extends o implements Function0<Uni
         StoreStream.access$initGatewaySocketListeners(this.this$0);
         StoreStream.access$dispatchSubscribe(this.this$0, d.d.a(), "streamBackgrounded", new AnonymousClass10(this.this$0));
         StoreStream storeStream10 = this.this$0;
-        Observable h = Observable.h(storeStream10.getExperiments$app_productionGoogleRelease().isInitialized().s(), this.this$0.getAuthentication$app_productionGoogleRelease().observeIsAuthed$app_productionGoogleRelease(), this.this$0.getChannelsSelected$app_productionGoogleRelease().observeInitializedForAuthedUser(), Persister.Companion.isPreloaded(), AnonymousClass11.INSTANCE);
+        Observable h = Observable.h(storeStream10.getExperiments$app_productionGoogleRelease().isInitialized().r(), this.this$0.getAuthentication$app_productionGoogleRelease().observeIsAuthed$app_productionGoogleRelease(), this.this$0.getChannelsSelected$app_productionGoogleRelease().observeInitializedForAuthedUser(), Persister.Companion.isPreloaded(), AnonymousClass11.INSTANCE);
         m.checkNotNullExpressionValue(h, "Observable\n        .comb…tedInitialized)\n        }");
         StoreStream.access$dispatchSubscribe(storeStream10, h, "streamInit", new AnonymousClass12(StoreStream.access$getInitialized$p(this.this$0)));
         AppLog.i("[StoreStream] Application stores initialized in: " + timeElapsed.getSeconds() + " seconds.");
diff --git a/app/src/main/java/com/discord/stores/StoreStream$guildStickers$1.java b/app/src/main/java/com/discord/stores/StoreStream$guildStickers$1.java
new file mode 100644
index 0000000000..8bbf6bf356
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreStream$guildStickers$1.java
@@ -0,0 +1,30 @@
+package com.discord.stores;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: StoreStream.kt */
+public final class StoreStream$guildStickers$1 extends o implements Function1<List<? extends Long>, Unit> {
+    public final /* synthetic */ StoreStream this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreStream$guildStickers$1(StoreStream storeStream) {
+        super(1);
+        this.this$0 = storeStream;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Long> list) {
+        invoke((List<Long>) list);
+        return Unit.a;
+    }
+
+    public final void invoke(List<Long> list) {
+        m.checkNotNullParameter(list, "deletedStickers");
+        this.this$0.getStickers$app_productionGoogleRelease().handleDeletedStickers(list);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$26.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$26.java
index 1a3d4d84eb..52b554b56b 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$26.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$26.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.user.User;
+import com.discord.api.thread.ThreadMemberListUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$26 extends k implements Function1<User, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$26 extends k implements Function1<ThreadMemberListUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$26(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleUserUpdated", "handleUserUpdated(Lcom/discord/api/user/User;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleThreadMemberListUpdate", "handleThreadMemberListUpdate(Lcom/discord/api/thread/ThreadMemberListUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(User user) {
-        invoke(user);
+    public /* bridge */ /* synthetic */ Unit invoke(ThreadMemberListUpdate threadMemberListUpdate) {
+        invoke(threadMemberListUpdate);
         return Unit.a;
     }
 
-    public final void invoke(User user) {
-        m.checkNotNullParameter(user, "p1");
-        StoreStream.access$handleUserUpdated((StoreStream) this.receiver, user);
+    public final void invoke(ThreadMemberListUpdate threadMemberListUpdate) {
+        m.checkNotNullParameter(threadMemberListUpdate, "p1");
+        StoreStream.access$handleThreadMemberListUpdate((StoreStream) this.receiver, threadMemberListUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$27.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$27.java
index a971d70c4f..a0a818f594 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$27.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$27.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelUserNote;
+import com.discord.api.user.User;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$27 extends k implements Function1<ModelUserNote.Update, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$27 extends k implements Function1<User, Unit> {
     public StoreStream$initGatewaySocketListeners$27(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleUserNoteUpdated", "handleUserNoteUpdated(Lcom/discord/models/domain/ModelUserNote$Update;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleUserUpdated", "handleUserUpdated(Lcom/discord/api/user/User;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelUserNote.Update update) {
-        invoke(update);
+    public /* bridge */ /* synthetic */ Unit invoke(User user) {
+        invoke(user);
         return Unit.a;
     }
 
-    public final void invoke(ModelUserNote.Update update) {
-        m.checkNotNullParameter(update, "p1");
-        StoreStream.access$handleUserNoteUpdated((StoreStream) this.receiver, update);
+    public final void invoke(User user) {
+        m.checkNotNullParameter(user, "p1");
+        StoreStream.access$handleUserUpdated((StoreStream) this.receiver, user);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$28.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$28.java
index b54c06a2c5..725b0a492c 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$28.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$28.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelUserRelationship;
+import com.discord.models.domain.ModelUserNote;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$28 extends k implements Function1<ModelUserRelationship, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$28 extends k implements Function1<ModelUserNote.Update, Unit> {
     public StoreStream$initGatewaySocketListeners$28(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleRelationshipAdd", "handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleUserNoteUpdated", "handleUserNoteUpdated(Lcom/discord/models/domain/ModelUserNote$Update;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelUserRelationship modelUserRelationship) {
-        invoke(modelUserRelationship);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelUserNote.Update update) {
+        invoke(update);
         return Unit.a;
     }
 
-    public final void invoke(ModelUserRelationship modelUserRelationship) {
-        m.checkNotNullParameter(modelUserRelationship, "p1");
-        ((StoreStream) this.receiver).handleRelationshipAdd(modelUserRelationship);
+    public final void invoke(ModelUserNote.Update update) {
+        m.checkNotNullParameter(update, "p1");
+        StoreStream.access$handleUserNoteUpdated((StoreStream) this.receiver, update);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$29.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$29.java
index add226fd59..7a68e1009d 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$29.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$29.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$29 extends k implements Function1<ModelUserRelationship, Unit> {
     public StoreStream$initGatewaySocketListeners$29(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleRelationshipRemove", "handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleRelationshipAdd", "handleRelationshipAdd(Lcom/discord/models/domain/ModelUserRelationship;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$29 ext
 
     public final void invoke(ModelUserRelationship modelUserRelationship) {
         m.checkNotNullParameter(modelUserRelationship, "p1");
-        StoreStream.access$handleRelationshipRemove((StoreStream) this.receiver, modelUserRelationship);
+        ((StoreStream) this.receiver).handleRelationshipAdd(modelUserRelationship);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java
index e5d7a6a4cd..3a42088fca 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.message.Message;
+import com.discord.models.domain.ModelUserRelationship;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$30 extends k implements Function1<Message, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$30 extends k implements Function1<ModelUserRelationship, Unit> {
     public StoreStream$initGatewaySocketListeners$30(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleMessageUpdate", "handleMessageUpdate(Lcom/discord/api/message/Message;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleRelationshipRemove", "handleRelationshipRemove(Lcom/discord/models/domain/ModelUserRelationship;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Message message) {
-        invoke(message);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelUserRelationship modelUserRelationship) {
+        invoke(modelUserRelationship);
         return Unit.a;
     }
 
-    public final void invoke(Message message) {
-        m.checkNotNullParameter(message, "p1");
-        StoreStream.access$handleMessageUpdate((StoreStream) this.receiver, message);
+    public final void invoke(ModelUserRelationship modelUserRelationship) {
+        m.checkNotNullParameter(modelUserRelationship, "p1");
+        StoreStream.access$handleRelationshipRemove((StoreStream) this.receiver, modelUserRelationship);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java
index 1cddf70ebc..a9563b26f1 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$31 extends k implements Function1<Message, Unit> {
     public StoreStream$initGatewaySocketListeners$31(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleMessageCreate", "handleMessageCreate(Lcom/discord/api/message/Message;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleMessageUpdate", "handleMessageUpdate(Lcom/discord/api/message/Message;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$31 ext
 
     public final void invoke(Message message) {
         m.checkNotNullParameter(message, "p1");
-        StoreStream.access$handleMessageCreate((StoreStream) this.receiver, message);
+        StoreStream.access$handleMessageUpdate((StoreStream) this.receiver, message);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$32.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$32.java
index c12b2ae6be..267b81784e 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$32.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$32.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.message.reaction.MessageReactionUpdate;
+import com.discord.api.message.Message;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$32 extends k implements Function1<MessageReactionUpdate, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$32 extends k implements Function1<Message, Unit> {
     public StoreStream$initGatewaySocketListeners$32(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleReactionAdd", "handleReactionAdd(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleMessageCreate", "handleMessageCreate(Lcom/discord/api/message/Message;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(MessageReactionUpdate messageReactionUpdate) {
-        invoke(messageReactionUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(Message message) {
+        invoke(message);
         return Unit.a;
     }
 
-    public final void invoke(MessageReactionUpdate messageReactionUpdate) {
-        m.checkNotNullParameter(messageReactionUpdate, "p1");
-        StoreStream.access$handleReactionAdd((StoreStream) this.receiver, messageReactionUpdate);
+    public final void invoke(Message message) {
+        m.checkNotNullParameter(message, "p1");
+        StoreStream.access$handleMessageCreate((StoreStream) this.receiver, message);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$33.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$33.java
index 5f4f8f1e25..20e09bf86d 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$33.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$33.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$33 extends k implements Function1<MessageReactionUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$33(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleReactionRemove", "handleReactionRemove(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleReactionAdd", "handleReactionAdd(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$33 ext
 
     public final void invoke(MessageReactionUpdate messageReactionUpdate) {
         m.checkNotNullParameter(messageReactionUpdate, "p1");
-        StoreStream.access$handleReactionRemove((StoreStream) this.receiver, messageReactionUpdate);
+        StoreStream.access$handleReactionAdd((StoreStream) this.receiver, messageReactionUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$34.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$34.java
index 86d886e2e6..e4c645fcd1 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$34.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$34.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$34 extends k implements Function1<MessageReactionUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$34(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleReactionRemoveEmoji", "handleReactionRemoveEmoji(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleReactionRemove", "handleReactionRemove(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$34 ext
 
     public final void invoke(MessageReactionUpdate messageReactionUpdate) {
         m.checkNotNullParameter(messageReactionUpdate, "p1");
-        StoreStream.access$handleReactionRemoveEmoji((StoreStream) this.receiver, messageReactionUpdate);
+        StoreStream.access$handleReactionRemove((StoreStream) this.receiver, messageReactionUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$35.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$35.java
index 746f226711..cf74a3dfb7 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$35.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$35.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$35 extends k implements Function1<MessageReactionUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$35(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleReactionRemoveAll", "handleReactionRemoveAll(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleReactionRemoveEmoji", "handleReactionRemoveEmoji(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$35 ext
 
     public final void invoke(MessageReactionUpdate messageReactionUpdate) {
         m.checkNotNullParameter(messageReactionUpdate, "p1");
-        StoreStream.access$handleReactionRemoveAll((StoreStream) this.receiver, messageReactionUpdate);
+        StoreStream.access$handleReactionRemoveEmoji((StoreStream) this.receiver, messageReactionUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$36.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$36.java
index 85ef4f1695..b70d24417b 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$36.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$36.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelMessageDelete;
+import com.discord.api.message.reaction.MessageReactionUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$36 extends k implements Function1<ModelMessageDelete, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$36 extends k implements Function1<MessageReactionUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$36(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleMessageDelete", "handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleReactionRemoveAll", "handleReactionRemoveAll(Lcom/discord/api/message/reaction/MessageReactionUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelMessageDelete modelMessageDelete) {
-        invoke(modelMessageDelete);
+    public /* bridge */ /* synthetic */ Unit invoke(MessageReactionUpdate messageReactionUpdate) {
+        invoke(messageReactionUpdate);
         return Unit.a;
     }
 
-    public final void invoke(ModelMessageDelete modelMessageDelete) {
-        m.checkNotNullParameter(modelMessageDelete, "p1");
-        StoreStream.access$handleMessageDelete((StoreStream) this.receiver, modelMessageDelete);
+    public final void invoke(MessageReactionUpdate messageReactionUpdate) {
+        m.checkNotNullParameter(messageReactionUpdate, "p1");
+        StoreStream.access$handleReactionRemoveAll((StoreStream) this.receiver, messageReactionUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$37.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$37.java
index 6ddfdc94f1..42f034cc7f 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$37.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$37.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelReadState;
+import com.discord.models.domain.ModelMessageDelete;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$37 extends k implements Function1<ModelReadState, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$37 extends k implements Function1<ModelMessageDelete, Unit> {
     public StoreStream$initGatewaySocketListeners$37(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleMessageAck", "handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleMessageDelete", "handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelReadState modelReadState) {
-        invoke(modelReadState);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelMessageDelete modelMessageDelete) {
+        invoke(modelMessageDelete);
         return Unit.a;
     }
 
-    public final void invoke(ModelReadState modelReadState) {
-        m.checkNotNullParameter(modelReadState, "p1");
-        StoreStream.access$handleMessageAck((StoreStream) this.receiver, modelReadState);
+    public final void invoke(ModelMessageDelete modelMessageDelete) {
+        m.checkNotNullParameter(modelMessageDelete, "p1");
+        StoreStream.access$handleMessageDelete((StoreStream) this.receiver, modelMessageDelete);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$38.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$38.java
index db74b43f33..504269f677 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$38.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$38.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.voice.state.VoiceState;
+import com.discord.models.domain.ModelReadState;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$38 extends k implements Function1<VoiceState, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$38 extends k implements Function1<ModelReadState, Unit> {
     public StoreStream$initGatewaySocketListeners$38(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleVoiceStateUpdate", "handleVoiceStateUpdate(Lcom/discord/api/voice/state/VoiceState;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleMessageAck", "handleMessageAck(Lcom/discord/models/domain/ModelReadState;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(VoiceState voiceState) {
-        invoke(voiceState);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelReadState modelReadState) {
+        invoke(modelReadState);
         return Unit.a;
     }
 
-    public final void invoke(VoiceState voiceState) {
-        m.checkNotNullParameter(voiceState, "p1");
-        StoreStream.access$handleVoiceStateUpdate((StoreStream) this.receiver, voiceState);
+    public final void invoke(ModelReadState modelReadState) {
+        m.checkNotNullParameter(modelReadState, "p1");
+        StoreStream.access$handleMessageAck((StoreStream) this.receiver, modelReadState);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$39.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$39.java
index 48a0c7606c..990dcb6174 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$39.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$39.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.voice.server.VoiceServer;
+import com.discord.api.voice.state.VoiceState;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$39 extends k implements Function1<VoiceServer, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$39 extends k implements Function1<VoiceState, Unit> {
     public StoreStream$initGatewaySocketListeners$39(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleVoiceServerUpdate", "handleVoiceServerUpdate(Lcom/discord/api/voice/server/VoiceServer;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleVoiceStateUpdate", "handleVoiceStateUpdate(Lcom/discord/api/voice/state/VoiceState;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(VoiceServer voiceServer) {
-        invoke(voiceServer);
+    public /* bridge */ /* synthetic */ Unit invoke(VoiceState voiceState) {
+        invoke(voiceState);
         return Unit.a;
     }
 
-    public final void invoke(VoiceServer voiceServer) {
-        m.checkNotNullParameter(voiceServer, "p1");
-        StoreStream.access$handleVoiceServerUpdate((StoreStream) this.receiver, voiceServer);
+    public final void invoke(VoiceState voiceState) {
+        m.checkNotNullParameter(voiceState, "p1");
+        StoreStream.access$handleVoiceStateUpdate((StoreStream) this.receiver, voiceState);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$40.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$40.java
index 0614991c1a..9bcae772ec 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$40.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$40.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelNotificationSettings;
+import com.discord.api.voice.server.VoiceServer;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$40 extends k implements Function1<ModelNotificationSettings, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$40 extends k implements Function1<VoiceServer, Unit> {
     public StoreStream$initGatewaySocketListeners$40(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleGuildSettingUpdated", "handleGuildSettingUpdated(Lcom/discord/models/domain/ModelNotificationSettings;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleVoiceServerUpdate", "handleVoiceServerUpdate(Lcom/discord/api/voice/server/VoiceServer;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelNotificationSettings modelNotificationSettings) {
-        invoke(modelNotificationSettings);
+    public /* bridge */ /* synthetic */ Unit invoke(VoiceServer voiceServer) {
+        invoke(voiceServer);
         return Unit.a;
     }
 
-    public final void invoke(ModelNotificationSettings modelNotificationSettings) {
-        m.checkNotNullParameter(modelNotificationSettings, "p1");
-        StoreStream.access$handleGuildSettingUpdated((StoreStream) this.receiver, modelNotificationSettings);
+    public final void invoke(VoiceServer voiceServer) {
+        m.checkNotNullParameter(voiceServer, "p1");
+        StoreStream.access$handleVoiceServerUpdate((StoreStream) this.receiver, voiceServer);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$41.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$41.java
index 592052bde8..2e331007ab 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$41.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$41.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelUserSettings;
+import com.discord.models.domain.ModelNotificationSettings;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$41 extends k implements Function1<ModelUserSettings, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$41 extends k implements Function1<ModelNotificationSettings, Unit> {
     public StoreStream$initGatewaySocketListeners$41(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleUserSettingsUpdate", "handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleGuildSettingUpdated", "handleGuildSettingUpdated(Lcom/discord/models/domain/ModelNotificationSettings;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelUserSettings modelUserSettings) {
-        invoke(modelUserSettings);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelNotificationSettings modelNotificationSettings) {
+        invoke(modelNotificationSettings);
         return Unit.a;
     }
 
-    public final void invoke(ModelUserSettings modelUserSettings) {
-        m.checkNotNullParameter(modelUserSettings, "p1");
-        StoreStream.access$handleUserSettingsUpdate((StoreStream) this.receiver, modelUserSettings);
+    public final void invoke(ModelNotificationSettings modelNotificationSettings) {
+        m.checkNotNullParameter(modelNotificationSettings, "p1");
+        StoreStream.access$handleGuildSettingUpdated((StoreStream) this.receiver, modelNotificationSettings);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$42.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$42.java
index 13bc8cc924..dfe090b60b 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$42.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$42.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.user.TypingUser;
+import com.discord.models.domain.ModelUserSettings;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$42 extends k implements Function1<TypingUser, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$42 extends k implements Function1<ModelUserSettings, Unit> {
     public StoreStream$initGatewaySocketListeners$42(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleTypingStart", "handleTypingStart(Lcom/discord/api/user/TypingUser;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleUserSettingsUpdate", "handleUserSettingsUpdate(Lcom/discord/models/domain/ModelUserSettings;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(TypingUser typingUser) {
-        invoke(typingUser);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelUserSettings modelUserSettings) {
+        invoke(modelUserSettings);
         return Unit.a;
     }
 
-    public final void invoke(TypingUser typingUser) {
-        m.checkNotNullParameter(typingUser, "p1");
-        StoreStream.access$handleTypingStart((StoreStream) this.receiver, typingUser);
+    public final void invoke(ModelUserSettings modelUserSettings) {
+        m.checkNotNullParameter(modelUserSettings, "p1");
+        StoreStream.access$handleUserSettingsUpdate((StoreStream) this.receiver, modelUserSettings);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$43.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$43.java
index 273236a9b5..add79301cb 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$43.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$43.java
@@ -1,33 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.presence.Presence;
+import com.discord.api.user.TypingUser;
+import d0.z.d.k;
 import d0.z.d.m;
-import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final class StoreStream$initGatewaySocketListeners$43 extends o implements Function1<Presence, Unit> {
-    public final /* synthetic */ StoreStream this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$43 extends k implements Function1<TypingUser, Unit> {
     public StoreStream$initGatewaySocketListeners$43(StoreStream storeStream) {
-        super(1);
-        this.this$0 = storeStream;
+        super(1, storeStream, StoreStream.class, "handleTypingStart", "handleTypingStart(Lcom/discord/api/user/TypingUser;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Presence presence) {
-        invoke(presence);
+    public /* bridge */ /* synthetic */ Unit invoke(TypingUser typingUser) {
+        invoke(typingUser);
         return Unit.a;
     }
 
-    public final void invoke(Presence presence) {
-        StoreStream storeStream = this.this$0;
-        Long d = presence.d();
-        long longValue = d != null ? d.longValue() : 0;
-        m.checkNotNullExpressionValue(presence, "it");
-        StoreStream.access$handlePresenceUpdate(storeStream, longValue, presence);
+    public final void invoke(TypingUser typingUser) {
+        m.checkNotNullParameter(typingUser, "p1");
+        StoreStream.access$handleTypingStart((StoreStream) this.receiver, typingUser);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$44.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$44.java
index 68fe261d9d..1b5826ca66 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$44.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$44.java
@@ -1,27 +1,33 @@
 package com.discord.stores;
 
 import com.discord.api.presence.Presence;
-import d0.z.d.k;
 import d0.z.d.m;
-import java.util.List;
+import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$44 extends k implements Function1<List<? extends Presence>, Unit> {
+public final class StoreStream$initGatewaySocketListeners$44 extends o implements Function1<Presence, Unit> {
+    public final /* synthetic */ StoreStream this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StoreStream$initGatewaySocketListeners$44(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handlePresenceReplace", "handlePresenceReplace(Ljava/util/List;)V", 0);
+        super(1);
+        this.this$0 = storeStream;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Presence> list) {
-        invoke((List<Presence>) list);
+    public /* bridge */ /* synthetic */ Unit invoke(Presence presence) {
+        invoke(presence);
         return Unit.a;
     }
 
-    public final void invoke(List<Presence> list) {
-        m.checkNotNullParameter(list, "p1");
-        StoreStream.access$handlePresenceReplace((StoreStream) this.receiver, list);
+    public final void invoke(Presence presence) {
+        StoreStream storeStream = this.this$0;
+        Long d = presence.d();
+        long longValue = d != null ? d.longValue() : 0;
+        m.checkNotNullExpressionValue(presence, "it");
+        StoreStream.access$handlePresenceUpdate(storeStream, longValue, presence);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$45.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$45.java
index 6d6bdb100a..97e1a8fafd 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$45.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$45.java
@@ -1,26 +1,27 @@
 package com.discord.stores;
 
-import com.discord.api.channel.ChannelRecipient;
+import com.discord.api.presence.Presence;
 import d0.z.d.k;
 import d0.z.d.m;
+import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$45 extends k implements Function1<ChannelRecipient, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$45 extends k implements Function1<List<? extends Presence>, Unit> {
     public StoreStream$initGatewaySocketListeners$45(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleGroupDMRecipientAdd", "handleGroupDMRecipientAdd(Lcom/discord/api/channel/ChannelRecipient;)V", 0);
+        super(1, storeStream, StoreStream.class, "handlePresenceReplace", "handlePresenceReplace(Ljava/util/List;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ChannelRecipient channelRecipient) {
-        invoke(channelRecipient);
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Presence> list) {
+        invoke((List<Presence>) list);
         return Unit.a;
     }
 
-    public final void invoke(ChannelRecipient channelRecipient) {
-        m.checkNotNullParameter(channelRecipient, "p1");
-        StoreStream.access$handleGroupDMRecipientAdd((StoreStream) this.receiver, channelRecipient);
+    public final void invoke(List<Presence> list) {
+        m.checkNotNullParameter(list, "p1");
+        StoreStream.access$handlePresenceReplace((StoreStream) this.receiver, list);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$46.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$46.java
index 46583ec5f3..e77b6adabf 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$46.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$46.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$46 extends k implements Function1<ChannelRecipient, Unit> {
     public StoreStream$initGatewaySocketListeners$46(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleGroupDMRecipientRemove", "handleGroupDMRecipientRemove(Lcom/discord/api/channel/ChannelRecipient;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleGroupDMRecipientAdd", "handleGroupDMRecipientAdd(Lcom/discord/api/channel/ChannelRecipient;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$46 ext
 
     public final void invoke(ChannelRecipient channelRecipient) {
         m.checkNotNullParameter(channelRecipient, "p1");
-        StoreStream.access$handleGroupDMRecipientRemove((StoreStream) this.receiver, channelRecipient);
+        StoreStream.access$handleGroupDMRecipientAdd((StoreStream) this.receiver, channelRecipient);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$47.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$47.java
index f48d7904f4..98f4bebae9 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$47.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$47.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelCall;
+import com.discord.api.channel.ChannelRecipient;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$47 extends k implements Function1<ModelCall, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$47 extends k implements Function1<ChannelRecipient, Unit> {
     public StoreStream$initGatewaySocketListeners$47(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleCallDelete", "handleCallDelete(Lcom/discord/models/domain/ModelCall;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleGroupDMRecipientRemove", "handleGroupDMRecipientRemove(Lcom/discord/api/channel/ChannelRecipient;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelCall modelCall) {
-        invoke(modelCall);
+    public /* bridge */ /* synthetic */ Unit invoke(ChannelRecipient channelRecipient) {
+        invoke(channelRecipient);
         return Unit.a;
     }
 
-    public final void invoke(ModelCall modelCall) {
-        m.checkNotNullParameter(modelCall, "p1");
-        StoreStream.access$handleCallDelete((StoreStream) this.receiver, modelCall);
+    public final void invoke(ChannelRecipient channelRecipient) {
+        m.checkNotNullParameter(channelRecipient, "p1");
+        StoreStream.access$handleGroupDMRecipientRemove((StoreStream) this.receiver, channelRecipient);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$48.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$48.java
index 7c4c821f36..1ea7e63e8a 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$48.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$48.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$48 extends k implements Function1<ModelCall, Unit> {
     public StoreStream$initGatewaySocketListeners$48(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleCallCreateOrUpdate", "handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleCallDelete", "handleCallDelete(Lcom/discord/models/domain/ModelCall;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$48 ext
 
     public final void invoke(ModelCall modelCall) {
         m.checkNotNullParameter(modelCall, "p1");
-        StoreStream.access$handleCallCreateOrUpdate((StoreStream) this.receiver, modelCall);
+        StoreStream.access$handleCallDelete((StoreStream) this.receiver, modelCall);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$49.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$49.java
index b8327bc699..49bec11fb2 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$49.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$49.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.emoji.GuildEmojisUpdate;
+import com.discord.models.domain.ModelCall;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$49 extends k implements Function1<GuildEmojisUpdate, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$49 extends k implements Function1<ModelCall, Unit> {
     public StoreStream$initGatewaySocketListeners$49(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleEmojiUpdate", "handleEmojiUpdate(Lcom/discord/api/emoji/GuildEmojisUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleCallCreateOrUpdate", "handleCallCreateOrUpdate(Lcom/discord/models/domain/ModelCall;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(GuildEmojisUpdate guildEmojisUpdate) {
-        invoke(guildEmojisUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelCall modelCall) {
+        invoke(modelCall);
         return Unit.a;
     }
 
-    public final void invoke(GuildEmojisUpdate guildEmojisUpdate) {
-        m.checkNotNullParameter(guildEmojisUpdate, "p1");
-        StoreStream.access$handleEmojiUpdate((StoreStream) this.receiver, guildEmojisUpdate);
+    public final void invoke(ModelCall modelCall) {
+        m.checkNotNullParameter(modelCall, "p1");
+        StoreStream.access$handleCallCreateOrUpdate((StoreStream) this.receiver, modelCall);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$50.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$50.java
index 8a4f07ae4a..f846ddd241 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$50.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$50.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.sticker.GuildStickerUpdate;
+import com.discord.api.emoji.GuildEmojisUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$50 extends k implements Function1<GuildStickerUpdate, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$50 extends k implements Function1<GuildEmojisUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$50(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStickersUpdate", "handleStickersUpdate(Lcom/discord/api/sticker/GuildStickerUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleEmojiUpdate", "handleEmojiUpdate(Lcom/discord/api/emoji/GuildEmojisUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(GuildStickerUpdate guildStickerUpdate) {
-        invoke(guildStickerUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(GuildEmojisUpdate guildEmojisUpdate) {
+        invoke(guildEmojisUpdate);
         return Unit.a;
     }
 
-    public final void invoke(GuildStickerUpdate guildStickerUpdate) {
-        m.checkNotNullParameter(guildStickerUpdate, "p1");
-        StoreStream.access$handleStickersUpdate((StoreStream) this.receiver, guildStickerUpdate);
+    public final void invoke(GuildEmojisUpdate guildEmojisUpdate) {
+        m.checkNotNullParameter(guildEmojisUpdate, "p1");
+        StoreStream.access$handleEmojiUpdate((StoreStream) this.receiver, guildEmojisUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$51.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$51.java
index b7eedbd71b..099d2c2af8 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$51.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$51.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.requiredaction.UserRequiredActionUpdate;
+import com.discord.api.sticker.GuildStickersUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$51 extends k implements Function1<UserRequiredActionUpdate, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$51 extends k implements Function1<GuildStickersUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$51(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleRequiredActionUpdate", "handleRequiredActionUpdate(Lcom/discord/api/requiredaction/UserRequiredActionUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleStickersUpdate", "handleStickersUpdate(Lcom/discord/api/sticker/GuildStickersUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(UserRequiredActionUpdate userRequiredActionUpdate) {
-        invoke(userRequiredActionUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(GuildStickersUpdate guildStickersUpdate) {
+        invoke(guildStickersUpdate);
         return Unit.a;
     }
 
-    public final void invoke(UserRequiredActionUpdate userRequiredActionUpdate) {
-        m.checkNotNullParameter(userRequiredActionUpdate, "p1");
-        StoreStream.access$handleRequiredActionUpdate((StoreStream) this.receiver, userRequiredActionUpdate);
+    public final void invoke(GuildStickersUpdate guildStickersUpdate) {
+        m.checkNotNullParameter(guildStickersUpdate, "p1");
+        StoreStream.access$handleStickersUpdate((StoreStream) this.receiver, guildStickersUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$52.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$52.java
index 9c106bb4b3..079c2a2b26 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$52.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$52.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelGuildMemberListUpdate;
+import com.discord.api.requiredaction.UserRequiredActionUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$52 extends k implements Function1<ModelGuildMemberListUpdate, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$52 extends k implements Function1<UserRequiredActionUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$52(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleGuildMemberListUpdate", "handleGuildMemberListUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleRequiredActionUpdate", "handleRequiredActionUpdate(Lcom/discord/api/requiredaction/UserRequiredActionUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(ModelGuildMemberListUpdate modelGuildMemberListUpdate) {
-        invoke(modelGuildMemberListUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(UserRequiredActionUpdate userRequiredActionUpdate) {
+        invoke(userRequiredActionUpdate);
         return Unit.a;
     }
 
-    public final void invoke(ModelGuildMemberListUpdate modelGuildMemberListUpdate) {
-        m.checkNotNullParameter(modelGuildMemberListUpdate, "p1");
-        StoreStream.access$handleGuildMemberListUpdate((StoreStream) this.receiver, modelGuildMemberListUpdate);
+    public final void invoke(UserRequiredActionUpdate userRequiredActionUpdate) {
+        m.checkNotNullParameter(userRequiredActionUpdate, "p1");
+        StoreStream.access$handleRequiredActionUpdate((StoreStream) this.receiver, userRequiredActionUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$53.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$53.java
index c13948d67f..dd49d5493a 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$53.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$53.java
@@ -1,27 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.ModelSession;
+import com.discord.models.domain.ModelGuildMemberListUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
-import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$53 extends k implements Function1<List<? extends ModelSession>, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$53 extends k implements Function1<ModelGuildMemberListUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$53(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleSessionsReplace", "handleSessionsReplace(Ljava/util/List;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleGuildMemberListUpdate", "handleGuildMemberListUpdate(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(List<? extends ModelSession> list) {
-        invoke(list);
+    public /* bridge */ /* synthetic */ Unit invoke(ModelGuildMemberListUpdate modelGuildMemberListUpdate) {
+        invoke(modelGuildMemberListUpdate);
         return Unit.a;
     }
 
-    public final void invoke(List<? extends ModelSession> list) {
-        m.checkNotNullParameter(list, "p1");
-        StoreStream.access$handleSessionsReplace((StoreStream) this.receiver, list);
+    public final void invoke(ModelGuildMemberListUpdate modelGuildMemberListUpdate) {
+        m.checkNotNullParameter(modelGuildMemberListUpdate, "p1");
+        StoreStream.access$handleGuildMemberListUpdate((StoreStream) this.receiver, modelGuildMemberListUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$54.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$54.java
index 5a1db47fe4..42825aaf42 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$54.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$54.java
@@ -1,27 +1,27 @@
 package com.discord.stores;
 
-import d0.z.d.o;
+import com.discord.models.domain.ModelSession;
+import d0.z.d.k;
+import d0.z.d.m;
+import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final class StoreStream$initGatewaySocketListeners$54 extends o implements Function1<Unit, Unit> {
-    public final /* synthetic */ StoreStream this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$54 extends k implements Function1<List<? extends ModelSession>, Unit> {
     public StoreStream$initGatewaySocketListeners$54(StoreStream storeStream) {
-        super(1);
-        this.this$0 = storeStream;
+        super(1, storeStream, StoreStream.class, "handleSessionsReplace", "handleSessionsReplace(Ljava/util/List;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Unit unit) {
-        invoke(unit);
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends ModelSession> list) {
+        invoke(list);
         return Unit.a;
     }
 
-    public final void invoke(Unit unit) {
-        StoreStream.access$handleUserPaymentSourcesUpdate(this.this$0);
+    public final void invoke(List<? extends ModelSession> list) {
+        m.checkNotNullParameter(list, "p1");
+        StoreStream.access$handleSessionsReplace((StoreStream) this.receiver, list);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$55.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$55.java
index de2f4e268b..69a9c70c95 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$55.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$55.java
@@ -22,6 +22,6 @@ public final class StoreStream$initGatewaySocketListeners$55 extends o implement
     }
 
     public final void invoke(Unit unit) {
-        StoreStream.access$handleUserSubscriptionsUpdate(this.this$0);
+        StoreStream.access$handleUserPaymentSourcesUpdate(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$56.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$56.java
index 6c5676677f..b1e32ceca0 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$56.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$56.java
@@ -1,26 +1,27 @@
 package com.discord.stores;
 
-import com.discord.models.domain.StreamCreateOrUpdate;
-import d0.z.d.k;
-import d0.z.d.m;
+import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$56 extends k implements Function1<StreamCreateOrUpdate, Unit> {
+public final class StoreStream$initGatewaySocketListeners$56 extends o implements Function1<Unit, Unit> {
+    public final /* synthetic */ StoreStream this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StoreStream$initGatewaySocketListeners$56(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStreamCreate", "handleStreamCreate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V", 0);
+        super(1);
+        this.this$0 = storeStream;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(StreamCreateOrUpdate streamCreateOrUpdate) {
-        invoke(streamCreateOrUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(Unit unit) {
+        invoke(unit);
         return Unit.a;
     }
 
-    public final void invoke(StreamCreateOrUpdate streamCreateOrUpdate) {
-        m.checkNotNullParameter(streamCreateOrUpdate, "p1");
-        StoreStream.access$handleStreamCreate((StoreStream) this.receiver, streamCreateOrUpdate);
+    public final void invoke(Unit unit) {
+        StoreStream.access$handleUserSubscriptionsUpdate(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$57.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$57.java
index 3b7df5ded5..8b86f7a505 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$57.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$57.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$57 extends k implements Function1<StreamCreateOrUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$57(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStreamUpdate", "handleStreamUpdate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleStreamCreate", "handleStreamCreate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$57 ext
 
     public final void invoke(StreamCreateOrUpdate streamCreateOrUpdate) {
         m.checkNotNullParameter(streamCreateOrUpdate, "p1");
-        StoreStream.access$handleStreamUpdate((StoreStream) this.receiver, streamCreateOrUpdate);
+        StoreStream.access$handleStreamCreate((StoreStream) this.receiver, streamCreateOrUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$58.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$58.java
index 8c5cdc81bf..d2338a9ae7 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$58.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$58.java
@@ -1,31 +1,26 @@
 package com.discord.stores;
 
-import com.discord.models.domain.StreamDelete;
+import com.discord.models.domain.StreamCreateOrUpdate;
+import d0.z.d.k;
 import d0.z.d.m;
-import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final class StoreStream$initGatewaySocketListeners$58 extends o implements Function1<StreamDelete, Unit> {
-    public final /* synthetic */ StoreStream this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$58 extends k implements Function1<StreamCreateOrUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$58(StoreStream storeStream) {
-        super(1);
-        this.this$0 = storeStream;
+        super(1, storeStream, StoreStream.class, "handleStreamUpdate", "handleStreamUpdate(Lcom/discord/models/domain/StreamCreateOrUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(StreamDelete streamDelete) {
-        invoke(streamDelete);
+    public /* bridge */ /* synthetic */ Unit invoke(StreamCreateOrUpdate streamCreateOrUpdate) {
+        invoke(streamCreateOrUpdate);
         return Unit.a;
     }
 
-    public final void invoke(StreamDelete streamDelete) {
-        StoreStream storeStream = this.this$0;
-        m.checkNotNullExpressionValue(streamDelete, "it");
-        storeStream.handleStreamDelete(streamDelete, false);
+    public final void invoke(StreamCreateOrUpdate streamCreateOrUpdate) {
+        m.checkNotNullParameter(streamCreateOrUpdate, "p1");
+        StoreStream.access$handleStreamUpdate((StoreStream) this.receiver, streamCreateOrUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$59.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$59.java
index 19fa5bd88b..ee44fd490e 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$59.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$59.java
@@ -1,26 +1,31 @@
 package com.discord.stores;
 
-import com.discord.models.domain.StreamServerUpdate;
-import d0.z.d.k;
+import com.discord.models.domain.StreamDelete;
 import d0.z.d.m;
+import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$59 extends k implements Function1<StreamServerUpdate, Unit> {
+public final class StoreStream$initGatewaySocketListeners$59 extends o implements Function1<StreamDelete, Unit> {
+    public final /* synthetic */ StoreStream this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StoreStream$initGatewaySocketListeners$59(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStreamServerUpdate", "handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V", 0);
+        super(1);
+        this.this$0 = storeStream;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(StreamServerUpdate streamServerUpdate) {
-        invoke(streamServerUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(StreamDelete streamDelete) {
+        invoke(streamDelete);
         return Unit.a;
     }
 
-    public final void invoke(StreamServerUpdate streamServerUpdate) {
-        m.checkNotNullParameter(streamServerUpdate, "p1");
-        StoreStream.access$handleStreamServerUpdate((StoreStream) this.receiver, streamServerUpdate);
+    public final void invoke(StreamDelete streamDelete) {
+        StoreStream storeStream = this.this$0;
+        m.checkNotNullExpressionValue(streamDelete, "it");
+        storeStream.handleStreamDelete(streamDelete, false);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$60.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$60.java
index 6eed0fa610..16f0115c0d 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$60.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$60.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.interaction.InteractionStateUpdate;
+import com.discord.models.domain.StreamServerUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$60 extends k implements Function1<InteractionStateUpdate, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$60 extends k implements Function1<StreamServerUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$60(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleInteractionCreate", "handleInteractionCreate(Lcom/discord/api/interaction/InteractionStateUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleStreamServerUpdate", "handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(InteractionStateUpdate interactionStateUpdate) {
-        invoke(interactionStateUpdate);
+    public /* bridge */ /* synthetic */ Unit invoke(StreamServerUpdate streamServerUpdate) {
+        invoke(streamServerUpdate);
         return Unit.a;
     }
 
-    public final void invoke(InteractionStateUpdate interactionStateUpdate) {
-        m.checkNotNullParameter(interactionStateUpdate, "p1");
-        StoreStream.access$handleInteractionCreate((StoreStream) this.receiver, interactionStateUpdate);
+    public final void invoke(StreamServerUpdate streamServerUpdate) {
+        m.checkNotNullParameter(streamServerUpdate, "p1");
+        StoreStream.access$handleStreamServerUpdate((StoreStream) this.receiver, streamServerUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$61.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$61.java
index a2d3c70b28..8c79a66b63 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$61.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$61.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$61 extends k implements Function1<InteractionStateUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$61(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleInteractionSuccess", "handleInteractionSuccess(Lcom/discord/api/interaction/InteractionStateUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleInteractionCreate", "handleInteractionCreate(Lcom/discord/api/interaction/InteractionStateUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$61 ext
 
     public final void invoke(InteractionStateUpdate interactionStateUpdate) {
         m.checkNotNullParameter(interactionStateUpdate, "p1");
-        StoreStream.access$handleInteractionSuccess((StoreStream) this.receiver, interactionStateUpdate);
+        StoreStream.access$handleInteractionCreate((StoreStream) this.receiver, interactionStateUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$62.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$62.java
index 10738425c2..5db2812ff1 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$62.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$62.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$62 extends k implements Function1<InteractionStateUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$62(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleInteractionFailure", "handleInteractionFailure(Lcom/discord/api/interaction/InteractionStateUpdate;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleInteractionSuccess", "handleInteractionSuccess(Lcom/discord/api/interaction/InteractionStateUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$62 ext
 
     public final void invoke(InteractionStateUpdate interactionStateUpdate) {
         m.checkNotNullParameter(interactionStateUpdate, "p1");
-        ((StoreStream) this.receiver).handleInteractionFailure(interactionStateUpdate);
+        StoreStream.access$handleInteractionSuccess((StoreStream) this.receiver, interactionStateUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$63.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$63.java
index 79fa3c861d..65cda7c204 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$63.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$63.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.stageinstance.StageInstance;
+import com.discord.api.interaction.InteractionStateUpdate;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$63 extends k implements Function1<StageInstance, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$63 extends k implements Function1<InteractionStateUpdate, Unit> {
     public StoreStream$initGatewaySocketListeners$63(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStageInstanceCreate", "handleStageInstanceCreate(Lcom/discord/api/stageinstance/StageInstance;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleInteractionFailure", "handleInteractionFailure(Lcom/discord/api/interaction/InteractionStateUpdate;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(StageInstance stageInstance) {
-        invoke(stageInstance);
+    public /* bridge */ /* synthetic */ Unit invoke(InteractionStateUpdate interactionStateUpdate) {
+        invoke(interactionStateUpdate);
         return Unit.a;
     }
 
-    public final void invoke(StageInstance stageInstance) {
-        m.checkNotNullParameter(stageInstance, "p1");
-        ((StoreStream) this.receiver).handleStageInstanceCreate(stageInstance);
+    public final void invoke(InteractionStateUpdate interactionStateUpdate) {
+        m.checkNotNullParameter(interactionStateUpdate, "p1");
+        ((StoreStream) this.receiver).handleInteractionFailure(interactionStateUpdate);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$64.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$64.java
index d584c00e01..7d4f617c66 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$64.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$64.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$64 extends k implements Function1<StageInstance, Unit> {
     public StoreStream$initGatewaySocketListeners$64(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStageInstanceUpdate", "handleStageInstanceUpdate(Lcom/discord/api/stageinstance/StageInstance;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleStageInstanceCreate", "handleStageInstanceCreate(Lcom/discord/api/stageinstance/StageInstance;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$64 ext
 
     public final void invoke(StageInstance stageInstance) {
         m.checkNotNullParameter(stageInstance, "p1");
-        ((StoreStream) this.receiver).handleStageInstanceUpdate(stageInstance);
+        ((StoreStream) this.receiver).handleStageInstanceCreate(stageInstance);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$65.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$65.java
index 3e33769d18..0fce3c3d99 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$65.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$65.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
 public final /* synthetic */ class StoreStream$initGatewaySocketListeners$65 extends k implements Function1<StageInstance, Unit> {
     public StoreStream$initGatewaySocketListeners$65(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleStageInstanceDelete", "handleStageInstanceDelete(Lcom/discord/api/stageinstance/StageInstance;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleStageInstanceUpdate", "handleStageInstanceUpdate(Lcom/discord/api/stageinstance/StageInstance;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class StoreStream$initGatewaySocketListeners$65 ext
 
     public final void invoke(StageInstance stageInstance) {
         m.checkNotNullParameter(stageInstance, "p1");
-        ((StoreStream) this.receiver).handleStageInstanceDelete(stageInstance);
+        ((StoreStream) this.receiver).handleStageInstanceUpdate(stageInstance);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$66.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$66.java
index 1856b5825b..4b41825765 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$66.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$66.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.friendsuggestions.FriendSuggestion;
+import com.discord.api.stageinstance.StageInstance;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$66 extends k implements Function1<FriendSuggestion, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$66 extends k implements Function1<StageInstance, Unit> {
     public StoreStream$initGatewaySocketListeners$66(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleFriendSuggestionCreate", "handleFriendSuggestionCreate(Lcom/discord/api/friendsuggestions/FriendSuggestion;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleStageInstanceDelete", "handleStageInstanceDelete(Lcom/discord/api/stageinstance/StageInstance;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(FriendSuggestion friendSuggestion) {
-        invoke(friendSuggestion);
+    public /* bridge */ /* synthetic */ Unit invoke(StageInstance stageInstance) {
+        invoke(stageInstance);
         return Unit.a;
     }
 
-    public final void invoke(FriendSuggestion friendSuggestion) {
-        m.checkNotNullParameter(friendSuggestion, "p1");
-        ((StoreStream) this.receiver).handleFriendSuggestionCreate(friendSuggestion);
+    public final void invoke(StageInstance stageInstance) {
+        m.checkNotNullParameter(stageInstance, "p1");
+        ((StoreStream) this.receiver).handleStageInstanceDelete(stageInstance);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$67.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$67.java
index 36086cdda7..98694f3802 100644
--- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$67.java
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$67.java
@@ -1,26 +1,26 @@
 package com.discord.stores;
 
-import com.discord.api.friendsuggestions.FriendSuggestionDelete;
+import com.discord.api.friendsuggestions.FriendSuggestion;
 import d0.z.d.k;
 import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: StoreStream.kt */
-public final /* synthetic */ class StoreStream$initGatewaySocketListeners$67 extends k implements Function1<FriendSuggestionDelete, Unit> {
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$67 extends k implements Function1<FriendSuggestion, Unit> {
     public StoreStream$initGatewaySocketListeners$67(StoreStream storeStream) {
-        super(1, storeStream, StoreStream.class, "handleFriendSuggestionDelete", "handleFriendSuggestionDelete(Lcom/discord/api/friendsuggestions/FriendSuggestionDelete;)V", 0);
+        super(1, storeStream, StoreStream.class, "handleFriendSuggestionCreate", "handleFriendSuggestionCreate(Lcom/discord/api/friendsuggestions/FriendSuggestion;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(FriendSuggestionDelete friendSuggestionDelete) {
-        invoke(friendSuggestionDelete);
+    public /* bridge */ /* synthetic */ Unit invoke(FriendSuggestion friendSuggestion) {
+        invoke(friendSuggestion);
         return Unit.a;
     }
 
-    public final void invoke(FriendSuggestionDelete friendSuggestionDelete) {
-        m.checkNotNullParameter(friendSuggestionDelete, "p1");
-        ((StoreStream) this.receiver).handleFriendSuggestionDelete(friendSuggestionDelete);
+    public final void invoke(FriendSuggestion friendSuggestion) {
+        m.checkNotNullParameter(friendSuggestion, "p1");
+        ((StoreStream) this.receiver).handleFriendSuggestionCreate(friendSuggestion);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$68.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$68.java
new file mode 100644
index 0000000000..7e05fe1e02
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$68.java
@@ -0,0 +1,26 @@
+package com.discord.stores;
+
+import com.discord.api.friendsuggestions.FriendSuggestionDelete;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: StoreStream.kt */
+public final /* synthetic */ class StoreStream$initGatewaySocketListeners$68 extends k implements Function1<FriendSuggestionDelete, Unit> {
+    public StoreStream$initGatewaySocketListeners$68(StoreStream storeStream) {
+        super(1, storeStream, StoreStream.class, "handleFriendSuggestionDelete", "handleFriendSuggestionDelete(Lcom/discord/api/friendsuggestions/FriendSuggestionDelete;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(FriendSuggestionDelete friendSuggestionDelete) {
+        invoke(friendSuggestionDelete);
+        return Unit.a;
+    }
+
+    public final void invoke(FriendSuggestionDelete friendSuggestionDelete) {
+        m.checkNotNullParameter(friendSuggestionDelete, "p1");
+        ((StoreStream) this.receiver).handleFriendSuggestionDelete(friendSuggestionDelete);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java
index 26f1487951..b32e3ae2eb 100644
--- a/app/src/main/java/com/discord/stores/StoreStream.java
+++ b/app/src/main/java/com/discord/stores/StoreStream.java
@@ -27,7 +27,8 @@ import com.discord.api.role.GuildRoleCreate;
 import com.discord.api.role.GuildRoleDelete;
 import com.discord.api.role.GuildRoleUpdate;
 import com.discord.api.stageinstance.StageInstance;
-import com.discord.api.sticker.GuildStickerUpdate;
+import com.discord.api.sticker.GuildStickersUpdate;
+import com.discord.api.thread.ThreadMemberListUpdate;
 import com.discord.api.thread.ThreadMemberUpdate;
 import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.TypingUser;
@@ -170,10 +171,11 @@ public final class StoreStream {
     private final StoreGuilds guilds;
     private final StoreGuildsNsfw guildsNsfw;
     private final StoreGuildsSorted guildsSorted;
-    private final BehaviorSubject<Boolean> initialized = BehaviorSubject.m0(Boolean.FALSE);
+    private final BehaviorSubject<Boolean> initialized = BehaviorSubject.l0(Boolean.FALSE);
     private final StoreInstantInvites instantInvites;
     private final StoreGuildIntegrations integrations;
     private final StoreChannelMembers lazyChannelMembersStore;
+    private final StoreThreadMembers lazyThreadMembersStore;
     private final StoreLibrary library;
     private final StoreLocalActionComponentState localActionComponentState;
     private final StoreLurking lurking;
@@ -681,6 +683,10 @@ public final class StoreStream {
             return getCollector().getThreadDraft$app_productionGoogleRelease();
         }
 
+        public final StoreThreadMembers getThreadMembers() {
+            return getCollector().getLazyThreadMembersStore$app_productionGoogleRelease();
+        }
+
         public final StoreThreadMessages getThreadMessages() {
             return getCollector().getThreadMessages$app_productionGoogleRelease();
         }
@@ -893,6 +899,7 @@ public final class StoreStream {
         StoreApplicationStreaming storeApplicationStreaming = new StoreApplicationStreaming(this, this.dispatcher, this.users, storeVoiceChannelSelected, storeRtcConnection, null, 32, null);
         this.applicationStreaming = storeApplicationStreaming;
         this.lazyChannelMembersStore = new StoreChannelMembers(ObservationDeckProvider.get(), this.dispatcher, this.guilds, this.users, new StoreStream$lazyChannelMembersStore$1(this.channels), new StoreStream$lazyChannelMembersStore$2(this.guildMemberCounts), new StoreStream$lazyChannelMembersStore$3(storeUserPresence.getPresences()), new StoreStream$lazyChannelMembersStore$4(storeApplicationStreaming));
+        this.lazyThreadMembersStore = new StoreThreadMembers(ObservationDeckProvider.get(), this.channels);
         this.guildMemberRequesterStore = new StoreGuildMemberRequester(this, this.dispatcher);
         this.reviewRequestStore = new StoreReviewRequest(this.clock, this);
         this.changeLogStore = new StoreChangeLog(this.clock, storeNotices, this.users, storeUserSettingsSystem, this.experiments, this.dispatcher);
@@ -912,7 +919,7 @@ public final class StoreStream {
         StoreStreamRtcConnection storeStreamRtcConnection = new StoreStreamRtcConnection(storeMediaEngine, this.users, this, this.dispatcher, this.clock, this.analytics, storeRtcConnection, null, null, null, 896, null);
         this.streamRtcConnection = storeStreamRtcConnection;
         this.audioManager = new StoreAudioManager(storeAudioDevices, storeRtcConnection, null, 4, null);
-        StoreAudioManagerV2 storeAudioManagerV2 = new StoreAudioManagerV2(ObservationDeckProvider.get(), this.dispatcher, null, this.voiceChannelSelected, this.channels, videoUseDetector, 4, null);
+        StoreAudioManagerV2 storeAudioManagerV2 = new StoreAudioManagerV2(ObservationDeckProvider.get(), this.dispatcher, null, this.voiceChannelSelected, this.channels, this.videoUseDetector, 4, null);
         this.audioManagerV2 = storeAudioManagerV2;
         StoreApplicationStreamPreviews storeApplicationStreamPreviews = new StoreApplicationStreamPreviews(this.dispatcher, this.clock, null, null, 12, null);
         this.applicationStreamPreviews = storeApplicationStreamPreviews;
@@ -939,7 +946,7 @@ public final class StoreStream {
         this.clientDataState = storeClientDataState;
         StoreGifPicker storeGifPicker = new StoreGifPicker(this.dispatcher, this.userSettingsSystem, null, null, 12, null);
         this.gifPicker = storeGifPicker;
-        StoreStickers storeStickers = new StoreStickers(this.dispatcher, null, null, 6, null);
+        StoreStickers storeStickers = new StoreStickers(this.dispatcher, null, null, null, 14, null);
         this.stickers = storeStickers;
         StoreGooglePlayPurchases storeGooglePlayPurchases = new StoreGooglePlayPurchases(ObservationDeckProvider.get(), this.dispatcher, companion.getApi(), this.clock, new Gson(), AnalyticsTracker.INSTANCE);
         this.googlePlayPurchases = storeGooglePlayPurchases;
@@ -985,11 +992,11 @@ public final class StoreStream {
         this.friendSuggestions = storeFriendSuggestions;
         StoreDirectories storeDirectories = new StoreDirectories(this.dispatcher, ObservationDeckProvider.get(), null, 4, null);
         this.directories = storeDirectories;
-        StoreGuildStickers storeGuildStickers = new StoreGuildStickers(this.dispatcher);
+        StoreGuildStickers storeGuildStickers = new StoreGuildStickers(this.dispatcher, null, new StoreStream$guildStickers$1(this), 2, null);
         this.guildStickers = storeGuildStickers;
         StoreOutboundPromotions storeOutboundPromotions = new StoreOutboundPromotions(this.dispatcher, null, null, false, 14, null);
         this.outboundPromotions = storeOutboundPromotions;
-        List<StoreV2> listOf = n.listOf((Object[]) new StoreV2[]{this.bans, this.users, this.guilds, this.channels, this.channelConversions, this.presences, this.permissions, this.voiceChannelSelected, this.voiceSpeaking, this.accessibility, this.callsIncoming, this.connectivity, this.connectionOpen, storeGuildWelcomeScreens, storeGuildVoiceRegions, this.videoStreams, storeClientDataState, storeGifPicker, storeStickers, this.guildMemberCounts, this.guildJoinRequests, this.experiments, this.messageReplies, storeChannelFollowerStats, storePendingReplies, storeGuildProfiles, this.application, storeApplicationCommands, this.guildSelected, this.channelsSelected, this.pinnedMessages, storeGuildMemberVerificationForm, this.userRequiredAction, this.userSurvey, storePhone, storeThreadsActive, this.threadsJoined, storeThreadsActiveJoined, storeThreadMessages, archivedThreadsStore, storeThreadDraft, storeExpressionPickerNavigation, storePremiumGuildSubscription, this.collapsedChannelCategories, this.messageUploads, storeExpressionSuggestions, this.applicationStreaming, storeApplicationInteractions, storeLocalActionComponentState, this.stageInstances, this.requestedStageChannels, storeStageChannels, storeStageChannelSelfPresence, storeAutocomplete, this.messageReactions, this.library, this.userRelationships, this.userSettingsSystem, this.tabsNavigation, this.voiceStates, this.mentions, storeUserAffinities, this.userProfile, this.audioDevices, this.userConnections, this.messagesMostRecent, this.usersTyping, this.instantInvites, this.guildSettings, this.customEmojis, storeEntitlements, storeMediaFavorites, this.subscriptions, storeGooglePlayPurchases, storeGooglePlaySkuDetails, this.guildTemplates, this.userNotes, storeMFA, this.messageAck, this.guildSubscriptions, this.lazyChannelMembersStore, this.guildEmojis, storeGuildsSorted, this.auditLog, storeExpandedGuildFolders, this.maskedLinks, storeStreamRtcConnection, this.paymentSources, storeContactSync, storeApplicationStreamPreviews, this.guildsNsfw, this.gameParty, storeFriendSuggestions, this.chat, storeAudioManagerV2, storeGuildStickers, storeOutboundPromotions, storeDirectories});
+        List<StoreV2> listOf = n.listOf((Object[]) new StoreV2[]{this.bans, this.users, this.guilds, this.channels, this.channelConversions, this.presences, this.permissions, this.voiceChannelSelected, this.voiceSpeaking, this.accessibility, this.callsIncoming, this.connectivity, this.connectionOpen, storeGuildWelcomeScreens, storeGuildVoiceRegions, this.videoStreams, storeClientDataState, storeGifPicker, storeStickers, this.guildMemberCounts, this.guildJoinRequests, this.experiments, this.messageReplies, storeChannelFollowerStats, storePendingReplies, storeGuildProfiles, this.application, storeApplicationCommands, this.guildSelected, this.channelsSelected, this.pinnedMessages, storeGuildMemberVerificationForm, this.userRequiredAction, this.userSurvey, storePhone, storeThreadsActive, this.threadsJoined, storeThreadsActiveJoined, storeThreadMessages, archivedThreadsStore, storeThreadDraft, storeExpressionPickerNavigation, storePremiumGuildSubscription, this.collapsedChannelCategories, this.messageUploads, storeExpressionSuggestions, this.applicationStreaming, storeApplicationInteractions, storeLocalActionComponentState, this.stageInstances, this.requestedStageChannels, storeStageChannels, storeStageChannelSelfPresence, storeAutocomplete, this.messageReactions, this.library, this.userRelationships, this.userSettingsSystem, this.tabsNavigation, this.voiceStates, this.mentions, storeUserAffinities, this.userProfile, this.audioDevices, this.userConnections, this.messagesMostRecent, this.usersTyping, this.instantInvites, this.guildSettings, this.customEmojis, storeEntitlements, storeMediaFavorites, this.subscriptions, storeGooglePlayPurchases, storeGooglePlaySkuDetails, this.guildTemplates, this.userNotes, storeMFA, this.messageAck, this.guildSubscriptions, this.lazyChannelMembersStore, this.lazyThreadMembersStore, this.guildEmojis, storeGuildsSorted, this.auditLog, storeExpandedGuildFolders, this.maskedLinks, storeStreamRtcConnection, this.paymentSources, storeContactSync, storeApplicationStreamPreviews, this.guildsNsfw, this.gameParty, storeFriendSuggestions, this.chat, storeAudioManagerV2, storeGuildStickers, storeOutboundPromotions, storeDirectories});
         this.storesV2 = listOf;
         StoreV2DispatchHandler storeV2DispatchHandler = new StoreV2DispatchHandler(listOf, null, 2, null);
         this.storeV2DispatchHandler = storeV2DispatchHandler;
@@ -1236,8 +1243,8 @@ public final class StoreStream {
         storeStream.handleSpeakingUsers(set);
     }
 
-    public static final /* synthetic */ void access$handleStickersUpdate(StoreStream storeStream, GuildStickerUpdate guildStickerUpdate) {
-        storeStream.handleStickersUpdate(guildStickerUpdate);
+    public static final /* synthetic */ void access$handleStickersUpdate(StoreStream storeStream, GuildStickersUpdate guildStickersUpdate) {
+        storeStream.handleStickersUpdate(guildStickersUpdate);
     }
 
     public static final /* synthetic */ void access$handleStreamCreate(StoreStream storeStream, StreamCreateOrUpdate streamCreateOrUpdate) {
@@ -1260,6 +1267,10 @@ public final class StoreStream {
         storeStream.handleThreadListSync(modelThreadListSync);
     }
 
+    public static final /* synthetic */ void access$handleThreadMemberListUpdate(StoreStream storeStream, ThreadMemberListUpdate threadMemberListUpdate) {
+        storeStream.handleThreadMemberListUpdate(threadMemberListUpdate);
+    }
+
     public static final /* synthetic */ void access$handleThreadMemberUpdate(StoreStream storeStream, ThreadMemberUpdate threadMemberUpdate) {
         storeStream.handleThreadMemberUpdate(threadMemberUpdate);
     }
@@ -1339,9 +1350,9 @@ public final class StoreStream {
     }
 
     private final <T> void dispatchSubscribe(Observable<T> observable, String str, Function1<? super T, Unit> function1) {
-        Observable<T> K = observable.K();
-        m.checkNotNullExpressionValue(K, "onBackpressureBuffer()");
-        ObservableExtensionsKt.appSubscribe$default(K, (Context) null, str, (Function1) null, new StoreStream$dispatchSubscribe$1(this, function1), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<T> J = observable.J();
+        m.checkNotNullExpressionValue(J, "onBackpressureBuffer()");
+        ObservableExtensionsKt.appSubscribe$default(J, (Context) null, str, (Function1) null, new StoreStream$dispatchSubscribe$1(this, function1), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     public static final StoreAnalytics getAnalytics() {
@@ -1644,6 +1655,10 @@ public final class StoreStream {
         return Companion.getSubscriptions();
     }
 
+    public static final StoreThreadMembers getThreadMembers() {
+        return Companion.getThreadMembers();
+    }
+
     public static final StoreThreadMessages getThreadMessages() {
         return Companion.getThreadMessages();
     }
@@ -1791,7 +1806,7 @@ public final class StoreStream {
         this.threadMessages.handleChannelDelete(channel);
         this.stageChannels.handleChannelDelete(channel);
         this.mentions.handleChannelOrThreadDelete(channel);
-        for (Channel channel2 : this.channels.getThreadsForChannelInternal$app_productionGoogleRelease(channel.g())) {
+        for (Channel channel2 : this.channels.getThreadsForChannelInternal$app_productionGoogleRelease(channel.h())) {
             handleChannelOrThreadDelete(channel2);
         }
     }
@@ -1886,6 +1901,7 @@ public final class StoreStream {
             this.friendSuggestions.handleConnectionOpen(payload);
             this.guildStickers.handleConnectionOpen(payload);
             this.outboundPromotions.handleConnectionOpen$app_productionGoogleRelease(payload);
+            this.lazyThreadMembersStore.handleConnectionOpen();
             AppLog.i("[StoreStream] Processed ready payload in " + timeElapsed.getSeconds() + " seconds");
             return;
         }
@@ -2279,9 +2295,9 @@ public final class StoreStream {
     }
 
     @StoreThread
-    private final void handleStickersUpdate(GuildStickerUpdate guildStickerUpdate) {
-        this.guildStickers.handleStickerUpdate(guildStickerUpdate);
-        this.clientDataState.handleStickersUpdate(guildStickerUpdate);
+    private final void handleStickersUpdate(GuildStickersUpdate guildStickersUpdate) {
+        this.guildStickers.handleStickerUpdate(guildStickersUpdate);
+        this.clientDataState.handleStickersUpdate(guildStickersUpdate);
     }
 
     @StoreThread
@@ -2307,6 +2323,7 @@ public final class StoreStream {
         this.threadsJoined.handleThreadDelete(channel);
         this.threadsActiveJoined.handleThreadCreateOrUpdateOrDelete(channel);
         this.threadMessages.handleThreadDelete(channel);
+        this.lazyThreadMembersStore.handleThreadDelete(channel);
     }
 
     @StoreThread
@@ -2321,6 +2338,15 @@ public final class StoreStream {
         this.threadMessages.handleThreadListSync(modelThreadListSync);
     }
 
+    @StoreThread
+    private final void handleThreadMemberListUpdate(ThreadMemberListUpdate threadMemberListUpdate) {
+        this.presences.handleThreadMemberListUpdate(threadMemberListUpdate);
+        this.users.handleThreadMemberListUpdate(threadMemberListUpdate);
+        this.guilds.handleThreadMemberListUpdate(threadMemberListUpdate);
+        this.gameParty.handleThreadMemberListUpdate(threadMemberListUpdate);
+        this.lazyThreadMembersStore.handleThreadMemberListUpdate(threadMemberListUpdate);
+    }
+
     @StoreThread
     private final void handleThreadMemberUpdate(ThreadMemberUpdate threadMemberUpdate) {
         this.threadsJoined.handleThreadMemberUpdate(threadMemberUpdate);
@@ -2334,6 +2360,11 @@ public final class StoreStream {
         this.threadsActiveJoined.handleThreadMembersUpdate(threadMembersUpdate);
         this.permissions.handleThreadMembersUpdate(threadMembersUpdate);
         this.mentions.handleThreadMembersUpdate(threadMembersUpdate);
+        this.presences.handleThreadMembersUpdate(threadMembersUpdate);
+        this.users.handleThreadMembersUpdate(threadMembersUpdate);
+        this.guilds.handleThreadMembersUpdate(threadMembersUpdate);
+        this.gameParty.handleThreadMembersUpdate(threadMembersUpdate);
+        this.lazyThreadMembersStore.handleThreadMembersUpdate(threadMembersUpdate);
     }
 
     @StoreThread
@@ -2439,75 +2470,76 @@ public final class StoreStream {
         dispatchSubscribe(this.gatewaySocket.getThreadListSync(), "streamThreadListSync", new StoreStream$initGatewaySocketListeners$23(this));
         dispatchSubscribe(this.gatewaySocket.getThreadMemberUpdate(), "streamThreadMemberUpdate", new StoreStream$initGatewaySocketListeners$24(this));
         dispatchSubscribe(this.gatewaySocket.getThreadMembersUpdate(), "streamThreadMembersUpdate", new StoreStream$initGatewaySocketListeners$25(this));
-        dispatchSubscribe(this.gatewaySocket.getUserUpdate(), "streamUserUpdated", new StoreStream$initGatewaySocketListeners$26(this));
-        dispatchSubscribe(this.gatewaySocket.getUserNoteUpdate(), "handleUserNoteUpdated", new StoreStream$initGatewaySocketListeners$27(this));
-        dispatchSubscribe(this.gatewaySocket.getRelationshipAdd(), "streamRelationshipAdd", new StoreStream$initGatewaySocketListeners$28(this));
-        dispatchSubscribe(this.gatewaySocket.getRelationshipRemove(), "streamRelationshipRemove", new StoreStream$initGatewaySocketListeners$29(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageUpdate(), "streamMessageUpdate", new StoreStream$initGatewaySocketListeners$30(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageCreate(), "streamMessageCreate", new StoreStream$initGatewaySocketListeners$31(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageReactionAdd(), "streamReactionAdd", new StoreStream$initGatewaySocketListeners$32(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageReactionRemove(), "streamReactionRemove", new StoreStream$initGatewaySocketListeners$33(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageReactionRemoveEmoji(), "streamMessageRemoveEmoji", new StoreStream$initGatewaySocketListeners$34(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageReactionRemoveAll(), "streamMessageRemoveAll", new StoreStream$initGatewaySocketListeners$35(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageDelete(), "streamMessageDelete", new StoreStream$initGatewaySocketListeners$36(this));
-        dispatchSubscribe(this.gatewaySocket.getMessageAck(), "streamMessageAck", new StoreStream$initGatewaySocketListeners$37(this));
-        dispatchSubscribe(this.gatewaySocket.getVoiceStateUpdate(), "streamVoiceStateUpdate", new StoreStream$initGatewaySocketListeners$38(this));
-        dispatchSubscribe(this.gatewaySocket.getVoiceServerUpdate(), "streamVoiceServerUpdate", new StoreStream$initGatewaySocketListeners$39(this));
-        dispatchSubscribe(this.gatewaySocket.getUserGuildSettingsUpdate(), "streamGuildSettingUpdated", new StoreStream$initGatewaySocketListeners$40(this));
-        dispatchSubscribe(this.gatewaySocket.getUserSettingsUpdate(), "streamUserSettingsUpdate", new StoreStream$initGatewaySocketListeners$41(this));
-        dispatchSubscribe(this.gatewaySocket.getTypingStart(), "streamTypingStart", new StoreStream$initGatewaySocketListeners$42(this));
-        dispatchSubscribe(this.gatewaySocket.getPresenceUpdate(), "streamPresenceUpdate", new StoreStream$initGatewaySocketListeners$43(this));
-        dispatchSubscribe(this.gatewaySocket.getPresenceReplace(), "streamPresenceReplace", new StoreStream$initGatewaySocketListeners$44(this));
-        dispatchSubscribe(this.gatewaySocket.getChannelRecipientAdd(), "streamGroupDMRecipientAdd", new StoreStream$initGatewaySocketListeners$45(this));
-        dispatchSubscribe(this.gatewaySocket.getChannelRecipientRemove(), "streamGroupDMRecipientRemove", new StoreStream$initGatewaySocketListeners$46(this));
-        dispatchSubscribe(this.gatewaySocket.getCallDelete(), "streamCallDelete", new StoreStream$initGatewaySocketListeners$47(this));
-        dispatchSubscribe(this.gatewaySocket.getCallCreateOrUpdate(), "streamCallCreateOrUpdate", new StoreStream$initGatewaySocketListeners$48(this));
-        dispatchSubscribe(this.gatewaySocket.getGuildEmojisUpdate(), "streamEmojisUpdate", new StoreStream$initGatewaySocketListeners$49(this));
-        dispatchSubscribe(this.gatewaySocket.getGuildStickersUpdate(), "streamStickersUpdate", new StoreStream$initGatewaySocketListeners$50(this));
-        dispatchSubscribe(this.gatewaySocket.getUserRequiredActionUpdate(), "streamUserRequiredActionUpdate", new StoreStream$initGatewaySocketListeners$51(this));
-        dispatchSubscribe(this.gatewaySocket.getGuildMemberListUpdate(), "guildMemberListUpdate", new StoreStream$initGatewaySocketListeners$52(this));
-        dispatchSubscribe(this.gatewaySocket.getSessionsReplace(), "streamSessionsReplace", new StoreStream$initGatewaySocketListeners$53(this));
-        dispatchSubscribe(this.gatewaySocket.getUserPaymentSourcesUpdate(), "streamUserPaymentSourcesUpdate", new StoreStream$initGatewaySocketListeners$54(this));
-        dispatchSubscribe(this.gatewaySocket.getUserSubscriptionsUpdate(), "streamUserSubscriptionsUpdate", new StoreStream$initGatewaySocketListeners$55(this));
-        dispatchSubscribe(this.gatewaySocket.getStreamCreate(), "streamStreamCreate", new StoreStream$initGatewaySocketListeners$56(this));
-        dispatchSubscribe(this.gatewaySocket.getStreamUpdate(), "streamStreamUpdate", new StoreStream$initGatewaySocketListeners$57(this));
-        dispatchSubscribe(this.gatewaySocket.getStreamDelete(), "streamStreamDelete", new StoreStream$initGatewaySocketListeners$58(this));
-        dispatchSubscribe(this.gatewaySocket.getStreamServerUpdate(), "streamStreamServerUpdate", new StoreStream$initGatewaySocketListeners$59(this));
-        dispatchSubscribe(this.gatewaySocket.getInteractionCreate(), "interactionCreate", new StoreStream$initGatewaySocketListeners$60(this));
-        dispatchSubscribe(this.gatewaySocket.getInteractionSuccess(), "interactionSuccess", new StoreStream$initGatewaySocketListeners$61(this));
-        dispatchSubscribe(this.gatewaySocket.getInteractionFailure(), "interactionFailure", new StoreStream$initGatewaySocketListeners$62(this));
-        dispatchSubscribe(this.gatewaySocket.getStageInstanceCreate(), "stageInstanceCreate", new StoreStream$initGatewaySocketListeners$63(this));
-        dispatchSubscribe(this.gatewaySocket.getStageInstanceUpdate(), "stageInstanceUpdate", new StoreStream$initGatewaySocketListeners$64(this));
-        dispatchSubscribe(this.gatewaySocket.getStageInstanceDelete(), "stageInstanceDelete", new StoreStream$initGatewaySocketListeners$65(this));
-        dispatchSubscribe(this.gatewaySocket.getFriendSuggestionCreate(), "friendSuggestionCreate", new StoreStream$initGatewaySocketListeners$66(this));
-        dispatchSubscribe(this.gatewaySocket.getFriendSuggestionDelete(), "friendSuggestionDelete", new StoreStream$initGatewaySocketListeners$67(this));
+        dispatchSubscribe(this.gatewaySocket.getThreadMemberListUpdate(), "threadMemberListUpdate", new StoreStream$initGatewaySocketListeners$26(this));
+        dispatchSubscribe(this.gatewaySocket.getUserUpdate(), "streamUserUpdated", new StoreStream$initGatewaySocketListeners$27(this));
+        dispatchSubscribe(this.gatewaySocket.getUserNoteUpdate(), "handleUserNoteUpdated", new StoreStream$initGatewaySocketListeners$28(this));
+        dispatchSubscribe(this.gatewaySocket.getRelationshipAdd(), "streamRelationshipAdd", new StoreStream$initGatewaySocketListeners$29(this));
+        dispatchSubscribe(this.gatewaySocket.getRelationshipRemove(), "streamRelationshipRemove", new StoreStream$initGatewaySocketListeners$30(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageUpdate(), "streamMessageUpdate", new StoreStream$initGatewaySocketListeners$31(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageCreate(), "streamMessageCreate", new StoreStream$initGatewaySocketListeners$32(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageReactionAdd(), "streamReactionAdd", new StoreStream$initGatewaySocketListeners$33(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageReactionRemove(), "streamReactionRemove", new StoreStream$initGatewaySocketListeners$34(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageReactionRemoveEmoji(), "streamMessageRemoveEmoji", new StoreStream$initGatewaySocketListeners$35(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageReactionRemoveAll(), "streamMessageRemoveAll", new StoreStream$initGatewaySocketListeners$36(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageDelete(), "streamMessageDelete", new StoreStream$initGatewaySocketListeners$37(this));
+        dispatchSubscribe(this.gatewaySocket.getMessageAck(), "streamMessageAck", new StoreStream$initGatewaySocketListeners$38(this));
+        dispatchSubscribe(this.gatewaySocket.getVoiceStateUpdate(), "streamVoiceStateUpdate", new StoreStream$initGatewaySocketListeners$39(this));
+        dispatchSubscribe(this.gatewaySocket.getVoiceServerUpdate(), "streamVoiceServerUpdate", new StoreStream$initGatewaySocketListeners$40(this));
+        dispatchSubscribe(this.gatewaySocket.getUserGuildSettingsUpdate(), "streamGuildSettingUpdated", new StoreStream$initGatewaySocketListeners$41(this));
+        dispatchSubscribe(this.gatewaySocket.getUserSettingsUpdate(), "streamUserSettingsUpdate", new StoreStream$initGatewaySocketListeners$42(this));
+        dispatchSubscribe(this.gatewaySocket.getTypingStart(), "streamTypingStart", new StoreStream$initGatewaySocketListeners$43(this));
+        dispatchSubscribe(this.gatewaySocket.getPresenceUpdate(), "streamPresenceUpdate", new StoreStream$initGatewaySocketListeners$44(this));
+        dispatchSubscribe(this.gatewaySocket.getPresenceReplace(), "streamPresenceReplace", new StoreStream$initGatewaySocketListeners$45(this));
+        dispatchSubscribe(this.gatewaySocket.getChannelRecipientAdd(), "streamGroupDMRecipientAdd", new StoreStream$initGatewaySocketListeners$46(this));
+        dispatchSubscribe(this.gatewaySocket.getChannelRecipientRemove(), "streamGroupDMRecipientRemove", new StoreStream$initGatewaySocketListeners$47(this));
+        dispatchSubscribe(this.gatewaySocket.getCallDelete(), "streamCallDelete", new StoreStream$initGatewaySocketListeners$48(this));
+        dispatchSubscribe(this.gatewaySocket.getCallCreateOrUpdate(), "streamCallCreateOrUpdate", new StoreStream$initGatewaySocketListeners$49(this));
+        dispatchSubscribe(this.gatewaySocket.getGuildEmojisUpdate(), "streamEmojisUpdate", new StoreStream$initGatewaySocketListeners$50(this));
+        dispatchSubscribe(this.gatewaySocket.getGuildStickersUpdate(), "streamStickersUpdate", new StoreStream$initGatewaySocketListeners$51(this));
+        dispatchSubscribe(this.gatewaySocket.getUserRequiredActionUpdate(), "streamUserRequiredActionUpdate", new StoreStream$initGatewaySocketListeners$52(this));
+        dispatchSubscribe(this.gatewaySocket.getGuildMemberListUpdate(), "guildMemberListUpdate", new StoreStream$initGatewaySocketListeners$53(this));
+        dispatchSubscribe(this.gatewaySocket.getSessionsReplace(), "streamSessionsReplace", new StoreStream$initGatewaySocketListeners$54(this));
+        dispatchSubscribe(this.gatewaySocket.getUserPaymentSourcesUpdate(), "streamUserPaymentSourcesUpdate", new StoreStream$initGatewaySocketListeners$55(this));
+        dispatchSubscribe(this.gatewaySocket.getUserSubscriptionsUpdate(), "streamUserSubscriptionsUpdate", new StoreStream$initGatewaySocketListeners$56(this));
+        dispatchSubscribe(this.gatewaySocket.getStreamCreate(), "streamStreamCreate", new StoreStream$initGatewaySocketListeners$57(this));
+        dispatchSubscribe(this.gatewaySocket.getStreamUpdate(), "streamStreamUpdate", new StoreStream$initGatewaySocketListeners$58(this));
+        dispatchSubscribe(this.gatewaySocket.getStreamDelete(), "streamStreamDelete", new StoreStream$initGatewaySocketListeners$59(this));
+        dispatchSubscribe(this.gatewaySocket.getStreamServerUpdate(), "streamStreamServerUpdate", new StoreStream$initGatewaySocketListeners$60(this));
+        dispatchSubscribe(this.gatewaySocket.getInteractionCreate(), "interactionCreate", new StoreStream$initGatewaySocketListeners$61(this));
+        dispatchSubscribe(this.gatewaySocket.getInteractionSuccess(), "interactionSuccess", new StoreStream$initGatewaySocketListeners$62(this));
+        dispatchSubscribe(this.gatewaySocket.getInteractionFailure(), "interactionFailure", new StoreStream$initGatewaySocketListeners$63(this));
+        dispatchSubscribe(this.gatewaySocket.getStageInstanceCreate(), "stageInstanceCreate", new StoreStream$initGatewaySocketListeners$64(this));
+        dispatchSubscribe(this.gatewaySocket.getStageInstanceUpdate(), "stageInstanceUpdate", new StoreStream$initGatewaySocketListeners$65(this));
+        dispatchSubscribe(this.gatewaySocket.getStageInstanceDelete(), "stageInstanceDelete", new StoreStream$initGatewaySocketListeners$66(this));
+        dispatchSubscribe(this.gatewaySocket.getFriendSuggestionCreate(), "friendSuggestionCreate", new StoreStream$initGatewaySocketListeners$67(this));
+        dispatchSubscribe(this.gatewaySocket.getFriendSuggestionDelete(), "friendSuggestionDelete", new StoreStream$initGatewaySocketListeners$68(this));
     }
 
     private final void maybeLogNotificationPermissionStatus(Application application, Clock clock) {
         SharedPreferences sharedPreferences = SharedPreferencesProvider.INSTANCE.get();
         long currentTimeMillis = clock.currentTimeMillis();
         if (currentTimeMillis - sharedPreferences.getLong(LAST_LOGGED_NOTIFICATION_PERMISSIONS_KEY, 0) > DAY_IN_MILLS) {
-            Observable<NotificationClient.SettingsV2> a02 = this.notifications.getSettings().a0(1);
-            m.checkNotNullExpressionValue(a02, "notifications.getSettings().take(1)");
-            ObservableExtensionsKt.appSubscribe$default(a02, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$maybeLogNotificationPermissionStatus$1(sharedPreferences, currentTimeMillis, application), 62, (Object) null);
+            Observable<NotificationClient.SettingsV2> Z = this.notifications.getSettings().Z(1);
+            m.checkNotNullExpressionValue(Z, "notifications.getSettings().take(1)");
+            ObservableExtensionsKt.appSubscribe$default(Z, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$maybeLogNotificationPermissionStatus$1(sharedPreferences, currentTimeMillis, application), 62, (Object) null);
         }
     }
 
     @StoreThread
     private final void processMessageUsers(Message message) {
-        synthesizeGuildMemberAdd(message.o(), message.g(), message.w());
-        List<User> z2 = message.z();
-        if (z2 != null) {
-            for (User user : z2) {
-                synthesizeGuildMemberAdd(message.o(), user, user.j());
+        synthesizeGuildMemberAdd(message.m(), message.e(), message.q());
+        List<User> t = message.t();
+        if (t != null) {
+            for (User user : t) {
+                synthesizeGuildMemberAdd(message.m(), user, user.j());
             }
         }
     }
 
     private final void startStoreInitializationTimer(NetworkMonitor networkMonitor) {
-        Observable a02 = Observable.I(networkMonitor.observeIsConnected().y(StoreStream$startStoreInitializationTimer$isOfflineObservable$1.INSTANCE), Observable.e0(6000, TimeUnit.MILLISECONDS)).a0(1);
-        m.checkNotNullExpressionValue(a02, "Observable.merge(\n      …le\n    )\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$startStoreInitializationTimer$1(this), 62, (Object) null);
+        Observable Z = Observable.H(networkMonitor.observeIsConnected().x(StoreStream$startStoreInitializationTimer$isOfflineObservable$1.INSTANCE), Observable.d0(6000, TimeUnit.MILLISECONDS)).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable.merge(\n      …le\n    )\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StoreStream.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreStream$startStoreInitializationTimer$1(this), 62, (Object) null);
     }
 
     public static /* synthetic */ void streamCreate$default(StoreStream storeStream, String str, String str2, int i, Object obj) {
@@ -2778,6 +2810,10 @@ public final class StoreStream {
         return this.lazyChannelMembersStore;
     }
 
+    public final StoreThreadMembers getLazyThreadMembersStore$app_productionGoogleRelease() {
+        return this.lazyThreadMembersStore;
+    }
+
     public final StoreLibrary getLibrary$app_productionGoogleRelease() {
         return this.library;
     }
@@ -3117,7 +3153,7 @@ public final class StoreStream {
     }
 
     @StoreThread
-    public final void handleLocalMessageDelete(Message message) {
+    public final void handleLocalMessageDelete(com.discord.models.message.Message message) {
         m.checkNotNullParameter(message, "message");
         this.applicationInteractions.handleLocalMessageDelete(message);
     }
@@ -3218,6 +3254,7 @@ public final class StoreStream {
         this.threadsJoined.handleThreadCreateOrUpdate(channel);
         this.threadsActiveJoined.handleThreadCreateOrUpdateOrDelete(channel);
         this.threadMessages.handleThreadCreateOrUpdate(channel);
+        this.lazyThreadMembersStore.handleThreadCreateOrUpdate(channel);
     }
 
     @StoreThread
diff --git a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
index 1d6934d38e..5d83ce903e 100644
--- a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
+++ b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java
@@ -320,7 +320,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin
         destroyRtcConnection();
         RtcConnection.Metadata rtcConnectionMetadata = this.storeRtcConnection.getRtcConnectionMetadata();
         String str4 = null;
-        Long l2 = rtcConnectionMetadata != null ? rtcConnectionMetadata.f2079c : null;
+        Long l2 = rtcConnectionMetadata != null ? rtcConnectionMetadata.f2085c : null;
         if (l2 != null && l2.longValue() == j2) {
             str4 = rtcConnectionMetadata.b;
         }
@@ -350,7 +350,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin
     @StoreThread
     private final void handleMediaSessionIdReceived() {
         RtcConnection rtcConnection = this.rtcConnection;
-        this.state = State.copy$default(this.state, null, null, rtcConnection != null ? rtcConnection.f2077y : null, null, 11, null);
+        this.state = State.copy$default(this.state, null, null, rtcConnection != null ? rtcConnection.H : null, null, 11, null);
         markChanged();
     }
 
@@ -448,9 +448,9 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin
         String str = this.sessionId;
         if (str != null) {
             RtcConnection rtcConnection = this.rtcConnection;
-            if (rtcConnection != null && rtcConnection.D == decodeStreamKey.getChannelId()) {
+            if (rtcConnection != null && rtcConnection.M == decodeStreamKey.getChannelId()) {
                 RtcConnection rtcConnection2 = this.rtcConnection;
-                if (m.areEqual(rtcConnection2 != null ? rtcConnection2.E : null, str)) {
+                if (m.areEqual(rtcConnection2 != null ? rtcConnection2.N : null, str)) {
                     return;
                 }
             }
@@ -533,7 +533,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin
     public final void updateFocusedParticipant(Long l) {
         MediaSinkWantsManager mediaSinkWantsManager;
         RtcConnection rtcConnection = this.rtcConnection;
-        if (rtcConnection != null && (mediaSinkWantsManager = rtcConnection.v) != null) {
+        if (rtcConnection != null && (mediaSinkWantsManager = rtcConnection.E) != null) {
             mediaSinkWantsManager.b(new j(mediaSinkWantsManager, l));
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreSubscriptions.java b/app/src/main/java/com/discord/stores/StoreSubscriptions.java
index 0a748ec299..d48c555383 100644
--- a/app/src/main/java/com/discord/stores/StoreSubscriptions.java
+++ b/app/src/main/java/com/discord/stores/StoreSubscriptions.java
@@ -187,9 +187,9 @@ public final class StoreSubscriptions extends StoreV2 {
     }
 
     public final Observable<SubscriptionsState> observeSubscriptions() {
-        Observable<SubscriptionsState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreSubscriptions$observeSubscriptions$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<SubscriptionsState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreSubscriptions$observeSubscriptions$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreTabsNavigation.java b/app/src/main/java/com/discord/stores/StoreTabsNavigation.java
index 7bc419f385..0c9f9091d0 100644
--- a/app/src/main/java/com/discord/stores/StoreTabsNavigation.java
+++ b/app/src/main/java/com/discord/stores/StoreTabsNavigation.java
@@ -25,7 +25,7 @@ public final class StoreTabsNavigation extends StoreV2 {
         this.storeStream = storeStream;
         this.observationDeck = observationDeck;
         this.selectedTab = NavigationTab.HOME;
-        this.dismissTabsDialogEventSubject = PublishSubject.l0();
+        this.dismissTabsDialogEventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -98,9 +98,9 @@ public final class StoreTabsNavigation extends StoreV2 {
     }
 
     public final Observable<NavigationTab> observeSelectedTab() {
-        Observable<NavigationTab> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreTabsNavigation$observeSelectedTab$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<NavigationTab> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreTabsNavigation$observeSelectedTab$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void selectHomeTab(StoreNavigation.PanelAction panelAction, boolean z2) {
diff --git a/app/src/main/java/com/discord/stores/StoreThreadDraft$clearDraftState$1.java b/app/src/main/java/com/discord/stores/StoreThreadDraft$clearDraftState$1.java
index 821781c7d1..7b9edf5e66 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadDraft$clearDraftState$1.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadDraft$clearDraftState$1.java
@@ -17,6 +17,6 @@ public final class StoreThreadDraft$clearDraftState$1 extends o implements Funct
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        StoreThreadDraft.access$getDraftStateSubject$p(this.this$0).onNext(new StoreThreadDraft.ThreadDraftState(false, 0, null, false, 15, null));
+        StoreThreadDraft.access$getDraftStateSubject$p(this.this$0).onNext(new StoreThreadDraft.ThreadDraftState(false, null, null, false, 15, null));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java b/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java
index bbcc5c292e..ad4a85940e 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadDraft$setDraftSending$1.java
@@ -22,6 +22,6 @@ public final class StoreThreadDraft$setDraftSending$1 extends o implements Funct
         BehaviorSubject access$getDraftStateSubject$p = StoreThreadDraft.access$getDraftStateSubject$p(this.this$0);
         BehaviorSubject access$getDraftStateSubject$p2 = StoreThreadDraft.access$getDraftStateSubject$p(this.this$0);
         m.checkNotNullExpressionValue(access$getDraftStateSubject$p2, "draftStateSubject");
-        access$getDraftStateSubject$p.onNext(StoreThreadDraft.ThreadDraftState.copy$default((StoreThreadDraft.ThreadDraftState) access$getDraftStateSubject$p2.o0(), false, 0, null, true, 7, null));
+        access$getDraftStateSubject$p.onNext(StoreThreadDraft.ThreadDraftState.copy$default((StoreThreadDraft.ThreadDraftState) access$getDraftStateSubject$p2.n0(), false, null, null, true, 7, null));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreThreadDraft.java b/app/src/main/java/com/discord/stores/StoreThreadDraft.java
index 251ed303a0..ef6b84824d 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadDraft.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadDraft.java
@@ -7,65 +7,53 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: StoreThreadDraft.kt */
 public final class StoreThreadDraft extends StoreV2 {
-    public static final Companion Companion = new Companion(null);
-    public static final int DEFAULT_AUTO_ARCHIVE_DURATION = 1440;
     private final Dispatcher dispatcher;
-    private final BehaviorSubject<ThreadDraftState> draftStateSubject = BehaviorSubject.m0(new ThreadDraftState(false, 0, null, false, 15, null));
-
-    /* compiled from: StoreThreadDraft.kt */
-    public static final class Companion {
-        private Companion() {
-        }
-
-        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
-            this();
-        }
-    }
+    private final BehaviorSubject<ThreadDraftState> draftStateSubject = BehaviorSubject.l0(new ThreadDraftState(false, null, null, false, 15, null));
 
     /* compiled from: StoreThreadDraft.kt */
     public static final class ThreadDraftState {
-        private final int autoArchiveDuration;
+        private final Integer autoArchiveDuration;
         private final boolean isPrivate;
         private final boolean isSending;
         private final String threadName;
 
         public ThreadDraftState() {
-            this(false, 0, null, false, 15, null);
+            this(false, null, null, false, 15, null);
         }
 
-        public ThreadDraftState(boolean z2, int i, String str, boolean z3) {
+        public ThreadDraftState(boolean z2, Integer num, String str, boolean z3) {
             this.isPrivate = z2;
-            this.autoArchiveDuration = i;
+            this.autoArchiveDuration = num;
             this.threadName = str;
             this.isSending = z3;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ ThreadDraftState(boolean z2, int i, String str, boolean z3, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-            this((i2 & 1) != 0 ? false : z2, (i2 & 2) != 0 ? 1440 : i, (i2 & 4) != 0 ? null : str, (i2 & 8) != 0 ? false : z3);
+        public /* synthetic */ ThreadDraftState(boolean z2, Integer num, String str, boolean z3, int i, DefaultConstructorMarker defaultConstructorMarker) {
+            this((i & 1) != 0 ? false : z2, (i & 2) != 0 ? null : num, (i & 4) != 0 ? null : str, (i & 8) != 0 ? false : z3);
         }
 
-        public static /* synthetic */ ThreadDraftState copy$default(ThreadDraftState threadDraftState, boolean z2, int i, String str, boolean z3, int i2, Object obj) {
-            if ((i2 & 1) != 0) {
+        public static /* synthetic */ ThreadDraftState copy$default(ThreadDraftState threadDraftState, boolean z2, Integer num, String str, boolean z3, int i, Object obj) {
+            if ((i & 1) != 0) {
                 z2 = threadDraftState.isPrivate;
             }
-            if ((i2 & 2) != 0) {
-                i = threadDraftState.autoArchiveDuration;
+            if ((i & 2) != 0) {
+                num = threadDraftState.autoArchiveDuration;
             }
-            if ((i2 & 4) != 0) {
+            if ((i & 4) != 0) {
                 str = threadDraftState.threadName;
             }
-            if ((i2 & 8) != 0) {
+            if ((i & 8) != 0) {
                 z3 = threadDraftState.isSending;
             }
-            return threadDraftState.copy(z2, i, str, z3);
+            return threadDraftState.copy(z2, num, str, z3);
         }
 
         public final boolean component1() {
             return this.isPrivate;
         }
 
-        public final int component2() {
+        public final Integer component2() {
             return this.autoArchiveDuration;
         }
 
@@ -77,8 +65,8 @@ public final class StoreThreadDraft extends StoreV2 {
             return this.isSending;
         }
 
-        public final ThreadDraftState copy(boolean z2, int i, String str, boolean z3) {
-            return new ThreadDraftState(z2, i, str, z3);
+        public final ThreadDraftState copy(boolean z2, Integer num, String str, boolean z3) {
+            return new ThreadDraftState(z2, num, str, z3);
         }
 
         public boolean equals(Object obj) {
@@ -89,10 +77,10 @@ public final class StoreThreadDraft extends StoreV2 {
                 return false;
             }
             ThreadDraftState threadDraftState = (ThreadDraftState) obj;
-            return this.isPrivate == threadDraftState.isPrivate && this.autoArchiveDuration == threadDraftState.autoArchiveDuration && m.areEqual(this.threadName, threadDraftState.threadName) && this.isSending == threadDraftState.isSending;
+            return this.isPrivate == threadDraftState.isPrivate && m.areEqual(this.autoArchiveDuration, threadDraftState.autoArchiveDuration) && m.areEqual(this.threadName, threadDraftState.threadName) && this.isSending == threadDraftState.isSending;
         }
 
-        public final int getAutoArchiveDuration() {
+        public final Integer getAutoArchiveDuration() {
             return this.autoArchiveDuration;
         }
 
@@ -109,14 +97,20 @@ public final class StoreThreadDraft extends StoreV2 {
             int i2 = z2 ? 1 : 0;
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
-            int i5 = ((i2 * 31) + this.autoArchiveDuration) * 31;
+            int i5 = i2 * 31;
+            Integer num = this.autoArchiveDuration;
+            int i6 = 0;
+            int hashCode = (i5 + (num != null ? num.hashCode() : 0)) * 31;
             String str = this.threadName;
-            int hashCode = (i5 + (str != null ? str.hashCode() : 0)) * 31;
+            if (str != null) {
+                i6 = str.hashCode();
+            }
+            int i7 = (hashCode + i6) * 31;
             boolean z3 = this.isSending;
             if (!z3) {
                 i = z3 ? 1 : 0;
             }
-            return hashCode + i;
+            return i7 + i;
         }
 
         public final boolean isPrivate() {
diff --git a/app/src/main/java/com/discord/stores/StoreThreadMembers$observeThreadMembers$1.java b/app/src/main/java/com/discord/stores/StoreThreadMembers$observeThreadMembers$1.java
new file mode 100644
index 0000000000..d108bdb399
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreThreadMembers$observeThreadMembers$1.java
@@ -0,0 +1,26 @@
+package com.discord.stores;
+
+import d0.t.n0;
+import d0.z.d.o;
+import java.util.Set;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreThreadMembers.kt */
+public final class StoreThreadMembers$observeThreadMembers$1 extends o implements Function0<Set<? extends Long>> {
+    public final /* synthetic */ long $channelId;
+    public final /* synthetic */ StoreThreadMembers this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreThreadMembers$observeThreadMembers$1(StoreThreadMembers storeThreadMembers, long j) {
+        super(0);
+        this.this$0 = storeThreadMembers;
+        this.$channelId = j;
+    }
+
+    /* Return type fixed from 'java.util.Set<java.lang.Long>' to match base method */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final Set<? extends Long> mo1invoke() {
+        Set<? extends Long> set = (Set) StoreThreadMembers.access$getMemberListsSnapshot$p(this.this$0).get(Long.valueOf(this.$channelId));
+        return set != null ? set : n0.emptySet();
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreThreadMembers.java b/app/src/main/java/com/discord/stores/StoreThreadMembers.java
new file mode 100644
index 0000000000..fa6f534134
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreThreadMembers.java
@@ -0,0 +1,149 @@
+package com.discord.stores;
+
+import com.discord.api.channel.Channel;
+import com.discord.api.guildmember.GuildMember;
+import com.discord.api.thread.AugmentedThreadMember;
+import com.discord.api.thread.ThreadListMember;
+import com.discord.api.thread.ThreadMemberListUpdate;
+import com.discord.api.thread.ThreadMembersUpdate;
+import com.discord.api.thread.ThreadMetadata;
+import com.discord.api.user.User;
+import com.discord.stores.updates.ObservationDeck;
+import d0.t.g0;
+import d0.t.o;
+import d0.t.u;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import rx.Observable;
+/* compiled from: StoreThreadMembers.kt */
+public final class StoreThreadMembers extends StoreV2 {
+    private final Map<Long, Set<Long>> memberLists = new LinkedHashMap();
+    private HashMap<Long, Set<Long>> memberListsSnapshot = new HashMap<>();
+    private final ObservationDeck observationDeck;
+    private final StoreChannels storeChannels;
+
+    public StoreThreadMembers(ObservationDeck observationDeck, StoreChannels storeChannels) {
+        m.checkNotNullParameter(observationDeck, "observationDeck");
+        m.checkNotNullParameter(storeChannels, "storeChannels");
+        this.observationDeck = observationDeck;
+        this.storeChannels = storeChannels;
+    }
+
+    public static final /* synthetic */ HashMap access$getMemberListsSnapshot$p(StoreThreadMembers storeThreadMembers) {
+        return storeThreadMembers.memberListsSnapshot;
+    }
+
+    public static final /* synthetic */ void access$setMemberListsSnapshot$p(StoreThreadMembers storeThreadMembers, HashMap hashMap) {
+        storeThreadMembers.memberListsSnapshot = hashMap;
+    }
+
+    @StoreThread
+    public final void handleConnectionOpen() {
+        this.memberLists.clear();
+        markChanged();
+    }
+
+    @StoreThread
+    public final void handleThreadCreateOrUpdate(Channel channel) {
+        ThreadMetadata y2;
+        m.checkNotNullParameter(channel, "channel");
+        if (this.memberLists.containsKey(Long.valueOf(channel.h())) && (y2 = channel.y()) != null && y2.b()) {
+            this.memberLists.remove(Long.valueOf(channel.h()));
+            markChanged();
+        }
+    }
+
+    @StoreThread
+    public final void handleThreadDelete(Channel channel) {
+        m.checkNotNullParameter(channel, "channel");
+        if (this.memberLists.containsKey(Long.valueOf(channel.h()))) {
+            this.memberLists.remove(Long.valueOf(channel.h()));
+            markChanged();
+        }
+    }
+
+    /* JADX WARNING: Code restructure failed: missing block: B:12:0x005d, code lost:
+        if (r6 != null) goto L_0x0065;
+     */
+    @StoreThread
+    public final void handleThreadMemberListUpdate(ThreadMemberListUpdate threadMemberListUpdate) {
+        Set<Long> set;
+        m.checkNotNullParameter(threadMemberListUpdate, "threadMemberListUpdate");
+        Channel channelInternal$app_productionGoogleRelease = this.storeChannels.getChannelInternal$app_productionGoogleRelease(threadMemberListUpdate.a(), threadMemberListUpdate.c());
+        if ((channelInternal$app_productionGoogleRelease != null ? Long.valueOf(channelInternal$app_productionGoogleRelease.r()) : null) != null) {
+            Map<Long, Set<Long>> map = this.memberLists;
+            Long valueOf = Long.valueOf(channelInternal$app_productionGoogleRelease.h());
+            List<ThreadListMember> b = threadMemberListUpdate.b();
+            if (b != null) {
+                ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(b, 10));
+                for (ThreadListMember threadListMember : b) {
+                    arrayList.add(Long.valueOf(threadListMember.c()));
+                }
+                set = u.toMutableSet(arrayList);
+            }
+            set = new LinkedHashSet<>();
+            map.put(valueOf, set);
+            markChanged();
+        }
+    }
+
+    @StoreThread
+    public final void handleThreadMembersUpdate(ThreadMembersUpdate threadMembersUpdate) {
+        User j;
+        m.checkNotNullParameter(threadMembersUpdate, "threadMembersUpdate");
+        if (this.memberLists.containsKey(Long.valueOf(threadMembersUpdate.c()))) {
+            List<AugmentedThreadMember> a = threadMembersUpdate.a();
+            if (a != null) {
+                for (AugmentedThreadMember augmentedThreadMember : a) {
+                    GuildMember c2 = augmentedThreadMember.c();
+                    Long valueOf = (c2 == null || (j = c2.j()) == null) ? null : Long.valueOf(j.i());
+                    if (valueOf != null) {
+                        Set<Long> set = this.memberLists.get(Long.valueOf(threadMembersUpdate.c()));
+                        if (set != null) {
+                            set.add(valueOf);
+                        }
+                        markChanged();
+                    }
+                }
+            }
+            List<Long> d = threadMembersUpdate.d();
+            if (d != null) {
+                for (Number number : d) {
+                    long longValue = number.longValue();
+                    Set<Long> set2 = this.memberLists.get(Long.valueOf(threadMembersUpdate.c()));
+                    if (set2 != null) {
+                        set2.remove(Long.valueOf(longValue));
+                    }
+                    markChanged();
+                }
+            }
+        }
+    }
+
+    public final Observable<Set<Long>> observeThreadMembers(long j) {
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadMembers$observeThreadMembers$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
+    }
+
+    @Override // com.discord.stores.StoreV2
+    @StoreThread
+    public void snapshotData() {
+        super.snapshotData();
+        Map<Long, Set<Long>> map = this.memberLists;
+        LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(map.size()));
+        Iterator<T> it = map.entrySet().iterator();
+        while (it.hasNext()) {
+            Map.Entry entry = (Map.Entry) it.next();
+            linkedHashMap.put(entry.getKey(), u.toSet((Iterable) entry.getValue()));
+        }
+        this.memberListsSnapshot = new HashMap<>(linkedHashMap);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreThreadMessages.java b/app/src/main/java/com/discord/stores/StoreThreadMessages.java
index ae02c1b04a..1fae5e6417 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadMessages.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadMessages.java
@@ -5,14 +5,13 @@ import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
-import com.discord.api.message.Message;
 import com.discord.models.domain.ModelMessageDelete;
 import com.discord.models.domain.ModelPayload;
+import com.discord.models.message.Message;
 import com.discord.models.thread.dto.ModelThreadListSync;
 import com.discord.stores.StoreMessagesLoader;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
-import com.discord.utilities.message.MessageUtils;
 import d0.d0.f;
 import d0.t.h0;
 import d0.t.r;
@@ -191,12 +190,12 @@ public final class StoreThreadMessages extends StoreV2 {
     private final ThreadState getOrAddState(Channel channel) {
         ThreadState threadState = (ThreadState) a.d(channel, this.threads);
         if (threadState == null) {
-            long g = channel.g();
-            long e = channel.e();
-            long q = channel.q();
-            Integer k = channel.k();
-            threadState = new ThreadState(g, e, q, k != null ? k.intValue() : 0, null);
-            this.threads.put(Long.valueOf(channel.g()), threadState);
+            long h = channel.h();
+            long f = channel.f();
+            long r = channel.r();
+            Integer l = channel.l();
+            threadState = new ThreadState(h, f, r, l != null ? l.intValue() : 0, null);
+            this.threads.put(Long.valueOf(channel.h()), threadState);
             markChanged();
         }
         return threadState;
@@ -215,15 +214,15 @@ public final class StoreThreadMessages extends StoreV2 {
     @StoreThread
     private final void updateFromThread(Channel channel) {
         ThreadState orAddState = getOrAddState(channel);
-        Integer k = channel.k();
-        if (k != null) {
-            this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, k.intValue(), null, 23, null));
+        Integer l = channel.l();
+        if (l != null) {
+            this.threads.put(Long.valueOf(channel.h()), ThreadState.copy$default(orAddState, 0, 0, 0, l.intValue(), null, 23, null));
             markChanged();
         }
-        if (channel.h() != 0) {
+        if (channel.i() != 0) {
             Message mostRecentMessage = orAddState.getMostRecentMessage();
-            if (mostRecentMessage == null || mostRecentMessage.r() != channel.h()) {
-                this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, 0, null, 15, null));
+            if (mostRecentMessage == null || mostRecentMessage.getId() != channel.i()) {
+                this.threads.put(Long.valueOf(channel.h()), ThreadState.copy$default(orAddState, 0, 0, 0, 0, null, 15, null));
                 markChanged();
             }
         }
@@ -240,7 +239,7 @@ public final class StoreThreadMessages extends StoreV2 {
     @StoreThread
     public final void handleChannelDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        deleteForParentChannel(channel.g());
+        deleteForParentChannel(channel.h());
     }
 
     @StoreThread
@@ -265,12 +264,12 @@ public final class StoreThreadMessages extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleMessageCreate(Message message) {
+    public final void handleMessageCreate(com.discord.api.message.Message message) {
         m.checkNotNullParameter(message, "message");
-        Channel channel = this.storeChannels.getChannel(message.i());
-        if (channel != null && AnimatableValueParser.y1(channel)) {
+        Channel channel = this.storeChannels.getChannel(message.g());
+        if (channel != null && AnimatableValueParser.z1(channel)) {
             ThreadState orAddState = getOrAddState(channel);
-            this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(orAddState.getCount() + 1, 50), message, 7, null));
+            this.threads.put(Long.valueOf(channel.h()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(orAddState.getCount() + 1, 50), new Message(message), 7, null));
             markChanged();
         }
     }
@@ -280,7 +279,7 @@ public final class StoreThreadMessages extends StoreV2 {
         Message mostRecentMessage;
         m.checkNotNullParameter(modelMessageDelete, "messageDeleteBulk");
         ThreadState threadState = this.threads.get(Long.valueOf(modelMessageDelete.getChannelId()));
-        Long valueOf = (threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null) ? null : Long.valueOf(mostRecentMessage.r());
+        Long valueOf = (threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null) ? null : Long.valueOf(mostRecentMessage.getId());
         if (valueOf != null) {
             valueOf.longValue();
             for (Long l : modelMessageDelete.getMessageIds()) {
@@ -294,12 +293,12 @@ public final class StoreThreadMessages extends StoreV2 {
     }
 
     @StoreThread
-    public final void handleMessageUpdate(Message message) {
+    public final void handleMessageUpdate(com.discord.api.message.Message message) {
         Message mostRecentMessage;
         m.checkNotNullParameter(message, "message");
-        ThreadState threadState = this.threads.get(Long.valueOf(message.i()));
-        if (threadState != null && (mostRecentMessage = threadState.getMostRecentMessage()) != null && mostRecentMessage.r() == message.r()) {
-            this.threads.put(Long.valueOf(message.i()), ThreadState.copy$default(threadState, 0, 0, 0, 0, this.storeMessages.getMessage(message.i(), message.r()), 15, null));
+        ThreadState threadState = this.threads.get(Long.valueOf(message.g()));
+        if (threadState != null && (mostRecentMessage = threadState.getMostRecentMessage()) != null && mostRecentMessage.getId() == message.o()) {
+            this.threads.put(Long.valueOf(message.g()), ThreadState.copy$default(threadState, 0, 0, 0, 0, this.storeMessages.getMessage(message.g(), message.o()), 15, null));
             markChanged();
         }
     }
@@ -313,7 +312,7 @@ public final class StoreThreadMessages extends StoreV2 {
         boolean z3 = false;
         boolean z4 = false;
         for (Message message : channelChunk.getMessages()) {
-            if (MessageUtils.INSTANCE.hasThread(message) && !this.threads.containsKey(Long.valueOf(message.r())) && (channel2 = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(message.r()))) != null) {
+            if (message.hasThread() && !this.threads.containsKey(Long.valueOf(message.getId())) && (channel2 = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(message.getId()))) != null) {
                 updateFromThread(channel2);
                 z4 = true;
             }
@@ -321,12 +320,12 @@ public final class StoreThreadMessages extends StoreV2 {
         if (z4) {
             markChanged();
         }
-        if (channelChunk.isPresent() && (channel = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(channelChunk.getChannelId()))) != null && AnimatableValueParser.y1(channel)) {
+        if (channelChunk.isPresent() && (channel = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(channelChunk.getChannelId()))) != null && AnimatableValueParser.z1(channel)) {
             ThreadState orAddState = getOrAddState(channel);
             if (channelChunk.getMessages().isEmpty()) {
-                this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, 0, null, 7, null));
+                this.threads.put(Long.valueOf(channel.h()), ThreadState.copy$default(orAddState, 0, 0, 0, 0, null, 7, null));
             } else {
-                Message message2 = this.storeMessages.getMessage(channelChunk.getChannelId(), channelChunk.getMessages().get(0).r());
+                Message message2 = this.storeMessages.getMessage(channelChunk.getChannelId(), channelChunk.getMessages().get(0).getId());
                 int size = channelChunk.getMessages().size();
                 List<Message> messages = channelChunk.getMessages();
                 if (!(messages instanceof Collection) || !messages.isEmpty()) {
@@ -335,8 +334,8 @@ public final class StoreThreadMessages extends StoreV2 {
                         if (!it.hasNext()) {
                             break;
                         }
-                        Integer M = ((Message) it.next()).M();
-                        if (M != null && M.intValue() == 21) {
+                        Integer type = ((Message) it.next()).getType();
+                        if (type != null && type.intValue() == 21) {
                             z2 = true;
                             continue;
                         } else {
@@ -352,8 +351,8 @@ public final class StoreThreadMessages extends StoreV2 {
                 if (z3) {
                     size--;
                 }
-                Integer M2 = message2 != null ? message2.M() : null;
-                this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(size, 50), (M2 != null && M2.intValue() == 21) ? null : message2, 7, null));
+                Integer type2 = message2 != null ? message2.getType() : null;
+                this.threads.put(Long.valueOf(channel.h()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(size, 50), (type2 != null && type2.intValue() == 21) ? null : message2, 7, null));
             }
             markChanged();
         }
@@ -368,8 +367,8 @@ public final class StoreThreadMessages extends StoreV2 {
     @StoreThread
     public final void handleThreadDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (this.threads.containsKey(Long.valueOf(channel.g()))) {
-            this.threads.remove(Long.valueOf(channel.g()));
+        if (this.threads.containsKey(Long.valueOf(channel.h()))) {
+            this.threads.remove(Long.valueOf(channel.h()));
             markChanged();
         }
     }
@@ -380,21 +379,21 @@ public final class StoreThreadMessages extends StoreV2 {
         for (Channel channel : modelThreadListSync.getThreads()) {
             updateFromThread(channel);
         }
-        List<Message> mostRecentMessages = modelThreadListSync.getMostRecentMessages();
+        List<com.discord.api.message.Message> mostRecentMessages = modelThreadListSync.getMostRecentMessages();
         if (mostRecentMessages != null) {
-            for (Message message : mostRecentMessages) {
-                ThreadState threadState = this.threads.get(Long.valueOf(message.i()));
+            for (com.discord.api.message.Message message : mostRecentMessages) {
+                ThreadState threadState = this.threads.get(Long.valueOf(message.g()));
                 if (threadState != null) {
-                    this.threads.put(Long.valueOf(message.i()), ThreadState.copy$default(threadState, 0, 0, 0, 0, message, 15, null));
+                    this.threads.put(Long.valueOf(message.g()), ThreadState.copy$default(threadState, 0, 0, 0, 0, new Message(message), 15, null));
                 }
             }
         }
     }
 
     public final Observable<Map<Long, ThreadState>> observeThreadCountAndLatestMessage() {
-        Observable<Map<Long, ThreadState>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadMessages$observeThreadCountAndLatestMessage$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, ThreadState>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadMessages$observeThreadCountAndLatestMessage$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreThreadsActive.java b/app/src/main/java/com/discord/stores/StoreThreadsActive.java
index 5dc10fde6a..3f4168b7f4 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadsActive.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadsActive.java
@@ -60,8 +60,8 @@ public final class StoreThreadsActive extends StoreV2 {
 
     private final void deleteThread(Channel channel) {
         Map map = (Map) a.c(channel, this.threadsByGuild);
-        if (map != null && map.containsKey(Long.valueOf(channel.g()))) {
-            map.remove(Long.valueOf(channel.g()));
+        if (map != null && map.containsKey(Long.valueOf(channel.h()))) {
+            map.remove(Long.valueOf(channel.h()));
             markChanged();
         }
     }
@@ -83,7 +83,7 @@ public final class StoreThreadsActive extends StoreV2 {
         }
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry entry : map.entrySet()) {
-            if (((Channel) entry.getValue()).q() == l.longValue()) {
+            if (((Channel) entry.getValue()).r() == l.longValue()) {
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }
@@ -102,13 +102,13 @@ public final class StoreThreadsActive extends StoreV2 {
         }
         ArrayList arrayList = new ArrayList(map.size());
         for (Map.Entry entry : map.entrySet()) {
-            arrayList.add(Long.valueOf(((Channel) entry.getValue()).q()));
+            arrayList.add(Long.valueOf(((Channel) entry.getValue()).r()));
         }
         return u.toSet(arrayList);
     }
 
     private final void saveThreads(Guild guild) {
-        ThreadMetadata x2;
+        ThreadMetadata y2;
         List<Channel> threadsForGuildInternal$app_productionGoogleRelease = this.storeChannels.getThreadsForGuildInternal$app_productionGoogleRelease(guild.o());
         if (!threadsForGuildInternal$app_productionGoogleRelease.isEmpty()) {
             Map<Long, Map<Long, Channel>> map = this.threadsByGuild;
@@ -116,13 +116,13 @@ public final class StoreThreadsActive extends StoreV2 {
             ArrayList arrayList = new ArrayList();
             for (Object obj : threadsForGuildInternal$app_productionGoogleRelease) {
                 Channel channel = (Channel) obj;
-                if (AnimatableValueParser.y1(channel) && ((x2 = channel.x()) == null || !x2.b())) {
+                if (AnimatableValueParser.z1(channel) && ((y2 = channel.y()) == null || !y2.b())) {
                     arrayList.add(obj);
                 }
             }
             LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList, 10)), 16));
             for (Object obj2 : arrayList) {
-                linkedHashMap.put(Long.valueOf(((Channel) obj2).g()), obj2);
+                linkedHashMap.put(Long.valueOf(((Channel) obj2).h()), obj2);
             }
             map.put(valueOf, h0.toMutableMap(linkedHashMap));
             markChanged();
@@ -143,14 +143,14 @@ public final class StoreThreadsActive extends StoreV2 {
             ArrayList<Channel> arrayList = new ArrayList();
             for (Object obj : values) {
                 Channel channel2 = (Channel) obj;
-                if (channel2.q() == channel.g() && channel2.n() != channel.n()) {
+                if (channel2.r() == channel.h() && channel2.o() != channel.o()) {
                     arrayList.add(obj);
                 }
             }
             for (Channel channel3 : arrayList) {
-                Channel channelInternal$app_productionGoogleRelease = this.storeChannels.getChannelInternal$app_productionGoogleRelease(channel3.e(), channel3.g());
+                Channel channelInternal$app_productionGoogleRelease = this.storeChannels.getChannelInternal$app_productionGoogleRelease(channel3.f(), channel3.h());
                 if (channelInternal$app_productionGoogleRelease != null) {
-                    map.put(Long.valueOf(channelInternal$app_productionGoogleRelease.g()), channelInternal$app_productionGoogleRelease);
+                    map.put(Long.valueOf(channelInternal$app_productionGoogleRelease.h()), channelInternal$app_productionGoogleRelease);
                 }
             }
         }
@@ -184,17 +184,17 @@ public final class StoreThreadsActive extends StoreV2 {
     @StoreThread
     public final void handleThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (AnimatableValueParser.y1(channel)) {
-            ThreadMetadata x2 = channel.x();
-            if (x2 == null || !x2.b()) {
+        if (AnimatableValueParser.z1(channel)) {
+            ThreadMetadata y2 = channel.y();
+            if (y2 == null || !y2.b()) {
                 Map<Long, Map<Long, Channel>> map = this.threadsByGuild;
-                Long valueOf = Long.valueOf(channel.e());
+                Long valueOf = Long.valueOf(channel.f());
                 Map<Long, Channel> map2 = map.get(valueOf);
                 if (map2 == null) {
                     map2 = new HashMap<>();
                     map.put(valueOf, map2);
                 }
-                map2.put(Long.valueOf(channel.g()), channel);
+                map2.put(Long.valueOf(channel.h()), channel);
                 markChanged();
                 return;
             }
@@ -220,29 +220,29 @@ public final class StoreThreadsActive extends StoreV2 {
         }
         Map<Long, Channel> map3 = map2;
         for (Channel channel : modelThreadListSync.getThreads()) {
-            if (AnimatableValueParser.y1(channel)) {
-                map3.put(Long.valueOf(channel.g()), channel);
+            if (AnimatableValueParser.z1(channel)) {
+                map3.put(Long.valueOf(channel.h()), channel);
             }
         }
         markChanged();
     }
 
     public final Observable<Map<Long, Channel>> observeActiveThreadsForChannel(long j, Long l) {
-        Observable<Map<Long, Channel>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActive$observeActiveThreadsForChannel$1(this, j, l), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Channel>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActive$observeActiveThreadsForChannel$1(this, j, l), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Channel>> observeActiveThreadsForGuild(long j) {
-        Observable<Map<Long, Channel>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActive$observeActiveThreadsForGuild$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Channel>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActive$observeActiveThreadsForGuild$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Set<Long>> observeChannelsWithActiveThreadsByGuild(long j) {
-        Observable<Set<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActive$observeChannelsWithActiveThreadsByGuild$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActive$observeChannelsWithActiveThreadsByGuild$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java b/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java
index fbf2ba1741..46b123d4f9 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadsActiveJoined.java
@@ -148,7 +148,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
             if (l == null || joinedThread.getGuildId() == l.longValue()) {
                 Map<Long, Channel> map = allActiveThreadsInternal$app_productionGoogleRelease.get(Long.valueOf(joinedThread.getGuildId()));
                 if (!(map == null || (channel = map.get(Long.valueOf(joinedThread.getThreadId()))) == null)) {
-                    this.activeJoinedThreads.put(Long.valueOf(channel.g()), new ActiveJoinedThread(channel, joinedThread.getJoinTimestamp()));
+                    this.activeJoinedThreads.put(Long.valueOf(channel.h()), new ActiveJoinedThread(channel, joinedThread.getJoinTimestamp()));
                     markChanged();
                 }
             }
@@ -181,7 +181,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
         Collection<ActiveJoinedThread> values = this.activeJoinedThreads.values();
         ArrayList<ActiveJoinedThread> arrayList = new ArrayList();
         for (Object obj : values) {
-            if (((ActiveJoinedThread) obj).getChannel().q() == j) {
+            if (((ActiveJoinedThread) obj).getChannel().r() == j) {
                 arrayList.add(obj);
             }
         }
@@ -200,8 +200,8 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
     @StoreThread
     public final void handleChannelCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        for (Channel channel2 : getActiveJoinedThreadsForChannelInternal$app_productionGoogleRelease(channel.g())) {
-            updateThread(channel2.e(), channel2.g());
+        for (Channel channel2 : getActiveJoinedThreadsForChannelInternal$app_productionGoogleRelease(channel.h())) {
+            updateThread(channel2.f(), channel2.h());
         }
     }
 
@@ -222,7 +222,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
     public final void handleGuildDelete(long j) {
         Iterator<ActiveJoinedThread> it = this.activeJoinedThreads.values().iterator();
         while (it.hasNext()) {
-            if (it.next().getChannel().e() == j) {
+            if (it.next().getChannel().f() == j) {
                 it.remove();
                 markChanged();
             }
@@ -232,7 +232,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
     @StoreThread
     public final void handleThreadCreateOrUpdateOrDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        updateThread(channel.e(), channel.g());
+        updateThread(channel.f(), channel.h());
     }
 
     @StoreThread
@@ -255,15 +255,15 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
     }
 
     public final Observable<Map<Long, ActiveJoinedThread>> observeActiveJoinedThreadsForChannel(long j, long j2) {
-        Observable<Map<Long, ActiveJoinedThread>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActiveJoined$observeActiveJoinedThreadsForChannel$1(this, j, j2), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, ActiveJoinedThread>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActiveJoined$observeActiveJoinedThreadsForChannel$1(this, j, j2), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Map<Long, ActiveJoinedThread>>> observeActiveJoinedThreadsForGuild(long j) {
-        Observable<Map<Long, Map<Long, ActiveJoinedThread>>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActiveJoined$observeActiveJoinedThreadsForGuild$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Map<Long, ActiveJoinedThread>>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreThreadsActiveJoined$observeActiveJoinedThreadsForGuild$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, ActiveJoinedThread>> observeAllActiveJoinedThreadsById() {
@@ -277,7 +277,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
         Collection<ActiveJoinedThread> values = this.activeJoinedThreads.values();
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Object obj : values) {
-            Long valueOf = Long.valueOf(((ActiveJoinedThread) obj).getChannel().e());
+            Long valueOf = Long.valueOf(((ActiveJoinedThread) obj).getChannel().f());
             Object obj2 = linkedHashMap.get(valueOf);
             if (obj2 == null) {
                 obj2 = new ArrayList();
@@ -290,7 +290,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
             Object key = entry.getKey();
             LinkedHashMap linkedHashMap3 = new LinkedHashMap();
             for (Object obj3 : (List) entry.getValue()) {
-                Long valueOf2 = Long.valueOf(((ActiveJoinedThread) obj3).getChannel().q());
+                Long valueOf2 = Long.valueOf(((ActiveJoinedThread) obj3).getChannel().r());
                 Object obj4 = linkedHashMap3.get(valueOf2);
                 if (obj4 == null) {
                     obj4 = new ArrayList();
@@ -304,7 +304,7 @@ public final class StoreThreadsActiveJoined extends StoreV2 {
                 List list = (List) entry2.getValue();
                 LinkedHashMap linkedHashMap5 = new LinkedHashMap(a.I(list, 10, 16));
                 for (Object obj5 : list) {
-                    linkedHashMap5.put(Long.valueOf(((ActiveJoinedThread) obj5).getChannel().g()), obj5);
+                    linkedHashMap5.put(Long.valueOf(((ActiveJoinedThread) obj5).getChannel().h()), obj5);
                 }
                 linkedHashMap4.put(key2, linkedHashMap5);
             }
diff --git a/app/src/main/java/com/discord/stores/StoreThreadsJoined.java b/app/src/main/java/com/discord/stores/StoreThreadsJoined.java
index c045148ac2..b8a2b991c7 100644
--- a/app/src/main/java/com/discord/stores/StoreThreadsJoined.java
+++ b/app/src/main/java/com/discord/stores/StoreThreadsJoined.java
@@ -5,6 +5,7 @@ import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.guild.Guild;
+import com.discord.api.thread.AugmentedThreadMember;
 import com.discord.api.thread.ThreadMember;
 import com.discord.api.thread.ThreadMemberUpdate;
 import com.discord.api.thread.ThreadMembersUpdate;
@@ -150,12 +151,12 @@ public final class StoreThreadsJoined extends StoreV2 {
     }
 
     private final void saveThreads(Guild guild) {
-        ThreadMember i;
+        ThreadMember j;
         List<Channel> K = guild.K();
         if (K != null) {
             for (Channel channel : K) {
-                if (AnimatableValueParser.y1(channel) && (i = channel.i()) != null) {
-                    this.joinedThreads.put(Long.valueOf(channel.g()), new JoinedThread(channel.g(), guild.o(), i.b(), i.d()));
+                if (AnimatableValueParser.z1(channel) && (j = channel.j()) != null) {
+                    this.joinedThreads.put(Long.valueOf(channel.h()), new JoinedThread(channel.h(), guild.o(), j.a(), j.c()));
                     markChanged();
                 }
             }
@@ -202,12 +203,12 @@ public final class StoreThreadsJoined extends StoreV2 {
         m.checkNotNullParameter(searchState, "searchState");
         List<Channel> threads = searchState.getThreads();
         if (!(threads == null || (channel = threads.get(0)) == null)) {
-            long e = channel.e();
+            long f = channel.f();
             List<ThreadMember> threadMembers = searchState.getThreadMembers();
             if (threadMembers != null) {
                 for (ThreadMember threadMember : threadMembers) {
-                    if (threadMember.e() == this.storeUser.getMe().getId()) {
-                        this.joinedThreads.put(Long.valueOf(threadMember.c()), new JoinedThread(threadMember.c(), e, threadMember.b(), threadMember.d()));
+                    if (threadMember.d() == this.storeUser.getMe().getId()) {
+                        this.joinedThreads.put(Long.valueOf(threadMember.b()), new JoinedThread(threadMember.b(), f, threadMember.a(), threadMember.c()));
                     }
                 }
             }
@@ -217,9 +218,9 @@ public final class StoreThreadsJoined extends StoreV2 {
     @StoreThread
     public final void handleThreadCreateOrUpdate(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        ThreadMember i = channel.i();
-        if (i != null && i.e() == this.storeUser.getMe().getId()) {
-            this.joinedThreads.put(Long.valueOf(channel.g()), new JoinedThread(channel.g(), channel.e(), i.b(), i.d()));
+        ThreadMember j = channel.j();
+        if (j != null && j.d() == this.storeUser.getMe().getId()) {
+            this.joinedThreads.put(Long.valueOf(channel.h()), new JoinedThread(channel.h(), channel.f(), j.a(), j.c()));
             markChanged();
         }
     }
@@ -227,8 +228,8 @@ public final class StoreThreadsJoined extends StoreV2 {
     @StoreThread
     public final void handleThreadDelete(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        if (this.joinedThreads.containsKey(Long.valueOf(channel.g()))) {
-            this.joinedThreads.remove(Long.valueOf(channel.g()));
+        if (this.joinedThreads.containsKey(Long.valueOf(channel.h()))) {
+            this.joinedThreads.remove(Long.valueOf(channel.h()));
             markChanged();
         }
     }
@@ -239,7 +240,7 @@ public final class StoreThreadsJoined extends StoreV2 {
         List<ThreadMember> members = modelThreadListSync.getMembers();
         if (members != null) {
             for (ThreadMember threadMember : members) {
-                this.joinedThreads.put(Long.valueOf(threadMember.c()), new JoinedThread(threadMember.c(), modelThreadListSync.getGuildId(), threadMember.b(), threadMember.d()));
+                this.joinedThreads.put(Long.valueOf(threadMember.b()), new JoinedThread(threadMember.b(), modelThreadListSync.getGuildId(), threadMember.a(), threadMember.c()));
                 markChanged();
             }
         }
@@ -266,8 +267,8 @@ public final class StoreThreadsJoined extends StoreV2 {
             this.joinedThreads.remove(Long.valueOf(threadMembersUpdate.c()));
             markChanged();
         }
-        List<ThreadMember> a = threadMembersUpdate.a();
-        ThreadMember threadMember = null;
+        List<AugmentedThreadMember> a = threadMembersUpdate.a();
+        AugmentedThreadMember augmentedThreadMember = null;
         if (a != null) {
             Iterator<T> it = a.iterator();
             while (true) {
@@ -275,7 +276,7 @@ public final class StoreThreadsJoined extends StoreV2 {
                     break;
                 }
                 Object next = it.next();
-                if (((ThreadMember) next).e() == id2) {
+                if (((AugmentedThreadMember) next).e() == id2) {
                     z2 = true;
                     continue;
                 } else {
@@ -283,14 +284,14 @@ public final class StoreThreadsJoined extends StoreV2 {
                     continue;
                 }
                 if (z2) {
-                    threadMember = next;
+                    augmentedThreadMember = next;
                     break;
                 }
             }
-            threadMember = threadMember;
+            augmentedThreadMember = augmentedThreadMember;
         }
-        if (threadMember != null) {
-            this.joinedThreads.put(Long.valueOf(threadMembersUpdate.c()), new JoinedThread(threadMembersUpdate.c(), threadMembersUpdate.b(), threadMember.b(), threadMember.d()));
+        if (augmentedThreadMember != null) {
+            this.joinedThreads.put(Long.valueOf(threadMembersUpdate.c()), new JoinedThread(threadMembersUpdate.c(), threadMembersUpdate.b(), augmentedThreadMember.a(), augmentedThreadMember.b()));
             markChanged();
         }
     }
diff --git a/app/src/main/java/com/discord/stores/StoreUser.java b/app/src/main/java/com/discord/stores/StoreUser.java
index 56e9ed70a7..41a1e797ae 100644
--- a/app/src/main/java/com/discord/stores/StoreUser.java
+++ b/app/src/main/java/com/discord/stores/StoreUser.java
@@ -11,6 +11,10 @@ import com.discord.api.guildmember.GuildMembersChunk;
 import com.discord.api.message.Message;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.presence.Presence;
+import com.discord.api.thread.AugmentedThreadMember;
+import com.discord.api.thread.ThreadListMember;
+import com.discord.api.thread.ThreadMemberListUpdate;
+import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.NsfwAllowance;
 import com.discord.api.user.User;
 import com.discord.app.AppLog;
@@ -22,7 +26,6 @@ import com.discord.stores.StoreMessagesLoader;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.utilities.collections.SnowflakePartitionMap;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.persister.Persister;
 import com.discord.utilities.user.UserRequestManager;
 import com.discord.utilities.user.UserUtils;
@@ -51,7 +54,7 @@ public final class StoreUser extends StoreV2 {
     private final Dispatcher dispatcher;
 
     /* renamed from: me  reason: collision with root package name */
-    private MeUser f2100me;
+    private MeUser f2106me;
     private final Persister<MeUser> meCache;
     private MeUser meSnapshot;
     private final Function1<User, Unit> notifyUserUpdated;
@@ -90,7 +93,7 @@ public final class StoreUser extends StoreV2 {
         this.observationDeck = observationDeck;
         this.meCache = persister;
         MeUser meUser = EMPTY_ME_USER;
-        this.f2100me = meUser;
+        this.f2106me = meUser;
         this.users = new SnowflakePartitionMap.CopiablePartitionMap<>(0, 1, null);
         this.meSnapshot = meUser;
         this.usersSnapshot = h0.emptyMap();
@@ -115,7 +118,7 @@ public final class StoreUser extends StoreV2 {
     }
 
     public static final /* synthetic */ MeUser access$getMe$p(StoreUser storeUser) {
-        return storeUser.f2100me;
+        return storeUser.f2106me;
     }
 
     public static final /* synthetic */ ObservationDeck.UpdateSource access$getMeUpdate$cp() {
@@ -131,7 +134,7 @@ public final class StoreUser extends StoreV2 {
     }
 
     public static final /* synthetic */ void access$setMe$p(StoreUser storeUser, MeUser meUser) {
-        storeUser.f2100me = meUser;
+        storeUser.f2106me = meUser;
     }
 
     @StoreThread
@@ -173,7 +176,7 @@ public final class StoreUser extends StoreV2 {
 
     @StoreThread
     public final MeUser getMeInternal$app_productionGoogleRelease() {
-        return this.f2100me;
+        return this.f2106me;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map<java.lang.Long, ? extends com.discord.models.user.User>, java.util.Map<java.lang.Long, com.discord.models.user.User> */
@@ -210,16 +213,16 @@ public final class StoreUser extends StoreV2 {
     public final void handleAuthToken(String str) {
         if (str == null) {
             markChanged(MeUpdate);
-            this.f2100me = EMPTY_ME_USER;
+            this.f2106me = EMPTY_ME_USER;
         }
     }
 
     @StoreThread
     public final void handleChannelCreated(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        List<User> v = channel.v();
-        if (v != null) {
-            for (User user : v) {
+        List<User> w = channel.w();
+        if (w != null) {
+            for (User user : w) {
                 updateUser(user);
             }
         }
@@ -232,7 +235,7 @@ public final class StoreUser extends StoreV2 {
         User me2 = modelPayload.getMe();
         m.checkNotNullExpressionValue(me2, "payload.me");
         MeUser meUser = new MeUser(me2);
-        this.f2100me = meUser;
+        this.f2106me = meUser;
         this.users.put(Long.valueOf(meUser.getId()), meUser);
         for (Channel channel : modelPayload.getPrivateChannels()) {
             m.checkNotNullExpressionValue(channel, "channel");
@@ -296,14 +299,15 @@ public final class StoreUser extends StoreV2 {
     @StoreThread
     public final void handleMessageCreateOrUpdate(Message message) {
         m.checkNotNullParameter(message, "message");
-        List<User> z2 = message.z();
-        if (z2 != null) {
-            for (User user : z2) {
+        List<User> t = message.t();
+        if (t != null) {
+            for (User user : t) {
                 updateUser(user);
             }
         }
-        if (MessageUtils.INSTANCE.isUrgent(message)) {
-            this.f2100me = MeUser.copy$default(this.f2100me, 0, null, null, null, false, false, 0, null, null, false, false, null, this.f2100me.getFlags() | 8192, 0, null, null, null, null, 258047, null);
+        Long l = message.l();
+        if (((l != null ? l.longValue() : 0) & 16) != 0) {
+            this.f2106me = MeUser.copy$default(this.f2106me, 0, null, null, null, false, false, 0, null, null, false, false, null, this.f2106me.getFlags() | 8192, 0, null, null, null, null, 258047, null);
             markChanged(MeUpdate);
         }
     }
@@ -311,14 +315,14 @@ public final class StoreUser extends StoreV2 {
     @StoreThread
     public final void handleMessagesLoaded(StoreMessagesLoader.ChannelChunk channelChunk) {
         m.checkNotNullParameter(channelChunk, "chunk");
-        for (Message message : channelChunk.getMessages()) {
-            User g = message.g();
-            if (g != null) {
-                updateUser(g);
+        for (com.discord.models.message.Message message : channelChunk.getMessages()) {
+            User author = message.getAuthor();
+            if (author != null) {
+                updateUser(author);
             }
-            List<User> z2 = message.z();
-            if (z2 != null) {
-                for (User user : z2) {
+            List<User> mentions = message.getMentions();
+            if (mentions != null) {
+                for (User user : mentions) {
                     updateUser(user);
                 }
             }
@@ -334,6 +338,44 @@ public final class StoreUser extends StoreV2 {
         }
     }
 
+    @StoreThread
+    public final void handleThreadMemberListUpdate(ThreadMemberListUpdate threadMemberListUpdate) {
+        m.checkNotNullParameter(threadMemberListUpdate, "threadMemberListUpdate");
+        List<ThreadListMember> b = threadMemberListUpdate.b();
+        if (b != null) {
+            for (ThreadListMember threadListMember : b) {
+                GuildMember a = threadListMember.a();
+                if (a != null) {
+                    updateUser(a.j());
+                }
+                Presence b2 = threadListMember.b();
+                User f = b2 != null ? b2.f() : null;
+                if (f != null) {
+                    updateUser(f);
+                }
+            }
+        }
+    }
+
+    @StoreThread
+    public final void handleThreadMembersUpdate(ThreadMembersUpdate threadMembersUpdate) {
+        m.checkNotNullParameter(threadMembersUpdate, "threadMembersUpdate");
+        List<AugmentedThreadMember> a = threadMembersUpdate.a();
+        if (a != null) {
+            for (AugmentedThreadMember augmentedThreadMember : a) {
+                GuildMember c2 = augmentedThreadMember.c();
+                if (c2 != null) {
+                    updateUser(c2.j());
+                }
+                Presence d = augmentedThreadMember.d();
+                User f = d != null ? d.f() : null;
+                if (f != null) {
+                    updateUser(f);
+                }
+            }
+        }
+    }
+
     @StoreThread
     public final void handleUserRelationshipAdd(ModelUserRelationship modelUserRelationship) {
         m.checkNotNullParameter(modelUserRelationship, "relationship");
@@ -346,8 +388,8 @@ public final class StoreUser extends StoreV2 {
     public final void handleUserUpdated(User user) {
         m.checkNotNullParameter(user, "user");
         updateUser(user);
-        if (this.f2100me.getId() == user.i()) {
-            this.f2100me = MeUser.Companion.merge(this.f2100me, user);
+        if (this.f2106me.getId() == user.i()) {
+            this.f2106me = MeUser.Companion.merge(this.f2106me, user);
             markChanged(MeUpdate);
         }
     }
@@ -356,7 +398,7 @@ public final class StoreUser extends StoreV2 {
     public void init(Context context) {
         m.checkNotNullParameter(context, "context");
         super.init(context);
-        this.f2100me = this.meCache.get();
+        this.f2106me = this.meCache.get();
         markChanged(MeUpdate);
     }
 
@@ -369,21 +411,21 @@ public final class StoreUser extends StoreV2 {
     }
 
     public final Observable<MeUser> observeMe(boolean z2) {
-        Observable<MeUser> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{MeUpdate}, false, null, null, new StoreUser$observeMe$1(this), 14, null).y(new StoreUser$observeMe$2(z2)).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<MeUser> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{MeUpdate}, false, null, null, new StoreUser$observeMe$1(this), 14, null).x(new StoreUser$observeMe$2(z2)).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Long> observeMeId() {
-        Observable<Long> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{MeUpdate}, false, null, null, new StoreUser$observeMeId$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Long> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{MeUpdate}, false, null, null, new StoreUser$observeMeId$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<com.discord.models.user.User> observeUser(long j) {
-        Observable<com.discord.models.user.User> s2 = observeAllUsers().G(new StoreUser$observeUser$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeAllUsers()\n      …  .distinctUntilChanged()");
-        return s2;
+        Observable<com.discord.models.user.User> r = observeAllUsers().F(new StoreUser$observeUser$1(j)).r();
+        m.checkNotNullExpressionValue(r, "observeAllUsers()\n      …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, String>> observeUsernames(Collection<Long> collection) {
@@ -400,9 +442,9 @@ public final class StoreUser extends StoreV2 {
 
     public final Observable<Map<Long, com.discord.models.user.User>> observeUsers(Collection<Long> collection, boolean z2) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, com.discord.models.user.User>> u = observeAllUsers().k(q.a(collection)).u(new StoreUser$observeUsers$1(this, z2, collection));
-        m.checkNotNullExpressionValue(u, "observeAllUsers()\n      …ys)\n          }\n        }");
-        return u;
+        Observable<Map<Long, com.discord.models.user.User>> t = observeAllUsers().k(q.a(collection)).t(new StoreUser$observeUsers$1(this, z2, collection));
+        m.checkNotNullExpressionValue(t, "observeAllUsers()\n      …ys)\n          }\n        }");
+        return t;
     }
 
     @Override // com.discord.stores.StoreV2
@@ -412,7 +454,7 @@ public final class StoreUser extends StoreV2 {
             this.usersSnapshot = this.users.fastCopy();
         }
         if (getUpdateSources().contains(MeUpdate)) {
-            MeUser meUser = this.f2100me;
+            MeUser meUser = this.f2106me;
             this.meSnapshot = meUser;
             Persister.set$default(this.meCache, meUser, false, 2, null);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreUserAffinities.java b/app/src/main/java/com/discord/stores/StoreUserAffinities.java
index 2b3cfd7852..69e3b140d5 100644
--- a/app/src/main/java/com/discord/stores/StoreUserAffinities.java
+++ b/app/src/main/java/com/discord/stores/StoreUserAffinities.java
@@ -72,9 +72,9 @@ public final class StoreUserAffinities extends StoreV2 {
     }
 
     public final Observable<List<Long>> observeAffinityUserIds() {
-        Observable<List<Long>> s2 = observeUserAffinities().G(StoreUserAffinities$observeAffinityUserIds$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeUserAffinities()\n…  .distinctUntilChanged()");
-        return s2;
+        Observable<List<Long>> r = observeUserAffinities().F(StoreUserAffinities$observeAffinityUserIds$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeUserAffinities()\n…  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.java b/app/src/main/java/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.java
index 2fc4aa477b..2904886308 100644
--- a/app/src/main/java/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.java
+++ b/app/src/main/java/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.java
@@ -32,7 +32,7 @@ public final class StoreUserGuildSettings$setChannelMuted$1 extends o implements
     public final void mo1invoke() {
         Channel findChannelByIdInternal$app_productionGoogleRelease = StoreUserGuildSettings.access$getStoreChannels$p(this.this$0).findChannelByIdInternal$app_productionGoogleRelease(this.$channelId);
         if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-            StoreUserGuildSettings.access$updateUserGuildSettings(this.this$0, this.$context, findChannelByIdInternal$app_productionGoogleRelease.e(), new RestAPIParams.UserGuildSettings(findChannelByIdInternal$app_productionGoogleRelease.g(), new RestAPIParams.UserGuildSettings.ChannelOverride(Boolean.valueOf(this.$muted), this.$muteConfig, null, 4, null)), AnimatableValueParser.x1(findChannelByIdInternal$app_productionGoogleRelease) ? StoreUserGuildSettings.SettingsUpdateType.CHANNEL : StoreUserGuildSettings.SettingsUpdateType.CATEGORY);
+            StoreUserGuildSettings.access$updateUserGuildSettings(this.this$0, this.$context, findChannelByIdInternal$app_productionGoogleRelease.f(), new RestAPIParams.UserGuildSettings(findChannelByIdInternal$app_productionGoogleRelease.h(), new RestAPIParams.UserGuildSettings.ChannelOverride(Boolean.valueOf(this.$muted), this.$muteConfig, null, 4, null)), AnimatableValueParser.y1(findChannelByIdInternal$app_productionGoogleRelease) ? StoreUserGuildSettings.SettingsUpdateType.CHANNEL : StoreUserGuildSettings.SettingsUpdateType.CATEGORY);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java b/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
index e1fae16f01..47f0260432 100644
--- a/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreUserGuildSettings.java
@@ -139,7 +139,7 @@ public final class StoreUserGuildSettings extends StoreV2 {
         this.guildsToHideMutedChannelsInSnapshot = n0.emptySet();
         this.guildSettingsCache = new Persister<>("STORE_SETTINGS_USER_GUILD_V5", new HashMap());
         this.guildsToHideMutedChannelsInCache = new Persister<>("STORE_SHOW_HIDE_MUTED_CHANNELS_V2", new HashSet());
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -203,9 +203,9 @@ public final class StoreUserGuildSettings extends StoreV2 {
             j = Math.min(j, modelNotificationSettings2.getNextMuteEndTimeMs(this.clock));
         }
         if (j < Long.MAX_VALUE) {
-            Observable<Long> f02 = Observable.f0(j - this.clock.currentTimeMillis(), TimeUnit.MILLISECONDS, this.dispatcher.getScheduler());
-            m.checkNotNullExpressionValue(f02, "Observable.timer(\n      …patcher.scheduler\n      )");
-            ObservableExtensionsKt.appSubscribe$default(f02, StoreUserGuildSettings.class, (Context) null, new StoreUserGuildSettings$handleGuildSettings$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserGuildSettings$handleGuildSettings$2(this), 58, (Object) null);
+            Observable<Long> e02 = Observable.e0(j - this.clock.currentTimeMillis(), TimeUnit.MILLISECONDS, this.dispatcher.getScheduler());
+            m.checkNotNullExpressionValue(e02, "Observable.timer(\n      …patcher.scheduler\n      )");
+            ObservableExtensionsKt.appSubscribe$default(e02, StoreUserGuildSettings.class, (Context) null, new StoreUserGuildSettings$handleGuildSettings$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserGuildSettings$handleGuildSettings$2(this), 58, (Object) null);
         }
     }
 
@@ -294,27 +294,27 @@ public final class StoreUserGuildSettings extends StoreV2 {
     }
 
     public final Observable<ModelNotificationSettings> observeGuildSettings(long j) {
-        Observable<ModelNotificationSettings> s2 = observeGuildSettings().G(new StoreUserGuildSettings$observeGuildSettings$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeGuildSettings()\n …  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelNotificationSettings> r = observeGuildSettings().F(new StoreUserGuildSettings$observeGuildSettings$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observeGuildSettings()\n …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeHideMutedChannels(long j) {
-        Observable<Boolean> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserGuildSettings$observeHideMutedChannels$1(this), 14, null).G(new StoreUserGuildSettings$observeHideMutedChannels$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserGuildSettings$observeHideMutedChannels$1(this), 14, null).F(new StoreUserGuildSettings$observeHideMutedChannels$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<List<Long>> observeMutedGuildIds() {
-        Observable<List<Long>> s2 = observeGuildSettings().G(StoreUserGuildSettings$observeMutedGuildIds$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeGuildSettings()\n …  .distinctUntilChanged()");
-        return s2;
+        Observable<List<Long>> r = observeGuildSettings().F(StoreUserGuildSettings$observeMutedGuildIds$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeGuildSettings()\n …  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setChannelFrequency(Context context, Channel channel, int i) {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(channel, "channel");
-        updateUserGuildSettings(context, channel.e(), new RestAPIParams.UserGuildSettings(channel.g(), new RestAPIParams.UserGuildSettings.ChannelOverride(Integer.valueOf(i))), SettingsUpdateType.CHANNEL);
+        updateUserGuildSettings(context, channel.f(), new RestAPIParams.UserGuildSettings(channel.h(), new RestAPIParams.UserGuildSettings.ChannelOverride(Integer.valueOf(i))), SettingsUpdateType.CHANNEL);
     }
 
     public final void setChannelMuted(Context context, long j, boolean z2, ModelMuteConfig modelMuteConfig) {
@@ -325,7 +325,7 @@ public final class StoreUserGuildSettings extends StoreV2 {
     public final void setChannelNotificationsDefault(Context context, Channel channel) {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(channel, "channel");
-        updateUserGuildSettings(context, channel.e(), new RestAPIParams.UserGuildSettings(channel.g(), new RestAPIParams.UserGuildSettings.ChannelOverride(Boolean.FALSE, null, Integer.valueOf(ModelNotificationSettings.FREQUENCY_UNSET))), SettingsUpdateType.CHANNEL);
+        updateUserGuildSettings(context, channel.f(), new RestAPIParams.UserGuildSettings(channel.h(), new RestAPIParams.UserGuildSettings.ChannelOverride(Boolean.FALSE, null, Integer.valueOf(ModelNotificationSettings.FREQUENCY_UNSET))), SettingsUpdateType.CHANNEL);
     }
 
     public final void setGuildFrequency(Context context, Guild guild, int i) {
diff --git a/app/src/main/java/com/discord/stores/StoreUserNotes.java b/app/src/main/java/com/discord/stores/StoreUserNotes.java
index b8e2ed416c..8fefe9ca4c 100644
--- a/app/src/main/java/com/discord/stores/StoreUserNotes.java
+++ b/app/src/main/java/com/discord/stores/StoreUserNotes.java
@@ -191,9 +191,9 @@ public final class StoreUserNotes extends StoreV2 {
     }
 
     public final Observable<UserNoteState> observeUserNote(long j) {
-        Observable<UserNoteState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserNotes$observeUserNote$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<UserNoteState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserNotes$observeUserNote$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final void saveNote(Context context, long j, String str) {
diff --git a/app/src/main/java/com/discord/stores/StoreUserPresence.java b/app/src/main/java/com/discord/stores/StoreUserPresence.java
index ae0c26ea45..46ed1c947e 100644
--- a/app/src/main/java/com/discord/stores/StoreUserPresence.java
+++ b/app/src/main/java/com/discord/stores/StoreUserPresence.java
@@ -8,6 +8,10 @@ import com.discord.api.activity.ActivityType;
 import com.discord.api.guild.Guild;
 import com.discord.api.presence.ClientStatus;
 import com.discord.api.presence.ClientStatuses;
+import com.discord.api.thread.AugmentedThreadMember;
+import com.discord.api.thread.ThreadListMember;
+import com.discord.api.thread.ThreadMemberListUpdate;
+import com.discord.api.thread.ThreadMembersUpdate;
 import com.discord.api.user.User;
 import com.discord.models.domain.ModelCustomStatusSetting;
 import com.discord.models.domain.ModelPayload;
@@ -541,6 +545,34 @@ public final class StoreUserPresence extends StoreV2 {
         updateSelfPresence(null, list, true);
     }
 
+    @StoreThread
+    public final void handleThreadMemberListUpdate(ThreadMemberListUpdate threadMemberListUpdate) {
+        m.checkNotNullParameter(threadMemberListUpdate, "threadMemberListUpdate");
+        List<ThreadListMember> b = threadMemberListUpdate.b();
+        if (b != null) {
+            for (ThreadListMember threadListMember : b) {
+                com.discord.api.presence.Presence b2 = threadListMember.b();
+                if (b2 != null) {
+                    handlePresenceUpdate(threadMemberListUpdate.a(), threadListMember.c(), b2.e(), b2.c(), b2.b());
+                }
+            }
+        }
+    }
+
+    @StoreThread
+    public final void handleThreadMembersUpdate(ThreadMembersUpdate threadMembersUpdate) {
+        m.checkNotNullParameter(threadMembersUpdate, "threadMembersUpdate");
+        List<AugmentedThreadMember> a = threadMembersUpdate.a();
+        if (a != null) {
+            for (AugmentedThreadMember augmentedThreadMember : a) {
+                com.discord.api.presence.Presence d = augmentedThreadMember.d();
+                if (d != null) {
+                    handlePresenceUpdate(threadMembersUpdate.b(), augmentedThreadMember.e(), d.e(), d.c(), d.b());
+                }
+            }
+        }
+    }
+
     @StoreThread
     public final void handleUserSettingsUpdate(ModelUserSettings modelUserSettings) {
         m.checkNotNullParameter(modelUserSettings, "userSettings");
@@ -552,28 +584,28 @@ public final class StoreUserPresence extends StoreV2 {
     }
 
     public final Observable<Activity> observeApplicationActivity(long j, long j2) {
-        Observable<Activity> s2 = observePresenceForUser(j).G(new StoreUserPresence$observeApplicationActivity$1(j2)).s();
-        m.checkNotNullExpressionValue(s2, "observePresenceForUser(u…  .distinctUntilChanged()");
-        return s2;
+        Observable<Activity> r = observePresenceForUser(j).F(new StoreUserPresence$observeApplicationActivity$1(j2)).r();
+        m.checkNotNullExpressionValue(r, "observePresenceForUser(u…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Presence> observeLocalPresence() {
-        Observable<Presence> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{LocalPresenceUpdateSource}, false, null, null, new StoreUserPresence$observeLocalPresence$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n      .c…  .distinctUntilChanged()");
-        return s2;
+        Observable<Presence> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{LocalPresenceUpdateSource}, false, null, null, new StoreUserPresence$observeLocalPresence$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n      .c…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Presence> observePresenceForUser(long j) {
-        Observable<Presence> s2 = observeAllPresences().G(new StoreUserPresence$observePresenceForUser$1(j)).s();
-        m.checkNotNullExpressionValue(s2, "observeAllPresences()\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<Presence> r = observeAllPresences().F(new StoreUserPresence$observePresenceForUser$1(j)).r();
+        m.checkNotNullExpressionValue(r, "observeAllPresences()\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Presence>> observePresencesForUsers(Collection<Long> collection) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, Presence>> s2 = observeAllPresences().G(new StoreUserPresence$observePresencesForUsers$1(collection)).s();
-        m.checkNotNullExpressionValue(s2, "observeAllPresences()\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Presence>> r = observeAllPresences().F(new StoreUserPresence$observePresencesForUsers$1(collection)).r();
+        m.checkNotNullExpressionValue(r, "observeAllPresences()\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreUserProfile$request$1.java b/app/src/main/java/com/discord/stores/StoreUserProfile$fetchProfile$1.java
similarity index 69%
rename from app/src/main/java/com/discord/stores/StoreUserProfile$request$1.java
rename to app/src/main/java/com/discord/stores/StoreUserProfile$fetchProfile$1.java
index af40ff5846..e955a970a5 100644
--- a/app/src/main/java/com/discord/stores/StoreUserProfile$request$1.java
+++ b/app/src/main/java/com/discord/stores/StoreUserProfile$fetchProfile$1.java
@@ -12,17 +12,17 @@ import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import rx.Observable;
 /* compiled from: StoreUserProfile.kt */
-public final class StoreUserProfile$request$1 extends o implements Function0<Unit> {
+public final class StoreUserProfile$fetchProfile$1 extends o implements Function0<Unit> {
     public final /* synthetic */ long $userId;
     public final /* synthetic */ StoreUserProfile this$0;
 
     /* compiled from: StoreUserProfile.kt */
-    /* renamed from: com.discord.stores.StoreUserProfile$request$1$1  reason: invalid class name */
+    /* renamed from: com.discord.stores.StoreUserProfile$fetchProfile$1$1  reason: invalid class name */
     public static final class AnonymousClass1 extends o implements Function1<ModelUserProfile, Unit> {
-        public final /* synthetic */ StoreUserProfile$request$1 this$0;
+        public final /* synthetic */ StoreUserProfile$fetchProfile$1 this$0;
 
         /* compiled from: StoreUserProfile.kt */
-        /* renamed from: com.discord.stores.StoreUserProfile$request$1$1$1  reason: invalid class name */
+        /* renamed from: com.discord.stores.StoreUserProfile$fetchProfile$1$1$1  reason: invalid class name */
         public static final class AnonymousClass1 extends o implements Function0<Unit> {
             public final /* synthetic */ ModelUserProfile $it;
             public final /* synthetic */ AnonymousClass1 this$0;
@@ -39,16 +39,16 @@ public final class StoreUserProfile$request$1 extends o implements Function0<Uni
             public final void mo1invoke() {
                 ModelUserProfile modelUserProfile = this.$it;
                 if (modelUserProfile != null) {
-                    StoreUserProfile$request$1 storeUserProfile$request$1 = this.this$0.this$0;
-                    StoreUserProfile.access$handleUserProfile(storeUserProfile$request$1.this$0, modelUserProfile, storeUserProfile$request$1.$userId);
+                    StoreUserProfile$fetchProfile$1 storeUserProfile$fetchProfile$1 = this.this$0.this$0;
+                    StoreUserProfile.access$handleUserProfile(storeUserProfile$fetchProfile$1.this$0, modelUserProfile, storeUserProfile$fetchProfile$1.$userId);
                 }
             }
         }
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(StoreUserProfile$request$1 storeUserProfile$request$1) {
+        public AnonymousClass1(StoreUserProfile$fetchProfile$1 storeUserProfile$fetchProfile$1) {
             super(1);
-            this.this$0 = storeUserProfile$request$1;
+            this.this$0 = storeUserProfile$fetchProfile$1;
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -65,12 +65,12 @@ public final class StoreUserProfile$request$1 extends o implements Function0<Uni
     }
 
     /* compiled from: StoreUserProfile.kt */
-    /* renamed from: com.discord.stores.StoreUserProfile$request$1$2  reason: invalid class name */
+    /* renamed from: com.discord.stores.StoreUserProfile$fetchProfile$1$2  reason: invalid class name */
     public static final class AnonymousClass2 extends o implements Function1<Error, Unit> {
-        public final /* synthetic */ StoreUserProfile$request$1 this$0;
+        public final /* synthetic */ StoreUserProfile$fetchProfile$1 this$0;
 
         /* compiled from: StoreUserProfile.kt */
-        /* renamed from: com.discord.stores.StoreUserProfile$request$1$2$1  reason: invalid class name */
+        /* renamed from: com.discord.stores.StoreUserProfile$fetchProfile$1$2$1  reason: invalid class name */
         public static final class AnonymousClass1 extends o implements Function0<Unit> {
             public final /* synthetic */ AnonymousClass2 this$0;
 
@@ -83,15 +83,15 @@ public final class StoreUserProfile$request$1 extends o implements Function0<Uni
             @Override // kotlin.jvm.functions.Function0
             /* renamed from: invoke */
             public final void mo1invoke() {
-                StoreUserProfile$request$1 storeUserProfile$request$1 = this.this$0.this$0;
-                StoreUserProfile.access$handleFailure(storeUserProfile$request$1.this$0, storeUserProfile$request$1.$userId);
+                StoreUserProfile$fetchProfile$1 storeUserProfile$fetchProfile$1 = this.this$0.this$0;
+                StoreUserProfile.access$handleFailure(storeUserProfile$fetchProfile$1.this$0, storeUserProfile$fetchProfile$1.$userId);
             }
         }
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass2(StoreUserProfile$request$1 storeUserProfile$request$1) {
+        public AnonymousClass2(StoreUserProfile$fetchProfile$1 storeUserProfile$fetchProfile$1) {
             super(1);
-            this.this$0 = storeUserProfile$request$1;
+            this.this$0 = storeUserProfile$fetchProfile$1;
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -109,7 +109,7 @@ public final class StoreUserProfile$request$1 extends o implements Function0<Uni
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public StoreUserProfile$request$1(StoreUserProfile storeUserProfile, long j) {
+    public StoreUserProfile$fetchProfile$1(StoreUserProfile storeUserProfile, long j) {
         super(0);
         this.this$0 = storeUserProfile;
         this.$userId = j;
@@ -120,9 +120,9 @@ public final class StoreUserProfile$request$1 extends o implements Function0<Uni
     public final void mo1invoke() {
         if (!StoreUserProfile.access$getProfilesLoading$p(this.this$0).contains(Long.valueOf(this.$userId))) {
             StoreUserProfile.access$getProfilesLoading$p(this.this$0).add(Long.valueOf(this.$userId));
-            Observable s2 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().userProfileGet(this.$userId), false, 1, null).s();
-            m.checkNotNullExpressionValue(s2, "RestAPI\n          .api\n …  .distinctUntilChanged()");
-            ObservableExtensionsKt.appSubscribe$default(s2, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass2(this), (Function0) null, (Function0) null, new AnonymousClass1(this), 54, (Object) null);
+            Observable r = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().userProfileGet(this.$userId), false, 1, null).r();
+            m.checkNotNullExpressionValue(r, "RestAPI\n          .api\n …  .distinctUntilChanged()");
+            ObservableExtensionsKt.appSubscribe$default(r, this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass2(this), (Function0) null, (Function0) null, new AnonymousClass1(this), 54, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreUserProfile$observeUserProfile$1.java b/app/src/main/java/com/discord/stores/StoreUserProfile$observeUserProfile$1.java
index aedba4ffd3..5cbe4766c2 100644
--- a/app/src/main/java/com/discord/stores/StoreUserProfile$observeUserProfile$1.java
+++ b/app/src/main/java/com/discord/stores/StoreUserProfile$observeUserProfile$1.java
@@ -18,7 +18,6 @@ public final class StoreUserProfile$observeUserProfile$1 extends o implements Fu
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ModelUserProfile mo1invoke() {
-        ModelUserProfile modelUserProfile = (ModelUserProfile) StoreUserProfile.access$getProfilesSnapshot$p(this.this$0).get(Long.valueOf(this.$userId));
-        return modelUserProfile != null ? modelUserProfile : StoreUserProfile.access$getEmptyProfile$p(this.this$0);
+        return this.this$0.getUserProfile(this.$userId);
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreUserProfile$updateUser$1.java b/app/src/main/java/com/discord/stores/StoreUserProfile$updateUser$1.java
new file mode 100644
index 0000000000..5abb7bcce4
--- /dev/null
+++ b/app/src/main/java/com/discord/stores/StoreUserProfile$updateUser$1.java
@@ -0,0 +1,24 @@
+package com.discord.stores;
+
+import com.discord.api.user.User;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StoreUserProfile.kt */
+public final class StoreUserProfile$updateUser$1 extends o implements Function0<Unit> {
+    public final /* synthetic */ User $user;
+    public final /* synthetic */ StoreUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public StoreUserProfile$updateUser$1(StoreUserProfile storeUserProfile, User user) {
+        super(0);
+        this.this$0 = storeUserProfile;
+        this.$user = user;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+        StoreUserProfile.access$handleUser(this.this$0, this.$user);
+    }
+}
diff --git a/app/src/main/java/com/discord/stores/StoreUserProfile.java b/app/src/main/java/com/discord/stores/StoreUserProfile.java
index 299ac7f7fd..6b011fb08a 100644
--- a/app/src/main/java/com/discord/stores/StoreUserProfile.java
+++ b/app/src/main/java/com/discord/stores/StoreUserProfile.java
@@ -1,5 +1,6 @@
 package com.discord.stores;
 
+import com.discord.api.user.User;
 import com.discord.models.domain.ModelUserProfile;
 import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
@@ -12,19 +13,33 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 import rx.Observable;
 /* compiled from: StoreUserProfile.kt */
 public final class StoreUserProfile extends StoreV2 {
+    public static final Companion Companion = new Companion(null);
+    private static final ModelUserProfile EMPTY_PROFILE = new ModelUserProfile();
     private final Dispatcher dispatcher;
-    private final ModelUserProfile emptyProfile;
     private final ObservationDeck observationDeck;
     private final HashMap<Long, ModelUserProfile> profiles;
     private final HashSet<Long> profilesLoading;
     private Map<Long, ? extends ModelUserProfile> profilesSnapshot;
 
+    /* compiled from: StoreUserProfile.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final ModelUserProfile getEMPTY_PROFILE() {
+            return StoreUserProfile.access$getEMPTY_PROFILE$cp();
+        }
+    }
+
     public StoreUserProfile(Dispatcher dispatcher, ObservationDeck observationDeck) {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         m.checkNotNullParameter(observationDeck, "observationDeck");
         this.dispatcher = dispatcher;
         this.observationDeck = observationDeck;
-        this.emptyProfile = new ModelUserProfile();
         this.profilesLoading = new HashSet<>();
         this.profiles = new HashMap<>();
         this.profilesSnapshot = h0.emptyMap();
@@ -39,35 +54,41 @@ public final class StoreUserProfile extends StoreV2 {
         return storeUserProfile.dispatcher;
     }
 
-    public static final /* synthetic */ ModelUserProfile access$getEmptyProfile$p(StoreUserProfile storeUserProfile) {
-        return storeUserProfile.emptyProfile;
+    public static final /* synthetic */ ModelUserProfile access$getEMPTY_PROFILE$cp() {
+        return EMPTY_PROFILE;
     }
 
     public static final /* synthetic */ HashSet access$getProfilesLoading$p(StoreUserProfile storeUserProfile) {
         return storeUserProfile.profilesLoading;
     }
 
-    public static final /* synthetic */ Map access$getProfilesSnapshot$p(StoreUserProfile storeUserProfile) {
-        return storeUserProfile.profilesSnapshot;
-    }
-
     public static final /* synthetic */ void access$handleFailure(StoreUserProfile storeUserProfile, long j) {
         storeUserProfile.handleFailure(j);
     }
 
+    public static final /* synthetic */ void access$handleUser(StoreUserProfile storeUserProfile, User user) {
+        storeUserProfile.handleUser(user);
+    }
+
     public static final /* synthetic */ void access$handleUserProfile(StoreUserProfile storeUserProfile, ModelUserProfile modelUserProfile, long j) {
         storeUserProfile.handleUserProfile(modelUserProfile, j);
     }
 
-    public static final /* synthetic */ void access$setProfilesSnapshot$p(StoreUserProfile storeUserProfile, Map map) {
-        storeUserProfile.profilesSnapshot = map;
-    }
-
     @StoreThread
     private final void handleFailure(long j) {
         this.profilesLoading.remove(Long.valueOf(j));
     }
 
+    @StoreThread
+    private final void handleUser(User user) {
+        ModelUserProfile modelUserProfile = this.profiles.get(Long.valueOf(user.i()));
+        if (modelUserProfile != null) {
+            m.checkNotNullExpressionValue(modelUserProfile, "profiles[user.id] ?: return");
+            this.profiles.put(Long.valueOf(user.i()), new ModelUserProfile(modelUserProfile.getConnectedAccounts(), modelUserProfile.getMutualGuilds(), user, modelUserProfile.getPremiumSince(), modelUserProfile.getPremiumGuildSince()));
+            markChanged();
+        }
+    }
+
     @StoreThread
     private final void handleUserProfile(ModelUserProfile modelUserProfile, long j) {
         this.profilesLoading.remove(Long.valueOf(j));
@@ -75,15 +96,20 @@ public final class StoreUserProfile extends StoreV2 {
         markChanged();
     }
 
-    public final Observable<ModelUserProfile> observeUserProfile(long j) {
-        request(j);
-        Observable<ModelUserProfile> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserProfile$observeUserProfile$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+    public final void fetchProfile(long j) {
+        this.dispatcher.schedule(new StoreUserProfile$fetchProfile$1(this, j));
     }
 
-    public final void request(long j) {
-        this.dispatcher.schedule(new StoreUserProfile$request$1(this, j));
+    public final ModelUserProfile getUserProfile(long j) {
+        ModelUserProfile modelUserProfile = (ModelUserProfile) this.profilesSnapshot.get(Long.valueOf(j));
+        return modelUserProfile != null ? modelUserProfile : EMPTY_PROFILE;
+    }
+
+    public final Observable<ModelUserProfile> observeUserProfile(long j) {
+        fetchProfile(j);
+        Observable<ModelUserProfile> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserProfile$observeUserProfile$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
@@ -92,4 +118,9 @@ public final class StoreUserProfile extends StoreV2 {
         super.snapshotData();
         this.profilesSnapshot = new HashMap(this.profiles);
     }
+
+    public final void updateUser(User user) {
+        m.checkNotNullParameter(user, "user");
+        this.dispatcher.schedule(new StoreUserProfile$updateUser$1(this, user));
+    }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreUserRelationships.java b/app/src/main/java/com/discord/stores/StoreUserRelationships.java
index 037e4707b1..75efe8a0af 100644
--- a/app/src/main/java/com/discord/stores/StoreUserRelationships.java
+++ b/app/src/main/java/com/discord/stores/StoreUserRelationships.java
@@ -203,34 +203,34 @@ public final class StoreUserRelationships extends StoreV2 {
     }
 
     public final Observable<Map<Long, Integer>> observe() {
-        Observable<Map<Long, Integer>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserRelationships$observe$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Integer>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserRelationships$observe$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Integer> observe(long j) {
-        Observable<R> G = observe().G(new StoreUserRelationships$observe$3(j));
-        m.checkNotNullExpressionValue(G, "observe()\n          .map…> relationships[userId] }");
-        return G;
+        Observable<R> F = observe().F(new StoreUserRelationships$observe$3(j));
+        m.checkNotNullExpressionValue(F, "observe()\n          .map…> relationships[userId] }");
+        return F;
     }
 
     public final Observable<Map<Long, Integer>> observe(Collection<Long> collection) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, Integer>> s2 = observe().G(new StoreUserRelationships$observe$2(collection)).s();
-        m.checkNotNullExpressionValue(s2, "observe()\n          .map…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Integer>> r = observe().F(new StoreUserRelationships$observe$2(collection)).r();
+        m.checkNotNullExpressionValue(r, "observe()\n          .map…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, Integer>> observeForType(int i) {
-        Observable<Map<Long, Integer>> s2 = observe().G(new StoreUserRelationships$observeForType$1(i)).s();
-        m.checkNotNullExpressionValue(s2, "observe()\n          .map…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, Integer>> r = observe().F(new StoreUserRelationships$observeForType$1(i)).r();
+        m.checkNotNullExpressionValue(r, "observe()\n          .map…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<UserRelationshipsState> observeUserRelationshipsState() {
-        Observable<UserRelationshipsState> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserRelationships$observeUserRelationshipsState$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<UserRelationshipsState> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserRelationships$observeUserRelationshipsState$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings.java b/app/src/main/java/com/discord/stores/StoreUserSettings.java
index 35cdb4d572..e2b6f18a5a 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettings.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettings.java
@@ -35,16 +35,16 @@ public final class StoreUserSettings extends Store {
     private final Persister<Boolean> allowAccessibilityDetectionPublisher;
     private final Persister<Boolean> allowAnimatedEmojisPublisher;
     private final Persister<Boolean> autoPlayGifsPublisher;
-    private final SerializedSubject<ModelCustomStatusSetting, ModelCustomStatusSetting> customStatusSubject = new SerializedSubject<>(BehaviorSubject.l0());
-    private final SerializedSubject<Boolean, Boolean> defaultGuildsRestrictedSubject = new SerializedSubject<>(BehaviorSubject.l0());
+    private final SerializedSubject<ModelCustomStatusSetting, ModelCustomStatusSetting> customStatusSubject = new SerializedSubject<>(BehaviorSubject.k0());
+    private final SerializedSubject<Boolean, Boolean> defaultGuildsRestrictedSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Dispatcher dispatcher;
     private Subscription expireCustomStatusSubscription;
-    private final SerializedSubject<Integer, Integer> explicitContentFilterSubject = new SerializedSubject<>(BehaviorSubject.l0());
-    private final SerializedSubject<Integer, Integer> friendDiscoveryFlagsSubject = new SerializedSubject<>(BehaviorSubject.m0(0));
-    private final SerializedSubject<ModelUserSettings.FriendSourceFlags, ModelUserSettings.FriendSourceFlags> friendSourceFlagsSubject = new SerializedSubject<>(BehaviorSubject.l0());
+    private final SerializedSubject<Integer, Integer> explicitContentFilterSubject = new SerializedSubject<>(BehaviorSubject.k0());
+    private final SerializedSubject<Integer, Integer> friendDiscoveryFlagsSubject = new SerializedSubject<>(BehaviorSubject.l0(0));
+    private final SerializedSubject<ModelUserSettings.FriendSourceFlags, ModelUserSettings.FriendSourceFlags> friendSourceFlagsSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Persister<List<ModelGuildFolder>> guildFoldersPublisher = new Persister<>("STORE_SETTINGS_FOLDERS_V1", new ArrayList());
     private final Persister<List<Long>> restrictedGuildIdsPublisher = new Persister<>("RESTRICTED_GUILD_IDS", new ArrayList());
-    private final SerializedSubject<Boolean, Boolean> shouldRenderEmbedsSubject = new SerializedSubject<>(BehaviorSubject.l0());
+    private final SerializedSubject<Boolean, Boolean> shouldRenderEmbedsSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Persister<Boolean> showCurrentGame;
     private final Persister<Integer> stickerAnimationSettingsPublisher;
     private final Persister<Boolean> stickerSuggestionsPublisher;
@@ -220,9 +220,9 @@ public final class StoreUserSettings extends Store {
         if (!m.areEqual(modelCustomStatusSetting, ModelCustomStatusSetting.Companion.getCLEAR())) {
             m.checkNotNull(modelCustomStatusSetting);
             if (modelCustomStatusSetting.getExpiresAt() != null) {
-                Observable<Long> e02 = Observable.e0(f.coerceAtLeast(TimeUtils.parseUTCDate(modelCustomStatusSetting.getExpiresAt()) - ClockFactory.get().currentTimeMillis(), 0), TimeUnit.MILLISECONDS);
-                m.checkNotNullExpressionValue(e02, "Observable\n            .…l, TimeUnit.MILLISECONDS)");
-                ObservableExtensionsKt.appSubscribe$default(e02, getClass(), (Context) null, new StoreUserSettings$updateLocalCustomStatus$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserSettings$updateLocalCustomStatus$2(this), 58, (Object) null);
+                Observable<Long> d02 = Observable.d0(f.coerceAtLeast(TimeUtils.parseUTCDate(modelCustomStatusSetting.getExpiresAt()) - ClockFactory.get().currentTimeMillis(), 0), TimeUnit.MILLISECONDS);
+                m.checkNotNullExpressionValue(d02, "Observable\n            .…l, TimeUnit.MILLISECONDS)");
+                ObservableExtensionsKt.appSubscribe$default(d02, getClass(), (Context) null, new StoreUserSettings$updateLocalCustomStatus$1(this), (Function1) null, (Function0) null, (Function0) null, new StoreUserSettings$updateLocalCustomStatus$2(this), 58, (Object) null);
             }
         }
     }
@@ -307,45 +307,45 @@ public final class StoreUserSettings extends Store {
     }
 
     public final Observable<Consents> observeConsents() {
-        Observable<Consents> M = RestAPI.Companion.getApi().getConsents().M(StoreUserSettings$observeConsents$1.INSTANCE);
-        m.checkNotNullExpressionValue(M, "RestAPI\n          .api\n …turn { Consents.DEFAULT }");
-        return ObservableExtensionsKt.restSubscribeOn$default(M, false, 1, null);
+        Observable<Consents> L = RestAPI.Companion.getApi().getConsents().L(StoreUserSettings$observeConsents$1.INSTANCE);
+        m.checkNotNullExpressionValue(L, "RestAPI\n          .api\n …turn { Consents.DEFAULT }");
+        return ObservableExtensionsKt.restSubscribeOn$default(L, false, 1, null);
     }
 
     public final Observable<ModelCustomStatusSetting> observeCustomStatus() {
-        Observable<ModelCustomStatusSetting> s2 = ObservableExtensionsKt.computationLatest(this.customStatusSubject).s();
-        m.checkNotNullExpressionValue(s2, "customStatusSubject\n    …  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelCustomStatusSetting> r = ObservableExtensionsKt.computationLatest(this.customStatusSubject).r();
+        m.checkNotNullExpressionValue(r, "customStatusSubject\n    …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Integer> observeExplicitContentFilter() {
-        Observable<Integer> s2 = ObservableExtensionsKt.computationLatest(this.explicitContentFilterSubject).s();
-        m.checkNotNullExpressionValue(s2, "explicitContentFilterSub…  .distinctUntilChanged()");
-        return s2;
+        Observable<Integer> r = ObservableExtensionsKt.computationLatest(this.explicitContentFilterSubject).r();
+        m.checkNotNullExpressionValue(r, "explicitContentFilterSub…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Integer> observeFriendDiscoveryFlags() {
-        Observable<Integer> s2 = ObservableExtensionsKt.computationLatest(this.friendDiscoveryFlagsSubject).s();
-        m.checkNotNullExpressionValue(s2, "friendDiscoveryFlagsSubj…  .distinctUntilChanged()");
-        return s2;
+        Observable<Integer> r = ObservableExtensionsKt.computationLatest(this.friendDiscoveryFlagsSubject).r();
+        m.checkNotNullExpressionValue(r, "friendDiscoveryFlagsSubj…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<ModelUserSettings.FriendSourceFlags> observeFriendSourceFlags() {
-        Observable<ModelUserSettings.FriendSourceFlags> s2 = ObservableExtensionsKt.computationLatest(this.friendSourceFlagsSubject).s();
-        m.checkNotNullExpressionValue(s2, "friendSourceFlagsSubject…  .distinctUntilChanged()");
-        return s2;
+        Observable<ModelUserSettings.FriendSourceFlags> r = ObservableExtensionsKt.computationLatest(this.friendSourceFlagsSubject).r();
+        m.checkNotNullExpressionValue(r, "friendSourceFlagsSubject…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<List<ModelGuildFolder>> observeGuildFolders() {
-        Observable<List<ModelGuildFolder>> s2 = ObservableExtensionsKt.computationLatest(this.guildFoldersPublisher.getObservable()).s();
-        m.checkNotNullExpressionValue(s2, "guildFoldersPublisher\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<List<ModelGuildFolder>> r = ObservableExtensionsKt.computationLatest(this.guildFoldersPublisher.getObservable()).r();
+        m.checkNotNullExpressionValue(r, "guildFoldersPublisher\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeIsAccessibilityDetectionAllowed() {
-        Observable<Boolean> s2 = this.allowAccessibilityDetectionPublisher.getObservable().s();
-        m.checkNotNullExpressionValue(s2, "allowAccessibilityDetect…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = this.allowAccessibilityDetectionPublisher.getObservable().r();
+        m.checkNotNullExpressionValue(r, "allowAccessibilityDetect…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeIsAnimatedEmojisEnabled(boolean z2) {
@@ -353,9 +353,9 @@ public final class StoreUserSettings extends Store {
         if (z2) {
             observable = Observable.j(observable, this.accessibilityStore.observeReducedMotionEnabled(), StoreUserSettings$observeIsAnimatedEmojisEnabled$1$1.INSTANCE);
         }
-        Observable<Boolean> s2 = observable.s();
-        m.checkNotNullExpressionValue(s2, "allowAnimatedEmojisPubli…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = observable.r();
+        m.checkNotNullExpressionValue(r, "allowAnimatedEmojisPubli…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeIsAutoPlayGifsEnabled(boolean z2) {
@@ -363,21 +363,21 @@ public final class StoreUserSettings extends Store {
         if (z2) {
             observable = Observable.j(observable, this.accessibilityStore.observeReducedMotionEnabled(), StoreUserSettings$observeIsAutoPlayGifsEnabled$1$1.INSTANCE);
         }
-        Observable<Boolean> s2 = observable.s();
-        m.checkNotNullExpressionValue(s2, "autoPlayGifsPublisher\n  …  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = observable.r();
+        m.checkNotNullExpressionValue(r, "autoPlayGifsPublisher\n  …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeIsDefaultGuildsRestricted() {
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationLatest(this.defaultGuildsRestrictedSubject).s();
-        m.checkNotNullExpressionValue(s2, "defaultGuildsRestrictedS…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservableExtensionsKt.computationLatest(this.defaultGuildsRestrictedSubject).r();
+        m.checkNotNullExpressionValue(r, "defaultGuildsRestrictedS…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeIsRenderEmbedsEnabled() {
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationLatest(this.shouldRenderEmbedsSubject).s();
-        m.checkNotNullExpressionValue(s2, "shouldRenderEmbedsSubjec…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservableExtensionsKt.computationLatest(this.shouldRenderEmbedsSubject).r();
+        m.checkNotNullExpressionValue(r, "shouldRenderEmbedsSubjec…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Boolean> observeIsShowCurrentGameEnabled() {
@@ -389,9 +389,9 @@ public final class StoreUserSettings extends Store {
     }
 
     public final Observable<List<Long>> observeRestrictedGuildIds() {
-        Observable<List<Long>> s2 = ObservableExtensionsKt.computationLatest(this.restrictedGuildIdsPublisher.getObservable()).s();
-        m.checkNotNullExpressionValue(s2, "restrictedGuildIdsPublis…  .distinctUntilChanged()");
-        return s2;
+        Observable<List<Long>> r = ObservableExtensionsKt.computationLatest(this.restrictedGuildIdsPublisher.getObservable()).r();
+        m.checkNotNullExpressionValue(r, "restrictedGuildIdsPublis…  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Integer> observeStickerAnimationSettings(boolean z2) {
@@ -399,9 +399,9 @@ public final class StoreUserSettings extends Store {
         if (z2) {
             observable = Observable.j(observable, this.accessibilityStore.observeReducedMotionEnabled(), StoreUserSettings$observeStickerAnimationSettings$1$1.INSTANCE);
         }
-        Observable<Integer> s2 = observable.s();
-        m.checkNotNullExpressionValue(s2, "stickerAnimationSettings…  .distinctUntilChanged()");
-        return s2;
+        Observable<Integer> r = observable.r();
+        m.checkNotNullExpressionValue(r, "stickerAnimationSettings…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setDefaultGuildsRestricted(AppActivity appActivity, boolean z2, Collection<Long> collection) {
@@ -429,9 +429,9 @@ public final class StoreUserSettings extends Store {
     }
 
     public final Observable<ModelUserSettings> setIsAccessibilityDetectionAllowed(boolean z2) {
-        Observable<ModelUserSettings> u = RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithAllowAccessibilityDetection(Boolean.valueOf(z2))).u(new StoreUserSettings$setIsAccessibilityDetectionAllowed$1(this, z2));
-        m.checkNotNullExpressionValue(u, "RestAPI\n          .api\n …AccessibilityDetection) }");
-        return u;
+        Observable<ModelUserSettings> t = RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithAllowAccessibilityDetection(Boolean.valueOf(z2))).t(new StoreUserSettings$setIsAccessibilityDetectionAllowed$1(this, z2));
+        m.checkNotNullExpressionValue(t, "RestAPI\n          .api\n …AccessibilityDetection) }");
+        return t;
     }
 
     public final void setIsAnimatedEmojisEnabled(AppActivity appActivity, boolean z2) {
@@ -470,7 +470,7 @@ public final class StoreUserSettings extends Store {
     public final void setIsDeveloperMode(AppActivity appActivity, boolean z2) {
         if (getIsDeveloperMode() != z2) {
             if (appActivity != null) {
-                Companion.access$updateUserSettings(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithDeveloperMode(z2), 2131893844);
+                Companion.access$updateUserSettings(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithDeveloperMode(z2), 2131893942);
             }
             setDeveloperModeInternal(z2);
         }
diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
index cf6e24ace6..330340d397 100644
--- a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
+++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java
@@ -266,11 +266,11 @@ public final class StoreUserSettingsSystem extends StoreV2 {
     public final Observable<Settings> observeSettings(boolean z2) {
         Observable connectRx$default = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserSettingsSystem$observeSettings$1(this), 14, null);
         if (z2) {
-            connectRx$default = connectRx$default.P(1500, TimeUnit.MILLISECONDS);
+            connectRx$default = connectRx$default.O(1500, TimeUnit.MILLISECONDS);
         }
-        Observable<Settings> s2 = connectRx$default.s();
-        m.checkNotNullExpressionValue(s2, "ObservationDeckProvider\n…  .distinctUntilChanged()");
-        return s2;
+        Observable<Settings> r = connectRx$default.r();
+        m.checkNotNullExpressionValue(r, "ObservationDeckProvider\n…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setFontScale(int i) {
diff --git a/app/src/main/java/com/discord/stores/StoreUserTyping.java b/app/src/main/java/com/discord/stores/StoreUserTyping.java
index ac0df205e0..18261f7eba 100644
--- a/app/src/main/java/com/discord/stores/StoreUserTyping.java
+++ b/app/src/main/java/com/discord/stores/StoreUserTyping.java
@@ -86,10 +86,10 @@ public final class StoreUserTyping extends StoreV2 {
     @StoreThread
     public final void handleMessageCreate(Message message) {
         m.checkNotNullParameter(message, "message");
-        User g = message.g();
-        if (g != null) {
-            long i = g.i();
-            Set<Long> set = this.typingUsers.get(Long.valueOf(message.i()));
+        User e = message.e();
+        if (e != null) {
+            long i = e.i();
+            Set<Long> set = this.typingUsers.get(Long.valueOf(message.g()));
             if (set != null) {
                 m.checkNotNullExpressionValue(set, "typingUsers[message.channelId] ?: return");
                 if (set.remove(Long.valueOf(i))) {
@@ -134,9 +134,9 @@ public final class StoreUserTyping extends StoreV2 {
     }
 
     public final Observable<Set<Long>> observeTypingUsers(long j) {
-        Observable<Set<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserTyping$observeTypingUsers$1(this), 14, null).G(new StoreUserTyping$observeTypingUsers$2(j)).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreUserTyping$observeTypingUsers$1(this), 14, null).F(new StoreUserTyping$observeTypingUsers$2(j)).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 
     public final void setUserTyping(long j) {
diff --git a/app/src/main/java/com/discord/stores/StoreVideoStreams.java b/app/src/main/java/com/discord/stores/StoreVideoStreams.java
index 92441d0911..3475e7a022 100644
--- a/app/src/main/java/com/discord/stores/StoreVideoStreams.java
+++ b/app/src/main/java/com/discord/stores/StoreVideoStreams.java
@@ -232,7 +232,7 @@ public final class StoreVideoStreams extends StoreV2 {
     @StoreThread
     public final void handleVoiceStateUpdates(VoiceState voiceState) {
         m.checkNotNullParameter(voiceState, "voiceState");
-        if (AnimatableValueParser.t1(voiceState)) {
+        if (AnimatableValueParser.u1(voiceState)) {
             if (this.userStreamsByUser.remove(Long.valueOf(voiceState.m())) != null) {
                 markChanged();
             }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java b/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java
index 6f33a8626b..409e1ff191 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceChannelSelected.java
@@ -150,7 +150,7 @@ public final class StoreVoiceChannelSelected extends StoreV2 implements Dispatch
     @StoreThread
     private final void clearInternal() {
         Channel channel = StoreStream.Companion.getChannels().getChannel(this.selectedVoiceChannelId);
-        if (channel != null && AnimatableValueParser.z2(channel)) {
+        if (channel != null && AnimatableValueParser.B2(channel)) {
             AppSoundManager.Provider.INSTANCE.get().play(AppSound.Companion.getSOUND_USER_LEFT());
         }
         selectVoiceChannelInternal(0, false);
@@ -253,7 +253,7 @@ public final class StoreVoiceChannelSelected extends StoreV2 implements Dispatch
         }
         long j2 = this.selectedVoiceChannelId;
         if (z3) {
-            if (!z2 && (channel = StoreStream.Companion.getChannels().getChannel(j)) != null && AnimatableValueParser.z2(channel)) {
+            if (!z2 && (channel = StoreStream.Companion.getChannels().getChannel(j)) != null && AnimatableValueParser.B2(channel)) {
                 AppSoundManager.Provider.INSTANCE.get().play(AppSound.Companion.getSOUND_USER_JOINED());
             }
             this.selectedVoiceChannelId = j;
@@ -368,7 +368,7 @@ public final class StoreVoiceChannelSelected extends StoreV2 implements Dispatch
         m.checkNotNullParameter(state, "state");
         if (state instanceof RtcConnection.State.f) {
             Channel findChannelByIdInternal$app_productionGoogleRelease = this.stream.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.selectedVoiceChannelId);
-            Guild guild = this.stream.getGuilds$app_productionGoogleRelease().getGuildsInternal$app_productionGoogleRelease().get(findChannelByIdInternal$app_productionGoogleRelease != null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.e()) : null);
+            Guild guild = this.stream.getGuilds$app_productionGoogleRelease().getGuildsInternal$app_productionGoogleRelease().get(findChannelByIdInternal$app_productionGoogleRelease != null ? Long.valueOf(findChannelByIdInternal$app_productionGoogleRelease.f()) : null);
             if (guild != null) {
                 Long afkChannelId = guild.getAfkChannelId();
                 long j = this.selectedVoiceChannelId;
@@ -389,7 +389,7 @@ public final class StoreVoiceChannelSelected extends StoreV2 implements Dispatch
     public final void handleVoiceStateUpdates(VoiceState voiceState) {
         Channel findChannelByIdInternal$app_productionGoogleRelease;
         m.checkNotNullParameter(voiceState, "voiceState");
-        if (this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId() == voiceState.m() && (findChannelByIdInternal$app_productionGoogleRelease = this.stream.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.selectedVoiceChannelId)) != null && findChannelByIdInternal$app_productionGoogleRelease.e() == voiceState.c()) {
+        if (this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId() == voiceState.m() && (findChannelByIdInternal$app_productionGoogleRelease = this.stream.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(this.selectedVoiceChannelId)) != null && findChannelByIdInternal$app_productionGoogleRelease.f() == voiceState.c()) {
             Long a = voiceState.a();
             long j = this.selectedVoiceChannelId;
             if ((a != null && a.longValue() == j) || !m.areEqual(voiceState.k(), this.sessionId)) {
@@ -419,13 +419,13 @@ public final class StoreVoiceChannelSelected extends StoreV2 implements Dispatch
 
     public final Observable<JoinVoiceChannelResult> selectVoiceChannel(long j) {
         Channel channel = this.stream.getChannels$app_productionGoogleRelease().getChannel(j);
-        if (channel != null && AnimatableValueParser.u1(channel)) {
+        if (channel != null && AnimatableValueParser.v1(channel)) {
             StoreStream.Companion.getMediaEngine().setAudioInputEnabled(false);
         }
-        PublishSubject l0 = PublishSubject.l0();
-        this.dispatcher.schedule(new StoreVoiceChannelSelected$selectVoiceChannel$1(this, j, l0));
-        m.checkNotNullExpressionValue(l0, "resultSubject");
-        return l0;
+        PublishSubject k0 = PublishSubject.k0();
+        this.dispatcher.schedule(new StoreVoiceChannelSelected$selectVoiceChannel$1(this, j, k0));
+        m.checkNotNullExpressionValue(k0, "resultSubject");
+        return k0;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java
index 2122914148..09962d1818 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$get$1.java
@@ -127,7 +127,7 @@ public final class StoreVoiceParticipants$get$1<T, R> implements b<Channel, Obse
                 for (T t : collection) {
                     arrayList.add(Long.valueOf(t.getId()));
                 }
-                return Observable.e(ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getVoiceSpeaking$app_productionGoogleRelease().observeSpeakingUsers(), 250, TimeUnit.MILLISECONDS), this.this$0.this$0.this$0.getStream().getCalls$app_productionGoogleRelease().get(this.this$0.this$0.$channelId).G(AnonymousClass1.INSTANCE), this.this$0.this$0.this$0.getStream().getVideoStreams$app_productionGoogleRelease().observeUserStreams(), ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getGuilds$app_productionGoogleRelease().observeComputed(this.this$0.$guildId), 1, TimeUnit.SECONDS), this.this$0.this$0.this$0.getStream().getApplicationStreaming$app_productionGoogleRelease().observeStreamSpectators(), this.this$0.this$0.this$0.getStream().getMediaSettings$app_productionGoogleRelease().getVoiceConfig(), StoreVoiceParticipants.access$getStreamContextsForUsers(this.this$0.this$0.this$0, u.plus((Collection<? extends Long>) arrayList, Long.valueOf(component1.getId()))), new AnonymousClass2(this, component1, collection));
+                return Observable.e(ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getVoiceSpeaking$app_productionGoogleRelease().observeSpeakingUsers(), 250, TimeUnit.MILLISECONDS), this.this$0.this$0.this$0.getStream().getCalls$app_productionGoogleRelease().get(this.this$0.this$0.$channelId).F(AnonymousClass1.INSTANCE), this.this$0.this$0.this$0.getStream().getVideoStreams$app_productionGoogleRelease().observeUserStreams(), ObservableExtensionsKt.leadingEdgeThrottle(this.this$0.this$0.this$0.getStream().getGuilds$app_productionGoogleRelease().observeComputed(this.this$0.$guildId), 1, TimeUnit.SECONDS), this.this$0.this$0.this$0.getStream().getApplicationStreaming$app_productionGoogleRelease().observeStreamSpectators(), this.this$0.this$0.this$0.getStream().getMediaSettings$app_productionGoogleRelease().getVoiceConfig(), StoreVoiceParticipants.access$getStreamContextsForUsers(this.this$0.this$0.this$0, u.plus((Collection<? extends Long>) arrayList, Long.valueOf(component1.getId()))), new AnonymousClass2(this, component1, collection));
             }
         }
 
@@ -149,7 +149,7 @@ public final class StoreVoiceParticipants$get$1<T, R> implements b<Channel, Obse
             StoreVoiceParticipants storeVoiceParticipants = this.this$0.this$0;
             Channel channel = this.$channel;
             m.checkNotNullExpressionValue(map, "voiceStates");
-            return Observable.j(observeMe$default, StoreVoiceParticipants.access$getOtherVoiceUsers(storeVoiceParticipants, channel, map), AnonymousClass1.INSTANCE).Z(new AnonymousClass2(this, map));
+            return Observable.j(observeMe$default, StoreVoiceParticipants.access$getOtherVoiceUsers(storeVoiceParticipants, channel, map), AnonymousClass1.INSTANCE).Y(new AnonymousClass2(this, map));
         }
     }
 
@@ -162,7 +162,7 @@ public final class StoreVoiceParticipants$get$1<T, R> implements b<Channel, Obse
         if (channel == null) {
             return new j(h0.emptyMap());
         }
-        long e = AnimatableValueParser.r1(channel) ? 0 : channel.e();
-        return this.this$0.getStream().getVoiceStates$app_productionGoogleRelease().observe(e, channel.g()).Z(new AnonymousClass1(this, channel, e));
+        long f = AnimatableValueParser.s1(channel) ? 0 : channel.f();
+        return this.this$0.getStream().getVoiceStates$app_productionGoogleRelease().observe(f, channel.h()).Y(new AnonymousClass1(this, channel, f));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java
index 0889fabfe6..6020d57a67 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceParticipants$getOtherVoiceUsers$1.java
@@ -85,14 +85,14 @@ public final class StoreVoiceParticipants$getOtherVoiceUsers$1<T, R> implements
 
             public final void call(Map<Long, ? extends User> map) {
                 StoreStream.Companion companion = StoreStream.Companion;
-                StageInstance stageInstanceForChannel = companion.getStageInstances().getStageInstanceForChannel(this.this$0.this$0.$channel.g());
+                StageInstance stageInstanceForChannel = companion.getStageInstances().getStageInstanceForChannel(this.this$0.this$0.$channel.h());
                 if ((stageInstanceForChannel != null ? stageInstanceForChannel.e() : null) == StageInstancePrivacyLevel.PUBLIC) {
                     StoreGuildMemberRequester guildMemberRequester = companion.getGuildMemberRequester();
                     for (Number number : this.this$0.this$0.$voiceStates.keySet()) {
                         long longValue = number.longValue();
                         m.checkNotNullExpressionValue(map, "otherUsers");
                         if (!map.containsKey(Long.valueOf(longValue))) {
-                            guildMemberRequester.queueRequest(this.this$0.this$0.$channel.e(), longValue);
+                            guildMemberRequester.queueRequest(this.this$0.this$0.$channel.f(), longValue);
                         }
                     }
                     guildMemberRequester.performQueuedRequests();
@@ -125,7 +125,7 @@ public final class StoreVoiceParticipants$getOtherVoiceUsers$1<T, R> implements
         public final Observable<? extends Collection<User>> call(List<Long> list) {
             StoreUser users = StoreStream.Companion.getUsers();
             m.checkNotNullExpressionValue(list, "otherMemberIds");
-            return users.observeUsers(list).u(new AnonymousClass1(this)).G(AnonymousClass2.INSTANCE);
+            return users.observeUsers(list).t(new AnonymousClass1(this)).F(AnonymousClass2.INSTANCE);
         }
     }
 
@@ -135,6 +135,6 @@ public final class StoreVoiceParticipants$getOtherVoiceUsers$1<T, R> implements
     }
 
     public final Observable<? extends Collection<User>> call(Long l) {
-        return StoreStream.Companion.getGuilds().observeComputed(this.$channel.e()).G(AnonymousClass1.INSTANCE).G(new AnonymousClass2(this, l)).Z(new AnonymousClass3(this));
+        return StoreStream.Companion.getGuilds().observeComputed(this.$channel.f()).F(AnonymousClass1.INSTANCE).F(new AnonymousClass2(this, l)).Y(new AnonymousClass3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java b/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java
index 3d9ea5569a..dc0904b74c 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceParticipants.java
@@ -33,7 +33,7 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: StoreVoiceParticipants.kt */
 public final class StoreVoiceParticipants extends Store {
-    private final BehaviorSubject<Long> selectedParticipantSubject = BehaviorSubject.m0(0L);
+    private final BehaviorSubject<Long> selectedParticipantSubject = BehaviorSubject.l0(0L);
     private final StoreStream stream;
 
     /* compiled from: StoreVoiceParticipants.kt */
@@ -438,14 +438,14 @@ public final class StoreVoiceParticipants extends Store {
     }
 
     private final Observable<Collection<User>> getOtherVoiceUsers(Channel channel, Map<Long, VoiceState> map) {
-        if (AnimatableValueParser.r1(channel)) {
+        if (AnimatableValueParser.s1(channel)) {
             j jVar = new j(AnimatableValueParser.G0(channel));
             m.checkNotNullExpressionValue(jVar, "Observable.just(channel.getRecipients())");
             return jVar;
-        } else if (AnimatableValueParser.k1(channel)) {
-            Observable<R> Z = StoreStream.Companion.getUsers().observeMeId().Z(new StoreVoiceParticipants$getOtherVoiceUsers$1(channel, map));
-            m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-            return Z;
+        } else if (AnimatableValueParser.l1(channel)) {
+            Observable<R> Y = StoreStream.Companion.getUsers().observeMeId().Y(new StoreVoiceParticipants$getOtherVoiceUsers$1(channel, map));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+            return Y;
         } else {
             j jVar2 = new j(n.emptyList());
             m.checkNotNullExpressionValue(jVar2, "Observable.just(emptyList())");
@@ -464,11 +464,11 @@ public final class StoreVoiceParticipants extends Store {
     }
 
     public final Observable<Map<Long, VoiceUser>> get(long j) {
-        Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new StoreVoiceParticipants$get$1(this, j));
-        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…  }\n          }\n        }");
-        Observable<Map<Long, VoiceUser>> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-        m.checkNotNullExpressionValue(s2, "StoreStream\n        .get…  .distinctUntilChanged()");
-        return s2;
+        Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new StoreVoiceParticipants$get$1(this, j));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…  }\n          }\n        }");
+        Observable<Map<Long, VoiceUser>> r = ObservableExtensionsKt.computationLatest(Y).r();
+        m.checkNotNullExpressionValue(r, "StoreStream\n        .get…  .distinctUntilChanged()");
+        return r;
     }
 
     public final StoreStream getStream() {
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceSpeaking.java b/app/src/main/java/com/discord/stores/StoreVoiceSpeaking.java
index 6d20ce3013..84b8997126 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceSpeaking.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceSpeaking.java
@@ -47,9 +47,9 @@ public final class StoreVoiceSpeaking extends StoreV2 {
     }
 
     public final Observable<Set<Long>> observeSpeakingUsers() {
-        Observable<Set<Long>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreVoiceSpeaking$observeSpeakingUsers$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck\n        …  .distinctUntilChanged()");
-        return s2;
+        Observable<Set<Long>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreVoiceSpeaking$observeSpeakingUsers$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck\n        …  .distinctUntilChanged()");
+        return r;
     }
 
     @Override // com.discord.stores.StoreV2
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java b/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java
index 9874e019fe..3257a57767 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceStates$observe$2.java
@@ -47,6 +47,6 @@ public final class StoreVoiceStates$observe$2<T, R> implements b<Map<Long, ? ext
     }
 
     public final Observable<? extends Map<Long, VoiceState>> call(Map<Long, VoiceState> map) {
-        return Observable.i0(new l0(Observable.B(map.values()).y(new AnonymousClass1(this)), AnonymousClass2.INSTANCE, l.INSTANCE));
+        return Observable.h0(new l0(Observable.A(map.values()).x(new AnonymousClass1(this)), AnonymousClass2.INSTANCE, l.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/stores/StoreVoiceStates.java b/app/src/main/java/com/discord/stores/StoreVoiceStates.java
index 4fd0b6b3c3..87c219277a 100644
--- a/app/src/main/java/com/discord/stores/StoreVoiceStates.java
+++ b/app/src/main/java/com/discord/stores/StoreVoiceStates.java
@@ -68,7 +68,7 @@ public final class StoreVoiceStates extends StoreV2 {
                 hashMap2 = new HashMap<>();
             }
             long j = 0;
-            if (AnimatableValueParser.t1(voiceState)) {
+            if (AnimatableValueParser.u1(voiceState)) {
                 VoiceState remove = hashMap2.remove(Long.valueOf(m));
                 if (remove != null) {
                     Long a2 = remove.a();
@@ -195,9 +195,9 @@ public final class StoreVoiceStates extends StoreV2 {
     }
 
     public final Observable<Map<Long, VoiceState>> observe(long j, long j2) {
-        Observable<Map<Long, VoiceState>> s2 = observe(j).Z(new StoreVoiceStates$observe$2(j2)).s();
-        m.checkNotNullExpressionValue(s2, "observe(guildId)\n       …  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, VoiceState>> r = observe(j).Y(new StoreVoiceStates$observe$2(j2)).r();
+        m.checkNotNullExpressionValue(r, "observe(guildId)\n       …  .distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<Map<Long, VoiceState>> observeForPrivateChannels(long j) {
diff --git a/app/src/main/java/com/discord/stores/VoicePropsTracker.java b/app/src/main/java/com/discord/stores/VoicePropsTracker.java
index 72991c9602..c067d40b2f 100644
--- a/app/src/main/java/com/discord/stores/VoicePropsTracker.java
+++ b/app/src/main/java/com/discord/stores/VoicePropsTracker.java
@@ -74,7 +74,7 @@ public final class VoicePropsTracker {
         if (voiceState.c() != this.guildId) {
             return;
         }
-        if (AnimatableValueParser.t1(voiceState)) {
+        if (AnimatableValueParser.u1(voiceState)) {
             this.currentVoiceStateUsers.remove(Long.valueOf(voiceState.m()));
             this.currentPotentialListeners.remove(Long.valueOf(voiceState.m()));
             this.currentSpeakerUsers.remove(Long.valueOf(voiceState.m()));
diff --git a/app/src/main/java/com/discord/stores/updates/ObservationDeck.java b/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
index a06df50f73..e34328a63b 100644
--- a/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
+++ b/app/src/main/java/com/discord/stores/updates/ObservationDeck.java
@@ -164,7 +164,7 @@ public final class ObservationDeck {
       (wrap: java.lang.String : 0x0071: INVOKE  (r3v5 java.lang.String) = 
       (r5v1 java.util.ArrayList)
       ("
-")
+    ")
       (null java.lang.CharSequence)
       (null java.lang.CharSequence)
       (0 int)
@@ -231,14 +231,14 @@ public final class ObservationDeck {
     }
 
     public final synchronized Observable<Unit> connectRx(UpdateSource[] updateSourceArr, boolean z2, Emitter.BackpressureMode backpressureMode, String str) {
-        Observable<Unit> w;
+        Observable<Unit> v;
         m.checkNotNullParameter(updateSourceArr, "updateSources");
         m.checkNotNullParameter(backpressureMode, "backpressureMode");
         Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
         ref$ObjectRef.element = null;
-        w = Observable.n(new ObservationDeck$connectRx$1(this, ref$ObjectRef, z2, str, updateSourceArr), backpressureMode).w(new ObservationDeck$connectRx$2(this, ref$ObjectRef));
-        m.checkNotNullExpressionValue(w, "Observable.create<Unit>(…rver?.let(::disconnect) }");
-        return w;
+        v = Observable.n(new ObservationDeck$connectRx$1(this, ref$ObjectRef, z2, str, updateSourceArr), backpressureMode).v(new ObservationDeck$connectRx$2(this, ref$ObjectRef));
+        m.checkNotNullExpressionValue(v, "Observable.create<Unit>(…rver?.let(::disconnect) }");
+        return v;
     }
 
     public final synchronized <T> Observable<T> connectRx(UpdateSource[] updateSourceArr, boolean z2, Emitter.BackpressureMode backpressureMode, String str, Function0<? extends T> function0) {
@@ -246,7 +246,7 @@ public final class ObservationDeck {
         m.checkNotNullParameter(updateSourceArr, "updateSources");
         m.checkNotNullParameter(backpressureMode, "backpressureMode");
         m.checkNotNullParameter(function0, "generator");
-        observable = (Observable<T>) connectRx((UpdateSource[]) Arrays.copyOf(updateSourceArr, updateSourceArr.length), z2, backpressureMode, str).G(new ObservationDeck$connectRx$3(function0));
+        observable = (Observable<T>) connectRx((UpdateSource[]) Arrays.copyOf(updateSourceArr, updateSourceArr.length), z2, backpressureMode, str).F(new ObservationDeck$connectRx$3(function0));
         m.checkNotNullExpressionValue(observable, "connectRx(\n        *upda…    ).map { generator() }");
         return observable;
     }
diff --git a/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java b/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java
index c5da8637d6..80c1b639ba 100644
--- a/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java
+++ b/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java
@@ -11,7 +11,7 @@ import kotlin.coroutines.Continuation;
 import kotlin.jvm.functions.Function2;
 import kotlinx.coroutines.CoroutineScope;
 /* compiled from: Batched.kt */
-@e(c = "com.discord.stores.utilities.Batched$onNext$1", f = "Batched.kt", l = {70}, m = "invokeSuspend")
+@e(c = "com.discord.stores.utilities.Batched$onNext$1", f = "Batched.kt", l = {82}, m = "invokeSuspend")
 public final class Batched$onNext$1 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
     public int label;
     public final /* synthetic */ Batched this$0;
diff --git a/app/src/main/java/com/discord/stores/utilities/Batched.java b/app/src/main/java/com/discord/stores/utilities/Batched.java
index f930f76745..dbb726e5fb 100644
--- a/app/src/main/java/com/discord/stores/utilities/Batched.java
+++ b/app/src/main/java/com/discord/stores/utilities/Batched.java
@@ -1,6 +1,7 @@
 package com.discord.stores.utilities;
 
 import c.q.a.k.a;
+import com.discord.app.AppLog;
 import com.discord.utilities.time.Clock;
 import com.discord.utilities.time.ClockFactory;
 import d0.z.d.m;
@@ -47,7 +48,7 @@ public final class Batched<T> {
         this.maxDebounceDelayMs = j2;
         this.scope = coroutineScope;
         this.clock = clock;
-        this.subject = new SerializedSubject<>(BehaviorSubject.l0());
+        this.subject = new SerializedSubject<>(BehaviorSubject.k0());
         this.queue = new ArrayList();
         this.queueStartTime = -1;
     }
@@ -61,7 +62,7 @@ public final class Batched<T> {
         return batched.debounceDelayMs;
     }
 
-    public final void flush() {
+    public final synchronized void flush() {
         Job job = this.debounceJob;
         if (job != null) {
             a.k(job, null, 1, null);
@@ -81,7 +82,10 @@ public final class Batched<T> {
         return this.subject;
     }
 
-    public final void onNext(T t) {
+    public final synchronized void onNext(T t) {
+        if (t == null) {
+            AppLog.i("onNext received a NULL value for Batched[" + this.type + ']');
+        }
         this.queue.add(t);
         long currentTimeMillis = this.clock.currentTimeMillis();
         if (this.queueStartTime == -1) {
@@ -89,13 +93,13 @@ public final class Batched<T> {
         }
         if (currentTimeMillis - this.queueStartTime >= this.maxDebounceDelayMs) {
             flush();
-            return;
+        } else {
+            Job job = this.debounceJob;
+            if (job != null) {
+                a.k(job, null, 1, null);
+            }
+            this.debounceJob = a.G(this.scope, null, null, new Batched$onNext$1(this, null), 3, null);
         }
-        Job job = this.debounceJob;
-        if (job != null) {
-            a.k(job, null, 1, null);
-        }
-        this.debounceJob = a.G(this.scope, null, null, new Batched$onNext$1(this, null), 3, null);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.lang.Object */
diff --git a/app/src/main/java/com/discord/tooltips/DefaultTooltipCreator.java b/app/src/main/java/com/discord/tooltips/DefaultTooltipCreator.java
index 80817b4d56..35c4fa3ca1 100644
--- a/app/src/main/java/com/discord/tooltips/DefaultTooltipCreator.java
+++ b/app/src/main/java/com/discord/tooltips/DefaultTooltipCreator.java
@@ -53,27 +53,27 @@ public final class DefaultTooltipCreator {
                 View rootView = view.getRootView();
                 Objects.requireNonNull(rootView, "null cannot be cast to non-null type android.view.ViewGroup");
                 View inflate = from.inflate(2131558461, (ViewGroup) rootView, false);
-                TextView textView = (TextView) inflate.findViewById(2131362840);
+                TextView textView = (TextView) inflate.findViewById(2131362865);
                 if (textView != null) {
                     viewBinding = new j((ConstraintLayout) inflate, textView);
                     m.checkNotNullExpressionValue(textView, "defaultTooltipText");
                     textView.setText(str);
                     m.checkNotNullExpressionValue(viewBinding, "DefaultTooltipViewTopBin…ext = tooltipText\n      }");
                 } else {
-                    throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362840)));
+                    throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131362865)));
                 }
             } else {
                 View rootView2 = view.getRootView();
                 Objects.requireNonNull(rootView2, "null cannot be cast to non-null type android.view.ViewGroup");
                 View inflate2 = from.inflate(2131558460, (ViewGroup) rootView2, false);
-                TextView textView2 = (TextView) inflate2.findViewById(2131362840);
+                TextView textView2 = (TextView) inflate2.findViewById(2131362865);
                 if (textView2 != null) {
                     viewBinding = new i((ConstraintLayout) inflate2, textView2);
                     m.checkNotNullExpressionValue(textView2, "defaultTooltipText");
                     textView2.setText(str);
                     m.checkNotNullExpressionValue(viewBinding, "DefaultTooltipViewBottom…ext = tooltipText\n      }");
                 } else {
-                    throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(2131362840)));
+                    throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(2131362865)));
                 }
             }
             viewBinding.getRoot().setOnClickListener(new a(this, tooltip));
diff --git a/app/src/main/java/com/discord/tooltips/SparkleView.java b/app/src/main/java/com/discord/tooltips/SparkleView.java
new file mode 100644
index 0000000000..a2fdca0aba
--- /dev/null
+++ b/app/src/main/java/com/discord/tooltips/SparkleView.java
@@ -0,0 +1,63 @@
+package com.discord.tooltips;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
+import c.a.i.h1;
+import c.a.w.b;
+import c.a.w.c;
+import d0.g;
+import d0.z.d.m;
+import kotlin.Lazy;
+/* compiled from: SparkleView.kt */
+public final class SparkleView extends FrameLayout {
+    public final h1 i;
+    public int j;
+    public final Lazy k;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public SparkleView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+        m.checkNotNullParameter(context, "context");
+        LayoutInflater.from(getContext()).inflate(2131558660, this);
+        ImageView imageView = (ImageView) findViewById(2131365003);
+        if (imageView != null) {
+            h1 h1Var = new h1(this, imageView);
+            m.checkNotNullExpressionValue(h1Var, "SparkleViewBinding.infla…ater.from(context), this)");
+            this.i = h1Var;
+            this.j = 2131232321;
+            this.k = g.lazy(new b(this));
+            setLayoutParams(new FrameLayout.LayoutParams(-2, -2));
+            imageView.setImageDrawable(getSparkleDrawable());
+            AnimatedVectorDrawableCompat sparkleDrawable = getSparkleDrawable();
+            if (sparkleDrawable != null) {
+                sparkleDrawable.registerAnimationCallback(new c(this));
+            }
+            AnimatedVectorDrawableCompat sparkleDrawable2 = getSparkleDrawable();
+            if (sparkleDrawable2 != null) {
+                sparkleDrawable2.start();
+                return;
+            }
+            return;
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131365003)));
+    }
+
+    public static final /* synthetic */ AnimatedVectorDrawableCompat a(SparkleView sparkleView) {
+        return sparkleView.getSparkleDrawable();
+    }
+
+    private final AnimatedVectorDrawableCompat getSparkleDrawable() {
+        return (AnimatedVectorDrawableCompat) this.k.getValue();
+    }
+
+    public final void b() {
+        AnimatedVectorDrawableCompat sparkleDrawable = getSparkleDrawable();
+        if (sparkleDrawable != null) {
+            sparkleDrawable.stop();
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/tooltips/TooltipManager.java b/app/src/main/java/com/discord/tooltips/TooltipManager.java
index e7e14f3193..84b02114ac 100644
--- a/app/src/main/java/com/discord/tooltips/TooltipManager.java
+++ b/app/src/main/java/com/discord/tooltips/TooltipManager.java
@@ -32,7 +32,7 @@ public class TooltipManager {
     public final c.a.w.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<String> f2101c;
+    public final Set<String> f2107c;
     public final int d;
     public final c.a.j.a e;
 
@@ -67,7 +67,7 @@ public class TooltipManager {
         public static final Lazy b = g.lazy(C0176a.i);
 
         /* renamed from: c  reason: collision with root package name */
-        public static final Lazy f2102c = g.lazy(b.i);
+        public static final Lazy f2108c = g.lazy(b.i);
         public static final a d = null;
 
         /* compiled from: TooltipManager.kt */
@@ -110,7 +110,7 @@ public class TooltipManager {
         m.checkNotNullParameter(set, "shownTooltipNames");
         m.checkNotNullParameter(aVar2, "floatingViewManager");
         this.b = aVar;
-        this.f2101c = set;
+        this.f2107c = set;
         this.d = i;
         this.e = aVar2;
         aVar2.a = new d(this);
@@ -151,8 +151,8 @@ public class TooltipManager {
             Objects.requireNonNull(aVar);
             m.checkNotNullParameter(cacheKey, "tooltipCacheKey");
             boolean z3 = aVar.a.getBoolean(cacheKey, false);
-            boolean contains = this.f2101c.contains(tooltip.getTooltipName());
-            int size = this.f2101c.size();
+            boolean contains = this.f2107c.contains(tooltip.getTooltipName());
+            int size = this.f2107c.size();
             if (z3) {
                 return false;
             }
@@ -181,7 +181,7 @@ public class TooltipManager {
         m.checkNotNullParameter(observable, "componentPausedObservable");
         if (b(tooltip, z2)) {
             c(tooltip);
-            this.f2101c.add(tooltip.getTooltipName());
+            this.f2107c.add(tooltip.getTooltipName());
             this.a.put(tooltip.getTooltipName(), Integer.valueOf(view2.getId()));
             c.a.j.a aVar = this.e;
             Objects.requireNonNull(aVar);
@@ -207,7 +207,7 @@ public class TooltipManager {
             f fVar = new f(aVar, view2, view, floatingViewGravity, i, i2);
             viewGroup.getViewTreeObserver().addOnPreDrawListener(fVar);
             aVar.b.put(Integer.valueOf(view2.getId()), new a.C0025a(view2, viewGroup, fVar));
-            observable.a0(1).X(new c.a.j.d(aVar, view2), new e(aVar));
+            observable.Z(1).W(new c.a.j.d(aVar, view2), new e(aVar));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.java b/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.java
index 92f5452e46..46c96c74bb 100644
--- a/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.java
+++ b/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$3.java
@@ -40,7 +40,7 @@ public final class ShareUtils$updateDirectShareTargets$3<T1, T2, R> implements F
         m.checkNotNullExpressionValue(list, "directShareChannels");
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
         for (ChannelShortcutInfo channelShortcutInfo : list) {
-            arrayList.add(Long.valueOf(channelShortcutInfo.getChannel().g()));
+            arrayList.add(Long.valueOf(channelShortcutInfo.getChannel().h()));
         }
         Set set = u.toSet(arrayList);
         if (Build.VERSION.SDK_INT >= 25) {
diff --git a/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java b/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java
index c5e013d5a0..fd1dc4a21c 100644
--- a/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java
+++ b/app/src/main/java/com/discord/utilities/ShareUtils$updateDirectShareTargets$4.java
@@ -76,6 +76,6 @@ public final class ShareUtils$updateDirectShareTargets$4<T, R> implements b<List
         while (it.hasNext()) {
             linkedHashSet.add(new MGImagesBitmap.ImageRequest((String) it.next().getSecond(), false));
         }
-        return MGImagesBitmap.getBitmaps(linkedHashSet).G(new AnonymousClass2(this)).G(new AnonymousClass3(list));
+        return MGImagesBitmap.getBitmaps(linkedHashSet).F(new AnonymousClass2(this)).F(new AnonymousClass3(list));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/ShareUtils.java b/app/src/main/java/com/discord/utilities/ShareUtils.java
index 450f3c3acb..f44e061f11 100644
--- a/app/src/main/java/com/discord/utilities/ShareUtils.java
+++ b/app/src/main/java/com/discord/utilities/ShareUtils.java
@@ -113,7 +113,7 @@ public final class ShareUtils {
     }
 
     private final ShortcutInfoCompat toShortcutInfo(Channel channel, Context context, IconCompat iconCompat, int i) {
-        ShortcutInfoCompat.Builder longLived = new ShortcutInfoCompat.Builder(context, String.valueOf(channel.g())).setShortLabel(AnimatableValueParser.y0(channel)).setLongLabel(AnimatableValueParser.y0(channel)).setIcon(iconCompat).setIntent(IntentUtils.RouteBuilders.selectChannel$default(channel.g(), 0, null, 6, null).setPackage(context.getPackageName())).setRank(i).setLongLived(true);
+        ShortcutInfoCompat.Builder longLived = new ShortcutInfoCompat.Builder(context, String.valueOf(channel.h())).setShortLabel(AnimatableValueParser.y0(channel)).setLongLabel(AnimatableValueParser.y0(channel)).setIcon(iconCompat).setIntent(IntentUtils.RouteBuilders.selectChannel$default(channel.h(), 0, null, 6, null).setPackage(context.getPackageName())).setRank(i).setLongLived(true);
         c.a.d.r0.a aVar = c.a.d.r0.a.b;
         ShortcutInfoCompat.Builder categories = longLived.setCategories(c.a.d.r0.a.a);
         List<User> G0 = AnimatableValueParser.G0(channel);
@@ -161,18 +161,18 @@ public final class ShareUtils {
         int dpToPixels = DimenUtils.dpToPixels(72);
         int dpToPixels2 = DimenUtils.dpToPixels(108);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable G = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getChannels().observeDirectShareCandidates(context), 0, false, 1, null).G(ShareUtils$updateDirectShareTargets$1.INSTANCE);
-        Observable<Map<Long, Channel>> y2 = companion.getChannels().observeGuildAndPrivateChannels().y(ShareUtils$updateDirectShareTargets$2.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "StoreStream\n            …ilter { it.isNotEmpty() }");
-        Observable j = Observable.j(G, ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 0, false, 1, null), new ShareUtils$updateDirectShareTargets$3(context));
+        Observable F = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getChannels().observeDirectShareCandidates(context), 0, false, 1, null).F(ShareUtils$updateDirectShareTargets$1.INSTANCE);
+        Observable<Map<Long, Channel>> x2 = companion.getChannels().observeGuildAndPrivateChannels().x(ShareUtils$updateDirectShareTargets$2.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "StoreStream\n            …ilter { it.isNotEmpty() }");
+        Observable j = Observable.j(F, ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, false, 1, null), new ShareUtils$updateDirectShareTargets$3(context));
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…o to icon }\n      }\n    }");
-        Observable A = ObservableExtensionsKt.computationLatest(j).A(new ShareUtils$updateDirectShareTargets$4(dpToPixels, dpToPixels2));
-        m.checkNotNullExpressionValue(A, "Observable.combineLatest…riPairs to it }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(A), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$5(context), 60, (Object) null);
+        Observable z2 = ObservableExtensionsKt.computationLatest(j).z(new ShareUtils$updateDirectShareTargets$4(dpToPixels, dpToPixels2));
+        m.checkNotNullExpressionValue(z2, "Observable.combineLatest…riPairs to it }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(z2), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$5(context), 60, (Object) null);
         if (Build.VERSION.SDK_INT >= 25) {
-            Observable<Map<Long, Channel>> y3 = companion.getChannels().observeGuildAndPrivateChannels().y(ShareUtils$updateDirectShareTargets$6.INSTANCE);
-            m.checkNotNullExpressionValue(y3, "StoreStream.getChannels(…ilter { it.isNotEmpty() }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(y3, 0, false, 1, null)), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$7((ShortcutManager) context.getSystemService(ShortcutManager.class), context), 60, (Object) null);
+            Observable<Map<Long, Channel>> x3 = companion.getChannels().observeGuildAndPrivateChannels().x(ShareUtils$updateDirectShareTargets$6.INSTANCE);
+            m.checkNotNullExpressionValue(x3, "StoreStream.getChannels(…ilter { it.isNotEmpty() }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(x3, 0, false, 1, null)), ShareUtils.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ShareUtils$updateDirectShareTargets$7((ShortcutManager) context.getSystemService(ShortcutManager.class), context), 60, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java b/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java
index 08e3b2ae17..308b105f03 100644
--- a/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java
+++ b/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java
@@ -76,14 +76,14 @@ public final class StoreUIEventHandler {
         int i;
         Channel channel;
         StageRoles r0;
-        if (status != KrispOveruseDetector.Status.FAILED || (channel = this.channelsStore.getChannel(this.voiceChannelSelectedStore.getSelectedVoiceChannelId())) == null || !AnimatableValueParser.u1(channel) || (r0 = this.stageChannelsStore.m10getMyRolesvisDeB4(channel.g())) == null || !StageRoles.m23isAudienceimpl(r0.m28unboximpl())) {
+        if (status != KrispOveruseDetector.Status.FAILED || (channel = this.channelsStore.getChannel(this.voiceChannelSelectedStore.getSelectedVoiceChannelId())) == null || !AnimatableValueParser.v1(channel) || (r0 = this.stageChannelsStore.m10getMyRolesvisDeB4(channel.h())) == null || !StageRoles.m23isAudienceimpl(r0.m28unboximpl())) {
             int ordinal = status.ordinal();
             if (ordinal == 0) {
-                i = 2131891217;
+                i = 2131891288;
             } else if (ordinal == 1) {
-                i = 2131891218;
+                i = 2131891289;
             } else if (ordinal == 2) {
-                i = 2131891212;
+                i = 2131891283;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -97,7 +97,7 @@ public final class StoreUIEventHandler {
         if (event instanceof StoreUserGuildSettings.Event.SettingsUpdated) {
             int ordinal = ((StoreUserGuildSettings.Event.SettingsUpdated) event).getType().ordinal();
             if (ordinal == 0) {
-                i = 2131893186;
+                i = 2131893269;
             } else if (ordinal == 1) {
                 i = 2131887327;
             } else if (ordinal == 2) {
diff --git a/app/src/main/java/com/discord/utilities/UtcDateTimeParceler.java b/app/src/main/java/com/discord/utilities/UtcDateTimeParceler.java
new file mode 100644
index 0000000000..b110e66d4d
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/UtcDateTimeParceler.java
@@ -0,0 +1,31 @@
+package com.discord.utilities;
+
+import android.os.Parcel;
+import com.discord.api.utcdatetime.UtcDateTime;
+import d0.j;
+import d0.z.d.m;
+import s.b.a;
+/* compiled from: Parcelers.kt */
+public final class UtcDateTimeParceler implements a<UtcDateTime> {
+    public static final UtcDateTimeParceler INSTANCE = new UtcDateTimeParceler();
+
+    private UtcDateTimeParceler() {
+    }
+
+    @Override // s.b.a
+    public UtcDateTime create(Parcel parcel) {
+        m.checkNotNullParameter(parcel, "parcel");
+        return new UtcDateTime(parcel.readLong());
+    }
+
+    public UtcDateTime[] newArray(int i) {
+        m.checkNotNullParameter(this, "this");
+        throw new j("Generated by Android Extensions automatically");
+    }
+
+    public void write(UtcDateTime utcDateTime, Parcel parcel, int i) {
+        m.checkNotNullParameter(utcDateTime, "$this$write");
+        m.checkNotNullParameter(parcel, "parcel");
+        parcel.writeLong(utcDateTime.f());
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java
index 067b40fe1a..0867426dbb 100644
--- a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java
+++ b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor$handleInitialState$1.java
@@ -31,6 +31,6 @@ public final class AccessibilityMonitor$handleInitialState$1 implements Accessib
 
     @Override // android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener
     public final void onAccessibilityStateChanged(boolean z2) {
-        new j(Unit.a).q(200, TimeUnit.MILLISECONDS).W(new AnonymousClass1(this, z2));
+        new j(Unit.a).q(200, TimeUnit.MILLISECONDS).V(new AnonymousClass1(this, z2));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java
index 266ea8577c..a30d074aed 100644
--- a/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java
+++ b/app/src/main/java/com/discord/utilities/accessibility/AccessibilityMonitor.java
@@ -54,7 +54,7 @@ public final class AccessibilityMonitor {
     public AccessibilityMonitor() {
         AccessibilityState accessibilityState = new AccessibilityState(null, 1, null);
         this.accessibilityState = accessibilityState;
-        this.accessibilityStateSubject = new SerializedSubject<>(BehaviorSubject.m0(accessibilityState));
+        this.accessibilityStateSubject = new SerializedSubject<>(BehaviorSubject.l0(accessibilityState));
     }
 
     public static final /* synthetic */ Lazy access$getINSTANCE$cp() {
@@ -169,8 +169,8 @@ public final class AccessibilityMonitor {
     }
 
     public final Observable<AccessibilityState> observeAccessibilityState() {
-        Observable<AccessibilityState> s2 = this.accessibilityStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "accessibilityStateSubject.distinctUntilChanged()");
-        return s2;
+        Observable<AccessibilityState> r = this.accessibilityStateSubject.r();
+        m.checkNotNullExpressionValue(r, "accessibilityStateSubject.distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java
index 77cc0bf0f5..5c21af5d23 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java
@@ -77,7 +77,7 @@ public final class AnalyticSuperProperties {
     private final void setBaselineProperties() {
         String locale = Locale.getDefault().toString();
         m.checkNotNullExpressionValue(locale, "Locale.getDefault().toString()");
-        updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/81014"), o.to("client_build_number", 81014), o.to("client_version", "81.14 - Stable"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
+        updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/82019"), o.to("client_build_number", 82019), o.to("client_version", "82.19 - Stable"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
     }
 
     private final void setSuperProperties(Map<String, ? extends Object> map) {
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java
index 0c206cdbd5..578a53db24 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$addAttachment$1.java
@@ -19,7 +19,7 @@ public final class AnalyticsTracker$addAttachment$1<T, R> implements b<Channel,
     }
 
     public final Map<String, Object> call(Channel channel) {
-        Map mapOf = h0.mapOf(o.to("source", this.$source), o.to("action_type", 0), o.to("mime_type", this.$mimeType), o.to("total_attachments", Integer.valueOf(this.$totalAttachments)), o.to("guild_id", Long.valueOf(channel.e())));
+        Map mapOf = h0.mapOf(o.to("source", this.$source), o.to("action_type", 0), o.to("mime_type", this.$mimeType), o.to("total_attachments", Integer.valueOf(this.$totalAttachments)), o.to("guild_id", Long.valueOf(channel.f())));
         AnalyticsUtils analyticsUtils = AnalyticsUtils.INSTANCE;
         m.checkNotNullExpressionValue(channel, "it");
         return h0.plus(mapOf, analyticsUtils.getProperties$app_productionGoogleRelease(channel));
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java
index 0f09d4a929..dd027c1822 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.java
@@ -35,7 +35,7 @@ public final class AnalyticsTracker$inviteSuggestionOpened$2 extends o implement
         List list = this.$channelSuggestions;
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Object obj : list) {
-            Integer valueOf = Integer.valueOf(((Channel) obj).z());
+            Integer valueOf = Integer.valueOf(((Channel) obj).A());
             Object obj2 = linkedHashMap.get(valueOf);
             if (obj2 == null) {
                 obj2 = new ArrayList();
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.java
index 0759edd0e2..05a6806fea 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker$trackUserVoiceEvent$1.java
@@ -32,9 +32,9 @@ public final class AnalyticsTracker$trackUserVoiceEvent$1 extends o implements F
         /* renamed from: invoke */
         public final Map<String, ? extends Object> mo1invoke() {
             this.$gameProperties.put("mode", this.this$0.$inputMode);
-            this.$gameProperties.put("channel", Long.valueOf(this.this$0.$this_trackUserVoiceEvent.g()));
-            this.$gameProperties.put("channel_type", Integer.valueOf(this.this$0.$this_trackUserVoiceEvent.z()));
-            this.$gameProperties.put("server", Long.valueOf(this.this$0.$this_trackUserVoiceEvent.e()));
+            this.$gameProperties.put("channel", Long.valueOf(this.this$0.$this_trackUserVoiceEvent.h()));
+            this.$gameProperties.put("channel_type", Integer.valueOf(this.this$0.$this_trackUserVoiceEvent.A()));
+            this.$gameProperties.put("server", Long.valueOf(this.this$0.$this_trackUserVoiceEvent.f()));
             return this.$gameProperties;
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
index 0e48205ecf..fa4911eca3 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java
@@ -46,11 +46,13 @@ import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsUtils;
 import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.collections.CollectionExtensionsKt;
+import com.discord.utilities.email.EmailUtils;
 import com.discord.utilities.fcm.NotificationClient;
 import com.discord.utilities.intent.RouteHandlers;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.persister.Persister;
+import com.discord.utilities.phone.PhoneUtils;
 import com.discord.utilities.platform.Platform;
 import com.discord.utilities.rest.FileUploadAlertType;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -129,7 +131,8 @@ public final class AnalyticsTracker {
         EmojiPickerLockedItemClicked("emoji_picker_emoji_clicked"),
         StreamQualityIndicator("stream_quality_indicator"),
         EmojiAutocompleteInline("emoji_autocomplete_inline"),
-        EmojiAutocompleteModal("emoji_autocomplete_modal");
+        EmojiAutocompleteModal("emoji_autocomplete_modal"),
+        CustomProfileUpsellModal("custom profiles upsell modal");
         
         private final String analyticsName;
 
@@ -198,20 +201,20 @@ public final class AnalyticsTracker {
     public static final void addAttachment(String str, String str2, int i) {
         m.checkNotNullParameter(str, "source");
         m.checkNotNullParameter(str2, "mimeType");
-        Observable<Channel> a02 = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().a0(1);
-        m.checkNotNullExpressionValue(a02, "StoreStream\n        .get…hannel()\n        .take(1)");
-        Observable<R> G = a02.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable G2 = G.G(new AnalyticsTracker$addAttachment$1(str, str2, i));
-        m.checkNotNullExpressionValue(G2, "StoreStream\n        .get…+ it.properties\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(G2), INSTANCE.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnalyticsTracker$addAttachment$2.INSTANCE, 62, (Object) null);
+        Observable<Channel> Z = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().Z(1);
+        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…hannel()\n        .take(1)");
+        Observable<R> F = Z.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable F2 = F.F(new AnalyticsTracker$addAttachment$1(str, str2, i));
+        m.checkNotNullExpressionValue(F2, "StoreStream\n        .get…+ it.properties\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(F2), INSTANCE.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnalyticsTracker$addAttachment$2.INSTANCE, 62, (Object) null);
     }
 
     private final void addVoiceConnectionProperties(Map<String, Object> map, Channel channel, String str) {
         if (channel != null) {
-            map.put("channel_id", Long.valueOf(Long.valueOf(channel.g()).longValue()));
+            map.put("channel_id", Long.valueOf(Long.valueOf(channel.h()).longValue()));
         }
-        Long valueOf = channel != null ? Long.valueOf(channel.e()) : null;
+        Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
         if (valueOf != null && valueOf.longValue() > 0) {
             map.put("guild_id", valueOf);
         }
@@ -318,11 +321,11 @@ public final class AnalyticsTracker {
         tracker.track("external_fingerprint_dropped", linkedHashMap);
     }
 
-    public static /* synthetic */ void friendRequestFailed$default(AnalyticsTracker analyticsTracker, String str, int i, Object obj) {
-        if ((i & 1) != 0) {
-            str = null;
+    public static /* synthetic */ void friendRequestFailed$default(AnalyticsTracker analyticsTracker, CharSequence charSequence, String str, Integer num, String str2, int i, Object obj) {
+        if ((i & 8) != 0) {
+            str2 = null;
         }
-        analyticsTracker.friendRequestFailed(str);
+        analyticsTracker.friendRequestFailed(charSequence, str, num, str2);
     }
 
     private final String getAnalyticsValueForNotificationFrequency(Integer num) {
@@ -356,13 +359,13 @@ public final class AnalyticsTracker {
     private final Observable<Map<String, Object>> getGameProperties(long j) {
         StoreStream.Companion companion = StoreStream.Companion;
         Observable<Presence> observeLocalPresence = companion.getPresences().observeLocalPresence();
-        Observable<R> G = companion.getPresences().observePresenceForUser(j).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable j2 = Observable.j(observeLocalPresence, G, AnalyticsTracker$getGameProperties$1.INSTANCE);
+        Observable<R> F = companion.getPresences().observePresenceForUser(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable j2 = Observable.j(observeLocalPresence, F, AnalyticsTracker$getGameProperties$1.INSTANCE);
         m.checkNotNullExpressionValue(j2, "Observable\n        .comb…\n            })\n        )");
-        Observable<Map<String, Object>> G2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j2, 0, false, 3, null).G(AnalyticsTracker$getGameProperties$2.INSTANCE);
-        m.checkNotNullExpressionValue(G2, "Observable\n        .comb…NonNullValues()\n        }");
-        return G2;
+        Observable<Map<String, Object>> F2 = ObservableExtensionsKt.takeSingleUntilTimeout$default(j2, 0, false, 3, null).F(AnalyticsTracker$getGameProperties$2.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "Observable\n        .comb…NonNullValues()\n        }");
+        return F2;
     }
 
     private final String getNetworkTypeAnalyticsValue(Integer num) {
@@ -395,7 +398,7 @@ public final class AnalyticsTracker {
         StageInstance stageInstanceForChannel = companion.getStageInstances().getStageInstanceForChannel(j);
         Pair[] pairArr = new Pair[5];
         pairArr[0] = o.to("channel_id", Long.valueOf(j));
-        pairArr[1] = o.to("guild_id", Long.valueOf(channel.e()));
+        pairArr[1] = o.to("guild_id", Long.valueOf(channel.f()));
         if (stageInstanceForChannel == null || (str = stageInstanceForChannel.f()) == null) {
             str = "";
         }
@@ -429,8 +432,8 @@ public final class AnalyticsTracker {
             i = 0;
             for (VoiceState voiceState : values) {
                 Long a = voiceState.a();
-                long g = channel.g();
-                if (!(a == null || a.longValue() != g || voiceState.m() == j)) {
+                long h = channel.h();
+                if (!(a == null || a.longValue() != h || voiceState.m() == j)) {
                     i2++;
                     if (voiceState.j()) {
                         i++;
@@ -438,10 +441,10 @@ public final class AnalyticsTracker {
                 }
             }
         }
-        Map<String, Object> mutableMapOf = h0.mutableMapOf(o.to("channel_id", Long.valueOf(channel.g())), o.to("channel_type", Integer.valueOf(channel.z())), o.to("voice_state_count", Integer.valueOf(i2)), o.to("video_stream_count", Integer.valueOf(i)));
-        long e = channel.e();
-        if (e > 0) {
-            mutableMapOf.put("guild_id", Long.valueOf(e));
+        Map<String, Object> mutableMapOf = h0.mutableMapOf(o.to("channel_id", Long.valueOf(channel.h())), o.to("channel_type", Integer.valueOf(channel.A())), o.to("voice_state_count", Integer.valueOf(i2)), o.to("video_stream_count", Integer.valueOf(i)));
+        long f = channel.f();
+        if (f > 0) {
+            mutableMapOf.put("guild_id", Long.valueOf(f));
         }
         if (videoInputDeviceDescription != null) {
             z2 = true;
@@ -501,9 +504,9 @@ public final class AnalyticsTracker {
             Guild guild = modelInvite.getGuild();
             Long valueOf = guild != null ? Long.valueOf(guild.o()) : null;
             Channel channel = modelInvite.getChannel();
-            Long valueOf2 = channel != null ? Long.valueOf(channel.g()) : null;
+            Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null;
             Channel channel2 = modelInvite.getChannel();
-            analyticsTracker.inviteCopied(code, valueOf, valueOf2, channel2 != null ? Integer.valueOf(channel2.z()) : null, str);
+            analyticsTracker.inviteCopied(code, valueOf, valueOf2, channel2 != null ? Integer.valueOf(channel2.A()) : null, str);
         }
     }
 
@@ -541,9 +544,9 @@ public final class AnalyticsTracker {
             Guild guild = modelInvite.getGuild();
             Long valueOf = guild != null ? Long.valueOf(guild.o()) : null;
             Channel channel = modelInvite.getChannel();
-            Long valueOf2 = channel != null ? Long.valueOf(channel.g()) : null;
+            Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null;
             Channel channel2 = modelInvite.getChannel();
-            Integer valueOf3 = channel2 != null ? Integer.valueOf(channel2.z()) : null;
+            Integer valueOf3 = channel2 != null ? Integer.valueOf(channel2.A()) : null;
             User inviter = modelInvite.getInviter();
             analyticsTracker.inviteShareClicked(code, valueOf, valueOf2, valueOf3, inviter != null ? Long.valueOf(inviter.i()) : null);
         }
@@ -608,14 +611,14 @@ public final class AnalyticsTracker {
         openModal(str, str2, l);
     }
 
-    public static /* synthetic */ void openUserSheet$default(AnalyticsTracker analyticsTracker, String str, ActivityPlatform activityPlatform, int i, Object obj) {
-        if ((i & 1) != 0) {
+    public static /* synthetic */ void openUserSheet$default(AnalyticsTracker analyticsTracker, boolean z2, String str, ActivityPlatform activityPlatform, int i, Object obj) {
+        if ((i & 2) != 0) {
             str = null;
         }
-        if ((i & 2) != 0) {
+        if ((i & 4) != 0) {
             activityPlatform = null;
         }
-        analyticsTracker.openUserSheet(str, activityPlatform);
+        analyticsTracker.openUserSheet(z2, str, activityPlatform);
     }
 
     public static final void overlayToggled(boolean z2) {
@@ -656,6 +659,15 @@ public final class AnalyticsTracker {
         analyticsTracker.paymentFlowStep(location, (i & 2) != 0 ? null : subscription, str, str2, (i & 16) != 0 ? null : storeSku, (i & 32) != 0 ? null : payment);
     }
 
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.analytics.AnalyticsTracker */
+    /* JADX WARN: Multi-variable type inference failed */
+    public static /* synthetic */ void premiumUpsellViewed$default(AnalyticsTracker analyticsTracker, PremiumUpsellType premiumUpsellType, Traits.Location location, Map map, int i, Object obj) {
+        if ((i & 4) != 0) {
+            map = h0.emptyMap();
+        }
+        analyticsTracker.premiumUpsellViewed(premiumUpsellType, location, map);
+    }
+
     public static final void readyPayloadReceived(Map<String, ? extends Object> map) {
         m.checkNotNullParameter(map, "properties");
         tracker.track("ready_payload_received", map);
@@ -879,7 +891,7 @@ public final class AnalyticsTracker {
     public final void ackMessage(Channel channel, Function0<? extends Map<String, ? extends Object>> function0) {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(function0, "propertyProvider");
-        tracker.track(o.to("ack_messages", Long.valueOf(channel.e())), 900000, new AnalyticsTracker$ackMessage$1(function0));
+        tracker.track(o.to("ack_messages", Long.valueOf(channel.f())), 900000, new AnalyticsTracker$ackMessage$1(function0));
     }
 
     public final void activityUpdatedSpotify(String str, boolean z2) {
@@ -1203,10 +1215,16 @@ public final class AnalyticsTracker {
         tracker.track("friend_add_viewed", g0.mapOf(o.to("friend_add_type", str)));
     }
 
-    public final void friendRequestFailed(String str) {
+    public final void friendRequestFailed(CharSequence charSequence, String str, Integer num, String str2) {
+        m.checkNotNullParameter(charSequence, "query");
+        m.checkNotNullParameter(str, "username");
         HashMap hashMap = new HashMap();
-        if (str != null) {
-            hashMap.put("reason", str);
+        if (str2 != null) {
+            hashMap.put("reason", str2);
+            hashMap.put("discrim_len", Integer.valueOf(String.valueOf(num).length()));
+            hashMap.put("username_len", Integer.valueOf(str.length()));
+            hashMap.put("is_email_like", Boolean.valueOf(EmailUtils.INSTANCE.isEmailLike(charSequence.toString())));
+            hashMap.put("is_num_only", Boolean.valueOf(PhoneUtils.INSTANCE.isValidPhoneFragment(charSequence.toString())));
         }
         tracker.track("friend_request_failed", hashMap);
     }
@@ -1230,6 +1248,10 @@ public final class AnalyticsTracker {
         tracker.track("gift_code_resolved", h0.mapOf(o.to("gift_code", str), o.to("resolved", Boolean.FALSE)));
     }
 
+    public final void guildCategorySelected(long j) {
+        expressionPickerCategorySelected$default(this, null, Long.valueOf(j), "sticker", 1, null);
+    }
+
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0017: APUT  
       (r1v1 kotlin.Pair[])
       (0 ??[int, short, byte, char])
@@ -1264,7 +1286,13 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(buildInfo, "buildInfo");
         m.checkNotNullParameter(memoryInfo, "memoryInfo");
         m.checkNotNullParameter(decoderCountInfo, "decoderCountInfo");
-        tracker.track("android_hardware_survey", h0.mapOf(o.to("device_board", buildInfo.a), o.to("device_brand", buildInfo.b), o.to("device_manufacturer", buildInfo.f2008c), o.to("device_model", buildInfo.d), o.to("device_product", buildInfo.e), o.to("device_supported_abis", buildInfo.f), o.to("device_is_64_bit", Boolean.valueOf(buildInfo.g)), o.to("is_low_ram_device", Boolean.valueOf(memoryInfo.b)), o.to("memory_class", Integer.valueOf(memoryInfo.f2010c)), o.to("large_memory_class", Integer.valueOf(memoryInfo.d)), o.to("hardware_decoders_1080", Integer.valueOf(decoderCountInfo.a)), o.to("hardware_decoders_720", Integer.valueOf(decoderCountInfo.b)), o.to("hardware_decoders_480", Integer.valueOf(decoderCountInfo.f2009c)), o.to("decoders_1080", Integer.valueOf(decoderCountInfo.d)), o.to("decoders_720", Integer.valueOf(decoderCountInfo.e)), o.to("decoders_480", Integer.valueOf(decoderCountInfo.f)), o.to("test_duration_ms", Integer.valueOf(decoderCountInfo.g))));
+        tracker.track("android_hardware_survey", h0.mapOf(o.to("device_board", buildInfo.a), o.to("device_brand", buildInfo.b), o.to("device_manufacturer", buildInfo.f2013c), o.to("device_model", buildInfo.d), o.to("device_product", buildInfo.e), o.to("device_supported_abis", buildInfo.f), o.to("device_is_64_bit", Boolean.valueOf(buildInfo.g)), o.to("is_low_ram_device", Boolean.valueOf(memoryInfo.b)), o.to("memory_class", Integer.valueOf(memoryInfo.f2015c)), o.to("large_memory_class", Integer.valueOf(memoryInfo.d)), o.to("hardware_decoders_1080", Integer.valueOf(decoderCountInfo.a)), o.to("hardware_decoders_720", Integer.valueOf(decoderCountInfo.b)), o.to("hardware_decoders_480", Integer.valueOf(decoderCountInfo.f2014c)), o.to("decoders_1080", Integer.valueOf(decoderCountInfo.d)), o.to("decoders_720", Integer.valueOf(decoderCountInfo.e)), o.to("decoders_480", Integer.valueOf(decoderCountInfo.f)), o.to("test_duration_ms", Integer.valueOf(decoderCountInfo.g))));
+    }
+
+    public final void impressionInviteAccept(String str) {
+        if (str != null) {
+            tracker.track("impression_invite_accept", g0.mapOf(o.to("invite_code", str)));
+        }
     }
 
     public final void inviteCopied(GuildInvite guildInvite, Channel channel, String str) {
@@ -1273,9 +1301,9 @@ public final class AnalyticsTracker {
         String inviteCode = guildInvite.getInviteCode();
         Long guildId = guildInvite.getGuildId();
         Integer num = null;
-        Long valueOf = channel != null ? Long.valueOf(channel.g()) : null;
+        Long valueOf = channel != null ? Long.valueOf(channel.h()) : null;
         if (channel != null) {
-            num = Integer.valueOf(channel.z());
+            num = Integer.valueOf(channel.A());
         }
         inviteCopied(inviteCode, guildId, valueOf, num, str);
     }
@@ -1290,8 +1318,8 @@ public final class AnalyticsTracker {
             mutableMapOf.put("code", code);
             Channel channel = modelInvite.getChannel();
             if (channel != null) {
-                mutableMapOf.put("channel_id", Long.valueOf(channel.g()));
-                mutableMapOf.put("channel_type", Integer.valueOf(channel.z()));
+                mutableMapOf.put("channel_id", Long.valueOf(channel.h()));
+                mutableMapOf.put("channel_type", Integer.valueOf(channel.A()));
             }
             Guild guild = modelInvite.getGuild();
             if (guild != null) {
@@ -1316,10 +1344,10 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(map, "snapshotProperties");
         Map<String, ? extends Object> filterNonNullValues = CollectionExtensionsKt.filterNonNullValues(map);
         if (channel != null) {
-            filterNonNullValues.put("invite_channel_id", Long.valueOf(channel.g()));
+            filterNonNullValues.put("invite_channel_id", Long.valueOf(channel.h()));
         }
         if (channel != null) {
-            filterNonNullValues.put("invite_channel_type", Integer.valueOf(channel.z()));
+            filterNonNullValues.put("invite_channel_type", Integer.valueOf(channel.A()));
         }
         if (guildInvite != null) {
             filterNonNullValues.put("invite_code", guildInvite.getInviteCode());
@@ -1335,7 +1363,7 @@ public final class AnalyticsTracker {
 
     public final void inviteShareClicked(GuildInvite guildInvite, Channel channel) {
         m.checkNotNullParameter(guildInvite, "guildInvite");
-        inviteShareClicked(guildInvite.getInviteCode(), guildInvite.getGuildId(), channel != null ? Long.valueOf(channel.g()) : null, channel != null ? Integer.valueOf(channel.z()) : null, guildInvite.getInviterId());
+        inviteShareClicked(guildInvite.getInviteCode(), guildInvite.getGuildId(), channel != null ? Long.valueOf(channel.h()) : null, channel != null ? Integer.valueOf(channel.A()) : null, guildInvite.getInviterId());
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0059: APUT  (r0v3 java.util.List[]), (0 ??[int, short, byte, char]), (r1v0 java.util.ArrayList) */
@@ -1346,10 +1374,10 @@ public final class AnalyticsTracker {
         List[] listArr = new List[2];
         ArrayList arrayList = new ArrayList();
         for (Channel channel : list) {
-            List<User> v = channel.v();
-            if (v != null) {
-                collection = new ArrayList(d0.t.o.collectionSizeOrDefault(v, 10));
-                for (User user : v) {
+            List<User> w = channel.w();
+            if (w != null) {
+                collection = new ArrayList(d0.t.o.collectionSizeOrDefault(w, 10));
+                for (User user : w) {
                     collection.add(Long.valueOf(user.i()));
                 }
             } else {
@@ -1363,13 +1391,9 @@ public final class AnalyticsTracker {
             arrayList2.add(Long.valueOf(user2.getId()));
         }
         listArr[1] = arrayList2;
-        Observable<R> G = StoreStream.Companion.getUserRelationships().observe(u.distinct(d0.t.o.flatten(n.listOf((Object[]) listArr)))).G(AnalyticsTracker$inviteSuggestionOpened$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get…         }.keys\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(G, 0, false, 3, null)), AnalyticsTracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsTracker$inviteSuggestionOpened$2(list, list2, j), 62, (Object) null);
-    }
-
-    public final void inviteViewed() {
-        AnalyticsUtils.Tracker.track$default(tracker, "invite_viewed", null, 2, null);
+        Observable<R> F = StoreStream.Companion.getUserRelationships().observe(u.distinct(d0.t.o.flatten(n.listOf((Object[]) listArr)))).F(AnalyticsTracker$inviteSuggestionOpened$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…         }.keys\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null)), AnalyticsTracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsTracker$inviteSuggestionOpened$2(list, list2, j), 62, (Object) null);
     }
 
     public final void joinGuildViewed() {
@@ -1398,11 +1422,11 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(map, "properties");
         Map<String, ? extends Object> mutableMap = h0.toMutableMap(map);
         if (channel != null) {
-            mutableMap.put("channel_id", Long.valueOf(channel.g()));
-            mutableMap.put("channel_type", Integer.valueOf(channel.z()));
-            long e = channel.e();
-            if (e > 0) {
-                mutableMap.put("guild_id", Long.valueOf(e));
+            mutableMap.put("channel_id", Long.valueOf(channel.h()));
+            mutableMap.put("channel_type", Integer.valueOf(channel.A()));
+            long f = channel.f();
+            if (f > 0) {
+                mutableMap.put("guild_id", Long.valueOf(f));
             }
         }
         tracker.track("media_session_joined", mutableMap);
@@ -1418,8 +1442,8 @@ public final class AnalyticsTracker {
         map.put("invite_code", code);
         Channel channel = modelInvite.getChannel();
         if (channel != null) {
-            map.put("invite_channel_id", Long.valueOf(channel.g()));
-            map.put("invite_channel_type", Integer.valueOf(channel.z()));
+            map.put("invite_channel_id", Long.valueOf(channel.h()));
+            map.put("invite_channel_type", Integer.valueOf(channel.A()));
         }
         Guild guild = modelInvite.getGuild();
         if (guild != null) {
@@ -1468,7 +1492,7 @@ public final class AnalyticsTracker {
         hashMap.put("guild_muted_until", muteConfig2 != null ? muteConfig2.getEndTimeMs() : null);
         hashMap.put("guild_receive_mobile_push", Boolean.valueOf(modelNotificationSettings.isMobilePush()));
         hashMap.put("guild_message_notification_settings", getAnalyticsValueForNotificationFrequency(Integer.valueOf(modelNotificationSettings.getMessageNotifications())));
-        hashMap.put("parent_id", channel != null ? Long.valueOf(channel.q()) : null);
+        hashMap.put("parent_id", channel != null ? Long.valueOf(channel.r()) : null);
         List<ModelNotificationSettings.ChannelOverride> channelOverrides = modelNotificationSettings.getChannelOverrides();
         m.checkNotNullExpressionValue(channelOverrides, "userGuildSettings.channelOverrides");
         Iterator<T> it = channelOverrides.iterator();
@@ -1482,7 +1506,7 @@ public final class AnalyticsTracker {
             ModelNotificationSettings.ChannelOverride channelOverride = (ModelNotificationSettings.ChannelOverride) obj;
             m.checkNotNullExpressionValue(channelOverride, "it");
             long channelId = channelOverride.getChannelId();
-            if (channel == null || channelId != channel.g()) {
+            if (channel == null || channelId != channel.h()) {
                 z3 = false;
                 continue;
             } else {
@@ -1497,7 +1521,7 @@ public final class AnalyticsTracker {
         Boolean valueOf = channelOverride2 != null ? Boolean.valueOf(channelOverride2.isMuted()) : null;
         Integer valueOf2 = channelOverride2 != null ? Integer.valueOf(channelOverride2.getMessageNotifications()) : null;
         if (channel != null) {
-            if ((channel.e() == -1 || channel.e() == 0) ? false : true) {
+            if ((channel.f() == -1 || channel.f() == 0) ? false : true) {
                 if (!m.areEqual(valueOf, Boolean.TRUE) && valueOf2 == null) {
                     z2 = false;
                 }
@@ -1578,8 +1602,9 @@ public final class AnalyticsTracker {
         tracker.track("open_popout", h0.plus(map, h0.mapOf(o.to("type", "Standard Emoji Popout"), o.to("guild_id", Long.valueOf(j)))));
     }
 
-    public final void openUserSheet(String str, ActivityPlatform activityPlatform) {
+    public final void openUserSheet(boolean z2, String str, ActivityPlatform activityPlatform) {
         HashMap hashMap = new HashMap();
+        hashMap.put("profile_has_nitro_customization", Boolean.valueOf(z2));
         if (str != null) {
             hashMap.put("game_name", str);
         }
@@ -1738,8 +1763,8 @@ public final class AnalyticsTracker {
         Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(o.to("query_length", Integer.valueOf(widgetGlobalSearchModel.getFilter().length())), o.to("query_mode", searchType != 0 ? searchType != 1 ? searchType != 2 ? searchType != 3 ? searchType != 4 ? "" : "VOICE_CHANNEL" : "GUILD" : str : "USER" : "GENERAL"), o.to("num_results_total", Integer.valueOf(widgetGlobalSearchModel.getData().size())), o.to("selected_index", Integer.valueOf(i)));
         if (itemDataPayload instanceof WidgetGlobalSearchModel.ItemChannel) {
             WidgetGlobalSearchModel.ItemChannel itemChannel = (WidgetGlobalSearchModel.ItemChannel) itemDataPayload;
-            mutableMapOf.put("selected_channel_id", Long.valueOf(itemChannel.getChannel().g()));
-            if (itemChannel.getChannel().z() == 3) {
+            mutableMapOf.put("selected_channel_id", Long.valueOf(itemChannel.getChannel().h()));
+            if (itemChannel.getChannel().A() == 3) {
                 str = "GROUP_DM";
             }
             mutableMapOf.put("selected_type", str);
@@ -1924,9 +1949,9 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(sticker, "sticker");
         m.checkNotNullParameter(str, "type");
         m.checkNotNullParameter(location, "locationTrait");
-        Long h = sticker.h();
-        m.checkNotNull(h);
-        Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(o.to("sticker_id", Long.valueOf(sticker.getId())), o.to("sticker_pack_id", h), o.to("type", str));
+        Long i = sticker.i();
+        m.checkNotNull(i);
+        Map<String, ? extends Object> mutableMapOf = h0.mutableMapOf(o.to("sticker_id", Long.valueOf(sticker.getId())), o.to("sticker_pack_id", i), o.to("type", str));
         if (str2 != null) {
             mutableMapOf.put("location", str2);
         }
@@ -2019,7 +2044,7 @@ public final class AnalyticsTracker {
                 }
             }
             if (!z3) {
-                trackUserVoiceEvent(channel, j, str, o.to("start_listening", Long.valueOf(channel.e())));
+                trackUserVoiceEvent(channel, j, str, o.to("start_listening", Long.valueOf(channel.f())));
                 return;
             }
             return;
@@ -2039,7 +2064,7 @@ public final class AnalyticsTracker {
         m.checkNotNullParameter(str, "inputMode");
         m.checkNotNullParameter(channel, "channel");
         if (set.contains(Long.valueOf(j))) {
-            trackUserVoiceEvent(channel, j, str, o.to("start_speaking", Long.valueOf(channel.e())));
+            trackUserVoiceEvent(channel, j, str, o.to("start_speaking", Long.valueOf(channel.f())));
         }
     }
 
@@ -2124,7 +2149,7 @@ public final class AnalyticsTracker {
         Map<String, Object> mutableMap = h0.toMutableMap(map);
         addVoiceConnectionProperties(mutableMap, channel, str);
         if (channel != null) {
-            mutableMap.put("channel_type", Integer.valueOf(channel.z()));
+            mutableMap.put("channel_type", Integer.valueOf(channel.A()));
             mutableMap.put("channel_bitrate", Integer.valueOf(channel.c()));
         }
         tracker.track("voice_disconnect", h0.plus(CollectionExtensionsKt.filterNonNullValues(mutableMap), toProperties(voiceConfiguration)));
diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
index 2c4c22a550..fe1df31d64 100644
--- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
+++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsUtils.java
@@ -168,9 +168,9 @@ public final class AnalyticsUtils {
                 map = h0.emptyMap();
             }
             concurrentLinkedQueue.add(new RestAPIParams.Science.Event(str, map));
-            Observable<Long> e02 = Observable.e0(1500, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable\n          .ti…0, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(e02, Tracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsUtils$Tracker$track$1(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(1500, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…0, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, Tracker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnalyticsUtils$Tracker$track$1(this), 62, (Object) null);
         }
 
         public final void track(Pair<String, Long> pair, long j, Function0<? extends Map<String, ? extends Object>> function0) {
@@ -216,11 +216,11 @@ public final class AnalyticsUtils {
         m.checkNotNullParameter(channel, "$this$properties");
         Pair[] pairArr = new Pair[3];
         int i = 0;
-        pairArr[0] = o.to("channel_id", Long.valueOf(channel.g()));
-        pairArr[1] = o.to("channel_type", Integer.valueOf(channel.z()));
-        List<User> v = channel.v();
-        if (v != null) {
-            i = v.size();
+        pairArr[0] = o.to("channel_id", Long.valueOf(channel.h()));
+        pairArr[1] = o.to("channel_type", Integer.valueOf(channel.A()));
+        List<User> w = channel.w();
+        if (w != null) {
+            i = w.size();
         }
         pairArr[2] = o.to("channel_size_total", Integer.valueOf(i));
         return h0.mapOf(pairArr);
@@ -228,7 +228,7 @@ public final class AnalyticsUtils {
 
     public final Map<String, String> getProperties$app_productionGoogleRelease(RtcConnection rtcConnection) {
         m.checkNotNullParameter(rtcConnection, "$this$properties");
-        return g0.mapOf(o.to("rtc_connection_id", rtcConnection.d));
+        return g0.mapOf(o.to("rtc_connection_id", rtcConnection.l));
     }
 
     @MainThread
diff --git a/app/src/main/java/com/discord/utilities/analytics/HardwareAnalytics.java b/app/src/main/java/com/discord/utilities/analytics/HardwareAnalytics.java
index a45f351326..30053174fb 100644
--- a/app/src/main/java/com/discord/utilities/analytics/HardwareAnalytics.java
+++ b/app/src/main/java/com/discord/utilities/analytics/HardwareAnalytics.java
@@ -58,11 +58,11 @@ public final class HardwareAnalytics {
     }
 
     private final Observable<Experiment> observeExperiment(StoreExperiments storeExperiments) {
-        Observable<R> G = storeExperiments.observeUserExperiment("2020-11_androidhardwaresurveyv1", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable a02 = G.a0(1);
-        m.checkNotNullExpressionValue(a02, "storeExperiments.observe…Null()\n          .take(1)");
-        return ObservableExtensionsKt.computationLatest(a02);
+        Observable<R> F = storeExperiments.observeUserExperiment("2020-11_androidhardwaresurveyv1", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "storeExperiments.observe…Null()\n          .take(1)");
+        return ObservableExtensionsKt.computationLatest(Z);
     }
 
     public static /* synthetic */ void runHardwareAnalytics$default(HardwareAnalytics hardwareAnalytics, Context context, HardwareSurveyVersionCache hardwareSurveyVersionCache, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/analytics/Traits.java b/app/src/main/java/com/discord/utilities/analytics/Traits.java
index b0ca698008..6b6be353fe 100644
--- a/app/src/main/java/com/discord/utilities/analytics/Traits.java
+++ b/app/src/main/java/com/discord/utilities/analytics/Traits.java
@@ -23,6 +23,7 @@ public final class Traits {
         public static final class Obj {
             public static final String BUTTON_CTA = "Button CTA";
             public static final String BUTTON_UPSELL = "Button Upsell";
+            public static final String EDIT_PROFILE_BANNER = "Edit Profile Banner";
             public static final Obj INSTANCE = new Obj();
 
             private Obj() {
@@ -46,8 +47,9 @@ public final class Traits {
             public static final String FOOTER = "Footer";
             public static final String HEADER = "Header";
             public static final Section INSTANCE = new Section();
+            public static final String PROFILE_CUSTOMIZATION = "Profile Customization";
             public static final String SETTINGS_TEXT_AND_IMAGES = "Text & Images";
-            public static final String STREAM_UPSELL_MODAL = "Stream Upsell Modal";
+            public static final String STICKER_SHEET_UPSELL = "Sticker Upsell Popout";
 
             private Section() {
             }
diff --git a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java
index 54775e4545..0d1f3e2085 100644
--- a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java
+++ b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java
@@ -377,32 +377,32 @@ public final class AuditLogChangeUtils {
             switch (key.hashCode()) {
                 case -1920783726:
                     if (key.equals("rtc_region")) {
-                        return getNullableNewOrOldValueString$default(this, change, 2131889418, 2131889419, 2131889420, null, 8, null);
+                        return getNullableNewOrOldValueString$default(this, change, 2131889425, 2131889426, 2131889427, null, 8, null);
                     }
                     break;
                 case -1451708889:
                     if (key.equals("video_quality_mode")) {
-                        return getNullableOldValueString(change, 2131889432, 2131889431);
+                        return getNullableOldValueString(change, 2131889439, 2131889438);
                     }
                     break;
                 case -934964668:
                     if (key.equals("reason")) {
-                        return 2131889434;
+                        return 2131889441;
                     }
                     break;
                 case -102270099:
                     if (key.equals("bitrate")) {
-                        return getNullableOldValueString(change, 2131889399, 2131889398);
+                        return getNullableOldValueString(change, 2131889406, 2131889405);
                     }
                     break;
                 case 3079692:
                     if (key.equals("deny")) {
-                        return 2131889411;
+                        return 2131889418;
                     }
                     break;
                 case 3373707:
                     if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889405, 2131889404);
+                        return getNullableOldValueString(change, 2131889412, 2131889411);
                     }
                     break;
                 case 3390806:
@@ -411,42 +411,42 @@ public final class AuditLogChangeUtils {
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (!booleanValue) {
-                            return 2131889406;
+                            return 2131889413;
                         }
                         if (booleanValue) {
-                            return 2131889407;
+                            return 2131889414;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 3575610:
                     if (key.equals("type")) {
-                        return getNullableOldValueString(change, 2131889427, 2131889426);
+                        return getNullableOldValueString(change, 2131889434, 2131889433);
                     }
                     break;
                 case 92906313:
                     if (key.equals("allow")) {
-                        return 2131889412;
+                        return 2131889419;
                     }
                     break;
                 case 108404047:
                     if (key.equals("reset")) {
-                        return 2131889413;
+                        return 2131889420;
                     }
                     break;
                 case 110546223:
                     if (key.equals("topic")) {
-                        return getNullableNewOrOldValueString$default(this, change, 2131889423, 2131889425, 2131889424, null, 8, null);
+                        return getNullableNewOrOldValueString$default(this, change, 2131889430, 2131889432, 2131889431, null, 8, null);
                     }
                     break;
                 case 747804969:
                     if (key.equals("position")) {
-                        return getNullableOldValueString(change, 2131889415, 2131889414);
+                        return getNullableOldValueString(change, 2131889422, 2131889421);
                     }
                     break;
                 case 987155184:
                     if (key.equals("rate_limit_per_user")) {
-                        return getNullableOldValueString(change, 2131889417, 2131889416);
+                        return getNullableOldValueString(change, 2131889424, 2131889423);
                     }
                     break;
             }
@@ -457,28 +457,28 @@ public final class AuditLogChangeUtils {
     @StringRes
     private final int getChannelTypeStringResIdFromValue(Integer num) {
         if (num != null && num.intValue() == 1) {
-            return 2131888171;
+            return 2131888170;
         }
         if (num != null && num.intValue() == 3) {
-            return 2131889136;
+            return 2131889140;
         }
         if (num != null && num.intValue() == 0) {
-            return 2131893827;
+            return 2131893925;
         }
         if (num != null && num.intValue() == 2) {
-            return 2131894515;
+            return 2131894635;
         }
         if (num != null && num.intValue() == 5) {
-            return 2131891356;
+            return 2131891427;
         }
         if (num != null && num.intValue() == 6) {
-            return 2131893594;
+            return 2131893691;
         }
         if (num != null && num.intValue() == 13) {
-            return 2131893327;
+            return 2131893410;
         }
         if ((num != null && num.intValue() == 10) || ((num != null && num.intValue() == 11) || (num != null && num.intValue() == 12))) {
-            return 2131893847;
+            return 2131893945;
         }
         return (num != null && num.intValue() == 4) ? 2131887200 : 0;
     }
@@ -490,10 +490,10 @@ public final class AuditLogChangeUtils {
             int hashCode = key.hashCode();
             if (hashCode != -934964668) {
                 if (hashCode == 3373707 && key.equals("name")) {
-                    return getNullableOldValueString(change, 2131889438, 2131889437);
+                    return getNullableOldValueString(change, 2131889445, 2131889444);
                 }
             } else if (key.equals("reason")) {
-                return 2131889434;
+                return 2131889441;
             }
         }
         return 0;
@@ -501,7 +501,7 @@ public final class AuditLogChangeUtils {
 
     private final CharSequence getExpireAfterString(int i, Context context) {
         if (i == 0) {
-            return b.g(context, 2131891425, new Object[0], null, 4);
+            return b.g(context, 2131891496, new Object[0], null, 4);
         }
         if (i == 1800) {
             Resources resources = context.getResources();
@@ -540,10 +540,10 @@ public final class AuditLogChangeUtils {
         }
         switch (key.hashCode()) {
             case -1907190207:
-                return key.equals("banner_hash") ? 2131889443 : 0;
+                return key.equals("banner_hash") ? 2131889450 : 0;
             case -1724546052:
                 if (key.equals("description")) {
-                    return getNullableNewValueString(change, 2131889447, 2131889446);
+                    return getNullableNewValueString(change, 2131889454, 2131889453);
                 }
                 return 0;
             case -1705139351:
@@ -554,28 +554,28 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
                 int longValue = (int) ((Long) value).longValue();
                 if (longValue == GuildExplicitContentFilter.NONE.getApiValue()) {
-                    return 2131889450;
+                    return 2131889457;
                 }
                 if (longValue == GuildExplicitContentFilter.SOME.getApiValue()) {
-                    return 2131889451;
+                    return 2131889458;
                 }
-                return longValue == GuildExplicitContentFilter.ALL.getApiValue() ? 2131889449 : 0;
+                return longValue == GuildExplicitContentFilter.ALL.getApiValue() ? 2131889456 : 0;
             case -1572429104:
                 if (key.equals("afk_channel_id")) {
-                    return getNullableNewValueString(change, 2131889441, 2131889440);
+                    return getNullableNewValueString(change, 2131889448, 2131889447);
                 }
                 return 0;
             case -1390796524:
-                return key.equals("icon_hash") ? 2131889452 : 0;
+                return key.equals("icon_hash") ? 2131889459 : 0;
             case -1100074521:
                 if (key.equals("system_channel_id")) {
-                    return getNullableNewValueString(change, 2131889463, 2131889462);
+                    return getNullableNewValueString(change, 2131889470, 2131889469);
                 }
                 return 0;
             case -934964668:
-                return key.equals("reason") ? 2131889434 : 0;
+                return key.equals("reason") ? 2131889441 : 0;
             case -934795532:
-                return key.equals("region") ? 2131889458 : 0;
+                return key.equals("region") ? 2131889465 : 0;
             case -506227616:
                 if (!key.equals("verification_level")) {
                     return 0;
@@ -584,29 +584,29 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
                 int longValue2 = (int) ((Long) value2).longValue();
                 if (longValue2 == GuildVerificationLevel.NONE.getApiValue()) {
-                    return 2131889472;
+                    return 2131889479;
                 }
                 if (longValue2 == GuildVerificationLevel.LOW.getApiValue()) {
-                    return 2131889470;
+                    return 2131889477;
                 }
                 if (longValue2 == GuildVerificationLevel.MEDIUM.getApiValue()) {
-                    return 2131889471;
+                    return 2131889478;
                 }
                 if (longValue2 == GuildVerificationLevel.HIGH.getApiValue()) {
-                    return 2131889469;
+                    return 2131889476;
                 }
-                return longValue2 == GuildVerificationLevel.HIGHEST.getApiValue() ? 2131889473 : 0;
+                return longValue2 == GuildVerificationLevel.HIGHEST.getApiValue() ? 2131889480 : 0;
             case -154917112:
-                return key.equals("afk_timeout") ? 2131889442 : 0;
+                return key.equals("afk_timeout") ? 2131889449 : 0;
             case 3373707:
-                return key.equals("name") ? 2131889455 : 0;
+                return key.equals("name") ? 2131889462 : 0;
             case 226923479:
-                return key.equals("discovery_splash_hash") ? 2131889448 : 0;
+                return key.equals("discovery_splash_hash") ? 2131889455 : 0;
             case 643741670:
-                return key.equals("splash_hash") ? 2131889461 : 0;
+                return key.equals("splash_hash") ? 2131889468 : 0;
             case 706006559:
                 if (key.equals("rules_channel_id")) {
-                    return getNullableNewValueString(change, 2131889460, 2131889459);
+                    return getNullableNewValueString(change, 2131889467, 2131889466);
                 }
                 return 0;
             case 945133165:
@@ -617,12 +617,12 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Long");
                 int longValue3 = (int) ((Long) value3).longValue();
                 if (longValue3 != 0) {
-                    return longValue3 != 1 ? 0 : 2131889454;
+                    return longValue3 != 1 ? 0 : 2131889461;
                 }
-                return 2131889453;
+                return 2131889460;
             case 950953474:
                 if (key.equals("public_updates_channel_id")) {
-                    return getNullableNewValueString(change, 2131889466, 2131889465);
+                    return getNullableNewValueString(change, 2131889473, 2131889472);
                 }
                 return 0;
             case 1207357234:
@@ -633,23 +633,23 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value4, "null cannot be cast to non-null type kotlin.Long");
                 int longValue4 = (int) ((Long) value4).longValue();
                 if (longValue4 != 0) {
-                    return longValue4 != 1 ? 0 : 2131889445;
+                    return longValue4 != 1 ? 0 : 2131889452;
                 }
-                return 2131889444;
+                return 2131889451;
             case 1580684753:
                 if (key.equals("vanity_url_code")) {
-                    return getNullableNewValueString(change, 2131889468, 2131889467);
+                    return getNullableNewValueString(change, 2131889475, 2131889474);
                 }
                 return 0;
             case 1639242418:
                 if (key.equals("widget_channel_id")) {
-                    return getNullableNewValueString(change, 2131889475, 2131889474);
+                    return getNullableNewValueString(change, 2131889482, 2131889481);
                 }
                 return 0;
             case 1663147559:
-                return key.equals("owner_id") ? 2131889456 : 0;
+                return key.equals("owner_id") ? 2131889463 : 0;
             case 1792613336:
-                return key.equals("preferred_locale") ? 2131889457 : 0;
+                return key.equals("preferred_locale") ? 2131889464 : 0;
             case 2010777670:
                 if (!key.equals("widget_enabled")) {
                     return 0;
@@ -658,10 +658,10 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value5, "null cannot be cast to non-null type kotlin.Boolean");
                 boolean booleanValue = ((Boolean) value5).booleanValue();
                 if (booleanValue) {
-                    return 2131889477;
+                    return 2131889484;
                 }
                 if (!booleanValue) {
-                    return 2131889476;
+                    return 2131889483;
                 }
                 throw new NoWhenBranchMatchedException();
             default:
@@ -677,9 +677,9 @@ public final class AuditLogChangeUtils {
         }
         switch (key.hashCode()) {
             case -2136953706:
-                return key.equals("sku_ids") ? 2131889540 : 0;
+                return key.equals("sku_ids") ? 2131889547 : 0;
             case -1724546052:
-                return key.equals("description") ? 2131889536 : 0;
+                return key.equals("description") ? 2131889543 : 0;
             case -892481550:
                 if (!key.equals("status")) {
                     return 0;
@@ -688,17 +688,17 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
                 int longValue = (int) ((Long) value).longValue();
                 if (longValue == GuildScheduledEventStatus.SCHEDULED.getApiValue()) {
-                    return 2131889544;
+                    return 2131889551;
                 }
                 if (longValue == GuildScheduledEventStatus.ACTIVE.getApiValue()) {
-                    return 2131889541;
+                    return 2131889548;
                 }
                 if (longValue == GuildScheduledEventStatus.COMPLETED.getApiValue()) {
-                    return 2131889543;
+                    return 2131889550;
                 }
-                return longValue == GuildScheduledEventStatus.CANCELED.getApiValue() ? 2131889542 : 0;
+                return longValue == GuildScheduledEventStatus.CANCELED.getApiValue() ? 2131889549 : 0;
             case 3373707:
-                return key.equals("name") ? 2131889539 : 0;
+                return key.equals("name") ? 2131889546 : 0;
             case 1281710614:
                 if (!key.equals("entity_type")) {
                     return 0;
@@ -707,9 +707,9 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
                 int longValue2 = (int) ((Long) value2).longValue();
                 if (longValue2 == GuildScheduledEventEntityType.NONE.getApiValue()) {
-                    return 2131889537;
+                    return 2131889544;
                 }
-                return longValue2 == GuildScheduledEventEntityType.STAGE_INSTANCE.getApiValue() ? 2131889538 : 0;
+                return longValue2 == GuildScheduledEventEntityType.STAGE_INSTANCE.getApiValue() ? 2131889545 : 0;
             case 1965579277:
                 if (!key.equals("privacy_level")) {
                     return 0;
@@ -718,9 +718,9 @@ public final class AuditLogChangeUtils {
                 Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Long");
                 int longValue3 = (int) ((Long) value3).longValue();
                 if (longValue3 == StageInstancePrivacyLevel.GUILD_ONLY.getApiValue()) {
-                    return 2131889549;
+                    return 2131889556;
                 }
-                return longValue3 == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889550 : 0;
+                return longValue3 == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889557 : 0;
             default:
                 return 0;
         }
@@ -735,7 +735,7 @@ public final class AuditLogChangeUtils {
         int hashCode = key.hashCode();
         if (hashCode != -1743820047) {
             if (hashCode != -486786702) {
-                return (hashCode == 1767574344 && key.equals("expire_grace_period")) ? 2131889484 : 0;
+                return (hashCode == 1767574344 && key.equals("expire_grace_period")) ? 2131889491 : 0;
             }
             if (!key.equals("expire_behavior")) {
                 return 0;
@@ -744,9 +744,9 @@ public final class AuditLogChangeUtils {
             Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
             int longValue = (int) ((Long) value).longValue();
             if (longValue != 0) {
-                return longValue != 1 ? 0 : 2131889482;
+                return longValue != 1 ? 0 : 2131889489;
             }
-            return 2131889483;
+            return 2131889490;
         } else if (!key.equals("enable_emoticons")) {
             return 0;
         } else {
@@ -754,10 +754,10 @@ public final class AuditLogChangeUtils {
             Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean");
             boolean booleanValue = ((Boolean) value2).booleanValue();
             if (booleanValue) {
-                return 2131889481;
+                return 2131889488;
             }
             if (!booleanValue) {
-                return 2131889480;
+                return 2131889487;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -770,31 +770,31 @@ public final class AuditLogChangeUtils {
             switch (key.hashCode()) {
                 case -1930808873:
                     if (key.equals("channel_id")) {
-                        return 2131889486;
+                        return 2131889493;
                     }
                     break;
                 case -934964668:
                     if (key.equals("reason")) {
-                        return 2131889434;
+                        return 2131889441;
                     }
                     break;
                 case 3059181:
                     if (key.equals("code")) {
-                        return 2131889487;
+                        return 2131889494;
                     }
                     break;
                 case 408141255:
                     if (key.equals("max_uses")) {
                         Object value = change.getValue();
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
-                        return ((int) ((Long) value).longValue()) != 0 ? 2131889492 : 2131889493;
+                        return ((int) ((Long) value).longValue()) != 0 ? 2131889499 : 2131889500;
                     }
                     break;
                 case 844430244:
                     if (key.equals("max_age")) {
                         Object value2 = change.getValue();
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
-                        return ((int) ((Long) value2).longValue()) != 0 ? 2131889490 : 2131889491;
+                        return ((int) ((Long) value2).longValue()) != 0 ? 2131889497 : 2131889498;
                     }
                     break;
                 case 1984986705:
@@ -803,10 +803,10 @@ public final class AuditLogChangeUtils {
                         Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value3).booleanValue();
                         if (booleanValue) {
-                            return 2131889495;
+                            return 2131889502;
                         }
                         if (!booleanValue) {
-                            return 2131889494;
+                            return 2131889501;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
@@ -861,17 +861,17 @@ public final class AuditLogChangeUtils {
                             if (hashCode == 108404047 && key.equals("reset")) {
                                 Resources resources = context.getResources();
                                 m.checkNotNullExpressionValue(resources, "context.resources");
-                                obj2 = b.g(context, 2131889413, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755141, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
+                                obj2 = b.g(context, 2131889420, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755141, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
                             }
                         } else if (key.equals("allow")) {
                             Resources resources2 = context.getResources();
                             m.checkNotNullExpressionValue(resources2, "context.resources");
-                            obj2 = b.g(context, 2131889412, new Object[]{StringResourceUtilsKt.getQuantityString(resources2, context, 2131755140, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
+                            obj2 = b.g(context, 2131889419, new Object[]{StringResourceUtilsKt.getQuantityString(resources2, context, 2131755140, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
                         }
                     } else if (key.equals("deny")) {
                         Resources resources3 = context.getResources();
                         m.checkNotNullExpressionValue(resources3, "context.resources");
-                        obj2 = b.g(context, 2131889411, new Object[]{StringResourceUtilsKt.getQuantityString(resources3, context, 2131755139, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
+                        obj2 = b.g(context, 2131889418, new Object[]{StringResourceUtilsKt.getQuantityString(resources3, context, 2131755139, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4);
                     }
                 }
                 return obj2.toString();
@@ -946,17 +946,17 @@ public final class AuditLogChangeUtils {
             switch (key.hashCode()) {
                 case -934964668:
                     if (key.equals("reason")) {
-                        return 2131889434;
+                        return 2131889441;
                     }
                     break;
                 case 3079692:
                     if (key.equals("deny")) {
-                        return 2131889531;
+                        return 2131889538;
                     }
                     break;
                 case 3373707:
                     if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889530, 2131889529);
+                        return getNullableOldValueString(change, 2131889537, 2131889536);
                     }
                     break;
                 case 64859716:
@@ -965,24 +965,24 @@ public final class AuditLogChangeUtils {
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (booleanValue) {
-                            return 2131889528;
+                            return 2131889535;
                         }
                         if (!booleanValue) {
-                            return 2131889527;
+                            return 2131889534;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 92906313:
                     if (key.equals("allow")) {
-                        return 2131889532;
+                        return 2131889539;
                     }
                     break;
                 case 94842723:
                     if (key.equals("color")) {
                         Object value2 = change.getValue();
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long");
-                        return ((Long) value2).longValue() == 0 ? 2131889522 : 2131889520;
+                        return ((Long) value2).longValue() == 0 ? 2131889529 : 2131889527;
                     }
                     break;
                 case 99457571:
@@ -991,10 +991,10 @@ public final class AuditLogChangeUtils {
                         Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue2 = ((Boolean) value3).booleanValue();
                         if (booleanValue2) {
-                            return 2131889526;
+                            return 2131889533;
                         }
                         if (!booleanValue2) {
-                            return 2131889525;
+                            return 2131889532;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
@@ -1019,11 +1019,11 @@ public final class AuditLogChangeUtils {
             Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long");
             int longValue = (int) ((Long) value).longValue();
             if (longValue == StageInstancePrivacyLevel.GUILD_ONLY.getApiValue()) {
-                return 2131889549;
+                return 2131889556;
             }
-            return longValue == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889550 : 0;
+            return longValue == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889557 : 0;
         } else if (key.equals("topic")) {
-            return getNullableOldValueString(change, 2131889425, 2131889423);
+            return getNullableOldValueString(change, 2131889432, 2131889430);
         } else {
             return 0;
         }
@@ -1032,10 +1032,10 @@ public final class AuditLogChangeUtils {
     @StringRes
     private final int getStringForPermission(long j, ModelAuditLogEntry modelAuditLogEntry) {
         if (j == 1) {
-            return 2131887913;
+            return 2131887912;
         }
         if (j == 2) {
-            return 2131890759;
+            return 2131890827;
         }
         if (j == 4) {
             return 2131886816;
@@ -1044,46 +1044,46 @@ public final class AuditLogChangeUtils {
             return 2131886301;
         }
         if (j == 16) {
-            return (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) ? 2131890907 : 2131890909;
+            return (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) ? 2131890977 : 2131890979;
         }
         if (j == 32) {
-            return 2131890923;
+            return 2131890993;
         }
         if (j == 524288) {
-            return 2131894501;
+            return 2131894620;
         }
         if (j == 67108864) {
             return 2131887246;
         }
         if (j == 134217728) {
-            return 2131890917;
+            return 2131890987;
         }
         if (j == 268435456) {
-            return 2131890921;
+            return 2131890991;
         }
         if (j == 536870912) {
-            return 2131890928;
+            return 2131890998;
         }
         if (j == 1073741824) {
-            return 2131890911;
+            return 2131890982;
         }
         if (j == 8589934592L) {
-            return 2131890913;
+            return 2131890983;
         }
         if (j == 128) {
-            return 2131894497;
+            return 2131894616;
         }
         if (j == 1024) {
-            return 2131892523;
+            return 2131892602;
         }
         if (j == 2048) {
-            return 2131893160;
+            return 2131893243;
         }
         if (j == 4096) {
-            return 2131893162;
+            return 2131893245;
         }
         if (j == 8192) {
-            return 2131890914;
+            return 2131890984;
         }
         if (j == 16384) {
             return 2131888226;
@@ -1092,13 +1092,13 @@ public final class AuditLogChangeUtils {
             return 2131886721;
         }
         if (j == 65536) {
-            return 2131892522;
+            return 2131892601;
         }
         if (j == 131072) {
-            return 2131891143;
+            return 2131891214;
         }
         if (j == 262144) {
-            return 2131894156;
+            return 2131894257;
         }
         if (j == 64) {
             return 2131886291;
@@ -1107,39 +1107,39 @@ public final class AuditLogChangeUtils {
             return 2131887501;
         }
         if (j == 2097152) {
-            return 2131893295;
+            return 2131893378;
         }
         if (j == 4194304) {
-            return 2131891305;
+            return 2131891376;
         }
         if (j == 8388608) {
-            return 2131888042;
+            return 2131888041;
         }
         if (j == 16777216) {
-            return 2131891253;
+            return 2131891324;
         }
         if (j == 33554432) {
-            return 2131894163;
+            return 2131894264;
         }
         if (j == 256) {
-            return 2131892371;
+            return 2131892448;
         }
         if (j == 512) {
-            return 2131894472;
+            return 2131894591;
         }
         if (j == 2147483648L) {
-            return 2131894152;
+            return 2131894253;
         }
-        return j == 4294967296L ? 2131892617 : 0;
+        return j == 4294967296L ? 2131892698 : 0;
     }
 
     private final CharSequence getStringForVideoQualityMode(MediaSinkWantsManager.VideoQualityMode videoQualityMode, Context context) {
         int ordinal = videoQualityMode.ordinal();
         if (ordinal == 0) {
-            return b.g(context, 2131894482, new Object[0], null, 4);
+            return b.g(context, 2131894601, new Object[0], null, 4);
         }
         if (ordinal == 1) {
-            return b.g(context, 2131894483, new Object[0], null, 4);
+            return b.g(context, 2131894602, new Object[0], null, 4);
         }
         throw new NoWhenBranchMatchedException();
     }
@@ -1168,17 +1168,17 @@ public final class AuditLogChangeUtils {
             switch (key.hashCode()) {
                 case -1919744682:
                     if (key.equals("prune_delete_days")) {
-                        return 2131889511;
+                        return 2131889518;
                     }
                     break;
                 case -934964668:
                     if (key.equals("reason")) {
-                        return 2131889434;
+                        return 2131889441;
                     }
                     break;
                 case 1168893:
                     if (key.equals("$add")) {
-                        return 2131889513;
+                        return 2131889520;
                     }
                     break;
                 case 3079270:
@@ -1187,10 +1187,10 @@ public final class AuditLogChangeUtils {
                         Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue = ((Boolean) value).booleanValue();
                         if (booleanValue) {
-                            return 2131889501;
+                            return 2131889508;
                         }
                         if (!booleanValue) {
-                            return 2131889500;
+                            return 2131889507;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
@@ -1201,22 +1201,22 @@ public final class AuditLogChangeUtils {
                         Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean");
                         boolean booleanValue2 = ((Boolean) value2).booleanValue();
                         if (booleanValue2) {
-                            return 2131889506;
+                            return 2131889513;
                         }
                         if (!booleanValue2) {
-                            return 2131889505;
+                            return 2131889512;
                         }
                         throw new NoWhenBranchMatchedException();
                     }
                     break;
                 case 3381091:
                     if (key.equals("nick")) {
-                        return getNullableNewOrOldValueString$default(this, change, 2131889507, 2131889508, 2131889509, null, 8, null);
+                        return getNullableNewOrOldValueString$default(this, change, 2131889514, 2131889515, 2131889516, null, 8, null);
                     }
                     break;
                 case 950750632:
                     if (key.equals("$remove")) {
-                        return 2131889514;
+                        return 2131889521;
                     }
                     break;
             }
@@ -1231,22 +1231,22 @@ public final class AuditLogChangeUtils {
             switch (key.hashCode()) {
                 case -1930808873:
                     if (key.equals("channel_id")) {
-                        return getNullableOldValueString(change, 2131889556, 2131889555);
+                        return getNullableOldValueString(change, 2131889563, 2131889562);
                     }
                     break;
                 case -934964668:
                     if (key.equals("reason")) {
-                        return 2131889434;
+                        return 2131889441;
                     }
                     break;
                 case 3373707:
                     if (key.equals("name")) {
-                        return getNullableOldValueString(change, 2131889560, 2131889559);
+                        return getNullableOldValueString(change, 2131889567, 2131889566);
                     }
                     break;
                 case 396929076:
                     if (key.equals("avatar_hash")) {
-                        return 2131889554;
+                        return 2131889561;
                     }
                     break;
             }
diff --git a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java
index 9f80e80433..df31525c46 100644
--- a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java
+++ b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java
@@ -81,7 +81,7 @@ public final class AuditLogUtils {
     private final int getEntryTitle(ModelAuditLogEntry modelAuditLogEntry) {
         int actionTypeId = modelAuditLogEntry.getActionTypeId();
         if (actionTypeId == 1) {
-            return 2131889464;
+            return 2131889471;
         }
         switch (actionTypeId) {
             case 10:
@@ -108,112 +108,112 @@ public final class AuditLogUtils {
                 Objects.requireNonNull(newValue, "null cannot be cast to non-null type kotlin.Long");
                 int longValue = (int) ((Long) newValue).longValue();
                 if (longValue == 2) {
-                    return 2131889433;
+                    return 2131889440;
                 }
                 if (longValue != 4) {
-                    return longValue != 13 ? 2131889422 : 2131889421;
+                    return longValue != 13 ? 2131889429 : 2131889428;
                 }
-                return 2131889400;
+                return 2131889407;
             case 11:
-                return 2131889428;
+                return 2131889435;
             case 12:
-                return 2131889403;
-            case 13:
-                return 2131889408;
-            case 14:
                 return 2131889410;
+            case 13:
+                return 2131889415;
+            case 14:
+                return 2131889417;
             case 15:
-                return 2131889409;
+                return 2131889416;
             default:
                 switch (actionTypeId) {
                     case 20:
-                        return 2131889503;
-                    case 21:
                         return 2131889510;
+                    case 21:
+                        return 2131889517;
                     case 22:
-                        return 2131889498;
+                        return 2131889505;
                     case 23:
-                        return 2131889499;
+                        return 2131889506;
                     case 24:
-                        return 2131889515;
+                        return 2131889522;
                     case 25:
-                        return 2131889512;
+                        return 2131889519;
                     case 26:
-                        return 2131889504;
+                        return 2131889511;
                     case 27:
-                        return 2131889502;
+                        return 2131889509;
                     case 28:
-                        return 2131889397;
+                        return 2131889404;
                     default:
                         switch (actionTypeId) {
                             case 30:
-                                return 2131889523;
+                                return 2131889530;
                             case 31:
-                                return 2131889533;
+                                return 2131889540;
                             case 32:
-                                return 2131889524;
+                                return 2131889531;
                             default:
                                 switch (actionTypeId) {
                                     case 40:
-                                        return 2131889488;
+                                        return 2131889495;
                                     case 41:
-                                        return 2131889496;
+                                        return 2131889503;
                                     case 42:
-                                        return 2131889489;
+                                        return 2131889496;
                                     default:
                                         switch (actionTypeId) {
                                             case 50:
-                                                return 2131889557;
+                                                return 2131889564;
                                             case 51:
-                                                return 2131889561;
+                                                return 2131889568;
                                             case 52:
-                                                return 2131889558;
+                                                return 2131889565;
                                             default:
                                                 switch (actionTypeId) {
                                                     case 60:
-                                                        return 2131889435;
+                                                        return 2131889442;
                                                     case 61:
-                                                        return 2131889439;
+                                                        return 2131889446;
                                                     case 62:
-                                                        return 2131889436;
+                                                        return 2131889443;
                                                     default:
                                                         switch (actionTypeId) {
                                                             case 72:
-                                                                return 2131889517;
+                                                                return 2131889524;
                                                             case 73:
-                                                                return 2131889516;
+                                                                return 2131889523;
                                                             case 74:
-                                                                return 2131889518;
+                                                                return 2131889525;
                                                             case 75:
-                                                                return 2131889519;
+                                                                return 2131889526;
                                                             default:
                                                                 switch (actionTypeId) {
                                                                     case 80:
-                                                                        return 2131889478;
-                                                                    case 81:
                                                                         return 2131889485;
+                                                                    case 81:
+                                                                        return 2131889492;
                                                                     case 82:
-                                                                        return 2131889479;
+                                                                        return 2131889486;
                                                                     case 83:
-                                                                        return 2131889546;
+                                                                        return 2131889553;
                                                                     case 84:
-                                                                        return 2131889551;
+                                                                        return 2131889558;
                                                                     case 85:
-                                                                        return modelAuditLogEntry.getUserId() == 0 ? 2131889548 : 2131889547;
+                                                                        return modelAuditLogEntry.getUserId() == 0 ? 2131889555 : 2131889554;
                                                                     default:
                                                                         switch (actionTypeId) {
                                                                             case 100:
-                                                                                return 2131889534;
+                                                                                return 2131889541;
                                                                             case 101:
-                                                                                return 2131889545;
+                                                                                return 2131889552;
                                                                             case 102:
-                                                                                return 2131889535;
+                                                                                return 2131889542;
                                                                             default:
                                                                                 AppLog appLog = AppLog.g;
                                                                                 StringBuilder L = a.L("Unknown audit log action type: ");
                                                                                 L.append(modelAuditLogEntry.getActionTypeId());
                                                                                 Logger.e$default(appLog, L.toString(), null, null, 6, null);
-                                                                                return 2131889553;
+                                                                                return 2131889560;
                                                                         }
                                                                 }
                                                         }
@@ -304,7 +304,7 @@ public final class AuditLogUtils {
         Clock clock = ClockFactory.get();
         CharSequence relativeTimeSpanString = DateUtils.getRelativeTimeSpanString(j, clock.currentTimeMillis(), 86400000, 131092);
         if (TimeUnit.MILLISECONDS.toDays(clock.currentTimeMillis() - j) < ((long) 7)) {
-            return b.g(context, 2131889552, new Object[]{relativeTimeSpanString, DateUtils.formatDateTime(context, j, 1)}, null, 4);
+            return b.g(context, 2131889559, new Object[]{relativeTimeSpanString, DateUtils.formatDateTime(context, j, 1)}, null, 4);
         }
         m.checkNotNullExpressionValue(relativeTimeSpanString, "timeString");
         return relativeTimeSpanString;
@@ -317,108 +317,108 @@ public final class AuditLogUtils {
     @StringRes
     public final int getActionName(int i) {
         if (i == 0) {
-            return 2131889683;
+            return 2131889691;
         }
         if (i == 1) {
-            return 2131889369;
+            return 2131889376;
         }
         switch (i) {
             case 10:
-                return 2131889357;
+                return 2131889364;
             case 11:
-                return 2131889362;
+                return 2131889369;
             case 12:
-                return 2131889358;
+                return 2131889365;
             case 13:
-                return 2131889359;
+                return 2131889366;
             case 14:
-                return 2131889361;
+                return 2131889368;
             case 15:
-                return 2131889360;
+                return 2131889367;
             default:
                 switch (i) {
                     case 20:
-                        return 2131889379;
+                        return 2131889386;
                     case 21:
-                        return 2131889381;
+                        return 2131889388;
                     case 22:
-                        return 2131889376;
-                    case 23:
-                        return 2131889377;
-                    case 24:
                         return 2131889383;
+                    case 23:
+                        return 2131889384;
+                    case 24:
+                        return 2131889390;
                     case 25:
-                        return 2131889382;
+                        return 2131889389;
                     case 26:
-                        return 2131889380;
+                        return 2131889387;
                     case 27:
-                        return 2131889378;
+                        return 2131889385;
                     case 28:
-                        return 2131889356;
+                        return 2131889363;
                     default:
                         switch (i) {
                             case 30:
-                                return 2131889388;
+                                return 2131889395;
                             case 31:
-                                return 2131889390;
+                                return 2131889397;
                             case 32:
-                                return 2131889389;
+                                return 2131889396;
                             default:
                                 switch (i) {
                                     case 40:
-                                        return 2131889373;
+                                        return 2131889380;
                                     case 41:
-                                        return 2131889375;
+                                        return 2131889382;
                                     case 42:
-                                        return 2131889374;
+                                        return 2131889381;
                                     default:
                                         switch (i) {
                                             case 50:
-                                                return 2131889394;
+                                                return 2131889401;
                                             case 51:
-                                                return 2131889396;
+                                                return 2131889403;
                                             case 52:
-                                                return 2131889395;
+                                                return 2131889402;
                                             default:
                                                 switch (i) {
                                                     case 60:
-                                                        return 2131889363;
+                                                        return 2131889370;
                                                     case 61:
-                                                        return 2131889365;
+                                                        return 2131889372;
                                                     case 62:
-                                                        return 2131889364;
+                                                        return 2131889371;
                                                     default:
                                                         switch (i) {
                                                             case 72:
-                                                                return 2131889385;
+                                                                return 2131889392;
                                                             case 73:
-                                                                return 2131889384;
+                                                                return 2131889391;
                                                             case 74:
-                                                                return 2131889386;
+                                                                return 2131889393;
                                                             case 75:
-                                                                return 2131889387;
+                                                                return 2131889394;
                                                             default:
                                                                 switch (i) {
                                                                     case 80:
-                                                                        return 2131889370;
+                                                                        return 2131889377;
                                                                     case 81:
-                                                                        return 2131889372;
+                                                                        return 2131889379;
                                                                     case 82:
-                                                                        return 2131889371;
+                                                                        return 2131889378;
                                                                     case 83:
-                                                                        return 2131889391;
+                                                                        return 2131889398;
                                                                     case 84:
-                                                                        return 2131889393;
+                                                                        return 2131889400;
                                                                     case 85:
-                                                                        return 2131889392;
+                                                                        return 2131889399;
                                                                     default:
                                                                         switch (i) {
                                                                             case 100:
-                                                                                return 2131889366;
+                                                                                return 2131889373;
                                                                             case 101:
-                                                                                return 2131889368;
+                                                                                return 2131889375;
                                                                             case 102:
-                                                                                return 2131889367;
+                                                                                return 2131889374;
                                                                             default:
                                                                                 return 0;
                                                                         }
@@ -438,13 +438,13 @@ public final class AuditLogUtils {
         if (actionType != null) {
             int ordinal = actionType.ordinal();
             if (ordinal == 1) {
-                return 2131231406;
+                return 2131231412;
             }
             if (ordinal == 2) {
-                return 2131231408;
+                return 2131231414;
             }
             if (ordinal == 3) {
-                return 2131231407;
+                return 2131231413;
             }
         }
         return 0;
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java
index b866481fe4..ed34cfb372 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager$saveCredentials$1.java
@@ -80,7 +80,7 @@ public final class GoogleSmartLockManager$saveCredentials$1 extends o implements
         UserUtils userUtils = UserUtils.INSTANCE;
         m.checkNotNullExpressionValue(meUser, "it");
         aVar.b = UserUtils.getUserNameWithDiscriminator$default(userUtils, meUser, null, null, 3, null).toString();
-        aVar.f2273c = Uri.parse(forUser$default);
+        aVar.f2279c = Uri.parse(forUser$default);
         Credential a = aVar.a();
         CredentialsClient access$getCredentialsClient$p = GoogleSmartLockManager.access$getCredentialsClient$p(this.this$0);
         Objects.requireNonNull(access$getCredentialsClient$p);
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
index 277b9387af..0035cd0367 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockManager.java
@@ -79,19 +79,19 @@ public final class GoogleSmartLockManager {
     public static final class SmartLockCredentials {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2103id;
+        private final String f2109id;
         private final String password;
 
         public SmartLockCredentials(String str, String str2) {
             m.checkNotNullParameter(str, "id");
             m.checkNotNullParameter(str2, "password");
-            this.f2103id = str;
+            this.f2109id = str;
             this.password = str2;
         }
 
         public static /* synthetic */ SmartLockCredentials copy$default(SmartLockCredentials smartLockCredentials, String str, String str2, int i, Object obj) {
             if ((i & 1) != 0) {
-                str = smartLockCredentials.f2103id;
+                str = smartLockCredentials.f2109id;
             }
             if ((i & 2) != 0) {
                 str2 = smartLockCredentials.password;
@@ -100,7 +100,7 @@ public final class GoogleSmartLockManager {
         }
 
         public final String component1() {
-            return this.f2103id;
+            return this.f2109id;
         }
 
         public final String component2() {
@@ -121,11 +121,11 @@ public final class GoogleSmartLockManager {
                 return false;
             }
             SmartLockCredentials smartLockCredentials = (SmartLockCredentials) obj;
-            return m.areEqual(this.f2103id, smartLockCredentials.f2103id) && m.areEqual(this.password, smartLockCredentials.password);
+            return m.areEqual(this.f2109id, smartLockCredentials.f2109id) && m.areEqual(this.password, smartLockCredentials.password);
         }
 
         public final String getId() {
-            return this.f2103id;
+            return this.f2109id;
         }
 
         public final String getPassword() {
@@ -133,7 +133,7 @@ public final class GoogleSmartLockManager {
         }
 
         public int hashCode() {
-            String str = this.f2103id;
+            String str = this.f2109id;
             int i = 0;
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.password;
@@ -145,7 +145,7 @@ public final class GoogleSmartLockManager {
 
         public String toString() {
             StringBuilder L = a.L("SmartLockCredentials(id=");
-            L.append(this.f2103id);
+            L.append(this.f2109id);
             L.append(", password=");
             return a.D(L, this.password, ")");
         }
@@ -267,9 +267,9 @@ public final class GoogleSmartLockManager {
         m.checkNotNullParameter(str, "id");
         m.checkNotNullParameter(str2, "password");
         if (this.smartLockRepo.getEnabled()) {
-            Observable a02 = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).a0(1);
-            m.checkNotNullExpressionValue(a02, "StoreStream.getUsers().observeMe().take(1)");
-            ObservableExtensionsKt.appSubscribe$default(a02, GoogleSmartLockManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GoogleSmartLockManager$saveCredentials$1(this, str, str2), 62, (Object) null);
+            Observable Z = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Z(1);
+            m.checkNotNullExpressionValue(Z, "StoreStream.getUsers().observeMe().take(1)");
+            ObservableExtensionsKt.appSubscribe$default(Z, GoogleSmartLockManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GoogleSmartLockManager$saveCredentials$1(this, str, str2), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
index 5ca60c23e4..cec98a37dc 100644
--- a/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
+++ b/app/src/main/java/com/discord/utilities/auth/GoogleSmartLockRepo.java
@@ -120,16 +120,16 @@ public final class GoogleSmartLockRepo {
     public GoogleSmartLockRepo(StoreExperiments storeExperiments, StoreAuthentication storeAuthentication) {
         m.checkNotNullParameter(storeExperiments, "storeExperiments");
         m.checkNotNullParameter(storeAuthentication, "storeAuth");
-        PublishSubject<GoogleSmartLockManager.SmartLockCredentials> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.smartLockLogin = l0;
+        PublishSubject<GoogleSmartLockManager.SmartLockCredentials> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.smartLockLogin = k0;
         this.smartLockLoginAttempt = new SmartLockSignInAttempt(false, false, 3, null);
         this.enabled = true;
-        Observable<R> G = storeExperiments.observeUserExperiment("2021-01_google_smart_lock", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable G2 = G.G(AnonymousClass1.INSTANCE);
-        m.checkNotNullExpressionValue(G2, "storeExperiments.observe…experiment?.bucket == 1 }");
-        ObservableExtensionsKt.appSubscribe$default(G2, GoogleSmartLockRepo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable<R> F = storeExperiments.observeUserExperiment("2021-01_google_smart_lock", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable F2 = F.F(AnonymousClass1.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "storeExperiments.observe…experiment?.bucket == 1 }");
+        ObservableExtensionsKt.appSubscribe$default(F2, GoogleSmartLockRepo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(storeAuthentication.getPreLogoutSignal$app_productionGoogleRelease(), GoogleSmartLockRepo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/billing/BillingUtils.java b/app/src/main/java/com/discord/utilities/billing/BillingUtils.java
index 2a719d664b..8c189bbcab 100644
--- a/app/src/main/java/com/discord/utilities/billing/BillingUtils.java
+++ b/app/src/main/java/com/discord/utilities/billing/BillingUtils.java
@@ -35,7 +35,7 @@ public final class BillingUtils {
         }
         String a = purchase.a();
         m.checkNotNullExpressionValue(a, "purchase.purchaseToken");
-        String optString = purchase.f1549c.optString("packageName");
+        String optString = purchase.f1544c.optString("packageName");
         m.checkNotNullExpressionValue(optString, "purchase.packageName");
         RestAPIParams.VerifyPurchaseTokenBody verifyPurchaseTokenBody = new RestAPIParams.VerifyPurchaseTokenBody(a, id2, optString, str2, str);
         companion.getGooglePlayPurchases().onVerificationStart();
@@ -56,7 +56,7 @@ public final class BillingUtils {
     public final void verifyPurchases(List<? extends Purchase> list) {
         if (list != null) {
             for (Purchase purchase : list) {
-                if ((purchase.f1549c.optInt("purchaseState", 1) != 4 ? (char) 1 : 2) == 1 && !purchase.c()) {
+                if ((purchase.f1544c.optInt("purchaseState", 1) != 4 ? (char) 1 : 2) == 1 && !purchase.c()) {
                     INSTANCE.verifyPurchase(purchase);
                 }
             }
diff --git a/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java b/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
index d2ae2c1dc1..133dd4bb61 100644
--- a/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
+++ b/app/src/main/java/com/discord/utilities/billing/GooglePlayBillingManager.java
@@ -307,9 +307,9 @@ public final class GooglePlayBillingManager implements e, b, g, d {
     private final void reconnect() {
         if (isReconnecting.compareAndSet(false, true)) {
             long j = backoffTimeMs.get();
-            Observable<Long> e02 = Observable.e0(j, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable\n          .ti…s, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(e02, GooglePlayBillingManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GooglePlayBillingManager$reconnect$1(j), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(j, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…s, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, GooglePlayBillingManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GooglePlayBillingManager$reconnect$1(j), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java b/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java
index 324d33f9e8..9b74e739e1 100644
--- a/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java
+++ b/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java
@@ -33,25 +33,25 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* JADX WARN: Init of enum PREMIUM_GUILD_1_MONTHLY can be incorrect */
 /* JADX WARN: Init of enum PREMIUM_GUILD_2_MONTHLY can be incorrect */
 public enum GooglePlaySku {
-    PREMIUM_TIER_2_YEARLY("premium_tier_2_yearly", 2131231845, r14, null, 2, r15, 8, null),
-    PREMIUM_TIER_2_MONTHLY("premium_tier_2_monthly", 2131231845, r14, r13, 2, r18),
-    PREMIUM_TIER_1_YEARLY("premium_tier_1_yearly", 2131231842, r14, null, 0, r15, 8, null),
-    PREMIUM_TIER_1_MONTHLY("premium_tier_1_monthly", 2131231842, r14, r13, 0, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_1_YEARLY("premium_tier_2_premium_guild_1_yearly", 2131231833, r14, null, 3, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_1_MONTHLY("premium_tier_2_premium_guild_1_monthly", 2131231833, r14, r13, 3, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_2_YEARLY("premium_tier_2_premium_guild_2_yearly", 2131231836, r14, null, 4, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_2_MONTHLY("premium_tier_2_premium_guild_2_monthly", 2131231836, r14, r13, 4, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_3_YEARLY("premium_tier_2_premium_guild_3_yearly", 2131231838, r14, null, 5, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_3_MONTHLY("premium_tier_2_premium_guild_3_monthly", 2131231838, r14, r13, 5, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_5_YEARLY("premium_tier_2_premium_guild_5_yearly", 2131231839, r14, null, 7, r15, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_5_MONTHLY("premium_tier_2_premium_guild_5_monthly", 2131231839, r14, r13, 7, r18),
-    PREMIUM_TIER_2_PREMIUM_GUILD_10_MONTHLY("premium_tier_2_premium_guild_10_monthly", 2131231834, r14, null, 12, r18, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_13_MONTHLY("premium_tier_2_premium_guild_13_monthly", 2131231835, r14, null, 15, r18, 8, null),
-    PREMIUM_TIER_2_PREMIUM_GUILD_28_MONTHLY("premium_tier_2_premium_guild_28_monthly", 2131231837, r14, null, 30, r18, 8, null),
-    PREMIUM_TIER_1_PREMIUM_GUILD_1_YEARLY("premium_tier_1_premium_guild_1_yearly", 2131231843, r14, null, 1, r15, 8, null),
-    PREMIUM_TIER_1_PREMIUM_GUILD_1_MONTHLY("premium_tier_1_premium_guild_1_monthly", 2131231843, r14, r13, 1, r18),
-    PREMIUM_GUILD_1_MONTHLY("premium_guild_1_monthly", 2131231840, r13, r17, 1, r18),
-    PREMIUM_GUILD_2_MONTHLY("premium_guild_2_monthly", 2131231841, r13, r17, 2, r18);
+    PREMIUM_TIER_2_YEARLY("premium_tier_2_yearly", 2131231853, r14, null, 2, r15, 8, null),
+    PREMIUM_TIER_2_MONTHLY("premium_tier_2_monthly", 2131231853, r14, r13, 2, r18),
+    PREMIUM_TIER_1_YEARLY("premium_tier_1_yearly", 2131231850, r14, null, 0, r15, 8, null),
+    PREMIUM_TIER_1_MONTHLY("premium_tier_1_monthly", 2131231850, r14, r13, 0, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_1_YEARLY("premium_tier_2_premium_guild_1_yearly", 2131231841, r14, null, 3, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_1_MONTHLY("premium_tier_2_premium_guild_1_monthly", 2131231841, r14, r13, 3, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_2_YEARLY("premium_tier_2_premium_guild_2_yearly", 2131231844, r14, null, 4, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_2_MONTHLY("premium_tier_2_premium_guild_2_monthly", 2131231844, r14, r13, 4, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_3_YEARLY("premium_tier_2_premium_guild_3_yearly", 2131231846, r14, null, 5, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_3_MONTHLY("premium_tier_2_premium_guild_3_monthly", 2131231846, r14, r13, 5, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_5_YEARLY("premium_tier_2_premium_guild_5_yearly", 2131231847, r14, null, 7, r15, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_5_MONTHLY("premium_tier_2_premium_guild_5_monthly", 2131231847, r14, r13, 7, r18),
+    PREMIUM_TIER_2_PREMIUM_GUILD_10_MONTHLY("premium_tier_2_premium_guild_10_monthly", 2131231842, r14, null, 12, r18, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_13_MONTHLY("premium_tier_2_premium_guild_13_monthly", 2131231843, r14, null, 15, r18, 8, null),
+    PREMIUM_TIER_2_PREMIUM_GUILD_28_MONTHLY("premium_tier_2_premium_guild_28_monthly", 2131231845, r14, null, 30, r18, 8, null),
+    PREMIUM_TIER_1_PREMIUM_GUILD_1_YEARLY("premium_tier_1_premium_guild_1_yearly", 2131231851, r14, null, 1, r15, 8, null),
+    PREMIUM_TIER_1_PREMIUM_GUILD_1_MONTHLY("premium_tier_1_premium_guild_1_monthly", 2131231851, r14, r13, 1, r18),
+    PREMIUM_GUILD_1_MONTHLY("premium_guild_1_monthly", 2131231848, r13, r17, 1, r18),
+    PREMIUM_GUILD_2_MONTHLY("premium_guild_2_monthly", 2131231849, r13, r17, 2, r18);
     
     private static final List<String> ALL_SKU_NAMES;
     public static final Companion Companion = new Companion(null);
@@ -102,19 +102,19 @@ public enum GooglePlaySku {
             m.checkNotNullParameter(type, "skuType");
             int ordinal = type.ordinal();
             if (ordinal == 0) {
-                return 2131231017;
+                return 2131231022;
             }
             if (ordinal == 1) {
-                return 2131231015;
+                return 2131231020;
             }
             if (ordinal == 2) {
-                return 2131231024;
+                return 2131231029;
             }
             if (ordinal == 3) {
-                return 2131231023;
+                return 2131231028;
             }
             if (ordinal == 4) {
-                return 2131231021;
+                return 2131231026;
             }
             throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java b/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java
index 0defeaafdc..832852e8e9 100644
--- a/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java
@@ -85,10 +85,10 @@ public final class PremiumUtilsKt {
     public static final int getPaymentSourceIcon(ModelPaymentSource modelPaymentSource) {
         m.checkNotNullParameter(modelPaymentSource, "paymentSource");
         if (modelPaymentSource instanceof ModelPaymentSource.ModelPaymentSourcePaypal) {
-            return 2131231541;
+            return 2131231547;
         }
         if (!(modelPaymentSource instanceof ModelPaymentSource.ModelPaymentSourceCard)) {
-            return 2131231539;
+            return 2131231545;
         }
         String brand = ((ModelPaymentSource.ModelPaymentSourceCard) modelPaymentSource).getBrand();
         Objects.requireNonNull(brand, "null cannot be cast to non-null type java.lang.String");
@@ -96,25 +96,25 @@ public final class PremiumUtilsKt {
         m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase()");
         switch (lowerCase.hashCode()) {
             case -2038717326:
-                return lowerCase.equals("mastercard") ? 2131231540 : 2131231539;
+                return lowerCase.equals("mastercard") ? 2131231546 : 2131231545;
             case 2997727:
-                return lowerCase.equals("amex") ? 2131231537 : 2131231539;
+                return lowerCase.equals("amex") ? 2131231543 : 2131231545;
             case 3619905:
-                return lowerCase.equals("visa") ? 2131231542 : 2131231539;
+                return lowerCase.equals("visa") ? 2131231548 : 2131231545;
             case 61060803:
                 if (!lowerCase.equals("american-express")) {
-                    return 2131231539;
+                    return 2131231545;
                 }
                 break;
             case 273184745:
-                return lowerCase.equals("discover") ? 2131231538 : 2131231539;
+                return lowerCase.equals("discover") ? 2131231544 : 2131231545;
             case 1174445979:
                 if (!lowerCase.equals("master-card")) {
-                    return 2131231539;
+                    return 2131231545;
                 }
                 break;
             default:
-                return 2131231539;
+                return 2131231545;
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java b/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
index 85e036018c..c7a234457a 100644
--- a/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
+++ b/app/src/main/java/com/discord/utilities/bugreports/BugReportManager.java
@@ -119,8 +119,8 @@ public final class BugReportManager {
     }
 
     public final void setupSubscriptions() {
-        Observable s2 = this.storeUser.observeMe(true).G(BugReportManager$setupSubscriptions$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "storeUser.observeMe(emit… }.distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, BugReportManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportManager$setupSubscriptions$2(this), 62, (Object) null);
+        Observable r = this.storeUser.observeMe(true).F(BugReportManager$setupSubscriptions$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "storeUser.observeMe(emit… }.distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, BugReportManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportManager$setupSubscriptions$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaErrorBody.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaErrorBody.java
index 947c6267cb..871f2bd33c 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaErrorBody.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaErrorBody.java
@@ -33,7 +33,7 @@ public final class CaptchaErrorBody implements Serializable {
                 return null;
             }
             e eVar = new e();
-            eVar.f1387c = c.LOWER_CASE_WITH_UNDERSCORES;
+            eVar.f1382c = c.LOWER_CASE_WITH_UNDERSCORES;
             try {
                 return (CaptchaErrorBody) c.i.a.f.e.o.c.q0(CaptchaErrorBody.class).cast(eVar.a().g(bodyText, CaptchaErrorBody.class));
             } catch (Exception e) {
diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
index 5c075ee616..9241fec05a 100644
--- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
+++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java
@@ -144,7 +144,7 @@ public final class CaptchaHelper$tryShowCaptcha$1<T> implements Action1<Emitter<
             builder.a = siteKey;
             builder.l = StoreStream.Companion.getUserSettingsSystem().getLocale();
             builder.k = true;
-            Boolean bool = builder.f2368c;
+            Boolean bool = builder.f2374c;
             if (!builder.b) {
                 bool = HCaptchaConfig.access$000();
             }
@@ -174,14 +174,14 @@ public final class CaptchaHelper$tryShowCaptcha$1<T> implements Action1<Emitter<
             c.j.a.c cVar = new c.j.a.c();
             cVar.setArguments(bundle);
             cVar.show(aVar.e, c.j.a.c.i);
-            aVar.f1453c.add(new AnonymousClass1(emitter));
+            aVar.f1448c.add(new AnonymousClass1(emitter));
             aVar.a();
             aVar.d.add(new AnonymousClass2(emitter, captchaHelper$tryShowCaptcha$1$errorHandler$1));
             aVar.a();
         } else if (captchaRequest instanceof CaptchaHelper.CaptchaRequest.ReCaptcha) {
             Activity activity2 = ((CaptchaHelper.CaptchaRequest.ReCaptcha) captchaRequest).getActivity();
             CaptchaHelper captchaHelper = CaptchaHelper.INSTANCE;
-            Object obj = GoogleApiAvailability.f2279c;
+            Object obj = GoogleApiAvailability.f2285c;
             GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
             m.checkNotNullExpressionValue(googleApiAvailability, "GoogleApiAvailability\n              .getInstance()");
             CaptchaHelper.access$ensurePlayServicesAvailable(captchaHelper, googleApiAvailability, activity2, new AnonymousClass3(activity2, emitter, captchaHelper$tryShowCaptcha$1$errorHandler$1), captchaHelper$tryShowCaptcha$1$errorHandler$1);
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelInviteLaunchUtils.java b/app/src/main/java/com/discord/utilities/channel/ChannelInviteLaunchUtils.java
index 84e0836865..3f4e5230db 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelInviteLaunchUtils.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelInviteLaunchUtils.java
@@ -20,24 +20,24 @@ public final class ChannelInviteLaunchUtils {
         m.checkNotNullParameter(fragment, "fragment");
         m.checkNotNullParameter(str, "source");
         if (channel != null) {
-            long g = channel.g();
-            if (channel.e() != 0) {
+            long h = channel.h();
+            if (channel.f() != 0) {
                 WidgetGuildInviteShare.Companion companion = WidgetGuildInviteShare.Companion;
                 Context requireContext = fragment.requireContext();
                 m.checkNotNullExpressionValue(requireContext, "fragment.requireContext()");
                 FragmentManager childFragmentManager = fragment.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager, "fragment.childFragmentManager");
-                WidgetGuildInviteShare.Companion.launch$default(companion, requireContext, childFragmentManager, channel.e(), Long.valueOf(g), false, str, 16, null);
+                WidgetGuildInviteShare.Companion.launch$default(companion, requireContext, childFragmentManager, channel.f(), Long.valueOf(h), false, str, 16, null);
             } else if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) {
                 GroupInviteFriendsSheet.Companion companion2 = GroupInviteFriendsSheet.Companion;
                 FragmentManager childFragmentManager2 = fragment.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager2, "fragment.childFragmentManager");
-                companion2.show(childFragmentManager2, g, str);
+                companion2.show(childFragmentManager2, h, str);
             } else {
                 WidgetGroupInviteFriends.Companion companion3 = WidgetGroupInviteFriends.Companion;
                 Context requireContext2 = fragment.requireContext();
                 m.checkNotNullExpressionValue(requireContext2, "fragment.requireContext()");
-                companion3.launch(requireContext2, g, str);
+                companion3.launch(requireContext2, h, str);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelNotificationSettingsUtils.java b/app/src/main/java/com/discord/utilities/channel/ChannelNotificationSettingsUtils.java
index 889c0c6338..fcae46a5e2 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelNotificationSettingsUtils.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelNotificationSettingsUtils.java
@@ -15,7 +15,7 @@ public final class ChannelNotificationSettingsUtils {
         m.checkNotNullParameter(guild, "guild");
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(modelNotificationSettings, "guildSettings");
-        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(channel.g());
+        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(channel.h());
         int messageNotifications = channelOverride != null ? channelOverride.getMessageNotifications() : ModelNotificationSettings.FREQUENCY_UNSET;
         if (messageNotifications != ModelNotificationSettings.FREQUENCY_UNSET) {
             return messageNotifications;
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java b/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java
index 8f9c4c7ef8..7da9cd0811 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java
@@ -13,63 +13,63 @@ import java.util.Map;
 public final class ChannelPermissionUtilsKt {
     public static final Map<Integer, PermissionLabelOverrides> getCategoryLabels(Context context) {
         m.checkNotNullParameter(context, "context");
-        String string = context.getString(2131892890);
-        String string2 = context.getString(2131892892);
+        String string = context.getString(2131892971);
+        String string2 = context.getString(2131892973);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…nel_description_category)");
-        String string3 = context.getString(2131890909);
-        String string4 = context.getString(2131892797);
+        String string3 = context.getString(2131890979);
+        String string4 = context.getString(2131892878);
         m.checkNotNullExpressionValue(string4, "context.getString(R.stri…nel_description_category)");
-        String string5 = context.getString(2131892811);
+        String string5 = context.getString(2131892892);
         m.checkNotNullExpressionValue(string5, "context.getString(R.stri…les_description_category)");
-        String string6 = context.getString(2131892819);
+        String string6 = context.getString(2131892900);
         m.checkNotNullExpressionValue(string6, "context.getString(R.stri…oks_description_category)");
-        String string7 = context.getString(2131892857);
+        String string7 = context.getString(2131892938);
         m.checkNotNullExpressionValue(string7, "context.getString(R.stri…ges_description_category)");
         f fVar = f.a;
         Object[] objArr = {fVar.a(360032008192L, null)};
-        String string8 = context.getString(2131892786);
+        String string8 = context.getString(2131892867);
         m.checkNotNullExpressionValue(string8, "context.getString(R.stri…ite_description_category)");
-        String string9 = context.getString(2131892793);
+        String string9 = context.getString(2131892874);
         m.checkNotNullExpressionValue(string9, "context.getString(R.stri…nks_description_category)");
-        String string10 = context.getString(2131892773);
+        String string10 = context.getString(2131892854);
         m.checkNotNullExpressionValue(string10, "context.getString(R.stri…les_description_category)");
-        String string11 = context.getString(2131892769);
+        String string11 = context.getString(2131892850);
         m.checkNotNullExpressionValue(string11, "context.getString(R.stri…ons_description_category)");
-        String string12 = context.getString(2131892877);
+        String string12 = context.getString(2131892958);
         m.checkNotNullExpressionValue(string12, "context.getString(R.stri…jis_description_category)");
-        String string13 = context.getString(2131892822);
+        String string13 = context.getString(2131892903);
         m.checkNotNullExpressionValue(string13, "context.getString(R.stri…one_description_category)");
-        String string14 = context.getString(2131892807);
+        String string14 = context.getString(2131892888);
         m.checkNotNullExpressionValue(string14, "context.getString(R.stri…ges_description_category)");
         Object[] objArr2 = {fVar.a(360032008192L, null)};
-        String string15 = context.getString(2131892840);
+        String string15 = context.getString(2131892921);
         m.checkNotNullExpressionValue(string15, "context.getString(R.stri…ory_description_category)");
-        String string16 = context.getString(2131892861);
+        String string16 = context.getString(2131892942);
         m.checkNotNullExpressionValue(string16, "context.getString(R.stri…ges_description_category)");
-        String string17 = context.getString(2131892779);
+        String string17 = context.getString(2131892860);
         m.checkNotNullExpressionValue(string17, "context.getString(R.stri…ect_description_category)");
-        String string18 = context.getString(2131892780);
-        String string19 = context.getString(2131892784);
-        String string20 = context.getString(2131892864);
+        String string18 = context.getString(2131892861);
+        String string19 = context.getString(2131892865);
+        String string20 = context.getString(2131892945);
         m.checkNotNullExpressionValue(string20, "context.getString(R.stri…eak_description_category)");
-        String string21 = context.getString(2131892868);
+        String string21 = context.getString(2131892949);
         m.checkNotNullExpressionValue(string21, "context.getString(R.stri…eam_description_category)");
-        String string22 = context.getString(2131892886);
+        String string22 = context.getString(2131892967);
         m.checkNotNullExpressionValue(string22, "context.getString(R.stri…vad_description_category)");
-        CharSequence g = b.g(context, 2131892835, new Object[]{b.g(context, 2131890739, new Object[0], null, 4)}, null, 4);
-        Object[] objArr3 = {b.g(context, 2131890739, new Object[0], null, 4)};
-        String string23 = context.getString(2131892790);
+        CharSequence g = b.g(context, 2131892916, new Object[]{b.g(context, 2131890807, new Object[0], null, 4)}, null, 4);
+        Object[] objArr3 = {b.g(context, 2131890807, new Object[0], null, 4)};
+        String string23 = context.getString(2131892871);
         m.checkNotNullExpressionValue(string23, "context.getString(R.stri…ers_description_category)");
-        String string24 = context.getString(2131892825);
+        String string24 = context.getString(2131892906);
         m.checkNotNullExpressionValue(string24, "context.getString(R.stri…ers_description_category)");
-        String string25 = context.getString(2131892843);
+        String string25 = context.getString(2131892924);
         m.checkNotNullExpressionValue(string25, "context.getString(R.stri…eak_description_category)");
-        return h0.hashMapOf(o.to(2131362297, new PermissionLabelOverrides(string2, string, null, null, context.getString(2131892895), context.getString(2131892896), null, context.getString(2131892893), null, 332, null)), o.to(2131362286, new PermissionLabelOverrides(string4, string3, context.getString(2131892800), context.getString(2131892798), null, null, null, null, null, 496, null)), o.to(2131362287, new PermissionLabelOverrides(string5, null, null, context.getString(2131892813), null, null, null, null, null, 502, null)), o.to(2131362288, new PermissionLabelOverrides(string6, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362298, new PermissionLabelOverrides(string7, null, null, null, null, null, null, null, b.g(context, 2131892856, objArr, null, 4), 254, null)), o.to(2131362285, new PermissionLabelOverrides(string8, null, context.getString(2131892788), null, null, null, null, null, null, 506, null)), o.to(2131362293, new PermissionLabelOverrides(string9, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362292, new PermissionLabelOverrides(string10, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362291, new PermissionLabelOverrides(string11, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362300, new PermissionLabelOverrides(string12, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362295, new PermissionLabelOverrides(string13, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362294, new PermissionLabelOverrides(string14, null, null, null, null, null, null, null, b.g(context, 2131892806, objArr2, null, 4), 254, null)), o.to(2131362296, new PermissionLabelOverrides(string15, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362299, new PermissionLabelOverrides(string16, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362302, new PermissionLabelOverrides(string17, null, null, context.getString(2131892781), null, string19, context.getString(2131892782), string18, null, 278, null)), o.to(2131362307, new PermissionLabelOverrides(string20, null, null, context.getString(2131892865), null, null, null, null, null, 502, null)), o.to(2131362309, new PermissionLabelOverrides(string21, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362308, new PermissionLabelOverrides(string22, null, null, context.getString(2131892887), null, null, null, null, null, 502, null)), o.to(2131362306, new PermissionLabelOverrides(g, null, null, null, null, null, null, b.g(context, 2131892835, objArr3, null, 4), null, 382, null)), o.to(2131362305, new PermissionLabelOverrides(b.g(context, 2131892829, new Object[0], null, 4), null, null, b.g(context, 2131892830, new Object[0], null, 4), null, null, null, null, null, 502, null)), o.to(2131362303, new PermissionLabelOverrides(string23, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362304, new PermissionLabelOverrides(string24, null, null, context.getString(2131892826), null, null, null, null, null, 502, null)), o.to(2131362290, new PermissionLabelOverrides(string25, null, null, null, null, null, null, null, null, 510, null)));
+        return h0.hashMapOf(o.to(2131362308, new PermissionLabelOverrides(string2, string, null, null, context.getString(2131892976), context.getString(2131892977), null, context.getString(2131892974), null, 332, null)), o.to(2131362297, new PermissionLabelOverrides(string4, string3, context.getString(2131892881), context.getString(2131892879), null, null, null, null, null, 496, null)), o.to(2131362298, new PermissionLabelOverrides(string5, null, null, context.getString(2131892894), null, null, null, null, null, 502, null)), o.to(2131362299, new PermissionLabelOverrides(string6, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362309, new PermissionLabelOverrides(string7, null, null, null, null, null, null, null, b.g(context, 2131892937, objArr, null, 4), 254, null)), o.to(2131362296, new PermissionLabelOverrides(string8, null, context.getString(2131892869), null, null, null, null, null, null, 506, null)), o.to(2131362304, new PermissionLabelOverrides(string9, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362303, new PermissionLabelOverrides(string10, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362302, new PermissionLabelOverrides(string11, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362311, new PermissionLabelOverrides(string12, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362306, new PermissionLabelOverrides(string13, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362305, new PermissionLabelOverrides(string14, null, null, null, null, null, null, null, b.g(context, 2131892887, objArr2, null, 4), 254, null)), o.to(2131362307, new PermissionLabelOverrides(string15, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362310, new PermissionLabelOverrides(string16, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362313, new PermissionLabelOverrides(string17, null, null, context.getString(2131892862), null, string19, context.getString(2131892863), string18, null, 278, null)), o.to(2131362318, new PermissionLabelOverrides(string20, null, null, context.getString(2131892946), null, null, null, null, null, 502, null)), o.to(2131362320, new PermissionLabelOverrides(string21, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362319, new PermissionLabelOverrides(string22, null, null, context.getString(2131892968), null, null, null, null, null, 502, null)), o.to(2131362317, new PermissionLabelOverrides(g, null, null, null, null, null, null, b.g(context, 2131892916, objArr3, null, 4), null, 382, null)), o.to(2131362316, new PermissionLabelOverrides(b.g(context, 2131892910, new Object[0], null, 4), null, null, b.g(context, 2131892911, new Object[0], null, 4), null, null, null, null, null, 502, null)), o.to(2131362314, new PermissionLabelOverrides(string23, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362315, new PermissionLabelOverrides(string24, null, null, context.getString(2131892907), null, null, null, null, null, 502, null)), o.to(2131362301, new PermissionLabelOverrides(string25, null, null, null, null, null, null, null, null, 510, null)));
     }
 
     @StringRes
     public static final int getChannelPermissionOwnerRoleLabel(GuildRole guildRole) {
         m.checkNotNullParameter(guildRole, "role");
-        return (guildRole.g() & 8) == 8 ? 2131892391 : 2131892394;
+        return (guildRole.g() & 8) == 8 ? 2131892468 : 2131892471;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
index eb10e0c304..46399d3a43 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
@@ -31,7 +31,7 @@ public final class ChannelSelector$findAndSet$1 extends o implements Function0<C
         Context context = this.$context;
         if (context != null) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
-            String string = context.getString(2131890329);
+            String string = context.getString(2131890395);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…sible_channel_link_title)");
             accessibilityUtils.sendAnnouncement(context, string);
         }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSetDirectMessage$1.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSetDirectMessage$1.java
index 10686658e9..1ff17f9de6 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSetDirectMessage$1.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSetDirectMessage$1.java
@@ -28,6 +28,6 @@ public final class ChannelSelector$findAndSetDirectMessage$1 extends o implement
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        this.this$0.findAndSet(this.$context, channel.g());
+        this.this$0.findAndSet(this.$context, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java
index d01181931c..23301bf84b 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java
@@ -35,8 +35,8 @@ public final class ChannelSelector$selectChannel$2 extends o implements Function
 
     public final void invoke(Channel channel) {
         m.checkNotNullExpressionValue(channel, "channel");
-        ChannelSelector.access$gotoChannel(this.this$0, this.$guildId, AnimatableValueParser.k1(channel) ? this.$guildId : this.$channelId, this.$peekParent, this.$analyticsLocation);
-        if (AnimatableValueParser.k1(channel)) {
+        ChannelSelector.access$gotoChannel(this.this$0, this.$guildId, AnimatableValueParser.l1(channel) ? this.$guildId : this.$channelId, this.$peekParent, this.$analyticsLocation);
+        if (AnimatableValueParser.l1(channel)) {
             this.this$0.getStream().getVoiceChannelSelected$app_productionGoogleRelease().selectVoiceChannel(this.$channelId);
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java
index 6265f61532..ddd1178411 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector.java
@@ -113,9 +113,9 @@ public final class ChannelSelector {
 
     public final void findAndSet(Context context, long j) {
         if (j > 0) {
-            Observable y2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stream.getChannels$app_productionGoogleRelease(), this.stream.getPermissions$app_productionGoogleRelease()}, false, null, null, new ChannelSelector$findAndSet$1(this, j, context), 14, null).y(ChannelSelector$findAndSet$2.INSTANCE);
-            m.checkNotNullExpressionValue(y2, "observationDeck\n        …   .filter { it != null }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 0, true, 1, null)), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$findAndSet$3(this), 62, (Object) null);
+            Observable x2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.stream.getChannels$app_productionGoogleRelease(), this.stream.getPermissions$app_productionGoogleRelease()}, false, null, null, new ChannelSelector$findAndSet$1(this, j, context), 14, null).x(ChannelSelector$findAndSet$2.INSTANCE);
+            m.checkNotNullExpressionValue(x2, "observationDeck\n        …   .filter { it != null }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, true, 1, null)), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$findAndSet$3(this), 62, (Object) null);
         }
     }
 
@@ -150,14 +150,14 @@ public final class ChannelSelector {
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationLatest(jVar), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$selectChannel$1(this, j, j2, l, selectedChannelAnalyticsLocation), 62, (Object) null);
             return;
         }
-        Observable<R> G = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j2).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(G, 0, false, 3, null), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$selectChannel$2(this, j, j2, l, selectedChannelAnalyticsLocation), 62, (Object) null);
+        Observable<R> F = this.stream.getChannels$app_productionGoogleRelease().observeChannel(j2).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null), ChannelSelector.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelSelector$selectChannel$2(this, j, j2, l, selectedChannelAnalyticsLocation), 62, (Object) null);
     }
 
     public final void selectChannel(Channel channel, Long l, SelectedChannelAnalyticsLocation selectedChannelAnalyticsLocation) {
         if (channel != null) {
-            selectChannel(channel.e(), channel.g(), l, selectedChannelAnalyticsLocation);
+            selectChannel(channel.f(), channel.h(), l, selectedChannelAnalyticsLocation);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java
index c9ee91494e..6bba543f90 100644
--- a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java
@@ -17,27 +17,27 @@ public final class GuildChannelIconUtilsKt {
         if (channel == null) {
             return GuildChannelIconType.Text.INSTANCE;
         }
-        int z4 = channel.z();
+        int A = channel.A();
         Object obj = null;
-        if (z4 != 5) {
-            switch (z4) {
+        if (A != 5) {
+            switch (A) {
                 case 10:
-                    return channel.n() ? GuildChannelIconType.NSFW.Thread.INSTANCE : GuildChannelIconType.Thread.INSTANCE;
+                    return channel.o() ? GuildChannelIconType.NSFW.Thread.INSTANCE : GuildChannelIconType.Thread.INSTANCE;
                 case 11:
-                    return channel.n() ? GuildChannelIconType.NSFW.Thread.INSTANCE : GuildChannelIconType.Thread.INSTANCE;
+                    return channel.o() ? GuildChannelIconType.NSFW.Thread.INSTANCE : GuildChannelIconType.Thread.INSTANCE;
                 case 12:
                     return GuildChannelIconType.Locked.Thread.INSTANCE;
                 default:
-                    if (channel.n()) {
+                    if (channel.o()) {
                         return GuildChannelIconType.NSFW.Text.INSTANCE;
                     }
-                    List<PermissionOverwrite> r = channel.r();
-                    if (r != null) {
-                        Iterator<T> it = r.iterator();
+                    List<PermissionOverwrite> s2 = channel.s();
+                    if (s2 != null) {
+                        Iterator<T> it = s2.iterator();
                         while (true) {
                             if (it.hasNext()) {
                                 Object next = it.next();
-                                if (((PermissionOverwrite) next).e() == channel.e()) {
+                                if (((PermissionOverwrite) next).e() == channel.f()) {
                                     z3 = true;
                                     continue;
                                 } else {
@@ -56,18 +56,18 @@ public final class GuildChannelIconUtilsKt {
                     }
                     return GuildChannelIconType.Text.INSTANCE;
             }
-        } else if (channel.n()) {
+        } else if (channel.o()) {
             return GuildChannelIconType.NSFW.Announcements.INSTANCE;
         } else {
-            List<PermissionOverwrite> r2 = channel.r();
-            if (r2 != null) {
-                Iterator<T> it2 = r2.iterator();
+            List<PermissionOverwrite> s3 = channel.s();
+            if (s3 != null) {
+                Iterator<T> it2 = s3.iterator();
                 while (true) {
                     if (!it2.hasNext()) {
                         break;
                     }
                     Object next2 = it2.next();
-                    if (((PermissionOverwrite) next2).e() == channel.e()) {
+                    if (((PermissionOverwrite) next2).e() == channel.f()) {
                         z2 = true;
                         continue;
                     } else {
@@ -96,31 +96,31 @@ public final class GuildChannelIconUtilsKt {
     public static final int mapGuildChannelTypeToIcon(GuildChannelIconType guildChannelIconType) {
         m.checkNotNullParameter(guildChannelIconType, "guildChannelIconType");
         if (m.areEqual(guildChannelIconType, GuildChannelIconType.Text.INSTANCE)) {
-            return 2131231483;
+            return 2131231489;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Thread) {
-            return 2131231991;
+            return 2131231999;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Announcements) {
-            return 2131231468;
+            return 2131231474;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.NSFW.Text) {
-            return 2131231488;
+            return 2131231494;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.NSFW.Announcements) {
-            return 2131231471;
+            return 2131231477;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.NSFW.Thread) {
-            return 2131231993;
+            return 2131232001;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Locked.Text) {
-            return 2131231487;
+            return 2131231493;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Locked.Announcements) {
-            return 2131231470;
+            return 2131231476;
         }
         if (guildChannelIconType instanceof GuildChannelIconType.Locked.Thread) {
-            return 2131231992;
+            return 2131232000;
         }
         throw new NoWhenBranchMatchedException();
     }
diff --git a/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo.java b/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo.java
index bfc7b56bce..2b398d86a3 100644
--- a/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo.java
+++ b/app/src/main/java/com/discord/utilities/channel/GuildChannelsInfo.java
@@ -49,9 +49,9 @@ public final class GuildChannelsInfo {
 
         public final Observable<GuildChannelsInfo> get(long j) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<GuildChannelsInfo> s2 = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getUsers().observeMe(true), companion.getGuilds().observeGuild(j), companion.getUserGuildSettings().observeGuildSettings(j), companion.getUserGuildSettings().observeHideMutedChannels(j), companion.getGuilds().observeRoles(j), companion.getPermissions().observePermissionsForGuild(j), companion.getPermissions().observeChannelPermissionsForGuild(j), companion.getChannels().observeChannelCategories(j), GuildChannelsInfo$Companion$get$1.INSTANCE, 500, TimeUnit.MILLISECONDS).s();
-            m.checkNotNullExpressionValue(s2, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
-            return s2;
+            Observable<GuildChannelsInfo> r = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getUsers().observeMe(true), companion.getGuilds().observeGuild(j), companion.getUserGuildSettings().observeGuildSettings(j), companion.getUserGuildSettings().observeHideMutedChannels(j), companion.getGuilds().observeRoles(j), companion.getPermissions().observePermissionsForGuild(j), companion.getPermissions().observeChannelPermissionsForGuild(j), companion.getChannels().observeChannelCategories(j), GuildChannelsInfo$Companion$get$1.INSTANCE, 500, TimeUnit.MILLISECONDS).r();
+            m.checkNotNullExpressionValue(r, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
+            return r;
         }
     }
 
@@ -169,7 +169,7 @@ public final class GuildChannelsInfo {
         m.checkNotNullParameter(map, "guildChannels");
         TreeMap treeMap = new TreeMap(new GuildChannelsInfo$getSortedCategories$sortedCategories$1(map));
         for (Channel channel : u.filterNotNull(map.values())) {
-            Long valueOf = Long.valueOf(AnimatableValueParser.f1(channel) ? channel.g() : channel.q());
+            Long valueOf = Long.valueOf(AnimatableValueParser.f1(channel) ? channel.h() : channel.r());
             Object obj = treeMap.get(valueOf);
             if (obj == null) {
                 obj = new TreeSet(AnimatableValueParser.K0(Channel.Companion));
diff --git a/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java b/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java
index 1c6cbae2d5..49ebd9644a 100644
--- a/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java
+++ b/app/src/main/java/com/discord/utilities/channel/permissions/ChannelPermissionsAddMemberUtils.java
@@ -57,8 +57,8 @@ public final class ChannelPermissionsAddMemberUtils {
             }
             arrayList.add(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updatePermissionOverwrites(j, longValue, channelPermissionOverwrites), false, 1, null));
         }
-        Observable<List<Void>> g02 = Observable.l(Observable.i0(new q(arrayList))).g0();
-        m.checkNotNullExpressionValue(g02, "Observable.concat(overwr…quests)\n        .toList()");
-        return g02;
+        Observable<List<Void>> f02 = Observable.l(Observable.h0(new q(arrayList))).f0();
+        m.checkNotNullExpressionValue(f02, "Observable.concat(overwr…quests)\n        .toList()");
+        return f02;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/collections/MultiListIterator.java b/app/src/main/java/com/discord/utilities/collections/MultiListIterator.java
new file mode 100644
index 0000000000..db32e1d235
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/collections/MultiListIterator.java
@@ -0,0 +1,52 @@
+package com.discord.utilities.collections;
+
+import d0.z.d.g0.a;
+import d0.z.d.m;
+import java.util.Iterator;
+import java.util.List;
+/* compiled from: MultiListIterator.kt */
+public final class MultiListIterator<T> implements Iterator<T>, a {
+    private Iterator<? extends T> curIterator;
+    private int listIndex;
+    private final List<T>[] lists;
+
+    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List<? extends T>[] */
+    /* JADX DEBUG: Multi-variable search result rejected for r2v1, resolved type: java.util.Stack */
+    /* JADX WARN: Multi-variable type inference failed */
+    public MultiListIterator(List<? extends T>... listArr) {
+        m.checkNotNullParameter(listArr, "lists");
+        this.lists = listArr;
+        this.curIterator = listArr[this.listIndex].iterator();
+    }
+
+    public final List<T>[] getLists() {
+        return this.lists;
+    }
+
+    @Override // java.util.Iterator
+    public boolean hasNext() {
+        if (this.curIterator.hasNext()) {
+            return true;
+        }
+        while (!this.curIterator.hasNext()) {
+            int i = this.listIndex + 1;
+            this.listIndex = i;
+            List<T>[] listArr = this.lists;
+            if (i >= listArr.length) {
+                return false;
+            }
+            this.curIterator = listArr[i].iterator();
+        }
+        return true;
+    }
+
+    @Override // java.util.Iterator
+    public T next() {
+        return (T) this.curIterator.next();
+    }
+
+    @Override // java.util.Iterator
+    public void remove() {
+        throw new UnsupportedOperationException("Operation is not supported for read-only collection");
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/collections/ShallowPartitionCollection.java b/app/src/main/java/com/discord/utilities/collections/ShallowPartitionCollection.java
index 718b52a166..3f57fba742 100644
--- a/app/src/main/java/com/discord/utilities/collections/ShallowPartitionCollection.java
+++ b/app/src/main/java/com/discord/utilities/collections/ShallowPartitionCollection.java
@@ -30,16 +30,16 @@ public class ShallowPartitionCollection<E, T extends Collection<E>> implements C
             this();
         }
 
-        public static /* synthetic */ ShallowPartitionCollection withArrayListParitions$default(Companion companion, int i, Function1 function1, int i2, Object obj) {
+        public static /* synthetic */ ShallowPartitionCollection withArrayListPartions$default(Companion companion, int i, Function1 function1, int i2, Object obj) {
             if ((i2 & 1) != 0) {
                 i = 40;
             }
-            return companion.withArrayListParitions(i, function1);
+            return companion.withArrayListPartions(i, function1);
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r0v2, resolved type: java.util.ArrayList */
         /* JADX WARN: Multi-variable type inference failed */
-        public final <E> ShallowPartitionCollection<E, ArrayList<E>> withArrayListParitions(int i, Function1<? super E, Integer> function1) {
+        public final <E> ShallowPartitionCollection<E, ArrayList<E>> withArrayListPartions(int i, Function1<? super E, Integer> function1) {
             m.checkNotNullParameter(function1, "partitionStrategy");
             IntRange until = f.until(0, i);
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(until, 10));
@@ -72,8 +72,8 @@ public class ShallowPartitionCollection<E, T extends Collection<E>> implements C
         return this.partitions.get(this.partitionStrategy.invoke(e).intValue());
     }
 
-    public static final <E> ShallowPartitionCollection<E, ArrayList<E>> withArrayListParitions(int i, Function1<? super E, Integer> function1) {
-        return Companion.withArrayListParitions(i, function1);
+    public static final <E> ShallowPartitionCollection<E, ArrayList<E>> withArrayListPartions(int i, Function1<? super E, Integer> function1) {
+        return Companion.withArrayListPartions(i, function1);
     }
 
     @Override // java.util.Collection
diff --git a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java
index a683774dee..473955cf77 100644
--- a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java
+++ b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java
@@ -24,7 +24,7 @@ public final class RepresentativeColors<T> {
     private static final int BLURPLE = Color.parseColor("#5865f2");
     public static final Companion Companion = new Companion(null);
     private final HashMap<T, Integer> representativeColors = new HashMap<>();
-    private final BehaviorSubject<Map<T, Integer>> representativeColorsSubject = BehaviorSubject.l0();
+    private final BehaviorSubject<Map<T, Integer>> representativeColorsSubject = BehaviorSubject.k0();
 
     /* compiled from: RepresentativeColors.kt */
     public static final class Companion {
@@ -213,8 +213,8 @@ public final class RepresentativeColors<T> {
     }
 
     public final Observable<Integer> observeRepresentativeColor(T t) {
-        Observable<Integer> s2 = this.representativeColorsSubject.G(new RepresentativeColors$observeRepresentativeColor$1(t)).s();
-        m.checkNotNullExpressionValue(s2, "representativeColorsSubj…  .distinctUntilChanged()");
-        return s2;
+        Observable<Integer> r = this.representativeColorsSubject.F(new RepresentativeColors$observeRepresentativeColor$1(t)).r();
+        m.checkNotNullExpressionValue(r, "representativeColorsSubj…  .distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java
index 4e592c46f6..80cce19f90 100644
--- a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java
@@ -11,9 +11,9 @@ import s.a.a.r;
 /* compiled from: RxCoroutineExtensions.kt */
 public final class RxCoroutineExtensionsKt {
     public static final <T> Object appAwaitFirst(Observable<T> observable, Context context, Continuation<? super T> continuation) {
-        Observable<T> z2 = observable.z();
-        m.checkNotNullExpressionValue(z2, "first()");
-        return appAwaitSingle(z2, context, continuation);
+        Observable<T> y2 = observable.y();
+        m.checkNotNullExpressionValue(y2, "first()");
+        return appAwaitSingle(y2, context, continuation);
     }
 
     public static /* synthetic */ Object appAwaitFirst$default(Observable observable, Context context, Continuation continuation, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java b/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java
index 6fc11ef45c..9cd0bcdcb5 100644
--- a/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java
+++ b/app/src/main/java/com/discord/utilities/device/RtcCameraConfig.java
@@ -22,11 +22,11 @@ public final class RtcCameraConfig {
     }
 
     private final Observable<Experiment> observeExperiment(StoreExperiments storeExperiments) {
-        Observable<R> G = storeExperiments.observeUserExperiment("2021-02_android_webrtc_camera2", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable a02 = G.a0(1);
-        m.checkNotNullExpressionValue(a02, "storeExperiments.observe…Null()\n          .take(1)");
-        return ObservableExtensionsKt.computationLatest(a02);
+        Observable<R> F = storeExperiments.observeUserExperiment("2021-02_android_webrtc_camera2", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "storeExperiments.observe…Null()\n          .take(1)");
+        return ObservableExtensionsKt.computationLatest(Z);
     }
 
     @AnyThread
diff --git a/app/src/main/java/com/discord/utilities/dsti/StickerUtils$DEFAULT_HEADER_SIZE_PX$2.java b/app/src/main/java/com/discord/utilities/dsti/StickerUtils$DEFAULT_HEADER_SIZE_PX$2.java
deleted file mode 100644
index a42959bb81..0000000000
--- a/app/src/main/java/com/discord/utilities/dsti/StickerUtils$DEFAULT_HEADER_SIZE_PX$2.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.discord.utilities.dsti;
-
-import com.discord.utilities.dimen.DimenUtils;
-import d0.z.d.o;
-import kotlin.jvm.functions.Function0;
-/* compiled from: StickerUtils.kt */
-public final class StickerUtils$DEFAULT_HEADER_SIZE_PX$2 extends o implements Function0<Integer> {
-    public static final StickerUtils$DEFAULT_HEADER_SIZE_PX$2 INSTANCE = new StickerUtils$DEFAULT_HEADER_SIZE_PX$2();
-
-    public StickerUtils$DEFAULT_HEADER_SIZE_PX$2() {
-        super(0);
-    }
-
-    /* Return type fixed from 'int' to match base method */
-    /* JADX WARNING: Unknown variable types count: 1 */
-    @Override // kotlin.jvm.functions.Function0
-    /* renamed from: invoke */
-    public final Integer mo1invoke() {
-        return DimenUtils.dpToPixels(1024);
-    }
-}
diff --git a/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java b/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java
index 8fec065fd1..455fb6171e 100644
--- a/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java
+++ b/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java
@@ -3,6 +3,8 @@ package com.discord.utilities.dsti;
 import android.content.Context;
 import c.a.l.b;
 import c.d.b.a.a;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.channel.Channel;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
@@ -12,11 +14,18 @@ import com.discord.app.AppLog;
 import com.discord.models.domain.ModelSku;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.models.sticker.dto.ModelStickerPackStoreListing;
+import com.discord.models.user.User;
+import com.discord.stores.StoreGuildSelected;
+import com.discord.stores.StoreGuildStickers;
+import com.discord.stores.StoreGuilds;
+import com.discord.stores.StoreStickers;
 import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
 import com.discord.utilities.billing.PremiumUtilsKt;
 import com.discord.utilities.file.DownloadUtils;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.logging.Logger;
+import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.premium.PremiumUtils;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.utilities.rest.RestAPI;
@@ -25,15 +34,20 @@ import com.discord.utilities.search.SearchUtils;
 import com.discord.utilities.string.StringUtilsKt;
 import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.time.TimeUtils;
+import com.discord.utilities.user.UserUtils;
 import d0.g;
 import d0.g0.t;
 import d0.g0.w;
+import d0.t.m0;
+import d0.t.n;
 import d0.t.n0;
 import d0.t.o;
+import d0.t.u;
 import d0.z.d.m;
 import j0.l.e.j;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -45,14 +59,21 @@ import org.json.JSONObject;
 import rx.Observable;
 /* compiled from: StickerUtils.kt */
 public final class StickerUtils {
-    private static final Lazy DEFAULT_HEADER_SIZE_PX$delegate = g.lazy(StickerUtils$DEFAULT_HEADER_SIZE_PX$2.INSTANCE);
     private static final Lazy DEFAULT_STICKER_SIZE_PX$delegate = g.lazy(StickerUtils$DEFAULT_STICKER_SIZE_PX$2.INSTANCE);
     public static final StickerUtils INSTANCE = new StickerUtils();
     public static final int MAXIMUM_LENGTH_STICKER_TEXT_SUGGESTIONS = 50;
-    public static final int MAXIMUM_WORD_COUNT_STICKER_TEXT_SUGGESTIONS = 5;
+    private static final int MAXIMUM_WORD_COUNT_STICKER_TEXT_SUGGESTIONS = 5;
     public static final int MINIMUM_LENGTH_STICKER_TEXT_SUGGESTIONS = 3;
     public static final int NUM_STICKERS_AUTO_SUGGEST = 4;
-    public static final long STICKER_APPLICATION_ID = 710982414301790216L;
+    private static final long STICKER_APPLICATION_ID = 710982414301790216L;
+
+    /* compiled from: StickerUtils.kt */
+    public enum StickerSendability {
+        SENDABLE,
+        SENDABLE_WITH_PREMIUM,
+        SENDABLE_WITH_PREMIUM_GUILD,
+        NONSENDABLE
+    }
 
     public final /* synthetic */ class WhenMappings {
         public static final /* synthetic */ int[] $EnumSwitchMapping$0;
@@ -122,6 +143,35 @@ public final class StickerUtils {
         return Integer.valueOf((premium == null || (modelPremiumSkuPrice = premium.get(premiumTier)) == null) ? price.getAmount() : modelPremiumSkuPrice.getAmount());
     }
 
+    public static /* synthetic */ StickerSendability getStickerSendability$default(StickerUtils stickerUtils, Sticker sticker, User user, Channel channel, Long l, int i, Object obj) {
+        if ((i & 4) != 0) {
+            channel = null;
+        }
+        if ((i & 8) != 0) {
+            l = null;
+        }
+        return stickerUtils.getStickerSendability(sticker, user, channel, l);
+    }
+
+    public static /* synthetic */ List getStickersForAutocomplete$default(StickerUtils stickerUtils, StoreUser storeUser, StoreGuilds storeGuilds, StoreStickers storeStickers, StoreGuildSelected storeGuildSelected, StoreGuildStickers storeGuildStickers, int i, Object obj) {
+        if ((i & 1) != 0) {
+            storeUser = StoreStream.Companion.getUsers();
+        }
+        if ((i & 2) != 0) {
+            storeGuilds = StoreStream.Companion.getGuilds();
+        }
+        if ((i & 4) != 0) {
+            storeStickers = StoreStream.Companion.getStickers();
+        }
+        if ((i & 8) != 0) {
+            storeGuildSelected = StoreStream.Companion.getGuildSelected();
+        }
+        if ((i & 16) != 0) {
+            storeGuildStickers = StoreStream.Companion.getGuildStickers();
+        }
+        return stickerUtils.getStickersForAutocomplete(storeUser, storeGuilds, storeStickers, storeGuildSelected, storeGuildStickers);
+    }
+
     public final int calculatePremiumStickerPackDiscount() {
         int stickerPackPrice = getStickerPackPrice(PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY);
         return (int) ((((float) (stickerPackPrice - getStickerPackPrice(PremiumTier.TIER_2))) * 100.0f) / ((float) stickerPackPrice));
@@ -145,6 +195,7 @@ public final class StickerUtils {
     }
 
     public final Set<Sticker> findStickerMatches(String str, List<Sticker> list, boolean z2) {
+        Sticker sticker;
         m.checkNotNullParameter(str, "searchText");
         m.checkNotNullParameter(list, "stickers");
         if (str.length() == 0) {
@@ -160,13 +211,13 @@ public final class StickerUtils {
             return n0.emptySet();
         }
         for (String str2 : queriesFromSearchText) {
-            for (Sticker sticker : list) {
-                if (t.equals(sticker.g(), str2, true)) {
-                    linkedHashSet2.add(sticker);
-                } else if (z2 && t.startsWith(sticker.g(), str2, true)) {
-                    linkedHashSet3.add(sticker);
+            for (Sticker sticker2 : list) {
+                if (t.equals(sticker2.h(), str2, true)) {
+                    linkedHashSet2.add(sticker2);
+                } else if (z2 && t.startsWith(sticker2.h(), str2, true)) {
+                    linkedHashSet3.add(sticker2);
                 }
-                List<String> split$default = w.split$default((CharSequence) sticker.i(), new String[]{","}, false, 0, 6, (Object) null);
+                List<String> split$default = w.split$default((CharSequence) sticker2.j(), new String[]{","}, false, 0, 6, (Object) null);
                 ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(split$default, 10));
                 for (String str3 : split$default) {
                     Objects.requireNonNull(str3, "null cannot be cast to non-null type kotlin.CharSequence");
@@ -178,12 +229,19 @@ public final class StickerUtils {
                         arrayList2.add(obj);
                     }
                 }
+                Sticker sticker3 = sticker2;
+                String replace$default = t.replace$default(str2, ":", "", false, 4, (Object) null);
                 for (String str4 : arrayList2) {
-                    if (t.equals(str4, str2, true)) {
+                    if (t.equals(str4, replace$default, true)) {
+                        sticker = sticker3;
                         linkedHashSet4.add(sticker);
-                    } else if (z2 && t.startsWith(str4, str2, true)) {
-                        linkedHashSet5.add(sticker);
+                    } else {
+                        sticker = sticker3;
+                        if (z2 && t.startsWith(str4, replace$default, true)) {
+                            linkedHashSet5.add(sticker);
+                        }
                     }
+                    sticker3 = sticker;
                 }
             }
         }
@@ -240,10 +298,6 @@ public final class StickerUtils {
         }
     }
 
-    public final int getDEFAULT_HEADER_SIZE_PX() {
-        return ((Number) DEFAULT_HEADER_SIZE_PX$delegate.getValue()).intValue();
-    }
-
     public final int getDEFAULT_STICKER_SIZE_PX() {
         return ((Number) DEFAULT_STICKER_SIZE_PX$delegate.getValue()).intValue();
     }
@@ -266,9 +320,9 @@ public final class StickerUtils {
             m.checkNotNullExpressionValue(jVar3, "Observable.just(null)");
             return jVar3;
         } else {
-            Observable<Sticker> u = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getSticker(j), false, 1, null).u(StickerUtils$getGuildOrStandardSticker$1.INSTANCE);
-            m.checkNotNullExpressionValue(u, "RestAPI\n        .api\n   …fetchedSticker)\n        }");
-            return u;
+            Observable<Sticker> t = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getSticker(j), false, 1, null).t(StickerUtils$getGuildOrStandardSticker$1.INSTANCE);
+            m.checkNotNullExpressionValue(t, "RestAPI\n        .api\n   …fetchedSticker)\n        }");
+            return t;
         }
     }
 
@@ -287,7 +341,7 @@ public final class StickerUtils {
         long j = unpublishedAtDate - (((long) hoursFromMillis) * 3600000);
         int minutesFromMillis = timeUtils.getMinutesFromMillis(j);
         int secondsFromMillis = timeUtils.getSecondsFromMillis(j - (((long) minutesFromMillis) * 60000));
-        return (hoursFromMillis < 0 || minutesFromMillis < 0 || secondsFromMillis < 0) ? b.g(context, 2131893544, new Object[0], null, 4) : b.g(context, 2131888190, new Object[]{a.H(new Object[]{Integer.valueOf(hoursFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(minutesFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(secondsFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)")}, null, 4);
+        return (hoursFromMillis < 0 || minutesFromMillis < 0 || secondsFromMillis < 0) ? b.g(context, 2131893628, new Object[0], null, 4) : b.g(context, 2131888189, new Object[]{a.H(new Object[]{Integer.valueOf(hoursFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(minutesFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(secondsFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)")}, null, 4);
     }
 
     public final CharSequence getStickerPackPremiumPriceLabel(Context context, ModelStickerPack modelStickerPack, PremiumTier premiumTier, boolean z2) {
@@ -295,7 +349,7 @@ public final class StickerUtils {
         m.checkNotNullParameter(modelStickerPack, "stickerPack");
         m.checkNotNullParameter(premiumTier, "currentPremiumTier");
         if (z2 && premiumTier != PremiumTier.TIER_2) {
-            return b.g(context, 2131893526, new Object[0], null, 4);
+            return b.g(context, 2131893610, new Object[0], null, 4);
         }
         PremiumTier premiumTier2 = PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY;
         if (premiumTier != premiumTier2) {
@@ -303,22 +357,57 @@ public final class StickerUtils {
             Integer stickerPackPriceForPremiumTier2 = getStickerPackPriceForPremiumTier(modelStickerPack, premiumTier);
             if (!(stickerPackPriceForPremiumTier == null || stickerPackPriceForPremiumTier2 == null || !(!m.areEqual(stickerPackPriceForPremiumTier, stickerPackPriceForPremiumTier2)))) {
                 CharSequence formattedPriceUsd = PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier.intValue(), context);
-                return stickerPackPriceForPremiumTier2.intValue() == 0 ? b.a(context, 2131893533, new Object[]{formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$1(context)) : b.a(context, 2131893534, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier2.intValue(), context), formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$2(context));
+                return stickerPackPriceForPremiumTier2.intValue() == 0 ? b.a(context, 2131893617, new Object[]{formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$1(context)) : b.a(context, 2131893618, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier2.intValue(), context), formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$2(context));
             }
         }
         if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier)) {
-            return b.g(context, 2131893527, new Object[0], null, 4);
+            return b.g(context, 2131893611, new Object[0], null, 4);
         }
         PremiumTier premiumTier3 = PremiumTier.TIER_1;
         if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier3) && !PremiumUtils.INSTANCE.isPremiumTierAtLeast(premiumTier, premiumTier3)) {
-            return b.g(context, 2131893528, new Object[0], null, 4);
+            return b.g(context, 2131893612, new Object[0], null, 4);
         }
         PremiumTier premiumTier4 = PremiumTier.TIER_2;
         if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier4) && !PremiumUtils.INSTANCE.isPremiumTierAtLeast(premiumTier, premiumTier4)) {
-            return b.g(context, 2131893529, new Object[0], null, 4);
+            return b.g(context, 2131893613, new Object[0], null, 4);
         }
         CharSequence formattedPriceUsd2 = PremiumUtilsKt.getFormattedPriceUsd(getStickerPackPrice(premiumTier4), context);
-        return premiumTier == premiumTier4 ? formattedPriceUsd2 : b.g(context, 2131893548, new Object[]{formattedPriceUsd2}, null, 4);
+        return premiumTier == premiumTier4 ? formattedPriceUsd2 : b.g(context, 2131893632, new Object[]{formattedPriceUsd2}, null, 4);
+    }
+
+    public final StickerSendability getStickerSendability(Sticker sticker, User user, Channel channel, Long l) {
+        m.checkNotNullParameter(sticker, "sticker");
+        m.checkNotNullParameter(user, "meUser");
+        boolean z2 = user.getPremiumTier() == PremiumTier.TIER_2;
+        if (sticker.k() == StickerType.STANDARD) {
+            return z2 ? StickerSendability.SENDABLE : StickerSendability.SENDABLE_WITH_PREMIUM;
+        }
+        if (sticker.k() != StickerType.GUILD) {
+            return StickerSendability.NONSENDABLE;
+        }
+        if (m.areEqual(sticker.e(), Boolean.FALSE)) {
+            return StickerSendability.SENDABLE_WITH_PREMIUM_GUILD;
+        }
+        return m.areEqual(sticker.g(), channel != null ? Long.valueOf(channel.f()) : null) ? StickerSendability.SENDABLE : (channel == null || AnimatableValueParser.s1(channel) || PermissionUtils.can(262144, l)) ? z2 ? StickerSendability.SENDABLE : StickerSendability.SENDABLE_WITH_PREMIUM : StickerSendability.NONSENDABLE;
+    }
+
+    public final List<Sticker> getStickersForAutocomplete(StoreUser storeUser, StoreGuilds storeGuilds, StoreStickers storeStickers, StoreGuildSelected storeGuildSelected, StoreGuildStickers storeGuildStickers) {
+        m.checkNotNullParameter(storeUser, "storeUser");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
+        m.checkNotNullParameter(storeStickers, "storeStickers");
+        m.checkNotNullParameter(storeGuildSelected, "storeGuildSelected");
+        m.checkNotNullParameter(storeGuildStickers, "storeGuildStickers");
+        boolean isPremiumTier2 = UserUtils.INSTANCE.isPremiumTier2(storeUser.getMe());
+        List<Sticker> enabledStickers = isPremiumTier2 ? storeStickers.getEnabledStickers() : n.emptyList();
+        Set<Long> keySet = isPremiumTier2 ? storeGuilds.getGuilds().keySet() : m0.setOf(Long.valueOf(storeGuildSelected.getSelectedGuildId()));
+        List<Sticker> allGuildStickersFlattened = storeGuildStickers.getAllGuildStickersFlattened();
+        ArrayList arrayList = new ArrayList();
+        for (Object obj : allGuildStickersFlattened) {
+            if (u.contains(keySet, ((Sticker) obj).g())) {
+                arrayList.add(obj);
+            }
+        }
+        return u.plus((Collection) enabledStickers, (Iterable) arrayList);
     }
 
     public final boolean isStickerPackFreeForPremiumTier(ModelStickerPack modelStickerPack, PremiumTier premiumTier) {
@@ -343,7 +432,7 @@ public final class StickerUtils {
                 m.checkNotNullExpressionValue(string, "jsonSticker.getString(\"name\")");
                 String string2 = jSONObject.getString("description");
                 m.checkNotNullExpressionValue(string2, "jsonSticker.getString(\"description\")");
-                return new Sticker(parseLong, valueOf, Long.valueOf(Long.parseLong(jSONObject.get("guild_id").toString())), string, string2, StickerFormatType.Companion.a(Integer.parseInt(jSONObject.get("format_type").toString())), jSONObject.has("tags") ? jSONObject.get("tags").toString() : "", StickerType.Companion.a(Integer.parseInt(jSONObject.get("type").toString())));
+                return new Sticker(parseLong, valueOf, Long.valueOf(Long.parseLong(jSONObject.get("guild_id").toString())), string, string2, StickerFormatType.Companion.a(Integer.parseInt(jSONObject.get("format_type").toString())), jSONObject.has("tags") ? jSONObject.get("tags").toString() : "", StickerType.Companion.a(Integer.parseInt(jSONObject.get("type").toString())), null, 256);
             } catch (JSONException e) {
                 Logger.e$default(AppLog.g, "Error parsing sticker from notification", e, null, 4, null);
                 return null;
diff --git a/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java b/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java
index 577527e8a2..54bc53913e 100644
--- a/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java
@@ -12,44 +12,44 @@ public final class DurationUtilsKt {
     public static final CharSequence humanizeDuration(Context context, long j) {
         m.checkNotNullParameter(context, "context");
         if (j <= 30000) {
-            String string = context.getString(2131890187);
+            String string = context.getString(2131890253);
             m.checkNotNullExpressionValue(string, "context.getString(\n     …ation_a_few_seconds\n    )");
             return string;
         } else if (j <= 60000) {
             int i = (int) (j / 1000);
-            return b.g(context, 2131890191, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755190, i, Integer.valueOf(i))}, null, 4);
+            return b.g(context, 2131890257, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755191, i, Integer.valueOf(i))}, null, 4);
         } else if (j <= 3600000) {
             int i2 = (int) (j / 60000);
-            return b.g(context, 2131890190, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, i2, Integer.valueOf(i2))}, null, 4);
+            return b.g(context, 2131890256, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755190, i2, Integer.valueOf(i2))}, null, 4);
         } else if (j <= 86400000) {
             int i3 = (int) (j / 3600000);
-            return b.g(context, 2131890189, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, i3, Integer.valueOf(i3))}, null, 4);
+            return b.g(context, 2131890255, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, i3, Integer.valueOf(i3))}, null, 4);
         } else {
             int i4 = (int) (j / 86400000);
-            return b.g(context, 2131890188, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, i4, Integer.valueOf(i4))}, null, 4);
+            return b.g(context, 2131890254, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, i4, Integer.valueOf(i4))}, null, 4);
         }
     }
 
     public static final CharSequence humanizeDurationRounded(Context context, long j) {
         m.checkNotNullParameter(context, "context");
         if (j <= 30000) {
-            String string = context.getString(2131890187);
+            String string = context.getString(2131890253);
             m.checkNotNullExpressionValue(string, "context.getString(\n     …ation_a_few_seconds\n    )");
             return string;
         }
         double d = (double) j;
         if (d <= 54000.0d) {
             float f = ((float) j) / ((float) 1000);
-            return b.g(context, 2131890191, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755190, a.roundToInt(f), Integer.valueOf(a.roundToInt(f)))}, null, 4);
+            return b.g(context, 2131890257, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755191, a.roundToInt(f), Integer.valueOf(a.roundToInt(f)))}, null, 4);
         } else if (d <= 3240000.0d) {
             float f2 = ((float) j) / ((float) 60000);
-            return b.g(context, 2131890190, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, a.roundToInt(f2), Integer.valueOf(a.roundToInt(f2)))}, null, 4);
+            return b.g(context, 2131890256, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755190, a.roundToInt(f2), Integer.valueOf(a.roundToInt(f2)))}, null, 4);
         } else if (d <= 7.776E7d) {
             float f3 = ((float) j) / ((float) 3600000);
-            return b.g(context, 2131890189, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, a.roundToInt(f3), Integer.valueOf(a.roundToInt(f3)))}, null, 4);
+            return b.g(context, 2131890255, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, a.roundToInt(f3), Integer.valueOf(a.roundToInt(f3)))}, null, 4);
         } else {
             float f4 = ((float) j) / ((float) 86400000);
-            return b.g(context, 2131890188, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, a.roundToInt(f4), Integer.valueOf(a.roundToInt(f4)))}, null, 4);
+            return b.g(context, 2131890254, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, a.roundToInt(f4), Integer.valueOf(a.roundToInt(f4)))}, null, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/email/EmailUtils.java b/app/src/main/java/com/discord/utilities/email/EmailUtils.java
new file mode 100644
index 0000000000..5ca6e75ec6
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/email/EmailUtils.java
@@ -0,0 +1,17 @@
+package com.discord.utilities.email;
+
+import d0.z.d.m;
+import kotlin.text.Regex;
+/* compiled from: EmailUtils.kt */
+public final class EmailUtils {
+    private static final Regex EMAIL_REGEX = new Regex("/^([\\w-+]+(?:\\.[\\w-+]+)*)@((?:[\\w-]+\\.)*\\w[\\w-]{0,66})\\.([a-z]{2,63}(?:\\.[a-z]{2})?)$/i");
+    public static final EmailUtils INSTANCE = new EmailUtils();
+
+    private EmailUtils() {
+    }
+
+    public final boolean isEmailLike(String str) {
+        m.checkNotNullParameter(str, "input");
+        return EMAIL_REGEX.matches(str);
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java b/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java
index 550b779def..afb5fd4eab 100644
--- a/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java
+++ b/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java
@@ -207,7 +207,7 @@ public final class EmbedResourceUtils {
         if (fromExtension != null) {
             return fromExtension.getFileDrawable();
         }
-        return 2131231623;
+        return 2131231629;
     }
 
     public final int getMAX_IMAGE_VIEW_HEIGHT_PX() {
diff --git a/app/src/main/java/com/discord/utilities/embed/FileType.java b/app/src/main/java/com/discord/utilities/embed/FileType.java
index ffae23c71d..63c2e2e80b 100644
--- a/app/src/main/java/com/discord/utilities/embed/FileType.java
+++ b/app/src/main/java/com/discord/utilities/embed/FileType.java
@@ -117,25 +117,25 @@ public enum FileType {
     public final int getFileDrawable() {
         switch (ordinal()) {
             case 0:
-                return 2131231625;
+                return 2131231631;
             case 1:
-                return 2131231608;
-            case 2:
-                return 2131231609;
-            case 3:
-                return 2131231621;
-            case 4:
-                return 2131231610;
-            case 5:
-                return 2131231611;
-            case 6:
-                return 2131231613;
-            case 7:
                 return 2131231614;
+            case 2:
+                return 2131231615;
+            case 3:
+                return 2131231627;
+            case 4:
+                return 2131231616;
+            case 5:
+                return 2131231617;
+            case 6:
+                return 2131231619;
+            case 7:
+                return 2131231620;
             case 8:
-                return 2131231622;
+                return 2131231628;
             case 9:
-                return 2131231626;
+                return 2131231632;
             default:
                 throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/utilities/embed/InviteEmbedModel.java b/app/src/main/java/com/discord/utilities/embed/InviteEmbedModel.java
index 0880cbe55c..a9d4aefbd1 100644
--- a/app/src/main/java/com/discord/utilities/embed/InviteEmbedModel.java
+++ b/app/src/main/java/com/discord/utilities/embed/InviteEmbedModel.java
@@ -172,22 +172,22 @@ public final class InviteEmbedModel {
         if (resolvedInvite != null) {
             Channel channel = resolvedInvite.getChannel();
             m.checkNotNullExpressionValue(channel, "invite.channel");
-            if (!AnimatableValueParser.u1(channel)) {
+            if (!AnimatableValueParser.v1(channel)) {
                 return null;
             }
-            StageInstance stageInstance2 = this.stageInstances.get(Long.valueOf(resolvedInvite.getChannel().g()));
-            if (stageInstance2 != null && AnimatableValueParser.s1(stageInstance2)) {
+            StageInstance stageInstance2 = this.stageInstances.get(Long.valueOf(resolvedInvite.getChannel().h()));
+            if (stageInstance2 != null && AnimatableValueParser.t1(stageInstance2)) {
                 return resolvedInvite;
             }
-            if (this.channels.get(Long.valueOf(resolvedInvite.getChannel().g())) != null) {
+            if (this.channels.get(Long.valueOf(resolvedInvite.getChannel().h())) != null) {
                 return null;
             }
-            StoreRequestedStageChannels.StageInstanceState stageInstanceState = this.requestedInstances.get(Long.valueOf(resolvedInvite.getChannel().g()));
-            if (stageInstanceState != null && (stageInstance = stageInstanceState.getStageInstance()) != null && (b = stageInstance.b()) != null && AnimatableValueParser.s1(b)) {
+            StoreRequestedStageChannels.StageInstanceState stageInstanceState = this.requestedInstances.get(Long.valueOf(resolvedInvite.getChannel().h()));
+            if (stageInstanceState != null && (stageInstance = stageInstanceState.getStageInstance()) != null && (b = stageInstance.b()) != null && AnimatableValueParser.t1(b)) {
                 return resolvedInvite;
             }
             if (stageInstanceState == null || stageInstanceState.isError()) {
-                StoreStream.Companion.getRequestedStageChannels().enqueueStageChannelFetch(resolvedInvite.getChannel().g());
+                StoreStream.Companion.getRequestedStageChannels().enqueueStageChannelFetch(resolvedInvite.getChannel().h());
             }
         }
         return null;
diff --git a/app/src/main/java/com/discord/utilities/error/Error.java b/app/src/main/java/com/discord/utilities/error/Error.java
index 698d8eae8a..20b33add03 100644
--- a/app/src/main/java/com/discord/utilities/error/Error.java
+++ b/app/src/main/java/com/discord/utilities/error/Error.java
@@ -560,7 +560,7 @@ public class Error {
             x<?> xVar = httpException.i;
             if (xVar != null) {
                 headers = xVar.a.n;
-                ResponseBody responseBody = xVar.f2824c;
+                ResponseBody responseBody = xVar.f2830c;
                 if (responseBody != null) {
                     MediaType b = responseBody.b();
                     str2 = b != null ? b.d : str5;
@@ -671,33 +671,33 @@ public class Error {
     private List<String> getToastMessages(@NonNull Context context) {
         switch (this.type.ordinal()) {
             case 0:
-                return Collections.singletonList(context.getString(2131891322));
+                return Collections.singletonList(context.getString(2131891393));
             case 1:
-                return Collections.singletonList(Response.access$100(this.response, context, 2131891324));
+                return Collections.singletonList(Response.access$100(this.response, context, 2131891395));
             case 2:
-                return Collections.singletonList(context.getString(2131891321));
+                return Collections.singletonList(context.getString(2131891392));
             case 3:
             case 9:
-                return Collections.singletonList(Response.access$100(this.response, context, 2131891326));
+                return Collections.singletonList(Response.access$100(this.response, context, 2131891397));
             case 4:
             default:
-                return Collections.singletonList(context.getString(2131891329));
+                return Collections.singletonList(context.getString(2131891400));
             case 5:
-                return Collections.singletonList(Response.access$100(this.response, context, 2131891320));
+                return Collections.singletonList(Response.access$100(this.response, context, 2131891391));
             case 6:
-                return Collections.singletonList(context.getString(2131890463));
+                return Collections.singletonList(context.getString(2131890529));
             case 7:
-                return Collections.singletonList(context.getString(2131891325));
+                return Collections.singletonList(context.getString(2131891396));
             case 8:
-                return Collections.singletonList(context.getString(2131891328));
+                return Collections.singletonList(context.getString(2131891399));
             case 10:
-                return Collections.singletonList(context.getString(2131892509));
+                return Collections.singletonList(context.getString(2131892588));
             case 11:
-                return Collections.singletonList(context.getString(2131891323));
+                return Collections.singletonList(context.getString(2131891394));
             case 12:
-                return Collections.singletonList(context.getString(2131891327));
+                return Collections.singletonList(context.getString(2131891398));
             case 13:
-                return Collections.singletonList(context.getString(2131893894));
+                return Collections.singletonList(context.getString(2131893994));
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java b/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java
index 419435a87a..45be2f0432 100644
--- a/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java
+++ b/app/src/main/java/com/discord/utilities/experiments/ExperimentRegistry.java
@@ -15,7 +15,7 @@ public final class ExperimentRegistry {
         registeredExperiments = linkedHashMap;
         RegisteredExperiment.Type type = RegisteredExperiment.Type.USER;
         RegisteredExperiment.Type type2 = RegisteredExperiment.Type.GUILD;
-        for (Object obj : n.listOf((Object[]) new RegisteredExperiment[]{new RegisteredExperiment("Compact Invite Widget", "2020-01_mobile_invite_suggestion_compact", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Use compact view"}), true), new RegisteredExperiment("Product Rebrand", "2021-04_product_rebrand", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Only design changes. No new fonts, colors, and images", "Treatment 2: Only new fonts, colors, and images. No design changes", "Treatment 3: Both new fonts, colors, and images and design changes"}), true), new RegisteredExperiment("Hardware Analytics", "2020-11_androidhardwaresurveyv1", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Run hardware analytics"}), false), new RegisteredExperiment("Guild Invite Sheet", "2020-12_android_guild_channel_invite_sheet", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen guild invite UI", "Treatment 1: Use the bottom sheet guild invite UI"}), true), new RegisteredExperiment("Disable mentions in landscape", "2020-12_android_disable_landscape_mentions", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hide mentions in landscape"}), true), new RegisteredExperiment("Invite to GDM Sheet", "2020-12_invite_to_gdm", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen GDM invite UI", "Treatment 1: Use the bottom sheet GDM invite UI"}), true), new RegisteredExperiment("Guild Delete Feedback", "2020-12_guild_delete_feedback", type, n.listOf((Object[]) new String[]{"Control: Do not show the feedback modal", "Treatment 1: Show the feedback modal"}), true), new RegisteredExperiment("View Threads", "2021-02_view_threads", type, n.listOf((Object[]) new String[]{"Control: Do not display anything threads-related, except if receiving a notification", "Treatment 1: Show view-only threads features in channel list, in chat view, etc."}), true), new RegisteredExperiment("Create Threads", "2020-09_threads", type2, n.listOf((Object[]) new String[]{"Control: Do not show thread creation entrypoints, or Thread Browser", "Treatment 1: Show thread creation buttons, and show button to open Thread Browser"}), true), new RegisteredExperiment("Disable Camera 2", "2021-02_android_webrtc_camera2", type, n.listOf((Object[]) new String[]{"Control: Use Camera 2 API if supported", "Treatment 1: Force Camera 1 API"}), true), new RegisteredExperiment("MediaSinkWants", "2021-03_android_media_sink_wants", type, n.listOf((Object[]) new String[]{"Control: disabled", "Treatment 1: use MediaSinkWants"}), true), new RegisteredExperiment("Default Invite Expiration", "2021-03_android_extend_invite_expiration", type2, n.listOf((Object[]) new String[]{"Control: Default Invite Expiration is 1 day", "Treatment 1: Default Invite Expiration is 7 days"}), true), new RegisteredExperiment("Emoji Autocomplete Upsell", "2021-03_nitro_emoji_autocomplete_upsell_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Emoji Autocomplete Upsell"}), true), new RegisteredExperiment("Bot UI Kit Components", "2021-03_bot_ui_kit_components_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Bot UI Kit Components"}), true), new RegisteredExperiment("Select Bot UI Component", "2021-05_bot_ui_kit_select", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Select Bot Ui Component"}), true), new RegisteredExperiment("Stage Public Toggle Guilds", "2021-04_stage_discovery_public_guilds", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables guild to create public stages for Stage Discovery surface"}), true), new RegisteredExperiment("Stage Public Toggle Users", "2021-05_stage_public_toggle_users", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to create public stages"}), true), new RegisteredExperiment("Stage Discovery for Users", "2021-04_stage_discovery", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables user to use the Stage Discovery surface"}), true), new RegisteredExperiment("Contact Sync: Base Experiment", "2021-04_contact_sync_android_main", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable core Contact Sync features"}), true), new RegisteredExperiment("Contact Sync: Existing Users w/ Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users with a phone number"}), true), new RegisteredExperiment("Contact Sync: Existing Users without Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_without_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users without a phone number"}), true), new RegisteredExperiment("Contact Sync: Empty states", "2021-05_contact_sync_android_empty_states", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync in empty friend lists"}), true), new RegisteredExperiment("Stop Offscreen Video Streams", "2021-03_stop_offscreen_video_streams", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Stop offscreen video streams"}), true), new RegisteredExperiment("Phone Reg: SMS Retriever for SMS auto-capture", "2021-04_android_sms_auto_capture", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable SMS auto capture with Retriever"}), true), new RegisteredExperiment("Guild Member Avatars Kill Switch", "2021-05_guild_member_avatars_android_kill_switch", type, n.listOf((Object[]) new String[]{"0: Render guild member avatars", "1: Don't render guild member avatars (i.e. turn off the feature)"}), true), new RegisteredExperiment("Phone Verification: Call me instead", "2021-05_call_me_instead_phone_verification", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show 'Call me Instead' option during registration phone verification"}), true), new RegisteredExperiment("Longer Messages for Premium Users", "2021-05_premium_increased_content_length", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Allow Nitro users to send messages of length up to 4,000 characters"}), true), new RegisteredExperiment("Increased Max Guilds for Premium Users", "2021-04_premium_increased_max_guilds", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Allow Nitro users to join up to 200 guilds"}), true), new RegisteredExperiment("Phone Reg: Cache inputs between email and phone", "2021-06_android_reg_cache_tab_input", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable Input Caching"}), true), new RegisteredExperiment("Sticker greet message in DM", "2021-06_dm_sticker_greet_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show a button to allow users to send a greeting sticker in new DMs"}), true), new RegisteredExperiment("Enabled Discord U", "2021-06_discord_u_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord U"}), true), new RegisteredExperiment("AudioManager V2 and OpenSL ES", "2021-05_opensl_default_enable_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Default enable OpenSL", "Treatment 2: Use StoreAudioManagerV2 for output routing"}), true)})) {
+        for (Object obj : n.listOf((Object[]) new RegisteredExperiment[]{new RegisteredExperiment("Compact Invite Widget", "2020-01_mobile_invite_suggestion_compact", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Use compact view"}), true), new RegisteredExperiment("Product Rebrand", "2021-04_product_rebrand", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Only design changes. No new fonts, colors, and images", "Treatment 2: Only new fonts, colors, and images. No design changes", "Treatment 3: Both new fonts, colors, and images and design changes"}), true), new RegisteredExperiment("Hardware Analytics", "2020-11_androidhardwaresurveyv1", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Run hardware analytics"}), false), new RegisteredExperiment("Guild Invite Sheet", "2020-12_android_guild_channel_invite_sheet", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen guild invite UI", "Treatment 1: Use the bottom sheet guild invite UI"}), true), new RegisteredExperiment("Disable mentions in landscape", "2020-12_android_disable_landscape_mentions", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Hide mentions in landscape"}), true), new RegisteredExperiment("Invite to GDM Sheet", "2020-12_invite_to_gdm", type, n.listOf((Object[]) new String[]{"Control: Use the full-screen GDM invite UI", "Treatment 1: Use the bottom sheet GDM invite UI"}), true), new RegisteredExperiment("Guild Delete Feedback", "2020-12_guild_delete_feedback", type, n.listOf((Object[]) new String[]{"Control: Do not show the feedback modal", "Treatment 1: Show the feedback modal"}), true), new RegisteredExperiment("View Threads", "2021-02_view_threads", type, n.listOf((Object[]) new String[]{"Control: Do not display anything threads-related, except if receiving a notification", "Treatment 1: Show view-only threads features in channel list, in chat view, etc."}), true), new RegisteredExperiment("Create Threads", "2020-09_threads", type2, n.listOf((Object[]) new String[]{"Control: Do not show thread creation entrypoints, or Thread Browser", "Treatment 1: Show thread creation buttons, and show button to open Thread Browser"}), true), new RegisteredExperiment("Disable Camera 2", "2021-02_android_webrtc_camera2", type, n.listOf((Object[]) new String[]{"Control: Use Camera 2 API if supported", "Treatment 1: Force Camera 1 API"}), true), new RegisteredExperiment("MediaSinkWants", "2021-03_android_media_sink_wants", type, n.listOf((Object[]) new String[]{"Control: disabled", "Treatment 1: use MediaSinkWants"}), true), new RegisteredExperiment("Default Invite Expiration", "2021-03_android_extend_invite_expiration", type2, n.listOf((Object[]) new String[]{"Control: Default Invite Expiration is 1 day", "Treatment 1: Default Invite Expiration is 7 days"}), true), new RegisteredExperiment("Emoji Autocomplete Upsell", "2021-03_nitro_emoji_autocomplete_upsell_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Emoji Autocomplete Upsell"}), true), new RegisteredExperiment("Bot UI Kit Components", "2021-03_bot_ui_kit_components_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Bot UI Kit Components"}), true), new RegisteredExperiment("Select Bot UI Component", "2021-05_bot_ui_kit_select", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Select Bot Ui Component"}), true), new RegisteredExperiment("Stage Public Toggle Guilds", "2021-04_stage_discovery_public_guilds", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables guild to create public stages for Stage Discovery surface"}), true), new RegisteredExperiment("Stage Public Toggle Users", "2021-05_stage_public_toggle_users", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to create public stages"}), true), new RegisteredExperiment("Stage Discovery for Users", "2021-04_stage_discovery", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables user to use the Stage Discovery surface"}), true), new RegisteredExperiment("Stage Events Guilds", "2021-06_stage_events", type2, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enables users to see events in guilds"}), true), new RegisteredExperiment("Contact Sync: Base Experiment", "2021-04_contact_sync_android_main", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable core Contact Sync features"}), true), new RegisteredExperiment("Contact Sync: Existing Users w/ Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users with a phone number"}), true), new RegisteredExperiment("Contact Sync: Existing Users without Phone Upsell Experiment", "2021-04_contact_sync_android_existing_user_without_phone_prompt", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync for existing users without a phone number"}), true), new RegisteredExperiment("Contact Sync: Empty states", "2021-05_contact_sync_android_empty_states", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show Contact Sync in empty friend lists"}), true), new RegisteredExperiment("Stop Offscreen Video Streams", "2021-03_stop_offscreen_video_streams", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Stop offscreen video streams"}), true), new RegisteredExperiment("Phone Reg: SMS Retriever for SMS auto-capture", "2021-04_android_sms_auto_capture", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Enable SMS auto capture with Retriever"}), true), new RegisteredExperiment("Guild Member Avatars Kill Switch", "2021-05_guild_member_avatars_android_kill_switch", type, n.listOf((Object[]) new String[]{"0: Render guild member avatars", "1: Don't render guild member avatars (i.e. turn off the feature)"}), true), new RegisteredExperiment("Phone Verification: Call me instead", "2021-05_call_me_instead_phone_verification", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show 'Call me Instead' option during registration phone verification"}), true), new RegisteredExperiment("Longer Messages for Premium Users", "2021-05_premium_increased_content_length", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Allow Nitro users to send messages of length up to 4,000 characters"}), true), new RegisteredExperiment("Increased Max Guilds for Premium Users", "2021-04_premium_increased_max_guilds", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Allow Nitro users to join up to 200 guilds"}), true), new RegisteredExperiment("Sticker greet message in DM", "2021-06_dm_sticker_greet_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Show a button to allow users to send a greeting sticker in new DMs"}), true), new RegisteredExperiment("Enabled Discord U", "2021-06_discord_u_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: See Discord U"}), true), new RegisteredExperiment("AudioManager V2 and OpenSL ES", "2021-05_opensl_default_enable_android", type, n.listOf((Object[]) new String[]{"Control", "Treatment 1: Default enable OpenSL", "Treatment 2: Use StoreAudioManagerV2 for output routing"}), true), new RegisteredExperiment("Custom Profile Editing", "2021-06_android_custom_profiles_editing", type, n.listOf((Object[]) new String[]{"Control: custom profile editing disabled. Hide User Profile settings.", "Treatment 1: custom profile editing enabled. Show User Profile settings"}), true), new RegisteredExperiment("Phone Registration - Bailout to Email", "2021-06_reg_bailout_to_email_android", type, n.listOf((Object[]) new String[]{"Control: Just the back button", "Treatment 1: Static button to bailout to the email tab"}), true)})) {
             linkedHashMap.put(((RegisteredExperiment) obj).getName(), obj);
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java b/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java
index 23ded2af77..9b8523794c 100644
--- a/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java
@@ -18,14 +18,14 @@ public final class SimpleDraweeViewExtensionsKt {
         CharSequence charSequence;
         m.checkNotNullParameter(simpleDraweeView, "$this$setGuildIcon");
         String forGuild = IconUtils.getForGuild(guild, "asset://asset/images/default_icon_selected.jpg", z3, num);
-        if (!m.areEqual(forGuild, simpleDraweeView.getTag(2131365329))) {
-            simpleDraweeView.setTag(2131365329, forGuild);
+        if (!m.areEqual(forGuild, simpleDraweeView.getTag(2131365385))) {
+            simpleDraweeView.setTag(2131365385, forGuild);
             IconUtils.setIcon$default(simpleDraweeView, forGuild, 0, function1, (MGImages.ChangeDetector) null, 20, (Object) null);
         }
         MGImages.setRoundingParams(simpleDraweeView, f, !z2, num2, num3, f2);
         if (guild == null || (charSequence = guild.getName()) == null) {
             Context context = simpleDraweeView.getContext();
-            charSequence = context != null ? context.getString(2131890156) : null;
+            charSequence = context != null ? context.getString(2131890178) : null;
         }
         simpleDraweeView.setContentDescription(charSequence);
     }
@@ -49,8 +49,8 @@ public final class SimpleDraweeViewExtensionsKt {
         m.checkNotNullParameter(simpleDraweeView, "$this$setUserIcon");
         int dimensionPixelSize = simpleDraweeView.getResources().getDimensionPixelSize(i);
         String forUser = dimensionPixelSize > 0 ? IconUtils.getForUser(l, str, num, z2, Integer.valueOf(IconUtils.getMediaProxySize(dimensionPixelSize))) : IconUtils.getForUser$default(l, str, num, z2, null, 16, null);
-        if (!m.areEqual(forUser, simpleDraweeView.getTag(2131365329))) {
-            simpleDraweeView.setTag(2131365329, forUser);
+        if (!m.areEqual(forUser, simpleDraweeView.getTag(2131365385))) {
+            simpleDraweeView.setTag(2131365385, forUser);
             IconUtils.setIcon$default(simpleDraweeView, forUser, i, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
index c3946b424b..5e84555017 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java
@@ -195,7 +195,7 @@ public final class NotificationData {
         private final LinkedHashMap<Long, NotificationData> extras;
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f2104id;
+        private final int f2110id;
         private boolean ignoreNextClearForAck;
 
         public DisplayPayload() {
@@ -205,7 +205,7 @@ public final class NotificationData {
         public DisplayPayload(NotificationData notificationData) {
             m.checkNotNullParameter(notificationData, "data");
             this.data = notificationData;
-            this.f2104id = new Random().nextInt(Integer.MAX_VALUE);
+            this.f2110id = new Random().nextInt(Integer.MAX_VALUE);
             this.extras = new LinkedHashMap<>();
         }
 
@@ -242,7 +242,7 @@ public final class NotificationData {
         }
 
         public final int getId() {
-            return this.f2104id;
+            return this.f2110id;
         }
 
         public final boolean getIgnoreNextClearForAck() {
@@ -306,13 +306,13 @@ public final class NotificationData {
         if (valueOf != null) {
             j5 = valueOf.longValue();
         } else {
-            int z3 = channel.z();
-            if (z3 == 1 || z3 == 3) {
+            int A = channel.A();
+            if (A == 1 || A == 3) {
                 j5 = 0;
             }
         }
         this.guildId = j5;
-        if (m.areEqual(str, "MESSAGE_CREATE") && (channel.z() == 0 || channel.z() == 3 || channel.z() == 10 || channel.z() == 11 || channel.z() == 12)) {
+        if (m.areEqual(str, "MESSAGE_CREATE") && (channel.A() == 0 || channel.A() == 3 || channel.A() == 10 || channel.A() == 11 || channel.A() == 12)) {
             z2 = true;
         }
         this.isGroupConversation = z2;
@@ -320,7 +320,7 @@ public final class NotificationData {
 
     /* JADX WARNING: Illegal instructions before constructor call */
     public NotificationData(Map<String, String> map) {
-        this(r1, r1, r6, r7, r8, r9, r48, r11, r12, r14, r15, r16, r1, r19, r20, r21, r22, (r1 == null || (r1 = s.toLongOrNull(r1)) == null) ? -1 : r1.longValue(), map.get("application_name"), map.get("application_icon"), StickerUtils.INSTANCE.parseFromMessageNotificationJson(map.get("message")), map.get("subtitle"));
+        this(r1, r1, r6, r7, r8, r9, r49, r11, r12, r14, r15, r16, r1, r19, r20, r21, r22, (r1 == null || (r1 = s.toLongOrNull(r1)) == null) ? -1 : r1.longValue(), map.get("application_name"), map.get("application_icon"), StickerUtils.INSTANCE.parseFromMessageNotificationJson(map.get("message")), map.get("subtitle"));
         Long longOrNull;
         Integer intOrNull;
         Long longOrNull2;
@@ -351,7 +351,7 @@ public final class NotificationData {
         String str10 = map.get("channel_name");
         str4 = str10 != null ? b.k(a.v("!!", str10, "!!"), new Object[0], null, 2).toString() : str4;
         String str11 = map.get("channel_id");
-        Channel channel = new Channel(null, intValue2, longValue2, str4, 0, (str11 == null || (longOrNull4 = s.toLongOrNull(str11)) == null) ? -1 : longOrNull4.longValue(), 0, null, null, 0, null, 0, 0, map.get("channel_icon"), 0, 0, null, false, 0, null, 0, map.get("rtc_region"), null, null, null, null, null, null);
+        Channel channel = new Channel(null, intValue2, longValue2, str4, 0, (str11 == null || (longOrNull4 = s.toLongOrNull(str11)) == null) ? -1 : longOrNull4.longValue(), 0, null, null, 0, null, 0, 0, map.get("channel_icon"), 0, 0, null, false, 0, null, 0, null, map.get("rtc_region"), null, null, null, null, null, null);
         List access$parseAckChannelIds = Companion.access$parseAckChannelIds(Companion, map.get("channel_ids"));
         String str12 = map.get("user_id");
         long longValue3 = (str12 == null || (longOrNull3 = s.toLongOrNull(str12)) == null) ? -1 : longOrNull3.longValue();
@@ -370,7 +370,7 @@ public final class NotificationData {
     }
 
     private final Intent addTrackingData(Intent intent) {
-        Intent putExtra = intent.putExtra("notif_type", this.type).putExtra("notif_user_id", this.userId).putExtra("message_id", this.messageId).putExtra("message_type", this.messageType).putExtra("guild_id", this.guildId).putExtra("channel_id", this.channel.g()).putExtra("channel_type", this.channel.z()).putExtra("rel_type", this.relationshipType).putExtra("activity_type", this.activityType).putExtra("activity_name", this.activityName);
+        Intent putExtra = intent.putExtra("notif_type", this.type).putExtra("notif_user_id", this.userId).putExtra("message_id", this.messageId).putExtra("message_type", this.messageType).putExtra("guild_id", this.guildId).putExtra("channel_id", this.channel.h()).putExtra("channel_type", this.channel.A()).putExtra("rel_type", this.relationshipType).putExtra("activity_type", this.activityType).putExtra("activity_name", this.activityName);
         m.checkNotNullExpressionValue(putExtra, "intent\n        .putExtra…IVITY_NAME, activityName)");
         return putExtra;
     }
@@ -391,25 +391,25 @@ public final class NotificationData {
             } else if (str.equals("ACTIVITY_START")) {
                 return IntentUtils.RouteBuilders.INSTANCE.selectDirectMessage(this.userId);
             }
-            return IntentUtils.RouteBuilders.selectChannel$default(this.channel.g(), this.guildId, null, 4, null);
+            return IntentUtils.RouteBuilders.selectChannel$default(this.channel.h(), this.guildId, null, 4, null);
         }
-        return this.channel.z() != 1 ? IntentUtils.RouteBuilders.selectChannel$default(this.channel.g(), this.guildId, null, 4, null) : IntentUtils.RouteBuilders.selectChannel$default(this.channel.g(), 0, null, 4, null);
+        return this.channel.A() != 1 ? IntentUtils.RouteBuilders.selectChannel$default(this.channel.h(), this.guildId, null, 4, null) : IntentUtils.RouteBuilders.selectChannel$default(this.channel.h(), 0, null, 4, null);
     }
 
     private final String getIconUrlForChannel() {
-        int z2 = this.channel.z();
-        if (z2 != 0) {
-            if (z2 == 1) {
+        int A = this.channel.A();
+        if (A != 0) {
+            if (A == 1) {
                 return getIconUrlForUser();
             }
-            if (z2 != 5) {
-                switch (z2) {
+            if (A != 5) {
+                switch (A) {
                     case 10:
                     case 11:
                     case 12:
                         break;
                     default:
-                        return IconUtils.getForChannel$default(this.channel.g(), this.channel.f(), this.channel.z(), true, null, 16, null);
+                        return IconUtils.getForChannel$default(this.channel.h(), this.channel.g(), this.channel.A(), true, null, 16, null);
                 }
             }
         }
@@ -421,31 +421,31 @@ public final class NotificationData {
         String a2;
         String r;
         m.checkNotNullParameter(message, "message");
-        long r2 = message.r();
-        MessageActivity b = message.b();
-        MessageActivityType b2 = b != null ? b.b() : null;
-        Application d = message.d();
-        String g = d != null ? d.g() : null;
-        Integer M = message.M();
-        m.checkNotNull(M);
-        int intValue = M.intValue();
-        String k = message.k();
-        Channel a3 = Channel.a(this.channel, null, 0, 0, null, 0, message.i(), 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435423);
+        long o = message.o();
+        MessageActivity a3 = message.a();
+        MessageActivityType b = a3 != null ? a3.b() : null;
+        Application b2 = message.b();
+        String g = b2 != null ? b2.g() : null;
+        Integer E = message.E();
+        m.checkNotNull(E);
+        int intValue = E.intValue();
+        String i = message.i();
+        Channel a4 = Channel.a(this.channel, null, 0, 0, null, 0, message.g(), 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, null, 536870879);
         List emptyList = n.emptyList();
-        User g2 = message.g();
-        long i = g2 != null ? g2.i() : 0;
-        User g3 = message.g();
+        User e = message.e();
+        long i2 = e != null ? e.i() : 0;
+        User e2 = message.e();
         String str = "";
-        String str2 = (g3 == null || (r = g3.r()) == null) ? str : r;
-        User g4 = message.g();
-        if (!(g4 == null || (a = g4.a()) == null || (a2 = a.a()) == null)) {
+        String str2 = (e2 == null || (r = e2.r()) == null) ? str : r;
+        User e3 = message.e();
+        if (!(e3 == null || (a = e3.a()) == null || (a2 = a.a()) == null)) {
             str = a2;
         }
         long j = this.guildId;
         String str3 = this.guildName;
         String str4 = this.guildIcon;
-        List<Sticker> I = message.I();
-        return new NotificationData("MESSAGE_CREATE", r2, b2, g, intValue, k, a3, emptyList, i, str2, str, -1, j, str3, str4, -1, null, -1, null, null, I != null ? (Sticker) u.firstOrNull((List<? extends Object>) I) : null, null);
+        List<Sticker> A = message.A();
+        return new NotificationData("MESSAGE_CREATE", o, b, g, intValue, i, a4, emptyList, i2, str2, str, -1, j, str3, str4, -1, null, -1, null, null, A != null ? (Sticker) u.firstOrNull((List<? extends Object>) A) : null, null);
     }
 
     public final List<Long> getAckChannelIds() {
@@ -459,18 +459,18 @@ public final class NotificationData {
         if (!m.areEqual(this.type, "CALL_RING")) {
             return null;
         }
-        PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.callAction(context, this.channel.g(), this.messageId, z2)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null));
-        Pair pair = z2 ? d0.o.to(2131890644, 2131100249) : d0.o.to(2131888047, 2131100324);
+        PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.callAction(context, this.channel.h(), this.messageId, z2)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null));
+        Pair pair = z2 ? d0.o.to(2131890712, 2131100249) : d0.o.to(2131888046, 2131100324);
         int intValue = ((Number) pair.component1()).intValue();
         int intValue2 = ((Number) pair.component2()).intValue();
         StringBuilder L = a.L("**");
         L.append(b.g(context, intValue, new Object[0], null, 4));
         L.append("**");
-        return new NotificationCompat.Action.Builder(z2 ? 2131231448 : 2131231449, b.f(L.toString(), new Object[0], new NotificationData$getCallAction$coloredString$1(context, intValue2)), broadcast).build();
+        return new NotificationCompat.Action.Builder(z2 ? 2131231454 : 2131231455, b.f(L.toString(), new Object[0], new NotificationData$getCallAction$coloredString$1(context, intValue2)), broadcast).build();
     }
 
     public final long getChannelId() {
-        return this.channel.g();
+        return this.channel.h();
     }
 
     public final CharSequence getContent(Context context) {
@@ -483,24 +483,24 @@ public final class NotificationData {
                     return "";
                 }
                 int i = this.relationshipType;
-                return i != 1 ? i != 3 ? "" : b.g(context, 2131891530, new Object[0], null, 4) : b.g(context, 2131891517, new Object[0], null, 4);
+                return i != 1 ? i != 3 ? "" : b.g(context, 2131891599, new Object[0], null, 4) : b.g(context, 2131891586, new Object[0], null, 4);
             case -1237752112:
-                return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888917, new Object[]{this.applicationName}, null, 4) : "";
+                return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888918, new Object[]{this.applicationName}, null, 4) : "";
             case 974015250:
-                return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891519, new Object[]{this.userUsername, this.activityName}, null, 4);
+                return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891588, new Object[]{this.userUsername, this.activityName}, null, 4);
             case 998188116:
                 if (!str.equals("MESSAGE_CREATE")) {
                     return "";
                 }
-                int z2 = this.channel.z();
-                if (z2 != 0) {
-                    if (z2 == 1 || z2 == 3) {
+                int A = this.channel.A();
+                if (A != 0) {
+                    if (A == 1 || A == 3) {
                         if (this.messageActivityType == MessageActivityType.JOIN) {
-                            return b.g(context, 2131891521, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
+                            return b.g(context, 2131891590, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
                         }
                         Sticker sticker = this.sticker;
                         if (sticker != null) {
-                            return b.g(context, 2131893523, new Object[]{sticker.g()}, null, 4);
+                            return b.g(context, 2131893607, new Object[]{sticker.h()}, null, 4);
                         }
                         String str2 = this.messageContent;
                         if (str2 != null) {
@@ -508,8 +508,8 @@ public final class NotificationData {
                             return charSequence;
                         }
                         return null;
-                    } else if (z2 != 5) {
-                        switch (z2) {
+                    } else if (A != 5) {
+                        switch (A) {
                             case 10:
                             case 11:
                             case 12:
@@ -523,11 +523,11 @@ public final class NotificationData {
                     return b.g(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(context, this.messageId), new Object[]{this.userUsername}, null, 4);
                 }
                 if (this.messageActivityType == MessageActivityType.JOIN) {
-                    return b.g(context, 2131891526, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
+                    return b.g(context, 2131891595, new Object[]{this.userUsername, this.messageApplicationName}, null, 4);
                 }
                 Sticker sticker2 = this.sticker;
                 if (sticker2 != null) {
-                    return b.g(context, 2131893523, new Object[]{sticker2.g()}, null, 4);
+                    return b.g(context, 2131893607, new Object[]{sticker2.h()}, null, 4);
                 }
                 String str3 = this.messageContent;
                 if (str3 != null) {
@@ -536,7 +536,7 @@ public final class NotificationData {
                 }
                 return null;
             case 1770025841:
-                return str.equals("CALL_RING") ? b.k(b.g(context, 2131891717, new Object[]{a.D(a.L("**"), this.userUsername, "**")}, null, 4), new Object[0], null, 2) : "";
+                return str.equals("CALL_RING") ? b.k(b.g(context, 2131891789, new Object[]{a.D(a.L("**"), this.userUsername, "**")}, null, 4), new Object[0], null, 2) : "";
             default:
                 return "";
         }
@@ -570,13 +570,13 @@ public final class NotificationData {
         if (str.hashCode() != 998188116 || !str.equals("MESSAGE_CREATE")) {
             return null;
         }
-        int z2 = this.channel.z();
-        if (z2 != 0) {
-            if (z2 == 3) {
+        int A = this.channel.A();
+        if (A != 0) {
+            if (A == 3) {
                 return AnimatableValueParser.A0(this.channel, context, false, 2);
             }
-            if (z2 != 5) {
-                switch (z2) {
+            if (A != 5) {
+                switch (A) {
                     case 10:
                     case 11:
                     case 12:
@@ -592,7 +592,7 @@ public final class NotificationData {
     @SuppressLint({"UnspecifiedImmutableFlag"})
     public final PendingIntent getDeleteIntent(Context context) {
         m.checkNotNullParameter(context, "context");
-        PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, NotificationActions.Companion.delete(context, this.channel.g()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
+        PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, NotificationActions.Companion.delete(context, this.channel.h()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
         m.checkNotNullExpressionValue(broadcast, "PendingIntent.getBroadca…LAG_UPDATE_CURRENT)\n    )");
         return broadcast;
     }
@@ -602,12 +602,12 @@ public final class NotificationData {
     public final NotificationCompat.Action getDirectReplyAction(Context context, Set<Long> set) {
         m.checkNotNullParameter(context, "ctx");
         m.checkNotNullParameter(set, "deniedChannels");
-        if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || set.contains(Long.valueOf(this.channel.g()))) {
+        if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || set.contains(Long.valueOf(this.channel.h()))) {
             return null;
         }
-        RemoteInput build = new RemoteInput.Builder("discord_notif_text_input").setLabel(b.g(context, 2131893158, new Object[0], null, 4)).build();
+        RemoteInput build = new RemoteInput.Builder("discord_notif_text_input").setLabel(b.g(context, 2131893241, new Object[0], null, 4)).build();
         m.checkNotNullExpressionValue(build, "RemoteInput.Builder(Inte…essage))\n        .build()");
-        return new NotificationCompat.Action.Builder(2131231907, b.g(context, 2131891531, new Object[0], null, 4), PendingIntent.getBroadcast(context, (int) this.channel.g(), addTrackingData(NotificationActions.Companion.directReply(context, this.channel.g(), getTitle(context))), PendingIntentExtensionsKt.mutablePendingIntentFlag(134217728))).addRemoteInput(build).setAllowGeneratedReplies(true).build();
+        return new NotificationCompat.Action.Builder(2131231915, b.g(context, 2131891600, new Object[0], null, 4), PendingIntent.getBroadcast(context, (int) this.channel.h(), addTrackingData(NotificationActions.Companion.directReply(context, this.channel.h(), getTitle(context))), PendingIntentExtensionsKt.mutablePendingIntentFlag(134217728))).addRemoteInput(build).setAllowGeneratedReplies(true).build();
     }
 
     @SuppressLint({"UnspecifiedImmutableFlag"})
@@ -684,7 +684,7 @@ public final class NotificationData {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:17:?, code lost:
-        return r3.type + r3.channel.g();
+        return r3.type + r3.channel.h();
      */
     /* JADX WARNING: Code restructure failed: missing block: B:3:0x0011, code lost:
         if (r0.equals("CALL_RING") != false) goto L_0x001c;
@@ -726,7 +726,7 @@ public final class NotificationData {
         if (!m.areEqual(this.type, "MESSAGE_CREATE")) {
             return null;
         }
-        return new NotificationCompat.Action.Builder(2131231505, b.g(context, 2131890933, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.markAsRead(context, this.channel.g(), this.messageId)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
+        return new NotificationCompat.Action.Builder(2131231511, b.g(context, 2131891003, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.markAsRead(context, this.channel.h(), this.messageId)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
     }
 
     public final long getMessageId() {
@@ -769,8 +769,8 @@ public final class NotificationData {
                 return "Calls";
             }
         } else if (str.equals("MESSAGE_CREATE")) {
-            int z2 = this.channel.z();
-            return (z2 == 1 || z2 == 3) ? "DirectMessages" : "Messages";
+            int A = this.channel.A();
+            return (A == 1 || A == 3) ? "DirectMessages" : "Messages";
         }
         return "Social";
     }
@@ -824,7 +824,7 @@ public final class NotificationData {
         m.checkNotNullParameter(context, "context");
         IconCompat iconCompat = null;
         boolean z2 = false;
-        CharSequence g = (!m.areEqual(this.type, "MESSAGE_CREATE") || this.messageType == 7 || (messageActivityType = this.messageActivityType) == MessageActivityType.SPECTATE || messageActivityType == MessageActivityType.JOIN) ? b.g(context, 2131888148, new Object[0], null, 4) : this.userUsername;
+        CharSequence g = (!m.areEqual(this.type, "MESSAGE_CREATE") || this.messageType == 7 || (messageActivityType = this.messageActivityType) == MessageActivityType.SPECTATE || messageActivityType == MessageActivityType.JOIN) ? b.g(context, 2131888147, new Object[0], null, 4) : this.userUsername;
         String valueOf = String.valueOf(this.userId);
         String str = this.subtitle;
         if (!(str == null || g == null)) {
@@ -889,15 +889,15 @@ public final class NotificationData {
         if (hashCode != -1327124998) {
             if (hashCode != 998188116) {
                 if (hashCode == 1770025841 && str.equals("CALL_RING")) {
-                    return 2131231792;
+                    return 2131231800;
                 }
             } else if (str.equals("MESSAGE_CREATE")) {
-                return 2131231794;
+                return 2131231802;
             }
         } else if (str.equals("RELATIONSHIP_ADD")) {
-            return 2131231793;
+            return 2131231801;
         }
-        return 2131231791;
+        return 2131231799;
     }
 
     public final Sticker getSticker() {
@@ -912,7 +912,7 @@ public final class NotificationData {
         if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || i < 2) {
             return null;
         }
-        return new NotificationCompat.Action.Builder(2131231797, b.g(context, 2131891528, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.timedMute(context, this.guildId, this.channel.g(), clock.currentTimeMillis() + 3600000)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
+        return new NotificationCompat.Action.Builder(2131231805, b.g(context, 2131891597, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.timedMute(context, this.guildId, this.channel.h(), clock.currentTimeMillis() + 3600000)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build();
     }
 
     public final CharSequence getTitle(Context context) {
@@ -922,23 +922,23 @@ public final class NotificationData {
             case -1327124998:
                 return str.equals("RELATIONSHIP_ADD") ? this.userUsername : "";
             case -1237752112:
-                return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888918, new Object[0], null, 4) : "";
+                return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888919, new Object[0], null, 4) : "";
             case 974015250:
-                return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891536, new Object[0], null, 4);
+                return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891605, new Object[0], null, 4);
             case 998188116:
                 if (!str.equals("MESSAGE_CREATE")) {
                     return "";
                 }
-                int z2 = this.channel.z();
-                if (z2 != 0) {
-                    if (z2 == 1) {
+                int A = this.channel.A();
+                if (A != 0) {
+                    if (A == 1) {
                         return this.userUsername;
                     }
-                    if (z2 == 3) {
+                    if (A == 3) {
                         return AnimatableValueParser.A0(this.channel, context, false, 2);
                     }
-                    if (z2 != 5) {
-                        switch (z2) {
+                    if (A != 5) {
+                        switch (A) {
                             case 10:
                             case 11:
                             case 12:
@@ -950,7 +950,7 @@ public final class NotificationData {
                 }
                 return b.k(this.guildName + " _" + AnimatableValueParser.A0(this.channel, context, false, 2) + '_', new Object[0], null, 2);
             case 1770025841:
-                return str.equals("CALL_RING") ? this.channel.z() != 1 ? AnimatableValueParser.y0(this.channel) : b.g(context, 2131890333, new Object[0], null, 4) : "";
+                return str.equals("CALL_RING") ? this.channel.A() != 1 ? AnimatableValueParser.y0(this.channel) : b.g(context, 2131890399, new Object[0], null, 4) : "";
             default:
                 return "";
         }
diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
index 20c9022560..17ad1a9839 100644
--- a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
+++ b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java
@@ -188,13 +188,13 @@ public final class NotificationRenderer {
             arrayList2.add(new MGImagesBitmap.ImageRequest(str, true));
         }
         Set mutableSet = u.toMutableSet(arrayList2);
-        Observable<MGImagesBitmap.CloseableBitmaps> R = MGImagesBitmap.getBitmaps(mutableSet).R();
+        Observable<MGImagesBitmap.CloseableBitmaps> Q = MGImagesBitmap.getBitmaps(mutableSet).Q();
         CompositeSubscription compositeSubscription = new CompositeSubscription();
-        Observable<Long> b02 = Observable.e0(250, TimeUnit.MILLISECONDS).b0(Observable.i0(new r(R.i, new f1(new d1(d.j)))));
-        m.checkNotNullExpressionValue(b02, "Observable\n        .time…Next(Observable.never()))");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(b02), (Context) null, "Unable to display notification, timeout.", new NotificationRenderer$displayAndUpdateCache$4(compositeSubscription), new NotificationRenderer$displayAndUpdateCache$5(context, andUpdate, contentIntent), (Function1) null, (Function0) null, (Function0) null, 112, (Object) null);
-        m.checkNotNullExpressionValue(R, "bitmapsObservable");
-        Observable ui = ObservableExtensionsKt.ui(R);
+        Observable<Long> a02 = Observable.d0(250, TimeUnit.MILLISECONDS).a0(Observable.h0(new r(Q.i, new f1(new d1(d.j)))));
+        m.checkNotNullExpressionValue(a02, "Observable\n        .time…Next(Observable.never()))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), (Context) null, "Unable to display notification, timeout.", new NotificationRenderer$displayAndUpdateCache$4(compositeSubscription), new NotificationRenderer$displayAndUpdateCache$5(context, andUpdate, contentIntent), (Function1) null, (Function0) null, (Function0) null, 112, (Object) null);
+        m.checkNotNullExpressionValue(Q, "bitmapsObservable");
+        Observable ui = ObservableExtensionsKt.ui(Q);
         StringBuilder L = a.L("Unable to display notification multi-fetch ");
         L.append(mutableSet.size());
         L.append(" bitmaps.");
@@ -211,7 +211,7 @@ public final class NotificationRenderer {
     }
 
     private final NotificationCompat.MessagingStyle getMessageStyle(Context context, NotificationData notificationData, List<NotificationData> list, Map<String, Bitmap> map) {
-        Person build = new Person.Builder().setName(context.getString(2131891006)).setKey("me").build();
+        Person build = new Person.Builder().setName(context.getString(2131891077)).setKey("me").build();
         m.checkNotNullExpressionValue(build, "Person.Builder()\n       …ey(\"me\")\n        .build()");
         NotificationCompat.MessagingStyle groupConversation = new NotificationCompat.MessagingStyle(build).setConversationTitle(notificationData.getConversationTitle(context)).setGroupConversation(notificationData.isGroupConversation());
         for (NotificationData notificationData2 : list) {
@@ -265,11 +265,11 @@ public final class NotificationRenderer {
     public final void displaySent(Context context, long j, CharSequence charSequence, boolean z2, int i) {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(charSequence, "channelName");
-        int i2 = z2 ? 2131891533 : 2131891532;
+        int i2 = z2 ? 2131891602 : 2131891601;
         PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, NotificationActions.Companion.delete(context, j), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
         Intent selectChannel$default = IntentUtils.RouteBuilders.selectChannel$default(j, 0, null, 6, null);
         selectChannel$default.setClass(context, AppActivity.Main.class);
-        NotificationManagerCompat.from(context).notify(i, new NotificationCompat.Builder(context, "Messages").setAutoCancel(true).setSmallIcon(2131231794).setCategory("msg").setContentText(b.g(context, i2, new Object[]{charSequence}, null, 4)).setDeleteIntent(broadcast).setContentIntent(PendingIntent.getActivity(context, 0, selectChannel$default, PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build());
+        NotificationManagerCompat.from(context).notify(i, new NotificationCompat.Builder(context, "Messages").setAutoCancel(true).setSmallIcon(2131231802).setCategory("msg").setContentText(b.g(context, i2, new Object[]{charSequence}, null, 4)).setDeleteIntent(broadcast).setContentIntent(PendingIntent.getActivity(context, 0, selectChannel$default, PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build());
         autoDismissNotification(context, i);
     }
 
@@ -277,8 +277,8 @@ public final class NotificationRenderer {
     public final void initNotificationChannels(Application application) {
         m.checkNotNullParameter(application, "context");
         NotificationChannel notificationChannel = new NotificationChannel("Calls", application.getString(2131887113), 4);
-        NotificationChannel notificationChannel2 = new NotificationChannel("Media Connections", application.getString(2131894511), 2);
-        List<NotificationChannel> listOf = n.listOf((Object[]) new NotificationChannel[]{notificationChannel, notificationChannel2, new NotificationChannel("Messages", application.getString(2131891184), 4), new NotificationChannel("DirectMessages", application.getString(2131888116), 4), new NotificationChannel("Social", application.getString(2131888810), 2), new NotificationChannel("Game Detection", application.getString(2131888884), 1)});
+        NotificationChannel notificationChannel2 = new NotificationChannel("Media Connections", application.getString(2131894631), 2);
+        List<NotificationChannel> listOf = n.listOf((Object[]) new NotificationChannel[]{notificationChannel, notificationChannel2, new NotificationChannel("Messages", application.getString(2131891255), 4), new NotificationChannel("DirectMessages", application.getString(2131888115), 4), new NotificationChannel("Social", application.getString(2131888811), 2), new NotificationChannel("Game Detection", application.getString(2131888885), 1)});
         for (NotificationChannel notificationChannel3 : listOf) {
             notificationChannel3.setShowBadge(true);
             notificationChannel3.enableVibration(true);
diff --git a/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java b/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java
index ea0fe965de..d6eee305aa 100644
--- a/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java
+++ b/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java
@@ -9,7 +9,7 @@ public final class GrowthTeamFeatures {
     private GrowthTeamFeatures() {
     }
 
-    public final boolean isDiscordUEnabled() {
+    public final boolean isDiscordHubEnabled() {
         Experiment userExperiment = StoreStream.Companion.getExperiments().getUserExperiment("2021-06_discord_u_android", true);
         return userExperiment != null && userExperiment.getBucket() == 1;
     }
diff --git a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
index 8c34e73e1b..af422792a6 100644
--- a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
+++ b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java
@@ -40,14 +40,14 @@ public final class GiftingUtils {
         
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f2105id;
+        private final int f2111id;
 
         private SkuTypes(int i) {
-            this.f2105id = i;
+            this.f2111id = i;
         }
 
         public final int getId() {
-            return this.f2105id;
+            return this.f2111id;
         }
     }
 
@@ -108,10 +108,10 @@ public final class GiftingUtils {
                     WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion;
                     FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
                     m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager");
-                    String string = fragmentActivity.getString(2131888112);
-                    String string2 = fragmentActivity.getString(2131889097);
+                    String string = fragmentActivity.getString(2131888111);
+                    String string2 = fragmentActivity.getString(2131889101);
                     m.checkNotNullExpressionValue(string2, "activity.getString(R.str…gle_play_notice_extended)");
-                    WidgetNoticeDialog.Companion.show$default(companion2, supportFragmentManager, string, string2, fragmentActivity.getString(2131886440), fragmentActivity.getString(2131891333), h0.mapOf(o.to(2131364032, new GiftingUtils$buyGift$2(googlePlayInAppSku, giftingUtils$buyGift$1)), o.to(2131364027, new GiftingUtils$buyGift$3(function0))), null, null, null, null, null, null, 0, new GiftingUtils$buyGift$4(function0), 8128, null);
+                    WidgetNoticeDialog.Companion.show$default(companion2, supportFragmentManager, string, string2, fragmentActivity.getString(2131886440), fragmentActivity.getString(2131891404), h0.mapOf(o.to(2131364075, new GiftingUtils$buyGift$2(googlePlayInAppSku, giftingUtils$buyGift$1)), o.to(2131364070, new GiftingUtils$buyGift$3(function0))), null, null, null, null, null, null, 0, new GiftingUtils$buyGift$4(function0), 8128, null);
                     companion.getGooglePlayPurchases().markViewedGiftingWarning();
                     return;
                 }
@@ -130,15 +130,15 @@ public final class GiftingUtils {
     public final Integer getIconForSku(GooglePlayInAppSku googlePlayInAppSku) {
         m.checkNotNullParameter(googlePlayInAppSku, "inAppSku");
         if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Month())) {
-            return 2131231842;
+            return 2131231850;
         }
         if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Year())) {
-            return 2131231844;
+            return 2131231852;
         }
         if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Month())) {
-            return 2131231845;
+            return 2131231853;
         }
-        return m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Year()) ? 2131231846 : null;
+        return m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Year()) ? 2131231854 : null;
     }
 
     public final PremiumTier getTierForSku(Long l) {
diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java
index e1481f6341..dfae711224 100644
--- a/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/guilds/GuildUtilsKt.java
@@ -48,6 +48,6 @@ public final class GuildUtilsKt {
 
     public static final int getMaxVoiceBitrateKbps(com.discord.models.guild.Guild guild, Channel channel) {
         m.checkNotNullParameter(guild, "guild");
-        return (channel == null || !AnimatableValueParser.u1(channel)) ? getMaxVoiceBitrateKbps(guild.getPremiumTier(), guild.getFeatures().contains(GuildFeature.VIP_REGIONS)) : Bitrate.DEFAULT.getKbps();
+        return (channel == null || !AnimatableValueParser.v1(channel)) ? getMaxVoiceBitrateKbps(guild.getPremiumTier(), guild.getFeatures().contains(GuildFeature.VIP_REGIONS)) : Bitrate.DEFAULT.getKbps();
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java
index 5aff889c4a..e65b0da666 100644
--- a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java
+++ b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java
@@ -107,8 +107,8 @@ public final class GuildVerificationLevelUtils {
         Observable<Guild> observeGuild = storeGuilds.observeGuild(j);
         Observable<GuildVerificationLevel> observeVerificationLevel = storeGuilds.observeVerificationLevel(j);
         Observable<Map<Long, GuildMember>> observeComputed = storeGuilds.observeComputed(j);
-        Observable<GuildVerificationLevel> s2 = Observable.g(observeJoinedAt, observeGuild, observeVerificationLevel, Observable.i0(new r(observeComputed.i, new LeadingEdgeThrottle(1500, TimeUnit.MILLISECONDS))), storeUser.observeMe(true), new GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(clock)).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n        .comb…  .distinctUntilChanged()");
-        return s2;
+        Observable<GuildVerificationLevel> r = Observable.g(observeJoinedAt, observeGuild, observeVerificationLevel, Observable.h0(new r(observeComputed.i, new LeadingEdgeThrottle(1500, TimeUnit.MILLISECONDS))), storeUser.observeMe(true), new GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(clock)).r();
+        m.checkNotNullExpressionValue(r, "Observable\n        .comb…  .distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java b/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java
index 681bafc5d4..ac0b679e58 100644
--- a/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java
+++ b/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java
@@ -1,8 +1,8 @@
 package com.discord.utilities.guilds;
 
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.user.User;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 /* compiled from: PublicGuildUtils.kt */
 public final class PublicGuildUtils {
@@ -13,11 +13,11 @@ public final class PublicGuildUtils {
     private PublicGuildUtils() {
     }
 
-    public static final boolean isPublicGuildSystemMessage(Message message) {
-        User g;
+    public final boolean isPublicGuildSystemMessage(Message message) {
+        User author;
         m.checkNotNullParameter(message, "message");
-        MessageReference A = message.A();
-        Long b = A != null ? A.b() : null;
-        return (b != null && b.longValue() == 667560445975986187L) || ((g = message.g()) != null && g.i() == 669627189624307712L);
+        MessageReference messageReference = message.getMessageReference();
+        Long b = messageReference != null ? messageReference.b() : null;
+        return (b != null && b.longValue() == 667560445975986187L) || ((author = message.getAuthor()) != null && author.i() == 669627189624307712L);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/icon/IconUtils.java b/app/src/main/java/com/discord/utilities/icon/IconUtils.java
index 20a1f0cc91..62adad7863 100644
--- a/app/src/main/java/com/discord/utilities/icon/IconUtils.java
+++ b/app/src/main/java/com/discord/utilities/icon/IconUtils.java
@@ -127,7 +127,7 @@ public final class IconUtils {
         if (channel == null) {
             return null;
         }
-        return channel.z() == 1 ? getForUser$default(AnimatableValueParser.v0(channel), false, null, 6, null) : getForChannel(channel.g(), channel.f(), channel.z(), false, num);
+        return channel.A() == 1 ? getForUser$default(AnimatableValueParser.v0(channel), false, null, 6, null) : getForChannel(channel.h(), channel.g(), channel.A(), false, num);
     }
 
     public static /* synthetic */ String getForChannel$default(long j, String str, int i, boolean z2, Integer num, int i2, Object obj) {
@@ -296,7 +296,7 @@ public final class IconUtils {
                 i = num.intValue() % 5;
             }
         }
-        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c;
+        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1591c;
         return RebrandFeatureFlag.b ? a.n("asset://asset/images/default_avatar_new_", i, ".png") : a.n("asset://asset/images/default_avatar_", i, ".jpg");
     }
 
@@ -765,17 +765,17 @@ public final class IconUtils {
             switch (str.hashCode()) {
                 case -1904464552:
                     if (str.equals("eu-central")) {
-                        return 2131232072;
+                        return 2131232080;
                     }
                     break;
                 case -1867973154:
                     if (str.equals("us-south")) {
-                        return 2131232070;
+                        return 2131232078;
                     }
                     break;
                 case -1504353500:
                     if (str.equals("singapore")) {
-                        return 2131232090;
+                        return 2131232098;
                     }
                     break;
                 case -1456593748:
@@ -788,27 +788,27 @@ public final class IconUtils {
                     break;
                 case -1381018772:
                     if (str.equals("brazil")) {
-                        return 2131232087;
+                        return 2131232095;
                     }
                     break;
                 case -1097131496:
                     if (str.equals("london")) {
-                        return 2131232075;
+                        return 2131232083;
                     }
                     break;
                 case -919652293:
                     if (str.equals("russia")) {
-                        return 2131232089;
+                        return 2131232097;
                     }
                     break;
                 case -887780828:
                     if (str.equals("sydney")) {
-                        return 2131232063;
+                        return 2131232071;
                     }
                     break;
                 case -455031011:
                     if (str.equals("hongkong")) {
-                        return 2131232077;
+                        return 2131232085;
                     }
                     break;
                 case -199235124:
@@ -821,22 +821,22 @@ public final class IconUtils {
                     break;
                 case -135164842:
                     if (str.equals("amsterdam")) {
-                        return 2131232084;
+                        return 2131232092;
                     }
                     break;
                 case 100893702:
                     if (str.equals("japan")) {
-                        return 2131232081;
+                        return 2131232089;
                     }
                     break;
                 case 579843043:
                     if (str.equals("frankfurt")) {
-                        return 2131232067;
+                        return 2131232075;
                     }
                     break;
             }
         }
-        return 2131232095;
+        return 2131232103;
     }
 
     public final boolean isImageHashAnimated(String str) {
diff --git a/app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java b/app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java
similarity index 81%
rename from app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java
rename to app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java
index 4f015748af..cacf2258e0 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImages$requestImageCrop$1.java
@@ -7,11 +7,11 @@ import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: MGImages.kt */
-public final class MGImages$requestAvatarCrop$1 extends o implements Function1<Exception, Unit> {
+public final class MGImages$requestImageCrop$1 extends o implements Function1<Exception, Unit> {
     public final /* synthetic */ Context $context;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public MGImages$requestAvatarCrop$1(Context context) {
+    public MGImages$requestImageCrop$1(Context context) {
         super(1);
         this.$context = context;
     }
@@ -27,6 +27,6 @@ public final class MGImages$requestAvatarCrop$1 extends o implements Function1<E
     public final void invoke(Exception exc) {
         m.checkNotNullParameter(exc, "e");
         Context context = this.$context;
-        c.a.d.o.h(context, context != null ? b.g(context, 2131894042, new Object[]{exc.getMessage()}, null, 4) : null, 0, null, 12);
+        c.a.d.o.h(context, context != null ? b.g(context, 2131894142, new Object[]{exc.getMessage()}, null, 4) : null, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImages.java b/app/src/main/java/com/discord/utilities/images/MGImages.java
index 7929472768..146c252075 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImages.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImages.java
@@ -121,7 +121,7 @@ public final class MGImages {
             z3 = true;
         }
         if (z3) {
-            b.f2178c = new e(i, i2);
+            b.f2184c = new e(i, i2);
         }
         return b;
     }
@@ -149,55 +149,6 @@ public final class MGImages {
         imageUploadDialog.show(fragmentManager, ImageUploadDialog.class.getName());
     }
 
-    public static final void requestAvatarCrop(Context context, MediaPicker.Provider provider, Uri uri) {
-        m.checkNotNullParameter(provider, "provider");
-        m.checkNotNullParameter(uri, "inputUri");
-        MGImages$requestAvatarCrop$1 mGImages$requestAvatarCrop$1 = new MGImages$requestAvatarCrop$1(context);
-        int themedColor = ColorCompat.getThemedColor(context, 2130969007);
-        int color = ColorCompat.getColor(context, 2131100428);
-        int themedColor2 = ColorCompat.getThemedColor(context, 2130969011);
-        int themedColor3 = ColorCompat.getThemedColor(context, 2130969007);
-        m.checkNotNullParameter(provider, "provider");
-        m.checkNotNullParameter(uri, "uri");
-        m.checkNotNullParameter(mGImages$requestAvatarCrop$1, "onError");
-        try {
-            Bundle bundle = new Bundle();
-            bundle.putInt("com.yalantis.ucrop.ToolbarColor", themedColor);
-            bundle.putInt("com.yalantis.ucrop.StatusBarColor", themedColor2);
-            bundle.putInt("com.yalantis.ucrop.UcropToolbarWidgetColor", color);
-            bundle.putInt("com.yalantis.ucrop.UcropColorControlsWidgetActive", themedColor3);
-            bundle.putInt("com.yalantis.ucrop.CropFrameColor", themedColor3);
-            bundle.putInt("com.yalantis.ucrop.CropGridColor", themedColor3);
-            if (bundle.getString("com.yalantis.ucrop.CompressionFormatName") == null) {
-                bundle.putString("com.yalantis.ucrop.CompressionFormatName", Bitmap.CompressFormat.PNG.name());
-            }
-            Context requireContext = provider.requireContext();
-            Uri fromFile = Uri.fromFile(provider.getImageFile());
-            m.checkNotNullExpressionValue(fromFile, "Uri.fromFile(provider.getImageFile())");
-            c.q.a.a aVar = new c.q.a.a(uri, fromFile);
-            m.checkNotNullExpressionValue(aVar, "UCrop.of(uri, destUri)");
-            aVar.b.putAll(bundle);
-            aVar.b.putInt("com.yalantis.ucrop.MaxSizeX", 1024);
-            aVar.b.putInt("com.yalantis.ucrop.MaxSizeY", 1024);
-            aVar.a.setClass(requireContext, UCropActivity.class);
-            aVar.a.putExtras(aVar.b);
-            Intent intent = aVar.a;
-            m.checkNotNullExpressionValue(intent, "uCrop.getIntent(context)");
-            List<ResolveInfo> queryIntentActivities = requireContext.getPackageManager().queryIntentActivities(intent, 65536);
-            m.checkNotNullExpressionValue(queryIntentActivities, "context\n        .package…nager.MATCH_DEFAULT_ONLY)");
-            for (ResolveInfo resolveInfo : queryIntentActivities) {
-                requireContext.grantUriPermission(resolveInfo.activityInfo.packageName, fromFile, 3);
-            }
-            try {
-                provider.startActivityForResult(intent, RequestType.CROP.getCode$media_picker_release());
-            } catch (ActivityNotFoundException unused) {
-                throw new IOException("No application available for media picker.");
-            }
-        } catch (IOException e) {
-            mGImages$requestAvatarCrop$1.invoke((MGImages$requestAvatarCrop$1) e);
-        }
-    }
-
     /* JADX WARNING: Code restructure failed: missing block: B:14:0x0036, code lost:
         r11 = move-exception;
      */
@@ -226,10 +177,71 @@ public final class MGImages {
                 o.h(context, c.a.l.b.g(context, 2131886798, new Object[]{e.getMessage()}, null, 4), 0, null, 12);
             } catch (NullPointerException e2) {
                 o.h(context, c.a.l.b.g(context, 2131886798, new Object[]{e2.getMessage()}, null, 4), 0, null, 12);
+            } catch (IllegalStateException e3) {
+                o.h(context, c.a.l.b.g(context, 2131886798, new Object[]{e3.getMessage()}, null, 4), 0, null, 12);
             }
         }
     }
 
+    public static final void requestImageCrop(Context context, MediaPicker.Provider provider, Uri uri, float f, float f2, int i) {
+        m.checkNotNullParameter(provider, "provider");
+        m.checkNotNullParameter(uri, "inputUri");
+        MGImages$requestImageCrop$1 mGImages$requestImageCrop$1 = new MGImages$requestImageCrop$1(context);
+        int themedColor = ColorCompat.getThemedColor(context, 2130969007);
+        int color = ColorCompat.getColor(context, 2131100428);
+        int themedColor2 = ColorCompat.getThemedColor(context, 2130969011);
+        int themedColor3 = ColorCompat.getThemedColor(context, 2130969007);
+        m.checkNotNullParameter(provider, "provider");
+        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(mGImages$requestImageCrop$1, "onError");
+        try {
+            Bundle bundle = new Bundle();
+            bundle.putInt("com.yalantis.ucrop.ToolbarColor", themedColor);
+            bundle.putInt("com.yalantis.ucrop.StatusBarColor", themedColor2);
+            bundle.putInt("com.yalantis.ucrop.UcropToolbarWidgetColor", color);
+            bundle.putInt("com.yalantis.ucrop.UcropColorControlsWidgetActive", themedColor3);
+            bundle.putInt("com.yalantis.ucrop.CropFrameColor", themedColor3);
+            bundle.putInt("com.yalantis.ucrop.CropGridColor", themedColor3);
+            if (bundle.getString("com.yalantis.ucrop.CompressionFormatName") == null) {
+                bundle.putString("com.yalantis.ucrop.CompressionFormatName", Bitmap.CompressFormat.PNG.name());
+            }
+            Context requireContext = provider.requireContext();
+            Uri fromFile = Uri.fromFile(provider.getImageFile());
+            m.checkNotNullExpressionValue(fromFile, "Uri.fromFile(provider.getImageFile())");
+            c.q.a.a aVar = new c.q.a.a(uri, fromFile);
+            m.checkNotNullExpressionValue(aVar, "UCrop.of(uri, destUri)");
+            aVar.b.putAll(bundle);
+            int i2 = i < 10 ? 10 : i;
+            if (i < 10) {
+                i = 10;
+            }
+            aVar.b.putInt("com.yalantis.ucrop.MaxSizeX", i2);
+            aVar.b.putInt("com.yalantis.ucrop.MaxSizeY", i);
+            aVar.b.putFloat("com.yalantis.ucrop.AspectRatioX", f);
+            aVar.b.putFloat("com.yalantis.ucrop.AspectRatioY", f2);
+            aVar.a.setClass(requireContext, UCropActivity.class);
+            aVar.a.putExtras(aVar.b);
+            Intent intent = aVar.a;
+            m.checkNotNullExpressionValue(intent, "uCrop.getIntent(context)");
+            List<ResolveInfo> queryIntentActivities = requireContext.getPackageManager().queryIntentActivities(intent, 65536);
+            m.checkNotNullExpressionValue(queryIntentActivities, "context\n        .package…nager.MATCH_DEFAULT_ONLY)");
+            for (ResolveInfo resolveInfo : queryIntentActivities) {
+                requireContext.grantUriPermission(resolveInfo.activityInfo.packageName, fromFile, 3);
+            }
+            try {
+                provider.startActivityForResult(intent, RequestType.CROP.getCode$media_picker_release());
+            } catch (ActivityNotFoundException unused) {
+                throw new IOException("No application available for media picker.");
+            }
+        } catch (IOException e) {
+            mGImages$requestImageCrop$1.invoke((MGImages$requestImageCrop$1) e);
+        }
+    }
+
+    public static /* synthetic */ void requestImageCrop$default(Context context, MediaPicker.Provider provider, Uri uri, float f, float f2, int i, int i2, Object obj) {
+        requestImageCrop(context, provider, uri, (i2 & 8) != 0 ? 1.0f : f, (i2 & 16) != 0 ? 1.0f : f2, (i2 & 32) != 0 ? 1024 : i);
+    }
+
     public static final void setImage(ImageView imageView, String str) {
         setImage$default(imageView, str, 0, 0, false, null, null, 124, null);
     }
@@ -404,7 +416,7 @@ public final class MGImages {
             AnimatableValueParser.l(z3, "the border width cannot be < 0");
             cVar.e = floatValue;
         }
-        INSTANCE.getHierarchy(imageView).q(cVar);
+        INSTANCE.getHierarchy(imageView).r(cVar);
     }
 
     public static /* synthetic */ void setRoundingParams$default(ImageView imageView, float f, boolean z2, Integer num, Integer num2, Float f2, int i, Object obj) {
@@ -414,10 +426,7 @@ public final class MGImages {
     public static final void setScaleType(ImageView imageView, ScalingUtils$ScaleType scalingUtils$ScaleType) {
         m.checkNotNullParameter(imageView, "view");
         m.checkNotNullParameter(scalingUtils$ScaleType, "scaleType");
-        GenericDraweeHierarchy hierarchy = INSTANCE.getHierarchy(imageView);
-        Objects.requireNonNull(hierarchy);
-        Objects.requireNonNull(scalingUtils$ScaleType);
-        hierarchy.l(2).r(scalingUtils$ScaleType);
+        INSTANCE.getHierarchy(imageView).n(scalingUtils$ScaleType);
     }
 
     public final void cancelImageRequests(ImageView imageView) {
@@ -448,7 +457,7 @@ public final class MGImages {
         m.checkNotNullParameter(changeDetector, "changeDetector");
         if (changeDetector.track(imageView, Integer.valueOf(i))) {
             GenericDraweeHierarchy hierarchy = getHierarchy(imageView);
-            hierarchy.n(1, hierarchy.b.getDrawable(i));
+            hierarchy.o(1, hierarchy.b.getDrawable(i));
         }
     }
 
@@ -457,7 +466,7 @@ public final class MGImages {
         m.checkNotNullParameter(drawable, "drawable");
         m.checkNotNullParameter(changeDetector, "changeDetector");
         if (changeDetector.track(imageView, drawable)) {
-            getHierarchy(imageView).n(1, drawable);
+            getHierarchy(imageView).o(1, drawable);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java
index 30fcc209e9..5b04c0f1d2 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap$getBitmaps$1.java
@@ -25,6 +25,6 @@ public final class MGImagesBitmap$getBitmaps$1<T, R> implements b<MGImagesBitmap
     }
 
     public final Observable<? extends Pair<String, Bitmap>> call(MGImagesBitmap.ImageRequest imageRequest) {
-        return MGImagesBitmap.INSTANCE.getBitmap(imageRequest.getImageUri(), imageRequest.getRoundAsCircle()).G(new AnonymousClass1(imageRequest));
+        return MGImagesBitmap.INSTANCE.getBitmap(imageRequest.getImageUri(), imageRequest.getRoundAsCircle()).F(new AnonymousClass1(imageRequest));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
index 19d1c748cd..f6935e8ede 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesBitmap.java
@@ -346,9 +346,9 @@ public final class MGImagesBitmap {
                 arrayList.add(obj);
             }
         }
-        Observable<CloseableBitmaps> Y = Observable.i0(new q(arrayList)).A(MGImagesBitmap$getBitmaps$1.INSTANCE).h0(MGImagesBitmap$getBitmaps$2.INSTANCE, MGImagesBitmap$getBitmaps$3.INSTANCE).G(MGImagesBitmap$getBitmaps$4.INSTANCE).Y(j0.p.a.a());
-        m.checkNotNullExpressionValue(Y, "Observable\n        .from…Schedulers.computation())");
-        return Y;
+        Observable<CloseableBitmaps> X = Observable.h0(new q(arrayList)).z(MGImagesBitmap$getBitmaps$1.INSTANCE).g0(MGImagesBitmap$getBitmaps$2.INSTANCE, MGImagesBitmap$getBitmaps$3.INSTANCE).F(MGImagesBitmap$getBitmaps$4.INSTANCE).X(j0.p.a.a());
+        m.checkNotNullExpressionValue(X, "Observable\n        .from…Schedulers.computation())");
+        return X;
     }
 
     private final boolean isValidUri(String str) {
@@ -369,9 +369,9 @@ public final class MGImagesBitmap {
     public final Observable<Bitmap> getBitmap(String str, boolean z2) {
         m.checkNotNullParameter(str, "imageUri");
         if (!isValidUri(str)) {
-            Observable<Bitmap> x2 = Observable.x(new IllegalArgumentException("invalid uri"));
-            m.checkNotNullExpressionValue(x2, "Observable.error(Illegal…Exception(\"invalid uri\"))");
-            return x2;
+            Observable<Bitmap> w = Observable.w(new IllegalArgumentException("invalid uri"));
+            m.checkNotNullExpressionValue(w, "Observable.error(Illegal…Exception(\"invalid uri\"))");
+            return w;
         }
         l lVar = l.a;
         AnimatableValueParser.y(lVar, "ImagePipelineFactory was not initialized!");
@@ -383,8 +383,8 @@ public final class MGImagesBitmap {
         if (z2) {
             imageRequest.j = new RoundAsCirclePostprocessor(str);
         }
-        Observable<Bitmap> i02 = Observable.i0(new MGImagesBitmap$getBitmap$1(hVar.a(imageRequest.a(), null, ImageRequest.c.FULL_FETCH, null, null), str));
-        m.checkNotNullExpressionValue(i02, "Observable.unsafeCreate …y emits the bitmap.\n    }");
-        return i02;
+        Observable<Bitmap> h02 = Observable.h0(new MGImagesBitmap$getBitmap$1(hVar.a(imageRequest.a(), null, ImageRequest.c.FULL_FETCH, null, null), str));
+        m.checkNotNullExpressionValue(h02, "Observable.unsafeCreate …y emits the bitmap.\n    }");
+        return h02;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java b/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java
index 75f0f641e8..aaf7290395 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1.java
@@ -18,6 +18,6 @@ public final class MGImagesConfig$getAppBitmapMemoryCacheParamsSupplier$1 extend
     public MemoryCacheParams get() {
         MemoryCacheParams memoryCacheParams = super.get();
         int i = memoryCacheParams.a;
-        return new MemoryCacheParams(i, memoryCacheParams.b, memoryCacheParams.f2169c, memoryCacheParams.d, i / 3, TimeUnit.MINUTES.toMillis(5));
+        return new MemoryCacheParams(i, memoryCacheParams.b, memoryCacheParams.f2175c, memoryCacheParams.d, i / 3, TimeUnit.MINUTES.toMillis(5));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java b/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
index f18390b8ef..e2f06cda43 100644
--- a/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
+++ b/app/src/main/java/com/discord/utilities/images/MGImagesConfig.java
@@ -42,7 +42,7 @@ public final class MGImagesConfig {
         DiskCacheConfig.b bVar = new DiskCacheConfig.b(context, null);
         bVar.b = new k(context.getCacheDir());
         bVar.a = str;
-        bVar.f2158c = 41943040;
+        bVar.f2164c = 41943040;
         DiskCacheConfig diskCacheConfig = new DiskCacheConfig(bVar);
         m.checkNotNullExpressionValue(diskCacheConfig, "DiskCacheConfig\n        …HE_SIZE)\n        .build()");
         return diskCacheConfig;
diff --git a/app/src/main/java/com/discord/utilities/intent/IntentUtils.java b/app/src/main/java/com/discord/utilities/intent/IntentUtils.java
index fe6dee5351..b456cda1fb 100644
--- a/app/src/main/java/com/discord/utilities/intent/IntentUtils.java
+++ b/app/src/main/java/com/discord/utilities/intent/IntentUtils.java
@@ -150,7 +150,7 @@ public final class IntentUtils {
         b bVar = b.F;
         Regex regex = b.u;
         RouteHandlers routeHandlers = RouteHandlers.INSTANCE;
-        pathRouterMap = h0.mapOf(o.to(b.t, IntentUtils$pathRouterMap$1.INSTANCE), o.to(regex, new IntentUtils$pathRouterMap$2(routeHandlers)), o.to(b.w, new IntentUtils$pathRouterMap$3(routeHandlers)), o.to(b.f49x, new IntentUtils$pathRouterMap$4(routeHandlers)), o.to(b.f51z, new IntentUtils$pathRouterMap$5(routeHandlers)), o.to(b.f50y, new IntentUtils$pathRouterMap$6(routeHandlers)), o.to(b.A, new IntentUtils$pathRouterMap$7(routeHandlers)), o.to(b.f48s, new IntentUtils$pathRouterMap$8(routeHandlers)), o.to(b.v, new IntentUtils$pathRouterMap$9(routeHandlers)), o.to(b.C, new IntentUtils$pathRouterMap$10(routeHandlers)), o.to(b.D, new IntentUtils$pathRouterMap$11(routeHandlers)), o.to(b.E, new IntentUtils$pathRouterMap$12(routeHandlers)), o.to(b.B, new IntentUtils$pathRouterMap$13(routeHandlers)), o.to(b.m, new IntentUtils$pathRouterMap$14(routeHandlers)));
+        pathRouterMap = h0.mapOf(o.to(b.t, IntentUtils$pathRouterMap$1.INSTANCE), o.to(regex, new IntentUtils$pathRouterMap$2(routeHandlers)), o.to(b.w, new IntentUtils$pathRouterMap$3(routeHandlers)), o.to(b.f48x, new IntentUtils$pathRouterMap$4(routeHandlers)), o.to(b.f50z, new IntentUtils$pathRouterMap$5(routeHandlers)), o.to(b.f49y, new IntentUtils$pathRouterMap$6(routeHandlers)), o.to(b.A, new IntentUtils$pathRouterMap$7(routeHandlers)), o.to(b.f47s, new IntentUtils$pathRouterMap$8(routeHandlers)), o.to(b.v, new IntentUtils$pathRouterMap$9(routeHandlers)), o.to(b.C, new IntentUtils$pathRouterMap$10(routeHandlers)), o.to(b.D, new IntentUtils$pathRouterMap$11(routeHandlers)), o.to(b.E, new IntentUtils$pathRouterMap$12(routeHandlers)), o.to(b.B, new IntentUtils$pathRouterMap$13(routeHandlers)), o.to(b.m, new IntentUtils$pathRouterMap$14(routeHandlers)));
     }
 
     private IntentUtils() {
@@ -196,8 +196,8 @@ public final class IntentUtils {
             AnimatableValueParser.z(new String(aVar.e), "setActionStatus is required before calling build().");
             aVar.a("actionToken", aVar.f);
             c.i.c.k.b bVar = null;
-            if ((aVar.f1282c == null ? null : new String(aVar.f1282c)) == null) {
-                aVar.f1282c = "AssistAction";
+            if ((aVar.f1279c == null ? null : new String(aVar.f1279c)) == null) {
+                aVar.f1279c = "AssistAction";
                 aVar.a("name", "AssistAction");
             }
             if ((aVar.d == null ? null : new String(aVar.d)) == null) {
@@ -207,9 +207,9 @@ public final class IntentUtils {
                 aVar.d = concat;
                 aVar.a("url", concat);
             }
-            AnimatableValueParser.z(aVar.f1282c, "setObject is required before calling build().");
+            AnimatableValueParser.z(aVar.f1279c, "setObject is required before calling build().");
             AnimatableValueParser.z(aVar.d, "setObject is required before calling build().");
-            zza zza = new zza(aVar.b, aVar.f1282c, aVar.d, null, new zzc(true), aVar.e, aVar.a);
+            zza zza = new zza(aVar.b, aVar.f1279c, aVar.d, null, new zzc(true), aVar.e, aVar.a);
             synchronized (c.i.c.k.b.class) {
                 WeakReference<c.i.c.k.b> weakReference = c.i.c.k.b.a;
                 if (weakReference != null) {
@@ -239,7 +239,7 @@ public final class IntentUtils {
 
     public static /* synthetic */ void performChooserSendIntent$default(Context context, String str, CharSequence charSequence, int i, Object obj) {
         if ((i & 4) != 0) {
-            charSequence = context.getString(2131893234);
+            charSequence = context.getString(2131893317);
             m.checkNotNullExpressionValue(charSequence, "context.getString(R.string.share)");
         }
         performChooserSendIntent(context, str, charSequence);
diff --git a/app/src/main/java/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.java b/app/src/main/java/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.java
index d4bd0e5ab5..2836a3a328 100644
--- a/app/src/main/java/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.java
+++ b/app/src/main/java/com/discord/utilities/intent/RouteHandlers$voiceConnect$1.java
@@ -36,7 +36,7 @@ public final class RouteHandlers$voiceConnect$1 extends o implements Function1<C
         if (context != null) {
             m.checkNotNullExpressionValue(context, "weakContext.get() ?: return@appSubscribe");
             m.checkNotNullExpressionValue(channel, "channel");
-            if (!AnimatableValueParser.r1(channel)) {
+            if (!AnimatableValueParser.s1(channel)) {
                 WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, context, this.$channelId, this.$isServicePermissionDeniedRedirect, null, null, 24, null);
             }
         }
diff --git a/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java b/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
index 97e2058b21..fe3033c3be 100644
--- a/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
+++ b/app/src/main/java/com/discord/utilities/intent/RouteHandlers.java
@@ -393,9 +393,9 @@ public final class RouteHandlers {
         long longValue = (matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = groupValues.get(1)) == null || (longOrNull = s.toLongOrNull(str)) == null) ? 0 : longOrNull.longValue();
         boolean booleanQueryParameter = uri.getBooleanQueryParameter("service_denied", false);
         WeakReference weakReference = new WeakReference(context);
-        Observable<R> G = StoreStream.Companion.getChannels().observeChannel(longValue).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(G, 0, false, 3, null)), RouteHandlers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new RouteHandlers$voiceConnect$1(weakReference, longValue, booleanQueryParameter), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getChannels().observeChannel(longValue).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null)), RouteHandlers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new RouteHandlers$voiceConnect$1(weakReference, longValue, booleanQueryParameter), 62, (Object) null);
         return new AnalyticsMetadata("voice", null, Long.valueOf(longValue), 2, null);
     }
 
diff --git a/app/src/main/java/com/discord/utilities/lazy/memberlist/ChannelMemberList.java b/app/src/main/java/com/discord/utilities/lazy/memberlist/ChannelMemberList.java
index 394a9efd2b..2efc6826f1 100644
--- a/app/src/main/java/com/discord/utilities/lazy/memberlist/ChannelMemberList.java
+++ b/app/src/main/java/com/discord/utilities/lazy/memberlist/ChannelMemberList.java
@@ -1,12 +1,10 @@
 package com.discord.utilities.lazy.memberlist;
 
-import a0.a.a.b;
-import androidx.annotation.ColorInt;
 import androidx.annotation.VisibleForTesting;
 import c.d.b.a.a;
 import com.discord.models.domain.ModelGuildMemberListUpdate;
-import com.discord.models.presence.Presence;
 import com.discord.utilities.collections.SparseMutableList;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
 import com.discord.utilities.logging.Logger;
 import d0.d0.f;
 import d0.t.g0;
@@ -24,430 +22,17 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.ranges.IntRange;
 /* compiled from: ChannelMemberList.kt */
-public final class ChannelMemberList {
+public final class ChannelMemberList implements MemberList {
     private SortedMap<Integer, String> groupIndices;
-    private Map<String, ? extends Row> groups;
+    private Map<String, ? extends MemberListRow> groups;
+    private final int initialSize;
     private final String listId;
     private final Logger logger;
-    private SparseMutableList<Row> rows;
-
-    /* compiled from: ChannelMemberList.kt */
-    public static abstract class Row {
-        private final String rowId;
-
-        /* compiled from: ChannelMemberList.kt */
-        public static final class Member extends Row {
-            private final String avatarUrl;
-            private final Integer color;
-            private final boolean isApplicationStreaming;
-            private final boolean isBot;
-            private final String name;
-            private final String premiumSince;
-            private final Presence presence;
-            private final boolean showOwnerIndicator;
-            private final Integer tagText;
-            private final boolean tagVerified;
-            private final long userId;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Member(long j, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5) {
-                super(String.valueOf(j), null);
-                m.checkNotNullParameter(str, "name");
-                this.userId = j;
-                this.name = str;
-                this.isBot = z2;
-                this.tagText = num;
-                this.tagVerified = z3;
-                this.presence = presence;
-                this.color = num2;
-                this.avatarUrl = str2;
-                this.showOwnerIndicator = z4;
-                this.premiumSince = str3;
-                this.isApplicationStreaming = z5;
-            }
-
-            public static /* synthetic */ Member copy$default(Member member, long j, String str, boolean z2, Integer num, boolean z3, Presence presence, Integer num2, String str2, boolean z4, String str3, boolean z5, int i, Object obj) {
-                return member.copy((i & 1) != 0 ? member.userId : j, (i & 2) != 0 ? member.name : str, (i & 4) != 0 ? member.isBot : z2, (i & 8) != 0 ? member.tagText : num, (i & 16) != 0 ? member.tagVerified : z3, (i & 32) != 0 ? member.presence : presence, (i & 64) != 0 ? member.color : num2, (i & 128) != 0 ? member.avatarUrl : str2, (i & 256) != 0 ? member.showOwnerIndicator : z4, (i & 512) != 0 ? member.premiumSince : str3, (i & 1024) != 0 ? member.isApplicationStreaming : z5);
-            }
-
-            public final long component1() {
-                return this.userId;
-            }
-
-            public final String component10() {
-                return this.premiumSince;
-            }
-
-            public final boolean component11() {
-                return this.isApplicationStreaming;
-            }
-
-            public final String component2() {
-                return this.name;
-            }
-
-            public final boolean component3() {
-                return this.isBot;
-            }
-
-            public final Integer component4() {
-                return this.tagText;
-            }
-
-            public final boolean component5() {
-                return this.tagVerified;
-            }
-
-            public final Presence component6() {
-                return this.presence;
-            }
-
-            public final Integer component7() {
-                return this.color;
-            }
-
-            public final String component8() {
-                return this.avatarUrl;
-            }
-
-            public final boolean component9() {
-                return this.showOwnerIndicator;
-            }
-
-            public final Member copy(long j, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5) {
-                m.checkNotNullParameter(str, "name");
-                return new Member(j, str, z2, num, z3, presence, num2, str2, z4, str3, z5);
-            }
-
-            public boolean equals(Object obj) {
-                if (this == obj) {
-                    return true;
-                }
-                if (!(obj instanceof Member)) {
-                    return false;
-                }
-                Member member = (Member) obj;
-                return this.userId == member.userId && m.areEqual(this.name, member.name) && this.isBot == member.isBot && m.areEqual(this.tagText, member.tagText) && this.tagVerified == member.tagVerified && m.areEqual(this.presence, member.presence) && m.areEqual(this.color, member.color) && m.areEqual(this.avatarUrl, member.avatarUrl) && this.showOwnerIndicator == member.showOwnerIndicator && m.areEqual(this.premiumSince, member.premiumSince) && this.isApplicationStreaming == member.isApplicationStreaming;
-            }
-
-            public final String getAvatarUrl() {
-                return this.avatarUrl;
-            }
-
-            public final Integer getColor() {
-                return this.color;
-            }
-
-            public final String getName() {
-                return this.name;
-            }
-
-            public final String getPremiumSince() {
-                return this.premiumSince;
-            }
-
-            public final Presence getPresence() {
-                return this.presence;
-            }
-
-            public final boolean getShowOwnerIndicator() {
-                return this.showOwnerIndicator;
-            }
-
-            public final Integer getTagText() {
-                return this.tagText;
-            }
-
-            public final boolean getTagVerified() {
-                return this.tagVerified;
-            }
-
-            public final long getUserId() {
-                return this.userId;
-            }
-
-            public int hashCode() {
-                int a = b.a(this.userId) * 31;
-                String str = this.name;
-                int i = 0;
-                int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
-                boolean z2 = this.isBot;
-                int i2 = 1;
-                if (z2) {
-                    z2 = true;
-                }
-                int i3 = z2 ? 1 : 0;
-                int i4 = z2 ? 1 : 0;
-                int i5 = z2 ? 1 : 0;
-                int i6 = (hashCode + i3) * 31;
-                Integer num = this.tagText;
-                int hashCode2 = (i6 + (num != null ? num.hashCode() : 0)) * 31;
-                boolean z3 = this.tagVerified;
-                if (z3) {
-                    z3 = true;
-                }
-                int i7 = z3 ? 1 : 0;
-                int i8 = z3 ? 1 : 0;
-                int i9 = z3 ? 1 : 0;
-                int i10 = (hashCode2 + i7) * 31;
-                Presence presence = this.presence;
-                int hashCode3 = (i10 + (presence != null ? presence.hashCode() : 0)) * 31;
-                Integer num2 = this.color;
-                int hashCode4 = (hashCode3 + (num2 != null ? num2.hashCode() : 0)) * 31;
-                String str2 = this.avatarUrl;
-                int hashCode5 = (hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31;
-                boolean z4 = this.showOwnerIndicator;
-                if (z4) {
-                    z4 = true;
-                }
-                int i11 = z4 ? 1 : 0;
-                int i12 = z4 ? 1 : 0;
-                int i13 = z4 ? 1 : 0;
-                int i14 = (hashCode5 + i11) * 31;
-                String str3 = this.premiumSince;
-                if (str3 != null) {
-                    i = str3.hashCode();
-                }
-                int i15 = (i14 + i) * 31;
-                boolean z5 = this.isApplicationStreaming;
-                if (!z5) {
-                    i2 = z5 ? 1 : 0;
-                }
-                return i15 + i2;
-            }
-
-            public final boolean isApplicationStreaming() {
-                return this.isApplicationStreaming;
-            }
-
-            public final boolean isBot() {
-                return this.isBot;
-            }
-
-            public String toString() {
-                StringBuilder L = a.L("Member(userId=");
-                L.append(this.userId);
-                L.append(", name=");
-                L.append(this.name);
-                L.append(", isBot=");
-                L.append(this.isBot);
-                L.append(", tagText=");
-                L.append(this.tagText);
-                L.append(", tagVerified=");
-                L.append(this.tagVerified);
-                L.append(", presence=");
-                L.append(this.presence);
-                L.append(", color=");
-                L.append(this.color);
-                L.append(", avatarUrl=");
-                L.append(this.avatarUrl);
-                L.append(", showOwnerIndicator=");
-                L.append(this.showOwnerIndicator);
-                L.append(", premiumSince=");
-                L.append(this.premiumSince);
-                L.append(", isApplicationStreaming=");
-                return a.G(L, this.isApplicationStreaming, ")");
-            }
-        }
-
-        /* compiled from: ChannelMemberList.kt */
-        public static final class RoleHeader extends Row {
-            private final int memberCount;
-            private final long roleId;
-            private final String roleName;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public RoleHeader(long j, String str, int i) {
-                super(String.valueOf(j), null);
-                m.checkNotNullParameter(str, "roleName");
-                this.roleId = j;
-                this.roleName = str;
-                this.memberCount = i;
-            }
-
-            public static /* synthetic */ RoleHeader copy$default(RoleHeader roleHeader, long j, String str, int i, int i2, Object obj) {
-                if ((i2 & 1) != 0) {
-                    j = roleHeader.roleId;
-                }
-                if ((i2 & 2) != 0) {
-                    str = roleHeader.roleName;
-                }
-                if ((i2 & 4) != 0) {
-                    i = roleHeader.memberCount;
-                }
-                return roleHeader.copy(j, str, i);
-            }
-
-            public final long component1() {
-                return this.roleId;
-            }
-
-            public final String component2() {
-                return this.roleName;
-            }
-
-            public final int component3() {
-                return this.memberCount;
-            }
-
-            public final RoleHeader copy(long j, String str, int i) {
-                m.checkNotNullParameter(str, "roleName");
-                return new RoleHeader(j, str, i);
-            }
-
-            public boolean equals(Object obj) {
-                if (this == obj) {
-                    return true;
-                }
-                if (!(obj instanceof RoleHeader)) {
-                    return false;
-                }
-                RoleHeader roleHeader = (RoleHeader) obj;
-                return this.roleId == roleHeader.roleId && m.areEqual(this.roleName, roleHeader.roleName) && this.memberCount == roleHeader.memberCount;
-            }
-
-            public final int getMemberCount() {
-                return this.memberCount;
-            }
-
-            public final long getRoleId() {
-                return this.roleId;
-            }
-
-            public final String getRoleName() {
-                return this.roleName;
-            }
-
-            public int hashCode() {
-                int a = b.a(this.roleId) * 31;
-                String str = this.roleName;
-                return ((a + (str != null ? str.hashCode() : 0)) * 31) + this.memberCount;
-            }
-
-            public String toString() {
-                StringBuilder L = a.L("RoleHeader(roleId=");
-                L.append(this.roleId);
-                L.append(", roleName=");
-                L.append(this.roleName);
-                L.append(", memberCount=");
-                return a.z(L, this.memberCount, ")");
-            }
-        }
-
-        /* compiled from: ChannelMemberList.kt */
-        public static final class StatusHeader extends Row {
-            private final int memberCount;
-            private final String rowId;
-            private final Type type;
-
-            /* compiled from: ChannelMemberList.kt */
-            public enum Type {
-                ONLINE,
-                OFFLINE
-            }
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public StatusHeader(String str, Type type, int i) {
-                super(str, null);
-                m.checkNotNullParameter(str, "rowId");
-                m.checkNotNullParameter(type, "type");
-                this.rowId = str;
-                this.type = type;
-                this.memberCount = i;
-            }
-
-            public static /* synthetic */ StatusHeader copy$default(StatusHeader statusHeader, String str, Type type, int i, int i2, Object obj) {
-                if ((i2 & 1) != 0) {
-                    str = statusHeader.getRowId();
-                }
-                if ((i2 & 2) != 0) {
-                    type = statusHeader.type;
-                }
-                if ((i2 & 4) != 0) {
-                    i = statusHeader.memberCount;
-                }
-                return statusHeader.copy(str, type, i);
-            }
-
-            public final String component1() {
-                return getRowId();
-            }
-
-            public final Type component2() {
-                return this.type;
-            }
-
-            public final int component3() {
-                return this.memberCount;
-            }
-
-            public final StatusHeader copy(String str, Type type, int i) {
-                m.checkNotNullParameter(str, "rowId");
-                m.checkNotNullParameter(type, "type");
-                return new StatusHeader(str, type, i);
-            }
-
-            public boolean equals(Object obj) {
-                if (this == obj) {
-                    return true;
-                }
-                if (!(obj instanceof StatusHeader)) {
-                    return false;
-                }
-                StatusHeader statusHeader = (StatusHeader) obj;
-                return m.areEqual(getRowId(), statusHeader.getRowId()) && m.areEqual(this.type, statusHeader.type) && this.memberCount == statusHeader.memberCount;
-            }
-
-            public final int getMemberCount() {
-                return this.memberCount;
-            }
-
-            @Override // com.discord.utilities.lazy.memberlist.ChannelMemberList.Row
-            public String getRowId() {
-                return this.rowId;
-            }
-
-            public final Type getType() {
-                return this.type;
-            }
-
-            public int hashCode() {
-                String rowId = getRowId();
-                int i = 0;
-                int hashCode = (rowId != null ? rowId.hashCode() : 0) * 31;
-                Type type = this.type;
-                if (type != null) {
-                    i = type.hashCode();
-                }
-                return ((hashCode + i) * 31) + this.memberCount;
-            }
-
-            public String toString() {
-                StringBuilder L = a.L("StatusHeader(rowId=");
-                L.append(getRowId());
-                L.append(", type=");
-                L.append(this.type);
-                L.append(", memberCount=");
-                return a.z(L, this.memberCount, ")");
-            }
-        }
-
-        private Row(String str) {
-            this.rowId = str;
-        }
-
-        public /* synthetic */ Row(String str, DefaultConstructorMarker defaultConstructorMarker) {
-            this(str);
-        }
-
-        public String getRowId() {
-            return this.rowId;
-        }
-    }
+    private SparseMutableList<MemberListRow> rows;
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public ChannelMemberList(ChannelMemberList channelMemberList) {
-        this(channelMemberList.listId, 0, channelMemberList.logger, 2, null);
+        this(channelMemberList.getListId(), 0, channelMemberList.logger, 2, null);
         m.checkNotNullParameter(channelMemberList, "other");
         this.rows = channelMemberList.rows.deepCopy();
         this.groups = new HashMap(channelMemberList.groups);
@@ -457,8 +42,9 @@ public final class ChannelMemberList {
     public ChannelMemberList(String str, int i, Logger logger) {
         m.checkNotNullParameter(str, "listId");
         this.listId = str;
+        this.initialSize = i;
         this.logger = logger;
-        this.rows = new SparseMutableList<>(i, 100);
+        this.rows = new SparseMutableList<>(getInitialSize(), 100);
         this.groups = h0.emptyMap();
         this.groupIndices = new TreeMap();
     }
@@ -468,22 +54,22 @@ public final class ChannelMemberList {
         this(str, (i2 & 2) != 0 ? 0 : i, (i2 & 4) != 0 ? null : logger);
     }
 
-    public final void add(Row row) {
+    public final void add(MemberListRow memberListRow) {
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" ADD");
             logger.recordBreadcrumb(L.toString(), "ChannelMemberList");
         }
-        this.rows.add(row);
+        this.rows.add(memberListRow);
     }
 
     public final void delete(int i) {
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" DELETE index: ");
             L.append(i);
             logger.recordBreadcrumb(L.toString(), "ChannelMemberList");
@@ -491,32 +77,41 @@ public final class ChannelMemberList {
         this.rows.remove(i);
     }
 
-    public final SortedMap<Integer, String> getGroupIndices() {
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public SortedMap<Integer, String> getGroupIndices() {
         return this.groupIndices;
     }
 
-    public final String getListId() {
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public int getInitialSize() {
+        return this.initialSize;
+    }
+
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public String getListId() {
         return this.listId;
     }
 
-    public final SparseMutableList<Row> getRows() {
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public SparseMutableList<MemberListRow> getRows() {
         return this.rows;
     }
 
-    public final int getSize() {
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public int getSize() {
         return this.rows.size();
     }
 
-    public final void insert(int i, Row row) {
+    public final void insert(int i, MemberListRow memberListRow) {
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" INSERT: index: ");
             L.append(i);
             logger.recordBreadcrumb(L.toString(), "ChannelMemberList");
         }
-        this.rows.add(i, row);
+        this.rows.add(i, memberListRow);
     }
 
     public final void invalidate(IntRange intRange) {
@@ -524,7 +119,7 @@ public final class ChannelMemberList {
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" INVALIDATE range: ");
             L.append(intRange);
             logger.recordBreadcrumb(L.toString(), "ChannelMemberList");
@@ -543,19 +138,19 @@ public final class ChannelMemberList {
         }
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r2v4, resolved type: com.discord.utilities.collections.SparseMutableList<com.discord.utilities.lazy.memberlist.ChannelMemberList$Row> */
+    /* JADX DEBUG: Multi-variable search result rejected for r2v4, resolved type: com.discord.utilities.collections.SparseMutableList<com.discord.utilities.lazy.memberlist.MemberListRow> */
     /* JADX WARN: Multi-variable type inference failed */
-    public final void rebuildMembers(Function1<? super Long, ? extends Row> function1) {
+    public final void rebuildMembers(Function1<? super Long, ? extends MemberListRow> function1) {
         m.checkNotNullParameter(function1, "makeMember");
         int i = 0;
-        for (Row row : this.rows) {
+        for (MemberListRow memberListRow : this.rows) {
             int i2 = i + 1;
             if (i < 0) {
                 n.throwIndexOverflow();
             }
-            Row row2 = row;
-            if (row2 instanceof Row.Member) {
-                this.rows.set(i, function1.invoke(Long.valueOf(((Row.Member) row2).getUserId())));
+            MemberListRow memberListRow2 = memberListRow;
+            if (memberListRow2 instanceof MemberListRow.Member) {
+                this.rows.set(i, function1.invoke(Long.valueOf(((MemberListRow.Member) memberListRow2).getUserId())));
             }
             i = i2;
         }
@@ -567,13 +162,13 @@ public final class ChannelMemberList {
         this.groupIndices = sortedMap;
     }
 
-    public final void setGroups(List<ModelGuildMemberListUpdate.Group> list, Function1<? super ModelGuildMemberListUpdate.Group, ? extends Row> function1) {
+    public final void setGroups(List<ModelGuildMemberListUpdate.Group> list, Function1<? super ModelGuildMemberListUpdate.Group, ? extends MemberListRow> function1) {
         m.checkNotNullParameter(list, "groups");
         m.checkNotNullParameter(function1, "makeGroup");
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" SET_GROUPS");
             logger.recordBreadcrumb(L.toString(), "ChannelMemberList");
         }
@@ -584,18 +179,18 @@ public final class ChannelMemberList {
             String id2 = group.getId();
             this.groupIndices.put(Integer.valueOf(i), group.getId());
             i += group.getCount() + 1;
-            linkedHashMap.put(id2, (Row) function1.invoke(group));
+            linkedHashMap.put(id2, (MemberListRow) function1.invoke(group));
         }
         this.groups = linkedHashMap;
         this.rows.setSize(i);
     }
 
-    public final void sync(int i, List<? extends Row> list) {
+    public final void sync(int i, List<? extends MemberListRow> list) {
         m.checkNotNullParameter(list, "items");
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" SYNC: startIndex: ");
             L.append(i);
             L.append(" -- items size: ");
@@ -608,20 +203,20 @@ public final class ChannelMemberList {
             if (i2 < 0) {
                 n.throwIndexOverflow();
             }
-            update(i2 + i, (Row) obj);
+            update(i2 + i, (MemberListRow) obj);
             i2 = i3;
         }
     }
 
-    public final void update(int i, Row row) {
+    public final void update(int i, MemberListRow memberListRow) {
         Logger logger = this.logger;
         if (logger != null) {
             StringBuilder L = a.L("memberListId: ");
-            L.append(this.listId);
+            L.append(getListId());
             L.append(" UPDATE index: ");
             L.append(i);
             logger.recordBreadcrumb(L.toString(), "ChannelMemberList");
         }
-        this.rows.set(i, row);
+        this.rows.set(i, memberListRow);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberList.java b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberList.java
new file mode 100644
index 0000000000..f48c461ba7
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberList.java
@@ -0,0 +1,16 @@
+package com.discord.utilities.lazy.memberlist;
+
+import com.discord.utilities.collections.SparseMutableList;
+import java.util.SortedMap;
+/* compiled from: MemberList.kt */
+public interface MemberList {
+    SortedMap<Integer, String> getGroupIndices();
+
+    int getInitialSize();
+
+    String getListId();
+
+    SparseMutableList<MemberListRow> getRows();
+
+    int getSize();
+}
diff --git a/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
new file mode 100644
index 0000000000..fa7ef207b1
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/lazy/memberlist/MemberListRow.java
@@ -0,0 +1,433 @@
+package com.discord.utilities.lazy.memberlist;
+
+import a0.a.a.b;
+import androidx.annotation.ColorInt;
+import c.d.b.a.a;
+import com.discord.models.presence.Presence;
+import d0.z.d.m;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: MemberListRow.kt */
+public abstract class MemberListRow {
+    private final String rowId;
+
+    /* compiled from: MemberListRow.kt */
+    public static final class Member extends MemberListRow {
+        private final String avatarUrl;
+        private final Integer color;
+        private final boolean isApplicationStreaming;
+        private final boolean isBot;
+        private final String name;
+        private final String premiumSince;
+        private final Presence presence;
+        private final boolean showOwnerIndicator;
+        private final Integer tagText;
+        private final boolean tagVerified;
+        private final long userId;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public Member(long j, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5) {
+            super(String.valueOf(j), null);
+            m.checkNotNullParameter(str, "name");
+            this.userId = j;
+            this.name = str;
+            this.isBot = z2;
+            this.tagText = num;
+            this.tagVerified = z3;
+            this.presence = presence;
+            this.color = num2;
+            this.avatarUrl = str2;
+            this.showOwnerIndicator = z4;
+            this.premiumSince = str3;
+            this.isApplicationStreaming = z5;
+        }
+
+        public static /* synthetic */ Member copy$default(Member member, long j, String str, boolean z2, Integer num, boolean z3, Presence presence, Integer num2, String str2, boolean z4, String str3, boolean z5, int i, Object obj) {
+            return member.copy((i & 1) != 0 ? member.userId : j, (i & 2) != 0 ? member.name : str, (i & 4) != 0 ? member.isBot : z2, (i & 8) != 0 ? member.tagText : num, (i & 16) != 0 ? member.tagVerified : z3, (i & 32) != 0 ? member.presence : presence, (i & 64) != 0 ? member.color : num2, (i & 128) != 0 ? member.avatarUrl : str2, (i & 256) != 0 ? member.showOwnerIndicator : z4, (i & 512) != 0 ? member.premiumSince : str3, (i & 1024) != 0 ? member.isApplicationStreaming : z5);
+        }
+
+        public final long component1() {
+            return this.userId;
+        }
+
+        public final String component10() {
+            return this.premiumSince;
+        }
+
+        public final boolean component11() {
+            return this.isApplicationStreaming;
+        }
+
+        public final String component2() {
+            return this.name;
+        }
+
+        public final boolean component3() {
+            return this.isBot;
+        }
+
+        public final Integer component4() {
+            return this.tagText;
+        }
+
+        public final boolean component5() {
+            return this.tagVerified;
+        }
+
+        public final Presence component6() {
+            return this.presence;
+        }
+
+        public final Integer component7() {
+            return this.color;
+        }
+
+        public final String component8() {
+            return this.avatarUrl;
+        }
+
+        public final boolean component9() {
+            return this.showOwnerIndicator;
+        }
+
+        public final Member copy(long j, String str, boolean z2, Integer num, boolean z3, Presence presence, @ColorInt Integer num2, String str2, boolean z4, String str3, boolean z5) {
+            m.checkNotNullParameter(str, "name");
+            return new Member(j, str, z2, num, z3, presence, num2, str2, z4, str3, z5);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof Member)) {
+                return false;
+            }
+            Member member = (Member) obj;
+            return this.userId == member.userId && m.areEqual(this.name, member.name) && this.isBot == member.isBot && m.areEqual(this.tagText, member.tagText) && this.tagVerified == member.tagVerified && m.areEqual(this.presence, member.presence) && m.areEqual(this.color, member.color) && m.areEqual(this.avatarUrl, member.avatarUrl) && this.showOwnerIndicator == member.showOwnerIndicator && m.areEqual(this.premiumSince, member.premiumSince) && this.isApplicationStreaming == member.isApplicationStreaming;
+        }
+
+        public final String getAvatarUrl() {
+            return this.avatarUrl;
+        }
+
+        public final Integer getColor() {
+            return this.color;
+        }
+
+        public final String getName() {
+            return this.name;
+        }
+
+        public final String getPremiumSince() {
+            return this.premiumSince;
+        }
+
+        public final Presence getPresence() {
+            return this.presence;
+        }
+
+        public final boolean getShowOwnerIndicator() {
+            return this.showOwnerIndicator;
+        }
+
+        public final Integer getTagText() {
+            return this.tagText;
+        }
+
+        public final boolean getTagVerified() {
+            return this.tagVerified;
+        }
+
+        public final long getUserId() {
+            return this.userId;
+        }
+
+        public int hashCode() {
+            int a = b.a(this.userId) * 31;
+            String str = this.name;
+            int i = 0;
+            int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
+            boolean z2 = this.isBot;
+            int i2 = 1;
+            if (z2) {
+                z2 = true;
+            }
+            int i3 = z2 ? 1 : 0;
+            int i4 = z2 ? 1 : 0;
+            int i5 = z2 ? 1 : 0;
+            int i6 = (hashCode + i3) * 31;
+            Integer num = this.tagText;
+            int hashCode2 = (i6 + (num != null ? num.hashCode() : 0)) * 31;
+            boolean z3 = this.tagVerified;
+            if (z3) {
+                z3 = true;
+            }
+            int i7 = z3 ? 1 : 0;
+            int i8 = z3 ? 1 : 0;
+            int i9 = z3 ? 1 : 0;
+            int i10 = (hashCode2 + i7) * 31;
+            Presence presence = this.presence;
+            int hashCode3 = (i10 + (presence != null ? presence.hashCode() : 0)) * 31;
+            Integer num2 = this.color;
+            int hashCode4 = (hashCode3 + (num2 != null ? num2.hashCode() : 0)) * 31;
+            String str2 = this.avatarUrl;
+            int hashCode5 = (hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31;
+            boolean z4 = this.showOwnerIndicator;
+            if (z4) {
+                z4 = true;
+            }
+            int i11 = z4 ? 1 : 0;
+            int i12 = z4 ? 1 : 0;
+            int i13 = z4 ? 1 : 0;
+            int i14 = (hashCode5 + i11) * 31;
+            String str3 = this.premiumSince;
+            if (str3 != null) {
+                i = str3.hashCode();
+            }
+            int i15 = (i14 + i) * 31;
+            boolean z5 = this.isApplicationStreaming;
+            if (!z5) {
+                i2 = z5 ? 1 : 0;
+            }
+            return i15 + i2;
+        }
+
+        public final boolean isApplicationStreaming() {
+            return this.isApplicationStreaming;
+        }
+
+        public final boolean isBot() {
+            return this.isBot;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("Member(userId=");
+            L.append(this.userId);
+            L.append(", name=");
+            L.append(this.name);
+            L.append(", isBot=");
+            L.append(this.isBot);
+            L.append(", tagText=");
+            L.append(this.tagText);
+            L.append(", tagVerified=");
+            L.append(this.tagVerified);
+            L.append(", presence=");
+            L.append(this.presence);
+            L.append(", color=");
+            L.append(this.color);
+            L.append(", avatarUrl=");
+            L.append(this.avatarUrl);
+            L.append(", showOwnerIndicator=");
+            L.append(this.showOwnerIndicator);
+            L.append(", premiumSince=");
+            L.append(this.premiumSince);
+            L.append(", isApplicationStreaming=");
+            return a.G(L, this.isApplicationStreaming, ")");
+        }
+    }
+
+    /* compiled from: MemberListRow.kt */
+    public static final class RoleHeader extends MemberListRow {
+        private final int memberCount;
+        private final long roleId;
+        private final String roleName;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public RoleHeader(long j, String str, int i) {
+            super(String.valueOf(j), null);
+            m.checkNotNullParameter(str, "roleName");
+            this.roleId = j;
+            this.roleName = str;
+            this.memberCount = i;
+        }
+
+        public static /* synthetic */ RoleHeader copy$default(RoleHeader roleHeader, long j, String str, int i, int i2, Object obj) {
+            if ((i2 & 1) != 0) {
+                j = roleHeader.roleId;
+            }
+            if ((i2 & 2) != 0) {
+                str = roleHeader.roleName;
+            }
+            if ((i2 & 4) != 0) {
+                i = roleHeader.memberCount;
+            }
+            return roleHeader.copy(j, str, i);
+        }
+
+        public final long component1() {
+            return this.roleId;
+        }
+
+        public final String component2() {
+            return this.roleName;
+        }
+
+        public final int component3() {
+            return this.memberCount;
+        }
+
+        public final RoleHeader copy(long j, String str, int i) {
+            m.checkNotNullParameter(str, "roleName");
+            return new RoleHeader(j, str, i);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof RoleHeader)) {
+                return false;
+            }
+            RoleHeader roleHeader = (RoleHeader) obj;
+            return this.roleId == roleHeader.roleId && m.areEqual(this.roleName, roleHeader.roleName) && this.memberCount == roleHeader.memberCount;
+        }
+
+        public final int getMemberCount() {
+            return this.memberCount;
+        }
+
+        public final long getRoleId() {
+            return this.roleId;
+        }
+
+        public final String getRoleName() {
+            return this.roleName;
+        }
+
+        public int hashCode() {
+            int a = b.a(this.roleId) * 31;
+            String str = this.roleName;
+            return ((a + (str != null ? str.hashCode() : 0)) * 31) + this.memberCount;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("RoleHeader(roleId=");
+            L.append(this.roleId);
+            L.append(", roleName=");
+            L.append(this.roleName);
+            L.append(", memberCount=");
+            return a.z(L, this.memberCount, ")");
+        }
+    }
+
+    /* compiled from: MemberListRow.kt */
+    public static final class StatusHeader extends MemberListRow {
+        private final int memberCount;
+        private final String rowId;
+        private final Type type;
+
+        /* compiled from: MemberListRow.kt */
+        public enum Type {
+            ONLINE(0),
+            OFFLINE(1);
+            
+
+            /* renamed from: id  reason: collision with root package name */
+            private final long f2112id;
+
+            private Type(long j) {
+                this.f2112id = j;
+            }
+
+            public final long getId() {
+                return this.f2112id;
+            }
+        }
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public StatusHeader(String str, Type type, int i) {
+            super(str, null);
+            m.checkNotNullParameter(str, "rowId");
+            m.checkNotNullParameter(type, "type");
+            this.rowId = str;
+            this.type = type;
+            this.memberCount = i;
+        }
+
+        public static /* synthetic */ StatusHeader copy$default(StatusHeader statusHeader, String str, Type type, int i, int i2, Object obj) {
+            if ((i2 & 1) != 0) {
+                str = statusHeader.getRowId();
+            }
+            if ((i2 & 2) != 0) {
+                type = statusHeader.type;
+            }
+            if ((i2 & 4) != 0) {
+                i = statusHeader.memberCount;
+            }
+            return statusHeader.copy(str, type, i);
+        }
+
+        public final String component1() {
+            return getRowId();
+        }
+
+        public final Type component2() {
+            return this.type;
+        }
+
+        public final int component3() {
+            return this.memberCount;
+        }
+
+        public final StatusHeader copy(String str, Type type, int i) {
+            m.checkNotNullParameter(str, "rowId");
+            m.checkNotNullParameter(type, "type");
+            return new StatusHeader(str, type, i);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof StatusHeader)) {
+                return false;
+            }
+            StatusHeader statusHeader = (StatusHeader) obj;
+            return m.areEqual(getRowId(), statusHeader.getRowId()) && m.areEqual(this.type, statusHeader.type) && this.memberCount == statusHeader.memberCount;
+        }
+
+        public final int getMemberCount() {
+            return this.memberCount;
+        }
+
+        @Override // com.discord.utilities.lazy.memberlist.MemberListRow
+        public String getRowId() {
+            return this.rowId;
+        }
+
+        public final Type getType() {
+            return this.type;
+        }
+
+        public int hashCode() {
+            String rowId = getRowId();
+            int i = 0;
+            int hashCode = (rowId != null ? rowId.hashCode() : 0) * 31;
+            Type type = this.type;
+            if (type != null) {
+                i = type.hashCode();
+            }
+            return ((hashCode + i) * 31) + this.memberCount;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("StatusHeader(rowId=");
+            L.append(getRowId());
+            L.append(", type=");
+            L.append(this.type);
+            L.append(", memberCount=");
+            return a.z(L, this.memberCount, ")");
+        }
+    }
+
+    private MemberListRow(String str) {
+        this.rowId = str;
+    }
+
+    public /* synthetic */ MemberListRow(String str, DefaultConstructorMarker defaultConstructorMarker) {
+        this(str);
+    }
+
+    public String getRowId() {
+        return this.rowId;
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/lazy/memberlist/ThreadMemberList.java b/app/src/main/java/com/discord/utilities/lazy/memberlist/ThreadMemberList.java
new file mode 100644
index 0000000000..b7fe749cee
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/lazy/memberlist/ThreadMemberList.java
@@ -0,0 +1,56 @@
+package com.discord.utilities.lazy.memberlist;
+
+import com.discord.utilities.collections.SparseMutableList;
+import d0.z.d.m;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: ThreadMemberList.kt */
+public final class ThreadMemberList implements MemberList {
+    private SortedMap<Integer, String> groupIndices;
+    private final int initialSize;
+    private final String listId;
+    private SparseMutableList<MemberListRow> rows;
+
+    public ThreadMemberList(String str, int i) {
+        m.checkNotNullParameter(str, "listId");
+        this.listId = str;
+        this.initialSize = i;
+        this.rows = new SparseMutableList<>(getInitialSize(), 100);
+        this.groupIndices = new TreeMap();
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ ThreadMemberList(String str, int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
+        this(str, (i2 & 2) != 0 ? 0 : i);
+    }
+
+    public final void add(MemberListRow memberListRow) {
+        this.rows.add(memberListRow);
+    }
+
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public SortedMap<Integer, String> getGroupIndices() {
+        return this.groupIndices;
+    }
+
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public int getInitialSize() {
+        return this.initialSize;
+    }
+
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public String getListId() {
+        return this.listId;
+    }
+
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public SparseMutableList<MemberListRow> getRows() {
+        return this.rows;
+    }
+
+    @Override // com.discord.utilities.lazy.memberlist.MemberList
+    public int getSize() {
+        return this.rows.size();
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java
index 0218221f88..c8c4b7cfef 100644
--- a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildMemberSubscriptionsManager.java
@@ -105,9 +105,9 @@ public final class GuildMemberSubscriptionsManager {
 
     private final void triggerUnsubscribe() {
         if (this.delayedFlushSubscription == null) {
-            Observable<Long> f02 = Observable.f0(20, TimeUnit.SECONDS, this.delayScheduler);
-            m.checkNotNullExpressionValue(f02, "Observable\n          .ti….SECONDS, delayScheduler)");
-            ObservableExtensionsKt.appSubscribe$default(f02, GuildMemberSubscriptionsManager.class, (Context) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$1(this), (Function1) null, (Function0) null, (Function0) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$2(this), 58, (Object) null);
+            Observable<Long> e02 = Observable.e0(20, TimeUnit.SECONDS, this.delayScheduler);
+            m.checkNotNullExpressionValue(e02, "Observable\n          .ti….SECONDS, delayScheduler)");
+            ObservableExtensionsKt.appSubscribe$default(e02, GuildMemberSubscriptionsManager.class, (Context) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$1(this), (Function1) null, (Function0) null, (Function0) null, new GuildMemberSubscriptionsManager$triggerUnsubscribe$2(this), 58, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.java
index 626f434879..3951e1d074 100644
--- a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.java
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptions.java
@@ -15,32 +15,34 @@ public final class GuildSubscriptions {
     private final Map<Long, List<IntRange>> channels;
     private final Set<Long> members;
     private final Lazy serializedRanges$delegate;
+    private final List<Long> threadMemberLists;
     private final Boolean threads;
     private final Boolean typing;
 
     public GuildSubscriptions() {
-        this(null, null, null, null, null, 31, null);
+        this(null, null, null, null, null, null, 63, null);
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.List<kotlin.ranges.IntRange>> */
     /* JADX WARN: Multi-variable type inference failed */
-    public GuildSubscriptions(Map<Long, ? extends List<IntRange>> map, Boolean bool, Boolean bool2, Set<Long> set, Boolean bool3) {
+    public GuildSubscriptions(Map<Long, ? extends List<IntRange>> map, Boolean bool, Boolean bool2, Set<Long> set, Boolean bool3, List<Long> list) {
         this.channels = map;
         this.typing = bool;
         this.activities = bool2;
         this.members = set;
         this.threads = bool3;
+        this.threadMemberLists = list;
         this.serializedRanges$delegate = g.lazy(new GuildSubscriptions$serializedRanges$2(this));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ GuildSubscriptions(Map map, Boolean bool, Boolean bool2, Set set, Boolean bool3, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i & 1) != 0 ? null : map, (i & 2) != 0 ? null : bool, (i & 4) != 0 ? null : bool2, (i & 8) != 0 ? null : set, (i & 16) != 0 ? null : bool3);
+    public /* synthetic */ GuildSubscriptions(Map map, Boolean bool, Boolean bool2, Set set, Boolean bool3, List list, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this((i & 1) != 0 ? null : map, (i & 2) != 0 ? null : bool, (i & 4) != 0 ? null : bool2, (i & 8) != 0 ? null : set, (i & 16) != 0 ? null : bool3, (i & 32) != 0 ? null : list);
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.utilities.lazy.subscriptions.GuildSubscriptions */
+    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.utilities.lazy.subscriptions.GuildSubscriptions */
     /* JADX WARN: Multi-variable type inference failed */
-    public static /* synthetic */ GuildSubscriptions copy$default(GuildSubscriptions guildSubscriptions, Map map, Boolean bool, Boolean bool2, Set set, Boolean bool3, int i, Object obj) {
+    public static /* synthetic */ GuildSubscriptions copy$default(GuildSubscriptions guildSubscriptions, Map map, Boolean bool, Boolean bool2, Set set, Boolean bool3, List list, int i, Object obj) {
         if ((i & 1) != 0) {
             map = guildSubscriptions.channels;
         }
@@ -56,7 +58,10 @@ public final class GuildSubscriptions {
         if ((i & 16) != 0) {
             bool3 = guildSubscriptions.threads;
         }
-        return guildSubscriptions.copy(map, bool, bool2, set, bool3);
+        if ((i & 32) != 0) {
+            list = guildSubscriptions.threadMemberLists;
+        }
+        return guildSubscriptions.copy(map, bool, bool2, set, bool3, list);
     }
 
     public final Map<Long, List<IntRange>> component1() {
@@ -79,8 +84,12 @@ public final class GuildSubscriptions {
         return this.threads;
     }
 
-    public final GuildSubscriptions copy(Map<Long, ? extends List<IntRange>> map, Boolean bool, Boolean bool2, Set<Long> set, Boolean bool3) {
-        return new GuildSubscriptions(map, bool, bool2, set, bool3);
+    public final List<Long> component6() {
+        return this.threadMemberLists;
+    }
+
+    public final GuildSubscriptions copy(Map<Long, ? extends List<IntRange>> map, Boolean bool, Boolean bool2, Set<Long> set, Boolean bool3, List<Long> list) {
+        return new GuildSubscriptions(map, bool, bool2, set, bool3, list);
     }
 
     public boolean equals(Object obj) {
@@ -91,7 +100,7 @@ public final class GuildSubscriptions {
             return false;
         }
         GuildSubscriptions guildSubscriptions = (GuildSubscriptions) obj;
-        return m.areEqual(this.channels, guildSubscriptions.channels) && m.areEqual(this.typing, guildSubscriptions.typing) && m.areEqual(this.activities, guildSubscriptions.activities) && m.areEqual(this.members, guildSubscriptions.members) && m.areEqual(this.threads, guildSubscriptions.threads);
+        return m.areEqual(this.channels, guildSubscriptions.channels) && m.areEqual(this.typing, guildSubscriptions.typing) && m.areEqual(this.activities, guildSubscriptions.activities) && m.areEqual(this.members, guildSubscriptions.members) && m.areEqual(this.threads, guildSubscriptions.threads) && m.areEqual(this.threadMemberLists, guildSubscriptions.threadMemberLists);
     }
 
     public final Boolean getActivities() {
@@ -110,6 +119,10 @@ public final class GuildSubscriptions {
         return (Map) this.serializedRanges$delegate.getValue();
     }
 
+    public final List<Long> getThreadMemberLists() {
+        return this.threadMemberLists;
+    }
+
     public final Boolean getThreads() {
         return this.threads;
     }
@@ -129,10 +142,12 @@ public final class GuildSubscriptions {
         Set<Long> set = this.members;
         int hashCode4 = (hashCode3 + (set != null ? set.hashCode() : 0)) * 31;
         Boolean bool3 = this.threads;
-        if (bool3 != null) {
-            i = bool3.hashCode();
+        int hashCode5 = (hashCode4 + (bool3 != null ? bool3.hashCode() : 0)) * 31;
+        List<Long> list = this.threadMemberLists;
+        if (list != null) {
+            i = list.hashCode();
         }
-        return hashCode4 + i;
+        return hashCode5 + i;
     }
 
     public String toString() {
@@ -146,7 +161,7 @@ public final class GuildSubscriptions {
         L.append(this.members);
         L.append(", threads=");
         L.append(this.threads);
-        L.append(")");
-        return L.toString();
+        L.append(", threadMemberLists=");
+        return a.E(L, this.threadMemberLists, ")");
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildThreadSubscriptionManager$1.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildThreadSubscriptionManager$1.java
new file mode 100644
index 0000000000..e2f6ba670e
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager$guildThreadSubscriptionManager$1.java
@@ -0,0 +1,26 @@
+package com.discord.utilities.lazy.subscriptions;
+
+import d0.z.d.k;
+import d0.z.d.m;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+/* compiled from: GuildSubscriptionsManager.kt */
+public final /* synthetic */ class GuildSubscriptionsManager$guildThreadSubscriptionManager$1 extends k implements Function2<Long, List<? extends Long>, Unit> {
+    public GuildSubscriptionsManager$guildThreadSubscriptionManager$1(GuildSubscriptionsManager guildSubscriptionsManager) {
+        super(2, guildSubscriptionsManager, GuildSubscriptionsManager.class, "handleThreadSubscriptionsChange", "handleThreadSubscriptionsChange(JLjava/util/List;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function2
+    public /* bridge */ /* synthetic */ Unit invoke(Long l, List<? extends Long> list) {
+        invoke(l.longValue(), (List<Long>) list);
+        return Unit.a;
+    }
+
+    public final void invoke(long j, List<Long> list) {
+        m.checkNotNullParameter(list, "p2");
+        GuildSubscriptionsManager.access$handleThreadSubscriptionsChange((GuildSubscriptionsManager) this.receiver, j, list);
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.java
index 6f7cf0ac2d..250e8bf74e 100644
--- a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.java
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildSubscriptionsManager.java
@@ -16,6 +16,7 @@ public final class GuildSubscriptionsManager {
     private final HashSet<Long> activityGuilds = new HashSet<>();
     private final GuildChannelSubscriptionsManager guildChannelSubscriptionsManager = new GuildChannelSubscriptionsManager(new GuildSubscriptionsManager$guildChannelSubscriptionsManager$1(this));
     private final GuildMemberSubscriptionsManager guildMemberSubscriptionsManager = new GuildMemberSubscriptionsManager(new GuildSubscriptionsManager$guildMemberSubscriptionsManager$1(this), new GuildSubscriptionsManager$guildMemberSubscriptionsManager$2(this), null, 4, null);
+    private final GuildThreadSubscriptionsManager guildThreadSubscriptionManager = new GuildThreadSubscriptionsManager(new GuildSubscriptionsManager$guildThreadSubscriptionManager$1(this));
     private final Function2<Long, GuildSubscriptions, Unit> onChange;
     private final HashMap<Long, GuildSubscriptions> pendingEmissions = new HashMap<>();
     private final HashSet<Long> subscribedGuilds = new HashSet<>();
@@ -37,6 +38,10 @@ public final class GuildSubscriptionsManager {
         guildSubscriptionsManager.handleMemberSubscriptionsChange(j, set, z2);
     }
 
+    public static final /* synthetic */ void access$handleThreadSubscriptionsChange(GuildSubscriptionsManager guildSubscriptionsManager, long j, List list) {
+        guildSubscriptionsManager.handleThreadSubscriptionsChange(j, list);
+    }
+
     public static final /* synthetic */ void access$requestFlushUnsubscriptions(GuildSubscriptionsManager guildSubscriptionsManager, Function0 function0) {
         guildSubscriptionsManager.requestFlushUnsubscriptions(function0);
     }
@@ -46,8 +51,8 @@ public final class GuildSubscriptionsManager {
         HashMap<Long, GuildSubscriptions> hashMap = this.pendingEmissions;
         Long valueOf = Long.valueOf(j);
         GuildSubscriptions guildSubscriptions2 = this.pendingEmissions.get(Long.valueOf(j));
-        if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, map, null, null, null, null, 30, null)) == null) {
-            guildSubscriptions = new GuildSubscriptions(map, null, null, null, null, 30, null);
+        if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, map, null, null, null, null, null, 62, null)) == null) {
+            guildSubscriptions = new GuildSubscriptions(map, null, null, null, null, null, 62, null);
         }
         hashMap.put(valueOf, guildSubscriptions);
     }
@@ -57,8 +62,8 @@ public final class GuildSubscriptionsManager {
         HashMap<Long, GuildSubscriptions> hashMap = this.pendingEmissions;
         Long valueOf = Long.valueOf(j);
         GuildSubscriptions guildSubscriptions2 = this.pendingEmissions.get(Long.valueOf(j));
-        if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, null, set, null, 23, null)) == null) {
-            guildSubscriptions = new GuildSubscriptions(null, null, null, set, null, 23, null);
+        if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, null, set, null, null, 55, null)) == null) {
+            guildSubscriptions = new GuildSubscriptions(null, null, null, set, null, null, 55, null);
         }
         hashMap.put(valueOf, guildSubscriptions);
         if (z2) {
@@ -66,6 +71,17 @@ public final class GuildSubscriptionsManager {
         }
     }
 
+    private final synchronized void handleThreadSubscriptionsChange(long j, List<Long> list) {
+        GuildSubscriptions guildSubscriptions;
+        HashMap<Long, GuildSubscriptions> hashMap = this.pendingEmissions;
+        Long valueOf = Long.valueOf(j);
+        GuildSubscriptions guildSubscriptions2 = this.pendingEmissions.get(Long.valueOf(j));
+        if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, null, null, null, list, 31, null)) == null) {
+            guildSubscriptions = new GuildSubscriptions(null, null, null, null, null, list, 31, null);
+        }
+        hashMap.put(valueOf, guildSubscriptions);
+    }
+
     private final synchronized void requestFlushUnsubscriptions(Function0<Unit> function0) {
         function0.mo1invoke();
     }
@@ -80,7 +96,7 @@ public final class GuildSubscriptionsManager {
     }
 
     public final synchronized GuildSubscriptions get(long j) {
-        return new GuildSubscriptions(this.guildChannelSubscriptionsManager.get(j), Boolean.valueOf(this.typingGuilds.contains(Long.valueOf(j))), Boolean.valueOf(this.activityGuilds.contains(Long.valueOf(j))), this.guildMemberSubscriptionsManager.get(j), Boolean.valueOf(this.threadGuilds.contains(Long.valueOf(j))));
+        return new GuildSubscriptions(this.guildChannelSubscriptionsManager.get(j), Boolean.valueOf(this.typingGuilds.contains(Long.valueOf(j))), Boolean.valueOf(this.activityGuilds.contains(Long.valueOf(j))), this.guildMemberSubscriptionsManager.get(j), Boolean.valueOf(this.threadGuilds.contains(Long.valueOf(j))), this.guildThreadSubscriptionManager.get(j));
     }
 
     public final synchronized void queueExistingSubscriptions() {
@@ -98,6 +114,7 @@ public final class GuildSubscriptionsManager {
         this.threadGuilds.remove(Long.valueOf(j));
         this.guildMemberSubscriptionsManager.remove(j);
         this.guildChannelSubscriptionsManager.remove(j);
+        this.guildThreadSubscriptionManager.remove(j);
     }
 
     public final synchronized void reset() {
@@ -108,6 +125,7 @@ public final class GuildSubscriptionsManager {
         this.threadGuilds.clear();
         this.guildChannelSubscriptionsManager.reset();
         this.guildMemberSubscriptionsManager.reset();
+        this.guildThreadSubscriptionManager.reset();
     }
 
     public final synchronized void retainAll(List<Long> list) {
@@ -124,6 +142,7 @@ public final class GuildSubscriptionsManager {
         this.threadGuilds.retainAll(list);
         this.guildChannelSubscriptionsManager.retainAll(list);
         this.guildMemberSubscriptionsManager.retainAll(list);
+        this.guildThreadSubscriptionManager.retainAll(list);
     }
 
     public final synchronized void subscribeActivities(long j) {
@@ -133,8 +152,8 @@ public final class GuildSubscriptionsManager {
             HashMap<Long, GuildSubscriptions> hashMap = this.pendingEmissions;
             Long valueOf = Long.valueOf(j);
             GuildSubscriptions guildSubscriptions2 = this.pendingEmissions.get(Long.valueOf(j));
-            if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, Boolean.TRUE, null, null, 27, null)) == null) {
-                guildSubscriptions = new GuildSubscriptions(null, null, Boolean.TRUE, null, null, 27, null);
+            if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, Boolean.TRUE, null, null, null, 59, null)) == null) {
+                guildSubscriptions = new GuildSubscriptions(null, null, Boolean.TRUE, null, null, null, 59, null);
             }
             hashMap.put(valueOf, guildSubscriptions);
         }
@@ -149,6 +168,10 @@ public final class GuildSubscriptionsManager {
         this.guildMemberSubscriptionsManager.subscribe(j, j2);
     }
 
+    public final synchronized void subscribeThread(long j, long j2) {
+        this.guildThreadSubscriptionManager.subscribe(j, j2);
+    }
+
     public final synchronized void subscribeThreads(long j) {
         GuildSubscriptions guildSubscriptions;
         if (!this.threadGuilds.contains(Long.valueOf(j))) {
@@ -156,8 +179,8 @@ public final class GuildSubscriptionsManager {
             HashMap<Long, GuildSubscriptions> hashMap = this.pendingEmissions;
             Long valueOf = Long.valueOf(j);
             GuildSubscriptions guildSubscriptions2 = this.pendingEmissions.get(Long.valueOf(j));
-            if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, null, null, Boolean.TRUE, 15, null)) == null) {
-                guildSubscriptions = new GuildSubscriptions(null, null, null, null, Boolean.TRUE, 15, null);
+            if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, null, null, null, Boolean.TRUE, null, 47, null)) == null) {
+                guildSubscriptions = new GuildSubscriptions(null, null, null, null, Boolean.TRUE, null, 47, null);
             }
             hashMap.put(valueOf, guildSubscriptions);
         }
@@ -170,8 +193,8 @@ public final class GuildSubscriptionsManager {
             HashMap<Long, GuildSubscriptions> hashMap = this.pendingEmissions;
             Long valueOf = Long.valueOf(j);
             GuildSubscriptions guildSubscriptions2 = this.pendingEmissions.get(Long.valueOf(j));
-            if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, Boolean.TRUE, null, null, null, 29, null)) == null) {
-                guildSubscriptions = new GuildSubscriptions(null, Boolean.TRUE, null, null, null, 29, null);
+            if (guildSubscriptions2 == null || (guildSubscriptions = GuildSubscriptions.copy$default(guildSubscriptions2, null, Boolean.TRUE, null, null, null, null, 61, null)) == null) {
+                guildSubscriptions = new GuildSubscriptions(null, Boolean.TRUE, null, null, null, null, 61, null);
             }
             hashMap.put(valueOf, guildSubscriptions);
         }
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildThreadSubscriptionsManager.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildThreadSubscriptionsManager.java
new file mode 100644
index 0000000000..ebb3e79362
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildThreadSubscriptionsManager.java
@@ -0,0 +1,63 @@
+package com.discord.utilities.lazy.subscriptions;
+
+import android.util.LruCache;
+import d0.t.n;
+import d0.t.u;
+import d0.z.d.m;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+/* compiled from: GuildThreadSubscriptionsManager.kt */
+public final class GuildThreadSubscriptionsManager {
+    private final Function2<Long, List<Long>, Unit> changeHandler;
+    private final HashMap<Long, LruCache<Long, Long>> subscriptions = new HashMap<>();
+
+    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function2<? super java.lang.Long, ? super java.util.List<java.lang.Long>, kotlin.Unit> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public GuildThreadSubscriptionsManager(Function2<? super Long, ? super List<Long>, Unit> function2) {
+        m.checkNotNullParameter(function2, "changeHandler");
+        this.changeHandler = function2;
+    }
+
+    public final List<Long> get(long j) {
+        Map<Long, Long> snapshot;
+        Set<Long> keySet;
+        List<Long> list;
+        LruCache<Long, Long> lruCache = this.subscriptions.get(Long.valueOf(j));
+        return (lruCache == null || (snapshot = lruCache.snapshot()) == null || (keySet = snapshot.keySet()) == null || (list = u.toList(keySet)) == null) ? n.emptyList() : list;
+    }
+
+    public final void remove(long j) {
+        this.subscriptions.remove(Long.valueOf(j));
+    }
+
+    public final void reset() {
+        this.subscriptions.clear();
+    }
+
+    public final void retainAll(List<Long> list) {
+        m.checkNotNullParameter(list, "guildIds");
+        Iterator<Map.Entry<Long, LruCache<Long, Long>>> it = this.subscriptions.entrySet().iterator();
+        while (it.hasNext()) {
+            if (!list.contains(Long.valueOf(it.next().getKey().longValue()))) {
+                it.remove();
+            }
+        }
+    }
+
+    public final void subscribe(long j, long j2) {
+        LruCache<Long, Long> lruCache = this.subscriptions.get(Long.valueOf(j));
+        if (lruCache == null) {
+            lruCache = new LruCache<>(3);
+        }
+        if (lruCache.get(Long.valueOf(j2)) == null) {
+            lruCache.put(Long.valueOf(j2), Long.valueOf(j2));
+            this.subscriptions.put(Long.valueOf(j), lruCache);
+            this.changeHandler.invoke(Long.valueOf(j), u.toList(lruCache.snapshot().keySet()));
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildThreadSubscriptionsManagerKt.java b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildThreadSubscriptionsManagerKt.java
new file mode 100644
index 0000000000..ff1042bbd6
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/lazy/subscriptions/GuildThreadSubscriptionsManagerKt.java
@@ -0,0 +1,5 @@
+package com.discord.utilities.lazy.subscriptions;
+/* compiled from: GuildThreadSubscriptionsManager.kt */
+public final class GuildThreadSubscriptionsManagerKt {
+    private static final int MAX_CHANNELS = 3;
+}
diff --git a/app/src/main/java/com/discord/utilities/media/AudioOutputMonitor.java b/app/src/main/java/com/discord/utilities/media/AudioOutputMonitor.java
index b9a7945072..ac0df30b52 100644
--- a/app/src/main/java/com/discord/utilities/media/AudioOutputMonitor.java
+++ b/app/src/main/java/com/discord/utilities/media/AudioOutputMonitor.java
@@ -54,7 +54,7 @@ public final class AudioOutputMonitor extends BroadcastReceiver {
     public AudioOutputMonitor() {
         AudioOutputState audioOutputState = new AudioOutputState(false, false, false, false, null, 31, null);
         this.outputState = audioOutputState;
-        this.outputStateSubject = new SerializedSubject<>(BehaviorSubject.m0(audioOutputState));
+        this.outputStateSubject = new SerializedSubject<>(BehaviorSubject.l0(audioOutputState));
         Map<String, KFunction<Unit>> mapOf = h0.mapOf(o.to("android.intent.action.HEADSET_PLUG", new AudioOutputMonitor$intentHandlers$1(this)), o.to("android.bluetooth.adapter.action.STATE_CHANGED", new AudioOutputMonitor$intentHandlers$2(this)), o.to("android.media.ACTION_SCO_AUDIO_STATE_UPDATED", new AudioOutputMonitor$intentHandlers$3(this)), o.to("android.bluetooth.headset.profile.action.CONNECTION_STATE_CHANGED", new AudioOutputMonitor$intentHandlers$4(this)));
         this.intentHandlers = mapOf;
         IntentFilter intentFilter = new IntentFilter();
@@ -152,9 +152,9 @@ public final class AudioOutputMonitor extends BroadcastReceiver {
     }
 
     public final Observable<AudioOutputState> getOutputState() {
-        Observable<AudioOutputState> s2 = this.outputStateSubject.s();
-        m.checkNotNullExpressionValue(s2, "outputStateSubject\n        .distinctUntilChanged()");
-        return s2;
+        Observable<AudioOutputState> r = this.outputStateSubject.r();
+        m.checkNotNullExpressionValue(r, "outputStateSubject\n        .distinctUntilChanged()");
+        return r;
     }
 
     @Override // android.content.BroadcastReceiver
diff --git a/app/src/main/java/com/discord/utilities/media/MediaFrecencyTracker.java b/app/src/main/java/com/discord/utilities/media/MediaFrecencyTracker.java
index 83b2d8842c..ef845d1e8b 100644
--- a/app/src/main/java/com/discord/utilities/media/MediaFrecencyTracker.java
+++ b/app/src/main/java/com/discord/utilities/media/MediaFrecencyTracker.java
@@ -3,10 +3,20 @@ package com.discord.utilities.media;
 import com.discord.utilities.frecency.FrecencyTracker;
 import d0.z.d.m;
 import java.util.List;
+import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: MediaFrecencyTracker.kt */
 public final class MediaFrecencyTracker extends FrecencyTracker<String> {
     public MediaFrecencyTracker() {
-        super(70, 10);
+        this(0, 0, 3, null);
+    }
+
+    public MediaFrecencyTracker(int i, int i2) {
+        super(i2, i);
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ MediaFrecencyTracker(int i, int i2, int i3, DefaultConstructorMarker defaultConstructorMarker) {
+        this((i3 & 1) != 0 ? 10 : i, (i3 & 2) != 0 ? 70 : i2);
     }
 
     private final int getDaysDiff(long j, long j2) {
diff --git a/app/src/main/java/com/discord/utilities/message/LocalMessageCreatorsKt.java b/app/src/main/java/com/discord/utilities/message/LocalMessageCreatorsKt.java
index 691828ca96..9f1a599121 100644
--- a/app/src/main/java/com/discord/utilities/message/LocalMessageCreatorsKt.java
+++ b/app/src/main/java/com/discord/utilities/message/LocalMessageCreatorsKt.java
@@ -3,7 +3,6 @@ package com.discord.utilities.message;
 import com.discord.api.application.Application;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.message.LocalAttachment;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.message.activity.MessageActivity;
 import com.discord.api.message.allowedmentions.MessageAllowedMentions;
@@ -12,6 +11,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.domain.NonceGenerator;
+import com.discord.models.message.Message;
 import com.discord.utilities.time.Clock;
 import d0.t.n;
 import d0.t.o;
@@ -30,28 +30,28 @@ public final class LocalMessageCreatorsKt {
         long computeNonce = NonceGenerator.Companion.computeNonce(clock);
         UtcDateTime utcDateTime = new UtcDateTime(clock.currentTimeMillis());
         Boolean bool = Boolean.FALSE;
-        return new Message(computeNonce, j, user, "", utcDateTime, null, bool, bool, n.emptyList(), n.emptyList(), n.emptyList(), n.emptyList(), n.emptyList(), String.valueOf(computeNonce), bool, null, -3, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, list, 0, 30);
+        return new Message(computeNonce, j, null, user, "", utcDateTime, null, bool, bool, n.emptyList(), n.emptyList(), n.emptyList(), n.emptyList(), n.emptyList(), String.valueOf(computeNonce), bool, null, -3, null, null, null, null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, list, 4, 15, null);
     }
 
     public static final Message createLocalApplicationCommandMessage(long j, String str, long j2, User user, User user2, boolean z2, boolean z3, Long l, Clock clock) {
         m.checkNotNullParameter(user2, "application");
         m.checkNotNullParameter(clock, "clock");
         int i = z2 ? -4 : -5;
-        return new Message(j, j2, user2, "", new UtcDateTime(clock.currentTimeMillis()), null, null, null, null, null, null, null, null, String.valueOf(j), null, null, Integer.valueOf(i), null, null, null, null, z3 ? 128L : null, null, null, null, new Interaction(l, 2, str, user, null), null, null, null, null, null, null, false, null, null, null, null, null, -35725344, 63);
+        return new Message(j, j2, null, user2, "", new UtcDateTime(clock.currentTimeMillis()), null, null, null, null, null, null, null, null, String.valueOf(j), null, null, Integer.valueOf(i), null, null, null, null, z3 ? 128L : null, null, null, null, new Interaction(l, 2, str, user, null), null, null, null, null, false, null, null, null, null, null, -71450684, 31, null);
     }
 
     public static final Message createLocalApplicationCommandMessage(Message message, Long l, boolean z2, boolean z3, Clock clock) {
         m.checkNotNullParameter(message, "other");
         m.checkNotNullParameter(clock, "clock");
-        Interaction t = message.t();
-        String b = t != null ? t.b() : null;
-        Interaction t2 = message.t();
-        User c2 = t2 != null ? t2.c() : null;
-        long r = message.r();
-        long i = message.i();
-        User g = message.g();
-        m.checkNotNull(g);
-        return createLocalApplicationCommandMessage(r, b, i, c2, g, z2, z3, l, clock);
+        Interaction interaction = message.getInteraction();
+        String b = interaction != null ? interaction.b() : null;
+        Interaction interaction2 = message.getInteraction();
+        User c2 = interaction2 != null ? interaction2.c() : null;
+        long id2 = message.getId();
+        long channelId = message.getChannelId();
+        User author = message.getAuthor();
+        m.checkNotNull(author);
+        return createLocalApplicationCommandMessage(id2, b, channelId, c2, author, z2, z3, l, clock);
     }
 
     public static final Message createLocalMessage(String str, long j, User user, List<User> list, boolean z2, boolean z3, Application application, MessageActivity messageActivity, Clock clock, List<LocalAttachment> list2, Long l, Long l2, Integer num, List<Sticker> list3, MessageReference messageReference, MessageAllowedMentions messageAllowedMentions) {
@@ -77,14 +77,14 @@ public final class LocalMessageCreatorsKt {
         } else {
             arrayList = null;
         }
-        return new Message(computeNonce, j, user, str, utcDateTime, null, bool, bool, list, emptyList, emptyList2, emptyList3, emptyList4, valueOf, bool, null, valueOf2, messageActivity, application, null, messageReference, null, list3, arrayList, null, null, null, null, null, null, null, Boolean.FALSE, z3, messageAllowedMentions, num, l, l2, list2);
+        return new Message(computeNonce, j, null, user, str, utcDateTime, null, bool, bool, list, emptyList, emptyList2, emptyList3, emptyList4, valueOf, bool, null, valueOf2, messageActivity, application, null, messageReference, null, list3, arrayList, null, null, null, null, null, Boolean.FALSE, z3, messageAllowedMentions, num, l, l2, list2, 4, 0, null);
     }
 
     public static final Message createThreadStarterMessageNotFoundMessage(long j, User user, Clock clock) {
         m.checkNotNullParameter(user, "author");
         m.checkNotNullParameter(clock, "clock");
         long computeNonce = NonceGenerator.Companion.computeNonce(clock);
-        return new Message(computeNonce, j, user, "", new UtcDateTime(clock.currentTimeMillis()), null, null, null, null, null, null, null, null, String.valueOf(computeNonce), null, null, 23, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null, null, null, null, null, -73760, 63);
+        return new Message(computeNonce, j, null, user, "", new UtcDateTime(clock.currentTimeMillis()), null, null, null, null, null, null, null, null, String.valueOf(computeNonce), null, null, 23, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null, null, null, null, null, -147516, 31, null);
     }
 
     public static final Message createWithReactions(Message message, LinkedHashMap<String, MessageReaction> linkedHashMap) {
@@ -94,6 +94,6 @@ public final class LocalMessageCreatorsKt {
         if (linkedHashMap == null || (values = linkedHashMap.values()) == null || (list = u.toList(values)) == null) {
             list = n.emptyList();
         }
-        return Message.a(message, 0, 0, null, null, null, null, null, null, null, null, null, null, list, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null, null, null, null, null, -4097, 63);
+        return Message.copy$default(message, 0, 0, null, null, null, null, null, null, null, null, null, null, null, list, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null, null, null, null, null, -8193, 31, null);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/message/MessageUtils.java b/app/src/main/java/com/discord/utilities/message/MessageUtils.java
index 6e0e353018..582c261e30 100644
--- a/app/src/main/java/com/discord/utilities/message/MessageUtils.java
+++ b/app/src/main/java/com/discord/utilities/message/MessageUtils.java
@@ -5,29 +5,14 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.LocaleList;
-import com.discord.api.application.Application;
-import com.discord.api.botuikit.Component;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelRecipientNick;
 import com.discord.api.interaction.Interaction;
-import com.discord.api.message.LocalAttachment;
-import com.discord.api.message.Message;
-import com.discord.api.message.MessageReference;
-import com.discord.api.message.activity.MessageActivity;
-import com.discord.api.message.activity.MessageActivityType;
-import com.discord.api.message.allowedmentions.MessageAllowedMentions;
-import com.discord.api.message.attachment.MessageAttachment;
-import com.discord.api.message.call.MessageCall;
-import com.discord.api.message.embed.MessageEmbed;
-import com.discord.api.message.reaction.MessageReaction;
-import com.discord.api.sticker.Sticker;
-import com.discord.api.sticker.StickerPartial;
 import com.discord.api.user.User;
-import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.utilities.time.TimeUtils;
-import d0.g0.w;
 import d0.z.d.m;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -38,7 +23,7 @@ import java.util.Map;
 public final class MessageUtils {
     public static final MessageUtils INSTANCE = new MessageUtils();
     private static final Comparator<Long> SORT_BY_IDS_COMPARATOR = MessageUtils$SORT_BY_IDS_COMPARATOR$1.INSTANCE;
-    private static final int[] WELCOME_MESSAGES = {2131893749, 2131893750, 2131893751, 2131893752, 2131893753, 2131893754, 2131893755, 2131893756, 2131893757, 2131893758, 2131893759, 2131893760, 2131893761};
+    private static final int[] WELCOME_MESSAGES = {2131893846, 2131893847, 2131893848, 2131893849, 2131893850, 2131893851, 2131893852, 2131893853, 2131893854, 2131893855, 2131893856, 2131893857, 2131893858};
 
     private MessageUtils() {
     }
@@ -59,20 +44,20 @@ public final class MessageUtils {
     public static final Map<Long, String> getNickOrUsernames(Message message, Channel channel, Map<Long, GuildMember> map, List<ChannelRecipientNick> list) {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(map, "channelMembers");
-        List<User> z2 = message.z();
-        HashMap hashMap = new HashMap((z2 != null ? z2.size() : 0) + 1);
-        List<User> z3 = message.z();
-        if (z3 != null) {
-            for (User user : z3) {
+        List<User> mentions = message.getMentions();
+        HashMap hashMap = new HashMap((mentions != null ? mentions.size() : 0) + 1);
+        List<User> mentions2 = message.getMentions();
+        if (mentions2 != null) {
+            for (User user : mentions2) {
                 hashMap.put(Long.valueOf(user.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(user), map.get(Long.valueOf(user.i())), channel, list));
             }
         }
-        User g = message.g();
-        if (g != null) {
-            hashMap.put(Long.valueOf(g.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(g), map.get(Long.valueOf(g.i())), channel, list));
+        User author = message.getAuthor();
+        if (author != null) {
+            hashMap.put(Long.valueOf(author.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(author), map.get(Long.valueOf(author.i())), channel, list));
         }
-        Interaction t = message.t();
-        User c2 = t != null ? t.c() : null;
+        Interaction interaction = message.getInteraction();
+        User c2 = interaction != null ? interaction.c() : null;
         if (c2 != null) {
             hashMap.put(Long.valueOf(c2.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(c2), map.get(Long.valueOf(c2.i())), channel, list));
         }
@@ -93,178 +78,10 @@ public final class MessageUtils {
     public static /* synthetic */ void getSORT_BY_IDS_COMPARATOR$annotations() {
     }
 
-    public static final boolean isLocal(Message message) {
-        Integer M;
-        Integer M2;
-        m.checkNotNullParameter(message, "$this$isLocal");
-        Integer M3 = message.M();
-        return (M3 != null && M3.intValue() == -1) || ((M = message.M()) != null && M.intValue() == -2) || (((M2 = message.M()) != null && M2.intValue() == -3) || INSTANCE.isLocalApplicationCommand(message));
-    }
-
     public static final boolean isNewer(Long l, Long l2) {
         return compareMessages(l, l2) < 0;
     }
 
-    public static final Message merge(Message message, Message message2) {
-        m.checkNotNullParameter(message, "old");
-        m.checkNotNullParameter(message2, "new");
-        long r = message2.r();
-        long i = message2.i() != 0 ? message2.i() : message.i();
-        User g = message2.g();
-        if (g == null) {
-            g = message.g();
-        }
-        String k = message2.k();
-        if (k == null) {
-            k = message.k();
-        }
-        UtcDateTime K = message2.K();
-        if (K == null) {
-            K = message.K();
-        }
-        UtcDateTime l = message2.l();
-        if (l == null) {
-            l = message.l();
-        }
-        List<MessageAttachment> f = message2.f();
-        if (f == null) {
-            f = message.f();
-        }
-        List<MessageEmbed> m = message2.m();
-        if (m == null) {
-            m = message.m();
-        }
-        Boolean L = message2.L();
-        if (L == null) {
-            L = message.L();
-        }
-        Boolean x2 = message2.x();
-        List<User> z2 = message2.z();
-        if (z2 == null) {
-            z2 = message.z();
-        }
-        List<Long> y2 = message2.y();
-        if (y2 == null) {
-            y2 = message.y();
-        }
-        List<MessageReaction> E = message2.E();
-        if (E == null) {
-            E = message.E();
-        }
-        String B = message2.B();
-        if (B == null) {
-            B = message.B();
-        }
-        Boolean D = message2.D();
-        if (D == null) {
-            D = message.D();
-        }
-        Long N = message2.N();
-        if (N == null) {
-            N = message.N();
-        }
-        Integer M = message2.M();
-        if (M == null) {
-            M = message.M();
-        }
-        MessageActivity b = message2.b();
-        if (b == null) {
-            b = message.b();
-        }
-        Application d = message2.d();
-        if (d == null) {
-            d = message.d();
-        }
-        Long e = message2.e();
-        if (e == null) {
-            e = message.e();
-        }
-        MessageReference A = message2.A();
-        if (A == null) {
-            A = message.A();
-        }
-        Long n = message2.n();
-        if (n == null) {
-            n = message.n();
-        }
-        List<Sticker> I = message2.I();
-        if (I == null) {
-            I = message.I();
-        }
-        List<StickerPartial> H = message2.H();
-        if (H == null) {
-            H = message.H();
-        }
-        Message G = message2.G();
-        if (G == null) {
-            G = message.G();
-        }
-        Interaction t = message2.t();
-        if (t == null) {
-            t = message.t();
-        }
-        Channel J = message2.J();
-        if (J == null) {
-            J = message.J();
-        }
-        List<Component> j = message2.j();
-        if (j == null) {
-            j = message.j();
-        }
-        MessageCall h = message2.h();
-        if (h == null) {
-            h = message.h();
-        }
-        boolean p = message2.p();
-        MessageAllowedMentions c2 = message2.c();
-        if (c2 == null) {
-            c2 = message.c();
-        }
-        List<LocalAttachment> v = message2.v();
-        if (v == null) {
-            v = message.v();
-        }
-        Long u = message2.u();
-        if (u == null) {
-            u = message.u();
-        }
-        Long s2 = message2.s();
-        if (s2 == null) {
-            s2 = message.s();
-        }
-        Integer C = message2.C();
-        if (C == null) {
-            C = message.C();
-        }
-        return Message.a(message, r, i, g, k, K, l, L, x2, z2, y2, f, m, E, B, D, N, M, b, d, e, A, n, I, H, G, t, J, j, h, null, null, null, p, c2, C, u, s2, v, -536870912, 0);
-    }
-
-    public final boolean canResend(Message message) {
-        m.checkNotNullParameter(message, "$this$canResend");
-        Integer M = message.M();
-        return M != null && M.intValue() == -2;
-    }
-
-    public final long getCallDuration(Message message) {
-        UtcDateTime a;
-        UtcDateTime K;
-        m.checkNotNullParameter(message, "$this$getCallDuration");
-        MessageCall h = message.h();
-        if (h == null || (a = h.a()) == null || (K = message.K()) == null) {
-            return 0;
-        }
-        return a.f() - K.f();
-    }
-
-    public final long getEditedTimestampMillis(Message message) {
-        m.checkNotNullParameter(message, "$this$getEditedTimestampMillis");
-        UtcDateTime l = message.l();
-        if (l != null) {
-            return l.f();
-        }
-        return 0;
-    }
-
     /* JADX WARNING: Removed duplicated region for block: B:17:0x003d  */
     /* JADX WARNING: Removed duplicated region for block: B:20:0x004d  */
     /* JADX WARNING: Removed duplicated region for block: B:21:0x0050  */
@@ -301,121 +118,4 @@ public final class MessageUtils {
         }
         return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))];
     }
-
-    public final boolean hasAttachments(Message message) {
-        m.checkNotNullParameter(message, "$this$hasAttachments");
-        List<MessageAttachment> f = message.f();
-        return !(f == null || f.isEmpty());
-    }
-
-    public final boolean hasEmbeds(Message message) {
-        m.checkNotNullParameter(message, "$this$hasEmbeds");
-        List<MessageEmbed> m = message.m();
-        return !(m == null || m.isEmpty());
-    }
-
-    public final boolean hasFlag(Message message, long j) {
-        m.checkNotNullParameter(message, "$this$hasFlag");
-        Long n = message.n();
-        return ((n != null ? n.longValue() : 0) & j) == j;
-    }
-
-    public final boolean hasStickerItems(Message message) {
-        m.checkNotNullParameter(message, "$this$hasStickerItems");
-        List<StickerPartial> H = message.H();
-        return !(H == null || H.isEmpty());
-    }
-
-    public final boolean hasStickers(Message message) {
-        m.checkNotNullParameter(message, "$this$hasStickers");
-        List<Sticker> I = message.I();
-        return !(I == null || I.isEmpty());
-    }
-
-    public final boolean hasThread(Message message) {
-        m.checkNotNullParameter(message, "$this$hasThread");
-        return hasFlag(message, 32);
-    }
-
-    public final boolean isCrosspost(Message message) {
-        m.checkNotNullParameter(message, "$this$isCrosspost");
-        return hasFlag(message, 2);
-    }
-
-    public final boolean isCrossposted(Message message) {
-        m.checkNotNullParameter(message, "$this$isCrossposted");
-        return hasFlag(message, 1);
-    }
-
-    public final boolean isEmbeddedMessageType(Message message) {
-        Integer M;
-        m.checkNotNullParameter(message, "$this$isEmbeddedMessageType");
-        Integer M2 = message.M();
-        return (M2 != null && M2.intValue() == 19) || ((M = message.M()) != null && M.intValue() == 21);
-    }
-
-    public final boolean isEphemeralMessage(Message message) {
-        m.checkNotNullParameter(message, "$this$isEphemeralMessage");
-        return hasFlag(message, 64);
-    }
-
-    public final boolean isFailed(Message message) {
-        Integer M;
-        Integer M2;
-        m.checkNotNullParameter(message, "$this$isFailed");
-        Integer M3 = message.M();
-        return (M3 != null && M3.intValue() == -3) || ((M = message.M()) != null && M.intValue() == -2) || ((M2 = message.M()) != null && M2.intValue() == -4);
-    }
-
-    public final boolean isInteraction(Message message) {
-        Integer M;
-        m.checkNotNullParameter(message, "$this$isInteraction");
-        Integer M2 = message.M();
-        return (M2 != null && M2.intValue() == -5) || ((M = message.M()) != null && M.intValue() == -4) || message.t() != null;
-    }
-
-    public final boolean isLoading(Message message) {
-        m.checkNotNullParameter(message, "$this$isLoading");
-        return hasFlag(message, 128);
-    }
-
-    public final boolean isLocalApplicationCommand(Message message) {
-        Integer M;
-        m.checkNotNullParameter(message, "$this$isLocalApplicationCommand");
-        Integer M2 = message.M();
-        return (M2 != null && M2.intValue() == -5) || ((M = message.M()) != null && M.intValue() == -4);
-    }
-
-    public final boolean isSourceDeleted(Message message) {
-        m.checkNotNullParameter(message, "$this$isSourceDeleted");
-        return hasFlag(message, 8);
-    }
-
-    public final boolean isSpotifyListeningActivity(Message message) {
-        m.checkNotNullParameter(message, "$this$isSpotifyListeningActivity");
-        MessageActivity b = message.b();
-        return b != null && b.b() == MessageActivityType.LISTEN && w.contains$default(b.a(), "spotify", false, 2, null);
-    }
-
-    public final boolean isSystemMessage(Message message) {
-        m.checkNotNullParameter(message, "$this$isSystemMessage");
-        return !isUserMessage(message);
-    }
-
-    public final boolean isUrgent(Message message) {
-        m.checkNotNullParameter(message, "$this$isUrgent");
-        return hasFlag(message, 16);
-    }
-
-    public final boolean isUserMessage(Message message) {
-        Integer M;
-        m.checkNotNullParameter(message, "$this$isUserMessage");
-        Integer M2 = message.M();
-        return (M2 != null && M2.intValue() == 0) || ((M = message.M()) != null && M.intValue() == 19);
-    }
-
-    public final boolean isWebhook(Message message) {
-        m.checkNotNullParameter(message, "$this$isWebhook");
-        return message.N() != null;
-    }
 }
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$2.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$2.java
index 439ee38eb9..0ca795ddfb 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$2.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$2.java
@@ -15,9 +15,9 @@ import okhttp3.MultipartBody;
 import rx.Observable;
 /* compiled from: MessageQueue.kt */
 public final class MessageQueue$doSend$2<T, R> implements b<SendUtils.SendPayload.ReadyToSend, Observable<? extends Message>> {
-    public final /* synthetic */ Message $message;
+    public final /* synthetic */ com.discord.models.message.Message $message;
 
-    public MessageQueue$doSend$2(Message message) {
+    public MessageQueue$doSend$2(com.discord.models.message.Message message) {
         this.$message = message;
     }
 
@@ -31,13 +31,13 @@ public final class MessageQueue$doSend$2<T, R> implements b<SendUtils.SendPayloa
             arrayList.add(it.next().getPart());
         }
         if (!(!arrayList.isEmpty())) {
-            return RestAPI.Companion.getApi().sendMessage(this.$message.i(), readyToSend.getMessage());
+            return RestAPI.Companion.getApi().sendMessage(this.$message.getChannelId(), readyToSend.getMessage());
         }
         RestAPI api = RestAPI.Companion.getApi();
-        long i = this.$message.i();
+        long channelId = this.$message.getChannelId();
         PayloadJSON<RestAPIParams.Message> payloadJSON = new PayloadJSON<>(readyToSend.getMessage());
         Object[] array = arrayList.toArray(new MultipartBody.Part[0]);
         Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
-        return api.sendMessage(i, payloadJSON, (MultipartBody.Part[]) array);
+        return api.sendMessage(channelId, payloadJSON, (MultipartBody.Part[]) array);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java
index f7d6c76672..b97588899b 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$processNextRequest$listener$1.java
@@ -171,9 +171,9 @@ public final class MessageQueue$processNextRequest$listener$1 extends o implemen
     public final void invoke(MessageResult messageResult) {
         m.checkNotNullParameter(messageResult, "result");
         if (messageResult instanceof MessageResult.RateLimited) {
-            Observable<Long> e02 = Observable.e0(((MessageResult.RateLimited) messageResult).getRetryAfterMs(), TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable\n             …s, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(e02, this.this$0.getClass(), (Context) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(((MessageResult.RateLimited) messageResult).getRetryAfterMs(), TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n             …s, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(d02, this.this$0.getClass(), (Context) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 58, (Object) null);
         } else if (messageResult instanceof MessageResult.NetworkFailure) {
             MessageQueue.access$getExecutorService$p(this.this$0).submit(new AnonymousClass3(this));
         } else {
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
index e1241de87c..1fe83e9d20 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue.java
@@ -179,53 +179,53 @@ public final class MessageQueue {
             drainListener.complete(validateMessage);
             return;
         }
-        Message message = send.getMessage();
-        boolean z2 = message.B() != null;
-        MessageActivity b = message.b();
+        com.discord.models.message.Message message = send.getMessage();
+        boolean z2 = message.getNonce() != null;
+        MessageActivity activity2 = message.getActivity();
         ArrayList arrayList = null;
-        if (b != null) {
-            Activity activity2 = send.getActivity();
-            activity = (activity2 == null || (k = activity2.k()) == null) ? null : new RestAPIParams.Message.Activity(b.b(), b.a(), k);
+        if (activity2 != null) {
+            Activity activity3 = send.getActivity();
+            activity = (activity3 == null || (k = activity3.k()) == null) ? null : new RestAPIParams.Message.Activity(activity2.b(), activity2.a(), k);
         } else {
             activity = null;
         }
-        MessageReference A = message.A();
-        if (A != null) {
-            Long b2 = A.b();
-            Long a = A.a();
+        MessageReference messageReference2 = message.getMessageReference();
+        if (messageReference2 != null) {
+            Long b = messageReference2.b();
+            Long a = messageReference2.a();
             m.checkNotNull(a);
-            messageReference = new RestAPIParams.Message.MessageReference(b2, a.longValue(), A.c());
+            messageReference = new RestAPIParams.Message.MessageReference(b, a.longValue(), messageReference2.c());
         } else {
             messageReference = null;
         }
-        MessageAllowedMentions c2 = message.c();
-        RestAPIParams.Message.AllowedMentions create = c2 != null ? RestAPIParams.Message.AllowedMentions.Companion.create(c2) : null;
-        String k2 = message.k();
-        String B = message.B();
-        Application d = message.d();
-        Long valueOf = d != null ? Long.valueOf(d.f()) : null;
-        List<StickerPartial> H = message.H();
-        if (H != null) {
-            arrayList = new ArrayList(o.collectionSizeOrDefault(H, 10));
-            for (StickerPartial stickerPartial : H) {
+        MessageAllowedMentions allowedMentions = message.getAllowedMentions();
+        RestAPIParams.Message.AllowedMentions create = allowedMentions != null ? RestAPIParams.Message.AllowedMentions.Companion.create(allowedMentions) : null;
+        String content = message.getContent();
+        String nonce = message.getNonce();
+        Application application = message.getApplication();
+        Long valueOf = application != null ? Long.valueOf(application.f()) : null;
+        List<StickerPartial> stickerItems = message.getStickerItems();
+        if (stickerItems != null) {
+            arrayList = new ArrayList(o.collectionSizeOrDefault(stickerItems, 10));
+            for (StickerPartial stickerPartial : stickerItems) {
                 arrayList.add(Long.valueOf(stickerPartial.getId()));
             }
         } else {
-            List<Sticker> I = message.I();
-            if (I != null) {
-                arrayList = new ArrayList(o.collectionSizeOrDefault(I, 10));
-                for (Sticker sticker : I) {
+            List<Sticker> stickers = message.getStickers();
+            if (stickers != null) {
+                arrayList = new ArrayList(o.collectionSizeOrDefault(stickers, 10));
+                for (Sticker sticker : stickers) {
                     arrayList.add(Long.valueOf(sticker.getId()));
                 }
             }
         }
-        Observable<SendUtils.SendPayload> u = SendUtils.INSTANCE.getSendPayload(this.contentResolver, new RestAPIParams.Message(k2, B, valueOf, activity, arrayList, messageReference, create), send.getAttachments()).u(new MessageQueue$doSend$1(send));
-        m.checkNotNullExpressionValue(u, "SendUtils\n        .getSe…  }\n          }\n        }");
-        Observable<R> G = u.y(MessageQueue$doSend$$inlined$filterIs$1.INSTANCE).G(MessageQueue$doSend$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        Observable A2 = G.a0(1).A(new MessageQueue$doSend$2(message));
-        m.checkNotNullExpressionValue(A2, "SendUtils\n        .getSe…ge)\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn(A2, z2), MessageQueue.class, (Context) null, new MessageQueue$doSend$5(this, send, drainListener), new MessageQueue$doSend$4(this, drainListener), (Function0) null, (Function0) null, new MessageQueue$doSend$3(this, drainListener), 50, (Object) null);
+        Observable<SendUtils.SendPayload> t = SendUtils.INSTANCE.getSendPayload(this.contentResolver, new RestAPIParams.Message(content, nonce, valueOf, activity, arrayList, messageReference, create), send.getAttachments()).t(new MessageQueue$doSend$1(send));
+        m.checkNotNullExpressionValue(t, "SendUtils\n        .getSe…  }\n          }\n        }");
+        Observable<R> F = t.x(MessageQueue$doSend$$inlined$filterIs$1.INSTANCE).F(MessageQueue$doSend$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        Observable z3 = F.Z(1).z(new MessageQueue$doSend$2(message));
+        m.checkNotNullExpressionValue(z3, "SendUtils\n        .getSe…ge)\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn(z3, z2), MessageQueue.class, (Context) null, new MessageQueue$doSend$5(this, send, drainListener), new MessageQueue$doSend$4(this, drainListener), (Function0) null, (Function0) null, new MessageQueue$doSend$3(this, drainListener), 50, (Object) null);
     }
 
     private final void doSendApplicationCommand(MessageRequest.SendApplicationCommand sendApplicationCommand, DrainListener drainListener) {
diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java b/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java
index e3a39c6333..d436c3bd13 100644
--- a/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java
+++ b/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java
@@ -1,9 +1,9 @@
 package com.discord.utilities.messagesend;
 
 import com.discord.api.activity.Activity;
-import com.discord.api.message.Message;
 import com.discord.api.message.allowedmentions.MessageAllowedMentions;
 import com.discord.models.commands.ApplicationCommandLocalSendData;
+import com.discord.models.message.Message;
 import com.discord.utilities.messagesend.MessageResult;
 import com.discord.utilities.rest.SendUtils;
 import com.lytefast.flexinput.model.Attachment;
@@ -95,8 +95,8 @@ public abstract class MessageRequest {
             m.checkNotNullParameter(function2, "onCompleted");
             m.checkNotNullParameter(function1, "onPreprocessing");
             m.checkNotNullParameter(function12, "onProgress");
-            String B = message.B();
-            m.checkNotNull(B);
+            String nonce = message.getNonce();
+            m.checkNotNull(nonce);
             this.message = message;
             this.activity = activity;
             this.attachments = list;
@@ -125,7 +125,7 @@ public abstract class MessageRequest {
         }
 
         public final MessageResult.ValidationError validateMessage() {
-            if (this.message.b() != null) {
+            if (this.message.getActivity() != null) {
                 List<Attachment<?>> list = this.attachments;
                 if (!(list == null || list.isEmpty())) {
                     return new MessageResult.ValidationError("Cannot send attachments with activity action");
@@ -138,15 +138,15 @@ public abstract class MessageRequest {
     /* compiled from: MessageQueue.kt */
     public static final class SendApplicationCommand extends MessageRequest {
         private final ApplicationCommandLocalSendData applicationCommandSendData;
-        private final Message message;
+        private final com.discord.api.message.Message message;
 
         /* JADX WARNING: Illegal instructions before constructor call */
-        public SendApplicationCommand(Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function2<? super MessageResult, ? super Boolean, Unit> function2, long j) {
+        public SendApplicationCommand(com.discord.api.message.Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function2<? super MessageResult, ? super Boolean, Unit> function2, long j) {
             super(r0 == null ? String.valueOf(applicationCommandLocalSendData.getNonce()) : r0, function2, j, null);
             m.checkNotNullParameter(message, "message");
             m.checkNotNullParameter(applicationCommandLocalSendData, "applicationCommandSendData");
             m.checkNotNullParameter(function2, "onCompleted");
-            String B = message.B();
+            String v = message.v();
             this.message = message;
             this.applicationCommandSendData = applicationCommandLocalSendData;
         }
@@ -155,7 +155,7 @@ public abstract class MessageRequest {
             return this.applicationCommandSendData;
         }
 
-        public final Message getMessage() {
+        public final com.discord.api.message.Message getMessage() {
             return this.message;
         }
     }
diff --git a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java
index 8779227788..2b4ca2f9ca 100644
--- a/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java
+++ b/app/src/main/java/com/discord/utilities/mg_recycler/MGRecyclerAdapterSimple.java
@@ -113,9 +113,9 @@ public abstract class MGRecyclerAdapterSimple<D extends MGRecyclerDataPayload> e
         if (list2.isEmpty()) {
             dispatchUpdates(null, list2, list);
         } else if (this.deferredDiffs) {
-            Observable Y = Observable.D(new MGRecyclerAdapterSimple$setData$1(this, list2, list)).Y(a.a());
-            m.checkNotNullExpressionValue(Y, "Observable\n            .…Schedulers.computation())");
-            Observable ui = ObservableExtensionsKt.ui(Y);
+            Observable X = Observable.C(new MGRecyclerAdapterSimple$setData$1(this, list2, list)).X(a.a());
+            m.checkNotNullExpressionValue(X, "Observable\n            .…Schedulers.computation())");
+            Observable ui = ObservableExtensionsKt.ui(X);
             Class<?> cls = getClass();
             MGRecyclerAdapterSimple$setData$2 mGRecyclerAdapterSimple$setData$2 = new MGRecyclerAdapterSimple$setData$2(this, list2, list);
             ObservableExtensionsKt.appSubscribe$default(ui, cls, (Context) null, new MGRecyclerAdapterSimple$setData$4(this), new MGRecyclerAdapterSimple$setData$3(this), (Function0) null, (Function0) null, mGRecyclerAdapterSimple$setData$2, 50, (Object) null);
diff --git a/app/src/main/java/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.java b/app/src/main/java/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.java
index 7dc7025b64..f5c8f99c6f 100644
--- a/app/src/main/java/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.java
+++ b/app/src/main/java/com/discord/utilities/networking/Backoff$TimerScheduler$schedule$1.java
@@ -1,17 +1,40 @@
 package com.discord.utilities.networking;
 
+import com.discord.utilities.logging.Logger;
+import com.discord.utilities.logging.LoggingProvider;
+import com.discord.utilities.networking.Backoff;
 import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
 import kotlin.jvm.functions.Function0;
 /* compiled from: Backoff.kt */
 public final class Backoff$TimerScheduler$schedule$1 extends TimerTask {
     public final /* synthetic */ Function0 $action;
+    public final /* synthetic */ Backoff.TimerScheduler this$0;
 
-    public Backoff$TimerScheduler$schedule$1(Function0 function0) {
+    public Backoff$TimerScheduler$schedule$1(Backoff.TimerScheduler timerScheduler, Function0 function0) {
+        this.this$0 = timerScheduler;
         this.$action = function0;
     }
 
+    /* JADX WARN: Multi-variable type inference failed */
+    /* JADX WARNING: Unknown variable types count: 1 */
     @Override // java.util.TimerTask, java.lang.Runnable
     public void run() {
-        this.$action.mo1invoke();
+        if (Backoff.TimerScheduler.access$getDelegateExecutor$p(this.this$0) == null) {
+            this.$action.mo1invoke();
+            return;
+        }
+        Logger logger = LoggingProvider.INSTANCE.get();
+        if (Backoff.TimerScheduler.access$getDelegateExecutor$p(this.this$0).isShutdown()) {
+            Logger.i$default(logger, Backoff.TimerScheduler.access$getTag$p(this.this$0), "skipping delayed task. executor is not running", null, 4, null);
+            return;
+        }
+        Logger.v$default(logger, Backoff.TimerScheduler.access$getTag$p(this.this$0), "TimerScheduler posting to delegate scheduler", null, 4, null);
+        ExecutorService access$getDelegateExecutor$p = Backoff.TimerScheduler.access$getDelegateExecutor$p(this.this$0);
+        Function0 function0 = this.$action;
+        if (function0 != null) {
+            function0 = new Backoff$sam$java_lang_Runnable$0(function0);
+        }
+        access$getDelegateExecutor$p.execute((Runnable) function0);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/networking/Backoff$sam$java_lang_Runnable$0.java b/app/src/main/java/com/discord/utilities/networking/Backoff$sam$java_lang_Runnable$0.java
new file mode 100644
index 0000000000..8c2e13db54
--- /dev/null
+++ b/app/src/main/java/com/discord/utilities/networking/Backoff$sam$java_lang_Runnable$0.java
@@ -0,0 +1,17 @@
+package com.discord.utilities.networking;
+
+import d0.z.d.m;
+import kotlin.jvm.functions.Function0;
+/* compiled from: Backoff.kt */
+public final class Backoff$sam$java_lang_Runnable$0 implements Runnable {
+    private final /* synthetic */ Function0 function;
+
+    public Backoff$sam$java_lang_Runnable$0(Function0 function0) {
+        this.function = function0;
+    }
+
+    @Override // java.lang.Runnable
+    public final /* synthetic */ void run() {
+        m.checkNotNullExpressionValue(this.function.mo1invoke(), "invoke(...)");
+    }
+}
diff --git a/app/src/main/java/com/discord/utilities/networking/Backoff.java b/app/src/main/java/com/discord/utilities/networking/Backoff.java
index 109541fbfe..d25294e133 100644
--- a/app/src/main/java/com/discord/utilities/networking/Backoff.java
+++ b/app/src/main/java/com/discord/utilities/networking/Backoff.java
@@ -3,6 +3,7 @@ package com.discord.utilities.networking;
 import d0.z.d.m;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -26,8 +27,33 @@ public final class Backoff {
 
     /* compiled from: Backoff.kt */
     public static final class TimerScheduler extends Timer implements Scheduler {
+        private final ExecutorService delegateExecutor;
+        private final String tag;
         private TimerTask timeoutTimerTask;
 
+        public TimerScheduler() {
+            this(null, null, 3, null);
+        }
+
+        public TimerScheduler(String str, ExecutorService executorService) {
+            m.checkNotNullParameter(str, "tag");
+            this.tag = str;
+            this.delegateExecutor = executorService;
+        }
+
+        /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+        public /* synthetic */ TimerScheduler(String str, ExecutorService executorService, int i, DefaultConstructorMarker defaultConstructorMarker) {
+            this((i & 1) != 0 ? "TimerScheduler" : str, (i & 2) != 0 ? null : executorService);
+        }
+
+        public static final /* synthetic */ ExecutorService access$getDelegateExecutor$p(TimerScheduler timerScheduler) {
+            return timerScheduler.delegateExecutor;
+        }
+
+        public static final /* synthetic */ String access$getTag$p(TimerScheduler timerScheduler) {
+            return timerScheduler.tag;
+        }
+
         @Override // java.util.Timer, com.discord.utilities.networking.Backoff.Scheduler
         public synchronized void cancel() {
             TimerTask timerTask = this.timeoutTimerTask;
@@ -43,7 +69,7 @@ public final class Backoff {
             if (timerTask != null) {
                 timerTask.cancel();
             }
-            Backoff$TimerScheduler$schedule$1 backoff$TimerScheduler$schedule$1 = new Backoff$TimerScheduler$schedule$1(function0);
+            Backoff$TimerScheduler$schedule$1 backoff$TimerScheduler$schedule$1 = new Backoff$TimerScheduler$schedule$1(this, function0);
             this.timeoutTimerTask = backoff$TimerScheduler$schedule$1;
             schedule(backoff$TimerScheduler$schedule$1, j);
         }
@@ -65,7 +91,7 @@ public final class Backoff {
 
     /* JADX WARNING: Illegal instructions before constructor call */
     public /* synthetic */ Backoff(long j, long j2, int i, boolean z2, Scheduler scheduler, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this(r0, (i2 & 2) != 0 ? ((long) 10) * r0 : j2, (i2 & 4) != 0 ? Integer.MAX_VALUE : i, (i2 & 8) != 0 ? true : z2, (i2 & 16) != 0 ? new TimerScheduler() : scheduler);
+        this(r0, (i2 & 2) != 0 ? ((long) 10) * r0 : j2, (i2 & 4) != 0 ? Integer.MAX_VALUE : i, (i2 & 8) != 0 ? true : z2, (i2 & 16) != 0 ? new TimerScheduler(null, null, 3, null) : scheduler);
         long j3 = (i2 & 1) != 0 ? 500 : j;
     }
 
diff --git a/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java b/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java
index 5cbb2b583a..1b4388353e 100644
--- a/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java
+++ b/app/src/main/java/com/discord/utilities/networking/NetworkMonitor.java
@@ -26,7 +26,7 @@ public final class NetworkMonitor {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(logger, "logger");
         this.logger = logger;
-        this.networkStateSubject = BehaviorSubject.m0(getState$default(this, context, null, 2, null));
+        this.networkStateSubject = BehaviorSubject.l0(getState$default(this, context, null, 2, null));
         registerConnectivityNetworkMonitor(context);
     }
 
@@ -100,14 +100,14 @@ public final class NetworkMonitor {
     }
 
     public final Observable<Boolean> observeIsConnected() {
-        Observable<Boolean> s2 = observeState().G(NetworkMonitor$observeIsConnected$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "observeState().map { sta… }.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = observeState().F(NetworkMonitor$observeIsConnected$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeState().map { sta… }.distinctUntilChanged()");
+        return r;
     }
 
     public final Observable<State> observeState() {
-        Observable<State> s2 = this.networkStateSubject.K().s();
-        m.checkNotNullExpressionValue(s2, "networkStateSubject.onBa…().distinctUntilChanged()");
-        return s2;
+        Observable<State> r = this.networkStateSubject.J().r();
+        m.checkNotNullExpressionValue(r, "networkStateSubject.onBa…().distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java
index 8664610e72..84d2c77912 100644
--- a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java
+++ b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java
@@ -196,11 +196,11 @@ public final class NoticeBuilders {
         Object[] objArr = new Object[1];
         Map<String, Object> metadata = dialog.getMetadata();
         objArr[0] = metadata != null ? metadata.get("platform_title") : null;
-        return new DialogData(b.a(context, 2131888143, objArr, NoticeBuilders$deleteConnectionModalBuilder$1.INSTANCE), b.g(context, 2131888142, new Object[0], null, 4), b.g(context, 2131893193, new Object[0], null, 4), b.g(context, 2131887178, new Object[0], null, 4), g0.mapOf(o.to(2131364032, new NoticeBuilders$deleteConnectionModalBuilder$2(dialog))), null, 32, null);
+        return new DialogData(b.a(context, 2131888142, objArr, NoticeBuilders$deleteConnectionModalBuilder$1.INSTANCE), b.g(context, 2131888141, new Object[0], null, 4), b.g(context, 2131893276, new Object[0], null, 4), b.g(context, 2131887178, new Object[0], null, 4), g0.mapOf(o.to(2131364075, new NoticeBuilders$deleteConnectionModalBuilder$2(dialog))), null, 32, null);
     }
 
     private final DialogData requestRatingModalBuilder(Context context, StoreNotices.Dialog dialog) {
-        return new DialogData(b.g(context, 2131892511, new Object[0], null, 4), b.g(context, 2131892510, new Object[0], null, 4), b.g(context, 2131891666, new Object[0], null, 4), b.g(context, 2131891423, new Object[0], null, 4), h0.mapOf(o.to(0, NoticeBuilders$requestRatingModalBuilder$1.INSTANCE), o.to(2131364032, NoticeBuilders$requestRatingModalBuilder$2.INSTANCE), o.to(2131364027, NoticeBuilders$requestRatingModalBuilder$3.INSTANCE)), 2131558791);
+        return new DialogData(b.g(context, 2131892590, new Object[0], null, 4), b.g(context, 2131892589, new Object[0], null, 4), b.g(context, 2131891735, new Object[0], null, 4), b.g(context, 2131891494, new Object[0], null, 4), h0.mapOf(o.to(0, NoticeBuilders$requestRatingModalBuilder$1.INSTANCE), o.to(2131364075, NoticeBuilders$requestRatingModalBuilder$2.INSTANCE), o.to(2131364070, NoticeBuilders$requestRatingModalBuilder$3.INSTANCE)), 2131558791);
     }
 
     public final void showNotice(Context context, FragmentManager fragmentManager, StoreNotices.Dialog dialog) {
diff --git a/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java b/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java
index afa9b2db1d..aa5fea0afc 100644
--- a/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java
+++ b/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java
@@ -1,12 +1,11 @@
 package com.discord.utilities.permissions;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerPartial;
 import com.discord.api.user.User;
+import com.discord.models.message.Message;
 import com.discord.models.user.MeUser;
-import com.discord.utilities.message.MessageUtils;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -33,22 +32,22 @@ public final class ManageMessageContext {
             boolean z5;
             m.checkNotNullParameter(message, "message");
             m.checkNotNullParameter(meUser, "meUser");
-            boolean isUserMessage = MessageUtils.INSTANCE.isUserMessage(message);
-            User g = message.g();
+            boolean isUserMessage = message.isUserMessage();
+            User author = message.getAuthor();
             boolean z6 = false;
-            boolean z7 = g != null && g.i() == meUser.getId();
+            boolean z7 = author != null && author.i() == meUser.getId();
             boolean z8 = z2 && !z3;
             boolean z9 = num != null && PermissionUtils.canAndIsElevated(8192, l, meUser.getMfaEnabled(), num.intValue()) && !z4;
             boolean z10 = z9 || z8;
             boolean z11 = z9 || z7;
             if (z7 && isUserMessage) {
-                List<Sticker> I = message.I();
-                if (I == null || I.isEmpty()) {
-                    List<StickerPartial> H = message.H();
-                    if ((H == null || H.isEmpty()) && !z4) {
+                List<Sticker> stickers = message.getStickers();
+                if (stickers == null || stickers.isEmpty()) {
+                    List<StickerPartial> stickerItems = message.getStickerItems();
+                    if ((stickerItems == null || stickerItems.isEmpty()) && !z4) {
                         z5 = true;
                         boolean z12 = !z11 && !z4 && PermissionsContextsKt.isDeleteable(message);
-                        boolean z13 = MessageUtils.isLocal(message) && (z8 || PermissionUtils.can(64, l)) && !z4;
+                        boolean z13 = message.isLocal() && (z8 || PermissionUtils.can(64, l)) && !z4;
                         if (z10 && isUserMessage && !z3 && !z4) {
                             z6 = true;
                         }
@@ -59,7 +58,7 @@ public final class ManageMessageContext {
             z5 = false;
             if (!z11) {
             }
-            if (MessageUtils.isLocal(message)) {
+            if (message.isLocal()) {
             }
             z6 = true;
             return new ManageMessageContext(z9, z5, z12, z13, z6, !z4);
diff --git a/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java b/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java
index 4fcee9954c..b2f4d3a53f 100644
--- a/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java
+++ b/app/src/main/java/com/discord/utilities/permissions/PermissionUtils.java
@@ -144,10 +144,10 @@ public final class PermissionUtils {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(map, "roles");
         boolean z2 = true;
-        if (AnimatableValueParser.y1(channel)) {
+        if (AnimatableValueParser.z1(channel)) {
             if (channel2 != null) {
                 m.checkNotNullParameter(channel, "$this$isPrivateThread");
-                if (channel.z() != 12) {
+                if (channel.A() != 12) {
                     z2 = false;
                 }
                 if (!z2) {
@@ -160,9 +160,9 @@ public final class PermissionUtils {
         if (!(guildRole == null || (guildRole.g() & j) == j)) {
             return false;
         }
-        List<PermissionOverwrite> r = channel.r();
-        if (r != null) {
-            for (PermissionOverwrite permissionOverwrite : r) {
+        List<PermissionOverwrite> s2 = channel.s();
+        if (s2 != null) {
+            for (PermissionOverwrite permissionOverwrite : s2) {
                 if (PermissionOverwriteUtilsKt.denies(permissionOverwrite, j)) {
                     return false;
                 }
@@ -198,15 +198,15 @@ public final class PermissionUtils {
         long j3;
         long j4;
         m.checkNotNullParameter(channel, "channel");
-        if (AnimatableValueParser.y1(channel)) {
+        if (AnimatableValueParser.z1(channel)) {
             j3 = channel2 == null ? 0 : computeThreadPermissions(j, channel, channel2, j2, guildMember, map, z2);
         } else {
-            long e = channel.e();
-            List<PermissionOverwrite> r = channel.r();
-            if (r == null) {
-                r = n.emptyList();
+            long f = channel.f();
+            List<PermissionOverwrite> s2 = channel.s();
+            if (s2 == null) {
+                s2 = n.emptyList();
             }
-            j3 = computeNonThreadPermissions(j, e, j2, guildMember, map, r);
+            j3 = computeNonThreadPermissions(j, f, j2, guildMember, map, s2);
         }
         if (!GuildMemberUtilsKt.isLurker(guildMember)) {
             return j3;
@@ -214,7 +214,7 @@ public final class PermissionUtils {
         Map<Long, StageInstance> emptyMap = map2 != null ? map2 : h0.emptyMap();
         m.checkNotNullParameter(channel, "$this$computeLurkerPermissionsAllowList");
         m.checkNotNullParameter(emptyMap, "stageInstances");
-        if (AnimatableValueParser.u1(channel)) {
+        if (AnimatableValueParser.v1(channel)) {
             StageInstance stageInstance = (StageInstance) a.d(channel, emptyMap);
             if ((stageInstance != null ? stageInstance.e() : null) == StageInstancePrivacyLevel.PUBLIC) {
                 j4 = 4331734016L;
@@ -228,14 +228,14 @@ public final class PermissionUtils {
     public static final long computeThreadPermissions(long j, Channel channel, Channel channel2, long j2, GuildMember guildMember, Map<Long, GuildRole> map, boolean z2) {
         m.checkNotNullParameter(channel, "thread");
         m.checkNotNullParameter(channel2, "parentChannel");
-        long e = channel2.e();
-        List<PermissionOverwrite> r = channel2.r();
-        if (r == null) {
-            r = n.emptyList();
+        long f = channel2.f();
+        List<PermissionOverwrite> s2 = channel2.s();
+        if (s2 == null) {
+            s2 = n.emptyList();
         }
-        long computeNonThreadPermissions = computeNonThreadPermissions(j, e, j2, guildMember, map, r);
+        long computeNonThreadPermissions = computeNonThreadPermissions(j, f, j2, guildMember, map, s2);
         m.checkNotNullParameter(channel, "$this$isPrivateThread");
-        if (!(channel.z() == 12)) {
+        if (!(channel.A() == 12)) {
             return can(34359738368L, Long.valueOf(computeNonThreadPermissions)) ? computeNonThreadPermissions | 2048 : computeNonThreadPermissions;
         }
         if (can(68719476736L, Long.valueOf(computeNonThreadPermissions))) {
@@ -270,9 +270,9 @@ public final class PermissionUtils {
     public final boolean canEveryoneRole(long j, Channel channel, Map<Long, GuildRole> map) {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(map, "roles");
-        long e = channel.e();
-        GuildRole guildRole = map.get(Long.valueOf(e));
-        return canRole(j, guildRole, guildRole != null ? AnimatableValueParser.F0(channel, e) : null);
+        long f = channel.f();
+        GuildRole guildRole = map.get(Long.valueOf(f));
+        return canRole(j, guildRole, guildRole != null ? AnimatableValueParser.F0(channel, f) : null);
     }
 
     public final boolean canRole(long j, GuildRole guildRole, PermissionOverwrite permissionOverwrite) {
@@ -297,15 +297,15 @@ public final class PermissionUtils {
 
     public final boolean hasAccess(Channel channel, Long l) {
         m.checkNotNullParameter(channel, "channel");
-        if (AnimatableValueParser.r1(channel)) {
+        if (AnimatableValueParser.s1(channel)) {
             return true;
         }
-        return can((AnimatableValueParser.j1(channel) || AnimatableValueParser.f1(channel)) ? 1024 : 1048576, l);
+        return can((AnimatableValueParser.k1(channel) || AnimatableValueParser.f1(channel)) ? 1024 : 1048576, l);
     }
 
     public final boolean hasAccessWrite(Channel channel, Long l) {
         m.checkNotNullParameter(channel, "channel");
-        return AnimatableValueParser.r1(channel) || can(3072, l);
+        return AnimatableValueParser.s1(channel) || can(3072, l);
     }
 
     public final boolean hasBypassSlowmodePermissions(Long l) {
diff --git a/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java b/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java
index f15e33b50f..96dea7eeb6 100644
--- a/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java
+++ b/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java
@@ -1,7 +1,6 @@
 package com.discord.utilities.permissions;
 
-import com.discord.api.message.Message;
-import com.discord.utilities.message.MessageUtils;
+import com.discord.models.message.Message;
 import d0.t.n0;
 import d0.t.u;
 import d0.z.d.m;
@@ -16,6 +15,6 @@ public final class PermissionsContextsKt {
 
     public static final boolean isDeleteable(Message message) {
         m.checkNotNullParameter(message, "$this$isDeleteable");
-        return u.contains(DELETEABLE_MESSAGE_TYPES, message.M()) || MessageUtils.isLocal(message);
+        return u.contains(DELETEABLE_MESSAGE_TYPES, message.getType()) || message.isLocal();
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/permissions/VideoPermissionsManager.java b/app/src/main/java/com/discord/utilities/permissions/VideoPermissionsManager.java
index 3c8c498364..81a7ff110c 100644
--- a/app/src/main/java/com/discord/utilities/permissions/VideoPermissionsManager.java
+++ b/app/src/main/java/com/discord/utilities/permissions/VideoPermissionsManager.java
@@ -24,11 +24,11 @@ public final class VideoPermissionsManager {
 
     public final boolean hasVideoPermission(Channel channel, Long l, Long l2) {
         m.checkNotNullParameter(channel, "channel");
-        long g = channel.g();
-        if (l != null && g == l.longValue()) {
+        long h = channel.h();
+        if (l != null && h == l.longValue()) {
             return false;
         }
-        if (AnimatableValueParser.r1(channel)) {
+        if (AnimatableValueParser.s1(channel)) {
             return true;
         }
         return this.permissionsManager.can(512, l2);
diff --git a/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java b/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java
index de048e0c5a..b758b002e8 100644
--- a/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java
+++ b/app/src/main/java/com/discord/utilities/persister/Persister$getObservable$1.java
@@ -49,7 +49,7 @@ public final class Persister$getObservable$1 extends o implements Function0<Subj
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Subject<T, T> mo1invoke() {
-        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.l0());
+        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.k0());
         j jVar = new j(null);
         m.checkNotNullExpressionValue(jVar, "Observable\n          .just(null)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(jVar), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this, serializedSubject), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/utilities/persister/Persister.java b/app/src/main/java/com/discord/utilities/persister/Persister.java
index 02554332a0..e9988251e7 100644
--- a/app/src/main/java/com/discord/utilities/persister/Persister.java
+++ b/app/src/main/java/com/discord/utilities/persister/Persister.java
@@ -109,9 +109,9 @@ public final class Persister<T> {
                 Persister.access$setContext$cp(context);
                 Persister.access$setClock$cp(clock);
                 Persister.access$setPreferencesPreloader$cp(new Preloader(clock));
-                Observable<Boolean> y2 = observable.y(Persister$Companion$init$1.INSTANCE);
-                m.checkNotNullExpressionValue(y2, "persistenceStrategy\n    …er { persist -> persist }");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(y2), Persister.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, Persister$Companion$init$2.INSTANCE, 62, (Object) null);
+                Observable<Boolean> x2 = observable.x(Persister$Companion$init$1.INSTANCE);
+                m.checkNotNullExpressionValue(x2, "persistenceStrategy\n    …er { persist -> persist }");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(x2), Persister.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, Persister$Companion$init$2.INSTANCE, 62, (Object) null);
             }
         }
 
@@ -188,11 +188,11 @@ public final class Persister<T> {
         public Preloader(Clock clock) {
             m.checkNotNullParameter(clock, "clock");
             this.preloadTime = new TimeElapsed(clock, 0, 2, null);
-            SerializedSubject<Persister<?>, Persister<?>> serializedSubject = new SerializedSubject<>(BehaviorSubject.l0());
+            SerializedSubject<Persister<?>, Persister<?>> serializedSubject = new SerializedSubject<>(BehaviorSubject.k0());
             this.preloadSubject = serializedSubject;
-            Observable<Persister<?>> c02 = serializedSubject.c0(AnonymousClass1.INSTANCE);
-            m.checkNotNullExpressionValue(c02, "preloadSubject\n          .takeUntil { it == null }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(c02), Preloader.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+            Observable<Persister<?>> b02 = serializedSubject.b0(AnonymousClass1.INSTANCE);
+            m.checkNotNullExpressionValue(b02, "preloadSubject\n          .takeUntil { it == null }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.computationBuffered(b02), Preloader.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         }
 
         public static final /* synthetic */ void access$handlePreload(Preloader preloader, Persister persister) {
@@ -213,9 +213,9 @@ public final class Persister<T> {
 
         /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: rx.Observable<com.discord.utilities.persister.Persister<?>>, java.lang.Object, rx.Observable<java.lang.Boolean> */
         public final Observable<Boolean> isPreloaded() {
-            Observable s2 = this.preloadSubject.G(Persister$Preloader$isPreloaded$1.INSTANCE).s();
-            m.checkNotNullExpressionValue(s2, "preloadSubject\n         …  .distinctUntilChanged()");
-            return s2;
+            Observable r = this.preloadSubject.F(Persister$Preloader$isPreloaded$1.INSTANCE).r();
+            m.checkNotNullExpressionValue(r, "preloadSubject\n         …  .distinctUntilChanged()");
+            return r;
         }
 
         public final synchronized <T> void preload(Persister<T> persister) {
diff --git a/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java b/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java
index a899e593de..871c5dcc80 100644
--- a/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java
+++ b/app/src/main/java/com/discord/utilities/persister/PersisterConfig.java
@@ -19,17 +19,17 @@ public final class PersisterConfig {
     }
 
     private final Observable<Boolean> getPersistenceStrategy() {
-        Observable<Boolean> I = Observable.I(isNotActive(), Observable.e0(1, TimeUnit.MINUTES).G(PersisterConfig$persistenceStrategy$1.INSTANCE));
-        m.checkNotNullExpressionValue(I, "Observable\n        .merg…  .map { true }\n        )");
-        return I;
+        Observable<Boolean> H = Observable.H(isNotActive(), Observable.d0(1, TimeUnit.MINUTES).F(PersisterConfig$persistenceStrategy$1.INSTANCE));
+        m.checkNotNullExpressionValue(H, "Observable\n        .merg…  .map { true }\n        )");
+        return H;
     }
 
     private final Observable<Boolean> isNotActive() {
-        Observable<Boolean> T = d.d.a().T(1);
-        n nVar = n.f45c;
-        Observable s2 = n.b.G(c.a.d.m.i).s();
-        m.checkNotNullExpressionValue(s2, "numGatewayConnectionCons…  .distinctUntilChanged()");
-        return Observable.j(T, s2, PersisterConfig$isNotActive$1.INSTANCE).s();
+        Observable<Boolean> S = d.d.a().S(1);
+        n nVar = n.f44c;
+        Observable r = n.b.F(c.a.d.m.i).r();
+        m.checkNotNullExpressionValue(r, "numGatewayConnectionCons…  .distinctUntilChanged()");
+        return Observable.j(S, r, PersisterConfig$isNotActive$1.INSTANCE).r();
     }
 
     public final void init(Context context, Clock clock) {
diff --git a/app/src/main/java/com/discord/utilities/platform/Platform.java b/app/src/main/java/com/discord/utilities/platform/Platform.java
index ae8a5d2e16..0d6958e7cb 100644
--- a/app/src/main/java/com/discord/utilities/platform/Platform.java
+++ b/app/src/main/java/com/discord/utilities/platform/Platform.java
@@ -12,23 +12,23 @@ import java.util.Objects;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: Platform.kt */
 public enum Platform {
-    XBOX("Xbox Live", 2131100468, 2131231365, 2131232060, false, true, true, 16, null),
-    BATTLENET("Battle.Net", 2131099687, 2131231347, 2131231440, false, false, false, 112, null),
-    FACEBOOK("Facebook", 2131099868, 2131231352, 2131231598, true, false, true, 32, null),
-    GOOGLE("Google", 2131099905, 2131231354, 2131231655, false, false, false, 112, null),
-    LEAGUEOFLEGENDS("League of Legends", 2131099922, 2131231355, 2131231728, false, false, false, 112, null),
-    OBS("OBS", null, 2131231357, null, false, false, false, 122, null),
-    PATREON("Patreon", null, 2131231358, null, false, false, false, 122, null),
-    REDDIT("Reddit", 2131100216, 2131231359, 2131231885, false, false, true, 48, null),
+    XBOX("Xbox Live", 2131100468, 2131231371, 2131232068, false, true, true, 16, null),
+    BATTLENET("Battle.Net", 2131099687, 2131231353, 2131231446, false, false, false, 112, null),
+    FACEBOOK("Facebook", 2131099868, 2131231358, 2131231604, true, false, true, 32, null),
+    GOOGLE("Google", 2131099905, 2131231360, 2131231661, false, false, false, 112, null),
+    LEAGUEOFLEGENDS("League of Legends", 2131099922, 2131231361, 2131231735, false, false, false, 112, null),
+    OBS("OBS", null, 2131231363, null, false, false, false, 122, null),
+    PATREON("Patreon", null, 2131231364, null, false, false, false, 122, null),
+    REDDIT("Reddit", 2131100216, 2131231365, 2131231893, false, false, true, 48, null),
     SAMSUNG("Samsung Galaxy", null, null, null, false, true, false, 94, null),
-    SKYPE("Skype", 2131100226, 2131231360, 2131231928, false, false, false, 112, null),
-    SPOTIFY("Spotify", 2131100228, 2131231361, 2131231945, false, true, true, 16, null),
-    STEAM("Steam", 2131100365, 2131231362, 2131231964, false, false, true, 48, null),
-    TWITCH("Twitch", 2131100380, 2131231363, 2131232001, false, false, true, 48, null),
-    TWITTER("Twitter", 2131100382, 2131231364, 2131232003, false, false, true, 48, null),
-    XSPLIT("XSplit", null, 2131231366, null, false, false, false, 122, null),
-    YOUTUBE("Youtube", 2131100470, 2131231367, 2131232061, false, false, true, 48, null),
-    GITHUB("Github", 2131099901, 2131231353, 2131231651, false, false, true, 48, null),
+    SKYPE("Skype", 2131100226, 2131231366, 2131231936, false, false, false, 112, null),
+    SPOTIFY("Spotify", 2131100228, 2131231367, 2131231953, false, true, true, 16, null),
+    STEAM("Steam", 2131100365, 2131231368, 2131231972, false, false, true, 48, null),
+    TWITCH("Twitch", 2131100380, 2131231369, 2131232009, false, false, true, 48, null),
+    TWITTER("Twitter", 2131100382, 2131231370, 2131232011, false, false, true, 48, null),
+    XSPLIT("XSplit", null, 2131231372, null, false, false, false, 122, null),
+    YOUTUBE("Youtube", 2131100470, 2131231373, 2131232069, false, false, true, 48, null),
+    GITHUB("Github", 2131099901, 2131231359, 2131231657, false, false, true, 48, null),
     NONE(null, null, null, null, false, false, false, 127, null);
     
     public static final Companion Companion = new Companion(null);
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java
index c856971a95..1b136c60f6 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4.java
@@ -43,6 +43,6 @@ public final class PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4<T, R>
         if (!bool.booleanValue()) {
             return new j(PremiumGuildSubscriptionUtils.ModifySubscriptionSlotResult.FAILURE_MODIFYING_SLOT);
         }
-        return this.$api.updateSubscription(this.$subscription.getId(), new RestAPIParams.UpdateSubscription(null, null, null, PremiumGuildSubscriptionUtils.INSTANCE.calculateAdditionalPlansWithPremiumGuildAdjustment(this.$subscription, this.$cancel ? -1 : 1), 7, null)).G(AnonymousClass1.INSTANCE).M(AnonymousClass2.INSTANCE);
+        return this.$api.updateSubscription(this.$subscription.getId(), new RestAPIParams.UpdateSubscription(null, null, null, PremiumGuildSubscriptionUtils.INSTANCE.calculateAdditionalPlansWithPremiumGuildAdjustment(this.$subscription, this.$cancel ? -1 : 1), 7, null)).F(AnonymousClass1.INSTANCE).L(AnonymousClass2.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
index 4a55e03d91..0f68fe85ed 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.java
@@ -53,9 +53,9 @@ public final class PremiumGuildSubscriptionUtils {
     }
 
     private final Observable<ModifySubscriptionSlotResult> modifySubscriptionSlot(RestAPI restAPI, long j, ModelSubscription modelSubscription, boolean z2, StorePremiumGuildSubscription storePremiumGuildSubscription) {
-        Observable<ModifySubscriptionSlotResult> A = (z2 ? restAPI.cancelSubscriptionSlot(j) : restAPI.uncancelSubscriptionSlot(j)).Y(a.c()).u(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1(storePremiumGuildSubscription)).G(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.INSTANCE).M(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.INSTANCE).A(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4(restAPI, modelSubscription, z2));
-        m.checkNotNullExpressionValue(A, "apiObs\n        .subscrib…N }\n          }\n        }");
-        return A;
+        Observable<ModifySubscriptionSlotResult> z3 = (z2 ? restAPI.cancelSubscriptionSlot(j) : restAPI.uncancelSubscriptionSlot(j)).X(a.c()).t(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$1(storePremiumGuildSubscription)).F(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$2.INSTANCE).L(PremiumGuildSubscriptionUtils$modifySubscriptionSlot$3.INSTANCE).z(new PremiumGuildSubscriptionUtils$modifySubscriptionSlot$4(restAPI, modelSubscription, z2));
+        m.checkNotNullExpressionValue(z3, "apiObs\n        .subscrib…N }\n          }\n        }");
+        return z3;
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r5v8, resolved type: java.lang.Object */
@@ -66,9 +66,9 @@ public final class PremiumGuildSubscriptionUtils {
         m.checkNotNullParameter(modelSubscription, "subscription");
         ModelSubscription.SubscriptionRenewalMutations renewalMutations = modelSubscription.getRenewalMutations();
         if (renewalMutations == null) {
-            list = modelSubscription.getAdditionalPlans();
+            list = modelSubscription.getPremiumAdditionalPlans();
         } else {
-            list = renewalMutations.getAdditionalPlans();
+            list = renewalMutations.getPremiumAdditionalPlans();
             if (list == null) {
                 list = n.emptyList();
             }
@@ -100,7 +100,7 @@ public final class PremiumGuildSubscriptionUtils {
         if (quantity < 0 || subscriptionAdditionalPlan == null) {
             AppLog appLog = AppLog.g;
             Logger.e$default(appLog, "Error calculating additional_plans adjustment, new sub count:" + quantity, null, null, 6, null);
-            return modelSubscription.getAdditionalPlans();
+            return modelSubscription.getPremiumAdditionalPlans();
         }
         ArrayList arrayList = new ArrayList();
         for (Object obj : list) {
diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java b/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java
index c263eb0773..9b3ad07c07 100644
--- a/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java
+++ b/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java
@@ -147,10 +147,10 @@ public final class PremiumUtils {
         if (skuCategory != null) {
             int ordinal = skuCategory.ordinal();
             if (ordinal == 1) {
-                return 2131231143;
+                return 2131231148;
             }
             if (ordinal == 2) {
-                return 2131231144;
+                return 2131231149;
             }
         }
         return 0;
@@ -173,7 +173,7 @@ public final class PremiumUtils {
 
     public final int getPremiumGuildSubscriptionCountFromSubscription(ModelSubscription modelSubscription) {
         m.checkNotNullParameter(modelSubscription, "$this$getPremiumGuildSubscriptionCountFromSubscription");
-        return (modelSubscription.getPlanId() == SubscriptionPlanType.PREMIUM_MONTH_TIER_2.getPlanId() || modelSubscription.getPlanId() == SubscriptionPlanType.PREMIUM_YEAR_TIER_2.getPlanId()) ? 2 : 0;
+        return (modelSubscription.getPremiumBasePlanId() == SubscriptionPlanType.PREMIUM_MONTH_TIER_2.getPlanId() || modelSubscription.getPremiumBasePlanId() == SubscriptionPlanType.PREMIUM_YEAR_TIER_2.getPlanId()) ? 2 : 0;
     }
 
     public final boolean isNitroSku(ModelSku modelSku) {
diff --git a/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java b/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java
index 97ab08caa5..b442237257 100644
--- a/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/presence/ActivityUtilsKt.java
@@ -69,13 +69,13 @@ public final class ActivityUtilsKt {
         StoreStream.Companion companion = StoreStream.Companion;
         long selectedVoiceChannelId = companion.getVoiceChannelSelected().getSelectedVoiceChannelId();
         Channel channel = companion.getChannels().getChannel(selectedVoiceChannelId);
-        if (channel == null || !AnimatableValueParser.u1(channel)) {
+        if (channel == null || !AnimatableValueParser.v1(channel)) {
             return null;
         }
         Map<Long, StageRoles> channelRolesInternal = companion.getStageChannels().getChannelRolesInternal(selectedVoiceChannelId);
         StageRoles r1 = companion.getStageChannels().m11getMyRolesInternalvisDeB4(selectedVoiceChannelId);
-        StageInstance stageInstanceForChannelInternal = companion.getStageInstances().getStageInstanceForChannelInternal(channel.g());
-        if (!(stageInstanceForChannelInternal == null || (guild = companion.getGuilds().getGuild(channel.e())) == null)) {
+        StageInstance stageInstanceForChannelInternal = companion.getStageInstances().getStageInstanceForChannelInternal(channel.h());
+        if (!(stageInstanceForChannelInternal == null || (guild = companion.getGuilds().getGuild(channel.f())) == null)) {
             String r12 = m15packStageChannelPartyIdhLOU_GE(channel, guild, r1, stageInstanceForChannelInternal);
             if (channelRolesInternal == null || (values = channelRolesInternal.values()) == null) {
                 i = 0;
@@ -92,7 +92,7 @@ public final class ActivityUtilsKt {
             StoreStream.Companion companion2 = StoreStream.Companion;
             Activity applicationActivity = companion2.getPresences().getApplicationActivity(companion2.getUsers().getMe().getId(), 834488117758001152L);
             StageCallRichPresencePartyData unpackStageChannelParty = unpackStageChannelParty(applicationActivity);
-            if (!(unpackStageChannelParty != null && unpackStageChannelParty.getGuildId() == guild.getId() && unpackStageChannelParty.getChannelId() == channel.g())) {
+            if (!(unpackStageChannelParty != null && unpackStageChannelParty.getGuildId() == guild.getId() && unpackStageChannelParty.getChannelId() == channel.h())) {
                 applicationActivity = null;
             }
             if (applicationActivity == null || (o = applicationActivity.o()) == null || (str = String.valueOf(o.c())) == null) {
@@ -203,9 +203,9 @@ public final class ActivityUtilsKt {
         String l = Long.toString((stageRoles == null || !StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) ? guild.hasFeature(GuildFeature.PARTNERED) ? 2 : guild.hasFeature(GuildFeature.VERIFIED) ? 4 : 0 : 1, a.checkRadix(16));
         m.checkNotNullExpressionValue(l, "java.lang.Long.toString(this, checkRadix(radix))");
         StringBuilder L = c.d.b.a.a.L("stage:");
-        L.append(channel.e());
+        L.append(channel.f());
         L.append(':');
-        L.append(channel.g());
+        L.append(channel.h());
         L.append(':');
         L.append(l);
         L.append(':');
diff --git a/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java b/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java
index b3960c7cb8..269804c637 100644
--- a/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java
+++ b/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java
@@ -71,7 +71,7 @@ public final class PresenceUtils {
         m.checkNotNullParameter(activity, "activity");
         int ordinal = activity.p().ordinal();
         if (ordinal != 0) {
-            return ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? ordinal != 5 ? b.g(context, 2131894184, new Object[0], null, 4) : b.g(context, 2131894181, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894188, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894182, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894183, new Object[]{activity.h()}, null, 4);
+            return ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? ordinal != 5 ? b.g(context, 2131894285, new Object[0], null, 4) : b.g(context, 2131894282, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894289, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894283, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894284, new Object[]{activity.h()}, null, 4);
         }
         ActivityPlatform j = activity.j();
         if (j != null) {
@@ -81,10 +81,10 @@ public final class PresenceUtils {
                 str = from.getProperName();
             }
             if (str != null) {
-                return b.g(context, 2131894185, new Object[]{str}, null, 4);
+                return b.g(context, 2131894286, new Object[]{str}, null, 4);
             }
         }
-        return b.g(context, 2131894184, new Object[0], null, 4);
+        return b.g(context, 2131894285, new Object[0], null, 4);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0042: APUT  (r4v4 java.lang.Object[]), (0 ??[int, short, byte, char]), (r5v6 java.lang.String) */
@@ -96,7 +96,7 @@ public final class PresenceUtils {
         }
         int ordinal = p.ordinal();
         if (ordinal == 0) {
-            return b.g(context, 2131891911, new Object[]{activity.h()}, null, 4);
+            return b.g(context, 2131891983, new Object[]{activity.h()}, null, 4);
         }
         if (ordinal == 1) {
             Object[] objArr = new Object[1];
@@ -105,9 +105,9 @@ public final class PresenceUtils {
                 e = activity.h();
             }
             objArr[0] = e;
-            return b.g(context, 2131893672, objArr, null, 4);
+            return b.g(context, 2131893769, objArr, null, 4);
         } else if (ordinal == 2) {
-            return b.g(context, 2131890809, new Object[]{activity.h()}, null, 4);
+            return b.g(context, 2131890879, new Object[]{activity.h()}, null, 4);
         } else {
             if (ordinal == 3) {
                 Object[] objArr2 = new Object[1];
@@ -116,7 +116,7 @@ public final class PresenceUtils {
                     e2 = activity.h();
                 }
                 objArr2[0] = e2;
-                return b.g(context, 2131894554, objArr2, null, 4);
+                return b.g(context, 2131894674, objArr2, null, 4);
             } else if (ordinal != 5) {
                 return null;
             } else {
@@ -127,7 +127,7 @@ public final class PresenceUtils {
 
     private final CharSequence getApplicationStreamingString(Context context, Presence presence) {
         Activity playingActivity;
-        return (presence == null || (playingActivity = getPlayingActivity(presence)) == null) ? b.g(context, 2131893673, new Object[0], null, 4) : b.g(context, 2131893672, new Object[]{playingActivity.h()}, null, 4);
+        return (presence == null || (playingActivity = getPlayingActivity(presence)) == null) ? b.g(context, 2131893770, new Object[0], null, 4) : b.g(context, 2131893769, new Object[]{playingActivity.h()}, null, 4);
     }
 
     private final Activity getSpotifyListeningActivity(List<Activity> list) {
@@ -193,16 +193,16 @@ public final class PresenceUtils {
         if (status != null) {
             int ordinal = status.ordinal();
             if (ordinal == 0) {
-                return 2131893511;
+                return 2131893595;
             }
             if (ordinal == 1) {
-                return 2131893507;
+                return 2131893591;
             }
             if (ordinal == 2) {
-                return 2131893505;
+                return 2131893589;
             }
         }
-        return 2131893510;
+        return 2131893594;
     }
 
     private final CharSequence getStatusText(Context context, Presence presence, boolean z2, boolean z3) {
diff --git a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java
index f9e1a94ab5..a3c8cfed8b 100644
--- a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java
+++ b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener$subscribe$1.java
@@ -13,6 +13,6 @@ public final class RepeatingOnTouchListener$subscribe$1<T, R> implements b<Long,
 
     public final Observable<? extends Long> call(Long l) {
         long repeatRate = this.this$0.getRepeatRate();
-        return Observable.F(repeatRate, repeatRate, this.this$0.getTimeUnit(), a.a());
+        return Observable.E(repeatRate, repeatRate, this.this$0.getTimeUnit(), a.a());
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java
index 7c49c74acc..6fd83e12f6 100644
--- a/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java
+++ b/app/src/main/java/com/discord/utilities/press/RepeatingOnTouchListener.java
@@ -39,7 +39,7 @@ public final class RepeatingOnTouchListener implements View.OnTouchListener {
     }
 
     private final void subscribe() {
-        this.subscription = Observable.e0(this.initialDelay, this.timeUnit).A(new RepeatingOnTouchListener$subscribe$1(this)).J(a.a()).X(new RepeatingOnTouchListener$subscribe$2(this), RepeatingOnTouchListener$subscribe$3.INSTANCE);
+        this.subscription = Observable.d0(this.initialDelay, this.timeUnit).z(new RepeatingOnTouchListener$subscribe$1(this)).I(a.a()).W(new RepeatingOnTouchListener$subscribe$2(this), RepeatingOnTouchListener$subscribe$3.INSTANCE);
     }
 
     public final Action0 getAction() {
diff --git a/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java b/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java
index 4e4f42d645..743efcf168 100644
--- a/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java
+++ b/app/src/main/java/com/discord/utilities/recycler/DiffCreator.java
@@ -27,7 +27,7 @@ public final class DiffCreator<T extends List<? extends DiffKeyProvider>, VH ext
     private static final int EXPENSIVE_DIFF_THRESHOLD = 225;
     private Subscription asyncDiffSubscription;
     private final AppComponent asyncDiffSubscriptionScope;
-    private final PublishSubject<UpdateRequest<T, VH>> updateRequestsSubject = PublishSubject.l0();
+    private final PublishSubject<UpdateRequest<T, VH>> updateRequestsSubject = PublishSubject.k0();
 
     /* compiled from: DiffCreator.kt */
     public static final class Companion {
@@ -210,9 +210,9 @@ public final class DiffCreator<T extends List<? extends DiffKeyProvider>, VH ext
     private final void subscribeToAsyncUpdateRequests(AppComponent appComponent) {
         PublishSubject<UpdateRequest<T, VH>> publishSubject = this.updateRequestsSubject;
         m.checkNotNullExpressionValue(publishSubject, "updateRequestsSubject");
-        Observable G = ObservableExtensionsKt.computationBuffered(publishSubject).G(new DiffCreator$subscribeToAsyncUpdateRequests$1(this));
-        m.checkNotNullExpressionValue(G, "updateRequestsSubject\n  …ms)\n          )\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(G, appComponent, null, 2, null), DiffCreator.class, (Context) null, new DiffCreator$subscribeToAsyncUpdateRequests$2(this), (Function1) null, (Function0) null, (Function0) null, new DiffCreator$subscribeToAsyncUpdateRequests$3(this), 58, (Object) null);
+        Observable F = ObservableExtensionsKt.computationBuffered(publishSubject).F(new DiffCreator$subscribeToAsyncUpdateRequests$1(this));
+        m.checkNotNullExpressionValue(F, "updateRequestsSubject\n  …ms)\n          )\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(F, appComponent, null, 2, null), DiffCreator.class, (Context) null, new DiffCreator$subscribeToAsyncUpdateRequests$2(this), (Function1) null, (Function0) null, (Function0) null, new DiffCreator$subscribeToAsyncUpdateRequests$3(this), 58, (Object) null);
     }
 
     public final DiffUtil.DiffResult calculateDiffResult(T t, T t2) {
diff --git a/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java b/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java
index 34c84df227..44c6e4731c 100644
--- a/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java
+++ b/app/src/main/java/com/discord/utilities/rest/AttachmentRequestBody.java
@@ -37,7 +37,7 @@ public final class AttachmentRequestBody extends RequestBody {
 
     @Override // okhttp3.RequestBody
     public MediaType contentType() {
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
         return MediaType.a.b(AttachmentUtilsKt.getMimeType(this.attachment, this.contentResolver));
     }
 
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
index c2d0aa3b21..9fab3a0275 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1.java
@@ -23,7 +23,7 @@ public final class RestAPI$Companion$buildAnalyticsInterceptor$$inlined$invoke$1
         m.checkParameterIsNotNull(c2, "request");
         new LinkedHashMap();
         w wVar = c2.b;
-        String str = c2.f2767c;
+        String str = c2.f2773c;
         RequestBody requestBody = c2.e;
         Map linkedHashMap = c2.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(c2.f);
         Headers.a e = c2.d.e();
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$2.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$2.java
index b9d0466c0a..97b61abd89 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$2.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$2.java
@@ -21,6 +21,6 @@ public final class RestAPI$addGroupRecipients$2<T, R> implements b<Channel, Obse
     }
 
     public final Observable<? extends Channel> call(Channel channel) {
-        return (channel == null || !AnimatableValueParser.p1(channel)) ? RestAPI.access$get_api$p(this.this$0).convertDMToGroup(this.$channelId, ((User) u.first((List<? extends Object>) this.$recipients)).getId()) : new j(channel);
+        return (channel == null || !AnimatableValueParser.q1(channel)) ? RestAPI.access$get_api$p(this.this$0).convertDMToGroup(this.$channelId, ((User) u.first((List<? extends Object>) this.$recipients)).getId()) : new j(channel);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java
index e22ca1e5a2..5c6aa0b94e 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$3.java
@@ -24,7 +24,7 @@ public final class RestAPI$addGroupRecipients$3<T, R> implements b<Channel, Obse
         }
 
         public final Observable<Void> call(User user) {
-            return RestAPI.access$get_api$p(this.this$0.this$0).addChannelRecipient(this.$channel.g(), user.getId());
+            return RestAPI.access$get_api$p(this.this$0.this$0).addChannelRecipient(this.$channel.h(), user.getId());
         }
     }
 
@@ -52,7 +52,7 @@ public final class RestAPI$addGroupRecipients$3<T, R> implements b<Channel, Obse
         }
 
         public final Observable<? extends Channel> call(List<Observable<Void>> list) {
-            return Observable.H(Observable.i0(new q(list))).g0().G(new AnonymousClass1(this));
+            return Observable.G(Observable.h0(new q(list))).f0().F(new AnonymousClass1(this));
         }
     }
 
@@ -64,12 +64,12 @@ public final class RestAPI$addGroupRecipients$3<T, R> implements b<Channel, Obse
 
     public final Observable<? extends Channel> call(Channel channel) {
         List list;
-        if (channel.g() == this.$channelId) {
+        if (channel.h() == this.$channelId) {
             list = this.$recipients;
         } else {
             List list2 = this.$recipients;
             list = list2.subList(1, list2.size());
         }
-        return Observable.B(list).G(new AnonymousClass1(this, channel)).g0().Z(new AnonymousClass2(channel));
+        return Observable.A(list).F(new AnonymousClass1(this, channel)).f0().Y(new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java
index 0f87341333..49272d6a48 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$addGroupRecipients$4.java
@@ -12,8 +12,8 @@ public final class RestAPI$addGroupRecipients$4<T, R> implements b<Channel, Obse
     public static final RestAPI$addGroupRecipients$4 INSTANCE = new RestAPI$addGroupRecipients$4();
 
     public final Observable<? extends Channel> call(Channel channel) {
-        Observable<R> G = StoreStream.Companion.getChannels().observeChannel(channel.g()).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        return G;
+        Observable<R> F = StoreStream.Companion.getChannels().observeChannel(channel.h()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        return F;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java b/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java
index cc269d1ff5..5d03633af0 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI$createOrFetchDM$1.java
@@ -62,6 +62,6 @@ public final class RestAPI$createOrFetchDM$1<T, R> implements b<Map<Long, ? exte
             }
         }
         T t2 = t;
-        return t2 != null ? new j(t2) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.access$get_api$p(this.this$0).userCreateChannel(new RestAPIParams.CreateChannel(this.$userId)), false, 1, null).u(AnonymousClass1.INSTANCE);
+        return t2 != null ? new j(t2) : ObservableExtensionsKt.restSubscribeOn$default(RestAPI.access$get_api$p(this.this$0).userCreateChannel(new RestAPIParams.CreateChannel(this.$userId)), false, 1, null).t(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI.java b/app/src/main/java/com/discord/utilities/rest/RestAPI.java
index 9d484698c3..027ed800ff 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java
@@ -37,6 +37,7 @@ import com.discord.api.stageinstance.StageInstance;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.thread.ThreadListing;
 import com.discord.api.thread.ThreadMember;
+import com.discord.api.user.PatchUserBody;
 import com.discord.api.user.UserSurveyFetchResponse;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.app.AppLog;
@@ -176,7 +177,7 @@ public final class RestAPI implements RestAPIInterface {
 
         @Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider
         public String getUserAgent() {
-            return "Discord-Android/81014";
+            return "Discord-Android/82019";
         }
     }
 
@@ -207,7 +208,7 @@ public final class RestAPI implements RestAPIInterface {
             a aVar = new a(new RestAPI$Companion$buildLoggingInterceptor$1());
             a.EnumC0309a aVar2 = a.EnumC0309a.BASIC;
             m.checkParameterIsNotNull(aVar2, "<set-?>");
-            aVar.f2746c = aVar2;
+            aVar.f2752c = aVar2;
             return aVar;
         }
 
@@ -416,8 +417,8 @@ public final class RestAPI implements RestAPIInterface {
         return Companion.buildLoggingInterceptor();
     }
 
-    public static /* synthetic */ Observable editTextChannel$default(RestAPI restAPI, long j, String str, Integer num, String str2, Boolean bool, Integer num2, int i, Object obj) {
-        return restAPI.editTextChannel(j, (i & 2) != 0 ? null : str, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : str2, (i & 16) != 0 ? null : bool, (i & 32) != 0 ? null : num2);
+    public static /* synthetic */ Observable editTextChannel$default(RestAPI restAPI, long j, String str, Integer num, String str2, Boolean bool, Integer num2, Integer num3, int i, Object obj) {
+        return restAPI.editTextChannel(j, (i & 2) != 0 ? null : str, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : str2, (i & 16) != 0 ? null : bool, (i & 32) != 0 ? null : num2, (i & 64) != 0 ? null : num3);
     }
 
     public static /* synthetic */ Observable editVoiceChannel$default(RestAPI restAPI, long j, String str, String str2, Integer num, Integer num2, Integer num3, String str3, int i, Object obj) {
@@ -558,11 +559,11 @@ public final class RestAPI implements RestAPIInterface {
 
     public final Observable<Channel> addGroupRecipients(long j, List<? extends User> list) {
         m.checkNotNullParameter(list, "recipients");
-        Observable<Channel> y2 = StoreStream.Companion.getChannels().observePrivateChannel(j).y(RestAPI$addGroupRecipients$1.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "StoreStream\n          .g…nnel -> channel != null }");
-        Observable Z = ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 0, false, 3, null).Z(new RestAPI$addGroupRecipients$2(this, j, list)).Z(new RestAPI$addGroupRecipients$3(this, j, list)).Z(RestAPI$addGroupRecipients$4.INSTANCE);
-        m.checkNotNullExpressionValue(Z, "StoreStream\n          .g….filterNull()\n          }");
-        return ObservableExtensionsKt.takeSingleUntilTimeout$default(Z, 0, false, 3, null);
+        Observable<Channel> x2 = StoreStream.Companion.getChannels().observePrivateChannel(j).x(RestAPI$addGroupRecipients$1.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "StoreStream\n          .g…nnel -> channel != null }");
+        Observable Y = ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, false, 3, null).Y(new RestAPI$addGroupRecipients$2(this, j, list)).Y(new RestAPI$addGroupRecipients$3(this, j, list)).Y(RestAPI$addGroupRecipients$4.INSTANCE);
+        m.checkNotNullExpressionValue(Y, "StoreStream\n          .g….filterNull()\n          }");
+        return ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -653,9 +654,9 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     @Override // com.discord.restapi.RestAPIInterface
-    @o("users/@me/promotions/{promoId}/claim-outbound")
-    public Observable<Void> claimOutboundPromotion() {
-        return this._api.claimOutboundPromotion();
+    @o("outbound-promotions/{promotionId}/claim")
+    public Observable<ClaimedOutboundPromotion> claimOutboundPromotion(@s("promotionId") long j) {
+        return this._api.claimOutboundPromotion(j);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -687,9 +688,9 @@ public final class RestAPI implements RestAPIInterface {
 
     public final Observable<Channel> createGroupDM(List<Long> list) {
         m.checkNotNullParameter(list, "userIds");
-        Observable<Channel> u = ObservableExtensionsKt.restSubscribeOn$default(this._api.userCreateChannel(new RestAPIParams.CreateChannel(list)), false, 1, null).u(RestAPI$createGroupDM$1.INSTANCE);
-        m.checkNotNullExpressionValue(u, "_api\n      .userCreateCh…pCreated(channel)\n      }");
-        return u;
+        Observable<Channel> t = ObservableExtensionsKt.restSubscribeOn$default(this._api.userCreateChannel(new RestAPIParams.CreateChannel(list)), false, 1, null).t(RestAPI$createGroupDM$1.INSTANCE);
+        m.checkNotNullExpressionValue(t, "_api\n      .userCreateCh…pCreated(channel)\n      }");
+        return t;
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -722,9 +723,9 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     public final Observable<Channel> createOrFetchDM(long j) {
-        Observable<Channel> Z = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observePrivateChannels(), 0, false, 3, null).Z(new RestAPI$createOrFetchDM$1(this, j));
-        m.checkNotNullExpressionValue(Z, "StoreStream\n          .g…            }\n          }");
-        return Z;
+        Observable<Channel> Y = ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observePrivateChannels(), 0, false, 3, null).Y(new RestAPI$createOrFetchDM$1(this, j));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+        return Y;
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -900,8 +901,8 @@ public final class RestAPI implements RestAPIInterface {
         return this._api.editTextChannel(j, textChannel);
     }
 
-    public final Observable<Channel> editTextChannel(long j, String str, Integer num, String str2, Boolean bool, Integer num2) {
-        return ObservableExtensionsKt.restSubscribeOn$default(this._api.editTextChannel(j, new RestAPIParams.TextChannel(str, num, str2, bool, num2)), false, 1, null);
+    public final Observable<Channel> editTextChannel(long j, String str, Integer num, String str2, Boolean bool, Integer num2, Integer num3) {
+        return ObservableExtensionsKt.restSubscribeOn$default(this._api.editTextChannel(j, new RestAPIParams.TextChannel(str, num, str2, bool, num2, num3)), false, 1, null);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1065,7 +1066,7 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     @Override // com.discord.restapi.RestAPIInterface
-    @f("/users/@me/outbound-promotions/codes")
+    @f("users/@me/outbound-promotions/codes")
     public Observable<List<ClaimedOutboundPromotion>> getClaimedOutboundPromotions() {
         return this._api.getClaimedOutboundPromotions();
     }
@@ -1075,9 +1076,9 @@ public final class RestAPI implements RestAPIInterface {
         if (dynamic == null) {
             m.throwUninitializedPropertyAccessException("apiClientVersions");
         }
-        Observable<R> G = dynamic.get("https://dl.discordapp.net/apps/android/versions.json").G(RestAPI$getClientVersion$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "apiClientVersions\n      …n_version\")?.asInt ?: 0 }");
-        return ObservableExtensionsKt.restSubscribeOn$default(G, false, 1, null);
+        Observable<R> F = dynamic.get("https://dl.discordapp.net/apps/android/versions.json").F(RestAPI$getClientVersion$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "apiClientVersions\n      …n_version\")?.asInt ?: 0 }");
+        return ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1219,9 +1220,9 @@ public final class RestAPI implements RestAPIInterface {
     }
 
     public final Observable<HarvestState> getHarvestStatusGuarded() {
-        Observable<R> G = this._api.getHarvestStatus().G(RestAPI$getHarvestStatusGuarded$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "_api.getHarvestStatus()\n…erRequested()\n          }");
-        return ObservableExtensionsKt.restSubscribeOn(G, false);
+        Observable<R> F = this._api.getHarvestStatus().F(RestAPI$getHarvestStatusGuarded$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "_api.getHarvestStatus()\n…erRequested()\n          }");
+        return ObservableExtensionsKt.restSubscribeOn(F, false);
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1360,6 +1361,12 @@ public final class RestAPI implements RestAPIInterface {
         return this._api.getSticker(j);
     }
 
+    @Override // com.discord.restapi.RestAPIInterface
+    @f("stickers/{stickerId}/guild")
+    public Observable<Guild> getStickerGuild(@s("stickerId") long j) {
+        return this._api.getStickerGuild(j);
+    }
+
     @Override // com.discord.restapi.RestAPIInterface
     @f("sticker-packs/{packId}")
     public Observable<ModelStickerPack> getStickerPack(@s("packId") long j) {
@@ -1444,7 +1451,7 @@ public final class RestAPI implements RestAPIInterface {
     public final Observable<Void> inviteUserToSpeak(Channel channel, long j, Clock clock) {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(clock, "clock");
-        return this._api.updateUserVoiceStates(channel.e(), j, new RestAPIParams.ChannelVoiceStateUpdate(channel.g(), Boolean.FALSE, new UtcDateTime(clock.currentTimeMillis())));
+        return this._api.updateUserVoiceStates(channel.f(), j, new RestAPIParams.ChannelVoiceStateUpdate(channel.h(), Boolean.FALSE, new UtcDateTime(clock.currentTimeMillis())));
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1506,6 +1513,13 @@ public final class RestAPI implements RestAPIInterface {
         return this._api.patchGuildEmoji(j, j2, patchGuildEmoji);
     }
 
+    @Override // com.discord.restapi.RestAPIInterface
+    @i0.g0.n("users/@me")
+    public Observable<com.discord.api.user.User> patchUser(@i0.g0.a PatchUserBody patchUserBody) {
+        m.checkNotNullParameter(patchUserBody, "patchUserBody");
+        return this._api.patchUser(patchUserBody);
+    }
+
     @Override // com.discord.restapi.RestAPIInterface
     @i0.g0.n("users/@me")
     public Observable<com.discord.api.user.User> patchUser(@i0.g0.a RestAPIParams.UserInfo userInfo) {
@@ -1600,9 +1614,9 @@ public final class RestAPI implements RestAPIInterface {
         Guild guild = modelInvite.getGuild();
         pairArr[1] = d0.o.to("location_guild_id", guild != null ? Long.valueOf(guild.o()) : null);
         Channel channel = modelInvite.getChannel();
-        pairArr[2] = d0.o.to("location_channel_id", channel != null ? Long.valueOf(channel.g()) : null);
+        pairArr[2] = d0.o.to("location_channel_id", channel != null ? Long.valueOf(channel.h()) : null);
         Channel channel2 = modelInvite.getChannel();
-        pairArr[3] = d0.o.to("location_channel_type", channel2 != null ? Integer.valueOf(channel2.z()) : null);
+        pairArr[3] = d0.o.to("location_channel_type", channel2 != null ? Integer.valueOf(channel2.A()) : null);
         return ObservableExtensionsKt.restSubscribeOn$default(restAPIInterface.postInviteCode(code, emptyBody, jsonObjectOf(pairArr)), false, 1, null);
     }
 
@@ -1741,7 +1755,7 @@ public final class RestAPI implements RestAPIInterface {
     public final Observable<Void> requestToSpeak(Channel channel, Clock clock) {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(clock, "clock");
-        return this._api.updateMyVoiceStates(channel.e(), new RestAPIParams.ChannelVoiceStateUpdate(channel.g(), null, new UtcDateTime(clock.currentTimeMillis()), 2, null));
+        return this._api.updateMyVoiceStates(channel.f(), new RestAPIParams.ChannelVoiceStateUpdate(channel.h(), null, new UtcDateTime(clock.currentTimeMillis()), 2, null));
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1875,7 +1889,7 @@ public final class RestAPI implements RestAPIInterface {
 
     public final Observable<Void> setMeSuppressed(Channel channel, boolean z2) {
         m.checkNotNullParameter(channel, "channel");
-        return this._api.updateMyVoiceStates(channel.e(), new RestAPIParams.ChannelVoiceStateUpdate(channel.g(), Boolean.valueOf(z2), null, 4, null));
+        return this._api.updateMyVoiceStates(channel.f(), new RestAPIParams.ChannelVoiceStateUpdate(channel.h(), Boolean.valueOf(z2), null, 4, null));
     }
 
     @Override // com.discord.restapi.RestAPIInterface
@@ -1887,7 +1901,7 @@ public final class RestAPI implements RestAPIInterface {
 
     public final Observable<Void> setUserSuppressed(Channel channel, long j, boolean z2) {
         m.checkNotNullParameter(channel, "channel");
-        return this._api.updateUserVoiceStates(channel.e(), j, new RestAPIParams.ChannelVoiceStateUpdate(channel.g(), Boolean.valueOf(z2), null, 4, null));
+        return this._api.updateUserVoiceStates(channel.f(), j, new RestAPIParams.ChannelVoiceStateUpdate(channel.h(), Boolean.valueOf(z2), null, 4, null));
     }
 
     @Override // com.discord.restapi.RestAPIInterface
diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java b/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java
index 107df68e28..6912c571f3 100644
--- a/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java
+++ b/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java
@@ -12,7 +12,7 @@ import kotlin.jvm.functions.Function0;
 /* compiled from: RestAPIAbortMessages.kt */
 public final class RestAPIAbortMessages {
     public static final RestAPIAbortMessages INSTANCE = new RestAPIAbortMessages();
-    private static final Map<Integer, Integer> MESSAGES = h0.mapOf(o.to(80000, 2131887049), o.to(50007, 2131887041), o.to(40003, 2131887040), o.to(40004, 2131887044), o.to(80000, 2131886258), o.to(30002, 2131886261), o.to(80001, 2131886260), o.to(80003, 2131886260), o.to(80002, 2131886260), o.to(80004, 2131886260), o.to(80007, 2131886256), o.to(160006, 2131893949), o.to(160007, 2131893944));
+    private static final Map<Integer, Integer> MESSAGES = h0.mapOf(o.to(80000, 2131887049), o.to(50007, 2131887041), o.to(40003, 2131887040), o.to(40004, 2131887044), o.to(80000, 2131886258), o.to(30002, 2131886261), o.to(80001, 2131886260), o.to(80003, 2131886260), o.to(80002, 2131886260), o.to(80004, 2131886260), o.to(80007, 2131886256), o.to(160006, 2131894049), o.to(160007, 2131894044));
 
     /* compiled from: RestAPIAbortMessages.kt */
     public static final class ResponseResolver {
diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils.java b/app/src/main/java/com/discord/utilities/rest/SendUtils.java
index 1ce4757a7b..9ae7ed57b4 100644
--- a/app/src/main/java/com/discord/utilities/rest/SendUtils.java
+++ b/app/src/main/java/com/discord/utilities/rest/SendUtils.java
@@ -418,7 +418,7 @@ public final class SendUtils {
                 arrayList.add(INSTANCE.getPart((Attachment) obj, contentResolver, a.l("file", i)));
                 i = i2;
             }
-            Observable<SendPayload> m = Observable.m(jVar2, Observable.l(Observable.i0(new q(arrayList))).g0().G(new SendUtils$getSendPayload$2(message2)));
+            Observable<SendPayload> m = Observable.m(jVar2, Observable.l(Observable.h0(new q(arrayList))).f0().F(new SendUtils$getSendPayload$2(message2)));
             m.checkNotNullExpressionValue(m, "Observable.concat(\n     …)\n              }\n      )");
             return m;
         }
@@ -447,7 +447,7 @@ public final class SendUtils {
             if (response2.isKnownResponse() || error.getType() == Error.Type.NETWORK) {
                 error.setShowErrorToasts(true);
             } else {
-                c.a.d.o.g(context, 2131891320, 0, null, 12);
+                c.a.d.o.g(context, 2131891391, 0, null, 12);
             }
         } else if (function02 != null) {
             function02.mo1invoke();
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
index b535ab7c76..47c864ddb7 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableExtensionsKt.java
@@ -32,10 +32,10 @@ public final class ObservableExtensionsKt {
         ObservableExtensionsKt$appSubscribe$subscription$1 observableExtensionsKt$appSubscribe$subscription$1 = new ObservableExtensionsKt$appSubscribe$subscription$1(str, function13, weakReference, function02);
         ObservableExtensionsKt$appSubscribe$subscription$2 observableExtensionsKt$appSubscribe$subscription$2 = new ObservableExtensionsKt$appSubscribe$subscription$2(function0, function02);
         Objects.requireNonNull(observable);
-        Subscription V = observable.V(new b(observableExtensionsKt$sam$rx_functions_Action1$0, observableExtensionsKt$appSubscribe$subscription$1, observableExtensionsKt$appSubscribe$subscription$2));
+        Subscription U = observable.U(new b(observableExtensionsKt$sam$rx_functions_Action1$0, observableExtensionsKt$appSubscribe$subscription$1, observableExtensionsKt$appSubscribe$subscription$2));
         if (function1 != null) {
-            m.checkNotNullExpressionValue(V, "subscription");
-            function1.invoke(V);
+            m.checkNotNullExpressionValue(U, "subscription");
+            function1.invoke(U);
         }
     }
 
@@ -61,41 +61,41 @@ public final class ObservableExtensionsKt {
     public static final <T> Observable<T> bindToComponentLifecycle(Observable<T> observable, AppComponent appComponent) {
         m.checkNotNullParameter(observable, "$this$bindToComponentLifecycle");
         m.checkNotNullParameter(appComponent, "appComponent");
-        Observable<T> b02 = observable.b0(appComponent.getUnsubscribeSignal());
+        Observable<T> a02 = observable.a0(appComponent.getUnsubscribeSignal());
         if (appComponent instanceof Fragment) {
-            b02 = b02.y(new ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1(appComponent));
+            a02 = a02.x(new ObservableExtensionsKt$bindToComponentLifecycle$$inlined$let$lambda$1(appComponent));
         }
-        m.checkNotNullExpressionValue(b02, "takeUntil(appComponent.u…ble\n          }\n        }");
-        return b02;
+        m.checkNotNullExpressionValue(a02, "takeUntil(appComponent.u…ble\n          }\n        }");
+        return a02;
     }
 
     public static final <T> Observable<T> computationBuffered(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$computationBuffered");
-        Observable<T> J = observable.K().Y(a.a()).J(a.a());
-        m.checkNotNullExpressionValue(J, "onBackpressureBuffer()\n …Schedulers.computation())");
-        return J;
+        Observable<T> I = observable.J().X(a.a()).I(a.a());
+        m.checkNotNullExpressionValue(I, "onBackpressureBuffer()\n …Schedulers.computation())");
+        return I;
     }
 
     public static final <T> Observable<T> computationLatest(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$computationLatest");
-        Observable<T> J = observable.L().Y(a.a()).J(a.a());
-        m.checkNotNullExpressionValue(J, "onBackpressureLatest()\n …Schedulers.computation())");
-        return J;
+        Observable<T> I = observable.K().X(a.a()).I(a.a());
+        m.checkNotNullExpressionValue(I, "onBackpressureLatest()\n …Schedulers.computation())");
+        return I;
     }
 
     public static final /* synthetic */ <T> Observable<T> filterIs(Observable<?> observable) {
         m.checkNotNullParameter(observable, "$this$filterIs");
         m.needClassReification();
-        Observable<?> y2 = observable.y(ObservableExtensionsKt$filterIs$1.INSTANCE);
+        Observable<?> x2 = observable.x(ObservableExtensionsKt$filterIs$1.INSTANCE);
         m.needClassReification();
-        Observable<T> observable2 = (Observable<T>) y2.G(ObservableExtensionsKt$filterIs$2.INSTANCE);
+        Observable<T> observable2 = (Observable<T>) x2.F(ObservableExtensionsKt$filterIs$2.INSTANCE);
         m.checkNotNullExpressionValue(observable2, "filter { it is T }.map { it as T }");
         return observable2;
     }
 
     public static final /* synthetic */ <T> Observable<T> filterNull(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$filterNull");
-        Observable<T> observable2 = (Observable<T>) observable.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        Observable<T> observable2 = (Observable<T>) observable.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
         m.checkNotNullExpressionValue(observable2, "filter { it != null }.map { it!! }");
         return observable2;
     }
@@ -103,21 +103,21 @@ public final class ObservableExtensionsKt {
     public static final <T> Observable<T> leadingEdgeThrottle(Observable<T> observable, long j, TimeUnit timeUnit) {
         m.checkNotNullParameter(observable, "$this$leadingEdgeThrottle");
         m.checkNotNullParameter(timeUnit, "timeUnit");
-        Observable<T> i02 = Observable.i0(new r(observable.i, new LeadingEdgeThrottle(j, timeUnit)));
-        m.checkNotNullExpressionValue(i02, "lift(LeadingEdgeThrottle…indowDuration, timeUnit))");
-        return i02;
+        Observable<T> h02 = Observable.h0(new r(observable.i, new LeadingEdgeThrottle(j, timeUnit)));
+        m.checkNotNullExpressionValue(h02, "lift(LeadingEdgeThrottle…indowDuration, timeUnit))");
+        return h02;
     }
 
     public static final <T> Observable<T> restSubscribeOn(Observable<T> observable, boolean z2) {
         m.checkNotNullParameter(observable, "$this$restSubscribeOn");
-        Observable<T> Y = observable.Y(a.c());
+        Observable<T> X = observable.X(a.c());
         if (z2) {
             RetryWithDelay retryWithDelay = RetryWithDelay.INSTANCE;
-            m.checkNotNullExpressionValue(Y, "observable");
-            Y = RetryWithDelay.restRetry$default(retryWithDelay, Y, 0, null, null, 7, null);
+            m.checkNotNullExpressionValue(X, "observable");
+            X = RetryWithDelay.restRetry$default(retryWithDelay, X, 0, null, null, 7, null);
         }
-        m.checkNotNullExpressionValue(Y, "subscribeOn(Schedulers.i… observable\n      }\n    }");
-        return Y;
+        m.checkNotNullExpressionValue(X, "subscribeOn(Schedulers.i… observable\n      }\n    }");
+        return X;
     }
 
     public static /* synthetic */ Observable restSubscribeOn$default(Observable observable, boolean z2, int i, Object obj) {
@@ -129,10 +129,10 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> takeSingleUntilTimeout(Observable<T> observable, long j, boolean z2) {
         m.checkNotNullParameter(observable, "$this$takeSingleUntilTimeout");
-        Observable<T> a02 = observable.a0(1);
-        Observable<T> d02 = z2 ? a02.d0(j, TimeUnit.MILLISECONDS) : a02.b0(Observable.e0(j, TimeUnit.MILLISECONDS));
-        m.checkNotNullExpressionValue(d02, "take(1).let {\n      if (…LISECONDS))\n      }\n    }");
-        return computationLatest(d02);
+        Observable<T> Z = observable.Z(1);
+        Observable<T> c02 = z2 ? Z.c0(j, TimeUnit.MILLISECONDS) : Z.a0(Observable.d0(j, TimeUnit.MILLISECONDS));
+        m.checkNotNullExpressionValue(c02, "take(1).let {\n      if (…LISECONDS))\n      }\n    }");
+        return computationLatest(c02);
     }
 
     public static /* synthetic */ Observable takeSingleUntilTimeout$default(Observable observable, long j, boolean z2, int i, Object obj) {
@@ -147,17 +147,17 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> ui(Observable<T> observable) {
         m.checkNotNullParameter(observable, "$this$ui");
-        Observable<T> J = observable.J(j0.j.b.a.a());
-        m.checkNotNullExpressionValue(J, "observeOn(AndroidSchedulers.mainThread())");
-        return J;
+        Observable<T> I = observable.I(j0.j.b.a.a());
+        m.checkNotNullExpressionValue(I, "observeOn(AndroidSchedulers.mainThread())");
+        return I;
     }
 
     public static final <T> Observable<T> ui(Observable<T> observable, AppComponent appComponent, MGRecyclerAdapterSimple<?> mGRecyclerAdapterSimple) {
         m.checkNotNullParameter(observable, "$this$ui");
         m.checkNotNullParameter(appComponent, "appComponent");
-        Observable<T> w = bindToComponentLifecycle(ui(observable), appComponent).w(new ObservableExtensionsKt$ui$1(mGRecyclerAdapterSimple));
-        m.checkNotNullExpressionValue(w, "ui()\n    .bindToComponen…scribeFromUpdates()\n    }");
-        return w;
+        Observable<T> v = bindToComponentLifecycle(ui(observable), appComponent).v(new ObservableExtensionsKt$ui$1(mGRecyclerAdapterSimple));
+        m.checkNotNullExpressionValue(v, "ui()\n    .bindToComponen…scribeFromUpdates()\n    }");
+        return v;
     }
 
     public static /* synthetic */ Observable ui$default(Observable observable, AppComponent appComponent, MGRecyclerAdapterSimple mGRecyclerAdapterSimple, int i, Object obj) {
@@ -169,9 +169,9 @@ public final class ObservableExtensionsKt {
 
     public static final <T> Observable<T> withDimmer(Observable<T> observable, DimmerView dimmerView, long j) {
         m.checkNotNullParameter(observable, "$this$withDimmer");
-        Observable<T> i02 = Observable.i0(new r(observable.i, new OnDelayedEmissionHandler(new ObservableExtensionsKt$withDimmer$1(dimmerView), j, TimeUnit.MILLISECONDS, null, 8, null)));
-        m.checkNotNullExpressionValue(i02, "lift(\n        OnDelayedE…LISECONDS\n        )\n    )");
-        return i02;
+        Observable<T> h02 = Observable.h0(new r(observable.i, new OnDelayedEmissionHandler(new ObservableExtensionsKt$withDimmer$1(dimmerView), j, TimeUnit.MILLISECONDS, null, 8, null)));
+        m.checkNotNullExpressionValue(h02, "lift(\n        OnDelayedE…LISECONDS\n        )\n    )");
+        return h02;
     }
 
     public static /* synthetic */ Observable withDimmer$default(Observable observable, DimmerView dimmerView, long j, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java b/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java
index fb75f87fae..e7c301aefb 100644
--- a/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java
+++ b/app/src/main/java/com/discord/utilities/rx/ObservableWithLeadingEdgeThrottle.java
@@ -56,7 +56,7 @@ public class ObservableWithLeadingEdgeThrottle {
 
     private static <T, R> Observable<R> combineLatest(List<? extends Observable<? extends T>> list, FuncN<? extends R> funcN, long j, TimeUnit timeUnit, Scheduler scheduler) {
         Observable b = Observable.b(list, IDENTITY_FUNC_N);
-        return Observable.i0(new r(b.i, new LeadingEdgeThrottle(j, timeUnit, scheduler))).G(new AnonymousClass2(funcN));
+        return Observable.h0(new r(b.i, new LeadingEdgeThrottle(j, timeUnit, scheduler))).F(new AnonymousClass2(funcN));
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLatest(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Observable<? extends T8> observable8, Observable<? extends T9> observable9, Func9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> func9, long j, TimeUnit timeUnit) {
diff --git a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
index 34a9448804..ec57b5b885 100644
--- a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
+++ b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler$call$wrappedSubscriber$1.java
@@ -23,9 +23,9 @@ public final class OnDelayedEmissionHandler$call$wrappedSubscriber$1 extends Sub
         if (access$getDelaySubscription$p != null) {
             access$getDelaySubscription$p.unsubscribe();
         }
-        Observable<T> J = new j(null).J(OnDelayedEmissionHandler.access$getScheduler$p(this.this$0));
-        m.checkNotNullExpressionValue(J, "Observable\n            .…    .observeOn(scheduler)");
-        ObservableExtensionsKt.appSubscribe$default(J, OnDelayedEmissionHandler$call$wrappedSubscriber$1.class, (Context) null, (Function1) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2(this), (Function0) null, (Function0) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1(this), 54, (Object) null);
+        Observable<T> I = new j(null).I(OnDelayedEmissionHandler.access$getScheduler$p(this.this$0));
+        m.checkNotNullExpressionValue(I, "Observable\n            .…    .observeOn(scheduler)");
+        ObservableExtensionsKt.appSubscribe$default(I, OnDelayedEmissionHandler$call$wrappedSubscriber$1.class, (Context) null, (Function1) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$2(this), (Function0) null, (Function0) null, new OnDelayedEmissionHandler$call$wrappedSubscriber$1$tryFinish$1(this), 54, (Object) null);
     }
 
     @Override // j0.g
diff --git a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java
index 0f55e8c89f..4cd7dd7ba4 100644
--- a/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java
+++ b/app/src/main/java/com/discord/utilities/rx/OnDelayedEmissionHandler.java
@@ -74,10 +74,10 @@ public final class OnDelayedEmissionHandler<T> implements Observable.b<T, T> {
     public Subscriber<? super T> call(Subscriber<? super T> subscriber) {
         m.checkNotNullParameter(subscriber, "subscriber");
         OnDelayedEmissionHandler$call$wrappedSubscriber$1 onDelayedEmissionHandler$call$wrappedSubscriber$1 = new OnDelayedEmissionHandler$call$wrappedSubscriber$1(this, subscriber);
-        Observable<Long> J = Observable.e0(this.timeout, this.unit).J(this.scheduler);
-        m.checkNotNullExpressionValue(J, "Observable\n        .time…    .observeOn(scheduler)");
+        Observable<Long> I = Observable.d0(this.timeout, this.unit).I(this.scheduler);
+        m.checkNotNullExpressionValue(I, "Observable\n        .time…    .observeOn(scheduler)");
         OnDelayedEmissionHandler$call$1 onDelayedEmissionHandler$call$1 = new OnDelayedEmissionHandler$call$1(this);
-        ObservableExtensionsKt.appSubscribe$default(J, OnDelayedEmissionHandler.class, (Context) null, new OnDelayedEmissionHandler$call$3(this), new OnDelayedEmissionHandler$call$2(onDelayedEmissionHandler$call$wrappedSubscriber$1), (Function0) null, (Function0) null, onDelayedEmissionHandler$call$1, 50, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(I, OnDelayedEmissionHandler.class, (Context) null, new OnDelayedEmissionHandler$call$3(this), new OnDelayedEmissionHandler$call$2(onDelayedEmissionHandler$call$wrappedSubscriber$1), (Function0) null, (Function0) null, onDelayedEmissionHandler$call$1, 50, (Object) null);
         return onDelayedEmissionHandler$call$wrappedSubscriber$1;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java b/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java
index de1d49571a..0826f1c828 100644
--- a/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java
+++ b/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java
@@ -44,9 +44,9 @@ public final class OperatorBufferedDelay<T> implements Observable.b<List<? exten
             m.checkNotNullParameter(observable, "$this$bufferedDelay");
             m.checkNotNullParameter(timeUnit, "timeUnit");
             m.checkNotNullParameter(scheduler, "scheduler");
-            Observable<List<T>> i02 = Observable.i0(new r(observable.i, new OperatorBufferedDelay(j, timeUnit, i, scheduler)));
-            m.checkNotNullExpressionValue(i02, "this.lift(OperatorBuffer…meUnit, size, scheduler))");
-            return i02;
+            Observable<List<T>> h02 = Observable.h0(new r(observable.i, new OperatorBufferedDelay(j, timeUnit, i, scheduler)));
+            m.checkNotNullExpressionValue(h02, "this.lift(OperatorBuffer…meUnit, size, scheduler))");
+            return h02;
         }
     }
 
diff --git a/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java b/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java
index f0a1932ea7..f8e0709a0f 100644
--- a/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java
+++ b/app/src/main/java/com/discord/utilities/rx/RxCoroutineUtilsKt.java
@@ -10,15 +10,15 @@ import s.a.k;
 /* compiled from: RxCoroutineUtils.kt */
 public final class RxCoroutineUtilsKt {
     public static final <T> Object awaitFirst(Observable<T> observable, Continuation<? super T> continuation) {
-        Observable<T> z2 = observable.z();
-        m.checkNotNullExpressionValue(z2, "first()");
-        return awaitSingle(z2, continuation);
+        Observable<T> y2 = observable.y();
+        m.checkNotNullExpressionValue(y2, "first()");
+        return awaitSingle(y2, continuation);
     }
 
     public static final <T> Object awaitSingle(Observable<T> observable, Continuation<? super T> continuation) {
         k kVar = new k(b.intercepted(continuation), 1);
         kVar.A();
-        kVar.e(new RxCoroutineUtilsKt$awaitSingle$2$1(observable.S().X(new RxCoroutineUtilsKt$awaitSingle$2$subscription$1(kVar), new RxCoroutineUtilsKt$awaitSingle$2$subscription$2(kVar))));
+        kVar.e(new RxCoroutineUtilsKt$awaitSingle$2$1(observable.R().W(new RxCoroutineUtilsKt$awaitSingle$2$subscription$1(kVar), new RxCoroutineUtilsKt$awaitSingle$2$subscription$2(kVar))));
         Object u = kVar.u();
         if (u == c.getCOROUTINE_SUSPENDED()) {
             g.probeCoroutineSuspended(continuation);
diff --git a/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java b/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java
index fc6a00ca5f..5ded802235 100644
--- a/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java
+++ b/app/src/main/java/com/discord/utilities/search/history/MGPreferenceSearchHistoryCache.java
@@ -183,25 +183,25 @@ public final class MGPreferenceSearchHistoryCache implements SearchHistoryCache
     @Override // com.discord.utilities.search.history.SearchHistoryCache
     public void clear(StoreSearch.SearchTarget searchTarget) {
         m.checkNotNullParameter(searchTarget, "searchTarget");
-        Observable<R> G = this.backingCache.getObservable().a0(1).G(new MGPreferenceSearchHistoryCache$clear$1(this, searchTarget));
-        m.checkNotNullExpressionValue(G, "backingCache\n        .ge…veAndCopy(searchTarget) }");
-        ObservableExtensionsKt.appSubscribe$default(G, (Context) null, "clear history", (Function1) null, new MGPreferenceSearchHistoryCache$clear$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<R> F = this.backingCache.getObservable().Z(1).F(new MGPreferenceSearchHistoryCache$clear$1(this, searchTarget));
+        m.checkNotNullExpressionValue(F, "backingCache\n        .ge…veAndCopy(searchTarget) }");
+        ObservableExtensionsKt.appSubscribe$default(F, (Context) null, "clear history", (Function1) null, new MGPreferenceSearchHistoryCache$clear$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     @Override // com.discord.utilities.search.history.SearchHistoryCache
     public Observable<Collection<List<QueryNode>>> getHistory(StoreSearch.SearchTarget searchTarget) {
         m.checkNotNullParameter(searchTarget, "searchTarget");
-        Observable<R> G = this.backingCache.getObservable().G(new MGPreferenceSearchHistoryCache$getHistory$1(this, searchTarget));
-        m.checkNotNullExpressionValue(G, "backingCache\n        .ge…{ it.find(searchTarget) }");
-        return G;
+        Observable<R> F = this.backingCache.getObservable().F(new MGPreferenceSearchHistoryCache$getHistory$1(this, searchTarget));
+        m.checkNotNullExpressionValue(F, "backingCache\n        .ge…{ it.find(searchTarget) }");
+        return F;
     }
 
     @Override // com.discord.utilities.search.history.SearchHistoryCache
     public void persistQuery(StoreSearch.SearchTarget searchTarget, List<? extends QueryNode> list) {
         m.checkNotNullParameter(searchTarget, "searchTarget");
         m.checkNotNullParameter(list, "query");
-        Observable<R> G = this.backingCache.getObservable().a0(1).G(new MGPreferenceSearchHistoryCache$persistQuery$1(this, searchTarget, list));
-        m.checkNotNullExpressionValue(G, "backingCache\n        .ge…py(searchTarget, query) }");
-        ObservableExtensionsKt.appSubscribe$default(G, (Context) null, "persist query", (Function1) null, new MGPreferenceSearchHistoryCache$persistQuery$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<R> F = this.backingCache.getObservable().Z(1).F(new MGPreferenceSearchHistoryCache$persistQuery$1(this, searchTarget, list));
+        m.checkNotNullExpressionValue(F, "backingCache\n        .ge…py(searchTarget, query) }");
+        ObservableExtensionsKt.appSubscribe$default(F, (Context) null, "persist query", (Function1) null, new MGPreferenceSearchHistoryCache$persistQuery$2(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java
index 32cdb0bfa4..584f47164a 100644
--- a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java
+++ b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher$makeQuery$2.java
@@ -18,7 +18,7 @@ public final class SearchFetcher$makeQuery$2<T, R> implements b<Observable<? ext
         }
 
         public final Observable<? extends Long> call(Void r3) {
-            return Observable.e0(this.this$0.$resubscribeDelayMillis.get(), TimeUnit.MILLISECONDS);
+            return Observable.d0(this.this$0.$resubscribeDelayMillis.get(), TimeUnit.MILLISECONDS);
         }
     }
 
@@ -28,6 +28,6 @@ public final class SearchFetcher$makeQuery$2<T, R> implements b<Observable<? ext
 
     /* JADX DEBUG: Type inference failed for r2v1. Raw type applied. Possible types: rx.Observable<R>, rx.Observable<?> */
     public final Observable<?> call(Observable<? extends Void> observable) {
-        return (Observable<R>) observable.A(new AnonymousClass1(this));
+        return (Observable<R>) observable.z(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java
index 1c41952b52..e3deb42d40 100644
--- a/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java
+++ b/app/src/main/java/com/discord/utilities/search/network/SearchFetcher.java
@@ -41,9 +41,9 @@ public class SearchFetcher {
 
     private final Observable<ModelSearchResponse> getRestObservable(StoreSearch.SearchTarget searchTarget, Long l, SearchQuery searchQuery) {
         SearchFetcher$getRestObservable$1 searchFetcher$getRestObservable$1 = SearchFetcher$getRestObservable$1.INSTANCE;
-        Observable A = Observable.p(new SearchFetcher$getRestObservable$2(this)).A(new SearchFetcher$getRestObservable$3(searchTarget, l, searchQuery.getParams(), searchQuery));
-        m.checkNotNullExpressionValue(A, "Observable\n        .defe…  )\n          }\n        }");
-        return ObservableExtensionsKt.restSubscribeOn$default(A, false, 1, null);
+        Observable z2 = Observable.p(new SearchFetcher$getRestObservable$2(this)).z(new SearchFetcher$getRestObservable$3(searchTarget, l, searchQuery.getParams(), searchQuery));
+        m.checkNotNullExpressionValue(z2, "Observable\n        .defe…  )\n          }\n        }");
+        return ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null);
     }
 
     private final boolean isIndexing(ModelSearchResponse modelSearchResponse) {
@@ -55,11 +55,11 @@ public class SearchFetcher {
         m.checkNotNullParameter(searchTarget, "searchTarget");
         m.checkNotNullParameter(searchQuery, "searchQuery");
         AtomicLong atomicLong = new AtomicLong();
-        Observable<ModelSearchResponse> u = getRestObservable(searchTarget, l, searchQuery).u(new SearchFetcher$makeQuery$1(this, atomicLong));
+        Observable<ModelSearchResponse> t = getRestObservable(searchTarget, l, searchQuery).t(new SearchFetcher$makeQuery$1(this, atomicLong));
         e.c cVar = new e.c(new SearchFetcher$makeQuery$2(atomicLong));
         AtomicReference<a> atomicReference = a.a;
-        Observable<ModelSearchResponse> c02 = Observable.i0(new y(u, cVar, false, true, j0.l.c.m.a)).c0(new SearchFetcher$makeQuery$3(this));
-        m.checkNotNullExpressionValue(c02, "getRestObservable(search…ntil { !it.isIndexing() }");
-        return c02;
+        Observable<ModelSearchResponse> b02 = Observable.h0(new y(t, cVar, false, true, j0.l.c.m.a)).b0(new SearchFetcher$makeQuery$3(this));
+        m.checkNotNullExpressionValue(b02, "getRestObservable(search…ntil { !it.isIndexing() }");
+        return b02;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java b/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java
index 44934eac25..7b961299c6 100644
--- a/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java
+++ b/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java
@@ -2,8 +2,8 @@ package com.discord.utilities.search.network.state;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.thread.ThreadMember;
+import com.discord.models.message.Message;
 import com.discord.utilities.search.network.SearchQuery;
 import d0.z.d.m;
 import java.util.List;
@@ -18,7 +18,9 @@ public final class SearchState {
     private final List<Channel> threads;
     private final int totalResults;
 
-    public SearchState(QueryFetchState queryFetchState, SearchQuery searchQuery, List<Channel> list, List<ThreadMember> list2, List<Message> list3, boolean z2, int i) {
+    /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: java.util.List<? extends com.discord.api.thread.ThreadMember> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public SearchState(QueryFetchState queryFetchState, SearchQuery searchQuery, List<Channel> list, List<? extends ThreadMember> list2, List<Message> list3, boolean z2, int i) {
         m.checkNotNullParameter(queryFetchState, "queryFetchState");
         this.queryFetchState = queryFetchState;
         this.searchQuery = searchQuery;
@@ -89,7 +91,7 @@ public final class SearchState {
         return this.totalResults;
     }
 
-    public final SearchState copy(QueryFetchState queryFetchState, SearchQuery searchQuery, List<Channel> list, List<ThreadMember> list2, List<Message> list3, boolean z2, int i) {
+    public final SearchState copy(QueryFetchState queryFetchState, SearchQuery searchQuery, List<Channel> list, List<? extends ThreadMember> list2, List<Message> list3, boolean z2, int i) {
         m.checkNotNullParameter(queryFetchState, "queryFetchState");
         return new SearchState(queryFetchState, searchQuery, list, list2, list3, z2, i);
     }
diff --git a/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java b/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java
index 7d696271fb..bc5f55606b 100644
--- a/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java
+++ b/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java
@@ -17,34 +17,34 @@ public final class ContextSearchStringProvider implements SearchStringProvider {
 
     public ContextSearchStringProvider(Context context) {
         m.checkNotNullParameter(context, "context");
-        String string = context.getString(2131893078);
+        String string = context.getString(2131893161);
         m.checkNotNullExpressionValue(string, "context.getString(R.string.search_filter_from)");
         this.fromFilterString = string;
-        String string2 = context.getString(2131893080);
+        String string2 = context.getString(2131893163);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.search_filter_in)");
         this.inFilterString = string2;
-        String string3 = context.getString(2131893082);
+        String string3 = context.getString(2131893165);
         m.checkNotNullExpressionValue(string3, "context.getString(R.string.search_filter_mentions)");
         this.mentionsFilterString = string3;
-        String string4 = context.getString(2131893079);
+        String string4 = context.getString(2131893162);
         m.checkNotNullExpressionValue(string4, "context.getString(R.string.search_filter_has)");
         this.hasFilterString = string4;
-        String string5 = context.getString(2131893057);
+        String string5 = context.getString(2131893140);
         m.checkNotNullExpressionValue(string5, "context.getString(R.string.search_answer_has_link)");
         this.linkAnswerString = string5;
-        String string6 = context.getString(2131893055);
+        String string6 = context.getString(2131893138);
         m.checkNotNullExpressionValue(string6, "context.getString(R.stri….search_answer_has_embed)");
         this.embedAnswerString = string6;
-        String string7 = context.getString(2131893054);
+        String string7 = context.getString(2131893137);
         m.checkNotNullExpressionValue(string7, "context.getString(R.stri…ch_answer_has_attachment)");
         this.fileAnswerString = string7;
-        String string8 = context.getString(2131893059);
+        String string8 = context.getString(2131893142);
         m.checkNotNullExpressionValue(string8, "context.getString(R.stri….search_answer_has_video)");
         this.videoAnswerString = string8;
-        String string9 = context.getString(2131893056);
+        String string9 = context.getString(2131893139);
         m.checkNotNullExpressionValue(string9, "context.getString(R.stri….search_answer_has_image)");
         this.imageAnswerString = string9;
-        String string10 = context.getString(2131893058);
+        String string10 = context.getString(2131893141);
         m.checkNotNullExpressionValue(string10, "context.getString(R.stri….search_answer_has_sound)");
         this.soundAnswerString = string10;
     }
diff --git a/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java b/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
index d0b59e250e..aa926ea906 100644
--- a/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
+++ b/app/src/main/java/com/discord/utilities/search/suggestion/SearchSuggestionEngine.java
@@ -46,7 +46,7 @@ public final class SearchSuggestionEngine {
     public static final SearchSuggestionEngine INSTANCE;
     private static final int MAX_ENTRY_TYPE_COUNT = 10;
     private static final int MAX_USER_SORTING_THRESHOLD = 100;
-    private static final SerializedSubject<CharSequence, CharSequence> membersRequestSubject = new SerializedSubject<>(PublishSubject.l0());
+    private static final SerializedSubject<CharSequence, CharSequence> membersRequestSubject = new SerializedSubject<>(PublishSubject.k0());
     private static Long targetGuildId;
 
     public final /* synthetic */ class WhenMappings {
@@ -90,7 +90,7 @@ public final class SearchSuggestionEngine {
         List<Channel> sortedWith = u.sortedWith(arrayList2, AnimatableValueParser.K0(Channel.Companion));
         ArrayList arrayList3 = new ArrayList(o.collectionSizeOrDefault(sortedWith, 10));
         for (Channel channel : sortedWith) {
-            arrayList3.add(new ChannelSuggestion(AnimatableValueParser.y0(channel), channel.g()));
+            arrayList3.add(new ChannelSuggestion(AnimatableValueParser.y0(channel), channel.h()));
         }
         return u.take(arrayList3, MAX_ENTRY_TYPE_COUNT);
     }
@@ -232,14 +232,14 @@ public final class SearchSuggestionEngine {
     /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: rx.Observable<R>, rx.Observable */
     /* JADX WARNING: Unknown variable types count: 1 */
     private final void setupMemberRequestSubscription() {
-        Observable G = membersRequestSubject.P(750, TimeUnit.MILLISECONDS).G(SearchSuggestionEngine$setupMemberRequestSubscription$1.INSTANCE);
+        Observable F = membersRequestSubject.O(750, TimeUnit.MILLISECONDS).F(SearchSuggestionEngine$setupMemberRequestSubscription$1.INSTANCE);
         SearchSuggestionEngine$setupMemberRequestSubscription$2 searchSuggestionEngine$setupMemberRequestSubscription$2 = SearchSuggestionEngine$setupMemberRequestSubscription$2.INSTANCE;
         if (searchSuggestionEngine$setupMemberRequestSubscription$2 != null) {
             searchSuggestionEngine$setupMemberRequestSubscription$2 = new SearchSuggestionEngine$sam$rx_functions_Func1$0(searchSuggestionEngine$setupMemberRequestSubscription$2);
         }
-        Observable s2 = G.y((b) searchSuggestionEngine$setupMemberRequestSubscription$2).s();
-        m.checkNotNullExpressionValue(s2, "membersRequestSubject\n  …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, SearchSuggestionEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, SearchSuggestionEngine$setupMemberRequestSubscription$3.INSTANCE, 62, (Object) null);
+        Observable r = F.x((b) searchSuggestionEngine$setupMemberRequestSubscription$2).r();
+        m.checkNotNullExpressionValue(r, "membersRequestSubject\n  …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, SearchSuggestionEngine.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, SearchSuggestionEngine$setupMemberRequestSubscription$3.INSTANCE, 62, (Object) null);
     }
 
     public final Long getTargetGuildId() {
diff --git a/app/src/main/java/com/discord/utilities/search/validation/SearchData.java b/app/src/main/java/com/discord/utilities/search/validation/SearchData.java
index e250e96f12..7789983e54 100644
--- a/app/src/main/java/com/discord/utilities/search/validation/SearchData.java
+++ b/app/src/main/java/com/discord/utilities/search/validation/SearchData.java
@@ -33,14 +33,14 @@ public final class SearchData {
         }
 
         public final SearchData buildForChannel(Channel channel, MeUser meUser, Map<Long, GuildMember> map) {
-            List<com.discord.api.user.User> v;
+            List<com.discord.api.user.User> w;
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(map, "guildMembers");
             HashMap hashMap = new HashMap();
             HashMap hashMap2 = new HashMap();
             SearchData$Builder$buildForChannel$1 searchData$Builder$buildForChannel$1 = new SearchData$Builder$buildForChannel$1(this, hashMap, map, hashMap2);
-            if (!(channel == null || (v = channel.v()) == null)) {
-                for (com.discord.api.user.User user : v) {
+            if (!(channel == null || (w = channel.w()) == null)) {
+                for (com.discord.api.user.User user : w) {
                     searchData$Builder$buildForChannel$1.invoke((User) new CoreUser(user));
                 }
             }
@@ -55,7 +55,7 @@ public final class SearchData {
             m.checkNotNullParameter(map4, "guildChannelPermissions");
             HashMap hashMap = new HashMap();
             for (Channel channel : map3.values()) {
-                hashMap.put(AnimatableValueParser.y0(channel), Long.valueOf(channel.g()));
+                hashMap.put(AnimatableValueParser.y0(channel), Long.valueOf(channel.h()));
             }
             HashMap hashMap2 = new HashMap();
             HashMap hashMap3 = new HashMap();
diff --git a/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java b/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java
index fe6cd143e8..112738bc95 100644
--- a/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java
+++ b/app/src/main/java/com/discord/utilities/spotify/SpotifyApiClient.java
@@ -19,7 +19,7 @@ import rx.subjects.BehaviorSubject;
 public final class SpotifyApiClient {
     private final Clock clock;
     private String spotifyAccountId;
-    private final BehaviorSubject<ModelSpotifyTrack> spotifyTrackSubject = BehaviorSubject.l0();
+    private final BehaviorSubject<ModelSpotifyTrack> spotifyTrackSubject = BehaviorSubject.k0();
     private final HashMap<String, ModelSpotifyTrack> spotifyTracks = new HashMap<>();
     private long tokenExpiresAt;
     private Subscription tokenSubscription;
diff --git a/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java b/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java
index 33810055b8..f6b02fd34f 100644
--- a/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java
+++ b/app/src/main/java/com/discord/utilities/stage/StageChannelUtils.java
@@ -33,7 +33,7 @@ public final class StageChannelUtils {
         }
         PermissionUtils permissionUtils = PermissionUtils.INSTANCE;
         Map<Long, GuildMember> map = storeGuilds.getMembers().get(Long.valueOf(j2));
-        return AnimatableValueParser.S0(Long.valueOf(permissionUtils.computeChannelOverwrite(j, j2, map != null ? map.get(Long.valueOf(j)) : null, channel.r())), 268435456);
+        return AnimatableValueParser.S0(Long.valueOf(permissionUtils.computeChannelOverwrite(j, j2, map != null ? map.get(Long.valueOf(j)) : null, channel.s())), 268435456);
     }
 
     public static /* synthetic */ boolean shouldShowEndStageBottomSheet$default(StageChannelUtils stageChannelUtils, long j, StoreChannels storeChannels, StoreStageChannels storeStageChannels, StoreStageInstances storeStageInstances, StoreUser storeUser, int i, Object obj) {
@@ -60,7 +60,7 @@ public final class StageChannelUtils {
         m.checkNotNullParameter(storeStageInstances, "stageInstanceStore");
         m.checkNotNullParameter(storeUser, "userStore");
         Channel channel = storeChannels.getChannel(j);
-        if (channel == null || !AnimatableValueParser.u1(channel) || storeStageInstances.getStageInstanceForChannel(channel.g()) == null || (r9 = storeStageChannels.m10getMyRolesvisDeB4(channel.g())) == null || !StageRoles.m25isModeratorimpl(r9.m28unboximpl()) || (channelRoles = storeStageChannels.getChannelRoles(channel.g())) == null) {
+        if (channel == null || !AnimatableValueParser.v1(channel) || storeStageInstances.getStageInstanceForChannel(channel.h()) == null || (r9 = storeStageChannels.m10getMyRolesvisDeB4(channel.h())) == null || !StageRoles.m25isModeratorimpl(r9.m28unboximpl()) || (channelRoles = storeStageChannels.getChannelRoles(channel.h())) == null) {
             return false;
         }
         long id2 = storeUser.getMe().getId();
diff --git a/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java b/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java
index 2e2b32daaa..6e8d89fd74 100644
--- a/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java
+++ b/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java
@@ -64,11 +64,11 @@ public final class StatefulViews {
             m.checkNotNullExpressionValue(a, "ViewDialogConfirmationBi…tInflater.from(activity))");
             AlertDialog create = new AlertDialog.Builder(this.activity).setView(a.a).create();
             m.checkNotNullExpressionValue(create, "AlertDialog.Builder(acti…logBinding.root).create()");
-            a.d.setText(2131888137);
-            a.e.setText(2131888138);
+            a.d.setText(2131888136);
+            a.e.setText(2131888137);
             a.b.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1(create));
-            a.f1649c.setText(2131891666);
-            a.f1649c.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2(this, create));
+            a.f1646c.setText(2131891735);
+            a.f1646c.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2(this, create));
             create.show();
             return true;
         }
diff --git a/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java b/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
index fb6bc669f9..45c133330e 100644
--- a/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
+++ b/app/src/main/java/com/discord/utilities/streams/StreamContextService$getForUser$1.java
@@ -78,8 +78,8 @@ public final class StreamContextService$getForUser$1<T, R> implements b<ModelApp
             if (((this.$stream instanceof ModelApplicationStream.GuildStream) && guild == null) || user == null) {
                 return null;
             }
-            int A = channel != null ? channel.A() : 0;
-            return new StreamContext(this.$stream, guild, streamPreview, (!(this.$stream instanceof ModelApplicationStream.GuildStream) || PermissionUtils.can(1048576, l) || (channel != null && (channel.g() > j ? 1 : (channel.g() == j ? 0 : -1)) == 0)) ? (!(A > 0 && map.size() >= A) || PermissionUtils.can(16, l)) ? StreamContext.Joinability.CAN_CONNECT : StreamContext.Joinability.VOICE_CHANNEL_FULL : StreamContext.Joinability.MISSING_PERMISSIONS, user, str, activeApplicationStream != null && activeApplicationStream.getState().isStreamActive() && m.areEqual(activeApplicationStream.getStream(), this.$stream), user.getId() == meUser.getId());
+            int B = channel != null ? channel.B() : 0;
+            return new StreamContext(this.$stream, guild, streamPreview, (!(this.$stream instanceof ModelApplicationStream.GuildStream) || PermissionUtils.can(1048576, l) || (channel != null && (channel.h() > j ? 1 : (channel.h() == j ? 0 : -1)) == 0)) ? (!(B > 0 && map.size() >= B) || PermissionUtils.can(16, l)) ? StreamContext.Joinability.CAN_CONNECT : StreamContext.Joinability.VOICE_CHANNEL_FULL : StreamContext.Joinability.MISSING_PERMISSIONS, user, str, activeApplicationStream != null && activeApplicationStream.getState().isStreamActive() && m.areEqual(activeApplicationStream.getStream(), this.$stream), user.getId() == meUser.getId());
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -114,8 +114,8 @@ public final class StreamContextService$getForUser$1<T, R> implements b<ModelApp
         Observable<Long> observePermissionsForChannel = StreamContextService.access$getPermissionsStore$p(this.this$0).observePermissionsForChannel(modelApplicationStream.getChannelId());
         Observable<User> observeUser = StreamContextService.access$getUserStore$p(this.this$0).observeUser(this.$userId);
         Observable observeMe$default = StoreUser.observeMe$default(StreamContextService.access$getUserStore$p(this.this$0), false, 1, null);
-        Observable<R> s2 = StreamContextService.access$getGuildStore$p(this.this$0).observeComputed(j).G(new AnonymousClass1(this)).G(AnonymousClass2.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "guildStore\n             …  .distinctUntilChanged()");
-        return ObservableCombineLatestOverloadsKt.combineLatest(observeGuild, access$getPreviewObservable, observePermissionsForChannel, observeUser, observeMe$default, s2, StreamContextService.access$getVoiceStateStore$p(this.this$0).observe(j, modelApplicationStream.getChannelId()), StreamContextService.access$getChannelStore$p(this.this$0).observeChannel(modelApplicationStream.getChannelId()), StreamContextService.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId(), StreamContextService.access$getApplicationStreamingStore$p(this.this$0).observeActiveStream(), new AnonymousClass3(modelApplicationStream));
+        Observable<R> r = StreamContextService.access$getGuildStore$p(this.this$0).observeComputed(j).F(new AnonymousClass1(this)).F(AnonymousClass2.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "guildStore\n             …  .distinctUntilChanged()");
+        return ObservableCombineLatestOverloadsKt.combineLatest(observeGuild, access$getPreviewObservable, observePermissionsForChannel, observeUser, observeMe$default, r, StreamContextService.access$getVoiceStateStore$p(this.this$0).observe(j, modelApplicationStream.getChannelId()), StreamContextService.access$getChannelStore$p(this.this$0).observeChannel(modelApplicationStream.getChannelId()), StreamContextService.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId(), StreamContextService.access$getApplicationStreamingStore$p(this.this$0).observeActiveStream(), new AnonymousClass3(modelApplicationStream));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/streams/StreamContextService.java b/app/src/main/java/com/discord/utilities/streams/StreamContextService.java
index b386c8c421..ef620acdce 100644
--- a/app/src/main/java/com/discord/utilities/streams/StreamContextService.java
+++ b/app/src/main/java/com/discord/utilities/streams/StreamContextService.java
@@ -100,20 +100,20 @@ public final class StreamContextService {
     }
 
     public final Observable<StreamContext> getForActiveStream() {
-        Observable<R> Z = this.applicationStreamingStore.observeActiveStream().Z(new StreamContextService$getForActiveStream$1(this));
-        m.checkNotNullExpressionValue(Z, "applicationStreamingStor…  )\n          }\n        }");
-        return Z;
+        Observable<R> Y = this.applicationStreamingStore.observeActiveStream().Y(new StreamContextService$getForActiveStream$1(this));
+        m.checkNotNullExpressionValue(Y, "applicationStreamingStor…  )\n          }\n        }");
+        return Y;
     }
 
     public final Observable<Map<Long, StreamContext>> getForAllStreamingUsers() {
-        Observable<Map<Long, StreamContext>> Z = this.applicationStreamingStore.observeStreamsByUser().G(StreamContextService$getForAllStreamingUsers$1.INSTANCE).Z(new StreamContextService$getForAllStreamingUsers$2(this));
-        m.checkNotNullExpressionValue(Z, "applicationStreamingStor…  }\n          }\n        }");
-        return Z;
+        Observable<Map<Long, StreamContext>> Y = this.applicationStreamingStore.observeStreamsByUser().F(StreamContextService$getForAllStreamingUsers$1.INSTANCE).Y(new StreamContextService$getForAllStreamingUsers$2(this));
+        m.checkNotNullExpressionValue(Y, "applicationStreamingStor…  }\n          }\n        }");
+        return Y;
     }
 
     public final Observable<StreamContext> getForUser(long j, boolean z2) {
-        Observable<R> Z = this.applicationStreamingStore.observeStreamsForUser(j).Z(new StreamContextService$getForUser$1(this, z2, j));
-        m.checkNotNullExpressionValue(Z, "applicationStreamingStor…  }\n          }\n        }");
-        return Z;
+        Observable<R> Y = this.applicationStreamingStore.observeStreamsForUser(j).Y(new StreamContextService$getForUser$1(this, z2, j));
+        m.checkNotNullExpressionValue(Y, "applicationStreamingStor…  }\n          }\n        }");
+        return Y;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java b/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
index 9b8c201d8c..5992157156 100644
--- a/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
+++ b/app/src/main/java/com/discord/utilities/surveys/SurveyUtils.java
@@ -90,9 +90,9 @@ public final class SurveyUtils {
             m.checkNotNullExpressionValue(jVar, "Observable.just(Survey.None)");
             return jVar;
         }
-        Observable<R> G = StoreStream.Companion.getUserSurvey().observeUserSurvey().G(SurveyUtils$getSurveyToShow$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get…  )\n          }\n        }");
-        return G;
+        Observable<R> F = StoreStream.Companion.getUserSurvey().observeUserSurvey().F(SurveyUtils$getSurveyToShow$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…  )\n          }\n        }");
+        return F;
     }
 
     public final void init(Application application) {
diff --git a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
index a904ca880c..495cd6e782 100644
--- a/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
+++ b/app/src/main/java/com/discord/utilities/systemlog/SystemLogUtils.java
@@ -174,9 +174,9 @@ public final class SystemLogUtils {
             m.checkNotNullExpressionValue(jVar, "Observable.just(output)");
             return jVar;
         }
-        Observable<LinkedList<String>> Y = Observable.D(new SystemLogUtils$fetch$1(linkedList, regex, z2)).Y(j0.p.a.b().d);
-        m.checkNotNullExpressionValue(Y, "Observable.fromCallable …n(Schedulers.newThread())");
-        return Y;
+        Observable<LinkedList<String>> X = Observable.C(new SystemLogUtils$fetch$1(linkedList, regex, z2)).X(j0.p.a.b().d);
+        m.checkNotNullExpressionValue(X, "Observable.fromCallable …n(Schedulers.newThread())");
+        return X;
     }
 
     private final String hashString(String str) {
@@ -214,9 +214,9 @@ public final class SystemLogUtils {
     }
 
     public final Observable<Tombstone> fetchLastTombstone() {
-        Observable<R> A = fetch(regexExtractTombstone).A(SystemLogUtils$fetchLastTombstone$1.INSTANCE);
-        m.checkNotNullExpressionValue(A, "fetch(regexExtractTombst…ble.just(tombstone)\n    }");
-        return A;
+        Observable<R> z2 = fetch(regexExtractTombstone).z(SystemLogUtils$fetchLastTombstone$1.INSTANCE);
+        m.checkNotNullExpressionValue(z2, "fetch(regexExtractTombst…ble.just(tombstone)\n    }");
+        return z2;
     }
 
     public final Tombstone fetchLastTombstone$app_productionGoogleRelease(Collection<String> collection) {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessagePreprocessor.java b/app/src/main/java/com/discord/utilities/textprocessing/MessagePreprocessor.java
index e37ba3a3b4..d12d34b142 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessagePreprocessor.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessagePreprocessor.java
@@ -182,7 +182,7 @@ public final class MessagePreprocessor implements a {
         MessagePreprocessor$processQuoteChildren$1 messagePreprocessor$processQuoteChildren$1 = new MessagePreprocessor$processQuoteChildren$1(this);
         Iterator<? extends Node<R>> it = collection.iterator();
         while (it.hasNext()) {
-            AnimatableValueParser.G2((Node) it.next(), messagePreprocessor$processQuoteChildren$1);
+            AnimatableValueParser.I2((Node) it.next(), messagePreprocessor$processQuoteChildren$1);
         }
     }
 
@@ -199,7 +199,7 @@ public final class MessagePreprocessor implements a {
                 }
             }
             for (SpoilerNode spoilerNode : arrayList) {
-                AnimatableValueParser.E2(spoilerNode.getChildren(), MessagePreprocessor$processSpoilerChildren$3$1.INSTANCE);
+                AnimatableValueParser.G2(spoilerNode.getChildren(), MessagePreprocessor$processSpoilerChildren$3$1.INSTANCE);
             }
         }
     }
@@ -235,9 +235,9 @@ public final class MessagePreprocessor implements a {
     public final <R extends BasicRenderContext> void process(Collection<? extends Node<R>> collection) {
         m.checkNotNullParameter(collection, "ast");
         stripSimpleEmbedLink(e0.asMutableCollection(collection));
-        AnimatableValueParser.E2(collection, this);
+        AnimatableValueParser.G2(collection, this);
         if (this.shouldJumboify) {
-            AnimatableValueParser.E2(collection, MessagePreprocessor$process$1.INSTANCE);
+            AnimatableValueParser.G2(collection, MessagePreprocessor$process$1.INSTANCE);
         }
         processSpoilerChildren();
         processQuoteChildren(collection);
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser.java
index 187b200aec..1982bee263 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageUnparser.java
@@ -61,6 +61,6 @@ public final class MessageUnparser {
         if (guild == null || (list = guild.getRoles()) == null) {
             list = n.emptyList();
         }
-        return AstRenderer.render(Parser.parse$default(addRule.addRule(messageUnparser.getRoleMentionRule(list)).addRule(messageUnparser.getChannelMentionRule(map)).addRule(messageUnparser.getCustomEmojiRule(emojiSet)).addRule(e.h.c()), str, null, null, 4, null), null);
+        return AstRenderer.render(Parser.parse$default(addRule.addRule(messageUnparser.getRoleMentionRule(list)).addRule(messageUnparser.getChannelMentionRule(map)).addRule(messageUnparser.getCustomEmojiRule(emojiSet)).addRule(e.h.d()), str, null, null, 4, null), null);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.java
index 095763f7d5..935c97655d 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTextReplacementRule$1.java
@@ -15,7 +15,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 /* compiled from: Rules.kt */
 public final class Rules$createTextReplacementRule$1 extends Rule<T, Node<T>, S> {
-    private final List<Rule<T, Node<T>, S>> innerRules = n.listOf((Object[]) new Rule[]{Rules.INSTANCE.createNamedEmojiRule(), e.h.c()});
+    private final List<Rule<T, Node<T>, S>> innerRules = n.listOf((Object[]) new Rule[]{Rules.INSTANCE.createNamedEmojiRule(), e.h.d()});
     public final /* synthetic */ Rules this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules.java
index 5544c0aa50..a462a35f1a 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/Rules.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules.java
@@ -220,7 +220,7 @@ public final class Rules {
         e eVar = e.h;
         Pattern pattern = e.a;
         m.checkNotNullExpressionValue(pattern, "PATTERN_BOLD");
-        return e.b(pattern, new Rules$createBoldColoredRule$1(i));
+        return e.c(pattern, new Rules$createBoldColoredRule$1(i));
     }
 
     public final <T extends ChannelMentionNode.RenderContext, S> Rule<T, ChannelMentionNode<T>, S> createChannelMentionRule() {
@@ -360,7 +360,7 @@ public final class Rules {
         e eVar = e.h;
         Pattern pattern = e.f231c;
         m.checkNotNullExpressionValue(pattern, "PATTERN_STRIKETHRU");
-        return e.b(pattern, new Rules$createStrikethroughColoredRule$1(i));
+        return e.c(pattern, new Rules$createStrikethroughColoredRule$1(i));
     }
 
     public final <T extends EmojiNode.RenderContext, S> Rule<T, Node<T>, S> createTextReplacementRule() {
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/TagsBuilder.java b/app/src/main/java/com/discord/utilities/textprocessing/TagsBuilder.java
index 065fd008b8..94b36bcd91 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/TagsBuilder.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/TagsBuilder.java
@@ -84,7 +84,7 @@ public final class TagsBuilder implements a {
 
     public final void processAst(Collection<? extends Node<?>> collection) {
         m.checkNotNullParameter(collection, "ast");
-        AnimatableValueParser.E2(collection, this);
+        AnimatableValueParser.G2(collection, this);
     }
 
     @Override // c.a.u.b.c.a
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java
index 7d8990d0d2..e2a06d8fe7 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java
@@ -44,7 +44,7 @@ public final class EditedMessageNode<RC> extends StyleNode<RC, CharacterStyle> {
 
         public final String getEditedString(Context context) {
             m.checkNotNullParameter(context, "context");
-            String string = context.getString(2131891162);
+            String string = context.getString(2131891233);
             m.checkNotNullExpressionValue(string, "context.getString(R.string.message_edited)");
             return " (" + string + ')';
         }
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
index 64101b8f8b..a6b1a8725e 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/EmojiNode.java
@@ -224,7 +224,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
         public static final class Custom extends EmojiIdAndType {
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2106id;
+            private final long f2113id;
             private final boolean isAnimated;
             private final String name;
 
@@ -232,14 +232,14 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             public Custom(long j, boolean z2, String str) {
                 super(null);
                 m.checkNotNullParameter(str, "name");
-                this.f2106id = j;
+                this.f2113id = j;
                 this.isAnimated = z2;
                 this.name = str;
             }
 
             public static /* synthetic */ Custom copy$default(Custom custom, long j, boolean z2, String str, int i, Object obj) {
                 if ((i & 1) != 0) {
-                    j = custom.f2106id;
+                    j = custom.f2113id;
                 }
                 if ((i & 2) != 0) {
                     z2 = custom.isAnimated;
@@ -251,7 +251,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             }
 
             public final long component1() {
-                return this.f2106id;
+                return this.f2113id;
             }
 
             public final boolean component2() {
@@ -276,11 +276,11 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
                     return false;
                 }
                 Custom custom = (Custom) obj;
-                return this.f2106id == custom.f2106id && this.isAnimated == custom.isAnimated && m.areEqual(this.name, custom.name);
+                return this.f2113id == custom.f2113id && this.isAnimated == custom.isAnimated && m.areEqual(this.name, custom.name);
             }
 
             public final long getId() {
-                return this.f2106id;
+                return this.f2113id;
             }
 
             public final String getName() {
@@ -289,7 +289,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
 
             @Override // java.lang.Object
             public int hashCode() {
-                int a = b.a(this.f2106id) * 31;
+                int a = b.a(this.f2113id) * 31;
                 boolean z2 = this.isAnimated;
                 if (z2) {
                     z2 = true;
@@ -309,7 +309,7 @@ public final class EmojiNode<T extends RenderContext> extends a<T> implements Sp
             @Override // java.lang.Object
             public String toString() {
                 StringBuilder L = c.d.b.a.a.L("Custom(id=");
-                L.append(this.f2106id);
+                L.append(this.f2113id);
                 L.append(", isAnimated=");
                 L.append(this.isAnimated);
                 L.append(", name=");
diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
index f66d080c6e..7df8d6b1ae 100644
--- a/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
+++ b/app/src/main/java/com/discord/utilities/textprocessing/node/SpoilerNode.java
@@ -16,7 +16,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
     private final String content;
 
     /* renamed from: id  reason: collision with root package name */
-    private int f2107id = -1;
+    private int f2114id = -1;
     private boolean isRevealed;
 
     /* compiled from: SpoilerNode.kt */
@@ -58,7 +58,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
     }
 
     public final int getId() {
-        return this.f2107id;
+        return this.f2114id;
     }
 
     @Override // com.discord.utilities.textprocessing.node.Spoilerable
@@ -101,7 +101,7 @@ public final class SpoilerNode<T extends RenderContext> extends Node<T> implemen
     }
 
     public final void updateState(int i, boolean z2) {
-        this.f2107id = i;
+        this.f2114id = i;
         setRevealed(z2);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java b/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java
index eddca5e9f8..4c5e5e9e4e 100644
--- a/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java
+++ b/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java
@@ -3,13 +3,14 @@ package com.discord.utilities.threads;
 import android.content.Context;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
+import com.discord.api.guild.GuildFeature;
 import com.discord.api.thread.ThreadMetadata;
+import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreThreadsActiveJoined;
 import com.discord.stores.StoreThreadsJoined;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.time.Clock;
@@ -18,11 +19,12 @@ import com.discord.utilities.time.TimeUtils;
 import com.discord.widgets.chat.list.CreateThreadsFeatureFlag;
 import com.discord.widgets.chat.list.ViewThreadsFeatureFlag;
 import d0.d0.f;
+import d0.o;
 import d0.t.g0;
 import d0.t.h0;
 import d0.t.n;
-import d0.t.o;
 import d0.t.t;
+import d0.t.u;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,22 +33,34 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedSet;
 import rx.Observable;
 /* compiled from: ThreadUtils.kt */
 public final class ThreadUtils {
+    public static final int DEFAULT_AUTO_ARCHIVE_DURATION = 1440;
     public static final ThreadUtils INSTANCE = new ThreadUtils();
     public static final int MAX_DISPLAYED_THREAD_BROWSER_ICON_COUNT = 99;
     public static final int MAX_THREAD_NAME_LENGTH = 30;
+    private static final List<Integer> THREAD_AUTO_ARCHIVE_DURATIONS;
+    private static final LinkedHashMap<Integer, Integer> THREAD_AUTO_ARCHIVE_DURATION_NAMES;
+
+    static {
+        LinkedHashMap<Integer, Integer> linkedMapOf = h0.linkedMapOf(o.to(60, 2131886778), o.to(1440, 2131886780), o.to(4320, 2131886781), o.to(10080, 2131886779));
+        THREAD_AUTO_ARCHIVE_DURATION_NAMES = linkedMapOf;
+        Set<Integer> keySet = linkedMapOf.keySet();
+        m.checkNotNullExpressionValue(keySet, "THREAD_AUTO_ARCHIVE_DURATION_NAMES.keys");
+        THREAD_AUTO_ARCHIVE_DURATIONS = u.toList(keySet);
+    }
 
     private ThreadUtils() {
     }
 
-    public static /* synthetic */ Observable createThread$default(ThreadUtils threadUtils, long j, Long l, String str, Integer num, int i, Object obj) {
-        if ((i & 8) != 0) {
+    public static /* synthetic */ Observable createThread$default(ThreadUtils threadUtils, long j, Long l, int i, String str, Integer num, int i2, Object obj) {
+        if ((i2 & 16) != 0) {
             num = null;
         }
-        return threadUtils.createThread(j, l, str, num);
+        return threadUtils.createThread(j, l, i, str, num);
     }
 
     public static /* synthetic */ long getThreadAckMessageTimestamp$default(ThreadUtils threadUtils, Channel channel, Long l, Long l2, Clock clock, int i, Object obj) {
@@ -65,7 +79,7 @@ public final class ThreadUtils {
     private final Map<Long, Collection<Channel>> prependSelectedThread(Map<Long, ? extends Collection<Channel>> map, Channel channel) {
         boolean z2;
         boolean z3;
-        Collection collection = (Collection) map.get(Long.valueOf(channel.q()));
+        Collection collection = (Collection) map.get(Long.valueOf(channel.r()));
         if (collection == null) {
             collection = n.emptyList();
         }
@@ -75,7 +89,7 @@ public final class ThreadUtils {
                 if (!it.hasNext()) {
                     break;
                 }
-                if (((Channel) it.next()).g() == channel.g()) {
+                if (((Channel) it.next()).h() == channel.h()) {
                     z3 = true;
                     continue;
                 } else {
@@ -93,7 +107,7 @@ public final class ThreadUtils {
             return map;
         }
         Map<Long, Collection<Channel>> mutableMap = h0.toMutableMap(map);
-        Long valueOf = Long.valueOf(channel.q());
+        Long valueOf = Long.valueOf(channel.r());
         List mutableListOf = n.mutableListOf(channel);
         mutableListOf.addAll(collection);
         mutableMap.put(valueOf, mutableListOf);
@@ -107,7 +121,7 @@ public final class ThreadUtils {
             Map.Entry entry = (Map.Entry) it.next();
             Object key = entry.getKey();
             SortedSet<StoreThreadsActiveJoined.ActiveJoinedThread> sortedSet = t.toSortedSet(((Map) entry.getValue()).values(), INSTANCE.getThreadTimestampComparator());
-            ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(sortedSet, 10));
+            ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(sortedSet, 10));
             for (StoreThreadsActiveJoined.ActiveJoinedThread activeJoinedThread : sortedSet) {
                 arrayList.add(activeJoinedThread.getChannel());
             }
@@ -118,45 +132,41 @@ public final class ThreadUtils {
 
     public final String autoArchiveDurationName(Context context, int i) {
         m.checkNotNullParameter(context, "context");
-        if (i == 60) {
-            String string = context.getString(2131886778);
-            m.checkNotNullExpressionValue(string, "context.getString(R.stri…_archive_duration_1_hour)");
-            return string;
-        } else if (i == 1440) {
-            String string2 = context.getString(2131886780);
-            m.checkNotNullExpressionValue(string2, "context.getString(R.stri…rchive_duration_24_hours)");
-            return string2;
-        } else if (i == 4320) {
-            String string3 = context.getString(2131886781);
-            m.checkNotNullExpressionValue(string3, "context.getString(R.stri…_archive_duration_3_days)");
-            return string3;
-        } else if (i != 10080) {
-            String quantityString = context.getResources().getQuantityString(2131755065, i / 60);
-            m.checkNotNullExpressionValue(quantityString, "context.resources.getQua…ours_hours, minutes / 60)");
-            return quantityString;
-        } else {
-            String string4 = context.getString(2131886779);
-            m.checkNotNullExpressionValue(string4, "context.getString(R.stri…_archive_duration_1_week)");
-            return string4;
+        Integer num = THREAD_AUTO_ARCHIVE_DURATION_NAMES.get(Integer.valueOf(i));
+        if (num != null) {
+            m.checkNotNullExpressionValue(num, "it");
+            String string = context.getString(num.intValue());
+            if (string != null) {
+                return string;
+            }
         }
+        String quantityString = context.getResources().getQuantityString(2131755065, i / 60);
+        m.checkNotNullExpressionValue(quantityString, "context.resources.getQua…ours_hours, minutes / 60)");
+        return quantityString;
     }
 
-    public final boolean canCreatePrivateThread(Long l, Channel channel, long j) {
-        return ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(j) && ((channel != null && PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) && PermissionUtils.can(68719476736L, l) && PermissionUtils.can(65536, l)) && (channel != null && !AnimatableValueParser.y1(channel));
+    public final boolean canCreatePrivateThread(Long l, Channel channel, Guild guild) {
+        if (guild == null || channel == null) {
+            return false;
+        }
+        return isThreadsEnabled(guild.getId()) && (PermissionUtils.INSTANCE.hasAccessWrite(channel, l) && PermissionUtils.can(68719476736L, l) && PermissionUtils.can(65536, l)) && (AnimatableValueParser.z1(channel) ^ true) && guild.hasFeature(GuildFeature.PRIVATE_THREADS);
     }
 
-    public final boolean canCreatePublicThread(Long l, Channel channel, Message message, long j) {
-        return ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(j) && ((channel != null && PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) && PermissionUtils.can(34359738368L, l)) && ((message == null || !MessageUtils.INSTANCE.isSystemMessage(message)) && channel != null && !AnimatableValueParser.y1(channel) && (message == null || !MessageUtils.INSTANCE.hasThread(message)));
+    public final boolean canCreatePublicThread(Long l, Channel channel, Message message, Guild guild) {
+        if (guild == null || channel == null) {
+            return false;
+        }
+        return isThreadsEnabled(guild.getId()) && (PermissionUtils.INSTANCE.hasAccessWrite(channel, l) && PermissionUtils.can(34359738368L, l)) && ((message == null || !message.isSystemMessage()) && !AnimatableValueParser.z1(channel) && (message == null || !message.hasThread()));
     }
 
-    public final boolean canCreateThread(Long l, Channel channel, Message message, long j) {
-        return canCreatePublicThread(l, channel, message, j) || canCreatePrivateThread(l, channel, j);
+    public final boolean canCreateThread(Long l, Channel channel, Message message, Guild guild) {
+        return canCreatePublicThread(l, channel, message, guild) || canCreatePrivateThread(l, channel, guild);
     }
 
     public final boolean canManageThread(User user, Channel channel, Long l) {
         m.checkNotNullParameter(user, "user");
         m.checkNotNullParameter(channel, "channel");
-        if (channel.p() != user.getId() || !PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) {
+        if (channel.q() != user.getId() || !PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) {
             return PermissionUtils.can(17179869184L, l) && PermissionUtils.INSTANCE.hasAccess(channel, l);
         }
         return true;
@@ -164,8 +174,8 @@ public final class ThreadUtils {
 
     public final boolean canUnarchiveThread(Channel channel, Long l) {
         m.checkNotNullParameter(channel, "channel");
-        ThreadMetadata x2 = channel.x();
-        return m.areEqual(x2 != null ? Boolean.valueOf(x2.d()) : null, Boolean.TRUE) ? PermissionUtils.can(17179869184L, l) && PermissionUtils.INSTANCE.hasAccessWrite(channel, l) : PermissionUtils.INSTANCE.hasAccessWrite(channel, l);
+        ThreadMetadata y2 = channel.y();
+        return m.areEqual(y2 != null ? Boolean.valueOf(y2.d()) : null, Boolean.TRUE) ? PermissionUtils.can(17179869184L, l) && PermissionUtils.INSTANCE.hasAccessWrite(channel, l) : PermissionUtils.INSTANCE.hasAccessWrite(channel, l);
     }
 
     public final boolean canViewAllPrivateThreads(Long l) {
@@ -179,11 +189,11 @@ public final class ThreadUtils {
     public final long computeThreadAutoArchiveTimeMs(Channel channel) {
         String a;
         m.checkNotNullParameter(channel, "channel");
-        long h = (channel.h() >>> 22) + 1420070400000L;
-        ThreadMetadata x2 = channel.x();
-        int c2 = (x2 != null ? x2.c() : 0) * 60 * 1000;
-        ThreadMetadata x3 = channel.x();
-        return Math.max(h, (x3 == null || (a = x3.a()) == null) ? 0 : TimeUtils.parseUTCDate(a)) + ((long) c2);
+        long i = (channel.i() >>> 22) + 1420070400000L;
+        ThreadMetadata y2 = channel.y();
+        int c2 = (y2 != null ? y2.c() : 0) * 60 * 1000;
+        ThreadMetadata y3 = channel.y();
+        return Math.max(i, (y3 == null || (a = y3.a()) == null) ? 0 : TimeUtils.parseUTCDate(a)) + ((long) c2);
     }
 
     public final int computeThreadNotificationSetting(StoreThreadsJoined.JoinedThread joinedThread, boolean z2) {
@@ -204,9 +214,9 @@ public final class ThreadUtils {
         return 2;
     }
 
-    public final Observable<Channel> createThread(long j, Long l, String str, Integer num) {
+    public final Observable<Channel> createThread(long j, Long l, int i, String str, Integer num) {
         m.checkNotNullParameter(str, "name");
-        RestAPIParams.ThreadCreationSettings threadCreationSettings = new RestAPIParams.ThreadCreationSettings(str, num);
+        RestAPIParams.ThreadCreationSettings threadCreationSettings = new RestAPIParams.ThreadCreationSettings(str, i, num);
         return l == null ? RestAPI.Companion.getApi().createThread(j, threadCreationSettings) : RestAPI.Companion.getApi().createThreadFromMessage(j, l.longValue(), threadCreationSettings);
     }
 
@@ -227,26 +237,38 @@ public final class ThreadUtils {
         return sb.toString();
     }
 
+    public final List<Integer> getTHREAD_AUTO_ARCHIVE_DURATIONS() {
+        return THREAD_AUTO_ARCHIVE_DURATIONS;
+    }
+
+    public final LinkedHashMap<Integer, Integer> getTHREAD_AUTO_ARCHIVE_DURATION_NAMES() {
+        return THREAD_AUTO_ARCHIVE_DURATION_NAMES;
+    }
+
     public final long getThreadAckMessageTimestamp(Channel channel, Long l, Long l2, Clock clock) {
         String a;
         m.checkNotNullParameter(channel, "$this$getThreadAckMessageTimestamp");
         m.checkNotNullParameter(clock, "clock");
         long longValue = l != null ? l.longValue() : clock.currentTimeMillis();
         long longValue2 = l2 != null ? l2.longValue() - ((long) 5000) : 0;
-        ThreadMetadata x2 = channel.x();
-        long max = Math.max(longValue2, (x2 == null || (a = x2.a()) == null) ? 0 : TimeUtils.parseUTCDate(a));
+        ThreadMetadata y2 = channel.y();
+        long max = Math.max(longValue2, (y2 == null || (a = y2.a()) == null) ? 0 : TimeUtils.parseUTCDate(a));
         if (max == 0) {
-            max = TimeUtils.parseSnowflake(Long.valueOf(channel.g()));
+            max = TimeUtils.parseSnowflake(Long.valueOf(channel.h()));
         }
         return Math.max(longValue, max);
     }
 
+    public final boolean isThreadsEnabled(long j) {
+        return ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(j);
+    }
+
     public final Map<Long, Collection<Channel>> sortThreadsForChannelList(Map<Long, ? extends Map<Long, StoreThreadsActiveJoined.ActiveJoinedThread>> map, Channel channel) {
         m.checkNotNullParameter(map, "threadsMap");
         if (!ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled()) {
             return h0.emptyMap();
         }
         Map<Long, Collection<Channel>> sortThreadsByJoinedDate = sortThreadsByJoinedDate(map);
-        return (channel == null || !AnimatableValueParser.y1(channel)) ? sortThreadsByJoinedDate : prependSelectedThread(sortThreadsByJoinedDate, channel);
+        return (channel == null || !AnimatableValueParser.z1(channel)) ? sortThreadsByJoinedDate : prependSelectedThread(sortThreadsByJoinedDate, channel);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/uri/UriHandler.java b/app/src/main/java/com/discord/utilities/uri/UriHandler.java
index 114feab424..2f8a075996 100644
--- a/app/src/main/java/com/discord/utilities/uri/UriHandler.java
+++ b/app/src/main/java/com/discord/utilities/uri/UriHandler.java
@@ -126,11 +126,11 @@ public final class UriHandler {
     private final void showUnhandledUrlDialog(Context context, String str) {
         AnalyticsTracker.INSTANCE.unhandledUrl(str);
         View inflate = LayoutInflater.from(context).inflate(2131558544, (ViewGroup) null, false);
-        int i = 2131365335;
-        TextView textView = (TextView) inflate.findViewById(2131365335);
+        int i = 2131365391;
+        TextView textView = (TextView) inflate.findViewById(2131365391);
         if (textView != null) {
-            i = 2131365336;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365336);
+            i = 2131365392;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365392);
             if (materialButton != null) {
                 LinearLayout linearLayout = (LinearLayout) inflate;
                 LayoutUnhandledUriBinding layoutUnhandledUriBinding = new LayoutUnhandledUriBinding(linearLayout, textView, materialButton);
diff --git a/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java b/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java
index b2365c2c3f..c3f3629841 100644
--- a/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java
+++ b/app/src/main/java/com/discord/utilities/video/VideoPlayerIdleDetector.java
@@ -61,9 +61,9 @@ public final class VideoPlayerIdleDetector {
 
     private final void beginIdleDetectionTimer() {
         cancelIdleDetectionTimer();
-        Observable<Long> J = Observable.f0(this.idleDetectionMs, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler).J(this.idleDetectionScheduler);
-        m.checkNotNullExpressionValue(J, "Observable\n        .time…n(idleDetectionScheduler)");
-        ObservableExtensionsKt.appSubscribe$default(J, VideoPlayerIdleDetector.class, (Context) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$2(this), (Function1) null, (Function0) null, (Function0) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$1(this), 58, (Object) null);
+        Observable<Long> I = Observable.e0(this.idleDetectionMs, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler).I(this.idleDetectionScheduler);
+        m.checkNotNullExpressionValue(I, "Observable\n        .time…n(idleDetectionScheduler)");
+        ObservableExtensionsKt.appSubscribe$default(I, VideoPlayerIdleDetector.class, (Context) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$2(this), (Function1) null, (Function0) null, (Function0) null, new VideoPlayerIdleDetector$beginIdleDetectionTimer$1(this), 58, (Object) null);
     }
 
     private final void cancelIdleDetectionTimer() {
diff --git a/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java b/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java
index 48d54e5f3c..e46daa61c6 100644
--- a/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java
+++ b/app/src/main/java/com/discord/utilities/view/extensions/ViewExtensions.java
@@ -272,7 +272,7 @@ public final class ViewExtensions {
         m.checkNotNullParameter(function1, "initializer");
         EditText editText = textInputLayout.getEditText();
         if (editText != null) {
-            b.m(editText, i, Arrays.copyOf(objArr, objArr.length), function1);
+            b.l(editText, i, Arrays.copyOf(objArr, objArr.length), function1);
         }
     }
 
@@ -291,6 +291,14 @@ public final class ViewExtensions {
         }
     }
 
+    public static final void moveCursorToEnd(TextInputLayout textInputLayout) {
+        m.checkNotNullParameter(textInputLayout, "$this$moveCursorToEnd");
+        EditText editText = textInputLayout.getEditText();
+        if (editText != null) {
+            editText.setSelection(editText.getText().toString().length());
+        }
+    }
+
     public static final void setBackgroundAndKeepPadding(View view, Drawable drawable) {
         m.checkNotNullParameter(view, "$this$setBackgroundAndKeepPadding");
         view.setBackground(drawable);
diff --git a/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java b/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java
index a2e884269c..9732462913 100644
--- a/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java
+++ b/app/src/main/java/com/discord/utilities/viewcontroller/RxViewController.java
@@ -24,11 +24,11 @@ public abstract class RxViewController<V extends View, T> {
     private final <T> Subscription connectViewRx(View view, Observable<T> observable, Function1<? super T, Unit> function1) {
         Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
         ref$ObjectRef.element = null;
-        Observable<T> b02 = observable.b0(new ViewDetachedFromWindowObservable(view).observe());
-        m.checkNotNullExpressionValue(b02, "observable\n        .take…servable(view).observe())");
-        Observable<T> y2 = ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(b02)).y(new RxViewController$connectViewRx$1(view));
-        m.checkNotNullExpressionValue(y2, "observable\n        .take…view.isAttachedToWindow }");
-        ObservableExtensionsKt.appSubscribe$default(y2, getClass(), (Context) null, new RxViewController$connectViewRx$2(ref$ObjectRef), (Function1) null, (Function0) null, (Function0) null, new RxViewController$connectViewRx$3(function1), 58, (Object) null);
+        Observable<T> a02 = observable.a0(new ViewDetachedFromWindowObservable(view).observe());
+        m.checkNotNullExpressionValue(a02, "observable\n        .take…servable(view).observe())");
+        Observable<T> x2 = ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(a02)).x(new RxViewController$connectViewRx$1(view));
+        m.checkNotNullExpressionValue(x2, "observable\n        .take…view.isAttachedToWindow }");
+        ObservableExtensionsKt.appSubscribe$default(x2, getClass(), (Context) null, new RxViewController$connectViewRx$2(ref$ObjectRef), (Function1) null, (Function0) null, (Function0) null, new RxViewController$connectViewRx$3(function1), 58, (Object) null);
         T t = ref$ObjectRef.element;
         if (t == null) {
             m.throwUninitializedPropertyAccessException("subscriptionResult");
diff --git a/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java b/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java
index 34c6d88af5..849257a17e 100644
--- a/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java
+++ b/app/src/main/java/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.java
@@ -7,7 +7,7 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: ViewDetachedFromWindowObservable.kt */
 public final class ViewDetachedFromWindowObservable implements View.OnAttachStateChangeListener {
-    private final BehaviorSubject<Unit> onDetachSubject = BehaviorSubject.l0();
+    private final BehaviorSubject<Unit> onDetachSubject = BehaviorSubject.k0();
 
     public ViewDetachedFromWindowObservable(View view) {
         m.checkNotNullParameter(view, "view");
diff --git a/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java b/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java
index cce11de3c8..5829aba426 100644
--- a/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java
+++ b/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java
@@ -55,7 +55,7 @@ public final class FloatingButtonMenuInitializer {
     }
 
     private final Animator createDefaultMenuRowAnimation(ViewGroup viewGroup, View view) {
-        return viewGroup.getId() == 2131363157 ? this.animatorFactoryFadeIn.createAnimator(viewGroup) : createMenuRowAnimation(viewGroup, this.animatorFactoryFadeIn, getAnimatorFactoryScaleUp(view), this.animatorFactorySlideUp);
+        return viewGroup.getId() == 2131363182 ? this.animatorFactoryFadeIn.createAnimator(viewGroup) : createMenuRowAnimation(viewGroup, this.animatorFactoryFadeIn, getAnimatorFactoryScaleUp(view), this.animatorFactorySlideUp);
     }
 
     private final Animator createMenuRowAnimation(ViewGroup viewGroup, AnimatorFactory<? super ViewGroup>... animatorFactoryArr) {
diff --git a/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java b/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java
index f2b6442072..2364cd1b11 100644
--- a/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java
+++ b/app/src/main/java/com/discord/utilities/views/ViewVisibilityObserver.java
@@ -5,12 +5,12 @@ import rx.Observable;
 import rx.subjects.BehaviorSubject;
 /* compiled from: ViewVisibilityObserver.kt */
 public final class ViewVisibilityObserver {
-    private final BehaviorSubject<Boolean> isVisibleSubject = BehaviorSubject.l0();
+    private final BehaviorSubject<Boolean> isVisibleSubject = BehaviorSubject.k0();
 
     public final Observable<Boolean> observeIsVisible() {
-        Observable<Boolean> s2 = this.isVisibleSubject.s();
-        m.checkNotNullExpressionValue(s2, "isVisibleSubject.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = this.isVisibleSubject.r();
+        m.checkNotNullExpressionValue(r, "isVisibleSubject.distinctUntilChanged()");
+        return r;
     }
 
     public final void updateVisibility(boolean z2) {
diff --git a/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java b/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
index 225d20652d..63b5a35f9c 100644
--- a/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
+++ b/app/src/main/java/com/discord/utilities/voice/CallSoundManager.java
@@ -66,7 +66,7 @@ public final class CallSoundManager {
         private final StoreApplicationStreaming.ActiveApplicationStream activeApplicationStream;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2108me;
+        private final MeUser f2115me;
         private final RtcConnection.State rtcConnectionState;
         private final Channel selectedVoiceChannel;
         private final Map<String, List<Long>> streamSpectators;
@@ -87,7 +87,7 @@ public final class CallSoundManager {
             this.streamsByUser = map2;
             this.streamSpectators = map3;
             this.activeApplicationStream = activeApplicationStream;
-            this.f2108me = meUser;
+            this.f2115me = meUser;
             this.selectedVoiceChannel = channel;
         }
 
@@ -110,7 +110,7 @@ public final class CallSoundManager {
                 activeApplicationStream = storeState.activeApplicationStream;
             }
             if ((i & 32) != 0) {
-                meUser = storeState.f2108me;
+                meUser = storeState.f2115me;
             }
             if ((i & 64) != 0) {
                 channel = storeState.selectedVoiceChannel;
@@ -139,7 +139,7 @@ public final class CallSoundManager {
         }
 
         public final MeUser component6() {
-            return this.f2108me;
+            return this.f2115me;
         }
 
         public final Channel component7() {
@@ -163,7 +163,7 @@ public final class CallSoundManager {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.voiceParticipants, storeState.voiceParticipants) && m.areEqual(this.rtcConnectionState, storeState.rtcConnectionState) && m.areEqual(this.streamsByUser, storeState.streamsByUser) && m.areEqual(this.streamSpectators, storeState.streamSpectators) && m.areEqual(this.activeApplicationStream, storeState.activeApplicationStream) && m.areEqual(this.f2108me, storeState.f2108me) && m.areEqual(this.selectedVoiceChannel, storeState.selectedVoiceChannel);
+            return m.areEqual(this.voiceParticipants, storeState.voiceParticipants) && m.areEqual(this.rtcConnectionState, storeState.rtcConnectionState) && m.areEqual(this.streamsByUser, storeState.streamsByUser) && m.areEqual(this.streamSpectators, storeState.streamSpectators) && m.areEqual(this.activeApplicationStream, storeState.activeApplicationStream) && m.areEqual(this.f2115me, storeState.f2115me) && m.areEqual(this.selectedVoiceChannel, storeState.selectedVoiceChannel);
         }
 
         public final StoreApplicationStreaming.ActiveApplicationStream getActiveApplicationStream() {
@@ -171,7 +171,7 @@ public final class CallSoundManager {
         }
 
         public final MeUser getMe() {
-            return this.f2108me;
+            return this.f2115me;
         }
 
         public final RtcConnection.State getRtcConnectionState() {
@@ -206,7 +206,7 @@ public final class CallSoundManager {
             int hashCode4 = (hashCode3 + (map3 != null ? map3.hashCode() : 0)) * 31;
             StoreApplicationStreaming.ActiveApplicationStream activeApplicationStream = this.activeApplicationStream;
             int hashCode5 = (hashCode4 + (activeApplicationStream != null ? activeApplicationStream.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2108me;
+            MeUser meUser = this.f2115me;
             int hashCode6 = (hashCode5 + (meUser != null ? meUser.hashCode() : 0)) * 31;
             Channel channel = this.selectedVoiceChannel;
             if (channel != null) {
@@ -227,7 +227,7 @@ public final class CallSoundManager {
             L.append(", activeApplicationStream=");
             L.append(this.activeApplicationStream);
             L.append(", me=");
-            L.append(this.f2108me);
+            L.append(this.f2115me);
             L.append(", selectedVoiceChannel=");
             L.append(this.selectedVoiceChannel);
             L.append(")");
@@ -327,7 +327,7 @@ public final class CallSoundManager {
         	at jadx.core.codegen.ClassGen.addMethod(ClassGen.java:298)
         	at jadx.core.codegen.ClassGen.lambda$addInnerClsAndMethods$3(ClassGen.java:267)
         	at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183)
-        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1541)
+        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
         	at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395)
         	at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258)
         */
@@ -351,8 +351,8 @@ public final class CallSoundManager {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        Observable<StoreState> s2 = this.storeStateGenerator.observeStoreState(j).s();
-        m.checkNotNullExpressionValue(s2, "storeStateGenerator\n    …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this.appComponent, null, 2, null), CallSoundManager.class, (Context) null, new CallSoundManager$subscribeToStoreState$1(this), (Function1) null, new CallSoundManager$subscribeToStoreState$2(this), (Function0) null, new CallSoundManager$subscribeToStoreState$3(this, j), 42, (Object) null);
+        Observable<StoreState> r = this.storeStateGenerator.observeStoreState(j).r();
+        m.checkNotNullExpressionValue(r, "storeStateGenerator\n    …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this.appComponent, null, 2, null), CallSoundManager.class, (Context) null, new CallSoundManager$subscribeToStoreState$1(this), (Function1) null, new CallSoundManager$subscribeToStoreState$2(this), (Function0) null, new CallSoundManager$subscribeToStoreState$3(this, j), 42, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
index 59a8d44831..99de90a894 100644
--- a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
+++ b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java
@@ -86,12 +86,12 @@ public final class DiscordOverlayService extends OverlayService {
             StoreStream.Companion companion = StoreStream.Companion;
             if (companion.getUserSettings().getIsMobileOverlayEnabled()) {
                 WeakReference weakReference = new WeakReference(context);
-                Observable G = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getRtcConnection().getConnectionState(), 1000, false, 2, null).G(DiscordOverlayService$Companion$launchForConnect$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "StoreStream\n            …          }\n            }");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(G), DiscordOverlayService.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$Companion$launchForConnect$2(weakReference), 60, (Object) null);
+                Observable F = ObservableExtensionsKt.takeSingleUntilTimeout$default(companion.getRtcConnection().getConnectionState(), 1000, false, 2, null).F(DiscordOverlayService$Companion$launchForConnect$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "StoreStream\n            …          }\n            }");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(F), DiscordOverlayService.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$Companion$launchForConnect$2(weakReference), 60, (Object) null);
                 return;
             }
-            o.g(context, 2131891727, 1, null, 8);
+            o.g(context, 2131891799, 1, null, 8);
         }
 
         public final void launchForVoice(Context context) {
@@ -163,7 +163,7 @@ public final class DiscordOverlayService extends OverlayService {
     @Override // com.discord.overlay.OverlayService
     public Notification createNotification(Intent intent) {
         PendingIntent service = PendingIntent.getService(this, 1010, Companion.access$createOverlayIntent(Companion, this, "com.discord.actions.OVERLAY_CLOSE"), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728));
-        Notification build = new NotificationCompat.Builder(this, "Media Connections").setCategory("service").setPriority(-2).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231791).setColor(ColorCompat.getColor(this, 2131100249)).setContentTitle(getString(2131891710)).setContentText(getString(2131891728)).setOngoing(true).addAction(2131231524, getString(2131887393), service).addAction(2131231911, getString(2131893200), PendingIntent.getActivity(this, 1010, new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getSelectSettingsVoice()).setPackage(getPackageName()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build();
+        Notification build = new NotificationCompat.Builder(this, "Media Connections").setCategory("service").setPriority(-2).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231799).setColor(ColorCompat.getColor(this, 2131100249)).setContentTitle(getString(2131891782)).setContentText(getString(2131891800)).setOngoing(true).addAction(2131231530, getString(2131887393), service).addAction(2131231919, getString(2131893283), PendingIntent.getActivity(this, 1010, new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getSelectSettingsVoice()).setPackage(getPackageName()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build();
         m.checkNotNullExpressionValue(build, "NotificationCompat.Build…       )\n        .build()");
         return build;
     }
@@ -260,9 +260,9 @@ public final class DiscordOverlayService extends OverlayService {
             stopSelf(i2);
             return 2;
         }
-        Observable<Boolean> a02 = StoreStream.Companion.isInitializedObservable().y(DiscordOverlayService$onStartCommand$1.INSTANCE).a0(1);
-        m.checkNotNullExpressionValue(a02, "StoreStream.isInitialize….takeFirst { it == true }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), DiscordOverlayService.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$onStartCommand$2(this, i2, intent), 62, (Object) null);
+        Observable<Boolean> Z = StoreStream.Companion.isInitializedObservable().x(DiscordOverlayService$onStartCommand$1.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "StoreStream.isInitialize….takeFirst { it == true }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), DiscordOverlayService.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$onStartCommand$2(this, i2, intent), 62, (Object) null);
         return 3;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java
index 6702535a30..0e50ddb83a 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager$startStream$1.java
@@ -12,7 +12,7 @@ public final class ScreenShareManager$startStream$1<T, R> implements b<RtcConnec
     }
 
     public final Boolean call(RtcConnection.Metadata metadata) {
-        Long l = metadata != null ? metadata.f2079c : null;
+        Long l = metadata != null ? metadata.f2085c : null;
         return Boolean.valueOf(l != null && l.longValue() == this.this$0.getChannelId() && m.areEqual(metadata.d, this.this$0.getGuildId()));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
index 90b78c376c..1fec156cf3 100644
--- a/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
+++ b/app/src/main/java/com/discord/utilities/voice/ScreenShareManager.java
@@ -190,9 +190,9 @@ public final class ScreenShareManager {
         this.restAPI = restAPI;
         this.imageEncoder = imageEncoder;
         this.tooltipManager = tooltipManager;
-        BehaviorSubject<Bitmap> l0 = BehaviorSubject.l0();
-        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create()");
-        this.thumbnailBitmapSubject = l0;
+        BehaviorSubject<Bitmap> k0 = BehaviorSubject.k0();
+        m.checkNotNullExpressionValue(k0, "BehaviorSubject.create()");
+        this.thumbnailBitmapSubject = k0;
         this.compositeSubscription = new CompositeSubscription();
         subscribeToStores();
     }
@@ -222,7 +222,7 @@ public final class ScreenShareManager {
             WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
             tooltipManager3 = weakReference2 != null ? weakReference2.get() : tooltipManager3;
             if (tooltipManager3 == null) {
-                TooltipManager tooltipManager4 = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+                TooltipManager tooltipManager4 = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
                 TooltipManager.a.a = new WeakReference<>(tooltipManager4);
                 tooltipManager3 = tooltipManager4;
             }
@@ -340,15 +340,15 @@ public final class ScreenShareManager {
     }
 
     private final void subscribeToStores() {
-        Observable s2 = Observable.i(this.storeApplicationStreaming.observeActiveStream(), this.storeStreamRtcConnection.observeRtcConnection(), StoreUser.observeMe$default(this.storeUser, false, 1, null), ScreenShareManager$subscribeToStores$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this.appComponent, null, 2, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$subscribeToStores$2(this), (Function1) null, (Function0) null, (Function0) null, new ScreenShareManager$subscribeToStores$3(this), 58, (Object) null);
+        Observable r = Observable.i(this.storeApplicationStreaming.observeActiveStream(), this.storeStreamRtcConnection.observeRtcConnection(), StoreUser.observeMe$default(this.storeUser, false, 1, null), ScreenShareManager$subscribeToStores$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this.appComponent, null, 2, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$subscribeToStores$2(this), (Function1) null, (Function0) null, (Function0) null, new ScreenShareManager$subscribeToStores$3(this), 58, (Object) null);
     }
 
     private final void uploadScreenSharePreviews() {
-        Observable<R> A = this.thumbnailBitmapSubject.A(new ScreenShareManager$uploadScreenSharePreviews$1(this));
-        m.checkNotNullExpressionValue(A, "thumbnailBitmapSubject\n …>()\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.bindToComponentLifecycle(A, this.appComponent), false, 1, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$uploadScreenSharePreviews$2(this), (Function1) null, (Function0) null, (Function0) null, ScreenShareManager$uploadScreenSharePreviews$3.INSTANCE, 58, (Object) null);
+        Observable<R> z2 = this.thumbnailBitmapSubject.z(new ScreenShareManager$uploadScreenSharePreviews$1(this));
+        m.checkNotNullExpressionValue(z2, "thumbnailBitmapSubject\n …>()\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.bindToComponentLifecycle(z2, this.appComponent), false, 1, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$uploadScreenSharePreviews$2(this), (Function1) null, (Function0) null, (Function0) null, ScreenShareManager$uploadScreenSharePreviews$3.INSTANCE, 58, (Object) null);
     }
 
     public final long getChannelId() {
@@ -365,9 +365,9 @@ public final class ScreenShareManager {
 
     public final void startStream(Intent intent) {
         m.checkNotNullParameter(intent, "intent");
-        Observable<RtcConnection.Metadata> a02 = this.storeRtcConnection.observeRtcConnectionMetadata().y(new ScreenShareManager$startStream$1(this)).a0(1);
-        m.checkNotNullExpressionValue(a02, "storeRtcConnection.obser…       }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(a02, this.appComponent, null, 2, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$startStream$2(this), (Function1) null, (Function0) null, (Function0) null, new ScreenShareManager$startStream$3(this, intent), 58, (Object) null);
+        Observable<RtcConnection.Metadata> Z = this.storeRtcConnection.observeRtcConnectionMetadata().x(new ScreenShareManager$startStream$1(this)).Z(1);
+        m.checkNotNullExpressionValue(Z, "storeRtcConnection.obser…       }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Z, this.appComponent, null, 2, null), ScreenShareManager.class, (Context) null, new ScreenShareManager$startStream$2(this), (Function1) null, (Function0) null, (Function0) null, new ScreenShareManager$startStream$3(this, intent), 58, (Object) null);
     }
 
     public final void stopStream() {
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.java b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.java
index 0e38c9ead0..cdf1423ede 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils$observeJoinability$1.java
@@ -67,6 +67,6 @@ public final class VoiceChannelJoinabilityUtils$observeJoinability$1<T, R> imple
     }
 
     public final Observable<? extends VoiceChannelJoinability> call(Channel channel) {
-        return channel == null ? new j(VoiceChannelJoinability.CHANNEL_DOES_NOT_EXIST) : Observable.f(this.$voiceStatesStore.observe(channel.e(), this.$channelId), this.$permissionsStore.observePermissionsForChannel(this.$channelId), this.$guildsStore.observeGuild(channel.e()), GuildVerificationLevelUtils.observeVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.e(), null, null, null, 14, null), this.$voiceChannelSelectedStore.observeSelectedVoiceChannelId(), this.$stageInstancesStore.observeStageInstanceForChannel(this.$channelId), new AnonymousClass1(channel));
+        return channel == null ? new j(VoiceChannelJoinability.CHANNEL_DOES_NOT_EXIST) : Observable.f(this.$voiceStatesStore.observe(channel.f(), this.$channelId), this.$permissionsStore.observePermissionsForChannel(this.$channelId), this.$guildsStore.observeGuild(channel.f()), GuildVerificationLevelUtils.observeVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.f(), null, null, null, 14, null), this.$voiceChannelSelectedStore.observeSelectedVoiceChannelId(), this.$stageInstancesStore.observeStageInstanceForChannel(this.$channelId), new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
index 652245a364..88a9053e7d 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceChannelJoinabilityUtils.java
@@ -41,24 +41,24 @@ public final class VoiceChannelJoinabilityUtils {
         m.checkNotNullParameter(collection, "channelVoiceStates");
         m.checkNotNullParameter(guildMaxVideoChannelUsers, "guildMaxVideoChannelUsers");
         m.checkNotNullParameter(guildVerificationLevel, "verificationLevelTriggered");
-        if (AnimatableValueParser.r1(channel)) {
+        if (AnimatableValueParser.s1(channel)) {
             return VoiceChannelJoinability.CAN_JOIN;
         }
-        long g = channel.g();
-        if (l2 != null && g == l2.longValue()) {
+        long h = channel.h();
+        if (l2 != null && h == l2.longValue()) {
             return VoiceChannelJoinability.CAN_JOIN;
         }
         if (!PermissionUtils.can(1048576, l)) {
             return VoiceChannelJoinability.PERMISSIONS_MISSING;
         }
         boolean z3 = true;
-        if ((guildVerificationLevel != GuildVerificationLevel.NONE) && (stageInstance == null || !AnimatableValueParser.s1(stageInstance))) {
+        if ((guildVerificationLevel != GuildVerificationLevel.NONE) && (stageInstance == null || !AnimatableValueParser.t1(stageInstance))) {
             return VoiceChannelJoinability.PERMISSIONS_MISSING;
         }
         ArrayList arrayList = new ArrayList();
         for (Object obj : collection) {
             Long a = ((VoiceState) obj).a();
-            if (a != null && a.longValue() == channel.g()) {
+            if (a != null && a.longValue() == channel.h()) {
                 arrayList.add(obj);
             }
         }
@@ -78,7 +78,7 @@ public final class VoiceChannelJoinabilityUtils {
         }
         z2 = false;
         boolean can = PermissionUtils.can(16777216, l);
-        if (size >= (channel.A() != 0 ? channel.A() : Integer.MAX_VALUE) && !can) {
+        if (size >= (channel.B() != 0 ? channel.B() : Integer.MAX_VALUE) && !can) {
             return VoiceChannelJoinability.CHANNEL_FULL;
         }
         boolean can2 = PermissionUtils.can(8, l);
@@ -109,8 +109,8 @@ public final class VoiceChannelJoinabilityUtils {
         }
         StoreStream.Companion companion2 = StoreStream.Companion;
         Long l = companion2.getPermissions().getPermissionsByChannel().get(Long.valueOf(j));
-        Guild guild = companion2.getGuilds().getGuild(channel.e());
-        GuildVerificationLevel verificationLevelTriggered$default = GuildVerificationLevelUtils.getVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.e(), null, null, null, 14, null);
+        Guild guild = companion2.getGuilds().getGuild(channel.f());
+        GuildVerificationLevel verificationLevelTriggered$default = GuildVerificationLevelUtils.getVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.f(), null, null, null, 14, null);
         long selectedVoiceChannelId = companion2.getVoiceChannelSelected().getSelectedVoiceChannelId();
         StageInstance stageInstanceForChannel = companion2.getStageInstances().getStageInstanceForChannel(j);
         if (guild == null || (guildMaxVideoChannelUsers = guild.getMaxVideoChannelUsers()) == null) {
@@ -126,8 +126,8 @@ public final class VoiceChannelJoinabilityUtils {
         m.checkNotNullParameter(storeVoiceStates, "voiceStatesStore");
         m.checkNotNullParameter(storeVoiceChannelSelected, "voiceChannelSelectedStore");
         m.checkNotNullParameter(storeStageInstances, "stageInstancesStore");
-        Observable<R> Z = storeChannels.observeChannel(j).Z(new VoiceChannelJoinabilityUtils$observeJoinability$1(storeVoiceStates, j, storePermissions, storeGuilds, storeVoiceChannelSelected, storeStageInstances));
-        m.checkNotNullExpressionValue(Z, "channelsStore\n        .o…  }\n          }\n        }");
-        return Z;
+        Observable<R> Y = storeChannels.observeChannel(j).Y(new VoiceChannelJoinabilityUtils$observeJoinability$1(storeVoiceStates, j, storePermissions, storeGuilds, storeVoiceChannelSelected, storeStageInstances));
+        m.checkNotNullExpressionValue(Y, "channelsStore\n        .o…  }\n          }\n        }");
+        return Y;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
index 36554fb82b..9f03f6ccf4 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineForegroundService.java
@@ -289,9 +289,9 @@ public final class VoiceEngineForegroundService extends IntentService implements
 
     public VoiceEngineForegroundService() {
         super("VoiceEngineForegroundService");
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     public static final /* synthetic */ Function0 access$getOnDisconnect$cp() {
@@ -343,7 +343,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
     public void onCreate() {
         super.onCreate();
         Logger.v$default(AppLog.g, "DiscordVoiceService", "Service created.", null, 4, null);
-        n.f45c.a(this);
+        n.f44c.a(this);
         Application application = getApplication();
         m.checkNotNullExpressionValue(application, "application");
         WifiManager.WifiLock createWifiLock$default = SystemServiceExtensionsKt.createWifiLock$default(application, false, 0, null, 7, null);
@@ -372,7 +372,7 @@ public final class VoiceEngineForegroundService extends IntentService implements
         super.onDestroy();
         Logger.v$default(AppLog.g, "DiscordVoiceService", "Service destroyed.", null, 4, null);
         StageChannelNotifications.Companion.getINSTANCE().onInviteToSpeakRescinded();
-        n.f45c.b(this);
+        n.f44c.b(this);
         WifiManager.WifiLock wifiLock = this.wakeLockWifi;
         if (wifiLock != null) {
             wifiLock.release();
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java
index 8f968b4a7a..4a089ba1e7 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java
@@ -42,17 +42,17 @@ public final class VoiceEngineNotificationBuilder {
         m.checkNotNullParameter(cls, "notificationServiceClass");
         m.checkNotNullParameter(str6, "notificationChannel");
         m.checkNotNullParameter(cls2, "notificationClass");
-        NotificationCompat.Builder ongoing = new NotificationCompat.Builder(context, str6).setContentTitle(charSequence).setContentText(charSequence2).setColor(ColorCompat.getThemedColor(context, 2130968994)).setColorized(true).setSmallIcon(2131231791).setContentIntent(getCallScreenNavigationIntent(context, j, str, cls2)).setOngoing(true);
-        String string = context.getResources().getString(2131888146);
+        NotificationCompat.Builder ongoing = new NotificationCompat.Builder(context, str6).setContentTitle(charSequence).setContentText(charSequence2).setColor(ColorCompat.getThemedColor(context, 2130968994)).setColorized(true).setSmallIcon(2131231799).setContentIntent(getCallScreenNavigationIntent(context, j, str, cls2)).setOngoing(true);
+        String string = context.getResources().getString(2131888145);
         VoiceEngineNotificationBuilder voiceEngineNotificationBuilder = INSTANCE;
-        ongoing.addAction(new NotificationCompat.Action(2131231449, string, voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str2)));
+        ongoing.addAction(new NotificationCompat.Action(2131231455, string, voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str2)));
         if (z2) {
-            ongoing.addAction(new NotificationCompat.Action(2131231758, context.getResources().getString(2131893590), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str3)));
+            ongoing.addAction(new NotificationCompat.Action(2131231766, context.getResources().getString(2131893687), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str3)));
         } else {
             if (str4 != null) {
-                ongoing.addAction(new NotificationCompat.Action(z3 ? 2131231753 : 2131231752, z3 ? context.getResources().getString(2131894063) : context.getResources().getString(2131891294), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str4)));
+                ongoing.addAction(new NotificationCompat.Action(z3 ? 2131231761 : 2131231760, z3 ? context.getResources().getString(2131894164) : context.getResources().getString(2131891365), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str4)));
             }
-            ongoing.addAction(new NotificationCompat.Action(z4 ? 2131231694 : 2131231693, z4 ? context.getResources().getString(2131894055) : context.getResources().getString(2131888041), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str5)));
+            ongoing.addAction(new NotificationCompat.Action(z4 ? 2131231700 : 2131231699, z4 ? context.getResources().getString(2131894156) : context.getResources().getString(2131888040), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str5)));
         }
         Notification build = ongoing.build();
         m.checkNotNullExpressionValue(build, "NotificationCompat.Build…     }\n          .build()");
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java
index 98859cda0a..7527e9f8f4 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java
@@ -22,7 +22,7 @@ public final class VoiceEngineServiceController$init$3 extends o implements Func
     public final void mo1invoke() {
         StoreMediaSettings.SelfMuteFailure selfMuteFailure = VoiceEngineServiceController.access$getMediaSettingsStore$p(this.this$0).toggleSelfMuted();
         if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) {
-            c.a.d.o.g(this.$context, 2131894415, 0, null, 12);
+            c.a.d.o.g(this.$context, 2131894534, 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java
index 47a433af93..65df634dc8 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$notificationDataObservable$1.java
@@ -51,12 +51,12 @@ public final class VoiceEngineServiceController$notificationDataObservable$1<T,
                 boolean isSelfMuted = voiceConfiguration.isSelfMuted();
                 boolean isSelfDeafened = voiceConfiguration.isSelfDeafened();
                 boolean z6 = callModel != null && callModel.isStreaming();
-                long g = (callModel == null || (channel2 = callModel.getChannel()) == null) ? -1 : channel2.g();
-                Long valueOf = (callModel == null || (channel = callModel.getChannel()) == null) ? null : Long.valueOf(channel.e());
+                long h = (callModel == null || (channel2 = callModel.getChannel()) == null) ? -1 : channel2.h();
+                Long valueOf = (callModel == null || (channel = callModel.getChannel()) == null) ? null : Long.valueOf(channel.f());
                 if (valueOf != null && valueOf.longValue() > 0) {
                     z2 = true;
                 }
-                return new VoiceEngineServiceController.NotificationData(state2, y0, isSelfMuted, isSelfDeafened, z6, z3, g, z2 ? valueOf : null, z4, z5);
+                return new VoiceEngineServiceController.NotificationData(state2, y0, isSelfMuted, isSelfDeafened, z6, z3, h, z2 ? valueOf : null, z4, z5);
             }
         }
 
@@ -81,6 +81,6 @@ public final class VoiceEngineServiceController$notificationDataObservable$1<T,
 
     public final Observable<? extends VoiceEngineServiceController.NotificationData> call(RtcConnection.StateChange stateChange) {
         RtcConnection.State state = stateChange.a;
-        return m.areEqual(state, RtcConnection.State.h.a) ? new j(VoiceEngineServiceController.access$getNOTIFICATION_DATA_DISCONNECTED$cp()) : VoiceEngineServiceController.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId().Z(new AnonymousClass1(this, state));
+        return m.areEqual(state, RtcConnection.State.h.a) ? new j(VoiceEngineServiceController.access$getNOTIFICATION_DATA_DISCONNECTED$cp()) : VoiceEngineServiceController.access$getVoiceChannelSelectedStore$p(this.this$0).observeSelectedVoiceChannelId().Y(new AnonymousClass1(this, state));
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
index 5642abd838..de766f4228 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java
@@ -309,9 +309,9 @@ public final class VoiceEngineServiceController {
         this.audioManagerStore = storeAudioManagerV2;
         this.mediaSettingsStore = storeMediaSettings;
         this.voiceChannelSelectedStore = storeVoiceChannelSelected;
-        Observable<R> Z = storeRtcConnection.getConnectionState().Z(new VoiceEngineServiceController$notificationDataObservable$1(this));
-        m.checkNotNullExpressionValue(Z, "rtcConnectionStore\n     …            }\n          }");
-        this.notificationDataObservable = ObservableExtensionsKt.computationLatest(Z).s();
+        Observable<R> Y = storeRtcConnection.getConnectionState().Y(new VoiceEngineServiceController$notificationDataObservable$1(this));
+        m.checkNotNullExpressionValue(Y, "rtcConnectionStore\n     …            }\n          }");
+        this.notificationDataObservable = ObservableExtensionsKt.computationLatest(Y).r();
     }
 
     public static final /* synthetic */ StoreAudioDevices access$getAudioDevicesStore$p(VoiceEngineServiceController voiceEngineServiceController) {
diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java b/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java
index be2275a1bb..7a17a2a4c3 100644
--- a/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java
+++ b/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java
@@ -51,7 +51,7 @@ public final class VoiceViewUtils {
     }
 
     public final int getCallIndicatorIcon(boolean z2, StreamContext streamContext) {
-        return (streamContext == null || !streamContext.isCurrentUserParticipating()) ? z2 ? 2131232042 : 2131231452 : streamContext.isSelfStream() ? 2131231450 : 2131231451;
+        return (streamContext == null || !streamContext.isCurrentUserParticipating()) ? z2 ? 2131232050 : 2131231458 : streamContext.isSelfStream() ? 2131231456 : 2131231457;
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0039: APUT  (r2v1 java.lang.Object[]), (0 ??[int, short, byte, char]), (r3v1 java.lang.String) */
@@ -125,14 +125,14 @@ public final class VoiceViewUtils {
     public final int getQualityIndicator(RtcConnection.Quality quality) {
         int ordinal;
         if (quality == null || (ordinal = quality.ordinal()) == 0) {
-            return 2131232051;
+            return 2131232059;
         }
         if (ordinal == 1) {
-            return 2131232049;
+            return 2131232057;
         }
         if (ordinal != 2) {
-            return ordinal != 3 ? 2131232051 : 2131232050;
+            return ordinal != 3 ? 2131232059 : 2131232058;
         }
-        return 2131232048;
+        return 2131232056;
     }
 }
diff --git a/app/src/main/java/com/discord/utilities/websocket/WebSocket.java b/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
index 67ab75ceb0..c0d2689f09 100644
--- a/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
+++ b/app/src/main/java/com/discord/utilities/websocket/WebSocket.java
@@ -146,14 +146,14 @@ public final class WebSocket {
         m.checkNotNullParameter(function3, "errorLogger");
         this.errorLogger = function3;
         this.socketFactory = sSLSocketFactory;
-        PublishSubject<Function0<Unit>> l0 = PublishSubject.l0();
-        this.schedulerSubject = l0;
-        Observable<Function0<Unit>> K = l0.K();
+        PublishSubject<Function0<Unit>> k0 = PublishSubject.k0();
+        this.schedulerSubject = k0;
+        Observable<Function0<Unit>> J = k0.J();
         if (scheduler == null) {
             AtomicReference<a> atomicReference = a.a;
             scheduler = j0.l.c.m.a;
         }
-        K.J(scheduler).X(AnonymousClass1.INSTANCE, new AnonymousClass2(this));
+        J.I(scheduler).W(AnonymousClass1.INSTANCE, new AnonymousClass2(this));
     }
 
     public static final /* synthetic */ okhttp3.WebSocket access$getClient$p(WebSocket webSocket) {
@@ -187,7 +187,7 @@ public final class WebSocket {
     private final okhttp3.WebSocket createWebSocket(String str, SSLSocketFactory sSLSocketFactory, WebSocketListener webSocketListener) {
         x.a aVar = new x.a();
         if (sSLSocketFactory != null) {
-            h.a aVar2 = h.f2731c;
+            h.a aVar2 = h.f2737c;
             aVar.b(sSLSocketFactory, h.a.n());
         }
         aVar.a(1, TimeUnit.MINUTES);
diff --git a/app/src/main/java/com/discord/views/ActiveSubscriptionView.java b/app/src/main/java/com/discord/views/ActiveSubscriptionView.java
index de0ac5cd56..43145484bd 100644
--- a/app/src/main/java/com/discord/views/ActiveSubscriptionView.java
+++ b/app/src/main/java/com/discord/views/ActiveSubscriptionView.java
@@ -11,7 +11,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;
-import c.a.i.o1;
+import c.a.i.q1;
 import c.a.l.b;
 import com.discord.models.domain.ModelSubscription;
 import com.discord.utilities.billing.GooglePlaySku;
@@ -26,14 +26,14 @@ import kotlin.jvm.functions.Function0;
 /* compiled from: ActiveSubscriptionView.kt */
 public final class ActiveSubscriptionView extends FrameLayout {
     public static final /* synthetic */ int i = 0;
-    public final o1 j;
+    public final q1 j;
 
     /* compiled from: ActiveSubscriptionView.kt */
     public enum ActiveSubscriptionType {
-        PREMIUM_CLASSIC(2130969519, 2131232214, 2131232218, 2131232215, 2131230924, 2131230930, 2131230929),
-        PREMIUM(2130969521, 2131232226, 2131232230, 2131232227, 2131230928, 2131230930, 2131230929),
-        PREMIUM_GUILD(2130969520, 2131232219, 2131232222, 2131232220, 2131230925, 2131230927, 2131230926),
-        PREMIUM_AND_PREMIUM_GUILD(2130969508, 2131232213, 2131232213, 2131232213, 2131230923, 2131230930, 2131230929);
+        PREMIUM_CLASSIC(2130969519, 2131232222, 2131232226, 2131232223, 2131230927, 2131230933, 2131230932),
+        PREMIUM(2130969521, 2131232234, 2131232238, 2131232235, 2131230931, 2131230933, 2131230932),
+        PREMIUM_GUILD(2130969520, 2131232227, 2131232230, 2131232228, 2131230928, 2131230930, 2131230929),
+        PREMIUM_AND_PREMIUM_GUILD(2130969508, 2131232221, 2131232221, 2131232221, 2131230926, 2131230933, 2131230932);
         
         private final int headerBackground;
         private final int headerBackgroundError;
@@ -146,9 +146,9 @@ public final class ActiveSubscriptionView extends FrameLayout {
                                     i2 = 2131361895;
                                     MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131361895);
                                     if (materialButton2 != null) {
-                                        o1 o1Var = new o1((FrameLayout) inflate, textView, imageView, imageView2, imageView3, textView2, materialButton, progressBar, materialButton2);
-                                        m.checkNotNullExpressionValue(o1Var, "ViewActiveSubscriptionBi…rom(context), this, true)");
-                                        this.j = o1Var;
+                                        q1 q1Var = new q1((FrameLayout) inflate, textView, imageView, imageView2, imageView3, textView2, materialButton, progressBar, materialButton2);
+                                        m.checkNotNullExpressionValue(q1Var, "ViewActiveSubscriptionBi…rom(context), this, true)");
+                                        this.j = q1Var;
                                         return;
                                     }
                                 }
@@ -225,7 +225,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
         m.checkNotNullParameter(activeSubscriptionType, "activeSubscriptionType");
         m.checkNotNullParameter(status, "status");
         m.checkNotNullParameter(charSequence, "priceText");
-        ImageView imageView = this.j.f133c;
+        ImageView imageView = this.j.f145c;
         int ordinal4 = status.ordinal();
         if (ordinal4 != 2) {
             if (ordinal4 == 3) {
@@ -251,14 +251,14 @@ public final class ActiveSubscriptionView extends FrameLayout {
                 if (ordinal2 != 0) {
                     if (ordinal2 != 1) {
                         if (ordinal2 == 2) {
-                            i5 = 2131892140;
+                            i5 = 2131892211;
                         } else if (ordinal2 != 3) {
                             throw new NoWhenBranchMatchedException();
                         }
                     }
-                    i5 = 2131892301;
+                    i5 = 2131892378;
                 } else {
-                    i5 = 2131892299;
+                    i5 = 2131892376;
                 }
                 imageView3.setContentDescription(b.i(this, i5, new Object[0], null, 4));
                 TextView textView = this.j.f;
@@ -266,19 +266,19 @@ public final class ActiveSubscriptionView extends FrameLayout {
                 ordinal3 = activeSubscriptionType.ordinal();
                 if (ordinal3 == 0) {
                     int ordinal5 = status.ordinal();
-                    charSequence2 = ordinal5 != 3 ? ordinal5 != 4 ? b.i(this, 2131892263, new Object[]{charSequence}, null, 4) : b.i(this, 2131892264, new Object[]{charSequence}, null, 4) : b.i(this, 2131892267, new Object[]{charSequence}, null, 4);
+                    charSequence2 = ordinal5 != 3 ? ordinal5 != 4 ? b.i(this, 2131892339, new Object[]{charSequence}, null, 4) : b.i(this, 2131892340, new Object[]{charSequence}, null, 4) : b.i(this, 2131892343, new Object[]{charSequence}, null, 4);
                 } else if (ordinal3 == 1) {
                     int ordinal6 = status.ordinal();
-                    charSequence2 = ordinal6 != 3 ? ordinal6 != 4 ? b.i(this, 2131892269, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892270, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892273, new Object[]{2, charSequence}, null, 4);
+                    charSequence2 = ordinal6 != 3 ? ordinal6 != 4 ? b.i(this, 2131892345, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892346, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892349, new Object[]{2, charSequence}, null, 4);
                 } else if (ordinal3 == 2) {
                     Context context = getContext();
                     m.checkNotNullExpressionValue(context, "context");
-                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755279, i2, Integer.valueOf(i2));
+                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755280, i2, Integer.valueOf(i2));
                     int ordinal7 = status.ordinal();
-                    charSequence2 = ordinal7 != 3 ? ordinal7 != 4 ? b.i(this, 2131892148, new Object[]{String.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892146, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892151, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4);
+                    charSequence2 = ordinal7 != 3 ? ordinal7 != 4 ? b.i(this, 2131892219, new Object[]{String.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892217, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892222, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4);
                 } else if (ordinal3 == 3) {
                     int ordinal8 = status.ordinal();
-                    charSequence2 = ordinal8 != 3 ? ordinal8 != 4 ? b.i(this, 2131892269, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892270, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892273, new Object[]{Integer.valueOf(i2), charSequence}, null, 4);
+                    charSequence2 = ordinal8 != 3 ? ordinal8 != 4 ? b.i(this, 2131892345, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892346, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892349, new Object[]{Integer.valueOf(i2), charSequence}, null, 4);
                 } else {
                     throw new NoWhenBranchMatchedException();
                 }
@@ -291,7 +291,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
                 textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8);
                 MaterialButton materialButton2 = this.j.i;
                 int ordinal9 = status.ordinal();
-                materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892294 : 2131886912 : 2131892651);
+                materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892371 : 2131886912 : 2131892732);
                 this.j.i.setOnClickListener(new a(0, function0));
                 MaterialButton materialButton3 = this.j.i;
                 m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton");
@@ -335,7 +335,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
             textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8);
             MaterialButton materialButton2 = this.j.i;
             int ordinal9 = status.ordinal();
-            materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892294 : 2131886912 : 2131892651);
+            materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892371 : 2131886912 : 2131892732);
             this.j.i.setOnClickListener(new a(0, function0));
             MaterialButton materialButton3 = this.j.i;
             m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton");
@@ -384,7 +384,7 @@ public final class ActiveSubscriptionView extends FrameLayout {
         textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8);
         MaterialButton materialButton2 = this.j.i;
         int ordinal9 = status.ordinal();
-        materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892294 : 2131886912 : 2131892651);
+        materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892371 : 2131886912 : 2131892732);
         this.j.i.setOnClickListener(new a(0, function0));
         MaterialButton materialButton3 = this.j.i;
         m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton");
diff --git a/app/src/main/java/com/discord/views/ChatActionItem.java b/app/src/main/java/com/discord/views/ChatActionItem.java
index 72f01a7fbd..6a50396389 100644
--- a/app/src/main/java/com/discord/views/ChatActionItem.java
+++ b/app/src/main/java/com/discord/views/ChatActionItem.java
@@ -7,32 +7,32 @@ import android.view.LayoutInflater;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
-import c.a.i.q1;
+import c.a.i.s1;
 import com.discord.R;
 import d0.z.d.m;
 /* compiled from: ChatActionItem.kt */
 public final class ChatActionItem extends CardView {
-    public final q1 i;
+    public final s1 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public ChatActionItem(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(getContext()).inflate(2131558726, this);
-        int i = 2131362442;
-        ImageView imageView = (ImageView) findViewById(2131362442);
+        int i = 2131362457;
+        ImageView imageView = (ImageView) findViewById(2131362457);
         if (imageView != null) {
-            i = 2131362444;
-            TextView textView = (TextView) findViewById(2131362444);
+            i = 2131362459;
+            TextView textView = (TextView) findViewById(2131362459);
             if (textView != null) {
-                q1 q1Var = new q1(this, imageView, textView);
-                m.checkNotNullExpressionValue(q1Var, "ViewChatActionItemBindin…ater.from(context), this)");
-                this.i = q1Var;
+                s1 s1Var = new s1(this, imageView, textView);
+                m.checkNotNullExpressionValue(s1Var, "ViewChatActionItemBindin…ater.from(context), this)");
+                this.i = s1Var;
                 TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(attributeSet, R.a.ChatActionItem, 0, 0);
                 m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…hatActionItem, 0, 0\n    )");
                 m.checkNotNullExpressionValue(textView, "binding.chatActionItemText");
                 textView.setText(obtainStyledAttributes.getString(1));
-                imageView.setImageResource(obtainStyledAttributes.getResourceId(0, 2131231088));
+                imageView.setImageResource(obtainStyledAttributes.getResourceId(0, 2131231093));
                 obtainStyledAttributes.recycle();
                 return;
             }
diff --git a/app/src/main/java/com/discord/views/CheckedSetting.java b/app/src/main/java/com/discord/views/CheckedSetting.java
index eb92cd9051..1b3a40f3ff 100644
--- a/app/src/main/java/com/discord/views/CheckedSetting.java
+++ b/app/src/main/java/com/discord/views/CheckedSetting.java
@@ -27,10 +27,10 @@ import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import c.a.d.o;
-import c.a.i.c3;
-import c.a.i.d3;
-import c.a.i.e3;
 import c.a.i.f3;
+import c.a.i.g3;
+import c.a.i.h3;
+import c.a.i.i3;
 import com.discord.R;
 import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.radiobutton.MaterialRadioButton;
@@ -99,15 +99,15 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             public final MaterialCheckBox f;
 
             /* JADX WARNING: Illegal instructions before constructor call */
-            public a(c3 c3Var) {
+            public a(f3 f3Var) {
                 super(r0, null, 2);
-                m.checkNotNullParameter(c3Var, "binding");
-                ConstraintLayout constraintLayout = c3Var.f74c;
+                m.checkNotNullParameter(f3Var, "binding");
+                ConstraintLayout constraintLayout = f3Var.f91c;
                 m.checkNotNullExpressionValue(constraintLayout, "binding.settingContainer");
-                ConstraintLayout constraintLayout2 = c3Var.f74c;
+                ConstraintLayout constraintLayout2 = f3Var.f91c;
                 m.checkNotNullExpressionValue(constraintLayout2, "binding.settingContainer");
                 this.e = constraintLayout2;
-                MaterialCheckBox materialCheckBox = c3Var.b;
+                MaterialCheckBox materialCheckBox = f3Var.b;
                 m.checkNotNullExpressionValue(materialCheckBox, "binding.settingButton");
                 this.f = materialCheckBox;
             }
@@ -130,15 +130,15 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             public final MaterialRadioButton f;
 
             /* JADX WARNING: Illegal instructions before constructor call */
-            public C0179b(d3 d3Var) {
+            public C0179b(g3 g3Var) {
                 super(r0, null, 2);
-                m.checkNotNullParameter(d3Var, "binding");
-                ConstraintLayout constraintLayout = d3Var.f80c;
+                m.checkNotNullParameter(g3Var, "binding");
+                ConstraintLayout constraintLayout = g3Var.f96c;
                 m.checkNotNullExpressionValue(constraintLayout, "binding.settingContainer");
-                ConstraintLayout constraintLayout2 = d3Var.f80c;
+                ConstraintLayout constraintLayout2 = g3Var.f96c;
                 m.checkNotNullExpressionValue(constraintLayout2, "binding.settingContainer");
                 this.e = constraintLayout2;
-                MaterialRadioButton materialRadioButton = d3Var.b;
+                MaterialRadioButton materialRadioButton = g3Var.b;
                 m.checkNotNullExpressionValue(materialRadioButton, "binding.settingButton");
                 this.f = materialRadioButton;
             }
@@ -160,45 +160,45 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             public final TextView b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final TextView f2109c;
+            public final TextView f2116c;
             public final ImageView d;
 
-            public c(ViewGroup viewGroup, e3 e3Var, int i) {
-                e3 e3Var2;
+            public c(ViewGroup viewGroup, h3 h3Var, int i) {
+                h3 h3Var2;
                 if ((i & 2) != 0) {
-                    int i2 = 2131364728;
-                    ImageView imageView = (ImageView) viewGroup.findViewById(2131364728);
+                    int i2 = 2131364777;
+                    ImageView imageView = (ImageView) viewGroup.findViewById(2131364777);
                     if (imageView != null) {
-                        i2 = 2131364729;
-                        TextView textView = (TextView) viewGroup.findViewById(2131364729);
+                        i2 = 2131364778;
+                        TextView textView = (TextView) viewGroup.findViewById(2131364778);
                         if (textView != null) {
-                            i2 = 2131364730;
-                            TextView textView2 = (TextView) viewGroup.findViewById(2131364730);
+                            i2 = 2131364779;
+                            TextView textView2 = (TextView) viewGroup.findViewById(2131364779);
                             if (textView2 != null) {
-                                i2 = 2131364731;
-                                TextView textView3 = (TextView) viewGroup.findViewById(2131364731);
+                                i2 = 2131364780;
+                                TextView textView3 = (TextView) viewGroup.findViewById(2131364780);
                                 if (textView3 != null) {
-                                    e3Var2 = new e3(viewGroup, imageView, textView, textView2, textView3);
-                                    m.checkNotNullExpressionValue(e3Var2, "ViewSettingSharedBinding.bind(container)");
+                                    h3Var2 = new h3(viewGroup, imageView, textView, textView2, textView3);
+                                    m.checkNotNullExpressionValue(h3Var2, "ViewSettingSharedBinding.bind(container)");
                                 }
                             }
                         }
                     }
                     throw new NullPointerException("Missing required view with ID: ".concat(viewGroup.getResources().getResourceName(i2)));
                 }
-                e3Var2 = null;
+                h3Var2 = null;
                 m.checkNotNullParameter(viewGroup, "container");
-                m.checkNotNullParameter(e3Var2, "binding");
-                TextView textView4 = e3Var2.f85c;
+                m.checkNotNullParameter(h3Var2, "binding");
+                TextView textView4 = h3Var2.f100c;
                 m.checkNotNullExpressionValue(textView4, "binding.settingLabel");
                 this.a = textView4;
-                TextView textView5 = e3Var2.e;
+                TextView textView5 = h3Var2.e;
                 m.checkNotNullExpressionValue(textView5, "binding.settingTag");
                 this.b = textView5;
-                TextView textView6 = e3Var2.d;
+                TextView textView6 = h3Var2.d;
                 m.checkNotNullExpressionValue(textView6, "binding.settingSubtext");
-                this.f2109c = textView6;
-                ImageView imageView2 = e3Var2.b;
+                this.f2116c = textView6;
+                ImageView imageView2 = h3Var2.b;
                 m.checkNotNullExpressionValue(imageView2, "binding.settingDrawableLeft");
                 this.d = imageView2;
             }
@@ -220,7 +220,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
 
             @Override // com.discord.views.CheckedSetting.b
             public TextView f() {
-                return this.f2109c;
+                return this.f2116c;
             }
         }
 
@@ -230,15 +230,15 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             public final SwitchMaterial f;
 
             /* JADX WARNING: Illegal instructions before constructor call */
-            public d(f3 f3Var) {
+            public d(i3 i3Var) {
                 super(r0, null, 2);
-                m.checkNotNullParameter(f3Var, "binding");
-                ConstraintLayout constraintLayout = f3Var.f90c;
+                m.checkNotNullParameter(i3Var, "binding");
+                ConstraintLayout constraintLayout = i3Var.f106c;
                 m.checkNotNullExpressionValue(constraintLayout, "binding.settingContainer");
-                ConstraintLayout constraintLayout2 = f3Var.f90c;
+                ConstraintLayout constraintLayout2 = i3Var.f106c;
                 m.checkNotNullExpressionValue(constraintLayout2, "binding.settingContainer");
                 this.e = constraintLayout2;
-                SwitchMaterial switchMaterial = f3Var.b;
+                SwitchMaterial switchMaterial = i3Var.b;
                 m.checkNotNullExpressionValue(switchMaterial, "binding.settingButton");
                 this.f = switchMaterial;
             }
@@ -473,7 +473,7 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
             if (drawable2 != null) {
                 setBackground(drawable2);
             } else {
-                setBackgroundResource(2131231033);
+                setBackgroundResource(2131231038);
             }
             ColorStateList colorStateList4 = obtainStyledAttributes.getColorStateList(1);
             if (colorStateList4 != null) {
@@ -553,49 +553,49 @@ public final class CheckedSetting extends RelativeLayout implements Checkable {
         b bVar;
         LayoutInflater from = LayoutInflater.from(getContext());
         int ordinal = viewType.ordinal();
-        int i2 = 2131364725;
+        int i2 = 2131364774;
         if (ordinal == 0) {
-            from.inflate(2131558803, this);
-            MaterialCheckBox materialCheckBox = (MaterialCheckBox) findViewById(2131364725);
+            from.inflate(2131558806, this);
+            MaterialCheckBox materialCheckBox = (MaterialCheckBox) findViewById(2131364774);
             if (materialCheckBox != null) {
-                ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364726);
+                ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364775);
                 if (constraintLayout != null) {
-                    c3 c3Var = new c3(this, materialCheckBox, constraintLayout);
-                    m.checkNotNullExpressionValue(c3Var, "ViewSettingCheckBinding.…ate(layoutInflater, this)");
-                    m.checkNotNullParameter(c3Var, "binding");
-                    bVar = new b.a(c3Var);
+                    f3 f3Var = new f3(this, materialCheckBox, constraintLayout);
+                    m.checkNotNullExpressionValue(f3Var, "ViewSettingCheckBinding.…ate(layoutInflater, this)");
+                    m.checkNotNullParameter(f3Var, "binding");
+                    bVar = new b.a(f3Var);
                 } else {
-                    i2 = 2131364726;
+                    i2 = 2131364775;
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2)));
         } else if (ordinal == 1) {
-            from.inflate(2131558804, this);
-            MaterialRadioButton materialRadioButton = (MaterialRadioButton) findViewById(2131364725);
+            from.inflate(2131558807, this);
+            MaterialRadioButton materialRadioButton = (MaterialRadioButton) findViewById(2131364774);
             if (materialRadioButton != null) {
-                ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364726);
+                ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364775);
                 if (constraintLayout2 != null) {
-                    d3 d3Var = new d3(this, materialRadioButton, constraintLayout2);
-                    m.checkNotNullExpressionValue(d3Var, "ViewSettingRadioBinding.…ate(layoutInflater, this)");
-                    m.checkNotNullParameter(d3Var, "binding");
-                    bVar = new b.C0179b(d3Var);
+                    g3 g3Var = new g3(this, materialRadioButton, constraintLayout2);
+                    m.checkNotNullExpressionValue(g3Var, "ViewSettingRadioBinding.…ate(layoutInflater, this)");
+                    m.checkNotNullParameter(g3Var, "binding");
+                    bVar = new b.C0179b(g3Var);
                 } else {
-                    i2 = 2131364726;
+                    i2 = 2131364775;
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2)));
         } else if (ordinal == 2) {
-            from.inflate(2131558806, this);
-            SwitchMaterial switchMaterial = (SwitchMaterial) findViewById(2131364725);
+            from.inflate(2131558809, this);
+            SwitchMaterial switchMaterial = (SwitchMaterial) findViewById(2131364774);
             if (switchMaterial != null) {
-                ConstraintLayout constraintLayout3 = (ConstraintLayout) findViewById(2131364726);
+                ConstraintLayout constraintLayout3 = (ConstraintLayout) findViewById(2131364775);
                 if (constraintLayout3 != null) {
-                    f3 f3Var = new f3(this, switchMaterial, constraintLayout3);
-                    m.checkNotNullExpressionValue(f3Var, "ViewSettingSwitchBinding…ate(layoutInflater, this)");
-                    m.checkNotNullParameter(f3Var, "binding");
-                    bVar = new b.d(f3Var);
+                    i3 i3Var = new i3(this, switchMaterial, constraintLayout3);
+                    m.checkNotNullExpressionValue(i3Var, "ViewSettingSwitchBinding…ate(layoutInflater, this)");
+                    m.checkNotNullParameter(i3Var, "binding");
+                    bVar = new b.d(i3Var);
                 } else {
-                    i2 = 2131364726;
+                    i2 = 2131364775;
                 }
             }
             throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2)));
diff --git a/app/src/main/java/com/discord/views/CodeVerificationView.java b/app/src/main/java/com/discord/views/CodeVerificationView.java
index 481d9a76ac..2446540543 100644
--- a/app/src/main/java/com/discord/views/CodeVerificationView.java
+++ b/app/src/main/java/com/discord/views/CodeVerificationView.java
@@ -15,7 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
-import c.a.i.t1;
+import c.a.i.v1;
 import c.a.z.b;
 import c.a.z.c;
 import c.a.z.d;
@@ -32,7 +32,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: CodeVerificationView.kt */
 public final class CodeVerificationView extends LinearLayout {
     public static final a i = a.NUMERIC;
-    public final t1 j;
+    public final v1 j;
     public final List<TextView> k;
     public final Drawable l;
     public final Drawable m;
@@ -63,27 +63,27 @@ public final class CodeVerificationView extends LinearLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558737, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131365480;
-        TextView textView = (TextView) inflate.findViewById(2131365480);
+        int i2 = 2131365541;
+        TextView textView = (TextView) inflate.findViewById(2131365541);
         if (textView != null) {
-            i2 = 2131365481;
-            TextView textView2 = (TextView) inflate.findViewById(2131365481);
+            i2 = 2131365542;
+            TextView textView2 = (TextView) inflate.findViewById(2131365542);
             if (textView2 != null) {
-                i2 = 2131365482;
-                TextView textView3 = (TextView) inflate.findViewById(2131365482);
+                i2 = 2131365543;
+                TextView textView3 = (TextView) inflate.findViewById(2131365543);
                 if (textView3 != null) {
-                    i2 = 2131365483;
-                    TextView textView4 = (TextView) inflate.findViewById(2131365483);
+                    i2 = 2131365544;
+                    TextView textView4 = (TextView) inflate.findViewById(2131365544);
                     if (textView4 != null) {
-                        i2 = 2131365484;
-                        TextView textView5 = (TextView) inflate.findViewById(2131365484);
+                        i2 = 2131365545;
+                        TextView textView5 = (TextView) inflate.findViewById(2131365545);
                         if (textView5 != null) {
-                            i2 = 2131365485;
-                            TextView textView6 = (TextView) inflate.findViewById(2131365485);
+                            i2 = 2131365546;
+                            TextView textView6 = (TextView) inflate.findViewById(2131365546);
                             if (textView6 != null) {
-                                t1 t1Var = new t1((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6);
-                                m.checkNotNullExpressionValue(t1Var, "ViewCodeVerificationBind…rom(context), this, true)");
-                                this.j = t1Var;
+                                v1 v1Var = new v1((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6);
+                                m.checkNotNullExpressionValue(v1Var, "ViewCodeVerificationBind…rom(context), this, true)");
+                                this.j = v1Var;
                                 this.o = "";
                                 this.p = e.i;
                                 if (attributeSet != null) {
@@ -118,8 +118,8 @@ public final class CodeVerificationView extends LinearLayout {
                                 } else {
                                     a(this);
                                 }
-                                this.l = ContextCompat.getDrawable(context, 2131231220);
-                                this.m = ContextCompat.getDrawable(context, 2131231221);
+                                this.l = ContextCompat.getDrawable(context, 2131231225);
+                                this.m = ContextCompat.getDrawable(context, 2131231226);
                                 e();
                                 return;
                             }
diff --git a/app/src/main/java/com/discord/views/CutoutView.java b/app/src/main/java/com/discord/views/CutoutView.java
index 516378cb7f..bbabfe281e 100644
--- a/app/src/main/java/com/discord/views/CutoutView.java
+++ b/app/src/main/java/com/discord/views/CutoutView.java
@@ -59,7 +59,7 @@ public class CutoutView extends FrameLayout {
                 Path path = new Path();
                 path.addRect(0.0f, 0.0f, (float) i, (float) i2, Path.Direction.CW);
                 Path path2 = new Path();
-                path2.addCircle(AnimatableValueParser.n1(context) ? (float) (i - this.b) : (float) this.b, (float) this.b, (float) this.a, Path.Direction.CW);
+                path2.addCircle(AnimatableValueParser.o1(context) ? (float) (i - this.b) : (float) this.b, (float) this.b, (float) this.a, Path.Direction.CW);
                 Path path3 = new Path(path);
                 path3.op(path2, Path.Op.DIFFERENCE);
                 return path3;
@@ -107,7 +107,7 @@ public class CutoutView extends FrameLayout {
                 float f3 = ((float) i3) * 2.0f;
                 float f4 = -f2;
                 float f5 = ((float) i2) + f2;
-                if (AnimatableValueParser.n1(context)) {
+                if (AnimatableValueParser.o1(context)) {
                     float f6 = f - ((float) this.b);
                     RectF rectF = new RectF(f6, f4, f3 + f6, f5);
                     Path path = new Path();
@@ -167,7 +167,7 @@ public class CutoutView extends FrameLayout {
                 float f = ((float) this.a) * resources.getDisplayMetrics().density;
                 float f2 = (float) i2;
                 float f3 = f2 / 2.0f;
-                if (AnimatableValueParser.n1(context)) {
+                if (AnimatableValueParser.o1(context)) {
                     Path path = new Path();
                     float f4 = ((float) i) + f;
                     path.moveTo(0.0f, 0.0f);
diff --git a/app/src/main/java/com/discord/views/FailedUploadList.java b/app/src/main/java/com/discord/views/FailedUploadList.java
index 358c9cb92d..c1de5dde03 100644
--- a/app/src/main/java/com/discord/views/FailedUploadList.java
+++ b/app/src/main/java/com/discord/views/FailedUploadList.java
@@ -9,7 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import c.a.i.s1;
+import c.a.i.u1;
 import com.discord.api.message.LocalAttachment;
 import com.discord.utilities.attachments.AttachmentUtilsKt;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -27,7 +27,7 @@ import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: FailedUploadList.kt */
 public final class FailedUploadList extends LinearLayout {
-    public final s1 i;
+    public final u1 i;
 
     /* compiled from: FailedUploadList.kt */
     public static final class a {
@@ -35,14 +35,14 @@ public final class FailedUploadList extends LinearLayout {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f2110c;
+        public final String f2117c;
 
         public a(String str, long j, String str2) {
             m.checkNotNullParameter(str, "displayName");
             m.checkNotNullParameter(str2, "mimeType");
             this.a = str;
             this.b = j;
-            this.f2110c = str2;
+            this.f2117c = str2;
         }
 
         public boolean equals(Object obj) {
@@ -53,14 +53,14 @@ public final class FailedUploadList extends LinearLayout {
                 return false;
             }
             a aVar = (a) obj;
-            return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f2110c, aVar.f2110c);
+            return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f2117c, aVar.f2117c);
         }
 
         public int hashCode() {
             String str = this.a;
             int i = 0;
             int a = (a0.a.a.b.a(this.b) + ((str != null ? str.hashCode() : 0) * 31)) * 31;
-            String str2 = this.f2110c;
+            String str2 = this.f2117c;
             if (str2 != null) {
                 i = str2.hashCode();
             }
@@ -73,7 +73,7 @@ public final class FailedUploadList extends LinearLayout {
             L.append(", sizeBytes=");
             L.append(this.b);
             L.append(", mimeType=");
-            return c.d.b.a.a.D(L, this.f2110c, ")");
+            return c.d.b.a.a.D(L, this.f2117c, ")");
         }
     }
 
@@ -154,18 +154,18 @@ public final class FailedUploadList extends LinearLayout {
         super(context, attributeSet);
         View inflate = LayoutInflater.from(getContext()).inflate(2131558731, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362603;
-        FailedUploadView failedUploadView = (FailedUploadView) inflate.findViewById(2131362603);
+        int i = 2131362616;
+        FailedUploadView failedUploadView = (FailedUploadView) inflate.findViewById(2131362616);
         if (failedUploadView != null) {
-            i = 2131362604;
-            FailedUploadView failedUploadView2 = (FailedUploadView) inflate.findViewById(2131362604);
+            i = 2131362617;
+            FailedUploadView failedUploadView2 = (FailedUploadView) inflate.findViewById(2131362617);
             if (failedUploadView2 != null) {
-                i = 2131362605;
-                FailedUploadView failedUploadView3 = (FailedUploadView) inflate.findViewById(2131362605);
+                i = 2131362618;
+                FailedUploadView failedUploadView3 = (FailedUploadView) inflate.findViewById(2131362618);
                 if (failedUploadView3 != null) {
-                    s1 s1Var = new s1((LinearLayout) inflate, failedUploadView, failedUploadView2, failedUploadView3);
-                    m.checkNotNullExpressionValue(s1Var, "ViewChatUploadListBindin…rom(context), this, true)");
-                    this.i = s1Var;
+                    u1 u1Var = new u1((LinearLayout) inflate, failedUploadView, failedUploadView2, failedUploadView3);
+                    m.checkNotNullExpressionValue(u1Var, "ViewChatUploadListBindin…rom(context), this, true)");
+                    this.i = u1Var;
                     return;
                 }
             }
@@ -176,7 +176,7 @@ public final class FailedUploadList extends LinearLayout {
     private final List<FailedUploadView> getFailedUploadViews() {
         FailedUploadView failedUploadView = this.i.b;
         m.checkNotNullExpressionValue(failedUploadView, "binding.chatUpload1");
-        FailedUploadView failedUploadView2 = this.i.f149c;
+        FailedUploadView failedUploadView2 = this.i.f163c;
         m.checkNotNullExpressionValue(failedUploadView2, "binding.chatUpload2");
         FailedUploadView failedUploadView3 = this.i.d;
         m.checkNotNullExpressionValue(failedUploadView3, "binding.chatUpload3");
@@ -234,7 +234,7 @@ public final class FailedUploadList extends LinearLayout {
                     String str = aVar.a;
                     Context context4 = failedUploadView2.getContext();
                     m.checkNotNullExpressionValue(context4, "context");
-                    failedUploadView2.a(str, FileUtilsKt.getIconForFiletype(context4, aVar.f2110c), FileUtilsKt.getSizeSubtitle(aVar.b));
+                    failedUploadView2.a(str, FileUtilsKt.getIconForFiletype(context4, aVar.f2117c), FileUtilsKt.getSizeSubtitle(aVar.b));
                 }
             } else if (obj instanceof b.C0182b) {
                 b.C0182b bVar = (b.C0182b) obj;
@@ -246,7 +246,7 @@ public final class FailedUploadList extends LinearLayout {
                 m.checkNotNullExpressionValue(resources, "resources");
                 Context context5 = failedUploadView3.getContext();
                 m.checkNotNullExpressionValue(context5, "context");
-                CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, context5, 2131755342, i2, Integer.valueOf(i2));
+                CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, context5, 2131755343, i2, Integer.valueOf(i2));
                 Context context6 = failedUploadView3.getContext();
                 m.checkNotNullExpressionValue(context6, "context");
                 failedUploadView3.a(quantityString, DrawableCompat.getThemedDrawableRes$default(context6, 2130969464, 0, 2, (Object) null), FileUtilsKt.getSizeSubtitle(j2));
diff --git a/app/src/main/java/com/discord/views/FailedUploadView.java b/app/src/main/java/com/discord/views/FailedUploadView.java
index 5fdb65e563..eca09404de 100644
--- a/app/src/main/java/com/discord/views/FailedUploadView.java
+++ b/app/src/main/java/com/discord/views/FailedUploadView.java
@@ -9,12 +9,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.r1;
+import c.a.i.t1;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import d0.z.d.m;
 /* compiled from: FailedUploadView.kt */
 public final class FailedUploadView extends ConstraintLayout {
-    public final r1 i;
+    public final t1 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public FailedUploadView(Context context, AttributeSet attributeSet) {
@@ -22,21 +22,21 @@ public final class FailedUploadView extends ConstraintLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(getContext()).inflate(2131558730, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362937;
-        TextView textView = (TextView) inflate.findViewById(2131362937);
+        int i = 2131362962;
+        TextView textView = (TextView) inflate.findViewById(2131362962);
         if (textView != null) {
-            i = 2131363161;
-            ImageView imageView = (ImageView) inflate.findViewById(2131363161);
+            i = 2131363186;
+            ImageView imageView = (ImageView) inflate.findViewById(2131363186);
             if (imageView != null) {
-                i = 2131363184;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131363184);
+                i = 2131363209;
+                ImageView imageView2 = (ImageView) inflate.findViewById(2131363209);
                 if (imageView2 != null) {
-                    i = 2131365134;
-                    TextView textView2 = (TextView) inflate.findViewById(2131365134);
+                    i = 2131365189;
+                    TextView textView2 = (TextView) inflate.findViewById(2131365189);
                     if (textView2 != null) {
-                        r1 r1Var = new r1((ConstraintLayout) inflate, textView, imageView, imageView2, textView2);
-                        m.checkNotNullExpressionValue(r1Var, "ViewChatUploadBinding.in…rom(context), this, true)");
-                        this.i = r1Var;
+                        t1 t1Var = new t1((ConstraintLayout) inflate, textView, imageView, imageView2, textView2);
+                        m.checkNotNullExpressionValue(t1Var, "ViewChatUploadBinding.in…rom(context), this, true)");
+                        this.i = t1Var;
                         return;
                     }
                 }
@@ -53,6 +53,6 @@ public final class FailedUploadView extends ConstraintLayout {
         TextView textView2 = this.i.d;
         m.checkNotNullExpressionValue(textView2, "binding.subtitleText");
         ViewExtensions.setTextAndVisibilityBy(textView2, str);
-        this.i.f146c.setImageResource(i);
+        this.i.f157c.setImageResource(i);
     }
 }
diff --git a/app/src/main/java/com/discord/views/GuildView.java b/app/src/main/java/com/discord/views/GuildView.java
index 93f775701d..d01bd6b5db 100644
--- a/app/src/main/java/com/discord/views/GuildView.java
+++ b/app/src/main/java/com/discord/views/GuildView.java
@@ -6,13 +6,13 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.z1;
+import c.a.i.b2;
 import com.discord.R;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: GuildView.kt */
 public final class GuildView extends ConstraintLayout {
-    public final z1 i;
+    public final b2 i;
     public int j;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -20,15 +20,15 @@ public final class GuildView extends ConstraintLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558753, this);
-        int i = 2131363343;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363343);
+        int i = 2131363369;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363369);
         if (simpleDraweeView != null) {
-            i = 2131363455;
-            TextView textView = (TextView) findViewById(2131363455);
+            i = 2131363496;
+            TextView textView = (TextView) findViewById(2131363496);
             if (textView != null) {
-                z1 z1Var = new z1(this, simpleDraweeView, textView);
-                m.checkNotNullExpressionValue(z1Var, "ViewGuildBinding.inflate…ater.from(context), this)");
-                this.i = z1Var;
+                b2 b2Var = new b2(this, simpleDraweeView, textView);
+                m.checkNotNullExpressionValue(b2Var, "ViewGuildBinding.inflate…ater.from(context), this)");
+                this.i = b2Var;
                 this.j = -1;
                 setClipToOutline(true);
                 if (attributeSet != null) {
diff --git a/app/src/main/java/com/discord/views/LoadingButton.java b/app/src/main/java/com/discord/views/LoadingButton.java
index b3494aebc0..47b1168a1a 100644
--- a/app/src/main/java/com/discord/views/LoadingButton.java
+++ b/app/src/main/java/com/discord/views/LoadingButton.java
@@ -10,13 +10,13 @@ import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import androidx.annotation.ColorInt;
-import c.a.i.b2;
+import c.a.i.d2;
 import com.discord.R;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
 /* compiled from: LoadingButton.kt */
 public final class LoadingButton extends FrameLayout {
-    public final b2 i;
+    public final d2 i;
     public float j;
     public CharSequence k;
     public Drawable l;
@@ -35,15 +35,15 @@ public final class LoadingButton extends FrameLayout {
         int i = 4;
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558760, this);
-        int i2 = 2131363767;
-        MaterialButton materialButton = (MaterialButton) findViewById(2131363767);
+        int i2 = 2131363808;
+        MaterialButton materialButton = (MaterialButton) findViewById(2131363808);
         if (materialButton != null) {
-            i2 = 2131363768;
-            ProgressBar progressBar = (ProgressBar) findViewById(2131363768);
+            i2 = 2131363809;
+            ProgressBar progressBar = (ProgressBar) findViewById(2131363809);
             if (progressBar != null) {
-                b2 b2Var = new b2(this, materialButton, progressBar);
-                m.checkNotNullExpressionValue(b2Var, "ViewLoadingButtonBinding…ater.from(context), this)");
-                this.i = b2Var;
+                d2 d2Var = new d2(this, materialButton, progressBar);
+                m.checkNotNullExpressionValue(d2Var, "ViewLoadingButtonBinding…ater.from(context), this)");
+                this.i = d2Var;
                 this.j = 0.2f;
                 setClickable(true);
                 setFocusable(true);
@@ -147,7 +147,7 @@ public final class LoadingButton extends FrameLayout {
     }
 
     private final void setProgressBarColor(@ColorInt int i) {
-        ProgressBar progressBar = this.i.f66c;
+        ProgressBar progressBar = this.i.f79c;
         m.checkNotNullExpressionValue(progressBar, "binding.loadingButtonProgress");
         progressBar.getIndeterminateDrawable().setColorFilter(i, PorterDuff.Mode.SRC_IN);
     }
@@ -192,7 +192,7 @@ public final class LoadingButton extends FrameLayout {
             MaterialButton materialButton3 = this.i.b;
             m.checkNotNullExpressionValue(materialButton3, "binding.loadingButtonButton");
             materialButton3.setIcon(null);
-            ProgressBar progressBar = this.i.f66c;
+            ProgressBar progressBar = this.i.f79c;
             m.checkNotNullExpressionValue(progressBar, "binding.loadingButtonProgress");
             progressBar.setVisibility(0);
             return;
@@ -204,7 +204,7 @@ public final class LoadingButton extends FrameLayout {
         MaterialButton materialButton5 = this.i.b;
         m.checkNotNullExpressionValue(materialButton5, "binding.loadingButtonButton");
         materialButton5.setIcon(this.l);
-        ProgressBar progressBar2 = this.i.f66c;
+        ProgressBar progressBar2 = this.i.f79c;
         m.checkNotNullExpressionValue(progressBar2, "binding.loadingButtonProgress");
         progressBar2.setVisibility(8);
     }
diff --git a/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java b/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java
index 746c4645c7..36f1081801 100644
--- a/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java
+++ b/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java
@@ -17,11 +17,11 @@ public final class MemberVerificationAvatarView extends FrameLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558563, this);
-        int i = 2131363827;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363827);
+        int i = 2131363868;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363868);
         if (simpleDraweeView != null) {
-            i = 2131363850;
-            TextView textView = (TextView) findViewById(2131363850);
+            i = 2131363891;
+            TextView textView = (TextView) findViewById(2131363891);
             if (textView != null) {
                 m0 m0Var = new m0(this, simpleDraweeView, textView);
                 m.checkNotNullExpressionValue(m0Var, "MemberVerificationAvatar…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/NumericBadgingView.java b/app/src/main/java/com/discord/views/NumericBadgingView.java
index 1ea1ae46b0..f5ab58efca 100644
--- a/app/src/main/java/com/discord/views/NumericBadgingView.java
+++ b/app/src/main/java/com/discord/views/NumericBadgingView.java
@@ -21,7 +21,7 @@ public final class NumericBadgingView extends CutoutView {
     public float r = ((float) DimenUtils.dpToPixels(4));
 
     /* renamed from: s  reason: collision with root package name */
-    public RectF f2111s = new RectF();
+    public RectF f2118s = new RectF();
     public String t = "";
     public final Paint u;
     public final Paint v;
@@ -41,7 +41,7 @@ public final class NumericBadgingView extends CutoutView {
         public Path a(Context context, int i, int i2) {
             m.checkNotNullParameter(context, "context");
             RectF rectF = new RectF(0.0f, 0.0f, this.a.width(), this.a.height());
-            if (AnimatableValueParser.n1(context)) {
+            if (AnimatableValueParser.o1(context)) {
                 rectF.offset(((float) i) - this.a.width(), 0.0f);
             }
             float f = this.b;
@@ -122,12 +122,12 @@ public final class NumericBadgingView extends CutoutView {
         if (!(this.t.length() == 0)) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            float measuredWidth = AnimatableValueParser.n1(context) ? ((float) getMeasuredWidth()) - (this.f2111s.width() / 2.0f) : this.f2111s.width() / 2.0f;
+            float measuredWidth = AnimatableValueParser.o1(context) ? ((float) getMeasuredWidth()) - (this.f2118s.width() / 2.0f) : this.f2118s.width() / 2.0f;
             int save = canvas.save();
-            canvas.translate(measuredWidth, this.f2111s.height() / 2.0f);
+            canvas.translate(measuredWidth, this.f2118s.height() / 2.0f);
             try {
-                float height = this.f2111s.height() / 2.0f;
-                canvas.drawRoundRect(this.f2111s, height, height, this.u);
+                float height = this.f2118s.height() / 2.0f;
+                canvas.drawRoundRect(this.f2118s, height, height, this.u);
                 canvas.drawText(this.t, 0.0f, -((this.v.descent() + this.v.ascent()) / 2.0f), this.v);
             } finally {
                 canvas.restoreToCount(save);
@@ -153,8 +153,8 @@ public final class NumericBadgingView extends CutoutView {
         float textSize = this.v.getTextSize() + ((float) this.q);
         float f = textSize / 2.0f;
         float measureText = i >= 10 ? (this.v.measureText(this.t) + textSize) / 2.0f : f;
-        this.f2111s.set(-measureText, -f, measureText, f);
-        setStyle(new a(this.f2111s, this.r));
+        this.f2118s.set(-measureText, -f, measureText, f);
+        setStyle(new a(this.f2118s, this.r));
         invalidate();
     }
 }
diff --git a/app/src/main/java/com/discord/views/OAuthPermissionViews.java b/app/src/main/java/com/discord/views/OAuthPermissionViews.java
index 46769ee5df..13a77cd0bf 100644
--- a/app/src/main/java/com/discord/views/OAuthPermissionViews.java
+++ b/app/src/main/java/com/discord/views/OAuthPermissionViews.java
@@ -1,7 +1,7 @@
 package com.discord.views;
 
 import android.widget.TextView;
-import c.a.i.n0;
+import c.a.i.o0;
 import com.discord.api.auth.OAuthScope;
 import com.discord.utilities.views.SimpleRecyclerAdapter;
 import d0.z.d.m;
@@ -27,15 +27,15 @@ public final class OAuthPermissionViews {
 
     /* compiled from: OAuthPermissionViews.kt */
     public static final class a extends SimpleRecyclerAdapter.ViewHolder<OAuthScope> {
-        public final n0 a;
+        public final o0 a;
 
         /* JADX WARNING: Illegal instructions before constructor call */
-        public a(n0 n0Var) {
+        public a(o0 o0Var) {
             super(r0);
-            m.checkNotNullParameter(n0Var, "binding");
-            TextView textView = n0Var.a;
+            m.checkNotNullParameter(o0Var, "binding");
+            TextView textView = o0Var.a;
             m.checkNotNullExpressionValue(textView, "binding.root");
-            this.a = n0Var;
+            this.a = o0Var;
         }
 
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
@@ -54,51 +54,51 @@ public final class OAuthPermissionViews {
         m.checkNotNullParameter(textView, "$this$setScopePermissionText");
         m.checkNotNullParameter(oAuthScope, "scope");
         if (m.areEqual(oAuthScope, OAuthScope.Identify.INSTANCE)) {
-            i = 2131893004;
+            i = 2131893087;
         } else if (m.areEqual(oAuthScope, OAuthScope.Email.INSTANCE)) {
-            i = 2131892996;
+            i = 2131893079;
         } else if (m.areEqual(oAuthScope, OAuthScope.Connections.INSTANCE)) {
-            i = 2131892994;
+            i = 2131893077;
         } else if (m.areEqual(oAuthScope, OAuthScope.Guilds.INSTANCE)) {
-            i = 2131893000;
+            i = 2131893083;
         } else if (m.areEqual(oAuthScope, OAuthScope.GuildsJoin.INSTANCE)) {
-            i = 2131893002;
+            i = 2131893085;
         } else if (m.areEqual(oAuthScope, OAuthScope.GdmJoin.INSTANCE)) {
-            i = 2131892998;
+            i = 2131893081;
         } else if (m.areEqual(oAuthScope, OAuthScope.Bot.INSTANCE)) {
-            i = 2131892991;
+            i = 2131893074;
         } else if (m.areEqual(oAuthScope, OAuthScope.WebhookIncoming.INSTANCE)) {
-            i = 2131893018;
+            i = 2131893101;
         } else if (m.areEqual(oAuthScope, OAuthScope.Rpc.INSTANCE)) {
-            i = 2131893009;
+            i = 2131893092;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcNotificationsRead.INSTANCE)) {
-            i = 2131893012;
+            i = 2131893095;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcVoiceRead.INSTANCE)) {
-            i = 2131893014;
+            i = 2131893097;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcVoiceWrite.INSTANCE)) {
-            i = 2131893015;
+            i = 2131893098;
         } else if (m.areEqual(oAuthScope, OAuthScope.RpcActivitiesWrite.INSTANCE)) {
-            i = 2131893010;
+            i = 2131893093;
         } else if (m.areEqual(oAuthScope, OAuthScope.MessagesRead.INSTANCE)) {
-            i = 2131893005;
+            i = 2131893088;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsBuildsUpload.INSTANCE)) {
-            i = 2131892981;
+            i = 2131893064;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsBuildsRead.INSTANCE)) {
-            i = 2131892979;
+            i = 2131893062;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsCommands.INSTANCE)) {
-            i = 2131892983;
+            i = 2131893066;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsCommandsUpdate.INSTANCE)) {
-            i = 2131892985;
+            i = 2131893068;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsStoreUpdate.INSTANCE)) {
-            i = 2131892989;
+            i = 2131893072;
         } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsEntitlements.INSTANCE)) {
-            i = 2131892987;
+            i = 2131893070;
         } else if (m.areEqual(oAuthScope, OAuthScope.ActivitiesRead.INSTANCE)) {
-            i = 2131892975;
+            i = 2131893058;
         } else if (m.areEqual(oAuthScope, OAuthScope.ActivitiesWrite.INSTANCE)) {
-            i = 2131892977;
+            i = 2131893060;
         } else if (m.areEqual(oAuthScope, OAuthScope.RelationshipsRead.INSTANCE)) {
-            i = 2131893007;
+            i = 2131893090;
         } else if (oAuthScope instanceof OAuthScope.Invalid) {
             throw new InvalidScopeException(((OAuthScope.Invalid) oAuthScope).b());
         } else {
diff --git a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
index 2cdeb24522..63216aa880 100644
--- a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
+++ b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java
@@ -11,8 +11,8 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.o0;
 import c.a.i.p0;
+import c.a.i.q0;
 import c.a.z.k;
 import c.a.z.o;
 import com.discord.app.AppComponent;
@@ -35,22 +35,22 @@ import rx.Observable;
 public final class OverlayMenuBubbleDialog extends k implements AppComponent {
 
     /* renamed from: y  reason: collision with root package name */
-    public final o0 f2112y;
+    public final p0 f2119y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final SimpleRecyclerAdapter<StoreVoiceParticipants.VoiceUser, a> f2113z;
+    public final SimpleRecyclerAdapter<StoreVoiceParticipants.VoiceUser, a> f2120z;
 
     /* compiled from: OverlayMenuBubbleDialog.kt */
     public static final class a extends SimpleRecyclerAdapter.ViewHolder<StoreVoiceParticipants.VoiceUser> {
-        public final p0 a;
+        public final q0 a;
 
         /* JADX WARNING: Illegal instructions before constructor call */
-        public a(p0 p0Var) {
+        public a(q0 q0Var) {
             super(r0);
-            m.checkNotNullParameter(p0Var, "binding");
-            VoiceUserView voiceUserView = p0Var.a;
+            m.checkNotNullParameter(q0Var, "binding");
+            VoiceUserView voiceUserView = q0Var.a;
             m.checkNotNullExpressionValue(voiceUserView, "binding.root");
-            this.a = p0Var;
+            this.a = q0Var;
         }
 
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
@@ -73,7 +73,7 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
             Long l2 = l;
             StoreChannels channels = StoreStream.Companion.getChannels();
             m.checkNotNullExpressionValue(l2, "channelId");
-            return channels.observeChannel(l2.longValue()).Z(new o(l2));
+            return channels.observeChannel(l2.longValue()).Y(new o(l2));
         }
     }
 
@@ -116,7 +116,7 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
             Pair<? extends List<? extends StoreVoiceParticipants.VoiceUser>, ? extends Integer> pair2 = pair;
             int intValue = ((Number) pair2.component2()).intValue();
             OverlayMenuBubbleDialog overlayMenuBubbleDialog = this.this$0;
-            overlayMenuBubbleDialog.f2113z.setData((List) pair2.component1());
+            overlayMenuBubbleDialog.f2120z.setData((List) pair2.component1());
             if (intValue == 0) {
                 str = null;
             } else {
@@ -125,7 +125,7 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
                 sb.append(intValue);
                 str = sb.toString();
             }
-            TextView textView = overlayMenuBubbleDialog.f2112y.d;
+            TextView textView = overlayMenuBubbleDialog.f2119y.d;
             m.checkNotNullExpressionValue(textView, "binding.overlayMembersOverflowTv");
             ViewExtensions.setTextAndVisibilityBy(textView, str);
             return Unit.a;
@@ -136,27 +136,27 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
     public OverlayMenuBubbleDialog(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558610, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558611, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364116;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364116);
+        int i = 2131364159;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364159);
         if (linearLayout != null) {
-            i = 2131364118;
-            View findViewById = inflate.findViewById(2131364118);
+            i = 2131364161;
+            View findViewById = inflate.findViewById(2131364161);
             if (findViewById != null) {
-                i = 2131364119;
-                TextView textView = (TextView) inflate.findViewById(2131364119);
+                i = 2131364162;
+                TextView textView = (TextView) inflate.findViewById(2131364162);
                 if (textView != null) {
-                    i = 2131364120;
-                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364120);
+                    i = 2131364163;
+                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364163);
                     if (recyclerView != null) {
-                        i = 2131364121;
-                        OverlayMenuView overlayMenuView = (OverlayMenuView) inflate.findViewById(2131364121);
+                        i = 2131364164;
+                        OverlayMenuView overlayMenuView = (OverlayMenuView) inflate.findViewById(2131364164);
                         if (overlayMenuView != null) {
-                            o0 o0Var = new o0((LinearLayout) inflate, linearLayout, findViewById, textView, recyclerView, overlayMenuView);
-                            m.checkNotNullExpressionValue(o0Var, "OverlayBubbleMenuBinding…rom(context), this, true)");
-                            this.f2112y = o0Var;
-                            this.f2113z = new SimpleRecyclerAdapter<>(null, c.a.z.m.i, 1, null);
+                            p0 p0Var = new p0((LinearLayout) inflate, linearLayout, findViewById, textView, recyclerView, overlayMenuView);
+                            m.checkNotNullExpressionValue(p0Var, "OverlayBubbleMenuBinding…rom(context), this, true)");
+                            this.f2119y = p0Var;
+                            this.f2120z = new SimpleRecyclerAdapter<>(null, c.a.z.m.i, 1, null);
                             overlayMenuView.setOnDismissRequested$app_productionGoogleRelease(new q(0, this));
                             setClipChildren(false);
                             return;
@@ -172,18 +172,18 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
     public Animator getClosingAnimator() {
         AnimatorSet animatorSet = new AnimatorSet();
         animatorSet.setStartDelay((long) getResources().getInteger(17694720));
-        OverlayMenuView overlayMenuView = this.f2112y.f;
+        OverlayMenuView overlayMenuView = this.f2119y.f;
         m.checkNotNullExpressionValue(overlayMenuView, "binding.overlayMenu");
         Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView.getContext(), 2130837533);
-        loadAnimator.setTarget(this.f2112y.f);
+        loadAnimator.setTarget(this.f2119y.f);
         Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), 2130837535);
-        loadAnimator2.setTarget(this.f2112y.b);
+        loadAnimator2.setTarget(this.f2119y.b);
         animatorSet.playTogether(loadAnimator, loadAnimator2);
         return animatorSet;
     }
 
     public final View getLinkedAnchorView() {
-        View view = this.f2112y.f132c;
+        View view = this.f2119y.f140c;
         m.checkNotNullExpressionValue(view, "binding.overlayLinkedAnchorView");
         return view;
     }
@@ -191,28 +191,28 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent {
     @Override // android.view.View, android.view.ViewGroup
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        OverlayMenuView overlayMenuView = this.f2112y.f;
+        OverlayMenuView overlayMenuView = this.f2119y.f;
         m.checkNotNullExpressionValue(overlayMenuView, "binding.overlayMenu");
         overlayMenuView.setAlpha(0.0f);
-        LinearLayout linearLayout = this.f2112y.b;
+        LinearLayout linearLayout = this.f2119y.b;
         m.checkNotNullExpressionValue(linearLayout, "binding.overlayHeader");
         linearLayout.setAlpha(0.0f);
         AnimatorSet animatorSet = new AnimatorSet();
-        OverlayMenuView overlayMenuView2 = this.f2112y.f;
+        OverlayMenuView overlayMenuView2 = this.f2119y.f;
         m.checkNotNullExpressionValue(overlayMenuView2, "binding.overlayMenu");
         Animator loadAnimator = AnimatorInflater.loadAnimator(overlayMenuView2.getContext(), 2130837534);
-        loadAnimator.setTarget(this.f2112y.f);
+        loadAnimator.setTarget(this.f2119y.f);
         Animator loadAnimator2 = AnimatorInflater.loadAnimator(getContext(), 2130837532);
-        loadAnimator2.setTarget(this.f2112y.b);
+        loadAnimator2.setTarget(this.f2119y.b);
         animatorSet.playTogether(loadAnimator, loadAnimator2);
         animatorSet.setStartDelay((long) getResources().getInteger(17694720));
         animatorSet.start();
-        RecyclerView recyclerView = this.f2112y.e;
+        RecyclerView recyclerView = this.f2119y.e;
         m.checkNotNullExpressionValue(recyclerView, "binding.overlayMembersRv");
-        recyclerView.setAdapter(this.f2113z);
-        Observable G = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().Z(b.i).G(c.i);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get…- 3\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(G), this, null, 2, null), OverlayMenuBubbleDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
+        recyclerView.setAdapter(this.f2120z);
+        Observable F = StoreStream.Companion.getVoiceChannelSelected().observeSelectedVoiceChannelId().Y(b.i).F(c.i);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…- 3\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(F), this, null, 2, null), OverlayMenuBubbleDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new d(this), 62, (Object) null);
     }
 
     @Override // com.discord.overlay.views.OverlayDialog, com.discord.overlay.views.OverlayBubbleWrap, android.view.View
diff --git a/app/src/main/java/com/discord/views/OverlayMenuView.java b/app/src/main/java/com/discord/views/OverlayMenuView.java
index 735f7c2029..e7871b8da3 100644
--- a/app/src/main/java/com/discord/views/OverlayMenuView.java
+++ b/app/src/main/java/com/discord/views/OverlayMenuView.java
@@ -9,8 +9,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
-import c.a.i.g2;
-import c.a.i.h2;
+import c.a.i.i2;
+import c.a.i.j2;
 import c.a.z.q;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.app.AppComponent;
@@ -35,7 +35,7 @@ import rx.subjects.Subject;
 /* compiled from: OverlayMenuView.kt */
 public final class OverlayMenuView extends LinearLayout implements AppComponent {
     public static final /* synthetic */ int i = 0;
-    public final g2 j;
+    public final i2 j;
     public final Subject<Void, Void> k;
     public Function0<Unit> l;
 
@@ -45,14 +45,14 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
         public final Guild b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final CallModel f2114c;
+        public final CallModel f2121c;
         public final RtcConnection.Quality d;
 
         public a(Long l, Guild guild, CallModel callModel, RtcConnection.Quality quality) {
             m.checkNotNullParameter(quality, "rtcQuality");
             this.a = l;
             this.b = guild;
-            this.f2114c = callModel;
+            this.f2121c = callModel;
             this.d = quality;
         }
     }
@@ -76,7 +76,7 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                 OverlayMenuView overlayMenuView = this.this$0;
                 int i = OverlayMenuView.i;
                 Objects.requireNonNull(overlayMenuView);
-                if (aVar2.f2114c != null) {
+                if (aVar2.f2121c != null) {
                     overlayMenuView.j.b.d.setOnClickListener(new e(0, overlayMenuView, aVar2));
                     TextView textView = overlayMenuView.j.b.d;
                     m.checkNotNullExpressionValue(textView, "binding.content.overlayInviteLink");
@@ -85,17 +85,17 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                     overlayMenuView.j.b.f.setOnClickListener(new e(1, overlayMenuView, aVar2));
                     ImageView imageView = overlayMenuView.j.e;
                     m.checkNotNullExpressionValue(imageView, "binding.srcToggle");
-                    ColorStateList valueOf = aVar2.f2114c.getAudioDevicesState().getSelectedOutputDevice() == StoreAudioDevices.OutputDevice.Speaker.INSTANCE ? ColorStateList.valueOf(-1) : ColorStateList.valueOf(ColorCompat.getColor(overlayMenuView.getContext(), 2131100162));
+                    ColorStateList valueOf = aVar2.f2121c.getAudioDevicesState().getSelectedOutputDevice() == StoreAudioDevices.OutputDevice.Speaker.INSTANCE ? ColorStateList.valueOf(-1) : ColorStateList.valueOf(ColorCompat.getColor(overlayMenuView.getContext(), 2131100162));
                     m.checkNotNullExpressionValue(valueOf, "if (selectedOutputDevice…rimary_dark_400))\n      }");
                     imageView.setImageTintList(valueOf);
                     overlayMenuView.j.e.setOnClickListener(new h(1, aVar2));
                     ImageView imageView2 = overlayMenuView.j.d;
                     m.checkNotNullExpressionValue(imageView2, "binding.muteToggle");
-                    imageView2.setActivated(aVar2.f2114c.isMeMutedByAnySource());
+                    imageView2.setActivated(aVar2.f2121c.isMeMutedByAnySource());
                     overlayMenuView.j.d.setOnClickListener(new h(2, aVar2));
-                    overlayMenuView.j.f94c.setOnClickListener(new h(3, overlayMenuView));
+                    overlayMenuView.j.f105c.setOnClickListener(new h(3, overlayMenuView));
                     overlayMenuView.j.b.e.setImageResource(VoiceViewUtils.INSTANCE.getQualityIndicator(aVar2.d));
-                    TextView textView2 = overlayMenuView.j.b.f100c;
+                    TextView textView2 = overlayMenuView.j.b.f109c;
                     m.checkNotNullExpressionValue(textView2, "binding.content.overlayGuildName");
                     Guild guild = aVar2.b;
                     String name = guild != null ? guild.getName() : null;
@@ -105,7 +105,7 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
                     textView2.setText(name);
                     TextView textView3 = overlayMenuView.j.b.b;
                     m.checkNotNullExpressionValue(textView3, "binding.content.overlayChannelName");
-                    textView3.setText(AnimatableValueParser.y0(aVar2.f2114c.getChannel()));
+                    textView3.setText(AnimatableValueParser.y0(aVar2.f2121c.getChannel()));
                 }
             }
             return Unit.a;
@@ -117,43 +117,43 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(getContext()).inflate(2131558772, this);
-        int i2 = 2131362749;
-        View findViewById = findViewById(2131362749);
+        int i2 = 2131362773;
+        View findViewById = findViewById(2131362773);
         if (findViewById != null) {
-            int i3 = 2131364113;
-            TextView textView = (TextView) findViewById.findViewById(2131364113);
+            int i3 = 2131364156;
+            TextView textView = (TextView) findViewById.findViewById(2131364156);
             if (textView != null) {
-                i3 = 2131364115;
-                TextView textView2 = (TextView) findViewById.findViewById(2131364115);
+                i3 = 2131364158;
+                TextView textView2 = (TextView) findViewById.findViewById(2131364158);
                 if (textView2 != null) {
-                    i3 = 2131364117;
-                    TextView textView3 = (TextView) findViewById.findViewById(2131364117);
+                    i3 = 2131364160;
+                    TextView textView3 = (TextView) findViewById.findViewById(2131364160);
                     if (textView3 != null) {
-                        i3 = 2131364122;
-                        ImageView imageView = (ImageView) findViewById.findViewById(2131364122);
+                        i3 = 2131364165;
+                        ImageView imageView = (ImageView) findViewById.findViewById(2131364165);
                         if (imageView != null) {
-                            i3 = 2131364123;
-                            TextView textView4 = (TextView) findViewById.findViewById(2131364123);
+                            i3 = 2131364166;
+                            TextView textView4 = (TextView) findViewById.findViewById(2131364166);
                             if (textView4 != null) {
-                                i3 = 2131364124;
-                                TextView textView5 = (TextView) findViewById.findViewById(2131364124);
+                                i3 = 2131364167;
+                                TextView textView5 = (TextView) findViewById.findViewById(2131364167);
                                 if (textView5 != null) {
-                                    h2 h2Var = new h2((CardView) findViewById, textView, textView2, textView3, imageView, textView4, textView5);
-                                    i2 = 2131362909;
-                                    ImageView imageView2 = (ImageView) findViewById(2131362909);
+                                    j2 j2Var = new j2((CardView) findViewById, textView, textView2, textView3, imageView, textView4, textView5);
+                                    i2 = 2131362934;
+                                    ImageView imageView2 = (ImageView) findViewById(2131362934);
                                     if (imageView2 != null) {
-                                        i2 = 2131363987;
-                                        ImageView imageView3 = (ImageView) findViewById(2131363987);
+                                        i2 = 2131364028;
+                                        ImageView imageView3 = (ImageView) findViewById(2131364028);
                                         if (imageView3 != null) {
-                                            i2 = 2131364966;
-                                            ImageView imageView4 = (ImageView) findViewById(2131364966);
+                                            i2 = 2131365016;
+                                            ImageView imageView4 = (ImageView) findViewById(2131365016);
                                             if (imageView4 != null) {
-                                                g2 g2Var = new g2(this, h2Var, imageView2, imageView3, imageView4);
-                                                m.checkNotNullExpressionValue(g2Var, "ViewOverlayMenuBinding.i…ater.from(context), this)");
-                                                this.j = g2Var;
-                                                PublishSubject l0 = PublishSubject.l0();
-                                                m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-                                                this.k = l0;
+                                                i2 i2Var = new i2(this, j2Var, imageView2, imageView3, imageView4);
+                                                m.checkNotNullExpressionValue(i2Var, "ViewOverlayMenuBinding.i…ater.from(context), this)");
+                                                this.j = i2Var;
+                                                PublishSubject k0 = PublishSubject.k0();
+                                                m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+                                                this.k = k0;
                                                 this.l = r.i;
                                                 return;
                                             }
@@ -182,11 +182,11 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent
     @Override // android.view.View, android.view.ViewGroup
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
-        Observable<R> Z = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().Z(q.i);
-        m.checkNotNullExpressionValue(Z, "StoreStream\n            …        }\n              }");
-        Observable s2 = ObservableExtensionsKt.computationLatest(Z).s();
-        m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), OverlayMenuView.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 62, (Object) null);
+        Observable<R> Y = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().Y(q.i);
+        m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+        Observable r = ObservableExtensionsKt.computationLatest(Y).r();
+        m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), OverlayMenuView.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new b(this), 62, (Object) null);
     }
 
     @Override // android.view.View, android.view.ViewGroup
diff --git a/app/src/main/java/com/discord/views/PileView.java b/app/src/main/java/com/discord/views/PileView.java
index 7cc372841d..1bd38f5d0d 100644
--- a/app/src/main/java/com/discord/views/PileView.java
+++ b/app/src/main/java/com/discord/views/PileView.java
@@ -9,7 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import androidx.annotation.ColorInt;
-import c.a.i.j2;
+import c.a.i.l2;
 import com.discord.R;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.icon.IconUtils;
@@ -41,7 +41,7 @@ public final class PileView extends FrameLayout {
         public static final a b = new a(1);
 
         /* renamed from: c  reason: collision with root package name */
-        public static final a f2115c = new a(2);
+        public static final a f2122c = new a(2);
         public final /* synthetic */ int d;
 
         public a(int i) {
@@ -49,7 +49,7 @@ public final class PileView extends FrameLayout {
         }
 
         @Override // com.discord.views.PileView.b
-        public final String a(int i) {
+        public final String getImageUri(int i) {
             int i2 = this.d;
             if (i2 == 0) {
                 return "asset://asset/images/default_avatar_0.jpg";
@@ -66,7 +66,7 @@ public final class PileView extends FrameLayout {
 
     /* compiled from: PileView.kt */
     public interface b {
-        String a(int i);
+        String getImageUri(int i);
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -92,7 +92,7 @@ public final class PileView extends FrameLayout {
         int i2 = this.p;
         this.q = new CutoutView.a.b((this.l / 2) + i2, i + i2);
         if (isInEditMode()) {
-            setItems(n.listOf((Object[]) new b[]{a.a, a.b, a.f2115c}));
+            setItems(n.listOf((Object[]) new b[]{a.a, a.b, a.f2122c}));
         }
     }
 
@@ -111,14 +111,14 @@ public final class PileView extends FrameLayout {
             int i4 = this.l * i2;
             int i5 = this.m * i2;
             View inflate = LayoutInflater.from(getContext()).inflate(2131558776, (ViewGroup) this, false);
-            int i6 = 2131364218;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364218);
+            int i6 = 2131364262;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364262);
             if (simpleDraweeView != null) {
-                i6 = 2131364219;
-                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364219);
+                i6 = 2131364263;
+                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364263);
                 if (simpleDraweeView2 != null) {
                     CutoutView cutoutView = (CutoutView) inflate;
-                    m.checkNotNullExpressionValue(new j2(cutoutView, simpleDraweeView, simpleDraweeView2), "ViewPileItemBinding.infl…om(context), this, false)");
+                    m.checkNotNullExpressionValue(new l2(cutoutView, simpleDraweeView, simpleDraweeView2), "ViewPileItemBinding.infl…om(context), this, false)");
                     cutoutView.setId(FrameLayout.generateViewId());
                     int i7 = this.l;
                     FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(i7, i7);
@@ -134,17 +134,17 @@ public final class PileView extends FrameLayout {
                             m.checkNotNullExpressionValue(simpleDraweeView2, "itemBinding.pileItemImage");
                             GenericDraweeHierarchy hierarchy = simpleDraweeView2.getHierarchy();
                             m.checkNotNullExpressionValue(hierarchy, "itemBinding.pileItemImage.hierarchy");
-                            hierarchy.q(null);
+                            hierarchy.r(null);
                         }
                         if (!this.k) {
                             m.checkNotNullExpressionValue(simpleDraweeView, "itemBinding.pileItemBg");
                             GenericDraweeHierarchy hierarchy2 = simpleDraweeView.getHierarchy();
                             m.checkNotNullExpressionValue(hierarchy2, "itemBinding.pileItemBg.hierarchy");
-                            hierarchy2.q(null);
+                            hierarchy2.r(null);
                         }
                         if (this.n != 0) {
                             m.checkNotNullExpressionValue(simpleDraweeView, "itemBinding.pileItemBg");
-                            simpleDraweeView.getHierarchy().n(1, new ColorDrawable(this.n));
+                            simpleDraweeView.getHierarchy().o(1, new ColorDrawable(this.n));
                             m.checkNotNullExpressionValue(simpleDraweeView, "itemBinding.pileItemBg");
                             simpleDraweeView.setVisibility(0);
                         }
@@ -152,9 +152,9 @@ public final class PileView extends FrameLayout {
                     if (i2 != i) {
                         cutoutView.setStyle(this.q);
                     }
-                    String a2 = bVar.a(IconUtils.getMediaProxySize(this.l));
+                    String imageUri = bVar.getImageUri(IconUtils.getMediaProxySize(this.l));
                     m.checkNotNullExpressionValue(simpleDraweeView2, "itemBinding.pileItemImage");
-                    MGImages.setImage$default(simpleDraweeView2, a2, 0, 0, true, null, null, 108, null);
+                    MGImages.setImage$default(simpleDraweeView2, imageUri, 0, 0, true, null, null, 108, null);
                     i2 = i3;
                 }
             }
diff --git a/app/src/main/java/com/discord/views/ScreenTitleView.java b/app/src/main/java/com/discord/views/ScreenTitleView.java
index eef2433613..30433b4cb6 100644
--- a/app/src/main/java/com/discord/views/ScreenTitleView.java
+++ b/app/src/main/java/com/discord/views/ScreenTitleView.java
@@ -8,13 +8,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.t2;
+import c.a.i.v2;
 import com.discord.R;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import d0.z.d.m;
 /* compiled from: ScreenTitleView.kt */
 public final class ScreenTitleView extends LinearLayout {
-    public final t2 i;
+    public final v2 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public ScreenTitleView(Context context, AttributeSet attributeSet) {
@@ -22,15 +22,15 @@ public final class ScreenTitleView extends LinearLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558792, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364522;
-        TextView textView = (TextView) inflate.findViewById(2131364522);
+        int i = 2131364561;
+        TextView textView = (TextView) inflate.findViewById(2131364561);
         if (textView != null) {
-            i = 2131364523;
-            TextView textView2 = (TextView) inflate.findViewById(2131364523);
+            i = 2131364562;
+            TextView textView2 = (TextView) inflate.findViewById(2131364562);
             if (textView2 != null) {
-                t2 t2Var = new t2((LinearLayout) inflate, textView, textView2);
-                m.checkNotNullExpressionValue(t2Var, "ViewScreenTitleBinding.i…rom(context), this, true)");
-                this.i = t2Var;
+                v2 v2Var = new v2((LinearLayout) inflate, textView, textView2);
+                m.checkNotNullExpressionValue(v2Var, "ViewScreenTitleBinding.i…rom(context), this, true)");
+                this.i = v2Var;
                 if (attributeSet != null) {
                     TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(attributeSet, R.a.ScreenTitleView, 0, 0);
                     m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.ScreenTitleView, 0, 0)");
@@ -56,7 +56,7 @@ public final class ScreenTitleView extends LinearLayout {
 
     public final void setTitle(CharSequence charSequence) {
         m.checkNotNullParameter(charSequence, "title");
-        TextView textView = this.i.f155c;
+        TextView textView = this.i.f167c;
         m.checkNotNullExpressionValue(textView, "binding.screenTitleTitle");
         textView.setText(charSequence);
     }
diff --git a/app/src/main/java/com/discord/views/SearchInputView.java b/app/src/main/java/com/discord/views/SearchInputView.java
index d68da08836..e0865fa562 100644
--- a/app/src/main/java/com/discord/views/SearchInputView.java
+++ b/app/src/main/java/com/discord/views/SearchInputView.java
@@ -73,12 +73,12 @@ public final class SearchInputView extends ConstraintLayout {
     public SearchInputView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558650, this);
-        int i2 = 2131364534;
-        ImageView imageView = (ImageView) findViewById(2131364534);
+        LayoutInflater.from(getContext()).inflate(2131558648, this);
+        int i2 = 2131364573;
+        ImageView imageView = (ImageView) findViewById(2131364573);
         if (imageView != null) {
-            i2 = 2131364541;
-            TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364541);
+            i2 = 2131364580;
+            TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364580);
             if (textInputEditText != null) {
                 d1 d1Var = new d1(this, imageView, textInputEditText);
                 m.checkNotNullExpressionValue(d1Var, "SearchInputViewBinding.i…ater.from(context), this)");
@@ -86,7 +86,7 @@ public final class SearchInputView extends ConstraintLayout {
                 this.k = "";
                 this.l = new q(1, this);
                 Drawable drawable = null;
-                Drawable drawable2 = ResourcesCompat.getDrawable(getResources(), 2131231008, null);
+                Drawable drawable2 = ResourcesCompat.getDrawable(getResources(), 2131231013, null);
                 if (drawable2 != null) {
                     drawable2.setTint(ColorCompat.getThemedColor(this, 2130968907));
                     drawable = drawable2;
@@ -120,13 +120,13 @@ public final class SearchInputView extends ConstraintLayout {
         int i2 = 0;
         boolean z2 = str.length() == 0;
         d1 d1Var = this.j;
-        d1Var.b.setImageResource(z2 ? 2131231901 : 2131231519);
+        d1Var.b.setImageResource(z2 ? 2131231909 : 2131231525);
         ImageView imageView = d1Var.b;
         m.checkNotNullExpressionValue(imageView, "searchClear");
         imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968988)) : ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968989)));
         ImageView imageView2 = d1Var.b;
         m.checkNotNullExpressionValue(imageView2, "searchClear");
-        imageView2.setContentDescription(z2 ? this.k : getContext().getString(2131892641));
+        imageView2.setContentDescription(z2 ? this.k : getContext().getString(2131892722));
         ImageView imageView3 = d1Var.b;
         m.checkNotNullExpressionValue(imageView3, "searchClear");
         if (z2) {
diff --git a/app/src/main/java/com/discord/views/ServerFolderView.java b/app/src/main/java/com/discord/views/ServerFolderView.java
index 59bffc0e52..d28f21151b 100644
--- a/app/src/main/java/com/discord/views/ServerFolderView.java
+++ b/app/src/main/java/com/discord/views/ServerFolderView.java
@@ -9,13 +9,13 @@ import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.annotation.AnimRes;
-import c.a.i.u2;
+import c.a.i.w2;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import d0.z.d.m;
 /* compiled from: ServerFolderView.kt */
 public final class ServerFolderView extends LinearLayout {
     public static final /* synthetic */ int i = 0;
-    public final u2 j;
+    public final w2 j;
     public Long k;
     public boolean l;
 
@@ -47,28 +47,28 @@ public final class ServerFolderView extends LinearLayout {
     public ServerFolderView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558794, this);
-        int i2 = 2131363222;
-        ImageView imageView = (ImageView) findViewById(2131363222);
+        LayoutInflater.from(context).inflate(2131558796, this);
+        int i2 = 2131363247;
+        ImageView imageView = (ImageView) findViewById(2131363247);
         if (imageView != null) {
-            i2 = 2131363462;
-            GuildView guildView = (GuildView) findViewById(2131363462);
+            i2 = 2131363503;
+            GuildView guildView = (GuildView) findViewById(2131363503);
             if (guildView != null) {
-                i2 = 2131363463;
-                GuildView guildView2 = (GuildView) findViewById(2131363463);
+                i2 = 2131363504;
+                GuildView guildView2 = (GuildView) findViewById(2131363504);
                 if (guildView2 != null) {
-                    i2 = 2131363464;
-                    GuildView guildView3 = (GuildView) findViewById(2131363464);
+                    i2 = 2131363505;
+                    GuildView guildView3 = (GuildView) findViewById(2131363505);
                     if (guildView3 != null) {
-                        i2 = 2131363465;
-                        GuildView guildView4 = (GuildView) findViewById(2131363465);
+                        i2 = 2131363506;
+                        GuildView guildView4 = (GuildView) findViewById(2131363506);
                         if (guildView4 != null) {
-                            i2 = 2131363466;
-                            GridLayout gridLayout = (GridLayout) findViewById(2131363466);
+                            i2 = 2131363507;
+                            GridLayout gridLayout = (GridLayout) findViewById(2131363507);
                             if (gridLayout != null) {
-                                u2 u2Var = new u2(this, imageView, guildView, guildView2, guildView3, guildView4, gridLayout);
-                                m.checkNotNullExpressionValue(u2Var, "ViewServerFolderBinding.…ater.from(context), this)");
-                                this.j = u2Var;
+                                w2 w2Var = new w2(this, imageView, guildView, guildView2, guildView3, guildView4, gridLayout);
+                                m.checkNotNullExpressionValue(w2Var, "ViewServerFolderBinding.…ater.from(context), this)");
+                                this.j = w2Var;
                                 setOrientation(1);
                                 return;
                             }
diff --git a/app/src/main/java/com/discord/views/StatusView.java b/app/src/main/java/com/discord/views/StatusView.java
index 88faedc188..282f502347 100644
--- a/app/src/main/java/com/discord/views/StatusView.java
+++ b/app/src/main/java/com/discord/views/StatusView.java
@@ -94,7 +94,7 @@ public final class StatusView extends AppCompatImageView {
         if (!this.k || presence == null || (clientStatuses2 = presence.getClientStatuses()) == null || !PresenceUtils.INSTANCE.isMobile(clientStatuses2)) {
             ClientStatus clientStatus = null;
             if ((presence != null ? PresenceUtils.INSTANCE.getStreamingActivity(presence) : null) != null) {
-                i = 2131231963;
+                i = 2131231971;
             } else {
                 if (presence != null) {
                     clientStatus = presence.getStatus();
@@ -102,17 +102,17 @@ public final class StatusView extends AppCompatImageView {
                 if (clientStatus != null) {
                     int ordinal = clientStatus.ordinal();
                     if (ordinal == 0) {
-                        i = 2131231962;
+                        i = 2131231970;
                     } else if (ordinal == 1) {
-                        i = 2131231960;
+                        i = 2131231968;
                     } else if (ordinal == 2) {
-                        i = 2131231959;
+                        i = 2131231967;
                     }
                 }
-                i = 2131231961;
+                i = 2131231969;
             }
         } else {
-            i = 2131231756;
+            i = 2131231764;
         }
         setImageResource(i);
         this.l = !(this.k && presence != null && (clientStatuses = presence.getClientStatuses()) != null && PresenceUtils.INSTANCE.isMobile(clientStatuses));
diff --git a/app/src/main/java/com/discord/views/StreamPreviewView.java b/app/src/main/java/com/discord/views/StreamPreviewView.java
index 041959ef7b..ffd95c0b7d 100644
--- a/app/src/main/java/com/discord/views/StreamPreviewView.java
+++ b/app/src/main/java/com/discord/views/StreamPreviewView.java
@@ -9,7 +9,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 import androidx.annotation.MainThread;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.l3;
+import c.a.i.o3;
 import c.a.l.b;
 import com.discord.stores.StoreApplicationStreamPreviews;
 import com.discord.utilities.streams.StreamContext;
@@ -19,26 +19,26 @@ import d0.z.d.m;
 import kotlin.NoWhenBranchMatchedException;
 /* compiled from: StreamPreviewView.kt */
 public final class StreamPreviewView extends FrameLayout {
-    public final l3 i;
+    public final o3 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StreamPreviewView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558817, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558820, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365124;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365124);
+        int i = 2131365179;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365179);
         if (simpleDraweeView != null) {
-            i = 2131365125;
-            TextView textView = (TextView) inflate.findViewById(2131365125);
+            i = 2131365180;
+            TextView textView = (TextView) inflate.findViewById(2131365180);
             if (textView != null) {
-                i = 2131365126;
-                TextView textView2 = (TextView) inflate.findViewById(2131365126);
+                i = 2131365181;
+                TextView textView2 = (TextView) inflate.findViewById(2131365181);
                 if (textView2 != null) {
-                    l3 l3Var = new l3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2);
-                    m.checkNotNullExpressionValue(l3Var, "ViewStreamPreviewBinding…rom(context), this, true)");
-                    this.i = l3Var;
+                    o3 o3Var = new o3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2);
+                    m.checkNotNullExpressionValue(o3Var, "ViewStreamPreviewBinding…rom(context), this, true)");
+                    this.i = o3Var;
                     setClickable(true);
                     setFocusable(false);
                     setFocusableInTouchMode(false);
@@ -60,7 +60,7 @@ public final class StreamPreviewView extends FrameLayout {
     }
 
     private final void setOverlayCaptionText(CharSequence charSequence) {
-        TextView textView = this.i.f124c;
+        TextView textView = this.i.f137c;
         m.checkNotNullExpressionValue(textView, "binding.streamPreviewOverlayText");
         ViewExtensions.setTextAndVisibilityBy(textView, charSequence);
     }
@@ -70,7 +70,7 @@ public final class StreamPreviewView extends FrameLayout {
         m.checkNotNullParameter(streamPreview, "preview");
         m.checkNotNullParameter(joinability, "joinability");
         if (streamPreview instanceof StoreApplicationStreamPreviews.StreamPreview.Fetching) {
-            setCaptionText(getContext().getString(2131893623));
+            setCaptionText(getContext().getString(2131893720));
         } else if (streamPreview instanceof StoreApplicationStreamPreviews.StreamPreview.Resolved) {
             StoreApplicationStreamPreviews.StreamPreview.Resolved resolved = (StoreApplicationStreamPreviews.StreamPreview.Resolved) streamPreview;
             if (resolved.getUrl() != null) {
@@ -79,7 +79,7 @@ public final class StreamPreviewView extends FrameLayout {
             } else {
                 setImage(null);
                 if (joinability == StreamContext.Joinability.CAN_CONNECT) {
-                    setCaptionText(getContext().getString(2131893611));
+                    setCaptionText(getContext().getString(2131893708));
                 } else {
                     setCaptionText(null);
                 }
@@ -88,14 +88,14 @@ public final class StreamPreviewView extends FrameLayout {
             throw new NoWhenBranchMatchedException();
         }
         if (z2) {
-            setOverlayCaptionText(b.i(this, 2131894552, new Object[0], null, 4));
+            setOverlayCaptionText(b.i(this, 2131894672, new Object[0], null, 4));
             return;
         }
         int ordinal = joinability.ordinal();
         if (ordinal == 0) {
-            setOverlayCaptionText(b.i(this, 2131890663, new Object[0], null, 4));
+            setOverlayCaptionText(b.i(this, 2131890731, new Object[0], null, 4));
         } else if (ordinal == 1) {
-            setOverlayCaptionText(b.i(this, 2131894039, new Object[0], null, 4));
+            setOverlayCaptionText(b.i(this, 2131894139, new Object[0], null, 4));
         } else if (ordinal == 2) {
             setOverlayCaptionText(b.i(this, 2131887274, new Object[0], null, 4));
         } else {
diff --git a/app/src/main/java/com/discord/views/TernaryCheckBox.java b/app/src/main/java/com/discord/views/TernaryCheckBox.java
index 06e420932b..6d9e4dcc50 100644
--- a/app/src/main/java/com/discord/views/TernaryCheckBox.java
+++ b/app/src/main/java/com/discord/views/TernaryCheckBox.java
@@ -11,14 +11,14 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import c.a.d.o;
-import c.a.i.m3;
+import c.a.i.p3;
 import com.discord.R;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: TernaryCheckBox.kt */
 public final class TernaryCheckBox extends RelativeLayout {
     public static final a i = new a(null);
-    public final m3 j;
+    public final p3 j;
     public String k;
     public CharSequence l;
     public b m;
@@ -71,38 +71,38 @@ public final class TernaryCheckBox extends RelativeLayout {
     public TernaryCheckBox(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558818, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558821, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131362607;
-        FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131362607);
+        int i2 = 2131362620;
+        FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131362620);
         if (frameLayout != null) {
-            i2 = 2131362609;
-            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362609);
+            i2 = 2131362622;
+            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362622);
             if (linearLayout != null) {
-                i2 = 2131364096;
-                View findViewById = inflate.findViewById(2131364096);
+                i2 = 2131364139;
+                View findViewById = inflate.findViewById(2131364139);
                 if (findViewById != null) {
-                    i2 = 2131364727;
-                    View findViewById2 = inflate.findViewById(2131364727);
+                    i2 = 2131364776;
+                    View findViewById2 = inflate.findViewById(2131364776);
                     if (findViewById2 != null) {
-                        i2 = 2131364729;
-                        TextView textView = (TextView) inflate.findViewById(2131364729);
+                        i2 = 2131364778;
+                        TextView textView = (TextView) inflate.findViewById(2131364778);
                         if (textView != null) {
-                            i2 = 2131364730;
-                            TextView textView2 = (TextView) inflate.findViewById(2131364730);
+                            i2 = 2131364779;
+                            TextView textView2 = (TextView) inflate.findViewById(2131364779);
                             if (textView2 != null) {
-                                i2 = 2131365198;
-                                CheckableImageView checkableImageView = (CheckableImageView) inflate.findViewById(2131365198);
+                                i2 = 2131365253;
+                                CheckableImageView checkableImageView = (CheckableImageView) inflate.findViewById(2131365253);
                                 if (checkableImageView != null) {
-                                    i2 = 2131365199;
-                                    CheckableImageView checkableImageView2 = (CheckableImageView) inflate.findViewById(2131365199);
+                                    i2 = 2131365254;
+                                    CheckableImageView checkableImageView2 = (CheckableImageView) inflate.findViewById(2131365254);
                                     if (checkableImageView2 != null) {
-                                        i2 = 2131365200;
-                                        CheckableImageView checkableImageView3 = (CheckableImageView) inflate.findViewById(2131365200);
+                                        i2 = 2131365255;
+                                        CheckableImageView checkableImageView3 = (CheckableImageView) inflate.findViewById(2131365255);
                                         if (checkableImageView3 != null) {
-                                            m3 m3Var = new m3((LinearLayout) inflate, frameLayout, linearLayout, findViewById, findViewById2, textView, textView2, checkableImageView, checkableImageView2, checkableImageView3);
-                                            m.checkNotNullExpressionValue(m3Var, "ViewTernaryCheckboxBindi…rom(context), this, true)");
-                                            this.j = m3Var;
+                                            p3 p3Var = new p3((LinearLayout) inflate, frameLayout, linearLayout, findViewById, findViewById2, textView, textView2, checkableImageView, checkableImageView2, checkableImageView3);
+                                            m.checkNotNullExpressionValue(p3Var, "ViewTernaryCheckboxBindi…rom(context), this, true)");
+                                            this.j = p3Var;
                                             this.n = -1;
                                             if (attributeSet != null) {
                                                 TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.TernaryCheckBox, 0, 0);
@@ -148,7 +148,7 @@ public final class TernaryCheckBox extends RelativeLayout {
         FrameLayout frameLayout = this.j.b;
         m.checkNotNullExpressionValue(frameLayout, "binding.checkableOffContainer");
         frameLayout.setEnabled(true);
-        View view = this.j.f128c;
+        View view = this.j.f143c;
         m.checkNotNullExpressionValue(view, "binding.offDisabledOverlay");
         view.setVisibility(8);
         this.j.d.setOnClickListener(new c(this, str));
@@ -164,8 +164,8 @@ public final class TernaryCheckBox extends RelativeLayout {
         View view = this.j.d;
         m.checkNotNullExpressionValue(view, "binding.settingDisabledOverlay");
         view.setVisibility(8);
-        this.j.f128c.setOnClickListener(new d(this, str));
-        View view2 = this.j.f128c;
+        this.j.f143c.setOnClickListener(new d(this, str));
+        View view2 = this.j.f143c;
         m.checkNotNullExpressionValue(view2, "binding.offDisabledOverlay");
         view2.setVisibility(0);
     }
@@ -199,7 +199,7 @@ public final class TernaryCheckBox extends RelativeLayout {
         CheckableImageView checkableImageView = this.j.h;
         m.checkNotNullExpressionValue(checkableImageView, "binding.ternaryCheckOff");
         checkableImageView.setEnabled(true);
-        View view = this.j.f128c;
+        View view = this.j.f143c;
         m.checkNotNullExpressionValue(view, "binding.offDisabledOverlay");
         view.setVisibility(8);
         View view2 = this.j.d;
diff --git a/app/src/main/java/com/discord/views/ToolbarTitleLayout.java b/app/src/main/java/com/discord/views/ToolbarTitleLayout.java
index 8eb83aa98f..4475fb414b 100644
--- a/app/src/main/java/com/discord/views/ToolbarTitleLayout.java
+++ b/app/src/main/java/com/discord/views/ToolbarTitleLayout.java
@@ -5,30 +5,30 @@ import android.view.LayoutInflater;
 import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.n3;
+import c.a.i.q3;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import d0.z.d.m;
 /* compiled from: ToolbarTitleLayout.kt */
 public final class ToolbarTitleLayout extends ConstraintLayout {
-    public final n3 i;
+    public final q3 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public ToolbarTitleLayout(Context context) {
         super(context);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558819, this);
-        int i = 2131365295;
-        StatusView statusView = (StatusView) findViewById(2131365295);
+        LayoutInflater.from(getContext()).inflate(2131558822, this);
+        int i = 2131365350;
+        StatusView statusView = (StatusView) findViewById(2131365350);
         if (statusView != null) {
-            i = 2131365296;
-            TextView textView = (TextView) findViewById(2131365296);
+            i = 2131365351;
+            TextView textView = (TextView) findViewById(2131365351);
             if (textView != null) {
-                i = 2131365297;
-                TextView textView2 = (TextView) findViewById(2131365297);
+                i = 2131365352;
+                TextView textView2 = (TextView) findViewById(2131365352);
                 if (textView2 != null) {
-                    n3 n3Var = new n3(this, statusView, textView, textView2);
-                    m.checkNotNullExpressionValue(n3Var, "ViewToolbarTitleBinding.…ater.from(context), this)");
-                    this.i = n3Var;
+                    q3 q3Var = new q3(this, statusView, textView, textView2);
+                    m.checkNotNullExpressionValue(q3Var, "ViewToolbarTitleBinding.…ater.from(context), this)");
+                    this.i = q3Var;
                     return;
                 }
             }
@@ -37,7 +37,7 @@ public final class ToolbarTitleLayout extends ConstraintLayout {
     }
 
     public final TextView getTitle() {
-        TextView textView = this.i.f131c;
+        TextView textView = this.i.f147c;
         m.checkNotNullExpressionValue(textView, "binding.toolbarTitle");
         return textView;
     }
@@ -49,6 +49,6 @@ public final class ToolbarTitleLayout extends ConstraintLayout {
     }
 
     public final void setTitleColor(@ColorInt int i) {
-        this.i.f131c.setTextColor(i);
+        this.i.f147c.setTextColor(i);
     }
 }
diff --git a/app/src/main/java/com/discord/views/UploadProgressView.java b/app/src/main/java/com/discord/views/UploadProgressView.java
index 19edb8774d..b27f8f7bba 100644
--- a/app/src/main/java/com/discord/views/UploadProgressView.java
+++ b/app/src/main/java/com/discord/views/UploadProgressView.java
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
-import c.a.i.o3;
+import c.a.i.r3;
 import c.d.b.a.a;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -21,7 +21,7 @@ import d0.z.d.m;
 /* compiled from: UploadProgressView.kt */
 public final class UploadProgressView extends ConstraintLayout {
     public static final /* synthetic */ int i = 0;
-    public final o3 j;
+    public final r3 j;
     public final Drawable k;
     public final Drawable l;
 
@@ -29,24 +29,24 @@ public final class UploadProgressView extends ConstraintLayout {
     public UploadProgressView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558820, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558823, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131364354;
-        ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364354);
+        int i2 = 2131364392;
+        ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364392);
         if (progressBar != null) {
-            i2 = 2131364358;
-            ImageView imageView = (ImageView) inflate.findViewById(2131364358);
+            i2 = 2131364396;
+            ImageView imageView = (ImageView) inflate.findViewById(2131364396);
             if (imageView != null) {
-                i2 = 2131364363;
-                TextView textView = (TextView) inflate.findViewById(2131364363);
+                i2 = 2131364401;
+                TextView textView = (TextView) inflate.findViewById(2131364401);
                 if (textView != null) {
-                    i2 = 2131364364;
-                    TextView textView2 = (TextView) inflate.findViewById(2131364364);
+                    i2 = 2131364402;
+                    TextView textView2 = (TextView) inflate.findViewById(2131364402);
                     if (textView2 != null) {
-                        o3 o3Var = new o3((ConstraintLayout) inflate, progressBar, imageView, textView, textView2);
-                        m.checkNotNullExpressionValue(o3Var, "ViewUploadProgressBindin…rom(context), this, true)");
-                        this.j = o3Var;
-                        this.k = ContextCompat.getDrawable(getContext(), 2131231184);
+                        r3 r3Var = new r3((ConstraintLayout) inflate, progressBar, imageView, textView, textView2);
+                        m.checkNotNullExpressionValue(r3Var, "ViewUploadProgressBindin…rom(context), this, true)");
+                        this.j = r3Var;
+                        this.k = ContextCompat.getDrawable(getContext(), 2131231189);
                         this.l = ContextCompat.getDrawable(getContext(), DrawableCompat.getThemedDrawableRes$default(this, 2130969913, 0, 2, (Object) null));
                         return;
                     }
@@ -58,53 +58,53 @@ public final class UploadProgressView extends ConstraintLayout {
 
     public final void a(CharSequence charSequence, int i2, String str) {
         m.checkNotNullParameter(charSequence, "title");
-        o3 o3Var = this.j;
-        TextView textView = o3Var.e;
+        r3 r3Var = this.j;
+        TextView textView = r3Var.e;
         m.checkNotNullExpressionValue(textView, "progressText");
         textView.setText(charSequence);
         boolean z2 = true;
         if (i2 >= 0) {
-            ProgressBar progressBar = o3Var.b;
+            ProgressBar progressBar = r3Var.b;
             m.checkNotNullExpressionValue(progressBar, "progressBar");
             progressBar.setIndeterminate(false);
             if (Build.VERSION.SDK_INT >= 24) {
-                ProgressBar progressBar2 = o3Var.b;
+                ProgressBar progressBar2 = r3Var.b;
                 m.checkNotNullExpressionValue(progressBar2, "progressBar");
                 if (i2 < progressBar2.getProgress()) {
                     z2 = false;
                 }
-                o3Var.b.setProgress(i2, z2);
+                r3Var.b.setProgress(i2, z2);
             } else {
-                ProgressBar progressBar3 = o3Var.b;
+                ProgressBar progressBar3 = r3Var.b;
                 m.checkNotNullExpressionValue(progressBar3, "progressBar");
                 progressBar3.setProgress(i2);
             }
-            ProgressBar progressBar4 = o3Var.b;
+            ProgressBar progressBar4 = r3Var.b;
             m.checkNotNullExpressionValue(progressBar4, "progressBar");
             progressBar4.setProgressDrawable(i2 == 100 ? this.k : this.l);
-            ProgressBar progressBar5 = o3Var.b;
+            ProgressBar progressBar5 = r3Var.b;
             m.checkNotNullExpressionValue(progressBar5, "progressBar");
             progressBar5.setVisibility(0);
         } else if (i2 == -1) {
-            ProgressBar progressBar6 = o3Var.b;
+            ProgressBar progressBar6 = r3Var.b;
             m.checkNotNullExpressionValue(progressBar6, "progressBar");
             progressBar6.setVisibility(0);
-            ProgressBar progressBar7 = o3Var.b;
+            ProgressBar progressBar7 = r3Var.b;
             m.checkNotNullExpressionValue(progressBar7, "progressBar");
             progressBar7.setIndeterminate(true);
         } else if (i2 == -2) {
-            ProgressBar progressBar8 = o3Var.b;
+            ProgressBar progressBar8 = r3Var.b;
             m.checkNotNullExpressionValue(progressBar8, "progressBar");
             progressBar8.setVisibility(4);
         } else {
             throw new IllegalArgumentException(a.l("invalid argument supplied to progress: ", i2));
         }
-        TextView textView2 = o3Var.d;
+        TextView textView2 = r3Var.d;
         m.checkNotNullExpressionValue(textView2, "progressSubtext");
         ViewExtensions.setTextAndVisibilityBy(textView2, str);
     }
 
     public final void setIcon(@DrawableRes int i2) {
-        this.j.f135c.setImageResource(i2);
+        this.j.f149c.setImageResource(i2);
     }
 }
diff --git a/app/src/main/java/com/discord/views/UserListItemView.java b/app/src/main/java/com/discord/views/UserListItemView.java
index cd83023715..b933d2a4f3 100644
--- a/app/src/main/java/com/discord/views/UserListItemView.java
+++ b/app/src/main/java/com/discord/views/UserListItemView.java
@@ -5,34 +5,34 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import c.a.i.p3;
+import c.a.i.s3;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: UserListItemView.kt */
 public final class UserListItemView extends RelativeLayout {
     public static final /* synthetic */ int i = 0;
-    public final p3 j;
+    public final s3 j;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public UserListItemView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558821, this);
-        int i2 = 2131365372;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365372);
+        LayoutInflater.from(context).inflate(2131558824, this);
+        int i2 = 2131365432;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365432);
         if (simpleDraweeView != null) {
-            i2 = 2131365373;
-            TextView textView = (TextView) findViewById(2131365373);
+            i2 = 2131365433;
+            TextView textView = (TextView) findViewById(2131365433);
             if (textView != null) {
-                i2 = 2131365374;
-                TextView textView2 = (TextView) findViewById(2131365374);
+                i2 = 2131365434;
+                TextView textView2 = (TextView) findViewById(2131365434);
                 if (textView2 != null) {
-                    i2 = 2131365375;
-                    StatusView statusView = (StatusView) findViewById(2131365375);
+                    i2 = 2131365435;
+                    StatusView statusView = (StatusView) findViewById(2131365435);
                     if (statusView != null) {
-                        p3 p3Var = new p3(this, simpleDraweeView, textView, textView2, statusView);
-                        m.checkNotNullExpressionValue(p3Var, "ViewUserListItemBinding.…ater.from(context), this)");
-                        this.j = p3Var;
+                        s3 s3Var = new s3(this, simpleDraweeView, textView, textView2, statusView);
+                        m.checkNotNullExpressionValue(s3Var, "ViewUserListItemBinding.…ater.from(context), this)");
+                        this.j = s3Var;
                         setClickable(true);
                         return;
                     }
diff --git a/app/src/main/java/com/discord/views/UsernameView.java b/app/src/main/java/com/discord/views/UsernameView.java
index 1e78093e47..f48b432659 100644
--- a/app/src/main/java/com/discord/views/UsernameView.java
+++ b/app/src/main/java/com/discord/views/UsernameView.java
@@ -9,7 +9,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.StringRes;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.widget.TextViewCompat;
-import c.a.i.s3;
+import c.a.i.v3;
 import com.discord.R;
 import com.discord.widgets.user.profile.DraweeSpanStringBuilderExtensionsKt;
 import com.facebook.drawee.span.DraweeSpanStringBuilder;
@@ -17,22 +17,22 @@ import com.facebook.drawee.span.SimpleDraweeSpanTextView;
 import d0.z.d.m;
 /* compiled from: UsernameView.kt */
 public final class UsernameView extends ConstraintLayout {
-    public final s3 i;
+    public final v3 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public UsernameView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558825, this);
-        int i = 2131365472;
-        TextView textView = (TextView) findViewById(2131365472);
+        LayoutInflater.from(getContext()).inflate(2131558828, this);
+        int i = 2131365532;
+        TextView textView = (TextView) findViewById(2131365532);
         if (textView != null) {
-            i = 2131365473;
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365473);
+            i = 2131365533;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365533);
             if (simpleDraweeSpanTextView != null) {
-                s3 s3Var = new s3(this, textView, simpleDraweeSpanTextView);
-                m.checkNotNullExpressionValue(s3Var, "ViewUsernameBinding.infl…ater.from(context), this)");
-                this.i = s3Var;
+                v3 v3Var = new v3(this, textView, simpleDraweeSpanTextView);
+                m.checkNotNullExpressionValue(v3Var, "ViewUsernameBinding.infl…ater.from(context), this)");
+                this.i = v3Var;
                 if (attributeSet != null) {
                     TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(attributeSet, R.a.UsernameView, 0, 0);
                     m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…eable.UsernameView, 0, 0)");
@@ -41,7 +41,10 @@ public final class UsernameView extends ConstraintLayout {
                         simpleDraweeSpanTextView.setText(obtainStyledAttributes.getText(1));
                         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.usernameText");
                         simpleDraweeSpanTextView.setSingleLine(obtainStyledAttributes.getBoolean(3, true));
-                        TextViewCompat.setTextAppearance(simpleDraweeSpanTextView, obtainStyledAttributes.getResourceId(4, 0));
+                        int resourceId = obtainStyledAttributes.getResourceId(4, 0);
+                        if (resourceId != 0) {
+                            TextViewCompat.setTextAppearance(simpleDraweeSpanTextView, resourceId);
+                        }
                         simpleDraweeSpanTextView.setTextSize(0, getResources().getDimension(obtainStyledAttributes.getResourceId(5, 2131165776)));
                         m.checkNotNullExpressionValue(textView, "binding.usernameTag");
                         textView.setText(obtainStyledAttributes.getText(0));
@@ -69,7 +72,7 @@ public final class UsernameView extends ConstraintLayout {
     }
 
     private final void setIsVerified(boolean z2) {
-        this.i.b.setCompoundDrawablesWithIntrinsicBounds(z2 ? 2131232035 : 0, 0, 0, 0);
+        this.i.b.setCompoundDrawablesWithIntrinsicBounds(z2 ? 2131232043 : 0, 0, 0, 0);
     }
 
     public final void a(boolean z2, @StringRes int i, boolean z3) {
@@ -93,10 +96,10 @@ public final class UsernameView extends ConstraintLayout {
         m.checkNotNullExpressionValue(context, "context");
         DraweeSpanStringBuilder avatar$default = DraweeSpanStringBuilderExtensionsKt.setAvatar$default(draweeSpanStringBuilder, context, str, z2, num, num2, null, 32, null);
         avatar$default.append(charSequence);
-        this.i.f150c.setDraweeSpanStringBuilder(avatar$default);
+        this.i.f168c.setDraweeSpanStringBuilder(avatar$default);
     }
 
     public final void setUsernameColor(@ColorInt int i) {
-        this.i.f150c.setTextColor(i);
+        this.i.f168c.setTextColor(i);
     }
 }
diff --git a/app/src/main/java/com/discord/views/VoiceUserLimitView.java b/app/src/main/java/com/discord/views/VoiceUserLimitView.java
index 3cac0606da..5c1dfade89 100644
--- a/app/src/main/java/com/discord/views/VoiceUserLimitView.java
+++ b/app/src/main/java/com/discord/views/VoiceUserLimitView.java
@@ -12,7 +12,7 @@ import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.v3;
+import c.a.i.y3;
 import c.a.z.e0;
 import com.discord.utilities.color.ColorCompat;
 import d0.a0.a;
@@ -21,7 +21,7 @@ import d0.z.d.m;
 import kotlin.Lazy;
 /* compiled from: VoiceUserLimitView.kt */
 public final class VoiceUserLimitView extends LinearLayout {
-    public final v3 i;
+    public final y3 i;
     public final Paint j;
     public final int k;
     public final Path l;
@@ -34,16 +34,16 @@ public final class VoiceUserLimitView extends LinearLayout {
     public VoiceUserLimitView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558829, this);
-        int i = 2131365555;
-        TextView textView = (TextView) findViewById(2131365555);
+        LayoutInflater.from(getContext()).inflate(2131558832, this);
+        int i = 2131365616;
+        TextView textView = (TextView) findViewById(2131365616);
         if (textView != null) {
-            i = 2131365556;
-            TextView textView2 = (TextView) findViewById(2131365556);
+            i = 2131365617;
+            TextView textView2 = (TextView) findViewById(2131365617);
             if (textView2 != null) {
-                v3 v3Var = new v3(this, textView, textView2);
-                m.checkNotNullExpressionValue(v3Var, "VoiceUserLimitViewBindin…ater.from(context), this)");
-                this.i = v3Var;
+                y3 y3Var = new y3(this, textView, textView2);
+                m.checkNotNullExpressionValue(y3Var, "VoiceUserLimitViewBindin…ater.from(context), this)");
+                this.i = y3Var;
                 Paint paint = new Paint(1);
                 this.j = paint;
                 Path path = new Path();
@@ -74,7 +74,7 @@ public final class VoiceUserLimitView extends LinearLayout {
         TextView textView = this.i.b;
         m.checkNotNullExpressionValue(textView, "binding.voiceUserLimitCurrent");
         textView.setText(i < 100 ? c.d.b.a.a.H(new Object[]{Integer.valueOf(i)}, 1, "%02d", "java.lang.String.format(format, *args)") : String.valueOf(i));
-        TextView textView2 = this.i.f168c;
+        TextView textView2 = this.i.f184c;
         m.checkNotNullExpressionValue(textView2, "binding.voiceUserLimitMax");
         textView2.setText(i2 < 100 ? c.d.b.a.a.H(new Object[]{Integer.valueOf(i2)}, 1, "%02d", "java.lang.String.format(format, *args)") : String.valueOf(i2));
         if (z2) {
diff --git a/app/src/main/java/com/discord/views/VoiceUserView.java b/app/src/main/java/com/discord/views/VoiceUserView.java
index 36142f3cd3..d7c26c3fe3 100644
--- a/app/src/main/java/com/discord/views/VoiceUserView.java
+++ b/app/src/main/java/com/discord/views/VoiceUserView.java
@@ -12,7 +12,7 @@ import android.widget.TextView;
 import androidx.annotation.DimenRes;
 import androidx.annotation.MainThread;
 import androidx.annotation.Px;
-import c.a.i.u3;
+import c.a.i.x3;
 import c.a.z.f0;
 import c.a.z.g0;
 import c.a.z.h0;
@@ -36,7 +36,7 @@ import kotlin.jvm.functions.Function1;
 public final class VoiceUserView extends FrameLayout {
     public static final /* synthetic */ int i = 0;
     public int j;
-    public final u3 k;
+    public final x3 k;
     public a l;
     public final RingAnimator m;
     public StoreVoiceParticipants.VoiceUser n;
@@ -116,16 +116,16 @@ public final class VoiceUserView extends FrameLayout {
         i2 = (i3 & 4) != 0 ? 0 : i2;
         m.checkNotNullParameter(context, "context");
         this.j = 17170445;
-        LayoutInflater.from(context).inflate(2131558827, this);
-        int i4 = 2131365554;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365554);
+        LayoutInflater.from(context).inflate(2131558830, this);
+        int i4 = 2131365615;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365615);
         if (simpleDraweeView != null) {
-            i4 = 2131365567;
-            TextView textView = (TextView) findViewById(2131365567);
+            i4 = 2131365628;
+            TextView textView = (TextView) findViewById(2131365628);
             if (textView != null) {
-                u3 u3Var = new u3(this, simpleDraweeView, textView);
-                m.checkNotNullExpressionValue(u3Var, "ViewVoiceUserBinding.inf…ater.from(context), this)");
-                this.k = u3Var;
+                x3 x3Var = new x3(this, simpleDraweeView, textView);
+                m.checkNotNullExpressionValue(x3Var, "ViewVoiceUserBinding.inf…ater.from(context), this)");
+                this.k = x3Var;
                 this.m = new RingAnimator(this, new g0(this));
                 this.o = f0.i;
                 if (attributeSet != null) {
@@ -156,7 +156,7 @@ public final class VoiceUserView extends FrameLayout {
     private final void setVoiceState(a aVar) {
         if (aVar != this.l) {
             this.l = aVar;
-            setBackgroundResource(aVar.ordinal() != 1 ? this.j : 2131231260);
+            setBackgroundResource(aVar.ordinal() != 1 ? this.j : 2131231265);
             float f = (aVar != a.DISCONNECTED || !this.q) ? 1.0f : 0.3f;
             SimpleDraweeView simpleDraweeView = this.k.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.voiceUserAvatar");
@@ -187,7 +187,7 @@ public final class VoiceUserView extends FrameLayout {
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.voiceUserAvatar");
                 IconUtils.setIcon$default(simpleDraweeView, forGuildMemberOrUser, i2, new c(this), (MGImages.ChangeDetector) null, 16, (Object) null);
             }
-            TextView textView = this.k.f162c;
+            TextView textView = this.k.f179c;
             m.checkNotNullExpressionValue(textView, "binding.voiceUserNameDisplay");
             textView.setText(voiceUser.getDisplayName());
             setVoiceState(voiceUser);
@@ -205,7 +205,7 @@ public final class VoiceUserView extends FrameLayout {
         SimpleDraweeView simpleDraweeView = this.k.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.voiceUserAvatar");
         bVar.invoke((View) simpleDraweeView);
-        TextView textView = this.k.f162c;
+        TextView textView = this.k.f179c;
         m.checkNotNullExpressionValue(textView, "binding.voiceUserNameDisplay");
         bVar.invoke((View) textView);
         requestLayout();
@@ -244,7 +244,7 @@ public final class VoiceUserView extends FrameLayout {
         boolean z3 = isSelected() != z2;
         super.setSelected(z2);
         if (z3) {
-            ViewExtensions.fadeBy$default(this.k.f162c, isSelected(), 0, 2, null);
+            ViewExtensions.fadeBy$default(this.k.f179c, isSelected(), 0, 2, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java b/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java
index bd02a07dc4..23a64eb5bb 100644
--- a/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java
+++ b/app/src/main/java/com/discord/views/calls/AppVideoStreamRenderer.java
@@ -29,10 +29,10 @@ import rx.subjects.BehaviorSubject;
 /* compiled from: AppVideoStreamRenderer.kt */
 public final class AppVideoStreamRenderer extends VideoStreamRenderer {
     public boolean i;
-    public final BehaviorSubject<Unit> j = BehaviorSubject.m0(Unit.a);
+    public final BehaviorSubject<Unit> j = BehaviorSubject.l0(Unit.a);
     public Subscription k;
     public Integer l;
-    public BehaviorSubject<Point> m = BehaviorSubject.m0(null);
+    public BehaviorSubject<Point> m = BehaviorSubject.l0(null);
     public Function1<? super Point, Unit> n;
     public RendererCommon.ScalingType o;
     public RendererCommon.ScalingType p;
@@ -84,11 +84,11 @@ public final class AppVideoStreamRenderer extends VideoStreamRenderer {
                 if (subscription != null) {
                     subscription.unsubscribe();
                 }
-                Observable<R> A = this.j.A(new a(eVar));
-                m.checkNotNullExpressionValue(A, "onSizeChangedSubject\n   …rameResolutionSampled() }");
-                Observable G = A.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-                m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-                Observable ui = ObservableExtensionsKt.ui(G);
+                Observable<R> z4 = this.j.z(new a(eVar));
+                m.checkNotNullExpressionValue(z4, "onSizeChangedSubject\n   …rameResolutionSampled() }");
+                Observable F = z4.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+                Observable ui = ObservableExtensionsKt.ui(F);
                 b bVar = new b(this);
                 String simpleName = AppVideoStreamRenderer.class.getSimpleName();
                 m.checkNotNullExpressionValue(simpleName, "javaClass.simpleName");
diff --git a/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java b/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java
index 5412467b47..cf50017454 100644
--- a/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java
+++ b/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java
@@ -330,7 +330,7 @@ public final class SpeakerPulseView extends FrameLayout {
         ViewGroup.LayoutParams layoutParams = childAt.getLayoutParams();
         Integer valueOf = layoutParams != null ? Integer.valueOf(layoutParams.width + ((int) (((float) 2) * paddingLeft * ((float) i3)))) : null;
         imageView.setAlpha(0.0f);
-        imageView.setImageResource(2131231087);
+        imageView.setImageResource(2131231092);
         int coerceAtLeast = d0.d0.f.coerceAtLeast(speakerPulseView.getChildCount() - 1, 0);
         int intValue = valueOf != null ? valueOf.intValue() : -1;
         if (valueOf != null) {
diff --git a/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java b/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java
index b3255e891c..b04868b0b6 100644
--- a/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java
+++ b/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java
@@ -6,44 +6,44 @@ import android.view.LayoutInflater;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
-import c.a.i.i3;
+import c.a.i.l3;
 import com.discord.views.VoiceUserView;
 import d0.z.d.m;
 import rx.Subscription;
 /* compiled from: StageCallSpeakerView.kt */
 public final class StageCallSpeakerView extends CardView {
-    public final i3 i;
+    public final l3 i;
     public Subscription j;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StageCallSpeakerView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558814, this);
-        int i = 2131364990;
-        VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364990);
+        LayoutInflater.from(context).inflate(2131558817, this);
+        int i = 2131365040;
+        VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131365040);
         if (voiceUserView != null) {
-            i = 2131364991;
-            ImageView imageView = (ImageView) findViewById(2131364991);
+            i = 2131365041;
+            ImageView imageView = (ImageView) findViewById(2131365041);
             if (imageView != null) {
-                i = 2131364993;
-                ImageView imageView2 = (ImageView) findViewById(2131364993);
+                i = 2131365043;
+                ImageView imageView2 = (ImageView) findViewById(2131365043);
                 if (imageView2 != null) {
-                    i = 2131364994;
-                    ImageView imageView3 = (ImageView) findViewById(2131364994);
+                    i = 2131365044;
+                    ImageView imageView3 = (ImageView) findViewById(2131365044);
                     if (imageView3 != null) {
-                        i = 2131364995;
-                        ImageView imageView4 = (ImageView) findViewById(2131364995);
+                        i = 2131365045;
+                        ImageView imageView4 = (ImageView) findViewById(2131365045);
                         if (imageView4 != null) {
-                            i = 2131364996;
-                            TextView textView = (TextView) findViewById(2131364996);
+                            i = 2131365046;
+                            TextView textView = (TextView) findViewById(2131365046);
                             if (textView != null) {
-                                i = 2131364997;
-                                SpeakerPulseView speakerPulseView = (SpeakerPulseView) findViewById(2131364997);
+                                i = 2131365047;
+                                SpeakerPulseView speakerPulseView = (SpeakerPulseView) findViewById(2131365047);
                                 if (speakerPulseView != null) {
-                                    i3 i3Var = new i3(this, voiceUserView, imageView, imageView2, imageView3, imageView4, textView, speakerPulseView);
-                                    m.checkNotNullExpressionValue(i3Var, "ViewStageChannelSpeakerB…ater.from(context), this)");
-                                    this.i = i3Var;
+                                    l3 l3Var = new l3(this, voiceUserView, imageView, imageView2, imageView3, imageView4, textView, speakerPulseView);
+                                    m.checkNotNullExpressionValue(l3Var, "ViewStageChannelSpeakerB…ater.from(context), this)");
+                                    this.i = l3Var;
                                     return;
                                 }
                             }
diff --git a/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java b/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java
index 05b5251a33..889a9d3267 100644
--- a/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java
+++ b/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java
@@ -7,31 +7,31 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.j3;
+import c.a.i.m3;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: StageCallVisitCommunityView.kt */
 public final class StageCallVisitCommunityView extends ConstraintLayout {
-    public final j3 i;
+    public final m3 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StageCallVisitCommunityView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558815, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(2131558818, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365518;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365518);
+        int i = 2131365579;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365579);
         if (simpleDraweeView != null) {
-            i = 2131365519;
-            TextView textView = (TextView) inflate.findViewById(2131365519);
+            i = 2131365580;
+            TextView textView = (TextView) inflate.findViewById(2131365580);
             if (textView != null) {
-                i = 2131365520;
-                TextView textView2 = (TextView) inflate.findViewById(2131365520);
+                i = 2131365581;
+                TextView textView2 = (TextView) inflate.findViewById(2131365581);
                 if (textView2 != null) {
-                    j3 j3Var = new j3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2);
-                    m.checkNotNullExpressionValue(j3Var, "ViewStageChannelVisitCom…rom(context), this, true)");
-                    this.i = j3Var;
+                    m3 m3Var = new m3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2);
+                    m.checkNotNullExpressionValue(m3Var, "ViewStageChannelVisitCom…rom(context), this, true)");
+                    this.i = m3Var;
                     return;
                 }
             }
diff --git a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
index 39fcad7a23..22f0f542c7 100644
--- a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
+++ b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java
@@ -18,7 +18,7 @@ import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.DisplayCutoutCompat;
 import androidx.core.view.ViewGroupKt;
-import c.a.i.t3;
+import c.a.i.w3;
 import c.a.l.b;
 import c.a.z.i0.j;
 import c.a.z.i0.k;
@@ -57,7 +57,7 @@ import rx.Subscription;
 import rx.subjects.BehaviorSubject;
 /* compiled from: VideoCallParticipantView.kt */
 public final class VideoCallParticipantView extends ConstraintLayout implements FrameGridLayout.DataView {
-    public final t3 i;
+    public final w3 i;
     public final boolean j;
     public ParticipantData k;
     public String l;
@@ -69,14 +69,14 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public VideoCallGridAdapter.CallUiInsets f2116s;
+    public VideoCallGridAdapter.CallUiInsets f2123s;
     public boolean t;
     public Drawable u;
     public Drawable v;
     public Function2<? super StreamResolution, ? super StreamFps, Unit> w;
 
     /* renamed from: x  reason: collision with root package name */
-    public Function2<? super StreamResolution, ? super StreamFps, Unit> f2117x;
+    public Function2<? super StreamResolution, ? super StreamFps, Unit> f2124x;
 
     /* compiled from: VideoCallParticipantView.kt */
     public static final class ParticipantData implements FrameGridLayout.Data {
@@ -84,7 +84,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         public final StoreVoiceParticipants.VoiceUser b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2118c;
+        public final boolean f2125c;
         public final RendererCommon.ScalingType d;
         public final RendererCommon.ScalingType e;
         public final ApplicationStreamState f;
@@ -114,14 +114,14 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             public final StreamResolution b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final StreamFps f2119c;
+            public final StreamFps f2126c;
             public final boolean d;
 
             public a(boolean z2, StreamResolution streamResolution, StreamFps streamFps, boolean z3) {
                 m.checkNotNullParameter(streamResolution, "resolution");
                 this.a = z2;
                 this.b = streamResolution;
-                this.f2119c = streamFps;
+                this.f2126c = streamFps;
                 this.d = z3;
             }
 
@@ -133,7 +133,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                     return false;
                 }
                 a aVar = (a) obj;
-                return this.a == aVar.a && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2119c, aVar.f2119c) && this.d == aVar.d;
+                return this.a == aVar.a && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2126c, aVar.f2126c) && this.d == aVar.d;
             }
 
             public int hashCode() {
@@ -149,7 +149,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 StreamResolution streamResolution = this.b;
                 int i6 = 0;
                 int hashCode = (i5 + (streamResolution != null ? streamResolution.hashCode() : 0)) * 31;
-                StreamFps streamFps = this.f2119c;
+                StreamFps streamFps = this.f2126c;
                 if (streamFps != null) {
                     i6 = streamFps.hashCode();
                 }
@@ -167,7 +167,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 L.append(", resolution=");
                 L.append(this.b);
                 L.append(", fps=");
-                L.append(this.f2119c);
+                L.append(this.f2126c);
                 L.append(", isBadQuality=");
                 return c.d.b.a.a.G(L, this.d, ")");
             }
@@ -180,7 +180,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             m.checkNotNullParameter(voiceUser, "participant");
             m.checkNotNullParameter(type, "type");
             this.b = voiceUser;
-            this.f2118c = z2;
+            this.f2125c = z2;
             this.d = scalingType;
             this.e = scalingType2;
             this.f = applicationStreamState;
@@ -203,7 +203,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         public static ParticipantData a(ParticipantData participantData, StoreVoiceParticipants.VoiceUser voiceUser, boolean z2, RendererCommon.ScalingType scalingType, RendererCommon.ScalingType scalingType2, ApplicationStreamState applicationStreamState, Type type, boolean z3, boolean z4, a aVar, int i) {
             Type type2 = null;
             StoreVoiceParticipants.VoiceUser voiceUser2 = (i & 1) != 0 ? participantData.b : null;
-            boolean z5 = (i & 2) != 0 ? participantData.f2118c : z2;
+            boolean z5 = (i & 2) != 0 ? participantData.f2125c : z2;
             RendererCommon.ScalingType scalingType3 = (i & 4) != 0 ? participantData.d : scalingType;
             RendererCommon.ScalingType scalingType4 = (i & 8) != 0 ? participantData.e : scalingType2;
             ApplicationStreamState applicationStreamState2 = (i & 16) != 0 ? participantData.f : null;
@@ -252,7 +252,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 return false;
             }
             ParticipantData participantData = (ParticipantData) obj;
-            return m.areEqual(this.b, participantData.b) && this.f2118c == participantData.f2118c && m.areEqual(this.d, participantData.d) && m.areEqual(this.e, participantData.e) && m.areEqual(this.f, participantData.f) && m.areEqual(this.g, participantData.g) && this.h == participantData.h && this.i == participantData.i && m.areEqual(this.j, participantData.j);
+            return m.areEqual(this.b, participantData.b) && this.f2125c == participantData.f2125c && m.areEqual(this.d, participantData.d) && m.areEqual(this.e, participantData.e) && m.areEqual(this.f, participantData.f) && m.areEqual(this.g, participantData.g) && this.h == participantData.h && this.i == participantData.i && m.areEqual(this.j, participantData.j);
         }
 
         @Override // com.discord.utilities.view.grid.FrameGridLayout.Data
@@ -264,7 +264,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             StoreVoiceParticipants.VoiceUser voiceUser = this.b;
             int i = 0;
             int hashCode = (voiceUser != null ? voiceUser.hashCode() : 0) * 31;
-            boolean z2 = this.f2118c;
+            boolean z2 = this.f2125c;
             int i2 = 1;
             if (z2) {
                 z2 = true;
@@ -305,7 +305,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             StringBuilder L = c.d.b.a.a.L("ParticipantData(participant=");
             L.append(this.b);
             L.append(", mirrorVideo=");
-            L.append(this.f2118c);
+            L.append(this.f2125c);
             L.append(", scalingType=");
             L.append(this.d);
             L.append(", scalingTypeMismatchOrientation=");
@@ -368,7 +368,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             @Override // com.discord.views.calls.VideoCallParticipantView.StreamResolution
             public CharSequence a(Context context) {
                 m.checkNotNullParameter(context, "context");
-                return c.a.l.b.g(context, 2131893036, new Object[]{Integer.valueOf(this.a)}, null, 4);
+                return c.a.l.b.g(context, 2131893119, new Object[]{Integer.valueOf(this.a)}, null, 4);
             }
 
             public boolean equals(Object obj) {
@@ -398,7 +398,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             @Override // com.discord.views.calls.VideoCallParticipantView.StreamResolution
             public CharSequence a(Context context) {
                 m.checkNotNullParameter(context, "context");
-                return c.a.l.b.g(context, 2131893040, new Object[0], null, 4);
+                return c.a.l.b.g(context, 2131893123, new Object[0], null, 4);
             }
         }
 
@@ -429,7 +429,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         public final void onClick(View view) {
             Function2<? super StreamResolution, ? super StreamFps, Unit> function2 = this.i.w;
             ParticipantData.a aVar = this.j;
-            function2.invoke(aVar.b, aVar.f2119c);
+            function2.invoke(aVar.b, aVar.f2126c);
         }
     }
 
@@ -445,82 +445,82 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         AttributeSet attributeSet2 = (i2 & 2) != 0 ? null : attributeSet;
         int i3 = (i2 & 4) != 0 ? 0 : i;
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558826, this);
-        int i4 = 2131364140;
-        View findViewById = findViewById(2131364140);
+        LayoutInflater.from(context).inflate(2131558829, this);
+        int i4 = 2131364183;
+        View findViewById = findViewById(2131364183);
         if (findViewById != null) {
-            i4 = 2131364141;
-            View findViewById2 = findViewById(2131364141);
+            i4 = 2131364184;
+            View findViewById2 = findViewById(2131364184);
             if (findViewById2 != null) {
-                i4 = 2131364142;
-                ImageView imageView = (ImageView) findViewById(2131364142);
+                i4 = 2131364185;
+                ImageView imageView = (ImageView) findViewById(2131364185);
                 if (imageView != null) {
-                    i4 = 2131364143;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364143);
+                    i4 = 2131364186;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364186);
                     if (constraintLayout != null) {
-                        i4 = 2131364144;
-                        Space space = (Space) findViewById(2131364144);
+                        i4 = 2131364187;
+                        Space space = (Space) findViewById(2131364187);
                         if (space != null) {
-                            i4 = 2131364145;
-                            ImageView imageView2 = (ImageView) findViewById(2131364145);
+                            i4 = 2131364188;
+                            ImageView imageView2 = (ImageView) findViewById(2131364188);
                             if (imageView2 != null) {
-                                i4 = 2131364146;
-                                TextView textView = (TextView) findViewById(2131364146);
+                                i4 = 2131364189;
+                                TextView textView = (TextView) findViewById(2131364189);
                                 if (textView != null) {
-                                    i4 = 2131364147;
-                                    LinearLayout linearLayout = (LinearLayout) findViewById(2131364147);
+                                    i4 = 2131364190;
+                                    LinearLayout linearLayout = (LinearLayout) findViewById(2131364190);
                                     if (linearLayout != null) {
-                                        i4 = 2131364148;
-                                        TextView textView2 = (TextView) findViewById(2131364148);
+                                        i4 = 2131364191;
+                                        TextView textView2 = (TextView) findViewById(2131364191);
                                         if (textView2 != null) {
-                                            i4 = 2131364149;
-                                            TextView textView3 = (TextView) findViewById(2131364149);
+                                            i4 = 2131364192;
+                                            TextView textView3 = (TextView) findViewById(2131364192);
                                             if (textView3 != null) {
-                                                i4 = 2131364150;
-                                                ImageView imageView3 = (ImageView) findViewById(2131364150);
+                                                i4 = 2131364193;
+                                                ImageView imageView3 = (ImageView) findViewById(2131364193);
                                                 if (imageView3 != null) {
-                                                    i4 = 2131364151;
-                                                    ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364151);
+                                                    i4 = 2131364194;
+                                                    ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364194);
                                                     if (constraintLayout2 != null) {
-                                                        i4 = 2131364152;
-                                                        ImageView imageView4 = (ImageView) findViewById(2131364152);
+                                                        i4 = 2131364195;
+                                                        ImageView imageView4 = (ImageView) findViewById(2131364195);
                                                         if (imageView4 != null) {
-                                                            i4 = 2131364153;
-                                                            TextView textView4 = (TextView) findViewById(2131364153);
+                                                            i4 = 2131364196;
+                                                            TextView textView4 = (TextView) findViewById(2131364196);
                                                             if (textView4 != null) {
-                                                                i4 = 2131364154;
-                                                                TextView textView5 = (TextView) findViewById(2131364154);
+                                                                i4 = 2131364197;
+                                                                TextView textView5 = (TextView) findViewById(2131364197);
                                                                 if (textView5 != null) {
-                                                                    i4 = 2131364155;
-                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364155);
+                                                                    i4 = 2131364198;
+                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364198);
                                                                     if (simpleDraweeView != null) {
-                                                                        i4 = 2131364156;
-                                                                        TextView textView6 = (TextView) findViewById(2131364156);
+                                                                        i4 = 2131364199;
+                                                                        TextView textView6 = (TextView) findViewById(2131364199);
                                                                         if (textView6 != null) {
-                                                                            i4 = 2131364157;
-                                                                            TextView textView7 = (TextView) findViewById(2131364157);
+                                                                            i4 = 2131364200;
+                                                                            TextView textView7 = (TextView) findViewById(2131364200);
                                                                             if (textView7 != null) {
-                                                                                i4 = 2131364158;
-                                                                                ProgressBar progressBar = (ProgressBar) findViewById(2131364158);
+                                                                                i4 = 2131364201;
+                                                                                ProgressBar progressBar = (ProgressBar) findViewById(2131364201);
                                                                                 if (progressBar != null) {
-                                                                                    i4 = 2131364159;
-                                                                                    AppVideoStreamRenderer appVideoStreamRenderer2 = (AppVideoStreamRenderer) findViewById(2131364159);
+                                                                                    i4 = 2131364202;
+                                                                                    AppVideoStreamRenderer appVideoStreamRenderer2 = (AppVideoStreamRenderer) findViewById(2131364202);
                                                                                     if (appVideoStreamRenderer2 != null) {
-                                                                                        i4 = 2131364160;
-                                                                                        LinearLayout linearLayout2 = (LinearLayout) findViewById(2131364160);
+                                                                                        i4 = 2131364203;
+                                                                                        LinearLayout linearLayout2 = (LinearLayout) findViewById(2131364203);
                                                                                         if (linearLayout2 != null) {
-                                                                                            i4 = 2131364161;
-                                                                                            VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364161);
+                                                                                            i4 = 2131364204;
+                                                                                            VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364204);
                                                                                             if (voiceUserView != null) {
-                                                                                                t3 t3Var = new t3(this, findViewById, findViewById2, imageView, constraintLayout, space, imageView2, textView, linearLayout, textView2, textView3, imageView3, constraintLayout2, imageView4, textView4, textView5, simpleDraweeView, textView6, textView7, progressBar, appVideoStreamRenderer2, linearLayout2, voiceUserView);
-                                                                                                m.checkNotNullExpressionValue(t3Var, "ViewVideoCallParticipant…ater.from(context), this)");
-                                                                                                this.i = t3Var;
+                                                                                                w3 w3Var = new w3(this, findViewById, findViewById2, imageView, constraintLayout, space, imageView2, textView, linearLayout, textView2, textView3, imageView3, constraintLayout2, imageView4, textView4, textView5, simpleDraweeView, textView6, textView7, progressBar, appVideoStreamRenderer2, linearLayout2, voiceUserView);
+                                                                                                m.checkNotNullExpressionValue(w3Var, "ViewVideoCallParticipant…ater.from(context), this)");
+                                                                                                this.i = w3Var;
                                                                                                 this.m = j.i;
-                                                                                                this.f2116s = new VideoCallGridAdapter.CallUiInsets(0, 0, 0, 0);
-                                                                                                this.u = ContextCompat.getDrawable(context, 2131230938);
-                                                                                                this.v = ContextCompat.getDrawable(context, 2131230939);
+                                                                                                this.f2123s = new VideoCallGridAdapter.CallUiInsets(0, 0, 0, 0);
+                                                                                                this.u = ContextCompat.getDrawable(context, 2131230942);
+                                                                                                this.v = ContextCompat.getDrawable(context, 2131230943);
                                                                                                 this.w = t.i;
-                                                                                                this.f2117x = t.j;
+                                                                                                this.f2124x = t.j;
                                                                                                 if (attributeSet2 != null) {
                                                                                                     TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet2, R.a.VideoCallParticipantView, 0, 0);
                                                                                                     m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…            0\n          )");
@@ -568,7 +568,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             z2 = videoCallParticipantView.r;
         }
         if ((i & 8) != 0) {
-            callUiInsets2 = videoCallParticipantView.f2116s;
+            callUiInsets2 = videoCallParticipantView.f2123s;
         }
         if ((i & 16) != 0) {
             z3 = videoCallParticipantView.t;
@@ -586,8 +586,8 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             return;
         }
         ConstraintLayout constraintLayout = this.i.e;
-        constraintLayout.setTranslationX(-((float) this.f2116s.getRight()));
-        constraintLayout.setTranslationY((float) this.f2116s.getTop());
+        constraintLayout.setTranslationX(-((float) this.f2123s.getRight()));
+        constraintLayout.setTranslationY((float) this.f2123s.getTop());
         constraintLayout.setOnClickListener(new a(this, aVar));
         ImageView imageView = this.i.f;
         m.checkNotNullExpressionValue(imageView, "binding.participantFullscreenStreamqualIcon");
@@ -596,12 +596,12 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
         CharSequence a2 = streamResolution.a(context);
-        StreamFps streamFps = aVar.f2119c;
+        StreamFps streamFps = aVar.f2126c;
         if (streamFps != null) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
             m.checkNotNullParameter(context2, "context");
-            charSequence = b.g(context2, 2131893029, new Object[]{Integer.valueOf(streamFps.a)}, null, 4);
+            charSequence = b.g(context2, 2131893112, new Object[]{Integer.valueOf(streamFps.a)}, null, 4);
         } else {
             charSequence = "";
         }
@@ -627,7 +627,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         textView2.setVisibility(i);
         textView2.setTextColor(ContextCompat.getColor(textView2.getContext(), i2));
         textView2.requestLayout();
-        this.f2117x.invoke(aVar.b, aVar.f2119c);
+        this.f2124x.invoke(aVar.b, aVar.f2126c);
         b(true);
     }
 
@@ -659,19 +659,19 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
         m.checkNotNullParameter(callUiInsets, "callUiInsets");
         this.q = displayCutoutCompat;
         this.r = z2;
-        this.f2116s = callUiInsets;
+        this.f2123s = callUiInsets;
         this.t = z3;
         StoreVoiceParticipants.VoiceUser voiceUser = participantData != null ? participantData.b : null;
         if (voiceUser != null) {
-            this.i.f157s.setOnBitmapLoadedListener(new k(voiceUser));
-            this.i.f157s.a(voiceUser, 2131165288);
+            this.i.f174s.setOnBitmapLoadedListener(new k(voiceUser));
+            this.i.f174s.a(voiceUser, 2131165288);
             Subscription subscription2 = this.n;
             if (subscription2 != null) {
                 subscription2.unsubscribe();
             }
-            Observable<Integer> c02 = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(Long.valueOf(voiceUser.getUser().getId())).c0(l.i);
-            m.checkNotNullExpressionValue(c02, "UserRepresentativeColors….takeUntil { it != null }");
-            ObservableExtensionsKt.appSubscribe$default(c02, VideoCallParticipantView.class, (Context) null, new o(0, this), (Function1) null, (Function0) null, (Function0) null, new c.a.z.i0.m(this), 58, (Object) null);
+            Observable<Integer> b02 = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(Long.valueOf(voiceUser.getUser().getId())).b0(l.i);
+            m.checkNotNullExpressionValue(b02, "UserRepresentativeColors….takeUntil { it != null }");
+            ObservableExtensionsKt.appSubscribe$default(b02, VideoCallParticipantView.class, (Context) null, new o(0, this), (Function1) null, (Function0) null, (Function0) null, new c.a.z.i0.m(this), 58, (Object) null);
         }
         String forUser$default = IconUtils.getForUser$default(voiceUser != null ? voiceUser.getUser() : null, false, null, 6, null);
         if (!m.areEqual(forUser$default, this.l)) {
@@ -691,7 +691,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 AppVideoStreamRenderer appVideoStreamRenderer = this.i.q;
                 m.checkNotNullExpressionValue(appVideoStreamRenderer, "binding.participantVideoStreamRenderer");
                 appVideoStreamRenderer.setVisibility(8);
-                View view = this.i.f156c;
+                View view = this.i.f173c;
                 m.checkNotNullExpressionValue(view, "binding.participantBgLetterbox");
                 SimpleDraweeView simpleDraweeView = this.i.m;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.participantStreamPreviewImage");
@@ -703,7 +703,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 AppVideoStreamRenderer appVideoStreamRenderer2 = this.i.q;
                 m.checkNotNullExpressionValue(appVideoStreamRenderer2, "binding.participantVideoStreamRenderer");
                 appVideoStreamRenderer2.setVisibility(8);
-                View view2 = this.i.f156c;
+                View view2 = this.i.f173c;
                 m.checkNotNullExpressionValue(view2, "binding.participantBgLetterbox");
                 view2.setVisibility(8);
                 ProgressBar progressBar2 = this.i.p;
@@ -715,7 +715,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
             View view3 = this.i.b;
             m.checkNotNullExpressionValue(view3, "binding.participantBgAvatar");
             view3.setVisibility(8);
-            VoiceUserView voiceUserView = this.i.f157s;
+            VoiceUserView voiceUserView = this.i.f174s;
             m.checkNotNullExpressionValue(voiceUserView, "binding.participantVoiceUserView");
             voiceUserView.setVisibility(8);
             ImageView imageView = this.i.j;
@@ -852,14 +852,14 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 View view4 = this.i.b;
                 m.checkNotNullExpressionValue(view4, "binding.participantBgAvatar");
                 view4.setVisibility(8);
-                VoiceUserView voiceUserView2 = this.i.f157s;
+                VoiceUserView voiceUserView2 = this.i.f174s;
                 m.checkNotNullExpressionValue(voiceUserView2, "binding.participantVoiceUserView");
                 voiceUserView2.setVisibility(8);
             } else {
                 View view5 = this.i.b;
                 m.checkNotNullExpressionValue(view5, "binding.participantBgAvatar");
                 view5.setVisibility(0);
-                VoiceUserView voiceUserView3 = this.i.f157s;
+                VoiceUserView voiceUserView3 = this.i.f174s;
                 m.checkNotNullExpressionValue(voiceUserView3, "binding.participantVoiceUserView");
                 voiceUserView3.setVisibility(0);
             }
@@ -910,7 +910,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 RendererCommon.ScalingType scalingType = participantData == null ? participantData.d : null;
                 RendererCommon.ScalingType scalingType2 = participantData == null ? participantData.e : null;
                 if (participantData == null) {
-                    z5 = participantData.f2118c;
+                    z5 = participantData.f2125c;
                     num = b2;
                 } else {
                     num = b2;
@@ -924,9 +924,9 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                 if (num != null) {
                     BehaviorSubject<Point> behaviorSubject = this.i.q.m;
                     m.checkNotNullExpressionValue(behaviorSubject, "currentFrameResolutionSubject");
-                    Observable<R> G = behaviorSubject.y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-                    m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-                    ObservableExtensionsKt.appSubscribe$default(G, VideoCallParticipantView.class, (Context) null, new o(1, this), (Function1) null, (Function0) null, (Function0) null, new o(this), 58, (Object) null);
+                    Observable<R> F = behaviorSubject.x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                    m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+                    ObservableExtensionsKt.appSubscribe$default(F, VideoCallParticipantView.class, (Context) null, new o(1, this), (Function1) null, (Function0) null, (Function0) null, new o(this), 58, (Object) null);
                 }
                 ParticipantData participantData3 = this.k;
                 type2 = participantData3 == null ? participantData3.g : null;
@@ -970,8 +970,8 @@ public final class VideoCallParticipantView extends ConstraintLayout implements
                     if (participantData.g == ParticipantData.Type.APPLICATION_STREAMING) {
                         Context context = getContext();
                         m.checkNotNullExpressionValue(context, "context");
-                        setContentDescription(b.g(context, 2131889125, new Object[]{voiceUser.getDisplayName()}, null, 4));
-                        this.i.o.setCompoundDrawablesWithIntrinsicBounds(2131231899, 0, 0, 0);
+                        setContentDescription(b.g(context, 2131889129, new Object[]{voiceUser.getDisplayName()}, null, 4));
+                        this.i.o.setCompoundDrawablesWithIntrinsicBounds(2131231907, 0, 0, 0);
                     } else {
                         setContentDescription(voiceUser.getDisplayName());
                         this.i.o.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
diff --git a/app/src/main/java/com/discord/views/calls/VolumeSliderView.java b/app/src/main/java/com/discord/views/calls/VolumeSliderView.java
index 366e231a84..f7dc9dea9e 100644
--- a/app/src/main/java/com/discord/views/calls/VolumeSliderView.java
+++ b/app/src/main/java/com/discord/views/calls/VolumeSliderView.java
@@ -7,7 +7,7 @@ import android.view.LayoutInflater;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
-import c.a.i.w3;
+import c.a.i.z3;
 import c.a.z.i;
 import com.discord.R;
 import com.discord.utilities.color.ColorCompat;
@@ -17,7 +17,7 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 /* compiled from: VolumeSliderView.kt */
 public final class VolumeSliderView extends LinearLayout {
-    public final w3 i;
+    public final z3 i;
 
     /* compiled from: VolumeSliderView.kt */
     public static final class a extends i {
@@ -38,19 +38,19 @@ public final class VolumeSliderView extends LinearLayout {
     public VolumeSliderView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558834, this);
-        int i = 2131365568;
-        ImageView imageView = (ImageView) findViewById(2131365568);
+        LayoutInflater.from(getContext()).inflate(2131558837, this);
+        int i = 2131365629;
+        ImageView imageView = (ImageView) findViewById(2131365629);
         if (imageView != null) {
-            i = 2131365569;
-            ImageView imageView2 = (ImageView) findViewById(2131365569);
+            i = 2131365630;
+            ImageView imageView2 = (ImageView) findViewById(2131365630);
             if (imageView2 != null) {
-                i = 2131365570;
-                SeekBar seekBar = (SeekBar) findViewById(2131365570);
+                i = 2131365631;
+                SeekBar seekBar = (SeekBar) findViewById(2131365631);
                 if (seekBar != null) {
-                    w3 w3Var = new w3(this, imageView, imageView2, seekBar);
-                    m.checkNotNullExpressionValue(w3Var, "VolumeSliderViewBinding.…ater.from(context), this)");
-                    this.i = w3Var;
+                    z3 z3Var = new z3(this, imageView, imageView2, seekBar);
+                    m.checkNotNullExpressionValue(z3Var, "VolumeSliderViewBinding.…ater.from(context), this)");
+                    this.i = z3Var;
                     if (attributeSet != null) {
                         TypedArray obtainStyledAttributes = getContext().obtainStyledAttributes(attributeSet, R.a.VolumeSliderView, 0, 0);
                         m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…e.VolumeSliderView, 0, 0)");
diff --git a/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java b/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java
index 3d29d86ff2..3352a92253 100644
--- a/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java
+++ b/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java
@@ -24,17 +24,17 @@ public final class GuildChannelSideBarActionsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(getContext()).inflate(2131558513, this);
-        int i = 2131362354;
-        MaterialButton materialButton = (MaterialButton) findViewById(2131362354);
+        int i = 2131362369;
+        MaterialButton materialButton = (MaterialButton) findViewById(2131362369);
         if (materialButton != null) {
-            i = 2131362355;
-            MaterialButton materialButton2 = (MaterialButton) findViewById(2131362355);
+            i = 2131362370;
+            MaterialButton materialButton2 = (MaterialButton) findViewById(2131362370);
             if (materialButton2 != null) {
-                i = 2131362356;
-                MaterialButton materialButton3 = (MaterialButton) findViewById(2131362356);
+                i = 2131362371;
+                MaterialButton materialButton3 = (MaterialButton) findViewById(2131362371);
                 if (materialButton3 != null) {
-                    i = 2131362357;
-                    MaterialButton materialButton4 = (MaterialButton) findViewById(2131362357);
+                    i = 2131362372;
+                    MaterialButton materialButton4 = (MaterialButton) findViewById(2131362372);
                     if (materialButton4 != null) {
                         q qVar = new q(this, materialButton, materialButton2, materialButton3, materialButton4);
                         m.checkNotNullExpressionValue(qVar, "GuildChannelSideBarActio…ater.from(context), this)");
@@ -57,15 +57,15 @@ public final class GuildChannelSideBarActionsView extends LinearLayout {
         int themedDrawableRes$default2 = z3 ? DrawableCompat.getThemedDrawableRes$default(this, 2130969452, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969453, 0, 2, (Object) null);
         this.i.d.setOnClickListener(new a(function1));
         this.i.e.setOnClickListener(new a(function14));
-        MaterialButton materialButton = this.i.f141c;
+        MaterialButton materialButton = this.i.f144c;
         DrawableCompat.setCompoundDrawablesCompat(materialButton, (Drawable) null, ContextCompat.getDrawable(materialButton.getContext(), themedDrawableRes$default), (Drawable) null, (Drawable) null);
         materialButton.setOnClickListener(new b(function13));
-        MaterialButton materialButton2 = this.i.f141c;
+        MaterialButton materialButton2 = this.i.f144c;
         m.checkNotNullExpressionValue(materialButton2, "binding.channelSidebarActionsPins");
         materialButton2.setEnabled(!z4);
         MaterialButton materialButton3 = this.i.b;
         DrawableCompat.setCompoundDrawablesCompat(materialButton3, (Drawable) null, ContextCompat.getDrawable(materialButton3.getContext(), themedDrawableRes$default2), (Drawable) null, (Drawable) null);
         materialButton3.setOnClickListener(new b(function12));
-        materialButton3.setContentDescription(z3 ? materialButton3.getContext().getString(2131891538) : materialButton3.getContext().getString(2131891537));
+        materialButton3.setContentDescription(z3 ? materialButton3.getContext().getString(2131891607) : materialButton3.getContext().getString(2131891606));
     }
 }
diff --git a/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java b/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java
index e438af874a..f19068a33f 100644
--- a/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java
+++ b/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java
@@ -19,18 +19,18 @@ public final class PrivateChannelSideBarActionsView extends LinearLayout {
     public PrivateChannelSideBarActionsView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(getContext()).inflate(2131558644, this);
-        int i = 2131364346;
-        MaterialButton materialButton = (MaterialButton) findViewById(2131364346);
+        LayoutInflater.from(getContext()).inflate(2131558642, this);
+        int i = 2131364382;
+        MaterialButton materialButton = (MaterialButton) findViewById(2131364382);
         if (materialButton != null) {
-            i = 2131364347;
-            MaterialButton materialButton2 = (MaterialButton) findViewById(2131364347);
+            i = 2131364383;
+            MaterialButton materialButton2 = (MaterialButton) findViewById(2131364383);
             if (materialButton2 != null) {
-                i = 2131364348;
-                MaterialButton materialButton3 = (MaterialButton) findViewById(2131364348);
+                i = 2131364384;
+                MaterialButton materialButton3 = (MaterialButton) findViewById(2131364384);
                 if (materialButton3 != null) {
-                    i = 2131364349;
-                    MaterialButton materialButton4 = (MaterialButton) findViewById(2131364349);
+                    i = 2131364385;
+                    MaterialButton materialButton4 = (MaterialButton) findViewById(2131364385);
                     if (materialButton4 != null) {
                         a1 a1Var = new a1(this, materialButton, materialButton2, materialButton3, materialButton4);
                         m.checkNotNullExpressionValue(a1Var, "PrivateChannelSideBarAct…ater.from(context), this)");
@@ -52,7 +52,7 @@ public final class PrivateChannelSideBarActionsView extends LinearLayout {
         int themedDrawableRes$default = z2 ? DrawableCompat.getThemedDrawableRes$default(this, 2130969452, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969453, 0, 2, (Object) null);
         this.i.b.setOnClickListener(onClickListener);
         this.i.e.setOnClickListener(onClickListener2);
-        MaterialButton materialButton = this.i.f61c;
+        MaterialButton materialButton = this.i.f60c;
         DrawableCompat.setCompoundDrawablesCompat(materialButton, (Drawable) null, ContextCompat.getDrawable(materialButton.getContext(), themedDrawableRes$default), (Drawable) null, (Drawable) null);
         materialButton.setOnClickListener(onClickListener3);
         this.i.d.setOnClickListener(onClickListener4);
diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java
index db315ef417..d34853fdfd 100644
--- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java
+++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java
@@ -8,7 +8,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.u1;
+import c.a.i.w1;
 import com.discord.utilities.locale.LocaleManager;
 import com.discord.views.discovery.speakers.DiscoveryStageCardSpeakersView;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -16,7 +16,7 @@ import d0.z.d.m;
 import java.text.NumberFormat;
 /* compiled from: DiscoveryStageCardBodyView.kt */
 public final class DiscoveryStageCardBodyView extends ConstraintLayout {
-    public final u1 i;
+    public final w1 i;
     public final NumberFormat j;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -24,36 +24,36 @@ public final class DiscoveryStageCardBodyView extends ConstraintLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558742, this);
-        int i = 2131365000;
-        LinearLayout linearLayout = (LinearLayout) findViewById(2131365000);
+        int i = 2131365050;
+        LinearLayout linearLayout = (LinearLayout) findViewById(2131365050);
         if (linearLayout != null) {
-            i = 2131365001;
-            TextView textView = (TextView) findViewById(2131365001);
+            i = 2131365051;
+            TextView textView = (TextView) findViewById(2131365051);
             if (textView != null) {
-                i = 2131365002;
-                Barrier barrier = (Barrier) findViewById(2131365002);
+                i = 2131365052;
+                Barrier barrier = (Barrier) findViewById(2131365052);
                 if (barrier != null) {
-                    i = 2131365003;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365003);
+                    i = 2131365053;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365053);
                     if (simpleDraweeView != null) {
-                        i = 2131365004;
-                        TextView textView2 = (TextView) findViewById(2131365004);
+                        i = 2131365054;
+                        TextView textView2 = (TextView) findViewById(2131365054);
                         if (textView2 != null) {
-                            i = 2131365005;
-                            FrameLayout frameLayout = (FrameLayout) findViewById(2131365005);
+                            i = 2131365055;
+                            FrameLayout frameLayout = (FrameLayout) findViewById(2131365055);
                             if (frameLayout != null) {
-                                i = 2131365006;
-                                TextView textView3 = (TextView) findViewById(2131365006);
+                                i = 2131365056;
+                                TextView textView3 = (TextView) findViewById(2131365056);
                                 if (textView3 != null) {
-                                    i = 2131365007;
-                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) findViewById(2131365007);
+                                    i = 2131365057;
+                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) findViewById(2131365057);
                                     if (discoveryStageCardSpeakersView != null) {
-                                        i = 2131365008;
-                                        TextView textView4 = (TextView) findViewById(2131365008);
+                                        i = 2131365058;
+                                        TextView textView4 = (TextView) findViewById(2131365058);
                                         if (textView4 != null) {
-                                            u1 u1Var = new u1(this, linearLayout, textView, barrier, simpleDraweeView, textView2, frameLayout, textView3, discoveryStageCardSpeakersView, textView4);
-                                            m.checkNotNullExpressionValue(u1Var, "ViewDiscoveryStageCardBo…ater.from(context), this)");
-                                            this.i = u1Var;
+                                            w1 w1Var = new w1(this, linearLayout, textView, barrier, simpleDraweeView, textView2, frameLayout, textView3, discoveryStageCardSpeakersView, textView4);
+                                            m.checkNotNullExpressionValue(w1Var, "ViewDiscoveryStageCardBo…ater.from(context), this)");
+                                            this.i = w1Var;
                                             this.j = NumberFormat.getNumberInstance(new LocaleManager().getPrimaryLocale(context));
                                             return;
                                         }
diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java
index a575abcd00..d30c5c67eb 100644
--- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java
+++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java
@@ -6,33 +6,33 @@ import android.view.LayoutInflater;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.v1;
+import c.a.i.x1;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
 /* compiled from: DiscoveryStageCardControlsView.kt */
 public final class DiscoveryStageCardControlsView extends ConstraintLayout {
-    public final v1 i;
+    public final x1 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public DiscoveryStageCardControlsView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558743, this);
-        int i = 2131362911;
-        ImageView imageView = (ImageView) findViewById(2131362911);
+        int i = 2131362936;
+        ImageView imageView = (ImageView) findViewById(2131362936);
         if (imageView != null) {
-            i = 2131362912;
-            MaterialButton materialButton = (MaterialButton) findViewById(2131362912);
+            i = 2131362937;
+            MaterialButton materialButton = (MaterialButton) findViewById(2131362937);
             if (materialButton != null) {
-                i = 2131362913;
-                TextView textView = (TextView) findViewById(2131362913);
+                i = 2131362938;
+                TextView textView = (TextView) findViewById(2131362938);
                 if (textView != null) {
-                    i = 2131362914;
-                    MaterialButton materialButton2 = (MaterialButton) findViewById(2131362914);
+                    i = 2131362939;
+                    MaterialButton materialButton2 = (MaterialButton) findViewById(2131362939);
                     if (materialButton2 != null) {
-                        v1 v1Var = new v1(this, imageView, materialButton, textView, materialButton2);
-                        m.checkNotNullExpressionValue(v1Var, "ViewDiscoveryStageCardCo…ater.from(context), this)");
-                        this.i = v1Var;
+                        x1 x1Var = new x1(this, imageView, materialButton, textView, materialButton2);
+                        m.checkNotNullExpressionValue(x1Var, "ViewDiscoveryStageCardCo…ater.from(context), this)");
+                        this.i = x1Var;
                         return;
                     }
                 }
diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java
index bd65ff820a..d8570f995b 100644
--- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java
+++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java
@@ -5,27 +5,27 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.x1;
+import c.a.i.z1;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 /* compiled from: DiscoveryStageCardTopHatView.kt */
 public final class DiscoveryStageCardTopHatView extends LinearLayout {
-    public final x1 i;
+    public final z1 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public DiscoveryStageCardTopHatView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558745, this);
-        int i = 2131362931;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131362931);
+        int i = 2131362956;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131362956);
         if (simpleDraweeView != null) {
-            i = 2131362932;
-            TextView textView = (TextView) findViewById(2131362932);
+            i = 2131362957;
+            TextView textView = (TextView) findViewById(2131362957);
             if (textView != null) {
-                x1 x1Var = new x1(this, simpleDraweeView, textView);
-                m.checkNotNullExpressionValue(x1Var, "ViewDiscoveryStageCardTo…ater.from(context), this)");
-                this.i = x1Var;
+                z1 z1Var = new z1(this, simpleDraweeView, textView);
+                m.checkNotNullExpressionValue(z1Var, "ViewDiscoveryStageCardTo…ater.from(context), this)");
+                this.i = z1Var;
                 return;
             }
         }
diff --git a/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java b/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java
index 2b9de93185..d2f8bed9f0 100644
--- a/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java
+++ b/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java
@@ -8,7 +8,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.w1;
+import c.a.i.y1;
 import c.a.z.k0.c.c;
 import c.a.z.k0.c.d;
 import com.discord.utilities.dimen.DimenUtils;
@@ -24,7 +24,7 @@ import java.util.Objects;
 /* compiled from: DiscoveryStageCardSpeakersView.kt */
 public final class DiscoveryStageCardSpeakersView extends LinearLayout {
     public static final RecyclerView.ItemDecoration i = new a();
-    public final w1 j;
+    public final y1 j;
     public final c k;
     public final GridLayoutManager l;
 
@@ -55,11 +55,11 @@ public final class DiscoveryStageCardSpeakersView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558744, this);
-        SpeakersRecyclerView speakersRecyclerView = (SpeakersRecyclerView) findViewById(2131362923);
+        SpeakersRecyclerView speakersRecyclerView = (SpeakersRecyclerView) findViewById(2131362948);
         if (speakersRecyclerView != null) {
-            w1 w1Var = new w1(this, speakersRecyclerView);
-            m.checkNotNullExpressionValue(w1Var, "ViewDiscoveryStageCardSp…ater.from(context), this)");
-            this.j = w1Var;
+            y1 y1Var = new y1(this, speakersRecyclerView);
+            m.checkNotNullExpressionValue(y1Var, "ViewDiscoveryStageCardSp…ater.from(context), this)");
+            this.j = y1Var;
             MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
             m.checkNotNullExpressionValue(speakersRecyclerView, "binding.discoverySpeakersRecycler");
             c cVar = (c) companion.configure(new c(speakersRecyclerView));
@@ -74,7 +74,7 @@ public final class DiscoveryStageCardSpeakersView extends LinearLayout {
             recycler.setHasFixedSize(false);
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131362923)));
+        throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131362948)));
     }
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(r12v1 int), ('-' char), (r14v6 int)] */
diff --git a/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java b/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java
index a484b0de82..5f960fd87d 100644
--- a/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java
+++ b/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java
@@ -9,15 +9,15 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.h3;
-import c.a.i.y1;
+import c.a.i.a2;
+import c.a.i.k3;
 import com.google.android.material.card.MaterialCardView;
 import d0.z.d.m;
 import java.util.List;
 import java.util.Objects;
 /* compiled from: ExperimentOverrideView.kt */
 public final class ExperimentOverrideView extends ConstraintLayout {
-    public final y1 i;
+    public final a2 i;
 
     /* compiled from: ExperimentOverrideView.kt */
     public static final class a extends ArrayAdapter<b> {
@@ -25,7 +25,7 @@ public final class ExperimentOverrideView extends ConstraintLayout {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public a(Context context, List<b> list) {
-            super(context, 2131558813, list);
+            super(context, 2131558816, list);
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(list, "items");
             this.i = list;
@@ -35,10 +35,10 @@ public final class ExperimentOverrideView extends ConstraintLayout {
         /* JADX WARN: Multi-variable type inference failed */
         public final View a(int i, View view) {
             if (view == 0) {
-                View inflate = LayoutInflater.from(getContext()).inflate(2131558813, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(getContext()).inflate(2131558816, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 view = (TextView) inflate;
-                m.checkNotNullExpressionValue(new h3(view), "ViewSimpleSpinnerDropdow…om(context), null, false)");
+                m.checkNotNullExpressionValue(new k3(view), "ViewSimpleSpinnerDropdow…om(context), null, false)");
                 m.checkNotNullExpressionValue(view, "ViewSimpleSpinnerDropdow…ntext), null, false).root");
             }
             ((TextView) view).setText(this.i.get(i).b);
@@ -123,27 +123,27 @@ public final class ExperimentOverrideView extends ConstraintLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558746, this);
-        int i = 2131363119;
-        TextView textView = (TextView) findViewById(2131363119);
+        int i = 2131363144;
+        TextView textView = (TextView) findViewById(2131363144);
         if (textView != null) {
-            i = 2131363120;
-            Spinner spinner = (Spinner) findViewById(2131363120);
+            i = 2131363145;
+            Spinner spinner = (Spinner) findViewById(2131363145);
             if (spinner != null) {
-                i = 2131363121;
-                MaterialCardView materialCardView = (MaterialCardView) findViewById(2131363121);
+                i = 2131363146;
+                MaterialCardView materialCardView = (MaterialCardView) findViewById(2131363146);
                 if (materialCardView != null) {
-                    i = 2131363122;
-                    TextView textView2 = (TextView) findViewById(2131363122);
+                    i = 2131363147;
+                    TextView textView2 = (TextView) findViewById(2131363147);
                     if (textView2 != null) {
-                        i = 2131363123;
-                        TextView textView3 = (TextView) findViewById(2131363123);
+                        i = 2131363148;
+                        TextView textView3 = (TextView) findViewById(2131363148);
                         if (textView3 != null) {
-                            i = 2131363124;
-                            TextView textView4 = (TextView) findViewById(2131363124);
+                            i = 2131363149;
+                            TextView textView4 = (TextView) findViewById(2131363149);
                             if (textView4 != null) {
-                                y1 y1Var = new y1(this, textView, spinner, materialCardView, textView2, textView3, textView4);
-                                m.checkNotNullExpressionValue(y1Var, "ViewExperimentOverrideBi…ater.from(context), this)");
-                                this.i = y1Var;
+                                a2 a2Var = new a2(this, textView, spinner, materialCardView, textView2, textView3, textView4);
+                                m.checkNotNullExpressionValue(a2Var, "ViewExperimentOverrideBi…ater.from(context), this)");
+                                this.i = a2Var;
                                 return;
                             }
                         }
diff --git a/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java b/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java
index a5674b6415..51f57037fa 100644
--- a/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java
+++ b/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java
@@ -31,17 +31,17 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
         LayoutInflater.from(context).inflate(2131558444, this);
-        int i = 2131362823;
-        ImageView imageView = (ImageView) findViewById(2131362823);
+        int i = 2131362848;
+        ImageView imageView = (ImageView) findViewById(2131362848);
         if (imageView != null) {
-            i = 2131362846;
-            TextView textView = (TextView) findViewById(2131362846);
+            i = 2131362871;
+            TextView textView = (TextView) findViewById(2131362871);
             if (textView != null) {
-                i = 2131363539;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363539);
+                i = 2131363580;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363580);
                 if (simpleDraweeView != null) {
-                    i = 2131363992;
-                    TextView textView2 = (TextView) findViewById(2131363992);
+                    i = 2131364033;
+                    TextView textView2 = (TextView) findViewById(2131364033);
                     if (textView2 != null) {
                         g gVar = new g(this, imageView, textView, simpleDraweeView, textView2);
                         m.checkNotNullExpressionValue(gVar, "ChannelPermissionOwnerVi…ater.from(context), this)");
@@ -59,7 +59,7 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
         int i = 8;
         if (permissionOwner instanceof PermissionOwner.Role) {
             GuildRole role = ((PermissionOwner.Role) permissionOwner).getRole();
-            Drawable drawable = ContextCompat.getDrawable(getContext(), 2131231826);
+            Drawable drawable = ContextCompat.getDrawable(getContext(), 2131231834);
             m.checkNotNull(drawable);
             m.checkNotNullExpressionValue(drawable, "ContextCompat.getDrawabl….ic_person_shield_24dp)!!");
             Context context = getContext();
@@ -75,7 +75,7 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
             TextView textView = this.i.e;
             m.checkNotNullExpressionValue(textView, "binding.name");
             textView.setText(role.f());
-            TextView textView2 = this.i.f92c;
+            TextView textView2 = this.i.f93c;
             m.checkNotNullExpressionValue(textView2, "binding.description");
             textView2.setText(getContext().getText(ChannelPermissionUtilsKt.getChannelPermissionOwnerRoleLabel(role)));
             ImageView imageView = this.i.b;
@@ -94,7 +94,7 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout {
                 nickname = user.getUsername();
             }
             textView3.setText(nickname);
-            TextView textView4 = this.i.f92c;
+            TextView textView4 = this.i.f93c;
             m.checkNotNullExpressionValue(textView4, "binding.description");
             textView4.setText(UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user, null, null, 3, null));
             ImageView imageView2 = this.i.b;
diff --git a/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java b/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java
index 0a4d658ef9..528464e2ab 100644
--- a/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java
+++ b/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java
@@ -11,7 +11,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import c.a.i.i2;
+import c.a.i.k2;
 import com.discord.R;
 import com.discord.models.phone.PhoneCountryCode;
 import com.discord.utilities.phone.PhoneUtils;
@@ -27,11 +27,10 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: PhoneOrEmailInputView.kt */
 public final class PhoneOrEmailInputView extends LinearLayout {
     public static final /* synthetic */ int i = 0;
-    public final i2 j;
+    public final k2 j;
     public Mode k;
-    public boolean l;
+    public CharSequence l;
     public CharSequence m;
-    public CharSequence n;
 
     /* compiled from: PhoneOrEmailInputView.kt */
     public enum Mode {
@@ -128,9 +127,9 @@ public final class PhoneOrEmailInputView extends LinearLayout {
             m.checkNotNullExpressionValue(textInputLayout, "binding.phoneOrEmailMainInputWrap");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
             if (phoneOrEmailInputView.k.ordinal() != 2) {
-                phoneOrEmailInputView.m = textOrEmpty;
+                phoneOrEmailInputView.l = textOrEmpty;
             } else {
-                phoneOrEmailInputView.n = textOrEmpty;
+                phoneOrEmailInputView.m = textOrEmpty;
             }
             this.this$0.c();
             return Unit.a;
@@ -142,22 +141,22 @@ public final class PhoneOrEmailInputView extends LinearLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558775, this);
-        int i2 = 2131364214;
-        TextInputLayout textInputLayout = (TextInputLayout) findViewById(2131364214);
+        int i2 = 2131364258;
+        TextInputLayout textInputLayout = (TextInputLayout) findViewById(2131364258);
         if (textInputLayout != null) {
-            i2 = 2131364215;
-            TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364215);
+            i2 = 2131364259;
+            TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364259);
             if (textInputEditText != null) {
-                i2 = 2131364216;
-                TextInputLayout textInputLayout2 = (TextInputLayout) findViewById(2131364216);
+                i2 = 2131364260;
+                TextInputLayout textInputLayout2 = (TextInputLayout) findViewById(2131364260);
                 if (textInputLayout2 != null) {
-                    i2 i2Var = new i2(this, textInputLayout, textInputEditText, textInputLayout2);
-                    m.checkNotNullExpressionValue(i2Var, "ViewPhoneOrEmailInputBin…ater.from(context), this)");
-                    this.j = i2Var;
+                    k2 k2Var = new k2(this, textInputLayout, textInputEditText, textInputLayout2);
+                    m.checkNotNullExpressionValue(k2Var, "ViewPhoneOrEmailInputBin…ater.from(context), this)");
+                    this.j = k2Var;
                     Mode mode = Mode.ADAPTIVE;
                     this.k = mode;
+                    this.l = "";
                     this.m = "";
-                    this.n = "";
                     setLayoutTransition(new LayoutTransition());
                     if (attributeSet != null) {
                         TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.PhoneOrEmailInputView, 0, 0);
@@ -219,33 +218,28 @@ public final class PhoneOrEmailInputView extends LinearLayout {
 
     public final void d() {
         if (this.k.ordinal() != 2) {
-            TextInputEditText textInputEditText = this.j.f104c;
+            TextInputEditText textInputEditText = this.j.f115c;
             m.checkNotNullExpressionValue(textInputEditText, "binding.phoneOrEmailMainInput");
             textInputEditText.setInputType(32);
             if (Build.VERSION.SDK_INT >= 26) {
-                this.j.f104c.setAutofillHints(new String[]{"emailAddress"});
-            }
-            if (this.l) {
-                TextInputLayout textInputLayout = this.j.d;
-                m.checkNotNullExpressionValue(textInputLayout, "binding.phoneOrEmailMainInputWrap");
-                ViewExtensions.setText(textInputLayout, this.m);
-                this.j.f104c.setSelection(this.m.length());
-                return;
+                this.j.f115c.setAutofillHints(new String[]{"emailAddress"});
             }
+            TextInputLayout textInputLayout = this.j.d;
+            m.checkNotNullExpressionValue(textInputLayout, "binding.phoneOrEmailMainInputWrap");
+            ViewExtensions.setText(textInputLayout, this.l);
+            this.j.f115c.setSelection(this.l.length());
             return;
         }
-        TextInputEditText textInputEditText2 = this.j.f104c;
+        TextInputEditText textInputEditText2 = this.j.f115c;
         m.checkNotNullExpressionValue(textInputEditText2, "binding.phoneOrEmailMainInput");
         textInputEditText2.setInputType(3);
         if (Build.VERSION.SDK_INT >= 26) {
-            this.j.f104c.setAutofillHints(new String[]{"phone"});
-        }
-        if (this.l) {
-            TextInputLayout textInputLayout2 = this.j.d;
-            m.checkNotNullExpressionValue(textInputLayout2, "binding.phoneOrEmailMainInputWrap");
-            ViewExtensions.setText(textInputLayout2, this.n);
-            this.j.f104c.setSelection(this.n.length());
+            this.j.f115c.setAutofillHints(new String[]{"phone"});
         }
+        TextInputLayout textInputLayout2 = this.j.d;
+        m.checkNotNullExpressionValue(textInputLayout2, "binding.phoneOrEmailMainInputWrap");
+        ViewExtensions.setText(textInputLayout2, this.m);
+        this.j.f115c.setSelection(this.m.length());
     }
 
     public final boolean e() {
@@ -263,7 +257,7 @@ public final class PhoneOrEmailInputView extends LinearLayout {
     }
 
     public final TextInputEditText getMainEditText() {
-        TextInputEditText textInputEditText = this.j.f104c;
+        TextInputEditText textInputEditText = this.j.f115c;
         m.checkNotNullExpressionValue(textInputEditText, "binding.phoneOrEmailMainInput");
         return textInputEditText;
     }
@@ -310,10 +304,6 @@ public final class PhoneOrEmailInputView extends LinearLayout {
         d();
     }
 
-    public final void setSaveValues(boolean z2) {
-        this.l = z2;
-    }
-
     public final void setText(CharSequence charSequence) {
         TextInputLayout textInputLayout = this.j.d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.phoneOrEmailMainInputWrap");
diff --git a/app/src/main/java/com/discord/views/premium/AccountCreditView.java b/app/src/main/java/com/discord/views/premium/AccountCreditView.java
index 1cb5bee2e2..d1178e8f9c 100644
--- a/app/src/main/java/com/discord/views/premium/AccountCreditView.java
+++ b/app/src/main/java/com/discord/views/premium/AccountCreditView.java
@@ -10,7 +10,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.n1;
+import c.a.i.p1;
 import c.a.l.b;
 import com.discord.models.domain.ModelSubscription;
 import com.discord.models.domain.premium.SubscriptionPlanType;
@@ -20,7 +20,7 @@ import d0.z.d.m;
 import java.text.DateFormat;
 /* compiled from: AccountCreditView.kt */
 public final class AccountCreditView extends ConstraintLayout {
-    public final n1 i;
+    public final p1 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public AccountCreditView(Context context, AttributeSet attributeSet) {
@@ -28,24 +28,24 @@ public final class AccountCreditView extends ConstraintLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558715, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362815;
-        TextView textView = (TextView) inflate.findViewById(2131362815);
+        int i = 2131362840;
+        TextView textView = (TextView) inflate.findViewById(2131362840);
         if (textView != null) {
-            i = 2131362816;
-            ImageView imageView = (ImageView) inflate.findViewById(2131362816);
+            i = 2131362841;
+            ImageView imageView = (ImageView) inflate.findViewById(2131362841);
             if (imageView != null) {
-                i = 2131362817;
-                TextView textView2 = (TextView) inflate.findViewById(2131362817);
+                i = 2131362842;
+                TextView textView2 = (TextView) inflate.findViewById(2131362842);
                 if (textView2 != null) {
-                    i = 2131362818;
-                    LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362818);
+                    i = 2131362843;
+                    LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362843);
                     if (linearLayout != null) {
-                        i = 2131362822;
-                        TextView textView3 = (TextView) inflate.findViewById(2131362822);
+                        i = 2131362847;
+                        TextView textView3 = (TextView) inflate.findViewById(2131362847);
                         if (textView3 != null) {
-                            n1 n1Var = new n1((ConstraintLayout) inflate, textView, imageView, textView2, linearLayout, textView3);
-                            m.checkNotNullExpressionValue(n1Var, "ViewAccountCreditBinding…rom(context), this, true)");
-                            this.i = n1Var;
+                            p1 p1Var = new p1((ConstraintLayout) inflate, textView, imageView, textView2, linearLayout, textView3);
+                            m.checkNotNullExpressionValue(p1Var, "ViewAccountCreditBinding…rom(context), this, true)");
+                            this.i = p1Var;
                             return;
                         }
                     }
@@ -60,24 +60,24 @@ public final class AccountCreditView extends ConstraintLayout {
         setVisibility(i > 0 ? 0 : 8);
         if (i > 0) {
             if (j == SubscriptionPlanType.PREMIUM_MONTH_TIER_1.getPlanId()) {
-                obj = b.i(this, 2131892299, new Object[0], null, 4);
-                this.i.f129c.setImageResource(2131231144);
+                obj = b.i(this, 2131892376, new Object[0], null, 4);
+                this.i.f141c.setImageResource(2131231149);
                 TextView textView = this.i.b;
                 m.checkNotNullExpressionValue(textView, "binding.creditHeader");
-                b.n(textView, 2131892257, new Object[]{obj}, null, 4);
+                b.m(textView, 2131892333, new Object[]{obj}, null, 4);
             } else if (j == SubscriptionPlanType.PREMIUM_MONTH_TIER_2.getPlanId()) {
-                obj = b.i(this, 2131892301, new Object[0], null, 4);
-                this.i.f129c.setImageResource(2131231143);
+                obj = b.i(this, 2131892378, new Object[0], null, 4);
+                this.i.f141c.setImageResource(2131231148);
                 TextView textView2 = this.i.b;
                 m.checkNotNullExpressionValue(textView2, "binding.creditHeader");
-                b.n(textView2, 2131892257, new Object[]{obj}, null, 4);
+                b.m(textView2, 2131892333, new Object[]{obj}, null, 4);
             } else {
                 obj = "";
             }
-            if ((modelSubscription != null && modelSubscription.isGoogleSubscription()) || modelSubscription == null || j != modelSubscription.getPlanId()) {
+            if ((modelSubscription != null && modelSubscription.isGoogleSubscription()) || modelSubscription == null || !modelSubscription.hasPlan(j)) {
                 TextView textView3 = this.i.d;
                 m.checkNotNullExpressionValue(textView3, "binding.creditInfo");
-                b.n(textView3, 2131892259, new Object[]{obj}, null, 4);
+                b.m(textView3, 2131892335, new Object[]{obj}, null, 4);
             } else {
                 TimeUtils timeUtils = TimeUtils.INSTANCE;
                 String currentPeriodEnd = modelSubscription.getCurrentPeriodEnd();
@@ -86,7 +86,7 @@ public final class AccountCreditView extends ConstraintLayout {
                 String renderUtcDate$default = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodEnd, context, (String) null, (DateFormat) null, 0, 28, (Object) null);
                 TextView textView4 = this.i.d;
                 m.checkNotNullExpressionValue(textView4, "binding.creditInfo");
-                b.n(textView4, 2131892260, new Object[]{renderUtcDate$default}, null, 4);
+                b.m(textView4, 2131892336, new Object[]{renderUtcDate$default}, null, 4);
             }
             TextView textView5 = this.i.e;
             m.checkNotNullExpressionValue(textView5, "binding.creditTime");
@@ -94,7 +94,7 @@ public final class AccountCreditView extends ConstraintLayout {
             m.checkNotNullExpressionValue(resources, "resources");
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            textView5.setText(StringResourceUtilsKt.getQuantityString(resources, context2, 2131755288, i, Integer.valueOf(i)));
+            textView5.setText(StringResourceUtilsKt.getQuantityString(resources, context2, 2131755289, i, Integer.valueOf(i)));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/views/premium/GiftSelectView.java b/app/src/main/java/com/discord/views/premium/GiftSelectView.java
index 0ff9fe0a49..0532432270 100644
--- a/app/src/main/java/com/discord/views/premium/GiftSelectView.java
+++ b/app/src/main/java/com/discord/views/premium/GiftSelectView.java
@@ -21,7 +21,7 @@ public final class GiftSelectView extends FrameLayout {
     public GiftSelectView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558974, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(2131558977, (ViewGroup) this, false);
         addView(inflate);
         WidgetChoosePlanAdapterPlanItemBinding a = WidgetChoosePlanAdapterPlanItemBinding.a(inflate);
         m.checkNotNullExpressionValue(a, "WidgetChoosePlanAdapterP…rom(context), this, true)");
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java
index b74b3c166e..e4a07336a2 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java
@@ -7,7 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
-import c.a.i.k2;
+import c.a.i.m2;
 import com.discord.models.guild.Guild;
 import com.discord.utilities.color.ColorCompatKt;
 import com.discord.utilities.drawable.DrawableCompat;
@@ -20,31 +20,31 @@ import d0.z.d.m;
 import kotlin.jvm.functions.Function1;
 /* compiled from: PremiumGuildConfirmationView.kt */
 public final class PremiumGuildConfirmationView extends CardView {
-    public final k2 i;
+    public final m2 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public PremiumGuildConfirmationView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(getContext()).inflate(2131558777, this);
-        int i = 2131364248;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364248);
+        int i = 2131364292;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364292);
         if (simpleDraweeView != null) {
-            i = 2131364249;
-            TextView textView = (TextView) findViewById(2131364249);
+            i = 2131364293;
+            TextView textView = (TextView) findViewById(2131364293);
             if (textView != null) {
-                i = 2131364250;
-                Chip chip = (Chip) findViewById(2131364250);
+                i = 2131364294;
+                Chip chip = (Chip) findViewById(2131364294);
                 if (chip != null) {
-                    i = 2131364251;
-                    Chip chip2 = (Chip) findViewById(2131364251);
+                    i = 2131364295;
+                    Chip chip2 = (Chip) findViewById(2131364295);
                     if (chip2 != null) {
-                        i = 2131364252;
-                        ImageView imageView = (ImageView) findViewById(2131364252);
+                        i = 2131364296;
+                        ImageView imageView = (ImageView) findViewById(2131364296);
                         if (imageView != null) {
-                            k2 k2Var = new k2(this, simpleDraweeView, textView, chip, chip2, imageView);
-                            m.checkNotNullExpressionValue(k2Var, "ViewPremiumGuildConfirma…ater.from(context), this)");
-                            this.i = k2Var;
+                            m2 m2Var = new m2(this, simpleDraweeView, textView, chip, chip2, imageView);
+                            m.checkNotNullExpressionValue(m2Var, "ViewPremiumGuildConfirma…ater.from(context), this)");
+                            this.i = m2Var;
                             return;
                         }
                     }
@@ -62,7 +62,7 @@ public final class PremiumGuildConfirmationView extends CardView {
         SimpleDraweeView simpleDraweeView = this.i.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.premiumGuildConfirmationAvatar");
         IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForGuild$default(guild, null, false, null, 14, null), 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
-        TextView textView = this.i.f116c;
+        TextView textView = this.i.f126c;
         m.checkNotNullExpressionValue(textView, "binding.premiumGuildConfirmationGuildName");
         textView.setText(guild.getName());
         Chip chip = this.i.d;
@@ -100,7 +100,7 @@ public final class PremiumGuildConfirmationView extends CardView {
 
     public final int c(int i) {
         if (i == 0) {
-            return 2131231673;
+            return 2131231679;
         }
         if (i == 1) {
             Context context = getContext();
@@ -120,7 +120,7 @@ public final class PremiumGuildConfirmationView extends CardView {
     }
 
     public final String d(int i) {
-        String string = i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892156) : getContext().getString(2131892155) : getContext().getString(2131892154) : getContext().getString(2131892009);
+        String string = i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892227) : getContext().getString(2131892226) : getContext().getString(2131892225) : getContext().getString(2131892080);
         m.checkNotNullExpressionValue(string, "when (premiumTier) {\n   …       else -> \"\"\n      }");
         return string;
     }
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java
index c9e66a9e39..ab35f577c3 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java
@@ -9,13 +9,13 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import c.a.i.m2;
+import c.a.i.o2;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.premium.PremiumGuildSubscriptionUtils;
 import d0.z.d.m;
 /* compiled from: PremiumGuildProgressView.kt */
 public final class PremiumGuildProgressView extends FrameLayout {
-    public final m2 i;
+    public final o2 i;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public PremiumGuildProgressView(Context context, AttributeSet attributeSet) {
@@ -23,18 +23,18 @@ public final class PremiumGuildProgressView extends FrameLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(getContext()).inflate(2131558780, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364359;
-        ImageView imageView = (ImageView) inflate.findViewById(2131364359);
+        int i = 2131364397;
+        ImageView imageView = (ImageView) inflate.findViewById(2131364397);
         if (imageView != null) {
-            i = 2131364361;
-            TextView textView = (TextView) inflate.findViewById(2131364361);
+            i = 2131364399;
+            TextView textView = (TextView) inflate.findViewById(2131364399);
             if (textView != null) {
-                i = 2131364362;
-                ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364362);
+                i = 2131364400;
+                ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364400);
                 if (progressBar != null) {
-                    m2 m2Var = new m2((FrameLayout) inflate, imageView, textView, progressBar);
-                    m.checkNotNullExpressionValue(m2Var, "ViewPremiumGuildProgress…rom(context), this, true)");
-                    this.i = m2Var;
+                    o2 o2Var = new o2((FrameLayout) inflate, imageView, textView, progressBar);
+                    m.checkNotNullExpressionValue(o2Var, "ViewPremiumGuildProgress…rom(context), this, true)");
+                    this.i = o2Var;
                     return;
                 }
             }
@@ -50,16 +50,16 @@ public final class PremiumGuildProgressView extends FrameLayout {
             m.checkNotNullExpressionValue(context, "context");
             i3 = DrawableCompat.getThemedDrawableRes$default(context, 2130968721, 0, 2, (Object) null);
         } else if (i == 1) {
-            i3 = 2131231444;
+            i3 = 2131231450;
         } else if (i == 2) {
-            i3 = 2131231445;
+            i3 = 2131231451;
         } else if (i == 3) {
-            i3 = 2131231446;
+            i3 = 2131231452;
         }
         imageView.setImageResource(i3);
-        TextView textView = this.i.f127c;
+        TextView textView = this.i.f136c;
         m.checkNotNullExpressionValue(textView, "binding.progressLevelText");
-        textView.setText(i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892156) : getContext().getString(2131892155) : getContext().getString(2131892154) : getContext().getString(2131892009));
+        textView.setText(i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892227) : getContext().getString(2131892226) : getContext().getString(2131892225) : getContext().getString(2131892080));
         ProgressBar progressBar = this.i.d;
         m.checkNotNullExpressionValue(progressBar, "binding.progressProgress");
         progressBar.setProgress(PremiumGuildSubscriptionUtils.INSTANCE.calculatePercentToNextTier(i, i2));
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java
index bbbf8fd7e1..3d1d12239d 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.r2;
+import c.a.i.t2;
 import c.a.l.b;
 import com.discord.api.premium.PremiumTier;
 import com.discord.i18n.RenderContext;
@@ -23,7 +23,7 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: PremiumGuildSubscriptionUpsellView.kt */
 public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
-    public final r2 i;
+    public final t2 i;
 
     /* compiled from: PremiumGuildSubscriptionUpsellView.kt */
     public static final class a extends o implements Function1<RenderContext, Unit> {
@@ -52,18 +52,18 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558786, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365507;
-        TextView textView = (TextView) inflate.findViewById(2131365507);
+        int i = 2131365568;
+        TextView textView = (TextView) inflate.findViewById(2131365568);
         if (textView != null) {
-            i = 2131365508;
-            TextView textView2 = (TextView) inflate.findViewById(2131365508);
+            i = 2131365569;
+            TextView textView2 = (TextView) inflate.findViewById(2131365569);
             if (textView2 != null) {
-                i = 2131365509;
-                TextView textView3 = (TextView) inflate.findViewById(2131365509);
+                i = 2131365570;
+                TextView textView3 = (TextView) inflate.findViewById(2131365570);
                 if (textView3 != null) {
-                    r2 r2Var = new r2((LinearLayout) inflate, textView, textView2, textView3);
-                    m.checkNotNullExpressionValue(r2Var, "ViewPremiumUpsellInfoBin…rom(context), this, true)");
-                    this.i = r2Var;
+                    t2 t2Var = new t2((LinearLayout) inflate, textView, textView2, textView3);
+                    m.checkNotNullExpressionValue(t2Var, "ViewPremiumUpsellInfoBin…rom(context), this, true)");
+                    this.i = t2Var;
                     return;
                 }
             }
@@ -73,7 +73,7 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
 
     public final void a(PremiumTier premiumTier, boolean z2) {
         m.checkNotNullParameter(premiumTier, "userPremiumTier");
-        TextView textView = this.i.f147c;
+        TextView textView = this.i.f158c;
         m.checkNotNullExpressionValue(textView, "binding.viewPremiumUpsellInfoSubheadingBlurb");
         textView.setVisibility(z2 ? 0 : 8);
         SubscriptionPlanType subscriptionPlanType = SubscriptionPlanType.PREMIUM_GUILD_MONTH;
@@ -84,29 +84,29 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout {
         Context context2 = getContext();
         m.checkNotNullExpressionValue(context2, "context");
         CharSequence i2 = b.i(this, 2131886948, new Object[]{PremiumUtilsKt.getFormattedPriceUsd((int) (((float) subscriptionPlanType.getPrice()) * 0.7f), context2)}, null, 4);
-        CharSequence i3 = b.i(this, 2131889832, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4);
+        CharSequence i3 = b.i(this, 2131889840, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4);
         Context context3 = getContext();
         m.checkNotNullExpressionValue(context3, "context");
-        CharSequence a2 = b.a(context3, 2131889841, new Object[]{i2, i}, new a(this));
+        CharSequence a2 = b.a(context3, 2131889849, new Object[]{i2, i}, new a(this));
         int ordinal = premiumTier.ordinal();
         if (ordinal == 1) {
             TextView textView2 = this.i.b;
             m.checkNotNullExpressionValue(textView2, "binding.viewPremiumUpsellInfoSubheading");
-            b.n(textView2, 2131889840, new Object[]{i}, null, 4);
+            b.m(textView2, 2131889848, new Object[]{i}, null, 4);
             TextView textView3 = this.i.d;
             m.checkNotNullExpressionValue(textView3, "binding.viewPremiumUpsellInfoSubheadingPrice");
             ViewExtensions.setTextAndVisibilityBy(textView3, null);
         } else if (ordinal == 2) {
             TextView textView4 = this.i.b;
             m.checkNotNullExpressionValue(textView4, "binding.viewPremiumUpsellInfoSubheading");
-            b.n(textView4, 2131889845, new Object[]{i3}, null, 4);
+            b.m(textView4, 2131889853, new Object[]{i3}, null, 4);
             TextView textView5 = this.i.d;
             m.checkNotNullExpressionValue(textView5, "binding.viewPremiumUpsellInfoSubheadingPrice");
             ViewExtensions.setTextAndVisibilityBy(textView5, a2);
         } else if (ordinal == 3) {
             TextView textView6 = this.i.b;
             m.checkNotNullExpressionValue(textView6, "binding.viewPremiumUpsellInfoSubheading");
-            b.n(textView6, 2131889847, new Object[]{String.valueOf(2), i3}, null, 4);
+            b.m(textView6, 2131889855, new Object[]{String.valueOf(2), i3}, null, 4);
             TextView textView7 = this.i.d;
             m.checkNotNullExpressionValue(textView7, "binding.viewPremiumUpsellInfoSubheadingPrice");
             ViewExtensions.setTextAndVisibilityBy(textView7, a2);
diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java
index 1e4e1bdd43..bb51799834 100644
--- a/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java
+++ b/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import c.a.i.n2;
+import c.a.i.p2;
 import c.a.l.b;
 import com.discord.api.premium.PremiumTier;
 import com.discord.utilities.KotlinExtensionsKt;
@@ -22,7 +22,7 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 /* compiled from: PremiumSubscriptionMarketingView.kt */
 public final class PremiumSubscriptionMarketingView extends FrameLayout {
-    public final n2 i;
+    public final p2 i;
 
     /* compiled from: PremiumSubscriptionMarketingView.kt */
     public static final class a implements View.OnClickListener {
@@ -44,34 +44,34 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558782, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365498;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365498);
+        int i = 2131365559;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365559);
         if (linearLayout != null) {
-            i = 2131365499;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365499);
+            i = 2131365560;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365560);
             if (materialButton != null) {
                 LinearLayout linearLayout2 = (LinearLayout) inflate;
-                i = 2131365501;
-                TextView textView = (TextView) inflate.findViewById(2131365501);
+                i = 2131365562;
+                TextView textView = (TextView) inflate.findViewById(2131365562);
                 if (textView != null) {
-                    i = 2131365502;
-                    TextView textView2 = (TextView) inflate.findViewById(2131365502);
+                    i = 2131365563;
+                    TextView textView2 = (TextView) inflate.findViewById(2131365563);
                     if (textView2 != null) {
-                        i = 2131365503;
-                        TextView textView3 = (TextView) inflate.findViewById(2131365503);
+                        i = 2131365564;
+                        TextView textView3 = (TextView) inflate.findViewById(2131365564);
                         if (textView3 != null) {
-                            i = 2131365504;
-                            TextView textView4 = (TextView) inflate.findViewById(2131365504);
+                            i = 2131365565;
+                            TextView textView4 = (TextView) inflate.findViewById(2131365565);
                             if (textView4 != null) {
-                                i = 2131365505;
-                                TextView textView5 = (TextView) inflate.findViewById(2131365505);
+                                i = 2131365566;
+                                TextView textView5 = (TextView) inflate.findViewById(2131365566);
                                 if (textView5 != null) {
-                                    i = 2131365506;
-                                    TextView textView6 = (TextView) inflate.findViewById(2131365506);
+                                    i = 2131365567;
+                                    TextView textView6 = (TextView) inflate.findViewById(2131365567);
                                     if (textView6 != null) {
-                                        n2 n2Var = new n2(linearLayout2, linearLayout, materialButton, linearLayout2, textView, textView2, textView3, textView4, textView5, textView6);
-                                        m.checkNotNullExpressionValue(n2Var, "ViewPremiumMarketingBind…rom(context), this, true)");
-                                        this.i = n2Var;
+                                        p2 p2Var = new p2(linearLayout2, linearLayout, materialButton, linearLayout2, textView, textView2, textView3, textView4, textView5, textView6);
+                                        m.checkNotNullExpressionValue(p2Var, "ViewPremiumMarketingBind…rom(context), this, true)");
+                                        this.i = p2Var;
                                         return;
                                     }
                                 }
@@ -95,17 +95,17 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
         m.checkNotNullExpressionValue(textView, "binding.viewPremiumMarketingNitroBoostDiscount");
         NumberFormat percentInstance = NumberFormat.getPercentInstance();
         Float valueOf = Float.valueOf(0.3f);
-        b.n(textView, 2131889832, new Object[]{percentInstance.format(valueOf)}, null, 4);
+        b.m(textView, 2131889840, new Object[]{percentInstance.format(valueOf)}, null, 4);
         TextView textView2 = this.i.g;
         m.checkNotNullExpressionValue(textView2, "binding.viewPremiumMarketingNitroBoostCount");
-        b.n(textView2, 2131889834, new Object[]{i18nPluralString}, null, 4);
+        b.m(textView2, 2131889842, new Object[]{i18nPluralString}, null, 4);
         TextView textView3 = this.i.j;
         m.checkNotNullExpressionValue(textView3, "binding.viewPremiumMarke…NitroClassicBoostDiscount");
-        b.n(textView3, 2131889832, new Object[]{NumberFormat.getPercentInstance().format(valueOf)}, null, 4);
+        b.m(textView3, 2131889840, new Object[]{NumberFormat.getPercentInstance().format(valueOf)}, null, 4);
         TextView textView4 = this.i.i;
         m.checkNotNullExpressionValue(textView4, "binding.viewPremiumMarketingNitroClassicBoostCount");
-        b.n(textView4, 2131889833, new Object[]{i18nPluralString}, null, 4);
-        this.i.f130c.setOnClickListener(new a(function0));
+        b.m(textView4, 2131889841, new Object[]{i18nPluralString}, null, 4);
+        this.i.f142c.setOnClickListener(new a(function0));
         int ordinal = premiumTier.ordinal();
         if (ordinal == 0) {
             unit = Unit.a;
@@ -118,7 +118,7 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
             linearLayout2.setVisibility(0);
             TextView textView5 = this.i.f;
             m.checkNotNullExpressionValue(textView5, "binding.viewPremiumMarketingMarketingTitle");
-            ViewExtensions.setTextAndVisibilityBy(textView5, b.i(this, 2131889836, new Object[0], null, 4));
+            ViewExtensions.setTextAndVisibilityBy(textView5, b.i(this, 2131889844, new Object[0], null, 4));
             TextView textView6 = this.i.e;
             m.checkNotNullExpressionValue(textView6, "binding.viewPremiumMarketingMarketingSubtitle");
             textView6.setVisibility(8);
@@ -132,10 +132,10 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout {
             linearLayout4.setVisibility(8);
             TextView textView7 = this.i.f;
             m.checkNotNullExpressionValue(textView7, "binding.viewPremiumMarketingMarketingTitle");
-            ViewExtensions.setTextAndVisibilityBy(textView7, b.i(this, 2131889837, new Object[0], null, 4));
+            ViewExtensions.setTextAndVisibilityBy(textView7, b.i(this, 2131889845, new Object[0], null, 4));
             TextView textView8 = this.i.e;
             m.checkNotNullExpressionValue(textView8, "binding.viewPremiumMarketingMarketingSubtitle");
-            ViewExtensions.setTextAndVisibilityBy(textView8, b.i(this, 2131889838, new Object[]{String.valueOf(2)}, null, 4));
+            ViewExtensions.setTextAndVisibilityBy(textView8, b.i(this, 2131889846, new Object[]{String.valueOf(2)}, null, 4));
             unit = Unit.a;
         } else if (ordinal == 3) {
             LinearLayout linearLayout5 = this.i.d;
diff --git a/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java b/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java
index 2d40b80801..6204695845 100644
--- a/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java
+++ b/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java
@@ -23,11 +23,11 @@ public final class CardSegment extends CardView implements a {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(getContext()).inflate(2131558443, this);
-        int i = 2131362219;
-        TextView textView = (TextView) findViewById(2131362219);
+        int i = 2131362230;
+        TextView textView = (TextView) findViewById(2131362230);
         if (textView != null) {
-            i = 2131362220;
-            TextView textView2 = (TextView) findViewById(2131362220);
+            i = 2131362231;
+            TextView textView2 = (TextView) findViewById(2131362231);
             if (textView2 != null) {
                 f fVar = new f(this, textView, textView2);
                 m.checkNotNullExpressionValue(fVar, "CardSegmentViewBinding.i…ater.from(context), this)");
diff --git a/app/src/main/java/com/discord/views/steps/StepsView.java b/app/src/main/java/com/discord/views/steps/StepsView.java
index 1140406da3..068caebbcf 100644
--- a/app/src/main/java/com/discord/views/steps/StepsView.java
+++ b/app/src/main/java/com/discord/views/steps/StepsView.java
@@ -13,7 +13,7 @@ import androidx.annotation.LayoutRes;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
-import c.a.i.k3;
+import c.a.i.n3;
 import com.discord.app.AppFragment;
 import com.discord.views.LoadingButton;
 import com.google.android.material.button.MaterialButton;
@@ -27,7 +27,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: StepsView.kt */
 public final class StepsView extends RelativeLayout {
     public static final /* synthetic */ int i = 0;
-    public final k3 j;
+    public final n3 j;
     public d k;
     public ViewPager2.OnPageChangeCallback l;
 
@@ -86,7 +86,7 @@ public final class StepsView extends RelativeLayout {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2120c;
+        public final int f2127c;
         public final Function1<View, Unit> d;
         public final Function1<View, Unit> e;
         public final Function1<View, Unit> f;
@@ -107,14 +107,14 @@ public final class StepsView extends RelativeLayout {
             public final boolean r;
 
             /* renamed from: s  reason: collision with root package name */
-            public final boolean f2121s;
+            public final boolean f2128s;
 
             /* JADX WARNING: Illegal instructions before constructor call */
             public a(Class cls, int i, int i2, int i3, Function1 function1, Function1 function12, Function1 function13, boolean z2, boolean z3, boolean z4, int i4) {
                 super(r13, r14, r15, null, null, r8, r7, r6, r5, null);
-                int i5 = (i4 & 2) != 0 ? 2131891362 : i;
+                int i5 = (i4 & 2) != 0 ? 2131891433 : i;
                 int i6 = (i4 & 4) != 0 ? 2131886808 : i2;
-                int i7 = (i4 & 8) != 0 ? 2131888176 : i3;
+                int i7 = (i4 & 8) != 0 ? 2131888175 : i3;
                 int i8 = i4 & 16;
                 int i9 = i4 & 32;
                 Function1 function14 = (i4 & 64) != 0 ? null : function13;
@@ -131,7 +131,7 @@ public final class StepsView extends RelativeLayout {
                 this.p = function14;
                 this.q = z5;
                 this.r = z6;
-                this.f2121s = z7;
+                this.f2128s = z7;
             }
 
             public boolean equals(Object obj) {
@@ -142,7 +142,7 @@ public final class StepsView extends RelativeLayout {
                     return false;
                 }
                 a aVar = (a) obj;
-                return m.areEqual(this.j, aVar.j) && this.k == aVar.k && this.l == aVar.l && this.m == aVar.m && m.areEqual(this.n, aVar.n) && m.areEqual(this.o, aVar.o) && m.areEqual(this.p, aVar.p) && this.q == aVar.q && this.r == aVar.r && this.f2121s == aVar.f2121s;
+                return m.areEqual(this.j, aVar.j) && this.k == aVar.k && this.l == aVar.l && this.m == aVar.m && m.areEqual(this.n, aVar.n) && m.areEqual(this.o, aVar.o) && m.areEqual(this.p, aVar.p) && this.q == aVar.q && this.r == aVar.r && this.f2128s == aVar.f2128s;
             }
 
             public int hashCode() {
@@ -175,7 +175,7 @@ public final class StepsView extends RelativeLayout {
                 int i9 = z3 ? 1 : 0;
                 int i10 = z3 ? 1 : 0;
                 int i11 = (i7 + i8) * 31;
-                boolean z4 = this.f2121s;
+                boolean z4 = this.f2128s;
                 if (!z4) {
                     i3 = z4 ? 1 : 0;
                 }
@@ -202,7 +202,7 @@ public final class StepsView extends RelativeLayout {
                 L.append(", canCancel=");
                 L.append(this.r);
                 L.append(", allowScroll=");
-                return c.d.b.a.a.G(L, this.f2121s, ")");
+                return c.d.b.a.a.G(L, this.f2128s, ")");
             }
         }
 
@@ -232,7 +232,7 @@ public final class StepsView extends RelativeLayout {
         public b(int i, int i2, int i3, Function1 function1, Function1 function12, Function1 function13, boolean z2, boolean z3, boolean z4, DefaultConstructorMarker defaultConstructorMarker) {
             this.a = i;
             this.b = i2;
-            this.f2120c = i3;
+            this.f2127c = i3;
             this.d = function1;
             this.e = function12;
             this.f = function13;
@@ -288,19 +288,19 @@ public final class StepsView extends RelativeLayout {
         public final /* synthetic */ Function1 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ Function0 f2122c;
+        public final /* synthetic */ Function0 f2129c;
 
         public e(StepsView stepsView, Function1 function1, Function0 function0) {
             this.a = stepsView;
             this.b = function1;
-            this.f2122c = function0;
+            this.f2129c = function0;
         }
 
         @Override // androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
         public void onPageSelected(int i) {
             this.b.invoke(Integer.valueOf(i));
             StepsView stepsView = this.a;
-            Function0<Unit> function0 = this.f2122c;
+            Function0<Unit> function0 = this.f2129c;
             int i2 = StepsView.i;
             stepsView.c(i, function0);
         }
@@ -361,29 +361,29 @@ public final class StepsView extends RelativeLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131558816, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(2131558819, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131365064;
-        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365064);
+        int i2 = 2131365118;
+        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365118);
         if (linearLayout != null) {
-            i2 = 2131365065;
-            TextView textView = (TextView) inflate.findViewById(2131365065);
+            i2 = 2131365119;
+            TextView textView = (TextView) inflate.findViewById(2131365119);
             if (textView != null) {
-                i2 = 2131365066;
-                ImageView imageView = (ImageView) inflate.findViewById(2131365066);
+                i2 = 2131365120;
+                ImageView imageView = (ImageView) inflate.findViewById(2131365120);
                 if (imageView != null) {
-                    i2 = 2131365067;
-                    LoadingButton loadingButton = (LoadingButton) inflate.findViewById(2131365067);
+                    i2 = 2131365121;
+                    LoadingButton loadingButton = (LoadingButton) inflate.findViewById(2131365121);
                     if (loadingButton != null) {
-                        i2 = 2131365068;
-                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365068);
+                        i2 = 2131365122;
+                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365122);
                         if (materialButton != null) {
-                            i2 = 2131365069;
-                            ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(2131365069);
+                            i2 = 2131365123;
+                            ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(2131365123);
                             if (viewPager2 != null) {
-                                k3 k3Var = new k3((RelativeLayout) inflate, linearLayout, textView, imageView, loadingButton, materialButton, viewPager2);
-                                m.checkNotNullExpressionValue(k3Var, "ViewStepsBinding.inflate…rom(context), this, true)");
-                                this.j = k3Var;
+                                n3 n3Var = new n3((RelativeLayout) inflate, linearLayout, textView, imageView, loadingButton, materialButton, viewPager2);
+                                m.checkNotNullExpressionValue(n3Var, "ViewStepsBinding.inflate…rom(context), this, true)");
+                                this.j = n3Var;
                                 setIsLoading(false);
                                 return;
                             }
@@ -433,16 +433,16 @@ public final class StepsView extends RelativeLayout {
             ViewPager2 viewPager2 = this.j.g;
             m.checkNotNullExpressionValue(viewPager2, "binding.stepsViewpager");
             viewPager2.setUserInputEnabled(((b) list.get(i2)).i);
-            TextView textView = this.j.f117c;
+            TextView textView = this.j.f133c;
             m.checkNotNullExpressionValue(textView, "binding.stepsCancel");
             textView.setText(getContext().getString(((b) list.get(i2)).b));
-            this.j.e.setText(getContext().getString(((b) list.get(i2)).f2120c));
+            this.j.e.setText(getContext().getString(((b) list.get(i2)).f2127c));
             MaterialButton materialButton = this.j.f;
             m.checkNotNullExpressionValue(materialButton, "binding.stepsNext");
             materialButton.setText(getContext().getString(((b) list.get(i2)).a));
             int i3 = 0;
             this.j.f.setOnClickListener(new a(0, i2, this, list));
-            this.j.f117c.setOnClickListener(new g(this, list, i2, function0));
+            this.j.f133c.setOnClickListener(new g(this, list, i2, function0));
             boolean z2 = true;
             this.j.e.setOnClickListener(new a(1, i2, list, function0));
             d dVar2 = this.k;
@@ -450,7 +450,7 @@ public final class StepsView extends RelativeLayout {
             MaterialButton materialButton2 = this.j.f;
             m.checkNotNullExpressionValue(materialButton2, "binding.stepsNext");
             materialButton2.setVisibility(!z3 && ((b) list.get(i2)).g ? 0 : 8);
-            TextView textView2 = this.j.f117c;
+            TextView textView2 = this.j.f133c;
             m.checkNotNullExpressionValue(textView2, "binding.stepsCancel");
             textView2.setVisibility(!z3 && ((b) list.get(i2)).h ? 0 : 8);
             LoadingButton loadingButton = this.j.e;
@@ -461,7 +461,7 @@ public final class StepsView extends RelativeLayout {
             MaterialButton materialButton3 = this.j.f;
             m.checkNotNullExpressionValue(materialButton3, "binding.stepsNext");
             if (!(materialButton3.getVisibility() == 0)) {
-                TextView textView3 = this.j.f117c;
+                TextView textView3 = this.j.f133c;
                 m.checkNotNullExpressionValue(textView3, "binding.stepsCancel");
                 if (!(textView3.getVisibility() == 0)) {
                     LoadingButton loadingButton2 = this.j.e;
diff --git a/app/src/main/java/com/discord/views/sticker/StickerView.java b/app/src/main/java/com/discord/views/sticker/StickerView.java
index 9809cda7e3..76c674e7ef 100644
--- a/app/src/main/java/com/discord/views/sticker/StickerView.java
+++ b/app/src/main/java/com/discord/views/sticker/StickerView.java
@@ -6,13 +6,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import c.a.i.h1;
+import c.a.i.i1;
 import c.a.l.b;
 import c.a.z.o0.a;
 import c.a.z.o0.d;
 import c.a.z.o0.e;
 import c.a.z.o0.f;
 import c.a.z.o0.h;
+import c.f.g.e.v;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerFormatType;
@@ -26,6 +27,8 @@ import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.logging.Logger;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.facebook.drawee.drawable.ScalingUtils$ScaleType;
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 import java.io.File;
@@ -37,7 +40,7 @@ import rx.Observable;
 import rx.Subscription;
 /* compiled from: StickerView.kt */
 public final class StickerView extends FrameLayout {
-    public final h1 i;
+    public final i1 i;
     public BaseSticker j;
     public Subscription k;
     public Job l;
@@ -47,18 +50,18 @@ public final class StickerView extends FrameLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(getContext()).inflate(2131558673, this);
-        int i = 2131365110;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365110);
+        int i = 2131365165;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365165);
         if (simpleDraweeView != null) {
-            i = 2131365111;
-            RLottieImageView rLottieImageView = (RLottieImageView) findViewById(2131365111);
+            i = 2131365166;
+            RLottieImageView rLottieImageView = (RLottieImageView) findViewById(2131365166);
             if (rLottieImageView != null) {
-                i = 2131365112;
-                ImageView imageView = (ImageView) findViewById(2131365112);
+                i = 2131365167;
+                ImageView imageView = (ImageView) findViewById(2131365167);
                 if (imageView != null) {
-                    h1 h1Var = new h1(this, simpleDraweeView, rLottieImageView, imageView);
-                    m.checkNotNullExpressionValue(h1Var, "StickerViewBinding.infla…ater.from(context), this)");
-                    this.i = h1Var;
+                    i1 i1Var = new i1(this, simpleDraweeView, rLottieImageView, imageView);
+                    m.checkNotNullExpressionValue(i1Var, "StickerViewBinding.infla…ater.from(context), this)");
+                    this.i = i1Var;
                     return;
                 }
             }
@@ -86,16 +89,16 @@ public final class StickerView extends FrameLayout {
             m.checkNotNullExpressionValue(context, "context");
             StringBuilder sb = new StringBuilder();
             Sticker sticker = (Sticker) baseSticker;
-            sb.append(sticker.g());
+            sb.append(sticker.h());
             sb.append(", ");
-            sb.append(sticker.e());
-            return b.g(context, 2131893517, new Object[]{sb.toString()}, null, 4);
+            sb.append(sticker.f());
+            return b.g(context, 2131893601, new Object[]{sb.toString()}, null, 4);
         } else if (!(baseSticker instanceof StickerPartial)) {
             return null;
         } else {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return b.g(context2, 2131893517, new Object[]{((StickerPartial) baseSticker).d()}, null, 4);
+            return b.g(context2, 2131893601, new Object[]{((StickerPartial) baseSticker).d()}, null, 4);
         }
     }
 
@@ -124,7 +127,7 @@ public final class StickerView extends FrameLayout {
             ImageView imageView = this.i.d;
             m.checkNotNullExpressionValue(imageView, "binding.stickerViewPlaceholder");
             imageView.setVisibility(8);
-            RLottieImageView rLottieImageView = this.i.f99c;
+            RLottieImageView rLottieImageView = this.i.f104c;
             m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie");
             rLottieImageView.setVisibility(8);
             SimpleDraweeView simpleDraweeView2 = this.i.b;
@@ -133,17 +136,29 @@ public final class StickerView extends FrameLayout {
             SimpleDraweeView simpleDraweeView3 = this.i.b;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.stickerViewImageview");
             MGImages.setImage$default(simpleDraweeView3, StickerUtils.getCDNAssetUrl$default(StickerUtils.INSTANCE, baseSticker, null, false, 6, null), 0, 0, false, null, null, 124, null);
-        } else if (ordinal == 2) {
             SimpleDraweeView simpleDraweeView4 = this.i.b;
             m.checkNotNullExpressionValue(simpleDraweeView4, "binding.stickerViewImageview");
-            simpleDraweeView4.setVisibility(0);
+            GenericDraweeHierarchy hierarchy = simpleDraweeView4.getHierarchy();
+            m.checkNotNullExpressionValue(hierarchy, "binding.stickerViewImageview.hierarchy");
+            ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
+            hierarchy.n(v.l);
+        } else if (ordinal == 2) {
+            SimpleDraweeView simpleDraweeView5 = this.i.b;
+            m.checkNotNullExpressionValue(simpleDraweeView5, "binding.stickerViewImageview");
+            simpleDraweeView5.setVisibility(0);
             ImageView imageView2 = this.i.d;
             m.checkNotNullExpressionValue(imageView2, "binding.stickerViewPlaceholder");
             imageView2.setVisibility(0);
-            RLottieImageView rLottieImageView2 = this.i.f99c;
+            RLottieImageView rLottieImageView2 = this.i.f104c;
             m.checkNotNullExpressionValue(rLottieImageView2, "binding.stickerViewLottie");
             rLottieImageView2.setVisibility(8);
             this.i.b.setImageDrawable(null);
+            SimpleDraweeView simpleDraweeView6 = this.i.b;
+            m.checkNotNullExpressionValue(simpleDraweeView6, "binding.stickerViewImageview");
+            GenericDraweeHierarchy hierarchy2 = simpleDraweeView6.getHierarchy();
+            m.checkNotNullExpressionValue(hierarchy2, "binding.stickerViewImageview.hierarchy");
+            ScalingUtils$ScaleType scalingUtils$ScaleType2 = ScalingUtils$ScaleType.a;
+            hierarchy2.n(v.l);
             Sticker sticker = baseSticker instanceof Sticker ? (Sticker) baseSticker : null;
             StickerUtils stickerUtils = StickerUtils.INSTANCE;
             Context context = getContext();
@@ -155,17 +170,17 @@ public final class StickerView extends FrameLayout {
             AppLog appLog = AppLog.g;
             Logger.e$default(appLog, "Invalid Sticker Format passed to " + StickerView.class + ", type: " + baseSticker.a(), null, null, 6, null);
         } else {
-            SimpleDraweeView simpleDraweeView5 = this.i.b;
-            m.checkNotNullExpressionValue(simpleDraweeView5, "binding.stickerViewImageview");
-            simpleDraweeView5.setVisibility(8);
+            SimpleDraweeView simpleDraweeView7 = this.i.b;
+            m.checkNotNullExpressionValue(simpleDraweeView7, "binding.stickerViewImageview");
+            simpleDraweeView7.setVisibility(8);
             ImageView imageView3 = this.i.d;
             m.checkNotNullExpressionValue(imageView3, "binding.stickerViewPlaceholder");
             imageView3.setVisibility(0);
-            RLottieImageView rLottieImageView3 = this.i.f99c;
+            RLottieImageView rLottieImageView3 = this.i.f104c;
             m.checkNotNullExpressionValue(rLottieImageView3, "binding.stickerViewLottie");
             rLottieImageView3.setVisibility(0);
-            this.i.f99c.setImageDrawable(null);
-            this.i.f99c.clearAnimation();
+            this.i.f104c.setImageDrawable(null);
+            this.i.f104c.clearAnimation();
             StickerUtils stickerUtils2 = StickerUtils.INSTANCE;
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
@@ -198,7 +213,7 @@ public final class StickerView extends FrameLayout {
             if (ordinal == 1 || ordinal == 2) {
                 this.i.b.setOnClickListener(onClickListener);
             } else if (ordinal == 3) {
-                this.i.f99c.setOnClickListener(onClickListener);
+                this.i.f104c.setOnClickListener(onClickListener);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/views/typing/TypingDots.java b/app/src/main/java/com/discord/views/typing/TypingDots.java
index fbea7fddb6..42599d1077 100644
--- a/app/src/main/java/com/discord/views/typing/TypingDots.java
+++ b/app/src/main/java/com/discord/views/typing/TypingDots.java
@@ -4,14 +4,14 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.j1;
+import c.a.i.l1;
 import c.a.z.p0.a;
 import d0.t.n;
 import d0.z.d.m;
 /* compiled from: TypingDots.kt */
 public final class TypingDots extends ConstraintLayout {
     public static final /* synthetic */ int i = 0;
-    public final j1 j;
+    public final l1 j;
     public final int k;
     public final long l;
     public boolean m;
@@ -21,18 +21,18 @@ public final class TypingDots extends ConstraintLayout {
         super(context, attributeSet, 0);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558698, this);
-        int i2 = 2131365513;
-        TypingDot typingDot = (TypingDot) findViewById(2131365513);
+        int i2 = 2131365574;
+        TypingDot typingDot = (TypingDot) findViewById(2131365574);
         if (typingDot != null) {
-            i2 = 2131365514;
-            TypingDot typingDot2 = (TypingDot) findViewById(2131365514);
+            i2 = 2131365575;
+            TypingDot typingDot2 = (TypingDot) findViewById(2131365575);
             if (typingDot2 != null) {
-                i2 = 2131365515;
-                TypingDot typingDot3 = (TypingDot) findViewById(2131365515);
+                i2 = 2131365576;
+                TypingDot typingDot3 = (TypingDot) findViewById(2131365576);
                 if (typingDot3 != null) {
-                    j1 j1Var = new j1(this, typingDot, typingDot2, typingDot3);
-                    m.checkNotNullExpressionValue(j1Var, "TypingDotsViewBinding.in…ater.from(context), this)");
-                    this.j = j1Var;
+                    l1 l1Var = new l1(this, typingDot, typingDot2, typingDot3);
+                    m.checkNotNullExpressionValue(l1Var, "TypingDotsViewBinding.in…ater.from(context), this)");
+                    this.j = l1Var;
                     int integer = getResources().getInteger(2131427332);
                     this.k = integer;
                     this.l = (long) (((double) integer) / 1.5d);
@@ -48,7 +48,7 @@ public final class TypingDots extends ConstraintLayout {
         if (!(this.m && !z2)) {
             long j = z2 ? this.l : 0;
             this.j.b.a(j);
-            this.j.f109c.a(this.l + j);
+            this.j.f119c.a(this.l + j);
             TypingDot typingDot = this.j.d;
             long j2 = this.l;
             typingDot.a(j + j2 + j2);
@@ -57,8 +57,8 @@ public final class TypingDots extends ConstraintLayout {
     }
 
     public final void b() {
-        j1 j1Var = this.j;
-        for (TypingDot typingDot : n.listOf((Object[]) new TypingDot[]{j1Var.b, j1Var.f109c, j1Var.d})) {
+        l1 l1Var = this.j;
+        for (TypingDot typingDot : n.listOf((Object[]) new TypingDot[]{l1Var.b, l1Var.f119c, l1Var.d})) {
             typingDot.i.cancel();
             typingDot.j.cancel();
         }
diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
index 43945ed371..84e5116723 100644
--- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
+++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java
@@ -12,7 +12,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import androidx.annotation.ColorInt;
-import c.a.i.l1;
+import c.a.i.n1;
 import com.discord.R;
 import com.discord.models.member.GuildMember;
 import com.discord.models.presence.Presence;
@@ -25,6 +25,7 @@ import com.discord.utilities.streams.StreamContext;
 import com.discord.views.StatusView;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import d0.g0.t;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.TypeCastException;
@@ -32,7 +33,7 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: UserAvatarPresenceView.kt */
 public final class UserAvatarPresenceView extends RelativeLayout {
-    public final l1 i;
+    public final n1 i;
     public final MGImages.DistinctChangeDetector j;
     public int k;
     public Function1<? super Bitmap, Unit> l;
@@ -43,24 +44,27 @@ public final class UserAvatarPresenceView extends RelativeLayout {
         public final Presence b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final StreamContext f2123c;
-        public final GuildMember d;
+        public final StreamContext f2130c;
+        public final boolean d;
+        public final GuildMember e;
 
-        public a(User user, Presence presence, StreamContext streamContext, GuildMember guildMember) {
+        public a(User user, Presence presence, StreamContext streamContext, boolean z2, GuildMember guildMember) {
             m.checkNotNullParameter(user, "user");
             this.a = user;
             this.b = presence;
-            this.f2123c = streamContext;
-            this.d = guildMember;
+            this.f2130c = streamContext;
+            this.d = z2;
+            this.e = guildMember;
         }
 
-        public a(User user, Presence presence, StreamContext streamContext, GuildMember guildMember, int i) {
-            int i2 = i & 8;
+        public a(User user, Presence presence, StreamContext streamContext, boolean z2, GuildMember guildMember, int i) {
+            int i2 = i & 16;
             m.checkNotNullParameter(user, "user");
             this.a = user;
             this.b = presence;
-            this.f2123c = streamContext;
-            this.d = null;
+            this.f2130c = streamContext;
+            this.d = z2;
+            this.e = null;
         }
 
         public boolean equals(Object obj) {
@@ -71,7 +75,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
                 return false;
             }
             a aVar = (a) obj;
-            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2123c, aVar.f2123c) && m.areEqual(this.d, aVar.d);
+            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2130c, aVar.f2130c) && this.d == aVar.d && m.areEqual(this.e, aVar.e);
         }
 
         public int hashCode() {
@@ -80,13 +84,21 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             int hashCode = (user != null ? user.hashCode() : 0) * 31;
             Presence presence = this.b;
             int hashCode2 = (hashCode + (presence != null ? presence.hashCode() : 0)) * 31;
-            StreamContext streamContext = this.f2123c;
+            StreamContext streamContext = this.f2130c;
             int hashCode3 = (hashCode2 + (streamContext != null ? streamContext.hashCode() : 0)) * 31;
-            GuildMember guildMember = this.d;
+            boolean z2 = this.d;
+            if (z2) {
+                z2 = true;
+            }
+            int i2 = z2 ? 1 : 0;
+            int i3 = z2 ? 1 : 0;
+            int i4 = z2 ? 1 : 0;
+            int i5 = (hashCode3 + i2) * 31;
+            GuildMember guildMember = this.e;
             if (guildMember != null) {
                 i = guildMember.hashCode();
             }
-            return hashCode3 + i;
+            return i5 + i;
         }
 
         public String toString() {
@@ -95,9 +107,11 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             L.append(", presence=");
             L.append(this.b);
             L.append(", streamContext=");
-            L.append(this.f2123c);
-            L.append(", guildMember=");
+            L.append(this.f2130c);
+            L.append(", showPresence=");
             L.append(this.d);
+            L.append(", guildMember=");
+            L.append(this.e);
             L.append(")");
             return L.toString();
         }
@@ -169,25 +183,25 @@ public final class UserAvatarPresenceView extends RelativeLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558707, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362074;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362074);
+        int i = 2131362075;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362075);
         if (simpleDraweeView != null) {
-            i = 2131362075;
-            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131362075);
+            i = 2131362076;
+            FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131362076);
             if (frameLayout != null) {
-                i = 2131362076;
-                ImageView imageView = (ImageView) inflate.findViewById(2131362076);
+                i = 2131362077;
+                ImageView imageView = (ImageView) inflate.findViewById(2131362077);
                 if (imageView != null) {
-                    i = 2131365062;
-                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131365062);
+                    i = 2131365116;
+                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131365116);
                     if (simpleDraweeView2 != null) {
                         RelativeLayout relativeLayout = (RelativeLayout) inflate;
-                        i = 2131365368;
-                        StatusView statusView = (StatusView) inflate.findViewById(2131365368);
+                        i = 2131365428;
+                        StatusView statusView = (StatusView) inflate.findViewById(2131365428);
                         if (statusView != null) {
-                            l1 l1Var = new l1(relativeLayout, simpleDraweeView, frameLayout, imageView, simpleDraweeView2, relativeLayout, statusView);
-                            m.checkNotNullExpressionValue(l1Var, "UserAvatarPresenceViewBi…rom(context), this, true)");
-                            this.i = l1Var;
+                            n1 n1Var = new n1(relativeLayout, simpleDraweeView, frameLayout, imageView, simpleDraweeView2, relativeLayout, statusView);
+                            m.checkNotNullExpressionValue(n1Var, "UserAvatarPresenceViewBi…rom(context), this, true)");
+                            this.i = n1Var;
                             this.j = new MGImages.DistinctChangeDetector();
                             this.l = b.i;
                             TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.UserAvatarPresenceView);
@@ -211,12 +225,20 @@ public final class UserAvatarPresenceView extends RelativeLayout {
         boolean z2;
         String str;
         m.checkNotNullParameter(aVar, "viewState");
-        GuildMember guildMember = aVar.d;
+        GuildMember guildMember = aVar.e;
         User user = aVar.a;
+        int i = 0;
         if (guildMember == null || !guildMember.hasAvatar()) {
             String avatar = user.getAvatar();
-            z2 = avatar != null ? IconUtils.INSTANCE.isImageHashAnimated(avatar) : false;
-            str = IconUtils.getForUser$default(aVar.a, true, null, 4, null);
+            if (avatar == null || !t.startsWith$default(avatar, "data:", false, 2, null)) {
+                String avatar2 = user.getAvatar();
+                z2 = avatar2 != null ? IconUtils.INSTANCE.isImageHashAnimated(avatar2) : false;
+                str = IconUtils.getForUser$default(aVar.a, true, null, 4, null);
+            } else {
+                String avatar3 = user.getAvatar();
+                z2 = avatar3 != null && t.startsWith$default(avatar3, "data:image/gif", false, 2, null);
+                str = user.getAvatar();
+            }
         } else {
             String avatarHash = guildMember.getAvatarHash();
             z2 = avatarHash != null ? IconUtils.INSTANCE.isImageHashAnimated(avatarHash) : false;
@@ -231,6 +253,12 @@ public final class UserAvatarPresenceView extends RelativeLayout {
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.staticAvatar");
             IconUtils.setIcon$default(simpleDraweeView2, forUser$default, 0, new d(this), this.j, 4, (Object) null);
         }
+        StatusView statusView = this.i.e;
+        m.checkNotNullExpressionValue(statusView, "binding.userAvatarPresenceStatus");
+        if (!aVar.d) {
+            i = 8;
+        }
+        statusView.setVisibility(i);
         this.i.e.setPresence(aVar.b);
     }
 
@@ -238,7 +266,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
     public void onMeasure(int i, int i2) {
         super.onMeasure(i, i2);
         int size = View.MeasureSpec.getSize(i);
-        ImageView imageView = this.i.f122c;
+        ImageView imageView = this.i.f131c;
         m.checkNotNullExpressionValue(imageView, "binding.avatarCutout");
         ViewGroup.LayoutParams layoutParams = imageView.getLayoutParams();
         if (layoutParams != null) {
@@ -292,7 +320,7 @@ public final class UserAvatarPresenceView extends RelativeLayout {
 
     public final void setAvatarBackgroundColor(@ColorInt int i) {
         this.i.e.setBackgroundColor(i);
-        ImageView imageView = this.i.f122c;
+        ImageView imageView = this.i.f131c;
         m.checkNotNullExpressionValue(imageView, "binding.avatarCutout");
         ColorCompatKt.tintWithColor(imageView, i);
     }
diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java
index 699db7fb7f..7a8f98b779 100644
--- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java
+++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceViewController.java
@@ -20,7 +20,7 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
     public final StoreUser b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final StoreUserPresence f2124c;
+    public final StoreUserPresence f2131c;
     public final StreamContextService d;
 
     /* compiled from: UserAvatarPresenceViewController.kt */
@@ -35,7 +35,7 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
             ModelRichPresence modelRichPresence2 = modelRichPresence;
             StreamContext streamContext2 = streamContext;
             m.checkNotNullExpressionValue(user2, "user");
-            return new UserAvatarPresenceView.a(user2, modelRichPresence2 != null ? modelRichPresence2.getPresence() : null, streamContext2, null, 8);
+            return new UserAvatarPresenceView.a(user2, modelRichPresence2 != null ? modelRichPresence2.getPresence() : null, streamContext2, true, null, 16);
         }
     }
 
@@ -51,7 +51,7 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
         m.checkNotNullParameter(presences, "storeUserPresence");
         m.checkNotNullParameter(streamContextService2, "streamContextService");
         this.b = users;
-        this.f2124c = presences;
+        this.f2131c = presences;
         this.d = streamContextService2;
     }
 
@@ -65,10 +65,10 @@ public final class UserAvatarPresenceViewController extends RxViewController<Use
 
     @Override // com.discord.utilities.viewcontroller.RxViewController
     public Observable<UserAvatarPresenceView.a> observeState() {
-        Observable<R> G = this.b.observeUser(this.a).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable<UserAvatarPresenceView.a> i = Observable.i(G, ModelRichPresence.Companion.get(this.a, this.f2124c), this.d.getForUser(this.a, false), a.a);
-        m.checkNotNullExpressionValue(i, "Observable.combineLatest…reamContext\n      )\n    }");
+        Observable<R> F = this.b.observeUser(this.a).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable<UserAvatarPresenceView.a> i = Observable.i(F, ModelRichPresence.Companion.get(this.a, this.f2131c), this.d.getForUser(this.a, false), a.a);
+        m.checkNotNullExpressionValue(i, "Observable.combineLatest…nce = true,\n      )\n    }");
         return i;
     }
 }
diff --git a/app/src/main/java/com/discord/views/user/UserSummaryView.java b/app/src/main/java/com/discord/views/user/UserSummaryView.java
index cbaed4dd8c..b8e7c536fd 100644
--- a/app/src/main/java/com/discord/views/user/UserSummaryView.java
+++ b/app/src/main/java/com/discord/views/user/UserSummaryView.java
@@ -7,7 +7,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.r3;
+import c.a.i.u3;
 import com.discord.R;
 import com.discord.models.guild.UserGuildMember;
 import com.discord.models.user.CoreUser;
@@ -75,7 +75,7 @@ public final class UserSummaryView extends ConstraintLayout {
                     break;
                 }
                 int childCount = getChildCount();
-                r3 a = r3.a(LayoutInflater.from(getContext()).inflate(2131558824, (ViewGroup) this, false));
+                u3 a = u3.a(LayoutInflater.from(getContext()).inflate(2131558827, (ViewGroup) this, false));
                 m.checkNotNullExpressionValue(a, "ViewUserSummaryItemBindi…ext), this, false\n      )");
                 CutoutView cutoutView = a.a;
                 cutoutView.setId(childCount + 10);
@@ -94,7 +94,7 @@ public final class UserSummaryView extends ConstraintLayout {
             }
             int i3 = coerceAtMost - 1;
             while (i < coerceAtMost) {
-                r3 a2 = r3.a(getChildAt(i));
+                u3 a2 = u3.a(getChildAt(i));
                 m.checkNotNullExpressionValue(a2, "ViewUserSummaryItemBinding.bind(getChildAt(i))");
                 a2.a.setStyle(i == i3 ? CutoutView.a.d.a : this.i);
                 int mediaProxySize = IconUtils.getMediaProxySize(this.j);
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java
index 09effe64fd..4964037175 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java
@@ -22,38 +22,38 @@ public final /* synthetic */ class WidgetChannelFollowSheet$binding$2 extends k
 
     public final WidgetChannelFollowSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362255;
-        ImageView imageView = (ImageView) view.findViewById(2131362255);
+        int i = 2131362266;
+        ImageView imageView = (ImageView) view.findViewById(2131362266);
         if (imageView != null) {
-            i = 2131362256;
-            TextView textView = (TextView) view.findViewById(2131362256);
+            i = 2131362267;
+            TextView textView = (TextView) view.findViewById(2131362267);
             if (textView != null) {
-                i = 2131362257;
-                TextView textView2 = (TextView) view.findViewById(2131362257);
+                i = 2131362268;
+                TextView textView2 = (TextView) view.findViewById(2131362268);
                 if (textView2 != null) {
-                    i = 2131362258;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362258);
+                    i = 2131362269;
+                    ImageView imageView2 = (ImageView) view.findViewById(2131362269);
                     if (imageView2 != null) {
-                        i = 2131362259;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362259);
+                        i = 2131362270;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362270);
                         if (simpleDraweeView != null) {
-                            i = 2131362260;
-                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362260);
+                            i = 2131362271;
+                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362271);
                             if (materialCardView != null) {
-                                i = 2131362261;
-                                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131362261);
+                                i = 2131362272;
+                                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131362272);
                                 if (materialCardView2 != null) {
-                                    i = 2131362262;
-                                    TextView textView3 = (TextView) view.findViewById(2131362262);
+                                    i = 2131362273;
+                                    TextView textView3 = (TextView) view.findViewById(2131362273);
                                     if (textView3 != null) {
-                                        i = 2131362263;
-                                        TextView textView4 = (TextView) view.findViewById(2131362263);
+                                        i = 2131362274;
+                                        TextView textView4 = (TextView) view.findViewById(2131362274);
                                         if (textView4 != null) {
-                                            i = 2131362788;
-                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362788);
+                                            i = 2131362813;
+                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362813);
                                             if (materialButton != null) {
-                                                i = 2131363223;
-                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363223);
+                                                i = 2131363248;
+                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363248);
                                                 if (appViewFlipper != null) {
                                                     return new WidgetChannelFollowSheetBinding((NestedScrollView) view, imageView, textView, textView2, imageView2, simpleDraweeView, materialCardView, materialCardView2, textView3, textView4, materialButton, appViewFlipper);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java
index a786251283..66890c12fa 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java
@@ -19,6 +19,6 @@ public final class WidgetChannelFollowSheet$configureChannelSelector$1 implement
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSelector.Companion.launch(this.this$0, this.$selectedGuild.getId(), "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", false, 2131891440, new WidgetChannelFollowSheet.ChannelFollowChannelFilterFunction(this.$selectedGuild.getId(), this.$viewState.getAvailableChannels()));
+        WidgetChannelSelector.Companion.launch(this.this$0, this.$selectedGuild.getId(), "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", false, 2131891511, new WidgetChannelFollowSheet.ChannelFollowChannelFilterFunction(this.$selectedGuild.getId(), this.$viewState.getAvailableChannels()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$2.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$2.java
index e6e5168d0e..02e40dc44e 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$2.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$2.java
@@ -14,6 +14,6 @@ public final class WidgetChannelFollowSheet$configureChannelSelector$2 implement
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelFollowSheet.access$getViewModel$p(this.this$0).followChannel(this.$selectedChannel.g());
+        WidgetChannelFollowSheet.access$getViewModel$p(this.this$0).followChannel(this.$selectedChannel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
index b0e92197b7..cef2331dcf 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java
@@ -104,7 +104,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
         @Override // com.discord.widgets.channels.WidgetChannelSelector.FilterFunction
         public boolean includeChannel(Channel channel) {
             m.checkNotNullParameter(channel, "channel");
-            return this.channelIds.contains(Long.valueOf(channel.g())) && channel.e() == this.selectedGuildId;
+            return this.channelIds.contains(Long.valueOf(channel.h())) && channel.f() == this.selectedGuildId;
         }
 
         @Override // java.lang.Object
@@ -179,7 +179,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
             i = 2130968949;
             TextView textView2 = getBinding().g;
             m.checkNotNullExpressionValue(textView2, "binding.channelFollowSelectedChannelName");
-            textView2.setText(getString(2131893132));
+            textView2.setText(getString(2131893215));
             MaterialButton materialButton2 = getBinding().i;
             m.checkNotNullExpressionValue(materialButton2, "binding.createChannelFollowerButton");
             materialButton2.setEnabled(false);
@@ -197,7 +197,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
         TextView textView = getBinding().h;
         m.checkNotNullExpressionValue(textView, "binding.channelFollowSelectedGuildName");
         if (selectedGuild == null || (str = selectedGuild.getName()) == null) {
-            str = getString(2131893132);
+            str = getString(2131893215);
         }
         textView.setText(str);
         int i = selectedGuild != null ? 2130968946 : 2130968949;
@@ -231,13 +231,13 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
             configureChannelSelector(loaded);
         }
         if (loaded.getErrorTextRes() != null) {
-            getBinding().f1689c.setText(loaded.getErrorTextRes().intValue());
-            TextView textView2 = getBinding().f1689c;
+            getBinding().f1686c.setText(loaded.getErrorTextRes().intValue());
+            TextView textView2 = getBinding().f1686c;
             m.checkNotNullExpressionValue(textView2, "binding.channelFollowErrorText");
             textView2.setVisibility(0);
             return;
         }
-        TextView textView3 = getBinding().f1689c;
+        TextView textView3 = getBinding().f1686c;
         m.checkNotNullExpressionValue(textView3, "binding.channelFollowErrorText");
         textView3.setVisibility(8);
     }
@@ -256,7 +256,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558862;
+        return 2131558865;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
@@ -269,11 +269,11 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet {
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
     public void onResume() {
         super.onResume();
-        Observable<WidgetChannelFollowSheetViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        Observable<R> G = s2.y(WidgetChannelFollowSheet$onResume$$inlined$filterIs$1.INSTANCE).G(WidgetChannelFollowSheet$onResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(G, this), WidgetChannelFollowSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelFollowSheet$onResume$1(this), 62, (Object) null);
+        Observable<WidgetChannelFollowSheetViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        Observable<R> F = r.x(WidgetChannelFollowSheet$onResume$$inlined$filterIs$1.INSTANCE).F(WidgetChannelFollowSheet$onResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(F, this), WidgetChannelFollowSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelFollowSheet$onResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetChannelFollowSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelFollowSheet$onResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
index 2d1dfda734..486f1b1ec7 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1.java
@@ -39,7 +39,7 @@ public final class WidgetChannelFollowSheetViewModel$calculateChannelsWithPermis
             for (Map.Entry<Long, Channel> entry : map.entrySet()) {
                 long longValue = entry.getKey().longValue();
                 Channel value = entry.getValue();
-                if (value.z() == 5 || value.z() == 0) {
+                if (value.A() == 5 || value.A() == 0) {
                     Long l = (Long) this.$perms.get(Long.valueOf(longValue));
                     if (PermissionUtils.can(536870912, Long.valueOf(l != null ? l.longValue() : 0))) {
                         z2 = true;
@@ -55,7 +55,7 @@ public final class WidgetChannelFollowSheetViewModel$calculateChannelsWithPermis
             Collection values = linkedHashMap.values();
             LinkedHashMap linkedHashMap2 = new LinkedHashMap();
             for (T t : values) {
-                Long valueOf = Long.valueOf(t.e());
+                Long valueOf = Long.valueOf(t.f());
                 Object obj = linkedHashMap2.get(valueOf);
                 if (obj == null) {
                     obj = new ArrayList();
@@ -79,6 +79,6 @@ public final class WidgetChannelFollowSheetViewModel$calculateChannelsWithPermis
     }
 
     public final Observable<? extends Map<Long, List<Channel>>> call(Map<Long, Long> map) {
-        return this.this$0.getStoreChannels().observeGuildAndPrivateChannels().s().G(new AnonymousClass1(map));
+        return this.this$0.getStoreChannels().observeGuildAndPrivateChannels().r().F(new AnonymousClass1(map));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.java
index 8ce6be4adc..81037c4b03 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.java
@@ -19,7 +19,7 @@ public final class WidgetChannelFollowSheetViewModel$observeViewStateFromStores$
         List<Channel> flatten = o.flatten(map.values());
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(flatten, 10));
         for (Channel channel3 : flatten) {
-            arrayList.add(Long.valueOf(channel3.g()));
+            arrayList.add(Long.valueOf(channel3.h()));
         }
         return new WidgetChannelFollowSheetViewModel.ViewState.Loaded(channel, guild, guild2, channel2, keySet, u.toSet(arrayList), null, 64, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
index 60108ba363..c8e556b131 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java
@@ -282,9 +282,9 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel<ViewSt
         this.storeGuilds = storeGuilds;
         this.storeChannels = storeChannels;
         this.storePermissions = storePermissions;
-        this.selectedGuildSubject = BehaviorSubject.m0(null);
-        this.selectedChannelSubject = BehaviorSubject.m0(null);
-        this.eventSubject = PublishSubject.l0();
+        this.selectedGuildSubject = BehaviorSubject.l0(null);
+        this.selectedChannelSubject = BehaviorSubject.l0(null);
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observeViewStateFromStores()), this, null, 2, null), WidgetChannelFollowSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -306,20 +306,20 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel<ViewSt
     }
 
     private final Observable<Map<Long, List<Channel>>> calculateChannelsWithPermissions() {
-        return this.storePermissions.observePermissionsForAllChannels().s().Z(new WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1(this));
+        return this.storePermissions.observePermissionsForAllChannels().r().Y(new WidgetChannelFollowSheetViewModel$calculateChannelsWithPermissions$1(this));
     }
 
     private final void handleChannelFollowError(Error error) {
         Error.Response response = error.getResponse();
         m.checkNotNullExpressionValue(response, "error.response");
-        int i = response.getCode() != 30007 ? 2131888529 : 2131888533;
+        int i = response.getCode() != 30007 ? 2131888530 : 2131888534;
         ViewState viewState = getViewState();
         Objects.requireNonNull(viewState, "null cannot be cast to non-null type com.discord.widgets.announcements.WidgetChannelFollowSheetViewModel.ViewState.Loaded");
         updateViewState(ViewState.Loaded.copy$default((ViewState.Loaded) viewState, null, null, null, null, null, null, Integer.valueOf(i), 63, null));
     }
 
     private final Observable<ViewState.Loaded> observeViewStateFromStores() {
-        Observable<ViewState.Loaded> g = Observable.g(this.storeGuilds.observeGuild(this.sourceGuildId), this.storeChannels.observeChannel(this.sourceChannelId), calculateChannelsWithPermissions(), this.selectedGuildSubject.Z(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1(this)), this.selectedChannelSubject.Z(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2(this)), WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.INSTANCE);
+        Observable<ViewState.Loaded> g = Observable.g(this.storeGuilds.observeGuild(this.sourceGuildId), this.storeChannels.observeChannel(this.sourceChannelId), calculateChannelsWithPermissions(), this.selectedGuildSubject.Y(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$1(this)), this.selectedChannelSubject.Y(new WidgetChannelFollowSheetViewModel$observeViewStateFromStores$2(this)), WidgetChannelFollowSheetViewModel$observeViewStateFromStores$3.INSTANCE);
         m.checkNotNullExpressionValue(g, "Observable.combineLatest…  )\n\n      expected\n    }");
         return g;
     }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java
index 42fba20b18..0e61264dd4 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetChannelFollowSuccessDialog$binding$2 ex
 
     public final WidgetChannelFollowSuccessDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362264;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362264);
+        int i = 2131362275;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362275);
         if (materialButton != null) {
-            i = 2131362265;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362265);
+            i = 2131362276;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362276);
             if (simpleDraweeView != null) {
-                i = 2131362266;
-                TextView textView = (TextView) view.findViewById(2131362266);
+                i = 2131362277;
+                TextView textView = (TextView) view.findViewById(2131362277);
                 if (textView != null) {
                     return new WidgetChannelFollowSuccessDialogBinding((NestedScrollView) view, materialButton, simpleDraweeView, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java
index 6a305e998a..f034bfa836 100644
--- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java
+++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.java
@@ -24,7 +24,7 @@ public final class WidgetChannelFollowSuccessDialog extends AppDialog {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetChannelFollowSuccessDialog$binding$2.INSTANCE, null, 2, null);
     private final Integer[] successImageOptions = {2130969494, 2130969495, 2130969496};
-    private final Integer[] successTextOptions = {2131888538, 2131888539, 2131888540, 2131888541, 2131888542, 2131888543, 2131888544, 2131888545, 2131888546, 2131888547};
+    private final Integer[] successTextOptions = {2131888539, 2131888540, 2131888541, 2131888542, 2131888543, 2131888544, 2131888545, 2131888546, 2131888547, 2131888548};
 
     /* compiled from: WidgetChannelFollowSuccessDialog.kt */
     public static final class Companion {
@@ -42,7 +42,7 @@ public final class WidgetChannelFollowSuccessDialog extends AppDialog {
     }
 
     public WidgetChannelFollowSuccessDialog() {
-        super(2131558863);
+        super(2131558866);
     }
 
     private final WidgetChannelFollowSuccessDialogBinding getBinding() {
@@ -63,7 +63,7 @@ public final class WidgetChannelFollowSuccessDialog extends AppDialog {
         c.a aVar = c.b;
         textView.setText(getString(((Number) k.random(numArr, aVar)).intValue()));
         MGImages mGImages = MGImages.INSTANCE;
-        SimpleDraweeView simpleDraweeView = getBinding().f1690c;
+        SimpleDraweeView simpleDraweeView = getBinding().f1687c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.channelFollowSuccessImage");
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
diff --git a/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java b/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java
index a0b560a8df..0d5d830565 100644
--- a/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java
+++ b/app/src/main/java/com/discord/widgets/auth/AuthInviteInfoView.java
@@ -82,13 +82,13 @@ public final class AuthInviteInfoView extends RelativeLayout {
         boolean z2 = r != null && (t.isBlank(r) ^ true);
         Channel channel = modelInvite.getChannel();
         m.checkNotNullExpressionValue(channel, "channel");
-        if (AnimatableValueParser.p1(channel)) {
+        if (AnimatableValueParser.q1(channel)) {
             Channel channel2 = modelInvite.getChannel();
             m.checkNotNullExpressionValue(channel2, "channel");
             if ((AnimatableValueParser.y0(channel2).length() == 0) || !z2) {
                 Context context = getContext();
                 m.checkNotNullExpressionValue(context, "context");
-                return b.g(context, 2131890383, new Object[0], null, 4);
+                return b.g(context, 2131890449, new Object[0], null, 4);
             }
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
@@ -99,7 +99,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
         } else if (modelInvite.getApproximateMemberCount() >= 200 || !z2) {
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return b.g(context3, 2131890381, new Object[0], null, 4);
+            return b.g(context3, 2131890447, new Object[0], null, 4);
         } else {
             Context context4 = getContext();
             m.checkNotNullExpressionValue(context4, "context");
@@ -117,8 +117,8 @@ public final class AuthInviteInfoView extends RelativeLayout {
         imageView.setVisibility(0);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.authInviteInfoInvitedText");
-        b.n(textView, 2131890011, new Object[0], null, 4);
-        TextView textView2 = this.binding.f1642c;
+        b.m(textView, 2131890024, new Object[0], null, 4);
+        TextView textView2 = this.binding.f1639c;
         m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName");
         textView2.setText(modelGuildTemplate.getName());
     }
@@ -135,7 +135,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
         m.checkNotNullExpressionValue(imageView, "binding.authInviteInfoTemplateIcon");
         imageView.setVisibility(8);
         Channel channel = modelInvite.getChannel();
-        Integer valueOf = channel != null ? Integer.valueOf(channel.z()) : null;
+        Integer valueOf = channel != null ? Integer.valueOf(channel.A()) : null;
         if ((valueOf != null && valueOf.intValue() == 5) || ((valueOf != null && valueOf.intValue() == 0) || ((valueOf != null && valueOf.intValue() == 2) || (valueOf != null && valueOf.intValue() == 13)))) {
             Guild guild = modelInvite.getGuild();
             if (guild != null) {
@@ -146,7 +146,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
                 TextView textView = this.binding.d;
                 m.checkNotNullExpressionValue(textView, "binding.authInviteInfoInvitedText");
                 textView.setText(b.k(getIntroText(modelInvite), new Object[0], null, 2));
-                TextView textView2 = this.binding.f1642c;
+                TextView textView2 = this.binding.f1639c;
                 m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName");
                 textView2.setText(guild.u());
             }
@@ -162,7 +162,7 @@ public final class AuthInviteInfoView extends RelativeLayout {
             TextView textView3 = this.binding.d;
             m.checkNotNullExpressionValue(textView3, "binding.authInviteInfoInvitedText");
             textView3.setText(b.k(getIntroText(modelInvite), new Object[0], null, 2));
-            TextView textView4 = this.binding.f1642c;
+            TextView textView4 = this.binding.f1639c;
             m.checkNotNullExpressionValue(textView4, "binding.authInviteInfoGuildName");
             Channel channel2 = modelInvite.getChannel();
             m.checkNotNullExpressionValue(channel2, "invite.channel");
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java
index c197710735..769235e360 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java
@@ -29,8 +29,8 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement
         int i = 2131361941;
         AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131361941);
         if (appViewFlipper != null) {
-            i = 2131362672;
-            View findViewById = view.findViewById(2131362672);
+            i = 2131362696;
+            View findViewById = view.findViewById(2131362696);
             if (findViewById != null) {
                 int i2 = 2131361930;
                 MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131361930);
@@ -45,7 +45,7 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement
                             TextView textView = (TextView) findViewById.findViewById(2131361933);
                             if (textView != null) {
                                 z zVar = new z((ConstraintLayout) findViewById, materialButton, loadingButton, linkifiedTextView, textView);
-                                View findViewById2 = view.findViewById(2131365333);
+                                View findViewById2 = view.findViewById(2131365389);
                                 if (findViewById2 != null) {
                                     int i3 = 2131361937;
                                     MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131361937);
@@ -56,11 +56,11 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement
                                             i3 = 2131361940;
                                             TextView textView2 = (TextView) findViewById2.findViewById(2131361940);
                                             if (textView2 != null) {
-                                                i3 = 2131365334;
-                                                TextView textView3 = (TextView) findViewById2.findViewById(2131365334);
+                                                i3 = 2131365390;
+                                                TextView textView3 = (TextView) findViewById2.findViewById(2131365390);
                                                 if (textView3 != null) {
                                                     a0 a0Var = new a0((ConstraintLayout) findViewById2, materialButton2, linkifiedTextView2, textView2, textView3);
-                                                    View findViewById3 = view.findViewById(2131365475);
+                                                    View findViewById3 = view.findViewById(2131365536);
                                                     if (findViewById3 != null) {
                                                         int i4 = 2131361934;
                                                         LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById3.findViewById(2131361934);
@@ -81,14 +81,14 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement
                                                         }
                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i4)));
                                                     }
-                                                    i = 2131365475;
+                                                    i = 2131365536;
                                                 }
                                             }
                                         }
                                     }
                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i3)));
                                 }
-                                i = 2131365333;
+                                i = 2131365389;
                             }
                         }
                     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java
index 7ddc467935..58e56870dd 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java
@@ -74,7 +74,7 @@ public final class WidgetAgeVerify extends AppFragment {
     }
 
     public WidgetAgeVerify() {
-        super(2131558837);
+        super(2131558840);
         WidgetAgeVerify$viewModel$2 widgetAgeVerify$viewModel$2 = WidgetAgeVerify$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetAgeVerifyViewModel.class), new WidgetAgeVerify$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetAgeVerify$viewModel$2));
@@ -106,16 +106,16 @@ public final class WidgetAgeVerify extends AppFragment {
             m.checkNotNullExpressionValue(dateInstance, "formatter");
             dateInstance.setTimeZone(instance.getTimeZone());
             String format = dateInstance.format(Long.valueOf(instance.getTimeInMillis()));
-            TextInputLayout textInputLayout = getBinding().e.f179c;
+            TextInputLayout textInputLayout = getBinding().e.f181c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.verify.ageVerifyInputWrapper");
             ViewExtensions.setText(textInputLayout, new SpannableStringBuilder(format));
         }
         if (viewState.getErrorStringId() != null) {
-            TextInputLayout textInputLayout2 = getBinding().e.f179c;
+            TextInputLayout textInputLayout2 = getBinding().e.f181c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.verify.ageVerifyInputWrapper");
             textInputLayout2.setError(b.j(this, viewState.getErrorStringId().intValue(), new Object[0], null, 4));
         }
-        TextInputLayout textInputLayout3 = getBinding().e.f179c;
+        TextInputLayout textInputLayout3 = getBinding().e.f181c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.verify.ageVerifyInputWrapper");
         ViewExtensions.setOnEditTextClickListener(textInputLayout3, new WidgetAgeVerify$configureBirthdayInput$1(this, dateOfBirth));
     }
@@ -130,8 +130,8 @@ public final class WidgetAgeVerify extends AppFragment {
         LoadingButton loadingButton = getBinding().e.d;
         m.checkNotNullExpressionValue(loadingButton, "binding.verify.ageVerifyNextButton");
         loadingButton.setEnabled(viewState.getDateOfBirth() != null);
-        getBinding().f1669c.f185c.setIsLoading(viewState.isSubmitting());
-        LoadingButton loadingButton2 = getBinding().f1669c.f185c;
+        getBinding().f1666c.f186c.setIsLoading(viewState.isSubmitting());
+        LoadingButton loadingButton2 = getBinding().f1666c.f186c;
         m.checkNotNullExpressionValue(loadingButton2, "binding.confirm.ageVerifyConfirmButton");
         loadingButton2.setEnabled(viewState.getDateOfBirth() != null);
         Resources resources = getResources();
@@ -139,8 +139,8 @@ public final class WidgetAgeVerify extends AppFragment {
         CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755015, 30, 30);
         TextView textView = getBinding().d.d;
         m.checkNotNullExpressionValue(textView, "binding.underage.underageWarning");
-        b.n(textView, 2131886333, new Object[]{quantityString}, null, 4);
-        LinkifiedTextView linkifiedTextView = getBinding().d.f60c;
+        b.m(textView, 2131886333, new Object[]{quantityString}, null, 4);
+        LinkifiedTextView linkifiedTextView = getBinding().d.f59c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.underage.ageVerifyUnderageDescription");
         Object[] objArr = new Object[2];
         String underageMessage = viewState.getUnderageMessage();
@@ -149,16 +149,16 @@ public final class WidgetAgeVerify extends AppFragment {
         }
         objArr[0] = underageMessage;
         objArr[1] = f.a.a(360040724612L, null);
-        b.n(linkifiedTextView, 2131886329, objArr, null, 4);
+        b.m(linkifiedTextView, 2131886329, objArr, null, 4);
         if (viewState.getDisplayedChild() == 2) {
             requireAppActivity().r = false;
             AppFragment.hideKeyboard$default(this, null, 1, null);
         }
         if (viewState.getDisplayedChild() == 1 && (dateOfBirth = viewState.getDateOfBirth()) != null) {
             int age = BirthdayHelper.INSTANCE.getAge(dateOfBirth.longValue());
-            TextView textView2 = getBinding().f1669c.e;
+            TextView textView2 = getBinding().f1666c.e;
             m.checkNotNullExpressionValue(textView2, "binding.confirm.ageVerifyConfirmTitle");
-            b.n(textView2, 2131886311, new Object[]{String.valueOf(age)}, null, 4);
+            b.m(textView2, 2131886311, new Object[]{String.valueOf(age)}, null, 4);
         }
         configureBirthdayInput(viewState);
         configureViewFlipper(viewState.getDisplayedChild());
@@ -223,14 +223,14 @@ public final class WidgetAgeVerify extends AppFragment {
         boolean booleanExtra = getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_NSFW_CHANNEL", false);
         LinkifiedTextView linkifiedTextView = getBinding().e.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.verify.ageVerifyDescription");
-        b.n(linkifiedTextView, booleanExtra ? 2131886323 : 2131886308, new Object[]{f.a.a(360040724612L, null)}, null, 4);
-        LinkifiedTextView linkifiedTextView2 = getBinding().f1669c.d;
+        b.m(linkifiedTextView, booleanExtra ? 2131886323 : 2131886308, new Object[]{f.a.a(360040724612L, null)}, null, 4);
+        LinkifiedTextView linkifiedTextView2 = getBinding().f1666c.d;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.confirm.ageVerifyConfirmDescription");
         LinkifiedTextView linkifiedTextView3 = getBinding().e.b;
         m.checkNotNullExpressionValue(linkifiedTextView3, "binding.verify.ageVerifyDescription");
         linkifiedTextView2.setText(linkifiedTextView3.getText());
         getBinding().e.d.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$2(this, booleanExtra));
-        getBinding().f1669c.f185c.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$3(this, booleanExtra));
-        getBinding().f1669c.b.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$4(this));
+        getBinding().f1666c.f186c.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$3(this, booleanExtra));
+        getBinding().f1666c.b.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$4(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java
index 1bfd6c9c98..ae9e413679 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel$Companion$observeStores$1.java
@@ -16,7 +16,7 @@ public final class WidgetAgeVerifyViewModel$Companion$observeStores$1<T, R> impl
         public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
         public final Channel call(Channel channel) {
-            if (channel == null || channel.n()) {
+            if (channel == null || channel.o()) {
                 return null;
             }
             return channel;
@@ -24,7 +24,7 @@ public final class WidgetAgeVerifyViewModel$Companion$observeStores$1<T, R> impl
     }
 
     public final Observable<? extends Channel> call(Channel channel) {
-        Long valueOf = channel != null ? Long.valueOf(channel.e()) : null;
-        return valueOf == null ? new j(null) : ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observeDefaultChannel(valueOf.longValue()), 0, false, 3, null).G(AnonymousClass1.INSTANCE);
+        Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
+        return valueOf == null ? new j(null) : ObservableExtensionsKt.takeSingleUntilTimeout$default(StoreStream.Companion.getChannels().observeDefaultChannel(valueOf.longValue()), 0, false, 3, null).F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
index b5a2ca49d4..82a50eacf7 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerifyViewModel.java
@@ -72,7 +72,7 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
 
         public final Observable<StoreState> observeStores() {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<StoreState> i = Observable.i(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getAuthentication().observeIsAuthed$app_productionGoogleRelease(), companion.getChannelsSelected().observeSelectedChannel().Z(WidgetAgeVerifyViewModel$Companion$observeStores$1.INSTANCE), WidgetAgeVerifyViewModel$Companion$observeStores$2.INSTANCE);
+            Observable<StoreState> i = Observable.i(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getAuthentication().observeIsAuthed$app_productionGoogleRelease(), companion.getChannelsSelected().observeSelectedChannel().Y(WidgetAgeVerifyViewModel$Companion$observeStores$1.INSTANCE), WidgetAgeVerifyViewModel$Companion$observeStores$2.INSTANCE);
             m.checkNotNullExpressionValue(i, "Observable.combineLatest…hed\n          )\n        }");
             return i;
         }
@@ -387,7 +387,7 @@ public final class WidgetAgeVerifyViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(observable, "storeObservable");
         this.restAPI = restAPI;
         this.storeAuth = storeAuthentication;
-        this.eventsSubject = PublishSubject.l0();
+        this.eventsSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetAgeVerifyViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java
index 07d64c0241..a06ffcac57 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetAuthAgeGated$binding$2 extends k implem
 
     public final WidgetAuthAgeGatedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362047;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362047);
+        int i = 2131362048;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362048);
         if (linearLayout != null) {
-            i = 2131362054;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362054);
+            i = 2131362055;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362055);
             if (materialButton != null) {
-                i = 2131362055;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362055);
+                i = 2131362056;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362056);
                 if (linkifiedTextView != null) {
                     return new WidgetAuthAgeGatedBinding((CoordinatorLayout) view, linearLayout, materialButton, linkifiedTextView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java
index 9585fcfc87..f39cf9e352 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthAgeGated.java
@@ -41,7 +41,7 @@ public final class WidgetAuthAgeGated extends AppFragment {
     }
 
     public WidgetAuthAgeGated() {
-        super(2131558841);
+        super(2131558844);
     }
 
     private final WidgetAuthAgeGatedBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java
index c61302b12a..ba36c7df7e 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$binding$2.java
@@ -22,23 +22,23 @@ public final /* synthetic */ class WidgetAuthBirthday$binding$2 extends k implem
 
     public final WidgetAuthBirthdayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362041;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362041);
+        int i = 2131362042;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362042);
         if (linkifiedTextView != null) {
-            i = 2131362045;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362045);
+            i = 2131362046;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362046);
             if (textInputLayout != null) {
-                i = 2131362046;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362046);
+                i = 2131362047;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362047);
                 if (materialButton != null) {
-                    i = 2131362047;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362047);
+                    i = 2131362048;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362048);
                     if (linearLayout != null) {
-                        i = 2131362059;
-                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362059);
+                        i = 2131362060;
+                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362060);
                         if (materialCheckBox != null) {
-                            i = 2131362896;
-                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                            i = 2131362921;
+                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                             if (dimmerView != null) {
                                 return new WidgetAuthBirthdayBinding((CoordinatorLayout) view, linkifiedTextView, textInputLayout, materialButton, linearLayout, materialCheckBox, dimmerView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java
index 2a5ca18435..d4fb954bb0 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java
@@ -30,7 +30,7 @@ public final class WidgetAuthBirthday$validationManager$2 extends o implements F
             if ((WidgetAuthBirthday.access$isConsentRequired$p(this.this$0.this$0) && checkBox.isChecked()) || !WidgetAuthBirthday.access$isConsentRequired$p(this.this$0.this$0)) {
                 return null;
             }
-            return checkBox.getContext().getString(2131893820);
+            return checkBox.getContext().getString(2131893918);
         }
     }
 
@@ -68,7 +68,7 @@ public final class WidgetAuthBirthday$validationManager$2 extends o implements F
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo1invoke() {
-        TextInputLayout textInputLayout = WidgetAuthBirthday.access$getBinding$p(this.this$0).f1672c;
+        TextInputLayout textInputLayout = WidgetAuthBirthday.access$getBinding$p(this.this$0).f1669c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday");
         return new ValidationManager(new Input.TextInputLayoutInput("dateOfBirth", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131886322)), new Input.GenericInput("tos", WidgetAuthBirthday.access$getBinding$p(this.this$0).e, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java
index 0574c2eead..f177411c56 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java
@@ -69,7 +69,7 @@ public final class WidgetAuthBirthday extends AppFragment {
     }
 
     public WidgetAuthBirthday() {
-        super(2131558842);
+        super(2131558845);
     }
 
     public static final /* synthetic */ WidgetAuthBirthdayBinding access$getBinding$p(WidgetAuthBirthday widgetAuthBirthday) {
@@ -99,7 +99,7 @@ public final class WidgetAuthBirthday extends AppFragment {
     private final Long getBirthday() {
         try {
             DateFormat dateFormat = this.formatter;
-            TextInputLayout textInputLayout = getBinding().f1672c;
+            TextInputLayout textInputLayout = getBinding().f1669c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday");
             Date parse = dateFormat.parse(ViewExtensions.getTextOrEmpty(textInputLayout));
             if (parse != null) {
@@ -117,7 +117,7 @@ public final class WidgetAuthBirthday extends AppFragment {
 
     private final void setBirthday(long j) {
         String format = this.formatter.format(Long.valueOf(j));
-        TextInputLayout textInputLayout = getBinding().f1672c;
+        TextInputLayout textInputLayout = getBinding().f1669c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday");
         ViewExtensions.setText(textInputLayout, new SpannableStringBuilder(format));
     }
@@ -143,8 +143,8 @@ public final class WidgetAuthBirthday extends AppFragment {
         materialCheckBox.setVisibility(this.isConsentRequired ? 0 : 8);
         LinkifiedTextView linkifiedTextView = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.authPolicyLinks");
-        b.n(linkifiedTextView, this.isConsentRequired ? 2131893819 : 2131893818, new Object[]{getString(2131893817), getString(2131892376)}, null, 4);
-        TextInputLayout textInputLayout = getBinding().f1672c;
+        b.m(linkifiedTextView, this.isConsentRequired ? 2131893917 : 2131893916, new Object[]{getString(2131893915), getString(2131892453)}, null, 4);
+        TextInputLayout textInputLayout = getBinding().f1669c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday");
         ViewExtensions.setOnEditTextClickListener(textInputLayout, new WidgetAuthBirthday$onViewBoundOrOnResume$1(this));
         getBinding().d.setOnClickListener(new WidgetAuthBirthday$onViewBoundOrOnResume$2(this));
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java
index 7b40336995..fc2f59bfc2 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java
@@ -25,8 +25,8 @@ public final /* synthetic */ class WidgetAuthCaptcha$binding$2 extends k impleme
             i = 2131362015;
             MaterialButton materialButton = (MaterialButton) view.findViewById(2131362015);
             if (materialButton != null) {
-                i = 2131364521;
-                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364521);
+                i = 2131364560;
+                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364560);
                 if (screenTitleView != null) {
                     return new WidgetAuthCaptchaBinding((CoordinatorLayout) view, textView, materialButton, screenTitleView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java
index 4eb619d621..39a4332b0b 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java
@@ -72,7 +72,7 @@ public final class WidgetAuthCaptcha extends AppFragment {
     }
 
     public WidgetAuthCaptcha() {
-        super(2131558843);
+        super(2131558846);
     }
 
     public static final /* synthetic */ void access$finishIfCaptchaTokenReceived(WidgetAuthCaptcha widgetAuthCaptcha, Activity activity) {
@@ -126,11 +126,11 @@ public final class WidgetAuthCaptcha extends AppFragment {
             m.checkNotNullExpressionValue(requireActivity2, "requireActivity()");
             captchaRequest = new CaptchaHelper.CaptchaRequest.HCaptcha(captchaSitekey, requireActivity2);
         }
-        String string = captchaRequest instanceof CaptchaHelper.CaptchaRequest.HCaptcha ? getString(2131894458) : getString(2131894461);
+        String string = captchaRequest instanceof CaptchaHelper.CaptchaRequest.HCaptcha ? getString(2131894577) : getString(2131894580);
         m.checkNotNullExpressionValue(string, "if (captchaRequest is Ca…erify_by_recaptcha)\n    }");
         getBinding().d.setTitle(string);
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Captcha", "viewed", null, 4, null);
-        getBinding().f1673c.setOnClickListener(new WidgetAuthCaptcha$onViewBound$1(this, captchaRequest));
+        getBinding().f1670c.setOnClickListener(new WidgetAuthCaptcha$onViewBound$1(this, captchaRequest));
         getBinding().b.setOnClickListener(new WidgetAuthCaptcha$onViewBound$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
index c20af97b3f..4835c5310a 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java
@@ -60,7 +60,7 @@ public final class WidgetAuthLanding extends AppFragment {
     }
 
     public WidgetAuthLanding() {
-        super(2131558845);
+        super(2131558848);
         WidgetAuthLanding$viewModel$2 widgetAuthLanding$viewModel$2 = new WidgetAuthLanding$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetAuthLandingViewModel.class), new WidgetAuthLanding$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetAuthLanding$viewModel$2));
@@ -182,18 +182,18 @@ public final class WidgetAuthLanding extends AppFragment {
             this.useRebrandLanding = true;
         }
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBound$1(this), 62, (Object) null);
-        getBinding().f1674c.setOnClickListener(WidgetAuthLanding$onViewBound$2.INSTANCE);
+        getBinding().f1671c.setOnClickListener(WidgetAuthLanding$onViewBound$2.INSTANCE);
         getBinding().d.setOnClickListener(new WidgetAuthLanding$onViewBound$3(this));
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<R> G = StoreStream.Companion.getExperiments().observeUserExperiment("2021-01_google_smart_lock", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable G2 = G.a0(1).G(WidgetAuthLanding$onViewBoundOrOnResume$1.INSTANCE);
-        m.checkNotNullExpressionValue(G2, "StoreStream.getExperimen…experiment?.bucket == 1 }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(G2, this), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getExperiments().observeUserExperiment("2021-01_google_smart_lock", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable F2 = F.Z(1).F(WidgetAuthLanding$onViewBoundOrOnResume$1.INSTANCE);
+        m.checkNotNullExpressionValue(F2, "StoreStream.getExperimen…experiment?.bucket == 1 }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(F2, this), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBoundOrOnResume$2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBoundOrOnResume$3(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java
index 92bd42b702..5d27279903 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel$Companion$observeStoreState$1.java
@@ -31,6 +31,6 @@ public final class WidgetAuthLandingViewModel$Companion$observeStoreState$1<T, R
     }
 
     public final Observable<? extends StoreGuildTemplates.GuildTemplateState> call(String str) {
-        return str != null ? this.$storeGuildTemplates.observeGuildTemplate(str).v(new AnonymousClass1(this, str)) : new j(StoreGuildTemplates.GuildTemplateState.None.INSTANCE);
+        return str != null ? this.$storeGuildTemplates.observeGuildTemplate(str).u(new AnonymousClass1(this, str)) : new j(StoreGuildTemplates.GuildTemplateState.None.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java
index ef632dff62..2a5cc9f421 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java
@@ -96,7 +96,7 @@ public final class WidgetAuthLandingViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreInviteSettings storeInviteSettings, StoreGuildTemplates storeGuildTemplates, StoreAuthentication storeAuthentication) {
-            Observable<StoreState> h = Observable.h(storeInviteSettings.getInviteCode(), storeInviteSettings.getInvite(), storeGuildTemplates.observeDynamicLinkGuildTemplateCode().Z(new WidgetAuthLandingViewModel$Companion$observeStoreState$1(storeGuildTemplates)), storeAuthentication.getAgeGateError(), WidgetAuthLandingViewModel$Companion$observeStoreState$2.INSTANCE);
+            Observable<StoreState> h = Observable.h(storeInviteSettings.getInviteCode(), storeInviteSettings.getInvite(), storeGuildTemplates.observeDynamicLinkGuildTemplateCode().Y(new WidgetAuthLandingViewModel$Companion$observeStoreState$1(storeGuildTemplates)), storeAuthentication.getAgeGateError(), WidgetAuthLandingViewModel$Companion$observeStoreState$2.INSTANCE);
             m.checkNotNullExpressionValue(h, "Observable.combineLatest…eError,\n        )\n      }");
             return h;
         }
@@ -507,7 +507,7 @@ public final class WidgetAuthLandingViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(googleSmartLockManager, "googleSmartLockManager");
         this.storeInstantInvites = storeInstantInvites;
         this.googleSmartLockManager = googleSmartLockManager;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetAuthLandingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(googleSmartLockManager.getSmartLockRepo().getSmartLockLoginObservable(), this, null, 2, null), WidgetAuthLandingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         storeAuthentication.requestConsentRequired();
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java
index 8df959c91c..4fa3d206eb 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$binding$2.java
@@ -40,8 +40,8 @@ public final /* synthetic */ class WidgetAuthLogin$binding$2 extends k implement
                             i = 2131362033;
                             TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362033);
                             if (textInputLayout != null) {
-                                i = 2131362896;
-                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                                i = 2131362921;
+                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                                 if (dimmerView != null) {
                                     return new WidgetAuthLoginBinding((CoordinatorLayout) view, materialButton, linearLayout, textView, phoneOrEmailInputView, textView2, textInputLayout, dimmerView);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java
index 90f477fd5f..c5350369ba 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java
@@ -43,9 +43,9 @@ public final class WidgetAuthLogin$forgotPassword$2 extends o implements Functio
             Context requireContext = this.this$0.requireContext();
             ActivityResultLauncher<Intent> access$getPhoneVerifyPasswordLauncher$p = WidgetAuthLogin.access$getPhoneVerifyPasswordLauncher$p(this.this$0);
             String str = this.$login;
-            String string = this.this$0.getString(2131891780);
+            String string = this.this$0.getString(2131891852);
             m.checkNotNullExpressionValue(string, "getString(R.string.passw…overy_verify_phone_title)");
-            String string2 = this.this$0.getString(2131891778);
+            String string2 = this.this$0.getString(2131891850);
             m.checkNotNullExpressionValue(string2, "getString(R.string.passw…ry_verify_phone_subtitle)");
             companion.launch(requireContext, access$getPhoneVerifyPasswordLauncher$p, str, string, string2);
             error.setShowErrorToasts(false);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java
index 454ed656bf..1bd4cd4403 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java
@@ -35,7 +35,7 @@ public final class WidgetAuthLogin$onViewBound$5 implements View.OnClickListener
             try {
                 view.getContext().startActivity(new Intent("android.settings.ACCESSIBILITY_SETTINGS"));
             } catch (ActivityNotFoundException unused) {
-                c.a.d.o.g(view.getContext(), 2131891774, 0, null, 12);
+                c.a.d.o.g(view.getContext(), 2131891846, 0, null, 12);
             }
         }
     }
@@ -46,7 +46,7 @@ public final class WidgetAuthLogin$onViewBound$5 implements View.OnClickListener
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.this$0.requireContext()).setTitle(2131891771).setMessage(2131891772).setPositiveButton(2131891773, AnonymousClass1.INSTANCE), 2131887178, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.this$0.requireContext()).setTitle(2131891843).setMessage(2131891844).setPositiveButton(2131891845, AnonymousClass1.INSTANCE), 2131887178, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         negativeButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyLoginLauncher$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyLoginLauncher$1.java
index 47ad75339e..4edf4ffeca 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyLoginLauncher$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyLoginLauncher$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.auth.WidgetAuthPhoneVerify;
 import d0.z.d.a;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -10,7 +11,7 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthLogin.kt */
-public final class WidgetAuthLogin$phoneVerifyLoginLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthLogin$phoneVerifyLoginLauncher$1 extends o implements Function1<WidgetAuthPhoneVerify.Result, Unit> {
     public final /* synthetic */ WidgetAuthLogin this$0;
 
     /* compiled from: WidgetAuthLogin.kt */
@@ -67,13 +68,15 @@ public final class WidgetAuthLogin$phoneVerifyLoginLauncher$1 extends o implemen
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(String str) {
-        invoke(str);
+    public /* bridge */ /* synthetic */ Unit invoke(WidgetAuthPhoneVerify.Result result) {
+        invoke(result);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
-        m.checkNotNullParameter(str, "token");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getAuthentication().authorizeIP(str), this.this$0, null, 2, null), WidgetAuthLogin.access$getBinding$p(this.this$0).h, 0, 2, null), this.this$0.getClass(), this.this$0.getContext(), (Function1) null, new AnonymousClass1(this.this$0), (Function0) null, (Function0) null, new AnonymousClass2(this), 52, (Object) null);
+    public final void invoke(WidgetAuthPhoneVerify.Result result) {
+        m.checkNotNullParameter(result, "result");
+        if (result instanceof WidgetAuthPhoneVerify.Result.Token) {
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getAuthentication().authorizeIP(((WidgetAuthPhoneVerify.Result.Token) result).getToken()), this.this$0, null, 2, null), WidgetAuthLogin.access$getBinding$p(this.this$0).h, 0, 2, null), this.this$0.getClass(), this.this$0.getContext(), (Function1) null, new AnonymousClass1(this.this$0), (Function0) null, (Function0) null, new AnonymousClass2(this), 52, (Object) null);
+        }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyPasswordLauncher$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyPasswordLauncher$1.java
index b13bfd305b..65524ddec0 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyPasswordLauncher$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$phoneVerifyPasswordLauncher$1.java
@@ -1,11 +1,12 @@
 package com.discord.widgets.auth;
 
+import com.discord.widgets.auth.WidgetAuthPhoneVerify;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthLogin.kt */
-public final class WidgetAuthLogin$phoneVerifyPasswordLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthLogin$phoneVerifyPasswordLauncher$1 extends o implements Function1<WidgetAuthPhoneVerify.Result, Unit> {
     public final /* synthetic */ WidgetAuthLogin this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -17,13 +18,15 @@ public final class WidgetAuthLogin$phoneVerifyPasswordLauncher$1 extends o imple
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(String str) {
-        invoke(str);
+    public /* bridge */ /* synthetic */ Unit invoke(WidgetAuthPhoneVerify.Result result) {
+        invoke(result);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
-        m.checkNotNullParameter(str, "token");
-        WidgetAuthResetPassword.Companion.start(this.this$0.requireContext(), str);
+    public final void invoke(WidgetAuthPhoneVerify.Result result) {
+        m.checkNotNullParameter(result, "result");
+        if (result instanceof WidgetAuthPhoneVerify.Result.Token) {
+            WidgetAuthResetPassword.Companion.start(this.this$0.requireContext(), ((WidgetAuthPhoneVerify.Result.Token) result).getToken());
+        }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java
index c1f06bc4e4..dc842bb7ba 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java
@@ -23,9 +23,9 @@ public final class WidgetAuthLogin$validationManager$2 extends o implements Func
     public final ValidationManager mo1invoke() {
         TextInputLayout mainTextInputLayout = WidgetAuthLogin.access$getBinding$p(this.this$0).e.getMainTextInputLayout();
         BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion;
-        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131890881)};
+        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131890951)};
         TextInputLayout textInputLayout = WidgetAuthLogin.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authLoginPasswordWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("binding.authLogin", mainTextInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout, companion.createRequiredInputValidator(2131891781)));
+        return new ValidationManager(new Input.TextInputLayoutInput("binding.authLogin", mainTextInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout, companion.createRequiredInputValidator(2131891853)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java
index 8f02c7cf85..fcfffb9983 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java
@@ -67,7 +67,7 @@ public final class WidgetAuthLogin extends AppFragment {
     }
 
     public WidgetAuthLogin() {
-        super(2131558846);
+        super(2131558849);
         WidgetAuthCaptcha.Companion companion = WidgetAuthCaptcha.Companion;
         this.captchaForgotPasswordLauncher = companion.registerForResult(this, new WidgetAuthLogin$captchaForgotPasswordLauncher$1(this));
         this.captchaLoginLauncher = companion.registerForResult(this, new WidgetAuthLogin$captchaLoginLauncher$1(this));
@@ -113,7 +113,7 @@ public final class WidgetAuthLogin extends AppFragment {
     private final void forgotPassword(String str) {
         String textOrEmpty = getBinding().e.getTextOrEmpty();
         if (textOrEmpty.length() == 0) {
-            o.g(getContext(), 2131890881, 0, null, 12);
+            o.g(getContext(), 2131890951, 0, null, 12);
         } else {
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui(StoreStream.Companion.getAuthentication().forgotPassword(textOrEmpty, str)), getBinding().h, 0, 2, null), getContext(), "REST: forgotPassword", (Function1) null, new WidgetAuthLogin$forgotPassword$1(this, textOrEmpty), new WidgetAuthLogin$forgotPassword$2(this, textOrEmpty), (Function0) null, (Function0) null, 100, (Object) null);
         }
@@ -164,9 +164,9 @@ public final class WidgetAuthLogin extends AppFragment {
             Context requireContext = requireContext();
             ActivityResultLauncher<Intent> activityResultLauncher = this.phoneVerifyLoginLauncher;
             String textOrEmpty = getBinding().e.getTextOrEmpty();
-            String string = getString(2131891872);
+            String string = getString(2131891944);
             m.checkNotNullExpressionValue(string, "getString(R.string.phone_ip_authorization_title)");
-            String string2 = getString(2131891870);
+            String string2 = getString(2131891942);
             m.checkNotNullExpressionValue(string2, "getString(R.string.phone…p_authorization_subtitle)");
             companion.launch(requireContext, activityResultLauncher, textOrEmpty, string, string2);
         } else {
@@ -291,7 +291,7 @@ public final class WidgetAuthLogin extends AppFragment {
         ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetAuthLogin$onViewBound$3(this), 1, null);
         getBinding().d.setOnClickListener(new WidgetAuthLogin$onViewBound$4(this));
         getBinding().f.setOnClickListener(new WidgetAuthLogin$onViewBound$5(this));
-        getBinding().f1675c.setOnClickListener(new WidgetAuthLogin$onViewBound$6(this));
+        getBinding().f1672c.setOnClickListener(new WidgetAuthLogin$onViewBound$6(this));
         getBinding().e.b(this);
         GoogleSmartLockManager.SmartLockCredentials smartLockCredentials = this.smartLockCredentials;
         if (smartLockCredentials != null) {
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java
index 32d70a3614..39d6a34cab 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$binding$2.java
@@ -25,8 +25,8 @@ public final /* synthetic */ class WidgetAuthMfa$binding$2 extends k implements
             i = 2131362034;
             CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362034);
             if (codeVerificationView != null) {
-                i = 2131362896;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                i = 2131362921;
+                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                 if (dimmerView != null) {
                     return new WidgetAuthMfaBinding((CoordinatorLayout) view, textView, codeVerificationView, dimmerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
index c937ac3c78..1d9cc8157b 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java
@@ -15,10 +15,10 @@ public final class WidgetAuthMfa$onViewBound$1<T1, T2> implements Action2<MenuIt
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363862:
+            case 2131363903:
                 WidgetAuthMfa.access$showBackupCodesDialog(this.this$0);
                 return;
-            case 2131363863:
+            case 2131363904:
                 WidgetAuthMfa.access$showInfoDialog(this.this$0);
                 return;
             default:
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.java
index c3d42c0bae..218c7f8bb0 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$showBackupCodesDialog$1.java
@@ -23,7 +23,7 @@ public final class WidgetAuthMfa$showBackupCodesDialog$1 implements View.OnClick
         WidgetAuthMfa widgetAuthMfa = this.this$0;
         AlertDialog alertDialog = this.$dialog;
         m.checkNotNullExpressionValue(alertDialog, "dialog");
-        TextInputLayout textInputLayout = this.$binding.f1676c;
+        TextInputLayout textInputLayout = this.$binding.f1673c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetAuthMfaBackupCodesEdittext");
         WidgetAuthMfa.access$evaluateBackupCode(widgetAuthMfa, alertDialog, ViewExtensions.getTextOrEmpty(textInputLayout));
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
index 32bffc80fc..3b73f70443 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa.java
@@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment;
 import c.a.d.l;
 import c.a.d.o;
 import c.a.d.q;
-import c.a.i.y3;
+import c.a.i.b4;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.discord.app.AppActivity;
@@ -72,7 +72,7 @@ public final class WidgetAuthMfa extends AppFragment {
     }
 
     public WidgetAuthMfa() {
-        super(2131558847);
+        super(2131558850);
     }
 
     public static final /* synthetic */ void access$evaluateBackupCode(WidgetAuthMfa widgetAuthMfa, AlertDialog alertDialog, String str) {
@@ -101,7 +101,7 @@ public final class WidgetAuthMfa extends AppFragment {
 
     private final void evaluateBackupCode(AlertDialog alertDialog, String str) {
         if (str.length() < 8) {
-            o.i(this, 2131893981, 0, 4);
+            o.i(this, 2131894081, 0, 4);
             return;
         }
         alertDialog.hide();
@@ -110,7 +110,7 @@ public final class WidgetAuthMfa extends AppFragment {
 
     private final void evaluateCode(String str) {
         if (TextUtils.isEmpty(str)) {
-            o.i(this, 2131894025, 0, 4);
+            o.i(this, 2131894125, 0, 4);
             return;
         }
         StoreAuthentication authentication = StoreStream.Companion.getAuthentication();
@@ -118,7 +118,7 @@ public final class WidgetAuthMfa extends AppFragment {
         if (str2 == null) {
             m.throwUninitializedPropertyAccessException("ticket");
         }
-        ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui$default(authentication.authMFA(str, str2), this, null, 2, null), getBinding().f1677c, 0).k(q.a.g(getContext(), WidgetAuthMfa$evaluateCode$1.INSTANCE, new WidgetAuthMfa$evaluateCode$2(this)));
+        ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui$default(authentication.authMFA(str, str2), this, null, 2, null), getBinding().f1674c, 0).k(q.a.g(getContext(), WidgetAuthMfa$evaluateCode$1.INSTANCE, new WidgetAuthMfa$evaluateCode$2(this)));
     }
 
     private final WidgetAuthMfaBinding getBinding() {
@@ -127,18 +127,18 @@ public final class WidgetAuthMfa extends AppFragment {
 
     @MainThread
     private final void showBackupCodesDialog() {
-        View inflate = getLayoutInflater().inflate(2131558848, (ViewGroup) null, false);
-        int i = 2131364622;
-        TextView textView = (TextView) inflate.findViewById(2131364622);
+        View inflate = getLayoutInflater().inflate(2131558851, (ViewGroup) null, false);
+        int i = 2131364671;
+        TextView textView = (TextView) inflate.findViewById(2131364671);
         if (textView != null) {
-            i = 2131365577;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365577);
+            i = 2131365638;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365638);
             if (materialButton != null) {
-                i = 2131365578;
-                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131365578);
+                i = 2131365639;
+                TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131365639);
                 if (textInputLayout != null) {
-                    i = 2131365579;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131365579);
+                    i = 2131365640;
+                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131365640);
                     if (materialButton2 != null) {
                         LinearLayout linearLayout = (LinearLayout) inflate;
                         WidgetAuthMfaBackupCodesBinding widgetAuthMfaBackupCodesBinding = new WidgetAuthMfaBackupCodesBinding(linearLayout, textView, materialButton, textInputLayout, materialButton2);
@@ -157,22 +157,22 @@ public final class WidgetAuthMfa extends AppFragment {
 
     @MainThread
     private final void showInfoDialog() {
-        View inflate = getLayoutInflater().inflate(2131558849, (ViewGroup) null, false);
-        int i = 2131364622;
-        TextView textView = (TextView) inflate.findViewById(2131364622);
+        View inflate = getLayoutInflater().inflate(2131558852, (ViewGroup) null, false);
+        int i = 2131364671;
+        TextView textView = (TextView) inflate.findViewById(2131364671);
         if (textView != null) {
-            i = 2131365580;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365580);
+            i = 2131365641;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365641);
             if (materialButton != null) {
-                i = 2131365581;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131365581);
+                i = 2131365642;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131365642);
                 if (linkifiedTextView != null) {
                     LinearLayout linearLayout = (LinearLayout) inflate;
-                    m.checkNotNullExpressionValue(new y3(linearLayout, textView, materialButton, linkifiedTextView), "WidgetAuthMfaInfoBinding…outInflater, null, false)");
+                    m.checkNotNullExpressionValue(new b4(linearLayout, textView, materialButton, linkifiedTextView), "WidgetAuthMfaInfoBinding…outInflater, null, false)");
                     m.checkNotNullExpressionValue(linearLayout, "binding.root");
                     AlertDialog show = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).show();
                     m.checkNotNullExpressionValue(linkifiedTextView, "binding.widgetAuthMfaInfoText");
-                    b.n(linkifiedTextView, 2131893995, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4);
+                    b.m(linkifiedTextView, 2131894095, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4);
                     materialButton.setOnClickListener(new WidgetAuthMfa$showInfoDialog$1(show));
                     return;
                 }
@@ -201,9 +201,9 @@ public final class WidgetAuthMfa extends AppFragment {
                         m.checkNotNullExpressionValue(coerceToText, "clipboardText");
                         codeVerificationView.setCode(coerceToText);
                         getBinding().b.setOnCodeEntered(new WidgetAuthMfa$tryPasteCodeFromClipboard$2(this));
-                        Observable<Long> e02 = Observable.e0(500, TimeUnit.MILLISECONDS);
-                        m.checkNotNullExpressionValue(e02, "Observable\n            .…L, TimeUnit.MILLISECONDS)");
-                        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetAuthMfa.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthMfa$tryPasteCodeFromClipboard$3(this), 62, (Object) null);
+                        Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+                        m.checkNotNullExpressionValue(d02, "Observable\n            .…L, TimeUnit.MILLISECONDS)");
+                        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthMfa.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthMfa$tryPasteCodeFromClipboard$3(this), 62, (Object) null);
                     }
                 }
             }
@@ -213,7 +213,7 @@ public final class WidgetAuthMfa extends AppFragment {
     @Override // androidx.fragment.app.Fragment
     public boolean onContextItemSelected(MenuItem menuItem) {
         m.checkNotNullParameter(menuItem, "item");
-        if (menuItem.getItemId() != 2131363878) {
+        if (menuItem.getItemId() != 2131363919) {
             return super.onContextItemSelected(menuItem);
         }
         tryPasteCodeFromClipboard();
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$Companion$registerForResult$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$Companion$registerForResult$1.java
index 6d9b8067e2..e524df0189 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$Companion$registerForResult$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$Companion$registerForResult$1.java
@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.content.Intent;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultCallback;
+import com.discord.widgets.auth.WidgetAuthPhoneVerify;
 import d0.z.d.m;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthPhoneVerify.kt */
@@ -19,8 +20,10 @@ public final class WidgetAuthPhoneVerify$Companion$registerForResult$1<O> implem
             Intent data = activityResult.getData();
             String stringExtra = data != null ? data.getStringExtra("RESULT_EXTRA_TOKEN") : null;
             if (stringExtra != null) {
-                this.$callback.invoke(stringExtra);
+                this.$callback.invoke(new WidgetAuthPhoneVerify.Result.Token(stringExtra));
             }
+        } else if (activityResult.getResultCode() == 2) {
+            this.$callback.invoke(WidgetAuthPhoneVerify.Result.Cancelled.INSTANCE);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java
index a79e64715a..8337d94c86 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$binding$2.java
@@ -26,21 +26,25 @@ public final /* synthetic */ class WidgetAuthPhoneVerify$binding$2 extends k imp
             TextView textView2 = (TextView) view.findViewById(2131362036);
             if (textView2 != null) {
                 i = 2131362037;
-                CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362037);
-                if (codeVerificationView != null) {
+                TextView textView3 = (TextView) view.findViewById(2131362037);
+                if (textView3 != null) {
                     i = 2131362038;
-                    TextView textView3 = (TextView) view.findViewById(2131362038);
-                    if (textView3 != null) {
+                    CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362038);
+                    if (codeVerificationView != null) {
                         i = 2131362039;
                         TextView textView4 = (TextView) view.findViewById(2131362039);
                         if (textView4 != null) {
                             i = 2131362040;
                             TextView textView5 = (TextView) view.findViewById(2131362040);
                             if (textView5 != null) {
-                                i = 2131362896;
-                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
-                                if (dimmerView != null) {
-                                    return new WidgetAuthPhoneVerifyBinding((CoordinatorLayout) view, textView, textView2, codeVerificationView, textView3, textView4, textView5, dimmerView);
+                                i = 2131362041;
+                                TextView textView6 = (TextView) view.findViewById(2131362041);
+                                if (textView6 != null) {
+                                    i = 2131362921;
+                                    DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
+                                    if (dimmerView != null) {
+                                        return new WidgetAuthPhoneVerifyBinding((CoordinatorLayout) view, textView, textView2, textView3, codeVerificationView, textView4, textView5, textView6, dimmerView);
+                                    }
                                 }
                             }
                         }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java
index 95cc4e1f42..7cefd35b3f 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java
@@ -27,6 +27,6 @@ public final class WidgetAuthPhoneVerify$evaluateCode$2 extends o implements Fun
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
         RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Phone Verification", "response_error", d0.t.m.listOf("code"));
-        WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).d.b();
+        WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).e.b();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$inputCode$3.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$inputCode$3.java
index 1261c6696b..5f7bcde1e4 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$inputCode$3.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$inputCode$3.java
@@ -23,6 +23,6 @@ public final class WidgetAuthPhoneVerify$inputCode$3 extends o implements Functi
 
     public final void invoke(Long l) {
         WidgetAuthPhoneVerify widgetAuthPhoneVerify = this.this$0;
-        WidgetAuthPhoneVerify.access$evaluateCode(widgetAuthPhoneVerify, WidgetAuthPhoneVerify.access$getBinding$p(widgetAuthPhoneVerify).d.getCode());
+        WidgetAuthPhoneVerify.access$evaluateCode(widgetAuthPhoneVerify, WidgetAuthPhoneVerify.access$getBinding$p(widgetAuthPhoneVerify).e.getCode());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$3.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$3.java
index aef45c1df4..226254df3a 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$3.java
@@ -1,29 +1,16 @@
 package com.discord.widgets.auth;
 
-import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
+import android.view.View;
 /* compiled from: WidgetAuthPhoneVerify.kt */
-public final class WidgetAuthPhoneVerify$onViewBound$3 extends o implements Function1<String, Unit> {
+public final class WidgetAuthPhoneVerify$onViewBound$3 implements View.OnClickListener {
     public final /* synthetic */ WidgetAuthPhoneVerify this$0;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetAuthPhoneVerify$onViewBound$3(WidgetAuthPhoneVerify widgetAuthPhoneVerify) {
-        super(1);
         this.this$0 = widgetAuthPhoneVerify;
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(String str) {
-        invoke(str);
-        return Unit.a;
-    }
-
-    public final void invoke(String str) {
-        m.checkNotNullParameter(str, "code");
-        WidgetAuthPhoneVerify.access$evaluateCode(this.this$0, str);
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetAuthPhoneVerify.access$bailoutToEmail(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java
new file mode 100644
index 0000000000..666ab48548
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$onViewBound$4.java
@@ -0,0 +1,29 @@
+package com.discord.widgets.auth;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetAuthPhoneVerify.kt */
+public final class WidgetAuthPhoneVerify$onViewBound$4 extends o implements Function1<String, Unit> {
+    public final /* synthetic */ WidgetAuthPhoneVerify this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetAuthPhoneVerify$onViewBound$4(WidgetAuthPhoneVerify widgetAuthPhoneVerify) {
+        super(1);
+        this.this$0 = widgetAuthPhoneVerify;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "code");
+        WidgetAuthPhoneVerify.access$evaluateCode(this.this$0, str);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$1.java
index e709fd9f46..22e012c7d7 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$1.java
@@ -22,6 +22,6 @@ public final class WidgetAuthPhoneVerify$resendCode$1 extends o implements Funct
     }
 
     public final void invoke(Void r1) {
-        WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).d.b();
+        WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).e.b();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$2.java
index cfcc57d6c9..74e6ae1b6f 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$resendCode$2.java
@@ -25,6 +25,6 @@ public final class WidgetAuthPhoneVerify$resendCode$2 extends o implements Funct
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).d.b();
+        WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).e.b();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
index a04548d219..303fb3e7f2 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java
@@ -16,13 +16,11 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.fragment.app.Fragment;
 import c.a.d.l;
 import c.d.b.a.a;
-import c.i.a.f.e.h.j.k0;
-import c.i.a.f.e.h.j.p;
-import c.i.a.f.h.b.b;
 import c.i.a.f.h.b.h;
-import c.i.a.f.h.b.j;
-import com.airbnb.lottie.parser.AnimatableValueParser;
+import c.i.a.f.h.b.i;
+import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
+import com.discord.app.AppTransitionActivity;
 import com.discord.databinding.WidgetAuthPhoneVerifyBinding;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.restapi.RestAPIParams;
@@ -32,8 +30,8 @@ import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.google.android.gms.common.Feature;
 import d0.z.d.m;
+import j0.l.e.j;
 import java.util.concurrent.TimeUnit;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -49,6 +47,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     private static final String INTENT_EXTRA_PHONE = "INTENT_EXTRA_PHONE";
     private static final String INTENT_EXTRA_SUBTITLE = "INTENT_EXTRA_SUBTITLE";
     private static final String INTENT_EXTRA_TITLE = "INTENT_EXTRA_TITLE";
+    private static final int RESULT_BACK_TO_EMAIL = 2;
     private static final String RESULT_EXTRA_TOKEN = "RESULT_EXTRA_TOKEN";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetAuthPhoneVerify$binding$2.INSTANCE, null, 2, null);
     private SmsAuthCodeBroadcastReceiver broadcastReceiver;
@@ -77,17 +76,92 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
             l.g.f(context, activityResultLauncher, WidgetAuthPhoneVerify.class, intent);
         }
 
-        public final ActivityResultLauncher<Intent> registerForResult(AppFragment appFragment, Function1<? super String, Unit> function1) {
+        public final ActivityResultLauncher<Intent> registerForResult(AppFragment appFragment, Function1<? super Result, Unit> function1) {
             m.checkNotNullParameter(appFragment, "fragment");
             m.checkNotNullParameter(function1, "callback");
             ActivityResultLauncher<Intent> registerForActivityResult = appFragment.registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new WidgetAuthPhoneVerify$Companion$registerForResult$1(function1));
-            m.checkNotNullExpressionValue(registerForActivityResult, "fragment.registerForActi…  }\n          }\n        }");
+            m.checkNotNullExpressionValue(registerForActivityResult, "fragment.registerForActi…ed)\n          }\n        }");
             return registerForActivityResult;
         }
     }
 
+    /* compiled from: WidgetAuthPhoneVerify.kt */
+    public static abstract class Result {
+
+        /* compiled from: WidgetAuthPhoneVerify.kt */
+        public static final class Cancelled extends Result {
+            public static final Cancelled INSTANCE = new Cancelled();
+
+            private Cancelled() {
+                super(null);
+            }
+        }
+
+        /* compiled from: WidgetAuthPhoneVerify.kt */
+        public static final class Token extends Result {
+            private final String token;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public Token(String str) {
+                super(null);
+                m.checkNotNullParameter(str, "token");
+                this.token = str;
+            }
+
+            public static /* synthetic */ Token copy$default(Token token, String str, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    str = token.token;
+                }
+                return token.copy(str);
+            }
+
+            public final String component1() {
+                return this.token;
+            }
+
+            public final Token copy(String str) {
+                m.checkNotNullParameter(str, "token");
+                return new Token(str);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof Token) && m.areEqual(this.token, ((Token) obj).token);
+                }
+                return true;
+            }
+
+            public final String getToken() {
+                return this.token;
+            }
+
+            public int hashCode() {
+                String str = this.token;
+                if (str != null) {
+                    return str.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                return a.D(a.L("Token(token="), this.token, ")");
+            }
+        }
+
+        private Result() {
+        }
+
+        public /* synthetic */ Result(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
     public WidgetAuthPhoneVerify() {
-        super(2131558850);
+        super(2131558853);
+    }
+
+    public static final /* synthetic */ void access$bailoutToEmail(WidgetAuthPhoneVerify widgetAuthPhoneVerify) {
+        widgetAuthPhoneVerify.bailoutToEmail();
     }
 
     public static final /* synthetic */ void access$evaluateCode(WidgetAuthPhoneVerify widgetAuthPhoneVerify, String str) {
@@ -110,6 +184,22 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         widgetAuthPhoneVerify.tryPasteCodeFromClipboard();
     }
 
+    private final void bailoutToEmail() {
+        AppActivity appActivity = getAppActivity();
+        if (appActivity != null) {
+            appActivity.setResult(2);
+        }
+        AppTransitionActivity.i = true;
+        AppActivity appActivity2 = getAppActivity();
+        if (appActivity2 != null) {
+            appActivity2.overridePendingTransition(2130771990, 2130771989);
+        }
+        AppActivity appActivity3 = getAppActivity();
+        if (appActivity3 != null) {
+            appActivity3.finish();
+        }
+    }
+
     private final void evaluateCode(String str) {
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Phone Verification", "submitted", null, 4, null);
         RestAPI api = RestAPI.Companion.getApi();
@@ -117,7 +207,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         if (str2 == null) {
             m.throwUninitializedPropertyAccessException("phone");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(api.phoneVerificationsVerify(new RestAPIParams.VerificationCode(str2, str)), false, 1, null), this, null, 2, null), getBinding().h, 0, 2, null), WidgetAuthPhoneVerify.class, getContext(), (Function1) null, new WidgetAuthPhoneVerify$evaluateCode$2(this), (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$evaluateCode$1(this), 52, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(api.phoneVerificationsVerify(new RestAPIParams.VerificationCode(str2, str)), false, 1, null), this, null, 2, null), getBinding().i, 0, 2, null), WidgetAuthPhoneVerify.class, getContext(), (Function1) null, new WidgetAuthPhoneVerify$evaluateCode$2(this), (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$evaluateCode$1(this), 52, (Object) null);
     }
 
     private final WidgetAuthPhoneVerifyBinding getBinding() {
@@ -125,12 +215,12 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     }
 
     private final void inputCode(CharSequence charSequence) {
-        getBinding().d.setOnCodeEntered(WidgetAuthPhoneVerify$inputCode$1.INSTANCE);
-        getBinding().d.setCode(charSequence);
-        getBinding().d.setOnCodeEntered(new WidgetAuthPhoneVerify$inputCode$2(this));
-        Observable<Long> e02 = Observable.e0(500, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
+        getBinding().e.setOnCodeEntered(WidgetAuthPhoneVerify$inputCode$1.INSTANCE);
+        getBinding().e.setCode(charSequence);
+        getBinding().e.setOnCodeEntered(new WidgetAuthPhoneVerify$inputCode$2(this));
+        Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
     }
 
     private final void resendCode(String str) {
@@ -139,7 +229,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         if (str2 == null) {
             m.throwUninitializedPropertyAccessException("phone");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(api.phoneVerificationsResend(new RestAPIParams.VerificationCodeResend(str2, str)), false, 1, null), this, null, 2, null), getBinding().h, 0, 2, null), WidgetAuthPhoneVerify.class, getContext(), (Function1) null, new WidgetAuthPhoneVerify$resendCode$2(this), (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$resendCode$1(this), 52, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(api.phoneVerificationsResend(new RestAPIParams.VerificationCodeResend(str2, str)), false, 1, null), this, null, 2, null), getBinding().i, 0, 2, null), WidgetAuthPhoneVerify.class, getContext(), (Function1) null, new WidgetAuthPhoneVerify$resendCode$2(this), (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$resendCode$1(this), 52, (Object) null);
     }
 
     public static /* synthetic */ void resendCode$default(WidgetAuthPhoneVerify widgetAuthPhoneVerify, String str, int i, Object obj) {
@@ -150,12 +240,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     }
 
     private final void setUpSmsReceiverSystem(Context context) {
-        h hVar = new h(requireActivity());
-        p.a aVar = new p.a(null);
-        aVar.a = new j(hVar);
-        aVar.b = new Feature[]{b.b};
-        AnimatableValueParser.p(true, "execute parameter required");
-        hVar.c(new k0(aVar, aVar.b, true));
+        new h(requireActivity()).c(new i());
         SmsAuthCodeBroadcastReceiver smsAuthCodeBroadcastReceiver = new SmsAuthCodeBroadcastReceiver(new WidgetAuthPhoneVerify$setUpSmsReceiverSystem$1(this));
         this.broadcastReceiver = smsAuthCodeBroadcastReceiver;
         if (smsAuthCodeBroadcastReceiver == null) {
@@ -191,7 +276,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     @Override // androidx.fragment.app.Fragment
     public boolean onContextItemSelected(MenuItem menuItem) {
         m.checkNotNullParameter(menuItem, "item");
-        if (menuItem.getItemId() != 2131363878) {
+        if (menuItem.getItemId() != 2131363919) {
             return super.onContextItemSelected(menuItem);
         }
         tryPasteCodeFromClipboard();
@@ -223,7 +308,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     public void onResume() {
         super.onResume();
         if (!this.ignoreAutopaste) {
-            j0.l.e.j jVar = new j0.l.e.j(Unit.a);
+            j jVar = new j(Unit.a);
             m.checkNotNullExpressionValue(jVar, "Observable\n          .just(Unit)");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(jVar, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$onResume$1(this), 62, (Object) null);
             return;
@@ -252,28 +337,36 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         }
         m.checkNotNullExpressionValue(charSequenceExtra2, "mostRecentIntent.getChar…ENT_EXTRA_SUBTITLE) ?: \"\"");
         if (!m.areEqual(charSequenceExtra, "")) {
-            TextView textView = getBinding().g;
+            TextView textView = getBinding().h;
             m.checkNotNullExpressionValue(textView, "binding.authPhoneVerifyTitle");
             textView.setText(charSequenceExtra);
         }
         if (!m.areEqual(charSequenceExtra2, "")) {
-            TextView textView2 = getBinding().f;
+            TextView textView2 = getBinding().g;
             m.checkNotNullExpressionValue(textView2, "binding.authPhoneVerifySubtitle");
             textView2.setText(charSequenceExtra2);
         }
-        getBinding().e.setOnClickListener(new WidgetAuthPhoneVerify$onViewBound$1(this));
-        Experiment userExperiment = StoreStream.Companion.getExperiments().getUserExperiment("2021-05_call_me_instead_phone_verification", true);
+        getBinding().f.setOnClickListener(new WidgetAuthPhoneVerify$onViewBound$1(this));
+        StoreStream.Companion companion = StoreStream.Companion;
+        Experiment userExperiment = companion.getExperiments().getUserExperiment("2021-05_call_me_instead_phone_verification", true);
         if (userExperiment != null && userExperiment.getBucket() == 1) {
-            TextView textView3 = getBinding().b;
+            TextView textView3 = getBinding().f1675c;
             m.checkNotNullExpressionValue(textView3, "binding.authPhoneVerifyActionSeparator");
             textView3.setVisibility(0);
-            TextView textView4 = getBinding().f1678c;
+            TextView textView4 = getBinding().d;
             m.checkNotNullExpressionValue(textView4, "binding.authPhoneVerifyCall");
             textView4.setVisibility(0);
-            getBinding().f1678c.setOnClickListener(new WidgetAuthPhoneVerify$onViewBound$2(this));
+            getBinding().d.setOnClickListener(new WidgetAuthPhoneVerify$onViewBound$2(this));
         }
-        getBinding().d.setOnCodeEntered(new WidgetAuthPhoneVerify$onViewBound$3(this));
-        registerForContextMenu(getBinding().d);
+        Experiment userExperiment2 = companion.getExperiments().getUserExperiment("2021-06_reg_bailout_to_email_android", true);
+        if (userExperiment2 != null && userExperiment2.getBucket() == 1) {
+            TextView textView5 = getBinding().b;
+            m.checkNotNullExpressionValue(textView5, "binding.authPhoneBailout");
+            textView5.setVisibility(0);
+            getBinding().b.setOnClickListener(new WidgetAuthPhoneVerify$onViewBound$3(this));
+        }
+        getBinding().e.setOnCodeEntered(new WidgetAuthPhoneVerify$onViewBound$4(this));
+        registerForContextMenu(getBinding().e);
         setUpSmsReceiverSystem(requireContext());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java
index 26c7c5a838..162de691cf 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$binding$2.java
@@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetAuthRegisterAccountInformation$binding$
 
     public final WidgetAuthRegisterAccountInformationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362041;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362041);
+        int i = 2131362042;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362042);
         if (linkifiedTextView != null) {
-            i = 2131362042;
-            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362042);
+            i = 2131362043;
+            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362043);
             if (loadingButton != null) {
-                i = 2131362043;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362043);
+                i = 2131362044;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362044);
                 if (textInputLayout != null) {
-                    i = 2131362044;
-                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362044);
+                    i = 2131362045;
+                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362045);
                     if (textInputLayout2 != null) {
-                        i = 2131362059;
-                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362059);
+                        i = 2131362060;
+                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362060);
                         if (materialCheckBox != null) {
                             return new WidgetAuthRegisterAccountInformationBinding((CoordinatorLayout) view, linkifiedTextView, loadingButton, textInputLayout, textInputLayout2, materialCheckBox);
                         }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$register$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$register$2.java
index 2bf0ecc046..734c0cbb2c 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$register$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$register$2.java
@@ -27,7 +27,7 @@ public final class WidgetAuthRegisterAccountInformation$register$2 extends o imp
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
         AnalyticsTracker.INSTANCE.registered(false);
-        WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).f1679c.setIsLoading(false);
+        WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).f1676c.setIsLoading(false);
         WidgetAuthRegisterAccountInformation.access$handleError(this.this$0, error);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java
index 1067b3b11c..84252ab408 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$validationManager$2.java
@@ -31,7 +31,7 @@ public final class WidgetAuthRegisterAccountInformation$validationManager$2 exte
             if ((WidgetAuthRegisterAccountInformation.access$isConsentRequired$p(this.this$0.this$0) && checkBox.isChecked()) || !WidgetAuthRegisterAccountInformation.access$isConsentRequired$p(this.this$0.this$0)) {
                 return null;
             }
-            return checkBox.getContext().getString(2131893820);
+            return checkBox.getContext().getString(2131893918);
         }
     }
 
@@ -72,9 +72,9 @@ public final class WidgetAuthRegisterAccountInformation$validationManager$2 exte
         TextInputLayout textInputLayout = WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterAccountInformationUsernameWrap");
         BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion;
-        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131894408)};
+        InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131894527)};
         TextInputLayout textInputLayout2 = WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.authRegisterAccountInformationPasswordWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout2, companion.createRequiredInputValidator(2131891781), AuthUtils.INSTANCE.createPasswordInputValidator(2131891770)), new Input.GenericInput("tos", WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).f, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
+        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout2, companion.createRequiredInputValidator(2131891853), AuthUtils.INSTANCE.createPasswordInputValidator(2131891842)), new Input.GenericInput("tos", WidgetAuthRegisterAccountInformation.access$getBinding$p(this.this$0).f, new AnonymousClass1(this), AnonymousClass2.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java
index dc3d76bcaa..e5d874318e 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation.java
@@ -52,7 +52,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
     private final Lazy validationManager$delegate = g.lazy(new WidgetAuthRegisterAccountInformation$validationManager$2(this));
 
     public WidgetAuthRegisterAccountInformation() {
-        super(2131558851);
+        super(2131558854);
     }
 
     public static final /* synthetic */ WidgetAuthRegisterAccountInformationBinding access$getBinding$p(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation) {
@@ -89,11 +89,11 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout2, "binding.authRegisterAccountInformationPasswordWrap");
             ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetAuthRegisterAccountInformation$configureUI$1(this), 1, null);
         }
-        getBinding().f1679c.setOnClickListener(new WidgetAuthRegisterAccountInformation$configureUI$2(this));
+        getBinding().f1676c.setOnClickListener(new WidgetAuthRegisterAccountInformation$configureUI$2(this));
         if (RegistrationFlowRepo.Companion.getINSTANCE().getBirthday() != null || !this.shouldShowAgeGate) {
-            getBinding().f1679c.setText(getText(2131892547));
+            getBinding().f1676c.setText(getText(2131892628));
         } else {
-            getBinding().f1679c.setText(getText(2131891362));
+            getBinding().f1676c.setText(getText(2131891433));
         }
     }
 
@@ -175,7 +175,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
             RegistrationFlowRepo.Companion companion = RegistrationFlowRepo.Companion;
             if (companion.getINSTANCE().getBirthday() != null || !this.shouldShowAgeGate) {
                 String uTCDateTime = companion.getINSTANCE().getBirthday() != null ? TimeUtils.toUTCDateTime(companion.getINSTANCE().getBirthday(), "yyyy-MM-dd") : null;
-                getBinding().f1679c.setIsLoading(true);
+                getBinding().f1676c.setIsLoading(true);
                 StoreAuthentication authentication = StoreStream.Companion.getAuthentication();
                 TextInputLayout textInputLayout = getBinding().e;
                 m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterAccountInformationUsernameWrap");
@@ -230,8 +230,8 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         materialCheckBox.setVisibility(i);
         LinkifiedTextView linkifiedTextView2 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.authPolicyLinks");
-        b.n(linkifiedTextView2, this.isConsentRequired ? 2131893819 : 2131893818, new Object[]{getString(2131893817), getString(2131892376)}, null, 4);
-        getBinding().f1679c.setIsLoading(false);
+        b.m(linkifiedTextView2, this.isConsentRequired ? 2131893917 : 2131893916, new Object[]{getString(2131893915), getString(2131892453)}, null, 4);
+        getBinding().f1676c.setIsLoading(false);
         RegistrationFlowRepo.trackTransition$default(companion.getINSTANCE(), "Account Information", "viewed", null, 4, null);
         TextInputLayout textInputLayout = getBinding().e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterAccountInformationUsernameWrap");
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java
index ac6c9f13ec..68534a02cc 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$binding$2.java
@@ -22,26 +22,26 @@ public final /* synthetic */ class WidgetAuthRegisterIdentity$binding$2 extends
 
     public final WidgetAuthRegisterIdentityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362048;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362048);
+        int i = 2131362049;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362049);
         if (materialButton != null) {
-            i = 2131362049;
-            CardSegment cardSegment = (CardSegment) view.findViewById(2131362049);
+            i = 2131362050;
+            CardSegment cardSegment = (CardSegment) view.findViewById(2131362050);
             if (cardSegment != null) {
-                i = 2131362050;
-                PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131362050);
+                i = 2131362051;
+                PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131362051);
                 if (phoneOrEmailInputView != null) {
-                    i = 2131362051;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362051);
+                    i = 2131362052;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362052);
                     if (linkifiedTextView != null) {
-                        i = 2131362052;
-                        CardSegment cardSegment2 = (CardSegment) view.findViewById(2131362052);
+                        i = 2131362053;
+                        CardSegment cardSegment2 = (CardSegment) view.findViewById(2131362053);
                         if (cardSegment2 != null) {
-                            i = 2131362053;
-                            SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131362053);
+                            i = 2131362054;
+                            SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131362054);
                             if (segmentedControlContainer != null) {
-                                i = 2131362896;
-                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                                i = 2131362921;
+                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                                 if (dimmerView != null) {
                                     return new WidgetAuthRegisterIdentityBinding((CoordinatorLayout) view, materialButton, cardSegment, phoneOrEmailInputView, linkifiedTextView, cardSegment2, segmentedControlContainer, dimmerView);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java
index 4b56b18935..3bcf4e77b8 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$handleNext$1.java
@@ -27,6 +27,6 @@ public final class WidgetAuthRegisterIdentity$handleNext$1 extends o implements
 
     public final void invoke(Void r13) {
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Account Identity", "success", null, 4, null);
-        WidgetAuthPhoneVerify.Companion.launch(this.this$0.requireContext(), WidgetAuthRegisterIdentity.access$getPhoneVerifyLauncher$p(this.this$0), WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getTextOrEmpty(), b.g(this.this$0.requireContext(), 2131893266, new Object[0], null, 4), b.g(this.this$0.requireContext(), 2131893265, new Object[]{this.$phone}, null, 4));
+        WidgetAuthPhoneVerify.Companion.launch(this.this$0.requireContext(), WidgetAuthRegisterIdentity.access$getPhoneVerifyLauncher$p(this.this$0), WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getTextOrEmpty(), b.g(this.this$0.requireContext(), 2131893349, new Object[0], null, 4), b.g(this.this$0.requireContext(), 2131893348, new Object[]{this.$phone}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java
index 05c4066716..b39fcb9927 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneValidationManager$2.java
@@ -19,6 +19,6 @@ public final class WidgetAuthRegisterIdentity$phoneValidationManager$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo1invoke() {
-        return new ValidationManager(new Input.TextInputLayoutInput("phone", WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getMainTextInputLayout(), BasicTextInputValidator.Companion.createRequiredInputValidator(2131891873), AuthUtils.INSTANCE.createPhoneInputValidator(2131891869)));
+        return new ValidationManager(new Input.TextInputLayoutInput("phone", WidgetAuthRegisterIdentity.access$getBinding$p(this.this$0).d.getMainTextInputLayout(), BasicTextInputValidator.Companion.createRequiredInputValidator(2131891945), AuthUtils.INSTANCE.createPhoneInputValidator(2131891941)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneVerifyLauncher$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneVerifyLauncher$1.java
index 16f43fec37..daf170bc10 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneVerifyLauncher$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$phoneVerifyLauncher$1.java
@@ -2,12 +2,14 @@ package com.discord.widgets.auth;
 
 import c.a.d.l;
 import com.discord.utilities.auth.RegistrationFlowRepo;
+import com.discord.views.phone.PhoneOrEmailInputView;
+import com.discord.widgets.auth.WidgetAuthPhoneVerify;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthRegisterIdentity.kt */
-public final class WidgetAuthRegisterIdentity$phoneVerifyLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthRegisterIdentity$phoneVerifyLauncher$1 extends o implements Function1<WidgetAuthPhoneVerify.Result, Unit> {
     public final /* synthetic */ WidgetAuthRegisterIdentity this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -19,16 +21,20 @@ public final class WidgetAuthRegisterIdentity$phoneVerifyLauncher$1 extends o im
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(String str) {
-        invoke(str);
+    public /* bridge */ /* synthetic */ Unit invoke(WidgetAuthPhoneVerify.Result result) {
+        invoke(result);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
-        m.checkNotNullParameter(str, "phoneToken");
-        RegistrationFlowRepo.Companion companion = RegistrationFlowRepo.Companion;
-        RegistrationFlowRepo.trackTransition$default(companion.getINSTANCE(), "Phone Verification", "success", null, 4, null);
-        companion.getINSTANCE().setPhoneToken(str);
-        l.e(this.this$0.requireContext(), WidgetAuthRegisterAccountInformation.class, null, 4);
+    public final void invoke(WidgetAuthPhoneVerify.Result result) {
+        m.checkNotNullParameter(result, "result");
+        if (result instanceof WidgetAuthPhoneVerify.Result.Token) {
+            RegistrationFlowRepo.Companion companion = RegistrationFlowRepo.Companion;
+            RegistrationFlowRepo.trackTransition$default(companion.getINSTANCE(), "Phone Verification", "success", null, 4, null);
+            companion.getINSTANCE().setPhoneToken(((WidgetAuthPhoneVerify.Result.Token) result).getToken());
+            l.e(this.this$0.requireContext(), WidgetAuthRegisterAccountInformation.class, null, 4);
+        } else if (result instanceof WidgetAuthPhoneVerify.Result.Cancelled) {
+            WidgetAuthRegisterIdentity.access$setInputMode(this.this$0, PhoneOrEmailInputView.Mode.EMAIL);
+        }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java
index c0f9ec0fb0..f4e95894e2 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity.java
@@ -64,7 +64,7 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
     }
 
     public WidgetAuthRegisterIdentity() {
-        super(2131558852);
+        super(2131558855);
     }
 
     public static final /* synthetic */ WidgetAuthRegisterIdentityBinding access$getBinding$p(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity) {
@@ -86,9 +86,9 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
     private final void configurePhoneInput() {
         getBinding().d.setMode(this.inputMode);
         if (this.inputMode == PhoneOrEmailInputView.Mode.PHONE) {
-            getBinding().d.setHint(getString(2131888716));
+            getBinding().d.setHint(getString(2131888717));
         } else {
-            getBinding().d.setHint(getString(2131888645));
+            getBinding().d.setHint(getString(2131888646));
         }
         getBinding().d.getMainEditText().setImeOptions(6);
         ViewExtensions.setOnImeActionDone$default(getBinding().d.getMainTextInputLayout(), false, new WidgetAuthRegisterIdentity$configurePhoneInput$1(this), 1, null);
@@ -107,11 +107,11 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         }
         getBinding().g.setSelectedIndex(i2);
         CardSegment cardSegmentForMode = getCardSegmentForMode(mode2);
-        cardSegmentForMode.setText(getString(2131891867));
-        cardSegmentForMode.setContentDescription(getString(2131894158));
+        cardSegmentForMode.setText(getString(2131891939));
+        cardSegmentForMode.setContentDescription(getString(2131894259));
         CardSegment cardSegmentForMode2 = getCardSegmentForMode(PhoneOrEmailInputView.Mode.EMAIL);
         cardSegmentForMode2.setText(getString(2131888221));
-        cardSegmentForMode2.setContentDescription(getString(2131894155));
+        cardSegmentForMode2.setContentDescription(getString(2131894256));
     }
 
     private final void configureUI() {
@@ -123,7 +123,7 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         getBinding().d.requestFocus();
         LinkifiedTextView linkifiedTextView = getBinding().e;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.authRegisterIdentityPolicyLink");
-        b.n(linkifiedTextView, 2131892551, new Object[]{getString(2131892376)}, null, 4);
+        b.m(linkifiedTextView, 2131892632, new Object[]{getString(2131892453)}, null, 4);
         getBinding().b.setOnClickListener(new WidgetAuthRegisterIdentity$configureUI$3(this));
     }
 
@@ -133,7 +133,7 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
 
     private final CardSegment getCardSegmentForMode(PhoneOrEmailInputView.Mode mode) {
         if (mode == PhoneOrEmailInputView.Mode.PHONE) {
-            CardSegment cardSegment = getBinding().f1680c;
+            CardSegment cardSegment = getBinding().f1677c;
             m.checkNotNullExpressionValue(cardSegment, "binding.authRegisterIdentityFirstSegmentCard");
             return cardSegment;
         }
@@ -224,13 +224,10 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         StoreStream.Companion companion = StoreStream.Companion;
         boolean z2 = true;
         Experiment userExperiment = companion.getExperiments().getUserExperiment("2021-01_android_registration_flow", true);
-        this.shouldValidateInputs = (userExperiment == null || userExperiment.getBucket() != 1) && (userExperiment == null || userExperiment.getBucket() != 3);
-        Experiment userExperiment2 = companion.getExperiments().getUserExperiment("2021-06_android_reg_cache_tab_input", true);
-        PhoneOrEmailInputView phoneOrEmailInputView = getBinding().d;
-        if (userExperiment2 == null || userExperiment2.getBucket() != 1) {
+        if ((userExperiment != null && userExperiment.getBucket() == 1) || (userExperiment != null && userExperiment.getBucket() == 3)) {
             z2 = false;
         }
-        phoneOrEmailInputView.setSaveValues(z2);
+        this.shouldValidateInputs = z2;
         configureUI();
         companion.getInviteSettings().trackWithInvite$app_productionGoogleRelease(WidgetAuthRegisterIdentity.class, WidgetAuthRegisterIdentity$onViewCreated$1.INSTANCE);
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java
index 98e5e96deb..4e3532595e 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword$binding$2.java
@@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetAuthResetPassword$binding$2 extends k i
 
     public final WidgetAuthResetPasswordBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362056;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362056);
+        int i = 2131362057;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362057);
         if (materialButton != null) {
-            i = 2131362057;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362057);
+            i = 2131362058;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362058);
             if (materialButton2 != null) {
                 return new WidgetAuthResetPasswordBinding((CoordinatorLayout) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java
index 1df1d0b436..5c93523bf3 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthResetPassword.java
@@ -40,7 +40,7 @@ public final class WidgetAuthResetPassword extends AppFragment {
     }
 
     public WidgetAuthResetPassword() {
-        super(2131558853);
+        super(2131558856);
     }
 
     public static final /* synthetic */ String access$getToken$p(WidgetAuthResetPassword widgetAuthResetPassword) {
@@ -68,7 +68,7 @@ public final class WidgetAuthResetPassword extends AppFragment {
             stringExtra = "";
         }
         this.token = stringExtra;
-        getBinding().f1681c.setOnClickListener(new WidgetAuthResetPassword$onViewBound$1(this));
+        getBinding().f1678c.setOnClickListener(new WidgetAuthResetPassword$onViewBound$1(this));
         getBinding().b.setOnClickListener(new WidgetAuthResetPassword$onViewBound$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java
index 94ac07487d..d15a318b6c 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount$binding$2.java
@@ -18,14 +18,14 @@ public final /* synthetic */ class WidgetAuthUndeleteAccount$binding$2 extends k
 
     public final WidgetAuthUndeleteAccountBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362060;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362060);
+        int i = 2131362061;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362061);
         if (materialButton != null) {
-            i = 2131362061;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362061);
+            i = 2131362062;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362062);
             if (materialButton2 != null) {
-                i = 2131362062;
-                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362062);
+                i = 2131362063;
+                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362063);
                 if (screenTitleView != null) {
                     return new WidgetAuthUndeleteAccountBinding((CoordinatorLayout) view, materialButton, materialButton2, screenTitleView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java
index fb0c4bf2bb..e5213fbcdb 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthUndeleteAccount.java
@@ -53,7 +53,7 @@ public final class WidgetAuthUndeleteAccount extends AppFragment {
     }
 
     public WidgetAuthUndeleteAccount() {
-        super(2131558854);
+        super(2131558857);
     }
 
     private final WidgetAuthUndeleteAccountBinding getBinding() {
@@ -82,7 +82,7 @@ public final class WidgetAuthUndeleteAccount extends AppFragment {
             screenTitleView2.setTitle(string2);
             getBinding().d.setSubtitle(getString(2131886150));
         }
-        getBinding().f1682c.setOnClickListener(WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.INSTANCE);
+        getBinding().f1679c.setOnClickListener(WidgetAuthUndeleteAccount$onViewBoundOrOnResume$1.INSTANCE);
         getBinding().b.setOnClickListener(new WidgetAuthUndeleteAccount$onViewBoundOrOnResume$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java
index c835240148..a8f3456c48 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$adapter$1.java
@@ -22,12 +22,12 @@ public final class WidgetOauth2Authorize$adapter$1 extends o implements Function
     public final WidgetOauth2Authorize.OAuthPermissionViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         m.checkNotNullParameter(layoutInflater, "layoutInflater");
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = layoutInflater.inflate(2131558608, viewGroup, false);
-        int i = 2131364093;
-        ImageView imageView = (ImageView) inflate.findViewById(2131364093);
+        View inflate = layoutInflater.inflate(2131558609, viewGroup, false);
+        int i = 2131364136;
+        ImageView imageView = (ImageView) inflate.findViewById(2131364136);
         if (imageView != null) {
-            i = 2131364094;
-            TextView textView = (TextView) inflate.findViewById(2131364094);
+            i = 2131364137;
+            TextView textView = (TextView) inflate.findViewById(2131364137);
             if (textView != null) {
                 OauthTokenPermissionDetailedListItemBinding oauthTokenPermissionDetailedListItemBinding = new OauthTokenPermissionDetailedListItemBinding((ConstraintLayout) inflate, imageView, textView);
                 m.checkNotNullExpressionValue(oauthTokenPermissionDetailedListItemBinding, "OauthTokenPermissionDeta…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java
index 4cfa79114d..3f54497cc6 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$binding$2.java
@@ -23,65 +23,65 @@ public final /* synthetic */ class WidgetOauth2Authorize$binding$2 extends k imp
 
     public final WidgetOauthAuthorizeBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364073;
-        TextView textView = (TextView) view.findViewById(2131364073);
+        int i = 2131364116;
+        TextView textView = (TextView) view.findViewById(2131364116);
         if (textView != null) {
-            i = 2131364074;
-            ImageView imageView = (ImageView) view.findViewById(2131364074);
+            i = 2131364117;
+            ImageView imageView = (ImageView) view.findViewById(2131364117);
             if (imageView != null) {
-                i = 2131364075;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364075);
+                i = 2131364118;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364118);
                 if (simpleDraweeView != null) {
-                    i = 2131364076;
-                    TextView textView2 = (TextView) view.findViewById(2131364076);
+                    i = 2131364119;
+                    TextView textView2 = (TextView) view.findViewById(2131364119);
                     if (textView2 != null) {
-                        i = 2131364077;
-                        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364077);
+                        i = 2131364120;
+                        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364120);
                         if (materialCardView != null) {
-                            i = 2131364078;
-                            TextView textView3 = (TextView) view.findViewById(2131364078);
+                            i = 2131364121;
+                            TextView textView3 = (TextView) view.findViewById(2131364121);
                             if (textView3 != null) {
-                                i = 2131364079;
-                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364079);
+                                i = 2131364122;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364122);
                                 if (linearLayout != null) {
-                                    i = 2131364080;
-                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364080);
+                                    i = 2131364123;
+                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364123);
                                     if (materialButton != null) {
-                                        i = 2131364081;
-                                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364081);
+                                        i = 2131364124;
+                                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364124);
                                         if (materialButton2 != null) {
-                                            i = 2131364082;
-                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364082);
+                                            i = 2131364125;
+                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364125);
                                             if (linearLayout2 != null) {
-                                                i = 2131364083;
-                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131364083);
+                                                i = 2131364126;
+                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131364126);
                                                 if (materialButton3 != null) {
-                                                    i = 2131364084;
-                                                    ImageView imageView2 = (ImageView) view.findViewById(2131364084);
+                                                    i = 2131364127;
+                                                    ImageView imageView2 = (ImageView) view.findViewById(2131364127);
                                                     if (imageView2 != null) {
-                                                        i = 2131364085;
-                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364085);
+                                                        i = 2131364128;
+                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364128);
                                                         if (linearLayout3 != null) {
-                                                            i = 2131364086;
-                                                            TextView textView4 = (TextView) view.findViewById(2131364086);
+                                                            i = 2131364129;
+                                                            TextView textView4 = (TextView) view.findViewById(2131364129);
                                                             if (textView4 != null) {
-                                                                i = 2131364087;
-                                                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364087);
+                                                                i = 2131364130;
+                                                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364130);
                                                                 if (recyclerView != null) {
-                                                                    i = 2131364088;
-                                                                    TextView textView5 = (TextView) view.findViewById(2131364088);
+                                                                    i = 2131364131;
+                                                                    TextView textView5 = (TextView) view.findViewById(2131364131);
                                                                     if (textView5 != null) {
-                                                                        i = 2131364089;
-                                                                        ImageView imageView3 = (ImageView) view.findViewById(2131364089);
+                                                                        i = 2131364132;
+                                                                        ImageView imageView3 = (ImageView) view.findViewById(2131364132);
                                                                         if (imageView3 != null) {
-                                                                            i = 2131364090;
-                                                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364090);
+                                                                            i = 2131364133;
+                                                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364133);
                                                                             if (materialButton4 != null) {
-                                                                                i = 2131364091;
-                                                                                MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131364091);
+                                                                                i = 2131364134;
+                                                                                MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131364134);
                                                                                 if (materialButton5 != null) {
-                                                                                    i = 2131364092;
-                                                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364092);
+                                                                                    i = 2131364135;
+                                                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364135);
                                                                                     if (simpleDraweeView2 != null) {
                                                                                         return new WidgetOauthAuthorizeBinding((CoordinatorLayout) view, textView, imageView, simpleDraweeView, textView2, materialCardView, textView3, linearLayout, materialButton, materialButton2, linearLayout2, materialButton3, imageView2, linearLayout3, textView4, recyclerView, textView5, imageView3, materialButton4, materialButton5, simpleDraweeView2);
                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java
index c570e0e322..1784a60b04 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2.java
@@ -63,7 +63,7 @@ public final class WidgetOauth2Authorize$validationManager$2 extends o implement
                 sb.append(']');
                 str = sb.toString();
             }
-            c.a.d.o.h(getView().getContext(), b.i(getView(), 2131891659, new Object[]{str}, null, 4), 1, null, 8);
+            c.a.d.o.h(getView().getContext(), b.i(getView(), 2131891728, new Object[]{str}, null, 4), 1, null, 8);
             return true;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java
index 34042711b5..d6f51881d1 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java
@@ -122,7 +122,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         }
 
         private final void handleError(Context context, Exception exc, Function0<Unit> function0) {
-            String obj = b.g(context, 2131891660, new Object[]{exc.getMessage()}, null, 4).toString();
+            String obj = b.g(context, 2131891729, new Object[]{exc.getMessage()}, null, 4).toString();
             AppLog.g.w(obj, exc);
             o.h(context, obj, 1, null, 8);
             function0.mo1invoke();
@@ -437,13 +437,13 @@ public class WidgetOauth2Authorize extends AppFragment {
         public void bind(PermissionModel permissionModel) {
             m.checkNotNullParameter(permissionModel, "data");
             if (permissionModel.getScope() != null) {
-                this.binding.b.setImageResource(2131231503);
-                TextView textView = this.binding.f1619c;
+                this.binding.b.setImageResource(2131231509);
+                TextView textView = this.binding.f1615c;
                 m.checkNotNullExpressionValue(textView, "binding.oauthTokenPermissionDetailedName");
                 OAuthPermissionViews.a(textView, permissionModel.getScope());
             } else if (permissionModel.getFakeText() != null) {
-                this.binding.b.setImageResource(2131231522);
-                this.binding.f1619c.setText(permissionModel.getFakeText().intValue());
+                this.binding.b.setImageResource(2131231528);
+                this.binding.f1615c.setText(permissionModel.getFakeText().intValue());
             }
         }
     }
@@ -468,7 +468,7 @@ public class WidgetOauth2Authorize extends AppFragment {
     }
 
     public WidgetOauth2Authorize() {
-        super(2131559103);
+        super(2131559109);
         WidgetOauth2Authorize$oauth2ViewModel$2 widgetOauth2Authorize$oauth2ViewModel$2 = WidgetOauth2Authorize$oauth2ViewModel$2.INSTANCE;
         c.a.d.h0 h0Var = new c.a.d.h0(this);
         this.oauth2ViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(OAuth2ViewModel.class), new WidgetOauth2Authorize$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetOauth2Authorize$oauth2ViewModel$2));
@@ -492,7 +492,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         long parseSnowflake = TimeUtils.parseSnowflake(Long.valueOf(j));
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.oauthAuthorizeAgeNotice");
-        b.n(textView, 2131891637, new Object[]{DateUtils.formatDateTime(requireContext(), parseSnowflake, 65536)}, null, 4);
+        b.m(textView, 2131891706, new Object[]{DateUtils.formatDateTime(requireContext(), parseSnowflake, 65536)}, null, 4);
     }
 
     private final void configureNotSupportedUI(Uri uri) {
@@ -509,10 +509,10 @@ public class WidgetOauth2Authorize extends AppFragment {
     }
 
     private final void configureSecurityNoticeUI(List<String> list) {
-        int i = list.contains(OAuthScope.MessagesRead.INSTANCE.a()) ? 2131891633 : 2131891634;
+        int i = list.contains(OAuthScope.MessagesRead.INSTANCE.a()) ? 2131891702 : 2131891703;
         TextView textView = getBinding().m;
         m.checkNotNullExpressionValue(textView, "binding.oauthAuthorizeSecurityNotice");
-        b.m(textView, i, new Object[0], new WidgetOauth2Authorize$configureSecurityNoticeUI$1(this));
+        b.l(textView, i, new Object[0], new WidgetOauth2Authorize$configureSecurityNoticeUI$1(this));
     }
 
     public static /* synthetic */ void getCaptchaLauncher$annotations() {
@@ -521,21 +521,21 @@ public class WidgetOauth2Authorize extends AppFragment {
     private final int getRandomFakeScopeText() {
         switch (c.b.nextInt(8)) {
             case 0:
-                return 2131891649;
+                return 2131891718;
             case 1:
-                return 2131891650;
+                return 2131891719;
             case 2:
-                return 2131891651;
+                return 2131891720;
             case 3:
-                return 2131891652;
+                return 2131891721;
             case 4:
-                return 2131891653;
+                return 2131891722;
             case 5:
-                return 2131891654;
+                return 2131891723;
             case 6:
-                return 2131891655;
+                return 2131891724;
             default:
-                return 2131891656;
+                return 2131891725;
         }
     }
 
@@ -550,7 +550,7 @@ public class WidgetOauth2Authorize extends AppFragment {
         L.append(" in ");
         L.append(getClass().getSimpleName());
         Logger.e$default(appLog, L.toString(), invalidScopeException, null, 4, null);
-        o.h(requireContext(), b.g(requireContext(), 2131891659, new Object[]{invalidScopeException.a()}, null, 4), 1, null, 8);
+        o.h(requireContext(), b.g(requireContext(), 2131891728, new Object[]{invalidScopeException.a()}, null, 4), 1, null, 8);
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
             appActivity.setResult(0);
@@ -581,8 +581,8 @@ public class WidgetOauth2Authorize extends AppFragment {
         textView.setText(application.g());
         TextView textView2 = getBinding().k;
         m.checkNotNullExpressionValue(textView2, "binding.oauthAuthorizePermissionsLabelTv");
-        b.n(textView2, 2131891662, new Object[]{application.g()}, null, 4);
-        SimpleDraweeView simpleDraweeView2 = getBinding().f1842c;
+        b.m(textView2, 2131891731, new Object[]{application.g()}, null, 4);
+        SimpleDraweeView simpleDraweeView2 = getBinding().f1844c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.oauthAuthorizeApplicationIcon");
         String e = application.e();
         MGImages.setImage$default(simpleDraweeView2, e != null ? IconUtils.getApplicationIcon$default(application.f(), e, 0, 4, null) : null, 0, 0, false, null, null, 124, null);
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java
index e287faadd3..9b4fd40c04 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java
@@ -31,7 +31,7 @@ public final class WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1<O> i
         Object obj2 = (data2 == null || (extras = data2.getExtras()) == null) ? null : extras.get("error_code");
         WidgetOauth2AuthorizeSamsung.Companion companion = WidgetOauth2AuthorizeSamsung.Companion;
         WidgetOauth2AuthorizeSamsung.Companion.logW$default(companion, "Connection requires disclaimer acceptance. [" + obj2 + "] " + obj, null, 2, null);
-        o.i(this.this$0, 2131888495, 0, 4);
+        o.i(this.this$0, 2131888496, 0, 4);
         AppActivity appActivity = this.this$0.getAppActivity();
         if (appActivity != null) {
             appActivity.finish();
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java
index d4391b15ef..811b2fb3bc 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java
@@ -3,9 +3,9 @@ package com.discord.widgets.auth;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import c.a.i.a5;
-import c.a.i.b5;
-import c.a.i.c5;
+import c.a.i.d5;
+import c.a.i.e5;
+import c.a.i.f5;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetRemoteAuthBinding;
 import com.google.android.material.button.MaterialButton;
@@ -23,35 +23,35 @@ public final /* synthetic */ class WidgetRemoteAuth$binding$2 extends k implemen
 
     public final WidgetRemoteAuthBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362058;
-        View findViewById = view.findViewById(2131362058);
+        int i = 2131362059;
+        View findViewById = view.findViewById(2131362059);
         if (findViewById != null) {
-            MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131364405);
+            MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131364443);
             if (materialButton != null) {
-                c5 c5Var = new c5((LinearLayout) findViewById, materialButton);
-                i = 2131364024;
-                View findViewById2 = view.findViewById(2131364024);
+                f5 f5Var = new f5((LinearLayout) findViewById, materialButton);
+                i = 2131364067;
+                View findViewById2 = view.findViewById(2131364067);
                 if (findViewById2 != null) {
-                    MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131364407);
+                    MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131364445);
                     if (materialButton2 != null) {
-                        a5 a5Var = new a5((LinearLayout) findViewById2, materialButton2);
-                        i = 2131364191;
-                        View findViewById3 = view.findViewById(2131364191);
+                        d5 d5Var = new d5((LinearLayout) findViewById2, materialButton2);
+                        i = 2131364235;
+                        View findViewById3 = view.findViewById(2131364235);
                         if (findViewById3 != null) {
-                            int i2 = 2131364404;
-                            MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131364404);
+                            int i2 = 2131364442;
+                            MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131364442);
                             if (materialButton3 != null) {
-                                i2 = 2131364406;
-                                MaterialButton materialButton4 = (MaterialButton) findViewById3.findViewById(2131364406);
+                                i2 = 2131364444;
+                                MaterialButton materialButton4 = (MaterialButton) findViewById3.findViewById(2131364444);
                                 if (materialButton4 != null) {
-                                    i2 = 2131364408;
-                                    SwitchMaterial switchMaterial = (SwitchMaterial) findViewById3.findViewById(2131364408);
+                                    i2 = 2131364446;
+                                    SwitchMaterial switchMaterial = (SwitchMaterial) findViewById3.findViewById(2131364446);
                                     if (switchMaterial != null) {
-                                        b5 b5Var = new b5((LinearLayout) findViewById3, materialButton3, materialButton4, switchMaterial);
-                                        i = 2131364409;
-                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364409);
+                                        e5 e5Var = new e5((LinearLayout) findViewById3, materialButton3, materialButton4, switchMaterial);
+                                        i = 2131364447;
+                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364447);
                                         if (appViewFlipper != null) {
-                                            return new WidgetRemoteAuthBinding((RelativeLayout) view, c5Var, a5Var, b5Var, appViewFlipper);
+                                            return new WidgetRemoteAuthBinding((RelativeLayout) view, f5Var, d5Var, e5Var, appViewFlipper);
                                         }
                                     }
                                 }
@@ -59,11 +59,11 @@ public final /* synthetic */ class WidgetRemoteAuth$binding$2 extends k implemen
                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i2)));
                         }
                     } else {
-                        throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(2131364407)));
+                        throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(2131364445)));
                     }
                 }
             } else {
-                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131364405)));
+                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131364443)));
             }
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
index 40ddab4a5b..fc69cbe717 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java
@@ -57,7 +57,7 @@ public final class WidgetRemoteAuth extends AppFragment {
     }
 
     public WidgetRemoteAuth() {
-        super(2131559114);
+        super(2131559120);
         WidgetRemoteAuth$viewModel$2 widgetRemoteAuth$viewModel$2 = new WidgetRemoteAuth$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetRemoteAuthViewModel.class), new WidgetRemoteAuth$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetRemoteAuth$viewModel$2));
@@ -84,7 +84,7 @@ public final class WidgetRemoteAuth extends AppFragment {
             AppViewFlipper appViewFlipper2 = getBinding().e;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.remoteAuthViewFlipper");
             appViewFlipper2.setDisplayedChild(1);
-            getBinding().f1851c.b.setOnClickListener(new WidgetRemoteAuth$configureUI$1(this));
+            getBinding().f1853c.b.setOnClickListener(new WidgetRemoteAuth$configureUI$1(this));
         } else if (m.areEqual(viewState, WidgetRemoteAuthViewModel.ViewState.Succeeded.INSTANCE)) {
             AppViewFlipper appViewFlipper3 = getBinding().e;
             m.checkNotNullExpressionValue(appViewFlipper3, "binding.remoteAuthViewFlipper");
@@ -96,12 +96,12 @@ public final class WidgetRemoteAuth extends AppFragment {
             appViewFlipper4.setDisplayedChild(0);
             WidgetRemoteAuthViewModel.ViewState.Loaded loaded = (WidgetRemoteAuthViewModel.ViewState.Loaded) viewState;
             if (loaded.getLoginAllowed()) {
-                MaterialButton materialButton = getBinding().d.f69c;
+                MaterialButton materialButton = getBinding().d.f87c;
                 m.checkNotNullExpressionValue(materialButton, "binding.pendingLogin.remoteAuthLoginButton");
                 materialButton.setEnabled(true);
-                getBinding().d.f69c.setOnClickListener(new WidgetRemoteAuth$configureUI$3(this));
+                getBinding().d.f87c.setOnClickListener(new WidgetRemoteAuth$configureUI$3(this));
             } else {
-                MaterialButton materialButton2 = getBinding().d.f69c;
+                MaterialButton materialButton2 = getBinding().d.f87c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.pendingLogin.remoteAuthLoginButton");
                 materialButton2.setEnabled(false);
             }
@@ -126,8 +126,8 @@ public final class WidgetRemoteAuth extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        Observable<WidgetRemoteAuthViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetRemoteAuth.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetRemoteAuth$onViewBound$1(this), 60, (Object) null);
+        Observable<WidgetRemoteAuthViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetRemoteAuth.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetRemoteAuth$onViewBound$1(this), 60, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java
index bd112cd332..21b5a6f888 100644
--- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java
+++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java
@@ -81,9 +81,9 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel<ViewState> {
                 String handshakeToken = this.$handshakeData.getHandshakeToken();
                 BehaviorSubject access$getTemporaryBehaviorSubject$p = WidgetRemoteAuthViewModel.access$getTemporaryBehaviorSubject$p(this.this$0.this$0);
                 m.checkNotNullExpressionValue(access$getTemporaryBehaviorSubject$p, "temporaryBehaviorSubject");
-                Object o0 = access$getTemporaryBehaviorSubject$p.o0();
-                m.checkNotNullExpressionValue(o0, "temporaryBehaviorSubject.value");
-                WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) o0).booleanValue(), true));
+                Object n0 = access$getTemporaryBehaviorSubject$p.n0();
+                m.checkNotNullExpressionValue(n0, "temporaryBehaviorSubject.value");
+                WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) n0).booleanValue(), true));
                 return Unit.a;
             }
         }
@@ -108,9 +108,9 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel<ViewState> {
             String handshakeToken = modelRemoteAuthHandshake.getHandshakeToken();
             BehaviorSubject access$getTemporaryBehaviorSubject$p = WidgetRemoteAuthViewModel.access$getTemporaryBehaviorSubject$p(this.this$0);
             m.checkNotNullExpressionValue(access$getTemporaryBehaviorSubject$p, "temporaryBehaviorSubject");
-            Object o0 = access$getTemporaryBehaviorSubject$p.o0();
-            m.checkNotNullExpressionValue(o0, "temporaryBehaviorSubject.value");
-            WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) o0).booleanValue(), false));
+            Object n0 = access$getTemporaryBehaviorSubject$p.n0();
+            m.checkNotNullExpressionValue(n0, "temporaryBehaviorSubject.value");
+            WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) n0).booleanValue(), false));
             a.G(ViewModelKt.getViewModelScope(this.this$0), null, null, new AnonymousClass1(this, modelRemoteAuthHandshake, null), 3, null);
         }
     }
@@ -285,7 +285,7 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(str, "fingerprint");
         m.checkNotNullParameter(restAPI, "restAPI");
         this.restAPI = restAPI;
-        this.temporaryBehaviorSubject = BehaviorSubject.m0(Boolean.TRUE);
+        this.temporaryBehaviorSubject = BehaviorSubject.l0(Boolean.TRUE);
         if (t.isBlank(str)) {
             updateViewState(ViewState.Failed.INSTANCE);
             return;
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java
index 830643c20a..cf78382640 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java
@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.a2;
-import c.a.i.k4;
+import c.a.i.c2;
+import c.a.i.n4;
 import com.discord.api.botuikit.ComponentType;
 import com.discord.models.botuikit.ActionInteractionComponentState;
 import com.discord.models.botuikit.ActionRowMessageComponent;
@@ -40,7 +40,7 @@ public final class ActionRowComponentView extends LinearLayout implements Compon
         public final ActionRowComponentView inflateComponent(Context context, ViewGroup viewGroup) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(viewGroup, "root");
-            k4 a = k4.a(LayoutInflater.from(context).inflate(2131558965, viewGroup, false));
+            n4 a = n4.a(LayoutInflater.from(context).inflate(2131558968, viewGroup, false));
             m.checkNotNullExpressionValue(a, "WidgetChatListBotUiActio…om(context), root, false)");
             ActionRowComponentView actionRowComponentView = a.a;
             m.checkNotNullExpressionValue(actionRowComponentView, "WidgetChatListBotUiActio…ntext), root, false).root");
@@ -66,7 +66,7 @@ public final class ActionRowComponentView extends LinearLayout implements Compon
         m.checkNotNullParameter(actionRowMessageComponent, "component");
         m.checkNotNullParameter(componentProvider, "componentProvider");
         m.checkNotNullParameter(componentActionListener, "componentActionListener");
-        k4 a = k4.a(this);
+        n4 a = n4.a(this);
         m.checkNotNullExpressionValue(a, "WidgetChatListBotUiActio…mponentBinding.bind(this)");
         List<MessageComponent> components = actionRowMessageComponent.getComponents();
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(components, 10));
@@ -84,9 +84,9 @@ public final class ActionRowComponentView extends LinearLayout implements Compon
         m.checkNotNullExpressionValue(flexboxLayout, "binding.actionRowComponentViewGroup");
         WidgetChatListAdapterItemBotComponentRowKt.replaceViews(flexboxLayout, u.filterNotNull(arrayList));
         ActionInteractionComponentState.Failed childError = MessageComponentUtils.INSTANCE.getChildError(actionRowMessageComponent);
-        a2 a2Var = a.f118c;
-        m.checkNotNullExpressionValue(a2Var, "binding.actionRowComponentViewGroupErrorRow");
-        ConstraintLayout constraintLayout = a2Var.a;
+        c2 c2Var = a.f134c;
+        m.checkNotNullExpressionValue(c2Var, "binding.actionRowComponentViewGroupErrorRow");
+        ConstraintLayout constraintLayout = c2Var.a;
         m.checkNotNullExpressionValue(constraintLayout, "binding.actionRowComponentViewGroupErrorRow.root");
         if (!(childError != null)) {
             i = 8;
@@ -98,7 +98,7 @@ public final class ActionRowComponentView extends LinearLayout implements Compon
                 errorMessage = getResources().getString(2131886379);
                 m.checkNotNullExpressionValue(errorMessage, "resources.getString(R.st…plication_command_failed)");
             }
-            TextView textView = a.f118c.b;
+            TextView textView = a.f134c.b;
             m.checkNotNullExpressionValue(textView, "binding.actionRowCompone…ractionFailedLabelMessage");
             textView.setText(errorMessage);
         }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
index db5b9866b9..2bb9d371d2 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java
@@ -44,7 +44,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo
         public final ButtonComponentView inflateComponent(Context context, ViewGroup viewGroup) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(viewGroup, "root");
-            WidgetChatListBotUiButtonComponentBinding a = WidgetChatListBotUiButtonComponentBinding.a(LayoutInflater.from(context).inflate(2131558966, viewGroup, false));
+            WidgetChatListBotUiButtonComponentBinding a = WidgetChatListBotUiButtonComponentBinding.a(LayoutInflater.from(context).inflate(2131558969, viewGroup, false));
             m.checkNotNullExpressionValue(a, "WidgetChatListBotUiButto…om(context), root, false)");
             ButtonComponentView buttonComponentView = a.a;
             m.checkNotNullExpressionValue(buttonComponentView, "WidgetChatListBotUiButto…ntext), root, false).root");
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java
index 7b9539c2de..37dec4c2c2 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java
@@ -18,20 +18,20 @@ public final /* synthetic */ class SelectComponentBottomSheet$binding$2 extends
 
     public final WidgetSelectComponentBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365620;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365620);
+        int i = 2131365681;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365681);
         if (constraintLayout != null) {
-            i = 2131365621;
-            TextView textView = (TextView) view.findViewById(2131365621);
+            i = 2131365682;
+            TextView textView = (TextView) view.findViewById(2131365682);
             if (textView != null) {
-                i = 2131365622;
-                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365622);
+                i = 2131365683;
+                MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365683);
                 if (maxHeightRecyclerView != null) {
-                    i = 2131365623;
-                    TextView textView2 = (TextView) view.findViewById(2131365623);
+                    i = 2131365684;
+                    TextView textView2 = (TextView) view.findViewById(2131365684);
                     if (textView2 != null) {
-                        i = 2131365624;
-                        TextView textView3 = (TextView) view.findViewById(2131365624);
+                        i = 2131365685;
+                        TextView textView3 = (TextView) view.findViewById(2131365685);
                         if (textView3 != null) {
                             return new WidgetSelectComponentBottomSheetBinding((ConstraintLayout) view, constraintLayout, textView, maxHeightRecyclerView, textView2, textView3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
index 2e6dd025e1..baffcfb230 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java
@@ -103,7 +103,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
         if (viewState.isMultiSelect()) {
             TextView textView3 = getBinding().e;
             m.checkNotNullExpressionValue(textView3, "binding.widgetSheetComponentBottomSheetSubtitle");
-            textView3.setText(b.j(this, 2131891174, new Object[]{Integer.valueOf(viewState.getMinSelections())}, null, 4));
+            textView3.setText(b.j(this, 2131891245, new Object[]{Integer.valueOf(viewState.getMinSelections())}, null, 4));
         }
         TextView textView4 = getBinding().d;
         m.checkNotNullExpressionValue(textView4, "binding.widgetSheetComponentBottomSheetSelect");
@@ -137,7 +137,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559129;
+        return 2131559135;
     }
 
     public final void onItemSelected(SelectItem selectItem, boolean z2) {
@@ -157,7 +157,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         setBottomSheetCollapsedStateDisabled();
-        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1858c;
+        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1860c;
         m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.widgetSheetComponentBottomSheetRecycler");
         maxHeightRecyclerView.setAdapter(this.adapter);
     }
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java
index 8e1dc59fa9..c4ace36b58 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java
@@ -48,24 +48,24 @@ public final class SelectComponentBottomSheetAdapter extends RecyclerView.Adapte
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559130, viewGroup, false);
-        int i2 = 2131364570;
-        MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364570);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559136, viewGroup, false);
+        int i2 = 2131364609;
+        MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364609);
         if (materialTextView != null) {
-            i2 = 2131364571;
-            View findViewById = inflate.findViewById(2131364571);
+            i2 = 2131364610;
+            View findViewById = inflate.findViewById(2131364610);
             if (findViewById != null) {
-                i2 = 2131364572;
-                View findViewById2 = inflate.findViewById(2131364572);
+                i2 = 2131364611;
+                View findViewById2 = inflate.findViewById(2131364611);
                 if (findViewById2 != null) {
-                    i2 = 2131364573;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364573);
+                    i2 = 2131364612;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364612);
                     if (simpleDraweeView != null) {
-                        i2 = 2131364574;
-                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) inflate.findViewById(2131364574);
+                        i2 = 2131364613;
+                        MaterialCheckBox materialCheckBox = (MaterialCheckBox) inflate.findViewById(2131364613);
                         if (materialCheckBox != null) {
-                            i2 = 2131364575;
-                            MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364575);
+                            i2 = 2131364614;
+                            MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364614);
                             if (materialTextView2 != null) {
                                 WidgetSelectComponentBottomSheetItemBinding widgetSelectComponentBottomSheetItemBinding = new WidgetSelectComponentBottomSheetItemBinding((ConstraintLayout) inflate, materialTextView, findViewById, findViewById2, simpleDraweeView, materialCheckBox, materialTextView2);
                                 m.checkNotNullExpressionValue(widgetSelectComponentBottomSheetItemBinding, "WidgetSelectComponentBot…          false\n        )");
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java
index b93b24a8b9..324ac87283 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java
@@ -76,7 +76,7 @@ public final class SelectComponentBottomSheetItemViewHolder extends RecyclerView
         View view = this.binding.d;
         m.checkNotNullExpressionValue(view, "binding.selectComponentSheetItemDividerIcon");
         view.setVisibility(z3 && !z5 ? 0 : 8);
-        View view2 = this.binding.f1859c;
+        View view2 = this.binding.f1861c;
         m.checkNotNullExpressionValue(view2, "binding.selectComponentSheetItemDivider");
         if (z3 || z5) {
             z7 = false;
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java
index 473007601a..3ab91c93b0 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetViewModel.java
@@ -122,7 +122,7 @@ public final class SelectComponentBottomSheetViewModel extends AppViewModel<View
         this.isMultiSelect = i3 <= 1 ? false : z2;
         this.selectedItems = u.toMutableSet(list2);
         updateViewState();
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     private final boolean isValidSelection() {
diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java
index bd40789d48..962697926e 100644
--- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java
+++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java
@@ -7,8 +7,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.l4;
-import c.a.i.m4;
+import c.a.i.o4;
+import c.a.i.p4;
 import com.discord.api.botuikit.ComponentType;
 import com.discord.api.botuikit.SelectItem;
 import com.discord.models.botuikit.ActionInteractionComponentState;
@@ -44,7 +44,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
         public final SelectComponentView inflateComponent(Context context, ViewGroup viewGroup) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(viewGroup, "root");
-            l4 a = l4.a(LayoutInflater.from(context).inflate(2131558967, viewGroup, false));
+            o4 a = o4.a(LayoutInflater.from(context).inflate(2131558970, viewGroup, false));
             m.checkNotNullExpressionValue(a, "WidgetChatListBotUiSelec…om(context), root, false)");
             SelectComponentView selectComponentView = a.a;
             m.checkNotNullExpressionValue(selectComponentView, "WidgetChatListBotUiSelec…ntext), root, false).root");
@@ -70,11 +70,11 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
         m.checkNotNullParameter(selectMessageComponent, "component");
         m.checkNotNullParameter(componentProvider, "componentProvider");
         m.checkNotNullParameter(componentActionListener, "componentActionListener");
-        l4 a = l4.a(this);
+        o4 a = o4.a(this);
         m.checkNotNullExpressionValue(a, "WidgetChatListBotUiSelec…mponentBinding.bind(this)");
         String placeholder = selectMessageComponent.getPlaceholder();
         if (placeholder == null) {
-            placeholder = getResources().getString(2131891173);
+            placeholder = getResources().getString(2131891244);
             m.checkNotNullExpressionValue(placeholder, "resources.getString(R.st…nent_default_placeholder)");
         }
         int i = 0;
@@ -117,10 +117,10 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
             flexboxLayout3.removeAllViews();
             LayoutInflater from = LayoutInflater.from(getContext());
             for (SelectItem selectItem2 : selectMessageComponent.getSelectedOptions()) {
-                View inflate = from.inflate(2131558968, (ViewGroup) null, false);
+                View inflate = from.inflate(2131558971, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 MaterialTextView materialTextView6 = (MaterialTextView) inflate;
-                m.checkNotNullExpressionValue(new m4(materialTextView6), "WidgetChatListBotUiSelec…Binding.inflate(inflater)");
+                m.checkNotNullExpressionValue(new p4(materialTextView6), "WidgetChatListBotUiSelec…Binding.inflate(inflater)");
                 m.checkNotNullExpressionValue(materialTextView6, "WidgetChatListBotUiSelec…ng.inflate(inflater).root");
                 materialTextView6.setText(selectItem2.c());
                 flexboxLayout3.addView(materialTextView6);
@@ -128,13 +128,13 @@ public final class SelectComponentView extends ConstraintLayout implements Compo
         }
         boolean z2 = !(selectMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Disabled);
         boolean z3 = selectMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Loading;
-        TypingDots typingDots = a.f125c;
+        TypingDots typingDots = a.f138c;
         if (z3) {
             typingDots.a(false);
         } else {
             typingDots.b();
         }
-        TypingDots typingDots2 = a.f125c;
+        TypingDots typingDots2 = a.f138c;
         m.checkNotNullExpressionValue(typingDots2, "binding.selectComponentLoading");
         boolean z4 = !z3;
         typingDots2.setVisibility(z4 ? 4 : 0);
diff --git a/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java b/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
index 3be1d05402..e81106177f 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/BugReportViewModel.java
@@ -358,8 +358,8 @@ public final class BugReportViewModel extends AppViewModel<ViewState> {
     static {
         StickerFormatType stickerFormatType = StickerFormatType.LOTTIE;
         StickerType stickerType = StickerType.STANDARD;
-        sendingStickers = n.listOf((Object[]) new Sticker[]{new Sticker(754107634172297306L, 754103543786504244L, null, "On My Way", "", stickerFormatType, "", stickerType), new Sticker(751606719611928586L, 751604115435421716L, null, "Nelly flies over on a jetpack", "", stickerFormatType, "", stickerType), new Sticker(749049128012742676L, 749043879713701898L, null, "Wumpus zipping by on a monowheel", "", stickerFormatType, "", stickerType), new Sticker(761114619137359892L, 761106686382964758L, null, "Cap running in a hurry", "", stickerFormatType, "", stickerType), new Sticker(783788733987815434L, 783506493751296033L, null, "Phibi clapping her hands", "", stickerFormatType, "", stickerType)});
-        successStickers = n.listOf((Object[]) new Sticker[]{new Sticker(754109076933443614L, 754103543786504244L, null, "Clyde cheering with his arms raised", "", stickerFormatType, "", stickerType), new Sticker(751606065447305216L, 751604115435421716L, null, "Nelly waves her arms cheerfully", "", stickerFormatType, "", stickerType), new Sticker(749053689419006003L, 749043879713701898L, null, "Wumpus jumps for joy", "", stickerFormatType, "", stickerType), new Sticker(761108384010862602L, 761106686382964758L, null, "Cap gives a thumbs up", "", stickerFormatType, "", stickerType), new Sticker(783794979704537108L, 783506493751296033L, null, "Phibi riding a four leaf clover", "", stickerFormatType, "", stickerType)});
+        sendingStickers = n.listOf((Object[]) new Sticker[]{new Sticker(754107634172297306L, 754103543786504244L, null, "On My Way", "", stickerFormatType, "", stickerType, null, 256), new Sticker(751606719611928586L, 751604115435421716L, null, "Nelly flies over on a jetpack", "", stickerFormatType, "", stickerType, null, 256), new Sticker(749049128012742676L, 749043879713701898L, null, "Wumpus zipping by on a monowheel", "", stickerFormatType, "", stickerType, null, 256), new Sticker(761114619137359892L, 761106686382964758L, null, "Cap running in a hurry", "", stickerFormatType, "", stickerType, null, 256), new Sticker(783788733987815434L, 783506493751296033L, null, "Phibi clapping her hands", "", stickerFormatType, "", stickerType, null, 256)});
+        successStickers = n.listOf((Object[]) new Sticker[]{new Sticker(754109076933443614L, 754103543786504244L, null, "Clyde cheering with his arms raised", "", stickerFormatType, "", stickerType, null, 256), new Sticker(751606065447305216L, 751604115435421716L, null, "Nelly waves her arms cheerfully", "", stickerFormatType, "", stickerType, null, 256), new Sticker(749053689419006003L, 749043879713701898L, null, "Wumpus jumps for joy", "", stickerFormatType, "", stickerType, null, 256), new Sticker(761108384010862602L, 761106686382964758L, null, "Cap gives a thumbs up", "", stickerFormatType, "", stickerType, null, 256), new Sticker(783794979704537108L, 783506493751296033L, null, "Phibi riding a four leaf clover", "", stickerFormatType, "", stickerType, null, 256)});
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -376,7 +376,7 @@ public final class BugReportViewModel extends AppViewModel<ViewState> {
         this.sendingSticker = list.get(random);
         this.successSticker = successStickers.get(random);
         this.useScreenshot = true;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -405,9 +405,9 @@ public final class BugReportViewModel extends AppViewModel<ViewState> {
     }
 
     private final void dismissAfterDelay() {
-        Observable<Long> e02 = Observable.e0(1500, TimeUnit.MILLISECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable.timer(1500, TimeUnit.MILLISECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), BugReportViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportViewModel$dismissAfterDelay$1(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(1500, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable.timer(1500, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), BugReportViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new BugReportViewModel$dismissAfterDelay$1(this), 62, (Object) null);
     }
 
     public static /* synthetic */ void updateViewState$default(BugReportViewModel bugReportViewModel, Error error, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java
index 1427edaae8..3eea83aaba 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java
@@ -25,53 +25,53 @@ public final /* synthetic */ class WidgetBugReport$binding$2 extends k implement
 
     public final WidgetBugReportBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362161;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362161);
+        int i = 2131362172;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362172);
         if (appCompatImageView != null) {
-            i = 2131362162;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362162);
+            i = 2131362173;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362173);
             if (textInputLayout != null) {
-                i = 2131362163;
-                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362163);
+                i = 2131362174;
+                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362174);
                 if (textInputLayout2 != null) {
-                    i = 2131362164;
-                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362164);
+                    i = 2131362175;
+                    MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362175);
                     if (materialTextView != null) {
-                        i = 2131362165;
-                        TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131362165);
+                        i = 2131362176;
+                        TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131362176);
                         if (textInputLayout3 != null) {
-                            i = 2131362166;
-                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362166);
+                            i = 2131362177;
+                            MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362177);
                             if (materialCardView != null) {
-                                i = 2131362167;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362167);
+                                i = 2131362178;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362178);
                                 if (simpleDraweeView != null) {
-                                    i = 2131362168;
-                                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131362168);
+                                    i = 2131362179;
+                                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131362179);
                                     if (appCompatImageView2 != null) {
-                                        i = 2131362169;
-                                        ImageView imageView = (ImageView) view.findViewById(2131362169);
+                                        i = 2131362180;
+                                        ImageView imageView = (ImageView) view.findViewById(2131362180);
                                         if (imageView != null) {
-                                            i = 2131362170;
-                                            StickerView stickerView = (StickerView) view.findViewById(2131362170);
+                                            i = 2131362181;
+                                            StickerView stickerView = (StickerView) view.findViewById(2131362181);
                                             if (stickerView != null) {
-                                                i = 2131362171;
-                                                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131362171);
+                                                i = 2131362182;
+                                                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131362182);
                                                 if (materialTextView2 != null) {
-                                                    i = 2131362172;
-                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362172);
+                                                    i = 2131362183;
+                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362183);
                                                     if (materialButton != null) {
-                                                        i = 2131362173;
-                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362173);
+                                                        i = 2131362184;
+                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362184);
                                                         if (appViewFlipper != null) {
-                                                            i = 2131362174;
-                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362174);
+                                                            i = 2131362185;
+                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362185);
                                                             if (materialButton2 != null) {
-                                                                i = 2131365132;
-                                                                MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131365132);
+                                                                i = 2131365187;
+                                                                MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131365187);
                                                                 if (materialTextView3 != null) {
-                                                                    i = 2131365582;
-                                                                    View findViewById = view.findViewById(2131365582);
+                                                                    i = 2131365643;
+                                                                    View findViewById = view.findViewById(2131365643);
                                                                     if (findViewById != null) {
                                                                         return new WidgetBugReportBinding((CoordinatorLayout) view, appCompatImageView, textInputLayout, textInputLayout2, materialTextView, textInputLayout3, materialCardView, simpleDraweeView, appCompatImageView2, imageView, stickerView, materialTextView2, materialButton, appViewFlipper, materialButton2, materialTextView3, findViewById);
                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$items$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$items$2.java
index cbd478b227..93815a3f5c 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$items$2.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$items$2.java
@@ -27,7 +27,7 @@ public final class WidgetBugReport$items$2 extends o implements Function0<List<?
         for (Priority priority : priorityLevels) {
             String string = this.this$0.getString(priority.getTitle());
             m.checkNotNullExpressionValue(string, "getString(it.title)");
-            arrayList.add(new b0(string, b.j(this.this$0, priority.getDescription(), new Object[0], null, 4), ModelEmojiCustom.getImageUri(priority.getEmojiId(), true, 64)));
+            arrayList.add(new b0(string, b.j(this.this$0, priority.getDescription(), new Object[0], null, 4), ModelEmojiCustom.getImageUri(priority.getEmojiId(), true, 64), null, 8));
         }
         return arrayList;
     }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java
index 513f628233..10baf8f414 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java
@@ -1,15 +1,11 @@
 package com.discord.widgets.bugreports;
 
 import android.view.View;
-import androidx.core.os.BundleKt;
 import androidx.fragment.app.FragmentManager;
 import c.a.z.a0;
-import c.a.z.b0;
 import com.discord.app.AppFragment;
 import d0.z.d.m;
 import d0.z.d.o;
-import java.util.List;
-import java.util.Objects;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetBugReport.kt */
@@ -52,16 +48,6 @@ public final class WidgetBugReport$onViewBound$5 implements View.OnClickListener
         m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
         String string = this.this$0.getString(2131887079);
         m.checkNotNullExpressionValue(string, "getString(R.string.bug_report_priority)");
-        List<b0> items = this.this$0.getItems();
-        AnonymousClass1 r4 = new AnonymousClass1(this);
-        Objects.requireNonNull(aVar);
-        m.checkNotNullParameter(childFragmentManager, "fragmentManager");
-        m.checkNotNullParameter(string, "title");
-        m.checkNotNullParameter(items, "options");
-        m.checkNotNullParameter(r4, "onSelectedListener");
-        a0 a0Var = new a0();
-        a0Var.setArguments(BundleKt.bundleOf(d0.o.to("simple_bottom_sheet_title", string), d0.o.to("simple_bottom_sheet_options", items)));
-        a0Var.k = r4;
-        a0Var.show(childFragmentManager, d0.z.d.a0.getOrCreateKotlinClass(a0.class).toString());
+        aVar.a(childFragmentManager, string, this.this$0.getItems(), true, new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
index 2b789d32f9..f76d95744c 100644
--- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
+++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java
@@ -83,7 +83,7 @@ public final class WidgetBugReport extends AppFragment {
     }
 
     public WidgetBugReport() {
-        super(2131558856);
+        super(2131558859);
         WidgetBugReport$viewModel$2 widgetBugReport$viewModel$2 = new WidgetBugReport$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(BugReportViewModel.class), new WidgetBugReport$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetBugReport$viewModel$2));
@@ -149,7 +149,7 @@ public final class WidgetBugReport extends AppFragment {
                 RequestBody.Companion companion = RequestBody.Companion;
                 String type = requireContext().getContentResolver().getType(screenshotUri);
                 if (type != null) {
-                    MediaType.a aVar = MediaType.f2851c;
+                    MediaType.a aVar = MediaType.f2857c;
                     mediaType = MediaType.a.a(type);
                 }
                 requestBody = RequestBody.Companion.d(companion, readBytes, mediaType, 0, 0, 6);
@@ -172,14 +172,14 @@ public final class WidgetBugReport extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131893676);
+        setActionBarTitle(2131893773);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().h.setImageURI(Uri.parse(getMostRecentIntent().getStringExtra("extra_screenshot_uri")));
         getBinding().b.setOnClickListener(new WidgetBugReport$onViewBound$1(this));
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetBugReport$onViewBound$2(this));
-        TextInputLayout textInputLayout2 = getBinding().f1684c;
+        TextInputLayout textInputLayout2 = getBinding().f1681c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.bugReportDescription");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetBugReport$onViewBound$3(this));
         getBinding().m.setOnClickListener(new WidgetBugReport$onViewBound$4(this));
@@ -215,7 +215,7 @@ public final class WidgetBugReport extends AppFragment {
             TextInputLayout textInputLayout = getBinding().d;
             m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName");
             ViewExtensions.setTextIfDifferent(textInputLayout, report.getReportName());
-            TextInputLayout textInputLayout2 = getBinding().f1684c;
+            TextInputLayout textInputLayout2 = getBinding().f1681c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.bugReportDescription");
             ViewExtensions.setTextIfDifferent(textInputLayout2, report.getReportDescription());
             AppCompatImageView appCompatImageView = getBinding().h;
diff --git a/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser.java b/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser.java
index 12c3adef4e..5ff7f805e0 100644
--- a/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser.java
+++ b/app/src/main/java/com/discord/widgets/changelog/ChangeLogParser.java
@@ -43,10 +43,10 @@ public final class ChangeLogParser {
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(charSequence, "input");
         m.checkNotNullParameter(function3, "onClickListener");
-        List a = e.a(true, true);
+        List b = e.b(false, false, 3);
         List createChangelogSpecialMarkdownRules = z2 ? createChangelogSpecialMarkdownRules(context) : createMarkdownRules(context);
         Parser parser = new Parser(false, 1, null);
         Rules rules = Rules.INSTANCE;
-        return AstRenderer.render(Parser.parse$default(parser.addRule(rules.createSoftHyphenRule()).addRule(rules.createBlockQuoteRule()).addRule(rules.createMaskedLinkRule()).addRule(rules.createUrlNoEmbedRule()).addRule(rules.createUrlRule()).addRule(rules.createHookedLinkRule()).addRules(createChangelogSpecialMarkdownRules).addRules(a), charSequence, MessageParseState.Companion.getInitialState(), null, 4, null), new ChangeLogParser$parse$renderContext$1(function3, context));
+        return AstRenderer.render(Parser.parse$default(parser.addRule(rules.createSoftHyphenRule()).addRule(rules.createBlockQuoteRule()).addRule(rules.createMaskedLinkRule()).addRule(rules.createUrlNoEmbedRule()).addRule(rules.createUrlRule()).addRule(rules.createHookedLinkRule()).addRules(createChangelogSpecialMarkdownRules).addRules(b), charSequence, MessageParseState.Companion.getInitialState(), null, 4, null), new ChangeLogParser$parse$renderContext$1(function3, context));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java
index 5b256bfca1..1b40ac1b27 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$binding$2.java
@@ -21,32 +21,32 @@ public final /* synthetic */ class WidgetChangeLog$binding$2 extends k implement
 
     public final WidgetChangeLogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362231;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362231);
+        int i = 2131362242;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362242);
         if (linkifiedTextView != null) {
-            i = 2131362232;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362232);
+            i = 2131362243;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362243);
             if (linearLayout != null) {
-                i = 2131362233;
-                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(2131362233);
+                i = 2131362244;
+                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(2131362244);
                 if (appCompatImageButton != null) {
-                    i = 2131362234;
-                    AppCompatImageButton appCompatImageButton2 = (AppCompatImageButton) view.findViewById(2131362234);
+                    i = 2131362245;
+                    AppCompatImageButton appCompatImageButton2 = (AppCompatImageButton) view.findViewById(2131362245);
                     if (appCompatImageButton2 != null) {
-                        i = 2131362235;
-                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362235);
+                        i = 2131362246;
+                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362246);
                         if (nestedScrollView != null) {
-                            i = 2131362243;
-                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362243);
+                            i = 2131362254;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362254);
                             if (simpleDraweeView != null) {
-                                i = 2131362244;
-                                AppCompatImageButton appCompatImageButton3 = (AppCompatImageButton) view.findViewById(2131362244);
+                                i = 2131362255;
+                                AppCompatImageButton appCompatImageButton3 = (AppCompatImageButton) view.findViewById(2131362255);
                                 if (appCompatImageButton3 != null) {
-                                    i = 2131362245;
-                                    VideoView videoView = (VideoView) view.findViewById(2131362245);
+                                    i = 2131362256;
+                                    VideoView videoView = (VideoView) view.findViewById(2131362256);
                                     if (videoView != null) {
-                                        i = 2131362246;
-                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362246);
+                                        i = 2131362257;
+                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362257);
                                         if (simpleDraweeView2 != null) {
                                             return new WidgetChangeLogBinding((LinearLayout) view, linkifiedTextView, linearLayout, appCompatImageButton, appCompatImageButton2, nestedScrollView, simpleDraweeView, appCompatImageButton3, videoView, simpleDraweeView2);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java
index a19c8ce9a2..5973c5bfef 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java
@@ -12,6 +12,6 @@ public final class WidgetChangeLog$configureFooter$1 implements View.OnClickList
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        UriHandler.handle$default(UriHandler.INSTANCE, this.this$0.requireContext(), this.this$0.getString(2131893973), null, 4, null);
+        UriHandler.handle$default(UriHandler.INSTANCE, this.this$0.requireContext(), this.this$0.getString(2131894073), null, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java
index 1303867060..6db8fdce84 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java
@@ -71,7 +71,7 @@ public final class WidgetChangeLog extends AppFragment {
     }
 
     public WidgetChangeLog() {
-        super(2131558860);
+        super(2131558863);
     }
 
     public static final /* synthetic */ WidgetChangeLogBinding access$getBinding$p(WidgetChangeLog widgetChangeLog) {
@@ -100,7 +100,7 @@ public final class WidgetChangeLog extends AppFragment {
 
     private final void configureFooter() {
         getBinding().g.setOnClickListener(new WidgetChangeLog$configureFooter$1(this));
-        getBinding().f1687c.setOnClickListener(new WidgetChangeLog$configureFooter$2(this));
+        getBinding().f1684c.setOnClickListener(new WidgetChangeLog$configureFooter$2(this));
         getBinding().d.setOnClickListener(new WidgetChangeLog$configureFooter$3(this));
     }
 
@@ -244,7 +244,7 @@ public final class WidgetChangeLog extends AppFragment {
         this.openedTimestamp = ClockFactory.get().currentTimeMillis();
         track$default(this, "change_log_opened", null, false, 2, null);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131894623);
+        setActionBarTitle(2131894743);
         setActionBarSubtitle(getDateString(requireContext()));
         String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_BODY");
         if (stringExtra == null) {
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java
index 74d1a17f8b..5aea2a1bef 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial$binding$2.java
@@ -24,44 +24,44 @@ public final /* synthetic */ class WidgetChangeLogSpecial$binding$2 extends k im
 
     public final WidgetChangeLogSpecialBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362231;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362231);
+        int i = 2131362242;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362242);
         if (linkifiedTextView != null) {
-            i = 2131362236;
-            ImageButton imageButton = (ImageButton) view.findViewById(2131362236);
+            i = 2131362247;
+            ImageButton imageButton = (ImageButton) view.findViewById(2131362247);
             if (imageButton != null) {
-                i = 2131362237;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362237);
+                i = 2131362248;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362248);
                 if (materialButton != null) {
-                    i = 2131362238;
-                    ImageButton imageButton2 = (ImageButton) view.findViewById(2131362238);
+                    i = 2131362249;
+                    ImageButton imageButton2 = (ImageButton) view.findViewById(2131362249);
                     if (imageButton2 != null) {
-                        i = 2131362239;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362239);
+                        i = 2131362250;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362250);
                         if (linearLayout != null) {
-                            i = 2131362240;
-                            TextView textView = (TextView) view.findViewById(2131362240);
+                            i = 2131362251;
+                            TextView textView = (TextView) view.findViewById(2131362251);
                             if (textView != null) {
-                                i = 2131362241;
-                                TextView textView2 = (TextView) view.findViewById(2131362241);
+                                i = 2131362252;
+                                TextView textView2 = (TextView) view.findViewById(2131362252);
                                 if (textView2 != null) {
-                                    i = 2131362242;
-                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362242);
+                                    i = 2131362253;
+                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362253);
                                     if (nestedScrollView != null) {
-                                        i = 2131362243;
-                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362243);
+                                        i = 2131362254;
+                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362254);
                                         if (simpleDraweeView != null) {
-                                            i = 2131362245;
-                                            VideoView videoView = (VideoView) view.findViewById(2131362245);
+                                            i = 2131362256;
+                                            VideoView videoView = (VideoView) view.findViewById(2131362256);
                                             if (videoView != null) {
-                                                i = 2131362246;
-                                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362246);
+                                                i = 2131362257;
+                                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362257);
                                                 if (simpleDraweeView2 != null) {
-                                                    i = 2131362252;
-                                                    CardView cardView = (CardView) view.findViewById(2131362252);
+                                                    i = 2131362263;
+                                                    CardView cardView = (CardView) view.findViewById(2131362263);
                                                     if (cardView != null) {
-                                                        i = 2131362253;
-                                                        CardView cardView2 = (CardView) view.findViewById(2131362253);
+                                                        i = 2131362264;
+                                                        CardView cardView2 = (CardView) view.findViewById(2131362264);
                                                         if (cardView2 != null) {
                                                             return new WidgetChangeLogSpecialBinding((LinearLayout) view, linkifiedTextView, imageButton, materialButton, imageButton2, linearLayout, textView, textView2, nestedScrollView, simpleDraweeView, videoView, simpleDraweeView2, cardView, cardView2);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java
index d0390f5b7a..16213dc76a 100644
--- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java
+++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java
@@ -95,7 +95,7 @@ public final class WidgetChangeLogSpecial extends AppFragment {
     }
 
     public WidgetChangeLogSpecial() {
-        super(2131558861);
+        super(2131558864);
     }
 
     public static final /* synthetic */ WidgetChangeLogSpecialBinding access$getBinding$p(WidgetChangeLogSpecial widgetChangeLogSpecial) {
@@ -269,7 +269,7 @@ public final class WidgetChangeLogSpecial extends AppFragment {
             ImageButton imageButton = getBinding().e;
             m.checkNotNullExpressionValue(imageButton, "binding.changeLogSpecialClose");
             imageButton.setVisibility(8);
-            ImageButton imageButton2 = getBinding().f1688c;
+            ImageButton imageButton2 = getBinding().f1685c;
             m.checkNotNullExpressionValue(imageButton2, "binding.changeLogSpecialBack");
             imageButton2.setVisibility(0);
         }
@@ -285,11 +285,11 @@ public final class WidgetChangeLogSpecial extends AppFragment {
         }
         m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…ring.change_log_md_video)");
         configureMedia(stringExtra2);
-        getBinding().f1688c.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$2(this));
+        getBinding().f1685c.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$2(this));
         getBinding().e.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$3(this));
         LinkifiedTextView linkifiedTextView2 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.changeLogBody");
-        c.a.l.b.n(linkifiedTextView2, 2131887261, new Object[0], null, 4);
+        c.a.l.b.m(linkifiedTextView2, 2131887261, new Object[0], null, 4);
         LinkifiedTextView linkifiedTextView3 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView3, "binding.changeLogBody");
         linkifiedTextView3.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1.java
index 375ba2c0e2..3277e18fbb 100644
--- a/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1.java
@@ -30,6 +30,6 @@ public final class ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1
     }
 
     public final Observable<? extends ChannelGroupDMSettingsViewModel.StoreState> call(Channel channel) {
-        return channel == null ? new j(ChannelGroupDMSettingsViewModel.StoreState.Invalid.INSTANCE) : Observable.j(new j(channel), this.$storeUserGuildSettings.observeGuildSettings(channel.e()), AnonymousClass1.INSTANCE);
+        return channel == null ? new j(ChannelGroupDMSettingsViewModel.StoreState.Invalid.INSTANCE) : Observable.j(new j(channel), this.$storeUserGuildSettings.observeGuildSettings(channel.f()), AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$ViewState$Valid$isDefaultPhoto$2.java b/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$ViewState$Valid$isDefaultPhoto$2.java
index 7509f0546d..af6b6ed615 100644
--- a/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$ViewState$Valid$isDefaultPhoto$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel$ViewState$Valid$isDefaultPhoto$2.java
@@ -19,6 +19,6 @@ public final class ChannelGroupDMSettingsViewModel$ViewState$Valid$isDefaultPhot
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final Boolean mo1invoke() {
-        return (this.this$0.getEditedIconUrl() == null || m.areEqual(this.this$0.getEditedIconUrl(), IconUtils.INSTANCE.getDefaultForGroupDM(this.this$0.getChannelSettings().getChannel().g()))) ? 1 : null;
+        return (this.this$0.getEditedIconUrl() == null || m.areEqual(this.this$0.getEditedIconUrl(), IconUtils.INSTANCE.getDefaultForGroupDM(this.this$0.getChannelSettings().getChannel().h()))) ? 1 : null;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel.java b/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel.java
index 01b4b330f2..9820d9784a 100644
--- a/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/ChannelGroupDMSettingsViewModel.java
@@ -66,9 +66,9 @@ public final class ChannelGroupDMSettingsViewModel extends AppViewModel<ViewStat
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StoreUserGuildSettings storeUserGuildSettings) {
-            Observable<R> Z = storeChannels.observeChannel(j).Z(new ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1(storeUserGuildSettings));
-            m.checkNotNullExpressionValue(Z, "storeChannels\n          …            }\n          }");
-            return Z;
+            Observable<R> Y = storeChannels.observeChannel(j).Y(new ChannelGroupDMSettingsViewModel$Companion$observeStoreState$1(storeUserGuildSettings));
+            m.checkNotNullExpressionValue(Y, "storeChannels\n          …            }\n          }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, long j, StoreChannels storeChannels, StoreUserGuildSettings storeUserGuildSettings, int i, Object obj) {
@@ -289,7 +289,7 @@ public final class ChannelGroupDMSettingsViewModel extends AppViewModel<ViewStat
                     return IconUtils.getForChannel(this.channelSettings.getChannel(), null);
                 }
                 String str = this.editedIconUrl;
-                return str != null ? str : IconUtils.INSTANCE.getDefaultForGroupDM(this.channelSettings.getChannel().g());
+                return str != null ? str : IconUtils.INSTANCE.getDefaultForGroupDM(this.channelSettings.getChannel().h());
             }
 
             public final String getEditedIconUrl() {
@@ -348,7 +348,7 @@ public final class ChannelGroupDMSettingsViewModel extends AppViewModel<ViewStat
         this.channelId = j;
         this.restApi = restAPI;
         this.storeUserGuildSettings = storeUserGuildSettings;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ChannelGroupDMSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -411,7 +411,7 @@ public final class ChannelGroupDMSettingsViewModel extends AppViewModel<ViewStat
         }
         ViewState.Valid valid = (ViewState.Valid) viewState;
         if (valid != null) {
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restApi.deleteChannel(valid.getChannelSettings().getChannel().g()), false, 1, null), this, null, 2, null), ChannelGroupDMSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelGroupDMSettingsViewModel$leaveGroup$1(this), 62, (Object) null);
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restApi.deleteChannel(valid.getChannelSettings().getChannel().h()), false, 1, null), this, null, 2, null), ChannelGroupDMSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChannelGroupDMSettingsViewModel$leaveGroup$1(this), 62, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/ChannelSettings.java b/app/src/main/java/com/discord/widgets/channels/ChannelSettings.java
index 7f83cebd1f..9a562c37dc 100644
--- a/app/src/main/java/com/discord/widgets/channels/ChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/ChannelSettings.java
@@ -34,7 +34,7 @@ public final class ChannelSettings {
                 }
                 ModelNotificationSettings.ChannelOverride next = it.next();
                 m.checkNotNullExpressionValue(next, "override");
-                if (next.getChannelId() == channel.g()) {
+                if (next.getChannelId() == channel.h()) {
                     isMuted = next.isMuted();
                     muteEndTime = next.getMuteEndTime();
                     break;
diff --git a/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java b/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java
index bfa7676d3e..72be7e9015 100644
--- a/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java
@@ -28,14 +28,14 @@ public final class SimpleMembersAdapter extends MGRecyclerAdapterSimple<MemberIt
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MemberAdapterItem(SimpleMembersAdapter simpleMembersAdapter) {
-            super(2131558659, simpleMembersAdapter);
+            super(2131558657, simpleMembersAdapter);
             m.checkNotNullParameter(simpleMembersAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363821;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363821);
+            int i = 2131363862;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363862);
             if (simpleDraweeView != null) {
-                i = 2131363824;
-                TextView textView = (TextView) view.findViewById(2131363824);
+                i = 2131363865;
+                TextView textView = (TextView) view.findViewById(2131363865);
                 if (textView != null) {
                     SimpleMemberListItemBinding simpleMemberListItemBinding = new SimpleMemberListItemBinding((LinearLayout) view, simpleDraweeView, textView);
                     m.checkNotNullExpressionValue(simpleMemberListItemBinding, "SimpleMemberListItemBinding.bind(itemView)");
@@ -53,7 +53,7 @@ public final class SimpleMembersAdapter extends MGRecyclerAdapterSimple<MemberIt
         public void onConfigure(int i, MemberItem memberItem) {
             m.checkNotNullParameter(memberItem, "data");
             super.onConfigure(i, (int) memberItem);
-            TextView textView = this.binding.f1626c;
+            TextView textView = this.binding.f1622c;
             m.checkNotNullExpressionValue(textView, "binding.memberListItemName");
             textView.setText(memberItem.getUser().getUsername());
             this.binding.a.setOnClickListener(new SimpleMembersAdapter$MemberAdapterItem$onConfigure$1(this, memberItem));
diff --git a/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java b/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java
index 33cdded878..bc365cabb0 100644
--- a/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/SimpleRolesAdapter.java
@@ -28,7 +28,7 @@ public final class SimpleRolesAdapter extends MGRecyclerAdapterSimple<RoleItem>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleAdapterItem(SimpleRolesAdapter simpleRolesAdapter) {
-            super(2131558660, simpleRolesAdapter);
+            super(2131558658, simpleRolesAdapter);
             m.checkNotNullParameter(simpleRolesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$binding$2.java
index 4e6ddd25a4..509fbc5b22 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$binding$2.java
@@ -22,26 +22,26 @@ public final /* synthetic */ class WidgetChannelGroupDMSettings$binding$2 extend
 
     public final WidgetChannelGroupDmSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362328;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362328);
+        int i = 2131362342;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362342);
         if (textInputLayout != null) {
-            i = 2131362347;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362347);
+            i = 2131362361;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362361);
             if (floatingActionButton != null) {
-                i = 2131363327;
-                NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131363327);
+                i = 2131363353;
+                NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131363353);
                 if (notificationMuteSettingsView != null) {
-                    i = 2131363328;
-                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363328);
+                    i = 2131363354;
+                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363354);
                     if (nestedScrollView != null) {
-                        i = 2131364840;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364840);
+                        i = 2131364889;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364889);
                         if (simpleDraweeView != null) {
-                            i = 2131364841;
-                            TextView textView = (TextView) view.findViewById(2131364841);
+                            i = 2131364890;
+                            TextView textView = (TextView) view.findViewById(2131364890);
                             if (textView != null) {
-                                i = 2131364842;
-                                TextView textView2 = (TextView) view.findViewById(2131364842);
+                                i = 2131364891;
+                                TextView textView2 = (TextView) view.findViewById(2131364891);
                                 if (textView2 != null) {
                                     return new WidgetChannelGroupDmSettingsBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton, notificationMuteSettingsView, nestedScrollView, simpleDraweeView, textView, textView2);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$1.java
index ef22addb7e..331356f0cc 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$1.java
@@ -37,7 +37,7 @@ public final class WidgetChannelGroupDMSettings$configureUi$1<T1, T2> implements
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363891) {
+        if (menuItem.getItemId() == 2131363932) {
             WidgetChannelGroupDMSettings widgetChannelGroupDMSettings = this.this$0;
             WidgetChannelGroupDMSettings.access$confirmLeave(widgetChannelGroupDMSettings, widgetChannelGroupDMSettings.requireContext(), new AnonymousClass1(this), this.$displayName);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$2.java
index 71fe7059fd..66fe914b78 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings$configureUi$2.java
@@ -20,10 +20,10 @@ public final class WidgetChannelGroupDMSettings$configureUi$2 implements View.On
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         ChannelGroupDMSettingsViewModel access$getViewModel$p = WidgetChannelGroupDMSettings.access$getViewModel$p(this.this$0);
-        long g = this.$group.g();
+        long h = this.$group.h();
         StatefulViews access$getState$p = WidgetChannelGroupDMSettings.access$getState$p(this.this$0);
         TextInputLayout textInputLayout = WidgetChannelGroupDMSettings.access$getBinding$p(this.this$0).b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
-        access$getViewModel$p.editGroup(g, ((String) access$getState$p.get(textInputLayout.getId(), this.$displayName)).toString());
+        access$getViewModel$p.editGroup(h, ((String) access$getState$p.get(textInputLayout.getId(), this.$displayName)).toString());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java
index ca10e229a1..4e36df315e 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java
@@ -70,12 +70,12 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
     }
 
     public WidgetChannelGroupDMSettings() {
-        super(2131558864);
+        super(2131558867);
         WidgetChannelGroupDMSettings$viewModel$2 widgetChannelGroupDMSettings$viewModel$2 = new WidgetChannelGroupDMSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChannelGroupDMSettingsViewModel.class), new WidgetChannelGroupDMSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelGroupDMSettings$viewModel$2));
         this.iconEditedResult = WidgetChannelGroupDMSettings$iconEditedResult$1.INSTANCE;
-        this.state = new StatefulViews(2131362328, 2131364840);
+        this.state = new StatefulViews(2131362342, 2131364889);
     }
 
     public static final /* synthetic */ void access$configureUi(WidgetChannelGroupDMSettings widgetChannelGroupDMSettings, ChannelGroupDMSettingsViewModel.ViewState viewState) {
@@ -140,7 +140,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
         }
         textView2.setVisibility(i);
         getBinding().h.setOnClickListener(new WidgetChannelGroupDMSettings$configureIcon$3(this));
-        this.state.configureSaveActionView(getBinding().f1691c);
+        this.state.configureSaveActionView(getBinding().f1688c);
     }
 
     private final void configureUi(ChannelGroupDMSettingsViewModel.ViewState viewState) {
@@ -168,15 +168,15 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditName");
             ViewExtensions.setSelectionEnd(textInputLayout3);
             configureIcon(valid);
-            this.state.configureSaveActionView(getBinding().f1691c);
-            getBinding().f1691c.setOnClickListener(new WidgetChannelGroupDMSettings$configureUi$2(this, channel, z0));
-            long g = channel.g();
-            getBinding().d.updateView(new NotificationMuteSettingsView.ViewState(channelSettings.isMuted(), channelSettings.getMuteEndTime(), b.j(this, 2131891298, new Object[0], null, 4), b.j(this, 2131894067, new Object[0], null, 4), b.j(this, 2131888675, new Object[0], null, 4), 2131888676, null), new WidgetChannelGroupDMSettings$configureUi$3(this, g), new WidgetChannelGroupDMSettings$configureUi$4(this));
+            this.state.configureSaveActionView(getBinding().f1688c);
+            getBinding().f1688c.setOnClickListener(new WidgetChannelGroupDMSettings$configureUi$2(this, channel, z0));
+            long h = channel.h();
+            getBinding().d.updateView(new NotificationMuteSettingsView.ViewState(channelSettings.isMuted(), channelSettings.getMuteEndTime(), b.j(this, 2131891369, new Object[0], null, 4), b.j(this, 2131894168, new Object[0], null, 4), b.j(this, 2131888676, new Object[0], null, 4), 2131888677, null), new WidgetChannelGroupDMSettings$configureUi$3(this, h), new WidgetChannelGroupDMSettings$configureUi$4(this));
         }
     }
 
     private final void confirmLeave(Context context, Function0<Unit> function0, CharSequence charSequence) {
-        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(b.j(this, 2131890789, new Object[]{charSequence}, null, 4)).setMessage(b.j(this, 2131890786, new Object[]{charSequence}, null, 4)).setDialogAttrTheme(2130969788).setPositiveButton(2131890785, new WidgetChannelGroupDMSettings$confirmLeave$1(function0)), 2131887178, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(b.j(this, 2131890857, new Object[]{charSequence}, null, 4)).setMessage(b.j(this, 2131890854, new Object[]{charSequence}, null, 4)).setDialogAttrTheme(2130969788).setPositiveButton(2131890853, new WidgetChannelGroupDMSettings$confirmLeave$1(function0)), 2131887178, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         negativeButton$default.show(parentFragmentManager);
@@ -191,7 +191,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
     }
 
     private final void handleSettingsSaved() {
-        o.i(this, 2131892974, 0, 4);
+        o.i(this, 2131893055, 0, 4);
         StatefulViews.clear$default(this.state, false, 1, null);
         AppFragment.hideKeyboard$default(this, null, 1, null);
         getBinding().e.fullScroll(33);
@@ -246,10 +246,10 @@ public final class WidgetChannelGroupDMSettings extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.settingsGroupIconLabel");
-        textView.setText(b.j(this, 2131891205, new Object[]{"128", "128"}, null, 4));
+        textView.setText(b.j(this, 2131891276, new Object[]{"128", "128"}, null, 4));
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f1691c;
+        FloatingActionButton floatingActionButton = getBinding().f1688c;
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java
index 0c9a38e9ff..9f4b4675ff 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java
@@ -27,7 +27,7 @@ public final class WidgetChannelNotificationSettings$Model$Companion$get$1$$spec
         Channel channel = this.$channel$inlined;
         m.checkNotNullExpressionValue(modelNotificationSettings, "guildSettings");
         int computeNotificationSetting = channelNotificationSettingsUtils.computeNotificationSetting(guild, channel, modelNotificationSettings);
-        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(this.$channel$inlined.g());
+        ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(this.$channel$inlined.h());
         boolean z2 = channelOverride != null && channelOverride.isMuted();
         boolean z3 = computeNotificationSetting == ModelNotificationSettings.FREQUENCY_UNSET;
         Integer a = (guildProfileData == null || (data = guildProfileData.getData()) == null) ? null : data.a();
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.java
index 7c85e50494..7d85c0b007 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$Model$Companion$get$1.java
@@ -15,6 +15,6 @@ public final class WidgetChannelNotificationSettings$Model$Companion$get$1<T, R>
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(companion.getGuilds().observeGuild(channel.e()), companion.getUserGuildSettings().observeGuildSettings(channel.e()), companion.getGuildProfiles().observeGuildProfile(channel.e()), new WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1(channel));
+        return Observable.i(companion.getGuilds().observeGuild(channel.f()), companion.getUserGuildSettings().observeGuildSettings(channel.f()), companion.getGuildProfiles().observeGuildProfile(channel.f()), new WidgetChannelNotificationSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java
index 85f0227b7b..9825ba9388 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java
@@ -20,26 +20,26 @@ public final /* synthetic */ class WidgetChannelNotificationSettings$binding$2 e
 
     public final WidgetChannelNotificationSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362280;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362280);
+        int i = 2131362291;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362291);
         if (linearLayout != null) {
-            i = 2131362281;
-            NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131362281);
+            i = 2131362292;
+            NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131362292);
             if (notificationMuteSettingsView != null) {
-                i = 2131362331;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362331);
+                i = 2131362345;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362345);
                 if (checkedSetting != null) {
-                    i = 2131362332;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362332);
+                    i = 2131362346;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362346);
                     if (checkedSetting2 != null) {
-                        i = 2131362333;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362333);
+                        i = 2131362347;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362347);
                         if (checkedSetting3 != null) {
-                            i = 2131362334;
-                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362334);
+                            i = 2131362348;
+                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362348);
                             if (linearLayout2 != null) {
-                                i = 2131364528;
-                                NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528);
+                                i = 2131364567;
+                                NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364567);
                                 if (nestedScrollView != null) {
                                     return new WidgetChannelNotificationSettingsBinding((CoordinatorLayout) view, linearLayout, notificationMuteSettingsView, checkedSetting, checkedSetting2, checkedSetting3, linearLayout2, nestedScrollView);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java
index 08fe0ede77..84da9dd0d2 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java
@@ -54,7 +54,7 @@ public final class WidgetChannelNotificationSettings$configureNotificationRadios
         if (!model.isAboveNotifyAllSize() || i != ModelNotificationSettings.FREQUENCY_ALL) {
             checkedSetting.h(null, false);
         } else {
-            checkedSetting.h(b.j(this.this$0, 2131890774, new Object[0], null, 4), false);
+            checkedSetting.h(b.j(this.this$0, 2131890842, new Object[0], null, 4), false);
         }
         if (model.getNotificationSetting() == i) {
             z2 = true;
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.java
index 3f6852fc48..123aa3bd87 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onMute$1.java
@@ -23,9 +23,9 @@ public final class WidgetChannelNotificationSettings$configureUI$onMute$1 extend
     /* renamed from: invoke */
     public final void mo1invoke() {
         WidgetMuteSettingsSheet.Companion companion = WidgetMuteSettingsSheet.Companion;
-        long g = this.$this_configureUI.getChannel().g();
+        long h = this.$this_configureUI.getChannel().h();
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.showForChannel(g, parentFragmentManager);
+        companion.showForChannel(h, parentFragmentManager);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.java
index 23ef51e3c1..2a7dac5ee1 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$onUnmute$1.java
@@ -21,6 +21,6 @@ public final class WidgetChannelNotificationSettings$configureUI$onUnmute$1 exte
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        StoreUserGuildSettings.setChannelMuted$default(StoreStream.Companion.getUserGuildSettings(), this.this$0.requireContext(), this.$this_configureUI.getChannel().g(), false, null, 8, null);
+        StoreUserGuildSettings.setChannelMuted$default(StoreStream.Companion.getUserGuildSettings(), this.this$0.requireContext(), this.$this_configureUI.getChannel().h(), false, null, 8, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java
index f29bec7e4c..cd69d535a7 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java
@@ -83,11 +83,11 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(WidgetChannelNotificationSettings$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …ust(null)\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationBuffered(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(WidgetChannelNotificationSettings$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …ust(null)\n              }");
+                Observable<Model> r = ObservableExtensionsKt.computationBuffered(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -259,7 +259,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
     }
 
     public WidgetChannelNotificationSettings() {
-        super(2131558871);
+        super(2131558874);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelNotificationSettings widgetChannelNotificationSettings, Model model) {
@@ -297,7 +297,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
 
     private final void configureUI(Model model) {
         setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2));
-        getBinding().f1693c.updateView(new NotificationMuteSettingsView.ViewState(model.getChannelIsMuted(), model.getChannelMuteEndTime(), AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131891296, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131891295, new Object[0], null, 4), AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131894065, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131894064, new Object[0], null, 4), b.g(requireContext(), 2131888670, new Object[0], null, 4), AnimatableValueParser.x1(model.getChannel()) ? 2131888671 : 2131888668, AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131888674, new Object[0], null, 4) : b.g(requireContext(), 2131888669, new Object[0], null, 4)), new WidgetChannelNotificationSettings$configureUI$onMute$1(this, model), new WidgetChannelNotificationSettings$configureUI$onUnmute$1(this, model));
+        getBinding().f1690c.updateView(new NotificationMuteSettingsView.ViewState(model.getChannelIsMuted(), model.getChannelMuteEndTime(), AnimatableValueParser.y1(model.getChannel()) ? b.g(requireContext(), 2131891367, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131891366, new Object[0], null, 4), AnimatableValueParser.y1(model.getChannel()) ? b.g(requireContext(), 2131894166, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131894165, new Object[0], null, 4), b.g(requireContext(), 2131888671, new Object[0], null, 4), AnimatableValueParser.y1(model.getChannel()) ? 2131888672 : 2131888669, AnimatableValueParser.y1(model.getChannel()) ? b.g(requireContext(), 2131888675, new Object[0], null, 4) : b.g(requireContext(), 2131888670, new Object[0], null, 4)), new WidgetChannelNotificationSettings$configureUI$onMute$1(this, model), new WidgetChannelNotificationSettings$configureUI$onUnmute$1(this, model));
         configureNotificationRadios(model);
     }
 
@@ -312,7 +312,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment {
         setRetainInstance(true);
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891534);
+        setActionBarTitle(2131891603);
         this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().d, getBinding().e, getBinding().f}));
         LinearLayout linearLayout = getBinding().b;
         m.checkNotNullExpressionValue(linearLayout, "binding.channelNotificationSettingsSystem");
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java
index bd24a11032..a77c78c046 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetChannelOnboarding$binding$2 extends k i
 
     public final WidgetChannelOnboardingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362254);
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362265);
         if (materialButton != null) {
             return new WidgetChannelOnboardingBinding((LinearLayout) view, materialButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362254)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362265)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java
index 47eef125f1..6d177c6331 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelOnboarding.java
@@ -43,7 +43,7 @@ public final class WidgetChannelOnboarding extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558872;
+        return 2131558875;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java
index 126606f7f1..57c4711b19 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetChannelSelector$binding$2 extends k imp
 
     public final WidgetChannelSelectorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362318;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362318);
+        int i = 2131362329;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362329);
         if (recyclerView != null) {
-            i = 2131363342;
-            TextView textView = (TextView) view.findViewById(2131363342);
+            i = 2131363368;
+            TextView textView = (TextView) view.findViewById(2131363368);
             if (textView != null) {
                 return new WidgetChannelSelectorBinding((NestedScrollView) view, recyclerView, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
index 1a519519f8..69aaf44114 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java
@@ -106,7 +106,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
                 Channel channel2 = item.getChannel();
-                Integer valueOf = channel2 != null ? Integer.valueOf(channel2.z()) : null;
+                Integer valueOf = channel2 != null ? Integer.valueOf(channel2.A()) : null;
                 int themedDrawableRes$default = DrawableCompat.getThemedDrawableRes$default(view, (valueOf != null && valueOf.intValue() == 2) ? 2130969476 : (valueOf != null && valueOf.intValue() == 13) ? 2130969389 : (valueOf != null && valueOf.intValue() == 0) ? 2130969390 : 0, 0, 2, (Object) null);
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.itemName");
@@ -130,7 +130,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ItemChannel onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ItemChannel(2131558877, this, this.noChannelStringId);
+            return new ItemChannel(2131558880, this, this.noChannelStringId);
         }
     }
 
@@ -157,19 +157,19 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         }
 
         public static /* synthetic */ void launchForInactiveStages$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForInactiveStages(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i);
+            companion.launchForInactiveStages(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891511 : i);
         }
 
         public static /* synthetic */ void launchForText$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForText(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i);
+            companion.launchForText(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891511 : i);
         }
 
         public static /* synthetic */ void launchForVocal$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForVocal(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i);
+            companion.launchForVocal(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891511 : i);
         }
 
         public static /* synthetic */ void launchForVoice$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) {
-            companion.launchForVoice(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i);
+            companion.launchForVoice(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891511 : i);
         }
 
         public static /* synthetic */ void registerForResult$default(Companion companion, Fragment fragment, String str, boolean z2, Function2 function2, int i, Object obj) {
@@ -251,7 +251,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         @Override // com.discord.widgets.channels.WidgetChannelSelector.FilterFunction
         public boolean includeChannel(Channel channel) {
             m.checkNotNullParameter(channel, "channel");
-            return AnimatableValueParser.u1(channel) && StoreStream.Companion.getStageInstances().getStageInstanceForChannel(channel.g()) == null;
+            return AnimatableValueParser.v1(channel) && StoreStream.Companion.getStageInstances().getStageInstanceForChannel(channel.h()) == null;
         }
     }
 
@@ -270,11 +270,11 @@ public final class WidgetChannelSelector extends AppBottomSheet {
 
             public final Observable<List<Item>> get(long j, boolean z2, FilterFunction filterFunction) {
                 m.checkNotNullParameter(filterFunction, "filterFunction");
-                Observable G = StoreChannels.observeChannelsForGuild$default(StoreStream.Companion.getChannels(), j, null, 2, null).G(new WidgetChannelSelector$Model$Companion$get$1(filterFunction, z2));
-                m.checkNotNullExpressionValue(G, "StoreStream.getChannels(… { Item(it) }\n          }");
-                Observable<List<Item>> s2 = ObservableExtensionsKt.computationLatest(G).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream.getChannels(…  .distinctUntilChanged()");
-                return s2;
+                Observable F = StoreChannels.observeChannelsForGuild$default(StoreStream.Companion.getChannels(), j, null, 2, null).F(new WidgetChannelSelector$Model$Companion$get$1(filterFunction, z2));
+                m.checkNotNullExpressionValue(F, "StoreStream.getChannels(… { Item(it) }\n          }");
+                Observable<List<Item>> r = ObservableExtensionsKt.computationLatest(F).r();
+                m.checkNotNullExpressionValue(r, "StoreStream.getChannels(…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -294,8 +294,8 @@ public final class WidgetChannelSelector extends AppBottomSheet {
             /* JADX WARNING: Illegal instructions before constructor call */
             public /* synthetic */ Item(Channel channel, int i, String str, int i2, DefaultConstructorMarker defaultConstructorMarker) {
                 this(channel, i, str);
-                i = (i2 & 2) != 0 ? channel != null ? channel.z() : -1 : i;
-                if ((i2 & 4) != 0 && (channel == null || (str = String.valueOf(channel.g())) == null)) {
+                i = (i2 & 2) != 0 ? channel != null ? channel.A() : -1 : i;
+                if ((i2 & 4) != 0 && (channel == null || (str = String.valueOf(channel.h())) == null)) {
                     str = "";
                 }
             }
@@ -418,7 +418,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         @Override // com.discord.widgets.channels.WidgetChannelSelector.FilterFunction
         public boolean includeChannel(Channel channel) {
             m.checkNotNullParameter(channel, "channel");
-            return this.type == channel.z();
+            return this.type == channel.A();
         }
 
         @Override // java.lang.Object
@@ -437,7 +437,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
         @Override // com.discord.widgets.channels.WidgetChannelSelector.FilterFunction
         public boolean includeChannel(Channel channel) {
             m.checkNotNullParameter(channel, "channel");
-            return AnimatableValueParser.k1(channel);
+            return AnimatableValueParser.l1(channel);
         }
     }
 
@@ -476,7 +476,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
     private final void onChannelSelected(Channel channel) {
         String requestCode = getRequestCode();
         Bundle bundle = new Bundle();
-        bundle.putLong("INTENT_EXTRA_CHANNEL_ID", channel != null ? channel.g() : -1);
+        bundle.putLong("INTENT_EXTRA_CHANNEL_ID", channel != null ? channel.h() : -1);
         bundle.putString("INTENT_EXTRA_CHANNEL_NAME", channel != null ? AnimatableValueParser.y0(channel) : null);
         FragmentKt.setFragmentResult(this, requestCode, bundle);
         dismiss();
@@ -507,7 +507,7 @@ public final class WidgetChannelSelector extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558876;
+        return 2131558879;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java
index 7e610f8588..58693a8d68 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetChannelSidebarActions$binding$2 extends
 
     public final WidgetChannelSidebarActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365586;
-        GuildChannelSideBarActionsView guildChannelSideBarActionsView = (GuildChannelSideBarActionsView) view.findViewById(2131365586);
+        int i = 2131365647;
+        GuildChannelSideBarActionsView guildChannelSideBarActionsView = (GuildChannelSideBarActionsView) view.findViewById(2131365647);
         if (guildChannelSideBarActionsView != null) {
-            i = 2131365587;
-            PrivateChannelSideBarActionsView privateChannelSideBarActionsView = (PrivateChannelSideBarActionsView) view.findViewById(2131365587);
+            i = 2131365648;
+            PrivateChannelSideBarActionsView privateChannelSideBarActionsView = (PrivateChannelSideBarActionsView) view.findViewById(2131365648);
             if (privateChannelSideBarActionsView != null) {
                 return new WidgetChannelSidebarActionsBinding((FrameLayout) view, guildChannelSideBarActionsView, privateChannelSideBarActionsView);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java
index 612488235a..77b3f451ac 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java
@@ -31,7 +31,7 @@ public final class WidgetChannelSidebarActions extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetChannelSidebarActions() {
-        super(2131558889);
+        super(2131558892);
         WidgetChannelSidebarActions$viewModel$2 widgetChannelSidebarActions$viewModel$2 = WidgetChannelSidebarActions$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSidebarActionsViewModel.class), new WidgetChannelSidebarActions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelSidebarActions$viewModel$2));
@@ -59,12 +59,12 @@ public final class WidgetChannelSidebarActions extends AppFragment {
             GuildChannelSideBarActionsView guildChannelSideBarActionsView = getBinding().b;
             m.checkNotNullExpressionValue(guildChannelSideBarActionsView, "binding.widgetChannelSidebarActionsGuildView");
             guildChannelSideBarActionsView.setVisibility(8);
-            PrivateChannelSideBarActionsView privateChannelSideBarActionsView = getBinding().f1704c;
+            PrivateChannelSideBarActionsView privateChannelSideBarActionsView = getBinding().f1701c;
             m.checkNotNullExpressionValue(privateChannelSideBarActionsView, "binding.widgetChannelSidebarActionsPrivateView");
             privateChannelSideBarActionsView.setVisibility(0);
             WidgetChannelSidebarActionsViewModel.ViewState.Private r2 = (WidgetChannelSidebarActionsViewModel.ViewState.Private) viewState;
             long channelId = r2.getChannelId();
-            getBinding().f1704c.a(new WidgetChannelSidebarActions$configureUI$1(this, viewState), new WidgetChannelSidebarActions$configureUI$2(this, viewState), new WidgetChannelSidebarActions$configureUI$3(this, channelId), new WidgetChannelSidebarActions$configureUI$4(channelId, requireContext()), r2.isMuted());
+            getBinding().f1701c.a(new WidgetChannelSidebarActions$configureUI$1(this, viewState), new WidgetChannelSidebarActions$configureUI$2(this, viewState), new WidgetChannelSidebarActions$configureUI$3(this, channelId), new WidgetChannelSidebarActions$configureUI$4(channelId, requireContext()), r2.isMuted());
         } else if (viewState instanceof WidgetChannelSidebarActionsViewModel.ViewState.Guild) {
             WidgetChannelSidebarActionsViewModel.ViewState.Guild guild = (WidgetChannelSidebarActionsViewModel.ViewState.Guild) viewState;
             long channelId2 = guild.getChannelId();
@@ -77,7 +77,7 @@ public final class WidgetChannelSidebarActions extends AppFragment {
             if (view3 != null) {
                 ViewKt.setVisible(view3, true);
             }
-            PrivateChannelSideBarActionsView privateChannelSideBarActionsView2 = getBinding().f1704c;
+            PrivateChannelSideBarActionsView privateChannelSideBarActionsView2 = getBinding().f1701c;
             m.checkNotNullExpressionValue(privateChannelSideBarActionsView2, "binding.widgetChannelSidebarActionsPrivateView");
             privateChannelSideBarActionsView2.setVisibility(8);
             GuildChannelSideBarActionsView guildChannelSideBarActionsView3 = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1$1$storeState$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1$1$storeState$1.java
index 8b54013ace..e467b7e4ac 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1$1$storeState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1$1$storeState$1.java
@@ -20,8 +20,8 @@ public final class WidgetChannelSidebarActionsViewModel$Companion$observeStoreSt
     }
 
     public final WidgetChannelSidebarActionsViewModel.StoreState.ChannelFound call(Map<Long, ? extends ModelNotificationSettings> map, MeUser meUser) {
-        boolean isGuildNsfwGateAgreed = this.this$0.this$0.$storeGuildNSFW.isGuildNsfwGateAgreed(this.$channel.e());
+        boolean isGuildNsfwGateAgreed = this.this$0.this$0.$storeGuildNSFW.isGuildNsfwGateAgreed(this.$channel.f());
         Channel channel = this.$channel;
-        return new WidgetChannelSidebarActionsViewModel.StoreState.ChannelFound(channel, (ModelNotificationSettings) a.c(channel, map), this.$channel.n() && (!isGuildNsfwGateAgreed || meUser.getNsfwAllowance() == NsfwAllowance.DISALLOWED));
+        return new WidgetChannelSidebarActionsViewModel.StoreState.ChannelFound(channel, (ModelNotificationSettings) a.c(channel, map), this.$channel.o() && (!isGuildNsfwGateAgreed || meUser.getNsfwAllowance() == NsfwAllowance.DISALLOWED));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java
index 2db984aaf8..04c1eb84ef 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1.java
@@ -31,7 +31,7 @@ public final class WidgetChannelSidebarActionsViewModel$Companion$observeStoreSt
 
         public final Observable<? extends WidgetChannelSidebarActionsViewModel.StoreState> call(Channel channel) {
             Observable<? extends WidgetChannelSidebarActionsViewModel.StoreState> jVar = channel == null ? new j<>(WidgetChannelSidebarActionsViewModel.StoreState.ChannelNotFound.INSTANCE) : Observable.j(this.this$0.$storeUserGuildSettings.observeGuildSettings(), StoreUser.observeMe$default(this.this$0.$storeUser, false, 1, null), new WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1$1$storeState$1(this, channel));
-            return m.areEqual(this.$panelState, PanelState.c.a) ? jVar : jVar.a0(1);
+            return m.areEqual(this.$panelState, PanelState.c.a) ? jVar : jVar.Z(1);
         }
     }
 
@@ -43,6 +43,6 @@ public final class WidgetChannelSidebarActionsViewModel$Companion$observeStoreSt
     }
 
     public final Observable<? extends WidgetChannelSidebarActionsViewModel.StoreState> call(PanelState panelState) {
-        return this.$storeChannelsSelected.observeSelectedChannel().Z(new AnonymousClass1(this, panelState));
+        return this.$storeChannelsSelected.observeSelectedChannel().Y(new AnonymousClass1(this, panelState));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java
index 1286def24d..8c9f43b07a 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.java
@@ -63,9 +63,9 @@ public final class WidgetChannelSidebarActionsViewModel extends AppViewModel<Vie
         }
 
         private final Observable<StoreState> observeStoreState(StoreNavigation storeNavigation, StoreChannelsSelected storeChannelsSelected, StoreUserGuildSettings storeUserGuildSettings, StoreGuildsNsfw storeGuildsNsfw, StoreUser storeUser) {
-            Observable<R> Z = storeNavigation.observeRightPanelState().Z(new WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1(storeChannelsSelected, storeUserGuildSettings, storeUser, storeGuildsNsfw));
-            m.checkNotNullExpressionValue(Z, "storeNavigation\n        …          }\n            }");
-            return Z;
+            Observable<R> Y = storeNavigation.observeRightPanelState().Y(new WidgetChannelSidebarActionsViewModel$Companion$observeStoreState$1(storeChannelsSelected, storeUserGuildSettings, storeUser, storeGuildsNsfw));
+            m.checkNotNullExpressionValue(Y, "storeNavigation\n        …          }\n            }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreNavigation storeNavigation, StoreChannelsSelected storeChannelsSelected, StoreUserGuildSettings storeUserGuildSettings, StoreGuildsNsfw storeGuildsNsfw, StoreUser storeUser, int i, Object obj) {
@@ -443,9 +443,9 @@ public final class WidgetChannelSidebarActionsViewModel extends AppViewModel<Vie
         } else if (storeState instanceof StoreState.ChannelFound) {
             StoreState.ChannelFound channelFound = (StoreState.ChannelFound) storeState;
             boolean z3 = false;
-            if (AnimatableValueParser.r1(channelFound.getChannel())) {
+            if (AnimatableValueParser.s1(channelFound.getChannel())) {
                 ModelNotificationSettings guildNotificationSettings = channelFound.getGuildNotificationSettings();
-                long g = channelFound.getChannel().g();
+                long h = channelFound.getChannel().h();
                 if (!(guildNotificationSettings == null || (channelOverrides = guildNotificationSettings.getChannelOverrides()) == null)) {
                     Iterator<T> it = channelOverrides.iterator();
                     while (true) {
@@ -456,7 +456,7 @@ public final class WidgetChannelSidebarActionsViewModel extends AppViewModel<Vie
                         obj = it.next();
                         ModelNotificationSettings.ChannelOverride channelOverride2 = (ModelNotificationSettings.ChannelOverride) obj;
                         m.checkNotNullExpressionValue(channelOverride2, "channelOverride");
-                        if (channelOverride2.getChannelId() == g) {
+                        if (channelOverride2.getChannelId() == h) {
                             z2 = true;
                             continue;
                         } else {
@@ -472,13 +472,13 @@ public final class WidgetChannelSidebarActionsViewModel extends AppViewModel<Vie
                         z3 = true;
                     }
                 }
-                updateViewState(new ViewState.Private(channelFound.getChannel().g(), z3));
+                updateViewState(new ViewState.Private(channelFound.getChannel().h(), z3));
                 return;
             }
-            long g2 = channelFound.getChannel().g();
-            long e = channelFound.getChannel().e();
+            long h2 = channelFound.getChannel().h();
+            long f = channelFound.getChannel().f();
             ModelNotificationSettings guildNotificationSettings2 = channelFound.getGuildNotificationSettings();
-            updateViewState(new ViewState.Guild(g2, e, (guildNotificationSettings2 == null || (channelOverride = guildNotificationSettings2.getChannelOverride(g2)) == null || !channelOverride.isMuted()) ? false : true, false, channelFound.getDisablePins()));
+            updateViewState(new ViewState.Guild(h2, f, (guildNotificationSettings2 == null || (channelOverride = guildNotificationSettings2.getChannelOverride(h2)) == null || !channelOverride.isMuted()) ? false : true, false, channelFound.getDisablePins()));
         } else {
             throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java
index 1d00804c81..32faa1c882 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$binding$2.java
@@ -21,20 +21,20 @@ public final /* synthetic */ class WidgetChannelTopic$binding$2 extends k implem
     public final WidgetChannelTopicBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         LinearLayout linearLayout = (LinearLayout) view;
-        int i = 2131362361;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362361);
+        int i = 2131362376;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362376);
         if (simpleDraweeView != null) {
-            i = 2131362362;
-            ImageView imageView = (ImageView) view.findViewById(2131362362);
+            i = 2131362377;
+            ImageView imageView = (ImageView) view.findViewById(2131362377);
             if (imageView != null) {
-                i = 2131362363;
-                ImageView imageView2 = (ImageView) view.findViewById(2131362363);
+                i = 2131362378;
+                ImageView imageView2 = (ImageView) view.findViewById(2131362378);
                 if (imageView2 != null) {
-                    i = 2131362364;
-                    TextView textView = (TextView) view.findViewById(2131362364);
+                    i = 2131362379;
+                    TextView textView = (TextView) view.findViewById(2131362379);
                     if (textView != null) {
-                        i = 2131362365;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362365);
+                        i = 2131362380;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362380);
                         if (linkifiedTextView != null) {
                             return new WidgetChannelTopicBinding((LinearLayout) view, linearLayout, simpleDraweeView, imageView, imageView2, textView, linkifiedTextView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java
index 1e2a61f2ab..3d3bcae36d 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java
@@ -54,7 +54,7 @@ public final class WidgetChannelTopic$showContextMenu$4 implements MenuItem.OnMe
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131890789, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890786, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890785, new Object[0], null, 4), b.j(this.this$0, 2131887178, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364032, new AnonymousClass1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131890857, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890854, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890853, new Object[0], null, 4), b.j(this.this$0, 2131887178, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364075, new AnonymousClass1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
         return true;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java
index 6485510753..b7cea6ac89 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java
@@ -160,7 +160,7 @@ public final class WidgetChannelTopic extends AppFragment {
     }
 
     public WidgetChannelTopic() {
-        super(2131558890);
+        super(2131558893);
         WidgetChannelTopic$viewModel$2 widgetChannelTopic$viewModel$2 = WidgetChannelTopic$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelTopicViewModel.class), new WidgetChannelTopic$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelTopic$viewModel$2));
@@ -200,8 +200,8 @@ public final class WidgetChannelTopic extends AppFragment {
         Lifecycle lifecycle = getLifecycle();
         m.checkNotNullExpressionValue(lifecycle, "lifecycle");
         if (lifecycle.getCurrentState().isAtLeast(Lifecycle.State.INITIALIZED)) {
-            getBinding().f1705c.setOnClickListener(new WidgetChannelTopic$configureEllipsis$1(this));
-            ImageView imageView = getBinding().f1705c;
+            getBinding().f1702c.setOnClickListener(new WidgetChannelTopic$configureEllipsis$1(this));
+            ImageView imageView = getBinding().f1702c;
             m.checkNotNullExpressionValue(imageView, "binding.channelTopicEllipsis");
             LinkifiedTextView linkifiedTextView = getBinding().f;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.channelTopicTitle");
@@ -264,7 +264,7 @@ public final class WidgetChannelTopic extends AppFragment {
             ImageView imageView3 = getBinding().d;
             m.checkNotNullExpressionValue(imageView3, "binding.channelTopicMoreIcon");
             imageView3.setVisibility(0);
-            setChannelIcon(2131231558);
+            setChannelIcon(2131231564);
             renderedTopic = getRenderedTopicForDM((WidgetChannelTopicViewModel.ViewState.DM) viewState);
         } else if (viewState instanceof WidgetChannelTopicViewModel.ViewState.GDM) {
             View view4 = getView();
@@ -400,18 +400,18 @@ public final class WidgetChannelTopic extends AppFragment {
         m.checkNotNullExpressionValue(imageView, "binding.channelTopicMoreIcon");
         PopupMenu popupMenu = new PopupMenu(imageView.getContext(), getBinding().d, 8388691);
         popupMenu.inflate(2131623958);
-        popupMenu.getMenu().findItem(2131363900).setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$1(this, j));
-        MenuItem findItem = popupMenu.getMenu().findItem(2131363898);
+        popupMenu.getMenu().findItem(2131363941).setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$1(this, j));
+        MenuItem findItem = popupMenu.getMenu().findItem(2131363939);
         m.checkNotNullExpressionValue(findItem, "copyChannelIdAction");
         findItem.setVisible(z3);
         findItem.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$2(this, j));
-        MenuItem findItem2 = popupMenu.getMenu().findItem(2131363899);
+        MenuItem findItem2 = popupMenu.getMenu().findItem(2131363940);
         m.checkNotNullExpressionValue(findItem2, "customizeGroupAction");
         findItem2.setVisible(z2);
         findItem2.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$3(this, j));
-        MenuItem findItem3 = popupMenu.getMenu().findItem(2131363897);
+        MenuItem findItem3 = popupMenu.getMenu().findItem(2131363938);
         if (z2) {
-            findItem3.setTitle(2131890785);
+            findItem3.setTitle(2131890853);
             findItem3.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$4(this, charSequence));
         } else {
             findItem3.setTitle(2131887395);
@@ -431,9 +431,9 @@ public final class WidgetChannelTopic extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().listenForEvents(), this), WidgetChannelTopic.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelTopic$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        Observable<WidgetChannelTopicViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetChannelTopic.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelTopic$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable<WidgetChannelTopicViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetChannelTopic.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelTopic$onViewBoundOrOnResume$2(this), 62, (Object) null);
         LinkifiedTextView linkifiedTextView = getBinding().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.channelTopicTitle");
         linkifiedTextView.setMaxLines(2);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel$Companion$observeStoreState$1.java
index 605d64274b..3862d5ccfa 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel$Companion$observeStoreState$1.java
@@ -30,12 +30,12 @@ public final class WidgetChannelTopicViewModel$Companion$observeStoreState$1<T,
         if (channel == null) {
             return new j(new WidgetChannelTopicViewModel.StoreState.NoChannel(this.$navState.isRightPanelOpened(), this.$navState.isOnHomeTab()));
         }
-        if (AnimatableValueParser.r1(channel)) {
+        if (AnimatableValueParser.s1(channel)) {
             return WidgetChannelTopicViewModel.Companion.access$mapChannelToPrivateStoreState(WidgetChannelTopicViewModel.Companion, channel, this.$navState, this.$storeGuilds, this.$storeUserSettings);
         }
-        if (channel.y() != null) {
-            String y2 = channel.y();
-            if (!(y2 == null || y2.length() == 0)) {
+        if (channel.z() != null) {
+            String z2 = channel.z();
+            if (!(z2 == null || z2.length() == 0)) {
                 return WidgetChannelTopicViewModel.Companion.access$mapChannelToGuildStoreState(WidgetChannelTopicViewModel.Companion, channel, this.$navState, this.$storeChannels, this.$storeUsers, this.$storeGuilds, this.$storeUserSettings);
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java
index 67dc550f08..2428503e36 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopicViewModel.java
@@ -73,7 +73,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
             }
             Companion companion2 = WidgetChannelTopicViewModel.Companion;
             m.checkNotNullExpressionValue(navState, "navState");
-            return Companion.observeStoreState$default(companion2, navState, null, null, null, null, null, 62, null).a0(1);
+            return Companion.observeStoreState$default(companion2, navState, null, null, null, null, null, 62, null).Z(1);
         }
     }
 
@@ -197,25 +197,25 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState.Guild> mapChannelToGuildStoreState(Channel channel, NavState navState, StoreChannels storeChannels, StoreUser storeUser, StoreGuilds storeGuilds, StoreUserSettings storeUserSettings) {
-            long e = channel.e();
-            Observable<StoreState.Guild> g = Observable.g(StoreChannels.observeChannelsForGuild$default(storeChannels, e, null, 2, null), storeUser.observeAllUsers(), storeGuilds.observeComputed(e), storeGuilds.observeRoles(e), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(storeUserSettings, false, 1, null), new WidgetChannelTopicViewModel$Companion$mapChannelToGuildStoreState$1(channel, navState));
+            long f = channel.f();
+            Observable<StoreState.Guild> g = Observable.g(StoreChannels.observeChannelsForGuild$default(storeChannels, f, null, 2, null), storeUser.observeAllUsers(), storeGuilds.observeComputed(f), storeGuilds.observeRoles(f), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(storeUserSettings, false, 1, null), new WidgetChannelTopicViewModel$Companion$mapChannelToGuildStoreState$1(channel, navState));
             m.checkNotNullExpressionValue(g, "Observable.combineLatest…HomeTab\n        )\n      }");
             return g;
         }
 
         private final Observable<StoreState> mapChannelToPrivateStoreState(Channel channel, NavState navState, StoreGuilds storeGuilds, StoreUserSettings storeUserSettings) {
-            if (AnimatableValueParser.i1(channel)) {
+            if (AnimatableValueParser.j1(channel)) {
                 j jVar = new j(new StoreState.GDM(channel, storeUserSettings.getIsDeveloperMode(), navState.isRightPanelOpened(), navState.isOnHomeTab()));
                 m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …            )\n          )");
                 return jVar;
             }
-            Observable<R> G = storeGuilds.observeComputed().G(new WidgetChannelTopicViewModel$Companion$mapChannelToPrivateStoreState$1(channel, storeUserSettings, navState));
-            m.checkNotNullExpressionValue(G, "storeGuilds.observeCompu…            )\n          }");
-            return G;
+            Observable<R> F = storeGuilds.observeComputed().F(new WidgetChannelTopicViewModel$Companion$mapChannelToPrivateStoreState$1(channel, storeUserSettings, navState));
+            m.checkNotNullExpressionValue(F, "storeGuilds.observeCompu…            )\n          }");
+            return F;
         }
 
         private final Observable<NavState> observeNavState(StoreNavigation storeNavigation, StoreTabsNavigation storeTabsNavigation) {
-            Observable<NavState> j = Observable.j(storeNavigation.observeRightPanelState().G(WidgetChannelTopicViewModel$Companion$observeNavState$1.INSTANCE), storeTabsNavigation.observeSelectedTab().G(WidgetChannelTopicViewModel$Companion$observeNavState$2.INSTANCE), WidgetChannelTopicViewModel$Companion$observeNavState$3.INSTANCE);
+            Observable<NavState> j = Observable.j(storeNavigation.observeRightPanelState().F(WidgetChannelTopicViewModel$Companion$observeNavState$1.INSTANCE), storeTabsNavigation.observeSelectedTab().F(WidgetChannelTopicViewModel$Companion$observeNavState$2.INSTANCE), WidgetChannelTopicViewModel$Companion$observeNavState$3.INSTANCE);
             m.checkNotNullExpressionValue(j, "Observable.combineLatest…sOpen, isOnHomeTab)\n    }");
             return j;
         }
@@ -231,9 +231,9 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(NavState navState, StoreChannelsSelected storeChannelsSelected, StoreChannels storeChannels, StoreUser storeUser, StoreGuilds storeGuilds, StoreUserSettings storeUserSettings) {
-            Observable<R> Z = storeChannelsSelected.observeSelectedChannel().Z(new WidgetChannelTopicViewModel$Companion$observeStoreState$1(navState, storeGuilds, storeUserSettings, storeChannels, storeUser));
-            m.checkNotNullExpressionValue(Z, "storeChannelsSelected\n  …            }\n          }");
-            return Z;
+            Observable<R> Y = storeChannelsSelected.observeSelectedChannel().Y(new WidgetChannelTopicViewModel$Companion$observeStoreState$1(navState, storeGuilds, storeUserSettings, storeChannels, storeUser));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected\n  …            }\n          }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, NavState navState, StoreChannelsSelected storeChannelsSelected, StoreChannels storeChannels, StoreUser storeUser, StoreGuilds storeGuilds, StoreUserSettings storeUserSettings, int i, Object obj) {
@@ -1807,7 +1807,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
         this.topicParser = parser;
         this.revealedIndices = n0.emptySet();
         this.previousChannelId = 0L;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetChannelTopicViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
@@ -1815,7 +1815,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
     public /* synthetic */ WidgetChannelTopicViewModel(Observable observable, Parser parser, int i, DefaultConstructorMarker defaultConstructorMarker) {
         this(observable, (i & 2) != 0 ? DiscordParser.createParser$default(false, true, false, 4, null) : parser);
         if ((i & 1) != 0) {
-            observable = Companion.observeNavState$default(Companion, null, null, 3, null).Z(AnonymousClass1.INSTANCE);
+            observable = Companion.observeNavState$default(Companion, null, null, 3, null).Y(AnonymousClass1.INSTANCE);
             m.checkNotNullExpressionValue(observable, "observeNavState().switch…avState\n    ).take(1)\n  }");
         }
     }
@@ -1835,8 +1835,8 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
             updateViewState(new ViewState.Guild.DefaultTopic(GuildChannelIconUtilsKt.getChannelType(defaultTopic.getChannel()), defaultTopic.getChannel(), guild.isRightPanelOpened(), guild.isOnHomeTab()));
         } else if (guild instanceof StoreState.Guild.Topic) {
             StoreState.Guild.Topic topic = (StoreState.Guild.Topic) guild;
-            String y2 = topic.getChannel().y();
-            List<Node<MessageRenderContext>> generateAST = generateAST(y2 != null ? y2 : "");
+            String z2 = topic.getChannel().z();
+            List<Node<MessageRenderContext>> generateAST = generateAST(z2 != null ? z2 : "");
             MessagePreprocessor messagePreprocessor = new MessagePreprocessor(-1, this.revealedIndices, null, false, null, 28, null);
             messagePreprocessor.process(generateAST);
             Map<Long, User> users = topic.getUsers();
@@ -1853,7 +1853,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
                 }
                 linkedHashMap.put(key, str);
             }
-            String str2 = y2 != null ? y2 : "";
+            String str2 = z2 != null ? z2 : "";
             Map<Long, Channel> channels = topic.getChannels();
             LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(channels.size()));
             Iterator<T> it2 = channels.entrySet().iterator();
@@ -1878,7 +1878,7 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
             StoreState.DM dm = (StoreState.DM) storeState;
             User v0 = AnimatableValueParser.v0(dm.getChannel());
             String nickOrUsername$default = v0 != null ? GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, v0, null, dm.getChannel(), null, 8, null) : null;
-            long g = dm.getChannel().g();
+            long h = dm.getChannel().h();
             Collection<Map<Long, GuildMember>> guildMembers = dm.getGuildMembers();
             ArrayList arrayList = new ArrayList();
             Iterator<T> it = guildMembers.iterator();
@@ -1891,10 +1891,10 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
                     arrayList.add(nick);
                 }
             }
-            updateViewState(new ViewState.DM(nickOrUsername$default, u.toSet(arrayList), g, dm.getDeveloperModeEnabled(), storeState.isRightPanelOpened(), storeState.isOnHomeTab()));
+            updateViewState(new ViewState.DM(nickOrUsername$default, u.toSet(arrayList), h, dm.getDeveloperModeEnabled(), storeState.isRightPanelOpened(), storeState.isOnHomeTab()));
         } else if (storeState instanceof StoreState.GDM) {
             StoreState.GDM gdm = (StoreState.GDM) storeState;
-            updateViewState(new ViewState.GDM(gdm.getChannel(), gdm.getChannel().g(), gdm.getDeveloperModeEnabled(), storeState.isRightPanelOpened(), storeState.isOnHomeTab()));
+            updateViewState(new ViewState.GDM(gdm.getChannel(), gdm.getChannel().h(), gdm.getDeveloperModeEnabled(), storeState.isRightPanelOpened(), storeState.isOnHomeTab()));
         }
     }
 
@@ -1902,12 +1902,12 @@ public final class WidgetChannelTopicViewModel extends AppViewModel<ViewState> {
     private final void handleStoreState(StoreState storeState) {
         Long l;
         if (storeState instanceof StoreState.Guild.Topic) {
-            long g = ((StoreState.Guild.Topic) storeState).getChannel().g();
+            long h = ((StoreState.Guild.Topic) storeState).getChannel().h();
             Long l2 = this.previousChannelId;
-            this.revealedIndices = (l2 != null && g == l2.longValue()) ? this.revealedIndices : n0.emptySet();
-            l = Long.valueOf(g);
+            this.revealedIndices = (l2 != null && h == l2.longValue()) ? this.revealedIndices : n0.emptySet();
+            l = Long.valueOf(h);
         } else {
-            l = storeState instanceof StoreState.Guild.DefaultTopic ? Long.valueOf(((StoreState.Guild.DefaultTopic) storeState).getChannel().g()) : storeState instanceof StoreState.DM ? Long.valueOf(((StoreState.DM) storeState).getChannel().g()) : storeState instanceof StoreState.GDM ? Long.valueOf(((StoreState.GDM) storeState).getChannel().g()) : null;
+            l = storeState instanceof StoreState.Guild.DefaultTopic ? Long.valueOf(((StoreState.Guild.DefaultTopic) storeState).getChannel().h()) : storeState instanceof StoreState.DM ? Long.valueOf(((StoreState.DM) storeState).getChannel().h()) : storeState instanceof StoreState.GDM ? Long.valueOf(((StoreState.GDM) storeState).getChannel().h()) : null;
         }
         this.previousChannelId = l;
         if (!(storeState.isRightPanelOpened() == this.wasRightPanelOpened && storeState.isOnHomeTab() == this.wasOnHomeTab)) {
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java
index 6f0c6315d8..e160168b5c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$binding$2.java
@@ -25,80 +25,80 @@ public final /* synthetic */ class WidgetCreateChannel$binding$2 extends k imple
 
     public final WidgetCreateChannelBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362784;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362784);
+        int i = 2131362809;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362809);
         if (constraintLayout != null) {
-            i = 2131362785;
-            ImageView imageView = (ImageView) view.findViewById(2131362785);
+            i = 2131362810;
+            ImageView imageView = (ImageView) view.findViewById(2131362810);
             if (imageView != null) {
-                i = 2131362786;
-                RadioButton radioButton = (RadioButton) view.findViewById(2131362786);
+                i = 2131362811;
+                RadioButton radioButton = (RadioButton) view.findViewById(2131362811);
                 if (radioButton != null) {
-                    i = 2131362787;
-                    TextView textView = (TextView) view.findViewById(2131362787);
+                    i = 2131362812;
+                    TextView textView = (TextView) view.findViewById(2131362812);
                     if (textView != null) {
-                        i = 2131362789;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362789);
+                        i = 2131362814;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362814);
                         if (textInputLayout != null) {
-                            i = 2131362790;
-                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362790);
+                            i = 2131362815;
+                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362815);
                             if (relativeLayout != null) {
-                                i = 2131362791;
-                                TextView textView2 = (TextView) view.findViewById(2131362791);
+                                i = 2131362816;
+                                TextView textView2 = (TextView) view.findViewById(2131362816);
                                 if (textView2 != null) {
-                                    i = 2131362792;
-                                    SwitchCompat switchCompat = (SwitchCompat) view.findViewById(2131362792);
+                                    i = 2131362817;
+                                    SwitchCompat switchCompat = (SwitchCompat) view.findViewById(2131362817);
                                     if (switchCompat != null) {
-                                        i = 2131362793;
-                                        TextView textView3 = (TextView) view.findViewById(2131362793);
+                                        i = 2131362818;
+                                        TextView textView3 = (TextView) view.findViewById(2131362818);
                                         if (textView3 != null) {
-                                            i = 2131362794;
-                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362794);
+                                            i = 2131362819;
+                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362819);
                                             if (recyclerView != null) {
-                                                i = 2131362795;
-                                                View findViewById = view.findViewById(2131362795);
+                                                i = 2131362820;
+                                                View findViewById = view.findViewById(2131362820);
                                                 if (findViewById != null) {
-                                                    i = 2131362796;
-                                                    TextView textView4 = (TextView) view.findViewById(2131362796);
+                                                    i = 2131362821;
+                                                    TextView textView4 = (TextView) view.findViewById(2131362821);
                                                     if (textView4 != null) {
-                                                        i = 2131362797;
-                                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131362797);
+                                                        i = 2131362822;
+                                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131362822);
                                                         if (constraintLayout2 != null) {
-                                                            i = 2131362798;
-                                                            ImageView imageView2 = (ImageView) view.findViewById(2131362798);
+                                                            i = 2131362823;
+                                                            ImageView imageView2 = (ImageView) view.findViewById(2131362823);
                                                             if (imageView2 != null) {
-                                                                i = 2131362799;
-                                                                RadioButton radioButton2 = (RadioButton) view.findViewById(2131362799);
+                                                                i = 2131362824;
+                                                                RadioButton radioButton2 = (RadioButton) view.findViewById(2131362824);
                                                                 if (radioButton2 != null) {
-                                                                    i = 2131362800;
-                                                                    TextView textView5 = (TextView) view.findViewById(2131362800);
+                                                                    i = 2131362825;
+                                                                    TextView textView5 = (TextView) view.findViewById(2131362825);
                                                                     if (textView5 != null) {
-                                                                        i = 2131362801;
-                                                                        ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131362801);
+                                                                        i = 2131362826;
+                                                                        ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131362826);
                                                                         if (constraintLayout3 != null) {
-                                                                            i = 2131362802;
-                                                                            ImageView imageView3 = (ImageView) view.findViewById(2131362802);
+                                                                            i = 2131362827;
+                                                                            ImageView imageView3 = (ImageView) view.findViewById(2131362827);
                                                                             if (imageView3 != null) {
-                                                                                i = 2131362803;
-                                                                                RadioButton radioButton3 = (RadioButton) view.findViewById(2131362803);
+                                                                                i = 2131362828;
+                                                                                RadioButton radioButton3 = (RadioButton) view.findViewById(2131362828);
                                                                                 if (radioButton3 != null) {
-                                                                                    i = 2131362804;
-                                                                                    TextView textView6 = (TextView) view.findViewById(2131362804);
+                                                                                    i = 2131362829;
+                                                                                    TextView textView6 = (TextView) view.findViewById(2131362829);
                                                                                     if (textView6 != null) {
-                                                                                        i = 2131362805;
-                                                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362805);
+                                                                                        i = 2131362830;
+                                                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362830);
                                                                                         if (linearLayout != null) {
-                                                                                            i = 2131362806;
-                                                                                            ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131362806);
+                                                                                            i = 2131362831;
+                                                                                            ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131362831);
                                                                                             if (constraintLayout4 != null) {
-                                                                                                i = 2131362807;
-                                                                                                ImageView imageView4 = (ImageView) view.findViewById(2131362807);
+                                                                                                i = 2131362832;
+                                                                                                ImageView imageView4 = (ImageView) view.findViewById(2131362832);
                                                                                                 if (imageView4 != null) {
-                                                                                                    i = 2131362808;
-                                                                                                    RadioButton radioButton4 = (RadioButton) view.findViewById(2131362808);
+                                                                                                    i = 2131362833;
+                                                                                                    RadioButton radioButton4 = (RadioButton) view.findViewById(2131362833);
                                                                                                     if (radioButton4 != null) {
-                                                                                                        i = 2131362809;
-                                                                                                        TextView textView7 = (TextView) view.findViewById(2131362809);
+                                                                                                        i = 2131362834;
+                                                                                                        TextView textView7 = (TextView) view.findViewById(2131362834);
                                                                                                         if (textView7 != null) {
                                                                                                             return new WidgetCreateChannelBinding((CoordinatorLayout) view, constraintLayout, imageView, radioButton, textView, textInputLayout, relativeLayout, textView2, switchCompat, textView3, recyclerView, findViewById, textView4, constraintLayout2, imageView2, radioButton2, textView5, constraintLayout3, imageView3, radioButton3, textView6, linearLayout, constraintLayout4, imageView4, radioButton4, textView7);
                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java
index 1da647699b..a088579cef 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java
@@ -45,7 +45,7 @@ public final class WidgetCreateChannel$configureUI$1<T1, T2> implements Action2<
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullParameter(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363911) {
+        if (menuItem.getItemId() == 2131363952) {
             RestAPI api = RestAPI.Companion.getApi();
             long access$getGuildId$p = WidgetCreateChannel.access$getGuildId$p(this.this$0);
             int access$getChannelType$p = WidgetCreateChannel.access$getChannelType$p(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java
index 7a8cc9e3c6..2cd703c02c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java
@@ -17,7 +17,7 @@ public final class WidgetCreateChannel$onViewBoundOrOnResume$4 implements View.O
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         RadioManager radioManager = this.$radioManager;
-        RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f1759c;
+        RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f1760c;
         m.checkNotNullExpressionValue(radioButton, "binding.createChannelAnnouncementsRadio");
         radioManager.a(radioButton);
         WidgetCreateChannel.access$configurePrivateRoles(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
index e36a23db7c..e7a09a29ad 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java
@@ -113,9 +113,9 @@ public final class WidgetCreateChannel extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable g = Observable.g(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeGuild(j), companion.getPermissions().observePermissionsForGuild(j), companion.getPermissions().observePermissionsForChannel(l != null ? l.longValue() : 0), companion.getGuilds().observeSortedRoles(j), WidgetCreateChannel$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(g, "Observable\n            .…          }\n            }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(g).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(g).r();
+                m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -239,7 +239,7 @@ public final class WidgetCreateChannel extends AppFragment {
     }
 
     public WidgetCreateChannel() {
-        super(2131558980);
+        super(2131558984);
     }
 
     public static final /* synthetic */ void access$configurePrivateRoles(WidgetCreateChannel widgetCreateChannel) {
@@ -316,7 +316,7 @@ public final class WidgetCreateChannel extends AppFragment {
         }
         boolean z2 = true;
         setActionBarDisplayHomeAsUpEnabled(true);
-        setActionBarTitle(getType() == 4 ? 2131887896 : 2131887897);
+        setActionBarTitle(getType() == 4 ? 2131887895 : 2131887896);
         AppFragment.setActionBarOptionsMenu$default(this, 2131623941, new WidgetCreateChannel$configureUI$1(this), null, 4, null);
         ConstraintLayout constraintLayout = getBinding().b;
         m.checkNotNullExpressionValue(constraintLayout, "binding.createChannelAnnouncementsContainer");
@@ -354,7 +354,7 @@ public final class WidgetCreateChannel extends AppFragment {
         if (radioButton.isChecked()) {
             return 2;
         }
-        RadioButton radioButton2 = getBinding().f1759c;
+        RadioButton radioButton2 = getBinding().f1760c;
         m.checkNotNullExpressionValue(radioButton2, "binding.createChannelAnnouncementsRadio");
         if (radioButton2.isChecked()) {
             return 5;
@@ -401,13 +401,13 @@ public final class WidgetCreateChannel extends AppFragment {
     }
 
     private final void onChannelCreated(Channel channel) {
-        if (channel.z() == 0) {
+        if (channel.A() == 0) {
             ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel, null, null, 6, null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
         boolean computeCanEditStageModerators = StageChannelUtils.computeCanEditStageModerators(companion.getPermissions(), companion.getGuilds(), companion.getUsers().getMe().getId(), getGuildId(), channel);
-        if (channel.z() == 13 && computeCanEditStageModerators) {
-            WidgetCreateChannelAddMember.Companion.create(requireContext(), channel.g());
+        if (channel.A() == 13 && computeCanEditStageModerators) {
+            WidgetCreateChannelAddMember.Companion.create(requireContext(), channel.h());
         }
         AppFragment.hideKeyboard$default(this, null, 1, null);
         AppActivity appActivity = getAppActivity();
@@ -436,7 +436,7 @@ public final class WidgetCreateChannel extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getGuildId(), getCategoryId()), this, null, 2, null), WidgetCreateChannel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCreateChannel$onViewBoundOrOnResume$1(this), 62, (Object) null);
         int i = 0;
         boolean z2 = true;
-        RadioManager radioManager = new RadioManager(n.listOf((Object[]) new RadioButton[]{getBinding().o, getBinding().r, getBinding().f1759c, getBinding().m}));
+        RadioManager radioManager = new RadioManager(n.listOf((Object[]) new RadioButton[]{getBinding().o, getBinding().r, getBinding().f1760c, getBinding().m}));
         getBinding().n.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$2(this, radioManager));
         getBinding().q.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$3(this, radioManager));
         getBinding().b.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$4(this, radioManager));
@@ -451,7 +451,7 @@ public final class WidgetCreateChannel extends AppFragment {
             m.checkNotNullExpressionValue(radioButton2, "binding.createChannelVoiceRadio");
             radioManager.a(radioButton2);
         } else if (type == 5) {
-            RadioButton radioButton3 = getBinding().f1759c;
+            RadioButton radioButton3 = getBinding().f1760c;
             m.checkNotNullExpressionValue(radioButton3, "binding.createChannelAnnouncementsRadio");
             radioManager.a(radioButton3);
         } else if (type == 13) {
@@ -470,11 +470,11 @@ public final class WidgetCreateChannel extends AppFragment {
             i = 8;
         }
         linearLayout.setVisibility(i);
-        getBinding().h.setText(getType() == 4 ? 2131892378 : 2131892381);
-        getBinding().f.setText(getType() == 4 ? 2131892380 : 2131892406);
-        getBinding().k.setText(getType() == 4 ? 2131888626 : 2131888629);
+        getBinding().h.setText(getType() == 4 ? 2131892455 : 2131892458);
+        getBinding().f.setText(getType() == 4 ? 2131892457 : 2131892483);
+        getBinding().k.setText(getType() == 4 ? 2131888627 : 2131888630);
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.createChannelNameLayout");
-        textInputLayout.setHint(getString(getType() == 4 ? 2131887204 : 2131888627));
+        textInputLayout.setHint(getString(getType() == 4 ? 2131887204 : 2131888628));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java
index 28cc8d4cad..7c82004bc5 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2.java
@@ -113,7 +113,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2
             }
 
             public final Observable<? extends Map<Long, Integer>> call(Map<Long, ? extends User> map) {
-                return Observable.B(this.$relationships.entrySet()).y(new AnonymousClass1(this, map)).h0(AnonymousClass2.INSTANCE, AnonymousClass3.INSTANCE);
+                return Observable.A(this.$relationships.entrySet()).x(new AnonymousClass1(this, map)).g0(AnonymousClass2.INSTANCE, AnonymousClass3.INSTANCE);
             }
         }
 
@@ -130,7 +130,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2
         }
 
         public final Observable<? extends Map<Long, Integer>> call(Map<Long, Integer> map) {
-            return StoreStream.Companion.getUsers().observeUsers(map.keySet()).Z(new AnonymousClass1(this, map));
+            return StoreStream.Companion.getUsers().observeUsers(map.keySet()).Y(new AnonymousClass1(this, map));
         }
     }
 
@@ -139,6 +139,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2
     }
 
     public final Observable<? extends Map<Long, Integer>> call(List<Long> list) {
-        return StoreStream.Companion.getUserRelationships().observeForType(1).Z(new AnonymousClass1(this, list));
+        return StoreStream.Companion.getUserRelationships().observeForType(1).Y(new AnonymousClass1(this, list));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java
index 88af9f3df7..927189c7a4 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForAdd$1.java
@@ -94,17 +94,17 @@ public final class WidgetGroupInviteFriends$Model$Companion$getForAdd$1<T, R> im
         public final Observable<? extends WidgetGroupInviteFriends.Model> call(WidgetGroupInviteFriends.Model.Companion.AddedUsersInput addedUsersInput) {
             ArrayList arrayList;
             WidgetGroupInviteFriends.Model.Companion companion = WidgetGroupInviteFriends.Model.Companion;
-            List<com.discord.api.user.User> v = this.$channel.v();
-            if (v != null) {
-                arrayList = new ArrayList(o.collectionSizeOrDefault(v, 10));
-                Iterator<T> it = v.iterator();
+            List<com.discord.api.user.User> w = this.$channel.w();
+            if (w != null) {
+                arrayList = new ArrayList(o.collectionSizeOrDefault(w, 10));
+                Iterator<T> it = w.iterator();
                 while (it.hasNext()) {
                     arrayList.add(new CoreUser(it.next()));
                 }
             } else {
                 arrayList = null;
             }
-            return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(companion, arrayList, addedUsersInput.getFilter()).G(new AnonymousClass2(addedUsersInput)).Z(new AnonymousClass3(this, addedUsersInput));
+            return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(companion, arrayList, addedUsersInput.getFilter()).F(new AnonymousClass2(addedUsersInput)).Y(new AnonymousClass3(this, addedUsersInput));
         }
     }
 
@@ -125,6 +125,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getForAdd$1<T, R> im
         if (r2 != null) {
             r2 = new WidgetGroupInviteFriends$sam$rx_functions_Func2$0(r2);
         }
-        return Observable.j(observable, observable2, (Func2) r2).Z(new AnonymousClass2(channel));
+        return Observable.j(observable, observable2, (Func2) r2).Y(new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java
index 93c6ba63d9..733eaa8c48 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getForCreate$2.java
@@ -55,6 +55,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getForCreate$2<T, R>
     }
 
     public final Observable<? extends WidgetGroupInviteFriends.Model> call(WidgetGroupInviteFriends.Model.Companion.AddedUsersInput addedUsersInput) {
-        return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(WidgetGroupInviteFriends.Model.Companion, null, addedUsersInput.getFilter()).G(new AnonymousClass1(addedUsersInput)).Z(new AnonymousClass2(addedUsersInput));
+        return WidgetGroupInviteFriends.Model.Companion.access$getFilteredFriends(WidgetGroupInviteFriends.Model.Companion, null, addedUsersInput.getFilter()).F(new AnonymousClass1(addedUsersInput)).Y(new AnonymousClass2(addedUsersInput));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java
index 7d062359d4..3dccbcd739 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1.java
@@ -34,7 +34,7 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1<T
         }
 
         public final Observable<? extends List<User>> call(Collection<? extends User> collection) {
-            return Observable.B(collection).y(new AnonymousClass1(this)).g0();
+            return Observable.A(collection).x(new AnonymousClass1(this)).f0();
         }
     }
 
@@ -50,6 +50,6 @@ public final class WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1<T
     }
 
     public final Observable<? extends List<User>> call(Map<Long, Integer> map) {
-        return this.$addedUsers.Z(new AnonymousClass1(map));
+        return this.$addedUsers.Y(new AnonymousClass1(map));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java
index 8f1127253d..758e11e21e 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java
@@ -22,23 +22,23 @@ public final /* synthetic */ class WidgetGroupInviteFriends$binding$2 extends k
 
     public final WidgetGroupInviteFriendsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363329;
-        ChipsView chipsView = (ChipsView) view.findViewById(2131363329);
+        int i = 2131363355;
+        ChipsView chipsView = (ChipsView) view.findViewById(2131363355);
         if (chipsView != null) {
-            i = 2131363330;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363330);
+            i = 2131363356;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363356);
             if (relativeLayout != null) {
-                i = 2131363331;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363331);
+                i = 2131363357;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363357);
                 if (recyclerView != null) {
-                    i = 2131363332;
-                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363332);
+                    i = 2131363358;
+                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363358);
                     if (floatingActionButton != null) {
-                        i = 2131363333;
-                        TextView textView = (TextView) view.findViewById(2131363333);
+                        i = 2131363359;
+                        TextView textView = (TextView) view.findViewById(2131363359);
                         if (textView != null) {
-                            i = 2131363334;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363334);
+                            i = 2131363360;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363360);
                             if (appViewFlipper != null) {
                                 return new WidgetGroupInviteFriendsBinding((CoordinatorLayout) view, chipsView, relativeLayout, recyclerView, floatingActionButton, textView, appViewFlipper);
                             }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java
index f27b18fe0c..82e709f32f 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java
@@ -31,7 +31,7 @@ public final class WidgetGroupInviteFriends$configureUI$1 extends o implements F
         if (!z2) {
             WidgetGroupInviteFriends.access$unselectUser(this.this$0, user);
         } else if (this.$data.getTotalNumRecipients() >= this.$data.getMaxGroupMemberCount()) {
-            c.a.d.o.i(this.this$0, 2131889144, 0, 4);
+            c.a.d.o.i(this.this$0, 2131889148, 0, 4);
         } else {
             WidgetGroupInviteFriends.access$selectUser(this.this$0, user);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java
index b796cb57e3..f3530a1868 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java
@@ -12,6 +12,6 @@ public final class WidgetGroupInviteFriends$setupFAB$1 implements View.OnClickLi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        o.g(this.this$0.getContext(), 2131889144, 0, null, 12);
+        o.g(this.this$0.getContext(), 2131889148, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.java
index 035e6292c8..2e3e1ccb59 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$2.java
@@ -79,33 +79,33 @@ public final class WidgetGroupInviteFriends$setupFAB$2 implements View.OnClickLi
         public final void invoke(Pair<Channel, Long> pair) {
             Channel component1 = pair.component1();
             Long component2 = pair.component2();
-            ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, component1.g(), null, null, 12, null);
+            ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, component1.h(), null, null, 12, null);
             StoreStream.Companion companion = StoreStream.Companion;
             Long l = null;
             StoreTabsNavigation.selectHomeTab$default(companion.getTabsNavigation(), StoreNavigation.PanelAction.CLOSE, false, 2, null);
             Channel channel = this.this$0.$data.getChannel();
             if (channel != null) {
-                l = Long.valueOf(channel.g());
+                l = Long.valueOf(channel.h());
             }
             if (m.areEqual(component2, l)) {
                 Channel channel2 = this.this$0.$data.getChannel();
-                if (channel2 == null || !AnimatableValueParser.p1(channel2)) {
+                if (channel2 == null || !AnimatableValueParser.q1(channel2)) {
                     companion.getVoiceChannelSelected().clear();
                     StoreCalls calls = companion.getCalls();
                     WidgetGroupInviteFriends widgetGroupInviteFriends = this.this$0.this$0;
                     Context requireContext = widgetGroupInviteFriends.requireContext();
                     FragmentManager parentFragmentManager = this.this$0.this$0.getParentFragmentManager();
                     m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                    calls.call(widgetGroupInviteFriends, requireContext, parentFragmentManager, component1.g(), AnonymousClass2.INSTANCE);
+                    calls.call(widgetGroupInviteFriends, requireContext, parentFragmentManager, component1.h(), AnonymousClass2.INSTANCE);
                 } else {
                     StoreCalls calls2 = companion.getCalls();
-                    long g = component1.g();
+                    long h = component1.h();
                     Collection<User> selectedUsers = this.this$0.$data.getSelectedUsers();
                     ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(selectedUsers, 10));
                     for (User user : selectedUsers) {
                         arrayList.add(Long.valueOf(user.getId()));
                     }
-                    calls2.ring(g, arrayList);
+                    calls2.ring(h, arrayList);
                 }
             }
             AppActivity appActivity = this.this$0.this$0.getAppActivity();
@@ -124,7 +124,7 @@ public final class WidgetGroupInviteFriends$setupFAB$2 implements View.OnClickLi
     public final void onClick(View view) {
         Observable<Channel> observable;
         if (this.$data.getChannel() != null) {
-            observable = RestAPI.Companion.getApi().addGroupRecipients(this.$data.getChannel().g(), u.toList(this.$data.getSelectedUsers()));
+            observable = RestAPI.Companion.getApi().addGroupRecipients(this.$data.getChannel().h(), u.toList(this.$data.getSelectedUsers()));
         } else if (this.$data.getSelectedUsers().size() == 1) {
             observable = RestAPI.Companion.getApi().createOrFetchDM(((User) u.first(this.$data.getSelectedUsers())).getId());
         } else {
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
index 623477b160..39ea9d1ba7 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java
@@ -65,9 +65,9 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     private static final int VIEW_INDEX_NO_FRIENDS = 1;
     private WidgetGroupInviteFriendsAdapter adapter;
     private final LinkedTreeMap<Long, User> addedUsers = new LinkedTreeMap<>();
-    private final BehaviorSubject<Collection<User>> addedUsersPublisher = BehaviorSubject.m0(new ArrayList());
+    private final BehaviorSubject<Collection<User>> addedUsersPublisher = BehaviorSubject.l0(new ArrayList());
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGroupInviteFriends$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.m0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
 
     /* compiled from: WidgetGroupInviteFriends.kt */
     public static final class Companion {
@@ -204,15 +204,15 @@ public final class WidgetGroupInviteFriends extends AppFragment {
                 if (collection == null) {
                     collection = n.emptyList();
                 }
-                Observable<ModelAppUserRelationship> Z = Observable.B(collection).G(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.INSTANCE).g0().A(new WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2(str)).Z(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "Observable\n            .…          }\n            }");
-                return Z;
+                Observable<ModelAppUserRelationship> Y = Observable.A(collection).F(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$1.INSTANCE).f0().z(new WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$2(str)).Y(WidgetGroupInviteFriends$Model$Companion$getFilteredFriends$3.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "Observable\n            .…          }\n            }");
+                return Y;
             }
 
             private final Observable<Model> getForAdd(long j, Observable<Collection<User>> observable, Observable<String> observable2) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new WidgetGroupInviteFriends$Model$Companion$getForAdd$1(observable, observable2));
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-                return Z;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetGroupInviteFriends$Model$Companion$getForAdd$1(observable, observable2));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                return Y;
             }
 
             /* JADX WARN: Multi-variable type inference failed */
@@ -222,9 +222,9 @@ public final class WidgetGroupInviteFriends extends AppFragment {
                 if (widgetGroupInviteFriends$Model$Companion$getForCreate$1 != null) {
                     widgetGroupInviteFriends$Model$Companion$getForCreate$1 = new WidgetGroupInviteFriends$sam$rx_functions_Func2$0(widgetGroupInviteFriends$Model$Companion$getForCreate$1);
                 }
-                Observable<Model> Z = Observable.j(observable, observable2, (Func2) widgetGroupInviteFriends$Model$Companion$getForCreate$1).Z(WidgetGroupInviteFriends$Model$Companion$getForCreate$2.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "Observable\n            .…          }\n            }");
-                return Z;
+                Observable<Model> Y = Observable.j(observable, observable2, (Func2) widgetGroupInviteFriends$Model$Companion$getForCreate$1).Y(WidgetGroupInviteFriends$Model$Companion$getForCreate$2.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "Observable\n            .…          }\n            }");
+                return Y;
             }
 
             public static /* synthetic */ void getMODE_CREATE$annotations() {
@@ -238,9 +238,9 @@ public final class WidgetGroupInviteFriends extends AppFragment {
 
             public final Observable<? extends Collection<User>> getFriendChanges(Observable<Collection<User>> observable) {
                 m.checkNotNullParameter(observable, "addedUsers");
-                Observable<? extends Collection<User>> s2 = StoreStream.Companion.getUserRelationships().observeForType(1).Z(new WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1(observable)).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<? extends Collection<User>> r = StoreStream.Companion.getUserRelationships().observeForType(1).Y(new WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1(observable)).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -639,8 +639,8 @@ public final class WidgetGroupInviteFriends extends AppFragment {
             if (channel == null) {
                 return size;
             }
-            List<com.discord.api.user.User> v = channel.v();
-            return size + (v != null ? v.size() : 0);
+            List<com.discord.api.user.User> w = channel.w();
+            return size + (w != null ? w.size() : 0);
         }
 
         public int hashCode() {
@@ -695,7 +695,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     }
 
     public WidgetGroupInviteFriends() {
-        super(2131559025);
+        super(2131559029);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGroupInviteFriends widgetGroupInviteFriends, Model model) {
@@ -716,7 +716,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
 
     private final void configureUI(Model model) {
         int i;
-        List<com.discord.api.user.User> v;
+        List<com.discord.api.user.User> w;
         if (model == null || (model.getMode() == 1 && model.getChannel() == null)) {
             AppActivity appActivity = getAppActivity();
             if (appActivity != null) {
@@ -747,8 +747,8 @@ public final class WidgetGroupInviteFriends extends AppFragment {
         getBinding().b.e(hashSet);
         List<Model.FriendItem> potentialAdditions = model.getPotentialAdditions();
         Channel channel = model.getChannel();
-        if (!(channel == null || (v = channel.v()) == null)) {
-            i = v.size();
+        if (!(channel == null || (w = channel.w()) == null)) {
+            i = w.size();
         }
         AppViewFlipper appViewFlipper = getBinding().f;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.groupInviteFriendsViewFlipper");
@@ -799,16 +799,16 @@ public final class WidgetGroupInviteFriends extends AppFragment {
     private final void setupToolbar(Model model) {
         CharSequence charSequence;
         if (model.getChannel() != null) {
-            setActionBarTitle(b.j(this, 2131889156, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4));
+            setActionBarTitle(b.j(this, 2131889160, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4));
         } else {
-            setActionBarTitle(getString(2131890545));
+            setActionBarTitle(getString(2131890613));
         }
         if (model.getChannel() != null) {
-            List<com.discord.api.user.User> v = model.getChannel().v();
-            if ((v != null ? v.size() : 1) >= model.getMaxGroupMemberCount()) {
-                charSequence = getString(2131889143);
+            List<com.discord.api.user.User> w = model.getChannel().w();
+            if ((w != null ? w.size() : 1) >= model.getMaxGroupMemberCount()) {
+                charSequence = getString(2131889147);
                 m.checkNotNullExpressionValue(charSequence, "getString(R.string.group_dm_invite_full_main)");
-                RelativeLayout relativeLayout = getBinding().f1790c;
+                RelativeLayout relativeLayout = getBinding().f1791c;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.groupInviteFriendsRecipientsContainer");
                 relativeLayout.setVisibility(8);
                 setActionBarSubtitle(charSequence);
@@ -820,7 +820,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
             m.checkNotNullExpressionValue(resources, "resources");
             charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755130, maxGroupMemberCount, Integer.valueOf(maxGroupMemberCount));
         } else if (maxGroupMemberCount == 0) {
-            charSequence = getString(2131889155);
+            charSequence = getString(2131889159);
             m.checkNotNullExpressionValue(charSequence, "getString(R.string.group…_invite_will_fill_mobile)");
         } else {
             int i = maxGroupMemberCount * -1;
@@ -828,7 +828,7 @@ public final class WidgetGroupInviteFriends extends AppFragment {
             m.checkNotNullExpressionValue(resources2, "resources");
             charSequence = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755131, i, Integer.valueOf(i));
         }
-        RelativeLayout relativeLayout2 = getBinding().f1790c;
+        RelativeLayout relativeLayout2 = getBinding().f1791c;
         m.checkNotNullExpressionValue(relativeLayout2, "binding.groupInviteFriendsRecipientsContainer");
         relativeLayout2.setVisibility(0);
         setActionBarSubtitle(charSequence);
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
index a1fbacfa04..60358b0fe5 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java
@@ -33,30 +33,30 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public WidgetGroupInviteFriendsListItem(WidgetGroupInviteFriendsAdapter widgetGroupInviteFriendsAdapter, WidgetGroupInviteFriendsAdapter widgetGroupInviteFriendsAdapter2) {
-            super(2131559026, widgetGroupInviteFriendsAdapter2);
+            super(2131559030, widgetGroupInviteFriendsAdapter2);
             m.checkNotNullParameter(widgetGroupInviteFriendsAdapter2, "adapter");
             this.this$0 = widgetGroupInviteFriendsAdapter;
             View view = this.itemView;
-            int i = 2131363227;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363227);
+            int i = 2131363252;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363252);
             if (relativeLayout != null) {
-                i = 2131363248;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363248);
+                i = 2131363273;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363273);
                 if (simpleDraweeView != null) {
-                    i = 2131363249;
-                    RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131363249);
+                    i = 2131363274;
+                    RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131363274);
                     if (relativeLayout2 != null) {
-                        i = 2131363255;
-                        SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363255);
+                        i = 2131363280;
+                        SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363280);
                         if (simpleDraweeSpanTextView != null) {
-                            i = 2131363257;
-                            TextView textView = (TextView) view.findViewById(2131363257);
+                            i = 2131363282;
+                            TextView textView = (TextView) view.findViewById(2131363282);
                             if (textView != null) {
-                                i = 2131363258;
-                                StatusView statusView = (StatusView) view.findViewById(2131363258);
+                                i = 2131363283;
+                                StatusView statusView = (StatusView) view.findViewById(2131363283);
                                 if (statusView != null) {
-                                    i = 2131365417;
-                                    CheckBox checkBox = (CheckBox) view.findViewById(2131365417);
+                                    i = 2131365477;
+                                    CheckBox checkBox = (CheckBox) view.findViewById(2131365477);
                                     if (checkBox != null) {
                                         WidgetGroupInviteFriendsItemBinding widgetGroupInviteFriendsItemBinding = new WidgetGroupInviteFriendsItemBinding((LinearLayout) view, relativeLayout, simpleDraweeView, relativeLayout2, simpleDraweeSpanTextView, textView, statusView, checkBox);
                                         m.checkNotNullExpressionValue(widgetGroupInviteFriendsItemBinding, "WidgetGroupInviteFriendsItemBinding.bind(itemView)");
@@ -93,7 +93,7 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp
             SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemGame");
             PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null);
-            SimpleDraweeView simpleDraweeView = this.binding.f1791c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1792c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, friendItem.getUser(), 2131165296, null, null, null, 56, null);
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java
deleted file mode 100644
index 3d4e4784dd..0000000000
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.discord.widgets.channels;
-
-import com.discord.api.channel.Channel;
-import com.discord.api.guild.GuildFeature;
-import com.discord.models.guild.Guild;
-import com.discord.models.user.MeUser;
-import com.discord.stores.StoreStream;
-import com.discord.utilities.permissions.PermissionUtils;
-import com.discord.widgets.channels.WidgetTextChannelSettings;
-import rx.functions.Func3;
-/* compiled from: WidgetTextChannelSettings.kt */
-public final class WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1<T1, T2, T3, R> implements Func3<Guild, MeUser, Long, WidgetTextChannelSettings.Model> {
-    public final /* synthetic */ Channel $channel$inlined;
-    public final /* synthetic */ WidgetTextChannelSettings$Model$Companion$get$1 this$0;
-
-    public WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1(WidgetTextChannelSettings$Model$Companion$get$1 widgetTextChannelSettings$Model$Companion$get$1, Channel channel) {
-        this.this$0 = widgetTextChannelSettings$Model$Companion$get$1;
-        this.$channel$inlined = channel;
-    }
-
-    public final WidgetTextChannelSettings.Model call(Guild guild, MeUser meUser, Long l) {
-        Long publicUpdatesChannelId;
-        Long rulesChannelId;
-        if (guild == null) {
-            return null;
-        }
-        boolean canAndIsElevated = PermissionUtils.canAndIsElevated(16, l, meUser.getMfaEnabled(), guild.getMfaLevel());
-        boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(268435456, l, meUser.getMfaEnabled(), guild.getMfaLevel());
-        boolean z2 = !this.$channel$inlined.n() || StoreStream.Companion.getGuildsNsfw().isGuildNsfwGateAgreed(this.$channel$inlined.e());
-        boolean contains = guild.getFeatures().contains(GuildFeature.COMMUNITY);
-        return new WidgetTextChannelSettings.Model(this.$channel$inlined, canAndIsElevated, canAndIsElevated2, z2, contains && (rulesChannelId = guild.getRulesChannelId()) != null && rulesChannelId.longValue() == this.this$0.$channelId, contains && (publicUpdatesChannelId = guild.getPublicUpdatesChannelId()) != null && publicUpdatesChannelId.longValue() == this.this$0.$channelId, contains);
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.java
index 638475cebc..6a29fe09f5 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion$get$1.java
@@ -1,25 +1,56 @@
 package com.discord.widgets.channels;
 
+import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
+import com.discord.api.guild.GuildFeature;
+import com.discord.models.guild.Guild;
+import com.discord.models.user.MeUser;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
+import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.widgets.channels.WidgetTextChannelSettings;
 import j0.k.b;
 import j0.l.e.j;
 import rx.Observable;
+import rx.functions.Func3;
 /* compiled from: WidgetTextChannelSettings.kt */
 public final class WidgetTextChannelSettings$Model$Companion$get$1<T, R> implements b<Channel, Observable<? extends WidgetTextChannelSettings.Model>> {
     public final /* synthetic */ long $channelId;
 
+    /* compiled from: WidgetTextChannelSettings.kt */
+    /* renamed from: com.discord.widgets.channels.WidgetTextChannelSettings$Model$Companion$get$1$1  reason: invalid class name */
+    public static final class AnonymousClass1<T1, T2, T3, R> implements Func3<Guild, MeUser, Long, WidgetTextChannelSettings.Model> {
+        public final /* synthetic */ Channel $channel;
+        public final /* synthetic */ WidgetTextChannelSettings$Model$Companion$get$1 this$0;
+
+        public AnonymousClass1(WidgetTextChannelSettings$Model$Companion$get$1 widgetTextChannelSettings$Model$Companion$get$1, Channel channel) {
+            this.this$0 = widgetTextChannelSettings$Model$Companion$get$1;
+            this.$channel = channel;
+        }
+
+        public final WidgetTextChannelSettings.Model call(Guild guild, MeUser meUser, Long l) {
+            Long publicUpdatesChannelId;
+            Long rulesChannelId;
+            if (guild == null) {
+                return null;
+            }
+            boolean canAndIsElevated = PermissionUtils.canAndIsElevated(16, l, meUser.getMfaEnabled(), guild.getMfaLevel());
+            boolean canAndIsElevated2 = PermissionUtils.canAndIsElevated(268435456, l, meUser.getMfaEnabled(), guild.getMfaLevel());
+            boolean z2 = !this.$channel.o() || StoreStream.Companion.getGuildsNsfw().isGuildNsfwGateAgreed(this.$channel.f());
+            boolean contains = guild.getFeatures().contains(GuildFeature.COMMUNITY);
+            return new WidgetTextChannelSettings.Model(guild, this.$channel, canAndIsElevated, canAndIsElevated2, z2, contains && (rulesChannelId = guild.getRulesChannelId()) != null && rulesChannelId.longValue() == this.this$0.$channelId, contains && (publicUpdatesChannelId = guild.getPublicUpdatesChannelId()) != null && publicUpdatesChannelId.longValue() == this.this$0.$channelId, contains);
+        }
+    }
+
     public WidgetTextChannelSettings$Model$Companion$get$1(long j) {
         this.$channelId = j;
     }
 
     public final Observable<? extends WidgetTextChannelSettings.Model> call(Channel channel) {
-        if (channel == null) {
+        if (channel == null || AnimatableValueParser.z1(channel)) {
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(companion.getGuilds().observeGuild(channel.e()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(this.$channelId), new WidgetTextChannelSettings$Model$Companion$get$1$$special$$inlined$let$lambda$1(this, channel));
+        return Observable.i(companion.getGuilds().observeGuild(channel.f()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(this.$channelId), new AnonymousClass1(this, channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java
index 5298975cb5..038fbfbfad 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java
@@ -23,58 +23,74 @@ public final /* synthetic */ class WidgetTextChannelSettings$binding$2 extends k
 
     public final WidgetTextChannelSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362320;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362320);
+        int i = 2131362331;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362331);
         if (checkedSetting != null) {
-            i = 2131362328;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362328);
-            if (textInputLayout != null) {
-                i = 2131362329;
-                TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362329);
-                if (textInputLayout2 != null) {
-                    i = 2131362330;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362330);
-                    if (linearLayout != null) {
-                        i = 2131362335;
-                        CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362335);
-                        if (checkedSetting2 != null) {
-                            i = 2131362336;
-                            TextView textView = (TextView) view.findViewById(2131362336);
-                            if (textView != null) {
-                                i = 2131362341;
-                                TextView textView2 = (TextView) view.findViewById(2131362341);
-                                if (textView2 != null) {
-                                    i = 2131362342;
-                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362342);
-                                    if (linearLayout2 != null) {
-                                        i = 2131362343;
-                                        View findViewById = view.findViewById(2131362343);
-                                        if (findViewById != null) {
-                                            i = 2131362347;
-                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362347);
-                                            if (floatingActionButton != null) {
-                                                i = 2131362348;
-                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362348);
-                                                if (linearLayout3 != null) {
-                                                    i = 2131362349;
-                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362349);
-                                                    if (linearLayout4 != null) {
-                                                        i = 2131362350;
-                                                        LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131362350);
-                                                        if (linearLayout5 != null) {
-                                                            i = 2131362351;
-                                                            TextView textView3 = (TextView) view.findViewById(2131362351);
-                                                            if (textView3 != null) {
-                                                                i = 2131362352;
-                                                                SeekBar seekBar = (SeekBar) view.findViewById(2131362352);
-                                                                if (seekBar != null) {
-                                                                    i = 2131362353;
-                                                                    TextView textView4 = (TextView) view.findViewById(2131362353);
-                                                                    if (textView4 != null) {
-                                                                        i = 2131364528;
-                                                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528);
-                                                                        if (nestedScrollView != null) {
-                                                                            return new WidgetTextChannelSettingsBinding((CoordinatorLayout) view, checkedSetting, textInputLayout, textInputLayout2, linearLayout, checkedSetting2, textView, textView2, linearLayout2, findViewById, floatingActionButton, linearLayout3, linearLayout4, linearLayout5, textView3, seekBar, textView4, nestedScrollView);
+            i = 2131362335;
+            TextView textView = (TextView) view.findViewById(2131362335);
+            if (textView != null) {
+                i = 2131362336;
+                SeekBar seekBar = (SeekBar) view.findViewById(2131362336);
+                if (seekBar != null) {
+                    i = 2131362337;
+                    TextView textView2 = (TextView) view.findViewById(2131362337);
+                    if (textView2 != null) {
+                        i = 2131362342;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362342);
+                        if (textInputLayout != null) {
+                            i = 2131362343;
+                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362343);
+                            if (textInputLayout2 != null) {
+                                i = 2131362344;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362344);
+                                if (linearLayout != null) {
+                                    i = 2131362349;
+                                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362349);
+                                    if (checkedSetting2 != null) {
+                                        i = 2131362350;
+                                        TextView textView3 = (TextView) view.findViewById(2131362350);
+                                        if (textView3 != null) {
+                                            i = 2131362355;
+                                            TextView textView4 = (TextView) view.findViewById(2131362355);
+                                            if (textView4 != null) {
+                                                i = 2131362356;
+                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362356);
+                                                if (linearLayout2 != null) {
+                                                    i = 2131362357;
+                                                    View findViewById = view.findViewById(2131362357);
+                                                    if (findViewById != null) {
+                                                        i = 2131362361;
+                                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362361);
+                                                        if (floatingActionButton != null) {
+                                                            i = 2131362362;
+                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362362);
+                                                            if (linearLayout3 != null) {
+                                                                i = 2131362363;
+                                                                LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362363);
+                                                                if (linearLayout4 != null) {
+                                                                    i = 2131362364;
+                                                                    LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131362364);
+                                                                    if (linearLayout5 != null) {
+                                                                        i = 2131362365;
+                                                                        LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131362365);
+                                                                        if (linearLayout6 != null) {
+                                                                            i = 2131362366;
+                                                                            TextView textView5 = (TextView) view.findViewById(2131362366);
+                                                                            if (textView5 != null) {
+                                                                                i = 2131362367;
+                                                                                SeekBar seekBar2 = (SeekBar) view.findViewById(2131362367);
+                                                                                if (seekBar2 != null) {
+                                                                                    i = 2131362368;
+                                                                                    TextView textView6 = (TextView) view.findViewById(2131362368);
+                                                                                    if (textView6 != null) {
+                                                                                        i = 2131364567;
+                                                                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364567);
+                                                                                        if (nestedScrollView != null) {
+                                                                                            return new WidgetTextChannelSettingsBinding((CoordinatorLayout) view, checkedSetting, textView, seekBar, textView2, textInputLayout, textInputLayout2, linearLayout, checkedSetting2, textView3, textView4, linearLayout2, findViewById, floatingActionButton, linearLayout3, linearLayout4, linearLayout5, linearLayout6, textView5, seekBar2, textView6, nestedScrollView);
+                                                                                        }
+                                                                                    }
+                                                                                }
+                                                                            }
                                                                         }
                                                                     }
                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java
index 776fb7125e..4092a2d7a4 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java
@@ -20,7 +20,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363868:
+            case 2131363909:
                 if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) {
                     WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel());
                     return;
@@ -28,7 +28,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
                     WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel());
                     return;
                 }
-            case 2131363869:
+            case 2131363910:
                 StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings();
                 m.checkNotNullExpressionValue(context, "context");
                 userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel());
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java
index 5abcc47ec1..9387d9d95e 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java
@@ -14,7 +14,7 @@ public final class WidgetTextChannelSettings$configureUI$2<T> implements Action1
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363868);
+        MenuItem findItem = menu.findItem(2131363909);
         m.checkNotNullExpressionValue(findItem, "it.findItem(R.id.menu_channel_settings_delete)");
         findItem.setVisible(this.$this_configureUI.getCanManageChannel());
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java
index f0e4a6397e..5a44474882 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java
@@ -19,18 +19,22 @@ public final class WidgetTextChannelSettings$configureUI$3 implements View.OnCli
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetTextChannelSettings widgetTextChannelSettings = this.this$0;
-        long g = this.$this_configureUI.getChannel().g();
+        long h = this.$this_configureUI.getChannel().h();
         StatefulViews access$getState$p = WidgetTextChannelSettings.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f1968c;
+        TextInputLayout textInputLayout = WidgetTextChannelSettings.access$getBinding$p(this.this$0).e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         String str = (String) access$getState$p.getIfChanged(textInputLayout.getId());
         StatefulViews access$getState$p2 = WidgetTextChannelSettings.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout2 = WidgetTextChannelSettings.access$getBinding$p(this.this$0).d;
+        TextInputLayout textInputLayout2 = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditTopic");
         String str2 = (String) access$getState$p2.getIfChanged(textInputLayout2.getId());
         StatefulViews access$getState$p3 = WidgetTextChannelSettings.access$getState$p(this.this$0);
-        SeekBar seekBar = WidgetTextChannelSettings.access$getBinding$p(this.this$0).p;
+        SeekBar seekBar = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f1972s;
         m.checkNotNullExpressionValue(seekBar, "binding.channelSettingsSlowModeCooldownSlider");
-        WidgetTextChannelSettings.saveChannel$default(widgetTextChannelSettings, g, str, null, str2, null, (Integer) access$getState$p3.getIfChanged(seekBar.getId()), 20, null);
+        Integer num = (Integer) access$getState$p3.getIfChanged(seekBar.getId());
+        StatefulViews access$getState$p4 = WidgetTextChannelSettings.access$getState$p(this.this$0);
+        SeekBar seekBar2 = WidgetTextChannelSettings.access$getBinding$p(this.this$0).d;
+        m.checkNotNullExpressionValue(seekBar2, "binding.channelSettingsD…AutoArchiveDurationSlider");
+        WidgetTextChannelSettings.saveChannel$default(widgetTextChannelSettings, h, str, null, str2, null, num, (Integer) access$getState$p4.getIfChanged(seekBar2.getId()), 20, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.java
index 85e9a5ce4b..66b3c872d2 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$5.java
@@ -14,6 +14,6 @@ public final class WidgetTextChannelSettings$configureUI$5 implements View.OnCli
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelPinnedMessages.Companion.show(a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().g());
+        WidgetChannelPinnedMessages.Companion.show(a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java
index 2710e02e78..475f0bb05c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java
@@ -10,6 +10,6 @@ public final class WidgetTextChannelSettings$configureUI$6 implements View.OnCli
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         m.checkNotNullExpressionValue(view, "it");
-        o.g(view.getContext(), 2131891899, 0, null, 12);
+        o.g(view.getContext(), 2131891971, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.java
index 7c2bca4b14..94535b542f 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$7.java
@@ -14,6 +14,6 @@ public final class WidgetTextChannelSettings$configureUI$7 implements View.OnCli
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSettingsPermissionsOverview.Companion.launch(a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().g());
+        WidgetChannelSettingsPermissionsOverview.Companion.launch(a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.java
index eab71ea8cb..2a978ee66d 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$8.java
@@ -16,9 +16,9 @@ public final class WidgetTextChannelSettings$configureUI$8 implements View.OnCli
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (AnimatableValueParser.d1(this.$this_configureUI.getChannel())) {
-            WidgetTextChannelSettings.saveChannel$default(this.this$0, this.$this_configureUI.getChannel().g(), null, 0, null, null, null, 58, null);
+            WidgetTextChannelSettings.saveChannel$default(this.this$0, this.$this_configureUI.getChannel().h(), null, 0, null, null, null, null, 122, null);
         } else {
-            WidgetTextChannelSettings.saveChannel$default(this.this$0, this.$this_configureUI.getChannel().g(), null, 5, null, null, null, 58, null);
+            WidgetTextChannelSettings.saveChannel$default(this.this$0, this.$this_configureUI.getChannel().h(), null, 5, null, null, null, null, 122, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$9.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$9.java
index 2d324b65e7..0604146b61 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$9.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$9.java
@@ -17,9 +17,9 @@ public final class WidgetTextChannelSettings$configureUI$9 implements View.OnCli
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetTextChannelSettings widgetTextChannelSettings = this.this$0;
-        long g = this.$this_configureUI.getChannel().g();
-        CheckedSetting checkedSetting = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f;
+        long h = this.$this_configureUI.getChannel().h();
+        CheckedSetting checkedSetting = WidgetTextChannelSettings.access$getBinding$p(this.this$0).h;
         m.checkNotNullExpressionValue(checkedSetting, "binding.channelSettingsNsfw");
-        WidgetTextChannelSettings.saveChannel$default(widgetTextChannelSettings, g, null, null, null, Boolean.valueOf(!checkedSetting.isChecked()), null, 46, null);
+        WidgetTextChannelSettings.saveChannel$default(widgetTextChannelSettings, h, null, null, null, Boolean.valueOf(!checkedSetting.isChecked()), null, null, 110, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.java
index 1a21fb5533..334f8a33d6 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$confirmDelete$2.java
@@ -51,7 +51,7 @@ public final class WidgetTextChannelSettings$confirmDelete$2 implements View.OnC
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteChannel(this.$channel.g()), false, 1, null), this.this$0, null, 2, null);
+        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteChannel(this.$channel.h()), false, 1, null), this.this$0, null, 2, null);
         m.checkNotNullExpressionValue(view, "v");
         ObservableExtensionsKt.appSubscribe$default(ui$default, view.getContext(), "javaClass", (Function1) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.java
index 451c27a382..5d0ce14e3c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.java
@@ -19,9 +19,9 @@ public final class WidgetTextChannelSettings$onViewBound$1 extends i {
         if (z2) {
             int intValue = ((Number) WidgetTextChannelSettings.access$getSLOWMODE_COOLDOWN_VALUES$cp().get(i)).intValue();
             WidgetTextChannelSettings.access$setSlowmodeLabel(this.this$0, intValue);
-            WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131362352, Integer.valueOf(intValue));
-            WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).k);
-            TextView textView = WidgetTextChannelSettings.access$getBinding$p(this.this$0).o;
+            WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131362367, Integer.valueOf(intValue));
+            WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).m);
+            TextView textView = WidgetTextChannelSettings.access$getBinding$p(this.this$0).r;
             m.checkNotNullExpressionValue(textView, "binding.channelSettingsSlowModeCooldownLabel");
             seekBar.setContentDescription(textView.getText());
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$2.java
new file mode 100644
index 0000000000..4b5c165857
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$2.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.channels;
+
+import android.widget.SeekBar;
+import android.widget.TextView;
+import c.a.z.i;
+import com.discord.utilities.threads.ThreadUtils;
+import d0.z.d.m;
+/* compiled from: WidgetTextChannelSettings.kt */
+public final class WidgetTextChannelSettings$onViewBound$2 extends i {
+    public final /* synthetic */ WidgetTextChannelSettings this$0;
+
+    public WidgetTextChannelSettings$onViewBound$2(WidgetTextChannelSettings widgetTextChannelSettings) {
+        this.this$0 = widgetTextChannelSettings;
+    }
+
+    @Override // c.a.z.i, android.widget.SeekBar.OnSeekBarChangeListener
+    public void onProgressChanged(SeekBar seekBar, int i, boolean z2) {
+        m.checkNotNullParameter(seekBar, "seekBar");
+        super.onProgressChanged(seekBar, i, z2);
+        if (z2) {
+            Integer num = ThreadUtils.INSTANCE.getTHREAD_AUTO_ARCHIVE_DURATIONS().get(i);
+            m.checkNotNullExpressionValue(num, "THREAD_AUTO_ARCHIVE_DURATIONS[progress]");
+            int intValue = num.intValue();
+            WidgetTextChannelSettings.access$setDefaultAutoArchiveDurationLabel(this.this$0, intValue);
+            WidgetTextChannelSettings.access$getState$p(this.this$0).put(2131362336, Integer.valueOf(intValue));
+            WidgetTextChannelSettings.access$getState$p(this.this$0).configureSaveActionView(WidgetTextChannelSettings.access$getBinding$p(this.this$0).m);
+            TextView textView = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f1971c;
+            m.checkNotNullExpressionValue(textView, "binding.channelSettingsD…tAutoArchiveDurationLabel");
+            seekBar.setContentDescription(textView.getText());
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java
index 6794eedbd3..458efb50ae 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java
@@ -14,18 +14,20 @@ import androidx.fragment.app.FragmentActivity;
 import c.a.d.f;
 import c.a.d.l;
 import c.a.d.q;
-import c.a.i.b4;
-import c.a.i.c4;
+import c.a.i.e4;
+import c.a.i.f4;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetTextChannelSettingsBinding;
+import com.discord.models.guild.Guild;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.stateful.StatefulViews;
+import com.discord.utilities.threads.ThreadUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
@@ -46,11 +48,12 @@ import rx.Observable;
 public final class WidgetTextChannelSettings extends AppFragment {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetTextChannelSettings.class, "binding", "getBinding()Lcom/discord/databinding/WidgetTextChannelSettingsBinding;", 0)};
     public static final Companion Companion = new Companion(null);
+    private static final int ONE_DAY = 86400;
     private static final int ONE_HOUR = 3600;
     private static final int ONE_MINUTE = 60;
     private static final List<Integer> SLOWMODE_COOLDOWN_VALUES = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 30, 60, 120, 300, 600, 900, 1800, 3600, 7200, 21600});
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetTextChannelSettings$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131362328, 2131362329, 2131362352, 2131362320);
+    private final StatefulViews state = new StatefulViews(2131362342, 2131362343, 2131362367, 2131362336, 2131362331);
 
     /* compiled from: WidgetTextChannelSettings.kt */
     public static final class Companion {
@@ -75,6 +78,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
         private final boolean canManageChannel;
         private final boolean canManagePermissions;
         private final Channel channel;
+        private final Guild guild;
         private final boolean isCommunityGuild;
         private final boolean isPinsEnabled;
         private final boolean isPublicGuildRulesChannel;
@@ -90,16 +94,18 @@ public final class WidgetTextChannelSettings extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new WidgetTextChannelSettings$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …ust(null)\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetTextChannelSettings$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
-        public Model(Channel channel, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7) {
+        public Model(Guild guild, Channel channel, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7) {
+            m.checkNotNullParameter(guild, "guild");
             m.checkNotNullParameter(channel, "channel");
+            this.guild = guild;
             this.channel = channel;
             this.canManageChannel = z2;
             this.canManagePermissions = z3;
@@ -109,62 +115,46 @@ public final class WidgetTextChannelSettings extends AppFragment {
             this.isCommunityGuild = z7;
         }
 
-        public static /* synthetic */ Model copy$default(Model model, Channel channel, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, int i, Object obj) {
-            if ((i & 1) != 0) {
-                channel = model.channel;
-            }
-            if ((i & 2) != 0) {
-                z2 = model.canManageChannel;
-            }
-            if ((i & 4) != 0) {
-                z3 = model.canManagePermissions;
-            }
-            if ((i & 8) != 0) {
-                z4 = model.isPinsEnabled;
-            }
-            if ((i & 16) != 0) {
-                z5 = model.isPublicGuildRulesChannel;
-            }
-            if ((i & 32) != 0) {
-                z6 = model.isPublicGuildUpdatesChannel;
-            }
-            if ((i & 64) != 0) {
-                z7 = model.isCommunityGuild;
-            }
-            return model.copy(channel, z2, z3, z4, z5, z6, z7);
+        public static /* synthetic */ Model copy$default(Model model, Guild guild, Channel channel, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, int i, Object obj) {
+            return model.copy((i & 1) != 0 ? model.guild : guild, (i & 2) != 0 ? model.channel : channel, (i & 4) != 0 ? model.canManageChannel : z2, (i & 8) != 0 ? model.canManagePermissions : z3, (i & 16) != 0 ? model.isPinsEnabled : z4, (i & 32) != 0 ? model.isPublicGuildRulesChannel : z5, (i & 64) != 0 ? model.isPublicGuildUpdatesChannel : z6, (i & 128) != 0 ? model.isCommunityGuild : z7);
         }
 
-        public final Channel component1() {
+        public final Guild component1() {
+            return this.guild;
+        }
+
+        public final Channel component2() {
             return this.channel;
         }
 
-        public final boolean component2() {
+        public final boolean component3() {
             return this.canManageChannel;
         }
 
-        public final boolean component3() {
+        public final boolean component4() {
             return this.canManagePermissions;
         }
 
-        public final boolean component4() {
+        public final boolean component5() {
             return this.isPinsEnabled;
         }
 
-        public final boolean component5() {
+        public final boolean component6() {
             return this.isPublicGuildRulesChannel;
         }
 
-        public final boolean component6() {
+        public final boolean component7() {
             return this.isPublicGuildUpdatesChannel;
         }
 
-        public final boolean component7() {
+        public final boolean component8() {
             return this.isCommunityGuild;
         }
 
-        public final Model copy(Channel channel, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7) {
+        public final Model copy(Guild guild, Channel channel, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7) {
+            m.checkNotNullParameter(guild, "guild");
             m.checkNotNullParameter(channel, "channel");
-            return new Model(channel, z2, z3, z4, z5, z6, z7);
+            return new Model(guild, channel, z2, z3, z4, z5, z6, z7);
         }
 
         public boolean equals(Object obj) {
@@ -175,7 +165,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.channel, model.channel) && this.canManageChannel == model.canManageChannel && this.canManagePermissions == model.canManagePermissions && this.isPinsEnabled == model.isPinsEnabled && this.isPublicGuildRulesChannel == model.isPublicGuildRulesChannel && this.isPublicGuildUpdatesChannel == model.isPublicGuildUpdatesChannel && this.isCommunityGuild == model.isCommunityGuild;
+            return m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.canManageChannel == model.canManageChannel && this.canManagePermissions == model.canManagePermissions && this.isPinsEnabled == model.isPinsEnabled && this.isPublicGuildRulesChannel == model.isPublicGuildRulesChannel && this.isPublicGuildUpdatesChannel == model.isPublicGuildUpdatesChannel && this.isCommunityGuild == model.isCommunityGuild;
         }
 
         public final boolean getCanManageChannel() {
@@ -190,55 +180,65 @@ public final class WidgetTextChannelSettings extends AppFragment {
             return this.channel;
         }
 
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
         public int hashCode() {
+            Guild guild = this.guild;
+            int i = 0;
+            int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
             Channel channel = this.channel;
-            int hashCode = (channel != null ? channel.hashCode() : 0) * 31;
+            if (channel != null) {
+                i = channel.hashCode();
+            }
+            int i2 = (hashCode + i) * 31;
             boolean z2 = this.canManageChannel;
-            int i = 1;
+            int i3 = 1;
             if (z2) {
                 z2 = true;
             }
-            int i2 = z2 ? 1 : 0;
-            int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
-            int i5 = (hashCode + i2) * 31;
+            int i5 = z2 ? 1 : 0;
+            int i6 = z2 ? 1 : 0;
+            int i7 = (i2 + i4) * 31;
             boolean z3 = this.canManagePermissions;
             if (z3) {
                 z3 = true;
             }
-            int i6 = z3 ? 1 : 0;
-            int i7 = z3 ? 1 : 0;
             int i8 = z3 ? 1 : 0;
-            int i9 = (i5 + i6) * 31;
+            int i9 = z3 ? 1 : 0;
+            int i10 = z3 ? 1 : 0;
+            int i11 = (i7 + i8) * 31;
             boolean z4 = this.isPinsEnabled;
             if (z4) {
                 z4 = true;
             }
-            int i10 = z4 ? 1 : 0;
-            int i11 = z4 ? 1 : 0;
             int i12 = z4 ? 1 : 0;
-            int i13 = (i9 + i10) * 31;
+            int i13 = z4 ? 1 : 0;
+            int i14 = z4 ? 1 : 0;
+            int i15 = (i11 + i12) * 31;
             boolean z5 = this.isPublicGuildRulesChannel;
             if (z5) {
                 z5 = true;
             }
-            int i14 = z5 ? 1 : 0;
-            int i15 = z5 ? 1 : 0;
             int i16 = z5 ? 1 : 0;
-            int i17 = (i13 + i14) * 31;
+            int i17 = z5 ? 1 : 0;
+            int i18 = z5 ? 1 : 0;
+            int i19 = (i15 + i16) * 31;
             boolean z6 = this.isPublicGuildUpdatesChannel;
             if (z6) {
                 z6 = true;
             }
-            int i18 = z6 ? 1 : 0;
-            int i19 = z6 ? 1 : 0;
             int i20 = z6 ? 1 : 0;
-            int i21 = (i17 + i18) * 31;
+            int i21 = z6 ? 1 : 0;
+            int i22 = z6 ? 1 : 0;
+            int i23 = (i19 + i20) * 31;
             boolean z7 = this.isCommunityGuild;
             if (!z7) {
-                i = z7 ? 1 : 0;
+                i3 = z7 ? 1 : 0;
             }
-            return i21 + i;
+            return i23 + i3;
         }
 
         public final boolean isCommunityGuild() {
@@ -258,7 +258,9 @@ public final class WidgetTextChannelSettings extends AppFragment {
         }
 
         public String toString() {
-            StringBuilder L = a.L("Model(channel=");
+            StringBuilder L = a.L("Model(guild=");
+            L.append(this.guild);
+            L.append(", channel=");
             L.append(this.channel);
             L.append(", canManageChannel=");
             L.append(this.canManageChannel);
@@ -276,7 +278,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
     }
 
     public WidgetTextChannelSettings() {
-        super(2131559244);
+        super(2131559252);
     }
 
     public static final /* synthetic */ void access$cannotDeleteWarn(WidgetTextChannelSettings widgetTextChannelSettings, boolean z2) {
@@ -303,27 +305,31 @@ public final class WidgetTextChannelSettings extends AppFragment {
         return widgetTextChannelSettings.state;
     }
 
+    public static final /* synthetic */ void access$setDefaultAutoArchiveDurationLabel(WidgetTextChannelSettings widgetTextChannelSettings, int i) {
+        widgetTextChannelSettings.setDefaultAutoArchiveDurationLabel(i);
+    }
+
     public static final /* synthetic */ void access$setSlowmodeLabel(WidgetTextChannelSettings widgetTextChannelSettings, int i) {
         widgetTextChannelSettings.setSlowmodeLabel(i);
     }
 
     private final void cannotDeleteWarn(boolean z2) {
-        View inflate = LayoutInflater.from(getContext()).inflate(2131558882, (ViewGroup) null, false);
-        int i = 2131362321;
-        TextView textView = (TextView) inflate.findViewById(2131362321);
+        View inflate = LayoutInflater.from(getContext()).inflate(2131558885, (ViewGroup) null, false);
+        int i = 2131362332;
+        TextView textView = (TextView) inflate.findViewById(2131362332);
         if (textView != null) {
-            i = 2131362322;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362322);
+            i = 2131362333;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362333);
             if (materialButton != null) {
-                i = 2131362323;
-                TextView textView2 = (TextView) inflate.findViewById(2131362323);
+                i = 2131362334;
+                TextView textView2 = (TextView) inflate.findViewById(2131362334);
                 if (textView2 != null) {
                     LinearLayout linearLayout = (LinearLayout) inflate;
-                    m.checkNotNullExpressionValue(new b4(linearLayout, textView, materialButton, textView2), "WidgetChannelSettingsCan…om(context), null, false)");
+                    m.checkNotNullExpressionValue(new e4(linearLayout, textView, materialButton, textView2), "WidgetChannelSettingsCan…om(context), null, false)");
                     m.checkNotNullExpressionValue(linearLayout, "binding.root");
                     AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).create();
                     m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()");
-                    textView.setText(z2 ? 2131888073 : 2131888082);
+                    textView.setText(z2 ? 2131888072 : 2131888081);
                     materialButton.setOnClickListener(new WidgetTextChannelSettings$cannotDeleteWarn$1(create));
                     create.show();
                     return;
@@ -334,6 +340,7 @@ public final class WidgetTextChannelSettings extends AppFragment {
     }
 
     private final void configureUI(Model model) {
+        int i;
         if (model == null) {
             FragmentActivity activity = getActivity();
             if (activity != null) {
@@ -344,119 +351,147 @@ public final class WidgetTextChannelSettings extends AppFragment {
         }
         CharSequence charSequence = null;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(AnimatableValueParser.x1(model.getChannel()) ? 2131887326 : 2131887208);
+        setActionBarTitle(AnimatableValueParser.y1(model.getChannel()) ? 2131887326 : 2131887208);
         setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2));
-        setActionBarOptionsMenu(AnimatableValueParser.x1(model.getChannel()) ? 2131623965 : 2131623940, new WidgetTextChannelSettings$configureUI$1(this, model), new WidgetTextChannelSettings$configureUI$2(model));
-        TextInputLayout textInputLayout = getBinding().f1968c;
+        setActionBarOptionsMenu(AnimatableValueParser.y1(model.getChannel()) ? 2131623965 : 2131623940, new WidgetTextChannelSettings$configureUI$1(this, model), new WidgetTextChannelSettings$configureUI$2(model));
+        TextInputLayout textInputLayout = getBinding().e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f1968c;
+        TextInputLayout textInputLayout2 = getBinding().e;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), AnimatableValueParser.y0(model.getChannel())));
-        getBinding().f1968c.setHint(AnimatableValueParser.x1(model.getChannel()) ? 2131888627 : 2131887204);
-        TextInputLayout textInputLayout3 = getBinding().d;
+        getBinding().e.setHint(AnimatableValueParser.y1(model.getChannel()) ? 2131888628 : 2131887204);
+        TextInputLayout textInputLayout3 = getBinding().f;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
         StatefulViews statefulViews2 = this.state;
-        TextInputLayout textInputLayout4 = getBinding().d;
+        TextInputLayout textInputLayout4 = getBinding().f;
         m.checkNotNullExpressionValue(textInputLayout4, "binding.channelSettingsEditTopic");
         int id2 = textInputLayout4.getId();
-        String y2 = model.getChannel().y();
-        if (y2 == null) {
-            y2 = "";
+        String z2 = model.getChannel().z();
+        if (z2 == null) {
+            z2 = "";
         }
-        ViewExtensions.setText(textInputLayout3, (CharSequence) statefulViews2.get(id2, y2));
-        TextInputLayout textInputLayout5 = getBinding().d;
+        ViewExtensions.setText(textInputLayout3, (CharSequence) statefulViews2.get(id2, z2));
+        TextInputLayout textInputLayout5 = getBinding().f;
         m.checkNotNullExpressionValue(textInputLayout5, "binding.channelSettingsEditTopic");
-        int i = 8;
-        textInputLayout5.setVisibility(AnimatableValueParser.x1(model.getChannel()) ? 0 : 8);
-        LinearLayout linearLayout = getBinding().e;
+        int i2 = 8;
+        textInputLayout5.setVisibility(AnimatableValueParser.y1(model.getChannel()) ? 0 : 8);
+        LinearLayout linearLayout = getBinding().g;
         m.checkNotNullExpressionValue(linearLayout, "binding.channelSettingsEditWrap");
         linearLayout.setVisibility(model.getCanManageChannel() ? 0 : 8);
-        getBinding().k.setOnClickListener(new WidgetTextChannelSettings$configureUI$3(this, model));
-        this.state.configureSaveActionView(getBinding().k);
-        LinearLayout linearLayout2 = getBinding().i;
+        getBinding().m.setOnClickListener(new WidgetTextChannelSettings$configureUI$3(this, model));
+        this.state.configureSaveActionView(getBinding().m);
+        LinearLayout linearLayout2 = getBinding().k;
         m.checkNotNullExpressionValue(linearLayout2, "binding.channelSettingsPinnedMessagesContainer");
-        linearLayout2.setVisibility(AnimatableValueParser.x1(model.getChannel()) ? 0 : 8);
-        TextView textView = getBinding().h;
+        linearLayout2.setVisibility(AnimatableValueParser.y1(model.getChannel()) ? 0 : 8);
+        TextView textView = getBinding().j;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsPinnedMessages");
         textView.setEnabled(model.isPinsEnabled());
-        getBinding().h.setOnClickListener(new WidgetTextChannelSettings$configureUI$5(model));
-        View view = getBinding().j;
+        getBinding().j.setOnClickListener(new WidgetTextChannelSettings$configureUI$5(model));
+        View view = getBinding().l;
         m.checkNotNullExpressionValue(view, "binding.channelSettingsP…edMessagesDisabledOverlay");
         view.setVisibility(model.isPinsEnabled() ^ true ? 0 : 8);
-        getBinding().j.setOnClickListener(WidgetTextChannelSettings$configureUI$6.INSTANCE);
-        TextView textView2 = getBinding().g;
+        getBinding().l.setOnClickListener(WidgetTextChannelSettings$configureUI$6.INSTANCE);
+        TextView textView2 = getBinding().i;
         m.checkNotNullExpressionValue(textView2, "binding.channelSettingsPermissions");
         textView2.setVisibility(model.getCanManagePermissions() ? 0 : 8);
-        getBinding().g.setOnClickListener(new WidgetTextChannelSettings$configureUI$7(model));
+        getBinding().i.setOnClickListener(new WidgetTextChannelSettings$configureUI$7(model));
         CheckedSetting checkedSetting = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting, "binding.channelSettingsAnnouncement");
         Channel channel = model.getChannel();
         m.checkNotNullParameter(channel, "$this$isGuildTextChannel");
-        checkedSetting.setVisibility(((channel.z() == 0) || AnimatableValueParser.d1(model.getChannel())) && model.getCanManageChannel() && model.isCommunityGuild() && !model.isPublicGuildRulesChannel() && !model.isPublicGuildUpdatesChannel() ? 0 : 8);
+        checkedSetting.setVisibility(((channel.A() == 0) || AnimatableValueParser.d1(model.getChannel())) && model.getCanManageChannel() && model.isCommunityGuild() && !model.isPublicGuildRulesChannel() && !model.isPublicGuildUpdatesChannel() ? 0 : 8);
         getBinding().b.g(AnimatableValueParser.d1(model.getChannel()), false);
         CheckedSetting checkedSetting2 = getBinding().b;
         Context context = getContext();
         if (context != null) {
-            charSequence = b.g(context, 2131888586, new Object[]{f.a.a(360032008192L, null)}, null, 4);
+            charSequence = b.g(context, 2131888587, new Object[]{f.a.a(360032008192L, null)}, null, 4);
         }
         checkedSetting2.h(charSequence, true);
         getBinding().b.e(new WidgetTextChannelSettings$configureUI$8(this, model));
-        LinearLayout linearLayout3 = getBinding().n;
+        LinearLayout linearLayout3 = getBinding().q;
         m.checkNotNullExpressionValue(linearLayout3, "binding.channelSettingsSectionUserManagement");
         linearLayout3.setVisibility(model.getCanManageChannel() || model.getCanManagePermissions() ? 0 : 8);
-        LinearLayout linearLayout4 = getBinding().l;
+        LinearLayout linearLayout4 = getBinding().o;
         m.checkNotNullExpressionValue(linearLayout4, "binding.channelSettingsSectionPrivacySafety");
-        linearLayout4.setVisibility(model.getCanManageChannel() && AnimatableValueParser.x1(model.getChannel()) ? 0 : 8);
-        CheckedSetting checkedSetting3 = getBinding().f;
+        linearLayout4.setVisibility(model.getCanManageChannel() && AnimatableValueParser.y1(model.getChannel()) ? 0 : 8);
+        CheckedSetting checkedSetting3 = getBinding().h;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.channelSettingsNsfw");
         checkedSetting3.setVisibility(model.getCanManageChannel() ? 0 : 8);
-        getBinding().f.g(model.getChannel().n(), false);
-        getBinding().f.e(new WidgetTextChannelSettings$configureUI$9(this, model));
-        LinearLayout linearLayout5 = getBinding().m;
+        getBinding().h.g(model.getChannel().o(), false);
+        getBinding().h.e(new WidgetTextChannelSettings$configureUI$9(this, model));
+        LinearLayout linearLayout5 = getBinding().p;
         m.checkNotNullExpressionValue(linearLayout5, "binding.channelSettingsSectionSlowMode");
-        if (model.getCanManageChannel() && AnimatableValueParser.x1(model.getChannel()) && !AnimatableValueParser.d1(model.getChannel())) {
-            i = 0;
-        }
-        linearLayout5.setVisibility(i);
-        int intValue = ((Number) this.state.get(2131362352, Integer.valueOf(model.getChannel().t()))).intValue();
+        linearLayout5.setVisibility(model.getCanManageChannel() && AnimatableValueParser.y1(model.getChannel()) && !AnimatableValueParser.d1(model.getChannel()) ? 0 : 8);
+        int intValue = ((Number) this.state.get(2131362367, Integer.valueOf(model.getChannel().u()))).intValue();
         setSlowmodeLabel(intValue);
         Iterator<Integer> it = SLOWMODE_COOLDOWN_VALUES.iterator();
-        int i2 = 0;
+        int i3 = 0;
         while (true) {
+            i = -1;
             if (!it.hasNext()) {
-                i2 = -1;
+                i3 = -1;
                 break;
             }
             if (it.next().intValue() >= intValue) {
                 break;
             }
-            i2++;
+            i3++;
         }
-        SeekBar seekBar = getBinding().p;
+        SeekBar seekBar = getBinding().f1972s;
         m.checkNotNullExpressionValue(seekBar, "binding.channelSettingsSlowModeCooldownSlider");
-        seekBar.setProgress(i2);
-        this.state.configureSaveActionView(getBinding().k);
-        SeekBar seekBar2 = getBinding().p;
+        seekBar.setProgress(i3);
+        this.state.configureSaveActionView(getBinding().m);
+        SeekBar seekBar2 = getBinding().f1972s;
         m.checkNotNullExpressionValue(seekBar2, "binding.channelSettingsSlowModeCooldownSlider");
-        TextView textView3 = getBinding().o;
+        TextView textView3 = getBinding().r;
         m.checkNotNullExpressionValue(textView3, "binding.channelSettingsSlowModeCooldownLabel");
         seekBar2.setContentDescription(textView3.getText());
+        LinearLayout linearLayout6 = getBinding().n;
+        m.checkNotNullExpressionValue(linearLayout6, "binding.channelSettingsS…efaultAutoArchiveDuration");
+        if (model.getCanManageChannel() && AnimatableValueParser.A1(model.getChannel()) && ThreadUtils.INSTANCE.isThreadsEnabled(model.getGuild().getId())) {
+            i2 = 0;
+        }
+        linearLayout6.setVisibility(i2);
+        Integer num = (Integer) this.state.get(2131362336, model.getChannel().d());
+        int intValue2 = num != null ? num.intValue() : 1440;
+        setDefaultAutoArchiveDurationLabel(intValue2);
+        Iterator<Integer> it2 = ThreadUtils.INSTANCE.getTHREAD_AUTO_ARCHIVE_DURATIONS().iterator();
+        int i4 = 0;
+        while (true) {
+            if (!it2.hasNext()) {
+                break;
+            }
+            if (m.compare(it2.next().intValue(), intValue2) >= 0) {
+                i = i4;
+                break;
+            }
+            i4++;
+        }
+        SeekBar seekBar3 = getBinding().d;
+        m.checkNotNullExpressionValue(seekBar3, "binding.channelSettingsD…AutoArchiveDurationSlider");
+        seekBar3.setProgress(i);
+        this.state.configureSaveActionView(getBinding().m);
+        SeekBar seekBar4 = getBinding().d;
+        m.checkNotNullExpressionValue(seekBar4, "binding.channelSettingsD…AutoArchiveDurationSlider");
+        TextView textView4 = getBinding().r;
+        m.checkNotNullExpressionValue(textView4, "binding.channelSettingsSlowModeCooldownLabel");
+        seekBar4.setContentDescription(textView4.getText());
     }
 
     private final void confirmDelete(Channel channel) {
-        c4 a = c4.a(LayoutInflater.from(getContext()), null, false);
+        f4 a = f4.a(LayoutInflater.from(getContext()), null, false);
         m.checkNotNullExpressionValue(a, "WidgetChannelSettingsDel…om(context), null, false)");
         LinearLayout linearLayout = a.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.root");
         AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(a.a).create();
         m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()");
-        a.e.setText(AnimatableValueParser.x1(channel) ? 2131888060 : 2131888059);
-        a.f75c.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$1(create));
+        a.e.setText(AnimatableValueParser.y1(channel) ? 2131888059 : 2131888058);
+        a.f92c.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$1(create));
         a.d.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$2(this, channel));
         TextView textView = a.b;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsDeleteBody");
-        b.n(textView, 2131888061, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4);
+        b.m(textView, 2131888060, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4);
         create.show();
     }
 
@@ -468,32 +503,45 @@ public final class WidgetTextChannelSettings extends AppFragment {
         Companion.launch(j, context);
     }
 
-    private final void saveChannel(long j, String str, Integer num, String str2, Boolean bool, Integer num2) {
-        ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().editTextChannel(j, str, num, str2, bool, num2), this, null, 2, null).k(q.a.g(getContext(), new WidgetTextChannelSettings$saveChannel$1(this), null));
+    private final void saveChannel(long j, String str, Integer num, String str2, Boolean bool, Integer num2, Integer num3) {
+        ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().editTextChannel(j, str, num, str2, bool, num2, num3), this, null, 2, null).k(q.a.g(getContext(), new WidgetTextChannelSettings$saveChannel$1(this), null));
     }
 
-    public static /* synthetic */ void saveChannel$default(WidgetTextChannelSettings widgetTextChannelSettings, long j, String str, Integer num, String str2, Boolean bool, Integer num2, int i, Object obj) {
-        widgetTextChannelSettings.saveChannel(j, (i & 2) != 0 ? null : str, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : str2, (i & 16) != 0 ? null : bool, (i & 32) != 0 ? null : num2);
+    public static /* synthetic */ void saveChannel$default(WidgetTextChannelSettings widgetTextChannelSettings, long j, String str, Integer num, String str2, Boolean bool, Integer num2, Integer num3, int i, Object obj) {
+        widgetTextChannelSettings.saveChannel(j, (i & 2) != 0 ? null : str, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : str2, (i & 16) != 0 ? null : bool, (i & 32) != 0 ? null : num2, (i & 64) != 0 ? null : num3);
+    }
+
+    private final void setDefaultAutoArchiveDurationLabel(int i) {
+        TextView textView = getBinding().f1971c;
+        m.checkNotNullExpressionValue(textView, "binding.channelSettingsD…tAutoArchiveDurationLabel");
+        setDurationSecondsLabel$default(this, textView, i * 60, 0, 4, null);
+    }
+
+    private final void setDurationSecondsLabel(TextView textView, int i, int i2) {
+        if (i == 0) {
+            textView.setText(getString(i2));
+        } else if (1 <= i && 60 > i) {
+            ViewExtensions.setPluralText(textView, 2131755070, i, new Object[0]);
+        } else if (60 <= i && 3600 > i) {
+            ViewExtensions.setPluralText(textView, 2131755067, i / 60, new Object[0]);
+        } else if (3600 <= i && 86400 > i) {
+            ViewExtensions.setPluralText(textView, 2131755065, i / 3600, new Object[0]);
+        } else {
+            ViewExtensions.setPluralText(textView, 2131755063, i / 86400, new Object[0]);
+        }
+    }
+
+    public static /* synthetic */ void setDurationSecondsLabel$default(WidgetTextChannelSettings widgetTextChannelSettings, TextView textView, int i, int i2, int i3, Object obj) {
+        if ((i3 & 4) != 0) {
+            i2 = 2131888746;
+        }
+        widgetTextChannelSettings.setDurationSecondsLabel(textView, i, i2);
     }
 
     private final void setSlowmodeLabel(int i) {
-        if (i == 0) {
-            TextView textView = getBinding().o;
-            m.checkNotNullExpressionValue(textView, "binding.channelSettingsSlowModeCooldownLabel");
-            textView.setText(getString(2131888745));
-        } else if (1 <= i && 60 > i) {
-            TextView textView2 = getBinding().o;
-            m.checkNotNullExpressionValue(textView2, "binding.channelSettingsSlowModeCooldownLabel");
-            ViewExtensions.setPluralText(textView2, 2131755070, i, new Object[0]);
-        } else if (60 <= i && 3600 > i) {
-            TextView textView3 = getBinding().o;
-            m.checkNotNullExpressionValue(textView3, "binding.channelSettingsSlowModeCooldownLabel");
-            ViewExtensions.setPluralText(textView3, 2131755067, i / 60, new Object[0]);
-        } else {
-            TextView textView4 = getBinding().o;
-            m.checkNotNullExpressionValue(textView4, "binding.channelSettingsSlowModeCooldownLabel");
-            ViewExtensions.setPluralText(textView4, 2131755065, i / 3600, new Object[0]);
-        }
+        TextView textView = getBinding().r;
+        m.checkNotNullExpressionValue(textView, "binding.channelSettingsSlowModeCooldownLabel");
+        setDurationSecondsLabel(textView, i, 2131888746);
     }
 
     @Override // com.discord.app.AppFragment
@@ -503,23 +551,27 @@ public final class WidgetTextChannelSettings extends AppFragment {
         setRetainInstance(true);
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout = getBinding().d;
+        TextInputLayout textInputLayout = getBinding().f;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditTopic");
         statefulViews.addOptionalFields(textInputLayout);
         StatefulViews statefulViews2 = this.state;
-        FloatingActionButton floatingActionButton = getBinding().k;
-        TextInputLayout textInputLayout2 = getBinding().f1968c;
+        FloatingActionButton floatingActionButton = getBinding().m;
+        TextInputLayout textInputLayout2 = getBinding().e;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
-        TextInputLayout textInputLayout3 = getBinding().d;
+        TextInputLayout textInputLayout3 = getBinding().f;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
         statefulViews2.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout2, textInputLayout3);
-        getBinding().p.setOnSeekBarChangeListener(new WidgetTextChannelSettings$onViewBound$1(this));
-        TextInputLayout textInputLayout4 = getBinding().d;
-        m.checkNotNullExpressionValue(textInputLayout4, "binding.channelSettingsEditTopic");
-        ViewExtensions.interceptScrollWhenInsideScrollable(textInputLayout4);
-        SeekBar seekBar = getBinding().p;
+        SeekBar seekBar = getBinding().f1972s;
         m.checkNotNullExpressionValue(seekBar, "binding.channelSettingsSlowModeCooldownSlider");
         seekBar.setMax(n.getLastIndex(SLOWMODE_COOLDOWN_VALUES));
+        getBinding().f1972s.setOnSeekBarChangeListener(new WidgetTextChannelSettings$onViewBound$1(this));
+        SeekBar seekBar2 = getBinding().d;
+        m.checkNotNullExpressionValue(seekBar2, "binding.channelSettingsD…AutoArchiveDurationSlider");
+        seekBar2.setMax(n.getLastIndex(ThreadUtils.INSTANCE.getTHREAD_AUTO_ARCHIVE_DURATIONS()));
+        getBinding().d.setOnSeekBarChangeListener(new WidgetTextChannelSettings$onViewBound$2(this));
+        TextInputLayout textInputLayout4 = getBinding().f;
+        m.checkNotNullExpressionValue(textInputLayout4, "binding.channelSettingsEditTopic");
+        ViewExtensions.interceptScrollWhenInsideScrollable(textInputLayout4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$Model$Companion$get$1.java
index 93f17d63cb..fd814928cc 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$Model$Companion$get$1.java
@@ -34,6 +34,6 @@ public final class WidgetThreadNotificationSettings$Model$Companion$get$1<T, R>
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(companion.getUserGuildSettings().observeGuildSettings(channel.e()), companion.getThreadsJoined().observeJoinedThread(channel.g()), companion.getChannels().observeChannel(channel.q()), new AnonymousClass1(channel));
+        return Observable.i(companion.getUserGuildSettings().observeGuildSettings(channel.f()), companion.getThreadsJoined().observeJoinedThread(channel.h()), companion.getChannels().observeChannel(channel.r()), new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java
index bc51339274..9bbdc76e10 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetThreadNotificationSettings$binding$2 ex
 
     public final WidgetThreadNotificationSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364528;
-        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528);
+        int i = 2131364567;
+        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364567);
         if (nestedScrollView != null) {
-            i = 2131365266;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365266);
+            i = 2131365321;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365321);
             if (linearLayout != null) {
-                i = 2131365269;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365269);
+                i = 2131365324;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365324);
                 if (checkedSetting != null) {
-                    i = 2131365270;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365270);
+                    i = 2131365325;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365325);
                     if (checkedSetting2 != null) {
-                        i = 2131365271;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365271);
+                        i = 2131365326;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365326);
                         if (checkedSetting3 != null) {
                             return new WidgetThreadNotificationSettingsBinding((CoordinatorLayout) view, nestedScrollView, linearLayout, checkedSetting, checkedSetting2, checkedSetting3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java
index ffc4652f83..c9134f2438 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java
@@ -43,7 +43,7 @@ public final class WidgetThreadNotificationSettings$configureNotificationRadio$1
         public final void invoke(ThreadMember threadMember) {
             m.checkNotNullParameter(threadMember, "threadMember");
             c.a.d.o.g(this.$context, 2131887327, 0, null, 12);
-            StoreStream.Companion.getAnalytics().onThreadNotificationSettingsUpdated(this.this$0.$model.getChannel().g(), this.this$0.$model.getChannel().q(), this.this$0.$model.getNotificationSetting(), threadMember.b());
+            StoreStream.Companion.getAnalytics().onThreadNotificationSettingsUpdated(this.this$0.$model.getChannel().h(), this.this$0.$model.getChannel().r(), this.this$0.$model.getNotificationSetting(), threadMember.a());
         }
     }
 
@@ -57,6 +57,6 @@ public final class WidgetThreadNotificationSettings$configureNotificationRadio$1
     public final void onClick(View view) {
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateThreadMemberSettings(this.$model.getChannel().g(), new RestAPIParams.ThreadMemberSettings(this.$threadMemberFlag)), false, 1, null), this.this$0, null, 2, null), this.this$0.getClass(), context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this, context), 60, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateThreadMemberSettings(this.$model.getChannel().h(), new RestAPIParams.ThreadMemberSettings(this.$threadMemberFlag)), false, 1, null), this.this$0, null, 2, null), this.this$0.getClass(), context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this, context), 60, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java
index 05b7f91303..64b6a5c5cf 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java
@@ -72,11 +72,11 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(WidgetThreadNotificationSettings$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …        }\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationBuffered(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(WidgetThreadNotificationSettings$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> r = ObservableExtensionsKt.computationBuffered(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -142,7 +142,7 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
     }
 
     public WidgetThreadNotificationSettings() {
-        super(2131559250);
+        super(2131559258);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetThreadNotificationSettings widgetThreadNotificationSettings, Model model) {
@@ -162,7 +162,7 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
 
     private final void configureUI(Model model) {
         setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2));
-        CheckedSetting checkedSetting = getBinding().f1974c;
+        CheckedSetting checkedSetting = getBinding().f1978c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.threadSettingsNotificationsFrequency0");
         configureNotificationRadio(model, checkedSetting, 2);
         CheckedSetting checkedSetting2 = getBinding().d;
@@ -184,8 +184,8 @@ public final class WidgetThreadNotificationSettings extends AppFragment {
         setRetainInstance(true);
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891534);
-        this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().f1974c, getBinding().d, getBinding().e}));
+        setActionBarTitle(2131891603);
+        this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().f1978c, getBinding().d, getBinding().e}));
         LinearLayout linearLayout = getBinding().b;
         m.checkNotNullExpressionValue(linearLayout, "binding.threadNotificationSettingsSystem");
         if (!getMostRecentIntent().getBooleanExtra("SHOW_SYSTEM_SETTING", false)) {
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java
index abc976969d..59fc35788c 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java
@@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetThreadSettings$binding$2 extends k impl
 
     public final WidgetThreadSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364528;
-        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528);
+        int i = 2131364567;
+        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364567);
         if (nestedScrollView != null) {
-            i = 2131365267;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365267);
+            i = 2131365322;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365322);
             if (textInputLayout != null) {
-                i = 2131365268;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365268);
+                i = 2131365323;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365323);
                 if (linearLayout != null) {
-                    i = 2131365272;
-                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365272);
+                    i = 2131365327;
+                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365327);
                     if (floatingActionButton != null) {
                         return new WidgetThreadSettingsBinding((CoordinatorLayout) view, nestedScrollView, textInputLayout, linearLayout, floatingActionButton);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java
index ed3b1ab83f..029089f6bd 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java
@@ -53,7 +53,7 @@ public final class WidgetThreadSettings extends AppFragment {
     }
 
     public WidgetThreadSettings() {
-        super(2131559251);
+        super(2131559259);
         WidgetThreadSettings$viewModel$2 widgetThreadSettings$viewModel$2 = new WidgetThreadSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadSettingsViewModel.class), new WidgetThreadSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadSettings$viewModel$2));
@@ -82,7 +82,7 @@ public final class WidgetThreadSettings extends AppFragment {
         }
         int i = 0;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131893887);
+        setActionBarTitle(2131893987);
         WidgetThreadSettingsViewModel.ViewState.Valid valid = (WidgetThreadSettingsViewModel.ViewState.Valid) viewState;
         setActionBarSubtitle(AnimatableValueParser.A0(valid.getChannel(), requireContext(), false, 2));
         String channelNameDraft = valid.getChannelNameDraft();
@@ -93,13 +93,13 @@ public final class WidgetThreadSettings extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout2, "binding.threadSettingsEditName");
             ViewExtensions.setText(textInputLayout2, valid.getChannelNameDraft());
         }
-        FloatingActionButton floatingActionButton = getBinding().f1975c;
+        FloatingActionButton floatingActionButton = getBinding().f1979c;
         m.checkNotNullExpressionValue(floatingActionButton, "binding.threadSettingsSave");
         if (!valid.getHasUnsavedChanges()) {
             i = 8;
         }
         floatingActionButton.setVisibility(i);
-        getBinding().f1975c.setOnClickListener(new WidgetThreadSettings$configureUI$1(this));
+        getBinding().f1979c.setOnClickListener(new WidgetThreadSettings$configureUI$1(this));
     }
 
     private final WidgetThreadSettingsBinding getBinding() {
@@ -128,9 +128,9 @@ public final class WidgetThreadSettings extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetThreadSettingsViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetThreadSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<WidgetThreadSettingsViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetThreadSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getViewModel().observeEvents(), this, null, 2, null), WidgetThreadSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadSettings$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java
index a646d23a56..062864b2a6 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java
@@ -28,6 +28,6 @@ public final class WidgetThreadSettingsViewModel$saveThread$1 extends o implemen
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "it");
         PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131893888));
+        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131893988));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java
index 9da25d0b00..6d44be7ef1 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java
@@ -28,6 +28,6 @@ public final class WidgetThreadSettingsViewModel$saveThread$2 extends o implemen
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
         PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131888049));
+        access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131888048));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel.java
index a233f0c13d..235da81483 100644
--- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel.java
@@ -24,7 +24,7 @@ import rx.subjects.PublishSubject;
 /* compiled from: WidgetThreadSettingsViewModel.kt */
 public final class WidgetThreadSettingsViewModel extends AppViewModel<ViewState> {
     private final long channelId;
-    private final PublishSubject<Event> eventSubject = PublishSubject.l0();
+    private final PublishSubject<Event> eventSubject = PublishSubject.k0();
 
     /* compiled from: WidgetThreadSettingsViewModel.kt */
     /* renamed from: com.discord.widgets.channels.WidgetThreadSettingsViewModel$1  reason: invalid class name */
@@ -246,9 +246,9 @@ public final class WidgetThreadSettingsViewModel extends AppViewModel<ViewState>
         super(null, 1, null);
         this.channelId = j;
         StoreChannels channels = StoreStream.Companion.getChannels();
-        Observable s2 = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels}, false, null, null, new AnonymousClass1(this, channels), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "ObservationDeckProvider.…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetThreadSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable r = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels}, false, null, null, new AnonymousClass1(this, channels), 14, null).r();
+        m.checkNotNullExpressionValue(r, "ObservationDeckProvider.…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetThreadSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
     public static final /* synthetic */ PublishSubject access$getEventSubject$p(WidgetThreadSettingsViewModel widgetThreadSettingsViewModel) {
@@ -262,7 +262,7 @@ public final class WidgetThreadSettingsViewModel extends AppViewModel<ViewState>
     @MainThread
     private final void handleStoreState(Channel channel) {
         String str = null;
-        if ((channel != null ? channel.l() : null) == null || !AnimatableValueParser.y1(channel)) {
+        if ((channel != null ? channel.m() : null) == null || !AnimatableValueParser.z1(channel)) {
             updateViewState(ViewState.Invalid.INSTANCE);
             return;
         }
@@ -277,7 +277,7 @@ public final class WidgetThreadSettingsViewModel extends AppViewModel<ViewState>
         if (str != null) {
             updateViewState(ViewState.Valid.copy$default(valid, channel, null, false, 6, null));
         } else {
-            updateViewState(new ViewState.Valid(channel, channel.l(), false));
+            updateViewState(new ViewState.Valid(channel, channel.m(), false));
         }
     }
 
@@ -312,7 +312,7 @@ public final class WidgetThreadSettingsViewModel extends AppViewModel<ViewState>
         }
         ViewState.Valid valid = (ViewState.Valid) viewState;
         if (valid != null && (channelNameDraft = valid.getChannelNameDraft()) != null) {
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(RestAPI.editTextChannel$default(RestAPI.Companion.getApi(), this.channelId, channelNameDraft, null, null, null, null, 60, null), this, null, 2, null), WidgetThreadSettingsViewModel.class, (Context) null, (Function1) null, new WidgetThreadSettingsViewModel$saveThread$2(this), (Function0) null, (Function0) null, new WidgetThreadSettingsViewModel$saveThread$1(this), 54, (Object) null);
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(RestAPI.editTextChannel$default(RestAPI.Companion.getApi(), this.channelId, channelNameDraft, null, null, null, null, null, 124, null), this, null, 2, null), WidgetThreadSettingsViewModel.class, (Context) null, (Function1) null, new WidgetThreadSettingsViewModel$saveThread$2(this), (Function0) null, (Function0) null, new WidgetThreadSettingsViewModel$saveThread$1(this), 54, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java
index 088a40bd57..648ba21d2e 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java
@@ -19,15 +19,15 @@ public final /* synthetic */ class GroupInviteFriendsSheet$binding$2 extends k i
 
     public final GroupInviteFriendsBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362618;
-        ChipsView chipsView = (ChipsView) view.findViewById(2131362618);
+        int i = 2131362631;
+        ChipsView chipsView = (ChipsView) view.findViewById(2131362631);
         if (chipsView != null) {
-            i = 2131364399;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364399);
+            i = 2131364437;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364437);
             if (recyclerView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131364539;
-                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364539);
+                i = 2131364578;
+                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364578);
                 if (appCompatImageView != null) {
                     return new GroupInviteFriendsBottomSheetBinding(constraintLayout, chipsView, recyclerView, constraintLayout, appCompatImageView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java
index edacd2ddb1..fa7b8bbad3 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java
@@ -132,7 +132,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet {
 
     private final void handleEvent(GroupInviteFriendsSheetViewModel.Event event) {
         if (event instanceof GroupInviteFriendsSheetViewModel.Event.ChannelFull) {
-            o.i(this, 2131889144, 0, 4);
+            o.i(this, 2131889148, 0, 4);
         }
     }
 
@@ -149,12 +149,12 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet {
             layoutParams.height = (int) (((float) resources.getDisplayMetrics().heightPixels) * 0.9f);
             constraintLayout.setLayoutParams(layoutParams);
         }
-        getBinding().f1612c.requestLayout();
+        getBinding().f1608c.requestLayout();
     }
 
     private final void scrollToTopIfDeletingChar(int i, int i2) {
         if (i < i2) {
-            getBinding().f1612c.smoothScrollToPosition(0);
+            getBinding().f1608c.smoothScrollToPosition(0);
         }
     }
 
@@ -209,7 +209,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1612c;
+        RecyclerView recyclerView = getBinding().f1608c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         this.adapter = (GroupInviteFriendsSheetAdapter) companion.configure(new GroupInviteFriendsSheetAdapter(recyclerView, new GroupInviteFriendsSheet$onViewCreated$1(this)));
         ChipsView chipsView = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java
index 2a056e4fc1..3eca8b84e6 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java
@@ -144,14 +144,14 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl
             super(i, groupInviteFriendsSheetAdapter);
             m.checkNotNullParameter(groupInviteFriendsSheetAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131363248;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363248);
+            int i2 = 2131363273;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363273);
             if (simpleDraweeView != null) {
-                i2 = 2131363257;
-                TextView textView = (TextView) view.findViewById(2131363257);
+                i2 = 2131363282;
+                TextView textView = (TextView) view.findViewById(2131363282);
                 if (textView != null) {
-                    i2 = 2131365417;
-                    MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131365417);
+                    i2 = 2131365477;
+                    MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131365477);
                     if (materialCheckBox != null) {
                         GroupInviteFriendsSheetItemBinding groupInviteFriendsSheetItemBinding = new GroupInviteFriendsSheetItemBinding((ConstraintLayout) view, simpleDraweeView, textView, materialCheckBox);
                         m.checkNotNullExpressionValue(groupInviteFriendsSheetItemBinding, "GroupInviteFriendsSheetItemBinding.bind(itemView)");
@@ -175,7 +175,7 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullParameter(friendItem, "data");
             super.onConfigure(i, (int) friendItem);
             User user = friendItem.getUser();
-            TextView textView = this.binding.f1613c;
+            TextView textView = this.binding.f1609c;
             m.checkNotNullExpressionValue(textView, "binding.friendsListItemName");
             textView.setText(user.getUsername());
             SimpleDraweeView simpleDraweeView = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java
index f68630af03..b42c5edaae 100644
--- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetViewModel.java
@@ -121,16 +121,16 @@ public final class GroupInviteFriendsSheetViewModel extends AppViewModel<ViewSta
         }
 
         private final Observable<Map<Long, User>> observeFriends(StoreUserRelationships storeUserRelationships, StoreUser storeUser) {
-            Observable<R> Z = storeUserRelationships.observeForType(1).Z(new GroupInviteFriendsSheetViewModel$Companion$observeFriends$1(storeUser));
-            m.checkNotNullExpressionValue(Z, "storeUserRelationships.o…ships.keys)\n            }");
-            return Z;
+            Observable<R> Y = storeUserRelationships.observeForType(1).Y(new GroupInviteFriendsSheetViewModel$Companion$observeFriends$1(storeUser));
+            m.checkNotNullExpressionValue(Y, "storeUserRelationships.o…ships.keys)\n            }");
+            return Y;
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreUserRelationships storeUserRelationships, StoreUser storeUser, StoreChannels storeChannels) {
             if (j == -1) {
-                Observable<R> G = observeFriends(storeUserRelationships, storeUser).G(GroupInviteFriendsSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "observeFriends(storeUser…          )\n            }");
-                return G;
+                Observable<R> F = observeFriends(storeUserRelationships, storeUser).F(GroupInviteFriendsSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "observeFriends(storeUser…          )\n            }");
+                return F;
             }
             Observable<StoreState> j2 = Observable.j(storeChannels.observeChannel(j), observeFriends(storeUserRelationships, storeUser), GroupInviteFriendsSheetViewModel$Companion$observeStoreState$2.INSTANCE);
             m.checkNotNullExpressionValue(j2, "Observable\n             …      )\n                }");
@@ -357,13 +357,13 @@ public final class GroupInviteFriendsSheetViewModel extends AppViewModel<ViewSta
         this.channelId = j;
         this.storeUser = storeUser;
         this.maxNumMembers = i;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.currentStoreState = new StoreState(null, null, 3, null);
         this.checkedUsers = new HashSet<>();
-        BehaviorSubject<CharSequence> l0 = BehaviorSubject.l0();
-        this.searchTextChangedPublisher = l0;
+        BehaviorSubject<CharSequence> k0 = BehaviorSubject.k0();
+        this.searchTextChangedPublisher = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), GroupInviteFriendsSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        Observable<CharSequence> o = l0.o(150, TimeUnit.MILLISECONDS);
+        Observable<CharSequence> o = k0.o(150, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "searchTextChangedPublish…S, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(o, this, null, 2, null), GroupInviteFriendsSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
@@ -395,12 +395,12 @@ public final class GroupInviteFriendsSheetViewModel extends AppViewModel<ViewSta
 
     private final List<User> excludeUsersAlreadyInChannel(Map<Long, ? extends User> map, Channel channel) {
         Set set;
-        List<com.discord.api.user.User> v;
-        if (channel == null || (v = channel.v()) == null) {
+        List<com.discord.api.user.User> w;
+        if (channel == null || (w = channel.w()) == null) {
             set = null;
         } else {
-            ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(v, 10));
-            for (com.discord.api.user.User user : v) {
+            ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(w, 10));
+            for (com.discord.api.user.User user : w) {
                 arrayList.add(Long.valueOf(user.i()));
             }
             set = u.toSet(arrayList);
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.java
index 605ad8b3d7..73d9c2c7e6 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.java
@@ -85,7 +85,7 @@ public final class WidgetChannelListModel$Companion$getPrivateChannelList$1<T, R
             T next = it.next();
             User v0 = AnimatableValueParser.v0(next);
             Presence presence = presences.get(v0 != null ? Long.valueOf(v0.getId()) : null);
-            boolean z2 = next.g() == id2;
+            boolean z2 = next.h() == id2;
             Integer num = (Integer) a.d(next, mentionCounts);
             int intValue = num != null ? num.intValue() : 0;
             User v02 = AnimatableValueParser.v0(next);
@@ -93,7 +93,7 @@ public final class WidgetChannelListModel$Companion$getPrivateChannelList$1<T, R
                 obj = Long.valueOf(v02.getId());
             }
             boolean containsKey = streamsByUser.containsKey(obj);
-            ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(next.g());
+            ModelNotificationSettings.ChannelOverride channelOverride = modelNotificationSettings.getChannelOverride(next.h());
             arrayList.add(new ChannelListItemPrivate(next, presence, z2, intValue, containsKey, channelOverride != null ? channelOverride.isMuted() : false));
         }
         boolean isEmpty = arrayList.isEmpty();
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java
index 5e58f04fb5..69bf73c059 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java
@@ -59,15 +59,15 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Boolean mo1invoke() {
-            Channel channel = StoreStream.Companion.getChannels().getChannel(this.$textChannel.q());
+            Channel channel = StoreStream.Companion.getChannels().getChannel(this.$textChannel.r());
             if (channel == null) {
                 return 1;
             }
-            long g = channel.g();
+            long h = channel.h();
             Channel channel2 = this.this$0.$selectedChannel$inlined;
-            boolean z2 = (channel2 != null && (g > channel2.g() ? 1 : (g == channel2.g() ? 0 : -1)) == 0) || this.this$0.$areAnyChildThreadsSelected$6$inlined.invoke(channel.g());
-            boolean contains = this.this$0.$collapsedCategories$inlined.contains(Long.valueOf(channel.q()));
-            return (this.this$0.$hiddenChannelsIds$inlined.contains(Long.valueOf(this.$textChannel.q())) || (!z2 && !this.this$0.$isThreadUnread$4$inlined.invoke(this.$textChannel) && (contains || m.areEqual(this.$isParentMuted, Boolean.TRUE)))) ? 1 : null;
+            boolean z2 = (channel2 != null && (h > channel2.h() ? 1 : (h == channel2.h() ? 0 : -1)) == 0) || this.this$0.$areAnyChildThreadsSelected$6$inlined.invoke(channel.h());
+            boolean contains = this.this$0.$collapsedCategories$inlined.contains(Long.valueOf(channel.r()));
+            return (this.this$0.$hiddenChannelsIds$inlined.contains(Long.valueOf(this.$textChannel.r())) || (!z2 && !this.this$0.$isThreadUnread$4$inlined.invoke(this.$textChannel) && (contains || m.areEqual(this.$isParentMuted, Boolean.TRUE)))) ? 1 : null;
         }
     }
 
@@ -103,9 +103,9 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         public final Boolean mo1invoke() {
             Boolean bool = 1;
             boolean z2 = this.$mentionCount <= 0;
-            boolean contains = this.this$0.$collapsedCategories$inlined.contains(Long.valueOf(this.$textChannel.q()));
-            boolean z3 = this.$channelSelected || this.this$0.$areAnyChildThreadsSelected$6$inlined.invoke(this.$textChannel.g());
-            boolean invoke = this.this$0.$areAllChildThreadsRead$5$inlined.invoke(this.$textChannel.g());
+            boolean contains = this.this$0.$collapsedCategories$inlined.contains(Long.valueOf(this.$textChannel.r()));
+            boolean z3 = this.$channelSelected || this.this$0.$areAnyChildThreadsSelected$6$inlined.invoke(this.$textChannel.h());
+            boolean invoke = this.this$0.$areAllChildThreadsRead$5$inlined.invoke(this.$textChannel.h());
             boolean z4 = (contains && z2 && (this.this$0.$isCategoryMuted || this.$isMuted || !this.$unread)) || (this.$isMuted && this.this$0.$guild$inlined.getHideMutedChannels());
             if (z3 || !invoke || !z4) {
                 bool = 0;
@@ -159,15 +159,15 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         Object obj;
         boolean z4;
         m.checkNotNullParameter(channel, "textChannel");
-        long g = channel.g();
+        long h = channel.h();
         Channel channel2 = this.$selectedChannel$inlined;
-        boolean z5 = channel2 != null && g == channel2.g();
-        Integer num = (Integer) this.$mentionCounts$inlined.get(Long.valueOf(g));
+        boolean z5 = channel2 != null && h == channel2.h();
+        Integer num = (Integer) this.$mentionCounts$inlined.get(Long.valueOf(h));
         int intValue = num != null ? num.intValue() : 0;
-        boolean contains = this.$unreadChannelIds$inlined.contains(Long.valueOf(g));
-        List<PermissionOverwrite> r = channel.r();
-        if (r != null) {
-            Iterator<T> it = r.iterator();
+        boolean contains = this.$unreadChannelIds$inlined.contains(Long.valueOf(h));
+        List<PermissionOverwrite> s2 = channel.s();
+        if (s2 != null) {
+            Iterator<T> it = s2.iterator();
             while (true) {
                 if (!it.hasNext()) {
                     obj = null;
@@ -188,11 +188,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
             PermissionOverwrite permissionOverwrite = (PermissionOverwrite) obj;
             if (permissionOverwrite != null && PermissionOverwriteUtilsKt.denies(permissionOverwrite, 1024)) {
                 z3 = true;
-                return new WidgetChannelListModel.Companion.TextLikeChannelData(z5, intValue, contains, z3, !AnimatableValueParser.y1(channel) ? new AnonymousClass1(this, channel, bool).mo1invoke() : new AnonymousClass2(this, intValue, channel, z5, z2, contains, g).mo1invoke());
+                return new WidgetChannelListModel.Companion.TextLikeChannelData(z5, intValue, contains, z3, !AnimatableValueParser.z1(channel) ? new AnonymousClass1(this, channel, bool).mo1invoke() : new AnonymousClass2(this, intValue, channel, z5, z2, contains, h).mo1invoke());
             }
         }
         z3 = false;
-        return new WidgetChannelListModel.Companion.TextLikeChannelData(z5, intValue, contains, z3, !AnimatableValueParser.y1(channel) ? new AnonymousClass1(this, channel, bool).mo1invoke() : new AnonymousClass2(this, intValue, channel, z5, z2, contains, g).mo1invoke());
+        return new WidgetChannelListModel.Companion.TextLikeChannelData(z5, intValue, contains, z3, !AnimatableValueParser.z1(channel) ? new AnonymousClass1(this, channel, bool).mo1invoke() : new AnonymousClass2(this, intValue, channel, z5, z2, contains, h).mo1invoke());
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java
index a36e4b57b4..e5dd42bd9f 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java
@@ -79,9 +79,9 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         int size = collection != null ? collection.size() : 0;
         PermissionUtils permissionUtils = PermissionUtils.INSTANCE;
         GuildRole everyoneRole = this.$guild$inlined.getEveryoneRole();
-        List<PermissionOverwrite> r = channel.r();
-        if (r != null) {
-            Iterator<T> it = r.iterator();
+        List<PermissionOverwrite> s2 = channel.s();
+        if (s2 != null) {
+            Iterator<T> it = s2.iterator();
             while (true) {
                 if (!it.hasNext()) {
                     obj = null;
@@ -107,7 +107,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         if (!PermissionUtils.can(1024, this.$permissions) && !z3) {
             return null;
         }
-        if (!this.$collapsedCategories$inlined.contains(Long.valueOf(channel.q())) || size != 0 || z3) {
+        if (!this.$collapsedCategories$inlined.contains(Long.valueOf(channel.r())) || size != 0 || z3) {
             return new WidgetChannelListModel.Companion.VocalChannelData(z3, z4, this.$permissions, size);
         }
         return null;
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java
index cbe5e57ed5..6baa3474b7 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java
@@ -75,6 +75,6 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
         if (invoke$default.getHide()) {
             return null;
         }
-        return new ChannelListItemTextChannel(this.$channel, invoke$default.getSelected(), invoke$default.getMentionCount(), invoke$default.getUnread(), this.$muted, invoke$default.getLocked(), this.$channelsWithActiveThreads$inlined.contains(Long.valueOf(this.$channel.g())));
+        return new ChannelListItemTextChannel(this.$channel, invoke$default.getSelected(), invoke$default.getMentionCount(), invoke$default.getUnread(), this.$muted, invoke$default.getLocked(), this.$channelsWithActiveThreads$inlined.contains(Long.valueOf(this.$channel.h())));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java
index 3a13bef0f6..ec95d756ec 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java
@@ -63,8 +63,8 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo
 
     public final ChannelListItemThread invoke(Channel channel) {
         m.checkNotNullParameter(channel, "thread");
-        Long l = this.$guild$inlined.getChannelPermissions().get(Long.valueOf(channel.g()));
-        ModelNotificationSettings.ChannelOverride channelOverride = this.$guild$inlined.getNotificationSettings().getChannelOverride(channel.q());
+        Long l = this.$guild$inlined.getChannelPermissions().get(Long.valueOf(channel.h()));
+        ModelNotificationSettings.ChannelOverride channelOverride = this.$guild$inlined.getNotificationSettings().getChannelOverride(channel.r());
         boolean z2 = channelOverride != null && channelOverride.isMuted();
         if (!PermissionUtils.INSTANCE.hasAccess(channel, l)) {
             return null;
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java
index ca5fbcae8c..856b9eec1e 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java
@@ -29,8 +29,8 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$3 extends o
     public final void mo1invoke() {
         ChannelListItem channelListItem = (ChannelListItem) u.lastOrNull((List<? extends Object>) this.$items);
         if (channelListItem != null && channelListItem.getType() == 8 && (channelListItem instanceof ChannelListItemCategory)) {
-            long g = ((ChannelListItemCategory) channelListItem).getChannel().g();
-            if (!this.$forceViewCategories.contains(Long.valueOf(g)) && !this.$collapsedCategories.contains(Long.valueOf(g))) {
+            long h = ((ChannelListItemCategory) channelListItem).getChannel().h();
+            if (!this.$forceViewCategories.contains(Long.valueOf(h)) && !this.$collapsedCategories.contains(Long.valueOf(h))) {
                 ArrayList arrayList = this.$items;
                 arrayList.remove(arrayList.size() - 1);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java
index 422a66ab63..bafd9d77ce 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java
@@ -24,6 +24,6 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$4 extends o
 
     public final boolean invoke(Channel channel) {
         m.checkNotNullParameter(channel, "thread");
-        return this.$unreadChannelIds.contains(Long.valueOf(channel.g()));
+        return this.$unreadChannelIds.contains(Long.valueOf(channel.h()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6.java
index b8f0187d3e..bb38377cee 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6.java
@@ -30,9 +30,9 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$6 extends o
             return false;
         }
         for (Channel channel : collection) {
-            long g = channel.g();
+            long h = channel.h();
             Channel channel2 = this.$selectedChannel;
-            if (channel2 != null && g == channel2.g()) {
+            if (channel2 != null && h == channel2.h()) {
                 return true;
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
index ba8ca7da19..cf25d3cb79 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java
@@ -329,9 +329,9 @@ public final class WidgetChannelListModel {
             StoreUserGuildSettings userGuildSettings = companion.getUserGuildSettings();
             StoreExperiments experiments = companion.getExperiments();
             StoreUserConnections userConnections = companion.getUserConnections();
-            Observable<WidgetChannelListModel> G = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels, channelsSelected, presences, messagesMostRecent, mentions, applicationStreaming, userGuildSettings, experiments, userConnections}, false, null, null, 14, null), 250, TimeUnit.MILLISECONDS).G(new WidgetChannelListModel$Companion$getPrivateChannelList$1(channels, messagesMostRecent, channelsSelected, presences, mentions, applicationStreaming, userGuildSettings, experiments, userConnections));
-            m.checkNotNullExpressionValue(G, "ObservationDeckProvider\n…            )\n          }");
-            return G;
+            Observable<WidgetChannelListModel> F = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels, channelsSelected, presences, messagesMostRecent, mentions, applicationStreaming, userGuildSettings, experiments, userConnections}, false, null, null, 14, null), 250, TimeUnit.MILLISECONDS).F(new WidgetChannelListModel$Companion$getPrivateChannelList$1(channels, messagesMostRecent, channelsSelected, presences, mentions, applicationStreaming, userGuildSettings, experiments, userConnections));
+            m.checkNotNullExpressionValue(F, "ObservationDeckProvider\n…            )\n          }");
+            return F;
         }
 
         private final Observable<WidgetChannelListModel> getSelectedGuildChannelList(long j) {
@@ -342,7 +342,7 @@ public final class WidgetChannelListModel {
 
         /*  JADX ERROR: IndexOutOfBoundsException in pass: SSATransform
             java.lang.IndexOutOfBoundsException: bitIndex < 0: -107
-            	at java.base/java.util.BitSet.get(BitSet.java:624)
+            	at java.base/java.util.BitSet.get(BitSet.java:626)
             	at jadx.core.dex.visitors.ssa.LiveVarAnalysis.fillBasicBlockInfo(LiveVarAnalysis.java:65)
             	at jadx.core.dex.visitors.ssa.LiveVarAnalysis.runAnalysis(LiveVarAnalysis.java:36)
             	at jadx.core.dex.visitors.ssa.SSATransform.process(SSATransform.java:55)
@@ -356,9 +356,9 @@ public final class WidgetChannelListModel {
         }
 
         public final Observable<WidgetChannelListModel> get() {
-            Observable<WidgetChannelListModel> s2 = StoreStream.Companion.getGuildSelected().observeSelectedGuildId().Z(WidgetChannelListModel$Companion$get$1.INSTANCE).s();
-            m.checkNotNullExpressionValue(s2, "StoreStream\n          .g…  .distinctUntilChanged()");
-            return s2;
+            Observable<WidgetChannelListModel> r = StoreStream.Companion.getGuildSelected().observeSelectedGuildId().Y(WidgetChannelListModel$Companion$get$1.INSTANCE).r();
+            m.checkNotNullExpressionValue(r, "StoreStream\n          .g…  .distinctUntilChanged()");
+            return r;
         }
     }
 
@@ -469,9 +469,9 @@ public final class WidgetChannelListModel {
             StoreStream.Companion companion = StoreStream.Companion;
             Observable f = Observable.f(companion.getApplicationStreaming().observeStreamsForGuild(j), ObservableExtensionsKt.leadingEdgeThrottle(companion.getVoiceStates().observe(j), 200, TimeUnit.MILLISECONDS), companion.getUsers().observeAllUsers(), companion.getGuilds().observeComputed(j), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), companion.getPermissions().observeChannelPermissionsForGuild(j), new WidgetChannelListModel$VoiceStates$get$1(comparator));
             m.checkNotNullExpressionValue(f, "Observable\n          .co…            )\n          }");
-            Observable<Map<Long, List<ChannelListItemVoiceUser>>> s2 = ObservableExtensionsKt.computationLatest(f).s();
-            m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-            return s2;
+            Observable<Map<Long, List<ChannelListItemVoiceUser>>> r = ObservableExtensionsKt.computationLatest(f).r();
+            m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+            return r;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java
index 20c7d9f804..d520b47ff5 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$binding$2.java
@@ -22,11 +22,11 @@ public final class WidgetChannelListUnreads$binding$2 extends o implements Funct
     /* renamed from: invoke */
     public final WidgetChannelsListUnreadsBinding mo1invoke() {
         View inflate = WidgetChannelListUnreads.access$getUnreadsStub$p(this.this$0).inflate();
-        int i = 2131362437;
-        TextView textView = (TextView) inflate.findViewById(2131362437);
+        int i = 2131362452;
+        TextView textView = (TextView) inflate.findViewById(2131362452);
         if (textView != null) {
-            i = 2131362438;
-            RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131362438);
+            i = 2131362453;
+            RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131362453);
             if (relativeLayout != null) {
                 WidgetChannelsListUnreadsBinding widgetChannelsListUnreadsBinding = new WidgetChannelsListUnreadsBinding((FrameLayout) inflate, textView, relativeLayout);
                 m.checkNotNullExpressionValue(widgetChannelsListUnreadsBinding, "WidgetChannelsListUnread…nd(unreadsStub.inflate())");
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
index 9157de1b92..db6ca99152 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java
@@ -352,7 +352,7 @@ public final class WidgetChannelListUnreads {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetChannelListUnreads(ViewStub viewStub, RecyclerView recyclerView, AppBarLayout appBarLayout, Function0 function0, int i, int i2, boolean z2, int i3, DefaultConstructorMarker defaultConstructorMarker) {
-        this(viewStub, recyclerView, (i3 & 4) != 0 ? null : appBarLayout, function0, (i3 & 16) != 0 ? 2131891341 : i, (i3 & 32) != 0 ? 2131891355 : i2, (i3 & 64) != 0 ? true : z2);
+        this(viewStub, recyclerView, (i3 & 4) != 0 ? null : appBarLayout, function0, (i3 & 16) != 0 ? 2131891412 : i, (i3 & 32) != 0 ? 2131891426 : i2, (i3 & 64) != 0 ? true : z2);
     }
 
     public static final /* synthetic */ ViewStub access$getUnreadsStub$p(WidgetChannelListUnreads widgetChannelListUnreads) {
@@ -372,7 +372,7 @@ public final class WidgetChannelListUnreads {
     }
 
     private final int getIcon(Model.Indicator indicator) {
-        return indicator.getType() != 0 ? 2131231058 : 2131231060;
+        return indicator.getType() != 0 ? 2131231063 : 2131231065;
     }
 
     private final int getText(Model.Indicator indicator) {
@@ -417,11 +417,11 @@ public final class WidgetChannelListUnreads {
     }
 
     private final void onConfigureView(Model.Indicator indicator, boolean z2) {
-        getBinding().f1719c.setBackgroundResource(getIcon(indicator));
+        getBinding().f1716c.setBackgroundResource(getIcon(indicator));
         getBinding().b.setText(getText(indicator));
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.channelsListUnreads");
-        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, z2 ? 2131231400 : 2131231394, 0, 11, (Object) null);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, z2 ? 2131231406 : 2131231400, 0, 11, (Object) null);
         FrameLayout frameLayout = getBinding().a;
         m.checkNotNullExpressionValue(frameLayout, "it");
         ViewGroup.LayoutParams layoutParams = frameLayout.getLayoutParams();
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java
index 39c6d192b8..3435ce12f9 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java
@@ -32,63 +32,63 @@ public final /* synthetic */ class WidgetChannelsList$binding$2 extends k implem
         int i = 2131361967;
         CustomAppBarLayout customAppBarLayout = (CustomAppBarLayout) view.findViewById(2131361967);
         if (customAppBarLayout != null) {
-            i = 2131362387;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362387);
+            i = 2131362402;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362402);
             if (recyclerView != null) {
-                i = 2131362392;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362392);
+                i = 2131362407;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362407);
                 if (simpleDraweeView != null) {
-                    i = 2131362393;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362393);
+                    i = 2131362408;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362408);
                     if (frameLayout != null) {
-                        i = 2131362394;
-                        TextView textView = (TextView) view.findViewById(2131362394);
+                        i = 2131362409;
+                        TextView textView = (TextView) view.findViewById(2131362409);
                         if (textView != null) {
-                            i = 2131362395;
-                            TextView textView2 = (TextView) view.findViewById(2131362395);
+                            i = 2131362410;
+                            TextView textView2 = (TextView) view.findViewById(2131362410);
                             if (textView2 != null) {
-                                i = 2131362428;
-                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362428);
+                                i = 2131362443;
+                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362443);
                                 if (constraintLayout != null) {
-                                    i = 2131362429;
-                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362429);
+                                    i = 2131362444;
+                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362444);
                                     if (materialButton != null) {
-                                        i = 2131362430;
-                                        TextView textView3 = (TextView) view.findViewById(2131362430);
+                                        i = 2131362445;
+                                        TextView textView3 = (TextView) view.findViewById(2131362445);
                                         if (textView3 != null) {
-                                            i = 2131362431;
-                                            TextView textView4 = (TextView) view.findViewById(2131362431);
+                                            i = 2131362446;
+                                            TextView textView4 = (TextView) view.findViewById(2131362446);
                                             if (textView4 != null) {
-                                                i = 2131362432;
-                                                Toolbar toolbar = (Toolbar) view.findViewById(2131362432);
+                                                i = 2131362447;
+                                                Toolbar toolbar = (Toolbar) view.findViewById(2131362447);
                                                 if (toolbar != null) {
-                                                    i = 2131362433;
-                                                    TextView textView5 = (TextView) view.findViewById(2131362433);
+                                                    i = 2131362448;
+                                                    TextView textView5 = (TextView) view.findViewById(2131362448);
                                                     if (textView5 != null) {
-                                                        i = 2131362434;
-                                                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362434);
+                                                        i = 2131362449;
+                                                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131362449);
                                                         if (appCompatImageView != null) {
-                                                            i = 2131362435;
-                                                            View findViewById = view.findViewById(2131362435);
+                                                            i = 2131362450;
+                                                            View findViewById = view.findViewById(2131362450);
                                                             if (findViewById != null) {
-                                                                i = 2131362436;
-                                                                View findViewById2 = view.findViewById(2131362436);
+                                                                i = 2131362451;
+                                                                View findViewById2 = view.findViewById(2131362451);
                                                                 if (findViewById2 != null) {
-                                                                    i = 2131362439;
-                                                                    ViewStub viewStub = (ViewStub) view.findViewById(2131362439);
+                                                                    i = 2131362454;
+                                                                    ViewStub viewStub = (ViewStub) view.findViewById(2131362454);
                                                                     if (viewStub != null) {
-                                                                        i = 2131362440;
-                                                                        Toolbar toolbar2 = (Toolbar) view.findViewById(2131362440);
+                                                                        i = 2131362455;
+                                                                        Toolbar toolbar2 = (Toolbar) view.findViewById(2131362455);
                                                                         if (toolbar2 != null) {
-                                                                            i = 2131362635;
-                                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362635);
+                                                                            i = 2131362659;
+                                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362659);
                                                                             if (collapsingToolbarLayout != null) {
                                                                                 RoundedCoordinatorLayout roundedCoordinatorLayout = (RoundedCoordinatorLayout) view;
-                                                                                i = 2131365591;
-                                                                                EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131365591);
+                                                                                i = 2131365652;
+                                                                                EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131365652);
                                                                                 if (emptyFriendsStateContactSyncView != null) {
-                                                                                    i = 2131365592;
-                                                                                    EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131365592);
+                                                                                    i = 2131365653;
+                                                                                    EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131365653);
                                                                                     if (emptyFriendsStateView != null) {
                                                                                         return new WidgetChannelsListBinding(roundedCoordinatorLayout, customAppBarLayout, recyclerView, simpleDraweeView, frameLayout, textView, textView2, constraintLayout, materialButton, textView3, textView4, toolbar, textView5, appCompatImageView, findViewById, findViewById2, viewStub, toolbar2, collapsingToolbarLayout, roundedCoordinatorLayout, emptyFriendsStateContactSyncView, emptyFriendsStateView);
                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.java
index 2cfcbfd1be..37e3db95f3 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$2.java
@@ -29,18 +29,18 @@ public final class WidgetChannelsList$onViewBound$2 extends o implements Functio
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        int z2 = channel.z();
-        if (!(z2 == 0 || z2 == 1)) {
-            if (z2 != 2) {
-                if (!(z2 == 3 || z2 == 4 || z2 == 5)) {
-                    switch (z2) {
+        int A = channel.A();
+        if (!(A == 0 || A == 1)) {
+            if (A != 2) {
+                if (!(A == 3 || A == 4 || A == 5)) {
+                    switch (A) {
                         case 10:
                         case 11:
                         case 12:
                             WidgetChannelsListItemThreadActions.Companion companion = WidgetChannelsListItemThreadActions.Companion;
                             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                            companion.show(parentFragmentManager, channel.g());
+                            companion.show(parentFragmentManager, channel.h());
                             return;
                         case 13:
                             break;
@@ -49,12 +49,12 @@ public final class WidgetChannelsList$onViewBound$2 extends o implements Functio
                     }
                 }
             }
-            WidgetVoiceChannelSettings.Companion.launch(channel.g(), this.this$0.requireContext());
+            WidgetVoiceChannelSettings.Companion.launch(channel.h(), this.this$0.requireContext());
             return;
         }
         WidgetChannelsListItemChannelActions.Companion companion2 = WidgetChannelsListItemChannelActions.Companion;
         FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
-        companion2.show(parentFragmentManager2, channel.g());
+        companion2.show(parentFragmentManager2, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java
index c83a5284ed..3a7d7c81f0 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$3.java
@@ -42,25 +42,25 @@ public final class WidgetChannelsList$onViewBound$3 extends o implements Functio
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            if (AnimatableValueParser.r1(this.$channel)) {
+            if (AnimatableValueParser.s1(this.$channel)) {
                 WidgetChannelsList widgetChannelsList = this.this$0.this$0;
                 Context requireContext = widgetChannelsList.requireContext();
                 FragmentManager childFragmentManager = this.this$0.this$0.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
-                new PrivateCallLauncher(widgetChannelsList, widgetChannelsList, requireContext, childFragmentManager).launchVoiceCall(this.$channel.g());
-            } else if (AnimatableValueParser.u1(this.$channel)) {
+                new PrivateCallLauncher(widgetChannelsList, widgetChannelsList, requireContext, childFragmentManager).launchVoiceCall(this.$channel.h());
+            } else if (AnimatableValueParser.v1(this.$channel)) {
                 StageChannelJoinHelper stageChannelJoinHelper = StageChannelJoinHelper.INSTANCE;
                 Context requireContext2 = this.this$0.this$0.requireContext();
                 FragmentManager parentFragmentManager = this.this$0.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext2, parentFragmentManager, this.$channel.g(), false, false, null, null, null, null, null, 1016, null);
+                StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext2, parentFragmentManager, this.$channel.h(), false, false, null, null, null, null, null, 1016, null);
             } else if (this.$hasUserSeenVoiceChannelOnboarding || !this.$isNewUser) {
                 WidgetVoiceBottomSheet.Companion companion = WidgetVoiceBottomSheet.Companion;
                 FragmentManager parentFragmentManager2 = this.this$0.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
-                companion.show(parentFragmentManager2, this.$channel.g(), true, WidgetVoiceBottomSheet.FeatureContext.HOME);
+                companion.show(parentFragmentManager2, this.$channel.h(), true, WidgetVoiceBottomSheet.FeatureContext.HOME);
             } else {
-                WidgetGuildCallOnboardingSheet.Companion.show(this.this$0.this$0, this.$channel.g());
+                WidgetGuildCallOnboardingSheet.Companion.show(this.this$0.this$0, this.$channel.h());
             }
         }
     }
@@ -91,6 +91,6 @@ public final class WidgetChannelsList$onViewBound$3 extends o implements Functio
         Context requireContext = this.this$0.requireContext();
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, channel.e(), "Guild Voice", null, new AnonymousClass1(this, channel, hasUserSeenVoiceChannelOnboarding, isNewUser$default), 16, null);
+        MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, channel.f(), "Guild Voice", null, new AnonymousClass1(this, channel, hasUserSeenVoiceChannelOnboarding, isNewUser$default), 16, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java
index 331793ae49..b55a4de2de 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java
@@ -8,6 +8,8 @@ import com.discord.api.stageinstance.StageInstance;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.guilds.MemberVerificationUtils;
 import com.discord.widgets.stage.StageChannelJoinHelper;
+import com.discord.widgets.stage.start.StartStageEventGuildsFeatureFlag;
+import com.discord.widgets.stage.start.WidgetStartStage;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -37,7 +39,7 @@ public final class WidgetChannelsList$onViewBound$4 extends o implements Functio
             Context requireContext = this.this$0.this$0.requireContext();
             FragmentManager parentFragmentManager = this.this$0.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, this.$channel.g(), false, false, null, null, null, null, null, 1016, null);
+            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, this.$channel.h(), false, false, null, null, null, null, null, 1016, null);
         }
     }
 
@@ -57,19 +59,21 @@ public final class WidgetChannelsList$onViewBound$4 extends o implements Functio
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        StageInstance stageInstanceForChannel = StoreStream.Companion.getStageInstances().getStageInstanceForChannel(channel.g());
-        if (stageInstanceForChannel == null || !AnimatableValueParser.s1(stageInstanceForChannel)) {
-            MemberVerificationUtils memberVerificationUtils = MemberVerificationUtils.INSTANCE;
+        StageInstance stageInstanceForChannel = StoreStream.Companion.getStageInstances().getStageInstanceForChannel(channel.h());
+        if (stageInstanceForChannel != null && AnimatableValueParser.t1(stageInstanceForChannel)) {
+            StageChannelJoinHelper stageChannelJoinHelper = StageChannelJoinHelper.INSTANCE;
             Context requireContext = this.this$0.requireContext();
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, channel.e(), "Guild Voice", null, new AnonymousClass1(this, channel), 16, null);
-            return;
+            StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, channel.h(), false, false, null, null, null, null, null, 1016, null);
+        } else if (stageInstanceForChannel != null || !StartStageEventGuildsFeatureFlag.Companion.getINSTANCE().canGuildAccessStartStageEvent(channel.f())) {
+            MemberVerificationUtils memberVerificationUtils = MemberVerificationUtils.INSTANCE;
+            Context requireContext2 = this.this$0.requireContext();
+            FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
+            m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
+            MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext2, parentFragmentManager2, channel.f(), "Guild Voice", null, new AnonymousClass1(this, channel), 16, null);
+        } else {
+            WidgetStartStage.Companion.launch(this.this$0.requireContext(), channel.h());
         }
-        StageChannelJoinHelper stageChannelJoinHelper = StageChannelJoinHelper.INSTANCE;
-        Context requireContext2 = this.this$0.requireContext();
-        FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
-        m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
-        StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext2, parentFragmentManager2, channel.g(), false, false, null, null, null, null, null, 1016, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java
index 12a95acfc1..b19d36727e 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java
@@ -49,6 +49,6 @@ public final class WidgetChannelsList$onViewBound$5 extends o implements Functio
             } catch (IllegalStateException unused) {
             }
         }
-        StoreStream.Companion.getStoreChannelCategories().setCollapsedCategory(channel.e(), channel.g(), !z2);
+        StoreStream.Companion.getStoreChannelCategories().setCollapsedCategory(channel.f(), channel.h(), !z2);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java
index 937a3fa032..bdafbed223 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java
@@ -39,7 +39,7 @@ public final class WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda
             Context context = this.$it$inlined.getContext();
             m.checkNotNullExpressionValue(context, "it.context");
             m.checkNotNullExpressionValue(link, "inviteLink");
-            c.a.d.o.a(context, link, 2131890549);
+            c.a.d.o.a(context, link, 2131890617);
             return;
         }
         Guild guild = StoreStream.Companion.getGuilds().getGuild(this.$selectedGuildId);
@@ -47,7 +47,7 @@ public final class WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda
             String createLinkFromCode = InviteUtils.INSTANCE.createLinkFromCode(vanityUrlCode);
             Context context2 = this.$it$inlined.getContext();
             m.checkNotNullExpressionValue(context2, "it.context");
-            c.a.d.o.a(context2, createLinkFromCode, 2131890549);
+            c.a.d.o.a(context2, createLinkFromCode, 2131890617);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java
index 74735b90c4..b261544671 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java
@@ -32,9 +32,9 @@ public final class WidgetChannelsList$onViewBound$7 extends o implements Functio
         m.checkNotNullParameter(channel, "channel");
         WidgetUserSheet.Companion companion = WidgetUserSheet.Companion;
         long id2 = user.getId();
-        Long valueOf = Long.valueOf(channel.g());
+        Long valueOf = Long.valueOf(channel.h());
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetUserSheet.Companion.show$default(companion, id2, valueOf, parentFragmentManager, Long.valueOf(channel.e()), Boolean.valueOf(AnimatableValueParser.z1(channel)), null, null, 96, null);
+        WidgetUserSheet.Companion.show$default(companion, id2, valueOf, parentFragmentManager, Long.valueOf(channel.f()), Boolean.valueOf(AnimatableValueParser.B1(channel)), null, null, 96, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
index 2f83ba1d78..39e3cf6165 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java
@@ -72,7 +72,7 @@ public final class WidgetChannelsList extends AppFragment {
     }
 
     public WidgetChannelsList() {
-        super(2131558891);
+        super(2131558894);
     }
 
     public static final /* synthetic */ void access$ackPremiumGuildHint(WidgetChannelsList widgetChannelsList) {
@@ -168,17 +168,17 @@ public final class WidgetChannelsList extends AppFragment {
         Drawable drawable;
         if (guild != null) {
             if (guild.getFeatures().contains(GuildFeature.VERIFIED)) {
-                i = getBinding().b.a() ? 2131232036 : 2131232037;
+                i = getBinding().b.a() ? 2131232044 : 2131232045;
             } else if (guild.getFeatures().contains(GuildFeature.PARTNERED)) {
-                i = getBinding().b.a() ? 2131231811 : 2131231812;
+                i = getBinding().b.a() ? 2131231819 : 2131231820;
             } else if (guild.getPremiumTier() == 0 && guild.getPremiumSubscriptionCount() > 0) {
-                i = getBinding().b.a() ? 2131231672 : 2131231673;
+                i = getBinding().b.a() ? 2131231678 : 2131231679;
             } else if (guild.getPremiumTier() == 1) {
-                i = getBinding().b.a() ? 2131231661 : 2131231662;
+                i = getBinding().b.a() ? 2131231667 : 2131231668;
             } else if (guild.getPremiumTier() == 2) {
-                i = getBinding().b.a() ? 2131231663 : 2131231664;
+                i = getBinding().b.a() ? 2131231669 : 2131231670;
             } else if (guild.getPremiumTier() == 3) {
-                i = getBinding().b.a() ? 2131231665 : 2131231666;
+                i = getBinding().b.a() ? 2131231671 : 2131231672;
             }
             TextView textView = getBinding().g;
             Drawable drawable2 = i != 0 ? null : ContextCompat.getDrawable(requireContext(), i);
@@ -212,12 +212,12 @@ public final class WidgetChannelsList extends AppFragment {
         EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = getBinding().p;
         m.checkNotNullExpressionValue(emptyFriendsStateContactSyncView, "binding.widgetChannelsListEmptyFriendsStateCsView");
         emptyFriendsStateContactSyncView.setVisibility(widgetChannelListModel.getShowEmptyState() && widgetChannelListModel.getShowContactSyncEmptyState() ? 0 : 8);
-        RecyclerView recyclerView = getBinding().f1707c;
+        RecyclerView recyclerView = getBinding().f1704c;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelsList");
         recyclerView.setVisibility(widgetChannelListModel.getShowEmptyState() ? 4 : 0);
         if (!m.areEqual(this.selectedGuildId, selectedGuild != null ? Long.valueOf(selectedGuild.getId()) : null)) {
             if (z3) {
-                getBinding().f1707c.scrollToPosition(0);
+                getBinding().f1704c.scrollToPosition(0);
                 getBinding().b.setExpanded(true);
                 configureHeaderColors(widgetChannelListModel.getSelectedGuild(), true);
             }
@@ -325,7 +325,7 @@ public final class WidgetChannelsList extends AppFragment {
         getBinding().q.updateView("Channels List");
         getBinding().p.updateView(true);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1707c;
+        RecyclerView recyclerView = getBinding().f1704c;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelsList");
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -366,13 +366,13 @@ public final class WidgetChannelsList extends AppFragment {
         }
         widgetChannelsListAdapter7.setOnSelectUserOptions(new WidgetChannelsList$onViewBound$7(this));
         getBinding().k.setOnClickListener(new WidgetChannelsList$onViewBound$8(this));
-        getBinding().f1707c.setHasFixedSize(false);
-        RecyclerView recyclerView2 = getBinding().f1707c;
+        getBinding().f1704c.setHasFixedSize(false);
+        RecyclerView recyclerView2 = getBinding().f1704c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.channelsList");
         recyclerView2.setItemAnimator(null);
         ViewStub viewStub = getBinding().m;
         m.checkNotNullExpressionValue(viewStub, "binding.channelsListUnreadsStub");
-        RecyclerView recyclerView3 = getBinding().f1707c;
+        RecyclerView recyclerView3 = getBinding().f1704c;
         m.checkNotNullExpressionValue(recyclerView3, "binding.channelsList");
         this.channelListUnreads = new WidgetChannelListUnreads(viewStub, recyclerView3, getBinding().b, new WidgetChannelsList$onViewBound$9(this), 0, 0, false, 112, null);
         WidgetChannelsListAdapter widgetChannelsListAdapter8 = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$4.java
index e8425c47c6..2d84abf1b1 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$4.java
@@ -17,6 +17,6 @@ public final class WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$4 i
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetCreateChannel.Companion.show(a.T(this.this$0.itemView, "itemView", "itemView.context"), this.$item.getChannel().e(), 0, Long.valueOf(this.$item.getChannel().g()));
+        WidgetCreateChannel.Companion.show(a.T(this.this$0.itemView, "itemView", "itemView.context"), this.$item.getChannel().f(), 0, Long.valueOf(this.$item.getChannel().h()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser$onConfigure$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser$onConfigure$2.java
index bf72471360..48137e3b5a 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser$onConfigure$2.java
@@ -17,7 +17,7 @@ public final class WidgetChannelsListAdapter$ItemVoiceUser$onConfigure$2 impleme
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        if (AnimatableValueParser.u1(((ChannelListItemVoiceUser) this.$data).getChannel())) {
+        if (AnimatableValueParser.v1(((ChannelListItemVoiceUser) this.$data).getChannel())) {
             WidgetChannelsListAdapter.ItemVoiceUser.access$getAdapter$p(this.this$0).getOnJoinStageChannel().invoke(((ChannelListItemVoiceUser) this.$data).getChannel());
         } else {
             WidgetChannelsListAdapter.ItemVoiceUser.access$getAdapter$p(this.this$0).getOnCallChannel().invoke(((ChannelListItemVoiceUser) this.$data).getChannel());
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
index df635d2231..56171ce088 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java
@@ -108,7 +108,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             int i;
             m.checkNotNullParameter(view, "$this$setBackground");
             m.checkNotNullParameter(channel, "channel");
-            if (!z2 || AnimatableValueParser.k1(channel)) {
+            if (!z2 || AnimatableValueParser.l1(channel)) {
                 Context context = view.getContext();
                 m.checkNotNullExpressionValue(context, "context");
                 i = DrawableCompat.getThemedDrawableRes$default(context, 2130969207, 0, 2, (Object) null);
@@ -161,9 +161,9 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             @DrawableRes
             private final int getArrowDrawable(ChannelListItemCategory channelListItemCategory) {
                 if (channelListItemCategory.isCollapsed()) {
-                    return 2131231514;
+                    return 2131231520;
                 }
-                return !channelListItemCategory.isCollapsed() ? 2131231510 : 0;
+                return !channelListItemCategory.isCollapsed() ? 2131231516 : 0;
             }
 
             @ColorInt
@@ -184,14 +184,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362366;
-            ImageView imageView = (ImageView) view.findViewById(2131362366);
+            int i2 = 2131362381;
+            ImageView imageView = (ImageView) view.findViewById(2131362381);
             if (imageView != null) {
-                i2 = 2131362367;
-                ImageView imageView2 = (ImageView) view.findViewById(2131362367);
+                i2 = 2131362382;
+                ImageView imageView2 = (ImageView) view.findViewById(2131362382);
                 if (imageView2 != null) {
-                    i2 = 2131362368;
-                    TextView textView = (TextView) view.findViewById(2131362368);
+                    i2 = 2131362383;
+                    TextView textView = (TextView) view.findViewById(2131362383);
                     if (textView != null) {
                         WidgetChannelsListItemCategoryBinding widgetChannelsListItemCategoryBinding = new WidgetChannelsListItemCategoryBinding((LinearLayout) view, imageView, imageView2, textView);
                         m.checkNotNullExpressionValue(widgetChannelsListItemCategoryBinding, "WidgetChannelsListItemCa…oryBinding.bind(itemView)");
@@ -248,13 +248,13 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             int access$getChannelColor = Companion.access$getChannelColor(companion, channelListItemCategory, context);
             this.binding.d.setTextColor(access$getChannelColor);
             ViewCompat.setAccessibilityDelegate(this.binding.d, new WidgetChannelsListAdapter$ItemChannelCategory$onConfigure$3());
-            this.binding.f1709c.setImageResource(Companion.access$getArrowDrawable(companion, channelListItemCategory));
-            ImageView imageView = this.binding.f1709c;
+            this.binding.f1706c.setImageResource(Companion.access$getArrowDrawable(companion, channelListItemCategory));
+            ImageView imageView = this.binding.f1706c;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemCategoryArrow");
             imageView.setImageTintList(ColorStateList.valueOf(access$getChannelColor));
             if (this.isCollapsed != channelListItemCategory.isCollapsed()) {
                 this.isCollapsed = channelListItemCategory.isCollapsed();
-                this.binding.f1709c.startAnimation(channelListItemCategory.isCollapsed() ? ARROW_ANIM_COLLAPSE : ARROW_ANIM_EXPAND);
+                this.binding.f1706c.startAnimation(channelListItemCategory.isCollapsed() ? ARROW_ANIM_COLLAPSE : ARROW_ANIM_EXPAND);
             }
             ImageView imageView2 = this.binding.b;
             m.checkNotNullExpressionValue(imageView2, "binding.channelsItemCategoryAdd");
@@ -278,11 +278,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362898;
-            ImageView imageView = (ImageView) view.findViewById(2131362898);
+            int i2 = 2131362923;
+            ImageView imageView = (ImageView) view.findViewById(2131362923);
             if (imageView != null) {
-                i2 = 2131362899;
-                TextView textView = (TextView) view.findViewById(2131362899);
+                i2 = 2131362924;
+                TextView textView = (TextView) view.findViewById(2131362924);
                 if (textView != null) {
                     WidgetChannelsListItemDirectoryBinding widgetChannelsListItemDirectoryBinding = new WidgetChannelsListItemDirectoryBinding((LinearLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(widgetChannelsListItemDirectoryBinding, "WidgetChannelsListItemDi…oryBinding.bind(itemView)");
@@ -319,23 +319,23 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362267;
-            StatusView statusView = (StatusView) view.findViewById(2131362267);
+            int i2 = 2131362278;
+            StatusView statusView = (StatusView) view.findViewById(2131362278);
             if (statusView != null) {
-                i2 = 2131362398;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362398);
+                i2 = 2131362413;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362413);
                 if (simpleDraweeView != null) {
-                    i2 = 2131362399;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131362399);
+                    i2 = 2131362414;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131362414);
                     if (simpleDraweeSpanTextView != null) {
-                        i2 = 2131362400;
-                        TextView textView = (TextView) view.findViewById(2131362400);
+                        i2 = 2131362415;
+                        TextView textView = (TextView) view.findViewById(2131362415);
                         if (textView != null) {
-                            i2 = 2131362401;
-                            TextView textView2 = (TextView) view.findViewById(2131362401);
+                            i2 = 2131362416;
+                            TextView textView2 = (TextView) view.findViewById(2131362416);
                             if (textView2 != null) {
-                                i2 = 2131362402;
-                                TextView textView3 = (TextView) view.findViewById(2131362402);
+                                i2 = 2131362417;
+                                TextView textView3 = (TextView) view.findViewById(2131362417);
                                 if (textView3 != null) {
                                     WidgetChannelsListItemChannelPrivateBinding widgetChannelsListItemChannelPrivateBinding = new WidgetChannelsListItemChannelPrivateBinding((RelativeLayout) view, statusView, simpleDraweeView, simpleDraweeSpanTextView, textView, textView2, textView3);
                                     m.checkNotNullExpressionValue(widgetChannelsListItemChannelPrivateBinding, "WidgetChannelsListItemCh…ateBinding.bind(itemView)");
@@ -355,31 +355,31 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
         }
 
         private final CharSequence getContentDescription(ChannelListItemPrivate channelListItemPrivate, CharSequence charSequence) {
-            if (AnimatableValueParser.i1(channelListItemPrivate.getChannel()) && channelListItemPrivate.getMentionCount() > 0) {
+            if (AnimatableValueParser.j1(channelListItemPrivate.getChannel()) && channelListItemPrivate.getMentionCount() > 0) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return b.i(view, 2131889160, new Object[]{charSequence}, null, 4);
-            } else if (AnimatableValueParser.i1(channelListItemPrivate.getChannel())) {
+                return b.i(view, 2131889164, new Object[]{charSequence}, null, 4);
+            } else if (AnimatableValueParser.j1(channelListItemPrivate.getChannel())) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return b.i(view2, 2131889159, new Object[]{charSequence}, null, 4);
+                return b.i(view2, 2131889163, new Object[]{charSequence}, null, 4);
             } else if (channelListItemPrivate.getMentionCount() > 0) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return b.i(view3, 2131888115, new Object[]{charSequence}, null, 4);
+                return b.i(view3, 2131888114, new Object[]{charSequence}, null, 4);
             } else {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                return b.i(view4, 2131888114, new Object[]{charSequence}, null, 4);
+                return b.i(view4, 2131888113, new Object[]{charSequence}, null, 4);
             }
         }
 
         /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x000d: ARITH  (r5v3 int) = (r5v2 int) + (1 int)), (' ' char), (r6v1 java.lang.CharSequence)] */
         @SuppressLint({"SetTextI18n"})
         private final String getMemberCount(Channel channel, Context context) {
-            List<com.discord.api.user.User> v = channel.v();
-            int size = v != null ? v.size() : 0;
-            CharSequence g = b.g(context, 2131891137, new Object[0], null, 4);
+            List<com.discord.api.user.User> w = channel.w();
+            int size = w != null ? w.size() : 0;
+            CharSequence g = b.g(context, 2131891208, new Object[0], null, 4);
             StringBuilder sb = new StringBuilder();
             sb.append(size + 1);
             sb.append(' ');
@@ -432,7 +432,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             boolean component3 = channelListItemPrivate.component3();
             int component4 = channelListItemPrivate.component4();
             boolean component5 = channelListItemPrivate.component5();
-            if (AnimatableValueParser.g1(component1)) {
+            if (AnimatableValueParser.h1(component1)) {
                 str = AnimatableValueParser.y0(component1);
             } else {
                 TextView textView = this.binding.f;
@@ -454,22 +454,22 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             this.binding.f.setTextColor(getTextColor(channelListItemPrivate));
             TextView textView3 = this.binding.g;
             m.checkNotNullExpressionValue(textView3, "binding.channelsListItemPrivateTag");
-            textView3.setVisibility(AnimatableValueParser.w1(component1) ? 0 : 8);
-            SimpleDraweeView simpleDraweeView = this.binding.f1711c;
+            textView3.setVisibility(AnimatableValueParser.x1(component1) ? 0 : 8);
+            SimpleDraweeView simpleDraweeView = this.binding.f1708c;
             m.checkNotNullExpressionValue(simpleDraweeView, "it");
             IconUtils.setIcon$default(simpleDraweeView, component1, 2131165296, null, 8, null);
             StatusView statusView = this.binding.b;
             m.checkNotNullExpressionValue(statusView, "binding.channelListItemPrivateStatus");
-            statusView.setVisibility(AnimatableValueParser.g1(component1) && !AnimatableValueParser.w1(component1) ? 0 : 8);
+            statusView.setVisibility(AnimatableValueParser.h1(component1) && !AnimatableValueParser.x1(component1) ? 0 : 8);
             this.binding.b.setPresence(component2);
             this.binding.b.setBackgroundColor(getPresenceBg(component3));
-            if (AnimatableValueParser.w1(component1)) {
+            if (AnimatableValueParser.x1(component1)) {
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.channelsListItemPrivateDesc");
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.channelsListItemPrivateDesc");
-                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.i(simpleDraweeSpanTextView2, 2131893721, new Object[0], null, 4));
-            } else if (AnimatableValueParser.p1(component1)) {
+                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.i(simpleDraweeSpanTextView2, 2131893818, new Object[0], null, 4));
+            } else if (AnimatableValueParser.q1(component1)) {
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.channelsListItemPrivateDesc");
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.binding.d;
@@ -544,14 +544,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131364987;
-            ImageView imageView = (ImageView) view.findViewById(2131364987);
+            int i2 = 2131365037;
+            ImageView imageView = (ImageView) view.findViewById(2131365037);
             if (imageView != null) {
-                i2 = 2131364988;
-                TextView textView = (TextView) view.findViewById(2131364988);
+                i2 = 2131365038;
+                TextView textView = (TextView) view.findViewById(2131365038);
                 if (textView != null) {
-                    i2 = 2131364989;
-                    TextView textView2 = (TextView) view.findViewById(2131364989);
+                    i2 = 2131365039;
+                    TextView textView2 = (TextView) view.findViewById(2131365039);
                     if (textView2 != null) {
                         WidgetChannelsListItemChannelStageVoiceBinding widgetChannelsListItemChannelStageVoiceBinding = new WidgetChannelsListItemChannelStageVoiceBinding((RelativeLayout) view, imageView, textView, textView2);
                         m.checkNotNullExpressionValue(widgetChannelsListItemChannelStageVoiceBinding, "WidgetChannelsListItemCh…iceBinding.bind(itemView)");
@@ -571,7 +571,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (i > 0) {
                 RelativeLayout relativeLayout = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.root");
-                return b.i(relativeLayout, 2131889915, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), Integer.valueOf(channelListVocalItem.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
+                return b.i(relativeLayout, 2131889924, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), Integer.valueOf(channelListVocalItem.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
             } else if (channelListVocalItem.getNumUsersConnected() > 0) {
                 RelativeLayout relativeLayout2 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
@@ -579,11 +579,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 m.checkNotNullExpressionValue(relativeLayout3, "binding.root");
                 Context context = relativeLayout3.getContext();
                 m.checkNotNullExpressionValue(context, "binding.root.context");
-                return b.i(relativeLayout2, 2131889916, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, 2131755172, channelListVocalItem.getNumUsersConnected(), Integer.valueOf(channelListVocalItem.getNumUsersConnected()))}, null, 4);
+                return b.i(relativeLayout2, 2131889925, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, 2131755172, channelListVocalItem.getNumUsersConnected(), Integer.valueOf(channelListVocalItem.getNumUsersConnected()))}, null, 4);
             } else {
                 RelativeLayout relativeLayout4 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout4, "binding.root");
-                return b.i(relativeLayout4, 2131889914, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel())}, null, 4);
+                return b.i(relativeLayout4, 2131889923, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel())}, null, 4);
             }
         }
 
@@ -615,7 +615,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             RelativeLayout relativeLayout2 = this.binding.a;
             m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
             setBackground(relativeLayout2, component2, component1);
-            TextView textView = this.binding.f1712c;
+            TextView textView = this.binding.f1709c;
             textView.setText(AnimatableValueParser.y0(component1));
             textView.setTextColor(access$getVoiceChannelColor);
             TextView textView2 = this.binding.d;
@@ -627,7 +627,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             }
             textView2.setVisibility(i2);
             textView2.setText(component6 != null ? component6.f() : null);
-            int i3 = !can ? 2131231475 : component4 ? 2131231482 : 2131231478;
+            int i3 = !can ? 2131231481 : component4 ? 2131231488 : 2131231484;
             ImageView imageView = this.binding.b;
             imageView.setImageResource(i3);
             if (!z3 || !can) {
@@ -640,7 +640,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             imageView.setImageTintList(colorStateList);
             RelativeLayout relativeLayout4 = this.binding.a;
             m.checkNotNullExpressionValue(relativeLayout4, "binding.root");
-            relativeLayout4.setContentDescription(getContentDescription((ChannelListVocalItem) channelListItem, component1.A()));
+            relativeLayout4.setContentDescription(getContentDescription((ChannelListVocalItem) channelListItem, component1.B()));
             if (PermissionUtils.can(16, component3)) {
                 RelativeLayout relativeLayout5 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout5, "binding.root");
@@ -662,17 +662,17 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362369;
-            ImageView imageView = (ImageView) view.findViewById(2131362369);
+            int i2 = 2131362384;
+            ImageView imageView = (ImageView) view.findViewById(2131362384);
             if (imageView != null) {
-                i2 = 2131362370;
-                TextView textView = (TextView) view.findViewById(2131362370);
+                i2 = 2131362385;
+                TextView textView = (TextView) view.findViewById(2131362385);
                 if (textView != null) {
-                    i2 = 2131362371;
-                    TextView textView2 = (TextView) view.findViewById(2131362371);
+                    i2 = 2131362386;
+                    TextView textView2 = (TextView) view.findViewById(2131362386);
                     if (textView2 != null) {
-                        i2 = 2131362372;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362372);
+                        i2 = 2131362387;
+                        ImageView imageView2 = (ImageView) view.findViewById(2131362387);
                         if (imageView2 != null) {
                             WidgetChannelsListItemChannelBinding widgetChannelsListItemChannelBinding = new WidgetChannelsListItemChannelBinding((RelativeLayout) view, imageView, textView, textView2, imageView2);
                             m.checkNotNullExpressionValue(widgetChannelsListItemChannelBinding, "WidgetChannelsListItemCh…nelBinding.bind(itemView)");
@@ -691,34 +691,34 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
 
         @DrawableRes
         private final int getAnnouncementsIcon(ChannelListItemTextChannel channelListItemTextChannel) {
-            return channelListItemTextChannel.getChannel().n() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231474 : 2131231471 : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231473 : 2131231470 : channelListItemTextChannel.getHasActiveThreads() ? 2131231472 : 2131231468;
+            return channelListItemTextChannel.getChannel().o() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231480 : 2131231477 : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231479 : 2131231476 : channelListItemTextChannel.getHasActiveThreads() ? 2131231478 : 2131231474;
         }
 
         private final CharSequence getContentDescription(ChannelListItemTextChannel channelListItemTextChannel, boolean z2) {
             if (z2 && channelListItemTextChannel.getMentionCount() > 0) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return b.i(view, 2131889905, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755169, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.i(view, 2131889914, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755169, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (z2 && channelListItemTextChannel.isUnread()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return b.i(view2, 2131889906, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.i(view2, 2131889915, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (z2) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return b.i(view3, 2131889904, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.i(view3, 2131889913, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (channelListItemTextChannel.getMentionCount() > 0) {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                return b.i(view4, 2131889908, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755170, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.i(view4, 2131889917, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755170, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else if (channelListItemTextChannel.isUnread()) {
                 View view5 = this.itemView;
                 m.checkNotNullExpressionValue(view5, "itemView");
-                return b.i(view5, 2131889909, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.i(view5, 2131889918, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             } else {
                 View view6 = this.itemView;
                 m.checkNotNullExpressionValue(view6, "itemView");
-                return b.i(view6, 2131889907, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
+                return b.i(view6, 2131889916, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4);
             }
         }
 
@@ -741,7 +741,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
 
         @DrawableRes
         private final int getHashIcon(ChannelListItemTextChannel channelListItemTextChannel) {
-            return channelListItemTextChannel.getChannel().n() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231993 : 2131231488 : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? 2131231992 : 2131231487 : channelListItemTextChannel.getHasActiveThreads() ? 2131231991 : 2131231483;
+            return channelListItemTextChannel.getChannel().o() ? channelListItemTextChannel.getHasActiveThreads() ? 2131232001 : 2131231494 : channelListItemTextChannel.isLocked() ? channelListItemTextChannel.getHasActiveThreads() ? 2131232000 : 2131231493 : channelListItemTextChannel.getHasActiveThreads() ? 2131231999 : 2131231489;
         }
 
         @ColorInt
@@ -771,7 +771,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             ChannelListItemTextChannel channelListItemTextChannel = (ChannelListItemTextChannel) channelListItem;
             boolean z2 = true;
             int i2 = 0;
-            boolean z3 = channelListItemTextChannel.getChannel().z() == 5;
+            boolean z3 = channelListItemTextChannel.getChannel().A() == 5;
             RelativeLayout relativeLayout = this.binding.a;
             m.checkNotNullExpressionValue(relativeLayout, "binding.root");
             ViewExtensions.setOnLongClickListenerConsumeClick(relativeLayout, new WidgetChannelsListAdapter$ItemChannelText$onConfigure$1(this, channelListItem));
@@ -790,10 +790,10 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             ImageView imageView = this.binding.b;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemChannelHash");
             imageView.setImageTintList(ColorStateList.valueOf(getHashColor(channelListItemTextChannel)));
-            TextView textView2 = this.binding.f1710c;
+            TextView textView2 = this.binding.f1707c;
             m.checkNotNullExpressionValue(textView2, "binding.channelsItemChannelMentions");
             textView2.setVisibility(channelListItemTextChannel.getMentionCount() > 0 ? 0 : 8);
-            TextView textView3 = this.binding.f1710c;
+            TextView textView3 = this.binding.f1707c;
             m.checkNotNullExpressionValue(textView3, "binding.channelsItemChannelMentions");
             textView3.setText(String.valueOf(Math.min(99, channelListItemTextChannel.getMentionCount())));
             ImageView imageView2 = this.binding.e;
@@ -825,20 +825,20 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362373;
-            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362373);
+            int i2 = 2131362388;
+            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362388);
             if (constraintLayout != null) {
-                i2 = 2131362374;
-                TextView textView = (TextView) view.findViewById(2131362374);
+                i2 = 2131362389;
+                TextView textView = (TextView) view.findViewById(2131362389);
                 if (textView != null) {
-                    i2 = 2131362375;
-                    TextView textView2 = (TextView) view.findViewById(2131362375);
+                    i2 = 2131362390;
+                    TextView textView2 = (TextView) view.findViewById(2131362390);
                     if (textView2 != null) {
-                        i2 = 2131362376;
-                        ImageView imageView = (ImageView) view.findViewById(2131362376);
+                        i2 = 2131362391;
+                        ImageView imageView = (ImageView) view.findViewById(2131362391);
                         if (imageView != null) {
-                            i2 = 2131362377;
-                            ImageView imageView2 = (ImageView) view.findViewById(2131362377);
+                            i2 = 2131362392;
+                            ImageView imageView2 = (ImageView) view.findViewById(2131362392);
                             if (imageView2 != null) {
                                 WidgetChannelsListItemThreadBinding widgetChannelsListItemThreadBinding = new WidgetChannelsListItemThreadBinding((ConstraintLayout) view, constraintLayout, textView, textView2, imageView, imageView2);
                                 m.checkNotNullExpressionValue(widgetChannelsListItemThreadBinding, "WidgetChannelsListItemThreadBinding.bind(itemView)");
@@ -860,26 +860,26 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (channelListItemThread.getMentionCount() > 0) {
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                return b.i(view, 2131889908, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755170, channelListItemThread.getMentionCount(), Integer.valueOf(channelListItemThread.getMentionCount())), channelListItemThread.getChannel().l()}, null, 4);
+                return b.i(view, 2131889917, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755170, channelListItemThread.getMentionCount(), Integer.valueOf(channelListItemThread.getMentionCount())), channelListItemThread.getChannel().m()}, null, 4);
             } else if (channelListItemThread.isUnread()) {
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
-                return b.i(view2, 2131889909, new Object[]{channelListItemThread.getChannel().l()}, null, 4);
+                return b.i(view2, 2131889918, new Object[]{channelListItemThread.getChannel().m()}, null, 4);
             } else {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                return b.i(view3, 2131889907, new Object[]{channelListItemThread.getChannel().l()}, null, 4);
+                return b.i(view3, 2131889916, new Object[]{channelListItemThread.getChannel().m()}, null, 4);
             }
         }
 
         private final int getSpineResourceId(WidgetChannelListModel.ThreadSpineType threadSpineType) {
             if (m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Single.INSTANCE)) {
-                return 2131231942;
+                return 2131231950;
             }
             if (m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Start.INSTANCE)) {
-                return 2131231940;
+                return 2131231948;
             }
-            return m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.End.INSTANCE) ? 2131231943 : 2131231941;
+            return m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.End.INSTANCE) ? 2131231951 : 2131231949;
         }
 
         @ColorInt
@@ -915,14 +915,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             constraintLayout3.setContentDescription(getContentDescription(channelListItemThread));
             TextView textView = this.binding.d;
             m.checkNotNullExpressionValue(textView, "binding.channelsItemThreadName");
-            textView.setText(channelListItemThread.getChannel().l());
+            textView.setText(channelListItemThread.getChannel().m());
             this.binding.d.setTextColor(getTextColor(channelListItemThread, channelListItemThread.getSelected()));
-            TextView textView2 = this.binding.f1717c;
+            TextView textView2 = this.binding.f1714c;
             m.checkNotNullExpressionValue(textView2, "binding.channelsItemThreadMentions");
             boolean z2 = true;
             int i2 = 0;
             textView2.setVisibility(channelListItemThread.getMentionCount() > 0 ? 0 : 8);
-            TextView textView3 = this.binding.f1717c;
+            TextView textView3 = this.binding.f1714c;
             m.checkNotNullExpressionValue(textView3, "binding.channelsItemThreadMentions");
             textView3.setText(String.valueOf(Math.min(99, channelListItemThread.getMentionCount())));
             ImageView imageView = this.binding.f;
@@ -975,14 +975,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362378;
-            TextView textView = (TextView) view.findViewById(2131362378);
+            int i2 = 2131362393;
+            TextView textView = (TextView) view.findViewById(2131362393);
             if (textView != null) {
-                i2 = 2131362379;
-                ImageView imageView = (ImageView) view.findViewById(2131362379);
+                i2 = 2131362394;
+                ImageView imageView = (ImageView) view.findViewById(2131362394);
                 if (imageView != null) {
-                    i2 = 2131362380;
-                    VoiceUserLimitView voiceUserLimitView = (VoiceUserLimitView) view.findViewById(2131362380);
+                    i2 = 2131362395;
+                    VoiceUserLimitView voiceUserLimitView = (VoiceUserLimitView) view.findViewById(2131362395);
                     if (voiceUserLimitView != null) {
                         WidgetChannelsListItemChannelVoiceBinding widgetChannelsListItemChannelVoiceBinding = new WidgetChannelsListItemChannelVoiceBinding((RelativeLayout) view, textView, imageView, voiceUserLimitView);
                         m.checkNotNullExpressionValue(widgetChannelsListItemChannelVoiceBinding, "WidgetChannelsListItemCh…iceBinding.bind(itemView)");
@@ -1002,7 +1002,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             if (i > 0) {
                 RelativeLayout relativeLayout = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout, "binding.root");
-                return b.i(relativeLayout, 2131889915, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
+                return b.i(relativeLayout, 2131889924, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()), Integer.valueOf(i)}, null, 4);
             } else if (channelListItemVoiceChannel.getNumUsersConnected() > 0) {
                 RelativeLayout relativeLayout2 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout2, "binding.root");
@@ -1010,11 +1010,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 m.checkNotNullExpressionValue(relativeLayout3, "binding.root");
                 Context context = relativeLayout3.getContext();
                 m.checkNotNullExpressionValue(context, "binding.root.context");
-                return b.i(relativeLayout2, 2131889916, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, 2131755172, channelListItemVoiceChannel.getNumUsersConnected(), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()))}, null, 4);
+                return b.i(relativeLayout2, 2131889925, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), StringResourceUtilsKt.getI18nPluralString(context, 2131755172, channelListItemVoiceChannel.getNumUsersConnected(), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()))}, null, 4);
             } else {
                 RelativeLayout relativeLayout4 = this.binding.a;
                 m.checkNotNullExpressionValue(relativeLayout4, "binding.root");
-                return b.i(relativeLayout4, 2131889914, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel())}, null, 4);
+                return b.i(relativeLayout4, 2131889923, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel())}, null, 4);
             }
         }
 
@@ -1048,8 +1048,8 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             m.checkNotNullExpressionValue(textView, "binding.channelsItemVoiceChannelName");
             textView.setText(AnimatableValueParser.y0(component1));
             this.binding.b.setTextColor(access$getVoiceChannelColor);
-            this.binding.f1713c.setImageResource(!can ? 2131231475 : component5 ? 2131231495 : 2131231492);
-            ImageView imageView = this.binding.f1713c;
+            this.binding.f1710c.setImageResource(!can ? 2131231481 : component5 ? 2131231501 : 2131231498);
+            ImageView imageView = this.binding.f1710c;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemVoiceChannelSpeaker");
             imageView.setImageTintList(ColorStateList.valueOf(access$getVoiceChannelColor));
             if (!(component7 instanceof GuildMaxVideoChannelUsers.Limited)) {
@@ -1058,12 +1058,12 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             GuildMaxVideoChannelUsers.Limited limited = (GuildMaxVideoChannelUsers.Limited) component7;
             int i2 = 0;
             int a = limited != null ? limited.a() : 0;
-            int min = Math.min(component1.A(), a);
+            int min = Math.min(component1.B(), a);
             if (min > 0) {
                 boolean z2 = true;
                 boolean z3 = component6 && min == a;
                 if (!z3) {
-                    a = component1.A();
+                    a = component1.B();
                 }
                 VoiceUserLimitView voiceUserLimitView = this.binding.d;
                 m.checkNotNullExpressionValue(voiceUserLimitView, "binding.channelsItemVoiceChannelUserLimit");
@@ -1107,11 +1107,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362396;
-            TextView textView = (TextView) view.findViewById(2131362396);
+            int i2 = 2131362411;
+            TextView textView = (TextView) view.findViewById(2131362411);
             if (textView != null) {
-                i2 = 2131362427;
-                ImageView imageView = (ImageView) view.findViewById(2131362427);
+                i2 = 2131362442;
+                ImageView imageView = (ImageView) view.findViewById(2131362442);
                 if (imageView != null) {
                     WidgetChannelsListItemHeaderBinding widgetChannelsListItemHeaderBinding = new WidgetChannelsListItemHeaderBinding((RelativeLayout) view, textView, imageView);
                     m.checkNotNullExpressionValue(widgetChannelsListItemHeaderBinding, "WidgetChannelsListItemHeaderBinding.bind(itemView)");
@@ -1130,25 +1130,25 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             boolean component3 = channelListItemHeader.component3();
             long component4 = channelListItemHeader.component4();
             if (!component3) {
-                ImageView imageView = this.binding.f1714c;
+                ImageView imageView = this.binding.f1711c;
                 m.checkNotNullExpressionValue(imageView, "binding.channelsListNew");
                 imageView.setVisibility(4);
-                this.binding.f1714c.setOnClickListener(null);
-            } else if (component2 == 2131891695) {
-                ImageView imageView2 = this.binding.f1714c;
+                this.binding.f1711c.setOnClickListener(null);
+            } else if (component2 == 2131891764) {
+                ImageView imageView2 = this.binding.f1711c;
                 m.checkNotNullExpressionValue(imageView2, "binding.channelsListNew");
                 imageView2.setVisibility(4);
-                this.binding.f1714c.setOnClickListener(null);
-            } else if (component2 == 2131893829) {
-                ImageView imageView3 = this.binding.f1714c;
+                this.binding.f1711c.setOnClickListener(null);
+            } else if (component2 == 2131893927) {
+                ImageView imageView3 = this.binding.f1711c;
                 m.checkNotNullExpressionValue(imageView3, "binding.channelsListNew");
                 imageView3.setVisibility(0);
-                this.binding.f1714c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$1(component4));
-            } else if (component2 == 2131894527) {
-                ImageView imageView4 = this.binding.f1714c;
+                this.binding.f1711c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$1(component4));
+            } else if (component2 == 2131894647) {
+                ImageView imageView4 = this.binding.f1711c;
                 m.checkNotNullExpressionValue(imageView4, "binding.channelsListNew");
                 imageView4.setVisibility(0);
-                this.binding.f1714c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$2(component4));
+                this.binding.f1711c.setOnClickListener(new WidgetChannelsListAdapter$ItemHeader$onConfigure$2(component4));
             }
             this.binding.b.setText(component2);
         }
@@ -1186,14 +1186,14 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362397);
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362412);
             if (linkifiedTextView != null) {
                 WidgetChannelsListItemMfaBinding widgetChannelsListItemMfaBinding = new WidgetChannelsListItemMfaBinding((LinearLayout) view, linkifiedTextView);
                 m.checkNotNullExpressionValue(widgetChannelsListItemMfaBinding, "WidgetChannelsListItemMfaBinding.bind(itemView)");
                 this.binding = widgetChannelsListItemMfaBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362397)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362412)));
         }
 
         public void onConfigure(int i, ChannelListItem channelListItem) {
@@ -1201,7 +1201,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super.onConfigure(i, (int) channelListItem);
             LinkifiedTextView linkifiedTextView = this.binding.b;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.channelsListItemMfaText");
-            b.m(linkifiedTextView, 2131894009, new Object[0], WidgetChannelsListAdapter$ItemMFA$onConfigure$1.INSTANCE);
+            b.l(linkifiedTextView, 2131894109, new Object[0], WidgetChannelsListAdapter$ItemMFA$onConfigure$1.INSTANCE);
         }
     }
 
@@ -1251,7 +1251,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                         item = null;
                     }
                     ChannelListItemStageActiveEvent channelListItemStageActiveEvent = (ChannelListItemStageActiveEvent) item;
-                    if (channelListItemStageActiveEvent != null && (data = channelListItemStageActiveEvent.getData()) != null && (channel = data.getChannel()) != null && AnimatableValueParser.u1(channel)) {
+                    if (channelListItemStageActiveEvent != null && (data = channelListItemStageActiveEvent.getData()) != null && (channel = data.getChannel()) != null && AnimatableValueParser.v1(channel)) {
                         this.$adapter.getOnJoinStageChannel().invoke(channelListItemStageActiveEvent.getData().getChannel());
                     }
                 }
@@ -1263,32 +1263,32 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362319;
-            ImageView imageView = (ImageView) view.findViewById(2131362319);
+            int i2 = 2131362330;
+            ImageView imageView = (ImageView) view.findViewById(2131362330);
             if (imageView != null) {
-                i2 = 2131363761;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363761);
+                i2 = 2131363802;
+                ImageView imageView2 = (ImageView) view.findViewById(2131363802);
                 if (imageView2 != null) {
-                    i2 = 2131363762;
-                    TextView textView = (TextView) view.findViewById(2131363762);
+                    i2 = 2131363803;
+                    TextView textView = (TextView) view.findViewById(2131363803);
                     if (textView != null) {
-                        i2 = 2131365009;
-                        TextView textView2 = (TextView) view.findViewById(2131365009);
+                        i2 = 2131365059;
+                        TextView textView2 = (TextView) view.findViewById(2131365059);
                         if (textView2 != null) {
-                            i2 = 2131365010;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365010);
+                            i2 = 2131365060;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365060);
                             if (materialButton != null) {
-                                i2 = 2131365011;
-                                TextView textView3 = (TextView) view.findViewById(2131365011);
+                                i2 = 2131365061;
+                                TextView textView3 = (TextView) view.findViewById(2131365061);
                                 if (textView3 != null) {
-                                    i2 = 2131365012;
-                                    TextView textView4 = (TextView) view.findViewById(2131365012);
+                                    i2 = 2131365062;
+                                    TextView textView4 = (TextView) view.findViewById(2131365062);
                                     if (textView4 != null) {
-                                        i2 = 2131365469;
-                                        UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131365469);
+                                        i2 = 2131365529;
+                                        UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131365529);
                                         if (userSummaryView != null) {
-                                            i2 = 2131365470;
-                                            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131365470);
+                                            i2 = 2131365530;
+                                            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131365530);
                                             if (materialTextView != null) {
                                                 WidgetChannelsListItemActiveStageEventBinding widgetChannelsListItemActiveStageEventBinding = new WidgetChannelsListItemActiveStageEventBinding((ConstraintLayout) view, imageView, imageView2, textView, textView2, materialButton, textView3, textView4, userSummaryView, materialTextView);
                                                 m.checkNotNullExpressionValue(widgetChannelsListItemActiveStageEventBinding, "WidgetChannelsListItemAc…entBinding.bind(itemView)");
@@ -1328,7 +1328,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             textView2.setText(AnimatableValueParser.A0(channel, context, false, 2));
             TextView textView3 = this.binding.d;
             m.checkNotNullExpressionValue(textView3, "binding.stageEventListeners");
-            b.n(textView3, 2131890808, new Object[]{Integer.valueOf(audienceSize)}, null, 4);
+            b.m(textView3, 2131890878, new Object[]{Integer.valueOf(audienceSize)}, null, 4);
             UserSummaryView userSummaryView = this.binding.f;
             int i3 = 8;
             userSummaryView.setVisibility(data.getSpeakers().isEmpty() ^ true ? 0 : 8);
@@ -1344,18 +1344,18 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
                 if (data.getSpeakers().size() != 1) {
                     Context context2 = materialTextView.getContext();
                     m.checkNotNullExpressionValue(context2, "context");
-                    charSequence = b.i(materialTextView, 2131894403, new Object[]{data.getSpeakers().get(0).getUser().getUsername(), StringResourceUtilsKt.getI18nPluralString(context2, 2131755354, data.getSpeakers().size() - 1, Integer.valueOf(data.getSpeakers().size() - 1))}, null, 4);
+                    charSequence = b.i(materialTextView, 2131894522, new Object[]{data.getSpeakers().get(0).getUser().getUsername(), StringResourceUtilsKt.getI18nPluralString(context2, 2131755355, data.getSpeakers().size() - 1, Integer.valueOf(data.getSpeakers().size() - 1))}, null, 4);
                 } else {
                     charSequence = data.getSpeakers().get(0).getUser().getUsername();
                 }
                 materialTextView.setText(charSequence);
             }
-            MaterialButton materialButton = this.binding.f1708c;
+            MaterialButton materialButton = this.binding.f1705c;
             if (!data.getContainsMe()) {
-                i2 = 2131893345;
+                i2 = 2131893428;
             } else {
                 StageRoles r12 = data.m43getMyRolestwRsX0();
-                i2 = (r12 == null || !StageRoles.m26isSpeakerimpl(r12.m28unboximpl())) ? 2131893346 : 2131893347;
+                i2 = (r12 == null || !StageRoles.m26isSpeakerimpl(r12.m28unboximpl())) ? 2131893429 : 2131893430;
             }
             materialButton.setText(i2);
         }
@@ -1370,11 +1370,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131364972;
-            ImageView imageView = (ImageView) view.findViewById(2131364972);
+            int i2 = 2131365022;
+            ImageView imageView = (ImageView) view.findViewById(2131365022);
             if (imageView != null) {
-                i2 = 2131364998;
-                TextView textView = (TextView) view.findViewById(2131364998);
+                i2 = 2131365048;
+                TextView textView = (TextView) view.findViewById(2131365048);
                 if (textView != null) {
                     WidgetChannelsListItemAudienceCountBinding widgetChannelsListItemAudienceCountBinding = new WidgetChannelsListItemAudienceCountBinding((RelativeLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(widgetChannelsListItemAudienceCountBinding, "WidgetChannelsListItemAu…untBinding.bind(itemView)");
@@ -1391,9 +1391,9 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             ChannelListItemStageAudienceCount channelListItemStageAudienceCount = (ChannelListItemStageAudienceCount) channelListItem;
             TextView textView = this.binding.b;
             if (channelListItemStageAudienceCount.getAudienceSize() != 0) {
-                b.n(textView, 2131893330, new Object[]{Integer.valueOf(channelListItemStageAudienceCount.getAudienceSize())}, null, 4);
+                b.m(textView, 2131893413, new Object[]{Integer.valueOf(channelListItemStageAudienceCount.getAudienceSize())}, null, 4);
             } else {
-                textView.setText(2131893351);
+                textView.setText(2131893434);
             }
         }
     }
@@ -1407,26 +1407,26 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             super(i, widgetChannelsListAdapter);
             m.checkNotNullParameter(widgetChannelsListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131362381;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362381);
+            int i2 = 2131362396;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362396);
             if (simpleDraweeView != null) {
-                i2 = 2131362382;
-                ImageView imageView = (ImageView) view.findViewById(2131362382);
+                i2 = 2131362397;
+                ImageView imageView = (ImageView) view.findViewById(2131362397);
                 if (imageView != null) {
-                    i2 = 2131362383;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362383);
+                    i2 = 2131362398;
+                    ImageView imageView2 = (ImageView) view.findViewById(2131362398);
                     if (imageView2 != null) {
-                        i2 = 2131362384;
-                        TextView textView = (TextView) view.findViewById(2131362384);
+                        i2 = 2131362399;
+                        TextView textView = (TextView) view.findViewById(2131362399);
                         if (textView != null) {
-                            i2 = 2131362385;
-                            ImageView imageView3 = (ImageView) view.findViewById(2131362385);
+                            i2 = 2131362400;
+                            ImageView imageView3 = (ImageView) view.findViewById(2131362400);
                             if (imageView3 != null) {
-                                i2 = 2131362386;
-                                TextView textView2 = (TextView) view.findViewById(2131362386);
+                                i2 = 2131362401;
+                                TextView textView2 = (TextView) view.findViewById(2131362401);
                                 if (textView2 != null) {
-                                    i2 = 2131363576;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363576);
+                                    i2 = 2131363617;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363617);
                                     if (linearLayout != null) {
                                         WidgetChannelsListItemVoiceUserBinding widgetChannelsListItemVoiceUserBinding = new WidgetChannelsListItemVoiceUserBinding((RelativeLayout) view, simpleDraweeView, imageView, imageView2, textView, imageView3, textView2, linearLayout);
                                         m.checkNotNullExpressionValue(widgetChannelsListItemVoiceUserBinding, "WidgetChannelsListItemVo…serBinding.bind(itemView)");
@@ -1466,13 +1466,13 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
             TextView textView = this.binding.g;
             m.checkNotNullExpressionValue(textView, "binding.channelsItemVoiceUserName");
             textView.setText(GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, component3, component4, component1, null, 8, null));
-            ImageView imageView = this.binding.f1718c;
+            ImageView imageView = this.binding.f1715c;
             m.checkNotNullExpressionValue(imageView, "binding.channelsItemVoiceUserCamera");
             int i2 = 8;
             imageView.setVisibility(component2.j() ? 0 : 8);
             ImageView imageView2 = this.binding.f;
             m.checkNotNullExpressionValue(imageView2, "binding.channelsItemVoiceUserMicrophone");
-            imageView2.setVisibility(AnimatableValueParser.q1(component2) ? 0 : 8);
+            imageView2.setVisibility(AnimatableValueParser.r1(component2) ? 0 : 8);
             ImageView imageView3 = this.binding.d;
             m.checkNotNullExpressionValue(imageView3, "binding.channelsItemVoiceUserHeadphones");
             boolean z2 = true;
@@ -1558,40 +1558,40 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple<Cha
         m.checkNotNullParameter(viewGroup, "parent");
         switch (i) {
             case 0:
-                return new ItemChannelText(2131558896, this);
+                return new ItemChannelText(2131558899, this);
             case 1:
-                return new ItemChannelVoice(2131558899, this);
+                return new ItemChannelVoice(2131558902, this);
             case 2:
-                return new ItemVoiceUser(2131558908, this);
+                return new ItemVoiceUser(2131558911, this);
             case 3:
-                return new ItemChannelPrivate(2131558897, this);
+                return new ItemChannelPrivate(2131558900, this);
             case 4:
             case 5:
             case 10:
             default:
                 throw invalidViewTypeException(i);
             case 6:
-                return new ItemHeader(2131558901, this);
+                return new ItemHeader(2131558904, this);
             case 7:
-                return new ItemMFA(2131558903, this);
+                return new ItemMFA(2131558906, this);
             case 8:
-                return new ItemChannelCategory(2131558895, this);
+                return new ItemChannelCategory(2131558898, this);
             case 9:
-                return new ItemInvite(2131558902, this);
+                return new ItemInvite(2131558905, this);
             case 11:
-                return new ItemSpace(2131558648, this);
+                return new ItemSpace(2131558646, this);
             case 12:
-                return new ItemChannelThread(2131558906, this);
+                return new ItemChannelThread(2131558909, this);
             case 13:
-                return new ItemChannelStageVoice(2131558898, this);
+                return new ItemChannelStageVoice(2131558901, this);
             case 14:
-                return new MGRecyclerViewHolder<>(2131558904, this);
+                return new MGRecyclerViewHolder<>(2131558907, this);
             case 15:
-                return new ItemStageActiveEvent(2131558893, this);
+                return new ItemStageActiveEvent(2131558896, this);
             case 16:
-                return new ItemStageChannelAudienceCount(2131558894, this);
+                return new ItemStageChannelAudienceCount(2131558897, this);
             case 17:
-                return new ItemChannelDirectory(2131558900, this);
+                return new ItemChannelDirectory(2131558903, this);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.java
index 1a1c9c27e2..274a0d0040 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.java
@@ -18,7 +18,7 @@ public final class WidgetChannelsListItemChannelActions$Model$Companion$get$1<T1
         }
         ModelNotificationSettings modelNotificationSettings = (ModelNotificationSettings) a.c(channel, map);
         boolean z2 = true;
-        if (modelNotificationSettings == null || (channelOverride = modelNotificationSettings.getChannelOverride(channel.g())) == null || !channelOverride.isMuted()) {
+        if (modelNotificationSettings == null || (channelOverride = modelNotificationSettings.getChannelOverride(channel.h())) == null || !channelOverride.isMuted()) {
             z2 = false;
         }
         return new WidgetChannelsListItemChannelActions.Model(channel, guild, l, z2);
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java
index 13524aa913..a30be3311a 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$binding$2.java
@@ -18,38 +18,38 @@ public final /* synthetic */ class WidgetChannelsListItemChannelActions$binding$
 
     public final WidgetChannelsListItemTextActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362403;
-        TextView textView = (TextView) view.findViewById(2131362403);
+        int i = 2131362418;
+        TextView textView = (TextView) view.findViewById(2131362418);
         if (textView != null) {
-            i = 2131362404;
-            TextView textView2 = (TextView) view.findViewById(2131362404);
+            i = 2131362419;
+            TextView textView2 = (TextView) view.findViewById(2131362419);
             if (textView2 != null) {
-                i = 2131362405;
-                TextView textView3 = (TextView) view.findViewById(2131362405);
+                i = 2131362420;
+                TextView textView3 = (TextView) view.findViewById(2131362420);
                 if (textView3 != null) {
-                    i = 2131362406;
-                    View findViewById = view.findViewById(2131362406);
+                    i = 2131362421;
+                    View findViewById = view.findViewById(2131362421);
                     if (findViewById != null) {
-                        i = 2131362407;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362407);
+                        i = 2131362422;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362422);
                         if (simpleDraweeView != null) {
-                            i = 2131362408;
-                            TextView textView4 = (TextView) view.findViewById(2131362408);
+                            i = 2131362423;
+                            TextView textView4 = (TextView) view.findViewById(2131362423);
                             if (textView4 != null) {
-                                i = 2131362409;
-                                TextView textView5 = (TextView) view.findViewById(2131362409);
+                                i = 2131362424;
+                                TextView textView5 = (TextView) view.findViewById(2131362424);
                                 if (textView5 != null) {
-                                    i = 2131362410;
-                                    TextView textView6 = (TextView) view.findViewById(2131362410);
+                                    i = 2131362425;
+                                    TextView textView6 = (TextView) view.findViewById(2131362425);
                                     if (textView6 != null) {
-                                        i = 2131362411;
-                                        TextView textView7 = (TextView) view.findViewById(2131362411);
+                                        i = 2131362426;
+                                        TextView textView7 = (TextView) view.findViewById(2131362426);
                                         if (textView7 != null) {
-                                            i = 2131362412;
-                                            TextView textView8 = (TextView) view.findViewById(2131362412);
+                                            i = 2131362427;
+                                            TextView textView8 = (TextView) view.findViewById(2131362427);
                                             if (textView8 != null) {
-                                                i = 2131362413;
-                                                TextView textView9 = (TextView) view.findViewById(2131362413);
+                                                i = 2131362428;
+                                                TextView textView9 = (TextView) view.findViewById(2131362428);
                                                 if (textView9 != null) {
                                                     return new WidgetChannelsListItemTextActionsBinding((NestedScrollView) view, textView, textView2, textView3, findViewById, simpleDraweeView, textView4, textView5, textView6, textView7, textView8, textView9);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.java
index 03d6d79299..7382eebbbd 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1.java
@@ -39,6 +39,6 @@ public final class WidgetChannelsListItemChannelActions$configureUI$$inlined$app
         m.checkNotNullExpressionValue(context, "context");
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetGuildInviteShare.Companion.launch$default(companion, context, parentFragmentManager, this.$this_configureUI$inlined.getChannel().e(), Long.valueOf(this.$this_configureUI$inlined.getChannel().g()), false, "Context Menu", 16, null);
+        WidgetGuildInviteShare.Companion.launch$default(companion, context, parentFragmentManager, this.$this_configureUI$inlined.getChannel().f(), Long.valueOf(this.$this_configureUI$inlined.getChannel().h()), false, "Context Menu", 16, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.java
index 5b6f82933c..4b6830e3c2 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.java
@@ -40,13 +40,13 @@ public final class WidgetChannelsListItemChannelActions$configureUI$$inlined$app
             StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings();
             Context context = this.$this_apply.getContext();
             m.checkNotNullExpressionValue(context, "context");
-            StoreUserGuildSettings.setChannelMuted$default(userGuildSettings, context, this.$this_configureUI$inlined.getChannel().g(), false, null, 8, null);
+            StoreUserGuildSettings.setChannelMuted$default(userGuildSettings, context, this.$this_configureUI$inlined.getChannel().h(), false, null, 8, null);
             return;
         }
         WidgetMuteSettingsSheet.Companion companion = WidgetMuteSettingsSheet.Companion;
-        long g = this.$this_configureUI$inlined.getChannel().g();
+        long h = this.$this_configureUI$inlined.getChannel().h();
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.showForChannel(g, parentFragmentManager);
+        companion.showForChannel(h, parentFragmentManager);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.java
index e401f091c7..6782b4bccd 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.java
@@ -32,6 +32,6 @@ public final class WidgetChannelsListItemChannelActions$configureUI$$inlined$app
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        WidgetThreadBrowser.Companion.show(this.$this_apply.getContext(), this.$this_configureUI$inlined.getChannel().e(), this.$this_configureUI$inlined.getChannel().g(), "Channel Context Menu");
+        WidgetThreadBrowser.Companion.show(this.$this_apply.getContext(), this.$this_configureUI$inlined.getChannel().f(), this.$this_configureUI$inlined.getChannel().h(), "Channel Context Menu");
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.java
index c3f3c222f3..b9ff7f4de9 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4.java
@@ -32,18 +32,18 @@ public final class WidgetChannelsListItemChannelActions$configureUI$$inlined$app
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        if (AnimatableValueParser.p1(this.$this_configureUI$inlined.getChannel())) {
+        if (AnimatableValueParser.q1(this.$this_configureUI$inlined.getChannel())) {
             WidgetChannelGroupDMSettings.Companion companion = WidgetChannelGroupDMSettings.Companion;
-            long g = this.$this_configureUI$inlined.getChannel().g();
+            long h = this.$this_configureUI$inlined.getChannel().h();
             Context context = view.getContext();
             m.checkNotNullExpressionValue(context, "view.context");
-            companion.create(g, context);
+            companion.create(h, context);
             return;
         }
         WidgetTextChannelSettings.Companion companion2 = WidgetTextChannelSettings.Companion;
-        long g2 = this.$this_configureUI$inlined.getChannel().g();
+        long h2 = this.$this_configureUI$inlined.getChannel().h();
         Context context2 = view.getContext();
         m.checkNotNullExpressionValue(context2, "view.context");
-        companion2.launch(g2, context2);
+        companion2.launch(h2, context2);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.java
index 59829b32f3..f120dc923e 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$6.java
@@ -14,6 +14,6 @@ public final class WidgetChannelsListItemChannelActions$configureUI$6 implements
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelNotificationSettings.Companion.launch$default(WidgetChannelNotificationSettings.Companion, a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().g(), false, 4, null);
+        WidgetChannelNotificationSettings.Companion.launch$default(WidgetChannelNotificationSettings.Companion, a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().h(), false, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.java
index ad3c137f2a..5d9272443e 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$7.java
@@ -27,6 +27,6 @@ public final class WidgetChannelsListItemChannelActions$configureUI$7 extends o
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        StoreStream.Companion.getMessageAck().ack(this.$this_configureUI.getChannel().g(), false, true);
+        StoreStream.Companion.getMessageAck().ack(this.$this_configureUI.getChannel().h(), false, true);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$8.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$8.java
index a10fa713f9..ea2e2a8caa 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$8.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$8.java
@@ -29,6 +29,6 @@ public final class WidgetChannelsListItemChannelActions$configureUI$8 extends o
         m.checkNotNullParameter(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        c.a.d.o.c(context, String.valueOf(this.$this_configureUI.getChannel().g()), 0, 4);
+        c.a.d.o.c(context, String.valueOf(this.$this_configureUI.getChannel().h()), 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
index a050b05f36..00b3d739a8 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java
@@ -21,10 +21,9 @@ import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.threads.ThreadUtils;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.discord.widgets.chat.list.CreateThreadsFeatureFlag;
-import com.discord.widgets.chat.list.ViewThreadsFeatureFlag;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
 import kotlin.jvm.functions.Function0;
@@ -83,9 +82,9 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable h = Observable.h(companion.getChannels().observeChannel(j), companion.getGuilds().observeFromChannelId(j), companion.getPermissions().observePermissionsForChannel(j), companion.getUserGuildSettings().observeGuildSettings(), WidgetChannelsListItemChannelActions$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(h, "Observable\n          .co…            }\n          }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(h).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(h).r();
+                m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -95,7 +94,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
             this.guild = guild;
             this.permissions = l;
             this.isMuted = z2;
-            this.canManageChannel = PermissionUtils.can(16, l) || AnimatableValueParser.p1(channel);
+            this.canManageChannel = PermissionUtils.can(16, l) || AnimatableValueParser.q1(channel);
             this.canCreateInstantInvite = PermissionUtils.can(1, l);
         }
 
@@ -165,7 +164,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
 
         public final CharSequence getMuteChannelText(Context context) {
             m.checkNotNullParameter(context, "context");
-            return this.isMuted ? b.g(context, 2131894063, new Object[0], null, 4) : b.g(context, 2131891296, new Object[]{AnimatableValueParser.A0(this.channel, context, false, 2)}, null, 4);
+            return this.isMuted ? b.g(context, 2131894164, new Object[0], null, 4) : b.g(context, 2131891367, new Object[]{AnimatableValueParser.A0(this.channel, context, false, 2)}, null, 4);
         }
 
         public final int getMuteIconResId(Context context) {
@@ -254,7 +253,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
         textView2.setVisibility(v0 != null ? 0 : 8);
         getBinding().j.setOnClickListener(new WidgetChannelsListItemChannelActions$configureUI$1(this, v0));
         TextView textView3 = getBinding().g;
-        textView3.setVisibility(model.getCanCreateInstantInvite() && AnimatableValueParser.x1(model.getChannel()) ? 0 : 8);
+        textView3.setVisibility(model.getCanCreateInstantInvite() && AnimatableValueParser.y1(model.getChannel()) ? 0 : 8);
         setOnClickAndDismissListener(textView3, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$1(textView3, this, model));
         TextView textView4 = getBinding().i;
         setOnClickAndDismissListener(textView4, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2(textView4, this, model));
@@ -265,15 +264,15 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
         m.checkNotNullExpressionValue(context2, "context");
         textView4.setText(model.getMuteChannelText(context2));
         TextView textView5 = getBinding().k;
-        textView5.setVisibility(ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(model.getChannel().e()) ? 0 : 8);
+        textView5.setVisibility(ThreadUtils.INSTANCE.isThreadsEnabled(model.getChannel().f()) && AnimatableValueParser.A1(model.getChannel()) ? 0 : 8);
         setOnClickAndDismissListener(textView5, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3(textView5, this, model));
-        TextView textView6 = getBinding().f1715c;
+        TextView textView6 = getBinding().f1712c;
         textView6.setVisibility(model.getCanManageChannel() ? 0 : 8);
         setOnClickAndDismissListener(textView6, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4(this, model));
         textView6.setText(getSettingsText(model.getChannel(), model.getCanManageChannel()));
         TextView textView7 = getBinding().b;
         m.checkNotNullExpressionValue(textView7, "binding.channelsListItem…tionsChannelNotifications");
-        if (!AnimatableValueParser.j1(model.getChannel()) && !AnimatableValueParser.f1(model.getChannel())) {
+        if (!AnimatableValueParser.k1(model.getChannel()) && !AnimatableValueParser.f1(model.getChannel())) {
             z2 = false;
         }
         textView7.setVisibility(z2 ? 0 : 8);
@@ -300,7 +299,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
     }
 
     private final String getSettingsText(Channel channel, boolean z2) {
-        String string = getString((!AnimatableValueParser.x1(channel) || !z2) ? (!AnimatableValueParser.x1(channel) || z2) ? AnimatableValueParser.f1(channel) ? 2131888200 : 2131892939 : 2131887326 : 2131888201);
+        String string = getString((!AnimatableValueParser.y1(channel) || !z2) ? (!AnimatableValueParser.y1(channel) || z2) ? AnimatableValueParser.f1(channel) ? 2131888199 : 2131893020 : 2131887326 : 2131888200);
         m.checkNotNullExpressionValue(string, "getString(\n      when {\n…_empty_string\n      }\n  )");
         return string;
     }
@@ -318,7 +317,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558905;
+        return 2131558908;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java
index f3aaac03da..f591396317 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$Model$Companion$get$1.java
@@ -74,6 +74,6 @@ public final class WidgetChannelsListItemThreadActions$Model$Companion$get$1<T,
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.e(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getChannels().observeChannel(channel.q()), companion.getGuilds().observeGuild(channel.e()), companion.getPermissions().observePermissionsForChannel(channel.q()), companion.getUserGuildSettings().observeGuildSettings(), companion.getThreadsJoined().observeJoinedThread(channel.g()), companion.getThreadsActive().observeActiveThreadsForGuild(channel.e()).G(new AnonymousClass1(channel)).s(), new AnonymousClass2(channel));
+        return Observable.e(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getChannels().observeChannel(channel.r()), companion.getGuilds().observeGuild(channel.f()), companion.getPermissions().observePermissionsForChannel(channel.r()), companion.getUserGuildSettings().observeGuildSettings(), companion.getThreadsJoined().observeJoinedThread(channel.h()), companion.getThreadsActive().observeActiveThreadsForGuild(channel.f()).F(new AnonymousClass1(channel)).r(), new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java
index 337b9e43ed..ec0c534590 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$binding$2.java
@@ -19,44 +19,44 @@ public final /* synthetic */ class WidgetChannelsListItemThreadActions$binding$2
 
     public final WidgetChannelsListItemThreadActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362414;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362414);
+        int i = 2131362429;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362429);
         if (linearLayout != null) {
-            i = 2131362415;
-            TextView textView = (TextView) view.findViewById(2131362415);
+            i = 2131362430;
+            TextView textView = (TextView) view.findViewById(2131362430);
             if (textView != null) {
-                i = 2131362416;
-                TextView textView2 = (TextView) view.findViewById(2131362416);
+                i = 2131362431;
+                TextView textView2 = (TextView) view.findViewById(2131362431);
                 if (textView2 != null) {
-                    i = 2131362417;
-                    TextView textView3 = (TextView) view.findViewById(2131362417);
+                    i = 2131362432;
+                    TextView textView3 = (TextView) view.findViewById(2131362432);
                     if (textView3 != null) {
-                        i = 2131362418;
-                        TextView textView4 = (TextView) view.findViewById(2131362418);
+                        i = 2131362433;
+                        TextView textView4 = (TextView) view.findViewById(2131362433);
                         if (textView4 != null) {
-                            i = 2131362419;
-                            View findViewById = view.findViewById(2131362419);
+                            i = 2131362434;
+                            View findViewById = view.findViewById(2131362434);
                             if (findViewById != null) {
-                                i = 2131362420;
-                                View findViewById2 = view.findViewById(2131362420);
+                                i = 2131362435;
+                                View findViewById2 = view.findViewById(2131362435);
                                 if (findViewById2 != null) {
-                                    i = 2131362421;
-                                    TextView textView5 = (TextView) view.findViewById(2131362421);
+                                    i = 2131362436;
+                                    TextView textView5 = (TextView) view.findViewById(2131362436);
                                     if (textView5 != null) {
-                                        i = 2131362422;
-                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362422);
+                                        i = 2131362437;
+                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362437);
                                         if (simpleDraweeView != null) {
-                                            i = 2131362423;
-                                            TextView textView6 = (TextView) view.findViewById(2131362423);
+                                            i = 2131362438;
+                                            TextView textView6 = (TextView) view.findViewById(2131362438);
                                             if (textView6 != null) {
-                                                i = 2131362424;
-                                                TextView textView7 = (TextView) view.findViewById(2131362424);
+                                                i = 2131362439;
+                                                TextView textView7 = (TextView) view.findViewById(2131362439);
                                                 if (textView7 != null) {
-                                                    i = 2131362425;
-                                                    TextView textView8 = (TextView) view.findViewById(2131362425);
+                                                    i = 2131362440;
+                                                    TextView textView8 = (TextView) view.findViewById(2131362440);
                                                     if (textView8 != null) {
-                                                        i = 2131362426;
-                                                        TextView textView9 = (TextView) view.findViewById(2131362426);
+                                                        i = 2131362441;
+                                                        TextView textView9 = (TextView) view.findViewById(2131362441);
                                                         if (textView9 != null) {
                                                             return new WidgetChannelsListItemThreadActionsBinding((NestedScrollView) view, linearLayout, textView, textView2, textView3, textView4, findViewById, findViewById2, textView5, simpleDraweeView, textView6, textView7, textView8, textView9);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$1.java
index d9000fc8b0..ce0524f432 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$1.java
@@ -27,6 +27,6 @@ public final class WidgetChannelsListItemThreadActions$configureUI$1 extends o i
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        StoreStream.Companion.getMessageAck().ack(this.$this_configureUI.getChannel().g(), false, true);
+        StoreStream.Companion.getMessageAck().ack(this.$this_configureUI.getChannel().h(), false, true);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$2.java
index fa96996cb9..b005d62f8f 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$2.java
@@ -14,6 +14,6 @@ public final class WidgetChannelsListItemThreadActions$configureUI$2 implements
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetThreadNotificationSettings.Companion.launch$default(WidgetThreadNotificationSettings.Companion, a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().g(), false, 4, null);
+        WidgetThreadNotificationSettings.Companion.launch$default(WidgetThreadNotificationSettings.Companion, a.T(view, "it", "it.context"), this.$this_configureUI.getChannel().h(), false, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$3.java
index b811284b5b..32cfd8b956 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$3.java
@@ -29,9 +29,9 @@ public final class WidgetChannelsListItemThreadActions$configureUI$3 extends o i
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
         WidgetThreadSettings.Companion companion = WidgetThreadSettings.Companion;
-        long g = this.$this_configureUI.getChannel().g();
+        long h = this.$this_configureUI.getChannel().h();
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        companion.launch(g, context);
+        companion.launch(h, context);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$4.java
index 96b08741ef..e231f9189b 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$4.java
@@ -33,6 +33,6 @@ public final class WidgetChannelsListItemThreadActions$configureUI$4 extends o i
         WidgetThreadArchiveActions.Companion companion = WidgetThreadArchiveActions.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.show(parentFragmentManager, this.$this_configureUI.getChannel().g());
+        companion.show(parentFragmentManager, this.$this_configureUI.getChannel().h(), this.$this_configureUI.getChannel().f());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$7.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$7.java
index 98f7ebb327..7317adf8a7 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$7.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$configureUI$7.java
@@ -29,6 +29,6 @@ public final class WidgetChannelsListItemThreadActions$configureUI$7 extends o i
         m.checkNotNullParameter(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        c.a.d.o.c(context, String.valueOf(this.$this_configureUI.getChannel().g()), 0, 4);
+        c.a.d.o.c(context, String.valueOf(this.$this_configureUI.getChannel().h()), 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java
index 3cea45a9a9..b3e5ee0719 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java
@@ -29,6 +29,6 @@ public final class WidgetChannelsListItemThreadActions$unarchiveThread$1 extends
         Error.Response response = error.getResponse();
         m.checkNotNullExpressionValue(response, "error.response");
         Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode());
-        c.a.d.o.g(this.this$0.getContext(), abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891320, 0, null, 12);
+        c.a.d.o.g(this.this$0.getContext(), abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891391, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
index 08410f787d..64b4b02e80 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java
@@ -87,11 +87,11 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(WidgetChannelsListItemThreadActions$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …        }\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(WidgetChannelsListItemThreadActions$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -284,8 +284,8 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
     }
 
     private final void configureUI(Model model) {
-        ThreadMetadata x2;
-        ThreadMetadata x3;
+        ThreadMetadata y2;
+        ThreadMetadata y3;
         if (model == null) {
             dismiss();
             return;
@@ -320,7 +320,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView4, "binding.channelsListItemThreadActionsEdit");
         setOnClickAndDismissListener(textView4, new WidgetChannelsListItemThreadActions$configureUI$3(model));
         boolean z2 = true;
-        boolean z3 = model.getCanManageThread() && ((x3 = model.getChannel().x()) == null || !x3.b());
+        boolean z3 = model.getCanManageThread() && ((y3 = model.getChannel().y()) == null || !y3.b());
         LinearLayout linearLayout = getBinding().b;
         m.checkNotNullExpressionValue(linearLayout, "binding.channelsListItem…eadActionsArchiveSettings");
         linearLayout.setVisibility(z3 ? 0 : 8);
@@ -328,10 +328,10 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
             ThreadUtils threadUtils = ThreadUtils.INSTANCE;
             Context requireContext2 = requireContext();
             m.checkNotNullExpressionValue(requireContext2, "requireContext()");
-            ThreadMetadata x4 = model.getChannel().x();
-            m.checkNotNull(x4);
-            String autoArchiveDurationName = threadUtils.autoArchiveDurationName(requireContext2, x4.c());
-            TextView textView5 = getBinding().f1716c;
+            ThreadMetadata y4 = model.getChannel().y();
+            m.checkNotNull(y4);
+            String autoArchiveDurationName = threadUtils.autoArchiveDurationName(requireContext2, y4.c());
+            TextView textView5 = getBinding().f1713c;
             m.checkNotNullExpressionValue(textView5, "binding.channelsListItem…sArchiveSettingsSubheader");
             Locale locale = Locale.getDefault();
             m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
@@ -345,7 +345,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
         setOnClickAndDismissListener(linearLayout2, new WidgetChannelsListItemThreadActions$configureUI$4(this, model));
         TextView textView6 = getBinding().m;
         m.checkNotNullExpressionValue(textView6, "binding.channelsListItemThreadActionsUnarchive");
-        textView6.setVisibility(model.getCanUnarchiveThread() && (x2 = model.getChannel().x()) != null && x2.b() ? 0 : 8);
+        textView6.setVisibility(model.getCanUnarchiveThread() && (y2 = model.getChannel().y()) != null && y2.b() ? 0 : 8);
         getBinding().m.setOnClickListener(new WidgetChannelsListItemThreadActions$configureUI$5(this, model));
         TextView textView7 = getBinding().j;
         m.checkNotNullExpressionValue(textView7, "binding.channelsListItemThreadActionsLeave");
@@ -373,7 +373,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
     }
 
     private final void leaveThread(Channel channel) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().leaveThread(channel.g(), "Context Menu"), false, 1, null), this, null, 2, null), getContext(), "REST: leaveThread", (Function1) null, new WidgetChannelsListItemThreadActions$leaveThread$1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().leaveThread(channel.h(), "Context Menu"), false, 1, null), this, null, 2, null), getContext(), "REST: leaveThread", (Function1) null, new WidgetChannelsListItemThreadActions$leaveThread$1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
     }
 
     public static final void show(FragmentManager fragmentManager, long j) {
@@ -381,7 +381,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
     }
 
     private final void unarchiveThread(Channel channel) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(channel.g(), new RestAPIParams.ThreadSettings(Boolean.FALSE, null, 2, null)), false, 1, null), this, null, 2, null), getContext(), "REST: unarchiveThread", (Function1) null, new WidgetChannelsListItemThreadActions$unarchiveThread$2(this), new WidgetChannelsListItemThreadActions$unarchiveThread$1(this), (Function0) null, (Function0) null, 100, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(channel.h(), new RestAPIParams.ThreadSettings(Boolean.FALSE, null, 2, null)), false, 1, null), this, null, 2, null), getContext(), "REST: unarchiveThread", (Function1) null, new WidgetChannelsListItemThreadActions$unarchiveThread$2(this), new WidgetChannelsListItemThreadActions$unarchiveThread$1(this), (Function0) null, (Function0) null, 100, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
@@ -393,7 +393,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558907;
+        return 2131558910;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
index 0a9c658353..8eaae541c6 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java
@@ -50,11 +50,11 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
             super(i, widgetCollapsedUsersListAdapter);
             m.checkNotNullParameter(widgetCollapsedUsersListAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131365598;
-            TextView textView = (TextView) view.findViewById(2131365598);
+            int i2 = 2131365659;
+            TextView textView = (TextView) view.findViewById(2131365659);
             if (textView != null) {
-                i2 = 2131365599;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365599);
+                i2 = 2131365660;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365660);
                 if (simpleDraweeView != null) {
                     WidgetCollapsedVoiceUserListItemBinding widgetCollapsedVoiceUserListItemBinding = new WidgetCollapsedVoiceUserListItemBinding((FrameLayout) view, textView, simpleDraweeView);
                     m.checkNotNullExpressionValue(widgetCollapsedVoiceUserListItemBinding, "WidgetCollapsedVoiceUser…temBinding.bind(itemView)");
@@ -77,14 +77,14 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
                 sb.append(collapsedUser.getExtraCount());
                 ViewExtensions.setTextAndVisibilityBy(textView, sb.toString());
                 MGImages mGImages = MGImages.INSTANCE;
-                SimpleDraweeView simpleDraweeView = this.binding.f1755c;
+                SimpleDraweeView simpleDraweeView = this.binding.f1756c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetCollapsedUserImageview");
-                MGImages.setImage$default(mGImages, simpleDraweeView, 2131231126, (MGImages.ChangeDetector) null, 4, (Object) null);
+                MGImages.setImage$default(mGImages, simpleDraweeView, 2131231131, (MGImages.ChangeDetector) null, 4, (Object) null);
             } else if (!collapsedUser.getEmptySlot()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.widgetCollapsedUserCount");
                 textView2.setVisibility(8);
-                SimpleDraweeView simpleDraweeView2 = this.binding.f1755c;
+                SimpleDraweeView simpleDraweeView2 = this.binding.f1756c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.widgetCollapsedUserImageview");
                 IconUtils.setIcon$default(simpleDraweeView2, collapsedUser.getUser(), 2131165290, null, null, null, 56, null);
             }
@@ -103,6 +103,6 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public MGRecyclerViewHolder<?, CollapsedUser> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        return new WidgetCollapsedUserListItem(2131558976, this);
+        return new WidgetCollapsedUserListItem(2131558980, this);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$Model$Companion$get$1.java
index cc7edaf440..cc811c8a68 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions$Model$Companion$get$1.java
@@ -1,15 +1,16 @@
 package com.discord.widgets.channels.list;
 
 import com.discord.api.channel.Channel;
+import com.discord.models.guild.Guild;
 import com.discord.widgets.channels.list.WidgetThreadArchiveActions;
-import j0.k.b;
+import rx.functions.Func2;
 /* compiled from: WidgetThreadArchiveActions.kt */
-public final class WidgetThreadArchiveActions$Model$Companion$get$1<T, R> implements b<Channel, WidgetThreadArchiveActions.Model> {
+public final class WidgetThreadArchiveActions$Model$Companion$get$1<T1, T2, R> implements Func2<Channel, Guild, WidgetThreadArchiveActions.Model> {
     public static final WidgetThreadArchiveActions$Model$Companion$get$1 INSTANCE = new WidgetThreadArchiveActions$Model$Companion$get$1();
 
-    public final WidgetThreadArchiveActions.Model call(Channel channel) {
+    public final WidgetThreadArchiveActions.Model call(Channel channel, Guild guild) {
         if (channel != null) {
-            return new WidgetThreadArchiveActions.Model(channel);
+            return new WidgetThreadArchiveActions.Model(channel, guild);
         }
         return null;
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
index 1553e453e1..1475c0a453 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java
@@ -9,8 +9,10 @@ import androidx.fragment.app.FragmentManager;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetThreadArchiveActionsSheetBinding;
+import com.discord.models.guild.Guild;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.rest.RestAPI;
@@ -31,6 +33,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetThreadArchiveActions.class, "binding", "getBinding()Lcom/discord/databinding/WidgetThreadArchiveActionsSheetBinding;", 0)};
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_EXTRA_CHANNEL_ID = "INTENT_EXTRA_CHANNEL_ID";
+    private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetThreadArchiveActions$binding$2.INSTANCE, null, 2, null);
 
     /* compiled from: WidgetThreadArchiveActions.kt */
@@ -42,11 +45,12 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
             this();
         }
 
-        public final void show(FragmentManager fragmentManager, long j) {
+        public final void show(FragmentManager fragmentManager, long j, long j2) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             WidgetThreadArchiveActions widgetThreadArchiveActions = new WidgetThreadArchiveActions();
             Bundle bundle = new Bundle();
             bundle.putLong("INTENT_EXTRA_CHANNEL_ID", j);
+            bundle.putLong("INTENT_EXTRA_GUILD_ID", j2);
             widgetThreadArchiveActions.setArguments(bundle);
             widgetThreadArchiveActions.show(fragmentManager, WidgetThreadArchiveActions.class.getName());
         }
@@ -56,6 +60,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
     public static final class Model {
         public static final Companion Companion = new Companion(null);
         private final Channel channel;
+        private final Guild guild;
 
         /* compiled from: WidgetThreadArchiveActions.kt */
         public static final class Companion {
@@ -66,58 +71,80 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
                 this();
             }
 
-            public final Observable<Model> get(long j) {
-                Observable<R> G = StoreStream.Companion.getChannels().observeChannel(j).G(WidgetThreadArchiveActions$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "StoreStream\n            …        }\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(G).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+            public final Observable<Model> get(long j, long j2) {
+                StoreStream.Companion companion = StoreStream.Companion;
+                Observable j3 = Observable.j(companion.getChannels().observeChannel(j), companion.getGuilds().observeGuild(j2), WidgetThreadArchiveActions$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(j3, "Observable.combineLatest…            }\n          }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(j3).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return r;
             }
         }
 
-        public Model(Channel channel) {
+        public Model(Channel channel, Guild guild) {
             m.checkNotNullParameter(channel, "channel");
             this.channel = channel;
+            this.guild = guild;
         }
 
-        public static /* synthetic */ Model copy$default(Model model, Channel channel, int i, Object obj) {
+        public static /* synthetic */ Model copy$default(Model model, Channel channel, Guild guild, int i, Object obj) {
             if ((i & 1) != 0) {
                 channel = model.channel;
             }
-            return model.copy(channel);
+            if ((i & 2) != 0) {
+                guild = model.guild;
+            }
+            return model.copy(channel, guild);
         }
 
         public final Channel component1() {
             return this.channel;
         }
 
-        public final Model copy(Channel channel) {
+        public final Guild component2() {
+            return this.guild;
+        }
+
+        public final Model copy(Channel channel, Guild guild) {
             m.checkNotNullParameter(channel, "channel");
-            return new Model(channel);
+            return new Model(channel, guild);
         }
 
         public boolean equals(Object obj) {
-            if (this != obj) {
-                return (obj instanceof Model) && m.areEqual(this.channel, ((Model) obj).channel);
+            if (this == obj) {
+                return true;
             }
-            return true;
+            if (!(obj instanceof Model)) {
+                return false;
+            }
+            Model model = (Model) obj;
+            return m.areEqual(this.channel, model.channel) && m.areEqual(this.guild, model.guild);
         }
 
         public final Channel getChannel() {
             return this.channel;
         }
 
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
         public int hashCode() {
             Channel channel = this.channel;
-            if (channel != null) {
-                return channel.hashCode();
+            int i = 0;
+            int hashCode = (channel != null ? channel.hashCode() : 0) * 31;
+            Guild guild = this.guild;
+            if (guild != null) {
+                i = guild.hashCode();
             }
-            return 0;
+            return hashCode + i;
         }
 
         public String toString() {
             StringBuilder L = a.L("Model(channel=");
             L.append(this.channel);
+            L.append(", guild=");
+            L.append(this.guild);
             L.append(")");
             return L.toString();
         }
@@ -140,7 +167,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
     }
 
     private final void archiveThread(Channel channel) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(channel.g(), new RestAPIParams.ThreadSettings(Boolean.TRUE, null, 2, null)), false, 1, null), this, null, 2, null), getContext(), "REST: archiveThread", (Function1) null, new WidgetThreadArchiveActions$archiveThread$1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(channel.h(), new RestAPIParams.ThreadSettings(Boolean.TRUE, null, 2, null)), false, 1, null), this, null, 2, null), getContext(), "REST: archiveThread", (Function1) null, new WidgetThreadArchiveActions$archiveThread$1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
     }
 
     private final void configureUI(Model model) {
@@ -151,12 +178,15 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         Channel channel = model.getChannel();
-        LinearLayout linearLayout = getBinding().f1969c;
+        Guild guild = model.getGuild();
+        LinearLayout linearLayout = getBinding().f1973c;
         m.checkNotNullExpressionValue(linearLayout, "binding.autoArchiveHeader");
+        int i = 0;
         linearLayout.setVisibility(0);
         long computeThreadAutoArchiveTimeMs = ThreadUtils.INSTANCE.computeThreadAutoArchiveTimeMs(channel);
         TextView textView = getBinding().h;
         m.checkNotNullExpressionValue(textView, "binding.subtitle");
+        boolean z2 = true;
         textView.setText(b.g(requireContext, 2131886784, new Object[]{TimeUtils.toReadableTimeString$default(requireContext, computeThreadAutoArchiveTimeMs, null, 4, null)}, null, 4));
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.archiveNow");
@@ -165,7 +195,19 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
         getBinding().d.setOnClickListener(new WidgetThreadArchiveActions$configureUI$2(this, channel));
         getBinding().g.setOnClickListener(new WidgetThreadArchiveActions$configureUI$3(this, channel));
         getBinding().f.setOnClickListener(new WidgetThreadArchiveActions$configureUI$4(this, channel));
+        TextView textView3 = getBinding().f;
+        m.checkNotNullExpressionValue(textView3, "binding.optionThreeDays");
+        textView3.setVisibility(guild != null && guild.hasFeature(GuildFeature.THREE_DAY_THREAD_ARCHIVE) ? 0 : 8);
         getBinding().e.setOnClickListener(new WidgetThreadArchiveActions$configureUI$5(this, channel));
+        TextView textView4 = getBinding().e;
+        m.checkNotNullExpressionValue(textView4, "binding.optionOneWeek");
+        if (guild == null || !guild.hasFeature(GuildFeature.SEVEN_DAY_THREAD_ARCHIVE)) {
+            z2 = false;
+        }
+        if (!z2) {
+            i = 8;
+        }
+        textView4.setVisibility(i);
     }
 
     private final WidgetThreadArchiveActionsSheetBinding getBinding() {
@@ -173,23 +215,23 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet {
     }
 
     private final void setAutoArchiveDuration(Channel channel, int i) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(channel.g(), new RestAPIParams.ThreadSettings(null, Integer.valueOf(i), 1, null)), false, 1, null), this, null, 2, null), getContext(), "REST: setAutoArchiveDuration", (Function1) null, new WidgetThreadArchiveActions$setAutoArchiveDuration$1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(channel.h(), new RestAPIParams.ThreadSettings(null, Integer.valueOf(i), 1, null)), false, 1, null), this, null, 2, null), getContext(), "REST: setAutoArchiveDuration", (Function1) null, new WidgetThreadArchiveActions$setAutoArchiveDuration$1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
     }
 
-    public static final void show(FragmentManager fragmentManager, long j) {
-        Companion.show(fragmentManager, j);
+    public static final void show(FragmentManager fragmentManager, long j, long j2) {
+        Companion.show(fragmentManager, j, j2);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
         super.bindSubscriptions(compositeSubscription);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("INTENT_EXTRA_CHANNEL_ID", -1)), this, null, 2, null), WidgetThreadArchiveActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadArchiveActions$bindSubscriptions$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("INTENT_EXTRA_CHANNEL_ID", -1), getArgumentsOrDefault().getLong("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetThreadArchiveActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadArchiveActions$bindSubscriptions$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559245;
+        return 2131559253;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemCategory.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemCategory.java
index 8cef89af3c..8cccba5d18 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemCategory.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemCategory.java
@@ -12,7 +12,7 @@ public final class ChannelListItemCategory implements ChannelListItem {
     private final String key;
     private final int type = 8;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0019: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemCategory A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemCategory.getType():int), (wrap: long : 0x0020: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0019: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemCategory A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemCategory.getType():int), (wrap: long : 0x0020: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemCategory(Channel channel, boolean z2, boolean z3, boolean z4) {
         m.checkNotNullParameter(channel, "channel");
         this.channel = channel;
@@ -21,7 +21,7 @@ public final class ChannelListItemCategory implements ChannelListItem {
         this.canManageChannels = z4;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(channel.g());
+        sb.append(channel.h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java
index 13710adcfe..5716b0975c 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java
@@ -10,14 +10,14 @@ public final class ChannelListItemDirectory implements ChannelListItem {
     private final boolean selected;
     private final int type = 17;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0015: INVOKE  (r0v1 int) = (r2v0 'this' com.discord.widgets.channels.list.items.ChannelListItemDirectory A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemDirectory.getType():int), (wrap: long : 0x001c: INVOKE  (r0v2 long) = (r3v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0015: INVOKE  (r0v1 int) = (r2v0 'this' com.discord.widgets.channels.list.items.ChannelListItemDirectory A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemDirectory.getType():int), (wrap: long : 0x001c: INVOKE  (r0v2 long) = (r3v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemDirectory(Channel channel, boolean z2) {
         m.checkNotNullParameter(channel, "channel");
         this.channel = channel;
         this.selected = z2;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(channel.g());
+        sb.append(channel.h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java
index 469139654f..98f366e95b 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemHeader.java
@@ -7,7 +7,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     private final boolean ableToManageChannel;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2125id;
+    private final long f2132id;
     private final String key;
     private final long selectedGuildId;
     private final int textResId;
@@ -15,7 +15,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0013: INVOKE  (r5v1 int) = (r0v0 'this' com.discord.widgets.channels.list.items.ChannelListItemHeader A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemHeader.getType():int), (r1v0 long), (r3v0 int)] */
     public ChannelListItemHeader(long j, int i, boolean z2, long j2) {
-        this.f2125id = j;
+        this.f2132id = j;
         this.textResId = i;
         this.ableToManageChannel = z2;
         this.selectedGuildId = j2;
@@ -28,7 +28,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
 
     public static /* synthetic */ ChannelListItemHeader copy$default(ChannelListItemHeader channelListItemHeader, long j, int i, boolean z2, long j2, int i2, Object obj) {
         if ((i2 & 1) != 0) {
-            j = channelListItemHeader.f2125id;
+            j = channelListItemHeader.f2132id;
         }
         if ((i2 & 2) != 0) {
             i = channelListItemHeader.textResId;
@@ -43,7 +43,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     }
 
     public final long component1() {
-        return this.f2125id;
+        return this.f2132id;
     }
 
     public final int component2() {
@@ -70,7 +70,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
             return false;
         }
         ChannelListItemHeader channelListItemHeader = (ChannelListItemHeader) obj;
-        return this.f2125id == channelListItemHeader.f2125id && this.textResId == channelListItemHeader.textResId && this.ableToManageChannel == channelListItemHeader.ableToManageChannel && this.selectedGuildId == channelListItemHeader.selectedGuildId;
+        return this.f2132id == channelListItemHeader.f2132id && this.textResId == channelListItemHeader.textResId && this.ableToManageChannel == channelListItemHeader.ableToManageChannel && this.selectedGuildId == channelListItemHeader.selectedGuildId;
     }
 
     public final boolean getAbleToManageChannel() {
@@ -78,7 +78,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     }
 
     public final long getId() {
-        return this.f2125id;
+        return this.f2132id;
     }
 
     @Override // com.discord.widgets.channels.list.items.ChannelListItem, com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -100,7 +100,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
     }
 
     public int hashCode() {
-        int a = ((b.a(this.f2125id) * 31) + this.textResId) * 31;
+        int a = ((b.a(this.f2132id) * 31) + this.textResId) * 31;
         boolean z2 = this.ableToManageChannel;
         if (z2) {
             z2 = true;
@@ -113,7 +113,7 @@ public final class ChannelListItemHeader implements ChannelListItem {
 
     public String toString() {
         StringBuilder L = a.L("ChannelListItemHeader(id=");
-        L.append(this.f2125id);
+        L.append(this.f2132id);
         L.append(", textResId=");
         L.append(this.textResId);
         L.append(", ableToManageChannel=");
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemPrivate.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemPrivate.java
index 85a780191a..eb2fa9c1b0 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemPrivate.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemPrivate.java
@@ -16,7 +16,7 @@ public final class ChannelListItemPrivate implements ChannelListItem, WidgetChan
     private final boolean selected;
     private final int type = 3;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001c: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemPrivate A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemPrivate.getType():int), (wrap: long : 0x0023: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001c: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemPrivate A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemPrivate.getType():int), (wrap: long : 0x0023: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemPrivate(Channel channel, Presence presence, boolean z2, int i, boolean z3, boolean z4) {
         m.checkNotNullParameter(channel, "channel");
         this.channel = channel;
@@ -27,7 +27,7 @@ public final class ChannelListItemPrivate implements ChannelListItem, WidgetChan
         this.muted = z4;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(channel.g());
+        sb.append(channel.h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageActiveEvent.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageActiveEvent.java
index b1cf31b5a7..5e61b21590 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageActiveEvent.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageActiveEvent.java
@@ -10,13 +10,13 @@ public final class ChannelListItemStageActiveEvent implements ChannelListItem {
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0013: INVOKE  (r1v0 int) = (r3v0 'this' com.discord.widgets.channels.list.items.ChannelListItemStageActiveEvent A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemStageActiveEvent.getType():int), (wrap: long : 0x001e: INVOKE  (r1v1 long) = 
       (wrap: com.discord.api.channel.Channel : 0x001a: INVOKE  (r4v1 com.discord.api.channel.Channel) = (r4v0 com.discord.widgets.stage.model.StageChannel) type: VIRTUAL call: com.discord.widgets.stage.model.StageChannel.getChannel():com.discord.api.channel.Channel)
-     type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+     type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemStageActiveEvent(StageChannel stageChannel) {
         m.checkNotNullParameter(stageChannel, "data");
         this.data = stageChannel;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(stageChannel.getChannel().g());
+        sb.append(stageChannel.getChannel().h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageVoiceChannel.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageVoiceChannel.java
index d391dc1201..0fd2680277 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageVoiceChannel.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemStageVoiceChannel.java
@@ -18,7 +18,7 @@ public final class ChannelListItemStageVoiceChannel implements ChannelListItem,
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001f: INVOKE  (r3v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemStageVoiceChannel A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemStageVoiceChannel.getType():int), (wrap: long : 0x002a: INVOKE  (r3v3 long) = 
       (wrap: com.discord.api.channel.Channel : 0x0026: INVOKE  (r3v2 com.discord.api.channel.Channel) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemStageVoiceChannel A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemStageVoiceChannel.getChannel():com.discord.api.channel.Channel)
-     type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+     type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemStageVoiceChannel(Channel channel, boolean z2, Long l, boolean z3, int i, StageInstance stageInstance, boolean z4) {
         m.checkNotNullParameter(channel, "channel");
         this.channel = channel;
@@ -30,7 +30,7 @@ public final class ChannelListItemStageVoiceChannel implements ChannelListItem,
         this.hasSpeakers = z4;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(getChannel().g());
+        sb.append(getChannel().h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.java
index 7c137f6362..0cd49f4025 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemTextChannel.java
@@ -16,7 +16,7 @@ public final class ChannelListItemTextChannel implements ChannelListItem, Widget
     private final boolean selected;
     private final int type;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001b: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemTextChannel A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemTextChannel.getType():int), (wrap: long : 0x0022: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001b: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemTextChannel A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemTextChannel.getType():int), (wrap: long : 0x0022: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemTextChannel(Channel channel, boolean z2, int i, boolean z3, boolean z4, boolean z5, boolean z6) {
         m.checkNotNullParameter(channel, "channel");
         this.channel = channel;
@@ -28,7 +28,7 @@ public final class ChannelListItemTextChannel implements ChannelListItem, Widget
         this.hasActiveThreads = z6;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(channel.g());
+        sb.append(channel.h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemThread.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemThread.java
index b8716f6f27..8771f27109 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemThread.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemThread.java
@@ -16,7 +16,7 @@ public final class ChannelListItemThread implements ChannelListItem, WidgetChann
     private WidgetChannelListModel.ThreadSpineType spineType;
     private final int type = 12;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001b: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemThread A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemThread.getType():int), (wrap: long : 0x0022: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001b: INVOKE  (r4v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemThread A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemThread.getType():int), (wrap: long : 0x0022: INVOKE  (r4v2 long) = (r2v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemThread(Channel channel, boolean z2, int i, boolean z3, boolean z4) {
         m.checkNotNullParameter(channel, "channel");
         this.channel = channel;
@@ -26,7 +26,7 @@ public final class ChannelListItemThread implements ChannelListItem, WidgetChann
         this.isLocked = z4;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(channel.g());
+        sb.append(channel.h());
         this.key = sb.toString();
         this.spineType = WidgetChannelListModel.ThreadSpineType.Single.INSTANCE;
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.java
index ae6b06fc46..99460c9f5c 100644
--- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.java
+++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemVoiceChannel.java
@@ -18,7 +18,7 @@ public final class ChannelListItemVoiceChannel implements ChannelListItem, Chann
 
     /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0023: INVOKE  (r3v1 int) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemVoiceChannel A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemVoiceChannel.getType():int), (wrap: long : 0x002e: INVOKE  (r3v3 long) = 
       (wrap: com.discord.api.channel.Channel : 0x002a: INVOKE  (r3v2 com.discord.api.channel.Channel) = (r1v0 'this' com.discord.widgets.channels.list.items.ChannelListItemVoiceChannel A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemVoiceChannel.getChannel():com.discord.api.channel.Channel)
-     type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */
+     type: VIRTUAL call: com.discord.api.channel.Channel.h():long)] */
     public ChannelListItemVoiceChannel(Channel channel, boolean z2, Long l, int i, boolean z3, boolean z4, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers) {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(guildMaxVideoChannelUsers, "guildMaxVideoChannelUsers");
@@ -31,7 +31,7 @@ public final class ChannelListItemVoiceChannel implements ChannelListItem, Chann
         this.guildMaxVideoChannelUsers = guildMaxVideoChannelUsers;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(getChannel().g());
+        sb.append(getChannel().h());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java
index 7bf531932c..37a6d04c19 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java
@@ -4,7 +4,7 @@ import com.discord.api.channel.Channel;
 import com.discord.models.guild.Guild;
 import com.discord.stores.StoreEmojiCustom;
 import com.discord.stores.StoreGuilds;
-import com.discord.utilities.lazy.memberlist.ChannelMemberList;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
 import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -12,7 +12,7 @@ import java.util.Map;
 import kotlin.NoWhenBranchMatchedException;
 import kotlin.jvm.functions.Function1;
 /* compiled from: GuildMemberListItemGenerator.kt */
-public final class GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1 extends o implements Function1<ChannelMemberList.Row, ChannelMembersListAdapter.Item> {
+public final class GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1 extends o implements Function1<MemberListRow, ChannelMembersListAdapter.Item> {
     public final /* synthetic */ Channel $channel;
     public final /* synthetic */ Guild $guild;
     public final /* synthetic */ Map $guildRoles;
@@ -29,12 +29,12 @@ public final class GuildMemberListItemGeneratorKt$generateGuildMemberListItems$l
         this.$guildRoles = map;
     }
 
-    public final ChannelMembersListAdapter.Item invoke(ChannelMemberList.Row row) {
+    public final ChannelMembersListAdapter.Item invoke(MemberListRow memberListRow) {
         ChannelMembersListAdapter.Item.Header.Type type;
-        m.checkNotNullParameter(row, "row");
-        if (row instanceof ChannelMemberList.Row.StatusHeader) {
-            String rowId = row.getRowId();
-            ChannelMemberList.Row.StatusHeader statusHeader = (ChannelMemberList.Row.StatusHeader) row;
+        m.checkNotNullParameter(memberListRow, "row");
+        if (memberListRow instanceof MemberListRow.StatusHeader) {
+            String rowId = memberListRow.getRowId();
+            MemberListRow.StatusHeader statusHeader = (MemberListRow.StatusHeader) memberListRow;
             int ordinal = statusHeader.getType().ordinal();
             if (ordinal == 0) {
                 type = ChannelMembersListAdapter.Item.Header.Type.ONLINE;
@@ -44,11 +44,14 @@ public final class GuildMemberListItemGeneratorKt$generateGuildMemberListItems$l
                 throw new NoWhenBranchMatchedException();
             }
             return new ChannelMembersListAdapter.Item.Header(rowId, type, statusHeader.getMemberCount());
-        } else if (row instanceof ChannelMemberList.Row.Member) {
-            ChannelMemberList.Row.Member member = (ChannelMemberList.Row.Member) row;
-            return new ChannelMembersListAdapter.Item.Member(member.getUserId(), Long.valueOf(this.$channel.e()), member.getName(), member.isBot(), member.getTagText(), member.getTagVerified(), member.getPresence(), member.getColor(), member.getAvatarUrl(), member.getShowOwnerIndicator(), member.getPremiumSince(), member.isApplicationStreaming(), GuildMemberListItemGeneratorKt.access$calculateCanDisplayStatusEmoji(this.$storeGuilds, this.$storeCustomEmojis, member.getUserId(), this.$guild, this.$channel, member.getPresence(), this.$guildRoles));
-        } else if (row instanceof ChannelMemberList.Row.RoleHeader) {
-            ChannelMemberList.Row.RoleHeader roleHeader = (ChannelMemberList.Row.RoleHeader) row;
+        } else if (memberListRow instanceof MemberListRow.Member) {
+            MemberListRow.Member member = (MemberListRow.Member) memberListRow;
+            boolean access$calculateCanDisplayStatusEmoji = GuildMemberListItemGeneratorKt.access$calculateCanDisplayStatusEmoji(this.$storeGuilds, this.$storeCustomEmojis, member.getUserId(), this.$guild, this.$channel, member.getPresence(), this.$guildRoles);
+            long userId = member.getUserId();
+            Guild guild = this.$guild;
+            return new ChannelMembersListAdapter.Item.Member(userId, guild != null ? Long.valueOf(guild.getId()) : null, member.getName(), member.isBot(), member.getTagText(), member.getTagVerified(), member.getPresence(), member.getColor(), member.getAvatarUrl(), member.getShowOwnerIndicator(), member.getPremiumSince(), member.isApplicationStreaming(), access$calculateCanDisplayStatusEmoji);
+        } else if (memberListRow instanceof MemberListRow.RoleHeader) {
+            MemberListRow.RoleHeader roleHeader = (MemberListRow.RoleHeader) memberListRow;
             return new ChannelMembersListAdapter.Item.RoleHeader(roleHeader.getRoleId(), roleHeader.getRoleName(), roleHeader.getMemberCount());
         } else {
             throw new NoWhenBranchMatchedException();
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java
index 50be4b18c2..ebae6d51d0 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java
@@ -9,7 +9,8 @@ import com.discord.models.presence.Presence;
 import com.discord.stores.StoreEmojiCustom;
 import com.discord.stores.StoreGuilds;
 import com.discord.utilities.collections.SparseMutableList;
-import com.discord.utilities.lazy.memberlist.ChannelMemberList;
+import com.discord.utilities.lazy.memberlist.MemberList;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.presence.PresenceUtils;
 import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel;
@@ -32,11 +33,11 @@ public final class GuildMemberListItemGeneratorKt {
         public static final /* synthetic */ int[] $EnumSwitchMapping$0;
 
         static {
-            ChannelMemberList.Row.StatusHeader.Type.values();
+            MemberListRow.StatusHeader.Type.values();
             int[] iArr = new int[2];
             $EnumSwitchMapping$0 = iArr;
-            iArr[ChannelMemberList.Row.StatusHeader.Type.ONLINE.ordinal()] = 1;
-            iArr[ChannelMemberList.Row.StatusHeader.Type.OFFLINE.ordinal()] = 2;
+            iArr[MemberListRow.StatusHeader.Type.ONLINE.ordinal()] = 1;
+            iArr[MemberListRow.StatusHeader.Type.OFFLINE.ordinal()] = 2;
         }
     }
 
@@ -53,27 +54,27 @@ public final class GuildMemberListItemGeneratorKt {
         ActivityEmoji f;
         String b;
         Long longOrNull;
-        long e = channel.e();
-        if (PermissionUtils.can(262144, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j, channel.e(), guild != null ? guild.getOwnerId() : 0, storeGuilds.getMember(e, j), map, channel.r()))) || presence == null || (customStatusActivity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null || (b = f.b()) == null || (longOrNull = s.toLongOrNull(b)) == null) {
+        long f2 = channel.f();
+        if (PermissionUtils.can(262144, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j, channel.f(), guild != null ? guild.getOwnerId() : 0, storeGuilds.getMember(f2, j), map, channel.s()))) || presence == null || (customStatusActivity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null || (b = f.b()) == null || (longOrNull = s.toLongOrNull(b)) == null) {
             return true;
         }
-        return storeEmojiCustom.getEmojiForGuild(e).get(Long.valueOf(longOrNull.longValue())) != null;
+        return storeEmojiCustom.getEmojiForGuild(f2).get(Long.valueOf(longOrNull.longValue())) != null;
     }
 
-    public static final WidgetChannelMembersListViewModel.MemberList generateGuildMemberListItems(ChannelMemberList channelMemberList, Guild guild, Channel channel, Map<Long, GuildRole> map, boolean z2, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom) {
-        m.checkNotNullParameter(channelMemberList, "channelMemberList");
+    public static final WidgetChannelMembersListViewModel.MemberList generateGuildMemberListItems(MemberList memberList, Guild guild, Channel channel, Map<Long, GuildRole> map, boolean z2, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom) {
+        m.checkNotNullParameter(memberList, "channelMemberList");
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(map, "guildRoles");
         m.checkNotNullParameter(storeGuilds, "storeGuilds");
         m.checkNotNullParameter(storeEmojiCustom, "storeCustomEmojis");
-        SparseMutableList<R> deepCopy = channelMemberList.getRows().deepCopy(new GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1(storeGuilds, storeEmojiCustom, guild, channel, map));
+        SparseMutableList<R> deepCopy = memberList.getRows().deepCopy(new GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1(storeGuilds, storeEmojiCustom, guild, channel, map));
         if ((!deepCopy.isEmpty()) && u.first((List<? extends Object>) deepCopy) == null) {
-            deepCopy.set(0, new ChannelMembersListAdapter.Item.PlaceholderHeader(channelMemberList.getListId()));
+            deepCopy.set(0, new ChannelMembersListAdapter.Item.PlaceholderHeader(memberList.getListId()));
         }
-        SortedMap<Integer, String> groupIndices = channelMemberList.getGroupIndices();
-        int size = channelMemberList.getSize();
+        SortedMap<Integer, String> groupIndices = memberList.getGroupIndices();
+        int size = memberList.getSize();
         if (z2) {
-            deepCopy.add(0, new ChannelMembersListAdapter.Item.AddMember(channelMemberList.getListId(), 2131890556));
+            deepCopy.add(0, new ChannelMembersListAdapter.Item.AddMember(memberList.getListId(), 2131890624));
             LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(groupIndices.size()));
             Iterator<T> it = groupIndices.entrySet().iterator();
             while (it.hasNext()) {
@@ -83,6 +84,6 @@ public final class GuildMemberListItemGeneratorKt {
             groupIndices = g0.toSortedMap(linkedHashMap);
             size++;
         }
-        return new GuildMemberListItems(channelMemberList.getListId(), size, deepCopy, groupIndices);
+        return new GuildMemberListItems(memberList.getListId(), size, deepCopy, groupIndices);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java
index 3c16e2c8d6..77ca4fd588 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java
@@ -27,7 +27,7 @@ public final class PrivateChannelMemberListItemGeneratorKt {
     }
 
     private static final ChannelMembersListAdapter.Item.Member createMemberListItem(User user, Presence presence, boolean z2, String str, boolean z3) {
-        return new ChannelMembersListAdapter.Item.Member(user.getId(), null, str != null ? str : user.getUsername(), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893725 : 2131887051), UserUtils.INSTANCE.isVerifiedBot(user), presence, null, IconUtils.getForUser$default(user, false, null, 6, null), z2, null, z3, true);
+        return new ChannelMembersListAdapter.Item.Member(user.getId(), null, str != null ? str : user.getUsername(), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893822 : 2131887051), UserUtils.INSTANCE.isVerifiedBot(user), presence, null, IconUtils.getForUser$default(user, false, null, 6, null), z2, null, z3, true);
     }
 
     /* JADX WARN: Multi-variable type inference failed */
@@ -63,17 +63,17 @@ public final class PrivateChannelMemberListItemGeneratorKt {
             sb.append(lowerCase);
             sb.append(UserUtils.INSTANCE.getDiscriminatorWithPadding(user));
             String sb2 = sb.toString();
-            List<ChannelRecipientNick> m = channel.m();
+            List<ChannelRecipientNick> n = channel.n();
             String str = null;
-            if (m != null) {
-                Iterator it2 = m.iterator();
+            if (n != null) {
+                Iterator it2 = n.iterator();
                 while (true) {
                     if (!it2.hasNext()) {
                         obj = null;
                         break;
                     }
                     obj = it2.next();
-                    if (((ChannelRecipientNick) obj).a() == user.getId()) {
+                    if (((ChannelRecipientNick) obj).b() == user.getId()) {
                         z3 = true;
                         continue;
                     } else {
@@ -86,10 +86,10 @@ public final class PrivateChannelMemberListItemGeneratorKt {
                 }
                 ChannelRecipientNick channelRecipientNick = (ChannelRecipientNick) obj;
                 if (channelRecipientNick != null) {
-                    str = channelRecipientNick.b();
+                    str = channelRecipientNick.c();
                 }
             }
-            if (channel.p() == user.getId()) {
+            if (channel.q() == user.getId()) {
                 z4 = true;
             }
             treeMap.put(sb2, createMemberListItem(user, (Presence) a.e(user, map2), z4, str, map3.containsKey(Long.valueOf(user.getId()))));
@@ -97,10 +97,10 @@ public final class PrivateChannelMemberListItemGeneratorKt {
         int size = map.size();
         ArrayList arrayList = new ArrayList(size + 1);
         if (z2) {
-            arrayList.add(0, new ChannelMembersListAdapter.Item.AddMember(String.valueOf(channel.g()), AnimatableValueParser.i1(channel) ? 2131889137 : 2131887910));
+            arrayList.add(0, new ChannelMembersListAdapter.Item.AddMember(String.valueOf(channel.h()), AnimatableValueParser.j1(channel) ? 2131889141 : 2131887909));
         }
         arrayList.add(createGroupDmHeader(size));
         arrayList.addAll(treeMap.values());
-        return new PrivateChannelMemberListItems(String.valueOf(channel.g()), arrayList);
+        return new PrivateChannelMemberListItems(String.valueOf(channel.h()), arrayList);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java
index 44fcd44a73..69cdfd794b 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListService.java
@@ -169,8 +169,8 @@ public final class PrivateChannelMemberListService {
 
     public final Observable<State> observeStateForGroupDm(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        Observable<State> Z = Observable.I(this.storeUser.observeMeId().a0(1).d0(5000, TimeUnit.MILLISECONDS), Observable.B(channel.v()).G(PrivateChannelMemberListService$observeStateForGroupDm$1.INSTANCE)).g0().Z(new PrivateChannelMemberListService$observeStateForGroupDm$2(this, channel));
-        m.checkNotNullExpressionValue(Z, "Observable.merge(\n      …            }\n          }");
-        return Z;
+        Observable<State> Y = Observable.H(this.storeUser.observeMeId().Z(1).c0(5000, TimeUnit.MILLISECONDS), Observable.A(channel.w()).F(PrivateChannelMemberListService$observeStateForGroupDm$1.INSTANCE)).f0().Y(new PrivateChannelMemberListService$observeStateForGroupDm$2(this, channel));
+        m.checkNotNullExpressionValue(Y, "Observable.merge(\n      …            }\n          }");
+        return Y;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1.java
new file mode 100644
index 0000000000..f7dc782e93
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1.java
@@ -0,0 +1,12 @@
+package com.discord.widgets.channels.memberlist;
+
+import com.discord.utilities.lazy.memberlist.MemberListRow;
+import java.util.Comparator;
+/* compiled from: ThreadMemberListItemGenerator.kt */
+public final class ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1<T> implements Comparator<MemberListRow.Member> {
+    public static final ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1 INSTANCE = new ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1();
+
+    public final int compare(MemberListRow.Member member, MemberListRow.Member member2) {
+        return member.getName().compareTo(member2.getName());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItemGeneratorKt.java
new file mode 100644
index 0000000000..6b23ef7f23
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItemGeneratorKt.java
@@ -0,0 +1,154 @@
+package com.discord.widgets.channels.memberlist;
+
+import com.discord.api.channel.Channel;
+import com.discord.api.presence.ClientStatus;
+import com.discord.api.role.GuildRole;
+import com.discord.models.domain.ModelApplicationStream;
+import com.discord.models.guild.Guild;
+import com.discord.models.member.GuildMember;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.stores.StoreChannelMembers;
+import com.discord.stores.StoreEmojiCustom;
+import com.discord.stores.StoreGuilds;
+import com.discord.utilities.guilds.RoleUtils;
+import com.discord.utilities.lazy.memberlist.MemberListRow;
+import com.discord.utilities.lazy.memberlist.ThreadMemberList;
+import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel;
+import d0.t.m0;
+import d0.t.u;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+/* compiled from: ThreadMemberListItemGenerator.kt */
+public final class ThreadMemberListItemGeneratorKt {
+    private static final Comparator<MemberListRow.Member> ALPHABETICAL_COMPARATOR = ThreadMemberListItemGeneratorKt$ALPHABETICAL_COMPARATOR$1.INSTANCE;
+
+    public static final ThreadMemberList createThreadMemberList(String str, Map<Long, GuildRole> map, LinkedHashMap<Long, SortedSet<MemberListRow.Member>> linkedHashMap) {
+        String str2;
+        m.checkNotNullParameter(str, "listId");
+        m.checkNotNullParameter(map, "roles");
+        m.checkNotNullParameter(linkedHashMap, "threadMemberMap");
+        int i = 0;
+        ThreadMemberList threadMemberList = new ThreadMemberList(str, 0, 2, null);
+        for (Map.Entry<Long, SortedSet<MemberListRow.Member>> entry : linkedHashMap.entrySet()) {
+            long longValue = entry.getKey().longValue();
+            SortedSet<MemberListRow.Member> value = entry.getValue();
+            if (!value.isEmpty()) {
+                MemberListRow.StatusHeader.Type type = MemberListRow.StatusHeader.Type.ONLINE;
+                if (longValue == type.getId()) {
+                    threadMemberList.add(new MemberListRow.StatusHeader(type.name(), type, value.size()));
+                } else {
+                    MemberListRow.StatusHeader.Type type2 = MemberListRow.StatusHeader.Type.OFFLINE;
+                    if (longValue == type2.getId()) {
+                        threadMemberList.add(new MemberListRow.StatusHeader(type2.name(), type2, value.size()));
+                    } else {
+                        GuildRole guildRole = map.get(Long.valueOf(longValue));
+                        if (guildRole == null || (str2 = guildRole.f()) == null) {
+                            str2 = "";
+                        }
+                        threadMemberList.add(new MemberListRow.RoleHeader(longValue, str2, value.size()));
+                    }
+                }
+                threadMemberList.getGroupIndices().put(Integer.valueOf(i), String.valueOf(longValue));
+                int size = value.size() + 1 + i;
+                for (MemberListRow.Member member : value) {
+                    threadMemberList.add(member);
+                }
+                i = size;
+            }
+        }
+        return threadMemberList;
+    }
+
+    public static final WidgetChannelMembersListViewModel.MemberList generateThreadMemberListItems(Channel channel, Map<Long, GuildRole> map, Guild guild, Map<Long, GuildMember> map2, Map<Long, ? extends User> map3, Map<Long, Presence> map4, Map<Long, ? extends ModelApplicationStream> map5, Set<Long> set, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom) {
+        Map<Long, Presence> map6 = map4;
+        m.checkNotNullParameter(channel, "channel");
+        m.checkNotNullParameter(map, "roles");
+        m.checkNotNullParameter(map2, "guildMembers");
+        m.checkNotNullParameter(map3, "users");
+        m.checkNotNullParameter(map6, "presences");
+        m.checkNotNullParameter(map5, "streams");
+        m.checkNotNullParameter(set, "threadMembers");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
+        m.checkNotNullParameter(storeEmojiCustom, "storeEmojiCustom");
+        if (set.isEmpty()) {
+            return GuildMemberListItemGeneratorKt.generateGuildMemberListItems(new ThreadMemberList(String.valueOf(channel.h()), map2.size()), guild, channel, map, false, storeGuilds, storeEmojiCustom);
+        }
+        LinkedHashMap<Long, SortedSet<MemberListRow.Member>> initializeOrderedMap = initializeOrderedMap(map);
+        for (Number number : set) {
+            long longValue = number.longValue();
+            MemberListRow.Member makeRowMember = StoreChannelMembers.Companion.makeRowMember(longValue, map2, map3, map6.get(Long.valueOf(longValue)), map5.containsKey(Long.valueOf(longValue)), false);
+            if (makeRowMember != null) {
+                insertMemberIntoMap(makeRowMember, map2, map, initializeOrderedMap);
+            }
+            initializeOrderedMap = initializeOrderedMap;
+            map6 = map4;
+        }
+        return GuildMemberListItemGeneratorKt.generateGuildMemberListItems(createThreadMemberList(String.valueOf(channel.h()), map, initializeOrderedMap), guild, channel, map, false, storeGuilds, storeEmojiCustom);
+    }
+
+    public static final Comparator<MemberListRow.Member> getALPHABETICAL_COMPARATOR() {
+        return ALPHABETICAL_COMPARATOR;
+    }
+
+    private static final LinkedHashMap<Long, SortedSet<MemberListRow.Member>> initializeOrderedMap(Map<Long, GuildRole> map) {
+        LinkedHashMap<Long, SortedSet<MemberListRow.Member>> linkedHashMap = new LinkedHashMap<>();
+        Collection<GuildRole> values = map.values();
+        ArrayList arrayList = new ArrayList();
+        for (Object obj : values) {
+            if (((GuildRole) obj).c()) {
+                arrayList.add(obj);
+            }
+        }
+        for (GuildRole guildRole : u.sortedWith(arrayList, RoleUtils.getROLE_COMPARATOR())) {
+            linkedHashMap.put(Long.valueOf(guildRole.getId()), m0.sortedSetOf(ALPHABETICAL_COMPARATOR, new MemberListRow.Member[0]));
+        }
+        Long valueOf = Long.valueOf(MemberListRow.StatusHeader.Type.ONLINE.getId());
+        Comparator<MemberListRow.Member> comparator = ALPHABETICAL_COMPARATOR;
+        linkedHashMap.put(valueOf, m0.sortedSetOf(comparator, new MemberListRow.Member[0]));
+        linkedHashMap.put(Long.valueOf(MemberListRow.StatusHeader.Type.OFFLINE.getId()), m0.sortedSetOf(comparator, new MemberListRow.Member[0]));
+        return linkedHashMap;
+    }
+
+    private static final void insertMemberIntoMap(MemberListRow.Member member, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, LinkedHashMap<Long, SortedSet<MemberListRow.Member>> linkedHashMap) {
+        SortedSet<MemberListRow.Member> sortedSet;
+        GuildMember guildMember = map.get(Long.valueOf(member.getUserId()));
+        Presence presence = member.getPresence();
+        Long l = null;
+        boolean z2 = false;
+        boolean z3 = (presence != null ? presence.getStatus() : null) == null || member.getPresence().getStatus() == ClientStatus.INVISIBLE || member.getPresence().getStatus() == ClientStatus.OFFLINE;
+        if (!((guildMember != null ? Long.valueOf(guildMember.getHoistRoleId()) : null) == null || guildMember.getHoistRoleId() == 0)) {
+            z2 = true;
+        }
+        if (z3) {
+            MemberListRow.StatusHeader.Type type = MemberListRow.StatusHeader.Type.OFFLINE;
+            SortedSet<MemberListRow.Member> sortedSet2 = linkedHashMap.get(Long.valueOf(type.getId()));
+            if (sortedSet2 != null) {
+                sortedSet2.add(member);
+                linkedHashMap.put(Long.valueOf(type.getId()), sortedSet2);
+            }
+        } else if (z2) {
+            if (guildMember != null) {
+                l = Long.valueOf(guildMember.getHoistRoleId());
+            }
+            GuildRole guildRole = map2.get(l);
+            if (!(guildRole == null || (sortedSet = linkedHashMap.get(Long.valueOf(guildRole.getId()))) == null)) {
+                sortedSet.add(member);
+                linkedHashMap.put(Long.valueOf(guildRole.getId()), sortedSet);
+                return;
+            }
+        }
+        MemberListRow.StatusHeader.Type type2 = MemberListRow.StatusHeader.Type.ONLINE;
+        SortedSet<MemberListRow.Member> sortedSet3 = linkedHashMap.get(Long.valueOf(type2.getId()));
+        if (sortedSet3 != null) {
+            sortedSet3.add(member);
+            linkedHashMap.put(Long.valueOf(type2.getId()), sortedSet3);
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItems.java b/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItems.java
new file mode 100644
index 0000000000..4709ca3e50
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/ThreadMemberListItems.java
@@ -0,0 +1,94 @@
+package com.discord.widgets.channels.memberlist;
+
+import c.d.b.a.a;
+import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel;
+import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: ThreadMemberListItemGenerator.kt */
+public final class ThreadMemberListItems implements WidgetChannelMembersListViewModel.MemberList {
+    private final String listId;
+    private final List<ChannelMembersListAdapter.Item> listItems;
+
+    public ThreadMemberListItems(String str, List<ChannelMembersListAdapter.Item> list) {
+        m.checkNotNullParameter(str, "listId");
+        m.checkNotNullParameter(list, "listItems");
+        this.listId = str;
+        this.listItems = list;
+    }
+
+    private final List<ChannelMembersListAdapter.Item> component2() {
+        return this.listItems;
+    }
+
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.channels.memberlist.ThreadMemberListItems */
+    /* JADX WARN: Multi-variable type inference failed */
+    public static /* synthetic */ ThreadMemberListItems copy$default(ThreadMemberListItems threadMemberListItems, String str, List list, int i, Object obj) {
+        if ((i & 1) != 0) {
+            str = threadMemberListItems.getListId();
+        }
+        if ((i & 2) != 0) {
+            list = threadMemberListItems.listItems;
+        }
+        return threadMemberListItems.copy(str, list);
+    }
+
+    public final String component1() {
+        return getListId();
+    }
+
+    public final ThreadMemberListItems copy(String str, List<ChannelMembersListAdapter.Item> list) {
+        m.checkNotNullParameter(str, "listId");
+        m.checkNotNullParameter(list, "listItems");
+        return new ThreadMemberListItems(str, list);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof ThreadMemberListItems)) {
+            return false;
+        }
+        ThreadMemberListItems threadMemberListItems = (ThreadMemberListItems) obj;
+        return m.areEqual(getListId(), threadMemberListItems.getListId()) && m.areEqual(this.listItems, threadMemberListItems.listItems);
+    }
+
+    @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.MemberList
+    public ChannelMembersListAdapter.Item get(int i) {
+        return this.listItems.get(i);
+    }
+
+    @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.MemberList
+    public Integer getHeaderPositionForItem(int i) {
+        return 0;
+    }
+
+    @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.MemberList
+    public String getListId() {
+        return this.listId;
+    }
+
+    @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.MemberList
+    public int getSize() {
+        return this.listItems.size();
+    }
+
+    public int hashCode() {
+        String listId = getListId();
+        int i = 0;
+        int hashCode = (listId != null ? listId.hashCode() : 0) * 31;
+        List<ChannelMembersListAdapter.Item> list = this.listItems;
+        if (list != null) {
+            i = list.hashCode();
+        }
+        return hashCode + i;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ThreadMemberListItems(listId=");
+        L.append(getListId());
+        L.append(", listItems=");
+        return a.E(L, this.listItems, ")");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.java
index 281bafdc3f..94a80ec1c3 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$1.java
@@ -29,9 +29,9 @@ public final class WidgetChannelMembersList$configureLoadedUI$1 extends o implem
 
     public final void invoke(long j) {
         WidgetUserSheet.Companion companion = WidgetUserSheet.Companion;
-        Long valueOf = Long.valueOf(this.$viewState.getChannel().g());
+        Long valueOf = Long.valueOf(this.$viewState.getChannel().h());
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetUserSheet.Companion.show$default(companion, j, valueOf, parentFragmentManager, Long.valueOf(this.$viewState.getChannel().e()), null, null, null, 112, null);
+        WidgetUserSheet.Companion.show$default(companion, j, valueOf, parentFragmentManager, Long.valueOf(this.$viewState.getChannel().f()), null, null, null, 112, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
index 50d46d7c5e..a4d220540a 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.java
@@ -49,7 +49,7 @@ public final class WidgetChannelMembersList extends AppFragment {
 
     /* compiled from: WidgetChannelMembersList.kt */
     public static final class RxOnScrollListener extends RecyclerView.OnScrollListener {
-        private final PublishSubject<Unit> scrollYSubject = PublishSubject.l0();
+        private final PublishSubject<Unit> scrollYSubject = PublishSubject.k0();
 
         public final Observable<Unit> observeScrollChanges() {
             PublishSubject<Unit> publishSubject = this.scrollYSubject;
@@ -67,7 +67,7 @@ public final class WidgetChannelMembersList extends AppFragment {
     }
 
     public WidgetChannelMembersList() {
-        super(2131558865);
+        super(2131558868);
         WidgetChannelMembersList$viewModel$2 widgetChannelMembersList$viewModel$2 = WidgetChannelMembersList$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelMembersListViewModel.class), new WidgetChannelMembersList$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelMembersList$viewModel$2));
@@ -150,7 +150,7 @@ public final class WidgetChannelMembersList extends AppFragment {
             RecyclerView.LayoutManager layoutManager = getRecycler().getLayoutManager();
             Objects.requireNonNull(layoutManager, "null cannot be cast to non-null type androidx.recyclerview.widget.LinearLayoutManager");
             LinearLayoutManager linearLayoutManager = (LinearLayoutManager) layoutManager;
-            getViewModel().updateSubscriptions(new IntRange(f.coerceAtLeast(linearLayoutManager.findFirstVisibleItemPosition() - height, 0), linearLayoutManager.findLastVisibleItemPosition() + height));
+            getViewModel().updateSubscriptionsForChannel(new IntRange(f.coerceAtLeast(linearLayoutManager.findFirstVisibleItemPosition() - height, 0), linearLayoutManager.findLastVisibleItemPosition() + height));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java
index 45130820f4..079b7c4e87 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java
@@ -3,10 +3,19 @@ package com.discord.widgets.channels.memberlist;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
+import com.discord.models.domain.ModelApplicationStream;
 import com.discord.models.guild.Guild;
+import com.discord.models.member.GuildMember;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.stores.StoreApplicationStreaming;
 import com.discord.stores.StoreChannelMembers;
+import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StorePermissions;
+import com.discord.stores.StoreThreadMembers;
+import com.discord.stores.StoreUser;
+import com.discord.stores.StoreUserPresence;
 import com.discord.stores.StoreUserRelationships;
 import com.discord.utilities.lazy.memberlist.ChannelMemberList;
 import com.discord.widgets.channels.memberlist.PrivateChannelMemberListService;
@@ -14,24 +23,42 @@ import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel
 import d0.z.d.m;
 import j0.k.b;
 import java.util.Map;
+import java.util.Set;
 import rx.Observable;
 import rx.functions.Func2;
 import rx.functions.Func5;
+import rx.functions.Func8;
 /* compiled from: WidgetChannelMembersListViewModel.kt */
 public final class WidgetChannelMembersListViewModel$Companion$observeStoreState$1<T, R> implements b<Channel, Observable<? extends WidgetChannelMembersListViewModel.StoreState>> {
     public final /* synthetic */ Observable $isPanelOpenObservable;
     public final /* synthetic */ PrivateChannelMemberListService $privateChannelMemberListService;
+    public final /* synthetic */ StoreApplicationStreaming $storeApplicationStreaming;
     public final /* synthetic */ StoreChannelMembers $storeChannelMembers;
+    public final /* synthetic */ StoreChannels $storeChannels;
     public final /* synthetic */ StoreGuilds $storeGuilds;
     public final /* synthetic */ StorePermissions $storePermissions;
+    public final /* synthetic */ StoreUserPresence $storePresence;
+    public final /* synthetic */ StoreThreadMembers $storeThreadMembers;
+    public final /* synthetic */ StoreUser $storeUser;
     public final /* synthetic */ StoreUserRelationships $storeUserRelationships;
 
     /* compiled from: WidgetChannelMembersListViewModel.kt */
     /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$1  reason: invalid class name */
-    public static final class AnonymousClass1<T1, T2, R> implements Func2<PrivateChannelMemberListService.State, Boolean, WidgetChannelMembersListViewModel.StoreState.Private> {
+    public static final class AnonymousClass1<T, R> implements b<Boolean, WidgetChannelMembersListViewModel.StoreState.None> {
+        public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
+
+        public final WidgetChannelMembersListViewModel.StoreState.None call(Boolean bool) {
+            m.checkNotNullExpressionValue(bool, "isPanelOpen");
+            return new WidgetChannelMembersListViewModel.StoreState.None(bool.booleanValue());
+        }
+    }
+
+    /* compiled from: WidgetChannelMembersListViewModel.kt */
+    /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$2  reason: invalid class name */
+    public static final class AnonymousClass2<T1, T2, R> implements Func2<PrivateChannelMemberListService.State, Boolean, WidgetChannelMembersListViewModel.StoreState.Private> {
         public final /* synthetic */ WidgetChannelMembersListViewModel$Companion$observeStoreState$1 this$0;
 
-        public AnonymousClass1(WidgetChannelMembersListViewModel$Companion$observeStoreState$1 widgetChannelMembersListViewModel$Companion$observeStoreState$1) {
+        public AnonymousClass2(WidgetChannelMembersListViewModel$Companion$observeStoreState$1 widgetChannelMembersListViewModel$Companion$observeStoreState$1) {
             this.this$0 = widgetChannelMembersListViewModel$Companion$observeStoreState$1;
         }
 
@@ -42,11 +69,105 @@ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState
     }
 
     /* compiled from: WidgetChannelMembersListViewModel.kt */
-    /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$2  reason: invalid class name */
-    public static final class AnonymousClass2<T1, T2, T3, T4, T5, R> implements Func5<Guild, Map<Long, ? extends GuildRole>, Long, ChannelMemberList, Boolean, WidgetChannelMembersListViewModel.StoreState.Guild> {
+    /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$3  reason: invalid class name */
+    public static final class AnonymousClass3<T, R> implements b<Channel, Observable<? extends WidgetChannelMembersListViewModel.StoreState>> {
+        public final /* synthetic */ Channel $channel;
+        public final /* synthetic */ WidgetChannelMembersListViewModel$Companion$observeStoreState$1 this$0;
+
+        /* compiled from: WidgetChannelMembersListViewModel.kt */
+        /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$3$1  reason: invalid class name */
+        public static final class AnonymousClass1<T, R> implements b<Boolean, WidgetChannelMembersListViewModel.StoreState.None> {
+            public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
+
+            public final WidgetChannelMembersListViewModel.StoreState.None call(Boolean bool) {
+                m.checkNotNullExpressionValue(bool, "isPanelOpen");
+                return new WidgetChannelMembersListViewModel.StoreState.None(bool.booleanValue());
+            }
+        }
+
+        /* compiled from: WidgetChannelMembersListViewModel.kt */
+        /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$3$2  reason: invalid class name */
+        public static final class AnonymousClass2<T1, T2, T3, T4, T5, R> implements Func5<Long, ChannelMemberList, Boolean, Map<Long, ? extends GuildRole>, Guild, WidgetChannelMembersListViewModel.StoreState.Guild> {
+            public final /* synthetic */ Channel $parentChannel;
+
+            public AnonymousClass2(Channel channel) {
+                this.$parentChannel = channel;
+            }
+
+            public final WidgetChannelMembersListViewModel.StoreState.Guild call(Long l, ChannelMemberList channelMemberList, Boolean bool, Map<Long, GuildRole> map, Guild guild) {
+                m.checkNotNullExpressionValue(bool, "isPanelOpen");
+                boolean booleanValue = bool.booleanValue();
+                Channel channel = this.$parentChannel;
+                m.checkNotNullExpressionValue(channelMemberList, "channelMemberList");
+                m.checkNotNullExpressionValue(map, "roles");
+                return new WidgetChannelMembersListViewModel.StoreState.Guild(booleanValue, channel, guild, channelMemberList, l, map);
+            }
+
+            /* Return type fixed from 'java.lang.Object' to match base method */
+            /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+            @Override // rx.functions.Func5
+            public /* bridge */ /* synthetic */ WidgetChannelMembersListViewModel.StoreState.Guild call(Long l, ChannelMemberList channelMemberList, Boolean bool, Map<Long, ? extends GuildRole> map, Guild guild) {
+                return call(l, channelMemberList, bool, (Map<Long, GuildRole>) map, guild);
+            }
+        }
+
+        /* compiled from: WidgetChannelMembersListViewModel.kt */
+        /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$3$3  reason: invalid class name */
+        public static final class AnonymousClass3<T1, T2, T3, T4, T5, T6, T7, T8, R> implements Func8<Set<? extends Long>, Boolean, Map<Long, ? extends GuildRole>, Map<Long, ? extends GuildMember>, Guild, Map<Long, ? extends User>, Map<Long, ? extends Presence>, Map<Long, ? extends ModelApplicationStream>, WidgetChannelMembersListViewModel.StoreState.Thread> {
+            public final /* synthetic */ AnonymousClass3 this$0;
+
+            public AnonymousClass3(AnonymousClass3 r1) {
+                this.this$0 = r1;
+            }
+
+            public final WidgetChannelMembersListViewModel.StoreState.Thread call(Set<Long> set, Boolean bool, Map<Long, GuildRole> map, Map<Long, GuildMember> map2, Guild guild, Map<Long, ? extends User> map3, Map<Long, Presence> map4, Map<Long, ? extends ModelApplicationStream> map5) {
+                m.checkNotNullExpressionValue(bool, "isPanelOpen");
+                boolean booleanValue = bool.booleanValue();
+                Channel channel = this.this$0.$channel;
+                m.checkNotNullExpressionValue(map, "roles");
+                m.checkNotNullExpressionValue(map2, "guildMembers");
+                m.checkNotNullExpressionValue(map3, "users");
+                m.checkNotNullExpressionValue(map4, "presences");
+                m.checkNotNullExpressionValue(map5, "streams");
+                m.checkNotNullExpressionValue(set, "threadMembers");
+                return new WidgetChannelMembersListViewModel.StoreState.Thread(booleanValue, channel, guild, map, map2, map3, map4, map5, set);
+            }
+
+            /* Return type fixed from 'java.lang.Object' to match base method */
+            /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+            @Override // rx.functions.Func8
+            public /* bridge */ /* synthetic */ WidgetChannelMembersListViewModel.StoreState.Thread call(Set<? extends Long> set, Boolean bool, Map<Long, ? extends GuildRole> map, Map<Long, ? extends GuildMember> map2, Guild guild, Map<Long, ? extends User> map3, Map<Long, ? extends Presence> map4, Map<Long, ? extends ModelApplicationStream> map5) {
+                return call((Set<Long>) set, bool, (Map<Long, GuildRole>) map, (Map<Long, GuildMember>) map2, guild, map3, (Map<Long, Presence>) map4, map5);
+            }
+        }
+
+        public AnonymousClass3(WidgetChannelMembersListViewModel$Companion$observeStoreState$1 widgetChannelMembersListViewModel$Companion$observeStoreState$1, Channel channel) {
+            this.this$0 = widgetChannelMembersListViewModel$Companion$observeStoreState$1;
+            this.$channel = channel;
+        }
+
+        public final Observable<? extends WidgetChannelMembersListViewModel.StoreState> call(Channel channel) {
+            if (channel == null) {
+                return this.this$0.$isPanelOpenObservable.F(AnonymousClass1.INSTANCE);
+            }
+            if (AnimatableValueParser.d1(channel)) {
+                Observable<Long> observePermissionsForChannel = this.this$0.$storePermissions.observePermissionsForChannel(channel.h());
+                Observable<ChannelMemberList> observeChannelMemberList = this.this$0.$storeChannelMembers.observeChannelMemberList(channel.f(), channel.h());
+                WidgetChannelMembersListViewModel$Companion$observeStoreState$1 widgetChannelMembersListViewModel$Companion$observeStoreState$1 = this.this$0;
+                return Observable.g(observePermissionsForChannel, observeChannelMemberList, widgetChannelMembersListViewModel$Companion$observeStoreState$1.$isPanelOpenObservable, widgetChannelMembersListViewModel$Companion$observeStoreState$1.$storeGuilds.observeRoles(this.$channel.f()), this.this$0.$storeGuilds.observeGuild(this.$channel.f()), new AnonymousClass2(channel));
+            }
+            Observable<Set<Long>> observeThreadMembers = this.this$0.$storeThreadMembers.observeThreadMembers(this.$channel.h());
+            WidgetChannelMembersListViewModel$Companion$observeStoreState$1 widgetChannelMembersListViewModel$Companion$observeStoreState$12 = this.this$0;
+            return Observable.d(observeThreadMembers, widgetChannelMembersListViewModel$Companion$observeStoreState$12.$isPanelOpenObservable, widgetChannelMembersListViewModel$Companion$observeStoreState$12.$storeGuilds.observeRoles(this.$channel.f()), this.this$0.$storeGuilds.observeGuildMembers(this.$channel.f()), this.this$0.$storeGuilds.observeGuild(this.$channel.f()), this.this$0.$storeUser.observeAllUsers(), this.this$0.$storePresence.observeAllPresences(), this.this$0.$storeApplicationStreaming.observeStreamsByUser(), new AnonymousClass3(this));
+        }
+    }
+
+    /* compiled from: WidgetChannelMembersListViewModel.kt */
+    /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$4  reason: invalid class name */
+    public static final class AnonymousClass4<T1, T2, T3, T4, T5, R> implements Func5<Guild, Map<Long, ? extends GuildRole>, Long, ChannelMemberList, Boolean, WidgetChannelMembersListViewModel.StoreState.Guild> {
         public final /* synthetic */ Channel $channel;
 
-        public AnonymousClass2(Channel channel) {
+        public AnonymousClass4(Channel channel) {
             this.$channel = channel;
         }
 
@@ -67,27 +188,21 @@ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState
         }
     }
 
-    /* compiled from: WidgetChannelMembersListViewModel.kt */
-    /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$3  reason: invalid class name */
-    public static final class AnonymousClass3<T, R> implements b<Boolean, WidgetChannelMembersListViewModel.StoreState.None> {
-        public static final AnonymousClass3 INSTANCE = new AnonymousClass3();
-
-        public final WidgetChannelMembersListViewModel.StoreState.None call(Boolean bool) {
-            m.checkNotNullExpressionValue(bool, "isPanelOpen");
-            return new WidgetChannelMembersListViewModel.StoreState.None(bool.booleanValue());
-        }
-    }
-
-    public WidgetChannelMembersListViewModel$Companion$observeStoreState$1(PrivateChannelMemberListService privateChannelMemberListService, Observable observable, StoreUserRelationships storeUserRelationships, StoreGuilds storeGuilds, StorePermissions storePermissions, StoreChannelMembers storeChannelMembers) {
-        this.$privateChannelMemberListService = privateChannelMemberListService;
+    public WidgetChannelMembersListViewModel$Companion$observeStoreState$1(Observable observable, PrivateChannelMemberListService privateChannelMemberListService, StoreUserRelationships storeUserRelationships, StoreChannels storeChannels, StorePermissions storePermissions, StoreChannelMembers storeChannelMembers, StoreGuilds storeGuilds, StoreThreadMembers storeThreadMembers, StoreUser storeUser, StoreUserPresence storeUserPresence, StoreApplicationStreaming storeApplicationStreaming) {
         this.$isPanelOpenObservable = observable;
+        this.$privateChannelMemberListService = privateChannelMemberListService;
         this.$storeUserRelationships = storeUserRelationships;
-        this.$storeGuilds = storeGuilds;
+        this.$storeChannels = storeChannels;
         this.$storePermissions = storePermissions;
         this.$storeChannelMembers = storeChannelMembers;
+        this.$storeGuilds = storeGuilds;
+        this.$storeThreadMembers = storeThreadMembers;
+        this.$storeUser = storeUser;
+        this.$storePresence = storeUserPresence;
+        this.$storeApplicationStreaming = storeApplicationStreaming;
     }
 
     public final Observable<? extends WidgetChannelMembersListViewModel.StoreState> call(Channel channel) {
-        return (channel == null || !AnimatableValueParser.r1(channel)) ? channel != null ? Observable.g(this.$storeGuilds.observeGuild(channel.e()), this.$storeGuilds.observeRoles(channel.e()), this.$storePermissions.observePermissionsForChannel(channel.g()), this.$storeChannelMembers.observeChannelMemberList(channel.e(), channel.g()), this.$isPanelOpenObservable, new AnonymousClass2(channel)) : this.$isPanelOpenObservable.G(AnonymousClass3.INSTANCE) : Observable.j(this.$privateChannelMemberListService.observeStateForGroupDm(channel), this.$isPanelOpenObservable, new AnonymousClass1(this));
+        return channel == null ? this.$isPanelOpenObservable.F(AnonymousClass1.INSTANCE) : AnimatableValueParser.s1(channel) ? Observable.j(this.$privateChannelMemberListService.observeStateForGroupDm(channel), this.$isPanelOpenObservable, new AnonymousClass2(this)) : AnimatableValueParser.z1(channel) ? this.$storeChannels.observeChannel(channel.r()).Y(new AnonymousClass3(this, channel)) : Observable.g(this.$storeGuilds.observeGuild(channel.f()), this.$storeGuilds.observeRoles(channel.f()), this.$storePermissions.observePermissionsForChannel(channel.h()), this.$storeChannelMembers.observeChannelMemberList(channel.f(), channel.h()), this.$isPanelOpenObservable, new AnonymousClass4(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java
index 7b1bae0119..40cbc43e51 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java
@@ -9,15 +9,21 @@ import com.discord.api.role.GuildRole;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelApplicationStream;
 import com.discord.models.domain.ModelUserRelationship;
+import com.discord.models.member.GuildMember;
 import com.discord.models.presence.Presence;
 import com.discord.models.user.User;
+import com.discord.stores.StoreApplicationStreaming;
 import com.discord.stores.StoreChannelMembers;
+import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreChannelsSelected;
 import com.discord.stores.StoreEmojiCustom;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreNavigation;
 import com.discord.stores.StorePermissions;
 import com.discord.stores.StoreStream;
+import com.discord.stores.StoreThreadMembers;
+import com.discord.stores.StoreUser;
+import com.discord.stores.StoreUserPresence;
 import com.discord.stores.StoreUserRelationships;
 import com.discord.utilities.lazy.memberlist.ChannelMemberList;
 import com.discord.utilities.permissions.PermissionUtils;
@@ -26,6 +32,7 @@ import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Map;
+import java.util.Set;
 import kotlin.NoWhenBranchMatchedException;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -38,18 +45,24 @@ import rx.subjects.PublishSubject;
 public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewState> {
     public static final Companion Companion = new Companion(null);
     private final PublishSubject<Event> eventSubject;
-    private final GuildChannelRangeSubscriber guildChannelRangeSubscriber;
+    private final GuildChannelSubscriber guildChannelSubscriber;
     private final StoreEmojiCustom storeCustomEmojis;
     private final StoreGuilds storeGuilds;
 
     /* compiled from: WidgetChannelMembersListViewModel.kt */
     /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$1  reason: invalid class name */
-    public static final class AnonymousClass1 implements GuildChannelRangeSubscriber {
-        @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.GuildChannelRangeSubscriber
-        public void subscribeToRange(Channel channel, IntRange intRange) {
+    public static final class AnonymousClass1 implements GuildChannelSubscriber {
+        @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.GuildChannelSubscriber
+        public void subscribeToChannelRange(Channel channel, IntRange intRange) {
             m.checkNotNullParameter(channel, "channel");
             m.checkNotNullParameter(intRange, "range");
-            StoreStream.Companion.getGuildSubscriptions().subscribeChannelRange(channel.e(), channel.g(), intRange);
+            StoreStream.Companion.getGuildSubscriptions().subscribeChannelRange(channel.f(), channel.h(), intRange);
+        }
+
+        @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.GuildChannelSubscriber
+        public void subscribeToThread(Channel channel) {
+            m.checkNotNullParameter(channel, "channel");
+            StoreStream.Companion.getGuildSubscriptions().subscribeThread(channel.f(), channel.h());
         }
     }
 
@@ -87,14 +100,14 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
             this();
         }
 
-        private final Observable<StoreState> observeStoreState(StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships) {
-            Observable<R> Z = storeChannelsSelected.observeSelectedChannel().Z(new WidgetChannelMembersListViewModel$Companion$observeStoreState$1(privateChannelMemberListService, storeNavigation.observeRightPanelState().G(WidgetChannelMembersListViewModel$Companion$observeStoreState$isPanelOpenObservable$1.INSTANCE), storeUserRelationships, storeGuilds, storePermissions, storeChannelMembers));
-            m.checkNotNullExpressionValue(Z, "storeChannelsSelected\n  …            }\n          }");
-            return Z;
+        private final Observable<StoreState> observeStoreState(StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreThreadMembers storeThreadMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, StoreChannels storeChannels, StoreUser storeUser, StoreUserPresence storeUserPresence, StoreApplicationStreaming storeApplicationStreaming) {
+            Observable<R> Y = storeChannelsSelected.observeSelectedChannel().Y(new WidgetChannelMembersListViewModel$Companion$observeStoreState$1(storeNavigation.observeRightPanelState().F(WidgetChannelMembersListViewModel$Companion$observeStoreState$isPanelOpenObservable$1.INSTANCE), privateChannelMemberListService, storeUserRelationships, storeChannels, storePermissions, storeChannelMembers, storeGuilds, storeThreadMembers, storeUser, storeUserPresence, storeApplicationStreaming));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected\n  …            }\n          }");
+            return Y;
         }
 
-        public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, int i, Object obj) {
-            return companion.observeStoreState((i & 1) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 2) != 0 ? StoreStream.Companion.getChannelMembers() : storeChannelMembers, (i & 4) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 8) != 0 ? StoreStream.Companion.getNavigation() : storeNavigation, (i & 16) != 0 ? new PrivateChannelMemberListService(null, null, null, 7, null) : privateChannelMemberListService, (i & 32) != 0 ? StoreStream.Companion.getPermissions() : storePermissions, (i & 64) != 0 ? StoreStream.Companion.getUserRelationships() : storeUserRelationships);
+        public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreThreadMembers storeThreadMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, StoreChannels storeChannels, StoreUser storeUser, StoreUserPresence storeUserPresence, StoreApplicationStreaming storeApplicationStreaming, int i, Object obj) {
+            return companion.observeStoreState((i & 1) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 2) != 0 ? StoreStream.Companion.getChannelMembers() : storeChannelMembers, (i & 4) != 0 ? StoreStream.Companion.getThreadMembers() : storeThreadMembers, (i & 8) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 16) != 0 ? StoreStream.Companion.getNavigation() : storeNavigation, (i & 32) != 0 ? new PrivateChannelMemberListService(null, null, null, 7, null) : privateChannelMemberListService, (i & 64) != 0 ? StoreStream.Companion.getPermissions() : storePermissions, (i & 128) != 0 ? StoreStream.Companion.getUserRelationships() : storeUserRelationships, (i & 256) != 0 ? StoreStream.Companion.getChannels() : storeChannels, (i & 512) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 1024) != 0 ? StoreStream.Companion.getPresences() : storeUserPresence, (i & 2048) != 0 ? StoreStream.Companion.getApplicationStreaming() : storeApplicationStreaming);
         }
     }
 
@@ -128,8 +141,10 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
     }
 
     /* compiled from: WidgetChannelMembersListViewModel.kt */
-    public interface GuildChannelRangeSubscriber {
-        void subscribeToRange(Channel channel, IntRange intRange);
+    public interface GuildChannelSubscriber {
+        void subscribeToChannelRange(Channel channel, IntRange intRange);
+
+        void subscribeToThread(Channel channel);
     }
 
     /* compiled from: WidgetChannelMembersListViewModel.kt */
@@ -534,6 +549,197 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
             }
         }
 
+        /* compiled from: WidgetChannelMembersListViewModel.kt */
+        public static final class Thread extends StoreState {
+            private final Channel channel;
+            private final com.discord.models.guild.Guild guild;
+            private final Map<Long, GuildMember> guildMembers;
+            private final boolean isPanelOpen;
+            private final Map<Long, Presence> presences;
+            private final Map<Long, GuildRole> roles;
+            private final Map<Long, ModelApplicationStream> streams;
+            private final Set<Long> threadMembers;
+            private final Map<Long, User> users;
+
+            /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.Map<java.lang.Long, ? extends com.discord.models.user.User> */
+            /* JADX DEBUG: Multi-variable search result rejected for r9v0, resolved type: java.util.Map<java.lang.Long, ? extends com.discord.models.domain.ModelApplicationStream> */
+            /* JADX WARN: Multi-variable type inference failed */
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public Thread(boolean z2, Channel channel, com.discord.models.guild.Guild guild, Map<Long, GuildRole> map, Map<Long, GuildMember> map2, Map<Long, ? extends User> map3, Map<Long, Presence> map4, Map<Long, ? extends ModelApplicationStream> map5, Set<Long> set) {
+                super(z2, channel, null);
+                m.checkNotNullParameter(channel, "channel");
+                m.checkNotNullParameter(map, "roles");
+                m.checkNotNullParameter(map2, "guildMembers");
+                m.checkNotNullParameter(map3, "users");
+                m.checkNotNullParameter(map4, "presences");
+                m.checkNotNullParameter(map5, "streams");
+                m.checkNotNullParameter(set, "threadMembers");
+                this.isPanelOpen = z2;
+                this.channel = channel;
+                this.guild = guild;
+                this.roles = map;
+                this.guildMembers = map2;
+                this.users = map3;
+                this.presences = map4;
+                this.streams = map5;
+                this.threadMembers = set;
+            }
+
+            public static /* synthetic */ Thread copy$default(Thread thread, boolean z2, Channel channel, com.discord.models.guild.Guild guild, Map map, Map map2, Map map3, Map map4, Map map5, Set set, int i, Object obj) {
+                return thread.copy((i & 1) != 0 ? thread.isPanelOpen() : z2, (i & 2) != 0 ? thread.getChannel() : channel, (i & 4) != 0 ? thread.guild : guild, (i & 8) != 0 ? thread.roles : map, (i & 16) != 0 ? thread.guildMembers : map2, (i & 32) != 0 ? thread.users : map3, (i & 64) != 0 ? thread.presences : map4, (i & 128) != 0 ? thread.streams : map5, (i & 256) != 0 ? thread.threadMembers : set);
+            }
+
+            public final boolean component1() {
+                return isPanelOpen();
+            }
+
+            public final Channel component2() {
+                return getChannel();
+            }
+
+            public final com.discord.models.guild.Guild component3() {
+                return this.guild;
+            }
+
+            public final Map<Long, GuildRole> component4() {
+                return this.roles;
+            }
+
+            public final Map<Long, GuildMember> component5() {
+                return this.guildMembers;
+            }
+
+            public final Map<Long, User> component6() {
+                return this.users;
+            }
+
+            public final Map<Long, Presence> component7() {
+                return this.presences;
+            }
+
+            public final Map<Long, ModelApplicationStream> component8() {
+                return this.streams;
+            }
+
+            public final Set<Long> component9() {
+                return this.threadMembers;
+            }
+
+            public final Thread copy(boolean z2, Channel channel, com.discord.models.guild.Guild guild, Map<Long, GuildRole> map, Map<Long, GuildMember> map2, Map<Long, ? extends User> map3, Map<Long, Presence> map4, Map<Long, ? extends ModelApplicationStream> map5, Set<Long> set) {
+                m.checkNotNullParameter(channel, "channel");
+                m.checkNotNullParameter(map, "roles");
+                m.checkNotNullParameter(map2, "guildMembers");
+                m.checkNotNullParameter(map3, "users");
+                m.checkNotNullParameter(map4, "presences");
+                m.checkNotNullParameter(map5, "streams");
+                m.checkNotNullParameter(set, "threadMembers");
+                return new Thread(z2, channel, guild, map, map2, map3, map4, map5, set);
+            }
+
+            public boolean equals(Object obj) {
+                if (this == obj) {
+                    return true;
+                }
+                if (!(obj instanceof Thread)) {
+                    return false;
+                }
+                Thread thread = (Thread) obj;
+                return isPanelOpen() == thread.isPanelOpen() && m.areEqual(getChannel(), thread.getChannel()) && m.areEqual(this.guild, thread.guild) && m.areEqual(this.roles, thread.roles) && m.areEqual(this.guildMembers, thread.guildMembers) && m.areEqual(this.users, thread.users) && m.areEqual(this.presences, thread.presences) && m.areEqual(this.streams, thread.streams) && m.areEqual(this.threadMembers, thread.threadMembers);
+            }
+
+            @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.StoreState
+            public Channel getChannel() {
+                return this.channel;
+            }
+
+            public final com.discord.models.guild.Guild getGuild() {
+                return this.guild;
+            }
+
+            public final Map<Long, GuildMember> getGuildMembers() {
+                return this.guildMembers;
+            }
+
+            public final Map<Long, Presence> getPresences() {
+                return this.presences;
+            }
+
+            public final Map<Long, GuildRole> getRoles() {
+                return this.roles;
+            }
+
+            public final Map<Long, ModelApplicationStream> getStreams() {
+                return this.streams;
+            }
+
+            public final Set<Long> getThreadMembers() {
+                return this.threadMembers;
+            }
+
+            public final Map<Long, User> getUsers() {
+                return this.users;
+            }
+
+            public int hashCode() {
+                boolean isPanelOpen = isPanelOpen();
+                if (isPanelOpen) {
+                    isPanelOpen = true;
+                }
+                int i = isPanelOpen ? 1 : 0;
+                int i2 = isPanelOpen ? 1 : 0;
+                int i3 = isPanelOpen ? 1 : 0;
+                int i4 = i * 31;
+                Channel channel = getChannel();
+                int i5 = 0;
+                int hashCode = (i4 + (channel != null ? channel.hashCode() : 0)) * 31;
+                com.discord.models.guild.Guild guild = this.guild;
+                int hashCode2 = (hashCode + (guild != null ? guild.hashCode() : 0)) * 31;
+                Map<Long, GuildRole> map = this.roles;
+                int hashCode3 = (hashCode2 + (map != null ? map.hashCode() : 0)) * 31;
+                Map<Long, GuildMember> map2 = this.guildMembers;
+                int hashCode4 = (hashCode3 + (map2 != null ? map2.hashCode() : 0)) * 31;
+                Map<Long, User> map3 = this.users;
+                int hashCode5 = (hashCode4 + (map3 != null ? map3.hashCode() : 0)) * 31;
+                Map<Long, Presence> map4 = this.presences;
+                int hashCode6 = (hashCode5 + (map4 != null ? map4.hashCode() : 0)) * 31;
+                Map<Long, ModelApplicationStream> map5 = this.streams;
+                int hashCode7 = (hashCode6 + (map5 != null ? map5.hashCode() : 0)) * 31;
+                Set<Long> set = this.threadMembers;
+                if (set != null) {
+                    i5 = set.hashCode();
+                }
+                return hashCode7 + i5;
+            }
+
+            @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.StoreState
+            public boolean isPanelOpen() {
+                return this.isPanelOpen;
+            }
+
+            public String toString() {
+                StringBuilder L = a.L("Thread(isPanelOpen=");
+                L.append(isPanelOpen());
+                L.append(", channel=");
+                L.append(getChannel());
+                L.append(", guild=");
+                L.append(this.guild);
+                L.append(", roles=");
+                L.append(this.roles);
+                L.append(", guildMembers=");
+                L.append(this.guildMembers);
+                L.append(", users=");
+                L.append(this.users);
+                L.append(", presences=");
+                L.append(this.presences);
+                L.append(", streams=");
+                L.append(this.streams);
+                L.append(", threadMembers=");
+                L.append(this.threadMembers);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
         private StoreState(boolean z2, Channel channel) {
             this.isPanelOpen = z2;
             this.channel = channel;
@@ -682,24 +888,36 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChannelMembersListViewModel(GuildChannelRangeSubscriber guildChannelRangeSubscriber, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Observable<StoreState> observable) {
+    public WidgetChannelMembersListViewModel(GuildChannelSubscriber guildChannelSubscriber, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Observable<StoreState> observable) {
         super(ViewState.Empty.INSTANCE);
-        m.checkNotNullParameter(guildChannelRangeSubscriber, "guildChannelRangeSubscriber");
+        m.checkNotNullParameter(guildChannelSubscriber, "guildChannelSubscriber");
         m.checkNotNullParameter(storeGuilds, "storeGuilds");
         m.checkNotNullParameter(storeEmojiCustom, "storeCustomEmojis");
         m.checkNotNullParameter(observable, "storeStateObservable");
-        this.guildChannelRangeSubscriber = guildChannelRangeSubscriber;
+        this.guildChannelSubscriber = guildChannelSubscriber;
         this.storeGuilds = storeGuilds;
         this.storeCustomEmojis = storeEmojiCustom;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetChannelMembersListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
-    /* JADX WARNING: Illegal instructions before constructor call */
-    public /* synthetic */ WidgetChannelMembersListViewModel(GuildChannelRangeSubscriber guildChannelRangeSubscriber, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(r0, r1, (i & 4) != 0 ? StoreStream.Companion.getCustomEmojis() : storeEmojiCustom, (i & 8) != 0 ? Companion.observeStoreState$default(Companion, r1, null, null, null, null, null, null, 126, null) : observable);
-        GuildChannelRangeSubscriber r0 = (i & 1) != 0 ? new AnonymousClass1() : guildChannelRangeSubscriber;
+    public /* synthetic */ WidgetChannelMembersListViewModel(GuildChannelSubscriber guildChannelSubscriber, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        StoreEmojiCustom storeEmojiCustom2;
+        Observable observable2;
+        WidgetChannelMembersListViewModel widgetChannelMembersListViewModel;
+        GuildChannelSubscriber r0 = (i & 1) != 0 ? new AnonymousClass1() : guildChannelSubscriber;
         StoreGuilds guilds = (i & 2) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds;
+        StoreEmojiCustom customEmojis = (i & 4) != 0 ? StoreStream.Companion.getCustomEmojis() : storeEmojiCustom;
+        if ((i & 8) != 0) {
+            observable2 = Companion.observeStoreState$default(Companion, guilds, null, null, null, null, null, null, null, null, null, null, null, 4094, null);
+            widgetChannelMembersListViewModel = this;
+            storeEmojiCustom2 = customEmojis;
+        } else {
+            widgetChannelMembersListViewModel = this;
+            observable2 = observable;
+            storeEmojiCustom2 = customEmojis;
+        }
+        new WidgetChannelMembersListViewModel(r0, guilds, storeEmojiCustom2, observable2);
     }
 
     public static final /* synthetic */ void access$handleStoreState(WidgetChannelMembersListViewModel widgetChannelMembersListViewModel, StoreState storeState) {
@@ -713,7 +931,6 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
             updateViewState(ViewState.Empty.INSTANCE);
             return;
         }
-        String str = null;
         if (storeState instanceof StoreState.Guild) {
             StoreState.Guild guild = (StoreState.Guild) storeState;
             memberList = GuildMemberListItemGeneratorKt.generateGuildMemberListItems(guild.getChannelMembers(), guild.getGuild(), guild.getChannel(), guild.getGuildRoles(), PermissionUtils.can(1, guild.getChannelPermissions()), this.storeGuilds, this.storeCustomEmojis);
@@ -721,22 +938,22 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
             StoreState.Private r0 = (StoreState.Private) storeState;
             Map<Long, Integer> relationships = r0.getRelationships();
             User v0 = AnimatableValueParser.v0(r0.getChannel());
-            memberList = PrivateChannelMemberListItemGeneratorKt.generateGroupDmMemberListItems(r0.getChannel(), r0.getUsers(), r0.getPresences(), r0.getApplicationStreams(), AnimatableValueParser.i1(r0.getChannel()) || ModelUserRelationship.isType(relationships.get(v0 != null ? Long.valueOf(v0.getId()) : null), 1));
+            Long valueOf = v0 != null ? Long.valueOf(v0.getId()) : null;
+            boolean z2 = true;
+            boolean isType = ModelUserRelationship.isType(relationships.get(valueOf), 1);
+            if (!AnimatableValueParser.j1(r0.getChannel()) && !isType) {
+                z2 = false;
+            }
+            memberList = PrivateChannelMemberListItemGeneratorKt.generateGroupDmMemberListItems(r0.getChannel(), r0.getUsers(), r0.getPresences(), r0.getApplicationStreams(), z2);
+        } else if (storeState instanceof StoreState.Thread) {
+            StoreState.Thread thread = (StoreState.Thread) storeState;
+            memberList = ThreadMemberListItemGeneratorKt.generateThreadMemberListItems(thread.getChannel(), thread.getRoles(), thread.getGuild(), thread.getGuildMembers(), thread.getUsers(), thread.getPresences(), thread.getStreams(), thread.getThreadMembers(), this.storeGuilds, this.storeCustomEmojis);
         } else {
             throw new NoWhenBranchMatchedException();
         }
-        ViewState viewState = getViewState();
         ViewState.Loaded loaded = new ViewState.Loaded(memberList, storeState.isPanelOpen(), storeState.getChannel());
         updateViewState(loaded);
-        if (viewState != null) {
-            str = viewState.getListId();
-        }
-        if ((!m.areEqual(str, loaded.getListId())) && storeState.isPanelOpen()) {
-            this.eventSubject.j.onNext(Event.ScrollToTop.INSTANCE);
-            updateSubscriptions(new IntRange(0, 99));
-        } else if ((viewState instanceof ViewState.Loaded) && !((ViewState.Loaded) viewState).isOpen() && loaded.isOpen()) {
-            this.eventSubject.j.onNext(Event.UpdateRanges.INSTANCE);
-        }
+        updateSubscriptions(getViewState(), loaded, storeState);
     }
 
     public final Observable<Event> observeEvents() {
@@ -745,8 +962,28 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
         return publishSubject;
     }
 
+    public final void updateSubscriptions(ViewState viewState, ViewState.Loaded loaded, StoreState storeState) {
+        m.checkNotNullParameter(loaded, "newViewState");
+        m.checkNotNullParameter(storeState, "storeState");
+        boolean z2 = (m.areEqual(viewState != null ? viewState.getListId() : null, loaded.getListId()) ^ true) && storeState.isPanelOpen();
+        Channel channel = loaded.getChannel();
+        if (channel == null || !AnimatableValueParser.z1(channel)) {
+            if (z2) {
+                this.eventSubject.j.onNext(Event.ScrollToTop.INSTANCE);
+                updateSubscriptionsForChannel(new IntRange(0, 99));
+            } else if ((viewState instanceof ViewState.Loaded) && !((ViewState.Loaded) viewState).isOpen() && loaded.isOpen()) {
+                this.eventSubject.j.onNext(Event.UpdateRanges.INSTANCE);
+            }
+        } else if (z2) {
+            this.eventSubject.j.onNext(Event.ScrollToTop.INSTANCE);
+            updateSubscriptionsForThread(loaded.getChannel());
+        } else if ((viewState instanceof ViewState.Loaded) && !((ViewState.Loaded) viewState).isOpen() && loaded.isOpen()) {
+            updateSubscriptionsForThread(loaded.getChannel());
+        }
+    }
+
     @MainThread
-    public final void updateSubscriptions(IntRange intRange) {
+    public final void updateSubscriptionsForChannel(IntRange intRange) {
         m.checkNotNullParameter(intRange, "range");
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
@@ -754,7 +991,16 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel<ViewSt
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && loaded.getChannel() != null && loaded.isOpen()) {
-            this.guildChannelRangeSubscriber.subscribeToRange(loaded.getChannel(), intRange);
+            this.guildChannelSubscriber.subscribeToChannelRange(loaded.getChannel(), intRange);
+        }
+    }
+
+    public final void updateSubscriptionsForThread(Channel channel) {
+        if (channel != null && !AnimatableValueParser.e1(channel)) {
+            m.checkNotNullParameter(channel, "$this$isAnnouncementThread");
+            if (!(channel.A() == 10)) {
+                this.guildChannelSubscriber.subscribeToThread(channel);
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
index b5ba7d2dfc..342d20ac20 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java
@@ -1042,16 +1042,16 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
     }
 
     public ChannelMembersListAdapter() {
-        PublishSubject<ListUpdateRequest> l0 = PublishSubject.l0();
-        this.updatesSubject = l0;
+        PublishSubject<ListUpdateRequest> k0 = PublishSubject.k0();
+        this.updatesSubject = k0;
         WidgetChannelMembersListViewModel.MemberList empty = WidgetChannelMembersListViewModel.MemberList.Companion.getEMPTY();
         this.memberList = empty;
         ListUpdateOperation.OverwriteUpdate overwriteUpdate = new ListUpdateOperation.OverwriteUpdate(new ListUpdateRequest("", empty, false));
         AnonymousClass1 r1 = AnonymousClass1.INSTANCE;
-        m.checkNotNullExpressionValue(l0, "updatesSubject");
-        Observable T = ObservableExtensionsKt.computationLatest(l0).Q(overwriteUpdate, AnonymousClass2.INSTANCE).T(1);
-        m.checkNotNullExpressionValue(T, "updatesSubject\n        .…      })\n        .skip(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(T), ChannelMembersListAdapter.class, (Context) null, new AnonymousClass4(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 58, (Object) null);
+        m.checkNotNullExpressionValue(k0, "updatesSubject");
+        Observable S = ObservableExtensionsKt.computationLatest(k0).P(overwriteUpdate, AnonymousClass2.INSTANCE).S(1);
+        m.checkNotNullExpressionValue(S, "updatesSubject\n        .…      })\n        .skip(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(S), ChannelMembersListAdapter.class, (Context) null, new AnonymousClass4(this), (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 58, (Object) null);
     }
 
     public static final /* synthetic */ WidgetChannelMembersListViewModel.MemberList access$getMemberList$p(ChannelMembersListAdapter channelMembersListAdapter) {
@@ -1247,27 +1247,27 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             m.checkNotNullExpressionValue(a3, "WidgetChannelMembersList…(inflater, parent, false)");
             return new ChannelMembersListViewHolderHeader(a3);
         } else if (ordinal == 3) {
-            View inflate = from.inflate(2131558870, viewGroup, false);
-            int i2 = 2131362270;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362270);
+            View inflate = from.inflate(2131558873, viewGroup, false);
+            int i2 = 2131362281;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362281);
             if (simpleDraweeView != null) {
-                i2 = 2131362271;
-                ImageView imageView = (ImageView) inflate.findViewById(2131362271);
+                i2 = 2131362282;
+                ImageView imageView = (ImageView) inflate.findViewById(2131362282);
                 if (imageView != null) {
-                    i2 = 2131362272;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131362272);
+                    i2 = 2131362283;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131362283);
                     if (simpleDraweeSpanTextView != null) {
-                        i2 = 2131362273;
-                        ImageView imageView2 = (ImageView) inflate.findViewById(2131362273);
+                        i2 = 2131362284;
+                        ImageView imageView2 = (ImageView) inflate.findViewById(2131362284);
                         if (imageView2 != null) {
-                            i2 = 2131362276;
-                            UsernameView usernameView = (UsernameView) inflate.findViewById(2131362276);
+                            i2 = 2131362287;
+                            UsernameView usernameView = (UsernameView) inflate.findViewById(2131362287);
                             if (usernameView != null) {
-                                i2 = 2131362277;
-                                StatusView statusView = (StatusView) inflate.findViewById(2131362277);
+                                i2 = 2131362288;
+                                StatusView statusView = (StatusView) inflate.findViewById(2131362288);
                                 if (statusView != null) {
-                                    i2 = 2131362278;
-                                    ImageView imageView3 = (ImageView) inflate.findViewById(2131362278);
+                                    i2 = 2131362289;
+                                    ImageView imageView3 = (ImageView) inflate.findViewById(2131362289);
                                     if (imageView3 != null) {
                                         WidgetChannelMembersListItemUserBinding widgetChannelMembersListItemUserBinding = new WidgetChannelMembersListItemUserBinding((ConstraintLayout) inflate, simpleDraweeView, imageView, simpleDraweeSpanTextView, imageView2, usernameView, statusView, imageView3);
                                         m.checkNotNullExpressionValue(widgetChannelMembersListItemUserBinding, "WidgetChannelMembersList…(inflater, parent, false)");
@@ -1281,12 +1281,12 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
         } else if (ordinal == 4) {
-            View inflate2 = from.inflate(2131558866, viewGroup, false);
-            int i3 = 2131362268;
-            ImageView imageView4 = (ImageView) inflate2.findViewById(2131362268);
+            View inflate2 = from.inflate(2131558869, viewGroup, false);
+            int i3 = 2131362279;
+            ImageView imageView4 = (ImageView) inflate2.findViewById(2131362279);
             if (imageView4 != null) {
-                i3 = 2131362269;
-                TextView textView = (TextView) inflate2.findViewById(2131362269);
+                i3 = 2131362280;
+                TextView textView = (TextView) inflate2.findViewById(2131362280);
                 if (textView != null) {
                     WidgetChannelMembersListItemAddBinding widgetChannelMembersListItemAddBinding = new WidgetChannelMembersListItemAddBinding((LinearLayout) inflate2, imageView4, textView);
                     m.checkNotNullExpressionValue(widgetChannelMembersListItemAddBinding, "WidgetChannelMembersList…(inflater, parent, false)");
@@ -1295,15 +1295,15 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter<Recycl
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i3)));
         } else if (ordinal == 5) {
-            View inflate3 = from.inflate(2131558868, viewGroup, false);
-            int i4 = 2131362101;
-            View findViewById = inflate3.findViewById(2131362101);
+            View inflate3 = from.inflate(2131558871, viewGroup, false);
+            int i4 = 2131362112;
+            View findViewById = inflate3.findViewById(2131362112);
             if (findViewById != null) {
-                i4 = 2131362102;
-                View findViewById2 = inflate3.findViewById(2131362102);
+                i4 = 2131362113;
+                View findViewById2 = inflate3.findViewById(2131362113);
                 if (findViewById2 != null) {
-                    i4 = 2131365471;
-                    Guideline guideline = (Guideline) inflate3.findViewById(2131365471);
+                    i4 = 2131365531;
+                    Guideline guideline = (Guideline) inflate3.findViewById(2131365531);
                     if (guideline != null) {
                         WidgetChannelMembersListItemLoadingBinding widgetChannelMembersListItemLoadingBinding = new WidgetChannelMembersListItemLoadingBinding((ConstraintLayout) inflate3, findViewById, findViewById2, guideline);
                         m.checkNotNullExpressionValue(widgetChannelMembersListItemLoadingBinding, "WidgetChannelMembersList…(inflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java
index 88cd57e6cd..9cc8a6ce40 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.java
@@ -35,11 +35,11 @@ public final class ChannelMembersListViewHolderHeader extends RecyclerView.ViewH
         m.checkNotNullParameter(header, "data");
         int ordinal = header.getHeaderType().ordinal();
         if (ordinal == 0) {
-            i = 2131893511;
+            i = 2131893595;
         } else if (ordinal == 1) {
-            i = 2131893510;
+            i = 2131893594;
         } else if (ordinal == 2) {
-            i = 2131891137;
+            i = 2131891208;
         } else {
             throw new NoWhenBranchMatchedException();
         }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java
index 5ba8af8f6a..fa8986abfd 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.java
@@ -25,7 +25,7 @@ public final class ChannelMembersListViewHolderMember$bind$3 implements View.OnC
             Context context = view.getContext();
             Context context2 = view.getContext();
             m.checkNotNullExpressionValue(context2, "it.context");
-            o.h(context, b.g(context2, 2131892141, new Object[]{readableTimeString}, null, 4), 0, null, 12);
+            o.h(context, b.g(context2, 2131892212, new Object[]{readableTimeString}, null, 4), 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java
index 45423985a7..8839930051 100644
--- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java
@@ -51,10 +51,10 @@ public final class ChannelMembersListViewHolderMember extends RecyclerView.ViewH
         ImageView imageView = this.binding.e;
         m.checkNotNullExpressionValue(imageView, "binding.channelMembersListItemGroupOwnerIndicator");
         imageView.setVisibility(member.getShowOwnerIndicator() ? 0 : 8);
-        ImageView imageView2 = this.binding.f1692c;
+        ImageView imageView2 = this.binding.f1689c;
         m.checkNotNullExpressionValue(imageView2, "binding.channelMembersListItemBoostedIndicator");
         imageView2.setVisibility(z2 ? 0 : 8);
-        this.binding.f1692c.setOnClickListener(new ChannelMembersListViewHolderMember$bind$3(z2, member));
+        this.binding.f1689c.setOnClickListener(new ChannelMembersListViewHolderMember$bind$3(z2, member));
         this.binding.g.setPresence(member.getPresence());
         ImageView imageView3 = this.binding.h;
         m.checkNotNullExpressionValue(imageView3, "binding.channelMembersListItemRichPresenceIv");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java b/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java
index b8cfc47842..fed4c5ca44 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/AddMemberAdapter.java
@@ -46,17 +46,17 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AddMemberAdapterCategoryItem(AddMemberAdapter addMemberAdapter) {
-            super(2131558879, addMemberAdapter);
+            super(2131558882, addMemberAdapter);
             m.checkNotNullParameter(addMemberAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363730);
+            TextView textView = (TextView) view.findViewById(2131363771);
             if (textView != null) {
                 WidgetChannelSettingsAddMemberCategoryBinding widgetChannelSettingsAddMemberCategoryBinding = new WidgetChannelSettingsAddMemberCategoryBinding((LinearLayout) view, textView);
                 m.checkNotNullExpressionValue(widgetChannelSettingsAddMemberCategoryBinding, "WidgetChannelSettingsAdd…oryBinding.bind(itemView)");
                 this.binding = widgetChannelSettingsAddMemberCategoryBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363730)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363771)));
         }
 
         public void onConfigure(int i, Item item) {
@@ -67,9 +67,9 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
             m.checkNotNullExpressionValue(textView, "binding.label");
             int ordinal = ((Item.CategoryItem) item).getCategoryType().ordinal();
             if (ordinal == 0) {
-                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131892909);
+                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131892990);
             } else if (ordinal == 1) {
-                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131891137);
+                str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131891208);
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -94,17 +94,17 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AddMemberAdapterItemItem(AddMemberAdapter addMemberAdapter) {
-            super(2131558880, addMemberAdapter);
+            super(2131558883, addMemberAdapter);
             m.checkNotNullParameter(addMemberAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362289;
-            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) view.findViewById(2131362289);
+            int i = 2131362300;
+            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) view.findViewById(2131362300);
             if (channelPermissionOwnerView != null) {
-                i = 2131362608;
-                MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362608);
+                i = 2131362621;
+                MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131362621);
                 if (materialCheckBox != null) {
-                    i = 2131362748;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362748);
+                    i = 2131362772;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362772);
                     if (constraintLayout != null) {
                         WidgetChannelSettingsAddMemberItemBinding widgetChannelSettingsAddMemberItemBinding = new WidgetChannelSettingsAddMemberItemBinding((FrameLayout) view, channelPermissionOwnerView, materialCheckBox, constraintLayout);
                         m.checkNotNullExpressionValue(widgetChannelSettingsAddMemberItemBinding, "WidgetChannelSettingsAdd…temBinding.bind(itemView)");
@@ -149,10 +149,10 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple<Item> {
             super.onConfigure(i, (int) item);
             Item.PermissionOwnerItem permissionOwnerItem = (Item.PermissionOwnerItem) item;
             this.binding.b.a(permissionOwnerItem.getPermissionOwner());
-            MaterialCheckBox materialCheckBox = this.binding.f1695c;
+            MaterialCheckBox materialCheckBox = this.binding.f1692c;
             m.checkNotNullExpressionValue(materialCheckBox, "binding.checkbox");
             materialCheckBox.setChecked(permissionOwnerItem.getChecked());
-            this.binding.f1695c.setOnClickListener(new AddMemberAdapter$AddMemberAdapterItemItem$onConfigure$1(this, permissionOwnerItem));
+            this.binding.f1692c.setOnClickListener(new AddMemberAdapter$AddMemberAdapterItemItem$onConfigure$1(this, permissionOwnerItem));
             this.binding.d.setOnClickListener(new AddMemberAdapter$AddMemberAdapterItemItem$onConfigure$2(this, permissionOwnerItem));
             ConstraintLayout constraintLayout = this.binding.d;
             m.checkNotNullExpressionValue(constraintLayout, "binding.container");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java
index 8f5f8935eb..e32e1cb8fd 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class ConfirmRemovePermissionDialog$binding$2 exten
 
     public final ConfirmRemovePermissionDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362110;
-        TextView textView = (TextView) view.findViewById(2131362110);
+        int i = 2131362121;
+        TextView textView = (TextView) view.findViewById(2131362121);
         if (textView != null) {
-            i = 2131362213;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362213);
+            i = 2131362224;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362224);
             if (materialButton != null) {
-                i = 2131362672;
-                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362672);
+                i = 2131362696;
+                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362696);
                 if (loadingButton != null) {
-                    i = 2131364030;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030);
+                    i = 2131364073;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364073);
                     if (linearLayout != null) {
                         return new ConfirmRemovePermissionDialogBinding((LinearLayout) view, textView, materialButton, loadingButton, linearLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java
index e920af450e..70a0a6e85f 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java
@@ -131,8 +131,8 @@ public final class ConfirmRemovePermissionDialog extends AppDialog {
         }
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.body");
-        b.n(textView, 2131893222, new Object[]{str}, null, 4);
+        b.m(textView, 2131893305, new Object[]{str}, null, 4);
         getBinding().d.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$2(this));
-        getBinding().f1602c.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$3(this));
+        getBinding().f1598c.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialogViewModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialogViewModel.java
index 04c1ee3bb1..fe482d5649 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialogViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialogViewModel.java
@@ -118,7 +118,7 @@ public final class ConfirmRemovePermissionDialogViewModel extends AppViewModel<V
         Object obj;
         boolean z2;
         Channel channel = this.channelStore.getChannel(this.channelId);
-        if (channel == null || (list = channel.r()) == null) {
+        if (channel == null || (list = channel.s()) == null) {
             list = n.emptyList();
         }
         PermissionOwner permissionOwner = this.permissionOwner;
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java
index 807cc799d6..46d778ca47 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java
@@ -47,12 +47,12 @@ public final class PermissionOwnerListView extends RecyclerView {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public PermissionOwnerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558649, viewGroup, false);
-            int i2 = 2131364202;
-            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) inflate.findViewById(2131364202);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558647, viewGroup, false);
+            int i2 = 2131364246;
+            ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) inflate.findViewById(2131364246);
             if (channelPermissionOwnerView != null) {
-                i2 = 2131364410;
-                ImageView imageView = (ImageView) inflate.findViewById(2131364410);
+                i2 = 2131364448;
+                ImageView imageView = (ImageView) inflate.findViewById(2131364448);
                 if (imageView != null) {
                     RemovablePermissionOwnerViewBinding removablePermissionOwnerViewBinding = new RemovablePermissionOwnerViewBinding((ConstraintLayout) inflate, channelPermissionOwnerView, imageView);
                     m.checkNotNullExpressionValue(removablePermissionOwnerViewBinding, "RemovablePermissionOwner…,\n          false\n      )");
@@ -181,10 +181,10 @@ public final class PermissionOwnerListView extends RecyclerView {
             m.checkNotNullParameter(item, "item");
             m.checkNotNullParameter(function0, "onRemoveClicked");
             this.binding.b.a(item.getPermissionOwner());
-            ImageView imageView = this.binding.f1623c;
+            ImageView imageView = this.binding.f1619c;
             m.checkNotNullExpressionValue(imageView, "binding.remove");
             ViewExtensions.setEnabledAlpha$default(imageView, item.getRemoveStatus() instanceof RemoveStatus.CanRemove, 0.0f, 2, null);
-            this.binding.f1623c.setOnClickListener(new PermissionOwnerListView$PermissionOwnerViewHolder$configure$1(this, item, function0));
+            this.binding.f1619c.setOnClickListener(new PermissionOwnerListView$PermissionOwnerViewHolder$configure$1(this, item, function0));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java
index 09a538cb15..b8fac4bc12 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetChannelSettingsAddMemberFragment$bindin
 
     public final WidgetChannelSettingsAddMemberBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364398;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364398);
+        int i = 2131364436;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364436);
         if (recyclerView != null) {
-            i = 2131364540;
-            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364540);
+            i = 2131364579;
+            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364579);
             if (searchInputView != null) {
                 return new WidgetChannelSettingsAddMemberBinding((CoordinatorLayout) view, recyclerView, searchInputView);
             }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
index 983d23f642..6cd5c84fad 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java
@@ -57,11 +57,11 @@ public final class WidgetChannelSettingsAddMemberFragment extends AppFragment {
     }
 
     public WidgetChannelSettingsAddMemberFragment() {
-        super(2131558878);
+        super(2131558881);
         WidgetChannelSettingsAddMemberFragment$viewModel$2 widgetChannelSettingsAddMemberFragment$viewModel$2 = new WidgetChannelSettingsAddMemberFragment$viewModel$2(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSettingsAddMemberFragmentViewModel.class), new WidgetChannelSettingsAddMemberFragment$appViewModels$$inlined$viewModels$1(widgetChannelSettingsAddMemberFragment$viewModel$2), new j0(new WidgetChannelSettingsAddMemberFragment$viewModel$3(this)));
-        this.querySubject = BehaviorSubject.m0("");
-        this.selectedSubject = BehaviorSubject.m0(Collections.emptyMap());
+        this.querySubject = BehaviorSubject.l0("");
+        this.selectedSubject = BehaviorSubject.l0(Collections.emptyMap());
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelSettingsAddMemberFragment widgetChannelSettingsAddMemberFragment, WidgetChannelSettingsAddMemberFragmentViewModel.ViewState viewState) {
@@ -127,11 +127,11 @@ public final class WidgetChannelSettingsAddMemberFragment extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<String> s2 = this.querySubject.o(200, TimeUnit.MILLISECONDS).s();
-        m.checkNotNullExpressionValue(s2, "querySubject\n        .de…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetChannelSettingsAddMemberFragment.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        getBinding().f1694c.setText(getViewModel().getQuery());
-        getBinding().f1694c.a(this, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$2(this));
+        Observable<String> r = this.querySubject.o(200, TimeUnit.MILLISECONDS).r();
+        m.checkNotNullExpressionValue(r, "querySubject\n        .de…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetChannelSettingsAddMemberFragment.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        getBinding().f1691c.setText(getViewModel().getQuery());
+        getBinding().f1691c.a(this, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$2(this));
         getAdapter().setOnClickListener(new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$3(this));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetChannelSettingsAddMemberFragment.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$4(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1.java
index 81b1408527..e1739ded53 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1.java
@@ -36,10 +36,10 @@ public final class WidgetChannelSettingsAddMemberFragmentViewModel$Companion$obs
             Map map4;
             Channel channel = this.$channel;
             m.checkNotNullExpressionValue(channel, "channel");
-            List<PermissionOverwrite> r = this.$channel.r();
-            if (r != null) {
-                map4 = new LinkedHashMap(a.I(r, 10, 16));
-                for (T t : r) {
+            List<PermissionOverwrite> s2 = this.$channel.s();
+            if (s2 != null) {
+                map4 = new LinkedHashMap(a.I(s2, 10, 16));
+                for (T t : s2) {
                     map4.put(Long.valueOf(t.e()), t);
                 }
             } else {
@@ -65,6 +65,6 @@ public final class WidgetChannelSettingsAddMemberFragmentViewModel$Companion$obs
     }
 
     public final Observable<? extends WidgetChannelSettingsAddMemberFragmentViewModel.StoreState> call(Channel channel) {
-        return Observable.h(this.$guildsStore.observeGuild(channel.e()), this.$guildsStore.observeRoles(channel.e()), this.$guildsStore.observeComputed(channel.e()), this.$userStore.observeAllUsers(), new AnonymousClass1(channel));
+        return Observable.h(this.$guildsStore.observeGuild(channel.f()), this.$guildsStore.observeRoles(channel.f()), this.$guildsStore.observeComputed(channel.f()), this.$userStore.observeAllUsers(), new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java
index b2a809fc90..d7d99a4464 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragmentViewModel.java
@@ -92,11 +92,11 @@ public final class WidgetChannelSettingsAddMemberFragmentViewModel extends AppVi
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StoreGuilds storeGuilds, StoreUser storeUser) {
-            Observable<R> G = storeChannels.observeChannel(j).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            Observable<StoreState> Z = G.s().Z(new WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1(storeGuilds, storeUser));
-            m.checkNotNullExpressionValue(Z, "channelsStore.observeCha…          }\n            }");
-            return Z;
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> Y = F.r().Y(new WidgetChannelSettingsAddMemberFragmentViewModel$Companion$observeStoreState$1(storeGuilds, storeUser));
+            m.checkNotNullExpressionValue(Y, "channelsStore.observeCha…          }\n            }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java
index 0c634950ab..0cf26bb9e8 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java
@@ -21,14 +21,14 @@ public final /* synthetic */ class WidgetChannelSettingsAddMemberSheet$binding$2
         int i = 2131361902;
         TextView textView = (TextView) view.findViewById(2131361902);
         if (textView != null) {
-            i = 2131362749;
-            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362749);
+            i = 2131362773;
+            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362773);
             if (fragmentContainerView != null) {
-                i = 2131365133;
-                TextView textView2 = (TextView) view.findViewById(2131365133);
+                i = 2131365188;
+                TextView textView2 = (TextView) view.findViewById(2131365188);
                 if (textView2 != null) {
-                    i = 2131365286;
-                    TextView textView3 = (TextView) view.findViewById(2131365286);
+                    i = 2131365341;
+                    TextView textView3 = (TextView) view.findViewById(2131365341);
                     if (textView3 != null) {
                         return new WidgetChannelSettingsAddMemberSheetBinding((LinearLayout) view, textView, fragmentContainerView, textView2, textView3);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
index 28748eabf3..2810146ad9 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java
@@ -85,9 +85,9 @@ public final class WidgetChannelSettingsAddMemberSheet extends AppBottomSheet {
         }
         BehaviorSubject<Map<Long, PermissionOverwrite.Type>> selectedItemsSubject = widgetChannelSettingsAddMemberFragment.getSelectedItemsSubject();
         m.checkNotNullExpressionValue(selectedItemsSubject, "fragment.getSelectedItemsSubject()");
-        Map<Long, PermissionOverwrite.Type> o0 = selectedItemsSubject.o0();
-        m.checkNotNullExpressionValue(o0, "fragment.getSelectedItemsSubject().value");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(channelPermissionsAddMemberUtils.addPermissionOverwrites(channelId, o0, 20971536), this, null, 2, null), WidgetChannelSettingsAddMemberSheet.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberSheet$addPermissionOverwrites$1(this), 60, (Object) null);
+        Map<Long, PermissionOverwrite.Type> n0 = selectedItemsSubject.n0();
+        m.checkNotNullExpressionValue(n0, "fragment.getSelectedItemsSubject().value");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(channelPermissionsAddMemberUtils.addPermissionOverwrites(channelId, n0, 20971536), this, null, 2, null), WidgetChannelSettingsAddMemberSheet.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberSheet$addPermissionOverwrites$1(this), 60, (Object) null);
     }
 
     @SuppressLint({"SetTextI18n"})
@@ -110,7 +110,7 @@ public final class WidgetChannelSettingsAddMemberSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558881;
+        return 2131558884;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -132,7 +132,7 @@ public final class WidgetChannelSettingsAddMemberSheet extends AppBottomSheet {
         super.onViewCreated(view, bundle);
         this.fragment = WidgetChannelSettingsAddMemberFragment.Companion.create(getChannelId(), false);
         FragmentTransaction beginTransaction = getChildFragmentManager().beginTransaction();
-        FragmentContainerView fragmentContainerView = getBinding().f1696c;
+        FragmentContainerView fragmentContainerView = getBinding().f1693c;
         m.checkNotNullExpressionValue(fragmentContainerView, "binding.content");
         int id2 = fragmentContainerView.getId();
         WidgetChannelSettingsAddMemberFragment widgetChannelSettingsAddMemberFragment = this.fragment;
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java
index cfb227f0dc..60f70d0fc1 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java
@@ -21,101 +21,101 @@ public final /* synthetic */ class WidgetChannelSettingsEditPermissions$binding$
 
     public final WidgetChannelSettingsEditPermissionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362285;
-        TernaryCheckBox ternaryCheckBox = (TernaryCheckBox) view.findViewById(2131362285);
+        int i = 2131362296;
+        TernaryCheckBox ternaryCheckBox = (TernaryCheckBox) view.findViewById(2131362296);
         if (ternaryCheckBox != null) {
-            i = 2131362286;
-            TernaryCheckBox ternaryCheckBox2 = (TernaryCheckBox) view.findViewById(2131362286);
+            i = 2131362297;
+            TernaryCheckBox ternaryCheckBox2 = (TernaryCheckBox) view.findViewById(2131362297);
             if (ternaryCheckBox2 != null) {
-                i = 2131362287;
-                TernaryCheckBox ternaryCheckBox3 = (TernaryCheckBox) view.findViewById(2131362287);
+                i = 2131362298;
+                TernaryCheckBox ternaryCheckBox3 = (TernaryCheckBox) view.findViewById(2131362298);
                 if (ternaryCheckBox3 != null) {
-                    i = 2131362288;
-                    TernaryCheckBox ternaryCheckBox4 = (TernaryCheckBox) view.findViewById(2131362288);
+                    i = 2131362299;
+                    TernaryCheckBox ternaryCheckBox4 = (TernaryCheckBox) view.findViewById(2131362299);
                     if (ternaryCheckBox4 != null) {
-                        i = 2131362290;
-                        TernaryCheckBox ternaryCheckBox5 = (TernaryCheckBox) view.findViewById(2131362290);
+                        i = 2131362301;
+                        TernaryCheckBox ternaryCheckBox5 = (TernaryCheckBox) view.findViewById(2131362301);
                         if (ternaryCheckBox5 != null) {
-                            i = 2131362291;
-                            TernaryCheckBox ternaryCheckBox6 = (TernaryCheckBox) view.findViewById(2131362291);
+                            i = 2131362302;
+                            TernaryCheckBox ternaryCheckBox6 = (TernaryCheckBox) view.findViewById(2131362302);
                             if (ternaryCheckBox6 != null) {
-                                i = 2131362292;
-                                TernaryCheckBox ternaryCheckBox7 = (TernaryCheckBox) view.findViewById(2131362292);
+                                i = 2131362303;
+                                TernaryCheckBox ternaryCheckBox7 = (TernaryCheckBox) view.findViewById(2131362303);
                                 if (ternaryCheckBox7 != null) {
-                                    i = 2131362293;
-                                    TernaryCheckBox ternaryCheckBox8 = (TernaryCheckBox) view.findViewById(2131362293);
+                                    i = 2131362304;
+                                    TernaryCheckBox ternaryCheckBox8 = (TernaryCheckBox) view.findViewById(2131362304);
                                     if (ternaryCheckBox8 != null) {
-                                        i = 2131362294;
-                                        TernaryCheckBox ternaryCheckBox9 = (TernaryCheckBox) view.findViewById(2131362294);
+                                        i = 2131362305;
+                                        TernaryCheckBox ternaryCheckBox9 = (TernaryCheckBox) view.findViewById(2131362305);
                                         if (ternaryCheckBox9 != null) {
-                                            i = 2131362295;
-                                            TernaryCheckBox ternaryCheckBox10 = (TernaryCheckBox) view.findViewById(2131362295);
+                                            i = 2131362306;
+                                            TernaryCheckBox ternaryCheckBox10 = (TernaryCheckBox) view.findViewById(2131362306);
                                             if (ternaryCheckBox10 != null) {
-                                                i = 2131362296;
-                                                TernaryCheckBox ternaryCheckBox11 = (TernaryCheckBox) view.findViewById(2131362296);
+                                                i = 2131362307;
+                                                TernaryCheckBox ternaryCheckBox11 = (TernaryCheckBox) view.findViewById(2131362307);
                                                 if (ternaryCheckBox11 != null) {
-                                                    i = 2131362297;
-                                                    TernaryCheckBox ternaryCheckBox12 = (TernaryCheckBox) view.findViewById(2131362297);
+                                                    i = 2131362308;
+                                                    TernaryCheckBox ternaryCheckBox12 = (TernaryCheckBox) view.findViewById(2131362308);
                                                     if (ternaryCheckBox12 != null) {
-                                                        i = 2131362298;
-                                                        TernaryCheckBox ternaryCheckBox13 = (TernaryCheckBox) view.findViewById(2131362298);
+                                                        i = 2131362309;
+                                                        TernaryCheckBox ternaryCheckBox13 = (TernaryCheckBox) view.findViewById(2131362309);
                                                         if (ternaryCheckBox13 != null) {
-                                                            i = 2131362299;
-                                                            TernaryCheckBox ternaryCheckBox14 = (TernaryCheckBox) view.findViewById(2131362299);
+                                                            i = 2131362310;
+                                                            TernaryCheckBox ternaryCheckBox14 = (TernaryCheckBox) view.findViewById(2131362310);
                                                             if (ternaryCheckBox14 != null) {
-                                                                i = 2131362300;
-                                                                TernaryCheckBox ternaryCheckBox15 = (TernaryCheckBox) view.findViewById(2131362300);
+                                                                i = 2131362311;
+                                                                TernaryCheckBox ternaryCheckBox15 = (TernaryCheckBox) view.findViewById(2131362311);
                                                                 if (ternaryCheckBox15 != null) {
-                                                                    i = 2131362301;
-                                                                    TernaryCheckBox ternaryCheckBox16 = (TernaryCheckBox) view.findViewById(2131362301);
+                                                                    i = 2131362312;
+                                                                    TernaryCheckBox ternaryCheckBox16 = (TernaryCheckBox) view.findViewById(2131362312);
                                                                     if (ternaryCheckBox16 != null) {
-                                                                        i = 2131362302;
-                                                                        TernaryCheckBox ternaryCheckBox17 = (TernaryCheckBox) view.findViewById(2131362302);
+                                                                        i = 2131362313;
+                                                                        TernaryCheckBox ternaryCheckBox17 = (TernaryCheckBox) view.findViewById(2131362313);
                                                                         if (ternaryCheckBox17 != null) {
-                                                                            i = 2131362303;
-                                                                            TernaryCheckBox ternaryCheckBox18 = (TernaryCheckBox) view.findViewById(2131362303);
+                                                                            i = 2131362314;
+                                                                            TernaryCheckBox ternaryCheckBox18 = (TernaryCheckBox) view.findViewById(2131362314);
                                                                             if (ternaryCheckBox18 != null) {
-                                                                                i = 2131362304;
-                                                                                TernaryCheckBox ternaryCheckBox19 = (TernaryCheckBox) view.findViewById(2131362304);
+                                                                                i = 2131362315;
+                                                                                TernaryCheckBox ternaryCheckBox19 = (TernaryCheckBox) view.findViewById(2131362315);
                                                                                 if (ternaryCheckBox19 != null) {
-                                                                                    i = 2131362305;
-                                                                                    TernaryCheckBox ternaryCheckBox20 = (TernaryCheckBox) view.findViewById(2131362305);
+                                                                                    i = 2131362316;
+                                                                                    TernaryCheckBox ternaryCheckBox20 = (TernaryCheckBox) view.findViewById(2131362316);
                                                                                     if (ternaryCheckBox20 != null) {
-                                                                                        i = 2131362306;
-                                                                                        TernaryCheckBox ternaryCheckBox21 = (TernaryCheckBox) view.findViewById(2131362306);
+                                                                                        i = 2131362317;
+                                                                                        TernaryCheckBox ternaryCheckBox21 = (TernaryCheckBox) view.findViewById(2131362317);
                                                                                         if (ternaryCheckBox21 != null) {
-                                                                                            i = 2131362307;
-                                                                                            TernaryCheckBox ternaryCheckBox22 = (TernaryCheckBox) view.findViewById(2131362307);
+                                                                                            i = 2131362318;
+                                                                                            TernaryCheckBox ternaryCheckBox22 = (TernaryCheckBox) view.findViewById(2131362318);
                                                                                             if (ternaryCheckBox22 != null) {
-                                                                                                i = 2131362308;
-                                                                                                TernaryCheckBox ternaryCheckBox23 = (TernaryCheckBox) view.findViewById(2131362308);
+                                                                                                i = 2131362319;
+                                                                                                TernaryCheckBox ternaryCheckBox23 = (TernaryCheckBox) view.findViewById(2131362319);
                                                                                                 if (ternaryCheckBox23 != null) {
-                                                                                                    i = 2131362309;
-                                                                                                    TernaryCheckBox ternaryCheckBox24 = (TernaryCheckBox) view.findViewById(2131362309);
+                                                                                                    i = 2131362320;
+                                                                                                    TernaryCheckBox ternaryCheckBox24 = (TernaryCheckBox) view.findViewById(2131362320);
                                                                                                     if (ternaryCheckBox24 != null) {
-                                                                                                        i = 2131362310;
-                                                                                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362310);
+                                                                                                        i = 2131362321;
+                                                                                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362321);
                                                                                                         if (simpleDraweeView != null) {
-                                                                                                            i = 2131362311;
-                                                                                                            TextView textView = (TextView) view.findViewById(2131362311);
+                                                                                                            i = 2131362322;
+                                                                                                            TextView textView = (TextView) view.findViewById(2131362322);
                                                                                                             if (textView != null) {
-                                                                                                                i = 2131362312;
-                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362312);
+                                                                                                                i = 2131362323;
+                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362323);
                                                                                                                 if (floatingActionButton != null) {
-                                                                                                                    i = 2131362313;
-                                                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362313);
+                                                                                                                    i = 2131362324;
+                                                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362324);
                                                                                                                     if (linearLayout != null) {
-                                                                                                                        i = 2131362314;
-                                                                                                                        TextView textView2 = (TextView) view.findViewById(2131362314);
+                                                                                                                        i = 2131362325;
+                                                                                                                        TextView textView2 = (TextView) view.findViewById(2131362325);
                                                                                                                         if (textView2 != null) {
-                                                                                                                            i = 2131362315;
-                                                                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362315);
+                                                                                                                            i = 2131362326;
+                                                                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362326);
                                                                                                                             if (linearLayout2 != null) {
-                                                                                                                                i = 2131362316;
-                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362316);
+                                                                                                                                i = 2131362327;
+                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362327);
                                                                                                                                 if (linearLayout3 != null) {
-                                                                                                                                    i = 2131364560;
-                                                                                                                                    TextView textView3 = (TextView) view.findViewById(2131364560);
+                                                                                                                                    i = 2131364599;
+                                                                                                                                    TextView textView3 = (TextView) view.findViewById(2131364599);
                                                                                                                                     if (textView3 != null) {
                                                                                                                                         return new WidgetChannelSettingsEditPermissionsBinding((CoordinatorLayout) view, ternaryCheckBox, ternaryCheckBox2, ternaryCheckBox3, ternaryCheckBox4, ternaryCheckBox5, ternaryCheckBox6, ternaryCheckBox7, ternaryCheckBox8, ternaryCheckBox9, ternaryCheckBox10, ternaryCheckBox11, ternaryCheckBox12, ternaryCheckBox13, ternaryCheckBox14, ternaryCheckBox15, ternaryCheckBox16, ternaryCheckBox17, ternaryCheckBox18, ternaryCheckBox19, ternaryCheckBox20, ternaryCheckBox21, ternaryCheckBox22, ternaryCheckBox23, ternaryCheckBox24, simpleDraweeView, textView, floatingActionButton, linearLayout, textView2, linearLayout2, linearLayout3, textView3);
                                                                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java
index edf7b64989..66d4bd49f1 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java
@@ -16,8 +16,8 @@ public final class WidgetChannelSettingsEditPermissions$configureUI$1<T1, T2> im
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363885) {
-            WidgetChannelSettingsEditPermissions.access$deletePermissionOverwrites(this.this$0, this.$model.getChannel().g(), WidgetChannelSettingsEditPermissions.access$getTargetId$p(this.this$0));
+        if (menuItem.getItemId() == 2131363926) {
+            WidgetChannelSettingsEditPermissions.access$deletePermissionOverwrites(this.this$0, this.$model.getChannel().h(), WidgetChannelSettingsEditPermissions.access$getTargetId$p(this.this$0));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$2.java
index 916d0277ff..a4fe9b75f2 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$2.java
@@ -13,6 +13,6 @@ public final class WidgetChannelSettingsEditPermissions$configureUI$2 implements
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSettingsEditPermissions.access$updatePermissionOverwrites(this.this$0, this.$model.getChannel().g(), this.$model.getTargetId(), this.$model.getType());
+        WidgetChannelSettingsEditPermissions.access$updatePermissionOverwrites(this.this$0, this.$model.getChannel().h(), this.$model.getTargetId(), this.$model.getType());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java
index c992968e16..3ae09b67a6 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java
@@ -19,6 +19,6 @@ public final class WidgetChannelSettingsEditPermissions$permissionCheckboxes$2 e
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final List<? extends TernaryCheckBox> mo1invoke() {
-        return n.listOf((Object[]) new TernaryCheckBox[]{WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).b, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1697c, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).d, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).e, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).h, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).i, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).j, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).k, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).l, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).m, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).n, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).o, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).q, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).p, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).g, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).r, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1698s, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).t, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).u, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).w, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1700y, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1699x, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).v, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f});
+        return n.listOf((Object[]) new TernaryCheckBox[]{WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).b, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1694c, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).d, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).e, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).h, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).i, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).j, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).k, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).l, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).m, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).n, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).o, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).q, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).p, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).g, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).r, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1695s, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).t, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).u, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).w, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1697y, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1696x, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).v, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f});
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java
index baca49a52e..db1b3e4dc7 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java
@@ -96,56 +96,56 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         @SuppressLint({"NonConstantResourceId"})
         private final long getPermission(@IdRes int i) {
             switch (i) {
-                case 2131362285:
+                case 2131362296:
                     return 1;
-                case 2131362286:
+                case 2131362297:
                     return 16;
-                case 2131362287:
+                case 2131362298:
                     return 268435456;
-                case 2131362288:
+                case 2131362299:
                     return 536870912;
-                case 2131362289:
+                case 2131362300:
                 default:
                     throw new IllegalArgumentException(a.l("Invalid ID: ", i));
-                case 2131362290:
-                    return 4294967296L;
-                case 2131362291:
-                    return 64;
-                case 2131362292:
-                    return 32768;
-                case 2131362293:
-                    return 16384;
-                case 2131362294:
-                    return 8192;
-                case 2131362295:
-                    return 131072;
-                case 2131362296:
-                    return 65536;
-                case 2131362297:
-                    return 1024;
-                case 2131362298:
-                    return 2048;
-                case 2131362299:
-                    return 4096;
-                case 2131362300:
-                    return 262144;
                 case 2131362301:
-                    return 2147483648L;
+                    return 4294967296L;
                 case 2131362302:
-                    return 1048576;
+                    return 64;
                 case 2131362303:
-                    return 8388608;
+                    return 32768;
                 case 2131362304:
-                    return 16777216;
+                    return 16384;
                 case 2131362305:
-                    return 4194304;
+                    return 8192;
                 case 2131362306:
-                    return 256;
+                    return 131072;
                 case 2131362307:
-                    return 2097152;
+                    return 65536;
                 case 2131362308:
-                    return 33554432;
+                    return 1024;
                 case 2131362309:
+                    return 2048;
+                case 2131362310:
+                    return 4096;
+                case 2131362311:
+                    return 262144;
+                case 2131362312:
+                    return 2147483648L;
+                case 2131362313:
+                    return 1048576;
+                case 2131362314:
+                    return 8388608;
+                case 2131362315:
+                    return 16777216;
+                case 2131362316:
+                    return 4194304;
+                case 2131362317:
+                    return 256;
+                case 2131362318:
+                    return 2097152;
+                case 2131362319:
+                    return 33554432;
+                case 2131362320:
                     return 512;
             }
         }
@@ -175,7 +175,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
     }
 
     public WidgetChannelSettingsEditPermissions() {
-        super(2131558884);
+        super(2131558887);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelSettingsEditPermissions widgetChannelSettingsEditPermissions, WidgetChannelSettingsEditPermissionsModel widgetChannelSettingsEditPermissionsModel) {
@@ -227,9 +227,9 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             }
             return;
         }
-        List<PermissionOverwrite> r = widgetChannelSettingsEditPermissionsModel.getChannel().r();
-        if (r != null) {
-            Iterator<T> it = r.iterator();
+        List<PermissionOverwrite> s2 = widgetChannelSettingsEditPermissionsModel.getChannel().s();
+        if (s2 != null) {
+            Iterator<T> it = s2.iterator();
             while (true) {
                 if (!it.hasNext()) {
                     obj = null;
@@ -256,7 +256,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         setActionBarSubtitle(AnimatableValueParser.z0(widgetChannelSettingsEditPermissionsModel.getChannel(), requireContext(), true));
         AppFragment.setActionBarOptionsMenu$default(this, i, new WidgetChannelSettingsEditPermissions$configureUI$1(this, widgetChannelSettingsEditPermissionsModel), null, 4, null);
         if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForRole) {
-            SimpleDraweeView simpleDraweeView = getBinding().f1701z;
+            SimpleDraweeView simpleDraweeView = getBinding().f1698z;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.channelPermissionsAvatar");
             simpleDraweeView.setVisibility(8);
             Companion companion = Companion;
@@ -266,7 +266,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             Companion.access$setTextWithFont(companion, textView, modelForRole.getGuildRole().f(), 2130969326);
             getBinding().D.setTextColor(RoleUtils.getRoleColor$default(modelForRole.getGuildRole(), requireContext(), null, 2, null));
         } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForUser) {
-            SimpleDraweeView simpleDraweeView2 = getBinding().f1701z;
+            SimpleDraweeView simpleDraweeView2 = getBinding().f1698z;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.channelPermissionsAvatar");
             simpleDraweeView2.setVisibility(0);
             Companion companion2 = Companion;
@@ -274,7 +274,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
             m.checkNotNullExpressionValue(textView2, "binding.channelPermissionsTargetName");
             WidgetChannelSettingsEditPermissionsModel.ModelForUser modelForUser = (WidgetChannelSettingsEditPermissionsModel.ModelForUser) widgetChannelSettingsEditPermissionsModel;
             Companion.access$setTextWithFont(companion2, textView2, modelForUser.getUser().getUsername(), 2130969325);
-            SimpleDraweeView simpleDraweeView3 = getBinding().f1701z;
+            SimpleDraweeView simpleDraweeView3 = getBinding().f1698z;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.channelPermissionsAvatar");
             IconUtils.setIcon$default(simpleDraweeView3, modelForUser.getUser(), 2131165296, null, null, null, 56, null);
         }
@@ -283,24 +283,24 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         textView3.setText(AnimatableValueParser.z0(widgetChannelSettingsEditPermissionsModel.getChannel(), requireContext(), true));
         LinearLayout linearLayout = getBinding().E;
         m.checkNotNullExpressionValue(linearLayout, "binding.channelPermissionsTextContainer");
-        linearLayout.setVisibility(AnimatableValueParser.j1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
+        linearLayout.setVisibility(AnimatableValueParser.k1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
         LinearLayout linearLayout2 = getBinding().F;
         m.checkNotNullExpressionValue(linearLayout2, "binding.channelPermissionsVoiceContainer");
-        linearLayout2.setVisibility(AnimatableValueParser.k1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
+        linearLayout2.setVisibility(AnimatableValueParser.l1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
         LinearLayout linearLayout3 = getBinding().C;
         m.checkNotNullExpressionValue(linearLayout3, "binding.channelPermissionsStageContainer");
-        linearLayout3.setVisibility(AnimatableValueParser.u1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
+        linearLayout3.setVisibility(AnimatableValueParser.v1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
         TernaryCheckBox ternaryCheckBox = getBinding().e;
         m.checkNotNullExpressionValue(ternaryCheckBox, "binding.channelPermissionGeneralManageWebhooks");
-        ternaryCheckBox.setVisibility(AnimatableValueParser.j1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
+        ternaryCheckBox.setVisibility(AnimatableValueParser.k1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8);
         if (AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel())) {
-            getBinding().G.setText(2131892847);
+            getBinding().G.setText(2131892928);
         }
         Map<Integer, PermissionLabelOverrides> categoryLabels = ChannelPermissionUtilsKt.getCategoryLabels(requireContext());
-        boolean z3 = widgetChannelSettingsEditPermissionsModel.getType() == 1 && widgetChannelSettingsEditPermissionsModel.getTargetId() == widgetChannelSettingsEditPermissionsModel.getChannel().e();
-        List<PermissionOverwrite> r2 = widgetChannelSettingsEditPermissionsModel.getChannel().r();
-        m.checkNotNull(r2);
-        Iterator<PermissionOverwrite> it2 = r2.iterator();
+        boolean z3 = widgetChannelSettingsEditPermissionsModel.getType() == 1 && widgetChannelSettingsEditPermissionsModel.getTargetId() == widgetChannelSettingsEditPermissionsModel.getChannel().f();
+        List<PermissionOverwrite> s3 = widgetChannelSettingsEditPermissionsModel.getChannel().s();
+        m.checkNotNull(s3);
+        Iterator<PermissionOverwrite> it2 = s3.iterator();
         while (true) {
             if (!it2.hasNext()) {
                 permissionOverwrite2 = null;
@@ -314,15 +314,15 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         for (TernaryCheckBox ternaryCheckBox2 : getPermissionCheckboxes()) {
             int id2 = ternaryCheckBox2.getId();
             long access$getPermission = Companion.access$getPermission(Companion, id2);
-            if (widgetChannelSettingsEditPermissionsModel.getChannel().z() == 13 && STAGE_HIDDEN_PERMISSIONS.contains(Long.valueOf(access$getPermission))) {
+            if (widgetChannelSettingsEditPermissionsModel.getChannel().A() == 13 && STAGE_HIDDEN_PERMISSIONS.contains(Long.valueOf(access$getPermission))) {
                 ternaryCheckBox2.setVisibility(8);
             }
             setupPermissionEnabledState(ternaryCheckBox2, access$getPermission, widgetChannelSettingsEditPermissionsModel);
             setupPermissionCheckedState(ternaryCheckBox2, permissionOverwrite2);
-            if (id2 == 2131362306) {
-                ternaryCheckBox2.setSubtext(b.i(ternaryCheckBox2, 2131892838, new Object[]{getString(2131890739)}, null, 4));
+            if (id2 == 2131362317) {
+                ternaryCheckBox2.setSubtext(b.i(ternaryCheckBox2, 2131892919, new Object[]{getString(2131890807)}, null, 4));
             }
-            updateCheckboxLabels(ternaryCheckBox2, widgetChannelSettingsEditPermissionsModel.getChannel().z(), z3, categoryLabels.get(Integer.valueOf(id2)));
+            updateCheckboxLabels(ternaryCheckBox2, widgetChannelSettingsEditPermissionsModel.getChannel().A(), z3, categoryLabels.get(Integer.valueOf(id2)));
         }
         getBinding().B.setOnClickListener(new WidgetChannelSettingsEditPermissions$configureUI$2(this, widgetChannelSettingsEditPermissionsModel));
         StatefulViews statefulViews = this.state;
@@ -393,8 +393,8 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
     }
 
     private final void setupPermissionEnabledState(TernaryCheckBox ternaryCheckBox, long j, WidgetChannelSettingsEditPermissionsModel widgetChannelSettingsEditPermissionsModel) {
-        if (AnimatableValueParser.u1(widgetChannelSettingsEditPermissionsModel.getChannel()) && STAGE_DISABLED_PERMISSIONS.contains(Long.valueOf(j))) {
-            ternaryCheckBox.setDisabled(2131893340);
+        if (AnimatableValueParser.v1(widgetChannelSettingsEditPermissionsModel.getChannel()) && STAGE_DISABLED_PERMISSIONS.contains(Long.valueOf(j))) {
+            ternaryCheckBox.setDisabled(2131893423);
         } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForUser) {
             WidgetChannelSettingsEditPermissionsModel.ModelForUser modelForUser = (WidgetChannelSettingsEditPermissionsModel.ModelForUser) widgetChannelSettingsEditPermissionsModel;
             if (modelForUser.isMe()) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java
index 5217dc3cf0..f85aea1e76 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1.java
@@ -79,7 +79,7 @@ public final class WidgetChannelSettingsEditPermissionsModel$Companion$getForRol
             WidgetChannelSettingsEditPermissionsModel.Companion companion = WidgetChannelSettingsEditPermissionsModel.Companion;
             m.checkNotNullExpressionValue(meUser, "meUser");
             if (WidgetChannelSettingsEditPermissionsModel.Companion.access$isAbleToManagePerms(companion, guild, meUser, l.longValue())) {
-                ArrayList arrayList = new ArrayList(channel.r() != null ? channel.r() : n.emptyList());
+                ArrayList arrayList = new ArrayList(channel.s() != null ? channel.s() : n.emptyList());
                 long j = this.$targetRoleId;
                 PermissionOverwrite.Type type = PermissionOverwrite.Type.ROLE;
                 PermissionOverwrite permissionOverwrite = new PermissionOverwrite(j, type, 0, 137438428927L);
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java
index 77b46c22df..8e8281e210 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissionsModel.java
@@ -39,18 +39,18 @@ public abstract class WidgetChannelSettingsEditPermissionsModel {
             StoreStream.Companion companion = StoreStream.Companion;
             Observable f = Observable.f(companion.getChannels().observeChannel(j2), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeGuild(j), companion.getPermissions().observePermissionsForChannel(j2), companion.getGuilds().observeRoles(j), companion.getGuilds().observeComputed(j), new WidgetChannelSettingsEditPermissionsModel$Companion$getForRole$1(j3));
             m.checkNotNullExpressionValue(f, "Observable\n            .…          }\n            }");
-            Observable<WidgetChannelSettingsEditPermissionsModel> s2 = ObservableExtensionsKt.computationLatest(f).s();
-            m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-            return s2;
+            Observable<WidgetChannelSettingsEditPermissionsModel> r = ObservableExtensionsKt.computationLatest(f).r();
+            m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+            return r;
         }
 
         private final Observable<WidgetChannelSettingsEditPermissionsModel> getForUser(long j, long j2, long j3) {
             StoreStream.Companion companion = StoreStream.Companion;
             Observable g = Observable.g(companion.getChannels().observeChannel(j2), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getUsers().observeUser(j3), companion.getGuilds().observeGuild(j), companion.getPermissions().observePermissionsForChannel(j2), WidgetChannelSettingsEditPermissionsModel$Companion$getForUser$1.INSTANCE);
             m.checkNotNullExpressionValue(g, "Observable\n            .…          }\n            }");
-            Observable<WidgetChannelSettingsEditPermissionsModel> s2 = ObservableExtensionsKt.computationLatest(g).s();
-            m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-            return s2;
+            Observable<WidgetChannelSettingsEditPermissionsModel> r = ObservableExtensionsKt.computationLatest(g).r();
+            m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+            return r;
         }
 
         private final boolean isAbleToManagePerms(Guild guild, MeUser meUser, long j) {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
index 0f69a26bca..f3ce2ba016 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddMember.java
@@ -45,7 +45,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     public static final /* synthetic */ int i = 0;
     private SimpleMembersAdapter membersAdapter;
     private RecyclerView membersRecycler;
-    private final Subject<String, String> nameFilterPublisher = BehaviorSubject.m0("");
+    private final Subject<String, String> nameFilterPublisher = BehaviorSubject.l0("");
     private TextInputLayout searchBox;
     private ViewFlipper viewFlipper;
 
@@ -74,11 +74,11 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
         }
 
         public static Observable<Model> get(long j, long j2, Observable<String> observable) {
-            return StoreStream.getChannels().observeChannel(j2).Z(new d(j, j2, observable));
+            return StoreStream.getChannels().observeChannel(j2).Y(new d(j, j2, observable));
         }
 
         private static Observable<List<SimpleMembersAdapter.MemberItem>> getMemberItems(long j, @Nullable List<PermissionOverwrite> list, String str) {
-            return StoreStream.getGuilds().observeComputed(j).Z(new f(list, str.toLowerCase(Locale.getDefault())));
+            return StoreStream.getGuilds().observeComputed(j).Y(new f(list, str.toLowerCase(Locale.getDefault())));
         }
 
         private static boolean isValid(MeUser meUser, Guild guild, Channel channel, List<SimpleMembersAdapter.MemberItem> list) {
@@ -86,7 +86,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
         }
 
         public static /* synthetic */ Observable lambda$null$0(long j, Channel channel, String str) {
-            return getMemberItems(j, channel.r(), str);
+            return getMemberItems(j, channel.s(), str);
         }
 
         public static /* synthetic */ Model lambda$null$1(Channel channel, MeUser meUser, Guild guild, Long l, List list) {
@@ -145,7 +145,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     }
 
     public WidgetChannelSettingsPermissionsAddMember() {
-        super(2131558885);
+        super(2131558888);
     }
 
     private void configureToolbar(Channel channel) {
@@ -185,9 +185,9 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBound(@NonNull View view) {
         super.onViewBound(view);
-        this.membersRecycler = (RecyclerView) view.findViewById(2131362338);
-        this.searchBox = (TextInputLayout) view.findViewById(2131362337);
-        this.viewFlipper = (ViewFlipper) view.findViewById(2131362339);
+        this.membersRecycler = (RecyclerView) view.findViewById(2131362352);
+        this.searchBox = (TextInputLayout) view.findViewById(2131362351);
+        this.viewFlipper = (ViewFlipper) view.findViewById(2131362353);
         setActionBarDisplayHomeAsUpEnabled();
         this.membersAdapter = (SimpleMembersAdapter) MGRecyclerAdapter.configure(new SimpleMembersAdapter(this.membersRecycler));
     }
@@ -199,7 +199,7 @@ public class WidgetChannelSettingsPermissionsAddMember extends AppFragment {
         long longExtra2 = getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", -1);
         ViewExtensions.addBindedTextWatcher(this.searchBox, this, new m(this));
         this.nameFilterPublisher.onNext(ViewExtensions.getTextOrEmpty(this.searchBox));
-        this.nameFilterPublisher.o(750, TimeUnit.MILLISECONDS).y(n.i).k(q.e(new b(longExtra), getClass()));
+        this.nameFilterPublisher.o(750, TimeUnit.MILLISECONDS).x(n.i).k(q.e(new b(longExtra), getClass()));
         Observable<Model> observable = Model.get(longExtra, longExtra2, this.nameFilterPublisher);
         d0.z.d.m.checkNotNullParameter(this, "appComponent");
         d0.z.d.m.checkNotNullExpressionValue(observable, "it");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
index ce0f199881..8b0bcadbfa 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAddRole.java
@@ -54,7 +54,7 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
         }
 
         public static Observable<Model> get(long j) {
-            return StoreStream.getChannels().observeChannel(j).Z(new p(j)).k(c.a.d.p.i);
+            return StoreStream.getChannels().observeChannel(j).Y(new p(j)).k(c.a.d.p.i);
         }
 
         private static boolean isValid(Guild guild, Channel channel) {
@@ -117,7 +117,7 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
     }
 
     public WidgetChannelSettingsPermissionsAddRole() {
-        super(2131558886);
+        super(2131558889);
     }
 
     private void configureToolbar(Channel channel) {
@@ -148,7 +148,7 @@ public class WidgetChannelSettingsPermissionsAddRole extends AppFragment {
     public void onViewBound(@NonNull View view) {
         super.onViewBound(view);
         setActionBarDisplayHomeAsUpEnabled();
-        this.rolesRecycler = (RecyclerView) view.findViewById(2131362340);
+        this.rolesRecycler = (RecyclerView) view.findViewById(2131362354);
         this.rolesAdapter = (SimpleRolesAdapter) MGRecyclerAdapter.configure(new SimpleRolesAdapter(this.rolesRecycler));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$1.java
index e230a5a43d..0ecf2e6eef 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$1.java
@@ -66,12 +66,12 @@ public final class WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$
         /* JADX WARN: Multi-variable type inference failed */
         /* JADX WARNING: Unknown variable types count: 1 */
         public final Observable<? extends List<SimpleMembersAdapter.MemberItem>> call(Map<Long, ? extends User> map) {
-            Observable B = Observable.B(map.values());
+            Observable A = Observable.A(map.values());
             AnonymousClass1 r0 = AnonymousClass1.INSTANCE;
             if (r0 != null) {
                 r0 = new WidgetChannelSettingsPermissionsAdvanced$sam$rx_functions_Func2$0(r0);
             }
-            return B.U((Func2) r0).G(AnonymousClass2.INSTANCE).g0();
+            return A.T((Func2) r0).F(AnonymousClass2.INSTANCE).f0();
         }
     }
 
@@ -116,6 +116,6 @@ public final class WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$
         }
         Collection<Long> access$getOverwriteIds = WidgetChannelSettingsPermissionsAdvanced.Model.Companion.access$getOverwriteIds(WidgetChannelSettingsPermissionsAdvanced.Model.Companion, channel, PermissionOverwrite.Type.MEMBER);
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.g(companion.getGuilds().observeGuild(channel.e()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(this.$channelId), companion.getGuilds().observeRoles(channel.e()), companion.getUsers().observeUsers(access$getOverwriteIds).Z(AnonymousClass1.INSTANCE), new AnonymousClass2(channel));
+        return Observable.g(companion.getGuilds().observeGuild(channel.f()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(this.$channelId), companion.getGuilds().observeRoles(channel.f()), companion.getUsers().observeUsers(access$getOverwriteIds).Y(AnonymousClass1.INSTANCE), new AnonymousClass2(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureMembers$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureMembers$1.java
index 5d475ceb04..cf4af1a0c2 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureMembers$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureMembers$1.java
@@ -28,6 +28,6 @@ public final class WidgetChannelSettingsPermissionsAdvanced$configureMembers$1 e
 
     public final void invoke(User user) {
         m.checkNotNullParameter(user, "user");
-        WidgetChannelSettingsEditPermissions.Companion.createForUser(this.this$0.requireContext(), this.$model.getGuild().getId(), this.$model.getChannel().g(), user.getId());
+        WidgetChannelSettingsEditPermissions.Companion.createForUser(this.this$0.requireContext(), this.$model.getGuild().getId(), this.$model.getChannel().h(), user.getId());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureRoles$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureRoles$1.java
index 668544e8a3..5894fd9f8d 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureRoles$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureRoles$1.java
@@ -32,8 +32,8 @@ public final class WidgetChannelSettingsPermissionsAdvanced$configureRoles$1 ext
         WidgetChannelSettingsEditPermissions.Companion companion = WidgetChannelSettingsEditPermissions.Companion;
         Context requireContext = this.this$0.requireContext();
         long id2 = this.$model.getGuild().getId();
-        long g = this.$model.getChannel().g();
+        long h = this.$model.getChannel().h();
         m.checkNotNull(guildRole);
-        companion.createForRole(requireContext, id2, g, guildRole.getId());
+        companion.createForRole(requireContext, id2, h, guildRole.getId());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java
index b4b0b4bd90..8cdbfbec11 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java
@@ -16,9 +16,9 @@ public final class WidgetChannelSettingsPermissionsAdvanced$configureUI$1 implem
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (this.$model.getCanAddRole()) {
-            WidgetChannelSettingsPermissionsAddRole.create(this.this$0.getContext(), this.$model.getChannel().g());
+            WidgetChannelSettingsPermissionsAddRole.create(this.this$0.getContext(), this.$model.getChannel().h());
         } else {
-            o.i(this.this$0, 2131891759, 0, 4);
+            o.i(this.this$0, 2131891831, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$2.java
index e4ae1aa999..6900f6455a 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$2.java
@@ -14,6 +14,6 @@ public final class WidgetChannelSettingsPermissionsAdvanced$configureUI$2 implem
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSettingsPermissionsAddMember.create(this.this$0.getContext(), this.$model.getGuild().getId(), this.$model.getChannel().g());
+        WidgetChannelSettingsPermissionsAddMember.create(this.this$0.getContext(), this.$model.getGuild().getId(), this.$model.getChannel().h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java
index dff47dbae6..da4fd170ca 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java
@@ -25,17 +25,17 @@ public final /* synthetic */ class WidgetChannelSettingsPermissionsAdvanced$view
             i = 2131361921;
             TextView textView2 = (TextView) view.findViewById(2131361921);
             if (textView2 != null) {
-                i = 2131363856;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363856);
+                i = 2131363897;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363897);
                 if (linearLayout != null) {
-                    i = 2131363858;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363858);
+                    i = 2131363899;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363899);
                     if (recyclerView != null) {
-                        i = 2131364500;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364500);
+                        i = 2131364538;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364538);
                         if (linearLayout2 != null) {
-                            i = 2131364503;
-                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364503);
+                            i = 2131364541;
+                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364541);
                             if (recyclerView2 != null) {
                                 return new WidgetChannelSettingsPermissionsAdvancedBinding((CoordinatorLayout) view, textView, textView2, linearLayout, recyclerView, linearLayout2, recyclerView2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
index f8d1737757..fcdd2aed74 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java
@@ -53,7 +53,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         private final Map<Long, GuildRole> guildRoles;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2126me;
+        private final MeUser f2133me;
         private final List<SimpleMembersAdapter.MemberItem> memberItems;
         private final long myPermissions;
         private final List<SimpleRolesAdapter.RoleItem> roleItems;
@@ -72,12 +72,12 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
             }
 
             private final Collection<Long> getOverwriteIds(Channel channel, PermissionOverwrite.Type type) {
-                List<PermissionOverwrite> r = channel.r();
-                if (r == null) {
+                List<PermissionOverwrite> s2 = channel.s();
+                if (s2 == null) {
                     return n.emptyList();
                 }
                 ArrayList<PermissionOverwrite> arrayList = new ArrayList();
-                for (Object obj : r) {
+                for (Object obj : s2) {
                     if (((PermissionOverwrite) obj).f() == type) {
                         arrayList.add(obj);
                     }
@@ -90,9 +90,9 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(Z, "getChannels()\n          …          }\n            }");
-                return Z;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetChannelSettingsPermissionsAdvanced$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "getChannels()\n          …          }\n            }");
+                return Y;
             }
 
             public final boolean isValid(MeUser meUser, Guild guild, Channel channel, Long l) {
@@ -106,7 +106,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
             m.checkNotNullParameter(channel, "channel");
             m.checkNotNullParameter(map, "guildRoles");
             m.checkNotNullParameter(list, "memberItems");
-            this.f2126me = meUser;
+            this.f2133me = meUser;
             this.guild = guild;
             this.channel = channel;
             this.myPermissions = j;
@@ -134,7 +134,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, Guild guild, Channel channel, long j, Map map, List list, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = model.f2126me;
+                meUser = model.f2133me;
             }
             if ((i & 2) != 0) {
                 guild = model.guild;
@@ -155,7 +155,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         }
 
         public final MeUser component1() {
-            return this.f2126me;
+            return this.f2133me;
         }
 
         public final Guild component2() {
@@ -195,7 +195,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.f2126me, model.f2126me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles) && m.areEqual(this.memberItems, model.memberItems);
+            return m.areEqual(this.f2133me, model.f2133me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles) && m.areEqual(this.memberItems, model.memberItems);
         }
 
         public final boolean getCanAddRole() {
@@ -219,7 +219,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         }
 
         public final MeUser getMe() {
-            return this.f2126me;
+            return this.f2133me;
         }
 
         public final List<SimpleMembersAdapter.MemberItem> getMemberItems() {
@@ -235,7 +235,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2126me;
+            MeUser meUser = this.f2133me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             Guild guild = this.guild;
@@ -253,7 +253,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
 
         public String toString() {
             StringBuilder L = a.L("Model(me=");
-            L.append(this.f2126me);
+            L.append(this.f2133me);
             L.append(", guild=");
             L.append(this.guild);
             L.append(", channel=");
@@ -268,7 +268,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
     }
 
     public WidgetChannelSettingsPermissionsAdvanced() {
-        super(2131558887);
+        super(2131558890);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelSettingsPermissionsAdvanced widgetChannelSettingsPermissionsAdvanced, Model model) {
@@ -311,7 +311,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
 
     private final void configureUI(Model model) {
         if (model != null && model.getCanManage()) {
-            getViewBinding().f1702c.setOnClickListener(new WidgetChannelSettingsPermissionsAdvanced$configureUI$1(this, model));
+            getViewBinding().f1699c.setOnClickListener(new WidgetChannelSettingsPermissionsAdvanced$configureUI$1(this, model));
             getViewBinding().b.setOnClickListener(new WidgetChannelSettingsPermissionsAdvanced$configureUI$2(this, model));
             configureRoles(model);
             configureMembers(model);
@@ -346,8 +346,8 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> s2 = Model.Companion.get(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", -1)).o(1, TimeUnit.SECONDS).s();
-        m.checkNotNullExpressionValue(s2, "Model[channelId]\n       …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetChannelSettingsPermissionsAdvanced.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsPermissionsAdvanced$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<Model> r = Model.Companion.get(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", -1)).o(1, TimeUnit.SECONDS).r();
+        m.checkNotNullExpressionValue(r, "Model[channelId]\n       …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetChannelSettingsPermissionsAdvanced.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsPermissionsAdvanced$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1.java
index e1c9c99e7a..93eec96ba7 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1.java
@@ -56,6 +56,6 @@ public final class WidgetChannelSettingsPermissionsOverview$Model$Companion$get$
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.h(companion.getGuilds().observeGuild(channel.e()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(this.$channelId), companion.getGuilds().observeRoles(channel.e()), new AnonymousClass1(channel));
+        return Observable.h(companion.getGuilds().observeGuild(channel.f()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(this.$channelId), companion.getGuilds().observeRoles(channel.f()), new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java
index d87c4d694e..6e3e1f9d69 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java
@@ -22,14 +22,14 @@ public final /* synthetic */ class WidgetChannelSettingsPermissionsOverview$view
         int i = 2131361924;
         FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131361924);
         if (fragmentContainerView != null) {
-            i = 2131363211;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363211);
+            i = 2131363236;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363236);
             if (appViewFlipper != null) {
-                i = 2131364564;
-                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131364564);
+                i = 2131364603;
+                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131364603);
                 if (segmentedControlContainer != null) {
-                    i = 2131365013;
-                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365013);
+                    i = 2131365063;
+                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365063);
                     if (fragmentContainerView2 != null) {
                         return new WidgetChannelSettingsPermissionsOverviewBinding((CoordinatorLayout) view, fragmentContainerView, appViewFlipper, segmentedControlContainer, fragmentContainerView2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewModel$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewModel$2.java
index c6955a963e..bf37e4337b 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewModel$2.java
@@ -21,6 +21,6 @@ public final class WidgetChannelSettingsPermissionsOverview$viewModel$2 extends
     public final AppViewModel<WidgetChannelSettingsPermissionsOverviewViewModel.ViewState> mo1invoke() {
         long access$getChannelIdFromIntent = WidgetChannelSettingsPermissionsOverview.access$getChannelIdFromIntent(this.this$0);
         Channel channel = StoreStream.Companion.getChannels().getChannel(access$getChannelIdFromIntent);
-        return new WidgetChannelSettingsPermissionsOverviewViewModel(access$getChannelIdFromIntent, channel != null && channel.z() == 13);
+        return new WidgetChannelSettingsPermissionsOverviewViewModel(access$getChannelIdFromIntent, channel != null && channel.A() == 13);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
index a3e2c10cc4..683fb9b8e2 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java
@@ -72,7 +72,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         private final Map<Long, GuildRole> guildRoles;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2127me;
+        private final MeUser f2134me;
         private final long myPermissions;
 
         /* compiled from: WidgetChannelSettingsPermissionsOverview.kt */
@@ -85,9 +85,9 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(Z, "StoreStream.getChannels(…          }\n            }");
-                return Z;
+                Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new WidgetChannelSettingsPermissionsOverview$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream.getChannels(…          }\n            }");
+                return Y;
             }
 
             public final boolean isValid(MeUser meUser, Guild guild, Channel channel, Long l) {
@@ -100,7 +100,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             m.checkNotNullParameter(guild, "guild");
             m.checkNotNullParameter(channel, "channel");
             m.checkNotNullParameter(map, "guildRoles");
-            this.f2127me = meUser;
+            this.f2134me = meUser;
             this.guild = guild;
             this.channel = channel;
             this.myPermissions = j;
@@ -112,7 +112,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, Guild guild, Channel channel, long j, Map map, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = model.f2127me;
+                meUser = model.f2134me;
             }
             if ((i & 2) != 0) {
                 guild = model.guild;
@@ -130,7 +130,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         }
 
         public final MeUser component1() {
-            return this.f2127me;
+            return this.f2134me;
         }
 
         public final Guild component2() {
@@ -165,7 +165,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.f2127me, model.f2127me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles);
+            return m.areEqual(this.f2134me, model.f2134me) && m.areEqual(this.guild, model.guild) && m.areEqual(this.channel, model.channel) && this.myPermissions == model.myPermissions && m.areEqual(this.guildRoles, model.guildRoles);
         }
 
         public final boolean getCanManage() {
@@ -185,7 +185,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         }
 
         public final MeUser getMe() {
-            return this.f2127me;
+            return this.f2134me;
         }
 
         public final long getMyPermissions() {
@@ -193,7 +193,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2127me;
+            MeUser meUser = this.f2134me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             Guild guild = this.guild;
@@ -209,7 +209,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
 
         public String toString() {
             StringBuilder L = a.L("Model(me=");
-            L.append(this.f2127me);
+            L.append(this.f2134me);
             L.append(", guild=");
             L.append(this.guild);
             L.append(", channel=");
@@ -242,7 +242,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
     }
 
     public WidgetChannelSettingsPermissionsOverview() {
-        super(2131558888);
+        super(2131558891);
         WidgetChannelSettingsPermissionsOverview$viewModel$2 widgetChannelSettingsPermissionsOverview$viewModel$2 = new WidgetChannelSettingsPermissionsOverview$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetChannelSettingsPermissionsOverviewViewModel.class), new WidgetChannelSettingsPermissionsOverview$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelSettingsPermissionsOverview$viewModel$2));
@@ -278,7 +278,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             m.checkNotNullExpressionValue(appViewFlipper2, "viewBinding.flipper");
             appViewFlipper2.setDisplayedChild(1);
         }
-        SegmentedControlContainer segmentedControlContainer = getViewBinding().f1703c;
+        SegmentedControlContainer segmentedControlContainer = getViewBinding().f1700c;
         int ordinal2 = viewState.getSelectedTab().ordinal();
         if (ordinal2 == 0) {
             i = 0;
@@ -288,8 +288,8 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
             throw new NoWhenBranchMatchedException();
         }
         segmentedControlContainer.a(i);
-        getViewBinding().f1703c.setOnSegmentSelectedChangeListener(new WidgetChannelSettingsPermissionsOverview$configureTabs$1(this));
-        SegmentedControlContainer segmentedControlContainer2 = getViewBinding().f1703c;
+        getViewBinding().f1700c.setOnSegmentSelectedChangeListener(new WidgetChannelSettingsPermissionsOverview$configureTabs$1(this));
+        SegmentedControlContainer segmentedControlContainer2 = getViewBinding().f1700c;
         m.checkNotNullExpressionValue(segmentedControlContainer2, "viewBinding.segmentedControl");
         if (viewState.getAvailableTabs().size() <= 1) {
             z2 = false;
@@ -335,9 +335,9 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> s2 = Model.Companion.get(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", -1)).s();
-        m.checkNotNullExpressionValue(s2, "Model\n        .get(chann…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetChannelSettingsPermissionsOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsPermissionsOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<Model> r = Model.Companion.get(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", -1)).r();
+        m.checkNotNullExpressionValue(r, "Model\n        .get(chann…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetChannelSettingsPermissionsOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsPermissionsOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetChannelSettingsPermissionsOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsPermissionsOverview$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java
index 05ab3293ce..d665ede815 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetCreateChannelAddMember$binding$2 extend
 
     public final WidgetCreateChannelAddMemberBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362749);
+        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362773);
         if (fragmentContainerView != null) {
             return new WidgetCreateChannelAddMemberBinding((LinearLayout) view, fragmentContainerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362749)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362773)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java
index 3e3bcb9093..2c22eb6e63 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java
@@ -27,7 +27,7 @@ public final class WidgetCreateChannelAddMember$onViewBound$2 extends o implemen
 
         public final void call(MenuItem menuItem, Context context) {
             m.checkNotNullExpressionValue(menuItem, "menuItem");
-            if (menuItem.getItemId() == 2131363881) {
+            if (menuItem.getItemId() == 2131363922) {
                 WidgetCreateChannelAddMember widgetCreateChannelAddMember = this.this$0.this$0;
                 Map map = this.$selected;
                 m.checkNotNullExpressionValue(map, "selected");
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java
index f49d02000e..2656915a57 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java
@@ -53,7 +53,7 @@ public final class WidgetCreateChannelAddMember extends AppFragment {
     }
 
     public WidgetCreateChannelAddMember() {
-        super(2131558981);
+        super(2131558985);
     }
 
     public static final /* synthetic */ void access$addPermissionOverwrites(WidgetCreateChannelAddMember widgetCreateChannelAddMember, Map map) {
@@ -89,7 +89,7 @@ public final class WidgetCreateChannelAddMember extends AppFragment {
             }
             return;
         }
-        setActionBarSubtitle(channel.l());
+        setActionBarSubtitle(channel.m());
     }
 
     private final WidgetCreateChannelAddMemberBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java
index 646a67cd53..d4670671aa 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java
@@ -19,11 +19,11 @@ public final /* synthetic */ class WidgetStageChannelModeratorPermissions$viewBi
         int i = 2131361920;
         AddPermissionOwnerView addPermissionOwnerView = (AddPermissionOwnerView) view.findViewById(2131361920);
         if (addPermissionOwnerView != null) {
-            i = 2131363857;
-            PermissionOwnerListView permissionOwnerListView = (PermissionOwnerListView) view.findViewById(2131363857);
+            i = 2131363898;
+            PermissionOwnerListView permissionOwnerListView = (PermissionOwnerListView) view.findViewById(2131363898);
             if (permissionOwnerListView != null) {
-                i = 2131364502;
-                PermissionOwnerListView permissionOwnerListView2 = (PermissionOwnerListView) view.findViewById(2131364502);
+                i = 2131364540;
+                PermissionOwnerListView permissionOwnerListView2 = (PermissionOwnerListView) view.findViewById(2131364540);
                 if (permissionOwnerListView2 != null) {
                     return new WidgetStageChannelModeratorPermissionsBinding((CoordinatorLayout) view, addPermissionOwnerView, permissionOwnerListView, permissionOwnerListView2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
index 392ba40e52..a3f603d131 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java
@@ -32,7 +32,7 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetStageChannelModeratorPermissions() {
-        super(2131559226);
+        super(2131559233);
         WidgetStageChannelModeratorPermissions$viewModel$2 widgetStageChannelModeratorPermissions$viewModel$2 = new WidgetStageChannelModeratorPermissions$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetStageChannelModeratorPermissionsViewModel.class), new WidgetStageChannelModeratorPermissions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStageChannelModeratorPermissions$viewModel$2));
@@ -62,7 +62,7 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment {
             ViewExtensions.setEnabledAlpha$default(addPermissionOwnerView, valid.getCanEditModerators(), 0.0f, 2, null);
             getViewBinding().b.setOnClickListener(new WidgetStageChannelModeratorPermissions$configureUI$1(this, viewState));
             getViewBinding().d.setData(valid.getRoleItems(), new WidgetStageChannelModeratorPermissions$configureUI$2(this));
-            getViewBinding().f1953c.setData(valid.getMemberItems(), new WidgetStageChannelModeratorPermissions$configureUI$3(this));
+            getViewBinding().f1956c.setData(valid.getMemberItems(), new WidgetStageChannelModeratorPermissions$configureUI$3(this));
         }
     }
 
@@ -88,8 +88,8 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetStageChannelModeratorPermissionsViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetStageChannelModeratorPermissions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageChannelModeratorPermissions$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<WidgetStageChannelModeratorPermissionsViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetStageChannelModeratorPermissions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageChannelModeratorPermissions$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel$Companion$observeStores$1.java
index 678d8dc417..7eb13943a2 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel$Companion$observeStores$1.java
@@ -44,19 +44,19 @@ public final class WidgetStageChannelModeratorPermissionsViewModel$Companion$obs
     /* renamed from: invoke */
     public final WidgetStageChannelModeratorPermissionsViewModel.StoreState mo1invoke() {
         Channel channel = this.$channelStore.getChannel(this.$channelId);
-        if (channel == null || channel.z() != 13) {
+        if (channel == null || channel.A() != 13) {
             return WidgetStageChannelModeratorPermissionsViewModel.StoreState.Invalid.INSTANCE;
         }
         Guild guild = (Guild) a.c(channel, this.$guildStore.getGuilds());
         if (guild == null) {
             return WidgetStageChannelModeratorPermissionsViewModel.StoreState.Invalid.INSTANCE;
         }
-        List<PermissionOverwrite> r = channel.r();
-        if (r == null) {
-            r = n.emptyList();
+        List<PermissionOverwrite> s2 = channel.s();
+        if (s2 == null) {
+            s2 = n.emptyList();
         }
         ArrayList<PermissionOverwrite> arrayList = new ArrayList();
-        Iterator<T> it = r.iterator();
+        Iterator<T> it = s2.iterator();
         while (true) {
             boolean z2 = true;
             if (!it.hasNext()) {
@@ -84,6 +84,6 @@ public final class WidgetStageChannelModeratorPermissionsViewModel$Companion$obs
         if (map2 == null) {
             map2 = h0.emptyMap();
         }
-        return new WidgetStageChannelModeratorPermissionsViewModel.StoreState.Valid(guild, r, map, users, map2, this.$userStore.getUsers(m.listOf(Long.valueOf(guild.getOwnerId())), true).get(Long.valueOf(guild.getOwnerId())), StageChannelUtils.computeCanEditStageModerators(this.$permissionStore, this.$guildStore, this.$userStore.getMe().getId(), guild.getId(), channel));
+        return new WidgetStageChannelModeratorPermissionsViewModel.StoreState.Valid(guild, s2, map, users, map2, this.$userStore.getUsers(m.listOf(Long.valueOf(guild.getOwnerId())), true).get(Long.valueOf(guild.getOwnerId())), StageChannelUtils.computeCanEditStageModerators(this.$permissionStore, this.$guildStore, this.$userStore.getMe().getId(), guild.getId(), channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java
index 10bb2edadf..ea1a9e75c6 100644
--- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissionsViewModel.java
@@ -419,9 +419,9 @@ public final class WidgetStageChannelModeratorPermissionsViewModel extends AppVi
 
     public WidgetStageChannelModeratorPermissionsViewModel(long j) {
         super(null, 1, null);
-        Observable s2 = Companion.observeStores$default(Companion, j, null, null, null, null, 30, null).Y(j0.p.a.a()).s();
-        m.checkNotNullExpressionValue(s2, "observeStores(channelId)…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetStageChannelModeratorPermissionsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable r = Companion.observeStores$default(Companion, j, null, null, null, null, 30, null).X(j0.p.a.a()).r();
+        m.checkNotNullExpressionValue(r, "observeStores(channelId)…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetStageChannelModeratorPermissionsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     public static final /* synthetic */ void access$handleStoreState(WidgetStageChannelModeratorPermissionsViewModel widgetStageChannelModeratorPermissionsViewModel, StoreState storeState) {
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$Model$Companion$get$1.java
index 88c227bb94..3c866d84e4 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet$Model$Companion$get$1.java
@@ -1,15 +1,16 @@
 package com.discord.widgets.channels.threads;
 
+import com.discord.models.guild.Guild;
 import com.discord.stores.StoreThreadDraft;
 import com.discord.widgets.channels.threads.WidgetThreadDraftArchiveSheet;
 import d0.z.d.m;
-import j0.k.b;
+import rx.functions.Func2;
 /* compiled from: WidgetThreadDraftArchiveSheet.kt */
-public final class WidgetThreadDraftArchiveSheet$Model$Companion$get$1<T, R> implements b<StoreThreadDraft.ThreadDraftState, WidgetThreadDraftArchiveSheet.Model> {
+public final class WidgetThreadDraftArchiveSheet$Model$Companion$get$1<T1, T2, R> implements Func2<StoreThreadDraft.ThreadDraftState, Guild, WidgetThreadDraftArchiveSheet.Model> {
     public static final WidgetThreadDraftArchiveSheet$Model$Companion$get$1 INSTANCE = new WidgetThreadDraftArchiveSheet$Model$Companion$get$1();
 
-    public final WidgetThreadDraftArchiveSheet.Model call(StoreThreadDraft.ThreadDraftState threadDraftState) {
+    public final WidgetThreadDraftArchiveSheet.Model call(StoreThreadDraft.ThreadDraftState threadDraftState, Guild guild) {
         m.checkNotNullExpressionValue(threadDraftState, "draftState");
-        return new WidgetThreadDraftArchiveSheet.Model(threadDraftState);
+        return new WidgetThreadDraftArchiveSheet.Model(threadDraftState, guild);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java
index 05d9731db7..74a6ef6c71 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java
@@ -1,11 +1,15 @@
 package com.discord.widgets.channels.threads;
 
 import android.content.Context;
+import android.os.Bundle;
+import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import c.d.b.a.a;
+import com.discord.api.guild.GuildFeature;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetThreadArchiveActionsSheetBinding;
+import com.discord.models.guild.Guild;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreThreadDraft;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -22,6 +26,7 @@ import rx.subscriptions.CompositeSubscription;
 public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetThreadDraftArchiveSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetThreadArchiveActionsSheetBinding;", 0)};
     public static final Companion Companion = new Companion(null);
+    private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetThreadDraftArchiveSheet$binding$2.INSTANCE, null, 2, null);
 
     /* compiled from: WidgetThreadDraftArchiveSheet.kt */
@@ -33,9 +38,13 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
             this();
         }
 
-        public final void show(FragmentManager fragmentManager) {
+        public final void show(FragmentManager fragmentManager, long j) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
-            new WidgetThreadDraftArchiveSheet().show(fragmentManager, WidgetThreadDraftArchiveSheet.class.getName());
+            WidgetThreadDraftArchiveSheet widgetThreadDraftArchiveSheet = new WidgetThreadDraftArchiveSheet();
+            Bundle bundle = new Bundle();
+            bundle.putLong("INTENT_EXTRA_GUILD_ID", j);
+            widgetThreadDraftArchiveSheet.setArguments(bundle);
+            widgetThreadDraftArchiveSheet.show(fragmentManager, WidgetThreadDraftArchiveSheet.class.getName());
         }
     }
 
@@ -43,6 +52,7 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
     public static final class Model {
         public static final Companion Companion = new Companion(null);
         private final StoreThreadDraft.ThreadDraftState draftState;
+        private final Guild guild;
 
         /* compiled from: WidgetThreadDraftArchiveSheet.kt */
         public static final class Companion {
@@ -53,58 +63,80 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
                 this();
             }
 
-            public final Observable<Model> get() {
-                Observable<R> G = StoreStream.Companion.getThreadDraft().observeDraftState().G(WidgetThreadDraftArchiveSheet$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "StoreStream\n            …aftState)\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(G).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+            public final Observable<Model> get(long j) {
+                StoreStream.Companion companion = StoreStream.Companion;
+                Observable j2 = Observable.j(companion.getThreadDraft().observeDraftState(), companion.getGuilds().observeGuild(j), WidgetThreadDraftArchiveSheet$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(j2, "Observable.combineLatest…raftState, guild)\n      }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(j2).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return r;
             }
         }
 
-        public Model(StoreThreadDraft.ThreadDraftState threadDraftState) {
+        public Model(StoreThreadDraft.ThreadDraftState threadDraftState, Guild guild) {
             m.checkNotNullParameter(threadDraftState, "draftState");
             this.draftState = threadDraftState;
+            this.guild = guild;
         }
 
-        public static /* synthetic */ Model copy$default(Model model, StoreThreadDraft.ThreadDraftState threadDraftState, int i, Object obj) {
+        public static /* synthetic */ Model copy$default(Model model, StoreThreadDraft.ThreadDraftState threadDraftState, Guild guild, int i, Object obj) {
             if ((i & 1) != 0) {
                 threadDraftState = model.draftState;
             }
-            return model.copy(threadDraftState);
+            if ((i & 2) != 0) {
+                guild = model.guild;
+            }
+            return model.copy(threadDraftState, guild);
         }
 
         public final StoreThreadDraft.ThreadDraftState component1() {
             return this.draftState;
         }
 
-        public final Model copy(StoreThreadDraft.ThreadDraftState threadDraftState) {
+        public final Guild component2() {
+            return this.guild;
+        }
+
+        public final Model copy(StoreThreadDraft.ThreadDraftState threadDraftState, Guild guild) {
             m.checkNotNullParameter(threadDraftState, "draftState");
-            return new Model(threadDraftState);
+            return new Model(threadDraftState, guild);
         }
 
         public boolean equals(Object obj) {
-            if (this != obj) {
-                return (obj instanceof Model) && m.areEqual(this.draftState, ((Model) obj).draftState);
+            if (this == obj) {
+                return true;
             }
-            return true;
+            if (!(obj instanceof Model)) {
+                return false;
+            }
+            Model model = (Model) obj;
+            return m.areEqual(this.draftState, model.draftState) && m.areEqual(this.guild, model.guild);
         }
 
         public final StoreThreadDraft.ThreadDraftState getDraftState() {
             return this.draftState;
         }
 
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
         public int hashCode() {
             StoreThreadDraft.ThreadDraftState threadDraftState = this.draftState;
-            if (threadDraftState != null) {
-                return threadDraftState.hashCode();
+            int i = 0;
+            int hashCode = (threadDraftState != null ? threadDraftState.hashCode() : 0) * 31;
+            Guild guild = this.guild;
+            if (guild != null) {
+                i = guild.hashCode();
             }
-            return 0;
+            return hashCode + i;
         }
 
         public String toString() {
             StringBuilder L = a.L("Model(draftState=");
             L.append(this.draftState);
+            L.append(", guild=");
+            L.append(this.guild);
             L.append(")");
             return L.toString();
         }
@@ -124,10 +156,25 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
 
     private final void configureUI(Model model) {
         StoreThreadDraft.ThreadDraftState draftState = model.getDraftState();
+        Guild guild = model.getGuild();
         getBinding().d.setOnClickListener(new WidgetThreadDraftArchiveSheet$configureUI$1(this, draftState));
         getBinding().g.setOnClickListener(new WidgetThreadDraftArchiveSheet$configureUI$2(this, draftState));
         getBinding().f.setOnClickListener(new WidgetThreadDraftArchiveSheet$configureUI$3(this, draftState));
+        TextView textView = getBinding().f;
+        m.checkNotNullExpressionValue(textView, "binding.optionThreeDays");
+        int i = 0;
+        boolean z2 = true;
+        textView.setVisibility(guild != null && guild.hasFeature(GuildFeature.THREE_DAY_THREAD_ARCHIVE) ? 0 : 8);
         getBinding().e.setOnClickListener(new WidgetThreadDraftArchiveSheet$configureUI$4(this, draftState));
+        TextView textView2 = getBinding().e;
+        m.checkNotNullExpressionValue(textView2, "binding.optionOneWeek");
+        if (guild == null || !guild.hasFeature(GuildFeature.SEVEN_DAY_THREAD_ARCHIVE)) {
+            z2 = false;
+        }
+        if (!z2) {
+            i = 8;
+        }
+        textView2.setVisibility(i);
     }
 
     private final WidgetThreadArchiveActionsSheetBinding getBinding() {
@@ -135,24 +182,24 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet {
     }
 
     private final void setAutoArchiveDuration(StoreThreadDraft.ThreadDraftState threadDraftState, int i) {
-        StoreStream.Companion.getThreadDraft().setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, false, i, null, false, 13, null));
+        StoreStream.Companion.getThreadDraft().setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, false, Integer.valueOf(i), null, false, 13, null));
         dismiss();
     }
 
-    public static final void show(FragmentManager fragmentManager) {
-        Companion.show(fragmentManager);
+    public static final void show(FragmentManager fragmentManager, long j) {
+        Companion.show(fragmentManager, j);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
         super.bindSubscriptions(compositeSubscription);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(), this, null, 2, null), WidgetThreadDraftArchiveSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadDraftArchiveSheet$bindSubscriptions$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getArgumentsOrDefault().getLong("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetThreadDraftArchiveSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetThreadDraftArchiveSheet$bindSubscriptions$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559245;
+        return 2131559253;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java
index 1cdc99eb7e..1aa74ec918 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java
@@ -16,11 +16,11 @@ import android.widget.TextView;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.databinding.ThreadBrowserThreadViewBinding;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.models.user.User;
 import com.discord.simpleast.core.parser.Parser;
@@ -381,26 +381,26 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558696, this);
-        int i2 = 2131365232;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365232);
+        int i2 = 2131365287;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365287);
         if (simpleDraweeView != null) {
-            i2 = 2131365261;
-            ImageView imageView = (ImageView) findViewById(2131365261);
+            i2 = 2131365316;
+            ImageView imageView = (ImageView) findViewById(2131365316);
             if (imageView != null) {
-                i2 = 2131365262;
-                FrameLayout frameLayout = (FrameLayout) findViewById(2131365262);
+                i2 = 2131365317;
+                FrameLayout frameLayout = (FrameLayout) findViewById(2131365317);
                 if (frameLayout != null) {
-                    i2 = 2131365263;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365263);
+                    i2 = 2131365318;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365318);
                     if (simpleDraweeSpanTextView != null) {
-                        i2 = 2131365264;
-                        TextView textView = (TextView) findViewById(2131365264);
+                        i2 = 2131365319;
+                        TextView textView = (TextView) findViewById(2131365319);
                         if (textView != null) {
-                            i2 = 2131365279;
-                            TextView textView2 = (TextView) findViewById(2131365279);
+                            i2 = 2131365334;
+                            TextView textView2 = (TextView) findViewById(2131365334);
                             if (textView2 != null) {
-                                i2 = 2131365280;
-                                TextView textView3 = (TextView) findViewById(2131365280);
+                                i2 = 2131365335;
+                                TextView textView3 = (TextView) findViewById(2131365335);
                                 if (textView3 != null) {
                                     ThreadBrowserThreadViewBinding threadBrowserThreadViewBinding = new ThreadBrowserThreadViewBinding(this, simpleDraweeView, imageView, frameLayout, simpleDraweeSpanTextView, textView, textView2, textView3);
                                     m.checkNotNullExpressionValue(threadBrowserThreadViewBinding, "ThreadBrowserThreadViewB…ater.from(context), this)");
@@ -425,14 +425,14 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         return threadBrowserThreadView.getMemberCharacterStyles(guildMember);
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:24:0x00f9  */
+    /* JADX WARNING: Removed duplicated region for block: B:24:0x00f7  */
     private final void configureActiveThreadUI(ThreadData.ActiveThread activeThread) {
         DraweeSpanStringBuilder draweeSpanStringBuilder;
         String str;
         Message message = activeThread.getMessage();
         DraweeSpanStringBuilder draweeSpanStringBuilder2 = null;
-        String k = message != null ? message.k() : null;
-        if (message == null || k == null) {
+        String content = message != null ? message.getContent() : null;
+        if (message == null || content == null) {
             TextView textView = this.binding.g;
             m.checkNotNullExpressionValue(textView, "binding.threadTimestampSeparator");
             textView.setVisibility(8);
@@ -442,7 +442,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
             if (activeThread.getOwner() == null) {
                 SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadMessage");
-                simpleDraweeSpanTextView.setText(getContext().getString(2131893862));
+                simpleDraweeSpanTextView.setText(getContext().getString(2131893960));
                 configureAvatar(null);
                 return;
             }
@@ -451,18 +451,17 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
         MessageRenderContext messageRenderContext = new MessageRenderContext(context, activeThread.getMyUserId(), true, MessageUtils.getNickOrUsernames$default(message, activeThread.getChannel(), activeThread.getGuildMembers(), null, 8, null), activeThread.getChannelNames(), activeThread.getGuildRoles(), 0, null, null, ColorCompat.getThemedColor(getContext(), 2130970180), 0, null, null, null, 15808, null);
-        com.discord.api.user.User g = activeThread.getMessage().g();
-        m.checkNotNull(g);
-        CoreUser coreUser = new CoreUser(g);
-        MessageUtils messageUtils = MessageUtils.INSTANCE;
-        String string = messageUtils.hasStickers(message) ? getContext().getString(2131892593) : (messageUtils.hasAttachments(message) || messageUtils.hasEmbeds(message)) ? getContext().getString(2131892591) : null;
+        com.discord.api.user.User author = activeThread.getMessage().getAuthor();
+        m.checkNotNull(author);
+        CoreUser coreUser = new CoreUser(author);
+        String string = message.hasStickers() ? getContext().getString(2131892674) : (message.hasAttachments() || message.hasEmbeds()) ? getContext().getString(2131892672) : null;
         if (string != null) {
             draweeSpanStringBuilder2 = new DraweeSpanStringBuilder();
             draweeSpanStringBuilder2.append((CharSequence) (string + (char) 160));
             draweeSpanStringBuilder2.setSpan(new StyleSpan(2), 0, string.length(), 33);
-        } else if (!t.isBlank(k)) {
+        } else if (!t.isBlank(content)) {
             str = "binding.threadTimestamp";
-            draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), k, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext);
+            draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), content, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext);
             if (draweeSpanStringBuilder != null) {
                 GuildMember guildMember = activeThread.getGuildMembers().get(Long.valueOf(coreUser.getId()));
                 String nickOrUsername$default = GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, coreUser, guildMember, activeThread.getChannel(), null, 8, null);
@@ -481,7 +480,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
             configureAvatar(coreUser);
             TextView textView5 = this.binding.f;
             m.checkNotNullExpressionValue(textView5, str);
-            textView5.setText(formatActivityTimestamp((message.r() >>> 22) + 1420070400000L));
+            textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + 1420070400000L));
         }
         str = "binding.threadTimestamp";
         draweeSpanStringBuilder = draweeSpanStringBuilder2;
@@ -496,27 +495,27 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         configureAvatar(coreUser);
         TextView textView5 = this.binding.f;
         m.checkNotNullExpressionValue(textView5, str);
-        textView5.setText(formatActivityTimestamp((message.r() >>> 22) + 1420070400000L));
+        textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + 1420070400000L));
     }
 
     private final void configureArchivedThreadUI(ThreadData.ArchivedThread archivedThread) {
         long j;
         int i;
-        ThreadMetadata x2 = archivedThread.getChannel().x();
-        if (x2 != null) {
+        ThreadMetadata y2 = archivedThread.getChannel().y();
+        if (y2 != null) {
             int ordinal = archivedThread.getTimestampMode().ordinal();
             if (ordinal == 0) {
-                j = TimeUtils.parseUTCDate(x2.a());
+                j = TimeUtils.parseUTCDate(y2.a());
             } else if (ordinal == 1) {
-                j = (archivedThread.getChannel().g() >>> 22) + 1420070400000L;
+                j = (archivedThread.getChannel().h() >>> 22) + 1420070400000L;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
             int ordinal2 = archivedThread.getTimestampMode().ordinal();
             if (ordinal2 == 0) {
-                i = 2131893851;
+                i = 2131893949;
             } else if (ordinal2 == 1) {
-                i = 2131893853;
+                i = 2131893951;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -531,7 +530,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
 
     private final void configureAvatar(User user) {
         if (user == null) {
-            ImageView imageView = this.binding.f1635c;
+            ImageView imageView = this.binding.f1632c;
             m.checkNotNullExpressionValue(imageView, "binding.threadIcon");
             imageView.setVisibility(0);
             SimpleDraweeView simpleDraweeView = this.binding.b;
@@ -539,7 +538,7 @@ public final class ThreadBrowserThreadView extends FrameLayout {
             simpleDraweeView.setVisibility(8);
             return;
         }
-        ImageView imageView2 = this.binding.f1635c;
+        ImageView imageView2 = this.binding.f1632c;
         m.checkNotNullExpressionValue(imageView2, "binding.threadIcon");
         imageView2.setVisibility(8);
         SimpleDraweeView simpleDraweeView2 = this.binding.b;
@@ -555,21 +554,21 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         if (currentTimeMillis < 60000) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return c.a.l.b.g(context, 2131893871, new Object[]{1}, null, 4);
+            return c.a.l.b.g(context, 2131893969, new Object[]{1}, null, 4);
         } else if (currentTimeMillis < 3600000) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return c.a.l.b.g(context2, 2131893871, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
+            return c.a.l.b.g(context2, 2131893969, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
         } else if (currentTimeMillis < 86400000) {
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return c.a.l.b.g(context3, 2131893870, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
+            return c.a.l.b.g(context3, 2131893968, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
         } else if (currentTimeMillis < 2592000000L) {
             Context context4 = getContext();
             m.checkNotNullExpressionValue(context4, "context");
-            return c.a.l.b.g(context4, 2131893869, new Object[]{Long.valueOf(currentTimeMillis / 86400000)}, null, 4);
+            return c.a.l.b.g(context4, 2131893967, new Object[]{Long.valueOf(currentTimeMillis / 86400000)}, null, 4);
         } else {
-            String string = getContext().getString(2131893872);
+            String string = getContext().getString(2131893970);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…imestamp_more_than_month)");
             return string;
         }
@@ -580,15 +579,15 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         if (currentTimeMillis < 60000) {
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            return c.a.l.b.g(context, 2131893871, new Object[]{1}, null, 4);
+            return c.a.l.b.g(context, 2131893969, new Object[]{1}, null, 4);
         } else if (currentTimeMillis < 3600000) {
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            return c.a.l.b.g(context2, 2131893871, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
+            return c.a.l.b.g(context2, 2131893969, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4);
         } else if (currentTimeMillis < 86400000) {
             Context context3 = getContext();
             m.checkNotNullExpressionValue(context3, "context");
-            return c.a.l.b.g(context3, 2131893870, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
+            return c.a.l.b.g(context3, 2131893968, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4);
         } else {
             String formatDateTime = DateUtils.formatDateTime(getContext(), j, 131076);
             m.checkNotNullExpressionValue(formatDateTime, "DateUtils.formatDateTime…teUtils.FORMAT_SHOW_YEAR)");
@@ -621,13 +620,13 @@ public final class ThreadBrowserThreadView extends FrameLayout {
         textView.setText(AnimatableValueParser.z0(channel, context, false));
         User owner = threadData.getOwner();
         if (owner == null) {
-            owner = new CoreUser(threadData.getChannel().p(), null, null, null, false, false, 0, null, 0, 0, null, null, 4094, null);
+            owner = new CoreUser(threadData.getChannel().q(), null, null, null, false, false, 0, null, 0, 0, null, null, 4094, null);
         }
         GuildMember guildMember = (GuildMember) a.e(owner, threadData.getGuildMembers());
         String nickOrUsername$default = GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, owner, guildMember, threadData.getChannel(), null, 8, null);
         SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadMessage");
-        c.a.l.b.m(simpleDraweeSpanTextView, 2131893868, new Object[0], new ThreadBrowserThreadView$setThreadData$1(this, nickOrUsername$default, guildMember));
+        c.a.l.b.l(simpleDraweeSpanTextView, 2131893966, new Object[0], new ThreadBrowserThreadView$setThreadData$1(this, nickOrUsername$default, guildMember));
         if (threadData instanceof ThreadData.ActiveThread) {
             configureActiveThreadUI((ThreadData.ActiveThread) threadData);
         } else if (threadData instanceof ThreadData.ArchivedThread) {
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java
index 14a5a9dd8a..b8181116a8 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java
@@ -22,11 +22,11 @@ public final /* synthetic */ class WidgetThreadBrowser$binding$2 extends k imple
         int i = 2131361869;
         TabLayout tabLayout = (TabLayout) view.findViewById(2131361869);
         if (tabLayout != null) {
-            i = 2131365244;
-            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365244);
+            i = 2131365299;
+            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365299);
             if (appBarLayout != null) {
-                i = 2131365246;
-                SimplePager simplePager = (SimplePager) view.findViewById(2131365246);
+                i = 2131365301;
+                SimplePager simplePager = (SimplePager) view.findViewById(2131365301);
                 if (simplePager != null) {
                     return new WidgetThreadBrowserBinding((ConstraintLayout) view, tabLayout, appBarLayout, simplePager);
                 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
index a3fb0718d2..97d77b003c 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java
@@ -18,11 +18,11 @@ public final class WidgetThreadBrowser$updateMenu$1<T1, T2> implements Action2<M
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363913:
+            case 2131363954:
                 ChannelSelector.openCreateThread$default(ChannelSelector.Companion.getInstance(), WidgetThreadBrowser.access$getGuildId$p(this.this$0), WidgetThreadBrowser.access$getChannelId$p(this.this$0), null, 4, null);
                 this.this$0.requireAppActivity().finish();
                 return;
-            case 2131363914:
+            case 2131363955:
                 WidgetThreadBrowserFilterSheet.Companion companion = WidgetThreadBrowserFilterSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java
index 28657bec0d..866e922a02 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$2.java
@@ -17,12 +17,12 @@ public final class WidgetThreadBrowser$updateMenu$2<T> implements Action1<Menu>
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363914);
+        MenuItem findItem = menu.findItem(2131363955);
         boolean z2 = true;
         if (findItem != null) {
             findItem.setVisible(this.$selectedPage == WidgetThreadBrowser.access$getARCHIVED_PAGE$p(this.this$0));
         }
-        MenuItem findItem2 = menu.findItem(2131363913);
+        MenuItem findItem2 = menu.findItem(2131363954);
         if (findItem2 != null) {
             if (this.$selectedPage != WidgetThreadBrowser.access$getACTIVE_PAGE$p(this.this$0) || !m.areEqual(this.$canCreateThread, Boolean.TRUE)) {
                 z2 = false;
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$viewModel$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$viewModel$2.java
index 1cbcdda4f5..cddfb665b3 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$viewModel$2.java
@@ -17,6 +17,6 @@ public final class WidgetThreadBrowser$viewModel$2 extends o implements Function
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetThreadBrowserViewModel.ViewState> mo1invoke() {
-        return new WidgetThreadBrowserViewModel(WidgetThreadBrowser.access$getGuildId$p(this.this$0), WidgetThreadBrowser.access$getChannelId$p(this.this$0), null, null, null, 28, null);
+        return new WidgetThreadBrowserViewModel(WidgetThreadBrowser.access$getGuildId$p(this.this$0), WidgetThreadBrowser.access$getChannelId$p(this.this$0), null, null, null, null, 60, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
index 60cde30a8a..2addc965cc 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java
@@ -67,7 +67,7 @@ public final class WidgetThreadBrowser extends AppFragment {
     }
 
     public WidgetThreadBrowser() {
-        super(2131559246);
+        super(2131559254);
     }
 
     public static final /* synthetic */ int access$getACTIVE_PAGE$p(WidgetThreadBrowser widgetThreadBrowser) {
@@ -135,19 +135,19 @@ public final class WidgetThreadBrowser extends AppFragment {
     }
 
     private final void initializeAdapter(WidgetThreadBrowserViewModel.ViewState.Browser browser) {
-        SimplePager simplePager = getBinding().f1972c;
+        SimplePager simplePager = getBinding().f1976c;
         m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager");
         if (simplePager.getAdapter() == null) {
             ArrayList arrayList = new ArrayList();
-            String string = getString(2131893850);
+            String string = getString(2131893948);
             m.checkNotNullExpressionValue(string, "getString(R.string.thread_browser_active)");
             arrayList.add(new SimplePager.Adapter.Item(string, new WidgetThreadBrowser$initializeAdapter$1(this)));
             if (browser.getCanViewArchivedThreads()) {
-                String string2 = getString(2131893852);
+                String string2 = getString(2131893950);
                 m.checkNotNullExpressionValue(string2, "getString(R.string.thread_browser_archived)");
                 arrayList.add(new SimplePager.Adapter.Item(string2, new WidgetThreadBrowser$initializeAdapter$2(this)));
             }
-            SimplePager simplePager2 = getBinding().f1972c;
+            SimplePager simplePager2 = getBinding().f1976c;
             m.checkNotNullExpressionValue(simplePager2, "binding.threadBrowserViewPager");
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -156,7 +156,7 @@ public final class WidgetThreadBrowser extends AppFragment {
             Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
             SimplePager.Adapter.Item[] itemArr = (SimplePager.Adapter.Item[]) array;
             simplePager2.setAdapter(new SimplePager.Adapter(parentFragmentManager, (SimplePager.Adapter.Item[]) Arrays.copyOf(itemArr, itemArr.length)));
-            getBinding().f1972c.addOnPageChangeListener(new WidgetThreadBrowser$initializeAdapter$3(this));
+            getBinding().f1976c.addOnPageChangeListener(new WidgetThreadBrowser$initializeAdapter$3(this));
             TabLayout tabLayout = getBinding().b;
             m.checkNotNullExpressionValue(tabLayout, "binding.actionBarTabs");
             if (!browser.getCanViewArchivedThreads()) {
@@ -186,7 +186,7 @@ public final class WidgetThreadBrowser extends AppFragment {
                 L.append(browser.getChannelName());
                 setActionBarSubtitle(L.toString());
             }
-            SimplePager simplePager = getBinding().f1972c;
+            SimplePager simplePager = getBinding().f1976c;
             m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager");
             updateMenu(simplePager.getCurrentItem(), Boolean.valueOf(browser.getCanCreateThread()));
         }
@@ -203,6 +203,6 @@ public final class WidgetThreadBrowser extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131893873);
+        setActionBarTitle(2131893971);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java
index 4b5ffe1c67..58faeb0c72 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java
@@ -3,7 +3,7 @@ package com.discord.widgets.channels.threads.browser;
 import android.view.View;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.i1;
+import c.a.i.k1;
 import com.discord.databinding.WidgetThreadBrowserActiveBinding;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -18,15 +18,15 @@ public final /* synthetic */ class WidgetThreadBrowserActive$binding$2 extends k
 
     public final WidgetThreadBrowserActiveBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363042;
-        View findViewById = view.findViewById(2131363042);
+        int i = 2131363067;
+        View findViewById = view.findViewById(2131363067);
         if (findViewById != null) {
-            i1 a = i1.a(findViewById);
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364399);
+            k1 a = k1.a(findViewById);
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364437);
             if (recyclerView != null) {
                 return new WidgetThreadBrowserActiveBinding((ConstraintLayout) view, a, recyclerView);
             }
-            i = 2131364399;
+            i = 2131364437;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$browserViewModel$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$browserViewModel$2.java
index fb97f33e1d..70f110e78c 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$browserViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$browserViewModel$2.java
@@ -17,6 +17,6 @@ public final class WidgetThreadBrowserActive$browserViewModel$2 extends o implem
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetThreadBrowserViewModel.ViewState> mo1invoke() {
-        return new WidgetThreadBrowserViewModel(WidgetThreadBrowserActive.access$getGuildId$p(this.this$0), WidgetThreadBrowserActive.access$getChannelId$p(this.this$0), null, null, null, 28, null);
+        return new WidgetThreadBrowserViewModel(WidgetThreadBrowserActive.access$getGuildId$p(this.this$0), WidgetThreadBrowserActive.access$getChannelId$p(this.this$0), null, null, null, null, 60, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$onViewBound$2.java
index bcf9acf930..db7fdf0e0c 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$onViewBound$2.java
@@ -30,6 +30,6 @@ public final class WidgetThreadBrowserActive$onViewBound$2 extends o implements
         WidgetChannelsListItemThreadActions.Companion companion = WidgetChannelsListItemThreadActions.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.show(parentFragmentManager, channel.g());
+        companion.show(parentFragmentManager, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
index e6a10f9c97..c2e2a69810 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java
@@ -59,7 +59,7 @@ public final class WidgetThreadBrowserActive extends AppFragment {
     }
 
     public WidgetThreadBrowserActive() {
-        super(2131559247);
+        super(2131559255);
         WidgetThreadBrowserActive$viewModel$2 widgetThreadBrowserActive$viewModel$2 = new WidgetThreadBrowserActive$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadBrowserActiveViewModel.class), new WidgetThreadBrowserActive$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadBrowserActive$viewModel$2));
@@ -106,12 +106,12 @@ public final class WidgetThreadBrowserActive extends AppFragment {
         widgetThreadBrowserAdapter.setData(viewState.getListItems());
         TextView textView = getBinding().b.d;
         m.checkNotNullExpressionValue(textView, "binding.emptyView.threadBrowserEmptyHeading");
-        textView.setText(requireContext().getString(2131893854));
+        textView.setText(requireContext().getString(2131893952));
         ConstraintLayout constraintLayout = getBinding().b.b;
         m.checkNotNullExpressionValue(constraintLayout, "binding.emptyView.threadBrowserEmpty");
         int i = 0;
         constraintLayout.setVisibility(viewState.getListItems().isEmpty() ? 0 : 8);
-        MaterialButton materialButton = getBinding().b.f103c;
+        MaterialButton materialButton = getBinding().b.f114c;
         m.checkNotNullExpressionValue(materialButton, "binding.emptyView.threadBrowserEmptyCreateButton");
         if (!viewState.getCanCreateThread()) {
             i = 8;
@@ -130,9 +130,9 @@ public final class WidgetThreadBrowserActive extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1970c;
+        RecyclerView recyclerView = getBinding().f1974c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         this.adapter = (WidgetThreadBrowserAdapter) companion.configure(new WidgetThreadBrowserAdapter(recyclerView, new WidgetThreadBrowserActive$onViewBound$1(getBrowserViewModel()), new WidgetThreadBrowserActive$onViewBound$2(this)));
-        getBinding().b.f103c.setOnClickListener(new WidgetThreadBrowserActive$onViewBound$3(this));
+        getBinding().b.f114c.setOnClickListener(new WidgetThreadBrowserActive$onViewBound$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3.java
index 288a41b6f7..43e13a02c2 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3.java
@@ -2,6 +2,7 @@ package com.discord.widgets.channels.threads.browser;
 
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
+import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
@@ -19,7 +20,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import kotlin.Pair;
 import rx.Observable;
-import rx.functions.Func8;
+import rx.functions.Func9;
 /* compiled from: WidgetThreadBrowserActiveViewModel.kt */
 public final class WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3<T, R> implements b<Pair<? extends Map<Long, ? extends Channel>, ? extends Map<Long, ? extends Channel>>, Observable<? extends WidgetThreadBrowserActiveViewModel.StoreState>> {
     public final /* synthetic */ long $channelId;
@@ -32,7 +33,7 @@ public final class WidgetThreadBrowserActiveViewModel$Companion$observeStoreStat
 
     /* compiled from: WidgetThreadBrowserActiveViewModel.kt */
     /* renamed from: com.discord.widgets.channels.threads.browser.WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3$2  reason: invalid class name */
-    public static final class AnonymousClass2<T1, T2, T3, T4, T5, T6, T7, T8, R> implements Func8<MeUser, Map<Long, ? extends User>, Map<Long, ? extends StoreThreadMessages.ThreadState>, Map<Long, ? extends GuildMember>, Map<Long, ? extends GuildRole>, Map<Long, ? extends String>, Long, Channel, WidgetThreadBrowserActiveViewModel.StoreState> {
+    public static final class AnonymousClass2<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> implements Func9<MeUser, Map<Long, ? extends User>, Map<Long, ? extends StoreThreadMessages.ThreadState>, Map<Long, ? extends GuildMember>, Map<Long, ? extends GuildRole>, Map<Long, ? extends String>, Long, Channel, Guild, WidgetThreadBrowserActiveViewModel.StoreState> {
         public final /* synthetic */ Map $activeJoinedThreads;
         public final /* synthetic */ Map $activeThreads;
 
@@ -41,7 +42,7 @@ public final class WidgetThreadBrowserActiveViewModel$Companion$observeStoreStat
             this.$activeThreads = map2;
         }
 
-        public final WidgetThreadBrowserActiveViewModel.StoreState call(MeUser meUser, Map<Long, ? extends User> map, Map<Long, StoreThreadMessages.ThreadState> map2, Map<Long, GuildMember> map3, Map<Long, GuildRole> map4, Map<Long, String> map5, Long l, Channel channel) {
+        public final WidgetThreadBrowserActiveViewModel.StoreState call(MeUser meUser, Map<Long, ? extends User> map, Map<Long, StoreThreadMessages.ThreadState> map2, Map<Long, GuildMember> map3, Map<Long, GuildRole> map4, Map<Long, String> map5, Long l, Channel channel, Guild guild) {
             m.checkNotNullExpressionValue(meUser, "meUser");
             Map map6 = this.$activeJoinedThreads;
             m.checkNotNullExpressionValue(map6, "activeJoinedThreads");
@@ -52,14 +53,14 @@ public final class WidgetThreadBrowserActiveViewModel$Companion$observeStoreStat
             m.checkNotNullExpressionValue(map, "users");
             m.checkNotNullExpressionValue(map4, "guildRoles");
             m.checkNotNullExpressionValue(map5, "channelNames");
-            return new WidgetThreadBrowserActiveViewModel.StoreState(meUser, map6, map7, map2, map3, map, map4, map5, l, channel);
+            return new WidgetThreadBrowserActiveViewModel.StoreState(meUser, map6, map7, map2, map3, map, map4, map5, l, channel, guild);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
-        @Override // rx.functions.Func8
-        public /* bridge */ /* synthetic */ WidgetThreadBrowserActiveViewModel.StoreState call(MeUser meUser, Map<Long, ? extends User> map, Map<Long, ? extends StoreThreadMessages.ThreadState> map2, Map<Long, ? extends GuildMember> map3, Map<Long, ? extends GuildRole> map4, Map<Long, ? extends String> map5, Long l, Channel channel) {
-            return call(meUser, map, (Map<Long, StoreThreadMessages.ThreadState>) map2, (Map<Long, GuildMember>) map3, (Map<Long, GuildRole>) map4, (Map<Long, String>) map5, l, channel);
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+        @Override // rx.functions.Func9
+        public /* bridge */ /* synthetic */ WidgetThreadBrowserActiveViewModel.StoreState call(MeUser meUser, Map<Long, ? extends User> map, Map<Long, ? extends StoreThreadMessages.ThreadState> map2, Map<Long, ? extends GuildMember> map3, Map<Long, ? extends GuildRole> map4, Map<Long, ? extends String> map5, Long l, Channel channel, Guild guild) {
+            return call(meUser, map, (Map<Long, StoreThreadMessages.ThreadState>) map2, (Map<Long, GuildMember>) map3, (Map<Long, GuildRole>) map4, (Map<Long, String>) map5, l, channel, guild);
         }
     }
 
@@ -88,16 +89,16 @@ public final class WidgetThreadBrowserActiveViewModel$Companion$observeStoreStat
         HashSet hashSet = new HashSet();
         m.checkNotNullExpressionValue(map, "activeJoinedThreads");
         for (Map.Entry entry : map.entrySet()) {
-            hashSet.add(Long.valueOf(((Channel) entry.getValue()).p()));
+            hashSet.add(Long.valueOf(((Channel) entry.getValue()).q()));
         }
         m.checkNotNullExpressionValue(map2, "activeThreads");
         for (Map.Entry entry2 : map2.entrySet()) {
-            hashSet.add(Long.valueOf(((Channel) entry2.getValue()).p()));
+            hashSet.add(Long.valueOf(((Channel) entry2.getValue()).q()));
         }
         Observable<Map<Long, User>> observeUsers = storeUser.observeUsers(hashSet);
         Observable<Map<Long, StoreThreadMessages.ThreadState>> observeThreadCountAndLatestMessage = this.$storeThreadMessages.observeThreadCountAndLatestMessage();
         Observable<Map<Long, GuildMember>> observeGuildMembers = this.$storeGuilds.observeGuildMembers(this.$guildId);
         m.checkNotNullExpressionValue(observeGuildMembers, "storeGuilds\n            …erveGuildMembers(guildId)");
-        return Observable.d(observeMe$default, observeUsers, observeThreadCountAndLatestMessage, ObservableExtensionsKt.leadingEdgeThrottle(observeGuildMembers, 1, TimeUnit.SECONDS).s(), this.$storeGuilds.observeRoles(this.$guildId), this.$storeChannels.observeNames(), this.$storePermissions.observePermissionsForChannel(this.$channelId), this.$storeChannels.observeChannel(this.$channelId), new AnonymousClass2(map, map2));
+        return Observable.c(observeMe$default, observeUsers, observeThreadCountAndLatestMessage, ObservableExtensionsKt.leadingEdgeThrottle(observeGuildMembers, 1, TimeUnit.SECONDS).r(), this.$storeGuilds.observeRoles(this.$guildId), this.$storeChannels.observeNames(), this.$storePermissions.observePermissionsForChannel(this.$channelId), this.$storeChannels.observeChannel(this.$channelId), this.$storeGuilds.observeGuild(this.$guildId), new AnonymousClass2(map, map2));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
index 7f326d0ec3..d2af953fb9 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java
@@ -4,10 +4,11 @@ import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppViewModel;
+import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
 import com.discord.stores.StoreChannels;
@@ -90,9 +91,9 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStoreState(long j, long j2, StoreUser storeUser, StoreThreadsActive storeThreadsActive, StoreThreadsActiveJoined storeThreadsActiveJoined, StoreThreadMessages storeThreadMessages, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions) {
-            Observable<StoreState> Z = Observable.j(storeThreadsActiveJoined.observeActiveJoinedThreadsForChannel(j, j2).G(WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$1.INSTANCE), storeThreadsActive.observeActiveThreadsForChannel(j, Long.valueOf(j2)), WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$2.INSTANCE).Z(new WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3(storeUser, storeThreadMessages, storeGuilds, j, storeChannels, storePermissions, j2));
-            m.checkNotNullExpressionValue(Z, "Observable.combineLatest…            }\n          }");
-            return Z;
+            Observable<StoreState> Y = Observable.j(storeThreadsActiveJoined.observeActiveJoinedThreadsForChannel(j, j2).F(WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$1.INSTANCE), storeThreadsActive.observeActiveThreadsForChannel(j, Long.valueOf(j2)), WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$2.INSTANCE).Y(new WidgetThreadBrowserActiveViewModel$Companion$observeStoreState$3(storeUser, storeThreadMessages, storeGuilds, j, storeChannels, storePermissions, j2));
+            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…            }\n          }");
+            return Y;
         }
     }
 
@@ -102,6 +103,7 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
         private final Map<Long, Channel> activeThreads;
         private final Channel channel;
         private final Map<Long, String> channelNames;
+        private final Guild guild;
         private final Map<Long, GuildMember> guildMembers;
         private final Map<Long, GuildRole> guildRoles;
         private final MeUser meUser;
@@ -111,7 +113,7 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
 
         /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.Map<java.lang.Long, ? extends com.discord.models.user.User> */
         /* JADX WARN: Multi-variable type inference failed */
-        public StoreState(MeUser meUser, Map<Long, Channel> map, Map<Long, Channel> map2, Map<Long, StoreThreadMessages.ThreadState> map3, Map<Long, GuildMember> map4, Map<Long, ? extends User> map5, Map<Long, GuildRole> map6, Map<Long, String> map7, Long l, Channel channel) {
+        public StoreState(MeUser meUser, Map<Long, Channel> map, Map<Long, Channel> map2, Map<Long, StoreThreadMessages.ThreadState> map3, Map<Long, GuildMember> map4, Map<Long, ? extends User> map5, Map<Long, GuildRole> map6, Map<Long, String> map7, Long l, Channel channel, Guild guild) {
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(map, "activeJoinedThreads");
             m.checkNotNullParameter(map2, "activeThreads");
@@ -130,10 +132,11 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             this.channelNames = map7;
             this.permissions = l;
             this.channel = channel;
+            this.guild = guild;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, Map map, Map map2, Map map3, Map map4, Map map5, Map map6, Map map7, Long l, Channel channel, int i, Object obj) {
-            return storeState.copy((i & 1) != 0 ? storeState.meUser : meUser, (i & 2) != 0 ? storeState.activeJoinedThreads : map, (i & 4) != 0 ? storeState.activeThreads : map2, (i & 8) != 0 ? storeState.threadStates : map3, (i & 16) != 0 ? storeState.guildMembers : map4, (i & 32) != 0 ? storeState.users : map5, (i & 64) != 0 ? storeState.guildRoles : map6, (i & 128) != 0 ? storeState.channelNames : map7, (i & 256) != 0 ? storeState.permissions : l, (i & 512) != 0 ? storeState.channel : channel);
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, Map map, Map map2, Map map3, Map map4, Map map5, Map map6, Map map7, Long l, Channel channel, Guild guild, int i, Object obj) {
+            return storeState.copy((i & 1) != 0 ? storeState.meUser : meUser, (i & 2) != 0 ? storeState.activeJoinedThreads : map, (i & 4) != 0 ? storeState.activeThreads : map2, (i & 8) != 0 ? storeState.threadStates : map3, (i & 16) != 0 ? storeState.guildMembers : map4, (i & 32) != 0 ? storeState.users : map5, (i & 64) != 0 ? storeState.guildRoles : map6, (i & 128) != 0 ? storeState.channelNames : map7, (i & 256) != 0 ? storeState.permissions : l, (i & 512) != 0 ? storeState.channel : channel, (i & 1024) != 0 ? storeState.guild : guild);
         }
 
         public final MeUser component1() {
@@ -144,6 +147,10 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             return this.channel;
         }
 
+        public final Guild component11() {
+            return this.guild;
+        }
+
         public final Map<Long, Channel> component2() {
             return this.activeJoinedThreads;
         }
@@ -176,7 +183,7 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             return this.permissions;
         }
 
-        public final StoreState copy(MeUser meUser, Map<Long, Channel> map, Map<Long, Channel> map2, Map<Long, StoreThreadMessages.ThreadState> map3, Map<Long, GuildMember> map4, Map<Long, ? extends User> map5, Map<Long, GuildRole> map6, Map<Long, String> map7, Long l, Channel channel) {
+        public final StoreState copy(MeUser meUser, Map<Long, Channel> map, Map<Long, Channel> map2, Map<Long, StoreThreadMessages.ThreadState> map3, Map<Long, GuildMember> map4, Map<Long, ? extends User> map5, Map<Long, GuildRole> map6, Map<Long, String> map7, Long l, Channel channel, Guild guild) {
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(map, "activeJoinedThreads");
             m.checkNotNullParameter(map2, "activeThreads");
@@ -185,7 +192,7 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             m.checkNotNullParameter(map5, "users");
             m.checkNotNullParameter(map6, "guildRoles");
             m.checkNotNullParameter(map7, "channelNames");
-            return new StoreState(meUser, map, map2, map3, map4, map5, map6, map7, l, channel);
+            return new StoreState(meUser, map, map2, map3, map4, map5, map6, map7, l, channel, guild);
         }
 
         public boolean equals(Object obj) {
@@ -196,7 +203,7 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.meUser, storeState.meUser) && m.areEqual(this.activeJoinedThreads, storeState.activeJoinedThreads) && m.areEqual(this.activeThreads, storeState.activeThreads) && m.areEqual(this.threadStates, storeState.threadStates) && m.areEqual(this.guildMembers, storeState.guildMembers) && m.areEqual(this.users, storeState.users) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.channelNames, storeState.channelNames) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.channel, storeState.channel);
+            return m.areEqual(this.meUser, storeState.meUser) && m.areEqual(this.activeJoinedThreads, storeState.activeJoinedThreads) && m.areEqual(this.activeThreads, storeState.activeThreads) && m.areEqual(this.threadStates, storeState.threadStates) && m.areEqual(this.guildMembers, storeState.guildMembers) && m.areEqual(this.users, storeState.users) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.channelNames, storeState.channelNames) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.guild, storeState.guild);
         }
 
         public final Map<Long, Channel> getActiveJoinedThreads() {
@@ -215,6 +222,10 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             return this.channelNames;
         }
 
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
         public final Map<Long, GuildMember> getGuildMembers() {
             return this.guildMembers;
         }
@@ -260,10 +271,12 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             Long l = this.permissions;
             int hashCode9 = (hashCode8 + (l != null ? l.hashCode() : 0)) * 31;
             Channel channel = this.channel;
-            if (channel != null) {
-                i = channel.hashCode();
+            int hashCode10 = (hashCode9 + (channel != null ? channel.hashCode() : 0)) * 31;
+            Guild guild = this.guild;
+            if (guild != null) {
+                i = guild.hashCode();
             }
-            return hashCode9 + i;
+            return hashCode10 + i;
         }
 
         public String toString() {
@@ -287,6 +300,8 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             L.append(this.permissions);
             L.append(", channel=");
             L.append(this.channel);
+            L.append(", guild=");
+            L.append(this.guild);
             L.append(")");
             return L.toString();
         }
@@ -417,11 +432,11 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
         int i;
         Iterator it;
         Iterator it2;
-        com.discord.api.user.User g;
+        com.discord.api.user.User author;
         ArrayList arrayList = new ArrayList();
         LinkedHashSet linkedHashSet = new LinkedHashSet();
         boolean z2 = true;
-        Iterator it3 = n.listOf((Object[]) new Triple[]{new Triple("joined", 2131893860, storeState.getActiveJoinedThreads()), new Triple("other", 2131893863, storeState.getActiveThreads())}).iterator();
+        Iterator it3 = n.listOf((Object[]) new Triple[]{new Triple("joined", 2131893958, storeState.getActiveJoinedThreads()), new Triple("other", 2131893961, storeState.getActiveThreads())}).iterator();
         while (it3.hasNext()) {
             Triple triple = (Triple) it3.next();
             String str = (String) triple.component1();
@@ -448,19 +463,19 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
                         it2 = it3;
                         it = it4;
                     } else {
-                        User user = storeState.getUsers().get(Long.valueOf(channel.p()));
-                        if (user == null || !storeState.getGuildMembers().containsKey(Long.valueOf(channel.p()))) {
-                            this.storeGuildMemberRequester.queueRequest(channel.e(), channel.p());
+                        User user = storeState.getUsers().get(Long.valueOf(channel.q()));
+                        if (user == null || !storeState.getGuildMembers().containsKey(Long.valueOf(channel.q()))) {
+                            this.storeGuildMemberRequester.queueRequest(channel.f(), channel.q());
                         }
                         StoreThreadMessages.ThreadState threadState = storeState.getThreadStates().get(Long.valueOf(longValue));
                         Message mostRecentMessage = threadState != null ? threadState.getMostRecentMessage() : null;
-                        if (mostRecentMessage == null || (g = mostRecentMessage.g()) == null || storeState.getGuildMembers().containsKey(g)) {
+                        if (mostRecentMessage == null || (author = mostRecentMessage.getAuthor()) == null || storeState.getGuildMembers().containsKey(author)) {
                             it2 = it3;
                             it = it4;
                         } else {
                             it2 = it3;
                             it = it4;
-                            this.storeGuildMemberRequester.queueRequest(channel.e(), g.i());
+                            this.storeGuildMemberRequester.queueRequest(channel.f(), author.i());
                         }
                         arrayList.add(new WidgetThreadBrowserAdapter.Item.Thread(new ThreadBrowserThreadView.ThreadData.ActiveThread(channel, user, mostRecentMessage, storeState.getMeUser().getId(), storeState.getGuildMembers(), storeState.getGuildRoles(), storeState.getChannelNames())));
                         linkedHashSet.add(Long.valueOf(longValue));
@@ -476,6 +491,6 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel<ViewS
             arrayList.clear();
         }
         this.storeGuildMemberRequester.performQueuedRequests();
-        updateViewState(new ViewState(arrayList, ThreadUtils.INSTANCE.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, this.guildId)));
+        updateViewState(new ViewState(arrayList, ThreadUtils.INSTANCE.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, storeState.getGuild())));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java
index 16cf558696..04efb89326 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserAdapter.java
@@ -34,14 +34,14 @@ public final class WidgetThreadBrowserAdapter extends MGRecyclerAdapterSimple<It
             super(2131558693, widgetThreadBrowserAdapter);
             m.checkNotNullParameter(widgetThreadBrowserAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363507);
+            TextView textView = (TextView) view.findViewById(2131363548);
             if (textView != null) {
                 ThreadBrowserItemHeaderBinding threadBrowserItemHeaderBinding = new ThreadBrowserItemHeaderBinding((ConstraintLayout) view, textView);
                 m.checkNotNullExpressionValue(threadBrowserItemHeaderBinding, "ThreadBrowserItemHeaderBinding.bind(itemView)");
                 this.binding = threadBrowserItemHeaderBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363507)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363548)));
         }
 
         public void onConfigure(int i, Item item) {
@@ -229,7 +229,7 @@ public final class WidgetThreadBrowserAdapter extends MGRecyclerAdapterSimple<It
                 super(null);
                 m.checkNotNullParameter(threadData, "threadData");
                 this.threadData = threadData;
-                this.key = String.valueOf(threadData.getChannel().g());
+                this.key = String.valueOf(threadData.getChannel().h());
             }
 
             public static /* synthetic */ Thread copy$default(Thread thread, ThreadBrowserThreadView.ThreadData threadData, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java
index dac8376ec2..84bb473da0 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$binding$2.java
@@ -4,7 +4,7 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.i1;
+import c.a.i.k1;
 import com.discord.databinding.WidgetThreadBrowserArchivedBinding;
 import com.google.android.material.button.MaterialButton;
 import d0.z.d.k;
@@ -20,21 +20,21 @@ public final /* synthetic */ class WidgetThreadBrowserArchived$binding$2 extends
 
     public final WidgetThreadBrowserArchivedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363042;
-        View findViewById = view.findViewById(2131363042);
+        int i = 2131363067;
+        View findViewById = view.findViewById(2131363067);
         if (findViewById != null) {
-            i1 a = i1.a(findViewById);
-            i = 2131364399;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364399);
+            k1 a = k1.a(findViewById);
+            i = 2131364437;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364437);
             if (recyclerView != null) {
-                i = 2131365238;
-                TextView textView = (TextView) view.findViewById(2131365238);
+                i = 2131365293;
+                TextView textView = (TextView) view.findViewById(2131365293);
                 if (textView != null) {
-                    i = 2131365239;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365239);
+                    i = 2131365294;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365294);
                     if (constraintLayout != null) {
-                        i = 2131365245;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365245);
+                        i = 2131365300;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365300);
                         if (materialButton != null) {
                             return new WidgetThreadBrowserArchivedBinding((ConstraintLayout) view, a, recyclerView, textView, constraintLayout, materialButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$browserViewModel$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$browserViewModel$2.java
index 80fbcced29..6f7acd5de0 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$browserViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$browserViewModel$2.java
@@ -17,6 +17,6 @@ public final class WidgetThreadBrowserArchived$browserViewModel$2 extends o impl
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetThreadBrowserViewModel.ViewState> mo1invoke() {
-        return new WidgetThreadBrowserViewModel(WidgetThreadBrowserArchived.access$getGuildId$p(this.this$0), WidgetThreadBrowserArchived.access$getChannelId$p(this.this$0), null, null, null, 28, null);
+        return new WidgetThreadBrowserViewModel(WidgetThreadBrowserArchived.access$getGuildId$p(this.this$0), WidgetThreadBrowserArchived.access$getChannelId$p(this.this$0), null, null, null, null, 60, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$onViewBound$2.java
index e2182cbc1b..517b6826c0 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived$onViewBound$2.java
@@ -30,6 +30,6 @@ public final class WidgetThreadBrowserArchived$onViewBound$2 extends o implement
         WidgetChannelsListItemThreadActions.Companion companion = WidgetChannelsListItemThreadActions.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.show(parentFragmentManager, channel.g());
+        companion.show(parentFragmentManager, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
index 15b784fdb6..acba79f38f 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchived.java
@@ -58,7 +58,7 @@ public final class WidgetThreadBrowserArchived extends AppFragment {
     }
 
     public WidgetThreadBrowserArchived() {
-        super(2131559248);
+        super(2131559256);
     }
 
     public static final /* synthetic */ long access$getChannelId$p(WidgetThreadBrowserArchived widgetThreadBrowserArchived) {
@@ -110,11 +110,11 @@ public final class WidgetThreadBrowserArchived extends AppFragment {
         widgetThreadBrowserAdapter.setData(viewState.getListItems());
         TextView textView = getBinding().b.d;
         m.checkNotNullExpressionValue(textView, "binding.emptyView.threadBrowserEmptyHeading");
-        textView.setText(requireContext().getString(2131893855));
+        textView.setText(requireContext().getString(2131893953));
         ConstraintLayout constraintLayout2 = getBinding().b.b;
         m.checkNotNullExpressionValue(constraintLayout2, "binding.emptyView.threadBrowserEmpty");
         constraintLayout2.setVisibility(viewState.getListItems().isEmpty() ? 0 : 8);
-        MaterialButton materialButton = getBinding().b.f103c;
+        MaterialButton materialButton = getBinding().b.f114c;
         m.checkNotNullExpressionValue(materialButton, "binding.emptyView.threadBrowserEmptyCreateButton");
         if (!viewState.getCanCreateThread()) {
             i = 8;
@@ -133,11 +133,11 @@ public final class WidgetThreadBrowserArchived extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1971c;
+        RecyclerView recyclerView = getBinding().f1975c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         this.adapter = (WidgetThreadBrowserAdapter) companion.configure(new WidgetThreadBrowserAdapter(recyclerView, new WidgetThreadBrowserArchived$onViewBound$1(getBrowserViewModel()), new WidgetThreadBrowserArchived$onViewBound$2(this)));
-        getBinding().f1971c.addOnScrollListener(new WidgetThreadBrowserArchived$onViewBound$3(this));
-        getBinding().b.f103c.setOnClickListener(new WidgetThreadBrowserArchived$onViewBound$4(this));
+        getBinding().f1975c.addOnScrollListener(new WidgetThreadBrowserArchived$onViewBound$3(this));
+        getBinding().b.f114c.setOnClickListener(new WidgetThreadBrowserArchived$onViewBound$4(this));
         getBinding().e.setOnClickListener(new WidgetThreadBrowserArchived$onViewBound$5(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java
index 978aa54793..7f58713cde 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.channels.threads.browser;
 
 import com.discord.api.channel.Channel;
+import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
 import com.discord.stores.ArchivedThreadsStore;
@@ -23,7 +24,7 @@ import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import kotlin.Pair;
 import rx.Observable;
-import rx.functions.Func3;
+import rx.functions.Func4;
 /* compiled from: WidgetThreadBrowserArchivedViewModel.kt */
 public final class WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2<T, R> implements b<Pair<? extends ArchivedThreadsStore.ThreadListingState, ? extends Channel>, Observable<? extends WidgetThreadBrowserArchivedViewModel.StoreState>> {
     public final /* synthetic */ long $guildId;
@@ -56,7 +57,7 @@ public final class WidgetThreadBrowserArchivedViewModel$Companion$observeStoreSt
 
     /* compiled from: WidgetThreadBrowserArchivedViewModel.kt */
     /* renamed from: com.discord.widgets.channels.threads.browser.WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2$2  reason: invalid class name */
-    public static final class AnonymousClass2<T1, T2, T3, R> implements Func3<Map<Long, ? extends GuildMember>, Map<Long, ? extends User>, Long, WidgetThreadBrowserArchivedViewModel.StoreState> {
+    public static final class AnonymousClass2<T1, T2, T3, T4, R> implements Func4<Map<Long, ? extends GuildMember>, Guild, Map<Long, ? extends User>, Long, WidgetThreadBrowserArchivedViewModel.StoreState> {
         public final /* synthetic */ Channel $channel;
         public final /* synthetic */ ArchivedThreadsStore.ThreadListingState $listingState;
         public final /* synthetic */ WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2 this$0;
@@ -67,21 +68,21 @@ public final class WidgetThreadBrowserArchivedViewModel$Companion$observeStoreSt
             this.$channel = channel;
         }
 
-        public final WidgetThreadBrowserArchivedViewModel.StoreState call(Map<Long, GuildMember> map, Map<Long, ? extends User> map2, Long l) {
+        public final WidgetThreadBrowserArchivedViewModel.StoreState call(Map<Long, GuildMember> map, Guild guild, Map<Long, ? extends User> map2, Long l) {
             boolean canViewAllPrivateThreads = ThreadUtils.INSTANCE.canViewAllPrivateThreads(l);
             WidgetThreadBrowserArchivedViewModel.ViewMode viewMode = this.this$0.$viewMode;
             m.checkNotNullExpressionValue(map, "guildMembers");
             m.checkNotNullExpressionValue(map2, "users");
             ArchivedThreadsStore.ThreadListingState threadListingState = this.$listingState;
             m.checkNotNullExpressionValue(threadListingState, "listingState");
-            return new WidgetThreadBrowserArchivedViewModel.StoreState(viewMode, map, map2, threadListingState, canViewAllPrivateThreads, this.$channel, l);
+            return new WidgetThreadBrowserArchivedViewModel.StoreState(viewMode, map, map2, threadListingState, canViewAllPrivateThreads, this.$channel, guild, l);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
-        @Override // rx.functions.Func3
-        public /* bridge */ /* synthetic */ WidgetThreadBrowserArchivedViewModel.StoreState call(Map<Long, ? extends GuildMember> map, Map<Long, ? extends User> map2, Long l) {
-            return call((Map<Long, GuildMember>) map, map2, l);
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+        @Override // rx.functions.Func4
+        public /* bridge */ /* synthetic */ WidgetThreadBrowserArchivedViewModel.StoreState call(Map<Long, ? extends GuildMember> map, Guild guild, Map<Long, ? extends User> map2, Long l) {
+            return call((Map<Long, GuildMember>) map, guild, map2, l);
         }
     }
 
@@ -110,18 +111,19 @@ public final class WidgetThreadBrowserArchivedViewModel$Companion$observeStoreSt
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(threads, 10));
             Iterator<T> it = threads.iterator();
             while (it.hasNext()) {
-                arrayList.add(Long.valueOf(it.next().p()));
+                arrayList.add(Long.valueOf(it.next().q()));
             }
             observable = storeUser.observeUsers(arrayList);
         } else {
             observable = new j(h0.emptyMap());
         }
-        Observable<R> G = this.$storeGuilds.observeComputed().G(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(G, "storeGuilds\n            …[guildId] ?: emptyMap() }");
-        Observable<T> s2 = ObservableExtensionsKt.leadingEdgeThrottle(G, 1, TimeUnit.SECONDS).s();
+        Observable<R> F = this.$storeGuilds.observeComputed().F(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(F, "storeGuilds\n            …[guildId] ?: emptyMap() }");
+        Observable<T> r = ObservableExtensionsKt.leadingEdgeThrottle(F, 1, TimeUnit.SECONDS).r();
+        Observable<Guild> observeGuild = this.$storeGuilds.observeGuild(this.$guildId);
         StorePermissions storePermissions = this.$storePermissions;
-        Long valueOf = component2 != null ? Long.valueOf(component2.q()) : null;
+        Long valueOf = component2 != null ? Long.valueOf(component2.r()) : null;
         Objects.requireNonNull(valueOf, "null cannot be cast to non-null type com.discord.models.domain.Snowflake /* = kotlin.Long */");
-        return Observable.i(s2, observable, storePermissions.observePermissionsForChannel(valueOf.longValue()), new AnonymousClass2(this, threadListingState, component2));
+        return Observable.h(r, observeGuild, observable, storePermissions.observePermissionsForChannel(valueOf.longValue()), new AnonymousClass2(this, threadListingState, component2));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
index e3b00a5b46..65a50a8b1c 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserArchivedViewModel.java
@@ -5,6 +5,7 @@ import androidx.annotation.MainThread;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppViewModel;
+import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.user.User;
 import com.discord.stores.ArchivedThreadsStore;
@@ -84,15 +85,16 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
         }
 
         private final Observable<StoreState> observeStoreState(ViewMode viewMode, long j, long j2, StoreGuilds storeGuilds, StoreChannels storeChannels, StoreUser storeUser, ArchivedThreadsStore archivedThreadsStore, StorePermissions storePermissions) {
-            Observable<StoreState> Z = Observable.j(archivedThreadsStore.loadAndObserveThreadListing(j2, viewMode.getThreadListingType()), storeChannels.observeChannel(j2), WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$1.INSTANCE).Z(new WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2(storeUser, storeGuilds, j, storePermissions, viewMode));
-            m.checkNotNullExpressionValue(Z, "Observable.combineLatest…            }\n          }");
-            return Z;
+            Observable<StoreState> Y = Observable.j(archivedThreadsStore.loadAndObserveThreadListing(j2, viewMode.getThreadListingType()), storeChannels.observeChannel(j2), WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$1.INSTANCE).Y(new WidgetThreadBrowserArchivedViewModel$Companion$observeStoreState$2(storeUser, storeGuilds, j, storePermissions, viewMode));
+            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…            }\n          }");
+            return Y;
         }
     }
 
     /* compiled from: WidgetThreadBrowserArchivedViewModel.kt */
     public static final class StoreState {
         private final Channel channel;
+        private final Guild guild;
         private final Map<Long, GuildMember> guildMembers;
         private final boolean isModerator;
         private final ArchivedThreadsStore.ThreadListingState listingState;
@@ -102,7 +104,7 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
 
         /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.Map<java.lang.Long, ? extends com.discord.models.user.User> */
         /* JADX WARN: Multi-variable type inference failed */
-        public StoreState(ViewMode viewMode, Map<Long, GuildMember> map, Map<Long, ? extends User> map2, ArchivedThreadsStore.ThreadListingState threadListingState, boolean z2, Channel channel, Long l) {
+        public StoreState(ViewMode viewMode, Map<Long, GuildMember> map, Map<Long, ? extends User> map2, ArchivedThreadsStore.ThreadListingState threadListingState, boolean z2, Channel channel, Guild guild, Long l) {
             m.checkNotNullParameter(viewMode, "viewMode");
             m.checkNotNullParameter(map, "guildMembers");
             m.checkNotNullParameter(map2, "users");
@@ -114,34 +116,12 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
             this.listingState = threadListingState;
             this.isModerator = z2;
             this.channel = channel;
+            this.guild = guild;
             this.permissions = l;
         }
 
-        /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: com.discord.widgets.channels.threads.browser.WidgetThreadBrowserArchivedViewModel$StoreState */
-        /* JADX WARN: Multi-variable type inference failed */
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, ViewMode viewMode, Map map, Map map2, ArchivedThreadsStore.ThreadListingState threadListingState, boolean z2, Channel channel, Long l, int i, Object obj) {
-            if ((i & 1) != 0) {
-                viewMode = storeState.viewMode;
-            }
-            if ((i & 2) != 0) {
-                map = storeState.guildMembers;
-            }
-            if ((i & 4) != 0) {
-                map2 = storeState.users;
-            }
-            if ((i & 8) != 0) {
-                threadListingState = storeState.listingState;
-            }
-            if ((i & 16) != 0) {
-                z2 = storeState.isModerator;
-            }
-            if ((i & 32) != 0) {
-                channel = storeState.channel;
-            }
-            if ((i & 64) != 0) {
-                l = storeState.permissions;
-            }
-            return storeState.copy(viewMode, map, map2, threadListingState, z2, channel, l);
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, ViewMode viewMode, Map map, Map map2, ArchivedThreadsStore.ThreadListingState threadListingState, boolean z2, Channel channel, Guild guild, Long l, int i, Object obj) {
+            return storeState.copy((i & 1) != 0 ? storeState.viewMode : viewMode, (i & 2) != 0 ? storeState.guildMembers : map, (i & 4) != 0 ? storeState.users : map2, (i & 8) != 0 ? storeState.listingState : threadListingState, (i & 16) != 0 ? storeState.isModerator : z2, (i & 32) != 0 ? storeState.channel : channel, (i & 64) != 0 ? storeState.guild : guild, (i & 128) != 0 ? storeState.permissions : l);
         }
 
         public final ViewMode component1() {
@@ -168,17 +148,21 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
             return this.channel;
         }
 
-        public final Long component7() {
+        public final Guild component7() {
+            return this.guild;
+        }
+
+        public final Long component8() {
             return this.permissions;
         }
 
-        public final StoreState copy(ViewMode viewMode, Map<Long, GuildMember> map, Map<Long, ? extends User> map2, ArchivedThreadsStore.ThreadListingState threadListingState, boolean z2, Channel channel, Long l) {
+        public final StoreState copy(ViewMode viewMode, Map<Long, GuildMember> map, Map<Long, ? extends User> map2, ArchivedThreadsStore.ThreadListingState threadListingState, boolean z2, Channel channel, Guild guild, Long l) {
             m.checkNotNullParameter(viewMode, "viewMode");
             m.checkNotNullParameter(map, "guildMembers");
             m.checkNotNullParameter(map2, "users");
             m.checkNotNullParameter(threadListingState, "listingState");
             m.checkNotNullParameter(channel, "channel");
-            return new StoreState(viewMode, map, map2, threadListingState, z2, channel, l);
+            return new StoreState(viewMode, map, map2, threadListingState, z2, channel, guild, l);
         }
 
         public boolean equals(Object obj) {
@@ -189,13 +173,17 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.viewMode, storeState.viewMode) && m.areEqual(this.guildMembers, storeState.guildMembers) && m.areEqual(this.users, storeState.users) && m.areEqual(this.listingState, storeState.listingState) && this.isModerator == storeState.isModerator && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.permissions, storeState.permissions);
+            return m.areEqual(this.viewMode, storeState.viewMode) && m.areEqual(this.guildMembers, storeState.guildMembers) && m.areEqual(this.users, storeState.users) && m.areEqual(this.listingState, storeState.listingState) && this.isModerator == storeState.isModerator && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions);
         }
 
         public final Channel getChannel() {
             return this.channel;
         }
 
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
         public final Map<Long, GuildMember> getGuildMembers() {
             return this.guildMembers;
         }
@@ -236,11 +224,13 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
             int i5 = (hashCode4 + i2) * 31;
             Channel channel = this.channel;
             int hashCode5 = (i5 + (channel != null ? channel.hashCode() : 0)) * 31;
+            Guild guild = this.guild;
+            int hashCode6 = (hashCode5 + (guild != null ? guild.hashCode() : 0)) * 31;
             Long l = this.permissions;
             if (l != null) {
                 i = l.hashCode();
             }
-            return hashCode5 + i;
+            return hashCode6 + i;
         }
 
         public final boolean isModerator() {
@@ -260,6 +250,8 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
             L.append(this.isModerator);
             L.append(", channel=");
             L.append(this.channel);
+            L.append(", guild=");
+            L.append(this.guild);
             L.append(", permissions=");
             return a.C(L, this.permissions, ")");
         }
@@ -553,13 +545,13 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
         this.storeArchivedThreads = archivedThreadsStore;
         this.storePermissions = storePermissions;
         this.storeGuildMemberRequester = storeGuildMemberRequester;
-        BehaviorSubject<ViewMode> m0 = BehaviorSubject.m0(new ViewMode(VisibilityMode.PublicThreads, false));
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(\n…rMode = false\n      )\n  )");
-        this.viewModeSubject = m0;
-        Observable<R> Z = m0.Z(new WidgetThreadBrowserArchivedViewModel$storeStateObservable$1(this));
-        m.checkNotNullExpressionValue(Z, "viewModeSubject\n        …            )\n          }");
-        this.storeStateObservable = Z;
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Z, this, null, 2, null), WidgetThreadBrowserArchivedViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        BehaviorSubject<ViewMode> l0 = BehaviorSubject.l0(new ViewMode(VisibilityMode.PublicThreads, false));
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\n…rMode = false\n      )\n  )");
+        this.viewModeSubject = l0;
+        Observable<R> Y = l0.Y(new WidgetThreadBrowserArchivedViewModel$storeStateObservable$1(this));
+        m.checkNotNullExpressionValue(Y, "viewModeSubject\n        …            )\n          }");
+        this.storeStateObservable = Y;
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Y, this, null, 2, null), WidgetThreadBrowserArchivedViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -614,17 +606,17 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
             if (!listing.getThreads().isEmpty()) {
                 int ordinal = viewMode.getVisibility().ordinal();
                 if (ordinal == 0) {
-                    i = 2131893867;
+                    i = 2131893965;
                 } else if (ordinal == 1) {
-                    i = 2131893865;
+                    i = 2131893963;
                 } else {
                     throw new NoWhenBranchMatchedException();
                 }
                 arrayList.add(new WidgetThreadBrowserAdapter.Item.Header("header", i, listing.getThreads().size()));
                 for (Channel channel : listing.getThreads()) {
-                    User user = storeState.getUsers().get(Long.valueOf(channel.p()));
-                    if (user == null || !storeState.getGuildMembers().containsKey(Long.valueOf(channel.p()))) {
-                        this.storeGuildMemberRequester.queueRequest(channel.e(), channel.p());
+                    User user = storeState.getUsers().get(Long.valueOf(channel.q()));
+                    if (user == null || !storeState.getGuildMembers().containsKey(Long.valueOf(channel.q()))) {
+                        this.storeGuildMemberRequester.queueRequest(channel.f(), channel.q());
                     }
                     Map<Long, GuildMember> guildMembers = storeState.getGuildMembers();
                     boolean z4 = viewMode.getThreadListingType() == ArchivedThreadsStore.ThreadListingType.MY_ARCHIVED_PRIVATE_THREADS;
@@ -650,11 +642,11 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
         } else if (listingState instanceof ArchivedThreadsStore.ThreadListingState.Error) {
             z2 = true;
             this.storeGuildMemberRequester.performQueuedRequests();
-            updateViewState(new ViewState(viewMode, arrayList, isModerator, z2, ThreadUtils.INSTANCE.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, this.guildId)));
+            updateViewState(new ViewState(viewMode, arrayList, isModerator, z2, ThreadUtils.INSTANCE.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, storeState.getGuild())));
         }
         z2 = false;
         this.storeGuildMemberRequester.performQueuedRequests();
-        updateViewState(new ViewState(viewMode, arrayList, isModerator, z2, ThreadUtils.INSTANCE.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, this.guildId)));
+        updateViewState(new ViewState(viewMode, arrayList, isModerator, z2, ThreadUtils.INSTANCE.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, storeState.getGuild())));
     }
 
     public static /* synthetic */ void maybeLoadMore$default(WidgetThreadBrowserArchivedViewModel widgetThreadBrowserArchivedViewModel, boolean z2, int i, Object obj) {
@@ -667,14 +659,14 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
     @MainThread
     public final void maybeLoadMore(boolean z2) {
         if (this.canLoadMore || z2) {
-            ArchivedThreadsStore.fetchListing$default(this.storeArchivedThreads, this.channelId, this.viewModeSubject.o0().getThreadListingType(), false, 4, null);
+            ArchivedThreadsStore.fetchListing$default(this.storeArchivedThreads, this.channelId, this.viewModeSubject.n0().getThreadListingType(), false, 4, null);
         }
     }
 
     @MainThread
     public final void onModeratorModeChanged(boolean z2) {
         BehaviorSubject<ViewMode> behaviorSubject = this.viewModeSubject;
-        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.o0(), null, z2, 1, null));
+        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.n0(), null, z2, 1, null));
         trackTabChanged();
     }
 
@@ -682,15 +674,15 @@ public final class WidgetThreadBrowserArchivedViewModel extends AppViewModel<Vie
     public final void onVisibilityChanged(VisibilityMode visibilityMode) {
         m.checkNotNullParameter(visibilityMode, "visibility");
         BehaviorSubject<ViewMode> behaviorSubject = this.viewModeSubject;
-        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.o0(), visibilityMode, false, 2, null));
+        behaviorSubject.onNext(ViewMode.copy$default(behaviorSubject.n0(), visibilityMode, false, 2, null));
         trackTabChanged();
     }
 
     public final void trackTabChanged() {
         String str;
-        ViewMode o0 = this.viewModeSubject.o0();
-        if (o0 != null) {
-            int ordinal = o0.getThreadListingType().ordinal();
+        ViewMode n0 = this.viewModeSubject.n0();
+        if (n0 != null) {
+            int ordinal = n0.getThreadListingType().ordinal();
             if (ordinal == 0) {
                 str = "My Private Archived Threads";
             } else if (ordinal == 1) {
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java
index a65e1e5806..8b8b7ab5a6 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet$binding$2.java
@@ -19,23 +19,23 @@ public final /* synthetic */ class WidgetThreadBrowserFilterSheet$binding$2 exte
 
     public final WidgetThreadBrowserFilterSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363418;
-        TextView textView = (TextView) view.findViewById(2131363418);
+        int i = 2131363445;
+        TextView textView = (TextView) view.findViewById(2131363445);
         if (textView != null) {
-            i = 2131365241;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365241);
+            i = 2131365296;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365296);
             if (checkedSetting != null) {
-                i = 2131365242;
-                CardView cardView = (CardView) view.findViewById(2131365242);
+                i = 2131365297;
+                CardView cardView = (CardView) view.findViewById(2131365297);
                 if (cardView != null) {
-                    i = 2131365247;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365247);
+                    i = 2131365302;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365302);
                     if (checkedSetting2 != null) {
-                        i = 2131365248;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365248);
+                        i = 2131365303;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365303);
                         if (checkedSetting3 != null) {
-                            i = 2131365286;
-                            TextView textView2 = (TextView) view.findViewById(2131365286);
+                            i = 2131365341;
+                            TextView textView2 = (TextView) view.findViewById(2131365341);
                             if (textView2 != null) {
                                 return new WidgetThreadBrowserFilterSheetBinding((NestedScrollView) view, textView, checkedSetting, cardView, checkedSetting2, checkedSetting3, textView2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
index 9d72c010c9..e25c8de8df 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserFilterSheet.java
@@ -87,7 +87,7 @@ public final class WidgetThreadBrowserFilterSheet extends AppBottomSheet {
         CheckedSetting checkedSetting2 = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.threadBrowserVisibilityPrivate");
         checkedSetting2.setChecked(viewMode.getVisibility() == WidgetThreadBrowserArchivedViewModel.VisibilityMode.PrivateThreads);
-        CardView cardView = getBinding().f1973c;
+        CardView cardView = getBinding().f1977c;
         m.checkNotNullExpressionValue(cardView, "binding.threadBrowserModeratorViewCard");
         cardView.setVisibility(viewState.isModerator() ? 0 : 8);
         if (viewMode.getVisibility() == visibilityMode) {
@@ -123,7 +123,7 @@ public final class WidgetThreadBrowserFilterSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559249;
+        return 2131559257;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel$Companion$observeStoreState$1.java
index ae21ee555a..91bed891ac 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel$Companion$observeStoreState$1.java
@@ -1,13 +1,14 @@
 package com.discord.widgets.channels.threads.browser;
 
 import com.discord.api.channel.Channel;
+import com.discord.models.guild.Guild;
 import com.discord.widgets.channels.threads.browser.WidgetThreadBrowserViewModel;
-import rx.functions.Func2;
+import rx.functions.Func3;
 /* compiled from: WidgetThreadBrowserViewModel.kt */
-public final class WidgetThreadBrowserViewModel$Companion$observeStoreState$1<T1, T2, R> implements Func2<Channel, Long, WidgetThreadBrowserViewModel.StoreState> {
+public final class WidgetThreadBrowserViewModel$Companion$observeStoreState$1<T1, T2, T3, R> implements Func3<Channel, Guild, Long, WidgetThreadBrowserViewModel.StoreState> {
     public static final WidgetThreadBrowserViewModel$Companion$observeStoreState$1 INSTANCE = new WidgetThreadBrowserViewModel$Companion$observeStoreState$1();
 
-    public final WidgetThreadBrowserViewModel.StoreState call(Channel channel, Long l) {
-        return new WidgetThreadBrowserViewModel.StoreState(channel, l);
+    public final WidgetThreadBrowserViewModel.StoreState call(Channel channel, Guild guild, Long l) {
+        return new WidgetThreadBrowserViewModel.StoreState(channel, guild, l);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel.java
index cf297efb84..c497cc4b8d 100644
--- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel.java
+++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserViewModel.java
@@ -6,7 +6,9 @@ import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.app.AppViewModel;
+import com.discord.models.guild.Guild;
 import com.discord.stores.StoreChannels;
+import com.discord.stores.StoreGuilds;
 import com.discord.stores.StorePermissions;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -24,6 +26,7 @@ public final class WidgetThreadBrowserViewModel extends AppViewModel<ViewState>
     private final long channelId;
     private final long guildId;
     private final StoreChannels storeChannels;
+    private final StoreGuilds storeGuilds;
     private final StorePermissions storePermissions;
 
     /* compiled from: WidgetThreadBrowserViewModel.kt */
@@ -60,47 +63,56 @@ public final class WidgetThreadBrowserViewModel extends AppViewModel<ViewState>
             this();
         }
 
-        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, long j, StoreChannels storeChannels, StorePermissions storePermissions) {
-            return companion.observeStoreState(j, storeChannels, storePermissions);
+        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, long j, long j2, StoreChannels storeChannels, StoreGuilds storeGuilds, StorePermissions storePermissions) {
+            return companion.observeStoreState(j, j2, storeChannels, storeGuilds, storePermissions);
         }
 
-        private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StorePermissions storePermissions) {
-            Observable<StoreState> j2 = Observable.j(storeChannels.observeChannel(j), storePermissions.observePermissionsForChannel(j), WidgetThreadBrowserViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(j2, "Observable.combineLatest…issions\n        )\n      }");
-            return j2;
+        private final Observable<StoreState> observeStoreState(long j, long j2, StoreChannels storeChannels, StoreGuilds storeGuilds, StorePermissions storePermissions) {
+            Observable<StoreState> i = Observable.i(storeChannels.observeChannel(j), storeGuilds.observeGuild(j2), storePermissions.observePermissionsForChannel(j), WidgetThreadBrowserViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(i, "Observable.combineLatest…issions\n        )\n      }");
+            return i;
         }
     }
 
     /* compiled from: WidgetThreadBrowserViewModel.kt */
     public static final class StoreState {
         private final Channel channel;
+        private final Guild guild;
         private final Long permissions;
 
-        public StoreState(Channel channel, Long l) {
+        public StoreState(Channel channel, Guild guild, Long l) {
             this.channel = channel;
+            this.guild = guild;
             this.permissions = l;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, Channel channel, Long l, int i, Object obj) {
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, Channel channel, Guild guild, Long l, int i, Object obj) {
             if ((i & 1) != 0) {
                 channel = storeState.channel;
             }
             if ((i & 2) != 0) {
+                guild = storeState.guild;
+            }
+            if ((i & 4) != 0) {
                 l = storeState.permissions;
             }
-            return storeState.copy(channel, l);
+            return storeState.copy(channel, guild, l);
         }
 
         public final Channel component1() {
             return this.channel;
         }
 
-        public final Long component2() {
+        public final Guild component2() {
+            return this.guild;
+        }
+
+        public final Long component3() {
             return this.permissions;
         }
 
-        public final StoreState copy(Channel channel, Long l) {
-            return new StoreState(channel, l);
+        public final StoreState copy(Channel channel, Guild guild, Long l) {
+            return new StoreState(channel, guild, l);
         }
 
         public boolean equals(Object obj) {
@@ -111,13 +123,17 @@ public final class WidgetThreadBrowserViewModel extends AppViewModel<ViewState>
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.channel, storeState.channel) && m.areEqual(this.permissions, storeState.permissions);
+            return m.areEqual(this.channel, storeState.channel) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions);
         }
 
         public final Channel getChannel() {
             return this.channel;
         }
 
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
         public final Long getPermissions() {
             return this.permissions;
         }
@@ -126,16 +142,20 @@ public final class WidgetThreadBrowserViewModel extends AppViewModel<ViewState>
             Channel channel = this.channel;
             int i = 0;
             int hashCode = (channel != null ? channel.hashCode() : 0) * 31;
+            Guild guild = this.guild;
+            int hashCode2 = (hashCode + (guild != null ? guild.hashCode() : 0)) * 31;
             Long l = this.permissions;
             if (l != null) {
                 i = l.hashCode();
             }
-            return hashCode + i;
+            return hashCode2 + i;
         }
 
         public String toString() {
             StringBuilder L = a.L("StoreState(channel=");
             L.append(this.channel);
+            L.append(", guild=");
+            L.append(this.guild);
             L.append(", permissions=");
             return a.C(L, this.permissions, ")");
         }
@@ -301,23 +321,26 @@ public final class WidgetThreadBrowserViewModel extends AppViewModel<ViewState>
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetThreadBrowserViewModel(long j, long j2, StoreChannels storeChannels, StorePermissions storePermissions, Observable<StoreState> observable) {
+    public WidgetThreadBrowserViewModel(long j, long j2, StoreChannels storeChannels, StoreGuilds storeGuilds, StorePermissions storePermissions, Observable<StoreState> observable) {
         super(null, 1, null);
         m.checkNotNullParameter(storeChannels, "storeChannels");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
         m.checkNotNullParameter(storePermissions, "storePermissions");
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.guildId = j;
         this.channelId = j2;
         this.storeChannels = storeChannels;
+        this.storeGuilds = storeGuilds;
         this.storePermissions = storePermissions;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetThreadBrowserViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
-    public /* synthetic */ WidgetThreadBrowserViewModel(long j, long j2, StoreChannels storeChannels, StorePermissions storePermissions, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(j, j2, r6, r7, (i & 16) != 0 ? Companion.access$observeStoreState(Companion, j2, r6, r7) : observable);
+    public /* synthetic */ WidgetThreadBrowserViewModel(long j, long j2, StoreChannels storeChannels, StoreGuilds storeGuilds, StorePermissions storePermissions, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(j, j2, r0, r9, r10, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, j2, j, r0, r9, r10) : observable);
         StoreChannels channels = (i & 4) != 0 ? StoreStream.Companion.getChannels() : storeChannels;
-        StorePermissions permissions = (i & 8) != 0 ? StoreStream.Companion.getPermissions() : storePermissions;
+        StoreGuilds guilds = (i & 8) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds;
+        StorePermissions permissions = (i & 16) != 0 ? StoreStream.Companion.getPermissions() : storePermissions;
     }
 
     public static final /* synthetic */ void access$handleStoreState(WidgetThreadBrowserViewModel widgetThreadBrowserViewModel, StoreState storeState) {
@@ -330,7 +353,7 @@ public final class WidgetThreadBrowserViewModel extends AppViewModel<ViewState>
             Channel channel = storeState.getChannel();
             String y0 = channel != null ? AnimatableValueParser.y0(channel) : null;
             ThreadUtils threadUtils = ThreadUtils.INSTANCE;
-            updateViewState(new ViewState.Browser(y0, threadUtils.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, this.guildId), threadUtils.canViewAllPublicArchivedThreads(storeState.getChannel(), storeState.getPermissions())));
+            updateViewState(new ViewState.Browser(y0, threadUtils.canCreateThread(storeState.getPermissions(), storeState.getChannel(), null, storeState.getGuild()), threadUtils.canViewAllPublicArchivedThreads(storeState.getChannel(), storeState.getPermissions())));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager.java b/app/src/main/java/com/discord/widgets/chat/MessageManager.java
index 20255f330a..24419480f0 100644
--- a/app/src/main/java/com/discord/widgets/chat/MessageManager.java
+++ b/app/src/main/java/com/discord/widgets/chat/MessageManager.java
@@ -6,7 +6,6 @@ import android.os.Build;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.message.allowedmentions.MessageAllowedMentions;
 import com.discord.api.message.allowedmentions.MessageAllowedMentionsTypes;
@@ -14,6 +13,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.api.user.User;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreChannelsSelected;
 import com.discord.stores.StoreExperiments;
@@ -361,28 +361,28 @@ public final class MessageManager {
     }
 
     private final MessageAllowedMentions getAllowedMentionsForMessageEdit(long j, long j2) {
-        Integer M;
-        MessageReference A;
+        Integer type;
+        MessageReference messageReference;
         Long c2;
         boolean z2;
         Message message = this.storeMessages.getMessage(j, j2);
-        if (!(message == null || (M = message.M()) == null || M.intValue() != 19 || (A = message.A()) == null || (c2 = A.c()) == null)) {
+        if (!(message == null || (type = message.getType()) == null || type.intValue() != 19 || (messageReference = message.getMessageReference()) == null || (c2 = messageReference.c()) == null)) {
             StoreMessageReplies.MessageState messageState = this.storeMessageReplies.getAllMessageReferences().get(Long.valueOf(c2.longValue()));
             if (messageState == null || !(messageState instanceof StoreMessageReplies.MessageState.Loaded)) {
                 return null;
             }
-            List<User> z3 = message.z();
-            if (z3 != null) {
-                boolean z4 = false;
-                if (!z3.isEmpty()) {
-                    Iterator<T> it = z3.iterator();
+            List<User> mentions = message.getMentions();
+            if (mentions != null) {
+                boolean z3 = false;
+                if (!mentions.isEmpty()) {
+                    Iterator<T> it = mentions.iterator();
                     while (true) {
                         if (!it.hasNext()) {
                             break;
                         }
                         long i = ((User) it.next()).i();
-                        User g = ((StoreMessageReplies.MessageState.Loaded) messageState).getMessage().g();
-                        if (g == null || i != g.i()) {
+                        User author = ((StoreMessageReplies.MessageState.Loaded) messageState).getMessage().getAuthor();
+                        if (author == null || i != author.i()) {
                             z2 = false;
                             continue;
                         } else {
@@ -390,12 +390,12 @@ public final class MessageManager {
                             continue;
                         }
                         if (z2) {
-                            z4 = true;
+                            z3 = true;
                             break;
                         }
                     }
                 }
-                if (z4) {
+                if (z3) {
                     return null;
                 }
             }
@@ -506,9 +506,9 @@ public final class MessageManager {
             }
         }
         StorePendingReplies.PendingReply pendingReply = z2 ? this.storePendingReplies.getPendingReply(longValue) : null;
-        Observable a02 = Observable.j(this.storeSlowMode.getCooldownSecs(l).a0(1).Z(new MessageManager$sendMessage$messageResultObservable$1(this, pendingReply, longValue, me2, str, list, attachments, list2, (pendingReply == null || pendingReply.getShouldMention()) ? null : new MessageAllowedMentions(k.toList(MessageAllowedMentionsTypes.values()), null, null, Boolean.FALSE, 6))), this.storeGuilds.observeFromChannelId(longValue), MessageManager$sendMessage$1.INSTANCE).a0(1);
-        m.checkNotNullExpressionValue(a02, "Observable.combineLatest…d)\n    }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(a02, false, 1, null)), MessageManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MessageManager$sendMessage$2(function1), 62, (Object) null);
+        Observable Z = Observable.j(this.storeSlowMode.getCooldownSecs(l).Z(1).Y(new MessageManager$sendMessage$messageResultObservable$1(this, pendingReply, longValue, me2, str, list, attachments, list2, (pendingReply == null || pendingReply.getShouldMention()) ? null : new MessageAllowedMentions(k.toList(MessageAllowedMentionsTypes.values()), null, null, Boolean.FALSE, 6))), this.storeGuilds.observeFromChannelId(longValue), MessageManager$sendMessage$1.INSTANCE).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable.combineLatest…d)\n    }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(Z, false, 1, null)), MessageManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MessageManager$sendMessage$2(function1), 62, (Object) null);
         return true;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java
index 46a49386ab..9c71147f2d 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$binding$2.java
@@ -17,17 +17,17 @@ public final /* synthetic */ class WidgetUrlActions$binding$2 extends k implemen
 
     public final WidgetUrlActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362891;
-        TextView textView = (TextView) view.findViewById(2131362891);
+        int i = 2131362916;
+        TextView textView = (TextView) view.findViewById(2131362916);
         if (textView != null) {
-            i = 2131362892;
-            TextView textView2 = (TextView) view.findViewById(2131362892);
+            i = 2131362917;
+            TextView textView2 = (TextView) view.findViewById(2131362917);
             if (textView2 != null) {
-                i = 2131362893;
-                TextView textView3 = (TextView) view.findViewById(2131362893);
+                i = 2131362918;
+                TextView textView3 = (TextView) view.findViewById(2131362918);
                 if (textView3 != null) {
-                    i = 2131362894;
-                    TextView textView4 = (TextView) view.findViewById(2131362894);
+                    i = 2131362919;
+                    TextView textView4 = (TextView) view.findViewById(2131362919);
                     if (textView4 != null) {
                         return new WidgetUrlActionsBinding((LinearLayout) view, textView, textView2, textView3, textView4);
                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java
index 10fe183bd8..8aa2d15462 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java
@@ -17,7 +17,7 @@ public final class WidgetUrlActions$onViewCreated$3 implements View.OnClickListe
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         String access$getUrl$p = WidgetUrlActions.access$getUrl$p(this.this$0);
-        String string = this.this$0.getString(2131888733);
+        String string = this.this$0.getString(2131888734);
         m.checkNotNullExpressionValue(string, "getString(R.string.form_label_send_to)");
         IntentUtils.performChooserSendIntent(requireContext, access$getUrl$p, string);
         this.this$0.dismiss();
diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
index 5cb1600e37..1626c38085 100644
--- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
+++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java
@@ -86,7 +86,7 @@ public final class WidgetUrlActions extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559257;
+        return 2131559266;
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -115,7 +115,7 @@ public final class WidgetUrlActions extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView, "binding.dialogUrlActionsUrl");
         ViewExtensions.setTextAndVisibilityBy(textView, getUrl());
         getBinding().b.setOnClickListener(new WidgetUrlActions$onViewCreated$1(this));
-        getBinding().f1980c.setOnClickListener(new WidgetUrlActions$onViewCreated$2(this));
+        getBinding().f1985c.setOnClickListener(new WidgetUrlActions$onViewCreated$2(this));
         getBinding().d.setOnClickListener(new WidgetUrlActions$onViewCreated$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java
index 43e4cf7000..8db1bef06e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java
@@ -1,7 +1,6 @@
 package com.discord.widgets.chat.input;
 
 import com.discord.api.channel.Channel;
-import com.discord.models.experiments.domain.Experiment;
 import com.discord.panels.PanelState;
 import com.discord.stores.StoreChannelsSelected;
 import com.discord.stores.StoreNotices;
@@ -10,30 +9,41 @@ import com.discord.widgets.chat.input.AppFlexInputViewModel;
 import d0.z.d.m;
 import j0.k.b;
 import rx.Observable;
-import rx.functions.Func7;
+import rx.functions.Func6;
 /* compiled from: AppFlexInputViewModel.kt */
 public final class AppFlexInputViewModel$Companion$observeStores$1<T, R> implements b<StoreChannelsSelected.ResolvedSelectedChannel, Observable<? extends AppFlexInputViewModel.StoreState>> {
     public static final AppFlexInputViewModel$Companion$observeStores$1 INSTANCE = new AppFlexInputViewModel$Companion$observeStores$1();
 
     /* compiled from: AppFlexInputViewModel.kt */
     /* renamed from: com.discord.widgets.chat.input.AppFlexInputViewModel$Companion$observeStores$1$1  reason: invalid class name */
-    public static final class AnonymousClass1<T1, T2, T3, T4, T5, T6, T7, R> implements Func7<PanelState, PanelState, Long, StoreNotices.Notice, Boolean, Boolean, Experiment, AppFlexInputViewModel.StoreState> {
+    public static final class AnonymousClass1<T1, T2, T3, T4, T5, T6, R> implements Func6<PanelState, PanelState, Long, StoreNotices.Notice, Boolean, Boolean, AppFlexInputViewModel.StoreState> {
         public final /* synthetic */ Channel $channel;
 
         public AnonymousClass1(Channel channel) {
             this.$channel = channel;
         }
 
-        public final AppFlexInputViewModel.StoreState call(PanelState panelState, PanelState panelState2, Long l, StoreNotices.Notice notice, Boolean bool, Boolean bool2, Experiment experiment) {
+        public final AppFlexInputViewModel.StoreState call(PanelState panelState, PanelState panelState2, Long l, StoreNotices.Notice notice, Boolean bool, Boolean bool2) {
+            boolean z2;
             m.checkNotNullExpressionValue(panelState, "leftPanelState");
             m.checkNotNullExpressionValue(panelState2, "rightPanelState");
-            return new AppFlexInputViewModel.StoreState(panelState, panelState2, this.$channel, l, notice, false);
+            Channel channel = this.$channel;
+            m.checkNotNullExpressionValue(bool, "stickerSuggestionsEnabled");
+            if (bool.booleanValue()) {
+                m.checkNotNullExpressionValue(bool2, "expressionSuggestionsEnabled");
+                if (bool2.booleanValue()) {
+                    z2 = true;
+                    return new AppFlexInputViewModel.StoreState(panelState, panelState2, channel, l, notice, z2);
+                }
+            }
+            z2 = false;
+            return new AppFlexInputViewModel.StoreState(panelState, panelState2, channel, l, notice, z2);
         }
     }
 
     public final Observable<? extends AppFlexInputViewModel.StoreState> call(StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel) {
         Channel channelOrParent = resolvedSelectedChannel.getChannelOrParent();
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.e(companion.getNavigation().observeLeftPanelState(), companion.getNavigation().observeRightPanelState(), companion.getPermissions().observePermissionsForChannel(channelOrParent != null ? channelOrParent.g() : 0), companion.getNotices().getNotices(), companion.getUserSettings().observeIsStickerSuggestionsEnabled(), companion.getExpressionSuggestions().observeSuggestionsEnabled(), companion.getExperiments().observeUserExperiment("2021-02_mobile_expression_suggestions", true), new AnonymousClass1(channelOrParent));
+        return Observable.f(companion.getNavigation().observeLeftPanelState(), companion.getNavigation().observeRightPanelState(), companion.getPermissions().observePermissionsForChannel(channelOrParent != null ? channelOrParent.h() : 0), companion.getNotices().getNotices(), companion.getUserSettings().observeIsStickerSuggestionsEnabled(), companion.getExpressionSuggestions().observeSuggestionsEnabled(), new AnonymousClass1(channelOrParent));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java
index 0045115193..d1b2ef369c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java
@@ -2,43 +2,21 @@ package com.discord.widgets.chat.input;
 
 import com.discord.api.sticker.Sticker;
 import com.discord.utilities.dsti.StickerUtils;
-import d0.t.n;
-import d0.t.u;
 import d0.z.d.m;
 import d0.z.d.o;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import kotlin.jvm.functions.Function2;
+import kotlin.jvm.functions.Function1;
 /* compiled from: AppFlexInputViewModel.kt */
-public final class AppFlexInputViewModel$getMatchingStickers$1 extends o implements Function2<String, Boolean, Set<? extends Sticker>> {
-    public final /* synthetic */ AppFlexInputViewModel this$0;
+public final class AppFlexInputViewModel$getMatchingStickers$1 extends o implements Function1<String, Set<? extends Sticker>> {
+    public static final AppFlexInputViewModel$getMatchingStickers$1 INSTANCE = new AppFlexInputViewModel$getMatchingStickers$1();
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public AppFlexInputViewModel$getMatchingStickers$1(AppFlexInputViewModel appFlexInputViewModel) {
-        super(2);
-        this.this$0 = appFlexInputViewModel;
+    public AppFlexInputViewModel$getMatchingStickers$1() {
+        super(1);
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function2
-    public /* bridge */ /* synthetic */ Set<? extends Sticker> invoke(String str, Boolean bool) {
-        return invoke(str, bool.booleanValue());
-    }
-
-    public final Set<Sticker> invoke(String str, boolean z2) {
+    public final Set<Sticker> invoke(String str) {
         m.checkNotNullParameter(str, "inputText");
-        List emptyList = n.emptyList();
-        Map<Long, Sticker> stickers = AppFlexInputViewModel.access$getStoreStickers$p(this.this$0).getStickers();
-        LinkedHashMap linkedHashMap = new LinkedHashMap();
-        for (Map.Entry<Long, Sticker> entry : stickers.entrySet()) {
-            Sticker value = entry.getValue();
-            if (z2 ? !u.contains(emptyList, value.h()) : u.contains(emptyList, value.h())) {
-                linkedHashMap.put(entry.getKey(), entry.getValue());
-            }
-        }
-        return StickerUtils.findStickerMatches$default(StickerUtils.INSTANCE, str, u.toList(linkedHashMap.values()), false, 4, null);
+        StickerUtils stickerUtils = StickerUtils.INSTANCE;
+        return StickerUtils.findStickerMatches$default(stickerUtils, str, StickerUtils.getStickersForAutocomplete$default(stickerUtils, null, null, null, null, null, 31, null), false, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
index d37dc410c8..9c517fcf64 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
@@ -28,7 +28,7 @@ public final class AppFlexInputViewModel$onGiftButtonClicked$1 extends o impleme
         m.checkNotNullParameter(fragmentActivity, "activity");
         StoreStream.Companion companion = StoreStream.Companion;
         Channel findChannelByIdInternal$app_productionGoogleRelease = companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(companion.getChannelsSelected().getId());
-        WidgetSettingsGifting.Companion.launch(fragmentActivity, new Traits.Location((findChannelByIdInternal$app_productionGoogleRelease == null || findChannelByIdInternal$app_productionGoogleRelease.e() != 0) ? "Guild Channel" : "DM Channel", "Channel Text Area", "Button Icon", "gift", null, 16, null));
+        WidgetSettingsGifting.Companion.launch(fragmentActivity, new Traits.Location((findChannelByIdInternal$app_productionGoogleRelease == null || findChannelByIdInternal$app_productionGoogleRelease.f() != 0) ? "Guild Channel" : "DM Channel", "Channel Text Area", "Button Icon", "gift", null, 16, null));
         StoreNotices.markSeen$default(companion.getNotices(), "CHAT_GIFTING_NOTICE", 0, 2, null);
         return true;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
index 842c321c07..6c3e47083e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java
@@ -13,9 +13,13 @@ import com.discord.app.AppViewModel;
 import com.discord.panels.PanelState;
 import com.discord.stores.StoreAnalytics;
 import com.discord.stores.StoreExpressionSuggestions;
+import com.discord.stores.StoreGuildSelected;
+import com.discord.stores.StoreGuildStickers;
+import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreNotices;
 import com.discord.stores.StoreStickers;
 import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
 import com.discord.utilities.permissions.PermissionUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.chat.input.sticker.StickerPickerFeatureFlag;
@@ -46,7 +50,11 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
     private final AppPermissionsRequests permissionRequests;
     private final StoreAnalytics storeAnalytics;
     private final StoreExpressionSuggestions storeExpressionSuggestions;
+    private final StoreGuildSelected storeGuildSelected;
+    private final StoreGuildStickers storeGuildStickers;
+    private final StoreGuilds storeGuilds;
     private final StoreStickers storeStickers;
+    private final StoreUser storeUser;
 
     /* compiled from: AppFlexInputViewModel.kt */
     /* renamed from: com.discord.widgets.chat.input.AppFlexInputViewModel$1  reason: invalid class name */
@@ -83,9 +91,9 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         }
 
         private final Observable<StoreState> observeStores() {
-            Observable<R> Z = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Z(AppFlexInputViewModel$Companion$observeStores$1.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "StoreStream\n          .g…            }\n          }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Y(AppFlexInputViewModel$Companion$observeStores$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
@@ -238,7 +246,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable<StoreState> observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions) {
+    public AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable<StoreState> observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds, StoreGuildSelected storeGuildSelected) {
         super(flexInputState);
         m.checkNotNullParameter(appPermissionsRequests, "permissionRequests");
         m.checkNotNullParameter(flexInputState, "initialViewState");
@@ -246,23 +254,27 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         m.checkNotNullParameter(storeStickers, "storeStickers");
         m.checkNotNullParameter(storeAnalytics, "storeAnalytics");
         m.checkNotNullParameter(storeExpressionSuggestions, "storeExpressionSuggestions");
+        m.checkNotNullParameter(storeUser, "storeUser");
+        m.checkNotNullParameter(storeGuildStickers, "storeGuildStickers");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
+        m.checkNotNullParameter(storeGuildSelected, "storeGuildSelected");
         this.permissionRequests = appPermissionsRequests;
         this.storeStickers = storeStickers;
         this.storeAnalytics = storeAnalytics;
         this.storeExpressionSuggestions = storeExpressionSuggestions;
-        this.eventSubject = PublishSubject.l0();
-        Observable s2 = ObservableExtensionsKt.computationLatest(observable).s();
-        m.checkNotNullExpressionValue(s2, "storeObservable\n        …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), AppFlexInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        this.storeUser = storeUser;
+        this.storeGuildStickers = storeGuildStickers;
+        this.storeGuilds = storeGuilds;
+        this.storeGuildSelected = storeGuildSelected;
+        this.eventSubject = PublishSubject.k0();
+        Observable r = ObservableExtensionsKt.computationLatest(observable).r();
+        m.checkNotNullExpressionValue(r, "storeObservable\n        …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), AppFlexInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(appPermissionsRequests, (i & 2) != 0 ? new FlexInputState(null, false, null, null, false, false, false, false, false, 511) : flexInputState, (i & 4) != 0 ? Companion.access$observeStores(Companion) : observable, (i & 8) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? StoreStream.Companion.getExpressionSuggestions() : storeExpressionSuggestions);
-    }
-
-    public static final /* synthetic */ StoreStickers access$getStoreStickers$p(AppFlexInputViewModel appFlexInputViewModel) {
-        return appFlexInputViewModel.storeStickers;
+    public /* synthetic */ AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds, StoreGuildSelected storeGuildSelected, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(appPermissionsRequests, (i & 2) != 0 ? new FlexInputState(null, false, null, null, false, false, false, false, false, 511) : flexInputState, (i & 4) != 0 ? Companion.access$observeStores(Companion) : observable, (i & 8) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? StoreStream.Companion.getExpressionSuggestions() : storeExpressionSuggestions, (i & 64) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 128) != 0 ? StoreStream.Companion.getGuildStickers() : storeGuildStickers, (i & 256) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 512) != 0 ? StoreStream.Companion.getGuildSelected() : storeGuildSelected);
     }
 
     public static final /* synthetic */ void access$handleStoreState(AppFlexInputViewModel appFlexInputViewModel, StoreState storeState) {
@@ -286,7 +298,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         boolean z3 = (m.areEqual(leftPanelState, aVar) ^ true) || (m.areEqual(storeState.getRightPanelState(), aVar) ^ true);
         boolean z4 = storeState.getNotice() != null && !storeState.getNotice().isInAppNotification() && !storeState.getNotice().isPopup();
         boolean hasAccessWrite = selectedChannel != null ? PermissionUtils.INSTANCE.hasAccessWrite(selectedChannel, channelPermission) : false;
-        boolean z5 = selectedChannel != null && (AnimatableValueParser.r1(selectedChannel) || PermissionUtils.can(32768, channelPermission));
+        boolean z5 = selectedChannel != null && (AnimatableValueParser.s1(selectedChannel) || PermissionUtils.can(32768, channelPermission));
         boolean z6 = requireViewState.g;
         if (z4 || z3) {
             hideKeyboard();
@@ -315,12 +327,12 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
         publishSubject.j.onNext(a.C0048a.a);
     }
 
-    public final List<Sticker> getMatchingStickers(String str, boolean z2) {
+    public final List<Sticker> getMatchingStickers(String str) {
         m.checkNotNullParameter(str, "inputText");
-        AppFlexInputViewModel$getMatchingStickers$1 appFlexInputViewModel$getMatchingStickers$1 = new AppFlexInputViewModel$getMatchingStickers$1(this);
+        AppFlexInputViewModel$getMatchingStickers$1 appFlexInputViewModel$getMatchingStickers$1 = AppFlexInputViewModel$getMatchingStickers$1.INSTANCE;
         boolean isEnabled = StickerPickerFeatureFlag.Companion.getINSTANCE().isEnabled();
         int length = str.length();
-        return u.toList((!isEnabled || !(3 <= length && 50 >= length)) ? n0.emptySet() : appFlexInputViewModel$getMatchingStickers$1.invoke(str, z2));
+        return u.toList((!isEnabled || !(3 <= length && 50 >= length)) ? n0.emptySet() : appFlexInputViewModel$getMatchingStickers$1.invoke(str));
     }
 
     @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel
@@ -493,7 +505,7 @@ public final class AppFlexInputViewModel extends AppViewModel<FlexInputState> im
     public void onSendButtonClicked(FlexInputListener flexInputListener) {
         FlexInputState viewState = getViewState();
         if (viewState != null && flexInputListener != null) {
-            flexInputListener.onSend(viewState.a, viewState.f2384c, new AppFlexInputViewModel$onSendButtonClicked$1(this));
+            flexInputListener.onSend(viewState.a, viewState.f2390c, new AppFlexInputViewModel$onSendButtonClicked$1(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputModel.java b/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputModel.java
deleted file mode 100644
index 33d1ce0187..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputModel.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import c.d.b.a.a;
-import d0.z.d.m;
-import java.util.List;
-/* compiled from: InputModels.kt */
-public final class AutocompleteInputModel {
-    private final AutocompleteApplicationCommands applicationCommands;
-    private final String input;
-
-    /* renamed from: me  reason: collision with root package name */
-    private final UserAndSelectedGuildRoles f2128me;
-    private final List<WidgetChatInputCommandsModel> mentionables;
-
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel> */
-    /* JADX WARN: Multi-variable type inference failed */
-    public AutocompleteInputModel(String str, List<? extends WidgetChatInputCommandsModel> list, AutocompleteApplicationCommands autocompleteApplicationCommands, UserAndSelectedGuildRoles userAndSelectedGuildRoles) {
-        m.checkNotNullParameter(str, "input");
-        m.checkNotNullParameter(list, "mentionables");
-        m.checkNotNullParameter(autocompleteApplicationCommands, "applicationCommands");
-        m.checkNotNullParameter(userAndSelectedGuildRoles, "me");
-        this.input = str;
-        this.mentionables = list;
-        this.applicationCommands = autocompleteApplicationCommands;
-        this.f2128me = userAndSelectedGuildRoles;
-    }
-
-    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.AutocompleteInputModel */
-    /* JADX WARN: Multi-variable type inference failed */
-    public static /* synthetic */ AutocompleteInputModel copy$default(AutocompleteInputModel autocompleteInputModel, String str, List list, AutocompleteApplicationCommands autocompleteApplicationCommands, UserAndSelectedGuildRoles userAndSelectedGuildRoles, int i, Object obj) {
-        if ((i & 1) != 0) {
-            str = autocompleteInputModel.input;
-        }
-        if ((i & 2) != 0) {
-            list = autocompleteInputModel.mentionables;
-        }
-        if ((i & 4) != 0) {
-            autocompleteApplicationCommands = autocompleteInputModel.applicationCommands;
-        }
-        if ((i & 8) != 0) {
-            userAndSelectedGuildRoles = autocompleteInputModel.f2128me;
-        }
-        return autocompleteInputModel.copy(str, list, autocompleteApplicationCommands, userAndSelectedGuildRoles);
-    }
-
-    public final String component1() {
-        return this.input;
-    }
-
-    public final List<WidgetChatInputCommandsModel> component2() {
-        return this.mentionables;
-    }
-
-    public final AutocompleteApplicationCommands component3() {
-        return this.applicationCommands;
-    }
-
-    public final UserAndSelectedGuildRoles component4() {
-        return this.f2128me;
-    }
-
-    public final AutocompleteInputModel copy(String str, List<? extends WidgetChatInputCommandsModel> list, AutocompleteApplicationCommands autocompleteApplicationCommands, UserAndSelectedGuildRoles userAndSelectedGuildRoles) {
-        m.checkNotNullParameter(str, "input");
-        m.checkNotNullParameter(list, "mentionables");
-        m.checkNotNullParameter(autocompleteApplicationCommands, "applicationCommands");
-        m.checkNotNullParameter(userAndSelectedGuildRoles, "me");
-        return new AutocompleteInputModel(str, list, autocompleteApplicationCommands, userAndSelectedGuildRoles);
-    }
-
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof AutocompleteInputModel)) {
-            return false;
-        }
-        AutocompleteInputModel autocompleteInputModel = (AutocompleteInputModel) obj;
-        return m.areEqual(this.input, autocompleteInputModel.input) && m.areEqual(this.mentionables, autocompleteInputModel.mentionables) && m.areEqual(this.applicationCommands, autocompleteInputModel.applicationCommands) && m.areEqual(this.f2128me, autocompleteInputModel.f2128me);
-    }
-
-    public final AutocompleteApplicationCommands getApplicationCommands() {
-        return this.applicationCommands;
-    }
-
-    public final String getInput() {
-        return this.input;
-    }
-
-    public final UserAndSelectedGuildRoles getMe() {
-        return this.f2128me;
-    }
-
-    public final List<WidgetChatInputCommandsModel> getMentionables() {
-        return this.mentionables;
-    }
-
-    public int hashCode() {
-        String str = this.input;
-        int i = 0;
-        int hashCode = (str != null ? str.hashCode() : 0) * 31;
-        List<WidgetChatInputCommandsModel> list = this.mentionables;
-        int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31;
-        AutocompleteApplicationCommands autocompleteApplicationCommands = this.applicationCommands;
-        int hashCode3 = (hashCode2 + (autocompleteApplicationCommands != null ? autocompleteApplicationCommands.hashCode() : 0)) * 31;
-        UserAndSelectedGuildRoles userAndSelectedGuildRoles = this.f2128me;
-        if (userAndSelectedGuildRoles != null) {
-            i = userAndSelectedGuildRoles.hashCode();
-        }
-        return hashCode3 + i;
-    }
-
-    public String toString() {
-        StringBuilder L = a.L("AutocompleteInputModel(input=");
-        L.append(this.input);
-        L.append(", mentionables=");
-        L.append(this.mentionables);
-        L.append(", applicationCommands=");
-        L.append(this.applicationCommands);
-        L.append(", me=");
-        L.append(this.f2128me);
-        L.append(")");
-        return L.toString();
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChannelOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/ChannelOptionValue.java
deleted file mode 100644
index 87d8852f25..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/ChannelOptionValue.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
-import d0.z.d.m;
-/* compiled from: InputModels.kt */
-public final class ChannelOptionValue extends CommandOptionValue {
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public ChannelOptionValue(WidgetChatInputCommandsModel.Channel channel) {
-        super(String.valueOf(channel.getId()), null);
-        m.checkNotNullParameter(channel, "channel");
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java
index 1174293014..13517e86c4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java
@@ -5,7 +5,6 @@ import com.discord.models.user.CoreUser;
 import com.discord.models.user.User;
 import com.discord.stores.StorePendingReplies;
 import com.discord.stores.StoreStream;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.widgets.chat.input.ChatInputViewModel;
 import d0.z.d.m;
 import j0.k.b;
@@ -35,17 +34,17 @@ public final class ChatInputViewModel$Companion$getPendingReplyStateObservable$1
         if (pendingReply == null) {
             return new j(null);
         }
-        if (MessageUtils.INSTANCE.isWebhook(pendingReply.getOriginalMessage())) {
-            com.discord.api.user.User g = pendingReply.getOriginalMessage().g();
-            m.checkNotNull(g);
-            return new j(new ChatInputViewModel.StoreState.Loaded.PendingReply(pendingReply, new CoreUser(g), null));
+        if (pendingReply.getOriginalMessage().isWebhook()) {
+            com.discord.api.user.User author = pendingReply.getOriginalMessage().getAuthor();
+            m.checkNotNull(author);
+            return new j(new ChatInputViewModel.StoreState.Loaded.PendingReply(pendingReply, new CoreUser(author), null));
         }
-        com.discord.api.user.User g2 = pendingReply.getOriginalMessage().g();
-        m.checkNotNull(g2);
-        long i = g2.i();
+        com.discord.api.user.User author2 = pendingReply.getOriginalMessage().getAuthor();
+        m.checkNotNull(author2);
+        long i = author2.i();
         Long b = pendingReply.getMessageReference().b();
         if (b != null) {
-            observable = StoreStream.Companion.getGuilds().observeComputed(b.longValue()).G(new ChatInputViewModel$Companion$getPendingReplyStateObservable$1$$special$$inlined$let$lambda$1(i)).s();
+            observable = StoreStream.Companion.getGuilds().observeComputed(b.longValue()).F(new ChatInputViewModel$Companion$getPendingReplyStateObservable$1$$special$$inlined$let$lambda$1(i)).r();
         } else {
             observable = new j(null);
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$observeStoreState$1.java
index 209755b5cc..a94e6fea45 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$observeStoreState$1.java
@@ -102,12 +102,12 @@ public final class ChatInputViewModel$Companion$observeStoreState$1<T, R> implem
         StoreUserRelationships storeUserRelationships = this.$storeUserRelationships;
         User v0 = AnimatableValueParser.v0(channelOrParent);
         Observable<Integer> observe = storeUserRelationships.observe(v0 != null ? v0.getId() : 0);
-        Observable<Long> observePermissionsForChannel = this.$storePermissions.observePermissionsForChannel(channelOrParent.g());
+        Observable<Long> observePermissionsForChannel = this.$storePermissions.observePermissionsForChannel(channelOrParent.h());
         ChatInputViewModel.Companion companion = ChatInputViewModel.Companion;
-        Observable access$getVerificationLevelTriggeredObservable = ChatInputViewModel.Companion.access$getVerificationLevelTriggeredObservable(companion, channelOrParent.e(), this.$storeGuilds, this.$storeUsers);
-        Observable<Boolean> isLurkingObs = this.$storeLurking.isLurkingObs(channelOrParent.e());
-        Observable access$getIsOnCooldownObservable = ChatInputViewModel.Companion.access$getIsOnCooldownObservable(companion, channelOrParent.g(), this.$storeSlowMode);
+        Observable access$getVerificationLevelTriggeredObservable = ChatInputViewModel.Companion.access$getVerificationLevelTriggeredObservable(companion, channelOrParent.f(), this.$storeGuilds, this.$storeUsers);
+        Observable<Boolean> isLurkingObs = this.$storeLurking.isLurkingObs(channelOrParent.f());
+        Observable access$getIsOnCooldownObservable = ChatInputViewModel.Companion.access$getIsOnCooldownObservable(companion, channelOrParent.h(), this.$storeSlowMode);
         m.checkNotNullExpressionValue(access$getIsOnCooldownObservable, "getIsOnCooldownObservabl…hannel.id, storeSlowMode)");
-        return ObservableCombineLatestOverloadsKt.combineLatest(observeMe, computationBuffered, observe, observePermissionsForChannel, access$getVerificationLevelTriggeredObservable, isLurkingObs, access$getIsOnCooldownObservable, this.$storeGuilds.observeFromChannelId(channelOrParent.g()), this.$stickerPickerNfxManager.observeCanShowStickerPickerNfx(), ChatInputViewModel.Companion.access$getPendingReplyStateObservable(companion, channelOrParent.g(), this.$storePendingReplies), this.$storeGuilds.observeComputedMember(channelOrParent.e(), this.$storeUsers.getMe().getId()), this.$storeGuildJoinRequest.observeGuildJoinRequest(channelOrParent.e()), this.$storeThreadDraft.observeDraftState(), new AnonymousClass1(channelOrParent, resolvedSelectedChannel));
+        return ObservableCombineLatestOverloadsKt.combineLatest(observeMe, computationBuffered, observe, observePermissionsForChannel, access$getVerificationLevelTriggeredObservable, isLurkingObs, access$getIsOnCooldownObservable, this.$storeGuilds.observeFromChannelId(channelOrParent.h()), this.$stickerPickerNfxManager.observeCanShowStickerPickerNfx(), ChatInputViewModel.Companion.access$getPendingReplyStateObservable(companion, channelOrParent.h(), this.$storePendingReplies), this.$storeGuilds.observeComputedMember(channelOrParent.f(), this.$storeUsers.getMe().getId()), this.$storeGuildJoinRequest.observeGuildJoinRequest(channelOrParent.f()), this.$storeThreadDraft.observeDraftState(), new AnonymousClass1(channelOrParent, resolvedSelectedChannel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
index 17c70023e1..4c181b12a3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java
@@ -1,6 +1,7 @@
 package com.discord.widgets.chat.input;
 
 import android.content.Context;
+import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.utilities.channel.ChannelSelector;
 import com.discord.utilities.error.Error;
@@ -9,15 +10,10 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
 import com.discord.utilities.threads.ThreadUtils;
-import com.discord.widgets.chat.MessageContent;
 import com.discord.widgets.chat.input.ChatInputViewModel;
-import com.lytefast.flexinput.model.Attachment;
-import d0.t.u;
 import d0.z.d.m;
 import d0.z.d.o;
 import j0.k.b;
-import java.util.ArrayList;
-import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
@@ -25,10 +21,8 @@ import kotlin.jvm.functions.Function2;
 import rx.Observable;
 /* compiled from: ChatInputViewModel.kt */
 public final class ChatInputViewModel$sendMessage$1 extends o implements Function2<Long, Function1<? super Channel, ? extends Unit>, Unit> {
-    public final /* synthetic */ ArrayList $attachments;
     public final /* synthetic */ Context $context;
     public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState;
-    public final /* synthetic */ MessageContent $messageContent;
     public final /* synthetic */ ChatInputViewModel this$0;
 
     /* compiled from: ChatInputViewModel.kt */
@@ -41,9 +35,9 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio
         }
 
         public final Observable<? extends Channel> call(Channel channel) {
-            Observable<R> G = ChatInputViewModel.access$getStoreChannels$p(this.this$0.this$0).observeChannel(channel.g()).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            return ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(G, 0, false, 3, null));
+            Observable<R> F = ChatInputViewModel.access$getStoreChannels$p(this.this$0.this$0).observeChannel(channel.h()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            return ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(F, 0, false, 3, null));
         }
     }
 
@@ -101,17 +95,15 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio
             Error.Response response = error.getResponse();
             m.checkNotNullExpressionValue(response, "error.response");
             Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode());
-            c.a.d.o.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891320, 0, null, 12);
+            c.a.d.o.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891391, 0, null, 12);
         }
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public ChatInputViewModel$sendMessage$1(ChatInputViewModel chatInputViewModel, ChatInputViewModel.ViewState.Loaded loaded, MessageContent messageContent, ArrayList arrayList, Context context) {
+    public ChatInputViewModel$sendMessage$1(ChatInputViewModel chatInputViewModel, ChatInputViewModel.ViewState.Loaded loaded, Context context) {
         super(2);
         this.this$0 = chatInputViewModel;
         this.$loadedViewState = loaded;
-        this.$messageContent = messageContent;
-        this.$attachments = arrayList;
         this.$context = context;
     }
 
@@ -135,14 +127,17 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio
     public final void invoke(Long l, Function1<? super Channel, Unit> function1) {
         ThreadUtils threadUtils = ThreadUtils.INSTANCE;
         long channelId = this.$loadedViewState.getChannelId();
+        int i = AnimatableValueParser.d1(this.$loadedViewState.getChannel()) ? 10 : this.$loadedViewState.getThreadDraftState().isPrivate() ? 12 : 11;
         String threadName = this.$loadedViewState.getThreadDraftState().getThreadName();
         if (threadName == null) {
-            String textContent = this.$messageContent.getTextContent();
-            Attachment attachment = (Attachment) u.firstOrNull((List<? extends Object>) this.$attachments);
-            threadName = threadUtils.generateDefaultName(textContent, attachment != null ? attachment.getDisplayName() : null);
+            threadName = "";
         }
-        Observable A = ObservableExtensionsKt.restSubscribeOn$default(ThreadUtils.createThread$default(threadUtils, channelId, l, threadName, null, 8, null), false, 1, null).A(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(A, "ThreadUtils.createThread…ationLatest()\n          }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(A, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(function1), 54, (Object) null);
+        Integer autoArchiveDuration = this.$loadedViewState.getThreadDraftState().getAutoArchiveDuration();
+        if (autoArchiveDuration == null) {
+            autoArchiveDuration = this.$loadedViewState.getChannel().d();
+        }
+        Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(threadUtils.createThread(channelId, l, i, threadName, Integer.valueOf(autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440)), false, 1, null).z(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(z2, "ThreadUtils.createThread…ationLatest()\n          }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(z2, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(function1), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java
index 26d48f0450..0e65658636 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$2.java
@@ -24,7 +24,7 @@ public final class ChatInputViewModel$sendMessage$2 extends o implements Functio
     }
 
     public final void invoke(Channel channel) {
-        m.checkNotNullParameter(channel, "channel");
-        this.$sendMessage.invoke(Long.valueOf(channel.g()));
+        m.checkNotNullParameter(channel, "thread");
+        this.$sendMessage.invoke(Long.valueOf(channel.h()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java
index a1efea254c..0023053cdd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java
@@ -19,11 +19,9 @@ import rx.subjects.PublishSubject;
 public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 extends o implements Function2<MessageResult, Guild, Unit> {
     public final /* synthetic */ ArrayList $attachments;
     public final /* synthetic */ Context $context;
-    public final /* synthetic */ ChatInputViewModel$sendMessage$1 $createAndGotoThread$1;
     public final /* synthetic */ boolean $hasGif;
     public final /* synthetic */ boolean $hasImage;
     public final /* synthetic */ boolean $hasVideo;
-    public final /* synthetic */ boolean $isSendingMessageInNewThread;
     public final /* synthetic */ boolean $isThreadDraft;
     public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState;
     public final /* synthetic */ Function0 $messageResendCompressedHandler;
@@ -76,7 +74,7 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public ChatInputViewModel$sendMessage$messageSendResultHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, boolean z2, boolean z3, boolean z4, Function0 function0, boolean z5, boolean z6, ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1) {
+    public ChatInputViewModel$sendMessage$messageSendResultHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, boolean z2, boolean z3, boolean z4, Function0 function0, boolean z5) {
         super(2);
         this.this$0 = chatInputViewModel;
         this.$context = context;
@@ -87,8 +85,6 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext
         this.$hasGif = z4;
         this.$messageResendCompressedHandler = function0;
         this.$isThreadDraft = z5;
-        this.$isSendingMessageInNewThread = z6;
-        this.$createAndGotoThread$1 = chatInputViewModel$sendMessage$1;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -105,9 +101,6 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext
             SendUtils.INSTANCE.handleSendError(((MessageResult.UnknownFailure) messageResult).getError(), this.$context, new AnonymousClass1(this, guild), new AnonymousClass2(this));
         } else if (this.$isThreadDraft) {
             ChatInputViewModel.access$getStoreThreadDraft$p(this.this$0).clearDraftState();
-            if ((messageResult instanceof MessageResult.Success) && !this.$isSendingMessageInNewThread) {
-                ChatInputViewModel$sendMessage$1.invoke$default(this.$createAndGotoThread$1, Long.valueOf(((MessageResult.Success) messageResult).getMessage().r()), null, 2, null);
-            }
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
index 2867e40320..6783098202 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java
@@ -12,13 +12,13 @@ import com.discord.api.channel.Channel;
 import com.discord.api.guild.GuildVerificationLevel;
 import com.discord.api.guildjoinrequest.ApplicationStatus;
 import com.discord.api.guildjoinrequest.GuildJoinRequest;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelUserRelationship;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
 import com.discord.stores.StoreAnalytics;
@@ -50,7 +50,10 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.threads.ThreadUtils;
 import com.discord.widgets.chat.MessageContent;
 import com.discord.widgets.chat.MessageManager;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder;
 import com.discord.widgets.chat.input.emoji.EmojiAutocompletePremiumUpsellFeatureFlag;
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
 import com.discord.widgets.chat.input.sticker.StickerPickerNfxManager;
 import com.discord.widgets.user.account.WidgetUserAccountVerifyBase;
 import com.discord.widgets.user.email.WidgetUserEmailVerify;
@@ -156,13 +159,13 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<Boolean> getIsOnCooldownObservable(long j, StoreSlowMode storeSlowMode) {
-            return storeSlowMode.getCooldownSecs(Long.valueOf(j)).G(ChatInputViewModel$Companion$getIsOnCooldownObservable$1.INSTANCE).s();
+            return storeSlowMode.getCooldownSecs(Long.valueOf(j)).F(ChatInputViewModel$Companion$getIsOnCooldownObservable$1.INSTANCE).r();
         }
 
         private final Observable<StoreState.Loaded.PendingReply> getPendingReplyStateObservable(long j, StorePendingReplies storePendingReplies) {
-            Observable<StoreState.Loaded.PendingReply> s2 = storePendingReplies.observePendingReply(j).Z(ChatInputViewModel$Companion$getPendingReplyStateObservable$1.INSTANCE).s();
-            m.checkNotNullExpressionValue(s2, "storePendingReplies\n    …  .distinctUntilChanged()");
-            return s2;
+            Observable<StoreState.Loaded.PendingReply> r = storePendingReplies.observePendingReply(j).Y(ChatInputViewModel$Companion$getPendingReplyStateObservable$1.INSTANCE).r();
+            m.checkNotNullExpressionValue(r, "storePendingReplies\n    …  .distinctUntilChanged()");
+            return r;
         }
 
         private final Observable<GuildVerificationLevel> getVerificationLevelTriggeredObservable(long j, StoreGuilds storeGuilds, StoreUser storeUser) {
@@ -170,9 +173,9 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreChannelsSelected storeChannelsSelected, StoreUser storeUser, StoreChat storeChat, StoreUserRelationships storeUserRelationships, StorePermissions storePermissions, StoreLurking storeLurking, StoreSlowMode storeSlowMode, StoreGuilds storeGuilds, StickerPickerNfxManager stickerPickerNfxManager, StorePendingReplies storePendingReplies, StoreGuildJoinRequest storeGuildJoinRequest, StoreThreadDraft storeThreadDraft) {
-            Observable<R> Z = storeChannelsSelected.observeResolvedSelectedChannel().Z(new ChatInputViewModel$Companion$observeStoreState$1(storeUser, storeChat, storeUserRelationships, storePermissions, storeGuilds, storeLurking, storeSlowMode, stickerPickerNfxManager, storePendingReplies, storeGuildJoinRequest, storeThreadDraft));
-            m.checkNotNullExpressionValue(Z, "storeChannelsSelected.ob…      }\n        }\n      }");
-            return Z;
+            Observable<R> Y = storeChannelsSelected.observeResolvedSelectedChannel().Y(new ChatInputViewModel$Companion$observeStoreState$1(storeUser, storeChat, storeUserRelationships, storePermissions, storeGuilds, storeLurking, storeSlowMode, stickerPickerNfxManager, storePendingReplies, storeGuildJoinRequest, storeThreadDraft));
+            m.checkNotNullExpressionValue(Y, "storeChannelsSelected.ob…      }\n        }\n      }");
+            return Y;
         }
     }
 
@@ -701,7 +704,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             private final boolean isOnCooldown;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2129me;
+            private final MeUser f2135me;
             private final GuildMember meGuildMember;
             private final PendingReply pendingReply;
             private final Integer relationshipType;
@@ -808,7 +811,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 m.checkNotNullParameter(guildVerificationLevel, "verificationLevelTriggered");
                 m.checkNotNullParameter(threadDraftState, "threadDraftState");
                 this.channel = channel;
-                this.f2129me = meUser;
+                this.f2135me = meUser;
                 this.editingMessage = editingMessage;
                 this.relationshipType = num;
                 this.channelPermissions = l;
@@ -825,7 +828,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public static /* synthetic */ Loaded copy$default(Loaded loaded, Channel channel, MeUser meUser, StoreChat.EditingMessage editingMessage, Integer num, Long l, GuildVerificationLevel guildVerificationLevel, boolean z2, boolean z3, Guild guild, boolean z4, PendingReply pendingReply, StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft, GuildMember guildMember, GuildJoinRequest guildJoinRequest, StoreThreadDraft.ThreadDraftState threadDraftState, int i, Object obj) {
-                return loaded.copy((i & 1) != 0 ? loaded.channel : channel, (i & 2) != 0 ? loaded.f2129me : meUser, (i & 4) != 0 ? loaded.editingMessage : editingMessage, (i & 8) != 0 ? loaded.relationshipType : num, (i & 16) != 0 ? loaded.channelPermissions : l, (i & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i & 64) != 0 ? loaded.isLurking : z2, (i & 128) != 0 ? loaded.isOnCooldown : z3, (i & 256) != 0 ? loaded.guild : guild, (i & 512) != 0 ? loaded.canShowStickerPickerNfx : z4, (i & 1024) != 0 ? loaded.pendingReply : pendingReply, (i & 2048) != 0 ? loaded.selectedThreadDraft : threadDraft, (i & 4096) != 0 ? loaded.meGuildMember : guildMember, (i & 8192) != 0 ? loaded.guildJoinRequest : guildJoinRequest, (i & 16384) != 0 ? loaded.threadDraftState : threadDraftState);
+                return loaded.copy((i & 1) != 0 ? loaded.channel : channel, (i & 2) != 0 ? loaded.f2135me : meUser, (i & 4) != 0 ? loaded.editingMessage : editingMessage, (i & 8) != 0 ? loaded.relationshipType : num, (i & 16) != 0 ? loaded.channelPermissions : l, (i & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i & 64) != 0 ? loaded.isLurking : z2, (i & 128) != 0 ? loaded.isOnCooldown : z3, (i & 256) != 0 ? loaded.guild : guild, (i & 512) != 0 ? loaded.canShowStickerPickerNfx : z4, (i & 1024) != 0 ? loaded.pendingReply : pendingReply, (i & 2048) != 0 ? loaded.selectedThreadDraft : threadDraft, (i & 4096) != 0 ? loaded.meGuildMember : guildMember, (i & 8192) != 0 ? loaded.guildJoinRequest : guildJoinRequest, (i & 16384) != 0 ? loaded.threadDraftState : threadDraftState);
             }
 
             public final Channel component1() {
@@ -857,7 +860,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser component2() {
-                return this.f2129me;
+                return this.f2135me;
             }
 
             public final StoreChat.EditingMessage component3() {
@@ -904,7 +907,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.channel, loaded.channel) && m.areEqual(this.f2129me, loaded.f2129me) && m.areEqual(this.editingMessage, loaded.editingMessage) && m.areEqual(this.relationshipType, loaded.relationshipType) && m.areEqual(this.channelPermissions, loaded.channelPermissions) && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isOnCooldown == loaded.isOnCooldown && m.areEqual(this.guild, loaded.guild) && this.canShowStickerPickerNfx == loaded.canShowStickerPickerNfx && m.areEqual(this.pendingReply, loaded.pendingReply) && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && m.areEqual(this.meGuildMember, loaded.meGuildMember) && m.areEqual(this.guildJoinRequest, loaded.guildJoinRequest) && m.areEqual(this.threadDraftState, loaded.threadDraftState);
+                return m.areEqual(this.channel, loaded.channel) && m.areEqual(this.f2135me, loaded.f2135me) && m.areEqual(this.editingMessage, loaded.editingMessage) && m.areEqual(this.relationshipType, loaded.relationshipType) && m.areEqual(this.channelPermissions, loaded.channelPermissions) && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isOnCooldown == loaded.isOnCooldown && m.areEqual(this.guild, loaded.guild) && this.canShowStickerPickerNfx == loaded.canShowStickerPickerNfx && m.areEqual(this.pendingReply, loaded.pendingReply) && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && m.areEqual(this.meGuildMember, loaded.meGuildMember) && m.areEqual(this.guildJoinRequest, loaded.guildJoinRequest) && m.areEqual(this.threadDraftState, loaded.threadDraftState);
             }
 
             public final boolean getCanShowStickerPickerNfx() {
@@ -932,7 +935,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser getMe() {
-                return this.f2129me;
+                return this.f2135me;
             }
 
             public final GuildMember getMeGuildMember() {
@@ -963,7 +966,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 Channel channel = this.channel;
                 int i = 0;
                 int hashCode = (channel != null ? channel.hashCode() : 0) * 31;
-                MeUser meUser = this.f2129me;
+                MeUser meUser = this.f2135me;
                 int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 StoreChat.EditingMessage editingMessage = this.editingMessage;
                 int hashCode3 = (hashCode2 + (editingMessage != null ? editingMessage.hashCode() : 0)) * 31;
@@ -1024,7 +1027,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 StringBuilder L = a.L("Loaded(channel=");
                 L.append(this.channel);
                 L.append(", me=");
-                L.append(this.f2129me);
+                L.append(this.f2135me);
                 L.append(", editingMessage=");
                 L.append(this.editingMessage);
                 L.append(", relationshipType=");
@@ -1095,7 +1098,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             private final int maxFileSizeMB;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2130me;
+            private final MeUser f2136me;
             private final PendingReplyState pendingReplyState;
             private final StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft;
             private final boolean shouldBadgeChatInput;
@@ -1272,7 +1275,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 m.checkNotNullParameter(threadDraftState, "threadDraftState");
                 this.channel = channel;
                 this.channelId = j;
-                this.f2130me = meUser;
+                this.f2136me = meUser;
                 this.editingMessage = editingMessage;
                 this.ableToSendMessage = z2;
                 this.verificationLevelTriggered = guildVerificationLevel;
@@ -1296,7 +1299,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public static /* synthetic */ Loaded copy$default(Loaded loaded, Channel channel, long j, MeUser meUser, StoreChat.EditingMessage editingMessage, boolean z2, GuildVerificationLevel guildVerificationLevel, boolean z3, boolean z4, boolean z5, int i, boolean z6, boolean z7, PendingReplyState pendingReplyState, boolean z8, boolean z9, boolean z10, boolean z11, boolean z12, boolean z13, StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft, boolean z14, ApplicationStatus applicationStatus, StoreThreadDraft.ThreadDraftState threadDraftState, int i2, Object obj) {
-                return loaded.copy((i2 & 1) != 0 ? loaded.channel : channel, (i2 & 2) != 0 ? loaded.channelId : j, (i2 & 4) != 0 ? loaded.f2130me : meUser, (i2 & 8) != 0 ? loaded.editingMessage : editingMessage, (i2 & 16) != 0 ? loaded.ableToSendMessage : z2, (i2 & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i2 & 64) != 0 ? loaded.isLurking : z3, (i2 & 128) != 0 ? loaded.isSystemDM : z4, (i2 & 256) != 0 ? loaded.isOnCooldown : z5, (i2 & 512) != 0 ? loaded.maxFileSizeMB : i, (i2 & 1024) != 0 ? loaded.shouldShowFollow : z6, (i2 & 2048) != 0 ? loaded.canShowStickerPickerNfx : z7, (i2 & 4096) != 0 ? loaded.pendingReplyState : pendingReplyState, (i2 & 8192) != 0 ? loaded.shouldBadgeChatInput : z8, (i2 & 16384) != 0 ? loaded.isBlocked : z9, (i2 & 32768) != 0 ? loaded.isInputShowing : z10, (i2 & 65536) != 0 ? loaded.isVerificationLevelTriggered : z11, (i2 & 131072) != 0 ? loaded.isEditing : z12, (i2 & 262144) != 0 ? loaded.isReplying : z13, (i2 & 524288) != 0 ? loaded.selectedThreadDraft : threadDraft, (i2 & 1048576) != 0 ? loaded.shouldShowVerificationGate : z14, (i2 & 2097152) != 0 ? loaded.joinRequestStatus : applicationStatus, (i2 & 4194304) != 0 ? loaded.threadDraftState : threadDraftState);
+                return loaded.copy((i2 & 1) != 0 ? loaded.channel : channel, (i2 & 2) != 0 ? loaded.channelId : j, (i2 & 4) != 0 ? loaded.f2136me : meUser, (i2 & 8) != 0 ? loaded.editingMessage : editingMessage, (i2 & 16) != 0 ? loaded.ableToSendMessage : z2, (i2 & 32) != 0 ? loaded.verificationLevelTriggered : guildVerificationLevel, (i2 & 64) != 0 ? loaded.isLurking : z3, (i2 & 128) != 0 ? loaded.isSystemDM : z4, (i2 & 256) != 0 ? loaded.isOnCooldown : z5, (i2 & 512) != 0 ? loaded.maxFileSizeMB : i, (i2 & 1024) != 0 ? loaded.shouldShowFollow : z6, (i2 & 2048) != 0 ? loaded.canShowStickerPickerNfx : z7, (i2 & 4096) != 0 ? loaded.pendingReplyState : pendingReplyState, (i2 & 8192) != 0 ? loaded.shouldBadgeChatInput : z8, (i2 & 16384) != 0 ? loaded.isBlocked : z9, (i2 & 32768) != 0 ? loaded.isInputShowing : z10, (i2 & 65536) != 0 ? loaded.isVerificationLevelTriggered : z11, (i2 & 131072) != 0 ? loaded.isEditing : z12, (i2 & 262144) != 0 ? loaded.isReplying : z13, (i2 & 524288) != 0 ? loaded.selectedThreadDraft : threadDraft, (i2 & 1048576) != 0 ? loaded.shouldShowVerificationGate : z14, (i2 & 2097152) != 0 ? loaded.joinRequestStatus : applicationStatus, (i2 & 4194304) != 0 ? loaded.threadDraftState : threadDraftState);
             }
 
             public final Channel component1() {
@@ -1364,7 +1367,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser component3() {
-                return this.f2130me;
+                return this.f2136me;
             }
 
             public final StoreChat.EditingMessage component4() {
@@ -1407,7 +1410,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.channel, loaded.channel) && this.channelId == loaded.channelId && m.areEqual(this.f2130me, loaded.f2130me) && m.areEqual(this.editingMessage, loaded.editingMessage) && this.ableToSendMessage == loaded.ableToSendMessage && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isSystemDM == loaded.isSystemDM && this.isOnCooldown == loaded.isOnCooldown && this.maxFileSizeMB == loaded.maxFileSizeMB && this.shouldShowFollow == loaded.shouldShowFollow && this.canShowStickerPickerNfx == loaded.canShowStickerPickerNfx && m.areEqual(this.pendingReplyState, loaded.pendingReplyState) && this.shouldBadgeChatInput == loaded.shouldBadgeChatInput && this.isBlocked == loaded.isBlocked && this.isInputShowing == loaded.isInputShowing && this.isVerificationLevelTriggered == loaded.isVerificationLevelTriggered && this.isEditing == loaded.isEditing && this.isReplying == loaded.isReplying && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && this.shouldShowVerificationGate == loaded.shouldShowVerificationGate && m.areEqual(this.joinRequestStatus, loaded.joinRequestStatus) && m.areEqual(this.threadDraftState, loaded.threadDraftState);
+                return m.areEqual(this.channel, loaded.channel) && this.channelId == loaded.channelId && m.areEqual(this.f2136me, loaded.f2136me) && m.areEqual(this.editingMessage, loaded.editingMessage) && this.ableToSendMessage == loaded.ableToSendMessage && m.areEqual(this.verificationLevelTriggered, loaded.verificationLevelTriggered) && this.isLurking == loaded.isLurking && this.isSystemDM == loaded.isSystemDM && this.isOnCooldown == loaded.isOnCooldown && this.maxFileSizeMB == loaded.maxFileSizeMB && this.shouldShowFollow == loaded.shouldShowFollow && this.canShowStickerPickerNfx == loaded.canShowStickerPickerNfx && m.areEqual(this.pendingReplyState, loaded.pendingReplyState) && this.shouldBadgeChatInput == loaded.shouldBadgeChatInput && this.isBlocked == loaded.isBlocked && this.isInputShowing == loaded.isInputShowing && this.isVerificationLevelTriggered == loaded.isVerificationLevelTriggered && this.isEditing == loaded.isEditing && this.isReplying == loaded.isReplying && m.areEqual(this.selectedThreadDraft, loaded.selectedThreadDraft) && this.shouldShowVerificationGate == loaded.shouldShowVerificationGate && m.areEqual(this.joinRequestStatus, loaded.joinRequestStatus) && m.areEqual(this.threadDraftState, loaded.threadDraftState);
             }
 
             public final boolean getAbleToSendMessage() {
@@ -1439,7 +1442,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
 
             public final MeUser getMe() {
-                return this.f2130me;
+                return this.f2136me;
             }
 
             public final PendingReplyState getPendingReplyState() {
@@ -1474,7 +1477,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 Channel channel = this.channel;
                 int i = 0;
                 int a = (b.a(this.channelId) + ((channel != null ? channel.hashCode() : 0) * 31)) * 31;
-                MeUser meUser = this.f2130me;
+                MeUser meUser = this.f2136me;
                 int hashCode = (a + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 StoreChat.EditingMessage editingMessage = this.editingMessage;
                 int hashCode2 = (hashCode + (editingMessage != null ? editingMessage.hashCode() : 0)) * 31;
@@ -1633,7 +1636,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 L.append(", channelId=");
                 L.append(this.channelId);
                 L.append(", me=");
-                L.append(this.f2130me);
+                L.append(this.f2136me);
                 L.append(", editingMessage=");
                 L.append(this.editingMessage);
                 L.append(", ableToSendMessage=");
@@ -1740,9 +1743,9 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         this.storeAnalytics = storeAnalytics;
         this.storeThreadDraft = storeThreadDraft;
         this.isEmojiAutocompleteUpsellEnabled = z2;
-        PublishSubject<Event> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.eventSubject = l0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         this.logEmojiAutocompleteUpsellViewed = true;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ChatInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeChat.observeEvents(), this, null, 2, null), ChatInputViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
@@ -1810,8 +1813,8 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             StoreState.Loaded loaded = (StoreState.Loaded) storeState;
             boolean hasAccessWrite = PermissionUtils.INSTANCE.hasAccessWrite(loaded.getChannel(), loaded.getChannelPermissions());
             boolean isType = ModelUserRelationship.isType(loaded.getRelationshipType(), 2);
-            boolean z2 = !isType && hasAccessWrite && !loaded.isLurking() && (ThreadUtils.INSTANCE.canUnarchiveThread(loaded.getChannel(), loaded.getChannelPermissions()) || !AnimatableValueParser.y1(loaded.getChannel()));
-            boolean z3 = loaded.getChannel().z() == 5 && !z2;
+            boolean z2 = !isType && hasAccessWrite && !loaded.isLurking() && (ThreadUtils.INSTANCE.canUnarchiveThread(loaded.getChannel(), loaded.getChannelPermissions()) || !AnimatableValueParser.z1(loaded.getChannel()));
+            boolean z3 = loaded.getChannel().A() == 5 && !z2;
             PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
             int maxFileSizeMB = premiumUtils.getMaxFileSizeMB(loaded.getMe());
             Guild guild = loaded.getGuild();
@@ -1823,21 +1826,21 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             boolean hasVerificationGate$default = MemberVerificationUtils.hasVerificationGate$default(MemberVerificationUtils.INSTANCE, loaded.getGuild(), null, 2, null);
             GuildMember meGuildMember = loaded.getMeGuildMember();
             boolean z5 = hasVerificationGate$default && ((meGuildMember != null ? meGuildMember.getPending() : false) || z4);
-            boolean z6 = !AnimatableValueParser.w1(loaded.getChannel()) && !loaded.isLurking() && !z4 && !z3 && !z5;
-            boolean z7 = z2 && loaded.getEditingMessage() != null && loaded.getEditingMessage().getMessage().i() == loaded.getChannel().g();
+            boolean z6 = !AnimatableValueParser.x1(loaded.getChannel()) && !loaded.isLurking() && !z4 && !z3 && !z5;
+            boolean z7 = z2 && loaded.getEditingMessage() != null && loaded.getEditingMessage().getMessage().getChannelId() == loaded.getChannel().h();
             boolean z8 = replying instanceof ViewState.Loaded.PendingReplyState.Replying;
             Channel channel = loaded.getChannel();
-            long g = loaded.getChannel().g();
+            long h = loaded.getChannel().h();
             MeUser me2 = loaded.getMe();
             StoreChat.EditingMessage editingMessage2 = loaded.getEditingMessage();
             GuildVerificationLevel verificationLevelTriggered = loaded.getVerificationLevelTriggered();
             boolean isLurking = loaded.isLurking();
-            boolean w1 = AnimatableValueParser.w1(loaded.getChannel());
+            boolean x1 = AnimatableValueParser.x1(loaded.getChannel());
             boolean isOnCooldown = loaded.isOnCooldown();
             boolean canShowStickerPickerNfx = loaded.getCanShowStickerPickerNfx();
             StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft();
             GuildJoinRequest guildJoinRequest = loaded.getGuildJoinRequest();
-            ViewState.Loaded loaded2 = new ViewState.Loaded(channel, g, me2, editingMessage2, z2, verificationLevelTriggered, isLurking, w1, isOnCooldown, max, z3, canShowStickerPickerNfx, replying, false, isType, z6, z4, z7, z8, selectedThreadDraft, z5, guildJoinRequest != null ? guildJoinRequest.a() : null, loaded.getThreadDraftState());
+            ViewState.Loaded loaded2 = new ViewState.Loaded(channel, h, me2, editingMessage2, z2, verificationLevelTriggered, isLurking, x1, isOnCooldown, max, z3, canShowStickerPickerNfx, replying, false, isType, z6, z4, z7, z8, selectedThreadDraft, z5, guildJoinRequest != null ? guildJoinRequest.a() : null, loaded.getThreadDraftState());
             ViewState viewState = getViewState();
             if (!(viewState instanceof ViewState.Loaded)) {
                 viewState = null;
@@ -1862,30 +1865,22 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         chatInputViewModel.sendMessage(context, messageManager, messageContent, list, (i & 16) != 0 ? false : z2, function1);
     }
 
-    public final void checkEmojiAutocompleteUpsellViewed(List<? extends WidgetChatInputCommandsModel> list) {
+    public final void checkEmojiAutocompleteUpsellViewed(List<? extends Autocompletable> list) {
         Object obj;
-        boolean z2;
         m.checkNotNullParameter(list, "visibleItems");
         if (this.isEmojiAutocompleteUpsellEnabled && this.logEmojiAutocompleteUpsellViewed) {
-            ListIterator<? extends WidgetChatInputCommandsModel> listIterator = list.listIterator(list.size());
+            ListIterator<? extends Autocompletable> listIterator = list.listIterator(list.size());
             while (true) {
                 if (!listIterator.hasPrevious()) {
                     obj = null;
                     break;
                 }
                 obj = listIterator.previous();
-                if (((WidgetChatInputCommandsModel) obj).getType() == 11) {
-                    z2 = true;
-                    continue;
-                } else {
-                    z2 = false;
-                    continue;
-                }
-                if (z2) {
+                if (((Autocompletable) obj) instanceof EmojiUpsellPlaceholder) {
                     break;
                 }
             }
-            if (((WidgetChatInputCommandsModel) obj) != null) {
+            if (((Autocompletable) obj) != null) {
                 this.logEmojiAutocompleteUpsellViewed = false;
                 this.storeAnalytics.emojiAutocompleteUpsellInlineViewed();
             }
@@ -1907,9 +1902,9 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         }
     }
 
-    public final boolean handleEmojiAutocompleteUpsellClicked(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        m.checkNotNullParameter(widgetChatInputCommandsModel, "item");
-        if (!this.isEmojiAutocompleteUpsellEnabled || widgetChatInputCommandsModel.getType() != 11) {
+    public final boolean handleEmojiAutocompleteUpsellClicked(Autocompletable autocompletable) {
+        m.checkNotNullParameter(autocompletable, "item");
+        if (!this.isEmojiAutocompleteUpsellEnabled || !(autocompletable instanceof EmojiUpsellPlaceholder)) {
             return false;
         }
         PublishSubject<Event> publishSubject = this.eventSubject;
@@ -1936,7 +1931,7 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
-            this.storeLurking.postJoinGuildAsMember(loaded.getChannel().e());
+            this.storeLurking.postJoinGuildAsMember(loaded.getChannel().f());
         }
     }
 
@@ -1963,8 +1958,8 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
             if (applicationCommandData.getValidInputs()) {
-                if (loaded.getChannel().e() != 0) {
-                    l = Long.valueOf(loaded.getChannel().e());
+                if (loaded.getChannel().f() != 0) {
+                    l = Long.valueOf(loaded.getChannel().f());
                 }
                 this.storeApplicationInteractions.sendApplicationCommand(loaded.getChannelId(), l, applicationCommandData.getApplicationCommand().getVersion(), applicationCommandData, ChatInputViewModel$sendCommand$1.INSTANCE, ChatInputViewModel$sendCommand$2.INSTANCE);
                 return true;
@@ -1974,21 +1969,18 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
         return false;
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:17:0x0072  */
-    /* JADX WARNING: Removed duplicated region for block: B:26:0x009a  */
-    /* JADX WARNING: Removed duplicated region for block: B:35:0x00ce A[LOOP:3: B:33:0x00c8->B:35:0x00ce, LOOP_END] */
-    /* JADX WARNING: Removed duplicated region for block: B:38:0x00f7  */
-    /* JADX WARNING: Removed duplicated region for block: B:39:0x00fe  */
-    /* JADX WARNING: Removed duplicated region for block: B:42:0x0107  */
-    /* JADX WARNING: Removed duplicated region for block: B:43:0x010a  */
-    /* JADX WARNING: Removed duplicated region for block: B:46:0x0112  */
-    /* JADX WARNING: Removed duplicated region for block: B:47:0x0117  */
-    /* JADX WARNING: Removed duplicated region for block: B:49:0x011b  */
-    /* JADX WARNING: Removed duplicated region for block: B:55:0x013c A[ADDED_TO_REGION] */
-    /* JADX WARNING: Removed duplicated region for block: B:60:0x017b  */
-    /* JADX WARNING: Removed duplicated region for block: B:66:0x01b4  */
-    /* JADX WARNING: Removed duplicated region for block: B:74:0x01f0  */
-    /* JADX WARNING: Removed duplicated region for block: B:80:0x0220  */
+    /* JADX WARNING: Removed duplicated region for block: B:17:0x0071  */
+    /* JADX WARNING: Removed duplicated region for block: B:26:0x0099  */
+    /* JADX WARNING: Removed duplicated region for block: B:35:0x00cd A[LOOP:3: B:33:0x00c7->B:35:0x00cd, LOOP_END] */
+    /* JADX WARNING: Removed duplicated region for block: B:38:0x00f6  */
+    /* JADX WARNING: Removed duplicated region for block: B:39:0x00fd  */
+    /* JADX WARNING: Removed duplicated region for block: B:42:0x0106  */
+    /* JADX WARNING: Removed duplicated region for block: B:43:0x0109  */
+    /* JADX WARNING: Removed duplicated region for block: B:46:0x0112 A[ADDED_TO_REGION] */
+    /* JADX WARNING: Removed duplicated region for block: B:51:0x014a  */
+    /* JADX WARNING: Removed duplicated region for block: B:57:0x0184  */
+    /* JADX WARNING: Removed duplicated region for block: B:64:0x01be  */
+    /* JADX WARNING: Removed duplicated region for block: B:68:0x01d7  */
     public final void sendMessage(Context context, MessageManager messageManager, MessageContent messageContent, List<? extends Attachment<?>> list, boolean z2, Function1<? super Boolean, Unit> function1) {
         boolean z3;
         boolean z4;
@@ -2061,42 +2053,38 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                         Float maxOrNull = u.m92maxOrNull((Iterable<Float>) arrayList2);
                         floatValue = maxOrNull == null ? maxOrNull.floatValue() : 0.0f;
                         z6 = loaded.getSelectedThreadDraft() == null;
-                        StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft();
-                        boolean z7 = (selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null || loaded.getThreadDraftState().isPrivate();
-                        ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context);
+                        ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context);
                         chatInputViewModel$sendMessage$messageResendCompressedHandler$1 = (!z2 || !z3) ? null : new ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(this, context, arrayList, messageManager, messageContent, function1);
-                        ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1);
+                        ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6);
                         chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this);
                         if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null || !this.storeUserSettings.getIsAutoImageCompressionEnabled()) {
                             ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1);
                             if (!loaded.isEditing() && loaded.getEditingMessage() != null) {
                                 Message message = loaded.getEditingMessage().getMessage();
-                                long r = message.r();
-                                long i2 = message.i();
+                                long id2 = message.getId();
+                                long channelId = message.getChannelId();
                                 String textContent = messageContent.getTextContent();
-                                String k = message.k();
-                                if (k != null) {
-                                    i = k.length();
+                                String content = message.getContent();
+                                if (content != null) {
+                                    i = content.length();
                                 }
-                                function1.invoke(Boolean.valueOf(messageManager.editMessage(r, i2, textContent, chatInputViewModel$sendMessage$onMessageTooLong$1, Integer.valueOf(i))));
-                            } else if (z6) {
-                                chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId()));
+                                function1.invoke(Boolean.valueOf(messageManager.editMessage(id2, channelId, textContent, chatInputViewModel$sendMessage$onMessageTooLong$1, Integer.valueOf(i))));
                                 return;
-                            } else if (z7) {
-                                StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft2 = loaded.getSelectedThreadDraft();
-                                if (selectedThreadDraft2 != null) {
-                                    l = selectedThreadDraft2.getStarterMessageId();
+                            } else if (!z6) {
+                                StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft();
+                                if (selectedThreadDraft != null) {
+                                    l = selectedThreadDraft.getStarterMessageId();
                                 }
                                 chatInputViewModel$sendMessage$1.invoke(l, (Function1<? super Channel, Unit>) new ChatInputViewModel$sendMessage$2(chatInputViewModel$sendMessage$sendMessage$1));
+                                return;
                             } else {
-                                this.storeThreadDraft.setDraftSending();
                                 chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId()));
                                 return;
                             }
+                        } else {
+                            chatInputViewModel$sendMessage$messageResendCompressedHandler$1.mo1invoke();
                             return;
                         }
-                        chatInputViewModel$sendMessage$messageResendCompressedHandler$1.mo1invoke();
-                        return;
                     }
                     z5 = false;
                     ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10));
@@ -2108,20 +2096,17 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                     }
                     if (loaded.getSelectedThreadDraft() == null) {
                     }
-                    StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft();
-                    if ((selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null) {
-                    }
-                    ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context);
+                    ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context);
                     if (!z2) {
                     }
-                    ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1);
+                    ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6);
                     chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this);
                     if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) {
                     }
                     ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1);
                     if (!loaded.isEditing()) {
                     }
-                    if (z6) {
+                    if (!z6) {
                     }
                 }
                 z4 = false;
@@ -2137,20 +2122,17 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
                 }
                 if (loaded.getSelectedThreadDraft() == null) {
                 }
-                StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft();
-                if ((selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null) {
-                }
-                ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context);
+                ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context);
                 if (!z2) {
                 }
-                ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1);
+                ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6);
                 chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this);
                 if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) {
                 }
                 ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1);
                 if (!loaded.isEditing()) {
                 }
-                if (z6) {
+                if (!z6) {
                 }
             }
             z3 = false;
@@ -2169,20 +2151,17 @@ public final class ChatInputViewModel extends AppViewModel<ViewState> {
             }
             if (loaded.getSelectedThreadDraft() == null) {
             }
-            StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft();
-            if ((selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null) {
-            }
-            ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context);
+            ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, context);
             if (!z2) {
             }
-            ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1);
+            ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6);
             chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this);
             if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) {
             }
             ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1);
             if (!loaded.isEditing()) {
             }
-            if (z6) {
+            if (!z6) {
             }
         } else {
             function1.invoke(Boolean.FALSE);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java
index 4179fd3718..9a1ea94378 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java
@@ -22,11 +22,11 @@ public final class CommandCategoryViewHolder extends MGRecyclerViewHolder<Widget
         super(2131558445, widgetChatInputCategoriesAdapter);
         m.checkNotNullParameter(widgetChatInputCategoriesAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362645;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362645);
+        int i = 2131362669;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362669);
         if (simpleDraweeView != null) {
-            i = 2131364125;
-            View findViewById = view.findViewById(2131364125);
+            i = 2131364168;
+            View findViewById = view.findViewById(2131364168);
             if (findViewById != null) {
                 CommandCategoryItemBinding commandCategoryItemBinding = new CommandCategoryItemBinding((FrameLayout) view, simpleDraweeView, new n(findViewById, findViewById));
                 m.checkNotNullExpressionValue(commandCategoryItemBinding, "CommandCategoryItemBinding.bind(itemView)");
@@ -52,7 +52,7 @@ public final class CommandCategoryViewHolder extends MGRecyclerViewHolder<Widget
         SimpleDraweeView simpleDraweeView2 = this.binding.b;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.commandCategoryItemIcon");
         simpleDraweeView2.setSelected(commandCategoryItem.isSelected());
-        View view = this.binding.f1601c.b;
+        View view = this.binding.f1597c.b;
         m.checkNotNullExpressionValue(view, "binding.overline.express…CategorySelectionOverline");
         view.setVisibility(commandCategoryItem.isSelected() ? 0 : 8);
         if (commandCategoryItem.isSelected()) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java
index 580707e2bd..fb7b6b1f50 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/StickerViewHolder.java
@@ -14,17 +14,17 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetChatInpu
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StickerViewHolder(WidgetChatInputAutocompleteStickerAdapter widgetChatInputAutocompleteStickerAdapter) {
-        super(2131558665, widgetChatInputAutocompleteStickerAdapter);
+        super(2131558664, widgetChatInputAutocompleteStickerAdapter);
         m.checkNotNullParameter(widgetChatInputAutocompleteStickerAdapter, "adapter");
         View view = this.itemView;
-        StickerView stickerView = (StickerView) view.findViewById(2131365072);
+        StickerView stickerView = (StickerView) view.findViewById(2131365126);
         if (stickerView != null) {
             StickerAutocompleteItemBinding stickerAutocompleteItemBinding = new StickerAutocompleteItemBinding((FrameLayout) view, stickerView);
             m.checkNotNullExpressionValue(stickerAutocompleteItemBinding, "StickerAutocompleteItemBinding.bind(itemView)");
             this.binding = stickerAutocompleteItemBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365072)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365126)));
     }
 
     public static final /* synthetic */ WidgetChatInputAutocompleteStickerAdapter access$getAdapter$p(StickerViewHolder stickerViewHolder) {
@@ -39,7 +39,7 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetChatInpu
         SimpleDraweeView simpleDraweeView = stickerView.i.b;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.stickerViewImageview");
         simpleDraweeView.setBackground(null);
-        RLottieImageView rLottieImageView = stickerView.i.f99c;
+        RLottieImageView rLottieImageView = stickerView.i.f104c;
         m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie");
         rLottieImageView.setBackground(null);
         this.binding.a.setOnClickListener(new StickerViewHolder$onConfigure$1(this, autocompleteStickerItem));
diff --git a/app/src/main/java/com/discord/widgets/chat/input/StickyHeaderHolder.java b/app/src/main/java/com/discord/widgets/chat/input/StickyHeaderHolder.java
deleted file mode 100644
index bf4b74af4c..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/StickyHeaderHolder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import android.view.View;
-/* compiled from: WidgetChatInputCommandsAdapter */
-public interface StickyHeaderHolder {
-    void bind(WidgetChatInputCommandsModel widgetChatInputCommandsModel);
-
-    View getItemView();
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/StickyHeaderManager.java b/app/src/main/java/com/discord/widgets/chat/input/StickyHeaderManager.java
deleted file mode 100644
index f18c42587b..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/StickyHeaderManager.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import android.view.View;
-import androidx.recyclerview.widget.RecyclerView;
-import com.discord.utilities.views.StickyHeaderItemDecoration;
-/* compiled from: WidgetChatInputCommandsAdapter */
-public class StickyHeaderManager {
-    public StickyHeaderHolder stickyHeaderHolder;
-
-    public StickyHeaderManager(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        this.stickyHeaderHolder = widgetChatInputCommandsAdapter.createStickyHeaderViewHolder();
-    }
-
-    public void layoutViews(RecyclerView recyclerView) {
-        View itemView = this.stickyHeaderHolder.getItemView();
-        if (itemView != null) {
-            StickyHeaderItemDecoration.LayoutManager.layoutHeaderView(recyclerView, itemView);
-        }
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java
index 27acb3a840..1a19eb0aa4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$binding$2.java
@@ -10,8 +10,8 @@ import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.d4;
-import c.a.i.e4;
+import c.a.i.g4;
+import c.a.i.h4;
 import com.discord.databinding.WidgetChatInputApplicationCommandsBinding;
 import com.discord.databinding.WidgetChatInputBinding;
 import com.google.android.material.button.MaterialButton;
@@ -31,97 +31,97 @@ public final /* synthetic */ class WidgetChatInput$binding$2 extends k implement
         int i = 2131361975;
         View findViewById = view.findViewById(2131361975);
         if (findViewById != null) {
-            int i2 = 2131362446;
-            TextView textView = (TextView) findViewById.findViewById(2131362446);
+            int i2 = 2131362461;
+            TextView textView = (TextView) findViewById.findViewById(2131362461);
             if (textView != null) {
-                i2 = 2131362447;
-                RecyclerView recyclerView = (RecyclerView) findViewById.findViewById(2131362447);
+                i2 = 2131362462;
+                RecyclerView recyclerView = (RecyclerView) findViewById.findViewById(2131362462);
                 if (recyclerView != null) {
-                    i2 = 2131362939;
-                    View findViewById2 = findViewById.findViewById(2131362939);
+                    i2 = 2131362964;
+                    View findViewById2 = findViewById.findViewById(2131362964);
                     if (findViewById2 != null) {
                         WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding = new WidgetChatInputApplicationCommandsBinding((ConstraintLayout) findViewById, textView, recyclerView, findViewById2);
-                        i = 2131362449;
-                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362449);
+                        i = 2131362464;
+                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362464);
                         if (recyclerView2 != null) {
                             LinearLayout linearLayout = (LinearLayout) view;
-                            i = 2131362451;
-                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362451);
+                            i = 2131362466;
+                            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362466);
                             if (relativeLayout != null) {
-                                i = 2131362452;
-                                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(2131362452);
+                                i = 2131362467;
+                                AppCompatImageButton appCompatImageButton = (AppCompatImageButton) view.findViewById(2131362467);
                                 if (appCompatImageButton != null) {
-                                    i = 2131362453;
-                                    TextView textView2 = (TextView) view.findViewById(2131362453);
+                                    i = 2131362468;
+                                    TextView textView2 = (TextView) view.findViewById(2131362468);
                                     if (textView2 != null) {
-                                        i = 2131362454;
-                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362454);
+                                        i = 2131362469;
+                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362469);
                                         if (linearLayout2 != null) {
-                                            i = 2131362455;
-                                            ImageView imageView = (ImageView) view.findViewById(2131362455);
+                                            i = 2131362470;
+                                            ImageView imageView = (ImageView) view.findViewById(2131362470);
                                             if (imageView != null) {
-                                                i = 2131362456;
-                                                TextView textView3 = (TextView) view.findViewById(2131362456);
+                                                i = 2131362471;
+                                                TextView textView3 = (TextView) view.findViewById(2131362471);
                                                 if (textView3 != null) {
-                                                    i = 2131362457;
-                                                    TextView textView4 = (TextView) view.findViewById(2131362457);
+                                                    i = 2131362472;
+                                                    TextView textView4 = (TextView) view.findViewById(2131362472);
                                                     if (textView4 != null) {
-                                                        i = 2131362475;
-                                                        RecyclerView recyclerView3 = (RecyclerView) view.findViewById(2131362475);
+                                                        i = 2131362490;
+                                                        RecyclerView recyclerView3 = (RecyclerView) view.findViewById(2131362490);
                                                         if (recyclerView3 != null) {
-                                                            i = 2131362491;
-                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362491);
+                                                            i = 2131362506;
+                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362506);
                                                             if (linearLayout3 != null) {
-                                                                i = 2131362492;
-                                                                TextView textView5 = (TextView) view.findViewById(2131362492);
+                                                                i = 2131362507;
+                                                                TextView textView5 = (TextView) view.findViewById(2131362507);
                                                                 if (textView5 != null) {
-                                                                    i = 2131362493;
-                                                                    RecyclerView recyclerView4 = (RecyclerView) view.findViewById(2131362493);
+                                                                    i = 2131362508;
+                                                                    RecyclerView recyclerView4 = (RecyclerView) view.findViewById(2131362508);
                                                                     if (recyclerView4 != null) {
-                                                                        i = 2131362502;
-                                                                        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362502);
+                                                                        i = 2131362515;
+                                                                        FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362515);
                                                                         if (fragmentContainerView != null) {
-                                                                            i = 2131362503;
-                                                                            LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362503);
+                                                                            i = 2131362516;
+                                                                            LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362516);
                                                                             if (linearLayout4 != null) {
-                                                                                i = 2131363337;
-                                                                                View findViewById3 = view.findViewById(2131363337);
+                                                                                i = 2131363363;
+                                                                                View findViewById3 = view.findViewById(2131363363);
                                                                                 if (findViewById3 != null) {
-                                                                                    int i3 = 2131362462;
-                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131362462);
+                                                                                    int i3 = 2131362477;
+                                                                                    MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131362477);
                                                                                     if (materialButton != null) {
-                                                                                        i3 = 2131362463;
-                                                                                        MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(2131362463);
+                                                                                        i3 = 2131362478;
+                                                                                        MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(2131362478);
                                                                                         if (materialButton2 != null) {
-                                                                                            i3 = 2131362464;
-                                                                                            TextView textView6 = (TextView) findViewById3.findViewById(2131362464);
+                                                                                            i3 = 2131362479;
+                                                                                            TextView textView6 = (TextView) findViewById3.findViewById(2131362479);
                                                                                             if (textView6 != null) {
-                                                                                                i3 = 2131362465;
-                                                                                                TextView textView7 = (TextView) findViewById3.findViewById(2131362465);
+                                                                                                i3 = 2131362480;
+                                                                                                TextView textView7 = (TextView) findViewById3.findViewById(2131362480);
                                                                                                 if (textView7 != null) {
-                                                                                                    d4 d4Var = new d4((LinearLayout) findViewById3, materialButton, materialButton2, textView6, textView7);
-                                                                                                    View findViewById4 = view.findViewById(2131363338);
+                                                                                                    g4 g4Var = new g4((LinearLayout) findViewById3, materialButton, materialButton2, textView6, textView7);
+                                                                                                    View findViewById4 = view.findViewById(2131363364);
                                                                                                     if (findViewById4 != null) {
-                                                                                                        int i4 = 2131362590;
-                                                                                                        CardView cardView = (CardView) findViewById4.findViewById(2131362590);
+                                                                                                        int i4 = 2131362603;
+                                                                                                        CardView cardView = (CardView) findViewById4.findViewById(2131362603);
                                                                                                         if (cardView != null) {
-                                                                                                            i4 = 2131362591;
-                                                                                                            ImageView imageView2 = (ImageView) findViewById4.findViewById(2131362591);
+                                                                                                            i4 = 2131362604;
+                                                                                                            ImageView imageView2 = (ImageView) findViewById4.findViewById(2131362604);
                                                                                                             if (imageView2 != null) {
-                                                                                                                i4 = 2131362592;
-                                                                                                                ImageView imageView3 = (ImageView) findViewById4.findViewById(2131362592);
+                                                                                                                i4 = 2131362605;
+                                                                                                                ImageView imageView3 = (ImageView) findViewById4.findViewById(2131362605);
                                                                                                                 if (imageView3 != null) {
-                                                                                                                    i4 = 2131362593;
-                                                                                                                    TextView textView8 = (TextView) findViewById4.findViewById(2131362593);
+                                                                                                                    i4 = 2131362606;
+                                                                                                                    TextView textView8 = (TextView) findViewById4.findViewById(2131362606);
                                                                                                                     if (textView8 != null) {
-                                                                                                                        return new WidgetChatInputBinding(linearLayout, widgetChatInputApplicationCommandsBinding, recyclerView2, linearLayout, relativeLayout, appCompatImageButton, textView2, linearLayout2, imageView, textView3, textView4, recyclerView3, linearLayout3, textView5, recyclerView4, fragmentContainerView, linearLayout4, d4Var, new e4((RelativeLayout) findViewById4, cardView, imageView2, imageView3, textView8));
+                                                                                                                        return new WidgetChatInputBinding(linearLayout, widgetChatInputApplicationCommandsBinding, recyclerView2, linearLayout, relativeLayout, appCompatImageButton, textView2, linearLayout2, imageView, textView3, textView4, recyclerView3, linearLayout3, textView5, recyclerView4, fragmentContainerView, linearLayout4, g4Var, new h4((RelativeLayout) findViewById4, cardView, imageView2, imageView3, textView8));
                                                                                                                     }
                                                                                                                 }
                                                                                                             }
                                                                                                         }
                                                                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById4.getResources().getResourceName(i4)));
                                                                                                     }
-                                                                                                    i = 2131363338;
+                                                                                                    i = 2131363364;
                                                                                                 }
                                                                                             }
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java
index 4afbdbfead..b9e79c1c3b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$1.java
@@ -40,6 +40,6 @@ public final class WidgetChatInput$configureChatGuard$1 implements View.OnClickL
         Context requireContext = this.this$0.requireContext();
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, this.$viewState.getChannel().e(), "Guild Channel", null, AnonymousClass1.INSTANCE, 16, null);
+        MemberVerificationUtils.maybeShowVerificationGate$default(memberVerificationUtils, requireContext, parentFragmentManager, this.$viewState.getChannel().f(), "Guild Channel", null, AnonymousClass1.INSTANCE, 16, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$2.java
index eeafeb7023..26336fc951 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$2.java
@@ -14,6 +14,6 @@ public final class WidgetChatInput$configureChatGuard$2 implements View.OnClickL
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChatInput.access$showFollowSheet(this.this$0, this.$viewState.getChannel().g(), this.$viewState.getChannel().e());
+        WidgetChatInput.access$showFollowSheet(this.this$0, this.$viewState.getChannel().h(), this.$viewState.getChannel().f());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$5.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$5.java
index c68f6065be..468858dc4f 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$5.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureChatGuard$5.java
@@ -14,6 +14,6 @@ public final class WidgetChatInput$configureChatGuard$5 implements View.OnClickL
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChatInput.access$showFollowSheet(this.this$0, this.$viewState.getChannel().g(), this.$viewState.getChannel().e());
+        WidgetChatInput.access$showFollowSheet(this.this$0, this.$viewState.getChannel().h(), this.$viewState.getChannel().f());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java
index 38355620a6..b97cd36d93 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$1.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input;
 
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$2.java
index 38a81670eb..7c77518bcc 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$2.java
@@ -5,6 +5,8 @@ import c.d.b.a.a;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.widgets.chat.MessageContent;
 import com.discord.widgets.chat.MessageManager;
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
+import com.discord.widgets.chat.input.models.ApplicationCommandValue;
 import com.lytefast.flexinput.model.Attachment;
 import d0.t.g0;
 import d0.z.d.m;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java
index b61aac0b61..db7e662cc8 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input;
 
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
 import com.lytefast.flexinput.model.Attachment;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java
index ee36378894..38e151a023 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureSendListeners$6.java
@@ -62,7 +62,7 @@ public final class WidgetChatInput$configureSendListeners$6 implements FlexInput
         } else if (this.$viewState.getAbleToSendMessage()) {
             this.$trySend$3.invoke(list, (Function1<? super Boolean, Unit>) new AnonymousClass1(this, function1));
         } else {
-            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131891417)));
+            function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131891488)));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java
index abc1d9ab4a..77dc668b2b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputFragment$2.java
@@ -18,7 +18,7 @@ public final class WidgetChatInput$flexInputFragment$2 extends o implements Func
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final FlexInputFragment mo1invoke() {
-        Fragment findFragmentById = this.this$0.getChildFragmentManager().findFragmentById(2131362502);
+        Fragment findFragmentById = this.this$0.getChildFragmentManager().findFragmentById(2131362515);
         Objects.requireNonNull(findFragmentById, "null cannot be cast to non-null type com.lytefast.flexinput.fragment.FlexInputFragment");
         return (FlexInputFragment) findFragmentById;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java
index abf2e93605..e7d772399b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java
@@ -17,6 +17,6 @@ public final class WidgetChatInput$flexInputViewModel$2 extends o implements Fun
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FlexInputState> mo1invoke() {
-        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null);
+        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, null, null, null, 1022, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java
index 869da1c389..4cf147464b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java
@@ -5,6 +5,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 import com.discord.databinding.WidgetChatInputApplicationCommandsBinding;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import com.lytefast.flexinput.widget.FlexEditText;
 import d0.z.d.k;
 import d0.z.d.m;
@@ -19,27 +20,27 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0<
 
     /* compiled from: WidgetChatInput.kt */
     /* renamed from: com.discord.widgets.chat.input.WidgetChatInput$onViewBound$1$1  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass1 extends k implements Function1<WidgetChatInputCommandsModel, Boolean> {
+    public static final /* synthetic */ class AnonymousClass1 extends k implements Function1<Autocompletable, Boolean> {
         public AnonymousClass1(ChatInputViewModel chatInputViewModel) {
-            super(1, chatInputViewModel, ChatInputViewModel.class, "handleEmojiAutocompleteUpsellClicked", "handleEmojiAutocompleteUpsellClicked(Lcom/discord/widgets/chat/input/WidgetChatInputCommandsModel;)Z", 0);
+            super(1, chatInputViewModel, ChatInputViewModel.class, "handleEmojiAutocompleteUpsellClicked", "handleEmojiAutocompleteUpsellClicked(Lcom/discord/widgets/chat/input/autocomplete/Autocompletable;)Z", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Boolean invoke(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            return Boolean.valueOf(invoke(widgetChatInputCommandsModel));
+        public /* bridge */ /* synthetic */ Boolean invoke(Autocompletable autocompletable) {
+            return Boolean.valueOf(invoke(autocompletable));
         }
 
-        public final boolean invoke(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            m.checkNotNullParameter(widgetChatInputCommandsModel, "p1");
-            return ((ChatInputViewModel) this.receiver).handleEmojiAutocompleteUpsellClicked(widgetChatInputCommandsModel);
+        public final boolean invoke(Autocompletable autocompletable) {
+            m.checkNotNullParameter(autocompletable, "p1");
+            return ((ChatInputViewModel) this.receiver).handleEmojiAutocompleteUpsellClicked(autocompletable);
         }
     }
 
     /* compiled from: WidgetChatInput.kt */
     /* renamed from: com.discord.widgets.chat.input.WidgetChatInput$onViewBound$1$2  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass2 extends k implements Function1<List<? extends WidgetChatInputCommandsModel>, Unit> {
+    public static final /* synthetic */ class AnonymousClass2 extends k implements Function1<List<? extends Autocompletable>, Unit> {
         public AnonymousClass2(ChatInputViewModel chatInputViewModel) {
             super(1, chatInputViewModel, ChatInputViewModel.class, "checkEmojiAutocompleteUpsellViewed", "checkEmojiAutocompleteUpsellViewed(Ljava/util/List;)V", 0);
         }
@@ -47,12 +48,12 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0<
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(List<? extends WidgetChatInputCommandsModel> list) {
+        public /* bridge */ /* synthetic */ Unit invoke(List<? extends Autocompletable> list) {
             invoke(list);
             return Unit.a;
         }
 
-        public final void invoke(List<? extends WidgetChatInputCommandsModel> list) {
+        public final void invoke(List<? extends Autocompletable> list) {
             m.checkNotNullParameter(list, "p1");
             ((ChatInputViewModel) this.receiver).checkEmojiAutocompleteUpsellViewed(list);
         }
@@ -83,7 +84,7 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0<
     public final void mo1invoke() {
         FlexEditText k = WidgetChatInput.access$getFlexInputFragment$p(this.this$0).k();
         WidgetChatInput.access$getBinding$p(this.this$0).l.setBackgroundColor(ColorCompat.getThemedColor(this.this$0.requireContext(), 2130968905));
-        RecyclerView recyclerView = WidgetChatInput.access$getBinding$p(this.this$0).f1721c;
+        RecyclerView recyclerView = WidgetChatInput.access$getBinding$p(this.this$0).f1719c;
         m.checkNotNullExpressionValue(recyclerView, "binding.chatInputCategoriesRecycler");
         recyclerView.setItemAnimator(null);
         WidgetChatInput widgetChatInput = this.this$0;
@@ -97,7 +98,7 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0<
         m.checkNotNullExpressionValue(textView2, "binding.chatInputEmojiMatchingHeader");
         RecyclerView recyclerView3 = WidgetChatInput.access$getBinding$p(this.this$0).l;
         m.checkNotNullExpressionValue(recyclerView3, "binding.chatInputMentionsRecycler");
-        RecyclerView recyclerView4 = WidgetChatInput.access$getBinding$p(this.this$0).f1721c;
+        RecyclerView recyclerView4 = WidgetChatInput.access$getBinding$p(this.this$0).f1719c;
         m.checkNotNullExpressionValue(recyclerView4, "binding.chatInputCategoriesRecycler");
         WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding = WidgetChatInput.access$getBinding$p(this.this$0).b;
         m.checkNotNullExpressionValue(widgetChatInputApplicationCommandsBinding, "binding.applicationCommandsRoot");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java
index d9b370b59e..a6987becfe 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java
@@ -5,8 +5,8 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
-import c.a.i.d4;
-import c.a.i.e4;
+import c.a.i.g4;
+import c.a.i.h4;
 import d0.z.d.m;
 /* compiled from: WidgetChatInput.kt */
 public final class WidgetChatInput$setWindowInsetsListeners$3 implements OnApplyWindowInsetsListener {
@@ -25,12 +25,12 @@ public final class WidgetChatInput$setWindowInsetsListeners$3 implements OnApply
         WindowInsetsCompat build = new WindowInsetsCompat.Builder().setSystemWindowInsets(Insets.of(0, 0, 0, this.$shouldApplyWindowInsets ? windowInsetsCompat.getSystemWindowInsetBottom() : 0)).build();
         m.checkNotNullExpressionValue(build, "WindowInsetsCompat.Build…        )\n      ).build()");
         ViewCompat.dispatchApplyWindowInsets(WidgetChatInput.access$getBinding$p(this.this$0).q, build);
-        d4 d4Var = WidgetChatInput.access$getBinding$p(this.this$0).r;
-        m.checkNotNullExpressionValue(d4Var, "binding.guard");
-        ViewCompat.dispatchApplyWindowInsets(d4Var.a, build);
-        e4 e4Var = WidgetChatInput.access$getBinding$p(this.this$0).f1722s;
-        m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification");
-        ViewCompat.dispatchApplyWindowInsets(e4Var.a, build);
+        g4 g4Var = WidgetChatInput.access$getBinding$p(this.this$0).r;
+        m.checkNotNullExpressionValue(g4Var, "binding.guard");
+        ViewCompat.dispatchApplyWindowInsets(g4Var.a, build);
+        h4 h4Var = WidgetChatInput.access$getBinding$p(this.this$0).f1720s;
+        m.checkNotNullExpressionValue(h4Var, "binding.guardMemberVerification");
+        ViewCompat.dispatchApplyWindowInsets(h4Var.a, build);
         return windowInsetsCompat.consumeSystemWindowInsets();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java
index 26390ee49b..352f7c6ba0 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import android.view.View;
 import android.widget.LinearLayout;
 import androidx.appcompat.widget.AppCompatImageButton;
-import c.a.w.c;
 import com.discord.floating_view_manager.FloatingViewGravity;
+import com.discord.tooltips.SparkleView;
 import com.discord.tooltips.TooltipManager;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -69,13 +69,13 @@ public final class WidgetChatInput$showExpressionButtonSparkle$1 extends o imple
         m.checkNotNullExpressionValue(linearLayout, "binding.chatInputContainer");
         Context context = linearLayout.getContext();
         m.checkNotNullExpressionValue(context, "binding.chatInputContainer.context");
-        c cVar = new c(context, null, 2);
+        SparkleView sparkleView = new SparkleView(context, null);
         TooltipManager access$getTooltipManager$p = WidgetChatInput.access$getTooltipManager$p(this.this$0);
         TooltipManager.Tooltip tooltip = this.$tooltip;
         FloatingViewGravity floatingViewGravity = FloatingViewGravity.CENTER;
-        Observable<Void> G = this.this$0.getUnsubscribeSignal().G(AnonymousClass1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "unsubscribeSignal.map { }");
-        TooltipManager.e(access$getTooltipManager$p, appCompatImageButton, cVar, tooltip, floatingViewGravity, 0, 0, false, G, 112, null);
-        cVar.setOnClickListener(new AnonymousClass2(this, appCompatImageButton));
+        Observable<Void> F = this.this$0.getUnsubscribeSignal().F(AnonymousClass1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "unsubscribeSignal.map { }");
+        TooltipManager.e(access$getTooltipManager$p, appCompatImageButton, sparkleView, tooltip, floatingViewGravity, 0, 0, false, F, 112, null);
+        sparkleView.setOnClickListener(new AnonymousClass2(this, appCompatImageButton));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
index f727c0e1fb..c053a5a8cf 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java
@@ -14,12 +14,12 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentContainerView;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
-import c.a.a.a.a;
-import c.a.a.b;
+import c.a.a.a;
+import c.a.a.e.a;
 import c.a.d.f;
 import c.a.d.g0;
-import c.a.i.d4;
-import c.a.i.e4;
+import c.a.i.g4;
+import c.a.i.h4;
 import c.a.j.a;
 import c.a.l.b;
 import c.a.p.b;
@@ -116,7 +116,7 @@ public final class WidgetChatInput extends AppFragment {
     }
 
     public WidgetChatInput() {
-        super(2131558910);
+        super(2131558913);
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(appLog, "logger");
         WeakReference<c.a.j.a> weakReference = a.b.a;
@@ -131,7 +131,7 @@ public final class WidgetChatInput extends AppFragment {
         WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
         tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
         if (tooltipManager == null) {
-            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
             TooltipManager.a.a = new WeakReference<>(tooltipManager);
         }
         this.tooltipManager = tooltipManager;
@@ -220,66 +220,66 @@ public final class WidgetChatInput extends AppFragment {
     }
 
     private final void configureChatGuard(ChatInputViewModel.ViewState.Loaded loaded) {
-        d4 d4Var = getBinding().r;
-        m.checkNotNullExpressionValue(d4Var, "binding.guard");
-        LinearLayout linearLayout = d4Var.a;
+        g4 g4Var = getBinding().r;
+        m.checkNotNullExpressionValue(g4Var, "binding.guard");
+        LinearLayout linearLayout = g4Var.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.guard.root");
         int i = 0;
         linearLayout.setVisibility(loaded.isLurking() || loaded.isVerificationLevelTriggered() || loaded.isSystemDM() || loaded.getShouldShowFollow() ? 0 : 8);
-        e4 e4Var = getBinding().f1722s;
-        m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification");
-        RelativeLayout relativeLayout = e4Var.a;
+        h4 h4Var = getBinding().f1720s;
+        m.checkNotNullExpressionValue(h4Var, "binding.guardMemberVerification");
+        RelativeLayout relativeLayout = h4Var.a;
         m.checkNotNullExpressionValue(relativeLayout, "binding.guardMemberVerification.root");
-        d4 d4Var2 = getBinding().r;
-        m.checkNotNullExpressionValue(d4Var2, "binding.guard");
-        LinearLayout linearLayout2 = d4Var2.a;
+        g4 g4Var2 = getBinding().r;
+        m.checkNotNullExpressionValue(g4Var2, "binding.guard");
+        LinearLayout linearLayout2 = g4Var2.a;
         m.checkNotNullExpressionValue(linearLayout2, "binding.guard.root");
         if (!(!(linearLayout2.getVisibility() == 0) && loaded.getShouldShowVerificationGate())) {
             i = 8;
         }
         relativeLayout.setVisibility(i);
-        e4 e4Var2 = getBinding().f1722s;
-        m.checkNotNullExpressionValue(e4Var2, "binding.guardMemberVerification");
-        e4Var2.a.setOnClickListener(new WidgetChatInput$configureChatGuard$1(this, loaded));
+        h4 h4Var2 = getBinding().f1720s;
+        m.checkNotNullExpressionValue(h4Var2, "binding.guardMemberVerification");
+        h4Var2.a.setOnClickListener(new WidgetChatInput$configureChatGuard$1(this, loaded));
         if (loaded.isSystemDM()) {
-            getBinding().r.e.setText(2131893722);
+            getBinding().r.e.setText(2131893819);
             TextView textView = getBinding().r.d;
             m.checkNotNullExpressionValue(textView, "binding.guard.chatInputGuardSubtext");
-            ViewExtensions.setTextAndVisibilityBy(textView, getString(2131893723));
+            ViewExtensions.setTextAndVisibilityBy(textView, getString(2131893820));
             MaterialButton materialButton = getBinding().r.b;
             m.checkNotNullExpressionValue(materialButton, "binding.guard.chatInputGuardAction");
             materialButton.setVisibility(8);
-            MaterialButton materialButton2 = getBinding().r.f81c;
+            MaterialButton materialButton2 = getBinding().r.f97c;
             m.checkNotNullExpressionValue(materialButton2, "binding.guard.chatInputGuardActionSecondary");
             materialButton2.setVisibility(8);
         } else if (loaded.isLurking()) {
             if (loaded.getShouldShowFollow()) {
-                getBinding().r.e.setText(2131888535);
+                getBinding().r.e.setText(2131888536);
                 MaterialButton materialButton3 = getBinding().r.b;
                 m.checkNotNullExpressionValue(materialButton3, "binding.guard.chatInputGuardAction");
-                ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(2131888953));
+                ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(2131888954));
                 getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$2(this, loaded));
-                MaterialButton materialButton4 = getBinding().r.f81c;
+                MaterialButton materialButton4 = getBinding().r.f97c;
                 m.checkNotNullExpressionValue(materialButton4, "binding.guard.chatInputGuardActionSecondary");
-                ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(2131890891));
-                getBinding().r.f81c.setOnClickListener(new WidgetChatInput$configureChatGuard$3(this));
+                ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(2131890961));
+                getBinding().r.f97c.setOnClickListener(new WidgetChatInput$configureChatGuard$3(this));
             } else {
-                getBinding().r.e.setText(2131890892);
+                getBinding().r.e.setText(2131890962);
                 MaterialButton materialButton5 = getBinding().r.b;
                 m.checkNotNullExpressionValue(materialButton5, "binding.guard.chatInputGuardAction");
-                ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(2131890891));
+                ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(2131890961));
                 getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$4(this));
-                MaterialButton materialButton6 = getBinding().r.f81c;
+                MaterialButton materialButton6 = getBinding().r.f97c;
                 m.checkNotNullExpressionValue(materialButton6, "binding.guard.chatInputGuardActionSecondary");
                 materialButton6.setVisibility(8);
             }
         } else if (loaded.getShouldShowFollow()) {
-            getBinding().r.e.setText(2131888535);
+            getBinding().r.e.setText(2131888536);
             MaterialButton materialButton7 = getBinding().r.b;
             m.checkNotNullExpressionValue(materialButton7, "binding.guard.chatInputGuardAction");
-            ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(2131888953));
+            ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(2131888954));
             getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$5(this, loaded));
-            MaterialButton materialButton8 = getBinding().r.f81c;
+            MaterialButton materialButton8 = getBinding().r.f97c;
             m.checkNotNullExpressionValue(materialButton8, "binding.guard.chatInputGuardActionSecondary");
             materialButton8.setVisibility(8);
         } else {
@@ -298,7 +298,7 @@ public final class WidgetChatInput extends AppFragment {
             m.checkNotNullExpressionValue(context2, "binding.guard.chatInputGuardAction.context");
             ViewExtensions.setTextAndVisibilityBy(materialButton9, getVerificationActionText(context2, loaded.getVerificationLevelTriggered()));
             getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$6(this));
-            MaterialButton materialButton11 = getBinding().r.f81c;
+            MaterialButton materialButton11 = getBinding().r.f97c;
             m.checkNotNullExpressionValue(materialButton11, "binding.guard.chatInputGuardActionSecondary");
             materialButton11.setVisibility(8);
         }
@@ -307,17 +307,17 @@ public final class WidgetChatInput extends AppFragment {
             if (joinRequestStatus != null) {
                 int ordinal = joinRequestStatus.ordinal();
                 if (ordinal == 1) {
-                    getBinding().f1722s.f86c.setText(2131891016);
-                    getBinding().f1722s.b.setImageResource(2131232183);
+                    getBinding().f1720s.f101c.setText(2131891087);
+                    getBinding().f1720s.b.setImageResource(2131232191);
                     return;
                 } else if (ordinal == 2) {
-                    getBinding().f1722s.f86c.setText(2131891021);
-                    getBinding().f1722s.b.setImageResource(2131232182);
+                    getBinding().f1720s.f101c.setText(2131891092);
+                    getBinding().f1720s.b.setImageResource(2131232190);
                     return;
                 }
             }
-            getBinding().f1722s.f86c.setText(2131891030);
-            getBinding().f1722s.b.setImageResource(2131232184);
+            getBinding().f1720s.f101c.setText(2131891101);
+            getBinding().f1720s.b.setImageResource(2131232192);
         }
     }
 
@@ -360,7 +360,7 @@ public final class WidgetChatInput extends AppFragment {
         }
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.chatInputContextDescription");
-        b.m(textView, 2131891223, new Object[]{str}, new WidgetChatInput$configureContextBarReplying$1(requireContext, replying));
+        b.l(textView, 2131891294, new Object[]{str}, new WidgetChatInput$configureContextBarReplying$1(requireContext, replying));
         getBinding().e.setOnClickListener(new WidgetChatInput$configureContextBarReplying$2(this, replying));
         getBinding().f.setOnClickListener(new WidgetChatInput$configureContextBarReplying$3(this));
         LinearLayout linearLayout = getBinding().h;
@@ -375,7 +375,7 @@ public final class WidgetChatInput extends AppFragment {
         m.checkNotNullExpressionValue(imageView, "binding.chatInputContextReplyMentionButtonImage");
         ColorCompatKt.tintWithColor(imageView, themedColor);
         getBinding().j.setTextColor(themedColor);
-        getBinding().j.setText(replying.getShouldMention() ? 2131892584 : 2131892582);
+        getBinding().j.setText(replying.getShouldMention() ? 2131892665 : 2131892663);
     }
 
     private final void configureInitialText(ChatInputViewModel.ViewState.Loaded loaded) {
@@ -426,14 +426,14 @@ public final class WidgetChatInput extends AppFragment {
             LinearLayout linearLayout = getBinding().q;
             m.checkNotNullExpressionValue(linearLayout, "binding.chatInputWrap");
             linearLayout.setVisibility(8);
-            e4 e4Var = getBinding().f1722s;
-            m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification");
-            RelativeLayout relativeLayout = e4Var.a;
+            h4 h4Var = getBinding().f1720s;
+            m.checkNotNullExpressionValue(h4Var, "binding.guardMemberVerification");
+            RelativeLayout relativeLayout = h4Var.a;
             m.checkNotNullExpressionValue(relativeLayout, "binding.guardMemberVerification.root");
             relativeLayout.setVisibility(8);
-            d4 d4Var = getBinding().r;
-            m.checkNotNullExpressionValue(d4Var, "binding.guard");
-            LinearLayout linearLayout2 = d4Var.a;
+            g4 g4Var = getBinding().r;
+            m.checkNotNullExpressionValue(g4Var, "binding.guard");
+            LinearLayout linearLayout2 = g4Var.a;
             m.checkNotNullExpressionValue(linearLayout2, "binding.guard.root");
             linearLayout2.setVisibility(8);
         } else if (viewState instanceof ChatInputViewModel.ViewState.Loaded) {
@@ -470,13 +470,13 @@ public final class WidgetChatInput extends AppFragment {
 
     private final CharSequence getHint(Context context, Channel channel, boolean z2, boolean z3) {
         if (z2) {
-            String string = context.getString(2131888175);
+            String string = context.getString(2131888174);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…erification_text_blocked)");
             return string;
         } else if (z3) {
-            return b.g(context, 2131893833, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
+            return b.g(context, 2131893931, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
         } else {
-            String string2 = context.getString(2131891417);
+            String string2 = context.getString(2131891488);
             m.checkNotNullExpressionValue(string2, "context.getString(R.stri…s_permission_placeholder)");
             return string2;
         }
@@ -485,29 +485,29 @@ public final class WidgetChatInput extends AppFragment {
     private final String getVerificationActionText(Context context, GuildVerificationLevel guildVerificationLevel) {
         int ordinal = guildVerificationLevel.ordinal();
         if (ordinal == 1) {
-            return context.getString(2131894454);
+            return context.getString(2131894573);
         }
         if (ordinal != 4) {
             return null;
         }
-        return context.getString(2131894466);
+        return context.getString(2131894585);
     }
 
     private final CharSequence getVerificationText(Context context, GuildVerificationLevel guildVerificationLevel) {
         int ordinal = guildVerificationLevel.ordinal();
         if (ordinal == 1) {
-            return context.getString(2131890118);
+            return context.getString(2131890140);
         }
         if (ordinal == 2) {
-            return b.g(context, 2131890116, new Object[]{"5"}, null, 4);
+            return b.g(context, 2131890138, new Object[]{"5"}, null, 4);
         }
         if (ordinal == 3) {
-            return b.g(context, 2131890117, new Object[]{"10"}, null, 4);
+            return b.g(context, 2131890139, new Object[]{"10"}, null, 4);
         }
         if (ordinal != 4) {
             return null;
         }
-        return context.getString(2131890119);
+        return context.getString(2131890141);
     }
 
     private final ChatInputViewModel getViewModel() {
@@ -519,7 +519,7 @@ public final class WidgetChatInput extends AppFragment {
         Unit unit = null;
         if (event instanceof ChatInputViewModel.Event.FilesTooLarge) {
             getFlexInputViewModel().hideKeyboard();
-            b.C0005b bVar = c.a.a.b.j;
+            a.b bVar = c.a.a.a.j;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             ChatInputViewModel.Event.FilesTooLarge filesTooLarge = (ChatInputViewModel.Event.FilesTooLarge) event;
@@ -535,14 +535,14 @@ public final class WidgetChatInput extends AppFragment {
             FragmentManager parentFragmentManager2 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
             ChatInputViewModel.Event.MessageTooLong messageTooLong = (ChatInputViewModel.Event.MessageTooLong) event;
-            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager2, getString(2131891178), c.a.l.b.j(this, 2131891177, new Object[]{numberInstance.format(Integer.valueOf(messageTooLong.getCurrentCharacterCount())), numberInstance.format(Integer.valueOf(messageTooLong.getMaxCharacterCount()))}, null, 4), getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager2, getString(2131891249), b.j(this, 2131891248, new Object[]{numberInstance.format(Integer.valueOf(messageTooLong.getCurrentCharacterCount())), numberInstance.format(Integer.valueOf(messageTooLong.getMaxCharacterCount()))}, null, 4), getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
             unit = Unit.a;
         } else if (event instanceof ChatInputViewModel.Event.FailedDeliveryToRecipient) {
             getFlexInputViewModel().hideKeyboard();
             WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion;
             FragmentManager parentFragmentManager3 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager3, "parentFragmentManager");
-            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager3, getString(2131888376), c.a.l.b.j(this, 2131887043, new Object[]{f.a.a(360060145013L, null)}, null, 4), getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager3, getString(2131888376), b.j(this, 2131887043, new Object[]{f.a.a(360060145013L, null)}, null, 4), getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
             unit = Unit.a;
         } else if (event instanceof ChatInputViewModel.Event.AppendChatText) {
             getFlexInputViewModel().onInputTextAppended(((ChatInputViewModel.Event.AppendChatText) event).getText());
@@ -558,7 +558,7 @@ public final class WidgetChatInput extends AppFragment {
                 unit = Unit.a;
             }
         } else if (event instanceof ChatInputViewModel.Event.ShowPremiumUpsell) {
-            a.b bVar2 = c.a.a.a.a.j;
+            a.b bVar2 = c.a.a.e.a.j;
             FragmentManager parentFragmentManager4 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager4, "parentFragmentManager");
             ChatInputViewModel.Event.ShowPremiumUpsell showPremiumUpsell = (ChatInputViewModel.Event.ShowPremiumUpsell) event;
@@ -613,12 +613,12 @@ public final class WidgetChatInput extends AppFragment {
         FragmentContainerView fragmentContainerView = getBinding().p;
         m.checkNotNullExpressionValue(fragmentContainerView, "binding.chatInputWidget");
         ViewExtensions.setForwardingWindowInsetsListener(fragmentContainerView);
-        d4 d4Var = getBinding().r;
-        m.checkNotNullExpressionValue(d4Var, "binding.guard");
-        ViewCompat.setOnApplyWindowInsetsListener(d4Var.a, WidgetChatInput$setWindowInsetsListeners$1.INSTANCE);
-        e4 e4Var = getBinding().f1722s;
-        m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification");
-        ViewCompat.setOnApplyWindowInsetsListener(e4Var.a, WidgetChatInput$setWindowInsetsListeners$2.INSTANCE);
+        g4 g4Var = getBinding().r;
+        m.checkNotNullExpressionValue(g4Var, "binding.guard");
+        ViewCompat.setOnApplyWindowInsetsListener(g4Var.a, WidgetChatInput$setWindowInsetsListeners$1.INSTANCE);
+        h4 h4Var = getBinding().f1720s;
+        m.checkNotNullExpressionValue(h4Var, "binding.guardMemberVerification");
+        ViewCompat.setOnApplyWindowInsetsListener(h4Var.a, WidgetChatInput$setWindowInsetsListeners$2.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, new WidgetChatInput$setWindowInsetsListeners$3(this, z2));
         getBinding().d.requestApplyInsets();
     }
@@ -670,9 +670,9 @@ public final class WidgetChatInput extends AppFragment {
         if (widgetChatInputEditText != null) {
             widgetChatInputEditText.configureMentionsDataSubscriptions(this);
         }
-        Observable<ChatInputViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<ChatInputViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$2(this), 62, (Object) null);
         WidgetChatInputAttachments widgetChatInputAttachments = this.chatAttachments;
         if (widgetChatInputAttachments == null) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
index e0cd6ed1fb..43633bc381 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$createPreviewAdapter$1.java
@@ -50,9 +50,9 @@ public final class WidgetChatInputAttachments$createPreviewAdapter$1 extends o i
         public void registerSelectionCoordinatorInternal(SelectionCoordinator<T, ?> selectionCoordinator) {
             m.checkNotNullParameter(selectionCoordinator, "selectionCoordinator");
             super.registerSelectionCoordinatorInternal(selectionCoordinator);
-            WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 = new WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1(this, selectionCoordinator.f2383c);
+            WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1 = new WidgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1(this, selectionCoordinator.f2389c);
             m.checkNotNullParameter(widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1, "<set-?>");
-            selectionCoordinator.f2383c = widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;
+            selectionCoordinator.f2389c = widgetChatInputAttachments$createPreviewAdapter$1$1$registerSelectionCoordinatorInternal$1;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
index 43ad1ffd67..d32fb5caf9 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java
@@ -11,7 +11,7 @@ import androidx.annotation.LayoutRes;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import c.a.i.f4;
+import c.a.i.i4;
 import c.a.l.b;
 import com.discord.app.AppFragment;
 import com.discord.widgets.chat.input.expression.WidgetExpressionTray;
@@ -35,7 +35,7 @@ public final class WidgetChatInputAttachments {
         @Override // com.lytefast.flexinput.fragment.FilesFragment
         public EmptyListAdapter newPermissionsRequestAdapter(View.OnClickListener onClickListener) {
             m.checkNotNullParameter(onClickListener, "onClickListener");
-            return new PermissionsEmptyListAdapter(2131558918, 2131361874, onClickListener);
+            return new PermissionsEmptyListAdapter(2131558921, 2131361874, onClickListener);
         }
     }
 
@@ -44,7 +44,7 @@ public final class WidgetChatInputAttachments {
         @Override // com.lytefast.flexinput.fragment.MediaFragment
         public EmptyListAdapter newPermissionsRequestAdapter(View.OnClickListener onClickListener) {
             m.checkNotNullParameter(onClickListener, "onClickListener");
-            return new PermissionsEmptyListAdapter(2131558918, 2131361874, onClickListener);
+            return new PermissionsEmptyListAdapter(2131558921, 2131361874, onClickListener);
         }
     }
 
@@ -64,12 +64,12 @@ public final class WidgetChatInputAttachments {
             int i2 = 2131361874;
             MaterialButton materialButton = (MaterialButton) view.findViewById(2131361874);
             if (materialButton != null) {
-                i2 = 2131364201;
-                TextView textView = (TextView) view.findViewById(2131364201);
+                i2 = 2131364245;
+                TextView textView = (TextView) view.findViewById(2131364245);
                 if (textView != null) {
-                    m.checkNotNullExpressionValue(new f4((LinearLayout) view, materialButton, textView), "WidgetChatInputPermReqFi…ing.bind(holder.itemView)");
+                    m.checkNotNullExpressionValue(new i4((LinearLayout) view, materialButton, textView), "WidgetChatInputPermReqFi…ing.bind(holder.itemView)");
                     m.checkNotNullExpressionValue(textView, "binding.permReqText");
-                    b.n(textView, 2131893801, new Object[0], null, 4);
+                    b.m(textView, 2131893898, new Object[0], null, 4);
                     return onCreateViewHolder;
                 }
             }
@@ -102,7 +102,7 @@ public final class WidgetChatInputAttachments {
         WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1(this);
         WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1(this);
         WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1(textView);
-        Fragment findFragmentById = fragmentManager.findFragmentById(2131363131);
+        Fragment findFragmentById = fragmentManager.findFragmentById(2131363156);
         if (!(findFragmentById instanceof WidgetExpressionTray)) {
             findFragmentById = null;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$10.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$10.java
index ddf4019c32..366e8b7263 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$10.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$10.java
@@ -1,24 +1,20 @@
 package com.discord.widgets.chat.input;
 
-import d0.z.d.o;
-import kotlin.Pair;
-import kotlin.jvm.functions.Function1;
+import com.discord.models.commands.ApplicationCommandOption;
+import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
+import com.discord.widgets.chat.input.models.InputSelectionModel;
+import com.discord.widgets.chat.input.models.VerifiedCommandMentionInputModel;
+import d0.z.d.m;
+import kotlin.ranges.IntRange;
+import rx.functions.Func2;
 /* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$10 extends o implements Function1<Pair<? extends Boolean, ? extends Boolean>, Boolean> {
+public final class WidgetChatInputAutocomplete$configureDataSubscriptions$10<T1, T2, R> implements Func2<IntRange, VerifiedCommandMentionInputModel, InputSelectionModel> {
     public static final WidgetChatInputAutocomplete$configureDataSubscriptions$10 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$10();
 
-    public WidgetChatInputAutocomplete$configureDataSubscriptions$10() {
-        super(1);
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Boolean invoke(Pair<? extends Boolean, ? extends Boolean> pair) {
-        return Boolean.valueOf(invoke((Pair<Boolean, Boolean>) pair));
-    }
-
-    public final boolean invoke(Pair<Boolean, Boolean> pair) {
-        return pair.component1().booleanValue();
+    public final InputSelectionModel call(IntRange intRange, VerifiedCommandMentionInputModel verifiedCommandMentionInputModel) {
+        ApplicationCommandOption selectedOption = WidgetChatInputModelMappingFunctions.INSTANCE.getSelectedOption(intRange.getFirst(), verifiedCommandMentionInputModel.getInputCommandOptions().getInputRanges());
+        m.checkNotNullExpressionValue(verifiedCommandMentionInputModel, "inputModel");
+        m.checkNotNullExpressionValue(intRange, "selection");
+        return new InputSelectionModel(verifiedCommandMentionInputModel, selectedOption, intRange);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$11.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$11.java
index 1c67cf76ff..5fb53ffc9d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$11.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$11.java
@@ -1,33 +1,53 @@
 package com.discord.widgets.chat.input;
 
+import com.discord.api.sticker.Sticker;
+import com.discord.models.commands.ApplicationCommand;
+import com.discord.models.commands.ApplicationCommandOption;
+import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import com.discord.widgets.chat.input.models.InputSelectionModel;
+import com.discord.widgets.chat.input.models.MentionToken;
 import d0.z.d.m;
 import d0.z.d.o;
-import java.util.Collection;
-import kotlin.Pair;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
-import rx.Observable;
 /* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$11 extends o implements Function1<Pair<? extends Boolean, ? extends Boolean>, Observable<Collection<WidgetChatInputCommandsModel>>> {
-    public final /* synthetic */ boolean $emojiAutocompleteUpsellEnabled;
+public final class WidgetChatInputAutocomplete$configureDataSubscriptions$11 extends o implements Function1<InputSelectionModel, Unit> {
     public final /* synthetic */ WidgetChatInputAutocomplete this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAutocomplete$configureDataSubscriptions$11(WidgetChatInputAutocomplete widgetChatInputAutocomplete, boolean z2) {
+    public WidgetChatInputAutocomplete$configureDataSubscriptions$11(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
         super(1);
         this.this$0 = widgetChatInputAutocomplete;
-        this.$emojiAutocompleteUpsellEnabled = z2;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Observable<Collection<WidgetChatInputCommandsModel>> invoke(Pair<? extends Boolean, ? extends Boolean> pair) {
-        return invoke((Pair<Boolean, Boolean>) pair);
+    public /* bridge */ /* synthetic */ Unit invoke(InputSelectionModel inputSelectionModel) {
+        invoke(inputSelectionModel);
+        return Unit.a;
     }
 
-    public final Observable<Collection<WidgetChatInputCommandsModel>> invoke(Pair<Boolean, Boolean> pair) {
-        Observable<Collection<WidgetChatInputCommandsModel>> observable = WidgetChatInputCommandsModel.get(this.this$0.getEditText().getContext(), this.$emojiAutocompleteUpsellEnabled, pair.component2().booleanValue());
-        m.checkNotNullExpressionValue(observable, "WidgetChatInputCommandsM…imate\n                  )");
-        return observable;
+    public final void invoke(InputSelectionModel inputSelectionModel) {
+        if (inputSelectionModel.getSelection().getLast() <= inputSelectionModel.getInputModel().getInput().length()) {
+            WidgetChatInputModelMappingFunctions widgetChatInputModelMappingFunctions = WidgetChatInputModelMappingFunctions.INSTANCE;
+            ApplicationCommand selectedCommand = inputSelectionModel.getInputModel().getInputCommandContext().getSelectedCommand();
+            ApplicationCommandOption selectedCommandOption = inputSelectionModel.getSelectedCommandOption();
+            InputSelectionModel access$getLastChatInputModel$p = WidgetChatInputAutocomplete.access$getLastChatInputModel$p(this.this$0);
+            Set<ApplicationCommandOption> errorsToShowForCommandParameters = widgetChatInputModelMappingFunctions.getErrorsToShowForCommandParameters(selectedCommand, selectedCommandOption, access$getLastChatInputModel$p != null ? access$getLastChatInputModel$p.getSelectedCommandOption() : null, inputSelectionModel.getInputModel().getInputCommandOptions().getCommandOptionValidity(), inputSelectionModel.getInputModel().getInputCommandOptions().getValues());
+            WidgetChatInputAutocomplete.access$applyCommandOptionSpans(this.this$0, inputSelectionModel.getInputModel(), inputSelectionModel.getSelectedCommandOption(), errorsToShowForCommandParameters);
+            MentionToken mentionAutoCompleteToken = widgetChatInputModelMappingFunctions.getMentionAutoCompleteToken(inputSelectionModel.getInputModel().getInput(), inputSelectionModel.getSelection(), inputSelectionModel.getSelectedCommandOption(), inputSelectionModel.hasSelectedFreeformInputOption(), inputSelectionModel.getInputModel().getInputCommandOptions());
+            m.checkNotNullExpressionValue(inputSelectionModel, "model");
+            Map<LeadingIdentifier, List<Autocompletable>> filterMentionsForCommandContext = widgetChatInputModelMappingFunctions.filterMentionsForCommandContext(inputSelectionModel);
+            List<Sticker> stickerMatches = widgetChatInputModelMappingFunctions.getStickerMatches(mentionAutoCompleteToken);
+            WidgetChatInputAutocomplete.access$setLastChatInputModel$p(this.this$0, inputSelectionModel);
+            WidgetChatInputAutocomplete.access$getAutocompleteInputSelectionModelSubject$p(this.this$0).onNext(new AutocompleteInputSelectionModel(mentionAutoCompleteToken, filterMentionsForCommandContext, inputSelectionModel, errorsToShowForCommandParameters, stickerMatches));
+        }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$12.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$12.java
index c1f557d3a9..9b8106ea8a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$12.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$12.java
@@ -1,31 +1,14 @@
 package com.discord.widgets.chat.input;
 
-import d0.t.n;
-import d0.z.d.m;
-import d0.z.d.o;
-import j0.l.e.j;
-import java.util.Collection;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import d0.o;
 import kotlin.Pair;
-import kotlin.jvm.functions.Function1;
-import rx.Observable;
+import rx.functions.Func2;
 /* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$12 extends o implements Function1<Pair<? extends Boolean, ? extends Boolean>, Observable<Collection<WidgetChatInputCommandsModel>>> {
+public final class WidgetChatInputAutocomplete$configureDataSubscriptions$12<T1, T2, R> implements Func2<AutocompleteInputSelectionModel, Boolean, Pair<? extends AutocompleteInputSelectionModel, ? extends Boolean>> {
     public static final WidgetChatInputAutocomplete$configureDataSubscriptions$12 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$12();
 
-    public WidgetChatInputAutocomplete$configureDataSubscriptions$12() {
-        super(1);
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Observable<Collection<WidgetChatInputCommandsModel>> invoke(Pair<? extends Boolean, ? extends Boolean> pair) {
-        return invoke((Pair<Boolean, Boolean>) pair);
-    }
-
-    public final Observable<Collection<WidgetChatInputCommandsModel>> invoke(Pair<Boolean, Boolean> pair) {
-        j jVar = new j(n.emptyList());
-        m.checkNotNullExpressionValue(jVar, "Observable.just(emptyList())");
-        return jVar;
+    public final Pair<AutocompleteInputSelectionModel, Boolean> call(AutocompleteInputSelectionModel autocompleteInputSelectionModel, Boolean bool) {
+        return o.to(autocompleteInputSelectionModel, bool);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$13.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$13.java
index 437ba2b0b8..33a6bcf795 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$13.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$13.java
@@ -1,33 +1,164 @@
 package com.discord.widgets.chat.input;
 
+import android.content.res.Resources;
+import android.widget.TextView;
+import c.a.l.b;
+import com.discord.api.sticker.Sticker;
+import com.discord.app.AppFragment;
+import com.discord.models.commands.Application;
+import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputApplicationCommands;
+import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import com.discord.widgets.chat.input.autocomplete.adapter.ChatInputAutocompleteAdapter;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import com.discord.widgets.chat.input.models.MentionToken;
+import d0.t.n;
+import d0.t.t;
 import d0.t.u;
 import d0.z.d.m;
 import d0.z.d.o;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
+import kotlin.Pair;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$13 extends o implements Function1<Collection<? extends WidgetChatInputCommandsModel>, Unit> {
+public final class WidgetChatInputAutocomplete$configureDataSubscriptions$13 extends o implements Function1<Pair<? extends AutocompleteInputSelectionModel, ? extends Boolean>, Unit> {
+    public final /* synthetic */ boolean $emojiAutocompleteUpsellEnabled;
+    public final /* synthetic */ AppFragment $fragment;
     public final /* synthetic */ WidgetChatInputAutocomplete this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAutocomplete$configureDataSubscriptions$13(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
+    public WidgetChatInputAutocomplete$configureDataSubscriptions$13(WidgetChatInputAutocomplete widgetChatInputAutocomplete, boolean z2, AppFragment appFragment) {
         super(1);
         this.this$0 = widgetChatInputAutocomplete;
+        this.$emojiAutocompleteUpsellEnabled = z2;
+        this.$fragment = appFragment;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Collection<? extends WidgetChatInputCommandsModel> collection) {
-        invoke(collection);
+    public /* bridge */ /* synthetic */ Unit invoke(Pair<? extends AutocompleteInputSelectionModel, ? extends Boolean> pair) {
+        invoke((Pair<AutocompleteInputSelectionModel, Boolean>) pair);
         return Unit.a;
     }
 
-    public final void invoke(Collection<? extends WidgetChatInputCommandsModel> collection) {
+    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x02f3: APUT  (r10v2 java.lang.Object[]), (0 ??[int, short, byte, char]), (r11v3 java.lang.String) */
+    public final void invoke(Pair<AutocompleteInputSelectionModel, Boolean> pair) {
+        List<? extends Autocompletable> list;
+        AutocompleteInputSelectionModel component1 = pair.component1();
+        Boolean component2 = pair.component2();
         WidgetChatInputAutocomplete widgetChatInputAutocomplete = this.this$0;
-        m.checkNotNullExpressionValue(collection, "mentions");
-        WidgetChatInputAutocomplete.access$setMentions$p(widgetChatInputAutocomplete, u.toList(collection));
-        WidgetChatInputAutocomplete.access$onModelUpdated(this.this$0);
+        MentionToken autocompleteToken = component1.getAutocompleteToken();
+        WidgetChatInputAutocomplete.access$setLastToken$p(widgetChatInputAutocomplete, autocompleteToken != null ? autocompleteToken.getToken() : null);
+        Resources resources = this.this$0.getEditText().getResources();
+        m.checkNotNullExpressionValue(resources, "editText.resources");
+        boolean z2 = (resources.getConfiguration().orientation == 2) && WidgetChatInputAutocomplete.access$getHideMentionsInLandscape$p(this.this$0);
+        int size = component1.getFilteredAutocompletables().size();
+        WidgetChatInputApplicationCommands access$getApplicationCommands$p = WidgetChatInputAutocomplete.access$getApplicationCommands$p(this.this$0);
+        m.checkNotNullExpressionValue(component1, "model");
+        access$getApplicationCommands$p.configureUi(component1, z2);
+        MentionToken autocompleteToken2 = component1.getAutocompleteToken();
+        int i = 8;
+        if (autocompleteToken2 == null || z2) {
+            ChatInputAutocompleteAdapter.setData$default(WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0), n.emptyList(), false, false, null, 14, null);
+            this.this$0.getMentionsRecycler().setVisibility(8);
+            WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0).getRecycler().setVisibility(8);
+            this.this$0.getStickersContainer().setVisibility(8);
+            WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0).setVisibility(8);
+            StoreStream.Companion.getAutocomplete().setAutocompleteVisible(false);
+            return;
+        }
+        List<Sticker> stickerMatches = component1.getStickerMatches();
+        ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(stickerMatches, 10));
+        for (Sticker sticker : stickerMatches) {
+            arrayList.add(new AutocompleteStickerItem(sticker, null, 0, 6, null));
+        }
+        boolean z3 = autocompleteToken2.isAtStart() && autocompleteToken2.getLeadingIdentifier() == LeadingIdentifier.APP_COMMAND && autocompleteToken2.getToken().length() == 1;
+        WidgetChatInputDiscoveryCommandsModel discoveryCommands = component1.getInputSelectionModel().getInputModel().getCommands().getDiscoveryCommands();
+        if (!z3 || discoveryCommands == null) {
+            List<Autocompletable> filterMentionsFromToken = WidgetChatInputModelMappingFunctions.INSTANCE.filterMentionsFromToken(autocompleteToken2, component1.getInputSelectionModel(), component1.getFilteredAutocompletables());
+            size = filterMentionsFromToken.size();
+            boolean isReducedMotionEnabled = StoreStream.Companion.getAccessibility().isReducedMotionEnabled();
+            m.checkNotNullExpressionValue(component2, "allowAnimatedEmoji");
+            boolean z4 = component2.booleanValue() && !isReducedMotionEnabled;
+            if (this.$emojiAutocompleteUpsellEnabled) {
+                List filterIsInstance = t.filterIsInstance(filterMentionsFromToken, EmojiAutocompletable.class);
+                ArrayList arrayList2 = new ArrayList();
+                ArrayList arrayList3 = new ArrayList();
+                for (Object obj : filterIsInstance) {
+                    if (!((EmojiAutocompletable) obj).getEmoji().isUsable()) {
+                        arrayList2.add(obj);
+                    } else {
+                        arrayList3.add(obj);
+                    }
+                }
+                Pair pair2 = new Pair(arrayList2, arrayList3);
+                List list2 = (List) pair2.component1();
+                list = (List) pair2.component2();
+                int size2 = list2.size();
+                List<EmojiAutocompletable> take = u.take(list2, 3);
+                ArrayList arrayList4 = new ArrayList(d0.t.o.collectionSizeOrDefault(take, 10));
+                for (EmojiAutocompletable emojiAutocompletable : take) {
+                    arrayList4.add(emojiAutocompletable.getEmoji());
+                }
+                EmojiUpsellPlaceholder emojiUpsellPlaceholder = new EmojiUpsellPlaceholder(size2, arrayList4, z4);
+                if (!list2.isEmpty()) {
+                    list = u.plus((Collection<? extends EmojiUpsellPlaceholder>) list, emojiUpsellPlaceholder);
+                }
+            } else {
+                list = u.toList(filterMentionsFromToken);
+            }
+            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setData(list, true, !arrayList.isEmpty(), WidgetChatInputAutocomplete.access$getUserAndRoles$p(this.this$0));
+            this.this$0.getMentionsRecycler().setVisibility(0);
+            WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0).getRecycler().setVisibility(8);
+            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setVisiblePositionListener(WidgetChatInputAutocomplete.access$getOnScrollVisibleMentions$p(this.this$0));
+            WidgetChatInputAutocomplete.access$getOnAutocompletionsUpdated$p(this.this$0).mo1invoke();
+        } else {
+            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setVisiblePositionListener(WidgetChatInputAutocomplete.access$getOnScrollVisibleDiscoveryCommands$p(this.this$0));
+            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setData(discoveryCommands.getFlattenCommandsModel(), false, !arrayList.isEmpty(), WidgetChatInputAutocomplete.access$getUserAndRoles$p(this.this$0));
+            this.this$0.getMentionsRecycler().setVisibility(0);
+            WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0).getRecycler().setVisibility(component1.getInputSelectionModel().getInputModel().getCommands().getApplications().size() > 1 ? 0 : 8);
+            WidgetChatInputCategoriesAdapter access$getCategoriesAdapter$p = WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0);
+            List<Application> applications = component1.getInputSelectionModel().getInputModel().getCommands().getApplications();
+            ArrayList arrayList5 = new ArrayList(d0.t.o.collectionSizeOrDefault(applications, 10));
+            for (Application application : applications) {
+                long id2 = application.getId();
+                Long access$getSelectedCommandApplicationId$p = WidgetChatInputAutocomplete.access$getSelectedCommandApplicationId$p(this.this$0);
+                arrayList5.add(new CommandCategoryItem(application, access$getSelectedCommandApplicationId$p != null && id2 == access$getSelectedCommandApplicationId$p.longValue(), null, 0, 12, null));
+            }
+            access$getCategoriesAdapter$p.setData(arrayList5);
+            if (discoveryCommands.getJumpedApplicationId() != null) {
+                int jumpedSequenceId = discoveryCommands.getJumpedSequenceId();
+                Integer access$getLastJumpedSequenceId$p = WidgetChatInputAutocomplete.access$getLastJumpedSequenceId$p(this.this$0);
+                if (access$getLastJumpedSequenceId$p == null || jumpedSequenceId != access$getLastJumpedSequenceId$p.intValue()) {
+                    WidgetChatInputAutocomplete.access$jumpToApplication(this.this$0, discoveryCommands.getJumpedApplicationId().longValue());
+                    WidgetChatInputAutocomplete.access$setLastJumpedSequenceId$p(this.this$0, Integer.valueOf(discoveryCommands.getJumpedSequenceId()));
+                }
+            }
+        }
+        WidgetChatInputAutocomplete.access$getStickersAdapter$p(this.this$0).setData(arrayList);
+        this.this$0.getStickersContainer().setVisibility(arrayList.isEmpty() ^ true ? 0 : 8);
+        TextView stickersHeader = this.this$0.getStickersHeader();
+        AppFragment appFragment = this.$fragment;
+        Object[] objArr = new Object[1];
+        String access$getLastToken$p = WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0);
+        objArr[0] = access$getLastToken$p != null ? d0.g0.t.replace$default(access$getLastToken$p, String.valueOf(':'), "", false, 4, (Object) null) : null;
+        stickersHeader.setText(b.j(appFragment, 2131893677, objArr, null, 4));
+        TextView access$getEmojiHeader$p = WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0);
+        if (component1.getAutocompleteToken().getLeadingIdentifier() == LeadingIdentifier.EMOJI_AND_STICKERS && size > 0) {
+            i = 0;
+        }
+        access$getEmojiHeader$p.setVisibility(i);
+        WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0).setText(b.j(this.$fragment, 2131888288, new Object[]{WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0)}, null, 4));
+        StoreStream.Companion companion = StoreStream.Companion;
+        companion.getAnalytics().trackAutocompleteOpen(companion.getChannelsSelected().getId(), component1.getAutocompleteType(), component1.getEmojiNumCount(), component1.getStickerNumCount());
+        companion.getAutocomplete().setAutocompleteVisible(true);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$14.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$14.java
index 1161e29ddd..6a9558879e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$14.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$14.java
@@ -1,18 +1,17 @@
 package com.discord.widgets.chat.input;
 
-import com.discord.models.commands.ApplicationCommandOption;
-import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
-import d0.z.d.m;
-import kotlin.ranges.IntRange;
-import rx.functions.Func2;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import com.discord.widgets.chat.input.models.MentionToken;
+import j0.k.b;
 /* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$14<T1, T2, R> implements Func2<IntRange, VerifiedCommandMentionInputModel, InputSelectionModel> {
+public final class WidgetChatInputAutocomplete$configureDataSubscriptions$14<T, R> implements b<AutocompleteInputSelectionModel, String> {
     public static final WidgetChatInputAutocomplete$configureDataSubscriptions$14 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$14();
 
-    public final InputSelectionModel call(IntRange intRange, VerifiedCommandMentionInputModel verifiedCommandMentionInputModel) {
-        ApplicationCommandOption selectedOption = WidgetChatInputModelMappingFunctions.INSTANCE.getSelectedOption(intRange.getFirst(), verifiedCommandMentionInputModel.getInputCommandOptions().getInputRanges());
-        m.checkNotNullExpressionValue(verifiedCommandMentionInputModel, "inputModel");
-        m.checkNotNullExpressionValue(intRange, "selection");
-        return new InputSelectionModel(verifiedCommandMentionInputModel, selectedOption, intRange);
+    public final String call(AutocompleteInputSelectionModel autocompleteInputSelectionModel) {
+        MentionToken autocompleteToken = autocompleteInputSelectionModel.getAutocompleteToken();
+        if (autocompleteToken != null) {
+            return autocompleteToken.getToken();
+        }
+        return null;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$15.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$15.java
deleted file mode 100644
index 92c3fff6da..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$15.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import com.discord.api.sticker.Sticker;
-import com.discord.models.commands.ApplicationCommand;
-import com.discord.models.commands.ApplicationCommandOption;
-import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
-import d0.z.d.m;
-import d0.z.d.o;
-import java.util.List;
-import java.util.Set;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$15 extends o implements Function1<InputSelectionModel, Unit> {
-    public final /* synthetic */ WidgetChatInputAutocomplete this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAutocomplete$configureDataSubscriptions$15(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
-        super(1);
-        this.this$0 = widgetChatInputAutocomplete;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(InputSelectionModel inputSelectionModel) {
-        invoke(inputSelectionModel);
-        return Unit.a;
-    }
-
-    public final void invoke(InputSelectionModel inputSelectionModel) {
-        if (inputSelectionModel.getSelection().getLast() <= inputSelectionModel.getInputModel().getInput().length()) {
-            WidgetChatInputModelMappingFunctions widgetChatInputModelMappingFunctions = WidgetChatInputModelMappingFunctions.INSTANCE;
-            ApplicationCommand selectedCommand = inputSelectionModel.getInputModel().getInputCommandContext().getSelectedCommand();
-            ApplicationCommandOption selectedCommandOption = inputSelectionModel.getSelectedCommandOption();
-            InputSelectionModel access$getLastChatInputModel$p = WidgetChatInputAutocomplete.access$getLastChatInputModel$p(this.this$0);
-            Set<ApplicationCommandOption> errorsToShowForCommandParameters = widgetChatInputModelMappingFunctions.getErrorsToShowForCommandParameters(selectedCommand, selectedCommandOption, access$getLastChatInputModel$p != null ? access$getLastChatInputModel$p.getSelectedCommandOption() : null, inputSelectionModel.getInputModel().getInputCommandOptions().getCommandOptionValidity(), inputSelectionModel.getInputModel().getInputCommandOptions().getValues());
-            WidgetChatInputAutocomplete.access$applyCommandOptionSpans(this.this$0, inputSelectionModel.getInputModel(), inputSelectionModel.getSelectedCommandOption(), errorsToShowForCommandParameters);
-            MentionToken mentionAutoCompleteToken = widgetChatInputModelMappingFunctions.getMentionAutoCompleteToken(inputSelectionModel.getInputModel().getInput(), inputSelectionModel.getSelection(), inputSelectionModel.getSelectedCommandOption(), inputSelectionModel.hasSelectedFreeformInputOption(), inputSelectionModel.getInputModel().getInputCommandOptions());
-            m.checkNotNullExpressionValue(inputSelectionModel, "model");
-            List<WidgetChatInputCommandsModel> filterMentionsForCommandContext = widgetChatInputModelMappingFunctions.filterMentionsForCommandContext(inputSelectionModel);
-            List<Sticker> stickerMatches = widgetChatInputModelMappingFunctions.getStickerMatches(mentionAutoCompleteToken);
-            WidgetChatInputAutocomplete.access$setLastChatInputModel$p(this.this$0, inputSelectionModel);
-            WidgetChatInputAutocomplete.access$getAutocompleteInputSelectionModelSubject$p(this.this$0).onNext(new AutocompleteInputSelectionModel(mentionAutoCompleteToken, filterMentionsForCommandContext, inputSelectionModel, errorsToShowForCommandParameters, stickerMatches));
-        }
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$16.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$16.java
deleted file mode 100644
index 40cde68623..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$16.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import d0.o;
-import kotlin.Pair;
-import rx.functions.Func2;
-/* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$16<T1, T2, R> implements Func2<AutocompleteInputSelectionModel, Boolean, Pair<? extends AutocompleteInputSelectionModel, ? extends Boolean>> {
-    public static final WidgetChatInputAutocomplete$configureDataSubscriptions$16 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$16();
-
-    public final Pair<AutocompleteInputSelectionModel, Boolean> call(AutocompleteInputSelectionModel autocompleteInputSelectionModel, Boolean bool) {
-        return o.to(autocompleteInputSelectionModel, bool);
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java
deleted file mode 100644
index 5c9a5d449e..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import android.content.res.Resources;
-import android.widget.TextView;
-import c.a.l.b;
-import com.discord.api.sticker.Sticker;
-import com.discord.app.AppFragment;
-import com.discord.models.commands.Application;
-import com.discord.models.domain.emoji.Emoji;
-import com.discord.stores.StoreStream;
-import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputApplicationCommands;
-import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
-import d0.g0.t;
-import d0.t.n;
-import d0.t.u;
-import d0.z.d.m;
-import d0.z.d.o;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import kotlin.Pair;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.functions.Function2;
-import rx.functions.Action2;
-/* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$17 extends o implements Function1<Pair<? extends AutocompleteInputSelectionModel, ? extends Boolean>, Unit> {
-    public final /* synthetic */ boolean $emojiAutocompleteUpsellEnabled;
-    public final /* synthetic */ AppFragment $fragment;
-    public final /* synthetic */ WidgetChatInputAutocomplete this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAutocomplete$configureDataSubscriptions$17(WidgetChatInputAutocomplete widgetChatInputAutocomplete, boolean z2, AppFragment appFragment) {
-        super(1);
-        this.this$0 = widgetChatInputAutocomplete;
-        this.$emojiAutocompleteUpsellEnabled = z2;
-        this.$fragment = appFragment;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Pair<? extends AutocompleteInputSelectionModel, ? extends Boolean> pair) {
-        invoke((Pair<AutocompleteInputSelectionModel, Boolean>) pair);
-        return Unit.a;
-    }
-
-    /* JADX WARN: Multi-variable type inference failed */
-    /* JADX DEBUG: Type inference failed for r3v9. Raw type applied. Possible types: java.util.Iterator<T>, java.util.Iterator */
-    /* JADX DEBUG: Type inference failed for r3v37. Raw type applied. Possible types: java.util.Iterator<T>, java.util.Iterator */
-    /* JADX DEBUG: Type inference failed for r3v58. Raw type applied. Possible types: java.util.Iterator<T>, java.util.Iterator */
-    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0319: APUT  (r10v1 java.lang.Object[]), (0 ??[int, short, byte, char]), (r12v7 java.lang.String) */
-    /* JADX WARNING: Unknown variable types count: 2 */
-    public final void invoke(Pair<AutocompleteInputSelectionModel, Boolean> pair) {
-        List<WidgetChatInputCommandsModel> list;
-        Character leadingIdentifier;
-        AutocompleteInputSelectionModel component1 = pair.component1();
-        Boolean component2 = pair.component2();
-        WidgetChatInputAutocomplete widgetChatInputAutocomplete = this.this$0;
-        MentionToken autocompleteToken = component1.getAutocompleteToken();
-        WidgetChatInputAutocomplete.access$setLastToken$p(widgetChatInputAutocomplete, autocompleteToken != null ? autocompleteToken.getToken() : null);
-        Resources resources = this.this$0.getEditText().getResources();
-        m.checkNotNullExpressionValue(resources, "editText.resources");
-        boolean z2 = (resources.getConfiguration().orientation == 2) && WidgetChatInputAutocomplete.access$getHideMentionsInLandscape$p(this.this$0);
-        int size = component1.getFilteredMentionables().size();
-        WidgetChatInputApplicationCommands access$getApplicationCommands$p = WidgetChatInputAutocomplete.access$getApplicationCommands$p(this.this$0);
-        m.checkNotNullExpressionValue(component1, "model");
-        access$getApplicationCommands$p.configureUi(component1, z2);
-        MentionToken autocompleteToken2 = component1.getAutocompleteToken();
-        int i = 8;
-        if (autocompleteToken2 == null || z2) {
-            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setData(n.emptyList());
-            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).getRecycler().setVisibility(8);
-            WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0).getRecycler().setVisibility(8);
-            this.this$0.getStickersContainer().setVisibility(8);
-            WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0).setVisibility(8);
-            StoreStream.Companion.getAutocomplete().setAutocompleteVisible(false);
-            return;
-        }
-        List<Sticker> stickerMatches = component1.getStickerMatches();
-        ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(stickerMatches, 10));
-        for (Sticker sticker : stickerMatches) {
-            arrayList.add(new AutocompleteStickerItem(sticker, null, 0, 6, null));
-        }
-        boolean z3 = autocompleteToken2.isAtStart() && (leadingIdentifier = autocompleteToken2.getLeadingIdentifier()) != null && leadingIdentifier.charValue() == '/' && autocompleteToken2.getToken().length() == 1;
-        WidgetChatInputDiscoveryCommandsModel discoveryCommands = component1.getInputSelectionModel().getInputModel().getCommands().getDiscoveryCommands();
-        if (!z3 || discoveryCommands == null) {
-            Collection<WidgetChatInputCommandsModel> filterMentionsFromToken = WidgetChatInputModelMappingFunctions.INSTANCE.filterMentionsFromToken(autocompleteToken2, component1.getInputSelectionModel(), component1.getFilteredMentionables());
-            size = filterMentionsFromToken.size();
-            boolean isReducedMotionEnabled = StoreStream.Companion.getAccessibility().isReducedMotionEnabled();
-            m.checkNotNullExpressionValue(component2, "allowAnimatedEmoji");
-            boolean z4 = component2.booleanValue() && !isReducedMotionEnabled;
-            if (this.$emojiAutocompleteUpsellEnabled) {
-                ArrayList arrayList2 = new ArrayList();
-                ArrayList arrayList3 = new ArrayList();
-                for (Object obj : filterMentionsFromToken) {
-                    Emoji emoji = ((WidgetChatInputCommandsModel) obj).getEmoji();
-                    if (emoji != null && !emoji.isUsable()) {
-                        arrayList2.add(obj);
-                    } else {
-                        arrayList3.add(obj);
-                    }
-                }
-                Pair pair2 = new Pair(arrayList2, arrayList3);
-                List list2 = (List) pair2.component1();
-                list = (List) pair2.component2();
-                int size2 = list2.size();
-                List<WidgetChatInputCommandsModel> take = u.take(list2, 3);
-                ArrayList arrayList4 = new ArrayList(d0.t.o.collectionSizeOrDefault(take, 10));
-                for (WidgetChatInputCommandsModel widgetChatInputCommandsModel : take) {
-                    arrayList4.add(widgetChatInputCommandsModel.getEmoji());
-                }
-                WidgetChatInputCommandsModel createEmojiAutocompleteUpsell = WidgetChatInputCommandsModel.createEmojiAutocompleteUpsell(size2, arrayList4, z4);
-                if (!list2.isEmpty()) {
-                    list = u.plus((Collection<? extends WidgetChatInputCommandsModel>) list, createEmojiAutocompleteUpsell);
-                }
-            } else {
-                list = u.toList(filterMentionsFromToken);
-            }
-            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setData(list, Boolean.TRUE, !arrayList.isEmpty(), WidgetChatInputAutocomplete.access$getUserAndRoles$p(this.this$0));
-            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).getRecycler().setVisibility(0);
-            WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0).getRecycler().setVisibility(8);
-            WidgetChatInputCommandsAdapter access$getMentionsAdapter$p = WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0);
-            Function2 access$getOnScrollVisibleMentions$p = WidgetChatInputAutocomplete.access$getOnScrollVisibleMentions$p(this.this$0);
-            if (access$getOnScrollVisibleMentions$p != null) {
-                access$getOnScrollVisibleMentions$p = new WidgetChatInputAutocomplete$sam$rx_functions_Action2$0(access$getOnScrollVisibleMentions$p);
-            }
-            access$getMentionsAdapter$p.setVisiblePositionListener((Action2) access$getOnScrollVisibleMentions$p);
-            WidgetChatInputAutocomplete.access$getOnAutocompletionsUpdated$p(this.this$0).mo1invoke();
-        } else {
-            WidgetChatInputCommandsAdapter access$getMentionsAdapter$p2 = WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0);
-            Function2 access$getOnScrollVisibleDiscoveryCommands$p = WidgetChatInputAutocomplete.access$getOnScrollVisibleDiscoveryCommands$p(this.this$0);
-            if (access$getOnScrollVisibleDiscoveryCommands$p != null) {
-                access$getOnScrollVisibleDiscoveryCommands$p = new WidgetChatInputAutocomplete$sam$rx_functions_Action2$0(access$getOnScrollVisibleDiscoveryCommands$p);
-            }
-            access$getMentionsAdapter$p2.setVisiblePositionListener((Action2) access$getOnScrollVisibleDiscoveryCommands$p);
-            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).setData(discoveryCommands.getFlattenCommandsModel(), Boolean.FALSE, !arrayList.isEmpty(), WidgetChatInputAutocomplete.access$getUserAndRoles$p(this.this$0));
-            WidgetChatInputAutocomplete.access$getMentionsAdapter$p(this.this$0).getRecycler().setVisibility(0);
-            WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0).getRecycler().setVisibility(component1.getInputSelectionModel().getInputModel().getCommands().getApplications().size() > 1 ? 0 : 8);
-            WidgetChatInputCategoriesAdapter access$getCategoriesAdapter$p = WidgetChatInputAutocomplete.access$getCategoriesAdapter$p(this.this$0);
-            List<Application> applications = component1.getInputSelectionModel().getInputModel().getCommands().getApplications();
-            ArrayList arrayList5 = new ArrayList(d0.t.o.collectionSizeOrDefault(applications, 10));
-            for (Application application : applications) {
-                long id2 = application.getId();
-                Long access$getSelectedCommandApplicationId$p = WidgetChatInputAutocomplete.access$getSelectedCommandApplicationId$p(this.this$0);
-                arrayList5.add(new CommandCategoryItem(application, access$getSelectedCommandApplicationId$p != null && id2 == access$getSelectedCommandApplicationId$p.longValue(), null, 0, 12, null));
-            }
-            access$getCategoriesAdapter$p.setData(arrayList5);
-            if (discoveryCommands.getJumpedApplicationId() != null) {
-                int jumpedSequenceId = discoveryCommands.getJumpedSequenceId();
-                Integer access$getLastJumpedSequenceId$p = WidgetChatInputAutocomplete.access$getLastJumpedSequenceId$p(this.this$0);
-                if (access$getLastJumpedSequenceId$p == null || jumpedSequenceId != access$getLastJumpedSequenceId$p.intValue()) {
-                    WidgetChatInputAutocomplete.access$jumpToApplication(this.this$0, discoveryCommands.getJumpedApplicationId().longValue());
-                    WidgetChatInputAutocomplete.access$setLastJumpedSequenceId$p(this.this$0, Integer.valueOf(discoveryCommands.getJumpedSequenceId()));
-                }
-            }
-        }
-        WidgetChatInputAutocomplete.access$getStickersAdapter$p(this.this$0).setData(arrayList);
-        this.this$0.getStickersContainer().setVisibility(arrayList.isEmpty() ^ true ? 0 : 8);
-        TextView stickersHeader = this.this$0.getStickersHeader();
-        AppFragment appFragment = this.$fragment;
-        Object[] objArr = new Object[1];
-        String access$getLastToken$p = WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0);
-        objArr[0] = access$getLastToken$p != null ? t.replace$default(access$getLastToken$p, String.valueOf(':'), "", false, 4, (Object) null) : null;
-        stickersHeader.setText(b.j(appFragment, 2131893580, objArr, null, 4));
-        TextView access$getEmojiHeader$p = WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0);
-        Character leadingIdentifier2 = component1.getAutocompleteToken().getLeadingIdentifier();
-        if (leadingIdentifier2 != null && leadingIdentifier2.charValue() == ':' && size > 0) {
-            i = 0;
-        }
-        access$getEmojiHeader$p.setVisibility(i);
-        WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0).setText(b.j(this.$fragment, 2131888288, new Object[]{WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0)}, null, 4));
-        StoreStream.Companion companion = StoreStream.Companion;
-        companion.getAnalytics().trackAutocompleteOpen(companion.getChannelsSelected().getId(), component1.getAutocompleteType(), component1.getEmojiNumCount(), component1.getStickerNumCount());
-        companion.getAutocomplete().setAutocompleteVisible(true);
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$18.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$18.java
deleted file mode 100644
index 9af121f52e..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$18.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import j0.k.b;
-/* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$18<T, R> implements b<AutocompleteInputSelectionModel, String> {
-    public static final WidgetChatInputAutocomplete$configureDataSubscriptions$18 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$18();
-
-    public final String call(AutocompleteInputSelectionModel autocompleteInputSelectionModel) {
-        MentionToken autocompleteToken = autocompleteInputSelectionModel.getAutocompleteToken();
-        if (autocompleteToken != null) {
-            return autocompleteToken.getToken();
-        }
-        return null;
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$3.java
index 442a427fa4..32cf25f36b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$3.java
@@ -16,6 +16,6 @@ public final class WidgetChatInputAutocomplete$configureDataSubscriptions$3<T, R
 
     public final Observable<? extends List<ApplicationCommand>> call(Channel channel) {
         m.checkNotNullExpressionValue(channel, "channel");
-        return AnimatableValueParser.e1(channel) ? new j(n.emptyList()) : StoreStream.Companion.getApplicationCommands().observeQueryCommands(channel.g());
+        return AnimatableValueParser.e1(channel) ? new j(n.emptyList()) : StoreStream.Companion.getApplicationCommands().observeQueryCommands(channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$5.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$5.java
index e908704a7b..d425a3b0cb 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$5.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$5.java
@@ -3,6 +3,7 @@ package com.discord.widgets.chat.input;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.stores.DiscoverCommands;
+import com.discord.widgets.chat.input.autocomplete.sources.ApplicationCommandsAutocompletableSource;
 import d0.t.n;
 import d0.z.d.m;
 import j0.k.b;
@@ -14,6 +15,6 @@ public final class WidgetChatInputAutocomplete$configureDataSubscriptions$5<T, R
 
     public final Observable<? extends WidgetChatInputDiscoveryCommandsModel> call(Channel channel) {
         m.checkNotNullExpressionValue(channel, "channel");
-        return AnimatableValueParser.e1(channel) ? new j(WidgetChatInputDiscoveryCommandsModel.Companion.parseModelDiscoveryCommands(n.emptyList(), DiscoverCommands.Companion.getDefaultModelDiscoveryCommands(), true, 3)) : WidgetChatInputCommandsModel.getDiscoveryCommands(Boolean.TRUE, 3, Long.valueOf(channel.g()));
+        return AnimatableValueParser.e1(channel) ? new j(WidgetChatInputDiscoveryCommandsModel.Companion.parseModelDiscoveryCommands(n.emptyList(), DiscoverCommands.Companion.getDefaultModelDiscoveryCommands(), true, 3)) : ApplicationCommandsAutocompletableSource.Companion.getDiscoveryCommands(true, 3, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$6.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$6.java
index ae296abc88..884bb73f0b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$6.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$6.java
@@ -1,6 +1,8 @@
 package com.discord.widgets.chat.input;
 
 import com.discord.models.commands.Application;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandLoadingPlaceholder;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import d0.d0.f;
 import d0.z.d.o;
 import java.util.Iterator;
@@ -30,20 +32,20 @@ public final class WidgetChatInputAutocomplete$configureDataSubscriptions$6 exte
         WidgetChatInputAutocomplete.access$setDiscoveryCommands$p(this.this$0, widgetChatInputDiscoveryCommandsModel);
         WidgetChatInputAutocomplete.access$getApplicationsPosition$p(this.this$0).clear();
         int i = 0;
-        for (Pair<Application, List<WidgetChatInputCommandsModel>> pair : widgetChatInputDiscoveryCommandsModel.getCommandsByApplication()) {
+        for (Pair<Application, List<Autocompletable>> pair : widgetChatInputDiscoveryCommandsModel.getCommandsByApplication()) {
             Application component1 = pair.component1();
-            List<WidgetChatInputCommandsModel> component2 = pair.component2();
-            Iterator<WidgetChatInputCommandsModel> it = component2.iterator();
+            List<Autocompletable> component2 = pair.component2();
+            Iterator<Autocompletable> it = component2.iterator();
             int i2 = 0;
             while (true) {
                 if (!it.hasNext()) {
                     i2 = -1;
                     break;
-                }
-                if (it.next().getType() != 9) {
+                } else if (!(it.next() instanceof ApplicationCommandLoadingPlaceholder)) {
                     break;
+                } else {
+                    i2++;
                 }
-                i2++;
             }
             WidgetChatInputAutocomplete.access$getApplicationsPosition$p(this.this$0).put(Long.valueOf(component1.getId()), Integer.valueOf(f.coerceAtLeast(i2, 0) + i));
             i += component2.size();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$7.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$7.java
index 371026c594..bc7ce40de3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$7.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$7.java
@@ -11,6 +11,6 @@ public final class WidgetChatInputAutocomplete$configureDataSubscriptions$7<T, R
     public static final WidgetChatInputAutocomplete$configureDataSubscriptions$7 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$7();
 
     public final Observable<? extends List<Application>> call(Channel channel) {
-        return StoreStream.Companion.getApplicationCommands().observeGuildApplications(channel.g());
+        return StoreStream.Companion.getApplicationCommands().observeGuildApplications(channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$9.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$9.java
index 48c2733997..bc7be96a11 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$9.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$9.java
@@ -1,22 +1,34 @@
 package com.discord.widgets.chat.input;
 
-import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
 import d0.z.d.m;
-import kotlin.Pair;
-import rx.functions.Func3;
+import d0.z.d.o;
+import java.util.Map;
+import java.util.Set;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$configureDataSubscriptions$9<T1, T2, T3, R> implements Func3<Boolean, Boolean, Boolean, Pair<? extends Boolean, ? extends Boolean>> {
-    public static final WidgetChatInputAutocomplete$configureDataSubscriptions$9 INSTANCE = new WidgetChatInputAutocomplete$configureDataSubscriptions$9();
+public final class WidgetChatInputAutocomplete$configureDataSubscriptions$9 extends o implements Function1<Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>>, Unit> {
+    public final /* synthetic */ WidgetChatInputAutocomplete this$0;
 
-    public final Pair<Boolean, Boolean> call(Boolean bool, Boolean bool2, Boolean bool3) {
-        m.checkNotNullExpressionValue(bool, "isExpressionTrayActive");
-        boolean z2 = false;
-        boolean z3 = bool.booleanValue() || !bool2.booleanValue();
-        boolean isReducedMotionEnabled = StoreStream.Companion.getAccessibility().isReducedMotionEnabled();
-        m.checkNotNullExpressionValue(bool3, "allowAnimatedEmoji");
-        if (bool3.booleanValue() && !isReducedMotionEnabled) {
-            z2 = true;
-        }
-        return new Pair<>(Boolean.valueOf(z3), Boolean.valueOf(z2));
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetChatInputAutocomplete$configureDataSubscriptions$9(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
+        super(1);
+        this.this$0 = widgetChatInputAutocomplete;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map) {
+        invoke(map);
+        return Unit.a;
+    }
+
+    public final void invoke(Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map) {
+        m.checkNotNullParameter(map, "mentions");
+        WidgetChatInputAutocomplete.access$setMentions$p(this.this$0, map);
+        WidgetChatInputAutocomplete.access$onModelUpdated(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickMentionItem$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickMentionItem$2.java
index 66cca68947..8d3223c336 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickMentionItem$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickMentionItem$2.java
@@ -1,17 +1,21 @@
 package com.discord.widgets.chat.input;
 
+import com.discord.stores.StoreAnalytics;
 import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetChatInputAutocomplete.kt */
 public final class WidgetChatInputAutocomplete$onClickMentionItem$2 extends o implements Function1<AutocompleteInputSelectionModel, Unit> {
-    public final /* synthetic */ WidgetChatInputCommandsModel $tag;
+    public final /* synthetic */ Autocompletable $tag;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatInputAutocomplete$onClickMentionItem$2(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
+    public WidgetChatInputAutocomplete$onClickMentionItem$2(Autocompletable autocompletable) {
         super(1);
-        this.$tag = widgetChatInputCommandsModel;
+        this.$tag = autocompletable;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -24,6 +28,12 @@ public final class WidgetChatInputAutocomplete$onClickMentionItem$2 extends o im
 
     public final void invoke(AutocompleteInputSelectionModel autocompleteInputSelectionModel) {
         StoreStream.Companion companion = StoreStream.Companion;
-        companion.getAnalytics().trackAutocompleteSelect(companion.getChannelsSelected().getId(), autocompleteInputSelectionModel.getAutocompleteType(), autocompleteInputSelectionModel.getEmojiNumCount(), autocompleteInputSelectionModel.getStickerNumCount(), this.$tag.getType() == 3 ? "EMOJI" : "MENTION", this.$tag.getType() == 3 ? "emoji" : null, null);
+        StoreAnalytics analytics = companion.getAnalytics();
+        long id2 = companion.getChannelsSelected().getId();
+        String autocompleteType = autocompleteInputSelectionModel.getAutocompleteType();
+        int emojiNumCount = autocompleteInputSelectionModel.getEmojiNumCount();
+        int stickerNumCount = autocompleteInputSelectionModel.getStickerNumCount();
+        Autocompletable autocompletable = this.$tag;
+        analytics.trackAutocompleteSelect(id2, autocompleteType, emojiNumCount, stickerNumCount, autocompletable instanceof EmojiAutocompletable ? "EMOJI" : "MENTION", autocompletable instanceof EmojiAutocompletable ? "emoji" : null, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickStickerItem$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickStickerItem$1.java
index ff7179e1de..d5373f4dae 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickStickerItem$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$onClickStickerItem$1.java
@@ -2,6 +2,7 @@ package com.discord.widgets.chat.input;
 
 import com.discord.api.sticker.Sticker;
 import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$sam$rx_functions_Action2$0.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$sam$rx_functions_Action2$0.java
deleted file mode 100644
index 0c9d81a97f..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$sam$rx_functions_Action2$0.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import d0.z.d.m;
-import kotlin.jvm.functions.Function2;
-import rx.functions.Action2;
-/* compiled from: WidgetChatInputAutocomplete.kt */
-public final class WidgetChatInputAutocomplete$sam$rx_functions_Action2$0 implements Action2 {
-    private final /* synthetic */ Function2 function;
-
-    public WidgetChatInputAutocomplete$sam$rx_functions_Action2$0(Function2 function2) {
-        this.function = function2;
-    }
-
-    @Override // rx.functions.Action2
-    public final /* synthetic */ void call(Object obj, Object obj2) {
-        m.checkNotNullExpressionValue(this.function.invoke(obj, obj2), "invoke(...)");
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java
index c10441e059..736c7b5fab 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java
@@ -11,17 +11,16 @@ import android.view.View;
 import android.widget.TextView;
 import androidx.annotation.MainThread;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.d.c0;
+import c.d.b.a.a;
 import com.discord.api.channel.Channel;
+import com.discord.api.role.GuildRole;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChatInputApplicationCommandsBinding;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ApplicationCommandOption;
-import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.experiments.domain.Experiment;
-import com.discord.stores.StoreEmoji;
 import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserSettings;
@@ -36,21 +35,39 @@ import com.discord.utilities.textprocessing.FontColorSpan;
 import com.discord.utilities.textprocessing.SimpleRoundedBackgroundSpan;
 import com.discord.widgets.chat.MessageContent;
 import com.discord.widgets.chat.MessageManager;
-import com.discord.widgets.chat.input.WidgetChatInputEditText;
 import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputApplicationCommands;
 import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputApplicationCommandsKt;
 import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctions;
 import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctionsKt;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.ChatInputAutocompletables;
+import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import com.discord.widgets.chat.input.autocomplete.RoleAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.UserAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.adapter.ChatInputAutocompleteAdapter;
 import com.discord.widgets.chat.input.emoji.EmojiAutocompletePremiumUpsellFeatureFlag;
-import com.discord.widgets.chat.input.expression.WidgetExpressionTray;
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
+import com.discord.widgets.chat.input.models.AutocompleteApplicationCommands;
+import com.discord.widgets.chat.input.models.AutocompleteInputCommandContext;
+import com.discord.widgets.chat.input.models.AutocompleteInputModel;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import com.discord.widgets.chat.input.models.ChatInputMentionsMap;
+import com.discord.widgets.chat.input.models.CommandOptionValue;
+import com.discord.widgets.chat.input.models.InputCommandOptions;
+import com.discord.widgets.chat.input.models.InputSelectionModel;
+import com.discord.widgets.chat.input.models.OptionRange;
+import com.discord.widgets.chat.input.models.VerifiedCommandMentionInputModel;
 import com.lytefast.flexinput.widget.FlexEditText;
 import d0.g0.w;
+import d0.t.h0;
 import d0.t.n;
+import d0.t.t;
 import d0.t.u;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -65,7 +82,6 @@ import kotlin.jvm.functions.Function2;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.ranges.IntRange;
 import rx.Observable;
-import rx.functions.Action1;
 import rx.subjects.BehaviorSubject;
 /* compiled from: WidgetChatInputAutocomplete.kt */
 public final class WidgetChatInputAutocomplete {
@@ -80,15 +96,16 @@ public final class WidgetChatInputAutocomplete {
     private WidgetChatInputDiscoveryCommandsModel discoveryCommands;
     private final FlexEditText editText;
     private final TextView emojiHeader;
-    private final Function1<WidgetChatInputCommandsModel, Boolean> handleAutocompleteItemClicked;
+    private final Function1<Autocompletable, Boolean> handleAutocompleteItemClicked;
     private boolean hideMentionsInLandscape;
     private final BehaviorSubject<VerifiedCommandMentionInputModel> inputMentionModelSubject;
     private final BehaviorSubject<IntRange> inputSelectionSubject;
     private InputSelectionModel lastChatInputModel;
     private Integer lastJumpedSequenceId;
     private String lastToken;
-    private List<? extends WidgetChatInputCommandsModel> mentions;
-    private WidgetChatInputCommandsAdapter mentionsAdapter;
+    private Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> mentions;
+    private ChatInputAutocompleteAdapter mentionsAdapter;
+    private final RecyclerView mentionsRecycler;
     private final Function0<Unit> onAutocompletionsUpdated;
     private final Function2<Integer, Integer, Unit> onScrollVisibleDiscoveryCommands;
     private final Function2<Integer, Integer, Unit> onScrollVisibleMentions;
@@ -101,7 +118,7 @@ public final class WidgetChatInputAutocomplete {
 
     /* compiled from: WidgetChatInputAutocomplete.kt */
     /* renamed from: com.discord.widgets.chat.input.WidgetChatInputAutocomplete$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function1<WidgetChatInputCommandsModel, Boolean> {
+    public static final class AnonymousClass1 extends o implements Function1<Autocompletable, Boolean> {
         public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
         public AnonymousClass1() {
@@ -111,12 +128,12 @@ public final class WidgetChatInputAutocomplete {
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Boolean invoke(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            return Boolean.valueOf(invoke(widgetChatInputCommandsModel));
+        public /* bridge */ /* synthetic */ Boolean invoke(Autocompletable autocompletable) {
+            return Boolean.valueOf(invoke(autocompletable));
         }
 
-        public final boolean invoke(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            m.checkNotNullParameter(widgetChatInputCommandsModel, "it");
+        public final boolean invoke(Autocompletable autocompletable) {
+            m.checkNotNullParameter(autocompletable, "it");
             return false;
         }
     }
@@ -138,17 +155,26 @@ public final class WidgetChatInputAutocomplete {
 
     /* compiled from: WidgetChatInputAutocomplete.kt */
     /* renamed from: com.discord.widgets.chat.input.WidgetChatInputAutocomplete$3  reason: invalid class name */
-    public static final class AnonymousClass3<T> implements Action1<WidgetChatInputCommandsModel> {
+    public static final class AnonymousClass3 extends o implements Function1<Autocompletable, Unit> {
         public final /* synthetic */ WidgetChatInputAutocomplete this$0;
 
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AnonymousClass3(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
+            super(1);
             this.this$0 = widgetChatInputAutocomplete;
         }
 
-        public final void call(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            WidgetChatInputAutocomplete widgetChatInputAutocomplete = this.this$0;
-            m.checkNotNullExpressionValue(widgetChatInputCommandsModel, "tag");
-            WidgetChatInputAutocomplete.access$onClickMentionItem(widgetChatInputAutocomplete, widgetChatInputCommandsModel);
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(Autocompletable autocompletable) {
+            invoke(autocompletable);
+            return Unit.a;
+        }
+
+        public final void invoke(Autocompletable autocompletable) {
+            m.checkNotNullParameter(autocompletable, "it");
+            WidgetChatInputAutocomplete.access$onClickMentionItem(this.this$0, autocompletable);
         }
     }
 
@@ -238,9 +264,9 @@ public final class WidgetChatInputAutocomplete {
         }
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r26v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.WidgetChatInputCommandsModel, java.lang.Boolean> */
+    /* JADX DEBUG: Multi-variable search result rejected for r26v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.autocomplete.Autocompletable, java.lang.Boolean> */
     /* JADX WARN: Multi-variable type inference failed */
-    public WidgetChatInputAutocomplete(FlexEditText flexEditText, RecyclerView recyclerView, View view, TextView textView, TextView textView2, RecyclerView recyclerView2, RecyclerView recyclerView3, WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, Function1<? super WidgetChatInputCommandsModel, Boolean> function1, Function1<? super List<? extends WidgetChatInputCommandsModel>, Unit> function12, Function0<Unit> function0) {
+    public WidgetChatInputAutocomplete(FlexEditText flexEditText, RecyclerView recyclerView, View view, TextView textView, TextView textView2, RecyclerView recyclerView2, RecyclerView recyclerView3, WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, Function1<? super Autocompletable, Boolean> function1, Function1<? super List<? extends Autocompletable>, Unit> function12, Function0<Unit> function0) {
         m.checkNotNullParameter(flexEditText, "editText");
         m.checkNotNullParameter(recyclerView, "stickersRecycler");
         m.checkNotNullParameter(view, "stickersContainer");
@@ -255,15 +281,16 @@ public final class WidgetChatInputAutocomplete {
         this.stickersContainer = view;
         this.stickersHeader = textView;
         this.emojiHeader = textView2;
+        this.mentionsRecycler = recyclerView2;
         this.handleAutocompleteItemClicked = function1;
         this.onAutocompletionsUpdated = function0;
         this.applicationCommands = new WidgetChatInputApplicationCommands(flexEditText, widgetChatInputApplicationCommandsBinding);
-        this.inputMentionModelSubject = BehaviorSubject.l0();
-        this.autocompleteInputSelectionModelSubject = BehaviorSubject.l0();
-        this.inputSelectionSubject = BehaviorSubject.l0();
+        this.inputMentionModelSubject = BehaviorSubject.k0();
+        this.autocompleteInputSelectionModelSubject = BehaviorSubject.k0();
+        this.inputSelectionSubject = BehaviorSubject.k0();
         this.queryCommands = n.emptyList();
         this.applications = n.emptyList();
-        this.mentions = n.emptyList();
+        this.mentions = h0.emptyMap();
         this.userAndRoles = new UserAndSelectedGuildRoles(0, null, 3, null);
         this.applicationsPosition = new HashMap();
         this.onScrollVisibleMentions = new WidgetChatInputAutocomplete$onScrollVisibleMentions$1(this, function12);
@@ -271,13 +298,16 @@ public final class WidgetChatInputAutocomplete {
         boolean z2 = true;
         Experiment userExperiment = StoreStream.Companion.getExperiments().getUserExperiment("2020-12_android_disable_landscape_mentions", true);
         this.hideMentionsInLandscape = (userExperiment == null || userExperiment.getBucket() != 1) ? false : z2;
-        MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter = (WidgetChatInputCommandsAdapter) companion.configure(new WidgetChatInputCommandsAdapter(recyclerView2, new AnonymousClass3(this)));
-        this.mentionsAdapter = widgetChatInputCommandsAdapter;
-        if (widgetChatInputCommandsAdapter == null) {
+        ChatInputAutocompleteAdapter chatInputAutocompleteAdapter = new ChatInputAutocompleteAdapter();
+        this.mentionsAdapter = chatInputAutocompleteAdapter;
+        recyclerView2.setAdapter(chatInputAutocompleteAdapter);
+        recyclerView2.setItemAnimator(null);
+        ChatInputAutocompleteAdapter chatInputAutocompleteAdapter2 = this.mentionsAdapter;
+        if (chatInputAutocompleteAdapter2 == null) {
             m.throwUninitializedPropertyAccessException("mentionsAdapter");
         }
-        widgetChatInputCommandsAdapter.getRecycler().setItemAnimator(null);
+        chatInputAutocompleteAdapter2.setOnItemSelected(new AnonymousClass3(this));
+        MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         WidgetChatInputCategoriesAdapter widgetChatInputCategoriesAdapter = (WidgetChatInputCategoriesAdapter) companion.configure(new WidgetChatInputCategoriesAdapter(recyclerView3, new AnonymousClass4(this)));
         this.categoriesAdapter = widgetChatInputCategoriesAdapter;
         recyclerView3.setLayoutManager(new SelfHealingLinearLayoutManager(recyclerView3, widgetChatInputCategoriesAdapter, 0, false, 8, null));
@@ -339,16 +369,16 @@ public final class WidgetChatInputAutocomplete {
         return widgetChatInputAutocomplete.lastToken;
     }
 
-    public static final /* synthetic */ List access$getMentions$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
+    public static final /* synthetic */ Map access$getMentions$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
         return widgetChatInputAutocomplete.mentions;
     }
 
-    public static final /* synthetic */ WidgetChatInputCommandsAdapter access$getMentionsAdapter$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
-        WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter = widgetChatInputAutocomplete.mentionsAdapter;
-        if (widgetChatInputCommandsAdapter == null) {
+    public static final /* synthetic */ ChatInputAutocompleteAdapter access$getMentionsAdapter$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
+        ChatInputAutocompleteAdapter chatInputAutocompleteAdapter = widgetChatInputAutocomplete.mentionsAdapter;
+        if (chatInputAutocompleteAdapter == null) {
             m.throwUninitializedPropertyAccessException("mentionsAdapter");
         }
-        return widgetChatInputCommandsAdapter;
+        return chatInputAutocompleteAdapter;
     }
 
     public static final /* synthetic */ Function0 access$getOnAutocompletionsUpdated$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete) {
@@ -387,8 +417,8 @@ public final class WidgetChatInputAutocomplete {
         widgetChatInputAutocomplete.jumpToApplication(j);
     }
 
-    public static final /* synthetic */ void access$onClickMentionItem(WidgetChatInputAutocomplete widgetChatInputAutocomplete, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        widgetChatInputAutocomplete.onClickMentionItem(widgetChatInputCommandsModel);
+    public static final /* synthetic */ void access$onClickMentionItem(WidgetChatInputAutocomplete widgetChatInputAutocomplete, Autocompletable autocompletable) {
+        widgetChatInputAutocomplete.onClickMentionItem(autocompletable);
     }
 
     public static final /* synthetic */ void access$onClickStickerItem(WidgetChatInputAutocomplete widgetChatInputAutocomplete, Sticker sticker) {
@@ -435,12 +465,12 @@ public final class WidgetChatInputAutocomplete {
         widgetChatInputAutocomplete.lastToken = str;
     }
 
-    public static final /* synthetic */ void access$setMentions$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete, List list) {
-        widgetChatInputAutocomplete.mentions = list;
+    public static final /* synthetic */ void access$setMentions$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete, Map map) {
+        widgetChatInputAutocomplete.mentions = map;
     }
 
-    public static final /* synthetic */ void access$setMentionsAdapter$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete, WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        widgetChatInputAutocomplete.mentionsAdapter = widgetChatInputCommandsAdapter;
+    public static final /* synthetic */ void access$setMentionsAdapter$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete, ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        widgetChatInputAutocomplete.mentionsAdapter = chatInputAutocompleteAdapter;
     }
 
     public static final /* synthetic */ void access$setQueryCommands$p(WidgetChatInputAutocomplete widgetChatInputAutocomplete, List list) {
@@ -488,11 +518,20 @@ public final class WidgetChatInputAutocomplete {
             Editable editableText = this.editText.getEditableText();
             m.checkNotNullExpressionValue(editableText, "editText.editableText");
             Companion.access$removeSpans(companion, editableText);
-            for (Map.Entry<IntRange, WidgetChatInputCommandsModel> entry : verifiedCommandMentionInputModel.getInputMentionsMap().entrySet()) {
+            for (Map.Entry<IntRange, Autocompletable> entry : verifiedCommandMentionInputModel.getInputMentionsMap().entrySet()) {
                 IntRange key = entry.getKey();
-                WidgetChatInputCommandsModel value = entry.getValue();
-                if (value.getType() != 5) {
-                    for (MetricAffectingSpan metricAffectingSpan : n.listOf((Object[]) new MetricAffectingSpan[]{new FontColorSpan(RoleUtils.getOpaqueColor(value.getRole(), ColorCompat.getThemedColor(this.editText, 2130970174))), new StyleSpan(1)})) {
+                Autocompletable value = entry.getValue();
+                if (!(value instanceof ApplicationCommandAutocompletable)) {
+                    int themedColor = ColorCompat.getThemedColor(this.editText, 2130970174);
+                    GuildRole guildRole = null;
+                    if (!(value instanceof RoleAutocompletable)) {
+                        value = null;
+                    }
+                    RoleAutocompletable roleAutocompletable = (RoleAutocompletable) value;
+                    if (roleAutocompletable != null) {
+                        guildRole = roleAutocompletable.getRole();
+                    }
+                    for (MetricAffectingSpan metricAffectingSpan : n.listOf((Object[]) new MetricAffectingSpan[]{new FontColorSpan(RoleUtils.getOpaqueColor(guildRole, themedColor)), new StyleSpan(1)})) {
                         this.editText.getEditableText().setSpan(metricAffectingSpan, key.getFirst(), key.getLast(), 33);
                     }
                 }
@@ -504,7 +543,7 @@ public final class WidgetChatInputAutocomplete {
         InputCommandOptions inputCommandOptions;
         AutocompleteInputCommandContext inputCommandContext = this.applicationCommands.getInputCommandContext(autocompleteInputModel.getInput(), autocompleteInputModel.getApplicationCommands(), autocompleteInputModel.getMe());
         WidgetChatInputModelMappingFunctions widgetChatInputModelMappingFunctions = WidgetChatInputModelMappingFunctions.INSTANCE;
-        ChatInputMentionsMap mapInputToMentions = widgetChatInputModelMappingFunctions.mapInputToMentions(autocompleteInputModel.getInput(), autocompleteInputModel.getMentionables(), inputCommandContext.isCommand());
+        ChatInputMentionsMap mapInputToMentions = widgetChatInputModelMappingFunctions.mapInputToMentions(autocompleteInputModel.getInput(), autocompleteInputModel.getAutocompletables(), inputCommandContext.isCommand());
         ApplicationCommand selectedCommand = inputCommandContext.getSelectedCommand();
         InputCommandOptions inputCommandOptions2 = new InputCommandOptions(null, null, null, 7, null);
         if (selectedCommand != null) {
@@ -514,7 +553,7 @@ public final class WidgetChatInputAutocomplete {
         } else {
             inputCommandOptions = inputCommandOptions2;
         }
-        VerifiedCommandMentionInputModel verifiedCommandMentionInputModel = new VerifiedCommandMentionInputModel(autocompleteInputModel.getInput(), autocompleteInputModel.getMentionables(), autocompleteInputModel.getApplicationCommands(), inputCommandContext, inputCommandOptions, mapInputToMentions.getMentions());
+        VerifiedCommandMentionInputModel verifiedCommandMentionInputModel = new VerifiedCommandMentionInputModel(autocompleteInputModel.getInput(), autocompleteInputModel.getAutocompletables(), autocompleteInputModel.getApplicationCommands(), inputCommandContext, inputCommandOptions, mapInputToMentions.getMentions());
         if (!this.applicationCommands.appendTextForCommandForInput(verifiedCommandMentionInputModel)) {
             applyInputSpans(verifiedCommandMentionInputModel);
             this.inputMentionModelSubject.onNext(verifiedCommandMentionInputModel);
@@ -532,7 +571,7 @@ public final class WidgetChatInputAutocomplete {
         AutocompleteApplicationCommands commands;
         Iterator it;
         WidgetChatInputDiscoveryCommandsModel widgetChatInputDiscoveryCommandsModel;
-        List<Pair<Application, List<WidgetChatInputCommandsModel>>> commandsByApplication;
+        List<Pair<Application, List<Autocompletable>>> commandsByApplication;
         Object obj;
         List list;
         boolean z2;
@@ -540,11 +579,11 @@ public final class WidgetChatInputAutocomplete {
         if (widgetChatInputDiscoveryCommandsModel2 == null || !widgetChatInputDiscoveryCommandsModel2.getHasMoreBefore() || i >= 3) {
             WidgetChatInputDiscoveryCommandsModel widgetChatInputDiscoveryCommandsModel3 = this.discoveryCommands;
             if (widgetChatInputDiscoveryCommandsModel3 != null && widgetChatInputDiscoveryCommandsModel3.getHasMoreAfter()) {
-                WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter = this.mentionsAdapter;
-                if (widgetChatInputCommandsAdapter == null) {
+                ChatInputAutocompleteAdapter chatInputAutocompleteAdapter = this.mentionsAdapter;
+                if (chatInputAutocompleteAdapter == null) {
                     m.throwUninitializedPropertyAccessException("mentionsAdapter");
                 }
-                if (i2 >= widgetChatInputCommandsAdapter.getItemCount() - 3) {
+                if (i2 >= chatInputAutocompleteAdapter.getItemCount() - 3) {
                     StoreStream.Companion.getApplicationCommands().requestLoadMoreDown();
                 }
             }
@@ -635,29 +674,29 @@ public final class WidgetChatInputAutocomplete {
     private final void jumpToApplication(long j) {
         Integer num = this.applicationsPosition.get(Long.valueOf(j));
         if (num != null) {
-            WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter = this.mentionsAdapter;
-            if (widgetChatInputCommandsAdapter == null) {
+            ChatInputAutocompleteAdapter chatInputAutocompleteAdapter = this.mentionsAdapter;
+            if (chatInputAutocompleteAdapter == null) {
                 m.throwUninitializedPropertyAccessException("mentionsAdapter");
             }
-            widgetChatInputCommandsAdapter.scrollToPosition(num.intValue());
+            ChatInputAutocompleteAdapter.scrollToPosition$default(chatInputAutocompleteAdapter, num.intValue(), false, 2, null);
         }
     }
 
-    private final void onClickMentionItem(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
+    private final void onClickMentionItem(Autocompletable autocompletable) {
         InputSelectionModel inputSelectionModel;
         VerifiedCommandMentionInputModel inputModel;
         InputCommandOptions inputCommandOptions;
         Map<ApplicationCommandOption, OptionRange> inputRanges;
         VerifiedCommandMentionInputModel inputModel2;
         AutocompleteInputCommandContext inputCommandContext;
-        if (!this.handleAutocompleteItemClicked.invoke(widgetChatInputCommandsModel).booleanValue()) {
-            if (widgetChatInputCommandsModel.getType() == 5) {
-                ApplicationCommand command = widgetChatInputCommandsModel.getCommand();
-                m.checkNotNullExpressionValue(command, "command");
+        if (!this.handleAutocompleteItemClicked.invoke(autocompletable).booleanValue()) {
+            if (autocompletable instanceof ApplicationCommandAutocompletable) {
+                ApplicationCommandAutocompletable applicationCommandAutocompletable = (ApplicationCommandAutocompletable) autocompletable;
+                ApplicationCommand command = applicationCommandAutocompletable.getCommand();
                 if (WidgetChatInputModelMappingFunctionsKt.hasPermission(command, this.userAndRoles)) {
                     this.applicationCommands.selectApplicationCommand(command);
                     StringBuilder sb = new StringBuilder();
-                    String name = widgetChatInputCommandsModel.getCommand().getName();
+                    String name = applicationCommandAutocompletable.getCommand().getName();
                     sb.append(String.valueOf('/') + name);
                     sb.append(" ");
                     String sb2 = sb.toString();
@@ -676,32 +715,24 @@ public final class WidgetChatInputAutocomplete {
             if (!(inputSelectionModel4 == null || (inputModel = inputSelectionModel4.getInputModel()) == null || (inputCommandOptions = inputModel.getInputCommandOptions()) == null || (inputRanges = inputCommandOptions.getInputRanges()) == null)) {
                 optionRange = inputRanges.get(selectedCommandOption);
             }
-            if (selectedCommandOption == null || optionRange == null || (inputSelectionModel = this.lastChatInputModel) == null || inputSelectionModel.hasSelectedFreeformInputOption()) {
-                WidgetChatInputEditText.Companion companion = WidgetChatInputEditText.Companion;
-                FlexEditText flexEditText = this.editText;
-                String displayTag = widgetChatInputCommandsModel.getDisplayTag();
-                m.checkNotNullExpressionValue(displayTag, "tag.displayTag");
-                companion.insertMention(flexEditText, displayTag, this.lastToken);
-            } else {
-                Editable editableText = this.editText.getEditableText();
-                int first = optionRange.getValue().getFirst();
-                int last = optionRange.getValue().getLast();
-                editableText.replace(first, last, widgetChatInputCommandsModel.getDisplayTag() + " ");
-                FlexEditText flexEditText2 = this.editText;
-                flexEditText2.setSelection(flexEditText2.getEditableText().toString().length());
+            if (!autocompletable.getInputTextMatchers().isEmpty()) {
+                if (selectedCommandOption == null || optionRange == null || (inputSelectionModel = this.lastChatInputModel) == null || inputSelectionModel.hasSelectedFreeformInputOption()) {
+                    WidgetChatInputEditText.Companion.insertMention(this.editText, (String) u.first((List<? extends Object>) autocompletable.getInputTextMatchers()), this.lastToken);
+                } else {
+                    this.editText.getEditableText().replace(optionRange.getValue().getFirst(), optionRange.getValue().getLast(), a.D(new StringBuilder(), (String) u.first((List<? extends Object>) autocompletable.getInputTextMatchers()), " "));
+                    FlexEditText flexEditText = this.editText;
+                    flexEditText.setSelection(flexEditText.getEditableText().toString().length());
+                }
             }
             if (!(selectedCommand == null || selectedCommandOption == null)) {
                 this.editText.post(new WidgetChatInputAutocomplete$onClickMentionItem$1(this, selectedCommand, selectedCommandOption));
             }
-            if (widgetChatInputCommandsModel.getType() == 3) {
-                StoreEmoji emojis = StoreStream.Companion.getEmojis();
-                Emoji emoji = widgetChatInputCommandsModel.getEmoji();
-                m.checkNotNullExpressionValue(emoji, "tag.emoji");
-                emojis.onEmojiUsed(emoji);
+            if (autocompletable instanceof EmojiAutocompletable) {
+                StoreStream.Companion.getEmojis().onEmojiUsed(((EmojiAutocompletable) autocompletable).getEmoji());
             }
-            Observable<AutocompleteInputSelectionModel> a02 = this.autocompleteInputSelectionModelSubject.a0(1);
-            m.checkNotNullExpressionValue(a02, "autocompleteInputSelecti…lSubject\n        .take(1)");
-            ObservableExtensionsKt.appSubscribe$default(a02, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$onClickMentionItem$2(widgetChatInputCommandsModel), 62, (Object) null);
+            Observable<AutocompleteInputSelectionModel> Z = this.autocompleteInputSelectionModelSubject.Z(1);
+            m.checkNotNullExpressionValue(Z, "autocompleteInputSelecti…lSubject\n        .take(1)");
+            ObservableExtensionsKt.appSubscribe$default(Z, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$onClickMentionItem$2(autocompletable), 62, (Object) null);
         }
     }
 
@@ -715,14 +746,14 @@ public final class WidgetChatInputAutocomplete {
         }
         String replaceAfterLast$default = w.replaceAfterLast$default(str, ':', "", null, 4, null);
         FlexEditText flexEditText = this.editText;
-        String substring = replaceAfterLast$default.substring(0, replaceAfterLast$default.length() - 1);
+        String substring = replaceAfterLast$default.substring(0, Math.max(0, replaceAfterLast$default.length() - 1));
         m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
         flexEditText.setText(substring);
         MessageManager.sendMessage$default(new MessageManager(this.stickersAdapter.getContext(), null, null, null, null, null, null, null, null, 510, null), null, null, null, null, d0.t.m.listOf(sticker), false, null, null, null, 495, null);
         companion.getStickers().onStickerUsed(sticker);
-        Observable<AutocompleteInputSelectionModel> a02 = this.autocompleteInputSelectionModelSubject.a0(1);
-        m.checkNotNullExpressionValue(a02, "autocompleteInputSelecti…lSubject\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$onClickStickerItem$1(sticker), 62, (Object) null);
+        Observable<AutocompleteInputSelectionModel> Z = this.autocompleteInputSelectionModelSubject.Z(1);
+        m.checkNotNullExpressionValue(Z, "autocompleteInputSelecti…lSubject\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$onClickStickerItem$1(sticker), 62, (Object) null);
     }
 
     private final void onCommandCategoryClicked(Application application) {
@@ -733,11 +764,11 @@ public final class WidgetChatInputAutocomplete {
             if (num == null || !StoreStream.Companion.getApplicationCommands().hasFetchedApplicationCommands(application.getId())) {
                 StoreStream.Companion.getApplicationCommands().requestDiscoverCommands(application.getId());
             } else {
-                WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter = this.mentionsAdapter;
-                if (widgetChatInputCommandsAdapter == null) {
+                ChatInputAutocompleteAdapter chatInputAutocompleteAdapter = this.mentionsAdapter;
+                if (chatInputAutocompleteAdapter == null) {
                     m.throwUninitializedPropertyAccessException("mentionsAdapter");
                 }
-                widgetChatInputCommandsAdapter.scrollToPosition(num.intValue());
+                ChatInputAutocompleteAdapter.scrollToPosition$default(chatInputAutocompleteAdapter, num.intValue(), false, 2, null);
             }
         }
         StoreStream.Companion.getAnalytics().trackApplicationCommandBrowserJump(application.getId());
@@ -747,7 +778,8 @@ public final class WidgetChatInputAutocomplete {
     private final void onModelUpdated() {
         String str = this.currentInput;
         if (str != null) {
-            handleInputModel(new AutocompleteInputModel(str, this.mentions, new AutocompleteApplicationCommands(this.applications, this.queryCommands, this.discoveryCommands), this.userAndRoles));
+            AutocompleteApplicationCommands autocompleteApplicationCommands = new AutocompleteApplicationCommands(this.applications, this.queryCommands, this.discoveryCommands);
+            handleInputModel(new AutocompleteInputModel(str, this.userAndRoles, this.mentions, autocompleteApplicationCommands));
         }
     }
 
@@ -771,63 +803,59 @@ public final class WidgetChatInputAutocomplete {
         m.checkNotNullParameter(appFragment, "fragment");
         m.checkNotNullParameter(observable, "emptyTextSubject");
         this.applicationCommands.configureObservables(appFragment);
+        ChatInputAutocompleteAdapter chatInputAutocompleteAdapter = this.mentionsAdapter;
+        if (chatInputAutocompleteAdapter == null) {
+            m.throwUninitializedPropertyAccessException("mentionsAdapter");
+        }
+        chatInputAutocompleteAdapter.configureSubscriptions(appFragment);
         boolean isEnabled = EmojiAutocompletePremiumUpsellFeatureFlag.Companion.getINSTANCE().isEnabled();
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable s2 = Observable.i(companion.getUsers().observeMeId(), companion.getGuildSelected().observeSelectedGuildId(), companion.getGuilds().observeComputed(), WidgetChatInputAutocomplete$configureDataSubscriptions$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "Observable.combineLatest… }.distinctUntilChanged()");
-        Observable L = ObservableExtensionsKt.ui$default(s2, appFragment, null, 2, null).L();
-        m.checkNotNullExpressionValue(L, "Observable.combineLatest…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(L, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$2(this), 62, (Object) null);
+        Observable r = Observable.i(companion.getUsers().observeMeId(), companion.getGuildSelected().observeSelectedGuildId(), companion.getGuilds().observeComputed(), WidgetChatInputAutocomplete$configureDataSubscriptions$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest… }.distinctUntilChanged()");
+        Observable K = ObservableExtensionsKt.ui$default(r, appFragment, null, 2, null).K();
+        m.checkNotNullExpressionValue(K, "Observable.combineLatest…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(K, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$2(this), 62, (Object) null);
         Observable<Channel> observeSelectedChannel = companion.getChannelsSelected().observeSelectedChannel();
         ObservableExtensionsKt$filterNull$1 observableExtensionsKt$filterNull$1 = ObservableExtensionsKt$filterNull$1.INSTANCE;
-        Observable<Channel> y2 = observeSelectedChannel.y(observableExtensionsKt$filterNull$1);
+        Observable<Channel> x2 = observeSelectedChannel.x(observableExtensionsKt$filterNull$1);
         ObservableExtensionsKt$filterNull$2 observableExtensionsKt$filterNull$2 = ObservableExtensionsKt$filterNull$2.INSTANCE;
-        Observable<R> G = y2.G(observableExtensionsKt$filterNull$2);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable s3 = G.Z(WidgetChatInputAutocomplete$configureDataSubscriptions$3.INSTANCE).s();
-        m.checkNotNullExpressionValue(s3, "StoreStream.getChannelsS…  .distinctUntilChanged()");
-        Observable L2 = ObservableExtensionsKt.ui$default(s3, appFragment, null, 2, null).L();
-        m.checkNotNullExpressionValue(L2, "StoreStream.getChannelsS…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(L2, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$4(this), 62, (Object) null);
-        Observable<R> G2 = companion.getChannelsSelected().observeSelectedChannel().y(observableExtensionsKt$filterNull$1).G(observableExtensionsKt$filterNull$2);
-        m.checkNotNullExpressionValue(G2, "filter { it != null }.map { it!! }");
-        Observable s4 = G2.Z(WidgetChatInputAutocomplete$configureDataSubscriptions$5.INSTANCE).s();
-        m.checkNotNullExpressionValue(s4, "StoreStream.getChannelsS… }.distinctUntilChanged()");
-        Observable L3 = ObservableExtensionsKt.ui$default(s4, appFragment, null, 2, null).L();
-        m.checkNotNullExpressionValue(L3, "StoreStream.getChannelsS…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(L3, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$6(this), 62, (Object) null);
-        Observable<R> G3 = companion.getChannelsSelected().observeSelectedChannel().y(observableExtensionsKt$filterNull$1).G(observableExtensionsKt$filterNull$2);
-        m.checkNotNullExpressionValue(G3, "filter { it != null }.map { it!! }");
-        Observable s5 = G3.Z(WidgetChatInputAutocomplete$configureDataSubscriptions$7.INSTANCE).s();
-        m.checkNotNullExpressionValue(s5, "StoreStream.getChannelsS…  .distinctUntilChanged()");
-        Observable L4 = ObservableExtensionsKt.ui$default(s5, appFragment, null, 2, null).L();
-        m.checkNotNullExpressionValue(L4, "StoreStream.getChannelsS…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(L4, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$8(this), 62, (Object) null);
-        Observable s6 = Observable.i(WidgetExpressionTray.Companion.observeIsExpressionTrayActive(), observable, StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), WidgetChatInputAutocomplete$configureDataSubscriptions$9.INSTANCE).s();
-        WidgetChatInputAutocomplete$configureDataSubscriptions$10 widgetChatInputAutocomplete$configureDataSubscriptions$10 = WidgetChatInputAutocomplete$configureDataSubscriptions$10.INSTANCE;
-        WidgetChatInputAutocomplete$configureDataSubscriptions$11 widgetChatInputAutocomplete$configureDataSubscriptions$11 = new WidgetChatInputAutocomplete$configureDataSubscriptions$11(this, isEnabled);
-        WidgetChatInputAutocomplete$configureDataSubscriptions$12 widgetChatInputAutocomplete$configureDataSubscriptions$12 = WidgetChatInputAutocomplete$configureDataSubscriptions$12.INSTANCE;
-        m.checkNotNullParameter(widgetChatInputAutocomplete$configureDataSubscriptions$10, "observableCondition");
-        m.checkNotNullParameter(widgetChatInputAutocomplete$configureDataSubscriptions$11, "switchedObservableFunc");
-        m.checkNotNullParameter(widgetChatInputAutocomplete$configureDataSubscriptions$12, "defaultObservableFunc");
-        Observable k = s6.k(new c0(widgetChatInputAutocomplete$configureDataSubscriptions$10, widgetChatInputAutocomplete$configureDataSubscriptions$11, widgetChatInputAutocomplete$configureDataSubscriptions$12));
-        m.checkNotNullExpressionValue(k, "Observable\n        .comb…}\n            )\n        )");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(k), appFragment, null, 2, null), WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$13(this), 62, (Object) null);
-        Observable j = Observable.j(this.inputSelectionSubject, this.inputMentionModelSubject, WidgetChatInputAutocomplete$configureDataSubscriptions$14.INSTANCE);
+        Observable<R> F = x2.F(observableExtensionsKt$filterNull$2);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable r2 = F.Y(WidgetChatInputAutocomplete$configureDataSubscriptions$3.INSTANCE).r();
+        m.checkNotNullExpressionValue(r2, "StoreStream.getChannelsS…  .distinctUntilChanged()");
+        Observable K2 = ObservableExtensionsKt.ui$default(r2, appFragment, null, 2, null).K();
+        m.checkNotNullExpressionValue(K2, "StoreStream.getChannelsS…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(K2, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$4(this), 62, (Object) null);
+        Observable<R> F2 = companion.getChannelsSelected().observeSelectedChannel().x(observableExtensionsKt$filterNull$1).F(observableExtensionsKt$filterNull$2);
+        m.checkNotNullExpressionValue(F2, "filter { it != null }.map { it!! }");
+        Observable r3 = F2.Y(WidgetChatInputAutocomplete$configureDataSubscriptions$5.INSTANCE).r();
+        m.checkNotNullExpressionValue(r3, "StoreStream.getChannelsS… }.distinctUntilChanged()");
+        Observable K3 = ObservableExtensionsKt.ui$default(r3, appFragment, null, 2, null).K();
+        m.checkNotNullExpressionValue(K3, "StoreStream.getChannelsS…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(K3, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$6(this), 62, (Object) null);
+        Observable<R> F3 = companion.getChannelsSelected().observeSelectedChannel().x(observableExtensionsKt$filterNull$1).F(observableExtensionsKt$filterNull$2);
+        m.checkNotNullExpressionValue(F3, "filter { it != null }.map { it!! }");
+        Observable r4 = F3.Y(WidgetChatInputAutocomplete$configureDataSubscriptions$7.INSTANCE).r();
+        m.checkNotNullExpressionValue(r4, "StoreStream.getChannelsS…  .distinctUntilChanged()");
+        Observable K4 = ObservableExtensionsKt.ui$default(r4, appFragment, null, 2, null).K();
+        m.checkNotNullExpressionValue(K4, "StoreStream.getChannelsS…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(K4, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$8(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(ChatInputAutocompletables.INSTANCE.observeChannelAutocompletables()), appFragment, null, 2, null), WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$9(this), 62, (Object) null);
+        Observable j = Observable.j(this.inputSelectionSubject, this.inputMentionModelSubject, WidgetChatInputAutocomplete$configureDataSubscriptions$10.INSTANCE);
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…dOption, selection)\n    }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(j), appFragment, null, 2, null), WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$15(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(j), appFragment, null, 2, null), WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$11(this), 62, (Object) null);
         BehaviorSubject<AutocompleteInputSelectionModel> behaviorSubject = this.autocompleteInputSelectionModelSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "autocompleteInputSelectionModelSubject");
-        Observable j2 = Observable.j(ObservableExtensionsKt.leadingEdgeThrottle(behaviorSubject, 100, TimeUnit.MILLISECONDS), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), WidgetChatInputAutocomplete$configureDataSubscriptions$16.INSTANCE);
+        Observable j2 = Observable.j(ObservableExtensionsKt.leadingEdgeThrottle(behaviorSubject, 100, TimeUnit.MILLISECONDS), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), WidgetChatInputAutocomplete$configureDataSubscriptions$12.INSTANCE);
         m.checkNotNullExpressionValue(j2, "Observable.combineLatest…l to allowAnimatedEmoji }");
-        Observable s7 = ObservableExtensionsKt.computationLatest(j2).s();
-        m.checkNotNullExpressionValue(s7, "Observable.combineLatest…  .distinctUntilChanged()");
-        Observable L5 = ObservableExtensionsKt.ui$default(s7, appFragment, null, 2, null).L();
-        m.checkNotNullExpressionValue(L5, "Observable.combineLatest…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(L5, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$17(this, isEnabled, appFragment), 62, (Object) null);
-        Observable s8 = this.autocompleteInputSelectionModelSubject.G(WidgetChatInputAutocomplete$configureDataSubscriptions$18.INSTANCE).s();
-        m.checkNotNullExpressionValue(s8, "autocompleteInputSelecti… }.distinctUntilChanged()");
-        StoreGuilds.Actions.requestMembers(appFragment, s8, true);
+        Observable r5 = ObservableExtensionsKt.computationLatest(j2).r();
+        m.checkNotNullExpressionValue(r5, "Observable.combineLatest…  .distinctUntilChanged()");
+        Observable K5 = ObservableExtensionsKt.ui$default(r5, appFragment, null, 2, null).K();
+        m.checkNotNullExpressionValue(K5, "Observable.combineLatest…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(K5, WidgetChatInputAutocomplete.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputAutocomplete$configureDataSubscriptions$13(this, isEnabled, appFragment), 62, (Object) null);
+        Observable r6 = this.autocompleteInputSelectionModelSubject.F(WidgetChatInputAutocomplete$configureDataSubscriptions$14.INSTANCE).r();
+        m.checkNotNullExpressionValue(r6, "autocompleteInputSelecti… }.distinctUntilChanged()");
+        StoreGuilds.Actions.requestMembers(appFragment, r6, true);
     }
 
     public final ApplicationCommandData getApplicationCommandData() {
@@ -843,6 +871,10 @@ public final class WidgetChatInputAutocomplete {
         return w.startsWith$default((CharSequence) str, '/', false, 2, (Object) null);
     }
 
+    public final RecyclerView getMentionsRecycler() {
+        return this.mentionsRecycler;
+    }
+
     public final View getStickersContainer() {
         return this.stickersContainer;
     }
@@ -867,19 +899,37 @@ public final class WidgetChatInputAutocomplete {
         }
     }
 
-    public final MessageContent replaceMentionableDataWithServerValues(String str) {
+    public final MessageContent replaceAutocompletableDataWithServerValues(String str) {
         VerifiedCommandMentionInputModel inputModel;
-        Map<IntRange, WidgetChatInputCommandsModel> inputMentionsMap;
-        Collection<WidgetChatInputCommandsModel> values;
-        List distinct;
+        Map<IntRange, Autocompletable> inputMentionsMap;
         m.checkNotNullParameter(str, "content");
         InputSelectionModel inputSelectionModel = this.lastChatInputModel;
-        List mutableList = (inputSelectionModel == null || (inputModel = inputSelectionModel.getInputModel()) == null || (inputMentionsMap = inputModel.getInputMentionsMap()) == null || (values = inputMentionsMap.values()) == null || (distinct = u.distinct(values)) == null) ? null : u.toMutableList((Collection) distinct);
-        if (mutableList == null) {
-            mutableList = n.emptyList();
+        if (inputSelectionModel == null || (inputModel = inputSelectionModel.getInputModel()) == null || (inputMentionsMap = inputModel.getInputMentionsMap()) == null) {
+            return new MessageContent(str, n.emptyList());
         }
-        MessageContent replaceMatches = WidgetChatInputCommandsModel.replaceMatches(str, mutableList);
-        m.checkNotNullExpressionValue(replaceMatches, "WidgetChatInputCommandsM…bleList().orEmpty()\n    )");
-        return replaceMatches;
+        String replaceAutocompleteDataWithServerValues = WidgetChatInputModelMappingFunctions.INSTANCE.replaceAutocompleteDataWithServerValues(str, inputMentionsMap);
+        List<UserAutocompletable> filterIsInstance = t.filterIsInstance(inputMentionsMap.values(), UserAutocompletable.class);
+        ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(filterIsInstance, 10));
+        for (UserAutocompletable userAutocompletable : filterIsInstance) {
+            arrayList.add(userAutocompletable.getUser());
+        }
+        int length = replaceAutocompleteDataWithServerValues.length() - 1;
+        int i = 0;
+        boolean z2 = false;
+        while (i <= length) {
+            boolean z3 = m.compare(replaceAutocompleteDataWithServerValues.charAt(!z2 ? i : length), 32) <= 0;
+            if (!z2) {
+                if (!z3) {
+                    z2 = true;
+                } else {
+                    i++;
+                }
+            } else if (!z3) {
+                break;
+            } else {
+                length--;
+            }
+        }
+        return new MessageContent(replaceAutocompleteDataWithServerValues.subSequence(i, length + 1).toString(), arrayList);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java
deleted file mode 100644
index 221a6ca98d..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java
+++ /dev/null
@@ -1,480 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.ColorInt;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import c.a.a0.b.a.c;
-import c.a.a0.b.a.d;
-import c.a.a0.b.a.e;
-import c.a.a0.b.a.f;
-import c.a.a0.b.a.g;
-import c.a.a0.b.a.h;
-import c.a.a0.b.a.i;
-import c.a.a0.b.a.j;
-import c.a.a0.b.a.k;
-import c.a.a0.b.a.l;
-import c.a.l.b;
-import com.discord.api.role.GuildRole;
-import com.discord.models.commands.Application;
-import com.discord.models.domain.emoji.Emoji;
-import com.discord.models.member.GuildMember;
-import com.discord.utilities.color.ColorCompat;
-import com.discord.utilities.dimen.DimenUtils;
-import com.discord.utilities.drawable.DrawableCompat;
-import com.discord.utilities.guilds.RoleUtils;
-import com.discord.utilities.icon.IconUtils;
-import com.discord.utilities.images.MGImages;
-import com.discord.utilities.images.MGImagesBitmap;
-import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
-import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
-import com.discord.utilities.premium.GuildMemberAvatarsFeatureFlag;
-import com.discord.utilities.rx.LeadingEdgeThrottle;
-import com.discord.utilities.textprocessing.AstRenderer;
-import com.discord.utilities.textprocessing.node.EmojiNode;
-import com.discord.utilities.user.UserUtils;
-import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
-import com.discord.utilities.views.StickyHeaderItemDecoration;
-import com.discord.views.PileView;
-import com.discord.views.StatusView;
-import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctionsKt;
-import com.facebook.drawee.span.DraweeSpanStringBuilder;
-import com.facebook.imagepipeline.request.ImageRequestBuilder;
-import d0.z.d.m;
-import j0.j.b.a;
-import j0.l.a.r;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.TimeUnit;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-import kotlin.text.Regex;
-import rx.Emitter;
-import rx.Observable;
-import rx.functions.Action1;
-import rx.functions.Action2;
-public class WidgetChatInputCommandsAdapter extends MGRecyclerAdapterSimple<WidgetChatInputCommandsModel> implements StickyHeaderItemDecoration.StickyHeaderAdapter {
-    private static final int COMMAND_HEADER_HEIGHT = 32;
-    private static final int CONTAINER_ROW_MAX_VISIBLE_COUNT = 4;
-    private static final int EMOJI_AUTOCOMPLETE_UPSELL_HEIGHT = 52;
-    private static final int MENTION_CONTAINER_MAX_SIZE = 176;
-    private static final int MENTION_CONTAINER_MAX_SIZE_WITH_STICKERS = 132;
-    private static final int MENTION_ROW_HEIGHT_DEFAULT = 44;
-    private List<Integer> headerIndices;
-    public final Action1<WidgetChatInputCommandsModel> onClickAction;
-    @NonNull
-    private RecyclerView.OnScrollListener onScrollListener;
-    @Nullable
-    private Action2<Integer, Integer> onScrollPositionListener;
-    private Boolean showAvatar;
-    private StickyHeaderManager stickyHeaderManager;
-    private UserAndSelectedGuildRoles userAndSelectedGuildRoles;
-
-    /* renamed from: com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter$1  reason: invalid class name */
-    public class AnonymousClass1 extends RecyclerView.OnScrollListener {
-        public final /* synthetic */ Emitter val$emitter;
-
-        public AnonymousClass1(Emitter emitter) {
-            this.val$emitter = emitter;
-        }
-
-        @Override // androidx.recyclerview.widget.RecyclerView.OnScrollListener
-        public void onScrolled(@NonNull RecyclerView recyclerView, int i, int i2) {
-            super.onScrolled(recyclerView, i, i2);
-            this.val$emitter.onNext(0);
-        }
-    }
-
-    public static class CommandHeaderItem extends MGRecyclerViewHolder<WidgetChatInputCommandsAdapter, WidgetChatInputCommandsModel> implements StickyHeaderHolder {
-        private WidgetChatInputCommandsModel currentItem;
-        private final ImageView itemAvatar = ((ImageView) this.itemView.findViewById(2131362445));
-        private final TextView itemName = ((TextView) this.itemView.findViewById(2131362448));
-
-        public CommandHeaderItem(@LayoutRes int i, WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-            super(i, widgetChatInputCommandsAdapter);
-        }
-
-        public /* synthetic */ void a(Application application, MGImagesBitmap.CloseableBitmaps closeableBitmaps) {
-            String icon;
-            String icon2 = this.currentItem.getApplication().getIcon();
-            if (icon2 != null && icon2.equals(application.getIcon()) && (icon = application.getIcon()) != null) {
-                this.itemAvatar.setImageBitmap(closeableBitmaps.get(IconUtils.getApplicationIcon(application.getId(), icon, 160)));
-            }
-        }
-
-        public /* synthetic */ void b(Drawable drawable, Throwable th) {
-            this.itemAvatar.setImageDrawable(drawable);
-        }
-
-        @Override // com.discord.widgets.chat.input.StickyHeaderHolder
-        public void bind(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            if (this.currentItem != widgetChatInputCommandsModel) {
-                this.currentItem = widgetChatInputCommandsModel;
-                Application application = widgetChatInputCommandsModel.getApplication();
-                Drawable drawable = DrawableCompat.getDrawable(this.itemAvatar.getContext(), 2131231929, ColorCompat.getThemedColor(this.itemAvatar, 2130968988), false);
-                String icon = application.getIcon();
-                if (icon == null || icon.isEmpty()) {
-                    this.itemAvatar.setImageDrawable(drawable);
-                } else {
-                    HashSet hashSet = new HashSet();
-                    hashSet.add(new MGImagesBitmap.ImageRequest(IconUtils.getApplicationIcon(application.getId(), icon, 160), true));
-                    this.itemAvatar.setImageBitmap(null);
-                    MGImagesBitmap.getBitmaps(hashSet).J(a.a()).X(new c(this, application), new d(this, drawable));
-                }
-                this.itemName.setText(widgetChatInputCommandsModel.getApplication().getName().toUpperCase(Locale.getDefault()));
-            }
-        }
-
-        @Override // com.discord.widgets.chat.input.StickyHeaderHolder
-        public View getItemView() {
-            return this.itemView;
-        }
-
-        public void onConfigure(int i, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            super.onConfigure(i, (int) widgetChatInputCommandsModel);
-            bind(widgetChatInputCommandsModel);
-        }
-    }
-
-    public static class CommandLoadingItem extends MGRecyclerViewHolder<WidgetChatInputCommandsAdapter, WidgetChatInputCommandsModel> {
-        public CommandLoadingItem(@LayoutRes int i, WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-            super(i, widgetChatInputCommandsAdapter);
-        }
-    }
-
-    public static class EmojiAutocompleteUpsellItem extends MGRecyclerViewHolder<WidgetChatInputCommandsAdapter, WidgetChatInputCommandsModel> {
-        public static final /* synthetic */ int a = 0;
-        private final TextView autocompleteText = ((TextView) this.itemView.findViewById(2131362461));
-        private final PileView emojiPreviewPile = ((PileView) this.itemView.findViewById(2131362460));
-
-        public EmojiAutocompleteUpsellItem(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-            super(2131558914, widgetChatInputCommandsAdapter);
-        }
-
-        public void onConfigure(int i, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            super.onConfigure(i, (int) widgetChatInputCommandsModel);
-            this.itemView.setOnClickListener(new f(this, widgetChatInputCommandsModel));
-            int parseInt = Integer.parseInt(widgetChatInputCommandsModel.getTag());
-            this.autocompleteText.setText(b.l(this.itemView.getResources().getString(2131886789), g.i, b.l(this.itemView.getResources().getQuantityString(2131755031, parseInt), i.i, Integer.valueOf(parseInt))));
-            ArrayList arrayList = new ArrayList();
-            for (Emoji emoji : widgetChatInputCommandsModel.getAdditionalEmoji()) {
-                arrayList.add(new h(this, emoji, widgetChatInputCommandsModel));
-            }
-            this.emojiPreviewPile.setItems(arrayList);
-        }
-    }
-
-    public static class Item extends MGRecyclerViewHolder<WidgetChatInputCommandsAdapter, WidgetChatInputCommandsModel> {
-        public static final /* synthetic */ int a = 0;
-        private ImageView itemAvatar = ((ImageView) this.itemView.findViewById(2131362467));
-        private TextView itemDescription = ((TextView) this.itemView.findViewById(2131362468));
-        private View itemDivider = this.itemView.findViewById(2131362469);
-        private SimpleDraweeSpanTextView itemEmoji = ((SimpleDraweeSpanTextView) this.itemView.findViewById(2131362470));
-        private TextView itemName = ((TextView) this.itemView.findViewById(2131362472));
-        private TextView itemNameRight = ((TextView) this.itemView.findViewById(2131362473));
-        @ColorInt
-        private final int itemNameTextColor = this.itemName.getCurrentTextColor();
-        private StatusView itemStatus = ((StatusView) this.itemView.findViewById(2131362474));
-
-        /* renamed from: com.discord.widgets.chat.input.WidgetChatInputCommandsAdapter$Item$1  reason: invalid class name */
-        public class AnonymousClass1 implements EmojiNode.RenderContext {
-            public final /* synthetic */ WidgetChatInputCommandsModel val$item;
-
-            public AnonymousClass1(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-                this.val$item = widgetChatInputCommandsModel;
-            }
-
-            @Override // com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
-            @NonNull
-            public Context getContext() {
-                return Item.access$000(Item.this).getContext();
-            }
-
-            @Override // com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
-            public boolean isAnimationEnabled() {
-                return this.val$item.isAllowEmojiToAnimate();
-            }
-
-            @Override // com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
-            public void onEmojiClicked(EmojiNode.EmojiIdAndType emojiIdAndType) {
-            }
-        }
-
-        public Item(@LayoutRes int i, WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-            super(i, widgetChatInputCommandsAdapter);
-        }
-
-        public static /* synthetic */ SimpleDraweeSpanTextView access$000(Item item) {
-            return item.itemEmoji;
-        }
-
-        /* JADX WARNING: Code restructure failed: missing block: B:13:0x0060, code lost:
-            if (r0 != 10) goto L_0x02c1;
-         */
-        /* JADX WARNING: Removed duplicated region for block: B:67:0x02cc  */
-        /* JADX WARNING: Removed duplicated region for block: B:73:? A[RETURN, SYNTHETIC] */
-        @SuppressLint({"SetTextI18n"})
-        public void onConfigure(int i, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            super.onConfigure(i, (int) widgetChatInputCommandsModel);
-            this.itemView.setOnClickListener(new j(this, widgetChatInputCommandsModel));
-            this.itemView.setEnabled(true);
-            this.itemView.setAlpha(1.0f);
-            this.itemDivider.setVisibility(0);
-            this.itemEmoji.setVisibility(8);
-            this.itemStatus.setVisibility(8);
-            this.itemAvatar.setVisibility(8);
-            this.itemDescription.setVisibility(8);
-            this.itemName.setTextColor(this.itemNameTextColor);
-            GuildMember guildMember = null;
-            this.itemNameRight.setText((CharSequence) null);
-            this.itemView.setContentDescription(null);
-            int type = widgetChatInputCommandsModel.getType();
-            if (!(type == 0 || type == 1)) {
-                if (type == 2) {
-                    String name = widgetChatInputCommandsModel.getChannel().getName();
-                    this.itemAvatar.setVisibility(0);
-                    int dpToPixels = DimenUtils.dpToPixels(6);
-                    this.itemAvatar.setPadding(dpToPixels, dpToPixels, dpToPixels, dpToPixels);
-                    if (widgetChatInputCommandsModel.getChannel().isVoice) {
-                        this.itemAvatar.setImageResource(2131231492);
-                    } else if (widgetChatInputCommandsModel.getChannel().guildTextyChannel) {
-                        this.itemAvatar.setImageResource(2131231483);
-                    } else {
-                        this.itemAvatar.setImageResource(2131231667);
-                    }
-                    ImageView imageView = this.itemAvatar;
-                    imageView.setColorFilter(ColorCompat.getColor(imageView, 2131100128), PorterDuff.Mode.SRC_ATOP);
-                    this.itemName.setText(name);
-                } else if (type == 3) {
-                    Emoji emoji = widgetChatInputCommandsModel.getEmoji();
-                    DraweeSpanStringBuilder render = AstRenderer.render(Collections.singleton(new EmojiNode(emoji.getFirstName(), new l(emoji), new EmojiNode.EmojiIdAndType.Unicode(emoji.getFirstName()))), new AnonymousClass1(widgetChatInputCommandsModel));
-                    this.itemName.setText(widgetChatInputCommandsModel.getTag());
-                    this.itemEmoji.setDraweeSpanStringBuilder(render);
-                    this.itemEmoji.setVisibility(0);
-                } else if (type == 4) {
-                    GuildRole role = widgetChatInputCommandsModel.getRole();
-                    TextView textView = this.itemName;
-                    textView.setTextColor(RoleUtils.getOpaqueColor(role, ColorCompat.getColor(textView, 2131100272)));
-                    this.itemName.setText(widgetChatInputCommandsModel.getTag());
-                    this.itemAvatar.setVisibility(0);
-                    IconUtils.setIcon(this.itemAvatar, "asset://asset/images/default_mention.jpg", 2131165295);
-                } else if (type == 5) {
-                    boolean z2 = WidgetChatInputCommandsAdapter.access$100((WidgetChatInputCommandsAdapter) this.adapter) == null || WidgetChatInputModelMappingFunctionsKt.hasPermission(widgetChatInputCommandsModel.getCommand(), WidgetChatInputCommandsAdapter.access$100((WidgetChatInputCommandsAdapter) this.adapter));
-                    this.itemName.setText(widgetChatInputCommandsModel.getTag());
-                    this.itemDescription.setVisibility(0);
-                    String description = widgetChatInputCommandsModel.getCommand().getDescription();
-                    Integer descriptionRes = widgetChatInputCommandsModel.getCommand().getDescriptionRes();
-                    if (description != null && !description.isEmpty()) {
-                        this.itemDescription.setText(description);
-                    } else if (descriptionRes != null) {
-                        this.itemDescription.setText(descriptionRes.intValue());
-                    }
-                    if (!WidgetChatInputCommandsAdapter.access$200((WidgetChatInputCommandsAdapter) this.adapter).booleanValue()) {
-                        this.itemAvatar.setVisibility(8);
-                        for (Integer num : WidgetChatInputCommandsAdapter.access$300((WidgetChatInputCommandsAdapter) this.adapter)) {
-                            int intValue = num.intValue();
-                            if (i == intValue - 1) {
-                                this.itemDivider.setVisibility(8);
-                                continue;
-                            }
-                            if (intValue > i) {
-                                break;
-                            }
-                        }
-                    } else {
-                        this.itemAvatar.setVisibility(0);
-                        if (widgetChatInputCommandsModel.getApplication() != null) {
-                            IconUtils.setApplicationIcon(this.itemAvatar, widgetChatInputCommandsModel.getApplication(), false);
-                        }
-                    }
-                    if (widgetChatInputCommandsModel.getApplication() != null) {
-                        this.itemNameRight.setVisibility(0);
-                        this.itemNameRight.setText(widgetChatInputCommandsModel.getApplication().getName().toUpperCase(Locale.getDefault()));
-                        Context context = this.itemView.getContext();
-                        k kVar = k.i;
-                        Object[] objArr = {widgetChatInputCommandsModel.getTag(), this.itemDescription.getText(), widgetChatInputCommandsModel.getApplication().getName()};
-                        Regex regex = b.a;
-                        m.checkNotNullParameter(context, "context");
-                        m.checkNotNullParameter(kVar, "initializer");
-                        m.checkNotNullParameter(objArr, "formatArgs");
-                        this.itemView.setContentDescription(b.a(context, 2131887426, Arrays.copyOf(objArr, 3), kVar));
-                    }
-                    if (!z2) {
-                        this.itemView.setEnabled(false);
-                        this.itemView.setAlpha(0.3f);
-                    }
-                } else if (type == 8) {
-                    this.itemName.setText(widgetChatInputCommandsModel.getTag());
-                }
-                if (i != ((WidgetChatInputCommandsAdapter) this.adapter).getItemCount() - 1) {
-                    this.itemDivider.setVisibility(8);
-                    return;
-                }
-                return;
-            }
-            this.itemName.setText(widgetChatInputCommandsModel.getNick() != null ? widgetChatInputCommandsModel.getNick() : widgetChatInputCommandsModel.getUser().getUsername());
-            TextView textView2 = this.itemNameRight;
-            textView2.setText(widgetChatInputCommandsModel.getUser().getUsername() + UserUtils.INSTANCE.getDiscriminatorWithPadding(widgetChatInputCommandsModel.getUser()));
-            this.itemAvatar.setVisibility(0);
-            if (GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled()) {
-                guildMember = widgetChatInputCommandsModel.getGuildMember();
-            }
-            IconUtils.setIcon(this.itemAvatar, widgetChatInputCommandsModel.getUser(), 2131165296, (Function1<? super ImageRequestBuilder, Unit>) null, MGImages.AlwaysUpdateChangeDetector.INSTANCE, guildMember);
-            if (widgetChatInputCommandsModel.getPresence() != null) {
-                this.itemStatus.setVisibility(0);
-                this.itemStatus.setPresence(widgetChatInputCommandsModel.getPresence());
-            }
-            if (i != ((WidgetChatInputCommandsAdapter) this.adapter).getItemCount() - 1) {
-            }
-        }
-    }
-
-    public WidgetChatInputCommandsAdapter(RecyclerView recyclerView, Action1<WidgetChatInputCommandsModel> action1) {
-        super(recyclerView, false);
-        this.onClickAction = action1;
-        setupScrollObservables();
-    }
-
-    public static /* synthetic */ UserAndSelectedGuildRoles access$100(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        return widgetChatInputCommandsAdapter.userAndSelectedGuildRoles;
-    }
-
-    public static /* synthetic */ Boolean access$200(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        return widgetChatInputCommandsAdapter.showAvatar;
-    }
-
-    public static /* synthetic */ List access$300(WidgetChatInputCommandsAdapter widgetChatInputCommandsAdapter) {
-        return widgetChatInputCommandsAdapter.headerIndices;
-    }
-
-    private int getDataHeight(List<WidgetChatInputCommandsModel> list) {
-        int i = 0;
-        int i2 = 0;
-        for (WidgetChatInputCommandsModel widgetChatInputCommandsModel : list) {
-            if (widgetChatInputCommandsModel.getType() == 7) {
-                i += 32;
-            } else if (widgetChatInputCommandsModel.getType() == 11) {
-                i += 52;
-            } else {
-                i2 += 44;
-            }
-        }
-        return i + i2;
-    }
-
-    private void setupScrollObservables() {
-        Observable n = Observable.n(new c.a.a0.b.a.b(this), Emitter.BackpressureMode.LATEST);
-        Observable.i0(new r(n.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS))).J(a.a()).W(new e(this));
-        if (this.onScrollListener != null) {
-            getRecycler().addOnScrollListener(this.onScrollListener);
-        }
-    }
-
-    public /* synthetic */ void a(RecyclerView recyclerView, View view, int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
-        this.stickyHeaderManager.layoutViews(recyclerView);
-    }
-
-    public /* synthetic */ void b(Emitter emitter) {
-        this.onScrollListener = new AnonymousClass1(emitter);
-    }
-
-    public /* synthetic */ void c(Object obj) {
-        if (this.onScrollPositionListener != null && (getRecycler().getLayoutManager() instanceof LinearLayoutManager)) {
-            LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getRecycler().getLayoutManager();
-            this.onScrollPositionListener.call(Integer.valueOf(linearLayoutManager.findFirstVisibleItemPosition()), Integer.valueOf(linearLayoutManager.findLastVisibleItemPosition()));
-        }
-    }
-
-    public StickyHeaderHolder createStickyHeaderViewHolder() {
-        return new CommandHeaderItem(2131558913, this);
-    }
-
-    @Override // com.discord.utilities.views.StickyHeaderItemDecoration.StickyHeaderAdapter
-    @Nullable
-    public View getAndBindHeaderView(int i) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = getInternalData().get(i);
-        if (widgetChatInputCommandsModel.getType() != 7) {
-            return null;
-        }
-        this.stickyHeaderManager.stickyHeaderHolder.bind(widgetChatInputCommandsModel);
-        return this.stickyHeaderManager.stickyHeaderHolder.getItemView();
-    }
-
-    @Override // com.discord.utilities.views.StickyHeaderItemDecoration.StickyHeaderAdapter
-    @Nullable
-    public Integer getHeaderPositionForItem(int i) {
-        for (int size = this.headerIndices.size() - 1; size >= 0; size--) {
-            int intValue = this.headerIndices.get(size).intValue();
-            if (intValue <= i) {
-                return Integer.valueOf(intValue);
-            }
-        }
-        return null;
-    }
-
-    @Override // com.discord.utilities.views.StickyHeaderItemDecoration.StickyHeaderAdapter
-    public boolean isHeader(int i) {
-        return this.headerIndices.contains(Integer.valueOf(i));
-    }
-
-    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
-    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-        super.onAttachedToRecyclerView(recyclerView);
-        this.stickyHeaderManager = new StickyHeaderManager(this);
-        recyclerView.addOnLayoutChangeListener(new c.a.a0.b.a.m(this, recyclerView));
-        StickyHeaderItemDecoration stickyHeaderItemDecoration = new StickyHeaderItemDecoration(this);
-        recyclerView.addItemDecoration(stickyHeaderItemDecoration);
-        stickyHeaderItemDecoration.blockClicks(recyclerView);
-    }
-
-    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
-    @NonNull
-    public MGRecyclerViewHolder<?, WidgetChatInputCommandsModel> onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        return i == 7 ? new CommandHeaderItem(2131558913, this) : i == 9 ? new CommandLoadingItem(2131558919, this) : i == 11 ? new EmojiAutocompleteUpsellItem(this) : new Item(2131558912, this);
-    }
-
-    public void scrollToPosition(int i) {
-        if (this.onScrollListener != null) {
-            getRecycler().removeOnScrollListener(this.onScrollListener);
-        }
-        if (getRecycler().getLayoutManager() instanceof LinearLayoutManager) {
-            ((LinearLayoutManager) getRecycler().getLayoutManager()).scrollToPositionWithOffset(i, 0);
-        }
-        if (this.onScrollListener != null) {
-            getRecycler().addOnScrollListener(this.onScrollListener);
-        }
-    }
-
-    public void setData(List<WidgetChatInputCommandsModel> list, Boolean bool, boolean z2, UserAndSelectedGuildRoles userAndSelectedGuildRoles) {
-        this.userAndSelectedGuildRoles = userAndSelectedGuildRoles;
-        getRecycler().getLayoutParams().height = DimenUtils.dpToPixels(Math.min(getDataHeight(list), z2 ? 132 : 176));
-        getRecycler().requestLayout();
-        this.showAvatar = bool;
-        ArrayList arrayList = new ArrayList();
-        for (int i = 0; i < list.size(); i++) {
-            if (list.get(i).getType() == 7) {
-                arrayList.add(Integer.valueOf(i));
-            }
-        }
-        this.headerIndices = arrayList;
-        super.setData(list);
-    }
-
-    public void setVisiblePositionListener(@Nullable Action2<Integer, Integer> action2) {
-        this.onScrollPositionListener = action2;
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.java
deleted file mode 100644
index 62afe0af69..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.java
+++ /dev/null
@@ -1,841 +0,0 @@
-package com.discord.widgets.chat.input;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Size;
-import c.a.a0.b.a.a0;
-import c.a.a0.b.a.b0;
-import c.a.a0.b.a.n;
-import c.a.a0.b.a.o;
-import c.a.a0.b.a.p;
-import c.a.a0.b.a.q;
-import c.a.a0.b.a.s;
-import c.a.a0.b.a.t;
-import c.a.a0.b.a.u;
-import c.a.a0.b.a.v;
-import c.a.a0.b.a.w;
-import c.a.a0.b.a.x;
-import c.a.a0.b.a.z;
-import c.d.b.a.a;
-import com.airbnb.lottie.parser.AnimatableValueParser;
-import com.discord.api.channel.ChannelRecipientNick;
-import com.discord.api.commands.ApplicationCommandType;
-import com.discord.api.commands.CommandChoice;
-import com.discord.api.role.GuildRole;
-import com.discord.models.commands.Application;
-import com.discord.models.commands.ApplicationCommand;
-import com.discord.models.commands.ApplicationCommandOption;
-import com.discord.models.domain.emoji.Emoji;
-import com.discord.models.domain.emoji.EmojiSet;
-import com.discord.models.member.GuildMember;
-import com.discord.models.presence.Presence;
-import com.discord.models.user.User;
-import com.discord.stores.StoreStream;
-import com.discord.utilities.collections.ShallowPartitionCollection;
-import com.discord.utilities.icon.IconUtils;
-import com.discord.utilities.permissions.PermissionUtils;
-import com.discord.utilities.rx.LeadingEdgeThrottle;
-import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.rx.ObservableWithLeadingEdgeThrottle;
-import com.discord.utilities.user.UserUtils;
-import com.discord.widgets.chat.MessageContent;
-import d0.z.d.m;
-import j0.l.a.r;
-import j0.l.e.j;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import rx.Observable;
-public class WidgetChatInputCommandsModel implements TagObject, Comparable<WidgetChatInputCommandsModel> {
-    public static final int EMOJI_PREVIEW_COUNT = 3;
-    private static final List<WidgetChatInputCommandsModel> EMPTY = new ArrayList();
-    private static final String MENTION_EVERYONE_COMMAND = "@everyone";
-    private static final String MENTION_HERE_COMMAND = "@here";
-    private static final int PARTITION_HUGE_GUILD_SIZE = 3000;
-    private static final int PARTITION_IDEAL_PARTITION_SIZE = 100;
-    public static final int TYPE_CHANNEL = 2;
-    public static final int TYPE_CUSTOM = 8;
-    public static final int TYPE_EMOJI = 3;
-    public static final int TYPE_EMOJI_AUTOCOMPLETE_UPSELL = 11;
-    public static final int TYPE_GUILD_USER = 10;
-    public static final int TYPE_MENTION = 4;
-    public static final int TYPE_SLASH = 5;
-    public static final int TYPE_SLASH_APPLICATION = 7;
-    public static final int TYPE_SLASH_BUILT_IN = 6;
-    public static final int TYPE_SLASH_LOADING = 9;
-    public static final int TYPE_USER = 0;
-    public static final int TYPE_USER_WITH_NICKNAME = 1;
-    private Collection<Emoji> additionalEmoji;
-    private boolean allowEmojiToAnimate;
-    private Application application;
-    private Channel channel;
-    private ApplicationCommand command;
-    private Emoji emoji;
-    @Nullable
-    private GuildMember guildMember;
-    private String icon;
-    private String nick;
-    private Presence presence;
-    private GuildRole role;
-    @Nullable
-    private WidgetChatInputSlashAction slashAction;
-    @Nullable
-    private String slashDisplay;
-    @Nullable
-    private String slashOutput;
-    private String tag;
-    private Pattern tagRegex;
-    private int type;
-    private User user;
-
-    public static class Channel {
-        public final boolean guildTextyChannel;
-
-        /* renamed from: id  reason: collision with root package name */
-        public final long f2131id;
-        public final boolean isVoice;
-        public final String name;
-
-        public Channel(long j, String str, boolean z2, boolean z3) {
-            this.f2131id = j;
-            this.name = str;
-            this.isVoice = z2;
-            this.guildTextyChannel = z3;
-        }
-
-        public Channel(com.discord.api.channel.Channel channel) {
-            this(channel.g(), AnimatableValueParser.y0(channel), AnimatableValueParser.z1(channel), AnimatableValueParser.j1(channel));
-        }
-
-        public boolean canEqual(Object obj) {
-            return obj instanceof Channel;
-        }
-
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-            if (!(obj instanceof Channel)) {
-                return false;
-            }
-            Channel channel = (Channel) obj;
-            if (!channel.canEqual(this) || getId() != channel.getId() || isVoice() != channel.isVoice() || isGuildTextyChannel() != channel.isGuildTextyChannel()) {
-                return false;
-            }
-            String name = getName();
-            String name2 = channel.getName();
-            return name != null ? name.equals(name2) : name2 == null;
-        }
-
-        public long getId() {
-            return this.f2131id;
-        }
-
-        public String getName() {
-            return this.name;
-        }
-
-        public int hashCode() {
-            long id2 = getId();
-            int i = 79;
-            int i2 = (((((int) (id2 ^ (id2 >>> 32))) + 59) * 59) + (isVoice() ? 79 : 97)) * 59;
-            if (!isGuildTextyChannel()) {
-                i = 97;
-            }
-            String name = getName();
-            return ((i2 + i) * 59) + (name == null ? 43 : name.hashCode());
-        }
-
-        public boolean isGuildTextyChannel() {
-            return this.guildTextyChannel;
-        }
-
-        public boolean isVoice() {
-            return this.isVoice;
-        }
-
-        public String toString() {
-            StringBuilder L = a.L("WidgetChatInputCommandsModel.Channel(id=");
-            L.append(getId());
-            L.append(", name=");
-            L.append(getName());
-            L.append(", isVoice=");
-            L.append(isVoice());
-            L.append(", guildTextyChannel=");
-            L.append(isGuildTextyChannel());
-            L.append(")");
-            return L.toString();
-        }
-    }
-
-    private int compareSlashCommand(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        Application application = this.application;
-        if (application == null || widgetChatInputCommandsModel.application == null) {
-            return this.tag.compareTo(widgetChatInputCommandsModel.tag);
-        }
-        int i = (application.getBuiltIn() ? 1 : 0) - (widgetChatInputCommandsModel.application.getBuiltIn() ? 1 : 0);
-        if (i != 0) {
-            return i;
-        }
-        int compareTo = this.application.getName().compareTo(widgetChatInputCommandsModel.application.getName());
-        return compareTo != 0 ? compareTo : this.tag.compareTo(widgetChatInputCommandsModel.tag);
-    }
-
-    private static Collection<WidgetChatInputCommandsModel> createBuiltInSlashCommands() {
-        u uVar = u.a;
-        ArrayList arrayList = new ArrayList();
-        arrayList.add(createSlashCommand("shrug", "¯\\\\_(ツ)\\_/¯", "¯\\_(ツ)_/¯", uVar));
-        arrayList.add(createSlashCommand("tableflip", "(╯°□°）╯︵ ┻━┻", null, uVar));
-        arrayList.add(createSlashCommand("unflip", "┬─┬ ノ( ゜-゜ノ)", null, uVar));
-        return arrayList;
-    }
-
-    private static WidgetChatInputCommandsModel createChannel(Context context, com.discord.api.channel.Channel channel) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 2;
-        StringBuilder J = a.J('#');
-        J.append(AnimatableValueParser.z0(channel, context, false));
-        widgetChatInputCommandsModel.tag = J.toString();
-        widgetChatInputCommandsModel.channel = new Channel(channel);
-        return widgetChatInputCommandsModel;
-    }
-
-    private static Observable<List<WidgetChatInputCommandsModel>> createChannelCommands(Context context, long j) {
-        return ObservableWithLeadingEdgeThrottle.combineLatest(StoreStream.getChannels().observeChannelsForGuild(j), StoreStream.getPermissions().observePermissionsForAllChannels(), new v(context), 500, TimeUnit.MILLISECONDS);
-    }
-
-    public static Collection<WidgetChatInputCommandsModel> createCommandsForEmoji(EmojiSet emojiSet, boolean z2) {
-        ArrayList arrayList = new ArrayList();
-        for (List<Emoji> list : emojiSet.unicodeEmojis.values()) {
-            for (Emoji emoji : list) {
-                for (String str : emoji.getNames()) {
-                    arrayList.add(createEmoji(emoji, str, z2));
-                }
-            }
-        }
-        for (List<Emoji> list2 : emojiSet.customEmojis.values()) {
-            for (Emoji emoji2 : list2) {
-                if (emoji2.isAvailable()) {
-                    arrayList.add(createEmoji(emoji2, emoji2.getFirstName(), z2));
-                }
-            }
-        }
-        return arrayList;
-    }
-
-    private static Collection<WidgetChatInputCommandsModel> createCommandsForMentions(com.discord.api.channel.Channel channel, com.discord.api.channel.Channel channel2, long j, long j2, Map<Long, GuildRole> map, Map<Long, GuildMember> map2, Map<Long, User> map3, Map<Long, Presence> map4, Long l) {
-        Collection<WidgetChatInputCommandsModel> collection;
-        GuildMember guildMember;
-        if (map2.size() > 3000) {
-            int size = map2.size() / 100;
-            collection = ShallowPartitionCollection.withArrayListParitions(size, new n(size));
-        } else {
-            collection = new ArrayList<>(map2.size());
-        }
-        boolean canEveryone = PermissionUtils.canEveryone(1024, channel, channel2, map);
-        for (Map.Entry<Long, GuildMember> entry : map2.entrySet()) {
-            long longValue = entry.getKey().longValue();
-            GuildMember value = entry.getValue();
-            if (canEveryone) {
-                guildMember = value;
-            } else if (!PermissionUtils.can(1024, Long.valueOf(PermissionUtils.computePermissions(longValue, channel, channel2, j2, value, map, null, true)))) {
-                User user = map3.get(entry.getKey());
-                if (user != null) {
-                    String nick = value != null ? value.getNick() : null;
-                    if (!(value == null || value.getPending() || value.getJoinedAt() == null)) {
-                        collection.add(createUserMention(user, nick, map4.get(Long.valueOf(longValue)), 10, value));
-                    }
-                }
-            } else {
-                guildMember = value;
-            }
-            User user2 = map3.get(entry.getKey());
-            if (user2 != null) {
-                collection.add(createUserMention(user2, guildMember != null ? guildMember.getNick() : null, map4.get(Long.valueOf(longValue)), guildMember));
-            }
-        }
-        boolean z2 = false;
-        if (map2.get(Long.valueOf(j)) != null && (z2 = PermissionUtils.can(131072, l))) {
-            collection.add(createRoleMention("@here", null));
-            collection.add(createRoleMention("@everyone", null));
-        }
-        for (GuildRole guildRole : map.values()) {
-            if (guildRole.e() || z2) {
-                if (guildRole.getId() != channel.e()) {
-                    StringBuilder J = a.J('@');
-                    J.append(guildRole.f());
-                    collection.add(createRoleMention(J.toString(), guildRole));
-                }
-            }
-        }
-        return collection;
-    }
-
-    private static Collection<WidgetChatInputCommandsModel> createCommandsForMentions(Map<Long, User> map, Map<Long, Presence> map2, @Nullable List<ChannelRecipientNick> list) {
-        ChannelRecipientNick channelRecipientNick;
-        ArrayList arrayList = new ArrayList();
-        for (User user : map.values()) {
-            if (list != null) {
-                channelRecipientNick = null;
-                for (int i = 0; i < list.size(); i++) {
-                    if (list.get(i).a() == user.getId()) {
-                        channelRecipientNick = list.get(i);
-                    }
-                }
-            } else {
-                channelRecipientNick = null;
-            }
-            arrayList.add(createUserMention(user, channelRecipientNick != null ? channelRecipientNick.b() : null, (Presence) a.e(user, map2), null));
-        }
-        arrayList.add(createRoleMention("@here", null));
-        arrayList.add(createRoleMention("@everyone", null));
-        return arrayList;
-    }
-
-    private static Collection<WidgetChatInputCommandsModel> createCommandsForSlash(List<Application> list, List<ApplicationCommand> list2) {
-        ArrayList arrayList = new ArrayList();
-        HashMap hashMap = new HashMap();
-        for (Application application : list) {
-            hashMap.put(Long.valueOf(application.getId()), application);
-        }
-        for (ApplicationCommand applicationCommand : list2) {
-            arrayList.add(createSlashCommand((Application) hashMap.get(Long.valueOf(applicationCommand.getApplicationId())), applicationCommand));
-        }
-        return arrayList;
-    }
-
-    private static WidgetChatInputCommandsModel createEmoji(Emoji emoji, String str, boolean z2) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 3;
-        widgetChatInputCommandsModel.tag = emoji.getCommand(str);
-        widgetChatInputCommandsModel.tagRegex = emoji.getRegex(str);
-        widgetChatInputCommandsModel.emoji = emoji;
-        widgetChatInputCommandsModel.allowEmojiToAnimate = z2;
-        return widgetChatInputCommandsModel;
-    }
-
-    public static WidgetChatInputCommandsModel createEmojiAutocompleteUpsell(int i, @Size(max = 3) Collection<Emoji> collection, boolean z2) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 11;
-        widgetChatInputCommandsModel.tag = String.valueOf(i);
-        widgetChatInputCommandsModel.allowEmojiToAnimate = z2;
-        widgetChatInputCommandsModel.additionalEmoji = collection;
-        return widgetChatInputCommandsModel;
-    }
-
-    private static Observable<Collection<WidgetChatInputCommandsModel>> createEmojiCommands(long j, long j2, boolean z2, boolean z3) {
-        return StoreStream.getEmojis().getEmojiSet(j, j2, z2, false).G(new t(z3)).s();
-    }
-
-    public static List<WidgetChatInputCommandsModel> createFromCommandOption(ApplicationCommandOption applicationCommandOption) {
-        ArrayList arrayList = new ArrayList();
-        if (applicationCommandOption.getType() == ApplicationCommandType.BOOLEAN) {
-            WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-            widgetChatInputCommandsModel.type = 8;
-            widgetChatInputCommandsModel.tag = "true";
-            arrayList.add(widgetChatInputCommandsModel);
-            WidgetChatInputCommandsModel widgetChatInputCommandsModel2 = new WidgetChatInputCommandsModel();
-            widgetChatInputCommandsModel2.type = 8;
-            widgetChatInputCommandsModel2.tag = "false";
-            arrayList.add(widgetChatInputCommandsModel2);
-        } else if (applicationCommandOption.getChoices() != null && applicationCommandOption.getChoices().size() > 0) {
-            for (CommandChoice commandChoice : applicationCommandOption.getChoices()) {
-                WidgetChatInputCommandsModel widgetChatInputCommandsModel3 = new WidgetChatInputCommandsModel();
-                widgetChatInputCommandsModel3.type = 8;
-                widgetChatInputCommandsModel3.tag = commandChoice.a();
-                arrayList.add(widgetChatInputCommandsModel3);
-            }
-        }
-        return arrayList;
-    }
-
-    private static Observable<Collection<WidgetChatInputCommandsModel>> createMentionCommands(com.discord.api.channel.Channel channel) {
-        int z2 = channel.z();
-        if (z2 != 0) {
-            if (z2 == 1 || z2 == 3) {
-                return Observable.B(AnimatableValueParser.G0(channel)).G(b0.i).g0().Z(new z(channel)).s();
-            }
-            if (z2 != 5) {
-                switch (z2) {
-                    case 10:
-                    case 11:
-                    case 12:
-                        break;
-                    default:
-                        return new j(EMPTY);
-                }
-            }
-        }
-        Observable<Long> observeMeId = StoreStream.getUsers().observeMeId();
-        Observable s2 = StoreStream.getGuilds().observeGuild(channel.e()).y(q.i).G(c.a.a0.b.a.a.i).s();
-        Observable<Map<Long, GuildRole>> observeRoles = StoreStream.getGuilds().observeRoles(channel.e());
-        Observable<Map<Long, GuildMember>> observeComputed = StoreStream.getGuilds().observeComputed(channel.e());
-        TimeUnit timeUnit = TimeUnit.SECONDS;
-        Observable i02 = Observable.i0(new r(observeComputed.i, new LeadingEdgeThrottle(5, timeUnit)));
-        Observable<Map<Long, User>> observeAllUsers = StoreStream.getUsers().observeAllUsers();
-        Observable<Map<Long, Presence>> observeAllPresences = StoreStream.getPresences().observeAllPresences();
-        return Observable.d(observeMeId, s2, observeRoles, i02, observeAllUsers, Observable.i0(new r(observeAllPresences.i, new LeadingEdgeThrottle(10, timeUnit))), StoreStream.getPermissions().observePermissionsForChannel(channel.g()).s(), StoreStream.getChannels().observeChannel(channel.q()).s(), new c.a.a0.b.a.r(channel)).s();
-    }
-
-    private static WidgetChatInputCommandsModel createRoleMention(String str, GuildRole guildRole) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 4;
-        widgetChatInputCommandsModel.tag = str;
-        widgetChatInputCommandsModel.role = guildRole;
-        return widgetChatInputCommandsModel;
-    }
-
-    public static WidgetChatInputCommandsModel createSlashCommand(@Nullable Application application, ApplicationCommand applicationCommand) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 5;
-        StringBuilder J = a.J('/');
-        J.append(applicationCommand.getName());
-        widgetChatInputCommandsModel.tag = J.toString();
-        StringBuilder J2 = a.J('/');
-        J2.append(applicationCommand.getName());
-        widgetChatInputCommandsModel.tagRegex = Pattern.compile(J2.toString());
-        widgetChatInputCommandsModel.application = application;
-        widgetChatInputCommandsModel.command = applicationCommand;
-        if (!(application == null || application.getIcon() == null)) {
-            widgetChatInputCommandsModel.icon = IconUtils.getApplicationIcon(application.getId(), application.getIcon(), 160);
-        }
-        return widgetChatInputCommandsModel;
-    }
-
-    private static WidgetChatInputCommandsModel createSlashCommand(String str, String str2, @Nullable String str3, WidgetChatInputSlashAction widgetChatInputSlashAction) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.tag = '/' + str;
-        widgetChatInputCommandsModel.tagRegex = Pattern.compile('/' + str);
-        widgetChatInputCommandsModel.slashOutput = str2;
-        if (str3 != null) {
-            str2 = str3;
-        }
-        widgetChatInputCommandsModel.slashDisplay = str2;
-        widgetChatInputCommandsModel.slashAction = widgetChatInputSlashAction;
-        widgetChatInputCommandsModel.type = 5;
-        return widgetChatInputCommandsModel;
-    }
-
-    public static WidgetChatInputCommandsModel createSlashCommandApplication(@Nullable Application application) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 7;
-        widgetChatInputCommandsModel.application = application;
-        widgetChatInputCommandsModel.tag = "/";
-        return widgetChatInputCommandsModel;
-    }
-
-    public static WidgetChatInputCommandsModel createSlashCommandPlaceholder(@Nullable Application application, String str) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = 9;
-        widgetChatInputCommandsModel.application = application;
-        widgetChatInputCommandsModel.tag = str;
-        return widgetChatInputCommandsModel;
-    }
-
-    private static Observable<Collection<WidgetChatInputCommandsModel>> createSlashCommands(Long l) {
-        Observable j = Observable.j(StoreStream.getApplicationCommands().observeGuildApplications(l.longValue()), StoreStream.getApplicationCommands().observeQueryCommands(l.longValue()), s.i);
-        m.checkNotNullExpressionValue(j, "observable");
-        return ObservableExtensionsKt.computationLatest(j).s();
-    }
-
-    private static WidgetChatInputCommandsModel createUserMention(User user, String str, Presence presence, int i, @Nullable GuildMember guildMember) {
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = new WidgetChatInputCommandsModel();
-        widgetChatInputCommandsModel.type = i;
-        widgetChatInputCommandsModel.user = user;
-        widgetChatInputCommandsModel.nick = str;
-        widgetChatInputCommandsModel.guildMember = guildMember;
-        widgetChatInputCommandsModel.presence = presence;
-        StringBuilder J = a.J('@');
-        J.append(user.getUsername());
-        J.append(UserUtils.INSTANCE.getDiscriminatorWithPadding(user));
-        String sb = J.toString();
-        if (str == null) {
-            widgetChatInputCommandsModel.tag = sb;
-        } else {
-            widgetChatInputCommandsModel.tag = sb + '\n' + str;
-        }
-        return widgetChatInputCommandsModel;
-    }
-
-    private static WidgetChatInputCommandsModel createUserMention(User user, String str, Presence presence, @Nullable GuildMember guildMember) {
-        return createUserMention(user, str, presence, str != null ? 1 : 0, guildMember);
-    }
-
-    public static Observable<Collection<WidgetChatInputCommandsModel>> get(Context context, boolean z2, boolean z3) {
-        return StoreStream.getChannelsSelected().observeSelectedChannel().y(a0.i).Z(new o(context, z2, z3));
-    }
-
-    public static Observable<WidgetChatInputDiscoveryCommandsModel> getDiscoveryCommands(Boolean bool, Integer num, Long l) {
-        return Observable.j(StoreStream.getApplicationCommands().observeGuildApplications(l.longValue()), StoreStream.getApplicationCommands().observeDiscoverCommands(l.longValue()), new p(bool, num));
-    }
-
-    public static /* synthetic */ String lambda$createBuiltInSlashCommands$13(String str, WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        String replaceAll = str.replaceAll(widgetChatInputCommandsModel.tag, "");
-        return replaceAll + ' ' + widgetChatInputCommandsModel.slashOutput;
-    }
-
-    public static /* synthetic */ List lambda$createChannelCommands$9(Context context, Map map, Map map2) {
-        ArrayList arrayList = new ArrayList();
-        for (com.discord.api.channel.Channel channel : map.values()) {
-            if (AnimatableValueParser.j1(channel) || AnimatableValueParser.z1(channel) || AnimatableValueParser.f1(channel)) {
-                if (PermissionUtils.hasAccess(channel, map2)) {
-                    arrayList.add(createChannel(context, channel));
-                }
-            }
-        }
-        return arrayList;
-    }
-
-    public static /* synthetic */ Collection lambda$createMentionCommands$6(com.discord.api.channel.Channel channel, Long l, Long l2, Map map, Map map2, Map map3, Map map4, Long l3, com.discord.api.channel.Channel channel2) {
-        return createCommandsForMentions(channel, channel2, l.longValue(), l2.longValue(), map, map2, map3, map4, l3);
-    }
-
-    public static /* synthetic */ Collection lambda$createSlashCommands$11(List list, List list2) {
-        return !list2.isEmpty() ? createCommandsForSlash(list, list2) : new ArrayList();
-    }
-
-    public static /* synthetic */ Observable lambda$get$2(Context context, boolean z2, boolean z3, com.discord.api.channel.Channel channel) {
-        return Observable.h(createMentionCommands(channel), createChannelCommands(context, channel.e()), createEmojiCommands(channel.e(), channel.g(), z2, z3), createSlashCommands(Long.valueOf(channel.g())), x.a);
-    }
-
-    public static /* synthetic */ Collection lambda$null$7(com.discord.api.channel.Channel channel, Map map, Map map2) {
-        return createCommandsForMentions(map, map2, channel.m());
-    }
-
-    public static /* synthetic */ int lambda$replaceMatches$4(WidgetChatInputCommandsModel widgetChatInputCommandsModel, WidgetChatInputCommandsModel widgetChatInputCommandsModel2) {
-        int i = widgetChatInputCommandsModel.type - widgetChatInputCommandsModel2.type;
-        return i != 0 ? i : widgetChatInputCommandsModel2.tag.length() - widgetChatInputCommandsModel.tag.length();
-    }
-
-    public static MessageContent replaceMatches(String str, List<WidgetChatInputCommandsModel> list) {
-        WidgetChatInputSlashAction widgetChatInputSlashAction;
-        Collections.sort(list, w.i);
-        ArrayList arrayList = new ArrayList();
-        for (WidgetChatInputCommandsModel widgetChatInputCommandsModel : list) {
-            String quote = Pattern.quote(widgetChatInputCommandsModel.getDisplayTag());
-            if (widgetChatInputCommandsModel.emoji != null) {
-                Matcher matcher = widgetChatInputCommandsModel.tagRegex.matcher(str);
-                StringBuffer stringBuffer = new StringBuffer(str.length());
-                while (matcher.find()) {
-                    StringBuilder sb = new StringBuilder();
-                    int i = 1;
-                    if (matcher.group(1) == null) {
-                        i = 2;
-                    }
-                    sb.append(matcher.group(i));
-                    sb.append(widgetChatInputCommandsModel.emoji.getMessageContentReplacement());
-                    matcher.appendReplacement(stringBuffer, sb.toString());
-                }
-                str = matcher.appendTail(stringBuffer).toString();
-            } else if (widgetChatInputCommandsModel.channel != null) {
-                StringBuilder L = a.L("<#");
-                L.append(widgetChatInputCommandsModel.channel.getId());
-                L.append('>');
-                str = str.replaceAll(quote, L.toString());
-            } else if (widgetChatInputCommandsModel.user != null) {
-                StringBuilder L2 = a.L("<@");
-                L2.append(widgetChatInputCommandsModel.user.getId());
-                L2.append('>');
-                str = str.replaceAll(quote, L2.toString());
-                arrayList.add(widgetChatInputCommandsModel.user);
-            } else if (widgetChatInputCommandsModel.role != null) {
-                StringBuilder L3 = a.L("<@&");
-                L3.append(widgetChatInputCommandsModel.role.getId());
-                L3.append('>');
-                str = str.replaceAll(quote, L3.toString());
-            } else if (!(widgetChatInputCommandsModel.slashOutput == null || str.trim().charAt(0) != '/' || (widgetChatInputSlashAction = widgetChatInputCommandsModel.slashAction) == null)) {
-                str = widgetChatInputSlashAction.call(str, widgetChatInputCommandsModel);
-            }
-        }
-        return new MessageContent(str, arrayList);
-    }
-
-    public boolean canEqual(Object obj) {
-        return obj instanceof WidgetChatInputCommandsModel;
-    }
-
-    public int compareTo(@NonNull WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-        if (isSlashCommand() && widgetChatInputCommandsModel.isSlashCommand()) {
-            return compareSlashCommand(widgetChatInputCommandsModel);
-        }
-        int i = this.type - widgetChatInputCommandsModel.type;
-        return i != 0 ? i : this.tag.compareTo(widgetChatInputCommandsModel.tag);
-    }
-
-    @Override // java.lang.Object
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        }
-        if (!(obj instanceof WidgetChatInputCommandsModel)) {
-            return false;
-        }
-        WidgetChatInputCommandsModel widgetChatInputCommandsModel = (WidgetChatInputCommandsModel) obj;
-        if (!widgetChatInputCommandsModel.canEqual(this) || getType() != widgetChatInputCommandsModel.getType() || isAllowEmojiToAnimate() != widgetChatInputCommandsModel.isAllowEmojiToAnimate()) {
-            return false;
-        }
-        User user = getUser();
-        User user2 = widgetChatInputCommandsModel.getUser();
-        if (user != null ? !user.equals(user2) : user2 != null) {
-            return false;
-        }
-        Presence presence = getPresence();
-        Presence presence2 = widgetChatInputCommandsModel.getPresence();
-        if (presence != null ? !presence.equals(presence2) : presence2 != null) {
-            return false;
-        }
-        Channel channel = getChannel();
-        Channel channel2 = widgetChatInputCommandsModel.getChannel();
-        if (channel != null ? !channel.equals(channel2) : channel2 != null) {
-            return false;
-        }
-        GuildRole role = getRole();
-        GuildRole role2 = widgetChatInputCommandsModel.getRole();
-        if (role != null ? !role.equals(role2) : role2 != null) {
-            return false;
-        }
-        Application application = getApplication();
-        Application application2 = widgetChatInputCommandsModel.getApplication();
-        if (application != null ? !application.equals(application2) : application2 != null) {
-            return false;
-        }
-        ApplicationCommand command = getCommand();
-        ApplicationCommand command2 = widgetChatInputCommandsModel.getCommand();
-        if (command != null ? !command.equals(command2) : command2 != null) {
-            return false;
-        }
-        Emoji emoji = getEmoji();
-        Emoji emoji2 = widgetChatInputCommandsModel.getEmoji();
-        if (emoji != null ? !emoji.equals(emoji2) : emoji2 != null) {
-            return false;
-        }
-        String nick = getNick();
-        String nick2 = widgetChatInputCommandsModel.getNick();
-        if (nick != null ? !nick.equals(nick2) : nick2 != null) {
-            return false;
-        }
-        GuildMember guildMember = getGuildMember();
-        GuildMember guildMember2 = widgetChatInputCommandsModel.getGuildMember();
-        if (guildMember != null ? !guildMember.equals(guildMember2) : guildMember2 != null) {
-            return false;
-        }
-        String slashOutput = getSlashOutput();
-        String slashOutput2 = widgetChatInputCommandsModel.getSlashOutput();
-        if (slashOutput != null ? !slashOutput.equals(slashOutput2) : slashOutput2 != null) {
-            return false;
-        }
-        String slashDisplay = getSlashDisplay();
-        String slashDisplay2 = widgetChatInputCommandsModel.getSlashDisplay();
-        if (slashDisplay != null ? !slashDisplay.equals(slashDisplay2) : slashDisplay2 != null) {
-            return false;
-        }
-        WidgetChatInputSlashAction slashAction = getSlashAction();
-        WidgetChatInputSlashAction slashAction2 = widgetChatInputCommandsModel.getSlashAction();
-        if (slashAction != null ? !slashAction.equals(slashAction2) : slashAction2 != null) {
-            return false;
-        }
-        String tag = getTag();
-        String tag2 = widgetChatInputCommandsModel.getTag();
-        if (tag != null ? !tag.equals(tag2) : tag2 != null) {
-            return false;
-        }
-        Pattern tagRegex = getTagRegex();
-        Pattern tagRegex2 = widgetChatInputCommandsModel.getTagRegex();
-        if (tagRegex != null ? !tagRegex.equals(tagRegex2) : tagRegex2 != null) {
-            return false;
-        }
-        String icon = getIcon();
-        String icon2 = widgetChatInputCommandsModel.getIcon();
-        if (icon != null ? !icon.equals(icon2) : icon2 != null) {
-            return false;
-        }
-        Collection<Emoji> additionalEmoji = getAdditionalEmoji();
-        Collection<Emoji> additionalEmoji2 = widgetChatInputCommandsModel.getAdditionalEmoji();
-        return additionalEmoji != null ? additionalEmoji.equals(additionalEmoji2) : additionalEmoji2 == null;
-    }
-
-    public Collection<Emoji> getAdditionalEmoji() {
-        return this.additionalEmoji;
-    }
-
-    public Application getApplication() {
-        return this.application;
-    }
-
-    public Channel getChannel() {
-        return this.channel;
-    }
-
-    public ApplicationCommand getCommand() {
-        return this.command;
-    }
-
-    @Override // com.discord.widgets.chat.input.TagObject
-    public String getDisplayTag() {
-        return getNick() != null ? this.tag.split("\n")[0] : this.tag;
-    }
-
-    public Emoji getEmoji() {
-        return this.emoji;
-    }
-
-    @Nullable
-    public GuildMember getGuildMember() {
-        return this.guildMember;
-    }
-
-    public String getIcon() {
-        return this.icon;
-    }
-
-    @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
-    public String getKey() {
-        return this.type + this.tag;
-    }
-
-    public String getNick() {
-        return this.nick;
-    }
-
-    public Presence getPresence() {
-        return this.presence;
-    }
-
-    public GuildRole getRole() {
-        return this.role;
-    }
-
-    @Nullable
-    public WidgetChatInputSlashAction getSlashAction() {
-        return this.slashAction;
-    }
-
-    @Nullable
-    public String getSlashDisplay() {
-        return this.slashDisplay;
-    }
-
-    @Nullable
-    public String getSlashOutput() {
-        return this.slashOutput;
-    }
-
-    @Override // com.discord.widgets.chat.input.TagObject
-    public String getTag() {
-        return this.tag;
-    }
-
-    @Override // com.discord.widgets.chat.input.TagObject
-    public Pattern getTagRegex() {
-        return this.tagRegex;
-    }
-
-    @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload
-    public int getType() {
-        return this.type;
-    }
-
-    public User getUser() {
-        return this.user;
-    }
-
-    @Override // java.lang.Object
-    public int hashCode() {
-        int type = ((getType() + 59) * 59) + (isAllowEmojiToAnimate() ? 79 : 97);
-        User user = getUser();
-        int i = 43;
-        int hashCode = (type * 59) + (user == null ? 43 : user.hashCode());
-        Presence presence = getPresence();
-        int hashCode2 = (hashCode * 59) + (presence == null ? 43 : presence.hashCode());
-        Channel channel = getChannel();
-        int hashCode3 = (hashCode2 * 59) + (channel == null ? 43 : channel.hashCode());
-        GuildRole role = getRole();
-        int hashCode4 = (hashCode3 * 59) + (role == null ? 43 : role.hashCode());
-        Application application = getApplication();
-        int hashCode5 = (hashCode4 * 59) + (application == null ? 43 : application.hashCode());
-        ApplicationCommand command = getCommand();
-        int hashCode6 = (hashCode5 * 59) + (command == null ? 43 : command.hashCode());
-        Emoji emoji = getEmoji();
-        int hashCode7 = (hashCode6 * 59) + (emoji == null ? 43 : emoji.hashCode());
-        String nick = getNick();
-        int hashCode8 = (hashCode7 * 59) + (nick == null ? 43 : nick.hashCode());
-        GuildMember guildMember = getGuildMember();
-        int hashCode9 = (hashCode8 * 59) + (guildMember == null ? 43 : guildMember.hashCode());
-        String slashOutput = getSlashOutput();
-        int hashCode10 = (hashCode9 * 59) + (slashOutput == null ? 43 : slashOutput.hashCode());
-        String slashDisplay = getSlashDisplay();
-        int hashCode11 = (hashCode10 * 59) + (slashDisplay == null ? 43 : slashDisplay.hashCode());
-        WidgetChatInputSlashAction slashAction = getSlashAction();
-        int hashCode12 = (hashCode11 * 59) + (slashAction == null ? 43 : slashAction.hashCode());
-        String tag = getTag();
-        int hashCode13 = (hashCode12 * 59) + (tag == null ? 43 : tag.hashCode());
-        Pattern tagRegex = getTagRegex();
-        int hashCode14 = (hashCode13 * 59) + (tagRegex == null ? 43 : tagRegex.hashCode());
-        String icon = getIcon();
-        int hashCode15 = (hashCode14 * 59) + (icon == null ? 43 : icon.hashCode());
-        Collection<Emoji> additionalEmoji = getAdditionalEmoji();
-        int i2 = hashCode15 * 59;
-        if (additionalEmoji != null) {
-            i = additionalEmoji.hashCode();
-        }
-        return i2 + i;
-    }
-
-    public boolean isAllowEmojiToAnimate() {
-        return this.allowEmojiToAnimate;
-    }
-
-    public boolean isSlashCommand() {
-        int i = this.type;
-        return i == 5 || i == 6 || i == 7;
-    }
-
-    @Override // java.lang.Object
-    public String toString() {
-        StringBuilder L = a.L("WidgetChatInputCommandsModel(user=");
-        L.append(getUser());
-        L.append(", presence=");
-        L.append(getPresence());
-        L.append(", channel=");
-        L.append(getChannel());
-        L.append(", role=");
-        L.append(getRole());
-        L.append(", application=");
-        L.append(getApplication());
-        L.append(", command=");
-        L.append(getCommand());
-        L.append(", emoji=");
-        L.append(getEmoji());
-        L.append(", nick=");
-        L.append(getNick());
-        L.append(", guildMember=");
-        L.append(getGuildMember());
-        L.append(", slashOutput=");
-        L.append(getSlashOutput());
-        L.append(", slashDisplay=");
-        L.append(getSlashDisplay());
-        L.append(", slashAction=");
-        L.append(getSlashAction());
-        L.append(", tag=");
-        L.append(getTag());
-        L.append(", tagRegex=");
-        L.append(getTagRegex());
-        L.append(", icon=");
-        L.append(getIcon());
-        L.append(", type=");
-        L.append(getType());
-        L.append(", allowEmojiToAnimate=");
-        L.append(isAllowEmojiToAnimate());
-        L.append(", additionalEmoji=");
-        L.append(getAdditionalEmoji());
-        L.append(")");
-        return L.toString();
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputDiscoveryCommandsModel.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputDiscoveryCommandsModel.java
index aec264def8..736f631081 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputDiscoveryCommandsModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputDiscoveryCommandsModel.java
@@ -5,6 +5,10 @@ import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ModelApplicationComparator;
 import com.discord.stores.DiscoverCommands;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandLoadingPlaceholder;
+import com.discord.widgets.chat.input.autocomplete.ApplicationPlaceholder;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import d0.t.u;
 import d0.z.d.m;
 import java.util.ArrayList;
@@ -17,7 +21,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: WidgetChatInputDiscoveryCommandsModel.kt */
 public final class WidgetChatInputDiscoveryCommandsModel {
     public static final Companion Companion = new Companion(null);
-    private final List<Pair<Application, List<WidgetChatInputCommandsModel>>> commandsByApplication;
+    private final List<Pair<Application, List<Autocompletable>>> commandsByApplication;
     private final boolean hasMoreAfter;
     private final boolean hasMoreBefore;
     private final Long jumpedApplicationId;
@@ -32,10 +36,10 @@ public final class WidgetChatInputDiscoveryCommandsModel {
             this();
         }
 
-        private final List<WidgetChatInputCommandsModel> createPlaceholderModels(int i, boolean z2, Application application) {
+        private final List<Autocompletable> createPlaceholderModels(int i, boolean z2, Application application) {
             ArrayList arrayList = new ArrayList();
             for (int i2 = 0; i2 < i; i2++) {
-                arrayList.add(i2, WidgetChatInputCommandsModel.createSlashCommandPlaceholder(application, getPlaceholderTag(z2, application.getId(), i2)));
+                arrayList.add(i2, new ApplicationCommandLoadingPlaceholder(application));
             }
             return arrayList;
         }
@@ -59,17 +63,15 @@ public final class WidgetChatInputDiscoveryCommandsModel {
                 if (application2 != null) {
                     m.checkNotNullExpressionValue(application2, "appMap[appId] ?: continue");
                     treeSet.add(application2);
-                    WidgetChatInputCommandsModel createSlashCommand = WidgetChatInputCommandsModel.createSlashCommand(application2, applicationCommand);
+                    ApplicationCommandAutocompletable applicationCommandAutocompletable = new ApplicationCommandAutocompletable(application2, applicationCommand);
                     if (!hashMap2.containsKey(Long.valueOf(applicationId))) {
                         ArrayList arrayList = new ArrayList();
-                        m.checkNotNullExpressionValue(createSlashCommand, "commandModel");
-                        arrayList.add(createSlashCommand);
+                        arrayList.add(applicationCommandAutocompletable);
                         hashMap2.put(Long.valueOf(applicationId), arrayList);
                     } else {
                         List list2 = (List) hashMap2.get(Long.valueOf(applicationId));
                         if (list2 != null) {
-                            m.checkNotNullExpressionValue(createSlashCommand, "commandModel");
-                            list2.add(createSlashCommand);
+                            list2.add(applicationCommandAutocompletable);
                         }
                     }
                 }
@@ -79,9 +81,7 @@ public final class WidgetChatInputDiscoveryCommandsModel {
                 List list3 = (List) hashMap2.get(Long.valueOf(application3.getId()));
                 if (list3 != null && (true ^ list3.isEmpty())) {
                     if (z2) {
-                        WidgetChatInputCommandsModel createSlashCommandApplication = WidgetChatInputCommandsModel.createSlashCommandApplication(application3);
-                        m.checkNotNullExpressionValue(createSlashCommandApplication, "WidgetChatInputCommandsM…shCommandApplication(app)");
-                        list3.add(0, createSlashCommandApplication);
+                        list3.add(0, new ApplicationPlaceholder(application3));
                     }
                     arrayList2.add(new Pair(application3, list3));
                 }
@@ -102,9 +102,9 @@ public final class WidgetChatInputDiscoveryCommandsModel {
         }
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List<? extends kotlin.Pair<com.discord.models.commands.Application, ? extends java.util.List<? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel>>> */
+    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List<? extends kotlin.Pair<com.discord.models.commands.Application, ? extends java.util.List<? extends com.discord.widgets.chat.input.autocomplete.Autocompletable>>> */
     /* JADX WARN: Multi-variable type inference failed */
-    public WidgetChatInputDiscoveryCommandsModel(List<? extends Pair<Application, ? extends List<? extends WidgetChatInputCommandsModel>>> list, boolean z2, boolean z3, int i, Long l) {
+    public WidgetChatInputDiscoveryCommandsModel(List<? extends Pair<Application, ? extends List<? extends Autocompletable>>> list, boolean z2, boolean z3, int i, Long l) {
         m.checkNotNullParameter(list, "commandsByApplication");
         this.commandsByApplication = list;
         this.hasMoreBefore = z2;
@@ -138,7 +138,7 @@ public final class WidgetChatInputDiscoveryCommandsModel {
         return Companion.parseModelDiscoveryCommands(list, discoverCommands, z2, i);
     }
 
-    public final List<Pair<Application, List<WidgetChatInputCommandsModel>>> component1() {
+    public final List<Pair<Application, List<Autocompletable>>> component1() {
         return this.commandsByApplication;
     }
 
@@ -158,7 +158,7 @@ public final class WidgetChatInputDiscoveryCommandsModel {
         return this.jumpedApplicationId;
     }
 
-    public final WidgetChatInputDiscoveryCommandsModel copy(List<? extends Pair<Application, ? extends List<? extends WidgetChatInputCommandsModel>>> list, boolean z2, boolean z3, int i, Long l) {
+    public final WidgetChatInputDiscoveryCommandsModel copy(List<? extends Pair<Application, ? extends List<? extends Autocompletable>>> list, boolean z2, boolean z3, int i, Long l) {
         m.checkNotNullParameter(list, "commandsByApplication");
         return new WidgetChatInputDiscoveryCommandsModel(list, z2, z3, i, l);
     }
@@ -174,13 +174,13 @@ public final class WidgetChatInputDiscoveryCommandsModel {
         return m.areEqual(this.commandsByApplication, widgetChatInputDiscoveryCommandsModel.commandsByApplication) && this.hasMoreBefore == widgetChatInputDiscoveryCommandsModel.hasMoreBefore && this.hasMoreAfter == widgetChatInputDiscoveryCommandsModel.hasMoreAfter && this.jumpedSequenceId == widgetChatInputDiscoveryCommandsModel.jumpedSequenceId && m.areEqual(this.jumpedApplicationId, widgetChatInputDiscoveryCommandsModel.jumpedApplicationId);
     }
 
-    public final List<Pair<Application, List<WidgetChatInputCommandsModel>>> getCommandsByApplication() {
+    public final List<Pair<Application, List<Autocompletable>>> getCommandsByApplication() {
         return this.commandsByApplication;
     }
 
-    public final List<WidgetChatInputCommandsModel> getFlattenCommandsModel() {
+    public final List<Autocompletable> getFlattenCommandsModel() {
         ArrayList arrayList = new ArrayList();
-        for (Pair<Application, List<WidgetChatInputCommandsModel>> pair : this.commandsByApplication) {
+        for (Pair<Application, List<Autocompletable>> pair : this.commandsByApplication) {
             arrayList.addAll(pair.component2());
         }
         return arrayList;
@@ -203,7 +203,7 @@ public final class WidgetChatInputDiscoveryCommandsModel {
     }
 
     public int hashCode() {
-        List<Pair<Application, List<WidgetChatInputCommandsModel>>> list = this.commandsByApplication;
+        List<Pair<Application, List<Autocompletable>>> list = this.commandsByApplication;
         int i = 0;
         int hashCode = (list != null ? list.hashCode() : 0) * 31;
         boolean z2 = this.hasMoreBefore;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java
index 17284fbe49..a522476db2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputEditText.java
@@ -9,6 +9,8 @@ import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetChatInputApplicationCommandsBinding;
 import com.discord.widgets.chat.MessageContent;
 import com.discord.widgets.chat.input.MessageDraftsRepo;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
 import com.lytefast.flexinput.widget.FlexEditText;
 import d0.t.n;
 import d0.z.d.m;
@@ -33,7 +35,7 @@ public final class WidgetChatInputEditText {
 
     /* compiled from: WidgetChatInputEditText.kt */
     /* renamed from: com.discord.widgets.chat.input.WidgetChatInputEditText$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function1<WidgetChatInputCommandsModel, Boolean> {
+    public static final class AnonymousClass1 extends o implements Function1<Autocompletable, Boolean> {
         public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
         public AnonymousClass1() {
@@ -43,19 +45,19 @@ public final class WidgetChatInputEditText {
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Boolean invoke(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            return Boolean.valueOf(invoke(widgetChatInputCommandsModel));
+        public /* bridge */ /* synthetic */ Boolean invoke(Autocompletable autocompletable) {
+            return Boolean.valueOf(invoke(autocompletable));
         }
 
-        public final boolean invoke(WidgetChatInputCommandsModel widgetChatInputCommandsModel) {
-            m.checkNotNullParameter(widgetChatInputCommandsModel, "it");
+        public final boolean invoke(Autocompletable autocompletable) {
+            m.checkNotNullParameter(autocompletable, "it");
             return false;
         }
     }
 
     /* compiled from: WidgetChatInputEditText.kt */
     /* renamed from: com.discord.widgets.chat.input.WidgetChatInputEditText$2  reason: invalid class name */
-    public static final class AnonymousClass2 extends o implements Function1<List<? extends WidgetChatInputCommandsModel>, Unit> {
+    public static final class AnonymousClass2 extends o implements Function1<List<? extends Autocompletable>, Unit> {
         public static final AnonymousClass2 INSTANCE = new AnonymousClass2();
 
         public AnonymousClass2() {
@@ -65,12 +67,12 @@ public final class WidgetChatInputEditText {
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(List<? extends WidgetChatInputCommandsModel> list) {
+        public /* bridge */ /* synthetic */ Unit invoke(List<? extends Autocompletable> list) {
             invoke(list);
             return Unit.a;
         }
 
-        public final void invoke(List<? extends WidgetChatInputCommandsModel> list) {
+        public final void invoke(List<? extends Autocompletable> list) {
             m.checkNotNullParameter(list, "<anonymous parameter 0>");
         }
     }
@@ -135,7 +137,7 @@ public final class WidgetChatInputEditText {
         }
     }
 
-    public WidgetChatInputEditText(FlexEditText flexEditText, RecyclerView recyclerView, View view, TextView textView, TextView textView2, RecyclerView recyclerView2, RecyclerView recyclerView3, WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, Function1<? super WidgetChatInputCommandsModel, Boolean> function1, Function1<? super List<? extends WidgetChatInputCommandsModel>, Unit> function12, Function0<Unit> function0, MessageDraftsRepo messageDraftsRepo) {
+    public WidgetChatInputEditText(FlexEditText flexEditText, RecyclerView recyclerView, View view, TextView textView, TextView textView2, RecyclerView recyclerView2, RecyclerView recyclerView3, WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, Function1<? super Autocompletable, Boolean> function1, Function1<? super List<? extends Autocompletable>, Unit> function12, Function0<Unit> function0, MessageDraftsRepo messageDraftsRepo) {
         m.checkNotNullParameter(flexEditText, "editText");
         m.checkNotNullParameter(recyclerView, "stickersRecycler");
         m.checkNotNullParameter(view, "stickersContainer");
@@ -150,9 +152,9 @@ public final class WidgetChatInputEditText {
         m.checkNotNullParameter(messageDraftsRepo, "messageDraftsRepo");
         this.editText = flexEditText;
         this.messageDraftsRepo = messageDraftsRepo;
-        BehaviorSubject m0 = BehaviorSubject.m0(Boolean.TRUE);
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(true)");
-        this.emptyTextSubject = m0;
+        BehaviorSubject l0 = BehaviorSubject.l0(Boolean.TRUE);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(true)");
+        this.emptyTextSubject = l0;
         this.chatInputCommands = new WidgetChatInputAutocomplete(flexEditText, recyclerView, view, textView, textView2, recyclerView2, recyclerView3, widgetChatInputApplicationCommandsBinding, function1, function12, function0);
         setOnSelectionChangedListener();
         setOnTextChangedListener();
@@ -215,12 +217,14 @@ public final class WidgetChatInputEditText {
     }
 
     public final MessageContent getMatchedContentWithMetaData() {
-        String stringSafe = Companion.toStringSafe(this.editText);
-        int length = stringSafe.length() - 1;
+        Companion companion = Companion;
+        String stringSafe = companion.toStringSafe(this.editText);
+        String stringSafe2 = companion.toStringSafe(this.editText);
+        int length = stringSafe2.length() - 1;
         int i = 0;
         boolean z2 = false;
         while (i <= length) {
-            boolean z3 = m.compare(stringSafe.charAt(!z2 ? i : length), 32) <= 0;
+            boolean z3 = m.compare(stringSafe2.charAt(!z2 ? i : length), 32) <= 0;
             if (!z2) {
                 if (!z3) {
                     z2 = true;
@@ -233,8 +237,8 @@ public final class WidgetChatInputEditText {
                 length--;
             }
         }
-        String obj = stringSafe.subSequence(i, length + 1).toString();
-        return !TextUtils.isEmpty(obj) ? this.chatInputCommands.replaceMentionableDataWithServerValues(obj) : new MessageContent(obj, n.emptyList());
+        String obj = stringSafe2.subSequence(i, length + 1).toString();
+        return !TextUtils.isEmpty(obj) ? this.chatInputCommands.replaceAutocompletableDataWithServerValues(stringSafe) : new MessageContent(obj, n.emptyList());
     }
 
     public final Function0<Unit> getOnSendListener() {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputSlashAction.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputSlashAction.java
deleted file mode 100644
index 90023c4035..0000000000
--- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputSlashAction.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.discord.widgets.chat.input;
-/* compiled from: WidgetChatInputSlashAction.kt */
-public interface WidgetChatInputSlashAction {
-    String call(String str, WidgetChatInputCommandsModel widgetChatInputCommandsModel);
-}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java
index 60d296df7d..7c035fe9dd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandOptionAdapterItem.java
@@ -40,7 +40,7 @@ public final class SelectedAppCommandOptionAdapterItem extends MGRecyclerViewHol
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.appcommandsOptiontitleTitle");
             textView.setText(option.getName());
-            int i3 = selectedApplicationCommandItem.getHighlighted() ? 2131231006 : 2131231007;
+            int i3 = selectedApplicationCommandItem.getHighlighted() ? 2131231011 : 2131231012;
             if (selectedApplicationCommandItem.getHighlighted()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.appcommandsOptiontitleTitle");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java
index d855194b19..4d84a4756c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java
@@ -18,8 +18,8 @@ public final class SelectedAppCommandSectionHeadingAdapterItem extends MGRecycle
         int i = 2131361970;
         TextView textView = (TextView) view.findViewById(2131361970);
         if (textView != null) {
-            i = 2131362939;
-            View findViewById = view.findViewById(2131362939);
+            i = 2131362964;
+            View findViewById = view.findViewById(2131362964);
             if (findViewById != null) {
                 ViewAppcommandsOptionheadingListitemBinding viewAppcommandsOptionheadingListitemBinding = new ViewAppcommandsOptionheadingListitemBinding((ConstraintLayout) view, textView, findViewById);
                 m.checkNotNullExpressionValue(viewAppcommandsOptionheadingListitemBinding, "ViewAppcommandsOptionhea…temBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java
index eea7592dac..e2f05ae1b3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java
@@ -45,7 +45,7 @@ public final class SelectedAppCommandTitleAdapterItem extends MGRecyclerViewHold
         textView.setText(sb);
         Application application = selectedApplicationCommandItem.getApplication();
         if (application != null) {
-            SimpleDraweeView simpleDraweeView = this.binding.f1641c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1638c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.appcommandsOptiontitleAvatar");
             IconUtils.setApplicationIcon$default(simpleDraweeView, application, false, 4, null);
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands$configureObservables$1.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands$configureObservables$1.java
index 6f07d0a7ff..d398c531c1 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands$configureObservables$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands$configureObservables$1.java
@@ -11,7 +11,7 @@ public final class WidgetChatInputApplicationCommands$configureObservables$1<T1,
 
     public final SelectedApplicationChat call(Long l, Channel channel) {
         User user;
-        if (channel == null || !AnimatableValueParser.g1(channel) || (user = AnimatableValueParser.v0(channel)) == null || !user.isBot()) {
+        if (channel == null || !AnimatableValueParser.h1(channel) || (user = AnimatableValueParser.v0(channel)) == null || !user.isBot()) {
             user = null;
         }
         m.checkNotNullExpressionValue(l, "guildId");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java
index 0daa22b1df..ae8c5ee07d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java
@@ -25,16 +25,16 @@ import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.textprocessing.SimpleRoundedBackgroundSpan;
-import com.discord.widgets.chat.input.ApplicationCommandData;
-import com.discord.widgets.chat.input.AutocompleteApplicationCommands;
-import com.discord.widgets.chat.input.AutocompleteInputCommandContext;
-import com.discord.widgets.chat.input.AutocompleteInputSelectionModel;
-import com.discord.widgets.chat.input.InputCommandOptions;
-import com.discord.widgets.chat.input.InputSelectionModel;
-import com.discord.widgets.chat.input.OptionRange;
 import com.discord.widgets.chat.input.UserAndSelectedGuildRoles;
-import com.discord.widgets.chat.input.VerifiedCommandMentionInputModel;
 import com.discord.widgets.chat.input.WidgetChatInputEditText;
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
+import com.discord.widgets.chat.input.models.AutocompleteApplicationCommands;
+import com.discord.widgets.chat.input.models.AutocompleteInputCommandContext;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import com.discord.widgets.chat.input.models.InputCommandOptions;
+import com.discord.widgets.chat.input.models.InputSelectionModel;
+import com.discord.widgets.chat.input.models.OptionRange;
+import com.discord.widgets.chat.input.models.VerifiedCommandMentionInputModel;
 import com.lytefast.flexinput.widget.FlexEditText;
 import d0.d0.f;
 import d0.g0.s;
@@ -67,6 +67,7 @@ public final class WidgetChatInputApplicationCommands {
     private String lastQuery;
     private boolean pendingShowNextOption;
     private ApplicationCommand selectedCommand;
+    private boolean showCommandUi;
 
     public final /* synthetic */ class WhenMappings {
         public static final /* synthetic */ int[] $EnumSwitchMapping$0;
@@ -99,7 +100,7 @@ public final class WidgetChatInputApplicationCommands {
         m.checkNotNullParameter(widgetChatInputApplicationCommandsBinding, "binding");
         this.editText = flexEditText;
         this.binding = widgetChatInputApplicationCommandsBinding;
-        RecyclerView recyclerView = widgetChatInputApplicationCommandsBinding.f1720c;
+        RecyclerView recyclerView = widgetChatInputApplicationCommandsBinding.f1717c;
         m.checkNotNullExpressionValue(recyclerView, "binding.chatInputApplicationCommandsRecycler");
         SelectedApplicationCommandAdapter selectedApplicationCommandAdapter = new SelectedApplicationCommandAdapter(recyclerView, new WidgetChatInputApplicationCommands$applicationCommandsParamAdapter$1(this));
         this.applicationCommandsParamAdapter = selectedApplicationCommandAdapter;
@@ -107,10 +108,10 @@ public final class WidgetChatInputApplicationCommands {
         m.checkNotNullExpressionValue(constraintLayout, "binding.root");
         Context context = constraintLayout.getContext();
         this.context = context;
-        RecyclerView recyclerView2 = widgetChatInputApplicationCommandsBinding.f1720c;
+        RecyclerView recyclerView2 = widgetChatInputApplicationCommandsBinding.f1717c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.chatInputApplicationCommandsRecycler");
         recyclerView2.setLayoutManager(new LinearLayoutManager(context, 0, false));
-        RecyclerView recyclerView3 = widgetChatInputApplicationCommandsBinding.f1720c;
+        RecyclerView recyclerView3 = widgetChatInputApplicationCommandsBinding.f1717c;
         m.checkNotNullExpressionValue(recyclerView3, "binding.chatInputApplicationCommandsRecycler");
         recyclerView3.setAdapter(selectedApplicationCommandAdapter);
         selectedApplicationCommandAdapter.getRecycler().setItemAnimator(null);
@@ -261,9 +262,9 @@ public final class WidgetChatInputApplicationCommands {
     public final void configureObservables(AppFragment appFragment) {
         m.checkNotNullParameter(appFragment, "appFragment");
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable s2 = Observable.j(companion.getGuildSelected().observeSelectedGuildId().s(), companion.getChannelsSelected().observeSelectedChannel().s(), WidgetChatInputApplicationCommands$configureObservables$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, appFragment, null, 2, null), WidgetChatInputApplicationCommands.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputApplicationCommands$configureObservables$2(this), 62, (Object) null);
+        Observable r = Observable.j(companion.getGuildSelected().observeSelectedGuildId().r(), companion.getChannelsSelected().observeSelectedChannel().r(), WidgetChatInputApplicationCommands$configureObservables$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, appFragment, null, 2, null), WidgetChatInputApplicationCommands.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInputApplicationCommands$configureObservables$2(this), 62, (Object) null);
     }
 
     public final void configureUi(AutocompleteInputSelectionModel autocompleteInputSelectionModel, boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java
index c9a53f57ff..4233bb4c1b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java
@@ -3,7 +3,7 @@ package com.discord.widgets.chat.input.applicationcommands;
 import androidx.annotation.VisibleForTesting;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ApplicationCommandOption;
-import com.discord.widgets.chat.input.OptionRange;
+import com.discord.widgets.chat.input.models.OptionRange;
 import d0.g0.e;
 import d0.g0.w;
 import d0.z.d.m;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1.java
new file mode 100644
index 0000000000..8d8388bca7
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1.java
@@ -0,0 +1,11 @@
+package com.discord.widgets.chat.input.applicationcommands;
+
+import d0.u.a;
+import java.util.Comparator;
+/* compiled from: Comparisons.kt */
+public final class WidgetChatInputModelMappingFunctions$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1<T> implements Comparator<T> {
+    @Override // java.util.Comparator
+    public final int compare(T t, T t2) {
+        return a.compareValues(Integer.valueOf(t2.getFirst()), Integer.valueOf(t.getFirst()));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java
index 89ba4a476f..57b38534d3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java
@@ -1,37 +1,43 @@
 package com.discord.widgets.chat.input.applicationcommands;
 
+import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.commands.ApplicationCommandType;
 import com.discord.api.commands.CommandChoice;
-import com.discord.api.role.GuildRole;
 import com.discord.api.sticker.Sticker;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
 import com.discord.models.commands.ApplicationCommandOption;
 import com.discord.models.commands.ApplicationSubCommand;
-import com.discord.models.user.User;
 import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.string.StringUtilsKt;
-import com.discord.widgets.chat.input.ApplicationCommandData;
-import com.discord.widgets.chat.input.ApplicationCommandValue;
-import com.discord.widgets.chat.input.AutocompleteInputSelectionModel;
-import com.discord.widgets.chat.input.BooleanOptionValue;
-import com.discord.widgets.chat.input.ChannelOptionValue;
-import com.discord.widgets.chat.input.ChatInputMentionsMap;
-import com.discord.widgets.chat.input.CommandOptionValue;
-import com.discord.widgets.chat.input.InputCommandOptions;
-import com.discord.widgets.chat.input.InputSelectionModel;
-import com.discord.widgets.chat.input.IntegerOptionValue;
-import com.discord.widgets.chat.input.MentionToken;
 import com.discord.widgets.chat.input.MentionUtilsKt;
-import com.discord.widgets.chat.input.OptionRange;
-import com.discord.widgets.chat.input.RawOptionValue;
-import com.discord.widgets.chat.input.RoleOptionValue;
-import com.discord.widgets.chat.input.SnowflakeOptionValue;
-import com.discord.widgets.chat.input.StringOptionValue;
 import com.discord.widgets.chat.input.UserAndSelectedGuildRoles;
-import com.discord.widgets.chat.input.UserOptionValue;
-import com.discord.widgets.chat.input.VerifiedCommandMentionInputModel;
-import com.discord.widgets.chat.input.WidgetChatInputCommandsModel;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandChoiceAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.ChannelAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import com.discord.widgets.chat.input.autocomplete.RoleAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.UserAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.sources.ApplicationCommandsAutocompletableSource;
+import com.discord.widgets.chat.input.models.ApplicationCommandData;
+import com.discord.widgets.chat.input.models.ApplicationCommandValue;
+import com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel;
+import com.discord.widgets.chat.input.models.BooleanOptionValue;
+import com.discord.widgets.chat.input.models.ChannelOptionValue;
+import com.discord.widgets.chat.input.models.ChatInputMentionsMap;
+import com.discord.widgets.chat.input.models.CommandOptionValue;
+import com.discord.widgets.chat.input.models.InputCommandOptions;
+import com.discord.widgets.chat.input.models.InputSelectionModel;
+import com.discord.widgets.chat.input.models.IntegerOptionValue;
+import com.discord.widgets.chat.input.models.MentionToken;
+import com.discord.widgets.chat.input.models.OptionRange;
+import com.discord.widgets.chat.input.models.RawOptionValue;
+import com.discord.widgets.chat.input.models.RoleOptionValue;
+import com.discord.widgets.chat.input.models.SnowflakeOptionValue;
+import com.discord.widgets.chat.input.models.StringOptionValue;
+import com.discord.widgets.chat.input.models.UserOptionValue;
+import com.discord.widgets.chat.input.models.VerifiedCommandMentionInputModel;
 import com.discord.widgets.chat.input.sticker.StickerPickerFeatureFlag;
 import d0.g0.s;
 import d0.g0.t;
@@ -125,10 +131,11 @@ public final class WidgetChatInputModelMappingFunctions {
             boolean z3 = true;
             Character valueOf = (!(t.isBlank(str) ^ true) || !MentionUtilsKt.getDEFAULT_LEADING_IDENTIFIERS().contains(Character.valueOf(str.charAt(0)))) ? null : Character.valueOf(str.charAt(0));
             if (valueOf != null || z2) {
+                LeadingIdentifier fromChar = LeadingIdentifier.Companion.fromChar(valueOf);
                 if (i != 0) {
                     z3 = false;
                 }
-                return new MentionToken(valueOf, str, z3);
+                return new MentionToken(fromChar, str, z3);
             }
         }
         return null;
@@ -158,13 +165,24 @@ public final class WidgetChatInputModelMappingFunctions {
         return !intRange.equals(intRange2) && intRange2.contains(intRange.getFirst()) && intRange2.contains(intRange.getLast());
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:128:0x0177 A[SYNTHETIC] */
-    /* JADX WARNING: Removed duplicated region for block: B:130:0x014a A[SYNTHETIC] */
-    public final List<WidgetChatInputCommandsModel> filterMentionsForCommandContext(InputSelectionModel inputSelectionModel) {
-        WidgetChatInputCommandsModel.Channel channel;
-        ArrayList arrayList;
-        boolean z2;
+    private final boolean lowerCaseContains(String str, String str2) {
+        Locale locale = Locale.getDefault();
+        m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
+        Objects.requireNonNull(str, "null cannot be cast to non-null type java.lang.String");
+        String lowerCase = str.toLowerCase(locale);
+        m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
+        Locale locale2 = Locale.getDefault();
+        m.checkNotNullExpressionValue(locale2, "Locale.getDefault()");
+        Objects.requireNonNull(str2, "null cannot be cast to non-null type java.lang.String");
+        String lowerCase2 = str2.toLowerCase(locale2);
+        m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)");
+        return w.contains$default((CharSequence) lowerCase, (CharSequence) lowerCase2, false, 2, (Object) null);
+    }
+
+    public final Map<LeadingIdentifier, List<Autocompletable>> filterMentionsForCommandContext(InputSelectionModel inputSelectionModel) {
+        List list;
         m.checkNotNullParameter(inputSelectionModel, "modelChat");
+        List flatten = o.flatten(inputSelectionModel.getInputModel().getAutocompletables().values());
         if (inputSelectionModel.getInputModel().getInputCommandContext().isCommand()) {
             ApplicationCommandOption selectedCommandOption = inputSelectionModel.getSelectedCommandOption();
             if (selectedCommandOption != null) {
@@ -172,105 +190,122 @@ public final class WidgetChatInputModelMappingFunctions {
                 if (choices == null || !(!choices.isEmpty())) {
                     switch (selectedCommandOption.getType().ordinal()) {
                         case 4:
-                            List<WidgetChatInputCommandsModel> createFromCommandOption = WidgetChatInputCommandsModel.createFromCommandOption(selectedCommandOption);
-                            m.checkNotNullExpressionValue(createFromCommandOption, "WidgetChatInputCommandsM…FromCommandOption(option)");
-                            return createFromCommandOption;
+                            list = ApplicationCommandsAutocompletableSource.Companion.createFromCommandOption(selectedCommandOption);
+                            break;
                         case 5:
-                            List<WidgetChatInputCommandsModel> mentionables = inputSelectionModel.getInputModel().getMentionables();
-                            arrayList = new ArrayList();
-                            for (Object obj : mentionables) {
-                                WidgetChatInputCommandsModel widgetChatInputCommandsModel = (WidgetChatInputCommandsModel) obj;
-                                if (widgetChatInputCommandsModel.getType() == 0 || widgetChatInputCommandsModel.getType() == 1 || widgetChatInputCommandsModel.getType() == 10) {
-                                    arrayList.add(obj);
+                            list = new ArrayList();
+                            for (Object obj : flatten) {
+                                if (obj instanceof UserAutocompletable) {
+                                    list.add(obj);
                                 }
                             }
                             break;
                         case 6:
-                            List<WidgetChatInputCommandsModel> mentionables2 = inputSelectionModel.getInputModel().getMentionables();
-                            arrayList = new ArrayList();
-                            for (Object obj2 : mentionables2) {
-                                if (((WidgetChatInputCommandsModel) obj2).getType() == 2) {
-                                    arrayList.add(obj2);
+                            list = new ArrayList();
+                            for (Object obj2 : flatten) {
+                                if (obj2 instanceof ChannelAutocompletable) {
+                                    list.add(obj2);
                                 }
                             }
                             break;
                         case 7:
-                            List<WidgetChatInputCommandsModel> mentionables3 = inputSelectionModel.getInputModel().getMentionables();
-                            arrayList = new ArrayList();
-                            for (Object obj3 : mentionables3) {
-                                WidgetChatInputCommandsModel widgetChatInputCommandsModel2 = (WidgetChatInputCommandsModel) obj3;
-                                if (widgetChatInputCommandsModel2.getType() == 4 && widgetChatInputCommandsModel2.getRole() != null) {
-                                    arrayList.add(obj3);
+                            list = new ArrayList();
+                            for (Object obj3 : flatten) {
+                                if (obj3 instanceof RoleAutocompletable) {
+                                    list.add(obj3);
                                 }
                             }
                             break;
                         case 8:
-                            List<WidgetChatInputCommandsModel> mentionables4 = inputSelectionModel.getInputModel().getMentionables();
-                            arrayList = new ArrayList();
-                            for (Object obj4 : mentionables4) {
-                                WidgetChatInputCommandsModel widgetChatInputCommandsModel3 = (WidgetChatInputCommandsModel) obj4;
-                                if (widgetChatInputCommandsModel3.getType() == 0 || widgetChatInputCommandsModel3.getType() == 1 || widgetChatInputCommandsModel3.getType() == 10 || (widgetChatInputCommandsModel3.getType() == 4 && widgetChatInputCommandsModel3.getRole() != null)) {
-                                    arrayList.add(obj4);
+                            list = new ArrayList();
+                            for (Object obj4 : flatten) {
+                                Autocompletable autocompletable = (Autocompletable) obj4;
+                                if ((autocompletable instanceof UserAutocompletable) || (autocompletable instanceof RoleAutocompletable)) {
+                                    list.add(obj4);
                                 }
                             }
                             break;
                         default:
-                            List<WidgetChatInputCommandsModel> createFromCommandOption2 = WidgetChatInputCommandsModel.createFromCommandOption(selectedCommandOption);
-                            m.checkNotNullExpressionValue(createFromCommandOption2, "WidgetChatInputCommandsM…FromCommandOption(option)");
-                            List plus = u.plus((Collection) createFromCommandOption2, (Iterable) inputSelectionModel.getInputModel().getMentionables());
-                            arrayList = new ArrayList();
+                            List plus = u.plus((Collection) ApplicationCommandsAutocompletableSource.Companion.createFromCommandOption(selectedCommandOption), (Iterable) flatten);
+                            List arrayList = new ArrayList();
                             for (Object obj5 : plus) {
-                                WidgetChatInputCommandsModel widgetChatInputCommandsModel4 = (WidgetChatInputCommandsModel) obj5;
-                                if (widgetChatInputCommandsModel4.getType() == 2 || widgetChatInputCommandsModel4.getType() == 10) {
-                                    m.checkNotNullExpressionValue(widgetChatInputCommandsModel4, "it");
-                                    WidgetChatInputCommandsModel.Channel channel2 = widgetChatInputCommandsModel4.getChannel();
-                                    if (channel2 == null || !channel2.guildTextyChannel) {
-                                        z2 = false;
-                                        if (!z2) {
-                                            arrayList.add(obj5);
-                                        }
-                                    }
-                                }
-                                z2 = true;
-                                if (!z2) {
+                                Autocompletable autocompletable2 = (Autocompletable) obj5;
+                                if (autocompletable2 instanceof ChannelAutocompletable ? AnimatableValueParser.k1(((ChannelAutocompletable) autocompletable2).getChannel()) : autocompletable2 instanceof UserAutocompletable ? ((UserAutocompletable) autocompletable2).getCanUserReadChannel() : !(autocompletable2 instanceof ApplicationCommandAutocompletable)) {
+                                    arrayList.add(obj5);
                                 }
                             }
+                            list = arrayList;
                             break;
                     }
-                    return arrayList;
+                    LinkedHashMap linkedHashMap = new LinkedHashMap();
+                    for (Object obj6 : list) {
+                        LeadingIdentifier leadingIdentifier = ((Autocompletable) obj6).leadingIdentifier();
+                        Object obj7 = linkedHashMap.get(leadingIdentifier);
+                        if (obj7 == null) {
+                            obj7 = new ArrayList();
+                            linkedHashMap.put(leadingIdentifier, obj7);
+                        }
+                        ((List) obj7).add(obj6);
+                    }
+                    return linkedHashMap;
                 }
-                List<WidgetChatInputCommandsModel> createFromCommandOption3 = WidgetChatInputCommandsModel.createFromCommandOption(selectedCommandOption);
-                m.checkNotNullExpressionValue(createFromCommandOption3, "WidgetChatInputCommandsM…FromCommandOption(option)");
-                return createFromCommandOption3;
+                List<Autocompletable> createFromCommandOption = ApplicationCommandsAutocompletableSource.Companion.createFromCommandOption(selectedCommandOption);
+                LinkedHashMap linkedHashMap2 = new LinkedHashMap();
+                for (Object obj8 : createFromCommandOption) {
+                    LeadingIdentifier leadingIdentifier2 = ((Autocompletable) obj8).leadingIdentifier();
+                    Object obj9 = linkedHashMap2.get(leadingIdentifier2);
+                    if (obj9 == null) {
+                        obj9 = new ArrayList();
+                        linkedHashMap2.put(leadingIdentifier2, obj9);
+                    }
+                    ((List) obj9).add(obj8);
+                }
+                return linkedHashMap2;
             }
-            List<WidgetChatInputCommandsModel> mentionables5 = inputSelectionModel.getInputModel().getMentionables();
             ArrayList arrayList2 = new ArrayList();
-            for (Object obj6 : mentionables5) {
-                WidgetChatInputCommandsModel widgetChatInputCommandsModel5 = (WidgetChatInputCommandsModel) obj6;
-                if ((widgetChatInputCommandsModel5.getType() == 5 || widgetChatInputCommandsModel5.getType() == 6) ? false : true) {
-                    arrayList2.add(obj6);
+            for (Object obj10 : flatten) {
+                if (!(((Autocompletable) obj10) instanceof ApplicationCommandAutocompletable)) {
+                    arrayList2.add(obj10);
                 }
             }
-            return arrayList2;
+            LinkedHashMap linkedHashMap3 = new LinkedHashMap();
+            for (Object obj11 : arrayList2) {
+                LeadingIdentifier leadingIdentifier3 = ((Autocompletable) obj11).leadingIdentifier();
+                Object obj12 = linkedHashMap3.get(leadingIdentifier3);
+                if (obj12 == null) {
+                    obj12 = new ArrayList();
+                    linkedHashMap3.put(leadingIdentifier3, obj12);
+                }
+                ((List) obj12).add(obj11);
+            }
+            return linkedHashMap3;
         }
-        List<WidgetChatInputCommandsModel> mentionables6 = inputSelectionModel.getInputModel().getMentionables();
         ArrayList arrayList3 = new ArrayList();
-        for (Object obj7 : mentionables6) {
-            WidgetChatInputCommandsModel widgetChatInputCommandsModel6 = (WidgetChatInputCommandsModel) obj7;
-            if (!(widgetChatInputCommandsModel6.getType() == 2 || widgetChatInputCommandsModel6.getType() == 10) || ((channel = widgetChatInputCommandsModel6.getChannel()) != null && channel.guildTextyChannel)) {
-                arrayList3.add(obj7);
+        for (Object obj13 : flatten) {
+            Autocompletable autocompletable3 = (Autocompletable) obj13;
+            if (autocompletable3 instanceof ChannelAutocompletable ? AnimatableValueParser.k1(((ChannelAutocompletable) autocompletable3).getChannel()) : autocompletable3 instanceof UserAutocompletable ? ((UserAutocompletable) autocompletable3).getCanUserReadChannel() : true) {
+                arrayList3.add(obj13);
             }
         }
-        return arrayList3;
+        LinkedHashMap linkedHashMap4 = new LinkedHashMap();
+        for (Object obj14 : arrayList3) {
+            LeadingIdentifier leadingIdentifier4 = ((Autocompletable) obj14).leadingIdentifier();
+            Object obj15 = linkedHashMap4.get(leadingIdentifier4);
+            if (obj15 == null) {
+                obj15 = new ArrayList();
+                linkedHashMap4.put(leadingIdentifier4, obj15);
+            }
+            ((List) obj15).add(obj14);
+        }
+        return linkedHashMap4;
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r19v0, resolved type: java.util.Collection<? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel> */
-    /* JADX WARN: Multi-variable type inference failed */
-    public final Collection<WidgetChatInputCommandsModel> filterMentionsFromToken(MentionToken mentionToken, InputSelectionModel inputSelectionModel, Collection<? extends WidgetChatInputCommandsModel> collection) {
-        Character leadingIdentifier;
+    public final List<Autocompletable> filterMentionsFromToken(MentionToken mentionToken, InputSelectionModel inputSelectionModel, Map<LeadingIdentifier, ? extends List<? extends Autocompletable>> map) {
+        ArrayList arrayList;
         m.checkNotNullParameter(mentionToken, "token");
         m.checkNotNullParameter(inputSelectionModel, "inputSelectionModel");
-        m.checkNotNullParameter(collection, "mentions");
+        m.checkNotNullParameter(map, "mentions");
+        boolean z2 = t.isBlank(mentionToken.getFormattedToken()) && mentionToken.getLeadingIdentifier() == LeadingIdentifier.NONE;
         String formattedToken = mentionToken.getFormattedToken();
         Locale locale = Locale.getDefault();
         m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
@@ -278,41 +313,58 @@ public final class WidgetChatInputModelMappingFunctions {
         String lowerCase = formattedToken.toLowerCase(locale);
         m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
         String replace$default = t.replace$default(StringUtilsKt.stripAccents(lowerCase), " ", "", false, 4, (Object) null);
-        boolean z2 = (mentionToken.getFormattedToken().length() == 0) && mentionToken.getLeadingIdentifier() == null;
         if (z2 && inputSelectionModel.hasSelectedOptionWithChoices()) {
-            return collection;
-        }
-        if (z2) {
+            List list = (List) map.get(LeadingIdentifier.NONE);
+            if (list != null) {
+                arrayList = new ArrayList();
+                for (Object obj : list) {
+                    if (obj instanceof ApplicationCommandChoiceAutocompletable) {
+                        arrayList.add(obj);
+                    }
+                }
+            } else {
+                arrayList = null;
+            }
+            return arrayList != null ? arrayList : n.emptyList();
+        } else if (z2) {
             return n.emptyList();
-        }
-        ArrayList arrayList = new ArrayList();
-        for (WidgetChatInputCommandsModel widgetChatInputCommandsModel : collection) {
-            String tag = widgetChatInputCommandsModel.getTag();
-            if (!(tag.length() == 0) && (mentionToken.isAtStart() || !widgetChatInputCommandsModel.isSlashCommand())) {
-                char charAt = tag.charAt(0);
-                if (mentionToken.getLeadingIdentifier() == null || ((leadingIdentifier = mentionToken.getLeadingIdentifier()) != null && charAt == leadingIdentifier.charValue())) {
-                    Locale locale2 = Locale.getDefault();
-                    m.checkNotNullExpressionValue(locale2, "Locale.getDefault()");
-                    String lowerCase2 = tag.toLowerCase(locale2);
-                    m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)");
-                    if (w.contains$default((CharSequence) t.replace$default(StringUtilsKt.stripAccents(lowerCase2), " ", "", false, 4, (Object) null), (CharSequence) replace$default, false, 2, (Object) null)) {
-                        arrayList.add(widgetChatInputCommandsModel);
+        } else {
+            ArrayList arrayList2 = new ArrayList();
+            List<Autocompletable> list2 = (List) map.get(mentionToken.getLeadingIdentifier());
+            if (list2 != null) {
+                for (Autocompletable autocompletable : list2) {
+                    Iterator<String> iterateAutocompleteMatchers = autocompletable.iterateAutocompleteMatchers();
+                    while (true) {
+                        if (!iterateAutocompleteMatchers.hasNext()) {
+                            break;
+                        }
+                        String next = iterateAutocompleteMatchers.next();
+                        Locale locale2 = Locale.getDefault();
+                        m.checkNotNullExpressionValue(locale2, "Locale.getDefault()");
+                        Objects.requireNonNull(next, "null cannot be cast to non-null type java.lang.String");
+                        String lowerCase2 = next.toLowerCase(locale2);
+                        m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)");
+                        if (INSTANCE.lowerCaseContains(t.replace$default(StringUtilsKt.stripAccents(lowerCase2), " ", "", false, 4, (Object) null), replace$default)) {
+                            arrayList2.add(autocompletable);
+                            break;
+                        }
                     }
                 }
             }
+            return arrayList2;
         }
-        return arrayList;
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:52:0x013a  */
-    /* JADX WARNING: Removed duplicated region for block: B:81:0x006e A[EDGE_INSN: B:81:0x006e->B:21:0x006e ?: BREAK  , SYNTHETIC] */
+    /* JADX WARNING: Removed duplicated region for block: B:103:0x006e A[EDGE_INSN: B:103:0x006e->B:21:0x006e ?: BREAK  , SYNTHETIC] */
+    /* JADX WARNING: Removed duplicated region for block: B:74:0x020a  */
     public final ApplicationCommandData getApplicationSendData(AutocompleteInputSelectionModel autocompleteInputSelectionModel, List<? extends ApplicationCommand> list) {
         InputSelectionModel inputSelectionModel;
         VerifiedCommandMentionInputModel inputModel;
         Object obj;
-        Object obj2;
+        OptionRange optionRange;
+        IntRange value;
         boolean z2;
-        Object obj3;
+        Object obj2;
         boolean z3;
         m.checkNotNullParameter(list, "queryCommands");
         if (autocompleteInputSelectionModel == null || (inputSelectionModel = autocompleteInputSelectionModel.getInputSelectionModel()) == null || (inputModel = inputSelectionModel.getInputModel()) == null) {
@@ -323,11 +375,11 @@ public final class WidgetChatInputModelMappingFunctions {
             Iterator<T> it = list.iterator();
             while (true) {
                 if (!it.hasNext()) {
-                    obj3 = null;
+                    obj2 = null;
                     break;
                 }
-                obj3 = it.next();
-                ApplicationCommand applicationCommand = (ApplicationCommand) obj3;
+                obj2 = it.next();
+                ApplicationCommand applicationCommand = (ApplicationCommand) obj2;
                 String input = autocompleteInputSelectionModel.getInputSelectionModel().getInputModel().getInput();
                 if (!t.isBlank(input)) {
                     String name = applicationCommand.getName();
@@ -347,7 +399,7 @@ public final class WidgetChatInputModelMappingFunctions {
                 if (z3) {
                 }
             }
-            selectedCommand = (ApplicationCommand) obj3;
+            selectedCommand = (ApplicationCommand) obj2;
         }
         if (selectedCommand == null) {
             return null;
@@ -378,31 +430,51 @@ public final class WidgetChatInputModelMappingFunctions {
         LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(values.size()));
         Iterator<T> it3 = values.entrySet().iterator();
         while (it3.hasNext()) {
-            Map.Entry entry = (Map.Entry) it3.next();
+            linkedHashMap.put(((Map.Entry) it3.next()).getKey(), "");
+        }
+        Map<ApplicationCommandOption, CommandOptionValue> values2 = inputModel.getInputCommandOptions().getValues();
+        LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(values2.size()));
+        Iterator<T> it4 = values2.entrySet().iterator();
+        while (it4.hasNext()) {
+            Map.Entry entry = (Map.Entry) it4.next();
             Object key = entry.getKey();
+            Object value2 = ((CommandOptionValue) entry.getValue()).getValue();
             if (entry.getValue() instanceof StringOptionValue) {
                 List<CommandChoice> choices = ((ApplicationCommandOption) entry.getKey()).getChoices();
-                if (choices == null || choices.isEmpty()) {
-                    obj2 = WidgetChatInputCommandsModel.replaceMatches(((CommandOptionValue) entry.getValue()).getValue().toString(), u.toMutableList((Collection) u.distinct(inputModel.getInputMentionsMap().values()))).getTextContent();
-                    linkedHashMap.put(key, obj2);
+                if (!(!(choices == null || choices.isEmpty()) || (optionRange = inputModel.getInputCommandOptions().getInputRanges().get(entry.getKey())) == null || (value = optionRange.getValue()) == null)) {
+                    int first = value.getFirst();
+                    String obj3 = ((CommandOptionValue) entry.getValue()).getValue().toString();
+                    Map<IntRange, Autocompletable> inputMentionsMap = inputModel.getInputMentionsMap();
+                    LinkedHashMap linkedHashMap3 = new LinkedHashMap(g0.mapCapacity(inputMentionsMap.size()));
+                    Iterator<T> it5 = inputMentionsMap.entrySet().iterator();
+                    while (it5.hasNext()) {
+                        Map.Entry entry2 = (Map.Entry) it5.next();
+                        linkedHashMap3.put(new IntRange(((IntRange) entry2.getKey()).getFirst() - first, ((IntRange) entry2.getKey()).getLast() - first), entry2.getValue());
+                    }
+                    LinkedHashMap linkedHashMap4 = new LinkedHashMap();
+                    for (Map.Entry entry3 : linkedHashMap3.entrySet()) {
+                        if (((IntRange) entry3.getKey()).getFirst() >= 0 && ((IntRange) entry3.getKey()).getLast() <= obj3.length()) {
+                            linkedHashMap4.put(entry3.getKey(), entry3.getValue());
+                        }
+                    }
+                    value2 = INSTANCE.replaceAutocompleteDataWithServerValues(obj3, linkedHashMap4);
                 }
             }
-            obj2 = ((CommandOptionValue) entry.getValue()).getValue();
-            linkedHashMap.put(key, obj2);
+            linkedHashMap2.put(key, value2);
         }
         Map<ApplicationCommandOption, Boolean> commandOptionValidity = inputModel.getInputCommandOptions().getCommandOptionValidity();
         for (ApplicationCommandOption applicationCommandOption : selectedCommand.getOptions()) {
-            if ((applicationCommandOption.getRequired() && linkedHashMap.get(applicationCommandOption) == null) || m.areEqual(commandOptionValidity.get(applicationCommandOption), Boolean.FALSE)) {
+            if ((applicationCommandOption.getRequired() && linkedHashMap2.get(applicationCommandOption) == null) || m.areEqual(commandOptionValidity.get(applicationCommandOption), Boolean.FALSE)) {
                 return new ApplicationCommandData(application, selectedCommand, n.emptyList(), false);
             }
             while (r2.hasNext()) {
             }
         }
         if (selectedCommand instanceof ApplicationSubCommand) {
-            Set<ApplicationCommandOption> keySet = linkedHashMap.keySet();
+            Set<ApplicationCommandOption> keySet = linkedHashMap2.keySet();
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(keySet, 10));
             for (ApplicationCommandOption applicationCommandOption2 : keySet) {
-                Object obj4 = linkedHashMap.get(applicationCommandOption2);
+                Object obj4 = linkedHashMap2.get(applicationCommandOption2);
                 if (obj4 == null) {
                     return null;
                 }
@@ -412,10 +484,10 @@ public final class WidgetChatInputModelMappingFunctions {
             ApplicationCommandValue applicationCommandValue = new ApplicationCommandValue(applicationSubCommand.getSubCommandName(), null, ApplicationCommandType.SUBCOMMAND.getType(), arrayList, 2, null);
             return applicationSubCommand.getParentGroupName() != null ? new ApplicationCommandData(application, applicationSubCommand.getRootCommand(), d0.t.m.listOf(new ApplicationCommandValue(applicationSubCommand.getParentGroupName(), null, ApplicationCommandType.SUBCOMMAND_GROUP.getType(), d0.t.m.listOf(applicationCommandValue), 2, null)), true) : new ApplicationCommandData(application, applicationSubCommand.getRootCommand(), d0.t.m.listOf(applicationCommandValue), true);
         }
-        Set<ApplicationCommandOption> keySet2 = linkedHashMap.keySet();
+        Set<ApplicationCommandOption> keySet2 = linkedHashMap2.keySet();
         ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(keySet2, 10));
         for (ApplicationCommandOption applicationCommandOption3 : keySet2) {
-            Object obj5 = linkedHashMap.get(applicationCommandOption3);
+            Object obj5 = linkedHashMap2.get(applicationCommandOption3);
             if (obj5 == null) {
                 return null;
             }
@@ -454,16 +526,16 @@ public final class WidgetChatInputModelMappingFunctions {
 
     /* JADX INFO: Can't fix incorrect switch cases order, some code will duplicate */
     /* JADX WARNING: Code restructure failed: missing block: B:28:0x008a, code lost:
-        if ((r2 instanceof com.discord.widgets.chat.input.SnowflakeOptionValue) == false) goto L_0x00c2;
+        if ((r2 instanceof com.discord.widgets.chat.input.models.SnowflakeOptionValue) == false) goto L_0x00c2;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:32:0x0093, code lost:
-        if ((r2 instanceof com.discord.widgets.chat.input.SnowflakeOptionValue) == false) goto L_0x00c2;
+        if ((r2 instanceof com.discord.widgets.chat.input.models.SnowflakeOptionValue) == false) goto L_0x00c2;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:36:0x009c, code lost:
-        if ((r2 instanceof com.discord.widgets.chat.input.SnowflakeOptionValue) == false) goto L_0x00c2;
+        if ((r2 instanceof com.discord.widgets.chat.input.models.SnowflakeOptionValue) == false) goto L_0x00c2;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:40:0x00a5, code lost:
-        if ((r2 instanceof com.discord.widgets.chat.input.SnowflakeOptionValue) == false) goto L_0x00c2;
+        if ((r2 instanceof com.discord.widgets.chat.input.models.SnowflakeOptionValue) == false) goto L_0x00c2;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:46:0x00bf, code lost:
         if ((!d0.g0.t.isBlank(r2.getValue().toString())) != false) goto L_0x007e;
@@ -648,8 +720,7 @@ public final class WidgetChatInputModelMappingFunctions {
 
     public final List<Sticker> getStickerMatches(MentionToken mentionToken) {
         if (StickerPickerFeatureFlag.Companion.getINSTANCE().isEnabled()) {
-            Character leadingIdentifier = mentionToken != null ? mentionToken.getLeadingIdentifier() : null;
-            if (leadingIdentifier != null && leadingIdentifier.charValue() == ':') {
+            if ((mentionToken != null ? mentionToken.getLeadingIdentifier() : null) == LeadingIdentifier.EMOJI_AND_STICKERS) {
                 String token = mentionToken.getToken();
                 StringBuilder sb = new StringBuilder();
                 int length = token.length();
@@ -662,203 +733,210 @@ public final class WidgetChatInputModelMappingFunctions {
                 String sb2 = sb.toString();
                 m.checkNotNullExpressionValue(sb2, "filterTo(StringBuilder(), predicate).toString()");
                 if (sb2.length() - 1 >= 3) {
-                    return u.toList(StickerUtils.INSTANCE.findStickerMatches(t.replace(mentionToken.getToken(), String.valueOf(mentionToken.getLeadingIdentifier().charValue()), "", true), n.emptyList(), true));
+                    StickerUtils stickerUtils = StickerUtils.INSTANCE;
+                    return u.toList(stickerUtils.findStickerMatches(t.replace(mentionToken.getToken(), mentionToken.getLeadingIdentifier().toString(), "", true), StickerUtils.getStickersForAutocomplete$default(stickerUtils, null, null, null, null, null, 31, null), true));
                 }
             }
         }
         return n.emptyList();
     }
 
-    /* JADX WARNING: Code restructure failed: missing block: B:40:0x00db, code lost:
-        r5 = false;
-     */
-    public final ChatInputMentionsMap mapInputToMentions(String str, Collection<? extends WidgetChatInputCommandsModel> collection, boolean z2) {
+    public final ChatInputMentionsMap mapInputToMentions(String str, Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map, boolean z2) {
         boolean z3;
         m.checkNotNullParameter(str, "input");
-        m.checkNotNullParameter(collection, "unfilteredMentionables");
+        m.checkNotNullParameter(map, "autocompletables");
         LinkedHashMap linkedHashMap = new LinkedHashMap();
-        ArrayList<WidgetChatInputCommandsModel> arrayList = new ArrayList();
-        Iterator<T> it = collection.iterator();
-        while (true) {
-            boolean z4 = false;
-            if (!it.hasNext()) {
-                break;
-            }
-            Object next = it.next();
-            if (((WidgetChatInputCommandsModel) next).getType() != 10) {
-                z4 = true;
-            }
-            if (z4) {
-                arrayList.add(next);
-            }
-        }
-        if (!(arrayList.size() <= 2000 || z2 || TAG_SYMBOLS_PATTERN.matcher(str).matches())) {
+        List<Autocompletable> flatten = o.flatten(map.values());
+        if (!(map.size() <= 2000 || z2 || TAG_SYMBOLS_PATTERN.matcher(str).matches())) {
             return new ChatInputMentionsMap(str, h0.emptyMap());
         }
-        for (WidgetChatInputCommandsModel widgetChatInputCommandsModel : arrayList) {
-            String displayTag = widgetChatInputCommandsModel.getDisplayTag();
-            m.checkNotNullExpressionValue(displayTag, "commandModel.displayTag");
-            int indexOf$default = w.indexOf$default((CharSequence) str, displayTag, 0, false, 4, (Object) null);
-            while (indexOf$default != -1) {
-                IntRange intRange = new IntRange(indexOf$default, displayTag.length() + indexOf$default);
-                if (linkedHashMap.isEmpty()) {
-                    linkedHashMap.put(intRange, widgetChatInputCommandsModel);
-                } else {
-                    Iterator it2 = linkedHashMap.entrySet().iterator();
-                    while (true) {
-                        if (!it2.hasNext()) {
-                            z3 = true;
-                            break;
-                        }
-                        Map.Entry entry = (Map.Entry) it2.next();
-                        IntRange intRange2 = (IntRange) entry.getKey();
-                        WidgetChatInputCommandsModel widgetChatInputCommandsModel2 = (WidgetChatInputCommandsModel) entry.getValue();
-                        if (!m.areEqual(intRange, intRange2) || widgetChatInputCommandsModel.getType() != 4 || widgetChatInputCommandsModel2.getType() == 4) {
-                            WidgetChatInputModelMappingFunctions widgetChatInputModelMappingFunctions = INSTANCE;
-                            if (!widgetChatInputModelMappingFunctions.isSubRangeOf(intRange2, intRange)) {
-                                if (m.areEqual(intRange, intRange2) || widgetChatInputModelMappingFunctions.isSubRangeOf(intRange, intRange2)) {
-                                    break;
+        for (Autocompletable autocompletable : flatten) {
+            Iterator<String> iterateTextMatchers = autocompletable.iterateTextMatchers();
+            while (iterateTextMatchers.hasNext()) {
+                String next = iterateTextMatchers.next();
+                int indexOf$default = w.indexOf$default((CharSequence) str, next, 0, false, 4, (Object) null);
+                while (indexOf$default != -1) {
+                    IntRange intRange = new IntRange(indexOf$default, next.length() + indexOf$default);
+                    if (linkedHashMap.isEmpty()) {
+                        linkedHashMap.put(intRange, autocompletable);
+                    } else {
+                        Iterator it = linkedHashMap.entrySet().iterator();
+                        while (true) {
+                            if (!it.hasNext()) {
+                                z3 = true;
+                                break;
+                            }
+                            Map.Entry entry = (Map.Entry) it.next();
+                            IntRange intRange2 = (IntRange) entry.getKey();
+                            Autocompletable autocompletable2 = (Autocompletable) entry.getValue();
+                            if (!m.areEqual(intRange, intRange2) || !(autocompletable instanceof RoleAutocompletable) || (autocompletable2 instanceof RoleAutocompletable)) {
+                                WidgetChatInputModelMappingFunctions widgetChatInputModelMappingFunctions = INSTANCE;
+                                if (!widgetChatInputModelMappingFunctions.isSubRangeOf(intRange2, intRange)) {
+                                    if (m.areEqual(intRange, intRange2) || widgetChatInputModelMappingFunctions.isSubRangeOf(intRange, intRange2)) {
+                                        break;
+                                    }
                                 }
                             }
+                            it.remove();
+                        }
+                        z3 = false;
+                        if (z3) {
+                            linkedHashMap.put(intRange, autocompletable);
                         }
-                        it2.remove();
-                    }
-                    if (z3) {
-                        linkedHashMap.put(intRange, widgetChatInputCommandsModel);
                     }
+                    indexOf$default = w.indexOf$default((CharSequence) str, next, indexOf$default + 1, false, 4, (Object) null);
                 }
-                indexOf$default = w.indexOf$default((CharSequence) str, displayTag, indexOf$default + 1, false, 4, (Object) null);
             }
         }
         return new ChatInputMentionsMap(str, linkedHashMap);
     }
 
-    /* JADX WARNING: Code restructure failed: missing block: B:22:0x00c3, code lost:
-        if (r4 != null) goto L_0x00c7;
+    /* JADX WARNING: Code restructure failed: missing block: B:20:0x00b8, code lost:
+        if (r3 != null) goto L_0x00bc;
      */
     public final Map<ApplicationCommandOption, CommandOptionValue> parseCommandOptions(String str, ApplicationCommand applicationCommand, ChatInputMentionsMap chatInputMentionsMap) {
         CommandOptionValue commandOptionValue;
         Object obj;
         String str2;
-        CommandOptionValue integerOptionValue;
-        User user;
-        WidgetChatInputCommandsModel.Channel channel;
-        GuildRole role;
+        CommandOptionValue booleanOptionValue;
         Object obj2;
         m.checkNotNullParameter(str, "input");
         m.checkNotNullParameter(applicationCommand, "command");
         m.checkNotNullParameter(chatInputMentionsMap, "mentionMap");
         Map<ApplicationCommandOption, OptionRange> findOptionRanges = WidgetChatInputApplicationCommandsKt.findOptionRanges(str, applicationCommand);
         LinkedHashMap linkedHashMap = new LinkedHashMap();
-        for (ApplicationCommandOption applicationCommandOption : findOptionRanges.keySet()) {
-            OptionRange optionRange = findOptionRanges.get(applicationCommandOption);
-            if (optionRange != null) {
-                String substring = str.substring(optionRange.getValue().getFirst(), optionRange.getValue().getLast());
-                m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
-                Objects.requireNonNull(substring, "null cannot be cast to non-null type kotlin.CharSequence");
-                String obj3 = w.trim(substring).toString();
-                Iterator<T> it = chatInputMentionsMap.getMentions().values().iterator();
-                while (true) {
-                    commandOptionValue = null;
-                    if (it.hasNext()) {
-                        obj = it.next();
-                        if (m.areEqual(((WidgetChatInputCommandsModel) obj).getDisplayTag(), obj3)) {
-                        }
-                    } else {
-                        obj = null;
+        for (Map.Entry<ApplicationCommandOption, OptionRange> entry : findOptionRanges.entrySet()) {
+            ApplicationCommandOption key = entry.getKey();
+            OptionRange value = entry.getValue();
+            String substring = str.substring(value.getValue().getFirst(), value.getValue().getLast());
+            m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)");
+            Objects.requireNonNull(substring, "null cannot be cast to non-null type kotlin.CharSequence");
+            String obj3 = w.trim(substring).toString();
+            Iterator<T> it = chatInputMentionsMap.getMentions().values().iterator();
+            while (true) {
+                commandOptionValue = null;
+                if (it.hasNext()) {
+                    obj = it.next();
+                    if (((Autocompletable) obj).matchesText(obj3)) {
                     }
-                }
-                WidgetChatInputCommandsModel widgetChatInputCommandsModel = (WidgetChatInputCommandsModel) obj;
-                List<CommandChoice> choices = applicationCommandOption.getChoices();
-                if (choices != null) {
-                    Iterator<T> it2 = choices.iterator();
-                    while (true) {
-                        if (it2.hasNext()) {
-                            obj2 = it2.next();
-                            String a = ((CommandChoice) obj2).a();
-                            Objects.requireNonNull(a, "null cannot be cast to non-null type kotlin.CharSequence");
-                            String obj4 = w.trim(a).toString();
-                            Objects.requireNonNull(obj3, "null cannot be cast to non-null type kotlin.CharSequence");
-                            if (m.areEqual(obj4, w.trim(obj3).toString())) {
-                            }
-                        } else {
-                            obj2 = null;
-                        }
-                    }
-                    CommandChoice commandChoice = (CommandChoice) obj2;
-                    if (commandChoice != null) {
-                        str2 = commandChoice.b();
-                    }
-                }
-                str2 = obj3;
-                switch (applicationCommandOption.getType().ordinal()) {
-                    case 2:
-                        commandOptionValue = new StringOptionValue(str2);
-                        break;
-                    case 3:
-                        Integer intOrNull = s.toIntOrNull(str2);
-                        if (intOrNull != null) {
-                            integerOptionValue = new IntegerOptionValue(intOrNull.intValue());
-                            commandOptionValue = integerOptionValue;
-                            break;
-                        }
-                        break;
-                    case 4:
-                        if (INSTANCE.isBoolean(obj3)) {
-                            integerOptionValue = new BooleanOptionValue(Boolean.parseBoolean(str2));
-                            commandOptionValue = integerOptionValue;
-                            break;
-                        }
-                        break;
-                    case 5:
-                        if (!(widgetChatInputCommandsModel == null || (user = widgetChatInputCommandsModel.getUser()) == null)) {
-                            integerOptionValue = new UserOptionValue(user);
-                            commandOptionValue = integerOptionValue;
-                            break;
-                        }
-                    case 6:
-                        if (!(widgetChatInputCommandsModel == null || (channel = widgetChatInputCommandsModel.getChannel()) == null)) {
-                            integerOptionValue = new ChannelOptionValue(channel);
-                            commandOptionValue = integerOptionValue;
-                            break;
-                        }
-                    case 7:
-                        if (!(widgetChatInputCommandsModel == null || (role = widgetChatInputCommandsModel.getRole()) == null)) {
-                            integerOptionValue = new RoleOptionValue(role);
-                            commandOptionValue = integerOptionValue;
-                            break;
-                        }
-                    case 8:
-                        if ((widgetChatInputCommandsModel != null ? widgetChatInputCommandsModel.getUser() : null) == null) {
-                            if ((widgetChatInputCommandsModel != null ? widgetChatInputCommandsModel.getRole() : null) != null) {
-                                GuildRole role2 = widgetChatInputCommandsModel.getRole();
-                                m.checkNotNullExpressionValue(role2, "mention.role");
-                                commandOptionValue = new RoleOptionValue(role2);
-                                break;
-                            }
-                        } else {
-                            User user2 = widgetChatInputCommandsModel.getUser();
-                            m.checkNotNullExpressionValue(user2, "mention.user");
-                            commandOptionValue = new UserOptionValue(user2);
-                            break;
-                        }
-                        break;
-                }
-                if (commandOptionValue != null) {
-                    linkedHashMap.put(applicationCommandOption, commandOptionValue);
                 } else {
-                    Long snowflake = INSTANCE.toSnowflake(obj3);
-                    if (snowflake != null) {
-                        linkedHashMap.put(applicationCommandOption, new SnowflakeOptionValue(snowflake.longValue()));
+                    obj = null;
+                }
+            }
+            Autocompletable autocompletable = (Autocompletable) obj;
+            List<CommandChoice> choices = key.getChoices();
+            if (choices != null) {
+                Iterator<T> it2 = choices.iterator();
+                while (true) {
+                    if (it2.hasNext()) {
+                        obj2 = it2.next();
+                        String a = ((CommandChoice) obj2).a();
+                        Objects.requireNonNull(a, "null cannot be cast to non-null type kotlin.CharSequence");
+                        if (m.areEqual(w.trim(a).toString(), obj3)) {
+                        }
                     } else {
-                        linkedHashMap.put(applicationCommandOption, new RawOptionValue(obj3));
+                        obj2 = null;
                     }
                 }
+                CommandChoice commandChoice = (CommandChoice) obj2;
+                if (commandChoice != null) {
+                    str2 = commandChoice.b();
+                }
+            }
+            str2 = substring;
+            switch (key.getType().ordinal()) {
+                case 2:
+                    commandOptionValue = new StringOptionValue(str2);
+                    break;
+                case 3:
+                    Integer intOrNull = s.toIntOrNull(obj3);
+                    if (intOrNull != null) {
+                        commandOptionValue = new IntegerOptionValue(intOrNull.intValue());
+                        break;
+                    }
+                    break;
+                case 4:
+                    if (isBoolean(obj3)) {
+                        booleanOptionValue = new BooleanOptionValue(Boolean.parseBoolean(obj3));
+                        commandOptionValue = booleanOptionValue;
+                        break;
+                    }
+                    break;
+                case 5:
+                    if (!(autocompletable instanceof UserAutocompletable)) {
+                        autocompletable = null;
+                    }
+                    UserAutocompletable userAutocompletable = (UserAutocompletable) autocompletable;
+                    if (userAutocompletable != null) {
+                        booleanOptionValue = new UserOptionValue(userAutocompletable.getUser());
+                        commandOptionValue = booleanOptionValue;
+                        break;
+                    }
+                    break;
+                case 6:
+                    if (!(autocompletable instanceof ChannelAutocompletable)) {
+                        autocompletable = null;
+                    }
+                    ChannelAutocompletable channelAutocompletable = (ChannelAutocompletable) autocompletable;
+                    if (channelAutocompletable != null) {
+                        booleanOptionValue = new ChannelOptionValue(channelAutocompletable.getChannel());
+                        commandOptionValue = booleanOptionValue;
+                        break;
+                    }
+                    break;
+                case 7:
+                    if (!(autocompletable instanceof RoleAutocompletable)) {
+                        autocompletable = null;
+                    }
+                    RoleAutocompletable roleAutocompletable = (RoleAutocompletable) autocompletable;
+                    if (roleAutocompletable != null) {
+                        booleanOptionValue = new RoleOptionValue(roleAutocompletable.getRole());
+                        commandOptionValue = booleanOptionValue;
+                        break;
+                    }
+                    break;
+                case 8:
+                    if (!(autocompletable instanceof RoleAutocompletable)) {
+                        if (autocompletable instanceof UserAutocompletable) {
+                            commandOptionValue = new UserOptionValue(((UserAutocompletable) autocompletable).getUser());
+                            break;
+                        }
+                    } else {
+                        commandOptionValue = new RoleOptionValue(((RoleAutocompletable) autocompletable).getRole());
+                        break;
+                    }
+                    break;
+            }
+            if (commandOptionValue != null) {
+                linkedHashMap.put(key, commandOptionValue);
+            } else {
+                Long snowflake = toSnowflake(obj3);
+                if (snowflake != null) {
+                    linkedHashMap.put(key, new SnowflakeOptionValue(snowflake.longValue()));
+                } else {
+                    linkedHashMap.put(key, new RawOptionValue(substring));
+                }
             }
         }
         return linkedHashMap;
     }
 
+    public final String replaceAutocompleteDataWithServerValues(String str, Map<IntRange, ? extends Autocompletable> map) {
+        m.checkNotNullParameter(str, "$this$replaceAutocompleteDataWithServerValues");
+        m.checkNotNullParameter(map, "inputMentionsMap");
+        for (IntRange intRange : u.sortedWith(map.keySet(), new WidgetChatInputModelMappingFunctions$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1())) {
+            Autocompletable autocompletable = (Autocompletable) map.get(intRange);
+            if (autocompletable != null) {
+                int first = intRange.getFirst();
+                int last = intRange.getLast();
+                String inputReplacement = autocompletable.getInputReplacement();
+                Objects.requireNonNull(str, "null cannot be cast to non-null type kotlin.CharSequence");
+                str = w.replaceRange(str, first, last, inputReplacement).toString();
+            }
+        }
+        return str;
+    }
+
     public final Long toSnowflake(String str) {
         m.checkNotNullParameter(str, "text");
         Long longOrNull = s.toLongOrNull(str);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandAutocompletable.java
new file mode 100644
index 0000000000..63e12d98ae
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandAutocompletable.java
@@ -0,0 +1,97 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.models.commands.Application;
+import com.discord.models.commands.ApplicationCommand;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: Autocompletable.kt */
+public final class ApplicationCommandAutocompletable extends Autocompletable {
+    private final Application application;
+    private final ApplicationCommand command;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ApplicationCommandAutocompletable(Application application, ApplicationCommand applicationCommand) {
+        super(null);
+        m.checkNotNullParameter(applicationCommand, "command");
+        this.application = application;
+        this.command = applicationCommand;
+    }
+
+    public static /* synthetic */ ApplicationCommandAutocompletable copy$default(ApplicationCommandAutocompletable applicationCommandAutocompletable, Application application, ApplicationCommand applicationCommand, int i, Object obj) {
+        if ((i & 1) != 0) {
+            application = applicationCommandAutocompletable.application;
+        }
+        if ((i & 2) != 0) {
+            applicationCommand = applicationCommandAutocompletable.command;
+        }
+        return applicationCommandAutocompletable.copy(application, applicationCommand);
+    }
+
+    public final Application component1() {
+        return this.application;
+    }
+
+    public final ApplicationCommand component2() {
+        return this.command;
+    }
+
+    public final ApplicationCommandAutocompletable copy(Application application, ApplicationCommand applicationCommand) {
+        m.checkNotNullParameter(applicationCommand, "command");
+        return new ApplicationCommandAutocompletable(application, applicationCommand);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof ApplicationCommandAutocompletable)) {
+            return false;
+        }
+        ApplicationCommandAutocompletable applicationCommandAutocompletable = (ApplicationCommandAutocompletable) obj;
+        return m.areEqual(this.application, applicationCommandAutocompletable.application) && m.areEqual(this.command, applicationCommandAutocompletable.command);
+    }
+
+    public final Application getApplication() {
+        return this.application;
+    }
+
+    public final ApplicationCommand getCommand() {
+        return this.command;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        return leadingIdentifier().getIdentifier() + this.command.getName();
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return d0.t.m.listOf(leadingIdentifier().getIdentifier() + this.command.getName());
+    }
+
+    public int hashCode() {
+        Application application = this.application;
+        int i = 0;
+        int hashCode = (application != null ? application.hashCode() : 0) * 31;
+        ApplicationCommand applicationCommand = this.command;
+        if (applicationCommand != null) {
+            i = applicationCommand.hashCode();
+        }
+        return hashCode + i;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public LeadingIdentifier leadingIdentifier() {
+        return LeadingIdentifier.APP_COMMAND;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ApplicationCommandAutocompletable(application=");
+        L.append(this.application);
+        L.append(", command=");
+        L.append(this.command);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandChoiceAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandChoiceAutocompletable.java
new file mode 100644
index 0000000000..62f4d85a3e
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandChoiceAutocompletable.java
@@ -0,0 +1,69 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.api.commands.CommandChoice;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: Autocompletable.kt */
+public final class ApplicationCommandChoiceAutocompletable extends Autocompletable {
+    private final CommandChoice choice;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ApplicationCommandChoiceAutocompletable(CommandChoice commandChoice) {
+        super(null);
+        m.checkNotNullParameter(commandChoice, "choice");
+        this.choice = commandChoice;
+    }
+
+    public static /* synthetic */ ApplicationCommandChoiceAutocompletable copy$default(ApplicationCommandChoiceAutocompletable applicationCommandChoiceAutocompletable, CommandChoice commandChoice, int i, Object obj) {
+        if ((i & 1) != 0) {
+            commandChoice = applicationCommandChoiceAutocompletable.choice;
+        }
+        return applicationCommandChoiceAutocompletable.copy(commandChoice);
+    }
+
+    public final CommandChoice component1() {
+        return this.choice;
+    }
+
+    public final ApplicationCommandChoiceAutocompletable copy(CommandChoice commandChoice) {
+        m.checkNotNullParameter(commandChoice, "choice");
+        return new ApplicationCommandChoiceAutocompletable(commandChoice);
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof ApplicationCommandChoiceAutocompletable) && m.areEqual(this.choice, ((ApplicationCommandChoiceAutocompletable) obj).choice);
+        }
+        return true;
+    }
+
+    public final CommandChoice getChoice() {
+        return this.choice;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        return this.choice.b();
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return d0.t.m.listOf(this.choice.a());
+    }
+
+    public int hashCode() {
+        CommandChoice commandChoice = this.choice;
+        if (commandChoice != null) {
+            return commandChoice.hashCode();
+        }
+        return 0;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ApplicationCommandChoiceAutocompletable(choice=");
+        L.append(this.choice);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandLoadingPlaceholder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandLoadingPlaceholder.java
new file mode 100644
index 0000000000..3eed1c2efc
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationCommandLoadingPlaceholder.java
@@ -0,0 +1,70 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.models.commands.Application;
+import d0.t.n;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: Autocompletable.kt */
+public final class ApplicationCommandLoadingPlaceholder extends Autocompletable {
+    private final Application application;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ApplicationCommandLoadingPlaceholder(Application application) {
+        super(null);
+        m.checkNotNullParameter(application, "application");
+        this.application = application;
+    }
+
+    public static /* synthetic */ ApplicationCommandLoadingPlaceholder copy$default(ApplicationCommandLoadingPlaceholder applicationCommandLoadingPlaceholder, Application application, int i, Object obj) {
+        if ((i & 1) != 0) {
+            application = applicationCommandLoadingPlaceholder.application;
+        }
+        return applicationCommandLoadingPlaceholder.copy(application);
+    }
+
+    public final Application component1() {
+        return this.application;
+    }
+
+    public final ApplicationCommandLoadingPlaceholder copy(Application application) {
+        m.checkNotNullParameter(application, "application");
+        return new ApplicationCommandLoadingPlaceholder(application);
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof ApplicationCommandLoadingPlaceholder) && m.areEqual(this.application, ((ApplicationCommandLoadingPlaceholder) obj).application);
+        }
+        return true;
+    }
+
+    public final Application getApplication() {
+        return this.application;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        return "";
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return n.emptyList();
+    }
+
+    public int hashCode() {
+        Application application = this.application;
+        if (application != null) {
+            return application.hashCode();
+        }
+        return 0;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ApplicationCommandLoadingPlaceholder(application=");
+        L.append(this.application);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationPlaceholder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationPlaceholder.java
new file mode 100644
index 0000000000..8f9597dcc8
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ApplicationPlaceholder.java
@@ -0,0 +1,70 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.models.commands.Application;
+import d0.t.n;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: Autocompletable.kt */
+public final class ApplicationPlaceholder extends Autocompletable {
+    private final Application application;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ApplicationPlaceholder(Application application) {
+        super(null);
+        m.checkNotNullParameter(application, "application");
+        this.application = application;
+    }
+
+    public static /* synthetic */ ApplicationPlaceholder copy$default(ApplicationPlaceholder applicationPlaceholder, Application application, int i, Object obj) {
+        if ((i & 1) != 0) {
+            application = applicationPlaceholder.application;
+        }
+        return applicationPlaceholder.copy(application);
+    }
+
+    public final Application component1() {
+        return this.application;
+    }
+
+    public final ApplicationPlaceholder copy(Application application) {
+        m.checkNotNullParameter(application, "application");
+        return new ApplicationPlaceholder(application);
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof ApplicationPlaceholder) && m.areEqual(this.application, ((ApplicationPlaceholder) obj).application);
+        }
+        return true;
+    }
+
+    public final Application getApplication() {
+        return this.application;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        return "";
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return n.emptyList();
+    }
+
+    public int hashCode() {
+        Application application = this.application;
+        if (application != null) {
+            return application.hashCode();
+        }
+        return 0;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ApplicationPlaceholder(application=");
+        L.append(this.application);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java
new file mode 100644
index 0000000000..58142407fa
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/Autocompletable.java
@@ -0,0 +1,61 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.utilities.collections.MultiListIterator;
+import d0.z.d.m;
+import java.util.Iterator;
+import java.util.List;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: Autocompletable.kt */
+public abstract class Autocompletable {
+    private Autocompletable() {
+    }
+
+    public /* synthetic */ Autocompletable(DefaultConstructorMarker defaultConstructorMarker) {
+        this();
+    }
+
+    public List<String> getAutocompleteTextMatchers() {
+        return null;
+    }
+
+    public List<String> getHiddenInputTextMatchers() {
+        return null;
+    }
+
+    public abstract String getInputReplacement();
+
+    public abstract List<String> getInputTextMatchers();
+
+    public final Iterator<String> iterateAutocompleteMatchers() {
+        List<String> autocompleteTextMatchers = getAutocompleteTextMatchers();
+        if (autocompleteTextMatchers == null || autocompleteTextMatchers.isEmpty()) {
+            return getInputTextMatchers().iterator();
+        }
+        List<String> autocompleteTextMatchers2 = getAutocompleteTextMatchers();
+        m.checkNotNull(autocompleteTextMatchers2);
+        return new MultiListIterator(getInputTextMatchers(), autocompleteTextMatchers2);
+    }
+
+    public final Iterator<String> iterateTextMatchers() {
+        List<String> hiddenInputTextMatchers = getHiddenInputTextMatchers();
+        if (hiddenInputTextMatchers == null || hiddenInputTextMatchers.isEmpty()) {
+            return getInputTextMatchers().iterator();
+        }
+        List<String> hiddenInputTextMatchers2 = getHiddenInputTextMatchers();
+        m.checkNotNull(hiddenInputTextMatchers2);
+        return new MultiListIterator(getInputTextMatchers(), hiddenInputTextMatchers2);
+    }
+
+    public LeadingIdentifier leadingIdentifier() {
+        return LeadingIdentifier.NONE;
+    }
+
+    public final boolean matchesText(String str) {
+        m.checkNotNullParameter(str, "text");
+        if (getInputTextMatchers().contains(str)) {
+            return true;
+        }
+        List<String> hiddenInputTextMatchers = getHiddenInputTextMatchers();
+        return hiddenInputTextMatchers != null && hiddenInputTextMatchers.contains(str);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompletableComparator.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompletableComparator.java
new file mode 100644
index 0000000000..78ab5cec2c
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompletableComparator.java
@@ -0,0 +1,80 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.models.commands.Application;
+import com.discord.utilities.user.UserUtils;
+import d0.z.d.a0;
+import d0.z.d.m;
+import java.util.Comparator;
+import kotlin.NoWhenBranchMatchedException;
+/* compiled from: Autocompletable.kt */
+public final class AutocompletableComparator implements Comparator<Autocompletable> {
+    public int compare(Autocompletable autocompletable, Autocompletable autocompletable2) {
+        m.checkNotNullParameter(autocompletable, "o1");
+        m.checkNotNullParameter(autocompletable2, "o2");
+        if (!m.areEqual(a0.getOrCreateKotlinClass(autocompletable.getClass()), a0.getOrCreateKotlinClass(autocompletable2.getClass()))) {
+            return m.compare(AutocompletableKt.getSortIndex(autocompletable), AutocompletableKt.getSortIndex(autocompletable2));
+        }
+        if (autocompletable instanceof ApplicationCommandChoiceAutocompletable) {
+            return AutocompletableKt.access$lower(((ApplicationCommandChoiceAutocompletable) autocompletable).getChoice().a()).compareTo(AutocompletableKt.access$lower(((ApplicationCommandChoiceAutocompletable) autocompletable2).getChoice().a()));
+        }
+        if (autocompletable instanceof ApplicationCommandLoadingPlaceholder) {
+            return AutocompletableKt.access$lower(((ApplicationCommandLoadingPlaceholder) autocompletable).getApplication().getName()).compareTo(AutocompletableKt.access$lower(((ApplicationCommandLoadingPlaceholder) autocompletable2).getApplication().getName()));
+        }
+        if (autocompletable instanceof ApplicationCommandAutocompletable) {
+            ApplicationCommandAutocompletable applicationCommandAutocompletable = (ApplicationCommandAutocompletable) autocompletable2;
+            ApplicationCommandAutocompletable applicationCommandAutocompletable2 = (ApplicationCommandAutocompletable) autocompletable;
+            Application application = applicationCommandAutocompletable2.getApplication();
+            String str = null;
+            Long valueOf = application != null ? Long.valueOf(application.getId()) : null;
+            Application application2 = applicationCommandAutocompletable.getApplication();
+            if (m.areEqual(valueOf, application2 != null ? Long.valueOf(application2.getId()) : null)) {
+                return AutocompletableKt.access$lower(applicationCommandAutocompletable2.getCommand().getName()).compareTo(AutocompletableKt.access$lower(applicationCommandAutocompletable.getCommand().getName()));
+            }
+            Application application3 = applicationCommandAutocompletable2.getApplication();
+            String access$lower = AutocompletableKt.access$lower(String.valueOf(application3 != null ? application3.getName() : null));
+            Application application4 = applicationCommandAutocompletable.getApplication();
+            if (application4 != null) {
+                str = application4.getName();
+            }
+            return access$lower.compareTo(AutocompletableKt.access$lower(String.valueOf(str)));
+        } else if (autocompletable instanceof ApplicationPlaceholder) {
+            return AutocompletableKt.access$lower(((ApplicationPlaceholder) autocompletable).getApplication().getName()).compareTo(AutocompletableKt.access$lower(((ApplicationPlaceholder) autocompletable2).getApplication().getName()));
+        } else {
+            if (autocompletable instanceof ChannelAutocompletable) {
+                return AutocompletableKt.access$lower(AnimatableValueParser.y0(((ChannelAutocompletable) autocompletable).getChannel())).compareTo(AutocompletableKt.access$lower(AnimatableValueParser.y0(((ChannelAutocompletable) autocompletable2).getChannel())));
+            }
+            if (autocompletable instanceof EmojiAutocompletable) {
+                String firstName = ((EmojiAutocompletable) autocompletable).getEmoji().getFirstName();
+                m.checkNotNullExpressionValue(firstName, "o1.emoji.firstName");
+                String access$lower2 = AutocompletableKt.access$lower(firstName);
+                String firstName2 = ((EmojiAutocompletable) autocompletable2).getEmoji().getFirstName();
+                m.checkNotNullExpressionValue(firstName2, "o2c.emoji.firstName");
+                return access$lower2.compareTo(AutocompletableKt.access$lower(firstName2));
+            } else if (autocompletable instanceof EmojiUpsellPlaceholder) {
+                return 0;
+            } else {
+                if (autocompletable instanceof GlobalRoleAutocompletable) {
+                    return AutocompletableKt.access$lower(((GlobalRoleAutocompletable) autocompletable).getText()).compareTo(AutocompletableKt.access$lower(((GlobalRoleAutocompletable) autocompletable2).getText()));
+                }
+                if (autocompletable instanceof RoleAutocompletable) {
+                    return AutocompletableKt.access$lower(((RoleAutocompletable) autocompletable).getRole().f()).compareTo(AutocompletableKt.access$lower(((RoleAutocompletable) autocompletable2).getRole().f()));
+                }
+                if (autocompletable instanceof UserAutocompletable) {
+                    UserAutocompletable userAutocompletable = (UserAutocompletable) autocompletable;
+                    String nickname = userAutocompletable.getNickname();
+                    if (nickname == null) {
+                        nickname = UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, userAutocompletable.getUser(), null, null, 3, null).toString();
+                    }
+                    UserAutocompletable userAutocompletable2 = (UserAutocompletable) autocompletable2;
+                    String nickname2 = userAutocompletable2.getNickname();
+                    if (nickname2 == null) {
+                        nickname2 = UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, userAutocompletable2.getUser(), null, null, 3, null).toString();
+                    }
+                    return AutocompletableKt.access$lower(nickname).compareTo(AutocompletableKt.access$lower(nickname2));
+                }
+                throw new NoWhenBranchMatchedException();
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompletableKt.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompletableKt.java
new file mode 100644
index 0000000000..1db26dbcb7
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompletableKt.java
@@ -0,0 +1,56 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import d0.z.d.m;
+import java.util.Locale;
+import java.util.Objects;
+import kotlin.NoWhenBranchMatchedException;
+/* compiled from: Autocompletable.kt */
+public final class AutocompletableKt {
+    public static final /* synthetic */ String access$lower(String str) {
+        return lower(str);
+    }
+
+    public static final int getSortIndex(Autocompletable autocompletable) {
+        m.checkNotNullParameter(autocompletable, "$this$getSortIndex");
+        if (autocompletable instanceof UserAutocompletable) {
+            return 0;
+        }
+        if (autocompletable instanceof RoleAutocompletable) {
+            return 1;
+        }
+        if (autocompletable instanceof GlobalRoleAutocompletable) {
+            return 2;
+        }
+        if (autocompletable instanceof ChannelAutocompletable) {
+            return 3;
+        }
+        if (autocompletable instanceof EmojiAutocompletable) {
+            return 4;
+        }
+        if (autocompletable instanceof ApplicationCommandAutocompletable) {
+            return 5;
+        }
+        if (autocompletable instanceof ApplicationCommandChoiceAutocompletable) {
+            return 6;
+        }
+        if (autocompletable instanceof ApplicationCommandLoadingPlaceholder) {
+            return 7;
+        }
+        if (autocompletable instanceof ApplicationPlaceholder) {
+            return 8;
+        }
+        if (autocompletable instanceof EmojiUpsellPlaceholder) {
+            return 9;
+        }
+        throw new NoWhenBranchMatchedException();
+    }
+
+    private static final String lower(String str) {
+        Locale locale = Locale.getDefault();
+        m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
+        Objects.requireNonNull(str, "null cannot be cast to non-null type java.lang.String");
+        String lowerCase = str.toLowerCase(locale);
+        m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
+        return lowerCase;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChannelAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChannelAutocompletable.java
new file mode 100644
index 0000000000..b0eb9bf7fd
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChannelAutocompletable.java
@@ -0,0 +1,77 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.api.channel.Channel;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: Autocompletable.kt */
+public final class ChannelAutocompletable extends Autocompletable {
+    private final Channel channel;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ChannelAutocompletable(Channel channel) {
+        super(null);
+        m.checkNotNullParameter(channel, "channel");
+        this.channel = channel;
+    }
+
+    public static /* synthetic */ ChannelAutocompletable copy$default(ChannelAutocompletable channelAutocompletable, Channel channel, int i, Object obj) {
+        if ((i & 1) != 0) {
+            channel = channelAutocompletable.channel;
+        }
+        return channelAutocompletable.copy(channel);
+    }
+
+    public final Channel component1() {
+        return this.channel;
+    }
+
+    public final ChannelAutocompletable copy(Channel channel) {
+        m.checkNotNullParameter(channel, "channel");
+        return new ChannelAutocompletable(channel);
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof ChannelAutocompletable) && m.areEqual(this.channel, ((ChannelAutocompletable) obj).channel);
+        }
+        return true;
+    }
+
+    public final Channel getChannel() {
+        return this.channel;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        StringBuilder L = a.L("<#");
+        L.append(this.channel.h());
+        L.append('>');
+        return L.toString();
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return d0.t.m.listOf(leadingIdentifier().getIdentifier() + this.channel.m());
+    }
+
+    public int hashCode() {
+        Channel channel = this.channel;
+        if (channel != null) {
+            return channel.hashCode();
+        }
+        return 0;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public LeadingIdentifier leadingIdentifier() {
+        return LeadingIdentifier.CHANNELS;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("ChannelAutocompletable(channel=");
+        L.append(this.channel);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2.java
new file mode 100644
index 0000000000..143f523f23
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2.java
@@ -0,0 +1,20 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.autocomplete.sources.ApplicationCommandsAutocompletableSource;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2 extends o implements Function0<ApplicationCommandsAutocompletableSource> {
+    public static final ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2 INSTANCE = new ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2();
+
+    public ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final ApplicationCommandsAutocompletableSource mo1invoke() {
+        return new ApplicationCommandsAutocompletableSource(StoreStream.Companion.getApplicationCommands());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$CHANNEL_SOURCE$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$CHANNEL_SOURCE$2.java
new file mode 100644
index 0000000000..a364e0fead
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$CHANNEL_SOURCE$2.java
@@ -0,0 +1,21 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.autocomplete.sources.ChannelAutocompletableSource;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletables$CHANNEL_SOURCE$2 extends o implements Function0<ChannelAutocompletableSource> {
+    public static final ChatInputAutocompletables$CHANNEL_SOURCE$2 INSTANCE = new ChatInputAutocompletables$CHANNEL_SOURCE$2();
+
+    public ChatInputAutocompletables$CHANNEL_SOURCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final ChannelAutocompletableSource mo1invoke() {
+        StoreStream.Companion companion = StoreStream.Companion;
+        return new ChannelAutocompletableSource(companion.getChannels(), companion.getPermissions());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$EMOJI_SOURCE$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$EMOJI_SOURCE$2.java
new file mode 100644
index 0000000000..c0eb3eac52
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$EMOJI_SOURCE$2.java
@@ -0,0 +1,21 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.autocomplete.sources.EmojiAutocompletableSource;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletables$EMOJI_SOURCE$2 extends o implements Function0<EmojiAutocompletableSource> {
+    public static final ChatInputAutocompletables$EMOJI_SOURCE$2 INSTANCE = new ChatInputAutocompletables$EMOJI_SOURCE$2();
+
+    public ChatInputAutocompletables$EMOJI_SOURCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final EmojiAutocompletableSource mo1invoke() {
+        StoreStream.Companion companion = StoreStream.Companion;
+        return new EmojiAutocompletableSource(companion.getEmojis(), companion.getUserSettings());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$USERS_SOURCE$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$USERS_SOURCE$2.java
new file mode 100644
index 0000000000..681eea3ce3
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$USERS_SOURCE$2.java
@@ -0,0 +1,21 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.autocomplete.sources.UserAutocompletableSource;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletables$USERS_SOURCE$2 extends o implements Function0<UserAutocompletableSource> {
+    public static final ChatInputAutocompletables$USERS_SOURCE$2 INSTANCE = new ChatInputAutocompletables$USERS_SOURCE$2();
+
+    public ChatInputAutocompletables$USERS_SOURCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final UserAutocompletableSource mo1invoke() {
+        StoreStream.Companion companion = StoreStream.Companion;
+        return new UserAutocompletableSource(companion.getUsers(), companion.getGuilds(), companion.getPresences(), companion.getPermissions(), companion.getChannels());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$observeChannelAutocompletables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$observeChannelAutocompletables$1.java
new file mode 100644
index 0000000000..f24780bdff
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables$observeChannelAutocompletables$1.java
@@ -0,0 +1,42 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.api.channel.Channel;
+import com.discord.widgets.chat.input.autocomplete.sources.ApplicationCommandsAutocompletableSource;
+import d0.z.d.m;
+import j0.k.b;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import rx.Observable;
+import rx.functions.Func4;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletables$observeChannelAutocompletables$1<T, R> implements b<Channel, Observable<? extends Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>>>> {
+    public static final ChatInputAutocompletables$observeChannelAutocompletables$1 INSTANCE = new ChatInputAutocompletables$observeChannelAutocompletables$1();
+
+    /* compiled from: ChatInputAutocompletables.kt */
+    /* renamed from: com.discord.widgets.chat.input.autocomplete.ChatInputAutocompletables$observeChannelAutocompletables$1$1  reason: invalid class name */
+    public static final class AnonymousClass1<T1, T2, T3, T4, R> implements Func4<Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>, Map<LeadingIdentifier, TreeSet<Autocompletable>>> {
+        public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
+
+        public final Map<LeadingIdentifier, TreeSet<Autocompletable>> call(Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> map, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> map2, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> map3, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> map4) {
+            LinkedHashMap linkedHashMap = new LinkedHashMap();
+            m.checkNotNullExpressionValue(map, "commands");
+            ChatInputAutocompletablesKt.access$merge(linkedHashMap, map);
+            m.checkNotNullExpressionValue(map2, "emojis");
+            ChatInputAutocompletablesKt.access$merge(linkedHashMap, map2);
+            m.checkNotNullExpressionValue(map3, "channels");
+            ChatInputAutocompletablesKt.access$merge(linkedHashMap, map3);
+            m.checkNotNullExpressionValue(map4, "users");
+            ChatInputAutocompletablesKt.access$merge(linkedHashMap, map4);
+            return linkedHashMap;
+        }
+    }
+
+    public final Observable<? extends Map<LeadingIdentifier, Set<Autocompletable>>> call(Channel channel) {
+        ChatInputAutocompletables chatInputAutocompletables = ChatInputAutocompletables.INSTANCE;
+        ApplicationCommandsAutocompletableSource application_commands_source = chatInputAutocompletables.getAPPLICATION_COMMANDS_SOURCE();
+        m.checkNotNullExpressionValue(channel, "channel");
+        return Observable.h(application_commands_source.observeApplicationCommandAutocompletables(channel), chatInputAutocompletables.getEMOJI_SOURCE().observeEmojiAutocompletables(channel), chatInputAutocompletables.getCHANNEL_SOURCE().observeChannelAutocompletables(channel.f()), chatInputAutocompletables.getUSERS_SOURCE().observeUserAutocompletables(channel), AnonymousClass1.INSTANCE);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java
new file mode 100644
index 0000000000..f0023b9cf8
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletables.java
@@ -0,0 +1,50 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.stores.StoreStream;
+import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
+import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
+import com.discord.widgets.chat.input.autocomplete.sources.ApplicationCommandsAutocompletableSource;
+import com.discord.widgets.chat.input.autocomplete.sources.ChannelAutocompletableSource;
+import com.discord.widgets.chat.input.autocomplete.sources.EmojiAutocompletableSource;
+import com.discord.widgets.chat.input.autocomplete.sources.UserAutocompletableSource;
+import d0.g;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.Set;
+import kotlin.Lazy;
+import rx.Observable;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletables {
+    private static final Lazy APPLICATION_COMMANDS_SOURCE$delegate = g.lazy(ChatInputAutocompletables$APPLICATION_COMMANDS_SOURCE$2.INSTANCE);
+    private static final Lazy CHANNEL_SOURCE$delegate = g.lazy(ChatInputAutocompletables$CHANNEL_SOURCE$2.INSTANCE);
+    private static final Lazy EMOJI_SOURCE$delegate = g.lazy(ChatInputAutocompletables$EMOJI_SOURCE$2.INSTANCE);
+    public static final ChatInputAutocompletables INSTANCE = new ChatInputAutocompletables();
+    private static final Lazy USERS_SOURCE$delegate = g.lazy(ChatInputAutocompletables$USERS_SOURCE$2.INSTANCE);
+
+    private ChatInputAutocompletables() {
+    }
+
+    public final ApplicationCommandsAutocompletableSource getAPPLICATION_COMMANDS_SOURCE() {
+        return (ApplicationCommandsAutocompletableSource) APPLICATION_COMMANDS_SOURCE$delegate.getValue();
+    }
+
+    public final ChannelAutocompletableSource getCHANNEL_SOURCE() {
+        return (ChannelAutocompletableSource) CHANNEL_SOURCE$delegate.getValue();
+    }
+
+    public final EmojiAutocompletableSource getEMOJI_SOURCE() {
+        return (EmojiAutocompletableSource) EMOJI_SOURCE$delegate.getValue();
+    }
+
+    public final UserAutocompletableSource getUSERS_SOURCE() {
+        return (UserAutocompletableSource) USERS_SOURCE$delegate.getValue();
+    }
+
+    public final Observable<Map<LeadingIdentifier, Set<Autocompletable>>> observeChannelAutocompletables() {
+        Observable<R> F = StoreStream.Companion.getChannelsSelected().observeSelectedChannel().x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable<Map<LeadingIdentifier, Set<Autocompletable>>> Y = F.Y(ChatInputAutocompletables$observeChannelAutocompletables$1.INSTANCE);
+        m.checkNotNullExpressionValue(Y, "StoreStream.getChannelsS…les\n          }\n        }");
+        return Y;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletablesKt.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletablesKt.java
new file mode 100644
index 0000000000..8988aa173a
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/ChatInputAutocompletablesKt.java
@@ -0,0 +1,36 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import d0.t.n0;
+import d0.t.o;
+import d0.z.d.m;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+/* compiled from: ChatInputAutocompletables.kt */
+public final class ChatInputAutocompletablesKt {
+    public static final /* synthetic */ void access$merge(Map map, Map map2) {
+        merge(map, map2);
+    }
+
+    public static final List<Autocompletable> flatten(Map<LeadingIdentifier, ? extends List<? extends Autocompletable>> map) {
+        m.checkNotNullParameter(map, "$this$flatten");
+        return o.flatten(map.values());
+    }
+
+    private static final void merge(Map<LeadingIdentifier, TreeSet<Autocompletable>> map, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> map2) {
+        for (LeadingIdentifier leadingIdentifier : map2.keySet()) {
+            TreeSet<Autocompletable> treeSet = map.get(leadingIdentifier);
+            if (treeSet == null) {
+                treeSet = new TreeSet<>(new AutocompletableComparator());
+                map.put(leadingIdentifier, treeSet);
+            }
+            TreeSet<Autocompletable> treeSet2 = treeSet;
+            Set set = (Set) map2.get(leadingIdentifier);
+            if (set == null) {
+                set = n0.emptySet();
+            }
+            treeSet2.addAll(set);
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java
new file mode 100644
index 0000000000..f472970048
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiAutocompletable.java
@@ -0,0 +1,129 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.models.domain.emoji.Emoji;
+import d0.t.o;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import kotlin.NoWhenBranchMatchedException;
+/* compiled from: Autocompletable.kt */
+public final class EmojiAutocompletable extends Autocompletable {
+    private final boolean animationsEnabled;
+    private final Emoji emoji;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public EmojiAutocompletable(Emoji emoji, boolean z2) {
+        super(null);
+        m.checkNotNullParameter(emoji, "emoji");
+        this.emoji = emoji;
+        this.animationsEnabled = z2;
+    }
+
+    public static /* synthetic */ EmojiAutocompletable copy$default(EmojiAutocompletable emojiAutocompletable, Emoji emoji, boolean z2, int i, Object obj) {
+        if ((i & 1) != 0) {
+            emoji = emojiAutocompletable.emoji;
+        }
+        if ((i & 2) != 0) {
+            z2 = emojiAutocompletable.animationsEnabled;
+        }
+        return emojiAutocompletable.copy(emoji, z2);
+    }
+
+    public final Emoji component1() {
+        return this.emoji;
+    }
+
+    public final boolean component2() {
+        return this.animationsEnabled;
+    }
+
+    public final EmojiAutocompletable copy(Emoji emoji, boolean z2) {
+        m.checkNotNullParameter(emoji, "emoji");
+        return new EmojiAutocompletable(emoji, z2);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof EmojiAutocompletable)) {
+            return false;
+        }
+        EmojiAutocompletable emojiAutocompletable = (EmojiAutocompletable) obj;
+        return m.areEqual(this.emoji, emojiAutocompletable.emoji) && this.animationsEnabled == emojiAutocompletable.animationsEnabled;
+    }
+
+    public final boolean getAnimationsEnabled() {
+        return this.animationsEnabled;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getAutocompleteTextMatchers() {
+        return null;
+    }
+
+    public final Emoji getEmoji() {
+        return this.emoji;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getHiddenInputTextMatchers() {
+        if (!this.emoji.requiresColons()) {
+            return this.emoji.getNames();
+        }
+        return null;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        String messageContentReplacement = this.emoji.getMessageContentReplacement();
+        m.checkNotNullExpressionValue(messageContentReplacement, "emoji.messageContentReplacement");
+        return messageContentReplacement;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        List<String> names = this.emoji.getNames();
+        m.checkNotNullExpressionValue(names, "emoji.names");
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(names, 10));
+        Iterator<T> it = names.iterator();
+        while (it.hasNext()) {
+            arrayList.add(':' + ((String) it.next()) + ':');
+        }
+        return arrayList;
+    }
+
+    public int hashCode() {
+        Emoji emoji = this.emoji;
+        int hashCode = (emoji != null ? emoji.hashCode() : 0) * 31;
+        boolean z2 = this.animationsEnabled;
+        if (z2) {
+            z2 = true;
+        }
+        int i = z2 ? 1 : 0;
+        int i2 = z2 ? 1 : 0;
+        int i3 = z2 ? 1 : 0;
+        return hashCode + i;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public LeadingIdentifier leadingIdentifier() {
+        boolean requiresColons = this.emoji.requiresColons();
+        if (requiresColons) {
+            return LeadingIdentifier.EMOJI_AND_STICKERS;
+        }
+        if (!requiresColons) {
+            return LeadingIdentifier.NONE;
+        }
+        throw new NoWhenBranchMatchedException();
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("EmojiAutocompletable(emoji=");
+        L.append(this.emoji);
+        L.append(", animationsEnabled=");
+        return a.G(L, this.animationsEnabled, ")");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiUpsellPlaceholder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiUpsellPlaceholder.java
new file mode 100644
index 0000000000..c8ef6e213b
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/EmojiUpsellPlaceholder.java
@@ -0,0 +1,58 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import com.discord.models.domain.emoji.Emoji;
+import d0.t.n;
+import d0.z.d.m;
+import java.util.List;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: Autocompletable.kt */
+public final class EmojiUpsellPlaceholder extends Autocompletable {
+    public static final Companion Companion = new Companion(null);
+    public static final int EMOJI_PREVIEW_COUNT = 3;
+    private final boolean allowEmojiToAnimate;
+    private final List<Emoji> lockedFirstThree;
+    private final int lockedTotal;
+
+    /* compiled from: Autocompletable.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends com.discord.models.domain.emoji.Emoji> */
+    /* JADX WARN: Multi-variable type inference failed */
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public EmojiUpsellPlaceholder(int i, List<? extends Emoji> list, boolean z2) {
+        super(null);
+        m.checkNotNullParameter(list, "lockedFirstThree");
+        this.lockedTotal = i;
+        this.lockedFirstThree = list;
+        this.allowEmojiToAnimate = z2;
+    }
+
+    public final boolean getAllowEmojiToAnimate() {
+        return this.allowEmojiToAnimate;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        return "";
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return n.emptyList();
+    }
+
+    public final List<Emoji> getLockedFirstThree() {
+        return this.lockedFirstThree;
+    }
+
+    public final int getLockedTotal() {
+        return this.lockedTotal;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java
new file mode 100644
index 0000000000..4ee5c67b97
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$everyone$2.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: Autocompletable.kt */
+public final class GlobalRoleAutocompletable$Companion$everyone$2 extends o implements Function0<GlobalRoleAutocompletable> {
+    public static final GlobalRoleAutocompletable$Companion$everyone$2 INSTANCE = new GlobalRoleAutocompletable$Companion$everyone$2();
+
+    public GlobalRoleAutocompletable$Companion$everyone$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final GlobalRoleAutocompletable mo1invoke() {
+        return new GlobalRoleAutocompletable("everyone");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$here$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$here$2.java
new file mode 100644
index 0000000000..0c0988a6fc
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable$Companion$here$2.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: Autocompletable.kt */
+public final class GlobalRoleAutocompletable$Companion$here$2 extends o implements Function0<GlobalRoleAutocompletable> {
+    public static final GlobalRoleAutocompletable$Companion$here$2 INSTANCE = new GlobalRoleAutocompletable$Companion$here$2();
+
+    public GlobalRoleAutocompletable$Companion$here$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final GlobalRoleAutocompletable mo1invoke() {
+        return new GlobalRoleAutocompletable("here");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java
new file mode 100644
index 0000000000..4ac625eb9a
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/GlobalRoleAutocompletable.java
@@ -0,0 +1,106 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import d0.g;
+import d0.z.d.m;
+import java.util.List;
+import kotlin.Lazy;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: Autocompletable.kt */
+public final class GlobalRoleAutocompletable extends Autocompletable {
+    public static final Companion Companion = new Companion(null);
+    private static final Lazy everyone$delegate = g.lazy(GlobalRoleAutocompletable$Companion$everyone$2.INSTANCE);
+    private static final Lazy here$delegate = g.lazy(GlobalRoleAutocompletable$Companion$here$2.INSTANCE);
+    private final String text;
+
+    /* compiled from: Autocompletable.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final GlobalRoleAutocompletable getEveryone() {
+            Lazy access$getEveryone$cp = GlobalRoleAutocompletable.access$getEveryone$cp();
+            Companion companion = GlobalRoleAutocompletable.Companion;
+            return (GlobalRoleAutocompletable) access$getEveryone$cp.getValue();
+        }
+
+        public final GlobalRoleAutocompletable getHere() {
+            Lazy access$getHere$cp = GlobalRoleAutocompletable.access$getHere$cp();
+            Companion companion = GlobalRoleAutocompletable.Companion;
+            return (GlobalRoleAutocompletable) access$getHere$cp.getValue();
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public GlobalRoleAutocompletable(String str) {
+        super(null);
+        m.checkNotNullParameter(str, "text");
+        this.text = str;
+    }
+
+    public static final /* synthetic */ Lazy access$getEveryone$cp() {
+        return everyone$delegate;
+    }
+
+    public static final /* synthetic */ Lazy access$getHere$cp() {
+        return here$delegate;
+    }
+
+    public static /* synthetic */ GlobalRoleAutocompletable copy$default(GlobalRoleAutocompletable globalRoleAutocompletable, String str, int i, Object obj) {
+        if ((i & 1) != 0) {
+            str = globalRoleAutocompletable.text;
+        }
+        return globalRoleAutocompletable.copy(str);
+    }
+
+    public final String component1() {
+        return this.text;
+    }
+
+    public final GlobalRoleAutocompletable copy(String str) {
+        m.checkNotNullParameter(str, "text");
+        return new GlobalRoleAutocompletable(str);
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof GlobalRoleAutocompletable) && m.areEqual(this.text, ((GlobalRoleAutocompletable) obj).text);
+        }
+        return true;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        return leadingIdentifier().getIdentifier() + this.text;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return d0.t.m.listOf(leadingIdentifier().getIdentifier() + this.text);
+    }
+
+    public final String getText() {
+        return this.text;
+    }
+
+    public int hashCode() {
+        String str = this.text;
+        if (str != null) {
+            return str.hashCode();
+        }
+        return 0;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public LeadingIdentifier leadingIdentifier() {
+        return LeadingIdentifier.MENTION;
+    }
+
+    public String toString() {
+        return a.D(a.L("GlobalRoleAutocompletable(text="), this.text, ")");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java
new file mode 100644
index 0000000000..cd715184c2
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/LeadingIdentifier.java
@@ -0,0 +1,36 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: Autocompletable.kt */
+public enum LeadingIdentifier {
+    APP_COMMAND('/'),
+    EMOJI_AND_STICKERS(':'),
+    CHANNELS('#'),
+    MENTION('@'),
+    NONE(null);
+    
+    public static final Companion Companion = new Companion(null);
+    private final Character identifier;
+
+    /* compiled from: Autocompletable.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final LeadingIdentifier fromChar(Character ch) {
+            return (ch != null && ch.charValue() == '/') ? LeadingIdentifier.APP_COMMAND : (ch != null && ch.charValue() == ':') ? LeadingIdentifier.EMOJI_AND_STICKERS : (ch != null && ch.charValue() == '#') ? LeadingIdentifier.CHANNELS : (ch != null && ch.charValue() == '@') ? LeadingIdentifier.MENTION : LeadingIdentifier.NONE;
+        }
+    }
+
+    private LeadingIdentifier(Character ch) {
+        this.identifier = ch;
+    }
+
+    public final Character getIdentifier() {
+        return this.identifier;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/RoleAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/RoleAutocompletable.java
new file mode 100644
index 0000000000..af1ce86f25
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/RoleAutocompletable.java
@@ -0,0 +1,79 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.api.role.GuildRole;
+import d0.z.d.m;
+import java.util.List;
+/* compiled from: Autocompletable.kt */
+public final class RoleAutocompletable extends Autocompletable {
+    private final GuildRole role;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public RoleAutocompletable(GuildRole guildRole) {
+        super(null);
+        m.checkNotNullParameter(guildRole, "role");
+        this.role = guildRole;
+    }
+
+    public static /* synthetic */ RoleAutocompletable copy$default(RoleAutocompletable roleAutocompletable, GuildRole guildRole, int i, Object obj) {
+        if ((i & 1) != 0) {
+            guildRole = roleAutocompletable.role;
+        }
+        return roleAutocompletable.copy(guildRole);
+    }
+
+    public final GuildRole component1() {
+        return this.role;
+    }
+
+    public final RoleAutocompletable copy(GuildRole guildRole) {
+        m.checkNotNullParameter(guildRole, "role");
+        return new RoleAutocompletable(guildRole);
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof RoleAutocompletable) && m.areEqual(this.role, ((RoleAutocompletable) obj).role);
+        }
+        return true;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        StringBuilder J = a.J('<');
+        J.append(leadingIdentifier().getIdentifier());
+        J.append('&');
+        J.append(this.role.getId());
+        J.append('>');
+        return J.toString();
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return d0.t.m.listOf(leadingIdentifier().getIdentifier() + this.role.f());
+    }
+
+    public final GuildRole getRole() {
+        return this.role;
+    }
+
+    public int hashCode() {
+        GuildRole guildRole = this.role;
+        if (guildRole != null) {
+            return guildRole.hashCode();
+        }
+        return 0;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public LeadingIdentifier leadingIdentifier() {
+        return LeadingIdentifier.MENTION;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("RoleAutocompletable(role=");
+        L.append(this.role);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/UserAutocompletable.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/UserAutocompletable.java
new file mode 100644
index 0000000000..b5f89f5025
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/UserAutocompletable.java
@@ -0,0 +1,172 @@
+package com.discord.widgets.chat.input.autocomplete;
+
+import c.d.b.a.a;
+import com.discord.models.member.GuildMember;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.utilities.user.UserUtils;
+import d0.z.d.m;
+import java.util.List;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: Autocompletable.kt */
+public final class UserAutocompletable extends Autocompletable {
+    private final boolean canUserReadChannel;
+    private final GuildMember guildMember;
+    private final String nickname;
+    private final Presence presence;
+    private final User user;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public UserAutocompletable(User user, GuildMember guildMember, String str, Presence presence, boolean z2) {
+        super(null);
+        m.checkNotNullParameter(user, "user");
+        this.user = user;
+        this.guildMember = guildMember;
+        this.nickname = str;
+        this.presence = presence;
+        this.canUserReadChannel = z2;
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ UserAutocompletable(User user, GuildMember guildMember, String str, Presence presence, boolean z2, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(user, (i & 2) != 0 ? null : guildMember, (i & 4) != 0 ? null : str, (i & 8) != 0 ? null : presence, (i & 16) != 0 ? true : z2);
+    }
+
+    public static /* synthetic */ UserAutocompletable copy$default(UserAutocompletable userAutocompletable, User user, GuildMember guildMember, String str, Presence presence, boolean z2, int i, Object obj) {
+        if ((i & 1) != 0) {
+            user = userAutocompletable.user;
+        }
+        if ((i & 2) != 0) {
+            guildMember = userAutocompletable.guildMember;
+        }
+        if ((i & 4) != 0) {
+            str = userAutocompletable.nickname;
+        }
+        if ((i & 8) != 0) {
+            presence = userAutocompletable.presence;
+        }
+        if ((i & 16) != 0) {
+            z2 = userAutocompletable.canUserReadChannel;
+        }
+        return userAutocompletable.copy(user, guildMember, str, presence, z2);
+    }
+
+    public final User component1() {
+        return this.user;
+    }
+
+    public final GuildMember component2() {
+        return this.guildMember;
+    }
+
+    public final String component3() {
+        return this.nickname;
+    }
+
+    public final Presence component4() {
+        return this.presence;
+    }
+
+    public final boolean component5() {
+        return this.canUserReadChannel;
+    }
+
+    public final UserAutocompletable copy(User user, GuildMember guildMember, String str, Presence presence, boolean z2) {
+        m.checkNotNullParameter(user, "user");
+        return new UserAutocompletable(user, guildMember, str, presence, z2);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof UserAutocompletable)) {
+            return false;
+        }
+        UserAutocompletable userAutocompletable = (UserAutocompletable) obj;
+        return m.areEqual(this.user, userAutocompletable.user) && m.areEqual(this.guildMember, userAutocompletable.guildMember) && m.areEqual(this.nickname, userAutocompletable.nickname) && m.areEqual(this.presence, userAutocompletable.presence) && this.canUserReadChannel == userAutocompletable.canUserReadChannel;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getAutocompleteTextMatchers() {
+        if (this.nickname == null) {
+            return null;
+        }
+        return d0.t.m.listOf(leadingIdentifier().getIdentifier() + this.nickname);
+    }
+
+    public final boolean getCanUserReadChannel() {
+        return this.canUserReadChannel;
+    }
+
+    public final GuildMember getGuildMember() {
+        return this.guildMember;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public String getInputReplacement() {
+        StringBuilder J = a.J('<');
+        J.append(leadingIdentifier().getIdentifier());
+        J.append(this.user.getId());
+        J.append('>');
+        return J.toString();
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public List<String> getInputTextMatchers() {
+        return d0.t.m.listOf(leadingIdentifier().getIdentifier() + this.user.getUsername() + UserUtils.INSTANCE.getDiscriminatorWithPadding(this.user));
+    }
+
+    public final String getNickname() {
+        return this.nickname;
+    }
+
+    public final Presence getPresence() {
+        return this.presence;
+    }
+
+    public final User getUser() {
+        return this.user;
+    }
+
+    public int hashCode() {
+        User user = this.user;
+        int i = 0;
+        int hashCode = (user != null ? user.hashCode() : 0) * 31;
+        GuildMember guildMember = this.guildMember;
+        int hashCode2 = (hashCode + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
+        String str = this.nickname;
+        int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31;
+        Presence presence = this.presence;
+        if (presence != null) {
+            i = presence.hashCode();
+        }
+        int i2 = (hashCode3 + i) * 31;
+        boolean z2 = this.canUserReadChannel;
+        if (z2) {
+            z2 = true;
+        }
+        int i3 = z2 ? 1 : 0;
+        int i4 = z2 ? 1 : 0;
+        int i5 = z2 ? 1 : 0;
+        return i2 + i3;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.Autocompletable
+    public LeadingIdentifier leadingIdentifier() {
+        return LeadingIdentifier.MENTION;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("UserAutocompletable(user=");
+        L.append(this.user);
+        L.append(", guildMember=");
+        L.append(this.guildMember);
+        L.append(", nickname=");
+        L.append(this.nickname);
+        L.append(", presence=");
+        L.append(this.presence);
+        L.append(", canUserReadChannel=");
+        return a.G(L, this.canUserReadChannel, ")");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ApplicationCommandLoadingViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ApplicationCommandLoadingViewHolder.java
new file mode 100644
index 0000000000..2e30251f5e
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ApplicationCommandLoadingViewHolder.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.databinding.WidgetChatInputSlashLoadingItemBinding;
+import d0.z.d.m;
+/* compiled from: ApplicationCommandLoadingViewHolder.kt */
+public final class ApplicationCommandLoadingViewHolder extends RecyclerView.ViewHolder {
+    private final WidgetChatInputSlashLoadingItemBinding binding;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ApplicationCommandLoadingViewHolder(WidgetChatInputSlashLoadingItemBinding widgetChatInputSlashLoadingItemBinding) {
+        super(widgetChatInputSlashLoadingItemBinding.a);
+        m.checkNotNullParameter(widgetChatInputSlashLoadingItemBinding, "binding");
+        this.binding = widgetChatInputSlashLoadingItemBinding;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder$bind$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder$bind$1.java
new file mode 100644
index 0000000000..9bda35e250
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder$bind$1.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.view.View;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+/* compiled from: AutocompleteItemViewHolder.kt */
+public final class AutocompleteItemViewHolder$bind$1 implements View.OnClickListener {
+    public final /* synthetic */ Autocompletable $autocompletable;
+    public final /* synthetic */ AutocompleteItemViewHolder this$0;
+
+    public AutocompleteItemViewHolder$bind$1(AutocompleteItemViewHolder autocompleteItemViewHolder, Autocompletable autocompletable) {
+        this.this$0 = autocompleteItemViewHolder;
+        this.$autocompletable = autocompletable;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        AutocompleteItemViewHolder.access$getOnItemSelected$p(this.this$0).invoke(this.$autocompletable);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder$bindEmoji$emojiNode$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder$bindEmoji$emojiNode$1.java
new file mode 100644
index 0000000000..13d463e4ff
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder$bindEmoji$emojiNode$1.java
@@ -0,0 +1,31 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.content.Context;
+import com.discord.models.domain.emoji.Emoji;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function3;
+/* compiled from: AutocompleteItemViewHolder.kt */
+public final class AutocompleteItemViewHolder$bindEmoji$emojiNode$1 extends o implements Function3<Boolean, Integer, Context, String> {
+    public final /* synthetic */ Emoji $emoji;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public AutocompleteItemViewHolder$bindEmoji$emojiNode$1(Emoji emoji) {
+        super(3);
+        this.$emoji = emoji;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function3
+    public /* bridge */ /* synthetic */ String invoke(Boolean bool, Integer num, Context context) {
+        return invoke(bool.booleanValue(), num.intValue(), context);
+    }
+
+    public final String invoke(boolean z2, int i, Context context) {
+        m.checkNotNullParameter(context, "context");
+        String imageUri = this.$emoji.getImageUri(z2, 32, context);
+        m.checkNotNullExpressionValue(imageUri, "emoji.getImageUri(isAnimated, 32, context)");
+        return imageUri;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
new file mode 100644
index 0000000000..ccb08f7e78
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java
@@ -0,0 +1,402 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.widget.TextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import c.a.l.b;
+import c.d.b.a.a;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.channel.Channel;
+import com.discord.api.role.GuildRole;
+import com.discord.databinding.WidgetChatInputAutocompleteItemBinding;
+import com.discord.models.commands.Application;
+import com.discord.models.commands.ApplicationCommand;
+import com.discord.models.domain.emoji.Emoji;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.stores.StoreApplicationCommandsKt;
+import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.dimen.DimenUtils;
+import com.discord.utilities.guilds.RoleUtils;
+import com.discord.utilities.icon.IconUtils;
+import com.discord.utilities.images.MGImages;
+import com.discord.utilities.textprocessing.AstRenderer;
+import com.discord.utilities.textprocessing.node.EmojiNode;
+import com.discord.utilities.user.UserUtils;
+import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
+import com.discord.views.StatusView;
+import com.discord.widgets.chat.input.UserAndSelectedGuildRoles;
+import com.discord.widgets.chat.input.applicationcommands.WidgetChatInputModelMappingFunctionsKt;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandChoiceAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.ChannelAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.GlobalRoleAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.RoleAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.UserAutocompletable;
+import com.facebook.drawee.span.DraweeSpanStringBuilder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import d0.g0.t;
+import d0.g0.w;
+import d0.z.d.m;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: AutocompleteItemViewHolder.kt */
+public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder {
+    private final WidgetChatInputAutocompleteItemBinding binding;
+    private final int defaultItemTextColor;
+    private final Function1<Autocompletable, Unit> onItemSelected;
+
+    /* compiled from: AutocompleteItemViewHolder.kt */
+    public final class EmojiAutocompleteRenderContext implements EmojiNode.RenderContext {
+        private final Context context;
+        private final boolean isAnimationEnabled;
+        public final /* synthetic */ AutocompleteItemViewHolder this$0;
+
+        public EmojiAutocompleteRenderContext(AutocompleteItemViewHolder autocompleteItemViewHolder, boolean z2, Context context) {
+            m.checkNotNullParameter(context, "context");
+            this.this$0 = autocompleteItemViewHolder;
+            this.isAnimationEnabled = z2;
+            this.context = context;
+        }
+
+        @Override // com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
+        public Context getContext() {
+            return this.context;
+        }
+
+        @Override // com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
+        public boolean isAnimationEnabled() {
+            return this.isAnimationEnabled;
+        }
+
+        @Override // com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
+        public void onEmojiClicked(EmojiNode.EmojiIdAndType emojiIdAndType) {
+            m.checkNotNullParameter(emojiIdAndType, "emojiIdAndType");
+            EmojiNode.RenderContext.DefaultImpls.onEmojiClicked(this, emojiIdAndType);
+        }
+    }
+
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.autocomplete.Autocompletable, kotlin.Unit> */
+    /* JADX WARN: Multi-variable type inference failed */
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public AutocompleteItemViewHolder(WidgetChatInputAutocompleteItemBinding widgetChatInputAutocompleteItemBinding, Function1<? super Autocompletable, Unit> function1) {
+        super(widgetChatInputAutocompleteItemBinding.a);
+        m.checkNotNullParameter(widgetChatInputAutocompleteItemBinding, "binding");
+        m.checkNotNullParameter(function1, "onItemSelected");
+        this.binding = widgetChatInputAutocompleteItemBinding;
+        this.onItemSelected = function1;
+        TextView textView = widgetChatInputAutocompleteItemBinding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        this.defaultItemTextColor = textView.getCurrentTextColor();
+    }
+
+    public static final /* synthetic */ Function1 access$getOnItemSelected$p(AutocompleteItemViewHolder autocompleteItemViewHolder) {
+        return autocompleteItemViewHolder.onItemSelected;
+    }
+
+    private final void bindChannel(ChannelAutocompletable channelAutocompletable) {
+        Channel channel = channelAutocompletable.getChannel();
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        textView.setText(channel.m());
+        int i = AnimatableValueParser.B1(channel) ? 2131231498 : AnimatableValueParser.k1(channel) ? 2131231489 : 2131231673;
+        SimpleDraweeView simpleDraweeView = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
+        int color = ColorCompat.getColor(simpleDraweeView, 2131100128);
+        SimpleDraweeView simpleDraweeView2 = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
+        simpleDraweeView2.setVisibility(0);
+        int dpToPixels = DimenUtils.dpToPixels(6);
+        this.binding.b.setPadding(dpToPixels, dpToPixels, dpToPixels, dpToPixels);
+        MGImages mGImages = MGImages.INSTANCE;
+        SimpleDraweeView simpleDraweeView3 = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView3, "binding.chatInputItemAvatar");
+        MGImages.setImage$default(mGImages, simpleDraweeView3, i, (MGImages.ChangeDetector) null, 4, (Object) null);
+        this.binding.b.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+    }
+
+    public final void bind(Autocompletable autocompletable, boolean z2, UserAndSelectedGuildRoles userAndSelectedGuildRoles) {
+        m.checkNotNullParameter(autocompletable, "autocompletable");
+        clearBinding();
+        if (autocompletable instanceof ApplicationCommandChoiceAutocompletable) {
+            bindCommandChoice((ApplicationCommandChoiceAutocompletable) autocompletable);
+        } else if (autocompletable instanceof ApplicationCommandAutocompletable) {
+            bindCommand((ApplicationCommandAutocompletable) autocompletable, z2, userAndSelectedGuildRoles);
+        } else if (autocompletable instanceof ChannelAutocompletable) {
+            bindChannel((ChannelAutocompletable) autocompletable);
+        } else if (autocompletable instanceof EmojiAutocompletable) {
+            bindEmoji((EmojiAutocompletable) autocompletable);
+        } else if (autocompletable instanceof GlobalRoleAutocompletable) {
+            bindGlobalRole((GlobalRoleAutocompletable) autocompletable);
+        } else if (autocompletable instanceof RoleAutocompletable) {
+            bindRole((RoleAutocompletable) autocompletable);
+        } else if (autocompletable instanceof UserAutocompletable) {
+            bindUser((UserAutocompletable) autocompletable);
+        } else {
+            throw new IllegalStateException("Cannot bind autocompletable. Not configured");
+        }
+        this.binding.a.setOnClickListener(new AutocompleteItemViewHolder$bind$1(this, autocompletable));
+    }
+
+    public final void bindCommand(ApplicationCommandAutocompletable applicationCommandAutocompletable, boolean z2, UserAndSelectedGuildRoles userAndSelectedGuildRoles) {
+        m.checkNotNullParameter(applicationCommandAutocompletable, "commandAutocompletable");
+        ApplicationCommand command = applicationCommandAutocompletable.getCommand();
+        Application application = applicationCommandAutocompletable.getApplication();
+        if (!(userAndSelectedGuildRoles == null || WidgetChatInputModelMappingFunctionsKt.hasPermission(command, userAndSelectedGuildRoles))) {
+            ConstraintLayout constraintLayout = this.binding.a;
+            m.checkNotNullExpressionValue(constraintLayout, "binding.root");
+            constraintLayout.setEnabled(false);
+            ConstraintLayout constraintLayout2 = this.binding.a;
+            m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
+            constraintLayout2.setAlpha(0.3f);
+        }
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        textView.setText(command.getName());
+        ConstraintLayout constraintLayout3 = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout3, "binding.root");
+        Resources resources = constraintLayout3.getResources();
+        m.checkNotNullExpressionValue(resources, "binding.root.resources");
+        String descriptionText = StoreApplicationCommandsKt.getDescriptionText(command, resources);
+        if (descriptionText != null && (!t.isBlank(descriptionText))) {
+            TextView textView2 = this.binding.f1718c;
+            m.checkNotNullExpressionValue(textView2, "binding.chatInputItemDescription");
+            textView2.setVisibility(0);
+            TextView textView3 = this.binding.f1718c;
+            m.checkNotNullExpressionValue(textView3, "binding.chatInputItemDescription");
+            textView3.setText(w.trim(descriptionText).toString());
+        }
+        if (application != null) {
+            TextView textView4 = this.binding.f;
+            m.checkNotNullExpressionValue(textView4, "binding.chatInputItemNameRight");
+            textView4.setVisibility(0);
+            TextView textView5 = this.binding.f;
+            m.checkNotNullExpressionValue(textView5, "binding.chatInputItemNameRight");
+            String name = application.getName();
+            Locale locale = Locale.getDefault();
+            m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
+            Objects.requireNonNull(name, "null cannot be cast to non-null type java.lang.String");
+            String upperCase = name.toUpperCase(locale);
+            m.checkNotNullExpressionValue(upperCase, "(this as java.lang.String).toUpperCase(locale)");
+            textView5.setText(upperCase);
+            ConstraintLayout constraintLayout4 = this.binding.a;
+            m.checkNotNullExpressionValue(constraintLayout4, "binding.root");
+            TextView textView6 = this.binding.f1718c;
+            m.checkNotNullExpressionValue(textView6, "binding.chatInputItemDescription");
+            CharSequence i = b.i(constraintLayout4, 2131887426, new Object[]{command.getName(), textView6.getText(), application.getName()}, null, 4);
+            ConstraintLayout constraintLayout5 = this.binding.a;
+            m.checkNotNullExpressionValue(constraintLayout5, "binding.root");
+            constraintLayout5.setContentDescription(i);
+        }
+        if (z2) {
+            SimpleDraweeView simpleDraweeView = this.binding.b;
+            m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
+            simpleDraweeView.setVisibility(0);
+            if (application != null) {
+                SimpleDraweeView simpleDraweeView2 = this.binding.b;
+                m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
+                IconUtils.setApplicationIcon(simpleDraweeView2, application, false);
+                return;
+            }
+            ConstraintLayout constraintLayout6 = this.binding.a;
+            m.checkNotNullExpressionValue(constraintLayout6, "binding.root");
+            int themedColor = ColorCompat.getThemedColor(constraintLayout6, 2130968988);
+            MGImages mGImages = MGImages.INSTANCE;
+            SimpleDraweeView simpleDraweeView3 = this.binding.b;
+            m.checkNotNullExpressionValue(simpleDraweeView3, "binding.chatInputItemAvatar");
+            MGImages.setImage$default(mGImages, simpleDraweeView3, 2131231937, (MGImages.ChangeDetector) null, 4, (Object) null);
+            this.binding.b.setColorFilter(themedColor, PorterDuff.Mode.SRC_ATOP);
+        }
+    }
+
+    public final void bindCommandChoice(ApplicationCommandChoiceAutocompletable applicationCommandChoiceAutocompletable) {
+        m.checkNotNullParameter(applicationCommandChoiceAutocompletable, "commandChoiceAutocompletable");
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        textView.setText(applicationCommandChoiceAutocompletable.getChoice().a());
+    }
+
+    public final void bindEmoji(EmojiAutocompletable emojiAutocompletable) {
+        m.checkNotNullParameter(emojiAutocompletable, "emojiAutocompletable");
+        Emoji emoji = emojiAutocompletable.getEmoji();
+        String firstName = emoji.getFirstName();
+        m.checkNotNullExpressionValue(firstName, "emoji.firstName");
+        EmojiNode.EmojiIdAndType.Unicode unicode = new EmojiNode.EmojiIdAndType.Unicode(firstName);
+        String firstName2 = emoji.getFirstName();
+        m.checkNotNullExpressionValue(firstName2, "emoji.firstName");
+        EmojiNode emojiNode = new EmojiNode(firstName2, new AutocompleteItemViewHolder$bindEmoji$emojiNode$1(emoji), unicode, 0, 0, 24, null);
+        boolean animationsEnabled = emojiAutocompletable.getAnimationsEnabled();
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
+        m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.chatInputItemEmoji");
+        Context context = simpleDraweeSpanTextView.getContext();
+        m.checkNotNullExpressionValue(context, "binding.chatInputItemEmoji.context");
+        EmojiAutocompleteRenderContext emojiAutocompleteRenderContext = new EmojiAutocompleteRenderContext(this, animationsEnabled, context);
+        Set singleton = Collections.singleton(emojiNode);
+        m.checkNotNullExpressionValue(singleton, "Collections.singleton(emojiNode)");
+        DraweeSpanStringBuilder render = AstRenderer.render(singleton, emojiAutocompleteRenderContext);
+        StringBuilder J = a.J(':');
+        J.append(emoji.getFirstName());
+        J.append(':');
+        String sb = J.toString();
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        textView.setText(sb);
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.d;
+        m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.chatInputItemEmoji");
+        simpleDraweeSpanTextView2.setVisibility(0);
+        this.binding.d.setDraweeSpanStringBuilder(render);
+    }
+
+    public final void bindGlobalRole(GlobalRoleAutocompletable globalRoleAutocompletable) {
+        m.checkNotNullParameter(globalRoleAutocompletable, "roleAutocompletable");
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        textView.setText(globalRoleAutocompletable.getText());
+        SimpleDraweeView simpleDraweeView = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
+        simpleDraweeView.setVisibility(0);
+        ConstraintLayout constraintLayout = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout, "binding.root");
+        Context context = constraintLayout.getContext();
+        m.checkNotNullExpressionValue(context, "binding.root.context");
+        Resources resources = context.getResources();
+        ConstraintLayout constraintLayout2 = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
+        Context context2 = constraintLayout2.getContext();
+        m.checkNotNullExpressionValue(context2, "binding.root.context");
+        Drawable drawable = ResourcesCompat.getDrawable(resources, 2131231743, context2.getTheme());
+        if (drawable != null) {
+            TextView textView2 = this.binding.e;
+            m.checkNotNullExpressionValue(textView2, "binding.chatInputItemName");
+            this.binding.b.setColorFilter(ColorCompat.getColor(textView2, 2131100272), PorterDuff.Mode.SRC_ATOP);
+            MGImages mGImages = MGImages.INSTANCE;
+            SimpleDraweeView simpleDraweeView2 = this.binding.b;
+            m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
+            m.checkNotNullExpressionValue(drawable, "it");
+            MGImages.setImage$default(mGImages, simpleDraweeView2, drawable, (MGImages.ChangeDetector) null, 4, (Object) null);
+        }
+    }
+
+    public final void bindRole(RoleAutocompletable roleAutocompletable) {
+        m.checkNotNullParameter(roleAutocompletable, "roleAutocompletable");
+        GuildRole role = roleAutocompletable.getRole();
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        int opaqueColor = RoleUtils.getOpaqueColor(role, ColorCompat.getColor(textView, 2131100272));
+        TextView textView2 = this.binding.e;
+        m.checkNotNullExpressionValue(textView2, "binding.chatInputItemName");
+        textView2.setText(roleAutocompletable.getRole().f());
+        this.binding.e.setTextColor(opaqueColor);
+        SimpleDraweeView simpleDraweeView = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
+        simpleDraweeView.setVisibility(0);
+        ConstraintLayout constraintLayout = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout, "binding.root");
+        Context context = constraintLayout.getContext();
+        m.checkNotNullExpressionValue(context, "binding.root.context");
+        Resources resources = context.getResources();
+        ConstraintLayout constraintLayout2 = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
+        Context context2 = constraintLayout2.getContext();
+        m.checkNotNullExpressionValue(context2, "binding.root.context");
+        Drawable drawable = ResourcesCompat.getDrawable(resources, 2131231743, context2.getTheme());
+        if (drawable != null) {
+            this.binding.b.setColorFilter(opaqueColor, PorterDuff.Mode.SRC_ATOP);
+            MGImages mGImages = MGImages.INSTANCE;
+            SimpleDraweeView simpleDraweeView2 = this.binding.b;
+            m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
+            m.checkNotNullExpressionValue(drawable, "it");
+            MGImages.setImage$default(mGImages, simpleDraweeView2, drawable, (MGImages.ChangeDetector) null, 4, (Object) null);
+        }
+    }
+
+    public final void bindUser(UserAutocompletable userAutocompletable) {
+        m.checkNotNullParameter(userAutocompletable, "userAutocompletable");
+        User user = userAutocompletable.getUser();
+        CharSequence userNameWithDiscriminator$default = UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user, null, null, 3, null);
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemName");
+        String nickname = userAutocompletable.getNickname();
+        if (nickname == null) {
+            nickname = user.getUsername();
+        }
+        textView.setText(nickname);
+        TextView textView2 = this.binding.f;
+        m.checkNotNullExpressionValue(textView2, "binding.chatInputItemNameRight");
+        textView2.setVisibility(0);
+        TextView textView3 = this.binding.f;
+        m.checkNotNullExpressionValue(textView3, "binding.chatInputItemNameRight");
+        textView3.setText(userNameWithDiscriminator$default);
+        SimpleDraweeView simpleDraweeView = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
+        simpleDraweeView.setVisibility(0);
+        SimpleDraweeView simpleDraweeView2 = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView2, "binding.chatInputItemAvatar");
+        IconUtils.setIcon$default(simpleDraweeView2, user, 2131165296, null, null, userAutocompletable.getGuildMember(), 24, null);
+        Presence presence = userAutocompletable.getPresence();
+        if (presence != null) {
+            StatusView statusView = this.binding.g;
+            m.checkNotNullExpressionValue(statusView, "binding.chatInputItemStatus");
+            statusView.setVisibility(0);
+            this.binding.g.setPresence(presence);
+        }
+    }
+
+    public final void clearBinding() {
+        ConstraintLayout constraintLayout = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout, "binding.root");
+        constraintLayout.setEnabled(true);
+        ConstraintLayout constraintLayout2 = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout2, "binding.root");
+        constraintLayout2.setAlpha(1.0f);
+        TextView textView = this.binding.f;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputItemNameRight");
+        textView.setText((CharSequence) null);
+        TextView textView2 = this.binding.f;
+        m.checkNotNullExpressionValue(textView2, "binding.chatInputItemNameRight");
+        textView2.setVisibility(8);
+        TextView textView3 = this.binding.e;
+        m.checkNotNullExpressionValue(textView3, "binding.chatInputItemName");
+        textView3.setText((CharSequence) null);
+        this.binding.e.setTextColor(this.defaultItemTextColor);
+        TextView textView4 = this.binding.f1718c;
+        m.checkNotNullExpressionValue(textView4, "binding.chatInputItemDescription");
+        textView4.setText((CharSequence) null);
+        TextView textView5 = this.binding.f1718c;
+        m.checkNotNullExpressionValue(textView5, "binding.chatInputItemDescription");
+        textView5.setVisibility(8);
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d;
+        m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.chatInputItemEmoji");
+        simpleDraweeSpanTextView.setText((CharSequence) null);
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.d;
+        m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.chatInputItemEmoji");
+        simpleDraweeSpanTextView2.setVisibility(8);
+        StatusView statusView = this.binding.g;
+        m.checkNotNullExpressionValue(statusView, "binding.chatInputItemStatus");
+        statusView.setVisibility(8);
+        SimpleDraweeView simpleDraweeView = this.binding.b;
+        m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatInputItemAvatar");
+        simpleDraweeView.setVisibility(8);
+        this.binding.b.setImageURI((String) null);
+        this.binding.b.setPadding(0, 0, 0, 0);
+        this.binding.b.clearColorFilter();
+        ConstraintLayout constraintLayout3 = this.binding.a;
+        m.checkNotNullExpressionValue(constraintLayout3, "binding.root");
+        constraintLayout3.setContentDescription(null);
+    }
+
+    public final int getDefaultItemTextColor() {
+        return this.defaultItemTextColor;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$onCreateViewHolder$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$onCreateViewHolder$1.java
new file mode 100644
index 0000000000..68f52f0a70
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$onCreateViewHolder$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: ChatInputAutocompleteAdapter.kt */
+public final /* synthetic */ class ChatInputAutocompleteAdapter$onCreateViewHolder$1 extends k implements Function1<Autocompletable, Unit> {
+    public ChatInputAutocompleteAdapter$onCreateViewHolder$1(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        super(1, chatInputAutocompleteAdapter, ChatInputAutocompleteAdapter.class, "onAutocompletableSelected", "onAutocompletableSelected(Lcom/discord/widgets/chat/input/autocomplete/Autocompletable;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Autocompletable autocompletable) {
+        invoke(autocompletable);
+        return Unit.a;
+    }
+
+    public final void invoke(Autocompletable autocompletable) {
+        m.checkNotNullParameter(autocompletable, "p1");
+        ((ChatInputAutocompleteAdapter) this.receiver).onAutocompletableSelected(autocompletable);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$onCreateViewHolder$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$onCreateViewHolder$2.java
new file mode 100644
index 0000000000..282f5eb7fe
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$onCreateViewHolder$2.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: ChatInputAutocompleteAdapter.kt */
+public final /* synthetic */ class ChatInputAutocompleteAdapter$onCreateViewHolder$2 extends k implements Function1<Autocompletable, Unit> {
+    public ChatInputAutocompleteAdapter$onCreateViewHolder$2(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        super(1, chatInputAutocompleteAdapter, ChatInputAutocompleteAdapter.class, "onAutocompletableSelected", "onAutocompletableSelected(Lcom/discord/widgets/chat/input/autocomplete/Autocompletable;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Autocompletable autocompletable) {
+        invoke(autocompletable);
+        return Unit.a;
+    }
+
+    public final void invoke(Autocompletable autocompletable) {
+        m.checkNotNullParameter(autocompletable, "p1");
+        ((ChatInputAutocompleteAdapter) this.receiver).onAutocompletableSelected(autocompletable);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupScrollObservables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupScrollObservables$1.java
new file mode 100644
index 0000000000..23a25075f0
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupScrollObservables$1.java
@@ -0,0 +1,38 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import androidx.recyclerview.widget.RecyclerView;
+import d0.z.d.m;
+import rx.Emitter;
+import rx.functions.Action1;
+/* compiled from: ChatInputAutocompleteAdapter.kt */
+public final class ChatInputAutocompleteAdapter$setupScrollObservables$1<T> implements Action1<Emitter<Object>> {
+    public final /* synthetic */ ChatInputAutocompleteAdapter this$0;
+
+    /* compiled from: ChatInputAutocompleteAdapter.kt */
+    /* renamed from: com.discord.widgets.chat.input.autocomplete.adapter.ChatInputAutocompleteAdapter$setupScrollObservables$1$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends RecyclerView.OnScrollListener {
+        public final /* synthetic */ Emitter $emitter;
+
+        public AnonymousClass1(Emitter emitter) {
+            this.$emitter = emitter;
+        }
+
+        /* JADX DEBUG: Multi-variable search result rejected for r2v1, resolved type: rx.Emitter */
+        /* JADX WARN: Multi-variable type inference failed */
+        @Override // androidx.recyclerview.widget.RecyclerView.OnScrollListener
+        public void onScrolled(RecyclerView recyclerView, int i, int i2) {
+            m.checkNotNullParameter(recyclerView, "recyclerView");
+            super.onScrolled(recyclerView, i, i2);
+            this.$emitter.onNext(0);
+        }
+    }
+
+    public ChatInputAutocompleteAdapter$setupScrollObservables$1(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        this.this$0 = chatInputAutocompleteAdapter;
+    }
+
+    public final void call(Emitter<Object> emitter) {
+        m.checkNotNullParameter(emitter, "emitter");
+        ChatInputAutocompleteAdapter.access$setOnScrollListener$p(this.this$0, new AnonymousClass1(emitter));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupScrollObservables$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupScrollObservables$2.java
new file mode 100644
index 0000000000..c4b7ffd467
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupScrollObservables$2.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import d0.z.d.o;
+import java.util.Objects;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+/* compiled from: ChatInputAutocompleteAdapter.kt */
+public final class ChatInputAutocompleteAdapter$setupScrollObservables$2 extends o implements Function1<Object, Unit> {
+    public final /* synthetic */ RecyclerView $recyclerView;
+    public final /* synthetic */ ChatInputAutocompleteAdapter this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ChatInputAutocompleteAdapter$setupScrollObservables$2(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, RecyclerView recyclerView) {
+        super(1);
+        this.this$0 = chatInputAutocompleteAdapter;
+        this.$recyclerView = recyclerView;
+    }
+
+    @Override // kotlin.jvm.functions.Function1
+    public final void invoke(Object obj) {
+        Function2 access$getOnScrollPositionListener$p = ChatInputAutocompleteAdapter.access$getOnScrollPositionListener$p(this.this$0);
+        if (access$getOnScrollPositionListener$p != null && (this.$recyclerView.getLayoutManager() instanceof LinearLayoutManager)) {
+            RecyclerView.LayoutManager layoutManager = this.$recyclerView.getLayoutManager();
+            Objects.requireNonNull(layoutManager, "null cannot be cast to non-null type androidx.recyclerview.widget.LinearLayoutManager");
+            LinearLayoutManager linearLayoutManager = (LinearLayoutManager) layoutManager;
+            access$getOnScrollPositionListener$p.invoke(Integer.valueOf(linearLayoutManager.findFirstVisibleItemPosition()), Integer.valueOf(linearLayoutManager.findLastVisibleItemPosition()));
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupStickyApplicationHeaders$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupStickyApplicationHeaders$1.java
new file mode 100644
index 0000000000..45cc124b68
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter$setupStickyApplicationHeaders$1.java
@@ -0,0 +1,22 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+/* compiled from: ChatInputAutocompleteAdapter.kt */
+public final class ChatInputAutocompleteAdapter$setupStickyApplicationHeaders$1 implements View.OnLayoutChangeListener {
+    public final /* synthetic */ RecyclerView $recyclerView;
+    public final /* synthetic */ ChatInputAutocompleteAdapter this$0;
+
+    public ChatInputAutocompleteAdapter$setupStickyApplicationHeaders$1(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, RecyclerView recyclerView) {
+        this.this$0 = chatInputAutocompleteAdapter;
+        this.$recyclerView = recyclerView;
+    }
+
+    @Override // android.view.View.OnLayoutChangeListener
+    public final void onLayoutChange(View view, int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
+        StickyHeaderManager access$getStickyHeaderManager$p = ChatInputAutocompleteAdapter.access$getStickyHeaderManager$p(this.this$0);
+        if (access$getStickyHeaderManager$p != null) {
+            access$getStickyHeaderManager$p.layoutViews(this.$recyclerView);
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java
new file mode 100644
index 0000000000..4930ce8299
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/ChatInputAutocompleteAdapter.java
@@ -0,0 +1,446 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.constraintlayout.widget.Barrier;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import c.d.b.a.a;
+import com.discord.app.AppComponent;
+import com.discord.databinding.WidgetChatInputAutocompleteItemBinding;
+import com.discord.databinding.WidgetChatInputCommandApplicationHeaderItemBinding;
+import com.discord.databinding.WidgetChatInputEmojiAutocompleteUpsellItemBinding;
+import com.discord.databinding.WidgetChatInputSlashLoadingItemBinding;
+import com.discord.utilities.dimen.DimenUtils;
+import com.discord.utilities.rx.LeadingEdgeThrottle;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
+import com.discord.utilities.views.StickyHeaderItemDecoration;
+import com.discord.views.PileView;
+import com.discord.views.StatusView;
+import com.discord.widgets.chat.input.UserAndSelectedGuildRoles;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandLoadingPlaceholder;
+import com.discord.widgets.chat.input.autocomplete.ApplicationPlaceholder;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import d0.t.n;
+import d0.z.d.m;
+import j0.l.a.r;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Emitter;
+import rx.Observable;
+import rx.Subscription;
+/* compiled from: ChatInputAutocompleteAdapter.kt */
+public final class ChatInputAutocompleteAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements StickyHeaderItemDecoration.StickyHeaderAdapter {
+    private static final int COMMAND_HEADER_HEIGHT = 32;
+    private static final int CONTAINER_ROW_MAX_VISIBLE_COUNT = 4;
+    public static final Companion Companion = new Companion(null);
+    private static final int EMOJI_AUTOCOMPLETE_UPSELL_HEIGHT = 52;
+    private static final int MENTION_CONTAINER_MAX_SIZE = 176;
+    private static final int MENTION_CONTAINER_MAX_SIZE_WITH_STICKERS = 132;
+    private static final int MENTION_ROW_HEIGHT_DEFAULT = 44;
+    public static final int VIEW_TYPE_AUTOCOMPLETE_ITEM = 0;
+    public static final int VIEW_TYPE_COMMAND_HEADER_ITEM = 1;
+    public static final int VIEW_TYPE_COMMAND_LOADING_ITEM = 2;
+    public static final int VIEW_TYPE_EMOJI_UPSELL_AUTOCOMPLETE = 3;
+    private List<? extends Autocompletable> data = n.emptyList();
+    private List<Integer> headerPositions = n.emptyList();
+    private Function1<? super Autocompletable, Unit> onItemSelected;
+    private RecyclerView.OnScrollListener onScrollListener;
+    private Function2<? super Integer, ? super Integer, Unit> onScrollPositionListener;
+    private RecyclerView recyclerView;
+    private boolean showAvatars = true;
+    private StickyHeaderManager stickyHeaderManager;
+    private Subscription subscription;
+    private UserAndSelectedGuildRoles userAndSelectedGuildRoles;
+
+    /* compiled from: ChatInputAutocompleteAdapter.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    public ChatInputAutocompleteAdapter() {
+        setHasStableIds(true);
+    }
+
+    public static final /* synthetic */ RecyclerView.OnScrollListener access$getOnScrollListener$p(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        return chatInputAutocompleteAdapter.onScrollListener;
+    }
+
+    public static final /* synthetic */ Function2 access$getOnScrollPositionListener$p(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        return chatInputAutocompleteAdapter.onScrollPositionListener;
+    }
+
+    public static final /* synthetic */ StickyHeaderManager access$getStickyHeaderManager$p(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        return chatInputAutocompleteAdapter.stickyHeaderManager;
+    }
+
+    public static final /* synthetic */ void access$setOnScrollListener$p(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, RecyclerView.OnScrollListener onScrollListener) {
+        chatInputAutocompleteAdapter.onScrollListener = onScrollListener;
+    }
+
+    public static final /* synthetic */ void access$setOnScrollPositionListener$p(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, Function2 function2) {
+        chatInputAutocompleteAdapter.onScrollPositionListener = function2;
+    }
+
+    public static final /* synthetic */ void access$setStickyHeaderManager$p(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, StickyHeaderManager stickyHeaderManager) {
+        chatInputAutocompleteAdapter.stickyHeaderManager = stickyHeaderManager;
+    }
+
+    private final List<Integer> calculateCommandHeaderPositions(List<? extends Autocompletable> list) {
+        ArrayList arrayList = new ArrayList();
+        int size = list.size();
+        for (int i = 0; i < size; i++) {
+            if (list.get(i) instanceof ApplicationPlaceholder) {
+                arrayList.add(Integer.valueOf(i));
+            }
+        }
+        return arrayList;
+    }
+
+    private final int getDataHeightOrMax(List<? extends Autocompletable> list, int i) {
+        int i2 = 0;
+        for (Autocompletable autocompletable : list) {
+            i2 += autocompletable instanceof ApplicationPlaceholder ? 32 : autocompletable instanceof EmojiUpsellPlaceholder ? 52 : 44;
+            if (i2 >= i) {
+                return i;
+            }
+        }
+        return i2;
+    }
+
+    private final void resizeRecyclerToData(List<? extends Autocompletable> list, boolean z2) {
+        ViewGroup.LayoutParams layoutParams;
+        int i = z2 ? 132 : 176;
+        RecyclerView recyclerView = this.recyclerView;
+        if (!(recyclerView == null || (layoutParams = recyclerView.getLayoutParams()) == null)) {
+            layoutParams.height = DimenUtils.dpToPixels(getDataHeightOrMax(list, i));
+        }
+        RecyclerView recyclerView2 = this.recyclerView;
+        if (recyclerView2 != null) {
+            recyclerView2.requestLayout();
+        }
+    }
+
+    public static /* synthetic */ void scrollToPosition$default(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, int i, boolean z2, int i2, Object obj) {
+        if ((i2 & 2) != 0) {
+            z2 = false;
+        }
+        chatInputAutocompleteAdapter.scrollToPosition(i, z2);
+    }
+
+    public static /* synthetic */ void setData$default(ChatInputAutocompleteAdapter chatInputAutocompleteAdapter, List list, boolean z2, boolean z3, UserAndSelectedGuildRoles userAndSelectedGuildRoles, int i, Object obj) {
+        if ((i & 2) != 0) {
+            z2 = false;
+        }
+        if ((i & 4) != 0) {
+            z3 = false;
+        }
+        if ((i & 8) != 0) {
+            userAndSelectedGuildRoles = null;
+        }
+        chatInputAutocompleteAdapter.setData(list, z2, z3, userAndSelectedGuildRoles);
+    }
+
+    private final void setupScrollObservables(RecyclerView recyclerView, AppComponent appComponent) {
+        Observable n = Observable.n(new ChatInputAutocompleteAdapter$setupScrollObservables$1(this), Emitter.BackpressureMode.LATEST);
+        Observable h02 = Observable.h0(new r(n.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
+        m.checkNotNullExpressionValue(h02, "Observable\n        .crea…, TimeUnit.MILLISECONDS))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(h02, appComponent, null, 2, null), ChatInputAutocompleteAdapter.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new ChatInputAutocompleteAdapter$setupScrollObservables$2(this, recyclerView), 62, (Object) null);
+        RecyclerView.OnScrollListener onScrollListener = this.onScrollListener;
+        if (onScrollListener != null) {
+            recyclerView.addOnScrollListener(onScrollListener);
+        }
+    }
+
+    private final void setupStickyApplicationHeaders(RecyclerView recyclerView) {
+        this.stickyHeaderManager = new StickyHeaderManager(recyclerView, this);
+        recyclerView.addOnLayoutChangeListener(new ChatInputAutocompleteAdapter$setupStickyApplicationHeaders$1(this, recyclerView));
+        StickyHeaderItemDecoration stickyHeaderItemDecoration = new StickyHeaderItemDecoration(this);
+        recyclerView.addItemDecoration(stickyHeaderItemDecoration);
+        stickyHeaderItemDecoration.blockClicks(recyclerView);
+    }
+
+    public final void configureSubscriptions(AppComponent appComponent) {
+        m.checkNotNullParameter(appComponent, "appComponent");
+        RecyclerView recyclerView = this.recyclerView;
+        if (recyclerView != null) {
+            setupScrollObservables(recyclerView, appComponent);
+        }
+    }
+
+    @Override // com.discord.utilities.views.StickyHeaderItemDecoration.StickyHeaderAdapter
+    public View getAndBindHeaderView(int i) {
+        StickyHeaderHolder stickyHeaderHolder;
+        StickyHeaderHolder stickyHeaderHolder2;
+        Autocompletable autocompletable = (Autocompletable) this.data.get(i);
+        if (!(autocompletable instanceof ApplicationPlaceholder)) {
+            return null;
+        }
+        StickyHeaderManager stickyHeaderManager = this.stickyHeaderManager;
+        if (!(stickyHeaderManager == null || (stickyHeaderHolder2 = stickyHeaderManager.getStickyHeaderHolder()) == null)) {
+            stickyHeaderHolder2.bind((ApplicationPlaceholder) autocompletable);
+        }
+        StickyHeaderManager stickyHeaderManager2 = this.stickyHeaderManager;
+        if (stickyHeaderManager2 == null || (stickyHeaderHolder = stickyHeaderManager2.getStickyHeaderHolder()) == null) {
+            return null;
+        }
+        return stickyHeaderHolder.getItemView();
+    }
+
+    @Override // com.discord.utilities.views.StickyHeaderItemDecoration.StickyHeaderAdapter
+    public Integer getHeaderPositionForItem(int i) {
+        int intValue;
+        int size = this.headerPositions.size();
+        do {
+            size--;
+            if (size < 0) {
+                return null;
+            }
+            intValue = this.headerPositions.get(size).intValue();
+        } while (intValue > i);
+        return Integer.valueOf(intValue);
+    }
+
+    public final Autocompletable getItem(int i) {
+        return (Autocompletable) this.data.get(i);
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public int getItemCount() {
+        return this.data.size();
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public long getItemId(int i) {
+        List<String> autocompleteTextMatchers = ((Autocompletable) this.data.get(i)).getAutocompleteTextMatchers();
+        return (long) (autocompleteTextMatchers != null ? autocompleteTextMatchers.hashCode() : ((Autocompletable) this.data.get(i)).getInputReplacement().hashCode());
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public int getItemViewType(int i) {
+        Autocompletable autocompletable = (Autocompletable) this.data.get(i);
+        if (autocompletable instanceof ApplicationCommandLoadingPlaceholder) {
+            return 2;
+        }
+        if (autocompletable instanceof ApplicationPlaceholder) {
+            return 1;
+        }
+        return autocompletable instanceof EmojiUpsellPlaceholder ? 3 : 0;
+    }
+
+    /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.autocomplete.Autocompletable, kotlin.Unit>, kotlin.jvm.functions.Function1<com.discord.widgets.chat.input.autocomplete.Autocompletable, kotlin.Unit> */
+    public final Function1<Autocompletable, Unit> getOnItemSelected() {
+        return this.onItemSelected;
+    }
+
+    public final Subscription getSubscription() {
+        return this.subscription;
+    }
+
+    @Override // com.discord.utilities.views.StickyHeaderItemDecoration.StickyHeaderAdapter
+    public boolean isHeader(int i) {
+        return this.headerPositions.contains(Integer.valueOf(i));
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+        m.checkNotNullParameter(recyclerView, "recyclerView");
+        super.onAttachedToRecyclerView(recyclerView);
+        this.recyclerView = recyclerView;
+        setupStickyApplicationHeaders(recyclerView);
+    }
+
+    public final void onAutocompletableSelected(Autocompletable autocompletable) {
+        m.checkNotNullParameter(autocompletable, "autocompletable");
+        Function1<? super Autocompletable, Unit> function1 = this.onItemSelected;
+        if (function1 != null) {
+            function1.invoke(autocompletable);
+        }
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int i) {
+        m.checkNotNullParameter(viewHolder, "holder");
+        int itemViewType = getItemViewType(i);
+        if (itemViewType == 0) {
+            ((AutocompleteItemViewHolder) viewHolder).bind((Autocompletable) this.data.get(i), this.showAvatars, this.userAndSelectedGuildRoles);
+        } else if (itemViewType == 1) {
+            Object obj = this.data.get(i);
+            Objects.requireNonNull(obj, "null cannot be cast to non-null type com.discord.widgets.chat.input.autocomplete.ApplicationPlaceholder");
+            ((CommandHeaderViewHolder) viewHolder).bind((ApplicationPlaceholder) obj);
+        } else if (itemViewType == 2) {
+        } else {
+            if (itemViewType == 3) {
+                Object obj2 = this.data.get(i);
+                Objects.requireNonNull(obj2, "null cannot be cast to non-null type com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder");
+                ((EmojiAutocompleteUpsellViewHolder) viewHolder).bind((EmojiUpsellPlaceholder) obj2);
+                return;
+            }
+            throw new IllegalStateException("Cannot bind. Unknown View Type");
+        }
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+        m.checkNotNullParameter(viewGroup, "parent");
+        LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
+        if (i == 0) {
+            View inflate = from.inflate(2131558915, viewGroup, false);
+            int i2 = 2131362481;
+            Barrier barrier = (Barrier) inflate.findViewById(2131362481);
+            if (barrier != null) {
+                i2 = 2131362482;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362482);
+                if (simpleDraweeView != null) {
+                    i2 = 2131362483;
+                    TextView textView = (TextView) inflate.findViewById(2131362483);
+                    if (textView != null) {
+                        i2 = 2131362484;
+                        View findViewById = inflate.findViewById(2131362484);
+                        if (findViewById != null) {
+                            i2 = 2131362485;
+                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131362485);
+                            if (simpleDraweeSpanTextView != null) {
+                                i2 = 2131362487;
+                                TextView textView2 = (TextView) inflate.findViewById(2131362487);
+                                if (textView2 != null) {
+                                    i2 = 2131362488;
+                                    TextView textView3 = (TextView) inflate.findViewById(2131362488);
+                                    if (textView3 != null) {
+                                        i2 = 2131362489;
+                                        StatusView statusView = (StatusView) inflate.findViewById(2131362489);
+                                        if (statusView != null) {
+                                            WidgetChatInputAutocompleteItemBinding widgetChatInputAutocompleteItemBinding = new WidgetChatInputAutocompleteItemBinding((ConstraintLayout) inflate, barrier, simpleDraweeView, textView, findViewById, simpleDraweeSpanTextView, textView2, textView3, statusView);
+                                            m.checkNotNullExpressionValue(widgetChatInputAutocompleteItemBinding, "WidgetChatInputAutocompl…tInflater, parent, false)");
+                                            return new AutocompleteItemViewHolder(widgetChatInputAutocompleteItemBinding, new ChatInputAutocompleteAdapter$onCreateViewHolder$1(this));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
+        } else if (i == 1) {
+            WidgetChatInputCommandApplicationHeaderItemBinding a = WidgetChatInputCommandApplicationHeaderItemBinding.a(from, viewGroup, false);
+            m.checkNotNullExpressionValue(a, "WidgetChatInputCommandAp…tInflater, parent, false)");
+            return new CommandHeaderViewHolder(a);
+        } else if (i == 2) {
+            View inflate2 = from.inflate(2131558922, viewGroup, false);
+            int i3 = 2131361976;
+            View findViewById2 = inflate2.findViewById(2131361976);
+            if (findViewById2 != null) {
+                i3 = 2131361977;
+                Guideline guideline = (Guideline) inflate2.findViewById(2131361977);
+                if (guideline != null) {
+                    i3 = 2131362872;
+                    View findViewById3 = inflate2.findViewById(2131362872);
+                    if (findViewById3 != null) {
+                        i3 = 2131362873;
+                        Guideline guideline2 = (Guideline) inflate2.findViewById(2131362873);
+                        if (guideline2 != null) {
+                            i3 = 2131364034;
+                            View findViewById4 = inflate2.findViewById(2131364034);
+                            if (findViewById4 != null) {
+                                i3 = 2131364035;
+                                Guideline guideline3 = (Guideline) inflate2.findViewById(2131364035);
+                                if (guideline3 != null) {
+                                    WidgetChatInputSlashLoadingItemBinding widgetChatInputSlashLoadingItemBinding = new WidgetChatInputSlashLoadingItemBinding((ConstraintLayout) inflate2, findViewById2, guideline, findViewById3, guideline2, findViewById4, guideline3);
+                                    m.checkNotNullExpressionValue(widgetChatInputSlashLoadingItemBinding, "WidgetChatInputSlashLoad…tInflater, parent, false)");
+                                    return new ApplicationCommandLoadingViewHolder(widgetChatInputSlashLoadingItemBinding);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i3)));
+        } else if (i == 3) {
+            View inflate3 = from.inflate(2131558917, viewGroup, false);
+            int i4 = 2131362475;
+            PileView pileView = (PileView) inflate3.findViewById(2131362475);
+            if (pileView != null) {
+                i4 = 2131362476;
+                TextView textView4 = (TextView) inflate3.findViewById(2131362476);
+                if (textView4 != null) {
+                    WidgetChatInputEmojiAutocompleteUpsellItemBinding widgetChatInputEmojiAutocompleteUpsellItemBinding = new WidgetChatInputEmojiAutocompleteUpsellItemBinding((LinearLayout) inflate3, pileView, textView4);
+                    m.checkNotNullExpressionValue(widgetChatInputEmojiAutocompleteUpsellItemBinding, "WidgetChatInputEmojiAuto…tInflater, parent, false)");
+                    return new EmojiAutocompleteUpsellViewHolder(widgetChatInputEmojiAutocompleteUpsellItemBinding, new ChatInputAutocompleteAdapter$onCreateViewHolder$2(this));
+                }
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate3.getResources().getResourceName(i4)));
+        } else {
+            throw new IllegalStateException(a.l("Cannot create view holder. Unknown View Type: ", i));
+        }
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.Adapter
+    public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
+        m.checkNotNullParameter(recyclerView, "recyclerView");
+        super.onDetachedFromRecyclerView(recyclerView);
+        this.recyclerView = null;
+    }
+
+    public final void scrollToPosition(int i, boolean z2) {
+        RecyclerView.OnScrollListener onScrollListener;
+        RecyclerView recyclerView;
+        RecyclerView.OnScrollListener onScrollListener2;
+        RecyclerView recyclerView2;
+        if (!(z2 || (onScrollListener2 = this.onScrollListener) == null || (recyclerView2 = this.recyclerView) == null)) {
+            recyclerView2.removeOnScrollListener(onScrollListener2);
+        }
+        RecyclerView recyclerView3 = this.recyclerView;
+        RecyclerView.LayoutManager layoutManager = recyclerView3 != null ? recyclerView3.getLayoutManager() : null;
+        if (layoutManager instanceof LinearLayoutManager) {
+            ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(i, 0);
+        }
+        if (!z2 && (onScrollListener = this.onScrollListener) != null && (recyclerView = this.recyclerView) != null) {
+            recyclerView.addOnScrollListener(onScrollListener);
+        }
+    }
+
+    public final void setData(List<? extends Autocompletable> list, boolean z2, boolean z3, UserAndSelectedGuildRoles userAndSelectedGuildRoles) {
+        m.checkNotNullParameter(list, "autocompletables");
+        this.showAvatars = z2;
+        this.userAndSelectedGuildRoles = userAndSelectedGuildRoles;
+        this.headerPositions = calculateCommandHeaderPositions(list);
+        resizeRecyclerToData(list, z3);
+        this.data = list;
+        notifyDataSetChanged();
+    }
+
+    public final void setOnItemSelected(Function1<? super Autocompletable, Unit> function1) {
+        this.onItemSelected = function1;
+    }
+
+    public final void setSubscription(Subscription subscription) {
+        this.subscription = subscription;
+    }
+
+    public final void setVisiblePositionListener(Function2<? super Integer, ? super Integer, Unit> function2) {
+        m.checkNotNullParameter(function2, "onScrollVisibleDiscoveryCommands");
+        this.onScrollPositionListener = function2;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$1.java
new file mode 100644
index 0000000000..80b53a3811
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$1.java
@@ -0,0 +1,42 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.graphics.Bitmap;
+import com.discord.models.commands.Application;
+import com.discord.utilities.images.MGImagesBitmap;
+import com.discord.widgets.chat.input.autocomplete.ApplicationPlaceholder;
+import d0.g0.t;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: CommandHeaderViewHolder.kt */
+public final class CommandHeaderViewHolder$bind$1 extends o implements Function1<MGImagesBitmap.CloseableBitmaps, Unit> {
+    public final /* synthetic */ String $iconUrl;
+    public final /* synthetic */ ApplicationPlaceholder $item;
+    public final /* synthetic */ CommandHeaderViewHolder this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public CommandHeaderViewHolder$bind$1(CommandHeaderViewHolder commandHeaderViewHolder, ApplicationPlaceholder applicationPlaceholder, String str) {
+        super(1);
+        this.this$0 = commandHeaderViewHolder;
+        this.$item = applicationPlaceholder;
+        this.$iconUrl = str;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(MGImagesBitmap.CloseableBitmaps closeableBitmaps) {
+        invoke(closeableBitmaps);
+        return Unit.a;
+    }
+
+    public final void invoke(MGImagesBitmap.CloseableBitmaps closeableBitmaps) {
+        Application application;
+        m.checkNotNullParameter(closeableBitmaps, "closeableBitmaps");
+        ApplicationPlaceholder currentItem = this.this$0.getCurrentItem();
+        if (t.equals$default((currentItem == null || (application = currentItem.getApplication()) == null) ? null : application.getIcon(), this.$item.getApplication().getIcon(), false, 2, null)) {
+            CommandHeaderViewHolder.access$getBinding$p(this.this$0).b.setImageBitmap((Bitmap) closeableBitmaps.get((Object) this.$iconUrl));
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java
new file mode 100644
index 0000000000..77843fab6e
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder$bind$2.java
@@ -0,0 +1,33 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.graphics.drawable.Drawable;
+import com.discord.utilities.error.Error;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: CommandHeaderViewHolder.kt */
+public final class CommandHeaderViewHolder$bind$2 extends o implements Function1<Error, Unit> {
+    public final /* synthetic */ Drawable $drawable;
+    public final /* synthetic */ CommandHeaderViewHolder this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public CommandHeaderViewHolder$bind$2(CommandHeaderViewHolder commandHeaderViewHolder, Drawable drawable) {
+        super(1);
+        this.this$0 = commandHeaderViewHolder;
+        this.$drawable = drawable;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
+        invoke(error);
+        return Unit.a;
+    }
+
+    public final void invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        CommandHeaderViewHolder.access$getBinding$p(this.this$0).b.setImageDrawable(this.$drawable);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
new file mode 100644
index 0000000000..513199bd19
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/CommandHeaderViewHolder.java
@@ -0,0 +1,82 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.databinding.WidgetChatInputCommandApplicationHeaderItemBinding;
+import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.drawable.DrawableCompat;
+import com.discord.utilities.icon.IconUtils;
+import com.discord.utilities.images.MGImagesBitmap;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.chat.input.autocomplete.ApplicationPlaceholder;
+import d0.z.d.m;
+import java.util.HashSet;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+/* compiled from: CommandHeaderViewHolder.kt */
+public final class CommandHeaderViewHolder extends RecyclerView.ViewHolder implements StickyHeaderHolder {
+    private final WidgetChatInputCommandApplicationHeaderItemBinding binding;
+    private ApplicationPlaceholder currentItem;
+    private final View itemView;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public CommandHeaderViewHolder(WidgetChatInputCommandApplicationHeaderItemBinding widgetChatInputCommandApplicationHeaderItemBinding) {
+        super(widgetChatInputCommandApplicationHeaderItemBinding.a);
+        m.checkNotNullParameter(widgetChatInputCommandApplicationHeaderItemBinding, "binding");
+        this.binding = widgetChatInputCommandApplicationHeaderItemBinding;
+        ConstraintLayout constraintLayout = widgetChatInputCommandApplicationHeaderItemBinding.a;
+        m.checkNotNullExpressionValue(constraintLayout, "binding.root");
+        this.itemView = constraintLayout;
+    }
+
+    public static final /* synthetic */ WidgetChatInputCommandApplicationHeaderItemBinding access$getBinding$p(CommandHeaderViewHolder commandHeaderViewHolder) {
+        return commandHeaderViewHolder.binding;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.adapter.StickyHeaderHolder
+    public void bind(ApplicationPlaceholder applicationPlaceholder) {
+        m.checkNotNullParameter(applicationPlaceholder, "item");
+        if (!m.areEqual(this.currentItem, applicationPlaceholder)) {
+            this.currentItem = applicationPlaceholder;
+            TextView textView = this.binding.f1721c;
+            m.checkNotNullExpressionValue(textView, "binding.chatInputApplicationName");
+            textView.setText(applicationPlaceholder.getApplication().getName());
+            ImageView imageView = this.binding.b;
+            m.checkNotNullExpressionValue(imageView, "binding.chatInputApplicationAvatar");
+            int themedColor = ColorCompat.getThemedColor(imageView, 2130968988);
+            ConstraintLayout constraintLayout = this.binding.a;
+            m.checkNotNullExpressionValue(constraintLayout, "binding.root");
+            Context context = constraintLayout.getContext();
+            m.checkNotNullExpressionValue(context, "binding.root.context");
+            Drawable drawable = DrawableCompat.getDrawable(context, 2131231937, themedColor, false);
+            String icon = applicationPlaceholder.getApplication().getIcon();
+            if (icon != null) {
+                String applicationIcon = IconUtils.getApplicationIcon(applicationPlaceholder.getApplication().getId(), icon, 160);
+                HashSet hashSet = new HashSet();
+                hashSet.add(new MGImagesBitmap.ImageRequest(applicationIcon, true));
+                this.binding.b.setImageBitmap(null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(MGImagesBitmap.getBitmaps(hashSet)), CommandHeaderViewHolder.class, (Context) null, (Function1) null, new CommandHeaderViewHolder$bind$2(this, drawable), (Function0) null, (Function0) null, new CommandHeaderViewHolder$bind$1(this, applicationPlaceholder, applicationIcon), 54, (Object) null);
+                return;
+            }
+            this.binding.b.setImageDrawable(drawable);
+        }
+    }
+
+    public final ApplicationPlaceholder getCurrentItem() {
+        return this.currentItem;
+    }
+
+    @Override // com.discord.widgets.chat.input.autocomplete.adapter.StickyHeaderHolder
+    public View getItemView() {
+        return this.itemView;
+    }
+
+    public final void setCurrentItem(ApplicationPlaceholder applicationPlaceholder) {
+        this.currentItem = applicationPlaceholder;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder$bind$$inlined$map$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder$bind$$inlined$map$lambda$1.java
new file mode 100644
index 0000000000..7c2033cbb6
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder$bind$$inlined$map$lambda$1.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.widget.LinearLayout;
+import com.discord.models.domain.emoji.Emoji;
+import com.discord.utilities.icon.IconUtils;
+import com.discord.views.PileView;
+import com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder;
+import d0.z.d.m;
+/* compiled from: EmojiAutocompleteUpsellViewHolder.kt */
+public final class EmojiAutocompleteUpsellViewHolder$bind$$inlined$map$lambda$1 implements PileView.b {
+    public final /* synthetic */ EmojiUpsellPlaceholder $emojiUpsellPlaceholder$inlined;
+    public final /* synthetic */ Emoji $it;
+    public final /* synthetic */ EmojiAutocompleteUpsellViewHolder this$0;
+
+    public EmojiAutocompleteUpsellViewHolder$bind$$inlined$map$lambda$1(Emoji emoji, EmojiAutocompleteUpsellViewHolder emojiAutocompleteUpsellViewHolder, EmojiUpsellPlaceholder emojiUpsellPlaceholder) {
+        this.$it = emoji;
+        this.this$0 = emojiAutocompleteUpsellViewHolder;
+        this.$emojiUpsellPlaceholder$inlined = emojiUpsellPlaceholder;
+    }
+
+    @Override // com.discord.views.PileView.b
+    public final String getImageUri(int i) {
+        int mediaProxySize = IconUtils.getMediaProxySize(i);
+        Emoji emoji = this.$it;
+        boolean allowEmojiToAnimate = this.$emojiUpsellPlaceholder$inlined.getAllowEmojiToAnimate();
+        LinearLayout linearLayout = EmojiAutocompleteUpsellViewHolder.access$getBinding$p(this.this$0).a;
+        m.checkNotNullExpressionValue(linearLayout, "binding.root");
+        String imageUri = emoji.getImageUri(allowEmojiToAnimate, mediaProxySize, linearLayout.getContext());
+        m.checkNotNullExpressionValue(imageUri, "it.getImageUri(emojiUpse…ze, binding.root.context)");
+        return imageUri;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder$bind$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder$bind$1.java
new file mode 100644
index 0000000000..8dfcd215c9
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder$bind$1.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.view.View;
+import com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder;
+/* compiled from: EmojiAutocompleteUpsellViewHolder.kt */
+public final class EmojiAutocompleteUpsellViewHolder$bind$1 implements View.OnClickListener {
+    public final /* synthetic */ EmojiUpsellPlaceholder $emojiUpsellPlaceholder;
+    public final /* synthetic */ EmojiAutocompleteUpsellViewHolder this$0;
+
+    public EmojiAutocompleteUpsellViewHolder$bind$1(EmojiAutocompleteUpsellViewHolder emojiAutocompleteUpsellViewHolder, EmojiUpsellPlaceholder emojiUpsellPlaceholder) {
+        this.this$0 = emojiAutocompleteUpsellViewHolder;
+        this.$emojiUpsellPlaceholder = emojiUpsellPlaceholder;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        EmojiAutocompleteUpsellViewHolder.access$getOnItemSelected$p(this.this$0).invoke(this.$emojiUpsellPlaceholder);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
new file mode 100644
index 0000000000..d134f2fe7c
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/EmojiAutocompleteUpsellViewHolder.java
@@ -0,0 +1,63 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.content.res.Resources;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+import c.a.l.b;
+import com.discord.databinding.WidgetChatInputEmojiAutocompleteUpsellItemBinding;
+import com.discord.models.domain.emoji.Emoji;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiUpsellPlaceholder;
+import d0.t.o;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: EmojiAutocompleteUpsellViewHolder.kt */
+public final class EmojiAutocompleteUpsellViewHolder extends RecyclerView.ViewHolder {
+    private final WidgetChatInputEmojiAutocompleteUpsellItemBinding binding;
+    private final Function1<Autocompletable, Unit> onItemSelected;
+
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.autocomplete.Autocompletable, kotlin.Unit> */
+    /* JADX WARN: Multi-variable type inference failed */
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public EmojiAutocompleteUpsellViewHolder(WidgetChatInputEmojiAutocompleteUpsellItemBinding widgetChatInputEmojiAutocompleteUpsellItemBinding, Function1<? super Autocompletable, Unit> function1) {
+        super(widgetChatInputEmojiAutocompleteUpsellItemBinding.a);
+        m.checkNotNullParameter(widgetChatInputEmojiAutocompleteUpsellItemBinding, "binding");
+        m.checkNotNullParameter(function1, "onItemSelected");
+        this.binding = widgetChatInputEmojiAutocompleteUpsellItemBinding;
+        this.onItemSelected = function1;
+    }
+
+    public static final /* synthetic */ WidgetChatInputEmojiAutocompleteUpsellItemBinding access$getBinding$p(EmojiAutocompleteUpsellViewHolder emojiAutocompleteUpsellViewHolder) {
+        return emojiAutocompleteUpsellViewHolder.binding;
+    }
+
+    public static final /* synthetic */ Function1 access$getOnItemSelected$p(EmojiAutocompleteUpsellViewHolder emojiAutocompleteUpsellViewHolder) {
+        return emojiAutocompleteUpsellViewHolder.onItemSelected;
+    }
+
+    public final void bind(EmojiUpsellPlaceholder emojiUpsellPlaceholder) {
+        m.checkNotNullParameter(emojiUpsellPlaceholder, "emojiUpsellPlaceholder");
+        int lockedTotal = emojiUpsellPlaceholder.getLockedTotal();
+        LinearLayout linearLayout = this.binding.a;
+        m.checkNotNullExpressionValue(linearLayout, "binding.root");
+        Resources resources = linearLayout.getResources();
+        String string = resources.getString(2131886789);
+        m.checkNotNullExpressionValue(string, "resources.getString(R.st…utocomplete_emoji_upsell)");
+        String quantityString = resources.getQuantityString(2131755031, lockedTotal);
+        m.checkNotNullExpressionValue(quantityString, "resources.getQuantityStr…moji_upsell_count, count)");
+        TextView textView = this.binding.f1722c;
+        m.checkNotNullExpressionValue(textView, "binding.chatInputEmojiUpsellText");
+        b.n(textView, string, new Object[]{b.k(quantityString, new Object[]{Integer.valueOf(lockedTotal)}, null, 2)}, null, 4);
+        List<Emoji> lockedFirstThree = emojiUpsellPlaceholder.getLockedFirstThree();
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(lockedFirstThree, 10));
+        for (Emoji emoji : lockedFirstThree) {
+            arrayList.add(new EmojiAutocompleteUpsellViewHolder$bind$$inlined$map$lambda$1(emoji, this, emojiUpsellPlaceholder));
+        }
+        this.binding.b.setItems(arrayList);
+        this.binding.a.setOnClickListener(new EmojiAutocompleteUpsellViewHolder$bind$1(this, emojiUpsellPlaceholder));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/StickyHeaderHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/StickyHeaderHolder.java
new file mode 100644
index 0000000000..365ebd39ca
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/StickyHeaderHolder.java
@@ -0,0 +1,10 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.view.View;
+import com.discord.widgets.chat.input.autocomplete.ApplicationPlaceholder;
+/* compiled from: StickyHeaderManager.kt */
+public interface StickyHeaderHolder {
+    void bind(ApplicationPlaceholder applicationPlaceholder);
+
+    View getItemView();
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/StickyHeaderManager.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/StickyHeaderManager.java
new file mode 100644
index 0000000000..3a9194681f
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/StickyHeaderManager.java
@@ -0,0 +1,40 @@
+package com.discord.widgets.chat.input.autocomplete.adapter;
+
+import android.view.LayoutInflater;
+import androidx.recyclerview.widget.RecyclerView;
+import com.discord.databinding.WidgetChatInputCommandApplicationHeaderItemBinding;
+import com.discord.utilities.views.StickyHeaderItemDecoration;
+import d0.z.d.m;
+/* compiled from: StickyHeaderManager.kt */
+public final class StickyHeaderManager {
+    private final ChatInputAutocompleteAdapter adapter;
+    private final RecyclerView recyclerView;
+    private final StickyHeaderHolder stickyHeaderHolder;
+
+    public StickyHeaderManager(RecyclerView recyclerView, ChatInputAutocompleteAdapter chatInputAutocompleteAdapter) {
+        m.checkNotNullParameter(recyclerView, "recyclerView");
+        m.checkNotNullParameter(chatInputAutocompleteAdapter, "adapter");
+        this.recyclerView = recyclerView;
+        this.adapter = chatInputAutocompleteAdapter;
+        WidgetChatInputCommandApplicationHeaderItemBinding a = WidgetChatInputCommandApplicationHeaderItemBinding.a(LayoutInflater.from(recyclerView.getContext()), recyclerView, false);
+        m.checkNotNullExpressionValue(a, "WidgetChatInputCommandAp…clerView, false\n        )");
+        this.stickyHeaderHolder = new CommandHeaderViewHolder(a);
+    }
+
+    public final ChatInputAutocompleteAdapter getAdapter() {
+        return this.adapter;
+    }
+
+    public final RecyclerView getRecyclerView() {
+        return this.recyclerView;
+    }
+
+    public final StickyHeaderHolder getStickyHeaderHolder() {
+        return this.stickyHeaderHolder;
+    }
+
+    public final void layoutViews(RecyclerView recyclerView) {
+        m.checkNotNullParameter(recyclerView, "recyclerView");
+        StickyHeaderItemDecoration.LayoutManager.layoutHeaderView(recyclerView, this.stickyHeaderHolder.getItemView());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource$Companion$getDiscoveryCommands$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource$Companion$getDiscoveryCommands$1.java
new file mode 100644
index 0000000000..cc6e358988
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource$Companion$getDiscoveryCommands$1.java
@@ -0,0 +1,31 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.models.commands.Application;
+import com.discord.stores.DiscoverCommands;
+import com.discord.widgets.chat.input.WidgetChatInputDiscoveryCommandsModel;
+import d0.z.d.m;
+import java.util.List;
+import rx.functions.Func2;
+/* compiled from: ApplicationCommandsAutocompletableSource.kt */
+public final class ApplicationCommandsAutocompletableSource$Companion$getDiscoveryCommands$1<T1, T2, R> implements Func2<List<? extends Application>, DiscoverCommands, WidgetChatInputDiscoveryCommandsModel> {
+    public final /* synthetic */ boolean $includeHeaders;
+    public final /* synthetic */ int $placeholdersCount;
+
+    public ApplicationCommandsAutocompletableSource$Companion$getDiscoveryCommands$1(boolean z2, int i) {
+        this.$includeHeaders = z2;
+        this.$placeholdersCount = i;
+    }
+
+    public final WidgetChatInputDiscoveryCommandsModel call(List<Application> list, DiscoverCommands discoverCommands) {
+        m.checkNotNullParameter(list, "apps");
+        m.checkNotNullParameter(discoverCommands, "discoveryCommands");
+        return WidgetChatInputDiscoveryCommandsModel.Companion.parseModelDiscoveryCommands(list, discoverCommands, this.$includeHeaders, this.$placeholdersCount);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func2
+    public /* bridge */ /* synthetic */ WidgetChatInputDiscoveryCommandsModel call(List<? extends Application> list, DiscoverCommands discoverCommands) {
+        return call((List<Application>) list, discoverCommands);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource$observeApplicationCommandAutocompletables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource$observeApplicationCommandAutocompletables$1.java
new file mode 100644
index 0000000000..50252e35e8
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource$observeApplicationCommandAutocompletables$1.java
@@ -0,0 +1,38 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.models.commands.Application;
+import com.discord.models.commands.ApplicationCommand;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.o;
+import d0.t.g0;
+import d0.z.d.m;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import rx.functions.Func2;
+/* compiled from: ApplicationCommandsAutocompletableSource.kt */
+public final class ApplicationCommandsAutocompletableSource$observeApplicationCommandAutocompletables$1<T1, T2, R> implements Func2<List<? extends Application>, List<? extends ApplicationCommand>, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>> {
+    public final /* synthetic */ ApplicationCommandsAutocompletableSource this$0;
+
+    public ApplicationCommandsAutocompletableSource$observeApplicationCommandAutocompletables$1(ApplicationCommandsAutocompletableSource applicationCommandsAutocompletableSource) {
+        this.this$0 = applicationCommandsAutocompletableSource;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func2
+    public /* bridge */ /* synthetic */ Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> call(List<? extends Application> list, List<? extends ApplicationCommand> list2) {
+        return call((List<Application>) list, list2);
+    }
+
+    public final Map<LeadingIdentifier, TreeSet<Autocompletable>> call(List<Application> list, List<? extends ApplicationCommand> list2) {
+        m.checkNotNullExpressionValue(list2, "queries");
+        if (!(!list2.isEmpty())) {
+            return g0.mapOf(o.to(LeadingIdentifier.APP_COMMAND, new TreeSet()));
+        }
+        ApplicationCommandsAutocompletableSource applicationCommandsAutocompletableSource = this.this$0;
+        m.checkNotNullExpressionValue(list, "apps");
+        return ApplicationCommandsAutocompletableSource.access$createAutocompletablesForApplicationCommands(applicationCommandsAutocompletableSource, list, list2);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource.java
new file mode 100644
index 0000000000..6b7d58db31
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ApplicationCommandsAutocompletableSource.java
@@ -0,0 +1,100 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.api.channel.Channel;
+import com.discord.api.commands.ApplicationCommandType;
+import com.discord.api.commands.CommandChoice;
+import com.discord.models.commands.Application;
+import com.discord.models.commands.ApplicationCommand;
+import com.discord.models.commands.ApplicationCommandOption;
+import com.discord.stores.StoreApplicationCommands;
+import com.discord.stores.StoreStream;
+import com.discord.widgets.chat.input.WidgetChatInputDiscoveryCommandsModel;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.ApplicationCommandChoiceAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.AutocompletableComparator;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.t.g0;
+import d0.t.o;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+/* compiled from: ApplicationCommandsAutocompletableSource.kt */
+public final class ApplicationCommandsAutocompletableSource {
+    public static final Companion Companion = new Companion(null);
+    private final StoreApplicationCommands storeApplicationCommands;
+
+    /* compiled from: ApplicationCommandsAutocompletableSource.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final List<Autocompletable> createFromCommandOption(ApplicationCommandOption applicationCommandOption) {
+            m.checkNotNullParameter(applicationCommandOption, "option");
+            ArrayList arrayList = new ArrayList();
+            if (applicationCommandOption.getType() == ApplicationCommandType.BOOLEAN) {
+                arrayList.add(new ApplicationCommandChoiceAutocompletable(new CommandChoice("true", "true")));
+                arrayList.add(new ApplicationCommandChoiceAutocompletable(new CommandChoice("false", "false")));
+            } else {
+                List<CommandChoice> choices = applicationCommandOption.getChoices();
+                if (!(choices == null || choices.isEmpty())) {
+                    List<CommandChoice> choices2 = applicationCommandOption.getChoices();
+                    ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(choices2, 10));
+                    for (CommandChoice commandChoice : choices2) {
+                        arrayList2.add(new ApplicationCommandChoiceAutocompletable(commandChoice));
+                    }
+                    arrayList.addAll(arrayList2);
+                }
+            }
+            return arrayList;
+        }
+
+        public final Observable<WidgetChatInputDiscoveryCommandsModel> getDiscoveryCommands(boolean z2, int i, long j) {
+            StoreStream.Companion companion = StoreStream.Companion;
+            Observable<WidgetChatInputDiscoveryCommandsModel> j2 = Observable.j(companion.getApplicationCommands().observeGuildApplications(j), companion.getApplicationCommands().observeDiscoverCommands(j), new ApplicationCommandsAutocompletableSource$Companion$getDiscoveryCommands$1(z2, i));
+            m.checkNotNullExpressionValue(j2, "Observable.combineLatest…rsCount\n        )\n      }");
+            return j2;
+        }
+    }
+
+    public ApplicationCommandsAutocompletableSource(StoreApplicationCommands storeApplicationCommands) {
+        m.checkNotNullParameter(storeApplicationCommands, "storeApplicationCommands");
+        this.storeApplicationCommands = storeApplicationCommands;
+    }
+
+    public static final /* synthetic */ Map access$createAutocompletablesForApplicationCommands(ApplicationCommandsAutocompletableSource applicationCommandsAutocompletableSource, List list, List list2) {
+        return applicationCommandsAutocompletableSource.createAutocompletablesForApplicationCommands(list, list2);
+    }
+
+    private final Map<LeadingIdentifier, TreeSet<Autocompletable>> createAutocompletablesForApplicationCommands(List<Application> list, List<? extends ApplicationCommand> list2) {
+        TreeSet treeSet = new TreeSet(new AutocompletableComparator());
+        HashMap hashMap = new HashMap();
+        for (Application application : list) {
+            hashMap.put(Long.valueOf(application.getId()), application);
+        }
+        for (ApplicationCommand applicationCommand : list2) {
+            treeSet.add(new ApplicationCommandAutocompletable((Application) hashMap.get(Long.valueOf(applicationCommand.getApplicationId())), applicationCommand));
+        }
+        return g0.mapOf(d0.o.to(LeadingIdentifier.APP_COMMAND, treeSet));
+    }
+
+    public final StoreApplicationCommands getStoreApplicationCommands() {
+        return this.storeApplicationCommands;
+    }
+
+    public final Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> observeApplicationCommandAutocompletables(Channel channel) {
+        m.checkNotNullParameter(channel, "channel");
+        Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> r = Observable.j(this.storeApplicationCommands.observeGuildApplications(channel.h()), this.storeApplicationCommands.observeQueryCommands(channel.h()), new ApplicationCommandsAutocompletableSource$observeApplicationCommandAutocompletables$1(this)).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest… }.distinctUntilChanged()");
+        return r;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java
new file mode 100644
index 0000000000..af596acd58
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource$observeChannelAutocompletables$1.java
@@ -0,0 +1,39 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.channel.Channel;
+import com.discord.utilities.permissions.PermissionUtils;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.AutocompletableComparator;
+import com.discord.widgets.chat.input.autocomplete.ChannelAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.o;
+import d0.t.g0;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.TreeSet;
+import rx.functions.Func2;
+/* compiled from: ChannelAutocompletableSource.kt */
+public final class ChannelAutocompletableSource$observeChannelAutocompletables$1<T1, T2, R> implements Func2<Map<Long, ? extends Channel>, Map<Long, ? extends Long>, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>> {
+    public static final ChannelAutocompletableSource$observeChannelAutocompletables$1 INSTANCE = new ChannelAutocompletableSource$observeChannelAutocompletables$1();
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func2
+    public /* bridge */ /* synthetic */ Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> call(Map<Long, ? extends Channel> map, Map<Long, ? extends Long> map2) {
+        return call((Map<Long, Channel>) map, (Map<Long, Long>) map2);
+    }
+
+    public final Map<LeadingIdentifier, TreeSet<Autocompletable>> call(Map<Long, Channel> map, Map<Long, Long> map2) {
+        TreeSet treeSet = new TreeSet(new AutocompletableComparator());
+        for (Channel channel : map.values()) {
+            if (AnimatableValueParser.k1(channel) || AnimatableValueParser.B1(channel) || AnimatableValueParser.f1(channel)) {
+                m.checkNotNullExpressionValue(map2, "permissions");
+                if (PermissionUtils.hasAccess(channel, map2)) {
+                    treeSet.add(new ChannelAutocompletable(channel));
+                }
+            }
+        }
+        return g0.mapOf(o.to(LeadingIdentifier.CHANNELS, treeSet));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource.java
new file mode 100644
index 0000000000..2420e43694
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/ChannelAutocompletableSource.java
@@ -0,0 +1,38 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.stores.StoreChannels;
+import com.discord.stores.StorePermissions;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+import rx.Observable;
+/* compiled from: ChannelAutocompletableSource.kt */
+public final class ChannelAutocompletableSource {
+    private final StoreChannels storeChannels;
+    private final StorePermissions storePermissions;
+
+    public ChannelAutocompletableSource(StoreChannels storeChannels, StorePermissions storePermissions) {
+        m.checkNotNullParameter(storeChannels, "storeChannels");
+        m.checkNotNullParameter(storePermissions, "storePermissions");
+        this.storeChannels = storeChannels;
+        this.storePermissions = storePermissions;
+    }
+
+    public final StoreChannels getStoreChannels() {
+        return this.storeChannels;
+    }
+
+    public final StorePermissions getStorePermissions() {
+        return this.storePermissions;
+    }
+
+    public final Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> observeChannelAutocompletables(long j) {
+        Observable r = Observable.j(StoreChannels.observeChannelsForGuild$default(this.storeChannels, j, null, 2, null), this.storePermissions.observePermissionsForAllChannels(), ChannelAutocompletableSource$observeChannelAutocompletables$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+        return ObservableExtensionsKt.leadingEdgeThrottle(r, 500, TimeUnit.MILLISECONDS);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/EmojiAutocompletableSource$observeEmojiAutocompletables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/EmojiAutocompletableSource$observeEmojiAutocompletables$1.java
new file mode 100644
index 0000000000..a343cf8239
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/EmojiAutocompletableSource$observeEmojiAutocompletables$1.java
@@ -0,0 +1,24 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.models.domain.emoji.EmojiSet;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.TreeSet;
+import rx.functions.Func2;
+/* compiled from: EmojiAutocompletableSource.kt */
+public final class EmojiAutocompletableSource$observeEmojiAutocompletables$1<T1, T2, R> implements Func2<EmojiSet, Boolean, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>> {
+    public final /* synthetic */ EmojiAutocompletableSource this$0;
+
+    public EmojiAutocompletableSource$observeEmojiAutocompletables$1(EmojiAutocompletableSource emojiAutocompletableSource) {
+        this.this$0 = emojiAutocompletableSource;
+    }
+
+    public final Map<LeadingIdentifier, TreeSet<Autocompletable>> call(EmojiSet emojiSet, Boolean bool) {
+        EmojiAutocompletableSource emojiAutocompletableSource = this.this$0;
+        m.checkNotNullExpressionValue(emojiSet, "emojiSet");
+        m.checkNotNullExpressionValue(bool, "animationsEnabled");
+        return EmojiAutocompletableSource.access$createFromEmojiSet(emojiAutocompletableSource, emojiSet, bool.booleanValue());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/EmojiAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/EmojiAutocompletableSource.java
new file mode 100644
index 0000000000..fd56038beb
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/EmojiAutocompletableSource.java
@@ -0,0 +1,75 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import c.d.b.a.a;
+import com.discord.api.channel.Channel;
+import com.discord.models.domain.emoji.Emoji;
+import com.discord.models.domain.emoji.EmojiSet;
+import com.discord.stores.StoreEmoji;
+import com.discord.stores.StoreUserSettings;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.AutocompletableComparator;
+import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import com.discord.widgets.chat.input.emoji.EmojiAutocompletePremiumUpsellFeatureFlag;
+import d0.o;
+import d0.t.g0;
+import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import rx.Observable;
+/* compiled from: EmojiAutocompletableSource.kt */
+public final class EmojiAutocompletableSource {
+    private final StoreEmoji emojiStore;
+    private final StoreUserSettings userSettingsStore;
+
+    public EmojiAutocompletableSource(StoreEmoji storeEmoji, StoreUserSettings storeUserSettings) {
+        m.checkNotNullParameter(storeEmoji, "emojiStore");
+        m.checkNotNullParameter(storeUserSettings, "userSettingsStore");
+        this.emojiStore = storeEmoji;
+        this.userSettingsStore = storeUserSettings;
+    }
+
+    public static final /* synthetic */ Map access$createFromEmojiSet(EmojiAutocompletableSource emojiAutocompletableSource, EmojiSet emojiSet, boolean z2) {
+        return emojiAutocompletableSource.createFromEmojiSet(emojiSet, z2);
+    }
+
+    private final Map<LeadingIdentifier, TreeSet<Autocompletable>> createFromEmojiSet(EmojiSet emojiSet, boolean z2) {
+        TreeSet treeSet = new TreeSet(new AutocompletableComparator());
+        Iterator<T> it = emojiSet.unicodeEmojis.values().iterator();
+        while (it.hasNext()) {
+            List<Emoji> list = (List) it.next();
+            m.checkNotNullExpressionValue(list, "categoryEmojis");
+            for (Emoji emoji : list) {
+                m.checkNotNullExpressionValue(emoji, "emoji");
+                treeSet.add(new EmojiAutocompletable(emoji, z2));
+            }
+        }
+        Iterator<T> it2 = emojiSet.customEmojis.values().iterator();
+        while (it2.hasNext()) {
+            List list2 = (List) it2.next();
+            ArrayList<Emoji> S = a.S(list2, "guildEmojis");
+            for (Object obj : list2) {
+                Emoji emoji2 = (Emoji) obj;
+                m.checkNotNullExpressionValue(emoji2, "it");
+                if (emoji2.isAvailable()) {
+                    S.add(obj);
+                }
+            }
+            for (Emoji emoji3 : S) {
+                m.checkNotNullExpressionValue(emoji3, "emoji");
+                treeSet.add(new EmojiAutocompletable(emoji3, z2));
+            }
+        }
+        return g0.mapOf(o.to(LeadingIdentifier.EMOJI_AND_STICKERS, treeSet));
+    }
+
+    public final Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> observeEmojiAutocompletables(Channel channel) {
+        m.checkNotNullParameter(channel, "channel");
+        Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> r = Observable.j(this.emojiStore.getEmojiSet(channel.f(), channel.h(), EmojiAutocompletePremiumUpsellFeatureFlag.Companion.getINSTANCE().isEnabled(), false), this.userSettingsStore.observeIsAnimatedEmojisEnabled(true), new EmojiAutocompletableSource$observeEmojiAutocompletables$1(this)).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest… }.distinctUntilChanged()");
+        return r;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java
new file mode 100644
index 0000000000..6670d44314
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$createAutocompletablesForUsers$mentions$1.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.UserAutocompletable;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function1;
+/* compiled from: UserMentionableSource.kt */
+public final class UserAutocompletableSource$createAutocompletablesForUsers$mentions$1 extends o implements Function1<Autocompletable, Integer> {
+    public final /* synthetic */ int $numPartitions;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public UserAutocompletableSource$createAutocompletablesForUsers$mentions$1(int i) {
+        super(1);
+        this.$numPartitions = i;
+    }
+
+    public final int invoke(Autocompletable autocompletable) {
+        m.checkNotNullParameter(autocompletable, "e");
+        if (autocompletable instanceof UserAutocompletable) {
+            return (int) ((((UserAutocompletable) autocompletable).getUser().getId() >> 22) % ((long) this.$numPartitions));
+        }
+        return 0;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Integer invoke(Autocompletable autocompletable) {
+        return Integer.valueOf(invoke(autocompletable));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$1.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$1.java
new file mode 100644
index 0000000000..107c7ee498
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$1.java
@@ -0,0 +1,12 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.models.guild.Guild;
+import j0.k.b;
+/* compiled from: UserMentionableSource.kt */
+public final class UserAutocompletableSource$observeUserAutocompletables$1<T, R> implements b<Guild, Long> {
+    public static final UserAutocompletableSource$observeUserAutocompletables$1 INSTANCE = new UserAutocompletableSource$observeUserAutocompletables$1();
+
+    public final Long call(Guild guild) {
+        return Long.valueOf(guild.getOwnerId());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$2.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$2.java
new file mode 100644
index 0000000000..b89fb21129
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$2.java
@@ -0,0 +1,44 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.api.channel.Channel;
+import com.discord.api.role.GuildRole;
+import com.discord.models.member.GuildMember;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.TreeSet;
+import rx.functions.Func8;
+/* compiled from: UserMentionableSource.kt */
+public final class UserAutocompletableSource$observeUserAutocompletables$2<T1, T2, T3, T4, T5, T6, T7, T8, R> implements Func8<Long, Long, Map<Long, ? extends GuildRole>, Map<Long, ? extends GuildMember>, Map<Long, ? extends User>, Map<Long, ? extends Presence>, Long, Channel, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>> {
+    public final /* synthetic */ Channel $channel;
+    public final /* synthetic */ UserAutocompletableSource this$0;
+
+    public UserAutocompletableSource$observeUserAutocompletables$2(UserAutocompletableSource userAutocompletableSource, Channel channel) {
+        this.this$0 = userAutocompletableSource;
+        this.$channel = channel;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func8
+    public /* bridge */ /* synthetic */ Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> call(Long l, Long l2, Map<Long, ? extends GuildRole> map, Map<Long, ? extends GuildMember> map2, Map<Long, ? extends User> map3, Map<Long, ? extends Presence> map4, Long l3, Channel channel) {
+        return call(l, l2, (Map<Long, GuildRole>) map, (Map<Long, GuildMember>) map2, map3, (Map<Long, Presence>) map4, l3, channel);
+    }
+
+    public final Map<LeadingIdentifier, TreeSet<Autocompletable>> call(Long l, Long l2, Map<Long, GuildRole> map, Map<Long, GuildMember> map2, Map<Long, ? extends User> map3, Map<Long, Presence> map4, Long l3, Channel channel) {
+        UserAutocompletableSource userAutocompletableSource = this.this$0;
+        m.checkNotNullExpressionValue(l, "myId");
+        long longValue = l.longValue();
+        Channel channel2 = this.$channel;
+        m.checkNotNullExpressionValue(l2, "guildOwnerId");
+        long longValue2 = l2.longValue();
+        m.checkNotNullExpressionValue(map, "roles");
+        m.checkNotNullExpressionValue(map2, "members");
+        m.checkNotNullExpressionValue(map3, "users");
+        m.checkNotNullExpressionValue(map4, "presences");
+        return UserAutocompletableSource.access$createAutocompletablesForUsers(userAutocompletableSource, longValue, channel2, channel, longValue2, map, map2, map3, map4, l3);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$3.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$3.java
new file mode 100644
index 0000000000..b4a696e040
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$3.java
@@ -0,0 +1,12 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.models.user.User;
+import j0.k.b;
+/* compiled from: UserMentionableSource.kt */
+public final class UserAutocompletableSource$observeUserAutocompletables$3<T, R> implements b<User, Long> {
+    public static final UserAutocompletableSource$observeUserAutocompletables$3 INSTANCE = new UserAutocompletableSource$observeUserAutocompletables$3();
+
+    public final Long call(User user) {
+        return Long.valueOf(user.getId());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$4.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$4.java
new file mode 100644
index 0000000000..032b03b1a6
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource$observeUserAutocompletables$4.java
@@ -0,0 +1,55 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.api.channel.Channel;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.stores.StoreUser;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.z.d.m;
+import j0.k.b;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import rx.Observable;
+import rx.functions.Func2;
+/* compiled from: UserMentionableSource.kt */
+public final class UserAutocompletableSource$observeUserAutocompletables$4<T, R> implements b<List<Long>, Observable<? extends Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>>> {
+    public final /* synthetic */ Channel $channel;
+    public final /* synthetic */ UserAutocompletableSource this$0;
+
+    /* compiled from: UserMentionableSource.kt */
+    /* renamed from: com.discord.widgets.chat.input.autocomplete.sources.UserAutocompletableSource$observeUserAutocompletables$4$1  reason: invalid class name */
+    public static final class AnonymousClass1<T1, T2, R> implements Func2<Map<Long, ? extends User>, Map<Long, ? extends Presence>, Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>>> {
+        public final /* synthetic */ UserAutocompletableSource$observeUserAutocompletables$4 this$0;
+
+        public AnonymousClass1(UserAutocompletableSource$observeUserAutocompletables$4 userAutocompletableSource$observeUserAutocompletables$4) {
+            this.this$0 = userAutocompletableSource$observeUserAutocompletables$4;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+        @Override // rx.functions.Func2
+        public /* bridge */ /* synthetic */ Map<LeadingIdentifier, ? extends TreeSet<Autocompletable>> call(Map<Long, ? extends User> map, Map<Long, ? extends Presence> map2) {
+            return call(map, (Map<Long, Presence>) map2);
+        }
+
+        public final Map<LeadingIdentifier, TreeSet<Autocompletable>> call(Map<Long, ? extends User> map, Map<Long, Presence> map2) {
+            UserAutocompletableSource userAutocompletableSource = this.this$0.this$0;
+            m.checkNotNullExpressionValue(map, "users");
+            m.checkNotNullExpressionValue(map2, "presences");
+            return UserAutocompletableSource.access$createAutocompletablesForDmUsers(userAutocompletableSource, map, map2, this.this$0.$channel.n());
+        }
+    }
+
+    public UserAutocompletableSource$observeUserAutocompletables$4(UserAutocompletableSource userAutocompletableSource, Channel channel) {
+        this.this$0 = userAutocompletableSource;
+        this.$channel = channel;
+    }
+
+    public final Observable<? extends Map<LeadingIdentifier, TreeSet<Autocompletable>>> call(List<Long> list) {
+        StoreUser storeUsers = this.this$0.getStoreUsers();
+        m.checkNotNullExpressionValue(list, "recipientIds");
+        return Observable.j(storeUsers.observeUsers(list), this.this$0.getStorePresences().observePresencesForUsers(list), new AnonymousClass1(this)).r();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
new file mode 100644
index 0000000000..944e76a1dc
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java
@@ -0,0 +1,192 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import c.d.b.a.a;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.channel.Channel;
+import com.discord.api.channel.ChannelRecipientNick;
+import com.discord.api.role.GuildRole;
+import com.discord.models.member.GuildMember;
+import com.discord.models.presence.Presence;
+import com.discord.models.user.User;
+import com.discord.stores.StoreChannels;
+import com.discord.stores.StoreGuilds;
+import com.discord.stores.StorePermissions;
+import com.discord.stores.StoreUser;
+import com.discord.stores.StoreUserPresence;
+import com.discord.utilities.collections.ShallowPartitionCollection;
+import com.discord.utilities.permissions.PermissionUtils;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
+import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.AutocompletableComparator;
+import com.discord.widgets.chat.input.autocomplete.GlobalRoleAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import com.discord.widgets.chat.input.autocomplete.RoleAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.UserAutocompletable;
+import d0.o;
+import d0.t.g0;
+import d0.t.h0;
+import d0.z.d.m;
+import j0.l.e.j;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+/* compiled from: UserMentionableSource.kt */
+public final class UserAutocompletableSource {
+    public static final Companion Companion = new Companion(null);
+    private static final int PARTITION_HUGE_GUILD_SIZE = 3000;
+    private static final int PARTITION_IDEAL_PARTITION_SIZE = 100;
+    private final StoreChannels storeChannels;
+    private final StoreGuilds storeGuilds;
+    private final StorePermissions storePermissions;
+    private final StoreUserPresence storePresences;
+    private final StoreUser storeUsers;
+
+    /* compiled from: UserMentionableSource.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    public UserAutocompletableSource(StoreUser storeUser, StoreGuilds storeGuilds, StoreUserPresence storeUserPresence, StorePermissions storePermissions, StoreChannels storeChannels) {
+        m.checkNotNullParameter(storeUser, "storeUsers");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
+        m.checkNotNullParameter(storeUserPresence, "storePresences");
+        m.checkNotNullParameter(storePermissions, "storePermissions");
+        m.checkNotNullParameter(storeChannels, "storeChannels");
+        this.storeUsers = storeUser;
+        this.storeGuilds = storeGuilds;
+        this.storePresences = storeUserPresence;
+        this.storePermissions = storePermissions;
+        this.storeChannels = storeChannels;
+    }
+
+    public static final /* synthetic */ Map access$createAutocompletablesForDmUsers(UserAutocompletableSource userAutocompletableSource, Map map, Map map2, List list) {
+        return userAutocompletableSource.createAutocompletablesForDmUsers(map, map2, list);
+    }
+
+    public static final /* synthetic */ Map access$createAutocompletablesForUsers(UserAutocompletableSource userAutocompletableSource, long j, Channel channel, Channel channel2, long j2, Map map, Map map2, Map map3, Map map4, Long l) {
+        return userAutocompletableSource.createAutocompletablesForUsers(j, channel, channel2, j2, map, map2, map3, map4, l);
+    }
+
+    private final Map<LeadingIdentifier, TreeSet<Autocompletable>> createAutocompletablesForDmUsers(Map<Long, ? extends User> map, Map<Long, Presence> map2, List<ChannelRecipientNick> list) {
+        ChannelRecipientNick channelRecipientNick;
+        TreeSet treeSet = new TreeSet(new AutocompletableComparator());
+        for (User user : map.values()) {
+            String str = null;
+            if (list != null) {
+                int size = list.size();
+                channelRecipientNick = null;
+                for (int i = 0; i < size; i++) {
+                    if (list.get(i).a() == user.getId()) {
+                        channelRecipientNick = list.get(i);
+                    }
+                }
+            } else {
+                channelRecipientNick = null;
+            }
+            if (channelRecipientNick != null) {
+                str = channelRecipientNick.c();
+            }
+            treeSet.add(new UserAutocompletable(user, null, str, (Presence) a.e(user, map2), false, 16, null));
+        }
+        GlobalRoleAutocompletable.Companion companion = GlobalRoleAutocompletable.Companion;
+        treeSet.add(companion.getHere());
+        treeSet.add(companion.getHere());
+        return g0.mapOf(o.to(LeadingIdentifier.MENTION, treeSet));
+    }
+
+    private final Map<LeadingIdentifier, TreeSet<Autocompletable>> createAutocompletablesForUsers(long j, Channel channel, Channel channel2, long j2, Map<Long, GuildRole> map, Map<Long, GuildMember> map2, Map<Long, ? extends User> map3, Map<Long, Presence> map4, Long l) {
+        Collection collection;
+        boolean can;
+        if (map2.size() > 3000) {
+            int size = map2.size() / 100;
+            collection = ShallowPartitionCollection.Companion.withArrayListPartions(size, new UserAutocompletableSource$createAutocompletablesForUsers$mentions$1(size));
+        } else {
+            collection = new ArrayList(map2.size());
+        }
+        boolean canEveryone = PermissionUtils.canEveryone(1024, channel, channel2, map);
+        for (Map.Entry<Long, GuildMember> entry : map2.entrySet()) {
+            long longValue = entry.getKey().longValue();
+            GuildMember value = entry.getValue();
+            if (canEveryone || (can = PermissionUtils.can(1024, Long.valueOf(PermissionUtils.computePermissions(longValue, channel, channel2, j2, value, map, null, true))))) {
+                User user = (User) map3.get(Long.valueOf(longValue));
+                if (user != null) {
+                    collection.add(new UserAutocompletable(user, value, value.getNick(), map4.get(Long.valueOf(longValue)), false, 16, null));
+                }
+            } else {
+                User user2 = (User) map3.get(Long.valueOf(longValue));
+                if (user2 != null) {
+                    collection.add(new UserAutocompletable(user2, value, value.getNick(), map4.get(Long.valueOf(longValue)), can));
+                }
+            }
+        }
+        boolean z2 = false;
+        if (map2.get(Long.valueOf(j)) != null && (z2 = PermissionUtils.can(131072, l))) {
+            GlobalRoleAutocompletable.Companion companion = GlobalRoleAutocompletable.Companion;
+            collection.add(companion.getHere());
+            collection.add(companion.getEveryone());
+        }
+        for (GuildRole guildRole : map.values()) {
+            if (guildRole.e() || z2) {
+                if (guildRole.getId() != channel.f()) {
+                    collection.add(new RoleAutocompletable(guildRole));
+                }
+            }
+        }
+        TreeSet treeSet = new TreeSet(new AutocompletableComparator());
+        treeSet.addAll(collection);
+        return g0.mapOf(o.to(LeadingIdentifier.MENTION, treeSet));
+    }
+
+    public final StoreChannels getStoreChannels() {
+        return this.storeChannels;
+    }
+
+    public final StoreGuilds getStoreGuilds() {
+        return this.storeGuilds;
+    }
+
+    public final StorePermissions getStorePermissions() {
+        return this.storePermissions;
+    }
+
+    public final StoreUserPresence getStorePresences() {
+        return this.storePresences;
+    }
+
+    public final StoreUser getStoreUsers() {
+        return this.storeUsers;
+    }
+
+    public final Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> observeUserAutocompletables(Channel channel) {
+        Observable observable;
+        m.checkNotNullParameter(channel, "channel");
+        long f = channel.f();
+        if (UserMentionableSourceKt.access$isGuildChannelOrThread(channel)) {
+            Observable<Long> observeMeId = this.storeUsers.observeMeId();
+            Observable<R> F = this.storeGuilds.observeGuild(f).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable r = F.F(UserAutocompletableSource$observeUserAutocompletables$1.INSTANCE).r();
+            Observable<Map<Long, GuildRole>> observeRoles = this.storeGuilds.observeRoles(f);
+            Observable<Map<Long, GuildMember>> observeComputed = this.storeGuilds.observeComputed(f);
+            TimeUnit timeUnit = TimeUnit.SECONDS;
+            observable = Observable.d(observeMeId, r, observeRoles, ObservableExtensionsKt.leadingEdgeThrottle(observeComputed, 5, timeUnit), this.storeUsers.observeAllUsers(), ObservableExtensionsKt.leadingEdgeThrottle(this.storePresences.observeAllPresences(), 10, timeUnit), this.storePermissions.observePermissionsForChannel(channel.h()).r(), this.storeChannels.observeChannel(channel.r()).r(), new UserAutocompletableSource$observeUserAutocompletables$2(this, channel));
+        } else {
+            observable = UserMentionableSourceKt.access$isDmOrGroupDm(channel) ? Observable.A(AnimatableValueParser.G0(channel)).F(UserAutocompletableSource$observeUserAutocompletables$3.INSTANCE).f0().Y(new UserAutocompletableSource$observeUserAutocompletables$4(this, channel)) : new j(h0.emptyMap());
+        }
+        Observable<Map<LeadingIdentifier, TreeSet<Autocompletable>>> r2 = observable.r();
+        m.checkNotNullExpressionValue(r2, "when {\n      // Guild Ch…  .distinctUntilChanged()");
+        return r2;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java
new file mode 100644
index 0000000000..d4762496bb
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java
@@ -0,0 +1,21 @@
+package com.discord.widgets.chat.input.autocomplete.sources;
+
+import com.discord.api.channel.Channel;
+/* compiled from: UserMentionableSource.kt */
+public final class UserMentionableSourceKt {
+    public static final /* synthetic */ boolean access$isDmOrGroupDm(Channel channel) {
+        return isDmOrGroupDm(channel);
+    }
+
+    public static final /* synthetic */ boolean access$isGuildChannelOrThread(Channel channel) {
+        return isGuildChannelOrThread(channel);
+    }
+
+    private static final boolean isDmOrGroupDm(Channel channel) {
+        return channel.A() == 3 || channel.A() == 1;
+    }
+
+    private static final boolean isGuildChannelOrThread(Channel channel) {
+        return channel.A() == 5 || channel.A() == 0 || channel.A() == 11 || channel.A() == 12;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java
index 38d53df89d..67d0c02e95 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java
@@ -102,33 +102,33 @@ public final class EmojiCategoryAdapter extends RecyclerView.Adapter<EmojiCatego
     public EmojiCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
-        int i2 = 2131364125;
+        int i2 = 2131364168;
         if (i == 0) {
             View inflate = from.inflate(2131558482, viewGroup, false);
-            ImageView imageView = (ImageView) inflate.findViewById(2131363007);
+            ImageView imageView = (ImageView) inflate.findViewById(2131363032);
             if (imageView != null) {
-                View findViewById = inflate.findViewById(2131364125);
+                View findViewById = inflate.findViewById(2131364168);
                 if (findViewById != null) {
                     EmojiCategoryItemStandardBinding emojiCategoryItemStandardBinding = new EmojiCategoryItemStandardBinding((FrameLayout) inflate, imageView, new c.a.i.n(findViewById, findViewById));
                     m.checkNotNullExpressionValue(emojiCategoryItemStandardBinding, "EmojiCategoryItemStandar…(inflater, parent, false)");
                     return new EmojiCategoryViewHolder.Standard(emojiCategoryItemStandardBinding);
                 }
             } else {
-                i2 = 2131363007;
+                i2 = 2131363032;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
         } else if (i == 1) {
             View inflate2 = from.inflate(2131558481, viewGroup, false);
-            GuildIcon guildIcon = (GuildIcon) inflate2.findViewById(2131363006);
+            GuildIcon guildIcon = (GuildIcon) inflate2.findViewById(2131363031);
             if (guildIcon != null) {
-                View findViewById2 = inflate2.findViewById(2131364125);
+                View findViewById2 = inflate2.findViewById(2131364168);
                 if (findViewById2 != null) {
                     EmojiCategoryItemGuildBinding emojiCategoryItemGuildBinding = new EmojiCategoryItemGuildBinding((FrameLayout) inflate2, guildIcon, new c.a.i.n(findViewById2, findViewById2));
                     m.checkNotNullExpressionValue(emojiCategoryItemGuildBinding, "EmojiCategoryItemGuildBi…(inflater, parent, false)");
                     return new EmojiCategoryViewHolder.Guild(emojiCategoryItemGuildBinding);
                 }
             } else {
-                i2 = 2131363006;
+                i2 = 2131363031;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
         } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java
index a8d8349715..40d732ebfc 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryViewHolder.java
@@ -56,28 +56,28 @@ public abstract class EmojiCategoryViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(emojiCategory, "emojiCategory");
             switch (emojiCategory.ordinal()) {
                 case 0:
-                    return 2131231576;
-                case 1:
                     return 2131231582;
+                case 1:
+                    return 2131231588;
                 case 2:
                 default:
-                    return 2131231575;
-                case 3:
                     return 2131231581;
+                case 3:
+                    return 2131231587;
                 case 4:
-                    return 2131231579;
+                    return 2131231585;
                 case 5:
-                    return 2131231578;
-                case 6:
-                    return 2131231574;
-                case 7:
                     return 2131231584;
-                case 8:
+                case 6:
                     return 2131231580;
+                case 7:
+                    return 2131231590;
+                case 8:
+                    return 2131231586;
                 case 9:
-                    return 2131231583;
+                    return 2131231589;
                 case 10:
-                    return 2131231577;
+                    return 2131231583;
             }
         }
     }
@@ -99,7 +99,7 @@ public abstract class EmojiCategoryViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(guildItem, "guildCategoryItem");
             m.checkNotNullParameter(function1, "onCategoryClicked");
             this.binding.b.updateView(guildItem.getGuild());
-            View view = this.binding.f1605c.b;
+            View view = this.binding.f1601c.b;
             m.checkNotNullExpressionValue(view, "binding.overline.express…CategorySelectionOverline");
             view.setVisibility(guildItem.isSelected() ? 0 : 8);
             this.itemView.setOnClickListener(new EmojiCategoryViewHolder$Guild$configure$1(function1, guildItem));
@@ -136,7 +136,7 @@ public abstract class EmojiCategoryViewHolder extends RecyclerView.ViewHolder {
             ImageView imageView2 = this.binding.b;
             m.checkNotNullExpressionValue(imageView2, "binding.emojiCategoryItemStandardIcon");
             imageView2.setSelected(isSelected);
-            View view2 = this.binding.f1606c.b;
+            View view2 = this.binding.f1602c.b;
             m.checkNotNullExpressionValue(view2, "binding.overline.express…CategorySelectionOverline");
             view2.setVisibility(isSelected ? 0 : 8);
             if (isSelected) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$getEmojiContextObservable$1.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$getEmojiContextObservable$1.java
index 1a5784e506..fe00915d2f 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$getEmojiContextObservable$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel$Companion$getEmojiContextObservable$1.java
@@ -11,6 +11,6 @@ public final class EmojiPickerViewModel$Companion$getEmojiContextObservable$1<T,
         if (channel == null) {
             return null;
         }
-        return new StoreEmoji.EmojiContext.Chat(channel.e(), channel.g());
+        return new StoreEmoji.EmojiContext.Chat(channel.f(), channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
index d7ae4806b1..0451fe4ace 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiPickerViewModel.java
@@ -349,9 +349,9 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
 
         private final Observable<StoreEmoji.EmojiContext> getEmojiContextObservable(EmojiPickerContextType emojiPickerContextType, StoreChannelsSelected storeChannelsSelected) {
             if (emojiPickerContextType.ordinal() != 1) {
-                Observable<R> G = storeChannelsSelected.observeSelectedChannel().G(EmojiPickerViewModel$Companion$getEmojiContextObservable$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "storeChannelsSelected.ob…      }\n                }");
-                return G;
+                Observable<R> F = storeChannelsSelected.observeSelectedChannel().F(EmojiPickerViewModel$Companion$getEmojiContextObservable$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "storeChannelsSelected.ob…      }\n                }");
+                return F;
             }
             j jVar = new j(StoreEmoji.EmojiContext.Global.INSTANCE);
             m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …ontext.Global\n          )");
@@ -377,9 +377,9 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(storeGuildsSorted, "storeGuildsSorted");
             m.checkNotNullParameter(storeUserSettings, "storeUserSettings");
             m.checkNotNullParameter(storeAccessibility, "storeAccessibility");
-            Observable<R> Z = observable.Z(new EmojiPickerViewModel$Companion$observeStoreState$1(storeEmoji, storeGuildsSorted, behaviorSubject, storeUserSettings, storeAccessibility, behaviorSubject2));
-            m.checkNotNullExpressionValue(Z, "emojiContextObservable.s…  )\n          }\n        }");
-            return Z;
+            Observable<R> Y = observable.Y(new EmojiPickerViewModel$Companion$observeStoreState$1(storeEmoji, storeGuildsSorted, behaviorSubject, storeUserSettings, storeAccessibility, behaviorSubject2));
+            m.checkNotNullExpressionValue(Y, "emojiContextObservable.s…  )\n          }\n        }");
+            return Y;
         }
     }
 
@@ -971,9 +971,9 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
         this.searchSubject = behaviorSubject;
         this.selectedCategoryItemIdSubject = behaviorSubject2;
         this.storeAnalytics = storeAnalytics;
-        PublishSubject<Event> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.eventSubject = l0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -984,13 +984,13 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
         BehaviorSubject behaviorSubject4;
         Observable observable2;
         if ((i & 4) != 0) {
-            behaviorSubject3 = BehaviorSubject.m0("");
+            behaviorSubject3 = BehaviorSubject.l0("");
             m.checkNotNullExpressionValue(behaviorSubject3, "BehaviorSubject.create(\"\")");
         } else {
             behaviorSubject3 = behaviorSubject;
         }
         if ((i & 8) != 0) {
-            behaviorSubject4 = BehaviorSubject.m0(Long.valueOf(EmojiCategoryItem.Companion.mapEmojiCategoryToItemId(EmojiCategory.FAVORITE)));
+            behaviorSubject4 = BehaviorSubject.l0(Long.valueOf(EmojiCategoryItem.Companion.mapEmojiCategoryToItemId(EmojiCategory.FAVORITE)));
             m.checkNotNullExpressionValue(behaviorSubject4, "BehaviorSubject.create(\n…ojiCategory.FAVORITE)\n  )");
         } else {
             behaviorSubject4 = behaviorSubject2;
@@ -1240,7 +1240,7 @@ public class EmojiPickerViewModel extends AppViewModel<ViewState> {
             if ((emoji instanceof ModelEmojiCustom) && ((ModelEmojiCustom) emoji).isAnimated()) {
                 z2 = true;
             }
-            this.eventSubject.j.onNext(new Event.ShowPremiumUpsellDialog(z2 ? 2 : 1, z2 ? 2131892326 : 2131892334, z2 ? 2131892327 : 2131892335, "Emoji Picker Popout", false, false));
+            this.eventSubject.j.onNext(new Event.ShowPremiumUpsellDialog(z2 ? 2 : 1, z2 ? 2131892403 : 2131892411, z2 ? 2131892404 : 2131892412, "Emoji Picker Popout", false, false));
             this.storeAnalytics.emojiPickerUpsellLockedItemClicked(this.emojiPickerContextType, z2);
         } else if (emoji.isAvailable()) {
             function1.invoke(emoji);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java
index e1ac59f36c..fc4c2cd852 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java
@@ -600,7 +600,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
                 if (headerItem instanceof HeaderItem.StandardHeaderItem) {
                     TextView textView = this.binding.b;
                     m.checkNotNullExpressionValue(textView, "binding.headerItemText");
-                    b.n(textView, Companion.getCategoryString(((HeaderItem.StandardHeaderItem) headerItem).getEmojiCategory()), new Object[0], null, 4);
+                    b.m(textView, Companion.getCategoryString(((HeaderItem.StandardHeaderItem) headerItem).getEmojiCategory()), new Object[0], null, 4);
                     unit = Unit.a;
                 } else if (headerItem instanceof HeaderItem.GuildHeaderItem) {
                     TextView textView2 = this.binding.b;
@@ -610,7 +610,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
                 } else if (headerItem instanceof HeaderItem.StringHeaderItem) {
                     TextView textView3 = this.binding.b;
                     m.checkNotNullExpressionValue(textView3, "binding.headerItemText");
-                    b.n(textView3, ((HeaderItem.StringHeaderItem) headerItem).getStringRes(), new Object[0], null, 4);
+                    b.m(textView3, ((HeaderItem.StringHeaderItem) headerItem).getStringRes(), new Object[0], null, 4);
                     unit = Unit.a;
                 } else {
                     throw new NoWhenBranchMatchedException();
@@ -649,7 +649,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
             super(2131558484, widgetEmojiAdapter);
             m.checkNotNullParameter(widgetEmojiAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363004);
+            TextView textView = (TextView) view.findViewById(2131363029);
             if (textView != null) {
                 EmojiPickerPremiumUpsellBinding emojiPickerPremiumUpsellBinding = new EmojiPickerPremiumUpsellBinding((LinearLayout) view, textView);
                 m.checkNotNullExpressionValue(emojiPickerPremiumUpsellBinding, "EmojiPickerPremiumUpsellBinding.bind(itemView)");
@@ -657,7 +657,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter {
                 textView.setOnClickListener(new AnonymousClass1(widgetEmojiAdapter));
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363004)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363029)));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java
index 263347a332..97fa1df345 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java
@@ -26,48 +26,48 @@ public final /* synthetic */ class WidgetEmojiPicker$binding$2 extends k impleme
 
     public final WidgetEmojiPickerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362458;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362458);
+        int i = 2131362473;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362473);
         if (recyclerView != null) {
-            i = 2131362459;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362459);
+            i = 2131362474;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362474);
             if (appViewFlipper != null) {
-                i = 2131363005;
-                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363005);
+                i = 2131363030;
+                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363030);
                 if (appBarLayout != null) {
-                    i = 2131363009;
-                    TextView textView = (TextView) view.findViewById(2131363009);
+                    i = 2131363034;
+                    TextView textView = (TextView) view.findViewById(2131363034);
                     if (textView != null) {
-                        i = 2131363012;
-                        ImageView imageView = (ImageView) view.findViewById(2131363012);
+                        i = 2131363037;
+                        ImageView imageView = (ImageView) view.findViewById(2131363037);
                         if (imageView != null) {
-                            i = 2131363013;
-                            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363013);
+                            i = 2131363038;
+                            ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363038);
                             if (constraintLayout != null) {
-                                i = 2131363014;
-                                View findViewById = view.findViewById(2131363014);
+                                i = 2131363039;
+                                View findViewById = view.findViewById(2131363039);
                                 if (findViewById != null) {
-                                    i = 2131363015;
-                                    Barrier barrier = (Barrier) view.findViewById(2131363015);
+                                    i = 2131363040;
+                                    Barrier barrier = (Barrier) view.findViewById(2131363040);
                                     if (barrier != null) {
-                                        i = 2131363016;
-                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363016);
+                                        i = 2131363041;
+                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363041);
                                         if (recyclerView2 != null) {
                                             CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
-                                            i = 2131363018;
-                                            ImageView imageView2 = (ImageView) view.findViewById(2131363018);
+                                            i = 2131363043;
+                                            ImageView imageView2 = (ImageView) view.findViewById(2131363043);
                                             if (imageView2 != null) {
-                                                i = 2131363019;
-                                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363019);
+                                                i = 2131363044;
+                                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363044);
                                                 if (frameLayout != null) {
-                                                    i = 2131363020;
-                                                    ImageView imageView3 = (ImageView) view.findViewById(2131363020);
+                                                    i = 2131363045;
+                                                    ImageView imageView3 = (ImageView) view.findViewById(2131363045);
                                                     if (imageView3 != null) {
-                                                        i = 2131363021;
-                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363021);
+                                                        i = 2131363046;
+                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363046);
                                                         if (textInputEditText != null) {
-                                                            i = 2131363025;
-                                                            Toolbar toolbar = (Toolbar) view.findViewById(2131363025);
+                                                            i = 2131363050;
+                                                            Toolbar toolbar = (Toolbar) view.findViewById(2131363050);
                                                             if (toolbar != null) {
                                                                 return new WidgetEmojiPickerBinding(coordinatorLayout, recyclerView, appViewFlipper, appBarLayout, textView, imageView, constraintLayout, findViewById, barrier, recyclerView2, coordinatorLayout, imageView2, frameLayout, imageView3, textInputEditText, toolbar);
                                                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
index 402fb9fa4a..0d43b0212e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java
@@ -19,7 +19,7 @@ import androidx.fragment.app.FragmentViewModelLazyKt;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.a.a.a;
+import c.a.a.e.a;
 import c.a.d.g0;
 import c.a.l.b;
 import c.d.b.a.a;
@@ -74,7 +74,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
     private EmojiCategoryAdapter categoryAdapter;
     private LinearLayoutManager categoryLayoutManager;
     private WidgetEmojiAdapter emojiAdapter;
-    private final PublishSubject<Unit> emojiCategoryScrollSubject = PublishSubject.l0();
+    private final PublishSubject<Unit> emojiCategoryScrollSubject = PublishSubject.k0();
     private EmojiPickerListener emojiPickerListener;
     private EmojiPickerMode emojiPickerMode;
     private boolean isNextCategoryScrollSmooth = true;
@@ -96,7 +96,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
     }
 
     public WidgetEmojiPicker() {
-        super(2131558992);
+        super(2131558996);
     }
 
     public static final /* synthetic */ void access$checkUpsellHeaderVisibility(WidgetEmojiPicker widgetEmojiPicker, RecyclerView recyclerView) {
@@ -249,7 +249,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
         }
         if (viewState != null) {
             if (viewState instanceof EmojiPickerViewModel.ViewState.EmptySearch) {
-                AppViewFlipper appViewFlipper = getBinding().f1769c;
+                AppViewFlipper appViewFlipper = getBinding().f1770c;
                 m.checkNotNullExpressionValue(appViewFlipper, "binding.chatInputEmojiPickerViewFlipper");
                 appViewFlipper.setDisplayedChild(1);
                 setEmojiPickerBottomBarVisible(false);
@@ -257,7 +257,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
             } else if (viewState instanceof EmojiPickerViewModel.ViewState.Results) {
                 EmojiPickerViewModel.ViewState.Results results = (EmojiPickerViewModel.ViewState.Results) viewState;
                 setEmojiPickerBottomBarVisible(results.getShowBottomBar());
-                AppViewFlipper appViewFlipper2 = getBinding().f1769c;
+                AppViewFlipper appViewFlipper2 = getBinding().f1770c;
                 m.checkNotNullExpressionValue(appViewFlipper2, "binding.chatInputEmojiPickerViewFlipper");
                 appViewFlipper2.setDisplayedChild(0);
                 WidgetEmojiAdapter widgetEmojiAdapter = this.emojiAdapter;
@@ -389,7 +389,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
             widgetEmojiAdapter.scrollToPosition(((EmojiPickerViewModel.Event.ScrollToEmojiListPosition) event).getPosition());
             unit = Unit.a;
         } else if (event instanceof EmojiPickerViewModel.Event.ShowPremiumUpsellDialog) {
-            a.b bVar = c.a.a.a.a.j;
+            a.b bVar = c.a.a.e.a.j;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             EmojiPickerViewModel.Event.ShowPremiumUpsellDialog showPremiumUpsellDialog = (EmojiPickerViewModel.Event.ShowPremiumUpsellDialog) event;
@@ -404,14 +404,14 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
     private final void handleInputChanged(String str) {
         getViewModel().setSearchText(str);
         boolean z2 = str.length() == 0;
-        getBinding().l.setImageResource(z2 ? 2131231901 : 2131231519);
+        getBinding().l.setImageResource(z2 ? 2131231909 : 2131231525);
         ImageView imageView = getBinding().l;
         m.checkNotNullExpressionValue(imageView, "binding.emojiSearchClear");
         imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968988)) : ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968989)));
         if (z2) {
             ImageView imageView2 = getBinding().l;
             m.checkNotNullExpressionValue(imageView2, "binding.emojiSearchClear");
-            imageView2.setContentDescription(b.j(this, 2131893071, new Object[0], null, 4));
+            imageView2.setContentDescription(b.j(this, 2131893154, new Object[0], null, 4));
             ImageView imageView3 = getBinding().l;
             m.checkNotNullExpressionValue(imageView3, "binding.emojiSearchClear");
             imageView3.setImportantForAccessibility(2);
@@ -419,7 +419,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
         }
         ImageView imageView4 = getBinding().l;
         m.checkNotNullExpressionValue(imageView4, "binding.emojiSearchClear");
-        imageView4.setContentDescription(b.j(this, 2131892641, new Object[0], null, 4));
+        imageView4.setContentDescription(b.j(this, 2131892722, new Object[0], null, 4));
         ImageView imageView5 = getBinding().l;
         m.checkNotNullExpressionValue(imageView5, "binding.emojiSearchClear");
         imageView5.setImportantForAccessibility(1);
@@ -624,9 +624,9 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec
 
     private final void subscribeToCategoryRecyclerScrolls() {
         PublishSubject<Unit> publishSubject = this.emojiCategoryScrollSubject;
-        Observable i02 = Observable.i0(new r(publishSubject.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
-        m.checkNotNullExpressionValue(i02, "emojiCategoryScrollSubje…, TimeUnit.MILLISECONDS))");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(i02, this, null, 2, null), WidgetEmojiPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1(this), 62, (Object) null);
+        Observable h02 = Observable.h0(new r(publishSubject.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
+        m.checkNotNullExpressionValue(h02, "emojiCategoryScrollSubje…, TimeUnit.MILLISECONDS))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(h02, this, null, 2, null), WidgetEmojiPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetEmojiPicker$subscribeToCategoryRecyclerScrolls$1(this), 62, (Object) null);
     }
 
     public final void clearSearchInput() {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java
index c9cc3575e3..cf2858201a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java
@@ -74,7 +74,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558993;
+        return 2131558997;
     }
 
     @Override // com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet, androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener
@@ -126,7 +126,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im
         if (widgetEmojiPicker4 == null) {
             m.throwUninitializedPropertyAccessException("emojiPickerFragment");
         }
-        beginTransaction.replace(2131363022, widgetEmojiPicker3, widgetEmojiPicker4.getClass().getSimpleName()).runOnCommit(new WidgetEmojiPickerSheet$onViewCreated$2(this)).commit();
+        beginTransaction.replace(2131363047, widgetEmojiPicker3, widgetEmojiPicker4.getClass().getSimpleName()).runOnCommit(new WidgetEmojiPickerSheet$onViewCreated$2(this)).commit();
     }
 
     public final void setEmojiPickerListener(EmojiPickerListener emojiPickerListener) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java
index 7a8df90f32..807dcb9d7e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionPickerEventBus.java
@@ -10,7 +10,7 @@ import rx.subjects.PublishSubject;
 public final class ExpressionPickerEventBus {
     public static final Companion Companion = new Companion(null);
     private static final Lazy INSTANCE$delegate = g.lazy(ExpressionPickerEventBus$Companion$INSTANCE$2.INSTANCE);
-    private final PublishSubject<ExpressionPickerEvent> expressionPickerEventSubject = PublishSubject.l0();
+    private final PublishSubject<ExpressionPickerEvent> expressionPickerEventSubject = PublishSubject.k0();
 
     /* compiled from: ExpressionPickerEventBus.kt */
     public static final class Companion {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Companion$observeStoreState$1.java
index beabb0208e..eec8cf97d4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Companion$observeStoreState$1.java
@@ -1,16 +1,31 @@
 package com.discord.widgets.chat.input.expression;
 
+import com.discord.api.channel.Channel;
+import com.discord.api.sticker.Sticker;
+import com.discord.models.guild.Guild;
+import com.discord.models.user.MeUser;
 import com.discord.widgets.chat.input.expression.ExpressionTrayViewModel;
+import d0.t.u;
 import d0.z.d.m;
-import rx.functions.Func2;
+import java.util.Map;
+import rx.functions.Func6;
 /* compiled from: ExpressionTrayViewModel.kt */
-public final class ExpressionTrayViewModel$Companion$observeStoreState$1<T1, T2, R> implements Func2<Boolean, ExpressionTrayTab, ExpressionTrayViewModel.StoreState> {
+public final class ExpressionTrayViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, T5, T6, R> implements Func6<Boolean, ExpressionTrayTab, Channel, MeUser, Map<Long, ? extends Map<Long, ? extends Sticker>>, Map<Long, ? extends Guild>, ExpressionTrayViewModel.StoreState> {
     public static final ExpressionTrayViewModel$Companion$observeStoreState$1 INSTANCE = new ExpressionTrayViewModel$Companion$observeStoreState$1();
 
-    public final ExpressionTrayViewModel.StoreState call(Boolean bool, ExpressionTrayTab expressionTrayTab) {
+    public final ExpressionTrayViewModel.StoreState call(Boolean bool, ExpressionTrayTab expressionTrayTab, Channel channel, MeUser meUser, Map<Long, ? extends Map<Long, Sticker>> map, Map<Long, Guild> map2) {
         m.checkNotNullExpressionValue(bool, "canShowStickerPickerNfx");
         boolean booleanValue = bool.booleanValue();
         m.checkNotNullExpressionValue(expressionTrayTab, "lastSelectedTab");
-        return new ExpressionTrayViewModel.StoreState(booleanValue, expressionTrayTab);
+        Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
+        m.checkNotNullExpressionValue(map, "guildStickers");
+        return new ExpressionTrayViewModel.StoreState(booleanValue, expressionTrayTab, valueOf, meUser, map, u.toSet(map2.keySet()));
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func6
+    public /* bridge */ /* synthetic */ ExpressionTrayViewModel.StoreState call(Boolean bool, ExpressionTrayTab expressionTrayTab, Channel channel, MeUser meUser, Map<Long, ? extends Map<Long, ? extends Sticker>> map, Map<Long, ? extends Guild> map2) {
+        return call(bool, expressionTrayTab, channel, meUser, (Map<Long, ? extends Map<Long, Sticker>>) map, (Map<Long, Guild>) map2);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java
index acd4c8834d..53da96c510 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/ExpressionTrayViewModel.java
@@ -2,10 +2,19 @@ package com.discord.widgets.chat.input.expression;
 
 import android.content.Context;
 import c.d.b.a.a;
+import com.discord.api.premium.PremiumTier;
+import com.discord.api.sticker.Sticker;
 import com.discord.app.AppViewModel;
+import com.discord.models.experiments.domain.Experiment;
+import com.discord.models.user.MeUser;
 import com.discord.stores.StoreAnalytics;
+import com.discord.stores.StoreChannelsSelected;
+import com.discord.stores.StoreExperiments;
 import com.discord.stores.StoreExpressionPickerNavigation;
+import com.discord.stores.StoreGuildStickers;
+import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.chat.input.expression.ExpressionDetailPage;
 import com.discord.widgets.chat.input.expression.ExpressionPickerEvent;
@@ -13,6 +22,10 @@ import com.discord.widgets.chat.input.gifpicker.GifCategoryItem;
 import com.discord.widgets.chat.input.sticker.StickerPickerNfxManager;
 import d0.z.d.k;
 import d0.z.d.m;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 import kotlin.NoWhenBranchMatchedException;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -25,7 +38,12 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
     public static final Companion Companion = new Companion(null);
     private final PublishSubject<Event> eventSubject;
     private final StoreAnalytics storeAnalytics;
+    private final StoreChannelsSelected storeChannelsSelected;
+    private final StoreExperiments storeExperiments;
     private final StoreExpressionPickerNavigation storeExpressionPickerNavigation;
+    private final StoreGuildStickers storeGuildStickers;
+    private final StoreGuilds storeGuilds;
+    private final StoreUser storeUser;
     private boolean wasActive;
 
     /* compiled from: ExpressionTrayViewModel.kt */
@@ -79,17 +97,14 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             this();
         }
 
-        private final Observable<StoreState> observeStoreState(StickerPickerNfxManager stickerPickerNfxManager, StoreExpressionPickerNavigation storeExpressionPickerNavigation) {
-            Observable<StoreState> j = Observable.j(stickerPickerNfxManager.observeCanShowStickerPickerNfx(), storeExpressionPickerNavigation.observeSelectedTab(), ExpressionTrayViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(j, "Observable.combineLatest…ab,\n          )\n        }");
-            return j;
+        private final Observable<StoreState> observeStoreState(StickerPickerNfxManager stickerPickerNfxManager, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds) {
+            Observable<StoreState> f = Observable.f(stickerPickerNfxManager.observeCanShowStickerPickerNfx(), storeExpressionPickerNavigation.observeSelectedTab(), storeChannelsSelected.observeSelectedChannel(), StoreUser.observeMe$default(storeUser, false, 1, null), storeGuildStickers.observeGuildStickers(), storeGuilds.observeGuilds(), ExpressionTrayViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(f, "Observable.combineLatest…(),\n          )\n        }");
+            return f;
         }
 
-        public static /* synthetic */ Observable observeStoreState$default(Companion companion, StickerPickerNfxManager stickerPickerNfxManager, StoreExpressionPickerNavigation storeExpressionPickerNavigation, int i, Object obj) {
-            if ((i & 1) != 0) {
-                stickerPickerNfxManager = new StickerPickerNfxManager(null, null, null, 7, null);
-            }
-            return companion.observeStoreState(stickerPickerNfxManager, storeExpressionPickerNavigation);
+        public static /* synthetic */ Observable observeStoreState$default(Companion companion, StickerPickerNfxManager stickerPickerNfxManager, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds, int i, Object obj) {
+            return companion.observeStoreState((i & 1) != 0 ? new StickerPickerNfxManager(null, null, null, 7, null) : stickerPickerNfxManager, storeExpressionPickerNavigation, storeChannelsSelected, storeUser, storeGuildStickers, storeGuilds);
         }
     }
 
@@ -233,22 +248,53 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
     /* compiled from: ExpressionTrayViewModel.kt */
     public static final class StoreState {
         private final boolean canShowStickerPickerNfx;
+        private final Long guildId;
+        private final Map<Long, Map<Long, Sticker>> guildStickers;
+        private final MeUser meUser;
         private final ExpressionTrayTab selectedExpressionTab;
+        private final Set<Long> userGuildIds;
 
-        public StoreState(boolean z2, ExpressionTrayTab expressionTrayTab) {
+        /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.Map<java.lang.Long, com.discord.api.sticker.Sticker>> */
+        /* JADX WARN: Multi-variable type inference failed */
+        public StoreState(boolean z2, ExpressionTrayTab expressionTrayTab, Long l, MeUser meUser, Map<Long, ? extends Map<Long, Sticker>> map, Set<Long> set) {
             m.checkNotNullParameter(expressionTrayTab, "selectedExpressionTab");
+            m.checkNotNullParameter(map, "guildStickers");
+            m.checkNotNullParameter(set, "userGuildIds");
             this.canShowStickerPickerNfx = z2;
             this.selectedExpressionTab = expressionTrayTab;
+            this.guildId = l;
+            this.meUser = meUser;
+            this.guildStickers = map;
+            this.userGuildIds = set;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, boolean z2, ExpressionTrayTab expressionTrayTab, int i, Object obj) {
+        /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+        public /* synthetic */ StoreState(boolean z2, ExpressionTrayTab expressionTrayTab, Long l, MeUser meUser, Map map, Set set, int i, DefaultConstructorMarker defaultConstructorMarker) {
+            this(z2, expressionTrayTab, (i & 4) != 0 ? null : l, (i & 8) != 0 ? null : meUser, map, set);
+        }
+
+        /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.chat.input.expression.ExpressionTrayViewModel$StoreState */
+        /* JADX WARN: Multi-variable type inference failed */
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, boolean z2, ExpressionTrayTab expressionTrayTab, Long l, MeUser meUser, Map map, Set set, int i, Object obj) {
             if ((i & 1) != 0) {
                 z2 = storeState.canShowStickerPickerNfx;
             }
             if ((i & 2) != 0) {
                 expressionTrayTab = storeState.selectedExpressionTab;
             }
-            return storeState.copy(z2, expressionTrayTab);
+            if ((i & 4) != 0) {
+                l = storeState.guildId;
+            }
+            if ((i & 8) != 0) {
+                meUser = storeState.meUser;
+            }
+            if ((i & 16) != 0) {
+                map = storeState.guildStickers;
+            }
+            if ((i & 32) != 0) {
+                set = storeState.userGuildIds;
+            }
+            return storeState.copy(z2, expressionTrayTab, l, meUser, map, set);
         }
 
         public final boolean component1() {
@@ -259,9 +305,27 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             return this.selectedExpressionTab;
         }
 
-        public final StoreState copy(boolean z2, ExpressionTrayTab expressionTrayTab) {
+        public final Long component3() {
+            return this.guildId;
+        }
+
+        public final MeUser component4() {
+            return this.meUser;
+        }
+
+        public final Map<Long, Map<Long, Sticker>> component5() {
+            return this.guildStickers;
+        }
+
+        public final Set<Long> component6() {
+            return this.userGuildIds;
+        }
+
+        public final StoreState copy(boolean z2, ExpressionTrayTab expressionTrayTab, Long l, MeUser meUser, Map<Long, ? extends Map<Long, Sticker>> map, Set<Long> set) {
             m.checkNotNullParameter(expressionTrayTab, "selectedExpressionTab");
-            return new StoreState(z2, expressionTrayTab);
+            m.checkNotNullParameter(map, "guildStickers");
+            m.checkNotNullParameter(set, "userGuildIds");
+            return new StoreState(z2, expressionTrayTab, l, meUser, map, set);
         }
 
         public boolean equals(Object obj) {
@@ -272,17 +336,33 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return this.canShowStickerPickerNfx == storeState.canShowStickerPickerNfx && m.areEqual(this.selectedExpressionTab, storeState.selectedExpressionTab);
+            return this.canShowStickerPickerNfx == storeState.canShowStickerPickerNfx && m.areEqual(this.selectedExpressionTab, storeState.selectedExpressionTab) && m.areEqual(this.guildId, storeState.guildId) && m.areEqual(this.meUser, storeState.meUser) && m.areEqual(this.guildStickers, storeState.guildStickers) && m.areEqual(this.userGuildIds, storeState.userGuildIds);
         }
 
         public final boolean getCanShowStickerPickerNfx() {
             return this.canShowStickerPickerNfx;
         }
 
+        public final Long getGuildId() {
+            return this.guildId;
+        }
+
+        public final Map<Long, Map<Long, Sticker>> getGuildStickers() {
+            return this.guildStickers;
+        }
+
+        public final MeUser getMeUser() {
+            return this.meUser;
+        }
+
         public final ExpressionTrayTab getSelectedExpressionTab() {
             return this.selectedExpressionTab;
         }
 
+        public final Set<Long> getUserGuildIds() {
+            return this.userGuildIds;
+        }
+
         public int hashCode() {
             boolean z2 = this.canShowStickerPickerNfx;
             if (z2) {
@@ -293,7 +373,19 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             int i3 = z2 ? 1 : 0;
             int i4 = i * 31;
             ExpressionTrayTab expressionTrayTab = this.selectedExpressionTab;
-            return i4 + (expressionTrayTab != null ? expressionTrayTab.hashCode() : 0);
+            int i5 = 0;
+            int hashCode = (i4 + (expressionTrayTab != null ? expressionTrayTab.hashCode() : 0)) * 31;
+            Long l = this.guildId;
+            int hashCode2 = (hashCode + (l != null ? l.hashCode() : 0)) * 31;
+            MeUser meUser = this.meUser;
+            int hashCode3 = (hashCode2 + (meUser != null ? meUser.hashCode() : 0)) * 31;
+            Map<Long, Map<Long, Sticker>> map = this.guildStickers;
+            int hashCode4 = (hashCode3 + (map != null ? map.hashCode() : 0)) * 31;
+            Set<Long> set = this.userGuildIds;
+            if (set != null) {
+                i5 = set.hashCode();
+            }
+            return hashCode4 + i5;
         }
 
         public String toString() {
@@ -301,6 +393,14 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             L.append(this.canShowStickerPickerNfx);
             L.append(", selectedExpressionTab=");
             L.append(this.selectedExpressionTab);
+            L.append(", guildId=");
+            L.append(this.guildId);
+            L.append(", meUser=");
+            L.append(this.meUser);
+            L.append(", guildStickers=");
+            L.append(this.guildStickers);
+            L.append(", userGuildIds=");
+            L.append(this.userGuildIds);
             L.append(")");
             return L.toString();
         }
@@ -310,6 +410,9 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
     public static final class ViewState {
         private final boolean canShowStickerPickerNfx;
         private final ExpressionDetailPage expressionDetailPage;
+        private final boolean hasGuildStickers;
+        private final boolean hasPremiumTier2;
+        private final boolean isInAnyGuildWithStickers;
         private final ExpressionTrayTab selectedExpressionTab;
         private final boolean showLandingPage;
         private final boolean showSearchBar;
@@ -328,12 +431,15 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             }
         }
 
-        public ViewState(boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3) {
+        public ViewState(boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3, boolean z4, boolean z5, boolean z6) {
             m.checkNotNullParameter(expressionTrayTab, "selectedExpressionTab");
             this.canShowStickerPickerNfx = z2;
             this.selectedExpressionTab = expressionTrayTab;
             this.expressionDetailPage = expressionDetailPage;
             this.showStickersSearchBar = z3;
+            this.hasGuildStickers = z4;
+            this.hasPremiumTier2 = z5;
+            this.isInAnyGuildWithStickers = z6;
             this.showLandingPage = expressionDetailPage == null;
             int ordinal = expressionTrayTab.ordinal();
             if (ordinal == 0 || ordinal == 1) {
@@ -345,11 +451,11 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ ViewState(boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this(z2, expressionTrayTab, (i & 4) != 0 ? null : expressionDetailPage, z3);
+        public /* synthetic */ ViewState(boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3, boolean z4, boolean z5, boolean z6, int i, DefaultConstructorMarker defaultConstructorMarker) {
+            this(z2, expressionTrayTab, (i & 4) != 0 ? null : expressionDetailPage, z3, z4, z5, z6);
         }
 
-        public static /* synthetic */ ViewState copy$default(ViewState viewState, boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3, int i, Object obj) {
+        public static /* synthetic */ ViewState copy$default(ViewState viewState, boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3, boolean z4, boolean z5, boolean z6, int i, Object obj) {
             if ((i & 1) != 0) {
                 z2 = viewState.canShowStickerPickerNfx;
             }
@@ -362,7 +468,16 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             if ((i & 8) != 0) {
                 z3 = viewState.showStickersSearchBar;
             }
-            return viewState.copy(z2, expressionTrayTab, expressionDetailPage, z3);
+            if ((i & 16) != 0) {
+                z4 = viewState.hasGuildStickers;
+            }
+            if ((i & 32) != 0) {
+                z5 = viewState.hasPremiumTier2;
+            }
+            if ((i & 64) != 0) {
+                z6 = viewState.isInAnyGuildWithStickers;
+            }
+            return viewState.copy(z2, expressionTrayTab, expressionDetailPage, z3, z4, z5, z6);
         }
 
         public final boolean component1() {
@@ -381,9 +496,21 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             return this.showStickersSearchBar;
         }
 
-        public final ViewState copy(boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3) {
+        public final boolean component5() {
+            return this.hasGuildStickers;
+        }
+
+        public final boolean component6() {
+            return this.hasPremiumTier2;
+        }
+
+        public final boolean component7() {
+            return this.isInAnyGuildWithStickers;
+        }
+
+        public final ViewState copy(boolean z2, ExpressionTrayTab expressionTrayTab, ExpressionDetailPage expressionDetailPage, boolean z3, boolean z4, boolean z5, boolean z6) {
             m.checkNotNullParameter(expressionTrayTab, "selectedExpressionTab");
-            return new ViewState(z2, expressionTrayTab, expressionDetailPage, z3);
+            return new ViewState(z2, expressionTrayTab, expressionDetailPage, z3, z4, z5, z6);
         }
 
         public boolean equals(Object obj) {
@@ -394,7 +521,7 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             ViewState viewState = (ViewState) obj;
-            return this.canShowStickerPickerNfx == viewState.canShowStickerPickerNfx && m.areEqual(this.selectedExpressionTab, viewState.selectedExpressionTab) && m.areEqual(this.expressionDetailPage, viewState.expressionDetailPage) && this.showStickersSearchBar == viewState.showStickersSearchBar;
+            return this.canShowStickerPickerNfx == viewState.canShowStickerPickerNfx && m.areEqual(this.selectedExpressionTab, viewState.selectedExpressionTab) && m.areEqual(this.expressionDetailPage, viewState.expressionDetailPage) && this.showStickersSearchBar == viewState.showStickersSearchBar && this.hasGuildStickers == viewState.hasGuildStickers && this.hasPremiumTier2 == viewState.hasPremiumTier2 && this.isInAnyGuildWithStickers == viewState.isInAnyGuildWithStickers;
         }
 
         public final boolean getCanShowStickerPickerNfx() {
@@ -405,6 +532,14 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             return this.expressionDetailPage;
         }
 
+        public final boolean getHasGuildStickers() {
+            return this.hasGuildStickers;
+        }
+
+        public final boolean getHasPremiumTier2() {
+            return this.hasPremiumTier2;
+        }
+
         public final ExpressionTrayTab getSelectedExpressionTab() {
             return this.selectedExpressionTab;
         }
@@ -440,10 +575,38 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             }
             int i7 = (hashCode + i6) * 31;
             boolean z3 = this.showStickersSearchBar;
-            if (!z3) {
-                i = z3 ? 1 : 0;
+            if (z3) {
+                z3 = true;
             }
-            return i7 + i;
+            int i8 = z3 ? 1 : 0;
+            int i9 = z3 ? 1 : 0;
+            int i10 = z3 ? 1 : 0;
+            int i11 = (i7 + i8) * 31;
+            boolean z4 = this.hasGuildStickers;
+            if (z4) {
+                z4 = true;
+            }
+            int i12 = z4 ? 1 : 0;
+            int i13 = z4 ? 1 : 0;
+            int i14 = z4 ? 1 : 0;
+            int i15 = (i11 + i12) * 31;
+            boolean z5 = this.hasPremiumTier2;
+            if (z5) {
+                z5 = true;
+            }
+            int i16 = z5 ? 1 : 0;
+            int i17 = z5 ? 1 : 0;
+            int i18 = z5 ? 1 : 0;
+            int i19 = (i15 + i16) * 31;
+            boolean z6 = this.isInAnyGuildWithStickers;
+            if (!z6) {
+                i = z6 ? 1 : 0;
+            }
+            return i19 + i;
+        }
+
+        public final boolean isInAnyGuildWithStickers() {
+            return this.isInAnyGuildWithStickers;
         }
 
         public String toString() {
@@ -454,7 +617,13 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
             L.append(", expressionDetailPage=");
             L.append(this.expressionDetailPage);
             L.append(", showStickersSearchBar=");
-            return a.G(L, this.showStickersSearchBar, ")");
+            L.append(this.showStickersSearchBar);
+            L.append(", hasGuildStickers=");
+            L.append(this.hasGuildStickers);
+            L.append(", hasPremiumTier2=");
+            L.append(this.hasPremiumTier2);
+            L.append(", isInAnyGuildWithStickers=");
+            return a.G(L, this.isInAnyGuildWithStickers, ")");
         }
     }
 
@@ -482,28 +651,43 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
     }
 
     public ExpressionTrayViewModel() {
-        this(null, null, null, null, 15, null);
+        this(null, null, null, null, null, null, null, null, null, 511, null);
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public ExpressionTrayViewModel(StoreAnalytics storeAnalytics, StoreExpressionPickerNavigation storeExpressionPickerNavigation, Observable<StoreState> observable, Observable<ExpressionPickerEvent> observable2) {
-        super(new ViewState(false, ExpressionTrayTab.EMOJI, null, true, 4, null));
+    public ExpressionTrayViewModel(StoreAnalytics storeAnalytics, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StoreExperiments storeExperiments, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds, Observable<StoreState> observable, Observable<ExpressionPickerEvent> observable2) {
+        super(new ViewState(false, ExpressionTrayTab.EMOJI, null, true, false, false, false, 4, null));
         m.checkNotNullParameter(storeAnalytics, "storeAnalytics");
         m.checkNotNullParameter(storeExpressionPickerNavigation, "storeExpressionPickerNavigation");
+        m.checkNotNullParameter(storeChannelsSelected, "storeChannelsSelected");
+        m.checkNotNullParameter(storeExperiments, "storeExperiments");
+        m.checkNotNullParameter(storeUser, "storeUser");
+        m.checkNotNullParameter(storeGuildStickers, "storeGuildStickers");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
         m.checkNotNullParameter(observable, "storeStateObservable");
         m.checkNotNullParameter(observable2, "expressionPickerNavigationObservable");
         this.storeAnalytics = storeAnalytics;
         this.storeExpressionPickerNavigation = storeExpressionPickerNavigation;
-        this.eventSubject = PublishSubject.l0();
+        this.storeChannelsSelected = storeChannelsSelected;
+        this.storeExperiments = storeExperiments;
+        this.storeUser = storeUser;
+        this.storeGuildStickers = storeGuildStickers;
+        this.storeGuilds = storeGuilds;
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), ExpressionTrayViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable2, this, null, 2, null), ExpressionTrayViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
-    public /* synthetic */ ExpressionTrayViewModel(StoreAnalytics storeAnalytics, StoreExpressionPickerNavigation storeExpressionPickerNavigation, Observable observable, Observable observable2, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(storeAnalytics, storeExpressionPickerNavigation, (i & 4) != 0 ? Companion.observeStoreState$default(Companion, null, storeExpressionPickerNavigation, 1, null) : observable, (i & 8) != 0 ? ExpressionPickerEventBus.Companion.getINSTANCE().observeExpressionPickerEvents() : observable2);
-        storeAnalytics = (i & 1) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics;
-        storeExpressionPickerNavigation = (i & 2) != 0 ? StoreStream.Companion.getExpressionPickerNavigation() : storeExpressionPickerNavigation;
+    public /* synthetic */ ExpressionTrayViewModel(StoreAnalytics storeAnalytics, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StoreExperiments storeExperiments, StoreUser storeUser, StoreGuildStickers storeGuildStickers, StoreGuilds storeGuilds, Observable observable, Observable observable2, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(r1, r2, r12, r13, r14, r15, r16, (i & 128) != 0 ? Companion.observeStoreState$default(Companion, null, r2, r12, r14, r15, r16, 1, null) : observable, (i & 256) != 0 ? ExpressionPickerEventBus.Companion.getINSTANCE().observeExpressionPickerEvents() : observable2);
+        StoreAnalytics analytics = (i & 1) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics;
+        StoreExpressionPickerNavigation expressionPickerNavigation = (i & 2) != 0 ? StoreStream.Companion.getExpressionPickerNavigation() : storeExpressionPickerNavigation;
+        StoreChannelsSelected channelsSelected = (i & 4) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected;
+        StoreExperiments experiments = (i & 8) != 0 ? StoreStream.Companion.getExperiments() : storeExperiments;
+        StoreUser users = (i & 16) != 0 ? StoreStream.Companion.getUsers() : storeUser;
+        StoreGuildStickers guildStickers = (i & 32) != 0 ? StoreStream.Companion.getGuildStickers() : storeGuildStickers;
+        StoreGuilds guilds = (i & 64) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds;
     }
 
     public static final /* synthetic */ void access$handleExpressionPickerEvents(ExpressionTrayViewModel expressionTrayViewModel, ExpressionPickerEvent expressionPickerEvent) {
@@ -550,8 +734,53 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
         }
     }
 
+    /* JADX WARNING: Removed duplicated region for block: B:28:0x0079  */
+    /* JADX WARNING: Removed duplicated region for block: B:29:0x007e  */
+    /* JADX WARNING: Removed duplicated region for block: B:32:0x0083  */
+    /* JADX WARNING: Removed duplicated region for block: B:33:0x0085  */
     private final void handleStoreState(StoreState storeState) {
-        updateViewState(ViewState.copy$default(requireViewState(), storeState.getCanShowStickerPickerNfx(), storeState.getSelectedExpressionTab(), null, false, 12, null));
+        boolean z2;
+        boolean z3;
+        boolean z4;
+        Long guildId = storeState.getGuildId();
+        if (guildId != null) {
+            Experiment guildExperiment = this.storeExperiments.getGuildExperiment("2021-03_stickers_premium_guild", guildId.longValue(), true);
+            z2 = guildExperiment != null && guildExperiment.getBucket() == 1;
+        } else {
+            z2 = false;
+        }
+        Set<Long> userGuildIds = storeState.getUserGuildIds();
+        if (!(userGuildIds instanceof Collection) || !userGuildIds.isEmpty()) {
+            Iterator<T> it = userGuildIds.iterator();
+            while (true) {
+                if (!it.hasNext()) {
+                    break;
+                }
+                Map<Long, Sticker> map = storeState.getGuildStickers().get(Long.valueOf(((Number) it.next()).longValue()));
+                if (map == null || map.isEmpty()) {
+                    z4 = false;
+                    continue;
+                } else {
+                    z4 = true;
+                    continue;
+                }
+                if (z4) {
+                    z3 = true;
+                    break;
+                }
+            }
+            ViewState requireViewState = requireViewState();
+            ExpressionTrayTab selectedExpressionTab = storeState.getSelectedExpressionTab();
+            boolean canShowStickerPickerNfx = storeState.getCanShowStickerPickerNfx();
+            MeUser meUser = storeState.getMeUser();
+            updateViewState(ViewState.copy$default(requireViewState, canShowStickerPickerNfx, selectedExpressionTab, null, false, z2, (meUser == null ? meUser.getPremiumTier() : null) != PremiumTier.TIER_2, z3, 12, null));
+        }
+        z3 = false;
+        ViewState requireViewState = requireViewState();
+        ExpressionTrayTab selectedExpressionTab = storeState.getSelectedExpressionTab();
+        boolean canShowStickerPickerNfx = storeState.getCanShowStickerPickerNfx();
+        MeUser meUser = storeState.getMeUser();
+        updateViewState(ViewState.copy$default(requireViewState, canShowStickerPickerNfx, selectedExpressionTab, null, false, z2, (meUser == null ? meUser.getPremiumTier() : null) != PremiumTier.TIER_2, z3, 12, null));
     }
 
     private final void hideExpressionPicker() {
@@ -606,7 +835,7 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
     public final void clickBack() {
         ViewState requireViewState = requireViewState();
         if (requireViewState.getExpressionDetailPage() != null) {
-            updateViewState(ViewState.copy$default(requireViewState, false, null, null, false, 11, null));
+            updateViewState(ViewState.copy$default(requireViewState, false, null, null, false, false, false, false, 123, null));
         }
     }
 
@@ -638,7 +867,7 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
 
     public final void selectGifCategory(GifCategoryItem gifCategoryItem) {
         m.checkNotNullParameter(gifCategoryItem, "gifCategoryItem");
-        updateViewState(ViewState.copy$default(requireViewState(), false, null, new ExpressionDetailPage.GifCategoryPage(gifCategoryItem), false, 11, null));
+        updateViewState(ViewState.copy$default(requireViewState(), false, null, new ExpressionDetailPage.GifCategoryPage(gifCategoryItem), false, false, false, false, 123, null));
     }
 
     public final void selectTab(ExpressionTrayTab expressionTrayTab) {
@@ -647,7 +876,7 @@ public final class ExpressionTrayViewModel extends AppViewModel<ViewState> {
     }
 
     public final void showStickersSearchBar(boolean z2) {
-        updateViewState(ViewState.copy$default(requireViewState(), false, null, null, z2, 7, null));
+        updateViewState(ViewState.copy$default(requireViewState(), false, null, null, z2, false, false, false, 119, null));
     }
 
     public void updateViewState(ViewState viewState) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java
index a8f30a88b5..92850c996b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionPickerAdapter.java
@@ -140,9 +140,9 @@ public abstract class WidgetExpressionPickerAdapter extends MGRecyclerAdapterSim
 
     private final void setupScrollObservables() {
         Observable n = Observable.n(new WidgetExpressionPickerAdapter$setupScrollObservables$1(this), Emitter.BackpressureMode.LATEST);
-        Observable i02 = Observable.i0(new r(n.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
-        m.checkNotNullExpressionValue(i02, "Observable\n        .crea…, TimeUnit.MILLISECONDS))");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(i02), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetExpressionPickerAdapter$setupScrollObservables$2(this), 62, (Object) null);
+        Observable h02 = Observable.h0(new r(n.i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS)));
+        m.checkNotNullExpressionValue(h02, "Observable\n        .crea…, TimeUnit.MILLISECONDS))");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(h02), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetExpressionPickerAdapter$setupScrollObservables$2(this), 62, (Object) null);
         RecyclerView.OnScrollListener onScrollListener = this.onScrollListener;
         if (onScrollListener != null) {
             getRecycler().addOnScrollListener(onScrollListener);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java
index 1b37a8c48a..f77df5f992 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java
@@ -26,50 +26,50 @@ public final /* synthetic */ class WidgetExpressionTray$binding$2 extends k impl
     public final WidgetExpressionTrayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         FrameLayout frameLayout = (FrameLayout) view;
-        int i = 2131363132;
-        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363132);
+        int i = 2131363157;
+        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363157);
         if (frameLayout2 != null) {
-            i = 2131363133;
-            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131363133);
+            i = 2131363158;
+            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131363158);
             if (fragmentContainerView != null) {
-                i = 2131363134;
-                CardSegment cardSegment = (CardSegment) view.findViewById(2131363134);
+                i = 2131363159;
+                CardSegment cardSegment = (CardSegment) view.findViewById(2131363159);
                 if (cardSegment != null) {
-                    i = 2131363135;
-                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131363135);
+                    i = 2131363160;
+                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131363160);
                     if (fragmentContainerView2 != null) {
-                        i = 2131363136;
-                        CardSegment cardSegment2 = (CardSegment) view.findViewById(2131363136);
+                        i = 2131363161;
+                        CardSegment cardSegment2 = (CardSegment) view.findViewById(2131363161);
                         if (cardSegment2 != null) {
-                            i = 2131363137;
-                            FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131363137);
+                            i = 2131363162;
+                            FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131363162);
                             if (fragmentContainerView3 != null) {
-                                i = 2131363138;
-                                ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view.findViewById(2131363138);
+                                i = 2131363163;
+                                ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view.findViewById(2131363163);
                                 if (contentResizingCoordinatorLayout != null) {
-                                    i = 2131363139;
-                                    RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view.findViewById(2131363139);
+                                    i = 2131363164;
+                                    RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view.findViewById(2131363164);
                                     if (roundedRelativeLayout != null) {
-                                        i = 2131363140;
-                                        TextView textView = (TextView) view.findViewById(2131363140);
+                                        i = 2131363165;
+                                        TextView textView = (TextView) view.findViewById(2131363165);
                                         if (textView != null) {
-                                            i = 2131363141;
-                                            ImageView imageView = (ImageView) view.findViewById(2131363141);
+                                            i = 2131363166;
+                                            ImageView imageView = (ImageView) view.findViewById(2131363166);
                                             if (imageView != null) {
-                                                i = 2131363142;
-                                                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131363142);
+                                                i = 2131363167;
+                                                SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131363167);
                                                 if (segmentedControlContainer != null) {
-                                                    i = 2131363143;
-                                                    CardSegment cardSegment3 = (CardSegment) view.findViewById(2131363143);
+                                                    i = 2131363168;
+                                                    CardSegment cardSegment3 = (CardSegment) view.findViewById(2131363168);
                                                     if (cardSegment3 != null) {
-                                                        i = 2131363144;
-                                                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131363144);
+                                                        i = 2131363169;
+                                                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131363169);
                                                         if (fragmentContainerView4 != null) {
-                                                            i = 2131363145;
-                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131363145);
+                                                            i = 2131363170;
+                                                            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131363170);
                                                             if (collapsingToolbarLayout != null) {
-                                                                i = 2131363146;
-                                                                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363146);
+                                                                i = 2131363171;
+                                                                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363171);
                                                                 if (appBarLayout != null) {
                                                                     return new WidgetExpressionTrayBinding((FrameLayout) view, frameLayout, frameLayout2, fragmentContainerView, cardSegment, fragmentContainerView2, cardSegment2, fragmentContainerView3, contentResizingCoordinatorLayout, roundedRelativeLayout, textView, imageView, segmentedControlContainer, cardSegment3, fragmentContainerView4, collapsingToolbarLayout, appBarLayout);
                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$expressionTrayViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$expressionTrayViewModel$2.java
index 094407bd89..7d2239d49b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$expressionTrayViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$expressionTrayViewModel$2.java
@@ -15,6 +15,6 @@ public final class WidgetExpressionTray$expressionTrayViewModel$2 extends o impl
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<ExpressionTrayViewModel.ViewState> mo1invoke() {
-        return new ExpressionTrayViewModel(null, null, null, null, 15, null);
+        return new ExpressionTrayViewModel(null, null, null, null, null, null, null, null, null, 511, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java
index 5e6ba55110..f347167a3b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java
@@ -18,6 +18,6 @@ public final class WidgetExpressionTray$flexInputViewModel$2 extends o implement
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FlexInputState> mo1invoke() {
-        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null);
+        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, null, null, null, 1022, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java
index 7c3093c372..a8ad0c9f69 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java
@@ -14,6 +14,6 @@ public final class WidgetExpressionTray$setWindowInsetsListeners$2 implements On
 
     @Override // androidx.core.view.OnApplyWindowInsetsListener
     public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
-        return ViewCompat.dispatchApplyWindowInsets(WidgetExpressionTray.access$getBinding$p(this.this$0).f1774c, windowInsetsCompat);
+        return ViewCompat.dispatchApplyWindowInsets(WidgetExpressionTray.access$getBinding$p(this.this$0).f1775c, windowInsetsCompat);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
index 1e8f8b3bcb..074d185475 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java
@@ -108,9 +108,9 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         }
 
         public final Observable<Boolean> observeIsExpressionTrayActive() {
-            Observable<Boolean> s2 = isExpressionTrayActiveSubject().s();
-            m.checkNotNullExpressionValue(s2, "isExpressionTrayActiveSu…ct.distinctUntilChanged()");
-            return s2;
+            Observable<Boolean> r = isExpressionTrayActiveSubject().r();
+            m.checkNotNullExpressionValue(r, "isExpressionTrayActiveSu…ct.distinctUntilChanged()");
+            return r;
         }
     }
 
@@ -152,13 +152,13 @@ public final class WidgetExpressionTray extends AppFragment implements c {
     }
 
     static {
-        BehaviorSubject<Boolean> m0 = BehaviorSubject.m0(Boolean.FALSE);
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(false)");
-        isExpressionTrayActiveSubject = m0;
+        BehaviorSubject<Boolean> l0 = BehaviorSubject.l0(Boolean.FALSE);
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(false)");
+        isExpressionTrayActiveSubject = l0;
     }
 
     public WidgetExpressionTray() {
-        super(2131559000);
+        super(2131559004);
         TooltipManager tooltipManager = null;
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(appLog, "logger");
@@ -173,12 +173,12 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
         tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
         if (tooltipManager == null) {
-            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
             TooltipManager.a.a = new WeakReference<>(tooltipManager);
         }
         this.tooltipManager = tooltipManager;
         this.defaultTooltipCreator = new DefaultTooltipCreator(tooltipManager);
-        this.isAtInitialScrollPositionSubject = BehaviorSubject.m0(Boolean.TRUE);
+        this.isAtInitialScrollPositionSubject = BehaviorSubject.l0(Boolean.TRUE);
         this.stickerPickerFeatureFlag = StickerPickerFeatureFlag.Companion.getINSTANCE();
     }
 
@@ -271,8 +271,8 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             bundle.putSerializable("GIF_CATEGORY_ITEM", ((ExpressionDetailPage.GifCategoryPage) expressionDetailPage).getGifCategoryItem());
             widgetGifCategory.setArguments(bundle);
             widgetGifCategory.setOnGifSelected(new WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2(this));
-            getChildFragmentManager().beginTransaction().replace(2131363133, widgetGifCategory, WidgetGifCategory.class.getSimpleName()).commit();
-        } else if (expressionDetailPage == null && (findFragmentById = getChildFragmentManager().findFragmentById(2131363133)) != null) {
+            getChildFragmentManager().beginTransaction().replace(2131363158, widgetGifCategory, WidgetGifCategory.class.getSimpleName()).commit();
+        } else if (expressionDetailPage == null && (findFragmentById = getChildFragmentManager().findFragmentById(2131363158)) != null) {
             getChildFragmentManager().beginTransaction().remove(findFragmentById).commit();
         }
     }
@@ -305,11 +305,11 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         }
         int ordinal2 = selectedExpressionTab.ordinal();
         if (ordinal2 == 0) {
-            i = 2131893084;
+            i = 2131893167;
         } else if (ordinal2 == 1) {
-            i = 2131893126;
+            i = 2131893209;
         } else if (ordinal2 == 2) {
-            i = 2131893086;
+            i = 2131893169;
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -400,33 +400,61 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         }
     }
 
+    /* JADX WARNING: Removed duplicated region for block: B:35:0x00b5  */
+    /* JADX WARNING: Removed duplicated region for block: B:43:0x00d6  */
     private final void handleViewState(ExpressionTrayViewModel.ViewState viewState) {
+        boolean z2;
+        CardSegment cardSegment;
         configureLandingPage(viewState);
         configureDetailPage(viewState);
         ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = getBinding().g;
         m.checkNotNullExpressionValue(contentResizingCoordinatorLayout, "binding.expressionTrayLandingPage");
-        int i = 0;
+        int i = 8;
         contentResizingCoordinatorLayout.setVisibility(viewState.getShowLandingPage() ? 0 : 8);
         FragmentContainerView fragmentContainerView = getBinding().d;
         m.checkNotNullExpressionValue(fragmentContainerView, "binding.expressionTrayDetailPage");
+        boolean z3 = true;
         fragmentContainerView.setVisibility(viewState.getShowLandingPage() ^ true ? 0 : 8);
         RoundedRelativeLayout roundedRelativeLayout = getBinding().h;
         m.checkNotNullExpressionValue(roundedRelativeLayout, "binding.expressionTraySearchBar");
-        if (!viewState.getShowSearchBar()) {
-            i = 8;
-        }
-        roundedRelativeLayout.setVisibility(i);
+        roundedRelativeLayout.setVisibility(viewState.getShowSearchBar() ? 0 : 8);
         if (viewState.getCanShowStickerPickerNfx() && this.wasActive) {
             BehaviorSubject<Boolean> behaviorSubject = this.isAtInitialScrollPositionSubject;
             m.checkNotNullExpressionValue(behaviorSubject, "isAtInitialScrollPositionSubject");
-            Boolean o0 = behaviorSubject.o0();
-            m.checkNotNullExpressionValue(o0, "isAtInitialScrollPositionSubject.value");
-            if (o0.booleanValue()) {
+            Boolean n0 = behaviorSubject.n0();
+            m.checkNotNullExpressionValue(n0, "isAtInitialScrollPositionSubject.value");
+            if (n0.booleanValue()) {
                 showStickerPickerTooltip();
-                return;
+                z2 = !this.stickerPickerFeatureFlag.isEnabled() || viewState.getHasGuildStickers() || (!viewState.getHasPremiumTier2() && viewState.isInAnyGuildWithStickers());
+                cardSegment = getBinding().k;
+                m.checkNotNullExpressionValue(cardSegment, "binding.expressionTrayStickerCard");
+                if (cardSegment.getVisibility() != 0) {
+                    z3 = false;
+                }
+                if (z3 && !z2 && viewState.getSelectedExpressionTab() == ExpressionTrayTab.STICKER) {
+                    getExpressionTrayViewModel().selectTab(ExpressionTrayTab.EMOJI);
+                }
+                CardSegment cardSegment2 = getBinding().k;
+                m.checkNotNullExpressionValue(cardSegment2, "binding.expressionTrayStickerCard");
+                if (z2) {
+                    i = 0;
+                }
+                cardSegment2.setVisibility(i);
             }
         }
         this.tooltipManager.c(StickerPickerTooltip.INSTANCE);
+        if (!this.stickerPickerFeatureFlag.isEnabled()) {
+        }
+        cardSegment = getBinding().k;
+        m.checkNotNullExpressionValue(cardSegment, "binding.expressionTrayStickerCard");
+        if (cardSegment.getVisibility() != 0) {
+        }
+        getExpressionTrayViewModel().selectTab(ExpressionTrayTab.EMOJI);
+        CardSegment cardSegment2 = getBinding().k;
+        m.checkNotNullExpressionValue(cardSegment2, "binding.expressionTrayStickerCard");
+        if (z2) {
+        }
+        cardSegment2.setVisibility(i);
     }
 
     private final void hideStickerPickerTooltip() {
@@ -459,7 +487,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             bundle.putSerializable("MODE", EmojiPickerMode.INLINE);
             bundle.putSerializable("EMOJI_PICKER_CONTEXT_TYPE", EmojiPickerContextType.CHAT);
             widgetEmojiPicker.setArguments(bundle);
-            getChildFragmentManager().beginTransaction().replace(2131363135, widgetEmojiPicker, WidgetEmojiPicker.class.getSimpleName()).commit();
+            getChildFragmentManager().beginTransaction().replace(2131363160, widgetEmojiPicker, WidgetEmojiPicker.class.getSimpleName()).commit();
             this.emojiPickerFragment = widgetEmojiPicker;
         }
     }
@@ -469,7 +497,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             this.gifPickerInitialized = true;
             WidgetGifPicker widgetGifPicker = new WidgetGifPicker();
             widgetGifPicker.setOnSelectGifCategory(new WidgetExpressionTray$setUpGifPicker$1(getExpressionTrayViewModel()));
-            getChildFragmentManager().beginTransaction().replace(2131363137, widgetGifPicker, WidgetGifPicker.class.getSimpleName()).commit();
+            getChildFragmentManager().beginTransaction().replace(2131363162, widgetGifPicker, WidgetGifPicker.class.getSimpleName()).commit();
             this.gifPickerFragment = widgetGifPicker;
         }
     }
@@ -485,7 +513,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             Bundle bundle = new Bundle();
             bundle.putSerializable("MODE", StickerPickerMode.INLINE);
             widgetStickerPicker.setArguments(bundle);
-            getChildFragmentManager().beginTransaction().replace(2131363144, widgetStickerPicker, WidgetStickerPicker.class.getSimpleName()).commit();
+            getChildFragmentManager().beginTransaction().replace(2131363169, widgetStickerPicker, WidgetStickerPicker.class.getSimpleName()).commit();
             this.stickerPickerFragment = widgetStickerPicker;
         }
     }
@@ -511,7 +539,7 @@ public final class WidgetExpressionTray extends AppFragment implements c {
         FragmentContainerView fragmentContainerView4 = getBinding().d;
         m.checkNotNullExpressionValue(fragmentContainerView4, "binding.expressionTrayDetailPage");
         ViewExtensions.setForwardingWindowInsetsListener(fragmentContainerView4);
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1774c, new WidgetExpressionTray$setWindowInsetsListeners$1(this));
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1775c, new WidgetExpressionTray$setWindowInsetsListeners$1(this));
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().g, new WidgetExpressionTray$setWindowInsetsListeners$2(this));
         FrameLayout frameLayout = getBinding().b;
         m.checkNotNullExpressionValue(frameLayout, "binding.expressionTrayContainer");
@@ -531,10 +559,10 @@ public final class WidgetExpressionTray extends AppFragment implements c {
             ExpressionPickerSparkleTooltip expressionPickerSparkleTooltip = ExpressionPickerSparkleTooltip.INSTANCE;
             Objects.requireNonNull(tooltipManager);
             m.checkNotNullParameter(expressionPickerSparkleTooltip, "tooltip");
-            boolean contains = tooltipManager.f2101c.contains(expressionPickerSparkleTooltip.getTooltipName());
-            Observable<Unit> G = getUnsubscribeSignal().G(WidgetExpressionTray$showStickerPickerTooltip$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "this.unsubscribeSignal.map { }");
-            defaultTooltipCreator.a(cardText, string, stickerPickerTooltip, floatingViewGravity, 0, dpToPixels, contains, G);
+            boolean contains = tooltipManager.f2107c.contains(expressionPickerSparkleTooltip.getTooltipName());
+            Observable<Unit> F = getUnsubscribeSignal().F(WidgetExpressionTray$showStickerPickerTooltip$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "this.unsubscribeSignal.map { }");
+            defaultTooltipCreator.a(cardText, string, stickerPickerTooltip, floatingViewGravity, 0, dpToPixels, contains, F);
         }
     }
 
@@ -543,9 +571,9 @@ public final class WidgetExpressionTray extends AppFragment implements c {
     }
 
     private final void subscribeToScrollPosition() {
-        Observable<Boolean> s2 = this.isAtInitialScrollPositionSubject.s();
-        m.checkNotNullExpressionValue(s2, "isAtInitialScrollPositio…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetExpressionTray.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetExpressionTray$subscribeToScrollPosition$1(this), 62, (Object) null);
+        Observable<Boolean> r = this.isAtInitialScrollPositionSubject.r();
+        m.checkNotNullExpressionValue(r, "isAtInitialScrollPositio…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetExpressionTray.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetExpressionTray$subscribeToScrollPosition$1(this), 62, (Object) null);
     }
 
     private final void trackExpressionPickerOpened() {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java
index ea3a60000e..0010cc8fb4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java
@@ -141,22 +141,22 @@ public final class GifAdapter extends RecyclerView.Adapter<GifViewHolder> {
         int ordinal = GifAdapterItem.ViewType.Companion.fromInt(i).ordinal();
         if (ordinal == 0) {
             View inflate = from.inflate(2131558507, viewGroup, false);
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363274);
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363300);
             if (simpleDraweeView != null) {
                 GifItemViewBinding gifItemViewBinding = new GifItemViewBinding((CardView) inflate, simpleDraweeView);
                 m.checkNotNullExpressionValue(gifItemViewBinding, "GifItemViewBinding.infla…(inflater, parent, false)");
                 gifViewHolder = new GifViewHolder.Gif(gifItemViewBinding);
             } else {
-                throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363274)));
+                throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363300)));
             }
         } else if (ordinal == 1 || ordinal == 2) {
             View inflate2 = from.inflate(2131558509, viewGroup, false);
             LinearLayout linearLayout = (LinearLayout) inflate2;
-            int i2 = 2131363283;
-            FlexboxLayout flexboxLayout = (FlexboxLayout) inflate2.findViewById(2131363283);
+            int i2 = 2131363309;
+            FlexboxLayout flexboxLayout = (FlexboxLayout) inflate2.findViewById(2131363309);
             if (flexboxLayout != null) {
-                i2 = 2131363284;
-                TextView textView = (TextView) inflate2.findViewById(2131363284);
+                i2 = 2131363310;
+                TextView textView = (TextView) inflate2.findViewById(2131363310);
                 if (textView != null) {
                     GifSuggestedTermViewBinding gifSuggestedTermViewBinding = new GifSuggestedTermViewBinding((LinearLayout) inflate2, linearLayout, flexboxLayout, textView);
                     m.checkNotNullExpressionValue(gifSuggestedTermViewBinding, "GifSuggestedTermViewBind…(inflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java
index 258067163f..df61539fbd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java
@@ -60,14 +60,14 @@ public final class GifCategoryAdapter extends RecyclerView.Adapter<GifCategoryVi
     public GifCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558506, viewGroup, false);
-        int i2 = 2131363269;
-        ImageView imageView = (ImageView) inflate.findViewById(2131363269);
+        int i2 = 2131363295;
+        ImageView imageView = (ImageView) inflate.findViewById(2131363295);
         if (imageView != null) {
-            i2 = 2131363270;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363270);
+            i2 = 2131363296;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363296);
             if (simpleDraweeView != null) {
-                i2 = 2131363271;
-                TextView textView = (TextView) inflate.findViewById(2131363271);
+                i2 = 2131363297;
+                TextView textView = (TextView) inflate.findViewById(2131363297);
                 if (textView != null) {
                     GifCategoryItemViewBinding gifCategoryItemViewBinding = new GifCategoryItemViewBinding((CardView) inflate, imageView, simpleDraweeView, textView);
                     m.checkNotNullExpressionValue(gifCategoryItemViewBinding, "GifCategoryItemViewBindi….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java
index 24baf1d8fa..3b0c6a3db9 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewHolder.java
@@ -27,12 +27,12 @@ public final class GifCategoryViewHolder extends RecyclerView.ViewHolder {
     }
 
     private final void setPreviewImage(String str) {
-        SimpleDraweeView simpleDraweeView = this.binding.f1610c;
+        SimpleDraweeView simpleDraweeView = this.binding.f1606c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.gifCategoryItemPreview");
         ViewGroup.LayoutParams layoutParams = simpleDraweeView.getLayoutParams();
         int i = layoutParams.width;
         int i2 = layoutParams.height;
-        SimpleDraweeView simpleDraweeView2 = this.binding.f1610c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.f1606c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.gifCategoryItemPreview");
         MGImages.setImage$default(simpleDraweeView2, str, i, i2, false, null, null, 112, null);
     }
@@ -54,14 +54,14 @@ public final class GifCategoryViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(textView2, "binding.gifCategoryItemTitle");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            textView2.setText(view.getResources().getString(2131888971));
+            textView2.setText(view.getResources().getString(2131888975));
             ImageView imageView2 = this.binding.b;
             m.checkNotNullExpressionValue(imageView2, "binding.gifCategoryItemIcon");
             imageView2.setVisibility(0);
             ImageView imageView3 = this.binding.b;
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            imageView3.setImageDrawable(ResourcesCompat.getDrawable(view2.getResources(), 2131231382, null));
+            imageView3.setImageDrawable(ResourcesCompat.getDrawable(view2.getResources(), 2131231388, null));
         }
         this.itemView.setOnClickListener(new GifCategoryViewHolder$configure$1(function1, gifCategoryItem));
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
index f953fa749d..37d8a5fd35 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryViewModel.java
@@ -80,9 +80,9 @@ public final class GifCategoryViewModel extends AppViewModel<ViewState> {
             } else {
                 throw new NoWhenBranchMatchedException();
             }
-            Observable<R> G = observable.G(GifCategoryViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "gifsObservable.map { gifs -> StoreState(gifs) }");
-            return G;
+            Observable<R> F = observable.F(GifCategoryViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "gifsObservable.map { gifs -> StoreState(gifs) }");
+            return F;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java
index 18b1b1a249..e64e217b86 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel$Companion$observeQueryState$2.java
@@ -63,6 +63,6 @@ public final class GifSearchViewModel$Companion$observeQueryState$2<T, R> implem
 
     public final Observable<? extends GifSearchViewModel.StoreState> call(String str) {
         m.checkNotNullExpressionValue(str, "query");
-        return str.length() == 0 ? new j(new GifSearchViewModel.StoreState.TrendingSearchTermsResults(this.$trendingSearchTerms)) : Observable.j(this.$storeGifPicker.observeGifsForSearchQuery(str).y(AnonymousClass1.INSTANCE), this.$storeGifPicker.observeSuggestedSearchTerms(str), new AnonymousClass2(this, str));
+        return str.length() == 0 ? new j(new GifSearchViewModel.StoreState.TrendingSearchTermsResults(this.$trendingSearchTerms)) : Observable.j(this.$storeGifPicker.observeGifsForSearchQuery(str).x(AnonymousClass1.INSTANCE), this.$storeGifPicker.observeSuggestedSearchTerms(str), new AnonymousClass2(this, str));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
index 7d45269b42..a0e621680d 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifSearchViewModel.java
@@ -78,16 +78,16 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeQueryState(BehaviorSubject<String> behaviorSubject, StoreAnalytics storeAnalytics, StoreGifPicker storeGifPicker, List<String> list) {
-            Observable<String> s2 = behaviorSubject.J(a.c()).s();
-            Observable<StoreState> Z = Observable.i0(new r(s2.i, new LeadingEdgeThrottle(1000, TimeUnit.MILLISECONDS, a.c()))).u(new GifSearchViewModel$Companion$observeQueryState$1(storeAnalytics)).Z(new GifSearchViewModel$Companion$observeQueryState$2(list, storeGifPicker));
-            m.checkNotNullExpressionValue(Z, "searchSubject\n          …          }\n            }");
-            return Z;
+            Observable<String> r = behaviorSubject.I(a.c()).r();
+            Observable<StoreState> Y = Observable.h0(new r(r.i, new LeadingEdgeThrottle(1000, TimeUnit.MILLISECONDS, a.c()))).t(new GifSearchViewModel$Companion$observeQueryState$1(storeAnalytics)).Y(new GifSearchViewModel$Companion$observeQueryState$2(list, storeGifPicker));
+            m.checkNotNullExpressionValue(Y, "searchSubject\n          …          }\n            }");
+            return Y;
         }
 
         private final Observable<StoreState> observeStoreState(BehaviorSubject<String> behaviorSubject, StoreAnalytics storeAnalytics, StoreGifPicker storeGifPicker) {
-            Observable<R> Z = storeGifPicker.observeGifTrendingSearchTerms().Z(new GifSearchViewModel$Companion$observeStoreState$1(behaviorSubject, storeAnalytics, storeGifPicker));
-            m.checkNotNullExpressionValue(Z, "storeGifPicker.observeGi…fPicker, terms)\n        }");
-            return Z;
+            Observable<R> Y = storeGifPicker.observeGifTrendingSearchTerms().Y(new GifSearchViewModel$Companion$observeStoreState$1(behaviorSubject, storeAnalytics, storeGifPicker));
+            m.checkNotNullExpressionValue(Y, "storeGifPicker.observeGi…fPicker, terms)\n        }");
+            return Y;
         }
     }
 
@@ -376,7 +376,7 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
         this(context, r0, r1, r2, (i & 16) != 0 ? new MessageManager(context, null, null, null, null, null, null, null, null, 510, null) : messageManager, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, r0, r2, r1) : observable);
         BehaviorSubject behaviorSubject2;
         if ((i & 2) != 0) {
-            behaviorSubject2 = BehaviorSubject.m0("");
+            behaviorSubject2 = BehaviorSubject.l0("");
             m.checkNotNullExpressionValue(behaviorSubject2, "BehaviorSubject.create(\"\")");
         } else {
             behaviorSubject2 = behaviorSubject;
@@ -405,14 +405,14 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
             boolean z3 = true;
             boolean z4 = arrayList.size() > 0;
             boolean z5 = searchResults.getSuggested().size() > 0;
-            String o0 = this.searchSubject.o0();
-            m.checkNotNullExpressionValue(o0, "searchSubject.value");
-            if (o0.length() <= 0) {
+            String n0 = this.searchSubject.n0();
+            m.checkNotNullExpressionValue(n0, "searchSubject.value");
+            if (n0.length() <= 0) {
                 z3 = false;
             }
-            arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, 2131888970) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131888968) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891388) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891389));
+            arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, 2131888974) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131888972) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891459) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891460));
         } else if (storeState instanceof StoreState.TrendingSearchTermsResults) {
-            arrayList.add(new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(trendingSearchTerms, 2131888968));
+            arrayList.add(new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(trendingSearchTerms, 2131888972));
         }
         ViewState.Loaded loaded = new ViewState.Loaded(arrayList);
         if (z2) {
@@ -437,7 +437,7 @@ public final class GifSearchViewModel extends AppViewModel<ViewState> {
     public final void setSearchText(String str) {
         m.checkNotNullParameter(str, "searchText");
         boolean z2 = true;
-        if (!m.areEqual(this.searchSubject.o0(), str)) {
+        if (!m.areEqual(this.searchSubject.n0(), str)) {
             if (str.length() <= 0) {
                 z2 = false;
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java
index fd9b4880ed..af1295a8c9 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java
@@ -86,9 +86,9 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder {
 
         private final void configureSearchTerms(GifAdapterItem.SuggestedTermsItem suggestedTermsItem, Function1<? super String, Unit> function1, int i) {
             List<String> terms = suggestedTermsItem.getTerms();
-            TextView textView = this.binding.f1611c;
+            TextView textView = this.binding.f1607c;
             m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText");
-            b.n(textView, suggestedTermsItem.getTitleResId(), new Object[0], null, 4);
+            b.m(textView, suggestedTermsItem.getTitleResId(), new Object[0], null, 4);
             int size = terms.size();
             if (size > 0) {
                 for (int i2 = 0; i2 < size; i2++) {
@@ -142,7 +142,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder {
 
         public final void configure(GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults suggestedTermsEmptyResults, Function1<? super String, Unit> function1) {
             m.checkNotNullParameter(suggestedTermsEmptyResults, "termsItem");
-            TextView textView = this.binding.f1611c;
+            TextView textView = this.binding.f1607c;
             m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
@@ -155,7 +155,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder {
 
         public final void configure(GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults suggestedTermsNonEmptyResults, Function1<? super String, Unit> function1) {
             m.checkNotNullParameter(suggestedTermsNonEmptyResults, "termsItem");
-            TextView textView = this.binding.f1611c;
+            TextView textView = this.binding.f1607c;
             m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText");
             DrawableCompat.setCompoundDrawablesCompat$default(textView, (Drawable) null, (Drawable) null, (Drawable) null, (Drawable) null, 13, (Object) null);
             configureSearchTerms(suggestedTermsNonEmptyResults, function1, -2);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java
index ecdb9d0870..26a035bbac 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetGifCategory$binding$2 extends k impleme
     public final WidgetGifCategoryBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view;
-        int i = 2131363268;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363268);
+        int i = 2131363294;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363294);
         if (recyclerView != null) {
-            i = 2131363272;
-            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363272);
+            i = 2131363298;
+            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363298);
             if (gifLoadingView != null) {
-                i = 2131363273;
-                TextView textView = (TextView) view.findViewById(2131363273);
+                i = 2131363299;
+                TextView textView = (TextView) view.findViewById(2131363299);
                 if (textView != null) {
                     return new WidgetGifCategoryBinding((ContentResizingCoordinatorLayout) view, contentResizingCoordinatorLayout, recyclerView, gifLoadingView, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$expressionTrayViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$expressionTrayViewModel$2.java
index c1c3a88f32..7a385e0cd2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$expressionTrayViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$expressionTrayViewModel$2.java
@@ -15,6 +15,6 @@ public final class WidgetGifCategory$expressionTrayViewModel$2 extends o impleme
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<ExpressionTrayViewModel.ViewState> mo1invoke() {
-        return new ExpressionTrayViewModel(null, null, null, null, 15, null);
+        return new ExpressionTrayViewModel(null, null, null, null, null, null, null, null, null, 511, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java
index c6363fb490..2f815dd73a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java
@@ -14,7 +14,7 @@ public final class WidgetGifCategory$setWindowInsetsListeners$2 implements OnApp
 
     @Override // androidx.core.view.OnApplyWindowInsetsListener
     public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
-        ViewCompat.dispatchApplyWindowInsets(WidgetGifCategory.access$getBinding$p(this.this$0).f1784c, windowInsetsCompat);
+        ViewCompat.dispatchApplyWindowInsets(WidgetGifCategory.access$getBinding$p(this.this$0).f1785c, windowInsetsCompat);
         return windowInsetsCompat.consumeSystemWindowInsets();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
index 8921429e5a..0c5b22c2d3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java
@@ -56,7 +56,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     public WidgetGifCategory() {
-        super(2131559015);
+        super(2131559019);
         WidgetGifCategory$gifCategoryViewModel$2 widgetGifCategory$gifCategoryViewModel$2 = new WidgetGifCategory$gifCategoryViewModel$2(this);
         h0 h0Var = new h0(this);
         this.gifCategoryViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifCategoryViewModel.class), new WidgetGifCategory$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifCategory$gifCategoryViewModel$2));
@@ -105,7 +105,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     private final void handleViewState(GifCategoryViewModel.ViewState viewState) {
-        RecyclerView recyclerView = getBinding().f1784c;
+        RecyclerView recyclerView = getBinding().f1785c;
         m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler");
         recyclerView.setVisibility(0);
         GifLoadingView gifLoadingView = getBinding().d;
@@ -133,25 +133,25 @@ public final class WidgetGifCategory extends AppFragment {
 
     private final void setUpGifRecycler(int i) {
         StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(i, 1);
-        RecyclerView recyclerView = getBinding().f1784c;
+        RecyclerView recyclerView = getBinding().f1785c;
         m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler");
         recyclerView.setLayoutManager(staggeredGridLayoutManager);
-        RecyclerView recyclerView2 = getBinding().f1784c;
+        RecyclerView recyclerView2 = getBinding().f1785c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.gifCategoryGifRecycler");
         recyclerView2.setItemAnimator(null);
         int dpToPixels = DimenUtils.dpToPixels(8);
         GifAdapter.Companion companion = GifAdapter.Companion;
-        RecyclerView recyclerView3 = getBinding().f1784c;
+        RecyclerView recyclerView3 = getBinding().f1785c;
         m.checkNotNullExpressionValue(recyclerView3, "binding.gifCategoryGifRecycler");
         this.gifAdapter = new GifAdapter(this, new WidgetGifCategory$setUpGifRecycler$1(this), companion.calculateColumnWidth(recyclerView3, i, dpToPixels), null, null, 24, null);
-        RecyclerView recyclerView4 = getBinding().f1784c;
+        RecyclerView recyclerView4 = getBinding().f1785c;
         m.checkNotNullExpressionValue(recyclerView4, "binding.gifCategoryGifRecycler");
         GifAdapter gifAdapter = this.gifAdapter;
         if (gifAdapter == null) {
             m.throwUninitializedPropertyAccessException("gifAdapter");
         }
         recyclerView4.setAdapter(gifAdapter);
-        getBinding().f1784c.addItemDecoration(new u(dpToPixels, i));
+        getBinding().f1785c.addItemDecoration(new u(dpToPixels, i));
     }
 
     private final void setUpTitle() {
@@ -162,7 +162,7 @@ public final class WidgetGifCategory extends AppFragment {
         if (gifCategory instanceof GifCategoryItem.Standard) {
             str = ((GifCategoryItem.Standard) gifCategory).getGifCategory().getCategoryName();
         } else if (gifCategory instanceof GifCategoryItem.Trending) {
-            str = getResources().getString(2131888971);
+            str = getResources().getString(2131888975);
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -170,7 +170,7 @@ public final class WidgetGifCategory extends AppFragment {
     }
 
     private final void setWindowInsetsListeners() {
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1784c, WidgetGifCategory$setWindowInsetsListeners$1.INSTANCE);
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1785c, WidgetGifCategory$setWindowInsetsListeners$1.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, new WidgetGifCategory$setWindowInsetsListeners$2(this));
     }
 
@@ -179,7 +179,7 @@ public final class WidgetGifCategory extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         GifAdapter.Companion companion = GifAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1784c;
+        RecyclerView recyclerView = getBinding().f1785c;
         m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler");
         int calculateColumnCount = companion.calculateColumnCount(recyclerView);
         setUpTitle();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java
index a3074080d3..aedbd5f509 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java
@@ -17,15 +17,15 @@ public final /* synthetic */ class WidgetGifPicker$binding$2 extends k implement
 
     public final WidgetGifPickerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363275;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363275);
+        int i = 2131363301;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363301);
         if (recyclerView != null) {
             FrameLayout frameLayout = (FrameLayout) view;
-            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363277);
+            GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363303);
             if (gifLoadingView != null) {
                 return new WidgetGifPickerBinding(frameLayout, recyclerView, frameLayout, gifLoadingView);
             }
-            i = 2131363277;
+            i = 2131363303;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
index ded1b86499..6487d6ac64 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java
@@ -34,7 +34,7 @@ public final class WidgetGifPicker extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetGifPicker() {
-        super(2131559016);
+        super(2131559020);
         WidgetGifPicker$viewModel$2 widgetGifPicker$viewModel$2 = WidgetGifPicker$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifPickerViewModel.class), new WidgetGifPicker$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifPicker$viewModel$2));
@@ -95,7 +95,7 @@ public final class WidgetGifPicker extends AppFragment {
     private final void setWindowInsetsListeners() {
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, WidgetGifPicker$setWindowInsetsListeners$1.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, WidgetGifPicker$setWindowInsetsListeners$2.INSTANCE);
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1785c, new WidgetGifPicker$setWindowInsetsListeners$3(this));
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1786c, new WidgetGifPicker$setWindowInsetsListeners$3(this));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java
index 5eb192a582..d8bd77cb18 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java
@@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetGifPickerSearch$binding$2 extends k imp
 
     public final WidgetGifPickerSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363278;
-        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363278);
+        int i = 2131363304;
+        AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363304);
         if (appBarLayout != null) {
-            i = 2131363279;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363279);
+            i = 2131363305;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363305);
             if (recyclerView != null) {
-                i = 2131363280;
-                GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363280);
+                i = 2131363306;
+                GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363306);
                 if (gifLoadingView != null) {
-                    i = 2131363285;
-                    Toolbar toolbar = (Toolbar) view.findViewById(2131363285);
+                    i = 2131363311;
+                    Toolbar toolbar = (Toolbar) view.findViewById(2131363311);
                     if (toolbar != null) {
-                        i = 2131363286;
-                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363286);
+                        i = 2131363312;
+                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363312);
                         if (appViewFlipper != null) {
-                            i = 2131364540;
-                            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364540);
+                            i = 2131364579;
+                            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364579);
                             if (searchInputView != null) {
                                 return new WidgetGifPickerSearchBinding((CoordinatorLayout) view, appBarLayout, recyclerView, gifLoadingView, toolbar, appViewFlipper, searchInputView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
index 01dee03077..0e38990483 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java
@@ -35,7 +35,7 @@ public final class WidgetGifPickerSearch extends AppFragment {
     private Function0<Unit> onGifSelected;
 
     public WidgetGifPickerSearch() {
-        super(2131559017);
+        super(2131559021);
         WidgetGifPickerSearch$gifPickerViewModel$2 widgetGifPickerSearch$gifPickerViewModel$2 = new WidgetGifPickerSearch$gifPickerViewModel$2(this);
         h0 h0Var = new h0(this);
         this.gifPickerViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifSearchViewModel.class), new WidgetGifPickerSearch$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifPickerSearch$gifPickerViewModel$2));
@@ -128,16 +128,16 @@ public final class WidgetGifPickerSearch extends AppFragment {
         int calculateColumnCount = companion.calculateColumnCount(recyclerView);
         setUpGifRecycler(calculateColumnCount);
         setupSearchBar();
-        GifLoadingView.updateView$default(getBinding().f1786c, calculateColumnCount, 0, 2, null);
+        GifLoadingView.updateView$default(getBinding().f1787c, calculateColumnCount, 0, 2, null);
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         getBinding().e.j.f78c.requestFocus();
-        Observable<GifSearchViewModel.ViewState> s2 = getGifPickerViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "gifPickerViewModel\n     …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetGifPickerSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGifPickerSearch$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<GifSearchViewModel.ViewState> r = getGifPickerViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "gifPickerViewModel\n     …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetGifPickerSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGifPickerSearch$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 
     public final void setOnGifSelected(Function0<Unit> function0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java
index 346c87c29c..f22fe03b92 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java
@@ -83,7 +83,7 @@ public final class WidgetGifPickerSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559018;
+        return 2131559022;
     }
 
     @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener
@@ -122,7 +122,7 @@ public final class WidgetGifPickerSheet extends AppBottomSheet {
         if (widgetGifPickerSearch3 == null) {
             m.throwUninitializedPropertyAccessException("gifPickerFragment");
         }
-        beginTransaction.replace(2131363281, widgetGifPickerSearch2, widgetGifPickerSearch3.getClass().getSimpleName()).runOnCommit(new WidgetGifPickerSheet$onViewCreated$2(this)).commit();
+        beginTransaction.replace(2131363307, widgetGifPickerSearch2, widgetGifPickerSearch3.getClass().getSimpleName()).runOnCommit(new WidgetGifPickerSheet$onViewCreated$2(this)).commit();
     }
 
     public final void setOnCancel(Function0<Unit> function0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ApplicationCommandData.java b/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandData.java
similarity index 96%
rename from app/src/main/java/com/discord/widgets/chat/input/ApplicationCommandData.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandData.java
index 4af9139644..92f2d265ed 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ApplicationCommandData.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandData.java
@@ -1,4 +1,4 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import com.discord.models.commands.Application;
@@ -6,7 +6,7 @@ import com.discord.models.commands.ApplicationCommand;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: InputModels.kt */
+/* compiled from: ApplicationCommandData.kt */
 public final class ApplicationCommandData {
     private final Application application;
     private final ApplicationCommand applicationCommand;
@@ -28,7 +28,7 @@ public final class ApplicationCommandData {
         this(application, applicationCommand, list, (i & 8) != 0 ? false : z2);
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.ApplicationCommandData */
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.models.ApplicationCommandData */
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ApplicationCommandData copy$default(ApplicationCommandData applicationCommandData, Application application, ApplicationCommand applicationCommand, List list, boolean z2, int i, Object obj) {
         if ((i & 1) != 0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ApplicationCommandValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java
similarity index 95%
rename from app/src/main/java/com/discord/widgets/chat/input/ApplicationCommandValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java
index 45d328f523..cbf187a320 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ApplicationCommandValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/ApplicationCommandValue.java
@@ -1,10 +1,10 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: InputModels.kt */
+/* compiled from: ApplicationCommandValue.kt */
 public final class ApplicationCommandValue {
     private final String name;
     private final List<ApplicationCommandValue> options;
@@ -24,7 +24,7 @@ public final class ApplicationCommandValue {
         this(str, (i2 & 2) != 0 ? null : obj, i, (i2 & 8) != 0 ? null : list);
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.ApplicationCommandValue */
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.models.ApplicationCommandValue */
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ApplicationCommandValue copy$default(ApplicationCommandValue applicationCommandValue, String str, Object obj, int i, List list, int i2, Object obj2) {
         if ((i2 & 1) != 0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteApplicationCommands.java b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteApplicationCommands.java
similarity index 94%
rename from app/src/main/java/com/discord/widgets/chat/input/AutocompleteApplicationCommands.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteApplicationCommands.java
index 7ad1ebc5c5..bf10935625 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteApplicationCommands.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteApplicationCommands.java
@@ -1,13 +1,14 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
+import com.discord.widgets.chat.input.WidgetChatInputDiscoveryCommandsModel;
 import d0.t.n;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: InputModels.kt */
+/* compiled from: AutocompleteApplicationCommands.kt */
 public final class AutocompleteApplicationCommands {
     private final List<Application> applications;
     private final WidgetChatInputDiscoveryCommandsModel discoveryCommands;
@@ -32,7 +33,7 @@ public final class AutocompleteApplicationCommands {
         this((i & 1) != 0 ? n.emptyList() : list, (i & 2) != 0 ? n.emptyList() : list2, (i & 4) != 0 ? null : widgetChatInputDiscoveryCommandsModel);
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.AutocompleteApplicationCommands */
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.models.AutocompleteApplicationCommands */
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ AutocompleteApplicationCommands copy$default(AutocompleteApplicationCommands autocompleteApplicationCommands, List list, List list2, WidgetChatInputDiscoveryCommandsModel widgetChatInputDiscoveryCommandsModel, int i, Object obj) {
         if ((i & 1) != 0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputCommandContext.java b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputCommandContext.java
similarity index 97%
rename from app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputCommandContext.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputCommandContext.java
index f9db7c9fe3..dba11e7bf8 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputCommandContext.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputCommandContext.java
@@ -1,11 +1,11 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import com.discord.models.commands.Application;
 import com.discord.models.commands.ApplicationCommand;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: InputModels.kt */
+/* compiled from: AutocompleteInputCommandContext.kt */
 public final class AutocompleteInputCommandContext {
     private final boolean isCommand;
     private final Application selectedApplication;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputModel.java b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputModel.java
new file mode 100644
index 0000000000..ad0c622b04
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputModel.java
@@ -0,0 +1,128 @@
+package com.discord.widgets.chat.input.models;
+
+import c.d.b.a.a;
+import com.discord.widgets.chat.input.UserAndSelectedGuildRoles;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
+import d0.z.d.m;
+import java.util.Map;
+import java.util.Set;
+/* compiled from: AutocompleteInputModel.kt */
+public final class AutocompleteInputModel {
+    private final AutocompleteApplicationCommands applicationCommands;
+    private final Map<LeadingIdentifier, Set<Autocompletable>> autocompletables;
+    private final String input;
+
+    /* renamed from: me  reason: collision with root package name */
+    private final UserAndSelectedGuildRoles f2137me;
+
+    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.Map<com.discord.widgets.chat.input.autocomplete.LeadingIdentifier, ? extends java.util.Set<? extends com.discord.widgets.chat.input.autocomplete.Autocompletable>> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public AutocompleteInputModel(String str, UserAndSelectedGuildRoles userAndSelectedGuildRoles, Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map, AutocompleteApplicationCommands autocompleteApplicationCommands) {
+        m.checkNotNullParameter(str, "input");
+        m.checkNotNullParameter(userAndSelectedGuildRoles, "me");
+        m.checkNotNullParameter(map, "autocompletables");
+        m.checkNotNullParameter(autocompleteApplicationCommands, "applicationCommands");
+        this.input = str;
+        this.f2137me = userAndSelectedGuildRoles;
+        this.autocompletables = map;
+        this.applicationCommands = autocompleteApplicationCommands;
+    }
+
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.models.AutocompleteInputModel */
+    /* JADX WARN: Multi-variable type inference failed */
+    public static /* synthetic */ AutocompleteInputModel copy$default(AutocompleteInputModel autocompleteInputModel, String str, UserAndSelectedGuildRoles userAndSelectedGuildRoles, Map map, AutocompleteApplicationCommands autocompleteApplicationCommands, int i, Object obj) {
+        if ((i & 1) != 0) {
+            str = autocompleteInputModel.input;
+        }
+        if ((i & 2) != 0) {
+            userAndSelectedGuildRoles = autocompleteInputModel.f2137me;
+        }
+        if ((i & 4) != 0) {
+            map = autocompleteInputModel.autocompletables;
+        }
+        if ((i & 8) != 0) {
+            autocompleteApplicationCommands = autocompleteInputModel.applicationCommands;
+        }
+        return autocompleteInputModel.copy(str, userAndSelectedGuildRoles, map, autocompleteApplicationCommands);
+    }
+
+    public final String component1() {
+        return this.input;
+    }
+
+    public final UserAndSelectedGuildRoles component2() {
+        return this.f2137me;
+    }
+
+    public final Map<LeadingIdentifier, Set<Autocompletable>> component3() {
+        return this.autocompletables;
+    }
+
+    public final AutocompleteApplicationCommands component4() {
+        return this.applicationCommands;
+    }
+
+    public final AutocompleteInputModel copy(String str, UserAndSelectedGuildRoles userAndSelectedGuildRoles, Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map, AutocompleteApplicationCommands autocompleteApplicationCommands) {
+        m.checkNotNullParameter(str, "input");
+        m.checkNotNullParameter(userAndSelectedGuildRoles, "me");
+        m.checkNotNullParameter(map, "autocompletables");
+        m.checkNotNullParameter(autocompleteApplicationCommands, "applicationCommands");
+        return new AutocompleteInputModel(str, userAndSelectedGuildRoles, map, autocompleteApplicationCommands);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof AutocompleteInputModel)) {
+            return false;
+        }
+        AutocompleteInputModel autocompleteInputModel = (AutocompleteInputModel) obj;
+        return m.areEqual(this.input, autocompleteInputModel.input) && m.areEqual(this.f2137me, autocompleteInputModel.f2137me) && m.areEqual(this.autocompletables, autocompleteInputModel.autocompletables) && m.areEqual(this.applicationCommands, autocompleteInputModel.applicationCommands);
+    }
+
+    public final AutocompleteApplicationCommands getApplicationCommands() {
+        return this.applicationCommands;
+    }
+
+    public final Map<LeadingIdentifier, Set<Autocompletable>> getAutocompletables() {
+        return this.autocompletables;
+    }
+
+    public final String getInput() {
+        return this.input;
+    }
+
+    public final UserAndSelectedGuildRoles getMe() {
+        return this.f2137me;
+    }
+
+    public int hashCode() {
+        String str = this.input;
+        int i = 0;
+        int hashCode = (str != null ? str.hashCode() : 0) * 31;
+        UserAndSelectedGuildRoles userAndSelectedGuildRoles = this.f2137me;
+        int hashCode2 = (hashCode + (userAndSelectedGuildRoles != null ? userAndSelectedGuildRoles.hashCode() : 0)) * 31;
+        Map<LeadingIdentifier, Set<Autocompletable>> map = this.autocompletables;
+        int hashCode3 = (hashCode2 + (map != null ? map.hashCode() : 0)) * 31;
+        AutocompleteApplicationCommands autocompleteApplicationCommands = this.applicationCommands;
+        if (autocompleteApplicationCommands != null) {
+            i = autocompleteApplicationCommands.hashCode();
+        }
+        return hashCode3 + i;
+    }
+
+    public String toString() {
+        StringBuilder L = a.L("AutocompleteInputModel(input=");
+        L.append(this.input);
+        L.append(", me=");
+        L.append(this.f2137me);
+        L.append(", autocompletables=");
+        L.append(this.autocompletables);
+        L.append(", applicationCommands=");
+        L.append(this.applicationCommands);
+        L.append(")");
+        return L.toString();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputSelectionModel.java b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java
similarity index 53%
rename from app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputSelectionModel.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java
index ade4e30255..7fc3c7e475 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/AutocompleteInputSelectionModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/AutocompleteInputSelectionModel.java
@@ -1,42 +1,60 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import com.discord.api.sticker.Sticker;
 import com.discord.models.commands.ApplicationCommandOption;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.EmojiAutocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
 import d0.z.d.m;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-/* compiled from: InputModels.kt */
+/* compiled from: AutocompleteInputSelectionModel.kt */
 public final class AutocompleteInputSelectionModel {
     private final MentionToken autocompleteToken;
-    private final List<WidgetChatInputCommandsModel> filteredMentionables;
+    private final Map<LeadingIdentifier, List<Autocompletable>> filteredAutocompletables;
     private final InputSelectionModel inputSelectionModel;
     private final Set<ApplicationCommandOption> showErrorsForOptions;
     private final List<Sticker> stickerMatches;
 
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel> */
-    /* JADX WARN: Multi-variable type inference failed */
-    public AutocompleteInputSelectionModel(MentionToken mentionToken, List<? extends WidgetChatInputCommandsModel> list, InputSelectionModel inputSelectionModel, Set<ApplicationCommandOption> set, List<Sticker> list2) {
-        m.checkNotNullParameter(list, "filteredMentionables");
-        m.checkNotNullParameter(inputSelectionModel, "inputSelectionModel");
-        m.checkNotNullParameter(set, "showErrorsForOptions");
-        m.checkNotNullParameter(list2, "stickerMatches");
-        this.autocompleteToken = mentionToken;
-        this.filteredMentionables = list;
-        this.inputSelectionModel = inputSelectionModel;
-        this.showErrorsForOptions = set;
-        this.stickerMatches = list2;
+    public final /* synthetic */ class WhenMappings {
+        public static final /* synthetic */ int[] $EnumSwitchMapping$0;
+
+        static {
+            LeadingIdentifier.values();
+            int[] iArr = new int[5];
+            $EnumSwitchMapping$0 = iArr;
+            iArr[LeadingIdentifier.APP_COMMAND.ordinal()] = 1;
+            iArr[LeadingIdentifier.EMOJI_AND_STICKERS.ordinal()] = 2;
+            iArr[LeadingIdentifier.CHANNELS.ordinal()] = 3;
+            iArr[LeadingIdentifier.MENTION.ordinal()] = 4;
+        }
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.chat.input.AutocompleteInputSelectionModel */
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Map<com.discord.widgets.chat.input.autocomplete.LeadingIdentifier, ? extends java.util.List<? extends com.discord.widgets.chat.input.autocomplete.Autocompletable>> */
     /* JADX WARN: Multi-variable type inference failed */
-    public static /* synthetic */ AutocompleteInputSelectionModel copy$default(AutocompleteInputSelectionModel autocompleteInputSelectionModel, MentionToken mentionToken, List list, InputSelectionModel inputSelectionModel, Set set, List list2, int i, Object obj) {
+    public AutocompleteInputSelectionModel(MentionToken mentionToken, Map<LeadingIdentifier, ? extends List<? extends Autocompletable>> map, InputSelectionModel inputSelectionModel, Set<ApplicationCommandOption> set, List<Sticker> list) {
+        m.checkNotNullParameter(map, "filteredAutocompletables");
+        m.checkNotNullParameter(inputSelectionModel, "inputSelectionModel");
+        m.checkNotNullParameter(set, "showErrorsForOptions");
+        m.checkNotNullParameter(list, "stickerMatches");
+        this.autocompleteToken = mentionToken;
+        this.filteredAutocompletables = map;
+        this.inputSelectionModel = inputSelectionModel;
+        this.showErrorsForOptions = set;
+        this.stickerMatches = list;
+    }
+
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.chat.input.models.AutocompleteInputSelectionModel */
+    /* JADX WARN: Multi-variable type inference failed */
+    public static /* synthetic */ AutocompleteInputSelectionModel copy$default(AutocompleteInputSelectionModel autocompleteInputSelectionModel, MentionToken mentionToken, Map map, InputSelectionModel inputSelectionModel, Set set, List list, int i, Object obj) {
         if ((i & 1) != 0) {
             mentionToken = autocompleteInputSelectionModel.autocompleteToken;
         }
         if ((i & 2) != 0) {
-            list = autocompleteInputSelectionModel.filteredMentionables;
+            map = autocompleteInputSelectionModel.filteredAutocompletables;
         }
         if ((i & 4) != 0) {
             inputSelectionModel = autocompleteInputSelectionModel.inputSelectionModel;
@@ -45,17 +63,17 @@ public final class AutocompleteInputSelectionModel {
             set = autocompleteInputSelectionModel.showErrorsForOptions;
         }
         if ((i & 16) != 0) {
-            list2 = autocompleteInputSelectionModel.stickerMatches;
+            list = autocompleteInputSelectionModel.stickerMatches;
         }
-        return autocompleteInputSelectionModel.copy(mentionToken, list, inputSelectionModel, set, list2);
+        return autocompleteInputSelectionModel.copy(mentionToken, map, inputSelectionModel, set, list);
     }
 
     public final MentionToken component1() {
         return this.autocompleteToken;
     }
 
-    public final List<WidgetChatInputCommandsModel> component2() {
-        return this.filteredMentionables;
+    public final Map<LeadingIdentifier, List<Autocompletable>> component2() {
+        return this.filteredAutocompletables;
     }
 
     public final InputSelectionModel component3() {
@@ -70,12 +88,12 @@ public final class AutocompleteInputSelectionModel {
         return this.stickerMatches;
     }
 
-    public final AutocompleteInputSelectionModel copy(MentionToken mentionToken, List<? extends WidgetChatInputCommandsModel> list, InputSelectionModel inputSelectionModel, Set<ApplicationCommandOption> set, List<Sticker> list2) {
-        m.checkNotNullParameter(list, "filteredMentionables");
+    public final AutocompleteInputSelectionModel copy(MentionToken mentionToken, Map<LeadingIdentifier, ? extends List<? extends Autocompletable>> map, InputSelectionModel inputSelectionModel, Set<ApplicationCommandOption> set, List<Sticker> list) {
+        m.checkNotNullParameter(map, "filteredAutocompletables");
         m.checkNotNullParameter(inputSelectionModel, "inputSelectionModel");
         m.checkNotNullParameter(set, "showErrorsForOptions");
-        m.checkNotNullParameter(list2, "stickerMatches");
-        return new AutocompleteInputSelectionModel(mentionToken, list, inputSelectionModel, set, list2);
+        m.checkNotNullParameter(list, "stickerMatches");
+        return new AutocompleteInputSelectionModel(mentionToken, map, inputSelectionModel, set, list);
     }
 
     public boolean equals(Object obj) {
@@ -86,7 +104,7 @@ public final class AutocompleteInputSelectionModel {
             return false;
         }
         AutocompleteInputSelectionModel autocompleteInputSelectionModel = (AutocompleteInputSelectionModel) obj;
-        return m.areEqual(this.autocompleteToken, autocompleteInputSelectionModel.autocompleteToken) && m.areEqual(this.filteredMentionables, autocompleteInputSelectionModel.filteredMentionables) && m.areEqual(this.inputSelectionModel, autocompleteInputSelectionModel.inputSelectionModel) && m.areEqual(this.showErrorsForOptions, autocompleteInputSelectionModel.showErrorsForOptions) && m.areEqual(this.stickerMatches, autocompleteInputSelectionModel.stickerMatches);
+        return m.areEqual(this.autocompleteToken, autocompleteInputSelectionModel.autocompleteToken) && m.areEqual(this.filteredAutocompletables, autocompleteInputSelectionModel.filteredAutocompletables) && m.areEqual(this.inputSelectionModel, autocompleteInputSelectionModel.inputSelectionModel) && m.areEqual(this.showErrorsForOptions, autocompleteInputSelectionModel.showErrorsForOptions) && m.areEqual(this.stickerMatches, autocompleteInputSelectionModel.stickerMatches);
     }
 
     public final MentionToken getAutocompleteToken() {
@@ -95,23 +113,41 @@ public final class AutocompleteInputSelectionModel {
 
     public final String getAutocompleteType() {
         MentionToken mentionToken = this.autocompleteToken;
-        Character leadingIdentifier = mentionToken != null ? mentionToken.getLeadingIdentifier() : null;
-        return (leadingIdentifier != null && leadingIdentifier.charValue() == '@') ? "MENTIONS" : (leadingIdentifier != null && leadingIdentifier.charValue() == ':') ? "EMOJIS_AND_STICKERS" : (leadingIdentifier != null && leadingIdentifier.charValue() == '#') ? "CHANNELS" : (leadingIdentifier != null && leadingIdentifier.charValue() == '/') ? "COMMANDS" : "CHOICE";
+        LeadingIdentifier leadingIdentifier = mentionToken != null ? mentionToken.getLeadingIdentifier() : null;
+        if (leadingIdentifier != null) {
+            int ordinal = leadingIdentifier.ordinal();
+            if (ordinal == 0) {
+                return "COMMANDS";
+            }
+            if (ordinal == 1) {
+                return "EMOJIS_AND_STICKERS";
+            }
+            if (ordinal == 2) {
+                return "CHANNELS";
+            }
+            if (ordinal == 3) {
+                return "MENTIONS";
+            }
+        }
+        return "CHOICE";
     }
 
     public final int getEmojiNumCount() {
-        List<WidgetChatInputCommandsModel> list = this.filteredMentionables;
+        List<Autocompletable> list = this.filteredAutocompletables.get(LeadingIdentifier.EMOJI_AND_STICKERS);
+        if (list == null) {
+            return 0;
+        }
         ArrayList arrayList = new ArrayList();
         for (Object obj : list) {
-            if (((WidgetChatInputCommandsModel) obj).getType() == 3) {
+            if (obj instanceof EmojiAutocompletable) {
                 arrayList.add(obj);
             }
         }
         return arrayList.size();
     }
 
-    public final List<WidgetChatInputCommandsModel> getFilteredMentionables() {
-        return this.filteredMentionables;
+    public final Map<LeadingIdentifier, List<Autocompletable>> getFilteredAutocompletables() {
+        return this.filteredAutocompletables;
     }
 
     public final InputSelectionModel getInputSelectionModel() {
@@ -134,15 +170,15 @@ public final class AutocompleteInputSelectionModel {
         MentionToken mentionToken = this.autocompleteToken;
         int i = 0;
         int hashCode = (mentionToken != null ? mentionToken.hashCode() : 0) * 31;
-        List<WidgetChatInputCommandsModel> list = this.filteredMentionables;
-        int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31;
+        Map<LeadingIdentifier, List<Autocompletable>> map = this.filteredAutocompletables;
+        int hashCode2 = (hashCode + (map != null ? map.hashCode() : 0)) * 31;
         InputSelectionModel inputSelectionModel = this.inputSelectionModel;
         int hashCode3 = (hashCode2 + (inputSelectionModel != null ? inputSelectionModel.hashCode() : 0)) * 31;
         Set<ApplicationCommandOption> set = this.showErrorsForOptions;
         int hashCode4 = (hashCode3 + (set != null ? set.hashCode() : 0)) * 31;
-        List<Sticker> list2 = this.stickerMatches;
-        if (list2 != null) {
-            i = list2.hashCode();
+        List<Sticker> list = this.stickerMatches;
+        if (list != null) {
+            i = list.hashCode();
         }
         return hashCode4 + i;
     }
@@ -150,8 +186,8 @@ public final class AutocompleteInputSelectionModel {
     public String toString() {
         StringBuilder L = a.L("AutocompleteInputSelectionModel(autocompleteToken=");
         L.append(this.autocompleteToken);
-        L.append(", filteredMentionables=");
-        L.append(this.filteredMentionables);
+        L.append(", filteredAutocompletables=");
+        L.append(this.filteredAutocompletables);
         L.append(", inputSelectionModel=");
         L.append(this.inputSelectionModel);
         L.append(", showErrorsForOptions=");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/BooleanOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/BooleanOptionValue.java
similarity index 64%
rename from app/src/main/java/com/discord/widgets/chat/input/BooleanOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/BooleanOptionValue.java
index f4dfb7e0d5..6454a733f7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/BooleanOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/BooleanOptionValue.java
@@ -1,5 +1,5 @@
-package com.discord.widgets.chat.input;
-/* compiled from: InputModels.kt */
+package com.discord.widgets.chat.input.models;
+/* compiled from: CommandOptionValue.kt */
 public final class BooleanOptionValue extends CommandOptionValue {
     public BooleanOptionValue(boolean z2) {
         super(Boolean.valueOf(z2), null);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/models/ChannelOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/ChannelOptionValue.java
new file mode 100644
index 0000000000..e12d040c52
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/ChannelOptionValue.java
@@ -0,0 +1,12 @@
+package com.discord.widgets.chat.input.models;
+
+import com.discord.api.channel.Channel;
+import d0.z.d.m;
+/* compiled from: CommandOptionValue.kt */
+public final class ChannelOptionValue extends CommandOptionValue {
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ChannelOptionValue(Channel channel) {
+        super(String.valueOf(channel.h()), null);
+        m.checkNotNullParameter(channel, "channel");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputMentionsMap.java b/app/src/main/java/com/discord/widgets/chat/input/models/ChatInputMentionsMap.java
similarity index 79%
rename from app/src/main/java/com/discord/widgets/chat/input/ChatInputMentionsMap.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/ChatInputMentionsMap.java
index 85a098ea1d..6877ce287b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputMentionsMap.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/ChatInputMentionsMap.java
@@ -1,24 +1,25 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
 import d0.z.d.m;
 import java.util.Map;
 import kotlin.ranges.IntRange;
-/* compiled from: InputModels.kt */
+/* compiled from: ChatInputMentionsMap.kt */
 public final class ChatInputMentionsMap {
     private final String input;
-    private final Map<IntRange, WidgetChatInputCommandsModel> mentions;
+    private final Map<IntRange, Autocompletable> mentions;
 
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Map<kotlin.ranges.IntRange, ? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel> */
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Map<kotlin.ranges.IntRange, ? extends com.discord.widgets.chat.input.autocomplete.Autocompletable> */
     /* JADX WARN: Multi-variable type inference failed */
-    public ChatInputMentionsMap(String str, Map<IntRange, ? extends WidgetChatInputCommandsModel> map) {
+    public ChatInputMentionsMap(String str, Map<IntRange, ? extends Autocompletable> map) {
         m.checkNotNullParameter(str, "input");
         m.checkNotNullParameter(map, "mentions");
         this.input = str;
         this.mentions = map;
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.ChatInputMentionsMap */
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.models.ChatInputMentionsMap */
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ ChatInputMentionsMap copy$default(ChatInputMentionsMap chatInputMentionsMap, String str, Map map, int i, Object obj) {
         if ((i & 1) != 0) {
@@ -34,11 +35,11 @@ public final class ChatInputMentionsMap {
         return this.input;
     }
 
-    public final Map<IntRange, WidgetChatInputCommandsModel> component2() {
+    public final Map<IntRange, Autocompletable> component2() {
         return this.mentions;
     }
 
-    public final ChatInputMentionsMap copy(String str, Map<IntRange, ? extends WidgetChatInputCommandsModel> map) {
+    public final ChatInputMentionsMap copy(String str, Map<IntRange, ? extends Autocompletable> map) {
         m.checkNotNullParameter(str, "input");
         m.checkNotNullParameter(map, "mentions");
         return new ChatInputMentionsMap(str, map);
@@ -59,7 +60,7 @@ public final class ChatInputMentionsMap {
         return this.input;
     }
 
-    public final Map<IntRange, WidgetChatInputCommandsModel> getMentions() {
+    public final Map<IntRange, Autocompletable> getMentions() {
         return this.mentions;
     }
 
@@ -67,7 +68,7 @@ public final class ChatInputMentionsMap {
         String str = this.input;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
-        Map<IntRange, WidgetChatInputCommandsModel> map = this.mentions;
+        Map<IntRange, Autocompletable> map = this.mentions;
         if (map != null) {
             i = map.hashCode();
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/CommandOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/CommandOptionValue.java
similarity index 82%
rename from app/src/main/java/com/discord/widgets/chat/input/CommandOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/CommandOptionValue.java
index 3b192e196b..72d16160e3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/CommandOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/CommandOptionValue.java
@@ -1,7 +1,7 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: InputModels.kt */
+/* compiled from: CommandOptionValue.kt */
 public abstract class CommandOptionValue {
     private final Object value;
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/InputCommandOptions.java b/app/src/main/java/com/discord/widgets/chat/input/models/InputCommandOptions.java
similarity index 94%
rename from app/src/main/java/com/discord/widgets/chat/input/InputCommandOptions.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/InputCommandOptions.java
index cf239cc1a2..363509f01f 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/InputCommandOptions.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/InputCommandOptions.java
@@ -1,4 +1,4 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import com.discord.models.commands.ApplicationCommandOption;
@@ -6,7 +6,7 @@ import d0.t.h0;
 import d0.z.d.m;
 import java.util.Map;
 import kotlin.jvm.internal.DefaultConstructorMarker;
-/* compiled from: InputModels.kt */
+/* compiled from: InputCommandOptions.kt */
 public final class InputCommandOptions {
     private final Map<ApplicationCommandOption, Boolean> commandOptionValidity;
     private final Map<ApplicationCommandOption, OptionRange> inputRanges;
@@ -16,7 +16,7 @@ public final class InputCommandOptions {
         this(null, null, null, 7, null);
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.Map<com.discord.models.commands.ApplicationCommandOption, ? extends com.discord.widgets.chat.input.CommandOptionValue> */
+    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.Map<com.discord.models.commands.ApplicationCommandOption, ? extends com.discord.widgets.chat.input.models.CommandOptionValue> */
     /* JADX WARN: Multi-variable type inference failed */
     public InputCommandOptions(Map<ApplicationCommandOption, ? extends CommandOptionValue> map, Map<ApplicationCommandOption, OptionRange> map2, Map<ApplicationCommandOption, Boolean> map3) {
         m.checkNotNullParameter(map, "values");
@@ -32,7 +32,7 @@ public final class InputCommandOptions {
         this((i & 1) != 0 ? h0.emptyMap() : map, (i & 2) != 0 ? h0.emptyMap() : map2, (i & 4) != 0 ? h0.emptyMap() : map3);
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.InputCommandOptions */
+    /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.models.InputCommandOptions */
     /* JADX WARN: Multi-variable type inference failed */
     public static /* synthetic */ InputCommandOptions copy$default(InputCommandOptions inputCommandOptions, Map map, Map map2, Map map3, int i, Object obj) {
         if ((i & 1) != 0) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/InputSelectionModel.java b/app/src/main/java/com/discord/widgets/chat/input/models/InputSelectionModel.java
similarity index 98%
rename from app/src/main/java/com/discord/widgets/chat/input/InputSelectionModel.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/InputSelectionModel.java
index f1456b11d7..53086a882a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/InputSelectionModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/InputSelectionModel.java
@@ -1,4 +1,4 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import com.discord.api.commands.ApplicationCommandType;
@@ -7,7 +7,7 @@ import com.discord.models.commands.ApplicationCommandOption;
 import d0.z.d.m;
 import java.util.List;
 import kotlin.ranges.IntRange;
-/* compiled from: InputModels.kt */
+/* compiled from: InputSelectionModel.kt */
 public final class InputSelectionModel {
     private final VerifiedCommandMentionInputModel inputModel;
     private final ApplicationCommandOption selectedCommandOption;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/IntegerOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/IntegerOptionValue.java
similarity index 63%
rename from app/src/main/java/com/discord/widgets/chat/input/IntegerOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/IntegerOptionValue.java
index 4b86c74cfc..9d81baa056 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/IntegerOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/IntegerOptionValue.java
@@ -1,5 +1,5 @@
-package com.discord.widgets.chat.input;
-/* compiled from: InputModels.kt */
+package com.discord.widgets.chat.input.models;
+/* compiled from: CommandOptionValue.kt */
 public final class IntegerOptionValue extends CommandOptionValue {
     public IntegerOptionValue(int i) {
         super(Integer.valueOf(i), null);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/MentionToken.java b/app/src/main/java/com/discord/widgets/chat/input/models/MentionToken.java
similarity index 63%
rename from app/src/main/java/com/discord/widgets/chat/input/MentionToken.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/MentionToken.java
index c93a178883..a77ee4ebd7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/MentionToken.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/MentionToken.java
@@ -1,30 +1,28 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
 import d0.g0.t;
 import d0.z.d.m;
-/* compiled from: InputModels.kt */
+/* compiled from: MentionToken.kt */
 public final class MentionToken {
     private final String formattedToken;
     private final boolean isAtStart;
-    private final Character leadingIdentifier;
+    private final LeadingIdentifier leadingIdentifier;
     private final String token;
 
-    public MentionToken(Character ch, String str, boolean z2) {
-        String replaceFirst$default;
+    public MentionToken(LeadingIdentifier leadingIdentifier, String str, boolean z2) {
+        m.checkNotNullParameter(leadingIdentifier, "leadingIdentifier");
         m.checkNotNullParameter(str, "token");
-        this.leadingIdentifier = ch;
+        this.leadingIdentifier = leadingIdentifier;
         this.token = str;
         this.isAtStart = z2;
-        if (!(ch == null || (replaceFirst$default = t.replaceFirst$default(str, String.valueOf(ch.charValue()), "", false, 4, null)) == null)) {
-            str = replaceFirst$default;
-        }
-        this.formattedToken = str;
+        this.formattedToken = t.replaceFirst$default(str, String.valueOf(leadingIdentifier.getIdentifier()), "", false, 4, null);
     }
 
-    public static /* synthetic */ MentionToken copy$default(MentionToken mentionToken, Character ch, String str, boolean z2, int i, Object obj) {
+    public static /* synthetic */ MentionToken copy$default(MentionToken mentionToken, LeadingIdentifier leadingIdentifier, String str, boolean z2, int i, Object obj) {
         if ((i & 1) != 0) {
-            ch = mentionToken.leadingIdentifier;
+            leadingIdentifier = mentionToken.leadingIdentifier;
         }
         if ((i & 2) != 0) {
             str = mentionToken.token;
@@ -32,10 +30,10 @@ public final class MentionToken {
         if ((i & 4) != 0) {
             z2 = mentionToken.isAtStart;
         }
-        return mentionToken.copy(ch, str, z2);
+        return mentionToken.copy(leadingIdentifier, str, z2);
     }
 
-    public final Character component1() {
+    public final LeadingIdentifier component1() {
         return this.leadingIdentifier;
     }
 
@@ -47,9 +45,10 @@ public final class MentionToken {
         return this.isAtStart;
     }
 
-    public final MentionToken copy(Character ch, String str, boolean z2) {
+    public final MentionToken copy(LeadingIdentifier leadingIdentifier, String str, boolean z2) {
+        m.checkNotNullParameter(leadingIdentifier, "leadingIdentifier");
         m.checkNotNullParameter(str, "token");
-        return new MentionToken(ch, str, z2);
+        return new MentionToken(leadingIdentifier, str, z2);
     }
 
     public boolean equals(Object obj) {
@@ -67,7 +66,7 @@ public final class MentionToken {
         return this.formattedToken;
     }
 
-    public final Character getLeadingIdentifier() {
+    public final LeadingIdentifier getLeadingIdentifier() {
         return this.leadingIdentifier;
     }
 
@@ -76,9 +75,9 @@ public final class MentionToken {
     }
 
     public int hashCode() {
-        Character ch = this.leadingIdentifier;
+        LeadingIdentifier leadingIdentifier = this.leadingIdentifier;
         int i = 0;
-        int hashCode = (ch != null ? ch.hashCode() : 0) * 31;
+        int hashCode = (leadingIdentifier != null ? leadingIdentifier.hashCode() : 0) * 31;
         String str = this.token;
         if (str != null) {
             i = str.hashCode();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/OptionRange.java b/app/src/main/java/com/discord/widgets/chat/input/models/OptionRange.java
similarity index 96%
rename from app/src/main/java/com/discord/widgets/chat/input/OptionRange.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/OptionRange.java
index 10082c11f7..6375420d34 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/OptionRange.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/OptionRange.java
@@ -1,9 +1,9 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
 import d0.z.d.m;
 import kotlin.ranges.IntRange;
-/* compiled from: InputModels.kt */
+/* compiled from: OptionRange.kt */
 public final class OptionRange {
     private final IntRange param;
     private final IntRange value;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/RawOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/RawOptionValue.java
similarity index 76%
rename from app/src/main/java/com/discord/widgets/chat/input/RawOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/RawOptionValue.java
index 9d77a2916d..19d03ba065 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/RawOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/RawOptionValue.java
@@ -1,7 +1,7 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import d0.z.d.m;
-/* compiled from: InputModels.kt */
+/* compiled from: CommandOptionValue.kt */
 public final class RawOptionValue extends CommandOptionValue {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public RawOptionValue(String str) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/RoleOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/RoleOptionValue.java
similarity index 80%
rename from app/src/main/java/com/discord/widgets/chat/input/RoleOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/RoleOptionValue.java
index d11f4fcc7c..82a477fe1c 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/RoleOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/RoleOptionValue.java
@@ -1,8 +1,8 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import com.discord.api.role.GuildRole;
 import d0.z.d.m;
-/* compiled from: InputModels.kt */
+/* compiled from: CommandOptionValue.kt */
 public final class RoleOptionValue extends CommandOptionValue {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public RoleOptionValue(GuildRole guildRole) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/SnowflakeOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/SnowflakeOptionValue.java
similarity index 63%
rename from app/src/main/java/com/discord/widgets/chat/input/SnowflakeOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/SnowflakeOptionValue.java
index 6b145cc31f..1747a0ff49 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/SnowflakeOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/SnowflakeOptionValue.java
@@ -1,5 +1,5 @@
-package com.discord.widgets.chat.input;
-/* compiled from: InputModels.kt */
+package com.discord.widgets.chat.input.models;
+/* compiled from: CommandOptionValue.kt */
 public final class SnowflakeOptionValue extends CommandOptionValue {
     public SnowflakeOptionValue(long j) {
         super(String.valueOf(j), null);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/StringOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/StringOptionValue.java
similarity index 76%
rename from app/src/main/java/com/discord/widgets/chat/input/StringOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/StringOptionValue.java
index ddf72a5c84..98dffd55b2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/StringOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/StringOptionValue.java
@@ -1,7 +1,7 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import d0.z.d.m;
-/* compiled from: InputModels.kt */
+/* compiled from: CommandOptionValue.kt */
 public final class StringOptionValue extends CommandOptionValue {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StringOptionValue(String str) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/TagObject.java b/app/src/main/java/com/discord/widgets/chat/input/models/TagObject.java
similarity index 74%
rename from app/src/main/java/com/discord/widgets/chat/input/TagObject.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/TagObject.java
index 7786f5b74a..6e6fe9ccb3 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/TagObject.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/TagObject.java
@@ -1,8 +1,8 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import java.util.regex.Pattern;
-/* compiled from: InputModels.kt */
+/* compiled from: TagObject.kt */
 public interface TagObject extends MGRecyclerDataPayload {
     String getDisplayTag();
 
diff --git a/app/src/main/java/com/discord/widgets/chat/input/UserOptionValue.java b/app/src/main/java/com/discord/widgets/chat/input/models/UserOptionValue.java
similarity index 79%
rename from app/src/main/java/com/discord/widgets/chat/input/UserOptionValue.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/UserOptionValue.java
index 04b9bb7220..0c473c20b5 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/UserOptionValue.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/UserOptionValue.java
@@ -1,8 +1,8 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import com.discord.models.user.User;
 import d0.z.d.m;
-/* compiled from: InputModels.kt */
+/* compiled from: CommandOptionValue.kt */
 public final class UserOptionValue extends CommandOptionValue {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public UserOptionValue(User user) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/VerifiedCommandMentionInputModel.java b/app/src/main/java/com/discord/widgets/chat/input/models/VerifiedCommandMentionInputModel.java
similarity index 58%
rename from app/src/main/java/com/discord/widgets/chat/input/VerifiedCommandMentionInputModel.java
rename to app/src/main/java/com/discord/widgets/chat/input/models/VerifiedCommandMentionInputModel.java
index b37bdebb66..37c5de65b1 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/VerifiedCommandMentionInputModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/models/VerifiedCommandMentionInputModel.java
@@ -1,45 +1,47 @@
-package com.discord.widgets.chat.input;
+package com.discord.widgets.chat.input.models;
 
 import c.d.b.a.a;
+import com.discord.widgets.chat.input.autocomplete.Autocompletable;
+import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier;
 import d0.z.d.m;
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import kotlin.ranges.IntRange;
-/* compiled from: InputModels.kt */
+/* compiled from: VerifiedCommandMentionInputModel.kt */
 public final class VerifiedCommandMentionInputModel {
+    private final Map<LeadingIdentifier, Set<Autocompletable>> autocompletables;
     private final AutocompleteApplicationCommands commands;
     private final String input;
     private final AutocompleteInputCommandContext inputCommandContext;
     private final InputCommandOptions inputCommandOptions;
-    private final Map<IntRange, WidgetChatInputCommandsModel> inputMentionsMap;
-    private final List<WidgetChatInputCommandsModel> mentionables;
+    private final Map<IntRange, Autocompletable> inputMentionsMap;
 
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel> */
-    /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.Map<kotlin.ranges.IntRange, ? extends com.discord.widgets.chat.input.WidgetChatInputCommandsModel> */
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Map<com.discord.widgets.chat.input.autocomplete.LeadingIdentifier, ? extends java.util.Set<? extends com.discord.widgets.chat.input.autocomplete.Autocompletable>> */
+    /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.Map<kotlin.ranges.IntRange, ? extends com.discord.widgets.chat.input.autocomplete.Autocompletable> */
     /* JADX WARN: Multi-variable type inference failed */
-    public VerifiedCommandMentionInputModel(String str, List<? extends WidgetChatInputCommandsModel> list, AutocompleteApplicationCommands autocompleteApplicationCommands, AutocompleteInputCommandContext autocompleteInputCommandContext, InputCommandOptions inputCommandOptions, Map<IntRange, ? extends WidgetChatInputCommandsModel> map) {
+    public VerifiedCommandMentionInputModel(String str, Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map, AutocompleteApplicationCommands autocompleteApplicationCommands, AutocompleteInputCommandContext autocompleteInputCommandContext, InputCommandOptions inputCommandOptions, Map<IntRange, ? extends Autocompletable> map2) {
         m.checkNotNullParameter(str, "input");
-        m.checkNotNullParameter(list, "mentionables");
+        m.checkNotNullParameter(map, "autocompletables");
         m.checkNotNullParameter(autocompleteApplicationCommands, "commands");
         m.checkNotNullParameter(autocompleteInputCommandContext, "inputCommandContext");
         m.checkNotNullParameter(inputCommandOptions, "inputCommandOptions");
-        m.checkNotNullParameter(map, "inputMentionsMap");
+        m.checkNotNullParameter(map2, "inputMentionsMap");
         this.input = str;
-        this.mentionables = list;
+        this.autocompletables = map;
         this.commands = autocompleteApplicationCommands;
         this.inputCommandContext = autocompleteInputCommandContext;
         this.inputCommandOptions = inputCommandOptions;
-        this.inputMentionsMap = map;
+        this.inputMentionsMap = map2;
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.chat.input.VerifiedCommandMentionInputModel */
+    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.chat.input.models.VerifiedCommandMentionInputModel */
     /* JADX WARN: Multi-variable type inference failed */
-    public static /* synthetic */ VerifiedCommandMentionInputModel copy$default(VerifiedCommandMentionInputModel verifiedCommandMentionInputModel, String str, List list, AutocompleteApplicationCommands autocompleteApplicationCommands, AutocompleteInputCommandContext autocompleteInputCommandContext, InputCommandOptions inputCommandOptions, Map map, int i, Object obj) {
+    public static /* synthetic */ VerifiedCommandMentionInputModel copy$default(VerifiedCommandMentionInputModel verifiedCommandMentionInputModel, String str, Map map, AutocompleteApplicationCommands autocompleteApplicationCommands, AutocompleteInputCommandContext autocompleteInputCommandContext, InputCommandOptions inputCommandOptions, Map map2, int i, Object obj) {
         if ((i & 1) != 0) {
             str = verifiedCommandMentionInputModel.input;
         }
         if ((i & 2) != 0) {
-            list = verifiedCommandMentionInputModel.mentionables;
+            map = verifiedCommandMentionInputModel.autocompletables;
         }
         if ((i & 4) != 0) {
             autocompleteApplicationCommands = verifiedCommandMentionInputModel.commands;
@@ -51,17 +53,17 @@ public final class VerifiedCommandMentionInputModel {
             inputCommandOptions = verifiedCommandMentionInputModel.inputCommandOptions;
         }
         if ((i & 32) != 0) {
-            map = verifiedCommandMentionInputModel.inputMentionsMap;
+            map2 = verifiedCommandMentionInputModel.inputMentionsMap;
         }
-        return verifiedCommandMentionInputModel.copy(str, list, autocompleteApplicationCommands, autocompleteInputCommandContext, inputCommandOptions, map);
+        return verifiedCommandMentionInputModel.copy(str, map, autocompleteApplicationCommands, autocompleteInputCommandContext, inputCommandOptions, map2);
     }
 
     public final String component1() {
         return this.input;
     }
 
-    public final List<WidgetChatInputCommandsModel> component2() {
-        return this.mentionables;
+    public final Map<LeadingIdentifier, Set<Autocompletable>> component2() {
+        return this.autocompletables;
     }
 
     public final AutocompleteApplicationCommands component3() {
@@ -76,18 +78,18 @@ public final class VerifiedCommandMentionInputModel {
         return this.inputCommandOptions;
     }
 
-    public final Map<IntRange, WidgetChatInputCommandsModel> component6() {
+    public final Map<IntRange, Autocompletable> component6() {
         return this.inputMentionsMap;
     }
 
-    public final VerifiedCommandMentionInputModel copy(String str, List<? extends WidgetChatInputCommandsModel> list, AutocompleteApplicationCommands autocompleteApplicationCommands, AutocompleteInputCommandContext autocompleteInputCommandContext, InputCommandOptions inputCommandOptions, Map<IntRange, ? extends WidgetChatInputCommandsModel> map) {
+    public final VerifiedCommandMentionInputModel copy(String str, Map<LeadingIdentifier, ? extends Set<? extends Autocompletable>> map, AutocompleteApplicationCommands autocompleteApplicationCommands, AutocompleteInputCommandContext autocompleteInputCommandContext, InputCommandOptions inputCommandOptions, Map<IntRange, ? extends Autocompletable> map2) {
         m.checkNotNullParameter(str, "input");
-        m.checkNotNullParameter(list, "mentionables");
+        m.checkNotNullParameter(map, "autocompletables");
         m.checkNotNullParameter(autocompleteApplicationCommands, "commands");
         m.checkNotNullParameter(autocompleteInputCommandContext, "inputCommandContext");
         m.checkNotNullParameter(inputCommandOptions, "inputCommandOptions");
-        m.checkNotNullParameter(map, "inputMentionsMap");
-        return new VerifiedCommandMentionInputModel(str, list, autocompleteApplicationCommands, autocompleteInputCommandContext, inputCommandOptions, map);
+        m.checkNotNullParameter(map2, "inputMentionsMap");
+        return new VerifiedCommandMentionInputModel(str, map, autocompleteApplicationCommands, autocompleteInputCommandContext, inputCommandOptions, map2);
     }
 
     public boolean equals(Object obj) {
@@ -98,7 +100,11 @@ public final class VerifiedCommandMentionInputModel {
             return false;
         }
         VerifiedCommandMentionInputModel verifiedCommandMentionInputModel = (VerifiedCommandMentionInputModel) obj;
-        return m.areEqual(this.input, verifiedCommandMentionInputModel.input) && m.areEqual(this.mentionables, verifiedCommandMentionInputModel.mentionables) && m.areEqual(this.commands, verifiedCommandMentionInputModel.commands) && m.areEqual(this.inputCommandContext, verifiedCommandMentionInputModel.inputCommandContext) && m.areEqual(this.inputCommandOptions, verifiedCommandMentionInputModel.inputCommandOptions) && m.areEqual(this.inputMentionsMap, verifiedCommandMentionInputModel.inputMentionsMap);
+        return m.areEqual(this.input, verifiedCommandMentionInputModel.input) && m.areEqual(this.autocompletables, verifiedCommandMentionInputModel.autocompletables) && m.areEqual(this.commands, verifiedCommandMentionInputModel.commands) && m.areEqual(this.inputCommandContext, verifiedCommandMentionInputModel.inputCommandContext) && m.areEqual(this.inputCommandOptions, verifiedCommandMentionInputModel.inputCommandOptions) && m.areEqual(this.inputMentionsMap, verifiedCommandMentionInputModel.inputMentionsMap);
+    }
+
+    public final Map<LeadingIdentifier, Set<Autocompletable>> getAutocompletables() {
+        return this.autocompletables;
     }
 
     public final AutocompleteApplicationCommands getCommands() {
@@ -117,29 +123,25 @@ public final class VerifiedCommandMentionInputModel {
         return this.inputCommandOptions;
     }
 
-    public final Map<IntRange, WidgetChatInputCommandsModel> getInputMentionsMap() {
+    public final Map<IntRange, Autocompletable> getInputMentionsMap() {
         return this.inputMentionsMap;
     }
 
-    public final List<WidgetChatInputCommandsModel> getMentionables() {
-        return this.mentionables;
-    }
-
     public int hashCode() {
         String str = this.input;
         int i = 0;
         int hashCode = (str != null ? str.hashCode() : 0) * 31;
-        List<WidgetChatInputCommandsModel> list = this.mentionables;
-        int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31;
+        Map<LeadingIdentifier, Set<Autocompletable>> map = this.autocompletables;
+        int hashCode2 = (hashCode + (map != null ? map.hashCode() : 0)) * 31;
         AutocompleteApplicationCommands autocompleteApplicationCommands = this.commands;
         int hashCode3 = (hashCode2 + (autocompleteApplicationCommands != null ? autocompleteApplicationCommands.hashCode() : 0)) * 31;
         AutocompleteInputCommandContext autocompleteInputCommandContext = this.inputCommandContext;
         int hashCode4 = (hashCode3 + (autocompleteInputCommandContext != null ? autocompleteInputCommandContext.hashCode() : 0)) * 31;
         InputCommandOptions inputCommandOptions = this.inputCommandOptions;
         int hashCode5 = (hashCode4 + (inputCommandOptions != null ? inputCommandOptions.hashCode() : 0)) * 31;
-        Map<IntRange, WidgetChatInputCommandsModel> map = this.inputMentionsMap;
-        if (map != null) {
-            i = map.hashCode();
+        Map<IntRange, Autocompletable> map2 = this.inputMentionsMap;
+        if (map2 != null) {
+            i = map2.hashCode();
         }
         return hashCode5 + i;
     }
@@ -147,8 +149,8 @@ public final class VerifiedCommandMentionInputModel {
     public String toString() {
         StringBuilder L = a.L("VerifiedCommandMentionInputModel(input=");
         L.append(this.input);
-        L.append(", mentionables=");
-        L.append(this.mentionables);
+        L.append(", autocompletables=");
+        L.append(this.autocompletables);
         L.append(", commands=");
         L.append(this.commands);
         L.append(", inputCommandContext=");
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/HeaderType.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/HeaderType.java
index 32ad72d644..c90bc919ae 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/HeaderType.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/HeaderType.java
@@ -1,12 +1,72 @@
 package com.discord.widgets.chat.input.sticker;
 
 import c.d.b.a.a;
+import com.discord.models.guild.Guild;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import d0.z.d.m;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: StickerAdapterItems.kt */
 public abstract class HeaderType {
 
+    /* compiled from: StickerAdapterItems.kt */
+    public static final class GuildItem extends HeaderType {
+        private final Guild guild;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public GuildItem(Guild guild) {
+            super(null);
+            m.checkNotNullParameter(guild, "guild");
+            this.guild = guild;
+        }
+
+        public static /* synthetic */ GuildItem copy$default(GuildItem guildItem, Guild guild, int i, Object obj) {
+            if ((i & 1) != 0) {
+                guild = guildItem.guild;
+            }
+            return guildItem.copy(guild);
+        }
+
+        public final Guild component1() {
+            return this.guild;
+        }
+
+        public final GuildItem copy(Guild guild) {
+            m.checkNotNullParameter(guild, "guild");
+            return new GuildItem(guild);
+        }
+
+        public boolean equals(Object obj) {
+            if (this != obj) {
+                return (obj instanceof GuildItem) && m.areEqual(this.guild, ((GuildItem) obj).guild);
+            }
+            return true;
+        }
+
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
+        @Override // com.discord.widgets.chat.input.sticker.HeaderType
+        public String getId() {
+            return String.valueOf(this.guild.getId());
+        }
+
+        public int hashCode() {
+            Guild guild = this.guild;
+            if (guild != null) {
+                return guild.hashCode();
+            }
+            return 0;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("GuildItem(guild=");
+            L.append(this.guild);
+            L.append(")");
+            return L.toString();
+        }
+    }
+
     /* compiled from: StickerAdapterItems.kt */
     public static final class PackItem extends HeaderType {
         private final ModelStickerPack pack;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java
index 2760783ff9..245ed784e1 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java
@@ -57,9 +57,9 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
                 textView.setText(packItem.getPack().getName());
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.headerItemText");
-                textView2.setContentDescription(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893520, new Object[]{packItem.getPack().getName()}, null, 4));
+                textView2.setContentDescription(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893604, new Object[]{packItem.getPack().getName()}, null, 4));
             } else if (headerType instanceof HeaderType.Recent) {
-                this.binding.b.setText(2131893532);
+                this.binding.b.setText(2131893616);
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.headerItemText");
                 TextView textView4 = this.binding.b;
@@ -68,7 +68,19 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
                 m.checkNotNullExpressionValue(context, "binding.headerItemText.context");
                 TextView textView5 = this.binding.b;
                 m.checkNotNullExpressionValue(textView5, "binding.headerItemText");
-                textView3.setContentDescription(b.g(context, 2131893520, new Object[]{textView5.getText()}, null, 4));
+                textView3.setContentDescription(b.g(context, 2131893604, new Object[]{textView5.getText()}, null, 4));
+            } else if (headerType instanceof HeaderType.GuildItem) {
+                TextView textView6 = this.binding.b;
+                m.checkNotNullExpressionValue(textView6, "binding.headerItemText");
+                HeaderType.GuildItem guildItem = (HeaderType.GuildItem) headerType;
+                textView6.setText(guildItem.getGuild().getName());
+                TextView textView7 = this.binding.b;
+                m.checkNotNullExpressionValue(textView7, "binding.headerItemText");
+                TextView textView8 = this.binding.b;
+                m.checkNotNullExpressionValue(textView8, "binding.headerItemText");
+                Context context2 = textView8.getContext();
+                m.checkNotNullExpressionValue(context2, "binding.headerItemText.context");
+                textView7.setContentDescription(b.g(context2, 2131893604, new Object[]{guildItem.getGuild().getName()}, null, 4));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java
index 064536c690..4beb749919 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryAdapter.java
@@ -7,10 +7,12 @@ import android.widget.FrameLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.discord.app.AppComponent;
+import com.discord.databinding.StickerCategoryItemGuildBinding;
 import com.discord.databinding.StickerCategoryItemPackBinding;
 import com.discord.databinding.StickerCategoryItemRecentBinding;
 import com.discord.utilities.recycler.DiffCreator;
 import com.discord.views.sticker.StickerView;
+import com.discord.widgets.chat.input.emoji.GuildIcon;
 import com.discord.widgets.chat.input.sticker.StickerCategoryItem;
 import com.discord.widgets.chat.input.sticker.StickerCategoryViewHolder;
 import d0.t.n;
@@ -25,29 +27,33 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public final class StickerCategoryAdapter extends RecyclerView.Adapter<StickerCategoryViewHolder> {
     private final DiffCreator<List<StickerCategoryItem>, StickerCategoryViewHolder> diffCreator;
     private List<? extends StickerCategoryItem> items;
+    private final Function1<StickerCategoryItem.GuildItem, Unit> onGuildClicked;
     private final Function1<StickerCategoryItem.PackItem, Unit> onPackClicked;
     private final Function0<Unit> onRecentClicked;
     private final Function1<Integer, Unit> onSelectedItemAdapterPositionUpdated;
 
-    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.sticker.StickerCategoryItem$PackItem, kotlin.Unit> */
-    /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: kotlin.jvm.functions.Function1<? super java.lang.Integer, kotlin.Unit> */
+    /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.sticker.StickerCategoryItem$GuildItem, kotlin.Unit> */
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.jvm.functions.Function1<? super com.discord.widgets.chat.input.sticker.StickerCategoryItem$PackItem, kotlin.Unit> */
+    /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: kotlin.jvm.functions.Function1<? super java.lang.Integer, kotlin.Unit> */
     /* JADX WARN: Multi-variable type inference failed */
-    public StickerCategoryAdapter(Function1<? super StickerCategoryItem.PackItem, Unit> function1, Function0<Unit> function0, Function1<? super Integer, Unit> function12, AppComponent appComponent, DiffCreator<List<StickerCategoryItem>, StickerCategoryViewHolder> diffCreator) {
-        m.checkNotNullParameter(function1, "onPackClicked");
+    public StickerCategoryAdapter(Function1<? super StickerCategoryItem.GuildItem, Unit> function1, Function1<? super StickerCategoryItem.PackItem, Unit> function12, Function0<Unit> function0, Function1<? super Integer, Unit> function13, AppComponent appComponent, DiffCreator<List<StickerCategoryItem>, StickerCategoryViewHolder> diffCreator) {
+        m.checkNotNullParameter(function1, "onGuildClicked");
+        m.checkNotNullParameter(function12, "onPackClicked");
         m.checkNotNullParameter(function0, "onRecentClicked");
-        m.checkNotNullParameter(function12, "onSelectedItemAdapterPositionUpdated");
+        m.checkNotNullParameter(function13, "onSelectedItemAdapterPositionUpdated");
         m.checkNotNullParameter(appComponent, "appComponent");
         m.checkNotNullParameter(diffCreator, "diffCreator");
-        this.onPackClicked = function1;
+        this.onGuildClicked = function1;
+        this.onPackClicked = function12;
         this.onRecentClicked = function0;
-        this.onSelectedItemAdapterPositionUpdated = function12;
+        this.onSelectedItemAdapterPositionUpdated = function13;
         this.diffCreator = diffCreator;
         this.items = n.emptyList();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ StickerCategoryAdapter(Function1 function1, Function0 function0, Function1 function12, AppComponent appComponent, DiffCreator diffCreator, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(function1, function0, function12, appComponent, (i & 16) != 0 ? new DiffCreator(appComponent) : diffCreator);
+    public /* synthetic */ StickerCategoryAdapter(Function1 function1, Function1 function12, Function0 function0, Function1 function13, AppComponent appComponent, DiffCreator diffCreator, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(function1, function12, function0, function13, appComponent, (i & 32) != 0 ? new DiffCreator(appComponent) : diffCreator);
     }
 
     public static final /* synthetic */ List access$getItems$p(StickerCategoryAdapter stickerCategoryAdapter) {
@@ -76,6 +82,9 @@ public final class StickerCategoryAdapter extends RecyclerView.Adapter<StickerCa
         if (stickerCategoryItem instanceof StickerCategoryItem.PackItem) {
             return ((StickerCategoryItem.PackItem) stickerCategoryItem).getPack().getId();
         }
+        if (stickerCategoryItem instanceof StickerCategoryItem.GuildItem) {
+            return ((StickerCategoryItem.GuildItem) stickerCategoryItem).getGuild().getId();
+        }
         throw new NoWhenBranchMatchedException();
     }
 
@@ -88,6 +97,9 @@ public final class StickerCategoryAdapter extends RecyclerView.Adapter<StickerCa
         if (stickerCategoryItem instanceof StickerCategoryItem.PackItem) {
             return 1;
         }
+        if (stickerCategoryItem instanceof StickerCategoryItem.GuildItem) {
+            return 2;
+        }
         throw new NoWhenBranchMatchedException();
     }
 
@@ -98,6 +110,8 @@ public final class StickerCategoryAdapter extends RecyclerView.Adapter<StickerCa
             ((StickerCategoryViewHolder.Recent) stickerCategoryViewHolder).configure((StickerCategoryItem.RecentItem) stickerCategoryItem, this.onRecentClicked);
         } else if (stickerCategoryItem instanceof StickerCategoryItem.PackItem) {
             ((StickerCategoryViewHolder.Pack) stickerCategoryViewHolder).configure((StickerCategoryItem.PackItem) stickerCategoryItem, this.onPackClicked);
+        } else if (stickerCategoryItem instanceof StickerCategoryItem.GuildItem) {
+            ((StickerCategoryViewHolder.Guild) stickerCategoryViewHolder).configure((StickerCategoryItem.GuildItem) stickerCategoryItem, this.onGuildClicked);
         }
     }
 
@@ -105,30 +119,44 @@ public final class StickerCategoryAdapter extends RecyclerView.Adapter<StickerCa
     public StickerCategoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
-        int i2 = 2131364125;
+        int i2 = 2131364168;
         if (i == 0) {
             View inflate = from.inflate(2131558667, viewGroup, false);
-            View findViewById = inflate.findViewById(2131364125);
+            View findViewById = inflate.findViewById(2131364168);
             if (findViewById != null) {
                 StickerCategoryItemRecentBinding stickerCategoryItemRecentBinding = new StickerCategoryItemRecentBinding((FrameLayout) inflate, new c.a.i.n(findViewById, findViewById));
                 m.checkNotNullExpressionValue(stickerCategoryItemRecentBinding, "StickerCategoryItemRecen…(inflater, parent, false)");
                 return new StickerCategoryViewHolder.Recent(stickerCategoryItemRecentBinding);
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131364125)));
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131364168)));
         } else if (i == 1) {
             View inflate2 = from.inflate(2131558666, viewGroup, false);
-            View findViewById2 = inflate2.findViewById(2131364125);
+            View findViewById2 = inflate2.findViewById(2131364168);
             if (findViewById2 != null) {
                 c.a.i.n nVar = new c.a.i.n(findViewById2, findViewById2);
-                StickerView stickerView = (StickerView) inflate2.findViewById(2131365073);
+                StickerView stickerView = (StickerView) inflate2.findViewById(2131365128);
                 if (stickerView != null) {
                     StickerCategoryItemPackBinding stickerCategoryItemPackBinding = new StickerCategoryItemPackBinding((FrameLayout) inflate2, nVar, stickerView);
                     m.checkNotNullExpressionValue(stickerCategoryItemPackBinding, "StickerCategoryItemPackB…(inflater, parent, false)");
                     return new StickerCategoryViewHolder.Pack(stickerCategoryItemPackBinding);
                 }
-                i2 = 2131365073;
+                i2 = 2131365128;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
+        } else if (i == 2) {
+            View inflate3 = from.inflate(2131558665, viewGroup, false);
+            View findViewById3 = inflate3.findViewById(2131364168);
+            if (findViewById3 != null) {
+                c.a.i.n nVar2 = new c.a.i.n(findViewById3, findViewById3);
+                GuildIcon guildIcon = (GuildIcon) inflate3.findViewById(2131365127);
+                if (guildIcon != null) {
+                    StickerCategoryItemGuildBinding stickerCategoryItemGuildBinding = new StickerCategoryItemGuildBinding((FrameLayout) inflate3, nVar2, guildIcon);
+                    m.checkNotNullExpressionValue(stickerCategoryItemGuildBinding, "StickerCategoryItemGuild…(inflater, parent, false)");
+                    return new StickerCategoryViewHolder.Guild(stickerCategoryItemGuildBinding);
+                }
+                i2 = 2131365127;
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(inflate3.getResources().getResourceName(i2)));
         } else {
             throw new IllegalStateException(a.l("Invalid Sticker Category Type: ", i));
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryItem.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryItem.java
index e74eb7b946..cb45318d96 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryItem.java
@@ -1,14 +1,18 @@
 package com.discord.widgets.chat.input.sticker;
 
 import c.d.b.a.a;
+import com.discord.api.sticker.Sticker;
+import com.discord.models.guild.Guild;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.utilities.recycler.DiffKeyProvider;
 import d0.z.d.m;
+import java.util.List;
 import kotlin.Pair;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: StickerCategoryItem.kt */
 public abstract class StickerCategoryItem implements DiffKeyProvider {
     public static final Companion Companion = new Companion(null);
+    public static final int TYPE_GUILD = 2;
     public static final int TYPE_PACK = 1;
     public static final int TYPE_RECENT = 0;
     private final boolean isSelected;
@@ -23,6 +27,136 @@ public abstract class StickerCategoryItem implements DiffKeyProvider {
         }
     }
 
+    /* compiled from: StickerCategoryItem.kt */
+    public static final class GuildItem extends StickerCategoryItem {
+        private final Pair<Integer, Integer> categoryRange;
+        private final Guild guild;
+        private final boolean isSelected;
+        private final String key;
+        private final List<Sticker> stickers;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public GuildItem(Guild guild, List<Sticker> list, Pair<Integer, Integer> pair, boolean z2) {
+            super(z2, null);
+            m.checkNotNullParameter(guild, "guild");
+            m.checkNotNullParameter(list, "stickers");
+            m.checkNotNullParameter(pair, "categoryRange");
+            this.guild = guild;
+            this.stickers = list;
+            this.categoryRange = pair;
+            this.isSelected = z2;
+            this.key = String.valueOf(guild.getId());
+        }
+
+        /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.chat.input.sticker.StickerCategoryItem$GuildItem */
+        /* JADX WARN: Multi-variable type inference failed */
+        public static /* synthetic */ GuildItem copy$default(GuildItem guildItem, Guild guild, List list, Pair pair, boolean z2, int i, Object obj) {
+            if ((i & 1) != 0) {
+                guild = guildItem.guild;
+            }
+            if ((i & 2) != 0) {
+                list = guildItem.stickers;
+            }
+            if ((i & 4) != 0) {
+                pair = guildItem.categoryRange;
+            }
+            if ((i & 8) != 0) {
+                z2 = guildItem.isSelected();
+            }
+            return guildItem.copy(guild, list, pair, z2);
+        }
+
+        public final Guild component1() {
+            return this.guild;
+        }
+
+        public final List<Sticker> component2() {
+            return this.stickers;
+        }
+
+        public final Pair<Integer, Integer> component3() {
+            return this.categoryRange;
+        }
+
+        public final boolean component4() {
+            return isSelected();
+        }
+
+        public final GuildItem copy(Guild guild, List<Sticker> list, Pair<Integer, Integer> pair, boolean z2) {
+            m.checkNotNullParameter(guild, "guild");
+            m.checkNotNullParameter(list, "stickers");
+            m.checkNotNullParameter(pair, "categoryRange");
+            return new GuildItem(guild, list, pair, z2);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof GuildItem)) {
+                return false;
+            }
+            GuildItem guildItem = (GuildItem) obj;
+            return m.areEqual(this.guild, guildItem.guild) && m.areEqual(this.stickers, guildItem.stickers) && m.areEqual(this.categoryRange, guildItem.categoryRange) && isSelected() == guildItem.isSelected();
+        }
+
+        public final Pair<Integer, Integer> getCategoryRange() {
+            return this.categoryRange;
+        }
+
+        public final Guild getGuild() {
+            return this.guild;
+        }
+
+        @Override // com.discord.utilities.recycler.DiffKeyProvider
+        public String getKey() {
+            return this.key;
+        }
+
+        public final List<Sticker> getStickers() {
+            return this.stickers;
+        }
+
+        public int hashCode() {
+            Guild guild = this.guild;
+            int i = 0;
+            int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
+            List<Sticker> list = this.stickers;
+            int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31;
+            Pair<Integer, Integer> pair = this.categoryRange;
+            if (pair != null) {
+                i = pair.hashCode();
+            }
+            int i2 = (hashCode2 + i) * 31;
+            boolean isSelected = isSelected();
+            if (isSelected) {
+                isSelected = true;
+            }
+            int i3 = isSelected ? 1 : 0;
+            int i4 = isSelected ? 1 : 0;
+            int i5 = isSelected ? 1 : 0;
+            return i2 + i3;
+        }
+
+        @Override // com.discord.widgets.chat.input.sticker.StickerCategoryItem
+        public boolean isSelected() {
+            return this.isSelected;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("GuildItem(guild=");
+            L.append(this.guild);
+            L.append(", stickers=");
+            L.append(this.stickers);
+            L.append(", categoryRange=");
+            L.append(this.categoryRange);
+            L.append(", isSelected=");
+            L.append(isSelected());
+            L.append(")");
+            return L.toString();
+        }
+    }
+
     /* compiled from: StickerCategoryItem.kt */
     public static final class PackItem extends StickerCategoryItem {
         private final Pair<Integer, Integer> categoryRange;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder$Guild$configure$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder$Guild$configure$1.java
new file mode 100644
index 0000000000..5229abbfad
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder$Guild$configure$1.java
@@ -0,0 +1,20 @@
+package com.discord.widgets.chat.input.sticker;
+
+import android.view.View;
+import com.discord.widgets.chat.input.sticker.StickerCategoryItem;
+import kotlin.jvm.functions.Function1;
+/* compiled from: StickerCategoryViewHolder.kt */
+public final class StickerCategoryViewHolder$Guild$configure$1 implements View.OnClickListener {
+    public final /* synthetic */ StickerCategoryItem.GuildItem $guildItem;
+    public final /* synthetic */ Function1 $onGuildClicked;
+
+    public StickerCategoryViewHolder$Guild$configure$1(Function1 function1, StickerCategoryItem.GuildItem guildItem) {
+        this.$onGuildClicked = function1;
+        this.$guildItem = guildItem;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        this.$onGuildClicked.invoke(this.$guildItem);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder.java
index 016aa0a25d..d361bdbe6b 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerCategoryViewHolder.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import androidx.recyclerview.widget.RecyclerView;
+import com.discord.databinding.StickerCategoryItemGuildBinding;
 import com.discord.databinding.StickerCategoryItemPackBinding;
 import com.discord.databinding.StickerCategoryItemRecentBinding;
 import com.discord.rlottie.RLottieImageView;
@@ -18,6 +19,33 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: StickerCategoryViewHolder.kt */
 public abstract class StickerCategoryViewHolder extends RecyclerView.ViewHolder {
 
+    /* compiled from: StickerCategoryViewHolder.kt */
+    public static final class Guild extends StickerCategoryViewHolder {
+        private final StickerCategoryItemGuildBinding binding;
+
+        /* JADX WARNING: Illegal instructions before constructor call */
+        public Guild(StickerCategoryItemGuildBinding stickerCategoryItemGuildBinding) {
+            super(r0, null);
+            m.checkNotNullParameter(stickerCategoryItemGuildBinding, "binding");
+            FrameLayout frameLayout = stickerCategoryItemGuildBinding.a;
+            m.checkNotNullExpressionValue(frameLayout, "binding.root");
+            this.binding = stickerCategoryItemGuildBinding;
+        }
+
+        public final void configure(StickerCategoryItem.GuildItem guildItem, Function1<? super StickerCategoryItem.GuildItem, Unit> function1) {
+            m.checkNotNullParameter(guildItem, "guildItem");
+            m.checkNotNullParameter(function1, "onGuildClicked");
+            this.binding.f1626c.updateView(guildItem.getGuild());
+            View view = this.binding.b.b;
+            m.checkNotNullExpressionValue(view, "binding.overline.express…CategorySelectionOverline");
+            view.setVisibility(guildItem.isSelected() ? 0 : 8);
+            this.itemView.setOnClickListener(new StickerCategoryViewHolder$Guild$configure$1(function1, guildItem));
+            View view2 = this.itemView;
+            m.checkNotNullExpressionValue(view2, "itemView");
+            view2.setContentDescription(guildItem.getGuild().getName());
+        }
+    }
+
     /* compiled from: StickerCategoryViewHolder.kt */
     public static final class Pack extends StickerCategoryViewHolder {
         private final StickerCategoryItemPackBinding binding;
@@ -34,19 +62,19 @@ public abstract class StickerCategoryViewHolder extends RecyclerView.ViewHolder
         public final void configure(StickerCategoryItem.PackItem packItem, Function1<? super StickerCategoryItem.PackItem, Unit> function1) {
             m.checkNotNullParameter(packItem, "packItem");
             m.checkNotNullParameter(function1, "onPackClicked");
-            this.binding.f1630c.c(packItem.getPack().getCoverSticker(), 2);
-            this.binding.f1630c.setOnClickListener(new StickerCategoryViewHolder$Pack$configure$1(function1, packItem));
-            StickerView stickerView = this.binding.f1630c;
+            this.binding.f1627c.c(packItem.getPack().getCoverSticker(), 2);
+            this.binding.f1627c.setOnClickListener(new StickerCategoryViewHolder$Pack$configure$1(function1, packItem));
+            StickerView stickerView = this.binding.f1627c;
             SimpleDraweeView simpleDraweeView = stickerView.i.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.stickerViewImageview");
             simpleDraweeView.setImportantForAccessibility(4);
-            RLottieImageView rLottieImageView = stickerView.i.f99c;
+            RLottieImageView rLottieImageView = stickerView.i.f104c;
             m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie");
             rLottieImageView.setImportantForAccessibility(4);
             ImageView imageView = stickerView.i.d;
             m.checkNotNullExpressionValue(imageView, "binding.stickerViewPlaceholder");
             imageView.setImportantForAccessibility(4);
-            StickerView stickerView2 = this.binding.f1630c;
+            StickerView stickerView2 = this.binding.f1627c;
             m.checkNotNullExpressionValue(stickerView2, "binding.stickerCategoryItemPackAvatar");
             stickerView2.setContentDescription(packItem.getPack().getName());
             View view = this.binding.b.b;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java
index edf2bc157f..cf5a41aeae 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class StickerFullSizeDialog$binding$2 extends k imp
 
     public final StickerFullSizeDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        StickerView stickerView = (StickerView) view.findViewById(2131365074);
+        StickerView stickerView = (StickerView) view.findViewById(2131365129);
         if (stickerView != null) {
             return new StickerFullSizeDialogBinding((FrameLayout) view, stickerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365074)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365129)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerItem.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerItem.java
index 0dbf32d0c6..3232ef3e86 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerItem.java
@@ -2,12 +2,14 @@ package com.discord.widgets.chat.input.sticker;
 
 import c.d.b.a.a;
 import com.discord.api.sticker.Sticker;
+import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import d0.z.d.m;
 /* compiled from: StickerAdapterItems.kt */
 public final class StickerItem implements MGRecyclerDataPayload {
     private final String key;
     private final Mode mode;
+    private final StickerUtils.StickerSendability sendability;
     private final Sticker sticker;
     private final int stickerAnimationSettings;
     private final int type = 1;
@@ -18,18 +20,20 @@ public final class StickerItem implements MGRecyclerDataPayload {
         STORE
     }
 
-    public StickerItem(Sticker sticker, int i, Mode mode) {
+    public StickerItem(Sticker sticker, int i, Mode mode, StickerUtils.StickerSendability stickerSendability) {
         m.checkNotNullParameter(sticker, "sticker");
         m.checkNotNullParameter(mode, "mode");
+        m.checkNotNullParameter(stickerSendability, "sendability");
         this.sticker = sticker;
         this.stickerAnimationSettings = i;
         this.mode = mode;
+        this.sendability = stickerSendability;
         StringBuilder L = a.L("sticker:");
         L.append(sticker.getId());
         this.key = L.toString();
     }
 
-    public static /* synthetic */ StickerItem copy$default(StickerItem stickerItem, Sticker sticker, int i, Mode mode, int i2, Object obj) {
+    public static /* synthetic */ StickerItem copy$default(StickerItem stickerItem, Sticker sticker, int i, Mode mode, StickerUtils.StickerSendability stickerSendability, int i2, Object obj) {
         if ((i2 & 1) != 0) {
             sticker = stickerItem.sticker;
         }
@@ -39,7 +43,10 @@ public final class StickerItem implements MGRecyclerDataPayload {
         if ((i2 & 4) != 0) {
             mode = stickerItem.mode;
         }
-        return stickerItem.copy(sticker, i, mode);
+        if ((i2 & 8) != 0) {
+            stickerSendability = stickerItem.sendability;
+        }
+        return stickerItem.copy(sticker, i, mode, stickerSendability);
     }
 
     public final Sticker component1() {
@@ -54,10 +61,15 @@ public final class StickerItem implements MGRecyclerDataPayload {
         return this.mode;
     }
 
-    public final StickerItem copy(Sticker sticker, int i, Mode mode) {
+    public final StickerUtils.StickerSendability component4() {
+        return this.sendability;
+    }
+
+    public final StickerItem copy(Sticker sticker, int i, Mode mode, StickerUtils.StickerSendability stickerSendability) {
         m.checkNotNullParameter(sticker, "sticker");
         m.checkNotNullParameter(mode, "mode");
-        return new StickerItem(sticker, i, mode);
+        m.checkNotNullParameter(stickerSendability, "sendability");
+        return new StickerItem(sticker, i, mode, stickerSendability);
     }
 
     public boolean equals(Object obj) {
@@ -68,7 +80,7 @@ public final class StickerItem implements MGRecyclerDataPayload {
             return false;
         }
         StickerItem stickerItem = (StickerItem) obj;
-        return m.areEqual(this.sticker, stickerItem.sticker) && this.stickerAnimationSettings == stickerItem.stickerAnimationSettings && m.areEqual(this.mode, stickerItem.mode);
+        return m.areEqual(this.sticker, stickerItem.sticker) && this.stickerAnimationSettings == stickerItem.stickerAnimationSettings && m.areEqual(this.mode, stickerItem.mode) && m.areEqual(this.sendability, stickerItem.sendability);
     }
 
     @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -80,6 +92,10 @@ public final class StickerItem implements MGRecyclerDataPayload {
         return this.mode;
     }
 
+    public final StickerUtils.StickerSendability getSendability() {
+        return this.sendability;
+    }
+
     public final Sticker getSticker() {
         return this.sticker;
     }
@@ -98,10 +114,12 @@ public final class StickerItem implements MGRecyclerDataPayload {
         int i = 0;
         int hashCode = (((sticker != null ? sticker.hashCode() : 0) * 31) + this.stickerAnimationSettings) * 31;
         Mode mode = this.mode;
-        if (mode != null) {
-            i = mode.hashCode();
+        int hashCode2 = (hashCode + (mode != null ? mode.hashCode() : 0)) * 31;
+        StickerUtils.StickerSendability stickerSendability = this.sendability;
+        if (stickerSendability != null) {
+            i = stickerSendability.hashCode();
         }
-        return hashCode + i;
+        return hashCode2 + i;
     }
 
     public String toString() {
@@ -111,6 +129,8 @@ public final class StickerItem implements MGRecyclerDataPayload {
         L.append(this.stickerAnimationSettings);
         L.append(", mode=");
         L.append(this.mode);
+        L.append(", sendability=");
+        L.append(this.sendability);
         L.append(")");
         return L.toString();
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.java
index 4d79d2169a..0e883c3c34 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPackStoreSheetViewModel.java
@@ -14,6 +14,7 @@ import com.discord.stores.StoreUser;
 import com.discord.stores.StoreUserSettings;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.Traits;
+import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.chat.input.sticker.StickerItem;
@@ -71,22 +72,22 @@ public final class StickerPackStoreSheetViewModel extends AppViewModel<ViewState
             this();
         }
 
-        public static final /* synthetic */ List access$buildStoreStickerListItems(Companion companion, ModelStickerPack modelStickerPack, int i) {
-            return companion.buildStoreStickerListItems(modelStickerPack, i);
+        public static final /* synthetic */ List access$buildStoreStickerListItems(Companion companion, ModelStickerPack modelStickerPack, int i, User user) {
+            return companion.buildStoreStickerListItems(modelStickerPack, i, user);
         }
 
         public static final /* synthetic */ Observable access$observeStoreState(Companion companion, long j, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser) {
             return companion.observeStoreState(j, storeStickers, storeUserSettings, storeUser);
         }
 
-        private final List<MGRecyclerDataPayload> buildStoreStickerListItems(ModelStickerPack modelStickerPack, int i) {
+        private final List<MGRecyclerDataPayload> buildStoreStickerListItems(ModelStickerPack modelStickerPack, int i, User user) {
             ArrayList arrayList = new ArrayList();
             if (modelStickerPack.getStickers().isEmpty()) {
                 return n.emptyList();
             }
             arrayList.add(new StoreHeaderItem(modelStickerPack, false));
             for (Sticker sticker : modelStickerPack.getStickers()) {
-                arrayList.add(new StickerItem(sticker, i, StickerItem.Mode.STORE));
+                arrayList.add(new StickerItem(sticker, i, StickerItem.Mode.STORE, StickerUtils.getStickerSendability$default(StickerUtils.INSTANCE, sticker, user, null, null, 12, null)));
             }
             return arrayList;
         }
@@ -361,7 +362,7 @@ public final class StickerPackStoreSheetViewModel extends AppViewModel<ViewState
         StoreStickers.StickerPackState stickerPack = storeState.getStickerPack();
         Objects.requireNonNull(stickerPack, "null cannot be cast to non-null type com.discord.stores.StoreStickers.StickerPackState.Loaded");
         ModelStickerPack stickerPack2 = ((StoreStickers.StickerPackState.Loaded) stickerPack).getStickerPack();
-        arrayList.addAll(Companion.access$buildStoreStickerListItems(Companion, stickerPack2, stickerAnimationSettings));
+        arrayList.addAll(Companion.access$buildStoreStickerListItems(Companion, stickerPack2, stickerAnimationSettings, storeState.getMeUser()));
         PremiumTier premiumTier = meUser.getPremiumTier();
         List<ModelStickerPack> enabledStickerPacks = this.stickersStore.getEnabledStickerPacks();
         boolean z3 = true;
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag.java
index 218ae58903..610df75fba 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerFeatureFlag.java
@@ -70,11 +70,11 @@ public final class StickerPickerFeatureFlag {
     }
 
     private final Observable<Experiment> observeExperiment(StoreExperiments storeExperiments) {
-        Observable<R> G = storeExperiments.observeUserExperiment("2020-10_stickers_user_android", true).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable u = G.a0(1).u(new StickerPickerFeatureFlag$observeExperiment$1(this));
-        m.checkNotNullExpressionValue(u, "storeExperiments.observe…che(experiment)\n        }");
-        return ObservableExtensionsKt.computationLatest(u);
+        Observable<R> F = storeExperiments.observeUserExperiment("2020-10_stickers_user_android", true).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable t = F.Z(1).t(new StickerPickerFeatureFlag$observeExperiment$1(this));
+        m.checkNotNullExpressionValue(t, "storeExperiments.observe…che(experiment)\n        }");
+        return ObservableExtensionsKt.computationLatest(t);
     }
 
     private final void writeExperimentToCache(Experiment experiment) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerInlineViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerInlineViewModel.java
index e8ef6190d6..c662dbbbed 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerInlineViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerInlineViewModel.java
@@ -7,7 +7,7 @@ import java.util.Locale;
 public final class StickerPickerInlineViewModel extends StickerPickerViewModel {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StickerPickerInlineViewModel(Locale locale, MessageManager messageManager, long j) {
-        super(null, null, locale, messageManager, null, j, null, null, null, null, 979, null);
+        super(null, null, locale, messageManager, null, j, null, null, null, null, null, 2003, null);
         m.checkNotNullParameter(locale, "locale");
         m.checkNotNullParameter(messageManager, "messageManager");
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.java
index b00024752e..b10961e649 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerNfxManager.java
@@ -60,7 +60,7 @@ public final class StickerPickerNfxManager {
             WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
             tooltipManager = weakReference2 != null ? weakReference2.get() : null;
             if (tooltipManager == null) {
-                tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+                tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
                 TooltipManager.a.a = new WeakReference<>(tooltipManager);
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerSheetViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerSheetViewModel.java
index d700802ac7..c4a6e68d4e 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerSheetViewModel.java
@@ -7,7 +7,7 @@ import java.util.Locale;
 public final class StickerPickerSheetViewModel extends StickerPickerViewModel {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StickerPickerSheetViewModel(Locale locale, MessageManager messageManager, long j) {
-        super(null, null, locale, messageManager, null, j, null, null, null, null, 979, null);
+        super(null, null, locale, messageManager, null, j, null, null, null, null, null, 2003, null);
         m.checkNotNullParameter(locale, "locale");
         m.checkNotNullParameter(messageManager, "messageManager");
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java
index 7148560790..ee82ee0795 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel$Companion$observeStoreState$1.java
@@ -1,31 +1,44 @@
 package com.discord.widgets.chat.input.sticker;
 
+import com.discord.api.channel.Channel;
 import com.discord.api.sticker.Sticker;
+import com.discord.models.guild.Guild;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.models.user.MeUser;
 import com.discord.widgets.chat.input.expression.ExpressionTrayTab;
 import com.discord.widgets.chat.input.sticker.StickerPickerViewModel;
 import d0.z.d.m;
+import d0.z.d.o;
+import java.util.LinkedHashMap;
 import java.util.List;
-import rx.functions.Func7;
+import java.util.Map;
+import kotlin.jvm.functions.Function11;
 /* compiled from: StickerPickerViewModel.kt */
-public final class StickerPickerViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, T5, T6, T7, R> implements Func7<List<? extends ModelStickerPack>, List<? extends Sticker>, String, Integer, Long, MeUser, ExpressionTrayTab, StickerPickerViewModel.StoreState> {
+public final class StickerPickerViewModel$Companion$observeStoreState$1 extends o implements Function11<LinkedHashMap<Long, Guild>, Map<Long, ? extends Map<Long, ? extends Sticker>>, List<? extends ModelStickerPack>, List<? extends Long>, String, Integer, Long, MeUser, ExpressionTrayTab, Channel, Map<Long, ? extends Long>, StickerPickerViewModel.StoreState> {
     public static final StickerPickerViewModel$Companion$observeStoreState$1 INSTANCE = new StickerPickerViewModel$Companion$observeStoreState$1();
 
-    public final StickerPickerViewModel.StoreState call(List<ModelStickerPack> list, List<Sticker> list2, String str, Integer num, Long l, MeUser meUser, ExpressionTrayTab expressionTrayTab) {
-        m.checkNotNullExpressionValue(list, "enabledStickerPacks");
-        m.checkNotNullExpressionValue(list2, "frequentlyUsedStickers");
+    public StickerPickerViewModel$Companion$observeStoreState$1() {
+        super(11);
+    }
+
+    public final StickerPickerViewModel.StoreState invoke(LinkedHashMap<Long, Guild> linkedHashMap, Map<Long, ? extends Map<Long, Sticker>> map, List<ModelStickerPack> list, List<Long> list2, String str, int i, Long l, MeUser meUser, ExpressionTrayTab expressionTrayTab, Channel channel, Map<Long, Long> map2) {
+        m.checkNotNullParameter(linkedHashMap, "allGuilds");
+        m.checkNotNullParameter(map, "guildStickers");
+        m.checkNotNullParameter(list, "enabledStickerPacks");
+        m.checkNotNullParameter(list2, "frequentlyUsedStickerIds");
+        m.checkNotNullParameter(meUser, "meUser");
+        m.checkNotNullParameter(expressionTrayTab, "selectedExpressionPickerTab");
+        m.checkNotNullParameter(map2, "allChannelPermissions");
         m.checkNotNullExpressionValue(str, "searchInputString");
-        m.checkNotNullExpressionValue(num, "stickerAnimationSettings");
-        int intValue = num.intValue();
-        m.checkNotNullExpressionValue(meUser, "meUser");
-        return new StickerPickerViewModel.StoreState.Loaded(list, list2, str, intValue, l, meUser, expressionTrayTab == ExpressionTrayTab.STICKER);
+        boolean z2 = expressionTrayTab == ExpressionTrayTab.STICKER;
+        Long l2 = map2.get(Long.valueOf(channel != null ? channel.h() : 0));
+        return new StickerPickerViewModel.StoreState.Loaded(linkedHashMap, map, list, list2, str, i, l, meUser, z2, channel, l2 != null ? l2.longValue() : 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
-    @Override // rx.functions.Func7
-    public /* bridge */ /* synthetic */ StickerPickerViewModel.StoreState call(List<? extends ModelStickerPack> list, List<? extends Sticker> list2, String str, Integer num, Long l, MeUser meUser, ExpressionTrayTab expressionTrayTab) {
-        return call((List<ModelStickerPack>) list, (List<Sticker>) list2, str, num, l, meUser, expressionTrayTab);
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function11
+    public /* bridge */ /* synthetic */ StickerPickerViewModel.StoreState invoke(LinkedHashMap<Long, Guild> linkedHashMap, Map<Long, ? extends Map<Long, ? extends Sticker>> map, List<? extends ModelStickerPack> list, List<? extends Long> list2, String str, Integer num, Long l, MeUser meUser, ExpressionTrayTab expressionTrayTab, Channel channel, Map<Long, ? extends Long> map2) {
+        return invoke(linkedHashMap, (Map<Long, ? extends Map<Long, Sticker>>) map, (List<ModelStickerPack>) list, (List<Long>) list2, str, num.intValue(), l, meUser, expressionTrayTab, channel, (Map<Long, Long>) map2);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
index 855a89c590..4d9417df77 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.input.sticker;
 
+import a0.a.a.b;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
@@ -7,33 +8,42 @@ import com.discord.api.channel.Channel;
 import com.discord.api.premium.PremiumTier;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppViewModel;
+import com.discord.models.guild.Guild;
 import com.discord.models.sticker.dto.ModelStickerPack;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreChannelsSelected;
 import com.discord.stores.StoreExpressionPickerNavigation;
+import com.discord.stores.StoreGuildStickers;
+import com.discord.stores.StoreGuildsSorted;
 import com.discord.stores.StorePermissions;
 import com.discord.stores.StoreStickers;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUser;
 import com.discord.stores.StoreUserSettings;
+import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.permissions.PermissionUtils;
+import com.discord.utilities.rx.ObservableCombineLatestOverloadsKt;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.chat.MessageManager;
 import com.discord.widgets.chat.input.sticker.HeaderType;
 import com.discord.widgets.chat.input.sticker.StickerCategoryItem;
 import com.discord.widgets.chat.input.sticker.StickerItem;
 import d0.g0.w;
+import d0.t.h0;
 import d0.t.n;
+import d0.t.u;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 import kotlin.Pair;
 import kotlin.Unit;
@@ -55,9 +65,10 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
     private final MessageManager messageManager;
     private final StorePermissions permissionStore;
     private final BehaviorSubject<String> searchSubject;
-    private final BehaviorSubject<Long> selectedPackIdSubject;
+    private final BehaviorSubject<Long> selectedCategoryIdSubject;
     private int stickerCountToDisplayForStore;
     private final StoreStickers stickersStore;
+    private final StoreUser userStore;
 
     /* compiled from: StickerPickerViewModel.kt */
     /* renamed from: com.discord.widgets.chat.input.sticker.StickerPickerViewModel$1  reason: invalid class name */
@@ -94,29 +105,57 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
             this();
         }
 
-        public static final /* synthetic */ List access$buildStickerListItems(Companion companion, ModelStickerPack modelStickerPack, String str, int i, Locale locale) {
-            return companion.buildStickerListItems(modelStickerPack, str, i, locale);
+        public static final /* synthetic */ List access$buildGuildStickersListItems(Companion companion, List list, Guild guild, int i, String str, MeUser meUser, Locale locale, Channel channel, long j) {
+            return companion.buildGuildStickersListItems(list, guild, i, str, meUser, locale, channel, j);
         }
 
-        private final List<MGRecyclerDataPayload> buildStickerListItems(ModelStickerPack modelStickerPack, String str, int i, Locale locale) {
+        public static final /* synthetic */ List access$buildStickerListItems(Companion companion, ModelStickerPack modelStickerPack, String str, int i, Locale locale, MeUser meUser) {
+            return companion.buildStickerListItems(modelStickerPack, str, i, locale, meUser);
+        }
+
+        private final List<MGRecyclerDataPayload> buildGuildStickersListItems(List<Sticker> list, Guild guild, int i, String str, MeUser meUser, Locale locale, Channel channel, long j) {
+            ArrayList arrayList = new ArrayList();
+            for (Sticker sticker : list) {
+                String h = sticker.h();
+                Objects.requireNonNull(h, "null cannot be cast to non-null type java.lang.String");
+                String lowerCase = h.toLowerCase(locale);
+                m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
+                if (!w.contains$default((CharSequence) lowerCase, (CharSequence) str, false, 2, (Object) null)) {
+                    String j2 = sticker.j();
+                    Objects.requireNonNull(j2, "null cannot be cast to non-null type java.lang.String");
+                    String lowerCase2 = j2.toLowerCase(locale);
+                    m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)");
+                    if (w.contains$default((CharSequence) lowerCase2, (CharSequence) str, false, 2, (Object) null)) {
+                    }
+                }
+                arrayList.add(new StickerItem(sticker, i, StickerItem.Mode.OWNED, StickerUtils.INSTANCE.getStickerSendability(sticker, meUser, channel, Long.valueOf(j))));
+            }
+            if ((str.length() > 0) && arrayList.isEmpty()) {
+                return n.emptyList();
+            }
+            arrayList.add(0, new HeaderItem(new HeaderType.GuildItem(guild)));
+            return arrayList;
+        }
+
+        private final List<MGRecyclerDataPayload> buildStickerListItems(ModelStickerPack modelStickerPack, String str, int i, Locale locale, MeUser meUser) {
             ArrayList arrayList = new ArrayList();
             if (modelStickerPack.getStickers().isEmpty()) {
                 return n.emptyList();
             }
             for (Sticker sticker : modelStickerPack.getStickers()) {
-                String g = sticker.g();
-                Objects.requireNonNull(g, "null cannot be cast to non-null type java.lang.String");
-                String lowerCase = g.toLowerCase(locale);
+                String h = sticker.h();
+                Objects.requireNonNull(h, "null cannot be cast to non-null type java.lang.String");
+                String lowerCase = h.toLowerCase(locale);
                 m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
                 if (!w.contains$default((CharSequence) lowerCase, (CharSequence) str, false, 2, (Object) null)) {
-                    String i2 = sticker.i();
-                    Objects.requireNonNull(i2, "null cannot be cast to non-null type java.lang.String");
-                    String lowerCase2 = i2.toLowerCase(locale);
+                    String j = sticker.j();
+                    Objects.requireNonNull(j, "null cannot be cast to non-null type java.lang.String");
+                    String lowerCase2 = j.toLowerCase(locale);
                     m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)");
                     if (w.contains$default((CharSequence) lowerCase2, (CharSequence) str, false, 2, (Object) null)) {
                     }
                 }
-                arrayList.add(new StickerItem(sticker, i, StickerItem.Mode.OWNED));
+                arrayList.add(new StickerItem(sticker, i, StickerItem.Mode.OWNED, StickerUtils.getStickerSendability$default(StickerUtils.INSTANCE, sticker, meUser, null, null, 12, null)));
             }
             if ((str.length() > 0) && arrayList.isEmpty()) {
                 return n.emptyList();
@@ -125,26 +164,12 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
             return arrayList;
         }
 
-        private final Observable<StoreState> observeStoreState(BehaviorSubject<String> behaviorSubject, BehaviorSubject<Long> behaviorSubject2, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser, StoreExpressionPickerNavigation storeExpressionPickerNavigation) {
-            Observable<StoreState> e = Observable.e(storeStickers.observeEnabledStickerPacks(), storeStickers.observeFrequentlyUsedStickers(), behaviorSubject, StoreUserSettings.observeStickerAnimationSettings$default(storeUserSettings, false, 1, null), behaviorSubject2, StoreUser.observeMe$default(storeUser, false, 1, null), storeExpressionPickerNavigation.observeSelectedTab(), StickerPickerViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(e, "Observable.combineLatest…Tab.STICKER\n      )\n    }");
-            return e;
+        private final Observable<StoreState> observeStoreState(BehaviorSubject<String> behaviorSubject, BehaviorSubject<Long> behaviorSubject2, StoreGuildsSorted storeGuildsSorted, StoreGuildStickers storeGuildStickers, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions) {
+            return ObservableCombineLatestOverloadsKt.combineLatest(storeGuildsSorted.observeOrderedGuilds(), storeGuildStickers.observeGuildStickers(), storeStickers.observeEnabledStickerPacks(), storeStickers.observeFrequentlyUsedStickerIds(), behaviorSubject, StoreUserSettings.observeStickerAnimationSettings$default(storeUserSettings, false, 1, null), behaviorSubject2, StoreUser.observeMe$default(storeUser, false, 1, null), storeExpressionPickerNavigation.observeSelectedTab(), storeChannelsSelected.observeSelectedChannel(), storePermissions.observePermissionsForAllChannels(), StickerPickerViewModel$Companion$observeStoreState$1.INSTANCE);
         }
 
-        public static /* synthetic */ Observable observeStoreState$default(Companion companion, BehaviorSubject behaviorSubject, BehaviorSubject behaviorSubject2, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser, StoreExpressionPickerNavigation storeExpressionPickerNavigation, int i, Object obj) {
-            if ((i & 4) != 0) {
-                storeStickers = StoreStream.Companion.getStickers();
-            }
-            if ((i & 8) != 0) {
-                storeUserSettings = StoreStream.Companion.getUserSettings();
-            }
-            if ((i & 16) != 0) {
-                storeUser = StoreStream.Companion.getUsers();
-            }
-            if ((i & 32) != 0) {
-                storeExpressionPickerNavigation = StoreStream.Companion.getExpressionPickerNavigation();
-            }
-            return companion.observeStoreState(behaviorSubject, behaviorSubject2, storeStickers, storeUserSettings, storeUser, storeExpressionPickerNavigation);
+        public static /* synthetic */ Observable observeStoreState$default(Companion companion, BehaviorSubject behaviorSubject, BehaviorSubject behaviorSubject2, StoreGuildsSorted storeGuildsSorted, StoreGuildStickers storeGuildStickers, StoreStickers storeStickers, StoreUserSettings storeUserSettings, StoreUser storeUser, StoreExpressionPickerNavigation storeExpressionPickerNavigation, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, int i, Object obj) {
+            return companion.observeStoreState(behaviorSubject, behaviorSubject2, (i & 4) != 0 ? StoreStream.Companion.getGuildsSorted() : storeGuildsSorted, (i & 8) != 0 ? StoreStream.Companion.getGuildStickers() : storeGuildStickers, (i & 16) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 32) != 0 ? StoreStream.Companion.getUserSettings() : storeUserSettings, (i & 64) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 128) != 0 ? StoreStream.Companion.getExpressionPickerNavigation() : storeExpressionPickerNavigation, (i & 256) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 512) != 0 ? StoreStream.Companion.getPermissions() : storePermissions);
         }
     }
 
@@ -208,91 +233,98 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
 
         /* compiled from: StickerPickerViewModel.kt */
         public static final class Loaded extends StoreState {
+            private final LinkedHashMap<Long, Guild> allGuilds;
+            private final Channel currentChannel;
+            private final long currentChannelPermissions;
             private final List<ModelStickerPack> enabledStickerPacks;
-            private final List<Sticker> frequentlyUsedStickers;
+            private final List<Long> frequentlyUsedStickerIds;
+            private final Map<Long, Map<Long, Sticker>> guildStickers;
             private final boolean isStickersSelectedTab;
             private final MeUser meUser;
             private final String searchInputStringUpper;
-            private final Long selectedPackId;
+            private final Long selectedCategoryId;
             private final int stickerAnimationSettings;
 
+            /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.Map<java.lang.Long, com.discord.api.sticker.Sticker>> */
+            /* JADX WARN: Multi-variable type inference failed */
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Loaded(List<ModelStickerPack> list, List<Sticker> list2, String str, int i, Long l, MeUser meUser, boolean z2) {
+            public Loaded(LinkedHashMap<Long, Guild> linkedHashMap, Map<Long, ? extends Map<Long, Sticker>> map, List<ModelStickerPack> list, List<Long> list2, String str, int i, Long l, MeUser meUser, boolean z2, Channel channel, long j) {
                 super(null);
+                m.checkNotNullParameter(linkedHashMap, "allGuilds");
+                m.checkNotNullParameter(map, "guildStickers");
                 m.checkNotNullParameter(list, "enabledStickerPacks");
-                m.checkNotNullParameter(list2, "frequentlyUsedStickers");
+                m.checkNotNullParameter(list2, "frequentlyUsedStickerIds");
                 m.checkNotNullParameter(str, "searchInputStringUpper");
                 m.checkNotNullParameter(meUser, "meUser");
+                this.allGuilds = linkedHashMap;
+                this.guildStickers = map;
                 this.enabledStickerPacks = list;
-                this.frequentlyUsedStickers = list2;
+                this.frequentlyUsedStickerIds = list2;
                 this.searchInputStringUpper = str;
                 this.stickerAnimationSettings = i;
-                this.selectedPackId = l;
+                this.selectedCategoryId = l;
                 this.meUser = meUser;
                 this.isStickersSelectedTab = z2;
+                this.currentChannel = channel;
+                this.currentChannelPermissions = j;
             }
 
-            /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: com.discord.widgets.chat.input.sticker.StickerPickerViewModel$StoreState$Loaded */
-            /* JADX WARN: Multi-variable type inference failed */
-            public static /* synthetic */ Loaded copy$default(Loaded loaded, List list, List list2, String str, int i, Long l, MeUser meUser, boolean z2, int i2, Object obj) {
-                if ((i2 & 1) != 0) {
-                    list = loaded.enabledStickerPacks;
-                }
-                if ((i2 & 2) != 0) {
-                    list2 = loaded.frequentlyUsedStickers;
-                }
-                if ((i2 & 4) != 0) {
-                    str = loaded.searchInputStringUpper;
-                }
-                if ((i2 & 8) != 0) {
-                    i = loaded.stickerAnimationSettings;
-                }
-                if ((i2 & 16) != 0) {
-                    l = loaded.selectedPackId;
-                }
-                if ((i2 & 32) != 0) {
-                    meUser = loaded.meUser;
-                }
-                if ((i2 & 64) != 0) {
-                    z2 = loaded.isStickersSelectedTab;
-                }
-                return loaded.copy(list, list2, str, i, l, meUser, z2);
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, LinkedHashMap linkedHashMap, Map map, List list, List list2, String str, int i, Long l, MeUser meUser, boolean z2, Channel channel, long j, int i2, Object obj) {
+                return loaded.copy((i2 & 1) != 0 ? loaded.allGuilds : linkedHashMap, (i2 & 2) != 0 ? loaded.guildStickers : map, (i2 & 4) != 0 ? loaded.enabledStickerPacks : list, (i2 & 8) != 0 ? loaded.frequentlyUsedStickerIds : list2, (i2 & 16) != 0 ? loaded.searchInputStringUpper : str, (i2 & 32) != 0 ? loaded.stickerAnimationSettings : i, (i2 & 64) != 0 ? loaded.selectedCategoryId : l, (i2 & 128) != 0 ? loaded.meUser : meUser, (i2 & 256) != 0 ? loaded.isStickersSelectedTab : z2, (i2 & 512) != 0 ? loaded.currentChannel : channel, (i2 & 1024) != 0 ? loaded.currentChannelPermissions : j);
             }
 
-            public final List<ModelStickerPack> component1() {
+            public final LinkedHashMap<Long, Guild> component1() {
+                return this.allGuilds;
+            }
+
+            public final Channel component10() {
+                return this.currentChannel;
+            }
+
+            public final long component11() {
+                return this.currentChannelPermissions;
+            }
+
+            public final Map<Long, Map<Long, Sticker>> component2() {
+                return this.guildStickers;
+            }
+
+            public final List<ModelStickerPack> component3() {
                 return this.enabledStickerPacks;
             }
 
-            public final List<Sticker> component2() {
-                return this.frequentlyUsedStickers;
+            public final List<Long> component4() {
+                return this.frequentlyUsedStickerIds;
             }
 
-            public final String component3() {
+            public final String component5() {
                 return this.searchInputStringUpper;
             }
 
-            public final int component4() {
+            public final int component6() {
                 return this.stickerAnimationSettings;
             }
 
-            public final Long component5() {
-                return this.selectedPackId;
+            public final Long component7() {
+                return this.selectedCategoryId;
             }
 
-            public final MeUser component6() {
+            public final MeUser component8() {
                 return this.meUser;
             }
 
-            public final boolean component7() {
+            public final boolean component9() {
                 return this.isStickersSelectedTab;
             }
 
-            public final Loaded copy(List<ModelStickerPack> list, List<Sticker> list2, String str, int i, Long l, MeUser meUser, boolean z2) {
+            public final Loaded copy(LinkedHashMap<Long, Guild> linkedHashMap, Map<Long, ? extends Map<Long, Sticker>> map, List<ModelStickerPack> list, List<Long> list2, String str, int i, Long l, MeUser meUser, boolean z2, Channel channel, long j) {
+                m.checkNotNullParameter(linkedHashMap, "allGuilds");
+                m.checkNotNullParameter(map, "guildStickers");
                 m.checkNotNullParameter(list, "enabledStickerPacks");
-                m.checkNotNullParameter(list2, "frequentlyUsedStickers");
+                m.checkNotNullParameter(list2, "frequentlyUsedStickerIds");
                 m.checkNotNullParameter(str, "searchInputStringUpper");
                 m.checkNotNullParameter(meUser, "meUser");
-                return new Loaded(list, list2, str, i, l, meUser, z2);
+                return new Loaded(linkedHashMap, map, list, list2, str, i, l, meUser, z2, channel, j);
             }
 
             public boolean equals(Object obj) {
@@ -303,15 +335,31 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.enabledStickerPacks, loaded.enabledStickerPacks) && m.areEqual(this.frequentlyUsedStickers, loaded.frequentlyUsedStickers) && m.areEqual(this.searchInputStringUpper, loaded.searchInputStringUpper) && this.stickerAnimationSettings == loaded.stickerAnimationSettings && m.areEqual(this.selectedPackId, loaded.selectedPackId) && m.areEqual(this.meUser, loaded.meUser) && this.isStickersSelectedTab == loaded.isStickersSelectedTab;
+                return m.areEqual(this.allGuilds, loaded.allGuilds) && m.areEqual(this.guildStickers, loaded.guildStickers) && m.areEqual(this.enabledStickerPacks, loaded.enabledStickerPacks) && m.areEqual(this.frequentlyUsedStickerIds, loaded.frequentlyUsedStickerIds) && m.areEqual(this.searchInputStringUpper, loaded.searchInputStringUpper) && this.stickerAnimationSettings == loaded.stickerAnimationSettings && m.areEqual(this.selectedCategoryId, loaded.selectedCategoryId) && m.areEqual(this.meUser, loaded.meUser) && this.isStickersSelectedTab == loaded.isStickersSelectedTab && m.areEqual(this.currentChannel, loaded.currentChannel) && this.currentChannelPermissions == loaded.currentChannelPermissions;
+            }
+
+            public final LinkedHashMap<Long, Guild> getAllGuilds() {
+                return this.allGuilds;
+            }
+
+            public final Channel getCurrentChannel() {
+                return this.currentChannel;
+            }
+
+            public final long getCurrentChannelPermissions() {
+                return this.currentChannelPermissions;
             }
 
             public final List<ModelStickerPack> getEnabledStickerPacks() {
                 return this.enabledStickerPacks;
             }
 
-            public final List<Sticker> getFrequentlyUsedStickers() {
-                return this.frequentlyUsedStickers;
+            public final List<Long> getFrequentlyUsedStickerIds() {
+                return this.frequentlyUsedStickerIds;
+            }
+
+            public final Map<Long, Map<Long, Sticker>> getGuildStickers() {
+                return this.guildStickers;
             }
 
             public final MeUser getMeUser() {
@@ -322,8 +370,8 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
                 return this.searchInputStringUpper;
             }
 
-            public final Long getSelectedPackId() {
-                return this.selectedPackId;
+            public final Long getSelectedCategoryId() {
+                return this.selectedCategoryId;
             }
 
             public final int getStickerAnimationSettings() {
@@ -331,28 +379,34 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
             }
 
             public int hashCode() {
-                List<ModelStickerPack> list = this.enabledStickerPacks;
+                LinkedHashMap<Long, Guild> linkedHashMap = this.allGuilds;
                 int i = 0;
-                int hashCode = (list != null ? list.hashCode() : 0) * 31;
-                List<Sticker> list2 = this.frequentlyUsedStickers;
-                int hashCode2 = (hashCode + (list2 != null ? list2.hashCode() : 0)) * 31;
+                int hashCode = (linkedHashMap != null ? linkedHashMap.hashCode() : 0) * 31;
+                Map<Long, Map<Long, Sticker>> map = this.guildStickers;
+                int hashCode2 = (hashCode + (map != null ? map.hashCode() : 0)) * 31;
+                List<ModelStickerPack> list = this.enabledStickerPacks;
+                int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31;
+                List<Long> list2 = this.frequentlyUsedStickerIds;
+                int hashCode4 = (hashCode3 + (list2 != null ? list2.hashCode() : 0)) * 31;
                 String str = this.searchInputStringUpper;
-                int hashCode3 = (((hashCode2 + (str != null ? str.hashCode() : 0)) * 31) + this.stickerAnimationSettings) * 31;
-                Long l = this.selectedPackId;
-                int hashCode4 = (hashCode3 + (l != null ? l.hashCode() : 0)) * 31;
+                int hashCode5 = (((hashCode4 + (str != null ? str.hashCode() : 0)) * 31) + this.stickerAnimationSettings) * 31;
+                Long l = this.selectedCategoryId;
+                int hashCode6 = (hashCode5 + (l != null ? l.hashCode() : 0)) * 31;
                 MeUser meUser = this.meUser;
-                if (meUser != null) {
-                    i = meUser.hashCode();
-                }
-                int i2 = (hashCode4 + i) * 31;
+                int hashCode7 = (hashCode6 + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 boolean z2 = this.isStickersSelectedTab;
                 if (z2) {
                     z2 = true;
                 }
+                int i2 = z2 ? 1 : 0;
                 int i3 = z2 ? 1 : 0;
                 int i4 = z2 ? 1 : 0;
-                int i5 = z2 ? 1 : 0;
-                return i2 + i3;
+                int i5 = (hashCode7 + i2) * 31;
+                Channel channel = this.currentChannel;
+                if (channel != null) {
+                    i = channel.hashCode();
+                }
+                return b.a(this.currentChannelPermissions) + ((i5 + i) * 31);
             }
 
             public final boolean isStickersSelectedTab() {
@@ -360,20 +414,28 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
             }
 
             public String toString() {
-                StringBuilder L = a.L("Loaded(enabledStickerPacks=");
+                StringBuilder L = a.L("Loaded(allGuilds=");
+                L.append(this.allGuilds);
+                L.append(", guildStickers=");
+                L.append(this.guildStickers);
+                L.append(", enabledStickerPacks=");
                 L.append(this.enabledStickerPacks);
-                L.append(", frequentlyUsedStickers=");
-                L.append(this.frequentlyUsedStickers);
+                L.append(", frequentlyUsedStickerIds=");
+                L.append(this.frequentlyUsedStickerIds);
                 L.append(", searchInputStringUpper=");
                 L.append(this.searchInputStringUpper);
                 L.append(", stickerAnimationSettings=");
                 L.append(this.stickerAnimationSettings);
-                L.append(", selectedPackId=");
-                L.append(this.selectedPackId);
+                L.append(", selectedCategoryId=");
+                L.append(this.selectedCategoryId);
                 L.append(", meUser=");
                 L.append(this.meUser);
                 L.append(", isStickersSelectedTab=");
-                return a.G(L, this.isStickersSelectedTab, ")");
+                L.append(this.isStickersSelectedTab);
+                L.append(", currentChannel=");
+                L.append(this.currentChannel);
+                L.append(", currentChannelPermissions=");
+                return a.A(L, this.currentChannelPermissions, ")");
             }
         }
 
@@ -670,19 +732,20 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public StickerPickerViewModel(BehaviorSubject<String> behaviorSubject, BehaviorSubject<Long> behaviorSubject2, Locale locale, MessageManager messageManager, StoreStickers storeStickers, long j, StoreChannels storeChannels, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, Observable<StoreState> observable) {
+    public StickerPickerViewModel(BehaviorSubject<String> behaviorSubject, BehaviorSubject<Long> behaviorSubject2, Locale locale, MessageManager messageManager, StoreStickers storeStickers, long j, StoreChannels storeChannels, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, StoreUser storeUser, Observable<StoreState> observable) {
         super(null);
         m.checkNotNullParameter(behaviorSubject, "searchSubject");
-        m.checkNotNullParameter(behaviorSubject2, "selectedPackIdSubject");
+        m.checkNotNullParameter(behaviorSubject2, "selectedCategoryIdSubject");
         m.checkNotNullParameter(locale, "locale");
         m.checkNotNullParameter(messageManager, "messageManager");
         m.checkNotNullParameter(storeStickers, "stickersStore");
         m.checkNotNullParameter(storeChannels, "channelStore");
         m.checkNotNullParameter(storeChannelsSelected, "channelSelectedStore");
         m.checkNotNullParameter(storePermissions, "permissionStore");
+        m.checkNotNullParameter(storeUser, "userStore");
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.searchSubject = behaviorSubject;
-        this.selectedPackIdSubject = behaviorSubject2;
+        this.selectedCategoryIdSubject = behaviorSubject2;
         this.locale = locale;
         this.messageManager = messageManager;
         this.stickersStore = storeStickers;
@@ -690,29 +753,30 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         this.channelStore = storeChannels;
         this.channelSelectedStore = storeChannelsSelected;
         this.permissionStore = storePermissions;
-        PublishSubject<Event> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.eventSubject = l0;
+        this.userStore = storeUser;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         this.stickerCountToDisplayForStore = 4;
         storeStickers.fetchEnabledStickerDirectory();
-        Observable s2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).s();
-        m.checkNotNullExpressionValue(s2, "storeStateObservable\n   …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).r();
+        m.checkNotNullExpressionValue(r, "storeStateObservable\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
-    public /* synthetic */ StickerPickerViewModel(BehaviorSubject behaviorSubject, BehaviorSubject behaviorSubject2, Locale locale, MessageManager messageManager, StoreStickers storeStickers, long j, StoreChannels storeChannels, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(r1, r2, locale, messageManager, (i & 16) != 0 ? StoreStream.Companion.getStickers() : storeStickers, j, (i & 64) != 0 ? StoreStream.Companion.getChannels() : storeChannels, (i & 128) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 256) != 0 ? StoreStream.Companion.getPermissions() : storePermissions, (i & 512) != 0 ? Companion.observeStoreState$default(Companion, r1, r2, null, null, null, null, 60, null) : observable);
+    public /* synthetic */ StickerPickerViewModel(BehaviorSubject behaviorSubject, BehaviorSubject behaviorSubject2, Locale locale, MessageManager messageManager, StoreStickers storeStickers, long j, StoreChannels storeChannels, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, StoreUser storeUser, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(r1, r2, locale, messageManager, (i & 16) != 0 ? StoreStream.Companion.getStickers() : storeStickers, j, (i & 64) != 0 ? StoreStream.Companion.getChannels() : storeChannels, (i & 128) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 256) != 0 ? StoreStream.Companion.getPermissions() : storePermissions, (i & 512) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 1024) != 0 ? Companion.observeStoreState$default(Companion, r1, r2, null, null, null, null, null, null, null, null, 1020, null) : observable);
         BehaviorSubject behaviorSubject3;
         BehaviorSubject behaviorSubject4;
         if ((i & 1) != 0) {
-            behaviorSubject3 = BehaviorSubject.m0("");
+            behaviorSubject3 = BehaviorSubject.l0("");
             m.checkNotNullExpressionValue(behaviorSubject3, "BehaviorSubject.create(\"\")");
         } else {
             behaviorSubject3 = behaviorSubject;
         }
         if ((i & 2) != 0) {
-            behaviorSubject4 = BehaviorSubject.m0(null);
+            behaviorSubject4 = BehaviorSubject.l0(null);
             m.checkNotNullExpressionValue(behaviorSubject4, "BehaviorSubject.create(null as Long?)");
         } else {
             behaviorSubject4 = behaviorSubject2;
@@ -723,14 +787,21 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         stickerPickerViewModel.handleStoreState(storeState);
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:30:0x00a1  */
-    private final List<StickerCategoryItem> createEnabledCategoryItems(StoreState.Loaded loaded, List<? extends MGRecyclerDataPayload> list) {
+    /* JADX WARNING: Removed duplicated region for block: B:34:0x00b1  */
+    /* JADX WARNING: Removed duplicated region for block: B:37:0x00c0  */
+    /* JADX WARNING: Removed duplicated region for block: B:90:0x00d0 A[SYNTHETIC] */
+    /* JADX WARNING: Removed duplicated region for block: B:95:0x0069 A[SYNTHETIC] */
+    private final List<StickerCategoryItem> createEnabledCategoryItems(StoreState.Loaded loaded, List<? extends MGRecyclerDataPayload> list, List<Sticker> list2) {
+        int i;
+        Collection<Sticker> values;
+        List list3;
         boolean z2;
         boolean z3;
         ArrayList arrayList = new ArrayList();
-        Long selectedPackId = loaded.getSelectedPackId();
+        Long selectedCategoryId = loaded.getSelectedCategoryId();
         LinkedHashSet linkedHashSet = new LinkedHashSet();
-        if (loaded.getMeUser().getPremiumTier() != PremiumTier.TIER_2 || loaded.getEnabledStickerPacks().isEmpty()) {
+        LinkedHashSet linkedHashSet2 = new LinkedHashSet();
+        if ((loaded.getMeUser().getPremiumTier() != PremiumTier.TIER_2 && loaded.getGuildStickers().isEmpty()) || loaded.getEnabledStickerPacks().isEmpty()) {
             return n.emptyList();
         }
         if (list == null) {
@@ -742,9 +813,8 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
             for (MGRecyclerDataPayload mGRecyclerDataPayload : list) {
                 if (mGRecyclerDataPayload instanceof StickerItem) {
                     Sticker sticker = ((StickerItem) mGRecyclerDataPayload).getSticker();
-                    List<Sticker> frequentlyUsedStickers = loaded.getFrequentlyUsedStickers();
-                    if (!(frequentlyUsedStickers instanceof Collection) || !frequentlyUsedStickers.isEmpty()) {
-                        Iterator<T> it = frequentlyUsedStickers.iterator();
+                    if (!(list2 instanceof Collection) || !list2.isEmpty()) {
+                        Iterator<T> it = list2.iterator();
                         while (true) {
                             if (!it.hasNext()) {
                                 break;
@@ -764,45 +834,95 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
                         if (z2) {
                             linkedHashSet.add(-1L);
                         }
-                        Long h = sticker.h();
-                        m.checkNotNull(h);
-                        linkedHashSet.add(h);
+                        if (sticker.i() != null) {
+                            Long i2 = sticker.i();
+                            Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlin.Long");
+                            linkedHashSet.add(i2);
+                        }
+                        if (sticker.g() == null) {
+                            Long g = sticker.g();
+                            Objects.requireNonNull(g, "null cannot be cast to non-null type kotlin.Long");
+                            linkedHashSet2.add(g);
+                        }
                     }
                     z2 = false;
                     if (z2) {
                     }
-                    Long h = sticker.h();
-                    m.checkNotNull(h);
-                    linkedHashSet.add(h);
+                    if (sticker.i() != null) {
+                    }
+                    if (sticker.g() == null) {
+                    }
                 }
             }
         }
-        int size = (loaded.getFrequentlyUsedStickers().isEmpty() ? 0 : loaded.getFrequentlyUsedStickers().size() + 1) + 0;
-        if ((!loaded.getFrequentlyUsedStickers().isEmpty()) && linkedHashSet.contains(-1L)) {
-            arrayList.add(new StickerCategoryItem.RecentItem(selectedPackId != null && selectedPackId.longValue() == -1, new Pair(0, Integer.valueOf(size))));
-        }
-        for (ModelStickerPack modelStickerPack2 : loaded.getEnabledStickerPacks()) {
-            boolean z4 = selectedPackId != null && selectedPackId.longValue() == modelStickerPack2.getId();
-            int size2 = modelStickerPack2.getStickers().size() + 1 + size;
-            if (linkedHashSet.contains(Long.valueOf(modelStickerPack2.getId()))) {
-                arrayList.add(new StickerCategoryItem.PackItem(modelStickerPack2, new Pair(Integer.valueOf(size), Integer.valueOf(size2)), z4));
+        if (!list2.isEmpty()) {
+            i = list2.size() + 1 + 0;
+            if (linkedHashSet.contains(-1L)) {
+                arrayList.add(new StickerCategoryItem.RecentItem(selectedCategoryId != null && selectedCategoryId.longValue() == -1, new Pair(0, Integer.valueOf(i))));
+            }
+        } else {
+            i = 0;
+        }
+        for (Map.Entry<Long, Guild> entry : loaded.getAllGuilds().entrySet()) {
+            long longValue = entry.getKey().longValue();
+            Guild value = entry.getValue();
+            Map<Long, Sticker> map = loaded.getGuildStickers().get(Long.valueOf(longValue));
+            if (!(map == null || (values = map.values()) == null || (list3 = u.toList(values)) == null)) {
+                boolean z4 = selectedCategoryId != null && selectedCategoryId.longValue() == value.getId();
+                int size = list3.size() + 1 + i;
+                if (linkedHashSet2.contains(Long.valueOf(longValue))) {
+                    arrayList.add(new StickerCategoryItem.GuildItem(value, list3, new Pair(Integer.valueOf(i), Integer.valueOf(size)), z4));
+                }
+                i = size;
+            }
+        }
+        if (loaded.getMeUser().getPremiumTier() == PremiumTier.TIER_2) {
+            for (ModelStickerPack modelStickerPack2 : loaded.getEnabledStickerPacks()) {
+                boolean z5 = selectedCategoryId != null && selectedCategoryId.longValue() == modelStickerPack2.getId();
+                int size2 = modelStickerPack2.getStickers().size() + 1 + i;
+                if (linkedHashSet.contains(Long.valueOf(modelStickerPack2.getId()))) {
+                    arrayList.add(new StickerCategoryItem.PackItem(modelStickerPack2, new Pair(Integer.valueOf(i), Integer.valueOf(size2)), z5));
+                }
+                i = size2;
             }
-            size = size2;
         }
         return arrayList;
     }
 
+    private final Map<Long, Sticker> getAllStickersById(StoreState.Loaded loaded) {
+        LinkedHashMap linkedHashMap = new LinkedHashMap();
+        for (ModelStickerPack modelStickerPack : loaded.getEnabledStickerPacks()) {
+            for (Sticker sticker : modelStickerPack.getStickers()) {
+                linkedHashMap.put(Long.valueOf(sticker.getId()), sticker);
+            }
+        }
+        Iterator<T> it = loaded.getGuildStickers().values().iterator();
+        while (it.hasNext()) {
+            for (Sticker sticker2 : ((Map) it.next()).values()) {
+                linkedHashMap.put(Long.valueOf(sticker2.getId()), sticker2);
+            }
+        }
+        return h0.toMap(linkedHashMap);
+    }
+
     @MainThread
     private final void handleStoreState(StoreState storeState) {
         if (storeState instanceof StoreState.Loaded) {
             StoreState.Loaded loaded = (StoreState.Loaded) storeState;
-            Long valueOf = loaded.getSelectedPackId() == null ? Long.valueOf(this.initialStickerPackId) : null;
+            Long valueOf = loaded.getSelectedCategoryId() == null ? Long.valueOf(this.initialStickerPackId) : null;
             handleStoreStateForEnabledPage(loaded);
             scrollToPackId(valueOf);
         }
     }
 
+    /* JADX WARNING: Removed duplicated region for block: B:24:0x00e7  */
+    /* JADX WARNING: Removed duplicated region for block: B:35:0x0151  */
+    /* JADX WARNING: Removed duplicated region for block: B:46:0x0203  */
     private final void handleStoreStateForEnabledPage(StoreState.Loaded loaded) {
+        List<StickerCategoryItem> createEnabledCategoryItems;
+        Collection<Sticker> values;
+        List list;
+        Map<Long, Sticker> allStickersById = getAllStickersById(loaded);
         List<ModelStickerPack> enabledStickerPacks = loaded.getEnabledStickerPacks();
         int stickerAnimationSettings = loaded.getStickerAnimationSettings();
         String searchInputStringUpper = loaded.getSearchInputStringUpper();
@@ -810,49 +930,82 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         Objects.requireNonNull(searchInputStringUpper, "null cannot be cast to non-null type java.lang.String");
         String lowerCase = searchInputStringUpper.toLowerCase(locale);
         m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
-        List<Sticker> frequentlyUsedStickers = loaded.getFrequentlyUsedStickers();
+        List<Long> frequentlyUsedStickerIds = loaded.getFrequentlyUsedStickerIds();
         ArrayList arrayList = new ArrayList();
+        for (Number number : frequentlyUsedStickerIds) {
+            Sticker sticker = allStickersById.get(Long.valueOf(number.longValue()));
+            if (sticker != null) {
+                arrayList.add(sticker);
+            }
+        }
+        ArrayList arrayList2 = new ArrayList();
         boolean z2 = true;
-        if (!frequentlyUsedStickers.isEmpty()) {
-            for (Sticker sticker : frequentlyUsedStickers) {
-                String g = sticker.g();
+        int i = 2;
+        boolean z3 = false;
+        if (!arrayList.isEmpty()) {
+            for (Sticker sticker2 : arrayList) {
+                String h = sticker2.h();
                 Locale locale2 = this.locale;
-                Objects.requireNonNull(g, "null cannot be cast to non-null type java.lang.String");
-                String lowerCase2 = g.toLowerCase(locale2);
+                Objects.requireNonNull(h, "null cannot be cast to non-null type java.lang.String");
+                String lowerCase2 = h.toLowerCase(locale2);
                 m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)");
-                if (!w.contains$default((CharSequence) lowerCase2, (CharSequence) lowerCase, false, 2, (Object) null)) {
-                    String i = sticker.i();
+                if (!w.contains$default(lowerCase2, lowerCase, z3, i, (Object) null)) {
+                    String j = sticker2.j();
                     Locale locale3 = this.locale;
-                    Objects.requireNonNull(i, "null cannot be cast to non-null type java.lang.String");
-                    String lowerCase3 = i.toLowerCase(locale3);
+                    Objects.requireNonNull(j, "null cannot be cast to non-null type java.lang.String");
+                    String lowerCase3 = j.toLowerCase(locale3);
                     m.checkNotNullExpressionValue(lowerCase3, "(this as java.lang.String).toLowerCase(locale)");
-                    if (w.contains$default((CharSequence) lowerCase3, (CharSequence) lowerCase, false, 2, (Object) null)) {
+                    if (!w.contains$default(lowerCase3, lowerCase, z3, i, (Object) null)) {
+                        i = 2;
+                        z3 = false;
                     }
                 }
-                arrayList.add(new StickerItem(sticker, stickerAnimationSettings, StickerItem.Mode.OWNED));
+                arrayList2.add(new StickerItem(sticker2, stickerAnimationSettings, StickerItem.Mode.OWNED, StickerUtils.INSTANCE.getStickerSendability(sticker2, loaded.getMeUser(), loaded.getCurrentChannel(), Long.valueOf(loaded.getCurrentChannelPermissions()))));
+                i = 2;
+                z3 = false;
             }
-            if (!arrayList.isEmpty()) {
-                arrayList.add(0, new HeaderItem(HeaderType.Recent.INSTANCE));
-            }
-        }
-        for (ModelStickerPack modelStickerPack : enabledStickerPacks) {
-            arrayList.addAll(Companion.access$buildStickerListItems(Companion, modelStickerPack, lowerCase, stickerAnimationSettings, this.locale));
-        }
-        List<StickerCategoryItem> createEnabledCategoryItems = createEnabledCategoryItems(loaded, arrayList);
-        if (loaded.getMeUser().getPremiumTier() != PremiumTier.TIER_2) {
-            updateViewState(new ViewState.Phase1RolloutNotPremium(n.listOfNotNull((Object[]) new Sticker[]{this.stickersStore.getStickers().get(781323769960202280L), this.stickersStore.getStickers().get(809209266556764241L), this.stickersStore.getStickers().get(818597810047680532L), this.stickersStore.getStickers().get(819129296374595614L)})));
-            return;
-        }
-        if (arrayList.isEmpty()) {
-            if (lowerCase.length() <= 0) {
-                z2 = false;
-            }
-            if (z2) {
-                updateViewState(new ViewState.EmptySearchResults(loaded.getSearchInputStringUpper(), createEnabledCategoryItems));
+            if (!arrayList2.isEmpty()) {
+                arrayList2.add(0, new HeaderItem(HeaderType.Recent.INSTANCE));
+                for (Map.Entry<Long, Guild> entry : loaded.getAllGuilds().entrySet()) {
+                    long longValue = entry.getKey().longValue();
+                    Guild value = entry.getValue();
+                    Map<Long, Sticker> map = loaded.getGuildStickers().get(Long.valueOf(longValue));
+                    if (map != null && (values = map.values()) != null && (list = u.toList(values)) != null) {
+                        arrayList2.addAll(Companion.access$buildGuildStickersListItems(Companion, list, value, stickerAnimationSettings, lowerCase, loaded.getMeUser(), this.locale, loaded.getCurrentChannel(), loaded.getCurrentChannelPermissions()));
+                    }
+                }
+                if (loaded.getMeUser().getPremiumTier() == PremiumTier.TIER_2) {
+                    for (ModelStickerPack modelStickerPack : enabledStickerPacks) {
+                        arrayList2.addAll(Companion.access$buildStickerListItems(Companion, modelStickerPack, lowerCase, stickerAnimationSettings, this.locale, loaded.getMeUser()));
+                    }
+                }
+                createEnabledCategoryItems = createEnabledCategoryItems(loaded, arrayList2, arrayList);
+                if (loaded.getMeUser().getPremiumTier() != PremiumTier.TIER_2 || !loaded.getGuildStickers().isEmpty()) {
+                    if (arrayList2.isEmpty()) {
+                        if (lowerCase.length() <= 0) {
+                            z2 = false;
+                        }
+                        if (z2) {
+                            updateViewState(new ViewState.EmptySearchResults(loaded.getSearchInputStringUpper(), createEnabledCategoryItems));
+                            return;
+                        }
+                    }
+                    updateViewState(new ViewState.Stickers(loaded.getSearchInputStringUpper(), arrayList2, createEnabledCategoryItems, loaded.isStickersSelectedTab()));
+                }
+                updateViewState(new ViewState.Phase1RolloutNotPremium(n.listOfNotNull((Object[]) new Sticker[]{this.stickersStore.getStickers().get(781323769960202280L), this.stickersStore.getStickers().get(809209266556764241L), this.stickersStore.getStickers().get(818597810047680532L), this.stickersStore.getStickers().get(819129296374595614L)})));
                 return;
             }
         }
-        updateViewState(new ViewState.Stickers(loaded.getSearchInputStringUpper(), arrayList, createEnabledCategoryItems, loaded.isStickersSelectedTab()));
+        while (r18.hasNext()) {
+        }
+        if (loaded.getMeUser().getPremiumTier() == PremiumTier.TIER_2) {
+        }
+        createEnabledCategoryItems = createEnabledCategoryItems(loaded, arrayList2, arrayList);
+        if (loaded.getMeUser().getPremiumTier() != PremiumTier.TIER_2) {
+        }
+        if (arrayList2.isEmpty()) {
+        }
+        updateViewState(new ViewState.Stickers(loaded.getSearchInputStringUpper(), arrayList2, createEnabledCategoryItems, loaded.isStickersSelectedTab()));
     }
 
     public final Observable<Event> observeEvents() {
@@ -864,7 +1017,10 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         Channel findChannelByIdInternal$app_productionGoogleRelease;
         m.checkNotNullParameter(sticker, "sticker");
         if ((getViewState() instanceof ViewState.Stickers) && (findChannelByIdInternal$app_productionGoogleRelease = this.channelStore.findChannelByIdInternal$app_productionGoogleRelease((id2 = this.channelSelectedStore.getId()))) != null) {
-            if (PermissionUtils.INSTANCE.hasAccessWrite(findChannelByIdInternal$app_productionGoogleRelease, this.permissionStore.getPermissionsByChannel().get(Long.valueOf(id2)))) {
+            Long l = this.permissionStore.getPermissionsByChannel().get(Long.valueOf(id2));
+            boolean hasAccessWrite = PermissionUtils.INSTANCE.hasAccessWrite(findChannelByIdInternal$app_productionGoogleRelease, l);
+            StickerUtils.StickerSendability stickerSendability = StickerUtils.INSTANCE.getStickerSendability(sticker, this.userStore.getMe(), findChannelByIdInternal$app_productionGoogleRelease, l);
+            if (hasAccessWrite && stickerSendability == StickerUtils.StickerSendability.SENDABLE) {
                 this.stickersStore.onStickerUsed(sticker);
                 MessageManager.sendMessage$default(this.messageManager, null, null, null, null, d0.t.m.listOf(sticker), false, null, null, null, 495, null);
                 this.searchSubject.onNext("");
@@ -907,8 +1063,8 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
         this.searchSubject.onNext(str);
     }
 
-    public final void setSelectedPackId(long j) {
-        this.selectedPackIdSubject.onNext(Long.valueOf(j));
+    public final void setSelectedCategoryId(long j) {
+        this.selectedCategoryIdSubject.onNext(Long.valueOf(j));
     }
 
     public final void setStickerCountToDisplayForStore(int i) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java
index eb6e392d59..27ffafbdf0 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java
@@ -9,6 +9,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.app.AppComponent;
 import com.discord.databinding.StickerPickerStickerItemBinding;
 import com.discord.rlottie.RLottieImageView;
+import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -39,14 +40,14 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetStickerA
         this.recyclerScrollingWithinThresholdSubject = behaviorSubject;
         this.appComponent = appComponent;
         View view = this.itemView;
-        StickerView stickerView = (StickerView) view.findViewById(2131365091);
+        StickerView stickerView = (StickerView) view.findViewById(2131365146);
         if (stickerView != null) {
             StickerPickerStickerItemBinding stickerPickerStickerItemBinding = new StickerPickerStickerItemBinding((FrameLayout) view, stickerView);
             m.checkNotNullExpressionValue(stickerPickerStickerItemBinding, "StickerPickerStickerItemBinding.bind(itemView)");
             this.binding = stickerPickerStickerItemBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365091)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365146)));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -79,6 +80,11 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetStickerA
         StickerItem stickerItem = (StickerItem) (!(mGRecyclerDataPayload instanceof StickerItem) ? null : mGRecyclerDataPayload);
         if (stickerItem != null && (sticker = stickerItem.getSticker()) != null) {
             this.binding.b.c(sticker, 0);
+            if (((StickerItem) mGRecyclerDataPayload).getSendability() != StickerUtils.StickerSendability.SENDABLE) {
+                StickerView stickerView = this.binding.b;
+                m.checkNotNullExpressionValue(stickerView, "binding.stickerPickerSticker");
+                stickerView.setAlpha(0.25f);
+            }
             this.binding.b.setOnClickListener(new StickerViewHolder$configureSticker$1(this, mGRecyclerDataPayload));
         }
     }
@@ -89,7 +95,7 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetStickerA
         if (job != null) {
             a.k(job, null, 1, null);
         }
-        stickerView.i.f99c.clearAnimation();
+        stickerView.i.f104c.clearAnimation();
         Subscription subscription = this.scrollingSpeedSubscription;
         if (subscription != null) {
             subscription.unsubscribe();
@@ -119,7 +125,7 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetStickerA
         super.onConfigure(i, (int) mGRecyclerDataPayload);
         if (this.recyclerScrollingWithinThresholdSubject != null) {
             StickerView stickerView = this.binding.b;
-            RLottieImageView rLottieImageView = stickerView.i.f99c;
+            RLottieImageView rLottieImageView = stickerView.i.f104c;
             m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie");
             rLottieImageView.setVisibility(8);
             SimpleDraweeView simpleDraweeView = stickerView.i.b;
@@ -129,9 +135,9 @@ public final class StickerViewHolder extends MGRecyclerViewHolder<WidgetStickerA
             ImageView imageView = stickerView.i.d;
             m.checkNotNullExpressionValue(imageView, "binding.stickerViewPlaceholder");
             imageView.setVisibility(0);
-            Observable<Boolean> s2 = this.recyclerScrollingWithinThresholdSubject.s();
-            m.checkNotNullExpressionValue(s2, "recyclerScrollingWithinT…  .distinctUntilChanged()");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this.appComponent, null, 2, null), StickerViewHolder.class, (Context) null, new StickerViewHolder$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new StickerViewHolder$onConfigure$1(this, mGRecyclerDataPayload), 58, (Object) null);
+            Observable<Boolean> r = this.recyclerScrollingWithinThresholdSubject.r();
+            m.checkNotNullExpressionValue(r, "recyclerScrollingWithinT…  .distinctUntilChanged()");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this.appComponent, null, 2, null), StickerViewHolder.class, (Context) null, new StickerViewHolder$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new StickerViewHolder$onConfigure$1(this, mGRecyclerDataPayload), 58, (Object) null);
             return;
         }
         configureSticker(mGRecyclerDataPayload);
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java
index b2980154f7..95aab416d4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java
@@ -23,26 +23,26 @@ public final class StoreHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
         super(2131558672, widgetStickerAdapter);
         m.checkNotNullParameter(widgetStickerAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131365102;
-        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365102);
+        int i = 2131365157;
+        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365157);
         if (frameLayout != null) {
-            i = 2131365103;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365103);
+            i = 2131365158;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365158);
             if (relativeLayout != null) {
-                i = 2131365104;
-                TextView textView = (TextView) view.findViewById(2131365104);
+                i = 2131365159;
+                TextView textView = (TextView) view.findViewById(2131365159);
                 if (textView != null) {
-                    i = 2131365105;
-                    Chip chip = (Chip) view.findViewById(2131365105);
+                    i = 2131365160;
+                    Chip chip = (Chip) view.findViewById(2131365160);
                     if (chip != null) {
-                        i = 2131365106;
-                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365106);
+                        i = 2131365161;
+                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365161);
                         if (frameLayout2 != null) {
-                            i = 2131365107;
-                            TextView textView2 = (TextView) view.findViewById(2131365107);
+                            i = 2131365162;
+                            TextView textView2 = (TextView) view.findViewById(2131365162);
                             if (textView2 != null) {
-                                i = 2131365108;
-                                TextView textView3 = (TextView) view.findViewById(2131365108);
+                                i = 2131365163;
+                                TextView textView3 = (TextView) view.findViewById(2131365163);
                                 if (textView3 != null) {
                                     StickerStoreHeaderItemBinding stickerStoreHeaderItemBinding = new StickerStoreHeaderItemBinding((LinearLayout) view, frameLayout, relativeLayout, textView, chip, frameLayout2, textView2, textView3);
                                     m.checkNotNullExpressionValue(stickerStoreHeaderItemBinding, "StickerStoreHeaderItemBinding.bind(itemView)");
@@ -84,7 +84,7 @@ public final class StoreHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
             StoreHeaderItem storeHeaderItem = (StoreHeaderItem) mGRecyclerDataPayload;
             textView.setText(storeHeaderItem.getPack().getName());
             int i2 = 0;
-            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755334, storeHeaderItem.getPack().getStickers().size(), Integer.valueOf(storeHeaderItem.getPack().getStickers().size()));
+            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755335, storeHeaderItem.getPack().getStickers().size(), Integer.valueOf(storeHeaderItem.getPack().getStickers().size()));
             TextView textView2 = this.binding.f;
             m.checkNotNullExpressionValue(textView2, "binding.stickerStoreHeaderItemSubtitle");
             textView2.setText(i18nPluralString);
@@ -107,7 +107,7 @@ public final class StoreHeaderViewHolder extends MGRecyclerViewHolder<WidgetStic
                 textView4.setVisibility(8);
             }
             if (storeHeaderItem.getPack().isAnimatedPack() || storeHeaderItem.getPack().isPremiumPack() || storeHeaderItem.getPack().isLimitedPack()) {
-                this.binding.f1632c.setOnClickListener(new StoreHeaderViewHolder$onConfigure$1(this, mGRecyclerDataPayload));
+                this.binding.f1629c.setOnClickListener(new StoreHeaderViewHolder$onConfigure$1(this, mGRecyclerDataPayload));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java
index e52ccce7a9..a3238efadd 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$binding$2.java
@@ -20,18 +20,18 @@ public final /* synthetic */ class WidgetStickerPackStoreSheet$binding$2 extends
 
     public final WidgetStickerPackStoreSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365083;
-        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365083);
+        int i = 2131365138;
+        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365138);
         if (frameLayout != null) {
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            i = 2131365085;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365085);
+            i = 2131365140;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365140);
             if (recyclerView != null) {
-                i = 2131365086;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365086);
+                i = 2131365141;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365141);
                 if (simpleDraweeView != null) {
-                    i = 2131365101;
-                    LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365101);
+                    i = 2131365156;
+                    LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365156);
                     if (loadingButton != null) {
                         return new WidgetStickerPackStoreSheetBinding(relativeLayout, frameLayout, relativeLayout, recyclerView, simpleDraweeView, loadingButton);
                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$viewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$viewModel$2.java
index f0940d2c9e..828dcccd3a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$viewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet$viewModel$2.java
@@ -40,8 +40,8 @@ public final class WidgetStickerPackStoreSheet$viewModel$2 extends o implements
         }
         Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.widgets.stickers.StickerPurchaseLocation");
         StickerPackStoreSheetAnalytics stickerPackStoreSheetAnalytics = new StickerPackStoreSheetAnalytics(sticker, stickerPackStoreSheetViewType, string, ((StickerPurchaseLocation) serializable).getAnalyticsValue());
-        Long h = sticker.h();
-        m.checkNotNull(h);
-        return new StickerPackStoreSheetViewModel(h.longValue(), null, stickerPackStoreSheetAnalytics, null, 10, null);
+        Long i = sticker.i();
+        m.checkNotNull(i);
+        return new StickerPackStoreSheetViewModel(i.longValue(), null, stickerPackStoreSheetAnalytics, null, 10, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
index af380313c9..f695627a8a 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPackStoreSheet.java
@@ -64,7 +64,7 @@ public final class WidgetStickerPackStoreSheet extends AppBottomSheet {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(sticker, "sticker");
             m.checkNotNullParameter(stickerPackStoreSheetViewType, "viewType");
-            if (sticker.j() == StickerType.STANDARD) {
+            if (sticker.k() == StickerType.STANDARD) {
                 WidgetStickerPackStoreSheet widgetStickerPackStoreSheet = new WidgetStickerPackStoreSheet();
                 Bundle bundle = new Bundle();
                 bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", sticker);
@@ -174,7 +174,7 @@ public final class WidgetStickerPackStoreSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559238;
+        return 2131559246;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -190,7 +190,7 @@ public final class WidgetStickerPackStoreSheet extends AppBottomSheet {
         RelativeLayout relativeLayout = getBinding().b;
         m.checkNotNullExpressionValue(relativeLayout, "binding.stickerPackStoreSheetContainer");
         relativeLayout.setPadding(relativeLayout.getPaddingLeft(), relativeLayout.getPaddingTop(), relativeLayout.getPaddingRight(), getAdditionalBottomPaddingPx());
-        RecyclerView recyclerView = getBinding().f1963c;
+        RecyclerView recyclerView = getBinding().f1966c;
         m.checkNotNullExpressionValue(recyclerView, "binding.stickerPackStoreSheetRecycler");
         this.adapter = new WidgetStickerAdapter(recyclerView, new WidgetStickerPackStoreSheet$onViewCreated$1(this), new WidgetStickerPackStoreSheet$onViewCreated$2(this), null, this, true, 8, null);
         getViewModel().fetchStickersData();
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java
index 2d5fe7e17b..f8ee9d08f2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$binding$2.java
@@ -28,69 +28,69 @@ public final /* synthetic */ class WidgetStickerPicker$binding$2 extends k imple
 
     public final WidgetStickerPickerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362476;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362476);
+        int i = 2131362491;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362491);
         if (linearLayout != null) {
-            i = 2131362477;
-            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362477);
+            i = 2131362492;
+            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362492);
             if (linearLayout2 != null) {
-                i = 2131362478;
-                ImageView imageView = (ImageView) view.findViewById(2131362478);
+                i = 2131362493;
+                ImageView imageView = (ImageView) view.findViewById(2131362493);
                 if (imageView != null) {
-                    i = 2131362479;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362479);
+                    i = 2131362494;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362494);
                     if (linkifiedTextView != null) {
-                        i = 2131362480;
-                        StickerView stickerView = (StickerView) view.findViewById(2131362480);
+                        i = 2131362495;
+                        StickerView stickerView = (StickerView) view.findViewById(2131362495);
                         if (stickerView != null) {
-                            i = 2131362481;
-                            StickerView stickerView2 = (StickerView) view.findViewById(2131362481);
+                            i = 2131362496;
+                            StickerView stickerView2 = (StickerView) view.findViewById(2131362496);
                             if (stickerView2 != null) {
-                                i = 2131362482;
-                                StickerView stickerView3 = (StickerView) view.findViewById(2131362482);
+                                i = 2131362497;
+                                StickerView stickerView3 = (StickerView) view.findViewById(2131362497);
                                 if (stickerView3 != null) {
-                                    i = 2131362483;
-                                    StickerView stickerView4 = (StickerView) view.findViewById(2131362483);
+                                    i = 2131362498;
+                                    StickerView stickerView4 = (StickerView) view.findViewById(2131362498);
                                     if (stickerView4 != null) {
-                                        i = 2131362484;
-                                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362484);
+                                        i = 2131362499;
+                                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362499);
                                         if (loadingButton != null) {
-                                            i = 2131362485;
-                                            TextView textView = (TextView) view.findViewById(2131362485);
+                                            i = 2131362500;
+                                            TextView textView = (TextView) view.findViewById(2131362500);
                                             if (textView != null) {
-                                                i = 2131362486;
-                                                TextView textView2 = (TextView) view.findViewById(2131362486);
+                                                i = 2131362501;
+                                                TextView textView2 = (TextView) view.findViewById(2131362501);
                                                 if (textView2 != null) {
-                                                    i = 2131362487;
-                                                    TextView textView3 = (TextView) view.findViewById(2131362487);
+                                                    i = 2131362502;
+                                                    TextView textView3 = (TextView) view.findViewById(2131362502);
                                                     if (textView3 != null) {
-                                                        i = 2131362488;
-                                                        TextView textView4 = (TextView) view.findViewById(2131362488);
+                                                        i = 2131362503;
+                                                        TextView textView4 = (TextView) view.findViewById(2131362503);
                                                         if (textView4 != null) {
-                                                            i = 2131362489;
-                                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362489);
+                                                            i = 2131362504;
+                                                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362504);
                                                             if (recyclerView != null) {
-                                                                i = 2131362490;
-                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362490);
+                                                                i = 2131362505;
+                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362505);
                                                                 if (appViewFlipper != null) {
-                                                                    i = 2131365071;
-                                                                    AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365071);
+                                                                    i = 2131365125;
+                                                                    AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365125);
                                                                     if (appBarLayout != null) {
-                                                                        i = 2131365087;
-                                                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365087);
+                                                                        i = 2131365142;
+                                                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365142);
                                                                         if (constraintLayout != null) {
-                                                                            i = 2131365088;
-                                                                            View findViewById = view.findViewById(2131365088);
+                                                                            i = 2131365143;
+                                                                            View findViewById = view.findViewById(2131365143);
                                                                             if (findViewById != null) {
-                                                                                i = 2131365089;
-                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131365089);
+                                                                                i = 2131365144;
+                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131365144);
                                                                                 if (recyclerView2 != null) {
                                                                                     CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
-                                                                                    i = 2131365092;
-                                                                                    SearchInputView searchInputView = (SearchInputView) view.findViewById(2131365092);
+                                                                                    i = 2131365147;
+                                                                                    SearchInputView searchInputView = (SearchInputView) view.findViewById(2131365147);
                                                                                     if (searchInputView != null) {
-                                                                                        i = 2131365109;
-                                                                                        Toolbar toolbar = (Toolbar) view.findViewById(2131365109);
+                                                                                        i = 2131365164;
+                                                                                        Toolbar toolbar = (Toolbar) view.findViewById(2131365164);
                                                                                         if (toolbar != null) {
                                                                                             return new WidgetStickerPickerBinding(coordinatorLayout, linearLayout, linearLayout2, imageView, linkifiedTextView, stickerView, stickerView2, stickerView3, stickerView4, loadingButton, textView, textView2, textView3, textView4, recyclerView, appViewFlipper, appBarLayout, constraintLayout, findViewById, recyclerView2, coordinatorLayout, searchInputView, toolbar);
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onGuildClicked$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onGuildClicked$1.java
new file mode 100644
index 0000000000..fcc022b5c1
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$onGuildClicked$1.java
@@ -0,0 +1,30 @@
+package com.discord.widgets.chat.input.sticker;
+
+import d0.z.d.o;
+import kotlin.Pair;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetStickerPicker.kt */
+public final class WidgetStickerPicker$onGuildClicked$1 extends o implements Function1<Unit, Unit> {
+    public final /* synthetic */ Pair $categoryRange;
+    public final /* synthetic */ WidgetStickerPicker this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetStickerPicker$onGuildClicked$1(WidgetStickerPicker widgetStickerPicker, Pair pair) {
+        super(1);
+        this.this$0 = widgetStickerPicker;
+        this.$categoryRange = pair;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Unit unit) {
+        invoke(unit);
+        return Unit.a;
+    }
+
+    public final void invoke(Unit unit) {
+        WidgetStickerPicker.access$getStickerAdapter$p(this.this$0).scrollToPosition(((Number) this.$categoryRange.getFirst()).intValue());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$1.java
index 803ee9dd57..4e2193b94f 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$1.java
@@ -6,21 +6,21 @@ import d0.z.d.m;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetStickerPicker.kt */
-public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$1 extends k implements Function1<StickerCategoryItem.PackItem, Unit> {
+public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$1 extends k implements Function1<StickerCategoryItem.GuildItem, Unit> {
     public WidgetStickerPicker$setUpCategoryRecycler$1(WidgetStickerPicker widgetStickerPicker) {
-        super(1, widgetStickerPicker, WidgetStickerPicker.class, "onPackClicked", "onPackClicked(Lcom/discord/widgets/chat/input/sticker/StickerCategoryItem$PackItem;)V", 0);
+        super(1, widgetStickerPicker, WidgetStickerPicker.class, "onGuildClicked", "onGuildClicked(Lcom/discord/widgets/chat/input/sticker/StickerCategoryItem$GuildItem;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(StickerCategoryItem.PackItem packItem) {
-        invoke(packItem);
+    public /* bridge */ /* synthetic */ Unit invoke(StickerCategoryItem.GuildItem guildItem) {
+        invoke(guildItem);
         return Unit.a;
     }
 
-    public final void invoke(StickerCategoryItem.PackItem packItem) {
-        m.checkNotNullParameter(packItem, "p1");
-        WidgetStickerPicker.access$onPackClicked((WidgetStickerPicker) this.receiver, packItem);
+    public final void invoke(StickerCategoryItem.GuildItem guildItem) {
+        m.checkNotNullParameter(guildItem, "p1");
+        WidgetStickerPicker.access$onGuildClicked((WidgetStickerPicker) this.receiver, guildItem);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$2.java
index 2f49a028dd..1e809e0bb2 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$2.java
@@ -1,17 +1,26 @@
 package com.discord.widgets.chat.input.sticker;
 
+import com.discord.widgets.chat.input.sticker.StickerCategoryItem;
 import d0.z.d.k;
+import d0.z.d.m;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetStickerPicker.kt */
-public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$2 extends k implements Function0<Unit> {
+public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$2 extends k implements Function1<StickerCategoryItem.PackItem, Unit> {
     public WidgetStickerPicker$setUpCategoryRecycler$2(WidgetStickerPicker widgetStickerPicker) {
-        super(0, widgetStickerPicker, WidgetStickerPicker.class, "onRecentClicked", "onRecentClicked()V", 0);
+        super(1, widgetStickerPicker, WidgetStickerPicker.class, "onPackClicked", "onPackClicked(Lcom/discord/widgets/chat/input/sticker/StickerCategoryItem$PackItem;)V", 0);
     }
 
-    @Override // kotlin.jvm.functions.Function0
-    /* renamed from: invoke */
-    public final void mo1invoke() {
-        WidgetStickerPicker.access$onRecentClicked((WidgetStickerPicker) this.receiver);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(StickerCategoryItem.PackItem packItem) {
+        invoke(packItem);
+        return Unit.a;
+    }
+
+    public final void invoke(StickerCategoryItem.PackItem packItem) {
+        m.checkNotNullParameter(packItem, "p1");
+        WidgetStickerPicker.access$onPackClicked((WidgetStickerPicker) this.receiver, packItem);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$3.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$3.java
index 830db4a7c4..c5a4bd07bf 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$3.java
@@ -2,22 +2,16 @@ package com.discord.widgets.chat.input.sticker;
 
 import d0.z.d.k;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetStickerPicker.kt */
-public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$3 extends k implements Function1<Integer, Unit> {
+public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$3 extends k implements Function0<Unit> {
     public WidgetStickerPicker$setUpCategoryRecycler$3(WidgetStickerPicker widgetStickerPicker) {
-        super(1, widgetStickerPicker, WidgetStickerPicker.class, "onSelectedCategoryAdapterPositionUpdated", "onSelectedCategoryAdapterPositionUpdated(I)V", 0);
+        super(0, widgetStickerPicker, WidgetStickerPicker.class, "onRecentClicked", "onRecentClicked()V", 0);
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Integer num) {
-        invoke(num.intValue());
-        return Unit.a;
-    }
-
-    public final void invoke(int i) {
-        WidgetStickerPicker.access$onSelectedCategoryAdapterPositionUpdated((WidgetStickerPicker) this.receiver, i);
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+        WidgetStickerPicker.access$onRecentClicked((WidgetStickerPicker) this.receiver);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$4.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$4.java
index 582d69ccec..66bd92fec7 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$4.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$4.java
@@ -1,22 +1,23 @@
 package com.discord.widgets.chat.input.sticker;
 
-import androidx.recyclerview.widget.RecyclerView;
-import d0.z.d.m;
+import d0.z.d.k;
 import kotlin.Unit;
-import rx.subjects.PublishSubject;
+import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetStickerPicker.kt */
-public final class WidgetStickerPicker$setUpCategoryRecycler$4 extends RecyclerView.OnScrollListener {
-    public final /* synthetic */ WidgetStickerPicker this$0;
-
+public final /* synthetic */ class WidgetStickerPicker$setUpCategoryRecycler$4 extends k implements Function1<Integer, Unit> {
     public WidgetStickerPicker$setUpCategoryRecycler$4(WidgetStickerPicker widgetStickerPicker) {
-        this.this$0 = widgetStickerPicker;
+        super(1, widgetStickerPicker, WidgetStickerPicker.class, "onSelectedCategoryAdapterPositionUpdated", "onSelectedCategoryAdapterPositionUpdated(I)V", 0);
     }
 
-    @Override // androidx.recyclerview.widget.RecyclerView.OnScrollListener
-    public void onScrolled(RecyclerView recyclerView, int i, int i2) {
-        m.checkNotNullParameter(recyclerView, "recyclerView");
-        super.onScrolled(recyclerView, i, i2);
-        PublishSubject access$getStickerCategoryScrollSubject$p = WidgetStickerPicker.access$getStickerCategoryScrollSubject$p(this.this$0);
-        access$getStickerCategoryScrollSubject$p.j.onNext(Unit.a);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Integer num) {
+        invoke(num.intValue());
+        return Unit.a;
+    }
+
+    public final void invoke(int i) {
+        WidgetStickerPicker.access$onSelectedCategoryAdapterPositionUpdated((WidgetStickerPicker) this.receiver, i);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$5.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$5.java
new file mode 100644
index 0000000000..a323d36719
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setUpCategoryRecycler$5.java
@@ -0,0 +1,22 @@
+package com.discord.widgets.chat.input.sticker;
+
+import androidx.recyclerview.widget.RecyclerView;
+import d0.z.d.m;
+import kotlin.Unit;
+import rx.subjects.PublishSubject;
+/* compiled from: WidgetStickerPicker.kt */
+public final class WidgetStickerPicker$setUpCategoryRecycler$5 extends RecyclerView.OnScrollListener {
+    public final /* synthetic */ WidgetStickerPicker this$0;
+
+    public WidgetStickerPicker$setUpCategoryRecycler$5(WidgetStickerPicker widgetStickerPicker) {
+        this.this$0 = widgetStickerPicker;
+    }
+
+    @Override // androidx.recyclerview.widget.RecyclerView.OnScrollListener
+    public void onScrolled(RecyclerView recyclerView, int i, int i2) {
+        m.checkNotNullParameter(recyclerView, "recyclerView");
+        super.onScrolled(recyclerView, i, i2);
+        PublishSubject access$getStickerCategoryScrollSubject$p = WidgetStickerPicker.access$getStickerCategoryScrollSubject$p(this.this$0);
+        access$getStickerCategoryScrollSubject$p.j.onNext(Unit.a);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setupForInlineSearchAndScroll$$inlined$doOnLayout$1.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setupForInlineSearchAndScroll$$inlined$doOnLayout$1.java
index 10a86ddd7b..f74c11bca4 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setupForInlineSearchAndScroll$$inlined$doOnLayout$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker$setupForInlineSearchAndScroll$$inlined$doOnLayout$1.java
@@ -21,7 +21,7 @@ public final class WidgetStickerPicker$setupForInlineSearchAndScroll$$inlined$do
         m.checkParameterIsNotNull(view, "view");
         view.removeOnLayoutChangeListener(this);
         WidgetStickerPicker.access$getViewModel$p(this.this$0).setSearchText(this.$searchText$inlined);
-        WidgetStickerPicker.access$getViewModel$p(this.this$0).setSelectedPackId(this.$packId$inlined);
+        WidgetStickerPicker.access$getViewModel$p(this.this$0).setSelectedCategoryId(this.$packId$inlined);
         RecyclerView recyclerView = WidgetStickerPicker.access$getBinding$p(this.this$0).k;
         m.checkNotNullExpressionValue(recyclerView, "binding.chatInputStickerPickerRecycler");
         if (!ViewCompat.isLaidOut(recyclerView) || recyclerView.isLayoutRequested()) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
index 1418f3885a..e5ae7a9306 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPicker.java
@@ -5,6 +5,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -86,7 +87,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
     private Function0<Unit> scrollExpressionPickerToTop = WidgetStickerPicker$scrollExpressionPickerToTop$1.INSTANCE;
     private Function1<? super Boolean, Unit> showSearchBar;
     private WidgetStickerAdapter stickerAdapter;
-    private final PublishSubject<Unit> stickerCategoryScrollSubject = PublishSubject.l0();
+    private final PublishSubject<Unit> stickerCategoryScrollSubject = PublishSubject.k0();
     private StickerPickerListener stickerPickerListener;
     private StickerPickerMode stickerPickerMode;
     private final TooltipManager tooltipManager;
@@ -105,7 +106,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
     }
 
     public WidgetStickerPicker() {
-        super(2131559239);
+        super(2131559247);
         TooltipManager tooltipManager = null;
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(appLog, "logger");
@@ -120,11 +121,11 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
         tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
         if (tooltipManager == null) {
-            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
             TooltipManager.a.a = new WeakReference<>(tooltipManager);
         }
         this.tooltipManager = tooltipManager;
-        this.recyclerScrollingWithinThresholdSubject = BehaviorSubject.m0(Boolean.TRUE);
+        this.recyclerScrollingWithinThresholdSubject = BehaviorSubject.l0(Boolean.TRUE);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetStickerPicker widgetStickerPicker, StickerPickerViewModel.ViewState viewState) {
@@ -179,6 +180,10 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         widgetStickerPicker.launchBottomSheet();
     }
 
+    public static final /* synthetic */ void access$onGuildClicked(WidgetStickerPicker widgetStickerPicker, StickerCategoryItem.GuildItem guildItem) {
+        widgetStickerPicker.onGuildClicked(guildItem);
+    }
+
     public static final /* synthetic */ void access$onPackClicked(WidgetStickerPicker widgetStickerPicker, StickerCategoryItem.PackItem packItem) {
         widgetStickerPicker.onPackClicked(packItem);
     }
@@ -239,14 +244,14 @@ public final class WidgetStickerPicker extends AppFragment implements c {
                     function12.invoke(Boolean.TRUE);
                 }
                 this.scrollExpressionPickerToTop.mo1invoke();
-                getBinding().b.setImageResource(2131232238);
+                getBinding().b.setImageResource(2131232247);
                 TextView textView = getBinding().j;
                 m.checkNotNullExpressionValue(textView, "binding.chatInputStickerPickerEmptyTitle");
                 textView.setVisibility(8);
                 TextView textView2 = getBinding().i;
                 m.checkNotNullExpressionValue(textView2, "binding.chatInputStickerPickerEmptySubtitle");
-                textView2.setText(getString(2131891418));
-                LinkifiedTextView linkifiedTextView = getBinding().f1964c;
+                textView2.setText(getString(2131891489));
+                LinkifiedTextView linkifiedTextView = getBinding().f1967c;
                 m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatInputStickerPickerEmptyLink");
                 linkifiedTextView.setVisibility(8);
                 showCategoryBottomBar(true);
@@ -292,6 +297,17 @@ public final class WidgetStickerPicker extends AppFragment implements c {
                     m.throwUninitializedPropertyAccessException("categoryAdapter");
                 }
                 stickerCategoryAdapter2.setItems(stickers.getCategoryItems());
+                if (this.stickerPickerMode == StickerPickerMode.BOTTOM_SHEET) {
+                    RecyclerView recyclerView = getBinding().k;
+                    m.checkNotNullExpressionValue(recyclerView, "binding.chatInputStickerPickerRecycler");
+                    ViewGroup.LayoutParams layoutParams = recyclerView.getLayoutParams();
+                    Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.widget.FrameLayout.LayoutParams");
+                    FrameLayout.LayoutParams layoutParams2 = (FrameLayout.LayoutParams) layoutParams;
+                    layoutParams2.topMargin = DimenUtils.dpToPixels(72);
+                    RecyclerView recyclerView2 = getBinding().k;
+                    m.checkNotNullExpressionValue(recyclerView2, "binding.chatInputStickerPickerRecycler");
+                    recyclerView2.setLayoutParams(layoutParams2);
+                }
             }
             this.previousViewState = viewState;
         }
@@ -361,7 +377,24 @@ public final class WidgetStickerPicker extends AppFragment implements c {
                     }
                     this.autoscrollToPackId = null;
                     if (!stickerCategoryItem.isSelected()) {
-                        selectPackById(((StickerCategoryItem.PackItem) stickerCategoryItem).getPack().getId());
+                        selectCategoryById(((StickerCategoryItem.PackItem) stickerCategoryItem).getPack().getId());
+                    }
+                }
+            } else if (stickerCategoryItem instanceof StickerCategoryItem.GuildItem) {
+                StickerCategoryItem.GuildItem guildItem = (StickerCategoryItem.GuildItem) stickerCategoryItem;
+                Pair<Integer, Integer> categoryRange2 = guildItem.getCategoryRange();
+                int intValue3 = categoryRange2.getFirst().intValue();
+                int intValue4 = categoryRange2.getSecond().intValue();
+                if (intValue3 <= i && intValue4 > i) {
+                    Long l2 = this.autoscrollToPackId;
+                    if (l2 != null) {
+                        long id3 = guildItem.getGuild().getId();
+                        if (l2 != null && l2.longValue() == id3) {
+                        }
+                    }
+                    this.autoscrollToPackId = null;
+                    if (!stickerCategoryItem.isSelected()) {
+                        selectCategoryById(((StickerCategoryItem.GuildItem) stickerCategoryItem).getGuild().getId());
                     }
                 }
             }
@@ -402,10 +435,20 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         WidgetStickerPickerSheet.Companion.show$default(companion, parentFragmentManager, this.stickerPickerListener, null, null, null, 28, null);
     }
 
+    private final void onGuildClicked(StickerCategoryItem.GuildItem guildItem) {
+        AnalyticsTracker.INSTANCE.guildCategorySelected(guildItem.getGuild().getId());
+        this.autoscrollToPackId = Long.valueOf(guildItem.getGuild().getId());
+        selectCategoryById(guildItem.getGuild().getId());
+        Pair<Integer, Integer> categoryRange = guildItem.getCategoryRange();
+        Observable<T> q = new j(Unit.a).q(200, TimeUnit.MILLISECONDS);
+        m.checkNotNullExpressionValue(q, "Observable.just(Unit)\n  …0, TimeUnit.MILLISECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(q, this, null, 2, null), WidgetStickerPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStickerPicker$onGuildClicked$1(this, categoryRange), 62, (Object) null);
+    }
+
     private final void onPackClicked(StickerCategoryItem.PackItem packItem) {
         AnalyticsTracker.INSTANCE.stickerPackCategorySelected(packItem.getPack().getId());
         this.autoscrollToPackId = Long.valueOf(packItem.getPack().getId());
-        selectPackById(packItem.getPack().getId());
+        selectCategoryById(packItem.getPack().getId());
         Pair<Integer, Integer> categoryRange = packItem.getCategoryRange();
         Observable<T> q = new j(Unit.a).q(200, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(q, "Observable.just(Unit)\n  …0, TimeUnit.MILLISECONDS)");
@@ -413,7 +456,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
     }
 
     private final void onRecentClicked() {
-        selectPackById(-1);
+        selectCategoryById(-1);
         WidgetStickerAdapter widgetStickerAdapter = this.stickerAdapter;
         if (widgetStickerAdapter == null) {
             m.throwUninitializedPropertyAccessException("stickerAdapter");
@@ -463,7 +506,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         RecyclerView recyclerView = getBinding().p;
         m.checkNotNullExpressionValue(recyclerView, "binding.stickerPickerCategoryRecycler");
         recyclerView.setItemAnimator(null);
-        StickerCategoryAdapter stickerCategoryAdapter = new StickerCategoryAdapter(new WidgetStickerPicker$setUpCategoryRecycler$1(this), new WidgetStickerPicker$setUpCategoryRecycler$2(this), new WidgetStickerPicker$setUpCategoryRecycler$3(this), this, null, 16, null);
+        StickerCategoryAdapter stickerCategoryAdapter = new StickerCategoryAdapter(new WidgetStickerPicker$setUpCategoryRecycler$1(this), new WidgetStickerPicker$setUpCategoryRecycler$2(this), new WidgetStickerPicker$setUpCategoryRecycler$3(this), new WidgetStickerPicker$setUpCategoryRecycler$4(this), this, null, 32, null);
         this.categoryAdapter = stickerCategoryAdapter;
         if (stickerCategoryAdapter == null) {
             m.throwUninitializedPropertyAccessException("categoryAdapter");
@@ -490,7 +533,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
             m.throwUninitializedPropertyAccessException("categoryLayoutManager");
         }
         recyclerView4.setLayoutManager(linearLayoutManager);
-        getBinding().p.addOnScrollListener(new WidgetStickerPicker$setUpCategoryRecycler$4(this));
+        getBinding().p.addOnScrollListener(new WidgetStickerPicker$setUpCategoryRecycler$5(this));
     }
 
     private final void setUpStickerRecycler() {
@@ -558,7 +601,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
             scrollToTop();
         }
         try {
-            getViewModel().setSelectedPackId(-1);
+            getViewModel().setSelectedCategoryId(-1);
             clearSearchInput();
         } catch (Exception unused) {
         }
@@ -586,7 +629,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
             setWindowInsetsListeners();
         }
         initializeSearchBar();
-        Toolbar toolbar = getBinding().f1965s;
+        Toolbar toolbar = getBinding().f1968s;
         m.checkNotNullExpressionValue(toolbar, "binding.stickerToolbar");
         ViewGroup.LayoutParams layoutParams = toolbar.getLayoutParams();
         Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type com.google.android.material.appbar.AppBarLayout.LayoutParams");
@@ -596,7 +639,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         getBinding().r.a(this, new WidgetStickerPicker$onViewBound$1(this));
         Bundle arguments = getArguments();
         Long valueOf = arguments != null ? Long.valueOf(arguments.getLong("com.discord.intent.EXTRA_STICKER_PACK_ID")) : null;
-        getViewModel().setSelectedPackId(valueOf != null ? valueOf.longValue() : -1);
+        getViewModel().setSelectedCategoryId(valueOf != null ? valueOf.longValue() : -1);
         RecyclerView recyclerView = getBinding().p;
         m.checkNotNullExpressionValue(recyclerView, "binding.stickerPickerCategoryRecycler");
         recyclerView.setLayoutParams(new ConstraintLayout.LayoutParams(-1, -1));
@@ -630,8 +673,8 @@ public final class WidgetStickerPicker extends AppFragment implements c {
         }
     }
 
-    public final void selectPackById(long j) {
-        getViewModel().setSelectedPackId(j);
+    public final void selectCategoryById(long j) {
+        getViewModel().setSelectedCategoryId(j);
     }
 
     public final void setListener(StickerPickerListener stickerPickerListener) {
@@ -660,7 +703,7 @@ public final class WidgetStickerPicker extends AppFragment implements c {
             return;
         }
         access$getViewModel$p(this).setSearchText(str);
-        access$getViewModel$p(this).setSelectedPackId(j);
+        access$getViewModel$p(this).setSelectedCategoryId(j);
         RecyclerView recyclerView2 = access$getBinding$p(this).k;
         m.checkNotNullExpressionValue(recyclerView2, "binding.chatInputStickerPickerRecycler");
         if (!ViewCompat.isLaidOut(recyclerView2) || recyclerView2.isLayoutRequested()) {
diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java
index 7053e9e763..0453b7cf99 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/WidgetStickerPickerSheet.java
@@ -64,7 +64,7 @@ public final class WidgetStickerPickerSheet extends WidgetExpressionPickerSheet
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559240;
+        return 2131559248;
     }
 
     @Override // com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet, androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener
@@ -86,7 +86,7 @@ public final class WidgetStickerPickerSheet extends WidgetExpressionPickerSheet
         if (widgetStickerPicker == null) {
             m.throwUninitializedPropertyAccessException("stickerPickerFragment");
         }
-        widgetStickerPicker.selectPackById(-1);
+        widgetStickerPicker.selectCategoryById(-1);
     }
 
     @Override // com.discord.widgets.chat.input.sticker.StickerPickerListener
@@ -143,7 +143,7 @@ public final class WidgetStickerPickerSheet extends WidgetExpressionPickerSheet
         if (widgetStickerPicker4 == null) {
             m.throwUninitializedPropertyAccessException("stickerPickerFragment");
         }
-        beginTransaction.replace(2131365096, widgetStickerPicker3, widgetStickerPicker4.getClass().getSimpleName()).runOnCommit(new WidgetStickerPickerSheet$onViewCreated$2(this)).commit();
+        beginTransaction.replace(2131365151, widgetStickerPicker3, widgetStickerPicker4.getClass().getSimpleName()).runOnCommit(new WidgetStickerPickerSheet$onViewCreated$2(this)).commit();
     }
 
     public final void scrollToPack(Long l) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java b/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java
index 037745ecbb..b2d1afdec9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ChatListItemMessageAccessibilityDelegate.java
@@ -33,7 +33,7 @@ public final class ChatListItemMessageAccessibilityDelegate extends Accessibilit
             SpoilerSpan[] spoilerSpanArr = (SpoilerSpan[]) spannableStringBuilder.getSpans(0, spannableStringBuilder.length(), SpoilerSpan.class);
             for (SpoilerSpan spoilerSpan : spoilerSpanArr) {
                 if (!spoilerSpan.k) {
-                    spannableStringBuilder.replace(spannableStringBuilder.getSpanStart(spoilerSpan), spannableStringBuilder.getSpanEnd(spoilerSpan), b.i(view, 2131893303, new Object[0], null, 4));
+                    spannableStringBuilder.replace(spannableStringBuilder.getSpanStart(spoilerSpan), spannableStringBuilder.getSpanEnd(spoilerSpan), b.i(view, 2131893386, new Object[0], null, 4));
                 }
             }
             ArrayList arrayList = new ArrayList();
diff --git a/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$Companion$INSTANCE$2.java b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$Companion$INSTANCE$2.java
index 358fe8408e..6128736953 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$Companion$INSTANCE$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$Companion$INSTANCE$2.java
@@ -13,6 +13,6 @@ public final class CreateThreadsFeatureFlag$Companion$INSTANCE$2 extends o imple
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final CreateThreadsFeatureFlag mo1invoke() {
-        return new CreateThreadsFeatureFlag(null, 1, null);
+        return new CreateThreadsFeatureFlag(null, null, 3, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$observeEnabled$1.java b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$observeEnabled$1.java
index 5715c04cb2..7241a6ddf2 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$observeEnabled$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$observeEnabled$1.java
@@ -1,16 +1,24 @@
 package com.discord.widgets.chat.list;
 
 import com.discord.models.experiments.domain.Experiment;
-import j0.k.b;
+import com.discord.models.guild.Guild;
+import com.discord.widgets.chat.list.CreateThreadsFeatureFlag;
+import d0.z.d.k;
+import kotlin.jvm.functions.Function3;
 /* compiled from: CreateThreadsFeatureFlag.kt */
-public final class CreateThreadsFeatureFlag$observeEnabled$1<T, R> implements b<Experiment, Boolean> {
-    public static final CreateThreadsFeatureFlag$observeEnabled$1 INSTANCE = new CreateThreadsFeatureFlag$observeEnabled$1();
+public final /* synthetic */ class CreateThreadsFeatureFlag$observeEnabled$1 extends k implements Function3<Experiment, Experiment, Guild, Boolean> {
+    public CreateThreadsFeatureFlag$observeEnabled$1(CreateThreadsFeatureFlag.Companion companion) {
+        super(3, companion, CreateThreadsFeatureFlag.Companion.class, "computeIsEnabled", "computeIsEnabled(Lcom/discord/models/experiments/domain/Experiment;Lcom/discord/models/experiments/domain/Experiment;Lcom/discord/models/guild/Guild;)Z", 0);
+    }
 
-    public final Boolean call(Experiment experiment) {
-        boolean z2 = true;
-        if (experiment == null || experiment.getBucket() != 1) {
-            z2 = false;
-        }
-        return Boolean.valueOf(z2);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function3
+    public /* bridge */ /* synthetic */ Boolean invoke(Experiment experiment, Experiment experiment2, Guild guild) {
+        return Boolean.valueOf(invoke(experiment, experiment2, guild));
+    }
+
+    public final boolean invoke(Experiment experiment, Experiment experiment2, Guild guild) {
+        return ((CreateThreadsFeatureFlag.Companion) this.receiver).computeIsEnabled(experiment, experiment2, guild);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.java b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$sam$rx_functions_Func3$0.java
similarity index 57%
rename from app/src/main/java/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.java
rename to app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$sam$rx_functions_Func3$0.java
index d5d8e82755..c131e5b7ce 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func3$0.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag$sam$rx_functions_Func3$0.java
@@ -1,12 +1,12 @@
-package com.discord.widgets.settings;
+package com.discord.widgets.chat.list;
 
 import kotlin.jvm.functions.Function3;
 import rx.functions.Func3;
-/* compiled from: WidgetSettings.kt */
-public final class WidgetSettings$sam$rx_functions_Func3$0 implements Func3 {
+/* compiled from: CreateThreadsFeatureFlag.kt */
+public final class CreateThreadsFeatureFlag$sam$rx_functions_Func3$0 implements Func3 {
     private final /* synthetic */ Function3 function;
 
-    public WidgetSettings$sam$rx_functions_Func3$0(Function3 function3) {
+    public CreateThreadsFeatureFlag$sam$rx_functions_Func3$0(Function3 function3) {
         this.function = function3;
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag.java b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag.java
index 6aaf9634fa..16c6255805 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/CreateThreadsFeatureFlag.java
@@ -1,7 +1,10 @@
 package com.discord.widgets.chat.list;
 
+import com.discord.api.guild.GuildFeature;
 import com.discord.models.experiments.domain.Experiment;
+import com.discord.models.guild.Guild;
 import com.discord.stores.StoreExperiments;
+import com.discord.stores.StoreGuilds;
 import com.discord.stores.StoreStream;
 import d0.g;
 import d0.z.d.m;
@@ -13,6 +16,7 @@ public final class CreateThreadsFeatureFlag {
     public static final Companion Companion = new Companion(null);
     private static final Lazy INSTANCE$delegate = g.lazy(CreateThreadsFeatureFlag$Companion$INSTANCE$2.INSTANCE);
     private final StoreExperiments storeExperiments;
+    private final StoreGuilds storeGuilds;
 
     /* compiled from: CreateThreadsFeatureFlag.kt */
     public static final class Companion {
@@ -23,6 +27,16 @@ public final class CreateThreadsFeatureFlag {
             this();
         }
 
+        public final boolean computeIsEnabled(Experiment experiment, Experiment experiment2, Guild guild) {
+            if (guild == null) {
+                return false;
+            }
+            if (guild.hasFeature(GuildFeature.THREADS_ENABLED)) {
+                return true;
+            }
+            return ((experiment2 != null && experiment2.getBucket() == 2) || !guild.hasFeature(GuildFeature.COMMUNITY)) && experiment != null && experiment.getBucket() == 1;
+        }
+
         public final CreateThreadsFeatureFlag getINSTANCE() {
             Lazy access$getINSTANCE$cp = CreateThreadsFeatureFlag.access$getINSTANCE$cp();
             Companion companion = CreateThreadsFeatureFlag.Companion;
@@ -31,17 +45,19 @@ public final class CreateThreadsFeatureFlag {
     }
 
     public CreateThreadsFeatureFlag() {
-        this(null, 1, null);
+        this(null, null, 3, null);
     }
 
-    public CreateThreadsFeatureFlag(StoreExperiments storeExperiments) {
+    public CreateThreadsFeatureFlag(StoreExperiments storeExperiments, StoreGuilds storeGuilds) {
         m.checkNotNullParameter(storeExperiments, "storeExperiments");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
         this.storeExperiments = storeExperiments;
+        this.storeGuilds = storeGuilds;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-    public /* synthetic */ CreateThreadsFeatureFlag(StoreExperiments storeExperiments, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i & 1) != 0 ? StoreStream.Companion.getExperiments() : storeExperiments);
+    public /* synthetic */ CreateThreadsFeatureFlag(StoreExperiments storeExperiments, StoreGuilds storeGuilds, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this((i & 1) != 0 ? StoreStream.Companion.getExperiments() : storeExperiments, (i & 2) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds);
     }
 
     public static final /* synthetic */ Lazy access$getINSTANCE$cp() {
@@ -49,13 +65,12 @@ public final class CreateThreadsFeatureFlag {
     }
 
     public final boolean isEnabled(long j) {
-        Experiment guildExperiment = this.storeExperiments.getGuildExperiment("2020-09_threads", j, true);
-        return guildExperiment != null && guildExperiment.getBucket() == 1;
+        return Companion.computeIsEnabled(this.storeExperiments.getGuildExperiment("2020-09_threads", j, true), this.storeExperiments.getGuildExperiment("2021-06_threads_rollout", j, false), this.storeGuilds.getGuild(j));
     }
 
     public final Observable<Boolean> observeEnabled(long j) {
-        Observable<R> G = this.storeExperiments.observeGuildExperiment("2020-09_threads", j, true).G(CreateThreadsFeatureFlag$observeEnabled$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "storeExperiments\n       …nt?.bucket == 1\n        }");
-        return G;
+        Observable<Boolean> i = Observable.i(this.storeExperiments.observeGuildExperiment("2020-09_threads", j, true), this.storeExperiments.observeGuildExperiment("2021-06_threads_rollout", j, false), this.storeGuilds.observeGuild(j), new CreateThreadsFeatureFlag$sam$rx_functions_Func3$0(new CreateThreadsFeatureFlag$observeEnabled$1(Companion)));
+        m.checkNotNullExpressionValue(i, "Observable.combineLatest… ::computeIsEnabled\n    )");
+        return i;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java
index a06b5bce31..9e55cabb6e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView$updateUI$2.java
@@ -48,9 +48,9 @@ public final class InlineMediaView$updateUI$2 extends o implements Function1<Flo
 
     public final void invoke(float f) {
         boolean z2 = f > ((float) 0);
-        InlineMediaView.access$getBinding$p(this.this$0).g.setImageDrawable(ContextCompat.getDrawable(this.this$0.getContext(), z2 ? 2131232055 : 2131232053));
+        InlineMediaView.access$getBinding$p(this.this$0).g.setImageDrawable(ContextCompat.getDrawable(this.this$0.getContext(), z2 ? 2131232063 : 2131232061));
         InlineMediaView.access$getBinding$p(this.this$0).g.setOnClickListener(new AnonymousClass1(this, z2));
-        int i = z2 ? 2131894480 : 2131894481;
+        int i = z2 ? 2131894599 : 2131894600;
         ImageView imageView = InlineMediaView.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(imageView, "binding.inlineMediaVolumeToggle");
         imageView.setContentDescription(b.i(this.this$0, i, new Object[0], null, 4));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java
index 6705d6e1c0..869c2ada38 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java
@@ -216,9 +216,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         this.featureTag = "";
         this.compositeSubscription = new CompositeSubscription();
         addOnAttachStateChangeListener(this);
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -232,9 +232,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         this.featureTag = "";
         this.compositeSubscription = new CompositeSubscription();
         addOnAttachStateChangeListener(this);
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -248,9 +248,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         this.featureTag = "";
         this.compositeSubscription = new CompositeSubscription();
         addOnAttachStateChangeListener(this);
-        PublishSubject l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.unsubscribeSignal = l0;
+        PublishSubject k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.unsubscribeSignal = k0;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -326,7 +326,7 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
         boolean z2 = true;
         int i = 0;
         if (m.areEqual(event, AppMediaPlayer.Event.a.a)) {
-            SimpleDraweeView simpleDraweeView = this.binding.f1615c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1611c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inlineMediaImagePreview");
             if (!(!shouldAutoPlay())) {
                 i = 8;
@@ -370,7 +370,7 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
     private final void resetViews() {
         ViewParams viewParams = this.viewParams;
         if (viewParams != null) {
-            SimpleDraweeView simpleDraweeView = this.binding.f1615c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1611c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inlineMediaImagePreview");
             int i = 0;
             simpleDraweeView.setVisibility(0);
@@ -429,7 +429,7 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
                 requestLayout();
             }
             if ((renderableEmbedMedia != null ? renderableEmbedMedia.a : null) != null) {
-                SimpleDraweeView simpleDraweeView = this.binding.f1615c;
+                SimpleDraweeView simpleDraweeView = this.binding.f1611c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.inlineMediaImagePreview");
                 MGImages.setImage$default(simpleDraweeView, EmbedResourceUtils.INSTANCE.getPreviewUrls(renderableEmbedMedia.a, num.intValue(), num2.intValue(), shouldAutoPlay()), 0, 0, false, null, null, null, 252, null);
             }
@@ -458,9 +458,9 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat
             MediaSource R = AnimatableValueParser.R(embedType == embedType2 ? MediaType.GIFV : MediaType.VIDEO, str, str2);
             this.compositeSubscription = new CompositeSubscription();
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(appMediaPlayer.d, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$1(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$2(this, appMediaPlayer), 58, (Object) null);
-            Observable<AppMediaPlayer.Event> K = appMediaPlayer.a.K();
-            m.checkNotNullExpressionValue(K, "eventSubject.onBackpressureBuffer()");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(K, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$3(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$4(this), 58, (Object) null);
+            Observable<AppMediaPlayer.Event> J = appMediaPlayer.a.J();
+            m.checkNotNullExpressionValue(J, "eventSubject.onBackpressureBuffer()");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(J, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$3(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$4(this), 58, (Object) null);
             if (embedType == embedType2) {
                 PlayerView playerView2 = this.binding.f;
                 m.checkNotNullExpressionValue(playerView2, "binding.inlineMediaPlayerView");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java
index db64876873..4a798eee9e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java
@@ -18,23 +18,23 @@ public final /* synthetic */ class PublishActionDialog$binding$2 extends k imple
 
     public final PublishMessageDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364025;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364025);
+        int i = 2131364068;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364068);
         if (linearLayout != null) {
-            i = 2131364026;
-            TextView textView = (TextView) view.findViewById(2131364026);
+            i = 2131364069;
+            TextView textView = (TextView) view.findViewById(2131364069);
             if (textView != null) {
-                i = 2131364027;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364027);
+                i = 2131364070;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364070);
                 if (materialButton != null) {
-                    i = 2131364029;
-                    TextView textView2 = (TextView) view.findViewById(2131364029);
+                    i = 2131364072;
+                    TextView textView2 = (TextView) view.findViewById(2131364072);
                     if (textView2 != null) {
-                        i = 2131364030;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364030);
+                        i = 2131364073;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364073);
                         if (linearLayout2 != null) {
-                            i = 2131364032;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364032);
+                            i = 2131364075;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364075);
                             if (materialButton2 != null) {
                                 return new PublishMessageDialogBinding((LinearLayout) view, linearLayout, textView, materialButton, textView2, linearLayout2, materialButton2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java
index 9ef2696532..86d471ad06 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java
@@ -73,7 +73,7 @@ public final class PublishActionDialog extends AppDialog {
     }
 
     public PublishActionDialog() {
-        super(2131558645);
+        super(2131558643);
         PublishActionDialog$viewModel$2 publishActionDialog$viewModel$2 = new PublishActionDialog$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PublishActionDialogViewModel.class), new PublishActionDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(publishActionDialog$viewModel$2));
@@ -113,9 +113,9 @@ public final class PublishActionDialog extends AppDialog {
 
     private final void handleEvent(PublishActionDialogViewModel.Event event) {
         if (event instanceof PublishActionDialogViewModel.Event.Success) {
-            o.i(this, 2131891168, 0, 4);
+            o.i(this, 2131891239, 0, 4);
         } else if (event instanceof PublishActionDialogViewModel.Event.Failure) {
-            o.i(this, 2131892459, 0, 4);
+            o.i(this, 2131892538, 0, 4);
         }
         dismiss();
     }
@@ -123,19 +123,19 @@ public final class PublishActionDialog extends AppDialog {
     private final void renderHasFollowers(PublishActionDialogViewModel.ViewState.LoadedHasFollowers loadedHasFollowers) {
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.noticeBodyText");
-        b.n(textView, 2131892455, new Object[]{String.valueOf(loadedHasFollowers.getFollowerStats().getGuildsFollowing())}, null, 4);
+        b.m(textView, 2131892534, new Object[]{String.valueOf(loadedHasFollowers.getFollowerStats().getGuildsFollowing())}, null, 4);
     }
 
     private final void renderLoading() {
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.noticeBodyText");
-        b.n(textView, 2131890817, new Object[0], null, 4);
+        b.m(textView, 2131890887, new Object[0], null, 4);
     }
 
     private final void renderNoFollowers() {
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.noticeBodyText");
-        b.n(textView, 2131892454, new Object[0], null, 4);
+        b.m(textView, 2131892533, new Object[0], null, 4);
     }
 
     public static final void show(FragmentManager fragmentManager, long j, long j2, Function0<Unit> function0, Integer num) {
@@ -173,7 +173,7 @@ public final class PublishActionDialog extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.noticeHeader");
-        b.n(textView, 2131891359, new Object[0], null, 4);
+        b.m(textView, 2131891430, new Object[0], null, 4);
         LinearLayout linearLayout = getBinding().e;
         m.checkNotNullExpressionValue(linearLayout, "binding.noticeHeaderContainer");
         linearLayout.setVisibility(0);
@@ -185,12 +185,12 @@ public final class PublishActionDialog extends AppDialog {
         textView3.setMovementMethod(new WidgetNoticeDialog.ActionLinkMovementMethod(new PublishActionDialog$onViewBound$1(this)));
         MaterialButton materialButton = getBinding().f;
         m.checkNotNullExpressionValue(materialButton, "binding.noticeOk");
-        ViewExtensions.setTextAndVisibilityBy(materialButton, b.j(this, 2131891358, new Object[0], null, 4));
+        ViewExtensions.setTextAndVisibilityBy(materialButton, b.j(this, 2131891429, new Object[0], null, 4));
         getBinding().f.setOnClickListener(new PublishActionDialog$onViewBound$2(this));
-        MaterialButton materialButton2 = getBinding().f1622c;
+        MaterialButton materialButton2 = getBinding().f1618c;
         m.checkNotNullExpressionValue(materialButton2, "binding.noticeCancel");
         ViewExtensions.setTextAndVisibilityBy(materialButton2, b.j(this, 2131887178, new Object[0], null, 4));
-        getBinding().f1622c.setOnClickListener(new PublishActionDialog$onViewBound$3(this));
+        getBinding().f1618c.setOnClickListener(new PublishActionDialog$onViewBound$3(this));
     }
 
     @Override // com.discord.app.AppDialog
diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
index 3a77d794c0..27b77c8404 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java
@@ -63,9 +63,9 @@ public final class PublishActionDialogViewModel extends AppViewModel<ViewState>
         }
 
         private final Observable<StoreState> observeChannelFollowerStatsStoreState(long j, StoreChannelFollowerStats storeChannelFollowerStats) {
-            Observable<StoreState> s2 = storeChannelFollowerStats.observeChannelFollowerStats(j).G(PublishActionDialogViewModel$Companion$observeChannelFollowerStatsStoreState$1.INSTANCE).s();
-            m.checkNotNullExpressionValue(s2, "storeChannelFollowerStat…  .distinctUntilChanged()");
-            return s2;
+            Observable<StoreState> r = storeChannelFollowerStats.observeChannelFollowerStats(j).F(PublishActionDialogViewModel$Companion$observeChannelFollowerStatsStoreState$1.INSTANCE).r();
+            m.checkNotNullExpressionValue(r, "storeChannelFollowerStat…  .distinctUntilChanged()");
+            return r;
         }
     }
 
@@ -273,7 +273,7 @@ public final class PublishActionDialogViewModel extends AppViewModel<ViewState>
         this.messageId = j;
         this.channelId = j2;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         storeChannelFollowerStats.fetchChannelFollowerStats(j2);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), PublishActionDialogViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -299,12 +299,12 @@ public final class PublishActionDialogViewModel extends AppViewModel<ViewState>
 
     private final void emitFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.Failure(2131888049));
+        publishSubject.j.onNext(new Event.Failure(2131888048));
     }
 
     private final void emitSuccessActionEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.Success(2131891168));
+        publishSubject.j.onNext(new Event.Success(2131891239));
     }
 
     private final void handleStoreState(StoreState storeState) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java b/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java
index e0d1b723d5..1872a13288 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java
@@ -21,7 +21,7 @@ public final class ThreadSpineItemDecoration extends RecyclerView.ItemDecoration
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         this.context = context;
         this.adapter = widgetChatListAdapter;
-        this.drawable = ContextCompat.getDrawable(context, 2131232322);
+        this.drawable = ContextCompat.getDrawable(context, 2131232332);
         this.startPositionPx = context.getResources().getDimensionPixelSize(2131165317);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java
index 98a5da6f4c..566759a4ab 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1.java
@@ -43,6 +43,6 @@ public final class ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1
     public final Observable<? extends Activity> call(Long l) {
         StoreUserPresence presences = StoreStream.Companion.getPresences();
         m.checkNotNullExpressionValue(l, "authorId");
-        return presences.observeApplicationActivity(l.longValue(), this.$applicationId.longValue()).y(new AnonymousClass1(this));
+        return presences.observeApplicationActivity(l.longValue(), this.$applicationId.longValue()).x(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
index 5bcbbb93c8..0d8624287c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java
@@ -132,9 +132,9 @@ public final class ViewEmbedGameInvite extends LinearLayout {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable g = Observable.g(jVar, StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getApplication().observeApplication(Long.valueOf(gameInviteEntry.getApplication().f())), companion.getPresences().observeApplicationActivity(gameInviteEntry.getAuthorId(), gameInviteEntry.getApplication().f()), companion.getGameParty().observeUsersForPartyId(gameInviteEntry.getActivity().a()), new ViewEmbedGameInvite$sam$rx_functions_Func5$0(new ViewEmbedGameInvite$Model$Companion$get$1(this)));
                 m.checkNotNullExpressionValue(g, "Observable\n            .…   ::create\n            )");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(g).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(g).r();
+                m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                return r;
             }
 
             public final Observable<Model> getForShare(Clock clock, Uri uri, Activity activity) {
@@ -155,11 +155,11 @@ public final class ViewEmbedGameInvite extends LinearLayout {
                     MessageActivity messageActivity = new MessageActivity(MessageActivityType.Companion.a(intOrNull), queryParameter2);
                     j jVar2 = new j(activity);
                     StoreStream.Companion companion = StoreStream.Companion;
-                    Observable f = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), new j(Long.valueOf(clock.currentTimeMillis())), new j(messageActivity), Observable.m(jVar2, companion.getUsers().observeMeId().Z(new ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1(longOrNull, queryParameter2))), companion.getGameParty().observeUsersForPartyId(messageActivity.a()), companion.getApplication().observeApplication(longOrNull), new ViewEmbedGameInvite$sam$rx_functions_Func6$0(new ViewEmbedGameInvite$Model$Companion$getForShare$1(this)));
+                    Observable f = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), new j(Long.valueOf(clock.currentTimeMillis())), new j(messageActivity), Observable.m(jVar2, companion.getUsers().observeMeId().Y(new ViewEmbedGameInvite$Model$Companion$getForShare$activityObs$1(longOrNull, queryParameter2))), companion.getGameParty().observeUsersForPartyId(messageActivity.a()), companion.getApplication().observeApplication(longOrNull), new ViewEmbedGameInvite$sam$rx_functions_Func6$0(new ViewEmbedGameInvite$Model$Companion$getForShare$1(this)));
                     m.checkNotNullExpressionValue(f, "Observable\n            .…ateForShare\n            )");
-                    Observable<Model> s2 = ObservableExtensionsKt.computationLatest(f).s();
-                    m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                    return s2;
+                    Observable<Model> r = ObservableExtensionsKt.computationLatest(f).r();
+                    m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                    return r;
                 }
                 j jVar3 = new j(null);
                 m.checkNotNullExpressionValue(jVar3, "Observable.just(null)");
@@ -477,13 +477,13 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         Activity activity;
         ActivityParty i;
         boolean isDeadInvite = model.isDeadInvite(clock.currentTimeMillis());
-        TextView textView = this.binding.f1645c;
+        TextView textView = this.binding.f1642c;
         m.checkNotNullExpressionValue(textView, "binding.itemGameInviteApplicationNameTv");
         textView.setText(model.getApplication().g());
         TextView textView2 = this.binding.g;
-        int i2 = 2131890510;
+        int i2 = 2131890578;
         if (!isDeadInvite && model.getMessageActivity().b() != MessageActivityType.SPECTATE) {
-            i2 = 2131890514;
+            i2 = 2131890582;
         }
         textView2.setText(i2);
         int i3 = 0;
@@ -521,12 +521,12 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         m.checkNotNullExpressionValue(materialButton, "binding.itemGameInviteActionBtn");
         boolean z4 = false;
         materialButton.setVisibility(0);
-        int i = 2131890642;
+        int i = 2131890710;
         if (z2 || !model.getCanJoin()) {
             MaterialButton materialButton2 = this.binding.b;
             m.checkNotNullExpressionValue(materialButton2, "binding.itemGameInviteActionBtn");
             materialButton2.setEnabled(false);
-            this.binding.b.setText(2131890642);
+            this.binding.b.setText(2131890710);
             return;
         }
         MaterialButton materialButton3 = this.binding.b;
@@ -537,9 +537,9 @@ public final class ViewEmbedGameInvite extends LinearLayout {
         materialButton3.setEnabled(z4);
         MaterialButton materialButton4 = this.binding.b;
         if (z3) {
-            i = 2131890509;
+            i = 2131890577;
         } else if (model.isInParty()) {
-            i = 2131890521;
+            i = 2131890589;
         }
         materialButton4.setText(i);
         this.binding.b.setOnClickListener(new ViewEmbedGameInvite$onConfigureActionButton$1(this, model));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java
index ccf340a1b1..3555f63efc 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java
@@ -18,6 +18,6 @@ public final class WidgetChatList$flexInputViewModel$2 extends o implements Func
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FlexInputState> mo1invoke() {
-        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null);
+        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, null, null, null, 1022, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java
index ec83388a6c..825505960d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java
@@ -33,10 +33,11 @@ public final class WidgetChatList extends AppFragment {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetChatList.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChatListBinding;", 0)};
     private WidgetChatListAdapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding(this, WidgetChatList$binding$2.INSTANCE, new WidgetChatList$binding$3(this));
+    private RecyclerView.ItemAnimator defaultItemAnimator;
     private final Lazy flexInputViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(AppFlexInputViewModel.class), new WidgetChatList$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(new WidgetChatList$flexInputViewModel$2(this)));
 
     public WidgetChatList() {
-        super(2131558921);
+        super(2131558924);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChatList widgetChatList, WidgetChatListModel widgetChatListModel) {
@@ -124,6 +125,18 @@ public final class WidgetChatList extends AppFragment {
         }
     }
 
+    public final void disableItemAnimations() {
+        RecyclerView recyclerView = getBinding().b;
+        m.checkNotNullExpressionValue(recyclerView, "binding.chatListRecycler");
+        recyclerView.setItemAnimator(null);
+    }
+
+    public final void enableItemAnimations() {
+        RecyclerView recyclerView = getBinding().b;
+        m.checkNotNullExpressionValue(recyclerView, "binding.chatListRecycler");
+        recyclerView.setItemAnimator(this.defaultItemAnimator);
+    }
+
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
     public void onPause() {
         super.onPause();
@@ -163,5 +176,8 @@ public final class WidgetChatList extends AppFragment {
         }
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(WidgetChatListModel.Companion.get()), this, this.adapter), WidgetChatList.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatList$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getMessagesLoader().getScrollTo(), this, null, 2, null), WidgetChatList.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatList$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        RecyclerView recyclerView = getBinding().b;
+        m.checkNotNullExpressionValue(recyclerView, "binding.chatListRecycler");
+        this.defaultItemAnimator = recyclerView.getItemAnimator();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java
index aee220e841..7c66520c91 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.actions;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java
index 38de8be46e..fb7f8b0527 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java
@@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.actions;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.api.message.Message;
 import com.discord.app.AppComponent;
+import com.discord.models.message.Message;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.m;
@@ -40,7 +40,7 @@ public final class MessageActionDialogs$showPinMessageConfirmation$1 extends o i
 
         public final void invoke(Void r5) {
             MessageActionDialogs$showPinMessageConfirmation$1 messageActionDialogs$showPinMessageConfirmation$1 = this.this$0;
-            c.a.d.o.g(messageActionDialogs$showPinMessageConfirmation$1.$context, messageActionDialogs$showPinMessageConfirmation$1.$isPinned ? 2131891182 : 2131891166, 0, null, 12);
+            c.a.d.o.g(messageActionDialogs$showPinMessageConfirmation$1.$context, messageActionDialogs$showPinMessageConfirmation$1.$isPinned ? 2131891253 : 2131891237, 0, null, 12);
             this.this$0.$onSuccess.mo1invoke();
         }
     }
@@ -65,8 +65,8 @@ public final class MessageActionDialogs$showPinMessageConfirmation$1 extends o i
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        long i = this.$message.i();
-        long r = this.$message.r();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.$isPinned ? RestAPI.Companion.getApi().deleteChannelPin(i, r) : RestAPI.Companion.getApi().addChannelPin(i, r), false, 1, null), this.$appComponent, null, 2, null), MessageActionDialogs.INSTANCE.getClass(), view.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+        long channelId = this.$message.getChannelId();
+        long id2 = this.$message.getId();
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.$isPinned ? RestAPI.Companion.getApi().deleteChannelPin(channelId, id2) : RestAPI.Companion.getApi().addChannelPin(channelId, id2), false, 1, null), this.$appComponent, null, 2, null), MessageActionDialogs.INSTANCE.getClass(), view.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java
index 4e3cbe5eaa..e5ef254d9b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java
@@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.actions;
 
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
-import com.discord.api.message.Message;
 import com.discord.app.AppComponent;
+import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.PublishActionDialog;
 import com.discord.widgets.notice.WidgetNoticeDialog;
 import d0.o;
@@ -24,10 +24,10 @@ public final class MessageActionDialogs {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(function0, "onSuccess");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = context.getString(2131888063);
-        String string2 = context.getString(2131888064);
+        String string = context.getString(2131888062);
+        String string2 = context.getString(2131888063);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.delete_message_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(2131888052), context.getString(2131887178), g0.mapOf(o.to(2131364032, new MessageActionDialogs$showDeleteMessageConfirmation$1(message, function0))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(2131888051), context.getString(2131887178), g0.mapOf(o.to(2131364075, new MessageActionDialogs$showDeleteMessageConfirmation$1(message, function0))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
     }
 
     public final void showPinMessageConfirmation(FragmentManager fragmentManager, Context context, Message message, AppComponent appComponent, Function0<Unit> function0) {
@@ -36,18 +36,18 @@ public final class MessageActionDialogs {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(appComponent, "appComponent");
         m.checkNotNullParameter(function0, "onSuccess");
-        boolean areEqual = m.areEqual(message.D(), Boolean.TRUE);
+        boolean areEqual = m.areEqual(message.getPinned(), Boolean.TRUE);
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = context.getString(areEqual ? 2131894077 : 2131891889);
-        String string2 = context.getString(areEqual ? 2131894073 : 2131891887);
+        String string = context.getString(areEqual ? 2131894178 : 2131891961);
+        String string2 = context.getString(areEqual ? 2131894174 : 2131891959);
         m.checkNotNullExpressionValue(string2, "context.getString(\n     …age_body_mobile\n        )");
-        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(areEqual ? 2131894070 : 2131891883), context.getString(2131887178), g0.mapOf(o.to(2131364032, new MessageActionDialogs$showPinMessageConfirmation$1(message, areEqual, appComponent, context, function0))), null, null, null, null, null, null, 0, null, 16320, null);
+        WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(areEqual ? 2131894171 : 2131891955), context.getString(2131887178), g0.mapOf(o.to(2131364075, new MessageActionDialogs$showPinMessageConfirmation$1(message, areEqual, appComponent, context, function0))), null, null, null, null, null, null, 0, null, 16320, null);
     }
 
     public final void showPublishMessageConfirmation(FragmentManager fragmentManager, Message message, Function0<Unit> function0) {
         m.checkNotNullParameter(fragmentManager, "fragmentManager");
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(function0, "onSuccess");
-        PublishActionDialog.Companion.show$default(PublishActionDialog.Companion, fragmentManager, message.r(), message.i(), function0, null, 16, null);
+        PublishActionDialog.Companion.show$default(PublishActionDialog.Companion, fragmentManager, message.getId(), message.getChannelId(), function0, null, 16, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java
index 3d0cef750e..2f541475d3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.actions;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.o;
 import kotlin.Pair;
 import rx.functions.Func2;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java
index 37d0804467..be20a9a0c7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java
@@ -1,11 +1,11 @@
 package com.discord.widgets.chat.list.actions;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.models.domain.emoji.EmojiSet;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreEmoji;
 import com.discord.stores.StoreStream;
@@ -47,31 +47,18 @@ public final class WidgetChatListActions$Model$Companion$get$2<T, R> implements
 
     /* compiled from: WidgetChatListActions.kt */
     /* renamed from: com.discord.widgets.chat.list.actions.WidgetChatListActions$Model$Companion$get$2$2  reason: invalid class name */
-    public static final class AnonymousClass2<T, R> implements b<Guild, Integer> {
-        public static final AnonymousClass2 INSTANCE = new AnonymousClass2();
-
-        public final Integer call(Guild guild) {
-            if (guild != null) {
-                return Integer.valueOf(guild.getMfaLevel());
-            }
-            return null;
-        }
-    }
-
-    /* compiled from: WidgetChatListActions.kt */
-    /* renamed from: com.discord.widgets.chat.list.actions.WidgetChatListActions$Model$Companion$get$2$3  reason: invalid class name */
-    public static final class AnonymousClass3<T1, T2, T3, T4, T5, R> implements Func5<Long, MeUser, GuildMember, Integer, EmojiSet, WidgetChatListActions.Model> {
+    public static final class AnonymousClass2<T1, T2, T3, T4, T5, R> implements Func5<Long, MeUser, GuildMember, Guild, EmojiSet, WidgetChatListActions.Model> {
         public final /* synthetic */ Channel $channel;
         public final /* synthetic */ Message $message;
         public final /* synthetic */ WidgetChatListActions$Model$Companion$get$2 this$0;
 
-        public AnonymousClass3(WidgetChatListActions$Model$Companion$get$2 widgetChatListActions$Model$Companion$get$2, Message message, Channel channel) {
+        public AnonymousClass2(WidgetChatListActions$Model$Companion$get$2 widgetChatListActions$Model$Companion$get$2, Message message, Channel channel) {
             this.this$0 = widgetChatListActions$Model$Companion$get$2;
             this.$message = message;
             this.$channel = channel;
         }
 
-        public final WidgetChatListActions.Model call(Long l, MeUser meUser, GuildMember guildMember, Integer num, EmojiSet emojiSet) {
+        public final WidgetChatListActions.Model call(Long l, MeUser meUser, GuildMember guildMember, Guild guild, EmojiSet emojiSet) {
             WidgetChatListActions.Model.Companion companion = WidgetChatListActions.Model.Companion;
             Message message = this.$message;
             m.checkNotNullExpressionValue(meUser, "meUser");
@@ -80,7 +67,7 @@ public final class WidgetChatListActions$Model$Companion$get$2<T, R> implements
             CharSequence charSequence = widgetChatListActions$Model$Companion$get$2.$messageContent;
             int i = widgetChatListActions$Model$Companion$get$2.$type;
             m.checkNotNullExpressionValue(emojiSet, "emojis");
-            return WidgetChatListActions.Model.Companion.access$create(companion, message, l, meUser, guildMember, num, channel, charSequence, i, emojiSet);
+            return WidgetChatListActions.Model.Companion.access$create(companion, message, guild, l, meUser, guildMember, channel, charSequence, i, emojiSet);
         }
     }
 
@@ -98,14 +85,14 @@ public final class WidgetChatListActions$Model$Companion$get$2<T, R> implements
     }
 
     public final Observable<? extends WidgetChatListActions.Model> call(Pair<Message, Channel> pair) {
-        User g;
+        User author;
         Message component1 = pair.component1();
         Channel component2 = pair.component2();
-        long i = (component1 == null || (g = component1.g()) == null) ? 0 : g.i();
+        long i = (component1 == null || (author = component1.getAuthor()) == null) ? 0 : author.i();
         if (component2 == null) {
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.g(companion.getPermissions().observePermissionsForChannel(this.$channelId), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeComputed(component2.e(), d0.t.m.listOf(Long.valueOf(i))).G(new AnonymousClass1(i)), companion.getGuilds().observeGuild(component2.e()).G(AnonymousClass2.INSTANCE).s(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), component2.e(), component2.g(), false, false, 12, null), new AnonymousClass3(this, component1, component2));
+        return Observable.g(companion.getPermissions().observePermissionsForChannel(this.$channelId), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeComputed(component2.f(), d0.t.m.listOf(Long.valueOf(i))).F(new AnonymousClass1(i)), companion.getGuilds().observeGuild(component2.f()).r(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), component2.f(), component2.h(), false, false, 12, null), new AnonymousClass2(this, component1, component2));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java
index e6cddd62c3..ee888c5e06 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$binding$2.java
@@ -19,56 +19,56 @@ public final /* synthetic */ class WidgetChatListActions$binding$2 extends k imp
 
     public final WidgetChatListActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362867;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362867);
+        int i = 2131362892;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362892);
         if (recyclerView != null) {
-            i = 2131362868;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362868);
+            i = 2131362893;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362893);
             if (linearLayout != null) {
-                i = 2131362869;
-                TextView textView = (TextView) view.findViewById(2131362869);
+                i = 2131362894;
+                TextView textView = (TextView) view.findViewById(2131362894);
                 if (textView != null) {
-                    i = 2131362870;
-                    TextView textView2 = (TextView) view.findViewById(2131362870);
+                    i = 2131362895;
+                    TextView textView2 = (TextView) view.findViewById(2131362895);
                     if (textView2 != null) {
-                        i = 2131362871;
-                        TextView textView3 = (TextView) view.findViewById(2131362871);
+                        i = 2131362896;
+                        TextView textView3 = (TextView) view.findViewById(2131362896);
                         if (textView3 != null) {
-                            i = 2131362872;
-                            TextView textView4 = (TextView) view.findViewById(2131362872);
+                            i = 2131362897;
+                            TextView textView4 = (TextView) view.findViewById(2131362897);
                             if (textView4 != null) {
-                                i = 2131362873;
-                                TextView textView5 = (TextView) view.findViewById(2131362873);
+                                i = 2131362898;
+                                TextView textView5 = (TextView) view.findViewById(2131362898);
                                 if (textView5 != null) {
-                                    i = 2131362874;
-                                    TextView textView6 = (TextView) view.findViewById(2131362874);
+                                    i = 2131362899;
+                                    TextView textView6 = (TextView) view.findViewById(2131362899);
                                     if (textView6 != null) {
-                                        i = 2131362875;
-                                        TextView textView7 = (TextView) view.findViewById(2131362875);
+                                        i = 2131362900;
+                                        TextView textView7 = (TextView) view.findViewById(2131362900);
                                         if (textView7 != null) {
-                                            i = 2131362876;
-                                            TextView textView8 = (TextView) view.findViewById(2131362876);
+                                            i = 2131362901;
+                                            TextView textView8 = (TextView) view.findViewById(2131362901);
                                             if (textView8 != null) {
-                                                i = 2131362877;
-                                                TextView textView9 = (TextView) view.findViewById(2131362877);
+                                                i = 2131362902;
+                                                TextView textView9 = (TextView) view.findViewById(2131362902);
                                                 if (textView9 != null) {
-                                                    i = 2131362878;
-                                                    TextView textView10 = (TextView) view.findViewById(2131362878);
+                                                    i = 2131362903;
+                                                    TextView textView10 = (TextView) view.findViewById(2131362903);
                                                     if (textView10 != null) {
-                                                        i = 2131362879;
-                                                        TextView textView11 = (TextView) view.findViewById(2131362879);
+                                                        i = 2131362904;
+                                                        TextView textView11 = (TextView) view.findViewById(2131362904);
                                                         if (textView11 != null) {
-                                                            i = 2131362880;
-                                                            TextView textView12 = (TextView) view.findViewById(2131362880);
+                                                            i = 2131362905;
+                                                            TextView textView12 = (TextView) view.findViewById(2131362905);
                                                             if (textView12 != null) {
-                                                                i = 2131362881;
-                                                                TextView textView13 = (TextView) view.findViewById(2131362881);
+                                                                i = 2131362906;
+                                                                TextView textView13 = (TextView) view.findViewById(2131362906);
                                                                 if (textView13 != null) {
-                                                                    i = 2131362882;
-                                                                    TextView textView14 = (TextView) view.findViewById(2131362882);
+                                                                    i = 2131362907;
+                                                                    TextView textView14 = (TextView) view.findViewById(2131362907);
                                                                     if (textView14 != null) {
-                                                                        i = 2131362883;
-                                                                        TextView textView15 = (TextView) view.findViewById(2131362883);
+                                                                        i = 2131362908;
+                                                                        TextView textView15 = (TextView) view.findViewById(2131362908);
                                                                         if (textView15 != null) {
                                                                             return new WidgetChatListActionsBinding((NestedScrollView) view, recyclerView, linearLayout, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, textView13, textView14, textView15);
                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java
index 30dfc51fab..c167cd6d53 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java
@@ -7,16 +7,18 @@ import com.discord.widgets.chat.list.actions.WidgetChatListActions;
 /* compiled from: WidgetChatListActions.kt */
 public final class WidgetChatListActions$configureUI$10 implements View.OnClickListener {
     public final /* synthetic */ WidgetChatListActions.Model $data;
+    public final /* synthetic */ long $guildId;
     public final /* synthetic */ WidgetChatListActions this$0;
 
-    public WidgetChatListActions$configureUI$10(WidgetChatListActions widgetChatListActions, WidgetChatListActions.Model model) {
+    public WidgetChatListActions$configureUI$10(WidgetChatListActions widgetChatListActions, WidgetChatListActions.Model model, long j) {
         this.this$0 = widgetChatListActions;
         this.$data = model;
+        this.$guildId = j;
     }
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        this.this$0.requireContext().startActivity(Intent.createChooser(IntentUtils.INSTANCE.toExternalizedSend(IntentUtils.RouteBuilders.selectChannel(this.$data.getMessage().i(), this.$data.getGuildId(), Long.valueOf(this.$data.getMessage().r()))), this.this$0.getString(2131893239)));
+        this.this$0.requireContext().startActivity(Intent.createChooser(IntentUtils.INSTANCE.toExternalizedSend(IntentUtils.RouteBuilders.selectChannel(this.$data.getMessage().getChannelId(), this.$guildId, Long.valueOf(this.$data.getMessage().getId()))), this.this$0.getString(2131893322)));
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java
index db07bd7afe..b5e3379e9b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java
@@ -19,9 +19,9 @@ public final class WidgetChatListActions$configureUI$13 implements View.OnClickL
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         this.this$0.dismiss();
-        User g = this.$data.getMessage().g();
-        if (g != null) {
-            long i = g.i();
+        User author = this.$data.getMessage().getAuthor();
+        if (author != null) {
+            long i = author.i();
             WidgetUserSheet.Companion companion = WidgetUserSheet.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java
index 3404f56b48..68bbcc3894 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java
@@ -6,16 +6,18 @@ import com.discord.widgets.chat.list.actions.WidgetChatListActions;
 /* compiled from: WidgetChatListActions.kt */
 public final class WidgetChatListActions$configureUI$15 implements View.OnClickListener {
     public final /* synthetic */ WidgetChatListActions.Model $data;
+    public final /* synthetic */ long $guildId;
     public final /* synthetic */ WidgetChatListActions this$0;
 
-    public WidgetChatListActions$configureUI$15(WidgetChatListActions widgetChatListActions, WidgetChatListActions.Model model) {
+    public WidgetChatListActions$configureUI$15(WidgetChatListActions widgetChatListActions, long j, WidgetChatListActions.Model model) {
         this.this$0 = widgetChatListActions;
+        this.$guildId = j;
         this.$data = model;
     }
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         this.this$0.dismiss();
-        ChannelSelector.Companion.getInstance().openCreateThread(this.$data.getGuildId(), this.$data.getMessage().i(), Long.valueOf(this.$data.getMessage().r()));
+        ChannelSelector.Companion.getInstance().openCreateThread(this.$guildId, this.$data.getMessage().getChannelId(), Long.valueOf(this.$data.getMessage().getId()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java
index e6f2e53f0d..543f716156 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java
@@ -46,8 +46,8 @@ public final class WidgetChatListActions$configureUI$5 implements View.OnClickLi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        Integer M = this.$data.getMessage().M();
-        if (M != null && M.intValue() == -4) {
+        Integer type = this.$data.getMessage().getType();
+        if (type != null && type.intValue() == -4) {
             StoreStream.Companion.getInteractions().resendApplicationCommand(this.$data.getMessage());
         } else {
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(StoreMessages.resendMessage$default(StoreStream.Companion.getMessages(), this.$data.getMessage(), false, 2, null)), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass1.INSTANCE, 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java
index 88ca5ed372..46a2730bf7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java
@@ -15,7 +15,7 @@ public final class WidgetChatListActions$configureUI$6 implements View.OnClickLi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        StoreStream.Companion.getMessageAck().markUnread(this.$data.getMessage().i(), this.$data.getMessage().r());
+        StoreStream.Companion.getMessageAck().markUnread(this.$data.getMessage().getChannelId(), this.$data.getMessage().getId());
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java
index d54c42ebd4..934cbe6dfe 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java
@@ -19,7 +19,7 @@ public final class WidgetChatListActions$configureUI$8 implements View.OnClickLi
     public final void onClick(View view) {
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        o.c(requireContext, String.valueOf(this.$data.getMessage().r()), 0, 4);
+        o.c(requireContext, String.valueOf(this.$data.getMessage().getId()), 0, 4);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java
index 230c664891..ab70aa1c65 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java
@@ -19,9 +19,9 @@ public final class WidgetChatListActions$configureUI$9 implements View.OnClickLi
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (ReportsFeatureFlag.Companion.isEnabled()) {
-            WidgetMobileReports.Companion.launchMessageReport(a.T(view, "view", "view.context"), this.$data.getMessage().r(), WidgetChatListActions.access$getChannelId$p(this.this$0));
+            WidgetMobileReports.Companion.launchMessageReport(a.T(view, "view", "view.context"), this.$data.getMessage().getId(), WidgetChatListActions.access$getChannelId$p(this.this$0));
         } else {
-            WidgetTosReportViolation.Companion.show(a.T(view, "view", "view.context"), this.$data.getMessageAuthorName(), Long.valueOf(this.$data.getMessage().i()), Long.valueOf(this.$data.getMessage().r()));
+            WidgetTosReportViolation.Companion.show(a.T(view, "view", "view.context"), this.$data.getMessageAuthorName(), Long.valueOf(this.$data.getMessage().getChannelId()), Long.valueOf(this.$data.getMessage().getId()));
         }
         this.this$0.dismiss();
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java
index 8db5865b3b..05349d298a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java
@@ -1,9 +1,9 @@
 package com.discord.widgets.chat.list.actions;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.models.domain.emoji.EmojiSet;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.stores.StoreEmoji;
 import com.discord.stores.StoreStream;
@@ -31,15 +31,15 @@ public final class WidgetChatListActions$editMessage$1<T, R> implements b<Map<Lo
         }
 
         public final CharSequence call(Map<Long, ? extends User> map, Map<Long, Guild> map2, EmojiSet emojiSet) {
-            String k = this.this$0.$message.k();
-            if (k == null) {
-                k = "";
+            String content = this.this$0.$message.getContent();
+            if (content == null) {
+                content = "";
             }
             Map map3 = this.$channels;
             m.checkNotNullExpressionValue(map3, "channels");
             m.checkNotNullExpressionValue(map, "users");
             m.checkNotNullExpressionValue(emojiSet, "emojiSet");
-            return MessageUnparser.unparse(k, map2.get(Long.valueOf(this.$guildId)), map3, map, emojiSet);
+            return MessageUnparser.unparse(content, map2.get(Long.valueOf(this.$guildId)), map3, map, emojiSet);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -62,9 +62,9 @@ public final class WidgetChatListActions$editMessage$1<T, R> implements b<Map<Lo
     }
 
     public final Observable<? extends CharSequence> call(Map<Long, Channel> map) {
-        Channel channel = map.get(Long.valueOf(this.$message.i()));
-        long e = channel != null ? channel.e() : 0;
+        Channel channel = map.get(Long.valueOf(this.$message.getChannelId()));
+        long f = channel != null ? channel.f() : 0;
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(companion.getUsers().observeAllUsers(), companion.getGuilds().observeGuilds(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), e, this.$message.i(), false, false, 12, null), new AnonymousClass1(this, e, map));
+        return Observable.i(companion.getUsers().observeAllUsers(), companion.getGuilds().observeGuilds(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), f, this.$message.getChannelId(), false, false, 12, null), new AnonymousClass1(this, f, map));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java
index 479b0dfa53..32493c2e22 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java
@@ -1,6 +1,6 @@
 package com.discord.widgets.chat.list.actions;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreChat;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java
index b06237e118..9681d481d6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java
@@ -55,6 +55,6 @@ public final class WidgetChatListActions$removeAllReactions$1 extends o implemen
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeAllReactions(this.$model.getMessage().i(), this.$model.getMessage().r()), false, 1, null), this.this$0, null, 2, null), view.getContext(), "REST: removeAllReactions", (Function1) null, new AnonymousClass1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeAllReactions(this.$model.getMessage().getChannelId(), this.$model.getMessage().getId()), false, 1, null), this.this$0, null, 2, null), view.getContext(), "REST: removeAllReactions", (Function1) null, new AnonymousClass1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
index 25d7df8fa6..8dcb92bb78 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java
@@ -1,6 +1,5 @@
 package com.discord.widgets.chat.list.actions;
 
-import a0.a.a.b;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
@@ -12,18 +11,18 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.api.user.User;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetChatListActionsBinding;
 import com.discord.models.domain.emoji.Emoji;
 import com.discord.models.domain.emoji.EmojiSet;
+import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.MeUser;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.dimen.DimenUtils;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.utilities.permissions.ManageMessageContext;
 import com.discord.utilities.permissions.PermissionUtils;
@@ -100,12 +99,12 @@ public final class WidgetChatListActions extends AppBottomSheet {
     public static final class Model {
         public static final Companion Companion = new Companion(null);
         private final Channel channel;
-        private final long guildId;
+        private final Guild guild;
         private final boolean isDeveloper;
         private final ManageMessageContext manageMessageContext;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2132me;
+        private final MeUser f2138me;
         private final Message message;
         private final String messageAuthorName;
         private final CharSequence messageContent;
@@ -122,22 +121,22 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 this();
             }
 
-            public static final /* synthetic */ Model access$create(Companion companion, Message message, Long l, MeUser meUser, GuildMember guildMember, Integer num, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) {
-                return companion.create(message, l, meUser, guildMember, num, channel, charSequence, i, emojiSet);
+            public static final /* synthetic */ Model access$create(Companion companion, Message message, Guild guild, Long l, MeUser meUser, GuildMember guildMember, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) {
+                return companion.create(message, guild, l, meUser, guildMember, channel, charSequence, i, emojiSet);
             }
 
-            private final Model create(Message message, Long l, MeUser meUser, GuildMember guildMember, Integer num, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) {
+            private final Model create(Message message, Guild guild, Long l, MeUser meUser, GuildMember guildMember, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) {
                 String nick;
-                ThreadMetadata x2;
+                ThreadMetadata y2;
                 String str = null;
                 if (message == null) {
                     return null;
                 }
-                ManageMessageContext from = ManageMessageContext.Companion.from(message, l, meUser, num, channel != null && AnimatableValueParser.r1(channel), channel != null && AnimatableValueParser.w1(channel), (channel == null || (x2 = channel.x()) == null || !x2.b()) ? false : true);
+                ManageMessageContext from = ManageMessageContext.Companion.from(message, l, meUser, guild != null ? Integer.valueOf(guild.getMfaLevel()) : null, channel != null && AnimatableValueParser.s1(channel), channel != null && AnimatableValueParser.x1(channel), (channel == null || (y2 = channel.y()) == null || !y2.b()) ? false : true);
                 if (guildMember == null || (nick = guildMember.getNick()) == null) {
-                    User g = message.g();
-                    if (g != null) {
-                        str = g.r();
+                    User author = message.getAuthor();
+                    if (author != null) {
+                        str = author.r();
                     }
                 } else {
                     str = nick;
@@ -145,30 +144,29 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 if (str == null) {
                     str = "";
                 }
-                long e = channel != null ? channel.e() : 0;
                 boolean isDeveloperMode = StoreStream.Companion.getUserSettings().getIsDeveloperMode();
                 List<Emoji> list = emojiSet.recentEmojis;
                 m.checkNotNullExpressionValue(list, "emojis.recentEmojis");
-                return new Model(message, e, str, charSequence, from, i, isDeveloperMode, list, channel, l, meUser);
+                return new Model(message, guild, str, charSequence, from, i, isDeveloperMode, list, channel, l, meUser);
             }
 
             public final Observable<Model> get(long j, long j2, CharSequence charSequence, int i) {
-                Observable<Model> Z = Observable.j(i != 0 ? i != 1 ? new j<>(null) : StoreStream.Companion.getPinnedMessages().observePinnedMessage(j, j2) : StoreStream.Companion.getMessages().observeMessagesForChannel(j, j2), StoreStream.Companion.getChannels().observeChannel(j), WidgetChatListActions$Model$Companion$get$1.INSTANCE).Z(new WidgetChatListActions$Model$Companion$get$2(j, charSequence, i));
-                m.checkNotNullExpressionValue(Z, "Observable\n            .…          }\n            }");
-                return Z;
+                Observable<Model> Y = Observable.j(i != 0 ? i != 1 ? new j<>(null) : StoreStream.Companion.getPinnedMessages().observePinnedMessage(j, j2) : StoreStream.Companion.getMessages().observeMessagesForChannel(j, j2), StoreStream.Companion.getChannels().observeChannel(j), WidgetChatListActions$Model$Companion$get$1.INSTANCE).Y(new WidgetChatListActions$Model$Companion$get$2(j, charSequence, i));
+                m.checkNotNullExpressionValue(Y, "Observable\n            .…          }\n            }");
+                return Y;
             }
         }
 
-        /* JADX DEBUG: Multi-variable search result rejected for r10v0, resolved type: java.util.List<? extends com.discord.models.domain.emoji.Emoji> */
+        /* JADX DEBUG: Multi-variable search result rejected for r9v0, resolved type: java.util.List<? extends com.discord.models.domain.emoji.Emoji> */
         /* JADX WARN: Multi-variable type inference failed */
-        public Model(Message message, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List<? extends Emoji> list, Channel channel, Long l, MeUser meUser) {
+        public Model(Message message, Guild guild, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List<? extends Emoji> list, Channel channel, Long l, MeUser meUser) {
             m.checkNotNullParameter(message, "message");
             m.checkNotNullParameter(str, "messageAuthorName");
             m.checkNotNullParameter(manageMessageContext, "manageMessageContext");
             m.checkNotNullParameter(list, "recentEmojis");
             m.checkNotNullParameter(meUser, "me");
             this.message = message;
-            this.guildId = j;
+            this.guild = guild;
             this.messageAuthorName = str;
             this.messageContent = charSequence;
             this.manageMessageContext = manageMessageContext;
@@ -177,11 +175,11 @@ public final class WidgetChatListActions extends AppBottomSheet {
             this.recentEmojis = list;
             this.channel = channel;
             this.permissions = l;
-            this.f2132me = meUser;
+            this.f2138me = meUser;
         }
 
-        public static /* synthetic */ Model copy$default(Model model, Message message, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser, int i2, Object obj) {
-            return model.copy((i2 & 1) != 0 ? model.message : message, (i2 & 2) != 0 ? model.guildId : j, (i2 & 4) != 0 ? model.messageAuthorName : str, (i2 & 8) != 0 ? model.messageContent : charSequence, (i2 & 16) != 0 ? model.manageMessageContext : manageMessageContext, (i2 & 32) != 0 ? model.type : i, (i2 & 64) != 0 ? model.isDeveloper : z2, (i2 & 128) != 0 ? model.recentEmojis : list, (i2 & 256) != 0 ? model.channel : channel, (i2 & 512) != 0 ? model.permissions : l, (i2 & 1024) != 0 ? model.f2132me : meUser);
+        public static /* synthetic */ Model copy$default(Model model, Message message, Guild guild, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser, int i2, Object obj) {
+            return model.copy((i2 & 1) != 0 ? model.message : message, (i2 & 2) != 0 ? model.guild : guild, (i2 & 4) != 0 ? model.messageAuthorName : str, (i2 & 8) != 0 ? model.messageContent : charSequence, (i2 & 16) != 0 ? model.manageMessageContext : manageMessageContext, (i2 & 32) != 0 ? model.type : i, (i2 & 64) != 0 ? model.isDeveloper : z2, (i2 & 128) != 0 ? model.recentEmojis : list, (i2 & 256) != 0 ? model.channel : channel, (i2 & 512) != 0 ? model.permissions : l, (i2 & 1024) != 0 ? model.f2138me : meUser);
         }
 
         public final Message component1() {
@@ -193,11 +191,11 @@ public final class WidgetChatListActions extends AppBottomSheet {
         }
 
         public final MeUser component11() {
-            return this.f2132me;
+            return this.f2138me;
         }
 
-        public final long component2() {
-            return this.guildId;
+        public final Guild component2() {
+            return this.guild;
         }
 
         public final String component3() {
@@ -228,13 +226,13 @@ public final class WidgetChatListActions extends AppBottomSheet {
             return this.channel;
         }
 
-        public final Model copy(Message message, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List<? extends Emoji> list, Channel channel, Long l, MeUser meUser) {
+        public final Model copy(Message message, Guild guild, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List<? extends Emoji> list, Channel channel, Long l, MeUser meUser) {
             m.checkNotNullParameter(message, "message");
             m.checkNotNullParameter(str, "messageAuthorName");
             m.checkNotNullParameter(manageMessageContext, "manageMessageContext");
             m.checkNotNullParameter(list, "recentEmojis");
             m.checkNotNullParameter(meUser, "me");
-            return new Model(message, j, str, charSequence, manageMessageContext, i, z2, list, channel, l, meUser);
+            return new Model(message, guild, str, charSequence, manageMessageContext, i, z2, list, channel, l, meUser);
         }
 
         public boolean equals(Object obj) {
@@ -245,15 +243,15 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.message, model.message) && this.guildId == model.guildId && m.areEqual(this.messageAuthorName, model.messageAuthorName) && m.areEqual(this.messageContent, model.messageContent) && m.areEqual(this.manageMessageContext, model.manageMessageContext) && this.type == model.type && this.isDeveloper == model.isDeveloper && m.areEqual(this.recentEmojis, model.recentEmojis) && m.areEqual(this.channel, model.channel) && m.areEqual(this.permissions, model.permissions) && m.areEqual(this.f2132me, model.f2132me);
+            return m.areEqual(this.message, model.message) && m.areEqual(this.guild, model.guild) && m.areEqual(this.messageAuthorName, model.messageAuthorName) && m.areEqual(this.messageContent, model.messageContent) && m.areEqual(this.manageMessageContext, model.manageMessageContext) && this.type == model.type && this.isDeveloper == model.isDeveloper && m.areEqual(this.recentEmojis, model.recentEmojis) && m.areEqual(this.channel, model.channel) && m.areEqual(this.permissions, model.permissions) && m.areEqual(this.f2138me, model.f2138me);
         }
 
         public final Channel getChannel() {
             return this.channel;
         }
 
-        public final long getGuildId() {
-            return this.guildId;
+        public final Guild getGuild() {
+            return this.guild;
         }
 
         public final ManageMessageContext getManageMessageContext() {
@@ -261,7 +259,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
         }
 
         public final MeUser getMe() {
-            return this.f2132me;
+            return this.f2138me;
         }
 
         public final Message getMessage() {
@@ -291,13 +289,15 @@ public final class WidgetChatListActions extends AppBottomSheet {
         public int hashCode() {
             Message message = this.message;
             int i = 0;
-            int a = (b.a(this.guildId) + ((message != null ? message.hashCode() : 0) * 31)) * 31;
+            int hashCode = (message != null ? message.hashCode() : 0) * 31;
+            Guild guild = this.guild;
+            int hashCode2 = (hashCode + (guild != null ? guild.hashCode() : 0)) * 31;
             String str = this.messageAuthorName;
-            int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
+            int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31;
             CharSequence charSequence = this.messageContent;
-            int hashCode2 = (hashCode + (charSequence != null ? charSequence.hashCode() : 0)) * 31;
+            int hashCode4 = (hashCode3 + (charSequence != null ? charSequence.hashCode() : 0)) * 31;
             ManageMessageContext manageMessageContext = this.manageMessageContext;
-            int hashCode3 = (((hashCode2 + (manageMessageContext != null ? manageMessageContext.hashCode() : 0)) * 31) + this.type) * 31;
+            int hashCode5 = (((hashCode4 + (manageMessageContext != null ? manageMessageContext.hashCode() : 0)) * 31) + this.type) * 31;
             boolean z2 = this.isDeveloper;
             if (z2) {
                 z2 = true;
@@ -305,18 +305,18 @@ public final class WidgetChatListActions extends AppBottomSheet {
             int i2 = z2 ? 1 : 0;
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
-            int i5 = (hashCode3 + i2) * 31;
+            int i5 = (hashCode5 + i2) * 31;
             List<Emoji> list = this.recentEmojis;
-            int hashCode4 = (i5 + (list != null ? list.hashCode() : 0)) * 31;
+            int hashCode6 = (i5 + (list != null ? list.hashCode() : 0)) * 31;
             Channel channel = this.channel;
-            int hashCode5 = (hashCode4 + (channel != null ? channel.hashCode() : 0)) * 31;
+            int hashCode7 = (hashCode6 + (channel != null ? channel.hashCode() : 0)) * 31;
             Long l = this.permissions;
-            int hashCode6 = (hashCode5 + (l != null ? l.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2132me;
+            int hashCode8 = (hashCode7 + (l != null ? l.hashCode() : 0)) * 31;
+            MeUser meUser = this.f2138me;
             if (meUser != null) {
                 i = meUser.hashCode();
             }
-            return hashCode6 + i;
+            return hashCode8 + i;
         }
 
         public final boolean isDeveloper() {
@@ -326,8 +326,8 @@ public final class WidgetChatListActions extends AppBottomSheet {
         public String toString() {
             StringBuilder L = a.L("Model(message=");
             L.append(this.message);
-            L.append(", guildId=");
-            L.append(this.guildId);
+            L.append(", guild=");
+            L.append(this.guild);
             L.append(", messageAuthorName=");
             L.append(this.messageAuthorName);
             L.append(", messageContent=");
@@ -345,7 +345,7 @@ public final class WidgetChatListActions extends AppBottomSheet {
             L.append(", permissions=");
             L.append(this.permissions);
             L.append(", me=");
-            L.append(this.f2132me);
+            L.append(this.f2138me);
             L.append(")");
             return L.toString();
         }
@@ -451,68 +451,69 @@ public final class WidgetChatListActions extends AppBottomSheet {
         widgetChatListActionsEmojisAdapter.setData(list, min);
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:100:0x0297  */
-    /* JADX WARNING: Removed duplicated region for block: B:103:0x02b2  */
-    /* JADX WARNING: Removed duplicated region for block: B:104:0x02b6  */
-    /* JADX WARNING: Removed duplicated region for block: B:107:0x02df  */
-    /* JADX WARNING: Removed duplicated region for block: B:108:0x02e1  */
-    /* JADX WARNING: Removed duplicated region for block: B:128:0x034f  */
-    /* JADX WARNING: Removed duplicated region for block: B:129:0x0351  */
-    /* JADX WARNING: Removed duplicated region for block: B:132:0x0388  */
-    /* JADX WARNING: Removed duplicated region for block: B:78:0x01fe  */
-    /* JADX WARNING: Removed duplicated region for block: B:79:0x0200  */
-    /* JADX WARNING: Removed duplicated region for block: B:87:0x023e  */
-    /* JADX WARNING: Removed duplicated region for block: B:88:0x0240  */
-    /* JADX WARNING: Removed duplicated region for block: B:95:0x026b  */
-    /* JADX WARNING: Removed duplicated region for block: B:96:0x026d  */
-    /* JADX WARNING: Removed duplicated region for block: B:99:0x0295  */
+    /* JADX WARNING: Removed duplicated region for block: B:102:0x029c  */
+    /* JADX WARNING: Removed duplicated region for block: B:103:0x029e  */
+    /* JADX WARNING: Removed duplicated region for block: B:106:0x02b9  */
+    /* JADX WARNING: Removed duplicated region for block: B:107:0x02bd  */
+    /* JADX WARNING: Removed duplicated region for block: B:110:0x02e6  */
+    /* JADX WARNING: Removed duplicated region for block: B:111:0x02e8  */
+    /* JADX WARNING: Removed duplicated region for block: B:131:0x0356  */
+    /* JADX WARNING: Removed duplicated region for block: B:132:0x0358  */
+    /* JADX WARNING: Removed duplicated region for block: B:135:0x038f  */
+    /* JADX WARNING: Removed duplicated region for block: B:81:0x0205  */
+    /* JADX WARNING: Removed duplicated region for block: B:82:0x0207  */
+    /* JADX WARNING: Removed duplicated region for block: B:90:0x0245  */
+    /* JADX WARNING: Removed duplicated region for block: B:91:0x0247  */
+    /* JADX WARNING: Removed duplicated region for block: B:98:0x0272  */
+    /* JADX WARNING: Removed duplicated region for block: B:99:0x0274  */
     private final void configureUI(Model model) {
         Channel channel;
-        Integer M;
+        Integer type;
         if (model == null) {
             dismiss();
             return;
         }
-        boolean isLocal = MessageUtils.isLocal(model.getMessage());
-        MessageUtils messageUtils = MessageUtils.INSTANCE;
-        boolean isCrossposted = messageUtils.isCrossposted(model.getMessage());
+        Guild guild = model.getGuild();
+        long id2 = guild != null ? guild.getId() : 0;
+        boolean isLocal = model.getMessage().isLocal();
+        boolean isCrossposted = model.getMessage().isCrossposted();
         boolean z2 = true;
         int i = 0;
         boolean z3 = model.getManageMessageContext().getCanEdit() || model.getManageMessageContext().getCanManageMessages();
         configureAddReactionEmojisList(model.getRecentEmojis(), isLocal, model.getManageMessageContext().getCanAddReactions());
-        int type = model.getType();
-        if (type == 0) {
+        int type2 = model.getType();
+        if (type2 == 0) {
             TextView textView = getBinding().f;
             m.checkNotNullExpressionValue(textView, "binding.dialogChatActionsEdit");
             textView.setVisibility(model.getManageMessageContext().getCanEdit() ? 0 : 8);
             getBinding().f.setOnClickListener(new WidgetChatListActions$configureUI$1(this, model));
-        } else if (type == 1) {
+        } else if (type2 == 1) {
             TextView textView2 = getBinding().f;
             m.checkNotNullExpressionValue(textView2, "binding.dialogChatActionsEdit");
             textView2.setVisibility(8);
         }
         TextView textView3 = getBinding().k;
         m.checkNotNullExpressionValue(textView3, "binding.dialogChatActionsPublish");
-        textView3.setVisibility(z3 && (channel = model.getChannel()) != null && channel.z() == 5 && (M = model.getMessage().M()) != null && M.intValue() == 0 && !isCrossposted ? 0 : 8);
+        textView3.setVisibility(z3 && (channel = model.getChannel()) != null && channel.A() == 5 && (type = model.getMessage().getType()) != null && type.intValue() == 0 && !isCrossposted ? 0 : 8);
         getBinding().k.setOnClickListener(new WidgetChatListActions$configureUI$2(this, model));
         TextView textView4 = getBinding().g;
         m.checkNotNullExpressionValue(textView4, "binding.dialogChatActionsManageReactions");
-        textView4.setVisibility(model.getMessage().F().isEmpty() ^ true ? 0 : 8);
+        textView4.setVisibility(model.getMessage().getReactionsMap().isEmpty() ^ true ? 0 : 8);
         getBinding().g.setOnClickListener(new WidgetChatListActions$configureUI$3(this));
         TextView textView5 = getBinding().l;
         m.checkNotNullExpressionValue(textView5, "binding.dialogChatActionsRemoveAllReactions");
-        textView5.setVisibility((model.getMessage().F().isEmpty() ^ true) && model.getManageMessageContext().getCanManageMessages() ? 0 : 8);
+        textView5.setVisibility((model.getMessage().getReactionsMap().isEmpty() ^ true) && model.getManageMessageContext().getCanManageMessages() ? 0 : 8);
         getBinding().l.setOnClickListener(new WidgetChatListActions$configureUI$4(this, model));
         TextView textView6 = getBinding().o;
         m.checkNotNullExpressionValue(textView6, "binding.dialogChatActionsResend");
-        textView6.setVisibility(messageUtils.canResend(model.getMessage()) ? 0 : 8);
+        textView6.setVisibility(model.getMessage().canResend() ? 0 : 8);
         getBinding().o.setOnClickListener(new WidgetChatListActions$configureUI$5(this, model));
         TextView textView7 = getBinding().h;
         m.checkNotNullExpressionValue(textView7, "binding.dialogChatActionsMarkUnread");
-        textView7.setVisibility(!messageUtils.isFailed(model.getMessage()) && model.getManageMessageContext().getCanMarkUnread() ? 0 : 8);
+        textView7.setVisibility(!model.getMessage().isFailed() && model.getManageMessageContext().getCanMarkUnread() ? 0 : 8);
         getBinding().h.setOnClickListener(new WidgetChatListActions$configureUI$6(this, model));
         if (model.getMessageContent() != null) {
-            if ((model.getMessageContent().length() > 0) && !messageUtils.isLocalApplicationCommand(model.getMessage())) {
+            if ((model.getMessageContent().length() > 0) && !model.getMessage().isLocalApplicationCommand()) {
                 TextView textView8 = getBinding().f1723c;
                 m.checkNotNullExpressionValue(textView8, "binding.dialogChatActionsCopy");
                 textView8.setVisibility(0);
@@ -523,25 +524,25 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 getBinding().d.setOnClickListener(new WidgetChatListActions$configureUI$8(this, model));
                 TextView textView10 = getBinding().n;
                 m.checkNotNullExpressionValue(textView10, "binding.dialogChatActionsReport");
-                User g = model.getMessage().g();
-                textView10.setVisibility(!(g != null || (g.i() > model.getMe().getId() ? 1 : (g.i() == model.getMe().getId() ? 0 : -1)) != 0) ? 0 : 8);
+                User author = model.getMessage().getAuthor();
+                textView10.setVisibility(!(author != null || (author.i() > model.getMe().getId() ? 1 : (author.i() == model.getMe().getId() ? 0 : -1)) != 0) ? 0 : 8);
                 getBinding().n.setOnClickListener(new WidgetChatListActions$configureUI$9(this, model));
                 TextView textView11 = getBinding().p;
                 m.checkNotNullExpressionValue(textView11, "binding.dialogChatActionsShare");
                 textView11.setVisibility(!(!model.isDeveloper() && !isLocal) ? 0 : 8);
-                getBinding().p.setOnClickListener(new WidgetChatListActions$configureUI$10(this, model));
+                getBinding().p.setOnClickListener(new WidgetChatListActions$configureUI$10(this, model, id2));
                 TextView textView12 = getBinding().i;
                 m.checkNotNullExpressionValue(textView12, "binding.dialogChatActionsPin");
                 textView12.setVisibility(!model.getManageMessageContext().getCanTogglePinned() ? 0 : 8);
-                getBinding().i.setText(!m.areEqual(model.getMessage().D(), Boolean.TRUE) ? 2131894070 : 2131891883);
+                getBinding().i.setText(!m.areEqual(model.getMessage().getPinned(), Boolean.TRUE) ? 2131894171 : 2131891955);
                 getBinding().i.setOnClickListener(new WidgetChatListActions$configureUI$11(this, model));
                 TextView textView13 = getBinding().e;
                 m.checkNotNullExpressionValue(textView13, "binding.dialogChatActionsDelete");
                 textView13.setVisibility(!model.getManageMessageContext().getCanDelete() ? 0 : 8);
                 getBinding().e.setOnClickListener(new WidgetChatListActions$configureUI$12(this, model));
                 getBinding().j.setOnClickListener(new WidgetChatListActions$configureUI$13(this, model));
-                boolean z4 = model.getChannel() == null && AnimatableValueParser.r1(model.getChannel()) && !AnimatableValueParser.w1(model.getChannel());
-                if (isLocal || model.getType() != 0 || !messageUtils.isUserMessage(model.getMessage()) || (!z4 && !PermissionUtils.can(67584, model.getPermissions()))) {
+                boolean z4 = model.getChannel() == null && AnimatableValueParser.s1(model.getChannel()) && !AnimatableValueParser.x1(model.getChannel());
+                if (isLocal || model.getType() != 0 || !model.getMessage().isUserMessage() || (!z4 && !PermissionUtils.can(67584, model.getPermissions()))) {
                     z2 = false;
                 }
                 TextView textView14 = getBinding().m;
@@ -550,11 +551,11 @@ public final class WidgetChatListActions extends AppBottomSheet {
                 getBinding().m.setOnClickListener(new WidgetChatListActions$configureUI$14(this, model));
                 TextView textView15 = getBinding().q;
                 m.checkNotNullExpressionValue(textView15, "binding.dialogChatActionsStartThread");
-                if (!ThreadUtils.INSTANCE.canCreatePublicThread(model.getPermissions(), model.getChannel(), model.getMessage(), model.getGuildId())) {
+                if (!ThreadUtils.INSTANCE.canCreatePublicThread(model.getPermissions(), model.getChannel(), model.getMessage(), model.getGuild())) {
                     i = 8;
                 }
                 textView15.setVisibility(i);
-                getBinding().q.setOnClickListener(new WidgetChatListActions$configureUI$15(this, model));
+                getBinding().q.setOnClickListener(new WidgetChatListActions$configureUI$15(this, id2, model));
             }
         }
         TextView textView16 = getBinding().f1723c;
@@ -566,17 +567,17 @@ public final class WidgetChatListActions extends AppBottomSheet {
         getBinding().d.setOnClickListener(new WidgetChatListActions$configureUI$8(this, model));
         TextView textView10 = getBinding().n;
         m.checkNotNullExpressionValue(textView10, "binding.dialogChatActionsReport");
-        User g = model.getMessage().g();
-        textView10.setVisibility(!(g != null || (g.i() > model.getMe().getId() ? 1 : (g.i() == model.getMe().getId() ? 0 : -1)) != 0) ? 0 : 8);
+        User author = model.getMessage().getAuthor();
+        textView10.setVisibility(!(author != null || (author.i() > model.getMe().getId() ? 1 : (author.i() == model.getMe().getId() ? 0 : -1)) != 0) ? 0 : 8);
         getBinding().n.setOnClickListener(new WidgetChatListActions$configureUI$9(this, model));
         TextView textView11 = getBinding().p;
         m.checkNotNullExpressionValue(textView11, "binding.dialogChatActionsShare");
         textView11.setVisibility(!(!model.isDeveloper() && !isLocal) ? 0 : 8);
-        getBinding().p.setOnClickListener(new WidgetChatListActions$configureUI$10(this, model));
+        getBinding().p.setOnClickListener(new WidgetChatListActions$configureUI$10(this, model, id2));
         TextView textView12 = getBinding().i;
         m.checkNotNullExpressionValue(textView12, "binding.dialogChatActionsPin");
         textView12.setVisibility(!model.getManageMessageContext().getCanTogglePinned() ? 0 : 8);
-        getBinding().i.setText(!m.areEqual(model.getMessage().D(), Boolean.TRUE) ? 2131894070 : 2131891883);
+        getBinding().i.setText(!m.areEqual(model.getMessage().getPinned(), Boolean.TRUE) ? 2131894171 : 2131891955);
         getBinding().i.setOnClickListener(new WidgetChatListActions$configureUI$11(this, model));
         TextView textView13 = getBinding().e;
         m.checkNotNullExpressionValue(textView13, "binding.dialogChatActionsDelete");
@@ -592,10 +593,10 @@ public final class WidgetChatListActions extends AppBottomSheet {
         getBinding().m.setOnClickListener(new WidgetChatListActions$configureUI$14(this, model));
         TextView textView15 = getBinding().q;
         m.checkNotNullExpressionValue(textView15, "binding.dialogChatActionsStartThread");
-        if (!ThreadUtils.INSTANCE.canCreatePublicThread(model.getPermissions(), model.getChannel(), model.getMessage(), model.getGuildId())) {
+        if (!ThreadUtils.INSTANCE.canCreatePublicThread(model.getPermissions(), model.getChannel(), model.getMessage(), model.getGuild())) {
         }
         textView15.setVisibility(i);
-        getBinding().q.setOnClickListener(new WidgetChatListActions$configureUI$15(this, model));
+        getBinding().q.setOnClickListener(new WidgetChatListActions$configureUI$15(this, id2, model));
     }
 
     @MainThread
@@ -617,9 +618,9 @@ public final class WidgetChatListActions extends AppBottomSheet {
     }
 
     private final void editMessage(Message message) {
-        Observable<R> Z = StoreStream.Companion.getChannels().observeGuildAndPrivateChannels().Z(new WidgetChatListActions$editMessage$1(message));
-        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…              }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationBuffered(Z), 0, false, 3, null), (Context) null, "editMessage", (Function1) null, new WidgetChatListActions$editMessage$2(message), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+        Observable<R> Y = StoreStream.Companion.getChannels().observeGuildAndPrivateChannels().Y(new WidgetChatListActions$editMessage$1(message));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…              }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationBuffered(Y), 0, false, 3, null), (Context) null, "editMessage", (Function1) null, new WidgetChatListActions$editMessage$2(message), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
     }
 
     private final WidgetChatListActionsBinding getBinding() {
@@ -631,22 +632,22 @@ public final class WidgetChatListActions extends AppBottomSheet {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = getString(2131892561);
-        String string2 = getString(2131892560);
+        String string = getString(2131892642);
+        String string2 = getString(2131892641);
         m.checkNotNullExpressionValue(string2, "getString(R.string.remov…l_reactions_confirm_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, getString(2131894658), getString(2131891422), g0.mapOf(o.to(2131364032, new WidgetChatListActions$removeAllReactions$1(this, model))), null, null, null, null, null, null, 0, null, 16320, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, getString(2131894759), getString(2131891493), g0.mapOf(o.to(2131364075, new WidgetChatListActions$removeAllReactions$1(this, model))), null, null, null, null, null, null, 0, null, 16320, null);
     }
 
     private final void replyMessage(Message message, Channel channel) {
         StoreStream.Companion companion = StoreStream.Companion;
         long id2 = companion.getUsers().getMe().getId();
-        boolean r1 = AnimatableValueParser.r1(channel);
-        boolean isWebhook = MessageUtils.INSTANCE.isWebhook(message);
-        User g = message.g();
+        boolean s1 = AnimatableValueParser.s1(channel);
+        boolean isWebhook = message.isWebhook();
+        User author = message.getAuthor();
         boolean z2 = true;
-        boolean z3 = g != null && g.i() == id2;
+        boolean z3 = author != null && author.i() == id2;
         boolean z4 = !isWebhook && !z3;
-        if (r1 || isWebhook || z3) {
+        if (s1 || isWebhook || z3) {
             z2 = false;
         }
         companion.getPendingReplies().onCreatePendingReply(channel, message, z4, z2);
@@ -672,16 +673,16 @@ public final class WidgetChatListActions extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558922;
+        return 2131558925;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
     public void onResume() {
         super.onResume();
         AppBottomSheet.hideKeyboard$default(this, null, 1, null);
-        Observable s2 = ObservableExtensionsKt.computationLatest(Model.Companion.get(this.channelId, this.messageId, getArgumentsOrDefault().getCharSequence("INTENT_EXTRA_MESSAGE_CONTENT"), getArgumentsOrDefault().getInt("INTENT_EXTRA_TYPE"))).s();
-        m.checkNotNullExpressionValue(s2, "Model.get(channelId, mes…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetChatListActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListActions$onResume$1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.computationLatest(Model.Companion.get(this.channelId, this.messageId, getArgumentsOrDefault().getCharSequence("INTENT_EXTRA_MESSAGE_CONTENT"), getArgumentsOrDefault().getInt("INTENT_EXTRA_TYPE"))).r();
+        m.checkNotNullExpressionValue(r, "Model.get(channelId, mes…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetChatListActions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListActions$onResume$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java
index 0fa3b36a0b..1de775590b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java
@@ -15,13 +15,13 @@ import c.q.a.k.a;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.activity.MessageActivityType;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppPermissionsRequests;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreChat;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
@@ -419,7 +419,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
         }
 
         private final void animateHighlight(View view) {
-            view.setBackgroundResource(2131231009);
+            view.setBackgroundResource(2131231014);
             Drawable background = view.getBackground();
             Objects.requireNonNull(background, "null cannot be cast to non-null type android.graphics.drawable.TransitionDrawable");
             TransitionDrawable transitionDrawable = (TransitionDrawable) background;
@@ -459,7 +459,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
                     break;
                 }
                 ChatListEntry chatListEntry = (ChatListEntry) it.next();
-                if ((chatListEntry instanceof MessageEntry) && ((MessageEntry) chatListEntry).getMessage().r() <= j) {
+                if ((chatListEntry instanceof MessageEntry) && ((MessageEntry) chatListEntry).getMessage().getId() <= j) {
                     i = i2;
                     break;
                 }
@@ -692,11 +692,11 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
         switch (i) {
             case 0:
             case 32:
-                return new WidgetChatListAdapterItemMessage(2131558959, this);
+                return new WidgetChatListAdapterItemMessage(2131558962, this);
             case 1:
-                return new WidgetChatListAdapterItemMessage(2131558943, this);
+                return new WidgetChatListAdapterItemMessage(2131558946, this);
             case 2:
-                return new WidgetChatListItem(2131558940, this);
+                return new WidgetChatListItem(2131558943, this);
             case 3:
                 return new WidgetChatListAdapterItemStart(this);
             case 4:
@@ -706,7 +706,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 6:
                 return new WidgetChatListAdapterItemUploadProgress(this);
             case 7:
-                return new WidgetChatListItem(2131558951, this);
+                return new WidgetChatListItem(2131558954, this);
             case 8:
                 return new WidgetChatListAdapterItemNewMessages(this);
             case 9:
@@ -716,13 +716,13 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 11:
                 return new WidgetChatListAdapterItemSearchResultCount(this);
             case 12:
-                return new MGRecyclerViewHolder<>(2131558949, this);
+                return new MGRecyclerViewHolder<>(2131558952, this);
             case 13:
-                return new MGRecyclerViewHolder<>(2131558947, this);
+                return new MGRecyclerViewHolder<>(2131558950, this);
             case 14:
-                return new MGRecyclerViewHolder<>(2131558948, this);
+                return new MGRecyclerViewHolder<>(2131558951, this);
             case 15:
-                return new MGRecyclerViewHolder<>(2131558928, this);
+                return new MGRecyclerViewHolder<>(2131558931, this);
             case 16:
                 return new WidgetChatListAdapterItemEmptyPins(this);
             case 17:
@@ -732,7 +732,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 19:
                 return new WidgetChatListAdapterItemCallMessage(this);
             case 20:
-                return new WidgetChatListAdapterItemMessage(2131558933, this);
+                return new WidgetChatListAdapterItemMessage(2131558936, this);
             case 21:
                 return new WidgetChatListAdapterItemEmbed(this);
             case 22:
@@ -771,7 +771,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple<ChatLis
             case 39:
                 return new WidgetChatListAdapterItemStageInvite(this);
             case 40:
-                return new MGRecyclerViewHolder<>(2131558963, this);
+                return new MGRecyclerViewHolder<>(2131558966, this);
             case 41:
                 return new WidgetChatListAdapterItemStickerGreet(this);
             case 42:
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java
index 48d32f1ff6..089dedf2c4 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1.java
@@ -40,7 +40,7 @@ public final class WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1 e
         public final void invoke(String str) {
             Context context = (Context) this.this$0.$weakContext.get();
             if (context != null) {
-                c.a.d.o.h(context, b.g(context, 2131888185, new Object[]{str}, null, 4), 0, null, 12);
+                c.a.d.o.h(context, b.g(context, 2131888184, new Object[]{str}, null, 4), 0, null, 12);
             }
         }
     }
@@ -69,7 +69,7 @@ public final class WidgetChatListAdapterEventsHandler$onQuickDownloadClicked$1 e
             AppLog.i("Could not download attachment due to:  \n" + th);
             Context context = (Context) this.this$0.$weakContext.get();
             if (context != null) {
-                c.a.d.o.h((Context) this.this$0.$weakContext.get(), context.getString(2131888184), 0, null, 12);
+                c.a.d.o.h((Context) this.this$0.$weakContext.get(), context.getString(2131888183), 0, null, 12);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java
index b52de6080d..e6fcb48d5c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java
@@ -1,9 +1,10 @@
 package com.discord.widgets.chat.list.adapter;
 
-import com.discord.api.message.Message;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
 import com.discord.api.sticker.StickerPartial;
+import com.discord.models.message.Message;
+import com.discord.widgets.stickers.WidgetGuildStickerSheet;
 import com.discord.widgets.stickers.WidgetStickerSheet;
 import d0.z.d.o;
 import java.util.Objects;
@@ -38,8 +39,11 @@ public final class WidgetChatListAdapterEventsHandler$onStickerClicked$1 extends
         if (!(baseSticker instanceof StickerPartial)) {
             Objects.requireNonNull(baseSticker, "null cannot be cast to non-null type com.discord.api.sticker.Sticker");
             Sticker sticker = (Sticker) baseSticker;
-            if (sticker.j().ordinal() == 1) {
-                WidgetStickerSheet.Companion.show(WidgetChatListAdapterEventsHandler.access$getFragmentManager$p(this.this$0), sticker, this.$message.i());
+            int ordinal = sticker.k().ordinal();
+            if (ordinal == 1) {
+                WidgetStickerSheet.Companion.show(WidgetChatListAdapterEventsHandler.access$getFragmentManager$p(this.this$0), sticker, this.$message.getChannelId());
+            } else if (ordinal == 2) {
+                WidgetGuildStickerSheet.Companion.show(WidgetChatListAdapterEventsHandler.access$getFragmentManager$p(this.this$0), sticker);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$2.java
index 6ede697658..432b42749c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$2.java
@@ -1,29 +1,41 @@
 package com.discord.widgets.chat.list.adapter;
 
+import androidx.fragment.app.FragmentManager;
 import com.discord.api.sticker.BaseSticker;
-import com.discord.api.sticker.Sticker;
+import com.discord.api.sticker.StickerPartial;
+import com.discord.utilities.error.Error;
+import com.discord.widgets.stickers.WidgetUnknownStickerSheet;
+import d0.z.d.m;
 import d0.z.d.o;
+import java.util.Objects;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetChatListAdapterEventsHandler.kt */
-public final class WidgetChatListAdapterEventsHandler$onStickerClicked$2 extends o implements Function1<Sticker, Unit> {
-    public final /* synthetic */ WidgetChatListAdapterEventsHandler$onStickerClicked$1 $handleFullStickerClicked$1;
+public final class WidgetChatListAdapterEventsHandler$onStickerClicked$2 extends o implements Function1<Error, Unit> {
+    public final /* synthetic */ BaseSticker $sticker;
+    public final /* synthetic */ WidgetChatListAdapterEventsHandler this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatListAdapterEventsHandler$onStickerClicked$2(WidgetChatListAdapterEventsHandler$onStickerClicked$1 widgetChatListAdapterEventsHandler$onStickerClicked$1) {
+    public WidgetChatListAdapterEventsHandler$onStickerClicked$2(WidgetChatListAdapterEventsHandler widgetChatListAdapterEventsHandler, BaseSticker baseSticker) {
         super(1);
-        this.$handleFullStickerClicked$1 = widgetChatListAdapterEventsHandler$onStickerClicked$1;
+        this.this$0 = widgetChatListAdapterEventsHandler;
+        this.$sticker = baseSticker;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Sticker sticker) {
-        invoke(sticker);
+    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
+        invoke(error);
         return Unit.a;
     }
 
-    public final void invoke(Sticker sticker) {
-        this.$handleFullStickerClicked$1.invoke((BaseSticker) sticker);
+    public final void invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        WidgetUnknownStickerSheet.Companion companion = WidgetUnknownStickerSheet.Companion;
+        FragmentManager access$getFragmentManager$p = WidgetChatListAdapterEventsHandler.access$getFragmentManager$p(this.this$0);
+        BaseSticker baseSticker = this.$sticker;
+        Objects.requireNonNull(baseSticker, "null cannot be cast to non-null type com.discord.api.sticker.StickerPartial");
+        companion.show(access$getFragmentManager$p, (StickerPartial) baseSticker);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$3.java
new file mode 100644
index 0000000000..41cb402870
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$3.java
@@ -0,0 +1,29 @@
+package com.discord.widgets.chat.list.adapter;
+
+import com.discord.api.sticker.BaseSticker;
+import com.discord.api.sticker.Sticker;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetChatListAdapterEventsHandler.kt */
+public final class WidgetChatListAdapterEventsHandler$onStickerClicked$3 extends o implements Function1<Sticker, Unit> {
+    public final /* synthetic */ WidgetChatListAdapterEventsHandler$onStickerClicked$1 $handleFullStickerClicked$1;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetChatListAdapterEventsHandler$onStickerClicked$3(WidgetChatListAdapterEventsHandler$onStickerClicked$1 widgetChatListAdapterEventsHandler$onStickerClicked$1) {
+        super(1);
+        this.$handleFullStickerClicked$1 = widgetChatListAdapterEventsHandler$onStickerClicked$1;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Sticker sticker) {
+        invoke(sticker);
+        return Unit.a;
+    }
+
+    public final void invoke(Sticker sticker) {
+        this.$handleFullStickerClicked$1.invoke((BaseSticker) sticker);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java
index 5d2f132a50..d905d87048 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java
@@ -40,7 +40,7 @@ public final class WidgetChatListAdapterEventsHandler$onUserActivityAction$1 ext
             join.addFlags(268435456);
             WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0).startActivity(join);
         } catch (ActivityNotFoundException unused) {
-            c.a.d.o.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), b.g(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), 2131894201, new Object[]{this.$application.g()}, null, 4), 0, null, 12);
+            c.a.d.o.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), b.g(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), 2131894302, new Object[]{this.$application.g()}, null, 4), 0, null, 12);
             String str = (String) u.firstOrNull((List<? extends Object>) this.$application.d());
             if (str != null) {
                 UriHandler.directToPlayStore$default(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), str, null, 4, null);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
index 76f7dd5627..a7c79977dd 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java
@@ -10,7 +10,6 @@ import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.message.activity.MessageActivityType;
 import com.discord.api.message.reaction.MessageReaction;
@@ -21,6 +20,7 @@ import com.discord.api.sticker.StickerType;
 import com.discord.api.user.User;
 import com.discord.app.AppFragment;
 import com.discord.models.domain.emoji.Emoji;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.SelectedChannelAnalyticsLocation;
@@ -33,7 +33,6 @@ import com.discord.utilities.channel.ChannelSelector;
 import com.discord.utilities.dsti.StickerUtils;
 import com.discord.utilities.guilds.MemberVerificationUtils;
 import com.discord.utilities.guilds.PublicGuildUtils;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.channels.list.WidgetChannelsListItemThreadActions;
@@ -211,14 +210,14 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
             this.host = appFragment;
             this.storeMessages = storeMessages;
             this.storeEmoji = storeEmoji;
-            PublishSubject l0 = PublishSubject.l0();
-            m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-            this.requestStream = l0;
+            PublishSubject k0 = PublishSubject.k0();
+            m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+            this.requestStream = k0;
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-            Objects.requireNonNull(l0);
-            Observable i02 = Observable.i0(new r(l0.i, new l2(250, timeUnit, j0.p.a.a())));
-            m.checkNotNullExpressionValue(i02, "requestStream\n          …S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(i02, appFragment.getClass(), appFragment.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+            Objects.requireNonNull(k0);
+            Observable h02 = Observable.h0(new r(k0.i, new l2(250, timeUnit, j0.p.a.a())));
+            m.checkNotNullExpressionValue(h02, "requestStream\n          …S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(h02, appFragment.getClass(), appFragment.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
         }
 
         public static final /* synthetic */ StoreEmoji access$getStoreEmoji$p(UserReactionHandler userReactionHandler) {
@@ -345,7 +344,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
         m.checkNotNullParameter(callStatus, "callStatus");
         int ordinal = callStatus.ordinal();
         if (ordinal == 0) {
-            AnimatableValueParser.o2(this.host, null, new WidgetChatListAdapterEventsHandler$onCallMessageClicked$1(this, j), 1, null);
+            AnimatableValueParser.q2(this.host, null, new WidgetChatListAdapterEventsHandler$onCallMessageClicked$1(this, j), 1, null);
         } else if (ordinal != 1) {
             WidgetStartCallSheet.Companion.show(j, getFragmentManager());
         } else {
@@ -382,47 +381,47 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onMessageAuthorAvatarClicked(Message message, long j) {
         m.checkNotNullParameter(message, "message");
-        if (PublicGuildUtils.isPublicGuildSystemMessage(message) || MessageUtils.INSTANCE.isCrosspost(message)) {
+        if (PublicGuildUtils.INSTANCE.isPublicGuildSystemMessage(message) || message.isCrosspost()) {
             onMessageAuthorNameClicked(message, j);
             return;
         }
-        User g = message.g();
-        if (g != null) {
-            WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, g.i(), Long.valueOf(message.i()), getFragmentManager(), Long.valueOf(j), null, null, null, 112, null);
+        User author = message.getAuthor();
+        if (author != null) {
+            WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, author.i(), Long.valueOf(message.getChannelId()), getFragmentManager(), Long.valueOf(j), null, null, null, 112, null);
         }
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onMessageAuthorLongClicked(Message message, Long l) {
         m.checkNotNullParameter(message, "message");
-        if (!MessageUtils.INSTANCE.isWebhook(message)) {
-            User g = message.g();
-            if (g != null) {
-                WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, g.i(), Long.valueOf(message.i()), getFragmentManager(), l, null, null, null, 112, null);
+        if (!message.isWebhook()) {
+            User author = message.getAuthor();
+            if (author != null) {
+                WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, author.i(), Long.valueOf(message.getChannelId()), getFragmentManager(), l, null, null, null, 112, null);
                 return;
             }
             return;
         }
-        o.g(getContext(), 2131894242, 0, null, 8);
+        o.g(getContext(), 2131894343, 0, null, 8);
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onMessageAuthorNameClicked(Message message, long j) {
         m.checkNotNullParameter(message, "message");
-        if (PublicGuildUtils.isPublicGuildSystemMessage(message)) {
+        if (PublicGuildUtils.INSTANCE.isPublicGuildSystemMessage(message)) {
             WidgetPublicAnnouncementProfileSheet.Companion.show(getFragmentManager());
-        } else if (!MessageUtils.INSTANCE.isCrosspost(message) || message.A() == null) {
+        } else if (!message.isCrosspost() || message.getMessageReference() == null) {
             StoreChat storeChat = this.storeChat;
-            User g = message.g();
-            m.checkNotNull(g);
-            storeChat.appendMention(new CoreUser(g), j);
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            storeChat.appendMention(new CoreUser(author), j);
         } else {
-            MessageReference A = message.A();
+            MessageReference messageReference = message.getMessageReference();
             Long l = null;
-            Long a = A != null ? A.a() : null;
-            MessageReference A2 = message.A();
-            if (A2 != null) {
-                l = A2.b();
+            Long a = messageReference != null ? messageReference.a() : null;
+            MessageReference messageReference2 = message.getMessageReference();
+            if (messageReference2 != null) {
+                l = messageReference2.b();
             }
             if (l != null && a != null) {
                 WidgetGuildProfileSheet.Companion.show(getFragmentManager(), false, l.longValue(), a.longValue());
@@ -433,14 +432,14 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onMessageBlockedGroupClicked(Message message) {
         m.checkNotNullParameter(message, "message");
-        this.storeChat.toggleBlockedMessageGroup(message.r());
+        this.storeChat.toggleBlockedMessageGroup(message.getId());
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onMessageClicked(Message message, boolean z2) {
         m.checkNotNullParameter(message, "message");
         if (z2) {
-            StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r());
+            StoreStream.Companion.getMessagesLoader().jumpToMessage(message.getChannelId(), message.getId());
         }
     }
 
@@ -449,7 +448,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(charSequence, "formattedMessage");
         if (!z2) {
-            WidgetChatListActions.Companion.showForChat(getFragmentManager(), message.i(), message.r(), charSequence);
+            WidgetChatListActions.Companion.showForChat(getFragmentManager(), message.getChannelId(), message.getId(), charSequence);
         }
     }
 
@@ -460,7 +459,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onOpenPinsClicked(Message message) {
         m.checkNotNullParameter(message, "message");
-        WidgetChannelPinnedMessages.Companion.show(getContext(), message.i());
+        WidgetChannelPinnedMessages.Companion.show(getContext(), message.getChannelId());
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
@@ -509,7 +508,7 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
             if (baseSticker instanceof Sticker) {
                 widgetChatListAdapterEventsHandler$onStickerClicked$1.invoke(baseSticker);
             } else {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StickerUtils.INSTANCE.getGuildOrStandardSticker(baseSticker.c(), true), this.host, null, 2, null), WidgetChatListAdapterEventsHandler.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterEventsHandler$onStickerClicked$2(widgetChatListAdapterEventsHandler$onStickerClicked$1), 62, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StickerUtils.INSTANCE.getGuildOrStandardSticker(baseSticker.c(), true), this.host, null, 2, null), WidgetChatListAdapterEventsHandler.class, (Context) null, (Function1) null, new WidgetChatListAdapterEventsHandler$onStickerClicked$2(this, baseSticker), (Function0) null, (Function0) null, new WidgetChatListAdapterEventsHandler$onStickerClicked$3(widgetChatListAdapterEventsHandler$onStickerClicked$1), 54, (Object) null);
             }
         }
     }
@@ -517,13 +516,13 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onThreadClicked(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        this.channelSelector.selectChannel(channel, Long.valueOf(channel.q()), SelectedChannelAnalyticsLocation.EMBED);
+        this.channelSelector.selectChannel(channel, Long.valueOf(channel.r()), SelectedChannelAnalyticsLocation.EMBED);
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onThreadLongClicked(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        WidgetChannelsListItemThreadActions.Companion.show(getFragmentManager(), channel.g());
+        WidgetChannelsListItemThreadActions.Companion.show(getFragmentManager(), channel.h());
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java
index e11db909bc..976d82ceb2 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java
@@ -2,9 +2,9 @@ package com.discord.widgets.chat.list.adapter;
 
 import android.text.style.StyleSpan;
 import android.view.View;
-import com.discord.api.message.Message;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
+import com.discord.models.message.Message;
 import com.discord.utilities.spans.ClickableSpan;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import d0.z.d.m;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
index f26a5a5896..873407fbd1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java
@@ -11,11 +11,11 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.a.l.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.WidgetChatListAdapterItemApplicationCommandBinding;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.time.TimeUtils;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -31,32 +31,32 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemApplicationCommand(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558923, widgetChatListAdapter);
+        super(2131558926, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362530;
-        ImageView imageView = (ImageView) view.findViewById(2131362530);
+        int i = 2131362543;
+        ImageView imageView = (ImageView) view.findViewById(2131362543);
         if (imageView != null) {
-            i = 2131362531;
-            TextView textView = (TextView) view.findViewById(2131362531);
+            i = 2131362544;
+            TextView textView = (TextView) view.findViewById(2131362544);
             if (textView != null) {
-                i = 2131362532;
-                CardView cardView = (CardView) view.findViewById(2131362532);
+                i = 2131362545;
+                CardView cardView = (CardView) view.findViewById(2131362545);
                 if (cardView != null) {
-                    i = 2131362535;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362535);
+                    i = 2131362548;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362548);
                     if (frameLayout != null) {
-                        i = 2131362539;
-                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362539);
+                        i = 2131362552;
+                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362552);
                         if (constraintLayout != null) {
-                            i = 2131362541;
-                            TextView textView2 = (TextView) view.findViewById(2131362541);
+                            i = 2131362554;
+                            TextView textView2 = (TextView) view.findViewById(2131362554);
                             if (textView2 != null) {
-                                i = 2131362544;
-                                TextView textView3 = (TextView) view.findViewById(2131362544);
+                                i = 2131362557;
+                                TextView textView3 = (TextView) view.findViewById(2131362557);
                                 if (textView3 != null) {
-                                    i = 2131365328;
-                                    Guideline guideline = (Guideline) view.findViewById(2131365328);
+                                    i = 2131365384;
+                                    Guideline guideline = (Guideline) view.findViewById(2131365384);
                                     if (guideline != null) {
                                         WidgetChatListAdapterItemApplicationCommandBinding widgetChatListAdapterItemApplicationCommandBinding = new WidgetChatListAdapterItemApplicationCommandBinding((ConstraintLayout) view, imageView, textView, cardView, frameLayout, constraintLayout, textView2, textView3, guideline);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemApplicationCommandBinding, "WidgetChatListAdapterIte…andBinding.bind(itemView)");
@@ -103,12 +103,12 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
         int authorTextColor = getAuthorTextColor(author);
         WidgetChatListAdapterItemApplicationCommand$onConfigure$1 widgetChatListAdapterItemApplicationCommand$onConfigure$1 = WidgetChatListAdapterItemApplicationCommand$onConfigure$1.INSTANCE;
         Pattern compile = Pattern.compile("^<(/[^:]+):([0-9]*)>(.*)");
-        String k = message.k();
+        String content = message.getContent();
         String str3 = "";
-        if (k == null) {
-            k = str3;
+        if (content == null) {
+            content = str3;
         }
-        Matcher matcher = compile.matcher(k);
+        Matcher matcher = compile.matcher(content);
         if (matcher.matches()) {
             str = matcher.group(1);
             if (str == null) {
@@ -119,8 +119,8 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
             str = "/";
         }
         str2 = str3;
-        User g = message.g();
-        String str4 = nickOrUsernames.get(g != null ? Long.valueOf(g.i()) : null);
+        User author2 = message.getAuthor();
+        String str4 = nickOrUsernames.get(author2 != null ? Long.valueOf(author2.i()) : null);
         if (str4 != null) {
             str3 = str4;
         }
@@ -129,7 +129,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
         int themedColor = ColorCompat.getThemedColor(view, 2130969007);
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextName");
-        CharSequence c2 = b.c(textView, 2131893733, new Object[]{str3, str}, new WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(this, authorTextColor, message, themedColor));
+        CharSequence c2 = b.c(textView, 2131893830, new Object[]{str3, str}, new WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(this, authorTextColor, message, themedColor));
         TextView textView2 = this.binding.e;
         m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemTextName");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -160,7 +160,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha
         TextView textView7 = this.binding.f;
         m.checkNotNullExpressionValue(textView7, "binding.chatListAdapterItemTextTimestamp");
         Context T = a.T(this.itemView, "itemView", "itemView.context");
-        UtcDateTime K = message.K();
-        textView7.setText(TimeUtils.toReadableTimeString$default(T, K != null ? K.f() : 0, null, 4, null));
+        UtcDateTime timestamp = message.getTimestamp();
+        textView7.setText(TimeUtils.toReadableTimeString$default(T, timestamp != null ? timestamp.f() : 0, null, 4, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java
index bdf918a34c..b79a75ecf1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import com.discord.widgets.chat.list.entries.AttachmentEntry;
 import d0.z.d.m;
@@ -32,10 +32,10 @@ public final class WidgetChatListAdapterItemAttachment$configureUI$3 extends o i
         m.checkNotNullParameter(view, "it");
         WidgetChatListAdapter.EventHandler eventHandler = WidgetChatListAdapterItemAttachment.access$getAdapter$p(this.this$0).getEventHandler();
         Message message = this.$data.getMessage();
-        String k = this.$data.getMessage().k();
-        if (k == null) {
-            k = "";
+        String content = this.$data.getMessage().getContent();
+        if (content == null) {
+            content = "";
         }
-        eventHandler.onMessageLongClicked(message, k, this.$data.isThreadStarterMessage());
+        eventHandler.onMessageLongClicked(message, content, this.$data.isThreadStarterMessage());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java
index f9600ee247..f069ba01cd 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java
@@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemAttachment$configureUI$5 implements
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (WidgetChatListAdapterItemAttachment.access$getAdapter$p(this.this$0).getData().isSpoilerClickAllowed()) {
-            StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getAttachmentEntry().getMessage().r(), this.$data.getEmbedIndex());
+            StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getAttachmentEntry().getMessage().getId(), this.$data.getEmbedIndex());
         } else {
             WidgetChatListAdapterItemAttachment.access$getAdapter$p(this.this$0).getEventHandler().onMessageClicked(this.$model.getAttachmentEntry().getMessage(), this.$data.isThreadStarterMessage());
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
index b1142c3590..15d73c9182 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java
@@ -12,11 +12,11 @@ import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.attachment.MessageAttachmentType;
 import com.discord.api.role.GuildRole;
 import com.discord.databinding.WidgetChatListAdapterItemAttachmentBinding;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageState;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserSettings;
@@ -237,7 +237,7 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemAttachment(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558924, widgetChatListAdapter);
+        super(2131558927, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE;
         View view = this.itemView;
@@ -246,38 +246,38 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte
         m.checkNotNullExpressionValue(context, "itemView.context");
         this.maxAttachmentImageWidth = embedResourceUtils.computeMaximumImageWidthPx(context);
         View view2 = this.itemView;
-        int i = 2131362517;
-        View findViewById = view2.findViewById(2131362517);
+        int i = 2131362530;
+        View findViewById = view2.findViewById(2131362530);
         if (findViewById != null) {
-            i = 2131362519;
-            View findViewById2 = view2.findViewById(2131362519);
+            i = 2131362532;
+            View findViewById2 = view2.findViewById(2131362532);
             if (findViewById2 != null) {
-                i = 2131362551;
-                Barrier barrier = (Barrier) view2.findViewById(2131362551);
+                i = 2131362564;
+                Barrier barrier = (Barrier) view2.findViewById(2131362564);
                 if (barrier != null) {
-                    i = 2131362552;
-                    MaterialCardView materialCardView = (MaterialCardView) view2.findViewById(2131362552);
+                    i = 2131362565;
+                    MaterialCardView materialCardView = (MaterialCardView) view2.findViewById(2131362565);
                     if (materialCardView != null) {
-                        i = 2131362553;
-                        TextView textView = (TextView) view2.findViewById(2131362553);
+                        i = 2131362566;
+                        TextView textView = (TextView) view2.findViewById(2131362566);
                         if (textView != null) {
-                            i = 2131362554;
-                            ImageView imageView = (ImageView) view2.findViewById(2131362554);
+                            i = 2131362567;
+                            ImageView imageView = (ImageView) view2.findViewById(2131362567);
                             if (imageView != null) {
-                                i = 2131362555;
-                                ImageView imageView2 = (ImageView) view2.findViewById(2131362555);
+                                i = 2131362568;
+                                ImageView imageView2 = (ImageView) view2.findViewById(2131362568);
                                 if (imageView2 != null) {
-                                    i = 2131362556;
-                                    InlineMediaView inlineMediaView = (InlineMediaView) view2.findViewById(2131362556);
+                                    i = 2131362569;
+                                    InlineMediaView inlineMediaView = (InlineMediaView) view2.findViewById(2131362569);
                                     if (inlineMediaView != null) {
-                                        i = 2131362557;
-                                        TextView textView2 = (TextView) view2.findViewById(2131362557);
+                                        i = 2131362570;
+                                        TextView textView2 = (TextView) view2.findViewById(2131362570);
                                         if (textView2 != null) {
-                                            i = 2131362558;
-                                            FrameLayout frameLayout = (FrameLayout) view2.findViewById(2131362558);
+                                            i = 2131362571;
+                                            FrameLayout frameLayout = (FrameLayout) view2.findViewById(2131362571);
                                             if (frameLayout != null) {
-                                                i = 2131365328;
-                                                Guideline guideline = (Guideline) view2.findViewById(2131365328);
+                                                i = 2131365384;
+                                                Guideline guideline = (Guideline) view2.findViewById(2131365384);
                                                 if (guideline != null) {
                                                     WidgetChatListAdapterItemAttachmentBinding widgetChatListAdapterItemAttachmentBinding = new WidgetChatListAdapterItemAttachmentBinding((ConstraintLayout) view2, findViewById, findViewById2, barrier, materialCardView, textView, imageView, imageView2, inlineMediaView, textView2, frameLayout, guideline);
                                                     m.checkNotNullExpressionValue(widgetChatListAdapterItemAttachmentBinding, "WidgetChatListAdapterIte…entBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java
index d15ff1c1b3..8ef9592f79 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 /* compiled from: WidgetChatListAdapterItemBlocked.kt */
 public final class WidgetChatListAdapterItemBlocked$onConfigure$1 implements View.OnClickListener {
     public final /* synthetic */ Message $message;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java
index a365d687bb..20e13f248c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java
@@ -7,8 +7,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import c.a.l.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.databinding.WidgetChatListAdapterItemBlockedBinding;
+import com.discord.models.message.Message;
 import com.discord.utilities.resources.StringResourceUtilsKt;
 import com.discord.widgets.chat.list.entries.BlockedMessagesEntry;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -19,17 +19,17 @@ public final class WidgetChatListAdapterItemBlocked extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemBlocked(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558925, widgetChatListAdapter);
+        super(2131558928, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131362506);
+        TextView textView = (TextView) view.findViewById(2131362519);
         if (textView != null) {
             WidgetChatListAdapterItemBlockedBinding widgetChatListAdapterItemBlockedBinding = new WidgetChatListAdapterItemBlockedBinding((RelativeLayout) view, textView);
             m.checkNotNullExpressionValue(widgetChatListAdapterItemBlockedBinding, "WidgetChatListAdapterIte…kedBinding.bind(itemView)");
             this.binding = widgetChatListAdapterItemBlockedBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362506)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362519)));
     }
 
     public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemBlocked widgetChatListAdapterItemBlocked) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
index 1cc998a0df..86462c8760 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java
@@ -5,9 +5,9 @@ import android.widget.LinearLayout;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.FragmentManager;
 import com.discord.api.botuikit.SelectItem;
-import com.discord.api.message.Message;
 import com.discord.databinding.WidgetChatListAdapterItemBotComponentRowBinding;
 import com.discord.models.botuikit.MessageComponent;
+import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.widgets.botuikit.ComponentProvider;
 import com.discord.widgets.botuikit.views.ComponentActionListener;
@@ -28,17 +28,17 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemBotComponentRow(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558926, widgetChatListAdapter);
+        super(2131558929, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362513;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362513);
+        int i = 2131362526;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362526);
         if (linearLayout != null) {
-            i = 2131362517;
-            View findViewById = view.findViewById(2131362517);
+            i = 2131362530;
+            View findViewById = view.findViewById(2131362530);
             if (findViewById != null) {
-                i = 2131362519;
-                View findViewById2 = view.findViewById(2131362519);
+                i = 2131362532;
+                View findViewById2 = view.findViewById(2131362532);
                 if (findViewById2 != null) {
                     WidgetChatListAdapterItemBotComponentRowBinding widgetChatListAdapterItemBotComponentRowBinding = new WidgetChatListAdapterItemBotComponentRowBinding((ConstraintLayout) view, linearLayout, findViewById, findViewById2);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemBotComponentRowBinding, "WidgetChatListAdapterIte…RowBinding.bind(itemView)");
@@ -72,12 +72,12 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi
         if (botUiComponentEntry2 == null) {
             m.throwUninitializedPropertyAccessException("entry");
         }
-        long r = botUiComponentEntry2.getMessage().r();
+        long id2 = botUiComponentEntry2.getMessage().getId();
         BotUiComponentEntry botUiComponentEntry3 = this.entry;
         if (botUiComponentEntry3 == null) {
             m.throwUninitializedPropertyAccessException("entry");
         }
-        widgetChatListAdapter.onBotUiComponentClicked(applicationId, r, botUiComponentEntry3.getMessage().n(), i, new RestAPIParams.ComponentInteractionData.ButtonComponentInteractionData(null, str, str2, 1, null));
+        widgetChatListAdapter.onBotUiComponentClicked(applicationId, id2, botUiComponentEntry3.getMessage().getFlags(), i, new RestAPIParams.ComponentInteractionData.ButtonComponentInteractionData(null, str, str2, 1, null));
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem
@@ -135,22 +135,22 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi
         if (botUiComponentEntry2 == null) {
             m.throwUninitializedPropertyAccessException("entry");
         }
-        long r = botUiComponentEntry2.getMessage().r();
+        long id2 = botUiComponentEntry2.getMessage().getId();
         BotUiComponentEntry botUiComponentEntry3 = this.entry;
         if (botUiComponentEntry3 == null) {
             m.throwUninitializedPropertyAccessException("entry");
         }
-        long i4 = botUiComponentEntry3.getMessage().i();
+        long channelId = botUiComponentEntry3.getMessage().getChannelId();
         BotUiComponentEntry botUiComponentEntry4 = this.entry;
         if (botUiComponentEntry4 == null) {
             m.throwUninitializedPropertyAccessException("entry");
         }
-        Long n = botUiComponentEntry4.getMessage().n();
+        Long flags = botUiComponentEntry4.getMessage().getFlags();
         BotUiComponentEntry botUiComponentEntry5 = this.entry;
         if (botUiComponentEntry5 == null) {
             m.throwUninitializedPropertyAccessException("entry");
         }
-        companion.show(fragmentManager, new ComponentContext(guildId, r, i4, n, botUiComponentEntry5.getApplicationId()), i, str, str2, str3, i2, i3, list, list2);
+        companion.show(fragmentManager, new ComponentContext(guildId, id2, channelId, flags, botUiComponentEntry5.getApplicationId()), i, str, str2, str3, i2, i3, list, list2);
     }
 
     public final void setEntry(BotUiComponentEntry botUiComponentEntry) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java
index e168cdba05..2c5f401c79 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemCallMessage;
 /* compiled from: WidgetChatListAdapterItemCallMessage.kt */
 public final class WidgetChatListAdapterItemCallMessage$handleState$1 implements View.OnClickListener {
@@ -17,6 +17,6 @@ public final class WidgetChatListAdapterItemCallMessage$handleState$1 implements
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChatListAdapterItemCallMessage.access$onItemClick(this.this$0, this.$callStatus, this.$message.i());
+        WidgetChatListAdapterItemCallMessage.access$onItemClick(this.this$0, this.$callStatus, this.$message.getChannelId());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
index 18c1982098..364534cca5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java
@@ -12,10 +12,10 @@ import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.message.call.MessageCall;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.WidgetChatListAdapterItemCallBinding;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.models.user.User;
 import com.discord.stores.StoreStream;
@@ -24,7 +24,6 @@ import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.color.ColorCompatKt;
 import com.discord.utilities.dimen.DimenUtils;
 import com.discord.utilities.duration.DurationUtilsKt;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.Clock;
@@ -204,26 +203,26 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemCallMessage(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558927, widgetChatListAdapter);
+        super(2131558930, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362507;
-        ImageView imageView = (ImageView) view.findViewById(2131362507);
+        int i = 2131362520;
+        ImageView imageView = (ImageView) view.findViewById(2131362520);
         if (imageView != null) {
-            i = 2131362508;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362508);
+            i = 2131362521;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362521);
             if (recyclerView != null) {
-                i = 2131362509;
-                TextView textView = (TextView) view.findViewById(2131362509);
+                i = 2131362522;
+                TextView textView = (TextView) view.findViewById(2131362522);
                 if (textView != null) {
-                    i = 2131362510;
-                    TextView textView2 = (TextView) view.findViewById(2131362510);
+                    i = 2131362523;
+                    TextView textView2 = (TextView) view.findViewById(2131362523);
                     if (textView2 != null) {
-                        i = 2131362511;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362511);
+                        i = 2131362524;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362524);
                         if (linearLayout != null) {
-                            i = 2131362546;
-                            TextView textView3 = (TextView) view.findViewById(2131362546);
+                            i = 2131362559;
+                            TextView textView3 = (TextView) view.findViewById(2131362559);
                             if (textView3 != null) {
                                 WidgetChatListAdapterItemCallBinding widgetChatListAdapterItemCallBinding = new WidgetChatListAdapterItemCallBinding((CardView) view, imageView, recyclerView, textView, textView2, linearLayout, textView3);
                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemCallBinding, "WidgetChatListAdapterIte…allBinding.bind(itemView)");
@@ -312,10 +311,10 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
             subscription.unsubscribe();
         }
         Message message = messageEntry.getMessage();
-        CharSequence humanizeDuration = DurationUtilsKt.humanizeDuration(context, MessageUtils.INSTANCE.getCallDuration(message));
+        CharSequence humanizeDuration = DurationUtilsKt.humanizeDuration(context, message.getCallDuration());
         Context T = a.T(this.itemView, "itemView", "itemView.context");
-        UtcDateTime K = message.K();
-        String obj = TimeUtils.toReadableTimeString$default(T, K != null ? K.f() : 0, null, 4, null).toString();
+        UtcDateTime timestamp = message.getTimestamp();
+        String obj = TimeUtils.toReadableTimeString$default(T, timestamp != null ? timestamp.f() : 0, null, 4, null).toString();
         LinearLayout linearLayout = this.binding.f;
         m.checkNotNullExpressionValue(linearLayout, "binding.chatListAdapterI…llUnjoinedOngoingSubtitle");
         int i = 8;
@@ -330,19 +329,19 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         textView.setVisibility(i);
         int ordinal = callStatus.ordinal();
         if (ordinal == 0 || ordinal == 1) {
-            UtcDateTime K2 = message.K();
-            long f = K2 != null ? K2.f() : 0;
-            Observable<Long> E = Observable.E(0, 1, TimeUnit.SECONDS);
-            m.checkNotNullExpressionValue(E, "Observable\n            .…0L, 1L, TimeUnit.SECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(E), WidgetChatListAdapterItemCallMessage.class, (Context) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$1(this, f), 58, (Object) null);
+            UtcDateTime timestamp2 = message.getTimestamp();
+            long f = timestamp2 != null ? timestamp2.f() : 0;
+            Observable<Long> D = Observable.D(0, 1, TimeUnit.SECONDS);
+            m.checkNotNullExpressionValue(D, "Observable\n            .…0L, 1L, TimeUnit.SECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(D), WidgetChatListAdapterItemCallMessage.class, (Context) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$1(this, f), 58, (Object) null);
         } else if (ordinal == 2) {
             TextView textView2 = this.binding.d;
             m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemCallSubtitle");
-            b.n(textView2, 2131887115, new Object[]{humanizeDuration, obj}, null, 4);
+            b.m(textView2, 2131887115, new Object[]{humanizeDuration, obj}, null, 4);
         } else if (ordinal == 3) {
             TextView textView3 = this.binding.d;
             m.checkNotNullExpressionValue(textView3, "binding.chatListAdapterItemCallSubtitle");
-            b.n(textView3, 2131887115, new Object[]{humanizeDuration, obj}, null, 4);
+            b.m(textView3, 2131887115, new Object[]{humanizeDuration, obj}, null, 4);
         }
     }
 
@@ -383,19 +382,19 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         Drawable drawable;
         int ordinal = callStatus.ordinal();
         if (ordinal == 0 || ordinal == 1) {
-            drawable = AppCompatResources.getDrawable(context, 2131231448);
+            drawable = AppCompatResources.getDrawable(context, 2131231454);
             if (drawable == null) {
                 return null;
             }
             ColorCompatKt.setTint(drawable, ColorCompat.getColor(context, 2131100249), false);
         } else if (ordinal == 2) {
-            drawable = AppCompatResources.getDrawable(context, 2131231449);
+            drawable = AppCompatResources.getDrawable(context, 2131231455);
             if (drawable == null) {
                 return null;
             }
             ColorCompatKt.setTint(drawable, ColorCompat.getColor(context, 2131100311), false);
         } else if (ordinal == 3) {
-            drawable = AppCompatResources.getDrawable(context, 2131231448);
+            drawable = AppCompatResources.getDrawable(context, 2131231454);
             if (drawable == null) {
                 return null;
             }
@@ -408,8 +407,8 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
 
     private final CallStatus getCallStatus(Message message, Map<Long, StoreVoiceParticipants.VoiceUser> map) {
         boolean z2;
-        MessageCall h = message.h();
-        if (h == null) {
+        MessageCall call = message.getCall();
+        if (call == null) {
             return CallStatus.INACTIVE_UNJOINED;
         }
         long userId = ((WidgetChatListAdapter) this.adapter).getData().getUserId();
@@ -433,9 +432,9 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         for (Map.Entry entry : arrayList) {
             arrayList2.add(Long.valueOf(((Number) entry.getKey()).longValue()));
         }
-        boolean contains = h.b().contains(Long.valueOf(userId));
+        boolean contains = call.b().contains(Long.valueOf(userId));
         boolean contains2 = arrayList2.contains(Long.valueOf(userId));
-        if (h.a() != null) {
+        if (call.a() != null) {
             z2 = false;
         }
         return (!z2 || !contains2) ? z2 ? CallStatus.ACTIVE_UNJOINED : contains ? CallStatus.INACTIVE_JOINED : CallStatus.INACTIVE_UNJOINED : CallStatus.ACTIVE_JOINED;
@@ -454,10 +453,10 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
     private final CharSequence getTitleString(CallStatus callStatus, Resources resources) {
         int ordinal = callStatus.ordinal();
         if (ordinal == 0 || ordinal == 1) {
-            return b.h(resources, 2131891670, new Object[0], null, 4);
+            return b.h(resources, 2131891739, new Object[0], null, 4);
         }
         if (ordinal == 2) {
-            return b.h(resources, 2131891207, new Object[0], null, 4);
+            return b.h(resources, 2131891278, new Object[0], null, 4);
         }
         if (ordinal == 3) {
             return b.h(resources, 2131887114, new Object[0], null, 4);
@@ -470,9 +469,9 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
         Message message = messageEntry.getMessage();
         Map<Long, StoreVoiceParticipants.VoiceUser> voiceParticipants = state.getVoiceParticipants();
         CallStatus callStatus = getCallStatus(message, voiceParticipants);
-        com.discord.api.user.User g = message.g();
-        m.checkNotNull(g);
-        List<CollapsedUser> createCallParticipantUsers = createCallParticipantUsers(voiceParticipants, callStatus, new CoreUser(g));
+        com.discord.api.user.User author = message.getAuthor();
+        m.checkNotNull(author);
+        List<CollapsedUser> createCallParticipantUsers = createCallParticipantUsers(voiceParticipants, callStatus, new CoreUser(author));
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemCallSubtitle");
         Context context = textView.getContext();
@@ -491,9 +490,9 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt
     }
 
     private final Observable<State> observeState(MessageEntry messageEntry) {
-        Observable<R> G = StoreStream.Companion.getVoiceParticipants().get(messageEntry.getMessage().i()).G(new WidgetChatListAdapterItemCallMessage$observeState$1(messageEntry));
-        m.checkNotNullExpressionValue(G, "StoreStream.getVoicePart…, messageEntry)\n        }");
-        return G;
+        Observable<R> F = StoreStream.Companion.getVoiceParticipants().get(messageEntry.getMessage().getChannelId()).F(new WidgetChatListAdapterItemCallMessage$observeState$1(messageEntry));
+        m.checkNotNullExpressionValue(F, "StoreStream.getVoicePart…, messageEntry)\n        }");
+        return F;
     }
 
     private final void onItemClick(CallStatus callStatus, long j) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java
index f240714965..f8ea4462b7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java
@@ -32,10 +32,10 @@ public final class WidgetChatListAdapterItemEmbed$configureEmbedTitle$1 extends
     public final void invoke(SpoilerNode<?> spoilerNode) {
         m.checkNotNullParameter(spoilerNode, "node");
         StoreMessageState messageState = StoreStream.Companion.getMessageState();
-        long r = this.$model.getEmbedEntry().getMessage().r();
+        long id2 = this.$model.getEmbedEntry().getMessage().getId();
         int i = this.$embedIndex;
         StringBuilder L = a.L("title:");
         L.append(spoilerNode.getId());
-        messageState.revealSpoilerEmbedData(r, i, L.toString());
+        messageState.revealSpoilerEmbedData(id2, i, L.toString());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java
index f9deeeb2fb..148d9cd6a9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java
@@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemEmbed$configureUI$3 implements View.
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (WidgetChatListAdapterItemEmbed.access$getAdapter$p(this.this$0).getData().isSpoilerClickAllowed()) {
-            StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getEmbedEntry().getMessage().r(), this.$data.getEmbedIndex());
+            StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getEmbedEntry().getMessage().getId(), this.$data.getEmbedIndex());
         } else {
             WidgetChatListAdapterItemEmbed.access$getAdapter$p(this.this$0).getEventHandler().onMessageClicked(this.$model.getEmbedEntry().getMessage(), this.$data.isThreadStarterMessage());
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
index 773883b2c7..3edd2a4b99 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java
@@ -14,10 +14,9 @@ import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.graphics.ColorUtils;
-import c.a.i.h4;
+import c.a.i.k4;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
-import com.discord.api.message.Message;
 import com.discord.api.message.embed.EmbedAuthor;
 import com.discord.api.message.embed.EmbedField;
 import com.discord.api.message.embed.EmbedFooter;
@@ -31,6 +30,7 @@ import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.app.AppLog;
 import com.discord.databinding.WidgetChatListAdapterItemEmbedBinding;
 import com.discord.embed.RenderableEmbedMedia;
+import com.discord.models.message.Message;
 import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.parser.Parser;
 import com.discord.stores.StoreMessageState;
@@ -215,9 +215,9 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             StoreStream.Companion companion = StoreStream.Companion;
             Observable h = Observable.h(companion.getUsers().observeMeId(), companion.getChannels().observeNames(build.getChannels()), Observable.j(companion.getGuilds().observeComputed(embedEntry.getGuildId(), build.getUsers()), companion.getUsers().observeUsernames(build.getUsers()), WidgetChatListAdapterItemEmbed$Companion$getModel$1.INSTANCE), companion.getGuilds().observeRoles(embedEntry.getGuildId(), build.getRoles()), new WidgetChatListAdapterItemEmbed$Companion$getModel$2(embedEntry, parsedDescription, parsedFields));
             m.checkNotNullExpressionValue(h, "Observable\n          .co… roles, myId)\n          }");
-            Observable<Model> s2 = ObservableExtensionsKt.computationLatest(h).s();
-            m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-            return s2;
+            Observable<Model> r = ObservableExtensionsKt.computationLatest(h).r();
+            m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+            return r;
         }
 
         public final Parser<MessageRenderContext, Node<MessageRenderContext>, MessageParseState> createTitlesParser() {
@@ -342,8 +342,8 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             this.roles = map3;
             this.myId = j;
             Parser<MessageRenderContext, Node<MessageRenderContext>, MessageParseState> createTitlesParser = WidgetChatListAdapterItemEmbed.Companion.createTitlesParser();
-            String k = embedEntry.getMessage().k();
-            List parse$default = Parser.parse$default(createTitlesParser, k == null ? "" : k, MessageParseState.Companion.getInitialState(), null, 4, null);
+            String content = embedEntry.getMessage().getContent();
+            List parse$default = Parser.parse$default(createTitlesParser, content == null ? "" : content, MessageParseState.Companion.getInitialState(), null, 4, null);
             MessagePreprocessor messagePreprocessor = new MessagePreprocessor(j, embedEntry.getMessageState());
             messagePreprocessor.process(parse$default);
             List<SpoilerNode<?>> spoilers = messagePreprocessor.getSpoilers();
@@ -357,7 +357,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
                         arrayList.add(this.spoilers.get(number.intValue()));
                     }
                     try {
-                        AnimatableValueParser.E2(arrayList, new WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1(embedEntry.getEmbed().l()));
+                        AnimatableValueParser.G2(arrayList, new WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$1(embedEntry.getEmbed().l()));
                     } catch (WidgetChatListAdapterItemEmbed$Model$isEmbedUrlFoundInVisibleSpoilerNode$1$2$MatchFoundException unused) {
                         z3 = true;
                     }
@@ -543,71 +543,71 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemEmbed(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558929, widgetChatListAdapter);
+        super(2131558932, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362517;
-        View findViewById = view.findViewById(2131362517);
+        int i = 2131362530;
+        View findViewById = view.findViewById(2131362530);
         if (findViewById != null) {
-            i = 2131362519;
-            View findViewById2 = view.findViewById(2131362519);
+            i = 2131362532;
+            View findViewById2 = view.findViewById(2131362532);
             if (findViewById2 != null) {
-                i = 2131362559;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362559);
+                i = 2131362572;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362572);
                 if (simpleDraweeView != null) {
-                    i = 2131362560;
-                    TextView textView = (TextView) view.findViewById(2131362560);
+                    i = 2131362573;
+                    TextView textView = (TextView) view.findViewById(2131362573);
                     if (textView != null) {
-                        i = 2131362561;
-                        Barrier barrier = (Barrier) view.findViewById(2131362561);
+                        i = 2131362574;
+                        Barrier barrier = (Barrier) view.findViewById(2131362574);
                         if (barrier != null) {
-                            i = 2131362562;
-                            Barrier barrier2 = (Barrier) view.findViewById(2131362562);
+                            i = 2131362575;
+                            Barrier barrier2 = (Barrier) view.findViewById(2131362575);
                             if (barrier2 != null) {
-                                i = 2131362563;
-                                MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362563);
+                                i = 2131362576;
+                                MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362576);
                                 if (materialCardView != null) {
-                                    i = 2131362564;
-                                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362564);
+                                    i = 2131362577;
+                                    ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362577);
                                     if (constraintLayout != null) {
-                                        i = 2131362565;
-                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362565);
+                                        i = 2131362578;
+                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362578);
                                         if (linkifiedTextView != null) {
-                                            i = 2131362566;
-                                            View findViewById3 = view.findViewById(2131362566);
+                                            i = 2131362579;
+                                            View findViewById3 = view.findViewById(2131362579);
                                             if (findViewById3 != null) {
-                                                i = 2131362569;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362569);
+                                                i = 2131362582;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362582);
                                                 if (linearLayout != null) {
-                                                    i = 2131362570;
-                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362570);
+                                                    i = 2131362583;
+                                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362583);
                                                     if (simpleDraweeView2 != null) {
-                                                        i = 2131362571;
-                                                        TextView textView2 = (TextView) view.findViewById(2131362571);
+                                                        i = 2131362584;
+                                                        TextView textView2 = (TextView) view.findViewById(2131362584);
                                                         if (textView2 != null) {
-                                                            i = 2131362572;
-                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) view.findViewById(2131362572);
+                                                            i = 2131362585;
+                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) view.findViewById(2131362585);
                                                             if (simpleDraweeView3 != null) {
-                                                                i = 2131362573;
-                                                                ImageView imageView = (ImageView) view.findViewById(2131362573);
+                                                                i = 2131362586;
+                                                                ImageView imageView = (ImageView) view.findViewById(2131362586);
                                                                 if (imageView != null) {
-                                                                    i = 2131362574;
-                                                                    SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) view.findViewById(2131362574);
+                                                                    i = 2131362587;
+                                                                    SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) view.findViewById(2131362587);
                                                                     if (simpleDraweeView4 != null) {
-                                                                        i = 2131362575;
-                                                                        TextView textView3 = (TextView) view.findViewById(2131362575);
+                                                                        i = 2131362588;
+                                                                        TextView textView3 = (TextView) view.findViewById(2131362588);
                                                                         if (textView3 != null) {
-                                                                            i = 2131362576;
-                                                                            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362576);
+                                                                            i = 2131362589;
+                                                                            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362589);
                                                                             if (frameLayout != null) {
-                                                                                i = 2131362577;
-                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362577);
+                                                                                i = 2131362590;
+                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362590);
                                                                                 if (linkifiedTextView2 != null) {
-                                                                                    i = 2131363001;
-                                                                                    CardView cardView = (CardView) view.findViewById(2131363001);
+                                                                                    i = 2131363026;
+                                                                                    CardView cardView = (CardView) view.findViewById(2131363026);
                                                                                     if (cardView != null) {
-                                                                                        i = 2131363002;
-                                                                                        InlineMediaView inlineMediaView = (InlineMediaView) view.findViewById(2131363002);
+                                                                                        i = 2131363027;
+                                                                                        InlineMediaView inlineMediaView = (InlineMediaView) view.findViewById(2131363027);
                                                                                         if (inlineMediaView != null) {
                                                                                             WidgetChatListAdapterItemEmbedBinding widgetChatListAdapterItemEmbedBinding = new WidgetChatListAdapterItemEmbedBinding((ConstraintLayout) view, findViewById, findViewById2, simpleDraweeView, textView, barrier, barrier2, materialCardView, constraintLayout, linkifiedTextView, findViewById3, linearLayout, simpleDraweeView2, textView2, simpleDraweeView3, imageView, simpleDraweeView4, textView3, frameLayout, linkifiedTextView2, cardView, inlineMediaView);
                                                                                             m.checkNotNullExpressionValue(widgetChatListAdapterItemEmbedBinding, "WidgetChatListAdapterIte…bedBinding.bind(itemView)");
@@ -728,12 +728,12 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
     private final void configureEmbedDescription(Model model, MessageRenderContext messageRenderContext) {
         Map<Integer, Set<String>> visibleSpoilerEmbedMap;
         if (model.getParsedDescription() != null) {
-            long r = model.getEmbedEntry().getMessage().r();
+            long id2 = model.getEmbedEntry().getMessage().getId();
             int embedIndex = model.getEmbedEntry().getEmbedIndex();
             long myId = model.getMyId();
             StoreMessageState.State messageState = model.getEmbedEntry().getMessageState();
             new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, "desc"), null, false, null, 28, null).process(model.getParsedDescription());
-            this.binding.h.setDraweeSpanStringBuilder(AstRenderer.render(model.getParsedDescription(), MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedDescription$1(r, embedIndex), null, null, 14335, null)));
+            this.binding.h.setDraweeSpanStringBuilder(AstRenderer.render(model.getParsedDescription(), MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedDescription$1(id2, embedIndex), null, null, 14335, null)));
             LinkifiedTextView linkifiedTextView = this.binding.h;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatListItemEmbedDescription");
             linkifiedTextView.setVisibility(0);
@@ -775,33 +775,33 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         LinearLayout linearLayout3 = this.binding.j;
         m.checkNotNullExpressionValue(linearLayout3, "binding.chatListItemEmbedFields");
         Context context = linearLayout3.getContext();
-        long r = model.getEmbedEntry().getMessage().r();
+        long id2 = model.getEmbedEntry().getMessage().getId();
         int embedIndex = model.getEmbedEntry().getEmbedIndex();
         StoreMessageState.State messageState = model.getEmbedEntry().getMessageState();
-        WidgetChatListAdapterItemEmbed$configureEmbedFields$1 widgetChatListAdapterItemEmbed$configureEmbedFields$1 = new WidgetChatListAdapterItemEmbed$configureEmbedFields$1(model, messageState != null ? messageState.getVisibleSpoilerEmbedMap() : null, embedIndex, messageRenderContext, r);
+        WidgetChatListAdapterItemEmbed$configureEmbedFields$1 widgetChatListAdapterItemEmbed$configureEmbedFields$1 = new WidgetChatListAdapterItemEmbed$configureEmbedFields$1(model, messageState != null ? messageState.getVisibleSpoilerEmbedMap() : null, embedIndex, messageRenderContext, id2);
         int size = parsedFields.size();
         for (int i = 0; i < size; i++) {
             LinearLayout linearLayout4 = this.binding.j;
             m.checkNotNullExpressionValue(linearLayout4, "binding.chatListItemEmbedFields");
-            int i2 = 2131362568;
+            int i2 = 2131362581;
             if (i < linearLayout4.getChildCount()) {
                 r5 = this.binding.j.getChildAt(i);
             } else {
-                View inflate = LayoutInflater.from(context).inflate(2131558930, (ViewGroup) this.binding.j, false);
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131362567);
+                View inflate = LayoutInflater.from(context).inflate(2131558933, (ViewGroup) this.binding.j, false);
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131362580);
                 if (linkifiedTextView != null) {
-                    LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) inflate.findViewById(2131362568);
+                    LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) inflate.findViewById(2131362581);
                     if (linkifiedTextView2 != null) {
                         r5 = (LinearLayout) inflate;
-                        m.checkNotNullExpressionValue(new h4(r5, linkifiedTextView, linkifiedTextView2), "WidgetChatListAdapterIte…edFields, false\n        )");
+                        m.checkNotNullExpressionValue(new k4(r5, linkifiedTextView, linkifiedTextView2), "WidgetChatListAdapterIte…edFields, false\n        )");
                     }
                 } else {
-                    i2 = 2131362567;
+                    i2 = 2131362580;
                 }
                 throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
             }
-            ((SimpleDraweeSpanTextView) r5.findViewById(2131362567)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedName(), a.l("f_name:", i)));
-            ((SimpleDraweeSpanTextView) r5.findViewById(2131362568)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedValue(), "f_value:" + i));
+            ((SimpleDraweeSpanTextView) r5.findViewById(2131362580)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedName(), a.l("f_name:", i)));
+            ((SimpleDraweeSpanTextView) r5.findViewById(2131362581)).setDraweeSpanStringBuilder(widgetChatListAdapterItemEmbed$configureEmbedFields$1.invoke((Collection<? extends Node<MessageRenderContext>>) parsedFields.get(i).getParsedValue(), "f_value:" + i));
             this.binding.j.addView(r5);
         }
     }
@@ -848,7 +848,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         boolean shouldRenderMedia = shouldRenderMedia();
         Integer num2 = previewImage.b;
         boolean z2 = true;
-        boolean z3 = num2 != null && d0.a0.a.getSign(num2.intValue()) == 1 && (num = previewImage.f2006c) != null && d0.a0.a.getSign(num.intValue()) == 1;
+        boolean z3 = num2 != null && d0.a0.a.getSign(num2.intValue()) == 1 && (num = previewImage.f2011c) != null && d0.a0.a.getSign(num.intValue()) == 1;
         if (!shouldRenderMedia || !z3) {
             CardView cardView2 = this.binding.f1729s;
             m.checkNotNullExpressionValue(cardView2, "binding.embedImageContainer");
@@ -860,7 +860,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
             int i3 = i2 / 2;
             Integer num3 = previewImage.b;
             int intValue = num3 != null ? num3.intValue() : 0;
-            Integer num4 = previewImage.f2006c;
+            Integer num4 = previewImage.f2011c;
             configureEmbedImage(simpleDraweeView, i2, intValue, num4 != null ? num4.intValue() : 0, previewImage.a, i3);
             CardView cardView3 = this.binding.f1729s;
             m.checkNotNullExpressionValue(cardView3, "binding.embedImageContainer");
@@ -1039,14 +1039,14 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         if (renderableEmbedMedia != null) {
             Integer num = renderableEmbedMedia.b;
             if ((num != null ? num.intValue() : 0) <= 0) {
-                Integer num2 = renderableEmbedMedia.f2006c;
+                Integer num2 = renderableEmbedMedia.f2011c;
                 if ((num2 != null ? num2.intValue() : 0) <= 0) {
                     z3 = false;
                     if (!z3) {
                         EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE;
                         Integer num3 = renderableEmbedMedia.b;
                         int intValue = num3 != null ? num3.intValue() : 0;
-                        Integer num4 = renderableEmbedMedia.f2006c;
+                        Integer num4 = renderableEmbedMedia.f2011c;
                         int intValue2 = num4 != null ? num4.intValue() : 0;
                         int i = this.maxEmbedImageWidth;
                         int i2 = MAX_IMAGE_VIEW_HEIGHT_PX;
@@ -1192,9 +1192,9 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp
         String c2 = embedEntry.getEmbed().c();
         Model model = new Model(embedEntry, c2 != null ? Parser.parse$default(UI_THREAD_VALUES_PARSER, c2, MessageParseState.Companion.getInitialState(), null, 4, null) : null, parseFields(embedEntry.getEmbed().d(), UI_THREAD_TITLES_PARSER, UI_THREAD_VALUES_PARSER), null, null, null, 0, 120, null);
         configureUI(model);
-        Observable a02 = Companion.access$getModel(Companion, model).a0(1);
-        m.checkNotNullExpressionValue(a02, "getModel(initialModel)\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), WidgetChatListAdapterItemEmbed.class, (Context) null, new WidgetChatListAdapterItemEmbed$onConfigure$3(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemEmbed$onConfigure$4(this), 58, (Object) null);
+        Observable Z = Companion.access$getModel(Companion, model).Z(1);
+        m.checkNotNullExpressionValue(Z, "getModel(initialModel)\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), WidgetChatListAdapterItemEmbed.class, (Context) null, new WidgetChatListAdapterItemEmbed$onConfigure$3(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemEmbed$onConfigure$4(this), 58, (Object) null);
     }
 
     @Override // com.discord.widgets.chat.list.FragmentLifecycleListener
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java
index ed199a1163..f831cc7280 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java
@@ -14,14 +14,14 @@ public final class WidgetChatListAdapterItemEmptyPins extends WidgetChatListItem
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemEmptyPins(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558931, widgetChatListAdapter);
+        super(2131558934, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362549;
-        ImageView imageView = (ImageView) view.findViewById(2131362549);
+        int i = 2131362562;
+        ImageView imageView = (ImageView) view.findViewById(2131362562);
         if (imageView != null) {
-            i = 2131362550;
-            TextView textView = (TextView) view.findViewById(2131362550);
+            i = 2131362563;
+            TextView textView = (TextView) view.findViewById(2131362563);
             if (textView != null) {
                 WidgetChatListAdapterItemEmptyPinsBinding widgetChatListAdapterItemEmptyPinsBinding = new WidgetChatListAdapterItemEmptyPinsBinding((RelativeLayout) view, imageView, textView);
                 m.checkNotNullExpressionValue(widgetChatListAdapterItemEmptyPinsBinding, "WidgetChatListAdapterIte…insBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
index e3d2554a20..8e2a782425 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java
@@ -1,9 +1,9 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
+import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -69,7 +69,7 @@ public final class WidgetChatListAdapterItemEphemeralMessage$onConfigure$2 exten
             AnonymousClass1 r1 = new AnonymousClass1(this);
             Objects.requireNonNull(hook);
             m.checkNotNullParameter(r1, "onClick");
-            hook.f2011c = new Hook.a(valueOf, r1);
+            hook.f2016c = new Hook.a(valueOf, r1);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
index ca295e144d..a228692b8b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java
@@ -7,8 +7,8 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import c.a.l.b;
-import com.discord.api.message.Message;
 import com.discord.databinding.WidgetChatListAdapterItemEphemeralMessageBinding;
+import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.entries.EphemeralMessageEntry;
 import d0.z.d.m;
@@ -18,26 +18,26 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemEphemeralMessage(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558932, widgetChatListAdapter);
+        super(2131558935, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362517;
-        View findViewById = view.findViewById(2131362517);
+        int i = 2131362530;
+        View findViewById = view.findViewById(2131362530);
         if (findViewById != null) {
-            i = 2131362519;
-            View findViewById2 = view.findViewById(2131362519);
+            i = 2131362532;
+            View findViewById2 = view.findViewById(2131362532);
             if (findViewById2 != null) {
-                i = 2131362520;
-                ImageView imageView = (ImageView) view.findViewById(2131362520);
+                i = 2131362533;
+                ImageView imageView = (ImageView) view.findViewById(2131362533);
                 if (imageView != null) {
-                    i = 2131362537;
-                    TextView textView = (TextView) view.findViewById(2131362537);
+                    i = 2131362550;
+                    TextView textView = (TextView) view.findViewById(2131362550);
                     if (textView != null) {
-                        i = 2131362547;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362547);
+                        i = 2131362560;
+                        ImageView imageView2 = (ImageView) view.findViewById(2131362560);
                         if (imageView2 != null) {
-                            i = 2131365328;
-                            Guideline guideline = (Guideline) view.findViewById(2131365328);
+                            i = 2131365384;
+                            Guideline guideline = (Guideline) view.findViewById(2131365384);
                             if (guideline != null) {
                                 WidgetChatListAdapterItemEphemeralMessageBinding widgetChatListAdapterItemEphemeralMessageBinding = new WidgetChatListAdapterItemEphemeralMessageBinding((ConstraintLayout) view, findViewById, findViewById2, imageView, textView, imageView2, guideline);
                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemEphemeralMessageBinding, "WidgetChatListAdapterIte…ageBinding.bind(itemView)");
@@ -73,11 +73,11 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL
         this.binding.d.setOnClickListener(new WidgetChatListAdapterItemEphemeralMessage$onConfigure$1(this));
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextDismiss");
-        String quantityString = textView.getResources().getQuantityString(2131755232, 1);
+        String quantityString = textView.getResources().getQuantityString(2131755233, 1);
         m.checkNotNullExpressionValue(quantityString, "itemDismiss.resources.ge…nd_delete_these_count, 1)");
-        String quantityString2 = textView.getResources().getQuantityString(2131755233, 1);
+        String quantityString2 = textView.getResources().getQuantityString(2131755234, 1);
         m.checkNotNullExpressionValue(quantityString2, "itemDismiss.resources.ge…e_these_countMessages, 1)");
         textView.setMovementMethod(LinkMovementMethod.getInstance());
-        textView.setText(b.c(textView, 2131891675, new Object[]{quantityString, quantityString2}, new WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(this, message)));
+        textView.setText(b.c(textView, 2131891744, new Object[]{quantityString, quantityString2}, new WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(this, message)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java
index fcf10b4b0c..0ab09cbde9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java
@@ -20,17 +20,17 @@ public final class WidgetChatListAdapterItemGameInvite extends WidgetChatListIte
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGameInvite(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558934, widgetChatListAdapter);
+        super(2131558937, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363649);
+        ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363690);
         if (viewEmbedGameInvite != null) {
             WidgetChatListAdapterItemGameInviteBinding widgetChatListAdapterItemGameInviteBinding = new WidgetChatListAdapterItemGameInviteBinding((CardView) view, viewEmbedGameInvite);
             m.checkNotNullExpressionValue(widgetChatListAdapterItemGameInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)");
             this.binding = widgetChatListAdapterItemGameInviteBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363649)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363690)));
     }
 
     public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemGameInvite widgetChatListAdapterItemGameInvite) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
index 637ebc03cc..f3044a10ef 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java
@@ -311,52 +311,52 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
 
         public final Observable<Model> get(GiftEntry giftEntry) {
             m.checkNotNullParameter(giftEntry, "item");
-            Observable<R> Z = StoreStream.Companion.getGifting().requestGift(giftEntry.getGiftCode()).Z(new WidgetChatListAdapterItemGift$ModelProvider$get$1(giftEntry));
-            m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getGifting().requestGift(giftEntry.getGiftCode()).Y(new WidgetChatListAdapterItemGift$ModelProvider$get$1(giftEntry));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+            return Y;
         }
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGift(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558935, widgetChatListAdapter);
+        super(2131558938, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362092;
-        Barrier barrier = (Barrier) view.findViewById(2131362092);
+        int i = 2131362097;
+        Barrier barrier = (Barrier) view.findViewById(2131362097);
         if (barrier != null) {
-            i = 2131363659;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363659);
+            i = 2131363700;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363700);
             if (materialButton != null) {
-                i = 2131363660;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363660);
+                i = 2131363701;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363701);
                 if (materialButton2 != null) {
-                    i = 2131363661;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363661);
+                    i = 2131363702;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363702);
                     if (linearLayout != null) {
-                        i = 2131363662;
-                        TextView textView = (TextView) view.findViewById(2131363662);
+                        i = 2131363703;
+                        TextView textView = (TextView) view.findViewById(2131363703);
                         if (textView != null) {
-                            i = 2131363663;
-                            TextView textView2 = (TextView) view.findViewById(2131363663);
+                            i = 2131363704;
+                            TextView textView2 = (TextView) view.findViewById(2131363704);
                             if (textView2 != null) {
-                                i = 2131363664;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363664);
+                                i = 2131363705;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363705);
                                 if (simpleDraweeView != null) {
-                                    i = 2131363665;
-                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363665);
+                                    i = 2131363706;
+                                    SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363706);
                                     if (simpleDraweeView2 != null) {
-                                        i = 2131363666;
-                                        View findViewById = view.findViewById(2131363666);
+                                        i = 2131363707;
+                                        View findViewById = view.findViewById(2131363707);
                                         if (findViewById != null) {
-                                            i = 2131363667;
-                                            TextView textView3 = (TextView) view.findViewById(2131363667);
+                                            i = 2131363708;
+                                            TextView textView3 = (TextView) view.findViewById(2131363708);
                                             if (textView3 != null) {
-                                                i = 2131363668;
-                                                TextView textView4 = (TextView) view.findViewById(2131363668);
+                                                i = 2131363709;
+                                                TextView textView4 = (TextView) view.findViewById(2131363709);
                                                 if (textView4 != null) {
-                                                    i = 2131363669;
-                                                    MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363669);
+                                                    i = 2131363710;
+                                                    MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363710);
                                                     if (materialButton3 != null) {
                                                         ConstraintLayout constraintLayout = (ConstraintLayout) view;
                                                         WidgetChatListAdapterItemGiftBinding widgetChatListAdapterItemGiftBinding = new WidgetChatListAdapterItemGiftBinding(constraintLayout, barrier, materialButton, materialButton2, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, findViewById, textView3, textView4, materialButton3, constraintLayout);
@@ -425,12 +425,12 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         simpleDraweeView.setVisibility(4);
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.itemGiftHeader");
-        textView.setText(areEqual ? context.getString(2131889071) : context.getString(2131889070));
-        this.binding.i.setText(2131889067);
+        textView.setText(areEqual ? context.getString(2131889075) : context.getString(2131889074));
+        this.binding.i.setText(2131889071);
         this.binding.i.setTextColor(ColorCompat.getColor(context, 2131100324));
         this.binding.i.setBackgroundResource(0);
         m.checkNotNullExpressionValue(context, "context");
-        this.binding.f.setImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969516, 2131232207));
+        this.binding.f.setImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969516, 2131232215));
         TextView textView2 = this.binding.j;
         m.checkNotNullExpressionValue(textView2, "binding.itemGiftSubtext");
         textView2.setVisibility(8);
@@ -453,13 +453,13 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
         Context context = view.getContext();
-        this.binding.e.setText(2131889072);
+        this.binding.e.setText(2131889076);
         TextView textView = this.binding.i;
         m.checkNotNullExpressionValue(textView, "binding.itemGiftName");
         textView.setText((CharSequence) null);
         this.binding.i.setTextColor(ColorCompat.getThemedColor(context, 2130969870));
-        this.binding.i.setBackgroundResource(2131231107);
-        this.binding.f.setActualImageResource(2131231107);
+        this.binding.i.setBackgroundResource(2131231112);
+        this.binding.f.setActualImageResource(2131231112);
         SimpleDraweeView simpleDraweeView = this.binding.g;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemGiftImageBackground");
         simpleDraweeView.setVisibility(4);
@@ -511,7 +511,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         String giftSplashUrl = iconUtils.getGiftSplashUrl(applicationId, h, Integer.valueOf(view2.getWidth()));
         if (resolved.getGift().isAnyNitroGift()) {
             m.checkNotNullExpressionValue(context, "context");
-            this.binding.g.setActualImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969336, 2131232191));
+            this.binding.g.setActualImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969336, 2131232199));
             SimpleDraweeView simpleDraweeView = this.binding.g;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemGiftImageBackground");
             simpleDraweeView.setVisibility(0);
@@ -529,7 +529,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
         }
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.itemGiftHeader");
-        textView.setText(z2 ? context.getString(2131889075) : context.getString(2131889074));
+        textView.setText(z2 ? context.getString(2131889079) : context.getString(2131889078));
         TextView textView2 = this.binding.i;
         m.checkNotNullExpressionValue(textView2, "binding.itemGiftName");
         ModelStoreListing storeListing3 = resolved.getGift().getStoreListing();
@@ -543,7 +543,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             TextView textView4 = this.binding.d;
             m.checkNotNullExpressionValue(textView4, "binding.itemGiftExpires");
             m.checkNotNullExpressionValue(context, "context");
-            textView4.setText(c.a.l.b.g(context, 2131889062, new Object[]{GiftingUtils.INSTANCE.getTimeString(resolved.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context)}, null, 4));
+            textView4.setText(c.a.l.b.g(context, 2131889066, new Object[]{GiftingUtils.INSTANCE.getTimeString(resolved.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context)}, null, 4));
         }
         if (resolved.getGift().isAnyNitroGift()) {
             MGImages mGImages = MGImages.INSTANCE;
@@ -561,16 +561,16 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             this.binding.f.setImageURI(str);
         }
         if (!resolved.getMeUser().isVerified()) {
-            String string = context.getString(2131888986);
+            String string = context.getString(2131888990);
             m.checkNotNullExpressionValue(string, "context.getString(R.stri…xt_verification_required)");
             str2 = t.replace$default(t.replace$default(t.replace$default(string, "(onClick)", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null);
         } else if (isClaimedByMe) {
-            str2 = context.getString(2131889036);
+            str2 = context.getString(2131889040);
         } else if (resolved.getInLibrary()) {
             m.checkNotNullExpressionValue(context, "context");
-            str2 = t.replace$default(t.replace$default(t.replace$default(c.a.l.b.g(context, 2131888985, new Object[]{""}, null, 4).toString(), "()", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null);
+            str2 = t.replace$default(t.replace$default(t.replace$default(c.a.l.b.g(context, 2131888989, new Object[]{""}, null, 4).toString(), "()", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null);
         } else if (z3) {
-            str2 = context.getString(2131888984);
+            str2 = context.getString(2131888988);
         }
         TextView textView5 = this.binding.j;
         m.checkNotNullExpressionValue(textView5, "binding.itemGiftSubtext");
@@ -583,11 +583,11 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem {
             materialButton = this.binding.k;
         } else {
             MaterialButton materialButton2 = this.binding.f1731c;
-            int i = 2131889058;
+            int i = 2131889062;
             if (resolved.getRedeeming()) {
-                i = 2131889059;
+                i = 2131889063;
             } else if (!isClaimedByMe && resolved.getInLibrary()) {
-                i = 2131889060;
+                i = 2131889064;
             }
             materialButton2.setText(i);
             materialButton = this.binding.f1731c;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java
index d87c38e016..b30fc4b707 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.entries.MessageEntry;
@@ -35,7 +35,7 @@ public final class WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2 ex
         Message message = ((MessageEntry) this.$data).getMessage();
         View view2 = this.this$0.itemView;
         m.checkNotNullExpressionValue(view2, "itemView");
-        String string = view2.getContext().getString(2131893778);
+        String string = view2.getContext().getString(2131893875);
         m.checkNotNullExpressionValue(string, "itemView.context.getStri…ssage_invite_users_owner)");
         eventHandler.onMessageLongClicked(message, string, false);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
index df427c88e0..4f93cd65c8 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java
@@ -17,20 +17,20 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGuildInviteReminder(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558936, widgetChatListAdapter);
+        super(2131558939, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362441;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362441);
+        int i = 2131362456;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362456);
         if (materialButton != null) {
-            i = 2131362442;
-            ImageView imageView = (ImageView) view.findViewById(2131362442);
+            i = 2131362457;
+            ImageView imageView = (ImageView) view.findViewById(2131362457);
             if (imageView != null) {
-                i = 2131362443;
-                TextView textView = (TextView) view.findViewById(2131362443);
+                i = 2131362458;
+                TextView textView = (TextView) view.findViewById(2131362458);
                 if (textView != null) {
-                    i = 2131362444;
-                    TextView textView2 = (TextView) view.findViewById(2131362444);
+                    i = 2131362459;
+                    TextView textView2 = (TextView) view.findViewById(2131362459);
                     if (textView2 != null) {
                         WidgetChatListAdapterItemGuildInviteReminderBinding widgetChatListAdapterItemGuildInviteReminderBinding = new WidgetChatListAdapterItemGuildInviteReminderBinding((ConstraintLayout) view, materialButton, imageView, textView, textView2);
                         m.checkNotNullExpressionValue(widgetChatListAdapterItemGuildInviteReminderBinding, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
@@ -54,8 +54,8 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh
         if (chatListEntry instanceof MessageEntry) {
             Guild guild = ((WidgetChatListAdapter) this.adapter).getData().getGuild();
             boolean isOwner = guild != null ? guild.isOwner(((WidgetChatListAdapter) this.adapter).getData().getUserId()) : false;
-            int i2 = isOwner ? 2131893778 : 2131893773;
-            int i3 = isOwner ? 2131893777 : 2131893776;
+            int i2 = isOwner ? 2131893875 : 2131893870;
+            int i3 = isOwner ? 2131893874 : 2131893873;
             this.binding.d.setText(i2);
             this.binding.f1732c.setText(i3);
             this.binding.b.setOnClickListener(new WidgetChatListAdapterItemGuildInviteReminder$onConfigure$1(this));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
index 3c64f9ae74..342b1bed97 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java
@@ -120,31 +120,31 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
 
         public final Observable<Model> get(GuildTemplateEntry guildTemplateEntry) {
             m.checkNotNullParameter(guildTemplateEntry, "item");
-            Observable<R> Z = StoreStream.Companion.getGuildTemplates().observeGuildTemplate(guildTemplateEntry.getGuildTemplateCode()).v(new WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1(guildTemplateEntry)).Z(WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$2.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…tes\n          }\n        }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getGuildTemplates().observeGuildTemplate(guildTemplateEntry.getGuildTemplateCode()).u(new WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$1(guildTemplateEntry)).Y(WidgetChatListAdapterItemGuildTemplate$ModelProvider$get$2.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…tes\n          }\n        }");
+            return Y;
         }
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGuildTemplate(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558937, widgetChatListAdapter);
+        super(2131558940, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131363671;
-        TextView textView = (TextView) view.findViewById(2131363671);
+        int i = 2131363712;
+        TextView textView = (TextView) view.findViewById(2131363712);
         if (textView != null) {
-            i = 2131363672;
-            ImageView imageView = (ImageView) view.findViewById(2131363672);
+            i = 2131363713;
+            ImageView imageView = (ImageView) view.findViewById(2131363713);
             if (imageView != null) {
-                i = 2131363673;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363673);
+                i = 2131363714;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363714);
                 if (materialButton != null) {
-                    i = 2131363674;
-                    TextView textView2 = (TextView) view.findViewById(2131363674);
+                    i = 2131363715;
+                    TextView textView2 = (TextView) view.findViewById(2131363715);
                     if (textView2 != null) {
-                        i = 2131363675;
-                        TextView textView3 = (TextView) view.findViewById(2131363675);
+                        i = 2131363716;
+                        TextView textView3 = (TextView) view.findViewById(2131363716);
                         if (textView3 != null) {
                             ConstraintLayout constraintLayout = (ConstraintLayout) view;
                             WidgetChatListAdapterItemGuildTemplateBinding widgetChatListAdapterItemGuildTemplateBinding = new WidgetChatListAdapterItemGuildTemplateBinding(constraintLayout, textView, imageView, materialButton, textView2, textView3, constraintLayout);
@@ -180,8 +180,8 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
     }
 
     private final void configureInvalidUI() {
-        this.binding.f1733c.setText(2131889991);
-        this.binding.d.setText(2131889990);
+        this.binding.f1733c.setText(2131890004);
+        this.binding.d.setText(2131890003);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext");
         textView.setVisibility(0);
@@ -191,7 +191,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList
     }
 
     private final void configureLoadingUI() {
-        this.binding.f1733c.setText(2131890065);
+        this.binding.f1733c.setText(2131890087);
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext");
         textView.setVisibility(8);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
index 592440b734..835587751c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java
@@ -22,25 +22,25 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemGuildWelcome(WidgetChatListAdapter widgetChatListAdapter, Clock clock) {
-        super(2131558938, widgetChatListAdapter);
+        super(2131558941, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         m.checkNotNullParameter(clock, "clock");
         this.clock = clock;
         View view = this.itemView;
-        int i = 2131363676;
-        TextView textView = (TextView) view.findViewById(2131363676);
+        int i = 2131363717;
+        TextView textView = (TextView) view.findViewById(2131363717);
         if (textView != null) {
-            i = 2131363677;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363677);
+            i = 2131363718;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363718);
             if (linkifiedTextView != null) {
-                i = 2131363678;
-                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131363678);
+                i = 2131363719;
+                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131363719);
                 if (linkifiedTextView2 != null) {
-                    i = 2131365572;
-                    ChatActionItem chatActionItem = (ChatActionItem) view.findViewById(2131365572);
+                    i = 2131365633;
+                    ChatActionItem chatActionItem = (ChatActionItem) view.findViewById(2131365633);
                     if (chatActionItem != null) {
-                        i = 2131365573;
-                        ChatActionItem chatActionItem2 = (ChatActionItem) view.findViewById(2131365573);
+                        i = 2131365634;
+                        ChatActionItem chatActionItem2 = (ChatActionItem) view.findViewById(2131365634);
                         if (chatActionItem2 != null) {
                             WidgetChatListAdapterItemGuildWelcomeBinding widgetChatListAdapterItemGuildWelcomeBinding = new WidgetChatListAdapterItemGuildWelcomeBinding((LinearLayout) view, textView, linkifiedTextView, linkifiedTextView2, chatActionItem, chatActionItem2);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemGuildWelcomeBinding, "WidgetChatListAdapterIte…omeBinding.bind(itemView)");
@@ -72,7 +72,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
             m.checkNotNullExpressionValue(textView, "binding.itemGuildWelcomeHeader");
             boolean z2 = true;
             GuildWelcomeEntry guildWelcomeEntry = (GuildWelcomeEntry) chatListEntry;
-            b.n(textView, 2131894600, new Object[]{guildWelcomeEntry.getGuildName()}, null, 4);
+            b.m(textView, 2131894720, new Object[]{guildWelcomeEntry.getGuildName()}, null, 4);
             boolean z3 = (guildWelcomeEntry.getGuildId() >>> 22) + 1420070400000L < this.clock.currentTimeMillis() - 2592000000L;
             ChatActionItem chatActionItem = this.binding.f;
             m.checkNotNullExpressionValue(chatActionItem, "binding.welcomeCardUploadIcon");
@@ -86,7 +86,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
             String D = a.D(new StringBuilder(), f.a.a(360045138571L, null), "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-new-user&utm_content=--t%3Apm");
             LinkifiedTextView linkifiedTextView = this.binding.d;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.itemGuildWelcomeSubheaderIntro");
-            b.n(linkifiedTextView, 2131894595, new Object[]{D}, null, 4);
+            b.m(linkifiedTextView, 2131894715, new Object[]{D}, null, 4);
             LinkifiedTextView linkifiedTextView2 = this.binding.d;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.itemGuildWelcomeSubheaderIntro");
             ChatActionItem chatActionItem3 = this.binding.f;
@@ -104,7 +104,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI
             linkifiedTextView2.setVisibility(i2);
             LinkifiedTextView linkifiedTextView3 = this.binding.f1734c;
             m.checkNotNullExpressionValue(linkifiedTextView3, "binding.itemGuildWelcomeSubheader");
-            b.n(linkifiedTextView3, z3 ? 2131894596 : guildWelcomeEntry.isOwner() ? 2131894598 : 2131894597, new Object[0], null, 4);
+            b.m(linkifiedTextView3, z3 ? 2131894716 : guildWelcomeEntry.isOwner() ? 2131894718 : 2131894717, new Object[0], null, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java
index 370acabb46..3b242ca2b4 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1.java
@@ -41,7 +41,7 @@ public final class WidgetChatListAdapterItemInvite$ModelProvider$observeModel$1
         Guild guild = this.$invite.getGuild();
         boolean z2 = (guild != null ? this.$guildStore.getGuilds().get(Long.valueOf(guild.o())) : null) != null;
         Channel channel = this.$invite.getChannel();
-        Channel channel2 = channel != null ? this.$channelStore.getChannel(channel.g()) : null;
+        Channel channel2 = channel != null ? this.$channelStore.getChannel(channel.h()) : null;
         return (this.$invite.getExpirationTime() >= ClockFactory.get().currentTimeMillis() || this.$invite.isRevoked()) ? new WidgetChatListAdapterItemInvite.Model.Invalid(user, id2, channel2) : new WidgetChatListAdapterItemInvite.Model.Resolved(this.$invite, id2, user, z2, channel2, !this.$accessibilityStore.isReducedMotionEnabled());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureInvalidUI$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureInvalidUI$1.java
index 7157e894fb..35abacb63e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureInvalidUI$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite$configureInvalidUI$1.java
@@ -28,11 +28,11 @@ public final class WidgetChatListAdapterItemInvite$configureInvalidUI$1 implemen
         if (this.$isInviter) {
             WidgetChatListAdapterItemInvite.Model.Invalid invalid = this.$model;
             if (invalid != null && (channel = invalid.getChannel()) != null) {
-                long e = channel.e();
+                long f = channel.f();
                 WidgetGuildInviteShare.Companion companion = WidgetGuildInviteShare.Companion;
                 Context context = this.$context;
                 m.checkNotNullExpressionValue(context, "context");
-                WidgetGuildInviteShare.Companion.launch$default(companion, context, WidgetChatListAdapterItemInvite.access$getAdapter$p(this.this$0).getFragmentManager(), e, Long.valueOf(this.$model.getChannel().g()), false, "Invite Button Embed", 16, null);
+                WidgetGuildInviteShare.Companion.launch$default(companion, context, WidgetChatListAdapterItemInvite.access$getAdapter$p(this.this$0).getFragmentManager(), f, Long.valueOf(this.$model.getChannel().h()), false, "Invite Button Embed", 16, null);
                 return;
             }
             return;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
index 99eec99c74..8df59b4df0 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java
@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import c.a.i.x2;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
@@ -341,70 +342,73 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
 
         public final Observable<Model> get(InviteEntry inviteEntry) {
             m.checkNotNullParameter(inviteEntry, "item");
-            Observable<R> Z = StoreStream.Companion.getInstantInvites().observeInvite(inviteEntry.getInviteCode()).Z(new WidgetChatListAdapterItemInvite$ModelProvider$get$1(inviteEntry));
-            m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…tes\n          }\n        }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getInstantInvites().observeInvite(inviteEntry.getInviteCode()).Y(new WidgetChatListAdapterItemInvite$ModelProvider$get$1(inviteEntry));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…tes\n          }\n        }");
+            return Y;
         }
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemInvite(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558939, widgetChatListAdapter);
+        super(2131558942, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131363684;
-        TextView textView = (TextView) view.findViewById(2131363684);
+        int i = 2131363725;
+        TextView textView = (TextView) view.findViewById(2131363725);
         if (textView != null) {
-            i = 2131363687;
-            TextView textView2 = (TextView) view.findViewById(2131363687);
+            i = 2131363728;
+            TextView textView2 = (TextView) view.findViewById(2131363728);
             if (textView2 != null) {
-                i = 2131363688;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363688);
+                i = 2131363729;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363729);
                 if (simpleDraweeView != null) {
-                    i = 2131363689;
-                    TextView textView3 = (TextView) view.findViewById(2131363689);
+                    i = 2131363730;
+                    TextView textView3 = (TextView) view.findViewById(2131363730);
                     if (textView3 != null) {
-                        i = 2131363690;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363690);
+                        i = 2131363731;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363731);
                         if (materialButton != null) {
-                            i = 2131363691;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363691);
+                            i = 2131363732;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363732);
                             if (materialButton2 != null) {
-                                i = 2131363692;
-                                View findViewById = view.findViewById(2131363692);
+                                i = 2131363733;
+                                View findViewById = view.findViewById(2131363733);
                                 if (findViewById != null) {
-                                    i = 2131363693;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363693);
-                                    if (linearLayout != null) {
-                                        i = 2131363694;
-                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363694);
-                                        if (materialButton3 != null) {
-                                            i = 2131363695;
-                                            TextView textView4 = (TextView) view.findViewById(2131363695);
+                                    i = 2131363734;
+                                    View findViewById2 = view.findViewById(2131363734);
+                                    if (findViewById2 != null) {
+                                        int i2 = 2131363737;
+                                        ImageView imageView = (ImageView) findViewById2.findViewById(2131363737);
+                                        if (imageView != null) {
+                                            i2 = 2131363738;
+                                            TextView textView4 = (TextView) findViewById2.findViewById(2131363738);
                                             if (textView4 != null) {
-                                                i = 2131363696;
-                                                ImageView imageView = (ImageView) view.findViewById(2131363696);
-                                                if (imageView != null) {
-                                                    i = 2131363697;
-                                                    TextView textView5 = (TextView) view.findViewById(2131363697);
+                                                i2 = 2131363739;
+                                                ImageView imageView2 = (ImageView) findViewById2.findViewById(2131363739);
+                                                if (imageView2 != null) {
+                                                    i2 = 2131363740;
+                                                    TextView textView5 = (TextView) findViewById2.findViewById(2131363740);
                                                     if (textView5 != null) {
-                                                        i = 2131363698;
-                                                        ImageView imageView2 = (ImageView) view.findViewById(2131363698);
-                                                        if (imageView2 != null) {
-                                                            i = 2131363699;
-                                                            TextView textView6 = (TextView) view.findViewById(2131363699);
+                                                        x2 x2Var = new x2((LinearLayout) findViewById2, imageView, textView4, imageView2, textView5);
+                                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363735);
+                                                        if (materialButton3 != null) {
+                                                            TextView textView6 = (TextView) view.findViewById(2131363736);
                                                             if (textView6 != null) {
                                                                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                                                                WidgetChatListAdapterItemInviteBinding widgetChatListAdapterItemInviteBinding = new WidgetChatListAdapterItemInviteBinding(constraintLayout, textView, textView2, simpleDraweeView, textView3, materialButton, materialButton2, findViewById, linearLayout, materialButton3, textView4, imageView, textView5, imageView2, textView6, constraintLayout);
+                                                                WidgetChatListAdapterItemInviteBinding widgetChatListAdapterItemInviteBinding = new WidgetChatListAdapterItemInviteBinding(constraintLayout, textView, textView2, simpleDraweeView, textView3, materialButton, materialButton2, findViewById, x2Var, materialButton3, textView6, constraintLayout);
                                                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)");
                                                                 this.binding = widgetChatListAdapterItemInviteBinding;
                                                                 return;
                                                             }
+                                                            i = 2131363736;
+                                                        } else {
+                                                            i = 2131363735;
                                                         }
                                                     }
                                                 }
                                             }
                                         }
+                                        throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i2)));
                                     }
                                 }
                             }
@@ -449,43 +453,47 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
     }
 
     private final void configureForTextChannel(boolean z2, Context context, ModelInvite modelInvite) {
-        LinearLayout linearLayout = this.binding.i;
-        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer");
+        x2 x2Var = this.binding.i;
+        m.checkNotNullExpressionValue(x2Var, "binding.itemInviteMemberContainer");
+        LinearLayout linearLayout = x2Var.a;
+        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer.root");
         linearLayout.setVisibility(0);
-        ImageView imageView = this.binding.l;
-        m.checkNotNullExpressionValue(imageView, "binding.itemInviteOnlineDot");
+        ImageView imageView = this.binding.i.b;
+        m.checkNotNullExpressionValue(imageView, "binding.itemInviteMember…ainer.itemInviteOnlineDot");
         int i = 8;
         imageView.setVisibility(z2 ^ true ? 0 : 8);
-        TextView textView = this.binding.m;
-        m.checkNotNullExpressionValue(textView, "binding.itemInviteOnlineText");
-        c.a.l.b.n(textView, 2131890369, new Object[]{StringUtilsKt.format(modelInvite.getApproximatePresenceCount(), context)}, null, 4);
-        TextView textView2 = this.binding.m;
-        m.checkNotNullExpressionValue(textView2, "binding.itemInviteOnlineText");
+        TextView textView = this.binding.i.f178c;
+        m.checkNotNullExpressionValue(textView, "binding.itemInviteMember…iner.itemInviteOnlineText");
+        c.a.l.b.m(textView, 2131890435, new Object[]{StringUtilsKt.format(modelInvite.getApproximatePresenceCount(), context)}, null, 4);
+        TextView textView2 = this.binding.i.f178c;
+        m.checkNotNullExpressionValue(textView2, "binding.itemInviteMember…iner.itemInviteOnlineText");
         if (!z2) {
             i = 0;
         }
         textView2.setVisibility(i);
-        ImageView imageView2 = this.binding.n;
-        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteTotalMemberDot");
+        ImageView imageView2 = this.binding.i.d;
+        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteMember….itemInviteTotalMemberDot");
         imageView2.setVisibility(0);
-        TextView textView3 = this.binding.o;
-        m.checkNotNullExpressionValue(textView3, "binding.itemInviteTotalMemberText");
-        TextView textView4 = this.binding.o;
-        m.checkNotNullExpressionValue(textView4, "binding.itemInviteTotalMemberText");
+        TextView textView3 = this.binding.i.e;
+        m.checkNotNullExpressionValue(textView3, "binding.itemInviteMember…itemInviteTotalMemberText");
+        TextView textView4 = this.binding.i.e;
+        m.checkNotNullExpressionValue(textView4, "binding.itemInviteMember…itemInviteTotalMemberText");
         Resources resources = textView4.getResources();
-        m.checkNotNullExpressionValue(resources, "binding.itemInviteTotalMemberText.resources");
-        ViewExtensions.setTextAndVisibilityBy(textView3, StringResourceUtilsKt.getQuantityString(resources, context, 2131755191, modelInvite.getApproximateMemberCount(), Integer.valueOf(modelInvite.getApproximateMemberCount())));
+        m.checkNotNullExpressionValue(resources, "binding.itemInviteMember…TotalMemberText.resources");
+        ViewExtensions.setTextAndVisibilityBy(textView3, StringResourceUtilsKt.getQuantityString(resources, context, 2131755192, modelInvite.getApproximateMemberCount(), Integer.valueOf(modelInvite.getApproximateMemberCount())));
     }
 
     private final void configureForVocalChannel(Channel channel, Context context) {
         int i;
-        LinearLayout linearLayout = this.binding.i;
-        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer");
+        x2 x2Var = this.binding.i;
+        m.checkNotNullExpressionValue(x2Var, "binding.itemInviteMemberContainer");
+        LinearLayout linearLayout = x2Var.a;
+        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer.root");
         linearLayout.setVisibility(8);
         TextView textView = this.binding.b;
-        int z2 = channel.z();
-        if (z2 != 2) {
-            i = z2 != 13 ? 0 : 2131231478;
+        int A = channel.A();
+        if (A != 2) {
+            i = A != 13 ? 0 : 2131231484;
         } else {
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
@@ -493,27 +501,29 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         }
         DrawableCompat.setCompoundDrawablesCompat$default(textView, i, 0, 0, 0, 14, (Object) null);
         ViewExtensions.setTextAndVisibilityBy(textView, AnimatableValueParser.z0(channel, context, false));
-        LinearLayout linearLayout2 = this.binding.i;
-        m.checkNotNullExpressionValue(linearLayout2, "binding.itemInviteMemberContainer");
+        x2 x2Var2 = this.binding.i;
+        m.checkNotNullExpressionValue(x2Var2, "binding.itemInviteMemberContainer");
+        LinearLayout linearLayout2 = x2Var2.a;
+        m.checkNotNullExpressionValue(linearLayout2, "binding.itemInviteMemberContainer.root");
         linearLayout2.setVisibility(8);
-        TextView textView2 = this.binding.m;
-        m.checkNotNullExpressionValue(textView2, "binding.itemInviteOnlineText");
+        TextView textView2 = this.binding.i.f178c;
+        m.checkNotNullExpressionValue(textView2, "binding.itemInviteMember…iner.itemInviteOnlineText");
         textView2.setVisibility(8);
-        ImageView imageView = this.binding.l;
-        m.checkNotNullExpressionValue(imageView, "binding.itemInviteOnlineDot");
+        ImageView imageView = this.binding.i.b;
+        m.checkNotNullExpressionValue(imageView, "binding.itemInviteMember…ainer.itemInviteOnlineDot");
         imageView.setVisibility(8);
-        TextView textView3 = this.binding.o;
-        m.checkNotNullExpressionValue(textView3, "binding.itemInviteTotalMemberText");
+        TextView textView3 = this.binding.i.e;
+        m.checkNotNullExpressionValue(textView3, "binding.itemInviteMember…itemInviteTotalMemberText");
         textView3.setVisibility(8);
-        ImageView imageView2 = this.binding.n;
-        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteTotalMemberDot");
+        ImageView imageView2 = this.binding.i.d;
+        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteMember….itemInviteTotalMemberDot");
         imageView2.setVisibility(8);
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:31:0x0122  */
-    /* JADX WARNING: Removed duplicated region for block: B:32:0x0126  */
-    /* JADX WARNING: Removed duplicated region for block: B:35:0x0137 A[ADDED_TO_REGION] */
-    /* JADX WARNING: Removed duplicated region for block: B:42:0x014e  */
+    /* JADX WARNING: Removed duplicated region for block: B:31:0x0136  */
+    /* JADX WARNING: Removed duplicated region for block: B:32:0x013a  */
+    /* JADX WARNING: Removed duplicated region for block: B:35:0x014b A[ADDED_TO_REGION] */
+    /* JADX WARNING: Removed duplicated region for block: B:42:0x0162  */
     private final void configureInvalidUI(Model.Invalid invalid) {
         CharSequence charSequence;
         Channel channel;
@@ -526,13 +536,13 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         TextView textView = this.binding.f1735c;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader");
         int i = 0;
-        c.a.l.b.n(textView, areEqual ? 2131890500 : 2131890494, new Object[0], null, 4);
+        c.a.l.b.m(textView, areEqual ? 2131890568 : 2131890561, new Object[0], null, 4);
         TextView textView2 = this.binding.k;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteName");
-        c.a.l.b.n(textView2, 2131890483, new Object[0], null, 4);
+        c.a.l.b.m(textView2, 2131890549, new Object[0], null, 4);
         this.binding.k.setTextColor(ColorCompat.getColor(context, 2131100324));
         this.binding.k.setBackgroundResource(0);
-        this.binding.d.setActualImageResource(2131232248);
+        this.binding.d.setActualImageResource(2131232257);
         TextView textView3 = this.binding.e;
         m.checkNotNullExpressionValue(textView3, "binding.itemInviteImageText");
         textView3.setVisibility(8);
@@ -540,31 +550,35 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         if (!areEqual) {
             if ((invalid != null ? invalid.getAuthorUser() : null) != null) {
                 m.checkNotNullExpressionValue(context, "context");
-                charSequence = c.a.l.b.g(context, 2131890359, new Object[]{invalid.getAuthorUser().getUsername()}, null, 4);
-                LinearLayout linearLayout = this.binding.i;
-                m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer");
+                charSequence = c.a.l.b.g(context, 2131890425, new Object[]{invalid.getAuthorUser().getUsername()}, null, 4);
+                x2 x2Var = this.binding.i;
+                m.checkNotNullExpressionValue(x2Var, "binding.itemInviteMemberContainer");
+                LinearLayout linearLayout = x2Var.a;
+                m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer.root");
                 linearLayout.setVisibility(0);
-                this.binding.i.setBackgroundResource(0);
-                TextView textView4 = this.binding.m;
-                m.checkNotNullExpressionValue(textView4, "binding.itemInviteOnlineText");
+                x2 x2Var2 = this.binding.i;
+                m.checkNotNullExpressionValue(x2Var2, "binding.itemInviteMemberContainer");
+                x2Var2.a.setBackgroundResource(0);
+                TextView textView4 = this.binding.i.f178c;
+                m.checkNotNullExpressionValue(textView4, "binding.itemInviteMember…iner.itemInviteOnlineText");
                 ViewExtensions.setTextAndVisibilityBy(textView4, charSequence);
-                ImageView imageView = this.binding.l;
-                m.checkNotNullExpressionValue(imageView, "binding.itemInviteOnlineDot");
+                ImageView imageView = this.binding.i.b;
+                m.checkNotNullExpressionValue(imageView, "binding.itemInviteMember…ainer.itemInviteOnlineDot");
                 imageView.setVisibility(8);
-                TextView textView5 = this.binding.o;
-                m.checkNotNullExpressionValue(textView5, "binding.itemInviteTotalMemberText");
+                TextView textView5 = this.binding.i.e;
+                m.checkNotNullExpressionValue(textView5, "binding.itemInviteMember…itemInviteTotalMemberText");
                 ViewExtensions.setTextAndVisibilityBy(textView5, null);
-                ImageView imageView2 = this.binding.n;
-                m.checkNotNullExpressionValue(imageView2, "binding.itemInviteTotalMemberDot");
+                ImageView imageView2 = this.binding.i.d;
+                m.checkNotNullExpressionValue(imageView2, "binding.itemInviteMember….itemInviteTotalMemberDot");
                 imageView2.setVisibility(8);
                 MaterialButton materialButton = this.binding.j;
                 m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
-                c.a.l.b.n(materialButton, areEqual ? 2131887913 : 2131891141, new Object[0], null, 4);
+                c.a.l.b.m(materialButton, areEqual ? 2131887912 : 2131891212, new Object[0], null, 4);
                 MaterialButton materialButton2 = this.binding.j;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton");
                 if (areEqual) {
                     if (!(invalid == null || (channel = invalid.getChannel()) == null)) {
-                        l = Long.valueOf(channel.e());
+                        l = Long.valueOf(channel.f());
                     }
                     if (l == null) {
                         z2 = false;
@@ -589,26 +603,30 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         if (!areEqual) {
             if ((invalid != null ? invalid.getAuthorUser() : null) == null) {
                 m.checkNotNullExpressionValue(context, "context");
-                charSequence = c.a.l.b.g(context, 2131890358, new Object[0], null, 4);
-                LinearLayout linearLayout = this.binding.i;
-                m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer");
+                charSequence = c.a.l.b.g(context, 2131890424, new Object[0], null, 4);
+                x2 x2Var = this.binding.i;
+                m.checkNotNullExpressionValue(x2Var, "binding.itemInviteMemberContainer");
+                LinearLayout linearLayout = x2Var.a;
+                m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer.root");
                 linearLayout.setVisibility(0);
-                this.binding.i.setBackgroundResource(0);
-                TextView textView4 = this.binding.m;
-                m.checkNotNullExpressionValue(textView4, "binding.itemInviteOnlineText");
+                x2 x2Var2 = this.binding.i;
+                m.checkNotNullExpressionValue(x2Var2, "binding.itemInviteMemberContainer");
+                x2Var2.a.setBackgroundResource(0);
+                TextView textView4 = this.binding.i.f178c;
+                m.checkNotNullExpressionValue(textView4, "binding.itemInviteMember…iner.itemInviteOnlineText");
                 ViewExtensions.setTextAndVisibilityBy(textView4, charSequence);
-                ImageView imageView = this.binding.l;
-                m.checkNotNullExpressionValue(imageView, "binding.itemInviteOnlineDot");
+                ImageView imageView = this.binding.i.b;
+                m.checkNotNullExpressionValue(imageView, "binding.itemInviteMember…ainer.itemInviteOnlineDot");
                 imageView.setVisibility(8);
-                TextView textView5 = this.binding.o;
-                m.checkNotNullExpressionValue(textView5, "binding.itemInviteTotalMemberText");
+                TextView textView5 = this.binding.i.e;
+                m.checkNotNullExpressionValue(textView5, "binding.itemInviteMember…itemInviteTotalMemberText");
                 ViewExtensions.setTextAndVisibilityBy(textView5, null);
-                ImageView imageView2 = this.binding.n;
-                m.checkNotNullExpressionValue(imageView2, "binding.itemInviteTotalMemberDot");
+                ImageView imageView2 = this.binding.i.d;
+                m.checkNotNullExpressionValue(imageView2, "binding.itemInviteMember….itemInviteTotalMemberDot");
                 imageView2.setVisibility(8);
                 MaterialButton materialButton = this.binding.j;
                 m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
-                c.a.l.b.n(materialButton, areEqual ? 2131887913 : 2131891141, new Object[0], null, 4);
+                c.a.l.b.m(materialButton, areEqual ? 2131887912 : 2131891212, new Object[0], null, 4);
                 MaterialButton materialButton2 = this.binding.j;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton");
                 if (areEqual) {
@@ -630,29 +648,33 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         }
         if (areEqual) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.g(context, 2131890484, new Object[0], null, 4);
+            charSequence = c.a.l.b.g(context, 2131890550, new Object[0], null, 4);
         } else {
             charSequence = null;
         }
-        LinearLayout linearLayout = this.binding.i;
-        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer");
+        x2 x2Var = this.binding.i;
+        m.checkNotNullExpressionValue(x2Var, "binding.itemInviteMemberContainer");
+        LinearLayout linearLayout = x2Var.a;
+        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer.root");
         linearLayout.setVisibility(0);
-        this.binding.i.setBackgroundResource(0);
-        TextView textView4 = this.binding.m;
-        m.checkNotNullExpressionValue(textView4, "binding.itemInviteOnlineText");
+        x2 x2Var2 = this.binding.i;
+        m.checkNotNullExpressionValue(x2Var2, "binding.itemInviteMemberContainer");
+        x2Var2.a.setBackgroundResource(0);
+        TextView textView4 = this.binding.i.f178c;
+        m.checkNotNullExpressionValue(textView4, "binding.itemInviteMember…iner.itemInviteOnlineText");
         ViewExtensions.setTextAndVisibilityBy(textView4, charSequence);
-        ImageView imageView = this.binding.l;
-        m.checkNotNullExpressionValue(imageView, "binding.itemInviteOnlineDot");
+        ImageView imageView = this.binding.i.b;
+        m.checkNotNullExpressionValue(imageView, "binding.itemInviteMember…ainer.itemInviteOnlineDot");
         imageView.setVisibility(8);
-        TextView textView5 = this.binding.o;
-        m.checkNotNullExpressionValue(textView5, "binding.itemInviteTotalMemberText");
+        TextView textView5 = this.binding.i.e;
+        m.checkNotNullExpressionValue(textView5, "binding.itemInviteMember…itemInviteTotalMemberText");
         ViewExtensions.setTextAndVisibilityBy(textView5, null);
-        ImageView imageView2 = this.binding.n;
-        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteTotalMemberDot");
+        ImageView imageView2 = this.binding.i.d;
+        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteMember….itemInviteTotalMemberDot");
         imageView2.setVisibility(8);
         MaterialButton materialButton = this.binding.j;
         m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
-        c.a.l.b.n(materialButton, areEqual ? 2131887913 : 2131891141, new Object[0], null, 4);
+        c.a.l.b.m(materialButton, areEqual ? 2131887912 : 2131891212, new Object[0], null, 4);
         MaterialButton materialButton2 = this.binding.j;
         m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton");
         if (areEqual) {
@@ -676,33 +698,35 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         View view = this.itemView;
         m.checkNotNullExpressionValue(view, "itemView");
         Context context = view.getContext();
-        this.binding.f1735c.setText(2131890378);
+        this.binding.f1735c.setText(2131890444);
         TextView textView = this.binding.k;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteName");
         textView.setText((CharSequence) null);
         this.binding.k.setTextColor(ColorCompat.getThemedColor(context, 2130969870));
-        this.binding.k.setBackgroundResource(2131231107);
-        this.binding.d.setImageResource(2131231107);
+        this.binding.k.setBackgroundResource(2131231112);
+        this.binding.d.setImageResource(2131231112);
         TextView textView2 = this.binding.e;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteImageText");
         textView2.setVisibility(8);
         TextView textView3 = this.binding.b;
         m.checkNotNullExpressionValue(textView3, "binding.itemInviteChannelName");
         textView3.setVisibility(8);
-        LinearLayout linearLayout = this.binding.i;
-        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer");
+        x2 x2Var = this.binding.i;
+        m.checkNotNullExpressionValue(x2Var, "binding.itemInviteMemberContainer");
+        LinearLayout linearLayout = x2Var.a;
+        m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer.root");
         linearLayout.setVisibility(8);
-        TextView textView4 = this.binding.m;
-        m.checkNotNullExpressionValue(textView4, "binding.itemInviteOnlineText");
+        TextView textView4 = this.binding.i.f178c;
+        m.checkNotNullExpressionValue(textView4, "binding.itemInviteMember…iner.itemInviteOnlineText");
         textView4.setVisibility(8);
-        ImageView imageView = this.binding.l;
-        m.checkNotNullExpressionValue(imageView, "binding.itemInviteOnlineDot");
+        ImageView imageView = this.binding.i.b;
+        m.checkNotNullExpressionValue(imageView, "binding.itemInviteMember…ainer.itemInviteOnlineDot");
         imageView.setVisibility(8);
-        TextView textView5 = this.binding.o;
-        m.checkNotNullExpressionValue(textView5, "binding.itemInviteTotalMemberText");
+        TextView textView5 = this.binding.i.e;
+        m.checkNotNullExpressionValue(textView5, "binding.itemInviteMember…itemInviteTotalMemberText");
         textView5.setVisibility(8);
-        ImageView imageView2 = this.binding.n;
-        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteTotalMemberDot");
+        ImageView imageView2 = this.binding.i.d;
+        m.checkNotNullExpressionValue(imageView2, "binding.itemInviteMember….itemInviteTotalMemberDot");
         imageView2.setVisibility(8);
         MaterialButton materialButton = this.binding.j;
         m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton");
@@ -746,33 +770,33 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         Guild guild2 = component1.getGuild();
         boolean z4 = (guild2 != null ? guild2.r() : 0) < 200;
         Channel channel = component1.getChannel();
-        boolean p1 = channel != null ? AnimatableValueParser.p1(channel) : false;
+        boolean q1 = channel != null ? AnimatableValueParser.q1(channel) : false;
         TextView textView = this.binding.f1735c;
         m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader");
         String str2 = null;
-        if (p1 && z3) {
+        if (q1 && z3) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.g(context, 2131890499, new Object[0], null, 4);
+            charSequence = c.a.l.b.g(context, 2131890566, new Object[0], null, 4);
         } else if (z3) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.g(context, 2131890498, new Object[0], null, 4);
-        } else if (p1 && !z3) {
+            charSequence = c.a.l.b.g(context, 2131890565, new Object[0], null, 4);
+        } else if (q1 && !z3) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.g(context, 2131890493, new Object[0], null, 4);
+            charSequence = c.a.l.b.g(context, 2131890559, new Object[0], null, 4);
         } else if (!z4 || component1.getInviter() == null) {
             m.checkNotNullExpressionValue(context, "context");
-            charSequence = c.a.l.b.g(context, 2131890492, new Object[0], null, 4);
+            charSequence = c.a.l.b.g(context, 2131890558, new Object[0], null, 4);
         } else {
             m.checkNotNullExpressionValue(context, "context");
             Object[] objArr = new Object[1];
             com.discord.api.user.User inviter = component1.getInviter();
             objArr[0] = inviter != null ? inviter.r() : null;
-            charSequence = c.a.l.b.g(context, 2131890382, objArr, null, 4);
+            charSequence = c.a.l.b.g(context, 2131890448, objArr, null, 4);
         }
         textView.setText(charSequence);
         TextView textView2 = this.binding.k;
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteName");
-        if (p1) {
+        if (q1) {
             if (component5 == null || (str = AnimatableValueParser.A0(component5, context, false, 2)) == null) {
                 Channel channel2 = component1.getChannel();
                 if (channel2 != null) {
@@ -782,7 +806,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
             textView2.setText(str);
             this.binding.k.setTextColor(ColorCompat.getThemedColor(context, 2130969870));
             this.binding.k.setBackgroundResource(0);
-            if (p1) {
+            if (q1) {
                 updateIconUrlIfChanged(IconUtils.getForChannel$default(component1.getChannel(), null, 2, null));
                 TextView textView3 = this.binding.e;
                 m.checkNotNullExpressionValue(textView3, "binding.itemInviteImageText");
@@ -810,12 +834,12 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
                 str2 = GuildUtilsKt.computeShortName(u);
                 ViewExtensions.setTextAndVisibilityBy(textView4, str2);
             }
-            if (component5 == null && AnimatableValueParser.k1(component5)) {
+            if (component5 == null && AnimatableValueParser.l1(component5)) {
                 configureForVocalChannel(component5, context);
             } else {
-                configureForTextChannel(p1, context, component1);
+                configureForTextChannel(q1, context, component1);
             }
-            if (p1) {
+            if (q1) {
                 component4 = component5 != null;
             }
             View view2 = this.binding.h;
@@ -842,12 +866,12 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
             textView2.setText(str);
             this.binding.k.setTextColor(ColorCompat.getThemedColor(context, 2130969870));
             this.binding.k.setBackgroundResource(0);
-            if (p1) {
+            if (q1) {
             }
             if (component5 == null) {
             }
-            configureForTextChannel(p1, context, component1);
-            if (p1) {
+            configureForTextChannel(q1, context, component1);
+            if (q1) {
             }
             View view2 = this.binding.h;
             m.checkNotNullExpressionValue(view2, "binding.itemInviteLoadingButton");
@@ -870,12 +894,12 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter
         textView2.setText(str);
         this.binding.k.setTextColor(ColorCompat.getThemedColor(context, 2130969870));
         this.binding.k.setBackgroundResource(0);
-        if (p1) {
+        if (q1) {
         }
         if (component5 == null) {
         }
-        configureForTextChannel(p1, context, component1);
-        if (p1) {
+        configureForTextChannel(q1, context, component1);
+        if (q1) {
         }
         View view2 = this.binding.h;
         m.checkNotNullExpressionValue(view2, "binding.itemInviteLoadingButton");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$2.java
index 7b87966da5..c88fe20ef7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$2.java
@@ -18,6 +18,6 @@ public final class WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        StoreStream.Companion.getVoiceChannelSelected().selectVoiceChannel(this.$invite.getChannel().g());
+        StoreStream.Companion.getVoiceChannelSelected().selectVoiceChannel(this.$invite.getChannel().h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java
index 797f52cfdd..7523cb1b71 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java
@@ -45,8 +45,8 @@ public abstract class WidgetChatListAdapterItemInviteBase extends WidgetChatList
         }
         Channel channel = modelInvite.getChannel();
         m.checkNotNullExpressionValue(channel, "invite.channel");
-        if (AnimatableValueParser.z1(channel)) {
-            AnimatableValueParser.o2(((WidgetChatListAdapter) this.adapter).getAppPermissionsRequests(), null, new WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$2(modelInvite), 1, null);
+        if (AnimatableValueParser.B1(channel)) {
+            AnimatableValueParser.q2(((WidgetChatListAdapter) this.adapter).getAppPermissionsRequests(), null, new WidgetChatListAdapterItemInviteBase$selectGuildThroughInvite$2(modelInvite), 1, null);
         }
     }
 
@@ -72,8 +72,8 @@ public abstract class WidgetChatListAdapterItemInviteBase extends WidgetChatList
                 if (guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.HUB)) {
                     z4 = false;
                 }
-                if (!z4 && !GrowthTeamFeatures.INSTANCE.isDiscordUEnabled()) {
-                    o.g(context, 2131888154, 0, null, 12);
+                if (!z4 && !GrowthTeamFeatures.INSTANCE.isDiscordHubEnabled()) {
+                    o.g(context, 2131888153, 0, null, 12);
                     return;
                 } else if (!z3) {
                     ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), modelInvite.getChannel(), null, null, 6, null);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
index 26c6f95e16..c607edf10e 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java
@@ -17,20 +17,20 @@ public final class WidgetChatListAdapterItemMentionFooter extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemMentionFooter(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558941, widgetChatListAdapter);
+        super(2131558944, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362578;
-        View findViewById = view.findViewById(2131362578);
+        int i = 2131362591;
+        View findViewById = view.findViewById(2131362591);
         if (findViewById != null) {
-            i = 2131362579;
-            ImageView imageView = (ImageView) view.findViewById(2131362579);
+            i = 2131362592;
+            ImageView imageView = (ImageView) view.findViewById(2131362592);
             if (imageView != null) {
-                i = 2131362580;
-                TextView textView = (TextView) view.findViewById(2131362580);
+                i = 2131362593;
+                TextView textView = (TextView) view.findViewById(2131362593);
                 if (textView != null) {
-                    i = 2131365284;
-                    View findViewById2 = view.findViewById(2131365284);
+                    i = 2131365339;
+                    View findViewById2 = view.findViewById(2131365339);
                     if (findViewById2 != null) {
                         WidgetChatListAdapterItemMentionFooterBinding widgetChatListAdapterItemMentionFooterBinding = new WidgetChatListAdapterItemMentionFooterBinding((LinearLayout) view, findViewById, imageView, textView, findViewById2);
                         m.checkNotNullExpressionValue(widgetChatListAdapterItemMentionFooterBinding, "WidgetChatListAdapterIte…terBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java
index 32738ac1ba..4ee4f6532b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 /* compiled from: WidgetChatListAdapterItemMessage.kt */
 public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$1 implements View.OnClickListener {
     public final /* synthetic */ Message $message;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java
index 03d6d941d8..61a4c0e36c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java
@@ -3,13 +3,12 @@ package com.discord.widgets.chat.list.adapter;
 import android.text.style.StyleSpan;
 import android.view.View;
 import com.discord.api.interaction.Interaction;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.i18n.Hook;
 import com.discord.i18n.RenderContext;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.spans.ClickableSpan;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import d0.z.d.m;
@@ -54,15 +53,14 @@ public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$co
                 Long a = this.this$0.this$0.$interaction.a();
                 if (a != null) {
                     long longValue = a.longValue();
-                    MessageUtils messageUtils = MessageUtils.INSTANCE;
-                    if (!messageUtils.isLocalApplicationCommand(this.this$0.this$0.$message) || messageUtils.isFailed(this.this$0.this$0.$message)) {
+                    if (!this.this$0.this$0.$message.isLocalApplicationCommand() || this.this$0.this$0.$message.isFailed()) {
                         WidgetChatListAdapter.EventHandler eventHandler = WidgetChatListAdapterItemMessage.access$getAdapter$p(this.this$0.this$0.this$0).getEventHandler();
-                        long i = this.this$0.this$0.$message.i();
-                        long r = this.this$0.this$0.$message.r();
-                        long i2 = this.this$0.this$0.$interactionUser.i();
-                        User g = this.this$0.this$0.$message.g();
-                        m.checkNotNull(g);
-                        eventHandler.onCommandClicked(longValue, valueOf, i, r, i2, g.i(), this.this$0.this$0.$message.B());
+                        long channelId = this.this$0.this$0.$message.getChannelId();
+                        long id2 = this.this$0.this$0.$message.getId();
+                        long i = this.this$0.this$0.$interactionUser.i();
+                        User author = this.this$0.this$0.$message.getAuthor();
+                        m.checkNotNull(author);
+                        eventHandler.onCommandClicked(longValue, valueOf, channelId, id2, i, author.i(), this.this$0.this$0.$message.getNonce());
                     }
                 }
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java
index 4671c3da1f..50aa8abe74 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreStream;
 /* compiled from: WidgetChatListAdapterItemMessage.kt */
 public final class WidgetChatListAdapterItemMessage$configureReplyPreview$1 implements View.OnClickListener {
@@ -13,6 +13,6 @@ public final class WidgetChatListAdapterItemMessage$configureReplyPreview$1 impl
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        StoreStream.Companion.getMessagesLoader().jumpToMessage(this.$repliedMessage.i(), this.$repliedMessage.r());
+        StoreStream.Companion.getMessagesLoader().jumpToMessage(this.$repliedMessage.getChannelId(), this.$repliedMessage.getId());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java
index eb581ccc2c..ec2b2468ca 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java
@@ -1,6 +1,6 @@
 package com.discord.widgets.chat.list.adapter;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.textprocessing.node.SpoilerNode;
 import d0.z.d.m;
@@ -29,7 +29,7 @@ public final class WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1 ext
 
     public final void invoke(SpoilerNode<?> spoilerNode) {
         m.checkNotNullParameter(spoilerNode, "spoilerNode");
-        StoreStream.Companion.getMessageState().revealSpoiler(this.$message.r(), spoilerNode.getId());
+        StoreStream.Companion.getMessageState().revealSpoiler(this.$message.getId(), spoilerNode.getId());
         this.this$0.itemView.sendAccessibilityEvent(16);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java
index 7a19e18452..8f21e58eb2 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 /* compiled from: WidgetChatListAdapterItemMessage.kt */
 public final class WidgetChatListAdapterItemMessage$onConfigure$1 implements View.OnClickListener {
     public final /* synthetic */ Message $message;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java
index e11e62a1b3..d2ac4c9aa7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java
index ef2ac25bf3..696d7094a5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 /* compiled from: WidgetChatListAdapterItemMessage.kt */
 public final class WidgetChatListAdapterItemMessage$onConfigure$3 implements View.OnClickListener {
     public final /* synthetic */ boolean $isThreadStarterMessage;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java
index 0afe9e3700..983475f543 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java
index a9f48bd4ec..7e7a902d88 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 /* compiled from: WidgetChatListAdapterItemMessage.kt */
 public final class WidgetChatListAdapterItemMessage$onConfigure$5 implements View.OnClickListener {
     public final /* synthetic */ Message $message;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java
index b733b4744c..038ed073d3 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java
index 561108f81a..dc36b87daa 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java
@@ -19,10 +19,10 @@ import c.a.l.b;
 import c.d.b.a.a;
 import com.discord.api.interaction.Interaction;
 import com.discord.api.message.LocalAttachment;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.stores.StoreMessageReplies;
 import com.discord.stores.StoreMessageState;
@@ -57,27 +57,27 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     public static final Companion Companion = new Companion(null);
     private static final int MAX_REPLY_AST_NODES = 50;
-    private final View backgroundHighlight = this.itemView.findViewById(2131362519);
-    private final FailedUploadList failedUploadList = ((FailedUploadList) this.itemView.findViewById(2131362516));
-    private final View gutterHighlight = this.itemView.findViewById(2131362517);
-    private final TextView itemAlertText = ((TextView) this.itemView.findViewById(2131362505));
-    private final ImageView itemAvatar = ((ImageView) this.itemView.findViewById(2131362530));
-    private final TextView itemLoadingText = ((TextView) this.itemView.findViewById(2131362540));
-    private final TextView itemName = ((TextView) this.itemView.findViewById(2131362541));
-    private final TextView itemTag = ((TextView) this.itemView.findViewById(2131362543));
+    private final View backgroundHighlight = this.itemView.findViewById(2131362532);
+    private final FailedUploadList failedUploadList = ((FailedUploadList) this.itemView.findViewById(2131362529));
+    private final View gutterHighlight = this.itemView.findViewById(2131362530);
+    private final TextView itemAlertText = ((TextView) this.itemView.findViewById(2131362518));
+    private final ImageView itemAvatar = ((ImageView) this.itemView.findViewById(2131362543));
+    private final TextView itemLoadingText = ((TextView) this.itemView.findViewById(2131362553));
+    private final TextView itemName = ((TextView) this.itemView.findViewById(2131362554));
+    private final TextView itemTag = ((TextView) this.itemView.findViewById(2131362556));
     private final SimpleDraweeSpanTextView itemText;
-    private final TextView itemTimestamp = ((TextView) this.itemView.findViewById(2131362544));
-    private final TypingDots loadingDots = ((TypingDots) this.itemView.findViewById(2131362596));
-    private final ImageView replyAvatar = ((ImageView) this.itemView.findViewById(2131362533));
-    private final View replyHolder = this.itemView.findViewById(2131362532);
-    private final ImageView replyIcon = ((ImageView) this.itemView.findViewById(2131362534));
-    private final View replyLeadingViewsHolder = this.itemView.findViewById(2131362522);
-    private final View replyLinkItem = this.itemView.findViewById(2131362535);
-    private final TextView replyName = ((TextView) this.itemView.findViewById(2131362536));
-    private final SimpleDraweeSpanTextView replyText = ((SimpleDraweeSpanTextView) this.itemView.findViewById(2131362542));
-    private final ImageView sendError = ((ImageView) this.itemView.findViewById(2131362538));
-    private final ImageView threadEmbedSpine = ((ImageView) this.itemView.findViewById(2131362545));
-    private final View threadStarterMessageHeader = this.itemView.findViewById(2131365273);
+    private final TextView itemTimestamp = ((TextView) this.itemView.findViewById(2131362557));
+    private final TypingDots loadingDots = ((TypingDots) this.itemView.findViewById(2131362609));
+    private final ImageView replyAvatar = ((ImageView) this.itemView.findViewById(2131362546));
+    private final View replyHolder = this.itemView.findViewById(2131362545);
+    private final ImageView replyIcon = ((ImageView) this.itemView.findViewById(2131362547));
+    private final View replyLeadingViewsHolder = this.itemView.findViewById(2131362535);
+    private final View replyLinkItem = this.itemView.findViewById(2131362548);
+    private final TextView replyName = ((TextView) this.itemView.findViewById(2131362549));
+    private final SimpleDraweeSpanTextView replyText = ((SimpleDraweeSpanTextView) this.itemView.findViewById(2131362555));
+    private final ImageView sendError = ((ImageView) this.itemView.findViewById(2131362551));
+    private final ImageView threadEmbedSpine = ((ImageView) this.itemView.findViewById(2131362558));
+    private final View threadStarterMessageHeader = this.itemView.findViewById(2131365328);
 
     /* compiled from: WidgetChatListAdapterItemMessage.kt */
     public static final class Companion {
@@ -93,7 +93,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     public WidgetChatListAdapterItemMessage(@LayoutRes int i, WidgetChatListAdapter widgetChatListAdapter) {
         super(i, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
-        View findViewById = this.itemView.findViewById(2131362529);
+        View findViewById = this.itemView.findViewById(2131362542);
         m.checkNotNullExpressionValue(findViewById, "itemView.findViewById(R.…t_list_adapter_item_text)");
         this.itemText = (SimpleDraweeSpanTextView) findViewById;
     }
@@ -110,10 +110,10 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         return widgetChatListAdapterItemMessage.replyText;
     }
 
-    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x00ae: APUT  
+    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x00ac: APUT  
       (r3v4 java.lang.Object[])
       (0 ??[int, short, byte, char])
-      (wrap: java.lang.String : 0x00aa: INVOKE  (r10v14 java.lang.String) = (r10v13 java.util.Map<java.lang.Long, java.lang.String>), (r0v4 java.lang.Long) type: INTERFACE call: java.util.Map.get(java.lang.Object):java.lang.Object)
+      (wrap: java.lang.String : 0x00a8: INVOKE  (r10v14 java.lang.String) = (r10v13 java.util.Map<java.lang.Long, java.lang.String>), (r0v4 java.lang.Long) type: INTERFACE call: java.util.Map.get(java.lang.Object):java.lang.Object)
      */
     private final TextView configureInteractionMessage(MessageEntry messageEntry) {
         int i;
@@ -151,8 +151,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         if (textView2 != null) {
             ViewKt.setVisible(textView2, true);
         }
-        MessageUtils messageUtils = MessageUtils.INSTANCE;
-        if (messageUtils.isFailed(message)) {
+        if (message.isFailed()) {
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
             i = ColorCompat.getThemedColor(view, 2130968930);
@@ -165,22 +164,22 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         if (textView3 != null) {
             textView3.setTextColor(i);
         }
-        if (messageUtils.isLocalApplicationCommand(message) && messageUtils.isLoading(message)) {
+        if (message.isLocalApplicationCommand() && message.isLoading()) {
             TextView textView4 = this.itemLoadingText;
             if (textView4 != null) {
                 Context context = this.itemText.getContext();
                 m.checkNotNullExpressionValue(context, "itemText.context");
                 Object[] objArr = new Object[1];
                 Map<Long, String> nickOrUsernames = messageEntry.getNickOrUsernames();
-                User g = message.g();
-                objArr[0] = nickOrUsernames.get(g != null ? Long.valueOf(g.i()) : null);
+                User author = message.getAuthor();
+                objArr[0] = nickOrUsernames.get(author != null ? Long.valueOf(author.i()) : null);
                 textView4.setText(b.g(context, 2131886389, objArr, null, 4));
             }
             ImageView imageView2 = this.sendError;
             if (imageView2 != null) {
                 ViewKt.setVisible(imageView2, false);
             }
-        } else if (messageUtils.isLocalApplicationCommand(message) && messageUtils.isFailed(message)) {
+        } else if (message.isLocalApplicationCommand() && message.isFailed()) {
             TextView textView5 = this.itemLoadingText;
             if (textView5 != null) {
                 textView5.setText(2131886379);
@@ -197,7 +196,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
             if (typingDots5 != null) {
                 typingDots5.b();
             }
-        } else if (messageUtils.isLocalApplicationCommand(message)) {
+        } else if (message.isLocalApplicationCommand()) {
             TextView textView6 = this.itemLoadingText;
             if (textView6 != null) {
                 textView6.setText(2131886380);
@@ -213,13 +212,13 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
 
     private final void configureItemTag(Message message) {
         if (this.itemTag != null) {
-            User g = message.g();
-            m.checkNotNull(g);
-            CoreUser coreUser = new CoreUser(g);
-            boolean isPublicGuildSystemMessage = PublicGuildUtils.isPublicGuildSystemMessage(message);
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            CoreUser coreUser = new CoreUser(author);
+            boolean isPublicGuildSystemMessage = PublicGuildUtils.INSTANCE.isPublicGuildSystemMessage(message);
             this.itemTag.setVisibility(coreUser.isBot() || coreUser.isSystemUser() || isPublicGuildSystemMessage ? 0 : 8);
-            this.itemTag.setText((coreUser.isSystemUser() || isPublicGuildSystemMessage) ? 2131893725 : 2131887051);
-            this.itemTag.setCompoundDrawablesWithIntrinsicBounds(UserUtils.INSTANCE.isVerifiedBot(coreUser) ? 2131232035 : 0, 0, 0, 0);
+            this.itemTag.setText((coreUser.isSystemUser() || isPublicGuildSystemMessage) ? 2131893822 : 2131887051);
+            this.itemTag.setCompoundDrawablesWithIntrinsicBounds(UserUtils.INSTANCE.isVerifiedBot(coreUser) ? 2131232043 : 0, 0, 0, 0);
         }
     }
 
@@ -230,9 +229,9 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
             str = user.getUsername();
         }
         boolean z2 = false;
-        List<User> z3 = messageEntry.getMessage().z();
-        if (z3 != null) {
-            for (User user2 : z3) {
+        List<User> mentions = messageEntry.getMessage().getMentions();
+        if (mentions != null) {
+            for (User user2 : mentions) {
                 if (user2.i() == user.getId()) {
                     z2 = true;
                 }
@@ -268,8 +267,8 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     private final void configureReplyInteraction(MessageEntry messageEntry) {
         User c2;
         Message message = messageEntry.getMessage();
-        Interaction t = message.t();
-        if (t != null && (c2 = t.c()) != null) {
+        Interaction interaction = message.getInteraction();
+        if (interaction != null && (c2 = interaction.c()) != null) {
             GuildMember interactionAuthor = messageEntry.getInteractionAuthor();
             CoreUser coreUser = new CoreUser(c2);
             configureReplyAvatar(new CoreUser(c2), messageEntry.getAuthor());
@@ -288,7 +287,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                 }
             }
             SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.replyText;
-            CharSequence c3 = simpleDraweeSpanTextView2 != null ? b.c(simpleDraweeSpanTextView2, 2131893729, new Object[]{t.b()}, new WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(this, t, message, c2)) : null;
+            CharSequence c3 = simpleDraweeSpanTextView2 != null ? b.c(simpleDraweeSpanTextView2, 2131893826, new Object[]{interaction.b()}, new WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(this, interaction, message, c2)) : null;
             if (c3 != null) {
                 SpannableString valueOf = SpannableString.valueOf(c3);
                 m.checkExpressionValueIsNotNull(valueOf, "SpannableString.valueOf(this)");
@@ -321,13 +320,12 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     }
 
     private final void configureReplyPreview(MessageEntry messageEntry) {
-        Integer M;
+        Integer type;
         if (this.replyHolder != null && this.replyLinkItem != null) {
             Message message = messageEntry.getMessage();
             MessageEntry.ReplyData replyData = messageEntry.getReplyData();
-            MessageUtils messageUtils = MessageUtils.INSTANCE;
-            boolean isInteraction = messageUtils.isInteraction(message);
-            if (isInteraction || !(replyData == null || (M = messageEntry.getMessage().M()) == null || M.intValue() != 19)) {
+            boolean isInteraction = message.isInteraction();
+            if (isInteraction || !(replyData == null || (type = messageEntry.getMessage().getType()) == null || type.intValue() != 19)) {
                 this.replyHolder.setVisibility(0);
                 this.replyLinkItem.setVisibility(0);
                 if (isInteraction) {
@@ -336,28 +334,28 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                     MessageEntry messageEntry2 = replyData.getMessageEntry();
                     StoreMessageReplies.MessageState messageState = replyData.getMessageState();
                     if (replyData.isRepliedUserBlocked()) {
-                        configureReplySystemMessage(2131892587);
+                        configureReplySystemMessage(2131892668);
                     } else if (messageState instanceof StoreMessageReplies.MessageState.Unloaded) {
-                        configureReplySystemMessage(2131892589);
+                        configureReplySystemMessage(2131892670);
                     } else if (messageState instanceof StoreMessageReplies.MessageState.Deleted) {
-                        configureReplySystemMessage(2131892588);
+                        configureReplySystemMessage(2131892669);
                     } else if ((messageState instanceof StoreMessageReplies.MessageState.Loaded) && messageEntry2 != null) {
                         Message message2 = messageEntry2.getMessage();
                         this.replyHolder.setOnClickListener(new WidgetChatListAdapterItemMessage$configureReplyPreview$1(message2));
-                        Integer M2 = message2.M();
-                        if (M2 != null && M2.intValue() == 7) {
+                        Integer type2 = message2.getType();
+                        if (type2 != null && type2.intValue() == 7) {
                             configureReplySystemMessageUserJoin(message2);
                             return;
                         }
-                        User g = message2.g();
-                        m.checkNotNull(g);
-                        configureReplyAuthor(new CoreUser(g), messageEntry2.getAuthor(), messageEntry2);
+                        User author = message2.getAuthor();
+                        m.checkNotNull(author);
+                        configureReplyAuthor(new CoreUser(author), messageEntry2.getAuthor(), messageEntry2);
                         if (this.replyText != null && this.replyLeadingViewsHolder != null) {
-                            String k = message2.k();
-                            if (k == null) {
-                                k = "";
+                            String content = message2.getContent();
+                            if (content == null) {
+                                content = "";
                             }
-                            if (!(k.length() == 0)) {
+                            if (!(content.length() == 0)) {
                                 Context context = this.replyText.getContext();
                                 EmbeddedMessageParser embeddedMessageParser = EmbeddedMessageParser.INSTANCE;
                                 m.checkNotNullExpressionValue(context, "context");
@@ -365,10 +363,10 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                                 parse.setSpan(getLeadingEdgeSpan(), 0, parse.length(), 33);
                                 this.replyText.setDraweeSpanStringBuilder(parse);
                                 configureReplyLayoutDirection();
-                            } else if (messageUtils.hasStickers(message2)) {
-                                configureReplyContentWithResourceId(2131892593);
-                            } else if (messageUtils.hasAttachments(message2) || messageUtils.hasEmbeds(message2)) {
-                                configureReplyContentWithResourceId(2131892591);
+                            } else if (message2.hasStickers()) {
+                                configureReplyContentWithResourceId(2131892674);
+                            } else if (message2.hasAttachments() || message2.hasEmbeds()) {
+                                configureReplyContentWithResourceId(2131892672);
                             }
                         }
                     }
@@ -391,14 +389,14 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         if (imageView != null && this.replyAvatar != null && this.replyText != null) {
             imageView.setVisibility(8);
             this.replyAvatar.setVisibility(0);
-            this.replyAvatar.setImageResource(2131231658);
+            this.replyAvatar.setImageResource(2131231664);
             configureReplyName("", 0, false);
             Context context = this.replyText.getContext();
             m.checkNotNullExpressionValue(context, "context");
-            int systemMessageUserJoin = MessageUtils.INSTANCE.getSystemMessageUserJoin(context, message.r());
-            User g = message.g();
-            m.checkNotNull(g);
-            configureReplyText(new SpannableString(b.g(context, systemMessageUserJoin, new Object[]{g.r()}, null, 4).toString()), 0.64f);
+            int systemMessageUserJoin = MessageUtils.INSTANCE.getSystemMessageUserJoin(context, message.getId());
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            configureReplyText(new SpannableString(b.g(context, systemMessageUserJoin, new Object[]{author.r()}, null, 4).toString()), 0.64f);
         }
     }
 
@@ -421,7 +419,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     private final void configureThreadSpine(Message message, boolean z2) {
         ImageView imageView = this.threadEmbedSpine;
         if (imageView != null) {
-            ViewKt.setVisible(imageView, MessageUtils.INSTANCE.hasThread(message) && !z2);
+            ViewKt.setVisible(imageView, message.hasThread() && !z2);
         }
     }
 
@@ -445,7 +443,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
 
     private final MessagePreprocessor getMessagePreprocessor(long j, Message message, StoreMessageState.State state) {
         StoreUserSettings userSettings = StoreStream.Companion.getUserSettings();
-        return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : message.m(), true, (Integer) null);
+        return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : message.getEmbeds(), true, (Integer) null);
     }
 
     private final MessageRenderContext getMessageRenderContext(Context context, MessageEntry messageEntry, Function1<? super SpoilerNode<?>, Unit> function1) {
@@ -463,17 +461,16 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         String str;
         Context context = simpleDraweeSpanTextView.getContext();
         Message message = messageEntry.getMessage();
-        MessageUtils messageUtils = MessageUtils.INSTANCE;
-        boolean isWebhook = messageUtils.isWebhook(message);
-        UtcDateTime l = message.l();
+        boolean isWebhook = message.isWebhook();
+        UtcDateTime editedTimestamp = message.getEditedTimestamp();
         boolean z2 = true;
         int i = 0;
-        boolean z3 = (l != null ? l.f() : 0) > 0;
-        if (messageUtils.isSourceDeleted(message)) {
+        boolean z3 = (editedTimestamp != null ? editedTimestamp.f() : 0) > 0;
+        if (message.isSourceDeleted()) {
             m.checkNotNullExpressionValue(context, "context");
-            str = context.getResources().getString(2131893294);
+            str = context.getResources().getString(2131893377);
         } else {
-            str = message.k();
+            str = message.getContent();
             if (str == null) {
                 str = "";
             }
@@ -482,7 +479,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         MessagePreprocessor messagePreprocessor = getMessagePreprocessor(((WidgetChatListAdapter) this.adapter).getData().getUserId(), message, messageEntry.getMessageState());
         m.checkNotNullExpressionValue(context, "context");
         DraweeSpanStringBuilder parseChannelMessage = DiscordParser.parseChannelMessage(context, str, getMessageRenderContext(context, messageEntry, getSpoilerClickHandler(message)), messagePreprocessor, isWebhook ? DiscordParser.ParserOptions.ALLOW_MASKED_LINKS : DiscordParser.ParserOptions.DEFAULT, z3);
-        simpleDraweeSpanTextView.setAutoLinkMask((messagePreprocessor.isLinkifyConflicting() || !shouldLinkify(message.k())) ? 0 : 6);
+        simpleDraweeSpanTextView.setAutoLinkMask((messagePreprocessor.isLinkifyConflicting() || !shouldLinkify(message.getContent())) ? 0 : 6);
         if (parseChannelMessage.length() <= 0) {
             z2 = false;
         }
@@ -491,8 +488,8 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
         }
         simpleDraweeSpanTextView.setVisibility(i);
         simpleDraweeSpanTextView.setDraweeSpanStringBuilder(parseChannelMessage);
-        Integer M = messageEntry.getMessage().M();
-        simpleDraweeSpanTextView.setAlpha((M != null && M.intValue() == -1) ? 0.5f : 1.0f);
+        Integer type = messageEntry.getMessage().getType();
+        simpleDraweeSpanTextView.setAlpha((type != null && type.intValue() == -1) ? 0.5f : 1.0f);
     }
 
     private final boolean shouldLinkify(String str) {
@@ -513,8 +510,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
     }
 
     private final boolean shouldShowInteractionMessage(Message message) {
-        MessageUtils messageUtils = MessageUtils.INSTANCE;
-        return messageUtils.isLocalApplicationCommand(message) || messageUtils.isLoading(message);
+        return message.isLocalApplicationCommand() || message.isLoading();
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem
@@ -536,8 +532,8 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
             TextView textView2 = this.itemName;
             if (textView2 != null) {
                 Map<Long, String> nickOrUsernames = messageEntry.getNickOrUsernames();
-                User g = message.g();
-                textView2.setText(nickOrUsernames.get(g != null ? Long.valueOf(g.i()) : null));
+                User author = message.getAuthor();
+                textView2.setText(nickOrUsernames.get(author != null ? Long.valueOf(author.i()) : null));
                 this.itemName.setTextColor(getAuthorTextColor(messageEntry.getAuthor()));
                 this.itemName.setOnClickListener(new WidgetChatListAdapterItemMessage$onConfigure$1(this, message));
                 ViewExtensions.setOnLongClickListenerConsumeClick(this.itemName, new WidgetChatListAdapterItemMessage$onConfigure$2(this, message));
@@ -545,9 +541,9 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
             TextView textView3 = this.itemTimestamp;
             if (textView3 != null) {
                 Context T = a.T(this.itemView, "itemView", "itemView.context");
-                UtcDateTime K = message.K();
-                if (K != null) {
-                    j = K.f();
+                UtcDateTime timestamp = message.getTimestamp();
+                if (timestamp != null) {
+                    j = timestamp.f();
                 }
                 textView3.setText(TimeUtils.toReadableTimeString$default(T, j, null, 4, null));
             }
@@ -571,28 +567,28 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem {
                 imageView.setOnClickListener(new WidgetChatListAdapterItemMessage$onConfigure$5(this, message));
                 ViewExtensions.setOnLongClickListenerConsumeClick(this.itemAvatar, new WidgetChatListAdapterItemMessage$onConfigure$6(this, message));
                 ImageView imageView2 = this.itemAvatar;
-                User g2 = message.g();
-                m.checkNotNull(g2);
-                IconUtils.setIcon$default(imageView2, new CoreUser(g2), 2131165285, null, null, messageEntry.getAuthor(), 24, null);
+                User author2 = message.getAuthor();
+                m.checkNotNull(author2);
+                IconUtils.setIcon$default(imageView2, new CoreUser(author2), 2131165285, null, null, messageEntry.getAuthor(), 24, null);
             }
             boolean z2 = true;
             if (this.failedUploadList != null) {
-                List<LocalAttachment> v = message.v();
-                if (!MessageUtils.INSTANCE.isFailed(message) || v == null || !(!v.isEmpty())) {
+                List<LocalAttachment> localAttachments = message.getLocalAttachments();
+                if (!message.isFailed() || localAttachments == null || !(!localAttachments.isEmpty())) {
                     this.failedUploadList.setVisibility(8);
                 } else {
                     this.failedUploadList.setVisibility(0);
-                    this.failedUploadList.setUp(v);
+                    this.failedUploadList.setUp(localAttachments);
                 }
             }
             if (this.itemAlertText != null) {
-                if (MessageUtils.INSTANCE.isFailed(message)) {
+                if (message.isFailed()) {
                     this.itemAlertText.setVisibility(0);
-                    Integer M = message.M();
-                    if (M == null || M.intValue() != -3) {
+                    Integer type = message.getType();
+                    if (type == null || type.intValue() != -3) {
                         z2 = false;
                     }
-                    this.itemAlertText.setText(z2 ? 2131890466 : 2131893159);
+                    this.itemAlertText.setText(z2 ? 2131890532 : 2131893242);
                 } else {
                     this.itemAlertText.setVisibility(8);
                 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
index d84a157caf..5dfcb0b674 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java
@@ -14,20 +14,20 @@ public final class WidgetChatListAdapterItemMessageHeader extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemMessageHeader(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558942, widgetChatListAdapter);
+        super(2131558945, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362580;
-        TextView textView = (TextView) view.findViewById(2131362580);
+        int i = 2131362593;
+        TextView textView = (TextView) view.findViewById(2131362593);
         if (textView != null) {
-            i = 2131362581;
-            View findViewById = view.findViewById(2131362581);
+            i = 2131362594;
+            View findViewById = view.findViewById(2131362594);
             if (findViewById != null) {
-                i = 2131362582;
-                TextView textView2 = (TextView) view.findViewById(2131362582);
+                i = 2131362595;
+                TextView textView2 = (TextView) view.findViewById(2131362595);
                 if (textView2 != null) {
-                    i = 2131362583;
-                    Space space = (Space) view.findViewById(2131362583);
+                    i = 2131362596;
+                    Space space = (Space) view.findViewById(2131362596);
                     if (space != null) {
                         WidgetChatListAdapterItemMessageHeaderBinding widgetChatListAdapterItemMessageHeaderBinding = new WidgetChatListAdapterItemMessageHeaderBinding((RelativeLayout) view, textView, findViewById, textView2, space);
                         m.checkNotNullExpressionValue(widgetChatListAdapterItemMessageHeaderBinding, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
index 7dc2bd156a..fd23b55c81 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java
@@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemNewMessages(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558960, widgetChatListAdapter);
+        super(2131558963, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         WidgetChatListAdapterItemTextDividerBinding a = WidgetChatListAdapterItemTextDividerBinding.a(this.itemView);
         m.checkNotNullExpressionValue(a, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
@@ -38,7 +38,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt
         m.checkNotNullExpressionValue(textView2, "binding.dividerText");
         View view6 = this.itemView;
         m.checkNotNullExpressionValue(view6, "itemView");
-        String string = view6.getContext().getString(2131891343);
+        String string = view6.getContext().getString(2131891414);
         m.checkNotNullExpressionValue(string, "itemView.context.getStri…ing.new_messages_divider)");
         TextView textView3 = a.d;
         m.checkNotNullExpressionValue(textView3, "binding.dividerText");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
index 25fbf5a422..a266c65a60 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java
@@ -20,17 +20,17 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemPrivateChannelStart(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558944, widgetChatListAdapter);
+        super(2131558947, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362521;
-        TextView textView = (TextView) view.findViewById(2131362521);
+        int i = 2131362534;
+        TextView textView = (TextView) view.findViewById(2131362534);
         if (textView != null) {
-            i = 2131364350;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364350);
+            i = 2131364386;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364386);
             if (simpleDraweeView != null) {
-                i = 2131364351;
-                TextView textView2 = (TextView) view.findViewById(2131364351);
+                i = 2131364387;
+                TextView textView2 = (TextView) view.findViewById(2131364387);
                 if (textView2 != null) {
                     WidgetChatListAdapterItemPrivateChannelStartBinding widgetChatListAdapterItemPrivateChannelStartBinding = new WidgetChatListAdapterItemPrivateChannelStartBinding((LinearLayout) view, textView, simpleDraweeView, textView2);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemPrivateChannelStartBinding, "WidgetChatListAdapterIte…artBinding.bind(itemView)");
@@ -59,7 +59,7 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
         if (!(!t.isBlank(component2))) {
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.chatListAdapterI…PrivateChannelStartHeader");
-            component2 = textView.getContext().getString(2131894069);
+            component2 = textView.getContext().getString(2131894170);
             m.checkNotNullExpressionValue(component2, "binding.chatListAdapterI…tString(R.string.unnamed)");
         }
         TextView textView2 = this.binding.b;
@@ -75,11 +75,11 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh
             IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon.jpg", 2131165298, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
         if (component5) {
-            this.binding.d.setText(2131893724);
+            this.binding.d.setText(2131893821);
             return;
         }
         TextView textView3 = this.binding.d;
         m.checkNotNullExpressionValue(textView3, "binding.privateChannelStartText");
-        b.n(textView3, getStartResId(component3), new Object[]{component2}, null, 4);
+        b.m(textView3, getStartResId(component3), new Object[]{component2}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
index ee20f151e7..03b97099ab 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java
@@ -7,9 +7,9 @@ import android.widget.ImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import c.a.i.b1;
 import c.a.z.z;
-import com.discord.api.message.Message;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.databinding.WidgetChatListAdapterItemReactionsBinding;
+import com.discord.models.message.Message;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.entries.ReactionsEntry;
@@ -37,24 +37,24 @@ public final class WidgetChatListAdapterItemReactions extends WidgetChatListItem
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemReactions(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558945, widgetChatListAdapter);
+        super(2131558948, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362517;
-        View findViewById = view.findViewById(2131362517);
+        int i = 2131362530;
+        View findViewById = view.findViewById(2131362530);
         if (findViewById != null) {
-            i = 2131362519;
-            View findViewById2 = view.findViewById(2131362519);
+            i = 2131362532;
+            View findViewById2 = view.findViewById(2131362532);
             if (findViewById2 != null) {
-                i = 2131362584;
-                FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131362584);
+                i = 2131362597;
+                FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131362597);
                 if (flexboxLayout != null) {
                     ConstraintLayout constraintLayout = (ConstraintLayout) view;
                     WidgetChatListAdapterItemReactionsBinding widgetChatListAdapterItemReactionsBinding = new WidgetChatListAdapterItemReactionsBinding(constraintLayout, findViewById, findViewById2, flexboxLayout);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemReactionsBinding, "WidgetChatListAdapterIte…onsBinding.bind(itemView)");
                     this.binding = widgetChatListAdapterItemReactionsBinding;
                     m.checkNotNullExpressionValue(constraintLayout, "binding.root");
-                    View inflate = LayoutInflater.from(constraintLayout.getContext()).inflate(2131558646, (ViewGroup) null, false);
+                    View inflate = LayoutInflater.from(constraintLayout.getContext()).inflate(2131558644, (ViewGroup) null, false);
                     Objects.requireNonNull(inflate, "rootView");
                     ImageView imageView = (ImageView) inflate;
                     m.checkNotNullExpressionValue(new b1(imageView, imageView), "ReactionQuickAddBinding.…ot.context), null, false)");
@@ -119,7 +119,7 @@ public final class WidgetChatListAdapterItemReactions extends WidgetChatListItem
         View view2 = this.binding.b;
         m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg");
         configureCellHighlight(message, view, view2);
-        displayReactions(reactionsEntry.getMessage().F().values(), reactionsEntry.getMessage().r(), reactionsEntry.getCanAddReactions(), reactionsEntry.getCanCreateReactions(), reactionsEntry.getAnimateEmojis());
+        displayReactions(reactionsEntry.getMessage().getReactionsMap().values(), reactionsEntry.getMessage().getId(), reactionsEntry.getCanAddReactions(), reactionsEntry.getCanCreateReactions(), reactionsEntry.getAnimateEmojis());
     }
 
     private final void removeQuickAddReactionView() {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java
index fa9eb86da2..47c527e1e9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java
@@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemSearchResultCount extends WidgetChat
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSearchResultCount(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558946, widgetChatListAdapter);
+        super(2131558949, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
         Objects.requireNonNull(view, "rootView");
@@ -41,6 +41,6 @@ public final class WidgetChatListAdapterItemSearchResultCount extends WidgetChat
         m.checkNotNullExpressionValue(textView3, "binding.resultCount");
         Context context = textView3.getContext();
         m.checkNotNullExpressionValue(context, "binding.resultCount.context");
-        textView.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755340, totalResults, Integer.valueOf(totalResults)));
+        textView.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755341, totalResults, Integer.valueOf(totalResults)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
index 4811e0366e..e03f11583a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java
@@ -112,9 +112,9 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable i = Observable.i(companion.getPresences().observePresenceForUser(spotifyListenTogetherEntry.getUserId()), companion.getGameParty().observeUsersForPartyId(spotifyListenTogetherEntry.getActivity().a()), companion.getUsers().observeMeId(), new WidgetChatListAdapterItemSpotifyListenTogether$Model$Companion$get$1(spotifyListenTogetherEntry));
                 m.checkNotNullExpressionValue(i, "Observable\n             …m.userId)\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(i).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n             …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(i).r();
+                m.checkNotNullExpressionValue(r, "Observable\n             …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -229,33 +229,33 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSpotifyListenTogether(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558952, widgetChatListAdapter);
+        super(2131558955, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362092;
-        Barrier barrier = (Barrier) view.findViewById(2131362092);
+        int i = 2131362097;
+        Barrier barrier = (Barrier) view.findViewById(2131362097);
         if (barrier != null) {
-            i = 2131363700;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363700);
+            i = 2131363741;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363741);
             if (simpleDraweeView != null) {
-                i = 2131363701;
-                TextView textView = (TextView) view.findViewById(2131363701);
+                i = 2131363742;
+                TextView textView = (TextView) view.findViewById(2131363742);
                 if (textView != null) {
                     ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                    i = 2131363703;
-                    TextView textView2 = (TextView) view.findViewById(2131363703);
+                    i = 2131363744;
+                    TextView textView2 = (TextView) view.findViewById(2131363744);
                     if (textView2 != null) {
-                        i = 2131363704;
-                        TextView textView3 = (TextView) view.findViewById(2131363704);
+                        i = 2131363745;
+                        TextView textView3 = (TextView) view.findViewById(2131363745);
                         if (textView3 != null) {
-                            i = 2131363705;
-                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363705);
+                            i = 2131363746;
+                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363746);
                             if (recyclerView != null) {
-                                i = 2131363706;
-                                TextView textView4 = (TextView) view.findViewById(2131363706);
+                                i = 2131363747;
+                                TextView textView4 = (TextView) view.findViewById(2131363747);
                                 if (textView4 != null) {
-                                    i = 2131363707;
-                                    TextView textView5 = (TextView) view.findViewById(2131363707);
+                                    i = 2131363748;
+                                    TextView textView5 = (TextView) view.findViewById(2131363748);
                                     if (textView5 != null) {
                                         WidgetChatListAdapterItemSpotifyListenTogetherBinding widgetChatListAdapterItemSpotifyListenTogetherBinding = new WidgetChatListAdapterItemSpotifyListenTogetherBinding(constraintLayout, barrier, simpleDraweeView, textView, constraintLayout, textView2, textView3, recyclerView, textView4, textView5);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemSpotifyListenTogetherBinding, "WidgetChatListAdapterIte…herBinding.bind(itemView)");
@@ -303,7 +303,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
         Context context2 = textView3.getContext();
         m.checkNotNullExpressionValue(context2, "binding.itemListenTogetherHeader.context");
         String str = null;
-        textView.setText(b.g(context, 2131890515, new Object[]{getActivityName(context2, model.getItem())}, null, 4));
+        textView.setText(b.g(context, 2131890583, new Object[]{getActivityName(context2, model.getItem())}, null, 4));
         boolean isDeadInvite = isDeadInvite(model.getPresence(), model.getItem());
         Presence presence = model.getPresence();
         Activity spotifyListeningActivity = presence != null ? PresenceUtils.INSTANCE.getSpotifyListeningActivity(presence) : null;
@@ -338,7 +338,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
             m.checkNotNullExpressionValue(textView8, "binding.itemListenTogetherArtist");
             Object[] objArr = new Object[1];
             objArr[0] = spotifyListeningActivity != null ? spotifyListeningActivity.l() : null;
-            b.n(textView8, 2131894199, objArr, null, 4);
+            b.m(textView8, 2131894300, objArr, null, 4);
             ActivityAssets b = spotifyListeningActivity != null ? spotifyListeningActivity.b() : null;
             if (!(b == null || (a = b.a()) == null)) {
                 SimpleDraweeView simpleDraweeView2 = this.binding.b;
@@ -362,7 +362,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget
         if (w.contains((CharSequence) a, (CharSequence) platform.getPlatformId(), true)) {
             return platform.getProperName();
         }
-        String string = context.getString(2131888639);
+        String string = context.getString(2131888640);
         m.checkNotNullExpressionValue(string, "context.getString(R.stri….form_label_desktop_only)");
         return string;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$Model$Companion$observe$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$Model$Companion$observe$1.java
index 5f25d7a254..7153694d44 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$Model$Companion$observe$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$Model$Companion$observe$1.java
@@ -55,18 +55,18 @@ public final class WidgetChatListAdapterItemStageInvite$Model$Companion$observe$
         long id2 = this.$userStore.getMe().getId();
         User user = this.$userStore.getUsers().get(Long.valueOf(this.$item.getUserId()));
         Channel channel2 = this.$item.getInvite().getChannel();
-        if (channel2 == null || (channel = this.$channelStore.getChannel(channel2.g())) == null) {
+        if (channel2 == null || (channel = this.$channelStore.getChannel(channel2.h())) == null) {
             channel = this.$item.getInvite().getChannel();
         }
         boolean isReducedMotionEnabled = this.$accessibilityStore.isReducedMotionEnabled();
-        StageInstance stageInstanceForChannel = this.$stageInstanceStore.getStageInstanceForChannel(channel.g());
+        StageInstance stageInstanceForChannel = this.$stageInstanceStore.getStageInstanceForChannel(channel.h());
         if (stageInstanceForChannel == null) {
-            stageInstanceForChannel = this.$requestedInstanceStore.getStageInstanceForChannel(channel.g());
+            stageInstanceForChannel = this.$requestedInstanceStore.getStageInstanceForChannel(channel.h());
         }
-        Map<Long, StageRoles> channelRoles = this.$stageChannelStore.getChannelRoles(channel.g());
+        Map<Long, StageRoles> channelRoles = this.$stageChannelStore.getChannelRoles(channel.h());
         StoreRequestedStageChannels.StageInstanceState stageInstanceState = (StoreRequestedStageChannels.StageInstanceState) a.d(channel, this.$requestedInstanceStore.getRequestedInstanceStatesByChannel());
         WidgetChatListAdapterItemStageInvite.Model.Companion companion = WidgetChatListAdapterItemStageInvite.Model.Companion;
-        List access$speakersFromLocalStore = WidgetChatListAdapterItemStageInvite.Model.Companion.access$speakersFromLocalStore(companion, this.$guildStore, this.$userStore, this.$stageChannelStore, channel.g(), this.$item.getGuildId());
+        List access$speakersFromLocalStore = WidgetChatListAdapterItemStageInvite.Model.Companion.access$speakersFromLocalStore(companion, this.$guildStore, this.$userStore, this.$stageChannelStore, channel.h(), this.$item.getGuildId());
         if (access$speakersFromLocalStore == null) {
             access$speakersFromLocalStore = WidgetChatListAdapterItemStageInvite.Model.Companion.access$speakersFromRequest(companion, stageInstanceState);
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java
index 3975143a5c..6834558a01 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite$configureUI$2.java
@@ -98,12 +98,12 @@ public final class WidgetChatListAdapterItemStageInvite$configureUI$2 implements
             m.checkNotNullExpressionValue(context3, "context");
             FragmentManager fragmentManager = WidgetChatListAdapterItemStageInvite.access$getAdapter$p(this.this$0.this$0).getFragmentManager();
             Guild guild = this.this$0.$model.getInvite().getGuild();
-            long e = (guild == null || (boxLong = b.boxLong(guild.o())) == null) ? this.this$0.$model.getChannel().e() : boxLong.longValue();
-            long g = this.this$0.$model.getChannel().g();
+            long f = (guild == null || (boxLong = b.boxLong(guild.o())) == null) ? this.this$0.$model.getChannel().f() : boxLong.longValue();
+            long h = this.this$0.$model.getChannel().h();
             this.L$0 = modelInvite2;
             this.label = 2;
             str = "context";
-            if (StageChannelJoinHelper.lurkAndJoinStageAsync$default(stageChannelJoinHelper, context3, fragmentManager, e, g, true, null, null, null, this, 224, null) == coroutine_suspended) {
+            if (StageChannelJoinHelper.lurkAndJoinStageAsync$default(stageChannelJoinHelper, context3, fragmentManager, f, h, true, null, null, null, this, 224, null) == coroutine_suspended) {
                 return coroutine_suspended;
             }
             modelInvite = modelInvite2;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
index 1d95b1358b..82e80ccd63 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java
@@ -305,33 +305,33 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStageInvite(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558953, widgetChatListAdapter);
+        super(2131558956, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131363685;
-        TextView textView = (TextView) view.findViewById(2131363685);
+        int i = 2131363726;
+        TextView textView = (TextView) view.findViewById(2131363726);
         if (textView != null) {
-            i = 2131363686;
-            TextView textView2 = (TextView) view.findViewById(2131363686);
+            i = 2131363727;
+            TextView textView2 = (TextView) view.findViewById(2131363727);
             if (textView2 != null) {
-                i = 2131363687;
-                TextView textView3 = (TextView) view.findViewById(2131363687);
+                i = 2131363728;
+                TextView textView3 = (TextView) view.findViewById(2131363728);
                 if (textView3 != null) {
-                    i = 2131363688;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363688);
+                    i = 2131363729;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363729);
                     if (simpleDraweeView != null) {
-                        i = 2131363689;
-                        TextView textView4 = (TextView) view.findViewById(2131363689);
+                        i = 2131363730;
+                        TextView textView4 = (TextView) view.findViewById(2131363730);
                         if (textView4 != null) {
-                            i = 2131363690;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363690);
+                            i = 2131363731;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363731);
                             if (materialButton != null) {
                                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                                i = 2131363708;
-                                TextView textView5 = (TextView) view.findViewById(2131363708);
+                                i = 2131363749;
+                                TextView textView5 = (TextView) view.findViewById(2131363749);
                                 if (textView5 != null) {
-                                    i = 2131365007;
-                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) view.findViewById(2131365007);
+                                    i = 2131365057;
+                                    DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) view.findViewById(2131365057);
                                     if (discoveryStageCardSpeakersView != null) {
                                         WidgetChatListAdapterItemStageInviteBinding widgetChatListAdapterItemStageInviteBinding = new WidgetChatListAdapterItemStageInviteBinding(constraintLayout, textView, textView2, textView3, simpleDraweeView, textView4, materialButton, constraintLayout, textView5, discoveryStageCardSpeakersView);
                                         m.checkNotNullExpressionValue(widgetChatListAdapterItemStageInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)");
@@ -400,17 +400,17 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
         m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName");
         Guild guild5 = model.getInvite().getGuild();
         if (guild5 == null || (str = guild5.u()) == null) {
-            str = model.getChannel().l();
+            str = model.getChannel().m();
         }
         textView2.setText(str);
         TextView textView3 = this.binding.b;
         m.checkNotNullExpressionValue(textView3, "binding.itemInviteChannelTopic");
         StageInstance stageInstance = model.getStageInstance();
         if (stageInstance == null || (str2 = stageInstance.f()) == null) {
-            str2 = model.getChannel().y();
+            str2 = model.getChannel().z();
         }
         if (str2 == null) {
-            str2 = model.getChannel().l();
+            str2 = model.getChannel().m();
         }
         ViewExtensions.setTextAndVisibilityBy(textView3, str2);
         TextView textView4 = this.binding.g;
@@ -454,8 +454,8 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd
         if (stageInviteEntry2 == null) {
             m.throwUninitializedPropertyAccessException("item");
         }
-        Observable G = ObservableExtensionsKt.ui(Model.Companion.observe$default(companion, stageInviteEntry2, null, null, null, null, null, null, null, null, 510, null)).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        ObservableExtensionsKt.appSubscribe$default(G, WidgetChatListAdapterItemStageInvite.class, (Context) null, new WidgetChatListAdapterItemStageInvite$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemStageInvite$onConfigure$1(this), 58, (Object) null);
+        Observable F = ObservableExtensionsKt.ui(Model.Companion.observe$default(companion, stageInviteEntry2, null, null, null, null, null, null, null, null, 510, null)).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetChatListAdapterItemStageInvite.class, (Context) null, new WidgetChatListAdapterItemStageInvite$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemStageInvite$onConfigure$1(this), 58, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$3.java
index 64180d9870..8d14ffb06c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart$configureThread$3.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.widgets.channels.WidgetTextChannelSettings;
+import com.discord.widgets.channels.WidgetThreadSettings;
 /* compiled from: WidgetChatListAdapterItemStart.kt */
 public final class WidgetChatListAdapterItemStart$configureThread$3 implements View.OnClickListener {
     public final /* synthetic */ long $channelId;
@@ -14,6 +14,6 @@ public final class WidgetChatListAdapterItemStart$configureThread$3 implements V
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetTextChannelSettings.Companion.launch(this.$channelId, WidgetChatListAdapterItemStart.access$getAdapter$p(this.this$0).getContext());
+        WidgetThreadSettings.Companion.launch(this.$channelId, WidgetChatListAdapterItemStart.access$getAdapter$p(this.this$0).getContext());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
index def1bab2c4..9f691e910c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java
@@ -19,23 +19,23 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStart(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558954, widgetChatListAdapter);
+        super(2131558957, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362514;
-        TextView textView = (TextView) view.findViewById(2131362514);
+        int i = 2131362527;
+        TextView textView = (TextView) view.findViewById(2131362527);
         if (textView != null) {
-            i = 2131362518;
-            TextView textView2 = (TextView) view.findViewById(2131362518);
+            i = 2131362531;
+            TextView textView2 = (TextView) view.findViewById(2131362531);
             if (textView2 != null) {
-                i = 2131362527;
-                TextView textView3 = (TextView) view.findViewById(2131362527);
+                i = 2131362540;
+                TextView textView3 = (TextView) view.findViewById(2131362540);
                 if (textView3 != null) {
-                    i = 2131362528;
-                    TextView textView4 = (TextView) view.findViewById(2131362528);
+                    i = 2131362541;
+                    TextView textView4 = (TextView) view.findViewById(2131362541);
                     if (textView4 != null) {
-                        i = 2131362548;
-                        ImageView imageView = (ImageView) view.findViewById(2131362548);
+                        i = 2131362561;
+                        ImageView imageView = (ImageView) view.findViewById(2131362561);
                         if (imageView != null) {
                             WidgetChatListAdapterItemStartBinding widgetChatListAdapterItemStartBinding = new WidgetChatListAdapterItemStartBinding((LinearLayout) view, textView, textView2, textView3, textView4, imageView);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemStartBinding, "WidgetChatListAdapterIte…artBinding.bind(itemView)");
@@ -61,7 +61,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
         TextView textView = this.binding.f1742c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader");
         int i = 0;
-        b.n(textView, 2131886351, new Object[]{str}, null, 4);
+        b.m(textView, 2131886351, new Object[]{str}, null, 4);
         TextView textView2 = this.binding.d;
         m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemSubheader1");
         textView2.setVisibility(8);
@@ -71,16 +71,16 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
         if (z2) {
             TextView textView3 = this.binding.e;
             m.checkNotNullExpressionValue(textView3, "binding.chatListAdapterItemSubheader2");
-            b.n(textView3, 2131886350, new Object[]{str}, null, 4);
+            b.m(textView3, 2131886350, new Object[]{str}, null, 4);
         } else {
             TextView textView4 = this.binding.e;
             m.checkNotNullExpressionValue(textView4, "binding.chatListAdapterItemSubheader2");
-            b.n(textView4, 2131886833, new Object[]{str}, null, 4);
+            b.m(textView4, 2131886833, new Object[]{str}, null, 4);
         }
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemStart$configureChannel$1(this, j));
         TextView textView5 = this.binding.b;
         m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemEditChannel");
-        b.n(textView5, 2131888201, new Object[0], null, 4);
+        b.m(textView5, 2131888200, new Object[0], null, 4);
         TextView textView6 = this.binding.b;
         m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemEditChannel");
         if (!z3) {
@@ -108,23 +108,23 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem {
         m.checkNotNullExpressionValue(textView4, "binding.chatListAdapterItemSubheader1");
         Object[] objArr = new Object[1];
         objArr[0] = guildMember != null ? guildMember.getNick() : null;
-        b.m(textView4, 2131893889, objArr, new WidgetChatListAdapterItemStart$configureThread$1(this, guildMember, context));
+        b.l(textView4, 2131893989, objArr, new WidgetChatListAdapterItemStart$configureThread$1(this, guildMember, context));
         if (z2) {
             ThreadUtils threadUtils = ThreadUtils.INSTANCE;
             m.checkNotNullExpressionValue(context, "context");
             String autoArchiveDurationName = threadUtils.autoArchiveDurationName(context, num != null ? num.intValue() : 0);
             TextView textView5 = this.binding.e;
             m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemSubheader2");
-            b.m(textView5, 2131886841, new Object[]{autoArchiveDurationName}, new WidgetChatListAdapterItemStart$configureThread$2(autoArchiveDurationName, context));
+            b.l(textView5, 2131886841, new Object[]{autoArchiveDurationName}, new WidgetChatListAdapterItemStart$configureThread$2(autoArchiveDurationName, context));
         } else {
             TextView textView6 = this.binding.e;
             m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemSubheader2");
-            b.n(textView6, 2131886833, new Object[]{str}, null, 4);
+            b.m(textView6, 2131886833, new Object[]{str}, null, 4);
         }
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemStart$configureThread$3(this, j));
         TextView textView7 = this.binding.b;
         m.checkNotNullExpressionValue(textView7, "binding.chatListAdapterItemEditChannel");
-        b.n(textView7, 2131888212, new Object[0], null, 4);
+        b.m(textView7, 2131888212, new Object[0], null, 4);
         TextView textView8 = this.binding.b;
         m.checkNotNullExpressionValue(textView8, "binding.chatListAdapterItemEditChannel");
         if (!z3) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
index ec8304bdcc..f55408814a 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java
@@ -20,17 +20,17 @@ public final class WidgetChatListAdapterItemSticker extends WidgetChatListItem {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSticker(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558955, widgetChatListAdapter);
+        super(2131558958, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        StickerView stickerView = (StickerView) view.findViewById(2131362524);
+        StickerView stickerView = (StickerView) view.findViewById(2131362537);
         if (stickerView != null) {
             WidgetChatListAdapterItemStickerBinding widgetChatListAdapterItemStickerBinding = new WidgetChatListAdapterItemStickerBinding((FrameLayout) view, stickerView);
             m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerBinding, "WidgetChatListAdapterIte…kerBinding.bind(itemView)");
             this.binding = widgetChatListAdapterItemStickerBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362524)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362537)));
     }
 
     public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemSticker widgetChatListAdapterItemSticker) {
@@ -51,8 +51,8 @@ public final class WidgetChatListAdapterItemSticker extends WidgetChatListItem {
         m.checkNotNullParameter(chatListEntry, "data");
         super.onConfigure(i, chatListEntry);
         StickerEntry stickerEntry = (StickerEntry) chatListEntry;
-        Observable a02 = StickerUtils.getGuildOrStandardSticker$default(StickerUtils.INSTANCE, stickerEntry.getSticker().c(), false, 2, null).a0(1);
-        m.checkNotNullExpressionValue(a02, "StickerUtils.getGuildOrS…kerId())\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, WidgetChatListAdapterItemSticker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemSticker$onConfigure$1(this, stickerEntry, chatListEntry), 62, (Object) null);
+        Observable Z = StickerUtils.getGuildOrStandardSticker$default(StickerUtils.INSTANCE, stickerEntry.getSticker().c(), false, 2, null).Z(1);
+        m.checkNotNullExpressionValue(Z, "StickerUtils.getGuildOrS…kerId())\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, WidgetChatListAdapterItemSticker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemSticker$onConfigure$1(this, stickerEntry, chatListEntry), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
index cd414c23cd..ea01ca6606 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java
@@ -17,14 +17,14 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStickerGreet(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558956, widgetChatListAdapter);
+        super(2131558959, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362525;
-        StickerView stickerView = (StickerView) view.findViewById(2131362525);
+        int i = 2131362538;
+        StickerView stickerView = (StickerView) view.findViewById(2131362538);
         if (stickerView != null) {
-            i = 2131364583;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364583);
+            i = 2131364622;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364622);
             if (materialButton != null) {
                 WidgetChatListAdapterItemStickerGreetBinding widgetChatListAdapterItemStickerGreetBinding = new WidgetChatListAdapterItemStickerGreetBinding((LinearLayout) view, stickerView, materialButton);
                 m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerGreetBinding, "WidgetChatListAdapterIte…eetBinding.bind(itemView)");
@@ -57,6 +57,6 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI
         this.binding.f1743c.setOnClickListener(new WidgetChatListAdapterItemStickerGreet$onConfigure$1(this, component2, component4, component1));
         MaterialButton materialButton = this.binding.f1743c;
         m.checkNotNullExpressionValue(materialButton, "binding.sendStickerGreetButton");
-        b.n(materialButton, 2131894557, new Object[]{component3}, null, 4);
+        b.m(materialButton, 2131894677, new Object[]{component3}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
index 7bacbf79ac..2db6ff6e96 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java
@@ -18,17 +18,17 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemStickerGreetCompact(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558957, widgetChatListAdapter);
+        super(2131558960, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362525;
-        StickerView stickerView = (StickerView) view.findViewById(2131362525);
+        int i = 2131362538;
+        StickerView stickerView = (StickerView) view.findViewById(2131362538);
         if (stickerView != null) {
-            i = 2131362526;
-            TextView textView = (TextView) view.findViewById(2131362526);
+            i = 2131362539;
+            TextView textView = (TextView) view.findViewById(2131362539);
             if (textView != null) {
-                i = 2131364583;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364583);
+                i = 2131364622;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364622);
                 if (linearLayout != null) {
                     WidgetChatListAdapterItemStickerGreetCompactBinding widgetChatListAdapterItemStickerGreetCompactBinding = new WidgetChatListAdapterItemStickerGreetCompactBinding((ConstraintLayout) view, stickerView, textView, linearLayout);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerGreetCompactBinding, "WidgetChatListAdapterIte…actBinding.bind(itemView)");
@@ -62,6 +62,6 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh
         this.binding.d.setOnClickListener(new WidgetChatListAdapterItemStickerGreetCompact$onConfigure$1(this, component2, component4, component1));
         TextView textView = this.binding.f1744c;
         m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemStickerGreetText");
-        b.n(textView, 2131894557, new Object[]{component3}, null, 4);
+        b.m(textView, 2131894677, new Object[]{component3}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java
index 4da9a25b4a..dc869edd64 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java
@@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.adapter;
 
 import android.content.Context;
 import c.a.l.b;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
+import com.discord.models.message.Message;
 import com.discord.utilities.message.MessageUtils;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -34,19 +34,19 @@ public final class WidgetChatListAdapterItemSystemMessage$getSystemMessage$1 ext
 
     public final CharSequence invoke(Context context) {
         m.checkNotNullParameter(context, "$this$getString");
-        Integer M = this.$this_getSystemMessage.M();
-        if (M != null && M.intValue() == 1) {
-            return b.a(context, 2131893788, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
+        Integer type = this.$this_getSystemMessage.getType();
+        if (type != null && type.intValue() == 1) {
+            return b.a(context, 2131893885, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
         }
         Long l = null;
-        if (M == null || M.intValue() != 2) {
-            return (M != null && M.intValue() == 4) ? b.a(context, 2131893741, new Object[]{this.$authorName, this.$this_getSystemMessage.k()}, this.$usernameRenderContext) : (M != null && M.intValue() == 5) ? b.a(context, 2131893740, new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 6) ? b.a(context, 2131893784, new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 7) ? b.a(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(this.$context, this.$this_getSystemMessage.r()), new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 8) ? b.a(context, 2131893762, new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 9) ? b.a(context, 2131893763, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892154, new Object[0], null, 4)}, this.$usernameRenderContext) : (M != null && M.intValue() == 10) ? b.a(context, 2131893763, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892155, new Object[0], null, 4)}, this.$usernameRenderContext) : (M != null && M.intValue() == 11) ? b.a(context, 2131893763, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892156, new Object[0], null, 4)}, this.$usernameRenderContext) : (M != null && M.intValue() == 12) ? b.a(context, 2131893738, new Object[]{this.$authorName, this.$this_getSystemMessage.k()}, this.$usernameRenderContext) : (M != null && M.intValue() == 14) ? b.g(context, 2131893745, new Object[0], null, 4) : (M != null && M.intValue() == 15) ? b.g(context, 2131893748, new Object[0], null, 4) : (M != null && M.intValue() == 16) ? b.g(context, 2131893747, new Object[0], null, 4) : (M != null && M.intValue() == 17) ? b.g(context, 2131893746, new Object[0], null, 4) : (M != null && M.intValue() == 18) ? b.a(context, 2131893791, new Object[]{this.$authorName, this.$this_getSystemMessage.k()}, this.$actorRenderContext) : (M != null && M.intValue() == 23) ? b.g(context, 2131893890, new Object[0], null, 4) : b.g(context, 2131892589, new Object[0], null, 4);
+        if (type == null || type.intValue() != 2) {
+            return (type != null && type.intValue() == 4) ? b.a(context, 2131893838, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext) : (type != null && type.intValue() == 5) ? b.a(context, 2131893837, new Object[]{this.$authorName}, this.$usernameRenderContext) : (type != null && type.intValue() == 6) ? b.a(context, 2131893881, new Object[]{this.$authorName}, this.$usernameRenderContext) : (type != null && type.intValue() == 7) ? b.a(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(this.$context, this.$this_getSystemMessage.getId()), new Object[]{this.$authorName}, this.$usernameRenderContext) : (type != null && type.intValue() == 8) ? b.a(context, 2131893859, new Object[]{this.$authorName}, this.$usernameRenderContext) : (type != null && type.intValue() == 9) ? b.a(context, 2131893860, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892225, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 10) ? b.a(context, 2131893860, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892226, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 11) ? b.a(context, 2131893860, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892227, new Object[0], null, 4)}, this.$usernameRenderContext) : (type != null && type.intValue() == 12) ? b.a(context, 2131893835, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext) : (type != null && type.intValue() == 14) ? b.g(context, 2131893842, new Object[0], null, 4) : (type != null && type.intValue() == 15) ? b.g(context, 2131893845, new Object[0], null, 4) : (type != null && type.intValue() == 16) ? b.g(context, 2131893844, new Object[0], null, 4) : (type != null && type.intValue() == 17) ? b.g(context, 2131893843, new Object[0], null, 4) : (type != null && type.intValue() == 18) ? b.a(context, 2131893888, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$actorRenderContext) : (type != null && type.intValue() == 23) ? b.g(context, 2131893990, new Object[0], null, 4) : b.g(context, 2131892670, new Object[0], null, 4);
         }
         Long l2 = this.$firstMentionedUserId;
-        User g = this.$this_getSystemMessage.g();
-        if (g != null) {
-            l = Long.valueOf(g.i());
+        User author = this.$this_getSystemMessage.getAuthor();
+        if (author != null) {
+            l = Long.valueOf(author.i());
         }
-        return m.areEqual(l2, l) ? b.a(context, 2131893790, new Object[]{this.$authorName}, this.$usernameRenderContext) : b.a(context, 2131893789, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
+        return m.areEqual(l2, l) ? b.a(context, 2131893887, new Object[]{this.$authorName}, this.$usernameRenderContext) : b.a(context, 2131893886, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java
index ab0ae12c8c..4c067ef494 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java
@@ -1,8 +1,8 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
+import com.discord.models.message.Message;
 import com.discord.utilities.channel.ChannelSelector;
 /* compiled from: WidgetChatListAdapterItemSystemMessage.kt */
 public final class WidgetChatListAdapterItemSystemMessage$onConfigure$1 implements View.OnClickListener {
@@ -16,16 +16,16 @@ public final class WidgetChatListAdapterItemSystemMessage$onConfigure$1 implemen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        Integer M = this.$message.M();
-        if ((M != null && M.intValue() == 7) || ((M != null && M.intValue() == 8) || ((M != null && M.intValue() == 9) || ((M != null && M.intValue() == 10) || (M != null && M.intValue() == 11))))) {
+        Integer type = this.$message.getType();
+        if ((type != null && type.intValue() == 7) || ((type != null && type.intValue() == 8) || ((type != null && type.intValue() == 9) || ((type != null && type.intValue() == 10) || (type != null && type.intValue() == 11))))) {
             WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId());
-        } else if (M != null && M.intValue() == 12) {
+        } else if (type != null && type.intValue() == 12) {
             WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId());
-        } else if (M != null && M.intValue() == 6) {
+        } else if (type != null && type.intValue() == 6) {
             WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onOpenPinsClicked(this.$message);
-        } else if (M != null && M.intValue() == 18) {
-            MessageReference A = this.$message.A();
-            Long a = A != null ? A.a() : null;
+        } else if (type != null && type.intValue() == 18) {
+            MessageReference messageReference = this.$message.getMessageReference();
+            Long a = messageReference != null ? messageReference.a() : null;
             if (a != null) {
                 ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId(), a.longValue(), null, null, 12, null);
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java
index fe6371cd72..ee536cba8b 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter;
 import d0.z.d.m;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
index e0a3c9c35f..250fe2bfba 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java
@@ -6,12 +6,12 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.WidgetChatListAdapterItemSystemBinding;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.time.TimeUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -28,17 +28,17 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemSystemMessage(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558958, widgetChatListAdapter);
+        super(2131558961, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131365166;
-        ImageView imageView = (ImageView) view.findViewById(2131365166);
+        int i = 2131365221;
+        ImageView imageView = (ImageView) view.findViewById(2131365221);
         if (imageView != null) {
-            i = 2131365167;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365167);
+            i = 2131365222;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365222);
             if (linkifiedTextView != null) {
-                i = 2131365168;
-                TextView textView = (TextView) view.findViewById(2131365168);
+                i = 2131365223;
+                TextView textView = (TextView) view.findViewById(2131365223);
                 if (textView != null) {
                     WidgetChatListAdapterItemSystemBinding widgetChatListAdapterItemSystemBinding = new WidgetChatListAdapterItemSystemBinding((RelativeLayout) view, imageView, linkifiedTextView, textView);
                     m.checkNotNullExpressionValue(widgetChatListAdapterItemSystemBinding, "WidgetChatListAdapterIte…temBinding.bind(itemView)");
@@ -59,44 +59,44 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
     }
 
     private final int getIcon(Message message) {
-        Integer M = message.M();
-        if (M == null || M.intValue() != 1) {
-            if (M != null && M.intValue() == 2) {
-                return 2131231659;
+        Integer type = message.getType();
+        if (type == null || type.intValue() != 1) {
+            if (type != null && type.intValue() == 2) {
+                return 2131231665;
             }
-            if ((M != null && M.intValue() == 4) || (M != null && M.intValue() == 5)) {
-                return 2131231657;
+            if ((type != null && type.intValue() == 4) || (type != null && type.intValue() == 5)) {
+                return 2131231663;
             }
-            if (M != null && M.intValue() == 6) {
-                return 2131231476;
+            if (type != null && type.intValue() == 6) {
+                return 2131231482;
             }
-            if (M == null || M.intValue() != 7) {
-                if ((M != null && M.intValue() == 8) || ((M != null && M.intValue() == 9) || ((M != null && M.intValue() == 10) || (M != null && M.intValue() == 11)))) {
-                    return 2131232026;
+            if (type == null || type.intValue() != 7) {
+                if ((type != null && type.intValue() == 8) || ((type != null && type.intValue() == 9) || ((type != null && type.intValue() == 10) || (type != null && type.intValue() == 11)))) {
+                    return 2131232034;
                 }
-                if (M == null || M.intValue() != 12) {
-                    if (M == null || M.intValue() != 14) {
-                        if (M != null && M.intValue() == 15) {
-                            return 2131231504;
+                if (type == null || type.intValue() != 12) {
+                    if (type == null || type.intValue() != 14) {
+                        if (type != null && type.intValue() == 15) {
+                            return 2131231510;
                         }
-                        if (M != null && M.intValue() == 16) {
-                            return 2131232058;
+                        if (type != null && type.intValue() == 16) {
+                            return 2131232066;
                         }
-                        if (M != null && M.intValue() == 17) {
-                            return 2131232058;
+                        if (type != null && type.intValue() == 17) {
+                            return 2131232066;
                         }
-                        if (M != null && M.intValue() == 18) {
-                            return 2131231991;
+                        if (type != null && type.intValue() == 18) {
+                            return 2131231999;
                         }
-                        if (M != null) {
-                            M.intValue();
+                        if (type != null) {
+                            type.intValue();
                         }
                     }
-                    return 2131232059;
+                    return 2131232067;
                 }
             }
         }
-        return 2131231658;
+        return 2131231664;
     }
 
     private final CharSequence getSystemMessage(Message message, Context context, String str, int i, Long l, String str2, int i2, String str3) {
@@ -113,12 +113,12 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
         GuildMember component3 = messageEntry.component3();
         GuildMember component4 = messageEntry.component4();
         Map<Long, String> component6 = messageEntry.component6();
-        User g = component1.g();
-        String str = component6.get(g != null ? Long.valueOf(g.i()) : null);
+        User author = component1.getAuthor();
+        String str = component6.get(author != null ? Long.valueOf(author.i()) : null);
         Guild guild = ((WidgetChatListAdapter) this.adapter).getData().getGuild();
         String name = guild != null ? guild.getName() : null;
-        List<User> z2 = component1.z();
-        Long valueOf = (z2 == null || (user = (User) u.firstOrNull(z2)) == null) ? null : Long.valueOf(user.i());
+        List<User> mentions = component1.getMentions();
+        Long valueOf = (mentions == null || (user = (User) u.firstOrNull(mentions)) == null) ? null : Long.valueOf(user.i());
         String str2 = valueOf != null ? component6.get(Long.valueOf(valueOf.longValue())) : null;
         LinkifiedTextView linkifiedTextView = this.binding.f1745c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.systemText");
@@ -138,8 +138,8 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.systemTimestamp");
         Context T = a.T(this.itemView, "itemView", "itemView.context");
-        UtcDateTime K = component1.K();
-        textView.setText(TimeUtils.toReadableTimeString$default(T, K != null ? K.f() : 0, null, 4, null));
+        UtcDateTime timestamp = component1.getTimestamp();
+        textView.setText(TimeUtils.toReadableTimeString$default(T, timestamp != null ? timestamp.f() : 0, null, 4, null));
         LinkifiedTextView linkifiedTextView3 = this.binding.f1745c;
         m.checkNotNullExpressionValue(linkifiedTextView3, "binding.systemText");
         linkifiedTextView3.setText(systemMessage);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$$inlined$apply$lambda$1.java
index d0772bc556..2ce0a4f7b7 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$$inlined$apply$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$$inlined$apply$lambda$1.java
@@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$$inlined
 
     @Override // android.text.TextWatcher
     public void afterTextChanged(Editable editable) {
-        this.$storeThreadDraft$inlined.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(this.$draftState$inlined, false, 0, editable != null ? editable.toString() : null, false, 11, null));
+        this.$storeThreadDraft$inlined.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(this.$draftState$inlined, false, null, editable != null ? editable.toString() : null, false, 11, null));
     }
 
     @Override // android.text.TextWatcher
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java
index acc4c1a29e..99be9e3008 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$2.java
@@ -17,6 +17,6 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$2<T> imp
         StoreThreadDraft storeThreadDraft = this.$storeThreadDraft;
         StoreThreadDraft.ThreadDraftState threadDraftState = this.$draftState;
         m.checkNotNullExpressionValue(bool, "checked");
-        storeThreadDraft.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, bool.booleanValue(), 0, null, false, 14, null));
+        storeThreadDraft.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, bool.booleanValue(), null, null, false, 14, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$3.java
index 18d8ea75ba..26e3e02147 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$3.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.chat.list.adapter;
 
+import android.content.Context;
 import android.text.style.StyleSpan;
 import android.view.View;
 import com.discord.i18n.Hook;
@@ -9,6 +10,8 @@ import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.spans.ClickableSpan;
 import com.discord.utilities.threads.ThreadUtils;
 import com.discord.widgets.channels.threads.WidgetThreadDraftArchiveSheet;
+import com.discord.widgets.chat.list.entries.ChatListEntry;
+import com.discord.widgets.chat.list.entries.ThreadDraftFormEntry;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Locale;
@@ -17,6 +20,8 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetChatListAdapterItemThreadDraftForm.kt */
 public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$3 extends o implements Function1<RenderContext, Unit> {
+    public final /* synthetic */ ChatListEntry $data;
+    public final /* synthetic */ ThreadDraftFormEntry $draftData;
     public final /* synthetic */ StoreThreadDraft.ThreadDraftState $draftState;
     public final /* synthetic */ WidgetChatListAdapterItemThreadDraftForm this$0;
 
@@ -46,7 +51,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$3 extend
 
             public final void invoke(View view) {
                 m.checkNotNullParameter(view, "it");
-                WidgetThreadDraftArchiveSheet.Companion.show(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0.this$0.this$0).getFragmentManager());
+                WidgetThreadDraftArchiveSheet.Companion.show(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0.this$0.this$0).getFragmentManager(), this.this$0.this$0.$draftData.getGuildId());
             }
         }
 
@@ -66,7 +71,13 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$3 extend
 
         public final void invoke(Hook hook) {
             m.checkNotNullParameter(hook, "$receiver");
-            String autoArchiveDurationName = ThreadUtils.INSTANCE.autoArchiveDurationName(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0.this$0).getContext(), this.this$0.$draftState.getAutoArchiveDuration());
+            ThreadUtils threadUtils = ThreadUtils.INSTANCE;
+            Context context = WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0.this$0).getContext();
+            Integer autoArchiveDuration = this.this$0.$draftState.getAutoArchiveDuration();
+            if (autoArchiveDuration == null) {
+                autoArchiveDuration = ((ThreadDraftFormEntry) this.this$0.$data).getDefaultAutoArchiveDuration();
+            }
+            String autoArchiveDurationName = threadUtils.autoArchiveDurationName(context, autoArchiveDuration != null ? autoArchiveDuration.intValue() : 1440);
             Locale locale = Locale.getDefault();
             m.checkNotNullExpressionValue(locale, "Locale.getDefault()");
             Objects.requireNonNull(autoArchiveDurationName, "null cannot be cast to non-null type java.lang.String");
@@ -79,10 +90,12 @@ public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$3 extend
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(WidgetChatListAdapterItemThreadDraftForm widgetChatListAdapterItemThreadDraftForm, StoreThreadDraft.ThreadDraftState threadDraftState) {
+    public WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(WidgetChatListAdapterItemThreadDraftForm widgetChatListAdapterItemThreadDraftForm, StoreThreadDraft.ThreadDraftState threadDraftState, ChatListEntry chatListEntry, ThreadDraftFormEntry threadDraftFormEntry) {
         super(1);
         this.this$0 = widgetChatListAdapterItemThreadDraftForm;
         this.$draftState = threadDraftState;
+        this.$data = chatListEntry;
+        this.$draftData = threadDraftFormEntry;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$4.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$4.java
index 189f23a2e9..c28bb28d6d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$4.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm$onConfigure$4.java
@@ -2,16 +2,19 @@ package com.discord.widgets.chat.list.adapter;
 
 import android.view.View;
 import com.discord.widgets.channels.threads.WidgetThreadDraftArchiveSheet;
+import com.discord.widgets.chat.list.entries.ThreadDraftFormEntry;
 /* compiled from: WidgetChatListAdapterItemThreadDraftForm.kt */
 public final class WidgetChatListAdapterItemThreadDraftForm$onConfigure$4 implements View.OnClickListener {
+    public final /* synthetic */ ThreadDraftFormEntry $draftData;
     public final /* synthetic */ WidgetChatListAdapterItemThreadDraftForm this$0;
 
-    public WidgetChatListAdapterItemThreadDraftForm$onConfigure$4(WidgetChatListAdapterItemThreadDraftForm widgetChatListAdapterItemThreadDraftForm) {
+    public WidgetChatListAdapterItemThreadDraftForm$onConfigure$4(WidgetChatListAdapterItemThreadDraftForm widgetChatListAdapterItemThreadDraftForm, ThreadDraftFormEntry threadDraftFormEntry) {
         this.this$0 = widgetChatListAdapterItemThreadDraftForm;
+        this.$draftData = threadDraftFormEntry;
     }
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetThreadDraftArchiveSheet.Companion.show(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0).getFragmentManager());
+        WidgetThreadDraftArchiveSheet.Companion.show(WidgetChatListAdapterItemThreadDraftForm.access$getAdapter$p(this.this$0).getFragmentManager(), this.$draftData.getGuildId());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
index b7eae5ece8..56661e362d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java
@@ -25,24 +25,24 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemThreadDraftForm(WidgetChatListAdapter widgetChatListAdapter, AppFlexInputViewModel appFlexInputViewModel) {
-        super(2131558961, widgetChatListAdapter);
+        super(2131558964, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         this.flexInputViewModel = appFlexInputViewModel;
         View view = this.itemView;
-        int i = 2131362070;
-        TextView textView = (TextView) view.findViewById(2131362070);
+        int i = 2131362071;
+        TextView textView = (TextView) view.findViewById(2131362071);
         if (textView != null) {
-            i = 2131362940;
-            View findViewById = view.findViewById(2131362940);
+            i = 2131362965;
+            View findViewById = view.findViewById(2131362965);
             if (findViewById != null) {
-                i = 2131364352;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364352);
+                i = 2131364388;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364388);
                 if (checkedSetting != null) {
-                    i = 2131365261;
-                    ImageView imageView = (ImageView) view.findViewById(2131365261);
+                    i = 2131365316;
+                    ImageView imageView = (ImageView) view.findViewById(2131365316);
                     if (imageView != null) {
-                        i = 2131365265;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365265);
+                        i = 2131365320;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365320);
                         if (textInputLayout != null) {
                             WidgetChatListAdapterItemThreadDraftFormBinding widgetChatListAdapterItemThreadDraftFormBinding = new WidgetChatListAdapterItemThreadDraftFormBinding((LinearLayout) view, textView, findViewById, checkedSetting, imageView, textInputLayout);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemThreadDraftFormBinding, "WidgetChatListAdapterIte…ormBinding.bind(itemView)");
@@ -71,7 +71,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         StoreThreadDraft threadDraft = StoreStream.Companion.getThreadDraft();
         ThreadDraftFormEntry threadDraftFormEntry = (ThreadDraftFormEntry) chatListEntry;
         StoreThreadDraft.ThreadDraftState threadDraftState = threadDraftFormEntry.getThreadDraftState();
-        this.binding.d.setImageResource(threadDraftState.isPrivate() ? 2131231992 : 2131231991);
+        this.binding.d.setImageResource(threadDraftState.isPrivate() ? 2131232000 : 2131231999);
         TextInputLayout textInputLayout = this.binding.e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.threadNameInput");
         EditText editText = textInputLayout.getEditText();
@@ -109,7 +109,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         if (threadDraftFormEntry.getCanCreatePublicThread() || threadDraftState.isPrivate()) {
             this.binding.f1747c.setOnCheckedListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$2(threadDraft, threadDraftState));
         } else {
-            threadDraft.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, true, 0, null, false, 14, null));
+            threadDraft.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, true, null, null, false, 14, null));
             this.binding.f1747c.setOnCheckedListener(null);
         }
         CheckedSetting checkedSetting2 = this.binding.f1747c;
@@ -117,7 +117,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi
         checkedSetting2.setChecked(threadDraftState.isPrivate());
         TextView textView = this.binding.b;
         m.checkNotNullExpressionValue(textView, "binding.autoArchiveDuration");
-        b.m(textView, 2131887966, new Object[0], new WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(this, threadDraftState));
-        this.binding.b.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$4(this));
+        b.l(textView, 2131887965, new Object[0], new WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(this, threadDraftState, chatListEntry, threadDraftFormEntry));
+        this.binding.b.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$4(this, threadDraftFormEntry));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
index d6f6d68036..17938239d6 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java
@@ -12,19 +12,18 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.core.content.ContextCompat;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.api.user.User;
 import com.discord.databinding.WidgetChatListAdapterItemThreadEmbedBinding;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.stores.StoreMessageState;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.font.FontUtils;
 import com.discord.utilities.icon.IconUtils;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
 import com.discord.widgets.chat.list.ViewReplySpline;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -53,51 +52,51 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemThreadEmbed(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558962, widgetChatListAdapter);
+        super(2131558965, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362517;
-        View findViewById = view.findViewById(2131362517);
+        int i = 2131362530;
+        View findViewById = view.findViewById(2131362530);
         if (findViewById != null) {
-            i = 2131362519;
-            View findViewById2 = view.findViewById(2131362519);
+            i = 2131362532;
+            View findViewById2 = view.findViewById(2131362532);
             if (findViewById2 != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131365250;
-                ImageView imageView = (ImageView) view.findViewById(2131365250);
+                i = 2131365305;
+                ImageView imageView = (ImageView) view.findViewById(2131365305);
                 if (imageView != null) {
-                    i = 2131365251;
-                    View findViewById3 = view.findViewById(2131365251);
+                    i = 2131365306;
+                    View findViewById3 = view.findViewById(2131365306);
                     if (findViewById3 != null) {
-                        i = 2131365252;
-                        TextView textView = (TextView) view.findViewById(2131365252);
+                        i = 2131365307;
+                        TextView textView = (TextView) view.findViewById(2131365307);
                         if (textView != null) {
-                            i = 2131365253;
-                            ImageView imageView2 = (ImageView) view.findViewById(2131365253);
+                            i = 2131365308;
+                            ImageView imageView2 = (ImageView) view.findViewById(2131365308);
                             if (imageView2 != null) {
-                                i = 2131365254;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365254);
+                                i = 2131365309;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365309);
                                 if (simpleDraweeView != null) {
-                                    i = 2131365255;
-                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365255);
+                                    i = 2131365310;
+                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365310);
                                     if (simpleDraweeSpanTextView != null) {
-                                        i = 2131365256;
-                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131365256);
+                                        i = 2131365311;
+                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131365311);
                                         if (constraintLayout2 != null) {
-                                            i = 2131365257;
-                                            TextView textView2 = (TextView) view.findViewById(2131365257);
+                                            i = 2131365312;
+                                            TextView textView2 = (TextView) view.findViewById(2131365312);
                                             if (textView2 != null) {
-                                                i = 2131365258;
-                                                TextView textView3 = (TextView) view.findViewById(2131365258);
+                                                i = 2131365313;
+                                                TextView textView3 = (TextView) view.findViewById(2131365313);
                                                 if (textView3 != null) {
-                                                    i = 2131365259;
-                                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131365259);
+                                                    i = 2131365314;
+                                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131365314);
                                                     if (constraintLayout3 != null) {
-                                                        i = 2131365260;
-                                                        ViewReplySpline viewReplySpline = (ViewReplySpline) view.findViewById(2131365260);
+                                                        i = 2131365315;
+                                                        ViewReplySpline viewReplySpline = (ViewReplySpline) view.findViewById(2131365315);
                                                         if (viewReplySpline != null) {
-                                                            i = 2131365328;
-                                                            Guideline guideline = (Guideline) view.findViewById(2131365328);
+                                                            i = 2131365384;
+                                                            Guideline guideline = (Guideline) view.findViewById(2131365384);
                                                             if (guideline != null) {
                                                                 WidgetChatListAdapterItemThreadEmbedBinding widgetChatListAdapterItemThreadEmbedBinding = new WidgetChatListAdapterItemThreadEmbedBinding(constraintLayout, findViewById, findViewById2, constraintLayout, imageView, findViewById3, textView, imageView2, simpleDraweeView, simpleDraweeSpanTextView, constraintLayout2, textView2, textView3, constraintLayout3, viewReplySpline, guideline);
                                                                 m.checkNotNullExpressionValue(widgetChatListAdapterItemThreadEmbedBinding, "WidgetChatListAdapterIte…bedBinding.bind(itemView)");
@@ -144,43 +143,40 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
         ConstraintLayout constraintLayout2 = this.binding.j;
         m.checkNotNullExpressionValue(constraintLayout2, "binding.threadEmbedMostRecentMessageHeader");
         constraintLayout2.setVisibility(8);
-        ThreadMetadata x2 = threadEmbedEntry.getThread().x();
-        if (x2 != null && x2.b()) {
+        ThreadMetadata y2 = threadEmbedEntry.getThread().y();
+        if (y2 != null && y2.b()) {
             m.checkNotNullExpressionValue(context, "context");
             Drawable drawable = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, 2130969461, 0));
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            String string = view.getResources().getString(2131893849);
+            String string = view.getResources().getString(2131893947);
             m.checkNotNullExpressionValue(string, "itemView.resources.getSt…R.string.thread_archived)");
             setNoMostRecentMessage$default(this, string, null, null, drawable, 6, null);
         } else if (threadEmbedEntry.getThreadMessageCount() == 0) {
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            String string2 = view2.getResources().getString(2131891424);
+            String string2 = view2.getResources().getString(2131891495);
             m.checkNotNullExpressionValue(string2, "itemView.resources.getSt…tring.no_thread_messages)");
             setNoMostRecentMessage$default(this, string2, null, null, null, 14, null);
         } else {
-            if ((mostRecentMessage != null ? mostRecentMessage.k() : null) == null || mostRecentMessage.g() == null || threadEmbedEntry.getMostRecentMessageGuildMember() == null) {
+            if ((mostRecentMessage != null ? mostRecentMessage.getContent() : null) == null || mostRecentMessage.getAuthor() == null || threadEmbedEntry.getMostRecentMessageGuildMember() == null) {
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
-                String string3 = view3.getResources().getString(2131891413);
+                String string3 = view3.getResources().getString(2131891484);
                 m.checkNotNullExpressionValue(string3, "itemView.resources.getSt…o_recent_thread_messages)");
                 setNoMostRecentMessage$default(this, string3, null, null, null, 14, null);
-                return;
-            }
-            MessageUtils messageUtils = MessageUtils.INSTANCE;
-            if (messageUtils.hasStickers(mostRecentMessage)) {
+            } else if (mostRecentMessage.hasStickers()) {
                 View view4 = this.itemView;
                 m.checkNotNullExpressionValue(view4, "itemView");
-                String string4 = view4.getResources().getString(2131892593);
+                String string4 = view4.getResources().getString(2131892674);
                 m.checkNotNullExpressionValue(string4, "itemView.resources.getSt…ply_quote_sticker_mobile)");
                 setNoMostRecentMessage$default(this, string4, mostRecentMessage, threadEmbedEntry.getMostRecentMessageGuildMember(), null, 8, null);
-            } else if (messageUtils.hasAttachments(mostRecentMessage) || messageUtils.hasEmbeds(mostRecentMessage)) {
+            } else if (mostRecentMessage.hasAttachments() || mostRecentMessage.hasEmbeds()) {
                 m.checkNotNullExpressionValue(context, "context");
                 Drawable drawable2 = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, 2130969408, 0));
                 View view5 = this.itemView;
                 m.checkNotNullExpressionValue(view5, "itemView");
-                String string5 = view5.getResources().getString(2131892591);
+                String string5 = view5.getResources().getString(2131892672);
                 m.checkNotNullExpressionValue(string5, "itemView.resources.getSt…e_no_text_content_mobile)");
                 setNoMostRecentMessage(string5, mostRecentMessage, threadEmbedEntry.getMostRecentMessageGuildMember(), drawable2);
             } else {
@@ -224,9 +220,9 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
             m.checkNotNullExpressionValue(textView, "binding.threadEmbedMostRecentMessageName");
             textView.setText(guildMember.getNick());
             this.binding.k.setTextColor(getAuthorTextColor(guildMember));
-            User g = message.g();
-            m.checkNotNull(g);
-            CoreUser coreUser = new CoreUser(g);
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            CoreUser coreUser = new CoreUser(author);
             SimpleDraweeView simpleDraweeView = this.binding.h;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.threadEmbedMostRecentMessageAvatar");
             IconUtils.setIcon$default(simpleDraweeView, coreUser, 2131165295, null, null, guildMember, 24, null);
@@ -300,7 +296,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt
             TextView textView = this.binding.l;
             m.checkNotNullExpressionValue(textView, "binding.threadEmbedName");
             ThreadEmbedEntry threadEmbedEntry = (ThreadEmbedEntry) chatListEntry;
-            textView.setText(threadEmbedEntry.getThread().l());
+            textView.setText(threadEmbedEntry.getThread().m());
             this.binding.d.setOnClickListener(new WidgetChatListAdapterItemThreadEmbed$onConfigure$1(this, chatListEntry));
             this.binding.a.setOnLongClickListener(new WidgetChatListAdapterItemThreadEmbed$onConfigure$2(this, chatListEntry));
             configureMessageCount(threadEmbedEntry.getThreadMessageCount());
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
index d8668f22b2..d9535236af 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java
@@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemTimestamp extends WidgetChatListItem
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemTimestamp(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558960, widgetChatListAdapter);
+        super(2131558963, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         WidgetChatListAdapterItemTextDividerBinding a = WidgetChatListAdapterItemTextDividerBinding.a(this.itemView);
         m.checkNotNullExpressionValue(a, "WidgetChatListAdapterIte…derBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
index 1d4bd3fc37..ec70073173 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java
@@ -464,9 +464,9 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             for (SendUtils.FileUpload fileUpload2 : list) {
                 arrayList.add(ObservableExtensionsKt.leadingEdgeThrottle(fileUpload2.getBytesWrittenObservable(), j, TimeUnit.MILLISECONDS));
             }
-            Observable<Model.Many> G = Observable.b(arrayList, WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.INSTANCE).G(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4(ref$LongRef)).s().G(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5(list, ref$LongRef));
-            m.checkNotNullExpressionValue(G, "Observable\n            .…essPercent)\n            }");
-            return G;
+            Observable<Model.Many> F = Observable.b(arrayList, WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$3.INSTANCE).F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$4(ref$LongRef)).r().F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getManyUploadsObservable$5(list, ref$LongRef));
+            m.checkNotNullExpressionValue(F, "Observable\n            .…essPercent)\n            }");
+            return F;
         }
 
         private final int getPercentage(long j, long j2) {
@@ -484,39 +484,39 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
                 m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …E\n            )\n        )");
                 return jVar;
             }
-            Observable<Model.Single> G = ObservableExtensionsKt.leadingEdgeThrottle(fileUpload.getBytesWrittenObservable(), j, TimeUnit.MILLISECONDS).G(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1(fileUpload)).s().G(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2(fileUpload));
-            m.checkNotNullExpressionValue(G, "upload\n            .byte…          )\n            }");
-            return G;
+            Observable<Model.Single> F = ObservableExtensionsKt.leadingEdgeThrottle(fileUpload.getBytesWrittenObservable(), j, TimeUnit.MILLISECONDS).F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$1(fileUpload)).r().F(new WidgetChatListAdapterItemUploadProgress$ModelProvider$getSingleUploadObservable$2(fileUpload));
+            m.checkNotNullExpressionValue(F, "upload\n            .byte…          )\n            }");
+            return F;
         }
 
         public final Observable<? extends Model> get(String str, long j) {
             m.checkNotNullParameter(str, "nonce");
             StoreMessageUploads messageUploads = StoreStream.Companion.getMessageUploads();
-            Observable<? extends Model> Z = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{messageUploads}, false, null, null, new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1(messageUploads, str), 14, null).Z(new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$2(j));
-            m.checkNotNullExpressionValue(Z, "ObservationDeckProvider.…      }\n        }\n      }");
-            return Z;
+            Observable<? extends Model> Y = ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{messageUploads}, false, null, null, new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$1(messageUploads, str), 14, null).Y(new WidgetChatListAdapterItemUploadProgress$ModelProvider$get$2(j));
+            m.checkNotNullExpressionValue(Y, "ObservationDeckProvider.…      }\n        }\n      }");
+            return Y;
         }
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetChatListAdapterItemUploadProgress(WidgetChatListAdapter widgetChatListAdapter) {
-        super(2131558964, widgetChatListAdapter);
+        super(2131558967, widgetChatListAdapter);
         m.checkNotNullParameter(widgetChatListAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131364355;
-        ImageView imageView = (ImageView) view.findViewById(2131364355);
+        int i = 2131364393;
+        ImageView imageView = (ImageView) view.findViewById(2131364393);
         if (imageView != null) {
-            i = 2131364356;
-            ImageView imageView2 = (ImageView) view.findViewById(2131364356);
+            i = 2131364394;
+            ImageView imageView2 = (ImageView) view.findViewById(2131364394);
             if (imageView2 != null) {
-                i = 2131365353;
-                UploadProgressView uploadProgressView = (UploadProgressView) view.findViewById(2131365353);
+                i = 2131365411;
+                UploadProgressView uploadProgressView = (UploadProgressView) view.findViewById(2131365411);
                 if (uploadProgressView != null) {
-                    i = 2131365354;
-                    UploadProgressView uploadProgressView2 = (UploadProgressView) view.findViewById(2131365354);
+                    i = 2131365412;
+                    UploadProgressView uploadProgressView2 = (UploadProgressView) view.findViewById(2131365412);
                     if (uploadProgressView2 != null) {
-                        i = 2131365355;
-                        UploadProgressView uploadProgressView3 = (UploadProgressView) view.findViewById(2131365355);
+                        i = 2131365413;
+                        UploadProgressView uploadProgressView3 = (UploadProgressView) view.findViewById(2131365413);
                         if (uploadProgressView3 != null) {
                             WidgetChatListAdapterItemUploadProgressBinding widgetChatListAdapterItemUploadProgressBinding = new WidgetChatListAdapterItemUploadProgressBinding((LinearLayout) view, imageView, imageView2, uploadProgressView, uploadProgressView2, uploadProgressView3);
                             m.checkNotNullExpressionValue(widgetChatListAdapterItemUploadProgressBinding, "WidgetChatListAdapterIte…essBinding.bind(itemView)");
@@ -641,7 +641,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
 
     private final void setUploadState(UploadProgressView uploadProgressView, Model model) {
         if (m.areEqual(model, Model.None.INSTANCE)) {
-            CharSequence i = c.a.l.b.i(uploadProgressView, 2131894140, new Object[0], null, 4);
+            CharSequence i = c.a.l.b.i(uploadProgressView, 2131894241, new Object[0], null, 4);
             int i2 = UploadProgressView.i;
             uploadProgressView.a(i, 0, null);
             Context context = uploadProgressView.getContext();
@@ -658,7 +658,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
                 m.checkNotNullExpressionValue(resources, "resources");
                 Context context2 = uploadProgressView.getContext();
                 m.checkNotNullExpressionValue(context2, "context");
-                displayName = StringResourceUtilsKt.getQuantityString(resources, context2, 2131755341, preprocessing.getNumFiles(), Integer.valueOf(preprocessing.getNumFiles()));
+                displayName = StringResourceUtilsKt.getQuantityString(resources, context2, 2131755342, preprocessing.getNumFiles(), Integer.valueOf(preprocessing.getNumFiles()));
             }
             int i4 = UploadProgressView.i;
             uploadProgressView.a(displayName, -1, null);
@@ -687,7 +687,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
             Context context6 = uploadProgressView.getContext();
             m.checkNotNullExpressionValue(context6, "context");
             Model.Many many = (Model.Many) model;
-            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, context6, 2131755341, many.getNumFiles(), Integer.valueOf(many.getNumFiles()));
+            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, context6, 2131755342, many.getNumFiles(), Integer.valueOf(many.getNumFiles()));
             if (many.getProgress() != -1) {
                 i3 = many.getProgress();
             }
@@ -707,9 +707,9 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis
     public void onConfigure(int i, ChatListEntry chatListEntry) {
         m.checkNotNullParameter(chatListEntry, "data");
         super.onConfigure(i, chatListEntry);
-        Observable<? extends Model> L = ModelProvider.INSTANCE.get(((UploadProgressEntry) chatListEntry).getMessageNonce(), 100).L();
-        m.checkNotNullExpressionValue(L, "ModelProvider.get(data.m…  .onBackpressureLatest()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(L), WidgetChatListAdapterItemUploadProgress.class, (Context) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$1(this), 58, (Object) null);
+        Observable<? extends Model> K = ModelProvider.INSTANCE.get(((UploadProgressEntry) chatListEntry).getMessageNonce(), 100).K();
+        m.checkNotNullExpressionValue(K, "ModelProvider.get(data.m…  .onBackpressureLatest()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(K), WidgetChatListAdapterItemUploadProgress.class, (Context) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$1(this), 58, (Object) null);
         WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1 widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1 = new WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1(chatListEntry);
         this.binding.f1749c.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$3(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1));
         this.binding.b.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$4(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1));
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java
index 4d17123971..a86329ee29 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java
@@ -5,9 +5,8 @@ import android.graphics.drawable.Drawable;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.utilities.color.ColorCompat;
-import com.discord.utilities.message.MessageUtils;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import d0.z.d.m;
@@ -56,10 +55,9 @@ public class WidgetChatListItem extends MGRecyclerViewHolder<WidgetChatListAdapt
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(view, "highlightView");
         m.checkNotNullParameter(view2, "gutterView");
-        MessageUtils messageUtils = MessageUtils.INSTANCE;
         boolean z2 = true;
         int i3 = 0;
-        if (messageUtils.isEphemeralMessage(message) || messageUtils.isFailed(message)) {
+        if (message.isEphemeralMessage() || message.isFailed()) {
             i = ColorCompat.getThemedColor(view.getContext(), 2130968902);
             i2 = ColorCompat.getThemedColor(view2, 2130968994);
         } else if (WidgetChatListItemKt.isUserMentioned((WidgetChatListAdapter) this.adapter, message)) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItemKt.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItemKt.java
index cc9bdf5514..0523067529 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItemKt.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItemKt.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.adapter;
 
-import com.discord.api.message.Message;
 import com.discord.api.user.User;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import java.util.Iterator;
 import java.util.List;
@@ -12,21 +12,21 @@ public final class WidgetChatListItemKt {
         m.checkNotNullParameter(widgetChatListAdapter, "$this$isUserMentioned");
         m.checkNotNullParameter(message, "message");
         if (widgetChatListAdapter.getMentionMeMessageLevelHighlighting()) {
-            if (m.areEqual(message.x(), Boolean.TRUE)) {
+            if (m.areEqual(message.getMentionEveryone(), Boolean.TRUE)) {
                 return true;
             }
-            List<User> z3 = message.z();
-            if (z3 != null) {
-                for (User user : z3) {
+            List<User> mentions = message.getMentions();
+            if (mentions != null) {
+                for (User user : mentions) {
                     if (user.i() == widgetChatListAdapter.getData().getUserId()) {
                         return true;
                     }
                 }
             }
-            List<Long> y2 = message.y();
-            if (y2 != null) {
-                if (!y2.isEmpty()) {
-                    Iterator<T> it = y2.iterator();
+            List<Long> mentionRoles = message.getMentionRoles();
+            if (mentionRoles != null) {
+                if (!mentionRoles.isEmpty()) {
+                    Iterator<T> it = mentionRoles.iterator();
                     while (true) {
                         if (!it.hasNext()) {
                             break;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java
index 68a32ba837..0d554e95a0 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java
@@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.entries;
 
 import a0.a.a.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.message.attachment.MessageAttachment;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageState;
 import d0.z.d.m;
 /* compiled from: AttachmentEntry.kt */
@@ -20,7 +20,7 @@ public final class AttachmentEntry extends ChatListEntry {
     private final StoreMessageState.State messageState;
     private final int type = 28;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE  (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.AttachmentEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.AttachmentEntry.getType():int), (wrap: long : 0x002f: INVOKE  (r3v2 long) = (r5v0 com.discord.api.message.Message) type: VIRTUAL call: com.discord.api.message.Message.r():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE  (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.AttachmentEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.AttachmentEntry.getType():int), (wrap: long : 0x002f: INVOKE  (r3v2 long) = (r5v0 com.discord.models.message.Message) type: VIRTUAL call: com.discord.models.message.Message.getId():long)] */
     public AttachmentEntry(int i, long j, Message message, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5) {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(messageAttachment, "attachment");
@@ -35,7 +35,7 @@ public final class AttachmentEntry extends ChatListEntry {
         this.isThreadStarterMessage = z5;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(message.r());
+        sb.append(message.getId());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java
index 26c2287952..a5c9675efe 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.entries;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 /* compiled from: BlockedMessagesEntry.kt */
 public final class BlockedMessagesEntry extends ChatListEntry {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java
index 711b8abb93..84a9f2505f 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java
@@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.entries;
 
 import a0.a.a.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.models.botuikit.MessageComponent;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import java.util.List;
 /* compiled from: BotUiComponentEntry.kt */
@@ -27,8 +27,8 @@ public final class BotUiComponentEntry extends ChatListEntry {
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
         sb.append(" -- ");
-        Object B = message.B();
-        sb.append(B == null ? Long.valueOf(message.r()) : B);
+        Object nonce = message.getNonce();
+        sb.append(nonce == null ? Long.valueOf(message.getId()) : nonce);
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java
index 3de0deaf7b..1977bedf17 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java
@@ -4,7 +4,6 @@ import c.a.d.r0.b;
 import com.discord.api.application.Application;
 import com.discord.api.botuikit.Component;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.activity.MessageActivity;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.embed.EmbedType;
@@ -16,6 +15,7 @@ import com.discord.api.user.User;
 import com.discord.models.botuikit.MessageComponent;
 import com.discord.models.domain.ModelInvite;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageState;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreThreadMessages;
@@ -98,61 +98,56 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
             ModelInvite resolveInviteCodeForPublicStage = inviteEmbedModel.resolveInviteCodeForPublicStage(str);
             long j = 0;
             if (resolveInviteCodeForPublicStage != null) {
-                User g = message.g();
-                m.checkNotNull(g);
-                long i = g.i();
-                long r = message.r();
-                Long o = message.o();
-                if (o != null) {
-                    j = o.longValue();
+                User author = message.getAuthor();
+                m.checkNotNull(author);
+                long i = author.i();
+                long id2 = message.getId();
+                Long guildId = message.getGuildId();
+                if (guildId != null) {
+                    j = guildId.longValue();
                 }
-                return new StageInviteEntry(i, r, str, resolveInviteCodeForPublicStage, j);
+                return new StageInviteEntry(i, id2, str, resolveInviteCodeForPublicStage, j);
             }
-            User g2 = message.g();
-            m.checkNotNull(g2);
-            long i2 = g2.i();
-            long r2 = message.r();
-            Long o2 = message.o();
-            if (o2 != null) {
-                j = o2.longValue();
+            User author2 = message.getAuthor();
+            m.checkNotNull(author2);
+            long i2 = author2.i();
+            long id3 = message.getId();
+            Long guildId2 = message.getGuildId();
+            if (guildId2 != null) {
+                j = guildId2.longValue();
             }
-            return new InviteEntry(i2, r2, str, j);
+            return new InviteEntry(i2, id3, str, j);
         }
 
         public final Collection<ChatListEntry> createBotComponentEntries(Message message, long j, ComponentChatListState.ComponentStoreState componentStoreState) {
             long j2;
             m.checkNotNullParameter(message, "message");
-            List<Component> j3 = message.j();
-            if (j3 == null || !(!j3.isEmpty())) {
+            List<Component> components = message.getComponents();
+            if (components == null || !(!components.isEmpty())) {
                 return n.emptyList();
             }
-            List<Component> j4 = message.j();
-            if (j4 == null) {
-                j4 = n.emptyList();
-            }
-            List<MessageComponent> processComponentsToMessageComponents = ComponentStateMapper.INSTANCE.processComponentsToMessageComponents(j4, componentStoreState, BotComponentExperiments.Companion.get(StoreStream.Companion.getExperiments()));
-            Long e = message.e();
-            if (e != null) {
-                j2 = e.longValue();
+            List<MessageComponent> processComponentsToMessageComponents = ComponentStateMapper.INSTANCE.processComponentsToMessageComponents(message.getComponents(), componentStoreState, BotComponentExperiments.Companion.get(StoreStream.Companion.getExperiments()));
+            Long applicationId = message.getApplicationId();
+            if (applicationId != null) {
+                j2 = applicationId.longValue();
             } else {
-                User g = message.g();
-                m.checkNotNull(g);
-                j2 = g.i();
+                User author = message.getAuthor();
+                m.checkNotNull(author);
+                j2 = author.i();
             }
             return d0.t.m.listOf(new BotUiComponentEntry(message, j2, Long.valueOf(j), processComponentsToMessageComponents));
         }
 
         public final List<ChatListEntry> createEmbedEntries(Message message, StoreMessageState.State state, boolean z2, boolean z3, boolean z4, boolean z5, long j, boolean z6) {
             m.checkNotNullParameter(message, "message");
-            MessageUtils messageUtils = MessageUtils.INSTANCE;
-            if (!(messageUtils.hasAttachments(message) || (messageUtils.hasEmbeds(message) && z5))) {
+            if (!(message.hasAttachments() || (message.hasEmbeds() && z5))) {
                 return n.emptyList();
             }
             HashSet hashSet = new HashSet();
             ArrayList<MessageEmbed> arrayList = new ArrayList();
-            List<MessageEmbed> m = message.m();
-            if (m != null) {
-                for (MessageEmbed messageEmbed : m) {
+            List<MessageEmbed> embeds = message.getEmbeds();
+            if (embeds != null) {
+                for (MessageEmbed messageEmbed : embeds) {
                     if (!hashSet.contains(messageEmbed.l())) {
                         hashSet.add(messageEmbed.l());
                         arrayList.add(messageEmbed);
@@ -161,20 +156,23 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
                     }
                 }
             }
-            List<MessageAttachment> f = message.f();
+            List<MessageAttachment> attachments = message.getAttachments();
             int i = 0;
-            ArrayList arrayList2 = new ArrayList(arrayList.size() + (f != null ? f.size() : 0));
-            List<MessageAttachment> f2 = message.f();
-            if (f2 != null) {
-                for (MessageAttachment messageAttachment : f2) {
-                    arrayList2.add(new AttachmentEntry(i, j, message, state, messageAttachment, z2, z3, z4, z6));
-                    i++;
+            ArrayList arrayList2 = new ArrayList(arrayList.size() + (attachments != null ? attachments.size() : 0));
+            List<MessageAttachment> attachments2 = message.getAttachments();
+            if (attachments2 != null) {
+                int i2 = 0;
+                for (MessageAttachment messageAttachment : attachments2) {
+                    arrayList2.add(new AttachmentEntry(i2, j, message, state, messageAttachment, z2, z3, z4, z6));
+                    i2++;
                 }
+                i = i2;
             }
+            int i3 = i;
             for (MessageEmbed messageEmbed2 : arrayList) {
                 if (messageEmbed2.k() != EmbedType.APPLICATION_NEWS) {
-                    arrayList2.add(new EmbedEntry(i, j, message, state, messageEmbed2, z2, z3, z4, z6));
-                    i++;
+                    arrayList2.add(new EmbedEntry(i3, j, message, state, messageEmbed2, z2, z3, z4, z6));
+                    i3++;
                 }
             }
             return arrayList2;
@@ -182,30 +180,30 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
 
         public final List<ChatListEntry> createGameInviteEntries(Message message) {
             m.checkNotNullParameter(message, "message");
-            Application d = message.d();
-            MessageActivity b = message.b();
-            if (d == null || b == null) {
+            Application application = message.getApplication();
+            MessageActivity activity = message.getActivity();
+            if (application == null || activity == null) {
                 return n.emptyList();
             }
-            User g = message.g();
-            m.checkNotNull(g);
-            return d0.t.m.listOf(new GameInviteEntry(g.i(), message.r(), b, d));
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            return d0.t.m.listOf(new GameInviteEntry(author.i(), message.getId(), activity, application));
         }
 
         public final Collection<ChatListEntry> createGiftEntries(Message message) {
             m.checkNotNullParameter(message, "message");
-            String k = message.k();
-            if (k == null || k.length() == 0) {
+            String content = message.getContent();
+            if (content == null || content.length() == 0) {
                 return n.emptyList();
             }
             HashMap hashMap = new HashMap();
-            for (MatchResult matchResult : b.r.findAll(k, 0)) {
+            for (MatchResult matchResult : b.r.findAll(content, 0)) {
                 List<String> groupValues = matchResult.getGroupValues();
                 if (!groupValues.isEmpty()) {
                     String str = groupValues.get(groupValues.size() - 1);
-                    User g = message.g();
-                    m.checkNotNull(g);
-                    hashMap.put(str, new GiftEntry(g.i(), message.r(), message.i(), str));
+                    User author = message.getAuthor();
+                    m.checkNotNull(author);
+                    hashMap.put(str, new GiftEntry(author.i(), message.getId(), message.getChannelId(), str));
                 }
             }
             Collection<ChatListEntry> values = hashMap.values();
@@ -215,17 +213,17 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
 
         public final Collection<ChatListEntry> createGuildTemplateEntries(Message message) {
             m.checkNotNullParameter(message, "message");
-            String k = message.k();
-            if (k != null) {
-                if (!(k.length() == 0)) {
+            String content = message.getContent();
+            if (content != null) {
+                if (!(content.length() == 0)) {
                     HashMap hashMap = new HashMap();
-                    for (MatchResult matchResult : b.q.findAll(k, 0)) {
+                    for (MatchResult matchResult : b.q.findAll(content, 0)) {
                         List<String> groupValues = matchResult.getGroupValues();
                         if (!groupValues.isEmpty()) {
                             String str = groupValues.get(groupValues.size() - 1);
-                            User g = message.g();
-                            m.checkNotNull(g);
-                            hashMap.put(str, new GuildTemplateEntry(g.i(), message.r(), str));
+                            User author = message.getAuthor();
+                            m.checkNotNull(author);
+                            hashMap.put(str, new GuildTemplateEntry(author.i(), message.getId(), str));
                         }
                     }
                     Collection<ChatListEntry> values = hashMap.values();
@@ -239,12 +237,12 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
         public final Collection<ChatListEntry> createInviteEntries(Message message, InviteEmbedModel inviteEmbedModel) {
             m.checkNotNullParameter(message, "message");
             m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel");
-            String k = message.k();
-            if (k == null || k.length() == 0) {
+            String content = message.getContent();
+            if (content == null || content.length() == 0) {
                 return n.emptyList();
             }
             HashMap hashMap = new HashMap();
-            for (MatchResult matchResult : b.o.findAll(k, 0)) {
+            for (MatchResult matchResult : b.o.findAll(content, 0)) {
                 List<String> groupValues = matchResult.getGroupValues();
                 if (!groupValues.isEmpty()) {
                     String str = groupValues.get(groupValues.size() - 1);
@@ -258,33 +256,34 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
 
         public final List<ChatListEntry> createSpotifyListenTogetherEntries(Message message) {
             m.checkNotNullParameter(message, "message");
-            MessageActivity b = message.b();
-            if (b == null || !MessageUtils.INSTANCE.isSpotifyListeningActivity(message)) {
+            MessageActivity activity = message.getActivity();
+            if (activity == null || !message.isSpotifyListeningActivity()) {
                 return n.emptyList();
             }
-            User g = message.g();
-            m.checkNotNull(g);
-            return d0.t.m.listOf(new SpotifyListenTogetherEntry(g.i(), message.r(), b));
+            User author = message.getAuthor();
+            m.checkNotNull(author);
+            return d0.t.m.listOf(new SpotifyListenTogetherEntry(author.i(), message.getId(), activity));
         }
 
         public final List<ChatListEntry> createStickerEntries(Message message) {
+            ArrayList arrayList;
             m.checkNotNullParameter(message, "message");
-            ArrayList arrayList = null;
-            if (MessageUtils.INSTANCE.hasStickerItems(message)) {
-                List<StickerPartial> H = message.H();
-                if (H != null) {
-                    arrayList = new ArrayList(o.collectionSizeOrDefault(H, 10));
-                    for (StickerPartial stickerPartial : H) {
-                        arrayList.add(new StickerEntry(message, stickerPartial));
-                    }
+            List<StickerPartial> stickerItems = message.getStickerItems();
+            if (!(stickerItems == null || stickerItems.isEmpty())) {
+                List<StickerPartial> stickerItems2 = message.getStickerItems();
+                arrayList = new ArrayList(o.collectionSizeOrDefault(stickerItems2, 10));
+                for (StickerPartial stickerPartial : stickerItems2) {
+                    arrayList.add(new StickerEntry(message, stickerPartial));
                 }
             } else {
-                List<Sticker> I = message.I();
-                if (I != null) {
-                    arrayList = new ArrayList(o.collectionSizeOrDefault(I, 10));
-                    for (Sticker sticker : I) {
+                List<Sticker> stickers = message.getStickers();
+                if (stickers != null) {
+                    arrayList = new ArrayList(o.collectionSizeOrDefault(stickers, 10));
+                    for (Sticker sticker : stickers) {
                         arrayList.add(new StickerEntry(message, sticker));
                     }
+                } else {
+                    arrayList = null;
                 }
             }
             return arrayList != null ? arrayList : n.emptyList();
@@ -293,7 +292,7 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
         public final Collection<ChatListEntry> createThreadEmbedEntries(Channel channel, Map<Long, GuildMember> map, Message message, Channel channel2, StoreThreadMessages.ThreadState threadState, Map<Long, GuildRole> map2, boolean z2, boolean z3) {
             Map<Long, String> map3;
             Message mostRecentMessage;
-            User g;
+            User author;
             Message mostRecentMessage2;
             m.checkNotNullParameter(channel, "channel");
             m.checkNotNullParameter(map, "channelMembers");
@@ -302,18 +301,18 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload {
             if (!z3) {
                 return n.emptyList();
             }
-            long r = message.r();
+            long id2 = message.getId();
             int count = threadState != null ? threadState.getCount() : 0;
             Long l = null;
             Message mostRecentMessage3 = threadState != null ? threadState.getMostRecentMessage() : null;
-            Map<Long, GuildRole> map4 = RoleUtils.containsRoleMentions(message.k()) ? map2 : null;
-            if (threadState == null || (mostRecentMessage2 = threadState.getMostRecentMessage()) == null || (map3 = MessageUtils.getNickOrUsernames(mostRecentMessage2, channel, map, channel.m())) == null) {
+            Map<Long, GuildRole> map4 = RoleUtils.containsRoleMentions(message.getContent()) ? map2 : null;
+            if (threadState == null || (mostRecentMessage2 = threadState.getMostRecentMessage()) == null || (map3 = MessageUtils.getNickOrUsernames(mostRecentMessage2, channel, map, channel.n())) == null) {
                 map3 = h0.emptyMap();
             }
-            if (!(threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null || (g = mostRecentMessage.g()) == null)) {
-                l = Long.valueOf(g.i());
+            if (!(threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null || (author = mostRecentMessage.getAuthor()) == null)) {
+                l = Long.valueOf(author.i());
             }
-            return d0.t.m.listOf(new ThreadEmbedEntry(r, channel2, count, mostRecentMessage3, map4, map3, z2, map.get(l), message));
+            return d0.t.m.listOf(new ThreadEmbedEntry(id2, channel2, count, mostRecentMessage3, map4, map3, z2, map.get(l), message));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java
index a16c99b30c..abe9c645ca 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java
@@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.entries;
 
 import a0.a.a.b;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.message.embed.MessageEmbed;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageState;
 import d0.z.d.m;
 /* compiled from: EmbedEntry.kt */
@@ -20,7 +20,7 @@ public final class EmbedEntry extends ChatListEntry {
     private final StoreMessageState.State messageState;
     private final int type = 21;
 
-    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE  (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.EmbedEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.EmbedEntry.getType():int), (wrap: long : 0x002f: INVOKE  (r3v2 long) = (r5v0 com.discord.api.message.Message) type: VIRTUAL call: com.discord.api.message.Message.r():long)] */
+    /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE  (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.EmbedEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.EmbedEntry.getType():int), (wrap: long : 0x002f: INVOKE  (r3v2 long) = (r5v0 com.discord.models.message.Message) type: VIRTUAL call: com.discord.models.message.Message.getId():long)] */
     public EmbedEntry(int i, long j, Message message, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5) {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(messageEmbed, "embed");
@@ -35,7 +35,7 @@ public final class EmbedEntry extends ChatListEntry {
         this.isThreadStarterMessage = z5;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        sb.append(message.r());
+        sb.append(message.getId());
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java
index 372d38451f..bff0407bab 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java
@@ -1,6 +1,6 @@
 package com.discord.widgets.chat.list.entries;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 /* compiled from: EphemeralMessageEntry.kt */
 public final class EphemeralMessageEntry extends ChatListEntry {
@@ -14,8 +14,8 @@ public final class EphemeralMessageEntry extends ChatListEntry {
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
         sb.append(' ');
-        Object B = message.B();
-        sb.append(B == null ? Long.valueOf(message.r()) : B);
+        Object nonce = message.getNonce();
+        sb.append(nonce == null ? Long.valueOf(message.getId()) : nonce);
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java
index 0c6c14f42e..a9b75be8a9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java
@@ -1,12 +1,11 @@
 package com.discord.widgets.chat.list.entries;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageReplies;
 import com.discord.stores.StoreMessageState;
-import com.discord.utilities.message.MessageUtils;
 import d0.z.d.m;
 import java.util.Map;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -128,10 +127,10 @@ public final class MessageEntry extends ChatListEntry {
     }
 
     public MessageEntry(Message message, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map<Long, GuildRole> map, Map<Long, String> map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5) {
-        Integer M;
-        Integer M2;
-        Integer M3;
-        Integer M4;
+        Integer type;
+        Integer type2;
+        Integer type3;
+        Integer type4;
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(map2, "nickOrUsernames");
         this.message = message;
@@ -149,23 +148,23 @@ public final class MessageEntry extends ChatListEntry {
         int i = 19;
         if (z2) {
             i = 1;
-        } else if (!MessageUtils.INSTANCE.isInteraction(message) && (((M = message.M()) == null || M.intValue() != 0) && ((M2 = message.M()) == null || M2.intValue() != -1))) {
-            Integer M5 = message.M();
-            if (M5 != null && M5.intValue() == 20 && message.t() == null) {
+        } else if (!message.isInteraction() && (((type = message.getType()) == null || type.intValue() != 0) && ((type2 = message.getType()) == null || type2.intValue() != -1))) {
+            Integer type5 = message.getType();
+            if (type5 != null && type5.intValue() == 20 && message.getInteraction() == null) {
                 i = 33;
             } else {
-                Integer M6 = message.M();
-                if ((M6 == null || M6.intValue() != 3) && ((M3 = message.M()) == null || M3.intValue() != 13)) {
-                    Integer M7 = message.M();
-                    if ((M7 != null && M7.intValue() == -2) || ((M4 = message.M()) != null && M4.intValue() == -3)) {
+                Integer type6 = message.getType();
+                if ((type6 == null || type6.intValue() != 3) && ((type3 = message.getType()) == null || type3.intValue() != 13)) {
+                    Integer type7 = message.getType();
+                    if ((type7 != null && type7.intValue() == -2) || ((type4 = message.getType()) != null && type4.intValue() == -3)) {
                         i = 20;
                     } else {
-                        Integer M8 = message.M();
-                        if (M8 != null && M8.intValue() == 19) {
+                        Integer type8 = message.getType();
+                        if (type8 != null && type8.intValue() == 19) {
                             i = 32;
                         } else {
-                            Integer M9 = message.M();
-                            i = (M9 != null && M9.intValue() == 22) ? 38 : 5;
+                            Integer type9 = message.getType();
+                            i = (type9 != null && type9.intValue() == 22) ? 38 : 5;
                         }
                     }
                 }
@@ -177,8 +176,8 @@ public final class MessageEntry extends ChatListEntry {
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
         sb.append(' ');
-        Object B = message.B();
-        sb.append(B == null ? Long.valueOf(message.r()) : B);
+        Object nonce = message.getNonce();
+        sb.append(nonce == null ? Long.valueOf(message.getId()) : nonce);
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java
index 48a353822b..1d6c33fa57 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java
@@ -3,37 +3,21 @@ package com.discord.widgets.chat.list.entries;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import d0.z.d.m;
-import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: MessageHeaderEntry.kt */
 public final class MessageHeaderEntry extends ChatListEntry {
-    public static final Companion Companion = new Companion(null);
     private final String channelName;
-    private final String key = String.valueOf(getType());
+    private final String key;
     private final Message message;
     private final String text;
-    private final int type = 17;
+    private final int type;
 
-    /* compiled from: MessageHeaderEntry.kt */
-    public static final class Companion {
-        private Companion() {
-        }
-
-        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
-            this();
-        }
-
-        public final MessageHeaderEntry create(Message message, Channel channel, Guild guild) {
-            m.checkNotNullParameter(message, "message");
-            String str = null;
-            String name = guild != null ? guild.getName() : null;
-            if (channel != null) {
-                str = AnimatableValueParser.y0(channel);
-            }
-            return new MessageHeaderEntry(message, name, str);
-        }
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public MessageHeaderEntry(Message message, Channel channel, Guild guild) {
+        this(message, guild != null ? guild.getName() : null, channel != null ? AnimatableValueParser.y0(channel) : null);
+        m.checkNotNullParameter(message, "message");
     }
 
     public MessageHeaderEntry(Message message, String str, String str2) {
@@ -41,6 +25,8 @@ public final class MessageHeaderEntry extends ChatListEntry {
         this.message = message;
         this.text = str;
         this.channelName = str2;
+        this.type = 17;
+        this.key = String.valueOf(getType());
     }
 
     public static /* synthetic */ MessageHeaderEntry copy$default(MessageHeaderEntry messageHeaderEntry, Message message, String str, String str2, int i, Object obj) {
@@ -56,10 +42,6 @@ public final class MessageHeaderEntry extends ChatListEntry {
         return messageHeaderEntry.copy(message, str, str2);
     }
 
-    public static final MessageHeaderEntry create(Message message, Channel channel, Guild guild) {
-        return Companion.create(message, channel, guild);
-    }
-
     public final Message component1() {
         return this.message;
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java
index 138e08007a..782fec79a1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.entries;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 /* compiled from: ReactionsEntry.kt */
 public final class ReactionsEntry extends ChatListEntry {
@@ -20,8 +20,8 @@ public final class ReactionsEntry extends ChatListEntry {
         this.animateEmojis = z4;
         StringBuilder sb = new StringBuilder();
         sb.append(getType());
-        Object B = message.B();
-        sb.append(B == null ? Long.valueOf(message.r()) : B);
+        Object nonce = message.getNonce();
+        sb.append(nonce == null ? Long.valueOf(message.getId()) : nonce);
         this.key = sb.toString();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java
index bbd26fbd65..9da4cf37d5 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java
@@ -1,8 +1,8 @@
 package com.discord.widgets.chat.list.entries;
 
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.sticker.BaseSticker;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 /* compiled from: StickerEntry.kt */
 public final class StickerEntry extends ChatListEntry {
@@ -16,7 +16,7 @@ public final class StickerEntry extends ChatListEntry {
         m.checkNotNullParameter(baseSticker, "sticker");
         this.message = message;
         this.sticker = baseSticker;
-        this.key = getType() + " -- " + message.r() + " -- " + baseSticker.c();
+        this.key = getType() + " -- " + message.getId() + " -- " + baseSticker.c();
     }
 
     public static /* synthetic */ StickerEntry copy$default(StickerEntry stickerEntry, Message message, BaseSticker baseSticker, int i, Object obj) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadDraftFormEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadDraftFormEntry.java
index e541aa1b8f..b67c02dcf4 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadDraftFormEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadDraftFormEntry.java
@@ -8,39 +8,28 @@ import d0.z.d.m;
 public final class ThreadDraftFormEntry extends ChatListEntry {
     private final boolean canCreatePrivateThread;
     private final boolean canCreatePublicThread;
+    private final Integer defaultAutoArchiveDuration;
+    private final long guildId;
     private final String key;
     private final long parentChannelId;
     private final Long parentMessageId;
     private final StoreThreadDraft.ThreadDraftState threadDraftState;
     private final int type = 37;
 
-    public ThreadDraftFormEntry(long j, Long l, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z2, boolean z3) {
+    public ThreadDraftFormEntry(long j, Long l, long j2, Integer num, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z2, boolean z3) {
         m.checkNotNullParameter(threadDraftState, "threadDraftState");
         this.parentChannelId = j;
         this.parentMessageId = l;
+        this.guildId = j2;
+        this.defaultAutoArchiveDuration = num;
         this.threadDraftState = threadDraftState;
         this.canCreatePrivateThread = z2;
         this.canCreatePublicThread = z3;
         this.key = "37" + j + l;
     }
 
-    public static /* synthetic */ ThreadDraftFormEntry copy$default(ThreadDraftFormEntry threadDraftFormEntry, long j, Long l, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z2, boolean z3, int i, Object obj) {
-        if ((i & 1) != 0) {
-            j = threadDraftFormEntry.parentChannelId;
-        }
-        if ((i & 2) != 0) {
-            l = threadDraftFormEntry.parentMessageId;
-        }
-        if ((i & 4) != 0) {
-            threadDraftState = threadDraftFormEntry.threadDraftState;
-        }
-        if ((i & 8) != 0) {
-            z2 = threadDraftFormEntry.canCreatePrivateThread;
-        }
-        if ((i & 16) != 0) {
-            z3 = threadDraftFormEntry.canCreatePublicThread;
-        }
-        return threadDraftFormEntry.copy(j, l, threadDraftState, z2, z3);
+    public static /* synthetic */ ThreadDraftFormEntry copy$default(ThreadDraftFormEntry threadDraftFormEntry, long j, Long l, long j2, Integer num, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z2, boolean z3, int i, Object obj) {
+        return threadDraftFormEntry.copy((i & 1) != 0 ? threadDraftFormEntry.parentChannelId : j, (i & 2) != 0 ? threadDraftFormEntry.parentMessageId : l, (i & 4) != 0 ? threadDraftFormEntry.guildId : j2, (i & 8) != 0 ? threadDraftFormEntry.defaultAutoArchiveDuration : num, (i & 16) != 0 ? threadDraftFormEntry.threadDraftState : threadDraftState, (i & 32) != 0 ? threadDraftFormEntry.canCreatePrivateThread : z2, (i & 64) != 0 ? threadDraftFormEntry.canCreatePublicThread : z3);
     }
 
     public final long component1() {
@@ -51,21 +40,29 @@ public final class ThreadDraftFormEntry extends ChatListEntry {
         return this.parentMessageId;
     }
 
-    public final StoreThreadDraft.ThreadDraftState component3() {
+    public final long component3() {
+        return this.guildId;
+    }
+
+    public final Integer component4() {
+        return this.defaultAutoArchiveDuration;
+    }
+
+    public final StoreThreadDraft.ThreadDraftState component5() {
         return this.threadDraftState;
     }
 
-    public final boolean component4() {
+    public final boolean component6() {
         return this.canCreatePrivateThread;
     }
 
-    public final boolean component5() {
+    public final boolean component7() {
         return this.canCreatePublicThread;
     }
 
-    public final ThreadDraftFormEntry copy(long j, Long l, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z2, boolean z3) {
+    public final ThreadDraftFormEntry copy(long j, Long l, long j2, Integer num, StoreThreadDraft.ThreadDraftState threadDraftState, boolean z2, boolean z3) {
         m.checkNotNullParameter(threadDraftState, "threadDraftState");
-        return new ThreadDraftFormEntry(j, l, threadDraftState, z2, z3);
+        return new ThreadDraftFormEntry(j, l, j2, num, threadDraftState, z2, z3);
     }
 
     public boolean equals(Object obj) {
@@ -76,7 +73,7 @@ public final class ThreadDraftFormEntry extends ChatListEntry {
             return false;
         }
         ThreadDraftFormEntry threadDraftFormEntry = (ThreadDraftFormEntry) obj;
-        return this.parentChannelId == threadDraftFormEntry.parentChannelId && m.areEqual(this.parentMessageId, threadDraftFormEntry.parentMessageId) && m.areEqual(this.threadDraftState, threadDraftFormEntry.threadDraftState) && this.canCreatePrivateThread == threadDraftFormEntry.canCreatePrivateThread && this.canCreatePublicThread == threadDraftFormEntry.canCreatePublicThread;
+        return this.parentChannelId == threadDraftFormEntry.parentChannelId && m.areEqual(this.parentMessageId, threadDraftFormEntry.parentMessageId) && this.guildId == threadDraftFormEntry.guildId && m.areEqual(this.defaultAutoArchiveDuration, threadDraftFormEntry.defaultAutoArchiveDuration) && m.areEqual(this.threadDraftState, threadDraftFormEntry.threadDraftState) && this.canCreatePrivateThread == threadDraftFormEntry.canCreatePrivateThread && this.canCreatePublicThread == threadDraftFormEntry.canCreatePublicThread;
     }
 
     public final boolean getCanCreatePrivateThread() {
@@ -87,6 +84,14 @@ public final class ThreadDraftFormEntry extends ChatListEntry {
         return this.canCreatePublicThread;
     }
 
+    public final Integer getDefaultAutoArchiveDuration() {
+        return this.defaultAutoArchiveDuration;
+    }
+
+    public final long getGuildId() {
+        return this.guildId;
+    }
+
     @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
     public String getKey() {
         return this.key;
@@ -113,7 +118,9 @@ public final class ThreadDraftFormEntry extends ChatListEntry {
         int a = b.a(this.parentChannelId) * 31;
         Long l = this.parentMessageId;
         int i = 0;
-        int hashCode = (a + (l != null ? l.hashCode() : 0)) * 31;
+        int a2 = (b.a(this.guildId) + ((a + (l != null ? l.hashCode() : 0)) * 31)) * 31;
+        Integer num = this.defaultAutoArchiveDuration;
+        int hashCode = (a2 + (num != null ? num.hashCode() : 0)) * 31;
         StoreThreadDraft.ThreadDraftState threadDraftState = this.threadDraftState;
         if (threadDraftState != null) {
             i = threadDraftState.hashCode();
@@ -140,6 +147,10 @@ public final class ThreadDraftFormEntry extends ChatListEntry {
         L.append(this.parentChannelId);
         L.append(", parentMessageId=");
         L.append(this.parentMessageId);
+        L.append(", guildId=");
+        L.append(this.guildId);
+        L.append(", defaultAutoArchiveDuration=");
+        L.append(this.defaultAutoArchiveDuration);
         L.append(", threadDraftState=");
         L.append(this.threadDraftState);
         L.append(", canCreatePrivateThread=");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java
index 84757505e6..1546feecd9 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java
@@ -3,9 +3,9 @@ package com.discord.widgets.chat.list.entries;
 import a0.a.a.b;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import d0.z.d.m;
 import java.util.Map;
 /* compiled from: ThreadEmbedEntry.kt */
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java
index 45d478d447..d951e91431 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState$Companion$get$1.java
@@ -32,6 +32,6 @@ public final class WidgetChatListModel$ChatListState$Companion$get$1<T, R> imple
     }
 
     public final Observable<? extends WidgetChatListModel.ChatListState> call(boolean z2) {
-        return z2 ? StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(this.$channelId).G(AnonymousClass1.INSTANCE).s() : new j(WidgetChatListModel.ChatListState.ATTACHED);
+        return z2 ? StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(this.$channelId).F(AnonymousClass1.INSTANCE).r() : new j(WidgetChatListModel.ChatListState.ATTACHED);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getChannel$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getChannel$1.java
index 9e5a135751..2a5c0b88ff 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getChannel$1.java
@@ -38,7 +38,7 @@ public final class WidgetChatListModel$Companion$getChannel$1<T1, T2, T3, T4, T5
         if (chatListState == WidgetChatListModel.ChatListState.DETACHED) {
             arrayList.add(new LoadingEntry());
         } else {
-            arrayList.add(new SpacerEntry(this.$channel.g()));
+            arrayList.add(new SpacerEntry(this.$channel.h()));
             if (access$shouldShowStickerGreet && (access$getGreetMessageItem = WidgetChatListModel.Companion.access$getGreetMessageItem(companion, widgetChatListModelMessages, this.$channel)) != null) {
                 arrayList.add(access$getGreetMessageItem);
             }
@@ -49,10 +49,10 @@ public final class WidgetChatListModel$Companion$getChannel$1<T1, T2, T3, T4, T5
         HashSet emptySet = (guildMember == null || (roles = guildMember.getRoles()) == null) ? n0.emptySet() : new HashSet(roles);
         m.checkNotNullExpressionValue(l, "myId");
         long longValue = l.longValue();
-        long g = this.$channel.g();
-        long e = this.$channel.e();
+        long h = this.$channel.h();
+        long f = this.$channel.f();
         m.checkNotNullExpressionValue(map, "channelNames");
-        return new WidgetChatListModel(longValue, g, guild, e, map, widgetChatListModelMessages.getOldestMessageId(), arrayList, emptySet, widgetChatListModelMessages.getNewMessagesMarkerMessageId(), widgetChatListModelMessages.getNewestKnownMessageId(), channelLoadedState.isLoadingMessages());
+        return new WidgetChatListModel(longValue, h, guild, f, map, widgetChatListModelMessages.getOldestMessageId(), arrayList, emptySet, widgetChatListModelMessages.getNewMessagesMarkerMessageId(), widgetChatListModelMessages.getNewestKnownMessageId(), channelLoadedState.isLoadingMessages());
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java
index 7b0a7607d0..e0bbda4367 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java
@@ -1,6 +1,6 @@
 package com.discord.widgets.chat.list.model;
 
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import d0.z.d.k;
 import java.util.List;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java
index 48210fd90b..b3bb4250f4 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java
@@ -1,9 +1,9 @@
 package com.discord.widgets.chat.list.model;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreThreadDraft;
 import com.discord.utilities.threads.ThreadUtils;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
@@ -34,16 +34,18 @@ public final class WidgetChatListModel$Companion$getThreadDraft$3<T1, T2, T3, T4
     public final WidgetChatListModel call(Map<Long, String> map, Long l, Map<Long, GuildMember> map2, Guild guild, StoreThreadDraft.ThreadDraftState threadDraftState, Long l2, Pair<Message, ? extends List<? extends ChatListEntry>> pair) {
         List<Long> roles;
         ArrayList arrayList = new ArrayList();
-        arrayList.add(new SpacerEntry(this.$parentChannel.g()));
+        arrayList.add(new SpacerEntry(this.$parentChannel.h()));
         if (threadDraftState.isSending()) {
             arrayList.add(new LoadingEntry());
         }
         arrayList.addAll((Collection) pair.getSecond());
-        long g = this.$parentChannel.g();
+        long h = this.$parentChannel.h();
         Long l3 = this.$parentMessageId;
+        long f = this.$parentChannel.f();
+        Integer d = this.$parentChannel.d();
         m.checkNotNullExpressionValue(threadDraftState, "threadDraft");
         ThreadUtils threadUtils = ThreadUtils.INSTANCE;
-        arrayList.add(new ThreadDraftFormEntry(g, l3, threadDraftState, threadUtils.canCreatePrivateThread(l2, this.$parentChannel, this.$guildId), threadUtils.canCreatePublicThread(l2, this.$parentChannel, pair.getFirst(), this.$guildId)));
+        arrayList.add(new ThreadDraftFormEntry(h, l3, f, d, threadDraftState, threadUtils.canCreatePrivateThread(l2, this.$parentChannel, guild), threadUtils.canCreatePublicThread(l2, this.$parentChannel, pair.getFirst(), guild)));
         GuildMember guildMember = map2.get(l);
         HashSet emptySet = (guildMember == null || (roles = guildMember.getRoles()) == null) ? n0.emptySet() : new HashSet(roles);
         m.checkNotNullExpressionValue(l, "myId");
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
index 6c571dcb8a..0f3f581bb1 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java
@@ -4,11 +4,11 @@ import a0.a.a.b;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.sticker.Sticker;
 import com.discord.models.experiments.domain.Experiment;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessagesLoader;
 import com.discord.stores.StoreStickers;
 import com.discord.stores.StoreStream;
@@ -63,9 +63,9 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
             }
 
             public final Observable<ChatListState> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getMessages().observeIsDetached(j).Z(new WidgetChatListModel$ChatListState$Companion$get$1(j));
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …        }\n              }");
-                return Z;
+                Observable<R> Y = StoreStream.Companion.getMessages().observeIsDetached(j).Y(new WidgetChatListModel$ChatListState$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                return Y;
             }
         }
     }
@@ -99,7 +99,7 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
             Observable<WidgetChatListModelTop> observable = WidgetChatListModelTop.Companion.get(channel);
             Observable<WidgetChatListModelMessages> observable2 = WidgetChatListModelMessages.Companion.get(channel);
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<WidgetChatListModel> d = Observable.d(observable, observable2, observeIsLoadingMessages(companion.getMessagesLoader(), channel.g()), companion.getChannels().observeNames(), companion.getUsers().observeMeId(), companion.getGuilds().observeComputed(channel.e()), companion.getGuilds().observeGuild(channel.e()), ChatListState.Companion.get(channel.g()), new WidgetChatListModel$Companion$getChannel$1(channel));
+            Observable<WidgetChatListModel> d = Observable.d(observable, observable2, observeIsLoadingMessages(companion.getMessagesLoader(), channel.h()), companion.getChannels().observeNames(), companion.getUsers().observeMeId(), companion.getGuilds().observeComputed(channel.f()), companion.getGuilds().observeGuild(channel.f()), ChatListState.Companion.get(channel.h()), new WidgetChatListModel$Companion$getChannel$1(channel));
             m.checkNotNullExpressionValue(d, "Observable\n            .…          )\n            }");
             return d;
         }
@@ -114,10 +114,10 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
             Sticker sticker = stickers.getStickers().get(749054660769218631L);
             if (!(sticker == null || (userExperiment = companion.getExperiments().getUserExperiment("2021-06_dm_sticker_greet_android", true)) == null || userExperiment.getBucket() != 1)) {
                 if (widgetChatListModelMessages.getItems().isEmpty()) {
-                    return new StickerGreetEntry(sticker, channel.g(), AnimatableValueParser.y0(channel), channel.z());
+                    return new StickerGreetEntry(sticker, channel.h(), AnimatableValueParser.y0(channel), channel.A());
                 }
                 if (widgetChatListModelMessages.getItems().size() < 25) {
-                    return new StickerGreetCompactEntry(sticker, channel.g(), AnimatableValueParser.y0(channel), channel.z());
+                    return new StickerGreetCompactEntry(sticker, channel.h(), AnimatableValueParser.y0(channel), channel.A());
                 }
             }
             return null;
@@ -127,16 +127,16 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
         /* JADX WARNING: Unknown variable types count: 2 */
         private final Observable<WidgetChatListModel> getThreadDraft(Channel channel, Long l) {
             Observable observable;
-            long e = channel.e();
+            long f = channel.f();
             StoreStream.Companion companion = StoreStream.Companion;
             Observable<Map<Long, String>> observeNames = companion.getChannels().observeNames();
             Observable<Long> observeMeId = companion.getUsers().observeMeId();
-            Observable<Map<Long, GuildMember>> observeComputed = companion.getGuilds().observeComputed(e);
-            Observable<Guild> observeGuild = companion.getGuilds().observeGuild(e);
+            Observable<Map<Long, GuildMember>> observeComputed = companion.getGuilds().observeComputed(f);
+            Observable<Guild> observeGuild = companion.getGuilds().observeGuild(f);
             Observable<StoreThreadDraft.ThreadDraftState> observeDraftState = companion.getThreadDraft().observeDraftState();
-            Observable<Long> observePermissionsForChannel = companion.getPermissions().observePermissionsForChannel(channel.g());
+            Observable<Long> observePermissionsForChannel = companion.getPermissions().observePermissionsForChannel(channel.h());
             if (l != null) {
-                Observable<Message> observeMessagesForChannel = companion.getMessages().observeMessagesForChannel(channel.g(), l.longValue());
+                Observable<Message> observeMessagesForChannel = companion.getMessages().observeMessagesForChannel(channel.h(), l.longValue());
                 Observable<List<ChatListEntry>> singleMessage = WidgetChatListModelMessages.Companion.getSingleMessage(channel, l.longValue());
                 WidgetChatListModel$Companion$getThreadDraft$1 widgetChatListModel$Companion$getThreadDraft$1 = WidgetChatListModel$Companion$getThreadDraft$1.INSTANCE;
                 if (widgetChatListModel$Companion$getThreadDraft$1 != null) {
@@ -152,23 +152,23 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data {
                 }
                 observable = Observable.j(jVar, jVar2, (Func2) widgetChatListModel$Companion$getThreadDraft$2);
             }
-            Observable<WidgetChatListModel> e2 = Observable.e(observeNames, observeMeId, observeComputed, observeGuild, observeDraftState, observePermissionsForChannel, observable, new WidgetChatListModel$Companion$getThreadDraft$3(channel, l, e));
-            m.checkNotNullExpressionValue(e2, "Observable\n          .co…            )\n          }");
-            return e2;
+            Observable<WidgetChatListModel> e = Observable.e(observeNames, observeMeId, observeComputed, observeGuild, observeDraftState, observePermissionsForChannel, observable, new WidgetChatListModel$Companion$getThreadDraft$3(channel, l, f));
+            m.checkNotNullExpressionValue(e, "Observable\n          .co…            )\n          }");
+            return e;
         }
 
         private final Observable<StoreMessagesLoader.ChannelLoadedState> observeIsLoadingMessages(StoreMessagesLoader storeMessagesLoader, long j) {
-            return storeMessagesLoader.getMessagesLoadedState(j).s();
+            return storeMessagesLoader.getMessagesLoadedState(j).r();
         }
 
         private final boolean shouldShowStickerGreet(StoreMessagesLoader.ChannelLoadedState channelLoadedState, WidgetChatListModelMessages widgetChatListModelMessages, Channel channel) {
-            return channelLoadedState.isOldestMessagesLoaded() && channelLoadedState.isInitialMessagesLoaded() && channelLoadedState.getNewestSentByUserMessageId() == null && widgetChatListModelMessages.getNewestSentByUserMessageId() == null && widgetChatListModelMessages.getItems().size() < 25 && AnimatableValueParser.g1(channel) && !AnimatableValueParser.w1(channel);
+            return channelLoadedState.isOldestMessagesLoaded() && channelLoadedState.isInitialMessagesLoaded() && channelLoadedState.getNewestSentByUserMessageId() == null && widgetChatListModelMessages.getNewestSentByUserMessageId() == null && widgetChatListModelMessages.getItems().size() < 25 && AnimatableValueParser.h1(channel) && !AnimatableValueParser.x1(channel);
         }
 
         public final Observable<WidgetChatListModel> get() {
-            Observable<R> Z = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Z(WidgetChatListModel$Companion$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "StoreStream\n          .g…            }\n          }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeResolvedSelectedChannel().Y(WidgetChatListModel$Companion$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java
index 47a5b51f13..135021da54 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java
@@ -1,11 +1,11 @@
 package com.discord.widgets.chat.list.model;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageReplies;
 import com.discord.utilities.embed.InviteEmbedModel;
 import com.discord.widgets.botuikit.ComponentChatListState;
@@ -65,20 +65,20 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
             }
             Message message6 = (Message) obj2;
             WidgetChatListModelMessages.Companion companion2 = WidgetChatListModelMessages.Companion;
-            UtcDateTime K = message6.K();
-            if (WidgetChatListModelMessages.Companion.access$willAddTimestamp(companion2, K != null ? K.f() : 0, j2)) {
+            UtcDateTime timestamp = message6.getTimestamp();
+            if (WidgetChatListModelMessages.Companion.access$willAddTimestamp(companion2, timestamp != null ? timestamp.f() : 0, j2)) {
                 i2 = WidgetChatListModelMessages.Companion.access$addBlockedMessage(companion2, items3, message4, i2, z6);
             }
-            long r = message6.r();
-            UtcDateTime K2 = message6.K();
-            long access$tryAddTimestamp = WidgetChatListModelMessages.Companion.access$tryAddTimestamp(companion2, items3, r, K2 != null ? K2.f() : 0, j2);
+            long id2 = message6.getId();
+            UtcDateTime timestamp2 = message6.getTimestamp();
+            long access$tryAddTimestamp = WidgetChatListModelMessages.Companion.access$tryAddTimestamp(companion2, items3, id2, timestamp2 != null ? timestamp2.f() : 0, j2);
             boolean z8 = i == messagesWithMetadata.getMessages().size() - 1;
-            User g = message6.g();
-            boolean containsKey = map5.containsKey(g != null ? Long.valueOf(g.i()) : null);
+            User author = message6.getAuthor();
+            boolean containsKey = map5.containsKey(author != null ? Long.valueOf(author.i()) : null);
             if (!containsKey || (i2 = i2 + 1) != 1) {
                 message = message4;
             } else {
-                z6 = list2.contains(Long.valueOf(message6.r()));
+                z6 = list2.contains(Long.valueOf(message6.getId()));
                 message = message6;
             }
             int access$addBlockedMessage = (!containsKey || z8) ? WidgetChatListModelMessages.Companion.access$addBlockedMessage(companion2, items3, message, i2, z6) : i2;
@@ -86,8 +86,8 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
             if (!containsKey || z9) {
                 boolean access$shouldConcatMessage = WidgetChatListModelMessages.Companion.access$shouldConcatMessage(companion2, items3, message6, message5);
                 items3.setConcatCount(access$shouldConcatMessage ? items3.getConcatCount() + 1 : 0);
-                Integer M = message6.M();
-                if (M != null && M.intValue() == 21) {
+                Integer type = message6.getType();
+                if (type != null && type.intValue() == 21) {
                     Channel channel2 = widgetChatListModelMessages$Companion$get$2.$channel;
                     m.checkNotNullExpressionValue(map6, "channelMembers");
                     m.checkNotNullExpressionValue(bool, "showBotComponents");
@@ -107,7 +107,7 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
                     Map<Long, StoreMessageReplies.MessageState> messageReplyState = messagesWithMetadata.getMessageReplyState();
                     m.checkNotNullExpressionValue(bool, "showBotComponents");
                     items = items3;
-                    items.addItems(WidgetChatListModelMessages.Companion.getMessageItems$default(companion, channel3, map2, map3, map, messagesWithMetadata.getMessageThreads().get(Long.valueOf(message3.r())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(message3.r())), message3, messagesWithMetadata.getMessageState().get(Long.valueOf(message3.r())), messageReplyState, z9, access$shouldConcatMessage, l2, z2, z3, z4, bool.booleanValue(), map4, inviteEmbedModel, false, 262144, null));
+                    items.addItems(WidgetChatListModelMessages.Companion.getMessageItems$default(companion, channel3, map2, map3, map, messagesWithMetadata.getMessageThreads().get(Long.valueOf(message3.getId())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(message3.getId())), message3, messagesWithMetadata.getMessageState().get(Long.valueOf(message3.getId())), messageReplyState, z9, access$shouldConcatMessage, l2, z2, z3, z4, bool.booleanValue(), map4, inviteEmbedModel, false, 262144, null));
                 }
             } else {
                 items = items3;
@@ -120,7 +120,7 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
                 m.checkNotNullExpressionValue(l, str);
                 items2 = items;
                 widgetChatListModelMessages$Companion$get$2 = this;
-                z7 = WidgetChatListModelMessages.Companion.access$tryAddNewMessagesSeparator(companion, items2, l.longValue(), z8, message3.r(), widgetChatListModelMessages$Companion$get$2.$channel);
+                z7 = WidgetChatListModelMessages.Companion.access$tryAddNewMessagesSeparator(companion, items2, l.longValue(), z8, message3.getId(), widgetChatListModelMessages$Companion$get$2.$channel);
             } else {
                 items2 = items;
                 widgetChatListModelMessages$Companion$get$2 = this;
@@ -139,9 +139,9 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
         t.reverse(items3.getItems());
         List<ChatListEntry> items4 = items3.getItems();
         Message message7 = (Message) u.firstOrNull((List<? extends Object>) messagesWithMetadata.getMessages());
-        long r2 = message7 != null ? message7.r() : 0;
+        long id3 = message7 != null ? message7.getId() : 0;
         Message message8 = (Message) u.lastOrNull((List<? extends Object>) messagesWithMetadata.getMessages());
-        long r3 = message8 != null ? message8.r() : 0;
+        long id4 = message8 != null ? message8.getId() : 0;
         m.checkNotNullExpressionValue(l, "newMessagesMarkerMessageId");
         long longValue = l.longValue();
         Iterator<T> it = messagesWithMetadata.getMessages().iterator();
@@ -151,8 +151,8 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
                 break;
             }
             obj = it.next();
-            User g2 = ((Message) obj).g();
-            if (g2 == null || g2.i() != j) {
+            User author2 = ((Message) obj).getAuthor();
+            if (author2 == null || author2.i() != j) {
                 z5 = false;
                 continue;
             } else {
@@ -164,7 +164,7 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme
             }
         }
         Message message9 = (Message) obj;
-        return new WidgetChatListModelMessages(items4, r2, r3, map2, longValue, message9 != null ? Long.valueOf(message9.r()) : null);
+        return new WidgetChatListModelMessages(items4, id3, id4, map2, longValue, message9 != null ? Long.valueOf(message9.getId()) : null);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java
index 898c950b9d..4af051a669 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java
@@ -1,9 +1,9 @@
 package com.discord.widgets.chat.list.model;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.utilities.embed.InviteEmbedModel;
 import com.discord.widgets.chat.list.entries.ChatListEntry;
 import com.discord.widgets.chat.list.model.WidgetChatListModelMessages;
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2.java
index 3d6894aa66..a7a2cc1e53 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.list.model;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreChannels;
 import com.discord.stores.StoreMessageReplies;
 import com.discord.stores.StoreMessageState;
@@ -69,8 +69,8 @@ public final class WidgetChatListModelMessages$MessagesWithMetadata$Companion$ge
         m.checkNotNullExpressionValue(list, "messages");
         Observable<Map<Long, Channel>> observeThreadsFromMessages = channels.observeThreadsFromMessages(list);
         Observable<Map<Long, StoreThreadMessages.ThreadState>> observeThreadCountAndLatestMessage = companion.getThreadMessages().observeThreadCountAndLatestMessage();
-        Observable<Map<Long, StoreMessageReplies.MessageState>> observeMessageReferencesForChannel = companion.getRepliedMessages().observeMessageReferencesForChannel(this.$channel.g());
-        Observable<Map<Long, StoreMessageReplies.MessageState>> observeMessageReferencesForChannel2 = companion.getRepliedMessages().observeMessageReferencesForChannel(this.$channel.q());
+        Observable<Map<Long, StoreMessageReplies.MessageState>> observeMessageReferencesForChannel = companion.getRepliedMessages().observeMessageReferencesForChannel(this.$channel.h());
+        Observable<Map<Long, StoreMessageReplies.MessageState>> observeMessageReferencesForChannel2 = companion.getRepliedMessages().observeMessageReferencesForChannel(this.$channel.r());
         AnonymousClass1 r1 = AnonymousClass1.INSTANCE;
         if (r1 != null) {
             r1 = new WidgetChatListModelMessages$sam$rx_functions_Func6$0(r1);
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
index 537ed264e4..fc1455d84d 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java
@@ -5,13 +5,13 @@ import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
 import com.discord.api.interaction.Interaction;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.role.GuildRole;
 import com.discord.api.thread.ThreadMetadata;
 import com.discord.api.user.User;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageReplies;
 import com.discord.stores.StoreMessageState;
 import com.discord.stores.StorePermissions;
@@ -113,78 +113,74 @@ public final class WidgetChatListModelMessages {
         }
 
         private final Observable<Long> observePermissionsForChannel(StorePermissions storePermissions, Channel channel) {
-            if (AnimatableValueParser.w1(channel)) {
+            if (AnimatableValueParser.x1(channel)) {
                 j jVar = new j(null);
                 m.checkNotNullExpressionValue(jVar, "Observable.just(null)");
                 return jVar;
-            } else if (AnimatableValueParser.r1(channel)) {
+            } else if (AnimatableValueParser.s1(channel)) {
                 j jVar2 = new j(null);
                 m.checkNotNullExpressionValue(jVar2, "Observable.just(null)");
                 return jVar2;
             } else {
-                Observable<Long> s2 = storePermissions.observePermissionsForChannel(channel.g()).s();
-                m.checkNotNullExpressionValue(s2, "observePermissionsForCha…  .distinctUntilChanged()");
-                return s2;
+                Observable<Long> r = storePermissions.observePermissionsForChannel(channel.h()).r();
+                m.checkNotNullExpressionValue(r, "observePermissionsForCha…  .distinctUntilChanged()");
+                return r;
             }
         }
 
         private final Observable<Long> observeUnreadMarkerMessageId(StoreReadStates storeReadStates, long j) {
-            Observable<R> G = storeReadStates.getUnreadMarker(j).G(WidgetChatListModelMessages$Companion$observeUnreadMarkerMessageId$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "getUnreadMarker(channelI… marker.messageId ?: 0L }");
-            return ObservableExtensionsKt.computationLatest(G).s();
+            Observable<R> F = storeReadStates.getUnreadMarker(j).F(WidgetChatListModelMessages$Companion$observeUnreadMarkerMessageId$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "getUnreadMarker(channelI… marker.messageId ?: 0L }");
+            return ObservableExtensionsKt.computationLatest(F).r();
         }
 
         private final boolean shouldConcatMessage(Items items, Message message, Message message2) {
             MGRecyclerDataPayload listItemMostRecentlyAdded;
             MGRecyclerDataPayload listItemMostRecentlyAdded2;
             MGRecyclerDataPayload listItemMostRecentlyAdded3;
-            Integer M;
-            if (message2 == null) {
+            Integer type;
+            if (message2 == null || message2.isSystemMessage() || message.hasThread() || message2.hasThread()) {
                 return false;
             }
-            MessageUtils messageUtils = MessageUtils.INSTANCE;
-            if (messageUtils.isSystemMessage(message2) || messageUtils.hasThread(message) || messageUtils.hasThread(message2)) {
-                return false;
-            }
-            Integer M2 = message.M();
-            if ((M2 == null || M2.intValue() != 0) && ((M = message.M()) == null || M.intValue() != -1)) {
+            Integer type2 = message.getType();
+            if ((type2 == null || type2.intValue() != 0) && ((type = message.getType()) == null || type.intValue() != -1)) {
                 return false;
             }
             MGRecyclerDataPayload listItemMostRecentlyAdded4 = items.getListItemMostRecentlyAdded();
             if ((listItemMostRecentlyAdded4 == null || listItemMostRecentlyAdded4.getType() != 0) && (((listItemMostRecentlyAdded = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded.getType() != 1) && (((listItemMostRecentlyAdded2 = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded2.getType() != 21) && ((listItemMostRecentlyAdded3 = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded3.getType() != 4)))) {
                 return false;
             }
-            User g = message2.g();
+            User author = message2.getAuthor();
             String str = null;
-            Long valueOf = g != null ? Long.valueOf(g.i()) : null;
-            User g2 = message.g();
-            if (!m.areEqual(valueOf, g2 != null ? Long.valueOf(g2.i()) : null)) {
+            Long valueOf = author != null ? Long.valueOf(author.i()) : null;
+            User author2 = message.getAuthor();
+            if (!m.areEqual(valueOf, author2 != null ? Long.valueOf(author2.i()) : null)) {
                 return false;
             }
-            UtcDateTime K = message.K();
+            UtcDateTime timestamp = message.getTimestamp();
             long j = 0;
-            long f = K != null ? K.f() : 0;
-            UtcDateTime K2 = message2.K();
-            if (K2 != null) {
-                j = K2.f();
+            long f = timestamp != null ? timestamp.f() : 0;
+            UtcDateTime timestamp2 = message2.getTimestamp();
+            if (timestamp2 != null) {
+                j = timestamp2.f();
             }
-            if (f - j >= 420000 || messageUtils.hasAttachments(message2) || messageUtils.hasEmbeds(message2)) {
+            if (f - j >= 420000 || message2.hasAttachments() || message2.hasEmbeds()) {
                 return false;
             }
-            List<User> z2 = message2.z();
-            if (!(z2 == null || z2.isEmpty()) || messageUtils.hasAttachments(message) || messageUtils.hasEmbeds(message)) {
+            List<User> mentions = message2.getMentions();
+            if (!(mentions == null || mentions.isEmpty()) || message.hasAttachments() || message.hasEmbeds()) {
                 return false;
             }
-            List<User> z3 = message.z();
-            if (!(z3 == null || z3.isEmpty()) || items.getConcatCount() >= 5) {
+            List<User> mentions2 = message.getMentions();
+            if (!(mentions2 == null || mentions2.isEmpty()) || items.getConcatCount() >= 5) {
                 return false;
             }
-            if (messageUtils.isWebhook(message)) {
-                User g3 = message2.g();
-                String r = g3 != null ? g3.r() : null;
-                User g4 = message.g();
-                if (g4 != null) {
-                    str = g4.r();
+            if (message.isWebhook()) {
+                User author3 = message2.getAuthor();
+                String r = author3 != null ? author3.r() : null;
+                User author4 = message.getAuthor();
+                if (author4 != null) {
+                    str = author4.r();
                 }
                 if (!m.areEqual(r, str)) {
                     return false;
@@ -200,7 +196,7 @@ public final class WidgetChatListModelMessages {
                 z3 = false;
             }
             if (z3) {
-                items.addItem(new NewMessagesEntry(channel.g(), j2));
+                items.addItem(new NewMessagesEntry(channel.h(), j2));
             }
             return z3;
         }
@@ -226,22 +222,22 @@ public final class WidgetChatListModelMessages {
             m.checkNotNullParameter(channel, "channel");
             Observable<MessagesWithMetadata> observable = MessagesWithMetadata.Companion.get(channel);
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<Channel> observeChannel = companion.getChannels().observeChannel(channel.q());
+            Observable<Channel> observeChannel = companion.getChannels().observeChannel(channel.r());
             Observable<Map<Long, Integer>> observeForType = companion.getUserRelationships().observeForType(2);
             Observable<List<Long>> observeExpandedBlockedMessageIds = companion.getChat().observeExpandedBlockedMessageIds();
-            Observable<Map<Long, GuildMember>> observeGuildMembers = companion.getGuilds().observeGuildMembers(channel.e());
+            Observable<Map<Long, GuildMember>> observeGuildMembers = companion.getGuilds().observeGuildMembers(channel.f());
             m.checkNotNullExpressionValue(observeGuildMembers, "StoreStream\n            …dMembers(channel.guildId)");
-            Observable<Long> observeUnreadMarkerMessageId = observeUnreadMarkerMessageId(companion.getReadStates(), channel.g());
+            Observable<Long> observeUnreadMarkerMessageId = observeUnreadMarkerMessageId(companion.getReadStates(), channel.h());
             m.checkNotNullExpressionValue(observeUnreadMarkerMessageId, "StoreStream\n            …rkerMessageId(channel.id)");
-            Observable<Map<Long, GuildRole>> observeRoles = companion.getGuilds().observeRoles(channel.e());
+            Observable<Map<Long, GuildRole>> observeRoles = companion.getGuilds().observeRoles(channel.f());
             Observable<Long> observePermissionsForChannel = observePermissionsForChannel(companion.getPermissions(), channel);
             Observable observeIsAnimatedEmojisEnabled$default = StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null);
             Observable observeIsAutoPlayGifsEnabled$default = StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null);
             Observable<Boolean> observeIsRenderEmbedsEnabled = companion.getUserSettings().observeIsRenderEmbedsEnabled();
             Observable<Long> observeMeId = companion.getUsers().observeMeId();
-            Observable<R> G = companion.getExperiments().observeUserExperiment("2021-03_bot_ui_kit_components_android", false).G(WidgetChatListModelMessages$Companion$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "StoreStream\n            …experiment?.bucket == 1 }");
-            return ObservableCombineLatestOverloadsKt.combineLatest(observable, observeChannel, observeForType, observeExpandedBlockedMessageIds, observeGuildMembers, observeUnreadMarkerMessageId, observeRoles, observePermissionsForChannel, observeIsAnimatedEmojisEnabled$default, observeIsAutoPlayGifsEnabled$default, observeIsRenderEmbedsEnabled, observeMeId, G, ComponentChatListState.INSTANCE.observeChatListComponentState(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$get$2(channel));
+            Observable<R> F = companion.getExperiments().observeUserExperiment("2021-03_bot_ui_kit_components_android", false).F(WidgetChatListModelMessages$Companion$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "StoreStream\n            …experiment?.bucket == 1 }");
+            return ObservableCombineLatestOverloadsKt.combineLatest(observable, observeChannel, observeForType, observeExpandedBlockedMessageIds, observeGuildMembers, observeUnreadMarkerMessageId, observeRoles, observePermissionsForChannel, observeIsAnimatedEmojisEnabled$default, observeIsAutoPlayGifsEnabled$default, observeIsRenderEmbedsEnabled, observeMeId, F, ComponentChatListState.INSTANCE.observeChatListComponentState(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$get$2(channel));
         }
 
         public final List<ChatListEntry> getMessageItems(Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, Integer> map3, Channel channel2, StoreThreadMessages.ThreadState threadState, Message message, StoreMessageState.State state, Map<Long, ? extends StoreMessageReplies.MessageState> map4, boolean z2, boolean z3, Long l, boolean z4, boolean z5, boolean z6, boolean z7, Map<Long, ComponentChatListState.ComponentStoreState> map5, InviteEmbedModel inviteEmbedModel, boolean z8) {
@@ -269,14 +265,14 @@ public final class WidgetChatListModelMessages {
             m.checkNotNullParameter(map4, "repliedMessages");
             m.checkNotNullParameter(map5, "componentStoreState");
             m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel");
-            Integer M = message.M();
-            if (M != null && M.intValue() == 38 && !PermissionUtils.can(1, l)) {
+            Integer type = message.getType();
+            if (type != null && type.intValue() == 38 && !PermissionUtils.can(1, l)) {
                 return n.emptyList();
             }
             ArrayList arrayList2 = new ArrayList();
-            MessageReference A = message.A();
+            MessageReference messageReference = message.getMessageReference();
             Long l4 = null;
-            StoreMessageReplies.MessageState messageState3 = (StoreMessageReplies.MessageState) map4.get(A != null ? A.c() : null);
+            StoreMessageReplies.MessageState messageState3 = (StoreMessageReplies.MessageState) map4.get(messageReference != null ? messageReference.c() : null);
             if (messageState3 != null) {
                 boolean z11 = messageState3 instanceof StoreMessageReplies.MessageState.Loaded;
                 if (z11) {
@@ -298,9 +294,9 @@ public final class WidgetChatListModelMessages {
                 }
                 if (z9) {
                     messageState2 = messageState;
-                    User g = ((StoreMessageReplies.MessageState.Loaded) messageState2).getMessage().g();
-                    if (g != null) {
-                        l3 = Long.valueOf(g.i());
+                    User author = ((StoreMessageReplies.MessageState.Loaded) messageState2).getMessage().getAuthor();
+                    if (author != null) {
+                        l3 = Long.valueOf(author.i());
                         map7 = map3;
                     } else {
                         map7 = map3;
@@ -318,27 +314,27 @@ public final class WidgetChatListModelMessages {
                 arrayList = arrayList2;
                 replyData = null;
             }
-            User g2 = message.g();
-            if (g2 != null) {
-                l2 = Long.valueOf(g2.i());
+            User author2 = message.getAuthor();
+            if (author2 != null) {
+                l2 = Long.valueOf(author2.i());
                 map6 = map;
             } else {
                 map6 = map;
                 l2 = null;
             }
             GuildMember guildMember = map6.get(l2);
-            List<User> z12 = message.z();
-            GuildMember guildMember2 = map6.get((z12 == null || (user = (User) u.firstOrNull(z12)) == null) ? null : Long.valueOf(user.i()));
-            Map<Long, GuildRole> map8 = RoleUtils.containsRoleMentions(message.k()) ? map2 : null;
-            Map<Long, String> nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map6, channel.m());
-            Interaction t = message.t();
-            if (!(t == null || (c2 = t.c()) == null)) {
+            List<User> mentions = message.getMentions();
+            GuildMember guildMember2 = map6.get((mentions == null || (user = (User) u.firstOrNull(mentions)) == null) ? null : Long.valueOf(user.i()));
+            Map<Long, GuildRole> map8 = RoleUtils.containsRoleMentions(message.getContent()) ? map2 : null;
+            Map<Long, String> nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map6, channel.n());
+            Interaction interaction = message.getInteraction();
+            if (!(interaction == null || (c2 = interaction.c()) == null)) {
                 l4 = Long.valueOf(c2.i());
             }
             arrayList.add(new MessageEntry(message, state, guildMember, guildMember2, map8, nickOrUsernames, z3, z2, z4, replyData, map6.get(l4), z8));
             int size = arrayList.size();
             ChatListEntry.Companion companion = ChatListEntry.Companion;
-            arrayList.addAll(companion.createEmbedEntries(message, state, z2, z4, z5, z6, channel.e(), z8));
+            arrayList.addAll(companion.createEmbedEntries(message, state, z2, z4, z5, z6, channel.f(), z8));
             arrayList.addAll(companion.createStickerEntries(message));
             arrayList.addAll(companion.createGameInviteEntries(message));
             arrayList.addAll(companion.createSpotifyListenTogetherEntries(message));
@@ -346,34 +342,33 @@ public final class WidgetChatListModelMessages {
             arrayList.addAll(companion.createGuildTemplateEntries(message));
             arrayList.addAll(companion.createGiftEntries(message));
             if (z8) {
-                arrayList.add(new ThreadStarterDividerEntry(channel.g(), message.r()));
+                arrayList.add(new ThreadStarterDividerEntry(channel.h(), message.getId()));
                 return arrayList;
             }
             if (z7) {
-                arrayList.addAll(companion.createBotComponentEntries(message, channel.e(), map5.get(Long.valueOf(message.r()))));
+                arrayList.addAll(companion.createBotComponentEntries(message, channel.f(), map5.get(Long.valueOf(message.getId()))));
             }
-            boolean z13 = true;
-            if (!message.F().isEmpty()) {
-                ThreadMetadata x2 = channel.x();
-                boolean z14 = x2 == null || !x2.b();
-                if (!PermissionUtils.can(64, l) || !z14) {
-                    z13 = false;
+            boolean z12 = true;
+            if (!message.getReactionsMap().isEmpty()) {
+                ThreadMetadata y2 = channel.y();
+                boolean z13 = y2 == null || !y2.b();
+                if (!PermissionUtils.can(64, l) || !z13) {
+                    z12 = false;
                 }
-                arrayList.add(new ReactionsEntry(message, z14, z13, z4));
+                arrayList.add(new ReactionsEntry(message, z13, z12, z4));
             }
-            if (message.p() && !MessageUtils.INSTANCE.isFailed(message)) {
-                String B = message.B();
-                if (B == null) {
-                    B = "";
+            if (message.getHasLocalUploads() && !message.isFailed()) {
+                String nonce = message.getNonce();
+                if (nonce == null) {
+                    nonce = "";
                 }
-                arrayList.add(new UploadProgressEntry(B, message.i()));
+                arrayList.add(new UploadProgressEntry(nonce, message.getChannelId()));
             }
-            if (ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && MessageUtils.INSTANCE.hasThread(message) && channel2 != null) {
+            if (ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && message.hasThread() && channel2 != null) {
                 enableThreadSpine(arrayList, size);
                 arrayList.addAll(companion.createThreadEmbedEntries(channel, map, message, channel2, threadState, map2, z4, z6));
             }
-            MessageUtils messageUtils = MessageUtils.INSTANCE;
-            if (messageUtils.isEphemeralMessage(message) || (messageUtils.isInteraction(message) && messageUtils.isFailed(message))) {
+            if (message.isEphemeralMessage() || (message.isInteraction() && message.isFailed())) {
                 arrayList.add(new EphemeralMessageEntry(message));
             }
             return arrayList;
@@ -382,7 +377,7 @@ public final class WidgetChatListModelMessages {
         public final Observable<List<ChatListEntry>> getSingleMessage(Channel channel, long j) {
             m.checkNotNullParameter(channel, "channel");
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<List<ChatListEntry>> e = Observable.e(companion.getMessages().observeMessagesForChannel(channel.g(), j), companion.getGuilds().observeGuildMembers(channel.e()), companion.getGuilds().observeRoles(channel.e()), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null), companion.getUserSettings().observeIsRenderEmbedsEnabled(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$getSingleMessage$1(channel));
+            Observable<List<ChatListEntry>> e = Observable.e(companion.getMessages().observeMessagesForChannel(channel.h(), j), companion.getGuilds().observeGuildMembers(channel.f()), companion.getGuilds().observeRoles(channel.f()), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null), companion.getUserSettings().observeIsRenderEmbedsEnabled(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$getSingleMessage$1(channel));
             m.checkNotNullExpressionValue(e, "Observable.combineLatest… ).asReversed()\n        }");
             return e;
         }
@@ -399,19 +394,19 @@ public final class WidgetChatListModelMessages {
             m.checkNotNullParameter(map4, "componentStoreState");
             m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel");
             Map<Long, StoreMessageReplies.MessageState> parentChannelMessageReplyState = messagesWithMetadata.getParentChannelMessageReplyState();
-            MessageReference A = message.A();
-            StoreMessageReplies.MessageState messageState = parentChannelMessageReplyState.get(A != null ? A.c() : null);
+            MessageReference messageReference = message.getMessageReference();
+            StoreMessageReplies.MessageState messageState = parentChannelMessageReplyState.get(messageReference != null ? messageReference.c() : null);
             if (channel == null || !(messageState instanceof StoreMessageReplies.MessageState.Loaded)) {
-                long g = channel2.g();
-                User g2 = message.g();
-                m.checkNotNull(g2);
-                message2 = LocalMessageCreatorsKt.createThreadStarterMessageNotFoundMessage(g, g2, ClockFactory.get());
+                long h = channel2.h();
+                User author = message.getAuthor();
+                m.checkNotNull(author);
+                message2 = LocalMessageCreatorsKt.createThreadStarterMessageNotFoundMessage(h, author, ClockFactory.get());
                 channel3 = channel2;
             } else {
                 message2 = ((StoreMessageReplies.MessageState.Loaded) messageState).getMessage();
                 channel3 = channel;
             }
-            return getMessageItems(channel3, map, map2, map3, null, null, message2, messagesWithMetadata.getMessageState().get(Long.valueOf(message2.r())), messagesWithMetadata.getParentChannelMessageReplyState(), false, false, null, z2, z3, z5, z4, map4, inviteEmbedModel, true);
+            return getMessageItems(channel3, map, map2, map3, null, null, message2, messagesWithMetadata.getMessageState().get(Long.valueOf(message2.getId())), messagesWithMetadata.getParentChannelMessageReplyState(), false, false, null, z2, z3, z5, z4, map4, inviteEmbedModel, true);
         }
     }
 
@@ -499,9 +494,9 @@ public final class WidgetChatListModelMessages {
 
             public final Observable<MessagesWithMetadata> get(Channel channel) {
                 m.checkNotNullParameter(channel, "channel");
-                Observable<R> Z = StoreStream.Companion.getMessages().observeMessagesForChannel(channel.g()).Z(new WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2(channel));
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …        )\n              }");
-                return Z;
+                Observable<R> Y = StoreStream.Companion.getMessages().observeMessagesForChannel(channel.h()).Y(new WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2(channel));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        )\n              }");
+                return Y;
             }
 
             public final Observable<MessagesWithMetadata> get(List<Message> list) {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java
index efb0292ffd..3b0a8ee6db 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$get$1.java
@@ -34,8 +34,8 @@ public final class WidgetChatListModelTop$Companion$get$1<T, R> implements b<Sto
         if (channelLoadedState.isOldestMessagesLoaded()) {
             observable = WidgetChatListModelTop.Companion.access$getWelcomeEntry(WidgetChatListModelTop.Companion, this.$channel);
         } else {
-            observable = (channelLoadedState.isTouchedSinceLastJump() || !channelLoadedState.isInitialMessagesLoaded()) ? new j(new LoadingEntry()) : new j(new SpacerEntry(this.$channel.g()));
+            observable = (channelLoadedState.isTouchedSinceLastJump() || !channelLoadedState.isInitialMessagesLoaded()) ? new j(new LoadingEntry()) : new j(new SpacerEntry(this.$channel.h()));
         }
-        return observable.G(AnonymousClass1.INSTANCE);
+        return observable.F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.java
index ee549b1689..9c8036f09c 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$1.java
@@ -7,6 +7,6 @@ public final class WidgetChatListModelTop$Companion$getWelcomeEntry$1<T, R> impl
     public static final WidgetChatListModelTop$Companion$getWelcomeEntry$1 INSTANCE = new WidgetChatListModelTop$Companion$getWelcomeEntry$1();
 
     public final Long call(Channel channel) {
-        return Long.valueOf(channel != null ? channel.g() : 0);
+        return Long.valueOf(channel != null ? channel.h() : 0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java
index 0f4cde51d6..ea0554f722 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java
@@ -25,7 +25,7 @@ public final class WidgetChatListModelTop$Companion$getWelcomeEntry$2<T1, T2, T3
 
     public final ChatListEntry call(Guild guild, MeUser meUser, Long l, Long l2, GuildMember guildMember) {
         ChatListEntry startOfChatEntry;
-        boolean z2 = l2 != null && this.$channel.g() == l2.longValue();
+        boolean z2 = l2 != null && this.$channel.h() == l2.longValue();
         boolean z3 = guild != null && guild.hasIcon();
         boolean can = PermissionUtils.can(65536, l);
         boolean can2 = PermissionUtils.can(1, l);
@@ -34,19 +34,19 @@ public final class WidgetChatListModelTop$Companion$getWelcomeEntry$2<T1, T2, T3
         m.checkNotNullExpressionValue(meUser, "me");
         boolean canManageThread = threadUtils.canManageThread(meUser, this.$channel, l);
         boolean isOwner = guild != null ? guild.isOwner(meUser.getId()) : false;
-        if (!AnimatableValueParser.j1(this.$channel) || guild == null || !z2 || !can || (!can2 && z3)) {
+        if (!AnimatableValueParser.k1(this.$channel) || guild == null || !z2 || !can || (!can2 && z3)) {
             Integer num = null;
-            if (AnimatableValueParser.r1(this.$channel)) {
-                startOfChatEntry = new StartOfPrivateChatEntry(this.$channel.g(), AnimatableValueParser.y0(this.$channel), this.$channel.z(), IconUtils.getForChannel$default(this.$channel, null, 2, null), AnimatableValueParser.w1(this.$channel));
+            if (AnimatableValueParser.s1(this.$channel)) {
+                startOfChatEntry = new StartOfPrivateChatEntry(this.$channel.h(), AnimatableValueParser.y0(this.$channel), this.$channel.A(), IconUtils.getForChannel$default(this.$channel, null, 2, null), AnimatableValueParser.x1(this.$channel));
             } else {
-                long g = this.$channel.g();
+                long h = this.$channel.h();
                 String y0 = AnimatableValueParser.y0(this.$channel);
-                boolean y1 = AnimatableValueParser.y1(this.$channel);
-                ThreadMetadata x2 = this.$channel.x();
-                if (x2 != null) {
-                    num = Integer.valueOf(x2.c());
+                boolean z1 = AnimatableValueParser.z1(this.$channel);
+                ThreadMetadata y2 = this.$channel.y();
+                if (y2 != null) {
+                    num = Integer.valueOf(y2.c());
                 }
-                startOfChatEntry = new StartOfChatEntry(g, y0, can, can3, canManageThread, y1, num, guildMember);
+                startOfChatEntry = new StartOfChatEntry(h, y0, can, can3, canManageThread, z1, num, guildMember);
             }
             return startOfChatEntry;
         }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java
index cb78fdc52c..bc2bd7aa14 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop.java
@@ -31,7 +31,7 @@ public final class WidgetChatListModelTop {
 
         private final Observable<ChatListEntry> getWelcomeEntry(Channel channel) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<ChatListEntry> g = Observable.g(companion.getGuilds().observeGuild(channel.e()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(channel.g()), companion.getChannels().observeDefaultChannel(channel.e()).G(WidgetChatListModelTop$Companion$getWelcomeEntry$1.INSTANCE).s(), observeGuildMember(channel.e(), channel.p()), new WidgetChatListModelTop$Companion$getWelcomeEntry$2(channel));
+            Observable<ChatListEntry> g = Observable.g(companion.getGuilds().observeGuild(channel.f()), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForChannel(channel.h()), companion.getChannels().observeDefaultChannel(channel.f()).F(WidgetChatListModelTop$Companion$getWelcomeEntry$1.INSTANCE).r(), observeGuildMember(channel.f(), channel.q()), new WidgetChatListModelTop$Companion$getWelcomeEntry$2(channel));
             m.checkNotNullExpressionValue(g, "Observable.combineLatest…      )\n        }\n      }");
             return g;
         }
@@ -44,9 +44,9 @@ public final class WidgetChatListModelTop {
 
         public final Observable<WidgetChatListModelTop> get(Channel channel) {
             m.checkNotNullParameter(channel, "channel");
-            Observable<WidgetChatListModelTop> s2 = StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(channel.g()).Z(new WidgetChatListModelTop$Companion$get$1(channel)).s();
-            m.checkNotNullExpressionValue(s2, "StoreStream\n          .g…  .distinctUntilChanged()");
-            return s2;
+            Observable<WidgetChatListModelTop> r = StoreStream.Companion.getMessagesLoader().getMessagesLoadedState(channel.h()).Y(new WidgetChatListModelTop$Companion$get$1(channel)).r();
+            m.checkNotNullExpressionValue(r, "StoreStream\n          .g…  .distinctUntilChanged()");
+            return r;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java
index 8631cd4f97..c872619520 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet$binding$2.java
@@ -21,29 +21,29 @@ public final /* synthetic */ class WidgetApplicationCommandBottomSheet$binding$2
 
     public final WidgetApplicationCommandBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362150;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362150);
+        int i = 2131362161;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362161);
         if (linearLayout != null) {
-            i = 2131362638;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362638);
+            i = 2131362662;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362662);
             if (simpleDraweeView != null) {
-                i = 2131362639;
-                TextView textView = (TextView) view.findViewById(2131362639);
+                i = 2131362663;
+                TextView textView = (TextView) view.findViewById(2131362663);
                 if (textView != null) {
-                    i = 2131362640;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362640);
+                    i = 2131362664;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362664);
                     if (materialButton != null) {
-                        i = 2131362641;
-                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131362641);
+                        i = 2131362665;
+                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131362665);
                         if (progressBar != null) {
-                            i = 2131362642;
-                            TextView textView2 = (TextView) view.findViewById(2131362642);
+                            i = 2131362666;
+                            TextView textView2 = (TextView) view.findViewById(2131362666);
                             if (textView2 != null) {
-                                i = 2131362643;
-                                TextView textView3 = (TextView) view.findViewById(2131362643);
+                                i = 2131362667;
+                                TextView textView3 = (TextView) view.findViewById(2131362667);
                                 if (textView3 != null) {
-                                    i = 2131362644;
-                                    TextView textView4 = (TextView) view.findViewById(2131362644);
+                                    i = 2131362668;
+                                    TextView textView4 = (TextView) view.findViewById(2131362668);
                                     if (textView4 != null) {
                                         return new WidgetApplicationCommandBottomSheetBinding((ConstraintLayout) view, linearLayout, simpleDraweeView, textView, materialButton, progressBar, textView2, textView3, textView4);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java
index f6d4b4bd6e..59aed3c801 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java
@@ -129,7 +129,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
         objArr[0] = str;
         boolean z2 = true;
         objArr[1] = sb;
-        CharSequence c2 = b.c(textView, 2131893731, objArr, new WidgetApplicationCommandBottomSheet$configureCommandTitle$content$1(this, loaded, themedColor));
+        CharSequence c2 = b.c(textView, 2131893828, objArr, new WidgetApplicationCommandBottomSheet$configureCommandTitle$content$1(this, loaded, themedColor));
         TextView textView2 = getBinding().f;
         m.checkNotNullExpressionValue(textView2, "binding.commandBottomSheetCommandTitle");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -179,7 +179,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
                 spannableStringBuilder.append((CharSequence) configureSlashCommandString(loaded, applicationCommandValue));
             }
         }
-        TextView textView = getBinding().f1670c;
+        TextView textView = getBinding().f1667c;
         m.checkNotNullExpressionValue(textView, "binding.commandBottomSheetCommandContent");
         textView.setText(spannableStringBuilder);
     }
@@ -240,7 +240,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558839;
+        return 2131558842;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java
index f7265a917b..7c95123321 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel$Companion$observeStores$1.java
@@ -140,9 +140,9 @@ public final class WidgetApplicationCommandBottomSheetViewModel$Companion$observ
                             Channel channel = this.$storeChannels.getChannelsForGuild(l.longValue()).get(longOrNull4);
                             String a9 = applicationCommandValue.a();
                             String a10 = applicationCommandValue.a();
-                            String valueOf9 = String.valueOf(channel != null ? channel.l() : null);
+                            String valueOf9 = String.valueOf(channel != null ? channel.m() : null);
                             StringBuilder J5 = a.J('#');
-                            J5.append(channel != null ? channel.l() : null);
+                            J5.append(channel != null ? channel.m() : null);
                             linkedHashMap3.put(a9, new WidgetApplicationCommandBottomSheetViewModel.SlashCommandParam(a10, valueOf9, null, J5.toString()));
                         }
                     } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
index e2ccc548c1..927f8d4399 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheetViewModel.java
@@ -522,7 +522,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
             private final Map<Long, GuildRole> guildRoles;
 
             /* renamed from: id  reason: collision with root package name */
-            private final long f2133id;
+            private final long f2139id;
             private final GuildMember interactionUser;
             private final User user;
             private final Map<Long, String> usernamesOrNicks;
@@ -533,7 +533,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
                 m.checkNotNullParameter(applicationCommandData, "applicationCommandData");
                 m.checkNotNullParameter(map4, "usernamesOrNicks");
                 m.checkNotNullParameter(map5, "commandValues");
-                this.f2133id = j;
+                this.f2139id = j;
                 this.user = user;
                 this.interactionUser = guildMember;
                 this.application = application;
@@ -580,7 +580,7 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
             }
 
             public final long getId() {
-                return this.f2133id;
+                return this.f2139id;
             }
 
             public final GuildMember getInteractionUser() {
@@ -626,9 +626,9 @@ public final class WidgetApplicationCommandBottomSheetViewModel extends AppViewM
         this.messageNonce = str;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetApplicationCommandBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         requestInteractionData();
-        Observable s2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).G(AnonymousClass2.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "storeObservable.computat…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, WidgetApplicationCommandBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).F(AnonymousClass2.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "storeObservable.computat…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, WidgetApplicationCommandBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java b/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java
index de87f42b69..48713b6133 100644
--- a/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java
+++ b/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java
@@ -2,9 +2,9 @@ package com.discord.widgets.chat.list.utils;
 
 import android.content.Context;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.api.user.User;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageState;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserSettings;
@@ -191,7 +191,7 @@ public final class EmbeddedMessageParser {
 
     private final MessagePreprocessor getMessagePreprocessor(long j, Message message, StoreMessageState.State state, Integer num) {
         StoreUserSettings userSettings = StoreStream.Companion.getUserSettings();
-        return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : message.m(), false, num);
+        return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : message.getEmbeds(), false, num);
     }
 
     private final MessageRenderContext getMessageRenderContext(ParserData parserData) {
@@ -201,16 +201,16 @@ public final class EmbeddedMessageParser {
     public final DraweeSpanStringBuilder parse(ParserData parserData) {
         m.checkNotNullParameter(parserData, "parserData");
         MessageRenderContext messageRenderContext = getMessageRenderContext(parserData);
-        User g = parserData.getMessage().g();
-        MessagePreprocessor messagePreprocessor = getMessagePreprocessor(g != null ? g.i() : 0, parserData.getMessage(), parserData.getMessageState(), parserData.getMaxNodes());
-        String k = parserData.getMessage().k();
-        if (k == null) {
-            k = "";
+        User author = parserData.getMessage().getAuthor();
+        MessagePreprocessor messagePreprocessor = getMessagePreprocessor(author != null ? author.i() : 0, parserData.getMessage(), parserData.getMessageState(), parserData.getMaxNodes());
+        String content = parserData.getMessage().getContent();
+        if (content == null) {
+            content = "";
         }
         Context context = parserData.getContext();
         String property = System.getProperty("line.separator");
         Objects.requireNonNull(property);
         m.checkNotNullExpressionValue(property, "Objects.requireNonNull(S…operty(\"line.separator\"))");
-        return DiscordParser.parseChannelMessage(context, new Regex(property).replace(k, " "), messageRenderContext, messagePreprocessor, DiscordParser.ParserOptions.REPLY, false);
+        return DiscordParser.parseChannelMessage(context, new Regex(property).replace(content, " "), messageRenderContext, messagePreprocessor, DiscordParser.ParserOptions.REPLY, false);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java
index d9cab85963..1c10a02324 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java
@@ -140,20 +140,20 @@ public final class ManageReactionsEmojisAdapter extends MGRecyclerAdapterSimple<
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ReactionEmojiViewHolder(ManageReactionsEmojisAdapter manageReactionsEmojisAdapter) {
-            super(2131559073, manageReactionsEmojisAdapter);
+            super(2131559079, manageReactionsEmojisAdapter);
             m.checkNotNullParameter(manageReactionsEmojisAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363776;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363776);
+            int i = 2131363817;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363817);
             if (linearLayout != null) {
-                i = 2131363777;
-                TextView textView = (TextView) view.findViewById(2131363777);
+                i = 2131363818;
+                TextView textView = (TextView) view.findViewById(2131363818);
                 if (textView != null) {
-                    i = 2131363778;
-                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363778);
+                    i = 2131363819;
+                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363819);
                     if (simpleDraweeSpanTextView != null) {
-                        i = 2131363779;
-                        View findViewById = view.findViewById(2131363779);
+                        i = 2131363820;
+                        View findViewById = view.findViewById(2131363820);
                         if (findViewById != null) {
                             WidgetManageReactionsEmojiBinding widgetManageReactionsEmojiBinding = new WidgetManageReactionsEmojiBinding((RelativeLayout) view, linearLayout, textView, simpleDraweeSpanTextView, findViewById);
                             m.checkNotNullExpressionValue(widgetManageReactionsEmojiBinding, "WidgetManageReactionsEmojiBinding.bind(itemView)");
@@ -174,7 +174,7 @@ public final class ManageReactionsEmojisAdapter extends MGRecyclerAdapterSimple<
             m.checkNotNullParameter(reactionEmojiItem, "data");
             super.onConfigure(i, (int) reactionEmojiItem);
             EmojiNode.Companion companion = EmojiNode.Companion;
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1826c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1828c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.manageReactionsEmojiEmojiTextview");
             companion.renderEmoji(simpleDraweeSpanTextView, reactionEmojiItem.getReaction().b(), true, emojiSizePx);
             TextView textView = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java
index 4eb80f711d..e7909cf56b 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$2.java
@@ -126,7 +126,7 @@ public final class ManageReactionsModelProvider$get$2<T, R> implements b<MeUser,
             public final Observable<? extends ManageReactionsModel> call(MessageReactionEmoji messageReactionEmoji) {
                 ManageReactionsModelProvider manageReactionsModelProvider = this.this$0.this$0.this$0;
                 m.checkNotNullExpressionValue(messageReactionEmoji, "targetedEmoji");
-                return ManageReactionsModelProvider.access$getUsersForReaction(manageReactionsModelProvider, messageReactionEmoji).G(new AnonymousClass1(this, messageReactionEmoji));
+                return ManageReactionsModelProvider.access$getUsersForReaction(manageReactionsModelProvider, messageReactionEmoji).F(new AnonymousClass1(this, messageReactionEmoji));
             }
         }
 
@@ -145,7 +145,7 @@ public final class ManageReactionsModelProvider$get$2<T, R> implements b<MeUser,
         public final Observable<? extends ManageReactionsModel> call(Triple<Boolean, ? extends List<MessageReaction>, ? extends Map<Long, GuildMember>> triple) {
             Boolean component1 = triple.component1();
             List list = (List) triple.component2();
-            return list.isEmpty() ? new j(null) : ManageReactionsModelProvider.access$getTargetedEmojiKeySubject$p(this.this$0.this$0).s().G(new AnonymousClass1(list)).Z(new AnonymousClass2(this, list, component1, (Map) triple.component3()));
+            return list.isEmpty() ? new j(null) : ManageReactionsModelProvider.access$getTargetedEmojiKeySubject$p(this.this$0.this$0).r().F(new AnonymousClass1(list)).Y(new AnonymousClass2(this, list, component1, (Map) triple.component3()));
         }
     }
 
@@ -157,6 +157,6 @@ public final class ManageReactionsModelProvider$get$2<T, R> implements b<MeUser,
     }
 
     public final Observable<? extends ManageReactionsModel> call(MeUser meUser) {
-        return Observable.i(this.$getCanManageMessagesObs$1.invoke(meUser.getMfaEnabled()), this.$reactionsObs, this.$guildMembersObservable, AnonymousClass1.INSTANCE).Z(new AnonymousClass2(this, meUser));
+        return Observable.i(this.$getCanManageMessagesObs$1.invoke(meUser.getMfaEnabled()), this.$reactionsObs, this.$guildMembersObservable, AnonymousClass1.INSTANCE).Y(new AnonymousClass2(this, meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$guildMembersObservable$1.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$guildMembersObservable$1.java
index ff193159b9..71c8c2f72f 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$guildMembersObservable$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$guildMembersObservable$1.java
@@ -21,7 +21,7 @@ public final class ManageReactionsModelProvider$get$guildMembersObservable$1 ext
     /* renamed from: invoke */
     public final Map<Long, ? extends GuildMember> mo1invoke() {
         Channel channel = ManageReactionsModelProvider.access$getStoreChannels$p(this.this$0).getChannel(this.this$0.getChannelId());
-        Map<Long, GuildMember> map = ManageReactionsModelProvider.access$getStoreGuilds$p(this.this$0).getMembers().get(channel != null ? Long.valueOf(channel.e()) : null);
+        Map<Long, GuildMember> map = ManageReactionsModelProvider.access$getStoreGuilds$p(this.this$0).getMembers().get(channel != null ? Long.valueOf(channel.f()) : null);
         return map != null ? map : h0.emptyMap();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java
index fabdafecc8..a787889fa6 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.chat.managereactions;
 
-import com.discord.api.message.Message;
 import com.discord.api.message.reaction.MessageReaction;
+import com.discord.models.message.Message;
 import d0.t.h0;
 import j0.k.b;
 import java.util.Map;
@@ -10,7 +10,7 @@ public final class ManageReactionsModelProvider$get$reactionsObs$1<T, R> impleme
     public static final ManageReactionsModelProvider$get$reactionsObs$1 INSTANCE = new ManageReactionsModelProvider$get$reactionsObs$1();
 
     public final Map<String, MessageReaction> call(Message message) {
-        Map<String, MessageReaction> F;
-        return (message == null || (F = message.F()) == null) ? h0.emptyMap() : F;
+        Map<String, MessageReaction> reactionsMap;
+        return (message == null || (reactionsMap = message.getReactionsMap()) == null) ? h0.emptyMap() : reactionsMap;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java
index 3119b05bd7..b6c9dc0e0c 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider.java
@@ -45,7 +45,7 @@ public final class ManageReactionsModelProvider {
         this.storeChannels = storeChannels;
         this.storeGuilds = storeGuilds;
         this.observationDeck = observationDeck;
-        this.targetedEmojiKeySubject = new SerializedSubject<>(BehaviorSubject.m0(str));
+        this.targetedEmojiKeySubject = new SerializedSubject<>(BehaviorSubject.l0(str));
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -119,13 +119,13 @@ public final class ManageReactionsModelProvider {
     public final Observable<ManageReactionsModel> get() {
         ManageReactionsModelProvider$get$1 manageReactionsModelProvider$get$1 = new ManageReactionsModelProvider$get$1(this);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable G = companion.getMessages().observeMessagesForChannel(this.channelId, this.messageId).G(ManageReactionsModelProvider$get$reactionsObs$1.INSTANCE).G(ManageReactionsModelProvider$get$reactionsObs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get…ion -> reaction.count } }");
-        Observable Z = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Z(new ManageReactionsModelProvider$get$2(this, manageReactionsModelProvider$get$1, G, ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeChannels, this.storeGuilds}, false, null, null, new ManageReactionsModelProvider$get$guildMembersObservable$1(this), 14, null)));
-        m.checkNotNullExpressionValue(Z, "StoreStream\n        .get…              }\n        }");
-        Observable<ManageReactionsModel> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-        m.checkNotNullExpressionValue(s2, "StoreStream\n        .get…  .distinctUntilChanged()");
-        return s2;
+        Observable F = companion.getMessages().observeMessagesForChannel(this.channelId, this.messageId).F(ManageReactionsModelProvider$get$reactionsObs$1.INSTANCE).F(ManageReactionsModelProvider$get$reactionsObs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…ion -> reaction.count } }");
+        Observable Y = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Y(new ManageReactionsModelProvider$get$2(this, manageReactionsModelProvider$get$1, F, ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeChannels, this.storeGuilds}, false, null, null, new ManageReactionsModelProvider$get$guildMembersObservable$1(this), 14, null)));
+        m.checkNotNullExpressionValue(Y, "StoreStream\n        .get…              }\n        }");
+        Observable<ManageReactionsModel> r = ObservableExtensionsKt.computationLatest(Y).r();
+        m.checkNotNullExpressionValue(r, "StoreStream\n        .get…  .distinctUntilChanged()");
+        return r;
     }
 
     public final long getChannelId() {
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java
index ffc4348db0..3137b79259 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java
@@ -81,14 +81,14 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ErrorViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) {
-            super(2131559074, manageReactionsResultsAdapter);
+            super(2131559080, manageReactionsResultsAdapter);
             m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363781;
-            ImageView imageView = (ImageView) view.findViewById(2131363781);
+            int i = 2131363822;
+            ImageView imageView = (ImageView) view.findViewById(2131363822);
             if (imageView != null) {
-                i = 2131363782;
-                TextView textView = (TextView) view.findViewById(2131363782);
+                i = 2131363823;
+                TextView textView = (TextView) view.findViewById(2131363823);
                 if (textView != null) {
                     WidgetManageReactionsResultErrorBinding widgetManageReactionsResultErrorBinding = new WidgetManageReactionsResultErrorBinding((RelativeLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(widgetManageReactionsResultErrorBinding, "WidgetManageReactionsRes…rorBinding.bind(itemView)");
@@ -126,7 +126,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
     public static final class LoadingViewHolder extends MGRecyclerViewHolder<ManageReactionsResultsAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public LoadingViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) {
-            super(2131559075, manageReactionsResultsAdapter);
+            super(2131559081, manageReactionsResultsAdapter);
             m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter");
         }
     }
@@ -278,17 +278,17 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ReactionUserViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) {
-            super(2131559076, manageReactionsResultsAdapter);
+            super(2131559082, manageReactionsResultsAdapter);
             m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363783;
-            ImageView imageView = (ImageView) view.findViewById(2131363783);
+            int i = 2131363824;
+            ImageView imageView = (ImageView) view.findViewById(2131363824);
             if (imageView != null) {
-                i = 2131363784;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363784);
+                i = 2131363825;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363825);
                 if (simpleDraweeView != null) {
-                    i = 2131363785;
-                    TextView textView = (TextView) view.findViewById(2131363785);
+                    i = 2131363826;
+                    TextView textView = (TextView) view.findViewById(2131363826);
                     if (textView != null) {
                         WidgetManageReactionsResultUserBinding widgetManageReactionsResultUserBinding = new WidgetManageReactionsResultUserBinding((RelativeLayout) view, imageView, simpleDraweeView, textView);
                         m.checkNotNullExpressionValue(widgetManageReactionsResultUserBinding, "WidgetManageReactionsRes…serBinding.bind(itemView)");
@@ -313,7 +313,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple
                     str = reactionUserItem.getUser().getUsername();
                 }
                 textView.setText(str);
-                SimpleDraweeView simpleDraweeView = this.binding.f1827c;
+                SimpleDraweeView simpleDraweeView = this.binding.f1829c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.manageReactionsResultUserAvatar");
                 IconUtils.setIcon$default(simpleDraweeView, reactionUserItem.getUser(), 2131165296, null, null, reactionUserItem.getGuildMember(), 24, null);
                 ImageView imageView = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java
index 3d36e97693..947614385a 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java
@@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetManageReactions$binding$2 extends k imp
 
     public final WidgetManageReactionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363780;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363780);
+        int i = 2131363821;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363821);
         if (recyclerView != null) {
-            i = 2131363786;
-            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363786);
+            i = 2131363827;
+            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363827);
             if (recyclerView2 != null) {
                 return new WidgetManageReactionsBinding((CoordinatorLayout) view, recyclerView, recyclerView2);
             }
diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java
index 4f06b1d1b1..235c78701a 100644
--- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java
+++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java
@@ -57,7 +57,7 @@ public final class WidgetManageReactions extends AppFragment {
     }
 
     public WidgetManageReactions() {
-        super(2131559072);
+        super(2131559078);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetManageReactions widgetManageReactions, ManageReactionsModel manageReactionsModel) {
@@ -110,7 +110,7 @@ public final class WidgetManageReactions extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131892520);
+        setActionBarTitle(2131892599);
         if (this.modelProvider == null) {
             this.modelProvider = new ManageReactionsModelProvider(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0), getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_MESSAGE_ID", 0), getMostRecentIntent().getStringExtra("com.discord.intent.extra.EXTRA_EMOJI_KEY"), null, null, null, 56, null);
         }
@@ -118,7 +118,7 @@ public final class WidgetManageReactions extends AppFragment {
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.manageReactionsEmojisRecycler");
         this.emojisAdapter = (ManageReactionsEmojisAdapter) companion.configure(new ManageReactionsEmojisAdapter(recyclerView));
-        RecyclerView recyclerView2 = getBinding().f1825c;
+        RecyclerView recyclerView2 = getBinding().f1827c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.manageReactionsResultsRecycler");
         this.resultsAdapter = (ManageReactionsResultsAdapter) companion.configure(new ManageReactionsResultsAdapter(recyclerView2));
         ManageReactionsEmojisAdapter manageReactionsEmojisAdapter = this.emojisAdapter;
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.java
index 9ef1a66238..c6ebaba946 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$get$1.java
@@ -31,9 +31,9 @@ public final class ChatTypingModel$Companion$get$1<T, R> implements b<Channel, O
 
             public final ChatTypingModel.Typing call(List<? extends CharSequence> list, Integer num) {
                 m.checkNotNullExpressionValue(list, "typingUsers");
-                int t = this.this$0.$channel.t();
+                int u = this.this$0.$channel.u();
                 m.checkNotNullExpressionValue(num, "cooldownSecs");
-                return new ChatTypingModel.Typing(list, t, num.intValue());
+                return new ChatTypingModel.Typing(list, u, num.intValue());
             }
         }
 
@@ -42,11 +42,11 @@ public final class ChatTypingModel$Companion$get$1<T, R> implements b<Channel, O
         }
 
         public final Observable<? extends ChatTypingModel> call(GuildVerificationLevel guildVerificationLevel) {
-            return guildVerificationLevel.compareTo(GuildVerificationLevel.NONE) > 0 ? new j(ChatTypingModel.Hide.INSTANCE) : Observable.j(ChatTypingModel.Companion.access$getTypingUsers(ChatTypingModel.Companion, this.$channel), StoreStream.Companion.getSlowMode().getCooldownSecs(Long.valueOf(this.$channel.g())), new AnonymousClass1(this));
+            return guildVerificationLevel.compareTo(GuildVerificationLevel.NONE) > 0 ? new j(ChatTypingModel.Hide.INSTANCE) : Observable.j(ChatTypingModel.Companion.access$getTypingUsers(ChatTypingModel.Companion, this.$channel), StoreStream.Companion.getSlowMode().getCooldownSecs(Long.valueOf(this.$channel.h())), new AnonymousClass1(this));
         }
     }
 
     public final Observable<? extends ChatTypingModel> call(Channel channel) {
-        return channel == null ? new j(ChatTypingModel.Hide.INSTANCE) : GuildVerificationLevelUtils.observeVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.e(), null, null, null, 14, null).Z(new AnonymousClass1(channel));
+        return channel == null ? new j(ChatTypingModel.Hide.INSTANCE) : GuildVerificationLevelUtils.observeVerificationLevelTriggered$default(GuildVerificationLevelUtils.INSTANCE, channel.f(), null, null, null, 14, null).Y(new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.java
index 12a8836272..41e391df61 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.java
@@ -7,6 +7,6 @@ public final class ChatTypingModel$Companion$getTarget$1<T, R> implements b<Chan
     public static final ChatTypingModel$Companion$getTarget$1 INSTANCE = new ChatTypingModel$Companion$getTarget$1();
 
     public final Object[] call(Channel channel) {
-        return channel != null ? new Object[]{Long.valueOf(channel.g()), Long.valueOf(channel.e()), Integer.valueOf(channel.t())} : new Object[0];
+        return channel != null ? new Object[]{Long.valueOf(channel.h()), Long.valueOf(channel.f()), Integer.valueOf(channel.u())} : new Object[0];
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.java
index 4a487783a3..3119efffed 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTypingUsers$1.java
@@ -57,6 +57,6 @@ public final class ChatTypingModel$Companion$getTypingUsers$1<T, R> implements b
         StoreStream.Companion companion = StoreStream.Companion;
         StoreUser users = companion.getUsers();
         m.checkNotNullExpressionValue(set, "userIds");
-        return Observable.j(users.observeUsers(set), companion.getGuilds().observeComputed(this.$channel.e(), set), AnonymousClass1.INSTANCE);
+        return Observable.j(users.observeUsers(set), companion.getGuilds().observeComputed(this.$channel.f(), set), AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java
index 686c713faa..f3ab8bda09 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/ChatTypingModel.java
@@ -28,21 +28,21 @@ public abstract class ChatTypingModel {
 
         private final Observable<Channel> getTarget() {
             Observable<Channel> observeSelectedChannel = StoreStream.Companion.getChannelsSelected().observeSelectedChannel();
-            Observable<Channel> i02 = Observable.i0(new r(observeSelectedChannel.i, new u0(ChatTypingModel$Companion$getTarget$1.INSTANCE)));
-            m.checkNotNullExpressionValue(i02, "StoreStream\n        .get…?: emptyArray()\n        }");
-            return i02;
+            Observable<Channel> h02 = Observable.h0(new r(observeSelectedChannel.i, new u0(ChatTypingModel$Companion$getTarget$1.INSTANCE)));
+            m.checkNotNullExpressionValue(h02, "StoreStream\n        .get…?: emptyArray()\n        }");
+            return h02;
         }
 
         private final Observable<List<CharSequence>> getTypingUsers(Channel channel) {
-            Observable<List<CharSequence>> s2 = StoreStream.Companion.getUsersTyping().observeTypingUsers(channel.g()).Z(new ChatTypingModel$Companion$getTypingUsers$1(channel)).G(ChatTypingModel$Companion$getTypingUsers$2.INSTANCE).s();
-            m.checkNotNullExpressionValue(s2, "StoreStream\n          .g…  .distinctUntilChanged()");
-            return s2;
+            Observable<List<CharSequence>> r = StoreStream.Companion.getUsersTyping().observeTypingUsers(channel.h()).Y(new ChatTypingModel$Companion$getTypingUsers$1(channel)).F(ChatTypingModel$Companion$getTypingUsers$2.INSTANCE).r();
+            m.checkNotNullExpressionValue(r, "StoreStream\n          .g…  .distinctUntilChanged()");
+            return r;
         }
 
         public final Observable<ChatTypingModel> get() {
-            Observable<ChatTypingModel> s2 = getTarget().Z(ChatTypingModel$Companion$get$1.INSTANCE).s();
-            m.checkNotNullExpressionValue(s2, "getTarget()\n          .s…  .distinctUntilChanged()");
-            return s2;
+            Observable<ChatTypingModel> r = getTarget().Y(ChatTypingModel$Companion$get$1.INSTANCE).r();
+            m.checkNotNullExpressionValue(r, "getTarget()\n          .s…  .distinctUntilChanged()");
+            return r;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java
index c3198e00cd..956842fbbf 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$OldMessageModel$Companion$get$1.java
@@ -38,8 +38,8 @@ public final class WidgetChatOverlay$OldMessageModel$Companion$get$1<T, R> imple
             StoreStream.Companion companion = StoreStream.Companion;
             StoreMessages messages = companion.getMessages();
             m.checkNotNullExpressionValue(l, "selectedChannelId");
-            observable = Observable.j(messages.observeIsDetached(l.longValue()), companion.getChat().observeInteractionState().y(new WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1(l)).o(200, TimeUnit.MILLISECONDS), WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.INSTANCE);
+            observable = Observable.j(messages.observeIsDetached(l.longValue()), companion.getChat().observeInteractionState().x(new WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$1(l)).o(200, TimeUnit.MILLISECONDS), WidgetChatOverlay$OldMessageModel$Companion$get$1$isViewingOldMessagesObs$2.INSTANCE);
         }
-        return Observable.m(new j(Boolean.FALSE), observable).s().G(new AnonymousClass1(l));
+        return Observable.m(new j(Boolean.FALSE), observable).r().F(new AnonymousClass1(l));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java
index cabce7b272..88e55610a5 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java
@@ -1,13 +1,12 @@
 package com.discord.widgets.chat.overlay;
 
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import c.a.i.g4;
+import c.a.i.j4;
 import com.discord.databinding.WidgetChatOverlayBinding;
 import com.discord.views.sticker.StickerView;
 import com.discord.views.typing.TypingDots;
@@ -25,51 +24,43 @@ public final /* synthetic */ class WidgetChatOverlay$binding$2 extends k impleme
 
     public final WidgetChatOverlayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362594;
-        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362594);
+        int i = 2131362607;
+        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362607);
         if (floatingActionButton != null) {
-            i = 2131362595;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362595);
+            i = 2131362608;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362608);
             if (relativeLayout != null) {
-                i = 2131362596;
-                TypingDots typingDots = (TypingDots) view.findViewById(2131362596);
+                i = 2131362609;
+                TypingDots typingDots = (TypingDots) view.findViewById(2131362609);
                 if (typingDots != null) {
-                    i = 2131362600;
-                    TextView textView = (TextView) view.findViewById(2131362600);
+                    i = 2131362613;
+                    TextView textView = (TextView) view.findViewById(2131362613);
                     if (textView != null) {
-                        i = 2131362601;
-                        ImageView imageView = (ImageView) view.findViewById(2131362601);
+                        i = 2131362614;
+                        ImageView imageView = (ImageView) view.findViewById(2131362614);
                         if (imageView != null) {
-                            i = 2131362602;
-                            TextView textView2 = (TextView) view.findViewById(2131362602);
+                            i = 2131362615;
+                            TextView textView2 = (TextView) view.findViewById(2131362615);
                             if (textView2 != null) {
-                                i = 2131365120;
-                                View findViewById = view.findViewById(2131365120);
+                                i = 2131365175;
+                                View findViewById = view.findViewById(2131365175);
                                 if (findViewById != null) {
-                                    int i2 = 2131362494;
-                                    StickerView stickerView = (StickerView) findViewById.findViewById(2131362494);
+                                    int i2 = 2131362509;
+                                    StickerView stickerView = (StickerView) findViewById.findViewById(2131362509);
                                     if (stickerView != null) {
-                                        i2 = 2131362495;
-                                        StickerView stickerView2 = (StickerView) findViewById.findViewById(2131362495);
+                                        i2 = 2131362510;
+                                        StickerView stickerView2 = (StickerView) findViewById.findViewById(2131362510);
                                         if (stickerView2 != null) {
-                                            i2 = 2131362496;
-                                            StickerView stickerView3 = (StickerView) findViewById.findViewById(2131362496);
+                                            i2 = 2131362511;
+                                            StickerView stickerView3 = (StickerView) findViewById.findViewById(2131362511);
                                             if (stickerView3 != null) {
-                                                i2 = 2131362497;
-                                                StickerView stickerView4 = (StickerView) findViewById.findViewById(2131362497);
+                                                i2 = 2131362512;
+                                                StickerView stickerView4 = (StickerView) findViewById.findViewById(2131362512);
                                                 if (stickerView4 != null) {
-                                                    i2 = 2131362498;
-                                                    FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(2131362498);
-                                                    if (frameLayout != null) {
-                                                        i2 = 2131362499;
-                                                        ImageView imageView2 = (ImageView) findViewById.findViewById(2131362499);
-                                                        if (imageView2 != null) {
-                                                            i2 = 2131362500;
-                                                            ImageView imageView3 = (ImageView) findViewById.findViewById(2131362500);
-                                                            if (imageView3 != null) {
-                                                                return new WidgetChatOverlayBinding((ConstraintLayout) view, floatingActionButton, relativeLayout, typingDots, textView, imageView, textView2, new g4((LinearLayout) findViewById, stickerView, stickerView2, stickerView3, stickerView4, frameLayout, imageView2, imageView3));
-                                                            }
-                                                        }
+                                                    i2 = 2131362513;
+                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(2131362513);
+                                                    if (imageView2 != null) {
+                                                        return new WidgetChatOverlayBinding((ConstraintLayout) view, floatingActionButton, relativeLayout, typingDots, textView, imageView, textView2, new j4((LinearLayout) findViewById, stickerView, stickerView2, stickerView3, stickerView4, imageView2));
                                                     }
                                                 }
                                             }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java
index 6ced81c710..40ea4842c2 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java
@@ -11,9 +11,9 @@ import java.util.List;
 /* compiled from: WidgetChatOverlay.kt */
 public final class WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1 implements View.OnClickListener {
     public final /* synthetic */ Sticker $matchedSticker$inlined;
-    public final /* synthetic */ List $ownedStickerMatches$inlined;
     public final /* synthetic */ boolean $shouldClearTextOnSend$inlined;
     public final /* synthetic */ Sticker $sticker;
+    public final /* synthetic */ List $stickerMatches$inlined;
     public final /* synthetic */ StickerView $stickerView$inlined;
     public final /* synthetic */ WidgetChatOverlay this$0;
 
@@ -22,7 +22,7 @@ public final class WidgetChatOverlay$configureStickerSuggestions$$inlined$forEac
         this.$stickerView$inlined = stickerView;
         this.$matchedSticker$inlined = sticker2;
         this.this$0 = widgetChatOverlay;
-        this.$ownedStickerMatches$inlined = list;
+        this.$stickerMatches$inlined = list;
         this.$shouldClearTextOnSend$inlined = z2;
     }
 
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java
index ea0d2e2c71..ed6ae402f3 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java
@@ -18,6 +18,6 @@ public final class WidgetChatOverlay$flexInputViewModel$2 extends o implements F
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<FlexInputState> mo1invoke() {
-        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null);
+        return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, null, null, null, 1022, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
index 343918bb7d..0234d16190 100644
--- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
+++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java
@@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.d.g0;
-import c.a.i.g4;
+import c.a.i.j4;
 import c.d.b.a.a;
 import com.discord.api.sticker.Sticker;
 import com.discord.app.AppFragment;
@@ -67,9 +67,9 @@ public final class WidgetChatOverlay extends AppFragment {
             }
 
             public final Observable<OldMessageModel> get() {
-                Observable<R> Z = StoreStream.Companion.getChannelsSelected().observeId().s().Z(WidgetChatOverlay$OldMessageModel$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-                return Z;
+                Observable<R> Y = StoreStream.Companion.getChannelsSelected().observeId().r().Y(WidgetChatOverlay$OldMessageModel$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                return Y;
             }
         }
 
@@ -210,7 +210,7 @@ public final class WidgetChatOverlay extends AppFragment {
 
         private final CharSequence getTypingString(Resources resources, List<? extends CharSequence> list) {
             int size = list.size();
-            return size != 0 ? size != 1 ? size != 2 ? size != 3 ? c.a.l.b.h(resources, 2131893233, new Object[0], null, 4) : c.a.l.b.h(resources, 2131893893, new Object[]{list.get(0), list.get(1), list.get(2)}, null, 4) : c.a.l.b.h(resources, 2131894029, new Object[]{list.get(0), list.get(1)}, null, 4) : c.a.l.b.h(resources, 2131891669, new Object[]{list.get(0)}, null, 4) : "";
+            return size != 0 ? size != 1 ? size != 2 ? size != 3 ? c.a.l.b.h(resources, 2131893316, new Object[0], null, 4) : c.a.l.b.h(resources, 2131893993, new Object[]{list.get(0), list.get(1), list.get(2)}, null, 4) : c.a.l.b.h(resources, 2131894129, new Object[]{list.get(0), list.get(1)}, null, 4) : c.a.l.b.h(resources, 2131891738, new Object[]{list.get(0)}, null, 4) : "";
         }
 
         public final void configureUI(ChatTypingModel chatTypingModel) {
@@ -226,7 +226,7 @@ public final class WidgetChatOverlay extends AppFragment {
     }
 
     public WidgetChatOverlay() {
-        super(2131558969);
+        super(2131558972);
     }
 
     public static final /* synthetic */ void access$configureStickerSuggestions(WidgetChatOverlay widgetChatOverlay, Pair pair) {
@@ -261,32 +261,32 @@ public final class WidgetChatOverlay extends AppFragment {
         boolean booleanValue = pair.component1().booleanValue();
         FlexInputState component2 = pair.component2();
         if (!component2.i || booleanValue) {
-            g4 g4Var = getBinding().h;
-            m.checkNotNullExpressionValue(g4Var, "binding.stickersSuggestions");
-            LinearLayout linearLayout = g4Var.a;
+            j4 j4Var = getBinding().h;
+            m.checkNotNullExpressionValue(j4Var, "binding.stickersSuggestions");
+            LinearLayout linearLayout = j4Var.a;
             m.checkNotNullExpressionValue(linearLayout, "binding.stickersSuggestions.root");
             linearLayout.setVisibility(8);
             return;
         }
-        List take = u.take(getFlexInputViewModel().getMatchingStickers(component2.a, false), 4);
+        List take = u.take(getFlexInputViewModel().getMatchingStickers(component2.a), 4);
         boolean z2 = SearchUtils.INSTANCE.getQueriesFromSearchText(component2.a).size() == 1;
         if (take == null || take.isEmpty()) {
-            g4 g4Var2 = getBinding().h;
-            m.checkNotNullExpressionValue(g4Var2, "binding.stickersSuggestions");
-            LinearLayout linearLayout2 = g4Var2.a;
+            j4 j4Var2 = getBinding().h;
+            m.checkNotNullExpressionValue(j4Var2, "binding.stickersSuggestions");
+            LinearLayout linearLayout2 = j4Var2.a;
             m.checkNotNullExpressionValue(linearLayout2, "binding.stickersSuggestions.root");
             linearLayout2.setVisibility(8);
             return;
         }
         StoreStream.Companion.getExpressionSuggestions().trackExpressionSuggestionsDisplayed();
-        g4 g4Var3 = getBinding().h;
-        m.checkNotNullExpressionValue(g4Var3, "binding.stickersSuggestions");
-        LinearLayout linearLayout3 = g4Var3.a;
+        j4 j4Var3 = getBinding().h;
+        m.checkNotNullExpressionValue(j4Var3, "binding.stickersSuggestions");
+        LinearLayout linearLayout3 = j4Var3.a;
         m.checkNotNullExpressionValue(linearLayout3, "binding.stickersSuggestions.root");
         linearLayout3.setVisibility(0);
         int i = 2;
         int i2 = 0;
-        for (Object obj : n.listOf((Object[]) new StickerView[]{getBinding().h.b, getBinding().h.f96c, getBinding().h.d, getBinding().h.e})) {
+        for (Object obj : n.listOf((Object[]) new StickerView[]{getBinding().h.b, getBinding().h.f111c, getBinding().h.d, getBinding().h.e})) {
             int i3 = i2 + 1;
             if (i2 < 0) {
                 n.throwIndexOverflow();
@@ -322,22 +322,22 @@ public final class WidgetChatOverlay extends AppFragment {
         WidgetChatOverlayBinding binding = getBinding();
         m.checkNotNullExpressionValue(binding, "binding");
         this.typingIndicatorViewHolder = new TypingIndicatorViewHolder(binding);
-        g4 g4Var = getBinding().h;
-        m.checkNotNullExpressionValue(g4Var, "binding.stickersSuggestions");
-        LinearLayout linearLayout = g4Var.a;
+        j4 j4Var = getBinding().h;
+        m.checkNotNullExpressionValue(j4Var, "binding.stickersSuggestions");
+        LinearLayout linearLayout = j4Var.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.stickersSuggestions.root");
         Drawable background = linearLayout.getBackground();
         m.checkNotNullExpressionValue(background, "binding.stickersSuggestions.root.background");
         background.setAlpha(216);
         getBinding().h.f.setOnClickListener(WidgetChatOverlay$onViewBoundOrOnResume$1.INSTANCE);
         getBinding().b.setOnClickListener(WidgetChatOverlay$onViewBoundOrOnResume$2.INSTANCE);
-        Observable<OldMessageModel> s2 = OldMessageModel.Companion.get().s();
-        m.checkNotNullExpressionValue(s2, "OldMessageModel.get()\n  …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetChatOverlay.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatOverlay$onViewBoundOrOnResume$3(this), 62, (Object) null);
-        Observable s3 = ObservableExtensionsKt.computationLatest(ChatTypingModel.Companion.get()).s();
-        m.checkNotNullExpressionValue(s3, "ChatTypingModel\n        …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s3, this, null, 2, null), WidgetChatOverlay.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatOverlay$onViewBoundOrOnResume$4(this), 62, (Object) null);
-        Observable j = Observable.j(StoreStream.Companion.getAutocomplete().observeAutocompleteVisibility().s(), getFlexInputViewModel().observeState().s(), WidgetChatOverlay$onViewBoundOrOnResume$5.INSTANCE);
+        Observable<OldMessageModel> r = OldMessageModel.Companion.get().r();
+        m.checkNotNullExpressionValue(r, "OldMessageModel.get()\n  …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetChatOverlay.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatOverlay$onViewBoundOrOnResume$3(this), 62, (Object) null);
+        Observable r2 = ObservableExtensionsKt.computationLatest(ChatTypingModel.Companion.get()).r();
+        m.checkNotNullExpressionValue(r2, "ChatTypingModel\n        …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r2, this, null, 2, null), WidgetChatOverlay.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatOverlay$onViewBoundOrOnResume$4(this), 62, (Object) null);
+        Observable j = Observable.j(StoreStream.Companion.getAutocomplete().observeAutocompleteVisibility().r(), getFlexInputViewModel().observeState().r(), WidgetChatOverlay$onViewBoundOrOnResume$5.INSTANCE);
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…isible, flexInputState) }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(j, this, null, 2, null), WidgetChatOverlay.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatOverlay$onViewBoundOrOnResume$6(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java
index aa908b371f..63677cbd23 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java
@@ -3,10 +3,10 @@ package com.discord.widgets.chat.pins;
 import android.content.Context;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.embed.InviteEmbedModel;
 import com.discord.widgets.chat.list.entries.DividerEntry;
@@ -43,7 +43,7 @@ public final class WidgetChannelPinnedMessages$Model$Companion$get$1<T1, T2, T3,
         if (list2 == null) {
             listOf = m.listOf(new LoadingEntry());
         } else if (list.isEmpty()) {
-            String string = this.$context.getString(AnimatableValueParser.r1(this.$channel) ? 2131891407 : 2131891406);
+            String string = this.$context.getString(AnimatableValueParser.s1(this.$channel) ? 2131891478 : 2131891477);
             d0.z.d.m.checkNotNullExpressionValue(string, "context.getString(\n     …}\n                      )");
             listOf = m.listOf(new EmptyPinsEntry(string));
         } else {
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java
index 43e4fc11af..d84fead2c6 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetChannelPinnedMessages$binding$2 extends
 
     public final WidgetChannelPinnedMessagesBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362317);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362328);
         if (recyclerView != null) {
             return new WidgetChannelPinnedMessagesBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362317)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362328)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java
index ef284cb04f..99c6828bba 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java
@@ -6,11 +6,11 @@ import c.a.d.l;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.activity.MessageActivityType;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
+import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreChat;
 import com.discord.stores.StoreStream;
@@ -88,7 +88,7 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
     public void onMessageClicked(Message message, boolean z2) {
         m.checkNotNullParameter(message, "message");
-        StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r());
+        StoreStream.Companion.getMessagesLoader().jumpToMessage(message.getChannelId(), message.getId());
         l.c(this.this$0.requireContext(), false, null, 6);
     }
 
@@ -99,7 +99,7 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh
         WidgetChatListActions.Companion companion = WidgetChatListActions.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        companion.showForPin(parentFragmentManager, message.i(), message.r(), charSequence);
+        companion.showForPin(parentFragmentManager, message.getChannelId(), message.getId(), charSequence);
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
@@ -147,7 +147,7 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh
     public void onStickerClicked(Message message, BaseSticker baseSticker) {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(baseSticker, "sticker");
-        StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r());
+        StoreStream.Companion.getMessagesLoader().jumpToMessage(message.getChannelId(), message.getId());
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
index 402681c56e..f387843ce2 100644
--- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
+++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
@@ -87,7 +87,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Channel findChannelByIdInternal$app_productionGoogleRelease = companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(j);
                 if (findChannelByIdInternal$app_productionGoogleRelease != null) {
-                    Observable<Model> c2 = Observable.c(companion.getUsers().observeMeId(), companion.getPinnedMessages().observeForChannel(j), companion.getGuilds().observeRoles(findChannelByIdInternal$app_productionGoogleRelease.e()), companion.getGuilds().observeComputed(findChannelByIdInternal$app_productionGoogleRelease.e()), companion.getChannels().observeNames(), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null), companion.getGuilds().observeGuild(findChannelByIdInternal$app_productionGoogleRelease.e()), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChannelPinnedMessages$Model$Companion$get$1(context, findChannelByIdInternal$app_productionGoogleRelease));
+                    Observable<Model> c2 = Observable.c(companion.getUsers().observeMeId(), companion.getPinnedMessages().observeForChannel(j), companion.getGuilds().observeRoles(findChannelByIdInternal$app_productionGoogleRelease.f()), companion.getGuilds().observeComputed(findChannelByIdInternal$app_productionGoogleRelease.f()), companion.getChannels().observeNames(), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null), companion.getGuilds().observeGuild(findChannelByIdInternal$app_productionGoogleRelease.f()), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChannelPinnedMessages$Model$Companion$get$1(context, findChannelByIdInternal$app_productionGoogleRelease));
                     m.checkNotNullExpressionValue(c2, "Observable\n            .… myRoleIds)\n            }");
                     return c2;
                 }
@@ -119,7 +119,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
         public /* synthetic */ Model(Channel channel, Guild guild, long j, Map map, List list, Set set, long j2, long j3, long j4, long j5, boolean z2, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this(channel, guild, j, map, list, set, (i & 64) != 0 ? channel.g() : j2, (i & 128) != 0 ? channel.e() : j3, (i & 256) != 0 ? 0 : j4, (i & 512) != 0 ? 0 : j5, (i & 1024) != 0 ? false : z2);
+            this(channel, guild, j, map, list, set, (i & 64) != 0 ? channel.h() : j2, (i & 128) != 0 ? channel.f() : j3, (i & 256) != 0 ? 0 : j4, (i & 512) != 0 ? 0 : j5, (i & 1024) != 0 ? false : z2);
         }
 
         public static /* synthetic */ Model copy$default(Model model, Channel channel, Guild guild, long j, Map map, List list, Set set, long j2, long j3, long j4, long j5, boolean z2, int i, Object obj) {
@@ -297,7 +297,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
     }
 
     public WidgetChannelPinnedMessages() {
-        super(2131558873);
+        super(2131558876);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChannelPinnedMessages widgetChannelPinnedMessages, Model model) {
@@ -343,7 +343,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891893);
+        setActionBarTitle(2131891965);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.channelPinnedMessagesRecycler");
@@ -355,9 +355,9 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> s2 = Model.Companion.get(requireContext(), getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", 0)).s();
-        m.checkNotNullExpressionValue(s2, "Model\n        .get(requi…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetChannelPinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelPinnedMessages$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<Model> r = Model.Companion.get(requireContext(), getMostRecentIntent().getLongExtra("INTENT_EXTRA_CHANNEL_ID", 0)).r();
+        m.checkNotNullExpressionValue(r, "Model\n        .get(requi…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetChannelPinnedMessages.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelPinnedMessages$onViewBoundOrOnResume$1(this), 62, (Object) null);
         WidgetChatListAdapter widgetChatListAdapter = this.adapter;
         if (widgetChatListAdapter != null) {
             widgetChatListAdapter.setHandlers();
diff --git a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java
index 74f8eeb91c..143c5e53b1 100644
--- a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetClientOutdated$binding$2 extends k impl
 
     public final WidgetClientOutdatedBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362626;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362626);
+        int i = 2131362650;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362650);
         if (linearLayout != null) {
-            i = 2131362627;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362627);
+            i = 2131362651;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362651);
             if (materialButton != null) {
                 return new WidgetClientOutdatedBinding((RelativeLayout) view, linearLayout, materialButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java
index 55c9f11e27..16233d216c 100644
--- a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java
+++ b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java
@@ -35,7 +35,7 @@ public final class WidgetClientOutdated extends AppFragment {
     }
 
     public WidgetClientOutdated() {
-        super(2131558975);
+        super(2131558979);
     }
 
     private final WidgetClientOutdatedBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java b/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java
index 9f342d90dc..b87a5c2e21 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java
@@ -58,14 +58,14 @@ public final class AddFriendsFailed extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader");
-        textView.setText(b.j(this, 2131888799, new Object[0], null, 4));
+        textView.setText(b.j(this, 2131888800, new Object[0], null, 4));
         TextView textView2 = getBinding().e;
         m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText");
-        textView2.setText(b.j(this, 2131888797, new Object[0], null, 4));
-        MaterialButton materialButton = getBinding().f1649c;
+        textView2.setText(b.j(this, 2131888798, new Object[0], null, 4));
+        MaterialButton materialButton = getBinding().f1646c;
         m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm");
-        materialButton.setText(b.j(this, 2131891666, new Object[0], null, 4));
-        getBinding().f1649c.setOnClickListener(new AddFriendsFailed$onViewBound$1(this));
+        materialButton.setText(b.j(this, 2131891735, new Object[0], null, 4));
+        getBinding().f1646c.setOnClickListener(new AddFriendsFailed$onViewBound$1(this));
         MaterialButton materialButton2 = getBinding().b;
         m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationCancel");
         materialButton2.setVisibility(8);
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java
index da710f716d..e5f10b9ab7 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java
@@ -40,21 +40,21 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap
             super(2131558793, contactSyncFriendSuggestionListAdapter);
             m.checkNotNullParameter(contactSyncFriendSuggestionListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363228;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363228);
+            int i = 2131363253;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363253);
             if (simpleDraweeView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131363230;
-                TextView textView = (TextView) view.findViewById(2131363230);
+                i = 2131363255;
+                TextView textView = (TextView) view.findViewById(2131363255);
                 if (textView != null) {
-                    i = 2131363231;
-                    TextView textView2 = (TextView) view.findViewById(2131363231);
+                    i = 2131363256;
+                    TextView textView2 = (TextView) view.findViewById(2131363256);
                     if (textView2 != null) {
-                        i = 2131363232;
-                        TextView textView3 = (TextView) view.findViewById(2131363232);
+                        i = 2131363257;
+                        TextView textView3 = (TextView) view.findViewById(2131363257);
                         if (textView3 != null) {
-                            i = 2131363233;
-                            MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131363233);
+                            i = 2131363258;
+                            MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131363258);
                             if (materialCheckBox != null) {
                                 ViewSelectableFriendSuggestionBinding viewSelectableFriendSuggestionBinding = new ViewSelectableFriendSuggestionBinding(constraintLayout, simpleDraweeView, constraintLayout, textView, textView2, textView3, materialCheckBox);
                                 m.checkNotNullExpressionValue(viewSelectableFriendSuggestionBinding, "ViewSelectableFriendSugg…ionBinding.bind(itemView)");
@@ -81,10 +81,10 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap
             WidgetContactSyncViewModel.Item.FriendSuggestionItem friendSuggestionItem = (WidgetContactSyncViewModel.Item.FriendSuggestionItem) item;
             FriendSuggestion suggestion = friendSuggestionItem.getSuggestion();
             User b = suggestion.b();
-            ConstraintLayout constraintLayout = this.binding.f1659c;
+            ConstraintLayout constraintLayout = this.binding.f1656c;
             m.checkNotNullExpressionValue(constraintLayout, "binding.friendSuggestionContainer");
             int paddingLeft = constraintLayout.getPaddingLeft();
-            ConstraintLayout constraintLayout2 = this.binding.f1659c;
+            ConstraintLayout constraintLayout2 = this.binding.f1656c;
             m.checkNotNullExpressionValue(constraintLayout2, "binding.friendSuggestionContainer");
             int i2 = 0;
             constraintLayout.setPadding(paddingLeft, 0, constraintLayout2.getPaddingRight(), ContactSyncFriendSuggestionListAdapter.access$getSpacing$p((ContactSyncFriendSuggestionListAdapter) this.adapter));
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java
index 3348b654e4..3b5eabc774 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet$binding$2.java
@@ -19,26 +19,26 @@ public final /* synthetic */ class ContactSyncPermissionsSheet$binding$2 extends
 
     public final ContactSyncPermissionsSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362717;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362717);
+        int i = 2131362741;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362741);
         if (checkedSetting != null) {
-            i = 2131362718;
-            TextView textView = (TextView) view.findViewById(2131362718);
+            i = 2131362742;
+            TextView textView = (TextView) view.findViewById(2131362742);
             if (textView != null) {
-                i = 2131362719;
-                TextView textView2 = (TextView) view.findViewById(2131362719);
+                i = 2131362743;
+                TextView textView2 = (TextView) view.findViewById(2131362743);
                 if (textView2 != null) {
-                    i = 2131362720;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362720);
+                    i = 2131362744;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362744);
                     if (checkedSetting2 != null) {
-                        i = 2131362721;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362721);
+                        i = 2131362745;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362745);
                         if (linkifiedTextView != null) {
-                            i = 2131362722;
-                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362722);
+                            i = 2131362746;
+                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362746);
                             if (checkedSetting3 != null) {
-                                i = 2131362723;
-                                TextView textView3 = (TextView) view.findViewById(2131362723);
+                                i = 2131362747;
+                                TextView textView3 = (TextView) view.findViewById(2131362747);
                                 if (textView3 != null) {
                                     return new ContactSyncPermissionsSheetBinding((ConstraintLayout) view, checkedSetting, textView, textView2, checkedSetting2, linkifiedTextView, checkedSetting3, textView3);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java
index c921cb5acb..e925648304 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java
@@ -66,15 +66,15 @@ public final class ContactSyncPermissionsSheet extends AppBottomSheet {
         CheckedSetting checkedSetting2 = getBinding().e;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncPermissionsPhoneToggle");
         checkedSetting2.setChecked(viewState.getAllowPhone());
-        CheckedSetting checkedSetting3 = getBinding().f1603c;
+        CheckedSetting checkedSetting3 = getBinding().f1599c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncPermissionsEmailToggle");
         checkedSetting3.setChecked(viewState.getAllowEmail());
         LinkifiedTextView linkifiedTextView = getBinding().d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncPermissionsLearnMore");
-        b.m(linkifiedTextView, 2131887576, new Object[0], new ContactSyncPermissionsSheet$configureUI$1(this));
+        b.l(linkifiedTextView, 2131887576, new Object[0], new ContactSyncPermissionsSheet$configureUI$1(this));
         getBinding().b.e(new ContactSyncPermissionsSheet$configureUI$2(this, z2));
         getBinding().e.e(new ContactSyncPermissionsSheet$configureUI$3(this, viewState));
-        getBinding().f1603c.e(new ContactSyncPermissionsSheet$configureUI$4(this, viewState));
+        getBinding().f1599c.e(new ContactSyncPermissionsSheet$configureUI$4(this, viewState));
     }
 
     private final ContactSyncPermissionsSheetBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java
index 3614d59104..e09e194862 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet$binding$2.java
@@ -20,23 +20,23 @@ public final /* synthetic */ class ContactSyncUpsellSheet$binding$2 extends k im
 
     public final ContactSyncUpsellSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362737;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362737);
+        int i = 2131362761;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362761);
         if (linearLayout != null) {
-            i = 2131362738;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362738);
+            i = 2131362762;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362762);
             if (materialButton != null) {
-                i = 2131362739;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362739);
+                i = 2131362763;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362763);
                 if (materialButton2 != null) {
-                    i = 2131362740;
-                    TextView textView = (TextView) view.findViewById(2131362740);
+                    i = 2131362764;
+                    TextView textView = (TextView) view.findViewById(2131362764);
                     if (textView != null) {
-                        i = 2131362741;
-                        TextView textView2 = (TextView) view.findViewById(2131362741);
+                        i = 2131362765;
+                        TextView textView2 = (TextView) view.findViewById(2131362765);
                         if (textView2 != null) {
-                            i = 2131362742;
-                            View findViewById = view.findViewById(2131362742);
+                            i = 2131362766;
+                            View findViewById = view.findViewById(2131362766);
                             if (findViewById != null) {
                                 return new ContactSyncUpsellSheetBinding((ConstraintLayout) view, linearLayout, materialButton, materialButton2, textView, textView2, g0.a(findViewById));
                             }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java
index 1a16f07f09..9f2a8b63ca 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java
@@ -63,14 +63,14 @@ public final class ContactSyncUpsellSheet extends AppBottomSheet {
 
     private final void configureUI(WidgetContactSyncViewModel.ViewState viewState) {
         boolean z2 = viewState.getAllowPhone() || viewState.getAllowEmail();
-        CheckedSetting checkedSetting = getBinding().d.f93c;
+        CheckedSetting checkedSetting = getBinding().d.f94c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncUpsel…ontactSyncDiscoveryToggle");
         checkedSetting.setChecked(z2);
-        getBinding().d.f93c.e(new ContactSyncUpsellSheet$configureUI$1(this, z2));
+        getBinding().d.f94c.e(new ContactSyncUpsellSheet$configureUI$1(this, z2));
         LinkifiedTextView linkifiedTextView = getBinding().d.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncUpsel…contactSyncDiscoveryInfo2");
-        b.m(linkifiedTextView, 2131887576, new Object[0], new ContactSyncUpsellSheet$configureUI$2(this));
-        getBinding().f1604c.setOnClickListener(new ContactSyncUpsellSheet$configureUI$3(this));
+        b.l(linkifiedTextView, 2131887576, new Object[0], new ContactSyncUpsellSheet$configureUI$2(this));
+        getBinding().f1600c.setOnClickListener(new ContactSyncUpsellSheet$configureUI$3(this));
         getBinding().b.setOnClickListener(new ContactSyncUpsellSheet$configureUI$4(this, viewState));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java
index c50980ca09..3d588d2b6b 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$binding$2.java
@@ -35,123 +35,123 @@ public final /* synthetic */ class WidgetContactSync$binding$2 extends k impleme
 
     public final WidgetContactSyncBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362692;
-        View findViewById = view.findViewById(2131362692);
+        int i = 2131362716;
+        View findViewById = view.findViewById(2131362716);
         if (findViewById != null) {
-            int i2 = 2131362693;
-            PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) findViewById.findViewById(2131362693);
+            int i2 = 2131362717;
+            PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) findViewById.findViewById(2131362717);
             if (phoneOrEmailInputView != null) {
-                i2 = 2131362694;
-                MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131362694);
+                i2 = 2131362718;
+                MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131362718);
                 if (materialButton != null) {
-                    i2 = 2131362695;
-                    TextView textView = (TextView) findViewById.findViewById(2131362695);
+                    i2 = 2131362719;
+                    TextView textView = (TextView) findViewById.findViewById(2131362719);
                     if (textView != null) {
-                        i2 = 2131362696;
-                        TextView textView2 = (TextView) findViewById.findViewById(2131362696);
+                        i2 = 2131362720;
+                        TextView textView2 = (TextView) findViewById.findViewById(2131362720);
                         if (textView2 != null) {
                             b0 b0Var = new b0((ConstraintLayout) findViewById, phoneOrEmailInputView, materialButton, textView, textView2);
-                            i = 2131362700;
-                            View findViewById2 = view.findViewById(2131362700);
+                            i = 2131362724;
+                            View findViewById2 = view.findViewById(2131362724);
                             if (findViewById2 != null) {
-                                int i3 = 2131362732;
-                                RecyclerView recyclerView = (RecyclerView) findViewById2.findViewById(2131362732);
+                                int i3 = 2131362756;
+                                RecyclerView recyclerView = (RecyclerView) findViewById2.findViewById(2131362756);
                                 if (recyclerView != null) {
-                                    i3 = 2131362734;
-                                    LoadingButton loadingButton = (LoadingButton) findViewById2.findViewById(2131362734);
+                                    i3 = 2131362758;
+                                    LoadingButton loadingButton = (LoadingButton) findViewById2.findViewById(2131362758);
                                     if (loadingButton != null) {
-                                        i3 = 2131362735;
-                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById2.findViewById(2131362735);
+                                        i3 = 2131362759;
+                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById2.findViewById(2131362759);
                                         if (linkifiedTextView != null) {
-                                            i3 = 2131362736;
-                                            TextView textView3 = (TextView) findViewById2.findViewById(2131362736);
+                                            i3 = 2131362760;
+                                            TextView textView3 = (TextView) findViewById2.findViewById(2131362760);
                                             if (textView3 != null) {
                                                 e0 e0Var = new e0((ConstraintLayout) findViewById2, recyclerView, loadingButton, linkifiedTextView, textView3);
-                                                i = 2131362701;
-                                                View findViewById3 = view.findViewById(2131362701);
+                                                i = 2131362725;
+                                                View findViewById3 = view.findViewById(2131362725);
                                                 if (findViewById3 != null) {
-                                                    int i4 = 2131362729;
-                                                    TextView textView4 = (TextView) findViewById3.findViewById(2131362729);
+                                                    int i4 = 2131362753;
+                                                    TextView textView4 = (TextView) findViewById3.findViewById(2131362753);
                                                     if (textView4 != null) {
-                                                        i4 = 2131362730;
-                                                        TextView textView5 = (TextView) findViewById3.findViewById(2131362730);
+                                                        i4 = 2131362754;
+                                                        TextView textView5 = (TextView) findViewById3.findViewById(2131362754);
                                                         if (textView5 != null) {
-                                                            i4 = 2131362731;
-                                                            MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(2131362731);
+                                                            i4 = 2131362755;
+                                                            MaterialButton materialButton2 = (MaterialButton) findViewById3.findViewById(2131362755);
                                                             if (materialButton2 != null) {
-                                                                i4 = 2131362733;
-                                                                MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131362733);
+                                                                i4 = 2131362757;
+                                                                MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131362757);
                                                                 if (materialButton3 != null) {
                                                                     f0 f0Var = new f0((ConstraintLayout) findViewById3, textView4, textView5, materialButton2, materialButton3);
-                                                                    i = 2131362702;
-                                                                    View findViewById4 = view.findViewById(2131362702);
+                                                                    i = 2131362726;
+                                                                    View findViewById4 = view.findViewById(2131362726);
                                                                     if (findViewById4 != null) {
-                                                                        int i5 = 2131362703;
-                                                                        LinearLayout linearLayout = (LinearLayout) findViewById4.findViewById(2131362703);
+                                                                        int i5 = 2131362727;
+                                                                        LinearLayout linearLayout = (LinearLayout) findViewById4.findViewById(2131362727);
                                                                         if (linearLayout != null) {
-                                                                            i5 = 2131362704;
-                                                                            TextView textView6 = (TextView) findViewById4.findViewById(2131362704);
+                                                                            i5 = 2131362728;
+                                                                            TextView textView6 = (TextView) findViewById4.findViewById(2131362728);
                                                                             if (textView6 != null) {
-                                                                                i5 = 2131362705;
-                                                                                LoadingButton loadingButton2 = (LoadingButton) findViewById4.findViewById(2131362705);
+                                                                                i5 = 2131362729;
+                                                                                LoadingButton loadingButton2 = (LoadingButton) findViewById4.findViewById(2131362729);
                                                                                 if (loadingButton2 != null) {
-                                                                                    i5 = 2131362706;
-                                                                                    View findViewById5 = findViewById4.findViewById(2131362706);
+                                                                                    i5 = 2131362730;
+                                                                                    View findViewById5 = findViewById4.findViewById(2131362730);
                                                                                     if (findViewById5 != null) {
-                                                                                        i5 = 2131362707;
-                                                                                        TextView textView7 = (TextView) findViewById4.findViewById(2131362707);
+                                                                                        i5 = 2131362731;
+                                                                                        TextView textView7 = (TextView) findViewById4.findViewById(2131362731);
                                                                                         if (textView7 != null) {
-                                                                                            i5 = 2131362708;
-                                                                                            TextView textView8 = (TextView) findViewById4.findViewById(2131362708);
+                                                                                            i5 = 2131362732;
+                                                                                            TextView textView8 = (TextView) findViewById4.findViewById(2131362732);
                                                                                             if (textView8 != null) {
-                                                                                                i5 = 2131362709;
-                                                                                                View findViewById6 = findViewById4.findViewById(2131362709);
+                                                                                                i5 = 2131362733;
+                                                                                                View findViewById6 = findViewById4.findViewById(2131362733);
                                                                                                 if (findViewById6 != null) {
                                                                                                     c0 c0Var = new c0((ConstraintLayout) findViewById4, linearLayout, textView6, loadingButton2, findViewById5, textView7, textView8, g0.a(findViewById6));
-                                                                                                    View findViewById7 = view.findViewById(2131362710);
+                                                                                                    View findViewById7 = view.findViewById(2131362734);
                                                                                                     if (findViewById7 != null) {
-                                                                                                        int i6 = 2131362711;
-                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) findViewById7.findViewById(2131362711);
+                                                                                                        int i6 = 2131362735;
+                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) findViewById7.findViewById(2131362735);
                                                                                                         if (textInputEditText != null) {
-                                                                                                            i6 = 2131362712;
-                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) findViewById7.findViewById(2131362712);
+                                                                                                            i6 = 2131362736;
+                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) findViewById7.findViewById(2131362736);
                                                                                                             if (textInputLayout != null) {
-                                                                                                                i6 = 2131362713;
-                                                                                                                LoadingButton loadingButton3 = (LoadingButton) findViewById7.findViewById(2131362713);
+                                                                                                                i6 = 2131362737;
+                                                                                                                LoadingButton loadingButton3 = (LoadingButton) findViewById7.findViewById(2131362737);
                                                                                                                 if (loadingButton3 != null) {
-                                                                                                                    i6 = 2131362714;
-                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(2131362714);
+                                                                                                                    i6 = 2131362738;
+                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(2131362738);
                                                                                                                     if (textView9 != null) {
-                                                                                                                        i6 = 2131362715;
-                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(2131362715);
+                                                                                                                        i6 = 2131362739;
+                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(2131362739);
                                                                                                                         if (textView10 != null) {
-                                                                                                                            i6 = 2131362716;
-                                                                                                                            TextView textView11 = (TextView) findViewById7.findViewById(2131362716);
+                                                                                                                            i6 = 2131362740;
+                                                                                                                            TextView textView11 = (TextView) findViewById7.findViewById(2131362740);
                                                                                                                             if (textView11 != null) {
                                                                                                                                 d0 d0Var = new d0((ConstraintLayout) findViewById7, textInputEditText, textInputLayout, loadingButton3, textView9, textView10, textView11);
-                                                                                                                                View findViewById8 = view.findViewById(2131362743);
+                                                                                                                                View findViewById8 = view.findViewById(2131362767);
                                                                                                                                 if (findViewById8 != null) {
-                                                                                                                                    int i7 = 2131362744;
-                                                                                                                                    CodeVerificationView codeVerificationView = (CodeVerificationView) findViewById8.findViewById(2131362744);
+                                                                                                                                    int i7 = 2131362768;
+                                                                                                                                    CodeVerificationView codeVerificationView = (CodeVerificationView) findViewById8.findViewById(2131362768);
                                                                                                                                     if (codeVerificationView != null) {
-                                                                                                                                        i7 = 2131362745;
-                                                                                                                                        TextView textView12 = (TextView) findViewById8.findViewById(2131362745);
+                                                                                                                                        i7 = 2131362769;
+                                                                                                                                        TextView textView12 = (TextView) findViewById8.findViewById(2131362769);
                                                                                                                                         if (textView12 != null) {
-                                                                                                                                            i7 = 2131362746;
-                                                                                                                                            TextView textView13 = (TextView) findViewById8.findViewById(2131362746);
+                                                                                                                                            i7 = 2131362770;
+                                                                                                                                            TextView textView13 = (TextView) findViewById8.findViewById(2131362770);
                                                                                                                                             if (textView13 != null) {
                                                                                                                                                 h0 h0Var = new h0((ConstraintLayout) findViewById8, codeVerificationView, textView12, textView13);
-                                                                                                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362747);
+                                                                                                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362771);
                                                                                                                                                 if (appViewFlipper != null) {
                                                                                                                                                     return new WidgetContactSyncBinding((CoordinatorLayout) view, b0Var, e0Var, f0Var, c0Var, d0Var, h0Var, appViewFlipper);
                                                                                                                                                 }
-                                                                                                                                                i = 2131362747;
+                                                                                                                                                i = 2131362771;
                                                                                                                                             }
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById8.getResources().getResourceName(i7)));
                                                                                                                                 }
-                                                                                                                                i = 2131362743;
+                                                                                                                                i = 2131362767;
                                                                                                                             }
                                                                                                                         }
                                                                                                                     }
@@ -160,7 +160,7 @@ public final /* synthetic */ class WidgetContactSync$binding$2 extends k impleme
                                                                                                         }
                                                                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i6)));
                                                                                                     }
-                                                                                                    i = 2131362710;
+                                                                                                    i = 2131362734;
                                                                                                 }
                                                                                             }
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java
index 58dccd99e0..0fcbeb5f8e 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java
@@ -14,7 +14,7 @@ public final class WidgetContactSync$configureToolbar$1<T1, T2> implements Actio
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363879) {
+        if (menuItem.getItemId() == 2131363920) {
             WidgetContactSync.access$getViewModel$p(this.this$0).skip();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java
index 3584b0e7f9..f1d59af81a 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java
@@ -14,7 +14,7 @@ public final class WidgetContactSync$configureToolbar$2<T> implements Action1<Me
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363879);
+        MenuItem findItem = menu.findItem(2131363920);
         m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_contact_sync_skip)");
         findItem.setVisible(this.$toolbarConfig.getShowSkip());
     }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java
index 4a4d96aa69..dbb2c6d4ca 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$10.java
@@ -23,6 +23,6 @@ public final class WidgetContactSync$configureUI$10 implements View.OnClickListe
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        IntentUtils.performChooserSendIntent(context, b.j(this.this$0, 2131888849, new Object[]{"https://discord.com", this.$viewState.getUsername()}, null, 4).toString(), b.j(this.this$0, 2131893904, new Object[0], null, 4));
+        IntentUtils.performChooserSendIntent(context, b.j(this.this$0, 2131888850, new Object[]{"https://discord.com", this.$viewState.getUsername()}, null, 4).toString(), b.j(this.this$0, 2131894004, new Object[0], null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$3.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$3.java
index 764662f0b3..7f5fc6bb5f 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureUI$3.java
@@ -13,7 +13,7 @@ public final class WidgetContactSync$configureUI$3 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        CheckedSetting checkedSetting = WidgetContactSync.access$getBinding$p(this.this$0).e.e.f93c;
+        CheckedSetting checkedSetting = WidgetContactSync.access$getBinding$p(this.this$0).e.e.f94c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncLandi…ontactSyncDiscoveryToggle");
         boolean isChecked = checkedSetting.isChecked();
         WidgetContactSync.access$getViewModel$p(this.this$0).onPermissionsToggle(!isChecked, !isChecked);
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
index eec62b4422..4330e7561c 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync.java
@@ -118,7 +118,7 @@ public final class WidgetContactSync extends AppFragment {
     }
 
     public WidgetContactSync() {
-        super(2131558979);
+        super(2131558983);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetContactSync widgetContactSync, WidgetContactSyncViewModel.ViewState viewState) {
@@ -159,12 +159,12 @@ public final class WidgetContactSync extends AppFragment {
         this.phoneNumber = viewState.getPhoneNumber();
         configureViewFlipper(viewState.getDisplayedChild());
         configureToolbar(viewState.getToolbarConfig());
-        LoadingButton loadingButton = getBinding().e.f71c;
+        LoadingButton loadingButton = getBinding().e.f72c;
         m.checkNotNullExpressionValue(loadingButton, "binding.contactSyncLandi…tactSyncLandingNextButton");
         loadingButton.setEnabled(viewState.getLandingNextEnabled());
-        getBinding().e.f71c.setIsLoading(viewState.isSubmitting());
+        getBinding().e.f72c.setIsLoading(viewState.isSubmitting());
         getBinding().f.d.setIsLoading(viewState.isSubmitting());
-        getBinding().f1758c.f84c.setIsLoading(viewState.isSubmitting());
+        getBinding().f1759c.f83c.setIsLoading(viewState.isSubmitting());
         if (viewState.getPermissionsDenied()) {
             TextView textView = getBinding().e.b;
             m.checkNotNullExpressionValue(textView, "binding.contactSyncLandi…ncLandingNeedsPermissions");
@@ -172,8 +172,8 @@ public final class WidgetContactSync extends AppFragment {
             View view = getBinding().e.d;
             m.checkNotNullExpressionValue(view, "binding.contactSyncLandi…LandingPermissionsDivider");
             view.setVisibility(0);
-            getBinding().e.f71c.setText(b.j(this, 2131891773, new Object[0], null, 4));
-            getBinding().e.f71c.setOnClickListener(WidgetContactSync$configureUI$1.INSTANCE);
+            getBinding().e.f72c.setText(b.j(this, 2131891845, new Object[0], null, 4));
+            getBinding().e.f72c.setOnClickListener(WidgetContactSync$configureUI$1.INSTANCE);
         } else {
             TextView textView2 = getBinding().e.b;
             m.checkNotNullExpressionValue(textView2, "binding.contactSyncLandi…ncLandingNeedsPermissions");
@@ -181,25 +181,25 @@ public final class WidgetContactSync extends AppFragment {
             View view2 = getBinding().e.d;
             m.checkNotNullExpressionValue(view2, "binding.contactSyncLandi…LandingPermissionsDivider");
             view2.setVisibility(8);
-            getBinding().e.f71c.setText(b.j(this, 2131888963, new Object[0], null, 4));
-            getBinding().e.f71c.setOnClickListener(new WidgetContactSync$configureUI$2(this));
+            getBinding().e.f72c.setText(b.j(this, 2131888967, new Object[0], null, 4));
+            getBinding().e.f72c.setOnClickListener(new WidgetContactSync$configureUI$2(this));
         }
-        CheckedSetting checkedSetting = getBinding().e.e.f93c;
+        CheckedSetting checkedSetting = getBinding().e.e.f94c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncLandi…ontactSyncDiscoveryToggle");
         checkedSetting.setChecked(viewState.getAllowPhone() || viewState.getAllowEmail());
-        getBinding().e.e.f93c.e(new WidgetContactSync$configureUI$3(this));
+        getBinding().e.e.f94c.e(new WidgetContactSync$configureUI$3(this));
         LinkifiedTextView linkifiedTextView = getBinding().e.e.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncLandi…contactSyncDiscoveryInfo2");
-        b.m(linkifiedTextView, 2131887590, new Object[0], new WidgetContactSync$configureUI$4(this));
+        b.l(linkifiedTextView, 2131887590, new Object[0], new WidgetContactSync$configureUI$4(this));
         getBinding().f.d.setOnClickListener(new WidgetContactSync$configureUI$5(this));
         ContactSyncFriendSuggestionListAdapter contactSyncFriendSuggestionListAdapter = this.friendSuggestionsAdapter;
         if (contactSyncFriendSuggestionListAdapter != null) {
             contactSyncFriendSuggestionListAdapter.setData(viewState.getFriendSuggestions());
         }
-        getBinding().f1758c.f84c.setOnClickListener(new WidgetContactSync$configureUI$6(this));
+        getBinding().f1759c.f83c.setOnClickListener(new WidgetContactSync$configureUI$6(this));
         getBinding().b.b.b(this);
         getBinding().b.b.setCountryCode(viewState.getCountryCode());
-        getBinding().b.f65c.setOnClickListener(new WidgetContactSync$configureUI$7(this));
+        getBinding().b.f66c.setOnClickListener(new WidgetContactSync$configureUI$7(this));
         getBinding().b.b.a(this, new WidgetContactSync$configureUI$8(this));
         getBinding().g.b.setOnCodeEntered(new WidgetContactSync$configureUI$9(this));
         getBinding().d.b.setOnClickListener(new WidgetContactSync$configureUI$10(this, viewState));
@@ -295,11 +295,11 @@ public final class WidgetContactSync extends AppFragment {
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
             companion2.show(parentFragmentManager2).setOnClose(new WidgetContactSync$handleEvent$$inlined$apply$lambda$2(this));
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.PhoneInvalid.INSTANCE)) {
-            o.j(this, b.j(this, 2131891869, new Object[0], null, 4), 0, 4);
+            o.j(this, b.j(this, 2131891941, new Object[0], null, 4), 0, 4);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.VerificationCodeInvalid.INSTANCE)) {
             o.j(this, b.j(this, 2131886405, new Object[0], null, 4), 0, 4);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.VerificationFailed.INSTANCE)) {
-            o.j(this, b.j(this, 2131891868, new Object[0], null, 4), 0, 4);
+            o.j(this, b.j(this, 2131891940, new Object[0], null, 4), 0, 4);
         } else if (m.areEqual(event, WidgetContactSyncViewModel.Event.Completed.INSTANCE)) {
             requireAppActivity().finish();
         }
@@ -307,7 +307,7 @@ public final class WidgetContactSync extends AppFragment {
 
     private final void handlePhoneNumberTextChanged() {
         String textOrEmpty = getBinding().b.b.getTextOrEmpty();
-        MaterialButton materialButton = getBinding().b.f65c;
+        MaterialButton materialButton = getBinding().b.f66c;
         m.checkNotNullExpressionValue(materialButton, "binding.contactSyncAddPh…e.contactSyncAddPhoneNext");
         boolean z2 = true;
         if (!(textOrEmpty.length() > 0) || !t.startsWith$default(textOrEmpty, "+", false, 2, null)) {
@@ -357,7 +357,7 @@ public final class WidgetContactSync extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        RecyclerView recyclerView = getBinding().f1758c.b;
+        RecyclerView recyclerView = getBinding().f1759c.b;
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         m.checkNotNullExpressionValue(recyclerView, "it");
         ContactSyncFriendSuggestionListAdapter contactSyncFriendSuggestionListAdapter = (ContactSyncFriendSuggestionListAdapter) companion.configure(new ContactSyncFriendSuggestionListAdapter(recyclerView));
diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
index 63accfd662..a9e309ca82 100644
--- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
+++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java
@@ -95,9 +95,9 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
             StoreUser users = companion.getUsers();
             StorePhone phone = companion.getPhone();
             StoreUserConnections userConnections = companion.getUserConnections();
-            Observable<StoreState> G = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{users, phone, userConnections}, false, null, null, 14, null), 1, TimeUnit.SECONDS).G(new WidgetContactSyncViewModel$Companion$observeStores$1(users, phone, userConnections));
-            m.checkNotNullExpressionValue(G, "ObservationDeckProvider\n…            )\n          }");
-            return G;
+            Observable<StoreState> F = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{users, phone, userConnections}, false, null, null, 14, null), 1, TimeUnit.SECONDS).F(new WidgetContactSyncViewModel$Companion$observeStores$1(users, phone, userConnections));
+            m.checkNotNullExpressionValue(F, "ObservationDeckProvider\n…            )\n          }");
+            return F;
         }
     }
 
@@ -892,7 +892,7 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
         this.restAPI = restAPI;
         this.tracker = contactSyncAnalytics;
         this.initialized = z4;
-        this.eventsSubject = PublishSubject.l0();
+        this.eventsSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetContactSyncViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java
index b1b4bcbfc4..334411425a 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetDebugging$binding$2 extends k implement
 
     public final WidgetDebuggingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362835);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362860);
         if (recyclerView != null) {
             return new WidgetDebuggingBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362835)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362860)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java
index 3be07cc332..24e216e375 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$1.java
@@ -14,7 +14,7 @@ public final class WidgetDebugging$configureUI$1<T1, T2> implements Action2<Menu
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363884) {
+        if (menuItem.getItemId() == 2131363925) {
             boolean z2 = !menuItem.isChecked();
             menuItem.setChecked(z2);
             WidgetDebugging.access$getFilterSubject$p(this.this$0).onNext(Boolean.valueOf(z2));
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java
index d8613f6c8e..94e36abcfe 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging$configureUI$2.java
@@ -14,7 +14,7 @@ public final class WidgetDebugging$configureUI$2<T> implements Action1<Menu> {
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363884);
+        MenuItem findItem = menu.findItem(2131363925);
         m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_debugging_filter)");
         findItem.setChecked(this.$model.isFiltered());
     }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
index 9406f27aaf..1f64c978cc 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java
@@ -45,7 +45,7 @@ public final class WidgetDebugging extends AppFragment {
     private static final int COLLAPSED_MAX_LINES = 2;
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetDebugging$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<Boolean> filterSubject = BehaviorSubject.m0(Boolean.TRUE);
+    private final BehaviorSubject<Boolean> filterSubject = BehaviorSubject.l0(Boolean.TRUE);
     private Adapter logsAdapter;
 
     /* compiled from: WidgetDebugging.kt */
@@ -90,14 +90,14 @@ public final class WidgetDebugging extends AppFragment {
                 super(i, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                TextView textView = (TextView) view.findViewById(2131363771);
+                TextView textView = (TextView) view.findViewById(2131363812);
                 if (textView != null) {
                     WidgetDebuggingAdapterItemBinding widgetDebuggingAdapterItemBinding = new WidgetDebuggingAdapterItemBinding((LinearLayout) view, textView);
                     m.checkNotNullExpressionValue(widgetDebuggingAdapterItemBinding, "WidgetDebuggingAdapterItemBinding.bind(itemView)");
                     this.binding = widgetDebuggingAdapterItemBinding;
                     return;
                 }
-                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363771)));
+                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363812)));
             }
 
             public static final /* synthetic */ WidgetDebuggingAdapterItemBinding access$getBinding$p(Item item) {
@@ -163,7 +163,7 @@ public final class WidgetDebugging extends AppFragment {
         public MGRecyclerViewHolder<?, AppLog.LoggedItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
             if (i == 0) {
-                return new Item(2131558984, this);
+                return new Item(2131558988, this);
             }
             throw invalidViewTypeException(i);
         }
@@ -261,7 +261,7 @@ public final class WidgetDebugging extends AppFragment {
     }
 
     public WidgetDebugging() {
-        super(2131558983);
+        super(2131558987);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetDebugging widgetDebugging, Model model) {
@@ -300,16 +300,16 @@ public final class WidgetDebugging extends AppFragment {
         linearLayoutManager.setReverseLayout(true);
         linearLayoutManager.setSmoothScrollbarEnabled(true);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131888046);
+        setActionBarTitle(2131888045);
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         Objects.requireNonNull(AppLog.g);
-        Observable s2 = ObservableExtensionsKt.computationBuffered(AppLog.d).s();
-        m.checkNotNullExpressionValue(s2, "logsSubject\n          .c…  .distinctUntilChanged()");
-        Observable j = Observable.j(s2.a(200, TimeUnit.MILLISECONDS).y(WidgetDebugging$onViewBoundOrOnResume$1.INSTANCE).Q(new ArrayList(), WidgetDebugging$onViewBoundOrOnResume$2.INSTANCE), this.filterSubject.s(), WidgetDebugging$onViewBoundOrOnResume$3.INSTANCE);
+        Observable r = ObservableExtensionsKt.computationBuffered(AppLog.d).r();
+        m.checkNotNullExpressionValue(r, "logsSubject\n          .c…  .distinctUntilChanged()");
+        Observable j = Observable.j(r.a(200, TimeUnit.MILLISECONDS).x(WidgetDebugging$onViewBoundOrOnResume$1.INSTANCE).P(new ArrayList(), WidgetDebugging$onViewBoundOrOnResume$2.INSTANCE), this.filterSubject.r(), WidgetDebugging$onViewBoundOrOnResume$3.INSTANCE);
         m.checkNotNullExpressionValue(j, "Observable\n        .comb…gs, isFiltered)\n        }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(j), this, null, 2, null), WidgetDebugging.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDebugging$onViewBoundOrOnResume$4(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java
index d17513541c..1bab1974ff 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java
@@ -19,26 +19,26 @@ public final /* synthetic */ class WidgetFatalCrash$binding$2 extends k implemen
 
     public final WidgetFatalCrashBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363162;
-        TextView textView = (TextView) view.findViewById(2131363162);
+        int i = 2131363187;
+        TextView textView = (TextView) view.findViewById(2131363187);
         if (textView != null) {
-            i = 2131363163;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363163);
+            i = 2131363188;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363188);
             if (linearLayout != null) {
-                i = 2131363164;
-                TextView textView2 = (TextView) view.findViewById(2131363164);
+                i = 2131363189;
+                TextView textView2 = (TextView) view.findViewById(2131363189);
                 if (textView2 != null) {
-                    i = 2131363165;
-                    TextView textView3 = (TextView) view.findViewById(2131363165);
+                    i = 2131363190;
+                    TextView textView3 = (TextView) view.findViewById(2131363190);
                     if (textView3 != null) {
-                        i = 2131363166;
-                        TextView textView4 = (TextView) view.findViewById(2131363166);
+                        i = 2131363191;
+                        TextView textView4 = (TextView) view.findViewById(2131363191);
                         if (textView4 != null) {
-                            i = 2131363167;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363167);
+                            i = 2131363192;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363192);
                             if (linkifiedTextView != null) {
-                                i = 2131363168;
-                                TextView textView5 = (TextView) view.findViewById(2131363168);
+                                i = 2131363193;
+                                TextView textView5 = (TextView) view.findViewById(2131363193);
                                 if (textView5 != null) {
                                     return new WidgetFatalCrashBinding((ScrollView) view, textView, linearLayout, textView2, textView3, textView4, linkifiedTextView, textView5);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
index ae636fa19f..bf88d764b1 100644
--- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
+++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java
@@ -67,7 +67,7 @@ public final class WidgetFatalCrash extends AppFragment {
     }
 
     public WidgetFatalCrash() {
-        super(2131559001);
+        super(2131559005);
     }
 
     private final WidgetFatalCrashBinding getBinding() {
@@ -86,26 +86,26 @@ public final class WidgetFatalCrash extends AppFragment {
         super.onViewBound(view);
         LinkifiedTextView linkifiedTextView = getBinding().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.fatalCrashTestersInvite");
-        linkifiedTextView.setText(b.j(this, 2131887892, new Object[]{"https://discord.gg/discord-testers"}, null, 4));
+        linkifiedTextView.setText(b.j(this, 2131887891, new Object[]{"https://discord.gg/discord-testers"}, null, 4));
         Bundle extras = getMostRecentIntent().getExtras();
         TextView textView = getBinding().e;
         m.checkNotNullExpressionValue(textView, "binding.fatalCrashSource");
         Object[] objArr = new Object[1];
-        objArr[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_SOURCE", getString(2131893514)) : null;
-        textView.setText(b.j(this, 2131887891, objArr, null, 4));
+        objArr[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_SOURCE", getString(2131893598)) : null;
+        textView.setText(b.j(this, 2131887890, objArr, null, 4));
         TextView textView2 = getBinding().g;
         m.checkNotNullExpressionValue(textView2, "binding.fatalCrashTime");
         Object[] objArr2 = new Object[1];
         objArr2[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_TIME") : null;
-        textView2.setText(b.j(this, 2131887893, objArr2, null, 4));
+        textView2.setText(b.j(this, 2131887892, objArr2, null, 4));
         TextView textView3 = getBinding().b;
         m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion");
-        textView3.setText(b.j(this, 2131887886, new Object[]{"81.14 - Stable"}, null, 4));
+        textView3.setText(b.j(this, 2131887885, new Object[]{"82.19 - Stable"}, null, 4));
         TextView textView4 = getBinding().d;
         m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
-        textView4.setText(b.j(this, 2131887889, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
-        TextView textView5 = getBinding().f1775c;
+        textView4.setText(b.j(this, 2131887888, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
+        TextView textView5 = getBinding().f1776c;
         m.checkNotNullExpressionValue(textView5, "binding.fatalCrashDevice");
-        textView5.setText(b.j(this, 2131887888, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4));
+        textView5.setText(b.j(this, 2131887887, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java
index 3d10dc6d6b..d75ba088ad 100644
--- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java
@@ -27,7 +27,7 @@ public final class WidgetDirectoriesViewModel$Companion$observeStores$1 extends
     public final WidgetDirectoriesViewModel.StoreState mo1invoke() {
         RestCallState<List<DirectoryEntry>> restCallState;
         Channel selectedChannel = this.$channelsSelectedStore.getSelectedChannel();
-        if (selectedChannel == null || (restCallState = this.$directoriesStore.getDirectoriesForChannel(selectedChannel.g())) == null) {
+        if (selectedChannel == null || (restCallState = this.$directoriesStore.getDirectoriesForChannel(selectedChannel.h())) == null) {
             restCallState = Default.INSTANCE;
         }
         return new WidgetDirectoriesViewModel.StoreState(selectedChannel, restCallState);
diff --git a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java
index b4bc1cda9c..464dbd8754 100644
--- a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java
+++ b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2.java
@@ -89,6 +89,6 @@ public final class EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2<T, R>
     }
 
     public final Observable<? extends EmojiSheetViewModel.Companion.CustomEmojGuildInfo> call(Guild guild) {
-        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getEmojiGuild(this.$emoji.getId()).G(AnonymousClass1.INSTANCE).G(AnonymousClass2.INSTANCE).M(new AnonymousClass3(guild)) : new j(new EmojiSheetViewModel.Companion.CustomEmojGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getEmojiGuild(this.$emoji.getId()).G(AnonymousClass4.INSTANCE).G(AnonymousClass5.INSTANCE).M(AnonymousClass6.INSTANCE);
+        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getEmojiGuild(this.$emoji.getId()).F(AnonymousClass1.INSTANCE).F(AnonymousClass2.INSTANCE).L(new AnonymousClass3(guild)) : new j(new EmojiSheetViewModel.Companion.CustomEmojGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getEmojiGuild(this.$emoji.getId()).F(AnonymousClass4.INSTANCE).F(AnonymousClass5.INSTANCE).L(AnonymousClass6.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java
index 80167e9f4c..03ed146370 100644
--- a/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/emoji/EmojiSheetViewModel.java
@@ -245,9 +245,9 @@ public final class EmojiSheetViewModel extends AppViewModel<ViewState> {
             }
             EmojiNode.EmojiIdAndType.Custom custom = (EmojiNode.EmojiIdAndType.Custom) emojiIdAndType;
             if (custom != null) {
-                Observable<CustomEmojGuildInfo> A = Observable.D(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$1(storeEmojiCustom, custom, storeGuilds)).A(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2(restAPI, custom));
-                m.checkNotNullExpressionValue(A, "Observable.fromCallable …      }\n        }\n      }");
-                return A;
+                Observable<CustomEmojGuildInfo> z2 = Observable.C(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$1(storeEmojiCustom, custom, storeGuilds)).z(new EmojiSheetViewModel$Companion$getGuildForCustomEmoji$2(restAPI, custom));
+                m.checkNotNullExpressionValue(z2, "Observable.fromCallable …      }\n        }\n      }");
+                return z2;
             }
             j jVar = new j(null);
             m.checkNotNullExpressionValue(jVar, "Observable.just(null)");
@@ -740,9 +740,9 @@ public final class EmojiSheetViewModel extends AppViewModel<ViewState> {
         this.storeGuilds = storeGuilds;
         this.storeChannelsSelected = storeChannelsSelected;
         this.storeMediaFavorites = storeMediaFavorites;
-        Observable s2 = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).s();
-        m.checkNotNullExpressionValue(s2, "storeStateObservable\n   …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, EmojiSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null).r();
+        m.checkNotNullExpressionValue(r, "storeStateObservable\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, EmojiSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -805,9 +805,9 @@ public final class EmojiSheetViewModel extends AppViewModel<ViewState> {
         Channel currentChannel = storeState.getCurrentChannel();
         boolean z3 = false;
         if (currentChannel != null) {
-            long e = currentChannel.e();
+            long f = currentChannel.f();
             Companion.CustomEmojGuildInfo.Known known = (Companion.CustomEmojGuildInfo.Known) (!(customEmojiGuildInfo instanceof Companion.CustomEmojGuildInfo.Known) ? null : customEmojiGuildInfo);
-            if (!(known == null || (guild = known.getGuild()) == null || guild.getId() != e)) {
+            if (!(known == null || (guild = known.getGuild()) == null || guild.getId() != f)) {
                 z3 = true;
             }
             z2 = z3;
diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java
index 063a243371..eec5196e06 100644
--- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java
@@ -21,57 +21,57 @@ public final /* synthetic */ class WidgetEmojiSheet$binding$2 extends k implemen
 
     public final WidgetEmojiSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362151;
-        TextView textView = (TextView) view.findViewById(2131362151);
+        int i = 2131362162;
+        TextView textView = (TextView) view.findViewById(2131362162);
         if (textView != null) {
-            i = 2131362185;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362185);
+            i = 2131362196;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362196);
             if (frameLayout != null) {
-                i = 2131362939;
-                View findViewById = view.findViewById(2131362939);
+                i = 2131362964;
+                View findViewById = view.findViewById(2131362964);
                 if (findViewById != null) {
-                    i = 2131363008;
-                    TextView textView2 = (TextView) view.findViewById(2131363008);
+                    i = 2131363033;
+                    TextView textView2 = (TextView) view.findViewById(2131363033);
                     if (textView2 != null) {
-                        i = 2131363011;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363011);
+                        i = 2131363036;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363036);
                         if (simpleDraweeView != null) {
                             AppViewFlipper appViewFlipper = (AppViewFlipper) view;
-                            i = 2131363169;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363169);
+                            i = 2131363194;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363194);
                             if (materialButton != null) {
-                                i = 2131363170;
-                                FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363170);
+                                i = 2131363195;
+                                FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363195);
                                 if (frameLayout2 != null) {
-                                    i = 2131363171;
-                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363171);
+                                    i = 2131363196;
+                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363196);
                                     if (materialButton2 != null) {
-                                        i = 2131363340;
-                                        TextView textView3 = (TextView) view.findViewById(2131363340);
+                                        i = 2131363366;
+                                        TextView textView3 = (TextView) view.findViewById(2131363366);
                                         if (textView3 != null) {
-                                            i = 2131363341;
-                                            FrameLayout frameLayout3 = (FrameLayout) view.findViewById(2131363341);
+                                            i = 2131363367;
+                                            FrameLayout frameLayout3 = (FrameLayout) view.findViewById(2131363367);
                                             if (frameLayout3 != null) {
-                                                i = 2131363345;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363345);
+                                                i = 2131363371;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363371);
                                                 if (linearLayout != null) {
-                                                    i = 2131363364;
-                                                    TextView textView4 = (TextView) view.findViewById(2131363364);
+                                                    i = 2131363390;
+                                                    TextView textView4 = (TextView) view.findViewById(2131363390);
                                                     if (textView4 != null) {
-                                                        i = 2131363388;
-                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363388);
+                                                        i = 2131363415;
+                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363415);
                                                         if (simpleDraweeView2 != null) {
-                                                            i = 2131363395;
-                                                            TextView textView5 = (TextView) view.findViewById(2131363395);
+                                                            i = 2131363422;
+                                                            TextView textView5 = (TextView) view.findViewById(2131363422);
                                                             if (textView5 != null) {
-                                                                i = 2131363720;
-                                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363720);
+                                                                i = 2131363761;
+                                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363761);
                                                                 if (materialButton3 != null) {
-                                                                    i = 2131363995;
-                                                                    TextView textView6 = (TextView) view.findViewById(2131363995);
+                                                                    i = 2131364036;
+                                                                    TextView textView6 = (TextView) view.findViewById(2131364036);
                                                                     if (textView6 != null) {
-                                                                        i = 2131364247;
-                                                                        MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364247);
+                                                                        i = 2131364291;
+                                                                        MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364291);
                                                                         if (materialButton4 != null) {
                                                                             return new WidgetEmojiSheetBinding(appViewFlipper, textView, frameLayout, findViewById, textView2, simpleDraweeView, appViewFlipper, materialButton, frameLayout2, materialButton2, textView3, frameLayout3, linearLayout, textView4, simpleDraweeView2, textView5, materialButton3, textView6, materialButton4);
                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
index 269286006b..1962db4c41 100644
--- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
+++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java
@@ -195,7 +195,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         TextView textView = binding2.p;
         m.checkNotNullExpressionValue(textView, "nameTv");
         textView.setText(':' + emojiCustom2.getName() + ':');
-        TextView textView2 = binding2.f1770c;
+        TextView textView2 = binding2.f1771c;
         m.checkNotNullExpressionValue(textView2, "emojiInfoTv");
         textView2.setText(getString(getCustomEmojiInfoText(isCurrentGuild, isUserInGuild, isPublic, isUserPremium)));
         configureButtons(isUserPremium, isUserInGuild, known != null ? known.getGuild() : null);
@@ -238,7 +238,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(simpleDraweeView, "guildIv");
             IconUtils.setIcon$default((ImageView) simpleDraweeView, guild, 0, (MGImages.ChangeDetector) this.imageChangeDetector, true, 4, (Object) null);
         } else {
-            binding.j.setBackgroundResource(2131231070);
+            binding.j.setBackgroundResource(2131231075);
             int themedColor = ColorCompat.getThemedColor(requireContext(), 2130968905);
             FrameLayout frameLayout = binding.j;
             m.checkNotNullExpressionValue(frameLayout, "guildAvatarWrap");
@@ -247,7 +247,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(textView, "guildAvatarText");
             textView.setText(guild.getShortName());
         }
-        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231812 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232037 : 0;
+        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231820 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232045 : 0;
         TextView textView2 = binding.n;
         m.checkNotNullExpressionValue(textView2, "guildNameTv");
         DrawableCompat.setCompoundDrawablesCompat(textView2, i, 0, 0, 0);
@@ -259,7 +259,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         CharSequence j = b.j(this, i2, new Object[0], null, 4);
         if (num != null) {
             String format = NumberFormat.getNumberInstance(new LocaleManager().getPrimaryLocale(requireContext())).format(Integer.valueOf(num.intValue()));
-            str = b.j(this, 2131890369, new Object[]{format}, null, 4).toString() + " • ";
+            str = b.j(this, 2131890435, new Object[]{format}, null, 4).toString() + " • ";
         }
         if (str == null) {
             str = "";
@@ -277,7 +277,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
         TextView textView = binding.p;
         m.checkNotNullExpressionValue(textView, "nameTv");
         textView.setText(':' + emojiUnicode.getEmojiUnicode().getFirstName() + ':');
-        TextView textView2 = binding.f1770c;
+        TextView textView2 = binding.f1771c;
         m.checkNotNullExpressionValue(textView2, "emojiInfoTv");
         textView2.setText(getString(2131888310));
         FrameLayout frameLayout = binding.b;
@@ -341,6 +341,6 @@ public final class WidgetEmojiSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558994;
+        return 2131558998;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java
index 005a41ab22..7db8605937 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java
@@ -19,15 +19,15 @@ public final /* synthetic */ class WidgetFeedbackSheet$binding$2 extends k imple
 
     public final WidgetFeedbackSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363180;
-        ImageView imageView = (ImageView) view.findViewById(2131363180);
+        int i = 2131363205;
+        ImageView imageView = (ImageView) view.findViewById(2131363205);
         if (imageView != null) {
             NestedScrollView nestedScrollView = (NestedScrollView) view;
-            i = 2131363182;
-            FeedbackView feedbackView = (FeedbackView) view.findViewById(2131363182);
+            i = 2131363207;
+            FeedbackView feedbackView = (FeedbackView) view.findViewById(2131363207);
             if (feedbackView != null) {
-                i = 2131363183;
-                TextView textView = (TextView) view.findViewById(2131363183);
+                i = 2131363208;
+                TextView textView = (TextView) view.findViewById(2131363208);
                 if (textView != null) {
                     return new WidgetFeedbackSheetBinding(nestedScrollView, imageView, nestedScrollView, feedbackView, textView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
index 572f495fc4..f79385e210 100644
--- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
+++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java
@@ -167,9 +167,9 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
                 requireDialog().cancel();
                 return;
             }
-            Observable<Long> e02 = Observable.e0(600, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable\n             …S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$handleEvent$1(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(600, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n             …S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$handleEvent$1(this), 62, (Object) null);
         } else if (event instanceof FeedbackSheetViewModel.Event.NavigateToIssueDetails) {
             WidgetIssueDetailsForm.Companion companion = WidgetIssueDetailsForm.Companion;
             Context requireContext = requireContext();
@@ -187,7 +187,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
         }
         if (z2) {
             if (viewState.getShowFaceRatings()) {
-                NestedScrollView nestedScrollView = getBinding().f1776c;
+                NestedScrollView nestedScrollView = getBinding().f1777c;
                 m.checkNotNullExpressionValue(nestedScrollView, "binding.feedbackSheetContainer");
                 updatePeekHeightPx(nestedScrollView.getMeasuredHeight());
             }
@@ -205,9 +205,9 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(string2, "getString(viewState.issuesHeaderTextResId)");
         feedbackView.updateView(string, selectedFeedbackRating, widgetFeedbackSheet$updateView$2, widgetFeedbackSheet$updateView$3, widgetFeedbackSheet$updateView$4, string2, viewState.getFeedbackIssues(), new WidgetFeedbackSheet$updateView$5(this));
         if (z2) {
-            Observable<Long> e02 = Observable.e0(100, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable\n          .ti…S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$updateView$6(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(100, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n          .ti…S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetFeedbackSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFeedbackSheet$updateView$6(this), 62, (Object) null);
         }
     }
 
@@ -221,7 +221,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559002;
+        return 2131559006;
     }
 
     public final Function0<Unit> getOnDismissed() {
diff --git a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java
index 87162db91a..af9fd78785 100644
--- a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java
+++ b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java
@@ -55,8 +55,8 @@ public final class EmptyFriendsStateContactSyncView extends ConstraintLayout {
             this.binding.d.setTextSize(2, 18.0f);
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.csSubtitle");
-            b.n(textView, 2131887559, new Object[0], null, 4);
+            b.m(textView, 2131887559, new Object[0], null, 4);
         }
-        this.binding.f1607c.setOnClickListener(EmptyFriendsStateContactSyncView$updateView$1.INSTANCE);
+        this.binding.f1603c.setOnClickListener(EmptyFriendsStateContactSyncView$updateView$1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java
index 2a5c113c27..8c75c42ebc 100644
--- a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java
+++ b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java
@@ -57,7 +57,7 @@ public final class EmptyFriendsStateView extends ConstraintLayout {
         m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.EmptyFriendsStateView)");
         int resourceId = obtainStyledAttributes.getResourceId(0, 2131165778);
         obtainStyledAttributes.recycle();
-        this.binding.f1608c.setTextSize(0, getResources().getDimension(resourceId));
+        this.binding.f1604c.setTextSize(0, getResources().getDimension(resourceId));
     }
 
     public final void updateView(String str) {
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java
index 3f38f9d128..06461a3015 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java
@@ -50,7 +50,7 @@ public final class FriendsListViewModel$acceptFriendRequest$2 extends o implemen
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Boolean mo1invoke() {
-            FriendsListViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888049);
+            FriendsListViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888048);
             return null;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.java
index 482784241c..6c3228b7e2 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$1.java
@@ -25,6 +25,6 @@ public final class FriendsListViewModel$launchVoiceCall$1 extends o implements F
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        FriendsListViewModel.access$emitLaunchVoiceCallEvent(this.this$0, channel.g());
+        FriendsListViewModel.access$emitLaunchVoiceCallEvent(this.this$0, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java
index 2a7f1222a0..d165ad23bc 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java
@@ -25,6 +25,6 @@ public final class FriendsListViewModel$launchVoiceCall$2 extends o implements F
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java
index b78131c0a4..8ae0a8c90b 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java
@@ -25,6 +25,6 @@ public final class FriendsListViewModel$removeFriendRequest$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
index 5ff7f68467..216f4545ca 100644
--- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java
@@ -100,9 +100,9 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
             StoreUser users = companion.getUsers();
             StoreUserRelationships userRelationships = companion.getUserRelationships();
             StoreUserConnections userConnections = companion.getUserConnections();
-            Observable<StoreState> G = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{companion.getChannelsSelected(), companion.getPresences(), companion.getUsers(), companion.getUserRelationships(), companion.getApplicationStreaming(), companion.getUserConnections(), companion.getExperiments(), companion.getContactSync()}, false, null, null, 14, null), 1, TimeUnit.SECONDS).G(new FriendsListViewModel$Companion$observeStores$1(channelsSelected, presences, users, userRelationships, companion.getApplicationStreaming(), userConnections, companion.getExperiments(), companion.getContactSync(), companion.getFriendSuggestions()));
-            m.checkNotNullExpressionValue(G, "ObservationDeckProvider\n…            )\n          }");
-            return G;
+            Observable<StoreState> F = ObservableExtensionsKt.leadingEdgeThrottle(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{companion.getChannelsSelected(), companion.getPresences(), companion.getUsers(), companion.getUserRelationships(), companion.getApplicationStreaming(), companion.getUserConnections(), companion.getExperiments(), companion.getContactSync()}, false, null, null, 14, null), 1, TimeUnit.SECONDS).F(new FriendsListViewModel$Companion$observeStores$1(channelsSelected, presences, users, userRelationships, companion.getApplicationStreaming(), userConnections, companion.getExperiments(), companion.getContactSync(), companion.getFriendSuggestions()));
+            m.checkNotNullExpressionValue(F, "ObservationDeckProvider\n…            )\n          }");
+            return F;
         }
     }
 
@@ -1456,7 +1456,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
         this.storeChannels = storeChannels;
         this.restAPI = restAPI;
         this.listSections = new ListSections(null, n.emptyList(), null, n.emptyList(), n.emptyList(), null);
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -1492,9 +1492,9 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
     private final <T> Cancellable asyncComputeAndHandleOnUiThread(Function0<? extends T> function0, Function1<? super Error, Unit> function1, Function1<? super T, Unit> function12) {
         Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef();
         ref$ObjectRef.element = null;
-        Observable<T> Y = Observable.n(new FriendsListViewModel$asyncComputeAndHandleOnUiThread$1(function0), Emitter.BackpressureMode.NONE).Y(j0.p.a.a());
-        m.checkNotNullExpressionValue(Y, "Observable\n        .crea…Schedulers.computation())");
-        Observable ui$default = ObservableExtensionsKt.ui$default(Y, this, null, 2, null);
+        Observable<T> X = Observable.n(new FriendsListViewModel$asyncComputeAndHandleOnUiThread$1(function0), Emitter.BackpressureMode.NONE).X(j0.p.a.a());
+        m.checkNotNullExpressionValue(X, "Observable\n        .crea…Schedulers.computation())");
+        Observable ui$default = ObservableExtensionsKt.ui$default(X, this, null, 2, null);
         FriendsListViewModel$asyncComputeAndHandleOnUiThread$2 friendsListViewModel$asyncComputeAndHandleOnUiThread$2 = new FriendsListViewModel$asyncComputeAndHandleOnUiThread$2(function12);
         ObservableExtensionsKt.appSubscribe$default(ui$default, FriendsListViewModel.class, (Context) null, new FriendsListViewModel$asyncComputeAndHandleOnUiThread$4(ref$ObjectRef), new FriendsListViewModel$asyncComputeAndHandleOnUiThread$3(function1), (Function0) null, (Function0) null, friendsListViewModel$asyncComputeAndHandleOnUiThread$2, 50, (Object) null);
         return new FriendsListViewModel$asyncComputeAndHandleOnUiThread$5(ref$ObjectRef);
@@ -1579,7 +1579,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
             }
         }
         List list = u.toList(u.sortedWith(arrayList2, FriendsListViewModel$getItems$sortedPendingItems$1.INSTANCE));
-        Item.PendingHeader pendingHeader = !list.isEmpty() ? new Item.PendingHeader(2131888832, list.size(), false, list.size() > 2) : null;
+        Item.PendingHeader pendingHeader = !list.isEmpty() ? new Item.PendingHeader(2131888833, list.size(), false, list.size() > 2) : null;
         ArrayList arrayList4 = new ArrayList();
         ArrayList arrayList5 = new ArrayList();
         for (Object obj : arrayList3) {
@@ -1589,7 +1589,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
         }
         List list2 = u.toList(u.sortedWith(arrayList5, FriendsListViewModel$getItems$onlineFriendItems$2.INSTANCE));
         if (!list2.isEmpty()) {
-            arrayList4.add(new Item.Header(2131888828, list2.size()));
+            arrayList4.add(new Item.Header(2131888829, list2.size()));
             arrayList4.addAll(list2);
         }
         ArrayList arrayList6 = new ArrayList();
@@ -1600,7 +1600,7 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
         }
         List list3 = u.toList(u.sortedWith(arrayList6, FriendsListViewModel$getItems$offlineFriendItems$2.INSTANCE));
         if (true ^ list3.isEmpty()) {
-            arrayList4.add(new Item.Header(2131888827, list3.size()));
+            arrayList4.add(new Item.Header(2131888828, list3.size()));
             arrayList4.addAll(list3);
         }
         return new ListSections(suggestedFriendsHeader, arrayList, pendingHeader, list, arrayList4, z2 ? new Item.ContactSyncUpsell(false) : null);
@@ -1720,6 +1720,6 @@ public final class FriendsListViewModel extends AppViewModel<ViewState> {
     }
 
     public final void removeFriendRequest(long j, int i) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("Friends List", j), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$removeFriendRequest$2(this), (Function0) null, (Function0) null, new FriendsListViewModel$removeFriendRequest$1(this, i == 3 ? 2131888801 : 2131888796), 54, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("Friends List", j), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$removeFriendRequest$2(this), (Function0) null, (Function0) null, new FriendsListViewModel$removeFriendRequest$1(this, i == 3 ? 2131888802 : 2131888797), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/NearbyManager.java b/app/src/main/java/com/discord/widgets/friends/NearbyManager.java
index 8c06b2fc93..88796329eb 100644
--- a/app/src/main/java/com/discord/widgets/friends/NearbyManager.java
+++ b/app/src/main/java/com/discord/widgets/friends/NearbyManager.java
@@ -33,7 +33,7 @@ public final class NearbyManager {
     private MessageListener messageListener;
     private PublishOptions messagePublishOptions;
     private MessagesClient messagesClient;
-    private final BehaviorSubject<NearbyState> nearbyStateSubject = BehaviorSubject.m0(NearbyState.Uninitialized.INSTANCE);
+    private final BehaviorSubject<NearbyState> nearbyStateSubject = BehaviorSubject.l0(NearbyState.Uninitialized.INSTANCE);
     private final HashSet<Long> nearbyUserIds = new HashSet<>();
     private Message outboundMessage;
     private SubscribeOptions subscribeOptions;
diff --git a/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java b/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java
index 939317321e..da366de411 100644
--- a/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java
+++ b/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java
@@ -32,20 +32,20 @@ public final class SuggestedFriendView extends ConstraintLayout {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558675, this);
-        int i2 = 2131365135;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365135);
+        int i2 = 2131365190;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365190);
         if (simpleDraweeView != null) {
-            i2 = 2131365136;
-            AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById(2131365136);
+            i2 = 2131365191;
+            AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById(2131365191);
             if (appCompatImageView != null) {
-                i2 = 2131365137;
-                TextView textView = (TextView) findViewById(2131365137);
+                i2 = 2131365192;
+                TextView textView = (TextView) findViewById(2131365192);
                 if (textView != null) {
-                    i2 = 2131365138;
-                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) findViewById(2131365138);
+                    i2 = 2131365193;
+                    AppCompatImageView appCompatImageView2 = (AppCompatImageView) findViewById(2131365193);
                     if (appCompatImageView2 != null) {
-                        i2 = 2131365139;
-                        TextView textView2 = (TextView) findViewById(2131365139);
+                        i2 = 2131365194;
+                        TextView textView2 = (TextView) findViewById(2131365194);
                         if (textView2 != null) {
                             SuggestedFriendViewBinding suggestedFriendViewBinding = new SuggestedFriendViewBinding(this, simpleDraweeView, appCompatImageView, textView, appCompatImageView2, textView2);
                             m.checkNotNullExpressionValue(suggestedFriendViewBinding, "SuggestedFriendViewBindi…ater.from(context), this)");
@@ -76,7 +76,7 @@ public final class SuggestedFriendView extends ConstraintLayout {
 
     public final void setOnDeclineClicked(Function0<Unit> function0) {
         m.checkNotNullParameter(function0, "onDeclineClicked");
-        this.binding.f1633c.setOnClickListener(new SuggestedFriendView$setOnDeclineClicked$1(function0));
+        this.binding.f1630c.setOnClickListener(new SuggestedFriendView$setOnDeclineClicked$1(function0));
     }
 
     public final void setOnSendClicked(Function0<Unit> function0) {
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java
index fcbfb3301b..199558c554 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java
@@ -53,7 +53,7 @@ public final class WidgetFriendsAdd extends AppFragment {
     }
 
     public WidgetFriendsAdd() {
-        super(2131559004);
+        super(2131559008);
     }
 
     private final WidgetFriendsAddBinding getBinding() {
@@ -73,14 +73,14 @@ public final class WidgetFriendsAdd extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131888842);
+        setActionBarTitle(2131888843);
         SimplePager simplePager = getBinding().b;
         m.checkNotNullExpressionValue(simplePager, "binding.addFriendViewPager");
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = getString(2131894405);
+        String string = getString(2131894524);
         m.checkNotNullExpressionValue(string, "getString(R.string.username)");
-        String string2 = getString(2131891316);
+        String string2 = getString(2131891387);
         m.checkNotNullExpressionValue(string2, "getString(R.string.nearby_scan)");
         simplePager.setAdapter(new SimplePager.Adapter(parentFragmentManager, new SimplePager.Adapter.Item(string, WidgetFriendsAdd$onViewBound$1.INSTANCE), new SimplePager.Adapter.Item(string2, WidgetFriendsAdd$onViewBound$2.INSTANCE)));
     }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java
index 2118a21200..4f122d5415 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java
@@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetFriendsAddById$binding$2 extends k impl
 
     public final WidgetFriendsAddByIdBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363226;
-        TextView textView = (TextView) view.findViewById(2131363226);
+        int i = 2131363251;
+        TextView textView = (TextView) view.findViewById(2131363251);
         if (textView != null) {
-            i = 2131363234;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363234);
+            i = 2131363259;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363259);
             if (linearLayout != null) {
-                i = 2131363235;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363235);
+                i = 2131363260;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363260);
                 if (materialButton != null) {
-                    i = 2131363236;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363236);
+                    i = 2131363261;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363261);
                     if (textInputLayout != null) {
                         return new WidgetFriendsAddByIdBinding((NestedScrollView) view, textView, linearLayout, materialButton, textInputLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
index 0b9952ee74..d668b9b220 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java
@@ -134,7 +134,7 @@ public final class WidgetFriendsAddById extends AppFragment {
     }
 
     public WidgetFriendsAddById() {
-        super(2131559005);
+        super(2131559009);
     }
 
     public static final /* synthetic */ void access$extractTargetAndSendFriendRequest(WidgetFriendsAddById widgetFriendsAddById) {
@@ -154,10 +154,10 @@ public final class WidgetFriendsAddById extends AppFragment {
     }
 
     private final void extractTargetAndSendFriendRequest() {
-        Companion companion = Companion;
         TextInputLayout textInputLayout = getBinding().e;
         m.checkNotNullExpressionValue(textInputLayout, "binding.friendsAddTextEditWrap");
-        Companion.UserNameDiscriminator access$extractUsernameAndDiscriminator = Companion.access$extractUsernameAndDiscriminator(companion, ViewExtensions.getTextOrEmpty(textInputLayout));
+        String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
+        Companion.UserNameDiscriminator access$extractUsernameAndDiscriminator = Companion.access$extractUsernameAndDiscriminator(Companion, textOrEmpty);
         if (access$extractUsernameAndDiscriminator.getDiscriminator() != null) {
             sendFriendRequest(access$extractUsernameAndDiscriminator.getUsername(), access$extractUsernameAndDiscriminator.getDiscriminator().intValue());
             return;
@@ -168,7 +168,7 @@ public final class WidgetFriendsAddById extends AppFragment {
             charSequence = b.g(context, 2131886262, new Object[]{access$extractUsernameAndDiscriminator.getUsername()}, null, 4);
         }
         setInputEditError(charSequence);
-        AnalyticsTracker.INSTANCE.friendRequestFailed("Invalid Username");
+        AnalyticsTracker.INSTANCE.friendRequestFailed(textOrEmpty, access$extractUsernameAndDiscriminator.getUsername(), access$extractUsernameAndDiscriminator.getDiscriminator(), "Invalid Username");
     }
 
     private final WidgetFriendsAddByIdBinding getBinding() {
@@ -179,7 +179,7 @@ public final class WidgetFriendsAddById extends AppFragment {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
         UserUtils userUtils = UserUtils.INSTANCE;
-        CharSequence h = b.h(resources, 2131893146, new Object[]{UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null)}, null, 4);
+        CharSequence h = b.h(resources, 2131893229, new Object[]{UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null)}, null, 4);
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(h);
         SpannableStringBuilder spannableStringBuilder2 = (SpannableStringBuilder) h;
         spannableStringBuilder.setSpan(new ForegroundColorSpan(ColorCompat.getThemedColor(requireContext(), 2130968932)), spannableStringBuilder2.length() - UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null).length(), spannableStringBuilder2.length(), 33);
@@ -240,7 +240,7 @@ public final class WidgetFriendsAddById extends AppFragment {
         m.checkNotNullExpressionValue(textInputLayout2, "binding.friendsAddTextEditWrap");
         String str = null;
         ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetFriendsAddById$onViewBound$3(this), 1, null);
-        getBinding().f1778c.setOnClickListener(new WidgetFriendsAddById$onViewBound$4(this));
+        getBinding().f1779c.setOnClickListener(new WidgetFriendsAddById$onViewBound$4(this));
         Bundle extras = getMostRecentIntent().getExtras();
         if (extras != null) {
             str = extras.getString("android.intent.extra.TEXT");
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java
index 7db4cea63b..59824aff02 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java
@@ -208,7 +208,7 @@ public final class WidgetFriendsAddUserAdapter extends MGRecyclerAdapterSimple<I
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public UserViewHolder(WidgetFriendsAddUserAdapter widgetFriendsAddUserAdapter) {
-            super(2131558836, widgetFriendsAddUserAdapter);
+            super(2131558839, widgetFriendsAddUserAdapter);
             m.checkNotNullParameter(widgetFriendsAddUserAdapter, "adapter");
             View view = this.itemView;
             int i = 2131361906;
@@ -292,7 +292,7 @@ public final class WidgetFriendsAddUserAdapter extends MGRecyclerAdapterSimple<I
             this.binding.d.setOnClickListener(new WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$2(this, id2, contains2));
             this.binding.i.setOnClickListener(new WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$3(this, user));
             this.binding.a.setOnClickListener(new WidgetFriendsAddUserAdapter$UserViewHolder$onConfigure$4(this, id2));
-            AppCompatImageView appCompatImageView = this.binding.f1668c;
+            AppCompatImageView appCompatImageView = this.binding.f1665c;
             m.checkNotNullExpressionValue(appCompatImageView, "binding.addFriendUserCheckImage");
             appCompatImageView.setVisibility(itemUser.isFriend() ? 0 : 8);
             AppCompatImageView appCompatImageView2 = this.binding.i;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java
index d31c90547a..a839ef7981 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby$binding$2.java
@@ -20,23 +20,23 @@ public final /* synthetic */ class WidgetFriendsFindNearby$binding$2 extends k i
 
     public final WidgetFriendsNearbyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364001;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364001);
+        int i = 2131364042;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364042);
         if (materialButton != null) {
-            i = 2131364002;
-            TextView textView = (TextView) view.findViewById(2131364002);
+            i = 2131364043;
+            TextView textView = (TextView) view.findViewById(2131364043);
             if (textView != null) {
-                i = 2131364003;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364003);
+                i = 2131364044;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364044);
                 if (recyclerView != null) {
-                    i = 2131364004;
-                    TextView textView2 = (TextView) view.findViewById(2131364004);
+                    i = 2131364045;
+                    TextView textView2 = (TextView) view.findViewById(2131364045);
                     if (textView2 != null) {
-                        i = 2131364005;
-                        RLottieImageView rLottieImageView = (RLottieImageView) view.findViewById(2131364005);
+                        i = 2131364046;
+                        RLottieImageView rLottieImageView = (RLottieImageView) view.findViewById(2131364046);
                         if (rLottieImageView != null) {
-                            i = 2131364006;
-                            TextView textView3 = (TextView) view.findViewById(2131364006);
+                            i = 2131364047;
+                            TextView textView3 = (TextView) view.findViewById(2131364047);
                             if (textView3 != null) {
                                 return new WidgetFriendsNearbyBinding((NestedScrollView) view, materialButton, textView, recyclerView, textView2, rLottieImageView, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
index a877c4e088..15fa7188d7 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsFindNearby.java
@@ -194,14 +194,14 @@ public final class WidgetFriendsFindNearby extends AppFragment {
 
         public final Observable<Model> get(Observable<NearbyManager.NearbyState> observable) {
             m.checkNotNullParameter(observable, "nearbyStateObservable");
-            Observable<R> Z = observable.Z(WidgetFriendsFindNearby$ModelProvider$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "nearbyStateObservable\n  …          }\n            }");
-            return Z;
+            Observable<R> Y = observable.Y(WidgetFriendsFindNearby$ModelProvider$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "nearbyStateObservable\n  …          }\n            }");
+            return Y;
         }
     }
 
     public WidgetFriendsFindNearby() {
-        super(2131559014);
+        super(2131559018);
     }
 
     private final void acceptFriendRequest(long j) {
@@ -337,7 +337,7 @@ public final class WidgetFriendsFindNearby extends AppFragment {
     }
 
     private final void declineFriendRequest(long j, boolean z2) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeRelationship("Nearby - Remove Friend Request", j), false, 1, null), this, null, 2, null), WidgetFriendsFindNearby.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFriendsFindNearby$declineFriendRequest$1(this, z2 ? 2131888801 : 2131888796), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeRelationship("Nearby - Remove Friend Request", j), false, 1, null), this, null, 2, null), WidgetFriendsFindNearby.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetFriendsFindNearby$declineFriendRequest$1(this, z2 ? 2131888802 : 2131888797), 62, (Object) null);
     }
 
     private final void enableScanning() {
@@ -431,7 +431,7 @@ public final class WidgetFriendsFindNearby extends AppFragment {
         }
         widgetFriendsAddUserAdapter4.setOnItemClick(new WidgetFriendsFindNearby$onViewBound$4(this));
         getBinding().b.setOnClickListener(new WidgetFriendsFindNearby$onViewBound$5(this));
-        getBinding().f1783c.setOnClickListener(WidgetFriendsFindNearby$onViewBound$6.INSTANCE);
+        getBinding().f1784c.setOnClickListener(WidgetFriendsFindNearby$onViewBound$6.INSTANCE);
         RLottieImageView rLottieImageView = getBinding().f;
         int dpToPixels = DimenUtils.dpToPixels(200);
         int dpToPixels2 = DimenUtils.dpToPixels(200);
@@ -461,17 +461,17 @@ public final class WidgetFriendsFindNearby extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable G = companion.getUserRelationships().observeForType(4).G(i.i);
-        Observable G2 = companion.getUserRelationships().observeForType(3).G(i.j);
+        Observable F = companion.getUserRelationships().observeForType(4).F(i.i);
+        Observable F2 = companion.getUserRelationships().observeForType(3).F(i.j);
         v vVar = v.i;
         if (vVar != null) {
             vVar = new w(vVar);
         }
-        Observable j = Observable.j(G, G2, (Func2) vVar);
+        Observable j = Observable.j(F, F2, (Func2) vVar);
         m.checkNotNullExpressionValue(j, "Observable\n        .comb…erRequestsModel\n        )");
-        Observable s2 = ObservableExtensionsKt.computationLatest(j).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n        .comb…  .distinctUntilChanged()");
-        ObservableExtensionsKt.ui$default(s2, this, null, 2, null).k(q.a.g(getContext(), new WidgetFriendsFindNearby$onViewBoundOrOnResume$1(this), null));
+        Observable r = ObservableExtensionsKt.computationLatest(j).r();
+        m.checkNotNullExpressionValue(r, "Observable\n        .comb…  .distinctUntilChanged()");
+        ObservableExtensionsKt.ui$default(r, this, null, 2, null).k(q.a.g(getContext(), new WidgetFriendsFindNearby$onViewBoundOrOnResume$1(this), null));
         Observable<Model> observable = ModelProvider.INSTANCE.get(this.nearbyManager.getState());
         WidgetFriendsAddUserAdapter widgetFriendsAddUserAdapter = this.resultsAdapter;
         if (widgetFriendsAddUserAdapter == null) {
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java
index 5ea2938491..84d576e3ed 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$binding$2.java
@@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetFriendsList$binding$2 extends k impleme
 
     public final WidgetFriendsListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363242;
-        EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131363242);
+        int i = 2131363267;
+        EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131363267);
         if (emptyFriendsStateContactSyncView != null) {
-            i = 2131363243;
-            EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131363243);
+            i = 2131363268;
+            EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131363268);
             if (emptyFriendsStateView != null) {
-                i = 2131363245;
-                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363245);
+                i = 2131363270;
+                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363270);
                 if (appViewFlipper != null) {
-                    i = 2131363260;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363260);
+                    i = 2131363285;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363285);
                     if (recyclerView != null) {
-                        i = 2131363262;
-                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363262);
+                        i = 2131363287;
+                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363287);
                         if (recyclerView2 != null) {
                             return new WidgetFriendsListBinding((RelativeLayout) view, emptyFriendsStateContactSyncView, emptyFriendsStateView, appViewFlipper, recyclerView, recyclerView2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
index 246d83bcbb..cbf2e2df63 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java
@@ -26,19 +26,19 @@ public final class WidgetFriendsList$configureToolbar$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363888:
+            case 2131363929:
                 WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null);
                 return;
-            case 2131363889:
+            case 2131363930:
                 ContactSyncAnalytics.Companion.trackStart$default(ContactSyncAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null);
                 AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null));
                 WidgetContactSync.Companion companion2 = WidgetContactSync.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null);
                 return;
-            case 2131363890:
+            case 2131363931:
                 if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) {
                     GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion;
                     FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java
index ab0f0c2b7c..e1a7598c9f 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java
@@ -12,7 +12,7 @@ public final class WidgetFriendsList$configureToolbar$2<T> implements Action1<Me
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363889);
+        MenuItem findItem = menu.findItem(2131363930);
         if (findItem != null) {
             findItem.setVisible(WidgetFriendsList.access$getShowContactSyncIcon$p(this.this$0));
         }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java
index bf0d23225a..46216bac80 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$onViewBound$8.java
@@ -46,7 +46,7 @@ public final class WidgetFriendsList$onViewBound$8 extends o implements Function
         m.checkNotNullParameter(view, "upsellView");
         PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), 2131951664), view);
         popupMenu.getMenuInflater().inflate(2131623947, popupMenu.getMenu());
-        popupMenu.getMenu().findItem(2131363880).setOnMenuItemClickListener(new AnonymousClass1(this));
+        popupMenu.getMenu().findItem(2131363921).setOnMenuItemClickListener(new AnonymousClass1(this));
         popupMenu.show();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
index 4a7a06b7c8..382e6aa295 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList.java
@@ -60,7 +60,7 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
     }
 
     public WidgetFriendsList() {
-        super(2131559006);
+        super(2131559010);
         WidgetFriendsList$viewModel$2 widgetFriendsList$viewModel$2 = WidgetFriendsList$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(FriendsListViewModel.class), new WidgetFriendsList$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetFriendsList$viewModel$2));
@@ -88,7 +88,7 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
 
     private final void configureToolbar() {
         bindToolbar();
-        setActionBarTitle(2131888810);
+        setActionBarTitle(2131888811);
         setActionBarTitleLayoutMinimumTappableArea();
         setActionBarOptionsMenu(2131623954, new WidgetFriendsList$configureToolbar$1(this), new WidgetFriendsList$configureToolbar$2(this));
     }
@@ -207,7 +207,7 @@ public final class WidgetFriendsList extends AppFragment implements OnTabSelecte
         if (widgetTabsHost != null) {
             widgetTabsHost.registerTabSelectionListener(NavigationTab.FRIENDS, this);
         }
-        getBinding().f1781c.updateView("Friends");
+        getBinding().f1782c.updateView("Friends");
         getBinding().b.updateView(false);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().f;
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
index 098cf4d83f..cd644e07e4 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListAdapter.java
@@ -75,21 +75,21 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemContactSyncUpsell(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559012, widgetFriendsListAdapter);
+            super(2131559016, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363237;
-            ImageView imageView = (ImageView) view.findViewById(2131363237);
+            int i = 2131363262;
+            ImageView imageView = (ImageView) view.findViewById(2131363262);
             if (imageView != null) {
                 MaterialCardView materialCardView = (MaterialCardView) view;
-                i = 2131363239;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363239);
+                i = 2131363264;
+                ImageView imageView2 = (ImageView) view.findViewById(2131363264);
                 if (imageView2 != null) {
-                    i = 2131363240;
-                    TextView textView = (TextView) view.findViewById(2131363240);
+                    i = 2131363265;
+                    TextView textView = (TextView) view.findViewById(2131363265);
                     if (textView != null) {
-                        i = 2131363241;
-                        TextView textView2 = (TextView) view.findViewById(2131363241);
+                        i = 2131363266;
+                        TextView textView2 = (TextView) view.findViewById(2131363266);
                         if (textView2 != null) {
                             WidgetFriendsListContactSyncUpsellBinding widgetFriendsListContactSyncUpsellBinding = new WidgetFriendsListContactSyncUpsellBinding(materialCardView, imageView, materialCardView, imageView2, textView, textView2);
                             m.checkNotNullExpressionValue(widgetFriendsListContactSyncUpsellBinding, "WidgetFriendsListContact…ellBinding.bind(itemView)");
@@ -120,17 +120,17 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemHeader(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559008, widgetFriendsListAdapter);
+            super(2131559012, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131363256);
+            TextView textView = (TextView) view.findViewById(2131363281);
             if (textView != null) {
                 WidgetFriendsListAdapterItemHeaderBinding widgetFriendsListAdapterItemHeaderBinding = new WidgetFriendsListAdapterItemHeaderBinding((FrameLayout) view, textView);
                 m.checkNotNullExpressionValue(widgetFriendsListAdapterItemHeaderBinding, "WidgetFriendsListAdapter…derBinding.bind(itemView)");
                 this.binding = widgetFriendsListAdapterItemHeaderBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363256)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363281)));
         }
 
         public void onConfigure(int i, FriendsListViewModel.Item item) {
@@ -139,7 +139,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             FriendsListViewModel.Item.Header header = (FriendsListViewModel.Item.Header) item;
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.friendsListItemHeaderText");
-            b.n(textView, header.getTitleStringResId(), new Object[]{Integer.valueOf(header.getCount())}, null, 4);
+            b.m(textView, header.getTitleStringResId(), new Object[]{Integer.valueOf(header.getCount())}, null, 4);
         }
     }
 
@@ -149,7 +149,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemPendingHeader(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559013, widgetFriendsListAdapter);
+            super(2131559017, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             WidgetFriendsListExpandableHeaderBinding a = WidgetFriendsListExpandableHeaderBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetFriendsListExpanda…derBinding.bind(itemView)");
@@ -164,18 +164,18 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             m.checkNotNullParameter(item, "data");
             super.onConfigure(i, (int) item);
             FriendsListViewModel.Item.PendingHeader pendingHeader = (FriendsListViewModel.Item.PendingHeader) item;
-            TextView textView = this.binding.f1782c;
+            TextView textView = this.binding.f1783c;
             m.checkNotNullExpressionValue(textView, "binding.friendsListPendingItemHeaderText");
-            b.n(textView, pendingHeader.getTitleStringResId(), new Object[]{Integer.valueOf(pendingHeader.getCount())}, null, 4);
+            b.m(textView, pendingHeader.getTitleStringResId(), new Object[]{Integer.valueOf(pendingHeader.getCount())}, null, 4);
             if (pendingHeader.getShowExpandButton()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.friendsListExpandableHeaderButton");
                 textView2.setVisibility(0);
-                int i2 = pendingHeader.isPendingSectionExpanded() ? 2131888831 : 2131888830;
+                int i2 = pendingHeader.isPendingSectionExpanded() ? 2131888832 : 2131888831;
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.friendsListExpandableHeaderButton");
-                b.n(textView3, i2, new Object[0], null, 4);
-                int i3 = pendingHeader.isPendingSectionExpanded() ? 2131231399 : 2131231398;
+                b.m(textView3, i2, new Object[0], null, 4);
+                int i3 = pendingHeader.isPendingSectionExpanded() ? 2131231405 : 2131231404;
                 TextView textView4 = this.binding.b;
                 m.checkNotNullExpressionValue(textView4, "binding.friendsListExpandableHeaderButton");
                 Drawable drawable = ContextCompat.getDrawable(textView4.getContext(), i3);
@@ -197,32 +197,32 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemPendingUser(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559010, widgetFriendsListAdapter);
+            super(2131559014, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363246;
-            AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363246);
+            int i = 2131363271;
+            AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363271);
             if (appCompatImageView != null) {
-                i = 2131363247;
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363247);
+                i = 2131363272;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363272);
                 if (simpleDraweeSpanTextView != null) {
-                    i = 2131363248;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363248);
+                    i = 2131363273;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363273);
                     if (simpleDraweeView != null) {
-                        i = 2131363250;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363250);
+                        i = 2131363275;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363275);
                         if (linearLayout != null) {
-                            i = 2131363253;
-                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131363253);
+                            i = 2131363278;
+                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131363278);
                             if (appCompatImageView2 != null) {
-                                i = 2131363257;
-                                TextView textView = (TextView) view.findViewById(2131363257);
+                                i = 2131363282;
+                                TextView textView = (TextView) view.findViewById(2131363282);
                                 if (textView != null) {
-                                    i = 2131363258;
-                                    StatusView statusView = (StatusView) view.findViewById(2131363258);
+                                    i = 2131363283;
+                                    StatusView statusView = (StatusView) view.findViewById(2131363283);
                                     if (statusView != null) {
-                                        i = 2131363259;
-                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363259);
+                                        i = 2131363284;
+                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363284);
                                         if (linearLayout2 != null) {
                                             WidgetFriendsListAdapterItemPendingBinding widgetFriendsListAdapterItemPendingBinding = new WidgetFriendsListAdapterItemPendingBinding((RelativeLayout) view, appCompatImageView, simpleDraweeSpanTextView, simpleDraweeView, linearLayout, appCompatImageView2, textView, statusView, linearLayout2);
                                             m.checkNotNullExpressionValue(widgetFriendsListAdapterItemPendingBinding, "WidgetFriendsListAdapter…ingBinding.bind(itemView)");
@@ -254,20 +254,20 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             this.binding.g.setPresence(pendingFriendRequest.getPresence());
             int relationshipType = pendingFriendRequest.getRelationshipType();
             if (relationshipType == 3) {
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1780c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1781c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemActivity");
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.f1780c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.binding.f1781c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.friendsListItemActivity");
-                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.i(simpleDraweeSpanTextView2, 2131890336, new Object[0], null, 4));
+                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView, b.i(simpleDraweeSpanTextView2, 2131890402, new Object[0], null, 4));
                 AppCompatImageView appCompatImageView = this.binding.b;
                 m.checkNotNullExpressionValue(appCompatImageView, "binding.friendsListItemAcceptButton");
                 appCompatImageView.setVisibility(0);
             } else if (relationshipType == 4) {
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.binding.f1780c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.binding.f1781c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.friendsListItemActivity");
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.binding.f1780c;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.binding.f1781c;
                 m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.friendsListItemActivity");
-                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView3, b.i(simpleDraweeSpanTextView4, 2131891706, new Object[0], null, 4));
+                ViewExtensions.setTextAndVisibilityBy(simpleDraweeSpanTextView3, b.i(simpleDraweeSpanTextView4, 2131891778, new Object[0], null, 4));
                 AppCompatImageView appCompatImageView2 = this.binding.b;
                 m.checkNotNullExpressionValue(appCompatImageView2, "binding.friendsListItemAcceptButton");
                 appCompatImageView2.setVisibility(8);
@@ -315,7 +315,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemSuggestedFriendHeader(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559013, widgetFriendsListAdapter);
+            super(2131559017, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             WidgetFriendsListExpandableHeaderBinding a = WidgetFriendsListExpandableHeaderBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetFriendsListExpanda…derBinding.bind(itemView)");
@@ -330,9 +330,9 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             CharSequence charSequence;
             m.checkNotNullParameter(item, "data");
             FriendsListViewModel.Item.SuggestedFriendsHeader suggestedFriendsHeader = (FriendsListViewModel.Item.SuggestedFriendsHeader) item;
-            TextView textView = this.binding.f1782c;
+            TextView textView = this.binding.f1783c;
             m.checkNotNullExpressionValue(textView, "binding.friendsListPendingItemHeaderText");
-            b.m(textView, 2131888826, new Object[0], new WidgetFriendsListAdapter$ItemSuggestedFriendHeader$onConfigure$1(item));
+            b.l(textView, 2131888827, new Object[0], new WidgetFriendsListAdapter$ItemSuggestedFriendHeader$onConfigure$1(item));
             if (suggestedFriendsHeader.getShowExpandButton()) {
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.friendsListExpandableHeaderButton");
@@ -342,14 +342,14 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
                 if (suggestedFriendsHeader.isExpanded()) {
                     TextView textView4 = this.binding.b;
                     m.checkNotNullExpressionValue(textView4, "binding.friendsListExpandableHeaderButton");
-                    charSequence = b.i(textView4, 2131888831, new Object[0], null, 4);
+                    charSequence = b.i(textView4, 2131888832, new Object[0], null, 4);
                 } else {
                     TextView textView5 = this.binding.b;
                     m.checkNotNullExpressionValue(textView5, "binding.friendsListExpandableHeaderButton");
-                    charSequence = b.i(textView5, 2131888830, new Object[0], null, 4);
+                    charSequence = b.i(textView5, 2131888831, new Object[0], null, 4);
                 }
                 textView3.setText(charSequence);
-                int i2 = suggestedFriendsHeader.isExpanded() ? 2131231399 : 2131231398;
+                int i2 = suggestedFriendsHeader.isExpanded() ? 2131231405 : 2131231404;
                 TextView textView6 = this.binding.b;
                 m.checkNotNullExpressionValue(textView6, "binding.friendsListExpandableHeaderButton");
                 Drawable drawable = ContextCompat.getDrawable(textView6.getContext(), i2);
@@ -371,32 +371,32 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemUser(WidgetFriendsListAdapter widgetFriendsListAdapter) {
-            super(2131559007, widgetFriendsListAdapter);
+            super(2131559011, widgetFriendsListAdapter);
             m.checkNotNullParameter(widgetFriendsListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363247;
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363247);
+            int i = 2131363272;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363272);
             if (simpleDraweeSpanTextView != null) {
-                i = 2131363248;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363248);
+                i = 2131363273;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363273);
                 if (simpleDraweeView != null) {
-                    i = 2131363250;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363250);
+                    i = 2131363275;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363275);
                     if (linearLayout != null) {
-                        i = 2131363251;
-                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363251);
+                        i = 2131363276;
+                        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363276);
                         if (appCompatImageView != null) {
-                            i = 2131363252;
-                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131363252);
+                            i = 2131363277;
+                            AppCompatImageView appCompatImageView2 = (AppCompatImageView) view.findViewById(2131363277);
                             if (appCompatImageView2 != null) {
-                                i = 2131363257;
-                                TextView textView = (TextView) view.findViewById(2131363257);
+                                i = 2131363282;
+                                TextView textView = (TextView) view.findViewById(2131363282);
                                 if (textView != null) {
-                                    i = 2131363258;
-                                    StatusView statusView = (StatusView) view.findViewById(2131363258);
+                                    i = 2131363283;
+                                    StatusView statusView = (StatusView) view.findViewById(2131363283);
                                     if (statusView != null) {
-                                        i = 2131363259;
-                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363259);
+                                        i = 2131363284;
+                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363284);
                                         if (linearLayout2 != null) {
                                             WidgetFriendsListAdapterItemFriendBinding widgetFriendsListAdapterItemFriendBinding = new WidgetFriendsListAdapterItemFriendBinding((RelativeLayout) view, simpleDraweeSpanTextView, simpleDraweeView, linearLayout, appCompatImageView, appCompatImageView2, textView, statusView, linearLayout2);
                                             m.checkNotNullExpressionValue(widgetFriendsListAdapterItemFriendBinding, "WidgetFriendsListAdapter…endBinding.bind(itemView)");
@@ -431,7 +431,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemActivity");
             PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null);
-            SimpleDraweeView simpleDraweeView = this.binding.f1779c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1780c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, friend.getUser(), 2131165296, null, null, null, 56, null);
             this.binding.d.setOnClickListener(new WidgetFriendsListAdapter$ItemUser$onConfigure$2(this, friend));
@@ -512,7 +512,7 @@ public final class WidgetFriendsListAdapter extends MGRecyclerAdapterSimple<Frie
             case 4:
                 return new ItemSuggestedFriendHeader(this);
             case 5:
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559011, viewGroup, false);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559015, viewGroup, false);
                 Objects.requireNonNull(inflate, "rootView");
                 SuggestedFriendView suggestedFriendView = (SuggestedFriendView) inflate;
                 WidgetFriendsListAdapterSuggestedFriendBinding widgetFriendsListAdapterSuggestedFriendBinding = new WidgetFriendsListAdapterSuggestedFriendBinding(suggestedFriendView, suggestedFriendView);
diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java
index 9a45b61b84..e3a3a3310b 100644
--- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java
+++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsListLoadingAdapter.java
@@ -36,12 +36,12 @@ public final class WidgetFriendsListLoadingAdapter extends RecyclerView.Adapter<
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559009, viewGroup, false);
-        int i2 = 2131362101;
-        View findViewById = inflate.findViewById(2131362101);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559013, viewGroup, false);
+        int i2 = 2131362112;
+        View findViewById = inflate.findViewById(2131362112);
         if (findViewById != null) {
-            i2 = 2131362102;
-            View findViewById2 = inflate.findViewById(2131362102);
+            i2 = 2131362113;
+            View findViewById2 = inflate.findViewById(2131362113);
             if (findViewById2 != null) {
                 WidgetFriendsListAdapterItemLoadingBinding widgetFriendsListAdapterItemLoadingBinding = new WidgetFriendsListAdapterItemLoadingBinding((ConstraintLayout) inflate, findViewById, findViewById2);
                 m.checkNotNullExpressionValue(widgetFriendsListAdapterItemLoadingBinding, "WidgetFriendsListAdapter….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
index 8b9f2cfd82..2b81be3f67 100644
--- a/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guild_delete_feedback/GuildDeleteFeedbackSheetViewModel.java
@@ -17,7 +17,7 @@ import rx.subjects.PublishSubject;
 public final class GuildDeleteFeedbackSheetViewModel extends AppViewModel<FeedbackSheetViewModel.ViewState> implements FeedbackSheetViewModel {
     public static final Companion Companion = new Companion(null);
     private static final List<FeedbackIssue> REASONS = n.listOf((Object[]) new FeedbackIssue[]{FeedbackIssue.GUILD_DELETE_TOO_HARD, FeedbackIssue.GUILD_DELETE_TEST, FeedbackIssue.GUILD_DELETE_ACCIDENT, FeedbackIssue.GUILD_DELETE_TEMPLATE, FeedbackIssue.GUILD_DELETE_LONELY, FeedbackIssue.GUILD_DELETE_INACTIVE});
-    private final PublishSubject<FeedbackSheetViewModel.Event> eventSubject = PublishSubject.l0();
+    private final PublishSubject<FeedbackSheetViewModel.Event> eventSubject = PublishSubject.k0();
     private PendingFeedback.GuildDeleteFeedback pendingFeedback;
     private boolean submitted;
 
@@ -32,7 +32,7 @@ public final class GuildDeleteFeedbackSheetViewModel extends AppViewModel<Feedba
     }
 
     public GuildDeleteFeedbackSheetViewModel(long j) {
-        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, u.plus((Collection<? extends FeedbackIssue>) m.shuffled(REASONS), FeedbackIssue.GUILD_DELETE_OTHER), 2131889192, null, 2131889191, 8, null));
+        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, u.plus((Collection<? extends FeedbackIssue>) m.shuffled(REASONS), FeedbackIssue.GUILD_DELETE_OTHER), 2131889196, null, 2131889195, 8, null));
         this.pendingFeedback = new PendingFeedback.GuildDeleteFeedback(j, null, null, 6, null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2.java
new file mode 100644
index 0000000000..a4690c2161
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.guild_role_subscriptions;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: GuildRoleSubscriptionsFeatureFlag.kt */
+public final class GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2 extends o implements Function0<GuildRoleSubscriptionsFeatureFlag> {
+    public static final GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2 INSTANCE = new GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2();
+
+    public GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final GuildRoleSubscriptionsFeatureFlag mo1invoke() {
+        return new GuildRoleSubscriptionsFeatureFlag(null, null, 3, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag$observeCanGuildCreateRoleSubscriptions$1.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag$observeCanGuildCreateRoleSubscriptions$1.java
new file mode 100644
index 0000000000..f062d93204
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag$observeCanGuildCreateRoleSubscriptions$1.java
@@ -0,0 +1,24 @@
+package com.discord.widgets.guild_role_subscriptions;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: GuildRoleSubscriptionsFeatureFlag.kt */
+public final class GuildRoleSubscriptionsFeatureFlag$observeCanGuildCreateRoleSubscriptions$1 extends o implements Function0<Boolean> {
+    public final /* synthetic */ long $guildId;
+    public final /* synthetic */ GuildRoleSubscriptionsFeatureFlag this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public GuildRoleSubscriptionsFeatureFlag$observeCanGuildCreateRoleSubscriptions$1(GuildRoleSubscriptionsFeatureFlag guildRoleSubscriptionsFeatureFlag, long j) {
+        super(0);
+        this.this$0 = guildRoleSubscriptionsFeatureFlag;
+        this.$guildId = j;
+    }
+
+    /* Return type fixed from 'boolean' to match base method */
+    /* JADX WARNING: Unknown variable types count: 1 */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final Boolean mo1invoke() {
+        return this.this$0.canGuildCreateRoleSubscriptions(this.$guildId);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java
new file mode 100644
index 0000000000..a03e87980f
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java
@@ -0,0 +1,66 @@
+package com.discord.widgets.guild_role_subscriptions;
+
+import com.discord.models.experiments.domain.Experiment;
+import com.discord.stores.StoreExperiments;
+import com.discord.stores.StoreStream;
+import com.discord.stores.updates.ObservationDeck;
+import com.discord.stores.updates.ObservationDeckProvider;
+import d0.g;
+import d0.z.d.m;
+import kotlin.Lazy;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+/* compiled from: GuildRoleSubscriptionsFeatureFlag.kt */
+public final class GuildRoleSubscriptionsFeatureFlag {
+    public static final Companion Companion = new Companion(null);
+    private static final Lazy INSTANCE$delegate = g.lazy(GuildRoleSubscriptionsFeatureFlag$Companion$INSTANCE$2.INSTANCE);
+    private final ObservationDeck observationDeck;
+    private final StoreExperiments storeExperiments;
+
+    /* compiled from: GuildRoleSubscriptionsFeatureFlag.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final GuildRoleSubscriptionsFeatureFlag getINSTANCE() {
+            Lazy access$getINSTANCE$cp = GuildRoleSubscriptionsFeatureFlag.access$getINSTANCE$cp();
+            Companion companion = GuildRoleSubscriptionsFeatureFlag.Companion;
+            return (GuildRoleSubscriptionsFeatureFlag) access$getINSTANCE$cp.getValue();
+        }
+    }
+
+    public GuildRoleSubscriptionsFeatureFlag() {
+        this(null, null, 3, null);
+    }
+
+    public GuildRoleSubscriptionsFeatureFlag(StoreExperiments storeExperiments, ObservationDeck observationDeck) {
+        m.checkNotNullParameter(storeExperiments, "storeExperiments");
+        m.checkNotNullParameter(observationDeck, "observationDeck");
+        this.storeExperiments = storeExperiments;
+        this.observationDeck = observationDeck;
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ GuildRoleSubscriptionsFeatureFlag(StoreExperiments storeExperiments, ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this((i & 1) != 0 ? StoreStream.Companion.getExperiments() : storeExperiments, (i & 2) != 0 ? ObservationDeckProvider.get() : observationDeck);
+    }
+
+    public static final /* synthetic */ Lazy access$getINSTANCE$cp() {
+        return INSTANCE$delegate;
+    }
+
+    public final boolean canGuildCreateRoleSubscriptions(long j) {
+        Experiment guildExperiment = this.storeExperiments.getGuildExperiment("2021-06_guild_role_subscriptions", j, false);
+        return guildExperiment != null && guildExperiment.getBucket() == 1;
+    }
+
+    public final Observable<Boolean> observeCanGuildCreateRoleSubscriptions(long j) {
+        Observable<Boolean> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeExperiments}, false, null, null, new GuildRoleSubscriptionsFeatureFlag$observeCanGuildCreateRoleSubscriptions$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java
index 8a1b0e3db3..52657d2043 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java
@@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetGuildFolderSettings$binding$2 extends k
 
     public final WidgetGuildFolderSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362965;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362965);
+        int i = 2131362990;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362990);
         if (textInputLayout != null) {
-            i = 2131363360;
-            TextView textView = (TextView) view.findViewById(2131363360);
+            i = 2131363386;
+            TextView textView = (TextView) view.findViewById(2131363386);
             if (textView != null) {
-                i = 2131363361;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363361);
+                i = 2131363387;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363387);
                 if (relativeLayout != null) {
-                    i = 2131363362;
-                    View findViewById = view.findViewById(2131363362);
+                    i = 2131363388;
+                    View findViewById = view.findViewById(2131363388);
                     if (findViewById != null) {
-                        i = 2131363363;
-                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363363);
+                        i = 2131363389;
+                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363389);
                         if (floatingActionButton != null) {
                             return new WidgetGuildFolderSettingsBinding((CoordinatorLayout) view, textInputLayout, textView, relativeLayout, findViewById, floatingActionButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
index 4b436de8f2..97935a64de 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java
@@ -70,7 +70,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
     }
 
     public WidgetGuildFolderSettings() {
-        super(2131559031);
+        super(2131559035);
         WidgetGuildFolderSettings$viewModel$2 widgetGuildFolderSettings$viewModel$2 = new WidgetGuildFolderSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildFolderSettingsViewModel.class), new WidgetGuildFolderSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildFolderSettings$viewModel$2));
@@ -109,7 +109,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         if (viewState instanceof WidgetGuildFolderSettingsViewModel.ViewState.Loaded) {
             View view = getBinding().e;
             m.checkNotNullExpressionValue(view, "binding.guildFolderSettingsColorDisplay");
-            Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231088);
+            Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231093);
             WidgetGuildFolderSettingsViewModel.ViewState.Loaded loaded = (WidgetGuildFolderSettingsViewModel.ViewState.Loaded) viewState;
             Integer rgbColorToARGB = rgbColorToARGB(loaded.getFormState().getColor());
             if (rgbColorToARGB != null) {
@@ -150,7 +150,7 @@ public final class WidgetGuildFolderSettings extends AppFragment {
                     Selection.setSelection(text, ViewExtensions.getTextOrEmpty(textInputLayout5).length());
                 }
             }
-            TextView textView = getBinding().f1795c;
+            TextView textView = getBinding().f1796c;
             m.checkNotNullExpressionValue(textView, "binding.guildFolderColorName");
             StringBuilder sb = new StringBuilder();
             sb.append('#');
@@ -225,27 +225,27 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         int intValue = rgbColorToARGB != null ? rgbColorToARGB.intValue() : ColorCompat.getThemedColor(getContext(), 2130968994);
         e.k kVar = new e.k();
         kVar.h = intValue;
-        kVar.f1461s = ColorCompat.getThemedColor(getContext(), 2130968904);
+        kVar.f1456s = ColorCompat.getThemedColor(getContext(), 2130968904);
         kVar.i = false;
         kVar.g = getColorsToDisplay(intValue);
-        kVar.a = 2131889240;
+        kVar.a = 2131889247;
         kVar.r = ColorCompat.getThemedColor(getContext(), 2130968932);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f1462x = fontUtils.getThemedFontResId(getContext(), 2130969320);
+        kVar.f1457x = fontUtils.getThemedFontResId(getContext(), 2130969320);
         kVar.o = ColorCompat.getThemedColor(getContext(), 2130968892);
-        kVar.f1460c = 2131887417;
+        kVar.f1455c = 2131887417;
         kVar.v = ColorCompat.getColor(getContext(), 2131100428);
         kVar.b = 2131887418;
         kVar.p = ColorCompat.getThemedColor(getContext(), 2130968994);
-        kVar.d = 2131893132;
+        kVar.d = 2131893215;
         kVar.l = true;
-        kVar.e = 2131892641;
+        kVar.e = 2131892722;
         kVar.w = ColorCompat.getColor(getContext(), 2131100428);
-        kVar.f1463y = fontUtils.getThemedFontResId(getContext(), 2130969326);
+        kVar.f1458y = fontUtils.getThemedFontResId(getContext(), 2130969326);
         kVar.q = ColorCompat.getThemedColor(getContext(), 2130968900);
         kVar.t = ColorCompat.getThemedColor(getContext(), 2130968988);
-        kVar.u = 2131231099;
-        kVar.f1464z = fontUtils.getThemedFontResId(getContext(), 2130969325);
+        kVar.u = 2131231104;
+        kVar.f1459z = fontUtils.getThemedFontResId(getContext(), 2130969325);
         e a = kVar.a();
         a.j = new WidgetGuildFolderSettings$launchColorPicker$1(this);
         AppFragment.hideKeyboard$default(this, null, 1, null);
@@ -264,15 +264,15 @@ public final class WidgetGuildFolderSettings extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131893173);
+        setActionBarTitle(2131893256);
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable s2 = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).s();
-        m.checkNotNullExpressionValue(s2, "viewModel.observeViewSta…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, WidgetGuildFolderSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildFolderSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).r();
+        m.checkNotNullExpressionValue(r, "viewModel.observeViewSta…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, WidgetGuildFolderSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildFolderSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetGuildFolderSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildFolderSettings$onViewBoundOrOnResume$2(this), 62, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
index 91f932652f..091de91e3f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java
@@ -447,7 +447,7 @@ public final class WidgetGuildFolderSettingsViewModel extends AppViewModel<ViewS
         this.folderId = j;
         this.storeUserSettings = storeUserSettings;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Companion.access$observeStoreState(Companion, j, storeUserSettings, storeGuildsSorted)), this, null, 2, null), WidgetGuildFolderSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -469,12 +469,12 @@ public final class WidgetGuildFolderSettingsViewModel extends AppViewModel<ViewS
 
     private final void emitUpdateFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.UpdateFolderSettingsFailure(2131888049));
+        publishSubject.j.onNext(new Event.UpdateFolderSettingsFailure(2131888048));
     }
 
     private final void emitUpdateSuccessEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.UpdateFolderSettingsSuccess(2131889245));
+        publishSubject.j.onNext(new Event.UpdateFolderSettingsSuccess(2131889252));
     }
 
     private final void handleStoreState(StoreState storeState) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java
index 1af7bd4b16..2bc2a78659 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetGuildSelector$binding$2 extends k imple
 
     public final WidgetGuildSelectorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363342;
-        TextView textView = (TextView) view.findViewById(2131363342);
+        int i = 2131363368;
+        TextView textView = (TextView) view.findViewById(2131363368);
         if (textView != null) {
-            i = 2131363447;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363447);
+            i = 2131363474;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363474);
             if (recyclerView != null) {
                 return new WidgetGuildSelectorBinding((NestedScrollView) view, textView, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java
index b9a6bdc3cc..be814be397 100644
--- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java
+++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java
@@ -74,17 +74,17 @@ public final class WidgetGuildSelector extends AppBottomSheet {
                 m.checkNotNullParameter(adapter, "adapter");
                 this.noGuildStringId = i2;
                 View view = this.itemView;
-                int i3 = 2131363645;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363645);
+                int i3 = 2131363686;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363686);
                 if (frameLayout != null) {
-                    i3 = 2131363681;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363681);
+                    i3 = 2131363722;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363722);
                     if (simpleDraweeView != null) {
-                        i3 = 2131363710;
-                        TextView textView = (TextView) view.findViewById(2131363710);
+                        i3 = 2131363751;
+                        TextView textView = (TextView) view.findViewById(2131363751);
                         if (textView != null) {
-                            i3 = 2131363713;
-                            TextView textView2 = (TextView) view.findViewById(2131363713);
+                            i3 = 2131363754;
+                            TextView textView2 = (TextView) view.findViewById(2131363754);
                             if (textView2 != null) {
                                 WidgetGuildSelectorItemBinding widgetGuildSelectorItemBinding = new WidgetGuildSelectorItemBinding((LinearLayout) view, frameLayout, simpleDraweeView, textView, textView2);
                                 m.checkNotNullExpressionValue(widgetGuildSelectorItemBinding, "WidgetGuildSelectorItemBinding.bind(itemView)");
@@ -129,13 +129,13 @@ public final class WidgetGuildSelector extends AppBottomSheet {
                         z2 = true;
                     }
                 }
-                SimpleDraweeView simpleDraweeView = this.binding.f1810c;
+                SimpleDraweeView simpleDraweeView = this.binding.f1811c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIcon");
                 Guild guild4 = item.getGuild();
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
                 Integer valueOf = Integer.valueOf(ColorCompat.getThemedColor(view, 2130968904));
-                SimpleDraweeView simpleDraweeView2 = this.binding.f1810c;
+                SimpleDraweeView simpleDraweeView2 = this.binding.f1811c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.itemIcon");
                 SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, false, guild4, (float) simpleDraweeView2.getResources().getDimensionPixelSize(2131165445), null, valueOf, null, null, true, null, 360, null);
                 FrameLayout frameLayout = this.binding.b;
@@ -166,7 +166,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ItemGuild onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ItemGuild(2131559046, this, this.noGuildStringId);
+            return new ItemGuild(2131559050, this, this.noGuildStringId);
         }
     }
 
@@ -193,7 +193,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
                 str = "GUILD_SELECTOR_DEFAULT_REQUEST_KEY";
             }
             boolean z3 = (i2 & 4) != 0 ? false : z2;
-            int i3 = (i2 & 8) != 0 ? 2131891440 : i;
+            int i3 = (i2 & 8) != 0 ? 2131891511 : i;
             if ((i2 & 16) != 0) {
                 filterFunction = null;
             }
@@ -395,11 +395,11 @@ public final class WidgetGuildSelector extends AppBottomSheet {
     }
 
     private final Observable<List<Item>> get(boolean z2, FilterFunction filterFunction) {
-        Observable<R> G = StoreStream.Companion.getGuildsSorted().observeOrderedGuilds().G(new WidgetGuildSelector$get$1(filterFunction, z2));
-        m.checkNotNullExpressionValue(G, "StoreStream.getGuildsSor….map { Item(it) }\n      }");
-        Observable<List<Item>> s2 = ObservableExtensionsKt.computationLatest(G).s();
-        m.checkNotNullExpressionValue(s2, "StoreStream.getGuildsSor…  .distinctUntilChanged()");
-        return s2;
+        Observable<R> F = StoreStream.Companion.getGuildsSorted().observeOrderedGuilds().F(new WidgetGuildSelector$get$1(filterFunction, z2));
+        m.checkNotNullExpressionValue(F, "StoreStream.getGuildsSor….map { Item(it) }\n      }");
+        Observable<List<Item>> r = ObservableExtensionsKt.computationLatest(F).r();
+        m.checkNotNullExpressionValue(r, "StoreStream.getGuildsSor…  .distinctUntilChanged()");
+        return r;
     }
 
     private final WidgetGuildSelectorBinding getBinding() {
@@ -443,7 +443,7 @@ public final class WidgetGuildSelector extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559045;
+        return 2131559049;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java
index 196c4c27fc..ae4a9218a2 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/FolderContextMenuViewModel.java
@@ -303,7 +303,7 @@ public final class FolderContextMenuViewModel extends AppViewModel<ViewState> {
         this.folderId = j;
         this.restAPI = restAPI;
         this.storeStateObservable = observable;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.guildIds = n.emptyList();
         this.unreadGuildIds = n0.emptySet();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), FolderContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -371,9 +371,9 @@ public final class FolderContextMenuViewModel extends AppViewModel<ViewState> {
         for (Number number : intersect) {
             arrayList.add(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.ackGuild(number.longValue()), false, 1, null));
         }
-        Observable g02 = Observable.H(Observable.i0(new q(arrayList))).g0();
-        m.checkNotNullExpressionValue(g02, "Observable\n        .merg…tCalls)\n        .toList()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(g02, this, null, 2, null), FolderContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new FolderContextMenuViewModel$onMarkAsReadClicked$1(this), 62, (Object) null);
+        Observable f02 = Observable.G(Observable.h0(new q(arrayList))).f0();
+        m.checkNotNullExpressionValue(f02, "Observable\n        .merg…tCalls)\n        .toList()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(f02, this, null, 2, null), FolderContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new FolderContextMenuViewModel$onMarkAsReadClicked$1(this), 62, (Object) null);
     }
 
     public final void onSettingsClicked() {
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java
index 067f3298fe..ed905c2f4c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/GuildContextMenuViewModel.java
@@ -364,7 +364,7 @@ public final class GuildContextMenuViewModel extends AppViewModel<ViewState> {
         this.guildId = j;
         this.restAPI = restAPI;
         this.storeStateObservable = observable;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), GuildContextMenuViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
index f508af36cf..d00c197d8f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java
@@ -64,7 +64,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
         }
 
         private final int computeMaxContextMenuHeight(Context context) {
-            WidgetFolderContextMenuBinding a = WidgetFolderContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559003, (ViewGroup) null, false));
+            WidgetFolderContextMenuBinding a = WidgetFolderContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559007, (ViewGroup) null, false));
             m.checkNotNullExpressionValue(a, "WidgetFolderContextMenuB…om(context), null, false)");
             CardView cardView = a.a;
             m.checkNotNullExpressionValue(cardView, "WidgetFolderContextMenuB…ntext), null, false).root");
@@ -144,7 +144,7 @@ public final class WidgetFolderContextMenu extends AppFragment {
     }
 
     public WidgetFolderContextMenu() {
-        super(2131559003);
+        super(2131559007);
         WidgetFolderContextMenu$viewModel$2 widgetFolderContextMenu$viewModel$2 = new WidgetFolderContextMenu$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(FolderContextMenuViewModel.class), new WidgetFolderContextMenu$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetFolderContextMenu$viewModel$2));
@@ -202,12 +202,12 @@ public final class WidgetFolderContextMenu extends AppFragment {
     }
 
     private final void configureValidUI(FolderContextMenuViewModel.ViewState.Valid valid) {
-        TextView textView = getBinding().f1777c;
+        TextView textView = getBinding().f1778c;
         m.checkNotNullExpressionValue(textView, "binding.folderContextMenuHeader");
         CharSequence name = valid.getFolder().getName();
         boolean z2 = false;
         if (name == null) {
-            name = b.j(this, 2131889244, new Object[0], null, 4);
+            name = b.j(this, 2131889251, new Object[0], null, 4);
         }
         textView.setText(name);
         getBinding().d.setOnClickListener(new WidgetFolderContextMenu$configureValidUI$1(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
index b5ade44454..f11b9357b0 100644
--- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
+++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java
@@ -63,7 +63,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
         }
 
         private final int computeMaxContextMenuHeight(Context context) {
-            WidgetGuildContextMenuBinding a = WidgetGuildContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559029, (ViewGroup) null, false));
+            WidgetGuildContextMenuBinding a = WidgetGuildContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559033, (ViewGroup) null, false));
             m.checkNotNullExpressionValue(a, "WidgetGuildContextMenuBi…om(context), null, false)");
             CardView cardView = a.a;
             m.checkNotNullExpressionValue(cardView, "WidgetGuildContextMenuBi…ntext), null, false).root");
@@ -143,7 +143,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
     }
 
     public WidgetGuildContextMenu() {
-        super(2131559029);
+        super(2131559033);
         WidgetGuildContextMenu$viewModel$2 widgetGuildContextMenu$viewModel$2 = new WidgetGuildContextMenu$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildContextMenuViewModel.class), new WidgetGuildContextMenu$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildContextMenu$viewModel$2));
@@ -197,7 +197,7 @@ public final class WidgetGuildContextMenu extends AppFragment {
     }
 
     private final void configureValidUI(GuildContextMenuViewModel.ViewState.Valid valid) {
-        TextView textView = getBinding().f1793c;
+        TextView textView = getBinding().f1794c;
         m.checkNotNullExpressionValue(textView, "binding.guildContextMenuHeader");
         textView.setText(valid.getGuild().getName());
         getBinding().e.setOnClickListener(new WidgetGuildContextMenu$configureValidUI$1(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java b/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
index 0764ac9a02..eaf4350f34 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/ChannelTemplate.java
@@ -6,7 +6,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public abstract class ChannelTemplate {
 
     /* renamed from: id  reason: collision with root package name */
-    private final Long f2134id;
+    private final Long f2140id;
     private final String name;
 
     /* compiled from: StockGuildTemplate.kt */
@@ -28,7 +28,7 @@ public abstract class ChannelTemplate {
     }
 
     private ChannelTemplate(Long l, String str) {
-        this.f2134id = l;
+        this.f2140id = l;
         this.name = str;
     }
 
@@ -37,7 +37,7 @@ public abstract class ChannelTemplate {
     }
 
     public final Long getId() {
-        return this.f2134id;
+        return this.f2140id;
     }
 
     public final String getName() {
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java b/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java
index 932c6f1997..bc992671e8 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java
@@ -56,7 +56,7 @@ public interface GuildCreateCloneViews {
             SimpleDraweeView simpleDraweeView = widgetGuildCloneBinding.e.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildCreateIconUploader.iconUploaderImage");
             this.iconUploaderImage = simpleDraweeView;
-            Group group = widgetGuildCloneBinding.e.f102c;
+            Group group = widgetGuildCloneBinding.e.f103c;
             m.checkNotNullExpressionValue(group, "binding.guildCreateIconUploader.placeholderGroup");
             this.iconUploaderPlaceholderGroup = group;
             i0 i0Var = widgetGuildCloneBinding.e;
@@ -126,7 +126,7 @@ public interface GuildCreateCloneViews {
             SimpleDraweeView simpleDraweeView = widgetGuildCreateBinding.d.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildCreateIconUploader.iconUploaderImage");
             this.iconUploaderImage = simpleDraweeView;
-            Group group = widgetGuildCreateBinding.d.f102c;
+            Group group = widgetGuildCreateBinding.d.f103c;
             m.checkNotNullExpressionValue(group, "binding.guildCreateIconUploader.placeholderGroup");
             this.iconUploaderPlaceholderGroup = group;
             i0 i0Var = widgetGuildCreateBinding.d;
@@ -134,7 +134,7 @@ public interface GuildCreateCloneViews {
             ConstraintLayout constraintLayout = i0Var.a;
             m.checkNotNullExpressionValue(constraintLayout, "binding.guildCreateIconUploader.root");
             this.guildCreateIconUploader = constraintLayout;
-            LinkifiedTextView linkifiedTextView = widgetGuildCreateBinding.f1794c;
+            LinkifiedTextView linkifiedTextView = widgetGuildCreateBinding.f1795c;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.guildCreateGuidelines");
             this.guidelinesTextView = linkifiedTextView;
             ScreenTitleView screenTitleView = widgetGuildCreateBinding.f;
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java b/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java
index 72a950a8f2..bbbc8366ea 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java
@@ -104,11 +104,11 @@ public final class GuildTemplateChannelsView extends LinearLayout {
             super(i, channelsAdapter);
             m.checkNotNullParameter(channelsAdapter, "adapter");
             View view = this.itemView;
-            int i2 = 2131363448;
-            ImageView imageView = (ImageView) view.findViewById(2131363448);
+            int i2 = 2131363489;
+            ImageView imageView = (ImageView) view.findViewById(2131363489);
             if (imageView != null) {
-                i2 = 2131363449;
-                TextView textView = (TextView) view.findViewById(2131363449);
+                i2 = 2131363490;
+                TextView textView = (TextView) view.findViewById(2131363490);
                 if (textView != null) {
                     GuildTemplateChannelsItemViewBinding guildTemplateChannelsItemViewBinding = new GuildTemplateChannelsItemViewBinding((LinearLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(guildTemplateChannelsItemViewBinding, "GuildTemplateChannelsIte…iewBinding.bind(itemView)");
@@ -122,17 +122,17 @@ public final class GuildTemplateChannelsView extends LinearLayout {
         public void onConfigure(int i, ChannelDataPayload channelDataPayload) {
             m.checkNotNullParameter(channelDataPayload, "data");
             super.onConfigure(i, (int) channelDataPayload);
-            TextView textView = this.binding.f1614c;
+            TextView textView = this.binding.f1610c;
             m.checkNotNullExpressionValue(textView, "binding.guildTemplateChannelsItemName");
             textView.setText(AnimatableValueParser.y0(channelDataPayload.getChannel()));
             if (AnimatableValueParser.f1(channelDataPayload.getChannel())) {
-                this.binding.b.setImageResource(2131231510);
-            } else if (AnimatableValueParser.z1(channelDataPayload.getChannel())) {
-                this.binding.b.setImageResource(2131231493);
+                this.binding.b.setImageResource(2131231516);
+            } else if (AnimatableValueParser.B1(channelDataPayload.getChannel())) {
+                this.binding.b.setImageResource(2131231499);
             } else {
-                this.binding.b.setImageResource(2131231484);
+                this.binding.b.setImageResource(2131231490);
             }
-            if (channelDataPayload.getChannel().q() > 0) {
+            if (channelDataPayload.getChannel().r() > 0) {
                 ImageView imageView = this.binding.b;
                 m.checkNotNullExpressionValue(imageView, "binding.guildTemplateChannelsItemImage");
                 ViewGroup.LayoutParams layoutParams = imageView.getLayoutParams();
@@ -166,7 +166,7 @@ public final class GuildTemplateChannelsView extends LinearLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558518, (ViewGroup) this, false);
         addView(inflate);
-        RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363450);
+        RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363491);
         if (recyclerView != null) {
             GuildTemplateChannelsViewBinding guildTemplateChannelsViewBinding = new GuildTemplateChannelsViewBinding((LinearLayout) inflate, recyclerView);
             m.checkNotNullExpressionValue(guildTemplateChannelsViewBinding, "GuildTemplateChannelsVie…rom(context), this, true)");
@@ -178,7 +178,7 @@ public final class GuildTemplateChannelsView extends LinearLayout {
             recyclerView.setHasFixedSize(false);
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363450)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363491)));
     }
 
     public final void updateView(List<Channel> list) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java b/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java
index 5c3d3ef553..d80c4e6ae9 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java
@@ -41,133 +41,133 @@ public enum StockGuildTemplate {
         m.checkNotNullParameter(resources, "resources");
         switch (ordinal()) {
             case 0:
-                String string = resources.getString(2131890024);
+                String string = resources.getString(2131890040);
                 m.checkNotNullExpressionValue(string, "resources.getString(R.st…plate_name_category_text)");
-                String string2 = resources.getString(2131890031);
+                String string2 = resources.getString(2131890048);
                 m.checkNotNullExpressionValue(string2, "resources.getString(R.st…ld_template_name_general)");
-                String string3 = resources.getString(2131890028);
+                String string3 = resources.getString(2131890045);
                 m.checkNotNullExpressionValue(string3, "resources.getString(R.st…guild_template_name_game)");
-                String string4 = resources.getString(2131890039);
+                String string4 = resources.getString(2131890058);
                 m.checkNotNullExpressionValue(string4, "resources.getString(R.st…uild_template_name_music)");
                 List access$createCategorySection = StockGuildTemplateKt.access$createCategorySection(string, 100, 0, new ChannelTemplate.SystemChannel(string2), new ChannelTemplate.NormalChannel(string3), new ChannelTemplate.NormalChannel(string4));
-                String string5 = resources.getString(2131890025);
+                String string5 = resources.getString(2131890041);
                 m.checkNotNullExpressionValue(string5, "resources.getString(R.st…late_name_category_voice)");
-                String string6 = resources.getString(2131890052);
+                String string6 = resources.getString(2131890072);
                 m.checkNotNullExpressionValue(string6, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string7 = resources.getString(2131890056);
+                String string7 = resources.getString(2131890077);
                 m.checkNotNullExpressionValue(string7, "resources.getString(R.st…e_name_voice_stream_room)");
                 return u.plus((Collection) access$createCategorySection, (Iterable) StockGuildTemplateKt.access$createCategorySection(string5, 200, 2, new ChannelTemplate.NormalChannel(string6), new ChannelTemplate.NormalChannel(string7)));
             case 1:
-                String string8 = resources.getString(2131890023);
+                String string8 = resources.getString(2131890039);
                 m.checkNotNullExpressionValue(string8, "resources.getString(R.st…ame_category_information)");
-                String string9 = resources.getString(2131890059);
+                String string9 = resources.getString(2131890081);
                 m.checkNotNullExpressionValue(string9, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string10 = resources.getString(2131890041);
+                String string10 = resources.getString(2131890060);
                 m.checkNotNullExpressionValue(string10, "resources.getString(R.st…ate_name_notes_resources)");
                 List access$createCategorySection2 = StockGuildTemplateKt.access$createCategorySection(string8, 100, 0, new ChannelTemplate.NormalChannel(string9), new ChannelTemplate.NormalChannel(string10));
-                String string11 = resources.getString(2131890024);
+                String string11 = resources.getString(2131890040);
                 m.checkNotNullExpressionValue(string11, "resources.getString(R.st…plate_name_category_text)");
-                String string12 = resources.getString(2131890031);
+                String string12 = resources.getString(2131890048);
                 m.checkNotNullExpressionValue(string12, "resources.getString(R.st…ld_template_name_general)");
-                String string13 = resources.getString(2131890034);
+                String string13 = resources.getString(2131890052);
                 m.checkNotNullExpressionValue(string13, "resources.getString(R.st…plate_name_homework_help)");
-                String string14 = resources.getString(2131890045);
+                String string14 = resources.getString(2131890064);
                 m.checkNotNullExpressionValue(string14, "resources.getString(R.st…te_name_session_planning)");
-                String string15 = resources.getString(2131890042);
+                String string15 = resources.getString(2131890061);
                 m.checkNotNullExpressionValue(string15, "resources.getString(R.st…_template_name_off_topic)");
                 List plus = u.plus((Collection) access$createCategorySection2, (Iterable) StockGuildTemplateKt.access$createCategorySection(string11, 200, 0, new ChannelTemplate.SystemChannel(string12), new ChannelTemplate.NormalChannel(string13), new ChannelTemplate.NormalChannel(string14), new ChannelTemplate.NormalChannel(string15)));
-                String string16 = resources.getString(2131890025);
+                String string16 = resources.getString(2131890041);
                 m.checkNotNullExpressionValue(string16, "resources.getString(R.st…late_name_category_voice)");
-                String string17 = resources.getString(2131890052);
+                String string17 = resources.getString(2131890072);
                 m.checkNotNullExpressionValue(string17, "resources.getString(R.st…mplate_name_voice_lounge)");
-                return u.plus((Collection) plus, (Iterable) StockGuildTemplateKt.access$createCategorySection(string16, 300, 2, new ChannelTemplate.NormalChannel(string17), new ChannelTemplate.NormalChannel(b.h(resources, 2131890057, new Object[]{"1"}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.h(resources, 2131890057, new Object[]{"2"}, null, 4).toString())));
+                return u.plus((Collection) plus, (Iterable) StockGuildTemplateKt.access$createCategorySection(string16, 300, 2, new ChannelTemplate.NormalChannel(string17), new ChannelTemplate.NormalChannel(b.h(resources, 2131890078, new Object[]{"1"}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.h(resources, 2131890078, new Object[]{"2"}, null, 4).toString())));
             case 2:
-                String string18 = resources.getString(2131890024);
+                String string18 = resources.getString(2131890040);
                 m.checkNotNullExpressionValue(string18, "resources.getString(R.st…plate_name_category_text)");
-                String string19 = resources.getString(2131890031);
+                String string19 = resources.getString(2131890048);
                 m.checkNotNullExpressionValue(string19, "resources.getString(R.st…ld_template_name_general)");
-                String string20 = resources.getString(2131890026);
+                String string20 = resources.getString(2131890042);
                 m.checkNotNullExpressionValue(string20, "resources.getString(R.st…ame_clips_and_highlights)");
                 List access$createCategorySection3 = StockGuildTemplateKt.access$createCategorySection(string18, 100, 0, new ChannelTemplate.SystemChannel(string19), new ChannelTemplate.NormalChannel(string20));
-                String string21 = resources.getString(2131890025);
+                String string21 = resources.getString(2131890041);
                 m.checkNotNullExpressionValue(string21, "resources.getString(R.st…late_name_category_voice)");
-                String string22 = resources.getString(2131890051);
+                String string22 = resources.getString(2131890071);
                 m.checkNotNullExpressionValue(string22, "resources.getString(R.st…emplate_name_voice_lobby)");
-                String string23 = resources.getString(2131890049);
+                String string23 = resources.getString(2131890069);
                 m.checkNotNullExpressionValue(string23, "resources.getString(R.st…mplate_name_voice_gaming)");
                 return u.plus((Collection) access$createCategorySection3, (Iterable) StockGuildTemplateKt.access$createCategorySection(string21, 200, 2, new ChannelTemplate.NormalChannel(string22), new ChannelTemplate.NormalChannel(string23)));
             case 3:
-                String string24 = resources.getString(2131890023);
+                String string24 = resources.getString(2131890039);
                 m.checkNotNullExpressionValue(string24, "resources.getString(R.st…ame_category_information)");
-                String string25 = resources.getString(2131890059);
+                String string25 = resources.getString(2131890081);
                 m.checkNotNullExpressionValue(string25, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string26 = resources.getString(2131890022);
+                String string26 = resources.getString(2131890035);
                 m.checkNotNullExpressionValue(string26, "resources.getString(R.st…plate_name_announcements)");
                 List access$createCategorySection4 = StockGuildTemplateKt.access$createCategorySection(string24, 100, 0, new ChannelTemplate.NormalChannel(string25), new ChannelTemplate.NormalChannel(string26));
-                String string27 = resources.getString(2131890024);
+                String string27 = resources.getString(2131890040);
                 m.checkNotNullExpressionValue(string27, "resources.getString(R.st…plate_name_category_text)");
-                String string28 = resources.getString(2131890031);
+                String string28 = resources.getString(2131890048);
                 m.checkNotNullExpressionValue(string28, "resources.getString(R.st…ld_template_name_general)");
-                String string29 = resources.getString(2131890027);
+                String string29 = resources.getString(2131890044);
                 m.checkNotNullExpressionValue(string29, "resources.getString(R.st…ild_template_name_events)");
-                String string30 = resources.getString(2131890035);
+                String string30 = resources.getString(2131890053);
                 m.checkNotNullExpressionValue(string30, "resources.getString(R.st…_name_ideas_and_feedback)");
                 List plus2 = u.plus((Collection) access$createCategorySection4, (Iterable) StockGuildTemplateKt.access$createCategorySection(string27, 200, 0, new ChannelTemplate.SystemChannel(string28), new ChannelTemplate.NormalChannel(string29), new ChannelTemplate.NormalChannel(string30)));
-                String string31 = resources.getString(2131890025);
+                String string31 = resources.getString(2131890041);
                 m.checkNotNullExpressionValue(string31, "resources.getString(R.st…late_name_category_voice)");
-                String string32 = resources.getString(2131890052);
+                String string32 = resources.getString(2131890072);
                 m.checkNotNullExpressionValue(string32, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string33 = resources.getString(2131890048);
+                String string33 = resources.getString(2131890067);
                 m.checkNotNullExpressionValue(string33, "resources.getString(R.st…_voice_community_hangout)");
-                String string34 = resources.getString(2131890056);
+                String string34 = resources.getString(2131890077);
                 m.checkNotNullExpressionValue(string34, "resources.getString(R.st…e_name_voice_stream_room)");
                 return u.plus((Collection) plus2, (Iterable) StockGuildTemplateKt.access$createCategorySection(string31, 300, 2, new ChannelTemplate.NormalChannel(string32), new ChannelTemplate.NormalChannel(string33), new ChannelTemplate.NormalChannel(string34)));
             case 4:
-                String string35 = resources.getString(2131890023);
+                String string35 = resources.getString(2131890039);
                 m.checkNotNullExpressionValue(string35, "resources.getString(R.st…ame_category_information)");
-                String string36 = resources.getString(2131890059);
+                String string36 = resources.getString(2131890081);
                 m.checkNotNullExpressionValue(string36, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string37 = resources.getString(2131890022);
+                String string37 = resources.getString(2131890035);
                 m.checkNotNullExpressionValue(string37, "resources.getString(R.st…plate_name_announcements)");
                 List access$createCategorySection5 = StockGuildTemplateKt.access$createCategorySection(string35, 100, 0, new ChannelTemplate.NormalChannel(string36), new ChannelTemplate.NormalChannel(string37));
-                String string38 = resources.getString(2131890024);
+                String string38 = resources.getString(2131890040);
                 m.checkNotNullExpressionValue(string38, "resources.getString(R.st…plate_name_category_text)");
-                String string39 = resources.getString(2131890031);
+                String string39 = resources.getString(2131890048);
                 m.checkNotNullExpressionValue(string39, "resources.getString(R.st…ld_template_name_general)");
-                String string40 = resources.getString(2131890036);
+                String string40 = resources.getString(2131890055);
                 m.checkNotNullExpressionValue(string40, "resources.getString(R.st…plate_name_meeting_plans)");
                 List plus3 = u.plus((Collection) access$createCategorySection5, (Iterable) StockGuildTemplateKt.access$createCategorySection(string38, 200, 0, new ChannelTemplate.SystemChannel(string39), new ChannelTemplate.NormalChannel(string40)));
-                String string41 = resources.getString(2131890025);
+                String string41 = resources.getString(2131890041);
                 m.checkNotNullExpressionValue(string41, "resources.getString(R.st…late_name_category_voice)");
-                String string42 = resources.getString(2131890052);
+                String string42 = resources.getString(2131890072);
                 m.checkNotNullExpressionValue(string42, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string43 = resources.getString(2131890053);
+                String string43 = resources.getString(2131890073);
                 m.checkNotNullExpressionValue(string43, "resources.getString(R.st…_name_voice_meeting_room)");
                 return u.plus((Collection) plus3, (Iterable) StockGuildTemplateKt.access$createCategorySection(string41, 300, 2, new ChannelTemplate.NormalChannel(string42), new ChannelTemplate.NormalChannel(string43)));
             case 5:
-                String string44 = resources.getString(2131890023);
+                String string44 = resources.getString(2131890039);
                 m.checkNotNullExpressionValue(string44, "resources.getString(R.st…ame_category_information)");
-                String string45 = resources.getString(2131890059);
+                String string45 = resources.getString(2131890081);
                 m.checkNotNullExpressionValue(string45, "resources.getString(R.st…e_name_welcome_and_rules)");
-                String string46 = resources.getString(2131890022);
+                String string46 = resources.getString(2131890035);
                 m.checkNotNullExpressionValue(string46, "resources.getString(R.st…plate_name_announcements)");
-                String string47 = resources.getString(2131890044);
+                String string47 = resources.getString(2131890063);
                 m.checkNotNullExpressionValue(string47, "resources.getString(R.st…_template_name_resources)");
                 List access$createCategorySection6 = StockGuildTemplateKt.access$createCategorySection(string44, 100, 0, new ChannelTemplate.NormalChannel(string45), new ChannelTemplate.NormalChannel(string46), new ChannelTemplate.NormalChannel(string47));
-                String string48 = resources.getString(2131890024);
+                String string48 = resources.getString(2131890040);
                 m.checkNotNullExpressionValue(string48, "resources.getString(R.st…plate_name_category_text)");
-                String string49 = resources.getString(2131890031);
+                String string49 = resources.getString(2131890048);
                 m.checkNotNullExpressionValue(string49, "resources.getString(R.st…ld_template_name_general)");
-                String string50 = resources.getString(2131890036);
+                String string50 = resources.getString(2131890055);
                 m.checkNotNullExpressionValue(string50, "resources.getString(R.st…plate_name_meeting_plans)");
-                String string51 = resources.getString(2131890042);
+                String string51 = resources.getString(2131890061);
                 m.checkNotNullExpressionValue(string51, "resources.getString(R.st…_template_name_off_topic)");
                 List plus4 = u.plus((Collection) access$createCategorySection6, (Iterable) StockGuildTemplateKt.access$createCategorySection(string48, 200, 0, new ChannelTemplate.SystemChannel(string49), new ChannelTemplate.NormalChannel(string50), new ChannelTemplate.NormalChannel(string51)));
-                String string52 = resources.getString(2131890025);
+                String string52 = resources.getString(2131890041);
                 m.checkNotNullExpressionValue(string52, "resources.getString(R.st…late_name_category_voice)");
-                String string53 = resources.getString(2131890052);
+                String string53 = resources.getString(2131890072);
                 m.checkNotNullExpressionValue(string53, "resources.getString(R.st…mplate_name_voice_lounge)");
-                String string54 = resources.getString(2131890053);
+                String string54 = resources.getString(2131890073);
                 m.checkNotNullExpressionValue(string54, "resources.getString(R.st…_name_voice_meeting_room)");
                 return u.plus((Collection) plus4, (Iterable) StockGuildTemplateKt.access$createCategorySection(string52, 300, 2, new ChannelTemplate.NormalChannel(string53), new ChannelTemplate.NormalChannel(string54)));
             case 6:
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java
index 25c1f72f73..f2d2a05309 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetCreationIntent$binding$2 extends k impl
 
     public final WidgetCreationIntentBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362810;
-        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362810);
+        int i = 2131362835;
+        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131362835);
         if (materialCardView != null) {
-            i = 2131362811;
-            TextView textView = (TextView) view.findViewById(2131362811);
+            i = 2131362836;
+            TextView textView = (TextView) view.findViewById(2131362836);
             if (textView != null) {
-                i = 2131362812;
-                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131362812);
+                i = 2131362837;
+                MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131362837);
                 if (materialCardView2 != null) {
-                    i = 2131362813;
-                    TextView textView2 = (TextView) view.findViewById(2131362813);
+                    i = 2131362838;
+                    TextView textView2 = (TextView) view.findViewById(2131362838);
                     if (textView2 != null) {
-                        i = 2131362814;
-                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362814);
+                        i = 2131362839;
+                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362839);
                         if (linkifiedTextView != null) {
                             return new WidgetCreationIntentBinding((CoordinatorLayout) view, materialCardView, textView, materialCardView2, textView2, linkifiedTextView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
index c84d35ef57..769494b9ff 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java
@@ -73,7 +73,7 @@ public final class WidgetCreationIntent extends AppFragment {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetCreationIntent(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i2 & 1) != 0 ? 2131558982 : i);
+        this((i2 & 1) != 0 ? 2131558986 : i);
     }
 
     public static final /* synthetic */ void access$onSelectionPressed(WidgetCreationIntent widgetCreationIntent, Boolean bool) {
@@ -81,14 +81,14 @@ public final class WidgetCreationIntent extends AppFragment {
     }
 
     private final void configureCommunityButton(View view, TextView textView) {
-        textView.setText(getString(2131887971));
-        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231131), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232062), (Drawable) null);
+        textView.setText(getString(2131887970));
+        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231136), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232070), (Drawable) null);
         view.setOnClickListener(new WidgetCreationIntent$configureCommunityButton$1(this));
     }
 
     private final void configureFriendsButton(View view, TextView textView) {
-        textView.setText(getString(2131887972));
-        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231129), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232062), (Drawable) null);
+        textView.setText(getString(2131887971));
+        textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231134), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232070), (Drawable) null);
         view.setOnClickListener(new WidgetCreationIntent$configureFriendsButton$1(this));
     }
 
@@ -119,7 +119,7 @@ public final class WidgetCreationIntent extends AppFragment {
         if (IS_FRIENDS_FIRST) {
             MaterialCardView materialCardView = getBinding().b;
             m.checkNotNullExpressionValue(materialCardView, "binding.creationIntentFirstOption");
-            TextView textView = getBinding().f1760c;
+            TextView textView = getBinding().f1761c;
             m.checkNotNullExpressionValue(textView, "binding.creationIntentFirstOptionText");
             configureFriendsButton(materialCardView, textView);
             MaterialCardView materialCardView2 = getBinding().d;
@@ -130,7 +130,7 @@ public final class WidgetCreationIntent extends AppFragment {
         } else {
             MaterialCardView materialCardView3 = getBinding().b;
             m.checkNotNullExpressionValue(materialCardView3, "binding.creationIntentFirstOption");
-            TextView textView3 = getBinding().f1760c;
+            TextView textView3 = getBinding().f1761c;
             m.checkNotNullExpressionValue(textView3, "binding.creationIntentFirstOptionText");
             configureCommunityButton(materialCardView3, textView3);
             MaterialCardView materialCardView4 = getBinding().d;
@@ -141,6 +141,6 @@ public final class WidgetCreationIntent extends AppFragment {
         }
         LinkifiedTextView linkifiedTextView = getBinding().f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.creationIntentSkipText");
-        b.m(linkifiedTextView, 2131887973, new Object[0], new WidgetCreationIntent$onViewBound$1(this));
+        b.l(linkifiedTextView, 2131887972, new Object[0], new WidgetCreationIntent$onViewBound$1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java
index f4d7c1e201..b1a599cf52 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java
@@ -25,39 +25,39 @@ public final /* synthetic */ class WidgetGuildClone$binding$2 extends k implemen
 
     public final WidgetGuildCloneBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363353;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363353);
+        int i = 2131363379;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363379);
         if (loadingButton != null) {
-            i = 2131363354;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363354);
+            i = 2131363380;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363380);
             if (appViewFlipper != null) {
-                i = 2131363355;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363355);
+                i = 2131363381;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363381);
                 if (linkifiedTextView != null) {
-                    i = 2131363356;
-                    View findViewById = view.findViewById(2131363356);
+                    i = 2131363382;
+                    View findViewById = view.findViewById(2131363382);
                     if (findViewById != null) {
                         i0 a = i0.a(findViewById);
-                        i = 2131363357;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363357);
+                        i = 2131363383;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363383);
                         if (textInputLayout != null) {
-                            i = 2131363358;
-                            TextView textView = (TextView) view.findViewById(2131363358);
+                            i = 2131363384;
+                            TextView textView = (TextView) view.findViewById(2131363384);
                             if (textView != null) {
-                                i = 2131363451;
-                                TextView textView2 = (TextView) view.findViewById(2131363451);
+                                i = 2131363492;
+                                TextView textView2 = (TextView) view.findViewById(2131363492);
                                 if (textView2 != null) {
-                                    i = 2131363452;
-                                    GuildTemplateChannelsView guildTemplateChannelsView = (GuildTemplateChannelsView) view.findViewById(2131363452);
+                                    i = 2131363493;
+                                    GuildTemplateChannelsView guildTemplateChannelsView = (GuildTemplateChannelsView) view.findViewById(2131363493);
                                     if (guildTemplateChannelsView != null) {
-                                        i = 2131363453;
-                                        RolesListView rolesListView = (RolesListView) view.findViewById(2131363453);
+                                        i = 2131363494;
+                                        RolesListView rolesListView = (RolesListView) view.findViewById(2131363494);
                                         if (rolesListView != null) {
-                                            i = 2131363454;
-                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363454);
+                                            i = 2131363495;
+                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363495);
                                             if (linearLayout != null) {
-                                                i = 2131363768;
-                                                ProgressBar progressBar = (ProgressBar) view.findViewById(2131363768);
+                                                i = 2131363809;
+                                                ProgressBar progressBar = (ProgressBar) view.findViewById(2131363809);
                                                 if (progressBar != null) {
                                                     return new WidgetGuildCloneBinding((CoordinatorLayout) view, loadingButton, appViewFlipper, linkifiedTextView, a, textInputLayout, textView, textView2, guildTemplateChannelsView, rolesListView, linearLayout, progressBar);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.java
index f7eddfa74c..4909b532d7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$configureUI$$inlined$sortedBy$1.java
@@ -8,6 +8,6 @@ public final class WidgetGuildClone$configureUI$$inlined$sortedBy$1<T> implement
     public final int compare(T t, T t2) {
         T t3 = t;
         T t4 = t2;
-        return a.compareValues(Long.valueOf(t3.q() == 0 ? t3.g() * ((long) 10000) : (t3.q() * ((long) 10000)) + t3.g()), Long.valueOf(t4.q() == 0 ? t4.g() * ((long) 10000) : (t4.q() * ((long) 10000)) + t4.g()));
+        return a.compareValues(Long.valueOf(t3.r() == 0 ? t3.h() * ((long) 10000) : (t3.r() * ((long) 10000)) + t3.h()), Long.valueOf(t4.r() == 0 ? t4.h() * ((long) 10000) : (t4.r() * ((long) 10000)) + t4.h()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
index a4ca4eb1f8..023e296db8 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java
@@ -68,7 +68,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
     }
 
     public WidgetGuildClone() {
-        super(2131559028);
+        super(2131559032);
     }
 
     private final WidgetGuildCloneBinding getBinding() {
@@ -83,30 +83,30 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
         StoreStream.Companion.getGuildTemplates().clearDynamicLinkGuildTemplateCode();
         int i = 0;
         if (m.areEqual(viewState, WidgetGuildCreateViewModel.ViewState.Uninitialized.INSTANCE)) {
-            AppViewFlipper appViewFlipper = getBinding().f1792c;
+            AppViewFlipper appViewFlipper = getBinding().f1793c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.guildCreateFlipper");
             appViewFlipper.setDisplayedChild(0);
         } else if (viewState instanceof WidgetGuildCreateViewModel.ViewState.Initialized) {
             WidgetGuildCreateViewModel.ViewState.Initialized initialized = (WidgetGuildCreateViewModel.ViewState.Initialized) viewState;
             StoreGuildTemplates.GuildTemplateState guildTemplate = initialized.getGuildTemplate();
             if (m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.None.INSTANCE) || m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.Invalid.INSTANCE) || m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.LoadFailed.INSTANCE)) {
-                AppViewFlipper appViewFlipper2 = getBinding().f1792c;
+                AppViewFlipper appViewFlipper2 = getBinding().f1793c;
                 m.checkNotNullExpressionValue(appViewFlipper2, "binding.guildCreateFlipper");
                 appViewFlipper2.setDisplayedChild(1);
             } else if (m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.Loading.INSTANCE)) {
-                AppViewFlipper appViewFlipper3 = getBinding().f1792c;
+                AppViewFlipper appViewFlipper3 = getBinding().f1793c;
                 m.checkNotNullExpressionValue(appViewFlipper3, "binding.guildCreateFlipper");
                 appViewFlipper3.setDisplayedChild(0);
             } else if (guildTemplate instanceof StoreGuildTemplates.GuildTemplateState.Resolved) {
                 ModelGuildTemplate guildTemplate2 = ((StoreGuildTemplates.GuildTemplateState.Resolved) initialized.getGuildTemplate()).getGuildTemplate();
                 Guild serializedSourceGuild = guildTemplate2.getSerializedSourceGuild();
                 if (serializedSourceGuild == null) {
-                    AppViewFlipper appViewFlipper4 = getBinding().f1792c;
+                    AppViewFlipper appViewFlipper4 = getBinding().f1793c;
                     m.checkNotNullExpressionValue(appViewFlipper4, "binding.guildCreateFlipper");
                     appViewFlipper4.setDisplayedChild(1);
                     return;
                 }
-                AppViewFlipper appViewFlipper5 = getBinding().f1792c;
+                AppViewFlipper appViewFlipper5 = getBinding().f1793c;
                 m.checkNotNullExpressionValue(appViewFlipper5, "binding.guildCreateFlipper");
                 appViewFlipper5.setDisplayedChild(2);
                 TextView textView = getBinding().g;
@@ -156,7 +156,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate {
         if (stringExtra2 == null) {
             stringExtra2 = "";
         }
-        return new WidgetGuildCreateViewModel(2131887925, null, stringExtra, false, stringExtra2, null, null, null, null, 450, null);
+        return new WidgetGuildCreateViewModel(2131887924, null, stringExtra, false, stringExtra2, null, null, null, null, 450, null);
     }
 
     @Override // com.discord.widgets.guilds.create.WidgetGuildCreate
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java
index 8e6eaa35b9..eedb3115bc 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java
@@ -21,21 +21,21 @@ public final /* synthetic */ class WidgetGuildCreate$binding$2 extends k impleme
 
     public final WidgetGuildCreateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363353;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363353);
+        int i = 2131363379;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363379);
         if (loadingButton != null) {
-            i = 2131363355;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363355);
+            i = 2131363381;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363381);
             if (linkifiedTextView != null) {
-                i = 2131363356;
-                View findViewById = view.findViewById(2131363356);
+                i = 2131363382;
+                View findViewById = view.findViewById(2131363382);
                 if (findViewById != null) {
                     i0 a = i0.a(findViewById);
-                    i = 2131363357;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363357);
+                    i = 2131363383;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363383);
                     if (textInputLayout != null) {
-                        i = 2131363359;
-                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363359);
+                        i = 2131363385;
+                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363385);
                         if (screenTitleView != null) {
                             return new WidgetGuildCreateBinding((CoordinatorLayout) view, loadingButton, linkifiedTextView, a, textInputLayout, screenTitleView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java
index b17494d455..4c99517ef9 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java
@@ -206,7 +206,7 @@ public class WidgetGuildCreate extends AppFragment {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetGuildCreate(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i2 & 1) != 0 ? 2131559030 : i);
+        this((i2 & 1) != 0 ? 2131559034 : i);
     }
 
     public static final /* synthetic */ WidgetGuildCreateViewModel access$getViewModel$p(WidgetGuildCreate widgetGuildCreate) {
@@ -280,7 +280,7 @@ public class WidgetGuildCreate extends AppFragment {
         Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("com.discord.intent.extra.EXTRA_OPTIONS");
         Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.widgets.guilds.create.WidgetGuildCreate.Options");
         Options options = (Options) serializableExtra;
-        return new WidgetGuildCreateViewModel(2131887925, options.getTemplate(), null, options.getShowChannelPrompt(), options.getAnalyticsLocation(), options.getCustomTitle(), null, null, null, 448, null);
+        return new WidgetGuildCreateViewModel(2131887924, options.getTemplate(), null, options.getShowChannelPrompt(), options.getAnalyticsLocation(), options.getCustomTitle(), null, null, null, 448, null);
     }
 
     public GuildCreateCloneViews getViews() {
@@ -314,7 +314,7 @@ public class WidgetGuildCreate extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildCreate$onResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildCreate$onResume$2(this), 62, (Object) null);
         getViews().getGuildCreateIconUploader().setOnClickListener(new WidgetGuildCreate$onResume$3(this));
-        b.n(getViews().getGuidelinesTextView(), 2131887929, new Object[]{"https://discord.com/guidelines"}, null, 4);
+        b.m(getViews().getGuidelinesTextView(), 2131887928, new Object[]{"https://discord.com/guidelines"}, null, 4);
         EditText editText = getViews().getGuildCreateName().getEditText();
         if (editText != null) {
             TextWatcherKt.addLifecycleAwareTextWatcher(editText, this, new WidgetGuildCreate$onResume$4(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
index 52f2cb5509..a8af830101 100644
--- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java
@@ -514,7 +514,7 @@ public final class WidgetGuildCreateViewModel extends AppViewModel<ViewState> {
         this.customTitle = str3;
         this.selectedGuildStore = storeGuildSelected;
         this.restAPI = restAPI;
-        this.eventsSubject = PublishSubject.l0();
+        this.eventsSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetGuildCreateViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
     }
 
@@ -529,10 +529,10 @@ public final class WidgetGuildCreateViewModel extends AppViewModel<ViewState> {
         RestAPI api = (i2 & 128) != 0 ? RestAPI.Companion.getApi() : restAPI;
         if ((i2 & 256) != 0) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable a02 = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).a0(1);
-            Observable<StoreGuildTemplates.GuildTemplateState> jVar = str == null ? new j<>(StoreGuildTemplates.GuildTemplateState.None.INSTANCE) : companion.getGuildTemplates().observeGuildTemplate(str).v(new AnonymousClass1(str));
+            Observable Z = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Z(1);
+            Observable<StoreGuildTemplates.GuildTemplateState> jVar = str == null ? new j<>(StoreGuildTemplates.GuildTemplateState.None.INSTANCE) : companion.getGuildTemplates().observeGuildTemplate(str).u(new AnonymousClass1(str));
             AnonymousClass2 r0 = AnonymousClass2.INSTANCE;
-            Observable j = Observable.j(a02, jVar, (Func2) (r0 != null ? new WidgetGuildCreateViewModel$sam$rx_functions_Func2$0(r0) : r0));
+            Observable j = Observable.j(Z, jVar, (Func2) (r0 != null ? new WidgetGuildCreateViewModel$sam$rx_functions_Func2$0(r0) : r0));
             m.checkNotNullExpressionValue(j, "Observable.combineLatest…},\n      ::StoreState\n  )");
             observable2 = j;
         } else {
@@ -589,7 +589,7 @@ public final class WidgetGuildCreateViewModel extends AppViewModel<ViewState> {
             String guildIconUri = initialized.getGuildIconUri();
             if (!initialized.isBusy()) {
                 if (t.isBlank(guildName)) {
-                    emitEvent(new Event.ShowToast(2131893180));
+                    emitEvent(new Event.ShowToast(2131893263));
                     return;
                 }
                 if (initialized.getGuildTemplate() instanceof StoreGuildTemplates.GuildTemplateState.Resolved) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java
index 5992b87332..e10e576b45 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java
@@ -36,7 +36,7 @@ public final class GuildInvite implements Serializable {
             Guild guild = modelInvite.getGuild();
             Long valueOf = guild != null ? Long.valueOf(guild.o()) : null;
             Channel channel = modelInvite.getChannel();
-            Long valueOf2 = channel != null ? Long.valueOf(channel.g()) : null;
+            Long valueOf2 = channel != null ? Long.valueOf(channel.h()) : null;
             User inviter = modelInvite.getInviter();
             return new GuildInvite(code, valueOf, valueOf2, inviter != null ? Long.valueOf(inviter.i()) : null, modelInvite.isStatic(), modelInvite.getExpirationTime());
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java
index fe855365de..bd8a8ccff1 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteSettingsViewModel.java
@@ -332,9 +332,9 @@ public final class GuildInviteSettingsViewModel extends AppViewModel<ViewState>
         this.guildId = j;
         this.storeInviteSettings = storeInviteSettings;
         this.targetChannelSelector = targetChannelSelector;
-        PublishSubject<Event> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.eventSubject = l0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), GuildInviteSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -400,7 +400,7 @@ public final class GuildInviteSettingsViewModel extends AppViewModel<ViewState>
         ModelInvite.Settings settings = this.inviteSettings;
         if (settings != null && (channel = this.targetChannel) != null) {
             this.storeInviteSettings.setInviteSettings(settings);
-            generateInviteForChannel(channel.g());
+            generateInviteForChannel(channel.h());
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java
index cbd5606068..5985be0e34 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java
@@ -46,7 +46,7 @@ public final class GuildInviteShareSheetViewModel$sendInviteToChannel$1 extends
             if (set == null) {
                 set = n0.emptySet();
             }
-            GuildInviteShareSheetViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().i()))))));
+            GuildInviteShareSheetViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().g()))))));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToUser$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToUser$1.java
index 750ada145b..0832209999 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToUser$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToUser$1.java
@@ -25,6 +25,6 @@ public final class GuildInviteShareSheetViewModel$sendInviteToUser$1 extends o i
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        GuildInviteShareSheetViewModel.access$sendInviteToChannel(this.this$0, channel.g());
+        GuildInviteShareSheetViewModel.access$sendInviteToChannel(this.this$0, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
index 75e75ac6c7..3547a24880 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java
@@ -160,7 +160,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             private final List<InviteSuggestion> inviteSuggestions;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2135me;
+            private final MeUser f2141me;
 
             /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.List<? extends com.discord.widgets.guilds.invite.InviteSuggestion> */
             /* JADX WARN: Multi-variable type inference failed */
@@ -176,7 +176,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                 m.checkNotNullParameter(map2, "guildStageInstances");
                 this.inviteSettings = settings;
                 this.invitableChannels = map;
-                this.f2135me = meUser;
+                this.f2141me = meUser;
                 this.dms = list;
                 this.guild = guild;
                 this.inviteSuggestions = list2;
@@ -193,7 +193,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                     map = valid.invitableChannels;
                 }
                 if ((i & 4) != 0) {
-                    meUser = valid.f2135me;
+                    meUser = valid.f2141me;
                 }
                 if ((i & 8) != 0) {
                     list = valid.dms;
@@ -219,7 +219,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             }
 
             public final MeUser component3() {
-                return this.f2135me;
+                return this.f2141me;
             }
 
             public final List<Channel> component4() {
@@ -257,7 +257,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                     return false;
                 }
                 Valid valid = (Valid) obj;
-                return m.areEqual(this.inviteSettings, valid.inviteSettings) && m.areEqual(this.invitableChannels, valid.invitableChannels) && m.areEqual(this.f2135me, valid.f2135me) && m.areEqual(this.dms, valid.dms) && m.areEqual(this.guild, valid.guild) && m.areEqual(this.inviteSuggestions, valid.inviteSuggestions) && m.areEqual(this.guildStageInstances, valid.guildStageInstances);
+                return m.areEqual(this.inviteSettings, valid.inviteSettings) && m.areEqual(this.invitableChannels, valid.invitableChannels) && m.areEqual(this.f2141me, valid.f2141me) && m.areEqual(this.dms, valid.dms) && m.areEqual(this.guild, valid.guild) && m.areEqual(this.inviteSuggestions, valid.inviteSuggestions) && m.areEqual(this.guildStageInstances, valid.guildStageInstances);
             }
 
             public final List<Channel> getDms() {
@@ -285,7 +285,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             }
 
             public final MeUser getMe() {
-                return this.f2135me;
+                return this.f2141me;
             }
 
             public int hashCode() {
@@ -294,7 +294,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                 int hashCode = (settings != null ? settings.hashCode() : 0) * 31;
                 Map<Long, Channel> map = this.invitableChannels;
                 int hashCode2 = (hashCode + (map != null ? map.hashCode() : 0)) * 31;
-                MeUser meUser = this.f2135me;
+                MeUser meUser = this.f2141me;
                 int hashCode3 = (hashCode2 + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 List<Channel> list = this.dms;
                 int hashCode4 = (hashCode3 + (list != null ? list.hashCode() : 0)) * 31;
@@ -315,7 +315,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                 L.append(", invitableChannels=");
                 L.append(this.invitableChannels);
                 L.append(", me=");
-                L.append(this.f2135me);
+                L.append(this.f2141me);
                 L.append(", dms=");
                 L.append(this.dms);
                 L.append(", guild=");
@@ -530,9 +530,9 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
         this.storeMessages = storeMessages;
         this.targetChannelSelector = targetChannelSelector;
         this.logger = logger;
-        BehaviorSubject<String> m0 = BehaviorSubject.m0("");
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(\"\")");
-        this.searchQuerySubject = m0;
+        BehaviorSubject<String> l0 = BehaviorSubject.l0("");
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+        this.searchQuerySubject = l0;
         this.searchQuery = "";
         this.sentInvites = h0.emptyMap();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), GuildInviteShareSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -634,7 +634,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             if (v0 != null) {
                 l = Long.valueOf(v0.getId());
             }
-            arrayList2.add(d0.o.to(l, Long.valueOf(channel.g())));
+            arrayList2.add(d0.o.to(l, Long.valueOf(channel.h())));
         }
         Map map2 = h0.toMap(arrayList2);
         if ((!inviteSuggestions.isEmpty()) || t.isBlank(str)) {
@@ -642,7 +642,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
             for (InviteSuggestion inviteSuggestion2 : inviteSuggestions) {
                 if (inviteSuggestion2 instanceof InviteSuggestion.ChannelItem) {
                     InviteSuggestion.ChannelItem channelItem = (InviteSuggestion.ChannelItem) inviteSuggestion2;
-                    obj = new InviteSuggestionItemV2.ChannelItem(channelItem.getChannel(), set.contains(Long.valueOf(channelItem.getChannel().g())), str);
+                    obj = new InviteSuggestionItemV2.ChannelItem(channelItem.getChannel(), set.contains(Long.valueOf(channelItem.getChannel().h())), str);
                 } else if (inviteSuggestion2 instanceof InviteSuggestion.UserSuggestion) {
                     InviteSuggestion.UserSuggestion userSuggestion = (InviteSuggestion.UserSuggestion) inviteSuggestion2;
                     obj = new InviteSuggestionItemV2.UserItem(userSuggestion.getUser(), u.contains(set, map2.get(Long.valueOf(userSuggestion.getUser().getId()))), str);
@@ -733,7 +733,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
                     }
                 }
                 if (channel == null && targetChannel != null) {
-                    generateInviteForChannel(targetChannel.g());
+                    generateInviteForChannel(targetChannel.h());
                 } else if (d != null) {
                     ModelInvite createForStaticUrl2 = ModelInvite.createForStaticUrl(d, GuildUtilsKt.createApiGuild(guild));
                     GuildInvite.Companion companion2 = GuildInvite.Companion;
@@ -805,7 +805,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModel<ViewState
     public final void sendInvite(InviteSuggestionItemV2 inviteSuggestionItemV2) {
         m.checkNotNullParameter(inviteSuggestionItemV2, "item");
         if (inviteSuggestionItemV2 instanceof InviteSuggestionItemV2.ChannelItem) {
-            sendInviteToChannel(((InviteSuggestionItemV2.ChannelItem) inviteSuggestionItemV2).getChannel().g());
+            sendInviteToChannel(((InviteSuggestionItemV2.ChannelItem) inviteSuggestionItemV2).getChannel().h());
         } else if (inviteSuggestionItemV2 instanceof InviteSuggestionItemV2.UserItem) {
             sendInviteToUser(((InviteSuggestionItemV2.UserItem) inviteSuggestionItemV2).getUser().getId());
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java
index de84c40711..c7b8a5e12f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java
@@ -16,7 +16,7 @@ import d0.z.d.m;
 /* compiled from: GuildInviteUiHelper.kt */
 public final class GuildInviteUiHelperKt {
     private static final void copyLink(Context context, String str) {
-        o.a(context, str, 2131890549);
+        o.a(context, str, 2131890617);
     }
 
     public static final void copyLinkClick(Context context, ModelInvite modelInvite, Intent intent) {
@@ -57,30 +57,30 @@ public final class GuildInviteUiHelperKt {
 
     public static final CharSequence getInviteLinkText(Context context, Experiment experiment) {
         m.checkNotNullParameter(context, "context");
-        return b.g(context, 2131890555, new Object[]{(experiment == null || experiment.getBucket() != 1) ? StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 1, 1) : StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 7, 7)}, null, 4);
+        return b.g(context, 2131890623, new Object[]{(experiment == null || experiment.getBucket() != 1) ? StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 1, 1) : StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 7, 7)}, null, 4);
     }
 
     public static final CharSequence getInviteSettingsText(Context context, long j) {
         m.checkNotNullParameter(context, "context");
-        return j <= 0 ? b.g(context, 2131890999, new Object[0], null, 4) : b.g(context, 2131890530, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j)}, null, 4);
+        return j <= 0 ? b.g(context, 2131891070, new Object[0], null, 4) : b.g(context, 2131890598, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j)}, null, 4);
     }
 
     public static final CharSequence getInviteSettingsText(Context context, long j, int i) {
         Object obj;
         m.checkNotNullParameter(context, "context");
         if (i == 0) {
-            obj = context.getString(2131891004);
+            obj = context.getString(2131891075);
             m.checkNotNullExpressionValue(obj, "context.getString(R.stri…scription_unlimited_uses)");
         } else {
             Resources resources = context.getResources();
             m.checkNotNullExpressionValue(resources, "context.resources");
-            obj = StringResourceUtilsKt.getQuantityString(resources, context, 2131755214, i, Integer.valueOf(i));
+            obj = StringResourceUtilsKt.getQuantityString(resources, context, 2131755215, i, Integer.valueOf(i));
         }
-        return j <= 0 ? b.g(context, 2131890582, new Object[]{context.getString(2131890999), obj}, null, 4) : b.g(context, 2131890583, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j), obj}, null, 4);
+        return j <= 0 ? b.g(context, 2131890650, new Object[]{context.getString(2131891070), obj}, null, 4) : b.g(context, 2131890651, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j), obj}, null, 4);
     }
 
     private static final void shareLink(Context context, String str) {
-        String string = context.getResources().getString(2131893904);
+        String string = context.getResources().getString(2131894004);
         m.checkNotNullExpressionValue(string, "context.resources.getStr…ip_instant_invite_title3)");
         IntentUtils.performChooserSendIntent(context, str, string);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java
index b10fcb50c8..12eb4200a9 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteGenerator.java
@@ -113,11 +113,11 @@ public final class InviteGenerator implements Closeable {
     }
 
     public InviteGenerator() {
-        BehaviorSubject<InviteGenerationState> m0 = BehaviorSubject.m0(new InviteGenerationState(null, null, 3, null));
-        this.generationStateSubject = m0;
-        Observable<InviteGenerationState> s2 = m0.s();
-        m.checkNotNullExpressionValue(s2, "generationStateSubject.distinctUntilChanged()");
-        this.generationState = s2;
+        BehaviorSubject<InviteGenerationState> l0 = BehaviorSubject.l0(new InviteGenerationState(null, null, 3, null));
+        this.generationStateSubject = l0;
+        Observable<InviteGenerationState> r = l0.r();
+        m.checkNotNullExpressionValue(r, "generationStateSubject.distinctUntilChanged()");
+        this.generationState = r;
     }
 
     public static final /* synthetic */ void access$handleGeneratedInvite(InviteGenerator inviteGenerator, ModelInvite modelInvite) {
@@ -135,7 +135,7 @@ public final class InviteGenerator implements Closeable {
     private final void handleRestCallFailed() {
         BehaviorSubject<InviteGenerationState> behaviorSubject = this.generationStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "generationStateSubject");
-        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.o0(), null, GenerationState.FAILURE, 1, null));
+        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.n0(), null, GenerationState.FAILURE, 1, null));
     }
 
     @Override // java.io.Closeable, java.lang.AutoCloseable
@@ -147,7 +147,7 @@ public final class InviteGenerator implements Closeable {
         m.checkNotNullParameter(appFragment, "fragment");
         BehaviorSubject<InviteGenerationState> behaviorSubject = this.generationStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "generationStateSubject");
-        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.o0(), null, GenerationState.GENERATING, 1, null));
+        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.n0(), null, GenerationState.GENERATING, 1, null));
         ObservableExtensionsKt.ui$default(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), j, null, 2, null), appFragment, null, 2, null).k(q.a.g(appFragment.getContext(), new InviteGenerator$generate$1(this), new InviteGenerator$generate$2(this)));
     }
 
@@ -155,7 +155,7 @@ public final class InviteGenerator implements Closeable {
         m.checkNotNullParameter(appComponent, "appComponent");
         BehaviorSubject<InviteGenerationState> behaviorSubject = this.generationStateSubject;
         m.checkNotNullExpressionValue(behaviorSubject, "generationStateSubject");
-        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.o0(), null, GenerationState.GENERATING, 1, null));
+        this.generationStateSubject.onNext(InviteGenerationState.copy$default(behaviorSubject.n0(), null, GenerationState.GENERATING, 1, null));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), j, null, 2, null)), appComponent, null, 2, null), InviteGenerator.class, (Context) null, (Function1) null, new InviteGenerator$generateForAppComponent$2(this), (Function0) null, (Function0) null, new InviteGenerator$generateForAppComponent$1(this), 54, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItem.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItem.java
index c53063a2b7..aff0e8d6c3 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItem.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItem.java
@@ -26,7 +26,7 @@ public abstract class InviteSuggestionItem implements MGRecyclerDataPayload {
             this.channel = channel;
             this.hasSent = z2;
             StringBuilder L = a.L("c");
-            L.append(String.valueOf(channel.g()));
+            L.append(String.valueOf(channel.h()));
             this.key = L.toString();
         }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItemV2.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItemV2.java
index a1277c41cb..6af5e61435 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItemV2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionItemV2.java
@@ -30,7 +30,7 @@ public abstract class InviteSuggestionItemV2 implements MGRecyclerDataPayload {
             this.hasSent = z2;
             this.searchQuery = str;
             StringBuilder L = a.L("c");
-            L.append(String.valueOf(channel.g()));
+            L.append(String.valueOf(channel.h()));
             L.append(str);
             this.key = L.toString();
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java
index 0d86aa4964..81da352c63 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java
@@ -36,7 +36,7 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple<Invi
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public InviteSuggestionViewHolder(InviteSuggestionsAdapter inviteSuggestionsAdapter) {
-            super(2131559038, inviteSuggestionsAdapter);
+            super(2131559042, inviteSuggestionsAdapter);
             m.checkNotNullParameter(inviteSuggestionsAdapter, "adapter");
             WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)");
@@ -62,7 +62,7 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple<Invi
             IconUtils.setIcon$default(simpleDraweeView, user, 0, null, null, null, 60, null);
             TextView textView = this.binding.d;
             m.checkNotNullExpressionValue(textView, "binding.itemNameTv");
-            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, null, ((InviteSuggestionsAdapter) this.adapter).getContext(), 2130968932, 2130969326, 2131427361, 2130968988, 2130969325, 2131427361));
+            textView.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, null, ((InviteSuggestionsAdapter) this.adapter).getContext(), 2130968932, 2130969326, 2131427362, 2130968988, 2130969325, 2131427362));
         }
 
         public void onConfigure(int i, InviteSuggestionItemV2 inviteSuggestionItemV2) {
@@ -85,13 +85,13 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple<Invi
                 m.checkNotNullExpressionValue(materialButton, "binding.itemSent");
                 int i2 = 0;
                 materialButton.setVisibility(inviteSuggestionItemV2.hasSentInvite() ? 0 : 8);
-                MaterialButton materialButton2 = this.binding.f1802c;
+                MaterialButton materialButton2 = this.binding.f1803c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn");
                 if (!(!inviteSuggestionItemV2.hasSentInvite())) {
                     i2 = 8;
                 }
                 materialButton2.setVisibility(i2);
-                this.binding.f1802c.setOnClickListener(new InviteSuggestionsAdapter$InviteSuggestionViewHolder$onConfigure$1(this, inviteSuggestionItemV2));
+                this.binding.f1803c.setOnClickListener(new InviteSuggestionsAdapter$InviteSuggestionViewHolder$onConfigure$1(this, inviteSuggestionItemV2));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager$observeInviteSuggestions$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager$observeInviteSuggestions$1.java
index 2bc1531af5..6551a6c4a0 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager$observeInviteSuggestions$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager$observeInviteSuggestions$1.java
@@ -52,6 +52,6 @@ public final class InviteSuggestionsManager$observeInviteSuggestions$1<T, R> imp
     public final Observable<? extends InviteSuggestionsManager.UserAffinityData> call(List<Long> list) {
         StoreUser access$getStoreUsers$p = InviteSuggestionsManager.access$getStoreUsers$p(this.this$0);
         m.checkNotNullExpressionValue(list, "affinityUserIds");
-        return Observable.j(access$getStoreUsers$p.observeUsers(list).s(), InviteSuggestionsManager.access$getStoreUserRelationships$p(this.this$0).observe(list), new AnonymousClass1(list));
+        return Observable.j(access$getStoreUsers$p.observeUsers(list).r(), InviteSuggestionsManager.access$getStoreUserRelationships$p(this.this$0).observe(list), new AnonymousClass1(list));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java
index efeebe8715..e76a6eb618 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsManager.java
@@ -149,7 +149,7 @@ public final class InviteSuggestionsManager {
     }
 
     public final Observable<List<InviteSuggestion>> observeInviteSuggestions() {
-        Observable<List<InviteSuggestion>> i = Observable.i(this.storeChannels.observePrivateChannels(), this.storeMessagesMostRecent.observeRecentMessageIds().a0(1), this.storeUserAffinities.observeAffinityUserIds().Z(new InviteSuggestionsManager$observeInviteSuggestions$1(this)), InviteSuggestionsManager$observeInviteSuggestions$2.INSTANCE);
+        Observable<List<InviteSuggestion>> i = Observable.i(this.storeChannels.observePrivateChannels(), this.storeMessagesMostRecent.observeRecentMessageIds().Z(1), this.storeUserAffinities.observeAffinityUserIds().Y(new InviteSuggestionsManager$observeInviteSuggestions$1(this)), InviteSuggestionsManager$observeInviteSuggestions$2.INSTANCE);
         m.checkNotNullExpressionValue(i, "Observable.combineLatest… inviteSuggestionList\n  }");
         return i;
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
index a4f1f77a7f..65f7436e8e 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/PrivateChannelAdapter.java
@@ -24,7 +24,7 @@ public final class PrivateChannelAdapter extends MGRecyclerAdapterSimple<InviteS
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public Item(PrivateChannelAdapter privateChannelAdapter) {
-            super(2131559038, privateChannelAdapter);
+            super(2131559042, privateChannelAdapter);
             m.checkNotNullParameter(privateChannelAdapter, "adapter");
             WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)");
@@ -41,7 +41,7 @@ public final class PrivateChannelAdapter extends MGRecyclerAdapterSimple<InviteS
             boolean z2 = inviteSuggestionItem instanceof InviteSuggestionItem.ChannelItem;
             if (z2) {
                 InviteSuggestionItem.ChannelItem channelItem = (InviteSuggestionItem.ChannelItem) inviteSuggestionItem;
-                if (channelItem.getChannel().z() != 1) {
+                if (channelItem.getChannel().A() != 1) {
                     SimpleDraweeView simpleDraweeView = this.binding.b;
                     m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv");
                     IconUtils.setIcon$default(simpleDraweeView, channelItem.getChannel(), 0, null, 12, null);
@@ -67,13 +67,13 @@ public final class PrivateChannelAdapter extends MGRecyclerAdapterSimple<InviteS
                 m.checkNotNullExpressionValue(materialButton, "binding.itemSent");
                 int i2 = 0;
                 materialButton.setVisibility(inviteSuggestionItem.hasSentInvite() ? 0 : 8);
-                MaterialButton materialButton2 = this.binding.f1802c;
+                MaterialButton materialButton2 = this.binding.f1803c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn");
                 if (!(!inviteSuggestionItem.hasSentInvite())) {
                     i2 = 8;
                 }
                 materialButton2.setVisibility(i2);
-                this.binding.f1802c.setOnClickListener(new PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
+                this.binding.f1803c.setOnClickListener(new PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java
index e22f7c2de6..d32b034876 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1.java
@@ -18,6 +18,6 @@ public final class ViewInviteSettingsSheet$ChannelsSpinnerAdapter$setupViews$1 e
     @IdRes
     /* renamed from: invoke */
     public final Integer mo1invoke() {
-        return this.$dropDownMode ? 2131362358 : 2131362359;
+        return this.$dropDownMode ? 2131362373 : 2131362374;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.java b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.java
index b0852d5073..785fe69772 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$configureUi$10.java
@@ -21,7 +21,7 @@ public final class ViewInviteSettingsSheet$configureUi$10 implements View.OnClic
         }
         Channel targetChannel = this.$data.getTargetChannel();
         if (targetChannel != null) {
-            this.this$0.getViewModel().generateInviteLink(Long.valueOf(targetChannel.g()).longValue());
+            this.this$0.getViewModel().generateInviteLink(Long.valueOf(targetChannel.h()).longValue());
         }
         this.this$0.getOnGenerateLinkListener().mo1invoke();
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.java
index 626967fe6c..bcf52923b4 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$setOnItemSelected$1.java
@@ -15,7 +15,7 @@ public final class ViewInviteSettingsSheet$setOnItemSelected$1 implements Adapte
     public void onItemSelected(AdapterView<?> adapterView, View view, int i, long j) {
         m.checkNotNullParameter(adapterView, "parent");
         m.checkNotNullParameter(view, "view");
-        this.this$0.getViewModel().selectChannel(ViewInviteSettingsSheet.access$getChannelsSpinnerAdapter$p(this.this$0).getItem(i).g());
+        this.this$0.getViewModel().selectChannel(ViewInviteSettingsSheet.access$getChannelsSpinnerAdapter$p(this.this$0).getItem(i).h());
     }
 
     @Override // android.widget.AdapterView.OnItemSelectedListener
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java
index 1742028507..6927eeb5c8 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.java
@@ -14,7 +14,7 @@ import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 import androidx.annotation.MainThread;
 import androidx.core.widget.NestedScrollView;
-import c.a.i.s2;
+import c.a.i.u2;
 import c.a.l.b;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
@@ -159,11 +159,11 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, 2131558758, null, 4, null);
         this.channelsSpinnerAdapter = channelsSpinnerAdapter;
         setFocusable(true);
-        setContentDescription(b.i(this, 2131890584, new Object[0], null, 4));
+        setContentDescription(b.i(this, 2131890652, new Object[0], null, 4));
         Spinner spinner = a.b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
-        RadioGroup radioGroup = a.f1654c;
+        RadioGroup radioGroup = a.f1651c;
         m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
         int[] iArr = ModelInvite.Settings.EXPIRES_AFTER_ARRAY;
         m.checkNotNullExpressionValue(iArr, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY");
@@ -189,11 +189,11 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, 2131558758, null, 4, null);
         this.channelsSpinnerAdapter = channelsSpinnerAdapter;
         setFocusable(true);
-        setContentDescription(b.i(this, 2131890584, new Object[0], null, 4));
+        setContentDescription(b.i(this, 2131890652, new Object[0], null, 4));
         Spinner spinner = a.b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
-        RadioGroup radioGroup = a.f1654c;
+        RadioGroup radioGroup = a.f1651c;
         m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
         int[] iArr = ModelInvite.Settings.EXPIRES_AFTER_ARRAY;
         m.checkNotNullExpressionValue(iArr, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY");
@@ -219,11 +219,11 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         ChannelsSpinnerAdapter channelsSpinnerAdapter = new ChannelsSpinnerAdapter(context2, 2131558758, null, 4, null);
         this.channelsSpinnerAdapter = channelsSpinnerAdapter;
         setFocusable(true);
-        setContentDescription(b.i(this, 2131890584, new Object[0], null, 4));
+        setContentDescription(b.i(this, 2131890652, new Object[0], null, 4));
         Spinner spinner = a.b;
         m.checkNotNullExpressionValue(spinner, "binding.guildInviteChannelSpinner");
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
-        RadioGroup radioGroup = a.f1654c;
+        RadioGroup radioGroup = a.f1651c;
         m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
         int[] iArr = ModelInvite.Settings.EXPIRES_AFTER_ARRAY;
         m.checkNotNullExpressionValue(iArr, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY");
@@ -268,7 +268,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
                 View inflate = LayoutInflater.from(getContext()).inflate(2131558789, (ViewGroup) radioGroup, false);
                 Objects.requireNonNull(inflate, "rootView");
                 RadioButton radioButton = (RadioButton) inflate;
-                m.checkNotNullExpressionValue(new s2(radioButton), "ViewRadioButtonBinding.i…text), radioGroup, false)");
+                m.checkNotNullExpressionValue(new u2(radioButton), "ViewRadioButtonBinding.i…text), radioGroup, false)");
                 m.checkNotNullExpressionValue(radioButton, "binding.root");
                 radioButton.setId(i);
                 m.checkNotNullExpressionValue(radioButton, "binding.root");
@@ -290,7 +290,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
 
     private final CharSequence getExpireAfterString(int i) {
         if (i == 0) {
-            return b.i(this, 2131891425, new Object[0], null, 4);
+            return b.i(this, 2131891496, new Object[0], null, 4);
         }
         if (i == 1800) {
             Resources resources = getResources();
@@ -363,7 +363,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
             }
             Channel next = it.next();
             Channel targetChannel = widgetInviteModel.getTargetChannel();
-            if (targetChannel != null && targetChannel.g() == next.g()) {
+            if (targetChannel != null && targetChannel.h() == next.h()) {
                 break;
             }
             i++;
@@ -372,13 +372,13 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
         ModelInvite.Settings settings = widgetInviteModel.getSettings();
         if (settings != null) {
             this.pendingInviteSettings = settings;
-            RadioGroup radioGroup = this.binding.f1654c;
+            RadioGroup radioGroup = this.binding.f1651c;
             m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
             IntRange until = f.until(0, radioGroup.getChildCount());
             ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(until, 10));
             Iterator<Integer> it2 = until.iterator();
             while (it2.hasNext()) {
-                View childAt = this.binding.f1654c.getChildAt(((c0) it2).nextInt());
+                View childAt = this.binding.f1651c.getChildAt(((c0) it2).nextInt());
                 Objects.requireNonNull(childAt, "null cannot be cast to non-null type android.widget.RadioButton");
                 arrayList.add((RadioButton) childAt);
             }
@@ -407,7 +407,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView {
             if (radioButton != null) {
                 radioButton.setChecked(true);
             }
-            this.binding.f1654c.setOnCheckedChangeListener(new ViewInviteSettingsSheet$configureUi$4(this));
+            this.binding.f1651c.setOnCheckedChangeListener(new ViewInviteSettingsSheet$configureUi$4(this));
             RadioGroup radioGroup2 = this.binding.e;
             m.checkNotNullExpressionValue(radioGroup2, "binding.guildInviteMaxUsesRadiogroup");
             IntRange until2 = f.until(0, radioGroup2.getChildCount());
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java
index c3a013d693..8e9ad8291f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java
@@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetGuildInvite$binding$2 extends k impleme
 
     public final WidgetGuildInviteBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363365;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363365);
+        int i = 2131363391;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363391);
         if (materialButton != null) {
-            i = 2131363366;
-            View findViewById = view.findViewById(2131363366);
+            i = 2131363392;
+            View findViewById = view.findViewById(2131363392);
             if (findViewById != null) {
-                i = 2131363367;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363367);
+                i = 2131363393;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363393);
                 if (materialButton2 != null) {
-                    i = 2131363376;
-                    WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(2131363376);
+                    i = 2131363402;
+                    WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(2131363402);
                     if (widgetInviteInfo != null) {
-                        i = 2131363384;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363384);
+                        i = 2131363410;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363410);
                         if (simpleDraweeView != null) {
                             return new WidgetGuildInviteBinding((CoordinatorLayout) view, materialButton, findViewById, materialButton2, widgetInviteInfo, simpleDraweeView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$1.java
index 211d0a4322..dc3559d9f6 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$1.java
@@ -24,7 +24,7 @@ public final class WidgetGuildInvite$onAcceptedGuildInvite$1 extends o implement
     public final void mo1invoke() {
         StoreGuildSelected guildSelected = StoreStream.Companion.getGuildSelected();
         Guild guild = this.$invite.getGuild();
-        guildSelected.set(guild != null ? guild.o() : this.$invite.getChannel().e());
+        guildSelected.set(guild != null ? guild.o() : this.$invite.getChannel().f());
         WidgetGuildInvite.access$displayInviteTarget(this.this$0, this.$invite);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$2.java
index c113f62d75..b9c84e18f7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$onAcceptedGuildInvite$2.java
@@ -20,7 +20,7 @@ public final class WidgetGuildInvite$onAcceptedGuildInvite$2 extends o implement
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        ChannelSelector.Companion.getInstance().findAndSet(this.this$0.getContext(), this.$invite.getChannel().g());
+        ChannelSelector.Companion.getInstance().findAndSet(this.this$0.getContext(), this.$invite.getChannel().h());
         WidgetGuildInvite.access$displayInviteTarget(this.this$0, this.$invite);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
index 8c20ae36e6..fcf695e465 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java
@@ -70,7 +70,7 @@ public final class WidgetGuildInvite extends AppFragment {
     }
 
     public WidgetGuildInvite() {
-        super(2131559032);
+        super(2131559036);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGuildInvite widgetGuildInvite, StoreInstantInvites.InviteState.Resolved resolved) {
@@ -111,7 +111,7 @@ public final class WidgetGuildInvite extends AppFragment {
         ModelInvite invite = resolved.getInvite();
         trackAndConsumeDynamicLinkCache(invite);
         getBinding().d.configureUI(invite);
-        MaterialButton materialButton = getBinding().f1796c;
+        MaterialButton materialButton = getBinding().f1797c;
         m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel");
         materialButton.setVisibility(8);
         MaterialButton materialButton2 = getBinding().b;
@@ -133,7 +133,7 @@ public final class WidgetGuildInvite extends AppFragment {
     }
 
     private final void configureUIFailure(Error error) {
-        MaterialButton materialButton = getBinding().f1796c;
+        MaterialButton materialButton = getBinding().f1797c;
         m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel");
         materialButton.setVisibility(0);
         MaterialButton materialButton2 = getBinding().b;
@@ -177,17 +177,17 @@ public final class WidgetGuildInvite extends AppFragment {
         }
         StoreStream.Companion companion = StoreStream.Companion;
         companion.getInstantInvites().fetchInviteIfNotLoaded(str, this.inviteLocation);
-        return companion.getInstantInvites().observeInvite(str).y(WidgetGuildInvite$getResolvedInviteOrDefault$1.INSTANCE);
+        return companion.getInstantInvites().observeInvite(str).x(WidgetGuildInvite$getResolvedInviteOrDefault$1.INSTANCE);
     }
 
     private final void onAcceptedGuildInvite(ModelInvite modelInvite) {
         Channel channel = modelInvite.getChannel();
         m.checkNotNullExpressionValue(channel, "invite.channel");
-        if (AnimatableValueParser.k1(channel)) {
+        if (AnimatableValueParser.l1(channel)) {
             requestMicrophone(new WidgetGuildInvite$onAcceptedGuildInvite$1(this, modelInvite), new WidgetGuildInvite$onAcceptedGuildInvite$2(this, modelInvite));
             return;
         }
-        ChannelSelector.Companion.getInstance().findAndSet(getContext(), modelInvite.getChannel().g());
+        ChannelSelector.Companion.getInstance().findAndSet(getContext(), modelInvite.getChannel().h());
         displayInviteTarget(modelInvite);
     }
 
@@ -218,8 +218,10 @@ public final class WidgetGuildInvite extends AppFragment {
         super.onViewBound(view);
         setRetainInstance(true);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        AnalyticsTracker.INSTANCE.inviteViewed();
-        getBinding().f1796c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
+        String stringExtra = getMostRecentIntent().getStringExtra("EXTRA_CODE");
+        this.inviteCode = stringExtra;
+        AnalyticsTracker.INSTANCE.impressionInviteAccept(stringExtra);
+        getBinding().f1797c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java
index d3f09ba88a..d2f259b7c3 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1.java
@@ -18,6 +18,6 @@ public final class WidgetGuildInviteSettings$ChannelsSpinnerAdapter$setupViews$1
     @IdRes
     /* renamed from: invoke */
     public final Integer mo1invoke() {
-        return this.$dropDownMode ? 2131362358 : 2131362359;
+        return this.$dropDownMode ? 2131362373 : 2131362374;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java
index 161e61ba6c..9b267adce5 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java
@@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetGuildInviteSettings$binding$2 extends k
 
     public final WidgetGuildInviteSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363368;
-        Spinner spinner = (Spinner) view.findViewById(2131363368);
+        int i = 2131363394;
+        Spinner spinner = (Spinner) view.findViewById(2131363394);
         if (spinner != null) {
-            i = 2131363374;
-            RadioGroup radioGroup = (RadioGroup) view.findViewById(2131363374);
+            i = 2131363400;
+            RadioGroup radioGroup = (RadioGroup) view.findViewById(2131363400);
             if (radioGroup != null) {
-                i = 2131363375;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363375);
+                i = 2131363401;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363401);
                 if (materialButton != null) {
-                    i = 2131363378;
-                    RadioGroup radioGroup2 = (RadioGroup) view.findViewById(2131363378);
+                    i = 2131363404;
+                    RadioGroup radioGroup2 = (RadioGroup) view.findViewById(2131363404);
                     if (radioGroup2 != null) {
-                        i = 2131363387;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363387);
+                        i = 2131363413;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363413);
                         if (checkedSetting != null) {
                             return new WidgetGuildInviteSettingsBinding((LinearLayout) view, spinner, radioGroup, materialButton, radioGroup2, checkedSetting);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
index dd055c7fec..65f8a4a68d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java
@@ -160,7 +160,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
     }
 
     public WidgetGuildInviteSettings() {
-        super(2131559034);
+        super(2131559038);
         WidgetGuildInviteSettings$viewModel$2 widgetGuildInviteSettings$viewModel$2 = new WidgetGuildInviteSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildInviteSettingsViewModel.class), new WidgetGuildInviteSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteSettings$viewModel$2));
@@ -232,7 +232,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
 
     private final CharSequence getExpireAfterString(int i, Context context) {
         if (i == 0) {
-            return b.j(this, 2131891425, new Object[0], null, 4);
+            return b.j(this, 2131891496, new Object[0], null, 4);
         }
         if (i == 1800) {
             Resources resources = getResources();
@@ -300,20 +300,20 @@ public final class WidgetGuildInviteSettings extends AppFragment {
             }
             Channel next = it.next();
             Channel targetChannel = viewState.getTargetChannel();
-            if (targetChannel != null && targetChannel.g() == next.g()) {
+            if (targetChannel != null && targetChannel.h() == next.h()) {
                 break;
             }
             i++;
         }
         getBinding().b.setSelection(Math.max(i, 0), false);
         ModelInvite.Settings inviteSettings = viewState.getInviteSettings();
-        RadioGroup radioGroup = getBinding().f1798c;
+        RadioGroup radioGroup = getBinding().f1799c;
         m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
         IntRange until = f.until(0, radioGroup.getChildCount());
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(until, 10));
         Iterator<Integer> it2 = until.iterator();
         while (it2.hasNext()) {
-            View childAt = getBinding().f1798c.getChildAt(((c0) it2).nextInt());
+            View childAt = getBinding().f1799c.getChildAt(((c0) it2).nextInt());
             Objects.requireNonNull(childAt, "null cannot be cast to non-null type android.widget.RadioButton");
             arrayList.add((RadioButton) childAt);
         }
@@ -340,7 +340,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
         if (radioButton != null) {
             radioButton.setChecked(true);
         }
-        getBinding().f1798c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings));
+        getBinding().f1799c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings));
         RadioGroup radioGroup2 = getBinding().e;
         m.checkNotNullExpressionValue(radioGroup2, "binding.guildInviteMaxUsesRadiogroup");
         IntRange until2 = f.until(0, radioGroup2.getChildCount());
@@ -389,7 +389,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
             requireActivity().setResult(-1, intent);
             requireActivity().finish();
         } else if (m.areEqual(event, GuildInviteSettingsViewModel.Event.InviteCreationFailure.INSTANCE)) {
-            c.a.d.o.g(requireContext(), 2131888049, 0, null, 12);
+            c.a.d.o.g(requireContext(), 2131888048, 0, null, 12);
         }
     }
 
@@ -405,7 +405,7 @@ public final class WidgetGuildInviteSettings extends AppFragment {
             m.throwUninitializedPropertyAccessException("channelsSpinnerAdapter");
         }
         spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter);
-        RadioGroup radioGroup = getBinding().f1798c;
+        RadioGroup radioGroup = getBinding().f1799c;
         m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup");
         int[] iArr = ModelInvite.Settings.EXPIRES_AFTER_ARRAY;
         m.checkNotNullExpressionValue(iArr, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY");
@@ -421,9 +421,9 @@ public final class WidgetGuildInviteSettings extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<GuildInviteSettingsViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel.observeViewSta…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetGuildInviteSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<GuildInviteSettingsViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel.observeViewSta…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetGuildInviteSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetGuildInviteSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteSettings$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java
index c360569a8a..a292f217ed 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java
@@ -23,35 +23,35 @@ public final /* synthetic */ class WidgetGuildInviteShare$binding$2 extends k im
 
     public final WidgetGuildInviteShareBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362153;
-        View findViewById = view.findViewById(2131362153);
+        int i = 2131362164;
+        View findViewById = view.findViewById(2131362164);
         if (findViewById != null) {
-            i = 2131363369;
-            TextView textView = (TextView) view.findViewById(2131363369);
+            i = 2131363395;
+            TextView textView = (TextView) view.findViewById(2131363395);
             if (textView != null) {
-                i = 2131363377;
-                TextView textView2 = (TextView) view.findViewById(2131363377);
+                i = 2131363403;
+                TextView textView2 = (TextView) view.findViewById(2131363403);
                 if (textView2 != null) {
-                    i = 2131363379;
-                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363379);
+                    i = 2131363405;
+                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363405);
                     if (checkedSetting != null) {
-                        i = 2131363380;
-                        ImageView imageView = (ImageView) view.findViewById(2131363380);
+                        i = 2131363406;
+                        ImageView imageView = (ImageView) view.findViewById(2131363406);
                         if (imageView != null) {
-                            i = 2131363381;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363381);
+                            i = 2131363407;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363407);
                             if (materialButton != null) {
-                                i = 2131363383;
-                                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363383);
+                                i = 2131363409;
+                                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363409);
                                 if (textInputLayout != null) {
-                                    i = 2131363385;
-                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363385);
+                                    i = 2131363411;
+                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363411);
                                     if (recyclerView != null) {
-                                        i = 2131363386;
-                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363386);
+                                        i = 2131363412;
+                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363412);
                                         if (appViewFlipper != null) {
-                                            i = 2131363632;
-                                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363632);
+                                            i = 2131363673;
+                                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363673);
                                             if (viewInviteSettingsSheet != null) {
                                                 return new WidgetGuildInviteShareBinding((CoordinatorLayout) view, findViewById, textView, textView2, checkedSetting, imageView, materialButton, textInputLayout, recyclerView, appViewFlipper, viewInviteSettingsSheet);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java
index 0036abce11..e966121cce 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java
@@ -35,7 +35,7 @@ public final class WidgetGuildInviteShare$configureUI$3 extends o implements Fun
         WidgetGuildInviteShare.access$sendInvite(this.this$0, inviteSuggestionItem, this.$viewState, this.$invite);
         AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
         Context context = WidgetGuildInviteShare.access$getAdapter$p(this.this$0).getContext();
-        String string = this.this$0.getString(2131890581);
+        String string = this.this$0.getString(2131890649);
         m.checkNotNullExpressionValue(string, "getString(R.string.invite_sent)");
         accessibilityUtils.sendAnnouncement(context, string);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java
index 8dd75a9aaa..bed95104fa 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.java
@@ -39,7 +39,7 @@ public final class WidgetGuildInviteShare$configureUI$5 implements View.OnClickL
         }
         Channel targetChannel = this.$widgetInviteModel.getTargetChannel();
         if (targetChannel != null) {
-            WidgetGuildInviteShare.access$getViewModel$p(this.this$0).generateInviteLink(Long.valueOf(targetChannel.g()).longValue());
+            WidgetGuildInviteShare.access$getViewModel$p(this.this$0).generateInviteLink(Long.valueOf(targetChannel.h()).longValue());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java
index 043c8861bc..d98e308253 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java
@@ -90,7 +90,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
     }
 
     public WidgetGuildInviteShare() {
-        super(2131559035);
+        super(2131559039);
         WidgetGuildInviteShare$viewModel$2 widgetGuildInviteShare$viewModel$2 = new WidgetGuildInviteShare$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShare$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShare$viewModel$2));
@@ -183,7 +183,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
             analyticsTracker.inviteSuggestionOpened(o, arrayList2, arrayList4);
             this.hasTrackedSuggestionsViewed = true;
         }
-        TextView textView = getBinding().f1799c;
+        TextView textView = getBinding().f1800c;
         m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults");
         textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8);
         RecyclerView recyclerView = getBinding().i;
@@ -255,7 +255,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
 
     private final void sendInvite(InviteSuggestionItem inviteSuggestionItem, WidgetGuildInviteShareViewModel.ViewState.Loaded loaded, ModelInvite modelInvite) {
         if (inviteSuggestionItem instanceof InviteSuggestionItem.ChannelItem) {
-            getViewModel().sendInviteToChannel(((InviteSuggestionItem.ChannelItem) inviteSuggestionItem).getChannel().g(), loaded, modelInvite);
+            getViewModel().sendInviteToChannel(((InviteSuggestionItem.ChannelItem) inviteSuggestionItem).getChannel().h(), loaded, modelInvite);
         } else if (inviteSuggestionItem instanceof InviteSuggestionItem.UserItem) {
             getViewModel().sendInviteToUser(((InviteSuggestionItem.UserItem) inviteSuggestionItem).getUser().getId(), loaded, modelInvite);
         }
@@ -276,7 +276,7 @@ public final class WidgetGuildInviteShare extends AppFragment {
             getViewModel().selectChannel(longExtra);
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887393 : null, null, 8, null);
-        setActionBarTitle(2131890570);
+        setActionBarTitle(2131890638);
         AppActivity appActivity = getAppActivity();
         if (!(appActivity == null || (window = appActivity.getWindow()) == null)) {
             window.setSoftInputMode(32);
@@ -300,12 +300,12 @@ public final class WidgetGuildInviteShare extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable G = ObservableExtensionsKt.computationBuffered(getViewModel().observeViewState()).y(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
+        Observable F = ObservableExtensionsKt.computationBuffered(getViewModel().observeViewState()).x(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetGuildInviteShare$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
         PrivateChannelAdapter privateChannelAdapter = this.adapter;
         if (privateChannelAdapter == null) {
             m.throwUninitializedPropertyAccessException("adapter");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(G, this, privateChannelAdapter), WidgetGuildInviteShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShare$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(F, this, privateChannelAdapter), WidgetGuildInviteShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShare$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java
index 1de799694e..d55684267f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java
@@ -22,32 +22,32 @@ public final /* synthetic */ class WidgetGuildInviteShareCompact$binding$2 exten
 
     public final WidgetGuildInviteShareCompactBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362153;
-        View findViewById = view.findViewById(2131362153);
+        int i = 2131362164;
+        View findViewById = view.findViewById(2131362164);
         if (findViewById != null) {
-            i = 2131363369;
-            TextView textView = (TextView) view.findViewById(2131363369);
+            i = 2131363395;
+            TextView textView = (TextView) view.findViewById(2131363395);
             if (textView != null) {
-                i = 2131363379;
-                TextView textView2 = (TextView) view.findViewById(2131363379);
+                i = 2131363405;
+                TextView textView2 = (TextView) view.findViewById(2131363405);
                 if (textView2 != null) {
-                    i = 2131363380;
-                    ImageView imageView = (ImageView) view.findViewById(2131363380);
+                    i = 2131363406;
+                    ImageView imageView = (ImageView) view.findViewById(2131363406);
                     if (imageView != null) {
-                        i = 2131363381;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363381);
+                        i = 2131363407;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363407);
                         if (materialButton != null) {
-                            i = 2131363382;
-                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363382);
+                            i = 2131363408;
+                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363408);
                             if (textInputLayout != null) {
-                                i = 2131363385;
-                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363385);
+                                i = 2131363411;
+                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363411);
                                 if (recyclerView != null) {
-                                    i = 2131363386;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363386);
+                                    i = 2131363412;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363412);
                                     if (appViewFlipper != null) {
-                                        i = 2131363632;
-                                        ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363632);
+                                        i = 2131363673;
+                                        ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363673);
                                         if (viewInviteSettingsSheet != null) {
                                             return new WidgetGuildInviteShareCompactBinding((CoordinatorLayout) view, findViewById, textView, textView2, imageView, materialButton, textInputLayout, recyclerView, appViewFlipper, viewInviteSettingsSheet);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java
index 3db95522b8..6da8961412 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java
@@ -67,7 +67,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public Item(PrivateChannelAdapter privateChannelAdapter) {
-                super(2131559038, privateChannelAdapter);
+                super(2131559042, privateChannelAdapter);
                 m.checkNotNullParameter(privateChannelAdapter, "adapter");
                 WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView);
                 m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)");
@@ -84,7 +84,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
                 boolean z2 = inviteSuggestionItem instanceof InviteSuggestionItem.ChannelItem;
                 if (z2) {
                     InviteSuggestionItem.ChannelItem channelItem = (InviteSuggestionItem.ChannelItem) inviteSuggestionItem;
-                    if (channelItem.getChannel().z() != 1) {
+                    if (channelItem.getChannel().A() != 1) {
                         SimpleDraweeView simpleDraweeView = this.binding.b;
                         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv");
                         IconUtils.setIcon$default(simpleDraweeView, channelItem.getChannel(), 0, null, 12, null);
@@ -110,13 +110,13 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
                     m.checkNotNullExpressionValue(materialButton, "binding.itemSent");
                     int i2 = 0;
                     materialButton.setVisibility(inviteSuggestionItem.hasSentInvite() ? 0 : 8);
-                    MaterialButton materialButton2 = this.binding.f1802c;
+                    MaterialButton materialButton2 = this.binding.f1803c;
                     m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn");
                     if (!(!inviteSuggestionItem.hasSentInvite())) {
                         i2 = 8;
                     }
                     materialButton2.setVisibility(i2);
-                    this.binding.f1802c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
+                    this.binding.f1803c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem));
                 }
             }
         }
@@ -145,7 +145,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
     }
 
     public WidgetGuildInviteShareCompact() {
-        super(2131559036);
+        super(2131559040);
         WidgetGuildInviteShareCompact$viewModel$2 widgetGuildInviteShareCompact$viewModel$2 = new WidgetGuildInviteShareCompact$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShareCompact$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShareCompact$viewModel$2));
@@ -225,7 +225,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
             analyticsTracker.inviteSuggestionOpened(o, arrayList2, arrayList4);
             this.hasTrackedSuggestionsViewed = true;
         }
-        TextView textView = getBinding().f1800c;
+        TextView textView = getBinding().f1801c;
         m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults");
         textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8);
         RecyclerView recyclerView = getBinding().h;
@@ -284,7 +284,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
 
     private final void sendInvite(InviteSuggestionItem inviteSuggestionItem, WidgetGuildInviteShareViewModel.ViewState.Loaded loaded, ModelInvite modelInvite) {
         if (inviteSuggestionItem instanceof InviteSuggestionItem.ChannelItem) {
-            getViewModel().sendInviteToChannel(((InviteSuggestionItem.ChannelItem) inviteSuggestionItem).getChannel().g(), loaded, modelInvite);
+            getViewModel().sendInviteToChannel(((InviteSuggestionItem.ChannelItem) inviteSuggestionItem).getChannel().h(), loaded, modelInvite);
         } else if (inviteSuggestionItem instanceof InviteSuggestionItem.UserItem) {
             getViewModel().sendInviteToUser(((InviteSuggestionItem.UserItem) inviteSuggestionItem).getUser().getId(), loaded, modelInvite);
         }
@@ -304,7 +304,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
             getViewModel().selectChannel(longExtra);
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887393 : null, null, 8, null);
-        setActionBarTitle(2131890570);
+        setActionBarTitle(2131890638);
         AppFragment.setOnBackPressed$default(this, new WidgetGuildInviteShareCompact$onViewBound$1(this, booleanExtra), 0, 2, null);
         TextInputLayout textInputLayout = getBinding().g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildInviteShareCompactSearch");
@@ -325,12 +325,12 @@ public final class WidgetGuildInviteShareCompact extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable G = ObservableExtensionsKt.computationBuffered(getViewModel().observeViewState()).y(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
+        Observable F = ObservableExtensionsKt.computationBuffered(getViewModel().observeViewState()).x(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetGuildInviteShareCompact$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
         PrivateChannelAdapter privateChannelAdapter = this.adapter;
         if (privateChannelAdapter == null) {
             m.throwUninitializedPropertyAccessException("adapter");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(G, this, privateChannelAdapter), WidgetGuildInviteShareCompact.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(F, this, privateChannelAdapter), WidgetGuildInviteShareCompact.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareCompact$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java
index 62b1562262..b09307db1f 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java
@@ -19,23 +19,23 @@ public final /* synthetic */ class WidgetGuildInviteShareEmptySuggestions$bindin
 
     public final WidgetGuildInviteShareEmptySuggestionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362153;
-        View findViewById = view.findViewById(2131362153);
+        int i = 2131362164;
+        View findViewById = view.findViewById(2131362164);
         if (findViewById != null) {
-            i = 2131363370;
-            TextView textView = (TextView) view.findViewById(2131363370);
+            i = 2131363396;
+            TextView textView = (TextView) view.findViewById(2131363396);
             if (textView != null) {
-                i = 2131363371;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363371);
+                i = 2131363397;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363397);
                 if (materialButton != null) {
-                    i = 2131363372;
-                    ImageButton imageButton = (ImageButton) view.findViewById(2131363372);
+                    i = 2131363398;
+                    ImageButton imageButton = (ImageButton) view.findViewById(2131363398);
                     if (imageButton != null) {
-                        i = 2131363373;
-                        TextView textView2 = (TextView) view.findViewById(2131363373);
+                        i = 2131363399;
+                        TextView textView2 = (TextView) view.findViewById(2131363399);
                         if (textView2 != null) {
-                            i = 2131363632;
-                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363632);
+                            i = 2131363673;
+                            ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363673);
                             if (viewInviteSettingsSheet != null) {
                                 return new WidgetGuildInviteShareEmptySuggestionsBinding((CoordinatorLayout) view, findViewById, textView, materialButton, imageButton, textView2, viewInviteSettingsSheet);
                             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java
index 68547d6ac6..08643e9854 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java
@@ -38,7 +38,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetGuildInviteShareEmptySuggestions() {
-        super(2131559037);
+        super(2131559041);
         WidgetGuildInviteShareEmptySuggestions$viewModel$2 widgetGuildInviteShareEmptySuggestions$viewModel$2 = new WidgetGuildInviteShareEmptySuggestions$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShareEmptySuggestions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShareEmptySuggestions$viewModel$2));
@@ -83,7 +83,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
         CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755065, i, Integer.valueOf(i));
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        return b.h(resources2, 2131890583, new Object[]{quantityString, charSequence}, null, 4);
+        return b.h(resources2, 2131890651, new Object[]{quantityString, charSequence}, null, 4);
     }
 
     private final String getInviteLink(ModelInvite modelInvite) {
@@ -109,25 +109,25 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
         WidgetInviteModel widgetInviteModel = loaded.getWidgetInviteModel();
         getBinding().g.configureUi(widgetInviteModel);
         ModelInvite invite = widgetInviteModel.getInvite();
-        TextView textView = getBinding().f1801c;
+        TextView textView = getBinding().f1802c;
         m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptySuggestionsInviteLink");
         textView.setText(getInviteLink(invite));
-        getBinding().f1801c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite));
+        getBinding().f1802c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite));
         getBinding().d.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$2(this, invite));
         getBinding().e.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$3(this));
         ModelInvite.Settings settings = widgetInviteModel.getSettings();
         if (settings != null) {
             if (settings.getMaxUses() == 0) {
-                charSequence = getResources().getString(2131891004);
+                charSequence = getResources().getString(2131891075);
                 m.checkNotNullExpressionValue(charSequence, "resources.getString(R.st…scription_unlimited_uses)");
             } else {
                 Resources resources = getResources();
                 m.checkNotNullExpressionValue(resources, "resources");
-                charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755214, settings.getMaxUses(), Integer.valueOf(settings.getMaxUses()));
+                charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755215, settings.getMaxUses(), Integer.valueOf(settings.getMaxUses()));
             }
             int maxAge = widgetInviteModel.getSettings().getMaxAge();
             if (maxAge == 0) {
-                String str = getResources().getString(2131890999) + ", " + charSequence;
+                String str = getResources().getString(2131891070) + ", " + charSequence;
                 m.checkNotNullExpressionValue(str, "StringBuilder()\n        …              .toString()");
                 TextView textView2 = getBinding().f;
                 m.checkNotNullExpressionValue(textView2, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
@@ -140,7 +140,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
                 m.checkNotNullExpressionValue(textView3, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
                 Resources resources3 = getResources();
                 m.checkNotNullExpressionValue(resources3, "resources");
-                textView3.setText(b.h(resources3, 2131890583, new Object[]{quantityString, charSequence}, null, 4));
+                textView3.setText(b.h(resources3, 2131890651, new Object[]{quantityString, charSequence}, null, 4));
             } else if (maxAge == 3600) {
                 TextView textView4 = getBinding().f;
                 m.checkNotNullExpressionValue(textView4, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
@@ -161,7 +161,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
                 m.checkNotNullExpressionValue(textView7, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
                 Resources resources5 = getResources();
                 m.checkNotNullExpressionValue(resources5, "resources");
-                textView7.setText(b.h(resources5, 2131890583, new Object[]{quantityString2, charSequence}, null, 4));
+                textView7.setText(b.h(resources5, 2131890651, new Object[]{quantityString2, charSequence}, null, 4));
             } else if (maxAge == 604800) {
                 Resources resources6 = getResources();
                 m.checkNotNullExpressionValue(resources6, "resources");
@@ -170,7 +170,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
                 m.checkNotNullExpressionValue(textView8, "binding.guildInviteEmpty…SettingsInviteLinkSubtext");
                 Resources resources7 = getResources();
                 m.checkNotNullExpressionValue(resources7, "resources");
-                textView8.setText(b.h(resources7, 2131890583, new Object[]{quantityString3, charSequence}, null, 4));
+                textView8.setText(b.h(resources7, 2131890651, new Object[]{quantityString3, charSequence}, null, 4));
             }
         }
     }
@@ -208,8 +208,8 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable G = ObservableExtensionsKt.computationBuffered(getViewModel().observeViewState()).y(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(G, this, null, 2, null), WidgetGuildInviteShareEmptySuggestions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.computationBuffered(getViewModel().observeViewState()).x(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(F, this, null, 2, null), WidgetGuildInviteShareEmptySuggestions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java
index 0217475496..ad4146c58d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java
@@ -27,69 +27,69 @@ public final /* synthetic */ class WidgetGuildInviteShareSheet$binding$2 extends
 
     public final WidgetGuildInviteShareSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362760;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362760);
+        int i = 2131362785;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362785);
         if (constraintLayout != null) {
-            i = 2131362761;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362761);
+            i = 2131362786;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362786);
             if (frameLayout != null) {
-                i = 2131362762;
-                Barrier barrier = (Barrier) view.findViewById(2131362762);
+                i = 2131362787;
+                Barrier barrier = (Barrier) view.findViewById(2131362787);
                 if (barrier != null) {
-                    i = 2131362763;
-                    TextView textView = (TextView) view.findViewById(2131362763);
+                    i = 2131362788;
+                    TextView textView = (TextView) view.findViewById(2131362788);
                     if (textView != null) {
-                        i = 2131362764;
-                        TextView textView2 = (TextView) view.findViewById(2131362764);
+                        i = 2131362789;
+                        TextView textView2 = (TextView) view.findViewById(2131362789);
                         if (textView2 != null) {
-                            i = 2131363034;
-                            TextView textView3 = (TextView) view.findViewById(2131363034);
+                            i = 2131363059;
+                            TextView textView3 = (TextView) view.findViewById(2131363059);
                             if (textView3 != null) {
-                                i = 2131363035;
-                                ImageView imageView = (ImageView) view.findViewById(2131363035);
+                                i = 2131363060;
+                                ImageView imageView = (ImageView) view.findViewById(2131363060);
                                 if (imageView != null) {
-                                    i = 2131363036;
-                                    TextView textView4 = (TextView) view.findViewById(2131363036);
+                                    i = 2131363061;
+                                    TextView textView4 = (TextView) view.findViewById(2131363061);
                                     if (textView4 != null) {
-                                        i = 2131363037;
-                                        ImageButton imageButton = (ImageButton) view.findViewById(2131363037);
+                                        i = 2131363062;
+                                        ImageButton imageButton = (ImageButton) view.findViewById(2131363062);
                                         if (imageButton != null) {
-                                            i = 2131363038;
-                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363038);
+                                            i = 2131363063;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363063);
                                             if (nestedScrollView != null) {
-                                                i = 2131363039;
-                                                TextView textView5 = (TextView) view.findViewById(2131363039);
+                                                i = 2131363064;
+                                                TextView textView5 = (TextView) view.findViewById(2131363064);
                                                 if (textView5 != null) {
-                                                    i = 2131363040;
-                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363040);
+                                                    i = 2131363065;
+                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363065);
                                                     if (materialButton != null) {
-                                                        i = 2131363041;
-                                                        TextView textView6 = (TextView) view.findViewById(2131363041);
+                                                        i = 2131363066;
+                                                        TextView textView6 = (TextView) view.findViewById(2131363066);
                                                         if (textView6 != null) {
-                                                            i = 2131363633;
-                                                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363633);
+                                                            i = 2131363674;
+                                                            FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363674);
                                                             if (frameLayout2 != null) {
-                                                                i = 2131363635;
-                                                                TextView textView7 = (TextView) view.findViewById(2131363635);
+                                                                i = 2131363676;
+                                                                TextView textView7 = (TextView) view.findViewById(2131363676);
                                                                 if (textView7 != null) {
-                                                                    i = 2131363757;
-                                                                    Barrier barrier2 = (Barrier) view.findViewById(2131363757);
+                                                                    i = 2131363798;
+                                                                    Barrier barrier2 = (Barrier) view.findViewById(2131363798);
                                                                     if (barrier2 != null) {
                                                                         FrameLayout frameLayout3 = (FrameLayout) view;
-                                                                        i = 2131364532;
-                                                                        Barrier barrier3 = (Barrier) view.findViewById(2131364532);
+                                                                        i = 2131364571;
+                                                                        Barrier barrier3 = (Barrier) view.findViewById(2131364571);
                                                                         if (barrier3 != null) {
-                                                                            i = 2131364540;
-                                                                            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364540);
+                                                                            i = 2131364579;
+                                                                            SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364579);
                                                                             if (searchInputView != null) {
-                                                                                i = 2131364933;
-                                                                                CardView cardView = (CardView) view.findViewById(2131364933);
+                                                                                i = 2131364983;
+                                                                                CardView cardView = (CardView) view.findViewById(2131364983);
                                                                                 if (cardView != null) {
-                                                                                    i = 2131365149;
-                                                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365149);
+                                                                                    i = 2131365204;
+                                                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365204);
                                                                                     if (recyclerView != null) {
-                                                                                        i = 2131365150;
-                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365150);
+                                                                                        i = 2131365205;
+                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365205);
                                                                                         if (appViewFlipper != null) {
                                                                                             return new WidgetGuildInviteShareSheetBinding(frameLayout3, constraintLayout, frameLayout, barrier, textView, textView2, textView3, imageView, textView4, imageButton, nestedScrollView, textView5, materialButton, textView6, frameLayout2, textView7, barrier2, frameLayout3, barrier3, searchInputView, cardView, recyclerView, appViewFlipper);
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java
index 6e7693b6e6..9f6987653a 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java
@@ -186,7 +186,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
         } else {
             TextView textView3 = binding.d;
             m.checkNotNullExpressionValue(textView3, "emptyStateInviteLink");
-            textView3.setText(getString(2131890817));
+            textView3.setText(getString(2131890887));
             TextView textView4 = binding.g;
             m.checkNotNullExpressionValue(textView4, "emptyStateSettingsSubtext");
             textView4.setText((CharSequence) null);
@@ -239,10 +239,10 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
             Channel channel = viewState.getChannel();
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            searchInputView.setHint(b.j(this, 2131890602, new Object[]{AnimatableValueParser.A0(channel, requireContext, false, 2)}, null, 4));
+            searchInputView.setHint(b.j(this, 2131890670, new Object[]{AnimatableValueParser.A0(channel, requireContext, false, 2)}, null, 4));
         } else {
             SearchInputView searchInputView2 = binding.k;
-            String string = getString(2131890601);
+            String string = getString(2131890669);
             m.checkNotNullExpressionValue(string, "getString(R.string.invite_your_friends)");
             searchInputView2.setHint(string);
         }
@@ -250,13 +250,13 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
         if (invite != null) {
             CardView cardView = binding.l;
             m.checkNotNullExpressionValue(cardView, "shareButton");
-            cardView.setContentDescription(b.j(this, 2131893236, new Object[]{invite}, null, 4));
+            cardView.setContentDescription(b.j(this, 2131893319, new Object[]{invite}, null, 4));
             long expirationTimeMs = invite.getExpirationTimeMs() - ClockFactory.get().currentTimeMillis();
             String link = invite.toLink();
             Context requireContext2 = requireContext();
             m.checkNotNullExpressionValue(requireContext2, "requireContext()");
             CharSequence inviteSettingsText = GuildInviteUiHelperKt.getInviteSettingsText(requireContext2, expirationTimeMs);
-            TextView textView = binding.f1803c;
+            TextView textView = binding.f1804c;
             m.checkNotNullExpressionValue(textView, "copyLinkSubtitle");
             textView.setText(link + ' ' + inviteSettingsText);
             binding.l.setOnClickListener(new WidgetGuildInviteShareSheet$configureNormalUI$$inlined$with$lambda$1(invite, this, searchQuery, viewState));
@@ -310,7 +310,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559039;
+        return 2131559043;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.java
index 39c6c30b6d..1f1eebd519 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.java
@@ -67,7 +67,7 @@ public final class WidgetGuildInviteShareViewModel$observeViewStateFromStores$1<
         ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(dms, 10));
         for (Channel channel : dms) {
             User v0 = AnimatableValueParser.v0(channel);
-            arrayList2.add(d0.o.to(v0 != null ? Long.valueOf(v0.getId()) : null, Long.valueOf(channel.g())));
+            arrayList2.add(d0.o.to(v0 != null ? Long.valueOf(v0.getId()) : null, Long.valueOf(channel.h())));
         }
         Map map2 = h0.toMap(arrayList2);
         if (!(!list.isEmpty())) {
@@ -86,7 +86,7 @@ public final class WidgetGuildInviteShareViewModel$observeViewStateFromStores$1<
         for (InviteSuggestion inviteSuggestion2 : list) {
             if (inviteSuggestion2 instanceof InviteSuggestion.ChannelItem) {
                 InviteSuggestion.ChannelItem channelItem = (InviteSuggestion.ChannelItem) inviteSuggestion2;
-                obj = new InviteSuggestionItem.ChannelItem(channelItem.getChannel(), set.contains(Long.valueOf(channelItem.getChannel().g())));
+                obj = new InviteSuggestionItem.ChannelItem(channelItem.getChannel(), set.contains(Long.valueOf(channelItem.getChannel().h())));
             } else if (inviteSuggestion2 instanceof InviteSuggestion.UserSuggestion) {
                 InviteSuggestion.UserSuggestion userSuggestion = (InviteSuggestion.UserSuggestion) inviteSuggestion2;
                 obj = new InviteSuggestionItem.UserItem(userSuggestion.getUser(), u.contains(set, map2.get(Long.valueOf(userSuggestion.getUser().getId()))));
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java
index 83a315fe3d..c3b91a200d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java
@@ -50,7 +50,7 @@ public final class WidgetGuildInviteShareViewModel$sendInviteToChannel$1 extends
             if (set == null) {
                 set = n0.emptySet();
             }
-            WidgetGuildInviteShareViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().i()))))));
+            WidgetGuildInviteShareViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().g()))))));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.java
index 52bf8ad262..f1fa0e7e1d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.java
@@ -31,6 +31,6 @@ public final class WidgetGuildInviteShareViewModel$sendInviteToUser$1 extends o
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        this.this$0.sendInviteToChannel(channel.g(), this.$viewState, this.$invite);
+        this.this$0.sendInviteToChannel(channel.h(), this.$viewState, this.$invite);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
index aa2416dc3c..87a72c4589 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.java
@@ -272,20 +272,20 @@ public final class WidgetGuildInviteShareViewModel extends AppViewModel<ViewStat
         this.resources = resources;
         this.subscribeOnInit = z2;
         this.guildId = j;
-        BehaviorSubject<Map<String, Set<Long>>> m0 = BehaviorSubject.m0(h0.emptyMap());
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(emptyMap())");
-        this.sentInvitesSubject = m0;
-        this.filterPublisher = BehaviorSubject.m0("");
-        BehaviorSubject<Long> m02 = BehaviorSubject.m0(null);
-        m.checkNotNullExpressionValue(m02, "BehaviorSubject.create(null as ChannelId?)");
-        this.selectedChannelSubject = m02;
-        BehaviorSubject<Unit> m03 = BehaviorSubject.m0(Unit.a);
-        m.checkNotNullExpressionValue(m03, "BehaviorSubject.create(Unit)");
-        this.refreshUiSubject = m03;
+        BehaviorSubject<Map<String, Set<Long>>> l0 = BehaviorSubject.l0(h0.emptyMap());
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(emptyMap())");
+        this.sentInvitesSubject = l0;
+        this.filterPublisher = BehaviorSubject.l0("");
+        BehaviorSubject<Long> l02 = BehaviorSubject.l0(null);
+        m.checkNotNullExpressionValue(l02, "BehaviorSubject.create(null as ChannelId?)");
+        this.selectedChannelSubject = l02;
+        BehaviorSubject<Unit> l03 = BehaviorSubject.l0(Unit.a);
+        m.checkNotNullExpressionValue(l03, "BehaviorSubject.create(Unit)");
+        this.refreshUiSubject = l03;
         if (z2) {
-            Observable<ViewState.Loaded> u = observeViewStateFromStores$app_productionGoogleRelease(j).u(new AnonymousClass1(this));
-            m.checkNotNullExpressionValue(u, "observeViewStateFromStor…romViewState(viewState) }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(u), this, null, 2, null), WidgetGuildInviteShareViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+            Observable<ViewState.Loaded> t = observeViewStateFromStores$app_productionGoogleRelease(j).t(new AnonymousClass1(this));
+            m.checkNotNullExpressionValue(t, "observeViewStateFromStor…romViewState(viewState) }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationBuffered(t), this, null, 2, null), WidgetGuildInviteShareViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         }
     }
 
@@ -313,7 +313,7 @@ public final class WidgetGuildInviteShareViewModel extends AppViewModel<ViewStat
     private final void generateInviteLinkFromViewState(ViewState.Loaded loaded) {
         WidgetInviteModel widgetInviteModel = loaded.getWidgetInviteModel();
         if (!widgetInviteModel.isValidInvite() && !widgetInviteModel.isGeneratingInvite() && widgetInviteModel.getTargetChannel() != null) {
-            this.inviteGenerator.generateForAppComponent(this, widgetInviteModel.getTargetChannel().g());
+            this.inviteGenerator.generateForAppComponent(this, widgetInviteModel.getTargetChannel().h());
         }
     }
 
@@ -324,9 +324,9 @@ public final class WidgetGuildInviteShareViewModel extends AppViewModel<ViewStat
     private final Observable<WidgetInviteModel> observeWidgetInviteViewModel(long j) {
         Observable d = Observable.d(this.storeInviteSettings.getInviteSettings(), this.storeInviteSettings.getInvitableChannels(j), this.inviteGenerator.getGenerationState(), this.selectedChannelSubject, StoreUser.observeMe$default(this.storeUser, false, 1, null), this.storeChannels.observeDMs(), this.storeGuilds.observeGuild(j), this.storeStageInstances.observeStageInstancesForGuild(j), WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.INSTANCE);
         m.checkNotNullExpressionValue(d, "Observable\n        .comb…ces\n          )\n        }");
-        Observable<WidgetInviteModel> s2 = ObservableExtensionsKt.computationLatest(d).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n        .comb…  .distinctUntilChanged()");
-        return s2;
+        Observable<WidgetInviteModel> r = ObservableExtensionsKt.computationLatest(d).r();
+        m.checkNotNullExpressionValue(r, "Observable\n        .comb…  .distinctUntilChanged()");
+        return r;
     }
 
     private final void updateSentInvites(Map<String, ? extends Set<Long>> map) {
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java
index d40ec93443..6ea8770bf6 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java
@@ -49,45 +49,45 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
     public WidgetInviteInfo(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "ctx");
-        LayoutInflater.from(getContext()).inflate(2131559033, this);
-        int i2 = 2131363609;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363609);
+        LayoutInflater.from(getContext()).inflate(2131559037, this);
+        int i2 = 2131363650;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363650);
         if (simpleDraweeView != null) {
-            i2 = 2131363610;
-            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById(2131363610);
+            i2 = 2131363651;
+            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById(2131363651);
             if (simpleDraweeView2 != null) {
-                i2 = 2131363611;
-                CardView cardView = (CardView) findViewById(2131363611);
+                i2 = 2131363652;
+                CardView cardView = (CardView) findViewById(2131363652);
                 if (cardView != null) {
-                    i2 = 2131363612;
-                    RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131363612);
+                    i2 = 2131363653;
+                    RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131363653);
                     if (relativeLayout != null) {
-                        i2 = 2131363613;
-                        RelativeLayout relativeLayout2 = (RelativeLayout) findViewById(2131363613);
+                        i2 = 2131363654;
+                        RelativeLayout relativeLayout2 = (RelativeLayout) findViewById(2131363654);
                         if (relativeLayout2 != null) {
-                            i2 = 2131363621;
-                            ImageView imageView = (ImageView) findViewById(2131363621);
+                            i2 = 2131363662;
+                            ImageView imageView = (ImageView) findViewById(2131363662);
                             if (imageView != null) {
-                                i2 = 2131363624;
-                                TextView textView = (TextView) findViewById(2131363624);
+                                i2 = 2131363665;
+                                TextView textView = (TextView) findViewById(2131363665);
                                 if (textView != null) {
-                                    i2 = 2131363625;
-                                    CardView cardView2 = (CardView) findViewById(2131363625);
+                                    i2 = 2131363666;
+                                    CardView cardView2 = (CardView) findViewById(2131363666);
                                     if (cardView2 != null) {
-                                        i2 = 2131363626;
-                                        TextView textView2 = (TextView) findViewById(2131363626);
+                                        i2 = 2131363667;
+                                        TextView textView2 = (TextView) findViewById(2131363667);
                                         if (textView2 != null) {
-                                            i2 = 2131363627;
-                                            CardView cardView3 = (CardView) findViewById(2131363627);
+                                            i2 = 2131363668;
+                                            CardView cardView3 = (CardView) findViewById(2131363668);
                                             if (cardView3 != null) {
-                                                i2 = 2131363628;
-                                                LinearLayout linearLayout = (LinearLayout) findViewById(2131363628);
+                                                i2 = 2131363669;
+                                                LinearLayout linearLayout = (LinearLayout) findViewById(2131363669);
                                                 if (linearLayout != null) {
-                                                    i2 = 2131363629;
-                                                    TextView textView3 = (TextView) findViewById(2131363629);
+                                                    i2 = 2131363670;
+                                                    TextView textView3 = (TextView) findViewById(2131363670);
                                                     if (textView3 != null) {
-                                                        i2 = 2131363636;
-                                                        TextView textView4 = (TextView) findViewById(2131363636);
+                                                        i2 = 2131363677;
+                                                        TextView textView4 = (TextView) findViewById(2131363677);
                                                         if (textView4 != null) {
                                                             WidgetGuildInviteInfoBinding widgetGuildInviteInfoBinding = new WidgetGuildInviteInfoBinding(this, simpleDraweeView, simpleDraweeView2, cardView, relativeLayout, relativeLayout2, imageView, textView, cardView2, textView2, cardView3, linearLayout, textView3, textView4);
                                                             m.checkNotNullExpressionValue(widgetGuildInviteInfoBinding, "WidgetGuildInviteInfoBin…ater.from(context), this)");
@@ -142,11 +142,11 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         boolean z2 = true;
         int i = 0;
         String y0 = AnimatableValueParser.y0(channel).length() > 0 ? AnimatableValueParser.y0(channel) : str;
-        if (AnimatableValueParser.p1(channel) && (r5 = channel.f()) != null) {
+        if (AnimatableValueParser.q1(channel) && (r5 = channel.g()) != null) {
         }
         z2 = false;
         if (z2) {
-            SimpleDraweeView simpleDraweeView2 = this.binding.f1797c;
+            SimpleDraweeView simpleDraweeView2 = this.binding.f1798c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
             IconUtils.setIcon$default(simpleDraweeView2, channel, 2131165290, null, 8, null);
         }
@@ -178,7 +178,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatar");
             User inviter = modelInvite.getInviter();
             IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null), 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
-            SimpleDraweeView simpleDraweeView2 = this.binding.f1797c;
+            SimpleDraweeView simpleDraweeView2 = this.binding.f1798c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
             Guild guild = modelInvite.getGuild();
             Long valueOf = guild != null ? Long.valueOf(guild.o()) : null;
@@ -201,7 +201,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         RelativeLayout relativeLayout = this.binding.e;
         m.checkNotNullExpressionValue(relativeLayout, "binding.inviteAvatarSmallWrap");
         relativeLayout.setVisibility(z2 ? 0 : 8);
-        SimpleDraweeView simpleDraweeView4 = this.binding.f1797c;
+        SimpleDraweeView simpleDraweeView4 = this.binding.f1798c;
         m.checkNotNullExpressionValue(simpleDraweeView4, "binding.inviteAvatarSmall");
         if (!z2) {
             i = 8;
@@ -221,12 +221,12 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
             if (!(guild7 == null || (l = guild7.l()) == null || !l.contains(GuildFeature.PARTNERED))) {
                 TextView textView2 = this.binding.m;
                 m.checkNotNullExpressionValue(textView2, "binding.inviteMessage");
-                ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 2131231811, 0, 0, 0, 14, null);
+                ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 2131231819, 0, 0, 0, 14, null);
             }
         } else {
             TextView textView3 = this.binding.m;
             m.checkNotNullExpressionValue(textView3, "binding.inviteMessage");
-            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, 2131232036, 0, 0, 0, 14, null);
+            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, 2131232044, 0, 0, 0, 14, null);
         }
         TextView textView4 = this.binding.n;
         m.checkNotNullExpressionValue(textView4, "binding.inviteTitle");
@@ -242,11 +242,11 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
     }
 
     private final CharSequence getIntroText(String str) {
-        return str == null ? b.i(this, 2131890381, new Object[0], null, 4) : b.i(this, 2131886764, new Object[]{str}, null, 4);
+        return str == null ? b.i(this, 2131890447, new Object[0], null, 4) : b.i(this, 2131886764, new Object[]{str}, null, 4);
     }
 
     private final CharSequence getIntroTextForGroup(String str, String str2) {
-        return str2.length() > 0 ? b.i(this, 2131886764, new Object[]{str}, null, 4) : b.i(this, 2131890383, new Object[0], null, 4);
+        return str2.length() > 0 ? b.i(this, 2131886764, new Object[]{str}, null, 4) : b.i(this, 2131890449, new Object[0], null, 4);
     }
 
     private final CharSequence getMembersCount(int i) {
@@ -254,13 +254,13 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
         m.checkNotNullExpressionValue(resources, "resources");
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        return b.i(this, 2131890370, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755191, i, Integer.valueOf(i))}, null, 4);
+        return b.i(this, 2131890436, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755192, i, Integer.valueOf(i))}, null, 4);
     }
 
     private final CharSequence getMembersOnlineCount(int i) {
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        return b.i(this, 2131890369, new Object[]{StringUtilsKt.format(i, context)}, null, 4);
+        return b.i(this, 2131890435, new Object[]{StringUtilsKt.format(i, context)}, null, 4);
     }
 
     private final void parseAttributeSet(Context context, AttributeSet attributeSet, int i) {
@@ -297,14 +297,14 @@ public final class WidgetInviteInfo extends LinearLayoutCompat {
     }
 
     public final void configureUIFailure(Error error) {
-        this.binding.n.setText(2131890362);
-        this.binding.m.setText(2131890482);
+        this.binding.n.setText(2131890428);
+        this.binding.m.setText(2131890548);
         if (error != null) {
             Error.Response response = error.getResponse();
             m.checkNotNullExpressionValue(response, "e.response");
             if (response.getCode() == 30001) {
-                this.binding.n.setText(2131893953);
-                this.binding.m.setText(2131893952);
+                this.binding.n.setText(2131894053);
+                this.binding.m.setText(2131894052);
                 this.binding.m.setTextSize(0, getResources().getDimension(2131165776));
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java
index b23ae711ae..d801de9615 100644
--- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java
@@ -25,7 +25,7 @@ public final class WidgetInviteModel {
     private final boolean isValidInvite;
 
     /* renamed from: me  reason: collision with root package name */
-    private final MeUser f2136me;
+    private final MeUser f2142me;
     private final ModelInvite.Settings settings;
     private final Channel targetChannel;
 
@@ -69,7 +69,7 @@ public final class WidgetInviteModel {
             Collections.sort(arrayList, AnimatableValueParser.K0(Channel.Companion));
             boolean z3 = true;
             Channel channel = map.containsKey(l) ? map.get(l) : arrayList.isEmpty() ^ true ? (Channel) arrayList.get(0) : null;
-            boolean z4 = (lastGeneratedInvite == null || channel == null || lastGeneratedInvite.getChannel() == null || lastGeneratedInvite.getChannel().g() != channel.g()) ? false : true;
+            boolean z4 = (lastGeneratedInvite == null || channel == null || lastGeneratedInvite.getChannel() == null || lastGeneratedInvite.getChannel().h() != channel.h()) ? false : true;
             if (channel == null || inviteGenerationState.getState() == InviteGenerator.GenerationState.FAILURE) {
                 modelInvite = tryGetStaticInvite(l, guild, map2);
                 if (modelInvite != null) {
@@ -98,7 +98,7 @@ public final class WidgetInviteModel {
         this.isGeneratingInvite = z2;
         this.isValidInvite = z3;
         this.invitableChannels = list;
-        this.f2136me = meUser;
+        this.f2142me = meUser;
         this.dms = list2;
     }
 
@@ -108,7 +108,7 @@ public final class WidgetInviteModel {
     }
 
     public static /* synthetic */ WidgetInviteModel copy$default(WidgetInviteModel widgetInviteModel, Channel channel, ModelInvite.Settings settings, ModelInvite modelInvite, boolean z2, boolean z3, List list, MeUser meUser, List list2, int i, Object obj) {
-        return widgetInviteModel.copy((i & 1) != 0 ? widgetInviteModel.targetChannel : channel, (i & 2) != 0 ? widgetInviteModel.settings : settings, (i & 4) != 0 ? widgetInviteModel.invite : modelInvite, (i & 8) != 0 ? widgetInviteModel.isGeneratingInvite : z2, (i & 16) != 0 ? widgetInviteModel.isValidInvite : z3, (i & 32) != 0 ? widgetInviteModel.invitableChannels : list, (i & 64) != 0 ? widgetInviteModel.f2136me : meUser, (i & 128) != 0 ? widgetInviteModel.dms : list2);
+        return widgetInviteModel.copy((i & 1) != 0 ? widgetInviteModel.targetChannel : channel, (i & 2) != 0 ? widgetInviteModel.settings : settings, (i & 4) != 0 ? widgetInviteModel.invite : modelInvite, (i & 8) != 0 ? widgetInviteModel.isGeneratingInvite : z2, (i & 16) != 0 ? widgetInviteModel.isValidInvite : z3, (i & 32) != 0 ? widgetInviteModel.invitableChannels : list, (i & 64) != 0 ? widgetInviteModel.f2142me : meUser, (i & 128) != 0 ? widgetInviteModel.dms : list2);
     }
 
     public final Channel component1() {
@@ -136,7 +136,7 @@ public final class WidgetInviteModel {
     }
 
     public final MeUser component7() {
-        return this.f2136me;
+        return this.f2142me;
     }
 
     public final List<Channel> component8() {
@@ -158,7 +158,7 @@ public final class WidgetInviteModel {
             return false;
         }
         WidgetInviteModel widgetInviteModel = (WidgetInviteModel) obj;
-        return m.areEqual(this.targetChannel, widgetInviteModel.targetChannel) && m.areEqual(this.settings, widgetInviteModel.settings) && m.areEqual(this.invite, widgetInviteModel.invite) && this.isGeneratingInvite == widgetInviteModel.isGeneratingInvite && this.isValidInvite == widgetInviteModel.isValidInvite && m.areEqual(this.invitableChannels, widgetInviteModel.invitableChannels) && m.areEqual(this.f2136me, widgetInviteModel.f2136me) && m.areEqual(this.dms, widgetInviteModel.dms);
+        return m.areEqual(this.targetChannel, widgetInviteModel.targetChannel) && m.areEqual(this.settings, widgetInviteModel.settings) && m.areEqual(this.invite, widgetInviteModel.invite) && this.isGeneratingInvite == widgetInviteModel.isGeneratingInvite && this.isValidInvite == widgetInviteModel.isValidInvite && m.areEqual(this.invitableChannels, widgetInviteModel.invitableChannels) && m.areEqual(this.f2142me, widgetInviteModel.f2142me) && m.areEqual(this.dms, widgetInviteModel.dms);
     }
 
     public final List<Channel> getDms() {
@@ -174,7 +174,7 @@ public final class WidgetInviteModel {
     }
 
     public final MeUser getMe() {
-        return this.f2136me;
+        return this.f2142me;
     }
 
     public final ModelInvite.Settings getSettings() {
@@ -209,7 +209,7 @@ public final class WidgetInviteModel {
         int i7 = (i6 + i2) * 31;
         List<Channel> list = this.invitableChannels;
         int hashCode4 = (i7 + (list != null ? list.hashCode() : 0)) * 31;
-        MeUser meUser = this.f2136me;
+        MeUser meUser = this.f2142me;
         int hashCode5 = (hashCode4 + (meUser != null ? meUser.hashCode() : 0)) * 31;
         List<Channel> list2 = this.dms;
         if (list2 != null) {
@@ -240,7 +240,7 @@ public final class WidgetInviteModel {
         L.append(", invitableChannels=");
         L.append(this.invitableChannels);
         L.append(", me=");
-        L.append(this.f2136me);
+        L.append(this.f2142me);
         L.append(", dms=");
         return a.E(L, this.dms, ")");
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java
index 18d6e2227b..29b8ceb441 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java
@@ -39,7 +39,7 @@ public final class ChannelViewHolder extends BaseChannelViewHolder {
         Long c2 = welcomeChannel.c();
         String str = null;
         String imageUri = c2 != null ? ModelEmojiCustom.getImageUri(c2.longValue(), false, mediaProxySize) : null;
-        TextView textView = this.binding.f1812c;
+        TextView textView = this.binding.f1814c;
         m.checkNotNullExpressionValue(textView, "binding.guildWelcomeChannelDescription");
         textView.setText(channelData.getWelcomeChannel().b());
         TextView textView2 = this.binding.e;
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java
index 88209e3a79..1b22cf4e81 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetGuildJoin$binding$2 extends k implement
 
     public final WidgetGuildJoinBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363389;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363389);
+        int i = 2131363416;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363416);
         if (materialButton != null) {
-            i = 2131363391;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363391);
+            i = 2131363418;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363418);
             if (textInputLayout != null) {
                 return new WidgetGuildJoinBinding((CoordinatorLayout) view, materialButton, textInputLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java
index 39e02ba3ac..6cb1f70de4 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java
@@ -74,7 +74,7 @@ public class WidgetGuildJoin extends AppFragment {
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
     public /* synthetic */ WidgetGuildJoin(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
-        this((i2 & 1) != 0 ? 2131559040 : i);
+        this((i2 & 1) != 0 ? 2131559044 : i);
     }
 
     public final WidgetGuildJoinBinding getBinding() {
@@ -82,13 +82,13 @@ public class WidgetGuildJoin extends AppFragment {
     }
 
     public final void handleGuildJoin() {
-        TextInputLayout textInputLayout = getBinding().f1804c;
+        TextInputLayout textInputLayout = getBinding().f1805c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
         if (textOrEmpty.length() > 0) {
             Intent selectInvite = IntentUtils.RouteBuilders.INSTANCE.selectInvite(textOrEmpty, "Join Guild Modal");
             IntentUtils intentUtils = IntentUtils.INSTANCE;
-            TextInputLayout textInputLayout2 = getBinding().f1804c;
+            TextInputLayout textInputLayout2 = getBinding().f1805c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.guildJoinInvite");
             Context context = textInputLayout2.getContext();
             m.checkNotNullExpressionValue(context, "binding.guildJoinInvite.context");
@@ -101,7 +101,7 @@ public class WidgetGuildJoin extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        TextInputLayout textInputLayout = getBinding().f1804c;
+        TextInputLayout textInputLayout = getBinding().f1805c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite");
         ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetGuildJoin$onViewBound$1(this), 1, null);
         getBinding().b.setOnClickListener(new WidgetGuildJoin$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java
index e515845a3d..97ae05f036 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java
@@ -21,26 +21,26 @@ public final /* synthetic */ class WidgetGuildWelcomeSheet$binding$2 extends k i
 
     public final WidgetGuildWelcomeSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363476;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363476);
+        int i = 2131363517;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363517);
         if (recyclerView != null) {
-            i = 2131363477;
-            TextView textView = (TextView) view.findViewById(2131363477);
+            i = 2131363518;
+            TextView textView = (TextView) view.findViewById(2131363518);
             if (textView != null) {
-                i = 2131363478;
-                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363478);
+                i = 2131363519;
+                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363519);
                 if (appViewFlipper != null) {
-                    i = 2131363479;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363479);
+                    i = 2131363520;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363520);
                     if (simpleDraweeView != null) {
-                        i = 2131363480;
-                        CardView cardView = (CardView) view.findViewById(2131363480);
+                        i = 2131363521;
+                        CardView cardView = (CardView) view.findViewById(2131363521);
                         if (cardView != null) {
-                            i = 2131363481;
-                            TextView textView2 = (TextView) view.findViewById(2131363481);
+                            i = 2131363522;
+                            TextView textView2 = (TextView) view.findViewById(2131363522);
                             if (textView2 != null) {
-                                i = 2131363482;
-                                TextView textView3 = (TextView) view.findViewById(2131363482);
+                                i = 2131363523;
+                                TextView textView3 = (TextView) view.findViewById(2131363523);
                                 if (textView3 != null) {
                                     return new WidgetGuildWelcomeSheetBinding((NestedScrollView) view, recyclerView, textView, appViewFlipper, simpleDraweeView, cardView, textView2, textView3);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java
index b0152e9e0d..6fdc39466c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java
@@ -88,14 +88,14 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet {
     private final void configureGuildDetails(String str, String str2) {
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.guildWelcomeSheetName");
-        b.n(textView, 2131894622, new Object[]{str}, null, 4);
+        b.m(textView, 2131894742, new Object[]{str}, null, 4);
         if (str2 != null) {
-            TextView textView2 = getBinding().f1813c;
+            TextView textView2 = getBinding().f1815c;
             m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeSheetDescription");
             ViewExtensions.setTextAndVisibilityBy(textView2, str2);
             return;
         }
-        TextView textView3 = getBinding().f1813c;
+        TextView textView3 = getBinding().f1815c;
         m.checkNotNullExpressionValue(textView3, "binding.guildWelcomeSheetDescription");
         textView3.setVisibility(8);
     }
@@ -191,7 +191,7 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559049;
+        return 2131559054;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java
index c04ffc1a8d..912efe4f93 100644
--- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java
@@ -37,31 +37,31 @@ public final class WidgetGuildWelcomeSheetChannelAdapter extends RecyclerView.Ad
     public BaseChannelViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559048, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559053, viewGroup, false);
             CardView cardView = (CardView) inflate;
-            int i2 = 2131363468;
-            TextView textView = (TextView) inflate.findViewById(2131363468);
+            int i2 = 2131363509;
+            TextView textView = (TextView) inflate.findViewById(2131363509);
             if (textView != null) {
-                i2 = 2131363469;
-                ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363469);
+                i2 = 2131363510;
+                ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363510);
                 if (constraintLayout != null) {
-                    i2 = 2131363470;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363470);
+                    i2 = 2131363511;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363511);
                     if (simpleDraweeView != null) {
-                        i2 = 2131363471;
-                        ImageView imageView = (ImageView) inflate.findViewById(2131363471);
+                        i2 = 2131363512;
+                        ImageView imageView = (ImageView) inflate.findViewById(2131363512);
                         if (imageView != null) {
-                            i2 = 2131363472;
-                            ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131363472);
+                            i2 = 2131363513;
+                            ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131363513);
                             if (constraintLayout2 != null) {
-                                i2 = 2131363473;
-                                TextView textView2 = (TextView) inflate.findViewById(2131363473);
+                                i2 = 2131363514;
+                                TextView textView2 = (TextView) inflate.findViewById(2131363514);
                                 if (textView2 != null) {
-                                    i2 = 2131363474;
-                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) inflate.findViewById(2131363474);
+                                    i2 = 2131363515;
+                                    ConstraintLayout constraintLayout3 = (ConstraintLayout) inflate.findViewById(2131363515);
                                     if (constraintLayout3 != null) {
-                                        i2 = 2131363475;
-                                        TextView textView3 = (TextView) inflate.findViewById(2131363475);
+                                        i2 = 2131363516;
+                                        TextView textView3 = (TextView) inflate.findViewById(2131363516);
                                         if (textView3 != null) {
                                             WidgetGuildWelcomeChannelBinding widgetGuildWelcomeChannelBinding = new WidgetGuildWelcomeChannelBinding((CardView) inflate, cardView, textView, constraintLayout, simpleDraweeView, imageView, constraintLayout2, textView2, constraintLayout3, textView3);
                                             m.checkNotNullExpressionValue(widgetGuildWelcomeChannelBinding, "WidgetGuildWelcomeChanne….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java b/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java
index b6ec2841eb..411bc9f984 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/LeaveGuildDialogViewModel.java
@@ -309,7 +309,7 @@ public final class LeaveGuildDialogViewModel extends AppViewModel<ViewState> {
         this.guildId = j;
         this.restAPI = restAPI;
         this.lurkingStore = storeLurking;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), LeaveGuildDialogViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java
index 4fce97ea2a..ec88ed2f1d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetLeaveGuildDialog$binding$2 extends k im
 
     public final LeaveGuildDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363745;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363745);
+        int i = 2131363786;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363786);
         if (materialButton != null) {
-            i = 2131363746;
-            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363746);
+            i = 2131363787;
+            LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363787);
             if (loadingButton != null) {
-                i = 2131363747;
-                TextView textView = (TextView) view.findViewById(2131363747);
+                i = 2131363788;
+                TextView textView = (TextView) view.findViewById(2131363788);
                 if (textView != null) {
-                    i = 2131363748;
-                    TextView textView2 = (TextView) view.findViewById(2131363748);
+                    i = 2131363789;
+                    TextView textView2 = (TextView) view.findViewById(2131363789);
                     if (textView2 != null) {
-                        i = 2131364030;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030);
+                        i = 2131364073;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364073);
                         if (linearLayout != null) {
                             return new LeaveGuildDialogBinding((LinearLayout) view, materialButton, loadingButton, textView, textView2, linearLayout);
                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java
index cb95b40909..934acd3a00 100644
--- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java
+++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java
@@ -77,11 +77,11 @@ public final class WidgetLeaveGuildDialog extends AppDialog {
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.leaveGuildDialogHeader");
             LeaveGuildDialogViewModel.ViewState.Valid valid = (LeaveGuildDialogViewModel.ViewState.Valid) viewState;
-            b.n(textView, 2131890793, new Object[]{valid.getGuild().getName()}, null, 4);
+            b.m(textView, 2131890863, new Object[]{valid.getGuild().getName()}, null, 4);
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.leaveGuildDialogBody");
-            b.n(textView2, 2131890792, new Object[]{valid.getGuild().getName()}, null, 4);
-            getBinding().f1617c.setIsLoading(valid.isLoading());
+            b.m(textView2, 2131890862, new Object[]{valid.getGuild().getName()}, null, 4);
+            getBinding().f1613c.setIsLoading(valid.isLoading());
         } else if (m.areEqual(viewState, LeaveGuildDialogViewModel.ViewState.Invalid.INSTANCE)) {
             dismiss();
         }
@@ -105,7 +105,7 @@ public final class WidgetLeaveGuildDialog extends AppDialog {
     public void onResume() {
         super.onResume();
         requireDialog().setCanceledOnTouchOutside(true);
-        getBinding().f1617c.setOnClickListener(new WidgetLeaveGuildDialog$onResume$1(this));
+        getBinding().f1613c.setOnClickListener(new WidgetLeaveGuildDialog$onResume$1(this));
         getBinding().b.setOnClickListener(new WidgetLeaveGuildDialog$onResume$2(this));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetLeaveGuildDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetLeaveGuildDialog$onResume$3(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetLeaveGuildDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetLeaveGuildDialog$onResume$4(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java b/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java
index 331d5b5df2..730822d5e7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/GuildListItem.java
@@ -17,6 +17,7 @@ public abstract class GuildListItem {
     private static final long ID_DIVIDER = -4;
     private static final long ID_FRIENDS_LIST = -2;
     private static final long ID_HELP = -5;
+    private static final long ID_HUB = -8;
     public static final long ID_PENDING_GUILDS_FOLDER = -7;
     private static final long ID_UNIDENTIFIED = -1;
     public static final int TYPE_BOTTOM_NAV_SPACE = 8;
@@ -27,6 +28,7 @@ public abstract class GuildListItem {
     public static final int TYPE_FRIENDS = 0;
     public static final int TYPE_GUILD = 3;
     public static final int TYPE_HELP = 7;
+    public static final int TYPE_HUB = 9;
     public static final int TYPE_UNAVAILABLE = 4;
     private final long itemId;
 
@@ -646,6 +648,54 @@ public abstract class GuildListItem {
         }
     }
 
+    /* compiled from: GuildListItem.kt */
+    public static final class HubItem extends GuildListItem {
+        private final boolean showSparkle;
+
+        public HubItem(boolean z2) {
+            super(-8, null);
+            this.showSparkle = z2;
+        }
+
+        public static /* synthetic */ HubItem copy$default(HubItem hubItem, boolean z2, int i, Object obj) {
+            if ((i & 1) != 0) {
+                z2 = hubItem.showSparkle;
+            }
+            return hubItem.copy(z2);
+        }
+
+        public final boolean component1() {
+            return this.showSparkle;
+        }
+
+        public final HubItem copy(boolean z2) {
+            return new HubItem(z2);
+        }
+
+        public boolean equals(Object obj) {
+            if (this != obj) {
+                return (obj instanceof HubItem) && this.showSparkle == ((HubItem) obj).showSparkle;
+            }
+            return true;
+        }
+
+        public final boolean getShowSparkle() {
+            return this.showSparkle;
+        }
+
+        public int hashCode() {
+            boolean z2 = this.showSparkle;
+            if (z2) {
+                return 1;
+            }
+            return z2 ? 1 : 0;
+        }
+
+        public String toString() {
+            return a.G(a.L("HubItem(showSparkle="), this.showSparkle, ")");
+        }
+    }
+
     /* compiled from: GuildListItem.kt */
     public static final class PrivateChannelItem extends GuildListItem implements WidgetChannelListUnreads.UnreadItem {
         private final Channel channel;
@@ -654,7 +704,7 @@ public abstract class GuildListItem {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PrivateChannelItem(Channel channel, int i) {
-            super(channel.g(), null);
+            super(channel.h(), null);
             m.checkNotNullParameter(channel, "channel");
             this.channel = channel;
             this.mentionCount = i;
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java
index 8e9e424ed9..529900dbd9 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java
@@ -12,7 +12,7 @@ import androidx.annotation.ColorInt;
 import androidx.core.content.ContextCompat;
 import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.u2;
+import c.a.i.w2;
 import c.a.l.b;
 import c.d.b.a.a;
 import c.f.g.e.f;
@@ -23,8 +23,10 @@ import com.discord.databinding.WidgetGuildsListItemDmBinding;
 import com.discord.databinding.WidgetGuildsListItemFolderBinding;
 import com.discord.databinding.WidgetGuildsListItemGuildBinding;
 import com.discord.databinding.WidgetGuildsListItemGuildVerticalBinding;
+import com.discord.databinding.WidgetGuildsListItemHubVerificationBinding;
 import com.discord.databinding.WidgetGuildsListItemProfileBinding;
 import com.discord.models.guild.Guild;
+import com.discord.tooltips.SparkleView;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
@@ -47,6 +49,38 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: GuildListViewHolder.kt */
 public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
 
+    /* compiled from: GuildListViewHolder.kt */
+    public static final class DiscordHubViewHolder extends GuildListViewHolder {
+        private final WidgetGuildsListItemHubVerificationBinding binding;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public DiscordHubViewHolder(View view) {
+            super(view, null);
+            m.checkNotNullParameter(view, "view");
+            SparkleView sparkleView = (SparkleView) view.findViewById(2131363414);
+            if (sparkleView != null) {
+                WidgetGuildsListItemHubVerificationBinding widgetGuildsListItemHubVerificationBinding = new WidgetGuildsListItemHubVerificationBinding((FrameLayout) view, sparkleView);
+                m.checkNotNullExpressionValue(widgetGuildsListItemHubVerificationBinding, "WidgetGuildsListItemHubV…icationBinding.bind(view)");
+                this.binding = widgetGuildsListItemHubVerificationBinding;
+                return;
+            }
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363414)));
+        }
+
+        public final void configure(GuildListItem.HubItem hubItem) {
+            m.checkNotNullParameter(hubItem, "item");
+            SparkleView sparkleView = this.binding.b;
+            if (!hubItem.getShowSparkle()) {
+                sparkleView.b();
+            }
+            sparkleView.setVisibility(hubItem.getShowSparkle() ? 0 : 8);
+        }
+
+        public final WidgetGuildsListItemHubVerificationBinding getBinding() {
+            return this.binding;
+        }
+    }
+
     /* compiled from: GuildListViewHolder.kt */
     public static final class FolderViewHolder extends GuildListViewHolder implements GuildsDragAndDropCallback.DraggableViewHolder {
         private final WidgetGuildsListItemFolderBinding binding;
@@ -69,26 +103,26 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(function12, "onLongPressed");
             this.onClicked = function1;
             this.onLongPressed = function12;
-            int i = 2131363490;
-            ServerFolderView serverFolderView = (ServerFolderView) view.findViewById(2131363490);
+            int i = 2131363531;
+            ServerFolderView serverFolderView = (ServerFolderView) view.findViewById(2131363531);
             if (serverFolderView != null) {
-                i = 2131363491;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363491);
+                i = 2131363532;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363532);
                 if (frameLayout != null) {
-                    i = 2131363492;
-                    View findViewById = view.findViewById(2131363492);
+                    i = 2131363533;
+                    View findViewById = view.findViewById(2131363533);
                     if (findViewById != null) {
-                        i = 2131363493;
-                        TextView textView = (TextView) view.findViewById(2131363493);
+                        i = 2131363534;
+                        TextView textView = (TextView) view.findViewById(2131363534);
                         if (textView != null) {
-                            i = 2131363497;
-                            View findViewById2 = view.findViewById(2131363497);
+                            i = 2131363538;
+                            View findViewById2 = view.findViewById(2131363538);
                             if (findViewById2 != null) {
-                                i = 2131363498;
-                                ImageView imageView = (ImageView) view.findViewById(2131363498);
+                                i = 2131363539;
+                                ImageView imageView = (ImageView) view.findViewById(2131363539);
                                 if (imageView != null) {
-                                    i = 2131363499;
-                                    ImageView imageView2 = (ImageView) view.findViewById(2131363499);
+                                    i = 2131363540;
+                                    ImageView imageView2 = (ImageView) view.findViewById(2131363540);
                                     if (imageView2 != null) {
                                         WidgetGuildsListItemFolderBinding widgetGuildsListItemFolderBinding = new WidgetGuildsListItemFolderBinding((RelativeLayout) view, serverFolderView, frameLayout, findViewById, textView, findViewById2, imageView, imageView2);
                                         m.checkNotNullExpressionValue(widgetGuildsListItemFolderBinding, "WidgetGuildsListItemFolderBinding.bind(view)");
@@ -144,7 +178,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                 GridLayout gridLayout = serverFolderView.j.g;
                 m.checkNotNullExpressionValue(gridLayout, "binding.guildViews");
                 gridLayout.setVisibility(isOpen ? 0 : 8);
-                serverFolderView.j.b.setImageDrawable(ContextCompat.getDrawable(serverFolderView.getContext(), 2131231670));
+                serverFolderView.j.b.setImageDrawable(ContextCompat.getDrawable(serverFolderView.getContext(), 2131231676));
             } else {
                 Long l = serverFolderView.k;
                 boolean z2 = (l == null || l.longValue() != folderId || serverFolderView.l == isOpen) ? false : true;
@@ -164,9 +198,9 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                     } else {
                         serverFolderView.a();
                     }
-                    u2 u2Var = serverFolderView.j;
+                    w2 w2Var = serverFolderView.j;
                     int i2 = 0;
-                    for (Object obj : n.listOf((Object[]) new GuildView[]{u2Var.f161c, u2Var.d, u2Var.e, u2Var.f})) {
+                    for (Object obj : n.listOf((Object[]) new GuildView[]{w2Var.f172c, w2Var.d, w2Var.e, w2Var.f})) {
                         int i3 = i2 + 1;
                         if (i2 < 0) {
                             n.throwIndexOverflow();
@@ -194,11 +228,11 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
                                 SimpleDraweeView simpleDraweeView3 = guildView.i.b;
                                 m.checkNotNullExpressionValue(simpleDraweeView3, "binding.guildAvatar");
                                 simpleDraweeView3.setVisibility(0);
-                                TextView textView = guildView.i.f187c;
+                                TextView textView = guildView.i.f67c;
                                 m.checkNotNullExpressionValue(textView, "binding.guildText");
                                 textView.setText(charSequence);
                             } else {
-                                TextView textView2 = guildView.i.f187c;
+                                TextView textView2 = guildView.i.f67c;
                                 m.checkNotNullExpressionValue(textView2, "binding.guildText");
                                 textView2.setText(shortName);
                                 SimpleDraweeView simpleDraweeView4 = guildView.i.b;
@@ -223,7 +257,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             ImageView imageView2 = this.binding.h;
             imageView2.setActivated(folderItem.isAnyGuildConnectedToVoice());
             imageView2.setVisibility(!folderItem.isOpen() && folderItem.isAnyGuildConnectedToVoice() ? 0 : 8);
-            imageView2.setImageResource(folderItem.isAnyGuildConnectedToStageChannel() ? 2131231480 : 2131232055);
+            imageView2.setImageResource(folderItem.isAnyGuildConnectedToStageChannel() ? 2131231486 : 2131232063);
             View view2 = this.binding.d;
             m.checkNotNullExpressionValue(view2, "binding.guildsItemHighlight");
             if (folderItem.isTargetedForFolderAddition()) {
@@ -241,7 +275,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(view4, "itemView");
             View view5 = this.itemView;
             m.checkNotNullExpressionValue(view5, "itemView");
-            view4.setContentDescription(b.i(view5, 2131889243, new Object[]{folderItem.getName(), charSequence, i6}, null, 4));
+            view4.setContentDescription(b.i(view5, 2131889250, new Object[]{folderItem.getName(), charSequence, i6}, null, 4));
             View view6 = this.itemView;
             m.checkNotNullExpressionValue(view6, "itemView");
             ViewExtensions.setOnLongClickListenerConsumeClick(view6, new GuildListViewHolder$FolderViewHolder$configure$4(this, folderItem));
@@ -276,7 +310,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(serverFolderView, "binding.guildsItemFolder");
             ServerFolderView serverFolderView2 = this.binding.b;
             m.checkNotNullExpressionValue(serverFolderView2, "binding.guildsItemFolder");
-            serverFolderView.setBackground(ContextCompat.getDrawable(serverFolderView2.getContext(), 2131231202));
+            serverFolderView.setBackground(ContextCompat.getDrawable(serverFolderView2.getContext(), 2131231207));
         }
 
         public final void setColor(Integer num) {
@@ -301,14 +335,14 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullParameter(view, "view");
             m.checkNotNullParameter(function1, "onClicked");
             this.onClicked = function1;
-            int i = 2131363494;
-            ImageView imageView = (ImageView) view.findViewById(2131363494);
+            int i = 2131363535;
+            ImageView imageView = (ImageView) view.findViewById(2131363535);
             if (imageView != null) {
-                i = 2131363495;
-                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363495);
+                i = 2131363536;
+                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363536);
                 if (frameLayout != null) {
-                    i = 2131363496;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131363496);
+                    i = 2131363537;
+                    ImageView imageView2 = (ImageView) view.findViewById(2131363537);
                     if (imageView2 != null) {
                         WidgetGuildsListItemProfileBinding widgetGuildsListItemProfileBinding = new WidgetGuildsListItemProfileBinding((RelativeLayout) view, imageView, frameLayout, imageView2);
                         m.checkNotNullExpressionValue(widgetGuildsListItemProfileBinding, "WidgetGuildsListItemProfileBinding.bind(view)");
@@ -331,16 +365,16 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             imageView.setVisibility(friendsItem.isSelected() ? 0 : 8);
             this.binding.a.setOnClickListener(new GuildListViewHolder$FriendsViewHolder$configure$1(this, friendsItem));
             if (friendsItem.isSelected()) {
-                this.binding.f1819c.setBackgroundResource(2131231201);
-                FrameLayout frameLayout = this.binding.f1819c;
+                this.binding.f1821c.setBackgroundResource(2131231206);
+                FrameLayout frameLayout = this.binding.f1821c;
                 m.checkNotNullExpressionValue(frameLayout, "binding.guildsItemProfileAvatarWrap");
                 frameLayout.setBackgroundTintList(null);
             } else {
-                this.binding.f1819c.setBackgroundResource(2131231070);
-                FrameLayout frameLayout2 = this.binding.f1819c;
+                this.binding.f1821c.setBackgroundResource(2131231075);
+                FrameLayout frameLayout2 = this.binding.f1821c;
                 m.checkNotNullExpressionValue(frameLayout2, "binding.guildsItemProfileAvatarWrap");
                 int themedColor = ColorCompat.getThemedColor(frameLayout2, 2130968905);
-                FrameLayout frameLayout3 = this.binding.f1819c;
+                FrameLayout frameLayout3 = this.binding.f1821c;
                 m.checkNotNullExpressionValue(frameLayout3, "binding.guildsItemProfileAvatarWrap");
                 frameLayout3.setBackgroundTintList(ColorStateList.valueOf(themedColor));
             }
@@ -415,11 +449,11 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             this.overlayColorInFolder = i2;
             this.onClicked = function1;
             this.onLongPressed = function12;
-            int i3 = 2131363497;
-            ImageView imageView = (ImageView) view.findViewById(2131363497);
+            int i3 = 2131363538;
+            ImageView imageView = (ImageView) view.findViewById(2131363538);
             if (imageView != null) {
-                i3 = 2131363498;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363498);
+                i3 = 2131363539;
+                ImageView imageView2 = (ImageView) view.findViewById(2131363539);
                 if (imageView2 != null) {
                     WidgetGuildsListItemGuildVerticalBinding widgetGuildsListItemGuildVerticalBinding = new WidgetGuildsListItemGuildVerticalBinding((RelativeLayout) view, imageView, imageView2);
                     m.checkNotNullExpressionValue(widgetGuildsListItemGuildVerticalBinding, "WidgetGuildsListItemGuil…calBinding.bind(itemView)");
@@ -469,17 +503,17 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             imageView4.setVisibility(0);
             int ordinal = applicationStatus.ordinal();
             if (ordinal == 0) {
-                this.bindingGuild.b.setImageResource(2131231386);
+                this.bindingGuild.b.setImageResource(2131231392);
             } else if (ordinal == 1) {
-                this.bindingGuild.b.setImageResource(2131231384);
+                this.bindingGuild.b.setImageResource(2131231390);
             } else if (ordinal == 2) {
-                this.bindingGuild.b.setImageResource(2131231385);
+                this.bindingGuild.b.setImageResource(2131231391);
             } else if (ordinal != 3) {
                 ImageView imageView5 = this.bindingGuild.b;
                 m.checkNotNullExpressionValue(imageView5, "bindingGuild.guildsItemApplicationStatus");
                 imageView5.setVisibility(8);
             } else {
-                this.bindingGuild.b.setImageResource(2131231383);
+                this.bindingGuild.b.setImageResource(2131231389);
             }
         }
 
@@ -504,20 +538,20 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             MGImages.setRoundingParams$default(simpleDraweeView2, dimensionPixelSize, !z2, Integer.valueOf(z3 ? this.overlayColorInFolder : this.overlayColor), null, null, 48, null);
             if (z4) {
                 if (z2) {
-                    this.bindingGuild.f.setBackgroundResource(2131231204);
+                    this.bindingGuild.f.setBackgroundResource(2131231209);
                 } else {
-                    this.bindingGuild.f.setBackgroundResource(2131231086);
+                    this.bindingGuild.f.setBackgroundResource(2131231091);
                 }
                 FrameLayout frameLayout = this.bindingGuild.f;
                 m.checkNotNullExpressionValue(frameLayout, "bindingGuild.guildsItemAvatarWrap");
                 frameLayout.setBackgroundTintList(null);
             } else if (z2) {
-                this.bindingGuild.f.setBackgroundResource(2131231201);
+                this.bindingGuild.f.setBackgroundResource(2131231206);
                 FrameLayout frameLayout2 = this.bindingGuild.f;
                 m.checkNotNullExpressionValue(frameLayout2, "bindingGuild.guildsItemAvatarWrap");
                 frameLayout2.setBackgroundTintList(null);
             } else {
-                this.bindingGuild.f.setBackgroundResource(2131231070);
+                this.bindingGuild.f.setBackgroundResource(2131231075);
                 int i = z3 ? 2130968905 : 2130968904;
                 FrameLayout frameLayout3 = this.bindingGuild.f;
                 m.checkNotNullExpressionValue(frameLayout3, "bindingGuild.guildsItemAvatarWrap");
@@ -533,7 +567,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             if (!guild.getFeatures().contains(GuildFeature.ANIMATED_ICON) || (icon = guild.getIcon()) == null || !t.startsWith$default(icon, "a", false, 2, null)) {
                 SimpleDraweeView simpleDraweeView = this.bindingGuild.d;
                 m.checkNotNullExpressionValue(simpleDraweeView, "bindingGuild.guildsItemAvatar");
-                simpleDraweeView.getHierarchy().o(2131230884);
+                simpleDraweeView.getHierarchy().p(2131230887);
                 SimpleDraweeView simpleDraweeView2 = this.bindingGuild.d;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "bindingGuild.guildsItemAvatar");
                 GenericDraweeHierarchy hierarchy = simpleDraweeView2.getHierarchy();
@@ -546,7 +580,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             } else {
                 SimpleDraweeView simpleDraweeView3 = this.bindingGuild.d;
                 m.checkNotNullExpressionValue(simpleDraweeView3, "bindingGuild.guildsItemAvatar");
-                simpleDraweeView3.getHierarchy().n(1, null);
+                simpleDraweeView3.getHierarchy().o(1, null);
                 SimpleDraweeView simpleDraweeView4 = this.bindingGuild.d;
                 m.checkNotNullExpressionValue(simpleDraweeView4, "bindingGuild.guildsItemAvatar");
                 GenericDraweeHierarchy hierarchy2 = simpleDraweeView4.getHierarchy();
@@ -684,16 +718,16 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(view4, "itemView");
             View view5 = this.itemView;
             m.checkNotNullExpressionValue(view5, "itemView");
-            view4.setContentDescription(b.i(view5, 2131890112, new Object[]{i18nPluralString, guildItem.getGuild().getName()}, null, 4));
+            view4.setContentDescription(b.i(view5, 2131890134, new Object[]{i18nPluralString, guildItem.getGuild().getName()}, null, 4));
             ImageView imageView = this.bindingGuild.h;
             int i2 = 8;
             imageView.setVisibility(guildItem.isConnectedToVoice() || guildItem.getHasActiveStageChannel() ? 0 : 8);
             imageView.setActivated(guildItem.isConnectedToVoice());
-            imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? 2131231480 : 2131232055);
-            ImageView imageView2 = this.bindingGuild.f1817c;
+            imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? 2131231486 : 2131232063);
+            ImageView imageView2 = this.bindingGuild.f1819c;
             m.checkNotNullExpressionValue(imageView2, "bindingGuild.guildsItemApplicationStream");
             imageView2.setVisibility(!guildItem.isConnectedToVoice() && guildItem.getHasOngoingApplicationStream() ? 0 : 8);
-            ImageView imageView3 = this.binding.f1818c;
+            ImageView imageView3 = this.binding.f1820c;
             m.checkNotNullExpressionValue(imageView3, "binding.guildsItemUnread");
             imageView3.setVisibility(guildItem.isUnread() ? 0 : 8);
             ImageView imageView4 = this.binding.b;
@@ -782,7 +816,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
         public final void configure(GuildListItem.PrivateChannelItem privateChannelItem) {
             m.checkNotNullParameter(privateChannelItem, "data");
             int mentionCount = privateChannelItem.getMentionCount();
-            TextView textView = this.binding.f1815c;
+            TextView textView = this.binding.f1817c;
             m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount");
             configureMentionsCount(textView, mentionCount);
             String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755062, mentionCount, Integer.valueOf(mentionCount)) : "";
@@ -790,7 +824,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder {
             m.checkNotNullExpressionValue(view, "itemView");
             View view2 = this.itemView;
             m.checkNotNullExpressionValue(view2, "itemView");
-            view.setContentDescription(b.i(view2, 2131888174, new Object[]{AnimatableValueParser.y0(privateChannelItem.getChannel()), i18nPluralString}, null, 4));
+            view.setContentDescription(b.i(view2, 2131888173, new Object[]{AnimatableValueParser.y0(privateChannelItem.getChannel()), i18nPluralString}, null, 4));
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildsItemDmAvatar");
             IconUtils.setIcon$default(simpleDraweeView, privateChannelItem.getChannel(), 2131165289, null, 8, null);
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$2.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$2.java
new file mode 100644
index 0000000000..d5ec48759e
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter$onBindViewHolder$2.java
@@ -0,0 +1,25 @@
+package com.discord.widgets.guilds.list;
+
+import android.view.View;
+import com.discord.widgets.guilds.list.WidgetGuildListAdapter;
+import d0.z.d.m;
+/* compiled from: WidgetGuildListAdapter.kt */
+public final class WidgetGuildListAdapter$onBindViewHolder$2 implements View.OnClickListener {
+    public final /* synthetic */ GuildListViewHolder $holder;
+    public final /* synthetic */ GuildListItem $item;
+    public final /* synthetic */ WidgetGuildListAdapter this$0;
+
+    public WidgetGuildListAdapter$onBindViewHolder$2(WidgetGuildListAdapter widgetGuildListAdapter, GuildListViewHolder guildListViewHolder, GuildListItem guildListItem) {
+        this.this$0 = widgetGuildListAdapter;
+        this.$holder = guildListViewHolder;
+        this.$item = guildListItem;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetGuildListAdapter.InteractionListener access$getInteractionListener$p = WidgetGuildListAdapter.access$getInteractionListener$p(this.this$0);
+        View view2 = this.$holder.itemView;
+        m.checkNotNullExpressionValue(view2, "holder.itemView");
+        access$getInteractionListener$p.onItemClicked(view2, this.$item);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java
index 503bd02d4f..67e2eca7db 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java
@@ -346,6 +346,9 @@ public final class WidgetGuildListAdapter extends RecyclerView.Adapter<GuildList
         if (m.areEqual(guildListItem, GuildListItem.CreateItem.INSTANCE)) {
             return 5;
         }
+        if (guildListItem instanceof GuildListItem.HubItem) {
+            return 9;
+        }
         if (m.areEqual(guildListItem, GuildListItem.HelpItem.INSTANCE)) {
             return 7;
         }
@@ -376,6 +379,9 @@ public final class WidgetGuildListAdapter extends RecyclerView.Adapter<GuildList
             ((GuildListViewHolder.FolderViewHolder) guildListViewHolder).configure((GuildListItem.FolderItem) guildListItem);
         } else if ((guildListItem instanceof GuildListItem.UnavailableItem) || (guildListItem instanceof GuildListItem.CreateItem) || (guildListItem instanceof GuildListItem.HelpItem)) {
             guildListViewHolder.itemView.setOnClickListener(new WidgetGuildListAdapter$onBindViewHolder$1(this, guildListViewHolder, guildListItem));
+        } else if (guildListItem instanceof GuildListItem.HubItem) {
+            guildListViewHolder.itemView.setOnClickListener(new WidgetGuildListAdapter$onBindViewHolder$2(this, guildListViewHolder, guildListItem));
+            ((GuildListViewHolder.DiscordHubViewHolder) guildListViewHolder).configure((GuildListItem.HubItem) guildListItem);
         } else if (guildListItem instanceof GuildListItem.SpaceItem) {
             ((GuildListViewHolder.SpaceViewHolder) guildListViewHolder).configure(this.bottomNavHeight);
         }
@@ -387,43 +393,47 @@ public final class WidgetGuildListAdapter extends RecyclerView.Adapter<GuildList
         WidgetGuildListAdapter$onCreateViewHolder$1 widgetGuildListAdapter$onCreateViewHolder$1 = new WidgetGuildListAdapter$onCreateViewHolder$1(viewGroup);
         switch (i) {
             case 0:
-                View invoke = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559060);
+                View invoke = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559066);
                 m.checkNotNullExpressionValue(invoke, "itemView");
                 return new GuildListViewHolder.FriendsViewHolder(invoke, new WidgetGuildListAdapter$onCreateViewHolder$8(this, invoke));
             case 1:
-                View invoke2 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559051);
+                View invoke2 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559056);
                 m.checkNotNullExpressionValue(invoke2, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke2);
             case 2:
-                View invoke3 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559053);
+                View invoke3 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559058);
                 m.checkNotNullExpressionValue(invoke3, "itemView");
                 return new GuildListViewHolder.PrivateChannelViewHolder(invoke3, new WidgetGuildListAdapter$onCreateViewHolder$6(this, invoke3), new WidgetGuildListAdapter$onCreateViewHolder$7(this, invoke3));
             case 3:
-                View invoke4 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559059);
+                View invoke4 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559064);
                 int themedColor = ColorCompat.getThemedColor(viewGroup.getContext(), 2130968907);
                 int themedColor2 = ColorCompat.getThemedColor(viewGroup.getContext(), 2130969888);
                 m.checkNotNullExpressionValue(invoke4, "itemView");
                 return new GuildListViewHolder.GuildViewHolder(invoke4, themedColor, themedColor2, new WidgetGuildListAdapter$onCreateViewHolder$2(this, invoke4), new WidgetGuildListAdapter$onCreateViewHolder$3(this, invoke4));
             case 4:
-                View invoke5 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559058);
+                View invoke5 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559063);
                 m.checkNotNullExpressionValue(invoke5, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke5);
             case 5:
-                View invoke6 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559056);
+                View invoke6 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559061);
                 m.checkNotNullExpressionValue(invoke6, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke6);
             case 6:
-                View invoke7 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559054);
+                View invoke7 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559059);
                 m.checkNotNullExpressionValue(invoke7, "itemView");
                 return new GuildListViewHolder.FolderViewHolder(invoke7, new WidgetGuildListAdapter$onCreateViewHolder$4(this, invoke7), new WidgetGuildListAdapter$onCreateViewHolder$5(this, invoke7));
             case 7:
-                View invoke8 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559057);
+                View invoke8 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559062);
                 m.checkNotNullExpressionValue(invoke8, "itemView");
                 return new GuildListViewHolder.SimpleViewHolder(invoke8);
             case 8:
-                View invoke9 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131558648);
+                View invoke9 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131558646);
                 m.checkNotNullExpressionValue(invoke9, "itemView");
                 return new GuildListViewHolder.SpaceViewHolder(invoke9);
+            case 9:
+                View invoke10 = widgetGuildListAdapter$onCreateViewHolder$1.invoke(2131559065);
+                m.checkNotNullExpressionValue(invoke10, "itemView");
+                return new GuildListViewHolder.DiscordHubViewHolder(invoke10);
             default:
                 throw new IllegalStateException(a.l("invalid view type: ", i));
         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java
index ead3d4e09f..e55d20bf9c 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetGuildsList$binding$2 extends k implemen
 
     public final WidgetGuildsListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363392;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363392);
+        int i = 2131363419;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363419);
         if (recyclerView != null) {
-            i = 2131363394;
-            ViewStub viewStub = (ViewStub) view.findViewById(2131363394);
+            i = 2131363421;
+            ViewStub viewStub = (ViewStub) view.findViewById(2131363421);
             if (viewStub != null) {
                 return new WidgetGuildsListBinding((RelativeLayout) view, recyclerView, viewStub);
             }
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java
index cae02edcd8..662e896383 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java
@@ -27,13 +27,13 @@ public final class WidgetGuildsList$configureBottomNavSpace$1 extends o implemen
 
     public final void invoke(int i) {
         WidgetGuildsList.access$getAdapter$p(this.this$0).handleBottomNavHeight(i);
-        ViewStub viewStub = WidgetGuildsList.access$getBinding$p(this.this$0).f1814c;
+        ViewStub viewStub = WidgetGuildsList.access$getBinding$p(this.this$0).f1816c;
         m.checkNotNullExpressionValue(viewStub, "binding.guildListUnreadsStub");
         ViewGroup.LayoutParams layoutParams = viewStub.getLayoutParams();
         Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams");
         ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) layoutParams;
         marginLayoutParams.setMargins(marginLayoutParams.leftMargin, marginLayoutParams.topMargin, marginLayoutParams.rightMargin, i);
-        ViewStub viewStub2 = WidgetGuildsList.access$getBinding$p(this.this$0).f1814c;
+        ViewStub viewStub2 = WidgetGuildsList.access$getBinding$p(this.this$0).f1816c;
         m.checkNotNullExpressionValue(viewStub2, "binding.guildListUnreadsStub");
         viewStub2.setLayoutParams(marginLayoutParams);
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java
index 29f9c82674..71c109fa64 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java
@@ -80,17 +80,17 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
 
             public final Observable<AddGuildHint> get() {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable y2 = Observable.i(companion.getNux().getNuxState(), StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetGuildsList$AddGuildHint$Companion$get$1.INSTANCE).y(WidgetGuildsList$AddGuildHint$Companion$get$2.INSTANCE);
-                m.checkNotNullExpressionValue(y2, "Observable\n             ….filter { it.isEligible }");
-                Observable<AddGuildHint> M = ObservableExtensionsKt.takeSingleUntilTimeout$default(y2, 0, false, 3, null).M(WidgetGuildsList$AddGuildHint$Companion$get$3.INSTANCE);
-                m.checkNotNullExpressionValue(M, "Observable\n             … = false)\n              }");
-                return M;
+                Observable x2 = Observable.i(companion.getNux().getNuxState(), StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetGuildsList$AddGuildHint$Companion$get$1.INSTANCE).x(WidgetGuildsList$AddGuildHint$Companion$get$2.INSTANCE);
+                m.checkNotNullExpressionValue(x2, "Observable\n             ….filter { it.isEligible }");
+                Observable<AddGuildHint> L = ObservableExtensionsKt.takeSingleUntilTimeout$default(x2, 0, false, 3, null).L(WidgetGuildsList$AddGuildHint$Companion$get$3.INSTANCE);
+                m.checkNotNullExpressionValue(L, "Observable\n             … = false)\n              }");
+                return L;
             }
 
             public final Observable<Boolean> getDismissAction() {
-                Observable<R> G = StoreStream.Companion.getNavigation().observeLeftPanelState().G(WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "StoreStream\n            …te == PanelState.Closed }");
-                return G;
+                Observable<R> F = StoreStream.Companion.getNavigation().observeLeftPanelState().F(WidgetGuildsList$AddGuildHint$Companion$getDismissAction$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "StoreStream\n            …te == PanelState.Closed }");
+                return F;
             }
         }
 
@@ -171,7 +171,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
     }
 
     public WidgetGuildsList() {
-        super(2131559050);
+        super(2131559055);
         WidgetGuildsList$viewModel$2 widgetGuildsList$viewModel$2 = WidgetGuildsList$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildsListViewModel.class), new WidgetGuildsList$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildsList$viewModel$2));
@@ -318,12 +318,14 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
             announceFolderToggle(((WidgetGuildsListViewModel.Event.AnnounceFolderToggleForAccessibility) event).getItem());
         } else if (m.areEqual(event, WidgetGuildsListViewModel.Event.ShowCreateGuild.INSTANCE)) {
             showCreateGuild();
-        } else if (m.areEqual(event, WidgetGuildsListViewModel.Event.ShowHelp.INSTANCE)) {
-            showHelp();
-        } else if (m.areEqual(event, WidgetGuildsListViewModel.Event.FocusFirstElement.INSTANCE)) {
-            focusFirstElement();
-        } else {
-            throw new NoWhenBranchMatchedException();
+        } else if (!m.areEqual(event, WidgetGuildsListViewModel.Event.ShowHubVerification.INSTANCE)) {
+            if (m.areEqual(event, WidgetGuildsListViewModel.Event.ShowHelp.INSTANCE)) {
+                showHelp();
+            } else if (m.areEqual(event, WidgetGuildsListViewModel.Event.FocusFirstElement.INSTANCE)) {
+                focusFirstElement();
+            } else {
+                throw new NoWhenBranchMatchedException();
+            }
         }
     }
 
@@ -391,7 +393,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
     private final void showUnavailableGuildsToast(int i) {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        o.h(getContext(), b.k(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755235, i, Integer.valueOf(i)), new Object[0], null, 2), 0, null, 12);
+        o.h(getContext(), b.k(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755236, i, Integer.valueOf(i)), new Object[0], null, 2), 0, null, 12);
     }
 
     @Override // com.discord.widgets.guilds.list.WidgetGuildListAdapter.InteractionListener
@@ -478,7 +480,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setupRecycler();
-        ViewStub viewStub = getBinding().f1814c;
+        ViewStub viewStub = getBinding().f1816c;
         m.checkNotNullExpressionValue(viewStub, "binding.guildListUnreadsStub");
         RecyclerView recyclerView = getBinding().b;
         m.checkNotNullExpressionValue(recyclerView, "binding.guildList");
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$1.java
index 20174849e3..053687e2cc 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Companion$observeStores$1.java
@@ -55,7 +55,7 @@ public final class WidgetGuildsListViewModel$Companion$observeStores$1 extends o
     /* renamed from: invoke */
     public final Observable<WidgetGuildsListViewModel.Companion.Chunk> mo1invoke() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<WidgetGuildsListViewModel.Companion.Chunk> c2 = Observable.c(companion.getGuildSelected().observeSelectedGuildId(), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), companion.getUserGuildSettings().observeGuildSettings(), companion.getReadStates().getUnreadGuildIds(), ObservableExtensionsKt.leadingEdgeThrottle(companion.getMentions().observeMentionCounts(), 500, TimeUnit.MILLISECONDS).s(), companion.getChannels().observeIds(true), companion.getGuilds().observeUnavailableGuilds(), companion.getChannels().observePrivateChannels(), companion.getGuildsSorted().observeEntries(), AnonymousClass1.INSTANCE);
+        Observable<WidgetGuildsListViewModel.Companion.Chunk> c2 = Observable.c(companion.getGuildSelected().observeSelectedGuildId(), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), companion.getUserGuildSettings().observeGuildSettings(), companion.getReadStates().getUnreadGuildIds(), ObservableExtensionsKt.leadingEdgeThrottle(companion.getMentions().observeMentionCounts(), 500, TimeUnit.MILLISECONDS).r(), companion.getChannels().observeIds(true), companion.getGuilds().observeUnavailableGuilds(), companion.getChannels().observePrivateChannels(), companion.getGuildsSorted().observeEntries(), AnonymousClass1.INSTANCE);
         m.checkNotNullExpressionValue(c2, "Observable.combineLatest…lds\n          )\n        }");
         return c2;
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.java
index 67a4a1a168..2e14363a9e 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$createDirectMessageItems$1.java
@@ -29,6 +29,6 @@ public final class WidgetGuildsListViewModel$createDirectMessageItems$1 extends
         ModelNotificationSettings modelNotificationSettings;
         ModelNotificationSettings.ChannelOverride channelOverride;
         m.checkNotNullParameter(channel, "channel");
-        return this.$mentionCounts.containsKey(Long.valueOf(channel.g())) && ((modelNotificationSettings = this.$dmSettings) == null || (channelOverride = modelNotificationSettings.getChannelOverride(channel.g())) == null || !channelOverride.isMuted());
+        return this.$mentionCounts.containsKey(Long.valueOf(channel.h())) && ((modelNotificationSettings = this.$dmSettings) == null || (channelOverride = modelNotificationSettings.getChannelOverride(channel.h())) == null || !channelOverride.isMuted());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
index bb905dd835..32c27ca630 100644
--- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java
@@ -21,6 +21,7 @@ import com.discord.utilities.channel.ChannelSelector;
 import com.discord.utilities.features.GrowthTeamFeatures;
 import com.discord.utilities.guilds.MemberVerificationUtils;
 import com.discord.utilities.permissions.PermissionUtils;
+import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.streams.StreamContext;
@@ -55,8 +56,10 @@ import rx.subjects.PublishSubject;
 /* compiled from: WidgetGuildsListViewModel.kt */
 public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
     public static final Companion Companion = new Companion(null);
+    private static final String DISCORD_HUB_VERIFICATION_CLICKED_KEY = "hub_verification_clicked_key";
     private final Clock clock;
     private WidgetGuildListAdapter.Operation.TargetOperation currentTargetOperation;
+    private final Persister<Boolean> discordHubClickedPersister;
     private final PublishSubject<Event> eventSubject;
     private boolean wasLeftPanelOpened;
     private boolean wasOnHomeTab;
@@ -417,7 +420,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             Observable<Chunk> invoke = widgetGuildsListViewModel$Companion$observeStores$1.mo1invoke();
             Observable<SecondChunk> invoke2 = widgetGuildsListViewModel$Companion$observeStores$2.mo1invoke();
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable c2 = Observable.c(invoke, invoke2, companion.getLurking().getLurkingGuildIds(), companion.getExpandedGuildFolders().observeOpenFolderIds(), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).s().G(new WidgetGuildsListViewModel$Companion$observeStores$3(clock)), new StreamContextService(null, null, null, null, null, null, null, null, 255, null).getForAllStreamingUsers(), companion.getPermissions().observePermissionsForAllChannels(), companion.getNavigation().observeLeftPanelState().G(WidgetGuildsListViewModel$Companion$observeStores$4.INSTANCE), companion.getTabsNavigation().observeSelectedTab().G(WidgetGuildsListViewModel$Companion$observeStores$5.INSTANCE), WidgetGuildsListViewModel$Companion$observeStores$6.INSTANCE);
+            Observable c2 = Observable.c(invoke, invoke2, companion.getLurking().getLurkingGuildIds(), companion.getExpandedGuildFolders().observeOpenFolderIds(), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).r().F(new WidgetGuildsListViewModel$Companion$observeStores$3(clock)), new StreamContextService(null, null, null, null, null, null, null, null, 255, null).getForAllStreamingUsers(), companion.getPermissions().observePermissionsForAllChannels(), companion.getNavigation().observeLeftPanelState().F(WidgetGuildsListViewModel$Companion$observeStores$4.INSTANCE), companion.getTabsNavigation().observeSelectedTab().F(WidgetGuildsListViewModel$Companion$observeStores$5.INSTANCE), WidgetGuildsListViewModel$Companion$observeStores$6.INSTANCE);
             m.checkNotNullExpressionValue(c2, "Observable.combineLatest…omeTab,\n        )\n      }");
             return ObservableExtensionsKt.leadingEdgeThrottle(c2, 100, TimeUnit.MILLISECONDS);
         }
@@ -551,6 +554,15 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             }
         }
 
+        /* compiled from: WidgetGuildsListViewModel.kt */
+        public static final class ShowHubVerification extends Event {
+            public static final ShowHubVerification INSTANCE = new ShowHubVerification();
+
+            private ShowHubVerification() {
+                super(null);
+            }
+        }
+
         /* compiled from: WidgetGuildsListViewModel.kt */
         public static final class ShowUnavailableGuilds extends Event {
             private final int unavailableGuildCount;
@@ -1113,10 +1125,11 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(clock, "clock");
         m.checkNotNullParameter(observable, "storeObservable");
         this.clock = clock;
-        this.eventSubject = PublishSubject.l0();
-        Observable s2 = ObservableExtensionsKt.computationLatest(observable).s();
-        m.checkNotNullExpressionValue(s2, "storeObservable\n        …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetGuildsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        this.eventSubject = PublishSubject.k0();
+        this.discordHubClickedPersister = new Persister<>("hub_verification_clicked_key", Boolean.FALSE);
+        Observable r = ObservableExtensionsKt.computationLatest(observable).r();
+        m.checkNotNullExpressionValue(r, "storeObservable\n        …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetGuildsListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -1163,14 +1176,14 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             boolean contains2 = set2.contains(Long.valueOf(guild.getId()));
             boolean contains3 = set3.contains(Long.valueOf(guild.getId()));
             Channel channel = map3.get(Long.valueOf(j2));
-            return new GuildListItem.GuildItem(guild, i, contains2, contains, z5, l, z3, shouldDisplayVideoIconOnGuild, false, bool, applicationStatus, z2, contains3, channel == null && AnimatableValueParser.u1(channel), 256, null);
+            return new GuildListItem.GuildItem(guild, i, contains2, contains, z5, l, z3, shouldDisplayVideoIconOnGuild, false, bool, applicationStatus, z2, contains3, channel == null && AnimatableValueParser.v1(channel), 256, null);
         }
         z3 = false;
         boolean shouldDisplayVideoIconOnGuild = shouldDisplayVideoIconOnGuild(id2, modelNotificationSettings, map4, map5);
         boolean contains2 = set2.contains(Long.valueOf(guild.getId()));
         boolean contains3 = set3.contains(Long.valueOf(guild.getId()));
         Channel channel = map3.get(Long.valueOf(j2));
-        return new GuildListItem.GuildItem(guild, i, contains2, contains, z5, l, z3, shouldDisplayVideoIconOnGuild, false, bool, applicationStatus, z2, contains3, channel == null && AnimatableValueParser.u1(channel), 256, null);
+        return new GuildListItem.GuildItem(guild, i, contains2, contains, z5, l, z3, shouldDisplayVideoIconOnGuild, false, bool, applicationStatus, z2, contains3, channel == null && AnimatableValueParser.v1(channel), 256, null);
     }
 
     public static /* synthetic */ GuildListItem.GuildItem createGuildItem$default(WidgetGuildsListViewModel widgetGuildsListViewModel, Guild guild, long j, long j2, Set set, Map map, int i, Map map2, Map map3, Set set2, Set set3, Long l, Boolean bool, Map map4, Map map5, ApplicationStatus applicationStatus, boolean z2, int i2, Object obj) {
@@ -1202,13 +1215,15 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:53:0x024e, code lost:
-        if (com.airbnb.lottie.parser.AnimatableValueParser.u1(r7) == true) goto L_0x0255;
+        if (com.airbnb.lottie.parser.AnimatableValueParser.v1(r7) == true) goto L_0x0255;
      */
     /* JADX WARNING: Removed duplicated region for block: B:112:0x042d  */
     /* JADX WARNING: Removed duplicated region for block: B:113:0x0471  */
     /* JADX WARNING: Removed duplicated region for block: B:116:0x0490  */
-    /* JADX WARNING: Removed duplicated region for block: B:119:0x04ab  */
-    /* JADX WARNING: Removed duplicated region for block: B:145:0x029d A[SYNTHETIC] */
+    /* JADX WARNING: Removed duplicated region for block: B:119:0x04ad  */
+    /* JADX WARNING: Removed duplicated region for block: B:120:0x04c6  */
+    /* JADX WARNING: Removed duplicated region for block: B:123:0x04ce  */
+    /* JADX WARNING: Removed duplicated region for block: B:149:0x029d A[SYNTHETIC] */
     /* JADX WARNING: Removed duplicated region for block: B:50:0x0235  */
     /* JADX WARNING: Removed duplicated region for block: B:56:0x0254  */
     /* JADX WARNING: Removed duplicated region for block: B:59:0x0258  */
@@ -1217,6 +1232,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         boolean z2;
         ArrayList arrayList;
         ArrayList arrayList2;
+        WidgetGuildsListViewModel widgetGuildsListViewModel;
         ArrayList arrayList3;
         Sequence sequence;
         HashMap hashMap;
@@ -1450,20 +1466,26 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
                 arrayList2.add(new GuildListItem.UnavailableItem(storeState.getUnavailableGuilds().size()));
             }
             arrayList2.add(GuildListItem.CreateItem.INSTANCE);
+            if (!GrowthTeamFeatures.INSTANCE.isDiscordHubEnabled()) {
+                widgetGuildsListViewModel = this;
+                arrayList2.add(new GuildListItem.HubItem(!widgetGuildsListViewModel.discordHubClickedPersister.get().booleanValue()));
+            } else {
+                widgetGuildsListViewModel = this;
+            }
             if (storeState.isNewUser()) {
                 arrayList2.add(dividerItem);
                 arrayList2.add(GuildListItem.HelpItem.INSTANCE);
             }
             arrayList2.add(GuildListItem.SpaceItem.INSTANCE);
             ViewState.Loaded loaded = new ViewState.Loaded(arrayList2, !storeState.getChannelIds().isEmpty(), false);
-            if (!(storeState.isLeftPanelOpened() == this.wasLeftPanelOpened && storeState.isOnHomeTab() == this.wasOnHomeTab)) {
+            if (!(storeState.isLeftPanelOpened() == widgetGuildsListViewModel.wasLeftPanelOpened && storeState.isOnHomeTab() == widgetGuildsListViewModel.wasOnHomeTab)) {
                 if (storeState.isLeftPanelOpened() && storeState.isOnHomeTab()) {
-                    this.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
+                    widgetGuildsListViewModel.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
                 }
-                this.wasLeftPanelOpened = storeState.isLeftPanelOpened();
-                this.wasOnHomeTab = storeState.isOnHomeTab();
+                widgetGuildsListViewModel.wasLeftPanelOpened = storeState.isLeftPanelOpened();
+                widgetGuildsListViewModel.wasOnHomeTab = storeState.isOnHomeTab();
             }
-            updateViewState(loaded);
+            widgetGuildsListViewModel.updateViewState(loaded);
         }
         z2 = false;
         if (!z2) {
@@ -1475,14 +1497,16 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         if (!storeState.getUnavailableGuilds().isEmpty()) {
         }
         arrayList2.add(GuildListItem.CreateItem.INSTANCE);
+        if (!GrowthTeamFeatures.INSTANCE.isDiscordHubEnabled()) {
+        }
         if (storeState.isNewUser()) {
         }
         arrayList2.add(GuildListItem.SpaceItem.INSTANCE);
         ViewState.Loaded loaded = new ViewState.Loaded(arrayList2, !storeState.getChannelIds().isEmpty(), false);
-        this.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
-        this.wasLeftPanelOpened = storeState.isLeftPanelOpened();
-        this.wasOnHomeTab = storeState.isOnHomeTab();
-        updateViewState(loaded);
+        widgetGuildsListViewModel.eventSubject.j.onNext(Event.FocusFirstElement.INSTANCE);
+        widgetGuildsListViewModel.wasLeftPanelOpened = storeState.isLeftPanelOpened();
+        widgetGuildsListViewModel.wasOnHomeTab = storeState.isOnHomeTab();
+        widgetGuildsListViewModel.updateViewState(loaded);
     }
 
     private final void move(int i, int i2, Long l) {
@@ -1735,7 +1759,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(guildListItem, "item");
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(fragmentManager, "fragmentManager");
-        boolean z2 = !GrowthTeamFeatures.INSTANCE.isDiscordUEnabled();
+        boolean z2 = !GrowthTeamFeatures.INSTANCE.isDiscordHubEnabled();
         if (guildListItem instanceof GuildListItem.GuildItem) {
             GuildListItem.GuildItem guildItem = (GuildListItem.GuildItem) guildListItem;
             if (guildItem.isPendingGuild()) {
@@ -1745,10 +1769,10 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             } else if (!guildItem.getGuild().hasFeature(GuildFeature.HUB) || !z2) {
                 StoreStream.Companion.getGuildSelected().set(guildItem.getGuild().getId());
             } else {
-                c.a.d.o.g(context, 2131888154, 0, null, 12);
+                c.a.d.o.g(context, 2131888153, 0, null, 12);
             }
         } else if (guildListItem instanceof GuildListItem.PrivateChannelItem) {
-            ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, ((GuildListItem.PrivateChannelItem) guildListItem).getChannel().g(), null, null, 12, null);
+            ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, ((GuildListItem.PrivateChannelItem) guildListItem).getChannel().h(), null, null, 12, null);
         } else if (guildListItem instanceof GuildListItem.UnavailableItem) {
             this.eventSubject.j.onNext(new Event.ShowUnavailableGuilds(((GuildListItem.UnavailableItem) guildListItem).getUnavailableGuildCount()));
         } else if (guildListItem instanceof GuildListItem.FriendsItem) {
@@ -1759,6 +1783,9 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
             }
         } else if (m.areEqual(guildListItem, GuildListItem.CreateItem.INSTANCE)) {
             this.eventSubject.j.onNext(Event.ShowCreateGuild.INSTANCE);
+        } else if (guildListItem instanceof GuildListItem.HubItem) {
+            Persister.set$default(this.discordHubClickedPersister, Boolean.TRUE, false, 2, null);
+            this.eventSubject.j.onNext(Event.ShowHubVerification.INSTANCE);
         } else if (m.areEqual(guildListItem, GuildListItem.HelpItem.INSTANCE)) {
             this.eventSubject.j.onNext(Event.ShowHelp.INSTANCE);
         } else if (guildListItem instanceof GuildListItem.FolderItem) {
@@ -1776,7 +1803,7 @@ public final class WidgetGuildsListViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(guildListItem, "item");
         if (guildListItem instanceof GuildListItem.PrivateChannelItem) {
             PublishSubject<Event> publishSubject = this.eventSubject;
-            publishSubject.j.onNext(new Event.ShowChannelActions(((GuildListItem.PrivateChannelItem) guildListItem).getChannel().g()));
+            publishSubject.j.onNext(new Event.ShowChannelActions(((GuildListItem.PrivateChannelItem) guildListItem).getChannel().h()));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java
index 88358d8703..36234ed574 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java
@@ -30,6 +30,6 @@ public final class MoreEmojiViewHolder extends BaseEmojiViewHolder {
         m.checkNotNullExpressionValue(view, "itemView");
         Resources resources = view.getResources();
         m.checkNotNullExpressionValue(resources, "itemView.resources");
-        textView.setText(b.h(resources, 2131888491, new Object[]{String.valueOf(((EmojiItem.MoreEmoji) emojiItem).getExtraEmojiCount())}, null, 4));
+        textView.setText(b.h(resources, 2131888492, new Object[]{String.valueOf(((EmojiItem.MoreEmoji) emojiItem).getExtraEmojiCount())}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java
index 2bf00f5bf0..804670f1c7 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java
@@ -27,140 +27,140 @@ public final /* synthetic */ class WidgetGuildProfileSheet$binding$2 extends k i
 
     public final WidgetGuildProfileSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363399;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363399);
+        int i = 2131363426;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363426);
         if (linearLayout != null) {
-            i = 2131363400;
-            Barrier barrier = (Barrier) view.findViewById(2131363400);
+            i = 2131363427;
+            Barrier barrier = (Barrier) view.findViewById(2131363427);
             if (barrier != null) {
-                i = 2131363401;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363401);
+                i = 2131363428;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363428);
                 if (checkedSetting != null) {
-                    i = 2131363402;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363402);
+                    i = 2131363429;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363429);
                     if (simpleDraweeView != null) {
-                        i = 2131363403;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363403);
+                        i = 2131363430;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363430);
                         if (materialButton != null) {
-                            i = 2131363404;
-                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363404);
+                            i = 2131363431;
+                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363431);
                             if (linearLayout2 != null) {
-                                i = 2131363405;
-                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363405);
+                                i = 2131363432;
+                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363432);
                                 if (linearLayout3 != null) {
-                                    i = 2131363406;
-                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363406);
+                                    i = 2131363433;
+                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363433);
                                     if (linearLayout4 != null) {
-                                        i = 2131363407;
-                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363407);
+                                        i = 2131363434;
+                                        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363434);
                                         if (constraintLayout != null) {
-                                            i = 2131363408;
-                                            LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131363408);
+                                            i = 2131363435;
+                                            LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131363435);
                                             if (linearLayout5 != null) {
-                                                i = 2131363409;
-                                                View findViewById = view.findViewById(2131363409);
+                                                i = 2131363436;
+                                                View findViewById = view.findViewById(2131363436);
                                                 if (findViewById != null) {
-                                                    i = 2131363410;
-                                                    TextView textView = (TextView) view.findViewById(2131363410);
+                                                    i = 2131363437;
+                                                    TextView textView = (TextView) view.findViewById(2131363437);
                                                     if (textView != null) {
-                                                        i = 2131363411;
-                                                        TextView textView2 = (TextView) view.findViewById(2131363411);
+                                                        i = 2131363438;
+                                                        TextView textView2 = (TextView) view.findViewById(2131363438);
                                                         if (textView2 != null) {
-                                                            i = 2131363412;
-                                                            TextView textView3 = (TextView) view.findViewById(2131363412);
+                                                            i = 2131363439;
+                                                            TextView textView3 = (TextView) view.findViewById(2131363439);
                                                             if (textView3 != null) {
-                                                                i = 2131363413;
-                                                                TextView textView4 = (TextView) view.findViewById(2131363413);
+                                                                i = 2131363440;
+                                                                TextView textView4 = (TextView) view.findViewById(2131363440);
                                                                 if (textView4 != null) {
-                                                                    i = 2131363414;
-                                                                    CardView cardView = (CardView) view.findViewById(2131363414);
+                                                                    i = 2131363441;
+                                                                    CardView cardView = (CardView) view.findViewById(2131363441);
                                                                     if (cardView != null) {
-                                                                        i = 2131363416;
-                                                                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363416);
+                                                                        i = 2131363443;
+                                                                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363443);
                                                                         if (recyclerView != null) {
-                                                                            i = 2131363417;
-                                                                            CardView cardView2 = (CardView) view.findViewById(2131363417);
+                                                                            i = 2131363444;
+                                                                            CardView cardView2 = (CardView) view.findViewById(2131363444);
                                                                             if (cardView2 != null) {
-                                                                                i = 2131363418;
-                                                                                TextView textView5 = (TextView) view.findViewById(2131363418);
+                                                                                i = 2131363445;
+                                                                                TextView textView5 = (TextView) view.findViewById(2131363445);
                                                                                 if (textView5 != null) {
-                                                                                    i = 2131363419;
-                                                                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363419);
+                                                                                    i = 2131363446;
+                                                                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363446);
                                                                                     if (appViewFlipper != null) {
-                                                                                        i = 2131363420;
-                                                                                        ImageView imageView = (ImageView) view.findViewById(2131363420);
+                                                                                        i = 2131363447;
+                                                                                        ImageView imageView = (ImageView) view.findViewById(2131363447);
                                                                                         if (imageView != null) {
-                                                                                            i = 2131363421;
-                                                                                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363421);
+                                                                                            i = 2131363448;
+                                                                                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363448);
                                                                                             if (checkedSetting2 != null) {
-                                                                                                i = 2131363422;
-                                                                                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363422);
+                                                                                                i = 2131363449;
+                                                                                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363449);
                                                                                                 if (simpleDraweeView2 != null) {
-                                                                                                    i = 2131363423;
-                                                                                                    CardView cardView3 = (CardView) view.findViewById(2131363423);
+                                                                                                    i = 2131363450;
+                                                                                                    CardView cardView3 = (CardView) view.findViewById(2131363450);
                                                                                                     if (cardView3 != null) {
-                                                                                                        i = 2131363424;
-                                                                                                        TextView textView6 = (TextView) view.findViewById(2131363424);
+                                                                                                        i = 2131363451;
+                                                                                                        TextView textView6 = (TextView) view.findViewById(2131363451);
                                                                                                         if (textView6 != null) {
-                                                                                                            i = 2131363425;
-                                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363425);
+                                                                                                            i = 2131363452;
+                                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363452);
                                                                                                             if (materialButton2 != null) {
-                                                                                                                i = 2131363426;
-                                                                                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363426);
+                                                                                                                i = 2131363453;
+                                                                                                                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363453);
                                                                                                                 if (materialButton3 != null) {
-                                                                                                                    i = 2131363427;
-                                                                                                                    TextView textView7 = (TextView) view.findViewById(2131363427);
+                                                                                                                    i = 2131363454;
+                                                                                                                    TextView textView7 = (TextView) view.findViewById(2131363454);
                                                                                                                     if (textView7 != null) {
-                                                                                                                        i = 2131363428;
-                                                                                                                        TextView textView8 = (TextView) view.findViewById(2131363428);
+                                                                                                                        i = 2131363455;
+                                                                                                                        TextView textView8 = (TextView) view.findViewById(2131363455);
                                                                                                                         if (textView8 != null) {
-                                                                                                                            i = 2131363429;
-                                                                                                                            CardView cardView4 = (CardView) view.findViewById(2131363429);
+                                                                                                                            i = 2131363456;
+                                                                                                                            CardView cardView4 = (CardView) view.findViewById(2131363456);
                                                                                                                             if (cardView4 != null) {
-                                                                                                                                i = 2131363430;
-                                                                                                                                LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131363430);
+                                                                                                                                i = 2131363457;
+                                                                                                                                LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131363457);
                                                                                                                                 if (linearLayout6 != null) {
-                                                                                                                                    i = 2131363431;
-                                                                                                                                    TextView textView9 = (TextView) view.findViewById(2131363431);
+                                                                                                                                    i = 2131363458;
+                                                                                                                                    TextView textView9 = (TextView) view.findViewById(2131363458);
                                                                                                                                     if (textView9 != null) {
-                                                                                                                                        i = 2131363432;
-                                                                                                                                        TextView textView10 = (TextView) view.findViewById(2131363432);
+                                                                                                                                        i = 2131363459;
+                                                                                                                                        TextView textView10 = (TextView) view.findViewById(2131363459);
                                                                                                                                         if (textView10 != null) {
-                                                                                                                                            i = 2131363433;
-                                                                                                                                            TextView textView11 = (TextView) view.findViewById(2131363433);
+                                                                                                                                            i = 2131363460;
+                                                                                                                                            TextView textView11 = (TextView) view.findViewById(2131363460);
                                                                                                                                             if (textView11 != null) {
-                                                                                                                                                i = 2131363434;
-                                                                                                                                                MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131363434);
+                                                                                                                                                i = 2131363461;
+                                                                                                                                                MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131363461);
                                                                                                                                                 if (materialButton4 != null) {
-                                                                                                                                                    i = 2131363435;
-                                                                                                                                                    LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131363435);
+                                                                                                                                                    i = 2131363462;
+                                                                                                                                                    LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131363462);
                                                                                                                                                     if (linearLayout7 != null) {
-                                                                                                                                                        i = 2131363436;
-                                                                                                                                                        TextView textView12 = (TextView) view.findViewById(2131363436);
+                                                                                                                                                        i = 2131363463;
+                                                                                                                                                        TextView textView12 = (TextView) view.findViewById(2131363463);
                                                                                                                                                         if (textView12 != null) {
-                                                                                                                                                            i = 2131363437;
-                                                                                                                                                            ImageView imageView2 = (ImageView) view.findViewById(2131363437);
+                                                                                                                                                            i = 2131363464;
+                                                                                                                                                            ImageView imageView2 = (ImageView) view.findViewById(2131363464);
                                                                                                                                                             if (imageView2 != null) {
-                                                                                                                                                                i = 2131363438;
-                                                                                                                                                                TextView textView13 = (TextView) view.findViewById(2131363438);
+                                                                                                                                                                i = 2131363465;
+                                                                                                                                                                TextView textView13 = (TextView) view.findViewById(2131363465);
                                                                                                                                                                 if (textView13 != null) {
-                                                                                                                                                                    i = 2131363439;
-                                                                                                                                                                    CardView cardView5 = (CardView) view.findViewById(2131363439);
+                                                                                                                                                                    i = 2131363466;
+                                                                                                                                                                    CardView cardView5 = (CardView) view.findViewById(2131363466);
                                                                                                                                                                     if (cardView5 != null) {
-                                                                                                                                                                        i = 2131363440;
-                                                                                                                                                                        CardView cardView6 = (CardView) view.findViewById(2131363440);
+                                                                                                                                                                        i = 2131363467;
+                                                                                                                                                                        CardView cardView6 = (CardView) view.findViewById(2131363467);
                                                                                                                                                                         if (cardView6 != null) {
-                                                                                                                                                                            i = 2131363441;
-                                                                                                                                                                            MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131363441);
+                                                                                                                                                                            i = 2131363468;
+                                                                                                                                                                            MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131363468);
                                                                                                                                                                             if (materialButton5 != null) {
-                                                                                                                                                                                i = 2131363442;
-                                                                                                                                                                                LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131363442);
+                                                                                                                                                                                i = 2131363469;
+                                                                                                                                                                                LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131363469);
                                                                                                                                                                                 if (linearLayout8 != null) {
-                                                                                                                                                                                    i = 2131363443;
-                                                                                                                                                                                    MaterialButton materialButton6 = (MaterialButton) view.findViewById(2131363443);
+                                                                                                                                                                                    i = 2131363470;
+                                                                                                                                                                                    MaterialButton materialButton6 = (MaterialButton) view.findViewById(2131363470);
                                                                                                                                                                                     if (materialButton6 != null) {
-                                                                                                                                                                                        i = 2131363444;
-                                                                                                                                                                                        MaterialButton materialButton7 = (MaterialButton) view.findViewById(2131363444);
+                                                                                                                                                                                        i = 2131363471;
+                                                                                                                                                                                        MaterialButton materialButton7 = (MaterialButton) view.findViewById(2131363471);
                                                                                                                                                                                         if (materialButton7 != null) {
                                                                                                                                                                                             return new WidgetGuildProfileSheetBinding((NestedScrollView) view, linearLayout, barrier, checkedSetting, simpleDraweeView, materialButton, linearLayout2, linearLayout3, linearLayout4, constraintLayout, linearLayout5, findViewById, textView, textView2, textView3, textView4, cardView, recyclerView, cardView2, textView5, appViewFlipper, imageView, checkedSetting2, simpleDraweeView2, cardView3, textView6, materialButton2, materialButton3, textView7, textView8, cardView4, linearLayout6, textView9, textView10, textView11, materialButton4, linearLayout7, textView12, imageView2, textView13, cardView5, cardView6, materialButton5, linearLayout8, materialButton6, materialButton7);
                                                                                                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java
index eb4d804ece..62f8d41e08 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java
@@ -42,7 +42,7 @@ public final class WidgetGuildProfileSheet$showChangeNicknameDialog$2 implements
     public final void onClick(View view) {
         WidgetGuildProfileSheetViewModel access$getViewModel$p = WidgetGuildProfileSheet.access$getViewModel$p(this.this$0);
         long j = this.$guildId;
-        TextInputLayout textInputLayout = this.$binding.f1706c;
+        TextInputLayout textInputLayout = this.$binding.f1703c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText");
         access$getViewModel$p.onClickSaveNickname(j, ViewExtensions.getTextOrEmpty(textInputLayout), new AnonymousClass1(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java
index 1e6482d6a9..d0dd5023ca 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java
@@ -177,7 +177,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         TextView textView3 = getBinding().G;
         textView3.setVisibility(true ^ (nick == null || nick.length() == 0) ? 0 : 8);
         textView3.setText(nick);
-        CheckedSetting checkedSetting = getBinding().f1805c;
+        CheckedSetting checkedSetting = getBinding().f1806c;
         checkedSetting.setChecked(actions.isAllowDMChecked());
         checkedSetting.setOnCheckedListener(new WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$4(this, actions, j));
         CheckedSetting checkedSetting2 = getBinding().u;
@@ -204,7 +204,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             MaterialButton materialButton = getBinding().P;
             materialButton.setVisibility(showUploadEmoji ? 0 : 8);
             setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1(this, showUploadEmoji, j));
-            MaterialButton materialButton2 = getBinding().f1809z;
+            MaterialButton materialButton2 = getBinding().f1810z;
             materialButton2.setVisibility(showJoinServer ? 0 : 8);
             setOnClickAndDismissListener(materialButton2, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2(this, showJoinServer, j));
             MaterialButton materialButton3 = getBinding().Q;
@@ -230,7 +230,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(textView, "binding.guildProfileSheetEmojisCount");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        textView.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755076, 2131891381, size, Integer.valueOf(size)));
+        textView.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755076, 2131891452, size, Integer.valueOf(size)));
         ImageView imageView = getBinding().K;
         m.checkNotNullExpressionValue(imageView, "binding.guildProfileSheetPremiumUpsellDotSeparator");
         imageView.setVisibility(isPremium ^ true ? 0 : 8);
@@ -318,7 +318,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
     private final void configureGuildIcon(long j, String str, String str2) {
         String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(j), str, null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165298))), 4, null);
         if (forGuild$default != null) {
-            TextView textView = getBinding().f1807x;
+            TextView textView = getBinding().f1808x;
             m.checkNotNullExpressionValue(textView, "binding.guildProfileSheetIconName");
             textView.setVisibility(8);
             SimpleDraweeView simpleDraweeView = getBinding().v;
@@ -329,10 +329,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
         SimpleDraweeView simpleDraweeView2 = getBinding().v;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.guildProfileSheetIcon");
         IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon_selected.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
-        TextView textView2 = getBinding().f1807x;
+        TextView textView2 = getBinding().f1808x;
         m.checkNotNullExpressionValue(textView2, "binding.guildProfileSheetIconName");
         textView2.setVisibility(0);
-        TextView textView3 = getBinding().f1807x;
+        TextView textView3 = getBinding().f1808x;
         m.checkNotNullExpressionValue(textView3, "binding.guildProfileSheetIconName");
         textView3.setText(str2);
     }
@@ -349,7 +349,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(linearLayout2, "binding.guildProfileSheetOnlineCount");
             Context context = linearLayout2.getContext();
             m.checkNotNullExpressionValue(context, "binding.guildProfileSheetOnlineCount.context");
-            b.n(textView, 2131890369, new Object[]{StringUtilsKt.format(intValue, context)}, null, 4);
+            b.m(textView, 2131890435, new Object[]{StringUtilsKt.format(intValue, context)}, null, 4);
         } else {
             LinearLayout linearLayout3 = getBinding().I;
             m.checkNotNullExpressionValue(linearLayout3, "binding.guildProfileSheetOnlineCount");
@@ -363,10 +363,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             m.checkNotNullExpressionValue(resources, "resources");
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext, 2131755191, num2.intValue(), num2);
+            CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext, 2131755192, num2.intValue(), num2);
             TextView textView2 = getBinding().E;
             m.checkNotNullExpressionValue(textView2, "binding.guildProfileSheetMemberCountText");
-            b.n(textView2, 2131890370, new Object[]{quantityString}, null, 4);
+            b.m(textView2, 2131890436, new Object[]{quantityString}, null, 4);
             return;
         }
         LinearLayout linearLayout5 = getBinding().D;
@@ -390,7 +390,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             MaterialButton materialButton = getBinding().e;
             Resources resources = materialButton.getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755244, 2131892066, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
+            materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755245, 2131892137, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
             materialButton.setTextColor(themedColor);
             setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1(this, premiumSubscriptionCount, themedColor, j));
             MaterialButton materialButton2 = getBinding().H;
@@ -402,7 +402,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
             ColorCompatKt.setDrawableColor(materialButton3, themedColor);
             materialButton3.setTextColor(themedColor);
             setOnClickAndDismissListener(materialButton3, new WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3(this, canAccessSettings, themedColor, j));
-            MaterialButton materialButton4 = getBinding().f1808y;
+            MaterialButton materialButton4 = getBinding().f1809y;
             if (ableToInstantInvite) {
                 i = 0;
             }
@@ -563,18 +563,18 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
 
     private final void showChangeNicknameDialog(long j, String str) {
         int i = 0;
-        View inflate = getLayoutInflater().inflate(2131558892, (ViewGroup) null, false);
-        int i2 = 2131362388;
-        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362388);
+        View inflate = getLayoutInflater().inflate(2131558895, (ViewGroup) null, false);
+        int i2 = 2131362403;
+        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131362403);
         if (materialButton != null) {
-            i2 = 2131362389;
-            TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131362389);
+            i2 = 2131362404;
+            TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131362404);
             if (textInputLayout != null) {
-                i2 = 2131362390;
-                TextView textView = (TextView) inflate.findViewById(2131362390);
+                i2 = 2131362405;
+                TextView textView = (TextView) inflate.findViewById(2131362405);
                 if (textView != null) {
-                    i2 = 2131362391;
-                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131362391);
+                    i2 = 2131362406;
+                    MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131362406);
                     if (materialButton2 != null) {
                         LinearLayout linearLayout = (LinearLayout) inflate;
                         WidgetChannelsListActionsChangeNicknameBinding widgetChannelsListActionsChangeNicknameBinding = new WidgetChannelsListActionsChangeNicknameBinding(linearLayout, materialButton, textInputLayout, textView, materialButton2);
@@ -612,13 +612,13 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
     }
 
     private final void showLoadingView() {
-        AppViewFlipper appViewFlipper = getBinding().f1806s;
+        AppViewFlipper appViewFlipper = getBinding().f1807s;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.guildProfileSheetFlipper");
         appViewFlipper.setDisplayedChild(0);
     }
 
     private final void updateView(WidgetGuildProfileSheetViewModel.ViewState.Loaded loaded) {
-        AppViewFlipper appViewFlipper = getBinding().f1806s;
+        AppViewFlipper appViewFlipper = getBinding().f1807s;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.guildProfileSheetFlipper");
         appViewFlipper.setDisplayedChild(1);
         configureUI(loaded);
@@ -626,7 +626,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559044;
+        return 2131559048;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java
index 6700561075..e1f3fb0ec1 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java
@@ -65,14 +65,14 @@ public final class WidgetGuildProfileSheetEmojisAdapter extends RecyclerView.Ada
     public BaseEmojiViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559043, viewGroup, false);
+            View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559047, viewGroup, false);
             Objects.requireNonNull(inflate, "rootView");
             SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate;
             WidgetGuildProfileEmojiItemBinding widgetGuildProfileEmojiItemBinding = new WidgetGuildProfileEmojiItemBinding(simpleDraweeView, simpleDraweeView);
             m.checkNotNullExpressionValue(widgetGuildProfileEmojiItemBinding, "WidgetGuildProfileEmojiI….context), parent, false)");
             return new EmojiViewHolder(widgetGuildProfileEmojiItemBinding);
         } else if (i == 1) {
-            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131559042, viewGroup, false);
+            View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131559046, viewGroup, false);
             Objects.requireNonNull(inflate2, "rootView");
             WidgetGuildProfileEmojiExtraBinding widgetGuildProfileEmojiExtraBinding = new WidgetGuildProfileEmojiExtraBinding((TextView) inflate2);
             m.checkNotNullExpressionValue(widgetGuildProfileEmojiExtraBinding, "WidgetGuildProfileEmojiE….context), parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java
index 58ca5cd517..dde313d666 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Companion$observeStores$1.java
@@ -37,6 +37,6 @@ public final class WidgetGuildProfileSheetViewModel$Companion$observeStores$1<T,
     }
 
     public final Observable<? extends GuildMember> call(MeUser meUser) {
-        return StoreStream.Companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).G(new AnonymousClass1(meUser));
+        return StoreStream.Companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).F(new AnonymousClass1(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java
index 81916aacbc..e628aed944 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java
@@ -19,6 +19,6 @@ public final class WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1 extends
     /* renamed from: invoke */
     public final void mo1invoke() {
         PublishSubject access$getEventSubject$p = WidgetGuildProfileSheetViewModel.access$getEventSubject$p(this.this$0);
-        access$getEventSubject$p.j.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(2131890935));
+        access$getEventSubject$p.j.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(2131891005));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
index 86919f94e5..5e30ef821d 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java
@@ -470,7 +470,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
 
         public final Observable<StoreState> observeStores(long j) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<StoreState> c2 = Observable.c(companion.getGuilds().observeGuild(j), companion.getGuildProfiles().observeGuildProfile(j), companion.getReadStates().getIsUnread(j), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Z(new WidgetGuildProfileSheetViewModel$Companion$observeStores$1(j)), companion.getUserSettings().observeRestrictedGuildIds(), companion.getEmojis().getEmojiSet(new StoreEmoji.EmojiContext.GuildProfile(j), true, false).G(new WidgetGuildProfileSheetViewModel$Companion$observeStores$2(j)), companion.getLurking().isLurkingObs(j), GuildChannelsInfo.Companion.get(j), WidgetGuildProfileSheetViewModel$Companion$observeStores$3.INSTANCE);
+            Observable<StoreState> c2 = Observable.c(companion.getGuilds().observeGuild(j), companion.getGuildProfiles().observeGuildProfile(j), companion.getReadStates().getIsUnread(j), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).Y(new WidgetGuildProfileSheetViewModel$Companion$observeStores$1(j)), companion.getUserSettings().observeRestrictedGuildIds(), companion.getEmojis().getEmojiSet(new StoreEmoji.EmojiContext.GuildProfile(j), true, false).F(new WidgetGuildProfileSheetViewModel$Companion$observeStores$2(j)), companion.getLurking().isLurkingObs(j), GuildChannelsInfo.Companion.get(j), WidgetGuildProfileSheetViewModel$Companion$observeStores$3.INSTANCE);
             m.checkNotNullExpressionValue(c2, "Observable\n            .…          )\n            }");
             return c2;
         }
@@ -642,7 +642,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         private final boolean isUnread;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2137me;
+        private final MeUser f2143me;
         private final List<Long> restrictedGuildIds;
 
         /* JADX DEBUG: Multi-variable search result rejected for r9v0, resolved type: java.util.List<? extends com.discord.models.domain.emoji.Emoji> */
@@ -655,7 +655,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             this.guild = guild;
             this.guildProfile = guildProfileData;
             this.guildChannelsInfo = guildChannelsInfo;
-            this.f2137me = meUser;
+            this.f2143me = meUser;
             this.computedMe = guildMember;
             this.restrictedGuildIds = list;
             this.isDeveloper = z2;
@@ -665,7 +665,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         }
 
         public static /* synthetic */ StoreState copy$default(StoreState storeState, Guild guild, StoreGuildProfiles.GuildProfileData guildProfileData, GuildChannelsInfo guildChannelsInfo, MeUser meUser, GuildMember guildMember, List list, boolean z2, List list2, boolean z3, boolean z4, int i, Object obj) {
-            return storeState.copy((i & 1) != 0 ? storeState.guild : guild, (i & 2) != 0 ? storeState.guildProfile : guildProfileData, (i & 4) != 0 ? storeState.guildChannelsInfo : guildChannelsInfo, (i & 8) != 0 ? storeState.f2137me : meUser, (i & 16) != 0 ? storeState.computedMe : guildMember, (i & 32) != 0 ? storeState.restrictedGuildIds : list, (i & 64) != 0 ? storeState.isDeveloper : z2, (i & 128) != 0 ? storeState.emojis : list2, (i & 256) != 0 ? storeState.isLurking : z3, (i & 512) != 0 ? storeState.isUnread : z4);
+            return storeState.copy((i & 1) != 0 ? storeState.guild : guild, (i & 2) != 0 ? storeState.guildProfile : guildProfileData, (i & 4) != 0 ? storeState.guildChannelsInfo : guildChannelsInfo, (i & 8) != 0 ? storeState.f2143me : meUser, (i & 16) != 0 ? storeState.computedMe : guildMember, (i & 32) != 0 ? storeState.restrictedGuildIds : list, (i & 64) != 0 ? storeState.isDeveloper : z2, (i & 128) != 0 ? storeState.emojis : list2, (i & 256) != 0 ? storeState.isLurking : z3, (i & 512) != 0 ? storeState.isUnread : z4);
         }
 
         public final Guild component1() {
@@ -685,7 +685,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         }
 
         public final MeUser component4() {
-            return this.f2137me;
+            return this.f2143me;
         }
 
         public final GuildMember component5() {
@@ -724,7 +724,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.guild, storeState.guild) && m.areEqual(this.guildProfile, storeState.guildProfile) && m.areEqual(this.guildChannelsInfo, storeState.guildChannelsInfo) && m.areEqual(this.f2137me, storeState.f2137me) && m.areEqual(this.computedMe, storeState.computedMe) && m.areEqual(this.restrictedGuildIds, storeState.restrictedGuildIds) && this.isDeveloper == storeState.isDeveloper && m.areEqual(this.emojis, storeState.emojis) && this.isLurking == storeState.isLurking && this.isUnread == storeState.isUnread;
+            return m.areEqual(this.guild, storeState.guild) && m.areEqual(this.guildProfile, storeState.guildProfile) && m.areEqual(this.guildChannelsInfo, storeState.guildChannelsInfo) && m.areEqual(this.f2143me, storeState.f2143me) && m.areEqual(this.computedMe, storeState.computedMe) && m.areEqual(this.restrictedGuildIds, storeState.restrictedGuildIds) && this.isDeveloper == storeState.isDeveloper && m.areEqual(this.emojis, storeState.emojis) && this.isLurking == storeState.isLurking && this.isUnread == storeState.isUnread;
         }
 
         public final GuildMember getComputedMe() {
@@ -748,7 +748,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         }
 
         public final MeUser getMe() {
-            return this.f2137me;
+            return this.f2143me;
         }
 
         public final List<Long> getRestrictedGuildIds() {
@@ -763,7 +763,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             int hashCode2 = (hashCode + (guildProfileData != null ? guildProfileData.hashCode() : 0)) * 31;
             GuildChannelsInfo guildChannelsInfo = this.guildChannelsInfo;
             int hashCode3 = (hashCode2 + (guildChannelsInfo != null ? guildChannelsInfo.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2137me;
+            MeUser meUser = this.f2143me;
             int hashCode4 = (hashCode3 + (meUser != null ? meUser.hashCode() : 0)) * 31;
             GuildMember guildMember = this.computedMe;
             int hashCode5 = (hashCode4 + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
@@ -818,7 +818,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
             L.append(", guildChannelsInfo=");
             L.append(this.guildChannelsInfo);
             L.append(", me=");
-            L.append(this.f2137me);
+            L.append(this.f2143me);
             L.append(", computedMe=");
             L.append(this.computedMe);
             L.append(", restrictedGuildIds=");
@@ -1202,7 +1202,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         this.restAPI = restAPI;
         this.storeLurking = storeLurking;
         this.guildId = j;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetGuildProfileSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         storeAnalytics.trackGuildProfileOpened(j);
     }
@@ -1237,9 +1237,9 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
         int i;
         Integer num2 = null;
         if (guild.getFeatures().contains(GuildFeature.VERIFIED)) {
-            i = 2131232036;
+            i = 2131232044;
         } else if (guild.getFeatures().contains(GuildFeature.PARTNERED)) {
-            i = 2131231811;
+            i = 2131231819;
         } else {
             num = null;
             Banner banner = new Banner(guild.getId(), guild.getBanner(), Banner.Type.BANNER);
@@ -1300,7 +1300,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel<ViewSta
     }
 
     private final void handleLoadedGuildPreview(GuildPreview guildPreview, boolean z2) {
-        int i = guildPreview.e().contains(GuildFeature.VERIFIED) ? 2131232036 : guildPreview.e().contains(GuildFeature.PARTNERED) ? 2131231811 : null;
+        int i = guildPreview.e().contains(GuildFeature.VERIFIED) ? 2131232044 : guildPreview.e().contains(GuildFeature.PARTNERED) ? 2131231819 : null;
         Banner banner = new Banner(guildPreview.g(), guildPreview.i(), Banner.Type.SPLASH);
         BottomActions bottomActions = new BottomActions(false, true, !this.viewingGuild);
         long g = guildPreview.g();
diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java
index 2dc5bee2ad..30343d37aa 100644
--- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java
+++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetPublicAnnouncementProfileSheet.java
@@ -51,7 +51,7 @@ public final class WidgetPublicAnnouncementProfileSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558838;
+        return 2131558841;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/home/LeftPanelManager.java b/app/src/main/java/com/discord/widgets/home/LeftPanelManager.java
index 024db3c51a..eca1a8b821 100644
--- a/app/src/main/java/com/discord/widgets/home/LeftPanelManager.java
+++ b/app/src/main/java/com/discord/widgets/home/LeftPanelManager.java
@@ -29,8 +29,8 @@ public final class LeftPanelManager {
     }
 
     public final Observable<OverlappingPanelsLayout.LockState> observeLockState() {
-        Observable<OverlappingPanelsLayout.LockState> s2 = Observable.j(this.storeChannelsSelected.observeResolvedSelectedChannel(), this.storeGuildSelected.observeSelectedGuildId(), LeftPanelManager$observeLockState$1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "Observable.combineLatest… }.distinctUntilChanged()");
-        return s2;
+        Observable<OverlappingPanelsLayout.LockState> r = Observable.j(this.storeChannelsSelected.observeResolvedSelectedChannel(), this.storeGuildSelected.observeSelectedGuildId(), LeftPanelManager$observeLockState$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest… }.distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$animatePeek$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$animatePeek$1.java
new file mode 100644
index 0000000000..4b7d212c7d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$animatePeek$1.java
@@ -0,0 +1,23 @@
+package com.discord.widgets.home;
+
+import android.widget.ImageView;
+import com.discord.widgets.chat.list.WidgetChatList;
+import d0.z.d.m;
+/* compiled from: WidgetHome.kt */
+public final class WidgetHome$animatePeek$1 implements Runnable {
+    public final /* synthetic */ WidgetChatList $fragmentChatList;
+    public final /* synthetic */ WidgetHome this$0;
+
+    public WidgetHome$animatePeek$1(WidgetHome widgetHome, WidgetChatList widgetChatList) {
+        this.this$0 = widgetHome;
+        this.$fragmentChatList = widgetChatList;
+    }
+
+    @Override // java.lang.Runnable
+    public final void run() {
+        ImageView imageView = WidgetHome.access$getBinding$p(this.this$0).g;
+        m.checkNotNullExpressionValue(imageView, "binding.peekTransitionBitmap");
+        imageView.setVisibility(8);
+        this.$fragmentChatList.enableItemAnimations();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java
index d40395623d..a1b5682279 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java
@@ -7,11 +7,11 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.fragment.app.FragmentContainerView;
-import c.a.i.q4;
-import c.a.i.r4;
-import c.a.i.s4;
 import c.a.i.t4;
 import c.a.i.u4;
+import c.a.i.v4;
+import c.a.i.w4;
+import c.a.i.x4;
 import com.discord.databinding.WidgetHomeBinding;
 import com.discord.utilities.view.rounded.RoundedRelativeLayout;
 import d0.z.d.k;
@@ -27,103 +27,114 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun
 
     public final WidgetHomeBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363765;
-        View findViewById = view.findViewById(2131363765);
+        int i = 2131363806;
+        View findViewById = view.findViewById(2131363806);
         if (findViewById != null) {
-            ImageView imageView = (ImageView) findViewById.findViewById(2131363772);
+            ImageView imageView = (ImageView) findViewById.findViewById(2131363813);
             if (imageView != null) {
-                t4 t4Var = new t4((FrameLayout) findViewById, imageView);
-                i = 2131364111;
-                HomePanelsLayout homePanelsLayout = (HomePanelsLayout) view.findViewById(2131364111);
+                w4 w4Var = new w4((FrameLayout) findViewById, imageView);
+                i = 2131364154;
+                HomePanelsLayout homePanelsLayout = (HomePanelsLayout) view.findViewById(2131364154);
                 if (homePanelsLayout != null) {
-                    i = 2131364132;
-                    View findViewById2 = view.findViewById(2131364132);
+                    i = 2131364175;
+                    View findViewById2 = view.findViewById(2131364175);
                     if (findViewById2 != null) {
-                        int i2 = 2131363512;
-                        ViewStub viewStub = (ViewStub) findViewById2.findViewById(2131363512);
+                        int i2 = 2131363553;
+                        ViewStub viewStub = (ViewStub) findViewById2.findViewById(2131363553);
                         if (viewStub != null) {
-                            i2 = 2131363515;
-                            ViewStub viewStub2 = (ViewStub) findViewById2.findViewById(2131363515);
+                            i2 = 2131363556;
+                            ViewStub viewStub2 = (ViewStub) findViewById2.findViewById(2131363556);
                             if (viewStub2 != null) {
-                                i2 = 2131365342;
-                                View findViewById3 = findViewById2.findViewById(2131365342);
+                                i2 = 2131365400;
+                                View findViewById3 = findViewById2.findViewById(2131365400);
                                 if (findViewById3 != null) {
                                     TextView textView = (TextView) findViewById3;
-                                    r4 r4Var = new r4(textView, textView);
-                                    i2 = 2131365593;
-                                    View findViewById4 = findViewById2.findViewById(2131365593);
+                                    u4 u4Var = new u4(textView, textView);
+                                    View findViewById4 = findViewById2.findViewById(2131365654);
                                     if (findViewById4 != null) {
-                                        i2 = 2131365594;
-                                        FragmentContainerView fragmentContainerView = (FragmentContainerView) findViewById2.findViewById(2131365594);
+                                        FragmentContainerView fragmentContainerView = (FragmentContainerView) findViewById2.findViewById(2131365655);
                                         if (fragmentContainerView != null) {
-                                            i2 = 2131365595;
-                                            FragmentContainerView fragmentContainerView2 = (FragmentContainerView) findViewById2.findViewById(2131365595);
+                                            FragmentContainerView fragmentContainerView2 = (FragmentContainerView) findViewById2.findViewById(2131365656);
                                             if (fragmentContainerView2 != null) {
-                                                i2 = 2131365596;
-                                                FragmentContainerView fragmentContainerView3 = (FragmentContainerView) findViewById2.findViewById(2131365596);
+                                                FragmentContainerView fragmentContainerView3 = (FragmentContainerView) findViewById2.findViewById(2131365657);
                                                 if (fragmentContainerView3 != null) {
-                                                    i2 = 2131365597;
-                                                    FragmentContainerView fragmentContainerView4 = (FragmentContainerView) findViewById2.findViewById(2131365597);
+                                                    FragmentContainerView fragmentContainerView4 = (FragmentContainerView) findViewById2.findViewById(2131365658);
                                                     if (fragmentContainerView4 != null) {
-                                                        i2 = 2131365637;
-                                                        FragmentContainerView fragmentContainerView5 = (FragmentContainerView) findViewById2.findViewById(2131365637);
+                                                        FragmentContainerView fragmentContainerView5 = (FragmentContainerView) findViewById2.findViewById(2131365698);
                                                         if (fragmentContainerView5 != null) {
-                                                            i2 = 2131365648;
-                                                            FragmentContainerView fragmentContainerView6 = (FragmentContainerView) findViewById2.findViewById(2131365648);
+                                                            FragmentContainerView fragmentContainerView6 = (FragmentContainerView) findViewById2.findViewById(2131365709);
                                                             if (fragmentContainerView6 != null) {
-                                                                q4 q4Var = new q4((RoundedRelativeLayout) findViewById2, viewStub, viewStub2, r4Var, findViewById4, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, fragmentContainerView6);
-                                                                View findViewById5 = view.findViewById(2131364133);
+                                                                t4 t4Var = new t4((RoundedRelativeLayout) findViewById2, viewStub, viewStub2, u4Var, findViewById4, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, fragmentContainerView6);
+                                                                View findViewById5 = view.findViewById(2131364176);
                                                                 if (findViewById5 != null) {
-                                                                    int i3 = 2131363393;
-                                                                    TextView textView2 = (TextView) findViewById5.findViewById(2131363393);
+                                                                    int i3 = 2131363420;
+                                                                    TextView textView2 = (TextView) findViewById5.findViewById(2131363420);
                                                                     if (textView2 != null) {
-                                                                        i3 = 2131365589;
-                                                                        FragmentContainerView fragmentContainerView7 = (FragmentContainerView) findViewById5.findViewById(2131365589);
+                                                                        i3 = 2131365650;
+                                                                        FragmentContainerView fragmentContainerView7 = (FragmentContainerView) findViewById5.findViewById(2131365650);
                                                                         if (fragmentContainerView7 != null) {
-                                                                            i3 = 2131365608;
-                                                                            FragmentContainerView fragmentContainerView8 = (FragmentContainerView) findViewById5.findViewById(2131365608);
+                                                                            i3 = 2131365669;
+                                                                            FragmentContainerView fragmentContainerView8 = (FragmentContainerView) findViewById5.findViewById(2131365669);
                                                                             if (fragmentContainerView8 != null) {
-                                                                                i3 = 2131365610;
-                                                                                FrameLayout frameLayout = (FrameLayout) findViewById5.findViewById(2131365610);
+                                                                                i3 = 2131365671;
+                                                                                FrameLayout frameLayout = (FrameLayout) findViewById5.findViewById(2131365671);
                                                                                 if (frameLayout != null) {
-                                                                                    s4 s4Var = new s4((RelativeLayout) findViewById5, textView2, fragmentContainerView7, fragmentContainerView8, frameLayout);
-                                                                                    View findViewById6 = view.findViewById(2131364134);
+                                                                                    v4 v4Var = new v4((RelativeLayout) findViewById5, textView2, fragmentContainerView7, fragmentContainerView8, frameLayout);
+                                                                                    View findViewById6 = view.findViewById(2131364177);
                                                                                     if (findViewById6 != null) {
-                                                                                        int i4 = 2131363775;
-                                                                                        RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) findViewById6.findViewById(2131363775);
+                                                                                        int i4 = 2131363816;
+                                                                                        RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) findViewById6.findViewById(2131363816);
                                                                                         if (roundedRelativeLayout != null) {
-                                                                                            i4 = 2131365583;
-                                                                                            FragmentContainerView fragmentContainerView9 = (FragmentContainerView) findViewById6.findViewById(2131365583);
+                                                                                            i4 = 2131365644;
+                                                                                            FragmentContainerView fragmentContainerView9 = (FragmentContainerView) findViewById6.findViewById(2131365644);
                                                                                             if (fragmentContainerView9 != null) {
-                                                                                                i4 = 2131365588;
-                                                                                                FragmentContainerView fragmentContainerView10 = (FragmentContainerView) findViewById6.findViewById(2131365588);
+                                                                                                i4 = 2131365649;
+                                                                                                FragmentContainerView fragmentContainerView10 = (FragmentContainerView) findViewById6.findViewById(2131365649);
                                                                                                 if (fragmentContainerView10 != null) {
-                                                                                                    i4 = 2131365600;
-                                                                                                    FragmentContainerView fragmentContainerView11 = (FragmentContainerView) findViewById6.findViewById(2131365600);
+                                                                                                    i4 = 2131365661;
+                                                                                                    FragmentContainerView fragmentContainerView11 = (FragmentContainerView) findViewById6.findViewById(2131365661);
                                                                                                     if (fragmentContainerView11 != null) {
-                                                                                                        u4 u4Var = new u4((FrameLayout) findViewById6, roundedRelativeLayout, fragmentContainerView9, fragmentContainerView10, fragmentContainerView11);
-                                                                                                        FrameLayout frameLayout2 = (FrameLayout) view;
-                                                                                                        return new WidgetHomeBinding(frameLayout2, t4Var, homePanelsLayout, q4Var, s4Var, u4Var, frameLayout2);
+                                                                                                        x4 x4Var = new x4((FrameLayout) findViewById6, roundedRelativeLayout, fragmentContainerView9, fragmentContainerView10, fragmentContainerView11);
+                                                                                                        ImageView imageView2 = (ImageView) view.findViewById(2131364232);
+                                                                                                        if (imageView2 != null) {
+                                                                                                            FrameLayout frameLayout2 = (FrameLayout) view;
+                                                                                                            return new WidgetHomeBinding(frameLayout2, w4Var, homePanelsLayout, t4Var, v4Var, x4Var, imageView2, frameLayout2);
+                                                                                                        }
+                                                                                                        i = 2131364232;
                                                                                                     }
                                                                                                 }
                                                                                             }
                                                                                         }
                                                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i4)));
                                                                                     }
-                                                                                    i = 2131364134;
+                                                                                    i = 2131364177;
                                                                                 }
                                                                             }
                                                                         }
                                                                     }
                                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(i3)));
                                                                 }
-                                                                i = 2131364133;
+                                                                i = 2131364176;
+                                                            } else {
+                                                                i2 = 2131365709;
                                                             }
+                                                        } else {
+                                                            i2 = 2131365698;
                                                         }
+                                                    } else {
+                                                        i2 = 2131365658;
                                                     }
+                                                } else {
+                                                    i2 = 2131365657;
                                                 }
+                                            } else {
+                                                i2 = 2131365656;
                                             }
+                                        } else {
+                                            i2 = 2131365655;
                                         }
+                                    } else {
+                                        i2 = 2131365654;
                                     }
                                 }
                             }
@@ -132,7 +143,7 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun
                     }
                 }
             } else {
-                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131363772)));
+                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131363813)));
             }
         }
         throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java
index f98ba6051d..e244677f28 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java
@@ -45,7 +45,7 @@ public final class WidgetHome$configureFirstOpen$2 extends o implements Function
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            WidgetHome.access$getBinding$p(this.this$0.this$0).f1820c.openStartPanel();
+            WidgetHome.access$getBinding$p(this.this$0.this$0).f1822c.openStartPanel();
         }
     }
 
@@ -124,9 +124,9 @@ public final class WidgetHome$configureFirstOpen$2 extends o implements Function
             }
             j jVar = new j(new AnonymousClass2(this));
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-            Observable I = Observable.I(jVar.q(1000, timeUnit), new j(AnonymousClass3.INSTANCE).q(2000, timeUnit));
-            m.checkNotNullExpressionValue(I, "Observable\n             …, TimeUnit.MILLISECONDS))");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(I, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass4.INSTANCE, 62, (Object) null);
+            Observable H = Observable.H(jVar.q(1000, timeUnit), new j(AnonymousClass3.INSTANCE).q(2000, timeUnit));
+            m.checkNotNullExpressionValue(H, "Observable\n             …, TimeUnit.MILLISECONDS))");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(H, this.this$0, null, 2, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass4.INSTANCE, 62, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java
index a2b2f0a55d..5f611f6c3c 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java
@@ -25,7 +25,7 @@ public final class WidgetHome$configureLeftPanel$1 extends o implements Function
 
     public final void invoke(OverlappingPanelsLayout.LockState lockState) {
         m.checkNotNullParameter(lockState, "lockState");
-        WidgetHome.access$getBinding$p(this.this$0).f1820c.setStartPanelUseFullPortraitWidth(lockState == OverlappingPanelsLayout.LockState.OPEN);
-        WidgetHome.access$getBinding$p(this.this$0).f1820c.setStartPanelLockState(lockState);
+        WidgetHome.access$getBinding$p(this.this$0).f1822c.setStartPanelUseFullPortraitWidth(lockState == OverlappingPanelsLayout.LockState.OPEN);
+        WidgetHome.access$getBinding$p(this.this$0).f1822c.setStartPanelLockState(lockState);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java
index bcdba077b4..378e33c64d 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java
@@ -27,6 +27,6 @@ public final class WidgetHome$configureNavigationDrawerAction$1 extends o implem
 
     public final void invoke(StoreNavigation.PanelAction panelAction) {
         m.checkNotNullParameter(panelAction, "it");
-        this.$this_configureNavigationDrawerAction.setNavigationPanelAction(panelAction, WidgetHome.access$getBinding$p(this.this$0).f1820c);
+        this.$this_configureNavigationDrawerAction.setNavigationPanelAction(panelAction, WidgetHome.access$getBinding$p(this.this$0).f1822c);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.java
index 2911e3fc83..5c3279b1c0 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$1.java
@@ -18,7 +18,7 @@ public final class WidgetHome$setPanelWindowInsetsListeners$1 implements OnApply
     public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
         m.checkNotNullParameter(view, "<anonymous parameter 0>");
         m.checkNotNullParameter(windowInsetsCompat, "insets");
-        ViewGroup.LayoutParams layoutParams = WidgetHome.access$getBinding$p(this.this$0).e.f151c.getLayoutParams();
+        ViewGroup.LayoutParams layoutParams = WidgetHome.access$getBinding$p(this.this$0).e.f169c.getLayoutParams();
         Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams");
         ((ViewGroup.MarginLayoutParams) layoutParams).leftMargin = windowInsetsCompat.getSystemWindowInsetLeft();
         return windowInsetsCompat.consumeSystemWindowInsets();
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.java
index fcce0ad806..945d81f684 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$setPanelWindowInsetsListeners$3.java
@@ -17,7 +17,7 @@ public final class WidgetHome$setPanelWindowInsetsListeners$3 implements OnApply
     public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) {
         m.checkNotNullParameter(view, "<anonymous parameter 0>");
         m.checkNotNullParameter(windowInsetsCompat, "insets");
-        FragmentContainerView fragmentContainerView = WidgetHome.access$getBinding$p(this.this$0).f.f163c;
+        FragmentContainerView fragmentContainerView = WidgetHome.access$getBinding$p(this.this$0).f.f180c;
         m.checkNotNullExpressionValue(fragmentContainerView, "binding.panelRight.widgetConnectedList");
         fragmentContainerView.setPadding(fragmentContainerView.getPaddingLeft(), fragmentContainerView.getPaddingTop(), fragmentContainerView.getPaddingRight(), windowInsetsCompat.getSystemWindowInsetBottom());
         return windowInsetsCompat.consumeSystemWindowInsets();
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome.java b/app/src/main/java/com/discord/widgets/home/WidgetHome.java
index e4c7aba1c2..4e3f5c1bf2 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHome.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHome.java
@@ -1,12 +1,15 @@
 package com.discord.widgets.home;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
@@ -16,10 +19,10 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.d.h0;
 import c.a.d.j0;
-import c.a.i.q4;
-import c.a.i.r4;
-import c.a.i.s4;
+import c.a.i.t4;
 import c.a.i.u4;
+import c.a.i.v4;
+import c.a.i.x4;
 import c.a.p.b;
 import c.d.b.a.a;
 import com.discord.app.AppActivity;
@@ -50,6 +53,7 @@ import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.widgets.accessibility.AccessibilityDetectionNavigator;
 import com.discord.widgets.channels.WidgetChannelOnboarding;
 import com.discord.widgets.chat.input.SmoothKeyboardReactionHelper;
+import com.discord.widgets.chat.list.WidgetChatList;
 import com.discord.widgets.guilds.join.WidgetGuildWelcomeSheet;
 import com.discord.widgets.home.WidgetHomeViewModel;
 import com.discord.widgets.notice.WidgetNoticeNuxSamsungLink;
@@ -115,11 +119,11 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     public WidgetHome() {
-        super(2131559061);
+        super(2131559067);
         WidgetHome$viewModel$2 widgetHome$viewModel$2 = WidgetHome$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetHomeViewModel.class), new WidgetHome$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetHome$viewModel$2));
-        this.fixedPositionViewIds = m0.setOf(2131365342);
+        this.fixedPositionViewIds = m0.setOf(2131365400);
         this.leftPanelManager = new LeftPanelManager(null, null, 3, null);
         this.localeManager = new LocaleManager();
         this.onGuildListAddHintCreate = WidgetHome$onGuildListAddHintCreate$1.INSTANCE;
@@ -183,11 +187,57 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         widgetHome.showUrgentMessageDialog();
     }
 
+    private final void animatePeek(WidgetHomeViewModel.Event event) {
+        View view;
+        long j;
+        float f;
+        float f2;
+        View view2;
+        Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365656);
+        if (!(findFragmentById instanceof WidgetChatList)) {
+            findFragmentById = null;
+        }
+        WidgetChatList widgetChatList = (WidgetChatList) findFragmentById;
+        if (widgetChatList != null) {
+            t4 t4Var = getBinding().d;
+            m.checkNotNullExpressionValue(t4Var, "binding.panelCenter");
+            RoundedRelativeLayout roundedRelativeLayout = t4Var.a;
+            m.checkNotNullExpressionValue(roundedRelativeLayout, "binding.panelCenter.root");
+            Bitmap createBitmap = Bitmap.createBitmap(roundedRelativeLayout.getMeasuredWidth(), roundedRelativeLayout.getMeasuredHeight(), Bitmap.Config.ARGB_8888);
+            roundedRelativeLayout.draw(new Canvas(createBitmap));
+            getBinding().g.setImageBitmap(createBitmap);
+            if (event instanceof WidgetHomeViewModel.Event.AnimatePeekIn) {
+                View view3 = getBinding().g;
+                m.checkNotNullExpressionValue(view3, "binding.peekTransitionBitmap");
+                f = (float) roundedRelativeLayout.getRight();
+                view2 = view3;
+                view = roundedRelativeLayout;
+                j = 250;
+                f2 = 0.0f;
+            } else {
+                view = getBinding().g;
+                m.checkNotNullExpressionValue(view, "binding.peekTransitionBitmap");
+                view2 = roundedRelativeLayout;
+                j = 200;
+                f2 = (float) roundedRelativeLayout.getRight();
+                f = 0.0f;
+            }
+            view.setTranslationX(f);
+            view.animate().setDuration(j).translationX(f2).withEndAction(new WidgetHome$animatePeek$1(this, widgetChatList)).start();
+            view2.setTranslationX(f - ((float) roundedRelativeLayout.getMeasuredWidth()));
+            view2.animate().setDuration(j).translationX(f2 - ((float) roundedRelativeLayout.getMeasuredWidth())).start();
+            widgetChatList.disableItemAnimations();
+            ImageView imageView = getBinding().g;
+            m.checkNotNullExpressionValue(imageView, "binding.peekTransitionBitmap");
+            imageView.setVisibility(0);
+        }
+    }
+
     private final void configureFirstOpen() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable z2 = Observable.j(StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetHome$configureFirstOpen$1.INSTANCE).z();
-        m.checkNotNullExpressionValue(z2, "Observable\n        .comb…       }\n        .first()");
-        ObservableExtensionsKt.appSubscribe$default(z2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$configureFirstOpen$2(this), 62, (Object) null);
+        Observable y2 = Observable.j(StoreConnectionOpen.observeConnectionOpen$default(companion.getConnectionOpen(), false, 1, null), companion.getChannels().observeGuildAndPrivateChannels(), WidgetHome$configureFirstOpen$1.INSTANCE).y();
+        m.checkNotNullExpressionValue(y2, "Observable\n        .comb…       }\n        .first()");
+        ObservableExtensionsKt.appSubscribe$default(y2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$configureFirstOpen$2(this), 62, (Object) null);
     }
 
     private final void configureLeftPanel() {
@@ -199,8 +249,8 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void configureOverlappingPanels() {
-        getBinding().f1820c.registerStartPanelStateListeners(new WidgetHome$configureOverlappingPanels$1(this));
-        getBinding().f1820c.registerEndPanelStateListeners(new WidgetHome$configureOverlappingPanels$2(this));
+        getBinding().f1822c.registerStartPanelStateListeners(new WidgetHome$configureOverlappingPanels$1(this));
+        getBinding().f1822c.registerEndPanelStateListeners(new WidgetHome$configureOverlappingPanels$2(this));
     }
 
     private final void configureUI(WidgetHomeModel widgetHomeModel) {
@@ -223,13 +273,13 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final boolean handleBackPressed() {
-        int ordinal = getBinding().f1820c.getSelectedPanel().ordinal();
+        int ordinal = getBinding().f1822c.getSelectedPanel().ordinal();
         if (ordinal == 0) {
             requireActivity().moveTaskToBack(true);
         } else if (ordinal == 1) {
             handleCenterPanelBack();
         } else if (ordinal == 2) {
-            getBinding().f1820c.closePanels();
+            getBinding().f1822c.closePanels();
         }
         return true;
     }
@@ -244,22 +294,24 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         if (selectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel) {
             StoreChannelsSelected.ResolvedSelectedChannel.Channel channel = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) selectedChannel;
             if (channel.getPeekParent() != null) {
-                ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel.getChannel().e(), channel.getPeekParent().longValue(), null, null, 12, null);
+                ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), channel.getChannel().f(), channel.getPeekParent().longValue(), null, null, 12, null);
                 return;
             }
         }
-        getBinding().f1820c.openStartPanel();
+        getBinding().f1822c.openStartPanel();
     }
 
     private final void handleEvent(WidgetHomeViewModel.Event event) {
         if (m.areEqual(event, WidgetHomeViewModel.Event.OpenLeftPanel.INSTANCE)) {
-            getBinding().f1820c.openStartPanel();
+            getBinding().f1822c.openStartPanel();
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.ClosePanels.INSTANCE)) {
-            getBinding().f1820c.closePanels();
+            getBinding().f1822c.closePanels();
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.UnlockLeftPanel.INSTANCE)) {
-            getBinding().f1820c.setStartPanelLockState(OverlappingPanelsLayout.LockState.UNLOCKED);
+            getBinding().f1822c.setStartPanelLockState(OverlappingPanelsLayout.LockState.UNLOCKED);
         } else if (m.areEqual(event, WidgetHomeViewModel.Event.ShowChannelOnboardingSheet.INSTANCE)) {
             showChannelOnboardingSheet();
+        } else if (m.areEqual(event, WidgetHomeViewModel.Event.AnimatePeekIn.INSTANCE) || m.areEqual(event, WidgetHomeViewModel.Event.AnimatePeekOut.INSTANCE)) {
+            animatePeek(event);
         } else if (event instanceof WidgetHomeViewModel.Event.ShowGuildWelcomeSheet) {
             showWelcomeSheet(((WidgetHomeViewModel.Event.ShowGuildWelcomeSheet) event).getGuildId());
         }
@@ -280,8 +332,8 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void handleViewState(WidgetHomeViewModel.ViewState viewState) {
-        getBinding().f1820c.handleStartPanelState(viewState.getLeftPanelState());
-        getBinding().f1820c.handleEndPanelState(viewState.getRightPanelState());
+        getBinding().f1822c.handleStartPanelState(viewState.getLeftPanelState());
+        getBinding().f1822c.handleEndPanelState(viewState.getRightPanelState());
     }
 
     private final boolean isOnHomeTab() {
@@ -290,36 +342,36 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
 
     private final void roundPanelCorners() {
         float dpToPixels = (float) DimenUtils.dpToPixels(8);
-        q4 q4Var = getBinding().d;
-        m.checkNotNullExpressionValue(q4Var, "binding.panelCenter");
-        q4Var.a.updateTopLeftRadius(dpToPixels);
-        q4 q4Var2 = getBinding().d;
-        m.checkNotNullExpressionValue(q4Var2, "binding.panelCenter");
-        q4Var2.a.updateTopRightRadius(dpToPixels);
+        t4 t4Var = getBinding().d;
+        m.checkNotNullExpressionValue(t4Var, "binding.panelCenter");
+        t4Var.a.updateTopLeftRadius(dpToPixels);
+        t4 t4Var2 = getBinding().d;
+        m.checkNotNullExpressionValue(t4Var2, "binding.panelCenter");
+        t4Var2.a.updateTopRightRadius(dpToPixels);
         getBinding().f.b.updateTopLeftRadius(dpToPixels);
         getBinding().f.b.updateTopRightRadius(dpToPixels);
     }
 
     private final void setPanelWindowInsetsListeners() {
-        FrameLayout frameLayout = getBinding().g;
+        FrameLayout frameLayout = getBinding().h;
         m.checkNotNullExpressionValue(frameLayout, "binding.widgetHomeContainer");
         ViewExtensions.setForwardingWindowInsetsListener(frameLayout);
-        HomePanelsLayout homePanelsLayout = getBinding().f1820c;
+        HomePanelsLayout homePanelsLayout = getBinding().f1822c;
         m.checkNotNullExpressionValue(homePanelsLayout, "binding.overlappingPanels");
         ViewExtensions.setForwardingWindowInsetsListener(homePanelsLayout);
-        s4 s4Var = getBinding().e;
-        m.checkNotNullExpressionValue(s4Var, "binding.panelLeft");
-        ViewCompat.setOnApplyWindowInsetsListener(s4Var.a, new WidgetHome$setPanelWindowInsetsListeners$1(this));
-        q4 q4Var = getBinding().d;
-        m.checkNotNullExpressionValue(q4Var, "binding.panelCenter");
-        ViewCompat.setOnApplyWindowInsetsListener(q4Var.a, new WidgetHome$setPanelWindowInsetsListeners$2(this));
-        u4 u4Var = getBinding().f;
-        m.checkNotNullExpressionValue(u4Var, "binding.panelRight");
-        ViewCompat.setOnApplyWindowInsetsListener(u4Var.a, new WidgetHome$setPanelWindowInsetsListeners$3(this));
+        v4 v4Var = getBinding().e;
+        m.checkNotNullExpressionValue(v4Var, "binding.panelLeft");
+        ViewCompat.setOnApplyWindowInsetsListener(v4Var.a, new WidgetHome$setPanelWindowInsetsListeners$1(this));
+        t4 t4Var = getBinding().d;
+        m.checkNotNullExpressionValue(t4Var, "binding.panelCenter");
+        ViewCompat.setOnApplyWindowInsetsListener(t4Var.a, new WidgetHome$setPanelWindowInsetsListeners$2(this));
+        x4 x4Var = getBinding().f;
+        m.checkNotNullExpressionValue(x4Var, "binding.panelRight");
+        ViewCompat.setOnApplyWindowInsetsListener(x4Var.a, new WidgetHome$setPanelWindowInsetsListeners$3(this));
     }
 
     private final void setUpToolbar() {
-        setActionBarDisplayHomeAsUpEnabled(true, 2131231736, 2131893936, Integer.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968946)));
+        setActionBarDisplayHomeAsUpEnabled(true, 2131231744, 2131894036, Integer.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968946)));
         Toolbar toolbar = getToolbar();
         if (toolbar != null) {
             toolbar.setNavigationOnClickListener(new WidgetHome$setUpToolbar$1(this));
@@ -327,9 +379,9 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void setupSmoothKeyboardReaction() {
-        q4 q4Var = getBinding().d;
-        m.checkNotNullExpressionValue(q4Var, "binding.panelCenter");
-        RoundedRelativeLayout roundedRelativeLayout = q4Var.a;
+        t4 t4Var = getBinding().d;
+        m.checkNotNullExpressionValue(t4Var, "binding.panelCenter");
+        RoundedRelativeLayout roundedRelativeLayout = t4Var.a;
         m.checkNotNullExpressionValue(roundedRelativeLayout, "binding.panelCenter.root");
         Iterator<View> it = ViewGroupKt.iterator(roundedRelativeLayout);
         while (it.hasNext()) {
@@ -363,18 +415,18 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     private final void unroundPanelCorners() {
-        q4 q4Var = getBinding().d;
-        m.checkNotNullExpressionValue(q4Var, "binding.panelCenter");
-        q4Var.a.updateTopLeftRadius(0.0f);
-        q4 q4Var2 = getBinding().d;
-        m.checkNotNullExpressionValue(q4Var2, "binding.panelCenter");
-        q4Var2.a.updateTopRightRadius(0.0f);
+        t4 t4Var = getBinding().d;
+        m.checkNotNullExpressionValue(t4Var, "binding.panelCenter");
+        t4Var.a.updateTopLeftRadius(0.0f);
+        t4 t4Var2 = getBinding().d;
+        m.checkNotNullExpressionValue(t4Var2, "binding.panelCenter");
+        t4Var2.a.updateTopRightRadius(0.0f);
         getBinding().f.b.updateTopLeftRadius(0.0f);
         getBinding().f.b.updateTopRightRadius(0.0f);
     }
 
     public final PanelLayout getPanelLayout() {
-        HomePanelsLayout homePanelsLayout = getBinding().f1820c;
+        HomePanelsLayout homePanelsLayout = getBinding().f1822c;
         m.checkNotNullExpressionValue(homePanelsLayout, "binding.overlappingPanels");
         return homePanelsLayout;
     }
@@ -388,15 +440,15 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     }
 
     public final TextView getUnreadCountView() {
-        r4 r4Var = getBinding().d.f144c;
-        m.checkNotNullExpressionValue(r4Var, "binding.panelCenter.unread");
-        TextView textView = r4Var.a;
+        u4 u4Var = getBinding().d.f160c;
+        m.checkNotNullExpressionValue(u4Var, "binding.panelCenter.unread");
+        TextView textView = u4Var.a;
         m.checkNotNullExpressionValue(textView, "binding.panelCenter.unread.root");
         return textView;
     }
 
     public final void lockCloseRightPanel(boolean z2) {
-        getBinding().f1820c.setEndPanelLockState(z2 ? OverlappingPanelsLayout.LockState.CLOSE : OverlappingPanelsLayout.LockState.UNLOCKED);
+        getBinding().f1822c.setEndPanelLockState(z2 ? OverlappingPanelsLayout.LockState.CLOSE : OverlappingPanelsLayout.LockState.UNLOCKED);
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -411,7 +463,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
     @Override // c.a.p.b.a
     public void onGestureRegionsUpdate(List<Rect> list) {
         m.checkNotNullParameter(list, "gestureRegions");
-        getBinding().f1820c.setChildGestureRegions(list);
+        getBinding().f1822c.setChildGestureRegions(list);
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -437,7 +489,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         if (widgetHomeModel$app_productionGoogleRelease != null) {
             WidgetHomeHeaderManager.INSTANCE.configure(this, widgetHomeModel$app_productionGoogleRelease);
         }
-        if (getBinding().f1820c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) {
+        if (getBinding().f1822c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) {
             setActionBarTitleAccessibilityViewFocused();
         }
     }
@@ -507,17 +559,17 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen
         StoreStream.Companion companion = StoreStream.Companion;
         configureNavigationDrawerAction(companion.getNavigation());
         configureOverlappingPanels();
-        Observable G = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(SurveyUtils.INSTANCE.getSurveyToShow(), 0, false, 3, null), this, null, 2, null).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable y2 = G.y(WidgetHome$onViewBoundOrOnResume$4.INSTANCE);
-        m.checkNotNullExpressionValue(y2, "SurveyUtils\n        .get…SurveyUtils.Survey.None }");
-        ObservableExtensionsKt.appSubscribe$default(y2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$5(this), 62, (Object) null);
-        Observable<StoreNux.NuxState> y3 = companion.getNux().getNuxState().y(WidgetHome$onViewBoundOrOnResume$6.INSTANCE);
-        m.checkNotNullExpressionValue(y3, "StoreStream\n        .get… .filter { it.firstOpen }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(y3, 0, false, 1, null), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$7(this), 62, (Object) null);
-        Observable y4 = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).y(WidgetHome$onViewBoundOrOnResume$8.INSTANCE);
-        m.checkNotNullExpressionValue(y4, "StoreStream\n        .get…hasUnreadUrgentMessages }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(y4, this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$9(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(SurveyUtils.INSTANCE.getSurveyToShow(), 0, false, 3, null), this, null, 2, null).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable x2 = F.x(WidgetHome$onViewBoundOrOnResume$4.INSTANCE);
+        m.checkNotNullExpressionValue(x2, "SurveyUtils\n        .get…SurveyUtils.Survey.None }");
+        ObservableExtensionsKt.appSubscribe$default(x2, WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$5(this), 62, (Object) null);
+        Observable<StoreNux.NuxState> x3 = companion.getNux().getNuxState().x(WidgetHome$onViewBoundOrOnResume$6.INSTANCE);
+        m.checkNotNullExpressionValue(x3, "StoreStream\n        .get… .filter { it.firstOpen }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(x3, 0, false, 1, null), this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$7(this), 62, (Object) null);
+        Observable x4 = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).x(WidgetHome$onViewBoundOrOnResume$8.INSTANCE);
+        m.checkNotNullExpressionValue(x4, "StoreStream\n        .get…hasUnreadUrgentMessages }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(x4, this, null, 2, null), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$9(this), 62, (Object) null);
         configureLeftPanel();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(this.globalStatusIndicatorStateObserver.observeState(), this), WidgetHome.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetHome$onViewBoundOrOnResume$10(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1.java
index dd3f530c91..6163986279 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1.java
@@ -17,7 +17,7 @@ public final class WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1 imp
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         Channel channel = this.$this_apply.getChannel();
-        Integer valueOf = channel != null ? Integer.valueOf(channel.z()) : null;
+        Integer valueOf = channel != null ? Integer.valueOf(channel.A()) : null;
         if ((valueOf != null && valueOf.intValue() == 1) || ((valueOf != null && valueOf.intValue() == 3) || ((valueOf != null && valueOf.intValue() == 5) || (valueOf != null && valueOf.intValue() == 0)))) {
             this.$widgetHome$inlined.getPanelLayout().openEndPanel();
         }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1.java
index 33de6d7de8..7594c1a3c6 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1.java
@@ -17,6 +17,6 @@ public final class WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetThreadBrowser.Companion.show(this.$context, this.$channel.e(), AnimatableValueParser.y1(this.$channel) ? this.$channel.q() : this.$channel.g(), "Chat List Header");
+        WidgetThreadBrowser.Companion.show(this.$context, this.$channel.f(), AnimatableValueParser.z1(this.$channel) ? this.$channel.r() : this.$channel.h(), "Chat List Header");
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java
index 8abe4900eb..29c65973c8 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java
@@ -16,48 +16,48 @@ public final class WidgetHomeHeaderManager$getOnConfigureAction$1<T> implements
 
     public final void call(Menu menu) {
         boolean z2 = false;
-        boolean z3 = this.$this_getOnConfigureAction.getChannel() != null && AnimatableValueParser.w1(this.$this_getOnConfigureAction.getChannel());
+        boolean z3 = this.$this_getOnConfigureAction.getChannel() != null && AnimatableValueParser.x1(this.$this_getOnConfigureAction.getChannel());
         Channel channel = this.$this_getOnConfigureAction.getChannel();
-        Integer valueOf = channel != null ? Integer.valueOf(channel.z()) : null;
+        Integer valueOf = channel != null ? Integer.valueOf(channel.A()) : null;
         if ((valueOf != null && valueOf.intValue() == 3) || (valueOf != null && valueOf.intValue() == 1)) {
-            MenuItem findItem = menu.findItem(2131363871);
+            MenuItem findItem = menu.findItem(2131363912);
             m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_chat_search)");
             findItem.setVisible(false);
-            MenuItem findItem2 = menu.findItem(2131363872);
+            MenuItem findItem2 = menu.findItem(2131363913);
             m.checkNotNullExpressionValue(findItem2, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem2.setVisible(true);
-            MenuItem findItem3 = menu.findItem(2131363877);
+            MenuItem findItem3 = menu.findItem(2131363918);
             m.checkNotNullExpressionValue(findItem3, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem3.setVisible(false);
         } else if ((valueOf != null && valueOf.intValue() == 5) || (valueOf != null && valueOf.intValue() == 0)) {
-            MenuItem findItem4 = menu.findItem(2131363872);
+            MenuItem findItem4 = menu.findItem(2131363913);
             m.checkNotNullExpressionValue(findItem4, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem4.setVisible(true);
-            MenuItem findItem5 = menu.findItem(2131363871);
+            MenuItem findItem5 = menu.findItem(2131363912);
             m.checkNotNullExpressionValue(findItem5, "menu.findItem(R.id.menu_chat_search)");
             findItem5.setVisible(!this.$this_getOnConfigureAction.getThreadExperimentEnabled());
-            MenuItem findItem6 = menu.findItem(2131363877);
+            MenuItem findItem6 = menu.findItem(2131363918);
             m.checkNotNullExpressionValue(findItem6, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem6.setVisible(this.$this_getOnConfigureAction.getThreadExperimentEnabled());
         } else if ((valueOf != null && valueOf.intValue() == 10) || ((valueOf != null && valueOf.intValue() == 12) || (valueOf != null && valueOf.intValue() == 11))) {
-            MenuItem findItem7 = menu.findItem(2131363872);
+            MenuItem findItem7 = menu.findItem(2131363913);
             m.checkNotNullExpressionValue(findItem7, "menu.findItem(R.id.menu_chat_side_panel)");
             findItem7.setVisible(false);
-            MenuItem findItem8 = menu.findItem(2131363871);
+            MenuItem findItem8 = menu.findItem(2131363912);
             m.checkNotNullExpressionValue(findItem8, "menu.findItem(R.id.menu_chat_search)");
             findItem8.setVisible(false);
-            MenuItem findItem9 = menu.findItem(2131363877);
+            MenuItem findItem9 = menu.findItem(2131363918);
             m.checkNotNullExpressionValue(findItem9, "menu.findItem(R.id.menu_chat_thread_browser)");
             findItem9.setVisible(true);
         }
-        boolean z4 = this.$this_getOnConfigureAction.getChannel() != null && AnimatableValueParser.r1(this.$this_getOnConfigureAction.getChannel());
-        MenuItem findItem10 = menu.findItem(2131363873);
+        boolean z4 = this.$this_getOnConfigureAction.getChannel() != null && AnimatableValueParser.s1(this.$this_getOnConfigureAction.getChannel());
+        MenuItem findItem10 = menu.findItem(2131363914);
         m.checkNotNullExpressionValue(findItem10, "menu.findItem(R.id.menu_chat_start_call)");
         findItem10.setVisible(!this.$this_getOnConfigureAction.isCallConnected() && z4 && !z3);
-        MenuItem findItem11 = menu.findItem(2131363875);
+        MenuItem findItem11 = menu.findItem(2131363916);
         m.checkNotNullExpressionValue(findItem11, "menu.findItem(R.id.menu_chat_start_video_call)");
         findItem11.setVisible(!this.$this_getOnConfigureAction.isCallConnected() && z4 && !z3);
-        MenuItem findItem12 = menu.findItem(2131363876);
+        MenuItem findItem12 = menu.findItem(2131363917);
         m.checkNotNullExpressionValue(findItem12, "menu.findItem(R.id.menu_chat_stop_call)");
         if (this.$this_getOnConfigureAction.isCallConnected() && !z3) {
             z2 = true;
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
index 886eddf52e..f6214765ce 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java
@@ -27,10 +27,10 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti
 
     private final void launchForSearch(Context context) {
         Channel channel = this.$this_getOnSelectedAction.getChannel();
-        if (channel == null || !AnimatableValueParser.r1(channel)) {
+        if (channel == null || !AnimatableValueParser.s1(channel)) {
             Channel channel2 = this.$this_getOnSelectedAction.getChannel();
-            if (channel2 != null && AnimatableValueParser.j1(channel2)) {
-                WidgetSearch.Companion.launchForGuild(this.$this_getOnSelectedAction.getChannel().e(), context);
+            if (channel2 != null && AnimatableValueParser.k1(channel2)) {
+                WidgetSearch.Companion.launchForGuild(this.$this_getOnSelectedAction.getChannel().f(), context);
                 return;
             }
             return;
@@ -46,25 +46,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti
         m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager");
         PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager);
         switch (menuItem.getItemId()) {
-            case 2131363870:
+            case 2131363911:
                 WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null);
                 break;
-            case 2131363871:
+            case 2131363912:
                 launchForSearch(context);
                 break;
-            case 2131363872:
+            case 2131363913:
                 this.$panelLayout.openEndPanel();
                 break;
-            case 2131363873:
+            case 2131363914:
                 privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case 2131363874:
+            case 2131363915:
                 ChannelInviteLaunchUtils.INSTANCE.inviteToChannel(this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar");
                 break;
-            case 2131363875:
+            case 2131363916:
                 privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case 2131363876:
+            case 2131363917:
                 StoreStream.Companion.getVoiceChannelSelected().clear();
                 break;
         }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java
index b580a64c1b..718376f77a 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java
@@ -154,8 +154,8 @@ public final class WidgetHomeHeaderManager {
         if (channel != null) {
             int threadCount = widgetHomeModel.getThreadCount();
             View view = null;
-            MenuItem findItem = (toolbar == null || (menu = toolbar.getMenu()) == null) ? null : menu.findItem(2131363877);
-            TextView textView = (findItem == null || (actionView2 = findItem.getActionView()) == null) ? null : (TextView) actionView2.findViewById(2131365233);
+            MenuItem findItem = (toolbar == null || (menu = toolbar.getMenu()) == null) ? null : menu.findItem(2131363918);
+            TextView textView = (findItem == null || (actionView2 = findItem.getActionView()) == null) ? null : (TextView) actionView2.findViewById(2131365288);
             if (textView != null) {
                 textView.setText(String.valueOf(Math.min(99, threadCount)));
             }
@@ -163,7 +163,7 @@ public final class WidgetHomeHeaderManager {
                 ViewKt.setVisible(textView, threadCount != 0);
             }
             if (!(findItem == null || (actionView = findItem.getActionView()) == null)) {
-                view = actionView.findViewById(2131365243);
+                view = actionView.findViewById(2131365298);
             }
             if (view != null) {
                 view.setOnClickListener(new WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1(context, channel));
@@ -178,15 +178,15 @@ public final class WidgetHomeHeaderManager {
         boolean z2 = true;
         if (selectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel) {
             Channel channel = widgetHomeModel.getChannel();
-            Integer valueOf = channel != null ? Integer.valueOf(channel.z()) : null;
+            Integer valueOf = channel != null ? Integer.valueOf(channel.A()) : null;
             if (valueOf == null) {
                 return new HeaderData(context.getString(2131887357), null, null, false, 10, null);
             }
             if (valueOf.intValue() == 3) {
-                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231660, false, 10, null);
+                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231666, false, 10, null);
             } else if (valueOf.intValue() == 1) {
-                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231558, false, 10, null);
-            } else if (widgetHomeModel.getChannel().g() <= 0) {
+                headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231564, false, 10, null);
+            } else if (widgetHomeModel.getChannel().h() <= 0) {
                 return new HeaderData(null, null, null, false, 10, null);
             } else {
                 String z0 = AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false);
@@ -203,7 +203,7 @@ public final class WidgetHomeHeaderManager {
         } else if (!(selectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) {
             return new HeaderData(null, null, null, false, 14, null);
         } else {
-            headerData = new HeaderData(context.getString(2131887964), AnimatableValueParser.z0(((StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) widgetHomeModel.getSelectedChannel()).getParentChannel(), context, true), null, true);
+            headerData = new HeaderData(context.getString(2131887963), AnimatableValueParser.z0(((StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) widgetHomeModel.getSelectedChannel()).getParentChannel(), context, true), null, true);
         }
         return headerData;
     }
@@ -220,7 +220,7 @@ public final class WidgetHomeHeaderManager {
         m.checkNotNullParameter(widgetHome, "widgetHome");
         m.checkNotNullParameter(widgetHomeModel, "model");
         boolean z2 = true;
-        widgetHome.lockCloseRightPanel(widgetHomeModel.getChannel() == null || (!AnimatableValueParser.r1(widgetHomeModel.getChannel()) && !AnimatableValueParser.j1(widgetHomeModel.getChannel())) || AnimatableValueParser.y1(widgetHomeModel.getChannel()));
+        widgetHome.lockCloseRightPanel(widgetHomeModel.getChannel() == null || (!AnimatableValueParser.s1(widgetHomeModel.getChannel()) && !AnimatableValueParser.k1(widgetHomeModel.getChannel())) || AnimatableValueParser.e1(widgetHomeModel.getChannel()));
         widgetHome.bindToolbar();
         widgetHome.setActionBarTitleLayoutExpandedTappableArea();
         Context context = widgetHome.getContext();
@@ -237,14 +237,14 @@ public final class WidgetHomeHeaderManager {
             widgetHome.setActionBarSubtitle(component2);
             Toolbar toolbar = widgetHome.getToolbar();
             if (toolbar != null) {
-                toolbar.setNavigationIcon(ContextCompat.getDrawable(context, component4 ? DrawableCompat.getThemedDrawableRes$default(context, 2130969368, 0, 2, (Object) null) : 2131231736));
+                toolbar.setNavigationIcon(ContextCompat.getDrawable(context, component4 ? DrawableCompat.getThemedDrawableRes$default(context, 2130969368, 0, 2, (Object) null) : 2131231744));
             }
         }
         widgetHome.setActionBarTitleClick(new WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1(widgetHomeModel, widgetHome, widgetHomeModel));
         WidgetHomeHeaderManager widgetHomeHeaderManager2 = INSTANCE;
         Toolbar actionBarOptionsMenu = widgetHome.setActionBarOptionsMenu(2131623943, widgetHomeHeaderManager2.getOnSelectedAction(widgetHomeModel, widgetHome, widgetHome.getPanelLayout()), widgetHomeHeaderManager2.getOnConfigureAction(widgetHomeModel));
         Channel channel = widgetHomeModel.getChannel();
-        boolean z3 = channel != null && AnimatableValueParser.g1(channel) && !AnimatableValueParser.w1(channel);
+        boolean z3 = channel != null && AnimatableValueParser.h1(channel) && !AnimatableValueParser.x1(channel);
         ToolbarTitleLayout actionBarTitleLayout = widgetHome.getActionBarTitleLayout();
         if (actionBarTitleLayout != null) {
             Presence dmPresence = widgetHomeModel.getDmPresence();
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeModel$Companion$get$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeModel$Companion$get$2.java
index 50ee7c49a6..0fd3c5ff60 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeModel$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeModel$Companion$get$2.java
@@ -45,10 +45,10 @@ public final class WidgetHomeModel$Companion$get$2<T, R> implements b<Pair<? ext
             Long l3;
             Channel channel2 = this.$channel;
             NsfwAllowance nsfwAllowance = null;
-            if (channel2 != null && AnimatableValueParser.r1(channel2)) {
+            if (channel2 != null && AnimatableValueParser.s1(channel2)) {
                 Channel channel3 = this.$channel;
                 if (channel3 != null) {
-                    l3 = Long.valueOf(channel3.g());
+                    l3 = Long.valueOf(channel3.h());
                     l2 = l;
                 } else {
                     l2 = l;
@@ -121,15 +121,15 @@ public final class WidgetHomeModel$Companion$get$2<T, R> implements b<Pair<? ext
         StoreThreadsActive threadsActive = companion.getThreadsActive();
         m.checkNotNullExpressionValue(component1, "selectedGuildId");
         long longValue = component1.longValue();
-        if (maybeChannel != null && AnimatableValueParser.y1(maybeChannel)) {
-            j = maybeChannel.q();
+        if (maybeChannel != null && AnimatableValueParser.z1(maybeChannel)) {
+            j = maybeChannel.r();
         } else if (maybeChannel != null) {
-            j = maybeChannel.g();
+            j = maybeChannel.h();
         } else {
             l = null;
-            return ObservableWithLeadingEdgeThrottle.combineLatest(observeMe$default, observeAllPresences, observeSelectedVoiceChannelId, observeTotalMentions, observe, threadsActive.observeActiveThreadsForChannel(longValue, l), WidgetHomeModel.Companion.getParentChannelObservable(maybeChannel), new CreateThreadsFeatureFlag(null, 1, null).observeEnabled(component1.longValue()), new AnonymousClass1(maybeChannel, resolvedSelectedChannel), 350, TimeUnit.MILLISECONDS);
+            return ObservableWithLeadingEdgeThrottle.combineLatest(observeMe$default, observeAllPresences, observeSelectedVoiceChannelId, observeTotalMentions, observe, threadsActive.observeActiveThreadsForChannel(longValue, l), WidgetHomeModel.Companion.getParentChannelObservable(maybeChannel), new CreateThreadsFeatureFlag(null, null, 3, null).observeEnabled(component1.longValue()), new AnonymousClass1(maybeChannel, resolvedSelectedChannel), 350, TimeUnit.MILLISECONDS);
         }
         l = Long.valueOf(j);
-        return ObservableWithLeadingEdgeThrottle.combineLatest(observeMe$default, observeAllPresences, observeSelectedVoiceChannelId, observeTotalMentions, observe, threadsActive.observeActiveThreadsForChannel(longValue, l), WidgetHomeModel.Companion.getParentChannelObservable(maybeChannel), new CreateThreadsFeatureFlag(null, 1, null).observeEnabled(component1.longValue()), new AnonymousClass1(maybeChannel, resolvedSelectedChannel), 350, TimeUnit.MILLISECONDS);
+        return ObservableWithLeadingEdgeThrottle.combineLatest(observeMe$default, observeAllPresences, observeSelectedVoiceChannelId, observeTotalMentions, observe, threadsActive.observeActiveThreadsForChannel(longValue, l), WidgetHomeModel.Companion.getParentChannelObservable(maybeChannel), new CreateThreadsFeatureFlag(null, null, 3, null).observeEnabled(component1.longValue()), new AnonymousClass1(maybeChannel, resolvedSelectedChannel), 350, TimeUnit.MILLISECONDS);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java
index 062120d0d7..48b783d663 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeModel.java
@@ -39,11 +39,11 @@ public final class WidgetHomeModel {
 
         public final Observable<WidgetHomeModel> get() {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable Z = Observable.j(companion.getGuildSelected().observeSelectedGuildId(), companion.getChannelsSelected().observeResolvedSelectedChannel(), WidgetHomeModel$Companion$get$1.INSTANCE).Z(WidgetHomeModel$Companion$get$2.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "Observable.combineLatest…            )\n          }");
-            Observable<WidgetHomeModel> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-            m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-            return s2;
+            Observable Y = Observable.j(companion.getGuildSelected().observeSelectedGuildId(), companion.getChannelsSelected().observeResolvedSelectedChannel(), WidgetHomeModel$Companion$get$1.INSTANCE).Y(WidgetHomeModel$Companion$get$2.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "Observable.combineLatest…            )\n          }");
+            Observable<WidgetHomeModel> r = ObservableExtensionsKt.computationLatest(Y).r();
+            m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+            return r;
         }
 
         public final Observable<Boolean> getInitialized() {
@@ -53,9 +53,9 @@ public final class WidgetHomeModel {
         }
 
         public final Observable<Channel> getParentChannelObservable(Channel channel) {
-            if (channel == null || AnimatableValueParser.y1(channel)) {
-                if ((channel != null ? Long.valueOf(channel.q()) : null) != null) {
-                    return StoreStream.Companion.getChannels().observeChannel(channel.q());
+            if (channel == null || AnimatableValueParser.z1(channel)) {
+                if ((channel != null ? Long.valueOf(channel.r()) : null) != null) {
+                    return StoreStream.Companion.getChannels().observeChannel(channel.r());
                 }
             }
             j jVar = new j(null);
@@ -77,7 +77,7 @@ public final class WidgetHomeModel {
         this.threadExperimentEnabled = z4;
         this.channel = resolvedSelectedChannel.getMaybeChannel();
         Channel maybeChannel = resolvedSelectedChannel.getMaybeChannel();
-        this.channelId = maybeChannel != null ? maybeChannel.g() : 0;
+        this.channelId = maybeChannel != null ? maybeChannel.h() : 0;
     }
 
     public static /* synthetic */ WidgetHomeModel copy$default(WidgetHomeModel widgetHomeModel, StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel, Channel channel, Presence presence, int i, boolean z2, boolean z3, NsfwAllowance nsfwAllowance, int i2, boolean z4, int i3, Object obj) {
@@ -215,7 +215,7 @@ public final class WidgetHomeModel {
 
     public final boolean isChannelNsfw() {
         Channel channel = this.channel;
-        return channel != null && channel.n();
+        return channel != null && channel.o();
     }
 
     public final boolean isFriend() {
@@ -223,7 +223,7 @@ public final class WidgetHomeModel {
     }
 
     public final boolean isNsfwUnConsented() {
-        return this.channel != null && !StoreStream.Companion.getGuildsNsfw().isGuildNsfwGateAgreed(this.channel.e());
+        return this.channel != null && !StoreStream.Companion.getGuildsNsfw().isGuildNsfwGateAgreed(this.channel.f());
     }
 
     public String toString() {
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelLoading.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelLoading.java
index c0fcaeaea1..dbee352d15 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelLoading.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelLoading.java
@@ -5,8 +5,8 @@ import android.content.res.Resources;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import c.a.i.q4;
 import c.a.i.t4;
+import c.a.i.w4;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetHomeBinding;
 import com.discord.stores.StoreStream;
@@ -63,43 +63,43 @@ public final class WidgetHomePanelLoading {
     }
 
     private final void setLoadingPanelVisibility(boolean z2, boolean z3) {
-        t4 t4Var = this.binding.b;
-        m.checkNotNullExpressionValue(t4Var, "binding.loading");
-        FrameLayout frameLayout = t4Var.a;
+        w4 w4Var = this.binding.b;
+        m.checkNotNullExpressionValue(w4Var, "binding.loading");
+        FrameLayout frameLayout = w4Var.a;
         m.checkNotNullExpressionValue(frameLayout, "binding.loading.root");
         if ((frameLayout.getVisibility() == 0) || !z2) {
             panelInitialized = z2;
             if (z2) {
                 if (z3) {
-                    t4 t4Var2 = this.binding.b;
-                    m.checkNotNullExpressionValue(t4Var2, "binding.loading");
-                    ViewExtensions.fadeOut$default(t4Var2.a, 0, null, null, 7, null);
-                    q4 q4Var = this.binding.d;
-                    m.checkNotNullExpressionValue(q4Var, "binding.panelCenter");
-                    ViewExtensions.fadeIn$default(q4Var.a, 0, null, null, null, 15, null);
+                    w4 w4Var2 = this.binding.b;
+                    m.checkNotNullExpressionValue(w4Var2, "binding.loading");
+                    ViewExtensions.fadeOut$default(w4Var2.a, 0, null, null, 7, null);
+                    t4 t4Var = this.binding.d;
+                    m.checkNotNullExpressionValue(t4Var, "binding.panelCenter");
+                    ViewExtensions.fadeIn$default(t4Var.a, 0, null, null, null, 15, null);
                 } else {
-                    t4 t4Var3 = this.binding.b;
-                    m.checkNotNullExpressionValue(t4Var3, "binding.loading");
-                    FrameLayout frameLayout2 = t4Var3.a;
+                    w4 w4Var3 = this.binding.b;
+                    m.checkNotNullExpressionValue(w4Var3, "binding.loading");
+                    FrameLayout frameLayout2 = w4Var3.a;
                     m.checkNotNullExpressionValue(frameLayout2, "binding.loading.root");
                     frameLayout2.setVisibility(8);
-                    q4 q4Var2 = this.binding.d;
-                    m.checkNotNullExpressionValue(q4Var2, "binding.panelCenter");
-                    RoundedRelativeLayout roundedRelativeLayout = q4Var2.a;
+                    t4 t4Var2 = this.binding.d;
+                    m.checkNotNullExpressionValue(t4Var2, "binding.panelCenter");
+                    RoundedRelativeLayout roundedRelativeLayout = t4Var2.a;
                     m.checkNotNullExpressionValue(roundedRelativeLayout, "binding.panelCenter.root");
                     roundedRelativeLayout.setVisibility(0);
                 }
                 StoreStream.Companion.getAnalytics().appUiViewed(WidgetHome.class);
                 return;
             }
-            q4 q4Var3 = this.binding.d;
-            m.checkNotNullExpressionValue(q4Var3, "binding.panelCenter");
-            RoundedRelativeLayout roundedRelativeLayout2 = q4Var3.a;
+            t4 t4Var3 = this.binding.d;
+            m.checkNotNullExpressionValue(t4Var3, "binding.panelCenter");
+            RoundedRelativeLayout roundedRelativeLayout2 = t4Var3.a;
             m.checkNotNullExpressionValue(roundedRelativeLayout2, "binding.panelCenter.root");
             roundedRelativeLayout2.setVisibility(8);
-            t4 t4Var4 = this.binding.b;
-            m.checkNotNullExpressionValue(t4Var4, "binding.loading");
-            FrameLayout frameLayout3 = t4Var4.a;
+            w4 w4Var4 = this.binding.b;
+            m.checkNotNullExpressionValue(w4Var4, "binding.loading");
+            FrameLayout frameLayout3 = w4Var4.a;
             m.checkNotNullExpressionValue(frameLayout3, "binding.loading.root");
             frameLayout3.setVisibility(0);
         }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.java
index ff71e465db..8ef774eb2f 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$1.java
@@ -17,6 +17,6 @@ public final class WidgetHomePanelNsfw$configureUI$1 implements View.OnClickList
     public final void onClick(View view) {
         StoreGuildsNsfw access$getGuildsNsfwStore$p = WidgetHomePanelNsfw.access$getGuildsNsfwStore$p(this.this$0);
         Channel channel = this.$model.getChannel();
-        access$getGuildsNsfwStore$p.deny(channel != null ? channel.e() : 0);
+        access$getGuildsNsfwStore$p.deny(channel != null ? channel.f() : 0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.java
index 33384f524f..59d73706aa 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw$configureUI$2.java
@@ -17,7 +17,7 @@ public final class WidgetHomePanelNsfw$configureUI$2 implements View.OnClickList
     public final void onClick(View view) {
         StoreGuildsNsfw access$getGuildsNsfwStore$p = WidgetHomePanelNsfw.access$getGuildsNsfwStore$p(this.this$0);
         Channel channel = this.$model.getChannel();
-        access$getGuildsNsfwStore$p.allow(channel != null ? channel.e() : 0);
+        access$getGuildsNsfwStore$p.allow(channel != null ? channel.f() : 0);
         WidgetHomePanelNsfw.access$setContainerViewHidden(this.this$0, true);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
index 42bdb2d938..40384a67f1 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java
@@ -83,7 +83,7 @@ public final class WidgetHomePanelNsfw {
         FragmentManager fragmentManager = this.fragmentManager.get();
         if (fragmentManager != null) {
             m.checkNotNullExpressionValue(fragmentManager, "fragmentManager.get() ?: return");
-            Fragment findFragmentById = fragmentManager.findFragmentById(2131365595);
+            Fragment findFragmentById = fragmentManager.findFragmentById(2131365656);
             if (findFragmentById != null) {
                 m.checkNotNullExpressionValue(findFragmentById, "fragmentManager.findFrag…dget_chat_list) ?: return");
                 FragmentTransaction beginTransaction = fragmentManager.beginTransaction();
@@ -132,31 +132,31 @@ public final class WidgetHomePanelNsfw {
         View inflate;
         boolean z4 = nsfwAllowance == NsfwAllowance.DISALLOWED;
         if (!z2 || (!z3 && !z4)) {
-            Observable<Long> e02 = Observable.e0(500, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable.timer(HIDE_DE…S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this.appComponent, null, 2, null), WidgetHomePanelNsfw.class, (Context) null, new WidgetHomePanelNsfw$toggleContainerVisibility$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetHomePanelNsfw$toggleContainerVisibility$3(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(HIDE_DE…S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this.appComponent, null, 2, null), WidgetHomePanelNsfw.class, (Context) null, new WidgetHomePanelNsfw$toggleContainerVisibility$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetHomePanelNsfw$toggleContainerVisibility$3(this), 58, (Object) null);
             return;
         }
         ViewStub viewStub = this.stub;
         if (!(viewStub == null || (inflate = viewStub.inflate()) == null)) {
             this.stub = null;
-            int i = 2131363516;
-            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363516);
+            int i = 2131363557;
+            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363557);
             if (linearLayout != null) {
-                i = 2131363517;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131363517);
+                i = 2131363558;
+                ImageView imageView2 = (ImageView) inflate.findViewById(2131363558);
                 if (imageView2 != null) {
-                    i = 2131363518;
-                    MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131363518);
+                    i = 2131363559;
+                    MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131363559);
                     if (materialButton3 != null) {
-                        i = 2131363519;
-                        MaterialButton materialButton4 = (MaterialButton) inflate.findViewById(2131363519);
+                        i = 2131363560;
+                        MaterialButton materialButton4 = (MaterialButton) inflate.findViewById(2131363560);
                         if (materialButton4 != null) {
-                            i = 2131363520;
-                            LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363520);
+                            i = 2131363561;
+                            LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363561);
                             if (linkifiedTextView3 != null) {
-                                i = 2131363521;
-                                TextView textView2 = (TextView) inflate.findViewById(2131363521);
+                                i = 2131363562;
+                                TextView textView2 = (TextView) inflate.findViewById(2131363562);
                                 if (textView2 != null) {
                                     this.binding = new WidgetHomePanelCenterNsfwBinding((LinearLayout) inflate, linearLayout, imageView2, materialButton3, materialButton4, linkifiedTextView3, textView2);
                                     ViewCompat.setOnApplyWindowInsetsListener(inflate, WidgetHomePanelNsfw$toggleContainerVisibility$1$1.INSTANCE);
@@ -171,29 +171,29 @@ public final class WidgetHomePanelNsfw {
         }
         if (z4) {
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding = this.binding;
-            if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f1821c) == null)) {
+            if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f1823c) == null)) {
                 ViewKt.setVisible(materialButton2, false);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding2 == null || (imageView = widgetHomePanelCenterNsfwBinding2.b) == null)) {
-                imageView.setImageResource(2131232105);
+                imageView.setImageResource(2131232113);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding3 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding3 == null || (materialButton = widgetHomePanelCenterNsfwBinding3.d) == null)) {
-                b.n(materialButton, 2131886808, new Object[0], null, 4);
+                b.m(materialButton, 2131886808, new Object[0], null, 4);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding4 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding4 == null || (textView = widgetHomePanelCenterNsfwBinding4.f) == null)) {
-                b.n(textView, 2131886326, new Object[0], null, 4);
+                b.m(textView, 2131886326, new Object[0], null, 4);
             }
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding5 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding5 == null || (linkifiedTextView2 = widgetHomePanelCenterNsfwBinding5.e) == null)) {
-                b.n(linkifiedTextView2, 2131886325, new Object[]{f.a.a(115000084051L, "h_5206f3f2-0ee4-4380-b50a-25319e45bc7c")}, null, 4);
+                b.m(linkifiedTextView2, 2131886325, new Object[]{f.a.a(115000084051L, "h_5206f3f2-0ee4-4380-b50a-25319e45bc7c")}, null, 4);
             }
         } else {
             WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding6 = this.binding;
             if (!(widgetHomePanelCenterNsfwBinding6 == null || (linkifiedTextView = widgetHomePanelCenterNsfwBinding6.e) == null)) {
-                b.n(linkifiedTextView, 2131886324, new Object[0], null, 4);
+                b.m(linkifiedTextView, 2131886324, new Object[0], null, 4);
             }
         }
         setContainerViewHidden(false);
@@ -214,7 +214,7 @@ public final class WidgetHomePanelNsfw {
             materialButton2.setOnClickListener(new WidgetHomePanelNsfw$configureUI$1(this, widgetHomeModel));
         }
         WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding;
-        if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f1821c) != null) {
+        if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f1823c) != null) {
             materialButton.setOnClickListener(new WidgetHomePanelNsfw$configureUI$2(this, widgetHomeModel));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java
index 045293e7d3..6715f4336b 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel$Companion$observeStoreState$1.java
@@ -2,18 +2,28 @@ package com.discord.widgets.home;
 
 import com.discord.models.user.MeUser;
 import com.discord.panels.PanelState;
+import com.discord.stores.StoreChannelsSelected;
 import com.discord.widgets.home.WidgetHomeViewModel;
 import d0.z.d.m;
-import rx.functions.Func4;
+import rx.functions.Func5;
 /* compiled from: WidgetHomeViewModel.kt */
-public final class WidgetHomeViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, R> implements Func4<PanelState, PanelState, WidgetHomeViewModel.GuildInfo, MeUser, WidgetHomeViewModel.StoreState> {
+public final class WidgetHomeViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, T5, R> implements Func5<PanelState, PanelState, WidgetHomeViewModel.GuildInfo, MeUser, StoreChannelsSelected.ResolvedSelectedChannel, WidgetHomeViewModel.StoreState> {
     public static final WidgetHomeViewModel$Companion$observeStoreState$1 INSTANCE = new WidgetHomeViewModel$Companion$observeStoreState$1();
 
-    public final WidgetHomeViewModel.StoreState call(PanelState panelState, PanelState panelState2, WidgetHomeViewModel.GuildInfo guildInfo, MeUser meUser) {
+    public final WidgetHomeViewModel.StoreState call(PanelState panelState, PanelState panelState2, WidgetHomeViewModel.GuildInfo guildInfo, MeUser meUser, StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel) {
+        Long l = null;
+        if (!(resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel)) {
+            resolvedSelectedChannel = null;
+        }
+        StoreChannelsSelected.ResolvedSelectedChannel.Channel channel = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel;
+        if (channel != null) {
+            l = channel.getPeekParent();
+        }
+        boolean z2 = l != null;
         m.checkNotNullExpressionValue(panelState, "leftPanelState");
         m.checkNotNullExpressionValue(panelState2, "rightPanelState");
         m.checkNotNullExpressionValue(guildInfo, "guildInfo");
         m.checkNotNullExpressionValue(meUser, "me");
-        return new WidgetHomeViewModel.StoreState(panelState, panelState2, guildInfo, meUser);
+        return new WidgetHomeViewModel.StoreState(panelState, panelState2, guildInfo, meUser, z2);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
index 357906da93..36871032e0 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java
@@ -7,6 +7,7 @@ import c.d.b.a.a;
 import com.discord.app.AppViewModel;
 import com.discord.models.user.MeUser;
 import com.discord.panels.PanelState;
+import com.discord.stores.StoreChannelsSelected;
 import com.discord.stores.StoreGuildSelected;
 import com.discord.stores.StoreGuildWelcomeScreens;
 import com.discord.stores.StoreLurking;
@@ -35,6 +36,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     private PanelState previousLeftPanelState;
     private final StoreGuildWelcomeScreens storeGuildWelcomeScreens;
     private final StoreNavigation storeNavigation;
+    private boolean wasThreadPeek;
     private WidgetHomeModel widgetHomeModel;
 
     /* compiled from: WidgetHomeViewModel.kt */
@@ -97,20 +99,38 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             this();
         }
 
-        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, StoreGuildSelected storeGuildSelected, StoreNavigation storeNavigation, StoreLurking storeLurking, StoreUser storeUser, StoreGuildWelcomeScreens storeGuildWelcomeScreens) {
-            return companion.observeStoreState(storeGuildSelected, storeNavigation, storeLurking, storeUser, storeGuildWelcomeScreens);
+        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, StoreGuildSelected storeGuildSelected, StoreNavigation storeNavigation, StoreLurking storeLurking, StoreUser storeUser, StoreGuildWelcomeScreens storeGuildWelcomeScreens, StoreChannelsSelected storeChannelsSelected) {
+            return companion.observeStoreState(storeGuildSelected, storeNavigation, storeLurking, storeUser, storeGuildWelcomeScreens, storeChannelsSelected);
         }
 
-        private final Observable<StoreState> observeStoreState(StoreGuildSelected storeGuildSelected, StoreNavigation storeNavigation, StoreLurking storeLurking, StoreUser storeUser, StoreGuildWelcomeScreens storeGuildWelcomeScreens) {
-            Observable<StoreState> h = Observable.h(storeNavigation.observeLeftPanelState(), storeNavigation.observeRightPanelState(), storeGuildSelected.observeSelectedGuildId().Z(new WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(storeLurking, storeGuildWelcomeScreens)), StoreUser.observeMe$default(storeUser, false, 1, null), WidgetHomeViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(h, "Observable.combineLatest…     me\n        )\n      }");
-            return h;
+        private final Observable<StoreState> observeStoreState(StoreGuildSelected storeGuildSelected, StoreNavigation storeNavigation, StoreLurking storeLurking, StoreUser storeUser, StoreGuildWelcomeScreens storeGuildWelcomeScreens, StoreChannelsSelected storeChannelsSelected) {
+            Observable<StoreState> g = Observable.g(storeNavigation.observeLeftPanelState(), storeNavigation.observeRightPanelState(), storeGuildSelected.observeSelectedGuildId().Y(new WidgetHomeViewModel$Companion$observeStoreState$guildInfoObservable$1(storeLurking, storeGuildWelcomeScreens)), StoreUser.observeMe$default(storeUser, false, 1, null), storeChannelsSelected.observeResolvedSelectedChannel(), WidgetHomeViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(g, "Observable.combineLatest…adPeek,\n        )\n      }");
+            return g;
         }
     }
 
     /* compiled from: WidgetHomeViewModel.kt */
     public static abstract class Event {
 
+        /* compiled from: WidgetHomeViewModel.kt */
+        public static final class AnimatePeekIn extends Event {
+            public static final AnimatePeekIn INSTANCE = new AnimatePeekIn();
+
+            private AnimatePeekIn() {
+                super(null);
+            }
+        }
+
+        /* compiled from: WidgetHomeViewModel.kt */
+        public static final class AnimatePeekOut extends Event {
+            public static final AnimatePeekOut INSTANCE = new AnimatePeekOut();
+
+            private AnimatePeekOut() {
+                super(null);
+            }
+        }
+
         /* compiled from: WidgetHomeViewModel.kt */
         public static final class ClosePanels extends Event {
             public static final ClosePanels INSTANCE = new ClosePanels();
@@ -292,13 +312,14 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
     /* compiled from: WidgetHomeViewModel.kt */
     public static final class StoreState {
         private final GuildInfo guildInfo;
+        private final boolean isThreadPeek;
         private final PanelState leftPanelState;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2138me;
+        private final MeUser f2144me;
         private final PanelState rightPanelState;
 
-        public StoreState(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser) {
+        public StoreState(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2) {
             m.checkNotNullParameter(panelState, "leftPanelState");
             m.checkNotNullParameter(panelState2, "rightPanelState");
             m.checkNotNullParameter(guildInfo, "guildInfo");
@@ -306,10 +327,11 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             this.leftPanelState = panelState;
             this.rightPanelState = panelState2;
             this.guildInfo = guildInfo;
-            this.f2138me = meUser;
+            this.f2144me = meUser;
+            this.isThreadPeek = z2;
         }
 
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, int i, Object obj) {
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2, int i, Object obj) {
             if ((i & 1) != 0) {
                 panelState = storeState.leftPanelState;
             }
@@ -320,9 +342,12 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
                 guildInfo = storeState.guildInfo;
             }
             if ((i & 8) != 0) {
-                meUser = storeState.f2138me;
+                meUser = storeState.f2144me;
             }
-            return storeState.copy(panelState, panelState2, guildInfo, meUser);
+            if ((i & 16) != 0) {
+                z2 = storeState.isThreadPeek;
+            }
+            return storeState.copy(panelState, panelState2, guildInfo, meUser, z2);
         }
 
         public final PanelState component1() {
@@ -338,15 +363,19 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser component4() {
-            return this.f2138me;
+            return this.f2144me;
         }
 
-        public final StoreState copy(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser) {
+        public final boolean component5() {
+            return this.isThreadPeek;
+        }
+
+        public final StoreState copy(PanelState panelState, PanelState panelState2, GuildInfo guildInfo, MeUser meUser, boolean z2) {
             m.checkNotNullParameter(panelState, "leftPanelState");
             m.checkNotNullParameter(panelState2, "rightPanelState");
             m.checkNotNullParameter(guildInfo, "guildInfo");
             m.checkNotNullParameter(meUser, "me");
-            return new StoreState(panelState, panelState2, guildInfo, meUser);
+            return new StoreState(panelState, panelState2, guildInfo, meUser, z2);
         }
 
         public boolean equals(Object obj) {
@@ -357,7 +386,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.leftPanelState, storeState.leftPanelState) && m.areEqual(this.rightPanelState, storeState.rightPanelState) && m.areEqual(this.guildInfo, storeState.guildInfo) && m.areEqual(this.f2138me, storeState.f2138me);
+            return m.areEqual(this.leftPanelState, storeState.leftPanelState) && m.areEqual(this.rightPanelState, storeState.rightPanelState) && m.areEqual(this.guildInfo, storeState.guildInfo) && m.areEqual(this.f2144me, storeState.f2144me) && this.isThreadPeek == storeState.isThreadPeek;
         }
 
         public final GuildInfo getGuildInfo() {
@@ -369,7 +398,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser getMe() {
-            return this.f2138me;
+            return this.f2144me;
         }
 
         public final PanelState getRightPanelState() {
@@ -384,11 +413,23 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             int hashCode2 = (hashCode + (panelState2 != null ? panelState2.hashCode() : 0)) * 31;
             GuildInfo guildInfo = this.guildInfo;
             int hashCode3 = (hashCode2 + (guildInfo != null ? guildInfo.hashCode() : 0)) * 31;
-            MeUser meUser = this.f2138me;
+            MeUser meUser = this.f2144me;
             if (meUser != null) {
                 i = meUser.hashCode();
             }
-            return hashCode3 + i;
+            int i2 = (hashCode3 + i) * 31;
+            boolean z2 = this.isThreadPeek;
+            if (z2) {
+                z2 = true;
+            }
+            int i3 = z2 ? 1 : 0;
+            int i4 = z2 ? 1 : 0;
+            int i5 = z2 ? 1 : 0;
+            return i2 + i3;
+        }
+
+        public final boolean isThreadPeek() {
+            return this.isThreadPeek;
         }
 
         public String toString() {
@@ -399,9 +440,9 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             L.append(", guildInfo=");
             L.append(this.guildInfo);
             L.append(", me=");
-            L.append(this.f2138me);
-            L.append(")");
-            return L.toString();
+            L.append(this.f2144me);
+            L.append(", isThreadPeek=");
+            return a.G(L, this.isThreadPeek, ")");
         }
     }
 
@@ -513,10 +554,10 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         this.storeGuildWelcomeScreens = storeGuildWelcomeScreens;
         this.channelOnboardingManager = channelOnboardingManager;
         this.clock = clock;
-        this.eventSubject = PublishSubject.l0();
-        Observable<StoreState> s2 = observable.s();
-        m.checkNotNullExpressionValue(s2, "storeStateObservable\n   …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetHomeViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        this.eventSubject = PublishSubject.k0();
+        Observable<StoreState> r = observable.r();
+        m.checkNotNullExpressionValue(r, "storeStateObservable\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetHomeViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable2, this, null, 2, null), WidgetHomeViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
@@ -528,7 +569,7 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         if ((i & 4) != 0) {
             Companion companion = Companion;
             StoreStream.Companion companion2 = StoreStream.Companion;
-            observable = Companion.access$observeStoreState(companion, companion2.getGuildSelected(), storeNavigation, companion2.getLurking(), companion2.getUsers(), storeGuildWelcomeScreens);
+            observable = Companion.access$observeStoreState(companion, companion2.getGuildSelected(), storeNavigation, companion2.getLurking(), companion2.getUsers(), storeGuildWelcomeScreens, companion2.getChannelsSelected());
         }
     }
 
@@ -540,6 +581,18 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
         widgetHomeViewModel.handleStoreState(storeState);
     }
 
+    @MainThread
+    private final void emitAnimatePeekIn() {
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        publishSubject.j.onNext(Event.AnimatePeekIn.INSTANCE);
+    }
+
+    @MainThread
+    private final void emitAnimatePeekOut() {
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        publishSubject.j.onNext(Event.AnimatePeekOut.INSTANCE);
+    }
+
     @MainThread
     private final void emitClosePanelsEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
@@ -596,6 +649,13 @@ public final class WidgetHomeViewModel extends AppViewModel<ViewState> {
             emitShowChannelOnboardingSheet();
         }
         this.previousLeftPanelState = leftPanelState;
+        if (storeState.isThreadPeek() && !this.wasThreadPeek) {
+            emitAnimatePeekIn();
+        }
+        if (!storeState.isThreadPeek() && this.wasThreadPeek) {
+            emitAnimatePeekOut();
+        }
+        this.wasThreadPeek = storeState.isThreadPeek();
     }
 
     private final boolean shouldShowChannelOnboardingSheet(PanelState panelState, PanelState panelState2, long j, boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java b/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java
index 162a0ab1f6..455989d867 100644
--- a/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java
+++ b/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java
@@ -88,12 +88,12 @@ public final class WidgetMainSurveyDialog extends AppDialog {
                 textView2.setText(string2);
                 MaterialButton materialButton = getBinding().b;
                 m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationCancel");
-                materialButton.setText(getString(2131891423));
+                materialButton.setText(getString(2131891494));
                 getBinding().b.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$1(this));
-                MaterialButton materialButton2 = getBinding().f1649c;
+                MaterialButton materialButton2 = getBinding().f1646c;
                 m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationConfirm");
-                materialButton2.setText(getString(2131891666));
-                getBinding().f1649c.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$2(this, string));
+                materialButton2.setText(getString(2131891735));
+                getBinding().f1646c.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$2(this, string));
                 AnalyticsTracker.INSTANCE.surveyViewed(string3);
                 return;
             }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java
index 90ea397f71..6464122311 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java
@@ -25,17 +25,17 @@ public final /* synthetic */ class WidgetMedia$binding$2 extends k implements Fu
         AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131361872);
         if (appBarLayout != null) {
             FrameLayout frameLayout = (FrameLayout) view;
-            i = 2131363817;
-            ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) view.findViewById(2131363817);
+            i = 2131363858;
+            ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) view.findViewById(2131363858);
             if (zoomableDraweeView != null) {
-                i = 2131363818;
-                ProgressBar progressBar = (ProgressBar) view.findViewById(2131363818);
+                i = 2131363859;
+                ProgressBar progressBar = (ProgressBar) view.findViewById(2131363859);
                 if (progressBar != null) {
-                    i = 2131363819;
-                    PlayerControlView playerControlView = (PlayerControlView) view.findViewById(2131363819);
+                    i = 2131363860;
+                    PlayerControlView playerControlView = (PlayerControlView) view.findViewById(2131363860);
                     if (playerControlView != null) {
-                        i = 2131363820;
-                        PlayerView playerView = (PlayerView) view.findViewById(2131363820);
+                        i = 2131363861;
+                        PlayerView playerView = (PlayerView) view.findViewById(2131363861);
                         if (playerView != null) {
                             return new WidgetMediaBinding(frameLayout, appBarLayout, frameLayout, zoomableDraweeView, progressBar, playerControlView, playerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
index bccb7c2fbf..e57dfd9e26 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java
@@ -53,7 +53,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
                     WidgetMedia widgetMedia = r0.this$0.this$0;
                     Context context = r0.$context;
                     m.checkNotNullExpressionValue(context, "context");
-                    c.a.d.o.j(widgetMedia, b.g(context, 2131888185, new Object[]{str}, null, 4), 0, 4);
+                    c.a.d.o.j(widgetMedia, b.g(context, 2131888184, new Object[]{str}, null, 4), 0, 4);
                 }
             }
         }
@@ -81,7 +81,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
                 m.checkNotNullParameter(th, "it");
                 if (this.this$0.this$0.this$0.isAdded()) {
                     WidgetMedia widgetMedia = this.this$0.this$0.this$0;
-                    c.a.d.o.j(widgetMedia, widgetMedia.getString(2131888184), 0, 4);
+                    c.a.d.o.j(widgetMedia, widgetMedia.getString(2131888183), 0, 4);
                 }
             }
         }
@@ -115,16 +115,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363893:
+            case 2131363934:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri, "sourceUri.toString()");
                 UriHandler.handleOrUntrusted$default(context, uri, null, 4, null);
                 return;
-            case 2131363894:
+            case 2131363935:
                 this.this$0.requestMediaDownload(new AnonymousClass1(this, context));
                 return;
-            case 2131363895:
+            case 2131363936:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri2 = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri2, "sourceUri.toString()");
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
index 90c217bd6a..46356ad0ea 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java
@@ -95,6 +95,7 @@ public final class WidgetMedia extends AppFragment {
                 int[] iArr2 = new int[11];
                 $EnumSwitchMapping$1 = iArr2;
                 iArr2[EmbedType.VIDEO.ordinal()] = 1;
+                iArr2[EmbedType.GIFV.ordinal()] = 2;
             }
         }
 
@@ -133,22 +134,23 @@ public final class WidgetMedia extends AppFragment {
             launch(context, a, c3, c2, c4, g, b, mediaType);
         }
 
-        /* JADX WARNING: Removed duplicated region for block: B:15:0x0041  */
-        /* JADX WARNING: Removed duplicated region for block: B:16:0x0044  */
-        /* JADX WARNING: Removed duplicated region for block: B:19:0x0051  */
-        /* JADX WARNING: Removed duplicated region for block: B:20:0x0055  */
+        /* JADX WARNING: Removed duplicated region for block: B:17:0x0044  */
+        /* JADX WARNING: Removed duplicated region for block: B:18:0x0047  */
+        /* JADX WARNING: Removed duplicated region for block: B:21:0x0054  */
         /* JADX WARNING: Removed duplicated region for block: B:22:0x0058  */
-        /* JADX WARNING: Removed duplicated region for block: B:23:0x005c  */
+        /* JADX WARNING: Removed duplicated region for block: B:24:0x005b  */
         /* JADX WARNING: Removed duplicated region for block: B:25:0x005f  */
+        /* JADX WARNING: Removed duplicated region for block: B:27:0x0062  */
         public final void launch(Context context, MessageEmbed messageEmbed) {
             String str;
             RenderableEmbedMedia previewImage;
+            int ordinal;
             String str2;
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(messageEmbed, "embed");
             EmbedType k = messageEmbed.k();
             Integer num = null;
-            if (k != null && k.ordinal() == 2) {
+            if (k != null && ((ordinal = k.ordinal()) == 2 || ordinal == 7)) {
                 EmbedVideo m = messageEmbed.m();
                 if (m == null || (str2 = m.b()) == null) {
                     EmbedVideo m2 = messageEmbed.m();
@@ -164,7 +166,7 @@ public final class WidgetMedia extends AppFragment {
                 String str3 = previewImage == null ? previewImage.a : null;
                 Integer num2 = previewImage == null ? previewImage.b : null;
                 if (previewImage != null) {
-                    num = previewImage.f2006c;
+                    num = previewImage.f2011c;
                 }
                 launch(context, j, l, str, str3, num2, num, mediaType);
             }
@@ -191,7 +193,7 @@ public final class WidgetMedia extends AppFragment {
     }
 
     public WidgetMedia() {
-        super(2131559078);
+        super(2131559084);
         WidgetMedia$viewModel$2 widgetMedia$viewModel$2 = WidgetMedia$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetMediaViewModel.class), new WidgetMedia$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMedia$viewModel$2));
@@ -397,9 +399,9 @@ public final class WidgetMedia extends AppFragment {
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            Observable<Long> e02 = Observable.e0(3000, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable.timer(SHOW_CO…S, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetMedia.class, (Context) null, new WidgetMedia$showControls$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$showControls$2(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(3000, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(SHOW_CO…S, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetMedia.class, (Context) null, new WidgetMedia$showControls$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$showControls$2(this), 58, (Object) null);
         } else {
             getBinding().f.c();
         }
@@ -464,7 +466,7 @@ public final class WidgetMedia extends AppFragment {
         if (videoSurfaceView != null) {
             videoSurfaceView.setOnClickListener(new WidgetMedia$onViewBound$1(this));
         }
-        getBinding().f1828c.setOnClickListener(new WidgetMedia$onViewBound$2(this));
+        getBinding().f1830c.setOnClickListener(new WidgetMedia$onViewBound$2(this));
         AppBarLayout appBarLayout = getBinding().b;
         m.checkNotNullExpressionValue(appBarLayout, "binding.actionBarToolbarLayout");
         ViewExtensions.addOnHeightChangedListener(appBarLayout, new WidgetMedia$onViewBound$3(this));
@@ -519,7 +521,7 @@ public final class WidgetMedia extends AppFragment {
             str = stringExtra;
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131894500);
+        setActionBarTitle(2131894619);
         setActionBarSubtitle(str);
         AppFragment.setActionBarOptionsMenu$default(this, 2131623956, new WidgetMedia$onViewBoundOrOnResume$1(this, parse, uri, stringExtra, str), null, 4, null);
         configureMediaImage();
@@ -556,9 +558,9 @@ public final class WidgetMedia extends AppFragment {
             if (appMediaPlayer4 == null) {
                 m.throwUninitializedPropertyAccessException("appMediaPlayer");
             }
-            Observable<AppMediaPlayer.Event> K = appMediaPlayer4.a.K();
-            m.checkNotNullExpressionValue(K, "eventSubject.onBackpressureBuffer()");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(K, this), WidgetMedia.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1(this), 62, (Object) null);
+            Observable<AppMediaPlayer.Event> J = appMediaPlayer4.a.J();
+            m.checkNotNullExpressionValue(J, "eventSubject.onBackpressureBuffer()");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(J, this), WidgetMedia.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetMedia$onViewBoundOrOnResume$$inlined$let$lambda$1(this), 62, (Object) null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java
index 3a8bb1fec9..744a414c8f 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetQRScanner$binding$2 extends k implement
 
     public final WidgetQrScannerBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364385;
-        ZXingScannerView zXingScannerView = (ZXingScannerView) view.findViewById(2131364385);
+        int i = 2131364423;
+        ZXingScannerView zXingScannerView = (ZXingScannerView) view.findViewById(2131364423);
         if (zXingScannerView != null) {
-            i = 2131364386;
-            Chip chip = (Chip) view.findViewById(2131364386);
+            i = 2131364424;
+            Chip chip = (Chip) view.findViewById(2131364424);
             if (chip != null) {
                 return new WidgetQrScannerBinding((FrameLayout) view, zXingScannerView, chip);
             }
diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
index 36cd7528f5..da40e8fcd1 100644
--- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
+++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java
@@ -61,7 +61,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
     }
 
     public WidgetQRScanner() {
-        super(2131559112);
+        super(2131559118);
     }
 
     public static final /* synthetic */ WidgetQrScannerBinding access$getBinding$p(WidgetQRScanner widgetQRScanner) {
@@ -96,7 +96,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
             IntentUtils intentUtils = IntentUtils.INSTANCE;
             m.checkNotNullExpressionValue(parse, "uri");
             if (!intentUtils.isDiscordAppUri(parse)) {
-                o.i(this, 2131892467, 0, 4);
+                o.i(this, 2131892546, 0, 4);
                 requireActivity().finish();
             }
             String path = parse.getPath();
@@ -140,9 +140,9 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
         int i = 0;
         ColorCompat.setStatusBarColor$default((Fragment) this, ColorCompat.getColor(this, 2131099689), false, 4, (Object) null);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131890884);
+        setActionBarTitle(2131890954);
         boolean booleanExtra = getMostRecentIntent().getBooleanExtra("SHOW_HELP_CHIP", false);
-        Chip chip = getBinding().f1849c;
+        Chip chip = getBinding().f1851c;
         m.checkNotNullExpressionValue(chip, "binding.qrScannerChip");
         if (!booleanExtra) {
             i = 8;
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java
index d0880daabe..9e312f6fba 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java
@@ -9,6 +9,7 @@ import c.a.l.b;
 import com.discord.api.report.ReportNodeBottomButton;
 import com.discord.databinding.ViewMobileReportsBottomButtonBinding;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.views.LoadingButton;
 import com.discord.widgets.mobile_reports.MobileReportsViewModel;
 import com.google.android.material.button.MaterialButton;
@@ -33,19 +34,19 @@ public final class MobileReportsBottomButton extends LinearLayout {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558763, this);
-        int i2 = 2131364417;
-        LoadingButton loadingButton = (LoadingButton) findViewById(2131364417);
+        int i2 = 2131364455;
+        LoadingButton loadingButton = (LoadingButton) findViewById(2131364455);
         if (loadingButton != null) {
-            i2 = 2131364418;
-            MaterialButton materialButton = (MaterialButton) findViewById(2131364418);
+            i2 = 2131364456;
+            MaterialButton materialButton = (MaterialButton) findViewById(2131364456);
             if (materialButton != null) {
-                i2 = 2131364419;
-                TextView textView = (TextView) findViewById(2131364419);
-                if (textView != null) {
-                    i2 = 2131364420;
-                    TextView textView2 = (TextView) findViewById(2131364420);
-                    if (textView2 != null) {
-                        ViewMobileReportsBottomButtonBinding viewMobileReportsBottomButtonBinding = new ViewMobileReportsBottomButtonBinding(this, loadingButton, materialButton, textView, textView2);
+                i2 = 2131364457;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById(2131364457);
+                if (linkifiedTextView != null) {
+                    i2 = 2131364458;
+                    TextView textView = (TextView) findViewById(2131364458);
+                    if (textView != null) {
+                        ViewMobileReportsBottomButtonBinding viewMobileReportsBottomButtonBinding = new ViewMobileReportsBottomButtonBinding(this, loadingButton, materialButton, linkifiedTextView, textView);
                         m.checkNotNullExpressionValue(viewMobileReportsBottomButtonBinding, "ViewMobileReportsBottomB…ater.from(context), this)");
                         this.binding = viewMobileReportsBottomButtonBinding;
                         return;
@@ -62,50 +63,50 @@ public final class MobileReportsBottomButton extends LinearLayout {
     }
 
     public final void setup(ReportNodeBottomButton reportNodeBottomButton, MobileReportsViewModel.SubmitState submitState, Function1<? super ReportNodeBottomButton, Unit> function1) {
-        this.binding.f1656c.setOnClickListener(null);
+        this.binding.f1653c.setOnClickListener(null);
         this.binding.b.setOnClickListener(null);
-        TextView textView = this.binding.d;
-        m.checkNotNullExpressionValue(textView, "binding.reportNodeBottomButtonDescription");
+        LinkifiedTextView linkifiedTextView = this.binding.d;
+        m.checkNotNullExpressionValue(linkifiedTextView, "binding.reportNodeBottomButtonDescription");
         boolean z2 = reportNodeBottomButton instanceof ReportNodeBottomButton.Submit;
         int i = 8;
-        textView.setVisibility(z2 ? 0 : 8);
-        MaterialButton materialButton = this.binding.f1656c;
+        linkifiedTextView.setVisibility(z2 ? 0 : 8);
+        MaterialButton materialButton = this.binding.f1653c;
         m.checkNotNullExpressionValue(materialButton, "binding.reportNodeBottomButtonCancel");
         boolean z3 = reportNodeBottomButton instanceof ReportNodeBottomButton.Cancel;
         materialButton.setVisibility(z3 ? 0 : 8);
         LoadingButton loadingButton = this.binding.b;
         m.checkNotNullExpressionValue(loadingButton, "binding.reportNodeBottomButton");
-        MaterialButton materialButton2 = this.binding.f1656c;
+        MaterialButton materialButton2 = this.binding.f1653c;
         m.checkNotNullExpressionValue(materialButton2, "binding.reportNodeBottomButtonCancel");
         loadingButton.setVisibility((materialButton2.getVisibility() == 0) ^ true ? 0 : 8);
         boolean z4 = submitState instanceof MobileReportsViewModel.SubmitState.Loading;
-        TextView textView2 = this.binding.e;
-        m.checkNotNullExpressionValue(textView2, "binding.reportNodeBottomButtonErrorText");
+        TextView textView = this.binding.e;
+        m.checkNotNullExpressionValue(textView, "binding.reportNodeBottomButtonErrorText");
         if (submitState instanceof MobileReportsViewModel.SubmitState.Error) {
             i = 0;
         }
-        textView2.setVisibility(i);
+        textView.setVisibility(i);
         this.binding.b.setIsLoading(z4);
         LoadingButton loadingButton2 = this.binding.b;
         m.checkNotNullExpressionValue(loadingButton2, "binding.reportNodeBottomButton");
         loadingButton2.setEnabled(!z4);
         if (z2) {
-            TextView textView3 = this.binding.d;
-            m.checkNotNullExpressionValue(textView3, "binding.reportNodeBottomButtonDescription");
+            LinkifiedTextView linkifiedTextView2 = this.binding.d;
+            m.checkNotNullExpressionValue(linkifiedTextView2, "binding.reportNodeBottomButtonDescription");
             Context context = getContext();
             m.checkNotNullExpressionValue(context, "context");
-            textView3.setText(b.g(context, 2131891230, new Object[0], null, 4));
-            this.binding.b.setText(getContext().getString(2131891231));
+            linkifiedTextView2.setText(b.g(context, 2131891301, new Object[0], null, 4));
+            this.binding.b.setText(getContext().getString(2131891302));
             this.binding.b.setBackgroundColor(ColorCompat.getColor(getContext(), 2131100311));
             this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$1(function1, reportNodeBottomButton));
         } else if (reportNodeBottomButton instanceof ReportNodeBottomButton.Done) {
-            this.binding.b.setText(getContext().getString(2131888176));
+            this.binding.b.setText(getContext().getString(2131888175));
             this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$2(function1, reportNodeBottomButton));
         } else if (reportNodeBottomButton instanceof ReportNodeBottomButton.Next) {
-            this.binding.b.setText(getContext().getString(2131891362));
+            this.binding.b.setText(getContext().getString(2131891433));
             this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$3(function1, reportNodeBottomButton));
         } else if (z3) {
-            this.binding.f1656c.setOnClickListener(new MobileReportsBottomButton$setup$4(function1, reportNodeBottomButton));
+            this.binding.f1653c.setOnClickListener(new MobileReportsBottomButton$setup$4(function1, reportNodeBottomButton));
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java
index 518dde094e..844a0c0d25 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java
@@ -56,11 +56,11 @@ public final class MobileReportsBreadcrumbs extends LinearLayout {
         ViewGroup viewGroup = (ViewGroup) view;
         View inflate = from.inflate(2131558765, viewGroup, false);
         viewGroup.addView(inflate);
-        int i = 2131364428;
-        View findViewById = inflate.findViewById(2131364428);
+        int i = 2131364466;
+        View findViewById = inflate.findViewById(2131364466);
         if (findViewById != null) {
-            i = 2131364429;
-            TextView textView = (TextView) inflate.findViewById(2131364429);
+            i = 2131364467;
+            TextView textView = (TextView) inflate.findViewById(2131364467);
             if (textView != null) {
                 ViewMobileReportsBreadcrumbsItemBinding viewMobileReportsBreadcrumbsItemBinding = new ViewMobileReportsBreadcrumbsItemBinding((ConstraintLayout) inflate, findViewById, textView);
                 m.checkNotNullExpressionValue(viewMobileReportsBreadcrumbsItemBinding, "ViewMobileReportsBreadcr…ach to parent */ true\n  )");
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java
index 5ea185a34c..97121041f7 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java
@@ -1,9 +1,9 @@
 package com.discord.widgets.mobile_reports;
 
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.stageinstance.StageInstance;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.widgets.mobile_reports.MobileReportsViewModel;
 import d0.z.d.m;
 import java.util.Map;
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
index 4904a79894..3fd40615f8 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java
@@ -3,7 +3,6 @@ package com.discord.widgets.mobile_reports;
 import android.content.Context;
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.report.MenuAPIResponse;
 import com.discord.api.report.NodeElementResult;
 import com.discord.api.report.NodeResult;
@@ -19,6 +18,7 @@ import com.discord.app.AppLog;
 import com.discord.app.AppViewModel;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
@@ -1459,8 +1459,8 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
             if (!(channel == null || (message = storeState.getMessage()) == null)) {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Map<Long, User> users = companion.getUsers().getUsers();
-                com.discord.api.user.User g = message.g();
-                User user = users.get(g != null ? Long.valueOf(g.i()) : null);
+                com.discord.api.user.User author = message.getAuthor();
+                User user = users.get(author != null ? Long.valueOf(author.i()) : null);
                 if (user == null || (getViewState() instanceof ViewState.Invalid)) {
                     return null;
                 }
@@ -1471,12 +1471,12 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
                 }
                 Map map3 = (Map) a.c(channel, companion.getGuilds().getRoles());
                 Map<Long, String> channelNames = companion.getChannels().getChannelNames();
-                Map<Long, String> nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map2, channel.m());
-                String k = message.k();
-                DraweeSpanStringBuilder parseChannelMessage = DiscordParser.parseChannelMessage(context, k != null ? new Regex("\n").replace(k, " ") : null, new MessageRenderContext(context, id2, false, nickOrUsernames, channelNames, map3, 0, null, null, 0, 0, null, null, null, 16320, null), new MessagePreprocessor(id2, null, null, false, 50, 6, null), DiscordParser.ParserOptions.REPLY, false);
-                com.discord.api.user.User g2 = message.g();
-                if (g2 != null) {
-                    l = Long.valueOf(g2.i());
+                Map<Long, String> nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map2, channel.n());
+                String content = message.getContent();
+                DraweeSpanStringBuilder parseChannelMessage = DiscordParser.parseChannelMessage(context, content != null ? new Regex("\n").replace(content, " ") : null, new MessageRenderContext(context, id2, false, nickOrUsernames, channelNames, map3, 0, null, null, 0, 0, null, null, null, 16320, null), new MessagePreprocessor(id2, null, null, false, 50, 6, null), DiscordParser.ParserOptions.REPLY, false);
+                com.discord.api.user.User author2 = message.getAuthor();
+                if (author2 != null) {
+                    l = Long.valueOf(author2.i());
                     map = nickOrUsernames;
                 } else {
                     map = nickOrUsernames;
@@ -1484,20 +1484,18 @@ public final class MobileReportsViewModel extends AppViewModel<ViewState> {
                 }
                 String str = map.get(l);
                 if (str == null) {
-                    com.discord.api.user.User g3 = message.g();
-                    str = g3 != null ? g3.r() : null;
+                    com.discord.api.user.User author3 = message.getAuthor();
+                    str = author3 != null ? author3.r() : null;
                 }
                 if (str == null) {
                     str = "";
                 }
                 GuildMember.Companion companion2 = GuildMember.Companion;
-                com.discord.api.user.User g4 = message.g();
-                if (g4 != null) {
-                    l2 = Long.valueOf(g4.i());
+                com.discord.api.user.User author4 = message.getAuthor();
+                if (author4 != null) {
+                    l2 = Long.valueOf(author4.i());
                 }
-                int color = companion2.getColor((GuildMember) map2.get(l2), ColorCompat.getThemedColor(context, 2130968932));
-                MessageUtils messageUtils = MessageUtils.INSTANCE;
-                return new MessagePreview(parseChannelMessage, str, color, user, messageUtils.hasEmbeds(message) || messageUtils.hasAttachments(message));
+                return new MessagePreview(parseChannelMessage, str, companion2.getColor((GuildMember) map2.get(l2), ColorCompat.getThemedColor(context, 2130968932)), user, message.hasEmbeds() || message.hasAttachments());
             }
         }
         return null;
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java b/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java
index 63e2788425..948b20a3f1 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java
@@ -12,10 +12,10 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.view.ViewGroupKt;
-import c.a.i.c2;
 import c.a.i.e2;
-import c.a.i.f2;
-import c.a.i.i4;
+import c.a.i.g2;
+import c.a.i.h2;
+import c.a.i.l4;
 import c.a.l.b;
 import com.discord.api.report.NodeResult;
 import com.discord.api.report.ReportNode;
@@ -140,9 +140,9 @@ public final class ReportsMenuNode extends ConstraintLayout {
         Context context;
         int i;
         MobileReportsViewModel.BlockUserElement blockUserElement = nodeState.getBlockUserElement();
-        c2 c2Var = this.binding.e;
-        m.checkNotNullExpressionValue(c2Var, "binding.mobileReportsNodeBlockUser");
-        LinearLayout linearLayout = c2Var.a;
+        e2 e2Var = this.binding.e;
+        m.checkNotNullExpressionValue(e2Var, "binding.mobileReportsNodeBlockUser");
+        LinearLayout linearLayout = e2Var.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.mobileReportsNodeBlockUser.root");
         int i2 = 0;
         if (!(blockUserElement != null)) {
@@ -158,11 +158,11 @@ public final class ReportsMenuNode extends ConstraintLayout {
             SimpleDraweeView simpleDraweeView = this.binding.e.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.mobileReportsNod…ileReportsBlockUserAvatar");
             IconUtils.setIcon$default(simpleDraweeView, user, 2131165296, null, null, null, 56, null);
-            this.binding.e.f73c.setOnClickListener(new ReportsMenuNode$setupBlockUser$1(this));
-            MaterialButton materialButton = this.binding.e.f73c;
+            this.binding.e.f84c.setOnClickListener(new ReportsMenuNode$setupBlockUser$1(this));
+            MaterialButton materialButton = this.binding.e.f84c;
             m.checkNotNullExpressionValue(materialButton, "binding.mobileReportsNod…ileReportsBlockUserButton");
             ViewExtensions.setEnabledAndAlpha(materialButton, !isBlocked, 0.5f);
-            MaterialButton materialButton2 = this.binding.e.f73c;
+            MaterialButton materialButton2 = this.binding.e.f84c;
             m.checkNotNullExpressionValue(materialButton2, "binding.mobileReportsNod…ileReportsBlockUserButton");
             if (isBlocked) {
                 context = getContext();
@@ -212,7 +212,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
             TextView textView = viewReportsMenuNodeBinding.b.b;
             m.checkNotNullExpressionValue(textView, "mobileReportsChannelPrev…ChannelPreviewChannelName");
             textView.setText(channelPreviewElement.getGuild().getName());
-            SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.b.f79c;
+            SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.b.f90c;
             m.checkNotNullExpressionValue(simpleDraweeView, "mobileReportsChannelPrev…eportsChannelPreviewImage");
             IconUtils.setIcon$default((ImageView) simpleDraweeView, channelPreviewElement.getGuild(), 2131165295, (MGImages.ChangeDetector) null, false, 24, (Object) null);
             MaterialCardView materialCardView = viewReportsMenuNodeBinding.h;
@@ -243,7 +243,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
                     linearLayout2.addView(inflate);
                     Objects.requireNonNull(inflate, "rootView");
                     CheckedSetting checkedSetting = (CheckedSetting) inflate;
-                    m.checkNotNullExpressionValue(new f2(checkedSetting), "checkbox");
+                    m.checkNotNullExpressionValue(new h2(checkedSetting), "checkbox");
                     checkedSetting.setText(reportNodeElementData.b());
                     m.checkNotNullExpressionValue(checkedSetting, "checkbox.root");
                     checkedSetting.setChecked(checkboxElement.getSelections().contains(reportNodeElementData));
@@ -268,14 +268,14 @@ public final class ReportsMenuNode extends ConstraintLayout {
                 LinearLayout linearLayout2 = this.binding.i;
                 View inflate = from.inflate(2131558767, (ViewGroup) linearLayout2, false);
                 linearLayout2.addView(inflate);
-                int i = 2131363935;
-                CardView cardView = (CardView) inflate.findViewById(2131363935);
+                int i = 2131363976;
+                CardView cardView = (CardView) inflate.findViewById(2131363976);
                 if (cardView != null) {
-                    i = 2131363936;
-                    TextView textView = (TextView) inflate.findViewById(2131363936);
+                    i = 2131363977;
+                    TextView textView = (TextView) inflate.findViewById(2131363977);
                     if (textView != null) {
                         FrameLayout frameLayout = (FrameLayout) inflate;
-                        m.checkNotNullExpressionValue(new e2(frameLayout, cardView, textView), "childView");
+                        m.checkNotNullExpressionValue(new g2(frameLayout, cardView, textView), "childView");
                         frameLayout.setOnClickListener(new ReportsMenuNode$setupChildren$$inlined$forEach$lambda$1(reportNodeChild, this));
                         m.checkNotNullExpressionValue(textView, "childView.mobileReportsChildMenuTitle");
                         textView.setText(reportNodeChild.a());
@@ -291,32 +291,32 @@ public final class ReportsMenuNode extends ConstraintLayout {
         ViewReportsMenuNodeBinding viewReportsMenuNodeBinding = this.binding;
         int i = 8;
         if (messagePreviewElement != null) {
-            TextView textView = viewReportsMenuNodeBinding.f1658c.e;
+            TextView textView = viewReportsMenuNodeBinding.f1655c.e;
             m.checkNotNullExpressionValue(textView, "mobileReportsMessagePrev…atListAdapterItemTextName");
             textView.setText(messagePreviewElement.getAuthorName());
-            viewReportsMenuNodeBinding.f1658c.e.setTextColor(messagePreviewElement.getAuthorNameColor());
-            SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.f1658c.d;
+            viewReportsMenuNodeBinding.f1655c.e.setTextColor(messagePreviewElement.getAuthorNameColor());
+            SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.f1655c.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "mobileReportsMessagePrev…ListAdapterItemTextAvatar");
             IconUtils.setIcon$default(simpleDraweeView, messagePreviewElement.getAuthor(), 2131165295, null, null, null, 56, null);
-            LinkifiedTextView linkifiedTextView = viewReportsMenuNodeBinding.f1658c.f106c;
+            LinkifiedTextView linkifiedTextView = viewReportsMenuNodeBinding.f1655c.f122c;
             m.checkNotNullExpressionValue(linkifiedTextView, "mobileReportsMessagePrev…w.chatListAdapterItemText");
             linkifiedTextView.setText(messagePreviewElement.getText());
-            ImageView imageView = viewReportsMenuNodeBinding.f1658c.b;
+            ImageView imageView = viewReportsMenuNodeBinding.f1655c.b;
             m.checkNotNullExpressionValue(imageView, "mobileReportsMessagePrev…terItemChatAttachmentIcon");
             if (messagePreviewElement.getHasEmbeds()) {
                 i = 0;
             }
             imageView.setVisibility(i);
-            i4 i4Var = viewReportsMenuNodeBinding.f1658c;
-            m.checkNotNullExpressionValue(i4Var, "mobileReportsMessagePreview");
-            ConstraintLayout constraintLayout = i4Var.a;
+            l4 l4Var = viewReportsMenuNodeBinding.f1655c;
+            m.checkNotNullExpressionValue(l4Var, "mobileReportsMessagePreview");
+            ConstraintLayout constraintLayout = l4Var.a;
             m.checkNotNullExpressionValue(constraintLayout, "mobileReportsMessagePreview.root");
             constraintLayout.setVisibility(0);
             return;
         }
-        i4 i4Var2 = viewReportsMenuNodeBinding.f1658c;
-        m.checkNotNullExpressionValue(i4Var2, "mobileReportsMessagePreview");
-        ConstraintLayout constraintLayout2 = i4Var2.a;
+        l4 l4Var2 = viewReportsMenuNodeBinding.f1655c;
+        m.checkNotNullExpressionValue(l4Var2, "mobileReportsMessagePreview");
+        ConstraintLayout constraintLayout2 = l4Var2.a;
         m.checkNotNullExpressionValue(constraintLayout2, "mobileReportsMessagePreview.root");
         constraintLayout2.setVisibility(8);
     }
@@ -339,7 +339,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
         linkifiedTextView.setVisibility(g != null ? 0 : 8);
         LinkifiedTextView linkifiedTextView2 = this.binding.m;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.mobileReportsNodeSubheader");
-        b.o(linkifiedTextView2, g, new Object[0], null, 4);
+        b.n(linkifiedTextView2, g, new Object[0], null, 4);
         String f = nodeState.getNode().f();
         MaterialCardView materialCardView = this.binding.k;
         m.checkNotNullExpressionValue(materialCardView, "binding.mobileReportsNodeInfoBox");
@@ -352,7 +352,7 @@ public final class ReportsMenuNode extends ConstraintLayout {
         materialCardView.setVisibility(i);
         TextView textView2 = this.binding.l;
         m.checkNotNullExpressionValue(textView2, "binding.mobileReportsNodeInfoText");
-        b.o(textView2, f, new Object[0], null, 4);
+        b.n(textView2, f, new Object[0], null, 4);
     }
 
     public final Function0<Unit> getHandleBlock() {
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java
index 975ed0777a..031e305211 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetMobileReports$binding$2 extends k imple
 
     public final WidgetMobileReportsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363901;
-        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363901);
+        int i = 2131363942;
+        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363942);
         if (frameLayout != null) {
-            i = 2131363950;
-            ProgressBar progressBar = (ProgressBar) view.findViewById(2131363950);
+            i = 2131363991;
+            ProgressBar progressBar = (ProgressBar) view.findViewById(2131363991);
             if (progressBar != null) {
                 return new WidgetMobileReportsBinding((CoordinatorLayout) view, frameLayout, progressBar);
             }
diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java
index 24375be035..9ae73b2833 100644
--- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java
+++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java
@@ -56,7 +56,7 @@ public final class WidgetMobileReports extends AppFragment {
     }
 
     public WidgetMobileReports() {
-        super(2131559089);
+        super(2131559095);
         WidgetMobileReports$viewModel$2 widgetMobileReports$viewModel$2 = new WidgetMobileReports$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(MobileReportsViewModel.class), new WidgetMobileReports$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMobileReports$viewModel$2));
@@ -80,7 +80,7 @@ public final class WidgetMobileReports extends AppFragment {
 
     private final void configureUI(MobileReportsViewModel.ViewState.Menu menu) {
         setActionBarDisplayHomeAsUpEnabled(!menu.shouldHideBackArrow());
-        ProgressBar progressBar = getBinding().f1833c;
+        ProgressBar progressBar = getBinding().f1835c;
         m.checkNotNullExpressionValue(progressBar, "binding.mobileReportsProgressBar");
         progressBar.setVisibility(8);
         ReportsMenuNode reportsMenuNode = (ReportsMenuNode) getBinding().b.getChildAt(0);
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java
index 3f9f221adf..95f61191ea 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java
@@ -15,23 +15,23 @@ public final class NoticePopup$enqueue$notice$1$3$2 implements Runnable {
 
     @Override // java.lang.Runnable
     public final void run() {
-        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f1839c;
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f1841c;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.popupBody");
         Layout layout = simpleDraweeSpanTextView.getLayout();
         int lineCount = layout != null ? layout.getLineCount() : 0;
-        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f1839c;
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f1841c;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.popupBody");
         if (lineCount > simpleDraweeSpanTextView2.getMaxLines()) {
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f1839c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f1841c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.popupBody");
             Layout layout2 = simpleDraweeSpanTextView3.getLayout();
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f1839c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f1841c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.popupBody");
             int lineEnd = layout2.getLineEnd(simpleDraweeSpanTextView4.getMaxLines() - 1);
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f1839c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f1841c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView5, "binding.popupBody");
             CharSequence subSequence = simpleDraweeSpanTextView5.getText().subSequence(0, lineEnd - 1);
-            SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f1839c;
+            SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f1841c;
             m.checkNotNullExpressionValue(simpleDraweeSpanTextView6, "binding.popupBody");
             simpleDraweeSpanTextView6.setText(new SpannableStringBuilder(subSequence).append((CharSequence) "…"));
         }
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java
index a7e51bc6f9..1d1007e1c3 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java
@@ -167,7 +167,7 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
             m.checkNotNullExpressionValue(decorView3, "it.decorView");
             Context context = decorView3.getContext();
             m.checkNotNullExpressionValue(context, "it.decorView.context");
-            bVar = new b(context, 2131559099, null, 0, 12);
+            bVar = new b(context, 2131559105, null, 0, 12);
         }
         iVar.b = bVar;
         int themedColor = ColorCompat.getThemedColor(fragmentActivity, 2130968907);
@@ -211,29 +211,29 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
         View layoutContainer = bVar10 != null ? bVar10.getLayoutContainer() : null;
         if (layoutContainer != null) {
             layoutContainer.setOnTouchListener(new NoticePopup$enqueue$notice$1$3$1(NoticePopup.access$getAutoDismissAnimator(NoticePopup.INSTANCE, this.$noticeAutoDismissPeriodSecs, new NoticePopup$enqueue$notice$1$$special$$inlined$also$lambda$1(this, fragmentActivity))));
-            int i3 = 2131364230;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) layoutContainer.findViewById(2131364230);
+            int i3 = 2131364274;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) layoutContainer.findViewById(2131364274);
             if (simpleDraweeView != null) {
-                i3 = 2131364231;
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) layoutContainer.findViewById(2131364231);
+                i3 = 2131364275;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) layoutContainer.findViewById(2131364275);
                 if (simpleDraweeSpanTextView != null) {
-                    i3 = 2131364232;
-                    ImageView imageView = (ImageView) layoutContainer.findViewById(2131364232);
+                    i3 = 2131364276;
+                    ImageView imageView = (ImageView) layoutContainer.findViewById(2131364276);
                     if (imageView != null) {
-                        i3 = 2131364233;
-                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) layoutContainer.findViewById(2131364233);
+                        i3 = 2131364277;
+                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) layoutContainer.findViewById(2131364277);
                         if (simpleDraweeView2 != null) {
-                            i3 = 2131364234;
-                            StickerView stickerView = (StickerView) layoutContainer.findViewById(2131364234);
+                            i3 = 2131364278;
+                            StickerView stickerView = (StickerView) layoutContainer.findViewById(2131364278);
                             if (stickerView != null) {
-                                i3 = 2131364235;
-                                TextView textView = (TextView) layoutContainer.findViewById(2131364235);
+                                i3 = 2131364279;
+                                TextView textView = (TextView) layoutContainer.findViewById(2131364279);
                                 if (textView != null) {
-                                    i3 = 2131364236;
-                                    TextView textView2 = (TextView) layoutContainer.findViewById(2131364236);
+                                    i3 = 2131364280;
+                                    TextView textView2 = (TextView) layoutContainer.findViewById(2131364280);
                                     if (textView2 != null) {
-                                        i3 = 2131364237;
-                                        RelativeLayout relativeLayout = (RelativeLayout) layoutContainer.findViewById(2131364237);
+                                        i3 = 2131364281;
+                                        RelativeLayout relativeLayout = (RelativeLayout) layoutContainer.findViewById(2131364281);
                                         if (relativeLayout != null) {
                                             WidgetNoticePopupBinding widgetNoticePopupBinding = new WidgetNoticePopupBinding((RelativeLayout) layoutContainer, simpleDraweeView, simpleDraweeSpanTextView, imageView, simpleDraweeView2, stickerView, textView, textView2, relativeLayout);
                                             m.checkNotNullExpressionValue(widgetNoticePopupBinding, "WidgetNoticePopupBinding.bind(view)");
@@ -307,7 +307,7 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1<F
             new Handler(Looper.getMainLooper()).post(new h(viewGroup, iVar));
         }
         b bVar11 = iVar.b;
-        View findViewById = bVar11 != null ? bVar11.findViewById(2131363763) : view;
+        View findViewById = bVar11 != null ? bVar11.findViewById(2131363804) : view;
         if (findViewById != null) {
             ViewCompat.setElevation(findViewById, fragmentActivity.getResources().getDimension(2131165279));
         }
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$createModel$onClickTopRightIcon$1.java b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$createModel$onClickTopRightIcon$1.java
index d3d81e8058..559d76d214 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$createModel$onClickTopRightIcon$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$createModel$onClickTopRightIcon$1.java
@@ -32,13 +32,13 @@ public final class NoticePopupChannel$createModel$onClickTopRightIcon$1 extends
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "it");
-        if (AnimatableValueParser.r1(this.$channel)) {
+        if (AnimatableValueParser.s1(this.$channel)) {
             return;
         }
-        if (AnimatableValueParser.y1(this.$channel)) {
-            WidgetThreadNotificationSettings.Companion.launch(this.$context, this.$channel.g(), true);
+        if (AnimatableValueParser.z1(this.$channel)) {
+            WidgetThreadNotificationSettings.Companion.launch(this.$context, this.$channel.h(), true);
         } else {
-            WidgetChannelNotificationSettings.Companion.launch(this.$context, this.$channel.g(), true);
+            WidgetChannelNotificationSettings.Companion.launch(this.$context, this.$channel.h(), true);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$enqueue$1.java b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$enqueue$1.java
index 945a86f24e..78d7fba7b9 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$enqueue$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel$enqueue$1.java
@@ -2,10 +2,10 @@ package com.discord.widgets.notice;
 
 import android.content.Context;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.User;
 import com.discord.widgets.notice.NoticePopupChannel;
 import d0.z.d.k;
@@ -15,7 +15,7 @@ import kotlin.jvm.functions.Function9;
 /* compiled from: NoticePopupChannel.kt */
 public final /* synthetic */ class NoticePopupChannel$enqueue$1 extends k implements Function9<Context, Message, Guild, Channel, Map<Long, ? extends GuildMember>, Long, User, Map<Long, ? extends String>, Map<Long, ? extends GuildRole>, NoticePopupChannel.Model> {
     public NoticePopupChannel$enqueue$1(NoticePopupChannel noticePopupChannel) {
-        super(9, noticePopupChannel, NoticePopupChannel.class, "createModel", "createModel(Landroid/content/Context;Lcom/discord/api/message/Message;Lcom/discord/models/guild/Guild;Lcom/discord/api/channel/Channel;Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/user/User;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/notice/NoticePopupChannel$Model;", 0);
+        super(9, noticePopupChannel, NoticePopupChannel.class, "createModel", "createModel(Landroid/content/Context;Lcom/discord/models/message/Message;Lcom/discord/models/guild/Guild;Lcom/discord/api/channel/Channel;Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/user/User;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/notice/NoticePopupChannel$Model;", 0);
     }
 
     public final NoticePopupChannel.Model invoke(Context context, Message message, Guild guild, Channel channel, Map<Long, GuildMember> map, Long l, User user, Map<Long, String> map2, Map<Long, GuildRole> map3) {
diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java
index 8c4a6f3b77..1053722f97 100644
--- a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java
+++ b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java
@@ -10,7 +10,6 @@ import androidx.core.content.ContextCompat;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.attachment.MessageAttachment;
 import com.discord.api.message.attachment.MessageAttachmentType;
 import com.discord.api.message.embed.MessageEmbed;
@@ -18,6 +17,7 @@ import com.discord.api.role.GuildRole;
 import com.discord.api.sticker.Sticker;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.models.user.CoreUser;
 import com.discord.models.user.User;
 import com.discord.simpleast.core.parser.Parser;
@@ -274,15 +274,15 @@ public final class NoticePopupChannel {
         MessageEmbed messageEmbed;
         boolean z2;
         if (channel != null) {
-            long g = channel.g();
-            if (l == null || l.longValue() != g) {
+            long h = channel.h();
+            if (l == null || l.longValue() != h) {
                 MessageRenderContext messageRenderContext = new MessageRenderContext(context, user.getId(), true, MessageUtils.getNickOrUsernames$default(message, channel, map, null, 8, null), map2, map3, 0, null, NoticePopupChannel$createModel$messageRenderContext$1.INSTANCE, ColorCompat.getThemedColor(context, 2130970180), 0, null, null, null, 15552, null);
-                String k = message.k();
-                if (k != null) {
+                String content = message.getContent();
+                if (content != null) {
                     z2 = false;
                     r1 = 0;
                     i = 0;
-                    draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), k, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext);
+                    draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), content, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext);
                 } else {
                     i = 0;
                     z2 = false;
@@ -291,15 +291,15 @@ public final class NoticePopupChannel {
                 r1 = z2;
                 String str4 = "";
                 if (t.isBlank(draweeSpanStringBuilder)) {
-                    List<MessageEmbed> m = message.m();
-                    String j = (m == null || (messageEmbed = (MessageEmbed) u.firstOrNull(m)) == null) ? r1 : messageEmbed.j();
+                    List<MessageEmbed> embeds = message.getEmbeds();
+                    String j = (embeds == null || (messageEmbed = (MessageEmbed) u.firstOrNull(embeds)) == null) ? r1 : messageEmbed.j();
                     if (j == null) {
                         j = str4;
                     }
                     draweeSpanStringBuilder.append((CharSequence) j);
                 }
-                long e = channel.e();
-                if (e == -1 || e == 0) {
+                long f = channel.f();
+                if (f == -1 || f == 0) {
                     pair = o.to(AnimatableValueParser.y0(channel), r1);
                 } else {
                     String name = guild != null ? guild.getName() : r1;
@@ -312,17 +312,17 @@ public final class NoticePopupChannel {
                 }
                 String str5 = (String) pair.component1();
                 String str6 = (String) pair.component2();
-                if (AnimatableValueParser.j1(channel)) {
+                if (AnimatableValueParser.k1(channel)) {
                     str = IconUtils.getForGuild$default(guild, "asset://asset/images/default_icon_selected.jpg", false, null, 12, null);
                     channel2 = channel;
                 } else {
                     channel2 = channel;
                     str = IconUtils.getForChannel$default(channel2, r1, 2, r1);
                 }
-                if (!AnimatableValueParser.g1(channel)) {
-                    com.discord.api.user.User g2 = message.g();
-                    m.checkNotNull(g2);
-                    CoreUser coreUser = new CoreUser(g2);
+                if (!AnimatableValueParser.h1(channel)) {
+                    com.discord.api.user.User author = message.getAuthor();
+                    m.checkNotNull(author);
+                    CoreUser coreUser = new CoreUser(author);
                     SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(a.u(GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, coreUser, map.get(Long.valueOf(coreUser.getId())), channel, null, 8, null), ": "));
                     context2 = context;
                     Object[] objArr = new Object[2];
@@ -335,15 +335,15 @@ public final class NoticePopupChannel {
                 } else {
                     context2 = context;
                 }
-                List<MessageAttachment> f = message.f();
-                MessageAttachment messageAttachment = f != null ? (MessageAttachment) u.firstOrNull((List<? extends Object>) f) : r1;
+                List<MessageAttachment> attachments = message.getAttachments();
+                MessageAttachment messageAttachment = attachments != null ? (MessageAttachment) u.firstOrNull((List<? extends Object>) attachments) : r1;
                 if (messageAttachment == null || !messageAttachment.h()) {
                     if ((messageAttachment != null ? messageAttachment.e() : r1) == MessageAttachmentType.IMAGE) {
                         str2 = messageAttachment.c();
                         str3 = r1;
                     } else if ((messageAttachment != null ? messageAttachment.e() : r1) == MessageAttachmentType.VIDEO) {
-                        Drawable drawable$default = DrawableCompat.getDrawable$default(context, 2131232301, ColorCompat.getThemedColor(context2, 2130968905), false, 4, null);
-                        drawable2 = DrawableCompat.getDrawable$default(context, 2131231849, ColorCompat.getThemedColor(context2, 2130968946), false, 4, null);
+                        Drawable drawable$default = DrawableCompat.getDrawable$default(context, 2131232311, ColorCompat.getThemedColor(context2, 2130968905), false, 4, null);
+                        drawable2 = DrawableCompat.getDrawable$default(context, 2131231857, ColorCompat.getThemedColor(context2, 2130968946), false, 4, null);
                         str2 = r1;
                         drawable = drawable$default;
                     } else {
@@ -357,7 +357,7 @@ public final class NoticePopupChannel {
                     str2 = r1;
                     drawable = str2;
                 }
-                return new Model(str5, str6, draweeSpanStringBuilder, str, drawable, str2, drawable2, ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, AnimatableValueParser.r1(channel) ? 2130969393 : 2130969449, i, 2, (Object) r1)), new NoticePopupChannel$createModel$onClickTopRightIcon$1(channel2, context2), message.I());
+                return new Model(str5, str6, draweeSpanStringBuilder, str, drawable, str2, drawable2, ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, AnimatableValueParser.s1(channel) ? 2130969393 : 2130969449, i, 2, (Object) r1)), new NoticePopupChannel$createModel$onClickTopRightIcon$1(channel2, context2), message.getStickers());
             }
         }
         return null;
@@ -371,19 +371,19 @@ public final class NoticePopupChannel {
         j jVar = new j(context);
         j jVar2 = new j(message);
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable<Guild> observeFromChannelId = companion.getGuilds().observeFromChannelId(message.i());
-        Observable<Channel> observeChannel = companion.getChannels().observeChannel(message.i());
+        Observable<Guild> observeFromChannelId = companion.getGuilds().observeFromChannelId(message.getChannelId());
+        Observable<Channel> observeChannel = companion.getChannels().observeChannel(message.getChannelId());
         StoreGuilds guilds = companion.getGuilds();
-        Long o = message.o();
+        Long guildId = message.getGuildId();
         long j = 0;
-        Observable<Map<Long, GuildMember>> observeComputed = guilds.observeComputed(o != null ? o.longValue() : 0);
+        Observable<Map<Long, GuildMember>> observeComputed = guilds.observeComputed(guildId != null ? guildId.longValue() : 0);
         Observable<Long> observeId = companion.getChannelsSelected().observeId();
         Observable observeMe$default = StoreUser.observeMe$default(companion.getUsers(), false, 1, null);
         Observable<Map<Long, String>> observeNames = companion.getChannels().observeNames();
         StoreGuilds guilds2 = companion.getGuilds();
-        Long o2 = message.o();
-        if (o2 != null) {
-            j = o2.longValue();
+        Long guildId2 = message.getGuildId();
+        if (guildId2 != null) {
+            j = guildId2.longValue();
         }
         Observable c2 = Observable.c(jVar, jVar2, observeFromChannelId, observeChannel, observeComputed, observeId, observeMe$default, observeNames, guilds2.observeRoles(j), new NoticePopupChannel$sam$rx_functions_Func9$0(new NoticePopupChannel$enqueue$1(this)));
         m.checkNotNullExpressionValue(c2, "Observable\n        .comb…is::createModel\n        )");
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java
index d2bafee6c0..6eea4997ac 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java
@@ -32,7 +32,7 @@ public final class WidgetNoticeDialog$Companion$showInputModal$1 extends o imple
         Function2 function2 = this.$onOKClicked;
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "view.context");
-        View findViewById = view.findViewById(2131365493);
+        View findViewById = view.findViewById(2131365554);
         m.checkNotNullExpressionValue(findViewById, "view.findViewById<TextIn…tLayout>(R.id.view_input)");
         function2.invoke(context, ViewExtensions.getTextOrEmpty((TextInputLayout) findViewById));
     }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java
index 2b124dbcae..8d16c4558a 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java
@@ -26,7 +26,7 @@ public final class WidgetNoticeDialog$Companion$showInputModal$3 extends o imple
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        View findViewById = view.findViewById(2131365493);
+        View findViewById = view.findViewById(2131365554);
         m.checkNotNullExpressionValue(findViewById, "view.findViewById<TextIn…tLayout>(R.id.view_input)");
         ((TextInputLayout) findViewById).setHint(this.$hintText);
     }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java
index 9e93e28562..b8061773dd 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java
@@ -19,23 +19,23 @@ public final /* synthetic */ class WidgetNoticeDialog$binding$2 extends k implem
 
     public final WidgetNoticeDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364025;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364025);
+        int i = 2131364068;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364068);
         if (linearLayout != null) {
-            i = 2131364026;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364026);
+            i = 2131364069;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364069);
             if (linkifiedTextView != null) {
-                i = 2131364027;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364027);
+                i = 2131364070;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364070);
                 if (materialButton != null) {
-                    i = 2131364029;
-                    TextView textView = (TextView) view.findViewById(2131364029);
+                    i = 2131364072;
+                    TextView textView = (TextView) view.findViewById(2131364072);
                     if (textView != null) {
-                        i = 2131364030;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364030);
+                        i = 2131364073;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364073);
                         if (linearLayout2 != null) {
-                            i = 2131364032;
-                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364032);
+                            i = 2131364075;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364075);
                             if (materialButton2 != null) {
                                 return new WidgetNoticeDialogBinding((LinearLayout) view, linearLayout, linkifiedTextView, materialButton, textView, linearLayout2, materialButton2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
index 605218b153..9d5d84b905 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java
@@ -59,9 +59,9 @@ public final class WidgetNoticeDialog extends AppDialog {
     private static final String ARG_OK_TEXT = "ok_text";
     private static final String ARG_STACK_TRACE_CALLER_FRAME = "stack_trace_caller_frame";
     private static final String ARG_THEME_ID = "theme_id";
-    public static final int CANCEL_BUTTON = 2131364027;
+    public static final int CANCEL_BUTTON = 2131364070;
     public static final Companion Companion = new Companion(null);
-    public static final int OK_BUTTON = 2131364032;
+    public static final int OK_BUTTON = 2131364075;
     public static final int ON_SHOW = 0;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null);
     private Map<Integer, ? extends Function1<? super View, Unit>> listenerMap;
@@ -223,7 +223,7 @@ public final class WidgetNoticeDialog extends AppDialog {
 
         public final void show(FragmentManager fragmentManager) {
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
-            Companion.show$default(WidgetNoticeDialog.Companion, fragmentManager, this.title, this.message, this.confirmText, this.cancelText, h0.mapOf(o.to(2131364032, this.onConfirm), o.to(2131364027, this.onCancel)), null, null, null, this.themeId, null, null, 0, null, 15808, null);
+            Companion.show$default(WidgetNoticeDialog.Companion, fragmentManager, this.title, this.message, this.confirmText, this.cancelText, h0.mapOf(o.to(2131364075, this.onConfirm), o.to(2131364070, this.onCancel)), null, null, null, this.themeId, null, null, 0, null, 15808, null);
         }
     }
 
@@ -291,9 +291,9 @@ public final class WidgetNoticeDialog extends AppDialog {
             m.checkNotNullParameter(charSequence3, "hintText");
             m.checkNotNullParameter(function2, "onOKClicked");
             HashMap hashMap = new HashMap();
-            hashMap.put(2131364032, new WidgetNoticeDialog$Companion$showInputModal$1(function2));
+            hashMap.put(2131364075, new WidgetNoticeDialog$Companion$showInputModal$1(function2));
             if (function0 != null) {
-                hashMap.put(2131364027, new WidgetNoticeDialog$Companion$showInputModal$2(function0));
+                hashMap.put(2131364070, new WidgetNoticeDialog$Companion$showInputModal$2(function0));
             }
             hashMap.put(0, new WidgetNoticeDialog$Companion$showInputModal$3(charSequence3));
             FragmentManager supportFragmentManager = appActivity.getSupportFragmentManager();
@@ -303,7 +303,7 @@ public final class WidgetNoticeDialog extends AppDialog {
     }
 
     public WidgetNoticeDialog() {
-        super(2131559096);
+        super(2131559102);
     }
 
     private final WidgetNoticeDialogBinding getBinding() {
@@ -402,16 +402,16 @@ public final class WidgetNoticeDialog extends AppDialog {
         LinearLayout linearLayout = getBinding().f;
         m.checkNotNullExpressionValue(linearLayout, "binding.noticeHeaderContainer");
         linearLayout.setVisibility((charSequence2 == null || t.isBlank(charSequence2)) ^ true ? 0 : 8);
-        LinkifiedTextView linkifiedTextView = getBinding().f1836c;
+        LinkifiedTextView linkifiedTextView = getBinding().f1838c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.noticeBodyText");
         Bundle arguments4 = getArguments();
         linkifiedTextView.setText(arguments4 != null ? arguments4.getCharSequence("body_text") : null);
         if (isCancelable()) {
-            LinkifiedTextView linkifiedTextView2 = getBinding().f1836c;
+            LinkifiedTextView linkifiedTextView2 = getBinding().f1838c;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.noticeBodyText");
             linkifiedTextView2.setMovementMethod(new ActionLinkMovementMethod(new WidgetNoticeDialog$onViewBound$2(this)));
         }
-        LinkifiedTextView linkifiedTextView3 = getBinding().f1836c;
+        LinkifiedTextView linkifiedTextView3 = getBinding().f1838c;
         m.checkNotNullExpressionValue(linkifiedTextView3, "binding.noticeBodyText");
         Bundle arguments5 = getArguments();
         linkifiedTextView3.setTextAlignment(arguments5 != null ? arguments5.getInt("body_text_alignment") : 2);
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java
index 1bb0053b5d..41f84e6879 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java
@@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetNoticeNuxOverlay$binding$2 extends k im
 
     public final WidgetNoticeNuxOverlayBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362215;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362215);
+        int i = 2131362226;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362226);
         if (materialButton != null) {
-            i = 2131363043;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363043);
+            i = 2131363068;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363068);
             if (materialButton2 != null) {
                 return new WidgetNoticeNuxOverlayBinding((LinearLayout) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java
index a541ffb6bb..7d41cab3cd 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java
@@ -13,7 +13,7 @@ public final class WidgetNoticeNuxOverlay$onViewBound$1 implements View.OnClickL
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsVoice.Companion.launch(a.T(view, "it", "it.context"), 2131364919, true);
+        WidgetSettingsVoice.Companion.launch(a.T(view, "it", "it.context"), 2131364969, true);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java
index ae04207790..1a4448f29e 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java
@@ -34,7 +34,7 @@ public final class WidgetNoticeNuxOverlay extends AppDialog {
     }
 
     public WidgetNoticeNuxOverlay() {
-        super(2131559097);
+        super(2131559103);
     }
 
     private final WidgetNoticeNuxOverlayBinding getBinding() {
@@ -46,7 +46,7 @@ public final class WidgetNoticeNuxOverlay extends AppDialog {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         StoreStream.Companion.getNotices().markDialogSeen("NUX/Overlay");
-        getBinding().f1837c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this));
+        getBinding().f1839c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this));
         getBinding().b.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java
index e7ad278409..a7d0adcd6b 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java
@@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetNoticeNuxSamsungLink$binding$2 extends
 
     public final WidgetNoticeNuxSamsungLinkBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362215;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362215);
+        int i = 2131362226;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362226);
         if (materialButton != null) {
-            i = 2131363043;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363043);
+            i = 2131363068;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363068);
             if (materialButton2 != null) {
                 return new WidgetNoticeNuxSamsungLinkBinding((LinearLayout) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java
index f5a9e9b7c8..ba4d32971f 100644
--- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java
+++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java
@@ -74,7 +74,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog {
     }
 
     public WidgetNoticeNuxSamsungLink() {
-        super(2131559098);
+        super(2131559104);
     }
 
     private final WidgetNoticeNuxSamsungLinkBinding getBinding() {
@@ -87,7 +87,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog {
         super.onViewBound(view);
         StoreStream.Companion.getNotices().markDialogSeen("NUX/SamsungLink");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getOAuthTokens(), false, 1, null)), 0, false, 1, null), this, null, 2, null), WidgetNoticeNuxSamsungLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetNoticeNuxSamsungLink$onViewBound$1(this), 62, (Object) null);
-        getBinding().f1838c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this));
+        getBinding().f1840c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this));
         getBinding().b.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java
index 0126ccaa90..47082071a3 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java
@@ -20,41 +20,41 @@ public final /* synthetic */ class WidgetGuildTemplates$binding$2 extends k impl
 
     public final WidgetNuxGuildTemplateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364053;
-        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364053);
+        int i = 2131364096;
+        MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364096);
         if (materialCardView != null) {
-            i = 2131364054;
-            MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131364054);
+            i = 2131364097;
+            MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131364097);
             if (materialCardView2 != null) {
-                i = 2131364055;
-                MaterialCardView materialCardView3 = (MaterialCardView) view.findViewById(2131364055);
+                i = 2131364098;
+                MaterialCardView materialCardView3 = (MaterialCardView) view.findViewById(2131364098);
                 if (materialCardView3 != null) {
-                    i = 2131364056;
-                    MaterialCardView materialCardView4 = (MaterialCardView) view.findViewById(2131364056);
+                    i = 2131364099;
+                    MaterialCardView materialCardView4 = (MaterialCardView) view.findViewById(2131364099);
                     if (materialCardView4 != null) {
-                        i = 2131364057;
-                        MaterialCardView materialCardView5 = (MaterialCardView) view.findViewById(2131364057);
+                        i = 2131364100;
+                        MaterialCardView materialCardView5 = (MaterialCardView) view.findViewById(2131364100);
                         if (materialCardView5 != null) {
-                            i = 2131364058;
-                            MaterialCardView materialCardView6 = (MaterialCardView) view.findViewById(2131364058);
+                            i = 2131364101;
+                            MaterialCardView materialCardView6 = (MaterialCardView) view.findViewById(2131364101);
                             if (materialCardView6 != null) {
-                                i = 2131364059;
-                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364059);
+                                i = 2131364102;
+                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364102);
                                 if (materialButton != null) {
-                                    i = 2131364060;
-                                    MaterialCardView materialCardView7 = (MaterialCardView) view.findViewById(2131364060);
+                                    i = 2131364103;
+                                    MaterialCardView materialCardView7 = (MaterialCardView) view.findViewById(2131364103);
                                     if (materialCardView7 != null) {
-                                        i = 2131364061;
-                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364061);
+                                        i = 2131364104;
+                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364104);
                                         if (linearLayout != null) {
-                                            i = 2131364062;
-                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364062);
+                                            i = 2131364105;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364105);
                                             if (nestedScrollView != null) {
-                                                i = 2131364063;
-                                                TextView textView = (TextView) view.findViewById(2131364063);
+                                                i = 2131364106;
+                                                TextView textView = (TextView) view.findViewById(2131364106);
                                                 if (textView != null) {
-                                                    i = 2131364064;
-                                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364064);
+                                                    i = 2131364107;
+                                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364107);
                                                     if (linearLayout2 != null) {
                                                         return new WidgetNuxGuildTemplateBinding((LinearLayout) view, materialCardView, materialCardView2, materialCardView3, materialCardView4, materialCardView5, materialCardView6, materialButton, materialCardView7, linearLayout, nestedScrollView, textView, linearLayout2);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java
index 3642e4fdd7..ee8a47b1f6 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java
@@ -15,8 +15,8 @@ public final class WidgetGuildTemplates$onViewBound$guildCreateClickListener$1 i
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        StockGuildTemplate stockGuildTemplate = m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f) ? StockGuildTemplate.FRIEND_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).i) ? StockGuildTemplate.STUDY_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).g) ? StockGuildTemplate.GAMING_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).e) ? StockGuildTemplate.CONTENT_CREATOR : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).b) ? StockGuildTemplate.CLUB : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f1841c) ? StockGuildTemplate.LOCAL_COMMUNITY : StockGuildTemplate.CREATE;
+        StockGuildTemplate stockGuildTemplate = m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f) ? StockGuildTemplate.FRIEND_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).i) ? StockGuildTemplate.STUDY_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).g) ? StockGuildTemplate.GAMING_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).e) ? StockGuildTemplate.CONTENT_CREATOR : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).b) ? StockGuildTemplate.CLUB : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f1843c) ? StockGuildTemplate.LOCAL_COMMUNITY : StockGuildTemplate.CREATE;
         WidgetGuildTemplates.access$trackPostRegistrationTransition(this.this$0, "Guild Template", "Server Intent Discovery");
-        WidgetCreationIntent.Companion.show(this.this$0.requireContext(), this.this$0.getTrigger(), new WidgetGuildCreate.Options(this.this$0.getLocation(), stockGuildTemplate, stockGuildTemplate == StockGuildTemplate.CREATE, this.this$0.getString(2131889186)));
+        WidgetCreationIntent.Companion.show(this.this$0.requireContext(), this.this$0.getTrigger(), new WidgetGuildCreate.Options(this.this$0.getLocation(), stockGuildTemplate, stockGuildTemplate == StockGuildTemplate.CREATE, this.this$0.getString(2131889190)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java
index 9eeff94bab..82a23648e8 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java
@@ -51,7 +51,7 @@ public final class WidgetGuildTemplates extends AppFragment {
     }
 
     public WidgetGuildTemplates() {
-        super(2131559101);
+        super(2131559107);
     }
 
     public static final /* synthetic */ WidgetNuxGuildTemplateBinding access$getBinding$p(WidgetGuildTemplates widgetGuildTemplates) {
@@ -112,7 +112,7 @@ public final class WidgetGuildTemplates extends AppFragment {
         trackPostRegistrationTransition("Registration", "Guild Template");
         AppFragment.setOnBackPressed$default(this, new WidgetGuildTemplates$onViewBound$1(this), 0, 2, null);
         WidgetGuildTemplates$onViewBound$guildCreateClickListener$1 widgetGuildTemplates$onViewBound$guildCreateClickListener$1 = new WidgetGuildTemplates$onViewBound$guildCreateClickListener$1(this);
-        for (MaterialCardView materialCardView : n.listOf((Object[]) new MaterialCardView[]{getBinding().d, getBinding().f, getBinding().i, getBinding().g, getBinding().b, getBinding().e, getBinding().f1841c})) {
+        for (MaterialCardView materialCardView : n.listOf((Object[]) new MaterialCardView[]{getBinding().d, getBinding().f, getBinding().i, getBinding().g, getBinding().b, getBinding().e, getBinding().f1843c})) {
             materialCardView.setOnClickListener(widgetGuildTemplates$onViewBound$guildCreateClickListener$1);
         }
         getBinding().h.setOnClickListener(new WidgetGuildTemplates$onViewBound$guildJoinClickListener$1(this));
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java
index a8138936db..185a827294 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetNavigationHelp$binding$2 extends k impl
 
     public final WidgetNavigationHelpBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363997;
-        ImageView imageView = (ImageView) view.findViewById(2131363997);
+        int i = 2131364038;
+        ImageView imageView = (ImageView) view.findViewById(2131364038);
         if (imageView != null) {
-            i = 2131363998;
-            TabLayout tabLayout = (TabLayout) view.findViewById(2131363998);
+            i = 2131364039;
+            TabLayout tabLayout = (TabLayout) view.findViewById(2131364039);
             if (tabLayout != null) {
-                i = 2131363999;
-                ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131363999);
+                i = 2131364040;
+                ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131364040);
                 if (viewPager2 != null) {
                     return new WidgetNavigationHelpBinding((LinearLayout) view, imageView, tabLayout, viewPager2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java
index 57a5f70e89..ca11b18802 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java
@@ -63,11 +63,11 @@ public final class WidgetNavigationHelp extends AppDialog {
         public Fragment createFragment(int i) {
             int i2;
             if (i == 0) {
-                i2 = 2131559095;
+                i2 = 2131559101;
             } else if (i == 1) {
-                i2 = 2131559093;
+                i2 = 2131559099;
             } else if (i == 2) {
-                i2 = 2131559094;
+                i2 = 2131559100;
             } else {
                 throw new IllegalStateException(a.l("unknown nux page: ", i));
             }
@@ -81,7 +81,7 @@ public final class WidgetNavigationHelp extends AppDialog {
     }
 
     public WidgetNavigationHelp() {
-        super(2131559092);
+        super(2131559098);
     }
 
     private final WidgetNavigationHelpBinding getBinding() {
@@ -109,7 +109,7 @@ public final class WidgetNavigationHelp extends AppDialog {
         ViewPager2 viewPager2 = getBinding().d;
         m.checkNotNullExpressionValue(viewPager2, "binding.navigationHelpNuxPager");
         viewPager2.setAdapter(new NuxPagerAdapter(this));
-        TabLayout tabLayout = getBinding().f1835c;
+        TabLayout tabLayout = getBinding().f1837c;
         m.checkNotNullExpressionValue(tabLayout, "binding.navigationHelpIndicators");
         ViewPager2 viewPager22 = getBinding().d;
         m.checkNotNullExpressionValue(viewPager22, "binding.navigationHelpNuxPager");
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java
index c200770c74..ae8fae5c91 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java
@@ -21,26 +21,26 @@ public final /* synthetic */ class WidgetNuxChannelPrompt$binding$2 extends k im
 
     public final WidgetNuxChannelPromptBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364046;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364046);
+        int i = 2131364089;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364089);
         if (loadingButton != null) {
-            i = 2131364047;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364047);
+            i = 2131364090;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364090);
             if (simpleDraweeView != null) {
-                i = 2131364048;
-                TextView textView = (TextView) view.findViewById(2131364048);
+                i = 2131364091;
+                TextView textView = (TextView) view.findViewById(2131364091);
                 if (textView != null) {
-                    i = 2131364049;
-                    TextView textView2 = (TextView) view.findViewById(2131364049);
+                    i = 2131364092;
+                    TextView textView2 = (TextView) view.findViewById(2131364092);
                     if (textView2 != null) {
-                        i = 2131364050;
-                        TextView textView3 = (TextView) view.findViewById(2131364050);
+                        i = 2131364093;
+                        TextView textView3 = (TextView) view.findViewById(2131364093);
                         if (textView3 != null) {
-                            i = 2131364051;
-                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364051);
+                            i = 2131364094;
+                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364094);
                             if (textInputLayout != null) {
-                                i = 2131365294;
-                                Toolbar toolbar = (Toolbar) view.findViewById(2131365294);
+                                i = 2131365349;
+                                Toolbar toolbar = (Toolbar) view.findViewById(2131365349);
                                 if (toolbar != null) {
                                     return new WidgetNuxChannelPromptBinding((RelativeLayout) view, loadingButton, simpleDraweeView, textView, textView2, textView3, textInputLayout, toolbar);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java
index 1a64129a0a..3fa0a87490 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java
@@ -83,6 +83,6 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu
         TextInputLayout textInputLayout = WidgetNuxChannelPrompt.access$getBinding$p(this.this$0).g;
         m.checkNotNullExpressionValue(textInputLayout, "binding.nufChannelPromptTopicWrap");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
-        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.q()), null, b.j(this.this$0, 2131891564, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this)));
+        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.r()), null, b.j(this.this$0, 2131891633, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
index 3df1bfed97..1e3f9d8960 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java
@@ -59,7 +59,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
     }
 
     public WidgetNuxChannelPrompt() {
-        super(2131559100);
+        super(2131559106);
     }
 
     public static final /* synthetic */ void access$finishActivity(WidgetNuxChannelPrompt widgetNuxChannelPrompt, long j) {
@@ -107,7 +107,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
                 TextView textView = getBinding().d;
                 m.checkNotNullExpressionValue(textView, "binding.nufChannelPromptGuildIconName");
                 textView.setVisibility(8);
-                SimpleDraweeView simpleDraweeView = getBinding().f1840c;
+                SimpleDraweeView simpleDraweeView = getBinding().f1842c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.nufChannelPromptGuildIcon");
                 IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
             } else {
@@ -117,7 +117,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment {
                 TextView textView3 = getBinding().d;
                 m.checkNotNullExpressionValue(textView3, "binding.nufChannelPromptGuildIconName");
                 textView3.setText(guild.getShortName());
-                SimpleDraweeView simpleDraweeView2 = getBinding().f1840c;
+                SimpleDraweeView simpleDraweeView2 = getBinding().f1842c;
                 m.checkNotNullExpressionValue(simpleDraweeView2, "binding.nufChannelPromptGuildIcon");
                 IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
             }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java
index be29418b32..3edc21b6b3 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java
@@ -19,7 +19,7 @@ public final class WidgetNuxPostRegistrationJoin$onViewBound$1 implements View.O
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        TextInputLayout textInputLayout = this.this$0.getBinding().f1804c;
+        TextInputLayout textInputLayout = this.this$0.getBinding().f1805c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite");
         if (t.isBlank(ViewExtensions.getTextOrEmpty(textInputLayout))) {
             AnalyticsTracker.INSTANCE.newUserOnboarding("Mobile NUX Post Reg", "Ask to join", "Friend List", Long.valueOf(this.$startTimeMs), true);
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java
index 0ecc1bd9fa..9c97341f69 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java
@@ -26,6 +26,6 @@ public final class WidgetNuxPostRegistrationJoin$onViewBound$2 extends o impleme
 
     public final void invoke(Editable editable) {
         m.checkNotNullParameter(editable, "editable");
-        this.this$0.getBinding().b.setText(t.isBlank(editable) ? 2131891623 : 2131890642);
+        this.this$0.getBinding().b.setText(t.isBlank(editable) ? 2131891692 : 2131890710);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java
index 9e5674f59e..9405068edc 100644
--- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java
+++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java
@@ -32,7 +32,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin {
     }
 
     public WidgetNuxPostRegistrationJoin() {
-        super(2131559102);
+        super(2131559108);
     }
 
     public static final /* synthetic */ void access$handleGuildJoin(WidgetNuxPostRegistrationJoin widgetNuxPostRegistrationJoin) {
@@ -46,7 +46,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin {
         setActionBarDisplayHomeAsUpEnabled(false);
         AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, "Mobile NUX Post Reg", "Registration", "Ask to join", null, false, 24, null);
         getBinding().b.setOnClickListener(new WidgetNuxPostRegistrationJoin$onViewBound$1(this, ClockFactory.get().currentTimeMillis()));
-        TextInputLayout textInputLayout = getBinding().f1804c;
+        TextInputLayout textInputLayout = getBinding().f1805c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetNuxPostRegistrationJoin$onViewBound$2(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java
index 59125f0b87..45fa98b46f 100644
--- a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java
+++ b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java
@@ -40,18 +40,18 @@ public final class PhoneCountryCodeAdapter extends RecyclerView.Adapter<PhoneCou
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public PhoneCountryCodeAdapterItem onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559107, viewGroup, false);
-        int i2 = 2131364208;
-        TextView textView = (TextView) inflate.findViewById(2131364208);
+        View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559113, viewGroup, false);
+        int i2 = 2131364252;
+        TextView textView = (TextView) inflate.findViewById(2131364252);
         if (textView != null) {
             ConstraintLayout constraintLayout = (ConstraintLayout) inflate;
-            TextView textView2 = (TextView) inflate.findViewById(2131364210);
+            TextView textView2 = (TextView) inflate.findViewById(2131364254);
             if (textView2 != null) {
                 WidgetPhoneCountryCodeListItemBinding widgetPhoneCountryCodeListItemBinding = new WidgetPhoneCountryCodeListItemBinding(constraintLayout, textView, constraintLayout, textView2);
                 m.checkNotNullExpressionValue(widgetPhoneCountryCodeListItemBinding, "WidgetPhoneCountryCodeLi….context), parent, false)");
                 return new PhoneCountryCodeAdapterItem(this, widgetPhoneCountryCodeListItemBinding);
             }
-            i2 = 2131364210;
+            i2 = 2131364254;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
     }
diff --git a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java
index 009a4ff7f8..91fc2e7d6c 100644
--- a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java
+++ b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java
@@ -39,6 +39,6 @@ public final class PhoneCountryCodeAdapterItem extends RecyclerView.ViewHolder {
         TextView textView2 = this.binding.b;
         m.checkNotNullExpressionValue(textView2, "binding.phoneCountryCodeCode");
         textView2.setText(phoneCountryCode.getCode());
-        this.binding.f1846c.setOnClickListener(new PhoneCountryCodeAdapterItem$bind$1(this, phoneCountryCode));
+        this.binding.f1848c.setOnClickListener(new PhoneCountryCodeAdapterItem$bind$1(this, phoneCountryCode));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java
index 433cb3fc3c..4e4ab46cc2 100644
--- a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetPhoneCountryCodeBottomSheet$binding$2 e
 
     public final WidgetPhoneCountryCodeBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364211;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364211);
+        int i = 2131364255;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364255);
         if (recyclerView != null) {
-            i = 2131364212;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364212);
+            i = 2131364256;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364256);
             if (textInputLayout != null) {
                 return new WidgetPhoneCountryCodeBottomSheetBinding((LinearLayout) view, recyclerView, textInputLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
index 88a4e3b08e..a278573abd 100644
--- a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java
@@ -53,9 +53,9 @@ public final class WidgetPhoneCountryCodeBottomSheet extends AppBottomSheet {
 
     public WidgetPhoneCountryCodeBottomSheet() {
         super(false, 1, null);
-        BehaviorSubject<String> m0 = BehaviorSubject.m0("");
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(\"\")");
-        this.nameFilterSubject = m0;
+        BehaviorSubject<String> l0 = BehaviorSubject.l0("");
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+        this.nameFilterSubject = l0;
         this.adapter = new PhoneCountryCodeAdapter();
     }
 
@@ -106,13 +106,13 @@ public final class WidgetPhoneCountryCodeBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559106;
+        return 2131559112;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
     public void onResume() {
         super.onResume();
-        TextInputLayout textInputLayout = getBinding().f1845c;
+        TextInputLayout textInputLayout = getBinding().f1847c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.phoneCountryCodeSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetPhoneCountryCodeBottomSheet$onResume$1(this));
         Observable<String> o = this.nameFilterSubject.o(200, TimeUnit.MILLISECONDS);
diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java
index 1b8b833673..5cad7e1b26 100644
--- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetQuickMentionsDialog$binding$2 extends k
 
     public final WidgetQuickMentionsDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365170;
-        ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131365170);
+        int i = 2131365225;
+        ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131365225);
         if (viewPager2 != null) {
-            i = 2131365171;
-            TabLayout tabLayout = (TabLayout) view.findViewById(2131365171);
+            i = 2131365226;
+            TabLayout tabLayout = (TabLayout) view.findViewById(2131365226);
             if (tabLayout != null) {
                 return new WidgetQuickMentionsDialogBinding((ConstraintLayout) view, viewPager2, tabLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
index 5d70754bd1..d274d9e530 100644
--- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
+++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java
@@ -104,17 +104,17 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
 
         public final int getItemTitleResId(int i) {
             if (i == 0) {
-                return 2131893047;
+                return 2131893130;
             }
             if (i == 1) {
-                return 2131891154;
+                return 2131891225;
             }
             throw new UnsupportedOperationException();
         }
     }
 
     public WidgetQuickMentionsDialog() {
-        super(2131559113);
+        super(2131559119);
     }
 
     private final WidgetQuickMentionsDialogBinding getBinding() {
@@ -154,7 +154,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog {
         ViewPager2 viewPager2 = getBinding().b;
         m.checkNotNullExpressionValue(viewPager2, "binding.tabContents");
         viewPager2.setAdapter(tabsAdapter);
-        TabLayout tabLayout = getBinding().f1850c;
+        TabLayout tabLayout = getBinding().f1852c;
         m.checkNotNullExpressionValue(tabLayout, "binding.tabs");
         ViewPager2 viewPager22 = getBinding().b;
         m.checkNotNullExpressionValue(viewPager22, "binding.tabContents");
diff --git a/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java
index 49ddff76a0..c9156b5c4f 100644
--- a/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java
@@ -24,6 +24,6 @@ public final class RolesListView$updateView$$inlined$forEach$lambda$1 implements
     public final void onClick(View view) {
         Context context = this.this$0.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        o.b(context, String.valueOf(this.$role.getId()), b.i(this.this$0, 2131892727, new Object[]{this.$role.f()}, null, 4));
+        o.b(context, String.valueOf(this.$role.getId()), b.i(this.this$0, 2131892808, new Object[]{this.$role.f()}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java
index f7d4701acf..76f6b9ad64 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetSearch$binding$2 extends k implements F
 
     public final WidgetSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364545;
-        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364545);
+        int i = 2131364584;
+        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364584);
         if (floatingActionButton != null) {
-            i = 2131365611;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365611);
+            i = 2131365672;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365672);
             if (textInputLayout != null) {
-                i = 2131365612;
-                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365612);
+                i = 2131365673;
+                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365673);
                 if (fragmentContainerView != null) {
-                    i = 2131365613;
-                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365613);
+                    i = 2131365674;
+                    FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365674);
                     if (fragmentContainerView2 != null) {
                         return new WidgetSearchBinding((CoordinatorLayout) view, floatingActionButton, textInputLayout, fragmentContainerView, fragmentContainerView2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java
index e66d8d6b4f..79b2aab664 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java
@@ -36,7 +36,7 @@ public final class WidgetSearch$configureSearchInput$1 extends o implements Func
         }
         AppFragment.hideKeyboard$default(this.this$0, null, 1, null);
         StoreSearch search = StoreStream.Companion.getSearch();
-        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1853c;
+        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1855c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
         Context context = textView.getContext();
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java
index 21148bc84c..8f72202948 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java
@@ -25,10 +25,10 @@ public final class WidgetSearch$configureSearchInput$5 extends o implements Func
     }
 
     public final void invoke(String str) {
-        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1853c;
+        TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1855c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         ViewExtensions.setText(textInputLayout, str);
-        TextInputLayout textInputLayout2 = WidgetSearch.access$getBinding$p(this.this$0).f1853c;
+        TextInputLayout textInputLayout2 = WidgetSearch.access$getBinding$p(this.this$0).f1855c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
         ViewExtensions.setSelectionEnd(textInputLayout2);
     }
diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
index 6e9082b6e5..01294528c7 100644
--- a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
+++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java
@@ -211,7 +211,7 @@ public final class WidgetSearch extends AppFragment {
     }
 
     public WidgetSearch() {
-        super(2131559119);
+        super(2131559125);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSearch widgetSearch, Model model) {
@@ -227,15 +227,15 @@ public final class WidgetSearch extends AppFragment {
     }
 
     private final void configureSearchInput() {
-        TextInputLayout textInputLayout = getBinding().f1853c;
+        TextInputLayout textInputLayout = getBinding().f1855c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         ViewExtensions.setOnEditorActionListener(textInputLayout, new WidgetSearch$configureSearchInput$1(this));
-        TextInputLayout textInputLayout2 = getBinding().f1853c;
+        TextInputLayout textInputLayout2 = getBinding().f1855c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, WidgetSearch$configureSearchInput$2.INSTANCE);
-        Observable G = ObservableExtensionsKt.ui$default(StoreStream.Companion.getSearch().getStoreSearchInput().getForcedInput(), this, null, 2, null).G(new WidgetSearch$configureSearchInput$3(this)).G(WidgetSearch$configureSearchInput$4.INSTANCE);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get… obj.toString()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(G, WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$configureSearchInput$5(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.ui$default(StoreStream.Companion.getSearch().getStoreSearchInput().getForcedInput(), this, null, 2, null).F(new WidgetSearch$configureSearchInput$3(this)).F(WidgetSearch$configureSearchInput$4.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get… obj.toString()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$configureSearchInput$5(this), 62, (Object) null);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0092: APUT  (r2v2 java.lang.Object[]), (0 ??[int, short, byte, char]), (r7v2 java.lang.String) */
@@ -251,20 +251,20 @@ public final class WidgetSearch extends AppFragment {
         int i = this.targetType;
         int i2 = 0;
         if (i == 0) {
-            TextInputLayout textInputLayout = getBinding().f1853c;
+            TextInputLayout textInputLayout = getBinding().f1855c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
             Object[] objArr = new Object[1];
             Guild guild = model.getGuild();
             objArr[0] = guild != null ? guild.getName() : null;
-            ViewExtensions.setSingleLineHint(textInputLayout, b.j(this, 2131893101, objArr, null, 4));
+            ViewExtensions.setSingleLineHint(textInputLayout, b.j(this, 2131893184, objArr, null, 4));
         } else if (i == 1) {
             Channel channel = model.getChannel();
             String z0 = channel != null ? AnimatableValueParser.z0(channel, requireContext(), false) : null;
-            TextInputLayout textInputLayout2 = getBinding().f1853c;
+            TextInputLayout textInputLayout2 = getBinding().f1855c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput");
             Channel channel2 = model.getChannel();
-            Integer valueOf = channel2 != null ? Integer.valueOf(channel2.z()) : null;
-            ViewExtensions.setSingleLineHint(textInputLayout2, (valueOf != null && valueOf.intValue() == 1) ? b.j(this, 2131893070, new Object[]{z0}, null, 4) : (valueOf != null && valueOf.intValue() == 3) ? b.j(this, 2131893101, new Object[]{z0}, null, 4) : b.j(this, 2131893047, new Object[0], null, 4));
+            Integer valueOf = channel2 != null ? Integer.valueOf(channel2.A()) : null;
+            ViewExtensions.setSingleLineHint(textInputLayout2, (valueOf != null && valueOf.intValue() == 1) ? b.j(this, 2131893153, new Object[]{z0}, null, 4) : (valueOf != null && valueOf.intValue() == 3) ? b.j(this, 2131893184, new Object[]{z0}, null, 4) : b.j(this, 2131893130, new Object[0], null, 4));
         }
         StoreSearch.DisplayState displayState = model.getDisplayState();
         if (displayState != null) {
@@ -303,7 +303,7 @@ public final class WidgetSearch extends AppFragment {
     private final void sendQuery(Context context) {
         AppFragment.hideKeyboard$default(this, null, 1, null);
         StoreSearch search = StoreStream.Companion.getSearch();
-        TextInputLayout textInputLayout = getBinding().f1853c;
+        TextInputLayout textInputLayout = getBinding().f1855c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
         search.loadInitial(ViewExtensions.getTextOrEmpty(textInputLayout), new ContextSearchStringProvider(context));
     }
@@ -330,7 +330,7 @@ public final class WidgetSearch extends AppFragment {
         this.targetId = getMostRecentIntent().getLongExtra("INTENT_EXTRA_TARGET_ID", 0);
         this.targetType = getMostRecentIntent().getIntExtra("INTENT_EXTRA_SEARCH_TYPE", -1);
         if (!isRecreated()) {
-            TextInputLayout textInputLayout = getBinding().f1853c;
+            TextInputLayout textInputLayout = getBinding().f1855c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput");
             showKeyboard(textInputLayout);
         }
@@ -348,7 +348,7 @@ public final class WidgetSearch extends AppFragment {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(this.targetType, this.targetId), this, null, 2, null), WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$onViewBoundOrOnResume$1(this), 62, (Object) null);
         configureSearchInput();
         getBinding().b.setOnClickListener(new WidgetSearch$onViewBoundOrOnResume$2(this));
-        getBinding().f1853c.setStartIconOnClickListener(new WidgetSearch$onViewBoundOrOnResume$3(this));
+        getBinding().f1855c.setStartIconOnClickListener(new WidgetSearch$onViewBoundOrOnResume$3(this));
     }
 
     public final void setTargetId(long j) {
diff --git a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java
index 749da89723..199b76cb7e 100644
--- a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java
@@ -2,10 +2,10 @@ package com.discord.widgets.search.results;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserSettings;
 import com.discord.utilities.embed.InviteEmbedModel;
@@ -66,22 +66,22 @@ public final class WidgetSearchResults$Model$Companion$get$1<T, R> implements b<
             if (this.$searchState.getQueryFetchState() == QueryFetchState.COMPLETED || this.$searchState.getQueryFetchState() == QueryFetchState.LOADING_MORE) {
                 List<Message> messages = messagesWithMetadata.getMessages();
                 if (!messages.isEmpty()) {
-                    Long valueOf = Long.valueOf(messages.get(messages.size() - 1).r());
+                    Long valueOf = Long.valueOf(messages.get(messages.size() - 1).getId());
                     arrayList.add(new SearchResultCountEntry(this.$searchState.getTotalResults()));
                     l = valueOf;
                 } else {
                     l = null;
                 }
                 for (Message message : messages) {
-                    Channel channel = map5.get(Long.valueOf(message.i()));
+                    Channel channel = map5.get(Long.valueOf(message.getChannelId()));
                     if (channel != null) {
                         Map map8 = (Map) a.c(channel, map7);
                         if (map8 == null || (guildMember = (GuildMember) map8.get(Long.valueOf(j))) == null || (list = guildMember.getRoles()) == null) {
                             list = n.emptyList();
                         }
                         hashSet.addAll(list);
-                        arrayList.add(MessageHeaderEntry.Companion.create(message, channel, (Guild) a.c(channel, map6)));
-                        Map map9 = (Map) map7.get(Long.valueOf(message.i()));
+                        arrayList.add(new MessageHeaderEntry(message, channel, (Guild) a.c(channel, map6)));
+                        Map map9 = (Map) map7.get(Long.valueOf(message.getChannelId()));
                         if (map9 == null) {
                             map9 = h0.emptyMap();
                         }
@@ -89,7 +89,7 @@ public final class WidgetSearchResults$Model$Companion$get$1<T, R> implements b<
                         if (map10 == null) {
                             map10 = h0.emptyMap();
                         }
-                        arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map9, map10, new HashMap(), messagesWithMetadata.getMessageThreads().get(Long.valueOf(message.r())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(message.r())), message, messagesWithMetadata.getMessageState().get(Long.valueOf(message.r())), new HashMap(), false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, new HashMap(), inviteEmbedModel, false, 262144, null));
+                        arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map9, map10, new HashMap(), messagesWithMetadata.getMessageThreads().get(Long.valueOf(message.getId())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(message.getId())), message, messagesWithMetadata.getMessageState().get(Long.valueOf(message.getId())), new HashMap(), false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, new HashMap(), inviteEmbedModel, false, 262144, null));
                     }
                     map6 = map2;
                     map7 = map3;
diff --git a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
index d83cc82f63..06342869b8 100644
--- a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
+++ b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java
@@ -12,7 +12,6 @@ import c.d.b.a.a;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.activity.MessageActivityType;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.api.sticker.BaseSticker;
@@ -20,6 +19,7 @@ import com.discord.api.sticker.Sticker;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetSearchResultsBinding;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.SelectedChannelAnalyticsLocation;
 import com.discord.stores.StoreChat;
@@ -72,9 +72,9 @@ public final class WidgetSearchResults extends AppFragment {
             }
 
             public final Observable<Model> get() {
-                Observable s2 = StoreStream.Companion.getSearch().getStoreSearchQuery().getState().Z(WidgetSearchResults$Model$Companion$get$1.INSTANCE).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return ObservableExtensionsKt.computationLatest(s2);
+                Observable r = StoreStream.Companion.getSearch().getStoreSearchQuery().getState().Y(WidgetSearchResults$Model$Companion$get$1.INSTANCE).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return ObservableExtensionsKt.computationLatest(r);
             }
         }
 
@@ -251,7 +251,7 @@ public final class WidgetSearchResults extends AppFragment {
         }
 
         private final void jumpToChat(Message message) {
-            StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r());
+            StoreStream.Companion.getMessagesLoader().jumpToMessage(message.getChannelId(), message.getId());
             l.c(this.context, false, null, 6);
         }
 
@@ -397,7 +397,7 @@ public final class WidgetSearchResults extends AppFragment {
     }
 
     public WidgetSearchResults() {
-        super(2131559120);
+        super(2131559126);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSearchResults widgetSearchResults, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java
index cbad85c571..4a82703e37 100644
--- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java
+++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java
@@ -59,9 +59,9 @@ public final class WidgetSearchSuggestions extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable i = Observable.i(companion.getSearch().getStoreSearchData().get(), companion.getSearch().getStoreSearchInput().getCurrentParsedInput(), companion.getSearch().getHistory(), new WidgetSearchSuggestions$Model$Companion$get$1(searchStringProvider));
                 m.checkNotNullExpressionValue(i, "Observable.combineLatest…gestionEntries)\n        }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(i).s();
-                m.checkNotNullExpressionValue(s2, "Observable.combineLatest…().distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(i).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…().distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -191,7 +191,7 @@ public final class WidgetSearchSuggestions extends AppFragment {
     }
 
     public WidgetSearchSuggestions() {
-        super(2131559123);
+        super(2131559129);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSearchSuggestions widgetSearchSuggestions, Model model) {
diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
index 0d068e21b2..a42d356d81 100644
--- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java
@@ -149,18 +149,18 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public FilterViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559127, widgetSearchSuggestionsAdapter);
+            super(2131559133, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
-            int i = 2131365141;
-            TextView textView = (TextView) view.findViewById(2131365141);
+            int i = 2131365196;
+            TextView textView = (TextView) view.findViewById(2131365196);
             if (textView != null) {
                 RelativeLayout relativeLayout = (RelativeLayout) view;
-                i = 2131365143;
-                TextView textView2 = (TextView) view.findViewById(2131365143);
+                i = 2131365198;
+                TextView textView2 = (TextView) view.findViewById(2131365198);
                 if (textView2 != null) {
-                    i = 2131365144;
-                    ImageView imageView = (ImageView) view.findViewById(2131365144);
+                    i = 2131365199;
+                    ImageView imageView = (ImageView) view.findViewById(2131365199);
                     if (imageView != null) {
                         WidgetSearchSuggestionsItemSuggestionBinding widgetSearchSuggestionsItemSuggestionBinding = new WidgetSearchSuggestionsItemSuggestionBinding(relativeLayout, textView, relativeLayout, textView2, imageView);
                         m.checkNotNullExpressionValue(widgetSearchSuggestionsItemSuggestionBinding, "WidgetSearchSuggestionsI…ionBinding.bind(itemView)");
@@ -180,16 +180,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
         private final int getAnswerText(FilterType filterType) {
             int ordinal = filterType.ordinal();
             if (ordinal == 0) {
-                return 2131893052;
+                return 2131893135;
             }
             if (ordinal == 1) {
-                return 2131893062;
+                return 2131893145;
             }
             if (ordinal == 2) {
-                return 2131893053;
+                return 2131893136;
             }
             if (ordinal == 3) {
-                return 2131893060;
+                return 2131893143;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -198,16 +198,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
         private final int getFilterText(FilterType filterType) {
             int ordinal = filterType.ordinal();
             if (ordinal == 0) {
-                return 2131893078;
+                return 2131893161;
             }
             if (ordinal == 1) {
-                return 2131893082;
+                return 2131893165;
             }
             if (ordinal == 2) {
-                return 2131893079;
+                return 2131893162;
             }
             if (ordinal == 3) {
-                return 2131893080;
+                return 2131893163;
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -215,16 +215,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
         private final Drawable getIconDrawable(Context context, FilterType filterType) {
             int ordinal = filterType.ordinal();
             if (ordinal == 0) {
-                return ContextCompat.getDrawable(context, 2131231734);
+                return ContextCompat.getDrawable(context, 2131231741);
             }
             if (ordinal == 1) {
-                return ContextCompat.getDrawable(context, 2131231735);
+                return ContextCompat.getDrawable(context, 2131231743);
             }
             if (ordinal == 2) {
-                return ContextCompat.getDrawable(context, 2131231401);
+                return ContextCompat.getDrawable(context, 2131231407);
             }
             if (ordinal == 3) {
-                return ContextCompat.getDrawable(context, 2131231988);
+                return ContextCompat.getDrawable(context, 2131231996);
             }
             throw new NoWhenBranchMatchedException();
         }
@@ -236,7 +236,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             FilterType filterType = ((FilterSuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData()).getFilterType();
             int filterText = getFilterText(filterType);
             int answerText = getAnswerText(filterType);
-            this.binding.f1857c.setOnClickListener(new WidgetSearchSuggestionsAdapter$FilterViewHolder$onConfigure$1(this, filterType));
+            this.binding.f1859c.setOnClickListener(new WidgetSearchSuggestionsAdapter$FilterViewHolder$onConfigure$1(this, filterType));
             ImageView imageView = this.binding.e;
             m.checkNotNullExpressionValue(imageView, "binding.suggestionExampleIcon");
             Context context = imageView.getContext();
@@ -291,22 +291,22 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             private final int getIconRes(HasAnswerOption hasAnswerOption) {
                 int ordinal = hasAnswerOption.ordinal();
                 if (ordinal == 0) {
-                    return 2131231557;
+                    return 2131231563;
                 }
                 if (ordinal == 1) {
-                    return 2131231571;
+                    return 2131231577;
                 }
                 if (ordinal == 2) {
-                    return 2131231401;
+                    return 2131231407;
                 }
                 if (ordinal == 3) {
-                    return 2131231849;
+                    return 2131231857;
                 }
                 if (ordinal == 4) {
-                    return 2131231989;
+                    return 2131231997;
                 }
                 if (ordinal == 5) {
-                    return 2131231935;
+                    return 2131231943;
                 }
                 throw new NoWhenBranchMatchedException();
             }
@@ -314,15 +314,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HasViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559125, widgetSearchSuggestionsAdapter);
+            super(2131559131, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i = 2131364553;
-            ImageView imageView = (ImageView) view.findViewById(2131364553);
+            int i = 2131364592;
+            ImageView imageView = (ImageView) view.findViewById(2131364592);
             if (imageView != null) {
-                i = 2131364554;
-                TextView textView = (TextView) view.findViewById(2131364554);
+                i = 2131364593;
+                TextView textView = (TextView) view.findViewById(2131364593);
                 if (textView != null) {
                     WidgetSearchSuggestionsItemHasBinding widgetSearchSuggestionsItemHasBinding = new WidgetSearchSuggestionsItemHasBinding((RelativeLayout) view, relativeLayout, imageView, textView);
                     m.checkNotNullExpressionValue(widgetSearchSuggestionsItemHasBinding, "WidgetSearchSuggestionsI…HasBinding.bind(itemView)");
@@ -349,7 +349,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             TextView textView = this.binding.d;
             m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemHasText");
             textView.setText(hasSuggestion.getHasAnswerOption().getLocalizedInputText(this.searchStringProvider));
-            this.binding.f1855c.setImageResource(Companion.access$getIconRes(Companion, hasSuggestion.getHasAnswerOption()));
+            this.binding.f1857c.setImageResource(Companion.access$getIconRes(Companion, hasSuggestion.getHasAnswerOption()));
             this.binding.b.setOnClickListener(new WidgetSearchSuggestionsAdapter$HasViewHolder$onConfigure$1(this, hasSuggestion));
         }
     }
@@ -376,7 +376,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559121, widgetSearchSuggestionsAdapter);
+            super(2131559127, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -390,22 +390,22 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             if (category != null) {
                 int ordinal = category.ordinal();
                 if (ordinal == 0) {
-                    return 2131893098;
+                    return 2131893181;
                 }
                 if (ordinal == 1) {
-                    return 2131893097;
+                    return 2131893180;
                 }
                 if (ordinal == 2) {
-                    return 2131893093;
+                    return 2131893176;
                 }
                 if (ordinal == 3) {
-                    return 2131893094;
+                    return 2131893177;
                 }
                 if (ordinal == 4) {
-                    return 2131893091;
+                    return 2131893174;
                 }
                 if (ordinal == 5) {
-                    return 2131893090;
+                    return 2131893173;
                 }
             }
             throw new IllegalArgumentException("couldn't resolve category: " + category);
@@ -424,17 +424,17 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HistoryHeaderViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559122, widgetSearchSuggestionsAdapter);
+            super(2131559128, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
-            int i = 2131365146;
-            ImageView imageView = (ImageView) view.findViewById(2131365146);
+            int i = 2131365201;
+            ImageView imageView = (ImageView) view.findViewById(2131365201);
             if (imageView != null) {
-                i = 2131365147;
-                View findViewById = view.findViewById(2131365147);
+                i = 2131365202;
+                View findViewById = view.findViewById(2131365202);
                 if (findViewById != null) {
-                    i = 2131365148;
-                    TextView textView = (TextView) view.findViewById(2131365148);
+                    i = 2131365203;
+                    TextView textView = (TextView) view.findViewById(2131365203);
                     if (textView != null) {
                         WidgetSearchSuggestionItemHeaderHistoryBinding widgetSearchSuggestionItemHeaderHistoryBinding = new WidgetSearchSuggestionItemHeaderHistoryBinding((RelativeLayout) view, imageView, findViewById, textView);
                         m.checkNotNullExpressionValue(widgetSearchSuggestionItemHeaderHistoryBinding, "WidgetSearchSuggestionIt…oryBinding.bind(itemView)");
@@ -463,15 +463,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public InChannelViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559124, widgetSearchSuggestionsAdapter);
+            super(2131559130, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i = 2131364551;
-            ImageView imageView = (ImageView) view.findViewById(2131364551);
+            int i = 2131364590;
+            ImageView imageView = (ImageView) view.findViewById(2131364590);
             if (imageView != null) {
-                i = 2131364552;
-                TextView textView = (TextView) view.findViewById(2131364552);
+                i = 2131364591;
+                TextView textView = (TextView) view.findViewById(2131364591);
                 if (textView != null) {
                     WidgetSearchSuggestionsItemChannelBinding widgetSearchSuggestionsItemChannelBinding = new WidgetSearchSuggestionsItemChannelBinding((RelativeLayout) view, relativeLayout, imageView, textView);
                     m.checkNotNullExpressionValue(widgetSearchSuggestionsItemChannelBinding, "WidgetSearchSuggestionsI…nelBinding.bind(itemView)");
@@ -490,7 +490,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullParameter(mGRecyclerDataPayload, "data");
             super.onConfigure(i, (int) mGRecyclerDataPayload);
             ChannelSuggestion channelSuggestion = (ChannelSuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData();
-            TextView textView = this.binding.f1854c;
+            TextView textView = this.binding.f1856c;
             m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemChannelText");
             textView.setText(channelSuggestion.getChannelName());
             this.binding.b.setOnClickListener(new WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1(this, channelSuggestion));
@@ -503,15 +503,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RecentQueryViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559126, widgetSearchSuggestionsAdapter);
+            super(2131559132, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "widgetSearchSuggestionsAdapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i = 2131364555;
-            ImageView imageView = (ImageView) view.findViewById(2131364555);
+            int i = 2131364594;
+            ImageView imageView = (ImageView) view.findViewById(2131364594);
             if (imageView != null) {
-                i = 2131364556;
-                TextView textView = (TextView) view.findViewById(2131364556);
+                i = 2131364595;
+                TextView textView = (TextView) view.findViewById(2131364595);
                 if (textView != null) {
                     WidgetSearchSuggestionsItemRecentQueryBinding widgetSearchSuggestionsItemRecentQueryBinding = new WidgetSearchSuggestionsItemRecentQueryBinding((RelativeLayout) view, relativeLayout, imageView, textView);
                     m.checkNotNullExpressionValue(widgetSearchSuggestionsItemRecentQueryBinding, "WidgetSearchSuggestionsI…eryBinding.bind(itemView)");
@@ -530,7 +530,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullParameter(mGRecyclerDataPayload, "data");
             super.onConfigure(i, (int) mGRecyclerDataPayload);
             List<QueryNode> query = ((RecentQuerySuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData()).getQuery();
-            TextView textView = this.binding.f1856c;
+            TextView textView = this.binding.f1858c;
             m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemRecentQueryText");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
@@ -547,7 +547,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public UserViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) {
-            super(2131559128, widgetSearchSuggestionsAdapter);
+            super(2131559134, widgetSearchSuggestionsAdapter);
             m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -574,14 +574,14 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl
             String str = user.getUsername() + UserUtils.INSTANCE.getDiscriminatorWithPadding(user);
             String nick = guildMember != null ? guildMember.getNick() : null;
             if (nick == null || nick.length() == 0) {
-                TextView textView = userListItemView.j.f139c;
+                TextView textView = userListItemView.j.f153c;
                 m.checkNotNullExpressionValue(textView, "binding.userListItemName");
                 textView.setText(str);
                 TextView textView2 = userListItemView.j.d;
                 m.checkNotNullExpressionValue(textView2, "binding.userListItemNameSecondary");
                 textView2.setText("");
             } else {
-                TextView textView3 = userListItemView.j.f139c;
+                TextView textView3 = userListItemView.j.f153c;
                 m.checkNotNullExpressionValue(textView3, "binding.userListItemName");
                 textView3.setText(nick);
                 TextView textView4 = userListItemView.j.d;
diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java
index 3e95dc9a0f..f3f999de36 100644
--- a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java
+++ b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java
@@ -195,16 +195,16 @@ public final class NotificationMuteSettingsView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558596, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(2131558597, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131364037;
-        TextView textView = (TextView) inflate.findViewById(2131364037);
+        int i = 2131364080;
+        TextView textView = (TextView) inflate.findViewById(2131364080);
         if (textView != null) {
-            i = 2131364038;
-            TextView textView2 = (TextView) inflate.findViewById(2131364038);
+            i = 2131364081;
+            TextView textView2 = (TextView) inflate.findViewById(2131364081);
             if (textView2 != null) {
-                i = 2131364039;
-                TextView textView3 = (TextView) inflate.findViewById(2131364039);
+                i = 2131364082;
+                TextView textView3 = (TextView) inflate.findViewById(2131364082);
                 if (textView3 != null) {
                     NotificationMuteSettingsViewBinding notificationMuteSettingsViewBinding = new NotificationMuteSettingsViewBinding((LinearLayout) inflate, textView, textView2, textView3);
                     m.checkNotNullExpressionValue(notificationMuteSettingsViewBinding, "NotificationMuteSettings…rom(context), this, true)");
@@ -250,7 +250,7 @@ public final class NotificationMuteSettingsView extends LinearLayout {
         TextView textView3 = this.binding.d;
         m.checkNotNullExpressionValue(textView3, "binding.notificationMuteSettingsMuteItemStatus");
         textView3.setVisibility(isMuted ? 0 : 8);
-        TextView textView4 = this.binding.f1618c;
+        TextView textView4 = this.binding.f1614c;
         m.checkNotNullExpressionValue(textView4, "binding.notificationMute…ttingsMuteItemDescription");
         if (muteDescriptionText == null) {
             z2 = false;
@@ -259,7 +259,7 @@ public final class NotificationMuteSettingsView extends LinearLayout {
             i = 8;
         }
         textView4.setVisibility(i);
-        TextView textView5 = this.binding.f1618c;
+        TextView textView5 = this.binding.f1614c;
         m.checkNotNullExpressionValue(textView5, "binding.notificationMute…ttingsMuteItemDescription");
         textView5.setText(muteDescriptionText);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java b/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java
index 9a46906a53..59e46a9cd1 100644
--- a/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java
@@ -50,7 +50,7 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
 
         @Override // androidx.recyclerview.widget.DiffUtil.Callback
         public boolean areItemsTheSame(int i, int i2) {
-            return this.newItems.get(i2).getChannel().g() == this.oldItems.get(i).getChannel().g();
+            return this.newItems.get(i2).getChannel().h() == this.oldItems.get(i).getChannel().h();
         }
 
         @Override // androidx.recyclerview.widget.DiffUtil.Callback
@@ -116,10 +116,10 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
                 TextView textView = this.binding.b;
                 m.checkNotNullExpressionValue(textView, "binding.categoryOverrideName");
                 textView.setText(AnimatableValueParser.y0(item.getChannel()));
-                int messageNotificationToString = item.getOverrideSettings().isMuted() ? 2131888700 : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
-                TextView textView2 = this.binding.f1643c;
+                int messageNotificationToString = item.getOverrideSettings().isMuted() ? 2131888701 : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
+                TextView textView2 = this.binding.f1640c;
                 m.checkNotNullExpressionValue(textView2, "binding.categoryOverrideStatus");
-                b.n(textView2, messageNotificationToString, new Object[0], null, 4);
+                b.m(textView2, messageNotificationToString, new Object[0], null, 4);
             }
         }
 
@@ -141,17 +141,17 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
             public void onBind(Item item) {
                 m.checkNotNullParameter(item, "data");
                 super.onBind(item);
-                TextView textView = this.binding.f1644c;
+                TextView textView = this.binding.f1641c;
                 m.checkNotNullExpressionValue(textView, "binding.channelOverrideName");
                 textView.setText(AnimatableValueParser.y0(item.getChannel()));
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.channelOverrideCategoryName");
                 Channel parent = item.getParent();
                 ViewExtensions.setTextAndVisibilityBy(textView2, parent != null ? AnimatableValueParser.y0(parent) : null);
-                int messageNotificationToString = item.getOverrideSettings().isMuted() ? 2131888700 : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
+                int messageNotificationToString = item.getOverrideSettings().isMuted() ? 2131888701 : messageNotificationToString(item.getOverrideSettings().getMessageNotifications());
                 TextView textView3 = this.binding.d;
                 m.checkNotNullExpressionValue(textView3, "binding.channelOverrideStatus");
-                b.n(textView3, messageNotificationToString, new Object[0], null, 4);
+                b.m(textView3, messageNotificationToString, new Object[0], null, 4);
             }
         }
 
@@ -173,12 +173,12 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
         @StringRes
         public final int messageNotificationToString(int i) {
             if (i == ModelNotificationSettings.FREQUENCY_ALL) {
-                return 2131888608;
+                return 2131888609;
             }
             if (i == ModelNotificationSettings.FREQUENCY_MENTIONS) {
-                return 2131888708;
+                return 2131888709;
             }
-            return i == ModelNotificationSettings.FREQUENCY_NOTHING ? 2131888703 : 0;
+            return i == ModelNotificationSettings.FREQUENCY_NOTHING ? 2131888704 : 0;
         }
 
         public void onBind(Item item) {
@@ -205,7 +205,7 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
 
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public int getItemViewType(int i) {
-        return this.data.get(i).getChannel().z();
+        return this.data.get(i).getChannel().A();
     }
 
     public final Function2<View, Item, Unit> getOnClick() {
@@ -220,30 +220,30 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        int i2 = 2131364000;
+        int i2 = 2131364041;
         if (i != 0) {
             if (i == 4) {
                 View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558724, viewGroup, false);
-                TextView textView = (TextView) inflate.findViewById(2131362221);
+                TextView textView = (TextView) inflate.findViewById(2131362232);
                 if (textView != null) {
-                    TextView textView2 = (TextView) inflate.findViewById(2131362222);
+                    TextView textView2 = (TextView) inflate.findViewById(2131362233);
                     if (textView2 != null) {
-                        Guideline guideline = (Guideline) inflate.findViewById(2131363339);
+                        Guideline guideline = (Guideline) inflate.findViewById(2131363365);
                         if (guideline != null) {
-                            ImageView imageView = (ImageView) inflate.findViewById(2131364000);
+                            ImageView imageView = (ImageView) inflate.findViewById(2131364041);
                             if (imageView != null) {
                                 ViewCategoryOverrideItemBinding viewCategoryOverrideItemBinding = new ViewCategoryOverrideItemBinding((ConstraintLayout) inflate, textView, textView2, guideline, imageView);
                                 m.checkNotNullExpressionValue(viewCategoryOverrideItemBinding, "ViewCategoryOverrideItem….context), parent, false)");
                                 return new ViewHolder.CategoryOverridesViewHolder(viewCategoryOverrideItemBinding, this.onClick);
                             }
                         } else {
-                            i2 = 2131363339;
+                            i2 = 2131363365;
                         }
                     } else {
-                        i2 = 2131362222;
+                        i2 = 2131362233;
                     }
                 } else {
-                    i2 = 2131362221;
+                    i2 = 2131362232;
                 }
                 throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i2)));
             } else if (i != 5) {
@@ -251,31 +251,31 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter<Vi
             }
         }
         View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131558725, viewGroup, false);
-        TextView textView3 = (TextView) inflate2.findViewById(2131362282);
+        TextView textView3 = (TextView) inflate2.findViewById(2131362293);
         if (textView3 != null) {
-            TextView textView4 = (TextView) inflate2.findViewById(2131362283);
+            TextView textView4 = (TextView) inflate2.findViewById(2131362294);
             if (textView4 != null) {
-                TextView textView5 = (TextView) inflate2.findViewById(2131362284);
+                TextView textView5 = (TextView) inflate2.findViewById(2131362295);
                 if (textView5 != null) {
-                    Guideline guideline2 = (Guideline) inflate2.findViewById(2131363339);
+                    Guideline guideline2 = (Guideline) inflate2.findViewById(2131363365);
                     if (guideline2 != null) {
-                        ImageView imageView2 = (ImageView) inflate2.findViewById(2131364000);
+                        ImageView imageView2 = (ImageView) inflate2.findViewById(2131364041);
                         if (imageView2 != null) {
                             ViewChannelOverrideItemBinding viewChannelOverrideItemBinding = new ViewChannelOverrideItemBinding((ConstraintLayout) inflate2, textView3, textView4, textView5, guideline2, imageView2);
                             m.checkNotNullExpressionValue(viewChannelOverrideItemBinding, "ViewChannelOverrideItemB….context), parent, false)");
                             return new ViewHolder.ChannelOverridesViewHolder(viewChannelOverrideItemBinding, this.onClick);
                         }
                     } else {
-                        i2 = 2131363339;
+                        i2 = 2131363365;
                     }
                 } else {
-                    i2 = 2131362284;
+                    i2 = 2131362295;
                 }
             } else {
-                i2 = 2131362283;
+                i2 = 2131362294;
             }
         } else {
-            i2 = 2131362282;
+            i2 = 2131362293;
         }
         throw new NullPointerException("Missing required view with ID: ".concat(inflate2.getResources().getResourceName(i2)));
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.java
index d343de2dbc..09abd2361a 100644
--- a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1.java
@@ -17,6 +17,6 @@ public final class SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlin
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        this.$onClick.invoke(Long.valueOf(this.$it$inlined.getChannel().g()));
+        this.$onClick.invoke(Long.valueOf(this.$it$inlined.getChannel().h()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.java b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.java
index 8e9a0156ac..1e71b4e974 100644
--- a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter$computeChangedPositions$1.java
@@ -20,7 +20,7 @@ public final class SettingsChannelListAdapter$computeChangedPositions$1 extends
         m.checkNotNullParameter(payload, "item");
         int type = payload.getType();
         if (type == 0) {
-            return Long.valueOf(((SettingsChannelListAdapter.ChannelItem) payload).getChannel().g());
+            return Long.valueOf(((SettingsChannelListAdapter.ChannelItem) payload).getChannel().h());
         }
         if (type == 1) {
             return Long.valueOf(((SettingsChannelListAdapter.CategoryItem) payload).getId());
diff --git a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
index 35c144f1df..a23b347b29 100644
--- a/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/SettingsChannelListAdapter.java
@@ -39,7 +39,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
         private final boolean canManageChannelsOfCategory;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2139id;
+        private final long f2145id;
         private final boolean isDraggable;
         private final String key;
         private final String name;
@@ -48,7 +48,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         public CategoryItem(String str, long j, int i, boolean z2, boolean z3, boolean z4) {
             this.name = str;
-            this.f2139id = j;
+            this.f2145id = j;
             this.pos = i;
             this.isDraggable = z2;
             this.canManageCategory = z3;
@@ -65,7 +65,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 str = categoryItem.name;
             }
             if ((i2 & 2) != 0) {
-                j = categoryItem.f2139id;
+                j = categoryItem.f2145id;
             }
             if ((i2 & 4) != 0) {
                 i = categoryItem.pos;
@@ -87,7 +87,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
         }
 
         public final long component2() {
-            return this.f2139id;
+            return this.f2145id;
         }
 
         public final boolean component4() {
@@ -114,7 +114,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 return false;
             }
             CategoryItem categoryItem = (CategoryItem) obj;
-            return m.areEqual(this.name, categoryItem.name) && this.f2139id == categoryItem.f2139id && this.pos == categoryItem.pos && this.isDraggable == categoryItem.isDraggable && this.canManageCategory == categoryItem.canManageCategory && this.canManageChannelsOfCategory == categoryItem.canManageChannelsOfCategory;
+            return m.areEqual(this.name, categoryItem.name) && this.f2145id == categoryItem.f2145id && this.pos == categoryItem.pos && this.isDraggable == categoryItem.isDraggable && this.canManageCategory == categoryItem.canManageCategory && this.canManageChannelsOfCategory == categoryItem.canManageChannelsOfCategory;
         }
 
         public final boolean getCanManageCategory() {
@@ -131,7 +131,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
         }
 
         public final long getId() {
-            return this.f2139id;
+            return this.f2145id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -155,7 +155,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         public int hashCode() {
             String str = this.name;
-            int a = (((b.a(this.f2139id) + ((str != null ? str.hashCode() : 0) * 31)) * 31) + this.pos) * 31;
+            int a = (((b.a(this.f2145id) + ((str != null ? str.hashCode() : 0) * 31)) * 31) + this.pos) * 31;
             boolean z2 = this.isDraggable;
             int i = 1;
             if (z2) {
@@ -188,7 +188,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
             StringBuilder L = a.L("CategoryItem(name=");
             L.append(this.name);
             L.append(", id=");
-            L.append(this.f2139id);
+            L.append(this.f2145id);
             L.append(", pos=");
             L.append(this.pos);
             L.append(", isDraggable=");
@@ -207,14 +207,14 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public CategoryListItem(SettingsChannelListAdapter settingsChannelListAdapter) {
-            super(2131558657, settingsChannelListAdapter);
+            super(2131558655, settingsChannelListAdapter);
             m.checkNotNullParameter(settingsChannelListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364821;
-            ImageView imageView = (ImageView) view.findViewById(2131364821);
+            int i = 2131364870;
+            ImageView imageView = (ImageView) view.findViewById(2131364870);
             if (imageView != null) {
-                i = 2131364822;
-                TextView textView = (TextView) view.findViewById(2131364822);
+                i = 2131364871;
+                TextView textView = (TextView) view.findViewById(2131364871);
                 if (textView != null) {
                     SettingsChannelListCategoryItemBinding settingsChannelListCategoryItemBinding = new SettingsChannelListCategoryItemBinding((RelativeLayout) view, imageView, textView);
                     m.checkNotNullExpressionValue(settingsChannelListCategoryItemBinding, "SettingsChannelListCateg…temBinding.bind(itemView)");
@@ -241,13 +241,13 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 if (onClickListener != null) {
                     this.itemView.setOnClickListener(new SettingsChannelListAdapter$CategoryListItem$onConfigure$$inlined$let$lambda$1(onClickListener, categoryItem, this));
                 }
-                TextView textView = this.binding.f1624c;
+                TextView textView = this.binding.f1620c;
                 m.checkNotNullExpressionValue(textView, "binding.settingsChannelListCategoryItemText");
                 String name = categoryItem.getName();
                 if (name == null) {
                     View view = this.itemView;
                     m.checkNotNullExpressionValue(view, "itemView");
-                    name = view.getContext().getString(2131894051);
+                    name = view.getContext().getString(2131894152);
                 }
                 textView.setText(name);
                 ImageView imageView = this.binding.b;
@@ -276,7 +276,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
             this.isDraggable = z2;
             this.parentId = j;
             this.canManageCategoryOfChannel = z3;
-            this.key = String.valueOf(channel.g());
+            this.key = String.valueOf(channel.h());
         }
 
         public static /* synthetic */ ChannelItem copy$default(ChannelItem channelItem, Channel channel, boolean z2, long j, boolean z3, int i, Object obj) {
@@ -351,7 +351,7 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         @Override // com.discord.utilities.mg_recycler.DragAndDropAdapter.Payload
         public int getPosition() {
-            return this.channel.s();
+            return this.channel.t();
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload
@@ -401,20 +401,20 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ChannelListItem(SettingsChannelListAdapter settingsChannelListAdapter) {
-            super(2131558658, settingsChannelListAdapter);
+            super(2131558656, settingsChannelListAdapter);
             m.checkNotNullParameter(settingsChannelListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364823;
-            ImageView imageView = (ImageView) view.findViewById(2131364823);
+            int i = 2131364872;
+            ImageView imageView = (ImageView) view.findViewById(2131364872);
             if (imageView != null) {
-                i = 2131364824;
-                ImageView imageView2 = (ImageView) view.findViewById(2131364824);
+                i = 2131364873;
+                ImageView imageView2 = (ImageView) view.findViewById(2131364873);
                 if (imageView2 != null) {
-                    i = 2131364825;
-                    TextView textView = (TextView) view.findViewById(2131364825);
+                    i = 2131364874;
+                    TextView textView = (TextView) view.findViewById(2131364874);
                     if (textView != null) {
-                        i = 2131364826;
-                        View findViewById = view.findViewById(2131364826);
+                        i = 2131364875;
+                        View findViewById = view.findViewById(2131364875);
                         if (findViewById != null) {
                             SettingsChannelListItemBinding settingsChannelListItemBinding = new SettingsChannelListItemBinding((RelativeLayout) view, imageView, imageView2, textView, findViewById);
                             m.checkNotNullExpressionValue(settingsChannelListItemBinding, "SettingsChannelListItemBinding.bind(itemView)");
@@ -444,9 +444,9 @@ public final class SettingsChannelListAdapter extends CategoricalDragAndDropAdap
                 if (onClickListener != null) {
                     this.itemView.setOnClickListener(new SettingsChannelListAdapter$ChannelListItem$onConfigure$$inlined$let$lambda$1(onClickListener, channelItem, this));
                 }
-                ImageView imageView = this.binding.f1625c;
-                int z2 = channelItem.getChannel().z();
-                imageView.setImageResource(z2 != 2 ? z2 != 5 ? z2 != 13 ? 2131231483 : 2131231478 : 2131231468 : 2131231492);
+                ImageView imageView = this.binding.f1621c;
+                int A = channelItem.getChannel().A();
+                imageView.setImageResource(A != 2 ? A != 5 ? A != 13 ? 2131231489 : 2131231484 : 2131231474 : 2131231498);
                 TextView textView = this.binding.d;
                 m.checkNotNullExpressionValue(textView, "binding.settingsChannelListItemName");
                 textView.setText(AnimatableValueParser.y0(channelItem.getChannel()));
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java
index c634d0f8b8..05b551f410 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog$binding$2.java
@@ -19,23 +19,23 @@ public final /* synthetic */ class WidgetServerDeleteDialog$binding$2 extends k
 
     public final WidgetServerDeleteDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364620;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364620);
+        int i = 2131364669;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364669);
         if (materialButton != null) {
-            i = 2131364621;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364621);
+            i = 2131364670;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364670);
             if (materialButton2 != null) {
-                i = 2131364622;
-                TextView textView = (TextView) view.findViewById(2131364622);
+                i = 2131364671;
+                TextView textView = (TextView) view.findViewById(2131364671);
                 if (textView != null) {
-                    i = 2131364623;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364623);
+                    i = 2131364672;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364672);
                     if (textInputLayout != null) {
-                        i = 2131364624;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364624);
+                        i = 2131364673;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364673);
                         if (linearLayout != null) {
-                            i = 2131364625;
-                            TextView textView2 = (TextView) view.findViewById(2131364625);
+                            i = 2131364674;
+                            TextView textView2 = (TextView) view.findViewById(2131364674);
                             if (textView2 != null) {
                                 return new WidgetServerDeleteDialogBinding((LinearLayout) view, materialButton, materialButton2, textView, textInputLayout, linearLayout, textView2);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
index 70d03d3e90..dfb0378c3d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerDeleteDialog.java
@@ -59,7 +59,7 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         private final Guild guild;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2140me;
+        private final MeUser f2146me;
 
         /* compiled from: WidgetServerDeleteDialog.kt */
         public static final class Companion {
@@ -82,13 +82,13 @@ public final class WidgetServerDeleteDialog extends AppDialog {
                 }
                 Observable j2 = Observable.j(observeMe$default, observeGuild, (Func2) widgetServerDeleteDialog$Model$Companion$get$1);
                 m.checkNotNullExpressionValue(j2, "Observable.combineLatest…      ::Model\n          )");
-                return ObservableExtensionsKt.computationLatest(j2).s();
+                return ObservableExtensionsKt.computationLatest(j2).r();
             }
         }
 
         public Model(MeUser meUser, Guild guild) {
             m.checkNotNullParameter(meUser, "me");
-            this.f2140me = meUser;
+            this.f2146me = meUser;
             this.guild = guild;
         }
 
@@ -97,12 +97,12 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         }
 
         public final MeUser getMe() {
-            return this.f2140me;
+            return this.f2146me;
         }
     }
 
     public WidgetServerDeleteDialog() {
-        super(2131559133);
+        super(2131559139);
     }
 
     public static final /* synthetic */ void access$afterDeleteGuild(WidgetServerDeleteDialog widgetServerDeleteDialog, long j) {
@@ -133,18 +133,18 @@ public final class WidgetServerDeleteDialog extends AppDialog {
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.serverSettingsDeleteServerHeader");
         Context context = getContext();
-        textView.setText(context != null ? b.g(context, 2131888078, new Object[]{model.getGuild().getName()}, null, 4) : null);
+        textView.setText(context != null ? b.g(context, 2131888077, new Object[]{model.getGuild().getName()}, null, 4) : null);
         LinearLayout linearLayout = getBinding().f;
         m.checkNotNullExpressionValue(linearLayout, "binding.serverSettingsDeleteServerMfaWrap");
         linearLayout.setVisibility(model.getMe().getMfaEnabled() ? 0 : 8);
         TextView textView2 = getBinding().g;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsDeleteServerText");
-        b.n(textView2, 2131888075, new Object[]{model.getGuild().getName()}, null, 4);
+        b.m(textView2, 2131888074, new Object[]{model.getGuild().getName()}, null, 4);
         getBinding().b.setOnClickListener(new WidgetServerDeleteDialog$configureUI$1(this));
-        MaterialButton materialButton = getBinding().f1862c;
+        MaterialButton materialButton = getBinding().f1864c;
         m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsDeleteServerConfirm");
         materialButton.setEnabled(model.getGuild().isOwner(model.getMe().getId()));
-        getBinding().f1862c.setOnClickListener(new WidgetServerDeleteDialog$configureUI$2(this, model));
+        getBinding().f1864c.setOnClickListener(new WidgetServerDeleteDialog$configureUI$2(this, model));
     }
 
     private final WidgetServerDeleteDialogBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.java
index 90bf952cf2..40021836ac 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$Companion$getNotificationOverrides$2.java
@@ -56,14 +56,14 @@ public final class WidgetServerNotifications$Companion$getNotificationOverrides$
         ArrayList<Channel> arrayList2 = new ArrayList();
         for (Object obj2 : sortedVisibleChannels) {
             Channel channel = (Channel) obj2;
-            if (AnimatableValueParser.f1(channel) || AnimatableValueParser.x1(channel)) {
+            if (AnimatableValueParser.f1(channel) || AnimatableValueParser.y1(channel)) {
                 arrayList2.add(obj2);
             }
         }
         ArrayList arrayList3 = new ArrayList();
         for (Channel channel2 : arrayList2) {
-            ModelNotificationSettings.ChannelOverride channelOverride3 = (ModelNotificationSettings.ChannelOverride) linkedHashMap.get(Long.valueOf(channel2.g()));
-            NotificationsOverridesAdapter.Item item = channelOverride3 != null ? new NotificationsOverridesAdapter.Item(channel2, map.get(Long.valueOf(channel2.q())), channelOverride3) : null;
+            ModelNotificationSettings.ChannelOverride channelOverride3 = (ModelNotificationSettings.ChannelOverride) linkedHashMap.get(Long.valueOf(channel2.h()));
+            NotificationsOverridesAdapter.Item item = channelOverride3 != null ? new NotificationsOverridesAdapter.Item(channel2, map.get(Long.valueOf(channel2.r())), channelOverride3) : null;
             if (item != null) {
                 arrayList3.add(item);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java
index 5b211da849..01b8ec1f22 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$binding$2.java
@@ -8,7 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.p1;
+import c.a.i.r1;
 import com.discord.databinding.WidgetServerNotificationsBinding;
 import com.discord.views.CheckedSetting;
 import d0.z.d.k;
@@ -27,47 +27,47 @@ public final /* synthetic */ class WidgetServerNotifications$binding$2 extends k
         int i = 2131361919;
         View findViewById = view.findViewById(2131361919);
         if (findViewById != null) {
-            int i2 = 2131362223;
-            TextView textView = (TextView) findViewById.findViewById(2131362223);
+            int i2 = 2131362234;
+            TextView textView = (TextView) findViewById.findViewById(2131362234);
             if (textView != null) {
-                i2 = 2131363339;
-                Guideline guideline = (Guideline) findViewById.findViewById(2131363339);
+                i2 = 2131363365;
+                Guideline guideline = (Guideline) findViewById.findViewById(2131363365);
                 if (guideline != null) {
-                    i2 = 2131364000;
-                    ImageView imageView = (ImageView) findViewById.findViewById(2131364000);
+                    i2 = 2131364041;
+                    ImageView imageView = (ImageView) findViewById.findViewById(2131364041);
                     if (imageView != null) {
-                        p1 p1Var = new p1((ConstraintLayout) findViewById, textView, guideline, imageView);
-                        i = 2131363398;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363398);
+                        r1 r1Var = new r1((ConstraintLayout) findViewById, textView, guideline, imageView);
+                        i = 2131363425;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363425);
                         if (recyclerView != null) {
-                            i = 2131364584;
-                            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364584);
+                            i = 2131364633;
+                            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364633);
                             if (checkedSetting != null) {
-                                i = 2131364585;
-                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364585);
+                                i = 2131364634;
+                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364634);
                                 if (checkedSetting2 != null) {
-                                    i = 2131364586;
-                                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364586);
+                                    i = 2131364635;
+                                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364635);
                                     if (checkedSetting3 != null) {
-                                        i = 2131364587;
-                                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364587);
+                                        i = 2131364636;
+                                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364636);
                                         if (checkedSetting4 != null) {
-                                            i = 2131364588;
-                                            View findViewById2 = view.findViewById(2131364588);
+                                            i = 2131364637;
+                                            View findViewById2 = view.findViewById(2131364637);
                                             if (findViewById2 != null) {
-                                                i = 2131364589;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364589);
+                                                i = 2131364638;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364638);
                                                 if (linearLayout != null) {
-                                                    i = 2131364590;
-                                                    NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131364590);
+                                                    i = 2131364639;
+                                                    NotificationMuteSettingsView notificationMuteSettingsView = (NotificationMuteSettingsView) view.findViewById(2131364639);
                                                     if (notificationMuteSettingsView != null) {
-                                                        i = 2131364591;
-                                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364591);
+                                                        i = 2131364640;
+                                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364640);
                                                         if (checkedSetting5 != null) {
-                                                            i = 2131364592;
-                                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364592);
+                                                            i = 2131364641;
+                                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364641);
                                                             if (checkedSetting6 != null) {
-                                                                return new WidgetServerNotificationsBinding((CoordinatorLayout) view, p1Var, recyclerView, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, findViewById2, linearLayout, notificationMuteSettingsView, checkedSetting5, checkedSetting6);
+                                                                return new WidgetServerNotificationsBinding((CoordinatorLayout) view, r1Var, recyclerView, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, findViewById2, linearLayout, notificationMuteSettingsView, checkedSetting5, checkedSetting6);
                                                             }
                                                         }
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.java
index da53f7c22b..fc9a1ea17d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.java
@@ -28,7 +28,7 @@ public final class WidgetServerNotifications$createSwipeableItemTouchHelper$1 ex
         if (item != null) {
             Channel channel = item.getChannel();
             if (item.getOverrideSettings().isMuted()) {
-                StoreUserGuildSettings.setChannelMuted$default(StoreStream.Companion.getUserGuildSettings(), this.this$0.requireContext(), channel.g(), false, null, 8, null);
+                StoreUserGuildSettings.setChannelMuted$default(StoreStream.Companion.getUserGuildSettings(), this.this$0.requireContext(), channel.h(), false, null, 8, null);
             }
             StoreStream.Companion.getUserGuildSettings().setChannelFrequency(this.this$0.requireContext(), channel, ModelNotificationSettings.FREQUENCY_UNSET);
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.java
index 562eea25e3..4bfe5ac0d6 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications$onViewBound$1.java
@@ -30,6 +30,6 @@ public final class WidgetServerNotifications$onViewBound$1 extends o implements
         WidgetChannelNotificationSettings.Companion companion = WidgetChannelNotificationSettings.Companion;
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "itemView.context");
-        WidgetChannelNotificationSettings.Companion.launch$default(companion, context, item.getChannel().g(), false, 4, null);
+        WidgetChannelNotificationSettings.Companion.launch$default(companion, context, item.getChannel().h(), false, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
index 9c549532f5..a9d2bf1cbc 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotifications.java
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.d.l;
-import c.a.i.p1;
+import c.a.i.r1;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.discord.api.guild.preview.GuildPreview;
@@ -64,7 +64,7 @@ public final class WidgetServerNotifications extends AppFragment {
 
         private final Observable<List<NotificationsOverridesAdapter.Item>> getNotificationOverrides(long j) {
             StoreStream.Companion companion = StoreStream.Companion;
-            return Observable.i(companion.getUserGuildSettings().observeGuildSettings(j).G(WidgetServerNotifications$Companion$getNotificationOverrides$1.INSTANCE), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), GuildChannelsInfo.Companion.get(j), WidgetServerNotifications$Companion$getNotificationOverrides$2.INSTANCE);
+            return Observable.i(companion.getUserGuildSettings().observeGuildSettings(j).F(WidgetServerNotifications$Companion$getNotificationOverrides$1.INSTANCE), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), GuildChannelsInfo.Companion.get(j), WidgetServerNotifications$Companion$getNotificationOverrides$2.INSTANCE);
         }
 
         public final void launch(long j, Context context) {
@@ -98,9 +98,9 @@ public final class WidgetServerNotifications extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable i = Observable.i(companion.getGuilds().observeGuild(j), companion.getUserGuildSettings().observeGuildSettings(j), companion.getGuildProfiles().observeGuildProfile(j), WidgetServerNotifications$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(i, "Observable\n          .co…  } else null\n          }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationBuffered(i).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationBuffered(i).r();
+                m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+                return r;
             }
 
             public final boolean isValid(Guild guild, ModelNotificationSettings modelNotificationSettings) {
@@ -209,7 +209,7 @@ public final class WidgetServerNotifications extends AppFragment {
     }
 
     public WidgetServerNotifications() {
-        super(2131559135);
+        super(2131559141);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerNotifications widgetServerNotifications, Model model) {
@@ -245,7 +245,7 @@ public final class WidgetServerNotifications extends AppFragment {
             int i2 = CheckedSetting.i;
             checkedSetting.h(null, false);
         } else {
-            CharSequence j = b.j(this, 2131890774, new Object[0], null, 4);
+            CharSequence j = b.j(this, 2131890842, new Object[0], null, 4);
             int i3 = CheckedSetting.i;
             checkedSetting.h(j, false);
         }
@@ -262,7 +262,7 @@ public final class WidgetServerNotifications extends AppFragment {
             return;
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891534);
+        setActionBarTitle(2131891603);
         setActionBarSubtitle(model.getGuild().getName());
         ModelNotificationSettings guildSettings = model.getGuildSettings();
         boolean isMuted = guildSettings.isMuted();
@@ -273,7 +273,7 @@ public final class WidgetServerNotifications extends AppFragment {
         LinearLayout linearLayout = getBinding().i;
         m.checkNotNullExpressionValue(linearLayout, "binding.serverNotificationsFrequencyWrap");
         linearLayout.setVisibility(isMuted ^ true ? 0 : 8);
-        getBinding().j.updateView(new NotificationMuteSettingsView.ViewState(isMuted, guildSettings.getMuteEndTime(), b.g(requireContext(), 2131888698, new Object[]{model.getGuild().getName()}, null, 4), b.g(requireContext(), 2131888760, new Object[]{model.getGuild().getName()}, null, 4), b.g(requireContext(), 2131888694, new Object[0], null, 4), 2131888695, b.g(requireContext(), 2131888699, new Object[0], null, 4)), new WidgetServerNotifications$configureUI$onMute$1(this, id2), new WidgetServerNotifications$configureUI$onUnmute$1(this, id2));
+        getBinding().j.updateView(new NotificationMuteSettingsView.ViewState(isMuted, guildSettings.getMuteEndTime(), b.g(requireContext(), 2131888699, new Object[]{model.getGuild().getName()}, null, 4), b.g(requireContext(), 2131888761, new Object[]{model.getGuild().getName()}, null, 4), b.g(requireContext(), 2131888695, new Object[0], null, 4), 2131888696, b.g(requireContext(), 2131888700, new Object[0], null, 4)), new WidgetServerNotifications$configureUI$onMute$1(this, id2), new WidgetServerNotifications$configureUI$onUnmute$1(this, id2));
         getBinding().d.setOnCheckedListener(new WidgetServerNotifications$configureUI$1(this, model));
         CheckedSetting checkedSetting = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting, "binding.serverNotificationsEveryoneSwitch");
@@ -281,7 +281,7 @@ public final class WidgetServerNotifications extends AppFragment {
         CheckedSetting checkedSetting2 = getBinding().d;
         CheckedSetting checkedSetting3 = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.serverNotificationsEveryoneSwitch");
-        checkedSetting2.setText(b.i(checkedSetting3, 2131888749, new Object[0], null, 4));
+        checkedSetting2.setText(b.i(checkedSetting3, 2131888750, new Object[0], null, 4));
         getBinding().l.setOnCheckedListener(new WidgetServerNotifications$configureUI$2(this, model));
         CheckedSetting checkedSetting4 = getBinding().l;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.serverNotificationsRolesSwitch");
@@ -289,7 +289,7 @@ public final class WidgetServerNotifications extends AppFragment {
         CheckedSetting checkedSetting5 = getBinding().l;
         CheckedSetting checkedSetting6 = getBinding().l;
         m.checkNotNullExpressionValue(checkedSetting6, "binding.serverNotificationsRolesSwitch");
-        checkedSetting5.setText(b.i(checkedSetting6, 2131888750, new Object[0], null, 4));
+        checkedSetting5.setText(b.i(checkedSetting6, 2131888751, new Object[0], null, 4));
         CheckedSetting checkedSetting7 = getBinding().k;
         m.checkNotNullExpressionValue(checkedSetting7, "binding.serverNotificationsPushSwitch");
         checkedSetting7.setVisibility(model.getGuildSettings().isMuted() ^ true ? 0 : 8);
@@ -300,7 +300,7 @@ public final class WidgetServerNotifications extends AppFragment {
         CheckedSetting checkedSetting9 = getBinding().f;
         CheckedSetting checkedSetting10 = getBinding().f;
         m.checkNotNullExpressionValue(checkedSetting10, "binding.serverNotificationsFrequency1Radio");
-        checkedSetting9.setText(b.i(checkedSetting10, 2131888708, new Object[0], null, 4));
+        checkedSetting9.setText(b.i(checkedSetting10, 2131888709, new Object[0], null, 4));
         CheckedSetting checkedSetting11 = getBinding().e;
         m.checkNotNullExpressionValue(checkedSetting11, "binding.serverNotificationsFrequency0Radio");
         configureRadio(checkedSetting11, ModelNotificationSettings.FREQUENCY_ALL, model);
@@ -313,7 +313,7 @@ public final class WidgetServerNotifications extends AppFragment {
     }
 
     private final ItemTouchHelper createSwipeableItemTouchHelper() {
-        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this, 2131100324), ContextCompat.getDrawable(requireContext(), 2131231555), DimenUtils.dpToPixels(8));
+        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this, 2131100324), ContextCompat.getDrawable(requireContext(), 2131231561), DimenUtils.dpToPixels(8));
         return new ItemTouchHelper(new WidgetServerNotifications$createSwipeableItemTouchHelper$1(this, swipeRevealConfiguration, swipeRevealConfiguration, swipeRevealConfiguration));
     }
 
@@ -327,21 +327,21 @@ public final class WidgetServerNotifications extends AppFragment {
         super.onViewBound(view);
         this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g}));
         this.overrideAdapter = new NotificationsOverridesAdapter(WidgetServerNotifications$onViewBound$1.INSTANCE);
-        RecyclerView recyclerView = getBinding().f1864c;
+        RecyclerView recyclerView = getBinding().f1866c;
         m.checkNotNullExpressionValue(recyclerView, "binding.guildNotificationsOverrideList");
         recyclerView.setNestedScrollingEnabled(false);
-        RecyclerView recyclerView2 = getBinding().f1864c;
+        RecyclerView recyclerView2 = getBinding().f1866c;
         m.checkNotNullExpressionValue(recyclerView2, "binding.guildNotificationsOverrideList");
         NotificationsOverridesAdapter notificationsOverridesAdapter = this.overrideAdapter;
         if (notificationsOverridesAdapter == null) {
             m.throwUninitializedPropertyAccessException("overrideAdapter");
         }
         recyclerView2.setAdapter(notificationsOverridesAdapter);
-        createSwipeableItemTouchHelper().attachToRecyclerView(getBinding().f1864c);
+        createSwipeableItemTouchHelper().attachToRecyclerView(getBinding().f1866c);
         long longExtra = getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_GUILD_ID", -1);
-        p1 p1Var = getBinding().b;
-        m.checkNotNullExpressionValue(p1Var, "binding.addOverride");
-        p1Var.a.setOnClickListener(new WidgetServerNotifications$onViewBound$2(longExtra));
+        r1 r1Var = getBinding().b;
+        m.checkNotNullExpressionValue(r1Var, "binding.addOverride");
+        r1Var.a.setOnClickListener(new WidgetServerNotifications$onViewBound$2(longExtra));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.java
index f335247427..74ae18616a 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$Companion$get$1.java
@@ -31,7 +31,7 @@ public final class WidgetServerNotificationsOverrideSelector$Companion$get$1<T1,
         for (Object obj : sortedVisibleChannels) {
             Channel channel = (Channel) obj;
             boolean z2 = true;
-            if (AnimatableValueParser.x1(channel) || AnimatableValueParser.f1(channel)) {
+            if (AnimatableValueParser.y1(channel) || AnimatableValueParser.f1(channel)) {
                 String y0 = AnimatableValueParser.y0(channel);
                 m.checkNotNullExpressionValue(str, "filter");
             }
@@ -42,7 +42,7 @@ public final class WidgetServerNotificationsOverrideSelector$Companion$get$1<T1,
         }
         ArrayList arrayList2 = new ArrayList();
         for (Channel channel2 : arrayList) {
-            Object categoryItem = AnimatableValueParser.f1(channel2) ? new SettingsChannelListAdapter.CategoryItem(AnimatableValueParser.y0(channel2), channel2.g(), channel2.s(), false, false, false) : AnimatableValueParser.x1(channel2) ? new SettingsChannelListAdapter.ChannelItem(channel2, false, channel2.q(), false) : null;
+            Object categoryItem = AnimatableValueParser.f1(channel2) ? new SettingsChannelListAdapter.CategoryItem(AnimatableValueParser.y0(channel2), channel2.h(), channel2.t(), false, false, false) : AnimatableValueParser.y1(channel2) ? new SettingsChannelListAdapter.ChannelItem(channel2, false, channel2.r(), false) : null;
             if (categoryItem != null) {
                 arrayList2.add(categoryItem);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java
index 9ceb7f6c09..ff84503e21 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetServerNotificationsOverrideSelector$bin
 
     public final WidgetServerNotificationOverrideSelectorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363396;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363396);
+        int i = 2131363423;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363423);
         if (recyclerView != null) {
-            i = 2131363397;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363397);
+            i = 2131363424;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363424);
             if (textInputLayout != null) {
                 return new WidgetServerNotificationOverrideSelectorBinding((CoordinatorLayout) view, recyclerView, textInputLayout);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
index ef319b9a17..98a0573841 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.java
@@ -34,7 +34,7 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerNotificationsOverrideSelector$binding$2.INSTANCE, null, 2, null);
     private SettingsChannelListAdapter channelsAdapter;
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.m0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
 
     /* compiled from: WidgetServerNotificationsOverrideSelector.kt */
     public static final class Companion {
@@ -52,7 +52,7 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
         private final Observable<List<CategoricalDragAndDropAdapter.Payload>> get(long j, BehaviorSubject<String> behaviorSubject) {
             Observable i = Observable.i(StoreChannels.observeChannelsForGuild$default(StoreStream.Companion.getChannels(), j, null, 2, null), GuildChannelsInfo.Companion.get(j), ObservableExtensionsKt.leadingEdgeThrottle(behaviorSubject, 100, TimeUnit.MILLISECONDS), WidgetServerNotificationsOverrideSelector$Companion$get$1.INSTANCE);
             m.checkNotNullExpressionValue(i, "Observable.combineLatest…              }\n        }");
-            return ObservableExtensionsKt.computationBuffered(i).s();
+            return ObservableExtensionsKt.computationBuffered(i).r();
         }
 
         public final void launch(Context context, long j) {
@@ -64,7 +64,7 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
     }
 
     public WidgetServerNotificationsOverrideSelector() {
-        super(2131559134);
+        super(2131559140);
     }
 
     public static final /* synthetic */ SettingsChannelListAdapter access$getChannelsAdapter$p(WidgetServerNotificationsOverrideSelector widgetServerNotificationsOverrideSelector) {
@@ -92,9 +92,9 @@ public final class WidgetServerNotificationsOverrideSelector extends AppFragment
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891529);
-        setActionBarSubtitle(2131893137);
-        TextInputLayout textInputLayout = getBinding().f1863c;
+        setActionBarTitle(2131891598);
+        setActionBarSubtitle(2131893220);
+        TextInputLayout textInputLayout = getBinding().f1865c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.guildNotificationsChannelSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetServerNotificationsOverrideSelector$onViewBound$1(this));
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java
index d8919dabd3..092955ff66 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetServerRegionSelectDialog$binding$2 exte
 
     public final WidgetServerSettingsOverviewRegionBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362215;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362215);
+        int i = 2131362226;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362226);
         if (materialButton != null) {
-            i = 2131364677;
-            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364677);
+            i = 2131364726;
+            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364726);
             if (maxHeightRecyclerView != null) {
                 return new WidgetServerSettingsOverviewRegionBinding((LinearLayout) view, materialButton, maxHeightRecyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java
index ebfbba0d8d..f2507d7539 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerRegionSelectDialog.java
@@ -81,9 +81,9 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<Model> G = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getGuildVoiceRegions(j), false, 1, null).G(WidgetServerRegionSelectDialog$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "RestAPI\n              .a…       .map { Model(it) }");
-                return G;
+                Observable<Model> F = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getGuildVoiceRegions(j), false, 1, null).F(WidgetServerRegionSelectDialog$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "RestAPI\n              .a…       .map { Model(it) }");
+                return F;
             }
         }
 
@@ -138,7 +138,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
                 TextView textView = this.binding.b;
                 m.checkNotNullExpressionValue(textView, "binding.serverSettingsOverviewRegionItemName");
                 textView.setText(voiceRegion.getName());
-                int i2 = m.areEqual(this.this$0.getSelectedRegion(), voiceRegion.getId()) ? 2131231505 : 0;
+                int i2 = m.areEqual(this.this$0.getSelectedRegion(), voiceRegion.getId()) ? 2131231511 : 0;
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.serverSettingsOverviewRegionItemName");
                 DrawableCompat.setCompoundDrawablesCompat$default(textView2, IconUtils.INSTANCE.getVoiceRegionIconResourceId(voiceRegion.getId()), 0, i2, 0, 10, (Object) null);
@@ -167,7 +167,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public ItemRegion onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ItemRegion(this, 2131559174, this);
+            return new ItemRegion(this, 2131559180, this);
         }
 
         public final void setSelectedRegion(String str) {
@@ -179,7 +179,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
     public static final class VoiceRegion implements MGRecyclerDataPayload {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2141id;
+        private final String f2147id;
         private final String key;
         private final String name;
         private final int type;
@@ -197,14 +197,14 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         public VoiceRegion(String str, String str2) {
             m.checkNotNullParameter(str, "id");
             m.checkNotNullParameter(str2, "name");
-            this.f2141id = str;
+            this.f2147id = str;
             this.name = str2;
             this.key = str;
         }
 
         public static /* synthetic */ VoiceRegion copy$default(VoiceRegion voiceRegion, String str, String str2, int i, Object obj) {
             if ((i & 1) != 0) {
-                str = voiceRegion.f2141id;
+                str = voiceRegion.f2147id;
             }
             if ((i & 2) != 0) {
                 str2 = voiceRegion.name;
@@ -213,7 +213,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         }
 
         public final String component1() {
-            return this.f2141id;
+            return this.f2147id;
         }
 
         public final String component2() {
@@ -234,11 +234,11 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
                 return false;
             }
             VoiceRegion voiceRegion = (VoiceRegion) obj;
-            return m.areEqual(this.f2141id, voiceRegion.f2141id) && m.areEqual(this.name, voiceRegion.name);
+            return m.areEqual(this.f2147id, voiceRegion.f2147id) && m.areEqual(this.name, voiceRegion.name);
         }
 
         public final String getId() {
-            return this.f2141id;
+            return this.f2147id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -256,7 +256,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         }
 
         public int hashCode() {
-            String str = this.f2141id;
+            String str = this.f2147id;
             int i = 0;
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.name;
@@ -268,14 +268,14 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
 
         public String toString() {
             StringBuilder L = a.L("VoiceRegion(id=");
-            L.append(this.f2141id);
+            L.append(this.f2147id);
             L.append(", name=");
             return a.D(L, this.name, ")");
         }
     }
 
     public WidgetServerRegionSelectDialog() {
-        super(2131559173);
+        super(2131559179);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerRegionSelectDialog widgetServerRegionSelectDialog, Model model) {
@@ -314,7 +314,7 @@ public final class WidgetServerRegionSelectDialog extends AppDialog {
         long j = getArgumentsOrDefault().getLong("INTENT_GUILD_ID");
         String string = getArgumentsOrDefault().getString("INTENT_REGION_SELECTED");
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1896c;
+        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1898c;
         m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.serverSettingsOverviewRegionList");
         this.adapter = (RegionAdapter) companion.configure(new RegionAdapter(maxHeightRecyclerView, string, new WidgetServerRegionSelectDialog$onViewBoundOrOnResume$2(this)));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(j), this, null, 2, null), WidgetServerRegionSelectDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerRegionSelectDialog$onViewBoundOrOnResume$3(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java
index b6086ed529..346431d43e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$binding$2.java
@@ -19,71 +19,71 @@ public final /* synthetic */ class WidgetServerSettings$binding$2 extends k impl
 
     public final WidgetServerSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364600;
-        TextView textView = (TextView) view.findViewById(2131364600);
+        int i = 2131364649;
+        TextView textView = (TextView) view.findViewById(2131364649);
         if (textView != null) {
-            i = 2131364610;
-            TextView textView2 = (TextView) view.findViewById(2131364610);
+            i = 2131364659;
+            TextView textView2 = (TextView) view.findViewById(2131364659);
             if (textView2 != null) {
-                i = 2131364633;
-                TextView textView3 = (TextView) view.findViewById(2131364633);
+                i = 2131364682;
+                TextView textView3 = (TextView) view.findViewById(2131364682);
                 if (textView3 != null) {
-                    i = 2131364637;
-                    TextView textView4 = (TextView) view.findViewById(2131364637);
+                    i = 2131364686;
+                    TextView textView4 = (TextView) view.findViewById(2131364686);
                     if (textView4 != null) {
-                        i = 2131364639;
-                        TextView textView5 = (TextView) view.findViewById(2131364639);
+                        i = 2131364688;
+                        TextView textView5 = (TextView) view.findViewById(2131364688);
                         if (textView5 != null) {
-                            i = 2131364644;
-                            TextView textView6 = (TextView) view.findViewById(2131364644);
+                            i = 2131364693;
+                            TextView textView6 = (TextView) view.findViewById(2131364693);
                             if (textView6 != null) {
-                                i = 2131364658;
-                                TextView textView7 = (TextView) view.findViewById(2131364658);
+                                i = 2131364707;
+                                TextView textView7 = (TextView) view.findViewById(2131364707);
                                 if (textView7 != null) {
-                                    i = 2131364659;
-                                    TextView textView8 = (TextView) view.findViewById(2131364659);
+                                    i = 2131364708;
+                                    TextView textView8 = (TextView) view.findViewById(2131364708);
                                     if (textView8 != null) {
-                                        i = 2131364660;
-                                        TextView textView9 = (TextView) view.findViewById(2131364660);
+                                        i = 2131364709;
+                                        TextView textView9 = (TextView) view.findViewById(2131364709);
                                         if (textView9 != null) {
-                                            i = 2131364661;
-                                            TextView textView10 = (TextView) view.findViewById(2131364661);
+                                            i = 2131364710;
+                                            TextView textView10 = (TextView) view.findViewById(2131364710);
                                             if (textView10 != null) {
-                                                i = 2131364662;
-                                                TextView textView11 = (TextView) view.findViewById(2131364662);
+                                                i = 2131364711;
+                                                TextView textView11 = (TextView) view.findViewById(2131364711);
                                                 if (textView11 != null) {
-                                                    i = 2131364663;
-                                                    TextView textView12 = (TextView) view.findViewById(2131364663);
+                                                    i = 2131364712;
+                                                    TextView textView12 = (TextView) view.findViewById(2131364712);
                                                     if (textView12 != null) {
-                                                        i = 2131364664;
-                                                        TextView textView13 = (TextView) view.findViewById(2131364664);
+                                                        i = 2131364713;
+                                                        TextView textView13 = (TextView) view.findViewById(2131364713);
                                                         if (textView13 != null) {
-                                                            i = 2131364690;
-                                                            TextView textView14 = (TextView) view.findViewById(2131364690);
+                                                            i = 2131364739;
+                                                            TextView textView14 = (TextView) view.findViewById(2131364739);
                                                             if (textView14 != null) {
-                                                                i = 2131364692;
-                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364692);
+                                                                i = 2131364741;
+                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364741);
                                                                 if (linearLayout != null) {
-                                                                    i = 2131364693;
-                                                                    View findViewById = view.findViewById(2131364693);
+                                                                    i = 2131364742;
+                                                                    View findViewById = view.findViewById(2131364742);
                                                                     if (findViewById != null) {
-                                                                        i = 2131364694;
-                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364694);
+                                                                        i = 2131364743;
+                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364743);
                                                                         if (linearLayout2 != null) {
-                                                                            i = 2131364695;
-                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364695);
+                                                                            i = 2131364744;
+                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364744);
                                                                             if (linearLayout3 != null) {
-                                                                                i = 2131364696;
-                                                                                View findViewById2 = view.findViewById(2131364696);
+                                                                                i = 2131364745;
+                                                                                View findViewById2 = view.findViewById(2131364745);
                                                                                 if (findViewById2 != null) {
-                                                                                    i = 2131364702;
-                                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364702);
+                                                                                    i = 2131364751;
+                                                                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364751);
                                                                                     if (simpleDraweeView != null) {
-                                                                                        i = 2131364703;
-                                                                                        TextView textView15 = (TextView) view.findViewById(2131364703);
+                                                                                        i = 2131364752;
+                                                                                        TextView textView15 = (TextView) view.findViewById(2131364752);
                                                                                         if (textView15 != null) {
-                                                                                            i = 2131364704;
-                                                                                            TextView textView16 = (TextView) view.findViewById(2131364704);
+                                                                                            i = 2131364753;
+                                                                                            TextView textView16 = (TextView) view.findViewById(2131364753);
                                                                                             if (textView16 != null) {
                                                                                                 return new WidgetServerSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, textView13, textView14, linearLayout, findViewById, linearLayout2, linearLayout3, findViewById2, simpleDraweeView, textView15, textView16);
                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java
index 3c29e1ced7..ef88f62487 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings$configureToolbar$1.java
@@ -19,7 +19,7 @@ public final class WidgetServerSettings$configureToolbar$1<T1, T2> implements Ac
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363903) {
+        if (menuItem.getItemId() == 2131363944) {
             WidgetServerDeleteDialog.Companion companion = WidgetServerDeleteDialog.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
index b21248a885..d7ee1f962e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java
@@ -75,9 +75,9 @@ public final class WidgetServerSettings extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable g = Observable.g(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeGuild(j), companion.getPermissions().observePermissionsForGuild(j), companion.getChannels().observeChannelCategories(j), companion.getPermissions().observeChannelPermissionsForGuild(j), WidgetServerSettings$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(g, "Observable\n          .co…GuildContext)\n          }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(g).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(g).r();
+                m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -153,7 +153,7 @@ public final class WidgetServerSettings extends AppFragment {
     }
 
     public WidgetServerSettings() {
-        super(2131559136);
+        super(2131559142);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettings widgetServerSettings, Model model) {
@@ -197,7 +197,7 @@ public final class WidgetServerSettings extends AppFragment {
         }
         z2 = false;
         linearLayout.setVisibility(z2 ? 0 : 8);
-        View view = getBinding().f1872s;
+        View view = getBinding().f1874s;
         m.checkNotNullExpressionValue(view, "binding.serverSettingsSectionUserManagementDivider");
         if (!z8 || !listOf.isEmpty()) {
             Iterator it2 = listOf.iterator();
@@ -319,12 +319,12 @@ public final class WidgetServerSettings extends AppFragment {
         LinearLayout linearLayout = getBinding().p;
         m.checkNotNullExpressionValue(linearLayout, "binding.serverSettingsSectionCommunity");
         linearLayout.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8);
-        TextView textView8 = getBinding().f1871c;
+        TextView textView8 = getBinding().f1873c;
         m.checkNotNullExpressionValue(textView8, "binding.serverSettingsCommunityOverviewOption");
         Set<GuildFeature> features = model.getGuild().getFeatures();
         GuildFeature guildFeature = GuildFeature.COMMUNITY;
         textView8.setVisibility(features.contains(guildFeature) ? 0 : 8);
-        getBinding().f1871c.setOnClickListener(new WidgetServerSettings$configureUI$8(model));
+        getBinding().f1873c.setOnClickListener(new WidgetServerSettings$configureUI$8(model));
         TextView textView9 = getBinding().e;
         m.checkNotNullExpressionValue(textView9, "binding.serverSettingsEnableCommunityOption");
         textView9.setVisibility(model.getGuild().getFeatures().contains(guildFeature) ^ true ? 0 : 8);
@@ -361,7 +361,7 @@ public final class WidgetServerSettings extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131893185);
+        setActionBarTitle(2131893268);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java
index c1becbffa7..0dae23a08f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$Model$Companion$getBanItems$1.java
@@ -92,8 +92,8 @@ public final class WidgetServerSettingsBans$Model$Companion$getBanItems$1<T, R>
         }
 
         public final Observable<? extends List<WidgetServerSettingsBans.Model.BanItem>> call(String str) {
-            Observable<R> G = Observable.B(this.$bannedUserMap.values()).y(new AnonymousClass1(str)).G(AnonymousClass2.INSTANCE);
-            return Observable.i0(new r(G.i, new o2(AnonymousClass3.INSTANCE, 10)));
+            Observable<R> F = Observable.A(this.$bannedUserMap.values()).x(new AnonymousClass1(str)).F(AnonymousClass2.INSTANCE);
+            return Observable.h0(new r(F.i, new o2(AnonymousClass3.INSTANCE, 10)));
         }
     }
 
@@ -113,6 +113,6 @@ public final class WidgetServerSettingsBans$Model$Companion$getBanItems$1<T, R>
     }
 
     public final Observable<? extends WidgetServerSettingsBans.Model> call(Map<Long, ? extends ModelBan> map) {
-        return map == null ? StoreStream.Companion.getGuilds().observeGuild(this.$guildId).G(AnonymousClass1.INSTANCE) : Observable.i(StoreStream.Companion.getGuilds().observeGuild(this.$guildId), new j(Integer.valueOf(map.size())), this.$filterPublisher.Z(new AnonymousClass2(map)), AnonymousClass3.INSTANCE);
+        return map == null ? StoreStream.Companion.getGuilds().observeGuild(this.$guildId).F(AnonymousClass1.INSTANCE) : Observable.i(StoreStream.Companion.getGuilds().observeGuild(this.$guildId), new j(Integer.valueOf(map.size())), this.$filterPublisher.Y(new AnonymousClass2(map)), AnonymousClass3.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java
index 6ccdd7d95b..36285fa926 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java
@@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetServerSettingsBans$binding$2 extends k
 
     public final WidgetServerSettingsBansBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364013;
-        TextView textView = (TextView) view.findViewById(2131364013);
+        int i = 2131364056;
+        TextView textView = (TextView) view.findViewById(2131364056);
         if (textView != null) {
-            i = 2131364019;
-            TextView textView2 = (TextView) view.findViewById(2131364019);
+            i = 2131364062;
+            TextView textView2 = (TextView) view.findViewById(2131364062);
             if (textView2 != null) {
-                i = 2131364601;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364601);
+                i = 2131364650;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364650);
                 if (recyclerView != null) {
-                    i = 2131364602;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364602);
+                    i = 2131364651;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364651);
                     if (textInputLayout != null) {
-                        i = 2131364603;
-                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364603);
+                        i = 2131364652;
+                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364652);
                         if (appViewFlipper != null) {
                             return new WidgetServerSettingsBansBinding((CoordinatorLayout) view, textView, textView2, recyclerView, textInputLayout, appViewFlipper);
                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
index 874ef6f45d..52d20b7fc2 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java
@@ -61,7 +61,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
     private Adapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsBans$binding$2.INSTANCE, null, 2, null);
     private AlertDialog dialog;
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.m0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
     private long guildId;
 
     /* compiled from: WidgetServerSettingsBans.kt */
@@ -75,16 +75,16 @@ public final class WidgetServerSettingsBans extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public BanListItem(Adapter adapter, Adapter adapter2) {
-                super(2131559143, adapter2);
+                super(2131559149, adapter2);
                 m.checkNotNullParameter(adapter2, "adapter");
                 this.this$0 = adapter;
                 View view = this.itemView;
                 RelativeLayout relativeLayout = (RelativeLayout) view;
-                int i = 2131362080;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362080);
+                int i = 2131362084;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362084);
                 if (simpleDraweeView != null) {
-                    i = 2131362081;
-                    TextView textView = (TextView) view.findViewById(2131362081);
+                    i = 2131362085;
+                    TextView textView = (TextView) view.findViewById(2131362085);
                     if (textView != null) {
                         WidgetServerSettingsBanListItemBinding widgetServerSettingsBanListItemBinding = new WidgetServerSettingsBanListItemBinding((RelativeLayout) view, relativeLayout, simpleDraweeView, textView);
                         m.checkNotNullExpressionValue(widgetServerSettingsBanListItemBinding, "WidgetServerSettingsBanL…temBinding.bind(itemView)");
@@ -109,7 +109,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
                 ModelBan ban = banItem.getBan();
                 CoreUser coreUser = null;
                 textView.setText((ban == null || (user2 = ban.getUser()) == null) ? null : user2.r());
-                SimpleDraweeView simpleDraweeView = this.binding.f1869c;
+                SimpleDraweeView simpleDraweeView = this.binding.f1871c;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.banListItemAvatar");
                 ModelBan ban2 = banItem.getBan();
                 if (!(ban2 == null || (user = ban2.getUser()) == null)) {
@@ -284,20 +284,20 @@ public final class WidgetServerSettingsBans extends AppFragment {
             }
 
             private final Observable<Model> getBanItems(long j, Observable<String> observable) {
-                Observable<R> Z = StoreStream.Companion.getBans().observeBans(j).Z(new WidgetServerSettingsBans$Model$Companion$getBanItems$1(j, observable));
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getBans().observeBans(j).Y(new WidgetServerSettingsBans$Model$Companion$getBanItems$1(j, observable));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
 
             private final Observable<Boolean> getCanManageBans(long j) {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable i = Observable.i(companion.getPermissions().observePermissionsForGuild(j), companion.getGuilds().observeGuild(j), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), WidgetServerSettingsBans$Model$Companion$getCanManageBans$1.INSTANCE);
                 m.checkNotNullExpressionValue(i, "Observable\n             …        }\n              }");
-                Observable<Boolean> s2 = ObservableExtensionsKt.computationLatest(i).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n             …  .distinctUntilChanged()");
-                return s2;
+                Observable<Boolean> r = ObservableExtensionsKt.computationLatest(i).r();
+                m.checkNotNullExpressionValue(r, "Observable\n             …  .distinctUntilChanged()");
+                return r;
             }
 
             public final Model create(Guild guild, Integer num, List<BanItem> list) {
@@ -309,9 +309,9 @@ public final class WidgetServerSettingsBans extends AppFragment {
 
             public final Observable<Model> get(long j, Observable<String> observable) {
                 m.checkNotNullParameter(observable, "filterPublisher");
-                Observable<R> Z = getCanManageBans(j).Z(new WidgetServerSettingsBans$Model$Companion$get$1(j, observable));
-                m.checkNotNullExpressionValue(Z, "getCanManageBans(guildId….just(null)\n            }");
-                return Z;
+                Observable<R> Y = getCanManageBans(j).Y(new WidgetServerSettingsBans$Model$Companion$get$1(j, observable));
+                m.checkNotNullExpressionValue(Y, "getCanManageBans(guildId….just(null)\n            }");
+                return Y;
             }
         }
 
@@ -438,7 +438,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
     }
 
     public WidgetServerSettingsBans() {
-        super(2131559144);
+        super(2131559150);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsBans widgetServerSettingsBans, Model model) {
@@ -506,7 +506,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
     private final void showConfirmUnbanDialog(long j, ModelBan modelBan) {
         String reason = modelBan.getReason();
         if (reason == null) {
-            reason = getString(2131891371);
+            reason = getString(2131891442);
         }
         m.checkNotNullExpressionValue(reason, "ban.reason ?: getString(R.string.no_ban_reason)");
         StringBuilder sb = new StringBuilder();
@@ -519,7 +519,7 @@ public final class WidgetServerSettingsBans extends AppFragment {
         sb.append(upperCase);
         sb.append("\n");
         sb.append(reason);
-        WidgetNoticeDialog.Builder dialogAttrTheme = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(c.a.l.b.g(requireContext(), 2131894047, new Object[]{modelBan.getUser().r()}, null, 4).toString()).setMessage(sb.toString()), 2131887178, (Function1) null, 2, (Object) null).setPositiveButton(2131894045, new WidgetServerSettingsBans$showConfirmUnbanDialog$1(this, j, modelBan)).setDialogAttrTheme(2130969788);
+        WidgetNoticeDialog.Builder dialogAttrTheme = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(c.a.l.b.g(requireContext(), 2131894148, new Object[]{modelBan.getUser().r()}, null, 4).toString()).setMessage(sb.toString()), 2131887178, (Function1) null, 2, (Object) null).setPositiveButton(2131894146, new WidgetServerSettingsBans$showConfirmUnbanDialog$1(this, j, modelBan)).setDialogAttrTheme(2130969788);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         dialogAttrTheme.show(parentFragmentManager);
@@ -539,10 +539,10 @@ public final class WidgetServerSettingsBans extends AppFragment {
     public void onResume() {
         super.onResume();
         BehaviorSubject<String> behaviorSubject = this.filterPublisher;
-        TextInputLayout textInputLayout = getBinding().f1870c;
+        TextInputLayout textInputLayout = getBinding().f1872c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.serverSettingsBansSearch");
         behaviorSubject.onNext(ViewExtensions.getTextOrEmpty(textInputLayout));
-        TextInputLayout textInputLayout2 = getBinding().f1870c;
+        TextInputLayout textInputLayout2 = getBinding().f1872c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.serverSettingsBansSearch");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetServerSettingsBans$onResume$1(this));
         Model.Companion companion = Model.Companion;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$get$1.java
index 777e7a78fd..7d0927f8f8 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$get$1.java
@@ -48,16 +48,16 @@ public final class WidgetServerSettingsChannels$Model$Companion$get$1<T1, T2, T3
         }
         Collections.sort(list, AnimatableValueParser.K0(Channel.Companion));
         for (Channel channel : list) {
-            if (PermissionUtils.hasAccess(channel, map2) || channel.g() == 0) {
+            if (PermissionUtils.hasAccess(channel, map2) || channel.h() == 0) {
                 ArrayList arrayList2 = new ArrayList();
                 boolean can = PermissionUtils.can(j, (Long) a.d(channel, map2));
                 if (can || canAndIsElevated) {
-                    hashSet2.add(Long.valueOf(channel.g()));
+                    hashSet2.add(Long.valueOf(channel.h()));
                 }
                 if (!z2 || can) {
                     hashSet = hashSet2;
-                    arrayList2.add(new SettingsChannelListAdapter.CategoryItem(AnimatableValueParser.y0(channel), channel.g(), channel.s(), num.intValue() == 4, canAndIsElevated, can));
-                    linkedHashMap.put(Long.valueOf(channel.g()), arrayList2);
+                    arrayList2.add(new SettingsChannelListAdapter.CategoryItem(AnimatableValueParser.y0(channel), channel.h(), channel.t(), num.intValue() == 4, canAndIsElevated, can));
+                    linkedHashMap.put(Long.valueOf(channel.h()), arrayList2);
                     hashSet2 = hashSet;
                     j = 16;
                 }
@@ -76,11 +76,11 @@ public final class WidgetServerSettingsChannels$Model$Companion$get$1<T1, T2, T3
         while (it.hasNext()) {
             Channel next = it.next();
             m.checkNotNullExpressionValue(next, "channel");
-            SettingsChannelListAdapter.ChannelItem channelItem = new SettingsChannelListAdapter.ChannelItem(next, z2, next.q(), hashSet3.contains(Long.valueOf(next.q())));
-            if (!z2 || hashSet3.contains(Long.valueOf(next.q()))) {
-                if (AnimatableValueParser.j1(next) && PermissionUtils.hasAccess(next, map2)) {
+            SettingsChannelListAdapter.ChannelItem channelItem = new SettingsChannelListAdapter.ChannelItem(next, z2, next.r(), hashSet3.contains(Long.valueOf(next.r())));
+            if (!z2 || hashSet3.contains(Long.valueOf(next.r()))) {
+                if (AnimatableValueParser.k1(next) && PermissionUtils.hasAccess(next, map2)) {
                     arrayList3.add(channelItem);
-                } else if (AnimatableValueParser.z1(next) && PermissionUtils.hasAccess(next, map2)) {
+                } else if (AnimatableValueParser.B1(next) && PermissionUtils.hasAccess(next, map2)) {
                     arrayList4.add(channelItem);
                 }
             }
@@ -90,12 +90,12 @@ public final class WidgetServerSettingsChannels$Model$Companion$get$1<T1, T2, T3
             sortedGuildChannels = sortedGuildChannels;
         }
         for (SettingsChannelListAdapter.ChannelItem channelItem2 : arrayList3) {
-            if (linkedHashMap.containsKey(Long.valueOf(channelItem2.getChannel().q())) && (list3 = (List) linkedHashMap.get(Long.valueOf(channelItem2.getChannel().q()))) != null) {
+            if (linkedHashMap.containsKey(Long.valueOf(channelItem2.getChannel().r())) && (list3 = (List) linkedHashMap.get(Long.valueOf(channelItem2.getChannel().r()))) != null) {
                 list3.add(channelItem2);
             }
         }
         for (SettingsChannelListAdapter.ChannelItem channelItem3 : arrayList4) {
-            if (linkedHashMap.containsKey(Long.valueOf(channelItem3.getChannel().q())) && (list2 = (List) linkedHashMap.get(Long.valueOf(channelItem3.getChannel().q()))) != null) {
+            if (linkedHashMap.containsKey(Long.valueOf(channelItem3.getChannel().r())) && (list2 = (List) linkedHashMap.get(Long.valueOf(channelItem3.getChannel().r()))) != null) {
                 list2.add(channelItem3);
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$getSortedGuildChannels$$inlined$also$lambda$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$getSortedGuildChannels$$inlined$also$lambda$1.java
index e04e00ad84..82c0902ff5 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$getSortedGuildChannels$$inlined$also$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$Model$Companion$getSortedGuildChannels$$inlined$also$lambda$1.java
@@ -29,13 +29,13 @@ public final class WidgetServerSettingsChannels$Model$Companion$getSortedGuildCh
         m.checkNotNullParameter(channel, "channel");
         int i = this.$channelType$inlined;
         if (i == 0) {
-            return AnimatableValueParser.j1(channel);
-        }
-        if (i == 2) {
             return AnimatableValueParser.k1(channel);
         }
-        int z2 = channel.z();
+        if (i == 2) {
+            return AnimatableValueParser.l1(channel);
+        }
+        int A = channel.A();
         int i2 = this.$channelType$inlined;
-        return z2 == i2 || i2 == -1;
+        return A == i2 || i2 == -1;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java
index 696b61039f..f53aef7418 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java
@@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetServerSettingsChannels$binding$2 extend
 
     public final WidgetServerSettingsChannelsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131364604;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364604);
+            i = 2131364653;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364653);
             if (floatingActionButton != null) {
-                i = 2131364608;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364608);
+                i = 2131364657;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364657);
                 if (recyclerView != null) {
-                    i = 2131365614;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365614);
+                    i = 2131365675;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365675);
                     if (frameLayout != null) {
                         return new WidgetServerSettingsChannelsBinding((CoordinatorLayout) view, dimmerView, floatingActionButton, recyclerView, frameLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java
index 07414596a7..a93dcc7f69 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java
@@ -41,6 +41,6 @@ public final class WidgetServerSettingsChannels$configureFabVisibility$1 impleme
         FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
         m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
         companion.show(id2, childFragmentManager, new AnonymousClass1(this));
-        WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1873c.hide();
+        WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1875c.hide();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java
index ea543b6b8b..a171334a27 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java
@@ -20,9 +20,9 @@ public final class WidgetServerSettingsChannels$configureFabVisibility$setFabVis
     /* renamed from: invoke */
     public final void mo1invoke() {
         if (!this.$model.isSorting()) {
-            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1873c.show();
+            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1875c.show();
         } else {
-            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1873c.hide();
+            WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1875c.hide();
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
index c2f2cd11dd..d7aeac1926 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java
@@ -44,13 +44,13 @@ public final class WidgetServerSettingsChannels$configureUI$1<T1, T2> implements
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363911:
+            case 2131363952:
                 WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion;
                 FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
                 companion.show(childFragmentManager, new AnonymousClass1(this));
                 return;
-            case 2131363912:
+            case 2131363953:
                 WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1);
                 return;
             default:
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java
index bd0be2a603..6dcbcbb12f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java
@@ -14,10 +14,10 @@ public final class WidgetServerSettingsChannels$configureUI$2<T> implements Acti
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363911);
+        MenuItem findItem = menu.findItem(2131363952);
         m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_sort_channel)");
         findItem.setVisible(!this.$model.isSorting());
-        MenuItem findItem2 = menu.findItem(2131363912);
+        MenuItem findItem2 = menu.findItem(2131363953);
         m.checkNotNullExpressionValue(findItem2, "menu.findItem(R.id.menu_sort_done)");
         findItem2.setVisible(this.$model.isSorting());
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$setOnClickListener$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$setOnClickListener$2.java
index c4280db781..9193cabdc1 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$setOnClickListener$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$setOnClickListener$2.java
@@ -32,7 +32,7 @@ public final class WidgetServerSettingsChannels$setOnClickListener$2 extends o i
     public final void invoke(long j) {
         if (PermissionUtils.can(16, this.$model.getChannelPermissions().get(Long.valueOf(j)))) {
             Channel channel = this.$model.getChannels().get(Long.valueOf(j));
-            if (channel == null || !AnimatableValueParser.z1(channel)) {
+            if (channel == null || !AnimatableValueParser.B1(channel)) {
                 WidgetTextChannelSettings.Companion.launch(j, this.this$0.requireContext());
             } else {
                 WidgetVoiceChannelSettings.Companion.launch(j, this.this$0.requireContext());
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
index 1e9f0e491a..3f330b99c1 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java
@@ -44,7 +44,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     public static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private SettingsChannelListAdapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsChannels$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<Integer> channelSortTypeSubject = BehaviorSubject.m0(-1);
+    private final BehaviorSubject<Integer> channelSortTypeSubject = BehaviorSubject.l0(-1);
 
     /* compiled from: WidgetServerSettingsChannels.kt */
     public static final class Companion {
@@ -87,9 +87,9 @@ public final class WidgetServerSettingsChannels extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable e = Observable.e(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForGuild(j), companion.getGuilds().observeGuild(j), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), companion.getChannels().observeChannelCategories(j), companion.getPermissions().observeChannelPermissionsForGuild(j), observable, WidgetServerSettingsChannels$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(e, "Observable\n            .…ermissions)\n            }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(e).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(e).r();
+                m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                return r;
             }
 
             /* JADX DEBUG: Multi-variable search result rejected for r0v1, resolved type: java.util.LinkedHashMap<java.lang.Long, com.discord.api.channel.Channel> */
@@ -98,7 +98,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
                 m.checkNotNullParameter(map, "guildChannels");
                 LinkedHashMap<Long, Channel> linkedHashMap = new LinkedHashMap<>();
                 for (Object obj : q.sortedWith(q.filter(u.asSequence(map.values()), new WidgetServerSettingsChannels$Model$Companion$getSortedGuildChannels$$inlined$also$lambda$1(map, i)), AnimatableValueParser.K0(Channel.Companion))) {
-                    linkedHashMap.put(Long.valueOf(((Channel) obj).g()), obj);
+                    linkedHashMap.put(Long.valueOf(((Channel) obj).h()), obj);
                 }
                 return linkedHashMap;
             }
@@ -236,7 +236,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     }
 
     public WidgetServerSettingsChannels() {
-        super(2131559145);
+        super(2131559151);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsChannels widgetServerSettingsChannels, Model model) {
@@ -258,7 +258,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
     private final void configureFabVisibility(Model model) {
         WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1 widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1 = new WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1(this, model);
         widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.mo1invoke();
-        getBinding().f1873c.setOnClickListener(new WidgetServerSettingsChannels$configureFabVisibility$1(this, model, widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1));
+        getBinding().f1875c.setOnClickListener(new WidgetServerSettingsChannels$configureFabVisibility$1(this, model, widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1));
     }
 
     private final void configureUI(Model model) {
@@ -271,7 +271,7 @@ public final class WidgetServerSettingsChannels extends AppFragment {
             return;
         }
         setActionBarDisplayHomeAsUpEnabled(!model.isSorting());
-        setActionBarTitle(!model.isSorting() ? 2131887354 : 2131893268);
+        setActionBarTitle(!model.isSorting() ? 2131887354 : 2131893351);
         setActionBarSubtitle(model.getGuild().getName());
         setActionBarOptionsMenu(2131623942, new WidgetServerSettingsChannels$configureUI$1(this), new WidgetServerSettingsChannels$configureUI$2(model));
         configureFabVisibility(model);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java
index 6c7e5cd7c4..3fefa789cf 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java
@@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetServerSettingsChannelsFabMenuFragment$b
 
     public final WidgetServerSettingsChannelsSortFabMenuBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363154;
-        TableRow tableRow = (TableRow) view.findViewById(2131363154);
+        int i = 2131363179;
+        TableRow tableRow = (TableRow) view.findViewById(2131363179);
         if (tableRow != null) {
-            i = 2131363155;
-            TableRow tableRow2 = (TableRow) view.findViewById(2131363155);
+            i = 2131363180;
+            TableRow tableRow2 = (TableRow) view.findViewById(2131363180);
             if (tableRow2 != null) {
-                i = 2131363156;
-                TableRow tableRow3 = (TableRow) view.findViewById(2131363156);
+                i = 2131363181;
+                TableRow tableRow3 = (TableRow) view.findViewById(2131363181);
                 if (tableRow3 != null) {
-                    i = 2131363157;
-                    TableRow tableRow4 = (TableRow) view.findViewById(2131363157);
+                    i = 2131363182;
+                    TableRow tableRow4 = (TableRow) view.findViewById(2131363182);
                     if (tableRow4 != null) {
-                        i = 2131363158;
-                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363158);
+                        i = 2131363183;
+                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363183);
                         if (floatingActionButton != null) {
                             TableLayout tableLayout = (TableLayout) view;
                             return new WidgetServerSettingsChannelsSortFabMenuBinding(tableLayout, tableRow, tableRow2, tableRow3, tableRow4, floatingActionButton, tableLayout);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
index 6c028befc8..0950614ba0 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java
@@ -44,12 +44,12 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment
             bundle.putLong("INTENT_EXTRA_GUILD_ID", j);
             widgetServerSettingsChannelsFabMenuFragment.setArguments(bundle);
             WidgetServerSettingsChannelsFabMenuFragment.access$setDismissHandler$p(widgetServerSettingsChannelsFabMenuFragment, action0);
-            fragmentManager.beginTransaction().setCustomAnimations(2130772015, 2130772017).add(2131365614, widgetServerSettingsChannelsFabMenuFragment, "channels fab menu").addToBackStack("channels fab menu").commit();
+            fragmentManager.beginTransaction().setCustomAnimations(2130772015, 2130772017).add(2131365675, widgetServerSettingsChannelsFabMenuFragment, "channels fab menu").addToBackStack("channels fab menu").commit();
         }
     }
 
     public WidgetServerSettingsChannelsFabMenuFragment() {
-        super(2131559147);
+        super(2131559153);
     }
 
     public static final /* synthetic */ void access$dismiss(WidgetServerSettingsChannelsFabMenuFragment widgetServerSettingsChannelsFabMenuFragment) {
@@ -103,8 +103,8 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment
         }
         Context requireContext = requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(2131363154, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(2131363156, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(2131363155, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(2131363157, createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE))));
-        TableLayout tableLayout = getBinding().f1875c;
+        FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(2131363179, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(2131363181, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(2131363180, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(2131363182, createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE))));
+        TableLayout tableLayout = getBinding().f1877c;
         m.checkNotNullExpressionValue(tableLayout, "binding.fabMenuTable");
         FloatingActionButton floatingActionButton = getBinding().b;
         m.checkNotNullExpressionValue(floatingActionButton, "binding.fabMenuMainFab");
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java
index 90140236bc..247ab82f73 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java
@@ -17,17 +17,17 @@ public final /* synthetic */ class WidgetServerSettingsChannelsSortActions$bindi
 
     public final WidgetServerSettingsChannelsSortActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363342;
-        TextView textView = (TextView) view.findViewById(2131363342);
+        int i = 2131363368;
+        TextView textView = (TextView) view.findViewById(2131363368);
         if (textView != null) {
-            i = 2131364605;
-            TextView textView2 = (TextView) view.findViewById(2131364605);
+            i = 2131364654;
+            TextView textView2 = (TextView) view.findViewById(2131364654);
             if (textView2 != null) {
-                i = 2131364606;
-                TextView textView3 = (TextView) view.findViewById(2131364606);
+                i = 2131364655;
+                TextView textView3 = (TextView) view.findViewById(2131364655);
                 if (textView3 != null) {
-                    i = 2131364607;
-                    TextView textView4 = (TextView) view.findViewById(2131364607);
+                    i = 2131364656;
+                    TextView textView4 = (TextView) view.findViewById(2131364656);
                     if (textView4 != null) {
                         return new WidgetServerSettingsChannelsSortActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
index 0dea59dbb2..1d3a73d919 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java
@@ -46,7 +46,7 @@ public final class WidgetServerSettingsChannelsSortActions extends AppBottomShee
     private final void configureUI() {
         getBinding().b.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$1(this));
         getBinding().d.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$2(this));
-        getBinding().f1874c.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$3(this));
+        getBinding().f1876c.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$3(this));
     }
 
     private final WidgetServerSettingsChannelsSortActionsBinding getBinding() {
@@ -55,7 +55,7 @@ public final class WidgetServerSettingsChannelsSortActions extends AppBottomShee
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559146;
+        return 2131559152;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super java.lang.Integer, kotlin.Unit>, kotlin.jvm.functions.Function1<java.lang.Integer, kotlin.Unit> */
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java
index 72daf5efa5..06e76cc334 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java
@@ -25,83 +25,83 @@ public final /* synthetic */ class WidgetServerSettingsEditIntegration$binding$2
 
     public final WidgetServerSettingsEditIntegrationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131362966;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362966);
+            i = 2131362991;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362991);
             if (linearLayout != null) {
-                i = 2131362967;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362967);
+                i = 2131362992;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362992);
                 if (checkedSetting != null) {
-                    i = 2131362968;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362968);
+                    i = 2131362993;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362993);
                     if (checkedSetting2 != null) {
-                        i = 2131362969;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362969);
+                        i = 2131362994;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362994);
                         if (checkedSetting3 != null) {
-                            i = 2131362970;
-                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362970);
+                            i = 2131362995;
+                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362995);
                             if (linearLayout2 != null) {
-                                i = 2131362971;
-                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362971);
+                                i = 2131362996;
+                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362996);
                                 if (linearLayout3 != null) {
-                                    i = 2131362972;
-                                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362972);
+                                    i = 2131362997;
+                                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362997);
                                     if (checkedSetting4 != null) {
-                                        i = 2131362973;
-                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131362973);
+                                        i = 2131362998;
+                                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131362998);
                                         if (checkedSetting5 != null) {
-                                            i = 2131362974;
-                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131362974);
+                                            i = 2131362999;
+                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131362999);
                                             if (checkedSetting6 != null) {
-                                                i = 2131362975;
-                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131362975);
+                                                i = 2131363000;
+                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131363000);
                                                 if (checkedSetting7 != null) {
-                                                    i = 2131362976;
-                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131362976);
+                                                    i = 2131363001;
+                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131363001);
                                                     if (checkedSetting8 != null) {
-                                                        i = 2131362977;
-                                                        ImageView imageView = (ImageView) view.findViewById(2131362977);
+                                                        i = 2131363002;
+                                                        ImageView imageView = (ImageView) view.findViewById(2131363002);
                                                         if (imageView != null) {
-                                                            i = 2131362979;
-                                                            TextView textView = (TextView) view.findViewById(2131362979);
+                                                            i = 2131363004;
+                                                            TextView textView = (TextView) view.findViewById(2131363004);
                                                             if (textView != null) {
-                                                                i = 2131362980;
-                                                                LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362980);
+                                                                i = 2131363005;
+                                                                LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363005);
                                                                 if (linearLayout4 != null) {
-                                                                    i = 2131362981;
-                                                                    TextView textView2 = (TextView) view.findViewById(2131362981);
+                                                                    i = 2131363006;
+                                                                    TextView textView2 = (TextView) view.findViewById(2131363006);
                                                                     if (textView2 != null) {
-                                                                        i = 2131362982;
-                                                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362982);
+                                                                        i = 2131363007;
+                                                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363007);
                                                                         if (floatingActionButton != null) {
-                                                                            i = 2131362983;
-                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362983);
+                                                                            i = 2131363008;
+                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363008);
                                                                             if (nestedScrollView != null) {
-                                                                                i = 2131362988;
-                                                                                LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131362988);
+                                                                                i = 2131363013;
+                                                                                LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131363013);
                                                                                 if (linearLayout5 != null) {
-                                                                                    i = 2131362992;
-                                                                                    LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131362992);
+                                                                                    i = 2131363017;
+                                                                                    LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131363017);
                                                                                     if (linearLayout6 != null) {
-                                                                                        i = 2131365160;
-                                                                                        View findViewById = view.findViewById(2131365160);
+                                                                                        i = 2131365215;
+                                                                                        View findViewById = view.findViewById(2131365215);
                                                                                         if (findViewById != null) {
-                                                                                            int i2 = 2131362978;
-                                                                                            TextView textView3 = (TextView) findViewById.findViewById(2131362978);
+                                                                                            int i2 = 2131363003;
+                                                                                            TextView textView3 = (TextView) findViewById.findViewById(2131363003);
                                                                                             if (textView3 != null) {
-                                                                                                i2 = 2131362984;
-                                                                                                TextView textView4 = (TextView) findViewById.findViewById(2131362984);
+                                                                                                i2 = 2131363009;
+                                                                                                TextView textView4 = (TextView) findViewById.findViewById(2131363009);
                                                                                                 if (textView4 != null) {
-                                                                                                    i2 = 2131362985;
-                                                                                                    RelativeLayout relativeLayout = (RelativeLayout) findViewById.findViewById(2131362985);
+                                                                                                    i2 = 2131363010;
+                                                                                                    RelativeLayout relativeLayout = (RelativeLayout) findViewById.findViewById(2131363010);
                                                                                                     if (relativeLayout != null) {
-                                                                                                        i2 = 2131362986;
-                                                                                                        TextView textView5 = (TextView) findViewById.findViewById(2131362986);
+                                                                                                        i2 = 2131363011;
+                                                                                                        TextView textView5 = (TextView) findViewById.findViewById(2131363011);
                                                                                                         if (textView5 != null) {
-                                                                                                            i2 = 2131362987;
-                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) findViewById.findViewById(2131362987);
+                                                                                                            i2 = 2131363012;
+                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) findViewById.findViewById(2131363012);
                                                                                                             if (relativeLayout2 != null) {
                                                                                                                 return new WidgetServerSettingsEditIntegrationBinding((CoordinatorLayout) view, dimmerView, linearLayout, checkedSetting, checkedSetting2, checkedSetting3, linearLayout2, linearLayout3, checkedSetting4, checkedSetting5, checkedSetting6, checkedSetting7, checkedSetting8, imageView, textView, linearLayout4, textView2, floatingActionButton, nestedScrollView, linearLayout5, linearLayout6, new v((LinearLayout) findViewById, textView3, textView4, relativeLayout, textView5, relativeLayout2));
                                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java
index 6b20500715..73bf304aaf 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsEditIntegration$onViewBound$2 implements
         StatefulViews access$getState$p = WidgetServerSettingsEditIntegration.access$getState$p(this.this$0);
         CheckedSetting checkedSetting = WidgetServerSettingsEditIntegration.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(checkedSetting, "binding.editIntegrationCustomEmotesToggle");
-        access$getState$p.put(2131362967, Boolean.valueOf(checkedSetting.isChecked()));
+        access$getState$p.put(2131362992, Boolean.valueOf(checkedSetting.isChecked()));
         WidgetServerSettingsEditIntegration.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsEditIntegration.access$getBinding$p(this.this$0).o);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
index c0474e3901..fd1c899637 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java
@@ -50,16 +50,16 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private static final String INTENT_EXTRA_INTEGRATION_ID = "INTENT_EXTRA_INTEGRATION_ID";
-    private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131362967;
-    private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131362970;
-    private static final int STATE_KEY_GRACE_PERIOD = 2131362971;
+    private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131362992;
+    private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131362995;
+    private static final int STATE_KEY_GRACE_PERIOD = 2131362996;
     private static final int[] gracePeriodDays = {1, 3, 7, 14, 30};
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditIntegration$binding$2.INSTANCE, null, 2, null);
     private RadioManager expiryBehaviorRadioManager;
     private final Lazy expiryBehaviorRadios$delegate = g.lazy(new WidgetServerSettingsEditIntegration$expiryBehaviorRadios$2(this));
     private RadioManager gracePeriodRadioManager;
     private final Lazy gracePeriodRadios$delegate = g.lazy(new WidgetServerSettingsEditIntegration$gracePeriodRadios$2(this));
-    private final StatefulViews state = new StatefulViews(2131362967, 2131362970, 2131362971);
+    private final StatefulViews state = new StatefulViews(2131362992, 2131362995, 2131362996);
 
     /* compiled from: WidgetServerSettingsEditIntegration.kt */
     public static final class Companion {
@@ -99,9 +99,9 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable g = Observable.g(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeGuild(j), companion.getGuilds().observeRoles(j), companion.getPermissions().observePermissionsForGuild(j), companion.getGuildIntegrations().get(j, j2), WidgetServerSettingsEditIntegration$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(g, "Observable.combineLatest…  }\n          }\n        }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(g).s();
-                m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(g).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -193,7 +193,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     }
 
     public WidgetServerSettingsEditIntegration() {
-        super(2131559153);
+        super(2131559159);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEditIntegration widgetServerSettingsEditIntegration, Model model) {
@@ -245,7 +245,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
             }
             return;
         }
-        setActionBarTitle(2131890392);
+        setActionBarTitle(2131890458);
         setActionBarSubtitle(model.getGuild().getName());
         boolean areEqual = m.areEqual(model.getIntegration().getType(), "twitch");
         TextView textView = getBinding().m;
@@ -254,7 +254,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         TextView textView2 = getBinding().n;
         m.checkNotNullExpressionValue(textView2, "binding.editIntegrationOwnerName");
         textView2.setText(model.getIntegration().getUser().r());
-        getBinding().l.setImageResource(areEqual ? 2131230879 : 2131230880);
+        getBinding().l.setImageResource(areEqual ? 2131230882 : 2131230883);
         getBinding().p.d.setOnClickListener(new WidgetServerSettingsEditIntegration$configureUI$1(this, model));
         int i = 0;
         WidgetServerSettingsEditIntegration$configureUI$2 widgetServerSettingsEditIntegration$configureUI$2 = null;
@@ -278,7 +278,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         m.checkNotNullExpressionValue(coordinatorLayout2, "binding.root");
         Context context2 = coordinatorLayout2.getContext();
         m.checkNotNullExpressionValue(context2, "binding.root.context");
-        textView4.setText(b.k(StringResourceUtilsKt.getQuantityString(resources, context2, areEqual ? 2131755230 : 2131755229, model.getIntegration().getSubscriberCount(), Integer.valueOf(model.getIntegration().getSubscriberCount())), new Object[0], null, 2));
+        textView4.setText(b.k(StringResourceUtilsKt.getQuantityString(resources, context2, areEqual ? 2131755231 : 2131755230, model.getIntegration().getSubscriberCount(), Integer.valueOf(model.getIntegration().getSubscriberCount())), new Object[0], null, 2));
         RelativeLayout relativeLayout = getBinding().p.f;
         if (model.getRole() != null) {
             widgetServerSettingsEditIntegration$configureUI$2 = new WidgetServerSettingsEditIntegration$configureUI$2(model);
@@ -288,19 +288,19 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         m.checkNotNullExpressionValue(textView5, "binding.syncSettings.editIntegrationSyncedRole");
         textView5.setText(model.getRole() != null ? model.getRole().f() : "None");
         getBinding().p.e.setTextColor(RoleUtils.getOpaqueColor(model.getRole(), ColorCompat.getColor(this, 2131100121)));
-        int intValue = ((Number) this.state.get(2131362970, Integer.valueOf(model.getIntegration().getExpireBehavior()))).intValue();
+        int intValue = ((Number) this.state.get(2131362995, Integer.valueOf(model.getIntegration().getExpireBehavior()))).intValue();
         RadioManager radioManager = this.expiryBehaviorRadioManager;
         if (radioManager == null) {
             m.throwUninitializedPropertyAccessException("expiryBehaviorRadioManager");
         }
         radioManager.a(getExpiryBehaviorRadios().get(intValue));
-        int intValue2 = ((Number) this.state.get(2131362971, Integer.valueOf(getGracePeriodPosition(model.getIntegration().getExpireGracePeriod())))).intValue();
+        int intValue2 = ((Number) this.state.get(2131362996, Integer.valueOf(getGracePeriodPosition(model.getIntegration().getExpireGracePeriod())))).intValue();
         RadioManager radioManager2 = this.gracePeriodRadioManager;
         if (radioManager2 == null) {
             m.throwUninitializedPropertyAccessException("gracePeriodRadioManager");
         }
         radioManager2.a(getGracePeriodRadios().get(intValue2));
-        LinearLayout linearLayout = getBinding().f1880c;
+        LinearLayout linearLayout = getBinding().f1882c;
         m.checkNotNullExpressionValue(linearLayout, "binding.editIntegrationCustomEmotesContainer");
         if (!areEqual) {
             i = 8;
@@ -370,8 +370,8 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setRetainInstance(true);
-        this.expiryBehaviorRadioManager = setupRadioManager(getExpiryBehaviorRadios(), 2131362970);
-        this.gracePeriodRadioManager = setupRadioManager(getGracePeriodRadios(), 2131362971);
+        this.expiryBehaviorRadioManager = setupRadioManager(getExpiryBehaviorRadios(), 2131362995);
+        this.gracePeriodRadioManager = setupRadioManager(getGracePeriodRadios(), 2131362996);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         this.state.setupUnsavedChangesConfirmation(this);
         List<CheckedSetting> gracePeriodRadios = getGracePeriodRadios();
@@ -388,7 +388,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
             Context context = checkedSetting.getContext();
             m.checkNotNullExpressionValue(context, "radio.context");
             int[] iArr = gracePeriodDays;
-            checkedSetting.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755221, iArr[i], Integer.valueOf(iArr[i])));
+            checkedSetting.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755222, iArr[i], Integer.valueOf(iArr[i])));
             arrayList.add(Unit.a);
             i = i2;
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java
index d3f12a3562..1fb4b5b4ee 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java
@@ -21,29 +21,29 @@ public final /* synthetic */ class WidgetServerSettingsEditMember$binding$2 exte
 
     public final WidgetServerSettingsEditMemberBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362988;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362988);
+        int i = 2131363013;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363013);
         if (linearLayout != null) {
-            i = 2131362989;
-            TextView textView = (TextView) view.findViewById(2131362989);
+            i = 2131363014;
+            TextView textView = (TextView) view.findViewById(2131363014);
             if (textView != null) {
-                i = 2131362990;
-                TextView textView2 = (TextView) view.findViewById(2131362990);
+                i = 2131363015;
+                TextView textView2 = (TextView) view.findViewById(2131363015);
                 if (textView2 != null) {
-                    i = 2131362991;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362991);
+                    i = 2131363016;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363016);
                     if (textInputLayout != null) {
-                        i = 2131362992;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362992);
+                        i = 2131363017;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363017);
                         if (linearLayout2 != null) {
-                            i = 2131362993;
-                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362993);
+                            i = 2131363018;
+                            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363018);
                             if (recyclerView != null) {
-                                i = 2131362994;
-                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362994);
+                                i = 2131363019;
+                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363019);
                                 if (floatingActionButton != null) {
-                                    i = 2131362995;
-                                    TextView textView3 = (TextView) view.findViewById(2131362995);
+                                    i = 2131363020;
+                                    TextView textView3 = (TextView) view.findViewById(2131363020);
                                     if (textView3 != null) {
                                         return new WidgetServerSettingsEditMemberBinding((CoordinatorLayout) view, linearLayout, textView, textView2, textInputLayout, linearLayout2, recyclerView, floatingActionButton, textView3);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java
index b174518aa9..bcbf172ec4 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java
@@ -20,7 +20,7 @@ public final class WidgetServerSettingsEditMember$configureUI$4 implements View.
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         if (this.$data.getGuild().getFeatures().contains(GuildFeature.VERIFIED) || this.$data.getGuild().getFeatures().contains(GuildFeature.PARTNERED)) {
-            o.i(this.this$0, 2131893962, 0, 4);
+            o.i(this.this$0, 2131894062, 0, 4);
             return;
         }
         WidgetServerSettingsTransferOwnership.Companion companion = WidgetServerSettingsTransferOwnership.Companion;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
index 2ad3d91d60..b8ae8590f1 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java
@@ -46,7 +46,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
     private static final String INTENT_EXTRA_USER_ID = "INTENT_EXTRA_USER_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditMember$binding$2.INSTANCE, null, 2, null);
     private WidgetServerSettingsEditMemberRolesAdapter rolesAdapter;
-    private final StatefulViews state = new StatefulViews(2131362991);
+    private final StatefulViews state = new StatefulViews(2131363016);
 
     /* compiled from: WidgetServerSettingsEditMember.kt */
     public static final class Companion {
@@ -92,9 +92,9 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
 
             public final Observable<Model> get(long j, long j2) {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable s2 = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getUsers().observeUser(j2), companion.getGuilds().observeComputed(j), companion.getGuilds().observeGuild(j), companion.getGuilds().observeRoles(j), companion.getPermissions().observePermissionsForGuild(j), new WidgetServerSettingsEditMember$Model$Companion$get$1(j, j2)).s();
-                m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-                return ObservableExtensionsKt.computationLatest(s2);
+                Observable r = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getUsers().observeUser(j2), companion.getGuilds().observeComputed(j), companion.getGuilds().observeGuild(j), companion.getGuilds().observeRoles(j), companion.getPermissions().observePermissionsForGuild(j), new WidgetServerSettingsEditMember$Model$Companion$get$1(j, j2)).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return ObservableExtensionsKt.computationLatest(r);
             }
         }
 
@@ -312,7 +312,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
     }
 
     public WidgetServerSettingsEditMember() {
-        super(2131559154);
+        super(2131559160);
     }
 
     public static final /* synthetic */ void access$changeNickname(WidgetServerSettingsEditMember widgetServerSettingsEditMember, Model model, String str) {
@@ -352,7 +352,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
         boolean z2 = true;
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         Context context = getContext();
-        setActionBarTitle(context != null ? c.a.l.b.g(context, 2131889263, new Object[]{model.getGuild().getName()}, null, 4) : null);
+        setActionBarTitle(context != null ? c.a.l.b.g(context, 2131889270, new Object[]{model.getGuild().getName()}, null, 4) : null);
         GuildMember.Companion companion = GuildMember.Companion;
         setActionBarSubtitle(companion.getNickOrUsername(model.getUserComputed(), model.getUser()));
         setupNickname(model);
@@ -363,7 +363,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
         if (model.getCanKick()) {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.editMemberKickButton");
-            c.a.l.b.n(textView, 2131890765, new Object[]{nickOrUsername}, null, 4);
+            c.a.l.b.m(textView, 2131890833, new Object[]{nickOrUsername}, null, 4);
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.editMemberKickButton");
             textView2.setVisibility(0);
@@ -375,18 +375,18 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
             getBinding().d.setOnClickListener(null);
         }
         if (model.getCanBan()) {
-            TextView textView4 = getBinding().f1881c;
+            TextView textView4 = getBinding().f1883c;
             m.checkNotNullExpressionValue(textView4, "binding.editMemberBanButton");
-            c.a.l.b.n(textView4, 2131886823, new Object[]{nickOrUsername}, null, 4);
-            TextView textView5 = getBinding().f1881c;
+            c.a.l.b.m(textView4, 2131886823, new Object[]{nickOrUsername}, null, 4);
+            TextView textView5 = getBinding().f1883c;
             m.checkNotNullExpressionValue(textView5, "binding.editMemberBanButton");
             textView5.setVisibility(0);
-            getBinding().f1881c.setOnClickListener(new WidgetServerSettingsEditMember$configureUI$3(this, nickOrUsername, model));
+            getBinding().f1883c.setOnClickListener(new WidgetServerSettingsEditMember$configureUI$3(this, nickOrUsername, model));
         } else {
-            TextView textView6 = getBinding().f1881c;
+            TextView textView6 = getBinding().f1883c;
             m.checkNotNullExpressionValue(textView6, "binding.editMemberBanButton");
             textView6.setVisibility(8);
-            getBinding().f1881c.setOnClickListener(null);
+            getBinding().f1883c.setOnClickListener(null);
         }
         if (model.getCanTransferOwnership()) {
             TextView textView7 = getBinding().i;
@@ -416,7 +416,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment {
 
     private final void onNicknameChangeSuccessful(String str) {
         AppFragment.hideKeyboard$default(this, null, 1, null);
-        o.j(this, str.length() > 0 ? c.a.l.b.j(this, 2131891364, new Object[]{str}, null, 4) : c.a.l.b.j(this, 2131891365, new Object[0], null, 4), 0, 4);
+        o.j(this, str.length() > 0 ? c.a.l.b.j(this, 2131891435, new Object[]{str}, null, 4) : c.a.l.b.j(this, 2131891436, new Object[0], null, 4), 0, 4);
     }
 
     private final void setupNickname(Model model) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java
index 59b637da1c..503e6e8f36 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java
@@ -190,7 +190,7 @@ public final class WidgetServerSettingsEditMemberRolesAdapter extends MGRecycler
             if (roleItem.isManageable()) {
                 this.binding.b.e(new WidgetServerSettingsEditMemberRolesAdapter$RoleListItem$onConfigure$1(this, roleItem));
             } else if (roleItem.isRoleManaged()) {
-                this.binding.b.b(2131890930);
+                this.binding.b.b(2131891000);
             } else {
                 CheckedSetting.d(this.binding.b, null, 1);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java
index c8161445b3..89a9c38957 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java
@@ -22,137 +22,137 @@ public final /* synthetic */ class WidgetServerSettingsEditRole$binding$2 extend
 
     public final WidgetEditRoleBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362997;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362997);
+        int i = 2131363022;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363022);
         if (textInputLayout != null) {
-            i = 2131362998;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362998);
+            i = 2131363023;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363023);
             if (floatingActionButton != null) {
-                i = 2131364459;
-                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364459);
+                i = 2131364497;
+                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364497);
                 if (checkedSetting != null) {
-                    i = 2131364460;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364460);
+                    i = 2131364498;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364498);
                     if (checkedSetting2 != null) {
-                        i = 2131364461;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364461);
+                        i = 2131364499;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364499);
                         if (checkedSetting3 != null) {
-                            i = 2131364462;
-                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364462);
+                            i = 2131364500;
+                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364500);
                             if (checkedSetting4 != null) {
-                                i = 2131364463;
-                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364463);
+                                i = 2131364501;
+                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364501);
                                 if (checkedSetting5 != null) {
-                                    i = 2131364464;
-                                    View findViewById = view.findViewById(2131364464);
+                                    i = 2131364502;
+                                    View findViewById = view.findViewById(2131364502);
                                     if (findViewById != null) {
-                                        i = 2131364465;
-                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364465);
+                                        i = 2131364503;
+                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364503);
                                         if (relativeLayout != null) {
-                                            i = 2131364466;
-                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364466);
+                                            i = 2131364504;
+                                            CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364504);
                                             if (checkedSetting6 != null) {
-                                                i = 2131364467;
-                                                View findViewById2 = view.findViewById(2131364467);
+                                                i = 2131364505;
+                                                View findViewById2 = view.findViewById(2131364505);
                                                 if (findViewById2 != null) {
-                                                    i = 2131364468;
-                                                    View findViewById3 = view.findViewById(2131364468);
+                                                    i = 2131364506;
+                                                    View findViewById3 = view.findViewById(2131364506);
                                                     if (findViewById3 != null) {
-                                                        i = 2131364469;
-                                                        CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364469);
+                                                        i = 2131364507;
+                                                        CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364507);
                                                         if (checkedSetting7 != null) {
-                                                            i = 2131364470;
-                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364470);
+                                                            i = 2131364508;
+                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364508);
                                                             if (checkedSetting8 != null) {
-                                                                i = 2131364471;
-                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364471);
+                                                                i = 2131364509;
+                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364509);
                                                                 if (checkedSetting9 != null) {
-                                                                    i = 2131364472;
-                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364472);
+                                                                    i = 2131364510;
+                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364510);
                                                                     if (checkedSetting10 != null) {
-                                                                        i = 2131364473;
-                                                                        CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364473);
+                                                                        i = 2131364511;
+                                                                        CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364511);
                                                                         if (checkedSetting11 != null) {
-                                                                            i = 2131364474;
-                                                                            CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364474);
+                                                                            i = 2131364512;
+                                                                            CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364512);
                                                                             if (checkedSetting12 != null) {
-                                                                                i = 2131364475;
-                                                                                CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364475);
+                                                                                i = 2131364513;
+                                                                                CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364513);
                                                                                 if (checkedSetting13 != null) {
-                                                                                    i = 2131364476;
-                                                                                    CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364476);
+                                                                                    i = 2131364514;
+                                                                                    CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364514);
                                                                                     if (checkedSetting14 != null) {
-                                                                                        i = 2131364477;
-                                                                                        CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364477);
+                                                                                        i = 2131364515;
+                                                                                        CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364515);
                                                                                         if (checkedSetting15 != null) {
-                                                                                            i = 2131364478;
-                                                                                            CheckedSetting checkedSetting16 = (CheckedSetting) view.findViewById(2131364478);
+                                                                                            i = 2131364516;
+                                                                                            CheckedSetting checkedSetting16 = (CheckedSetting) view.findViewById(2131364516);
                                                                                             if (checkedSetting16 != null) {
-                                                                                                i = 2131364479;
-                                                                                                CheckedSetting checkedSetting17 = (CheckedSetting) view.findViewById(2131364479);
+                                                                                                i = 2131364517;
+                                                                                                CheckedSetting checkedSetting17 = (CheckedSetting) view.findViewById(2131364517);
                                                                                                 if (checkedSetting17 != null) {
-                                                                                                    i = 2131364480;
-                                                                                                    CheckedSetting checkedSetting18 = (CheckedSetting) view.findViewById(2131364480);
+                                                                                                    i = 2131364518;
+                                                                                                    CheckedSetting checkedSetting18 = (CheckedSetting) view.findViewById(2131364518);
                                                                                                     if (checkedSetting18 != null) {
-                                                                                                        i = 2131364481;
-                                                                                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364481);
+                                                                                                        i = 2131364519;
+                                                                                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364519);
                                                                                                         if (nestedScrollView != null) {
-                                                                                                            i = 2131364482;
-                                                                                                            CheckedSetting checkedSetting19 = (CheckedSetting) view.findViewById(2131364482);
+                                                                                                            i = 2131364520;
+                                                                                                            CheckedSetting checkedSetting19 = (CheckedSetting) view.findViewById(2131364520);
                                                                                                             if (checkedSetting19 != null) {
-                                                                                                                i = 2131364483;
-                                                                                                                CheckedSetting checkedSetting20 = (CheckedSetting) view.findViewById(2131364483);
+                                                                                                                i = 2131364521;
+                                                                                                                CheckedSetting checkedSetting20 = (CheckedSetting) view.findViewById(2131364521);
                                                                                                                 if (checkedSetting20 != null) {
-                                                                                                                    i = 2131364484;
-                                                                                                                    CheckedSetting checkedSetting21 = (CheckedSetting) view.findViewById(2131364484);
+                                                                                                                    i = 2131364522;
+                                                                                                                    CheckedSetting checkedSetting21 = (CheckedSetting) view.findViewById(2131364522);
                                                                                                                     if (checkedSetting21 != null) {
-                                                                                                                        i = 2131364485;
-                                                                                                                        CheckedSetting checkedSetting22 = (CheckedSetting) view.findViewById(2131364485);
+                                                                                                                        i = 2131364523;
+                                                                                                                        CheckedSetting checkedSetting22 = (CheckedSetting) view.findViewById(2131364523);
                                                                                                                         if (checkedSetting22 != null) {
-                                                                                                                            i = 2131364486;
-                                                                                                                            CheckedSetting checkedSetting23 = (CheckedSetting) view.findViewById(2131364486);
+                                                                                                                            i = 2131364524;
+                                                                                                                            CheckedSetting checkedSetting23 = (CheckedSetting) view.findViewById(2131364524);
                                                                                                                             if (checkedSetting23 != null) {
-                                                                                                                                i = 2131364487;
-                                                                                                                                CheckedSetting checkedSetting24 = (CheckedSetting) view.findViewById(2131364487);
+                                                                                                                                i = 2131364525;
+                                                                                                                                CheckedSetting checkedSetting24 = (CheckedSetting) view.findViewById(2131364525);
                                                                                                                                 if (checkedSetting24 != null) {
-                                                                                                                                    i = 2131364488;
-                                                                                                                                    CheckedSetting checkedSetting25 = (CheckedSetting) view.findViewById(2131364488);
+                                                                                                                                    i = 2131364526;
+                                                                                                                                    CheckedSetting checkedSetting25 = (CheckedSetting) view.findViewById(2131364526);
                                                                                                                                     if (checkedSetting25 != null) {
-                                                                                                                                        i = 2131364489;
-                                                                                                                                        CheckedSetting checkedSetting26 = (CheckedSetting) view.findViewById(2131364489);
+                                                                                                                                        i = 2131364527;
+                                                                                                                                        CheckedSetting checkedSetting26 = (CheckedSetting) view.findViewById(2131364527);
                                                                                                                                         if (checkedSetting26 != null) {
-                                                                                                                                            i = 2131364490;
-                                                                                                                                            CheckedSetting checkedSetting27 = (CheckedSetting) view.findViewById(2131364490);
+                                                                                                                                            i = 2131364528;
+                                                                                                                                            CheckedSetting checkedSetting27 = (CheckedSetting) view.findViewById(2131364528);
                                                                                                                                             if (checkedSetting27 != null) {
-                                                                                                                                                i = 2131364491;
-                                                                                                                                                CheckedSetting checkedSetting28 = (CheckedSetting) view.findViewById(2131364491);
+                                                                                                                                                i = 2131364529;
+                                                                                                                                                CheckedSetting checkedSetting28 = (CheckedSetting) view.findViewById(2131364529);
                                                                                                                                                 if (checkedSetting28 != null) {
-                                                                                                                                                    i = 2131364492;
-                                                                                                                                                    CheckedSetting checkedSetting29 = (CheckedSetting) view.findViewById(2131364492);
+                                                                                                                                                    i = 2131364530;
+                                                                                                                                                    CheckedSetting checkedSetting29 = (CheckedSetting) view.findViewById(2131364530);
                                                                                                                                                     if (checkedSetting29 != null) {
-                                                                                                                                                        i = 2131364493;
-                                                                                                                                                        CheckedSetting checkedSetting30 = (CheckedSetting) view.findViewById(2131364493);
+                                                                                                                                                        i = 2131364531;
+                                                                                                                                                        CheckedSetting checkedSetting30 = (CheckedSetting) view.findViewById(2131364531);
                                                                                                                                                         if (checkedSetting30 != null) {
-                                                                                                                                                            i = 2131364494;
-                                                                                                                                                            CheckedSetting checkedSetting31 = (CheckedSetting) view.findViewById(2131364494);
+                                                                                                                                                            i = 2131364532;
+                                                                                                                                                            CheckedSetting checkedSetting31 = (CheckedSetting) view.findViewById(2131364532);
                                                                                                                                                             if (checkedSetting31 != null) {
-                                                                                                                                                                i = 2131364495;
-                                                                                                                                                                CheckedSetting checkedSetting32 = (CheckedSetting) view.findViewById(2131364495);
+                                                                                                                                                                i = 2131364533;
+                                                                                                                                                                CheckedSetting checkedSetting32 = (CheckedSetting) view.findViewById(2131364533);
                                                                                                                                                                 if (checkedSetting32 != null) {
-                                                                                                                                                                    i = 2131364496;
-                                                                                                                                                                    CheckedSetting checkedSetting33 = (CheckedSetting) view.findViewById(2131364496);
+                                                                                                                                                                    i = 2131364534;
+                                                                                                                                                                    CheckedSetting checkedSetting33 = (CheckedSetting) view.findViewById(2131364534);
                                                                                                                                                                     if (checkedSetting33 != null) {
-                                                                                                                                                                        i = 2131364497;
-                                                                                                                                                                        CheckedSetting checkedSetting34 = (CheckedSetting) view.findViewById(2131364497);
+                                                                                                                                                                        i = 2131364535;
+                                                                                                                                                                        CheckedSetting checkedSetting34 = (CheckedSetting) view.findViewById(2131364535);
                                                                                                                                                                         if (checkedSetting34 != null) {
-                                                                                                                                                                            i = 2131364498;
-                                                                                                                                                                            CheckedSetting checkedSetting35 = (CheckedSetting) view.findViewById(2131364498);
+                                                                                                                                                                            i = 2131364536;
+                                                                                                                                                                            CheckedSetting checkedSetting35 = (CheckedSetting) view.findViewById(2131364536);
                                                                                                                                                                             if (checkedSetting35 != null) {
-                                                                                                                                                                                i = 2131365014;
-                                                                                                                                                                                View findViewById4 = view.findViewById(2131365014);
+                                                                                                                                                                                i = 2131365064;
+                                                                                                                                                                                View findViewById4 = view.findViewById(2131365064);
                                                                                                                                                                                 if (findViewById4 != null) {
-                                                                                                                                                                                    i = 2131365015;
-                                                                                                                                                                                    TextView textView = (TextView) view.findViewById(2131365015);
+                                                                                                                                                                                    i = 2131365065;
+                                                                                                                                                                                    TextView textView = (TextView) view.findViewById(2131365065);
                                                                                                                                                                                     if (textView != null) {
                                                                                                                                                                                         return new WidgetEditRoleBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, findViewById, relativeLayout, checkedSetting6, findViewById2, findViewById3, checkedSetting7, checkedSetting8, checkedSetting9, checkedSetting10, checkedSetting11, checkedSetting12, checkedSetting13, checkedSetting14, checkedSetting15, checkedSetting16, checkedSetting17, checkedSetting18, nestedScrollView, checkedSetting19, checkedSetting20, checkedSetting21, checkedSetting22, checkedSetting23, checkedSetting24, checkedSetting25, checkedSetting26, checkedSetting27, checkedSetting28, checkedSetting29, checkedSetting30, checkedSetting31, checkedSetting32, checkedSetting33, checkedSetting34, checkedSetting35, findViewById4, textView);
                                                                                                                                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java
index 370ba5de70..e5ab34ca1e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java
@@ -51,6 +51,6 @@ public final class WidgetServerSettingsEditRole$configureUI$1 implements View.On
             AppFragment.hideKeyboard$default(this.this$0, null, 1, null);
             return;
         }
-        o.i(this.this$0, 2131888726, 0, 4);
+        o.i(this.this$0, 2131888727, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java
index 65a0035107..35eaf96429 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java
@@ -19,7 +19,7 @@ public final class WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2 i
     public final void onClick(View view) {
         WidgetServerSettingsEditRole.access$getBinding$p(this.this$0).b.clearFocus();
         RestAPIParams.Role createWithRole = RestAPIParams.Role.Companion.createWithRole(this.$data.getRole());
-        CheckedSetting checkedSetting = WidgetServerSettingsEditRole.access$getBinding$p(this.this$0).f1767y;
+        CheckedSetting checkedSetting = WidgetServerSettingsEditRole.access$getBinding$p(this.this$0).f1768y;
         m.checkNotNullExpressionValue(checkedSetting, "binding.roleSettingsMentionableCheckedsetting");
         createWithRole.setMentionable(Boolean.valueOf(!checkedSetting.isChecked()));
         WidgetServerSettingsEditRole.access$patchRole(this.this$0, this.$data.getGuildId(), createWithRole);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java
index 296af69102..cb8a8a4e39 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java
@@ -39,7 +39,7 @@ public final class WidgetServerSettingsEditRole$setupMenu$1<T1, T2> implements A
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullParameter(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363886) {
+        if (menuItem.getItemId() == 2131363927) {
             ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteRole(this.$data.getGuildId(), this.$data.getRole().getId()), false, 1, null), this.this$0, null, 2, null).k(q.j(new AnonymousClass1(this), this.this$0.getContext(), null, 4));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
index f3aef48f20..4ae01cbc38 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java
@@ -55,7 +55,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private static final String INTENT_EXTRA_ROLE_ID = "INTENT_EXTRA_ROLE_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditRole$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131362997);
+    private final StatefulViews state = new StatefulViews(2131363022);
 
     /* compiled from: WidgetServerSettingsEditRole.kt */
     public static final class Companion {
@@ -124,9 +124,9 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             }
 
             public final Observable<Model> get(long j, long j2) {
-                Observable<Model> s2 = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Z(new WidgetServerSettingsEditRole$Model$Companion$get$1(j, j2)).s();
-                m.checkNotNullExpressionValue(s2, "getUsers()\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Y(new WidgetServerSettingsEditRole$Model$Companion$get$1(j, j2)).r();
+                m.checkNotNullExpressionValue(r, "getUsers()\n            .…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -306,7 +306,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     }
 
     public WidgetServerSettingsEditRole() {
-        super(2131558991);
+        super(2131558995);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEditRole widgetServerSettingsEditRole, Model model) {
@@ -344,8 +344,8 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         setupHoistAndMentionSettings(model);
         setupPermissionsSettings(model);
         setupColorSetting(model);
-        this.state.configureSaveActionView(getBinding().f1764c);
-        getBinding().f1764c.setOnClickListener(new WidgetServerSettingsEditRole$configureUI$1(this, model));
+        this.state.configureSaveActionView(getBinding().f1765c);
+        getBinding().f1765c.setOnClickListener(new WidgetServerSettingsEditRole$configureUI$1(this, model));
     }
 
     private final void enableSetting(CheckedSetting checkedSetting, Model model, long j) {
@@ -386,13 +386,13 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             if (manageStatus != null) {
                 int ordinal = manageStatus.ordinal();
                 if (ordinal == 0) {
-                    str = getString(2131890138);
+                    str = getString(2131890160);
                 } else if (ordinal == 1) {
-                    str = getString(2131890140);
+                    str = getString(2131890162);
                 } else if (ordinal == 2) {
-                    str = getString(2131890141);
+                    str = getString(2131890163);
                 } else if (ordinal == 3) {
-                    str = getString(2131894010);
+                    str = getString(2131894110);
                 }
                 m.checkNotNullExpressionValue(str, "when (data.manageStatus)…s)\n      else -> \"\"\n    }");
                 return str;
@@ -401,7 +401,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             m.checkNotNullExpressionValue(str, "when (data.manageStatus)…s)\n      else -> \"\"\n    }");
             return str;
         }
-        String string = getString(2131888640);
+        String string = getString(2131888641);
         m.checkNotNullExpressionValue(string, "getString(R.string.form_…el_disabled_for_everyone)");
         return string;
     }
@@ -414,27 +414,27 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         int roleColor$default = RoleUtils.getRoleColor$default(model.getRole(), requireContext(), null, 2, null);
         e.k kVar = new e.k();
         kVar.h = roleColor$default;
-        kVar.f1461s = ColorCompat.getThemedColor(getContext(), 2130968904);
+        kVar.f1456s = ColorCompat.getThemedColor(getContext(), 2130968904);
         kVar.i = false;
         kVar.g = getColorsToDisplay(roleColor$default);
-        kVar.a = 2131892668;
+        kVar.a = 2131892749;
         kVar.r = ColorCompat.getThemedColor(getContext(), 2130968932);
         FontUtils fontUtils = FontUtils.INSTANCE;
-        kVar.f1462x = fontUtils.getThemedFontResId(getContext(), 2130969320);
+        kVar.f1457x = fontUtils.getThemedFontResId(getContext(), 2130969320);
         kVar.o = ColorCompat.getThemedColor(getContext(), 2130968892);
-        kVar.f1460c = 2131887417;
+        kVar.f1455c = 2131887417;
         kVar.v = ColorCompat.getColor(getContext(), 2131100428);
         kVar.b = 2131887418;
         kVar.p = ColorCompat.getThemedColor(getContext(), 2130968994);
-        kVar.d = 2131893132;
+        kVar.d = 2131893215;
         kVar.l = true;
-        kVar.e = 2131892641;
+        kVar.e = 2131892722;
         kVar.w = ColorCompat.getColor(getContext(), 2131100428);
-        kVar.f1463y = fontUtils.getThemedFontResId(getContext(), 2130969326);
+        kVar.f1458y = fontUtils.getThemedFontResId(getContext(), 2130969326);
         kVar.q = ColorCompat.getThemedColor(getContext(), 2130968900);
         kVar.t = ColorCompat.getThemedColor(getContext(), 2130968988);
-        kVar.u = 2131231099;
-        kVar.f1464z = fontUtils.getThemedFontResId(getContext(), 2130969325);
+        kVar.u = 2131231104;
+        kVar.f1459z = fontUtils.getThemedFontResId(getContext(), 2130969325);
         e a = kVar.a();
         a.j = new WidgetServerSettingsEditRole$launchColorPicker$1(this, model);
         AppFragment.hideKeyboard$default(this, null, 1, null);
@@ -464,7 +464,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
             ColorCompat.setStatusBarColor(this, i, isColorDark$default);
             WidgetServerSettingsEditRole$setupActionBar$1 widgetServerSettingsEditRole$setupActionBar$1 = WidgetServerSettingsEditRole$setupActionBar$1.INSTANCE;
             AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-            String string = getString(2131888728);
+            String string = getString(2131888729);
             m.checkNotNullExpressionValue(string, "getString(R.string.form_label_role_settings)");
             setActionBarTitle(widgetServerSettingsEditRole$setupActionBar$1.invoke(string, color));
             setActionBarSubtitle(widgetServerSettingsEditRole$setupActionBar$1.invoke(model.getRole().f(), color));
@@ -483,7 +483,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     private final void setupColorSetting(Model model) {
         View view = getBinding().l;
         m.checkNotNullExpressionValue(view, "binding.roleSettingsCurrentColorDisplay");
-        Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231088);
+        Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231093);
         if (drawable != null) {
             drawable.setColorFilter(new PorterDuffColorFilter(RoleUtils.getRoleColor$default(model.getRole(), requireContext(), null, 2, null), PorterDuff.Mode.SRC_ATOP));
             View view2 = getBinding().l;
@@ -508,17 +508,17 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         CheckedSetting checkedSetting = getBinding().o;
         m.checkNotNullExpressionValue(checkedSetting, "binding.roleSettingsHoistCheckedsetting");
         checkedSetting.setChecked(model.getRole().c());
-        CheckedSetting checkedSetting2 = getBinding().f1767y;
+        CheckedSetting checkedSetting2 = getBinding().f1768y;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.roleSettingsMentionableCheckedsetting");
         checkedSetting2.setChecked(model.getRole().e());
         if (!model.canManage() || model.isEveryoneRole()) {
             String lockMessage = getLockMessage(model, true);
             getBinding().o.c(lockMessage);
-            getBinding().f1767y.c(lockMessage);
+            getBinding().f1768y.c(lockMessage);
             return;
         }
         getBinding().o.e(new WidgetServerSettingsEditRole$setupHoistAndMentionSettings$1(this, model));
-        getBinding().f1767y.e(new WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2(this, model));
+        getBinding().f1768y.e(new WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2(this, model));
     }
 
     private final void setupMenu(Model model) {
@@ -533,116 +533,116 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
     /* JADX WARNING: Removed duplicated region for block: B:71:0x026f  */
     private final void setupPermissionsSettings(Model model) {
         long j;
-        for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g, getBinding().h, getBinding().k, getBinding().n, getBinding().p, getBinding().q, getBinding().f1765s, getBinding().t, getBinding().r, getBinding().u, getBinding().v, getBinding().w, getBinding().f1766x, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().F, getBinding().G, getBinding().d, getBinding().H, getBinding().J, getBinding().N, getBinding().P, getBinding().M, getBinding().K, getBinding().L, getBinding().O, getBinding().f1768z, getBinding().I, getBinding().C})) {
+        for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g, getBinding().h, getBinding().k, getBinding().n, getBinding().p, getBinding().q, getBinding().f1766s, getBinding().t, getBinding().r, getBinding().u, getBinding().v, getBinding().w, getBinding().f1767x, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().F, getBinding().G, getBinding().d, getBinding().H, getBinding().J, getBinding().N, getBinding().P, getBinding().M, getBinding().K, getBinding().L, getBinding().O, getBinding().f1769z, getBinding().I, getBinding().C})) {
             m.checkNotNullExpressionValue(checkedSetting, "setting");
             switch (checkedSetting.getId()) {
-                case 2131364459:
+                case 2131364497:
                     j = 64;
                     break;
-                case 2131364460:
+                case 2131364498:
                     j = 8;
                     break;
-                case 2131364461:
+                case 2131364499:
                     j = 32768;
                     break;
-                case 2131364462:
+                case 2131364500:
                     j = 4;
                     break;
-                case 2131364463:
+                case 2131364501:
                     j = 67108864;
                     break;
-                case 2131364464:
-                case 2131364465:
-                case 2131364467:
-                case 2131364468:
-                case 2131364470:
-                case 2131364480:
-                case 2131364481:
+                case 2131364502:
+                case 2131364503:
+                case 2131364505:
+                case 2131364506:
+                case 2131364508:
+                case 2131364518:
+                case 2131364519:
                 default:
                     j = 0;
                     break;
-                case 2131364466:
+                case 2131364504:
                     j = 1;
                     break;
-                case 2131364469:
+                case 2131364507:
                     j = 16384;
                     break;
-                case 2131364471:
+                case 2131364509:
                     j = 2;
                     break;
-                case 2131364472:
+                case 2131364510:
                     j = 16;
                     break;
-                case 2131364473:
+                case 2131364511:
                     j = 1073741824;
                     break;
-                case 2131364474:
+                case 2131364512:
                     j = 8192;
                     break;
-                case 2131364475:
+                case 2131364513:
                     j = 134217728;
                     break;
-                case 2131364476:
+                case 2131364514:
                     j = 268435456;
                     break;
-                case 2131364477:
+                case 2131364515:
                     j = 32;
                     break;
-                case 2131364478:
+                case 2131364516:
                     j = 536870912;
                     break;
-                case 2131364479:
+                case 2131364517:
                     j = 131072;
                     break;
-                case 2131364482:
+                case 2131364520:
                     j = 256;
                     break;
-                case 2131364483:
+                case 2131364521:
                     j = 65536;
                     break;
-                case 2131364484:
+                case 2131364522:
                     j = 1024;
                     break;
-                case 2131364485:
+                case 2131364523:
                     j = 4294967296L;
                     break;
-                case 2131364486:
+                case 2131364524:
                     j = 2048;
                     break;
-                case 2131364487:
+                case 2131364525:
                     j = 4096;
                     break;
-                case 2131364488:
+                case 2131364526:
                     j = 2147483648L;
                     break;
-                case 2131364489:
+                case 2131364527:
                     j = 262144;
                     break;
-                case 2131364490:
+                case 2131364528:
                     j = 128;
                     break;
-                case 2131364491:
+                case 2131364529:
                     j = 524288;
                     break;
-                case 2131364492:
+                case 2131364530:
                     j = 1048576;
                     break;
-                case 2131364493:
+                case 2131364531:
                     j = 8388608;
                     break;
-                case 2131364494:
+                case 2131364532:
                     j = 16777216;
                     break;
-                case 2131364495:
+                case 2131364533:
                     j = 4194304;
                     break;
-                case 2131364496:
+                case 2131364534:
                     j = 2097152;
                     break;
-                case 2131364497:
+                case 2131364535:
                     j = 33554432;
                     break;
-                case 2131364498:
+                case 2131364536:
                     j = 512;
                     break;
             }
@@ -657,15 +657,15 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
                         if (model.getOwner() || j != 8 || !model.isSingular(j)) {
                             enableSetting(checkedSetting, model, j);
                         } else {
-                            checkedSetting.b(2131890143);
+                            checkedSetting.b(2131890165);
                         }
                     }
                 } else if (can2 && !(model.isSingular(j) && can)) {
                     enableSetting(checkedSetting, model, j);
                 } else if (!can2) {
-                    checkedSetting.b(2131890139);
+                    checkedSetting.b(2131890161);
                 } else {
-                    checkedSetting.b(2131890143);
+                    checkedSetting.b(2131890165);
                 }
                 checkedSetting.setVisibility(!((j != 524288 && !model.isCommunityServer()) ^ true) ? 0 : 8);
             }
@@ -701,11 +701,11 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         setRetainInstance(true);
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f1764c;
+        FloatingActionButton floatingActionButton = getBinding().f1765c;
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editRoleName");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
-        FloatingActionButton floatingActionButton2 = getBinding().f1764c;
+        FloatingActionButton floatingActionButton2 = getBinding().f1765c;
         m.checkNotNullExpressionValue(floatingActionButton2, "binding.editRoleSave");
         floatingActionButton2.setVisibility(8);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java
index 56c5fcf2ce..8e4246272e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetServerSettingsEmojis$binding$2 extends
 
     public final WidgetServerSettingsEmojisBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365615;
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365615);
+        int i = 2131365676;
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365676);
         if (recyclerView != null) {
-            i = 2131365619;
-            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365619);
+            i = 2131365680;
+            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365680);
             if (appViewFlipper != null) {
                 return new WidgetServerSettingsEmojisBinding((CoordinatorLayout) view, recyclerView, appViewFlipper);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
index 0de2d7b8d2..7fa5b1688d 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java
@@ -84,7 +84,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
         public static final class EmojiEmptyViewHolder extends MGRecyclerViewHolder<Adapter, Item> {
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiEmptyViewHolder(Adapter adapter) {
-                super(2131559157, adapter);
+                super(2131559163, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
             }
 
@@ -99,14 +99,14 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiHeaderViewHolder(Adapter adapter) {
-                super(2131559158, adapter);
+                super(2131559164, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i = 2131365617;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365617);
+                int i = 2131365678;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365678);
                 if (materialButton != null) {
-                    i = 2131365618;
-                    TextView textView = (TextView) view.findViewById(2131365618);
+                    i = 2131365679;
+                    TextView textView = (TextView) view.findViewById(2131365679);
                     if (textView != null) {
                         WidgetServerSettingsEmojisHeaderBinding widgetServerSettingsEmojisHeaderBinding = new WidgetServerSettingsEmojisHeaderBinding((LinearLayout) view, materialButton, textView);
                         m.checkNotNullExpressionValue(widgetServerSettingsEmojisHeaderBinding, "WidgetServerSettingsEmoj…derBinding.bind(itemView)");
@@ -123,9 +123,9 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             public void onConfigure(int i, Item item) {
                 m.checkNotNullParameter(item, "data");
-                TextView textView = this.binding.f1884c;
+                TextView textView = this.binding.f1886c;
                 m.checkNotNullExpressionValue(textView, "binding.widgetServerSett…gsEmojisUploadDescription");
-                textView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131889678, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4));
+                textView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131889686, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4));
                 this.binding.b.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder$onConfigure$1(this));
             }
         }
@@ -136,24 +136,24 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiItemViewHolder(Adapter adapter) {
-                super(2131559159, adapter);
+                super(2131559165, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i = 2131364628;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364628);
+                int i = 2131364677;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364677);
                 if (simpleDraweeView != null) {
                     LinearLayout linearLayout = (LinearLayout) view;
-                    i = 2131364632;
-                    TextView textView = (TextView) view.findViewById(2131364632);
+                    i = 2131364681;
+                    TextView textView = (TextView) view.findViewById(2131364681);
                     if (textView != null) {
-                        i = 2131364634;
-                        ImageView imageView = (ImageView) view.findViewById(2131364634);
+                        i = 2131364683;
+                        ImageView imageView = (ImageView) view.findViewById(2131364683);
                         if (imageView != null) {
-                            i = 2131364635;
-                            TextView textView2 = (TextView) view.findViewById(2131364635);
+                            i = 2131364684;
+                            TextView textView2 = (TextView) view.findViewById(2131364684);
                             if (textView2 != null) {
-                                i = 2131364636;
-                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364636);
+                                i = 2131364685;
+                                SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364685);
                                 if (simpleDraweeView2 != null) {
                                     WidgetServerSettingsEmojisItemBinding widgetServerSettingsEmojisItemBinding = new WidgetServerSettingsEmojisItemBinding(linearLayout, simpleDraweeView, linearLayout, textView, imageView, textView2, simpleDraweeView2);
                                     m.checkNotNullExpressionValue(widgetServerSettingsEmojisItemBinding, "WidgetServerSettingsEmoj…temBinding.bind(itemView)");
@@ -194,7 +194,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 SimpleDraweeView simpleDraweeView4 = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView4, "binding.serverSettingsEmojisAvatar");
                 simpleDraweeView4.setImageAlpha(emojiItem.getEmoji().getAvailable() ? 255 : 100);
-                this.binding.f1885c.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1(this, item));
+                this.binding.f1887c.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1(this, item));
             }
         }
 
@@ -204,17 +204,17 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public EmojiSectionViewHolder(Adapter adapter) {
-                super(2131559160, adapter);
+                super(2131559166, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                TextView textView = (TextView) view.findViewById(2131365616);
+                TextView textView = (TextView) view.findViewById(2131365677);
                 if (textView != null) {
                     WidgetServerSettingsEmojisSectionBinding widgetServerSettingsEmojisSectionBinding = new WidgetServerSettingsEmojisSectionBinding((LinearLayout) view, textView);
                     m.checkNotNullExpressionValue(widgetServerSettingsEmojisSectionBinding, "WidgetServerSettingsEmoj…ionBinding.bind(itemView)");
                     this.binding = widgetServerSettingsEmojisSectionBinding;
                     return;
                 }
-                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365616)));
+                throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365677)));
             }
 
             public void onConfigure(int i, Item item) {
@@ -636,15 +636,15 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
             private final Observable<Model> getGuildEmojis(Guild guild) {
                 StoreEmojiGuild guildEmojis = StoreStream.Companion.getGuildEmojis();
                 long id2 = guild.getId();
-                Observable<R> G = guildEmojis.observeGuildEmoji(id2).v(new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1(guildEmojis, id2)).G(new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$2(guild));
-                m.checkNotNullExpressionValue(G, "storeGuildEmoji\n        …map { create(guild, it) }");
-                return ObservableExtensionsKt.computationBuffered(G);
+                Observable<R> F = guildEmojis.observeGuildEmoji(id2).u(new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$1(guildEmojis, id2)).F(new WidgetServerSettingsEmojis$Model$Companion$getGuildEmojis$2(guild));
+                m.checkNotNullExpressionValue(F, "storeGuildEmoji\n        …map { create(guild, it) }");
+                return ObservableExtensionsKt.computationBuffered(F);
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = canManageEmojis(j).Z(WidgetServerSettingsEmojis$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "canManageEmojis(guildId)…          }\n            }");
-                return Z;
+                Observable<R> Y = canManageEmojis(j).Y(WidgetServerSettingsEmojis$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "canManageEmojis(guildId)…          }\n            }");
+                return Y;
             }
         }
 
@@ -812,7 +812,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
     }
 
     public WidgetServerSettingsEmojis() {
-        super(2131559155);
+        super(2131559161);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEmojis widgetServerSettingsEmojis, Model model) {
@@ -850,7 +850,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment {
                 z2 = true;
             }
             if (!z2) {
-                AppViewFlipper appViewFlipper = getBinding().f1882c;
+                AppViewFlipper appViewFlipper = getBinding().f1884c;
                 m.checkNotNullExpressionValue(appViewFlipper, "binding.widgetServerSettingsEmojisViewFlipper");
                 appViewFlipper.setDisplayedChild(1);
                 this.uploadEmojiAction = new WidgetServerSettingsEmojis$configureUI$1(this, model);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java
index 8bbef3b381..abdc682fea 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetServerSettingsEmojisEdit$binding$2 exte
 
     public final WidgetServerSettingsEmojisEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364630;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364630);
+        int i = 2131364679;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364679);
         if (textInputLayout != null) {
-            i = 2131364631;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364631);
+            i = 2131364680;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364680);
             if (floatingActionButton != null) {
                 return new WidgetServerSettingsEmojisEditBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java
index e9705061e4..fd9ddce504 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java
@@ -14,7 +14,7 @@ public final class WidgetServerSettingsEmojisEdit$configureMenu$1<T1, T2> implem
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363904) {
+        if (menuItem.getItemId() == 2131363945) {
             WidgetServerSettingsEmojisEdit.access$deleteEmoji(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
index c0faac4e35..f49a7c4649 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java
@@ -36,7 +36,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
     private long emojiId = -1;
     private String emojiName = "";
     private long guildId = -1;
-    private final StatefulViews state = new StatefulViews(2131364630);
+    private final StatefulViews state = new StatefulViews(2131364679);
 
     /* compiled from: WidgetServerSettingsEmojisEdit.kt */
     public static final class Companion {
@@ -57,7 +57,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
     }
 
     public WidgetServerSettingsEmojisEdit() {
-        super(2131559156);
+        super(2131559162);
     }
 
     public static final /* synthetic */ void access$deleteEmoji(WidgetServerSettingsEmojisEdit widgetServerSettingsEmojisEdit) {
@@ -132,7 +132,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
         TextInputLayout textInputLayout3 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.serverSettingsEmojisEditAlias");
         ViewExtensions.setText(textInputLayout2, (CharSequence) statefulViews2.get(textInputLayout3.getId(), str));
-        o.j(this, getString(2131892973), 0, 4);
+        o.j(this, getString(2131893054), 0, 4);
     }
 
     private final String sanitizeEmojiName(String str) {
@@ -163,12 +163,12 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment {
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), this.emojiName));
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews2 = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f1883c;
+        FloatingActionButton floatingActionButton = getBinding().f1885c;
         TextInputLayout textInputLayout3 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.serverSettingsEmojisEditAlias");
         statefulViews2.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout3);
-        this.state.configureSaveActionView(getBinding().f1883c);
-        getBinding().f1883c.setOnClickListener(new WidgetServerSettingsEmojisEdit$onViewBound$1(this));
+        this.state.configureSaveActionView(getBinding().f1885c);
+        getBinding().f1885c.setOnClickListener(new WidgetServerSettingsEmojisEdit$onViewBound$1(this));
         configureToolbar(this.emojiName);
         configureMenu();
         if (!isRecreated()) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java
index 5e378042d0..1d54767f28 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java
@@ -17,17 +17,17 @@ public final /* synthetic */ class WidgetServerSettingsInstantInvitesActions$bin
 
     public final WidgetServerSettingsInstantInviteActionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363605;
-        TextView textView = (TextView) view.findViewById(2131363605);
+        int i = 2131363646;
+        TextView textView = (TextView) view.findViewById(2131363646);
         if (textView != null) {
-            i = 2131363606;
-            TextView textView2 = (TextView) view.findViewById(2131363606);
+            i = 2131363647;
+            TextView textView2 = (TextView) view.findViewById(2131363647);
             if (textView2 != null) {
-                i = 2131363607;
-                TextView textView3 = (TextView) view.findViewById(2131363607);
+                i = 2131363648;
+                TextView textView3 = (TextView) view.findViewById(2131363648);
                 if (textView3 != null) {
-                    i = 2131363608;
-                    TextView textView4 = (TextView) view.findViewById(2131363608);
+                    i = 2131363649;
+                    TextView textView4 = (TextView) view.findViewById(2131363649);
                     if (textView4 != null) {
                         return new WidgetServerSettingsInstantInviteActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java
index 4827104dce..d33a5be64f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java
@@ -19,7 +19,7 @@ public final class WidgetServerSettingsInstantInvitesActions$onResume$3 implemen
     public final void onClick(View view) {
         Context T = a.T(view, "it", "it.context");
         String str = this.$inviteUrl;
-        IntentUtils.performChooserSendIntent(T, str, b.j(this.this$0, 2131893236, new Object[]{str}, null, 4));
+        IntentUtils.performChooserSendIntent(T, str, b.j(this.this$0, 2131893319, new Object[]{str}, null, 4));
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
index 436d8085a3..045445adc4 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java
@@ -66,7 +66,7 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559163;
+        return 2131559169;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -91,7 +91,7 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh
             m.checkNotNullExpressionValue(textView2, "binding.inviteActionsTitle");
             textView2.setText(string);
         }
-        getBinding().f1886c.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$1(this, string));
+        getBinding().f1888c.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$1(this, string));
         getBinding().b.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$2(this, createLinkFromCode));
         getBinding().d.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$3(this, createLinkFromCode));
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java
index a902b8873d..f74f5a058f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsIntegrations$binding$2 ex
 
     public final WidgetServerSettingsIntegrationsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363594;
-        TextView textView = (TextView) view.findViewById(2131363594);
+        int i = 2131363635;
+        TextView textView = (TextView) view.findViewById(2131363635);
         if (textView != null) {
-            i = 2131363595;
-            TextView textView2 = (TextView) view.findViewById(2131363595);
+            i = 2131363636;
+            TextView textView2 = (TextView) view.findViewById(2131363636);
             if (textView2 != null) {
-                i = 2131363596;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363596);
+                i = 2131363637;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363637);
                 if (recyclerView != null) {
-                    i = 2131363598;
-                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363598);
+                    i = 2131363639;
+                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363639);
                     if (appViewFlipper != null) {
                         return new WidgetServerSettingsIntegrationsBinding((CoordinatorLayout) view, textView, textView2, recyclerView, appViewFlipper);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
index d30df335ec..b9fe0da900 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java
@@ -110,9 +110,9 @@ public final class WidgetServerSettingsIntegrations extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable g = Observable.g(companion.getGuildIntegrations().get(j), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForGuild(j), companion.getGuilds().observeGuild(j), companion.getGuilds().observeRoles(j), WidgetServerSettingsIntegrations$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(g, "Observable\n             …        }\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(g).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n             …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(g).r();
+                m.checkNotNullExpressionValue(r, "Observable\n             …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -294,7 +294,7 @@ public final class WidgetServerSettingsIntegrations extends AppFragment {
     }
 
     public WidgetServerSettingsIntegrations() {
-        super(2131559167);
+        super(2131559173);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsIntegrations widgetServerSettingsIntegrations, Model model) {
@@ -303,9 +303,9 @@ public final class WidgetServerSettingsIntegrations extends AppFragment {
 
     private final void configureUI(Model model) {
         if (model != null) {
-            setActionBarTitle(2131890393);
+            setActionBarTitle(2131890459);
             setActionBarSubtitle(model.getGuildName());
-            AppViewFlipper appViewFlipper = getBinding().f1890c;
+            AppViewFlipper appViewFlipper = getBinding().f1892c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.integrationsViewFlipper");
             appViewFlipper.setDisplayedChild(model.getIntegrations().isEmpty() ? 1 : 0);
             Adapter adapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
index 595a715a9d..6574411707 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java
@@ -11,7 +11,7 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
-import c.a.i.d5;
+import c.a.i.g5;
 import com.discord.api.user.User;
 import com.discord.databinding.WidgetServerSettingsIntegrationListItemBinding;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
@@ -25,35 +25,35 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetServerSettingsIntegrationsListItem(WidgetServerSettingsIntegrations.Adapter adapter) {
-        super(2131559166, adapter);
+        super(2131559172, adapter);
         m.checkNotNullParameter(adapter, "adapter");
         View view = this.itemView;
-        int i = 2131363585;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363585);
+        int i = 2131363626;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363626);
         if (relativeLayout != null) {
-            i = 2131363586;
-            View findViewById = view.findViewById(2131363586);
+            i = 2131363627;
+            View findViewById = view.findViewById(2131363627);
             if (findViewById != null) {
-                i = 2131363587;
-                ImageView imageView = (ImageView) view.findViewById(2131363587);
+                i = 2131363628;
+                ImageView imageView = (ImageView) view.findViewById(2131363628);
                 if (imageView != null) {
-                    i = 2131363588;
-                    TextView textView = (TextView) view.findViewById(2131363588);
+                    i = 2131363629;
+                    TextView textView = (TextView) view.findViewById(2131363629);
                     if (textView != null) {
-                        i = 2131363589;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363589);
+                        i = 2131363630;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363630);
                         if (linearLayout != null) {
-                            i = 2131363590;
-                            TextView textView2 = (TextView) view.findViewById(2131363590);
+                            i = 2131363631;
+                            TextView textView2 = (TextView) view.findViewById(2131363631);
                             if (textView2 != null) {
-                                i = 2131363591;
-                                ImageView imageView2 = (ImageView) view.findViewById(2131363591);
+                                i = 2131363632;
+                                ImageView imageView2 = (ImageView) view.findViewById(2131363632);
                                 if (imageView2 != null) {
-                                    i = 2131363592;
-                                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363592);
+                                    i = 2131363633;
+                                    CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363633);
                                     if (checkedSetting != null) {
-                                        i = 2131363593;
-                                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131363593);
+                                        i = 2131363634;
+                                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131363634);
                                         if (progressBar != null) {
                                             WidgetServerSettingsIntegrationListItemBinding widgetServerSettingsIntegrationListItemBinding = new WidgetServerSettingsIntegrationListItemBinding((FrameLayout) view, relativeLayout, findViewById, imageView, textView, linearLayout, textView2, imageView2, checkedSetting, progressBar);
                                             m.checkNotNullExpressionValue(widgetServerSettingsIntegrationListItemBinding, "WidgetServerSettingsInte…temBinding.bind(itemView)");
@@ -88,26 +88,26 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
     }
 
     private final void showDisableSyncDialog(long j, long j2, boolean z2, Context context) {
-        View inflate = LayoutInflater.from(context).inflate(2131559152, (ViewGroup) null, false);
-        int i = 2131364616;
-        TextView textView = (TextView) inflate.findViewById(2131364616);
+        View inflate = LayoutInflater.from(context).inflate(2131559158, (ViewGroup) null, false);
+        int i = 2131364665;
+        TextView textView = (TextView) inflate.findViewById(2131364665);
         if (textView != null) {
-            i = 2131364617;
-            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364617);
+            i = 2131364666;
+            MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364666);
             if (materialButton != null) {
-                i = 2131364618;
-                MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364618);
+                i = 2131364667;
+                MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364667);
                 if (materialButton2 != null) {
-                    i = 2131364619;
-                    TextView textView2 = (TextView) inflate.findViewById(2131364619);
+                    i = 2131364668;
+                    TextView textView2 = (TextView) inflate.findViewById(2131364668);
                     if (textView2 != null) {
                         LinearLayout linearLayout = (LinearLayout) inflate;
-                        m.checkNotNullExpressionValue(new d5(linearLayout, textView, materialButton, materialButton2, textView2), "WidgetServerSettingsConf…om(context), null, false)");
+                        m.checkNotNullExpressionValue(new g5(linearLayout, textView, materialButton, materialButton2, textView2), "WidgetServerSettingsConf…om(context), null, false)");
                         AlertDialog create = new AlertDialog.Builder(context).setView(linearLayout).create();
                         m.checkNotNullExpressionValue(create, "AlertDialog.Builder(cont…ew(binding.root).create()");
                         materialButton.setOnClickListener(new WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1(create));
                         materialButton2.setOnClickListener(new WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2(j, j2, create, context));
-                        textView.setText(z2 ? 2131888128 : 2131888129);
+                        textView.setText(z2 ? 2131888127 : 2131888128);
                         create.show();
                         return;
                     }
@@ -125,7 +125,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
         ProgressBar progressBar = this.binding.i;
         m.checkNotNullExpressionValue(progressBar, "binding.integrationSyncingProgressBar");
         progressBar.setVisibility(z2 ? 0 : 8);
-        View view = this.binding.f1889c;
+        View view = this.binding.f1891c;
         m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay");
         if (!z2) {
             i = 8;
@@ -155,8 +155,8 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi
         m.checkNotNullExpressionValue(textView2, "binding.integrationOwnerName");
         User user = integrationItem.getIntegration().getUser();
         textView2.setText(user != null ? user.r() : null);
-        this.binding.d.setImageResource(areEqual ? 2131230879 : 2131230880);
-        View view = this.binding.f1889c;
+        this.binding.d.setImageResource(areEqual ? 2131230882 : 2131230883);
+        View view = this.binding.f1891c;
         m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay");
         int i2 = 0;
         if (!(isSyncing || !isEnabled)) {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java
index cbb79691cc..a510f1b850 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java
@@ -18,35 +18,35 @@ public final /* synthetic */ class WidgetServerSettingsModeration$binding$2 exte
 
     public final WidgetServerSettingsModerationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364648;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364648);
+        int i = 2131364697;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364697);
         if (checkedSetting != null) {
-            i = 2131364649;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364649);
+            i = 2131364698;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364698);
             if (checkedSetting2 != null) {
-                i = 2131364650;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364650);
+                i = 2131364699;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364699);
                 if (checkedSetting3 != null) {
-                    i = 2131364651;
-                    TextView textView = (TextView) view.findViewById(2131364651);
+                    i = 2131364700;
+                    TextView textView = (TextView) view.findViewById(2131364700);
                     if (textView != null) {
-                        i = 2131364652;
-                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364652);
+                        i = 2131364701;
+                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364701);
                         if (checkedSetting4 != null) {
-                            i = 2131364653;
-                            CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364653);
+                            i = 2131364702;
+                            CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364702);
                             if (checkedSetting5 != null) {
-                                i = 2131364654;
-                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364654);
+                                i = 2131364703;
+                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364703);
                                 if (checkedSetting6 != null) {
-                                    i = 2131364655;
-                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364655);
+                                    i = 2131364704;
+                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364704);
                                     if (checkedSetting7 != null) {
-                                        i = 2131364656;
-                                        CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364656);
+                                        i = 2131364705;
+                                        CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364705);
                                         if (checkedSetting8 != null) {
-                                            i = 2131364657;
-                                            TextView textView2 = (TextView) view.findViewById(2131364657);
+                                            i = 2131364706;
+                                            TextView textView2 = (TextView) view.findViewById(2131364706);
                                             if (textView2 != null) {
                                                 return new WidgetServerSettingsModerationBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, textView, checkedSetting4, checkedSetting5, checkedSetting6, checkedSetting7, checkedSetting8, textView2);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java
index bbab6cedef..d5eb9cf7bf 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java
@@ -25,6 +25,6 @@ public final class WidgetServerSettingsModeration$updateGuild$1 extends o implem
 
     public final void invoke(Guild guild) {
         m.checkNotNullParameter(guild, "it");
-        c.a.d.o.i(this.this$0, 2131893186, 0, 4);
+        c.a.d.o.i(this.this$0, 2131893269, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
index 57ed6891a0..39d21dbb90 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java
@@ -82,9 +82,9 @@ public final class WidgetServerSettingsModeration extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable i = Observable.i(companion.getGuilds().observeGuild(j), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getPermissions().observePermissionsForGuild(j), WidgetServerSettingsModeration$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(i, "Observable\n             …        }\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(i).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n             …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(i).r();
+                m.checkNotNullExpressionValue(r, "Observable\n             …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -137,7 +137,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
     }
 
     public WidgetServerSettingsModeration() {
-        super(2131559170);
+        super(2131559176);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsModeration widgetServerSettingsModeration, Model model) {
@@ -157,7 +157,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
         if (!model.getGuild().getFeatures().contains(GuildFeature.COMMUNITY) || guildExplicitContentFilter.compareTo(GuildExplicitContentFilter.ALL) >= 0) {
             checkedSetting.e(new WidgetServerSettingsModeration$configureExplicitContentRadio$1(this, model, guildExplicitContentFilter));
         } else {
-            checkedSetting.b(2131893954);
+            checkedSetting.b(2131894054);
         }
         if (this.radioManagerExplicit != null && model.getGuild().getExplicitContentFilter() == guildExplicitContentFilter && (radioManager = this.radioManagerExplicit) != null) {
             radioManager.a(checkedSetting);
@@ -189,7 +189,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
         if (!model.getGuild().getFeatures().contains(GuildFeature.COMMUNITY) || guildVerificationLevel != GuildVerificationLevel.NONE) {
             checkedSetting.e(new WidgetServerSettingsModeration$configureVerificationLevelRadio$1(this, model, guildVerificationLevel));
         } else {
-            checkedSetting.b(2131893954);
+            checkedSetting.b(2131894054);
         }
         if (this.radioManagerVerification != null && model.getGuild().getVerificationLevel() == guildVerificationLevel && (radioManager = this.radioManagerVerification) != null) {
             radioManager.a(checkedSetting);
@@ -203,7 +203,7 @@ public final class WidgetServerSettingsModeration extends AppFragment {
     private final List<CheckedSetting> getExplicitContentViews() {
         CheckedSetting checkedSetting = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting, "binding.serverSettingsModerationExplicit1");
-        CheckedSetting checkedSetting2 = getBinding().f1893c;
+        CheckedSetting checkedSetting2 = getBinding().f1895c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.serverSettingsModerationExplicit2");
         CheckedSetting checkedSetting3 = getBinding().d;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.serverSettingsModerationExplicit3");
@@ -237,17 +237,17 @@ public final class WidgetServerSettingsModeration extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131891239);
+        setActionBarTitle(2131891310);
         TextView textView = getBinding().k;
         m.checkNotNullExpressionValue(textView, "binding.serverSettingsModerationVerificationHelp");
-        b.n(textView, 2131888601, new Object[0], null, 4);
+        b.m(textView, 2131888602, new Object[0], null, 4);
         TextView textView2 = getBinding().e;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsModerationExplicitHelp");
-        b.n(textView2, 2131888580, new Object[0], null, 4);
+        b.m(textView2, 2131888581, new Object[0], null, 4);
         this.radioManagerVerification = new RadioManager(getVerificationViews());
         this.radioManagerExplicit = new RadioManager(getExplicitContentViews());
-        CheckedSetting.i(getVerificationViews().get(2), b.j(this, 2131894440, new Object[]{"5"}, null, 4), false, 2);
-        CheckedSetting.i(getVerificationViews().get(3), b.j(this, 2131894436, new Object[]{"10"}, null, 4), false, 2);
+        CheckedSetting.i(getVerificationViews().get(2), b.j(this, 2131894559, new Object[]{"5"}, null, 4), false, 2);
+        CheckedSetting.i(getVerificationViews().get(3), b.j(this, 2131894555, new Object[]{"10"}, null, 4), false, 2);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java
index ab8c926de4..d8a792ae10 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java
@@ -17,23 +17,23 @@ public final /* synthetic */ class WidgetServerSettingsOverview$AfkBottomSheet$b
 
     public final WidgetServerSettingsOverviewAfkTimeoutBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363342;
-        TextView textView = (TextView) view.findViewById(2131363342);
+        int i = 2131363368;
+        TextView textView = (TextView) view.findViewById(2131363368);
         if (textView != null) {
-            i = 2131364665;
-            TextView textView2 = (TextView) view.findViewById(2131364665);
+            i = 2131364714;
+            TextView textView2 = (TextView) view.findViewById(2131364714);
             if (textView2 != null) {
-                i = 2131364666;
-                TextView textView3 = (TextView) view.findViewById(2131364666);
+                i = 2131364715;
+                TextView textView3 = (TextView) view.findViewById(2131364715);
                 if (textView3 != null) {
-                    i = 2131364667;
-                    TextView textView4 = (TextView) view.findViewById(2131364667);
+                    i = 2131364716;
+                    TextView textView4 = (TextView) view.findViewById(2131364716);
                     if (textView4 != null) {
-                        i = 2131364668;
-                        TextView textView5 = (TextView) view.findViewById(2131364668);
+                        i = 2131364717;
+                        TextView textView5 = (TextView) view.findViewById(2131364717);
                         if (textView5 != null) {
-                            i = 2131364669;
-                            TextView textView6 = (TextView) view.findViewById(2131364669);
+                            i = 2131364718;
+                            TextView textView6 = (TextView) view.findViewById(2131364718);
                             if (textView6 != null) {
                                 return new WidgetServerSettingsOverviewAfkTimeoutBinding((NestedScrollView) view, textView, textView2, textView3, textView4, textView5, textView6);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java
index fe0ba09d73..8a371e6547 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java
@@ -10,10 +10,10 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.i.a3;
 import c.a.i.b3;
-import c.a.i.e5;
-import c.a.i.v2;
-import c.a.i.w2;
-import c.a.i.x2;
+import c.a.i.c3;
+import c.a.i.d3;
+import c.a.i.e3;
+import c.a.i.h5;
 import c.a.i.y2;
 import c.a.i.z2;
 import com.discord.databinding.WidgetServerSettingsOverviewBinding;
@@ -50,118 +50,118 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend
                         i2 = 2131361929;
                         LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(2131361929);
                         if (linearLayout2 != null) {
-                            e5 e5Var = new e5((LinearLayout) findViewById, textView, linearLayout, textView2, linearLayout2);
-                            i = 2131363505;
-                            View findViewById2 = view.findViewById(2131363505);
+                            h5 h5Var = new h5((LinearLayout) findViewById, textView, linearLayout, textView2, linearLayout2);
+                            i = 2131363546;
+                            View findViewById2 = view.findViewById(2131363546);
                             if (findViewById2 != null) {
-                                int i3 = 2131363528;
-                                TextView textView3 = (TextView) findViewById2.findViewById(2131363528);
+                                int i3 = 2131363569;
+                                TextView textView3 = (TextView) findViewById2.findViewById(2131363569);
                                 if (textView3 != null) {
-                                    i3 = 2131364126;
-                                    TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131364126);
+                                    i3 = 2131364169;
+                                    TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131364169);
                                     if (textInputLayout != null) {
-                                        i3 = 2131364670;
-                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById2.findViewById(2131364670);
+                                        i3 = 2131364719;
+                                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById2.findViewById(2131364719);
                                         if (simpleDraweeView != null) {
                                             ConstraintLayout constraintLayout = (ConstraintLayout) findViewById2;
-                                            i3 = 2131364672;
-                                            TextView textView4 = (TextView) findViewById2.findViewById(2131364672);
+                                            i3 = 2131364721;
+                                            TextView textView4 = (TextView) findViewById2.findViewById(2131364721);
                                             if (textView4 != null) {
-                                                i3 = 2131364673;
-                                                TextView textView5 = (TextView) findViewById2.findViewById(2131364673);
+                                                i3 = 2131364722;
+                                                TextView textView5 = (TextView) findViewById2.findViewById(2131364722);
                                                 if (textView5 != null) {
-                                                    v2 v2Var = new v2(constraintLayout, textView3, textInputLayout, simpleDraweeView, constraintLayout, textView4, textView5);
-                                                    i = 2131364044;
-                                                    View findViewById3 = view.findViewById(2131364044);
+                                                    y2 y2Var = new y2(constraintLayout, textView3, textInputLayout, simpleDraweeView, constraintLayout, textView4, textView5);
+                                                    i = 2131364087;
+                                                    View findViewById3 = view.findViewById(2131364087);
                                                     if (findViewById3 != null) {
-                                                        int i4 = 2131364674;
-                                                        CheckedSetting checkedSetting = (CheckedSetting) findViewById3.findViewById(2131364674);
+                                                        int i4 = 2131364723;
+                                                        CheckedSetting checkedSetting = (CheckedSetting) findViewById3.findViewById(2131364723);
                                                         if (checkedSetting != null) {
-                                                            i4 = 2131364675;
-                                                            CheckedSetting checkedSetting2 = (CheckedSetting) findViewById3.findViewById(2131364675);
+                                                            i4 = 2131364724;
+                                                            CheckedSetting checkedSetting2 = (CheckedSetting) findViewById3.findViewById(2131364724);
                                                             if (checkedSetting2 != null) {
-                                                                w2 w2Var = new w2((LinearLayout) findViewById3, checkedSetting, checkedSetting2);
-                                                                View findViewById4 = view.findViewById(2131364400);
+                                                                z2 z2Var = new z2((LinearLayout) findViewById3, checkedSetting, checkedSetting2);
+                                                                View findViewById4 = view.findViewById(2131364438);
                                                                 if (findViewById4 != null) {
-                                                                    int i5 = 2131364127;
-                                                                    TextView textView6 = (TextView) findViewById4.findViewById(2131364127);
+                                                                    int i5 = 2131364170;
+                                                                    TextView textView6 = (TextView) findViewById4.findViewById(2131364170);
                                                                     if (textView6 != null) {
-                                                                        i5 = 2131364128;
-                                                                        ImageView imageView = (ImageView) findViewById4.findViewById(2131364128);
+                                                                        i5 = 2131364171;
+                                                                        ImageView imageView = (ImageView) findViewById4.findViewById(2131364171);
                                                                         if (imageView != null) {
                                                                             LinearLayout linearLayout3 = (LinearLayout) findViewById4;
-                                                                            x2 x2Var = new x2(linearLayout3, textView6, imageView, linearLayout3);
-                                                                            View findViewById5 = view.findViewById(2131364401);
+                                                                            a3 a3Var = new a3(linearLayout3, textView6, imageView, linearLayout3);
+                                                                            View findViewById5 = view.findViewById(2131364439);
                                                                             if (findViewById5 != null) {
-                                                                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById5.findViewById(2131363445);
+                                                                                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById5.findViewById(2131363472);
                                                                                 if (linkifiedTextView != null) {
                                                                                     LinearLayout linearLayout4 = (LinearLayout) findViewById5;
-                                                                                    y2 y2Var = new y2(linearLayout4, linkifiedTextView, linearLayout4);
-                                                                                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364510);
+                                                                                    b3 b3Var = new b3(linearLayout4, linkifiedTextView, linearLayout4);
+                                                                                    FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364548);
                                                                                     if (floatingActionButton != null) {
-                                                                                        ScrollView scrollView = (ScrollView) view.findViewById(2131364678);
+                                                                                        ScrollView scrollView = (ScrollView) view.findViewById(2131364727);
                                                                                         if (scrollView != null) {
-                                                                                            View findViewById6 = view.findViewById(2131365161);
+                                                                                            View findViewById6 = view.findViewById(2131365216);
                                                                                             if (findViewById6 != null) {
-                                                                                                int i6 = 2131365162;
-                                                                                                TextView textView7 = (TextView) findViewById6.findViewById(2131365162);
+                                                                                                int i6 = 2131365217;
+                                                                                                TextView textView7 = (TextView) findViewById6.findViewById(2131365217);
                                                                                                 if (textView7 != null) {
-                                                                                                    i6 = 2131365163;
-                                                                                                    CheckedSetting checkedSetting3 = (CheckedSetting) findViewById6.findViewById(2131365163);
+                                                                                                    i6 = 2131365218;
+                                                                                                    CheckedSetting checkedSetting3 = (CheckedSetting) findViewById6.findViewById(2131365218);
                                                                                                     if (checkedSetting3 != null) {
-                                                                                                        i6 = 2131365164;
-                                                                                                        CheckedSetting checkedSetting4 = (CheckedSetting) findViewById6.findViewById(2131365164);
+                                                                                                        i6 = 2131365219;
+                                                                                                        CheckedSetting checkedSetting4 = (CheckedSetting) findViewById6.findViewById(2131365219);
                                                                                                         if (checkedSetting4 != null) {
                                                                                                             LinearLayout linearLayout5 = (LinearLayout) findViewById6;
-                                                                                                            z2 z2Var = new z2(linearLayout5, textView7, checkedSetting3, checkedSetting4, linearLayout5);
-                                                                                                            View findViewById7 = view.findViewById(2131365345);
+                                                                                                            c3 c3Var = new c3(linearLayout5, textView7, checkedSetting3, checkedSetting4, linearLayout5);
+                                                                                                            View findViewById7 = view.findViewById(2131365403);
                                                                                                             if (findViewById7 != null) {
-                                                                                                                int i7 = 2131364679;
-                                                                                                                FrameLayout frameLayout = (FrameLayout) findViewById7.findViewById(2131364679);
+                                                                                                                int i7 = 2131364728;
+                                                                                                                FrameLayout frameLayout = (FrameLayout) findViewById7.findViewById(2131364728);
                                                                                                                 if (frameLayout != null) {
-                                                                                                                    i7 = 2131364680;
-                                                                                                                    TextView textView8 = (TextView) findViewById7.findViewById(2131364680);
+                                                                                                                    i7 = 2131364729;
+                                                                                                                    TextView textView8 = (TextView) findViewById7.findViewById(2131364729);
                                                                                                                     if (textView8 != null) {
-                                                                                                                        i7 = 2131365347;
-                                                                                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById7.findViewById(2131365347);
+                                                                                                                        i7 = 2131365405;
+                                                                                                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById7.findViewById(2131365405);
                                                                                                                         if (simpleDraweeView2 != null) {
-                                                                                                                            i7 = 2131365348;
-                                                                                                                            FloatingActionButton floatingActionButton2 = (FloatingActionButton) findViewById7.findViewById(2131365348);
+                                                                                                                            i7 = 2131365406;
+                                                                                                                            FloatingActionButton floatingActionButton2 = (FloatingActionButton) findViewById7.findViewById(2131365406);
                                                                                                                             if (floatingActionButton2 != null) {
-                                                                                                                                i7 = 2131365349;
-                                                                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById7.findViewById(2131365349);
+                                                                                                                                i7 = 2131365407;
+                                                                                                                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById7.findViewById(2131365407);
                                                                                                                                 if (linkifiedTextView2 != null) {
-                                                                                                                                    i7 = 2131365350;
-                                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(2131365350);
+                                                                                                                                    i7 = 2131365408;
+                                                                                                                                    TextView textView9 = (TextView) findViewById7.findViewById(2131365408);
                                                                                                                                     if (textView9 != null) {
-                                                                                                                                        i7 = 2131365351;
-                                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(2131365351);
+                                                                                                                                        i7 = 2131365409;
+                                                                                                                                        TextView textView10 = (TextView) findViewById7.findViewById(2131365409);
                                                                                                                                         if (textView10 != null) {
-                                                                                                                                            a3 a3Var = new a3((LinearLayout) findViewById7, frameLayout, textView8, simpleDraweeView2, floatingActionButton2, linkifiedTextView2, textView9, textView10);
-                                                                                                                                            View findViewById8 = view.findViewById(2131365346);
+                                                                                                                                            d3 d3Var = new d3((LinearLayout) findViewById7, frameLayout, textView8, simpleDraweeView2, floatingActionButton2, linkifiedTextView2, textView9, textView10);
+                                                                                                                                            View findViewById8 = view.findViewById(2131365404);
                                                                                                                                             if (findViewById8 != null) {
-                                                                                                                                                int i8 = 2131364681;
-                                                                                                                                                FrameLayout frameLayout2 = (FrameLayout) findViewById8.findViewById(2131364681);
+                                                                                                                                                int i8 = 2131364730;
+                                                                                                                                                FrameLayout frameLayout2 = (FrameLayout) findViewById8.findViewById(2131364730);
                                                                                                                                                 if (frameLayout2 != null) {
-                                                                                                                                                    i8 = 2131364682;
-                                                                                                                                                    FloatingActionButton floatingActionButton3 = (FloatingActionButton) findViewById8.findViewById(2131364682);
+                                                                                                                                                    i8 = 2131364731;
+                                                                                                                                                    FloatingActionButton floatingActionButton3 = (FloatingActionButton) findViewById8.findViewById(2131364731);
                                                                                                                                                     if (floatingActionButton3 != null) {
-                                                                                                                                                        i8 = 2131364683;
-                                                                                                                                                        TextView textView11 = (TextView) findViewById8.findViewById(2131364683);
+                                                                                                                                                        i8 = 2131364732;
+                                                                                                                                                        TextView textView11 = (TextView) findViewById8.findViewById(2131364732);
                                                                                                                                                         if (textView11 != null) {
-                                                                                                                                                            i8 = 2131365356;
-                                                                                                                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById8.findViewById(2131365356);
+                                                                                                                                                            i8 = 2131365414;
+                                                                                                                                                            SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById8.findViewById(2131365414);
                                                                                                                                                             if (simpleDraweeView3 != null) {
-                                                                                                                                                                i8 = 2131365357;
-                                                                                                                                                                LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById8.findViewById(2131365357);
+                                                                                                                                                                i8 = 2131365415;
+                                                                                                                                                                LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById8.findViewById(2131365415);
                                                                                                                                                                 if (linkifiedTextView3 != null) {
-                                                                                                                                                                    i8 = 2131365358;
-                                                                                                                                                                    TextView textView12 = (TextView) findViewById8.findViewById(2131365358);
+                                                                                                                                                                    i8 = 2131365416;
+                                                                                                                                                                    TextView textView12 = (TextView) findViewById8.findViewById(2131365416);
                                                                                                                                                                     if (textView12 != null) {
-                                                                                                                                                                        i8 = 2131365359;
-                                                                                                                                                                        TextView textView13 = (TextView) findViewById8.findViewById(2131365359);
+                                                                                                                                                                        i8 = 2131365417;
+                                                                                                                                                                        TextView textView13 = (TextView) findViewById8.findViewById(2131365417);
                                                                                                                                                                         if (textView13 != null) {
-                                                                                                                                                                            return new WidgetServerSettingsOverviewBinding((CoordinatorLayout) view, e5Var, v2Var, w2Var, x2Var, y2Var, floatingActionButton, scrollView, z2Var, a3Var, new b3((LinearLayout) findViewById8, frameLayout2, floatingActionButton3, textView11, simpleDraweeView3, linkifiedTextView3, textView12, textView13));
+                                                                                                                                                                            return new WidgetServerSettingsOverviewBinding((CoordinatorLayout) view, h5Var, y2Var, z2Var, a3Var, b3Var, floatingActionButton, scrollView, c3Var, d3Var, new e3((LinearLayout) findViewById8, frameLayout2, floatingActionButton3, textView11, simpleDraweeView3, linkifiedTextView3, textView12, textView13));
                                                                                                                                                                         }
                                                                                                                                                                     }
                                                                                                                                                                 }
@@ -171,7 +171,7 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend
                                                                                                                                                 }
                                                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById8.getResources().getResourceName(i8)));
                                                                                                                                             }
-                                                                                                                                            i = 2131365346;
+                                                                                                                                            i = 2131365404;
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                 }
@@ -181,30 +181,30 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend
                                                                                                                 }
                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i7)));
                                                                                                             }
-                                                                                                            i = 2131365345;
+                                                                                                            i = 2131365403;
                                                                                                         }
                                                                                                     }
                                                                                                 }
                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i6)));
                                                                                             }
-                                                                                            i = 2131365161;
+                                                                                            i = 2131365216;
                                                                                         } else {
-                                                                                            i = 2131364678;
+                                                                                            i = 2131364727;
                                                                                         }
                                                                                     } else {
-                                                                                        i = 2131364510;
+                                                                                        i = 2131364548;
                                                                                     }
                                                                                 } else {
-                                                                                    throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(2131363445)));
+                                                                                    throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(2131363472)));
                                                                                 }
                                                                             } else {
-                                                                                i = 2131364401;
+                                                                                i = 2131364439;
                                                                             }
                                                                         }
                                                                     }
                                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById4.getResources().getResourceName(i5)));
                                                                 }
-                                                                i = 2131364400;
+                                                                i = 2131364438;
                                                             }
                                                         }
                                                         throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i4)));
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java
index 0fe78c747d..a7f2caf4d7 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java
@@ -15,6 +15,6 @@ public final class WidgetServerSettingsOverview$configureUI$2 implements View.On
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSelector.Companion.launchForVoice(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_AFK_CHANNEL", true, 2131891368);
+        WidgetChannelSelector.Companion.launchForVoice(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_AFK_CHANNEL", true, 2131891439);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java
index bbdd1ad532..721384e163 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java
@@ -15,6 +15,6 @@ public final class WidgetServerSettingsOverview$configureUI$4 implements View.On
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSelector.Companion.launchForText(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_SYSTEM_CHANNEL", true, 2131891421);
+        WidgetChannelSelector.Companion.launchForText(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_SYSTEM_CHANNEL", true, 2131891492);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java
index 779fca4c51..ecb1b19895 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$6.java
@@ -14,16 +14,16 @@ public final class WidgetServerSettingsOverview$configureUI$6 implements View.On
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        CheckedSetting checkedSetting = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f188c;
+        CheckedSetting checkedSetting = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f74c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.systemChannel.systemChannelBoost");
-        CheckedSetting checkedSetting2 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f188c;
+        CheckedSetting checkedSetting2 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f74c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.systemChannel.systemChannelBoost");
         checkedSetting.setChecked(!checkedSetting2.isChecked());
         StatefulViews access$getState$p = WidgetServerSettingsOverview.access$getState$p(this.this$0);
-        CheckedSetting checkedSetting3 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f188c;
+        CheckedSetting checkedSetting3 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f74c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.systemChannel.systemChannelBoost");
         int id2 = checkedSetting3.getId();
-        CheckedSetting checkedSetting4 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f188c;
+        CheckedSetting checkedSetting4 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f74c;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.systemChannel.systemChannelBoost");
         access$getState$p.put(id2, Boolean.valueOf(checkedSetting4.isChecked()));
         WidgetServerSettingsOverview.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsOverview.access$getBinding$p(this.this$0).g);
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java
index 5402ce6e7c..72df92f363 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java
@@ -36,9 +36,9 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On
         public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
         public final Observable<? extends com.discord.models.guild.Guild> call(Guild guild) {
-            Observable<R> G = StoreStream.Companion.getGuilds().observeGuild(guild.o()).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            return G;
+            Observable<R> F = StoreStream.Companion.getGuilds().observeGuild(guild.o()).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            return F;
         }
     }
 
@@ -81,10 +81,10 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On
         m.checkNotNullExpressionValue(checkedSetting2, "binding.systemChannel.systemChannelJoin");
         int i = !((Boolean) access$getState$p.get(id2, Boolean.valueOf(checkedSetting2.isChecked()))).booleanValue() ? 1 : 0;
         StatefulViews access$getState$p2 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
-        CheckedSetting checkedSetting3 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f188c;
+        CheckedSetting checkedSetting3 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f74c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.systemChannel.systemChannelBoost");
         int id3 = checkedSetting3.getId();
-        CheckedSetting checkedSetting4 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f188c;
+        CheckedSetting checkedSetting4 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.f74c;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.systemChannel.systemChannelBoost");
         if (!((Boolean) access$getState$p2.get(id3, Boolean.valueOf(checkedSetting4.isChecked()))).booleanValue()) {
             i |= 2;
@@ -95,7 +95,7 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On
         TextView textView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).b.b;
         m.checkNotNullExpressionValue(textView, "binding.afk.afkChannel");
         Channel channel = (Channel) access$getState$p3.get(textView.getId(), this.$this_configureUI.getAfkChannelModel());
-        Long valueOf = channel != null ? Long.valueOf(channel.g()) : null;
+        Long valueOf = channel != null ? Long.valueOf(channel.h()) : null;
         StatefulViews access$getState$p4 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
         LinearLayout linearLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).b.e;
         m.checkNotNullExpressionValue(linearLayout, "binding.afk.afkTimeoutWrap");
@@ -104,14 +104,14 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On
         TextView textView2 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).i.b;
         m.checkNotNullExpressionValue(textView2, "binding.systemChannel.systemChannel");
         Channel channel2 = (Channel) access$getState$p5.get(textView2.getId(), this.$this_configureUI.getSystemChannelModel());
-        Long valueOf2 = channel2 != null ? Long.valueOf(channel2.g()) : null;
+        Long valueOf2 = channel2 != null ? Long.valueOf(channel2.h()) : null;
         Integer num2 = (Integer) WidgetServerSettingsOverview.access$getState$p(this.this$0).get(90001, Integer.valueOf(this.$this_configureUI.getGuild().getDefaultMessageNotifications()));
         StatefulViews access$getState$p6 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
-        SimpleDraweeView simpleDraweeView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1895c.d;
+        SimpleDraweeView simpleDraweeView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1897c.d;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.header.serverSettingsOverviewIcon");
         String str = (String) access$getState$p6.get(simpleDraweeView.getId(), IconUtils.getForGuild$default(this.$this_configureUI.getGuild(), null, false, null, 14, null));
         StatefulViews access$getState$p7 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1895c.f167c;
+        TextInputLayout textInputLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1897c.f183c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName");
         String str2 = (String) access$getState$p7.get(textInputLayout.getId(), this.$this_configureUI.getGuild().getName());
         StatefulViews access$getState$p8 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
@@ -127,8 +127,8 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On
         StatefulViews access$getState$p10 = WidgetServerSettingsOverview.access$getState$p(this.this$0);
         SimpleDraweeView simpleDraweeView3 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).j.d;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.uploadBanner.uploadBanner");
-        Observable Z = ObservableExtensionsKt.restSubscribeOn$default(apiSerializeNulls.updateGuild(id4, new RestAPIParams.UpdateGuild(valueOf, num, valueOf2, num2, str, str2, str3, verificationLevel, explicitContentFilter, str4, (String) access$getState$p10.get(simpleDraweeView3.getId(), this.$this_configureUI.getGuild().getBanner()), Integer.valueOf(i), u.toList(this.$this_configureUI.getGuild().getFeatures()), this.$this_configureUI.getGuild().getRulesChannelId(), this.$this_configureUI.getGuild().getPublicUpdatesChannelId(), this.$this_configureUI.getGuild().getPreferredLocale())), false, 1, null).Z(AnonymousClass1.INSTANCE).Z(AnonymousClass2.INSTANCE);
-        m.checkNotNullExpressionValue(Z, "RestAPI\n          .apiSe…atedGuild.id)\n          }");
-        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(Z, 0, false, 3, null), this.this$0, null, 2, null).k(q.i(new AnonymousClass3(this), this.this$0));
+        Observable Y = ObservableExtensionsKt.restSubscribeOn$default(apiSerializeNulls.updateGuild(id4, new RestAPIParams.UpdateGuild(valueOf, num, valueOf2, num2, str, str2, str3, verificationLevel, explicitContentFilter, str4, (String) access$getState$p10.get(simpleDraweeView3.getId(), this.$this_configureUI.getGuild().getBanner()), Integer.valueOf(i), u.toList(this.$this_configureUI.getGuild().getFeatures()), this.$this_configureUI.getGuild().getRulesChannelId(), this.$this_configureUI.getGuild().getPublicUpdatesChannelId(), this.$this_configureUI.getGuild().getPreferredLocale())), false, 1, null).Y(AnonymousClass1.INSTANCE).Y(AnonymousClass2.INSTANCE);
+        m.checkNotNullExpressionValue(Y, "RestAPI\n          .apiSe…atedGuild.id)\n          }");
+        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null), this.this$0, null, 2, null).k(q.i(new AnonymousClass3(this), this.this$0));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java
index 802394000f..106695f31f 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsOverview$onViewBound$2 extends o implemen
     public final void invoke(long j, String str) {
         m.checkNotNullParameter(str, "<anonymous parameter 1>");
         Channel channel = StoreStream.Companion.getChannels().getChannel(j);
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131365162, channel);
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131365217, channel);
         WidgetServerSettingsOverview.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsOverview.access$getBinding$p(this.this$0).g);
         WidgetServerSettingsOverview.access$configureSystemChannel(this.this$0, channel);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java
index 6ebec01d35..eefeaf1ac6 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java
@@ -30,8 +30,8 @@ public final class WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$
     public final void invoke(WidgetServerRegionSelectDialog.VoiceRegion voiceRegion) {
         m.checkNotNullParameter(voiceRegion, "voiceRegion");
         int voiceRegionIconResourceId = IconUtils.INSTANCE.getVoiceRegionIconResourceId(voiceRegion.getId());
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364127, voiceRegion.getName());
-        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364128, Integer.valueOf(voiceRegionIconResourceId));
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364170, voiceRegion.getName());
+        WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364171, Integer.valueOf(voiceRegionIconResourceId));
         StatefulViews access$getState$p = WidgetServerSettingsOverview.access$getState$p(this.this$0);
         LinearLayout linearLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.d;
         m.checkNotNullExpressionValue(linearLayout, "binding.region.overviewRegionWrap");
@@ -39,7 +39,7 @@ public final class WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$
         TextView textView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.b;
         m.checkNotNullExpressionValue(textView, "binding.region.overviewRegion");
         textView.setText(voiceRegion.getName());
-        WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.f176c.setImageResource(voiceRegionIconResourceId);
+        WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.f62c.setImageResource(voiceRegionIconResourceId);
         LinearLayout linearLayout2 = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.d;
         m.checkNotNullExpressionValue(linearLayout2, "binding.region.overviewRegionWrap");
         linearLayout2.setTag(voiceRegion.getId());
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
index 2158d6745d..7541cc1ccd 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java
@@ -80,7 +80,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsOverview$binding$2.INSTANCE, null, 2, null);
     private boolean hasOpenedAvatarPicker;
     private Action1<String> imageSelectedResult;
-    private final StatefulViews state = new StatefulViews(2131364670, 2131364126, 2131364127, 2131364128, 2131364129, 2131361926, 2131361928, 2131361929, 2131365162, 2131365356, 2131365347, 2131365164, 2131365163, 90001);
+    private final StatefulViews state = new StatefulViews(2131364719, 2131364169, 2131364170, 2131364171, 2131364172, 2131361926, 2131361928, 2131361929, 2131365217, 2131365414, 2131365405, 2131365219, 2131365218, 90001);
 
     /* compiled from: WidgetServerSettingsOverview.kt */
     public static final class AfkBottomSheet extends AppBottomSheet {
@@ -98,7 +98,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         private final List<TextView> getTimeouts() {
             TextView textView = getBinding().b;
             m.checkNotNullExpressionValue(textView, "binding.serverSettingsOverviewAfkTimeout01");
-            TextView textView2 = getBinding().f1894c;
+            TextView textView2 = getBinding().f1896c;
             m.checkNotNullExpressionValue(textView2, "binding.serverSettingsOverviewAfkTimeout05");
             TextView textView3 = getBinding().d;
             m.checkNotNullExpressionValue(textView3, "binding.serverSettingsOverviewAfkTimeout15");
@@ -111,7 +111,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
 
         @Override // com.discord.app.AppBottomSheet
         public int getContentViewResId() {
-            return 2131559172;
+            return 2131559178;
         }
 
         @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -190,11 +190,11 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<R> Z = StoreStream.Companion.getGuilds().observeGuild(j).Z(new WidgetServerSettingsOverview$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …        }\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getGuilds().observeGuild(j).Y(new WidgetServerSettingsOverview$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
 
             public final CharSequence getAfkTimeout(Context context, int i) {
@@ -229,7 +229,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         public static final class VoiceRegion implements MGRecyclerDataPayload {
 
             /* renamed from: id  reason: collision with root package name */
-            private final String f2142id;
+            private final String f2148id;
             private final String key;
             private final String name;
             private final int type;
@@ -237,14 +237,14 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             public VoiceRegion(String str, String str2) {
                 m.checkNotNullParameter(str, "id");
                 m.checkNotNullParameter(str2, "name");
-                this.f2142id = str;
+                this.f2148id = str;
                 this.name = str2;
                 this.key = str;
             }
 
             public static /* synthetic */ VoiceRegion copy$default(VoiceRegion voiceRegion, String str, String str2, int i, Object obj) {
                 if ((i & 1) != 0) {
-                    str = voiceRegion.f2142id;
+                    str = voiceRegion.f2148id;
                 }
                 if ((i & 2) != 0) {
                     str2 = voiceRegion.name;
@@ -253,7 +253,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             }
 
             public final String component1() {
-                return this.f2142id;
+                return this.f2148id;
             }
 
             public final String component2() {
@@ -274,11 +274,11 @@ public final class WidgetServerSettingsOverview extends AppFragment {
                     return false;
                 }
                 VoiceRegion voiceRegion = (VoiceRegion) obj;
-                return m.areEqual(this.f2142id, voiceRegion.f2142id) && m.areEqual(this.name, voiceRegion.name);
+                return m.areEqual(this.f2148id, voiceRegion.f2148id) && m.areEqual(this.name, voiceRegion.name);
             }
 
             public final String getId() {
-                return this.f2142id;
+                return this.f2148id;
             }
 
             @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -296,7 +296,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             }
 
             public int hashCode() {
-                String str = this.f2142id;
+                String str = this.f2148id;
                 int i = 0;
                 int hashCode = (str != null ? str.hashCode() : 0) * 31;
                 String str2 = this.name;
@@ -308,7 +308,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
 
             public String toString() {
                 StringBuilder L = a.L("VoiceRegion(id=");
-                L.append(this.f2142id);
+                L.append(this.f2148id);
                 L.append(", name=");
                 return a.D(L, this.name, ")");
             }
@@ -405,7 +405,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     }
 
     public WidgetServerSettingsOverview() {
-        super(2131559171);
+        super(2131559177);
     }
 
     public static final /* synthetic */ void access$configureAfkChannel(WidgetServerSettingsOverview widgetServerSettingsOverview, Channel channel) {
@@ -467,7 +467,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final void configureAfkChannel(Channel channel) {
         TextView textView = getBinding().b.b;
         m.checkNotNullExpressionValue(textView, "binding.afk.afkChannel");
-        configureChannel(textView, channel, 2131891368, 2131231493);
+        configureChannel(textView, channel, 2131891439, 2131231499);
     }
 
     private final void configureBannerImage(String str, String str2, boolean z2) {
@@ -486,31 +486,31 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         SimpleDraweeView simpleDraweeView3 = getBinding().j.d;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.uploadBanner.uploadBanner");
         IconUtils.setIcon$default(simpleDraweeView3, str2, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
-        TextView textView = getBinding().j.f62c;
+        TextView textView = getBinding().j.f80c;
         m.checkNotNullExpressionValue(textView, "binding.uploadBanner.ser…verviewUploadBannerRemove");
         int i = 0;
         if (!(!(str2 == null || t.isBlank(str2)))) {
             i = 8;
         }
         textView.setVisibility(i);
-        getBinding().j.f62c.setOnClickListener(new WidgetServerSettingsOverview$configureBannerImage$2(this, str));
+        getBinding().j.f80c.setOnClickListener(new WidgetServerSettingsOverview$configureBannerImage$2(this, str));
         this.state.configureSaveActionView(getBinding().g);
     }
 
     private final void configureBannerSection(Guild guild) {
         boolean z2 = true;
         if (guild.canHaveBanner()) {
-            getBinding().k.e.setBackgroundResource(2131231016);
+            getBinding().k.e.setBackgroundResource(2131231021);
             TextView textView = getBinding().j.g;
             m.checkNotNullExpressionValue(textView, "binding.uploadBanner.uploadBannerNitroTier");
             int i = 8;
             textView.setVisibility(8);
             TextView textView2 = getBinding().j.h;
             m.checkNotNullExpressionValue(textView2, "binding.uploadBanner.uploadBannerUnlock");
-            b.n(textView2, 2131889789, new Object[]{"2"}, null, 4);
+            b.m(textView2, 2131889797, new Object[]{"2"}, null, 4);
             TextView textView3 = getBinding().j.h;
             m.checkNotNullExpressionValue(textView3, "binding.uploadBanner.uploadBannerUnlock");
-            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231815, 0, 0, 13, (Object) null);
+            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231823, 0, 0, 13, (Object) null);
             getBinding().j.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100428));
             TextView textView4 = getBinding().j.h;
             m.checkNotNullExpressionValue(textView4, "binding.uploadBanner.uploadBannerUnlock");
@@ -531,7 +531,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         TextView textView5 = getBinding().j.g;
         m.checkNotNullExpressionValue(textView5, "binding.uploadBanner.uploadBannerNitroTier");
-        b.m(textView5, 2131889790, new Object[]{"2", "tierStatus"}, new WidgetServerSettingsOverview$configureBannerSection$1(guild));
+        b.l(textView5, 2131889798, new Object[]{"2", "tierStatus"}, new WidgetServerSettingsOverview$configureBannerSection$1(guild));
         TextView textView6 = getBinding().j.g;
         m.checkNotNullExpressionValue(textView6, "binding.uploadBanner.uploadBannerNitroTier");
         textView6.setVisibility(0);
@@ -544,10 +544,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755160, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount));
         TextView textView7 = getBinding().j.h;
         m.checkNotNullExpressionValue(textView7, "binding.uploadBanner.uploadBannerUnlock");
-        ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889788, new Object[]{quantityString}, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889796, new Object[]{quantityString}, null, 4));
         TextView textView8 = getBinding().j.h;
         m.checkNotNullExpressionValue(textView8, "binding.uploadBanner.uploadBannerUnlock");
-        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231814, 0, 0, 13, (Object) null);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231822, 0, 0, 13, (Object) null);
         getBinding().j.h.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130969877));
         getBinding().j.d.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130969890));
         getBinding().j.g.setOnClickListener(new WidgetServerSettingsOverview$configureBannerSection$2(guild));
@@ -574,36 +574,36 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         if (z2) {
             StatefulViews statefulViews = this.state;
-            SimpleDraweeView simpleDraweeView = getBinding().f1895c.d;
+            SimpleDraweeView simpleDraweeView = getBinding().f1897c.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.header.serverSettingsOverviewIcon");
             statefulViews.put(simpleDraweeView.getId(), str3 != null ? str3 : "");
         } else {
             StatefulViews statefulViews2 = this.state;
-            SimpleDraweeView simpleDraweeView2 = getBinding().f1895c.d;
+            SimpleDraweeView simpleDraweeView2 = getBinding().f1897c.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.header.serverSettingsOverviewIcon");
             str3 = (String) statefulViews2.get(simpleDraweeView2.getId(), str2);
         }
-        getBinding().f1895c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2));
-        SimpleDraweeView simpleDraweeView3 = getBinding().f1895c.d;
+        getBinding().f1897c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2));
+        SimpleDraweeView simpleDraweeView3 = getBinding().f1897c.d;
         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.header.serverSettingsOverviewIcon");
         IconUtils.setIcon$default(simpleDraweeView3, str3, 2131165286, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         if (str3 != null && !t.isBlank(str3)) {
             z3 = false;
         }
-        TextView textView = getBinding().f1895c.b;
+        TextView textView = getBinding().f1897c.b;
         m.checkNotNullExpressionValue(textView, "binding.header.iconLabel");
         textView.setVisibility(z3 ? 0 : 8);
-        TextView textView2 = getBinding().f1895c.e;
+        TextView textView2 = getBinding().f1897c.e;
         m.checkNotNullExpressionValue(textView2, "binding.header.serverSettingsOverviewIconRemove");
         textView2.setVisibility(z3 ^ true ? 0 : 8);
-        getBinding().f1895c.e.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$2(this, str, str2));
-        TextView textView3 = getBinding().f1895c.f;
+        getBinding().f1897c.e.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$2(this, str, str2));
+        TextView textView3 = getBinding().f1897c.f;
         m.checkNotNullExpressionValue(textView3, "binding.header.serverSettingsOverviewIconText");
         if (!z3) {
             i = 8;
         }
         textView3.setVisibility(i);
-        TextView textView4 = getBinding().f1895c.f;
+        TextView textView4 = getBinding().f1897c.f;
         m.checkNotNullExpressionValue(textView4, "binding.header.serverSettingsOverviewIconText");
         textView4.setText(str);
         this.state.configureSaveActionView(getBinding().g);
@@ -614,7 +614,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             this.state.put(i, Integer.valueOf(i2));
         }
         int i3 = 0;
-        for (Object obj : n.listOf((Object[]) new CheckedSetting[]{getBinding().d.b, getBinding().d.f171c})) {
+        for (Object obj : n.listOf((Object[]) new CheckedSetting[]{getBinding().d.b, getBinding().d.f189c})) {
             int i4 = i3 + 1;
             if (i3 < 0) {
                 n.throwIndexOverflow();
@@ -622,10 +622,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             CheckedSetting checkedSetting = (CheckedSetting) obj;
             m.checkNotNullExpressionValue(checkedSetting, "checkedSetting");
             checkedSetting.setChecked(i3 == i2);
-            if (!z2 || checkedSetting.getId() != 2131364674) {
+            if (!z2 || checkedSetting.getId() != 2131364723) {
                 checkedSetting.h(null, false);
             } else {
-                checkedSetting.h(b.j(this, 2131889601, new Object[0], null, 4), false);
+                checkedSetting.h(b.j(this, 2131889608, new Object[0], null, 4), false);
             }
             checkedSetting.setOnCheckedListener(new WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1(i3, this, i2, z2, i));
             i3 = i4;
@@ -667,13 +667,13 @@ public final class WidgetServerSettingsOverview extends AppFragment {
             m.checkNotNullExpressionValue(textView, "binding.uploadSplash.uploadSplashNitroTier");
             int i = 8;
             textView.setVisibility(8);
-            getBinding().k.e.setBackgroundResource(2131231016);
+            getBinding().k.e.setBackgroundResource(2131231021);
             TextView textView2 = getBinding().k.h;
             m.checkNotNullExpressionValue(textView2, "binding.uploadSplash.uploadSplashUnlock");
-            b.n(textView2, 2131889789, new Object[]{"1"}, null, 4);
+            b.m(textView2, 2131889797, new Object[]{"1"}, null, 4);
             TextView textView3 = getBinding().k.h;
             m.checkNotNullExpressionValue(textView3, "binding.uploadSplash.uploadSplashUnlock");
-            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231815, 0, 0, 13, (Object) null);
+            DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231823, 0, 0, 13, (Object) null);
             getBinding().k.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100428));
             TextView textView4 = getBinding().k.h;
             m.checkNotNullExpressionValue(textView4, "binding.uploadSplash.uploadSplashUnlock");
@@ -694,11 +694,11 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         TextView textView5 = getBinding().k.g;
         m.checkNotNullExpressionValue(textView5, "binding.uploadSplash.uploadSplashNitroTier");
-        b.m(textView5, 2131889790, new Object[]{"1", "tierInfo"}, new WidgetServerSettingsOverview$configureSplashSection$1(guild));
+        b.l(textView5, 2131889798, new Object[]{"1", "tierInfo"}, new WidgetServerSettingsOverview$configureSplashSection$1(guild));
         TextView textView6 = getBinding().k.g;
         m.checkNotNullExpressionValue(textView6, "binding.uploadSplash.uploadSplashNitroTier");
         textView6.setVisibility(0);
-        FloatingActionButton floatingActionButton = getBinding().k.f67c;
+        FloatingActionButton floatingActionButton = getBinding().k.f85c;
         m.checkNotNullExpressionValue(floatingActionButton, "binding.uploadSplash.ser…gsOverviewUploadSplashFab");
         ViewExtensions.setEnabledAlpha$default(floatingActionButton, false, 0.0f, 2, null);
         int premiumSubscriptionCount = 2 - guild.getPremiumSubscriptionCount();
@@ -707,10 +707,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755160, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount));
         TextView textView7 = getBinding().k.h;
         m.checkNotNullExpressionValue(textView7, "binding.uploadSplash.uploadSplashUnlock");
-        ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889788, new Object[]{quantityString}, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889796, new Object[]{quantityString}, null, 4));
         TextView textView8 = getBinding().k.h;
         m.checkNotNullExpressionValue(textView8, "binding.uploadSplash.uploadSplashUnlock");
-        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231814, 0, 0, 13, (Object) null);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231822, 0, 0, 13, (Object) null);
         getBinding().k.h.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130969877));
         getBinding().k.e.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130969890));
         getBinding().k.g.setOnClickListener(new WidgetServerSettingsOverview$configureSplashSection$2(guild));
@@ -719,7 +719,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     private final void configureSystemChannel(Channel channel) {
         TextView textView = getBinding().i.b;
         m.checkNotNullExpressionValue(textView, "binding.systemChannel.systemChannel");
-        configureChannel(textView, channel, 2131891421, 2131231484);
+        configureChannel(textView, channel, 2131891492, 2131231490);
     }
 
     private final void configureUI(Model model) {
@@ -733,10 +733,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         }
         boolean z2 = false;
         configureIcon(model.getGuild().getShortName(), IconUtils.getForGuild$default(model.getGuild(), null, true, null, 10, null), null, false);
-        TextInputLayout textInputLayout = getBinding().f1895c.f167c;
+        TextInputLayout textInputLayout = getBinding().f1897c.f183c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName");
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f1895c.f167c;
+        TextInputLayout textInputLayout2 = getBinding().f1897c.f183c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.header.overviewName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), model.getGuild().getName()));
         getBinding().e.d.setOnClickListener(new WidgetServerSettingsOverview$configureUI$1(this, model));
@@ -757,10 +757,10 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         m.checkNotNullExpressionValue(textView2, "binding.region.overviewRegion");
         CharSequence charSequence = (String) statefulViews3.get(textView2.getId(), model.getVoiceRegion());
         if (charSequence == null) {
-            charSequence = b.j(this, 2131893184, new Object[0], null, 4);
+            charSequence = b.j(this, 2131893267, new Object[0], null, 4);
         }
         textView.setText(charSequence);
-        LinearLayout linearLayout4 = getBinding().f.f182c;
+        LinearLayout linearLayout4 = getBinding().f.f68c;
         m.checkNotNullExpressionValue(linearLayout4, "binding.regionHelp.overviewRegionWrapHelp");
         if (model.getHideRegionOverride()) {
             i = 0;
@@ -768,17 +768,17 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         linearLayout4.setVisibility(i);
         LinkifiedTextView linkifiedTextView = getBinding().f.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.regionHelp.guildRegionHelp");
-        b.n(linkifiedTextView, 2131889342, new Object[]{f.a.a(360060570993L, null)}, null, 4);
+        b.m(linkifiedTextView, 2131889349, new Object[]{f.a.a(360060570993L, null)}, null, 4);
         int voiceRegionIconResourceId = IconUtils.INSTANCE.getVoiceRegionIconResourceId(model.getGuild().getRegion());
         StatefulViews statefulViews4 = this.state;
-        ImageView imageView = getBinding().e.f176c;
+        ImageView imageView = getBinding().e.f62c;
         m.checkNotNullExpressionValue(imageView, "binding.region.overviewRegionFlag");
-        getBinding().e.f176c.setImageResource(((Number) statefulViews4.get(imageView.getId(), Integer.valueOf(voiceRegionIconResourceId))).intValue());
+        getBinding().e.f62c.setImageResource(((Number) statefulViews4.get(imageView.getId(), Integer.valueOf(voiceRegionIconResourceId))).intValue());
         StatefulViews statefulViews5 = this.state;
         TextView textView3 = getBinding().b.b;
         m.checkNotNullExpressionValue(textView3, "binding.afk.afkChannel");
         configureAfkChannel((Channel) statefulViews5.get(textView3.getId(), model.getAfkChannelModel()));
-        getBinding().b.f87c.setOnClickListener(new WidgetServerSettingsOverview$configureUI$2(this, model));
+        getBinding().b.f102c.setOnClickListener(new WidgetServerSettingsOverview$configureUI$2(this, model));
         TextView textView4 = getBinding().b.d;
         m.checkNotNullExpressionValue(textView4, "binding.afk.afkTimeout");
         StatefulViews statefulViews6 = this.state;
@@ -824,16 +824,16 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         if ((model.getGuild().getSystemChannelFlags() & 2) == 0) {
             z2 = true;
         }
-        CheckedSetting checkedSetting3 = getBinding().i.f188c;
+        CheckedSetting checkedSetting3 = getBinding().i.f74c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.systemChannel.systemChannelBoost");
         StatefulViews statefulViews10 = this.state;
-        CheckedSetting checkedSetting4 = getBinding().i.f188c;
+        CheckedSetting checkedSetting4 = getBinding().i.f74c;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.systemChannel.systemChannelBoost");
         checkedSetting3.setChecked(((Boolean) statefulViews10.get(checkedSetting4.getId(), Boolean.valueOf(z2))).booleanValue());
         if (model.getSystemChannelModel() != null) {
-            getBinding().i.f188c.e(new WidgetServerSettingsOverview$configureUI$6(this));
+            getBinding().i.f74c.e(new WidgetServerSettingsOverview$configureUI$6(this));
         } else {
-            CheckedSetting.d(getBinding().i.f188c, null, 1);
+            CheckedSetting.d(getBinding().i.f74c, null, 1);
         }
         this.state.configureSaveActionView(getBinding().g);
         getBinding().g.setOnClickListener(new WidgetServerSettingsOverview$configureUI$7(this, model));
@@ -844,7 +844,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         AppFragment.hideKeyboard$default(this, null, 1, null);
         getBinding().h.fullScroll(33);
         configureUI(model);
-        o.i(this, 2131893186, 0, 4);
+        o.i(this, 2131893269, 0, 4);
     }
 
     public static final void create(Context context, long j, boolean z2) {
@@ -898,7 +898,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().g;
-        TextInputLayout textInputLayout = getBinding().f1895c.f167c;
+        TextInputLayout textInputLayout = getBinding().f1897c.f183c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName");
         TextView textView = getBinding().e.b;
         m.checkNotNullExpressionValue(textView, "binding.region.overviewRegion");
@@ -911,16 +911,16 @@ public final class WidgetServerSettingsOverview extends AppFragment {
         TextView textView4 = getBinding().i.b;
         m.checkNotNullExpressionValue(textView4, "binding.systemChannel.systemChannel");
         statefulViews2.addOptionalFields(textView3, textView4);
-        TextView textView5 = getBinding().f1895c.b;
+        TextView textView5 = getBinding().f1897c.b;
         m.checkNotNullExpressionValue(textView5, "binding.header.iconLabel");
-        b.n(textView5, 2131891205, new Object[]{"128", "128"}, null, 4);
+        b.m(textView5, 2131891276, new Object[]{"128", "128"}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().k.f;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.uploadSplash.uploadSplashLearnMore");
         f fVar = f.a;
-        b.n(linkifiedTextView, 2131889889, new Object[]{fVar.a(360028716472L, null)}, null, 4);
+        b.m(linkifiedTextView, 2131889897, new Object[]{fVar.a(360028716472L, null)}, null, 4);
         LinkifiedTextView linkifiedTextView2 = getBinding().j.f;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.uploadBanner.uploadBannerLearnMore");
-        b.n(linkifiedTextView2, 2131889562, new Object[]{fVar.a(360028716472L, null)}, null, 4);
+        b.m(linkifiedTextView2, 2131889569, new Object[]{fVar.a(360028716472L, null)}, null, 4);
         getBinding().g.hide();
         WidgetChannelSelector.Companion companion = WidgetChannelSelector.Companion;
         companion.registerForResult(this, "REQUEST_KEY_AFK_CHANNEL", true, new WidgetServerSettingsOverview$onViewBound$1(this));
@@ -930,7 +930,7 @@ public final class WidgetServerSettingsOverview extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        setActionBarTitle(2131891755);
+        setActionBarTitle(2131891827);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetServerSettingsOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java
index 7dda2b8812..20e485cdab 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$Model$Companion$get$1.java
@@ -83,6 +83,6 @@ public final class WidgetServerSettingsRolesList$Model$Companion$get$1<T, R> imp
 
     public final Observable<? extends WidgetServerSettingsRolesList.Model> call(MeUser meUser) {
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.h(companion.getGuilds().observeGuild(this.$guildId), companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).G(new AnonymousClass1(meUser)), companion.getPermissions().observePermissionsForGuild(this.$guildId), companion.getGuilds().observeRoles(this.$guildId), new AnonymousClass2(this, meUser));
+        return Observable.h(companion.getGuilds().observeGuild(this.$guildId), companion.getGuilds().observeComputed(this.$guildId, m.listOf(Long.valueOf(meUser.getId()))).F(new AnonymousClass1(meUser)), companion.getPermissions().observePermissionsForGuild(this.$guildId), companion.getGuilds().observeRoles(this.$guildId), new AnonymousClass2(this, meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java
index 115c7d6df7..e257160f82 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetServerSettingsRolesList$binding$2 exten
 
     public final WidgetServerSettingsRolesListBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131364501;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364501);
+            i = 2131364539;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364539);
             if (floatingActionButton != null) {
-                i = 2131364691;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364691);
+                i = 2131364740;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364740);
                 if (recyclerView != null) {
                     return new WidgetServerSettingsRolesListBinding((CoordinatorLayout) view, dimmerView, floatingActionButton, recyclerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$createRole$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$createRole$1.java
index 83d157e085..c229b75d49 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$createRole$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$createRole$1.java
@@ -37,6 +37,6 @@ public final class WidgetServerSettingsRolesList$createRole$1<T, R> implements b
 
     public final Observable<? extends GuildRole> call(GuildRole guildRole) {
         long a = guildRole.a();
-        return StoreStream.Companion.getGuilds().observeRoles(this.$guildId, m.listOf(Long.valueOf(a))).G(new AnonymousClass1(a));
+        return StoreStream.Companion.getGuilds().observeRoles(this.$guildId, m.listOf(Long.valueOf(a))).F(new AnonymousClass1(a));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java
index fd021c84a8..adb555a235 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java
@@ -22,6 +22,6 @@ public final class WidgetServerSettingsRolesList$processRoleDrop$1 extends o imp
     }
 
     public final void invoke(Void r4) {
-        c.a.d.o.i(this.this$0, 2131892735, 0, 4);
+        c.a.d.o.i(this.this$0, 2131892816, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java
index 6bea3a9acb..c2c8cf1f8b 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java
@@ -82,9 +82,9 @@ public final class WidgetServerSettingsRolesList extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable<Model> s2 = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Z(new WidgetServerSettingsRolesList$Model$Companion$get$1(j)).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).Y(new WidgetServerSettingsRolesList$Model$Companion$get$1(j)).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -217,7 +217,7 @@ public final class WidgetServerSettingsRolesList extends AppFragment {
     }
 
     public WidgetServerSettingsRolesList() {
-        super(2131559177);
+        super(2131559183);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsRolesList widgetServerSettingsRolesList, Model model) {
@@ -245,25 +245,25 @@ public final class WidgetServerSettingsRolesList extends AppFragment {
             }
             return;
         }
-        setActionBarTitle(2131892909);
+        setActionBarTitle(2131892990);
         setActionBarSubtitle(model.getGuildName());
         WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter = this.adapter;
         if (widgetServerSettingsRolesListAdapter != null) {
             widgetServerSettingsRolesListAdapter.configure(model.getRoleItems(), new WidgetServerSettingsRolesList$configureUI$1(this, model), new WidgetServerSettingsRolesList$configureUI$2(this, model));
         }
         if (!model.getCanManageRoles() || !model.getElevated()) {
-            getBinding().f1898c.hide();
-            getBinding().f1898c.setOnClickListener(null);
+            getBinding().f1900c.hide();
+            getBinding().f1900c.setOnClickListener(null);
             return;
         }
-        getBinding().f1898c.setOnClickListener(new WidgetServerSettingsRolesList$configureUI$3(this, model));
-        getBinding().f1898c.show();
+        getBinding().f1900c.setOnClickListener(new WidgetServerSettingsRolesList$configureUI$3(this, model));
+        getBinding().f1900c.show();
     }
 
     private final void createRole(long j, Model model) {
-        Observable Z = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createRole(j), false, 1, null).Z(new WidgetServerSettingsRolesList$createRole$1(j));
-        m.checkNotNullExpressionValue(Z, "RestAPI\n        .api\n   … rolesMap[id] }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(Z, 0, false, 3, null), this, null, 2, null), WidgetServerSettingsRolesList.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsRolesList$createRole$2(this, j, model), 60, (Object) null);
+        Observable Y = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createRole(j), false, 1, null).Y(new WidgetServerSettingsRolesList$createRole$1(j));
+        m.checkNotNullExpressionValue(Y, "RestAPI\n        .api\n   … rolesMap[id] }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(Y, 0, false, 3, null), this, null, 2, null), WidgetServerSettingsRolesList.class, getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsRolesList$createRole$2(this, j, model), 60, (Object) null);
     }
 
     private final WidgetServerSettingsRolesListBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java
index ca086519f1..209e750315 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java
@@ -23,6 +23,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.d.o.g(view.getContext(), 2131888640, 0, null, 12);
+        c.a.d.o.g(view.getContext(), 2131888641, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java
index 27176307cd..c63e610691 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java
@@ -23,6 +23,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.d.o.g(view.getContext(), 2131890138, 0, null, 12);
+        c.a.d.o.g(view.getContext(), 2131890160, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java
index 54d8281b7d..df6541a936 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java
@@ -23,6 +23,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.d.o.g(view.getContext(), 2131894010, 0, null, 12);
+        c.a.d.o.g(view.getContext(), 2131894110, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java
index be96fee923..7bc3d92a9e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java
@@ -281,7 +281,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleListHelpItem(WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter) {
-            super(2131559162, widgetServerSettingsRolesListAdapter);
+            super(2131559168, widgetServerSettingsRolesListAdapter);
             m.checkNotNullParameter(widgetServerSettingsRolesListAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -301,7 +301,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
             super.onConfigure(i, (int) payload);
             LinkifiedTextView linkifiedTextView = this.binding.b;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.serverSettingsHelpItem");
-            c.a.l.b.m(linkifiedTextView, 2131890142, new Object[0], new WidgetServerSettingsRolesListAdapter$RoleListHelpItem$onConfigure$1(payload));
+            c.a.l.b.l(linkifiedTextView, 2131890164, new Object[0], new WidgetServerSettingsRolesListAdapter$RoleListHelpItem$onConfigure$1(payload));
         }
 
         @Override // com.discord.utilities.mg_recycler.DragAndDropHelper.DraggableViewHolder
@@ -316,23 +316,23 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RoleListItem(WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter) {
-            super(2131559176, widgetServerSettingsRolesListAdapter);
+            super(2131559182, widgetServerSettingsRolesListAdapter);
             m.checkNotNullParameter(widgetServerSettingsRolesListAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364685;
-            View findViewById = view.findViewById(2131364685);
+            int i = 2131364734;
+            View findViewById = view.findViewById(2131364734);
             if (findViewById != null) {
-                i = 2131364686;
-                View findViewById2 = view.findViewById(2131364686);
+                i = 2131364735;
+                View findViewById2 = view.findViewById(2131364735);
                 if (findViewById2 != null) {
-                    i = 2131364687;
-                    View findViewById3 = view.findViewById(2131364687);
+                    i = 2131364736;
+                    View findViewById3 = view.findViewById(2131364736);
                     if (findViewById3 != null) {
-                        i = 2131364688;
-                        ImageView imageView = (ImageView) view.findViewById(2131364688);
+                        i = 2131364737;
+                        ImageView imageView = (ImageView) view.findViewById(2131364737);
                         if (imageView != null) {
-                            i = 2131364689;
-                            TextView textView = (TextView) view.findViewById(2131364689);
+                            i = 2131364738;
+                            TextView textView = (TextView) view.findViewById(2131364738);
                             if (textView != null) {
                                 WidgetServerSettingsRoleItemBinding widgetServerSettingsRoleItemBinding = new WidgetServerSettingsRoleItemBinding((RelativeLayout) view, findViewById, findViewById2, findViewById3, imageView, textView);
                                 m.checkNotNullExpressionValue(widgetServerSettingsRoleItemBinding, "WidgetServerSettingsRoleItemBinding.bind(itemView)");
@@ -386,7 +386,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt
             } else {
                 this.binding.a.setOnLongClickListener(null);
             }
-            ImageView imageView = this.binding.f1897c;
+            ImageView imageView = this.binding.f1899c;
             m.checkNotNullExpressionValue(imageView, "binding.serverSettingsRoleItemLockIndicator");
             imageView.setVisibility(roleItem.getLocked() ? 0 : 8);
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java
index 4f3db26b09..6b7ee6de61 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsSecurity$ToggleMfaDialog$
 
     public final WidgetServerSettingsSecurityDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364029;
-        TextView textView = (TextView) view.findViewById(2131364029);
+        int i = 2131364072;
+        TextView textView = (TextView) view.findViewById(2131364072);
         if (textView != null) {
-            i = 2131364697;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364697);
+            i = 2131364746;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364746);
             if (materialButton != null) {
-                i = 2131364698;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364698);
+                i = 2131364747;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364747);
                 if (materialButton2 != null) {
-                    i = 2131364700;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364700);
+                    i = 2131364749;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364749);
                     if (textInputLayout != null) {
                         return new WidgetServerSettingsSecurityDialogBinding((LinearLayout) view, textView, materialButton, materialButton2, textInputLayout);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java
index 199ce34bc3..eec0b6a13e 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java
@@ -18,14 +18,14 @@ public final /* synthetic */ class WidgetServerSettingsSecurity$binding$2 extend
 
     public final WidgetServerSettingsSecurityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363917;
-        TextView textView = (TextView) view.findViewById(2131363917);
+        int i = 2131363958;
+        TextView textView = (TextView) view.findViewById(2131363958);
         if (textView != null) {
-            i = 2131364699;
-            TextView textView2 = (TextView) view.findViewById(2131364699);
+            i = 2131364748;
+            TextView textView2 = (TextView) view.findViewById(2131364748);
             if (textView2 != null) {
-                i = 2131364701;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364701);
+                i = 2131364750;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364750);
                 if (materialButton != null) {
                     return new WidgetServerSettingsSecurityBinding((CoordinatorLayout) view, textView, textView2, materialButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
index 5e18c748ea..87b7d7865a 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java
@@ -80,9 +80,9 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable j2 = Observable.j(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeGuild(j), WidgetServerSettingsSecurity$Model$Companion$get$1.INSTANCE);
                 m.checkNotNullExpressionValue(j2, "Observable\n             …        )\n              }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(j2).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n             …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(j2).r();
+                m.checkNotNullExpressionValue(r, "Observable\n             …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -199,7 +199,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
         }
 
         public ToggleMfaDialog() {
-            super(2131559179);
+            super(2131559185);
         }
 
         public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(ToggleMfaDialog toggleMfaDialog) {
@@ -226,15 +226,15 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
             if (j <= 0) {
                 dismiss();
             }
-            getBinding().f1900c.setText(z2 ? 2131888123 : 2131888324);
-            MaterialButton materialButton = getBinding().f1900c;
+            getBinding().f1902c.setText(z2 ? 2131888122 : 2131888324);
+            MaterialButton materialButton = getBinding().f1902c;
             m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityDialogConfirm");
             WidgetServerSettingsSecurityDialogBinding binding = getBinding();
             m.checkNotNullExpressionValue(binding, "binding");
             LinearLayout linearLayout = binding.a;
             m.checkNotNullExpressionValue(linearLayout, "binding.root");
             materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(linearLayout.getContext(), z2 ? 2131100324 : 2131100249)));
-            getBinding().f1900c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j));
+            getBinding().f1902c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j));
             getBinding().b.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$2(this));
         }
 
@@ -253,7 +253,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
     }
 
     public WidgetServerSettingsSecurity() {
-        super(2131559178);
+        super(2131559184);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsSecurity widgetServerSettingsSecurity, Model model) {
@@ -273,16 +273,16 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
             }
             return;
         }
-        setActionBarTitle(2131893129);
+        setActionBarTitle(2131893212);
         setActionBarSubtitle(model.getGuildName());
         if (model.isMfaEnabled()) {
-            getBinding().f1899c.setText(2131889352);
-            MaterialButton materialButton = getBinding().f1899c;
+            getBinding().f1901c.setText(2131889359);
+            MaterialButton materialButton = getBinding().f1901c;
             m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityToggleMfaButton");
             materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100324)));
         } else {
-            getBinding().f1899c.setText(2131889353);
-            MaterialButton materialButton2 = getBinding().f1899c;
+            getBinding().f1901c.setText(2131889360);
+            MaterialButton materialButton2 = getBinding().f1901c;
             m.checkNotNullExpressionValue(materialButton2, "binding.serverSettingsSecurityToggleMfaButton");
             materialButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100249)));
         }
@@ -290,7 +290,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
         if (findFragmentByTag != null) {
             ((ToggleMfaDialog) findFragmentByTag).configure(model.getGuildId(), model.isMfaEnabled());
         }
-        getBinding().f1899c.setOnClickListener(new WidgetServerSettingsSecurity$configureUI$1(this, model));
+        getBinding().f1901c.setOnClickListener(new WidgetServerSettingsSecurity$configureUI$1(this, model));
     }
 
     private final WidgetServerSettingsSecurityBinding getBinding() {
@@ -312,7 +312,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment {
         }
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.mfaDescriptionText");
-        c.a.l.b.n(textView, 2131889347, new Object[0], null, 4);
+        c.a.l.b.m(textView, 2131889354, new Object[0], null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java
index 2804070b3f..10a463c3cd 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetServerSettingsTransferOwnership$binding
 
     public final WidgetGuildTransferOwnershipBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363456;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363456);
+        int i = 2131363497;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363497);
         if (checkedSetting != null) {
-            i = 2131363457;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363457);
+            i = 2131363498;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363498);
             if (materialButton != null) {
-                i = 2131363458;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363458);
+                i = 2131363499;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363499);
                 if (materialButton2 != null) {
-                    i = 2131363459;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363459);
+                    i = 2131363500;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363500);
                     if (textInputLayout != null) {
-                        i = 2131363460;
-                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363460);
+                        i = 2131363501;
+                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363501);
                         if (linearLayout != null) {
                             return new WidgetGuildTransferOwnershipBinding((LinearLayout) view, checkedSetting, materialButton, materialButton2, textInputLayout, linearLayout);
                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java
index 7195f122d1..eceaea41bf 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java
@@ -74,9 +74,9 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
 
             public final Observable<Model> get(long j, long j2) {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable s2 = Observable.i(companion.getGuilds().observeGuild(j), companion.getUsers().observeUser(j2), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), WidgetServerSettingsTransferOwnership$Model$Companion$get$1.INSTANCE).s();
-                m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-                return ObservableExtensionsKt.computationLatest(s2);
+                Observable r = Observable.i(companion.getGuilds().observeGuild(j), companion.getUsers().observeUser(j2), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), WidgetServerSettingsTransferOwnership$Model$Companion$get$1.INSTANCE).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return ObservableExtensionsKt.computationLatest(r);
             }
         }
 
@@ -192,7 +192,7 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
     }
 
     public WidgetServerSettingsTransferOwnership() {
-        super(2131559047);
+        super(2131559052);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsTransferOwnership widgetServerSettingsTransferOwnership, Model model) {
@@ -219,13 +219,13 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog {
         LinearLayout linearLayout = getBinding().f;
         m.checkNotNullExpressionValue(linearLayout, "binding.guildTransferOwnershipMfaWrap");
         linearLayout.setVisibility(model.isMfaEnabled() ? 0 : 8);
-        getBinding().f1811c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this));
+        getBinding().f1813c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this));
         MaterialButton materialButton = getBinding().d;
         m.checkNotNullExpressionValue(materialButton, "binding.guildTransferOwnershipConfirm");
         CheckedSetting checkedSetting = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting, "binding.guildTransferOwnershipAcknowledgeCheck");
         materialButton.setEnabled(checkedSetting.isChecked());
-        getBinding().b.setText(b.j(this, 2131893961, new Object[]{model.getUser().getUsername()}, null, 4));
+        getBinding().b.setText(b.j(this, 2131894061, new Object[]{model.getUser().getUsername()}, null, 4));
         getBinding().b.e(new WidgetServerSettingsTransferOwnership$configureUI$2(this));
         getBinding().d.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$3(this, model));
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java
index fa0d60e338..4d2c5f99b7 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java
@@ -21,32 +21,32 @@ public final /* synthetic */ class WidgetServerSettingsVanityUrl$binding$2 exten
 
     public final WidgetServerSettingsVanityUrlBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364705;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364705);
+        int i = 2131364754;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364754);
         if (textInputLayout != null) {
-            i = 2131364706;
-            TextView textView = (TextView) view.findViewById(2131364706);
+            i = 2131364755;
+            TextView textView = (TextView) view.findViewById(2131364755);
             if (textView != null) {
-                i = 2131364707;
-                TextView textView2 = (TextView) view.findViewById(2131364707);
+                i = 2131364756;
+                TextView textView2 = (TextView) view.findViewById(2131364756);
                 if (textView2 != null) {
-                    i = 2131364708;
-                    TextView textView3 = (TextView) view.findViewById(2131364708);
+                    i = 2131364757;
+                    TextView textView3 = (TextView) view.findViewById(2131364757);
                     if (textView3 != null) {
-                        i = 2131364709;
-                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364709);
+                        i = 2131364758;
+                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364758);
                         if (relativeLayout != null) {
-                            i = 2131364710;
-                            ProgressBar progressBar = (ProgressBar) view.findViewById(2131364710);
+                            i = 2131364759;
+                            ProgressBar progressBar = (ProgressBar) view.findViewById(2131364759);
                             if (progressBar != null) {
-                                i = 2131364711;
-                                TextView textView4 = (TextView) view.findViewById(2131364711);
+                                i = 2131364760;
+                                TextView textView4 = (TextView) view.findViewById(2131364760);
                                 if (textView4 != null) {
-                                    i = 2131364712;
-                                    TextView textView5 = (TextView) view.findViewById(2131364712);
+                                    i = 2131364761;
+                                    TextView textView5 = (TextView) view.findViewById(2131364761);
                                     if (textView5 != null) {
-                                        i = 2131364713;
-                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364713);
+                                        i = 2131364762;
+                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364762);
                                         if (floatingActionButton != null) {
                                             return new WidgetServerSettingsVanityUrlBinding((CoordinatorLayout) view, textInputLayout, textView, textView2, textView3, relativeLayout, progressBar, textView4, textView5, floatingActionButton);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
index 498c0a495c..d5b3af6ab9 100644
--- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
+++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java
@@ -41,7 +41,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsVanityUrl$binding$2.INSTANCE, null, 2, null);
     private final Lazy guildId$delegate = g.lazy(new WidgetServerSettingsVanityUrl$guildId$2(this));
-    private final StatefulViews state = new StatefulViews(2131364705);
+    private final StatefulViews state = new StatefulViews(2131364754);
 
     /* compiled from: WidgetServerSettingsVanityUrl.kt */
     public static final class Companion {
@@ -197,7 +197,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
     }
 
     public WidgetServerSettingsVanityUrl() {
-        super(2131559180);
+        super(2131559186);
     }
 
     public static final /* synthetic */ void access$configureInviteCode(WidgetServerSettingsVanityUrl widgetServerSettingsVanityUrl, String str, int i) {
@@ -247,12 +247,12 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
         if (str != null) {
             if (str.length() > 0) {
                 String u = a.u("https://discord.gg/", str);
-                TextView textView = getBinding().f1901c;
+                TextView textView = getBinding().f1903c;
                 m.checkNotNullExpressionValue(textView, "binding.serverSettingsVanityUrlCurrentUrl");
-                c.a.l.b.n(textView, 2131894421, new Object[]{u}, null, 4);
+                c.a.l.b.m(textView, 2131894540, new Object[]{u}, null, 4);
             }
         }
-        TextView textView2 = getBinding().f1901c;
+        TextView textView2 = getBinding().f1903c;
         m.checkNotNullExpressionValue(textView2, "binding.serverSettingsVanityUrlCurrentUrl");
         if (str != null) {
             if (str.length() > 0) {
@@ -269,13 +269,13 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
                         }
                         textView3.setVisibility(i2);
                         if (str != null) {
-                            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755355, i, Integer.valueOf(i));
+                            CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755356, i, Integer.valueOf(i));
                             TextView textView4 = getBinding().e;
                             m.checkNotNullExpressionValue(textView4, "binding.serverSettingsVanityUrlHeader");
-                            c.a.l.b.n(textView4, 2131894418, new Object[]{i18nPluralString}, null, 4);
+                            c.a.l.b.m(textView4, 2131894537, new Object[]{i18nPluralString}, null, 4);
                             return;
                         }
-                        getBinding().e.setText(2131894417);
+                        getBinding().e.setText(2131894536);
                         return;
                     }
                 }
@@ -312,7 +312,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment {
             return;
         }
         showLoadingUI(false);
-        setActionBarTitle(2131894417);
+        setActionBarTitle(2131894536);
         setActionBarSubtitle(model.getGuildName());
         configureInviteCode(model.getVanityUrl(), model.getVanityUrlUses());
         this.state.configureSaveActionView(getBinding().j);
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java
index e79c765e3d..f29d3f4a84 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java
@@ -68,12 +68,9 @@ public final class WidgetServerSettingsAuditLog$Model$Companion$get$1<T1, T2, T3
                         break;
                     case 3:
                     case 4:
-                        Channel channel2 = map5.get(Long.valueOf(modelAuditLogEntry.getTargetId()));
-                        if (channel2 != null) {
-                            obj = '#' + AnimatableValueParser.y0(channel2);
-                            break;
-                        }
-                        obj = null;
+                        WidgetServerSettingsAuditLog.Model.Companion companion = WidgetServerSettingsAuditLog.Model.Companion;
+                        m.checkNotNullExpressionValue(map5, "channels");
+                        obj = WidgetServerSettingsAuditLog.Model.Companion.access$resolveChannelName(companion, map5, modelAuditLogEntry);
                         break;
                     case 5:
                         User user = (User) map2.get(Long.valueOf(modelAuditLogEntry.getTargetId()));
@@ -111,12 +108,12 @@ public final class WidgetServerSettingsAuditLog$Model$Companion$get$1<T1, T2, T3
             String str = "#";
             if (it.hasNext()) {
                 Map.Entry<Long, Channel> next = it.next();
-                if (!AnimatableValueParser.j1(next.getValue())) {
+                if (!AnimatableValueParser.k1(next.getValue())) {
                     str = "";
                 }
                 Map map6 = (Map) hashMap.get(ModelAuditLogEntry.TargetType.CHANNEL);
                 if (map6 != null) {
-                    Long valueOf = Long.valueOf(next.getValue().g());
+                    Long valueOf = Long.valueOf(next.getValue().h());
                     StringBuilder L = a.L(str);
                     L.append(AnimatableValueParser.y0(next.getValue()));
                     CharSequence charSequence3 = (CharSequence) map6.put(valueOf, L.toString());
@@ -180,7 +177,7 @@ public final class WidgetServerSettingsAuditLog$Model$Companion$get$1<T1, T2, T3
                     }
                 }
                 for (ModelAuditLogEntry modelAuditLogEntry2 : arrayList2) {
-                    String str2 = (!(modelAuditLogEntry2.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry2.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) || (channel = map5.get(Long.valueOf(modelAuditLogEntry2.getTargetId()))) == null || AnimatableValueParser.j1(channel) != z2) ? "" : str;
+                    String str2 = (!(modelAuditLogEntry2.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry2.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) || (channel = map5.get(Long.valueOf(modelAuditLogEntry2.getTargetId()))) == null || AnimatableValueParser.k1(channel) != z2) ? "" : str;
                     User user2 = auditLogState.getUsers().get(Long.valueOf(modelAuditLogEntry2.getUserId()));
                     String str3 = (user2 == null || (userNameWithDiscriminator$default = UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user2, null, null, 3, null)) == null) ? "" : userNameWithDiscriminator$default;
                     long id2 = modelAuditLogEntry2.getId();
@@ -199,7 +196,7 @@ public final class WidgetServerSettingsAuditLog$Model$Companion$get$1<T1, T2, T3
                 }
                 User user4 = (User) map2.get(Long.valueOf(auditLogState.getFilter().getUserFilter()));
                 if (user4 == null || (charSequence = UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user4, null, null, 3, null)) == null) {
-                    charSequence = this.$context.getString(2131889684);
+                    charSequence = this.$context.getString(2131889692);
                     m.checkNotNullExpressionValue(charSequence, "context.getString(R.stri…ettings_filter_all_users)");
                 }
                 String string = this.$context.getString(AuditLogUtils.INSTANCE.getActionName(auditLogState.getFilter().getActionFilter()));
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java
index c2a3a9efc5..9051700be6 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$binding$2.java
@@ -20,32 +20,32 @@ public final /* synthetic */ class WidgetServerSettingsAuditLog$binding$2 extend
 
     public final WidgetServerSettingsAuditLogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364017;
-        TextView textView = (TextView) view.findViewById(2131364017);
+        int i = 2131364060;
+        TextView textView = (TextView) view.findViewById(2131364060);
         if (textView != null) {
-            i = 2131364018;
-            TextView textView2 = (TextView) view.findViewById(2131364018);
+            i = 2131364061;
+            TextView textView2 = (TextView) view.findViewById(2131364061);
             if (textView2 != null) {
-                i = 2131364593;
-                TextView textView3 = (TextView) view.findViewById(2131364593);
+                i = 2131364642;
+                TextView textView3 = (TextView) view.findViewById(2131364642);
                 if (textView3 != null) {
-                    i = 2131364594;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364594);
+                    i = 2131364643;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364643);
                     if (linearLayout != null) {
-                        i = 2131364595;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364595);
+                        i = 2131364644;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364644);
                         if (recyclerView != null) {
-                            i = 2131364596;
-                            TextView textView4 = (TextView) view.findViewById(2131364596);
+                            i = 2131364645;
+                            TextView textView4 = (TextView) view.findViewById(2131364645);
                             if (textView4 != null) {
-                                i = 2131364597;
-                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364597);
+                                i = 2131364646;
+                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364646);
                                 if (linearLayout2 != null) {
-                                    i = 2131364598;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364598);
+                                    i = 2131364647;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364647);
                                     if (appViewFlipper != null) {
-                                        i = 2131364599;
-                                        AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364599);
+                                        i = 2131364648;
+                                        AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364648);
                                         if (appViewFlipper2 != null) {
                                             return new WidgetServerSettingsAuditLogBinding((CoordinatorLayout) view, textView, textView2, textView3, linearLayout, recyclerView, textView4, linearLayout2, appViewFlipper, appViewFlipper2);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
index 520767653e..7e82351135 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java
@@ -32,10 +32,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
             public final boolean onMenuItemClick(MenuItem menuItem) {
                 m.checkNotNullExpressionValue(menuItem, "it");
                 switch (menuItem.getItemId()) {
-                    case 2131363860:
+                    case 2131363901:
                         WidgetServerSettingsAuditLogFilterSheet.Companion.show(a.T(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1);
                         break;
-                    case 2131363861:
+                    case 2131363902:
                         WidgetServerSettingsAuditLogFilterSheet.Companion.show(a.T(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0);
                         break;
                 }
@@ -62,7 +62,7 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
 
     public final void call(Menu menu) {
         View actionView;
-        MenuItem findItem = menu.findItem(2131363887);
+        MenuItem findItem = menu.findItem(2131363928);
         if (findItem != null && (actionView = findItem.getActionView()) != null) {
             actionView.setOnClickListener(new AnonymousClass1(this));
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
index a0ffbf8ce3..a88fb67627 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java
@@ -10,6 +10,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.d.l;
 import c.a.d.o;
 import c.d.b.a.a;
+import com.airbnb.lottie.parser.AnimatableValueParser;
+import com.discord.api.channel.Channel;
 import com.discord.app.AppActivity;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
@@ -23,8 +25,11 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import d0.z.d.m;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import kotlin.NoWhenBranchMatchedException;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -102,12 +107,127 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
                 this();
             }
 
+            public static final /* synthetic */ String access$resolveChannelName(Companion companion, Map map, ModelAuditLogEntry modelAuditLogEntry) {
+                return companion.resolveChannelName(map, modelAuditLogEntry);
+            }
+
+            /* JADX WARNING: Removed duplicated region for block: B:25:0x0077  */
+            /* JADX WARNING: Removed duplicated region for block: B:28:0x0080  */
+            /* JADX WARNING: Removed duplicated region for block: B:40:0x00b0  */
+            /* JADX WARNING: Removed duplicated region for block: B:46:0x00c2  */
+            /* JADX WARNING: Removed duplicated region for block: B:47:0x00d2  */
+            private final String resolveChannelName(Map<Long, Channel> map, ModelAuditLogEntry modelAuditLogEntry) {
+                Object obj;
+                List<ModelAuditLogEntry.Change> changes;
+                Object obj2;
+                Long l;
+                boolean g1;
+                Object obj3;
+                Object obj4;
+                Channel channel = map.get(Long.valueOf(modelAuditLogEntry.getTargetId()));
+                if (channel != null) {
+                    boolean k1 = AnimatableValueParser.k1(channel);
+                    if (k1) {
+                        StringBuilder J = a.J('#');
+                        J.append(AnimatableValueParser.y0(channel));
+                        return J.toString();
+                    } else if (!k1) {
+                        return AnimatableValueParser.y0(channel);
+                    } else {
+                        throw new NoWhenBranchMatchedException();
+                    }
+                } else {
+                    if (modelAuditLogEntry.getActionTypeId() == 12) {
+                        List<ModelAuditLogEntry.Change> changes2 = modelAuditLogEntry.getChanges();
+                        if (changes2 != null) {
+                            Iterator<T> it = changes2.iterator();
+                            while (true) {
+                                if (!it.hasNext()) {
+                                    obj4 = null;
+                                    break;
+                                }
+                                obj4 = it.next();
+                                ModelAuditLogEntry.Change change = (ModelAuditLogEntry.Change) obj4;
+                                m.checkNotNullExpressionValue(change, "it");
+                                if (m.areEqual(change.getKey(), "name")) {
+                                    break;
+                                }
+                            }
+                            ModelAuditLogEntry.Change change2 = (ModelAuditLogEntry.Change) obj4;
+                            if (change2 != null) {
+                                obj = change2.getOldValue();
+                                if (!(obj instanceof String)) {
+                                    obj = null;
+                                }
+                                String str = (String) obj;
+                                changes = modelAuditLogEntry.getChanges();
+                                if (changes != null) {
+                                    Iterator<T> it2 = changes.iterator();
+                                    while (true) {
+                                        if (!it2.hasNext()) {
+                                            obj3 = null;
+                                            break;
+                                        }
+                                        obj3 = it2.next();
+                                        ModelAuditLogEntry.Change change3 = (ModelAuditLogEntry.Change) obj3;
+                                        m.checkNotNullExpressionValue(change3, "it");
+                                        if (m.areEqual(change3.getKey(), "type")) {
+                                            break;
+                                        }
+                                    }
+                                    ModelAuditLogEntry.Change change4 = (ModelAuditLogEntry.Change) obj3;
+                                    if (change4 != null) {
+                                        obj2 = change4.getOldValue();
+                                        if (!(obj2 instanceof Long)) {
+                                            obj2 = null;
+                                        }
+                                        l = (Long) obj2;
+                                        if (!(str == null || l == null)) {
+                                            g1 = AnimatableValueParser.g1((int) l.longValue());
+                                            if (g1) {
+                                                return '#' + str;
+                                            } else if (!g1) {
+                                                return str;
+                                            } else {
+                                                throw new NoWhenBranchMatchedException();
+                                            }
+                                        }
+                                    }
+                                }
+                                obj2 = null;
+                                if (!(obj2 instanceof Long)) {
+                                }
+                                l = (Long) obj2;
+                                g1 = AnimatableValueParser.g1((int) l.longValue());
+                                if (g1) {
+                                }
+                            }
+                        }
+                        obj = null;
+                        if (!(obj instanceof String)) {
+                        }
+                        String str = (String) obj;
+                        changes = modelAuditLogEntry.getChanges();
+                        if (changes != null) {
+                        }
+                        obj2 = null;
+                        if (!(obj2 instanceof Long)) {
+                        }
+                        l = (Long) obj2;
+                        g1 = AnimatableValueParser.g1((int) l.longValue());
+                        if (g1) {
+                        }
+                    }
+                    return null;
+                }
+            }
+
             public final Observable<Model> get(long j, Context context) {
                 m.checkNotNullParameter(context, "context");
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable<Model> s2 = Observable.g(companion.getAuditLog().observeAuditLogState(j), companion.getGuilds().observeGuild(j), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), ObservableExtensionsKt.leadingEdgeThrottle(companion.getUsers().observeAllUsers(), 3, TimeUnit.SECONDS), companion.getGuilds().observeRoles(j), new WidgetServerSettingsAuditLog$Model$Companion$get$1(j, context)).s();
-                m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = Observable.g(companion.getAuditLog().observeAuditLogState(j), companion.getGuilds().observeGuild(j), StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), ObservableExtensionsKt.leadingEdgeThrottle(companion.getUsers().observeAllUsers(), 3, TimeUnit.SECONDS), companion.getGuilds().observeRoles(j), new WidgetServerSettingsAuditLog$Model$Companion$get$1(j, context)).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -161,7 +281,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
     }
 
     public WidgetServerSettingsAuditLog() {
-        super(2131559137);
+        super(2131559143);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsAuditLog widgetServerSettingsAuditLog, Model model) {
@@ -234,18 +354,18 @@ public final class WidgetServerSettingsAuditLog extends AppFragment {
         long longExtra = getMostRecentIntent().getLongExtra("GUILD_ID", -1);
         this.guildId = longExtra;
         if (longExtra == -1) {
-            o.g(getContext(), 2131887894, 0, null, 12);
+            o.g(getContext(), 2131887893, 0, null, 12);
             AppActivity appActivity = getAppActivity();
             if (appActivity != null) {
                 appActivity.finish();
             }
         }
-        setActionBarTitle(2131889734);
+        setActionBarTitle(2131889742);
         setActionBarSubtitle(getMostRecentIntent().getStringExtra("GUILD_NAME"));
         setActionBarOptionsMenu(2131623953, null, new WidgetServerSettingsAuditLog$onViewBound$1(this));
-        getBinding().f1865c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2());
+        getBinding().f1867c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2());
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1865c;
+        RecyclerView recyclerView = getBinding().f1867c;
         m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsAuditLogsRecycler");
         this.adapter = (WidgetServerSettingsAuditLogAdapter) companion.configure(new WidgetServerSettingsAuditLogAdapter(recyclerView));
         getBinding().d.setOnClickListener(new WidgetServerSettingsAuditLog$onViewBound$3(this));
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
index 20672b33d1..f12e565f9c 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java
@@ -99,7 +99,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogEntryViewHolder(WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter) {
-            super(2131559140, widgetServerSettingsAuditLogAdapter);
+            super(2131559146, widgetServerSettingsAuditLogAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogAdapter, "adapter");
             View view = this.itemView;
             int i = 2131362004;
@@ -179,11 +179,11 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
             TextView textView3 = this.binding.e;
             m.checkNotNullExpressionValue(textView3, "binding.auditLogListitemChangeText");
             textView3.setVisibility(auditLogEntryItem.isSelected() && auditLogEntryItem.getHasChangesToRender() ? 0 : 8);
-            ImageView imageView3 = this.binding.f1868c;
+            ImageView imageView3 = this.binding.f1870c;
             m.checkNotNullExpressionValue(imageView3, "binding.auditLogListitemArrow");
             imageView3.setVisibility(auditLogEntryItem.getHasChangesToRender() ? 0 : 4);
             if (!auditLogEntryItem.isSelected() || !auditLogEntryItem.getHasChangesToRender()) {
-                this.binding.f1868c.setImageResource(2131231514);
+                this.binding.f1870c.setImageResource(2131231520);
                 RelativeLayout relativeLayout = this.binding.i;
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
@@ -192,7 +192,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
                 TextView textView4 = this.binding.e;
                 m.checkNotNullExpressionValue(textView4, "binding.auditLogListitemChangeText");
                 textView4.setText(auditLogEntryItem.getChangeText());
-                this.binding.f1868c.setImageResource(2131231510);
+                this.binding.f1870c.setImageResource(2131231516);
                 RelativeLayout relativeLayout2 = this.binding.i;
                 View view3 = this.itemView;
                 m.checkNotNullExpressionValue(view3, "itemView");
@@ -226,7 +226,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter
     public static final class AuditLogLoadingViewHolder extends MGRecyclerViewHolder<WidgetServerSettingsAuditLogAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogLoadingViewHolder(WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter) {
-            super(2131559141, widgetServerSettingsAuditLogAdapter);
+            super(2131559147, widgetServerSettingsAuditLogAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogAdapter, "adapter");
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
index 0ea58d4531..72d5547f24 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java
@@ -77,7 +77,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogFilterActionViewHolder(WidgetServerSettingsAuditLogFilterAdapter widgetServerSettingsAuditLogFilterAdapter) {
-            super(2131559138, widgetServerSettingsAuditLogFilterAdapter);
+            super(2131559144, widgetServerSettingsAuditLogFilterAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogFilterAdapter, "adapter");
             View view = this.itemView;
             int i = 2131361997;
@@ -116,7 +116,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
             imageView.setImageResource(auditLogUtils.getTargetTypeImage(view, auditLogActionFilterItem.getActionId()));
-            this.binding.f1866c.setImageResource(auditLogUtils.getActionTypeImage(auditLogActionFilterItem.getActionId()));
+            this.binding.f1868c.setImageResource(auditLogUtils.getActionTypeImage(auditLogActionFilterItem.getActionId()));
             this.binding.b.setText(auditLogActionFilterItem.getText());
             CheckedSetting checkedSetting = this.binding.b;
             m.checkNotNullExpressionValue(checkedSetting, "binding.auditLogFilterCs");
@@ -131,7 +131,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public AuditLogFilterUserViewHolder(WidgetServerSettingsAuditLogFilterAdapter widgetServerSettingsAuditLogFilterAdapter) {
-            super(2131559139, widgetServerSettingsAuditLogFilterAdapter);
+            super(2131559145, widgetServerSettingsAuditLogFilterAdapter);
             m.checkNotNullParameter(widgetServerSettingsAuditLogFilterAdapter, "adapter");
             View view = this.itemView;
             int i = 2131361996;
@@ -187,7 +187,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
                 ImageView imageView2 = this.binding.d;
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
-                Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231734);
+                Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231741);
                 if (drawable != null) {
                     ImageView imageView3 = this.binding.d;
                     m.checkNotNullExpressionValue(imageView3, "binding.auditLogFilterImage");
@@ -197,11 +197,11 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
                 }
                 imageView2.setImageDrawable(drawable);
             }
-            this.binding.f1867c.setText(auditLogUserFilterItem.getText());
-            CheckedSetting checkedSetting = this.binding.f1867c;
+            this.binding.f1869c.setText(auditLogUserFilterItem.getText());
+            CheckedSetting checkedSetting = this.binding.f1869c;
             m.checkNotNullExpressionValue(checkedSetting, "binding.auditLogFilterCs");
             checkedSetting.setChecked(auditLogUserFilterItem.isChecked());
-            this.binding.f1867c.setOnCheckedListener(new WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$2(this, auditLogUserFilterItem));
+            this.binding.f1869c.setOnCheckedListener(new WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$2(this, auditLogUserFilterItem));
         }
     }
 
@@ -211,7 +211,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         private final Integer discriminator;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2143id;
+        private final long f2149id;
         private final boolean isChecked;
         private final String key;
         private final CharSequence text;
@@ -220,7 +220,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         public AuditLogUserFilterItem(String str, long j, CharSequence charSequence, Integer num, boolean z2) {
             m.checkNotNullParameter(charSequence, "text");
             this.avatarUrl = str;
-            this.f2143id = j;
+            this.f2149id = j;
             this.text = charSequence;
             this.discriminator = num;
             this.isChecked = z2;
@@ -236,7 +236,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA
         }
 
         public final long getId() {
-            return this.f2143id;
+            return this.f2149id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java
index 19d1427340..5ed531f36f 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java
@@ -97,7 +97,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2
         if (this.$filterType == 0) {
             m.checkNotNullExpressionValue(str, "filterText");
             if (t.isBlank(str)) {
-                String string = this.$context.getString(2131889684);
+                String string = this.$context.getString(2131889692);
                 m.checkNotNullExpressionValue(string, "context.getString(R.stri…ettings_filter_all_users)");
                 sequence = u.asSequence(d0.t.m.listOf(new WidgetServerSettingsAuditLogFilterAdapter.AuditLogUserFilterItem("", 0, string, null, auditLogState.getFilter().getUserFilter() == 0)));
             } else {
diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java
index 644cd9d22d..4e1c8b0ca6 100644
--- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java
+++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java
@@ -42,7 +42,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private WidgetServerSettingsAuditLogFilterAdapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsAuditLogFilterSheet$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.m0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
     private Integer filterType;
     private Long guildId;
     private final Function0<Unit> onFilterSelectedCallback = new WidgetServerSettingsAuditLogFilterSheet$onFilterSelectedCallback$1(this);
@@ -80,18 +80,18 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
 
             private final Observable<Set<Long>> getPermissionUserIds(long j) {
                 StoreGuilds guilds = StoreStream.Companion.getGuilds();
-                Observable<Set<Long>> s2 = Observable.i(guilds.observeGuild(j), guilds.observeRoles(j), guilds.observeComputed(j), WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPermissionUserIds$1.INSTANCE).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Set<Long>> r = Observable.i(guilds.observeGuild(j), guilds.observeRoles(j), guilds.observeComputed(j), WidgetServerSettingsAuditLogFilterSheet$Model$Companion$getPermissionUserIds$1.INSTANCE).r();
+                m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                return r;
             }
 
             @SuppressLint({"DefaultLocale"})
             public final Observable<Model> get(Context context, long j, int i, Observable<String> observable) {
                 m.checkNotNullParameter(context, "context");
                 m.checkNotNullParameter(observable, "filterPublisher");
-                Observable<Model> s2 = Observable.h(StoreStream.Companion.getAuditLog().observeAuditLogState(j), getPermissionUserIds(j).Z(WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.INSTANCE), new j(AuditLogUtils.INSTANCE.getALL_ACTION_TYPES()), ObservableExtensionsKt.leadingEdgeThrottle(observable, 100, TimeUnit.MILLISECONDS).s(), new WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2(i, context)).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n             …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = Observable.h(StoreStream.Companion.getAuditLog().observeAuditLogState(j), getPermissionUserIds(j).Y(WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$1.INSTANCE), new j(AuditLogUtils.INSTANCE.getALL_ACTION_TYPES()), ObservableExtensionsKt.leadingEdgeThrottle(observable, 100, TimeUnit.MILLISECONDS).r(), new WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2(i, context)).r();
+                m.checkNotNullExpressionValue(r, "Observable\n             …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -108,7 +108,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
     }
 
     public WidgetServerSettingsAuditLogFilterSheet() {
-        super(2131558840);
+        super(2131558843);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsAuditLogFilterSheet widgetServerSettingsAuditLogFilterSheet, Model model) {
@@ -171,16 +171,16 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment {
         super.onViewCreated(view, bundle);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1671c;
+        RecyclerView recyclerView = getBinding().f1668c;
         m.checkNotNullExpressionValue(recyclerView, "binding.auditLogFilterRecycler");
         this.adapter = (WidgetServerSettingsAuditLogFilterAdapter) companion.configure(new WidgetServerSettingsAuditLogFilterAdapter(recyclerView));
-        setActionBarTitle(2131889734);
+        setActionBarTitle(2131889742);
         Integer num = this.filterType;
-        setActionBarSubtitle((num != null && num.intValue() == 0) ? 2131889685 : 2131889681);
+        setActionBarSubtitle((num != null && num.intValue() == 0) ? 2131889693 : 2131889689);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.auditLogFilterInput");
         Integer num2 = this.filterType;
-        ViewExtensions.setSingleLineHint(textInputLayout, (num2 != null && num2.intValue() == 0) ? 2131893102 : 2131893048);
+        ViewExtensions.setSingleLineHint(textInputLayout, (num2 != null && num2.intValue() == 0) ? 2131893185 : 2131893131);
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.auditLogFilterInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1(this));
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java
index cb8dfc4c0e..410bf9a4c7 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java
@@ -29,11 +29,11 @@ public final class CommunityGetStartedHeaderIconView extends CardView {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558738, this);
-        int i2 = 2131362648;
-        ImageView imageView = (ImageView) findViewById(2131362648);
+        int i2 = 2131362672;
+        ImageView imageView = (ImageView) findViewById(2131362672);
         if (imageView != null) {
-            i2 = 2131362649;
-            TextView textView = (TextView) findViewById(2131362649);
+            i2 = 2131362673;
+            TextView textView = (TextView) findViewById(2131362673);
             if (textView != null) {
                 ViewCommunityGetStartedHeaderBinding viewCommunityGetStartedHeaderBinding = new ViewCommunityGetStartedHeaderBinding(this, imageView, textView);
                 m.checkNotNullExpressionValue(viewCommunityGetStartedHeaderBinding, "ViewCommunityGetStartedH…ater.from(context), this)");
@@ -60,7 +60,7 @@ public final class CommunityGetStartedHeaderIconView extends CardView {
         CharSequence text = obtainStyledAttributes.getText(1);
         obtainStyledAttributes.recycle();
         this.binding.b.setImageDrawable(AppCompatResources.getDrawable(getContext(), resourceId));
-        TextView textView = this.binding.f1646c;
+        TextView textView = this.binding.f1643c;
         m.checkNotNullExpressionValue(textView, "binding.communityGetStartedHeaderIconText");
         textView.setText(text);
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java
index 7d61ae22ae..c94b93daca 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java
@@ -33,23 +33,23 @@ public final class CommunityGetStartedInformationView extends CardView {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558739, this);
-        int i2 = 2131362652;
-        Guideline guideline = (Guideline) findViewById(2131362652);
+        int i2 = 2131362676;
+        Guideline guideline = (Guideline) findViewById(2131362676);
         if (guideline != null) {
-            i2 = 2131362655;
-            TextView textView = (TextView) findViewById(2131362655);
+            i2 = 2131362679;
+            TextView textView = (TextView) findViewById(2131362679);
             if (textView != null) {
-                i2 = 2131362656;
-                ImageView imageView = (ImageView) findViewById(2131362656);
+                i2 = 2131362680;
+                ImageView imageView = (ImageView) findViewById(2131362680);
                 if (imageView != null) {
-                    i2 = 2131362657;
-                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131362657);
+                    i2 = 2131362681;
+                    ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131362681);
                     if (constraintLayout != null) {
-                        i2 = 2131362658;
-                        RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131362658);
+                        i2 = 2131362682;
+                        RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131362682);
                         if (relativeLayout != null) {
-                            i2 = 2131362659;
-                            TextView textView2 = (TextView) findViewById(2131362659);
+                            i2 = 2131362683;
+                            TextView textView2 = (TextView) findViewById(2131362683);
                             if (textView2 != null) {
                                 ViewCommunityGetStartedInformationBinding viewCommunityGetStartedInformationBinding = new ViewCommunityGetStartedInformationBinding(this, guideline, textView, imageView, constraintLayout, relativeLayout, textView2);
                                 m.checkNotNullExpressionValue(viewCommunityGetStartedInformationBinding, "ViewCommunityGetStartedI…ater.from(context), this)");
@@ -80,7 +80,7 @@ public final class CommunityGetStartedInformationView extends CardView {
         CharSequence text = obtainStyledAttributes.getText(2);
         CharSequence text2 = obtainStyledAttributes.getText(0);
         obtainStyledAttributes.recycle();
-        this.binding.f1647c.setImageDrawable(AppCompatResources.getDrawable(getContext(), resourceId));
+        this.binding.f1644c.setImageDrawable(AppCompatResources.getDrawable(getContext(), resourceId));
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.communityListAdapterItemTextName");
         textView.setText(text);
diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java
index e2130c855e..f3c67b19ca 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java
@@ -27,18 +27,18 @@ public final class CommunitySelectorView extends LinearLayout {
     public CommunitySelectorView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558795, this);
-        int i2 = 2131364612;
-        TextView textView = (TextView) findViewById(2131364612);
+        LayoutInflater.from(context).inflate(2131558798, this);
+        int i2 = 2131364661;
+        TextView textView = (TextView) findViewById(2131364661);
         if (textView != null) {
-            i2 = 2131364613;
-            ImageView imageView = (ImageView) findViewById(2131364613);
+            i2 = 2131364662;
+            ImageView imageView = (ImageView) findViewById(2131364662);
             if (imageView != null) {
-                i2 = 2131364614;
-                TextView textView2 = (TextView) findViewById(2131364614);
+                i2 = 2131364663;
+                TextView textView2 = (TextView) findViewById(2131364663);
                 if (textView2 != null) {
-                    i2 = 2131364615;
-                    TextView textView3 = (TextView) findViewById(2131364615);
+                    i2 = 2131364664;
+                    TextView textView3 = (TextView) findViewById(2131364664);
                     if (textView3 != null) {
                         ViewServerSettingsCommunitySettingSelectorBinding viewServerSettingsCommunitySettingSelectorBinding = new ViewServerSettingsCommunitySettingSelectorBinding(this, textView, imageView, textView2, textView3);
                         m.checkNotNullExpressionValue(viewServerSettingsCommunitySettingSelectorBinding, "ViewServerSettingsCommun…ater.from(context), this)");
@@ -81,7 +81,7 @@ public final class CommunitySelectorView extends LinearLayout {
         TextView textView4 = this.binding.d;
         m.checkNotNullExpressionValue(textView4, "binding.serverSettingsCo…tySettingSelectorSubtitle");
         textView4.setVisibility(z2 ? 0 : 8);
-        ImageView imageView = this.binding.f1660c;
+        ImageView imageView = this.binding.f1657c;
         m.checkNotNullExpressionValue(imageView, "binding.serverSettingsCo…ttingSelectorDropdownIcon");
         if (!z2) {
             i = 8;
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java
index 28b974d292..987363c02f 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog$binding$2.java
@@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetConfirmRemoveCommunityDialog$binding$2
 
     public final WidgetConfirmRemoveCommunityDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362674;
-        TextView textView = (TextView) view.findViewById(2131362674);
+        int i = 2131362698;
+        TextView textView = (TextView) view.findViewById(2131362698);
         if (textView != null) {
-            i = 2131362675;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362675);
+            i = 2131362699;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362699);
             if (materialButton != null) {
-                i = 2131362676;
-                TextView textView2 = (TextView) view.findViewById(2131362676);
+                i = 2131362700;
+                TextView textView2 = (TextView) view.findViewById(2131362700);
                 if (textView2 != null) {
-                    i = 2131362677;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362677);
+                    i = 2131362701;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362701);
                     if (linearLayout != null) {
-                        i = 2131362678;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362678);
+                        i = 2131362702;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362702);
                         if (materialButton2 != null) {
                             return new WidgetConfirmRemoveCommunityDialogBinding((LinearLayout) view, textView, materialButton, textView2, linearLayout, materialButton2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
index bfb3841d6a..08662f1d2a 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java
@@ -44,7 +44,7 @@ public final class WidgetConfirmRemoveCommunityDialog extends AppDialog {
     }
 
     public WidgetConfirmRemoveCommunityDialog() {
-        super(2131558977);
+        super(2131558981);
     }
 
     public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(WidgetConfirmRemoveCommunityDialog widgetConfirmRemoveCommunityDialog) {
@@ -67,7 +67,7 @@ public final class WidgetConfirmRemoveCommunityDialog extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f1756c.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$1(this));
+        getBinding().f1757c.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$1(this));
         getBinding().b.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java
index 982483e3dd..83f35d3667 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$binding$2.java
@@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetServerSettingsCommunityFirstStep$bindin
     public final WidgetServerSettingsCommunitySetupFirstStepBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        int i = 2131362650;
-        ImageView imageView = (ImageView) view.findViewById(2131362650);
+        int i = 2131362674;
+        ImageView imageView = (ImageView) view.findViewById(2131362674);
         if (imageView != null) {
-            i = 2131362666;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362666);
+            i = 2131362690;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362690);
             if (checkedSetting != null) {
-                i = 2131362667;
-                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362667);
+                i = 2131362691;
+                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362691);
                 if (checkedSetting2 != null) {
-                    i = 2131362668;
-                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362668);
+                    i = 2131362692;
+                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362692);
                     if (screenTitleView != null) {
                         return new WidgetServerSettingsCommunitySetupFirstStepBinding((ScrollView) view, scrollView, imageView, checkedSetting, checkedSetting2, screenTitleView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
index 24244acbd9..76566e9ec3 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java
@@ -25,7 +25,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$1 implemen
 
         public final WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig invoke(WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig communityGuildConfig) {
             m.checkNotNullParameter(communityGuildConfig, "it");
-            CheckedSetting checkedSetting = WidgetServerSettingsCommunityFirstStep.access$getBinding$p(this.this$0.this$0).f1877c;
+            CheckedSetting checkedSetting = WidgetServerSettingsCommunityFirstStep.access$getBinding$p(this.this$0.this$0).f1879c;
             m.checkNotNullExpressionValue(checkedSetting, "binding.communitySettingsVerifiedEmailedSwitch");
             return WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig.copy$default(communityGuildConfig, null, null, null, null, false, false, !checkedSetting.isChecked(), false, null, false, null, null, 4031, null);
         }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
index 537ba2adf6..29af24d45b 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java
@@ -50,7 +50,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
     }
 
     public WidgetServerSettingsCommunityFirstStep() {
-        super(2131559149);
+        super(2131559155);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityFirstStep widgetServerSettingsCommunityFirstStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
@@ -74,7 +74,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
     }
 
     private final void configureUI(WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
-        CheckedSetting checkedSetting = getBinding().f1877c;
+        CheckedSetting checkedSetting = getBinding().f1879c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.communitySettingsVerifiedEmailedSwitch");
         checkedSetting.setChecked(loaded.getCommunityGuildConfig().getVerificationLevel());
         CheckedSetting checkedSetting2 = getBinding().b;
@@ -86,7 +86,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
         if (guild == null || guild.getExplicitContentFilter().compareTo(GuildExplicitContentFilter.NONE) <= 0) {
             z2 = false;
         }
-        getBinding().f1877c.e(new WidgetServerSettingsCommunityFirstStep$configureUI$1(this, loaded, z3));
+        getBinding().f1879c.e(new WidgetServerSettingsCommunityFirstStep$configureUI$1(this, loaded, z3));
         getBinding().b.e(new WidgetServerSettingsCommunityFirstStep$configureUI$2(this, loaded, z2));
     }
 
@@ -111,8 +111,8 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable G = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).y(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(G, WidgetServerSettingsCommunityFirstStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).x(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunityFirstStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityFirstStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java
index 9e1a7b2604..598ba1f1bf 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java
@@ -18,23 +18,23 @@ public final /* synthetic */ class WidgetServerSettingsCommunityOverview$binding
 
     public final WidgetServerSettingsCommunityOverviewBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362660;
-        CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(2131362660);
+        int i = 2131362684;
+        CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(2131362684);
         if (communitySelectorView != null) {
-            i = 2131362669;
-            CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362669);
+            i = 2131362693;
+            CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362693);
             if (communitySelectorView2 != null) {
-                i = 2131364609;
-                CommunitySelectorView communitySelectorView3 = (CommunitySelectorView) view.findViewById(2131364609);
+                i = 2131364658;
+                CommunitySelectorView communitySelectorView3 = (CommunitySelectorView) view.findViewById(2131364658);
                 if (communitySelectorView3 != null) {
-                    i = 2131364611;
-                    ScrollView scrollView = (ScrollView) view.findViewById(2131364611);
+                    i = 2131364660;
+                    ScrollView scrollView = (ScrollView) view.findViewById(2131364660);
                     if (scrollView != null) {
-                        i = 2131364626;
-                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364626);
+                        i = 2131364675;
+                        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364675);
                         if (loadingButton != null) {
-                            i = 2131364627;
-                            CommunitySelectorView communitySelectorView4 = (CommunitySelectorView) view.findViewById(2131364627);
+                            i = 2131364676;
+                            CommunitySelectorView communitySelectorView4 = (CommunitySelectorView) view.findViewById(2131364676);
                             if (communitySelectorView4 != null) {
                                 return new WidgetServerSettingsCommunityOverviewBinding((LinearLayout) view, communitySelectorView, communitySelectorView2, communitySelectorView3, scrollView, loadingButton, communitySelectorView4);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java
index 767b5de16a..ce58563b1e 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java
@@ -34,9 +34,9 @@ public final class WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2
             m.checkNotNullExpressionValue(requireActivity, "requireActivity()");
             companion.create(requireActivity, this.this$0.getGuildId());
         } else if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.SaveSuccess.INSTANCE)) {
-            c.a.d.o.i(this.this$0, 2131893186, 0, 4);
+            c.a.d.o.i(this.this$0, 2131893269, 0, 4);
         } else if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.Error.INSTANCE)) {
-            c.a.d.o.i(this.this$0, 2131889850, 0, 4);
+            c.a.d.o.i(this.this$0, 2131889858, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
index 822ad322bf..77910b123c 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java
@@ -60,7 +60,7 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
     }
 
     public WidgetServerSettingsCommunityOverview() {
-        super(2131559148);
+        super(2131559154);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityOverview widgetServerSettingsCommunityOverview, WidgetServerSettingsCommunityOverviewViewModel.ViewState viewState) {
@@ -88,10 +88,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
     private final void configureValidUI(WidgetServerSettingsCommunityOverviewViewModel.ViewState.Loaded loaded) {
         String str;
         getBinding().e.setIsLoading(false);
-        String string = loaded.getRulesChannel() == null ? requireContext().getString(2131889849) : AnimatableValueParser.A0(loaded.getRulesChannel(), requireContext(), false, 2);
+        String string = loaded.getRulesChannel() == null ? requireContext().getString(2131889857) : AnimatableValueParser.A0(loaded.getRulesChannel(), requireContext(), false, 2);
         m.checkNotNullExpressionValue(string, "when (viewState.rulesCha…t(requireContext())\n    }");
         if (loaded.getUpdatesChannel() == null) {
-            str = requireContext().getString(2131889849);
+            str = requireContext().getString(2131889857);
         } else {
             Channel updatesChannel = loaded.getUpdatesChannel();
             FragmentActivity requireActivity = requireActivity();
@@ -100,10 +100,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
         }
         m.checkNotNullExpressionValue(str, "when (viewState.updatesC…(requireActivity())\n    }");
         getBinding().b.setSubtitle(string);
-        getBinding().f1876c.setSubtitle(str);
+        getBinding().f1878c.setSubtitle(str);
         getBinding().d.setSubtitle(WidgetSettingsLanguage.Companion.getAsStringInLocale(loaded.getGuild().getPreferredLocale()));
         getBinding().b.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$1(this, loaded));
-        getBinding().f1876c.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$2(this, loaded));
+        getBinding().f1878c.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$2(this, loaded));
         getBinding().d.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$3(this));
         getBinding().e.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$4(this, loaded));
     }
@@ -138,10 +138,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131889563);
-        Observable<WidgetServerSettingsCommunityOverviewViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetServerSettingsCommunityOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        setActionBarTitle(2131889570);
+        Observable<WidgetServerSettingsCommunityOverviewViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetServerSettingsCommunityOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getViewModel().observeEvents(), this, null, 2, null), WidgetServerSettingsCommunityOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java
index 092be632cb..784e221602 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverviewViewModel.java
@@ -66,9 +66,9 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser) {
-            Observable<R> Z = storeGuilds.observeGuild(j).Z(new WidgetServerSettingsCommunityOverviewViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
-            m.checkNotNullExpressionValue(Z, "storeGuilds.observeGuild…      }\n        }\n      }");
-            return Z;
+            Observable<R> Y = storeGuilds.observeGuild(j).Y(new WidgetServerSettingsCommunityOverviewViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
+            m.checkNotNullExpressionValue(Y, "storeGuilds.observeGuild…      }\n        }\n      }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser, int i, Object obj) {
@@ -143,7 +143,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
             private final Guild guild;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2144me;
+            private final MeUser f2150me;
             private final Long permissions;
             private final Channel rulesChannel;
             private final Channel updatesChannel;
@@ -154,7 +154,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                 m.checkNotNullParameter(guild, "guild");
                 m.checkNotNullParameter(meUser, "me");
                 this.guild = guild;
-                this.f2144me = meUser;
+                this.f2150me = meUser;
                 this.permissions = l;
                 this.rulesChannel = channel;
                 this.updatesChannel = channel2;
@@ -165,7 +165,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                     guild = valid.guild;
                 }
                 if ((i & 2) != 0) {
-                    meUser = valid.f2144me;
+                    meUser = valid.f2150me;
                 }
                 if ((i & 4) != 0) {
                     l = valid.permissions;
@@ -184,7 +184,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
             }
 
             public final MeUser component2() {
-                return this.f2144me;
+                return this.f2150me;
             }
 
             public final Long component3() {
@@ -213,7 +213,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                     return false;
                 }
                 Valid valid = (Valid) obj;
-                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2144me, valid.f2144me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
+                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2150me, valid.f2150me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
             }
 
             public final Guild getGuild() {
@@ -221,7 +221,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
             }
 
             public final MeUser getMe() {
-                return this.f2144me;
+                return this.f2150me;
             }
 
             public final Long getPermissions() {
@@ -240,7 +240,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                 Guild guild = this.guild;
                 int i = 0;
                 int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
-                MeUser meUser = this.f2144me;
+                MeUser meUser = this.f2150me;
                 int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 Long l = this.permissions;
                 int hashCode3 = (hashCode2 + (l != null ? l.hashCode() : 0)) * 31;
@@ -257,7 +257,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
                 StringBuilder L = a.L("Valid(guild=");
                 L.append(this.guild);
                 L.append(", me=");
-                L.append(this.f2144me);
+                L.append(this.f2150me);
                 L.append(", permissions=");
                 L.append(this.permissions);
                 L.append(", rulesChannel=");
@@ -452,7 +452,7 @@ public final class WidgetServerSettingsCommunityOverviewViewModel extends AppVie
         super(ViewState.Uninitialized.INSTANCE);
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.guildId = j;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetServerSettingsCommunityOverviewViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java
index 6a17b79835..7fb8696681 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsCommunitySecondStep$bindi
     public final WidgetServerSettingsCommunitySetupSecondStepBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        int i = 2131362650;
-        ImageView imageView = (ImageView) view.findViewById(2131362650);
+        int i = 2131362674;
+        ImageView imageView = (ImageView) view.findViewById(2131362674);
         if (imageView != null) {
-            i = 2131362653;
-            CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(2131362653);
+            i = 2131362677;
+            CommunitySelectorView communitySelectorView = (CommunitySelectorView) view.findViewById(2131362677);
             if (communitySelectorView != null) {
-                i = 2131362668;
-                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362668);
+                i = 2131362692;
+                ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362692);
                 if (screenTitleView != null) {
-                    i = 2131362669;
-                    CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362669);
+                    i = 2131362693;
+                    CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362693);
                     if (communitySelectorView2 != null) {
                         return new WidgetServerSettingsCommunitySetupSecondStepBinding((ScrollView) view, scrollView, imageView, communitySelectorView, screenTitleView, communitySelectorView2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
index 6bd3caeeec..a29d7c74c7 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java
@@ -49,7 +49,7 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
     }
 
     public WidgetServerSettingsCommunitySecondStep() {
-        super(2131559150);
+        super(2131559156);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunitySecondStep widgetServerSettingsCommunitySecondStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
@@ -66,9 +66,9 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
         String string2 = loaded.getCommunityGuildConfig().getUpdatesChannel() == null ? requireContext().getString(2131888356) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getUpdatesChannel(), requireContext(), false, 2);
         m.checkNotNullExpressionValue(string2, "when (viewState.communit…t(requireContext())\n    }");
         getBinding().b.setSubtitle(string);
-        getBinding().f1878c.setSubtitle(string2);
+        getBinding().f1880c.setSubtitle(string2);
         getBinding().b.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$1(this));
-        getBinding().f1878c.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$2(this));
+        getBinding().f1880c.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$2(this));
     }
 
     public static final void create(Context context) {
@@ -95,8 +95,8 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable G = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).y(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(G, WidgetServerSettingsCommunitySecondStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).x(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunitySecondStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunitySecondStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java
index 316c5e3c32..78c50a01df 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$binding$2.java
@@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetServerSettingsCommunityThirdStep$bindin
     public final WidgetServerSettingsCommunitySetupThirdStepBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ScrollView scrollView = (ScrollView) view;
-        int i = 2131362650;
-        ImageView imageView = (ImageView) view.findViewById(2131362650);
+        int i = 2131362674;
+        ImageView imageView = (ImageView) view.findViewById(2131362674);
         if (imageView != null) {
-            i = 2131362661;
-            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362661);
+            i = 2131362685;
+            CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362685);
             if (checkedSetting != null) {
-                i = 2131362663;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362663);
+                i = 2131362687;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362687);
                 if (linkifiedTextView != null) {
-                    i = 2131362664;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362664);
+                    i = 2131362688;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362688);
                     if (checkedSetting2 != null) {
-                        i = 2131362665;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362665);
+                        i = 2131362689;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362689);
                         if (checkedSetting3 != null) {
-                            i = 2131362668;
-                            ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362668);
+                            i = 2131362692;
+                            ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362692);
                             if (screenTitleView != null) {
                                 return new WidgetServerSettingsCommunitySetupThirdStepBinding((ScrollView) view, scrollView, imageView, checkedSetting, linkifiedTextView, checkedSetting2, checkedSetting3, screenTitleView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
index acc2e64608..e3fd0275c3 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java
@@ -53,7 +53,7 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment {
     }
 
     public WidgetServerSettingsCommunityThirdStep() {
-        super(2131559151);
+        super(2131559157);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityThirdStep widgetServerSettingsCommunityThirdStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) {
@@ -147,17 +147,17 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable G = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).y(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(G, WidgetServerSettingsCommunityThirdStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).x(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsCommunityThirdStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$1(this), 62, (Object) null);
         CheckedSetting checkedSetting = getBinding().e;
         Context context = getContext();
         checkedSetting.setText(context != null ? b.a(context, 2131888329, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2(this)) : null);
         CheckedSetting checkedSetting2 = getBinding().d;
         Context context2 = getContext();
         checkedSetting2.setText(context2 != null ? b.a(context2, 2131888332, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3(this)) : null);
-        LinkifiedTextView linkifiedTextView = getBinding().f1879c;
+        LinkifiedTextView linkifiedTextView = getBinding().f1881c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.communitySettingGuidelines");
-        b.n(linkifiedTextView, 2131887483, new Object[]{f.a.a(360035969312L, null)}, null, 4);
+        b.m(linkifiedTextView, 2131887483, new Object[]{f.a.a(360035969312L, null)}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java
index 04303578d4..cf93a1dbf0 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity$binding$2.java
@@ -20,18 +20,18 @@ public final /* synthetic */ class WidgetServerSettingsEnableCommunity$binding$2
 
     public final WidgetServerSettingsEnableCommunityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362647;
-        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362647);
+        int i = 2131362671;
+        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131362671);
         if (screenTitleView != null) {
-            i = 2131362650;
-            ImageView imageView = (ImageView) view.findViewById(2131362650);
+            i = 2131362674;
+            ImageView imageView = (ImageView) view.findViewById(2131362674);
             if (imageView != null) {
                 ScrollView scrollView = (ScrollView) view;
-                i = 2131362654;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362654);
+                i = 2131362678;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362678);
                 if (relativeLayout != null) {
-                    i = 2131362662;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362662);
+                    i = 2131362686;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362686);
                     if (materialButton != null) {
                         return new WidgetServerSettingsEnableCommunityBinding(scrollView, screenTitleView, imageView, scrollView, relativeLayout, materialButton);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java
index 44d38b5577..3a1f482c37 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsEnableCommunity extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetServerSettingsEnableCommunityViewModel.class), new WidgetServerSettingsEnableCommunity$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetServerSettingsEnableCommunity$viewModel$2.INSTANCE));
 
     public WidgetServerSettingsEnableCommunity() {
-        super(2131559161);
+        super(2131559167);
     }
 
     public static final /* synthetic */ WidgetServerSettingsEnableCommunityViewModel access$getViewModel$p(WidgetServerSettingsEnableCommunity widgetServerSettingsEnableCommunity) {
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java
index a968a1f23b..686296e79d 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java
@@ -34,7 +34,7 @@ public final class WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResum
             m.checkNotNullExpressionValue(requireActivity, "requireActivity()");
             companion.create(requireActivity, this.this$0.getGuildId());
         } else if (m.areEqual(event, WidgetServerSettingsEnableCommunityViewModel.Event.Error.INSTANCE)) {
-            c.a.d.o.i(this.this$0, 2131889850, 0, 4);
+            c.a.d.o.i(this.this$0, 2131889858, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
index 478aaa9864..f6548b72c9 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java
@@ -52,7 +52,7 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment
     }
 
     public WidgetServerSettingsEnableCommunitySteps() {
-        super(2131558995);
+        super(2131558999);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEnableCommunitySteps widgetServerSettingsEnableCommunitySteps, WidgetServerSettingsEnableCommunityViewModel.ViewState viewState) {
@@ -100,12 +100,12 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetServerSettingsEnableCommunityViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        Observable G = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).y(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).G(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        ObservableExtensionsKt.appSubscribe$default(G, WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable<WidgetServerSettingsEnableCommunityViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable F = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).x(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$1.INSTANCE).F(WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$$inlined$filterIs$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        ObservableExtensionsKt.appSubscribe$default(F, WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetServerSettingsEnableCommunitySteps.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java
index e96dae149f..729e6dd563 100644
--- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunityViewModel.java
@@ -312,9 +312,9 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser) {
-            Observable<R> Z = storeGuilds.observeGuild(j).Z(new WidgetServerSettingsEnableCommunityViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
-            m.checkNotNullExpressionValue(Z, "storeGuilds.observeGuild…      }\n        }\n      }");
-            return Z;
+            Observable<R> Y = storeGuilds.observeGuild(j).Y(new WidgetServerSettingsEnableCommunityViewModel$Companion$observeStoreState$1(storeUser, storePermissions, j, storeChannels));
+            m.checkNotNullExpressionValue(Y, "storeGuilds.observeGuild…      }\n        }\n      }");
+            return Y;
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, long j, StoreGuilds storeGuilds, StoreChannels storeChannels, StorePermissions storePermissions, StoreUser storeUser, int i, Object obj) {
@@ -380,7 +380,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
             private final Guild guild;
 
             /* renamed from: me  reason: collision with root package name */
-            private final MeUser f2145me;
+            private final MeUser f2151me;
             private final Long permissions;
             private final Map<Long, GuildRole> roles;
             private final Channel rulesChannel;
@@ -392,7 +392,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                 m.checkNotNullParameter(guild, "guild");
                 m.checkNotNullParameter(meUser, "me");
                 this.guild = guild;
-                this.f2145me = meUser;
+                this.f2151me = meUser;
                 this.permissions = l;
                 this.roles = map;
                 this.rulesChannel = channel;
@@ -406,7 +406,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                     guild = valid.guild;
                 }
                 if ((i & 2) != 0) {
-                    meUser = valid.f2145me;
+                    meUser = valid.f2151me;
                 }
                 if ((i & 4) != 0) {
                     l = valid.permissions;
@@ -428,7 +428,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
             }
 
             public final MeUser component2() {
-                return this.f2145me;
+                return this.f2151me;
             }
 
             public final Long component3() {
@@ -461,7 +461,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                     return false;
                 }
                 Valid valid = (Valid) obj;
-                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2145me, valid.f2145me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.roles, valid.roles) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
+                return m.areEqual(this.guild, valid.guild) && m.areEqual(this.f2151me, valid.f2151me) && m.areEqual(this.permissions, valid.permissions) && m.areEqual(this.roles, valid.roles) && m.areEqual(this.rulesChannel, valid.rulesChannel) && m.areEqual(this.updatesChannel, valid.updatesChannel);
             }
 
             public final Guild getGuild() {
@@ -469,7 +469,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
             }
 
             public final MeUser getMe() {
-                return this.f2145me;
+                return this.f2151me;
             }
 
             public final Long getPermissions() {
@@ -492,7 +492,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                 Guild guild = this.guild;
                 int i = 0;
                 int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
-                MeUser meUser = this.f2145me;
+                MeUser meUser = this.f2151me;
                 int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
                 Long l = this.permissions;
                 int hashCode3 = (hashCode2 + (l != null ? l.hashCode() : 0)) * 31;
@@ -511,7 +511,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
                 StringBuilder L = a.L("Valid(guild=");
                 L.append(this.guild);
                 L.append(", me=");
-                L.append(this.f2145me);
+                L.append(this.f2151me);
                 L.append(", permissions=");
                 L.append(this.permissions);
                 L.append(", roles=");
@@ -661,7 +661,7 @@ public final class WidgetServerSettingsEnableCommunityViewModel extends AppViewM
         super(ViewState.Uninitialized.INSTANCE);
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.guildId = j;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetServerSettingsEnableCommunityViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java
index 678f9f0488..0e6414502f 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java
@@ -19,23 +19,23 @@ public final /* synthetic */ class MemberVerificationPendingDialog$binding$2 ext
 
     public final WidgetMemberVerificationPendingDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363835;
-        ImageView imageView = (ImageView) view.findViewById(2131363835);
+        int i = 2131363876;
+        ImageView imageView = (ImageView) view.findViewById(2131363876);
         if (imageView != null) {
-            i = 2131363836;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363836);
+            i = 2131363877;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363877);
             if (materialButton != null) {
-                i = 2131363847;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363847);
+                i = 2131363888;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363888);
                 if (materialButton2 != null) {
-                    i = 2131363849;
-                    TextView textView = (TextView) view.findViewById(2131363849);
+                    i = 2131363890;
+                    TextView textView = (TextView) view.findViewById(2131363890);
                     if (textView != null) {
-                        i = 2131364189;
-                        TextView textView2 = (TextView) view.findViewById(2131364189);
+                        i = 2131364233;
+                        TextView textView2 = (TextView) view.findViewById(2131364233);
                         if (textView2 != null) {
-                            i = 2131364190;
-                            TextView textView3 = (TextView) view.findViewById(2131364190);
+                            i = 2131364234;
+                            TextView textView3 = (TextView) view.findViewById(2131364234);
                             if (textView3 != null) {
                                 return new WidgetMemberVerificationPendingDialogBinding((RelativeLayout) view, imageView, materialButton, materialButton2, textView, textView2, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java
index 335d4f1668..461e578ace 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java
@@ -26,7 +26,7 @@ public final class MemberVerificationPendingDialog$onViewBoundOrOnResume$2 exten
     public final void invoke(MemberVerificationPendingViewModel.Event event) {
         m.checkNotNullParameter(event, "event");
         if (!(event instanceof MemberVerificationPendingViewModel.Event.Success) && (event instanceof MemberVerificationPendingViewModel.Event.Error)) {
-            c.a.d.o.i(this.this$0, 2131889850, 0, 4);
+            c.a.d.o.i(this.this$0, 2131889858, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java
index 96935b4a6b..6a9b7d9fff 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java
@@ -84,7 +84,7 @@ public final class MemberVerificationPendingDialog extends AppDialog {
     }
 
     public MemberVerificationPendingDialog() {
-        super(2131559085);
+        super(2131559091);
         MemberVerificationPendingDialog$viewModel$2 memberVerificationPendingDialog$viewModel$2 = new MemberVerificationPendingDialog$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(MemberVerificationPendingViewModel.class), new MemberVerificationPendingDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(memberVerificationPendingDialog$viewModel$2));
@@ -110,72 +110,72 @@ public final class MemberVerificationPendingDialog extends AppDialog {
         }
         textView.setVisibility(i);
         int themedColor = loaded.getDialogState().ordinal() != 3 ? ColorCompat.getThemedColor(getContext(), 2130969007) : ColorCompat.getColor(getContext(), 2131100324);
-        MaterialButton materialButton = getBinding().f1830c;
+        MaterialButton materialButton = getBinding().f1832c;
         m.checkNotNullExpressionValue(materialButton, "binding.memberVerificationPrimaryBtn");
         materialButton.setBackgroundTintList(ColorStateList.valueOf(themedColor));
         int ordinal = loaded.getDialogState().ordinal();
         if (ordinal == 0) {
-            getBinding().b.setImageResource(2131231529);
+            getBinding().b.setImageResource(2131231535);
             TextView textView2 = getBinding().g;
             m.checkNotNullExpressionValue(textView2, "binding.pendingDialogTitle");
-            textView2.setText(getString(2131891136));
+            textView2.setText(getString(2131891207));
             TextView textView3 = getBinding().f;
             m.checkNotNullExpressionValue(textView3, "binding.pendingDialogDesc");
-            textView3.setText(getString(2131891135));
-            MaterialButton materialButton2 = getBinding().f1830c;
+            textView3.setText(getString(2131891206));
+            MaterialButton materialButton2 = getBinding().f1832c;
             m.checkNotNullExpressionValue(materialButton2, "binding.memberVerificationPrimaryBtn");
-            materialButton2.setText(getString(2131891134));
+            materialButton2.setText(getString(2131891205));
             MaterialButton materialButton3 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton3, "binding.memberVerificationSecondaryBtn");
             materialButton3.setText(getString(2131887178));
-            getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this));
+            getBinding().f1832c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$9(this));
         } else if (ordinal == 1) {
-            getBinding().b.setImageResource(2131231733);
+            getBinding().b.setImageResource(2131231740);
             TextView textView4 = getBinding().g;
             m.checkNotNullExpressionValue(textView4, "binding.pendingDialogTitle");
-            textView4.setText(getString(2131891100));
+            textView4.setText(getString(2131891171));
             TextView textView5 = getBinding().f;
             m.checkNotNullExpressionValue(textView5, "binding.pendingDialogDesc");
-            textView5.setText(getString(2131891096));
-            MaterialButton materialButton4 = getBinding().f1830c;
+            textView5.setText(getString(2131891167));
+            MaterialButton materialButton4 = getBinding().f1832c;
             m.checkNotNullExpressionValue(materialButton4, "binding.memberVerificationPrimaryBtn");
-            materialButton4.setText(getString(2131891095));
+            materialButton4.setText(getString(2131891166));
             MaterialButton materialButton5 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton5, "binding.memberVerificationSecondaryBtn");
-            materialButton5.setText(getString(2131891094));
-            getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this));
+            materialButton5.setText(getString(2131891165));
+            getBinding().f1832c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$2(this));
             getBinding().e.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$3(this));
         } else if (ordinal == 2) {
             TextView textView6 = getBinding().g;
             m.checkNotNullExpressionValue(textView6, "binding.pendingDialogTitle");
-            textView6.setText(getString(2131891090));
+            textView6.setText(getString(2131891161));
             TextView textView7 = getBinding().f;
             m.checkNotNullExpressionValue(textView7, "binding.pendingDialogDesc");
-            textView7.setText(getString(2131891092));
-            MaterialButton materialButton6 = getBinding().f1830c;
+            textView7.setText(getString(2131891163));
+            MaterialButton materialButton6 = getBinding().f1832c;
             m.checkNotNullExpressionValue(materialButton6, "binding.memberVerificationPrimaryBtn");
-            materialButton6.setText(getString(2131891094));
+            materialButton6.setText(getString(2131891165));
             MaterialButton materialButton7 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton7, "binding.memberVerificationSecondaryBtn");
-            materialButton7.setText(getString(2131891097));
-            getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this));
+            materialButton7.setText(getString(2131891168));
+            getBinding().f1832c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$5(this));
         } else if (ordinal == 3) {
             TextView textView8 = getBinding().g;
             m.checkNotNullExpressionValue(textView8, "binding.pendingDialogTitle");
-            textView8.setText(getString(2131891093));
+            textView8.setText(getString(2131891164));
             TextView textView9 = getBinding().f;
             m.checkNotNullExpressionValue(textView9, "binding.pendingDialogDesc");
-            textView9.setText(getString(2131891092));
-            MaterialButton materialButton8 = getBinding().f1830c;
+            textView9.setText(getString(2131891163));
+            MaterialButton materialButton8 = getBinding().f1832c;
             m.checkNotNullExpressionValue(materialButton8, "binding.memberVerificationPrimaryBtn");
-            materialButton8.setText(getString(2131891098));
+            materialButton8.setText(getString(2131891169));
             MaterialButton materialButton9 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton9, "binding.memberVerificationSecondaryBtn");
-            materialButton9.setText(getString(2131891097));
-            getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this));
+            materialButton9.setText(getString(2131891168));
+            getBinding().f1832c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this));
             getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$7(this));
         }
     }
@@ -203,9 +203,9 @@ public final class MemberVerificationPendingDialog extends AppDialog {
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<MemberVerificationPendingViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), MemberVerificationPendingDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MemberVerificationPendingDialog$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<MemberVerificationPendingViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), MemberVerificationPendingDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MemberVerificationPendingDialog$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), MemberVerificationPendingDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MemberVerificationPendingDialog$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java
index f77cdba93b..d2476fe4cf 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingViewModel.java
@@ -63,9 +63,9 @@ public final class MemberVerificationPendingViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStores(long j) {
-            Observable<R> G = StoreStream.Companion.getMemberVerificationForms().observeMemberVerificationFormData(j).G(MemberVerificationPendingViewModel$Companion$observeStores$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "StoreStream\n          .g…d).map { StoreState(it) }");
-            return G;
+            Observable<R> F = StoreStream.Companion.getMemberVerificationForms().observeMemberVerificationFormData(j).F(MemberVerificationPendingViewModel$Companion$observeStores$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "StoreStream\n          .g…d).map { StoreState(it) }");
+            return F;
         }
     }
 
@@ -271,7 +271,7 @@ public final class MemberVerificationPendingViewModel extends AppViewModel<ViewS
         m.checkNotNullParameter(observable, "storeObservable");
         this.guildId = j;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), MemberVerificationPendingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java
index 9865cfed45..6ab1176fae 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java
@@ -11,7 +11,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.w4;
+import c.a.i.z4;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.discord.app.AppFragment;
@@ -59,7 +59,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ApproveTermsItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559080, memberVerificationRulesAdapter);
+            super(2131559086, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -90,7 +90,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559081, memberVerificationRulesAdapter);
+            super(2131559087, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -115,7 +115,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MultipleChoiceItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559082, memberVerificationRulesAdapter);
+            super(2131559088, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -134,10 +134,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
             for (String str : list) {
                 int indexOf = list.indexOf(str);
                 if (indexOf >= radioGroup.getChildCount()) {
-                    View inflate = LayoutInflater.from(context).inflate(2131559083, (ViewGroup) radioGroup, false);
+                    View inflate = LayoutInflater.from(context).inflate(2131559089, (ViewGroup) radioGroup, false);
                     Objects.requireNonNull(inflate, "rootView");
                     radioButton = (RadioButton) inflate;
-                    m.checkNotNullExpressionValue(new w4(radioButton), "WidgetMemberVerification…        false\n          )");
+                    m.checkNotNullExpressionValue(new z4(radioButton), "WidgetMemberVerification…        false\n          )");
                     m.checkNotNullExpressionValue(radioButton, "WidgetMemberVerification…   false\n          ).root");
                     radioGroup.addView(radioButton);
                 } else {
@@ -207,10 +207,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ParagraphItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559084, memberVerificationRulesAdapter);
+            super(2131559090, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363834);
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363875);
             if (textInputEditText != null) {
                 WidgetMemberVerificationParagraphItemBinding widgetMemberVerificationParagraphItemBinding = new WidgetMemberVerificationParagraphItemBinding((TextInputLayout) view, textInputEditText);
                 m.checkNotNullExpressionValue(widgetMemberVerificationParagraphItemBinding, "WidgetMemberVerification…temBinding.bind(itemView)");
@@ -219,7 +219,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
                 TextWatcherKt.addBindedTextWatcher(textInputEditText, memberVerificationRulesAdapter.getFragment(), new AnonymousClass1(this, memberVerificationRulesAdapter));
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363834)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363875)));
         }
 
         public static final /* synthetic */ int access$getFieldIndex$p(ParagraphItemHolder paragraphItemHolder) {
@@ -248,7 +248,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TermHeaderItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559081, memberVerificationRulesAdapter);
+            super(2131559087, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -265,7 +265,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullExpressionValue(textView, "binding.memberVerificationRulesHeader");
             View view = this.itemView;
             m.checkNotNullExpressionValue(view, "itemView");
-            textView.setText(view.getResources().getString(2131891069));
+            textView.setText(view.getResources().getString(2131891140));
         }
     }
 
@@ -275,20 +275,20 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TermItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559086, memberVerificationRulesAdapter);
+            super(2131559092, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363837;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363837);
+            int i = 2131363878;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363878);
             if (linearLayout != null) {
-                i = 2131363838;
-                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363838);
+                i = 2131363879;
+                SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363879);
                 if (simpleDraweeSpanTextView != null) {
-                    i = 2131363839;
-                    View findViewById = view.findViewById(2131363839);
+                    i = 2131363880;
+                    View findViewById = view.findViewById(2131363880);
                     if (findViewById != null) {
-                        i = 2131363840;
-                        TextView textView = (TextView) view.findViewById(2131363840);
+                        i = 2131363881;
+                        TextView textView = (TextView) view.findViewById(2131363881);
                         if (textView != null) {
                             RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view;
                             WidgetMemberVerificationRuleItemBinding widgetMemberVerificationRuleItemBinding = new WidgetMemberVerificationRuleItemBinding(roundedRelativeLayout, linearLayout, simpleDraweeSpanTextView, findViewById, textView, roundedRelativeLayout);
@@ -319,9 +319,9 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
             m.checkNotNullExpressionValue(context, "itemView.context");
             String format = StringUtilsKt.format(index, context);
             int i2 = 0;
-            textView.setText(b.h(resources, 2131891111, new Object[]{format}, null, 4));
+            textView.setText(b.h(resources, 2131891182, new Object[]{format}, null, 4));
             this.binding.b.setDraweeSpanStringBuilder(AstRenderer.render(memberVerificationItemTerm.getAst(), new MessageRenderContext(a.T(this.itemView, "itemView", "itemView.context"), 0, memberVerificationItemTerm.getAllowAnimatedEmojis(), null, memberVerificationItemTerm.getChannelNames(), memberVerificationItemTerm.getRoles(), 0, null, null, 0, 0, null, null, null, 16328, null)));
-            View view3 = this.binding.f1831c;
+            View view3 = this.binding.f1833c;
             m.checkNotNullExpressionValue(view3, "binding.memberVerificationRuleDivider");
             if (!(!memberVerificationItemTerm.isLastItem())) {
                 i2 = 8;
@@ -373,10 +373,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public TextInputItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) {
-            super(2131559088, memberVerificationRulesAdapter);
+            super(2131559094, memberVerificationRulesAdapter);
             m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter");
             View view = this.itemView;
-            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363851);
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363892);
             if (textInputEditText != null) {
                 WidgetMemberVerificationTextInputItemBinding widgetMemberVerificationTextInputItemBinding = new WidgetMemberVerificationTextInputItemBinding((TextInputLayout) view, textInputEditText);
                 m.checkNotNullExpressionValue(widgetMemberVerificationTextInputItemBinding, "WidgetMemberVerification…temBinding.bind(itemView)");
@@ -385,7 +385,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl
                 TextWatcherKt.addBindedTextWatcher(textInputEditText, memberVerificationRulesAdapter.getFragment(), new AnonymousClass1(this, memberVerificationRulesAdapter));
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363851)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363892)));
         }
 
         public static final /* synthetic */ int access$getFieldIndex$p(TextInputItemHolder textInputItemHolder) {
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java
index c127184937..63ab00e818 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class MemberVerificationSuccessDialog$binding$2 ext
 
     public final WidgetMemberVerificationSuccessBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363829;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363829);
+        int i = 2131363870;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363870);
         if (materialButton != null) {
-            i = 2131363832;
-            TextView textView = (TextView) view.findViewById(2131363832);
+            i = 2131363873;
+            TextView textView = (TextView) view.findViewById(2131363873);
             if (textView != null) {
-                i = 2131363848;
-                CardView cardView = (CardView) view.findViewById(2131363848);
+                i = 2131363889;
+                CardView cardView = (CardView) view.findViewById(2131363889);
                 if (cardView != null) {
                     return new WidgetMemberVerificationSuccessBinding((RelativeLayout) view, materialButton, textView, cardView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java
index 626211b53f..896d2df683 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java
@@ -39,7 +39,7 @@ public final class MemberVerificationSuccessDialog extends AppDialog {
     }
 
     public MemberVerificationSuccessDialog() {
-        super(2131559087);
+        super(2131559093);
     }
 
     private final WidgetMemberVerificationSuccessBinding getBinding() {
@@ -51,9 +51,9 @@ public final class MemberVerificationSuccessDialog extends AppDialog {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         String string = getArgumentsOrDefault().getString("INTENT_EXTRA_GUILD_NAME");
-        TextView textView = getBinding().f1832c;
+        TextView textView = getBinding().f1834c;
         m.checkNotNullExpressionValue(textView, "binding.memberVerificationGuildName");
-        textView.setText(b.j(this, 2131890902, new Object[]{string}, null, 4));
+        textView.setText(b.j(this, 2131890972, new Object[]{string}, null, 4));
         getBinding().b.setOnClickListener(new MemberVerificationSuccessDialog$onViewBound$1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java
index c7c19b2b04..01416aa2cc 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java
@@ -31,17 +31,17 @@ public final class MemberVerificationView extends CardView {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
         LayoutInflater.from(context).inflate(2131558761, this);
-        int i2 = 2131363852;
-        TextView textView = (TextView) findViewById(2131363852);
+        int i2 = 2131363893;
+        TextView textView = (TextView) findViewById(2131363893);
         if (textView != null) {
-            i2 = 2131363853;
-            MaterialButton materialButton = (MaterialButton) findViewById(2131363853);
+            i2 = 2131363894;
+            MaterialButton materialButton = (MaterialButton) findViewById(2131363894);
             if (materialButton != null) {
-                i2 = 2131363854;
-                ImageView imageView = (ImageView) findViewById(2131363854);
+                i2 = 2131363895;
+                ImageView imageView = (ImageView) findViewById(2131363895);
                 if (imageView != null) {
-                    i2 = 2131363855;
-                    TextView textView2 = (TextView) findViewById(2131363855);
+                    i2 = 2131363896;
+                    TextView textView2 = (TextView) findViewById(2131363896);
                     if (textView2 != null) {
                         ViewMemberVerificationBinding viewMemberVerificationBinding = new ViewMemberVerificationBinding(this, textView, materialButton, imageView, textView2);
                         m.checkNotNullExpressionValue(viewMemberVerificationBinding, "ViewMemberVerificationBi…ater.from(context), this)");
@@ -71,12 +71,12 @@ public final class MemberVerificationView extends CardView {
     public final void configure(@DrawableRes int i, @StringRes int i2, boolean z2, Function0<Unit> function0) {
         this.binding.d.setImageResource(i);
         this.binding.e.setText(i2);
-        this.binding.f1655c.setOnClickListener(new MemberVerificationView$configure$1(function0));
+        this.binding.f1652c.setOnClickListener(new MemberVerificationView$configure$1(function0));
         TextView textView = this.binding.b;
         m.checkNotNullExpressionValue(textView, "binding.memberVerificationVerifiedCheck");
         int i3 = 0;
         textView.setVisibility(z2 ? 0 : 8);
-        MaterialButton materialButton = this.binding.f1655c;
+        MaterialButton materialButton = this.binding.f1652c;
         m.checkNotNullExpressionValue(materialButton, "binding.memberVerificationVerifyButton");
         if (!(!z2)) {
             i3 = 8;
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java
index 1e5bc799d4..6ce29249eb 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java
@@ -27,29 +27,29 @@ public final /* synthetic */ class WidgetMemberVerification$binding$2 extends k
         int i = 2131361967;
         CustomAppBarLayout customAppBarLayout = (CustomAppBarLayout) view.findViewById(2131361967);
         if (customAppBarLayout != null) {
-            i = 2131362635;
-            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362635);
+            i = 2131362659;
+            CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362659);
             if (collapsingToolbarLayout != null) {
-                i = 2131362896;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                i = 2131362921;
+                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                 if (dimmerView != null) {
-                    i = 2131363828;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363828);
+                    i = 2131363869;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363869);
                     if (simpleDraweeView != null) {
-                        i = 2131363830;
-                        MemberVerificationView memberVerificationView = (MemberVerificationView) view.findViewById(2131363830);
+                        i = 2131363871;
+                        MemberVerificationView memberVerificationView = (MemberVerificationView) view.findViewById(2131363871);
                         if (memberVerificationView != null) {
-                            i = 2131363831;
-                            MemberVerificationAvatarView memberVerificationAvatarView = (MemberVerificationAvatarView) view.findViewById(2131363831);
+                            i = 2131363872;
+                            MemberVerificationAvatarView memberVerificationAvatarView = (MemberVerificationAvatarView) view.findViewById(2131363872);
                             if (memberVerificationAvatarView != null) {
-                                i = 2131363843;
-                                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363843);
+                                i = 2131363884;
+                                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363884);
                                 if (loadingButton != null) {
-                                    i = 2131363845;
-                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363845);
+                                    i = 2131363886;
+                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363886);
                                     if (recyclerView != null) {
-                                        i = 2131363846;
-                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363846);
+                                        i = 2131363887;
+                                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363887);
                                         if (nestedScrollView != null) {
                                             return new WidgetMemberVerificationBinding((CoordinatorLayout) view, customAppBarLayout, collapsingToolbarLayout, dimmerView, simpleDraweeView, memberVerificationView, memberVerificationAvatarView, loadingButton, recyclerView, nestedScrollView);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java
index 877c8f9bd1..5d2672bb65 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java
@@ -38,7 +38,7 @@ public final class WidgetMemberVerification$onViewBoundOrOnResume$2 extends o im
                 MemberVerificationPendingDialog.Companion.enqueue(success.getGuildId().longValue(), success.getGuildName());
             }
         } else if (event instanceof WidgetMemberVerificationViewModel.Event.Error) {
-            c.a.d.o.i(this.this$0, 2131889850, 0, 4);
+            c.a.d.o.i(this.this$0, 2131889858, 0, 4);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java
index 64fef7f0c7..25f03bad62 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java
@@ -100,7 +100,7 @@ public final class WidgetMemberVerification extends AppFragment {
     }
 
     public WidgetMemberVerification() {
-        super(2131559079);
+        super(2131559085);
         WidgetMemberVerification$viewModel$2 widgetMemberVerification$viewModel$2 = new WidgetMemberVerification$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetMemberVerificationViewModel.class), new WidgetMemberVerification$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMemberVerification$viewModel$2));
@@ -137,7 +137,7 @@ public final class WidgetMemberVerification extends AppFragment {
         RecyclerView recyclerView = getBinding().g;
         m.checkNotNullExpressionValue(recyclerView, "binding.memberVerificationRulesRecycler");
         recyclerView.setVisibility(loaded.isRulesListVisible() ? 0 : 8);
-        SimpleDraweeView simpleDraweeView = getBinding().f1829c;
+        SimpleDraweeView simpleDraweeView = getBinding().f1831c;
         IconUtils iconUtils = IconUtils.INSTANCE;
         Guild guild = loaded.getGuild();
         Resources resources = getResources();
@@ -150,7 +150,7 @@ public final class WidgetMemberVerification extends AppFragment {
         if (guild2 == null || !guild2.hasIcon()) {
             z2 = false;
         }
-        TextView textView = memberVerificationAvatarView.i.f126c;
+        TextView textView = memberVerificationAvatarView.i.f124c;
         m.checkNotNullExpressionValue(textView, "binding.memberVerificationText");
         if (!(!z2)) {
             i = 8;
@@ -160,11 +160,11 @@ public final class WidgetMemberVerification extends AppFragment {
             SimpleDraweeView simpleDraweeView2 = memberVerificationAvatarView.i.b;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.memberVerificationAvatar");
             IconUtils.setIcon$default(simpleDraweeView2, IconUtils.getForGuild$default(guild2, null, false, null, 14, null), 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
-            TextView textView2 = memberVerificationAvatarView.i.f126c;
+            TextView textView2 = memberVerificationAvatarView.i.f124c;
             m.checkNotNullExpressionValue(textView2, "binding.memberVerificationText");
             textView2.setText("");
         } else {
-            TextView textView3 = memberVerificationAvatarView.i.f126c;
+            TextView textView3 = memberVerificationAvatarView.i.f124c;
             m.checkNotNullExpressionValue(textView3, "binding.memberVerificationText");
             if (guild2 != null) {
                 str = guild2.getShortName();
@@ -181,7 +181,7 @@ public final class WidgetMemberVerification extends AppFragment {
 
     private final void configureUI(WidgetMemberVerificationViewModel.ViewState viewState) {
         if (viewState instanceof WidgetMemberVerificationViewModel.ViewState.Invalid) {
-            o.i(this, 2131888049, 0, 4);
+            o.i(this, 2131888048, 0, 4);
             requireActivity().finish();
         } else if (viewState instanceof WidgetMemberVerificationViewModel.ViewState.Loaded) {
             configureLoadedUI((WidgetMemberVerificationViewModel.ViewState.Loaded) viewState);
@@ -207,9 +207,9 @@ public final class WidgetMemberVerification extends AppFragment {
         if (verificationType != null) {
             int ordinal = verificationType.ordinal();
             if (ordinal == 0) {
-                getBinding().d.configure(2131231829, 2131891064, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$2(this));
+                getBinding().d.configure(2131231837, 2131891135, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$2(this));
             } else if (ordinal == 1) {
-                getBinding().d.configure(2131231570, 2131891059, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$1(this));
+                getBinding().d.configure(2131231576, 2131891130, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$1(this));
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java
index 2012582add..19fa8d733e 100644
--- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java
@@ -217,7 +217,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         private final Guild guild;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2146me;
+        private final MeUser f2152me;
         private final StoreGuildMemberVerificationForm.MemberVerificationFormData memberVerificationFormData;
         private final Map<Long, GuildRole> roles;
 
@@ -225,7 +225,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(map, "channels");
             m.checkNotNullParameter(map2, "roles");
-            this.f2146me = meUser;
+            this.f2152me = meUser;
             this.guild = guild;
             this.memberVerificationFormData = memberVerificationFormData;
             this.channels = map;
@@ -237,7 +237,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         /* JADX WARN: Multi-variable type inference failed */
         public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, Guild guild, StoreGuildMemberVerificationForm.MemberVerificationFormData memberVerificationFormData, Map map, Map map2, boolean z2, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = storeState.f2146me;
+                meUser = storeState.f2152me;
             }
             if ((i & 2) != 0) {
                 guild = storeState.guild;
@@ -258,7 +258,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         }
 
         public final MeUser component1() {
-            return this.f2146me;
+            return this.f2152me;
         }
 
         public final Guild component2() {
@@ -296,7 +296,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.f2146me, storeState.f2146me) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.memberVerificationFormData, storeState.memberVerificationFormData) && m.areEqual(this.channels, storeState.channels) && m.areEqual(this.roles, storeState.roles) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis;
+            return m.areEqual(this.f2152me, storeState.f2152me) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.memberVerificationFormData, storeState.memberVerificationFormData) && m.areEqual(this.channels, storeState.channels) && m.areEqual(this.roles, storeState.roles) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis;
         }
 
         public final boolean getAllowAnimatedEmojis() {
@@ -312,7 +312,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         }
 
         public final MeUser getMe() {
-            return this.f2146me;
+            return this.f2152me;
         }
 
         public final StoreGuildMemberVerificationForm.MemberVerificationFormData getMemberVerificationFormData() {
@@ -324,7 +324,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2146me;
+            MeUser meUser = this.f2152me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             Guild guild = this.guild;
@@ -350,7 +350,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
 
         public String toString() {
             StringBuilder L = a.L("StoreState(me=");
-            L.append(this.f2146me);
+            L.append(this.f2152me);
             L.append(", guild=");
             L.append(this.guild);
             L.append(", memberVerificationFormData=");
@@ -703,7 +703,7 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         this.inviteGuild = guild;
         this.restAPI = restAPI;
         this.rulesParser = parser;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.formUserInputDataMap = new HashMap();
         AnalyticsTracker.openModal("Membership Gating", str, Long.valueOf(j));
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetMemberVerificationViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java
index 9c1da522c2..1c55a65b28 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.java
@@ -13,7 +13,7 @@ public final class PremiumGuildSubscriptionPerkView$configure$1 extends o implem
 
     public final int invoke(@DrawableRes int i, boolean z2) {
         if (z2) {
-            return 2131231504;
+            return 2131231510;
         }
         return i;
     }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java
index 6c04407c1a..962b4af499 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java
@@ -66,10 +66,10 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout {
 
     private final void initialize() {
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = this.binding.f1657c;
+        RecyclerView recyclerView = this.binding.f1654c;
         m.checkNotNullExpressionValue(recyclerView, "binding.perksLevelContentsRecycler");
         this.adapter = (PremiumGuildSubscriptionPerkViewAdapter) companion.configure(new PremiumGuildSubscriptionPerkViewAdapter(recyclerView));
-        this.binding.f1657c.addOnItemTouchListener(new PremiumGuildSubscriptionPerkView$initialize$1());
+        this.binding.f1654c.addOnItemTouchListener(new PremiumGuildSubscriptionPerkView$initialize$1());
     }
 
     public final void configure(int i, int i2) {
@@ -77,15 +77,15 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout {
         PremiumGuildSubscriptionPerkView$configure$1 premiumGuildSubscriptionPerkView$configure$1 = PremiumGuildSubscriptionPerkView$configure$1.INSTANCE;
         boolean z2 = i2 >= i;
         if (z2) {
-            this.binding.d.setBackgroundResource(2131231021);
+            this.binding.d.setBackgroundResource(2131231026);
         } else {
             this.binding.d.setBackgroundColor(ColorCompat.getThemedColor(this, 2130969896));
         }
         int i3 = i != 1 ? i != 2 ? i != 3 ? 0 : 30 : 15 : 2;
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.perksLevelHeaderText");
-        b.n(textView, i != 1 ? i != 2 ? i != 3 ? 0 : 2131889732 : 2131889731 : 2131889730, new Object[0], null, 4);
-        int i4 = i != 1 ? i != 2 ? i != 3 ? 0 : z2 ? 2131231819 : 2131231820 : z2 ? 2131231817 : 2131231818 : z2 ? 2131231815 : 2131231816;
+        b.m(textView, i != 1 ? i != 2 ? i != 3 ? 0 : 2131889740 : 2131889739 : 2131889738, new Object[0], null, 4);
+        int i4 = i != 1 ? i != 2 ? i != 3 ? 0 : z2 ? 2131231827 : 2131231828 : z2 ? 2131231825 : 2131231826 : z2 ? 2131231823 : 2131231824;
         TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.perksLevelHeaderText");
         DrawableCompat.setCompoundDrawablesCompat$default(textView2, i4, 0, 0, 0, 14, (Object) null);
@@ -109,21 +109,21 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout {
         cardView.setVisibility(i5);
         TextView textView5 = this.binding.b;
         m.checkNotNullExpressionValue(textView5, "binding.perksLevelContentsHeader");
-        b.n(textView5, i != 1 ? 2131889728 : 2131889726, new Object[0], null, 4);
+        b.m(textView5, i != 1 ? 2131889736 : 2131889734, new Object[0], null, 4);
         if (i == 1) {
-            int invoke = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231931, z2);
+            int invoke = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231939, z2);
             PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
-            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke, b.i(this, 2131889723, new Object[]{50, Integer.valueOf(premiumUtils.getGuildEmojiMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889724, new Object[]{15, Integer.valueOf(premiumUtils.getGuildStickerMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231682, z2), b.i(this, 2131889722, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231782, z2), b.i(this, 2131889716, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231707, z2), b.i(this, 2131889717, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231671, z2), b.i(this, 2131889718, new Object[0], null, 4)));
+            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke, b.i(this, 2131889731, new Object[]{50, Integer.valueOf(premiumUtils.getGuildEmojiMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231973, z2), b.i(this, 2131889732, new Object[]{15, Integer.valueOf(premiumUtils.getGuildStickerMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231688, z2), b.i(this, 2131889730, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231790, z2), b.i(this, 2131889724, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231714, z2), b.i(this, 2131889725, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231677, z2), b.i(this, 2131889726, new Object[0], null, 4)));
         } else if (i == 2) {
-            int invoke2 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231931, z2);
+            int invoke2 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231939, z2);
             PremiumUtils premiumUtils2 = PremiumUtils.INSTANCE;
-            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke2, b.i(this, 2131889723, new Object[]{50, Integer.valueOf(premiumUtils2.getGuildEmojiMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889724, new Object[]{15, Integer.valueOf(premiumUtils2.getGuildStickerMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231682, z2), b.i(this, 2131889722, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232008, z2), b.i(this, 2131889725, new Object[]{b.i(this, 2131888509, new Object[]{Integer.valueOf(premiumUtils2.getGuildMaxFileSizeMB(2))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231707, z2), b.i(this, 2131889719, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231671, z2), b.i(this, 2131889720, new Object[0], null, 4)));
+            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke2, b.i(this, 2131889731, new Object[]{50, Integer.valueOf(premiumUtils2.getGuildEmojiMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231973, z2), b.i(this, 2131889732, new Object[]{15, Integer.valueOf(premiumUtils2.getGuildStickerMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231688, z2), b.i(this, 2131889730, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232016, z2), b.i(this, 2131889733, new Object[]{b.i(this, 2131888510, new Object[]{Integer.valueOf(premiumUtils2.getGuildMaxFileSizeMB(2))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231714, z2), b.i(this, 2131889727, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231677, z2), b.i(this, 2131889728, new Object[0], null, 4)));
         } else if (i != 3) {
             list = new ArrayList();
         } else {
-            int invoke3 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231931, z2);
+            int invoke3 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231939, z2);
             PremiumUtils premiumUtils3 = PremiumUtils.INSTANCE;
-            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke3, b.i(this, 2131889723, new Object[]{100, Integer.valueOf(premiumUtils3.getGuildEmojiMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889724, new Object[]{30, Integer.valueOf(premiumUtils3.getGuildStickerMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231682, z2), b.i(this, 2131889722, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232008, z2), b.i(this, 2131889725, new Object[]{b.i(this, 2131888509, new Object[]{Integer.valueOf(premiumUtils3.getGuildMaxFileSizeMB(3))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231957, z2), b.i(this, 2131889721, new Object[0], null, 4)));
+            list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke3, b.i(this, 2131889731, new Object[]{100, Integer.valueOf(premiumUtils3.getGuildEmojiMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231973, z2), b.i(this, 2131889732, new Object[]{30, Integer.valueOf(premiumUtils3.getGuildStickerMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231688, z2), b.i(this, 2131889730, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232016, z2), b.i(this, 2131889733, new Object[]{b.i(this, 2131888510, new Object[]{Integer.valueOf(premiumUtils3.getGuildMaxFileSizeMB(3))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889729, new Object[0], null, 4)));
         }
         if (!StickerPickerFeatureFlag.Companion.getINSTANCE().isEnabled() && list.size() >= 2) {
             list.remove(1);
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java
index 31eb20f179..bec57cf429 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildTransferInProgressViewModel.java
@@ -506,8 +506,8 @@ public final class PremiumGuildTransferInProgressViewModel extends AppViewModel<
     @MainThread
     public final void transferPremiumGuildSubscription() {
         handlePremiumGuildSubscriptionStarted();
-        Observable<R> A = this.restAPI.unsubscribeToGuild(this.previousGuildId, this.subscriptionId).A(new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1(this));
-        m.checkNotNullExpressionValue(A, "restAPI\n        .unsubsc…              )\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(A, false, 1, null), this, null, 2, null), PremiumGuildTransferInProgressViewModel.class, (Context) null, (Function1) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2(this), (Function0) null, (Function0) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3(this), 54, (Object) null);
+        Observable<R> z2 = this.restAPI.unsubscribeToGuild(this.previousGuildId, this.subscriptionId).z(new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$1(this));
+        m.checkNotNullExpressionValue(z2, "restAPI\n        .unsubsc…              )\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(z2, false, 1, null), this, null, 2, null), PremiumGuildTransferInProgressViewModel.class, (Context) null, (Function1) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$2(this), (Function0) null, (Function0) null, new PremiumGuildTransferInProgressViewModel$transferPremiumGuildSubscription$3(this), 54, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
index 70e7a3412c..5f0973d102 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java
@@ -663,7 +663,7 @@ public final class PremiumGuildViewModel extends AppViewModel<ViewState> {
         this.storePremiumGuildSubscription = storePremiumGuildSubscription;
         this.storeSubscriptions = storeSubscriptions;
         this.clock = clock;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         fetchData();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), PremiumGuildViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -753,15 +753,15 @@ public final class PremiumGuildViewModel extends AppViewModel<ViewState> {
             ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List<? extends Object>) loaded.getSubscriptions());
             if (modelSubscription == null || modelSubscription.isGoogleSubscription()) {
                 if ((modelSubscription != null ? modelSubscription.getRenewalMutations() : null) != null) {
-                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892125, 2131892123));
+                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892196, 2131892194));
                     return;
                 }
                 if ((modelSubscription != null ? modelSubscription.getStatus() : null) == ModelSubscription.Status.CANCELED) {
-                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892125, 2131892122));
+                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892196, 2131892193));
                     return;
                 }
                 if ((modelSubscription != null ? modelSubscription.getStatus() : null) == ModelSubscription.Status.ACCOUNT_HOLD) {
-                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892121, 2131892120));
+                    this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892192, 2131892191));
                     return;
                 }
                 List<Purchase> purchases = loaded.getPurchases();
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java
index 0da82809a8..7c3d91f378 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java
@@ -8,7 +8,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import c.a.i.l2;
+import c.a.i.n2;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerBoostStatusBinding;
 import com.discord.utilities.simple_pager.SimplePager;
@@ -29,76 +29,76 @@ public final /* synthetic */ class WidgetPremiumGuildSubscription$binding$2 exte
 
     public final WidgetServerBoostStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362128;
-        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362128);
+        int i = 2131362139;
+        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362139);
         if (appViewFlipper != null) {
-            i = 2131362129;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362129);
+            i = 2131362140;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362140);
             if (linkifiedTextView != null) {
-                i = 2131362130;
-                TextView textView = (TextView) view.findViewById(2131362130);
+                i = 2131362141;
+                TextView textView = (TextView) view.findViewById(2131362141);
                 if (textView != null) {
-                    i = 2131362131;
-                    PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131362131);
+                    i = 2131362142;
+                    PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131362142);
                     if (premiumSubscriptionMarketingView != null) {
-                        i = 2131362132;
-                        PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131362132);
+                        i = 2131362143;
+                        PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131362143);
                         if (premiumGuildSubscriptionUpsellView != null) {
-                            i = 2131362133;
-                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362133);
+                            i = 2131362144;
+                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362144);
                             if (linkifiedTextView2 != null) {
-                                i = 2131362134;
-                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362134);
+                                i = 2131362145;
+                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362145);
                                 if (materialButton != null) {
-                                    i = 2131362135;
-                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362135);
+                                    i = 2131362146;
+                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362146);
                                     if (materialButton2 != null) {
-                                        i = 2131362136;
-                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362136);
+                                        i = 2131362147;
+                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362147);
                                         if (materialButton3 != null) {
-                                            i = 2131362137;
-                                            SimplePager simplePager = (SimplePager) view.findViewById(2131362137);
+                                            i = 2131362148;
+                                            SimplePager simplePager = (SimplePager) view.findViewById(2131362148);
                                             if (simplePager != null) {
-                                                i = 2131364353;
-                                                View findViewById = view.findViewById(2131364353);
+                                                i = 2131364391;
+                                                View findViewById = view.findViewById(2131364391);
                                                 if (findViewById != null) {
-                                                    int i2 = 2131362111;
-                                                    ProgressBar progressBar = (ProgressBar) findViewById.findViewById(2131362111);
+                                                    int i2 = 2131362122;
+                                                    ProgressBar progressBar = (ProgressBar) findViewById.findViewById(2131362122);
                                                     if (progressBar != null) {
-                                                        i2 = 2131362112;
-                                                        FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(2131362112);
+                                                        i2 = 2131362123;
+                                                        FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(2131362123);
                                                         if (frameLayout != null) {
-                                                            i2 = 2131362113;
-                                                            ImageView imageView = (ImageView) findViewById.findViewById(2131362113);
+                                                            i2 = 2131362124;
+                                                            ImageView imageView = (ImageView) findViewById.findViewById(2131362124);
                                                             if (imageView != null) {
-                                                                i2 = 2131362114;
-                                                                LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(2131362114);
+                                                                i2 = 2131362125;
+                                                                LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(2131362125);
                                                                 if (linearLayout != null) {
-                                                                    i2 = 2131362115;
-                                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(2131362115);
+                                                                    i2 = 2131362126;
+                                                                    ImageView imageView2 = (ImageView) findViewById.findViewById(2131362126);
                                                                     if (imageView2 != null) {
-                                                                        i2 = 2131362116;
-                                                                        TextView textView2 = (TextView) findViewById.findViewById(2131362116);
+                                                                        i2 = 2131362127;
+                                                                        TextView textView2 = (TextView) findViewById.findViewById(2131362127);
                                                                         if (textView2 != null) {
-                                                                            i2 = 2131362117;
-                                                                            LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(2131362117);
+                                                                            i2 = 2131362128;
+                                                                            LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(2131362128);
                                                                             if (linearLayout2 != null) {
-                                                                                i2 = 2131362118;
-                                                                                ImageView imageView3 = (ImageView) findViewById.findViewById(2131362118);
+                                                                                i2 = 2131362129;
+                                                                                ImageView imageView3 = (ImageView) findViewById.findViewById(2131362129);
                                                                                 if (imageView3 != null) {
-                                                                                    i2 = 2131362119;
-                                                                                    TextView textView3 = (TextView) findViewById.findViewById(2131362119);
+                                                                                    i2 = 2131362130;
+                                                                                    TextView textView3 = (TextView) findViewById.findViewById(2131362130);
                                                                                     if (textView3 != null) {
-                                                                                        i2 = 2131362120;
-                                                                                        LinearLayout linearLayout3 = (LinearLayout) findViewById.findViewById(2131362120);
+                                                                                        i2 = 2131362131;
+                                                                                        LinearLayout linearLayout3 = (LinearLayout) findViewById.findViewById(2131362131);
                                                                                         if (linearLayout3 != null) {
-                                                                                            i2 = 2131362121;
-                                                                                            ImageView imageView4 = (ImageView) findViewById.findViewById(2131362121);
+                                                                                            i2 = 2131362132;
+                                                                                            ImageView imageView4 = (ImageView) findViewById.findViewById(2131362132);
                                                                                             if (imageView4 != null) {
-                                                                                                i2 = 2131362122;
-                                                                                                TextView textView4 = (TextView) findViewById.findViewById(2131362122);
+                                                                                                i2 = 2131362133;
+                                                                                                TextView textView4 = (TextView) findViewById.findViewById(2131362133);
                                                                                                 if (textView4 != null) {
-                                                                                                    return new WidgetServerBoostStatusBinding((CoordinatorLayout) view, appViewFlipper, linkifiedTextView, textView, premiumSubscriptionMarketingView, premiumGuildSubscriptionUpsellView, linkifiedTextView2, materialButton, materialButton2, materialButton3, simplePager, new l2((ConstraintLayout) findViewById, progressBar, frameLayout, imageView, linearLayout, imageView2, textView2, linearLayout2, imageView3, textView3, linearLayout3, imageView4, textView4));
+                                                                                                    return new WidgetServerBoostStatusBinding((CoordinatorLayout) view, appViewFlipper, linkifiedTextView, textView, premiumSubscriptionMarketingView, premiumGuildSubscriptionUpsellView, linkifiedTextView2, materialButton, materialButton2, materialButton3, simplePager, new n2((ConstraintLayout) findViewById, progressBar, frameLayout, imageView, linearLayout, imageView2, textView2, linearLayout2, imageView3, textView3, linearLayout3, imageView4, textView4));
                                                                                                 }
                                                                                             }
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java
index cf40de4820..32eac11279 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java
@@ -11,7 +11,7 @@ public final class WidgetPremiumGuildSubscription$onViewBound$2<T1, T2> implemen
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363896) {
+        if (menuItem.getItemId() == 2131363937) {
             WidgetSettingsPremiumGuildSubscription.Companion companion = WidgetSettingsPremiumGuildSubscription.Companion;
             m.checkNotNullExpressionValue(context, "context");
             companion.launch(context);
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
index 191c009f8a..4b619ce0c4 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java
@@ -154,7 +154,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
     }
 
     public WidgetPremiumGuildSubscription() {
-        super(2131559132);
+        super(2131559138);
         WidgetPremiumGuildSubscription$viewModel$2 widgetPremiumGuildSubscription$viewModel$2 = new WidgetPremiumGuildSubscription$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildViewModel.class), new WidgetPremiumGuildSubscription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscription$viewModel$2));
@@ -225,8 +225,8 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
         ProgressBar progressBar2 = getBinding().l.b;
         m.checkNotNullExpressionValue(progressBar2, "binding.progress.boostBarProgressBar");
         boolean z2 = false;
-        progressBar2.setContentDescription(getString(i != 0 ? i != 1 ? i != 2 ? i != 3 ? 0 : 2131892156 : 2131892155 : 2131892154 : 2131892009));
-        ImageView imageView = getBinding().l.f123c;
+        progressBar2.setContentDescription(getString(i != 0 ? i != 1 ? i != 2 ? i != 3 ? 0 : 2131892227 : 2131892226 : 2131892225 : 2131892080));
+        ImageView imageView = getBinding().l.f132c;
         m.checkNotNullExpressionValue(imageView, "binding.progress.boostBarTier0Iv");
         imageView.setEnabled(i2 > 0);
         ImageView imageView2 = getBinding().l.d;
@@ -244,7 +244,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131892026);
+        setActionBarTitle(2131892097);
         setActionBarSubtitle(str);
     }
 
@@ -276,7 +276,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             m.checkNotNullExpressionValue(textView, "binding.boostStatusNumBoosts");
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            textView.setText(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755244, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
+            textView.setText(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755245, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
         }
     }
 
@@ -339,7 +339,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, getString(2131892125), b.j(this, 2131892124, new Object[]{f.a.a(360055386693L, null)}, null, 4), getString(2131892096), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+            WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, getString(2131892196), b.j(this, 2131892195, new Object[]{f.a.a(360055386693L, null)}, null, 4), getString(2131892167), null, null, null, null, null, null, null, null, 0, null, 16368, null);
         } else if (event instanceof PremiumGuildViewModel.Event.UnacknowledgedPurchase) {
             o.i(this, 2131886888, 0, 4);
             GooglePlayBillingManager.INSTANCE.queryPurchases();
@@ -351,7 +351,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
             String string = getString(showBlockedPlanSwitchAlertDialog.getHeaderStringRes());
             String string2 = getString(showBlockedPlanSwitchAlertDialog.getBodyStringRes());
             m.checkNotNullExpressionValue(string2, "getString(event.bodyStringRes)");
-            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager2, string, string2, getString(2131886914), getString(2131887178), g0.mapOf(d0.o.to(2131364032, new WidgetPremiumGuildSubscription$handleEvent$1(this))), null, null, null, null, null, null, 0, null, 16320, null);
+            WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager2, string, string2, getString(2131886914), getString(2131887178), g0.mapOf(d0.o.to(2131364075, new WidgetPremiumGuildSubscription$handleEvent$1(this))), null, null, null, null, null, null, 0, null, 16320, null);
         }
     }
 
@@ -371,14 +371,14 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
         simplePager.setAdapter(perksPagerAdapter);
         getBinding().k.addOnPageChangeListener(new WidgetPremiumGuildSubscription$onViewBound$1(this));
         AppFragment.setActionBarOptionsMenu$default(this, 2131623957, WidgetPremiumGuildSubscription$onViewBound$2.INSTANCE, null, 4, null);
-        LinkifiedTextView linkifiedTextView = getBinding().f1861c;
+        LinkifiedTextView linkifiedTextView = getBinding().f1863c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.boostStatusLearnMore");
-        b.m(linkifiedTextView, 2131892018, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE);
-        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755246, 2, 2);
+        b.l(linkifiedTextView, 2131892089, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE);
+        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755247, 2, 2);
         LinkifiedTextView linkifiedTextView2 = getBinding().g;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.boostStatusProtip");
-        b.m(linkifiedTextView2, 2131892032, new Object[]{i18nPluralString}, new WidgetPremiumGuildSubscription$onViewBound$4(this));
-        ImageView imageView = getBinding().l.f123c;
+        b.l(linkifiedTextView2, 2131892103, new Object[]{i18nPluralString}, new WidgetPremiumGuildSubscription$onViewBound$4(this));
+        ImageView imageView = getBinding().l.f132c;
         m.checkNotNullExpressionValue(imageView, "binding.progress.boostBarTier0Iv");
         ImageView imageView2 = getBinding().l.d;
         m.checkNotNullExpressionValue(imageView2, "binding.progress.boostBarTier1Iv");
@@ -400,9 +400,9 @@ public final class WidgetPremiumGuildSubscription extends AppFragment {
         if ((getGuildId() == 0 || getGuildId() == -1) && (appActivity = getAppActivity()) != null) {
             appActivity.finish();
         }
-        Observable<PremiumGuildViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetPremiumGuildSubscription.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<PremiumGuildViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetPremiumGuildSubscription.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetPremiumGuildSubscription.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscription$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java
index 8ed430776e..282e490237 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$binding$2.java
@@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetPremiumGuildSubscriptionConfirmation$bi
 
     public final WidgetServerBoostConfirmationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362123;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362123);
+        int i = 2131362134;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362134);
         if (linearLayout != null) {
-            i = 2131362124;
-            PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131362124);
+            i = 2131362135;
+            PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131362135);
             if (premiumGuildConfirmationView != null) {
-                i = 2131362125;
-                TextView textView = (TextView) view.findViewById(2131362125);
+                i = 2131362136;
+                TextView textView = (TextView) view.findViewById(2131362136);
                 if (textView != null) {
-                    i = 2131362126;
-                    TextView textView2 = (TextView) view.findViewById(2131362126);
+                    i = 2131362137;
+                    TextView textView2 = (TextView) view.findViewById(2131362137);
                     if (textView2 != null) {
-                        i = 2131362127;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362127);
+                        i = 2131362138;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362138);
                         if (materialButton != null) {
-                            i = 2131362896;
-                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                            i = 2131362921;
+                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                             if (dimmerView != null) {
                                 return new WidgetServerBoostConfirmationBinding((CoordinatorLayout) view, linearLayout, premiumGuildConfirmationView, textView, textView2, materialButton, dimmerView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
index 9fac3426c8..d324ad7080 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java
@@ -7,7 +7,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
-import c.a.a.d.c;
+import c.a.a.c.c;
 import c.a.d.h0;
 import c.a.d.j0;
 import c.a.d.l;
@@ -76,7 +76,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
     }
 
     public WidgetPremiumGuildSubscriptionConfirmation() {
-        super(2131559131);
+        super(2131559137);
         WidgetPremiumGuildSubscriptionConfirmation$viewModel$2 widgetPremiumGuildSubscriptionConfirmation$viewModel$2 = new WidgetPremiumGuildSubscriptionConfirmation$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildSubscriptionInProgressViewModel.class), new WidgetPremiumGuildSubscriptionConfirmation$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscriptionConfirmation$viewModel$2));
@@ -105,7 +105,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
     }
 
     private final void configureToolbar(String str) {
-        setActionBarTitle(2131892026);
+        setActionBarTitle(2131892097);
         setActionBarSubtitle(str);
     }
 
@@ -173,9 +173,9 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
         if ((getGuildId() == 0 || getGuildId() == -1) && (appActivity = getAppActivity()) != null) {
             appActivity.finish();
         }
-        Observable s2 = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, WidgetPremiumGuildSubscriptionConfirmation.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscriptionConfirmation$onResume$1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, WidgetPremiumGuildSubscriptionConfirmation.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscriptionConfirmation$onResume$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppFragment
@@ -186,11 +186,11 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen
         getBinding().e.setOnClickListener(new WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1(this));
         MaterialButton materialButton = getBinding().e;
         m.checkNotNullExpressionValue(materialButton, "binding.boostConfirmationSelect");
-        materialButton.setText(b.j(this, 2131892042, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755252, 1, 1)}, null, 4));
-        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755253, 7, 7);
-        CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755254, 1, 1);
-        TextView textView = getBinding().f1860c;
+        materialButton.setText(b.j(this, 2131892113, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755253, 1, 1)}, null, 4));
+        CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755254, 7, 7);
+        CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755255, 1, 1);
+        TextView textView = getBinding().f1862c;
         m.checkNotNullExpressionValue(textView, "binding.boostConfirmationCooldownWarning");
-        textView.setText(b.j(this, 2131892044, new Object[]{i18nPluralString2, i18nPluralString}, null, 4));
+        textView.setText(b.j(this, 2131892115, new Object[]{i18nPluralString2, i18nPluralString}, null, 4));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java
index bef1c0088a..f7b12b7e04 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java
@@ -20,29 +20,29 @@ public final /* synthetic */ class WidgetPremiumGuildSubscriptionTransfer$bindin
 
     public final WidgetPremiumGuildTransferBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131364270;
-            TextView textView = (TextView) view.findViewById(2131364270);
+            i = 2131364314;
+            TextView textView = (TextView) view.findViewById(2131364314);
             if (textView != null) {
-                i = 2131364271;
-                TextView textView2 = (TextView) view.findViewById(2131364271);
+                i = 2131364315;
+                TextView textView2 = (TextView) view.findViewById(2131364315);
                 if (textView2 != null) {
-                    i = 2131364272;
-                    PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131364272);
+                    i = 2131364316;
+                    PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131364316);
                     if (premiumGuildConfirmationView != null) {
-                        i = 2131364273;
-                        TextView textView3 = (TextView) view.findViewById(2131364273);
+                        i = 2131364317;
+                        TextView textView3 = (TextView) view.findViewById(2131364317);
                         if (textView3 != null) {
-                            i = 2131364274;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364274);
+                            i = 2131364318;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364318);
                             if (materialButton != null) {
-                                i = 2131364275;
-                                PremiumGuildConfirmationView premiumGuildConfirmationView2 = (PremiumGuildConfirmationView) view.findViewById(2131364275);
+                                i = 2131364319;
+                                PremiumGuildConfirmationView premiumGuildConfirmationView2 = (PremiumGuildConfirmationView) view.findViewById(2131364319);
                                 if (premiumGuildConfirmationView2 != null) {
-                                    i = 2131364276;
-                                    TextView textView4 = (TextView) view.findViewById(2131364276);
+                                    i = 2131364320;
+                                    TextView textView4 = (TextView) view.findViewById(2131364320);
                                     if (textView4 != null) {
                                         return new WidgetPremiumGuildTransferBinding((CoordinatorLayout) view, dimmerView, textView, textView2, premiumGuildConfirmationView, textView3, materialButton, premiumGuildConfirmationView2, textView4);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java
index e1746eeb05..0990d635f9 100644
--- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java
+++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java
@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
-import c.a.a.d.c;
+import c.a.a.c.c;
 import c.a.d.h0;
 import c.a.d.j0;
 import c.a.d.l;
@@ -75,7 +75,7 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment {
     }
 
     public WidgetPremiumGuildSubscriptionTransfer() {
-        super(2131559109);
+        super(2131559115);
         WidgetPremiumGuildSubscriptionTransfer$viewModel$2 widgetPremiumGuildSubscriptionTransfer$viewModel$2 = new WidgetPremiumGuildSubscriptionTransfer$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildTransferInProgressViewModel.class), new WidgetPremiumGuildSubscriptionTransfer$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscriptionTransfer$viewModel$2));
@@ -143,26 +143,26 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        TextView textView = getBinding().f1847c;
+        TextView textView = getBinding().f1849c;
         m.checkNotNullExpressionValue(textView, "binding.premiumGuildTransferConfirmationBlurb");
-        textView.setText(b.j(this, 2131892045, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755256, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755255, 1, 1)}, null, 4));
+        textView.setText(b.j(this, 2131892116, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755257, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755256, 1, 1)}, null, 4));
         TextView textView2 = getBinding().f;
         m.checkNotNullExpressionValue(textView2, "binding.premiumGuildTransferPreviousGuildHeader");
-        textView2.setText(b.j(this, 2131892046, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755257, 1, 1)}, null, 4));
+        textView2.setText(b.j(this, 2131892117, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755258, 1, 1)}, null, 4));
         TextView textView3 = getBinding().i;
         m.checkNotNullExpressionValue(textView3, "binding.premiumGuildTransferTargetGuildHeader");
-        textView3.setText(b.j(this, 2131892048, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755258, 1, 1)}, null, 4));
+        textView3.setText(b.j(this, 2131892119, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755259, 1, 1)}, null, 4));
         getBinding().g.setOnClickListener(new WidgetPremiumGuildSubscriptionTransfer$onViewBound$1(this));
         MaterialButton materialButton = getBinding().g;
         m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildTransferSelect");
-        materialButton.setText(b.j(this, 2131892054, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755260, 1, 1)}, null, 4));
+        materialButton.setText(b.j(this, 2131892125, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755261, 1, 1)}, null, 4));
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable s2 = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, WidgetPremiumGuildSubscriptionTransfer.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, WidgetPremiumGuildSubscriptionTransfer.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPremiumGuildSubscriptionTransfer$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java
index 19ee2fffc4..b175df0b23 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsInstantInvites$binding$2
 
     public final WidgetServerSettingsInstantInvitesBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364015;
-        TextView textView = (TextView) view.findViewById(2131364015);
+        int i = 2131364058;
+        TextView textView = (TextView) view.findViewById(2131364058);
         if (textView != null) {
-            i = 2131364016;
-            TextView textView2 = (TextView) view.findViewById(2131364016);
+            i = 2131364059;
+            TextView textView2 = (TextView) view.findViewById(2131364059);
             if (textView2 != null) {
-                i = 2131364640;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364640);
+                i = 2131364689;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364689);
                 if (recyclerView != null) {
-                    i = 2131364641;
-                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364641);
+                    i = 2131364690;
+                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364690);
                     if (appViewFlipper != null) {
                         return new WidgetServerSettingsInstantInvitesBinding((CoordinatorLayout) view, textView, textView2, recyclerView, appViewFlipper);
                     }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
index a88fff94b3..7268519907 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java
@@ -134,9 +134,9 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable j2 = Observable.j(companion.getGuilds().observeGuild(j), companion.getInstantInvites().observeInvites(j), new WidgetServerSettingsInstantInvites$Model$Companion$get$1(j));
                 m.checkNotNullExpressionValue(j2, "Observable.combineLatest…            }\n          }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(j2).s();
-                m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(j2).r();
+                m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -346,7 +346,7 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
     }
 
     public WidgetServerSettingsInstantInvites() {
-        super(2131559165);
+        super(2131559171);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetServerSettingsInstantInvites widgetServerSettingsInstantInvites, Model model) {
@@ -367,15 +367,15 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
             return;
         }
         if (model.getInviteItems() == null) {
-            AppViewFlipper appViewFlipper = getBinding().f1888c;
+            AppViewFlipper appViewFlipper = getBinding().f1890c;
             m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsInstantInvitesViewFlipper");
             appViewFlipper.setDisplayedChild(0);
         } else if (model.getInviteItems().isEmpty()) {
-            AppViewFlipper appViewFlipper2 = getBinding().f1888c;
+            AppViewFlipper appViewFlipper2 = getBinding().f1890c;
             m.checkNotNullExpressionValue(appViewFlipper2, "binding.serverSettingsInstantInvitesViewFlipper");
             appViewFlipper2.setDisplayedChild(2);
         } else {
-            AppViewFlipper appViewFlipper3 = getBinding().f1888c;
+            AppViewFlipper appViewFlipper3 = getBinding().f1890c;
             m.checkNotNullExpressionValue(appViewFlipper3, "binding.serverSettingsInstantInvitesViewFlipper");
             appViewFlipper3.setDisplayedChild(1);
             Adapter adapter = this.adapter;
@@ -383,7 +383,7 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment {
                 adapter.configure(model.getInviteItems(), new WidgetServerSettingsInstantInvites$configureUI$1(this), WidgetServerSettingsInstantInvites$configureUI$2.INSTANCE);
             }
         }
-        setActionBarTitle(2131890386);
+        setActionBarTitle(2131890452);
         setActionBarSubtitle(model.getGuild().getName());
     }
 
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
index aa139339ab..48e804dde2 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java
@@ -29,47 +29,47 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetServerSettingsInstantInvitesListItem(WidgetServerSettingsInstantInvites.Adapter adapter) {
-        super(2131559164, adapter);
+        super(2131559170, adapter);
         m.checkNotNullParameter(adapter, "adapter");
         View view = this.itemView;
-        int i = 2131363615;
-        TextView textView = (TextView) view.findViewById(2131363615);
+        int i = 2131363656;
+        TextView textView = (TextView) view.findViewById(2131363656);
         if (textView != null) {
-            i = 2131363616;
-            TextView textView2 = (TextView) view.findViewById(2131363616);
+            i = 2131363657;
+            TextView textView2 = (TextView) view.findViewById(2131363657);
             if (textView2 != null) {
-                i = 2131363617;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363617);
+                i = 2131363658;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363658);
                 if (linearLayout != null) {
-                    i = 2131363618;
-                    View findViewById = view.findViewById(2131363618);
+                    i = 2131363659;
+                    View findViewById = view.findViewById(2131363659);
                     if (findViewById != null) {
-                        i = 2131363619;
-                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363619);
+                        i = 2131363660;
+                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363660);
                         if (linearLayout2 != null) {
-                            i = 2131363620;
-                            TextView textView3 = (TextView) view.findViewById(2131363620);
+                            i = 2131363661;
+                            TextView textView3 = (TextView) view.findViewById(2131363661);
                             if (textView3 != null) {
-                                i = 2131363622;
-                                TextView textView4 = (TextView) view.findViewById(2131363622);
+                                i = 2131363663;
+                                TextView textView4 = (TextView) view.findViewById(2131363663);
                                 if (textView4 != null) {
-                                    i = 2131363623;
-                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363623);
+                                    i = 2131363664;
+                                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363664);
                                     if (simpleDraweeView != null) {
-                                        i = 2131363630;
-                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363630);
+                                        i = 2131363671;
+                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363671);
                                         if (linearLayout3 != null) {
-                                            i = 2131363634;
-                                            ImageView imageView = (ImageView) view.findViewById(2131363634);
+                                            i = 2131363675;
+                                            ImageView imageView = (ImageView) view.findViewById(2131363675);
                                             if (imageView != null) {
-                                                i = 2131363637;
-                                                TextView textView5 = (TextView) view.findViewById(2131363637);
+                                                i = 2131363678;
+                                                TextView textView5 = (TextView) view.findViewById(2131363678);
                                                 if (textView5 != null) {
-                                                    i = 2131363638;
-                                                    TextView textView6 = (TextView) view.findViewById(2131363638);
+                                                    i = 2131363679;
+                                                    TextView textView6 = (TextView) view.findViewById(2131363679);
                                                     if (textView6 != null) {
-                                                        i = 2131363639;
-                                                        TextView textView7 = (TextView) view.findViewById(2131363639);
+                                                        i = 2131363680;
+                                                        TextView textView7 = (TextView) view.findViewById(2131363680);
                                                         if (textView7 != null) {
                                                             WidgetServerSettingsInstantInviteListItemBinding widgetServerSettingsInstantInviteListItemBinding = new WidgetServerSettingsInstantInviteListItemBinding((CardView) view, textView, textView2, linearLayout, findViewById, linearLayout2, textView3, textView4, simpleDraweeView, linearLayout3, imageView, textView5, textView6, textView7);
                                                             m.checkNotNullExpressionValue(widgetServerSettingsInstantInviteListItemBinding, "WidgetServerSettingsInst…temBinding.bind(itemView)");
@@ -137,7 +137,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
 
     private final void setupExpirationTime(ModelInvite modelInvite) {
         if (modelInvite.getMaxAge() == 0) {
-            this.binding.e.setText(2131890998);
+            this.binding.e.setText(2131891069);
             TextView textView = this.binding.e;
             m.checkNotNullExpressionValue(textView, "binding.inviteExpirationTime");
             textView.setTextColor(ColorCompat.getColor(textView, 2131099906));
@@ -163,7 +163,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
         super.onConfigure(i, (int) inviteItem);
         User inviter = inviteItem.getInvite().getInviter();
         this.binding.d.setOnClickListener(new WidgetServerSettingsInstantInvitesListItem$onConfigure$1(this, inviteItem));
-        TextView textView = this.binding.f1887c;
+        TextView textView = this.binding.f1889c;
         m.checkNotNullExpressionValue(textView, "binding.inviteCode");
         textView.setText(inviteItem.getInvite().getCode());
         TextView textView2 = this.binding.h;
@@ -183,7 +183,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler
         if (inviter == null || (str = inviter.r()) == null) {
             CardView cardView = this.binding.a;
             m.checkNotNullExpressionValue(cardView, "binding.root");
-            str = cardView.getContext().getString(2131890367);
+            str = cardView.getContext().getString(2131890433);
         }
         textView5.setText(str);
         if (inviter != null) {
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java
index 6aa78d5125..db515e15f0 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java
@@ -22,23 +22,23 @@ public final /* synthetic */ class WidgetServerSettingsMembers$binding$2 extends
 
     public final WidgetServerSettingsMembersBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364019;
-        TextView textView = (TextView) view.findViewById(2131364019);
+        int i = 2131364062;
+        TextView textView = (TextView) view.findViewById(2131364062);
         if (textView != null) {
-            i = 2131364642;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364642);
+            i = 2131364691;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364691);
             if (linearLayout != null) {
-                i = 2131364643;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364643);
+                i = 2131364692;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364692);
                 if (textInputLayout != null) {
-                    i = 2131364645;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364645);
+                    i = 2131364694;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364694);
                     if (recyclerView != null) {
-                        i = 2131364646;
-                        Spinner spinner = (Spinner) view.findViewById(2131364646);
+                        i = 2131364695;
+                        Spinner spinner = (Spinner) view.findViewById(2131364695);
                         if (spinner != null) {
-                            i = 2131364647;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364647);
+                            i = 2131364696;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364696);
                             if (appViewFlipper != null) {
                                 return new WidgetServerSettingsMembersBinding((CoordinatorLayout) view, textView, linearLayout, textInputLayout, recyclerView, spinner, appViewFlipper);
                             }
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java
index c639b3a8ba..e75c4f3885 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java
@@ -18,7 +18,7 @@ public final class WidgetServerSettingsMembers$configureUI$1<T1, T2> implements
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363905) {
+        if (menuItem.getItemId() == 2131363946) {
             WidgetPruneUsers.Companion companion = WidgetPruneUsers.Companion;
             long id2 = this.$model.getGuild().getId();
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
index c9c95b7129..9618ee9b1e 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java
@@ -81,7 +81,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public RolesSpinnerAdapter(Context context, ArrayList<GuildRole> arrayList) {
-            super(context, 2131558655, arrayList);
+            super(context, 2131558653, arrayList);
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(arrayList, "roles");
             this.roles = arrayList;
@@ -105,7 +105,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
             f1 f1Var;
             m.checkNotNullParameter(viewGroup, "parent");
             if (view == null) {
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558656, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558654, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 TextView textView = (TextView) inflate;
                 f1Var = new f1(textView, textView);
@@ -139,7 +139,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
             e1 e1Var;
             m.checkNotNullParameter(viewGroup, "parent");
             if (view == null) {
-                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558655, (ViewGroup) null, false);
+                View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558653, (ViewGroup) null, false);
                 Objects.requireNonNull(inflate, "rootView");
                 TextView textView = (TextView) inflate;
                 e1Var = new e1(textView, textView);
@@ -158,13 +158,13 @@ public final class WidgetServerSettingsMembers extends AppFragment {
     }
 
     public WidgetServerSettingsMembers() {
-        super(2131559169);
-        BehaviorSubject m0 = BehaviorSubject.m0("");
-        m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(\"\")");
-        this.nameFilterPublisher = m0;
-        BehaviorSubject m02 = BehaviorSubject.m0(-1L);
-        m.checkNotNullExpressionValue(m02, "BehaviorSubject.create(-1L)");
-        this.roleFilterPublisher = m02;
+        super(2131559175);
+        BehaviorSubject l0 = BehaviorSubject.l0("");
+        m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(\"\")");
+        this.nameFilterPublisher = l0;
+        BehaviorSubject l02 = BehaviorSubject.l0(-1L);
+        m.checkNotNullExpressionValue(l02, "BehaviorSubject.create(-1L)");
+        this.roleFilterPublisher = l02;
         this.guildId$delegate = g.lazy(new WidgetServerSettingsMembers$guildId$2(this));
     }
 
@@ -202,7 +202,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
             return;
         }
         AppFragment.setActionBarOptionsMenu$default(this, widgetServerSettingsMembersModel.getCanKick() ? 2131623961 : 2131623951, new WidgetServerSettingsMembers$configureUI$1(this, widgetServerSettingsMembersModel), null, 4, null);
-        setActionBarTitle(2131891010);
+        setActionBarTitle(2131891081);
         setActionBarSubtitle(widgetServerSettingsMembersModel.getGuild().getName());
         AppViewFlipper appViewFlipper = getBinding().e;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsMembersViewFlipper");
@@ -249,7 +249,7 @@ public final class WidgetServerSettingsMembers extends AppFragment {
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-        RecyclerView recyclerView = getBinding().f1892c;
+        RecyclerView recyclerView = getBinding().f1894c;
         m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsMembersRecycler");
         this.adapter = (WidgetServerSettingsMembersAdapter) companion.configure(new WidgetServerSettingsMembersAdapter(recyclerView));
         if (!isRecreated()) {
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
index 23138203e0..c3b061c115 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java
@@ -30,24 +30,24 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public MemberListItem(WidgetServerSettingsMembersAdapter widgetServerSettingsMembersAdapter) {
-            super(2131559168, widgetServerSettingsMembersAdapter);
+            super(2131559174, widgetServerSettingsMembersAdapter);
             m.checkNotNullParameter(widgetServerSettingsMembersAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363821;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363821);
+            int i = 2131363862;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363862);
             if (simpleDraweeView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131363823;
-                ImageView imageView = (ImageView) view.findViewById(2131363823);
+                i = 2131363864;
+                ImageView imageView = (ImageView) view.findViewById(2131363864);
                 if (imageView != null) {
-                    i = 2131363824;
-                    UsernameView usernameView = (UsernameView) view.findViewById(2131363824);
+                    i = 2131363865;
+                    UsernameView usernameView = (UsernameView) view.findViewById(2131363865);
                     if (usernameView != null) {
-                        i = 2131363825;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131363825);
+                        i = 2131363866;
+                        ImageView imageView2 = (ImageView) view.findViewById(2131363866);
                         if (imageView2 != null) {
-                            i = 2131363826;
-                            RolesListView rolesListView = (RolesListView) view.findViewById(2131363826);
+                            i = 2131363867;
+                            RolesListView rolesListView = (RolesListView) view.findViewById(2131363867);
                             if (rolesListView != null) {
                                 WidgetServerSettingsMemberListItemBinding widgetServerSettingsMemberListItemBinding = new WidgetServerSettingsMemberListItemBinding(constraintLayout, simpleDraweeView, constraintLayout, imageView, usernameView, imageView2, rolesListView);
                                 m.checkNotNullExpressionValue(widgetServerSettingsMemberListItemBinding, "WidgetServerSettingsMemb…temBinding.bind(itemView)");
@@ -88,7 +88,7 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS
                 i2 = 8;
             }
             imageView2.setVisibility(i2);
-            this.binding.f1891c.setOnClickListener(new WidgetServerSettingsMembersAdapter$MemberListItem$onConfigure$1(this, memberItem));
+            this.binding.f1893c.setOnClickListener(new WidgetServerSettingsMembersAdapter$MemberListItem$onConfigure$1(this, memberItem));
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.memberListItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, memberItem.getUser(), 2131165296, null, null, memberItem.getGuildMember(), 24, null);
diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java
index ce8f80404d..71e24912ec 100644
--- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java
+++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersModel.java
@@ -65,11 +65,11 @@ public final class WidgetServerSettingsMembersModel {
         public final Observable<WidgetServerSettingsMembersModel> get(long j, Observable<String> observable, Observable<Long> observable2) {
             m.checkNotNullParameter(observable, "filterPublisher");
             m.checkNotNullParameter(observable2, "roleFilterPublisher");
-            Observable<R> Z = StoreStream.Companion.getGuilds().observeComputed(j).Z(new WidgetServerSettingsMembersModel$Companion$get$1(j, observable, observable2));
-            m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-            Observable<WidgetServerSettingsMembersModel> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-            m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-            return s2;
+            Observable<R> Y = StoreStream.Companion.getGuilds().observeComputed(j).Y(new WidgetServerSettingsMembersModel$Companion$get$1(j, observable, observable2));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+            Observable<WidgetServerSettingsMembersModel> r = ObservableExtensionsKt.computationLatest(Y).r();
+            m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+            return r;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2.java b/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2.java
new file mode 100644
index 0000000000..9598392435
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.settings;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: CustomProfilesEditingFeatureFlag.kt */
+public final class CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2 extends o implements Function0<CustomProfilesEditingFeatureFlag> {
+    public static final CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2 INSTANCE = new CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2();
+
+    public CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final CustomProfilesEditingFeatureFlag mo1invoke() {
+        return new CustomProfilesEditingFeatureFlag();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag$observeIsEnabled$1.java b/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag$observeIsEnabled$1.java
new file mode 100644
index 0000000000..1ec875177c
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag$observeIsEnabled$1.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings;
+
+import com.discord.models.experiments.domain.Experiment;
+import j0.k.b;
+/* compiled from: CustomProfilesEditingFeatureFlag.kt */
+public final class CustomProfilesEditingFeatureFlag$observeIsEnabled$1<T, R> implements b<Experiment, Boolean> {
+    public static final CustomProfilesEditingFeatureFlag$observeIsEnabled$1 INSTANCE = new CustomProfilesEditingFeatureFlag$observeIsEnabled$1();
+
+    public final Boolean call(Experiment experiment) {
+        boolean z2 = true;
+        if (experiment == null || experiment.getBucket() != 1) {
+            z2 = false;
+        }
+        return Boolean.valueOf(z2);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag.java b/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag.java
new file mode 100644
index 0000000000..0b07c6f314
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/CustomProfilesEditingFeatureFlag.java
@@ -0,0 +1,45 @@
+package com.discord.widgets.settings;
+
+import com.discord.models.experiments.domain.Experiment;
+import com.discord.stores.StoreStream;
+import d0.g;
+import d0.z.d.m;
+import kotlin.Lazy;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+/* compiled from: CustomProfilesEditingFeatureFlag.kt */
+public final class CustomProfilesEditingFeatureFlag {
+    public static final Companion Companion = new Companion(null);
+    private static final Lazy INSTANCE$delegate = g.lazy(CustomProfilesEditingFeatureFlag$Companion$INSTANCE$2.INSTANCE);
+
+    /* compiled from: CustomProfilesEditingFeatureFlag.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final CustomProfilesEditingFeatureFlag getINSTANCE() {
+            Lazy access$getINSTANCE$cp = CustomProfilesEditingFeatureFlag.access$getINSTANCE$cp();
+            Companion companion = CustomProfilesEditingFeatureFlag.Companion;
+            return (CustomProfilesEditingFeatureFlag) access$getINSTANCE$cp.getValue();
+        }
+    }
+
+    public static final /* synthetic */ Lazy access$getINSTANCE$cp() {
+        return INSTANCE$delegate;
+    }
+
+    public final boolean isEnabled() {
+        Experiment userExperiment = StoreStream.Companion.getExperiments().getUserExperiment("2021-06_android_custom_profiles_editing", true);
+        return userExperiment != null && userExperiment.getBucket() == 1;
+    }
+
+    public final Observable<Boolean> observeIsEnabled() {
+        Observable<R> F = StoreStream.Companion.getExperiments().observeUserExperiment("2021-06_android_custom_profiles_editing", true).F(CustomProfilesEditingFeatureFlag$observeIsEnabled$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream.getExperimen…riment?.bucket == 1\n    }");
+        return F;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion$observeStoreState$1.java
index e39b223693..855d2b6af2 100644
--- a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel$Companion$observeStoreState$1.java
@@ -14,16 +14,16 @@ public final class MuteSettingsSheetViewModel$Companion$observeStoreState$1<T1,
     /* JADX WARNING: Removed duplicated region for block: B:9:0x001c  */
     public final MuteSettingsSheetViewModel.StoreState call(Guild guild, Channel channel, Map<Long, ? extends ModelNotificationSettings> map) {
         Long l;
-        long e;
+        long f;
         if (guild != null) {
-            e = guild.getId();
+            f = guild.getId();
         } else if (channel != null) {
-            e = channel.e();
+            f = channel.f();
         } else {
             l = null;
             return new MuteSettingsSheetViewModel.StoreState(guild, channel, (ModelNotificationSettings) map.get(Long.valueOf(l == null ? l.longValue() : 0)));
         }
-        l = Long.valueOf(e);
+        l = Long.valueOf(f);
         return new MuteSettingsSheetViewModel.StoreState(guild, channel, (ModelNotificationSettings) map.get(Long.valueOf(l == null ? l.longValue() : 0)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
index 6e86951a67..363bb0460c 100644
--- a/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/MuteSettingsSheetViewModel.java
@@ -565,7 +565,7 @@ public final class MuteSettingsSheetViewModel extends AppViewModel<ViewState> {
         this.storeUserGuildSettings = storeUserGuildSettings;
         this.clock = clock;
         this.config = j != 0 ? new Config.Guild(j) : new Config.Channel(j2);
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), MuteSettingsSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -603,7 +603,7 @@ public final class MuteSettingsSheetViewModel extends AppViewModel<ViewState> {
         boolean z2;
         Guild guild = storeState.getGuild();
         Channel channel = storeState.getChannel();
-        SettingsType settingsType = guild != null ? SettingsType.GUILD : channel != null ? AnimatableValueParser.g1(channel) ? SettingsType.DM : AnimatableValueParser.i1(channel) ? SettingsType.GROUP_DM : AnimatableValueParser.f1(channel) ? SettingsType.CATEGORY : SettingsType.GUILD_CHANNEL : SettingsType.UNKNOWN;
+        SettingsType settingsType = guild != null ? SettingsType.GUILD : channel != null ? AnimatableValueParser.h1(channel) ? SettingsType.DM : AnimatableValueParser.j1(channel) ? SettingsType.GROUP_DM : AnimatableValueParser.f1(channel) ? SettingsType.CATEGORY : SettingsType.GUILD_CHANNEL : SettingsType.UNKNOWN;
         if (settingsType == SettingsType.UNKNOWN) {
             updateViewState(ViewState.Failure.INSTANCE);
             return;
@@ -642,9 +642,9 @@ public final class MuteSettingsSheetViewModel extends AppViewModel<ViewState> {
                 ModelNotificationSettings.ChannelOverride channelOverride2 = (ModelNotificationSettings.ChannelOverride) obj;
                 Channel channel2 = storeState.getChannel();
                 if (channel2 != null) {
-                    long g = channel2.g();
+                    long h = channel2.h();
                     m.checkNotNullExpressionValue(channelOverride2, "channelOverride");
-                    if (g == channelOverride2.getChannelId()) {
+                    if (h == channelOverride2.getChannelId()) {
                         z2 = true;
                         continue;
                         if (z2) {
@@ -659,7 +659,7 @@ public final class MuteSettingsSheetViewModel extends AppViewModel<ViewState> {
             }
             channelOverride = (ModelNotificationSettings.ChannelOverride) obj;
         }
-        boolean z4 = channel != null && !AnimatableValueParser.r1(channel) && (guildNotificationSettings = storeState.getGuildNotificationSettings()) != null && guildNotificationSettings.isMuted();
+        boolean z4 = channel != null && !AnimatableValueParser.s1(channel) && (guildNotificationSettings = storeState.getGuildNotificationSettings()) != null && guildNotificationSettings.isMuted();
         if (channelOverride != null && channelOverride.isMuted()) {
             z3 = true;
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java
index 1b4a43c5b4..a95a281190 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java
@@ -19,53 +19,53 @@ public final /* synthetic */ class WidgetMuteSettingsSheet$binding$2 extends k i
 
     public final WidgetMuteSettingsSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362279;
-        TextView textView = (TextView) view.findViewById(2131362279);
+        int i = 2131362290;
+        TextView textView = (TextView) view.findViewById(2131362290);
         if (textView != null) {
-            i = 2131363986;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363986);
+            i = 2131364027;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364027);
             if (linearLayout != null) {
-                i = 2131364040;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364040);
+                i = 2131364083;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364083);
                 if (linearLayout2 != null) {
-                    i = 2131364041;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364041);
+                    i = 2131364084;
+                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364084);
                     if (frameLayout != null) {
-                        i = 2131364042;
-                        TextView textView2 = (TextView) view.findViewById(2131364042);
+                        i = 2131364085;
+                        TextView textView2 = (TextView) view.findViewById(2131364085);
                         if (textView2 != null) {
-                            i = 2131364043;
-                            TextView textView3 = (TextView) view.findViewById(2131364043);
+                            i = 2131364086;
+                            TextView textView3 = (TextView) view.findViewById(2131364086);
                             if (textView3 != null) {
-                                i = 2131364101;
-                                TextView textView4 = (TextView) view.findViewById(2131364101);
+                                i = 2131364144;
+                                TextView textView4 = (TextView) view.findViewById(2131364144);
                                 if (textView4 != null) {
-                                    i = 2131364102;
-                                    TextView textView5 = (TextView) view.findViewById(2131364102);
+                                    i = 2131364145;
+                                    TextView textView5 = (TextView) view.findViewById(2131364145);
                                     if (textView5 != null) {
-                                        i = 2131364103;
-                                        TextView textView6 = (TextView) view.findViewById(2131364103);
+                                        i = 2131364146;
+                                        TextView textView6 = (TextView) view.findViewById(2131364146);
                                         if (textView6 != null) {
-                                            i = 2131364104;
-                                            TextView textView7 = (TextView) view.findViewById(2131364104);
+                                            i = 2131364147;
+                                            TextView textView7 = (TextView) view.findViewById(2131364147);
                                             if (textView7 != null) {
-                                                i = 2131364107;
-                                                TextView textView8 = (TextView) view.findViewById(2131364107);
+                                                i = 2131364150;
+                                                TextView textView8 = (TextView) view.findViewById(2131364150);
                                                 if (textView8 != null) {
-                                                    i = 2131365133;
-                                                    TextView textView9 = (TextView) view.findViewById(2131365133);
+                                                    i = 2131365188;
+                                                    TextView textView9 = (TextView) view.findViewById(2131365188);
                                                     if (textView9 != null) {
-                                                        i = 2131365286;
-                                                        TextView textView10 = (TextView) view.findViewById(2131365286);
+                                                        i = 2131365341;
+                                                        TextView textView10 = (TextView) view.findViewById(2131365341);
                                                         if (textView10 != null) {
-                                                            i = 2131365339;
-                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365339);
+                                                            i = 2131365397;
+                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365397);
                                                             if (linearLayout3 != null) {
-                                                                i = 2131365340;
-                                                                TextView textView11 = (TextView) view.findViewById(2131365340);
+                                                                i = 2131365398;
+                                                                TextView textView11 = (TextView) view.findViewById(2131365398);
                                                                 if (textView11 != null) {
-                                                                    i = 2131365341;
-                                                                    TextView textView12 = (TextView) view.findViewById(2131365341);
+                                                                    i = 2131365399;
+                                                                    TextView textView12 = (TextView) view.findViewById(2131365399);
                                                                     if (textView12 != null) {
                                                                         return new WidgetMuteSettingsSheetBinding((NestedScrollView) view, textView, linearLayout, linearLayout2, frameLayout, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, linearLayout3, textView11, textView12);
                                                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
index 2ff22c6957..a4cbeeddd5 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java
@@ -134,7 +134,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.notificationSettingsOverridesLabel");
         int notificationOverride = loaded.getNotificationOverride();
-        textView.setText(notificationOverride == ModelNotificationSettings.FREQUENCY_ALL ? b.j(this, 2131888609, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_MENTIONS ? b.j(this, 2131888709, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_NOTHING ? b.j(this, 2131888703, new Object[0], null, 4) : "");
+        textView.setText(notificationOverride == ModelNotificationSettings.FREQUENCY_ALL ? b.j(this, 2131888610, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_MENTIONS ? b.j(this, 2131888710, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_NOTHING ? b.j(this, 2131888704, new Object[0], null, 4) : "");
         int ordinal = loaded.getSettingsType().ordinal();
         if (ordinal != 0) {
             boolean z2 = true;
@@ -152,7 +152,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
                     textView3.setVisibility(0);
                     TextView textView4 = getBinding().b;
                     m.checkNotNullExpressionValue(textView4, "binding.channelMutedDetails");
-                    textView4.setText(loaded.isChannelMuted() ? b.j(this, 2131888561, new Object[0], null, 4) : b.d(this, 2131888673, new Object[0], new WidgetMuteSettingsSheet$configureNotificationSettings$1(this)));
+                    textView4.setText(loaded.isChannelMuted() ? b.j(this, 2131888562, new Object[0], null, 4) : b.d(this, 2131888674, new Object[0], new WidgetMuteSettingsSheet$configureNotificationSettings$1(this)));
                 } else {
                     TextView textView5 = getBinding().f;
                     m.checkNotNullExpressionValue(textView5, "binding.notificationSettingsLabel");
@@ -182,22 +182,22 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
         if (loaded.isChannelMuted()) {
             TextView textView = getBinding().q;
             m.checkNotNullExpressionValue(textView, "binding.unmuteButtonLabel");
-            b.m(textView, 2131894065, new Object[]{loaded.getSubtitle()}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
+            b.l(textView, 2131894166, new Object[]{loaded.getSubtitle()}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
             TextView textView2 = getBinding().p;
             m.checkNotNullExpressionValue(textView2, "binding.unmuteButtonDetailsLabel");
             int ordinal = loaded.getSettingsType().ordinal();
             if (ordinal == 1 || ordinal == 2) {
                 String muteEndTime = loaded.getMuteEndTime();
-                charSequence = muteEndTime == null ? b.d(this, 2131888675, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888676, new Object[]{parseMuteEndtime(muteEndTime)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
+                charSequence = muteEndTime == null ? b.d(this, 2131888676, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888677, new Object[]{parseMuteEndtime(muteEndTime)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
             } else {
                 String muteEndTime2 = loaded.getMuteEndTime();
-                charSequence = muteEndTime2 == null ? b.d(this, 2131888670, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888671, new Object[]{parseMuteEndtime(muteEndTime2)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
+                charSequence = muteEndTime2 == null ? b.d(this, 2131888671, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888672, new Object[]{parseMuteEndtime(muteEndTime2)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1);
             }
             textView2.setText(charSequence);
             LinearLayout linearLayout = getBinding().o;
             m.checkNotNullExpressionValue(linearLayout, "binding.unmuteButton");
             linearLayout.setVisibility(0);
-            LinearLayout linearLayout2 = getBinding().f1834c;
+            LinearLayout linearLayout2 = getBinding().f1836c;
             m.checkNotNullExpressionValue(linearLayout2, "binding.muteSettingsSheetMuteOptions");
             linearLayout2.setVisibility(8);
             return;
@@ -205,7 +205,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
         LinearLayout linearLayout3 = getBinding().o;
         m.checkNotNullExpressionValue(linearLayout3, "binding.unmuteButton");
         linearLayout3.setVisibility(8);
-        LinearLayout linearLayout4 = getBinding().f1834c;
+        LinearLayout linearLayout4 = getBinding().f1836c;
         m.checkNotNullExpressionValue(linearLayout4, "binding.muteSettingsSheetMuteOptions");
         linearLayout4.setVisibility(0);
     }
@@ -245,7 +245,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             MuteSettingsSheetViewModel.ViewState.Loaded loaded = (MuteSettingsSheetViewModel.ViewState.Loaded) viewState;
             int ordinal = loaded.getSettingsType().ordinal();
             CharSequence charSequence = null;
-            Integer num = ordinal != 0 ? (ordinal == 1 || ordinal == 2) ? 2131891310 : ordinal != 3 ? ordinal != 4 ? null : 2131891307 : 2131891308 : 2131891309;
+            Integer num = ordinal != 0 ? (ordinal == 1 || ordinal == 2) ? 2131891381 : ordinal != 3 ? ordinal != 4 ? null : 2131891378 : 2131891379 : 2131891380;
             TextView textView = getBinding().n;
             m.checkNotNullExpressionValue(textView, "binding.title");
             if (num != null) {
@@ -258,7 +258,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
             configureUnmuteButton(loaded);
             configureNotificationSettings(loaded);
         } else if (viewState instanceof MuteSettingsSheetViewModel.ViewState.Failure) {
-            o.i(this, 2131888049, 0, 4);
+            o.i(this, 2131888048, 0, 4);
             dismiss();
         }
     }
@@ -274,7 +274,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559091;
+        return 2131559097;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.java
index 56e4e66cc8..56c7738871 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$1.java
@@ -1,29 +1,19 @@
 package com.discord.widgets.settings;
 
-import com.discord.models.presence.Presence;
-import com.discord.models.user.MeUser;
-import com.discord.widgets.settings.WidgetSettings;
-import d0.z.d.k;
-import d0.z.d.m;
-import kotlin.jvm.functions.Function3;
+import com.discord.api.premium.OutboundPromotion;
+import com.discord.stores.StoreOutboundPromotions;
+import j0.k.b;
+import java.util.List;
 /* compiled from: WidgetSettings.kt */
-public final /* synthetic */ class WidgetSettings$Model$Companion$get$1 extends k implements Function3<MeUser, Boolean, Presence, WidgetSettings.Model> {
+public final class WidgetSettings$Model$Companion$get$1<T, R> implements b<StoreOutboundPromotions.State, Integer> {
     public static final WidgetSettings$Model$Companion$get$1 INSTANCE = new WidgetSettings$Model$Companion$get$1();
 
-    public WidgetSettings$Model$Companion$get$1() {
-        super(3, WidgetSettings.Model.class, "<init>", "<init>(Lcom/discord/models/user/MeUser;ZLcom/discord/models/presence/Presence;)V", 0);
-    }
-
-    public final WidgetSettings.Model invoke(MeUser meUser, boolean z2, Presence presence) {
-        m.checkNotNullParameter(meUser, "p1");
-        m.checkNotNullParameter(presence, "p3");
-        return new WidgetSettings.Model(meUser, z2, presence);
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function3
-    public /* bridge */ /* synthetic */ WidgetSettings.Model invoke(MeUser meUser, Boolean bool, Presence presence) {
-        return invoke(meUser, bool.booleanValue(), presence);
+    public final Integer call(StoreOutboundPromotions.State state) {
+        List<OutboundPromotion> validActivePromotions;
+        if (!(state instanceof StoreOutboundPromotions.State.Loaded)) {
+            state = null;
+        }
+        StoreOutboundPromotions.State.Loaded loaded = (StoreOutboundPromotions.State.Loaded) state;
+        return Integer.valueOf((loaded == null || (validActivePromotions = loaded.getValidActivePromotions()) == null) ? 0 : validActivePromotions.size());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$2.java
new file mode 100644
index 0000000000..3b519a14f4
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$Model$Companion$get$2.java
@@ -0,0 +1,29 @@
+package com.discord.widgets.settings;
+
+import com.discord.models.presence.Presence;
+import com.discord.models.user.MeUser;
+import com.discord.widgets.settings.WidgetSettings;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function5;
+/* compiled from: WidgetSettings.kt */
+public final /* synthetic */ class WidgetSettings$Model$Companion$get$2 extends k implements Function5<MeUser, Boolean, Presence, Integer, Boolean, WidgetSettings.Model> {
+    public static final WidgetSettings$Model$Companion$get$2 INSTANCE = new WidgetSettings$Model$Companion$get$2();
+
+    public WidgetSettings$Model$Companion$get$2() {
+        super(5, WidgetSettings.Model.class, "<init>", "<init>(Lcom/discord/models/user/MeUser;ZLcom/discord/models/presence/Presence;IZ)V", 0);
+    }
+
+    public final WidgetSettings.Model invoke(MeUser meUser, boolean z2, Presence presence, int i, boolean z3) {
+        m.checkNotNullParameter(meUser, "p1");
+        m.checkNotNullParameter(presence, "p3");
+        return new WidgetSettings.Model(meUser, z2, presence, i, z3);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function5
+    public /* bridge */ /* synthetic */ WidgetSettings.Model invoke(MeUser meUser, Boolean bool, Presence presence, Integer num, Boolean bool2) {
+        return invoke(meUser, bool.booleanValue(), presence, num.intValue(), bool2.booleanValue());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java
index ee7d469ee6..6746575f5a 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java
@@ -41,85 +41,97 @@ public final /* synthetic */ class WidgetSettings$binding$2 extends k implements
                                 i = 2131361974;
                                 TextView textView7 = (TextView) view.findViewById(2131361974);
                                 if (textView7 != null) {
-                                    i = 2131362063;
-                                    TextView textView8 = (TextView) view.findViewById(2131362063);
+                                    i = 2131362064;
+                                    TextView textView8 = (TextView) view.findViewById(2131362064);
                                     if (textView8 != null) {
-                                        i = 2131362096;
-                                        TextView textView9 = (TextView) view.findViewById(2131362096);
+                                        i = 2131362101;
+                                        TextView textView9 = (TextView) view.findViewById(2131362101);
                                         if (textView9 != null) {
-                                            i = 2131362251;
-                                            TextView textView10 = (TextView) view.findViewById(2131362251);
+                                            i = 2131362262;
+                                            TextView textView10 = (TextView) view.findViewById(2131362262);
                                             if (textView10 != null) {
-                                                i = 2131362686;
-                                                TextView textView11 = (TextView) view.findViewById(2131362686);
+                                                i = 2131362710;
+                                                TextView textView11 = (TextView) view.findViewById(2131362710);
                                                 if (textView11 != null) {
-                                                    i = 2131362854;
-                                                    TextView textView12 = (TextView) view.findViewById(2131362854);
+                                                    i = 2131362879;
+                                                    TextView textView12 = (TextView) view.findViewById(2131362879);
                                                     if (textView12 != null) {
-                                                        i = 2131362855;
-                                                        View findViewById = view.findViewById(2131362855);
+                                                        i = 2131362880;
+                                                        View findViewById = view.findViewById(2131362880);
                                                         if (findViewById != null) {
-                                                            i = 2131362856;
-                                                            TextView textView13 = (TextView) view.findViewById(2131362856);
+                                                            i = 2131362881;
+                                                            TextView textView13 = (TextView) view.findViewById(2131362881);
                                                             if (textView13 != null) {
-                                                                i = 2131363733;
-                                                                TextView textView14 = (TextView) view.findViewById(2131363733);
+                                                                i = 2131363774;
+                                                                TextView textView14 = (TextView) view.findViewById(2131363774);
                                                                 if (textView14 != null) {
-                                                                    i = 2131364008;
-                                                                    TextView textView15 = (TextView) view.findViewById(2131364008);
+                                                                    i = 2131364051;
+                                                                    TextView textView15 = (TextView) view.findViewById(2131364051);
                                                                     if (textView15 != null) {
-                                                                        i = 2131364009;
-                                                                        TextView textView16 = (TextView) view.findViewById(2131364009);
+                                                                        i = 2131364052;
+                                                                        TextView textView16 = (TextView) view.findViewById(2131364052);
                                                                         if (textView16 != null) {
-                                                                            i = 2131364010;
-                                                                            TextView textView17 = (TextView) view.findViewById(2131364010);
+                                                                            i = 2131364049;
+                                                                            TextView textView17 = (TextView) view.findViewById(2131364049);
                                                                             if (textView17 != null) {
-                                                                                i = 2131364011;
-                                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364011);
+                                                                                i = 2131364050;
+                                                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364050);
                                                                                 if (linearLayout != null) {
-                                                                                    i = 2131364044;
-                                                                                    TextView textView18 = (TextView) view.findViewById(2131364044);
+                                                                                    i = 2131364053;
+                                                                                    TextView textView18 = (TextView) view.findViewById(2131364053);
                                                                                     if (textView18 != null) {
-                                                                                        i = 2131364336;
-                                                                                        TextView textView19 = (TextView) view.findViewById(2131364336);
-                                                                                        if (textView19 != null) {
-                                                                                            i = 2131364385;
-                                                                                            TextView textView20 = (TextView) view.findViewById(2131364385);
-                                                                                            if (textView20 != null) {
-                                                                                                i = 2131364724;
-                                                                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364724);
-                                                                                                if (linearLayout2 != null) {
-                                                                                                    i = 2131364806;
-                                                                                                    TextView textView21 = (TextView) view.findViewById(2131364806);
+                                                                                        i = 2131364054;
+                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364054);
+                                                                                        if (linearLayout2 != null) {
+                                                                                            i = 2131364087;
+                                                                                            TextView textView19 = (TextView) view.findViewById(2131364087);
+                                                                                            if (textView19 != null) {
+                                                                                                i = 2131364372;
+                                                                                                TextView textView20 = (TextView) view.findViewById(2131364372);
+                                                                                                if (textView20 != null) {
+                                                                                                    i = 2131364389;
+                                                                                                    TextView textView21 = (TextView) view.findViewById(2131364389);
                                                                                                     if (textView21 != null) {
-                                                                                                        i = 2131364853;
-                                                                                                        TextView textView22 = (TextView) view.findViewById(2131364853);
+                                                                                                        i = 2131364423;
+                                                                                                        TextView textView22 = (TextView) view.findViewById(2131364423);
                                                                                                         if (textView22 != null) {
-                                                                                                            i = 2131364862;
-                                                                                                            TextView textView23 = (TextView) view.findViewById(2131364862);
-                                                                                                            if (textView23 != null) {
-                                                                                                                i = 2131364884;
-                                                                                                                StatusView statusView = (StatusView) view.findViewById(2131364884);
-                                                                                                                if (statusView != null) {
-                                                                                                                    i = 2131365151;
-                                                                                                                    TextView textView24 = (TextView) view.findViewById(2131365151);
+                                                                                                            i = 2131364773;
+                                                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364773);
+                                                                                                            if (linearLayout3 != null) {
+                                                                                                                i = 2131364855;
+                                                                                                                TextView textView23 = (TextView) view.findViewById(2131364855);
+                                                                                                                if (textView23 != null) {
+                                                                                                                    i = 2131364902;
+                                                                                                                    TextView textView24 = (TextView) view.findViewById(2131364902);
                                                                                                                     if (textView24 != null) {
-                                                                                                                        i = 2131365215;
-                                                                                                                        TextView textView25 = (TextView) view.findViewById(2131365215);
+                                                                                                                        i = 2131364911;
+                                                                                                                        TextView textView25 = (TextView) view.findViewById(2131364911);
                                                                                                                         if (textView25 != null) {
-                                                                                                                            i = 2131365352;
-                                                                                                                            TextView textView26 = (TextView) view.findViewById(2131365352);
-                                                                                                                            if (textView26 != null) {
-                                                                                                                                i = 2131365418;
-                                                                                                                                TextView textView27 = (TextView) view.findViewById(2131365418);
-                                                                                                                                if (textView27 != null) {
-                                                                                                                                    i = 2131365420;
-                                                                                                                                    UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365420);
-                                                                                                                                    if (userProfileHeaderView != null) {
-                                                                                                                                        i = 2131365521;
-                                                                                                                                        TextView textView28 = (TextView) view.findViewById(2131365521);
+                                                                                                                            i = 2131364934;
+                                                                                                                            StatusView statusView = (StatusView) view.findViewById(2131364934);
+                                                                                                                            if (statusView != null) {
+                                                                                                                                i = 2131365206;
+                                                                                                                                TextView textView26 = (TextView) view.findViewById(2131365206);
+                                                                                                                                if (textView26 != null) {
+                                                                                                                                    i = 2131365270;
+                                                                                                                                    TextView textView27 = (TextView) view.findViewById(2131365270);
+                                                                                                                                    if (textView27 != null) {
+                                                                                                                                        i = 2131365410;
+                                                                                                                                        TextView textView28 = (TextView) view.findViewById(2131365410);
                                                                                                                                         if (textView28 != null) {
-                                                                                                                                            return new WidgetSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, findViewById, textView13, textView14, textView15, textView16, textView17, linearLayout, textView18, textView19, textView20, linearLayout2, textView21, textView22, textView23, statusView, textView24, textView25, textView26, textView27, userProfileHeaderView, textView28);
+                                                                                                                                            i = 2131365478;
+                                                                                                                                            TextView textView29 = (TextView) view.findViewById(2131365478);
+                                                                                                                                            if (textView29 != null) {
+                                                                                                                                                i = 2131365480;
+                                                                                                                                                UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365480);
+                                                                                                                                                if (userProfileHeaderView != null) {
+                                                                                                                                                    i = 2131365582;
+                                                                                                                                                    TextView textView30 = (TextView) view.findViewById(2131365582);
+                                                                                                                                                    if (textView30 != null) {
+                                                                                                                                                        return new WidgetSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, findViewById, textView13, textView14, textView15, textView16, textView17, linearLayout, textView18, linearLayout2, textView19, textView20, textView21, textView22, linearLayout3, textView23, textView24, textView25, statusView, textView26, textView27, textView28, textView29, userProfileHeaderView, textView30);
+                                                                                                                                                    }
+                                                                                                                                                }
+                                                                                                                                            }
                                                                                                                                         }
                                                                                                                                     }
                                                                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
index 7142256ca3..a9ab99d083 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java
@@ -16,12 +16,12 @@ public final class WidgetSettings$configureToolbar$1<T1, T2> implements Action2<
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363906:
+            case 2131363947:
                 WidgetDebugging.Companion companion = WidgetDebugging.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launch(context);
                 return;
-            case 2131363907:
+            case 2131363948:
                 WidgetSettings widgetSettings = this.this$0;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetSettings.access$showLogoutDialog(widgetSettings, context);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java
index cae9a94956..9d29e3ec9c 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java
@@ -47,17 +47,17 @@ public final class WidgetSettings$onViewBound$$inlined$with$lambda$4 implements
         public final void invoke(boolean z2) {
             WidgetSettings widgetSettings;
             int i;
-            TextView textView = this.this$0.$this_with.D;
+            TextView textView = this.this$0.$this_with.F;
             m.checkNotNullExpressionValue(textView, "uploadDebugLogs");
             textView.setEnabled(z2);
-            TextView textView2 = this.this$0.$this_with.D;
+            TextView textView2 = this.this$0.$this_with.F;
             m.checkNotNullExpressionValue(textView2, "uploadDebugLogs");
             if (z2) {
                 widgetSettings = this.this$0.this$0;
-                i = 2131894132;
+                i = 2131894233;
             } else {
                 widgetSettings = this.this$0.this$0;
-                i = 2131894630;
+                i = 2131894750;
             }
             textView2.setText(widgetSettings.getString(i));
         }
@@ -85,7 +85,7 @@ public final class WidgetSettings$onViewBound$$inlined$with$lambda$4 implements
         }
 
         public final void invoke(Void r4) {
-            c.a.d.o.i(this.this$0.this$0, 2131894130, 0, 4);
+            c.a.d.o.i(this.this$0.this$0, 2131894231, 0, 4);
             AnonymousClass1.invoke$default(this.$updateUploadDebugLogsUI$1, false, 1, null);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$10.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$10.java
index 2034f6fe90..8144d83a0c 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$10.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$10.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.connections.WidgetSettingsUserConnections;
+import com.discord.widgets.settings.WidgetSettingsPrivacy;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$10 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$10 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsUserConnections.Companion companion = WidgetSettingsUserConnections.Companion;
+        WidgetSettingsPrivacy.Companion companion = WidgetSettingsPrivacy.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$11.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$11.java
index c289a3dadb..64d2f5af34 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$11.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$11.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsAppearance;
+import com.discord.widgets.settings.connections.WidgetSettingsUserConnections;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$11 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$11 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsAppearance.Companion companion = WidgetSettingsAppearance.Companion;
+        WidgetSettingsUserConnections.Companion companion = WidgetSettingsUserConnections.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$12.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$12.java
index 6e397dc627..274c74d82e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$12.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$12.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsAccessibility;
+import com.discord.widgets.settings.WidgetSettingsAppearance;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$12 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$12 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsAccessibility.Companion companion = WidgetSettingsAccessibility.Companion;
+        WidgetSettingsAppearance.Companion companion = WidgetSettingsAppearance.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$13.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$13.java
index e777a946d9..c51e53d8b5 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$13.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$13.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsBehavior;
+import com.discord.widgets.settings.WidgetSettingsAccessibility;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$13 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$13 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsBehavior.Companion companion = WidgetSettingsBehavior.Companion;
+        WidgetSettingsAccessibility.Companion companion = WidgetSettingsAccessibility.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$14.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$14.java
index 62cef2ca52..4b97f7da66 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$14.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$14.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsLanguage;
+import com.discord.widgets.settings.WidgetSettingsBehavior;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$14 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$14 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsLanguage.Companion companion = WidgetSettingsLanguage.Companion;
+        WidgetSettingsBehavior.Companion companion = WidgetSettingsBehavior.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$15.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$15.java
index a33bbd0554..3b9f630609 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$15.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$15.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsActivityStatus;
+import com.discord.widgets.settings.WidgetSettingsLanguage;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$15 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$15 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsActivityStatus.Companion companion = WidgetSettingsActivityStatus.Companion;
+        WidgetSettingsLanguage.Companion companion = WidgetSettingsLanguage.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$17.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$16.java
similarity index 58%
rename from app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$17.java
rename to app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$16.java
index a4d10aaa77..719126ce0c 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$17.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$16.java
@@ -2,15 +2,15 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsMedia;
+import com.discord.widgets.settings.WidgetSettingsActivityStatus;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
-public final class WidgetSettings$onViewBound$1$17 implements View.OnClickListener {
-    public static final WidgetSettings$onViewBound$1$17 INSTANCE = new WidgetSettings$onViewBound$1$17();
+public final class WidgetSettings$onViewBound$1$16 implements View.OnClickListener {
+    public static final WidgetSettings$onViewBound$1$16 INSTANCE = new WidgetSettings$onViewBound$1$16();
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsMedia.Companion companion = WidgetSettingsMedia.Companion;
+        WidgetSettingsActivityStatus.Companion companion = WidgetSettingsActivityStatus.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.java
index 1ce0919e3e..46aa671eb0 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsVoice;
+import com.discord.widgets.settings.WidgetSettingsMedia;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$18 implements View.OnClickListener {
@@ -10,10 +10,10 @@ public final class WidgetSettings$onViewBound$1$18 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsVoice.Companion companion = WidgetSettingsVoice.Companion;
+        WidgetSettingsMedia.Companion companion = WidgetSettingsMedia.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        WidgetSettingsVoice.Companion.launch$default(companion, context, null, false, 6, null);
+        companion.launch(context);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$19.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$19.java
index fdb245469e..830fcc54f8 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$19.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$19.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.utilities.uri.UriHandler;
+import com.discord.widgets.settings.WidgetSettingsVoice;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$19 implements View.OnClickListener {
@@ -10,10 +10,10 @@ public final class WidgetSettings$onViewBound$1$19 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        UriHandler uriHandler = UriHandler.INSTANCE;
+        WidgetSettingsVoice.Companion companion = WidgetSettingsVoice.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        UriHandler.handle$default(uriHandler, context, "https://support.discord.com", null, 4, null);
+        WidgetSettingsVoice.Companion.launch$default(companion, context, null, false, 6, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$20.java
similarity index 73%
rename from app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.java
rename to app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$20.java
index 679c01a815..c98210b7e4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$20.java
@@ -5,8 +5,8 @@ import android.view.View;
 import com.discord.utilities.uri.UriHandler;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
-public final class WidgetSettings$onViewBound$1$21 implements View.OnClickListener {
-    public static final WidgetSettings$onViewBound$1$21 INSTANCE = new WidgetSettings$onViewBound$1$21();
+public final class WidgetSettings$onViewBound$1$20 implements View.OnClickListener {
+    public static final WidgetSettings$onViewBound$1$20 INSTANCE = new WidgetSettings$onViewBound$1$20();
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
@@ -14,6 +14,6 @@ public final class WidgetSettings$onViewBound$1$21 implements View.OnClickListen
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        UriHandler.handle$default(uriHandler, context, "https://discord.com/acknowledgements", null, 4, null);
+        UriHandler.handle$default(uriHandler, context, "https://support.discord.com", null, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$22.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$22.java
index 951d114ba2..8138dc07eb 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$22.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$22.java
@@ -2,8 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.stores.StoreChangeLog;
-import com.discord.stores.StoreStream;
+import com.discord.utilities.uri.UriHandler;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$22 implements View.OnClickListener {
@@ -11,10 +10,10 @@ public final class WidgetSettings$onViewBound$1$22 implements View.OnClickListen
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        StoreChangeLog changeLog = StoreStream.Companion.getChangeLog();
+        UriHandler uriHandler = UriHandler.INSTANCE;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
-        changeLog.openChangeLog(context, true);
+        UriHandler.handle$default(uriHandler, context, "https://discord.com/acknowledgements", null, 4, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$23.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$23.java
new file mode 100644
index 0000000000..45e413ad6b
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$23.java
@@ -0,0 +1,20 @@
+package com.discord.widgets.settings;
+
+import android.content.Context;
+import android.view.View;
+import com.discord.stores.StoreChangeLog;
+import com.discord.stores.StoreStream;
+import d0.z.d.m;
+/* compiled from: WidgetSettings.kt */
+public final class WidgetSettings$onViewBound$1$23 implements View.OnClickListener {
+    public static final WidgetSettings$onViewBound$1$23 INSTANCE = new WidgetSettings$onViewBound$1$23();
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        StoreChangeLog changeLog = StoreStream.Companion.getChangeLog();
+        m.checkNotNullExpressionValue(view, "it");
+        Context context = view.getContext();
+        m.checkNotNullExpressionValue(context, "it.context");
+        changeLog.openChangeLog(context, true);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$8.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$8.java
index 3a90447be1..24a33943b1 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$8.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$8.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsAuthorizedApps;
+import com.discord.widgets.settings.profile.WidgetSettingsUserProfile;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$8 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$8 implements View.OnClickListene
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsAuthorizedApps.Companion companion = WidgetSettingsAuthorizedApps.Companion;
+        WidgetSettingsUserProfile.Companion companion = WidgetSettingsUserProfile.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$9.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$9.java
index 1eb1f6b0ce..d32d594e52 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$9.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$1$9.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.content.Context;
 import android.view.View;
-import com.discord.widgets.settings.WidgetSettingsPrivacy;
+import com.discord.widgets.settings.WidgetSettingsAuthorizedApps;
 import d0.z.d.m;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings$onViewBound$1$9 implements View.OnClickListener {
@@ -10,7 +10,7 @@ public final class WidgetSettings$onViewBound$1$9 implements View.OnClickListene
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetSettingsPrivacy.Companion companion = WidgetSettingsPrivacy.Companion;
+        WidgetSettingsAuthorizedApps.Companion companion = WidgetSettingsAuthorizedApps.Companion;
         m.checkNotNullExpressionValue(view, "it");
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "it.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func5$0.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func5$0.java
new file mode 100644
index 0000000000..839933d477
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$sam$rx_functions_Func5$0.java
@@ -0,0 +1,17 @@
+package com.discord.widgets.settings;
+
+import kotlin.jvm.functions.Function5;
+import rx.functions.Func5;
+/* compiled from: WidgetSettings.kt */
+public final class WidgetSettings$sam$rx_functions_Func5$0 implements Func5 {
+    private final /* synthetic */ Function5 function;
+
+    public WidgetSettings$sam$rx_functions_Func5$0(Function5 function5) {
+        this.function = function5;
+    }
+
+    @Override // rx.functions.Func5
+    public final /* synthetic */ Object call(Object obj, Object obj2, Object obj3, Object obj4, Object obj5) {
+        return this.function.invoke(obj, obj2, obj3, obj4, obj5);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
index 2d90d041e4..01564868e4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@@ -1,9 +1,11 @@
 package com.discord.widgets.settings;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
@@ -28,6 +30,8 @@ import com.discord.widgets.tabs.WidgetTabsHost;
 import com.discord.widgets.user.Badge;
 import com.discord.widgets.user.profile.UserProfileHeaderView;
 import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+import com.google.android.material.shape.MaterialShapeDrawable;
+import com.google.android.material.shape.ShapeAppearanceModel;
 import d0.t.n;
 import d0.z.d.a0;
 import d0.z.d.m;
@@ -37,7 +41,7 @@ import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
 import rx.Observable;
-import rx.functions.Func3;
+import rx.functions.Func5;
 /* compiled from: WidgetSettings.kt */
 public final class WidgetSettings extends AppFragment implements OnTabSelectedListener {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetSettings.class, "binding", "getBinding()Lcom/discord/databinding/WidgetSettingsBinding;", 0)};
@@ -47,9 +51,11 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
     /* compiled from: WidgetSettings.kt */
     public static final class Model {
         public static final Companion Companion = new Companion(null);
+        private final boolean isCustomProfilesEditingEnabled;
         private final boolean isStaffOrAlpha;
         private final MeUser meUser;
         private final Presence presence;
+        private final int promoCount;
 
         /* compiled from: WidgetSettings.kt */
         public static final class Companion {
@@ -61,41 +67,52 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
             }
 
             /* JADX WARN: Multi-variable type inference failed */
+            /* JADX DEBUG: Type inference failed for r6v0. Raw type applied. Possible types: rx.Observable<R>, rx.Observable */
             /* JADX WARNING: Unknown variable types count: 1 */
             public final Observable<Model> get() {
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable<MeUser> observeMe = companion.getUsers().observeMe(true);
                 Observable<Boolean> experimentalAlpha = companion.getExperiments().getExperimentalAlpha();
                 Observable<Presence> observeLocalPresence = companion.getPresences().observeLocalPresence();
-                WidgetSettings$Model$Companion$get$1 widgetSettings$Model$Companion$get$1 = WidgetSettings$Model$Companion$get$1.INSTANCE;
-                if (widgetSettings$Model$Companion$get$1 != null) {
-                    widgetSettings$Model$Companion$get$1 = new WidgetSettings$sam$rx_functions_Func3$0(widgetSettings$Model$Companion$get$1);
+                Observable F = companion.getOutboundPromotions().observeState().F(WidgetSettings$Model$Companion$get$1.INSTANCE);
+                Observable<Boolean> observeIsEnabled = CustomProfilesEditingFeatureFlag.Companion.getINSTANCE().observeIsEnabled();
+                WidgetSettings$Model$Companion$get$2 widgetSettings$Model$Companion$get$2 = WidgetSettings$Model$Companion$get$2.INSTANCE;
+                if (widgetSettings$Model$Companion$get$2 != null) {
+                    widgetSettings$Model$Companion$get$2 = new WidgetSettings$sam$rx_functions_Func5$0(widgetSettings$Model$Companion$get$2);
                 }
-                Observable<Model> i = Observable.i(observeMe, experimentalAlpha, observeLocalPresence, (Func3) widgetSettings$Model$Companion$get$1);
-                m.checkNotNullExpressionValue(i, "Observable\n            .…    ::Model\n            )");
-                return i;
+                Observable<Model> g = Observable.g(observeMe, experimentalAlpha, observeLocalPresence, F, observeIsEnabled, (Func5) widgetSettings$Model$Companion$get$2);
+                m.checkNotNullExpressionValue(g, "Observable\n            .…    ::Model\n            )");
+                return g;
             }
         }
 
-        public Model(MeUser meUser, boolean z2, Presence presence) {
+        public Model(MeUser meUser, boolean z2, Presence presence, int i, boolean z3) {
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(presence, "presence");
             this.meUser = meUser;
             this.isStaffOrAlpha = z2;
             this.presence = presence;
+            this.promoCount = i;
+            this.isCustomProfilesEditingEnabled = z3;
         }
 
-        public static /* synthetic */ Model copy$default(Model model, MeUser meUser, boolean z2, Presence presence, int i, Object obj) {
-            if ((i & 1) != 0) {
+        public static /* synthetic */ Model copy$default(Model model, MeUser meUser, boolean z2, Presence presence, int i, boolean z3, int i2, Object obj) {
+            if ((i2 & 1) != 0) {
                 meUser = model.meUser;
             }
-            if ((i & 2) != 0) {
+            if ((i2 & 2) != 0) {
                 z2 = model.isStaffOrAlpha;
             }
-            if ((i & 4) != 0) {
+            if ((i2 & 4) != 0) {
                 presence = model.presence;
             }
-            return model.copy(meUser, z2, presence);
+            if ((i2 & 8) != 0) {
+                i = model.promoCount;
+            }
+            if ((i2 & 16) != 0) {
+                z3 = model.isCustomProfilesEditingEnabled;
+            }
+            return model.copy(meUser, z2, presence, i, z3);
         }
 
         public final MeUser component1() {
@@ -110,10 +127,18 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
             return this.presence;
         }
 
-        public final Model copy(MeUser meUser, boolean z2, Presence presence) {
+        public final int component4() {
+            return this.promoCount;
+        }
+
+        public final boolean component5() {
+            return this.isCustomProfilesEditingEnabled;
+        }
+
+        public final Model copy(MeUser meUser, boolean z2, Presence presence, int i, boolean z3) {
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(presence, "presence");
-            return new Model(meUser, z2, presence);
+            return new Model(meUser, z2, presence, i, z3);
         }
 
         public boolean equals(Object obj) {
@@ -124,7 +149,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.meUser, model.meUser) && this.isStaffOrAlpha == model.isStaffOrAlpha && m.areEqual(this.presence, model.presence);
+            return m.areEqual(this.meUser, model.meUser) && this.isStaffOrAlpha == model.isStaffOrAlpha && m.areEqual(this.presence, model.presence) && this.promoCount == model.promoCount && this.isCustomProfilesEditingEnabled == model.isCustomProfilesEditingEnabled;
         }
 
         public final MeUser getMeUser() {
@@ -135,23 +160,37 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
             return this.presence;
         }
 
+        public final int getPromoCount() {
+            return this.promoCount;
+        }
+
         public int hashCode() {
             MeUser meUser = this.meUser;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             boolean z2 = this.isStaffOrAlpha;
+            int i2 = 1;
             if (z2) {
                 z2 = true;
             }
-            int i2 = z2 ? 1 : 0;
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
-            int i5 = (hashCode + i2) * 31;
+            int i5 = z2 ? 1 : 0;
+            int i6 = (hashCode + i3) * 31;
             Presence presence = this.presence;
             if (presence != null) {
                 i = presence.hashCode();
             }
-            return i5 + i;
+            int i7 = (((i6 + i) * 31) + this.promoCount) * 31;
+            boolean z3 = this.isCustomProfilesEditingEnabled;
+            if (!z3) {
+                i2 = z3 ? 1 : 0;
+            }
+            return i7 + i2;
+        }
+
+        public final boolean isCustomProfilesEditingEnabled() {
+            return this.isCustomProfilesEditingEnabled;
         }
 
         public final boolean isStaffOrAlpha() {
@@ -165,13 +204,15 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
             L.append(this.isStaffOrAlpha);
             L.append(", presence=");
             L.append(this.presence);
-            L.append(")");
-            return L.toString();
+            L.append(", promoCount=");
+            L.append(this.promoCount);
+            L.append(", isCustomProfilesEditingEnabled=");
+            return a.G(L, this.isCustomProfilesEditingEnabled, ")");
         }
     }
 
     public WidgetSettings() {
-        super(2131559181);
+        super(2131559187);
         WidgetSettings$viewModelUserProfileHeader$2 widgetSettings$viewModelUserProfileHeader$2 = WidgetSettings$viewModelUserProfileHeader$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModelUserProfileHeader$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(UserProfileHeaderViewModel.class), new WidgetSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettings$viewModelUserProfileHeader$2));
@@ -187,7 +228,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
 
     private final void configureToolbar() {
         bindToolbar();
-        setActionBarTitle(2131894256);
+        setActionBarTitle(2131894357);
         setActionBarTitleLayoutMinimumTappableArea();
         AppFragment.setActionBarOptionsMenu$default(this, 2131623962, new WidgetSettings$configureToolbar$1(this), null, 4, null);
     }
@@ -210,23 +251,43 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         m.checkNotNullExpressionValue(textView2, "developerOptions");
         textView2.setVisibility(z2 ? 0 : 8);
         binding.m.setOnClickListener(WidgetSettings$configureUI$1$1.INSTANCE);
-        LinearLayout linearLayout = binding.t;
+        LinearLayout linearLayout = binding.u;
         m.checkNotNullExpressionValue(linearLayout, "nitroSettingsContainer");
-        if (!isVerified) {
-            i = 8;
-        }
-        linearLayout.setVisibility(i);
-        TextView textView3 = binding.f1919y;
+        linearLayout.setVisibility(isVerified ? 0 : 8);
+        TextView textView3 = binding.A;
         m.checkNotNullExpressionValue(textView3, "settingsNitro");
-        textView3.setText(getString(hasSubscription ? 2131886914 : 2131892252));
+        textView3.setText(getString(hasSubscription ? 2131886914 : 2131892328));
         TextView textView4 = binding.q;
         m.checkNotNullExpressionValue(textView4, "nitroBoosting");
-        textView4.setText(getString(hasSubscription ? 2131892030 : 2131892246));
+        textView4.setText(getString(hasSubscription ? 2131892101 : 2131892322));
         Presence presence = model.getPresence();
-        binding.A.setPresence(presence);
-        TextView textView5 = binding.f1920z;
+        binding.C.setPresence(presence);
+        TextView textView5 = binding.B;
         m.checkNotNullExpressionValue(textView5, "settingsPresenceText");
         textView5.setText(getString(PresenceUtils.INSTANCE.getStatusStringResForPresence(presence)));
+        if (model.getPromoCount() > 0) {
+            TextView textView6 = binding.r;
+            m.checkNotNullExpressionValue(textView6, "nitroGiftingBadge");
+            textView6.setText(String.valueOf(model.getPromoCount()));
+            TextView textView7 = binding.r;
+            m.checkNotNullExpressionValue(textView7, "nitroGiftingBadge");
+            MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(new ShapeAppearanceModel.Builder().setAllCornerSizes(ShapeAppearanceModel.PILL).build());
+            materialShapeDrawable.setFillColor(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), 2131100324)));
+            textView7.setBackground(materialShapeDrawable);
+            TextView textView8 = binding.r;
+            m.checkNotNullExpressionValue(textView8, "nitroGiftingBadge");
+            textView8.setVisibility(0);
+        } else {
+            TextView textView9 = binding.r;
+            m.checkNotNullExpressionValue(textView9, "nitroGiftingBadge");
+            textView9.setVisibility(8);
+        }
+        TextView textView10 = getBinding().f1920x;
+        m.checkNotNullExpressionValue(textView10, "binding.profile");
+        if (!model.isCustomProfilesEditingEnabled()) {
+            i = 8;
+        }
+        textView10.setVisibility(i);
     }
 
     private final WidgetSettingsBinding getBinding() {
@@ -240,7 +301,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
     private final void showLogoutDialog(Context context) {
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131890887).setMessage(2131894302).setDialogAttrTheme(2130969788).setPositiveButton(2131890887, WidgetSettings$showLogoutDialog$1.INSTANCE), 2131887178, (Function1) null, 2, (Object) null).show(parentFragmentManager);
+        WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131890957).setMessage(2131894410).setDialogAttrTheme(2130969788).setPositiveButton(2131890957, WidgetSettings$showLogoutDialog$1.INSTANCE), 2131887178, (Function1) null, 2, (Object) null).show(parentFragmentManager);
     }
 
     @Override // com.discord.widgets.tabs.OnTabSelectedListener
@@ -262,8 +323,8 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
             widgetTabsHost.registerTabSelectionListener(NavigationTab.SETTINGS, this);
         }
         WidgetSettingsBinding binding = getBinding();
-        binding.f1918x.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$1(this));
-        UserProfileHeaderView userProfileHeaderView = binding.F;
+        binding.f1922z.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$1(this));
+        UserProfileHeaderView userProfileHeaderView = binding.H;
         Badge.Companion companion = Badge.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -271,28 +332,29 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
         String string = getString(2131886360);
-        textView.setText(string + " - 81.14 - Stable (81014)");
-        binding.w.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this));
-        binding.t.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE);
+        textView.setText(string + " - 82.19 - Stable (82019)");
+        binding.f1921y.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this));
+        binding.u.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
-        binding.r.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
-        binding.f1916c.setOnClickListener(WidgetSettings$onViewBound$1$7.INSTANCE);
-        binding.i.setOnClickListener(WidgetSettings$onViewBound$1$8.INSTANCE);
-        binding.v.setOnClickListener(WidgetSettings$onViewBound$1$9.INSTANCE);
-        binding.l.setOnClickListener(WidgetSettings$onViewBound$1$10.INSTANCE);
-        binding.h.setOnClickListener(WidgetSettings$onViewBound$1$11.INSTANCE);
-        binding.b.setOnClickListener(WidgetSettings$onViewBound$1$12.INSTANCE);
-        binding.j.setOnClickListener(WidgetSettings$onViewBound$1$13.INSTANCE);
-        binding.p.setOnClickListener(WidgetSettings$onViewBound$1$14.INSTANCE);
-        binding.e.setOnClickListener(WidgetSettings$onViewBound$1$15.INSTANCE);
-        binding.u.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
-        binding.C.setOnClickListener(WidgetSettings$onViewBound$1$17.INSTANCE);
-        binding.G.setOnClickListener(WidgetSettings$onViewBound$1$18.INSTANCE);
-        binding.B.setOnClickListener(WidgetSettings$onViewBound$1$19.INSTANCE);
-        binding.D.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$4(binding, this));
-        binding.d.setOnClickListener(WidgetSettings$onViewBound$1$21.INSTANCE);
-        binding.k.setOnClickListener(WidgetSettings$onViewBound$1$22.INSTANCE);
-        for (TextView textView2 : n.listOf((Object[]) new TextView[]{binding.E, binding.f1917s, binding.g, binding.o, binding.f})) {
+        binding.f1919s.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
+        binding.f1918c.setOnClickListener(WidgetSettings$onViewBound$1$7.INSTANCE);
+        binding.f1920x.setOnClickListener(WidgetSettings$onViewBound$1$8.INSTANCE);
+        binding.i.setOnClickListener(WidgetSettings$onViewBound$1$9.INSTANCE);
+        binding.w.setOnClickListener(WidgetSettings$onViewBound$1$10.INSTANCE);
+        binding.l.setOnClickListener(WidgetSettings$onViewBound$1$11.INSTANCE);
+        binding.h.setOnClickListener(WidgetSettings$onViewBound$1$12.INSTANCE);
+        binding.b.setOnClickListener(WidgetSettings$onViewBound$1$13.INSTANCE);
+        binding.j.setOnClickListener(WidgetSettings$onViewBound$1$14.INSTANCE);
+        binding.p.setOnClickListener(WidgetSettings$onViewBound$1$15.INSTANCE);
+        binding.e.setOnClickListener(WidgetSettings$onViewBound$1$16.INSTANCE);
+        binding.v.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
+        binding.E.setOnClickListener(WidgetSettings$onViewBound$1$18.INSTANCE);
+        binding.I.setOnClickListener(WidgetSettings$onViewBound$1$19.INSTANCE);
+        binding.D.setOnClickListener(WidgetSettings$onViewBound$1$20.INSTANCE);
+        binding.F.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$4(binding, this));
+        binding.d.setOnClickListener(WidgetSettings$onViewBound$1$22.INSTANCE);
+        binding.k.setOnClickListener(WidgetSettings$onViewBound$1$23.INSTANCE);
+        for (TextView textView2 : n.listOf((Object[]) new TextView[]{binding.G, binding.t, binding.g, binding.o, binding.f})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView2, "header");
             accessibilityUtils.setViewIsHeading(textView2);
@@ -303,9 +365,9 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         UserProfileHeaderView.Companion companion = UserProfileHeaderView.Companion;
-        UserProfileHeaderView userProfileHeaderView = getBinding().F;
+        UserProfileHeaderView userProfileHeaderView = getBinding().H;
         m.checkNotNullExpressionValue(userProfileHeaderView, "binding.userSettingsProfileHeaderView");
-        companion.bind(userProfileHeaderView, this, getViewModelUserProfileHeader());
+        companion.bind(userProfileHeaderView, this, getViewModelUserProfileHeader().observeViewState());
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Model.Companion.get()), this, null, 2, null), WidgetSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettings$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java
index 0fa40a1cba..549b2a084e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$binding$2.java
@@ -20,41 +20,41 @@ public final /* synthetic */ class WidgetSettingsAccessibility$binding$2 extends
 
     public final WidgetSettingsAccessibilityBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364732;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364732);
+        int i = 2131364781;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364781);
         if (checkedSetting != null) {
-            i = 2131364733;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364733);
+            i = 2131364782;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364782);
             if (checkedSetting2 != null) {
-                i = 2131364734;
-                TextView textView = (TextView) view.findViewById(2131364734);
+                i = 2131364783;
+                TextView textView = (TextView) view.findViewById(2131364783);
                 if (textView != null) {
-                    i = 2131364735;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364735);
+                    i = 2131364784;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364784);
                     if (linkifiedTextView != null) {
-                        i = 2131364736;
-                        TextView textView2 = (TextView) view.findViewById(2131364736);
+                        i = 2131364785;
+                        TextView textView2 = (TextView) view.findViewById(2131364785);
                         if (textView2 != null) {
-                            i = 2131364737;
-                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364737);
+                            i = 2131364786;
+                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364786);
                             if (checkedSetting3 != null) {
-                                i = 2131364738;
-                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364738);
+                                i = 2131364787;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364787);
                                 if (linearLayout != null) {
-                                    i = 2131364739;
-                                    TextView textView3 = (TextView) view.findViewById(2131364739);
+                                    i = 2131364788;
+                                    TextView textView3 = (TextView) view.findViewById(2131364788);
                                     if (textView3 != null) {
-                                        i = 2131364791;
-                                        View findViewById = view.findViewById(2131364791);
+                                        i = 2131364840;
+                                        View findViewById = view.findViewById(2131364840);
                                         if (findViewById != null) {
-                                            i = 2131365113;
-                                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365113);
+                                            i = 2131365168;
+                                            CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131365168);
                                             if (checkedSetting4 != null) {
-                                                i = 2131365114;
-                                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365114);
+                                                i = 2131365169;
+                                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131365169);
                                                 if (checkedSetting5 != null) {
-                                                    i = 2131365115;
-                                                    CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365115);
+                                                    i = 2131365170;
+                                                    CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365170);
                                                     if (checkedSetting6 != null) {
                                                         return new WidgetSettingsAccessibilityBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, textView, linkifiedTextView, textView2, checkedSetting3, linearLayout, textView3, findViewById, checkedSetting4, checkedSetting5, checkedSetting6);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java
index dea57436b9..0fcf91a32b 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$configureUI$2.java
@@ -13,8 +13,8 @@ public final class WidgetSettingsAccessibility$configureUI$2 implements View.OnC
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        CheckedSetting checkedSetting = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f1902c;
-        CheckedSetting checkedSetting2 = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f1902c;
+        CheckedSetting checkedSetting = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f1904c;
+        CheckedSetting checkedSetting2 = WidgetSettingsAccessibility.access$getBinding$p(this.this$0).f1904c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
         checkedSetting.g(!checkedSetting2.isChecked(), true);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
index 499b3cee5b..0f9a9b4bc9 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility.java
@@ -179,7 +179,7 @@ public final class WidgetSettingsAccessibility extends AppFragment {
     }
 
     public WidgetSettingsAccessibility() {
-        super(2131559182);
+        super(2131559188);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccessibility widgetSettingsAccessibility, Model model) {
@@ -208,7 +208,7 @@ public final class WidgetSettingsAccessibility extends AppFragment {
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsAccessib…tyAllowAnimateEmojiSwitch");
             checkedSetting2.setChecked(false);
             for (CheckedSetting checkedSetting3 : n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k})) {
-                checkedSetting3.b(2131893577);
+                checkedSetting3.b(2131893674);
             }
             if (model.getCurrentStickerAnimationSettings() != 2) {
                 RadioManager radioManager = this.stickersAnimationRadioManager;
@@ -225,10 +225,10 @@ public final class WidgetSettingsAccessibility extends AppFragment {
                     radioManager2.a(checkedSetting5);
                 }
             }
-            CheckedSetting checkedSetting6 = getBinding().f1902c;
+            CheckedSetting checkedSetting6 = getBinding().f1904c;
             m.checkNotNullExpressionValue(checkedSetting6, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
             checkedSetting6.setChecked(false);
-            getBinding().f1902c.b(2131886133);
+            getBinding().f1904c.b(2131886133);
             return;
         }
         CheckedSetting checkedSetting7 = getBinding().b;
@@ -246,11 +246,11 @@ public final class WidgetSettingsAccessibility extends AppFragment {
         CheckedSetting checkedSetting10 = getBinding().k;
         m.checkNotNullExpressionValue(checkedSetting10, "binding.stickersNeverAnimate");
         configureStickerAnimationRadio(currentStickerAnimationSettings3, checkedSetting10, 2);
-        CheckedSetting checkedSetting11 = getBinding().f1902c;
+        CheckedSetting checkedSetting11 = getBinding().f1904c;
         m.checkNotNullExpressionValue(checkedSetting11, "binding.settingsAccessib…ityAllowAutoplayGifSwitch");
         checkedSetting11.setChecked(model.getAutoPlayGifs());
         getBinding().b.e(new WidgetSettingsAccessibility$configureUI$1(this));
-        getBinding().f1902c.e(new WidgetSettingsAccessibility$configureUI$2(this));
+        getBinding().f1904c.e(new WidgetSettingsAccessibility$configureUI$2(this));
     }
 
     private final WidgetSettingsAccessibilityBinding getBinding() {
@@ -262,14 +262,14 @@ public final class WidgetSettingsAccessibility extends AppFragment {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(), this, null, 2, null), WidgetSettingsAccessibility.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAccessibility$onViewBoundOrOnResume$1(this), 62, (Object) null);
         setActionBarTitle(2131886116);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().g.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$2.INSTANCE);
         LinkifiedTextView linkifiedTextView = getBinding().e;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsAccessib…yReducedMotionDescription");
-        b.n(linkifiedTextView, 2131886131, new Object[]{f.a.a(360040613412L, null)}, null, 4);
+        b.m(linkifiedTextView, 2131886131, new Object[]{f.a.a(360040613412L, null)}, null, 4);
         getBinding().b.setOnCheckedListener(new WidgetSettingsAccessibility$onViewBoundOrOnResume$3(this));
-        getBinding().f1902c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE);
+        getBinding().f1904c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE);
         this.stickersAnimationRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k}));
         for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().f, getBinding().d, getBinding().h})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java
index 246b3f5766..e673993ad2 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetSettingsActivityStatus$binding$2 extend
 
     public final WidgetSettingsActivityStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364938);
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364988);
         if (checkedSetting != null) {
             return new WidgetSettingsActivityStatusBinding((CoordinatorLayout) view, checkedSetting);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364938)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364988)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java
index a531274490..1eaf0db13e 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java
@@ -39,7 +39,7 @@ public final class WidgetSettingsActivityStatus extends AppFragment {
     }
 
     public WidgetSettingsActivityStatus() {
-        super(2131559189);
+        super(2131559195);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsActivityStatus widgetSettingsActivityStatus, boolean z2) {
@@ -61,7 +61,7 @@ public final class WidgetSettingsActivityStatus extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         setActionBarTitle(2131886233);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java
index faa5a565de..6ed86df8b6 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java
@@ -10,7 +10,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import c.a.i.j4;
+import c.a.i.m4;
 import com.discord.databinding.WidgetSettingsAppearanceBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.utilities.view.text.SimpleDraweeSpanTextView;
@@ -30,125 +30,125 @@ public final /* synthetic */ class WidgetSettingsAppearance$binding$2 extends k
 
     public final WidgetSettingsAppearanceBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362504;
-        View findViewById = view.findViewById(2131362504);
+        int i = 2131362517;
+        View findViewById = view.findViewById(2131362517);
         if (findViewById != null) {
-            int i2 = 2131362517;
-            View findViewById2 = findViewById.findViewById(2131362517);
+            int i2 = 2131362530;
+            View findViewById2 = findViewById.findViewById(2131362530);
             if (findViewById2 != null) {
-                i2 = 2131362519;
-                View findViewById3 = findViewById.findViewById(2131362519);
+                i2 = 2131362532;
+                View findViewById3 = findViewById.findViewById(2131362532);
                 if (findViewById3 != null) {
-                    i2 = 2131362522;
-                    LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(2131362522);
+                    i2 = 2131362535;
+                    LinearLayout linearLayout = (LinearLayout) findViewById.findViewById(2131362535);
                     if (linearLayout != null) {
-                        i2 = 2131362523;
-                        View findViewById4 = findViewById.findViewById(2131362523);
+                        i2 = 2131362536;
+                        View findViewById4 = findViewById.findViewById(2131362536);
                         if (findViewById4 != null) {
-                            i2 = 2131362529;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131362529);
+                            i2 = 2131362542;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131362542);
                             if (linkifiedTextView != null) {
-                                i2 = 2131362530;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131362530);
+                                i2 = 2131362543;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131362543);
                                 if (simpleDraweeView != null) {
-                                    i2 = 2131362532;
-                                    FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(2131362532);
+                                    i2 = 2131362545;
+                                    FrameLayout frameLayout = (FrameLayout) findViewById.findViewById(2131362545);
                                     if (frameLayout != null) {
-                                        i2 = 2131362533;
-                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById.findViewById(2131362533);
+                                        i2 = 2131362546;
+                                        SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById.findViewById(2131362546);
                                         if (simpleDraweeView2 != null) {
-                                            i2 = 2131362534;
-                                            ImageView imageView = (ImageView) findViewById.findViewById(2131362534);
+                                            i2 = 2131362547;
+                                            ImageView imageView = (ImageView) findViewById.findViewById(2131362547);
                                             if (imageView != null) {
-                                                i2 = 2131362535;
-                                                FrameLayout frameLayout2 = (FrameLayout) findViewById.findViewById(2131362535);
+                                                i2 = 2131362548;
+                                                FrameLayout frameLayout2 = (FrameLayout) findViewById.findViewById(2131362548);
                                                 if (frameLayout2 != null) {
-                                                    i2 = 2131362536;
-                                                    TextView textView = (TextView) findViewById.findViewById(2131362536);
+                                                    i2 = 2131362549;
+                                                    TextView textView = (TextView) findViewById.findViewById(2131362549);
                                                     if (textView != null) {
-                                                        i2 = 2131362538;
-                                                        ImageView imageView2 = (ImageView) findViewById.findViewById(2131362538);
+                                                        i2 = 2131362551;
+                                                        ImageView imageView2 = (ImageView) findViewById.findViewById(2131362551);
                                                         if (imageView2 != null) {
-                                                            i2 = 2131362539;
-                                                            ConstraintLayout constraintLayout = (ConstraintLayout) findViewById.findViewById(2131362539);
+                                                            i2 = 2131362552;
+                                                            ConstraintLayout constraintLayout = (ConstraintLayout) findViewById.findViewById(2131362552);
                                                             if (constraintLayout != null) {
-                                                                i2 = 2131362540;
-                                                                TextView textView2 = (TextView) findViewById.findViewById(2131362540);
+                                                                i2 = 2131362553;
+                                                                TextView textView2 = (TextView) findViewById.findViewById(2131362553);
                                                                 if (textView2 != null) {
-                                                                    i2 = 2131362541;
-                                                                    TextView textView3 = (TextView) findViewById.findViewById(2131362541);
+                                                                    i2 = 2131362554;
+                                                                    TextView textView3 = (TextView) findViewById.findViewById(2131362554);
                                                                     if (textView3 != null) {
-                                                                        i2 = 2131362542;
-                                                                        SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById.findViewById(2131362542);
+                                                                        i2 = 2131362555;
+                                                                        SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById.findViewById(2131362555);
                                                                         if (simpleDraweeSpanTextView != null) {
-                                                                            i2 = 2131362543;
-                                                                            TextView textView4 = (TextView) findViewById.findViewById(2131362543);
+                                                                            i2 = 2131362556;
+                                                                            TextView textView4 = (TextView) findViewById.findViewById(2131362556);
                                                                             if (textView4 != null) {
-                                                                                i2 = 2131362544;
-                                                                                TextView textView5 = (TextView) findViewById.findViewById(2131362544);
+                                                                                i2 = 2131362557;
+                                                                                TextView textView5 = (TextView) findViewById.findViewById(2131362557);
                                                                                 if (textView5 != null) {
-                                                                                    i2 = 2131362545;
-                                                                                    AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById.findViewById(2131362545);
+                                                                                    i2 = 2131362558;
+                                                                                    AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById.findViewById(2131362558);
                                                                                     if (appCompatImageView != null) {
-                                                                                        i2 = 2131362596;
-                                                                                        TypingDots typingDots = (TypingDots) findViewById.findViewById(2131362596);
+                                                                                        i2 = 2131362609;
+                                                                                        TypingDots typingDots = (TypingDots) findViewById.findViewById(2131362609);
                                                                                         if (typingDots != null) {
-                                                                                            i2 = 2131365273;
-                                                                                            ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById.findViewById(2131365273);
+                                                                                            i2 = 2131365328;
+                                                                                            ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById.findViewById(2131365328);
                                                                                             if (constraintLayout2 != null) {
-                                                                                                i2 = 2131365274;
-                                                                                                ImageView imageView3 = (ImageView) findViewById.findViewById(2131365274);
+                                                                                                i2 = 2131365329;
+                                                                                                ImageView imageView3 = (ImageView) findViewById.findViewById(2131365329);
                                                                                                 if (imageView3 != null) {
-                                                                                                    i2 = 2131365275;
-                                                                                                    TextView textView6 = (TextView) findViewById.findViewById(2131365275);
+                                                                                                    i2 = 2131365330;
+                                                                                                    TextView textView6 = (TextView) findViewById.findViewById(2131365330);
                                                                                                     if (textView6 != null) {
-                                                                                                        i2 = 2131365328;
-                                                                                                        Guideline guideline = (Guideline) findViewById.findViewById(2131365328);
+                                                                                                        i2 = 2131365384;
+                                                                                                        Guideline guideline = (Guideline) findViewById.findViewById(2131365384);
                                                                                                         if (guideline != null) {
-                                                                                                            j4 j4Var = new j4((ConstraintLayout) findViewById, findViewById2, findViewById3, linearLayout, findViewById4, linkifiedTextView, simpleDraweeView, frameLayout, simpleDraweeView2, imageView, frameLayout2, textView, imageView2, constraintLayout, textView2, textView3, simpleDraweeSpanTextView, textView4, textView5, appCompatImageView, typingDots, constraintLayout2, imageView3, textView6, guideline);
-                                                                                                            i = 2131364784;
-                                                                                                            TextView textView7 = (TextView) view.findViewById(2131364784);
+                                                                                                            m4 m4Var = new m4((ConstraintLayout) findViewById, findViewById2, findViewById3, linearLayout, findViewById4, linkifiedTextView, simpleDraweeView, frameLayout, simpleDraweeView2, imageView, frameLayout2, textView, imageView2, constraintLayout, textView2, textView3, simpleDraweeSpanTextView, textView4, textView5, appCompatImageView, typingDots, constraintLayout2, imageView3, textView6, guideline);
+                                                                                                            i = 2131364833;
+                                                                                                            TextView textView7 = (TextView) view.findViewById(2131364833);
                                                                                                             if (textView7 != null) {
-                                                                                                                i = 2131364785;
-                                                                                                                TextView textView8 = (TextView) view.findViewById(2131364785);
+                                                                                                                i = 2131364834;
+                                                                                                                TextView textView8 = (TextView) view.findViewById(2131364834);
                                                                                                                 if (textView8 != null) {
-                                                                                                                    i = 2131364786;
-                                                                                                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364786);
+                                                                                                                    i = 2131364835;
+                                                                                                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364835);
                                                                                                                     if (linearLayout2 != null) {
-                                                                                                                        i = 2131364787;
-                                                                                                                        TextView textView9 = (TextView) view.findViewById(2131364787);
+                                                                                                                        i = 2131364836;
+                                                                                                                        TextView textView9 = (TextView) view.findViewById(2131364836);
                                                                                                                         if (textView9 != null) {
-                                                                                                                            i = 2131364788;
-                                                                                                                            SeekBar seekBar = (SeekBar) view.findViewById(2131364788);
+                                                                                                                            i = 2131364837;
+                                                                                                                            SeekBar seekBar = (SeekBar) view.findViewById(2131364837);
                                                                                                                             if (seekBar != null) {
-                                                                                                                                i = 2131364789;
-                                                                                                                                TextView textView10 = (TextView) view.findViewById(2131364789);
+                                                                                                                                i = 2131364838;
+                                                                                                                                TextView textView10 = (TextView) view.findViewById(2131364838);
                                                                                                                                 if (textView10 != null) {
-                                                                                                                                    i = 2131364790;
-                                                                                                                                    TextView textView11 = (TextView) view.findViewById(2131364790);
+                                                                                                                                    i = 2131364839;
+                                                                                                                                    TextView textView11 = (TextView) view.findViewById(2131364839);
                                                                                                                                     if (textView11 != null) {
-                                                                                                                                        i = 2131364791;
-                                                                                                                                        View findViewById5 = view.findViewById(2131364791);
+                                                                                                                                        i = 2131364840;
+                                                                                                                                        View findViewById5 = view.findViewById(2131364840);
                                                                                                                                         if (findViewById5 != null) {
-                                                                                                                                            i = 2131364792;
-                                                                                                                                            TextView textView12 = (TextView) view.findViewById(2131364792);
+                                                                                                                                            i = 2131364841;
+                                                                                                                                            TextView textView12 = (TextView) view.findViewById(2131364841);
                                                                                                                                             if (textView12 != null) {
-                                                                                                                                                i = 2131364793;
-                                                                                                                                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364793);
+                                                                                                                                                i = 2131364842;
+                                                                                                                                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364842);
                                                                                                                                                 if (checkedSetting != null) {
-                                                                                                                                                    i = 2131364794;
-                                                                                                                                                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364794);
+                                                                                                                                                    i = 2131364843;
+                                                                                                                                                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364843);
                                                                                                                                                     if (checkedSetting2 != null) {
-                                                                                                                                                        i = 2131364795;
-                                                                                                                                                        TextView textView13 = (TextView) view.findViewById(2131364795);
+                                                                                                                                                        i = 2131364844;
+                                                                                                                                                        TextView textView13 = (TextView) view.findViewById(2131364844);
                                                                                                                                                         if (textView13 != null) {
-                                                                                                                                                            i = 2131364796;
-                                                                                                                                                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364796);
+                                                                                                                                                            i = 2131364845;
+                                                                                                                                                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364845);
                                                                                                                                                             if (checkedSetting3 != null) {
-                                                                                                                                                                i = 2131364797;
-                                                                                                                                                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364797);
+                                                                                                                                                                i = 2131364846;
+                                                                                                                                                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364846);
                                                                                                                                                                 if (checkedSetting4 != null) {
-                                                                                                                                                                    return new WidgetSettingsAppearanceBinding((CoordinatorLayout) view, j4Var, textView7, textView8, linearLayout2, textView9, seekBar, textView10, textView11, findViewById5, textView12, checkedSetting, checkedSetting2, textView13, checkedSetting3, checkedSetting4);
+                                                                                                                                                                    return new WidgetSettingsAppearanceBinding((CoordinatorLayout) view, m4Var, textView7, textView8, linearLayout2, textView9, seekBar, textView10, textView11, findViewById5, textView12, checkedSetting, checkedSetting2, textView13, checkedSetting3, checkedSetting4);
                                                                                                                                                                 }
                                                                                                                                                             }
                                                                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java
index b85b002ec8..a1157590a3 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java
@@ -83,9 +83,9 @@ public final class WidgetSettingsAppearance$configureUI$2 implements View.OnClic
                 }
             } else if (3 <= andIncrement && 8 > andIncrement) {
                 m.checkNotNullExpressionValue(view, "it");
-                o.h(view.getContext(), b.j(this.this$0, 2131893839, new Object[]{String.valueOf(8 - andIncrement)}, null, 4), 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0), 4);
+                o.h(view.getContext(), b.j(this.this$0, 2131893937, new Object[]{String.valueOf(8 - andIncrement)}, null, 4), 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0), 4);
             } else if (andIncrement == 8) {
-                o.d(this.this$0.getContext(), 2131893840, 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0));
+                o.d(this.this$0.getContext(), 2131893938, 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0));
                 WidgetSettingsAppearance.access$getPureEvilEasterEggSubject$p(this.this$0).onNext(Boolean.TRUE);
             }
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
index 6d236c5823..bc0dbd77ae 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$pureEvilEasterEggSubject$2.java
@@ -16,6 +16,6 @@ public final class WidgetSettingsAppearance$pureEvilEasterEggSubject$2 extends o
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final BehaviorSubject<Boolean> mo1invoke() {
-        return BehaviorSubject.m0(Boolean.valueOf(m.areEqual(StoreStream.Companion.getUserSettingsSystem().getTheme(), "pureEvil")));
+        return BehaviorSubject.l0(Boolean.valueOf(m.areEqual(StoreStream.Companion.getUserSettingsSystem().getTheme(), "pureEvil")));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java
index bda3b9e714..62482d7a9b 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java
@@ -37,9 +37,9 @@ public final class WidgetSettingsAppearance$updateTheme$1 extends o implements F
         public final void invoke(ModelUserSettings modelUserSettings) {
             m.checkNotNullParameter(modelUserSettings, "it");
             if (m.areEqual(this.this$0.$theme, "pureEvil")) {
-                c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893842, 0, null, 12);
+                c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893940, 0, null, 12);
             } else {
-                c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893844, 0, null, 12);
+                c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893942, 0, null, 12);
             }
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
index 67a2fe4b07..8ead0384de 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java
@@ -52,7 +52,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     private static final int PURE_EVIL_UNLOCK_COUNT = 8;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAppearance$binding$2.INSTANCE, null, 2, null);
     private final AtomicInteger holyLightEasterEggCounter = new AtomicInteger(0);
-    private final BehaviorSubject<Integer> newFontScaleSubject = BehaviorSubject.l0();
+    private final BehaviorSubject<Integer> newFontScaleSubject = BehaviorSubject.k0();
     private final AtomicInteger pureEvilEasterEggCounter = new AtomicInteger(0);
     private final Lazy pureEvilEasterEggSubject$delegate = g.lazy(WidgetSettingsAppearance$pureEvilEasterEggSubject$2.INSTANCE);
     private ToastManager toastManager = new ToastManager();
@@ -206,7 +206,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     }
 
     public WidgetSettingsAppearance() {
-        super(2131559190);
+        super(2131559196);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAppearance widgetSettingsAppearance, Model model) {
@@ -297,7 +297,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
         getBinding().f.setOnSeekBarChangeListener(new WidgetSettingsAppearance$configureUI$4(this));
         getBinding().e.setOnClickListener(WidgetSettingsAppearance$configureUI$5.INSTANCE);
         setupMessage(model);
-        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().h, getBinding().f1913c})) {
+        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().h, getBinding().f1915c})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
@@ -327,7 +327,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
     }
 
     private final void setupMessage(Model model) {
-        SimpleDraweeView simpleDraweeView = getBinding().b.f112c;
+        SimpleDraweeView simpleDraweeView = getBinding().b.f128c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.chatItem.chatListAdapterItemTextAvatar");
         IconUtils.setIcon$default(simpleDraweeView, model.getMeUser(), 2131165296, null, null, null, 56, null);
         TextView textView = getBinding().b.e;
@@ -341,18 +341,18 @@ public final class WidgetSettingsAppearance extends AppFragment {
         textView3.setText(TimeUtils.toReadableTimeString$default(requireContext(), ClockFactory.get().currentTimeMillis(), null, 4, null));
         LinkifiedTextView linkifiedTextView = getBinding().b.b;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatItem.chatListAdapterItemText");
-        linkifiedTextView.setText(getString(2131894285));
+        linkifiedTextView.setText(getString(2131894387));
     }
 
     private final void showHolyLight() {
-        o.d(getContext(), 2131893837, 0, this.toastManager);
+        o.d(getContext(), 2131893935, 0, this.toastManager);
         tryEnableTorchMode(true);
         View view = getBinding().g;
         m.checkNotNullExpressionValue(view, "binding.settingsAppearanceHolyLight");
         view.setVisibility(0);
-        Observable<Long> e02 = Observable.e0(3, TimeUnit.SECONDS);
-        m.checkNotNullExpressionValue(e02, "Observable\n        .timer(3, TimeUnit.SECONDS)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetSettingsAppearance.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAppearance$showHolyLight$1(this), 62, (Object) null);
+        Observable<Long> d02 = Observable.d0(3, TimeUnit.SECONDS);
+        m.checkNotNullExpressionValue(d02, "Observable\n        .timer(3, TimeUnit.SECONDS)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetSettingsAppearance.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAppearance$showHolyLight$1(this), 62, (Object) null);
     }
 
     private final void tryEnableTorchMode(boolean z2) {
@@ -388,7 +388,7 @@ public final class WidgetSettingsAppearance extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setActionBarTitle(2131886370);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         SeekBar seekBar = getBinding().f;
         m.checkNotNullExpressionValue(seekBar, "binding.settingsAppearanceFontScalingSeekbar");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java
index ba6eb8626e..5b416a7527 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java
@@ -54,28 +54,28 @@ public final class WidgetSettingsAuthorizedApps$adapter$1 extends o implements F
     public final WidgetSettingsAuthorizedApps.AuthorizedAppViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) {
         m.checkNotNullParameter(layoutInflater, "layoutInflater");
         m.checkNotNullParameter(viewGroup, "parent");
-        View inflate = layoutInflater.inflate(2131559192, viewGroup, false);
-        int i = 2131364065;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131364065);
+        View inflate = layoutInflater.inflate(2131559198, viewGroup, false);
+        int i = 2131364108;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131364108);
         if (appCompatImageView != null) {
-            i = 2131364066;
-            TextView textView = (TextView) inflate.findViewById(2131364066);
+            i = 2131364109;
+            TextView textView = (TextView) inflate.findViewById(2131364109);
             if (textView != null) {
-                i = 2131364067;
-                TextView textView2 = (TextView) inflate.findViewById(2131364067);
+                i = 2131364110;
+                TextView textView2 = (TextView) inflate.findViewById(2131364110);
                 if (textView2 != null) {
-                    i = 2131364068;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364068);
+                    i = 2131364111;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364111);
                     if (simpleDraweeView != null) {
                         MaterialCardView materialCardView = (MaterialCardView) inflate;
-                        i = 2131364070;
-                        TextView textView3 = (TextView) inflate.findViewById(2131364070);
+                        i = 2131364113;
+                        TextView textView3 = (TextView) inflate.findViewById(2131364113);
                         if (textView3 != null) {
-                            i = 2131364071;
-                            TextView textView4 = (TextView) inflate.findViewById(2131364071);
+                            i = 2131364114;
+                            TextView textView4 = (TextView) inflate.findViewById(2131364114);
                             if (textView4 != null) {
-                                i = 2131364072;
-                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364072);
+                                i = 2131364115;
+                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364115);
                                 if (recyclerView != null) {
                                     WidgetSettingsAuthorizedAppsListItemBinding widgetSettingsAuthorizedAppsListItemBinding = new WidgetSettingsAuthorizedAppsListItemBinding(materialCardView, appCompatImageView, textView, textView2, simpleDraweeView, materialCardView, textView3, textView4, recyclerView);
                                     m.checkNotNullExpressionValue(widgetSettingsAuthorizedAppsListItemBinding, "WidgetSettingsAuthorized…tInflater, parent, false)");
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java
index 9159c353fb..ab2598163b 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetSettingsAuthorizedApps$binding$2 extend
 
     public final WidgetSettingsAuthorizedAppsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362064);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362065);
         if (recyclerView != null) {
             return new WidgetSettingsAuthorizedAppsBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362064)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362065)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
index f71e24c727..727ba39a5d 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java
@@ -66,7 +66,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
             RecyclerView recyclerView = widgetSettingsAuthorizedAppsListItemBinding.i;
             m.checkNotNullExpressionValue(recyclerView, "binding.oauthApplicationPermissionsRv");
             recyclerView.setAdapter(simpleRecyclerAdapter);
-            for (TextView textView : n.listOf((Object[]) new TextView[]{widgetSettingsAuthorizedAppsListItemBinding.g, widgetSettingsAuthorizedAppsListItemBinding.f1914c, widgetSettingsAuthorizedAppsListItemBinding.h})) {
+            for (TextView textView : n.listOf((Object[]) new TextView[]{widgetSettingsAuthorizedAppsListItemBinding.g, widgetSettingsAuthorizedAppsListItemBinding.f1916c, widgetSettingsAuthorizedAppsListItemBinding.h})) {
                 AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
                 m.checkNotNullExpressionValue(textView, "header");
                 accessibilityUtils.setViewIsHeading(textView);
@@ -91,7 +91,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
             MaterialCardView materialCardView = this.binding.f;
             m.checkNotNullExpressionValue(materialCardView, "binding.oauthApplicationListItem");
             materialCardView.setContentDescription(application.g());
-            TextView textView2 = this.binding.f1914c;
+            TextView textView2 = this.binding.f1916c;
             m.checkNotNullExpressionValue(textView2, "binding.oauthApplicationDescriptionLabelTv");
             String c2 = application.c();
             int i = 0;
@@ -123,7 +123,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
     }
 
     public WidgetSettingsAuthorizedApps() {
-        super(2131559191);
+        super(2131559197);
     }
 
     public static final /* synthetic */ SimpleRecyclerAdapter access$getAdapter$p(WidgetSettingsAuthorizedApps widgetSettingsAuthorizedApps) {
@@ -144,7 +144,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment {
 
     @MainThread
     public final void deauthorizeApp(long j) {
-        WidgetNoticeDialog.Builder positiveButton = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888044).setMessage(2131888058), 2131887178, (Function1) null, 2, (Object) null).setPositiveButton(2131888043, new WidgetSettingsAuthorizedApps$deauthorizeApp$1(this, j));
+        WidgetNoticeDialog.Builder positiveButton = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888043).setMessage(2131888057), 2131887178, (Function1) null, 2, (Object) null).setPositiveButton(2131888042, new WidgetSettingsAuthorizedApps$deauthorizeApp$1(this, j));
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java
index 69fc2560cc..4bc0761730 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java
@@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetSettingsBehavior$binding$2 extends k im
 
     public final WidgetSettingsBehaviorBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364801;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364801);
+        int i = 2131364850;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364850);
         if (checkedSetting != null) {
-            i = 2131364802;
-            TextView textView = (TextView) view.findViewById(2131364802);
+            i = 2131364851;
+            TextView textView = (TextView) view.findViewById(2131364851);
             if (textView != null) {
-                i = 2131364803;
-                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364803);
+                i = 2131364852;
+                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364852);
                 if (checkedSetting2 != null) {
-                    i = 2131364804;
-                    TextView textView2 = (TextView) view.findViewById(2131364804);
+                    i = 2131364853;
+                    TextView textView2 = (TextView) view.findViewById(2131364853);
                     if (textView2 != null) {
-                        i = 2131364805;
-                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364805);
+                        i = 2131364854;
+                        CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364854);
                         if (checkedSetting3 != null) {
                             return new WidgetSettingsBehaviorBinding((CoordinatorLayout) view, checkedSetting, textView, checkedSetting2, textView2, checkedSetting3);
                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
index 3acce83f2a..851d08d244 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java
@@ -42,7 +42,7 @@ public final class WidgetSettingsBehavior extends AppFragment {
     }
 
     public WidgetSettingsBehavior() {
-        super(2131559193);
+        super(2131559199);
     }
 
     private final WidgetSettingsBehaviorBinding getBinding() {
@@ -57,8 +57,8 @@ public final class WidgetSettingsBehavior extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131888677);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131888678);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StoreUserSettings userSettings = StoreStream.Companion.getUserSettings();
         CheckedSetting checkedSetting = getBinding().f;
@@ -68,16 +68,16 @@ public final class WidgetSettingsBehavior extends AppFragment {
         checkedSetting2.setChecked(userSettings.getIsDeveloperMode());
         Context context = checkedSetting2.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        b.g(context, 2131888107, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4);
+        b.g(context, 2131888106, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4);
         Context context2 = checkedSetting2.getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        checkedSetting2.h(b.g(context2, 2131888107, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4), false);
+        checkedSetting2.h(b.g(context2, 2131888106, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4), false);
         checkedSetting2.setSubtextOnClickListener(new WidgetSettingsBehavior$onViewBound$2$1(checkedSetting2));
         checkedSetting2.setOnCheckedListener(new WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2(this, userSettings));
         CheckedSetting checkedSetting3 = getBinding().b;
         checkedSetting3.setChecked(userSettings.getIsChromeCustomTabsEnabled());
         checkedSetting3.setOnCheckedListener(new WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3(userSettings));
-        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().e, getBinding().f1915c})) {
+        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().e, getBinding().f1917c})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java
index 40923f7a65..ea63748180 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java
@@ -20,23 +20,23 @@ public final /* synthetic */ class WidgetSettingsLanguage$binding$2 extends k im
 
     public final WidgetSettingsLanguageBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364844;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364844);
+        int i = 2131364893;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364893);
         if (relativeLayout != null) {
-            i = 2131364845;
-            ImageView imageView = (ImageView) view.findViewById(2131364845);
+            i = 2131364894;
+            ImageView imageView = (ImageView) view.findViewById(2131364894);
             if (imageView != null) {
-                i = 2131364846;
-                TextView textView = (TextView) view.findViewById(2131364846);
+                i = 2131364895;
+                TextView textView = (TextView) view.findViewById(2131364895);
                 if (textView != null) {
-                    i = 2131364847;
-                    TextView textView2 = (TextView) view.findViewById(2131364847);
+                    i = 2131364896;
+                    TextView textView2 = (TextView) view.findViewById(2131364896);
                     if (textView2 != null) {
-                        i = 2131364851;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364851);
+                        i = 2131364900;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364900);
                         if (checkedSetting != null) {
-                            i = 2131364852;
-                            TextView textView3 = (TextView) view.findViewById(2131364852);
+                            i = 2131364901;
+                            TextView textView3 = (TextView) view.findViewById(2131364901);
                             if (textView3 != null) {
                                 return new WidgetSettingsLanguageBinding((CoordinatorLayout) view, relativeLayout, imageView, textView, textView2, checkedSetting, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java
index 5540068576..1d3784c5e4 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java
@@ -43,7 +43,7 @@ public final class WidgetSettingsLanguage$onViewBound$1 extends o implements Fun
 
             public final void invoke(ModelUserSettings modelUserSettings) {
                 m.checkNotNullParameter(modelUserSettings, "it");
-                c.a.d.o.g(this.this$0.this$0.this$0.requireContext(), 2131890772, 0, null, 12);
+                c.a.d.o.g(this.this$0.this$0.this$0.requireContext(), 2131890840, 0, null, 12);
             }
         }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
index ea4485a6ba..a65cabddb2 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java
@@ -111,72 +111,72 @@ public final class WidgetSettingsLanguage extends AppFragment {
         @DrawableRes
         public final int getLocaleFlagResId(String str) {
             if (str == null) {
-                return 2131232070;
+                return 2131232078;
             }
             switch (str.hashCode()) {
                 case 3141:
-                    return str.equals("bg") ? 2131232064 : 2131232070;
+                    return str.equals("bg") ? 2131232072 : 2131232078;
                 case 3184:
-                    return str.equals("cs") ? 2131232065 : 2131232070;
+                    return str.equals("cs") ? 2131232073 : 2131232078;
                 case 3197:
-                    return str.equals("da") ? 2131232066 : 2131232070;
+                    return str.equals("da") ? 2131232074 : 2131232078;
                 case 3201:
-                    return str.equals("de") ? 2131232067 : 2131232070;
+                    return str.equals("de") ? 2131232075 : 2131232078;
                 case 3239:
-                    return str.equals("el") ? 2131232068 : 2131232070;
+                    return str.equals("el") ? 2131232076 : 2131232078;
                 case 3267:
-                    return str.equals("fi") ? 2131232073 : 2131232070;
+                    return str.equals("fi") ? 2131232081 : 2131232078;
                 case 3276:
-                    return str.equals("fr") ? 2131232074 : 2131232070;
+                    return str.equals("fr") ? 2131232082 : 2131232078;
                 case 3329:
-                    return str.equals("hi") ? 2131232076 : 2131232070;
+                    return str.equals("hi") ? 2131232084 : 2131232078;
                 case 3338:
-                    return str.equals("hr") ? 2131232078 : 2131232070;
+                    return str.equals("hr") ? 2131232086 : 2131232078;
                 case 3341:
-                    return str.equals("hu") ? 2131232079 : 2131232070;
+                    return str.equals("hu") ? 2131232087 : 2131232078;
                 case 3371:
-                    return str.equals("it") ? 2131232080 : 2131232070;
+                    return str.equals("it") ? 2131232088 : 2131232078;
                 case 3383:
-                    return str.equals("ja") ? 2131232081 : 2131232070;
+                    return str.equals("ja") ? 2131232089 : 2131232078;
                 case 3428:
-                    return str.equals("ko") ? 2131232082 : 2131232070;
+                    return str.equals("ko") ? 2131232090 : 2131232078;
                 case 3464:
-                    return str.equals("lt") ? 2131232083 : 2131232070;
+                    return str.equals("lt") ? 2131232091 : 2131232078;
                 case 3518:
-                    return str.equals("nl") ? 2131232084 : 2131232070;
+                    return str.equals("nl") ? 2131232092 : 2131232078;
                 case 3521:
-                    return str.equals("no") ? 2131232085 : 2131232070;
+                    return str.equals("no") ? 2131232093 : 2131232078;
                 case 3580:
-                    return str.equals("pl") ? 2131232086 : 2131232070;
+                    return str.equals("pl") ? 2131232094 : 2131232078;
                 case 3645:
-                    return str.equals("ro") ? 2131232088 : 2131232070;
+                    return str.equals("ro") ? 2131232096 : 2131232078;
                 case 3651:
-                    return str.equals("ru") ? 2131232089 : 2131232070;
+                    return str.equals("ru") ? 2131232097 : 2131232078;
                 case 3700:
-                    return str.equals("th") ? 2131232092 : 2131232070;
+                    return str.equals("th") ? 2131232100 : 2131232078;
                 case 3710:
-                    return str.equals("tr") ? 2131232093 : 2131232070;
+                    return str.equals("tr") ? 2131232101 : 2131232078;
                 case 3734:
-                    return str.equals("uk") ? 2131232094 : 2131232070;
+                    return str.equals("uk") ? 2131232102 : 2131232078;
                 case 3763:
-                    return str.equals("vi") ? 2131232096 : 2131232070;
+                    return str.equals("vi") ? 2131232104 : 2131232078;
                 case 96598143:
-                    return str.equals("en-GB") ? 2131232069 : 2131232070;
+                    return str.equals("en-GB") ? 2131232077 : 2131232078;
                 case 96598594:
                     str.equals("en-US");
-                    return 2131232070;
+                    return 2131232078;
                 case 96747053:
-                    return str.equals("es-ES") ? 2131232071 : 2131232070;
+                    return str.equals("es-ES") ? 2131232079 : 2131232078;
                 case 106935481:
-                    return str.equals("pt-BR") ? 2131232087 : 2131232070;
+                    return str.equals("pt-BR") ? 2131232095 : 2131232078;
                 case 109766140:
-                    return str.equals("sv-SE") ? 2131232091 : 2131232070;
+                    return str.equals("sv-SE") ? 2131232099 : 2131232078;
                 case 115813226:
-                    return str.equals("zh-CN") ? 2131232097 : 2131232070;
+                    return str.equals("zh-CN") ? 2131232105 : 2131232078;
                 case 115813762:
-                    return str.equals("zh-TW") ? 2131232098 : 2131232070;
+                    return str.equals("zh-TW") ? 2131232106 : 2131232078;
                 default:
-                    return 2131232070;
+                    return 2131232078;
             }
         }
 
@@ -189,49 +189,49 @@ public final class WidgetSettingsLanguage extends AppFragment {
                 case 3141:
                     return str.equals("bg") ? 2131886843 : 2131888323;
                 case 3184:
-                    return str.equals("cs") ? 2131887987 : 2131888323;
+                    return str.equals("cs") ? 2131887986 : 2131888323;
                 case 3197:
-                    return str.equals("da") ? 2131888009 : 2131888323;
+                    return str.equals("da") ? 2131888008 : 2131888323;
                 case 3201:
-                    return str.equals("de") ? 2131888040 : 2131888323;
+                    return str.equals("de") ? 2131888039 : 2131888323;
                 case 3239:
                     return str.equals("el") ? 2131888216 : 2131888323;
                 case 3267:
-                    return str.equals("fi") ? 2131888504 : 2131888323;
+                    return str.equals("fi") ? 2131888505 : 2131888323;
                 case 3276:
-                    return str.equals("fr") ? 2131888786 : 2131888323;
+                    return str.equals("fr") ? 2131888787 : 2131888323;
                 case 3329:
-                    return str.equals("hi") ? 2131890144 : 2131888323;
+                    return str.equals("hi") ? 2131890166 : 2131888323;
                 case 3338:
-                    return str.equals("hr") ? 2131890158 : 2131888323;
+                    return str.equals("hr") ? 2131890180 : 2131888323;
                 case 3341:
-                    return str.equals("hu") ? 2131890159 : 2131888323;
+                    return str.equals("hu") ? 2131890181 : 2131888323;
                 case 3371:
-                    return str.equals("it") ? 2131890639 : 2131888323;
+                    return str.equals("it") ? 2131890707 : 2131888323;
                 case 3383:
-                    return str.equals("ja") ? 2131890641 : 2131888323;
+                    return str.equals("ja") ? 2131890709 : 2131888323;
                 case 3428:
-                    return str.equals("ko") ? 2131890766 : 2131888323;
+                    return str.equals("ko") ? 2131890834 : 2131888323;
                 case 3464:
-                    return str.equals("lt") ? 2131890890 : 2131888323;
+                    return str.equals("lt") ? 2131890960 : 2131888323;
                 case 3518:
-                    return str.equals("nl") ? 2131891366 : 2131888323;
+                    return str.equals("nl") ? 2131891437 : 2131888323;
                 case 3521:
-                    return str.equals("no") ? 2131891367 : 2131888323;
+                    return str.equals("no") ? 2131891438 : 2131888323;
                 case 3580:
-                    return str.equals("pl") ? 2131891901 : 2131888323;
+                    return str.equals("pl") ? 2131891973 : 2131888323;
                 case 3645:
-                    return str.equals("ro") ? 2131892661 : 2131888323;
+                    return str.equals("ro") ? 2131892742 : 2131888323;
                 case 3651:
-                    return str.equals("ru") ? 2131892928 : 2131888323;
+                    return str.equals("ru") ? 2131893009 : 2131888323;
                 case 3700:
-                    return str.equals("th") ? 2131893834 : 2131888323;
+                    return str.equals("th") ? 2131893932 : 2131888323;
                 case 3710:
-                    return str.equals("tr") ? 2131893958 : 2131888323;
+                    return str.equals("tr") ? 2131894058 : 2131888323;
                 case 3734:
-                    return str.equals("uk") ? 2131894038 : 2131888323;
+                    return str.equals("uk") ? 2131894138 : 2131888323;
                 case 3763:
-                    return str.equals("vi") ? 2131894471 : 2131888323;
+                    return str.equals("vi") ? 2131894590 : 2131888323;
                 case 96598143:
                     return str.equals("en-GB") ? 2131888322 : 2131888323;
                 case 96598594:
@@ -240,13 +240,13 @@ public final class WidgetSettingsLanguage extends AppFragment {
                 case 96747053:
                     return str.equals("es-ES") ? 2131888388 : 2131888323;
                 case 106935481:
-                    return str.equals("pt-BR") ? 2131892440 : 2131888323;
+                    return str.equals("pt-BR") ? 2131892519 : 2131888323;
                 case 109766140:
-                    return str.equals("sv-SE") ? 2131893695 : 2131888323;
+                    return str.equals("sv-SE") ? 2131893792 : 2131888323;
                 case 115813226:
-                    return str.equals("zh-CN") ? 2131894662 : 2131888323;
+                    return str.equals("zh-CN") ? 2131894763 : 2131888323;
                 case 115813762:
-                    return str.equals("zh-TW") ? 2131894663 : 2131888323;
+                    return str.equals("zh-TW") ? 2131894764 : 2131888323;
                 default:
                     return 2131888323;
             }
@@ -259,7 +259,7 @@ public final class WidgetSettingsLanguage extends AppFragment {
     }
 
     public WidgetSettingsLanguage() {
-        super(2131559209);
+        super(2131559215);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsLanguage widgetSettingsLanguage, String str) {
@@ -271,7 +271,7 @@ public final class WidgetSettingsLanguage extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.settingsLanguageCurrentText");
         Companion companion = Companion;
         textView.setText(getString(companion.getLocaleResId(str)));
-        getBinding().f1931c.setImageResource(companion.getLocaleFlagResId(str));
+        getBinding().f1933c.setImageResource(companion.getLocaleFlagResId(str));
     }
 
     private final WidgetSettingsLanguageBinding getBinding() {
@@ -282,8 +282,8 @@ public final class WidgetSettingsLanguage extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131890769);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131890837);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         WidgetSettingsLanguageSelect.Companion.registerForResult(this, new WidgetSettingsLanguage$onViewBound$1(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java
index 52daec22ae..42f03fa8a7 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetSettingsLanguageSelect$binding$2 extend
 
     public final WidgetSettingsLanguageSelectBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364850);
+        MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364899);
         if (maxHeightRecyclerView != null) {
             return new WidgetSettingsLanguageSelectBinding((NestedScrollView) view, maxHeightRecyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364850)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364899)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
index 2d7a52c29c..86077144af 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java
@@ -56,17 +56,17 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
                 super(i, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i2 = 2131363206;
-                ImageView imageView = (ImageView) view.findViewById(2131363206);
+                int i2 = 2131363231;
+                ImageView imageView = (ImageView) view.findViewById(2131363231);
                 if (imageView != null) {
-                    i2 = 2131363207;
-                    Barrier barrier = (Barrier) view.findViewById(2131363207);
+                    i2 = 2131363232;
+                    Barrier barrier = (Barrier) view.findViewById(2131363232);
                     if (barrier != null) {
-                        i2 = 2131364848;
-                        TextView textView = (TextView) view.findViewById(2131364848);
+                        i2 = 2131364897;
+                        TextView textView = (TextView) view.findViewById(2131364897);
                         if (textView != null) {
-                            i2 = 2131364849;
-                            TextView textView2 = (TextView) view.findViewById(2131364849);
+                            i2 = 2131364898;
+                            TextView textView2 = (TextView) view.findViewById(2131364898);
                             if (textView2 != null) {
                                 WidgetSettingsLanguageSelectItemBinding widgetSettingsLanguageSelectItemBinding = new WidgetSettingsLanguageSelectItemBinding((ConstraintLayout) view, imageView, barrier, textView, textView2);
                                 m.checkNotNullExpressionValue(widgetSettingsLanguageSelectItemBinding, "WidgetSettingsLanguageSe…temBinding.bind(itemView)");
@@ -87,7 +87,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
                 m.checkNotNullParameter(item, "data");
                 super.onConfigure(i, (int) item);
                 this.binding.a.setOnClickListener(new WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$onConfigure$1(this, item));
-                TextView textView = this.binding.f1932c;
+                TextView textView = this.binding.f1934c;
                 m.checkNotNullExpressionValue(textView, "binding.settingsLanguageSelectItemName");
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
@@ -116,7 +116,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public AdapterItemLocale onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new AdapterItemLocale(2131559211, this);
+            return new AdapterItemLocale(2131559217, this);
         }
     }
 
@@ -225,7 +225,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog {
     }
 
     public WidgetSettingsLanguageSelect() {
-        super(2131559210);
+        super(2131559216);
     }
 
     public static final /* synthetic */ void access$onLocaleSelected(WidgetSettingsLanguageSelect widgetSettingsLanguageSelect, String str) {
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java
index 8eb79f23e9..54d4ae4966 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java
@@ -23,41 +23,41 @@ public final /* synthetic */ class WidgetSettingsMedia$binding$2 extends k imple
         int i = 2131361984;
         CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131361984);
         if (checkedSetting != null) {
-            i = 2131362670;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362670);
+            i = 2131362694;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362694);
             if (checkedSetting2 != null) {
-                i = 2131362671;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362671);
+                i = 2131362695;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362695);
                 if (linkifiedTextView != null) {
-                    i = 2131364885;
-                    TextView textView = (TextView) view.findViewById(2131364885);
+                    i = 2131364935;
+                    TextView textView = (TextView) view.findViewById(2131364935);
                     if (textView != null) {
-                        i = 2131364886;
-                        TextView textView2 = (TextView) view.findViewById(2131364886);
+                        i = 2131364936;
+                        TextView textView2 = (TextView) view.findViewById(2131364936);
                         if (textView2 != null) {
-                            i = 2131364887;
-                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364887);
+                            i = 2131364937;
+                            CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364937);
                             if (checkedSetting3 != null) {
-                                i = 2131364888;
-                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364888);
+                                i = 2131364938;
+                                CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364938);
                                 if (checkedSetting4 != null) {
-                                    i = 2131364889;
-                                    TextView textView3 = (TextView) view.findViewById(2131364889);
+                                    i = 2131364939;
+                                    TextView textView3 = (TextView) view.findViewById(2131364939);
                                     if (textView3 != null) {
-                                        i = 2131364890;
-                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364890);
+                                        i = 2131364940;
+                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364940);
                                         if (linearLayout != null) {
-                                            i = 2131364891;
-                                            TextView textView4 = (TextView) view.findViewById(2131364891);
+                                            i = 2131364941;
+                                            TextView textView4 = (TextView) view.findViewById(2131364941);
                                             if (textView4 != null) {
-                                                i = 2131364892;
-                                                TextView textView5 = (TextView) view.findViewById(2131364892);
+                                                i = 2131364942;
+                                                TextView textView5 = (TextView) view.findViewById(2131364942);
                                                 if (textView5 != null) {
-                                                    i = 2131364893;
-                                                    CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364893);
+                                                    i = 2131364943;
+                                                    CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364943);
                                                     if (checkedSetting5 != null) {
-                                                        i = 2131365120;
-                                                        CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365120);
+                                                        i = 2131365175;
+                                                        CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365175);
                                                         if (checkedSetting6 != null) {
                                                             return new WidgetSettingsMediaBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, linkifiedTextView, textView, textView2, checkedSetting3, checkedSetting4, textView3, linearLayout, textView4, textView5, checkedSetting5, checkedSetting6);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.java
index 3a0ea79b48..1ff1df25bc 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$onViewBound$3.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings;
 
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
-import c.a.a.a.a;
+import c.a.a.e.a;
 import com.discord.i18n.RenderContext;
 import d0.z.d.m;
 import d0.z.d.o;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
index 3ae3fa8df5..5b214986f5 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java
@@ -49,7 +49,7 @@ public final class WidgetSettingsMedia extends AppFragment {
     }
 
     public WidgetSettingsMedia() {
-        super(2131559212);
+        super(2131559218);
     }
 
     public static final /* synthetic */ WidgetSettingsMediaBinding access$getBinding$p(WidgetSettingsMedia widgetSettingsMedia) {
@@ -80,8 +80,8 @@ public final class WidgetSettingsMedia extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131893826);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131893924);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StoreStream.Companion companion = StoreStream.Companion;
         this.userSettings = companion.getUserSettings();
@@ -93,10 +93,10 @@ public final class WidgetSettingsMedia extends AppFragment {
             m.throwUninitializedPropertyAccessException("userSettings");
         }
         checkedSetting.setChecked(storeUserSettings.getIsAttachmentMediaInline());
-        CheckedSetting.i(getBinding().b, b.j(this, 2131890344, new Object[]{"10"}, null, 4), false, 2);
+        CheckedSetting.i(getBinding().b, b.j(this, 2131890410, new Object[]{"10"}, null, 4), false, 2);
         getBinding().b.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$1(this));
-        getBinding().f1933c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this));
-        CheckedSetting checkedSetting2 = getBinding().f1933c;
+        getBinding().f1935c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this));
+        CheckedSetting checkedSetting2 = getBinding().f1935c;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.compressionToggle");
         StoreUserSettings storeUserSettings2 = this.userSettings;
         if (storeUserSettings2 == null) {
@@ -105,7 +105,7 @@ public final class WidgetSettingsMedia extends AppFragment {
         checkedSetting2.setChecked(storeUserSettings2.getIsAutoImageCompressionEnabled());
         LinkifiedTextView linkifiedTextView = getBinding().d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.compressionToggleSubtext");
-        b.m(linkifiedTextView, 2131890319, new Object[]{"getNitro"}, new WidgetSettingsMedia$onViewBound$3(this));
+        b.l(linkifiedTextView, 2131890385, new Object[]{"getNitro"}, new WidgetSettingsMedia$onViewBound$3(this));
         CheckedSetting checkedSetting3 = getBinding().g;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsTextImagesEmbedsToggle");
         StoreUserSettings storeUserSettings3 = this.userSettings;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java
index cecc256256..369ce8b6fd 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java
@@ -18,23 +18,23 @@ public final /* synthetic */ class WidgetSettingsNotifications$binding$2 extends
 
     public final WidgetSettingsNotificationsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364843;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364843);
+        int i = 2131364892;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364892);
         if (checkedSetting != null) {
-            i = 2131364857;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364857);
+            i = 2131364906;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364906);
             if (checkedSetting2 != null) {
-                i = 2131364858;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364858);
+                i = 2131364907;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364907);
                 if (checkedSetting3 != null) {
-                    i = 2131364859;
-                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364859);
+                    i = 2131364908;
+                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364908);
                     if (checkedSetting4 != null) {
-                        i = 2131364860;
-                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364860);
+                        i = 2131364909;
+                        CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364909);
                         if (checkedSetting5 != null) {
-                            i = 2131364861;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364861);
+                            i = 2131364910;
+                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364910);
                             if (linearLayout != null) {
                                 return new WidgetSettingsNotificationsBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, linearLayout);
                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java
index 74ab2b8dc8..c98f7f3590 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java
@@ -36,7 +36,7 @@ public final class WidgetSettingsNotifications$onViewBoundOrOnResume$1 extends o
         CheckedSetting checkedSetting2 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).b;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsInappNotifsSwitch");
         checkedSetting2.setChecked(settingsV2.isEnabledInApp());
-        CheckedSetting checkedSetting3 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f1935c;
+        CheckedSetting checkedSetting3 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f1937c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsNotificationsBlink");
         checkedSetting3.setChecked(settingsV2.isDisableBlink());
         CheckedSetting checkedSetting4 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
index 2e71b8e9d5..afd1f57e5a 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java
@@ -40,7 +40,7 @@ public final class WidgetSettingsNotifications extends AppFragment {
     }
 
     public WidgetSettingsNotifications() {
-        super(2131559214);
+        super(2131559220);
     }
 
     public static final /* synthetic */ WidgetSettingsNotificationsBinding access$getBinding$p(WidgetSettingsNotifications widgetSettingsNotifications) {
@@ -59,13 +59,13 @@ public final class WidgetSettingsNotifications extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131891537);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131891606);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StoreNotifications storeNotifications = this.notificationStore;
         getBinding().d.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$1(storeNotifications));
         getBinding().b.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$2(storeNotifications));
-        getBinding().f1935c.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$3(storeNotifications));
+        getBinding().f1937c.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$3(storeNotifications));
         getBinding().f.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$4(storeNotifications));
         getBinding().e.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$5(storeNotifications));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java
index 9316c0d4a0..0c0f0ef396 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java
@@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetSettingsNotificationsOs$binding$2 exten
 
     public final WidgetSettingsNotificationOsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364843;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364843);
+        int i = 2131364892;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364892);
         if (checkedSetting != null) {
-            i = 2131364854;
-            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364854);
+            i = 2131364903;
+            RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364903);
             if (relativeLayout != null) {
-                i = 2131364855;
-                TextView textView = (TextView) view.findViewById(2131364855);
+                i = 2131364904;
+                TextView textView = (TextView) view.findViewById(2131364904);
                 if (textView != null) {
-                    i = 2131364856;
-                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364856);
+                    i = 2131364905;
+                    CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364905);
                     if (checkedSetting2 != null) {
                         return new WidgetSettingsNotificationOsBinding((LinearLayout) view, checkedSetting, relativeLayout, textView, checkedSetting2);
                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
index c87d247203..444b7a59bd 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java
@@ -58,7 +58,7 @@ public final class WidgetSettingsNotificationsOs extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559213;
+        return 2131559219;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -73,6 +73,6 @@ public final class WidgetSettingsNotificationsOs extends AppBottomSheet {
         super.onViewCreated(view, bundle);
         getBinding().d.setOnCheckedListener(WidgetSettingsNotificationsOs$onViewCreated$1.INSTANCE);
         getBinding().b.setOnCheckedListener(WidgetSettingsNotificationsOs$onViewCreated$2.INSTANCE);
-        getBinding().f1934c.setOnClickListener(new WidgetSettingsNotificationsOs$onViewCreated$3(this));
+        getBinding().f1936c.setOnClickListener(new WidgetSettingsNotificationsOs$onViewCreated$3(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java
index b248909264..9ea3d581fd 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$3.java
@@ -48,9 +48,9 @@ public final class WidgetSettingsPrivacy$Model$Companion$get$3<T, R> implements
 
         public final Observable<? extends RestAPI.HarvestState> call(MeUser meUser) {
             RetryWithDelay retryWithDelay = RetryWithDelay.INSTANCE;
-            Observable<RestAPI.HarvestState> J = RestAPI.Companion.getApi().getHarvestStatusGuarded().J(a.c());
-            m.checkNotNullExpressionValue(J, "RestAPI\n                …bserveOn(Schedulers.io())");
-            return RetryWithDelay.restRetry$default(retryWithDelay, J, 0, null, null, 7, null).q(500, TimeUnit.MILLISECONDS).M(AnonymousClass1.INSTANCE);
+            Observable<RestAPI.HarvestState> I = RestAPI.Companion.getApi().getHarvestStatusGuarded().I(a.c());
+            m.checkNotNullExpressionValue(I, "RestAPI\n                …bserveOn(Schedulers.io())");
+            return RetryWithDelay.restRetry$default(retryWithDelay, I, 0, null, null, 7, null).q(500, TimeUnit.MILLISECONDS).L(AnonymousClass1.INSTANCE);
         }
     }
 
@@ -76,6 +76,6 @@ public final class WidgetSettingsPrivacy$Model$Companion$get$3<T, R> implements
     public final Observable<? extends WidgetSettingsPrivacy.Model> call(WidgetSettingsPrivacy.LocalState localState) {
         j jVar = new j(localState);
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.i(jVar, companion.getUserSettings().observeConsents(), Observable.I(new j(null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).y(AnonymousClass1.INSTANCE).A(AnonymousClass2.INSTANCE)), AnonymousClass3.INSTANCE);
+        return Observable.i(jVar, companion.getUserSettings().observeConsents(), Observable.H(new j(null), StoreUser.observeMe$default(companion.getUsers(), false, 1, null).x(AnonymousClass1.INSTANCE).z(AnonymousClass2.INSTANCE)), AnonymousClass3.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java
index a7b8099e51..a975ec2d78 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java
@@ -21,83 +21,83 @@ public final /* synthetic */ class WidgetSettingsPrivacy$binding$2 extends k imp
 
     public final WidgetSettingsPrivacyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362724;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362724);
+        int i = 2131362748;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362748);
         if (checkedSetting != null) {
-            i = 2131362725;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362725);
+            i = 2131362749;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362749);
             if (checkedSetting2 != null) {
-                i = 2131362726;
-                TextView textView = (TextView) view.findViewById(2131362726);
+                i = 2131362750;
+                TextView textView = (TextView) view.findViewById(2131362750);
                 if (textView != null) {
-                    i = 2131362727;
-                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362727);
+                    i = 2131362751;
+                    CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362751);
                     if (checkedSetting3 != null) {
-                        i = 2131362728;
-                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362728);
+                        i = 2131362752;
+                        CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362752);
                         if (checkedSetting4 != null) {
-                            i = 2131362896;
-                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                            i = 2131362921;
+                            DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                             if (dimmerView != null) {
-                                i = 2131364430;
-                                TextView textView2 = (TextView) view.findViewById(2131364430);
+                                i = 2131364468;
+                                TextView textView2 = (TextView) view.findViewById(2131364468);
                                 if (textView2 != null) {
-                                    i = 2131364863;
-                                    CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364863);
+                                    i = 2131364912;
+                                    CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364912);
                                     if (checkedSetting5 != null) {
-                                        i = 2131364864;
-                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364864);
+                                        i = 2131364913;
+                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364913);
                                         if (linearLayout != null) {
-                                            i = 2131364865;
-                                            TextView textView3 = (TextView) view.findViewById(2131364865);
+                                            i = 2131364914;
+                                            TextView textView3 = (TextView) view.findViewById(2131364914);
                                             if (textView3 != null) {
-                                                i = 2131364866;
-                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364866);
+                                                i = 2131364915;
+                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364915);
                                                 if (linearLayout2 != null) {
-                                                    i = 2131364867;
-                                                    TextView textView4 = (TextView) view.findViewById(2131364867);
+                                                    i = 2131364916;
+                                                    TextView textView4 = (TextView) view.findViewById(2131364916);
                                                     if (textView4 != null) {
-                                                        i = 2131364868;
-                                                        CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364868);
+                                                        i = 2131364917;
+                                                        CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364917);
                                                         if (checkedSetting6 != null) {
-                                                            i = 2131364871;
-                                                            TextView textView5 = (TextView) view.findViewById(2131364871);
+                                                            i = 2131364920;
+                                                            TextView textView5 = (TextView) view.findViewById(2131364920);
                                                             if (textView5 != null) {
-                                                                i = 2131364872;
-                                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364872);
+                                                                i = 2131364921;
+                                                                CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364921);
                                                                 if (checkedSetting7 != null) {
-                                                                    i = 2131364873;
-                                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364873);
+                                                                    i = 2131364922;
+                                                                    CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364922);
                                                                     if (checkedSetting8 != null) {
-                                                                        i = 2131364874;
-                                                                        CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364874);
+                                                                        i = 2131364923;
+                                                                        CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364923);
                                                                         if (checkedSetting9 != null) {
-                                                                            i = 2131364875;
-                                                                            CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364875);
+                                                                            i = 2131364924;
+                                                                            CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364924);
                                                                             if (checkedSetting10 != null) {
-                                                                                i = 2131364876;
-                                                                                CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364876);
+                                                                                i = 2131364925;
+                                                                                CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364925);
                                                                                 if (checkedSetting11 != null) {
-                                                                                    i = 2131364877;
-                                                                                    CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364877);
+                                                                                    i = 2131364926;
+                                                                                    CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364926);
                                                                                     if (checkedSetting12 != null) {
-                                                                                        i = 2131364878;
-                                                                                        TextView textView6 = (TextView) view.findViewById(2131364878);
+                                                                                        i = 2131364927;
+                                                                                        TextView textView6 = (TextView) view.findViewById(2131364927);
                                                                                         if (textView6 != null) {
-                                                                                            i = 2131364879;
-                                                                                            CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364879);
+                                                                                            i = 2131364928;
+                                                                                            CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364928);
                                                                                             if (checkedSetting13 != null) {
-                                                                                                i = 2131364880;
-                                                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364880);
+                                                                                                i = 2131364929;
+                                                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364929);
                                                                                                 if (materialButton != null) {
-                                                                                                    i = 2131364881;
-                                                                                                    TextView textView7 = (TextView) view.findViewById(2131364881);
+                                                                                                    i = 2131364930;
+                                                                                                    TextView textView7 = (TextView) view.findViewById(2131364930);
                                                                                                     if (textView7 != null) {
-                                                                                                        i = 2131364882;
-                                                                                                        CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364882);
+                                                                                                        i = 2131364931;
+                                                                                                        CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364931);
                                                                                                         if (checkedSetting14 != null) {
-                                                                                                            i = 2131364883;
-                                                                                                            CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364883);
+                                                                                                            i = 2131364932;
+                                                                                                            CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364932);
                                                                                                             if (checkedSetting15 != null) {
                                                                                                                 return new WidgetSettingsPrivacyBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, textView, checkedSetting3, checkedSetting4, dimmerView, textView2, checkedSetting5, linearLayout, textView3, linearLayout2, textView4, checkedSetting6, textView5, checkedSetting7, checkedSetting8, checkedSetting9, checkedSetting10, checkedSetting11, checkedSetting12, textView6, checkedSetting13, materialButton, textView7, checkedSetting14, checkedSetting15);
                                                                                                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
index d9f7283fea..f6cfaa8d3a 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java
@@ -22,7 +22,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$2 implement
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1938c;
+        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1940c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncSettingEnabled");
         boolean z2 = !checkedSetting.isChecked();
         if (this.$model.getContactSyncConnection() != null) {
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java
index 3b3ab6c587..a7bb497f56 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java
@@ -21,7 +21,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$3 implement
         m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncSettingEmail");
         boolean isChecked = checkedSetting2.isChecked();
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1938c;
+        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1940c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEnabled");
         boolean isChecked2 = checkedSetting3.isChecked();
         CheckedSetting checkedSetting4 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).b;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java
index 517ce322e8..0f01436af0 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java
@@ -21,7 +21,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$4 implement
         m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncSettingPhone");
         boolean isChecked = checkedSetting2.isChecked();
         AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1938c;
+        CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1940c;
         m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEnabled");
         boolean isChecked2 = checkedSetting3.isChecked();
         CheckedSetting checkedSetting4 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).e;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
index 939bcc0691..4afb457234 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java
@@ -35,10 +35,10 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
             @Override // android.view.View.OnClickListener
             public final void onClick(View view) {
                 this.$dialog.dismiss();
-                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1942z;
+                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1944z;
                 m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
                 checkedSetting.setChecked(true);
-                CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1942z;
+                CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1944z;
                 m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics");
                 checkedSetting2.setEnabled(true);
             }
@@ -63,7 +63,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
                 Boolean bool = r4.$consented;
                 m.checkNotNullExpressionValue(bool, "consented");
                 boolean booleanValue = bool.booleanValue();
-                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1942z;
+                CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1944z;
                 m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
                 WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "usage_statistics", checkedSetting);
             }
@@ -90,11 +90,11 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
             m.checkNotNullParameter(textView2, "dialogBody");
             m.checkNotNullParameter(textView3, "dialogCancel");
             m.checkNotNullParameter(textView4, "dialogConfirm");
-            textView.setText(2131894151);
-            textView2.setText(2131894148);
-            textView3.setText(2131894149);
+            textView.setText(2131894252);
+            textView2.setText(2131894249);
+            textView3.setText(2131894250);
             textView3.setOnClickListener(new AnonymousClass1(this, alertDialog));
-            textView4.setText(2131894150);
+            textView4.setText(2131894251);
             textView4.setOnClickListener(new AnonymousClass2(this, alertDialog));
         }
     }
@@ -105,14 +105,14 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1<T> implement
     }
 
     public final void call(Boolean bool) {
-        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1942z;
+        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1944z;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
         checkedSetting.setEnabled(false);
         m.checkNotNullExpressionValue(bool, "consented");
         if (bool.booleanValue()) {
             WidgetSettingsPrivacy widgetSettingsPrivacy = this.this$0;
             boolean booleanValue = bool.booleanValue();
-            CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1942z;
+            CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1944z;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics");
             WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "usage_statistics", checkedSetting2);
             return;
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java
index b7f3e3a3f9..38e4acfb80 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java
@@ -90,11 +90,11 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$2<T> implement
             m.checkNotNullParameter(textView2, "dialogBody");
             m.checkNotNullParameter(textView3, "dialogCancel");
             m.checkNotNullParameter(textView4, "dialogConfirm");
-            textView.setText(2131891866);
-            textView2.setText(2131891863);
-            textView3.setText(2131891864);
+            textView.setText(2131891938);
+            textView2.setText(2131891935);
+            textView3.setText(2131891936);
             textView3.setOnClickListener(new AnonymousClass1(this, alertDialog));
-            textView4.setText(2131891865);
+            textView4.setText(2131891937);
             textView4.setOnClickListener(new AnonymousClass2(this, alertDialog));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java
index 099b5d8a38..8bb598db16 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java
@@ -24,7 +24,7 @@ public final class WidgetSettingsPrivacy$configureRequestDataButton$1 implements
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return@setOnClickListener");
             if (!this.$isMeVerified || (harvestState = this.$harvestState) == null) {
-                o.i(this.this$0, 2131888034, 0, 4);
+                o.i(this.this$0, 2131888033, 0, 4);
             } else {
                 WidgetSettingsPrivacy.access$onRequestDataClick(this.this$0, context, harvestState);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java
index 962e98aa05..5c6301e634 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java
@@ -19,6 +19,6 @@ public final class WidgetSettingsPrivacy$friendSourceRadios$2 extends o implemen
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final List<? extends CheckedSetting> mo1invoke() {
-        return n.listOf((Object[]) new CheckedSetting[]{WidgetSettingsPrivacy.access$getBinding$p(this.this$0).r, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1939s, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).t});
+        return n.listOf((Object[]) new CheckedSetting[]{WidgetSettingsPrivacy.access$getBinding$p(this.this$0).r, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1941s, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).t});
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java
index 802fa442e7..35e86ecabf 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java
@@ -31,7 +31,7 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$1 extends o implemen
 
     public final void invoke(Harvest harvest) {
         m.checkNotNullParameter(harvest, "requestedHarvest");
-        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888033).setMessage(2131888032), 2131891666, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888032).setMessage(2131888031), 2131891735, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java
index e2fb727d28..c8a78f54d6 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java
@@ -38,12 +38,12 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$2 extends o implemen
     /* JADX WARN: Multi-variable type inference failed */
     /* JADX WARNING: Unknown variable types count: 1 */
     public final void invoke(String str) {
-        WidgetNoticeDialog.Builder title = new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888025);
+        WidgetNoticeDialog.Builder title = new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888024);
         String str2 = str;
         if (str == null) {
-            str2 = b.g(this.$context, 2131888024, new Object[0], null, 4);
+            str2 = b.g(this.$context, 2131888023, new Object[0], null, 4);
         }
-        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(title.setMessage(str2), 2131891666, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(title.setMessage(str2), 2131891735, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java
index 7e775b777a..04a6b9097c 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java
@@ -51,7 +51,7 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$4 extends o implemen
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888023).setMessage(2131888028).setPositiveButton(2131891666, new AnonymousClass1(this)), 2131887178, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888022).setMessage(2131888027).setPositiveButton(2131891735, new AnonymousClass1(this)), 2131887178, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         negativeButton$default.show(parentFragmentManager);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java
index 7195c3b550..caae07cfa5 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java
@@ -24,7 +24,7 @@ public final class WidgetSettingsPrivacy$onViewBoundOrOnResume$2 extends o imple
     }
 
     public final void invoke(boolean z2) {
-        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1941y;
+        CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1943y;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyScreenreaderDetection");
         checkedSetting.setChecked(z2);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
index 2a8b50dc85..a3a984c71d 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java
@@ -13,7 +13,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.d.f;
 import c.a.d.l;
 import c.a.d.q;
-import c.a.i.f5;
+import c.a.i.i5;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.discord.app.AppFragment;
@@ -90,12 +90,12 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         private final ModelUserSettings.FriendSourceFlags friendSourceFlags;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2147me;
+        private final MeUser f2153me;
         private final int userDiscoveryFlags;
 
         public LocalState(MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, ModelConnectedAccount modelConnectedAccount, Experiment experiment, int i2) {
             m.checkNotNullParameter(meUser, "me");
-            this.f2147me = meUser;
+            this.f2153me = meUser;
             this.explicitContentFilter = i;
             this.defaultRestrictedGuilds = z2;
             this.friendSourceFlags = friendSourceFlags;
@@ -106,7 +106,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
 
         public static /* synthetic */ LocalState copy$default(LocalState localState, MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, ModelConnectedAccount modelConnectedAccount, Experiment experiment, int i2, int i3, Object obj) {
             if ((i3 & 1) != 0) {
-                meUser = localState.f2147me;
+                meUser = localState.f2153me;
             }
             if ((i3 & 2) != 0) {
                 i = localState.explicitContentFilter;
@@ -130,7 +130,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public final MeUser component1() {
-            return this.f2147me;
+            return this.f2153me;
         }
 
         public final int component2() {
@@ -170,7 +170,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
                 return false;
             }
             LocalState localState = (LocalState) obj;
-            return m.areEqual(this.f2147me, localState.f2147me) && this.explicitContentFilter == localState.explicitContentFilter && this.defaultRestrictedGuilds == localState.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, localState.friendSourceFlags) && m.areEqual(this.contactSyncConnection, localState.contactSyncConnection) && m.areEqual(this.contactSyncExperiment, localState.contactSyncExperiment) && this.userDiscoveryFlags == localState.userDiscoveryFlags;
+            return m.areEqual(this.f2153me, localState.f2153me) && this.explicitContentFilter == localState.explicitContentFilter && this.defaultRestrictedGuilds == localState.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, localState.friendSourceFlags) && m.areEqual(this.contactSyncConnection, localState.contactSyncConnection) && m.areEqual(this.contactSyncExperiment, localState.contactSyncExperiment) && this.userDiscoveryFlags == localState.userDiscoveryFlags;
         }
 
         public final ModelConnectedAccount getContactSyncConnection() {
@@ -194,7 +194,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public final MeUser getMe() {
-            return this.f2147me;
+            return this.f2153me;
         }
 
         public final int getUserDiscoveryFlags() {
@@ -202,7 +202,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2147me;
+            MeUser meUser = this.f2153me;
             int i = 0;
             int hashCode = (((meUser != null ? meUser.hashCode() : 0) * 31) + this.explicitContentFilter) * 31;
             boolean z2 = this.defaultRestrictedGuilds;
@@ -226,7 +226,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
 
         public String toString() {
             StringBuilder L = a.L("LocalState(me=");
-            L.append(this.f2147me);
+            L.append(this.f2153me);
             L.append(", explicitContentFilter=");
             L.append(this.explicitContentFilter);
             L.append(", defaultRestrictedGuilds=");
@@ -253,7 +253,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         private final RestAPI.HarvestState harvestState;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2148me;
+        private final MeUser f2154me;
         private final boolean showContactSync;
         private final int userDiscoveryFlags;
 
@@ -275,25 +275,25 @@ public final class WidgetSettingsPrivacy extends AppFragment {
                 Observable<Integer> observeExplicitContentFilter = companion.getUserSettings().observeExplicitContentFilter();
                 Observable<Boolean> observeIsDefaultGuildsRestricted = companion.getUserSettings().observeIsDefaultGuildsRestricted();
                 Observable<ModelUserSettings.FriendSourceFlags> observeFriendSourceFlags = companion.getUserSettings().observeFriendSourceFlags();
-                Observable G = companion.getUserConnections().observeConnectedAccounts().G(WidgetSettingsPrivacy$Model$Companion$get$1.INSTANCE);
+                Observable F = companion.getUserConnections().observeConnectedAccounts().F(WidgetSettingsPrivacy$Model$Companion$get$1.INSTANCE);
                 Observable<Experiment> observeUserExperiment = companion.getExperiments().observeUserExperiment("2021-04_contact_sync_android_main", true);
                 Observable<Integer> observeFriendDiscoveryFlags = companion.getUserSettings().observeFriendDiscoveryFlags();
                 WidgetSettingsPrivacy$Model$Companion$get$2 widgetSettingsPrivacy$Model$Companion$get$2 = WidgetSettingsPrivacy$Model$Companion$get$2.INSTANCE;
                 if (widgetSettingsPrivacy$Model$Companion$get$2 != null) {
                     widgetSettingsPrivacy$Model$Companion$get$2 = new WidgetSettingsPrivacy$sam$rx_functions_Func7$0(widgetSettingsPrivacy$Model$Companion$get$2);
                 }
-                Observable Z = Observable.e(observeMe$default, observeExplicitContentFilter, observeIsDefaultGuildsRestricted, observeFriendSourceFlags, G, observeUserExperiment, observeFriendDiscoveryFlags, (Func7) widgetSettingsPrivacy$Model$Companion$get$2).Z(WidgetSettingsPrivacy$Model$Companion$get$3.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "Observable\n          .co…            }\n          }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-                return s2;
+                Observable Y = Observable.e(observeMe$default, observeExplicitContentFilter, observeIsDefaultGuildsRestricted, observeFriendSourceFlags, F, observeUserExperiment, observeFriendDiscoveryFlags, (Func7) widgetSettingsPrivacy$Model$Companion$get$2).Y(WidgetSettingsPrivacy$Model$Companion$get$3.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "Observable\n          .co…            }\n          }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+                return r;
             }
         }
 
         public Model(MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, int i2, ModelConnectedAccount modelConnectedAccount, boolean z3, Consents consents, RestAPI.HarvestState harvestState) {
             m.checkNotNullParameter(meUser, "me");
             m.checkNotNullParameter(consents, "consents");
-            this.f2148me = meUser;
+            this.f2154me = meUser;
             this.explicitContentFilter = i;
             this.defaultRestrictedGuilds = z2;
             this.friendSourceFlags = friendSourceFlags;
@@ -305,11 +305,11 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, int i, boolean z2, ModelUserSettings.FriendSourceFlags friendSourceFlags, int i2, ModelConnectedAccount modelConnectedAccount, boolean z3, Consents consents, RestAPI.HarvestState harvestState, int i3, Object obj) {
-            return model.copy((i3 & 1) != 0 ? model.f2148me : meUser, (i3 & 2) != 0 ? model.explicitContentFilter : i, (i3 & 4) != 0 ? model.defaultRestrictedGuilds : z2, (i3 & 8) != 0 ? model.friendSourceFlags : friendSourceFlags, (i3 & 16) != 0 ? model.userDiscoveryFlags : i2, (i3 & 32) != 0 ? model.contactSyncConnection : modelConnectedAccount, (i3 & 64) != 0 ? model.showContactSync : z3, (i3 & 128) != 0 ? model.consents : consents, (i3 & 256) != 0 ? model.harvestState : harvestState);
+            return model.copy((i3 & 1) != 0 ? model.f2154me : meUser, (i3 & 2) != 0 ? model.explicitContentFilter : i, (i3 & 4) != 0 ? model.defaultRestrictedGuilds : z2, (i3 & 8) != 0 ? model.friendSourceFlags : friendSourceFlags, (i3 & 16) != 0 ? model.userDiscoveryFlags : i2, (i3 & 32) != 0 ? model.contactSyncConnection : modelConnectedAccount, (i3 & 64) != 0 ? model.showContactSync : z3, (i3 & 128) != 0 ? model.consents : consents, (i3 & 256) != 0 ? model.harvestState : harvestState);
         }
 
         public final MeUser component1() {
-            return this.f2148me;
+            return this.f2154me;
         }
 
         public final int component2() {
@@ -358,7 +358,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.f2148me, model.f2148me) && this.explicitContentFilter == model.explicitContentFilter && this.defaultRestrictedGuilds == model.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, model.friendSourceFlags) && this.userDiscoveryFlags == model.userDiscoveryFlags && m.areEqual(this.contactSyncConnection, model.contactSyncConnection) && this.showContactSync == model.showContactSync && m.areEqual(this.consents, model.consents) && m.areEqual(this.harvestState, model.harvestState);
+            return m.areEqual(this.f2154me, model.f2154me) && this.explicitContentFilter == model.explicitContentFilter && this.defaultRestrictedGuilds == model.defaultRestrictedGuilds && m.areEqual(this.friendSourceFlags, model.friendSourceFlags) && this.userDiscoveryFlags == model.userDiscoveryFlags && m.areEqual(this.contactSyncConnection, model.contactSyncConnection) && this.showContactSync == model.showContactSync && m.areEqual(this.consents, model.consents) && m.areEqual(this.harvestState, model.harvestState);
         }
 
         public final Consents getConsents() {
@@ -386,7 +386,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public final MeUser getMe() {
-            return this.f2148me;
+            return this.f2154me;
         }
 
         public final boolean getShowContactSync() {
@@ -398,7 +398,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2148me;
+            MeUser meUser = this.f2154me;
             int i = 0;
             int hashCode = (((meUser != null ? meUser.hashCode() : 0) * 31) + this.explicitContentFilter) * 31;
             boolean z2 = this.defaultRestrictedGuilds;
@@ -430,7 +430,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
 
         public String toString() {
             StringBuilder L = a.L("Model(me=");
-            L.append(this.f2148me);
+            L.append(this.f2154me);
             L.append(", explicitContentFilter=");
             L.append(this.explicitContentFilter);
             L.append(", defaultRestrictedGuilds=");
@@ -453,7 +453,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     public WidgetSettingsPrivacy() {
-        super(2131559216);
+        super(2131559222);
     }
 
     public static final /* synthetic */ void access$configureRequestDataButton(WidgetSettingsPrivacy widgetSettingsPrivacy, boolean z2, RestAPI.HarvestState harvestState) {
@@ -516,11 +516,11 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         if (model.getShowContactSync()) {
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.contactSyncSettingInfo");
-            b.m(textView, 2131887566, new Object[0], new WidgetSettingsPrivacy$configureContactSyncOptions$1(this));
+            b.l(textView, 2131887566, new Object[0], new WidgetSettingsPrivacy$configureContactSyncOptions$1(this));
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.contactSyncSettingInfo");
             textView2.setMovementMethod(LinkMovementMethod.getInstance());
-            CheckedSetting checkedSetting = getBinding().f1938c;
+            CheckedSetting checkedSetting = getBinding().f1940c;
             m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncSettingEnabled");
             ModelConnectedAccount contactSyncConnection = model.getContactSyncConnection();
             checkedSetting.setChecked(contactSyncConnection != null && contactSyncConnection.isFriendSync());
@@ -530,7 +530,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
             CheckedSetting checkedSetting3 = getBinding().b;
             m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEmail");
             checkedSetting3.setChecked((model.getUserDiscoveryFlags() & 4) == 4);
-            getBinding().f1938c.e(new WidgetSettingsPrivacy$configureContactSyncOptions$2(this, model));
+            getBinding().f1940c.e(new WidgetSettingsPrivacy$configureContactSyncOptions$2(this, model));
             getBinding().e.e(new WidgetSettingsPrivacy$configureContactSyncOptions$3(this));
             getBinding().b.e(new WidgetSettingsPrivacy$configureContactSyncOptions$4(this));
             CheckedSetting checkedSetting4 = getBinding().f;
@@ -593,10 +593,10 @@ public final class WidgetSettingsPrivacy extends AppFragment {
             LinearLayout linearLayout = getBinding().k;
             m.checkNotNullExpressionValue(linearLayout, "binding.settingsPrivacyControls");
             linearLayout.setVisibility(0);
-            CheckedSetting checkedSetting = getBinding().f1942z;
+            CheckedSetting checkedSetting = getBinding().f1944z;
             m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics");
             checkedSetting.setChecked(model.getConsents().getUsageStatistics().getConsented());
-            getBinding().f1942z.setOnCheckedListener(new WidgetSettingsPrivacy$configurePrivacyControls$1(this, context));
+            getBinding().f1944z.setOnCheckedListener(new WidgetSettingsPrivacy$configurePrivacyControls$1(this, context));
             CheckedSetting checkedSetting2 = getBinding().v;
             m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization");
             checkedSetting2.setChecked(model.getConsents().getPersonalization().getConsented());
@@ -636,7 +636,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText");
         MaterialButton materialButton = a.b;
         m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationCancel");
-        MaterialButton materialButton2 = a.f1649c;
+        MaterialButton materialButton2 = a.f1646c;
         m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationConfirm");
         function5.invoke(create, textView, textView2, materialButton, materialButton2);
         create.show();
@@ -679,15 +679,15 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     private final void showDefaultGuildsRestrictedExistingServers(boolean z2) {
-        View inflate = getLayoutInflater().inflate(2131559217, (ViewGroup) null, false);
-        int i = 2131364869;
-        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364869);
+        View inflate = getLayoutInflater().inflate(2131559223, (ViewGroup) null, false);
+        int i = 2131364918;
+        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364918);
         if (materialButton != null) {
-            i = 2131364870;
-            MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364870);
+            i = 2131364919;
+            MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364919);
             if (materialButton2 != null) {
                 LinearLayout linearLayout = (LinearLayout) inflate;
-                m.checkNotNullExpressionValue(new f5(linearLayout, materialButton, materialButton2), "WidgetSettingsPrivacyDef…outInflater, null, false)");
+                m.checkNotNullExpressionValue(new i5(linearLayout, materialButton, materialButton2), "WidgetSettingsPrivacyDef…outInflater, null, false)");
                 materialButton.setOnClickListener(new WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$1(this, z2));
                 materialButton2.setOnClickListener(new WidgetSettingsPrivacy$showDefaultGuildsRestrictedExistingServers$$inlined$apply$lambda$2(this, z2));
                 AlertDialog alertDialog = this.dialog;
@@ -711,7 +711,7 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         Context context = getContext();
         if (context != null) {
             m.checkNotNullExpressionValue(context, "context ?: return");
-            WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131888037).setMessage(b.g(context, 2131888014, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, j, context, 0, 4, null)}, null, 4)), 2131891666, (Function1) null, 2, (Object) null);
+            WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131888036).setMessage(b.g(context, 2131888013, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, j, context, 0, 4, null)}, null, 4)), 2131891735, (Function1) null, 2, (Object) null);
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             positiveButton$default.show(parentFragmentManager);
@@ -739,9 +739,9 @@ public final class WidgetSettingsPrivacy extends AppFragment {
     }
 
     private final void updateDefaultGuildsRestricted(boolean z2, boolean z3) {
-        Observable a02 = (!z3 ? new j(null) : !z2 ? new j(n0.emptySet()) : StoreStream.Companion.getGuilds().observeGuilds().G(WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.INSTANCE)).a0(1);
-        m.checkNotNullExpressionValue(a02, "when {\n      !applyToExi… }\n    }\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(a02), this, null, 2, null), WidgetSettingsPrivacy.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2(this, z2), 62, (Object) null);
+        Observable Z = (!z3 ? new j(null) : !z2 ? new j(n0.emptySet()) : StoreStream.Companion.getGuilds().observeGuilds().F(WidgetSettingsPrivacy$updateDefaultGuildsRestricted$1.INSTANCE)).Z(1);
+        m.checkNotNullExpressionValue(Z, "when {\n      !applyToExi… }\n    }\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(Z), this, null, 2, null), WidgetSettingsPrivacy.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPrivacy$updateDefaultGuildsRestricted$2(this, z2), 62, (Object) null);
         AlertDialog alertDialog = this.dialog;
         if (alertDialog != null) {
             alertDialog.dismiss();
@@ -788,25 +788,25 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131892374);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131892451);
         this.radioManagerExplicit = new RadioManager(getExplicitContentRadios());
         CheckedSetting checkedSetting = getBinding().v;
         CheckedSetting checkedSetting2 = getBinding().v;
         m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization");
         f fVar = f.a;
-        checkedSetting.h(b.i(checkedSetting2, 2131888021, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
-        CheckedSetting checkedSetting3 = getBinding().f1941y;
-        CheckedSetting checkedSetting4 = getBinding().f1941y;
+        checkedSetting.h(b.i(checkedSetting2, 2131888020, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
+        CheckedSetting checkedSetting3 = getBinding().f1943y;
+        CheckedSetting checkedSetting4 = getBinding().f1943y;
         m.checkNotNullExpressionValue(checkedSetting4, "binding.settingsPrivacyScreenreaderDetection");
-        checkedSetting3.h(b.i(checkedSetting4, 2131888016, new Object[]{fVar.a(360035966492L, null)}, null, 4), true);
-        CheckedSetting checkedSetting5 = getBinding().f1941y;
+        checkedSetting3.h(b.i(checkedSetting4, 2131888015, new Object[]{fVar.a(360035966492L, null)}, null, 4), true);
+        CheckedSetting checkedSetting5 = getBinding().f1943y;
         checkedSetting5.setOnCheckedListener(new WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1(checkedSetting5, this));
         getBinding().i.setButtonVisibility(false);
         CheckedSetting checkedSetting6 = getBinding().i;
         CheckedSetting checkedSetting7 = getBinding().i;
         m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsPrivacyBasicService");
-        checkedSetting6.h(b.c(checkedSetting7, 2131888018, new Object[0], WidgetSettingsPrivacy$onViewBound$2.INSTANCE), true);
+        checkedSetting6.h(b.c(checkedSetting7, 2131888017, new Object[0], WidgetSettingsPrivacy$onViewBound$2.INSTANCE), true);
         getBinding().i.e(WidgetSettingsPrivacy$onViewBound$3.INSTANCE);
         String a = fVar.a(360004027692L, null);
         TextView textView = getBinding().h;
@@ -815,17 +815,17 @@ public final class WidgetSettingsPrivacy extends AppFragment {
         sb.append('[');
         TextView textView2 = getBinding().h;
         m.checkNotNullExpressionValue(textView2, "binding.requestDataLink");
-        sb.append(b.i(textView2, 2131891516, new Object[0], null, 4));
+        sb.append(b.i(textView2, 2131891585, new Object[0], null, 4));
         sb.append("](");
         sb.append(a);
         sb.append(')');
         textView.setText(b.k(sb.toString(), new Object[0], null, 2));
         getBinding().h.setOnClickListener(new WidgetSettingsPrivacy$onViewBound$4(a));
-        CheckedSetting checkedSetting8 = getBinding().f1942z;
-        CheckedSetting checkedSetting9 = getBinding().f1942z;
+        CheckedSetting checkedSetting8 = getBinding().f1944z;
+        CheckedSetting checkedSetting9 = getBinding().f1944z;
         m.checkNotNullExpressionValue(checkedSetting9, "binding.settingsPrivacyStatistics");
-        checkedSetting8.h(b.i(checkedSetting9, 2131888035, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
-        for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f1940x, getBinding().n, getBinding().u, getBinding().l})) {
+        checkedSetting8.h(b.i(checkedSetting9, 2131888034, new Object[]{fVar.a(360004109911L, null)}, null, 4), true);
+        for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f1942x, getBinding().n, getBinding().u, getBinding().l})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView3, "header");
             accessibilityUtils.setViewIsHeading(textView3);
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java
index b2124576e2..c8e7801672 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java
@@ -18,14 +18,14 @@ public final /* synthetic */ class WidgetSettingsVoice$InputModeSelector$binding
 
     public final WidgetSettingsVoiceInputModeBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363342;
-        TextView textView = (TextView) view.findViewById(2131363342);
+        int i = 2131363368;
+        TextView textView = (TextView) view.findViewById(2131363368);
         if (textView != null) {
-            i = 2131364901;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364901);
+            i = 2131364951;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364951);
             if (linearLayout != null) {
-                i = 2131364902;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364902);
+                i = 2131364952;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364952);
                 if (linearLayout2 != null) {
                     return new WidgetSettingsVoiceInputModeBinding((NestedScrollView) view, textView, linearLayout, linearLayout2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java
index 1572a86d5b..bccc6b58ac 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java
@@ -23,104 +23,104 @@ public final /* synthetic */ class WidgetSettingsVoice$binding$2 extends k imple
 
     public final WidgetSettingsVoiceBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364896;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364896);
+        int i = 2131364946;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364946);
         if (checkedSetting != null) {
-            i = 2131364897;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364897);
+            i = 2131364947;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364947);
             if (checkedSetting2 != null) {
-                i = 2131364898;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364898);
+                i = 2131364948;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364948);
                 if (checkedSetting3 != null) {
-                    i = 2131364899;
-                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364899);
+                    i = 2131364949;
+                    CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364949);
                     if (checkedSetting4 != null) {
-                        i = 2131364900;
-                        TextView textView = (TextView) view.findViewById(2131364900);
+                        i = 2131364950;
+                        TextView textView = (TextView) view.findViewById(2131364950);
                         if (textView != null) {
-                            i = 2131364903;
-                            TextView textView2 = (TextView) view.findViewById(2131364903);
+                            i = 2131364953;
+                            TextView textView2 = (TextView) view.findViewById(2131364953);
                             if (textView2 != null) {
-                                i = 2131364904;
-                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364904);
+                                i = 2131364954;
+                                CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364954);
                                 if (checkedSetting5 != null) {
-                                    i = 2131364905;
-                                    RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364905);
+                                    i = 2131364955;
+                                    RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364955);
                                     if (relativeLayout != null) {
-                                        i = 2131364906;
-                                        TextView textView3 = (TextView) view.findViewById(2131364906);
+                                        i = 2131364956;
+                                        TextView textView3 = (TextView) view.findViewById(2131364956);
                                         if (textView3 != null) {
-                                            i = 2131364907;
-                                            TextView textView4 = (TextView) view.findViewById(2131364907);
+                                            i = 2131364957;
+                                            TextView textView4 = (TextView) view.findViewById(2131364957);
                                             if (textView4 != null) {
-                                                i = 2131364908;
-                                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364908);
+                                                i = 2131364958;
+                                                CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364958);
                                                 if (checkedSetting6 != null) {
-                                                    i = 2131364909;
-                                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364909);
+                                                    i = 2131364959;
+                                                    CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364959);
                                                     if (checkedSetting7 != null) {
-                                                        i = 2131364910;
-                                                        TextView textView5 = (TextView) view.findViewById(2131364910);
+                                                        i = 2131364960;
+                                                        TextView textView5 = (TextView) view.findViewById(2131364960);
                                                         if (textView5 != null) {
-                                                            i = 2131364911;
-                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364911);
+                                                            i = 2131364961;
+                                                            CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364961);
                                                             if (checkedSetting8 != null) {
-                                                                i = 2131364912;
-                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364912);
+                                                                i = 2131364962;
+                                                                CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364962);
                                                                 if (checkedSetting9 != null) {
-                                                                    i = 2131364913;
-                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364913);
+                                                                    i = 2131364963;
+                                                                    CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364963);
                                                                     if (checkedSetting10 != null) {
-                                                                        i = 2131364914;
-                                                                        TextView textView6 = (TextView) view.findViewById(2131364914);
+                                                                        i = 2131364964;
+                                                                        TextView textView6 = (TextView) view.findViewById(2131364964);
                                                                         if (textView6 != null) {
-                                                                            i = 2131364915;
-                                                                            TextView textView7 = (TextView) view.findViewById(2131364915);
+                                                                            i = 2131364965;
+                                                                            TextView textView7 = (TextView) view.findViewById(2131364965);
                                                                             if (textView7 != null) {
-                                                                                i = 2131364916;
-                                                                                SeekBar seekBar = (SeekBar) view.findViewById(2131364916);
+                                                                                i = 2131364966;
+                                                                                SeekBar seekBar = (SeekBar) view.findViewById(2131364966);
                                                                                 if (seekBar != null) {
-                                                                                    i = 2131364917;
-                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364917);
+                                                                                    i = 2131364967;
+                                                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364967);
                                                                                     if (linearLayout != null) {
-                                                                                        i = 2131364918;
-                                                                                        TextView textView8 = (TextView) view.findViewById(2131364918);
+                                                                                        i = 2131364968;
+                                                                                        TextView textView8 = (TextView) view.findViewById(2131364968);
                                                                                         if (textView8 != null) {
-                                                                                            i = 2131364919;
-                                                                                            CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364919);
+                                                                                            i = 2131364969;
+                                                                                            CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364969);
                                                                                             if (checkedSetting11 != null) {
-                                                                                                i = 2131364920;
-                                                                                                TextView textView9 = (TextView) view.findViewById(2131364920);
+                                                                                                i = 2131364970;
+                                                                                                TextView textView9 = (TextView) view.findViewById(2131364970);
                                                                                                 if (textView9 != null) {
-                                                                                                    i = 2131364921;
-                                                                                                    View findViewById = view.findViewById(2131364921);
+                                                                                                    i = 2131364971;
+                                                                                                    View findViewById = view.findViewById(2131364971);
                                                                                                     if (findViewById != null) {
-                                                                                                        i = 2131364922;
-                                                                                                        TextView textView10 = (TextView) view.findViewById(2131364922);
+                                                                                                        i = 2131364972;
+                                                                                                        TextView textView10 = (TextView) view.findViewById(2131364972);
                                                                                                         if (textView10 != null) {
-                                                                                                            i = 2131364923;
-                                                                                                            TextView textView11 = (TextView) view.findViewById(2131364923);
+                                                                                                            i = 2131364973;
+                                                                                                            TextView textView11 = (TextView) view.findViewById(2131364973);
                                                                                                             if (textView11 != null) {
-                                                                                                                i = 2131364924;
-                                                                                                                SeekBar seekBar2 = (SeekBar) view.findViewById(2131364924);
+                                                                                                                i = 2131364974;
+                                                                                                                SeekBar seekBar2 = (SeekBar) view.findViewById(2131364974);
                                                                                                                 if (seekBar2 != null) {
-                                                                                                                    i = 2131364925;
-                                                                                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364925);
+                                                                                                                    i = 2131364975;
+                                                                                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364975);
                                                                                                                     if (materialButton != null) {
-                                                                                                                        i = 2131364926;
-                                                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364926);
+                                                                                                                        i = 2131364976;
+                                                                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364976);
                                                                                                                         if (linearLayout2 != null) {
-                                                                                                                            i = 2131364927;
-                                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131364927);
+                                                                                                                            i = 2131364977;
+                                                                                                                            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131364977);
                                                                                                                             if (relativeLayout2 != null) {
-                                                                                                                                i = 2131364928;
-                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364928);
+                                                                                                                                i = 2131364978;
+                                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364978);
                                                                                                                                 if (linearLayout3 != null) {
-                                                                                                                                    i = 2131364929;
-                                                                                                                                    TextView textView12 = (TextView) view.findViewById(2131364929);
+                                                                                                                                    i = 2131364979;
+                                                                                                                                    TextView textView12 = (TextView) view.findViewById(2131364979);
                                                                                                                                     if (textView12 != null) {
-                                                                                                                                        i = 2131364930;
-                                                                                                                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364930);
+                                                                                                                                        i = 2131364980;
+                                                                                                                                        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364980);
                                                                                                                                         if (linkifiedTextView != null) {
                                                                                                                                             return new WidgetSettingsVoiceBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, textView, textView2, checkedSetting5, relativeLayout, textView3, textView4, checkedSetting6, checkedSetting7, textView5, checkedSetting8, checkedSetting9, checkedSetting10, textView6, textView7, seekBar, linearLayout, textView8, checkedSetting11, textView9, findViewById, textView10, textView11, seekBar2, materialButton, linearLayout2, relativeLayout2, linearLayout3, textView12, linkifiedTextView);
                                                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.java
index 106e7c8815..65a0921acd 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$configureVoiceSensitivity$1.java
@@ -33,6 +33,6 @@ public final class WidgetSettingsVoice$configureVoiceSensitivity$1 implements Vi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        AnimatableValueParser.o2(this.this$0, null, new AnonymousClass1(this), 1, null);
+        AnimatableValueParser.q2(this.this$0, null, new AnonymousClass1(this), 1, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
index eb9d3ad072..cd9e7c91fe 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java
@@ -66,7 +66,7 @@ public final class WidgetSettingsVoice extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsVoice$binding$2.INSTANCE, null, 2, null);
     private List<CheckedSetting> openSLESConfigRadioButtons;
     private RadioManager openSLESConfigRadioManager;
-    private final BehaviorSubject<Boolean> requestListenForSensitivitySubject = BehaviorSubject.m0(Boolean.FALSE);
+    private final BehaviorSubject<Boolean> requestListenForSensitivitySubject = BehaviorSubject.l0(Boolean.FALSE);
 
     /* compiled from: WidgetSettingsVoice.kt */
     public static final class Companion {
@@ -124,7 +124,7 @@ public final class WidgetSettingsVoice extends AppFragment {
 
         @Override // com.discord.app.AppBottomSheet
         public int getContentViewResId() {
-            return 2131559219;
+            return 2131559226;
         }
 
         @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -133,7 +133,7 @@ public final class WidgetSettingsVoice extends AppFragment {
             super.onViewCreated(view, bundle);
             setBottomSheetCollapsedStateDisabled();
             getBinding().b.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$1(this));
-            getBinding().f1948c.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$2(this));
+            getBinding().f1951c.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$2(this));
         }
     }
 
@@ -163,16 +163,16 @@ public final class WidgetSettingsVoice extends AppFragment {
                 Observable j = Observable.j(observable, companion.getMediaEngine().getIsNativeEngineInitialized(), WidgetSettingsVoice$Model$Companion$get$shouldListenForSensitivity$1.INSTANCE);
                 Observable<StoreMediaSettings.VoiceConfiguration> voiceConfig = companion.getMediaSettings().getVoiceConfig();
                 Observable<MediaEngine.OpenSLESConfig> openSLESConfig = companion.getMediaEngine().getOpenSLESConfig();
-                Observable Z = j.Z(WidgetSettingsVoice$Model$Companion$get$1.INSTANCE);
+                Observable Y = j.Y(WidgetSettingsVoice$Model$Companion$get$1.INSTANCE);
                 WidgetSettingsVoice$Model$Companion$get$2 widgetSettingsVoice$Model$Companion$get$2 = WidgetSettingsVoice$Model$Companion$get$2.INSTANCE;
                 if (widgetSettingsVoice$Model$Companion$get$2 != null) {
                     widgetSettingsVoice$Model$Companion$get$2 = new WidgetSettingsVoice$sam$rx_functions_Func3$0(widgetSettingsVoice$Model$Companion$get$2);
                 }
-                Observable i = Observable.i(voiceConfig, openSLESConfig, Z, (Func3) widgetSettingsVoice$Model$Companion$get$2);
+                Observable i = Observable.i(voiceConfig, openSLESConfig, Y, (Func3) widgetSettingsVoice$Model$Companion$get$2);
                 m.checkNotNullExpressionValue(i, "Observable\n            .…    ::Model\n            )");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(i).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(i).r();
+                m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -224,7 +224,7 @@ public final class WidgetSettingsVoice extends AppFragment {
     }
 
     public WidgetSettingsVoice() {
-        super(2131559218);
+        super(2131559225);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsVoice widgetSettingsVoice, Model model) {
@@ -265,17 +265,17 @@ public final class WidgetSettingsVoice extends AppFragment {
 
     private final void configureUI(Model model) {
         CheckedSetting checkedSetting;
-        SeekBar seekBar = getBinding().f1944s;
+        SeekBar seekBar = getBinding().f1947s;
         m.checkNotNullExpressionValue(seekBar, "binding.settingsVoiceOutputVolume");
         seekBar.setProgress(d0.a0.a.roundToInt(PerceptualVolumeUtils.amplitudeToPerceptual$default(PerceptualVolumeUtils.INSTANCE, model.getVoiceConfig().getOutputVolume(), 0.0f, 2, null)));
         getBinding().i.setOnClickListener(new WidgetSettingsVoice$configureUI$1(this));
         int i = 0;
-        getBinding().j.setText(model.getModePTT() ? 2131890348 : model.getModeVAD() ? 2131890351 : 0);
+        getBinding().j.setText(model.getModePTT() ? 2131890414 : model.getModeVAD() ? 2131890417 : 0);
         String D = a.D(new StringBuilder(), f.a.a(360045138471L, null), "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-voice-video&utm_content=--t%3Apm");
         LinkifiedTextView linkifiedTextView = getBinding().D;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsVoiceVideoTroubleshootingGuide");
         boolean z2 = true;
-        b.n(linkifiedTextView, 2131888603, new Object[]{D}, null, 4);
+        b.m(linkifiedTextView, 2131888604, new Object[]{D}, null, 4);
         RadioManager radioManager = this.openSLESConfigRadioManager;
         if (radioManager == null) {
             m.throwUninitializedPropertyAccessException("openSLESConfigRadioManager");
@@ -311,7 +311,7 @@ public final class WidgetSettingsVoice extends AppFragment {
         getBinding().k.setOnCheckedListener(WidgetSettingsVoice$configureUI$4.INSTANCE);
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.settingsVoiceKrispInfo");
-        b.n(textView, 2131890783, new Object[]{f.a.a(360040843952L, null)}, null, 4);
+        b.m(textView, 2131890851, new Object[]{f.a.a(360040843952L, null)}, null, 4);
         TextView textView2 = getBinding().g;
         m.checkNotNullExpressionValue(textView2, "binding.settingsVoiceKrispInfo");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
@@ -319,8 +319,8 @@ public final class WidgetSettingsVoice extends AppFragment {
         m.checkNotNullExpressionValue(checkedSetting5, "binding.settingsVoiceNoiseSuppressionToggle");
         checkedSetting5.setChecked(model.getVoiceConfig().getNoiseProcessing() == StoreMediaSettings.NoiseProcessing.Suppression);
         if (model.getVoiceConfig().getNoiseProcessing() == noiseProcessing2) {
-            getBinding().l.b(2131894307);
-            CheckedSetting.i(getBinding().l, b.j(this, 2131894307, new Object[0], null, 4), false, 2);
+            getBinding().l.b(2131894415);
+            CheckedSetting.i(getBinding().l, b.j(this, 2131894415, new Object[0], null, 4), false, 2);
         } else {
             getBinding().l.e(WidgetSettingsVoice$configureUI$5.INSTANCE);
             CheckedSetting.i(getBinding().l, null, false, 2);
@@ -332,10 +332,10 @@ public final class WidgetSettingsVoice extends AppFragment {
         }
         checkedSetting6.setChecked(z2);
         getBinding().h.setOnCheckedListener(WidgetSettingsVoice$configureUI$6.INSTANCE);
-        CheckedSetting checkedSetting7 = getBinding().f1943c;
+        CheckedSetting checkedSetting7 = getBinding().f1946c;
         m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsVoiceEchoCancellationToggle");
         checkedSetting7.setChecked(model.getVoiceConfig().getEchoCancellation());
-        getBinding().f1943c.setOnCheckedListener(WidgetSettingsVoice$configureUI$7.INSTANCE);
+        getBinding().f1946c.setOnCheckedListener(WidgetSettingsVoice$configureUI$7.INSTANCE);
         CheckedSetting checkedSetting8 = getBinding().b;
         m.checkNotNullExpressionValue(checkedSetting8, "binding.settingsVoiceAutoVadToggle");
         checkedSetting8.setChecked(model.getVoiceConfig().getAutomaticVad());
@@ -358,28 +358,28 @@ public final class WidgetSettingsVoice extends AppFragment {
         m.checkNotNullExpressionValue(relativeLayout, "binding.settingsVoiceSensitivityWrap");
         int i = 8;
         relativeLayout.setVisibility(model.getModeVAD() ? 0 : 8);
-        TextView textView = getBinding().f1945x;
+        TextView textView = getBinding().f1948x;
         m.checkNotNullExpressionValue(textView, "binding.settingsVoiceSensitivityLabel");
         textView.setVisibility(model.getVoiceConfig().getAutomaticVad() ? 0 : 8);
         boolean z2 = !m.areEqual(model.getLocalVoiceStatus(), LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED);
         LinearLayout linearLayout = getBinding().A;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsVoiceSensitivityTestingContainer");
         linearLayout.setVisibility(z2 ? 0 : 8);
-        MaterialButton materialButton = getBinding().f1947z;
+        MaterialButton materialButton = getBinding().f1950z;
         m.checkNotNullExpressionValue(materialButton, "binding.settingsVoiceSensitivityTestButton");
         if (!z2) {
             i = 0;
         }
         materialButton.setVisibility(i);
-        getBinding().f1947z.setOnClickListener(new WidgetSettingsVoice$configureVoiceSensitivity$1(this));
+        getBinding().f1950z.setOnClickListener(new WidgetSettingsVoice$configureVoiceSensitivity$1(this));
         if (model.getVoiceConfig().getAutomaticVad()) {
             View view = getBinding().w;
             m.checkNotNullExpressionValue(view, "binding.settingsVoiceSensitivityAutomatic");
             view.setVisibility(0);
-            SeekBar seekBar = getBinding().f1946y;
+            SeekBar seekBar = getBinding().f1949y;
             m.checkNotNullExpressionValue(seekBar, "binding.settingsVoiceSensitivityManual");
             seekBar.setVisibility(4);
-            int i2 = model.getLocalVoiceStatus().b ? 2131231258 : 2131231257;
+            int i2 = model.getLocalVoiceStatus().b ? 2131231263 : 2131231262;
             View view2 = getBinding().w;
             m.checkNotNullExpressionValue(view2, "binding.settingsVoiceSensitivityAutomatic");
             view2.setBackground(ContextCompat.getDrawable(requireContext(), i2));
@@ -388,13 +388,13 @@ public final class WidgetSettingsVoice extends AppFragment {
         View view3 = getBinding().w;
         m.checkNotNullExpressionValue(view3, "binding.settingsVoiceSensitivityAutomatic");
         view3.setVisibility(4);
-        SeekBar seekBar2 = getBinding().f1946y;
+        SeekBar seekBar2 = getBinding().f1949y;
         m.checkNotNullExpressionValue(seekBar2, "binding.settingsVoiceSensitivityManual");
         seekBar2.setVisibility(0);
-        SeekBar seekBar3 = getBinding().f1946y;
+        SeekBar seekBar3 = getBinding().f1949y;
         m.checkNotNullExpressionValue(seekBar3, "binding.settingsVoiceSensitivityManual");
         seekBar3.setSecondaryProgress(((int) model.getLocalVoiceStatus().a) + 100);
-        SeekBar seekBar4 = getBinding().f1946y;
+        SeekBar seekBar4 = getBinding().f1949y;
         m.checkNotNullExpressionValue(seekBar4, "binding.settingsVoiceSensitivityManual");
         seekBar4.setProgress(((int) model.getVoiceConfig().getSensitivity()) + 100);
     }
@@ -417,16 +417,16 @@ public final class WidgetSettingsVoice extends AppFragment {
         if (openSLESConfig != null) {
             StoreStream.Companion.getMediaEngine().setOpenSLESConfig(openSLESConfig);
         }
-        o.i(this, 2131894366, 0, 4);
+        o.i(this, 2131894483, 0, 4);
     }
 
     private final void onOverlayToggled(Context context) {
         StoreStream.Companion companion = StoreStream.Companion;
         if (companion.getUserSettings().getIsMobileOverlayEnabled()) {
-            Observable<RtcConnection.StateChange> y2 = companion.getRtcConnection().getConnectionState().y(WidgetSettingsVoice$onOverlayToggled$1.INSTANCE);
-            Observable<R> G = companion.getVoiceChannelSelected().observeSelectedChannel().y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            Observable j = Observable.j(y2, G, WidgetSettingsVoice$onOverlayToggled$2.INSTANCE);
+            Observable<RtcConnection.StateChange> x2 = companion.getRtcConnection().getConnectionState().x(WidgetSettingsVoice$onOverlayToggled$1.INSTANCE);
+            Observable<R> F = companion.getVoiceChannelSelected().observeSelectedChannel().x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable j = Observable.j(x2, F, WidgetSettingsVoice$onOverlayToggled$2.INSTANCE);
             m.checkNotNullExpressionValue(j, "Observable\n          .co… -> rtcState to channel }");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout(j, 200, false), this, null, 2, null), WidgetSettingsVoice.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsVoice$onOverlayToggled$3(context), 62, (Object) null);
             return;
@@ -458,7 +458,7 @@ public final class WidgetSettingsVoice extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().q;
         m.checkNotNullExpressionValue(textView, "binding.settingsVoiceOpenslesHelp");
-        b.n(textView, 2131888613, new Object[0], null, 4);
+        b.m(textView, 2131888614, new Object[0], null, 4);
         CheckedSetting checkedSetting = getBinding().n;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsVoiceOpenslesDefault");
         CheckedSetting checkedSetting2 = getBinding().p;
@@ -508,8 +508,8 @@ public final class WidgetSettingsVoice extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        getBinding().f1944s.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$1());
-        getBinding().f1946y.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$2());
+        getBinding().f1947s.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$1());
+        getBinding().f1949y.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$2());
         Model.Companion companion = Model.Companion;
         BehaviorSubject<Boolean> behaviorSubject = this.requestListenForSensitivitySubject;
         m.checkNotNullExpressionValue(behaviorSubject, "requestListenForSensitivitySubject");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java
index 838a616a85..8f79cffd26 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java
@@ -20,26 +20,26 @@ public final /* synthetic */ class WidgetDisableDeleteAccountDialog$binding$2 ex
 
     public final WidgetDisableDeleteAccountDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362903;
-        TextView textView = (TextView) view.findViewById(2131362903);
+        int i = 2131362928;
+        TextView textView = (TextView) view.findViewById(2131362928);
         if (textView != null) {
-            i = 2131362904;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362904);
+            i = 2131362929;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362929);
             if (materialButton != null) {
-                i = 2131362905;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362905);
+                i = 2131362930;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362930);
                 if (textInputLayout != null) {
-                    i = 2131362906;
-                    LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362906);
+                    i = 2131362931;
+                    LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362931);
                     if (loadingButton != null) {
-                        i = 2131362907;
-                        TextView textView2 = (TextView) view.findViewById(2131362907);
+                        i = 2131362932;
+                        TextView textView2 = (TextView) view.findViewById(2131362932);
                         if (textView2 != null) {
-                            i = 2131362908;
-                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362908);
+                            i = 2131362933;
+                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362933);
                             if (textInputLayout2 != null) {
-                                i = 2131364030;
-                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030);
+                                i = 2131364073;
+                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364073);
                                 if (linearLayout != null) {
                                     return new WidgetDisableDeleteAccountDialogBinding((LinearLayout) view, textView, materialButton, textInputLayout, loadingButton, textView2, textInputLayout2, linearLayout);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
index f8b1ed3cb3..0a133b846a 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java
@@ -62,8 +62,8 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
 
     /* compiled from: WidgetDisableDeleteAccountDialog.kt */
     public enum Mode {
-        DISABLE(2131888124, 2131888125, 2131888123),
-        DELETE(2131888053, 2131888054, 2131888052);
+        DISABLE(2131888123, 2131888124, 2131888122),
+        DELETE(2131888052, 2131888053, 2131888051);
         
         private final int bodyStringId;
         private final int confirmStringId;
@@ -101,7 +101,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
     }
 
     public WidgetDisableDeleteAccountDialog() {
-        super(2131558985);
+        super(2131558989);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetDisableDeleteAccountDialog widgetDisableDeleteAccountDialog, MeUser meUser) {
@@ -184,7 +184,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog {
         m.checkNotNullExpressionValue(textView2, "binding.disableDeleteBody");
         textView2.setText(getString(mode.getBodyStringId()));
         getBinding().e.setText(getString(mode.getConfirmStringId()));
-        getBinding().f1761c.setOnClickListener(new WidgetDisableDeleteAccountDialog$onViewBound$1(this));
+        getBinding().f1762c.setOnClickListener(new WidgetDisableDeleteAccountDialog$onViewBound$1(this));
         TextInputLayout textInputLayout = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.disableDeleteCodeWrap");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetDisableDeleteAccountDialog$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java
index 2799a0eb19..1b13117c9d 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java
@@ -20,23 +20,23 @@ public final /* synthetic */ class WidgetEnableSMSBackupDialog$binding$2 extends
 
     public final WidgetEnableSmsBackupDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363049;
-        TextView textView = (TextView) view.findViewById(2131363049);
+        int i = 2131363074;
+        TextView textView = (TextView) view.findViewById(2131363074);
         if (textView != null) {
-            i = 2131363050;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363050);
+            i = 2131363075;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363075);
             if (materialButton != null) {
-                i = 2131363051;
-                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363051);
+                i = 2131363076;
+                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363076);
                 if (loadingButton != null) {
-                    i = 2131363052;
-                    TextView textView2 = (TextView) view.findViewById(2131363052);
+                    i = 2131363077;
+                    TextView textView2 = (TextView) view.findViewById(2131363077);
                     if (textView2 != null) {
-                        i = 2131363053;
-                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363053);
+                        i = 2131363078;
+                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363078);
                         if (textInputLayout != null) {
-                            i = 2131364030;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030);
+                            i = 2131364073;
+                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364073);
                             if (linearLayout != null) {
                                 return new WidgetEnableSmsBackupDialogBinding((LinearLayout) view, textView, materialButton, loadingButton, textView2, textInputLayout, linearLayout);
                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
index 15d2332586..6f17f2a0a7 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java
@@ -52,7 +52,7 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
     }
 
     public WidgetEnableSMSBackupDialog() {
-        super(2131558997);
+        super(2131559001);
         setCancelable(false);
     }
 
@@ -95,21 +95,21 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog {
         if (valueOf.booleanValue()) {
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.enableSmsBackupHeader");
-            textView.setText(getString(2131891196));
+            textView.setText(getString(2131891267));
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.enableSmsBackupBody");
-            textView2.setText(getString(2131891191));
+            textView2.setText(getString(2131891262));
             getBinding().d.setText(getString(2131888324));
         } else {
             TextView textView3 = getBinding().e;
             m.checkNotNullExpressionValue(textView3, "binding.enableSmsBackupHeader");
-            textView3.setText(getString(2131891202));
+            textView3.setText(getString(2131891273));
             TextView textView4 = getBinding().b;
             m.checkNotNullExpressionValue(textView4, "binding.enableSmsBackupBody");
-            textView4.setText(getString(2131891193));
-            getBinding().d.setText(getString(2131888123));
+            textView4.setText(getString(2131891264));
+            getBinding().d.setText(getString(2131888122));
         }
-        getBinding().f1772c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this));
+        getBinding().f1773c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this));
         getBinding().d.setIsLoading(false);
         getBinding().d.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$2(this, valueOf));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.java
index 4286b16e92..28855efe72 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$Model$Companion$get$1.java
@@ -12,33 +12,28 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
-import rx.functions.Func5;
+import rx.functions.Func6;
 /* compiled from: WidgetSettingsAccount.kt */
-public final class WidgetSettingsAccount$Model$Companion$get$1<T1, T2, T3, T4, T5, R> implements Func5<MeUser, StoreMFA.State, Map<Long, ? extends Guild>, List<? extends ModelConnectedAccount>, Experiment, WidgetSettingsAccount.Model> {
+public final class WidgetSettingsAccount$Model$Companion$get$1<T1, T2, T3, T4, T5, T6, R> implements Func6<MeUser, StoreMFA.State, Map<Long, ? extends Guild>, List<? extends ModelConnectedAccount>, Experiment, Boolean, WidgetSettingsAccount.Model> {
     public static final WidgetSettingsAccount$Model$Companion$get$1 INSTANCE = new WidgetSettingsAccount$Model$Companion$get$1();
 
-    public final WidgetSettingsAccount.Model call(MeUser meUser, StoreMFA.State state, Map<Long, Guild> map, List<ModelConnectedAccount> list, Experiment experiment) {
+    public final WidgetSettingsAccount.Model call(MeUser meUser, StoreMFA.State state, Map<Long, Guild> map, List<ModelConnectedAccount> list, Experiment experiment, Boolean bool) {
         ModelConnectedAccount modelConnectedAccount;
-        ModelConnectedAccount modelConnectedAccount2;
         boolean z2;
+        boolean z3;
         m.checkNotNullExpressionValue(list, "connectedAccounts");
         ListIterator<ModelConnectedAccount> listIterator = list.listIterator(list.size());
         while (true) {
-            modelConnectedAccount = null;
             if (!listIterator.hasPrevious()) {
-                modelConnectedAccount2 = null;
+                modelConnectedAccount = null;
                 break;
             }
-            modelConnectedAccount2 = listIterator.previous();
-            if (m.areEqual(modelConnectedAccount2.getType(), "contacts")) {
+            modelConnectedAccount = listIterator.previous();
+            if (m.areEqual(modelConnectedAccount.getType(), "contacts")) {
                 break;
             }
         }
-        ModelConnectedAccount modelConnectedAccount3 = modelConnectedAccount2;
-        boolean z3 = true;
-        if (experiment != null && experiment.getBucket() == 1) {
-            modelConnectedAccount = modelConnectedAccount3;
-        }
+        ModelConnectedAccount modelConnectedAccount2 = (experiment == null || experiment.getBucket() != 1) ? null : modelConnectedAccount;
         m.checkNotNullExpressionValue(meUser, "meUser");
         m.checkNotNullExpressionValue(state, "pendingMFAState");
         Collection<Guild> values = map.values();
@@ -49,25 +44,27 @@ public final class WidgetSettingsAccount$Model$Companion$get$1<T1, T2, T3, T4, T
                     break;
                 }
                 if (((Guild) it.next()).getOwnerId() == meUser.getId()) {
-                    z2 = true;
+                    z3 = true;
                     continue;
                 } else {
-                    z2 = false;
+                    z3 = false;
                     continue;
                 }
-                if (z2) {
+                if (z3) {
+                    z2 = true;
                     break;
                 }
             }
         }
-        z3 = false;
-        return new WidgetSettingsAccount.Model(meUser, state, z3, modelConnectedAccount);
+        z2 = false;
+        m.checkNotNullExpressionValue(bool, "isCustomProfileEditingEnabled");
+        return new WidgetSettingsAccount.Model(meUser, state, z2, modelConnectedAccount2, bool.booleanValue());
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
-    @Override // rx.functions.Func5
-    public /* bridge */ /* synthetic */ WidgetSettingsAccount.Model call(MeUser meUser, StoreMFA.State state, Map<Long, ? extends Guild> map, List<? extends ModelConnectedAccount> list, Experiment experiment) {
-        return call(meUser, state, (Map<Long, Guild>) map, (List<ModelConnectedAccount>) list, experiment);
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func6
+    public /* bridge */ /* synthetic */ WidgetSettingsAccount.Model call(MeUser meUser, StoreMFA.State state, Map<Long, ? extends Guild> map, List<? extends ModelConnectedAccount> list, Experiment experiment, Boolean bool) {
+        return call(meUser, state, (Map<Long, Guild>) map, (List<ModelConnectedAccount>) list, experiment, bool);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java
index d8fbe5d7af..a130a10f94 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java
@@ -29,142 +29,150 @@ public final /* synthetic */ class WidgetSettingsAccount$binding$2 extends k imp
 
     public final WidgetSettingsAccountBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
-        if (dimmerView != null) {
-            i = 2131364740;
-            TextView textView = (TextView) view.findViewById(2131364740);
-            if (textView != null) {
-                i = 2131364741;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364741);
-                if (simpleDraweeView != null) {
-                    i = 2131364742;
-                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364742);
-                    if (frameLayout != null) {
-                        i = 2131364743;
-                        ImageView imageView = (ImageView) view.findViewById(2131364743);
-                        if (imageView != null) {
-                            i = 2131364744;
-                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364744);
-                            if (linearLayout != null) {
-                                i = 2131364745;
-                                TextView textView2 = (TextView) view.findViewById(2131364745);
-                                if (textView2 != null) {
-                                    i = 2131364746;
-                                    LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364746);
-                                    if (linearLayout2 != null) {
-                                        i = 2131364747;
-                                        TextView textView3 = (TextView) view.findViewById(2131364747);
-                                        if (textView3 != null) {
-                                            i = 2131364748;
-                                            TextView textView4 = (TextView) view.findViewById(2131364748);
-                                            if (textView4 != null) {
-                                                i = 2131364749;
-                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364749);
-                                                if (linearLayout3 != null) {
-                                                    i = 2131364750;
-                                                    TextView textView5 = (TextView) view.findViewById(2131364750);
-                                                    if (textView5 != null) {
-                                                        i = 2131364751;
-                                                        TextView textView6 = (TextView) view.findViewById(2131364751);
-                                                        if (textView6 != null) {
-                                                            i = 2131364752;
-                                                            LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364752);
-                                                            if (linearLayout4 != null) {
-                                                                i = 2131364753;
-                                                                LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131364753);
-                                                                if (linearLayout5 != null) {
-                                                                    i = 2131364754;
-                                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364754);
-                                                                    if (materialButton != null) {
-                                                                        i = 2131364755;
-                                                                        LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131364755);
-                                                                        if (linearLayout6 != null) {
-                                                                            i = 2131364756;
-                                                                            TextView textView7 = (TextView) view.findViewById(2131364756);
-                                                                            if (textView7 != null) {
-                                                                                i = 2131364757;
-                                                                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364757);
-                                                                                if (appViewFlipper != null) {
-                                                                                    i = 2131364758;
-                                                                                    LottieAnimationView lottieAnimationView = (LottieAnimationView) view.findViewById(2131364758);
-                                                                                    if (lottieAnimationView != null) {
-                                                                                        i = 2131364759;
-                                                                                        TextView textView8 = (TextView) view.findViewById(2131364759);
-                                                                                        if (textView8 != null) {
-                                                                                            i = 2131364761;
-                                                                                            LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131364761);
-                                                                                            if (linearLayout7 != null) {
-                                                                                                i = 2131364762;
-                                                                                                TextView textView9 = (TextView) view.findViewById(2131364762);
-                                                                                                if (textView9 != null) {
-                                                                                                    i = 2131364763;
-                                                                                                    TextView textView10 = (TextView) view.findViewById(2131364763);
-                                                                                                    if (textView10 != null) {
-                                                                                                        i = 2131364764;
-                                                                                                        LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131364764);
-                                                                                                        if (linearLayout8 != null) {
-                                                                                                            i = 2131364765;
-                                                                                                            TextView textView11 = (TextView) view.findViewById(2131364765);
-                                                                                                            if (textView11 != null) {
-                                                                                                                i = 2131364766;
-                                                                                                                TextView textView12 = (TextView) view.findViewById(2131364766);
-                                                                                                                if (textView12 != null) {
-                                                                                                                    i = 2131364767;
-                                                                                                                    TextView textView13 = (TextView) view.findViewById(2131364767);
-                                                                                                                    if (textView13 != null) {
-                                                                                                                        i = 2131364768;
-                                                                                                                        TextView textView14 = (TextView) view.findViewById(2131364768);
-                                                                                                                        if (textView14 != null) {
-                                                                                                                            i = 2131364769;
-                                                                                                                            LinearLayout linearLayout9 = (LinearLayout) view.findViewById(2131364769);
-                                                                                                                            if (linearLayout9 != null) {
-                                                                                                                                i = 2131364770;
-                                                                                                                                TextView textView15 = (TextView) view.findViewById(2131364770);
-                                                                                                                                if (textView15 != null) {
-                                                                                                                                    i = 2131364771;
-                                                                                                                                    TextView textView16 = (TextView) view.findViewById(2131364771);
-                                                                                                                                    if (textView16 != null) {
-                                                                                                                                        i = 2131364772;
-                                                                                                                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772);
-                                                                                                                                        if (floatingActionButton != null) {
-                                                                                                                                            i = 2131364773;
-                                                                                                                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364773);
-                                                                                                                                            if (nestedScrollView != null) {
-                                                                                                                                                i = 2131364774;
-                                                                                                                                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364774);
-                                                                                                                                                if (checkedSetting != null) {
-                                                                                                                                                    i = 2131364775;
-                                                                                                                                                    TextView textView17 = (TextView) view.findViewById(2131364775);
-                                                                                                                                                    if (textView17 != null) {
-                                                                                                                                                        i = 2131364776;
-                                                                                                                                                        TextView textView18 = (TextView) view.findViewById(2131364776);
-                                                                                                                                                        if (textView18 != null) {
-                                                                                                                                                            i = 2131364777;
-                                                                                                                                                            LinearLayout linearLayout10 = (LinearLayout) view.findViewById(2131364777);
-                                                                                                                                                            if (linearLayout10 != null) {
-                                                                                                                                                                i = 2131364778;
-                                                                                                                                                                TextView textView19 = (TextView) view.findViewById(2131364778);
-                                                                                                                                                                if (textView19 != null) {
-                                                                                                                                                                    i = 2131364779;
-                                                                                                                                                                    TextView textView20 = (TextView) view.findViewById(2131364779);
-                                                                                                                                                                    if (textView20 != null) {
-                                                                                                                                                                        i = 2131364780;
-                                                                                                                                                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364780);
-                                                                                                                                                                        if (relativeLayout != null) {
-                                                                                                                                                                            i = 2131364781;
-                                                                                                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364781);
-                                                                                                                                                                            if (materialButton2 != null) {
-                                                                                                                                                                                i = 2131364782;
-                                                                                                                                                                                TextView textView21 = (TextView) view.findViewById(2131364782);
-                                                                                                                                                                                if (textView21 != null) {
-                                                                                                                                                                                    i = 2131364783;
-                                                                                                                                                                                    TextView textView22 = (TextView) view.findViewById(2131364783);
-                                                                                                                                                                                    if (textView22 != null) {
-                                                                                                                                                                                        i = 2131364809;
-                                                                                                                                                                                        TextView textView23 = (TextView) view.findViewById(2131364809);
-                                                                                                                                                                                        if (textView23 != null) {
-                                                                                                                                                                                            return new WidgetSettingsAccountBinding((CoordinatorLayout) view, dimmerView, textView, simpleDraweeView, frameLayout, imageView, linearLayout, textView2, linearLayout2, textView3, textView4, linearLayout3, textView5, textView6, linearLayout4, linearLayout5, materialButton, linearLayout6, textView7, appViewFlipper, lottieAnimationView, textView8, linearLayout7, textView9, textView10, linearLayout8, textView11, textView12, textView13, textView14, linearLayout9, textView15, textView16, floatingActionButton, nestedScrollView, checkedSetting, textView17, textView18, linearLayout10, textView19, textView20, relativeLayout, materialButton2, textView21, textView22, textView23);
+        int i = 2131362079;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362079);
+        if (relativeLayout != null) {
+            i = 2131362080;
+            View findViewById = view.findViewById(2131362080);
+            if (findViewById != null) {
+                i = 2131362921;
+                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
+                if (dimmerView != null) {
+                    i = 2131364789;
+                    TextView textView = (TextView) view.findViewById(2131364789);
+                    if (textView != null) {
+                        i = 2131364790;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364790);
+                        if (simpleDraweeView != null) {
+                            i = 2131364791;
+                            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364791);
+                            if (frameLayout != null) {
+                                i = 2131364792;
+                                ImageView imageView = (ImageView) view.findViewById(2131364792);
+                                if (imageView != null) {
+                                    i = 2131364793;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364793);
+                                    if (linearLayout != null) {
+                                        i = 2131364794;
+                                        TextView textView2 = (TextView) view.findViewById(2131364794);
+                                        if (textView2 != null) {
+                                            i = 2131364795;
+                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364795);
+                                            if (linearLayout2 != null) {
+                                                i = 2131364796;
+                                                TextView textView3 = (TextView) view.findViewById(2131364796);
+                                                if (textView3 != null) {
+                                                    i = 2131364797;
+                                                    TextView textView4 = (TextView) view.findViewById(2131364797);
+                                                    if (textView4 != null) {
+                                                        i = 2131364798;
+                                                        LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364798);
+                                                        if (linearLayout3 != null) {
+                                                            i = 2131364799;
+                                                            TextView textView5 = (TextView) view.findViewById(2131364799);
+                                                            if (textView5 != null) {
+                                                                i = 2131364800;
+                                                                TextView textView6 = (TextView) view.findViewById(2131364800);
+                                                                if (textView6 != null) {
+                                                                    i = 2131364801;
+                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364801);
+                                                                    if (linearLayout4 != null) {
+                                                                        i = 2131364802;
+                                                                        LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131364802);
+                                                                        if (linearLayout5 != null) {
+                                                                            i = 2131364803;
+                                                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364803);
+                                                                            if (materialButton != null) {
+                                                                                i = 2131364804;
+                                                                                LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131364804);
+                                                                                if (linearLayout6 != null) {
+                                                                                    i = 2131364805;
+                                                                                    TextView textView7 = (TextView) view.findViewById(2131364805);
+                                                                                    if (textView7 != null) {
+                                                                                        i = 2131364806;
+                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364806);
+                                                                                        if (appViewFlipper != null) {
+                                                                                            i = 2131364807;
+                                                                                            LottieAnimationView lottieAnimationView = (LottieAnimationView) view.findViewById(2131364807);
+                                                                                            if (lottieAnimationView != null) {
+                                                                                                i = 2131364808;
+                                                                                                TextView textView8 = (TextView) view.findViewById(2131364808);
+                                                                                                if (textView8 != null) {
+                                                                                                    i = 2131364810;
+                                                                                                    LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131364810);
+                                                                                                    if (linearLayout7 != null) {
+                                                                                                        i = 2131364811;
+                                                                                                        TextView textView9 = (TextView) view.findViewById(2131364811);
+                                                                                                        if (textView9 != null) {
+                                                                                                            i = 2131364812;
+                                                                                                            TextView textView10 = (TextView) view.findViewById(2131364812);
+                                                                                                            if (textView10 != null) {
+                                                                                                                i = 2131364813;
+                                                                                                                LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131364813);
+                                                                                                                if (linearLayout8 != null) {
+                                                                                                                    i = 2131364814;
+                                                                                                                    TextView textView11 = (TextView) view.findViewById(2131364814);
+                                                                                                                    if (textView11 != null) {
+                                                                                                                        i = 2131364815;
+                                                                                                                        TextView textView12 = (TextView) view.findViewById(2131364815);
+                                                                                                                        if (textView12 != null) {
+                                                                                                                            i = 2131364816;
+                                                                                                                            TextView textView13 = (TextView) view.findViewById(2131364816);
+                                                                                                                            if (textView13 != null) {
+                                                                                                                                i = 2131364817;
+                                                                                                                                TextView textView14 = (TextView) view.findViewById(2131364817);
+                                                                                                                                if (textView14 != null) {
+                                                                                                                                    i = 2131364818;
+                                                                                                                                    LinearLayout linearLayout9 = (LinearLayout) view.findViewById(2131364818);
+                                                                                                                                    if (linearLayout9 != null) {
+                                                                                                                                        i = 2131364819;
+                                                                                                                                        TextView textView15 = (TextView) view.findViewById(2131364819);
+                                                                                                                                        if (textView15 != null) {
+                                                                                                                                            i = 2131364820;
+                                                                                                                                            TextView textView16 = (TextView) view.findViewById(2131364820);
+                                                                                                                                            if (textView16 != null) {
+                                                                                                                                                i = 2131364821;
+                                                                                                                                                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364821);
+                                                                                                                                                if (floatingActionButton != null) {
+                                                                                                                                                    i = 2131364822;
+                                                                                                                                                    NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364822);
+                                                                                                                                                    if (nestedScrollView != null) {
+                                                                                                                                                        i = 2131364823;
+                                                                                                                                                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364823);
+                                                                                                                                                        if (checkedSetting != null) {
+                                                                                                                                                            i = 2131364824;
+                                                                                                                                                            TextView textView17 = (TextView) view.findViewById(2131364824);
+                                                                                                                                                            if (textView17 != null) {
+                                                                                                                                                                i = 2131364825;
+                                                                                                                                                                TextView textView18 = (TextView) view.findViewById(2131364825);
+                                                                                                                                                                if (textView18 != null) {
+                                                                                                                                                                    i = 2131364826;
+                                                                                                                                                                    LinearLayout linearLayout10 = (LinearLayout) view.findViewById(2131364826);
+                                                                                                                                                                    if (linearLayout10 != null) {
+                                                                                                                                                                        i = 2131364827;
+                                                                                                                                                                        TextView textView19 = (TextView) view.findViewById(2131364827);
+                                                                                                                                                                        if (textView19 != null) {
+                                                                                                                                                                            i = 2131364828;
+                                                                                                                                                                            TextView textView20 = (TextView) view.findViewById(2131364828);
+                                                                                                                                                                            if (textView20 != null) {
+                                                                                                                                                                                i = 2131364829;
+                                                                                                                                                                                RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131364829);
+                                                                                                                                                                                if (relativeLayout2 != null) {
+                                                                                                                                                                                    i = 2131364830;
+                                                                                                                                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364830);
+                                                                                                                                                                                    if (materialButton2 != null) {
+                                                                                                                                                                                        i = 2131364831;
+                                                                                                                                                                                        TextView textView21 = (TextView) view.findViewById(2131364831);
+                                                                                                                                                                                        if (textView21 != null) {
+                                                                                                                                                                                            i = 2131364832;
+                                                                                                                                                                                            TextView textView22 = (TextView) view.findViewById(2131364832);
+                                                                                                                                                                                            if (textView22 != null) {
+                                                                                                                                                                                                i = 2131364858;
+                                                                                                                                                                                                TextView textView23 = (TextView) view.findViewById(2131364858);
+                                                                                                                                                                                                if (textView23 != null) {
+                                                                                                                                                                                                    return new WidgetSettingsAccountBinding((CoordinatorLayout) view, relativeLayout, findViewById, dimmerView, textView, simpleDraweeView, frameLayout, imageView, linearLayout, textView2, linearLayout2, textView3, textView4, linearLayout3, textView5, textView6, linearLayout4, linearLayout5, materialButton, linearLayout6, textView7, appViewFlipper, lottieAnimationView, textView8, linearLayout7, textView9, textView10, linearLayout8, textView11, textView12, textView13, textView14, linearLayout9, textView15, textView16, floatingActionButton, nestedScrollView, checkedSetting, textView17, textView18, linearLayout10, textView19, textView20, relativeLayout2, materialButton2, textView21, textView22, textView23);
+                                                                                                                                                                                                }
+                                                                                                                                                                                            }
                                                                                                                                                                                         }
                                                                                                                                                                                     }
                                                                                                                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.java
index 6ffd091344..6fd692a5ac 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$1.java
@@ -16,7 +16,7 @@ public final class WidgetSettingsAccount$configureUI$1 implements View.OnClickLi
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetSettingsAccountChangePassword.Companion companion = WidgetSettingsAccountChangePassword.Companion;
-        TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
+        TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).h;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountChangePassword");
         Context context = textView.getContext();
         m.checkNotNullExpressionValue(context, "binding.settingsAccountChangePassword.context");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java
index 51833b3471..6a778245e6 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.settings.account;
 
 import androidx.fragment.app.FragmentManager;
-import c.a.a.a.a;
+import c.a.a.e.a;
 import com.discord.models.user.MeUser;
 import com.discord.utilities.stateful.StatefulViews;
 import com.discord.utilities.user.UserUtils;
@@ -26,15 +26,15 @@ public final class WidgetSettingsAccount$configureUI$2<T> implements Action1<Str
                 a.b bVar = a.j;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                a.b.a(bVar, parentFragmentManager, 4, this.this$0.getString(2131892321), null, "User Settings", "My Account", null, null, false, false, 968);
+                a.b.a(bVar, parentFragmentManager, 4, this.this$0.getString(2131892398), null, "User Settings", "My Account", null, null, false, false, 968);
                 return;
             }
         }
         StatefulViews access$getState$p = WidgetSettingsAccount.access$getState$p(this.this$0);
-        SimpleDraweeView simpleDraweeView = WidgetSettingsAccount.access$getBinding$p(this.this$0).d;
+        SimpleDraweeView simpleDraweeView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.settingsAccountAvatar");
         access$getState$p.put(simpleDraweeView.getId(), str);
-        WidgetSettingsAccount.access$getState$p(this.this$0).configureSaveActionView(WidgetSettingsAccount.access$getBinding$p(this.this$0).A);
+        WidgetSettingsAccount.access$getState$p(this.this$0).configureSaveActionView(WidgetSettingsAccount.access$getBinding$p(this.this$0).C);
         WidgetSettingsAccount.access$setIcon(this.this$0, this.$user);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java
index 98d68e72a8..68cd947235 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.java
@@ -22,16 +22,16 @@ public final class WidgetSettingsAccount$configureUI$3 implements View.OnClickLi
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         StatefulViews access$getState$p = WidgetSettingsAccount.access$getState$p(this.this$0);
-        SimpleDraweeView simpleDraweeView = WidgetSettingsAccount.access$getBinding$p(this.this$0).d;
+        SimpleDraweeView simpleDraweeView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.settingsAccountAvatar");
         access$getState$p.put(simpleDraweeView.getId(), null);
         String forUser$default = IconUtils.getForUser$default(Long.valueOf(this.$user.getId()), null, Integer.valueOf(this.$user.getDiscriminator()), false, null, 24, null);
-        SimpleDraweeView simpleDraweeView2 = WidgetSettingsAccount.access$getBinding$p(this.this$0).d;
+        SimpleDraweeView simpleDraweeView2 = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.settingsAccountAvatar");
         IconUtils.setIcon$default(simpleDraweeView2, forUser$default, 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
-        TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f1907y;
+        TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).A;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountRemoveAvatar");
         textView.setVisibility(4);
-        WidgetSettingsAccount.access$getState$p(this.this$0).configureSaveActionView(WidgetSettingsAccount.access$getBinding$p(this.this$0).A);
+        WidgetSettingsAccount.access$getState$p(this.this$0).configureSaveActionView(WidgetSettingsAccount.access$getBinding$p(this.this$0).C);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.java
index 392d04bd2a..aeb559753a 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$9.java
@@ -41,12 +41,12 @@ public final class WidgetSettingsAccount$configureUI$9 implements View.OnClickLi
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         StatefulViews access$getState$p = WidgetSettingsAccount.access$getState$p(this.this$0);
-        SimpleDraweeView simpleDraweeView = WidgetSettingsAccount.access$getBinding$p(this.this$0).d;
+        SimpleDraweeView simpleDraweeView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.settingsAccountAvatar");
         RestAPI apiSerializeNulls = access$getState$p.hasChanged(simpleDraweeView.getId()) ? RestAPI.Companion.getApiSerializeNulls() : RestAPI.Companion.getApi();
         StatefulViews access$getState$p2 = WidgetSettingsAccount.access$getState$p(this.this$0);
-        SimpleDraweeView simpleDraweeView2 = WidgetSettingsAccount.access$getBinding$p(this.this$0).d;
+        SimpleDraweeView simpleDraweeView2 = WidgetSettingsAccount.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.settingsAccountAvatar");
-        ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(apiSerializeNulls.patchUser(new RestAPIParams.UserInfo((String) access$getState$p2.get(simpleDraweeView2.getId(), null), this.$user.getEmail(), null, null, this.$user.getUsername(), StoreStream.Companion.getNotifications().getPushToken(), null, null, null, null, 900, null)), false, 1, null), this.this$0, null, 2, null), WidgetSettingsAccount.access$getBinding$p(this.this$0).b, 0, 2, null).k(q.i(new AnonymousClass1(this), this.this$0));
+        ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(apiSerializeNulls.patchUser(new RestAPIParams.UserInfo((String) access$getState$p2.get(simpleDraweeView2.getId(), null), this.$user.getEmail(), null, null, this.$user.getUsername(), StoreStream.Companion.getNotifications().getPushToken(), null, null, null, null, 900, null)), false, 1, null), this.this$0, null, 2, null), WidgetSettingsAccount.access$getBinding$p(this.this$0).d, 0, 2, null).k(q.i(new AnonymousClass1(this), this.this$0));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java
index 9ddbef3460..4aadeeeab5 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$onViewBound$1.java
@@ -15,7 +15,7 @@ import kotlin.coroutines.Continuation;
 import kotlin.jvm.functions.Function2;
 import kotlinx.coroutines.CoroutineScope;
 /* compiled from: WidgetSettingsAccount.kt */
-@e(c = "com.discord.widgets.settings.account.WidgetSettingsAccount$onViewBound$1", f = "WidgetSettingsAccount.kt", l = {89}, m = "invokeSuspend")
+@e(c = "com.discord.widgets.settings.account.WidgetSettingsAccount$onViewBound$1", f = "WidgetSettingsAccount.kt", l = {90}, m = "invokeSuspend")
 public final class WidgetSettingsAccount$onViewBound$1 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
     public int label;
     public final /* synthetic */ WidgetSettingsAccount this$0;
@@ -53,11 +53,11 @@ public final class WidgetSettingsAccount$onViewBound$1 extends k implements Func
         } else {
             throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
         }
-        NestedScrollView nestedScrollView = WidgetSettingsAccount.access$getBinding$p(this.this$0).B;
-        LinearLayout linearLayout = WidgetSettingsAccount.access$getBinding$p(this.this$0).f1906x;
+        NestedScrollView nestedScrollView = WidgetSettingsAccount.access$getBinding$p(this.this$0).D;
+        LinearLayout linearLayout = WidgetSettingsAccount.access$getBinding$p(this.this$0).f1910z;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountPrivateDataWrap");
         nestedScrollView.smoothScrollTo(0, linearLayout.getBottom());
-        TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).w;
+        TextView textView = WidgetSettingsAccount.access$getBinding$p(this.this$0).f1909y;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountPrivateDataDisable");
         ViewExtensions.hintWithRipple$default(textView, 0, 1, null);
         return Unit.a;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java
index e0b92388c9..3cb7b1af6c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1.java
@@ -38,7 +38,7 @@ public final class WidgetSettingsAccount$showRemove2FAModal$1 extends o implemen
 
         public final void invoke(DisableMfaResponse disableMfaResponse) {
             m.checkNotNullParameter(disableMfaResponse, "it");
-            c.a.d.o.h(this.this$0.this$0.requireContext(), this.this$0.this$0.requireContext().getString(2131894346), 0, null, 12);
+            c.a.d.o.h(this.this$0.this$0.requireContext(), this.this$0.this$0.requireContext().getString(2131894457), 0, null, 12);
             StoreStream.Companion companion = StoreStream.Companion;
             companion.getAuthentication().setAuthed(disableMfaResponse.a());
             companion.getMFA().updatePendingMFAState(StoreMFA.MFAActivationState.PENDING_DISABLED);
@@ -62,6 +62,6 @@ public final class WidgetSettingsAccount$showRemove2FAModal$1 extends o implemen
     public final void invoke(Context context, String str) {
         m.checkNotNullParameter(context, "<anonymous parameter 0>");
         m.checkNotNullParameter(str, "code");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().disableMFA(new DisableMfaRequestBody(str)), this.this$0, null, 2, null), WidgetSettingsAccount.access$getBinding$p(this.this$0).b, 0, 2, null), false, 1, null), WidgetSettingsAccount.class, this.this$0.requireContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(RestAPI.Companion.getApi().disableMFA(new DisableMfaRequestBody(str)), this.this$0, null, 2, null), WidgetSettingsAccount.access$getBinding$p(this.this$0).d, 0, 2, null), false, 1, null), WidgetSettingsAccount.class, this.this$0.requireContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
index 5787b2fb51..916f7398c7 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount.java
@@ -39,6 +39,7 @@ import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.utilities.views.ViewCoroutineScopeKt;
 import com.discord.views.CheckedSetting;
 import com.discord.widgets.notice.WidgetNoticeDialog;
+import com.discord.widgets.settings.CustomProfilesEditingFeatureFlag;
 import com.discord.widgets.settings.account.WidgetEnableSMSBackupDialog;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -64,7 +65,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     private Action1<String> accountAvatarSelectedResult;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccount$binding$2.INSTANCE, null, 2, null);
     private String lastIconUrl;
-    private final StatefulViews state = new StatefulViews(2131364741);
+    private final StatefulViews state = new StatefulViews(2131364790);
 
     /* compiled from: WidgetSettingsAccount.kt */
     public static final class Companion {
@@ -110,6 +111,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     public static final class Model {
         public static final Companion Companion = new Companion(null);
         private final ModelConnectedAccount contactSyncConnection;
+        private final boolean isCustomProfileEditingEnabled;
         private final MeUser meUser;
         private final boolean ownsAnyGuilds;
         private final StoreMFA.State pendingMFAState;
@@ -125,22 +127,23 @@ public final class WidgetSettingsAccount extends AppFragment {
 
             public final Observable<Model> get() {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable<Model> g = Observable.g(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getMFA().observeState(), companion.getGuilds().observeGuilds(), companion.getUserConnections().observeConnectedAccounts(), companion.getExperiments().observeUserExperiment("2021-04_contact_sync_android_main", true), WidgetSettingsAccount$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(g, "Observable.combineLatest…            )\n          }");
-                return g;
+                Observable<Model> f = Observable.f(StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getMFA().observeState(), companion.getGuilds().observeGuilds(), companion.getUserConnections().observeConnectedAccounts(), companion.getExperiments().observeUserExperiment("2021-04_contact_sync_android_main", true), CustomProfilesEditingFeatureFlag.Companion.getINSTANCE().observeIsEnabled(), WidgetSettingsAccount$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(f, "Observable.combineLatest…            )\n          }");
+                return f;
             }
         }
 
-        public Model(MeUser meUser, StoreMFA.State state, boolean z2, ModelConnectedAccount modelConnectedAccount) {
+        public Model(MeUser meUser, StoreMFA.State state, boolean z2, ModelConnectedAccount modelConnectedAccount, boolean z3) {
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(state, "pendingMFAState");
             this.meUser = meUser;
             this.pendingMFAState = state;
             this.ownsAnyGuilds = z2;
             this.contactSyncConnection = modelConnectedAccount;
+            this.isCustomProfileEditingEnabled = z3;
         }
 
-        public static /* synthetic */ Model copy$default(Model model, MeUser meUser, StoreMFA.State state, boolean z2, ModelConnectedAccount modelConnectedAccount, int i, Object obj) {
+        public static /* synthetic */ Model copy$default(Model model, MeUser meUser, StoreMFA.State state, boolean z2, ModelConnectedAccount modelConnectedAccount, boolean z3, int i, Object obj) {
             if ((i & 1) != 0) {
                 meUser = model.meUser;
             }
@@ -153,7 +156,10 @@ public final class WidgetSettingsAccount extends AppFragment {
             if ((i & 8) != 0) {
                 modelConnectedAccount = model.contactSyncConnection;
             }
-            return model.copy(meUser, state, z2, modelConnectedAccount);
+            if ((i & 16) != 0) {
+                z3 = model.isCustomProfileEditingEnabled;
+            }
+            return model.copy(meUser, state, z2, modelConnectedAccount, z3);
         }
 
         public final MeUser component1() {
@@ -172,10 +178,14 @@ public final class WidgetSettingsAccount extends AppFragment {
             return this.contactSyncConnection;
         }
 
-        public final Model copy(MeUser meUser, StoreMFA.State state, boolean z2, ModelConnectedAccount modelConnectedAccount) {
+        public final boolean component5() {
+            return this.isCustomProfileEditingEnabled;
+        }
+
+        public final Model copy(MeUser meUser, StoreMFA.State state, boolean z2, ModelConnectedAccount modelConnectedAccount, boolean z3) {
             m.checkNotNullParameter(meUser, "meUser");
             m.checkNotNullParameter(state, "pendingMFAState");
-            return new Model(meUser, state, z2, modelConnectedAccount);
+            return new Model(meUser, state, z2, modelConnectedAccount, z3);
         }
 
         public boolean equals(Object obj) {
@@ -186,7 +196,7 @@ public final class WidgetSettingsAccount extends AppFragment {
                 return false;
             }
             Model model = (Model) obj;
-            return m.areEqual(this.meUser, model.meUser) && m.areEqual(this.pendingMFAState, model.pendingMFAState) && this.ownsAnyGuilds == model.ownsAnyGuilds && m.areEqual(this.contactSyncConnection, model.contactSyncConnection);
+            return m.areEqual(this.meUser, model.meUser) && m.areEqual(this.pendingMFAState, model.pendingMFAState) && this.ownsAnyGuilds == model.ownsAnyGuilds && m.areEqual(this.contactSyncConnection, model.contactSyncConnection) && this.isCustomProfileEditingEnabled == model.isCustomProfileEditingEnabled;
         }
 
         public final ModelConnectedAccount getContactSyncConnection() {
@@ -212,18 +222,28 @@ public final class WidgetSettingsAccount extends AppFragment {
             StoreMFA.State state = this.pendingMFAState;
             int hashCode2 = (hashCode + (state != null ? state.hashCode() : 0)) * 31;
             boolean z2 = this.ownsAnyGuilds;
+            int i2 = 1;
             if (z2) {
                 z2 = true;
             }
-            int i2 = z2 ? 1 : 0;
             int i3 = z2 ? 1 : 0;
             int i4 = z2 ? 1 : 0;
-            int i5 = (hashCode2 + i2) * 31;
+            int i5 = z2 ? 1 : 0;
+            int i6 = (hashCode2 + i3) * 31;
             ModelConnectedAccount modelConnectedAccount = this.contactSyncConnection;
             if (modelConnectedAccount != null) {
                 i = modelConnectedAccount.hashCode();
             }
-            return i5 + i;
+            int i7 = (i6 + i) * 31;
+            boolean z3 = this.isCustomProfileEditingEnabled;
+            if (!z3) {
+                i2 = z3 ? 1 : 0;
+            }
+            return i7 + i2;
+        }
+
+        public final boolean isCustomProfileEditingEnabled() {
+            return this.isCustomProfileEditingEnabled;
         }
 
         public String toString() {
@@ -235,8 +255,8 @@ public final class WidgetSettingsAccount extends AppFragment {
             L.append(this.ownsAnyGuilds);
             L.append(", contactSyncConnection=");
             L.append(this.contactSyncConnection);
-            L.append(")");
-            return L.toString();
+            L.append(", isCustomProfileEditingEnabled=");
+            return a.G(L, this.isCustomProfileEditingEnabled, ")");
         }
     }
 
@@ -246,7 +266,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     public WidgetSettingsAccount() {
-        super(2131559183);
+        super(2131559189);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccount widgetSettingsAccount, Model model) {
@@ -278,119 +298,125 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     private final void configureAccountVerificationBanner(MeUser meUser) {
-        RelativeLayout relativeLayout = getBinding().H;
+        RelativeLayout relativeLayout = getBinding().J;
         m.checkNotNullExpressionValue(relativeLayout, "binding.settingsAccountVerification");
         relativeLayout.setVisibility(meUser.isVerified() ^ true ? 0 : 8);
         if (meUser.getEmail() == null) {
-            TextView textView = getBinding().J;
+            TextView textView = getBinding().L;
             m.checkNotNullExpressionValue(textView, "binding.settingsAccountVerificationTitle");
             textView.setText(getString(2131886247));
-            MaterialButton materialButton = getBinding().I;
+            MaterialButton materialButton = getBinding().K;
             m.checkNotNullExpressionValue(materialButton, "binding.settingsAccountVerificationButton");
             materialButton.setText(getString(2131886249));
         } else {
-            TextView textView2 = getBinding().J;
+            TextView textView2 = getBinding().L;
             m.checkNotNullExpressionValue(textView2, "binding.settingsAccountVerificationTitle");
-            textView2.setText(getString(2131894468));
-            MaterialButton materialButton2 = getBinding().I;
+            textView2.setText(getString(2131894587));
+            MaterialButton materialButton2 = getBinding().K;
             m.checkNotNullExpressionValue(materialButton2, "binding.settingsAccountVerificationButton");
-            materialButton2.setText(getString(2131894453));
+            materialButton2.setText(getString(2131894572));
         }
-        getBinding().I.setOnClickListener(WidgetSettingsAccount$configureAccountVerificationBanner$1.INSTANCE);
+        getBinding().K.setOnClickListener(WidgetSettingsAccount$configureAccountVerificationBanner$1.INSTANCE);
     }
 
     private final void configureMFA(boolean z2, boolean z3) {
-        TextView textView = getBinding().n;
+        TextView textView = getBinding().p;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountMfaEnabledHeader");
         int i = 0;
         textView.setVisibility(z2 ? 0 : 8);
-        AppViewFlipper appViewFlipper = getBinding().o;
+        AppViewFlipper appViewFlipper = getBinding().q;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsAccountMfaFlipper");
         appViewFlipper.setDisplayedChild(!z2 ? 1 : 0);
-        LottieAnimationView lottieAnimationView = getBinding().p;
+        LottieAnimationView lottieAnimationView = getBinding().r;
         m.checkNotNullExpressionValue(lottieAnimationView, "binding.settingsAccountMfaLottie");
         lottieAnimationView.setVisibility(z2 ^ true ? 0 : 8);
-        TextView textView2 = getBinding().q;
+        TextView textView2 = getBinding().f1907s;
         m.checkNotNullExpressionValue(textView2, "binding.settingsAccountMfaSalesPitch");
         textView2.setVisibility(z2 ^ true ? 0 : 8);
-        MaterialButton materialButton = getBinding().l;
+        MaterialButton materialButton = getBinding().n;
         m.checkNotNullExpressionValue(materialButton, "binding.settingsAccountMfaEnable");
         if (!(!z2)) {
             i = 8;
         }
         materialButton.setVisibility(i);
-        MaterialButton materialButton2 = getBinding().l;
+        MaterialButton materialButton2 = getBinding().n;
         m.checkNotNullExpressionValue(materialButton2, "binding.settingsAccountMfaEnable");
         materialButton2.setEnabled(!z3);
-        TextView textView3 = getBinding().K;
+        TextView textView3 = getBinding().M;
         m.checkNotNullExpressionValue(textView3, "binding.settingsAccountViewBackupCodes");
         textView3.setEnabled(!z3);
-        TextView textView4 = getBinding().f1908z;
+        TextView textView4 = getBinding().B;
         m.checkNotNullExpressionValue(textView4, "binding.settingsAccountRemoveTwoFa");
         textView4.setEnabled(!z3);
-        LinearLayout linearLayout = getBinding().k;
+        LinearLayout linearLayout = getBinding().m;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountMfaDisabledContainer");
         ViewExtensions.setEnabledAlpha$default(linearLayout, !z3, 0.0f, 2, null);
-        LinearLayout linearLayout2 = getBinding().m;
+        LinearLayout linearLayout2 = getBinding().o;
         m.checkNotNullExpressionValue(linearLayout2, "binding.settingsAccountMfaEnabledContainer");
         ViewExtensions.setEnabledAlpha$default(linearLayout2, !z3, 0.0f, 2, null);
     }
 
     private final void configureUI(Model model) {
         String str;
+        RelativeLayout relativeLayout = getBinding().b;
+        m.checkNotNullExpressionValue(relativeLayout, "binding.avatarEditSection");
+        int i = 8;
+        relativeLayout.setVisibility(model.isCustomProfileEditingEnabled() ^ true ? 0 : 8);
+        View view = getBinding().f1906c;
+        m.checkNotNullExpressionValue(view, "binding.avatarEditSectionBottomDivider");
+        view.setVisibility(model.isCustomProfileEditingEnabled() ^ true ? 0 : 8);
         MeUser component1 = model.component1();
         StoreMFA.State component2 = model.component2();
         ModelConnectedAccount component4 = model.component4();
         configureAccountVerificationBanner(component1);
-        TextView textView = getBinding().E;
+        TextView textView = getBinding().G;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountTag");
         UserUtils userUtils = UserUtils.INSTANCE;
-        TextView textView2 = getBinding().E;
+        TextView textView2 = getBinding().G;
         m.checkNotNullExpressionValue(textView2, "binding.settingsAccountTag");
         textView.setText(UserUtils.getUserNameWithDiscriminator$default(userUtils, component1, Integer.valueOf(ColorCompat.getThemedColor(textView2.getContext(), 2130969880)), null, 2, null));
-        LinearLayout linearLayout = getBinding().r;
+        LinearLayout linearLayout = getBinding().t;
         m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountNameContainer");
-        int i = 8;
         linearLayout.setVisibility(component4 != null ? 0 : 8);
-        TextView textView3 = getBinding().f1905s;
+        TextView textView3 = getBinding().u;
         m.checkNotNullExpressionValue(textView3, "binding.settingsAccountNameText");
         if (component4 == null || (str = component4.getUsername()) == null) {
             str = "";
         }
         textView3.setText(str);
-        TextView textView4 = getBinding().G;
+        TextView textView4 = getBinding().I;
         m.checkNotNullExpressionValue(textView4, "binding.settingsAccountTagText");
         textView4.setText(UserUtils.getUserNameWithDiscriminator$default(userUtils, component1, null, null, 3, null));
-        TextView textView5 = getBinding().h;
+        TextView textView5 = getBinding().j;
         m.checkNotNullExpressionValue(textView5, "binding.settingsAccountEmailText");
         textView5.setText(component1.getEmail());
-        TextView textView6 = getBinding().u;
+        TextView textView6 = getBinding().w;
         m.checkNotNullExpressionValue(textView6, "binding.settingsAccountPhoneText");
         textView6.setText(component1.getPhoneNumber());
-        getBinding().f.setOnClickListener(new WidgetSettingsAccount$configureUI$1(this));
+        getBinding().h.setOnClickListener(new WidgetSettingsAccount$configureUI$1(this));
         this.accountAvatarSelectedResult = new WidgetSettingsAccount$configureUI$2(this, component1);
         setIcon(component1);
-        getBinding().f1907y.setOnClickListener(new WidgetSettingsAccount$configureUI$3(this, component1));
-        getBinding().e.setOnClickListener(new WidgetSettingsAccount$configureUI$4(this));
-        getBinding().F.setOnClickListener(WidgetSettingsAccount$configureUI$5.INSTANCE);
-        getBinding().r.setOnClickListener(WidgetSettingsAccount$configureUI$6.INSTANCE);
-        getBinding().g.setOnClickListener(WidgetSettingsAccount$configureUI$7.INSTANCE);
-        getBinding().t.setOnClickListener(WidgetSettingsAccount$configureUI$8.INSTANCE);
-        this.state.configureSaveActionView(getBinding().A);
-        getBinding().A.setOnClickListener(new WidgetSettingsAccount$configureUI$9(this, component1));
-        TextView textView7 = getBinding().n;
+        getBinding().A.setOnClickListener(new WidgetSettingsAccount$configureUI$3(this, component1));
+        getBinding().g.setOnClickListener(new WidgetSettingsAccount$configureUI$4(this));
+        getBinding().H.setOnClickListener(WidgetSettingsAccount$configureUI$5.INSTANCE);
+        getBinding().t.setOnClickListener(WidgetSettingsAccount$configureUI$6.INSTANCE);
+        getBinding().i.setOnClickListener(WidgetSettingsAccount$configureUI$7.INSTANCE);
+        getBinding().v.setOnClickListener(WidgetSettingsAccount$configureUI$8.INSTANCE);
+        this.state.configureSaveActionView(getBinding().C);
+        getBinding().C.setOnClickListener(new WidgetSettingsAccount$configureUI$9(this, component1));
+        TextView textView7 = getBinding().p;
         m.checkNotNullExpressionValue(textView7, "binding.settingsAccountMfaEnabledHeader");
         textView7.setVisibility(component1.getMfaEnabled() ? 0 : 8);
-        AppViewFlipper appViewFlipper = getBinding().o;
+        AppViewFlipper appViewFlipper = getBinding().q;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsAccountMfaFlipper");
         appViewFlipper.setDisplayedChild(!component1.getMfaEnabled());
-        LottieAnimationView lottieAnimationView = getBinding().p;
+        LottieAnimationView lottieAnimationView = getBinding().r;
         m.checkNotNullExpressionValue(lottieAnimationView, "binding.settingsAccountMfaLottie");
         lottieAnimationView.setVisibility(component1.getMfaEnabled() ^ true ? 0 : 8);
-        TextView textView8 = getBinding().q;
+        TextView textView8 = getBinding().f1907s;
         m.checkNotNullExpressionValue(textView8, "binding.settingsAccountMfaSalesPitch");
         textView8.setVisibility(component1.getMfaEnabled() ^ true ? 0 : 8);
-        MaterialButton materialButton = getBinding().l;
+        MaterialButton materialButton = getBinding().n;
         m.checkNotNullExpressionValue(materialButton, "binding.settingsAccountMfaEnable");
         if (!component1.getMfaEnabled()) {
             i = 0;
@@ -401,41 +427,41 @@ public final class WidgetSettingsAccount extends AppFragment {
         } else {
             configureMFA(component1.getMfaEnabled(), false);
         }
-        getBinding().l.setOnClickListener(WidgetSettingsAccount$configureUI$10.INSTANCE);
-        getBinding().K.setOnClickListener(WidgetSettingsAccount$configureUI$11.INSTANCE);
-        getBinding().f1908z.setOnClickListener(new WidgetSettingsAccount$configureUI$12(this));
-        getBinding().L.setOnClickListener(WidgetSettingsAccount$configureUI$13.INSTANCE);
-        getBinding().w.setOnClickListener(new WidgetSettingsAccount$configureUI$14(this, model));
-        getBinding().v.setOnClickListener(new WidgetSettingsAccount$configureUI$15(this, model));
+        getBinding().n.setOnClickListener(WidgetSettingsAccount$configureUI$10.INSTANCE);
+        getBinding().M.setOnClickListener(WidgetSettingsAccount$configureUI$11.INSTANCE);
+        getBinding().B.setOnClickListener(new WidgetSettingsAccount$configureUI$12(this));
+        getBinding().N.setOnClickListener(WidgetSettingsAccount$configureUI$13.INSTANCE);
+        getBinding().f1909y.setOnClickListener(new WidgetSettingsAccount$configureUI$14(this, model));
+        getBinding().f1908x.setOnClickListener(new WidgetSettingsAccount$configureUI$15(this, model));
         String sMSBackupDisabledMessage = getSMSBackupDisabledMessage(component1);
         CharSequence charSequence = null;
         if (sMSBackupDisabledMessage != null || component2.isTogglingSMSBackup()) {
-            CheckedSetting.d(getBinding().C, null, 1);
-            TextView textView9 = getBinding().D;
+            CheckedSetting.d(getBinding().E, null, 1);
+            TextView textView9 = getBinding().F;
             m.checkNotNullExpressionValue(textView9, "binding.settingsAccountSmsPhone");
             ViewExtensions.setEnabledAlpha$default(textView9, false, 0.0f, 2, null);
         } else {
-            TextView textView10 = getBinding().D;
+            TextView textView10 = getBinding().F;
             m.checkNotNullExpressionValue(textView10, "binding.settingsAccountSmsPhone");
             ViewExtensions.setEnabledAlpha$default(textView10, true, 0.0f, 2, null);
-            getBinding().C.e(new WidgetSettingsAccount$configureUI$16(this, component1));
+            getBinding().E.e(new WidgetSettingsAccount$configureUI$16(this, component1));
         }
-        TextView textView11 = getBinding().D;
+        TextView textView11 = getBinding().F;
         m.checkNotNullExpressionValue(textView11, "binding.settingsAccountSmsPhone");
         if (component1.getPhoneNumber() != null) {
-            TextView textView12 = getBinding().D;
+            TextView textView12 = getBinding().F;
             m.checkNotNullExpressionValue(textView12, "binding.settingsAccountSmsPhone");
             Context context = textView12.getContext();
             m.checkNotNullExpressionValue(context, "binding.settingsAccountSmsPhone.context");
-            charSequence = b.g(context, 2131891190, new Object[]{component1.getPhoneNumber()}, null, 4);
+            charSequence = b.g(context, 2131891261, new Object[]{component1.getPhoneNumber()}, null, 4);
         }
         ViewExtensions.setTextAndVisibilityBy(textView11, charSequence);
-        CheckedSetting checkedSetting = getBinding().C;
+        CheckedSetting checkedSetting = getBinding().E;
         m.checkNotNullExpressionValue(checkedSetting, "binding.settingsAccountSmsBackup");
         checkedSetting.setChecked(userUtils.isMfaSMSEnabled(component1));
-        CheckedSetting checkedSetting2 = getBinding().C;
+        CheckedSetting checkedSetting2 = getBinding().E;
         if (sMSBackupDisabledMessage == null) {
-            sMSBackupDisabledMessage = getString(2131891191);
+            sMSBackupDisabledMessage = getString(2131891262);
             m.checkNotNullExpressionValue(sMSBackupDisabledMessage, "getString(R.string.mfa_sms_auth_sales_pitch)");
         }
         CheckedSetting.i(checkedSetting2, sMSBackupDisabledMessage, false, 2);
@@ -446,7 +472,7 @@ public final class WidgetSettingsAccount extends AppFragment {
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             companion.show(parentFragmentManager, true);
         }
-        for (TextView textView13 : n.listOf((Object[]) new TextView[]{getBinding().i, getBinding().f1904c, getBinding().j})) {
+        for (TextView textView13 : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().e, getBinding().l})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView13, "header");
             accessibilityUtils.setViewIsHeading(textView13);
@@ -454,11 +480,11 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     private final void configureUpdatedUser(User user) {
-        o.i(this, 2131892974, 0, 4);
+        o.i(this, 2131893055, 0, 4);
         StatefulViews.clear$default(this.state, false, 1, null);
         StoreStream.Companion.getAuthentication().setAuthed(user.q());
         AppFragment.hideKeyboard$default(this, null, 1, null);
-        getBinding().B.fullScroll(33);
+        getBinding().D.fullScroll(33);
     }
 
     private final WidgetSettingsAccountBinding getBinding() {
@@ -468,10 +494,10 @@ public final class WidgetSettingsAccount extends AppFragment {
     private final String getSMSBackupDisabledMessage(MeUser meUser) {
         UserUtils userUtils = UserUtils.INSTANCE;
         if (userUtils.isPartner(meUser) || userUtils.isStaff(meUser)) {
-            return getString(2131891195);
+            return getString(2131891266);
         }
         if (meUser.getEmail() == null) {
-            return getString(2131891194);
+            return getString(2131891265);
         }
         return null;
     }
@@ -490,17 +516,17 @@ public final class WidgetSettingsAccount extends AppFragment {
 
     private final void setIcon(com.discord.models.user.User user) {
         StatefulViews statefulViews = this.state;
-        SimpleDraweeView simpleDraweeView = getBinding().d;
+        SimpleDraweeView simpleDraweeView = getBinding().f;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.settingsAccountAvatar");
         String str = (String) statefulViews.get(simpleDraweeView.getId(), IconUtils.getForUser$default(Long.valueOf(user.getId()), user.getAvatar(), Integer.valueOf(user.getDiscriminator()), true, null, 16, null));
         boolean z2 = true;
         if (!m.areEqual(str, this.lastIconUrl)) {
-            SimpleDraweeView simpleDraweeView2 = getBinding().d;
+            SimpleDraweeView simpleDraweeView2 = getBinding().f;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.settingsAccountAvatar");
             IconUtils.setIcon$default(simpleDraweeView2, str, 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
             this.lastIconUrl = str;
         }
-        TextView textView = getBinding().f1907y;
+        TextView textView = getBinding().A;
         m.checkNotNullExpressionValue(textView, "binding.settingsAccountRemoveAvatar");
         int i = 0;
         if (str != null && w.contains$default((CharSequence) str, (CharSequence) "asset://asset/images/default_avatar", false, 2, (Object) null)) {
@@ -513,7 +539,7 @@ public final class WidgetSettingsAccount extends AppFragment {
     }
 
     private final void showOwnsGuildModal() {
-        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888056).setMessage(2131888057), 2131891666, (Function1) null, 2, (Object) null);
+        WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888055).setMessage(2131888056), 2131891735, (Function1) null, 2, (Object) null);
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         positiveButton$default.show(parentFragmentManager);
@@ -523,11 +549,11 @@ public final class WidgetSettingsAccount extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
-            String string = requireContext().getString(2131894021);
+            String string = requireContext().getString(2131894121);
             m.checkNotNullExpressionValue(string, "requireContext().getString(R.string.two_fa_remove)");
-            String string2 = requireContext().getString(2131894343);
+            String string2 = requireContext().getString(2131894454);
             m.checkNotNullExpressionValue(string2, "requireContext().getStri…ngs_mfa_enable_code_body)");
-            String string3 = requireContext().getString(2131893978);
+            String string3 = requireContext().getString(2131894078);
             m.checkNotNullExpressionValue(string3, "requireContext().getStri….string.two_fa_auth_code)");
             WidgetNoticeDialog.Companion.showInputModal$default(companion, appActivity, string, string2, string3, new WidgetSettingsAccount$showRemove2FAModal$1(this), null, null, 96, null);
         }
@@ -563,14 +589,14 @@ public final class WidgetSettingsAccount extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131894349);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131894460);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         setRetainInstance(true);
         this.state.setupUnsavedChangesConfirmation(this);
-        this.state.setupTextWatcherWithSaveAction(this, getBinding().A, new View[0]);
+        this.state.setupTextWatcherWithSaveAction(this, getBinding().C, new View[0]);
         if (getMostRecentIntent().getBooleanExtra("com.discord.extra.HINT_DATA_MANAGEMENT", false)) {
-            LinearLayout linearLayout = getBinding().f1906x;
+            LinearLayout linearLayout = getBinding().f1910z;
             m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountPrivateDataWrap");
             CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(linearLayout);
             if (coroutineScope != null) {
@@ -582,8 +608,8 @@ public final class WidgetSettingsAccount extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<Model> s2 = Model.Companion.get().s();
-        m.checkNotNullExpressionValue(s2, "Model\n        .get()\n   …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetSettingsAccount.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAccount$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<Model> r = Model.Companion.get().r();
+        m.checkNotNullExpressionValue(r, "Model\n        .get()\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetSettingsAccount.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAccount$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java
index f65c808110..ba373b9e99 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java
@@ -23,6 +23,6 @@ public final class WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder
         if (clipboardManager != null) {
             clipboardManager.setPrimaryClip(newPlainText);
         }
-        o.g(view.getContext(), 2131887622, 0, null, 12);
+        o.g(view.getContext(), 2131887621, 0, null, 12);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java
index 28884e0912..0d41fde742 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java
@@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetSettingsAccountBackupCodes$binding$2 ex
 
     public final WidgetSettingsAccountBackupCodesBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131364798;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364798);
+            i = 2131364847;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364847);
             if (materialButton != null) {
-                i = 2131364799;
-                TextView textView = (TextView) view.findViewById(2131364799);
+                i = 2131364848;
+                TextView textView = (TextView) view.findViewById(2131364848);
                 if (textView != null) {
-                    i = 2131364800;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364800);
+                    i = 2131364849;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364849);
                     if (recyclerView != null) {
                         return new WidgetSettingsAccountBackupCodesBinding((CoordinatorLayout) view, dimmerView, materialButton, textView, recyclerView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java
index b68d91fc64..0e959beacc 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java
@@ -43,7 +43,7 @@ public final class WidgetSettingsAccountBackupCodes$getBackupCodes$1 extends o i
         }
         ArrayList arrayList3 = new ArrayList();
         if (!arrayList.isEmpty()) {
-            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894292, new Object[0], null, 4)));
+            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894394, new Object[0], null, 4)));
             ArrayList arrayList4 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10));
             for (BackupCode backupCode : arrayList) {
                 arrayList4.add(new WidgetSettingsAccountBackupCodes.BackupCodeItem(backupCode));
@@ -51,7 +51,7 @@ public final class WidgetSettingsAccountBackupCodes$getBackupCodes$1 extends o i
             arrayList3.addAll(arrayList4);
         }
         if (!arrayList2.isEmpty()) {
-            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894380, new Object[0], null, 4)));
+            arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894499, new Object[0], null, 4)));
             ArrayList arrayList5 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList2, 10));
             for (BackupCode backupCode2 : arrayList2) {
                 arrayList5.add(new WidgetSettingsAccountBackupCodes.BackupCodeItem(backupCode2));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
index 2470afbe82..a417650709 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java
@@ -99,9 +99,9 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
                 Objects.requireNonNull(a2, "null cannot be cast to non-null type java.lang.String");
                 String substring2 = a2.substring(4);
                 m.checkNotNullExpressionValue(substring2, "(this as java.lang.String).substring(startIndex)");
-                b.n(textView, 2131886813, new Object[]{substring, substring2}, null, 4);
+                b.m(textView, 2131886813, new Object[]{substring, substring2}, null, 4);
                 if (backupCodeItem.getBackupCode().b()) {
-                    this.binding.b.setCompoundDrawablesWithIntrinsicBounds(0, 0, 2131231501, 0);
+                    this.binding.b.setCompoundDrawablesWithIntrinsicBounds(0, 0, 2131231507, 0);
                     this.binding.b.setOnClickListener(null);
                     return;
                 }
@@ -119,7 +119,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<Adapter, MGRecyclerDataPayload> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return i != 0 ? i != 1 ? new MGRecyclerViewHolder<>(0, this) : new BackupCodeViewHolder(2131559205, this) : new BackupCodeHeaderViewHolder(2131559206, this);
+            return i != 0 ? i != 1 ? new MGRecyclerViewHolder<>(0, this) : new BackupCodeViewHolder(2131559211, this) : new BackupCodeHeaderViewHolder(2131559212, this);
         }
     }
 
@@ -269,7 +269,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
     }
 
     public WidgetSettingsAccountBackupCodes() {
-        super(2131559184);
+        super(2131559190);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountBackupCodes widgetSettingsAccountBackupCodes, List list) {
@@ -312,7 +312,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
             getBinding().b.setDimmed(true, true);
-            WidgetNoticeDialog.Companion.showInputModal(appActivity, b.g(requireContext(), 2131893985, new Object[0], null, 4), b.g(requireContext(), 2131894312, new Object[0], null, 4), b.g(requireContext(), 2131888715, new Object[0], null, 4), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1(this), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2(this), Boolean.FALSE);
+            WidgetNoticeDialog.Companion.showInputModal(appActivity, b.g(requireContext(), 2131894085, new Object[0], null, 4), b.g(requireContext(), 2131894423, new Object[0], null, 4), b.g(requireContext(), 2131888716, new Object[0], null, 4), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1(this), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2(this), Boolean.FALSE);
         }
     }
 
@@ -320,12 +320,12 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131893985);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131894085);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.settingsBackupCodesInfo");
-        b.n(textView, 2131893984, new Object[0], null, 4);
+        b.m(textView, 2131894084, new Object[0], null, 4);
         RecyclerView recyclerView = getBinding().e;
         m.checkNotNullExpressionValue(recyclerView, "binding.settingsBackupCodesRv");
         this.backupCodesAdapter = new Adapter(recyclerView);
@@ -335,7 +335,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment {
             m.checkNotNullExpressionValue(recyclerView2, "binding.settingsBackupCodesRv");
             this.backupCodesAdapter = (Adapter) companion.configure(new Adapter(recyclerView2));
         }
-        getBinding().f1903c.setOnClickListener(new WidgetSettingsAccountBackupCodes$onViewBound$2(this));
+        getBinding().f1905c.setOnClickListener(new WidgetSettingsAccountBackupCodes$onViewBound$2(this));
         showPasswordModal();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java
index c10c3c658e..54801b1bdd 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetSettingsAccountChangePassword$binding$2
 
     public final WidgetSettingsAccountChangePasswordBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362247;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362247);
+        int i = 2131362258;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362258);
         if (textInputLayout != null) {
-            i = 2131362248;
-            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362248);
+            i = 2131362259;
+            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362259);
             if (textInputLayout2 != null) {
-                i = 2131362249;
-                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362249);
+                i = 2131362260;
+                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362260);
                 if (floatingActionButton != null) {
-                    i = 2131362250;
-                    TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131362250);
+                    i = 2131362261;
+                    TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131362261);
                     if (textInputLayout3 != null) {
-                        i = 2131362896;
-                        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                        i = 2131362921;
+                        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                         if (dimmerView != null) {
                             return new WidgetSettingsAccountChangePasswordBinding((CoordinatorLayout) view, textInputLayout, textInputLayout2, floatingActionButton, textInputLayout3, dimmerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java
index 2326a4bfe5..3e9bcaa82c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java
@@ -26,7 +26,7 @@ public final class WidgetSettingsAccountChangePassword$onViewBound$2 extends o i
 
     public final void invoke(Editable editable) {
         m.checkNotNullParameter(editable, "it");
-        TextInputLayout textInputLayout = WidgetSettingsAccountChangePassword.access$getBinding$p(this.this$0).f1909c;
+        TextInputLayout textInputLayout = WidgetSettingsAccountChangePassword.access$getBinding$p(this.this$0).f1911c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.changePasswordNewPasswordInput");
         textInputLayout.setError(null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java
index 6a6479bb34..85126be2e9 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java
@@ -20,7 +20,7 @@ public final class WidgetSettingsAccountChangePassword$saveNewPassword$1<T> impl
 
     public final void call(User user) {
         GoogleSmartLockManager googleSmartLockManager;
-        o.i(this.this$0, 2131892974, 0, 4);
+        o.i(this.this$0, 2131893055, 0, 4);
         StoreStream.Companion.getAuthentication().setAuthed(user.q());
         Context context = this.this$0.getContext();
         if (!(context == null || (googleSmartLockManager = GoogleSmartLockManagerKt.googleSmartLockManager(context)) == null)) {
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
index 17d7cb700a..a1c5029deb 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java
@@ -33,7 +33,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountChangePassword$binding$2.INSTANCE, null, 2, null);
     private GoogleSmartLockManager googleSmartLockManager;
-    private final StatefulViews state = new StatefulViews(2131362248);
+    private final StatefulViews state = new StatefulViews(2131362259);
 
     /* compiled from: WidgetSettingsAccountChangePassword.kt */
     public static final class Companion {
@@ -51,7 +51,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
     }
 
     public WidgetSettingsAccountChangePassword() {
-        super(2131559185);
+        super(2131559191);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountChangePassword widgetSettingsAccountChangePassword, MeUser meUser) {
@@ -89,7 +89,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.changePasswordCurrentPasswordInput");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout2);
-        TextInputLayout textInputLayout3 = getBinding().f1909c;
+        TextInputLayout textInputLayout3 = getBinding().f1911c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.changePasswordNewPasswordInput");
         String textOrEmpty2 = ViewExtensions.getTextOrEmpty(textInputLayout3);
         if (textOrEmpty.length() == 0) {
@@ -98,14 +98,14 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
             m.checkNotNullExpressionValue(textInputLayout4, "binding.changePasswordCurrentPasswordInput");
             TextInputLayout textInputLayout5 = getBinding().b;
             m.checkNotNullExpressionValue(textInputLayout5, "binding.changePasswordCurrentPasswordInput");
-            textInputLayout4.setError(textInputLayout5.getContext().getString(2131891781));
+            textInputLayout4.setError(textInputLayout5.getContext().getString(2131891853));
         } else if (!AuthUtils.INSTANCE.isValidPasswordLength(textOrEmpty2)) {
-            getBinding().f1909c.requestFocus();
-            TextInputLayout textInputLayout6 = getBinding().f1909c;
+            getBinding().f1911c.requestFocus();
+            TextInputLayout textInputLayout6 = getBinding().f1911c;
             m.checkNotNullExpressionValue(textInputLayout6, "binding.changePasswordNewPasswordInput");
-            TextInputLayout textInputLayout7 = getBinding().f1909c;
+            TextInputLayout textInputLayout7 = getBinding().f1911c;
             m.checkNotNullExpressionValue(textInputLayout7, "binding.changePasswordNewPasswordInput");
-            textInputLayout6.setError(textInputLayout7.getContext().getString(2131891770));
+            textInputLayout6.setError(textInputLayout7.getContext().getString(2131891842));
         } else {
             if (meUser.getMfaEnabled()) {
                 if (str == null || str.length() == 0) {
@@ -114,7 +114,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
                     m.checkNotNullExpressionValue(textInputLayout8, "binding.changePasswordTwoFactor");
                     TextInputLayout textInputLayout9 = getBinding().e;
                     m.checkNotNullExpressionValue(textInputLayout9, "binding.changePasswordTwoFactor");
-                    textInputLayout8.setError(textInputLayout9.getContext().getString(2131894025));
+                    textInputLayout8.setError(textInputLayout9.getContext().getString(2131894125));
                     return;
                 }
             }
@@ -131,19 +131,19 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment {
         Context context = view.getContext();
         m.checkNotNullExpressionValue(context, "view.context");
         this.googleSmartLockManager = new GoogleSmartLockManager(context, null, 2, null);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         setActionBarTitle(2131887249);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         this.state.setupUnsavedChangesConfirmation(this);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
-        TextInputLayout textInputLayout = getBinding().f1909c;
+        TextInputLayout textInputLayout = getBinding().f1911c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.changePasswordNewPasswordInput");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.changePasswordCurrentPasswordInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetSettingsAccountChangePassword$onViewBound$1(this));
-        TextInputLayout textInputLayout3 = getBinding().f1909c;
+        TextInputLayout textInputLayout3 = getBinding().f1911c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.changePasswordNewPasswordInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout3, this, new WidgetSettingsAccountChangePassword$onViewBound$2(this));
         TextInputLayout textInputLayout4 = getBinding().e;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java
index f3e064066b..a32d65580c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetSettingsAccountContactsNameEdit$binding
 
     public final WidgetSettingsAccountContactsNameEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362961;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362961);
+        int i = 2131362986;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362986);
         if (textInputLayout != null) {
-            i = 2131364760;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364760);
+            i = 2131364809;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364809);
             if (materialButton != null) {
-                i = 2131364772;
-                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772);
+                i = 2131364821;
+                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364821);
                 if (floatingActionButton != null) {
                     return new WidgetSettingsAccountContactsNameEditBinding((CoordinatorLayout) view, textInputLayout, materialButton, floatingActionButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
index 518d0f33c5..1d6eda6d33 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java
@@ -50,7 +50,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment {
     }
 
     public WidgetSettingsAccountContactsNameEdit() {
-        super(2131559186);
+        super(2131559192);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountContactsNameEdit widgetSettingsAccountContactsNameEdit, List list) {
@@ -86,7 +86,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment {
             str = "";
         }
         ViewExtensions.setText(textInputLayout, str);
-        getBinding().f1910c.setOnClickListener(new WidgetSettingsAccountContactsNameEdit$configureUI$1(this));
+        getBinding().f1912c.setOnClickListener(new WidgetSettingsAccountContactsNameEdit$configureUI$1(this));
     }
 
     private final WidgetSettingsAccountContactsNameEditBinding getBinding() {
@@ -113,7 +113,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         setActionBarTitle(2131887610);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextInputLayout textInputLayout = getBinding().b;
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java
index 29adcf3363..963a8f6f22 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetSettingsAccountEmailEdit$binding$2 exte
 
     public final WidgetSettingsAccountEmailEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362960;
-        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362960);
+        int i = 2131362985;
+        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362985);
         if (textInputLayout != null) {
-            i = 2131364772;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772);
+            i = 2131364821;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364821);
             if (floatingActionButton != null) {
                 return new WidgetSettingsAccountEmailEditBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
index 7546ff216e..11f0603a1f 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java
@@ -34,7 +34,7 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountEmailEdit$binding$2.INSTANCE, null, 2, null);
     private final ActivityResultLauncher<Intent> passwordVerifyLauncher = WidgetUserPasswordVerify.Companion.registerForResult(this, new WidgetSettingsAccountEmailEdit$passwordVerifyLauncher$1(this));
-    private final StatefulViews state = new StatefulViews(2131362960);
+    private final StatefulViews state = new StatefulViews(2131362985);
     private final Lazy validationManager$delegate = g.lazy(new WidgetSettingsAccountEmailEdit$validationManager$2(this));
 
     /* compiled from: WidgetSettingsAccountEmailEdit.kt */
@@ -53,7 +53,7 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
     }
 
     public WidgetSettingsAccountEmailEdit() {
-        super(2131559188);
+        super(2131559194);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountEmailEdit widgetSettingsAccountEmailEdit, MeUser meUser) {
@@ -104,15 +104,15 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131894261);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131894363);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountEmailWrap");
         ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsAccountEmailEdit$onViewBound$1(this), 1, null);
-        getBinding().f1912c.setOnClickListener(new WidgetSettingsAccountEmailEdit$onViewBound$2(this));
+        getBinding().f1914c.setOnClickListener(new WidgetSettingsAccountEmailEdit$onViewBound$2(this));
         StatefulViews statefulViews = this.state;
-        FloatingActionButton floatingActionButton = getBinding().f1912c;
+        FloatingActionButton floatingActionButton = getBinding().f1914c;
         TextInputLayout textInputLayout2 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountEmailWrap");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout2);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java
index 44a5a74556..f5200bd72a 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java
@@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetSettingsAccountUsernameEdit$binding$2 e
 
     public final WidgetSettingsAccountEditBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362955;
-        TextView textView = (TextView) view.findViewById(2131362955);
+        int i = 2131362980;
+        TextView textView = (TextView) view.findViewById(2131362980);
         if (textView != null) {
-            i = 2131362959;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362959);
+            i = 2131362984;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362984);
             if (textInputLayout != null) {
-                i = 2131362963;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362963);
+                i = 2131362988;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362988);
                 if (relativeLayout != null) {
-                    i = 2131362964;
-                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362964);
+                    i = 2131362989;
+                    TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362989);
                     if (textInputLayout2 != null) {
-                        i = 2131364772;
-                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772);
+                        i = 2131364821;
+                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364821);
                         if (floatingActionButton != null) {
                             return new WidgetSettingsAccountEditBinding((CoordinatorLayout) view, textView, textInputLayout, relativeLayout, textInputLayout2, floatingActionButton);
                         }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java
index 3620da31bd..cc36f80226 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java
@@ -2,7 +2,7 @@ package com.discord.widgets.settings.account;
 
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
-import c.a.a.a.a;
+import c.a.a.e.a;
 import d0.z.d.m;
 /* compiled from: WidgetSettingsAccountUsernameEdit.kt */
 public final class WidgetSettingsAccountUsernameEdit$configureUI$1 implements View.OnFocusChangeListener {
@@ -34,7 +34,7 @@ public final class WidgetSettingsAccountUsernameEdit$configureUI$1 implements Vi
             a.b bVar = a.j;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            a.b.a(bVar, parentFragmentManager, 0, this.this$0.getString(2131892347), null, "User Settings", "Edit Account", null, null, false, false, 968);
+            a.b.a(bVar, parentFragmentManager, 0, this.this$0.getString(2131892424), null, "User Settings", "Edit Account", null, null, false, false, 968);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
index 8a23c62e31..d8d4e4f27c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java
@@ -22,11 +22,11 @@ public final class WidgetSettingsAccountUsernameEdit$validationManager$2 extends
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo1invoke() {
-        TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f1911c;
+        TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f1913c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
-        InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(2131894408)};
+        InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(2131894527)};
         TextInputLayout textInputLayout2 = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).b;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountDiscriminatorWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.EditTextInput("discriminator", textInputLayout2, AuthUtils.INSTANCE.createDiscriminatorInputValidator(2131891940, 2131891946)));
+        return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.EditTextInput("discriminator", textInputLayout2, AuthUtils.INSTANCE.createDiscriminatorInputValidator(2131892012, 2131892018)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
index 912ffbd635..368301313a 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java
@@ -39,7 +39,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountUsernameEdit$binding$2.INSTANCE, null, 2, null);
     private final ActivityResultLauncher<Intent> passwordVerifyLauncher = WidgetUserPasswordVerify.Companion.registerForResult(this, new WidgetSettingsAccountUsernameEdit$passwordVerifyLauncher$1(this));
-    private final StatefulViews state = new StatefulViews(2131362964, 2131362959);
+    private final StatefulViews state = new StatefulViews(2131362989, 2131362984);
     private final Lazy validationManager$delegate = g.lazy(new WidgetSettingsAccountUsernameEdit$validationManager$2(this));
 
     /* compiled from: WidgetSettingsAccountUsernameEdit.kt */
@@ -58,7 +58,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     }
 
     public WidgetSettingsAccountUsernameEdit() {
-        super(2131559187);
+        super(2131559193);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountUsernameEdit widgetSettingsAccountUsernameEdit, MeUser meUser) {
@@ -78,10 +78,10 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     }
 
     private final void configureUI(MeUser meUser) {
-        TextInputLayout textInputLayout = getBinding().f1911c;
+        TextInputLayout textInputLayout = getBinding().f1913c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
         StatefulViews statefulViews = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f1911c;
+        TextInputLayout textInputLayout2 = getBinding().f1913c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountUsernameWrap");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), meUser.getUsername()));
         TextInputLayout textInputLayout3 = getBinding().b;
@@ -93,11 +93,11 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
         String format = String.format("%04d", Arrays.copyOf(new Object[]{Integer.valueOf(meUser.getDiscriminator())}, 1));
         m.checkNotNullExpressionValue(format, "java.lang.String.format(format, *args)");
         ViewExtensions.setText(textInputLayout3, (CharSequence) statefulViews2.get(id2, format));
-        TextInputLayout textInputLayout5 = getBinding().f1911c;
+        TextInputLayout textInputLayout5 = getBinding().f1913c;
         m.checkNotNullExpressionValue(textInputLayout5, "binding.editAccountUsernameWrap");
         EditText editText = textInputLayout5.getEditText();
         Editable text = editText != null ? editText.getText() : null;
-        TextInputLayout textInputLayout6 = getBinding().f1911c;
+        TextInputLayout textInputLayout6 = getBinding().f1913c;
         m.checkNotNullExpressionValue(textInputLayout6, "binding.editAccountUsernameWrap");
         Selection.setSelection(text, ViewExtensions.getTextOrEmpty(textInputLayout6).length());
         TextInputLayout textInputLayout7 = getBinding().b;
@@ -124,7 +124,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
             WidgetUserPasswordVerify.Companion companion = WidgetUserPasswordVerify.Companion;
             Context requireContext = requireContext();
             ActivityResultLauncher<Intent> activityResultLauncher = this.passwordVerifyLauncher;
-            TextInputLayout textInputLayout = getBinding().f1911c;
+            TextInputLayout textInputLayout = getBinding().f1913c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
             TextInputLayout textInputLayout2 = getBinding().b;
@@ -137,8 +137,8 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131894266);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131894368);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextInputLayout textInputLayout = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountDiscriminatorWrap");
@@ -149,7 +149,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment {
         getBinding().d.setOnClickListener(new WidgetSettingsAccountUsernameEdit$onViewBound$3(this));
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
-        TextInputLayout textInputLayout3 = getBinding().f1911c;
+        TextInputLayout textInputLayout3 = getBinding().f1913c;
         m.checkNotNullExpressionValue(textInputLayout3, "binding.editAccountUsernameWrap");
         TextInputLayout textInputLayout4 = getBinding().b;
         m.checkNotNullExpressionValue(textInputLayout4, "binding.editAccountDiscriminatorWrap");
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java
index e144b86491..83fb436780 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetSettingsBlockedUsers$binding$2 extends
 
     public final WidgetSettingsBlockedUsersBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362107;
-        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362107);
+        int i = 2131362118;
+        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362118);
         if (appViewFlipper != null) {
-            i = 2131362108;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362108);
+            i = 2131362119;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362119);
             if (recyclerView != null) {
-                i = 2131363254;
-                ImageView imageView = (ImageView) view.findViewById(2131363254);
+                i = 2131363279;
+                ImageView imageView = (ImageView) view.findViewById(2131363279);
                 if (imageView != null) {
                     return new WidgetSettingsBlockedUsersBinding((CoordinatorLayout) view, appViewFlipper, recyclerView, imageView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
index 354ec8f852..3863eedad5 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java
@@ -53,7 +53,7 @@ public final class WidgetSettingsBlockedUsers extends AppFragment {
     }
 
     public WidgetSettingsBlockedUsers() {
-        super(2131559194);
+        super(2131559200);
         WidgetSettingsBlockedUsers$viewModel$2 widgetSettingsBlockedUsers$viewModel$2 = WidgetSettingsBlockedUsers$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsBlockedUsersViewModel.class), new WidgetSettingsBlockedUsers$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsBlockedUsers$viewModel$2));
@@ -131,9 +131,9 @@ public final class WidgetSettingsBlockedUsers extends AppFragment {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        setActionBarTitle(2131894296);
+        setActionBarTitle(2131894401);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        RecyclerView recyclerView = getBinding().f1921c;
+        RecyclerView recyclerView = getBinding().f1923c;
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         m.checkNotNullExpressionValue(recyclerView, "it");
         WidgetSettingsBlockedUsersAdapter widgetSettingsBlockedUsersAdapter = (WidgetSettingsBlockedUsersAdapter) companion.configure(new WidgetSettingsBlockedUsersAdapter(recyclerView));
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
index 6103eab77d..12e87e57d0 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java
@@ -32,14 +32,14 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
             m.checkNotNullParameter(widgetSettingsBlockedUsersAdapter, "adapter");
             View view = this.itemView;
             RelativeLayout relativeLayout = (RelativeLayout) view;
-            int i2 = 2131362104;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362104);
+            int i2 = 2131362115;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362115);
             if (simpleDraweeView != null) {
-                i2 = 2131362105;
-                TextView textView = (TextView) view.findViewById(2131362105);
+                i2 = 2131362116;
+                TextView textView = (TextView) view.findViewById(2131362116);
                 if (textView != null) {
-                    i2 = 2131365331;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365331);
+                    i2 = 2131365387;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365387);
                     if (materialButton != null) {
                         WidgetSettingsItemBlockedUserBinding widgetSettingsItemBlockedUserBinding = new WidgetSettingsItemBlockedUserBinding((RelativeLayout) view, relativeLayout, simpleDraweeView, textView, materialButton);
                         m.checkNotNullExpressionValue(widgetSettingsItemBlockedUserBinding, "WidgetSettingsItemBlocke…serBinding.bind(itemView)");
@@ -62,7 +62,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
             SimpleDraweeView simpleDraweeView = this.binding.b;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.blockedUserItemAvatar");
             IconUtils.setIcon$default(simpleDraweeView, item.getUser(), 2131165296, null, null, null, 56, null);
-            TextView textView = this.binding.f1929c;
+            TextView textView = this.binding.f1931c;
             m.checkNotNullExpressionValue(textView, "binding.blockedUserItemName");
             textView.setText(item.getUser().getUsername());
             this.binding.d.setOnClickListener(new WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder$onConfigure$2(this, item));
@@ -89,7 +89,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi
     public MGRecyclerViewHolder<WidgetSettingsBlockedUsersAdapter, WidgetSettingsBlockedUsersViewModel.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 0) {
-            return new BlockedUserViewHolder(2131559207, this);
+            return new BlockedUserViewHolder(2131559213, this);
         }
         throw invalidViewTypeException(i);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java
index 12e7f538e6..e9525c33cc 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1.java
@@ -42,6 +42,6 @@ public final class WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }
-        return this.$storeUser.observeUsers(linkedHashMap.keySet()).G(AnonymousClass1.INSTANCE);
+        return this.$storeUser.observeUsers(linkedHashMap.keySet()).F(AnonymousClass1.INSTANCE);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java
index 8fd3564232..0e50fb4300 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java
@@ -22,6 +22,6 @@ public final class WidgetSettingsBlockedUsersViewModel$onClickUnblock$1 extends
     }
 
     public final void invoke(Void r2) {
-        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131894229);
+        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131894330);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java
index c53779082d..e4e603012c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java
@@ -25,6 +25,6 @@ public final class WidgetSettingsBlockedUsersViewModel$onClickUnblock$2 extends
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
index 8e289e52bd..877ee9e418 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel.java
@@ -68,9 +68,9 @@ public final class WidgetSettingsBlockedUsersViewModel extends AppViewModel<View
         public final Observable<StoreState> observeStores(StoreUserRelationships storeUserRelationships, StoreUser storeUser) {
             m.checkNotNullParameter(storeUserRelationships, "storeUserRelationships");
             m.checkNotNullParameter(storeUser, "storeUser");
-            Observable<R> Z = storeUserRelationships.observe().Z(new WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1(storeUser));
-            m.checkNotNullExpressionValue(Z, "storeUserRelationships\n …          }\n            }");
-            return Z;
+            Observable<R> Y = storeUserRelationships.observe().Y(new WidgetSettingsBlockedUsersViewModel$Companion$observeStores$1(storeUser));
+            m.checkNotNullExpressionValue(Y, "storeUserRelationships\n …          }\n            }");
+            return Y;
         }
     }
 
@@ -339,7 +339,7 @@ public final class WidgetSettingsBlockedUsersViewModel extends AppViewModel<View
         m.checkNotNullParameter(observable, "storeObservable");
         m.checkNotNullParameter(restAPI, "restAPI");
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetSettingsBlockedUsersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java
index 6fa5f84159..90f7b6ebf3 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetEnableMFADownload$binding$2 extends k i
 
     public final WidgetSettingsEnableMfaDownloadBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        TextView textView = (TextView) view.findViewById(2131363918);
+        TextView textView = (TextView) view.findViewById(2131363959);
         if (textView != null) {
             return new WidgetSettingsEnableMfaDownloadBinding((LinearLayout) view, textView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363918)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363959)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java
index 36aa910021..0f68d6acb5 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java
@@ -18,7 +18,7 @@ public final class WidgetEnableMFADownload extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetEnableMFADownload$binding$2.INSTANCE, null, 2, null);
 
     public WidgetEnableMFADownload() {
-        super(2131559199);
+        super(2131559205);
     }
 
     private final WidgetSettingsEnableMfaDownloadBinding getBinding() {
@@ -31,7 +31,7 @@ public final class WidgetEnableMFADownload extends AppFragment {
         super.onViewBound(view);
         TextView textView = getBinding().b;
         m.checkNotNullExpressionValue(textView, "binding.mfaDownloadBody");
-        b.n(textView, 2131893995, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4);
+        b.m(textView, 2131894095, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4);
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.mfaDownloadBody");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java
index 56be27e6fc..00986744fe 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetEnableMFAInput$binding$2 extends k impl
 
     public final WidgetSettingsEnableMfaInputBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131365419);
+        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131365479);
         if (codeVerificationView != null) {
             return new WidgetSettingsEnableMfaInputBinding((LinearLayout) view, codeVerificationView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365419)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365479)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java
index 2506543d08..203722a9d8 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java
@@ -24,7 +24,7 @@ public final class WidgetEnableMFAInput extends AppFragment {
     private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetEnableMFAViewModel.class), new WidgetEnableMFAInput$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetEnableMFAInput$viewModel$2.INSTANCE));
 
     public WidgetEnableMFAInput() {
-        super(2131559200);
+        super(2131559206);
     }
 
     public static final /* synthetic */ WidgetEnableMFAViewModel access$getViewModel$p(WidgetEnableMFAInput widgetEnableMFAInput) {
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java
index 70d12d4b69..dafaac3616 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java
@@ -17,14 +17,14 @@ public final /* synthetic */ class WidgetEnableMFAKey$binding$2 extends k implem
 
     public final WidgetSettingsEnableMfaKeyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363045;
-        TextView textView = (TextView) view.findViewById(2131363045);
+        int i = 2131363070;
+        TextView textView = (TextView) view.findViewById(2131363070);
         if (textView != null) {
-            i = 2131363046;
-            TextView textView2 = (TextView) view.findViewById(2131363046);
+            i = 2131363071;
+            TextView textView2 = (TextView) view.findViewById(2131363071);
             if (textView2 != null) {
-                i = 2131363047;
-                TextView textView3 = (TextView) view.findViewById(2131363047);
+                i = 2131363072;
+                TextView textView3 = (TextView) view.findViewById(2131363072);
                 if (textView3 != null) {
                     return new WidgetSettingsEnableMfaKeyBinding((LinearLayout) view, textView, textView2, textView3);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
index 0f610863bc..be76e5fa2f 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java
@@ -54,7 +54,7 @@ public final class WidgetEnableMFAKey extends AppFragment {
     }
 
     public WidgetEnableMFAKey() {
-        super(2131559201);
+        super(2131559207);
     }
 
     public static final /* synthetic */ void access$copyCodeToClipboard(WidgetEnableMFAKey widgetEnableMFAKey, Context context) {
@@ -71,7 +71,7 @@ public final class WidgetEnableMFAKey extends AppFragment {
         if (clipboardManager != null) {
             clipboardManager.setPrimaryClip(newPlainText);
         }
-        o.g(context, 2131887622, 0, null, 12);
+        o.g(context, 2131887621, 0, null, 12);
     }
 
     private final WidgetSettingsEnableMfaKeyBinding getBinding() {
@@ -88,18 +88,18 @@ public final class WidgetEnableMFAKey extends AppFragment {
         if (activity != null && (packageManager = activity.getPackageManager()) != null) {
             Companion companion = Companion;
             if (Companion.access$isPackageInstalled(companion, "com.authy.authy", packageManager)) {
-                TextView textView = getBinding().f1925c;
+                TextView textView = getBinding().f1927c;
                 m.checkNotNullExpressionValue(textView, "binding.enableMfaKeyLaunchAuthy");
-                textView.setText(b.j(this, 2131890780, new Object[]{b.j(this, 2131893976, new Object[0], null, 4)}, null, 4));
-                TextView textView2 = getBinding().f1925c;
+                textView.setText(b.j(this, 2131890848, new Object[]{b.j(this, 2131894076, new Object[0], null, 4)}, null, 4));
+                TextView textView2 = getBinding().f1927c;
                 m.checkNotNullExpressionValue(textView2, "binding.enableMfaKeyLaunchAuthy");
                 textView2.setVisibility(0);
-                getBinding().f1925c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager));
+                getBinding().f1927c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager));
             }
             if (Companion.access$isPackageInstalled(companion, "com.google.android.apps.authenticator2", packageManager)) {
                 TextView textView3 = getBinding().d;
                 m.checkNotNullExpressionValue(textView3, "binding.enableMfaKeyLaunchGoogleAuth");
-                textView3.setText(b.j(this, 2131890780, new Object[]{b.j(this, 2131893977, new Object[0], null, 4)}, null, 4));
+                textView3.setText(b.j(this, 2131890848, new Object[]{b.j(this, 2131894077, new Object[0], null, 4)}, null, 4));
                 TextView textView4 = getBinding().d;
                 m.checkNotNullExpressionValue(textView4, "binding.enableMfaKeyLaunchGoogleAuth");
                 textView4.setVisibility(0);
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java
index 8f100e71a5..438286fa7c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetEnableMFASteps$binding$2 extends k impl
 
     public final WidgetEnableMfaStepsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131363048;
-            StepsView stepsView = (StepsView) view.findViewById(2131363048);
+            i = 2131363073;
+            StepsView stepsView = (StepsView) view.findViewById(2131363073);
             if (stepsView != null) {
                 return new WidgetEnableMfaStepsBinding((FrameLayout) view, dimmerView, stepsView);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java
index a91527ad3d..5dccd938e3 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java
@@ -29,7 +29,7 @@ public final class WidgetEnableMFASteps$onViewBoundOrOnResume$1 extends o implem
         DimmerView.setDimmed$default(WidgetEnableMFASteps.access$getBinding$p(this.this$0).b, viewState.isLoading(), false, 2, null);
         Integer screenIndex = viewState.getScreenIndex();
         if (screenIndex != null) {
-            WidgetEnableMFASteps.access$getBinding$p(this.this$0).f1771c.b(screenIndex.intValue());
+            WidgetEnableMFASteps.access$getBinding$p(this.this$0).f1772c.b(screenIndex.intValue());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
index 3333e9c6ad..4488e846ab 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java
@@ -54,7 +54,7 @@ public final class WidgetEnableMFASteps extends AppFragment {
     }
 
     public WidgetEnableMFASteps() {
-        super(2131558996);
+        super(2131559000);
     }
 
     public static final /* synthetic */ WidgetEnableMfaStepsBinding access$getBinding$p(WidgetEnableMFASteps widgetEnableMFASteps) {
@@ -98,7 +98,7 @@ public final class WidgetEnableMFASteps extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f1771c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, 2131887178, 0, null, null, null, false, false, false, 1018), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, false, false, false, 1022), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, false, false, false, 382), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, false, false, false, 510)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this));
+        getBinding().f1772c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, 2131887178, 0, null, null, null, false, false, false, 1018), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, false, false, false, 1022), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, false, false, false, 382), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, false, false, false, 510)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this));
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java
index 15a1e24d78..363dc0e4f7 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetEnableMFASuccess$binding$2 extends k im
 
     public final WidgetSettingsEnableMfaSuccessBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363919);
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363960);
         if (materialButton != null) {
             return new WidgetSettingsEnableMfaSuccessBinding((LinearLayout) view, materialButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363919)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363960)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java
index 4a070b0b1e..ca179b5a4c 100644
--- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java
+++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java
@@ -15,7 +15,7 @@ public final class WidgetEnableMFASuccess extends AppFragment {
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetEnableMFASuccess$binding$2.INSTANCE, null, 2, null);
 
     public WidgetEnableMFASuccess() {
-        super(2131559202);
+        super(2131559208);
     }
 
     private final WidgetSettingsEnableMfaSuccessBinding getBinding() {
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java
index 334a8d4422..14525e684a 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java
@@ -62,7 +62,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
     public static final class PaymentSourceAddViewHolder extends MGRecyclerViewHolder<PaymentSourceAdapter, Item> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PaymentSourceAddViewHolder(PaymentSourceAdapter paymentSourceAdapter) {
-            super(2131558614, paymentSourceAdapter);
+            super(2131558615, paymentSourceAdapter);
             m.checkNotNullParameter(paymentSourceAdapter, "adapter");
         }
 
@@ -164,7 +164,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PaymentSourceHeaderViewHolder(PaymentSourceAdapter paymentSourceAdapter) {
-            super(2131558615, paymentSourceAdapter);
+            super(2131558616, paymentSourceAdapter);
             m.checkNotNullParameter(paymentSourceAdapter, "adapter");
         }
 
@@ -178,7 +178,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
             if (ordinal == 0) {
                 i2 = 2131886081;
             } else if (ordinal == 1) {
-                i2 = 2131891693;
+                i2 = 2131891762;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
@@ -279,14 +279,14 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PaymentSourceItemViewHolder(PaymentSourceAdapter paymentSourceAdapter) {
-            super(2131558616, paymentSourceAdapter);
+            super(2131558617, paymentSourceAdapter);
             m.checkNotNullParameter(paymentSourceAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131364166;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364166);
+            int i = 2131364209;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364209);
             if (materialButton != null) {
-                i = 2131364168;
-                PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364168);
+                i = 2131364211;
+                PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364211);
                 if (paymentSourceView != null) {
                     PaymentMethodListItemBinding paymentMethodListItemBinding = new PaymentMethodListItemBinding((RelativeLayout) view, materialButton, paymentSourceView);
                     m.checkNotNullExpressionValue(paymentMethodListItemBinding, "PaymentMethodListItemBinding.bind(itemView)");
@@ -305,7 +305,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple<Item> {
             m.checkNotNullParameter(item, "data");
             PaymentSourceItem paymentSourceItem = (PaymentSourceItem) item;
             ModelPaymentSource paymentSource = paymentSourceItem.getPaymentSource();
-            this.binding.f1620c.bind(paymentSource, paymentSourceItem.isPremium());
+            this.binding.f1616c.bind(paymentSource, paymentSourceItem.isPremium());
             this.binding.b.setOnClickListener(new PaymentSourceAdapter$PaymentSourceItemViewHolder$onConfigure$1(this, paymentSource));
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java
index 2d0b7fa689..9cc503fc2d 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java
@@ -31,24 +31,24 @@ public final class PaymentSourceView extends ConstraintLayout {
     public PaymentSourceView(Context context, AttributeSet attributeSet, @StyleRes int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        LayoutInflater.from(context).inflate(2131558617, this);
-        int i2 = 2131364180;
-        ImageView imageView = (ImageView) findViewById(2131364180);
+        LayoutInflater.from(context).inflate(2131558618, this);
+        int i2 = 2131364223;
+        ImageView imageView = (ImageView) findViewById(2131364223);
         if (imageView != null) {
-            i2 = 2131364181;
-            CardView cardView = (CardView) findViewById(2131364181);
+            i2 = 2131364224;
+            CardView cardView = (CardView) findViewById(2131364224);
             if (cardView != null) {
-                i2 = 2131364182;
-                TextView textView = (TextView) findViewById(2131364182);
+                i2 = 2131364225;
+                TextView textView = (TextView) findViewById(2131364225);
                 if (textView != null) {
-                    i2 = 2131364183;
-                    ImageView imageView2 = (ImageView) findViewById(2131364183);
+                    i2 = 2131364226;
+                    ImageView imageView2 = (ImageView) findViewById(2131364226);
                     if (imageView2 != null) {
-                        i2 = 2131364184;
-                        TextView textView2 = (TextView) findViewById(2131364184);
+                        i2 = 2131364227;
+                        TextView textView2 = (TextView) findViewById(2131364227);
                         if (textView2 != null) {
-                            i2 = 2131364185;
-                            TextView textView3 = (TextView) findViewById(2131364185);
+                            i2 = 2131364228;
+                            TextView textView3 = (TextView) findViewById(2131364228);
                             if (textView3 != null) {
                                 PaymentSourceViewBinding paymentSourceViewBinding = new PaymentSourceViewBinding(this, imageView, cardView, textView, imageView2, textView2, textView3);
                                 m.checkNotNullExpressionValue(paymentSourceViewBinding, "PaymentSourceViewBinding…ater.from(context), this)");
@@ -71,7 +71,7 @@ public final class PaymentSourceView extends ConstraintLayout {
     private final void bindCard(ModelPaymentSource.ModelPaymentSourceCard modelPaymentSourceCard) {
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewTitle");
-        b.n(textView, 2131891806, new Object[]{modelPaymentSourceCard.getBrand(), modelPaymentSourceCard.getLast4()}, null, 4);
+        b.m(textView, 2131891878, new Object[]{modelPaymentSourceCard.getBrand(), modelPaymentSourceCard.getLast4()}, null, 4);
         TimeUtils timeUtils = TimeUtils.INSTANCE;
         int expiresMonth = modelPaymentSourceCard.getExpiresMonth();
         TextView textView2 = this.binding.e;
@@ -81,11 +81,11 @@ public final class PaymentSourceView extends ConstraintLayout {
         String localizedMonthName = timeUtils.getLocalizedMonthName(expiresMonth, context);
         TextView textView3 = this.binding.e;
         m.checkNotNullExpressionValue(textView3, "binding.paymentSourceViewSubtext");
-        b.n(textView3, 2131891808, new Object[]{localizedMonthName, Integer.valueOf(modelPaymentSourceCard.getExpiresYear())}, null, 4);
+        b.m(textView3, 2131891880, new Object[]{localizedMonthName, Integer.valueOf(modelPaymentSourceCard.getExpiresYear())}, null, 4);
     }
 
     private final void bindPaypal(ModelPaymentSource.ModelPaymentSourcePaypal modelPaymentSourcePaypal) {
-        this.binding.f.setText(2131891833);
+        this.binding.f.setText(2131891905);
         TextView textView = this.binding.e;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewSubtext");
         textView.setText(modelPaymentSourcePaypal.getEmail());
@@ -94,7 +94,7 @@ public final class PaymentSourceView extends ConstraintLayout {
     public final void bind(ModelPaymentSource modelPaymentSource, boolean z2) {
         m.checkNotNullParameter(modelPaymentSource, "paymentSource");
         this.binding.b.setImageResource(PremiumUtilsKt.getPaymentSourceIcon(modelPaymentSource));
-        TextView textView = this.binding.f1621c;
+        TextView textView = this.binding.f1617c;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewInvalid");
         int i = 0;
         textView.setVisibility(modelPaymentSource.getInvalid() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java
index d5b2dd6916..cb9a8b9065 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java
@@ -25,44 +25,44 @@ public final /* synthetic */ class WidgetPaymentSourceEditDialog$binding$2 exten
         int i = 2131361871;
         Toolbar toolbar = (Toolbar) view.findViewById(2131361871);
         if (toolbar != null) {
-            i = 2131362887;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362887);
+            i = 2131362912;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362912);
             if (materialButton != null) {
-                i = 2131362888;
-                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362888);
+                i = 2131362913;
+                LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362913);
                 if (loadingButton != null) {
-                    i = 2131364169;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364169);
+                    i = 2131364212;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364212);
                     if (textInputLayout != null) {
-                        i = 2131364170;
-                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131364170);
+                        i = 2131364213;
+                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131364213);
                         if (textInputLayout2 != null) {
-                            i = 2131364171;
-                            TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131364171);
+                            i = 2131364214;
+                            TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131364214);
                             if (textInputLayout3 != null) {
-                                i = 2131364172;
-                                TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(2131364172);
+                                i = 2131364215;
+                                TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(2131364215);
                                 if (textInputLayout4 != null) {
-                                    i = 2131364173;
-                                    CheckBox checkBox = (CheckBox) view.findViewById(2131364173);
+                                    i = 2131364216;
+                                    CheckBox checkBox = (CheckBox) view.findViewById(2131364216);
                                     if (checkBox != null) {
-                                        i = 2131364174;
-                                        TextView textView = (TextView) view.findViewById(2131364174);
+                                        i = 2131364217;
+                                        TextView textView = (TextView) view.findViewById(2131364217);
                                         if (textView != null) {
-                                            i = 2131364175;
-                                            TextView textView2 = (TextView) view.findViewById(2131364175);
+                                            i = 2131364218;
+                                            TextView textView2 = (TextView) view.findViewById(2131364218);
                                             if (textView2 != null) {
-                                                i = 2131364176;
-                                                TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(2131364176);
+                                                i = 2131364219;
+                                                TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(2131364219);
                                                 if (textInputLayout5 != null) {
-                                                    i = 2131364177;
-                                                    TextInputLayout textInputLayout6 = (TextInputLayout) view.findViewById(2131364177);
+                                                    i = 2131364220;
+                                                    TextInputLayout textInputLayout6 = (TextInputLayout) view.findViewById(2131364220);
                                                     if (textInputLayout6 != null) {
-                                                        i = 2131364178;
-                                                        TextInputLayout textInputLayout7 = (TextInputLayout) view.findViewById(2131364178);
+                                                        i = 2131364221;
+                                                        TextInputLayout textInputLayout7 = (TextInputLayout) view.findViewById(2131364221);
                                                         if (textInputLayout7 != null) {
-                                                            i = 2131364179;
-                                                            PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364179);
+                                                            i = 2131364222;
+                                                            PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364222);
                                                             if (paymentSourceView != null) {
                                                                 return new WidgetPaymentSourceEditDialogBinding((LinearLayout) view, toolbar, materialButton, loadingButton, textInputLayout, textInputLayout2, textInputLayout3, textInputLayout4, checkBox, textView, textView2, textInputLayout5, textInputLayout6, textInputLayout7, paymentSourceView);
                                                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java
index 0a4cd530ee..da0f8b5a92 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java
@@ -22,7 +22,7 @@ public final class WidgetPaymentSourceEditDialog$deletePaymentSource$1 extends o
     }
 
     public final void invoke(Void r4) {
-        c.a.d.o.i(this.this$0, 2131891814, 0, 4);
+        c.a.d.o.i(this.this$0, 2131891886, 0, 4);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java
index d567491b94..5f6e0bd85a 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java
@@ -18,6 +18,6 @@ public final class WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2 impleme
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131891812, new Object[0], null, 4), b.j(this.this$0, 2131891813, new Object[0], null, 4), b.j(this.this$0, 2131891666, new Object[0], null, 4), "", null, null, null, null, null, null, null, 0, null, 16352, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131891884, new Object[0], null, 4), b.j(this.this$0, 2131891885, new Object[0], null, 4), b.j(this.this$0, 2131891735, new Object[0], null, 4), "", null, null, null, null, null, null, null, 0, null, 16352, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java
index 939273c691..cdf2d92843 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java
@@ -22,7 +22,7 @@ public final class WidgetPaymentSourceEditDialog$updatePaymentSource$1 extends o
     }
 
     public final void invoke(Void r4) {
-        c.a.d.o.i(this.this$0, 2131891817, 0, 4);
+        c.a.d.o.i(this.this$0, 2131891889, 0, 4);
         this.this$0.dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java
index a827ec88bb..038b5781c8 100644
--- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java
+++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java
@@ -171,7 +171,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
     }
 
     public WidgetPaymentSourceEditDialog() {
-        super(2131559105);
+        super(2131559111);
         WidgetPaymentSourceEditDialog$viewModel$2 widgetPaymentSourceEditDialog$viewModel$2 = WidgetPaymentSourceEditDialog$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsBillingViewModel.class), new WidgetPaymentSourceEditDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPaymentSourceEditDialog$viewModel$2));
@@ -257,7 +257,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         TextView textView = getBinding().k;
         m.checkNotNullExpressionValue(textView, "binding.paymentSourceEditHelp");
         boolean z2 = false;
-        textView.setText(component1 instanceof ModelPaymentSource.ModelPaymentSourcePaypal ? b.j(this, 2131891816, new Object[]{"https://www.paypal.com"}, null, 4) : b.j(this, 2131891815, new Object[0], null, 4));
+        textView.setText(component1 instanceof ModelPaymentSource.ModelPaymentSourcePaypal ? b.j(this, 2131891888, new Object[]{"https://www.paypal.com"}, null, 4) : b.j(this, 2131891887, new Object[0], null, 4));
         StateEntry[] statesFor = getStatesFor(component1);
         ModelBillingAddress billingAddress = component1.getBillingAddress();
         TextInputLayout textInputLayout = getBinding().l;
@@ -303,12 +303,12 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         checkBox.setChecked(component1.getDefault());
         getBinding().d.setIsLoading(false);
         if (component2) {
-            getBinding().f1844c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this));
-            MaterialButton materialButton = getBinding().f1844c;
+            getBinding().f1846c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this));
+            MaterialButton materialButton = getBinding().f1846c;
             m.checkNotNullExpressionValue(materialButton, "binding.dialogDelete");
             materialButton.setAlpha(0.3f);
         } else {
-            getBinding().f1844c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1));
+            getBinding().f1846c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1));
         }
         getBinding().d.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$4(this, component1));
         if (m.areEqual(component1.getBillingAddress().getCountry(), "CA")) {
@@ -388,7 +388,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
         m.a aVar = c.a.a.m.j;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         d0.z.d.m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        CharSequence j = b.j(this, 2131891818, new Object[0], null, 4);
+        CharSequence j = b.j(this, 2131891890, new Object[0], null, 4);
         ArrayList arrayList = new ArrayList(stateEntryArr.length);
         for (StateEntry stateEntry : stateEntryArr) {
             arrayList.add(stateEntry.getLabel());
@@ -503,13 +503,13 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog {
     public void onViewBound(View view) {
         d0.z.d.m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        Observable<R> G = getViewModel().observeViewState().y(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.INSTANCE).G(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.INSTANCE);
-        d0.z.d.m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-        Observable G2 = G.G(WidgetPaymentSourceEditDialog$onViewBound$1.INSTANCE).G(new WidgetPaymentSourceEditDialog$onViewBound$2(this));
-        d0.z.d.m.checkNotNullExpressionValue(G2, "viewModel\n        .obser…ymentSourceId }\n        }");
-        Observable a02 = ObservableExtensionsKt.computationBuffered(G2).a0(1);
-        d0.z.d.m.checkNotNullExpressionValue(a02, "viewModel\n        .obser…ffered()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(a02, this, null, 2, null), WidgetPaymentSourceEditDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPaymentSourceEditDialog$onViewBound$3(this), 62, (Object) null);
+        Observable<R> F = getViewModel().observeViewState().x(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$1.INSTANCE).F(WidgetPaymentSourceEditDialog$onViewBound$$inlined$filterIs$2.INSTANCE);
+        d0.z.d.m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+        Observable F2 = F.F(WidgetPaymentSourceEditDialog$onViewBound$1.INSTANCE).F(new WidgetPaymentSourceEditDialog$onViewBound$2(this));
+        d0.z.d.m.checkNotNullExpressionValue(F2, "viewModel\n        .obser…ymentSourceId }\n        }");
+        Observable Z = ObservableExtensionsKt.computationBuffered(F2).Z(1);
+        d0.z.d.m.checkNotNullExpressionValue(Z, "viewModel\n        .obser…ffered()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Z, this, null, 2, null), WidgetPaymentSourceEditDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPaymentSourceEditDialog$onViewBound$3(this), 62, (Object) null);
         getBinding().b.setNavigationOnClickListener(new WidgetPaymentSourceEditDialog$onViewBound$4(this));
         getBinding().d.setOnClickListener(new WidgetPaymentSourceEditDialog$onViewBound$5(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java b/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java
index ec1fadc566..b4da57d2d8 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java
@@ -28,20 +28,20 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558740, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365601;
-        TextView textView = (TextView) inflate.findViewById(2131365601);
+        int i = 2131365662;
+        TextView textView = (TextView) inflate.findViewById(2131365662);
         if (textView != null) {
-            i = 2131365602;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365602);
+            i = 2131365663;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365663);
             if (simpleDraweeView != null) {
-                i = 2131365603;
-                TextView textView2 = (TextView) inflate.findViewById(2131365603);
+                i = 2131365664;
+                TextView textView2 = (TextView) inflate.findViewById(2131365664);
                 if (textView2 != null) {
-                    i = 2131365604;
-                    TextView textView3 = (TextView) inflate.findViewById(2131365604);
+                    i = 2131365665;
+                    TextView textView3 = (TextView) inflate.findViewById(2131365665);
                     if (textView3 != null) {
-                        i = 2131365605;
-                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365605);
+                        i = 2131365666;
+                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365666);
                         if (materialButton != null) {
                             ViewConnectionGuildIntegrationBinding viewConnectionGuildIntegrationBinding = new ViewConnectionGuildIntegrationBinding((CardView) inflate, textView, simpleDraweeView, textView2, textView3, materialButton);
                             m.checkNotNullExpressionValue(viewConnectionGuildIntegrationBinding, "ViewConnectionGuildInteg…rom(context), this, true)");
@@ -66,7 +66,7 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout {
             m.checkNotNullExpressionValue(textView2, "binding.widgetConnectionIntegrationGuildName");
             textView2.setText(guild.getName());
             String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(guild.getId()), guild.getIcon(), null, false, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165296))), 12, null);
-            SimpleDraweeView simpleDraweeView = this.binding.f1648c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1645c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetConnectionIntegrationGuildIcon");
             IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
         }
@@ -75,7 +75,7 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout {
         materialButton.setEnabled(!(joinStatus instanceof WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining));
         MaterialButton materialButton2 = this.binding.f;
         m.checkNotNullExpressionValue(materialButton2, "binding.widgetConnectionIntegrationJoinGuild");
-        materialButton2.setText(m.areEqual(joinStatus, WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining.INSTANCE) ? getResources().getString(2131890672) : getResources().getString(2131890642));
+        materialButton2.setText(m.areEqual(joinStatus, WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining.INSTANCE) ? getResources().getString(2131890740) : getResources().getString(2131890710));
         TextView textView3 = this.binding.d;
         m.checkNotNullExpressionValue(textView3, "binding.widgetConnectionIntegrationGuildJoinError");
         int i = 0;
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java
index cdd1d81042..69b290f531 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetSettingsUserConnections$binding$2 exten
 
     public final WidgetSettingsConnectionsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362687;
-        TextView textView = (TextView) view.findViewById(2131362687);
+        int i = 2131362711;
+        TextView textView = (TextView) view.findViewById(2131362711);
         if (textView != null) {
-            i = 2131362688;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362688);
+            i = 2131362712;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362712);
             if (recyclerView != null) {
                 return new WidgetSettingsConnectionsBinding((CoordinatorLayout) view, textView, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java
index 2ecc68ebe0..d44d788d37 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java
@@ -14,7 +14,7 @@ public final class WidgetSettingsUserConnections$onViewBound$2<T1, T2> implement
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363859 && this.this$0.getContext() != null) {
+        if (menuItem.getItemId() == 2131363900 && this.this$0.getContext() != null) {
             WidgetSettingsUserConnectionsAdd.Companion.show(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
index 6ac8109f5a..011a68601f 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java
@@ -77,38 +77,38 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 m.checkNotNullParameter(adapter2, "adapter");
                 this.this$0 = adapter;
                 View view = this.itemView;
-                int i2 = 2131362682;
-                ImageView imageView = (ImageView) view.findViewById(2131362682);
+                int i2 = 2131362706;
+                ImageView imageView = (ImageView) view.findViewById(2131362706);
                 if (imageView != null) {
-                    i2 = 2131362683;
-                    View findViewById = view.findViewById(2131362683);
+                    i2 = 2131362707;
+                    View findViewById = view.findViewById(2131362707);
                     if (findViewById != null) {
-                        i2 = 2131362684;
-                        ImageView imageView2 = (ImageView) view.findViewById(2131362684);
+                        i2 = 2131362708;
+                        ImageView imageView2 = (ImageView) view.findViewById(2131362708);
                         if (imageView2 != null) {
-                            i2 = 2131362685;
-                            TextView textView = (TextView) view.findViewById(2131362685);
+                            i2 = 2131362709;
+                            TextView textView = (TextView) view.findViewById(2131362709);
                             if (textView != null) {
-                                i2 = 2131362936;
-                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131362936);
+                                i2 = 2131362961;
+                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131362961);
                                 if (switchMaterial != null) {
-                                    i2 = 2131362938;
-                                    SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131362938);
+                                    i2 = 2131362963;
+                                    SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131362963);
                                     if (switchMaterial2 != null) {
-                                        i2 = 2131362939;
-                                        View findViewById2 = view.findViewById(2131362939);
+                                        i2 = 2131362964;
+                                        View findViewById2 = view.findViewById(2131362964);
                                         if (findViewById2 != null) {
-                                            i2 = 2131363153;
-                                            TextView textView2 = (TextView) view.findViewById(2131363153);
+                                            i2 = 2131363178;
+                                            TextView textView2 = (TextView) view.findViewById(2131363178);
                                             if (textView2 != null) {
-                                                i2 = 2131363597;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363597);
+                                                i2 = 2131363638;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363638);
                                                 if (linearLayout != null) {
-                                                    i2 = 2131363730;
-                                                    TextView textView3 = (TextView) view.findViewById(2131363730);
+                                                    i2 = 2131363771;
+                                                    TextView textView3 = (TextView) view.findViewById(2131363771);
                                                     if (textView3 != null) {
-                                                        i2 = 2131365159;
-                                                        SwitchMaterial switchMaterial3 = (SwitchMaterial) view.findViewById(2131365159);
+                                                        i2 = 2131365214;
+                                                        SwitchMaterial switchMaterial3 = (SwitchMaterial) view.findViewById(2131365214);
                                                         if (switchMaterial3 != null) {
                                                             WidgetSettingsItemConnectedAccountBinding widgetSettingsItemConnectedAccountBinding = new WidgetSettingsItemConnectedAccountBinding((CardView) view, imageView, findViewById, imageView2, textView, switchMaterial, switchMaterial2, findViewById2, textView2, linearLayout, textView3, switchMaterial3);
                                                             m.checkNotNullExpressionValue(widgetSettingsItemConnectedAccountBinding, "WidgetSettingsItemConnec…untBinding.bind(itemView)");
@@ -162,10 +162,10 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 String id2 = connection.getId();
                 m.checkNotNullExpressionValue(id2, "connectedAccount.id");
                 this.binding.a.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1(from, this, userConnectionItem));
-                ImageView imageView = this.binding.f1930c;
+                ImageView imageView = this.binding.f1932c;
                 Integer platformImage = from.getPlatformImage();
                 imageView.setImageResource(platformImage != null ? platformImage.intValue() : 0);
-                ImageView imageView2 = this.binding.f1930c;
+                ImageView imageView2 = this.binding.f1932c;
                 m.checkNotNullExpressionValue(imageView2, "binding.connectedAccountImg");
                 imageView2.setContentDescription(from.name());
                 TextView textView = this.binding.d;
@@ -191,7 +191,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 switchMaterial4.setVisibility(from.getCanShowActivity() ? 0 : 8);
                 SwitchMaterial switchMaterial5 = this.binding.e;
                 m.checkNotNullExpressionValue(switchMaterial5, "binding.displayActivitySwitch");
-                b.n(switchMaterial5, 2131888165, new Object[]{t.capitalize(from.getProperName())}, null, 4);
+                b.m(switchMaterial5, 2131888164, new Object[]{t.capitalize(from.getProperName())}, null, 4);
                 SwitchMaterial switchMaterial6 = this.binding.e;
                 m.checkNotNullExpressionValue(switchMaterial6, "binding.displayActivitySwitch");
                 switchMaterial6.setChecked(connection.isShowActivity());
@@ -202,7 +202,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                     textView2.setVisibility(0);
                     TextView textView3 = this.binding.g;
                     m.checkNotNullExpressionValue(textView3, "binding.extraInfo");
-                    b.n(textView3, 2131893306, new Object[0], null, 4);
+                    b.m(textView3, 2131893389, new Object[0], null, 4);
                     this.binding.g.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$6(this, userConnectionItem));
                 } else {
                     TextView textView4 = this.binding.g;
@@ -214,7 +214,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                     LinearLayout linearLayout = this.binding.h;
                     m.checkNotNullExpressionValue(linearLayout, "binding.integrationsRoot");
                     linearLayout.setVisibility(0);
-                    int indexOfChild = this.binding.h.indexOfChild(this.binding.h.findViewById(2131363730));
+                    int indexOfChild = this.binding.h.indexOfChild(this.binding.h.findViewById(2131363771));
                     if (indexOfChild != -1) {
                         LinearLayout linearLayout2 = this.binding.h;
                         int i2 = indexOfChild + 1;
@@ -264,7 +264,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<Adapter, UserConnectionItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ViewHolder(this, 2131559208, this);
+            return new ViewHolder(this, 2131559214, this);
         }
     }
 
@@ -313,7 +313,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
     }
 
     public WidgetSettingsUserConnections() {
-        super(2131559196);
+        super(2131559202);
         WidgetSettingsUserConnections$viewModel$2 widgetSettingsUserConnections$viewModel$2 = WidgetSettingsUserConnections$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsUserConnectionsViewModel.class), new WidgetSettingsUserConnections$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsUserConnections$viewModel$2));
@@ -342,21 +342,21 @@ public final class WidgetSettingsUserConnections extends AppFragment {
             TextView textView = getBinding().b;
             m.checkNotNullExpressionValue(textView, "binding.connectionsEmpty");
             textView.setVisibility(8);
-            RecyclerView recyclerView = getBinding().f1923c;
+            RecyclerView recyclerView = getBinding().f1925c;
             m.checkNotNullExpressionValue(recyclerView, "binding.connectionsRecycler");
             recyclerView.setVisibility(8);
         } else if (viewState instanceof WidgetSettingsUserConnectionsViewModel.ViewState.Empty) {
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.connectionsEmpty");
             textView2.setVisibility(0);
-            RecyclerView recyclerView2 = getBinding().f1923c;
+            RecyclerView recyclerView2 = getBinding().f1925c;
             m.checkNotNullExpressionValue(recyclerView2, "binding.connectionsRecycler");
             recyclerView2.setVisibility(8);
         } else if (viewState instanceof WidgetSettingsUserConnectionsViewModel.ViewState.Loaded) {
             TextView textView3 = getBinding().b;
             m.checkNotNullExpressionValue(textView3, "binding.connectionsEmpty");
             textView3.setVisibility(8);
-            RecyclerView recyclerView3 = getBinding().f1923c;
+            RecyclerView recyclerView3 = getBinding().f1925c;
             m.checkNotNullExpressionValue(recyclerView3, "binding.connectionsRecycler");
             recyclerView3.setVisibility(0);
             List<WidgetSettingsUserConnectionsViewModel.ConnectionState> data = ((WidgetSettingsUserConnectionsViewModel.ViewState.Loaded) viewState).getData();
@@ -369,7 +369,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 adapter2.setData(arrayList);
             }
             if (itemCount != 0 && arrayList.size() > itemCount) {
-                getBinding().f1923c.smoothScrollToPosition(arrayList.size() - 1);
+                getBinding().f1925c.smoothScrollToPosition(arrayList.size() - 1);
             }
         }
     }
@@ -385,7 +385,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
         FragmentActivity activity = getActivity();
         if (activity != null) {
             MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
-            RecyclerView recyclerView = getBinding().f1923c;
+            RecyclerView recyclerView = getBinding().f1925c;
             m.checkNotNullExpressionValue(recyclerView, "binding.connectionsRecycler");
             m.checkNotNullExpressionValue(activity, "it");
             FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
@@ -393,7 +393,7 @@ public final class WidgetSettingsUserConnections extends AppFragment {
             this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, supportFragmentManager, new WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1(this)));
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         setActionBarTitle(2131887544);
         AppFragment.setActionBarOptionsMenu$default(this, 2131623945, new WidgetSettingsUserConnections$onViewBound$2(this), null, 4, null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java
index 5ec8b0bc9e..f027725e25 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetSettingsUserConnectionsAdd$binding$2 ex
 
     public final WidgetSettingsConnectionsAddBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362688);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362712);
         if (recyclerView != null) {
             return new WidgetSettingsConnectionsAddBinding((NestedScrollView) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362688)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131362712)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
index e9a6554b5f..7860f0bac7 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java
@@ -85,7 +85,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
             public void onConfigure(int i, PlatformItem platformItem) {
                 m.checkNotNullParameter(platformItem, "data");
                 super.onConfigure(i, (int) platformItem);
-                TextView textView = this.binding.f1928c;
+                TextView textView = this.binding.f1930c;
                 m.checkNotNullExpressionValue(textView, "binding.addConnectedAccountText");
                 textView.setText(platformItem.getPlatform().getProperName());
                 ImageView imageView = this.binding.b;
@@ -110,7 +110,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<Adapter, PlatformItem> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new ViewHolder(2131559204, this, this.dialogDismissCallback);
+            return new ViewHolder(2131559210, this, this.dialogDismissCallback);
         }
     }
 
@@ -207,7 +207,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559197;
+        return 2131559203;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java
index 2527704942..87735453bf 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetSettingsUserConnectionsAddXbox$binding$
 
     public final WidgetConnectionsAddXboxBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362689;
-        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362689);
+        int i = 2131362713;
+        CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131362713);
         if (codeVerificationView != null) {
-            i = 2131362690;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362690);
+            i = 2131362714;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362714);
             if (linearLayout != null) {
-                i = 2131362896;
-                DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                i = 2131362921;
+                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                 if (dimmerView != null) {
                     return new WidgetConnectionsAddXboxBinding((CoordinatorLayout) view, codeVerificationView, linearLayout, dimmerView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
index e027dd980c..6c2ac44b69 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java
@@ -46,7 +46,7 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
     }
 
     public WidgetSettingsUserConnectionsAddXbox() {
-        super(2131558978);
+        super(2131558982);
     }
 
     public static final /* synthetic */ WidgetConnectionsAddXboxBinding access$getBinding$p(WidgetSettingsUserConnectionsAddXbox widgetSettingsUserConnectionsAddXbox) {
@@ -91,10 +91,10 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894256);
+        setActionBarSubtitle(2131894357);
         setActionBarTitle(2131887544);
         trackXboxLinkStep();
-        getBinding().f1757c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE);
+        getBinding().f1758c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE);
         getBinding().b.setOnCodeEntered(new WidgetSettingsUserConnectionsAddXbox$onViewBound$2(this));
     }
 
@@ -103,8 +103,8 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment {
         m.checkNotNullParameter(platform, "platform");
         m.checkNotNullParameter(appComponent, "appComponent");
         m.checkNotNullParameter(action1, "errorHandler");
-        Observable A = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getConnectionState(platform.getPlatformId(), str), false, 1, null).A(new WidgetSettingsUserConnectionsAddXbox$submitPinCode$1(platform));
-        m.checkNotNullExpressionValue(A, "RestAPI\n        .api\n   …              )\n        }");
-        ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(A, appComponent, null, 2, null), dimmerView, 0, 2, null).k(q.a.g(activity, new WidgetSettingsUserConnectionsAddXbox$submitPinCode$2(activity), action1));
+        Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getConnectionState(platform.getPlatformId(), str), false, 1, null).z(new WidgetSettingsUserConnectionsAddXbox$submitPinCode$1(platform));
+        m.checkNotNullExpressionValue(z2, "RestAPI\n        .api\n   …              )\n        }");
+        ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(z2, appComponent, null, 2, null), dimmerView, 0, 2, null).k(q.a.g(activity, new WidgetSettingsUserConnectionsAddXbox$submitPinCode$2(activity), action1));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java
index 4653332d21..0890188eaa 100644
--- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java
@@ -382,10 +382,10 @@ public final class WidgetSettingsUserConnectionsViewModel extends AppViewModel<V
         m.checkNotNullParameter(restAPI, "restApi");
         this.restApi = restAPI;
         this.joinStatusMap = new LinkedHashMap();
-        BehaviorSubject<Map<String, JoinStatus>> m0 = BehaviorSubject.m0(h0.emptyMap());
-        this.joinStateSubject = m0;
+        BehaviorSubject<Map<String, JoinStatus>> l0 = BehaviorSubject.l0(h0.emptyMap());
+        this.joinStateSubject = l0;
         storeUserConnections.fetchConnectedAccounts();
-        Observable j = Observable.j(observable, m0, new AnonymousClass1(this));
+        Observable j = Observable.j(observable, l0, new AnonymousClass1(this));
         m.checkNotNullExpressionValue(j, "Observable.combineLatest…te(storeState, joinMap) }");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(j), this, null, 2, null), WidgetSettingsUserConnectionsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java b/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java
index fb42f27e1e..73d5207d65 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java
@@ -70,15 +70,15 @@ public final class ExperimentOverridesAdapter extends RecyclerView.Adapter<Exper
             for (int i2 = 0; i2 < size; i2++) {
                 arrayList.add(new ExperimentOverrideView.b(Integer.valueOf(i2), a.l("Bucket ", i2)));
             }
-            Spinner spinner = experimentOverrideView.i.f181c;
+            Spinner spinner = experimentOverrideView.i.f61c;
             m.checkNotNullExpressionValue(spinner, "binding.experimentOverrideBucketsSpinner");
             Context context = experimentOverrideView.getContext();
             m.checkNotNullExpressionValue(context, "context");
             spinner.setAdapter((SpinnerAdapter) new ExperimentOverrideView.a(context, arrayList));
             if (overrideBucket != null) {
-                experimentOverrideView.i.f181c.setSelection(overrideBucket.intValue());
+                experimentOverrideView.i.f61c.setSelection(overrideBucket.intValue());
             }
-            Spinner spinner2 = experimentOverrideView.i.f181c;
+            Spinner spinner2 = experimentOverrideView.i.f61c;
             m.checkNotNullExpressionValue(spinner2, "binding.experimentOverrideBucketsSpinner");
             spinner2.setOnItemSelectedListener(new c.a.z.l0.a(onOverrideBucketSelected));
             experimentOverrideView.i.d.setOnClickListener(new b(onOverrideBucketCleared));
@@ -120,13 +120,13 @@ public final class ExperimentOverridesAdapter extends RecyclerView.Adapter<Exper
     public ExperimentViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558499, viewGroup, false);
-        ExperimentOverrideView experimentOverrideView = (ExperimentOverrideView) inflate.findViewById(2131363125);
+        ExperimentOverrideView experimentOverrideView = (ExperimentOverrideView) inflate.findViewById(2131363150);
         if (experimentOverrideView != null) {
             ExperimentOverridesListItemBinding experimentOverridesListItemBinding = new ExperimentOverridesListItemBinding((CardView) inflate, experimentOverrideView);
             m.checkNotNullExpressionValue(experimentOverridesListItemBinding, "ExperimentOverridesListI….context), parent, false)");
             return new ExperimentViewHolder(experimentOverridesListItemBinding);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363125)));
+        throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363150)));
     }
 
     public final void setData(List<? extends Item> list) {
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java
index dd9943fb0d..592286c8fc 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java
@@ -20,29 +20,29 @@ public final /* synthetic */ class WidgetSettingsDeveloper$binding$2 extends k i
 
     public final WidgetSettingsDeveloperBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362857;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362857);
+        int i = 2131362882;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362882);
         if (materialButton != null) {
-            i = 2131362858;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362858);
+            i = 2131362883;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362883);
             if (materialButton2 != null) {
-                i = 2131362859;
-                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362859);
+                i = 2131362884;
+                MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362884);
                 if (materialButton3 != null) {
-                    i = 2131362860;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362860);
+                    i = 2131362885;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362885);
                     if (recyclerView != null) {
-                        i = 2131362861;
-                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362861);
+                        i = 2131362886;
+                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362886);
                         if (recyclerView2 != null) {
-                            i = 2131362862;
-                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131362862);
+                            i = 2131362887;
+                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131362887);
                             if (materialButton4 != null) {
-                                i = 2131364827;
-                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364827);
+                                i = 2131364876;
+                                CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364876);
                                 if (checkedSetting != null) {
-                                    i = 2131365214;
-                                    TextView textView = (TextView) view.findViewById(2131365214);
+                                    i = 2131365269;
+                                    TextView textView = (TextView) view.findViewById(2131365269);
                                     if (textView != null) {
                                         return new WidgetSettingsDeveloperBinding((CoordinatorLayout) view, materialButton, materialButton2, materialButton3, recyclerView, recyclerView2, materialButton4, checkedSetting, textView);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java
index 2c2dca0122..e62bb14dbe 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java
@@ -44,7 +44,7 @@ public final class WidgetSettingsDeveloper$setupNoticesSection$1 extends o imple
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ItemTouchHelper mo1invoke() {
-        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this.this$0, 2131100324), ContextCompat.getDrawable(this.this$0.requireContext(), 2131231555), DimenUtils.dpToPixels(8));
+        SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this.this$0, 2131100324), ContextCompat.getDrawable(this.this$0.requireContext(), 2131231561), DimenUtils.dpToPixels(8));
         return new ItemTouchHelper(new AnonymousClass1(swipeRevealConfiguration, swipeRevealConfiguration, swipeRevealConfiguration));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
index 2cca596237..27b5e6cc79 100644
--- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
+++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java
@@ -100,7 +100,7 @@ public final class WidgetSettingsDeveloper extends AppFragment {
     }
 
     public WidgetSettingsDeveloper() {
-        super(2131559198);
+        super(2131559204);
     }
 
     public static final /* synthetic */ ExperimentOverridesAdapter access$getExperimentOverridesAdapter$p(WidgetSettingsDeveloper widgetSettingsDeveloper) {
@@ -125,7 +125,7 @@ public final class WidgetSettingsDeveloper extends AppFragment {
 
     private final void setupCrashes() {
         getBinding().d.setOnClickListener(WidgetSettingsDeveloper$setupCrashes$1.INSTANCE);
-        getBinding().f1924c.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$2(this));
+        getBinding().f1926c.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$2(this));
         getBinding().b.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$3(this));
         getBinding().g.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$4(this));
     }
@@ -140,9 +140,9 @@ public final class WidgetSettingsDeveloper extends AppFragment {
         }
         recyclerView.setAdapter(experimentOverridesAdapter);
         StoreExperiments experiments = StoreStream.Companion.getExperiments();
-        Observable<R> G = experiments.observeOverrides().G(new WidgetSettingsDeveloper$setupExperimentSection$1(experiments));
-        m.checkNotNullExpressionValue(G, "experimentStore\n        …              }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(G, this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupExperimentSection$2(this), 62, (Object) null);
+        Observable<R> F = experiments.observeOverrides().F(new WidgetSettingsDeveloper$setupExperimentSection$1(experiments));
+        m.checkNotNullExpressionValue(F, "experimentStore\n        …              }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(F, this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupExperimentSection$2(this), 62, (Object) null);
     }
 
     private final void setupNoticesSection() {
@@ -151,9 +151,9 @@ public final class WidgetSettingsDeveloper extends AppFragment {
         m.checkNotNullExpressionValue(recyclerView, "binding.developerSettingsNotices");
         recyclerView.setAdapter(simpleRecyclerAdapter);
         new WidgetSettingsDeveloper$setupNoticesSection$1(this).mo1invoke().attachToRecyclerView(getBinding().f);
-        Observable<R> G = StoreStream.Companion.getNotices().observeNoticesSeen().G(WidgetSettingsDeveloper$setupNoticesSection$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "StoreStream\n        .get…      .toList()\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(G), this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupNoticesSection$3(simpleRecyclerAdapter), 62, (Object) null);
+        Observable<R> F = StoreStream.Companion.getNotices().observeNoticesSeen().F(WidgetSettingsDeveloper$setupNoticesSection$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "StoreStream\n        .get…      .toList()\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(F), this, null, 2, null), WidgetSettingsDeveloper.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsDeveloper$setupNoticesSection$3(simpleRecyclerAdapter), 62, (Object) null);
     }
 
     private final void setupScreenshotDetector() {
@@ -169,7 +169,7 @@ public final class WidgetSettingsDeveloper extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         setActionBarDisplayHomeAsUpEnabled(true);
-        setActionBarTitle(2131888108);
+        setActionBarTitle(2131888107);
         setupCrashes();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
index bb24dda6ed..fef5a10f42 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java
@@ -626,7 +626,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(observable, "storeObservable");
         this.viewType = viewType;
         this.oldSkuName = str;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         fetchData();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), ChoosePlanViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getGooglePlayPurchases().observeEvents(), this, null, 2, null), ChoosePlanViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
@@ -911,7 +911,7 @@ public final class ChoosePlanViewModel extends AppViewModel<ViewState> {
                 aVar.d = prorationMode;
                 String a = findPurchaseForSkuName.a();
                 aVar.b = str;
-                aVar.f1548c = a;
+                aVar.f1543c = a;
                 if (prorationMode == 4) {
                     ModelSubscription findSubscriptionForSku = premiumUtils.findSubscriptionForSku(loaded.getSubscriptions(), str);
                     if (findSubscriptionForSku != null) {
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$claimPromo$1.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$claimPromo$1.java
new file mode 100644
index 0000000000..03e82b30d1
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$claimPromo$1.java
@@ -0,0 +1,38 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.api.premium.ClaimedOutboundPromotion;
+import com.discord.widgets.settings.premium.ClaimOutboundPromoViewModel;
+import com.discord.widgets.settings.premium.ClaimStatus;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.subjects.PublishSubject;
+/* compiled from: ClaimOutboundPromoViewModel.kt */
+public final class ClaimOutboundPromoViewModel$claimPromo$1 extends o implements Function1<ClaimedOutboundPromotion, Unit> {
+    public final /* synthetic */ ClaimOutboundPromoViewModel this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ClaimOutboundPromoViewModel$claimPromo$1(ClaimOutboundPromoViewModel claimOutboundPromoViewModel) {
+        super(1);
+        this.this$0 = claimOutboundPromoViewModel;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(ClaimedOutboundPromotion claimedOutboundPromotion) {
+        invoke(claimedOutboundPromotion);
+        return Unit.a;
+    }
+
+    public final void invoke(ClaimedOutboundPromotion claimedOutboundPromotion) {
+        m.checkNotNullParameter(claimedOutboundPromotion, "claimedPromo");
+        ClaimOutboundPromoViewModel claimOutboundPromoViewModel = this.this$0;
+        ClaimStatus.Claimed claimed = new ClaimStatus.Claimed(claimedOutboundPromotion.b().b(), claimedOutboundPromotion.a(), claimedOutboundPromotion.b().c(), claimedOutboundPromotion.d(), claimedOutboundPromotion.c());
+        ClaimOutboundPromoViewModel.access$updateViewState(this.this$0, new ClaimOutboundPromoViewModel.ViewState.Claimed(claimed));
+        PublishSubject access$getEventSubject$p = ClaimOutboundPromoViewModel.access$getEventSubject$p(this.this$0);
+        access$getEventSubject$p.j.onNext(new ClaimOutboundPromoViewModel.Event.Claimed(claimed));
+        ClaimOutboundPromoViewModel.access$setClaimStatus$p(claimOutboundPromoViewModel, claimed);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$claimPromo$2.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$claimPromo$2.java
new file mode 100644
index 0000000000..affdebac7d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$claimPromo$2.java
@@ -0,0 +1,31 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.utilities.error.Error;
+import com.discord.widgets.settings.premium.ClaimOutboundPromoViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: ClaimOutboundPromoViewModel.kt */
+public final class ClaimOutboundPromoViewModel$claimPromo$2 extends o implements Function1<Error, Unit> {
+    public final /* synthetic */ ClaimOutboundPromoViewModel this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ClaimOutboundPromoViewModel$claimPromo$2(ClaimOutboundPromoViewModel claimOutboundPromoViewModel) {
+        super(1);
+        this.this$0 = claimOutboundPromoViewModel;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
+        invoke(error);
+        return Unit.a;
+    }
+
+    public final void invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        ClaimOutboundPromoViewModel.access$updateViewState(this.this$0, ClaimOutboundPromoViewModel.ViewState.ClaimFailed.INSTANCE);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
new file mode 100644
index 0000000000..14abf3b04b
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimOutboundPromoViewModel.java
@@ -0,0 +1,371 @@
+package com.discord.widgets.settings.premium;
+
+import android.content.Context;
+import androidx.annotation.MainThread;
+import c.d.b.a.a;
+import com.discord.app.AppViewModel;
+import com.discord.stores.StoreOutboundPromotions;
+import com.discord.stores.StoreStream;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.settings.premium.ClaimStatus;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+/* compiled from: ClaimOutboundPromoViewModel.kt */
+public final class ClaimOutboundPromoViewModel extends AppViewModel<ViewState> {
+    private ClaimStatus claimStatus;
+    private final PublishSubject<Event> eventSubject;
+    private final StoreOutboundPromotions storeOutboundPromotions;
+
+    /* compiled from: ClaimOutboundPromoViewModel.kt */
+    public static abstract class Event {
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class Claimed extends Event {
+            private final ClaimStatus.Claimed claimedStatus;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public Claimed(ClaimStatus.Claimed claimed) {
+                super(null);
+                m.checkNotNullParameter(claimed, "claimedStatus");
+                this.claimedStatus = claimed;
+            }
+
+            public static /* synthetic */ Claimed copy$default(Claimed claimed, ClaimStatus.Claimed claimed2, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    claimed2 = claimed.claimedStatus;
+                }
+                return claimed.copy(claimed2);
+            }
+
+            public final ClaimStatus.Claimed component1() {
+                return this.claimedStatus;
+            }
+
+            public final Claimed copy(ClaimStatus.Claimed claimed) {
+                m.checkNotNullParameter(claimed, "claimedStatus");
+                return new Claimed(claimed);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof Claimed) && m.areEqual(this.claimedStatus, ((Claimed) obj).claimedStatus);
+                }
+                return true;
+            }
+
+            public final ClaimStatus.Claimed getClaimedStatus() {
+                return this.claimedStatus;
+            }
+
+            public int hashCode() {
+                ClaimStatus.Claimed claimed = this.claimedStatus;
+                if (claimed != null) {
+                    return claimed.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder L = a.L("Claimed(claimedStatus=");
+                L.append(this.claimedStatus);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class CopyCode extends Event {
+            private final String code;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public CopyCode(String str) {
+                super(null);
+                m.checkNotNullParameter(str, "code");
+                this.code = str;
+            }
+
+            public static /* synthetic */ CopyCode copy$default(CopyCode copyCode, String str, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    str = copyCode.code;
+                }
+                return copyCode.copy(str);
+            }
+
+            public final String component1() {
+                return this.code;
+            }
+
+            public final CopyCode copy(String str) {
+                m.checkNotNullParameter(str, "code");
+                return new CopyCode(str);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof CopyCode) && m.areEqual(this.code, ((CopyCode) obj).code);
+                }
+                return true;
+            }
+
+            public final String getCode() {
+                return this.code;
+            }
+
+            public int hashCode() {
+                String str = this.code;
+                if (str != null) {
+                    return str.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                return a.D(a.L("CopyCode(code="), this.code, ")");
+            }
+        }
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class Dismiss extends Event {
+            public static final Dismiss INSTANCE = new Dismiss();
+
+            private Dismiss() {
+                super(null);
+            }
+        }
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class OpenRedemptionUrl extends Event {
+            private final String url;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public OpenRedemptionUrl(String str) {
+                super(null);
+                m.checkNotNullParameter(str, "url");
+                this.url = str;
+            }
+
+            public static /* synthetic */ OpenRedemptionUrl copy$default(OpenRedemptionUrl openRedemptionUrl, String str, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    str = openRedemptionUrl.url;
+                }
+                return openRedemptionUrl.copy(str);
+            }
+
+            public final String component1() {
+                return this.url;
+            }
+
+            public final OpenRedemptionUrl copy(String str) {
+                m.checkNotNullParameter(str, "url");
+                return new OpenRedemptionUrl(str);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof OpenRedemptionUrl) && m.areEqual(this.url, ((OpenRedemptionUrl) obj).url);
+                }
+                return true;
+            }
+
+            public final String getUrl() {
+                return this.url;
+            }
+
+            public int hashCode() {
+                String str = this.url;
+                if (str != null) {
+                    return str.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                return a.D(a.L("OpenRedemptionUrl(url="), this.url, ")");
+            }
+        }
+
+        private Event() {
+        }
+
+        public /* synthetic */ Event(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    /* compiled from: ClaimOutboundPromoViewModel.kt */
+    public static abstract class ViewState {
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class ClaimFailed extends ViewState {
+            public static final ClaimFailed INSTANCE = new ClaimFailed();
+
+            private ClaimFailed() {
+                super(null);
+            }
+        }
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class ClaimInProgress extends ViewState {
+            public static final ClaimInProgress INSTANCE = new ClaimInProgress();
+
+            private ClaimInProgress() {
+                super(null);
+            }
+        }
+
+        /* compiled from: ClaimOutboundPromoViewModel.kt */
+        public static final class Claimed extends ViewState {
+            private final ClaimStatus.Claimed claimedStatus;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public Claimed(ClaimStatus.Claimed claimed) {
+                super(null);
+                m.checkNotNullParameter(claimed, "claimedStatus");
+                this.claimedStatus = claimed;
+            }
+
+            public static /* synthetic */ Claimed copy$default(Claimed claimed, ClaimStatus.Claimed claimed2, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    claimed2 = claimed.claimedStatus;
+                }
+                return claimed.copy(claimed2);
+            }
+
+            public final ClaimStatus.Claimed component1() {
+                return this.claimedStatus;
+            }
+
+            public final Claimed copy(ClaimStatus.Claimed claimed) {
+                m.checkNotNullParameter(claimed, "claimedStatus");
+                return new Claimed(claimed);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof Claimed) && m.areEqual(this.claimedStatus, ((Claimed) obj).claimedStatus);
+                }
+                return true;
+            }
+
+            public final ClaimStatus.Claimed getClaimedStatus() {
+                return this.claimedStatus;
+            }
+
+            public int hashCode() {
+                ClaimStatus.Claimed claimed = this.claimedStatus;
+                if (claimed != null) {
+                    return claimed.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder L = a.L("Claimed(claimedStatus=");
+                L.append(this.claimedStatus);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
+        private ViewState() {
+        }
+
+        public /* synthetic */ ViewState(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public ClaimOutboundPromoViewModel(ClaimStatus claimStatus, StoreOutboundPromotions storeOutboundPromotions) {
+        super(ViewState.ClaimInProgress.INSTANCE);
+        m.checkNotNullParameter(claimStatus, "claimStatus");
+        m.checkNotNullParameter(storeOutboundPromotions, "storeOutboundPromotions");
+        this.claimStatus = claimStatus;
+        this.storeOutboundPromotions = storeOutboundPromotions;
+        this.eventSubject = PublishSubject.k0();
+        handleClaimStatus();
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ ClaimOutboundPromoViewModel(ClaimStatus claimStatus, StoreOutboundPromotions storeOutboundPromotions, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(claimStatus, (i & 2) != 0 ? StoreStream.Companion.getOutboundPromotions() : storeOutboundPromotions);
+    }
+
+    public static final /* synthetic */ ClaimStatus access$getClaimStatus$p(ClaimOutboundPromoViewModel claimOutboundPromoViewModel) {
+        return claimOutboundPromoViewModel.claimStatus;
+    }
+
+    public static final /* synthetic */ PublishSubject access$getEventSubject$p(ClaimOutboundPromoViewModel claimOutboundPromoViewModel) {
+        return claimOutboundPromoViewModel.eventSubject;
+    }
+
+    public static final /* synthetic */ void access$setClaimStatus$p(ClaimOutboundPromoViewModel claimOutboundPromoViewModel, ClaimStatus claimStatus) {
+        claimOutboundPromoViewModel.claimStatus = claimStatus;
+    }
+
+    public static final /* synthetic */ void access$updateViewState(ClaimOutboundPromoViewModel claimOutboundPromoViewModel, ViewState viewState) {
+        claimOutboundPromoViewModel.updateViewState(viewState);
+    }
+
+    private final void claimPromo(long j) {
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.storeOutboundPromotions.claimOutboundPromotion(j), false, 1, null), this, null, 2, null), ClaimOutboundPromoViewModel.class, (Context) null, (Function1) null, new ClaimOutboundPromoViewModel$claimPromo$2(this), (Function0) null, (Function0) null, new ClaimOutboundPromoViewModel$claimPromo$1(this), 54, (Object) null);
+    }
+
+    @MainThread
+    private final void handleClaimStatus() {
+        ClaimStatus claimStatus = this.claimStatus;
+        if (claimStatus instanceof ClaimStatus.Claimed) {
+            updateViewState(new ViewState.Claimed((ClaimStatus.Claimed) claimStatus));
+        } else if (claimStatus instanceof ClaimStatus.Unclaimed) {
+            claimPromo(((ClaimStatus.Unclaimed) claimStatus).getPromoId());
+        }
+    }
+
+    @MainThread
+    public final void copyClicked() {
+        ClaimStatus claimStatus = this.claimStatus;
+        if (!(claimStatus instanceof ClaimStatus.Claimed)) {
+            claimStatus = null;
+        }
+        ClaimStatus.Claimed claimed = (ClaimStatus.Claimed) claimStatus;
+        if (claimed != null) {
+            PublishSubject<Event> publishSubject = this.eventSubject;
+            publishSubject.j.onNext(new Event.CopyCode(claimed.getCode()));
+        }
+    }
+
+    @MainThread
+    public final void failureCloseClicked() {
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        publishSubject.j.onNext(Event.Dismiss.INSTANCE);
+    }
+
+    @MainThread
+    public final void maybeLaterClicked() {
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        publishSubject.j.onNext(Event.Dismiss.INSTANCE);
+    }
+
+    public final Observable<Event> observeEvents() {
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        m.checkNotNullExpressionValue(publishSubject, "eventSubject");
+        return publishSubject;
+    }
+
+    @MainThread
+    public final void redeemClicked() {
+        ClaimStatus claimStatus = this.claimStatus;
+        if (!(claimStatus instanceof ClaimStatus.Claimed)) {
+            claimStatus = null;
+        }
+        ClaimStatus.Claimed claimed = (ClaimStatus.Claimed) claimStatus;
+        if (claimed != null) {
+            PublishSubject<Event> publishSubject = this.eventSubject;
+            publishSubject.j.onNext(new Event.OpenRedemptionUrl(claimed.getLink()));
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java b/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java
new file mode 100644
index 0000000000..0773856089
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/ClaimStatus.java
@@ -0,0 +1,284 @@
+package com.discord.widgets.settings.premium;
+
+import a0.a.a.b;
+import android.os.Parcel;
+import android.os.Parcelable;
+import c.d.b.a.a;
+import com.discord.api.utcdatetime.UtcDateTime;
+import com.discord.utilities.UtcDateTimeParceler;
+import d0.z.d.m;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: ClaimStatus.kt */
+public abstract class ClaimStatus implements Parcelable {
+
+    /* compiled from: ClaimStatus.kt */
+    public static final class Claimed extends ClaimStatus {
+        public static final Parcelable.Creator<Claimed> CREATOR = new Creator();
+        private final String body;
+        private final String code;
+        private final String link;
+        private final long promoId;
+        private final UtcDateTime redeemBy;
+
+        public static class Creator implements Parcelable.Creator<Claimed> {
+            @Override // android.os.Parcelable.Creator
+            public final Claimed createFromParcel(Parcel parcel) {
+                m.checkNotNullParameter(parcel, "in");
+                return new Claimed(parcel.readLong(), parcel.readString(), parcel.readString(), parcel.readString(), UtcDateTimeParceler.INSTANCE.create(parcel));
+            }
+
+            @Override // android.os.Parcelable.Creator
+            public final Claimed[] newArray(int i) {
+                return new Claimed[i];
+            }
+        }
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public Claimed(long j, String str, String str2, String str3, UtcDateTime utcDateTime) {
+            super(null);
+            m.checkNotNullParameter(str, "code");
+            m.checkNotNullParameter(str2, "body");
+            m.checkNotNullParameter(str3, "link");
+            m.checkNotNullParameter(utcDateTime, "redeemBy");
+            this.promoId = j;
+            this.code = str;
+            this.body = str2;
+            this.link = str3;
+            this.redeemBy = utcDateTime;
+        }
+
+        public static /* synthetic */ Claimed copy$default(Claimed claimed, long j, String str, String str2, String str3, UtcDateTime utcDateTime, int i, Object obj) {
+            if ((i & 1) != 0) {
+                j = claimed.promoId;
+            }
+            if ((i & 2) != 0) {
+                str = claimed.code;
+            }
+            if ((i & 4) != 0) {
+                str2 = claimed.body;
+            }
+            if ((i & 8) != 0) {
+                str3 = claimed.link;
+            }
+            if ((i & 16) != 0) {
+                utcDateTime = claimed.redeemBy;
+            }
+            return claimed.copy(j, str, str2, str3, utcDateTime);
+        }
+
+        public final long component1() {
+            return this.promoId;
+        }
+
+        public final String component2() {
+            return this.code;
+        }
+
+        public final String component3() {
+            return this.body;
+        }
+
+        public final String component4() {
+            return this.link;
+        }
+
+        public final UtcDateTime component5() {
+            return this.redeemBy;
+        }
+
+        public final Claimed copy(long j, String str, String str2, String str3, UtcDateTime utcDateTime) {
+            m.checkNotNullParameter(str, "code");
+            m.checkNotNullParameter(str2, "body");
+            m.checkNotNullParameter(str3, "link");
+            m.checkNotNullParameter(utcDateTime, "redeemBy");
+            return new Claimed(j, str, str2, str3, utcDateTime);
+        }
+
+        @Override // android.os.Parcelable
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override // java.lang.Object
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof Claimed)) {
+                return false;
+            }
+            Claimed claimed = (Claimed) obj;
+            return this.promoId == claimed.promoId && m.areEqual(this.code, claimed.code) && m.areEqual(this.body, claimed.body) && m.areEqual(this.link, claimed.link) && m.areEqual(this.redeemBy, claimed.redeemBy);
+        }
+
+        public final String getBody() {
+            return this.body;
+        }
+
+        public final String getCode() {
+            return this.code;
+        }
+
+        public final String getLink() {
+            return this.link;
+        }
+
+        public final long getPromoId() {
+            return this.promoId;
+        }
+
+        public final UtcDateTime getRedeemBy() {
+            return this.redeemBy;
+        }
+
+        @Override // java.lang.Object
+        public int hashCode() {
+            int a = b.a(this.promoId) * 31;
+            String str = this.code;
+            int i = 0;
+            int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
+            String str2 = this.body;
+            int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31;
+            String str3 = this.link;
+            int hashCode3 = (hashCode2 + (str3 != null ? str3.hashCode() : 0)) * 31;
+            UtcDateTime utcDateTime = this.redeemBy;
+            if (utcDateTime != null) {
+                i = utcDateTime.hashCode();
+            }
+            return hashCode3 + i;
+        }
+
+        @Override // java.lang.Object
+        public String toString() {
+            StringBuilder L = a.L("Claimed(promoId=");
+            L.append(this.promoId);
+            L.append(", code=");
+            L.append(this.code);
+            L.append(", body=");
+            L.append(this.body);
+            L.append(", link=");
+            L.append(this.link);
+            L.append(", redeemBy=");
+            L.append(this.redeemBy);
+            L.append(")");
+            return L.toString();
+        }
+
+        @Override // android.os.Parcelable
+        public void writeToParcel(Parcel parcel, int i) {
+            m.checkNotNullParameter(parcel, "parcel");
+            parcel.writeLong(this.promoId);
+            parcel.writeString(this.code);
+            parcel.writeString(this.body);
+            parcel.writeString(this.link);
+            UtcDateTimeParceler.INSTANCE.write((UtcDateTimeParceler) this.redeemBy, parcel, i);
+        }
+    }
+
+    /* compiled from: ClaimStatus.kt */
+    public static final class Unclaimed extends ClaimStatus {
+        public static final Parcelable.Creator<Unclaimed> CREATOR = new Creator();
+        private final UtcDateTime claimBy;
+        private final long promoId;
+
+        public static class Creator implements Parcelable.Creator<Unclaimed> {
+            @Override // android.os.Parcelable.Creator
+            public final Unclaimed createFromParcel(Parcel parcel) {
+                m.checkNotNullParameter(parcel, "in");
+                return new Unclaimed(parcel.readLong(), UtcDateTimeParceler.INSTANCE.create(parcel));
+            }
+
+            @Override // android.os.Parcelable.Creator
+            public final Unclaimed[] newArray(int i) {
+                return new Unclaimed[i];
+            }
+        }
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public Unclaimed(long j, UtcDateTime utcDateTime) {
+            super(null);
+            m.checkNotNullParameter(utcDateTime, "claimBy");
+            this.promoId = j;
+            this.claimBy = utcDateTime;
+        }
+
+        public static /* synthetic */ Unclaimed copy$default(Unclaimed unclaimed, long j, UtcDateTime utcDateTime, int i, Object obj) {
+            if ((i & 1) != 0) {
+                j = unclaimed.promoId;
+            }
+            if ((i & 2) != 0) {
+                utcDateTime = unclaimed.claimBy;
+            }
+            return unclaimed.copy(j, utcDateTime);
+        }
+
+        public final long component1() {
+            return this.promoId;
+        }
+
+        public final UtcDateTime component2() {
+            return this.claimBy;
+        }
+
+        public final Unclaimed copy(long j, UtcDateTime utcDateTime) {
+            m.checkNotNullParameter(utcDateTime, "claimBy");
+            return new Unclaimed(j, utcDateTime);
+        }
+
+        @Override // android.os.Parcelable
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override // java.lang.Object
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof Unclaimed)) {
+                return false;
+            }
+            Unclaimed unclaimed = (Unclaimed) obj;
+            return this.promoId == unclaimed.promoId && m.areEqual(this.claimBy, unclaimed.claimBy);
+        }
+
+        public final UtcDateTime getClaimBy() {
+            return this.claimBy;
+        }
+
+        public final long getPromoId() {
+            return this.promoId;
+        }
+
+        @Override // java.lang.Object
+        public int hashCode() {
+            int a = b.a(this.promoId) * 31;
+            UtcDateTime utcDateTime = this.claimBy;
+            return a + (utcDateTime != null ? utcDateTime.hashCode() : 0);
+        }
+
+        @Override // java.lang.Object
+        public String toString() {
+            StringBuilder L = a.L("Unclaimed(promoId=");
+            L.append(this.promoId);
+            L.append(", claimBy=");
+            L.append(this.claimBy);
+            L.append(")");
+            return L.toString();
+        }
+
+        @Override // android.os.Parcelable
+        public void writeToParcel(Parcel parcel, int i) {
+            m.checkNotNullParameter(parcel, "parcel");
+            parcel.writeLong(this.promoId);
+            UtcDateTimeParceler.INSTANCE.write((UtcDateTimeParceler) this.claimBy, parcel, i);
+        }
+    }
+
+    private ClaimStatus() {
+    }
+
+    public /* synthetic */ ClaimStatus(DefaultConstructorMarker defaultConstructorMarker) {
+        this();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
index 06c60d8d80..144ea4734b 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java
@@ -103,9 +103,9 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
                     m.checkNotNullExpressionValue(jVar, "Observable.just(\n       …nvoice(null))\n          )");
                     return jVar;
                 }
-                Observable<SubscriptionAndInvoice> M = ObservableExtensionsKt.restSubscribeOn$default(restAPI.getInvoicePreview(new RestAPIParams.InvoicePreviewBody(id2, true, z2 && !modelSubscription.isGoogleSubscription())), false, 1, null).G(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$1(subscriptionsState)).M(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$2(subscriptionsState));
-                m.checkNotNullExpressionValue(M, "restAPI\n              .g…ch.Error)\n              }");
-                return M;
+                Observable<SubscriptionAndInvoice> L = ObservableExtensionsKt.restSubscribeOn$default(restAPI.getInvoicePreview(new RestAPIParams.InvoicePreviewBody(id2, true, z2 && !modelSubscription.isGoogleSubscription())), false, 1, null).F(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$1(subscriptionsState)).L(new SettingsPremiumViewModel$Companion$getSubscriptionsAndInvoicePreview$2(subscriptionsState));
+                m.checkNotNullExpressionValue(L, "restAPI\n              .g…ch.Error)\n              }");
+                return L;
             }
             Observable observable = d.j;
             m.checkNotNullExpressionValue(observable, "Observable.never()");
@@ -113,7 +113,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStores(StorePaymentSources storePaymentSources, StoreSubscriptions storeSubscriptions, StoreEntitlements storeEntitlements, StorePremiumGuildSubscription storePremiumGuildSubscription, StoreGooglePlaySkuDetails storeGooglePlaySkuDetails, StoreGooglePlayPurchases storeGooglePlayPurchases, RestAPI restAPI) {
-            Observable<StoreState> e = Observable.e(storePaymentSources.observePaymentSourcesState(), storeSubscriptions.observeSubscriptions().Z(new SettingsPremiumViewModel$Companion$observeStores$1(restAPI)), storeSubscriptions.observeSubscriptions().Z(new SettingsPremiumViewModel$Companion$observeStores$2(restAPI)), storeEntitlements.observeEntitlementState(), StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(storePremiumGuildSubscription, null, 1, null), storeGooglePlaySkuDetails.observeState(), storeGooglePlayPurchases.observeState(), SettingsPremiumViewModel$Companion$observeStores$3.INSTANCE);
+            Observable<StoreState> e = Observable.e(storePaymentSources.observePaymentSourcesState(), storeSubscriptions.observeSubscriptions().Y(new SettingsPremiumViewModel$Companion$observeStores$1(restAPI)), storeSubscriptions.observeSubscriptions().Y(new SettingsPremiumViewModel$Companion$observeStores$2(restAPI)), storeEntitlements.observeEntitlementState(), StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(storePremiumGuildSubscription, null, 1, null), storeGooglePlaySkuDetails.observeState(), storeGooglePlayPurchases.observeState(), SettingsPremiumViewModel$Companion$observeStores$3.INSTANCE);
             m.checkNotNullExpressionValue(e, "Observable\n          .co…            )\n          }");
             return e;
         }
@@ -736,7 +736,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
         this.storeEntitlements = storeEntitlements;
         this.storePremiumGuildSubscription = storePremiumGuildSubscription;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         fetchData();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), SettingsPremiumViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -838,7 +838,7 @@ public final class SettingsPremiumViewModel extends AppViewModel<ViewState> {
     private final void onCancelError() {
         if (getViewState() instanceof ViewState.Loaded) {
             PublishSubject<Event> publishSubject = this.eventSubject;
-            publishSubject.j.onNext(new Event.ErrorToast(2131891922));
+            publishSubject.j.onNext(new Event.ErrorToast(2131891994));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java
index 0c4112a6ee..5e9077a59d 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$binding$2.java
@@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetChoosePlan$binding$2 extends k implemen
 
     public final WidgetChoosePlanBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362619;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362619);
+        int i = 2131362632;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362632);
         if (linearLayout != null) {
-            i = 2131362620;
-            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362620);
+            i = 2131362633;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362633);
             if (linkifiedTextView != null) {
-                i = 2131362621;
-                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362621);
+                i = 2131362634;
+                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362634);
                 if (recyclerView != null) {
-                    i = 2131362896;
-                    DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                    i = 2131362921;
+                    DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                     if (dimmerView != null) {
                         return new WidgetChoosePlanBinding((CoordinatorLayout) view, linearLayout, linkifiedTextView, recyclerView, dimmerView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$setUpRecycler$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$setUpRecycler$2.java
index 37ffc76d43..cb9ab3eef5 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$setUpRecycler$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan$setUpRecycler$2.java
@@ -2,8 +2,8 @@ package com.discord.widgets.settings.premium;
 
 import android.os.Bundle;
 import androidx.fragment.app.FragmentManager;
-import c.a.a.a.b;
-import c.a.a.a.c;
+import c.a.a.e.b;
+import c.a.a.e.d;
 import com.android.billingclient.api.SkuDetails;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.analytics.Traits;
@@ -130,7 +130,7 @@ public final class WidgetChoosePlan$setUpRecycler$2 extends o implements Functio
         m.checkNotNullParameter(googlePlaySku, "sku");
         if (googlePlaySku.getUpgrade() != null && skuDetails != null && googlePlaySku.getType() == GooglePlaySku.Type.PREMIUM_GUILD) {
             AnalyticsTracker.paymentFlowStep$default(AnalyticsTracker.INSTANCE, this.$locationTrait, Traits.Subscription.Companion.withGatewayPlanId(googlePlaySku.getSkuName()), "premium_upsell", "plan_select", null, null, 48, null);
-            b.C0003b bVar = b.j;
+            b.C0014b bVar = b.j;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             AnonymousClass1 r7 = new AnonymousClass1(this, googlePlaySku, str);
@@ -153,7 +153,7 @@ public final class WidgetChoosePlan$setUpRecycler$2 extends o implements Functio
             WidgetChoosePlan.access$getViewModel$p(this.this$0).buy(googlePlaySku, str, this.$locationTrait, "plan_select");
         } else {
             AnalyticsTracker.paymentFlowStep$default(AnalyticsTracker.INSTANCE, this.$locationTrait, Traits.Subscription.Companion.withGatewayPlanId(googlePlaySku.getSkuName()), "yearly_upsell", "plan_select", null, null, 48, null);
-            c.b bVar3 = c.j;
+            d.b bVar3 = d.j;
             FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
             AnonymousClass3 r72 = new AnonymousClass3(this, googlePlaySku, str);
@@ -167,15 +167,15 @@ public final class WidgetChoosePlan$setUpRecycler$2 extends o implements Functio
             m.checkNotNullParameter(r72, "onMonthlyClickListener");
             m.checkNotNullParameter(r92, "onYearlyClickListener");
             m.checkNotNullParameter(b2, "upgradePrice");
-            c cVar = new c();
-            cVar.k = r72;
-            cVar.l = r92;
-            cVar.m = b2;
-            cVar.n = areEqual2;
+            d dVar = new d();
+            dVar.k = r72;
+            dVar.l = r92;
+            dVar.m = b2;
+            dVar.n = areEqual2;
             Bundle bundle = new Bundle();
             bundle.putBoolean("ARG_IS_TIER_1", z2);
-            cVar.setArguments(bundle);
-            cVar.show(parentFragmentManager2, c.class.getSimpleName());
+            dVar.setArguments(bundle);
+            dVar.show(parentFragmentManager2, d.class.getSimpleName());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
index 6a378f97a7..bdfe990647 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java
@@ -12,10 +12,9 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.a.a.d;
-import c.a.a.a.e;
-import c.a.a.d.c;
-import c.a.d.f;
+import c.a.a.c.c;
+import c.a.a.e.e;
+import c.a.a.e.f;
 import c.a.d.h0;
 import c.a.d.j0;
 import c.a.d.l;
@@ -121,7 +120,7 @@ public final class WidgetChoosePlan extends AppFragment {
     }
 
     public WidgetChoosePlan() {
-        super(2131558971);
+        super(2131558974);
         WidgetChoosePlan$viewModel$2 widgetChoosePlan$viewModel$2 = new WidgetChoosePlan$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChoosePlanViewModel.class), new WidgetChoosePlan$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChoosePlan$viewModel$2));
@@ -187,17 +186,17 @@ public final class WidgetChoosePlan extends AppFragment {
                 WidgetChoosePlan$handleEvent$onDismiss$1 widgetChoosePlan$handleEvent$onDismiss$1 = new WidgetChoosePlan$handleEvent$onDismiss$1(this);
                 int ordinal = fromSkuName.getType().ordinal();
                 if (ordinal == 0) {
-                    d.a aVar = d.j;
+                    e.a aVar = e.j;
                     FragmentManager parentFragmentManager = getParentFragmentManager();
                     m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
                     aVar.a(parentFragmentManager, widgetChoosePlan$handleEvent$onDismiss$1, false);
                 } else if (ordinal == 1) {
-                    d.a aVar2 = d.j;
+                    e.a aVar2 = e.j;
                     FragmentManager parentFragmentManager2 = getParentFragmentManager();
                     m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
                     aVar2.a(parentFragmentManager2, widgetChoosePlan$handleEvent$onDismiss$1, true);
                 } else if (ordinal == 2 || ordinal == 3) {
-                    e.a aVar3 = e.j;
+                    f.a aVar3 = f.j;
                     FragmentManager parentFragmentManager3 = getParentFragmentManager();
                     m.checkNotNullExpressionValue(parentFragmentManager3, "parentFragmentManager");
                     String planName = completeSkuPurchase.getPlanName();
@@ -205,12 +204,12 @@ public final class WidgetChoosePlan extends AppFragment {
                     m.checkNotNullParameter(parentFragmentManager3, "fragmentManager");
                     m.checkNotNullParameter(widgetChoosePlan$handleEvent$onDismiss$1, "onDismiss");
                     m.checkNotNullParameter(planName, "planName");
-                    e eVar = new e();
-                    eVar.k = widgetChoosePlan$handleEvent$onDismiss$1;
+                    f fVar = new f();
+                    fVar.k = widgetChoosePlan$handleEvent$onDismiss$1;
                     Bundle bundle = new Bundle();
                     bundle.putString("extra_plan_text", planName);
-                    eVar.setArguments(bundle);
-                    eVar.show(parentFragmentManager3, e.class.getSimpleName());
+                    fVar.setArguments(bundle);
+                    fVar.show(parentFragmentManager3, f.class.getSimpleName());
                 } else if (ordinal == 4) {
                     c.a aVar4 = c.k;
                     FragmentManager parentFragmentManager4 = getParentFragmentManager();
@@ -260,7 +259,7 @@ public final class WidgetChoosePlan extends AppFragment {
         setUpRecycler();
         LinkifiedTextView linkifiedTextView = getBinding().f1754c;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.choosePlanEmptyDescription");
-        b.n(linkifiedTextView, 2131892193, new Object[]{f.a.a(360055386693L, null)}, null, 4);
+        b.m(linkifiedTextView, 2131892267, new Object[]{c.a.d.f.a.a(360055386693L, null)}, null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
index 7f10a32624..bbc188d2db 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java
@@ -32,7 +32,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
     public static final class DividerViewHolder extends MGRecyclerViewHolder<WidgetChoosePlanAdapter, Item> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public DividerViewHolder(WidgetChoosePlanAdapter widgetChoosePlanAdapter) {
-            super(2131558972, widgetChoosePlanAdapter);
+            super(2131558975, widgetChoosePlanAdapter);
             m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter");
         }
     }
@@ -43,17 +43,17 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetChoosePlanAdapter widgetChoosePlanAdapter) {
-            super(2131558973, widgetChoosePlanAdapter);
+            super(2131558976, widgetChoosePlanAdapter);
             m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter");
             View view = this.itemView;
-            TextView textView = (TextView) view.findViewById(2131364577);
+            TextView textView = (TextView) view.findViewById(2131364616);
             if (textView != null) {
                 WidgetChoosePlanAdapterHeaderItemBinding widgetChoosePlanAdapterHeaderItemBinding = new WidgetChoosePlanAdapterHeaderItemBinding((FrameLayout) view, textView);
                 m.checkNotNullExpressionValue(widgetChoosePlanAdapterHeaderItemBinding, "WidgetChoosePlanAdapterH…temBinding.bind(itemView)");
                 this.binding = widgetChoosePlanAdapterHeaderItemBinding;
                 return;
             }
-            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364577)));
+            throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364616)));
         }
 
         public void onConfigure(int i, Item item) {
@@ -61,7 +61,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
             super.onConfigure(i, (int) item);
             TextView textView = this.binding.b;
             m.checkNotNullExpressionValue(textView, "binding.selectSubscriptionHeaderText");
-            b.n(textView, ((Item.Header) item).getTitleStringResId(), new Object[0], null, 4);
+            b.m(textView, ((Item.Header) item).getTitleStringResId(), new Object[0], null, 4);
         }
     }
 
@@ -329,7 +329,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple<Item>
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PlanViewHeader(WidgetChoosePlanAdapter widgetChoosePlanAdapter) {
-            super(2131558974, widgetChoosePlanAdapter);
+            super(2131558977, widgetChoosePlanAdapter);
             m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter");
             WidgetChoosePlanAdapterPlanItemBinding a = WidgetChoosePlanAdapterPlanItemBinding.a(this.itemView);
             m.checkNotNullExpressionValue(a, "WidgetChoosePlanAdapterP…temBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2.java
new file mode 100644
index 0000000000..5f10950007
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2.java
@@ -0,0 +1,38 @@
+package com.discord.widgets.settings.premium;
+
+import android.os.Bundle;
+import android.os.Parcelable;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2 extends o implements Function2<String, Bundle, Unit> {
+    public final /* synthetic */ Function1 $onPromoClaimed;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2(Function1 function1) {
+        super(2);
+        this.$onPromoClaimed = function1;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function2
+    public /* bridge */ /* synthetic */ Unit invoke(String str, Bundle bundle) {
+        invoke(str, bundle);
+        return Unit.a;
+    }
+
+    public final void invoke(String str, Bundle bundle) {
+        m.checkNotNullParameter(str, "requestKey");
+        m.checkNotNullParameter(bundle, "bundle");
+        if (m.areEqual("KEY_PROMO_CLAIMED", str)) {
+            Function1 function1 = this.$onPromoClaimed;
+            Parcelable parcelable = bundle.getParcelable("KEY_PROMO_CLAIMED");
+            m.checkNotNull(parcelable);
+            function1.invoke(parcelable);
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1.java
new file mode 100644
index 0000000000..93a27fd38c
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1.java
@@ -0,0 +1,25 @@
+package com.discord.widgets.settings.premium;
+
+import androidx.lifecycle.ViewModelStore;
+import androidx.lifecycle.ViewModelStoreOwner;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: FragmentViewModelLazy.kt */
+public final class WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1 extends o implements Function0<ViewModelStore> {
+    public final /* synthetic */ Function0 $ownerProducer;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1(Function0 function0) {
+        super(0);
+        this.$ownerProducer = function0;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final ViewModelStore mo1invoke() {
+        ViewModelStore viewModelStore = ((ViewModelStoreOwner) this.$ownerProducer.mo1invoke()).getViewModelStore();
+        m.checkNotNullExpressionValue(viewModelStore, "ownerProducer().viewModelStore");
+        return viewModelStore;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java
new file mode 100644
index 0000000000..d32d984a47
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$binding$2.java
@@ -0,0 +1,71 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.appcompat.widget.LinearLayoutCompat;
+import com.discord.app.AppViewFlipper;
+import com.discord.databinding.WidgetClaimOutboundPromoBinding;
+import com.google.android.material.button.MaterialButton;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final /* synthetic */ class WidgetClaimOutboundPromo$binding$2 extends k implements Function1<View, WidgetClaimOutboundPromoBinding> {
+    public static final WidgetClaimOutboundPromo$binding$2 INSTANCE = new WidgetClaimOutboundPromo$binding$2();
+
+    public WidgetClaimOutboundPromo$binding$2() {
+        super(1, WidgetClaimOutboundPromoBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetClaimOutboundPromoBinding;", 0);
+    }
+
+    public final WidgetClaimOutboundPromoBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = 2131362638;
+        TextView textView = (TextView) view.findViewById(2131362638);
+        if (textView != null) {
+            i = 2131362639;
+            TextView textView2 = (TextView) view.findViewById(2131362639);
+            if (textView2 != null) {
+                i = 2131362640;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362640);
+                if (linearLayout != null) {
+                    i = 2131362641;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131362641);
+                    if (materialButton != null) {
+                        i = 2131362642;
+                        LinearLayoutCompat linearLayoutCompat = (LinearLayoutCompat) view.findViewById(2131362642);
+                        if (linearLayoutCompat != null) {
+                            i = 2131362643;
+                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362643);
+                            if (materialButton2 != null) {
+                                i = 2131362644;
+                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362644);
+                                if (appViewFlipper != null) {
+                                    i = 2131362645;
+                                    FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362645);
+                                    if (frameLayout != null) {
+                                        i = 2131362646;
+                                        MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362646);
+                                        if (materialButton3 != null) {
+                                            i = 2131362647;
+                                            MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131362647);
+                                            if (materialButton4 != null) {
+                                                i = 2131362648;
+                                                LinearLayoutCompat linearLayoutCompat2 = (LinearLayoutCompat) view.findViewById(2131362648);
+                                                if (linearLayoutCompat2 != null) {
+                                                    return new WidgetClaimOutboundPromoBinding((LinearLayoutCompat) view, textView, textView2, linearLayout, materialButton, linearLayoutCompat, materialButton2, appViewFlipper, frameLayout, materialButton3, materialButton4, linearLayoutCompat2);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$1.java
new file mode 100644
index 0000000000..08dd4106b5
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$1.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo$onViewBound$1 implements View.OnClickListener {
+    public final /* synthetic */ WidgetClaimOutboundPromo this$0;
+
+    public WidgetClaimOutboundPromo$onViewBound$1(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        this.this$0 = widgetClaimOutboundPromo;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetClaimOutboundPromo.access$getViewModel$p(this.this$0).copyClicked();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$2.java
new file mode 100644
index 0000000000..7a912e319d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$2.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo$onViewBound$2 implements View.OnClickListener {
+    public final /* synthetic */ WidgetClaimOutboundPromo this$0;
+
+    public WidgetClaimOutboundPromo$onViewBound$2(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        this.this$0 = widgetClaimOutboundPromo;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetClaimOutboundPromo.access$getViewModel$p(this.this$0).redeemClicked();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$3.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$3.java
new file mode 100644
index 0000000000..f42c6e1664
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$3.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo$onViewBound$3 implements View.OnClickListener {
+    public final /* synthetic */ WidgetClaimOutboundPromo this$0;
+
+    public WidgetClaimOutboundPromo$onViewBound$3(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        this.this$0 = widgetClaimOutboundPromo;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetClaimOutboundPromo.access$getViewModel$p(this.this$0).maybeLaterClicked();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$4.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$4.java
new file mode 100644
index 0000000000..4029d23062
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBound$4.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo$onViewBound$4 implements View.OnClickListener {
+    public final /* synthetic */ WidgetClaimOutboundPromo this$0;
+
+    public WidgetClaimOutboundPromo$onViewBound$4(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        this.this$0 = widgetClaimOutboundPromo;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetClaimOutboundPromo.access$getViewModel$p(this.this$0).failureCloseClicked();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBoundOrOnResume$1.java
new file mode 100644
index 0000000000..bf30faddd9
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBoundOrOnResume$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.widgets.settings.premium.ClaimOutboundPromoViewModel;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final /* synthetic */ class WidgetClaimOutboundPromo$onViewBoundOrOnResume$1 extends k implements Function1<ClaimOutboundPromoViewModel.ViewState, Unit> {
+    public WidgetClaimOutboundPromo$onViewBoundOrOnResume$1(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        super(1, widgetClaimOutboundPromo, WidgetClaimOutboundPromo.class, "configureUi", "configureUi(Lcom/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$ViewState;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(ClaimOutboundPromoViewModel.ViewState viewState) {
+        invoke(viewState);
+        return Unit.a;
+    }
+
+    public final void invoke(ClaimOutboundPromoViewModel.ViewState viewState) {
+        m.checkNotNullParameter(viewState, "p1");
+        WidgetClaimOutboundPromo.access$configureUi((WidgetClaimOutboundPromo) this.receiver, viewState);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBoundOrOnResume$2.java
new file mode 100644
index 0000000000..cc9bf6092a
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$onViewBoundOrOnResume$2.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.widgets.settings.premium.ClaimOutboundPromoViewModel;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final /* synthetic */ class WidgetClaimOutboundPromo$onViewBoundOrOnResume$2 extends k implements Function1<ClaimOutboundPromoViewModel.Event, Unit> {
+    public WidgetClaimOutboundPromo$onViewBoundOrOnResume$2(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        super(1, widgetClaimOutboundPromo, WidgetClaimOutboundPromo.class, "handleEvent", "handleEvent(Lcom/discord/widgets/settings/premium/ClaimOutboundPromoViewModel$Event;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(ClaimOutboundPromoViewModel.Event event) {
+        invoke(event);
+        return Unit.a;
+    }
+
+    public final void invoke(ClaimOutboundPromoViewModel.Event event) {
+        m.checkNotNullParameter(event, "p1");
+        WidgetClaimOutboundPromo.access$handleEvent((WidgetClaimOutboundPromo) this.receiver, event);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$viewModel$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$viewModel$2.java
new file mode 100644
index 0000000000..870661c854
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo$viewModel$2.java
@@ -0,0 +1,22 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.app.AppViewModel;
+import com.discord.widgets.settings.premium.ClaimOutboundPromoViewModel;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo$viewModel$2 extends o implements Function0<AppViewModel<ClaimOutboundPromoViewModel.ViewState>> {
+    public final /* synthetic */ WidgetClaimOutboundPromo this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetClaimOutboundPromo$viewModel$2(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        super(0);
+        this.this$0 = widgetClaimOutboundPromo;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final AppViewModel<ClaimOutboundPromoViewModel.ViewState> mo1invoke() {
+        return new ClaimOutboundPromoViewModel(WidgetClaimOutboundPromo.access$getClaimStatus$p(this.this$0), null, 2, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
new file mode 100644
index 0000000000..64b0b6741c
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetClaimOutboundPromo.java
@@ -0,0 +1,231 @@
+package com.discord.widgets.settings.premium;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.ColorInt;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentKt;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentViewModelLazyKt;
+import androidx.transition.AutoTransition;
+import androidx.transition.TransitionManager;
+import c.a.d.h0;
+import c.a.d.j0;
+import c.a.l.b;
+import c.d.b.a.a;
+import com.discord.app.AppDialog;
+import com.discord.app.AppViewFlipper;
+import com.discord.databinding.WidgetClaimOutboundPromoBinding;
+import com.discord.utilities.KotlinExtensionsKt;
+import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.dimen.DimenUtils;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.uri.UriHandler;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.settings.premium.ClaimOutboundPromoViewModel;
+import com.discord.widgets.settings.premium.ClaimStatus;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.shape.MaterialShapeDrawable;
+import com.google.android.material.shape.ShapeAppearanceModel;
+import d0.z.d.a0;
+import d0.z.d.m;
+import java.util.Objects;
+import kotlin.Lazy;
+import kotlin.NoWhenBranchMatchedException;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+/* compiled from: WidgetClaimOutboundPromo.kt */
+public final class WidgetClaimOutboundPromo extends AppDialog {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetClaimOutboundPromo.class, "binding", "getBinding()Lcom/discord/databinding/WidgetClaimOutboundPromoBinding;", 0)};
+    private static final String ARG_CLAIM_STATUS = "ARG_CLAIM_STATUS";
+    public static final Companion Companion = new Companion(null);
+    private static final int INDEX_FAILURE = 2;
+    private static final int INDEX_LOADING = 0;
+    private static final int INDEX_SUCCESS = 1;
+    private static final String KEY_PROMO_CLAIMED = "KEY_PROMO_CLAIMED";
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetClaimOutboundPromo$binding$2.INSTANCE, null, 2, null);
+    private final MaterialShapeDrawable codeBoxBackground;
+    private final Lazy viewModel$delegate;
+
+    /* compiled from: WidgetClaimOutboundPromo.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void showAndRegisterForClaimResult(ClaimStatus claimStatus, Fragment fragment, Function1<? super ClaimStatus.Claimed, Unit> function1) {
+            m.checkNotNullParameter(claimStatus, "claimStatus");
+            m.checkNotNullParameter(fragment, "fragment");
+            m.checkNotNullParameter(function1, "onPromoClaimed");
+            if (fragment.getParentFragmentManager().findFragmentByTag("javaClass") == null) {
+                if (claimStatus instanceof ClaimStatus.Unclaimed) {
+                    FragmentKt.setFragmentResultListener(fragment, "KEY_PROMO_CLAIMED", new WidgetClaimOutboundPromo$Companion$showAndRegisterForClaimResult$2(function1));
+                }
+                WidgetClaimOutboundPromo widgetClaimOutboundPromo = new WidgetClaimOutboundPromo();
+                Bundle bundle = new Bundle();
+                bundle.putParcelable("ARG_CLAIM_STATUS", claimStatus);
+                widgetClaimOutboundPromo.setArguments(bundle);
+                FragmentManager parentFragmentManager = fragment.getParentFragmentManager();
+                m.checkNotNullExpressionValue(parentFragmentManager, "fragment.parentFragmentManager");
+                widgetClaimOutboundPromo.show(parentFragmentManager, "javaClass");
+            }
+        }
+    }
+
+    public WidgetClaimOutboundPromo() {
+        super(2131558978);
+        WidgetClaimOutboundPromo$viewModel$2 widgetClaimOutboundPromo$viewModel$2 = new WidgetClaimOutboundPromo$viewModel$2(this);
+        h0 h0Var = new h0(this);
+        this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ClaimOutboundPromoViewModel.class), new WidgetClaimOutboundPromo$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetClaimOutboundPromo$viewModel$2));
+        MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(new ShapeAppearanceModel.Builder().setAllCornerSizes((float) DimenUtils.dpToPixels(4)).build());
+        materialShapeDrawable.setFillColor(ColorStateList.valueOf(0));
+        this.codeBoxBackground = materialShapeDrawable;
+    }
+
+    public static final /* synthetic */ void access$configureUi(WidgetClaimOutboundPromo widgetClaimOutboundPromo, ClaimOutboundPromoViewModel.ViewState viewState) {
+        widgetClaimOutboundPromo.configureUi(viewState);
+    }
+
+    public static final /* synthetic */ ClaimStatus access$getClaimStatus$p(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        return widgetClaimOutboundPromo.getClaimStatus();
+    }
+
+    public static final /* synthetic */ ClaimOutboundPromoViewModel access$getViewModel$p(WidgetClaimOutboundPromo widgetClaimOutboundPromo) {
+        return widgetClaimOutboundPromo.getViewModel();
+    }
+
+    public static final /* synthetic */ void access$handleEvent(WidgetClaimOutboundPromo widgetClaimOutboundPromo, ClaimOutboundPromoViewModel.Event event) {
+        widgetClaimOutboundPromo.handleEvent(event);
+    }
+
+    private final void configureUi(ClaimOutboundPromoViewModel.ViewState viewState) {
+        View view = getView();
+        if (!(view instanceof ViewGroup)) {
+            view = null;
+        }
+        ViewGroup viewGroup = (ViewGroup) view;
+        if (viewGroup != null) {
+            AutoTransition autoTransition = new AutoTransition();
+            autoTransition.setOrdering(0);
+            autoTransition.setDuration(200L);
+            TransitionManager.beginDelayedTransition(viewGroup, autoTransition);
+        }
+        if (viewState instanceof ClaimOutboundPromoViewModel.ViewState.ClaimInProgress) {
+            AppViewFlipper appViewFlipper = getBinding().g;
+            m.checkNotNullExpressionValue(appViewFlipper, "binding.claimPromoFlipper");
+            appViewFlipper.setDisplayedChild(0);
+        } else if (viewState instanceof ClaimOutboundPromoViewModel.ViewState.Claimed) {
+            TextView textView = getBinding().b;
+            m.checkNotNullExpressionValue(textView, "binding.claimPromoBody");
+            ClaimOutboundPromoViewModel.ViewState.Claimed claimed = (ClaimOutboundPromoViewModel.ViewState.Claimed) viewState;
+            textView.setText(claimed.getClaimedStatus().getBody());
+            TextView textView2 = getBinding().f1755c;
+            m.checkNotNullExpressionValue(textView2, "binding.claimPromoCode");
+            textView2.setText(claimed.getClaimedStatus().getCode());
+            AppViewFlipper appViewFlipper2 = getBinding().g;
+            m.checkNotNullExpressionValue(appViewFlipper2, "binding.claimPromoFlipper");
+            appViewFlipper2.setDisplayedChild(1);
+            setCancelable(true);
+        } else if (viewState instanceof ClaimOutboundPromoViewModel.ViewState.ClaimFailed) {
+            AppViewFlipper appViewFlipper3 = getBinding().g;
+            m.checkNotNullExpressionValue(appViewFlipper3, "binding.claimPromoFlipper");
+            appViewFlipper3.setMeasureAllChildren(false);
+            AppViewFlipper appViewFlipper4 = getBinding().g;
+            m.checkNotNullExpressionValue(appViewFlipper4, "binding.claimPromoFlipper");
+            appViewFlipper4.setDisplayedChild(2);
+            setCancelable(true);
+        }
+    }
+
+    private final WidgetClaimOutboundPromoBinding getBinding() {
+        return (WidgetClaimOutboundPromoBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    private final ClaimStatus getClaimStatus() {
+        Parcelable parcelable = getArgumentsOrDefault().getParcelable("ARG_CLAIM_STATUS");
+        m.checkNotNull(parcelable);
+        return (ClaimStatus) parcelable;
+    }
+
+    private final ClaimOutboundPromoViewModel getViewModel() {
+        return (ClaimOutboundPromoViewModel) this.viewModel$delegate.getValue();
+    }
+
+    private final void handleEvent(ClaimOutboundPromoViewModel.Event event) {
+        Unit unit;
+        if (event instanceof ClaimOutboundPromoViewModel.Event.Claimed) {
+            Bundle bundle = new Bundle();
+            bundle.putParcelable("KEY_PROMO_CLAIMED", ((ClaimOutboundPromoViewModel.Event.Claimed) event).getClaimedStatus());
+            unit = Unit.a;
+            FragmentKt.setFragmentResult(this, "KEY_PROMO_CLAIMED", bundle);
+        } else if (event instanceof ClaimOutboundPromoViewModel.Event.CopyCode) {
+            Object systemService = requireContext().getSystemService("clipboard");
+            Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.content.ClipboardManager");
+            ((ClipboardManager) systemService).setPrimaryClip(ClipData.newPlainText("Promo Code", ((ClaimOutboundPromoViewModel.Event.CopyCode) event).getCode()));
+            MaterialButton materialButton = getBinding().e;
+            m.checkNotNullExpressionValue(materialButton, "binding.claimPromoCopyButton");
+            b.m(materialButton, 2131887620, new Object[0], null, 4);
+            setCodeBoxColor(ContextCompat.getColor(requireContext(), 2131100249));
+            unit = Unit.a;
+        } else if (event instanceof ClaimOutboundPromoViewModel.Event.OpenRedemptionUrl) {
+            UriHandler uriHandler = UriHandler.INSTANCE;
+            Context requireContext = requireContext();
+            m.checkNotNullExpressionValue(requireContext, "requireContext()");
+            UriHandler.handle$default(uriHandler, requireContext, ((ClaimOutboundPromoViewModel.Event.OpenRedemptionUrl) event).getUrl(), null, 4, null);
+            dismiss();
+            unit = Unit.a;
+        } else if (event instanceof ClaimOutboundPromoViewModel.Event.Dismiss) {
+            dismiss();
+            unit = Unit.a;
+        } else {
+            throw new NoWhenBranchMatchedException();
+        }
+        KotlinExtensionsKt.getExhaustive(unit);
+    }
+
+    private final void setCodeBoxColor(@ColorInt int i) {
+        this.codeBoxBackground.setStroke((float) DimenUtils.dpToPixels(1), i);
+        getBinding().d.invalidate();
+    }
+
+    @Override // androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        setCancelable(false);
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBound(View view) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewBound(view);
+        ViewCompat.setBackground(getBinding().d, this.codeBoxBackground);
+        setCodeBoxColor(ColorCompat.getThemedColor(view, 2130968949));
+        getBinding().e.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$1(this));
+        getBinding().i.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$2(this));
+        getBinding().h.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$3(this));
+        getBinding().f.setOnClickListener(new WidgetClaimOutboundPromo$onViewBound$4(this));
+    }
+
+    @Override // com.discord.app.AppDialog
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetClaimOutboundPromo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetClaimOutboundPromo$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetClaimOutboundPromo.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetClaimOutboundPromo$onViewBoundOrOnResume$2(this), 62, (Object) null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java
new file mode 100644
index 0000000000..bb17eb67fa
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$binding$2.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.discord.databinding.WidgetOutboundPromoTermsBinding;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetOutboundPromoTerms.kt */
+public final /* synthetic */ class WidgetOutboundPromoTerms$binding$2 extends k implements Function1<View, WidgetOutboundPromoTermsBinding> {
+    public static final WidgetOutboundPromoTerms$binding$2 INSTANCE = new WidgetOutboundPromoTerms$binding$2();
+
+    public WidgetOutboundPromoTerms$binding$2() {
+        super(1, WidgetOutboundPromoTermsBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetOutboundPromoTermsBinding;", 0);
+    }
+
+    public final WidgetOutboundPromoTermsBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = 2131364403;
+        TextView textView = (TextView) view.findViewById(2131364403);
+        if (textView != null) {
+            i = 2131364404;
+            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364404);
+            if (linkifiedTextView != null) {
+                return new WidgetOutboundPromoTermsBinding((LinearLayout) view, textView, linkifiedTextView);
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$onViewCreated$1.java
new file mode 100644
index 0000000000..56e1fcacfc
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$onViewCreated$1.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings.premium;
+
+import android.view.View;
+/* compiled from: WidgetOutboundPromoTerms.kt */
+public final class WidgetOutboundPromoTerms$onViewCreated$1 implements View.OnClickListener {
+    public final /* synthetic */ WidgetOutboundPromoTerms this$0;
+
+    public WidgetOutboundPromoTerms$onViewCreated$1(WidgetOutboundPromoTerms widgetOutboundPromoTerms) {
+        this.this$0 = widgetOutboundPromoTerms;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        this.this$0.dismiss();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1.java
new file mode 100644
index 0000000000..acfbb54b0f
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1.java
@@ -0,0 +1,30 @@
+package com.discord.widgets.settings.premium;
+
+import android.content.Context;
+import com.discord.utilities.uri.UriHandler;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function3;
+/* compiled from: WidgetOutboundPromoTerms.kt */
+public final class WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1 extends o implements Function3<Context, String, String, Unit> {
+    public static final WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1 INSTANCE = new WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1();
+
+    public WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1() {
+        super(3);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function3
+    public /* bridge */ /* synthetic */ Unit invoke(Context context, String str, String str2) {
+        invoke(context, str, str2);
+        return Unit.a;
+    }
+
+    public final void invoke(Context context, String str, String str2) {
+        m.checkNotNullParameter(context, "context");
+        m.checkNotNullParameter(str, "url");
+        UriHandler.handle$default(UriHandler.INSTANCE, context, str, null, 4, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1.java
new file mode 100644
index 0000000000..078acef631
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.premium;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetOutboundPromoTerms.kt */
+public final class WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1 extends o implements Function1<String, Unit> {
+    public static final WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1 INSTANCE = new WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1();
+
+    public WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1() {
+        super(1);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "it");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java
new file mode 100644
index 0000000000..4d594381d7
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms$renderContext$1.java
@@ -0,0 +1,45 @@
+package com.discord.widgets.settings.premium;
+
+import android.content.Context;
+import com.discord.utilities.textprocessing.node.UrlNode;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function3;
+/* compiled from: WidgetOutboundPromoTerms.kt */
+public final class WidgetOutboundPromoTerms$renderContext$1 implements UrlNode.RenderContext {
+    private final Context context;
+    private final int linkColorAttrResId;
+    private final Function3<Context, String, String, Unit> onClickUrl = WidgetOutboundPromoTerms$renderContext$1$onClickUrl$1.INSTANCE;
+    private final Function1<String, Unit> onLongPressUrl;
+    public final /* synthetic */ WidgetOutboundPromoTerms this$0;
+
+    public WidgetOutboundPromoTerms$renderContext$1(WidgetOutboundPromoTerms widgetOutboundPromoTerms) {
+        this.this$0 = widgetOutboundPromoTerms;
+        Context requireContext = widgetOutboundPromoTerms.requireContext();
+        m.checkNotNullExpressionValue(requireContext, "requireContext()");
+        this.context = requireContext;
+        this.linkColorAttrResId = 2130968986;
+        this.onLongPressUrl = WidgetOutboundPromoTerms$renderContext$1$onLongPressUrl$1.INSTANCE;
+    }
+
+    @Override // com.discord.utilities.textprocessing.node.BasicRenderContext, com.discord.utilities.textprocessing.node.UserMentionNode.RenderContext, com.discord.utilities.textprocessing.node.EmojiNode.RenderContext
+    public Context getContext() {
+        return this.context;
+    }
+
+    @Override // com.discord.utilities.textprocessing.node.UrlNode.RenderContext
+    public int getLinkColorAttrResId() {
+        return this.linkColorAttrResId;
+    }
+
+    @Override // com.discord.utilities.textprocessing.node.UrlNode.RenderContext
+    public Function3<Context, String, String, Unit> getOnClickUrl() {
+        return this.onClickUrl;
+    }
+
+    @Override // com.discord.utilities.textprocessing.node.UrlNode.RenderContext
+    public Function1<String, Unit> getOnLongPressUrl() {
+        return this.onLongPressUrl;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java
new file mode 100644
index 0000000000..08a9a389c6
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java
@@ -0,0 +1,85 @@
+package com.discord.widgets.settings.premium;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import c.a.u.b.b.e;
+import c.d.b.a.a;
+import com.discord.app.AppBottomSheet;
+import com.discord.databinding.WidgetOutboundPromoTermsBinding;
+import com.discord.simpleast.core.node.Node;
+import com.discord.simpleast.core.parser.Parser;
+import com.discord.utilities.textprocessing.AstRenderer;
+import com.discord.utilities.textprocessing.MessageParseState;
+import com.discord.utilities.textprocessing.Rules;
+import com.discord.utilities.textprocessing.node.UrlNode;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import d0.z.d.m;
+import java.util.List;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+/* compiled from: WidgetOutboundPromoTerms.kt */
+public final class WidgetOutboundPromoTerms extends AppBottomSheet {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetOutboundPromoTerms.class, "binding", "getBinding()Lcom/discord/databinding/WidgetOutboundPromoTermsBinding;", 0)};
+    private static final String ARG_CONTENT = "ARG_CONTENT";
+    public static final Companion Companion = new Companion(null);
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetOutboundPromoTerms$binding$2.INSTANCE, null, 2, null);
+    private final Parser<UrlNode.RenderContext, Node<UrlNode.RenderContext>, MessageParseState> parser;
+
+    /* compiled from: WidgetOutboundPromoTerms.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void show(String str, FragmentManager fragmentManager) {
+            m.checkNotNullParameter(str, "content");
+            m.checkNotNullParameter(fragmentManager, "fragmentManager");
+            WidgetOutboundPromoTerms widgetOutboundPromoTerms = new WidgetOutboundPromoTerms();
+            Bundle bundle = new Bundle();
+            bundle.putString("ARG_CONTENT", str);
+            widgetOutboundPromoTerms.setArguments(bundle);
+            widgetOutboundPromoTerms.show(fragmentManager, WidgetOutboundPromoTerms.class.getName());
+        }
+    }
+
+    public WidgetOutboundPromoTerms() {
+        super(false, 1, null);
+        Parser parser = new Parser(false, 1, null);
+        Rules rules = Rules.INSTANCE;
+        this.parser = parser.addRule(rules.createMaskedLinkRule()).addRule(rules.createUrlRule()).addRules(e.b(false, false, 3));
+    }
+
+    private final WidgetOutboundPromoTermsBinding getBinding() {
+        return (WidgetOutboundPromoTermsBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    private final UrlNode.RenderContext getRenderContext() {
+        return new WidgetOutboundPromoTerms$renderContext$1(this);
+    }
+
+    @Override // com.discord.app.AppBottomSheet
+    public int getContentViewResId() {
+        return 2131559110;
+    }
+
+    @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
+    public void onViewCreated(View view, Bundle bundle) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewCreated(view, bundle);
+        getBinding().b.setOnClickListener(new WidgetOutboundPromoTerms$onViewCreated$1(this));
+        String string = getArgumentsOrDefault().getString("ARG_CONTENT", "");
+        Parser<UrlNode.RenderContext, Node<UrlNode.RenderContext>, MessageParseState> parser = this.parser;
+        m.checkNotNullExpressionValue(string, "content");
+        List parse$default = Parser.parse$default(parser, string, MessageParseState.Companion.getInitialState(), null, 4, null);
+        LinkifiedTextView linkifiedTextView = getBinding().f1845c;
+        m.checkNotNullExpressionValue(linkifiedTextView, "binding.promoTermsContent");
+        linkifiedTextView.setText(AstRenderer.render(parse$default, getRenderContext()));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java
deleted file mode 100644
index 1d1d43145e..0000000000
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.discord.widgets.settings.premium;
-
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import com.discord.databinding.WidgetOutboundPromoTermsSheetBinding;
-import d0.z.d.k;
-import d0.z.d.m;
-import kotlin.jvm.functions.Function1;
-/* compiled from: WidgetOutboundPromoTermsSheet.kt */
-public final /* synthetic */ class WidgetOutboundPromoTermsSheet$binding$2 extends k implements Function1<View, WidgetOutboundPromoTermsSheetBinding> {
-    public static final WidgetOutboundPromoTermsSheet$binding$2 INSTANCE = new WidgetOutboundPromoTermsSheet$binding$2();
-
-    public WidgetOutboundPromoTermsSheet$binding$2() {
-        super(1, WidgetOutboundPromoTermsSheetBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetOutboundPromoTermsSheetBinding;", 0);
-    }
-
-    public final WidgetOutboundPromoTermsSheetBinding invoke(View view) {
-        m.checkNotNullParameter(view, "p1");
-        int i = 2131364365;
-        TextView textView = (TextView) view.findViewById(2131364365);
-        if (textView != null) {
-            i = 2131364366;
-            TextView textView2 = (TextView) view.findViewById(2131364366);
-            if (textView2 != null) {
-                return new WidgetOutboundPromoTermsSheetBinding((LinearLayout) view, textView, textView2);
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$onViewCreated$1.java
deleted file mode 100644
index d49f123fca..0000000000
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$onViewCreated$1.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.discord.widgets.settings.premium;
-
-import android.view.View;
-/* compiled from: WidgetOutboundPromoTermsSheet.kt */
-public final class WidgetOutboundPromoTermsSheet$onViewCreated$1 implements View.OnClickListener {
-    public final /* synthetic */ WidgetOutboundPromoTermsSheet this$0;
-
-    public WidgetOutboundPromoTermsSheet$onViewCreated$1(WidgetOutboundPromoTermsSheet widgetOutboundPromoTermsSheet) {
-        this.this$0 = widgetOutboundPromoTermsSheet;
-    }
-
-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        this.this$0.dismiss();
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java
deleted file mode 100644
index 86220e85d7..0000000000
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.discord.widgets.settings.premium;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import c.d.b.a.a;
-import com.discord.app.AppBottomSheet;
-import com.discord.databinding.WidgetOutboundPromoTermsSheetBinding;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import d0.z.d.m;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.reflect.KProperty;
-/* compiled from: WidgetOutboundPromoTermsSheet.kt */
-public final class WidgetOutboundPromoTermsSheet extends AppBottomSheet {
-    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetOutboundPromoTermsSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetOutboundPromoTermsSheetBinding;", 0)};
-    private static final String ARG_CONTENT = "ARG_CONTENT";
-    public static final Companion Companion = new Companion(null);
-    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetOutboundPromoTermsSheet$binding$2.INSTANCE, null, 2, null);
-
-    /* compiled from: WidgetOutboundPromoTermsSheet.kt */
-    public static final class Companion {
-        private Companion() {
-        }
-
-        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
-            this();
-        }
-
-        public final void show(String str, FragmentManager fragmentManager) {
-            m.checkNotNullParameter(str, "content");
-            m.checkNotNullParameter(fragmentManager, "fragmentManager");
-            WidgetOutboundPromoTermsSheet widgetOutboundPromoTermsSheet = new WidgetOutboundPromoTermsSheet();
-            Bundle bundle = new Bundle();
-            bundle.putString("ARG_CONTENT", str);
-            widgetOutboundPromoTermsSheet.setArguments(bundle);
-            widgetOutboundPromoTermsSheet.show(fragmentManager, WidgetOutboundPromoTermsSheet.class.getName());
-        }
-    }
-
-    public WidgetOutboundPromoTermsSheet() {
-        super(false, 1, null);
-    }
-
-    private final WidgetOutboundPromoTermsSheetBinding getBinding() {
-        return (WidgetOutboundPromoTermsSheetBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
-    }
-
-    @Override // com.discord.app.AppBottomSheet
-    public int getContentViewResId() {
-        return 2131559104;
-    }
-
-    @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
-    public void onViewCreated(View view, Bundle bundle) {
-        m.checkNotNullParameter(view, "view");
-        super.onViewCreated(view, bundle);
-        getBinding().b.setOnClickListener(new WidgetOutboundPromoTermsSheet$onViewCreated$1(this));
-        TextView textView = getBinding().f1843c;
-        m.checkNotNullExpressionValue(textView, "binding.promoTermsContent");
-        textView.setText(getArgumentsOrDefault().getString("ARG_CONTENT", ""));
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java
index 4d416cbfe0..0094ff67ca 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java
@@ -26,62 +26,62 @@ public final /* synthetic */ class WidgetSettingsGifting$binding$2 extends k imp
 
     public final WidgetSettingsGiftingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131363305;
-            GiftSelectView giftSelectView = (GiftSelectView) view.findViewById(2131363305);
+            i = 2131363331;
+            GiftSelectView giftSelectView = (GiftSelectView) view.findViewById(2131363331);
             if (giftSelectView != null) {
-                i = 2131363306;
-                GiftSelectView giftSelectView2 = (GiftSelectView) view.findViewById(2131363306);
+                i = 2131363332;
+                GiftSelectView giftSelectView2 = (GiftSelectView) view.findViewById(2131363332);
                 if (giftSelectView2 != null) {
-                    i = 2131363307;
-                    GiftSelectView giftSelectView3 = (GiftSelectView) view.findViewById(2131363307);
+                    i = 2131363333;
+                    GiftSelectView giftSelectView3 = (GiftSelectView) view.findViewById(2131363333);
                     if (giftSelectView3 != null) {
-                        i = 2131363308;
-                        GiftSelectView giftSelectView4 = (GiftSelectView) view.findViewById(2131363308);
+                        i = 2131363334;
+                        GiftSelectView giftSelectView4 = (GiftSelectView) view.findViewById(2131363334);
                         if (giftSelectView4 != null) {
-                            i = 2131364318;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364318);
+                            i = 2131364354;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364354);
                             if (linkifiedTextView != null) {
-                                i = 2131364320;
-                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131364320);
+                                i = 2131364356;
+                                LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131364356);
                                 if (linkifiedTextView2 != null) {
-                                    i = 2131364828;
-                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364828);
+                                    i = 2131364877;
+                                    AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364877);
                                     if (appViewFlipper != null) {
-                                        i = 2131364829;
-                                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131364829);
+                                        i = 2131364878;
+                                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131364878);
                                         if (progressBar != null) {
-                                            i = 2131364830;
-                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364830);
+                                            i = 2131364879;
+                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364879);
                                             if (textInputLayout != null) {
-                                                i = 2131364831;
-                                                TextView textView = (TextView) view.findViewById(2131364831);
+                                                i = 2131364880;
+                                                TextView textView = (TextView) view.findViewById(2131364880);
                                                 if (textView != null) {
-                                                    i = 2131364832;
-                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364832);
+                                                    i = 2131364881;
+                                                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364881);
                                                     if (recyclerView != null) {
-                                                        i = 2131364833;
-                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364833);
+                                                        i = 2131364882;
+                                                        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364882);
                                                         if (linearLayout != null) {
-                                                            i = 2131364834;
-                                                            TextView textView2 = (TextView) view.findViewById(2131364834);
+                                                            i = 2131364883;
+                                                            TextView textView2 = (TextView) view.findViewById(2131364883);
                                                             if (textView2 != null) {
-                                                                i = 2131364835;
-                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364835);
+                                                                i = 2131364884;
+                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131364884);
                                                                 if (materialButton != null) {
-                                                                    i = 2131364836;
-                                                                    TextView textView3 = (TextView) view.findViewById(2131364836);
+                                                                    i = 2131364885;
+                                                                    TextView textView3 = (TextView) view.findViewById(2131364885);
                                                                     if (textView3 != null) {
-                                                                        i = 2131364837;
-                                                                        TextView textView4 = (TextView) view.findViewById(2131364837);
+                                                                        i = 2131364886;
+                                                                        TextView textView4 = (TextView) view.findViewById(2131364886);
                                                                         if (textView4 != null) {
-                                                                            i = 2131364838;
-                                                                            TextView textView5 = (TextView) view.findViewById(2131364838);
+                                                                            i = 2131364887;
+                                                                            TextView textView5 = (TextView) view.findViewById(2131364887);
                                                                             if (textView5 != null) {
-                                                                                i = 2131364839;
-                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364839);
+                                                                                i = 2131364888;
+                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364888);
                                                                                 if (recyclerView2 != null) {
                                                                                     return new WidgetSettingsGiftingBinding((CoordinatorLayout) view, dimmerView, giftSelectView, giftSelectView2, giftSelectView3, giftSelectView4, linkifiedTextView, linkifiedTextView2, appViewFlipper, progressBar, textInputLayout, textView, recyclerView, linearLayout, textView2, materialButton, textView3, textView4, textView5, recyclerView2);
                                                                                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$handleEvent$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$handleEvent$1.java
new file mode 100644
index 0000000000..1509ad948b
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$handleEvent$1.java
@@ -0,0 +1,30 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.widgets.settings.premium.ClaimStatus;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsGifting.kt */
+public final class WidgetSettingsGifting$handleEvent$1 extends o implements Function1<ClaimStatus.Claimed, Unit> {
+    public final /* synthetic */ WidgetSettingsGifting this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsGifting$handleEvent$1(WidgetSettingsGifting widgetSettingsGifting) {
+        super(1);
+        this.this$0 = widgetSettingsGifting;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(ClaimStatus.Claimed claimed) {
+        invoke(claimed);
+        return Unit.a;
+    }
+
+    public final void invoke(ClaimStatus.Claimed claimed) {
+        m.checkNotNullParameter(claimed, "it");
+        WidgetSettingsGifting.access$getViewModel$p(this.this$0).handleClaimedPromo(claimed);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.java
index fdb2d26df8..59c0425f52 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$4.java
@@ -8,7 +8,7 @@ import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetSettingsGifting.kt */
 public final /* synthetic */ class WidgetSettingsGifting$onViewBound$4 extends k implements Function1<WidgetSettingsGiftingViewModel.OutboundPromoItem, Unit> {
     public WidgetSettingsGifting$onViewBound$4(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
-        super(1, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "handlePromoClaimClicked", "handlePromoClaimClicked(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$OutboundPromoItem;)V", 0);
+        super(1, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "handlePromoButtonClicked", "handlePromoButtonClicked(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$OutboundPromoItem;)V", 0);
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -21,6 +21,6 @@ public final /* synthetic */ class WidgetSettingsGifting$onViewBound$4 extends k
 
     public final void invoke(WidgetSettingsGiftingViewModel.OutboundPromoItem outboundPromoItem) {
         m.checkNotNullParameter(outboundPromoItem, "p1");
-        ((WidgetSettingsGiftingViewModel) this.receiver).handlePromoClaimClicked(outboundPromoItem);
+        ((WidgetSettingsGiftingViewModel) this.receiver).handlePromoButtonClicked(outboundPromoItem);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
index 88688ec5c6..039c0b5fee 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java
@@ -28,6 +28,7 @@ import com.discord.databinding.WidgetSettingsGiftingBinding;
 import com.discord.models.domain.ModelEntitlement;
 import com.discord.models.domain.ModelGift;
 import com.discord.models.domain.ModelSku;
+import com.discord.utilities.KotlinExtensionsKt;
 import com.discord.utilities.accessibility.AccessibilityUtils;
 import com.discord.utilities.analytics.Traits;
 import com.discord.utilities.billing.GooglePlayInAppSku;
@@ -45,7 +46,7 @@ import com.discord.utilities.view.text.LinkifiedTextView;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.views.premium.GiftSelectView;
-import com.discord.widgets.settings.premium.WidgetOutboundPromoTermsSheet;
+import com.discord.widgets.settings.premium.WidgetOutboundPromoTerms;
 import com.discord.widgets.settings.premium.WidgetSettingsGiftingAdapter;
 import com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel;
 import com.google.android.material.textfield.TextInputLayout;
@@ -64,6 +65,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import kotlin.Lazy;
+import kotlin.NoWhenBranchMatchedException;
+import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
@@ -107,7 +110,7 @@ public final class WidgetSettingsGifting extends AppFragment {
     }
 
     public WidgetSettingsGifting() {
-        super(2131559203);
+        super(2131559209);
         WidgetSettingsGifting$viewModel$2 widgetSettingsGifting$viewModel$2 = WidgetSettingsGifting$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsGiftingViewModel.class), new WidgetSettingsGifting$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsGifting$viewModel$2));
@@ -152,9 +155,9 @@ public final class WidgetSettingsGifting extends AppFragment {
                 z zVar = (z) withIndex.next();
                 int component1 = zVar.component1();
                 ModelEntitlement modelEntitlement2 = (ModelEntitlement) zVar.component2();
-                Map<Long, List<ModelGift>> myGifts = loaded.getMyGifts();
+                Map<Long, List<ModelGift>> myPurchasedGifts = loaded.getMyPurchasedGifts();
                 SubscriptionPlan subscriptionPlan3 = modelEntitlement2.getSubscriptionPlan();
-                List<ModelGift> list3 = myGifts.get(Long.valueOf(subscriptionPlan3 != null ? subscriptionPlan3.a() : modelEntitlement2.getSkuId()));
+                List<ModelGift> list3 = myPurchasedGifts.get(Long.valueOf(subscriptionPlan3 != null ? subscriptionPlan3.a() : modelEntitlement2.getSkuId()));
                 ModelGift modelGift = (component1 < (list3 != null ? list3.size() : -1) && list3 != null) ? list3.get(component1) : null;
                 boolean z3 = true;
                 if (modelGift == null) {
@@ -212,7 +215,7 @@ public final class WidgetSettingsGifting extends AppFragment {
             TextView textView = getBinding().r;
             m.checkNotNullExpressionValue(textView, "binding.settingsGiftingYourGiftsHeader");
             textView.setVisibility(z3 ? 0 : 8);
-            RecyclerView recyclerView = getBinding().f1927s;
+            RecyclerView recyclerView = getBinding().f1929s;
             m.checkNotNullExpressionValue(recyclerView, "binding.settingsGiftingYourGiftsRecycler");
             if (!z3) {
                 i = 8;
@@ -277,13 +280,21 @@ public final class WidgetSettingsGifting extends AppFragment {
     }
 
     private final void handleEvent(WidgetSettingsGiftingViewModel.Event event) {
+        Unit unit;
         if (event instanceof WidgetSettingsGiftingViewModel.Event.ShowPromoBottomSheet) {
-            WidgetOutboundPromoTermsSheet.Companion companion = WidgetOutboundPromoTermsSheet.Companion;
+            WidgetOutboundPromoTerms.Companion companion = WidgetOutboundPromoTerms.Companion;
             String content = ((WidgetSettingsGiftingViewModel.Event.ShowPromoBottomSheet) event).getContent();
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             companion.show(content, parentFragmentManager);
+            unit = Unit.a;
+        } else if (event instanceof WidgetSettingsGiftingViewModel.Event.ShowPromoDialog) {
+            WidgetClaimOutboundPromo.Companion.showAndRegisterForClaimResult(((WidgetSettingsGiftingViewModel.Event.ShowPromoDialog) event).getClaimStatus(), this, new WidgetSettingsGifting$handleEvent$1(this));
+            unit = Unit.a;
+        } else {
+            throw new NoWhenBranchMatchedException();
         }
+        KotlinExtensionsKt.getExhaustive(unit);
     }
 
     private final void handleGiftPurchaseEvent(WidgetSettingsGiftingViewModel.GiftPurchaseEvent giftPurchaseEvent) {
@@ -327,7 +338,7 @@ public final class WidgetSettingsGifting extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        this.chooseGiftViews = d0.t.h0.mapOf(d0.o.to(getBinding().f1926c, GooglePlayInAppSkuKt.getPremiumTier1Month()), d0.o.to(getBinding().d, GooglePlayInAppSkuKt.getPremiumTier1Year()), d0.o.to(getBinding().e, GooglePlayInAppSkuKt.getPremiumTier2Month()), d0.o.to(getBinding().f, GooglePlayInAppSkuKt.getPremiumTier2Year()));
+        this.chooseGiftViews = d0.t.h0.mapOf(d0.o.to(getBinding().f1928c, GooglePlayInAppSkuKt.getPremiumTier1Month()), d0.o.to(getBinding().d, GooglePlayInAppSkuKt.getPremiumTier1Year()), d0.o.to(getBinding().e, GooglePlayInAppSkuKt.getPremiumTier2Month()), d0.o.to(getBinding().f, GooglePlayInAppSkuKt.getPremiumTier2Year()));
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         getBinding().o.setOnClickListener(WidgetSettingsGifting$onViewBound$1.INSTANCE);
         TextInputLayout textInputLayout = getBinding().k;
@@ -335,11 +346,11 @@ public final class WidgetSettingsGifting extends AppFragment {
         ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsGifting$onViewBound$2(this), 1, null);
         getBinding().k.setErrorTextColor(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100324)));
         WidgetSettingsGiftingOutboundPromosAdapter widgetSettingsGiftingOutboundPromosAdapter = new WidgetSettingsGiftingOutboundPromosAdapter(new WidgetSettingsGifting$onViewBound$3(getViewModel()), new WidgetSettingsGifting$onViewBound$4(getViewModel()));
-        RecyclerView recyclerView = getBinding().f1927s;
+        RecyclerView recyclerView = getBinding().f1929s;
         m.checkNotNullExpressionValue(recyclerView, "binding.settingsGiftingYourGiftsRecycler");
         recyclerView.setAdapter(widgetSettingsGiftingOutboundPromosAdapter);
         this.promosAdapter = widgetSettingsGiftingOutboundPromosAdapter;
-        RecyclerView recyclerView2 = getBinding().f1927s;
+        RecyclerView recyclerView2 = getBinding().f1929s;
         WidgetSettingsGiftingOutboundPromosAdapter widgetSettingsGiftingOutboundPromosAdapter2 = this.promosAdapter;
         if (widgetSettingsGiftingOutboundPromosAdapter2 == null) {
             m.throwUninitializedPropertyAccessException("promosAdapter");
@@ -361,10 +372,10 @@ public final class WidgetSettingsGifting extends AppFragment {
         this.giftingAdapter = (WidgetSettingsGiftingAdapter) companion.configure(new WidgetSettingsGiftingAdapter(recyclerView3));
         LinkifiedTextView linkifiedTextView = getBinding().g;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.premiumTier1GiftLearnMore");
-        b.m(linkifiedTextView, 2131891963, new Object[0], WidgetSettingsGifting$onViewBound$7.INSTANCE);
+        b.l(linkifiedTextView, 2131892034, new Object[0], WidgetSettingsGifting$onViewBound$7.INSTANCE);
         LinkifiedTextView linkifiedTextView2 = getBinding().h;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.premiumTier2GiftLearnMore");
-        b.m(linkifiedTextView2, 2131892203, new Object[0], WidgetSettingsGifting$onViewBound$8.INSTANCE);
+        b.l(linkifiedTextView2, 2131892277, new Object[0], WidgetSettingsGifting$onViewBound$8.INSTANCE);
         Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("com.discord.intent.extra.EXTRA_LOCATION");
         if (!(serializableExtra instanceof Traits.Location)) {
             serializableExtra = null;
@@ -422,9 +433,9 @@ public final class WidgetSettingsGifting extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetSettingsGiftingViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetSettingsGifting.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsGifting$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<WidgetSettingsGiftingViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetSettingsGifting.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsGifting$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getViewModel().observeGiftPurchaseEvents(), this, null, 2, null), WidgetSettingsGifting.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsGifting$onViewBoundOrOnResume$2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetSettingsGifting.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsGifting$onViewBoundOrOnResume$3(this), 62, (Object) null);
         getViewModel().setOnGiftCodeResolved(WidgetSettingsGifting$onViewBoundOrOnResume$4.INSTANCE);
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java
index 71eb393f71..b940e3617c 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java
@@ -69,27 +69,27 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
             super(2131558748, widgetSettingsGiftingAdapter);
             m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363293;
-            TextView textView = (TextView) view.findViewById(2131363293);
+            int i = 2131363319;
+            TextView textView = (TextView) view.findViewById(2131363319);
             if (textView != null) {
-                i = 2131363294;
-                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363294);
+                i = 2131363320;
+                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363320);
                 if (relativeLayout != null) {
                     FrameLayout frameLayout = (FrameLayout) view;
-                    i = 2131363296;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363296);
+                    i = 2131363322;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131363322);
                     if (materialButton != null) {
-                        i = 2131363297;
-                        View findViewById = view.findViewById(2131363297);
+                        i = 2131363323;
+                        View findViewById = view.findViewById(2131363323);
                         if (findViewById != null) {
-                            i = 2131363298;
-                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363298);
+                            i = 2131363324;
+                            AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363324);
                             if (appViewFlipper != null) {
-                                i = 2131363299;
-                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363299);
+                                i = 2131363325;
+                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363325);
                                 if (materialButton2 != null) {
-                                    i = 2131363300;
-                                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363300);
+                                    i = 2131363326;
+                                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363326);
                                     if (linkifiedTextView != null) {
                                         ViewGiftEntitlementListItemBinding viewGiftEntitlementListItemBinding = new ViewGiftEntitlementListItemBinding(frameLayout, textView, relativeLayout, frameLayout, materialButton, findViewById, appViewFlipper, materialButton2, linkifiedTextView);
                                         m.checkNotNullExpressionValue(viewGiftEntitlementListItemBinding, "ViewGiftEntitlementListItemBinding.bind(itemView)");
@@ -143,8 +143,8 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                     m.checkNotNullExpressionValue(materialButton, "binding.giftEntitlementCopy");
                     View view6 = this.itemView;
                     m.checkNotNullExpressionValue(view6, "itemView");
-                    materialButton.setText(b.i(view6, areEqual ? 2131887621 : 2131887623, new Object[0], null, 4));
-                    RelativeLayout relativeLayout = this.binding.f1650c;
+                    materialButton.setText(b.i(view6, areEqual ? 2131887620 : 2131887622, new Object[0], null, 4));
+                    RelativeLayout relativeLayout = this.binding.f1647c;
                     if (areEqual) {
                         m.checkNotNullExpressionValue(context, "context");
                         i2 = DrawableCompat.getThemedDrawableRes$default(context, 2130969333, 0, 2, (Object) null);
@@ -158,7 +158,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                     CharSequence timeString = giftingUtils.getTimeString(giftItem.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context);
                     LinkifiedTextView linkifiedTextView = this.binding.i;
                     m.checkNotNullExpressionValue(linkifiedTextView, "binding.giftEntitlementRevoke");
-                    b.m(linkifiedTextView, 2131889081, new Object[]{timeString}, new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4(this, giftItem));
+                    b.l(linkifiedTextView, 2131889085, new Object[]{timeString}, new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4(this, giftItem));
                     TextView textView = this.binding.b;
                     m.checkNotNullExpressionValue(textView, "binding.giftEntitlementCode");
                     textView.setText(giftingUtils.generateGiftUrl(giftItem.getGift().getCode()));
@@ -412,17 +412,17 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
             super(2131558750, widgetSettingsGiftingAdapter);
             m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131363309;
-            ImageView imageView = (ImageView) view.findViewById(2131363309);
+            int i = 2131363335;
+            ImageView imageView = (ImageView) view.findViewById(2131363335);
             if (imageView != null) {
-                i = 2131363310;
-                TextView textView = (TextView) view.findViewById(2131363310);
+                i = 2131363336;
+                TextView textView = (TextView) view.findViewById(2131363336);
                 if (textView != null) {
-                    i = 2131363311;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363311);
+                    i = 2131363337;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363337);
                     if (simpleDraweeView != null) {
-                        i = 2131363312;
-                        TextView textView2 = (TextView) view.findViewById(2131363312);
+                        i = 2131363338;
+                        TextView textView2 = (TextView) view.findViewById(2131363338);
                         if (textView2 != null) {
                             ViewGiftSkuListItemBinding viewGiftSkuListItemBinding = new ViewGiftSkuListItemBinding((CardView) view, imageView, textView, simpleDraweeView, textView2);
                             m.checkNotNullExpressionValue(viewGiftSkuListItemBinding, "ViewGiftSkuListItemBinding.bind(itemView)");
@@ -453,7 +453,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                 TextView textView2 = this.binding.e;
                 m.checkNotNullExpressionValue(textView2, "binding.giftSkuName");
                 if (from != null) {
-                    Pair pair = from.getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131889093, 2131755128) : new Pair(2131889094, 2131755129);
+                    Pair pair = from.getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131889097, 2131755128) : new Pair(2131889098, 2131755129);
                     int intValue = ((Number) pair.component1()).intValue();
                     int intValue2 = ((Number) pair.component2()).intValue();
                     View view = this.itemView;
@@ -463,10 +463,10 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple<
                     charSequence = giftItem.getSku().getName();
                 }
                 textView2.setText(charSequence);
-                TextView textView3 = this.binding.f1652c;
+                TextView textView3 = this.binding.f1649c;
                 m.checkNotNullExpressionValue(textView3, "binding.giftSkuCopies");
                 textView3.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755125, giftItem.getCopies().intValue(), giftItem.getCopies()));
-                this.binding.b.setImageResource(giftItem.getExpanded().booleanValue() ? 2131231511 : 2131231515);
+                this.binding.b.setImageResource(giftItem.getExpanded().booleanValue() ? 2131231517 : 2131231521);
                 PremiumUtils premiumUtils = PremiumUtils.INSTANCE;
                 if (premiumUtils.isNitroSku(giftItem.getSku())) {
                     this.binding.d.setImageResource(premiumUtils.getNitroGiftIcon(giftItem.getSku()));
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java
index 79ae464005..0a5a9dfedf 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java
@@ -1,6 +1,5 @@
 package com.discord.widgets.settings.premium;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,12 +8,12 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.l.b;
-import c.d.b.a.a;
 import com.discord.databinding.ViewGiftOutboundPromoListItemBinding;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.time.TimeUtils;
 import com.discord.utilities.view.recycler.SimpleItemCallback;
+import com.discord.widgets.settings.premium.ClaimStatus;
 import com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.android.material.button.MaterialButton;
@@ -27,7 +26,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapter<WidgetSettingsGiftingViewModel.OutboundPromoItem, OutboundPromoViewHolder> {
     public static final Companion Companion = new Companion(null);
     private static final SimpleItemCallback<WidgetSettingsGiftingViewModel.OutboundPromoItem> DIFF_CALLBACK = new SimpleItemCallback<>(WidgetSettingsGiftingOutboundPromosAdapter$Companion$DIFF_CALLBACK$1.INSTANCE);
-    private final Function1<WidgetSettingsGiftingViewModel.OutboundPromoItem, Unit> onClaimClick;
+    private final Function1<WidgetSettingsGiftingViewModel.OutboundPromoItem, Unit> onButtonClick;
     private final Function1<WidgetSettingsGiftingViewModel.OutboundPromoItem, Unit> onMoreDetailsClick;
 
     /* compiled from: WidgetSettingsGiftingOutboundPromosAdapter.kt */
@@ -59,20 +58,20 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
             this.onMoreDetailsClick = function1;
             this.onButtonClick = function12;
             View view = this.itemView;
-            int i = 2131363287;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363287);
+            int i = 2131363313;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363313);
             if (materialButton != null) {
-                i = 2131363288;
-                TextView textView = (TextView) view.findViewById(2131363288);
+                i = 2131363314;
+                TextView textView = (TextView) view.findViewById(2131363314);
                 if (textView != null) {
-                    i = 2131363289;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363289);
+                    i = 2131363315;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363315);
                     if (simpleDraweeView != null) {
-                        i = 2131363290;
-                        TextView textView2 = (TextView) view.findViewById(2131363290);
+                        i = 2131363316;
+                        TextView textView2 = (TextView) view.findViewById(2131363316);
                         if (textView2 != null) {
-                            i = 2131363291;
-                            TextView textView3 = (TextView) view.findViewById(2131363291);
+                            i = 2131363317;
+                            TextView textView3 = (TextView) view.findViewById(2131363317);
                             if (textView3 != null) {
                                 ViewGiftOutboundPromoListItemBinding viewGiftOutboundPromoListItemBinding = new ViewGiftOutboundPromoListItemBinding((MaterialCardView) view, materialButton, textView, simpleDraweeView, textView2, textView3);
                                 textView2.setOnClickListener(new WidgetSettingsGiftingOutboundPromosAdapter$OutboundPromoViewHolder$$special$$inlined$also$lambda$1(this));
@@ -108,7 +107,6 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
             outboundPromoViewHolder.boundItem = outboundPromoItem;
         }
 
-        @SuppressLint({"SetTextI18n"})
         public final void bindTo(WidgetSettingsGiftingViewModel.OutboundPromoItem outboundPromoItem) {
             m.checkNotNullParameter(outboundPromoItem, "item");
             this.boundItem = outboundPromoItem;
@@ -118,35 +116,35 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
             TextView textView = this.binding.f;
             m.checkNotNullExpressionValue(textView, "binding.giftPromoTitle");
             textView.setText(outboundPromoItem.getTitle());
-            WidgetSettingsGiftingViewModel.ClaimStatus claimStatus = outboundPromoItem.getClaimStatus();
-            if (claimStatus instanceof WidgetSettingsGiftingViewModel.ClaimStatus.Unclaimed) {
-                long f = ((WidgetSettingsGiftingViewModel.ClaimStatus.Unclaimed) outboundPromoItem.getClaimStatus()).getClaimBy().f();
+            ClaimStatus claimStatus = outboundPromoItem.getClaimStatus();
+            if (claimStatus instanceof ClaimStatus.Unclaimed) {
+                long f = ((ClaimStatus.Unclaimed) outboundPromoItem.getClaimStatus()).getClaimBy().f();
                 TimeUtils timeUtils = TimeUtils.INSTANCE;
                 View view = this.itemView;
                 m.checkNotNullExpressionValue(view, "itemView");
                 Context context = view.getContext();
                 m.checkNotNullExpressionValue(context, "itemView.context");
                 String renderUtcDate = timeUtils.renderUtcDate(f, context, 1);
-                TextView textView2 = this.binding.f1651c;
+                TextView textView2 = this.binding.f1648c;
                 m.checkNotNullExpressionValue(textView2, "binding.giftPromoDescription");
-                textView2.setText("Claim your code before " + renderUtcDate);
+                b.m(textView2, 2131891293, new Object[]{renderUtcDate}, null, 4);
                 MaterialButton materialButton = this.binding.b;
                 m.checkNotNullExpressionValue(materialButton, "binding.giftPromoButton");
-                materialButton.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131892426, new Object[0], null, 4));
-            } else if (claimStatus instanceof WidgetSettingsGiftingViewModel.ClaimStatus.Claimed) {
-                long f2 = ((WidgetSettingsGiftingViewModel.ClaimStatus.Claimed) outboundPromoItem.getClaimStatus()).getRedeemBy().f();
+                b.m(materialButton, 2131892506, new Object[0], null, 4);
+            } else if (claimStatus instanceof ClaimStatus.Claimed) {
+                long f2 = ((ClaimStatus.Claimed) outboundPromoItem.getClaimStatus()).getRedeemBy().f();
                 TimeUtils timeUtils2 = TimeUtils.INSTANCE;
                 View view2 = this.itemView;
                 m.checkNotNullExpressionValue(view2, "itemView");
                 Context context2 = view2.getContext();
                 m.checkNotNullExpressionValue(context2, "itemView.context");
                 String renderUtcDate2 = timeUtils2.renderUtcDate(f2, context2, 1);
-                TextView textView3 = this.binding.f1651c;
+                TextView textView3 = this.binding.f1648c;
                 m.checkNotNullExpressionValue(textView3, "binding.giftPromoDescription");
-                textView3.setText("Redeem your code before " + renderUtcDate2);
+                b.m(textView3, 2131891292, new Object[]{renderUtcDate2}, null, 4);
                 MaterialButton materialButton2 = this.binding.b;
                 m.checkNotNullExpressionValue(materialButton2, "binding.giftPromoButton");
-                materialButton2.setText("See Code");
+                b.m(materialButton2, 2131891777, new Object[0], null, 4);
             }
         }
     }
@@ -158,9 +156,9 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
     public WidgetSettingsGiftingOutboundPromosAdapter(Function1<? super WidgetSettingsGiftingViewModel.OutboundPromoItem, Unit> function1, Function1<? super WidgetSettingsGiftingViewModel.OutboundPromoItem, Unit> function12) {
         super(DIFF_CALLBACK);
         m.checkNotNullParameter(function1, "onMoreDetailsClick");
-        m.checkNotNullParameter(function12, "onClaimClick");
+        m.checkNotNullParameter(function12, "onButtonClick");
         this.onMoreDetailsClick = function1;
-        this.onClaimClick = function12;
+        this.onButtonClick = function12;
     }
 
     public void onBindViewHolder(OutboundPromoViewHolder outboundPromoViewHolder, int i) {
@@ -173,6 +171,6 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte
     @Override // androidx.recyclerview.widget.RecyclerView.Adapter
     public OutboundPromoViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
-        return new OutboundPromoViewHolder(viewGroup, this.onMoreDetailsClick, this.onClaimClick);
+        return new OutboundPromoViewHolder(viewGroup, this.onMoreDetailsClick, this.onButtonClick);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$2.java
index 0ba08872c5..e7e45db8d6 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$2.java
@@ -1,32 +1,16 @@
 package com.discord.widgets.settings.premium;
 
-import com.discord.models.domain.ModelGift;
-import com.discord.stores.StoreEntitlements;
-import com.discord.stores.StoreOutboundPromotions;
-import com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel;
-import d0.z.d.k;
+import com.discord.models.user.MeUser;
+import com.discord.utilities.user.UserUtils;
 import d0.z.d.m;
-import java.util.List;
-import kotlin.jvm.functions.Function3;
+import j0.k.b;
 /* compiled from: WidgetSettingsGiftingViewModel.kt */
-public final /* synthetic */ class WidgetSettingsGiftingViewModel$Companion$observeStores$2 extends k implements Function3<StoreEntitlements.State, List<? extends ModelGift>, StoreOutboundPromotions.State, WidgetSettingsGiftingViewModel.StoreState> {
+public final class WidgetSettingsGiftingViewModel$Companion$observeStores$2<T, R> implements b<MeUser, Boolean> {
     public static final WidgetSettingsGiftingViewModel$Companion$observeStores$2 INSTANCE = new WidgetSettingsGiftingViewModel$Companion$observeStores$2();
 
-    public WidgetSettingsGiftingViewModel$Companion$observeStores$2() {
-        super(3, WidgetSettingsGiftingViewModel.StoreState.class, "<init>", "<init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;Lcom/discord/stores/StoreOutboundPromotions$State;)V", 0);
-    }
-
-    public final WidgetSettingsGiftingViewModel.StoreState invoke(StoreEntitlements.State state, List<ModelGift> list, StoreOutboundPromotions.State state2) {
-        m.checkNotNullParameter(state, "p1");
-        m.checkNotNullParameter(list, "p2");
-        m.checkNotNullParameter(state2, "p3");
-        return new WidgetSettingsGiftingViewModel.StoreState(state, list, state2);
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function3
-    public /* bridge */ /* synthetic */ WidgetSettingsGiftingViewModel.StoreState invoke(StoreEntitlements.State state, List<? extends ModelGift> list, StoreOutboundPromotions.State state2) {
-        return invoke(state, (List<ModelGift>) list, state2);
+    public final Boolean call(MeUser meUser) {
+        UserUtils userUtils = UserUtils.INSTANCE;
+        m.checkNotNullExpressionValue(meUser, "it");
+        return Boolean.valueOf(userUtils.isPremium(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$3.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$3.java
new file mode 100644
index 0000000000..f9962c798f
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$Companion$observeStores$3.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.models.domain.ModelGift;
+import com.discord.stores.StoreEntitlements;
+import com.discord.stores.StoreOutboundPromotions;
+import com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel;
+import d0.z.d.k;
+import d0.z.d.m;
+import java.util.List;
+import kotlin.jvm.functions.Function4;
+/* compiled from: WidgetSettingsGiftingViewModel.kt */
+public final /* synthetic */ class WidgetSettingsGiftingViewModel$Companion$observeStores$3 extends k implements Function4<StoreEntitlements.State, List<? extends ModelGift>, StoreOutboundPromotions.State, Boolean, WidgetSettingsGiftingViewModel.StoreState> {
+    public static final WidgetSettingsGiftingViewModel$Companion$observeStores$3 INSTANCE = new WidgetSettingsGiftingViewModel$Companion$observeStores$3();
+
+    public WidgetSettingsGiftingViewModel$Companion$observeStores$3() {
+        super(4, WidgetSettingsGiftingViewModel.StoreState.class, "<init>", "<init>(Lcom/discord/stores/StoreEntitlements$State;Ljava/util/List;Lcom/discord/stores/StoreOutboundPromotions$State;Z)V", 0);
+    }
+
+    public final WidgetSettingsGiftingViewModel.StoreState invoke(StoreEntitlements.State state, List<ModelGift> list, StoreOutboundPromotions.State state2, boolean z2) {
+        m.checkNotNullParameter(state, "p1");
+        m.checkNotNullParameter(list, "p2");
+        m.checkNotNullParameter(state2, "p3");
+        return new WidgetSettingsGiftingViewModel.StoreState(state, list, state2, z2);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function4
+    public /* bridge */ /* synthetic */ WidgetSettingsGiftingViewModel.StoreState invoke(StoreEntitlements.State state, List<? extends ModelGift> list, StoreOutboundPromotions.State state2, Boolean bool) {
+        return invoke(state, (List<ModelGift>) list, state2, bool.booleanValue());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1.java
new file mode 100644
index 0000000000..4e747b03ac
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1.java
@@ -0,0 +1,14 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.api.premium.ClaimedOutboundPromotion;
+import d0.t.n;
+import j0.k.b;
+import java.util.List;
+/* compiled from: WidgetSettingsGiftingViewModel.kt */
+public final class WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1<T, R> implements b<Throwable, List<? extends ClaimedOutboundPromotion>> {
+    public static final WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1 INSTANCE = new WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1();
+
+    public final List<ClaimedOutboundPromotion> call(Throwable th) {
+        return n.emptyList();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$2.java
new file mode 100644
index 0000000000..c8702b8baa
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$2.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.premium;
+
+import com.discord.api.premium.ClaimedOutboundPromotion;
+import d0.z.d.k;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.subjects.BehaviorSubject;
+/* compiled from: WidgetSettingsGiftingViewModel.kt */
+public final /* synthetic */ class WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$2 extends k implements Function1<List<? extends ClaimedOutboundPromotion>, Unit> {
+    public WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$2(BehaviorSubject behaviorSubject) {
+        super(1, behaviorSubject, BehaviorSubject.class, "onNext", "onNext(Ljava/lang/Object;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends ClaimedOutboundPromotion> list) {
+        invoke((List<ClaimedOutboundPromotion>) list);
+        return Unit.a;
+    }
+
+    public final void invoke(List<ClaimedOutboundPromotion> list) {
+        ((BehaviorSubject) this.receiver).onNext(list);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$sam$rx_functions_Func3$0.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$sam$rx_functions_Func3$0.java
deleted file mode 100644
index bb4941a984..0000000000
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$sam$rx_functions_Func3$0.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.discord.widgets.settings.premium;
-
-import kotlin.jvm.functions.Function3;
-import rx.functions.Func3;
-/* compiled from: WidgetSettingsGiftingViewModel.kt */
-public final class WidgetSettingsGiftingViewModel$sam$rx_functions_Func3$0 implements Func3 {
-    private final /* synthetic */ Function3 function;
-
-    public WidgetSettingsGiftingViewModel$sam$rx_functions_Func3$0(Function3 function3) {
-        this.function = function3;
-    }
-
-    @Override // rx.functions.Func3
-    public final /* synthetic */ Object call(Object obj, Object obj2, Object obj3) {
-        return this.function.invoke(obj, obj2, obj3);
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$sam$rx_functions_Func4$0.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$sam$rx_functions_Func4$0.java
new file mode 100644
index 0000000000..8733c72e30
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$sam$rx_functions_Func4$0.java
@@ -0,0 +1,17 @@
+package com.discord.widgets.settings.premium;
+
+import kotlin.jvm.functions.Function4;
+import rx.functions.Func4;
+/* compiled from: WidgetSettingsGiftingViewModel.kt */
+public final class WidgetSettingsGiftingViewModel$sam$rx_functions_Func4$0 implements Func4 {
+    private final /* synthetic */ Function4 function;
+
+    public WidgetSettingsGiftingViewModel$sam$rx_functions_Func4$0(Function4 function4) {
+        this.function = function4;
+    }
+
+    @Override // rx.functions.Func4
+    public final /* synthetic */ Object call(Object obj, Object obj2, Object obj3, Object obj4) {
+        return this.function.invoke(obj, obj2, obj3, obj4);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.java
index e6ac5f16de..3926e9d6a7 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.java
@@ -1,12 +1,12 @@
 package com.discord.widgets.settings.premium;
 
+import a0.a.a.b;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import androidx.annotation.StringRes;
 import c.d.b.a.a;
 import com.discord.api.premium.ClaimedOutboundPromotion;
 import com.discord.api.premium.OutboundPromotion;
-import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.app.AppComponent;
 import com.discord.app.AppViewModel;
 import com.discord.models.domain.ModelEntitlement;
@@ -16,31 +16,33 @@ import com.discord.stores.StoreGifting;
 import com.discord.stores.StoreGooglePlayPurchases;
 import com.discord.stores.StoreOutboundPromotions;
 import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
 import com.discord.stores.StoreUserSettingsSystem;
 import com.discord.utilities.billing.GooglePlayBillingManager;
 import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.widgets.settings.premium.ClaimStatus;
 import d0.t.h0;
 import d0.t.n;
 import d0.t.n0;
+import d0.t.o;
 import d0.t.u;
 import d0.z.d.k;
 import d0.z.d.m;
-import j0.k.b;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import kotlin.NoWhenBranchMatchedException;
-import kotlin.Pair;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.functions.Function2;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import rx.Observable;
-import rx.functions.Func2;
-import rx.functions.Func3;
+import rx.functions.Action1;
+import rx.functions.Func4;
 import rx.subjects.BehaviorSubject;
 import rx.subjects.PublishSubject;
 import rx.subscriptions.CompositeSubscription;
@@ -51,53 +53,18 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
     private final PublishSubject<Event> eventSubject;
     private final PublishSubject<GiftPurchaseEvent> giftPurchaseEventSubject;
     private Function1<? super String, Unit> onGiftCodeResolved;
-    private final BehaviorSubject<StoreData> storeDataSubject;
+    private AtomicBoolean shouldCheckClaimedPromos;
     private final StoreEntitlements storeEntitlements;
     private final StoreGifting storeGifting;
     private final StoreOutboundPromotions storeOutboundPromotions;
+    private final BehaviorSubject<StoreState> storeStateSubject;
     private final StoreUserSettingsSystem storeUserSettingsSystem;
     private final CompositeSubscription subscriptions;
 
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
     /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$1  reason: invalid class name */
-    public static final class AnonymousClass1<T, R> implements b<StoreState, StoreData> {
-        public final /* synthetic */ WidgetSettingsGiftingViewModel this$0;
-
+    public static final /* synthetic */ class AnonymousClass1 extends k implements Function1<StoreGooglePlayPurchases.Event, Unit> {
         public AnonymousClass1(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
-            this.this$0 = widgetSettingsGiftingViewModel;
-        }
-
-        public final StoreData call(StoreState storeState) {
-            WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel = this.this$0;
-            m.checkNotNullExpressionValue(storeState, "it");
-            return WidgetSettingsGiftingViewModel.access$storeStateToStoreData(widgetSettingsGiftingViewModel, storeState);
-        }
-    }
-
-    /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$2  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass2 extends k implements Function1<StoreData, Unit> {
-        public AnonymousClass2(BehaviorSubject behaviorSubject) {
-            super(1, behaviorSubject, BehaviorSubject.class, "onNext", "onNext(Ljava/lang/Object;)V", 0);
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(StoreData storeData) {
-            invoke(storeData);
-            return Unit.a;
-        }
-
-        public final void invoke(StoreData storeData) {
-            ((BehaviorSubject) this.receiver).onNext(storeData);
-        }
-    }
-
-    /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$3  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass3 extends k implements Function1<StoreGooglePlayPurchases.Event, Unit> {
-        public AnonymousClass3(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
             super(1, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "handleGooglePlayPurchaseEvent", "handleGooglePlayPurchaseEvent(Lcom/discord/stores/StoreGooglePlayPurchases$Event;)V", 0);
         }
 
@@ -116,9 +83,9 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
     }
 
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$4  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass4 extends k implements Function1<StoreGooglePlayPurchases.QueryState, Unit> {
-        public AnonymousClass4(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
+    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$2  reason: invalid class name */
+    public static final /* synthetic */ class AnonymousClass2 extends k implements Function1<StoreGooglePlayPurchases.QueryState, Unit> {
+        public AnonymousClass2(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
             super(1, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "handleGooglePlayQueryStateUpdate", "handleGooglePlayQueryStateUpdate(Lcom/discord/stores/StoreGooglePlayPurchases$QueryState;)V", 0);
         }
 
@@ -137,215 +104,78 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
     }
 
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$5  reason: invalid class name */
-    public static final class AnonymousClass5<T, R> implements b<Throwable, List<? extends ClaimedOutboundPromotion>> {
-        public static final AnonymousClass5 INSTANCE = new AnonymousClass5();
+    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$3  reason: invalid class name */
+    public static final class AnonymousClass3<T> implements Action1<StoreState> {
+        public final /* synthetic */ WidgetSettingsGiftingViewModel this$0;
 
-        public final List<ClaimedOutboundPromotion> call(Throwable th) {
-            return n.emptyList();
+        public AnonymousClass3(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
+            this.this$0 = widgetSettingsGiftingViewModel;
+        }
+
+        public final void call(StoreState storeState) {
+            WidgetSettingsGiftingViewModel.access$maybeCheckClaimedPromos(this.this$0, storeState.isUserPremium());
         }
     }
 
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$6  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass6 extends k implements Function1<List<? extends ClaimedOutboundPromotion>, Unit> {
-        public AnonymousClass6(BehaviorSubject behaviorSubject) {
+    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$4  reason: invalid class name */
+    public static final /* synthetic */ class AnonymousClass4 extends k implements Function1<StoreState, Unit> {
+        public AnonymousClass4(BehaviorSubject behaviorSubject) {
             super(1, behaviorSubject, BehaviorSubject.class, "onNext", "onNext(Ljava/lang/Object;)V", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(List<? extends ClaimedOutboundPromotion> list) {
-            invoke((List<ClaimedOutboundPromotion>) list);
+        public /* bridge */ /* synthetic */ Unit invoke(StoreState storeState) {
+            invoke(storeState);
             return Unit.a;
         }
 
-        public final void invoke(List<ClaimedOutboundPromotion> list) {
-            ((BehaviorSubject) this.receiver).onNext(list);
+        public final void invoke(StoreState storeState) {
+            ((BehaviorSubject) this.receiver).onNext(storeState);
         }
     }
 
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$7  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass7 extends k implements Function2<StoreData, List<? extends ClaimedOutboundPromotion>, Pair<? extends StoreData, ? extends List<? extends ClaimedOutboundPromotion>>> {
-        public static final AnonymousClass7 INSTANCE = new AnonymousClass7();
+    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$5  reason: invalid class name */
+    public static final /* synthetic */ class AnonymousClass5 extends k implements Function2<StoreState, List<? extends ClaimedOutboundPromotion>, GiftAndPromoData> {
+        public AnonymousClass5(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
+            super(2, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "combineData", "combineData(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$StoreState;Ljava/util/List;)Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$GiftAndPromoData;", 0);
+        }
 
-        public AnonymousClass7() {
-            super(2, Pair.class, "<init>", "<init>(Ljava/lang/Object;Ljava/lang/Object;)V", 0);
+        public final GiftAndPromoData invoke(StoreState storeState, List<ClaimedOutboundPromotion> list) {
+            m.checkNotNullParameter(storeState, "p1");
+            m.checkNotNullParameter(list, "p2");
+            return WidgetSettingsGiftingViewModel.access$combineData((WidgetSettingsGiftingViewModel) this.receiver, storeState, list);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
         @Override // kotlin.jvm.functions.Function2
-        public /* bridge */ /* synthetic */ Pair<? extends StoreData, ? extends List<? extends ClaimedOutboundPromotion>> invoke(StoreData storeData, List<? extends ClaimedOutboundPromotion> list) {
-            return invoke(storeData, (List<ClaimedOutboundPromotion>) list);
-        }
-
-        public final Pair<StoreData, List<ClaimedOutboundPromotion>> invoke(StoreData storeData, List<ClaimedOutboundPromotion> list) {
-            return new Pair<>(storeData, list);
+        public /* bridge */ /* synthetic */ GiftAndPromoData invoke(StoreState storeState, List<? extends ClaimedOutboundPromotion> list) {
+            return invoke(storeState, (List<ClaimedOutboundPromotion>) list);
         }
     }
 
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$8  reason: invalid class name */
-    public static final /* synthetic */ class AnonymousClass8 extends k implements Function1<Pair<? extends StoreData, ? extends List<? extends ClaimedOutboundPromotion>>, Unit> {
-        public AnonymousClass8(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
-            super(1, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "handleAsyncData", "handleAsyncData(Lkotlin/Pair;)V", 0);
+    /* renamed from: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$6  reason: invalid class name */
+    public static final /* synthetic */ class AnonymousClass6 extends k implements Function1<GiftAndPromoData, Unit> {
+        public AnonymousClass6(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
+            super(1, widgetSettingsGiftingViewModel, WidgetSettingsGiftingViewModel.class, "handleAsyncData", "handleAsyncData(Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$GiftAndPromoData;)V", 0);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(Pair<? extends StoreData, ? extends List<? extends ClaimedOutboundPromotion>> pair) {
-            invoke((Pair<StoreData, ? extends List<ClaimedOutboundPromotion>>) pair);
+        public /* bridge */ /* synthetic */ Unit invoke(GiftAndPromoData giftAndPromoData) {
+            invoke(giftAndPromoData);
             return Unit.a;
         }
 
-        public final void invoke(Pair<StoreData, ? extends List<ClaimedOutboundPromotion>> pair) {
-            m.checkNotNullParameter(pair, "p1");
-            WidgetSettingsGiftingViewModel.access$handleAsyncData((WidgetSettingsGiftingViewModel) this.receiver, pair);
-        }
-    }
-
-    /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    public static abstract class ClaimStatus {
-
-        /* compiled from: WidgetSettingsGiftingViewModel.kt */
-        public static final class Claimed extends ClaimStatus {
-            private final String code;
-            private final UtcDateTime redeemBy;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Claimed(UtcDateTime utcDateTime, String str) {
-                super(null);
-                m.checkNotNullParameter(utcDateTime, "redeemBy");
-                m.checkNotNullParameter(str, "code");
-                this.redeemBy = utcDateTime;
-                this.code = str;
-            }
-
-            public static /* synthetic */ Claimed copy$default(Claimed claimed, UtcDateTime utcDateTime, String str, int i, Object obj) {
-                if ((i & 1) != 0) {
-                    utcDateTime = claimed.redeemBy;
-                }
-                if ((i & 2) != 0) {
-                    str = claimed.code;
-                }
-                return claimed.copy(utcDateTime, str);
-            }
-
-            public final UtcDateTime component1() {
-                return this.redeemBy;
-            }
-
-            public final String component2() {
-                return this.code;
-            }
-
-            public final Claimed copy(UtcDateTime utcDateTime, String str) {
-                m.checkNotNullParameter(utcDateTime, "redeemBy");
-                m.checkNotNullParameter(str, "code");
-                return new Claimed(utcDateTime, str);
-            }
-
-            public boolean equals(Object obj) {
-                if (this == obj) {
-                    return true;
-                }
-                if (!(obj instanceof Claimed)) {
-                    return false;
-                }
-                Claimed claimed = (Claimed) obj;
-                return m.areEqual(this.redeemBy, claimed.redeemBy) && m.areEqual(this.code, claimed.code);
-            }
-
-            public final String getCode() {
-                return this.code;
-            }
-
-            public final UtcDateTime getRedeemBy() {
-                return this.redeemBy;
-            }
-
-            public int hashCode() {
-                UtcDateTime utcDateTime = this.redeemBy;
-                int i = 0;
-                int hashCode = (utcDateTime != null ? utcDateTime.hashCode() : 0) * 31;
-                String str = this.code;
-                if (str != null) {
-                    i = str.hashCode();
-                }
-                return hashCode + i;
-            }
-
-            public String toString() {
-                StringBuilder L = a.L("Claimed(redeemBy=");
-                L.append(this.redeemBy);
-                L.append(", code=");
-                return a.D(L, this.code, ")");
-            }
-        }
-
-        /* compiled from: WidgetSettingsGiftingViewModel.kt */
-        public static final class Unclaimed extends ClaimStatus {
-            private final UtcDateTime claimBy;
-
-            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Unclaimed(UtcDateTime utcDateTime) {
-                super(null);
-                m.checkNotNullParameter(utcDateTime, "claimBy");
-                this.claimBy = utcDateTime;
-            }
-
-            public static /* synthetic */ Unclaimed copy$default(Unclaimed unclaimed, UtcDateTime utcDateTime, int i, Object obj) {
-                if ((i & 1) != 0) {
-                    utcDateTime = unclaimed.claimBy;
-                }
-                return unclaimed.copy(utcDateTime);
-            }
-
-            public final UtcDateTime component1() {
-                return this.claimBy;
-            }
-
-            public final Unclaimed copy(UtcDateTime utcDateTime) {
-                m.checkNotNullParameter(utcDateTime, "claimBy");
-                return new Unclaimed(utcDateTime);
-            }
-
-            public boolean equals(Object obj) {
-                if (this != obj) {
-                    return (obj instanceof Unclaimed) && m.areEqual(this.claimBy, ((Unclaimed) obj).claimBy);
-                }
-                return true;
-            }
-
-            public final UtcDateTime getClaimBy() {
-                return this.claimBy;
-            }
-
-            public int hashCode() {
-                UtcDateTime utcDateTime = this.claimBy;
-                if (utcDateTime != null) {
-                    return utcDateTime.hashCode();
-                }
-                return 0;
-            }
-
-            public String toString() {
-                StringBuilder L = a.L("Unclaimed(claimBy=");
-                L.append(this.claimBy);
-                L.append(")");
-                return L.toString();
-            }
-        }
-
-        private ClaimStatus() {
-        }
-
-        public /* synthetic */ ClaimStatus(DefaultConstructorMarker defaultConstructorMarker) {
-            this();
+        public final void invoke(GiftAndPromoData giftAndPromoData) {
+            m.checkNotNullParameter(giftAndPromoData, "p1");
+            WidgetSettingsGiftingViewModel.access$handleAsyncData((WidgetSettingsGiftingViewModel) this.receiver, giftAndPromoData);
         }
     }
 
@@ -368,15 +198,16 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         private final Observable<StoreState> observeStores() {
             StoreStream.Companion companion = StoreStream.Companion;
             Observable<StoreEntitlements.State> observeEntitlementState = companion.getEntitlements().observeEntitlementState();
-            Observable Z = companion.getUsers().observeMeId().Z(WidgetSettingsGiftingViewModel$Companion$observeStores$1.INSTANCE);
+            Observable Y = companion.getUsers().observeMeId().Y(WidgetSettingsGiftingViewModel$Companion$observeStores$1.INSTANCE);
             Observable<StoreOutboundPromotions.State> observeState = companion.getOutboundPromotions().observeState();
-            WidgetSettingsGiftingViewModel$Companion$observeStores$2 widgetSettingsGiftingViewModel$Companion$observeStores$2 = WidgetSettingsGiftingViewModel$Companion$observeStores$2.INSTANCE;
-            if (widgetSettingsGiftingViewModel$Companion$observeStores$2 != null) {
-                widgetSettingsGiftingViewModel$Companion$observeStores$2 = new WidgetSettingsGiftingViewModel$sam$rx_functions_Func3$0(widgetSettingsGiftingViewModel$Companion$observeStores$2);
+            Observable F = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).F(WidgetSettingsGiftingViewModel$Companion$observeStores$2.INSTANCE);
+            WidgetSettingsGiftingViewModel$Companion$observeStores$3 widgetSettingsGiftingViewModel$Companion$observeStores$3 = WidgetSettingsGiftingViewModel$Companion$observeStores$3.INSTANCE;
+            if (widgetSettingsGiftingViewModel$Companion$observeStores$3 != null) {
+                widgetSettingsGiftingViewModel$Companion$observeStores$3 = new WidgetSettingsGiftingViewModel$sam$rx_functions_Func4$0(widgetSettingsGiftingViewModel$Companion$observeStores$3);
             }
-            Observable<StoreState> s2 = Observable.i(observeEntitlementState, Z, observeState, (Func3) widgetSettingsGiftingViewModel$Companion$observeStores$2).s();
-            m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-            return s2;
+            Observable<StoreState> r = Observable.h(observeEntitlementState, Y, observeState, F, (Func4) widgetSettingsGiftingViewModel$Companion$observeStores$3).r();
+            m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+            return r;
         }
     }
 
@@ -434,6 +265,60 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             }
         }
 
+        /* compiled from: WidgetSettingsGiftingViewModel.kt */
+        public static final class ShowPromoDialog extends Event {
+            private final ClaimStatus claimStatus;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public ShowPromoDialog(ClaimStatus claimStatus) {
+                super(null);
+                m.checkNotNullParameter(claimStatus, "claimStatus");
+                this.claimStatus = claimStatus;
+            }
+
+            public static /* synthetic */ ShowPromoDialog copy$default(ShowPromoDialog showPromoDialog, ClaimStatus claimStatus, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    claimStatus = showPromoDialog.claimStatus;
+                }
+                return showPromoDialog.copy(claimStatus);
+            }
+
+            public final ClaimStatus component1() {
+                return this.claimStatus;
+            }
+
+            public final ShowPromoDialog copy(ClaimStatus claimStatus) {
+                m.checkNotNullParameter(claimStatus, "claimStatus");
+                return new ShowPromoDialog(claimStatus);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof ShowPromoDialog) && m.areEqual(this.claimStatus, ((ShowPromoDialog) obj).claimStatus);
+                }
+                return true;
+            }
+
+            public final ClaimStatus getClaimStatus() {
+                return this.claimStatus;
+            }
+
+            public int hashCode() {
+                ClaimStatus claimStatus = this.claimStatus;
+                if (claimStatus != null) {
+                    return claimStatus.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder L = a.L("ShowPromoDialog(claimStatus=");
+                L.append(this.claimStatus);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
         private Event() {
         }
 
@@ -442,6 +327,141 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
     }
 
+    /* compiled from: WidgetSettingsGiftingViewModel.kt */
+    public static final class GiftAndPromoData {
+        private final List<ClaimedOutboundPromotion> claimedOutboundPromotions;
+        private final StoreEntitlements.State entitlementState;
+        private final Map<Long, List<ModelGift>> myPurchasedGifts;
+        private final StoreOutboundPromotions.State outboundPromoState;
+        private final ResolvingGiftState resolvingGiftState;
+
+        /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.List<com.discord.models.domain.ModelGift>> */
+        /* JADX WARN: Multi-variable type inference failed */
+        public GiftAndPromoData(StoreEntitlements.State state, ResolvingGiftState resolvingGiftState, Map<Long, ? extends List<ModelGift>> map, StoreOutboundPromotions.State state2, List<ClaimedOutboundPromotion> list) {
+            m.checkNotNullParameter(state, "entitlementState");
+            m.checkNotNullParameter(resolvingGiftState, "resolvingGiftState");
+            m.checkNotNullParameter(map, "myPurchasedGifts");
+            m.checkNotNullParameter(state2, "outboundPromoState");
+            m.checkNotNullParameter(list, "claimedOutboundPromotions");
+            this.entitlementState = state;
+            this.resolvingGiftState = resolvingGiftState;
+            this.myPurchasedGifts = map;
+            this.outboundPromoState = state2;
+            this.claimedOutboundPromotions = list;
+        }
+
+        /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$GiftAndPromoData */
+        /* JADX WARN: Multi-variable type inference failed */
+        public static /* synthetic */ GiftAndPromoData copy$default(GiftAndPromoData giftAndPromoData, StoreEntitlements.State state, ResolvingGiftState resolvingGiftState, Map map, StoreOutboundPromotions.State state2, List list, int i, Object obj) {
+            if ((i & 1) != 0) {
+                state = giftAndPromoData.entitlementState;
+            }
+            if ((i & 2) != 0) {
+                resolvingGiftState = giftAndPromoData.resolvingGiftState;
+            }
+            if ((i & 4) != 0) {
+                map = giftAndPromoData.myPurchasedGifts;
+            }
+            if ((i & 8) != 0) {
+                state2 = giftAndPromoData.outboundPromoState;
+            }
+            if ((i & 16) != 0) {
+                list = giftAndPromoData.claimedOutboundPromotions;
+            }
+            return giftAndPromoData.copy(state, resolvingGiftState, map, state2, list);
+        }
+
+        public final StoreEntitlements.State component1() {
+            return this.entitlementState;
+        }
+
+        public final ResolvingGiftState component2() {
+            return this.resolvingGiftState;
+        }
+
+        public final Map<Long, List<ModelGift>> component3() {
+            return this.myPurchasedGifts;
+        }
+
+        public final StoreOutboundPromotions.State component4() {
+            return this.outboundPromoState;
+        }
+
+        public final List<ClaimedOutboundPromotion> component5() {
+            return this.claimedOutboundPromotions;
+        }
+
+        public final GiftAndPromoData copy(StoreEntitlements.State state, ResolvingGiftState resolvingGiftState, Map<Long, ? extends List<ModelGift>> map, StoreOutboundPromotions.State state2, List<ClaimedOutboundPromotion> list) {
+            m.checkNotNullParameter(state, "entitlementState");
+            m.checkNotNullParameter(resolvingGiftState, "resolvingGiftState");
+            m.checkNotNullParameter(map, "myPurchasedGifts");
+            m.checkNotNullParameter(state2, "outboundPromoState");
+            m.checkNotNullParameter(list, "claimedOutboundPromotions");
+            return new GiftAndPromoData(state, resolvingGiftState, map, state2, list);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof GiftAndPromoData)) {
+                return false;
+            }
+            GiftAndPromoData giftAndPromoData = (GiftAndPromoData) obj;
+            return m.areEqual(this.entitlementState, giftAndPromoData.entitlementState) && m.areEqual(this.resolvingGiftState, giftAndPromoData.resolvingGiftState) && m.areEqual(this.myPurchasedGifts, giftAndPromoData.myPurchasedGifts) && m.areEqual(this.outboundPromoState, giftAndPromoData.outboundPromoState) && m.areEqual(this.claimedOutboundPromotions, giftAndPromoData.claimedOutboundPromotions);
+        }
+
+        public final List<ClaimedOutboundPromotion> getClaimedOutboundPromotions() {
+            return this.claimedOutboundPromotions;
+        }
+
+        public final StoreEntitlements.State getEntitlementState() {
+            return this.entitlementState;
+        }
+
+        public final Map<Long, List<ModelGift>> getMyPurchasedGifts() {
+            return this.myPurchasedGifts;
+        }
+
+        public final StoreOutboundPromotions.State getOutboundPromoState() {
+            return this.outboundPromoState;
+        }
+
+        public final ResolvingGiftState getResolvingGiftState() {
+            return this.resolvingGiftState;
+        }
+
+        public int hashCode() {
+            StoreEntitlements.State state = this.entitlementState;
+            int i = 0;
+            int hashCode = (state != null ? state.hashCode() : 0) * 31;
+            ResolvingGiftState resolvingGiftState = this.resolvingGiftState;
+            int hashCode2 = (hashCode + (resolvingGiftState != null ? resolvingGiftState.hashCode() : 0)) * 31;
+            Map<Long, List<ModelGift>> map = this.myPurchasedGifts;
+            int hashCode3 = (hashCode2 + (map != null ? map.hashCode() : 0)) * 31;
+            StoreOutboundPromotions.State state2 = this.outboundPromoState;
+            int hashCode4 = (hashCode3 + (state2 != null ? state2.hashCode() : 0)) * 31;
+            List<ClaimedOutboundPromotion> list = this.claimedOutboundPromotions;
+            if (list != null) {
+                i = list.hashCode();
+            }
+            return hashCode4 + i;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("GiftAndPromoData(entitlementState=");
+            L.append(this.entitlementState);
+            L.append(", resolvingGiftState=");
+            L.append(this.resolvingGiftState);
+            L.append(", myPurchasedGifts=");
+            L.append(this.myPurchasedGifts);
+            L.append(", outboundPromoState=");
+            L.append(this.outboundPromoState);
+            L.append(", claimedOutboundPromotions=");
+            return a.E(L, this.claimedOutboundPromotions, ")");
+        }
+    }
+
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
     public static abstract class GiftPurchaseEvent {
 
@@ -670,7 +690,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         private final ClaimStatus claimStatus;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2149id;
+        private final long f2155id;
         private final String imageUrl;
         private final String redemptionLink;
         private final String terms;
@@ -684,7 +704,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             m.checkNotNullParameter(str4, "terms");
             m.checkNotNullParameter(str5, "imageUrl");
             this.claimStatus = claimStatus;
-            this.f2149id = j;
+            this.f2155id = j;
             this.title = str;
             this.body = str2;
             this.redemptionLink = str3;
@@ -693,7 +713,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
 
         public static /* synthetic */ OutboundPromoItem copy$default(OutboundPromoItem outboundPromoItem, ClaimStatus claimStatus, long j, String str, String str2, String str3, String str4, String str5, int i, Object obj) {
-            return outboundPromoItem.copy((i & 1) != 0 ? outboundPromoItem.claimStatus : claimStatus, (i & 2) != 0 ? outboundPromoItem.f2149id : j, (i & 4) != 0 ? outboundPromoItem.title : str, (i & 8) != 0 ? outboundPromoItem.body : str2, (i & 16) != 0 ? outboundPromoItem.redemptionLink : str3, (i & 32) != 0 ? outboundPromoItem.terms : str4, (i & 64) != 0 ? outboundPromoItem.imageUrl : str5);
+            return outboundPromoItem.copy((i & 1) != 0 ? outboundPromoItem.claimStatus : claimStatus, (i & 2) != 0 ? outboundPromoItem.f2155id : j, (i & 4) != 0 ? outboundPromoItem.title : str, (i & 8) != 0 ? outboundPromoItem.body : str2, (i & 16) != 0 ? outboundPromoItem.redemptionLink : str3, (i & 32) != 0 ? outboundPromoItem.terms : str4, (i & 64) != 0 ? outboundPromoItem.imageUrl : str5);
         }
 
         public final ClaimStatus component1() {
@@ -701,7 +721,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
 
         public final long component2() {
-            return this.f2149id;
+            return this.f2155id;
         }
 
         public final String component3() {
@@ -742,7 +762,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 return false;
             }
             OutboundPromoItem outboundPromoItem = (OutboundPromoItem) obj;
-            return m.areEqual(this.claimStatus, outboundPromoItem.claimStatus) && this.f2149id == outboundPromoItem.f2149id && m.areEqual(this.title, outboundPromoItem.title) && m.areEqual(this.body, outboundPromoItem.body) && m.areEqual(this.redemptionLink, outboundPromoItem.redemptionLink) && m.areEqual(this.terms, outboundPromoItem.terms) && m.areEqual(this.imageUrl, outboundPromoItem.imageUrl);
+            return m.areEqual(this.claimStatus, outboundPromoItem.claimStatus) && this.f2155id == outboundPromoItem.f2155id && m.areEqual(this.title, outboundPromoItem.title) && m.areEqual(this.body, outboundPromoItem.body) && m.areEqual(this.redemptionLink, outboundPromoItem.redemptionLink) && m.areEqual(this.terms, outboundPromoItem.terms) && m.areEqual(this.imageUrl, outboundPromoItem.imageUrl);
         }
 
         public final String getBody() {
@@ -754,7 +774,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
 
         public final long getId() {
-            return this.f2149id;
+            return this.f2155id;
         }
 
         public final String getImageUrl() {
@@ -776,7 +796,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         public int hashCode() {
             ClaimStatus claimStatus = this.claimStatus;
             int i = 0;
-            int a = (a0.a.a.b.a(this.f2149id) + ((claimStatus != null ? claimStatus.hashCode() : 0) * 31)) * 31;
+            int a = (b.a(this.f2155id) + ((claimStatus != null ? claimStatus.hashCode() : 0) * 31)) * 31;
             String str = this.title;
             int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31;
             String str2 = this.body;
@@ -796,7 +816,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             StringBuilder L = a.L("OutboundPromoItem(claimStatus=");
             L.append(this.claimStatus);
             L.append(", id=");
-            L.append(this.f2149id);
+            L.append(this.f2155id);
             L.append(", title=");
             L.append(this.title);
             L.append(", body=");
@@ -848,142 +868,26 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
     }
 
-    /* compiled from: WidgetSettingsGiftingViewModel.kt */
-    public static final class StoreData {
-        private final StoreEntitlements.State entitlementState;
-        private final Map<Long, List<ModelGift>> myGifts;
-        private final StoreOutboundPromotions.State outboundPromoState;
-        private final ResolvingGiftState resolvingGiftState;
-
-        /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.Map<java.lang.Long, ? extends java.util.List<com.discord.models.domain.ModelGift>> */
-        /* JADX WARN: Multi-variable type inference failed */
-        public StoreData(StoreEntitlements.State state, ResolvingGiftState resolvingGiftState, Map<Long, ? extends List<ModelGift>> map, StoreOutboundPromotions.State state2) {
-            m.checkNotNullParameter(state, "entitlementState");
-            m.checkNotNullParameter(resolvingGiftState, "resolvingGiftState");
-            m.checkNotNullParameter(map, "myGifts");
-            m.checkNotNullParameter(state2, "outboundPromoState");
-            this.entitlementState = state;
-            this.resolvingGiftState = resolvingGiftState;
-            this.myGifts = map;
-            this.outboundPromoState = state2;
-        }
-
-        /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$StoreData */
-        /* JADX WARN: Multi-variable type inference failed */
-        public static /* synthetic */ StoreData copy$default(StoreData storeData, StoreEntitlements.State state, ResolvingGiftState resolvingGiftState, Map map, StoreOutboundPromotions.State state2, int i, Object obj) {
-            if ((i & 1) != 0) {
-                state = storeData.entitlementState;
-            }
-            if ((i & 2) != 0) {
-                resolvingGiftState = storeData.resolvingGiftState;
-            }
-            if ((i & 4) != 0) {
-                map = storeData.myGifts;
-            }
-            if ((i & 8) != 0) {
-                state2 = storeData.outboundPromoState;
-            }
-            return storeData.copy(state, resolvingGiftState, map, state2);
-        }
-
-        public final StoreEntitlements.State component1() {
-            return this.entitlementState;
-        }
-
-        public final ResolvingGiftState component2() {
-            return this.resolvingGiftState;
-        }
-
-        public final Map<Long, List<ModelGift>> component3() {
-            return this.myGifts;
-        }
-
-        public final StoreOutboundPromotions.State component4() {
-            return this.outboundPromoState;
-        }
-
-        public final StoreData copy(StoreEntitlements.State state, ResolvingGiftState resolvingGiftState, Map<Long, ? extends List<ModelGift>> map, StoreOutboundPromotions.State state2) {
-            m.checkNotNullParameter(state, "entitlementState");
-            m.checkNotNullParameter(resolvingGiftState, "resolvingGiftState");
-            m.checkNotNullParameter(map, "myGifts");
-            m.checkNotNullParameter(state2, "outboundPromoState");
-            return new StoreData(state, resolvingGiftState, map, state2);
-        }
-
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof StoreData)) {
-                return false;
-            }
-            StoreData storeData = (StoreData) obj;
-            return m.areEqual(this.entitlementState, storeData.entitlementState) && m.areEqual(this.resolvingGiftState, storeData.resolvingGiftState) && m.areEqual(this.myGifts, storeData.myGifts) && m.areEqual(this.outboundPromoState, storeData.outboundPromoState);
-        }
-
-        public final StoreEntitlements.State getEntitlementState() {
-            return this.entitlementState;
-        }
-
-        public final Map<Long, List<ModelGift>> getMyGifts() {
-            return this.myGifts;
-        }
-
-        public final StoreOutboundPromotions.State getOutboundPromoState() {
-            return this.outboundPromoState;
-        }
-
-        public final ResolvingGiftState getResolvingGiftState() {
-            return this.resolvingGiftState;
-        }
-
-        public int hashCode() {
-            StoreEntitlements.State state = this.entitlementState;
-            int i = 0;
-            int hashCode = (state != null ? state.hashCode() : 0) * 31;
-            ResolvingGiftState resolvingGiftState = this.resolvingGiftState;
-            int hashCode2 = (hashCode + (resolvingGiftState != null ? resolvingGiftState.hashCode() : 0)) * 31;
-            Map<Long, List<ModelGift>> map = this.myGifts;
-            int hashCode3 = (hashCode2 + (map != null ? map.hashCode() : 0)) * 31;
-            StoreOutboundPromotions.State state2 = this.outboundPromoState;
-            if (state2 != null) {
-                i = state2.hashCode();
-            }
-            return hashCode3 + i;
-        }
-
-        public String toString() {
-            StringBuilder L = a.L("StoreData(entitlementState=");
-            L.append(this.entitlementState);
-            L.append(", resolvingGiftState=");
-            L.append(this.resolvingGiftState);
-            L.append(", myGifts=");
-            L.append(this.myGifts);
-            L.append(", outboundPromoState=");
-            L.append(this.outboundPromoState);
-            L.append(")");
-            return L.toString();
-        }
-    }
-
     /* compiled from: WidgetSettingsGiftingViewModel.kt */
     public static final class StoreState {
         private final StoreEntitlements.State entitlementState;
+        private final boolean isUserPremium;
         private final List<ModelGift> myResolvedGifts;
         private final StoreOutboundPromotions.State outboundPromoState;
 
-        public StoreState(StoreEntitlements.State state, List<ModelGift> list, StoreOutboundPromotions.State state2) {
+        public StoreState(StoreEntitlements.State state, List<ModelGift> list, StoreOutboundPromotions.State state2, boolean z2) {
             m.checkNotNullParameter(state, "entitlementState");
             m.checkNotNullParameter(list, "myResolvedGifts");
             m.checkNotNullParameter(state2, "outboundPromoState");
             this.entitlementState = state;
             this.myResolvedGifts = list;
             this.outboundPromoState = state2;
+            this.isUserPremium = z2;
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.settings.premium.WidgetSettingsGiftingViewModel$StoreState */
         /* JADX WARN: Multi-variable type inference failed */
-        public static /* synthetic */ StoreState copy$default(StoreState storeState, StoreEntitlements.State state, List list, StoreOutboundPromotions.State state2, int i, Object obj) {
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, StoreEntitlements.State state, List list, StoreOutboundPromotions.State state2, boolean z2, int i, Object obj) {
             if ((i & 1) != 0) {
                 state = storeState.entitlementState;
             }
@@ -993,7 +897,10 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             if ((i & 4) != 0) {
                 state2 = storeState.outboundPromoState;
             }
-            return storeState.copy(state, list, state2);
+            if ((i & 8) != 0) {
+                z2 = storeState.isUserPremium;
+            }
+            return storeState.copy(state, list, state2, z2);
         }
 
         public final StoreEntitlements.State component1() {
@@ -1008,11 +915,15 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             return this.outboundPromoState;
         }
 
-        public final StoreState copy(StoreEntitlements.State state, List<ModelGift> list, StoreOutboundPromotions.State state2) {
+        public final boolean component4() {
+            return this.isUserPremium;
+        }
+
+        public final StoreState copy(StoreEntitlements.State state, List<ModelGift> list, StoreOutboundPromotions.State state2, boolean z2) {
             m.checkNotNullParameter(state, "entitlementState");
             m.checkNotNullParameter(list, "myResolvedGifts");
             m.checkNotNullParameter(state2, "outboundPromoState");
-            return new StoreState(state, list, state2);
+            return new StoreState(state, list, state2, z2);
         }
 
         public boolean equals(Object obj) {
@@ -1023,7 +934,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.entitlementState, storeState.entitlementState) && m.areEqual(this.myResolvedGifts, storeState.myResolvedGifts) && m.areEqual(this.outboundPromoState, storeState.outboundPromoState);
+            return m.areEqual(this.entitlementState, storeState.entitlementState) && m.areEqual(this.myResolvedGifts, storeState.myResolvedGifts) && m.areEqual(this.outboundPromoState, storeState.outboundPromoState) && this.isUserPremium == storeState.isUserPremium;
         }
 
         public final StoreEntitlements.State getEntitlementState() {
@@ -1048,7 +959,19 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             if (state2 != null) {
                 i = state2.hashCode();
             }
-            return hashCode2 + i;
+            int i2 = (hashCode2 + i) * 31;
+            boolean z2 = this.isUserPremium;
+            if (z2) {
+                z2 = true;
+            }
+            int i3 = z2 ? 1 : 0;
+            int i4 = z2 ? 1 : 0;
+            int i5 = z2 ? 1 : 0;
+            return i2 + i3;
+        }
+
+        public final boolean isUserPremium() {
+            return this.isUserPremium;
         }
 
         public String toString() {
@@ -1058,8 +981,8 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             L.append(this.myResolvedGifts);
             L.append(", outboundPromoState=");
             L.append(this.outboundPromoState);
-            L.append(")");
-            return L.toString();
+            L.append(", isUserPremium=");
+            return a.G(L, this.isUserPremium, ")");
         }
     }
 
@@ -1080,7 +1003,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             private final Set<Long> expandedSkuOrPlanIds;
             private final String lastCopiedCode;
             private final Map<Long, List<ModelEntitlement>> myEntitlements;
-            private final Map<Long, List<ModelGift>> myGifts;
+            private final Map<Long, List<ModelGift>> myPurchasedGifts;
             private final List<OutboundPromoItem> outboundPromos;
             private final ResolvingGiftState resolvingGiftState;
 
@@ -1094,12 +1017,12 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 m.checkNotNullParameter(resolvingGiftState, "resolvingGiftState");
                 m.checkNotNullParameter(set, "expandedSkuOrPlanIds");
                 m.checkNotNullParameter(list, "outboundPromos");
-                m.checkNotNullParameter(map2, "myGifts");
+                m.checkNotNullParameter(map2, "myPurchasedGifts");
                 this.myEntitlements = map;
                 this.resolvingGiftState = resolvingGiftState;
                 this.expandedSkuOrPlanIds = set;
                 this.outboundPromos = list;
-                this.myGifts = map2;
+                this.myPurchasedGifts = map2;
                 this.lastCopiedCode = str;
             }
 
@@ -1119,7 +1042,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                     list = loaded.outboundPromos;
                 }
                 if ((i & 16) != 0) {
-                    map2 = loaded.myGifts;
+                    map2 = loaded.myPurchasedGifts;
                 }
                 if ((i & 32) != 0) {
                     str = loaded.lastCopiedCode;
@@ -1144,7 +1067,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             }
 
             public final Map<Long, List<ModelGift>> component5() {
-                return this.myGifts;
+                return this.myPurchasedGifts;
             }
 
             public final String component6() {
@@ -1156,7 +1079,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 m.checkNotNullParameter(resolvingGiftState, "resolvingGiftState");
                 m.checkNotNullParameter(set, "expandedSkuOrPlanIds");
                 m.checkNotNullParameter(list, "outboundPromos");
-                m.checkNotNullParameter(map2, "myGifts");
+                m.checkNotNullParameter(map2, "myPurchasedGifts");
                 return new Loaded(map, resolvingGiftState, set, list, map2, str);
             }
 
@@ -1168,7 +1091,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.myEntitlements, loaded.myEntitlements) && m.areEqual(this.resolvingGiftState, loaded.resolvingGiftState) && m.areEqual(this.expandedSkuOrPlanIds, loaded.expandedSkuOrPlanIds) && m.areEqual(this.outboundPromos, loaded.outboundPromos) && m.areEqual(this.myGifts, loaded.myGifts) && m.areEqual(this.lastCopiedCode, loaded.lastCopiedCode);
+                return m.areEqual(this.myEntitlements, loaded.myEntitlements) && m.areEqual(this.resolvingGiftState, loaded.resolvingGiftState) && m.areEqual(this.expandedSkuOrPlanIds, loaded.expandedSkuOrPlanIds) && m.areEqual(this.outboundPromos, loaded.outboundPromos) && m.areEqual(this.myPurchasedGifts, loaded.myPurchasedGifts) && m.areEqual(this.lastCopiedCode, loaded.lastCopiedCode);
             }
 
             public final Set<Long> getExpandedSkuOrPlanIds() {
@@ -1183,8 +1106,8 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 return this.myEntitlements;
             }
 
-            public final Map<Long, List<ModelGift>> getMyGifts() {
-                return this.myGifts;
+            public final Map<Long, List<ModelGift>> getMyPurchasedGifts() {
+                return this.myPurchasedGifts;
             }
 
             public final List<OutboundPromoItem> getOutboundPromos() {
@@ -1205,7 +1128,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 int hashCode3 = (hashCode2 + (set != null ? set.hashCode() : 0)) * 31;
                 List<OutboundPromoItem> list = this.outboundPromos;
                 int hashCode4 = (hashCode3 + (list != null ? list.hashCode() : 0)) * 31;
-                Map<Long, List<ModelGift>> map2 = this.myGifts;
+                Map<Long, List<ModelGift>> map2 = this.myPurchasedGifts;
                 int hashCode5 = (hashCode4 + (map2 != null ? map2.hashCode() : 0)) * 31;
                 String str = this.lastCopiedCode;
                 if (str != null) {
@@ -1223,8 +1146,8 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                 L.append(this.expandedSkuOrPlanIds);
                 L.append(", outboundPromos=");
                 L.append(this.outboundPromos);
-                L.append(", myGifts=");
-                L.append(this.myGifts);
+                L.append(", myPurchasedGifts=");
+                L.append(this.myPurchasedGifts);
                 L.append(", lastCopiedCode=");
                 return a.D(L, this.lastCopiedCode, ")");
             }
@@ -1251,9 +1174,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         this(null, null, null, null, null, null, null, 127, null);
     }
 
-    /* JADX WARN: Multi-variable type inference failed */
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    /* JADX WARNING: Unknown variable types count: 1 */
     public WidgetSettingsGiftingViewModel(StoreEntitlements storeEntitlements, StoreGifting storeGifting, StoreUserSettingsSystem storeUserSettingsSystem, StoreOutboundPromotions storeOutboundPromotions, StoreGooglePlayPurchases storeGooglePlayPurchases, GooglePlayBillingManager googlePlayBillingManager, Observable<StoreState> observable) {
         super(ViewState.Loading.INSTANCE);
         m.checkNotNullParameter(storeEntitlements, "storeEntitlements");
@@ -1267,32 +1188,28 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         this.storeGifting = storeGifting;
         this.storeUserSettingsSystem = storeUserSettingsSystem;
         this.storeOutboundPromotions = storeOutboundPromotions;
-        BehaviorSubject<StoreData> l0 = BehaviorSubject.l0();
-        this.storeDataSubject = l0;
-        BehaviorSubject<List<ClaimedOutboundPromotion>> l02 = BehaviorSubject.l0();
-        this.claimedPromotionsSubject = l02;
-        this.giftPurchaseEventSubject = PublishSubject.l0();
-        this.eventSubject = PublishSubject.l0();
+        BehaviorSubject<StoreState> k0 = BehaviorSubject.k0();
+        this.storeStateSubject = k0;
+        BehaviorSubject<List<ClaimedOutboundPromotion>> k02 = BehaviorSubject.k0();
+        this.claimedPromotionsSubject = k02;
+        this.shouldCheckClaimedPromos = new AtomicBoolean(true);
+        this.giftPurchaseEventSubject = PublishSubject.k0();
+        this.eventSubject = PublishSubject.k0();
         this.onGiftCodeResolved = WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.INSTANCE;
         this.subscriptions = new CompositeSubscription();
         storeEntitlements.fetchMyGiftEntitlements();
         googlePlayBillingManager.queryPurchases();
-        Observable G = ObservableExtensionsKt.computationLatest(observable).G(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(G, "storeObservable\n        …oreStateToStoreData(it) }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(G, this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(l0), 62, (Object) null);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeGooglePlayPurchases.observeEvents(), this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeGooglePlayPurchases.observeQueryState(), this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass4(this), 62, (Object) null);
-        Observable M = ObservableExtensionsKt.restSubscribeOn$default(storeOutboundPromotions.fetchClaimedOutboundPromotions(), false, 1, null).M(AnonymousClass5.INSTANCE);
-        m.checkNotNullExpressionValue(M, "storeOutboundPromotions.…rorReturn { emptyList() }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(M, this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass6(l02), 62, (Object) null);
-        m.checkNotNullExpressionValue(l0, "storeDataSubject");
-        Observable computationLatest = ObservableExtensionsKt.computationLatest(l0);
-        m.checkNotNullExpressionValue(l02, "claimedPromotionsSubject");
-        Observable computationLatest2 = ObservableExtensionsKt.computationLatest(l02);
-        AnonymousClass7 r3 = AnonymousClass7.INSTANCE;
-        Observable s2 = Observable.j(computationLatest, computationLatest2, (Func2) (r3 != null ? new WidgetSettingsGiftingViewModel$sam$rx_functions_Func2$0(r3) : r3)).s();
-        m.checkNotNullExpressionValue(s2, "Observable.combineLatest…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass8(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeGooglePlayPurchases.observeEvents(), this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeGooglePlayPurchases.observeQueryState(), this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable t = ObservableExtensionsKt.computationLatest(observable).t(new AnonymousClass3(this));
+        m.checkNotNullExpressionValue(t, "storeObservable\n        …oreState.isUserPremium) }");
+        ObservableExtensionsKt.appSubscribe$default(t, WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass4(k0), 62, (Object) null);
+        m.checkNotNullExpressionValue(k0, "storeStateSubject");
+        Observable computationLatest = ObservableExtensionsKt.computationLatest(k0);
+        m.checkNotNullExpressionValue(k02, "claimedPromotionsSubject");
+        Observable r = Observable.j(computationLatest, ObservableExtensionsKt.computationLatest(k02), new WidgetSettingsGiftingViewModel$sam$rx_functions_Func2$0(new AnonymousClass5(this))).r();
+        m.checkNotNullExpressionValue(r, "Observable.combineLatest…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass6(this), 62, (Object) null);
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -1300,6 +1217,10 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         this((i & 1) != 0 ? StoreStream.Companion.getEntitlements() : storeEntitlements, (i & 2) != 0 ? StoreStream.Companion.getGifting() : storeGifting, (i & 4) != 0 ? StoreStream.Companion.getUserSettingsSystem() : storeUserSettingsSystem, (i & 8) != 0 ? StoreStream.Companion.getOutboundPromotions() : storeOutboundPromotions, (i & 16) != 0 ? StoreStream.Companion.getGooglePlayPurchases() : storeGooglePlayPurchases, (i & 32) != 0 ? GooglePlayBillingManager.INSTANCE : googlePlayBillingManager, (i & 64) != 0 ? Companion.access$observeStores(Companion) : observable);
     }
 
+    public static final /* synthetic */ GiftAndPromoData access$combineData(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, StoreState storeState, List list) {
+        return widgetSettingsGiftingViewModel.combineData(storeState, list);
+    }
+
     public static final /* synthetic */ PublishSubject access$getGiftPurchaseEventSubject$p(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel) {
         return widgetSettingsGiftingViewModel.giftPurchaseEventSubject;
     }
@@ -1312,8 +1233,8 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         return widgetSettingsGiftingViewModel.subscriptions;
     }
 
-    public static final /* synthetic */ void access$handleAsyncData(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, Pair pair) {
-        widgetSettingsGiftingViewModel.handleAsyncData(pair);
+    public static final /* synthetic */ void access$handleAsyncData(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, GiftAndPromoData giftAndPromoData) {
+        widgetSettingsGiftingViewModel.handleAsyncData(giftAndPromoData);
     }
 
     public static final /* synthetic */ void access$handleGooglePlayPurchaseEvent(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, StoreGooglePlayPurchases.Event event) {
@@ -1324,12 +1245,12 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         widgetSettingsGiftingViewModel.handleGooglePlayQueryStateUpdate(queryState);
     }
 
-    public static final /* synthetic */ void access$onHandleGiftCode(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, StoreGifting.GiftState giftState) {
-        widgetSettingsGiftingViewModel.onHandleGiftCode(giftState);
+    public static final /* synthetic */ void access$maybeCheckClaimedPromos(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, boolean z2) {
+        widgetSettingsGiftingViewModel.maybeCheckClaimedPromos(z2);
     }
 
-    public static final /* synthetic */ StoreData access$storeStateToStoreData(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, StoreState storeState) {
-        return widgetSettingsGiftingViewModel.storeStateToStoreData(storeState);
+    public static final /* synthetic */ void access$onHandleGiftCode(WidgetSettingsGiftingViewModel widgetSettingsGiftingViewModel, StoreGifting.GiftState giftState) {
+        widgetSettingsGiftingViewModel.onHandleGiftCode(giftState);
     }
 
     @MainThread
@@ -1358,32 +1279,71 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         return new ViewState.Loaded(((StoreEntitlements.State.Loaded) state).getGiftableEntitlements(), resolvingGiftState, set, ((OutboundPromoData.Loaded) outboundPromoData).getOutboundPromos(), map, str);
     }
 
+    private final GiftAndPromoData combineData(StoreState storeState, List<ClaimedOutboundPromotion> list) {
+        ResolvingGiftState resolvingGiftState;
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded == null || (resolvingGiftState = loaded.getResolvingGiftState()) == null) {
+            resolvingGiftState = ResolvingGiftState.NotResolving.INSTANCE;
+        }
+        StoreEntitlements.State entitlementState = storeState.getEntitlementState();
+        StoreOutboundPromotions.State outboundPromoState = storeState.getOutboundPromoState();
+        LinkedHashMap linkedHashMap = new LinkedHashMap();
+        if (entitlementState instanceof StoreEntitlements.State.Loaded) {
+            for (ModelGift modelGift : storeState.getMyResolvedGifts()) {
+                Long subscriptionPlanId = modelGift.getSubscriptionPlanId();
+                long longValue = subscriptionPlanId != null ? subscriptionPlanId.longValue() : modelGift.getSkuId();
+                if (!linkedHashMap.containsKey(Long.valueOf(longValue))) {
+                    linkedHashMap.put(Long.valueOf(longValue), new ArrayList());
+                }
+                List list2 = (List) linkedHashMap.get(Long.valueOf(longValue));
+                if (list2 != null) {
+                    list2.add(modelGift);
+                }
+            }
+        }
+        return new GiftAndPromoData(entitlementState, resolvingGiftState, linkedHashMap, outboundPromoState, list);
+    }
+
     private final String getPromoImageUrl(long j) {
-        m.areEqual(this.storeUserSettingsSystem.getTheme(), "light");
-        return "https://cdn.discordapp.com".length() > 0 ? "asset://asset/images/default_avatar_0.jpg" : "asset://asset/images/default_avatar_0.jpg";
+        String str = m.areEqual(this.storeUserSettingsSystem.getTheme(), "light") ? "logo-light" : "logo-dark";
+        String str2 = "https://cdn.discordapp.com";
+        if (!(str2.length() > 0)) {
+            str2 = null;
+        }
+        if (str2 == null) {
+            str2 = "https://discord.com/api/";
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append(str2);
+        sb.append("/promotions/");
+        sb.append(j);
+        sb.append('/');
+        return a.D(sb, str, "?size=256");
     }
 
     private final List<OutboundPromoItem> getPromos(List<OutboundPromotion> list, List<ClaimedOutboundPromotion> list2) {
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (OutboundPromotion outboundPromotion : list) {
-            OutboundPromoItem outboundPromoItem = new OutboundPromoItem(new ClaimStatus.Unclaimed(outboundPromotion.a()), outboundPromotion.b(), outboundPromotion.f(), outboundPromotion.c(), outboundPromotion.d(), outboundPromotion.e(), getPromoImageUrl(outboundPromotion.b()));
+            OutboundPromoItem outboundPromoItem = new OutboundPromoItem(new ClaimStatus.Unclaimed(outboundPromotion.b(), outboundPromotion.a()), outboundPromotion.b(), outboundPromotion.f(), outboundPromotion.c(), outboundPromotion.d(), outboundPromotion.e(), getPromoImageUrl(outboundPromotion.b()));
             linkedHashMap.put(Long.valueOf(outboundPromoItem.getId()), outboundPromoItem);
         }
         for (ClaimedOutboundPromotion claimedOutboundPromotion : list2) {
-            OutboundPromoItem outboundPromoItem2 = new OutboundPromoItem(new ClaimStatus.Claimed(claimedOutboundPromotion.c(), claimedOutboundPromotion.a()), claimedOutboundPromotion.b().b(), claimedOutboundPromotion.b().f(), claimedOutboundPromotion.b().c(), claimedOutboundPromotion.b().d(), claimedOutboundPromotion.b().e(), getPromoImageUrl(claimedOutboundPromotion.b().b()));
+            OutboundPromoItem outboundPromoItem2 = new OutboundPromoItem(new ClaimStatus.Claimed(claimedOutboundPromotion.b().b(), claimedOutboundPromotion.a(), claimedOutboundPromotion.b().c(), claimedOutboundPromotion.d(), claimedOutboundPromotion.c()), claimedOutboundPromotion.b().b(), claimedOutboundPromotion.b().f(), claimedOutboundPromotion.b().c(), claimedOutboundPromotion.b().d(), claimedOutboundPromotion.b().e(), getPromoImageUrl(claimedOutboundPromotion.b().b()));
             linkedHashMap.put(Long.valueOf(outboundPromoItem2.getId()), outboundPromoItem2);
         }
         return u.toList(linkedHashMap.values());
     }
 
     @MainThread
-    private final void handleAsyncData(Pair<StoreData, ? extends List<ClaimedOutboundPromotion>> pair) {
+    private final void handleAsyncData(GiftAndPromoData giftAndPromoData) {
         OutboundPromoData outboundPromoData;
-        StoreData component1 = pair.component1();
-        List<ClaimedOutboundPromotion> list = (List) pair.component2();
-        StoreOutboundPromotions.State outboundPromoState = component1.getOutboundPromoState();
+        StoreOutboundPromotions.State outboundPromoState = giftAndPromoData.getOutboundPromoState();
         if (outboundPromoState instanceof StoreOutboundPromotions.State.Loaded) {
-            outboundPromoData = new OutboundPromoData.Loaded(getPromos(((StoreOutboundPromotions.State.Loaded) outboundPromoState).getValidActivePromotions(), list));
+            outboundPromoData = new OutboundPromoData.Loaded(getPromos(((StoreOutboundPromotions.State.Loaded) outboundPromoState).getValidActivePromotions(), giftAndPromoData.getClaimedOutboundPromotions()));
         } else if (outboundPromoState instanceof StoreOutboundPromotions.State.Failed) {
             outboundPromoData = new OutboundPromoData.Loaded(n.emptyList());
         } else if (outboundPromoState instanceof StoreOutboundPromotions.State.Loading) {
@@ -1391,7 +1351,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         } else {
             throw new NoWhenBranchMatchedException();
         }
-        updateViewState(buildViewState(component1.getEntitlementState(), component1.getResolvingGiftState(), component1.getMyGifts(), outboundPromoData));
+        updateViewState(buildViewState(giftAndPromoData.getEntitlementState(), giftAndPromoData.getResolvingGiftState(), giftAndPromoData.getMyPurchasedGifts(), outboundPromoData));
     }
 
     private final void handleGooglePlayPurchaseEvent(StoreGooglePlayPurchases.Event event) {
@@ -1423,6 +1383,19 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
     }
 
+    private final void maybeCheckClaimedPromos(boolean z2) {
+        if (!this.shouldCheckClaimedPromos.compareAndSet(true, false)) {
+            return;
+        }
+        if (z2) {
+            Observable L = ObservableExtensionsKt.restSubscribeOn$default(this.storeOutboundPromotions.fetchClaimedOutboundPromotions(), false, 1, null).L(WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$1.INSTANCE);
+            m.checkNotNullExpressionValue(L, "storeOutboundPromotions.…rorReturn { emptyList() }");
+            ObservableExtensionsKt.appSubscribe$default(L, WidgetSettingsGiftingViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsGiftingViewModel$maybeCheckClaimedPromos$2(this.claimedPromotionsSubject), 62, (Object) null);
+            return;
+        }
+        this.claimedPromotionsSubject.onNext(n.emptyList());
+    }
+
     @MainThread
     private final void onHandleGiftCode(StoreGifting.GiftState giftState) {
         ViewState viewState;
@@ -1437,7 +1410,7 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
             StoreEntitlements.State.Loaded loaded2 = new StoreEntitlements.State.Loaded(loaded.getMyEntitlements(), h0.emptyMap());
             OutboundPromoData.Loaded loaded3 = new OutboundPromoData.Loaded(loaded.getOutboundPromos());
             if ((giftState instanceof StoreGifting.GiftState.Loading) || (giftState instanceof StoreGifting.GiftState.Redeeming)) {
-                viewState = buildViewState(loaded2, ResolvingGiftState.Resolving.INSTANCE, loaded.getMyGifts(), loaded3);
+                viewState = buildViewState(loaded2, ResolvingGiftState.Resolving.INSTANCE, loaded.getMyPurchasedGifts(), loaded3);
             } else if (!(giftState instanceof StoreGifting.GiftState.LoadFailed) && !(giftState instanceof StoreGifting.GiftState.RedeemedFailed) && !(giftState instanceof StoreGifting.GiftState.Invalid)) {
                 boolean z2 = giftState instanceof StoreGifting.GiftState.Revoking;
                 if (!z2 && !(giftState instanceof StoreGifting.GiftState.Resolved)) {
@@ -1459,44 +1432,36 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
                     if (!modelGift.isClaimedByMe()) {
                         this.onGiftCodeResolved.invoke(modelGift.getCode());
                     }
-                    viewState = buildViewState(loaded2, ResolvingGiftState.NotResolving.INSTANCE, loaded.getMyGifts(), loaded3);
+                    viewState = buildViewState(loaded2, ResolvingGiftState.NotResolving.INSTANCE, loaded.getMyPurchasedGifts(), loaded3);
                 } else {
                     return;
                 }
             } else {
-                viewState = buildViewState(loaded2, ResolvingGiftState.Error.INSTANCE, loaded.getMyGifts(), loaded3);
+                viewState = buildViewState(loaded2, ResolvingGiftState.Error.INSTANCE, loaded.getMyPurchasedGifts(), loaded3);
             }
             updateViewState(viewState);
         }
     }
 
-    private final StoreData storeStateToStoreData(StoreState storeState) {
-        ResolvingGiftState resolvingGiftState;
+    @MainThread
+    public final void handleClaimedPromo(ClaimStatus.Claimed claimed) {
+        m.checkNotNullParameter(claimed, "claimedStatus");
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
             viewState = null;
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
-        if (loaded == null || (resolvingGiftState = loaded.getResolvingGiftState()) == null) {
-            resolvingGiftState = ResolvingGiftState.NotResolving.INSTANCE;
-        }
-        StoreEntitlements.State entitlementState = storeState.getEntitlementState();
-        StoreOutboundPromotions.State outboundPromoState = storeState.getOutboundPromoState();
-        LinkedHashMap linkedHashMap = new LinkedHashMap();
-        if (entitlementState instanceof StoreEntitlements.State.Loaded) {
-            for (ModelGift modelGift : storeState.getMyResolvedGifts()) {
-                Long subscriptionPlanId = modelGift.getSubscriptionPlanId();
-                long longValue = subscriptionPlanId != null ? subscriptionPlanId.longValue() : modelGift.getSkuId();
-                if (!linkedHashMap.containsKey(Long.valueOf(longValue))) {
-                    linkedHashMap.put(Long.valueOf(longValue), new ArrayList());
-                }
-                List list = (List) linkedHashMap.get(Long.valueOf(longValue));
-                if (list != null) {
-                    list.add(modelGift);
+        if (loaded != null) {
+            List<OutboundPromoItem> outboundPromos = loaded.getOutboundPromos();
+            ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(outboundPromos, 10));
+            for (OutboundPromoItem outboundPromoItem : outboundPromos) {
+                if (outboundPromoItem.getId() == claimed.getPromoId()) {
+                    outboundPromoItem = OutboundPromoItem.copy$default(outboundPromoItem, claimed, 0, null, null, null, null, null, 126, null);
                 }
+                arrayList.add(outboundPromoItem);
             }
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, null, arrayList, null, null, 55, null));
         }
-        return new StoreData(entitlementState, resolvingGiftState, linkedHashMap, outboundPromoState);
     }
 
     @MainThread
@@ -1512,8 +1477,10 @@ public final class WidgetSettingsGiftingViewModel extends AppViewModel<ViewState
         }
     }
 
-    public final void handlePromoClaimClicked(OutboundPromoItem outboundPromoItem) {
+    public final void handlePromoButtonClicked(OutboundPromoItem outboundPromoItem) {
         m.checkNotNullParameter(outboundPromoItem, "promoItem");
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        publishSubject.j.onNext(new Event.ShowPromoDialog(outboundPromoItem.getClaimStatus()));
     }
 
     public final void handlePromoMoreDetailsClicked(OutboundPromoItem outboundPromoItem) {
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java
index b7e1a70c64..f1ce220d1d 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java
@@ -9,9 +9,9 @@ import android.widget.TextView;
 import androidx.cardview.widget.CardView;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import c.a.i.j0;
-import c.a.i.o2;
-import c.a.i.p2;
 import c.a.i.q2;
+import c.a.i.r2;
+import c.a.i.s2;
 import c.a.i.x;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsPremiumBinding;
@@ -33,121 +33,121 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
         int i;
         m.checkNotNullParameter(view, "p1");
         View findViewById = view.findViewById(2131361860);
-        int i2 = 2131364287;
+        int i2 = 2131364331;
         if (findViewById != null) {
-            AccountCreditView accountCreditView = (AccountCreditView) findViewById.findViewById(2131362819);
+            AccountCreditView accountCreditView = (AccountCreditView) findViewById.findViewById(2131362844);
             if (accountCreditView != null) {
-                AccountCreditView accountCreditView2 = (AccountCreditView) findViewById.findViewById(2131362820);
+                AccountCreditView accountCreditView2 = (AccountCreditView) findViewById.findViewById(2131362845);
                 if (accountCreditView2 != null) {
-                    View findViewById2 = findViewById.findViewById(2131362821);
+                    View findViewById2 = findViewById.findViewById(2131362846);
                     if (findViewById2 != null) {
                         x xVar = new x((CardView) findViewById, accountCreditView, accountCreditView2, findViewById2);
-                        View findViewById3 = view.findViewById(2131364165);
+                        View findViewById3 = view.findViewById(2131364208);
                         if (findViewById3 != null) {
                             int i3 = 2131361896;
                             MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131361896);
                             if (materialButton != null) {
-                                i3 = 2131364284;
-                                View findViewById4 = findViewById3.findViewById(2131364284);
+                                i3 = 2131364328;
+                                View findViewById4 = findViewById3.findViewById(2131364328);
                                 if (findViewById4 != null) {
-                                    i3 = 2131364285;
-                                    TextView textView = (TextView) findViewById3.findViewById(2131364285);
+                                    i3 = 2131364329;
+                                    TextView textView = (TextView) findViewById3.findViewById(2131364329);
                                     if (textView != null) {
-                                        i3 = 2131364288;
-                                        TextView textView2 = (TextView) findViewById3.findViewById(2131364288);
+                                        i3 = 2131364332;
+                                        TextView textView2 = (TextView) findViewById3.findViewById(2131364332);
                                         if (textView2 != null) {
                                             LinearLayout linearLayout = (LinearLayout) findViewById3;
-                                            i3 = 2131364298;
-                                            TextView textView3 = (TextView) findViewById3.findViewById(2131364298);
+                                            i3 = 2131364342;
+                                            TextView textView3 = (TextView) findViewById3.findViewById(2131364342);
                                             if (textView3 != null) {
                                                 j0 j0Var = new j0(linearLayout, materialButton, findViewById4, textView, textView2, linearLayout, textView3);
-                                                View findViewById5 = view.findViewById(2131364277);
+                                                View findViewById5 = view.findViewById(2131364321);
                                                 if (findViewById5 != null) {
-                                                    int i4 = 2131364278;
-                                                    TextView textView4 = (TextView) findViewById5.findViewById(2131364278);
+                                                    int i4 = 2131364322;
+                                                    TextView textView4 = (TextView) findViewById5.findViewById(2131364322);
                                                     if (textView4 != null) {
-                                                        i4 = 2131364279;
-                                                        TextView textView5 = (TextView) findViewById5.findViewById(2131364279);
+                                                        i4 = 2131364323;
+                                                        TextView textView5 = (TextView) findViewById5.findViewById(2131364323);
                                                         if (textView5 != null) {
-                                                            i4 = 2131364280;
-                                                            TextView textView6 = (TextView) findViewById5.findViewById(2131364280);
+                                                            i4 = 2131364324;
+                                                            TextView textView6 = (TextView) findViewById5.findViewById(2131364324);
                                                             if (textView6 != null) {
-                                                                i4 = 2131364281;
-                                                                TextView textView7 = (TextView) findViewById5.findViewById(2131364281);
+                                                                i4 = 2131364325;
+                                                                TextView textView7 = (TextView) findViewById5.findViewById(2131364325);
                                                                 if (textView7 != null) {
-                                                                    o2 o2Var = new o2((LinearLayout) findViewById5, textView4, textView5, textView6, textView7);
-                                                                    ActiveSubscriptionView activeSubscriptionView = (ActiveSubscriptionView) view.findViewById(2131364282);
+                                                                    q2 q2Var = new q2((LinearLayout) findViewById5, textView4, textView5, textView6, textView7);
+                                                                    ActiveSubscriptionView activeSubscriptionView = (ActiveSubscriptionView) view.findViewById(2131364326);
                                                                     if (activeSubscriptionView != null) {
-                                                                        ActiveSubscriptionView activeSubscriptionView2 = (ActiveSubscriptionView) view.findViewById(2131364283);
+                                                                        ActiveSubscriptionView activeSubscriptionView2 = (ActiveSubscriptionView) view.findViewById(2131364327);
                                                                         if (activeSubscriptionView2 != null) {
-                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364286);
+                                                                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364330);
                                                                             if (linearLayout2 != null) {
-                                                                                TextView textView8 = (TextView) view.findViewById(2131364287);
+                                                                                TextView textView8 = (TextView) view.findViewById(2131364331);
                                                                                 if (textView8 != null) {
-                                                                                    TextView textView9 = (TextView) view.findViewById(2131364289);
+                                                                                    TextView textView9 = (TextView) view.findViewById(2131364333);
                                                                                     if (textView9 != null) {
-                                                                                        TextView textView10 = (TextView) view.findViewById(2131364290);
+                                                                                        TextView textView10 = (TextView) view.findViewById(2131364334);
                                                                                         if (textView10 != null) {
-                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364301);
+                                                                                            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364345);
                                                                                             if (materialButton2 != null) {
-                                                                                                ScrollView scrollView = (ScrollView) view.findViewById(2131364302);
+                                                                                                ScrollView scrollView = (ScrollView) view.findViewById(2131364346);
                                                                                                 if (scrollView != null) {
-                                                                                                    i2 = 2131364303;
-                                                                                                    Button button = (Button) view.findViewById(2131364303);
+                                                                                                    i2 = 2131364347;
+                                                                                                    Button button = (Button) view.findViewById(2131364347);
                                                                                                     if (button != null) {
-                                                                                                        CardView cardView = (CardView) view.findViewById(2131364304);
+                                                                                                        CardView cardView = (CardView) view.findViewById(2131364348);
                                                                                                         if (cardView != null) {
-                                                                                                            i2 = 2131364305;
-                                                                                                            TextView textView11 = (TextView) view.findViewById(2131364305);
+                                                                                                            i2 = 2131364349;
+                                                                                                            TextView textView11 = (TextView) view.findViewById(2131364349);
                                                                                                             if (textView11 != null) {
-                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364306);
+                                                                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364350);
                                                                                                                 if (linearLayout3 != null) {
-                                                                                                                    i2 = 2131364307;
-                                                                                                                    TextView textView12 = (TextView) view.findViewById(2131364307);
+                                                                                                                    i2 = 2131364351;
+                                                                                                                    TextView textView12 = (TextView) view.findViewById(2131364351);
                                                                                                                     if (textView12 != null) {
-                                                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364308);
+                                                                                                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364352);
                                                                                                                         if (appViewFlipper != null) {
-                                                                                                                            i2 = 2131364317;
-                                                                                                                            View findViewById6 = view.findViewById(2131364317);
+                                                                                                                            i2 = 2131364353;
+                                                                                                                            View findViewById6 = view.findViewById(2131364353);
                                                                                                                             if (findViewById6 != null) {
-                                                                                                                                int i5 = 2131363812;
-                                                                                                                                TextView textView13 = (TextView) findViewById6.findViewById(2131363812);
+                                                                                                                                int i5 = 2131363853;
+                                                                                                                                TextView textView13 = (TextView) findViewById6.findViewById(2131363853);
                                                                                                                                 if (textView13 != null) {
-                                                                                                                                    i5 = 2131363813;
-                                                                                                                                    TextView textView14 = (TextView) findViewById6.findViewById(2131363813);
+                                                                                                                                    i5 = 2131363854;
+                                                                                                                                    TextView textView14 = (TextView) findViewById6.findViewById(2131363854);
                                                                                                                                     if (textView14 != null) {
-                                                                                                                                        i5 = 2131364292;
-                                                                                                                                        ImageView imageView = (ImageView) findViewById6.findViewById(2131364292);
+                                                                                                                                        i5 = 2131364336;
+                                                                                                                                        ImageView imageView = (ImageView) findViewById6.findViewById(2131364336);
                                                                                                                                         if (imageView != null) {
-                                                                                                                                            i5 = 2131364293;
-                                                                                                                                            TextView textView15 = (TextView) findViewById6.findViewById(2131364293);
+                                                                                                                                            i5 = 2131364337;
+                                                                                                                                            TextView textView15 = (TextView) findViewById6.findViewById(2131364337);
                                                                                                                                             if (textView15 != null) {
-                                                                                                                                                i5 = 2131364294;
-                                                                                                                                                TextView textView16 = (TextView) findViewById6.findViewById(2131364294);
+                                                                                                                                                i5 = 2131364338;
+                                                                                                                                                TextView textView16 = (TextView) findViewById6.findViewById(2131364338);
                                                                                                                                                 if (textView16 != null) {
-                                                                                                                                                    i5 = 2131364295;
-                                                                                                                                                    ImageView imageView2 = (ImageView) findViewById6.findViewById(2131364295);
+                                                                                                                                                    i5 = 2131364339;
+                                                                                                                                                    ImageView imageView2 = (ImageView) findViewById6.findViewById(2131364339);
                                                                                                                                                     if (imageView2 != null) {
-                                                                                                                                                        i5 = 2131364300;
-                                                                                                                                                        MaterialButton materialButton3 = (MaterialButton) findViewById6.findViewById(2131364300);
+                                                                                                                                                        i5 = 2131364344;
+                                                                                                                                                        MaterialButton materialButton3 = (MaterialButton) findViewById6.findViewById(2131364344);
                                                                                                                                                         if (materialButton3 != null) {
-                                                                                                                                                            i5 = 2131365283;
-                                                                                                                                                            TextView textView17 = (TextView) findViewById6.findViewById(2131365283);
+                                                                                                                                                            i5 = 2131365338;
+                                                                                                                                                            TextView textView17 = (TextView) findViewById6.findViewById(2131365338);
                                                                                                                                                             if (textView17 != null) {
-                                                                                                                                                                p2 p2Var = new p2((LinearLayout) findViewById6, textView13, textView14, imageView, textView15, textView16, imageView2, materialButton3, textView17);
-                                                                                                                                                                i2 = 2131364319;
-                                                                                                                                                                View findViewById7 = view.findViewById(2131364319);
+                                                                                                                                                                r2 r2Var = new r2((LinearLayout) findViewById6, textView13, textView14, imageView, textView15, textView16, imageView2, materialButton3, textView17);
+                                                                                                                                                                i2 = 2131364355;
+                                                                                                                                                                View findViewById7 = view.findViewById(2131364355);
                                                                                                                                                                 if (findViewById7 != null) {
-                                                                                                                                                                    int i6 = 2131364291;
-                                                                                                                                                                    ImageView imageView3 = (ImageView) findViewById7.findViewById(2131364291);
+                                                                                                                                                                    int i6 = 2131364335;
+                                                                                                                                                                    ImageView imageView3 = (ImageView) findViewById7.findViewById(2131364335);
                                                                                                                                                                     if (imageView3 != null) {
-                                                                                                                                                                        i6 = 2131364296;
-                                                                                                                                                                        ImageView imageView4 = (ImageView) findViewById7.findViewById(2131364296);
+                                                                                                                                                                        i6 = 2131364340;
+                                                                                                                                                                        ImageView imageView4 = (ImageView) findViewById7.findViewById(2131364340);
                                                                                                                                                                         if (imageView4 != null) {
-                                                                                                                                                                            i6 = 2131364299;
-                                                                                                                                                                            MaterialButton materialButton4 = (MaterialButton) findViewById7.findViewById(2131364299);
+                                                                                                                                                                            i6 = 2131364343;
+                                                                                                                                                                            MaterialButton materialButton4 = (MaterialButton) findViewById7.findViewById(2131364343);
                                                                                                                                                                             if (materialButton4 != null) {
-                                                                                                                                                                                return new WidgetSettingsPremiumBinding((CoordinatorLayout) view, xVar, j0Var, o2Var, activeSubscriptionView, activeSubscriptionView2, linearLayout2, textView8, textView9, textView10, materialButton2, scrollView, button, cardView, textView11, linearLayout3, textView12, appViewFlipper, p2Var, new q2((LinearLayout) findViewById7, imageView3, imageView4, materialButton4));
+                                                                                                                                                                                return new WidgetSettingsPremiumBinding((CoordinatorLayout) view, xVar, j0Var, q2Var, activeSubscriptionView, activeSubscriptionView2, linearLayout2, textView8, textView9, textView10, materialButton2, scrollView, button, cardView, textView11, linearLayout3, textView12, appViewFlipper, r2Var, new s2((LinearLayout) findViewById7, imageView3, imageView4, materialButton4));
                                                                                                                                                                             }
                                                                                                                                                                         }
                                                                                                                                                                     }
@@ -164,38 +164,38 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
                                                                                                                                 throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i5)));
                                                                                                                             }
                                                                                                                         } else {
-                                                                                                                            i2 = 2131364308;
+                                                                                                                            i2 = 2131364352;
                                                                                                                         }
                                                                                                                     }
                                                                                                                 } else {
-                                                                                                                    i2 = 2131364306;
+                                                                                                                    i2 = 2131364350;
                                                                                                                 }
                                                                                                             }
                                                                                                         } else {
-                                                                                                            i2 = 2131364304;
+                                                                                                            i2 = 2131364348;
                                                                                                         }
                                                                                                     }
                                                                                                 } else {
-                                                                                                    i2 = 2131364302;
+                                                                                                    i2 = 2131364346;
                                                                                                 }
                                                                                             } else {
-                                                                                                i2 = 2131364301;
+                                                                                                i2 = 2131364345;
                                                                                             }
                                                                                         } else {
-                                                                                            i2 = 2131364290;
+                                                                                            i2 = 2131364334;
                                                                                         }
                                                                                     } else {
-                                                                                        i2 = 2131364289;
+                                                                                        i2 = 2131364333;
                                                                                     }
                                                                                 }
                                                                             } else {
-                                                                                i2 = 2131364286;
+                                                                                i2 = 2131364330;
                                                                             }
                                                                         } else {
-                                                                            i2 = 2131364283;
+                                                                            i2 = 2131364327;
                                                                         }
                                                                     } else {
-                                                                        i2 = 2131364282;
+                                                                        i2 = 2131364326;
                                                                     }
                                                                 }
                                                             }
@@ -203,7 +203,7 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
                                                     }
                                                     throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(i4)));
                                                 }
-                                                i2 = 2131364277;
+                                                i2 = 2131364321;
                                             }
                                         }
                                     }
@@ -211,15 +211,15 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp
                             }
                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i3)));
                         }
-                        i2 = 2131364165;
+                        i2 = 2131364208;
                     } else {
-                        i = 2131362821;
+                        i = 2131362846;
                     }
                 } else {
-                    i = 2131362820;
+                    i = 2131362845;
                 }
             } else {
-                i = 2131362819;
+                i = 2131362844;
             }
             throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(i)));
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java
index 9cfb8b5c9b..26ef59c2cd 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java
@@ -24,8 +24,8 @@ public final class WidgetSettingsPremium$configureButtons$$inlined$forEach$lambd
     public final void onClick(View view) {
         WidgetChoosePlan.Companion companion = WidgetChoosePlan.Companion;
         Context requireContext = this.this$0.requireContext();
-        WidgetChoosePlan.ViewType viewType = m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1937s.f) ? WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_1 : WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_2;
+        WidgetChoosePlan.ViewType viewType = m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1939s.f) ? WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_1 : WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_2;
         ModelSubscription modelSubscription = this.$premiumSubscription$inlined;
-        WidgetChoosePlan.Companion.launch$default(companion, requireContext, null, viewType, modelSubscription != null ? modelSubscription.getPaymentGatewayPlanId() : null, new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), Traits.Subscription.Companion.withGatewayPlanId(m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1937s.f) ? GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName() : GooglePlaySku.PREMIUM_TIER_2_MONTHLY.getSkuName()), 2, null);
+        WidgetChoosePlan.Companion.launch$default(companion, requireContext, null, viewType, modelSubscription != null ? modelSubscription.getPaymentGatewayPlanId() : null, new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), Traits.Subscription.Companion.withGatewayPlanId(m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1939s.f) ? GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName() : GooglePlaySku.PREMIUM_TIER_2_MONTHLY.getSkuName()), 2, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java
index 4cdb024f5c..5712f86f8e 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java
@@ -26,8 +26,8 @@ public final class WidgetSettingsPremium$onViewBound$1 extends o implements Func
 
     public final void invoke(RenderContext renderContext) {
         m.checkNotNullParameter(renderContext, "$receiver");
-        renderContext.a.put("maxUploadStandard", b.j(this.this$0, 2131888513, new Object[0], null, 4).toString());
-        renderContext.a.put("maxUploadPremiumTier1", b.j(this.this$0, 2131888510, new Object[0], null, 4).toString());
-        renderContext.a.put("maxUploadPremiumTier2", b.j(this.this$0, 2131888511, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadStandard", b.j(this.this$0, 2131888514, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadPremiumTier1", b.j(this.this$0, 2131888511, new Object[0], null, 4).toString());
+        renderContext.a.put("maxUploadPremiumTier2", b.j(this.this$0, 2131888512, new Object[0], null, 4).toString());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
index 6e7deaf4b2..588bc68d29 100644
--- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
+++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java
@@ -20,8 +20,8 @@ import c.a.d.h0;
 import c.a.d.j0;
 import c.a.d.l;
 import c.a.d.o;
-import c.a.i.p2;
-import c.a.i.q2;
+import c.a.i.r2;
+import c.a.i.s2;
 import c.a.l.b;
 import c.d.b.a.a;
 import com.android.billingclient.api.Purchase;
@@ -295,7 +295,7 @@ public final class WidgetSettingsPremium extends AppFragment {
     }
 
     public WidgetSettingsPremium() {
-        super(2131559215);
+        super(2131559221);
         WidgetSettingsPremium$viewModel$2 widgetSettingsPremium$viewModel$2 = WidgetSettingsPremium$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsPremiumViewModel.class), new WidgetSettingsPremium$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsPremium$viewModel$2));
@@ -375,14 +375,11 @@ public final class WidgetSettingsPremium extends AppFragment {
             i = 8;
         }
         view.setVisibility(i);
-        getBinding().b.f173c.a(SubscriptionPlanType.PREMIUM_MONTH_TIER_1.getPlanId(), i2, modelSubscription);
+        getBinding().b.f175c.a(SubscriptionPlanType.PREMIUM_MONTH_TIER_1.getPlanId(), i2, modelSubscription);
         getBinding().b.b.a(SubscriptionPlanType.PREMIUM_MONTH_TIER_2.getPlanId(), i3, modelSubscription);
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:162:0x0264  */
-    /* JADX WARNING: Removed duplicated region for block: B:170:0x0277  */
-    /* JADX WARNING: Removed duplicated region for block: B:172:0x027e  */
-    /* JADX WARNING: Removed duplicated region for block: B:192:0x00b3 A[EDGE_INSN: B:192:0x00b3->B:48:0x00b3 ?: BREAK  , SYNTHETIC] */
+    /* JADX WARNING: Removed duplicated region for block: B:197:0x00b3 A[EDGE_INSN: B:197:0x00b3->B:48:0x00b3 ?: BREAK  , SYNTHETIC] */
     /* JADX WARNING: Removed duplicated region for block: B:70:0x0102  */
     /* JADX WARNING: Removed duplicated region for block: B:71:0x0107  */
     /* JADX WARNING: Removed duplicated region for block: B:80:0x0128  */
@@ -431,10 +428,10 @@ public final class WidgetSettingsPremium extends AppFragment {
                 }
                 obj2 = it.next();
                 ModelInvoiceItem modelInvoiceItem2 = (ModelInvoiceItem) obj2;
-                if (modelInvoiceItem2.getSubscriptionPlanId() != premiumSubscription.getPlanId()) {
+                if (modelInvoiceItem2.getSubscriptionPlanId() != premiumSubscription.getPremiumBasePlanId()) {
                     long subscriptionPlanId = modelInvoiceItem2.getSubscriptionPlanId();
                     ModelSubscription.SubscriptionRenewalMutations renewalMutations3 = premiumSubscription.getRenewalMutations();
-                    if (renewalMutations3 == null || subscriptionPlanId != renewalMutations3.getPlanId()) {
+                    if (renewalMutations3 == null || subscriptionPlanId != renewalMutations3.getPremiumBasePlanId()) {
                         z5 = false;
                         continue;
                         if (z5) {
@@ -459,15 +456,15 @@ public final class WidgetSettingsPremium extends AppFragment {
                             function02 = premiumSubscriptionViewCallbacks.getManageBillingCallback();
                         } else if (premiumSubscription.getRenewalMutations() != null) {
                             function0 = null;
-                            getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
+                            getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPremiumBasePlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPremiumBasePlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
                         } else {
                             function02 = premiumSubscription.getStatus().isCanceled() ? premiumSubscriptionViewCallbacks.getRestoreCallback() : premiumSubscriptionViewCallbacks.getManagePlanCallback();
                         }
                         function0 = function02;
                         if (!isGoogleSubscription) {
-                            getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
+                            getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPremiumBasePlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPremiumBasePlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
                         }
-                        getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
+                        getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPremiumBasePlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPremiumBasePlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
                     }
                 }
             }
@@ -476,7 +473,7 @@ public final class WidgetSettingsPremium extends AppFragment {
             if (!premiumSubscription.getStatus().isAccountHold()) {
             }
             function0 = function02;
-            getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
+            getBinding().f.a(ActiveSubscriptionView.b(premiumSubscription), premiumSubscription.getStatus(), premiumSubscription.getTrialId() == null, priceText, loaded.isBusy(), premiumSubscriptionCount, function0, premiumSubscriptionViewCallbacks.getManagePremiumGuildCallback(), premiumSubscriptionViewCallbacks.getCancelCallback(), !isGoogleSubscription && (((renewalMutations = premiumSubscription.getRenewalMutations()) != null && renewalMutations.getPremiumBasePlanId() == SubscriptionPlanType.NONE_MONTH.getPlanId()) || ((renewalMutations2 = premiumSubscription.getRenewalMutations()) != null && renewalMutations2.getPremiumBasePlanId() == SubscriptionPlanType.NONE_YEAR.getPlanId())));
         }
         ModelInvoicePreview currentInvoicePreview2 = loaded.getCurrentInvoicePreview();
         if (currentInvoicePreview2 == null || (invoiceItems = currentInvoicePreview2.getInvoiceItems()) == null) {
@@ -489,9 +486,10 @@ public final class WidgetSettingsPremium extends AppFragment {
                     break;
                 }
                 obj = it2.next();
-                ModelInvoiceItem modelInvoiceItem4 = (ModelInvoiceItem) obj;
-                if (premiumSubscription != null) {
-                    z3 = premiumSubscription.hasAnyOfPlans(m0.setOf(Long.valueOf(modelInvoiceItem4.getSubscriptionPlanId())));
+                long subscriptionPlanId2 = ((ModelInvoiceItem) obj).getSubscriptionPlanId();
+                Long premiumGuildPlanId = premiumSubscription != null ? premiumSubscription.getPremiumGuildPlanId() : null;
+                if (premiumGuildPlanId != null && subscriptionPlanId2 == premiumGuildPlanId.longValue()) {
+                    z3 = true;
                     continue;
                 } else {
                     z3 = false;
@@ -538,30 +536,17 @@ public final class WidgetSettingsPremium extends AppFragment {
                         break;
                     }
                 }
-                if (isGoogleSubscription) {
-                    if ((premiumSubscription == null || (status3 = premiumSubscription.getStatus()) == null) ? false : status3.isCanceled()) {
-                        z6 = true;
-                    }
-                }
-                Function0<Unit> restoreCallback = !z6 ? premiumGuildSubscriptionViewCallbacks.getRestoreCallback() : (premiumSubscription == null || (status = premiumSubscription.getStatus()) == null || !status.isAccountHold()) ? premiumGuildSubscriptionViewCallbacks.getManagePlanCallback() : premiumGuildSubscriptionViewCallbacks.getManageBillingCallback();
-                ActiveSubscriptionView activeSubscriptionView4 = getBinding().e;
-                ActiveSubscriptionView.ActiveSubscriptionType activeSubscriptionType = ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_GUILD;
-                ModelSubscription.Status status4 = (!z2 || z6) ? ModelSubscription.Status.CANCELED : (premiumSubscription == null || (status2 = premiumSubscription.getStatus()) == null || !status2.isAccountHold()) ? ModelSubscription.Status.ACTIVE : ModelSubscription.Status.ACCOUNT_HOLD;
-                boolean isBusy = loaded.isBusy();
-                Function0<Unit> managePremiumGuildCallback = premiumGuildSubscriptionViewCallbacks.getManagePremiumGuildCallback();
-                Function0<Unit> cancelCallback = premiumGuildSubscriptionViewCallbacks.getCancelCallback();
-                int i2 = ActiveSubscriptionView.i;
-                activeSubscriptionView4.a(activeSubscriptionType, status4, false, priceText2, isBusy, size, restoreCallback, managePremiumGuildCallback, cancelCallback, false);
             }
             z2 = false;
             if (isGoogleSubscription) {
+                if ((premiumSubscription == null || (status3 = premiumSubscription.getStatus()) == null) ? false : status3.isCanceled()) {
+                    z6 = true;
+                }
             }
-            if (!z6) {
-            }
+            Function0<Unit> restoreCallback = z6 ? premiumGuildSubscriptionViewCallbacks.getRestoreCallback() : (premiumSubscription == null || (status = premiumSubscription.getStatus()) == null || !status.isAccountHold()) ? premiumGuildSubscriptionViewCallbacks.getManagePlanCallback() : premiumGuildSubscriptionViewCallbacks.getManageBillingCallback();
             ActiveSubscriptionView activeSubscriptionView4 = getBinding().e;
             ActiveSubscriptionView.ActiveSubscriptionType activeSubscriptionType = ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_GUILD;
-            if (!z2) {
-            }
+            ModelSubscription.Status status4 = (z2 || z6) ? ModelSubscription.Status.CANCELED : (premiumSubscription == null || (status2 = premiumSubscription.getStatus()) == null || !status2.isAccountHold()) ? ModelSubscription.Status.ACTIVE : ModelSubscription.Status.ACCOUNT_HOLD;
             boolean isBusy = loaded.isBusy();
             Function0<Unit> managePremiumGuildCallback = premiumGuildSubscriptionViewCallbacks.getManagePremiumGuildCallback();
             Function0<Unit> cancelCallback = premiumGuildSubscriptionViewCallbacks.getCancelCallback();
@@ -571,7 +556,7 @@ public final class WidgetSettingsPremium extends AppFragment {
     }
 
     private final void configureButtonText(Map<String, ? extends SkuDetails> map) {
-        MaterialButton materialButton = getBinding().f1937s.f;
+        MaterialButton materialButton = getBinding().f1939s.f;
         m.checkNotNullExpressionValue(materialButton, "binding.premiumTier1.premiumSettingsPremiumClassic");
         SkuDetails skuDetails = null;
         materialButton.setText(getPriceText(map != null ? (SkuDetails) map.get(GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName()) : null));
@@ -595,14 +580,14 @@ public final class WidgetSettingsPremium extends AppFragment {
     private final void configureButtons(ModelSubscription modelSubscription, Map<String, ? extends SkuDetails> map) {
         configureButtonText(map);
         if (modelSubscription == null || !modelSubscription.isAppleSubscription()) {
-            for (MaterialButton materialButton : n.listOf((Object[]) new MaterialButton[]{getBinding().f1937s.f, getBinding().t.b})) {
+            for (MaterialButton materialButton : n.listOf((Object[]) new MaterialButton[]{getBinding().f1939s.f, getBinding().t.b})) {
                 m.checkNotNullExpressionValue(materialButton, "button");
                 materialButton.setEnabled(modelSubscription == null);
                 materialButton.setOnClickListener(new WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2(materialButton, this, modelSubscription));
             }
             return;
         }
-        for (MaterialButton materialButton2 : n.listOf((Object[]) new MaterialButton[]{getBinding().f1937s.f, getBinding().t.b})) {
+        for (MaterialButton materialButton2 : n.listOf((Object[]) new MaterialButton[]{getBinding().f1939s.f, getBinding().t.b})) {
             m.checkNotNullExpressionValue(materialButton2, "button");
             ViewExtensions.setEnabledAlpha$default(materialButton2, true, 0.0f, 2, null);
             materialButton2.setOnClickListener(new WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1(this));
@@ -615,9 +600,9 @@ public final class WidgetSettingsPremium extends AppFragment {
         if (planType != null) {
             int ordinal = planType.ordinal();
             if (ordinal == 2) {
-                charSequence = b.j(this, 2131891981, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_MONTHLY_END_DATE())}, null, 4);
+                charSequence = b.j(this, 2131892052, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_MONTHLY_END_DATE())}, null, 4);
             } else if (ordinal == 3) {
-                charSequence = b.j(this, 2131891991, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_YEARLY_END_DATE())}, null, 4);
+                charSequence = b.j(this, 2131892062, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_YEARLY_END_DATE())}, null, 4);
             }
         }
         TextView textView = getBinding().i;
@@ -653,7 +638,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         textView2.setVisibility(0);
         TextView textView3 = getBinding().j;
         m.checkNotNullExpressionValue(textView3, "binding.premiumSettingsLegalese");
-        b.n(textView3, i, new Object[]{b.j(this, 2131893817, new Object[0], null, 4), b.j(this, 2131892376, new Object[0], null, 4), googleSubscriptionRenewalPrice}, null, 4);
+        b.m(textView3, i, new Object[]{b.j(this, 2131893915, new Object[0], null, 4), b.j(this, 2131892453, new Object[0], null, 4), googleSubscriptionRenewalPrice}, null, 4);
         TextView textView4 = getBinding().j;
         m.checkNotNullExpressionValue(textView4, "binding.premiumSettingsLegalese");
         textView4.setMovementMethod(LinkMovementMethod.getInstance());
@@ -686,10 +671,10 @@ public final class WidgetSettingsPremium extends AppFragment {
             obj = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodStart, requireContext, (String) null, (java.text.DateFormat) null, ordinal2 != 2 ? ordinal2 != 4 ? 0 : 30 : 3, 12, (Object) null);
         }
         obj = obj2;
-        LinearLayout linearLayout = getBinding().f1936c.f;
+        LinearLayout linearLayout = getBinding().f1938c.f;
         m.checkNotNullExpressionValue(linearLayout, "binding.payment.premiumSettingsPaymentContainer");
         linearLayout.setVisibility(premiumSubscription != null ? 0 : 8);
-        View view = getBinding().f1936c.f108c;
+        View view = getBinding().f1938c.f108c;
         m.checkNotNullExpressionValue(view, "binding.payment.premiumSettingsBillingDivider");
         view.setVisibility(isAppleSubscription ? 0 : 8);
         if (premiumSubscription != null) {
@@ -699,11 +684,11 @@ public final class WidgetSettingsPremium extends AppFragment {
             if (isGoogleSubscription && a != null) {
                 obj2 = a;
             } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM) {
-                obj2 = b.j(this, 2131892301, new Object[0], null, 4);
+                obj2 = b.j(this, 2131892378, new Object[0], null, 4);
             } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_CLASSIC) {
-                obj2 = b.j(this, 2131892299, new Object[0], null, 4);
+                obj2 = b.j(this, 2131892376, new Object[0], null, 4);
             } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_GUILD) {
-                obj2 = b.j(this, 2131892140, new Object[0], null, 4);
+                obj2 = b.j(this, 2131892211, new Object[0], null, 4);
             }
         }
         if (isAppleSubscription) {
@@ -719,48 +704,51 @@ public final class WidgetSettingsPremium extends AppFragment {
                         googleSubscriptionRenewalPrice = PremiumUtilsKt.getFormattedPriceUsd(renewalInvoicePreview != null ? renewalInvoicePreview.getTotal() : 0, requireContext());
                     }
                     objArr[1] = googleSubscriptionRenewalPrice;
-                    charSequence = b.j(this, 2131892247, objArr, null, 4);
+                    charSequence = b.j(this, 2131892323, objArr, null, 4);
                 } else if (ordinal3 == 2) {
-                    charSequence = b.j(this, 2131892244, new Object[]{obj2, obj}, null, 4);
+                    charSequence = b.j(this, 2131892320, new Object[]{obj2, obj}, null, 4);
                 } else if (ordinal3 == 3) {
-                    charSequence = b.j(this, 2131892241, new Object[]{obj}, null, 4);
+                    charSequence = b.j(this, 2131892317, new Object[]{obj}, null, 4);
                 } else if (ordinal3 == 4) {
-                    charSequence = b.j(this, 2131892235, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, premiumSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null)}, null, 4);
+                    charSequence = b.j(this, 2131892311, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, premiumSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null)}, null, 4);
                 }
             }
             charSequence = null;
         }
-        TextView textView = getBinding().f1936c.d;
+        TextView textView = getBinding().f1938c.d;
         m.checkNotNullExpressionValue(textView, "binding.payment.premiumSettingsBillingInformation");
         if (charSequence == null) {
             z2 = false;
         }
         textView.setVisibility(z2 ? 0 : 8);
         if (charSequence != null) {
-            TextView textView2 = getBinding().f1936c.d;
+            TextView textView2 = getBinding().f1938c.d;
             m.checkNotNullExpressionValue(textView2, "binding.payment.premiumSettingsBillingInformation");
             textView2.setText(charSequence);
         }
-        MaterialButton materialButton = getBinding().f1936c.b;
+        MaterialButton materialButton = getBinding().f1938c.b;
         m.checkNotNullExpressionValue(materialButton, "binding.payment.activeSubscriptionsBottomButton");
         if (isAppleSubscription) {
             charSequence2 = b.j(this, 2131886914, new Object[0], null, 4);
         }
         ViewExtensions.setTextAndVisibilityBy(materialButton, charSequence2);
-        getBinding().f1936c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription));
-        TextView textView3 = getBinding().f1936c.e;
+        getBinding().f1938c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription));
+        TextView textView3 = getBinding().f1938c.e;
         m.checkNotNullExpressionValue(textView3, "binding.payment.premiumSettingsGooglePlayManage");
         if (!isGoogleSubscription) {
             i = 8;
         }
         textView3.setVisibility(i);
-        getBinding().f1936c.e.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$2(isGoogleSubscription, premiumSubscription));
+        getBinding().f1938c.e.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$2(isGoogleSubscription, premiumSubscription));
     }
 
-    /* JADX WARNING: Code restructure failed: missing block: B:57:0x00df, code lost:
-        if (r2 != null) goto L_0x0106;
+    /* JADX WARNING: Code restructure failed: missing block: B:62:0x00ea, code lost:
+        if (r2 != null) goto L_0x0111;
      */
+    /* JADX WARNING: Removed duplicated region for block: B:24:0x0046  */
+    /* JADX WARNING: Removed duplicated region for block: B:25:0x0048  */
     private final void configureStatusNotice(ModelSubscription modelSubscription, Map<String, ? extends SkuDetails> map) {
+        boolean z2;
         CharSequence charSequence;
         CharSequence charSequence2;
         SubscriptionPlanType subscriptionPlanType;
@@ -768,82 +756,95 @@ public final class WidgetSettingsPremium extends AppFragment {
         CharSequence charSequence3;
         String paymentGatewayPlanId;
         ModelSubscription.Status status;
-        boolean z2 = (modelSubscription != null ? modelSubscription.getRenewalMutations() : null) != null;
+        boolean z3 = (modelSubscription != null ? modelSubscription.getRenewalMutations() : null) != null;
         boolean isAccountHold = (modelSubscription == null || (status = modelSubscription.getStatus()) == null) ? false : status.isAccountHold();
-        boolean z3 = z2 || isAccountHold;
+        if (z3 || isAccountHold) {
+            if ((modelSubscription != null ? modelSubscription.getStatus() : null) != ModelSubscription.Status.CANCELED) {
+                z2 = true;
+                CardView cardView = getBinding().n;
+                m.checkNotNullExpressionValue(cardView, "binding.premiumSettingsStatusNoticeContainer");
+                int i = 8;
+                cardView.setVisibility(!z2 ? 0 : 8);
+                if (z2 && modelSubscription != null) {
+                    boolean isGoogleSubscription = modelSubscription.isGoogleSubscription();
+                    if (z3) {
+                        String renderUtcDate$default = TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getCurrentPeriodEnd(), requireContext(), (String) null, (java.text.DateFormat) null, 0, 28, (Object) null);
+                        ModelSubscription.SubscriptionRenewalMutations renewalMutations = modelSubscription.getRenewalMutations();
+                        SkuDetails skuDetails = (renewalMutations == null || (paymentGatewayPlanId = renewalMutations.getPaymentGatewayPlanId()) == null || map == null) ? null : (SkuDetails) map.get(paymentGatewayPlanId);
+                        SubscriptionPlanType[] values = SubscriptionPlanType.values();
+                        int i2 = 0;
+                        while (true) {
+                            if (i2 >= 10) {
+                                subscriptionPlanType2 = null;
+                                break;
+                            }
+                            subscriptionPlanType2 = values[i2];
+                            long planId = subscriptionPlanType2.getPlanId();
+                            ModelSubscription.SubscriptionRenewalMutations renewalMutations2 = modelSubscription.getRenewalMutations();
+                            if (renewalMutations2 != null && planId == renewalMutations2.getPremiumBasePlanId()) {
+                                break;
+                            }
+                            i2++;
+                        }
+                        if (!isGoogleSubscription || skuDetails == null) {
+                            charSequence3 = getPlanString(subscriptionPlanType2);
+                        } else {
+                            charSequence3 = skuDetails.a();
+                            m.checkNotNullExpressionValue(charSequence3, "skuDetails.description");
+                        }
+                        charSequence = b.j(this, 2131892286, new Object[]{charSequence3, renderUtcDate$default}, null, 4);
+                    } else if (isAccountHold) {
+                        String paymentGatewayPlanId2 = modelSubscription.getPaymentGatewayPlanId();
+                        if (paymentGatewayPlanId2 != null) {
+                            SkuDetails skuDetails2 = map != null ? (SkuDetails) map.get(paymentGatewayPlanId2) : null;
+                            if (skuDetails2 != null) {
+                                charSequence2 = skuDetails2.a();
+                            }
+                        }
+                        SubscriptionPlanType[] values2 = SubscriptionPlanType.values();
+                        int i3 = 0;
+                        while (true) {
+                            if (i3 >= 10) {
+                                subscriptionPlanType = null;
+                                break;
+                            }
+                            subscriptionPlanType = values2[i3];
+                            if (modelSubscription.hasAnyOfPlans(m0.setOf(Long.valueOf(subscriptionPlanType.getPlanId())))) {
+                                break;
+                            }
+                            i3++;
+                        }
+                        charSequence2 = getPlanString(subscriptionPlanType);
+                        charSequence = b.j(this, 2131892315, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null), charSequence2}, null, 4);
+                    } else {
+                        charSequence = "";
+                    }
+                    TextView textView = getBinding().o;
+                    m.checkNotNullExpressionValue(textView, "binding.premiumSettingsStatusNoticeTv");
+                    textView.setText(charSequence);
+                    Button button = getBinding().m;
+                    m.checkNotNullExpressionValue(button, "binding.premiumSettingsStatusNoticeButton");
+                    if (isAccountHold) {
+                        i = 0;
+                    }
+                    button.setVisibility(i);
+                    if (isAccountHold) {
+                        Button button2 = getBinding().m;
+                        m.checkNotNullExpressionValue(button2, "binding.premiumSettingsStatusNoticeButton");
+                        b.m(button2, 2131892314, new Object[0], null, 4);
+                        getBinding().m.setOnClickListener(new WidgetSettingsPremium$configureStatusNotice$1(this, modelSubscription));
+                        return;
+                    }
+                    return;
+                }
+            }
+        }
+        z2 = false;
         CardView cardView = getBinding().n;
         m.checkNotNullExpressionValue(cardView, "binding.premiumSettingsStatusNoticeContainer");
         int i = 8;
-        cardView.setVisibility(z3 ? 0 : 8);
-        if (z3 && modelSubscription != null) {
-            boolean isGoogleSubscription = modelSubscription.isGoogleSubscription();
-            if (z2) {
-                String renderUtcDate$default = TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getCurrentPeriodEnd(), requireContext(), (String) null, (java.text.DateFormat) null, 0, 28, (Object) null);
-                ModelSubscription.SubscriptionRenewalMutations renewalMutations = modelSubscription.getRenewalMutations();
-                SkuDetails skuDetails = (renewalMutations == null || (paymentGatewayPlanId = renewalMutations.getPaymentGatewayPlanId()) == null || map == null) ? null : (SkuDetails) map.get(paymentGatewayPlanId);
-                SubscriptionPlanType[] values = SubscriptionPlanType.values();
-                int i2 = 0;
-                while (true) {
-                    if (i2 >= 10) {
-                        subscriptionPlanType2 = null;
-                        break;
-                    }
-                    subscriptionPlanType2 = values[i2];
-                    long planId = subscriptionPlanType2.getPlanId();
-                    ModelSubscription.SubscriptionRenewalMutations renewalMutations2 = modelSubscription.getRenewalMutations();
-                    if (renewalMutations2 != null && planId == renewalMutations2.getPlanId()) {
-                        break;
-                    }
-                    i2++;
-                }
-                if (!isGoogleSubscription || skuDetails == null) {
-                    charSequence3 = getPlanString(subscriptionPlanType2);
-                } else {
-                    charSequence3 = skuDetails.a();
-                    m.checkNotNullExpressionValue(charSequence3, "skuDetails.description");
-                }
-                charSequence = b.j(this, 2131892212, new Object[]{charSequence3, renderUtcDate$default}, null, 4);
-            } else if (isAccountHold) {
-                String paymentGatewayPlanId2 = modelSubscription.getPaymentGatewayPlanId();
-                if (paymentGatewayPlanId2 != null) {
-                    SkuDetails skuDetails2 = map != null ? (SkuDetails) map.get(paymentGatewayPlanId2) : null;
-                    if (skuDetails2 != null) {
-                        charSequence2 = skuDetails2.a();
-                    }
-                }
-                SubscriptionPlanType[] values2 = SubscriptionPlanType.values();
-                int i3 = 0;
-                while (true) {
-                    if (i3 >= 10) {
-                        subscriptionPlanType = null;
-                        break;
-                    }
-                    subscriptionPlanType = values2[i3];
-                    if (modelSubscription.hasAnyOfPlans(m0.setOf(Long.valueOf(subscriptionPlanType.getPlanId())))) {
-                        break;
-                    }
-                    i3++;
-                }
-                charSequence2 = getPlanString(subscriptionPlanType);
-                charSequence = b.j(this, 2131892239, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null), charSequence2}, null, 4);
-            } else {
-                charSequence = "";
-            }
-            TextView textView = getBinding().o;
-            m.checkNotNullExpressionValue(textView, "binding.premiumSettingsStatusNoticeTv");
-            textView.setText(charSequence);
-            Button button = getBinding().m;
-            m.checkNotNullExpressionValue(button, "binding.premiumSettingsStatusNoticeButton");
-            if (isAccountHold) {
-                i = 0;
-            }
-            button.setVisibility(i);
-            if (isAccountHold) {
-                Button button2 = getBinding().m;
-                m.checkNotNullExpressionValue(button2, "binding.premiumSettingsStatusNoticeButton");
-                b.n(button2, 2131892238, new Object[0], null, 4);
-                getBinding().m.setOnClickListener(new WidgetSettingsPremium$configureStatusNotice$1(this, modelSubscription));
-            }
+        cardView.setVisibility(!z2 ? 0 : 8);
+        if (z2) {
         }
     }
 
@@ -877,16 +878,16 @@ public final class WidgetSettingsPremium extends AppFragment {
         if (subscriptionPlanType != null) {
             int ordinal = subscriptionPlanType.ordinal();
             if (ordinal == 4) {
-                return b.j(this, 2131892215, new Object[0], null, 4);
+                return b.j(this, 2131892289, new Object[0], null, 4);
             }
             if (ordinal == 5) {
-                return b.j(this, 2131892219, new Object[0], null, 4);
+                return b.j(this, 2131892293, new Object[0], null, 4);
             }
             if (ordinal == 6) {
-                return b.j(this, 2131892216, new Object[0], null, 4);
+                return b.j(this, 2131892290, new Object[0], null, 4);
             }
             if (ordinal == 7) {
-                return b.j(this, 2131892220, new Object[0], null, 4);
+                return b.j(this, 2131892294, new Object[0], null, 4);
             }
         }
         return "";
@@ -922,7 +923,7 @@ public final class WidgetSettingsPremium extends AppFragment {
     }
 
     private final CharSequence getPriceText(SkuDetails skuDetails) {
-        return skuDetails != null ? b.j(this, 2131892251, new Object[]{skuDetails.b()}, null, 4) : b.j(this, 2131893616, new Object[0], null, 4);
+        return skuDetails != null ? b.j(this, 2131892327, new Object[]{skuDetails.b()}, null, 4) : b.j(this, 2131893713, new Object[0], null, 4);
     }
 
     /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0056: APUT  
@@ -970,18 +971,18 @@ public final class WidgetSettingsPremium extends AppFragment {
     private final void scrollToSection(Integer num) {
         int i;
         if (num != null && num.intValue() == 0) {
-            p2 p2Var = getBinding().f1937s;
-            m.checkNotNullExpressionValue(p2Var, "binding.premiumTier1");
-            LinearLayout linearLayout = p2Var.a;
+            r2 r2Var = getBinding().f1939s;
+            m.checkNotNullExpressionValue(r2Var, "binding.premiumTier1");
+            LinearLayout linearLayout = r2Var.a;
             m.checkNotNullExpressionValue(linearLayout, "binding.premiumTier1.root");
             int top = linearLayout.getTop();
             ScrollView scrollView = getBinding().l;
             m.checkNotNullExpressionValue(scrollView, "binding.premiumSettingsScrollview");
             i = scrollView.getHeight() + top;
         } else if (num != null && num.intValue() == 1) {
-            q2 q2Var = getBinding().t;
-            m.checkNotNullExpressionValue(q2Var, "binding.premiumTier2");
-            LinearLayout linearLayout2 = q2Var.a;
+            s2 s2Var = getBinding().t;
+            m.checkNotNullExpressionValue(s2Var, "binding.premiumTier2");
+            LinearLayout linearLayout2 = s2Var.a;
             m.checkNotNullExpressionValue(linearLayout2, "binding.premiumTier2.root");
             i = linearLayout2.getTop();
         } else {
@@ -998,7 +999,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131891934, new Object[0], null, 4), b.j(this, 2131891926, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131891933, new Object[0], null, 4), b.j(this, 2131891333, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364032, new WidgetSettingsPremium$showCancelConfirmationAlert$1(settingsPremiumViewModel))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131892006, new Object[0], null, 4), b.j(this, 2131891998, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131892005, new Object[0], null, 4), b.j(this, 2131891404, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364075, new WidgetSettingsPremium$showCancelConfirmationAlert$1(settingsPremiumViewModel))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
     }
 
     private final void showContent(SettingsPremiumViewModel.ViewState.Loaded loaded) {
@@ -1023,9 +1024,9 @@ public final class WidgetSettingsPremium extends AppFragment {
             Integer valueOf3 = extras != null ? Integer.valueOf(extras.getInt("intent_section", -1)) : null;
             if (valueOf3 == null || valueOf3.intValue() != -1) {
                 try {
-                    Observable<Long> e02 = Observable.e0(300, TimeUnit.MILLISECONDS);
-                    m.checkNotNullExpressionValue(e02, "Observable\n            .…0, TimeUnit.MILLISECONDS)");
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$showContent$1(this, valueOf3), 62, (Object) null);
+                    Observable<Long> d02 = Observable.d0(300, TimeUnit.MILLISECONDS);
+                    m.checkNotNullExpressionValue(d02, "Observable\n            .…0, TimeUnit.MILLISECONDS)");
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$showContent$1(this, valueOf3), 62, (Object) null);
                 } catch (Exception e) {
                     Logger.e$default(AppLog.g, "Error Scrolling to section", e, null, 4, null);
                 }
@@ -1051,7 +1052,7 @@ public final class WidgetSettingsPremium extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131886914, new Object[0], null, 4), b.j(this, 2131892170, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131892096, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131886914, new Object[0], null, 4), b.j(this, 2131892241, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131892167, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showFailureUI() {
@@ -1072,19 +1073,19 @@ public final class WidgetSettingsPremium extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131892307);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131892384);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         TextView textView = getBinding().d.e;
         m.checkNotNullExpressionValue(textView, "binding.premiumPerks.premiumPerksUploadText");
-        textView.setText(b.c(view, 2131891952, new Object[0], new WidgetSettingsPremium$onViewBound$1(this)));
-        TextView textView2 = getBinding().f1937s.e;
+        textView.setText(b.c(view, 2131892024, new Object[0], new WidgetSettingsPremium$onViewBound$1(this)));
+        TextView textView2 = getBinding().f1939s.e;
         m.checkNotNullExpressionValue(textView2, "binding.premiumTier1.pre…NitroClassicBoostDiscount");
-        ViewExtensions.setTextAndVisibilityBy(textView2, b.j(this, 2131889832, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(textView2, b.j(this, 2131889840, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4));
         CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755166, 2, 2);
-        TextView textView3 = getBinding().f1937s.d;
+        TextView textView3 = getBinding().f1939s.d;
         m.checkNotNullExpressionValue(textView3, "binding.premiumTier1.pre…ngsNitroClassicBoostCount");
-        ViewExtensions.setTextAndVisibilityBy(textView3, b.j(this, 2131889833, new Object[]{i18nPluralString}, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(textView3, b.j(this, 2131889841, new Object[]{i18nPluralString}, null, 4));
         NumberFormat instance = NumberFormat.getInstance(this.localeManager.getPrimaryLocale(requireContext()));
         TextView textView4 = getBinding().d.b;
         m.checkNotNullExpressionValue(textView4, "binding.premiumPerks.premiumPerksMaxGuilds");
@@ -1092,31 +1093,31 @@ public final class WidgetSettingsPremium extends AppFragment {
         textView4.setVisibility(isIncreasedMaxGuildsEnabled() ? 0 : 8);
         TextView textView5 = getBinding().d.b;
         m.checkNotNullExpressionValue(textView5, "binding.premiumPerks.premiumPerksMaxGuilds");
-        textView5.setText(b.d(this, 2131891954, new Object[0], new WidgetSettingsPremium$onViewBound$2(instance)));
-        TextView textView6 = getBinding().d.f134c;
+        textView5.setText(b.d(this, 2131892026, new Object[0], new WidgetSettingsPremium$onViewBound$2(instance)));
+        TextView textView6 = getBinding().d.f146c;
         m.checkNotNullExpressionValue(textView6, "binding.premiumPerks.premiumPerksMaxMessageLength");
         textView6.setVisibility(isIncreasedMessageLengthEnabled() ? 0 : 8);
-        TextView textView7 = getBinding().d.f134c;
+        TextView textView7 = getBinding().d.f146c;
         m.checkNotNullExpressionValue(textView7, "binding.premiumPerks.premiumPerksMaxMessageLength");
-        textView7.setText(b.d(this, 2131891955, new Object[0], new WidgetSettingsPremium$onViewBound$3(instance)));
-        TextView textView8 = getBinding().f1937s.b;
+        textView7.setText(b.d(this, 2131892027, new Object[0], new WidgetSettingsPremium$onViewBound$3(instance)));
+        TextView textView8 = getBinding().f1939s.b;
         m.checkNotNullExpressionValue(textView8, "binding.premiumTier1.maxGuilds");
         textView8.setVisibility(isIncreasedMaxGuildsEnabled() ? 0 : 8);
-        TextView textView9 = getBinding().f1937s.f138c;
+        TextView textView9 = getBinding().f1939s.f148c;
         m.checkNotNullExpressionValue(textView9, "binding.premiumTier1.maxMessageLength");
         textView9.setVisibility(isIncreasedMessageLengthEnabled() ? 0 : 8);
         TextView textView10 = getBinding().d.d;
         m.checkNotNullExpressionValue(textView10, "binding.premiumPerks.premiumPerksStickers");
         StickerPickerFeatureFlag.Companion companion = StickerPickerFeatureFlag.Companion;
         textView10.setVisibility(companion.getINSTANCE().isEnabled() ? 0 : 8);
-        TextView textView11 = getBinding().f1937s.g;
+        TextView textView11 = getBinding().f1939s.g;
         m.checkNotNullExpressionValue(textView11, "binding.premiumTier1.tier1StickersPerk");
         if (companion.getINSTANCE().isEnabled()) {
             i = 0;
         }
         textView11.setVisibility(i);
         configureButtonText$default(this, null, 1, null);
-        for (TextView textView12 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f1936c.g})) {
+        for (TextView textView12 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f1938c.g})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView12, "header");
             accessibilityUtils.setViewIsHeading(textView12);
@@ -1126,9 +1127,9 @@ public final class WidgetSettingsPremium extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<SettingsPremiumViewModel.ViewState> s2 = getViewModel().observeViewState().q(200, TimeUnit.MILLISECONDS).s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetSettingsPremium.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<SettingsPremiumViewModel.ViewState> r = getViewModel().observeViewState().q(200, TimeUnit.MILLISECONDS).r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(r, this, null, 2, null), WidgetSettingsPremium.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getViewModel().getEventSubject(), this, null, 2, null), WidgetSettingsPremium.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremium$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java
index c1abeccdba..fba4de70ba 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java
@@ -32,20 +32,20 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GuildListItem(SettingsPremiumGuildSubscriptionSampleGuildAdapter settingsPremiumGuildSubscriptionSampleGuildAdapter) {
-            super(2131558810, settingsPremiumGuildSubscriptionSampleGuildAdapter);
+            super(2131558813, settingsPremiumGuildSubscriptionSampleGuildAdapter);
             m.checkNotNullParameter(settingsPremiumGuildSubscriptionSampleGuildAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362146;
-            TextView textView = (TextView) view.findViewById(2131362146);
+            int i = 2131362157;
+            TextView textView = (TextView) view.findViewById(2131362157);
             if (textView != null) {
-                i = 2131362147;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362147);
+                i = 2131362158;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362158);
                 if (simpleDraweeView != null) {
-                    i = 2131362148;
-                    TextView textView2 = (TextView) view.findViewById(2131362148);
+                    i = 2131362159;
+                    TextView textView2 = (TextView) view.findViewById(2131362159);
                     if (textView2 != null) {
-                        i = 2131362149;
-                        PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(2131362149);
+                        i = 2131362160;
+                        PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(2131362160);
                         if (premiumGuildProgressView != null) {
                             ViewSettingsBoostedSampleGuildBinding viewSettingsBoostedSampleGuildBinding = new ViewSettingsBoostedSampleGuildBinding((CardView) view, textView, simpleDraweeView, textView2, premiumGuildProgressView);
                             m.checkNotNullExpressionValue(viewSettingsBoostedSampleGuildBinding, "ViewSettingsBoostedSampl…ildBinding.bind(itemView)");
@@ -66,7 +66,7 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG
             m.checkNotNullParameter(item, "data");
             super.onConfigure(i, (int) item);
             int premiumSubscriptionCount = item.getGuild().getPremiumSubscriptionCount();
-            SimpleDraweeView simpleDraweeView = this.binding.f1663c;
+            SimpleDraweeView simpleDraweeView = this.binding.f1660c;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.boostedSampleGuildIcon");
             IconUtils.setIcon$default((ImageView) simpleDraweeView, item.getGuild(), 0, (MGImages.ChangeDetector) null, false, 28, (Object) null);
             TextView textView = this.binding.d;
@@ -74,7 +74,7 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG
             textView.setText(item.getGuild().getName());
             TextView textView2 = this.binding.b;
             m.checkNotNullExpressionValue(textView2, "binding.boostedSampleGuildCount");
-            textView2.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755261, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
+            textView2.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755262, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)));
             this.binding.e.a(item.getGuild().getPremiumTier(), premiumSubscriptionCount);
             this.itemView.setOnClickListener(new SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem$onConfigure$1(this, item));
         }
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
index f13c7d4ab0..1af3a8748e 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java
@@ -87,12 +87,12 @@ public final class SettingsPremiumGuildViewModel extends AppViewModel<ViewState>
             Observable observePremiumGuildSubscriptionsState$default = StorePremiumGuildSubscription.observePremiumGuildSubscriptionsState$default(companion.getPremiumGuildSubscriptions(), null, 1, null);
             Observable<StoreSubscriptions.SubscriptionsState> observeSubscriptions = companion.getSubscriptions().observeSubscriptions();
             Observable<LinkedHashMap<Long, Guild>> observeOrderedGuilds = companion.getGuildsSorted().observeOrderedGuilds();
-            Observable s2 = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).G(SettingsPremiumGuildViewModel$Companion$observeStores$1.INSTANCE).s();
+            Observable r = StoreUser.observeMe$default(companion.getUsers(), false, 1, null).F(SettingsPremiumGuildViewModel$Companion$observeStores$1.INSTANCE).r();
             SettingsPremiumGuildViewModel$Companion$observeStores$2 settingsPremiumGuildViewModel$Companion$observeStores$2 = SettingsPremiumGuildViewModel$Companion$observeStores$2.INSTANCE;
             if (settingsPremiumGuildViewModel$Companion$observeStores$2 != null) {
                 settingsPremiumGuildViewModel$Companion$observeStores$2 = new SettingsPremiumGuildViewModel$sam$rx_functions_Func4$0(settingsPremiumGuildViewModel$Companion$observeStores$2);
             }
-            Observable<StoreState> h = Observable.h(observePremiumGuildSubscriptionsState$default, observeSubscriptions, observeOrderedGuilds, s2, (Func4) settingsPremiumGuildViewModel$Companion$observeStores$2);
+            Observable<StoreState> h = Observable.h(observePremiumGuildSubscriptionsState$default, observeSubscriptions, observeOrderedGuilds, r, (Func4) settingsPremiumGuildViewModel$Companion$observeStores$2);
             m.checkNotNullExpressionValue(h, "Observable.combineLatest…     ::StoreState\n      )");
             return h;
         }
@@ -723,7 +723,7 @@ public final class SettingsPremiumGuildViewModel extends AppViewModel<ViewState>
             }
         }
         if (!hashMap.isEmpty()) {
-            arrayList.add(new WidgetSettingsPremiumGuildSubscriptionAdapter.Item.HeaderItem(2131892067));
+            arrayList.add(new WidgetSettingsPremiumGuildSubscriptionAdapter.Item.HeaderItem(2131892138));
         }
         for (Map.Entry entry : hashMap.entrySet()) {
             Long l2 = (Long) entry.getKey();
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java
index 14c1e6031e..2612171af1 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java
@@ -7,7 +7,7 @@ import android.widget.TextView;
 import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.g3;
+import c.a.i.j3;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetSettingsBoostBinding;
 import com.discord.utilities.view.text.LinkifiedTextView;
@@ -27,44 +27,44 @@ public final /* synthetic */ class WidgetSettingsPremiumGuildSubscription$bindin
 
     public final WidgetSettingsBoostBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364014;
-        View findViewById = view.findViewById(2131364014);
+        int i = 2131364057;
+        View findViewById = view.findViewById(2131364057);
         if (findViewById != null) {
-            int i2 = 2131364812;
-            ImageView imageView = (ImageView) findViewById.findViewById(2131364812);
+            int i2 = 2131364861;
+            ImageView imageView = (ImageView) findViewById.findViewById(2131364861);
             if (imageView != null) {
-                i2 = 2131364813;
-                TextView textView = (TextView) findViewById.findViewById(2131364813);
+                i2 = 2131364862;
+                TextView textView = (TextView) findViewById.findViewById(2131364862);
                 if (textView != null) {
-                    i2 = 2131364814;
-                    TextView textView2 = (TextView) findViewById.findViewById(2131364814);
+                    i2 = 2131364863;
+                    TextView textView2 = (TextView) findViewById.findViewById(2131364863);
                     if (textView2 != null) {
-                        g3 g3Var = new g3((LinearLayoutCompat) findViewById, imageView, textView, textView2);
-                        i = 2131364810;
-                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364810);
+                        j3 j3Var = new j3((LinearLayoutCompat) findViewById, imageView, textView, textView2);
+                        i = 2131364859;
+                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364859);
                         if (appViewFlipper != null) {
-                            i = 2131364811;
-                            PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131364811);
+                            i = 2131364860;
+                            PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131364860);
                             if (premiumSubscriptionMarketingView != null) {
-                                i = 2131364815;
-                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364815);
+                                i = 2131364864;
+                                RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364864);
                                 if (recyclerView != null) {
-                                    i = 2131364816;
-                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364816);
+                                    i = 2131364865;
+                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131364865);
                                     if (materialButton != null) {
-                                        i = 2131364817;
-                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364817);
+                                        i = 2131364866;
+                                        RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364866);
                                         if (recyclerView2 != null) {
-                                            i = 2131364818;
-                                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364818);
+                                            i = 2131364867;
+                                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364867);
                                             if (linkifiedTextView != null) {
-                                                i = 2131364819;
-                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364819);
+                                                i = 2131364868;
+                                                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364868);
                                                 if (linearLayout != null) {
-                                                    i = 2131364820;
-                                                    PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131364820);
+                                                    i = 2131364869;
+                                                    PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131364869);
                                                     if (premiumGuildSubscriptionUpsellView != null) {
-                                                        return new WidgetSettingsBoostBinding((CoordinatorLayout) view, g3Var, appViewFlipper, premiumSubscriptionMarketingView, recyclerView, materialButton, recyclerView2, linkifiedTextView, linearLayout, premiumGuildSubscriptionUpsellView);
+                                                        return new WidgetSettingsBoostBinding((CoordinatorLayout) view, j3Var, appViewFlipper, premiumSubscriptionMarketingView, recyclerView, materialButton, recyclerView2, linkifiedTextView, linearLayout, premiumGuildSubscriptionUpsellView);
                                                     }
                                                 }
                                             }
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
index bcbc3a25ca..55068b1da0 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java
@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.a.d.a;
-import c.a.a.d.b;
+import c.a.a.c.a;
+import c.a.a.c.b;
 import c.a.d.f;
 import c.a.d.h0;
 import c.a.d.j0;
@@ -69,7 +69,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     }
 
     public WidgetSettingsPremiumGuildSubscription() {
-        super(2131559195);
+        super(2131559201);
         WidgetSettingsPremiumGuildSubscription$viewModel$2 widgetSettingsPremiumGuildSubscription$viewModel$2 = WidgetSettingsPremiumGuildSubscription$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsPremiumGuildViewModel.class), new WidgetSettingsPremiumGuildSubscription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsPremiumGuildSubscription$viewModel$2));
@@ -103,7 +103,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
         TextView textView = getBinding().b.d;
         m.checkNotNullExpressionValue(textView, "binding.noGuilds.settingsBoostNoGuildsTitle");
         textView.setVisibility(z2 ? 0 : 8);
-        TextView textView2 = getBinding().b.f95c;
+        TextView textView2 = getBinding().b.f110c;
         m.checkNotNullExpressionValue(textView2, "binding.noGuilds.settingsBoostNoGuildsSubtitle");
         if (!z2) {
             i = 8;
@@ -132,7 +132,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     }
 
     private final void showContent(SettingsPremiumGuildViewModel.ViewState.Loaded loaded) {
-        AppViewFlipper appViewFlipper = getBinding().f1922c;
+        AppViewFlipper appViewFlipper = getBinding().f1924c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper");
         appViewFlipper.setDisplayedChild(2);
         boolean z2 = !loaded.getPremiumGuildSubscriptionItems().isEmpty();
@@ -169,20 +169,20 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
                 getViewModel().consumePendingAction();
             }
         } else if (pendingAction instanceof SettingsPremiumGuildViewModel.PendingAction.Cancel) {
-            a.b bVar = c.a.a.d.a.j;
+            a.b bVar = c.a.a.c.a.j;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             long slotId = ((SettingsPremiumGuildViewModel.PendingAction.Cancel) pendingAction).getSlotId();
             Objects.requireNonNull(bVar);
             m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
-            c.a.a.d.a aVar = new c.a.a.d.a();
+            c.a.a.c.a aVar = new c.a.a.c.a();
             Bundle bundle = new Bundle();
             bundle.putLong("extra_slot_id", slotId);
             aVar.setArguments(bundle);
-            aVar.show(parentFragmentManager, c.a.a.d.a.class.getName());
+            aVar.show(parentFragmentManager, c.a.a.c.a.class.getName());
             getViewModel().consumePendingAction();
         } else if (pendingAction instanceof SettingsPremiumGuildViewModel.PendingAction.Uncancel) {
-            b.C0010b bVar2 = b.j;
+            b.C0006b bVar2 = b.j;
             FragmentManager parentFragmentManager2 = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
             long slotId2 = ((SettingsPremiumGuildViewModel.PendingAction.Uncancel) pendingAction).getSlotId();
@@ -201,13 +201,13 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     }
 
     private final void showFailureUI() {
-        AppViewFlipper appViewFlipper = getBinding().f1922c;
+        AppViewFlipper appViewFlipper = getBinding().f1924c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper");
         appViewFlipper.setDisplayedChild(1);
     }
 
     private final void showLoadingUI() {
-        AppViewFlipper appViewFlipper = getBinding().f1922c;
+        AppViewFlipper appViewFlipper = getBinding().f1924c;
         m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper");
         appViewFlipper.setDisplayedChild(0);
     }
@@ -217,8 +217,8 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131892140);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131892211);
         MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion;
         RecyclerView recyclerView = getBinding().e;
         m.checkNotNullExpressionValue(recyclerView, "binding.settingsBoostRecycler");
@@ -229,7 +229,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
         String a = f.a.a(360028038352L, null);
         LinkifiedTextView linkifiedTextView = getBinding().h;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsBoostSubtext");
-        c.a.l.b.n(linkifiedTextView, 2131892139, new Object[]{a}, null, 4);
+        c.a.l.b.m(linkifiedTextView, 2131892210, new Object[]{a}, null, 4);
         getBinding().h.setOnClickListener(new WidgetSettingsPremiumGuildSubscription$onViewBound$1(a));
         getBinding().f.setOnClickListener(new WidgetSettingsPremiumGuildSubscription$onViewBound$2(this));
         getBinding().e.setHasFixedSize(false);
@@ -239,8 +239,8 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<SettingsPremiumGuildViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetSettingsPremium.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<SettingsPremiumGuildViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetSettingsPremium.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsPremiumGuildSubscription$onViewBoundOrOnResume$1(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java
index d11e25ab71..ca11a8454d 100644
--- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java
+++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java
@@ -55,26 +55,26 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GuildListItem(WidgetSettingsPremiumGuildSubscriptionAdapter widgetSettingsPremiumGuildSubscriptionAdapter) {
-            super(2131558808, widgetSettingsPremiumGuildSubscriptionAdapter);
+            super(2131558811, widgetSettingsPremiumGuildSubscriptionAdapter);
             m.checkNotNullParameter(widgetSettingsPremiumGuildSubscriptionAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362142;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362142);
+            int i = 2131362153;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362153);
             if (simpleDraweeView != null) {
-                i = 2131362143;
-                View findViewById = view.findViewById(2131362143);
+                i = 2131362154;
+                View findViewById = view.findViewById(2131362154);
                 if (findViewById != null) {
-                    i = 2131362144;
-                    PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(2131362144);
+                    i = 2131362155;
+                    PremiumGuildProgressView premiumGuildProgressView = (PremiumGuildProgressView) view.findViewById(2131362155);
                     if (premiumGuildProgressView != null) {
-                        i = 2131362146;
-                        TextView textView = (TextView) view.findViewById(2131362146);
+                        i = 2131362157;
+                        TextView textView = (TextView) view.findViewById(2131362157);
                         if (textView != null) {
-                            i = 2131362147;
-                            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362147);
+                            i = 2131362158;
+                            SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131362158);
                             if (simpleDraweeView2 != null) {
-                                i = 2131362148;
-                                TextView textView2 = (TextView) view.findViewById(2131362148);
+                                i = 2131362159;
+                                TextView textView2 = (TextView) view.findViewById(2131362159);
                                 if (textView2 != null) {
                                     ViewSettingsBoostedGuildListitemBinding viewSettingsBoostedGuildListitemBinding = new ViewSettingsBoostedGuildListitemBinding((LinearLayout) view, simpleDraweeView, findViewById, premiumGuildProgressView, textView, simpleDraweeView2, textView2);
                                     m.checkNotNullExpressionValue(viewSettingsBoostedGuildListitemBinding, "ViewSettingsBoostedGuild…temBinding.bind(itemView)");
@@ -100,14 +100,14 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     Context context = view.getContext();
                     if (guildItem.getGuild().getBanner() != null) {
                         this.binding.b.setImageURI(IconUtils.getBannerForGuild$default(IconUtils.INSTANCE, guildItem.getGuild(), null, 2, null));
-                        View view2 = this.binding.f1662c;
+                        View view2 = this.binding.f1659c;
                         m.checkNotNullExpressionValue(view2, "binding.boostedGuildGradient");
                         view2.setVisibility(0);
                     } else {
                         SimpleDraweeView simpleDraweeView = this.binding.b;
                         m.checkNotNullExpressionValue(context, "context");
                         simpleDraweeView.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130968718, 0, 2, (Object) null));
-                        View view3 = this.binding.f1662c;
+                        View view3 = this.binding.f1659c;
                         m.checkNotNullExpressionValue(view3, "binding.boostedGuildGradient");
                         view3.setVisibility(8);
                     }
@@ -118,10 +118,10 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     m.checkNotNullExpressionValue(textView, "binding.boostedSampleGuildName");
                     textView.setText(guildItem.getGuild().getName());
                     m.checkNotNullExpressionValue(context, "context");
-                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755269, guildItem.getSubscriptionCount(), Integer.valueOf(guildItem.getSubscriptionCount()));
+                    CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755270, guildItem.getSubscriptionCount(), Integer.valueOf(guildItem.getSubscriptionCount()));
                     TextView textView2 = this.binding.e;
                     m.checkNotNullExpressionValue(textView2, "binding.boostedSampleGuildCount");
-                    textView2.setText(b.g(context, 2131892095, new Object[]{i18nPluralString}, null, 4));
+                    textView2.setText(b.g(context, 2131892166, new Object[]{i18nPluralString}, null, 4));
                     this.binding.d.a(guildItem.getGuild().getPremiumTier(), guildItem.getGuild().getPremiumSubscriptionCount());
                     return;
                 }
@@ -136,7 +136,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderListItem(WidgetSettingsPremiumGuildSubscriptionAdapter widgetSettingsPremiumGuildSubscriptionAdapter) {
-            super(2131558809, widgetSettingsPremiumGuildSubscriptionAdapter);
+            super(2131558812, widgetSettingsPremiumGuildSubscriptionAdapter);
             m.checkNotNullParameter(widgetSettingsPremiumGuildSubscriptionAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -416,20 +416,20 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public PremiumGuildSubListItem(WidgetSettingsPremiumGuildSubscriptionAdapter widgetSettingsPremiumGuildSubscriptionAdapter) {
-            super(2131558807, widgetSettingsPremiumGuildSubscriptionAdapter);
+            super(2131558810, widgetSettingsPremiumGuildSubscriptionAdapter);
             m.checkNotNullParameter(widgetSettingsPremiumGuildSubscriptionAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362138;
-            TextView textView = (TextView) view.findViewById(2131362138);
+            int i = 2131362149;
+            TextView textView = (TextView) view.findViewById(2131362149);
             if (textView != null) {
-                i = 2131362139;
-                ImageView imageView = (ImageView) view.findViewById(2131362139);
+                i = 2131362150;
+                ImageView imageView = (ImageView) view.findViewById(2131362150);
                 if (imageView != null) {
-                    i = 2131362140;
-                    TextView textView2 = (TextView) view.findViewById(2131362140);
+                    i = 2131362151;
+                    TextView textView2 = (TextView) view.findViewById(2131362151);
                     if (textView2 != null) {
-                        i = 2131362141;
-                        TextView textView3 = (TextView) view.findViewById(2131362141);
+                        i = 2131362152;
+                        TextView textView3 = (TextView) view.findViewById(2131362152);
                         if (textView3 != null) {
                             ViewSettingsBoostedBoostListitemBinding viewSettingsBoostedBoostListitemBinding = new ViewSettingsBoostedBoostListitemBinding((RelativeLayout) view, textView, imageView, textView2, textView3);
                             m.checkNotNullExpressionValue(viewSettingsBoostedBoostListitemBinding, "ViewSettingsBoostedBoost…temBinding.bind(itemView)");
@@ -453,9 +453,9 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
         private final void showPremiumGuildSubPopup(View view, boolean z2, boolean z3, boolean z4, Item.PremiumGuildSubscriptionItem premiumGuildSubscriptionItem) {
             PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), 2131951664), view);
             popupMenu.getMenuInflater().inflate(2131623964, popupMenu.getMenu());
-            MenuItem findItem = popupMenu.getMenu().findItem(2131363909);
-            MenuItem findItem2 = popupMenu.getMenu().findItem(2131363908);
-            MenuItem findItem3 = popupMenu.getMenu().findItem(2131363910);
+            MenuItem findItem = popupMenu.getMenu().findItem(2131363950);
+            MenuItem findItem2 = popupMenu.getMenu().findItem(2131363949);
+            MenuItem findItem3 = popupMenu.getMenu().findItem(2131363951);
             boolean canceled = premiumGuildSubscriptionItem.getSubscriptionSlot().getCanceled();
             m.checkNotNullExpressionValue(findItem, "transfer");
             boolean z5 = true;
@@ -498,7 +498,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                 ModelPremiumGuildSubscription premiumGuildSubscription2 = premiumGuildSubscriptionItem.getSubscriptionSlot().getPremiumGuildSubscription();
                 long id2 = ((premiumGuildSubscription2 != null ? premiumGuildSubscription2.getId() : 0) >>> 22) + 1420070400000L;
                 boolean canceled = premiumGuildSubscriptionItem.getSubscriptionSlot().getCanceled();
-                ImageView imageView = this.binding.f1661c;
+                ImageView imageView = this.binding.f1658c;
                 m.checkNotNullExpressionValue(imageView, "binding.boostedBoostCancelled");
                 imageView.setVisibility(canceled ? 0 : 8);
                 TextView textView = this.binding.e;
@@ -516,7 +516,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     z3 = z6;
                     z2 = z5;
                     i2 = 0;
-                    str2 = t.replace$default(b.g(context, 2131892126, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, subscriptionEndsAt, context, (String) null, (java.text.DateFormat) null, 0, 28, (Object) null)}, null, 4).toString(), "*", "", false, 4, (Object) null);
+                    str2 = t.replace$default(b.g(context, 2131892197, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, subscriptionEndsAt, context, (String) null, (java.text.DateFormat) null, 0, 28, (Object) null)}, null, 4).toString(), "*", "", false, 4, (Object) null);
                 }
                 if (z3) {
                     long max = Math.max(premiumGuildSubscriptionItem.getSubscriptionSlot().getCooldownExpiresAtTimestamp() - currentTimeMillis, 0L);
@@ -530,7 +530,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                     z4 = true;
                     objArr[1] = String.valueOf(j3);
                     objArr[2] = String.valueOf((j2 - (3600000 * j3)) / 60000);
-                    charSequence = b.g(context, 2131891993, objArr, null, 4);
+                    charSequence = b.g(context, 2131892064, objArr, null, 4);
                 } else {
                     str3 = str;
                     z4 = true;
@@ -555,7 +555,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc
                 }
                 TextView textView6 = this.binding.b;
                 m.checkNotNullExpressionValue(textView6, "binding.boostedBoostAction");
-                textView6.setText((z2 || z3) ? "" : context.getString(2131892131));
+                textView6.setText((z2 || z3) ? "" : context.getString(2131892202));
                 if (z3 && ((canceled || !WidgetSettingsPremiumGuildSubscriptionAdapter.access$getCanCancelBoosts$p((WidgetSettingsPremiumGuildSubscriptionAdapter) this.adapter)) && (!canceled || !WidgetSettingsPremiumGuildSubscriptionAdapter.access$getCanUncancelBoosts$p((WidgetSettingsPremiumGuildSubscriptionAdapter) this.adapter)))) {
                     z4 = false;
                 }
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$Companion$observeStoreState$1.java
new file mode 100644
index 0000000000..3a8358f6ea
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$Companion$observeStoreState$1.java
@@ -0,0 +1,34 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.api.user.User;
+import com.discord.models.domain.ModelUserProfile;
+import com.discord.models.user.MeUser;
+import com.discord.stores.StoreUser;
+import com.discord.stores.StoreUserProfile;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: SettingsUserProfileViewModel.kt */
+public final class SettingsUserProfileViewModel$Companion$observeStoreState$1 extends o implements Function0<SettingsUserProfileViewModel.StoreState> {
+    public final /* synthetic */ StoreUser $storeUser;
+    public final /* synthetic */ StoreUserProfile $storeUserProfile;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public SettingsUserProfileViewModel$Companion$observeStoreState$1(StoreUser storeUser, StoreUserProfile storeUserProfile) {
+        super(0);
+        this.$storeUser = storeUser;
+        this.$storeUserProfile = storeUserProfile;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final SettingsUserProfileViewModel.StoreState mo1invoke() {
+        MeUser me2 = this.$storeUser.getMe();
+        ModelUserProfile userProfile = this.$storeUserProfile.getUserProfile(me2.getId());
+        MeUser.Companion companion = MeUser.Companion;
+        User user = userProfile.getUser();
+        m.checkNotNullExpressionValue(user, "userProfile.user");
+        return new SettingsUserProfileViewModel.StoreState(companion.merge(me2, user));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$observeHeaderViewState$1.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$observeHeaderViewState$1.java
new file mode 100644
index 0000000000..e538bcbf36
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$observeHeaderViewState$1.java
@@ -0,0 +1,23 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.models.user.MeUser;
+import com.discord.utilities.user.UserUtils;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+import j0.k.b;
+import kotlin.NoWhenBranchMatchedException;
+/* compiled from: SettingsUserProfileViewModel.kt */
+public final class SettingsUserProfileViewModel$observeHeaderViewState$1<T, R> implements b<SettingsUserProfileViewModel.ViewState, UserProfileHeaderViewModel.ViewState> {
+    public static final SettingsUserProfileViewModel$observeHeaderViewState$1 INSTANCE = new SettingsUserProfileViewModel$observeHeaderViewState$1();
+
+    public final UserProfileHeaderViewModel.ViewState call(SettingsUserProfileViewModel.ViewState viewState) {
+        if (viewState == null) {
+            return UserProfileHeaderViewModel.ViewState.Uninitialized.INSTANCE;
+        }
+        if (viewState instanceof SettingsUserProfileViewModel.ViewState.Loaded) {
+            SettingsUserProfileViewModel.ViewState.Loaded loaded = (SettingsUserProfileViewModel.ViewState.Loaded) viewState;
+            return new UserProfileHeaderViewModel.ViewState.Loaded(loaded.getCurrentAvatar() != null ? MeUser.copy$default(loaded.getUser(), 0, null, loaded.getCurrentAvatar().a(), null, false, false, 0, null, null, false, false, null, 0, 0, null, null, null, null, 262139, null) : loaded.getUser(), loaded.getCurrentBanner() != null ? loaded.getCurrentBanner().a() : loaded.getUser().getBanner(), loaded.getUser().getBannerColor(), null, null, null, null, UserUtils.INSTANCE.isPremium(loaded.getUser()), loaded.getUser().isVerified(), 0, false, false, true, 1656, null);
+        }
+        throw new NoWhenBranchMatchedException();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$saveUserChanges$1.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$saveUserChanges$1.java
new file mode 100644
index 0000000000..cd5828b696
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$saveUserChanges$1.java
@@ -0,0 +1,33 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.utilities.error.Error;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.subjects.PublishSubject;
+/* compiled from: SettingsUserProfileViewModel.kt */
+public final class SettingsUserProfileViewModel$saveUserChanges$1 extends o implements Function1<Error, Unit> {
+    public final /* synthetic */ SettingsUserProfileViewModel this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public SettingsUserProfileViewModel$saveUserChanges$1(SettingsUserProfileViewModel settingsUserProfileViewModel) {
+        super(1);
+        this.this$0 = settingsUserProfileViewModel;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
+        invoke(error);
+        return Unit.a;
+    }
+
+    public final void invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        PublishSubject access$getEventSubject$p = SettingsUserProfileViewModel.access$getEventSubject$p(this.this$0);
+        access$getEventSubject$p.j.onNext(SettingsUserProfileViewModel.Event.UserUpdateRequestCompleted.INSTANCE);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$saveUserChanges$2.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$saveUserChanges$2.java
new file mode 100644
index 0000000000..8e147a5a61
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel$saveUserChanges$2.java
@@ -0,0 +1,40 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.api.user.User;
+import com.discord.models.user.MeUser;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.subjects.PublishSubject;
+/* compiled from: SettingsUserProfileViewModel.kt */
+public final class SettingsUserProfileViewModel$saveUserChanges$2 extends o implements Function1<User, Unit> {
+    public final /* synthetic */ MeUser $meUser;
+    public final /* synthetic */ SettingsUserProfileViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ SettingsUserProfileViewModel this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public SettingsUserProfileViewModel$saveUserChanges$2(SettingsUserProfileViewModel settingsUserProfileViewModel, MeUser meUser, SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        super(1);
+        this.this$0 = settingsUserProfileViewModel;
+        this.$meUser = meUser;
+        this.$viewState = loaded;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(User user) {
+        invoke(user);
+        return Unit.a;
+    }
+
+    public final void invoke(User user) {
+        m.checkNotNullParameter(user, "apiUser");
+        SettingsUserProfileViewModel.access$getStoreUserProfile$p(this.this$0).updateUser(user);
+        SettingsUserProfileViewModel.access$updateViewState(this.this$0, SettingsUserProfileViewModel.ViewState.Loaded.copy$default(this.$viewState, MeUser.Companion.merge(this.$meUser, user), null, null, null, null, false, 56, null));
+        PublishSubject access$getEventSubject$p = SettingsUserProfileViewModel.access$getEventSubject$p(this.this$0);
+        access$getEventSubject$p.j.onNext(SettingsUserProfileViewModel.Event.UserUpdateRequestCompleted.INSTANCE);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java
new file mode 100644
index 0000000000..807a870f76
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModel.java
@@ -0,0 +1,562 @@
+package com.discord.widgets.settings.profile;
+
+import android.content.Context;
+import androidx.annotation.MainThread;
+import c.d.b.a.a;
+import com.discord.api.user.PatchUserBody;
+import com.discord.app.AppViewModel;
+import com.discord.models.user.MeUser;
+import com.discord.nullserializable.NullSerializable;
+import com.discord.simpleast.core.node.Node;
+import com.discord.simpleast.core.parser.Parser;
+import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
+import com.discord.stores.StoreUserProfile;
+import com.discord.stores.updates.ObservationDeck;
+import com.discord.stores.updates.ObservationDeckProvider;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.textprocessing.DiscordParser;
+import com.discord.utilities.textprocessing.MessageParseState;
+import com.discord.utilities.textprocessing.MessagePreprocessor;
+import com.discord.utilities.textprocessing.MessageRenderContext;
+import com.discord.utilities.textprocessing.node.SpoilerNode;
+import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+/* compiled from: SettingsUserProfileViewModel.kt */
+public final class SettingsUserProfileViewModel extends AppViewModel<ViewState> {
+    public static final Companion Companion = new Companion(null);
+    private final Parser<MessageRenderContext, Node<MessageRenderContext>, MessageParseState> bioParser;
+    private final PublishSubject<Event> eventSubject;
+    private final RestAPI restAPI;
+    private final Set<Integer> revealedBioIndices;
+    private final StoreUserProfile storeUserProfile;
+
+    /* compiled from: SettingsUserProfileViewModel.kt */
+    /* renamed from: com.discord.widgets.settings.profile.SettingsUserProfileViewModel$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends o implements Function1<MeUser, Unit> {
+        public final /* synthetic */ SettingsUserProfileViewModel this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(SettingsUserProfileViewModel settingsUserProfileViewModel) {
+            super(1);
+            this.this$0 = settingsUserProfileViewModel;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(MeUser meUser) {
+            invoke(meUser);
+            return Unit.a;
+        }
+
+        public final void invoke(MeUser meUser) {
+            SettingsUserProfileViewModel.access$getStoreUserProfile$p(this.this$0).fetchProfile(meUser.getId());
+        }
+    }
+
+    /* compiled from: SettingsUserProfileViewModel.kt */
+    /* renamed from: com.discord.widgets.settings.profile.SettingsUserProfileViewModel$2  reason: invalid class name */
+    public static final class AnonymousClass2 extends o implements Function1<StoreState, Unit> {
+        public final /* synthetic */ SettingsUserProfileViewModel this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass2(SettingsUserProfileViewModel settingsUserProfileViewModel) {
+            super(1);
+            this.this$0 = settingsUserProfileViewModel;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(StoreState storeState) {
+            invoke(storeState);
+            return Unit.a;
+        }
+
+        public final void invoke(StoreState storeState) {
+            SettingsUserProfileViewModel settingsUserProfileViewModel = this.this$0;
+            m.checkNotNullExpressionValue(storeState, "storeState");
+            SettingsUserProfileViewModel.access$handleStoreState(settingsUserProfileViewModel, storeState);
+        }
+    }
+
+    /* compiled from: SettingsUserProfileViewModel.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        private final Observable<StoreState> observeStoreState(StoreUser storeUser, StoreUserProfile storeUserProfile) {
+            return ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{StoreUser.Companion.getMeUpdate(), storeUserProfile}, false, null, null, new SettingsUserProfileViewModel$Companion$observeStoreState$1(storeUser, storeUserProfile), 14, null);
+        }
+
+        public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreUser storeUser, StoreUserProfile storeUserProfile, int i, Object obj) {
+            if ((i & 1) != 0) {
+                storeUser = StoreStream.Companion.getUsers();
+            }
+            if ((i & 2) != 0) {
+                storeUserProfile = StoreStream.Companion.getUserProfile();
+            }
+            return companion.observeStoreState(storeUser, storeUserProfile);
+        }
+    }
+
+    /* compiled from: SettingsUserProfileViewModel.kt */
+    public static abstract class Event {
+
+        /* compiled from: SettingsUserProfileViewModel.kt */
+        public static final class UserUpdateRequestCompleted extends Event {
+            public static final UserUpdateRequestCompleted INSTANCE = new UserUpdateRequestCompleted();
+
+            private UserUpdateRequestCompleted() {
+                super(null);
+            }
+        }
+
+        private Event() {
+        }
+
+        public /* synthetic */ Event(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    /* compiled from: SettingsUserProfileViewModel.kt */
+    public static final class StoreState {
+        private final MeUser user;
+
+        public StoreState(MeUser meUser) {
+            m.checkNotNullParameter(meUser, "user");
+            this.user = meUser;
+        }
+
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, int i, Object obj) {
+            if ((i & 1) != 0) {
+                meUser = storeState.user;
+            }
+            return storeState.copy(meUser);
+        }
+
+        public final MeUser component1() {
+            return this.user;
+        }
+
+        public final StoreState copy(MeUser meUser) {
+            m.checkNotNullParameter(meUser, "user");
+            return new StoreState(meUser);
+        }
+
+        public boolean equals(Object obj) {
+            if (this != obj) {
+                return (obj instanceof StoreState) && m.areEqual(this.user, ((StoreState) obj).user);
+            }
+            return true;
+        }
+
+        public final MeUser getUser() {
+            return this.user;
+        }
+
+        public int hashCode() {
+            MeUser meUser = this.user;
+            if (meUser != null) {
+                return meUser.hashCode();
+            }
+            return 0;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("StoreState(user=");
+            L.append(this.user);
+            L.append(")");
+            return L.toString();
+        }
+    }
+
+    /* compiled from: SettingsUserProfileViewModel.kt */
+    public static abstract class ViewState {
+
+        /* compiled from: SettingsUserProfileViewModel.kt */
+        public static final class Loaded extends ViewState {
+            private final List<Node<MessageRenderContext>> bioAst;
+            private final NullSerializable<String> currentAvatar;
+            private final NullSerializable<String> currentBanner;
+            private final String currentBio;
+            private final boolean isBioChanged;
+            private final boolean isDirty;
+            private final boolean isEditingBio;
+            private final boolean showBioEditor;
+            private final boolean showSaveFab;
+            private final MeUser user;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            /* JADX WARNING: Code restructure failed: missing block: B:19:0x004e, code lost:
+                if ((r5 == null || d0.g0.t.isBlank(r5)) != false) goto L_0x0050;
+             */
+            public Loaded(MeUser meUser, NullSerializable<String> nullSerializable, NullSerializable<String> nullSerializable2, String str, List<Node<MessageRenderContext>> list, boolean z2) {
+                super(null);
+                m.checkNotNullParameter(meUser, "user");
+                this.user = meUser;
+                this.currentAvatar = nullSerializable;
+                this.currentBanner = nullSerializable2;
+                this.currentBio = str;
+                this.bioAst = list;
+                this.isEditingBio = z2;
+                boolean z3 = false;
+                boolean z4 = (nullSerializable == null && nullSerializable2 == null && !(m.areEqual(str, meUser.getBio()) ^ true)) ? false : true;
+                this.isDirty = z4;
+                this.showSaveFab = z4 && !z2;
+                this.isBioChanged = !m.areEqual(str, meUser.getBio());
+                if (!z2) {
+                }
+                z3 = true;
+                this.showBioEditor = z3;
+            }
+
+            /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+            public /* synthetic */ Loaded(MeUser meUser, NullSerializable nullSerializable, NullSerializable nullSerializable2, String str, List list, boolean z2, int i, DefaultConstructorMarker defaultConstructorMarker) {
+                this(meUser, (i & 2) != 0 ? null : nullSerializable, (i & 4) != 0 ? null : nullSerializable2, str, list, z2);
+            }
+
+            /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.settings.profile.SettingsUserProfileViewModel$ViewState$Loaded */
+            /* JADX WARN: Multi-variable type inference failed */
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, MeUser meUser, NullSerializable nullSerializable, NullSerializable nullSerializable2, String str, List list, boolean z2, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    meUser = loaded.user;
+                }
+                if ((i & 2) != 0) {
+                    nullSerializable = loaded.currentAvatar;
+                }
+                if ((i & 4) != 0) {
+                    nullSerializable2 = loaded.currentBanner;
+                }
+                if ((i & 8) != 0) {
+                    str = loaded.currentBio;
+                }
+                if ((i & 16) != 0) {
+                    list = loaded.bioAst;
+                }
+                if ((i & 32) != 0) {
+                    z2 = loaded.isEditingBio;
+                }
+                return loaded.copy(meUser, nullSerializable, nullSerializable2, str, list, z2);
+            }
+
+            public final MeUser component1() {
+                return this.user;
+            }
+
+            public final NullSerializable<String> component2() {
+                return this.currentAvatar;
+            }
+
+            public final NullSerializable<String> component3() {
+                return this.currentBanner;
+            }
+
+            public final String component4() {
+                return this.currentBio;
+            }
+
+            public final List<Node<MessageRenderContext>> component5() {
+                return this.bioAst;
+            }
+
+            public final boolean component6() {
+                return this.isEditingBio;
+            }
+
+            public final Loaded copy(MeUser meUser, NullSerializable<String> nullSerializable, NullSerializable<String> nullSerializable2, String str, List<Node<MessageRenderContext>> list, boolean z2) {
+                m.checkNotNullParameter(meUser, "user");
+                return new Loaded(meUser, nullSerializable, nullSerializable2, str, list, z2);
+            }
+
+            public boolean equals(Object obj) {
+                if (this == obj) {
+                    return true;
+                }
+                if (!(obj instanceof Loaded)) {
+                    return false;
+                }
+                Loaded loaded = (Loaded) obj;
+                return m.areEqual(this.user, loaded.user) && m.areEqual(this.currentAvatar, loaded.currentAvatar) && m.areEqual(this.currentBanner, loaded.currentBanner) && m.areEqual(this.currentBio, loaded.currentBio) && m.areEqual(this.bioAst, loaded.bioAst) && this.isEditingBio == loaded.isEditingBio;
+            }
+
+            public final List<Node<MessageRenderContext>> getBioAst() {
+                return this.bioAst;
+            }
+
+            public final NullSerializable<String> getCurrentAvatar() {
+                return this.currentAvatar;
+            }
+
+            public final NullSerializable<String> getCurrentBanner() {
+                return this.currentBanner;
+            }
+
+            public final String getCurrentBio() {
+                return this.currentBio;
+            }
+
+            public final boolean getShowBioEditor() {
+                return this.showBioEditor;
+            }
+
+            public final boolean getShowSaveFab() {
+                return this.showSaveFab;
+            }
+
+            public final MeUser getUser() {
+                return this.user;
+            }
+
+            public int hashCode() {
+                MeUser meUser = this.user;
+                int i = 0;
+                int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
+                NullSerializable<String> nullSerializable = this.currentAvatar;
+                int hashCode2 = (hashCode + (nullSerializable != null ? nullSerializable.hashCode() : 0)) * 31;
+                NullSerializable<String> nullSerializable2 = this.currentBanner;
+                int hashCode3 = (hashCode2 + (nullSerializable2 != null ? nullSerializable2.hashCode() : 0)) * 31;
+                String str = this.currentBio;
+                int hashCode4 = (hashCode3 + (str != null ? str.hashCode() : 0)) * 31;
+                List<Node<MessageRenderContext>> list = this.bioAst;
+                if (list != null) {
+                    i = list.hashCode();
+                }
+                int i2 = (hashCode4 + i) * 31;
+                boolean z2 = this.isEditingBio;
+                if (z2) {
+                    z2 = true;
+                }
+                int i3 = z2 ? 1 : 0;
+                int i4 = z2 ? 1 : 0;
+                int i5 = z2 ? 1 : 0;
+                return i2 + i3;
+            }
+
+            public final boolean isBioChanged() {
+                return this.isBioChanged;
+            }
+
+            public final boolean isDirty() {
+                return this.isDirty;
+            }
+
+            public final boolean isEditingBio() {
+                return this.isEditingBio;
+            }
+
+            public String toString() {
+                StringBuilder L = a.L("Loaded(user=");
+                L.append(this.user);
+                L.append(", currentAvatar=");
+                L.append(this.currentAvatar);
+                L.append(", currentBanner=");
+                L.append(this.currentBanner);
+                L.append(", currentBio=");
+                L.append(this.currentBio);
+                L.append(", bioAst=");
+                L.append(this.bioAst);
+                L.append(", isEditingBio=");
+                return a.G(L, this.isEditingBio, ")");
+            }
+        }
+
+        private ViewState() {
+        }
+
+        public /* synthetic */ ViewState(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    public SettingsUserProfileViewModel() {
+        this(null, null, null, null, null, 31, null);
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public SettingsUserProfileViewModel(StoreUser storeUser, StoreUserProfile storeUserProfile, RestAPI restAPI, Parser<MessageRenderContext, Node<MessageRenderContext>, MessageParseState> parser, Observable<StoreState> observable) {
+        super(null);
+        m.checkNotNullParameter(storeUser, "storeUser");
+        m.checkNotNullParameter(storeUserProfile, "storeUserProfile");
+        m.checkNotNullParameter(restAPI, "restAPI");
+        m.checkNotNullParameter(parser, "bioParser");
+        m.checkNotNullParameter(observable, "storeStateObservable");
+        this.storeUserProfile = storeUserProfile;
+        this.restAPI = restAPI;
+        this.bioParser = parser;
+        this.eventSubject = PublishSubject.k0();
+        Observable Z = ObservableExtensionsKt.computationLatest(storeUser.observeMe(false)).Z(1);
+        m.checkNotNullExpressionValue(Z, "storeUser.observeMe(emit…Latest()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Z, this, null, 2, null), SettingsUserProfileViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<StoreState> r = observable.r();
+        m.checkNotNullExpressionValue(r, "storeStateObservable\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), SettingsUserProfileViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        this.revealedBioIndices = new LinkedHashSet();
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ SettingsUserProfileViewModel(StoreUser storeUser, StoreUserProfile storeUserProfile, RestAPI restAPI, Parser parser, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this((i & 1) != 0 ? StoreStream.Companion.getUsers() : storeUser, (i & 2) != 0 ? StoreStream.Companion.getUserProfile() : storeUserProfile, (i & 4) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 8) != 0 ? DiscordParser.createParser$default(false, false, false, 4, null) : parser, (i & 16) != 0 ? Companion.observeStoreState$default(Companion, null, null, 3, null) : observable);
+    }
+
+    public static final /* synthetic */ PublishSubject access$getEventSubject$p(SettingsUserProfileViewModel settingsUserProfileViewModel) {
+        return settingsUserProfileViewModel.eventSubject;
+    }
+
+    public static final /* synthetic */ StoreUserProfile access$getStoreUserProfile$p(SettingsUserProfileViewModel settingsUserProfileViewModel) {
+        return settingsUserProfileViewModel.storeUserProfile;
+    }
+
+    public static final /* synthetic */ void access$handleStoreState(SettingsUserProfileViewModel settingsUserProfileViewModel, StoreState storeState) {
+        settingsUserProfileViewModel.handleStoreState(storeState);
+    }
+
+    public static final /* synthetic */ void access$updateViewState(SettingsUserProfileViewModel settingsUserProfileViewModel, ViewState viewState) {
+        settingsUserProfileViewModel.updateViewState(viewState);
+    }
+
+    private final List<Node<MessageRenderContext>> createAndProcessBioAstFromText(String str) {
+        List<Node<MessageRenderContext>> parseBio = parseBio(str);
+        createMessagePreprocessor().process(parseBio);
+        return parseBio;
+    }
+
+    private final MessagePreprocessor createMessagePreprocessor() {
+        return new MessagePreprocessor(-1, this.revealedBioIndices, null, false, null, 28, null);
+    }
+
+    @MainThread
+    private final void handleStoreState(StoreState storeState) {
+        String str;
+        MeUser user = storeState.getUser();
+        String bio = user.getBio();
+        ViewState.Loaded loaded = null;
+        List<Node<MessageRenderContext>> createAndProcessBioAstFromText = bio != null ? createAndProcessBioAstFromText(bio) : null;
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded2 = (ViewState.Loaded) viewState;
+        if (loaded2 == null || (str = loaded2.getCurrentBio()) == null) {
+            str = user.getBio();
+        }
+        ViewState viewState2 = getViewState();
+        if (viewState2 instanceof ViewState.Loaded) {
+            loaded = viewState2;
+        }
+        ViewState.Loaded loaded3 = loaded;
+        updateViewState(new ViewState.Loaded(user, null, null, str, createAndProcessBioAstFromText, loaded3 != null ? loaded3.isEditingBio() : false, 6, null));
+    }
+
+    private final List<Node<MessageRenderContext>> parseBio(String str) {
+        return Parser.parse$default(this.bioParser, str, MessageParseState.Companion.getInitialState(), null, 4, null);
+    }
+
+    @MainThread
+    public final void handleBioIndexClicked(SpoilerNode<?> spoilerNode) {
+        String currentBio;
+        m.checkNotNullParameter(spoilerNode, "spoilerNode");
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded != null && (currentBio = loaded.getCurrentBio()) != null) {
+            this.revealedBioIndices.add(Integer.valueOf(spoilerNode.getId()));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, null, null, createAndProcessBioAstFromText(currentBio), false, 47, null));
+        }
+    }
+
+    public final Observable<Event> observeEvents() {
+        PublishSubject<Event> publishSubject = this.eventSubject;
+        m.checkNotNullExpressionValue(publishSubject, "eventSubject");
+        return publishSubject;
+    }
+
+    public final Observable<UserProfileHeaderViewModel.ViewState> observeHeaderViewState() {
+        Observable<UserProfileHeaderViewModel.ViewState> r = observeViewState().F(SettingsUserProfileViewModel$observeHeaderViewState$1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "observeViewState().map {… }.distinctUntilChanged()");
+        return r;
+    }
+
+    @MainThread
+    public final void saveUserChanges(Context context) {
+        m.checkNotNullParameter(context, "context");
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded != null) {
+            MeUser user = loaded.getUser();
+            String currentBio = loaded.getCurrentBio();
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.patchUser(new PatchUserBody(loaded.getCurrentAvatar(), loaded.getCurrentBanner(), loaded.isBioChanged() ? currentBio != null ? new NullSerializable.b(currentBio) : new NullSerializable.a(null, 1) : null)), false, 1, null), this, null, 2, null), SettingsUserProfileViewModel.class, context, (Function1) null, new SettingsUserProfileViewModel$saveUserChanges$1(this), (Function0) null, (Function0) null, new SettingsUserProfileViewModel$saveUserChanges$2(this, user, loaded), 52, (Object) null);
+        }
+    }
+
+    @MainThread
+    public final void updateAvatar(String str) {
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded != null) {
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, str != null ? new NullSerializable.b(str) : new NullSerializable.a(null, 1), null, null, null, false, 61, null));
+        }
+    }
+
+    @MainThread
+    public final void updateBanner(String str) {
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded != null) {
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, str != null ? new NullSerializable.b(str) : new NullSerializable.a(null, 1), null, null, false, 59, null));
+        }
+    }
+
+    @MainThread
+    public final void updateBio(String str) {
+        m.checkNotNullParameter(str, "bio");
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded != null && (!m.areEqual(str, loaded.getCurrentBio()))) {
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, null, str, createAndProcessBioAstFromText(str), false, 39, null));
+        }
+    }
+
+    @MainThread
+    public final void updateIsEditingBio(boolean z2) {
+        ViewState viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
+            viewState = null;
+        }
+        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+        if (loaded != null) {
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, null, null, null, null, z2, 31, null));
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModelKt.java b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModelKt.java
new file mode 100644
index 0000000000..0a449c666d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/SettingsUserProfileViewModelKt.java
@@ -0,0 +1,4 @@
+package com.discord.widgets.settings.profile;
+/* compiled from: SettingsUserProfileViewModel.kt */
+public final class SettingsUserProfileViewModelKt {
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/TouchInterceptingCoordinatorLayout.java b/app/src/main/java/com/discord/widgets/settings/profile/TouchInterceptingCoordinatorLayout.java
new file mode 100644
index 0000000000..8fde259d84
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/TouchInterceptingCoordinatorLayout.java
@@ -0,0 +1,56 @@
+package com.discord.widgets.settings.profile;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: TouchInterceptingCoordinatorLayout.kt */
+public final class TouchInterceptingCoordinatorLayout extends CoordinatorLayout {
+    private Function1<? super MotionEvent, Boolean> onInterceptTouchEvent;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public TouchInterceptingCoordinatorLayout(Context context) {
+        super(context);
+        m.checkNotNullParameter(context, "context");
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public TouchInterceptingCoordinatorLayout(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+        m.checkNotNullParameter(context, "context");
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public TouchInterceptingCoordinatorLayout(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+        m.checkNotNullParameter(context, "context");
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ TouchInterceptingCoordinatorLayout(Context context, AttributeSet attributeSet, int i, int i2, DefaultConstructorMarker defaultConstructorMarker) {
+        this(context, (i2 & 2) != 0 ? null : attributeSet, (i2 & 4) != 0 ? 0 : i);
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ TouchInterceptingCoordinatorLayout(Context context, AttributeSet attributeSet, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(context, (i & 2) != 0 ? null : attributeSet);
+    }
+
+    /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super android.view.MotionEvent, java.lang.Boolean>, kotlin.jvm.functions.Function1<android.view.MotionEvent, java.lang.Boolean> */
+    public final Function1<MotionEvent, Boolean> getOnInterceptTouchEvent() {
+        return this.onInterceptTouchEvent;
+    }
+
+    @Override // androidx.coordinatorlayout.widget.CoordinatorLayout, android.view.ViewGroup
+    public boolean onInterceptTouchEvent(MotionEvent motionEvent) {
+        Function1<? super MotionEvent, Boolean> function1 = this.onInterceptTouchEvent;
+        return function1 != null ? function1.invoke(motionEvent).booleanValue() : super.onInterceptTouchEvent(motionEvent);
+    }
+
+    public final void setOnInterceptTouchEvent(Function1<? super MotionEvent, Boolean> function1) {
+        this.onInterceptTouchEvent = function1;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1.java
new file mode 100644
index 0000000000..268db23401
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1.java
@@ -0,0 +1,25 @@
+package com.discord.widgets.settings.profile;
+
+import androidx.lifecycle.ViewModelStore;
+import androidx.lifecycle.ViewModelStoreOwner;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: FragmentViewModelLazy.kt */
+public final class WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1 extends o implements Function0<ViewModelStore> {
+    public final /* synthetic */ Function0 $ownerProducer;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1(Function0 function0) {
+        super(0);
+        this.$ownerProducer = function0;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final ViewModelStore mo1invoke() {
+        ViewModelStore viewModelStore = ((ViewModelStoreOwner) this.$ownerProducer.mo1invoke()).getViewModelStore();
+        m.checkNotNullExpressionValue(viewModelStore, "ownerProducer().viewModelStore");
+        return viewModelStore;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$avatarSelectedResult$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$avatarSelectedResult$1.java
new file mode 100644
index 0000000000..7fffcda7f2
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$avatarSelectedResult$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.profile;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$avatarSelectedResult$1 extends o implements Function1<String, Unit> {
+    public static final WidgetSettingsUserProfile$avatarSelectedResult$1 INSTANCE = new WidgetSettingsUserProfile$avatarSelectedResult$1();
+
+    public WidgetSettingsUserProfile$avatarSelectedResult$1() {
+        super(1);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "it");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$bannerSelectedResult$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$bannerSelectedResult$1.java
new file mode 100644
index 0000000000..f37e469c53
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$bannerSelectedResult$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.profile;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$bannerSelectedResult$1 extends o implements Function1<String, Unit> {
+    public static final WidgetSettingsUserProfile$bannerSelectedResult$1 INSTANCE = new WidgetSettingsUserProfile$bannerSelectedResult$1();
+
+    public WidgetSettingsUserProfile$bannerSelectedResult$1() {
+        super(1);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "it");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java
new file mode 100644
index 0000000000..36bbe63b30
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$binding$2.java
@@ -0,0 +1,75 @@
+package com.discord.widgets.settings.profile;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.cardview.widget.CardView;
+import androidx.core.widget.NestedScrollView;
+import com.discord.databinding.WidgetSettingsUserProfileBinding;
+import com.discord.utilities.dimmer.DimmerView;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.discord.widgets.user.profile.UserProfileHeaderView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final /* synthetic */ class WidgetSettingsUserProfile$binding$2 extends k implements Function1<View, WidgetSettingsUserProfileBinding> {
+    public static final WidgetSettingsUserProfile$binding$2 INSTANCE = new WidgetSettingsUserProfile$binding$2();
+
+    public WidgetSettingsUserProfile$binding$2() {
+        super(1, WidgetSettingsUserProfileBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetSettingsUserProfileBinding;", 0);
+    }
+
+    public final WidgetSettingsUserProfileBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = 2131362103;
+        CardView cardView = (CardView) view.findViewById(2131362103);
+        if (cardView != null) {
+            i = 2131362104;
+            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131362104);
+            if (textInputEditText != null) {
+                i = 2131362105;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362105);
+                if (textInputLayout != null) {
+                    i = 2131362106;
+                    TextView textView = (TextView) view.findViewById(2131362106);
+                    if (textView != null) {
+                        i = 2131362107;
+                        CardView cardView2 = (CardView) view.findViewById(2131362107);
+                        if (cardView2 != null) {
+                            i = 2131362108;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362108);
+                            if (linkifiedTextView != null) {
+                                i = 2131362921;
+                                DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
+                                if (dimmerView != null) {
+                                    i = 2131364390;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364390);
+                                    if (linearLayout != null) {
+                                        i = 2131364549;
+                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364549);
+                                        if (floatingActionButton != null) {
+                                            i = 2131364933;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364933);
+                                            if (nestedScrollView != null) {
+                                                i = 2131365480;
+                                                UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365480);
+                                                if (userProfileHeaderView != null) {
+                                                    return new WidgetSettingsUserProfileBinding((TouchInterceptingCoordinatorLayout) view, cardView, textInputEditText, textInputLayout, textView, cardView2, linkifiedTextView, dimmerView, linearLayout, floatingActionButton, nestedScrollView, userProfileHeaderView);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java
new file mode 100644
index 0000000000..60ae31380e
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$1.java
@@ -0,0 +1,43 @@
+package com.discord.widgets.settings.profile;
+
+import androidx.fragment.app.FragmentManager;
+import c.a.a.e.a;
+import com.discord.utilities.user.UserUtils;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.g0.t;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$configureAvatarSelect$1 extends o implements Function1<String, Unit> {
+    public final /* synthetic */ SettingsUserProfileViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$configureAvatarSelect$1(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        super(1);
+        this.this$0 = widgetSettingsUserProfile;
+        this.$viewState = loaded;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "dataUrl");
+        if (UserUtils.INSTANCE.isPremium(this.$viewState.getUser()) || !t.startsWith$default(str, "data:image/gif", false, 2, null)) {
+            WidgetSettingsUserProfile.access$getViewModel$p(this.this$0).updateAvatar(str);
+            return;
+        }
+        a.b bVar = a.j;
+        FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
+        m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
+        a.b.a(bVar, parentFragmentManager, 4, this.this$0.getString(2131892398), null, "User Settings", "User Profile", null, null, false, false, 968);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$2.java
new file mode 100644
index 0000000000..9192b68b72
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureAvatarSelect$2.java
@@ -0,0 +1,61 @@
+package com.discord.widgets.settings.profile;
+
+import androidx.fragment.app.FragmentManager;
+import c.a.z.a0;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.List;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$configureAvatarSelect$2 extends o implements Function0<Unit> {
+    public final /* synthetic */ List $avatarSheetOptions;
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* compiled from: WidgetSettingsUserProfile.kt */
+    /* renamed from: com.discord.widgets.settings.profile.WidgetSettingsUserProfile$configureAvatarSelect$2$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends o implements Function1<Integer, Unit> {
+        public final /* synthetic */ WidgetSettingsUserProfile$configureAvatarSelect$2 this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(WidgetSettingsUserProfile$configureAvatarSelect$2 widgetSettingsUserProfile$configureAvatarSelect$2) {
+            super(1);
+            this.this$0 = widgetSettingsUserProfile$configureAvatarSelect$2;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(Integer num) {
+            invoke(num.intValue());
+            return Unit.a;
+        }
+
+        public final void invoke(int i) {
+            if (i == 0) {
+                WidgetSettingsUserProfile widgetSettingsUserProfile = this.this$0.this$0;
+                WidgetSettingsUserProfile.access$setImageSelectedResult$p(widgetSettingsUserProfile, WidgetSettingsUserProfile.access$getAvatarSelectedResult$p(widgetSettingsUserProfile));
+                this.this$0.this$0.openMediaChooser();
+            } else if (i == 1) {
+                WidgetSettingsUserProfile.access$getViewModel$p(this.this$0.this$0).updateAvatar(null);
+            }
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$configureAvatarSelect$2(WidgetSettingsUserProfile widgetSettingsUserProfile, List list) {
+        super(0);
+        this.this$0 = widgetSettingsUserProfile;
+        this.$avatarSheetOptions = list;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+        a0.a aVar = a0.j;
+        FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
+        m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
+        aVar.a(childFragmentManager, "", this.$avatarSheetOptions, false, new AnonymousClass1(this));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$1.java
new file mode 100644
index 0000000000..56a9126fa6
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$1.java
@@ -0,0 +1,29 @@
+package com.discord.widgets.settings.profile;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$configureBannerSelect$1 extends o implements Function1<String, Unit> {
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$configureBannerSelect$1(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        super(1);
+        this.this$0 = widgetSettingsUserProfile;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "dataUrl");
+        WidgetSettingsUserProfile.access$getViewModel$p(this.this$0).updateBanner(str);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java
new file mode 100644
index 0000000000..a3c829aa43
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBannerSelect$2.java
@@ -0,0 +1,97 @@
+package com.discord.widgets.settings.profile;
+
+import android.content.res.Resources;
+import android.os.Bundle;
+import androidx.fragment.app.FragmentManager;
+import c.a.a.e.c;
+import c.a.l.b;
+import c.a.z.a0;
+import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.analytics.Traits;
+import com.discord.utilities.user.UserUtils;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.List;
+import java.util.Objects;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$configureBannerSelect$2 extends o implements Function0<Unit> {
+    public final /* synthetic */ List $bannerSheetOptions;
+    public final /* synthetic */ SettingsUserProfileViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* compiled from: WidgetSettingsUserProfile.kt */
+    /* renamed from: com.discord.widgets.settings.profile.WidgetSettingsUserProfile$configureBannerSelect$2$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends o implements Function1<Integer, Unit> {
+        public final /* synthetic */ WidgetSettingsUserProfile$configureBannerSelect$2 this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(WidgetSettingsUserProfile$configureBannerSelect$2 widgetSettingsUserProfile$configureBannerSelect$2) {
+            super(1);
+            this.this$0 = widgetSettingsUserProfile$configureBannerSelect$2;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(Integer num) {
+            invoke(num.intValue());
+            return Unit.a;
+        }
+
+        public final void invoke(int i) {
+            if (i == 0) {
+                WidgetSettingsUserProfile widgetSettingsUserProfile = this.this$0.this$0;
+                WidgetSettingsUserProfile.access$setImageSelectedResult$p(widgetSettingsUserProfile, WidgetSettingsUserProfile.access$getBannerSelectedResult$p(widgetSettingsUserProfile));
+                this.this$0.this$0.openMediaChooser();
+            } else if (i == 1) {
+                WidgetSettingsUserProfile.access$getViewModel$p(this.this$0.this$0).updateBanner(null);
+            }
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$configureBannerSelect$2(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.ViewState.Loaded loaded, List list) {
+        super(0);
+        this.this$0 = widgetSettingsUserProfile;
+        this.$viewState = loaded;
+        this.$bannerSheetOptions = list;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+        if (!UserUtils.INSTANCE.isPremiumTier2(this.$viewState.getUser())) {
+            c.b bVar = c.j;
+            FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
+            m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
+            AnalyticsTracker.PremiumUpsellType premiumUpsellType = AnalyticsTracker.PremiumUpsellType.CustomProfileUpsellModal;
+            Resources resources = this.this$0.getResources();
+            m.checkNotNullExpressionValue(resources, "resources");
+            String obj = b.h(resources, 2131892298, new Object[0], null, 4).toString();
+            Resources resources2 = this.this$0.getResources();
+            m.checkNotNullExpressionValue(resources2, "resources");
+            String obj2 = b.h(resources2, 2131892296, new Object[0], null, 4).toString();
+            Objects.requireNonNull(bVar);
+            m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
+            m.checkNotNullParameter(premiumUpsellType, "premiumUpsellType");
+            c cVar = new c();
+            Bundle bundle = new Bundle();
+            bundle.putInt("extra_image_drawable_res", 2131232239);
+            bundle.putString("extra_header_text", obj);
+            bundle.putString("extra_body_text", obj2);
+            bundle.putString("extra_section_name", "Profile Customization");
+            cVar.setArguments(bundle);
+            cVar.show(parentFragmentManager, c.class.getName());
+            AnalyticsTracker.premiumUpsellViewed$default(AnalyticsTracker.INSTANCE, premiumUpsellType, new Traits.Location("User Settings", "Profile Customization", "Edit Profile Banner", null, null, 24, null), null, 4, null);
+            return;
+        }
+        a0.a aVar = a0.j;
+        FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
+        m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
+        aVar.a(childFragmentManager, "", this.$bannerSheetOptions, false, new AnonymousClass1(this));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBio$renderContext$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBio$renderContext$1.java
new file mode 100644
index 0000000000..9ca15dd006
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureBio$renderContext$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.utilities.textprocessing.node.SpoilerNode;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final /* synthetic */ class WidgetSettingsUserProfile$configureBio$renderContext$1 extends k implements Function1<SpoilerNode<?>, Unit> {
+    public WidgetSettingsUserProfile$configureBio$renderContext$1(SettingsUserProfileViewModel settingsUserProfileViewModel) {
+        super(1, settingsUserProfileViewModel, SettingsUserProfileViewModel.class, "handleBioIndexClicked", "handleBioIndexClicked(Lcom/discord/utilities/textprocessing/node/SpoilerNode;)V", 0);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(SpoilerNode<?> spoilerNode) {
+        invoke(spoilerNode);
+        return Unit.a;
+    }
+
+    public final void invoke(SpoilerNode<?> spoilerNode) {
+        m.checkNotNullParameter(spoilerNode, "p1");
+        ((SettingsUserProfileViewModel) this.receiver).handleBioIndexClicked(spoilerNode);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureUI$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureUI$1.java
new file mode 100644
index 0000000000..a13c8ded42
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$configureUI$1.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import rx.functions.Func0;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$configureUI$1<R> implements Func0<Boolean> {
+    public final /* synthetic */ SettingsUserProfileViewModel.ViewState $viewState;
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    public WidgetSettingsUserProfile$configureUI$1(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.ViewState viewState) {
+        this.this$0 = widgetSettingsUserProfile;
+        this.$viewState = viewState;
+    }
+
+    @Override // rx.functions.Func0, java.util.concurrent.Callable
+    public final Boolean call() {
+        return Boolean.valueOf(WidgetSettingsUserProfile.access$handleBackPressed(this.this$0, (SettingsUserProfileViewModel.ViewState.Loaded) this.$viewState));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$handleBackPressed$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$handleBackPressed$1.java
new file mode 100644
index 0000000000..ed53717680
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$handleBackPressed$1.java
@@ -0,0 +1,17 @@
+package com.discord.widgets.settings.profile;
+
+import android.view.View;
+import androidx.appcompat.app.AlertDialog;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$handleBackPressed$1 implements View.OnClickListener {
+    public final /* synthetic */ AlertDialog $dialog;
+
+    public WidgetSettingsUserProfile$handleBackPressed$1(AlertDialog alertDialog) {
+        this.$dialog = alertDialog;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        this.$dialog.dismiss();
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$handleBackPressed$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$handleBackPressed$2.java
new file mode 100644
index 0000000000..956f7596fa
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$handleBackPressed$2.java
@@ -0,0 +1,25 @@
+package com.discord.widgets.settings.profile;
+
+import android.view.View;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$handleBackPressed$2 implements View.OnClickListener {
+    public final /* synthetic */ AlertDialog $dialog;
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    public WidgetSettingsUserProfile$handleBackPressed$2(WidgetSettingsUserProfile widgetSettingsUserProfile, AlertDialog alertDialog) {
+        this.this$0 = widgetSettingsUserProfile;
+        this.$dialog = alertDialog;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetSettingsUserProfile.access$getDiscardConfirmed$p(this.this$0).set(true);
+        this.$dialog.dismiss();
+        FragmentActivity activity = this.this$0.getActivity();
+        if (activity != null) {
+            activity.onBackPressed();
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$imageSelectedResult$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$imageSelectedResult$1.java
new file mode 100644
index 0000000000..5f99eac91d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$imageSelectedResult$1.java
@@ -0,0 +1,26 @@
+package com.discord.widgets.settings.profile;
+
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$imageSelectedResult$1 extends o implements Function1<String, Unit> {
+    public static final WidgetSettingsUserProfile$imageSelectedResult$1 INSTANCE = new WidgetSettingsUserProfile$imageSelectedResult$1();
+
+    public WidgetSettingsUserProfile$imageSelectedResult$1() {
+        super(1);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(String str) {
+        invoke(str);
+        return Unit.a;
+    }
+
+    public final void invoke(String str) {
+        m.checkNotNullParameter(str, "it");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$1.java
new file mode 100644
index 0000000000..043f90cb21
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$1.java
@@ -0,0 +1,25 @@
+package com.discord.widgets.settings.profile;
+
+import android.content.Context;
+import android.view.View;
+import com.discord.utilities.dimmer.DimmerView;
+import d0.z.d.m;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$onViewBound$1 implements View.OnClickListener {
+    public final /* synthetic */ View $view;
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    public WidgetSettingsUserProfile$onViewBound$1(WidgetSettingsUserProfile widgetSettingsUserProfile, View view) {
+        this.this$0 = widgetSettingsUserProfile;
+        this.$view = view;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        SettingsUserProfileViewModel access$getViewModel$p = WidgetSettingsUserProfile.access$getViewModel$p(this.this$0);
+        Context context = this.$view.getContext();
+        m.checkNotNullExpressionValue(context, "view.context");
+        access$getViewModel$p.saveUserChanges(context);
+        DimmerView.setDimmed$default(WidgetSettingsUserProfile.access$getBinding$p(this.this$0).g, true, false, 2, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$2.java
new file mode 100644
index 0000000000..652c920311
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$2.java
@@ -0,0 +1,58 @@
+package com.discord.widgets.settings.profile;
+
+import android.view.MotionEvent;
+import androidx.cardview.widget.CardView;
+import com.google.android.material.textfield.TextInputLayout;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$onViewBound$2 extends o implements Function1<MotionEvent, Boolean> {
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$onViewBound$2(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        super(1);
+        this.this$0 = widgetSettingsUserProfile;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Boolean invoke(MotionEvent motionEvent) {
+        return Boolean.valueOf(invoke(motionEvent));
+    }
+
+    public final boolean invoke(MotionEvent motionEvent) {
+        if (motionEvent == null) {
+            return false;
+        }
+        int actionMasked = motionEvent.getActionMasked();
+        boolean z2 = true;
+        if (actionMasked == 1 || actionMasked == 3) {
+            float rawX = motionEvent.getRawX();
+            float rawY = motionEvent.getRawY();
+            TextInputLayout textInputLayout = WidgetSettingsUserProfile.access$getBinding$p(this.this$0).d;
+            m.checkNotNullExpressionValue(textInputLayout, "binding.bioEditorTextInputFieldWrap");
+            int width = textInputLayout.getWidth();
+            TextInputLayout textInputLayout2 = WidgetSettingsUserProfile.access$getBinding$p(this.this$0).d;
+            m.checkNotNullExpressionValue(textInputLayout2, "binding.bioEditorTextInputFieldWrap");
+            int height = textInputLayout2.getHeight();
+            int[] iArr = new int[2];
+            WidgetSettingsUserProfile.access$getBinding$p(this.this$0).d.getLocationOnScreen(iArr);
+            int i = iArr[0];
+            int i2 = iArr[1];
+            if (rawX < ((float) i) || rawX > ((float) (i + width)) || rawY < ((float) i2) || rawY > ((float) (i2 + height))) {
+                CardView cardView = WidgetSettingsUserProfile.access$getBinding$p(this.this$0).b;
+                m.checkNotNullExpressionValue(cardView, "binding.bioEditorCard");
+                if (cardView.getVisibility() != 0) {
+                    z2 = false;
+                }
+                if (z2) {
+                    WidgetSettingsUserProfile.access$setCurrentBioFromEditor(this.this$0);
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$3.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$3.java
new file mode 100644
index 0000000000..94e0cd9a7e
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$3.java
@@ -0,0 +1,30 @@
+package com.discord.widgets.settings.profile;
+
+import android.widget.TextView;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$onViewBound$3 extends o implements Function1<TextView, Unit> {
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$onViewBound$3(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        super(1);
+        this.this$0 = widgetSettingsUserProfile;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(TextView textView) {
+        invoke(textView);
+        return Unit.a;
+    }
+
+    public final void invoke(TextView textView) {
+        m.checkNotNullParameter(textView, "it");
+        WidgetSettingsUserProfile.access$setCurrentBioFromEditor(this.this$0);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$4.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$4.java
new file mode 100644
index 0000000000..667b83b536
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBound$4.java
@@ -0,0 +1,16 @@
+package com.discord.widgets.settings.profile;
+
+import android.view.View;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$onViewBound$4 implements View.OnClickListener {
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    public WidgetSettingsUserProfile$onViewBound$4(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        this.this$0 = widgetSettingsUserProfile;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetSettingsUserProfile.access$getViewModel$p(this.this$0).updateIsEditingBio(true);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$1.java
new file mode 100644
index 0000000000..2be1e622c3
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$1.java
@@ -0,0 +1,31 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$onViewBoundOrOnResume$1 extends o implements Function1<SettingsUserProfileViewModel.ViewState, Unit> {
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$onViewBoundOrOnResume$1(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        super(1);
+        this.this$0 = widgetSettingsUserProfile;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(SettingsUserProfileViewModel.ViewState viewState) {
+        invoke(viewState);
+        return Unit.a;
+    }
+
+    public final void invoke(SettingsUserProfileViewModel.ViewState viewState) {
+        WidgetSettingsUserProfile widgetSettingsUserProfile = this.this$0;
+        m.checkNotNullExpressionValue(viewState, "viewState");
+        WidgetSettingsUserProfile.access$configureUI(widgetSettingsUserProfile, viewState);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java
new file mode 100644
index 0000000000..a530e9f96b
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$onViewBoundOrOnResume$2.java
@@ -0,0 +1,30 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$onViewBoundOrOnResume$2 extends o implements Function1<SettingsUserProfileViewModel.Event, Unit> {
+    public final /* synthetic */ WidgetSettingsUserProfile this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetSettingsUserProfile$onViewBoundOrOnResume$2(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        super(1);
+        this.this$0 = widgetSettingsUserProfile;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(SettingsUserProfileViewModel.Event event) {
+        invoke(event);
+        return Unit.a;
+    }
+
+    public final void invoke(SettingsUserProfileViewModel.Event event) {
+        m.checkNotNullParameter(event, "event");
+        WidgetSettingsUserProfile.access$handleEvent(this.this$0, event);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$sam$rx_functions_Action1$0.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$sam$rx_functions_Action1$0.java
new file mode 100644
index 0000000000..bcbe456433
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$sam$rx_functions_Action1$0.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.settings.profile;
+
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+import rx.functions.Action1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$sam$rx_functions_Action1$0 implements Action1 {
+    private final /* synthetic */ Function1 function;
+
+    public WidgetSettingsUserProfile$sam$rx_functions_Action1$0(Function1 function1) {
+        this.function = function1;
+    }
+
+    @Override // rx.functions.Action1
+    public final /* synthetic */ void call(Object obj) {
+        m.checkNotNullExpressionValue(this.function.invoke(obj), "invoke(...)");
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$viewModel$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$viewModel$2.java
new file mode 100644
index 0000000000..643c3fb1c9
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile$viewModel$2.java
@@ -0,0 +1,20 @@
+package com.discord.widgets.settings.profile;
+
+import com.discord.app.AppViewModel;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile$viewModel$2 extends o implements Function0<AppViewModel<SettingsUserProfileViewModel.ViewState>> {
+    public static final WidgetSettingsUserProfile$viewModel$2 INSTANCE = new WidgetSettingsUserProfile$viewModel$2();
+
+    public WidgetSettingsUserProfile$viewModel$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final AppViewModel<SettingsUserProfileViewModel.ViewState> mo1invoke() {
+        return new SettingsUserProfileViewModel(null, null, null, null, null, 31, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
new file mode 100644
index 0000000000..d3aa23abf2
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/settings/profile/WidgetSettingsUserProfile.java
@@ -0,0 +1,314 @@
+package com.discord.widgets.settings.profile;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentViewModelLazyKt;
+import c.a.d.h0;
+import c.a.d.j0;
+import c.a.d.l;
+import c.a.z.b0;
+import c.d.b.a.a;
+import com.discord.app.AppFragment;
+import com.discord.databinding.ViewDialogConfirmationBinding;
+import com.discord.databinding.WidgetSettingsUserProfileBinding;
+import com.discord.simpleast.core.node.Node;
+import com.discord.stores.StoreAnalytics;
+import com.discord.stores.StoreStream;
+import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.dimmer.DimmerView;
+import com.discord.utilities.images.MGImages;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.textprocessing.AstRenderer;
+import com.discord.utilities.textprocessing.MessageRenderContext;
+import com.discord.utilities.view.extensions.ViewExtensions;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.settings.profile.SettingsUserProfileViewModel;
+import com.discord.widgets.user.profile.UserProfileHeaderView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+import d0.t.n;
+import d0.z.d.a0;
+import d0.z.d.m;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import kotlin.Lazy;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+import rx.Observable;
+import rx.functions.Action1;
+/* compiled from: WidgetSettingsUserProfile.kt */
+public final class WidgetSettingsUserProfile extends AppFragment {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetSettingsUserProfile.class, "binding", "getBinding()Lcom/discord/databinding/WidgetSettingsUserProfileBinding;", 0)};
+    public static final Companion Companion = new Companion(null);
+    private Function1<? super String, Unit> avatarSelectedResult = WidgetSettingsUserProfile$avatarSelectedResult$1.INSTANCE;
+    private Function1<? super String, Unit> bannerSelectedResult = WidgetSettingsUserProfile$bannerSelectedResult$1.INSTANCE;
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsUserProfile$binding$2.INSTANCE, null, 2, null);
+    private final AtomicBoolean discardConfirmed;
+    private Function1<? super String, Unit> imageSelectedResult = WidgetSettingsUserProfile$imageSelectedResult$1.INSTANCE;
+    private final Lazy viewModel$delegate;
+
+    /* compiled from: WidgetSettingsUserProfile.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void launch(Context context) {
+            m.checkNotNullParameter(context, "context");
+            l.d(context, WidgetSettingsUserProfile.class, new Intent());
+            StoreAnalytics.onUserSettingsPaneViewed$default(StoreStream.Companion.getAnalytics(), "User Profile", null, 2, null);
+        }
+    }
+
+    public WidgetSettingsUserProfile() {
+        super(2131559224);
+        WidgetSettingsUserProfile$viewModel$2 widgetSettingsUserProfile$viewModel$2 = WidgetSettingsUserProfile$viewModel$2.INSTANCE;
+        h0 h0Var = new h0(this);
+        this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsUserProfileViewModel.class), new WidgetSettingsUserProfile$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsUserProfile$viewModel$2));
+        this.discardConfirmed = new AtomicBoolean(false);
+    }
+
+    public static final /* synthetic */ void access$configureUI(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.ViewState viewState) {
+        widgetSettingsUserProfile.configureUI(viewState);
+    }
+
+    public static final /* synthetic */ Function1 access$getAvatarSelectedResult$p(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        return widgetSettingsUserProfile.avatarSelectedResult;
+    }
+
+    public static final /* synthetic */ Function1 access$getBannerSelectedResult$p(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        return widgetSettingsUserProfile.bannerSelectedResult;
+    }
+
+    public static final /* synthetic */ WidgetSettingsUserProfileBinding access$getBinding$p(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        return widgetSettingsUserProfile.getBinding();
+    }
+
+    public static final /* synthetic */ AtomicBoolean access$getDiscardConfirmed$p(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        return widgetSettingsUserProfile.discardConfirmed;
+    }
+
+    public static final /* synthetic */ Function1 access$getImageSelectedResult$p(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        return widgetSettingsUserProfile.imageSelectedResult;
+    }
+
+    public static final /* synthetic */ SettingsUserProfileViewModel access$getViewModel$p(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        return widgetSettingsUserProfile.getViewModel();
+    }
+
+    public static final /* synthetic */ boolean access$handleBackPressed(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        return widgetSettingsUserProfile.handleBackPressed(loaded);
+    }
+
+    public static final /* synthetic */ void access$handleEvent(WidgetSettingsUserProfile widgetSettingsUserProfile, SettingsUserProfileViewModel.Event event) {
+        widgetSettingsUserProfile.handleEvent(event);
+    }
+
+    public static final /* synthetic */ void access$setAvatarSelectedResult$p(WidgetSettingsUserProfile widgetSettingsUserProfile, Function1 function1) {
+        widgetSettingsUserProfile.avatarSelectedResult = function1;
+    }
+
+    public static final /* synthetic */ void access$setBannerSelectedResult$p(WidgetSettingsUserProfile widgetSettingsUserProfile, Function1 function1) {
+        widgetSettingsUserProfile.bannerSelectedResult = function1;
+    }
+
+    public static final /* synthetic */ void access$setCurrentBioFromEditor(WidgetSettingsUserProfile widgetSettingsUserProfile) {
+        widgetSettingsUserProfile.setCurrentBioFromEditor();
+    }
+
+    public static final /* synthetic */ void access$setImageSelectedResult$p(WidgetSettingsUserProfile widgetSettingsUserProfile, Function1 function1) {
+        widgetSettingsUserProfile.imageSelectedResult = function1;
+    }
+
+    private final void configureAvatarSelect(SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        this.avatarSelectedResult = new WidgetSettingsUserProfile$configureAvatarSelect$1(this, loaded);
+        String string = getString(2131894405);
+        m.checkNotNullExpressionValue(string, "getString(R.string.user_settings_change_avatar)");
+        List mutableListOf = n.mutableListOf(new b0(string, null, null, null, 8));
+        if (loaded.getUser().getAvatar() != null) {
+            String string2 = getString(2131894480);
+            m.checkNotNullExpressionValue(string2, "getString(R.string.user_settings_remove_avatar)");
+            mutableListOf.add(new b0(string2, null, null, Integer.valueOf(ColorCompat.getColor(requireContext(), 2131100324))));
+        }
+        getBinding().i.setOnAvatarEdit(new WidgetSettingsUserProfile$configureAvatarSelect$2(this, mutableListOf));
+    }
+
+    private final void configureBannerSelect(SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        this.bannerSelectedResult = new WidgetSettingsUserProfile$configureBannerSelect$1(this);
+        String string = getString(2131894408);
+        m.checkNotNullExpressionValue(string, "getString(R.string.user_…gs_change_profile_banner)");
+        List mutableListOf = n.mutableListOf(new b0(string, getString(2131894399), null, null, 8));
+        if (loaded.getUser().getBanner() != null) {
+            String string2 = getString(2131894482);
+            m.checkNotNullExpressionValue(string2, "getString(R.string.user_…gs_remove_profile_banner)");
+            mutableListOf.add(new b0(string2, null, null, Integer.valueOf(ColorCompat.getColor(requireContext(), 2131100324))));
+        }
+        getBinding().i.setOnBannerEdit(new WidgetSettingsUserProfile$configureBannerSelect$2(this, loaded, mutableListOf));
+    }
+
+    private final void configureBio(SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        List<Node<MessageRenderContext>> bioAst = loaded.getBioAst();
+        boolean showBioEditor = loaded.getShowBioEditor();
+        CardView cardView = getBinding().b;
+        m.checkNotNullExpressionValue(cardView, "binding.bioEditorCard");
+        int i = 0;
+        boolean z2 = cardView.getVisibility() == 0;
+        CardView cardView2 = getBinding().e;
+        m.checkNotNullExpressionValue(cardView2, "binding.bioPreviewCard");
+        cardView2.setVisibility(showBioEditor ^ true ? 0 : 8);
+        CardView cardView3 = getBinding().b;
+        m.checkNotNullExpressionValue(cardView3, "binding.bioEditorCard");
+        if (!showBioEditor) {
+            i = 8;
+        }
+        cardView3.setVisibility(i);
+        if (showBioEditor) {
+            TextInputLayout textInputLayout = getBinding().d;
+            m.checkNotNullExpressionValue(textInputLayout, "binding.bioEditorTextInputFieldWrap");
+            ViewExtensions.setText(textInputLayout, loaded.getCurrentBio());
+            if (!z2) {
+                getBinding().d.requestFocus();
+                TextInputLayout textInputLayout2 = getBinding().d;
+                m.checkNotNullExpressionValue(textInputLayout2, "binding.bioEditorTextInputFieldWrap");
+                ViewExtensions.moveCursorToEnd(textInputLayout2);
+                TextInputLayout textInputLayout3 = getBinding().d;
+                m.checkNotNullExpressionValue(textInputLayout3, "binding.bioEditorTextInputFieldWrap");
+                showKeyboard(textInputLayout3);
+            }
+        } else if (bioAst != null) {
+            LinkifiedTextView linkifiedTextView = getBinding().f;
+            m.checkNotNullExpressionValue(linkifiedTextView, "binding.bioPreviewText");
+            Context context = linkifiedTextView.getContext();
+            m.checkNotNullExpressionValue(context, "binding.bioPreviewText.context");
+            MessageRenderContext messageRenderContext = new MessageRenderContext(context, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetSettingsUserProfile$configureBio$renderContext$1(getViewModel()), null, null, 14328, null);
+            LinkifiedTextView linkifiedTextView2 = getBinding().f;
+            m.checkNotNullExpressionValue(linkifiedTextView2, "binding.bioPreviewText");
+            linkifiedTextView2.setText(AstRenderer.render(loaded.getBioAst(), messageRenderContext));
+        }
+    }
+
+    private final void configureFab(SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        FloatingActionButton floatingActionButton = getBinding().h;
+        m.checkNotNullExpressionValue(floatingActionButton, "binding.saveFab");
+        floatingActionButton.setVisibility(loaded.getShowSaveFab() ? 0 : 8);
+    }
+
+    private final void configureUI(SettingsUserProfileViewModel.ViewState viewState) {
+        if (viewState instanceof SettingsUserProfileViewModel.ViewState.Loaded) {
+            SettingsUserProfileViewModel.ViewState.Loaded loaded = (SettingsUserProfileViewModel.ViewState.Loaded) viewState;
+            configureBio(loaded);
+            configureAvatarSelect(loaded);
+            configureBannerSelect(loaded);
+            configureFab(loaded);
+            AppFragment.setOnBackPressed$default(this, new WidgetSettingsUserProfile$configureUI$1(this, viewState), 0, 2, null);
+        }
+    }
+
+    private final WidgetSettingsUserProfileBinding getBinding() {
+        return (WidgetSettingsUserProfileBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    private final SettingsUserProfileViewModel getViewModel() {
+        return (SettingsUserProfileViewModel) this.viewModel$delegate.getValue();
+    }
+
+    private final boolean handleBackPressed(SettingsUserProfileViewModel.ViewState.Loaded loaded) {
+        if (!loaded.isDirty() || this.discardConfirmed.get()) {
+            return false;
+        }
+        ViewDialogConfirmationBinding a = ViewDialogConfirmationBinding.a(LayoutInflater.from(getActivity()).inflate(2131558741, (ViewGroup) null, false));
+        m.checkNotNullExpressionValue(a, "ViewDialogConfirmationBi…tInflater.from(activity))");
+        AlertDialog create = new AlertDialog.Builder(requireContext()).setView(a.a).create();
+        m.checkNotNullExpressionValue(create, "AlertDialog.Builder(requ…logBinding.root).create()");
+        a.d.setText(2131888136);
+        a.e.setText(2131888137);
+        a.b.setOnClickListener(new WidgetSettingsUserProfile$handleBackPressed$1(create));
+        a.f1646c.setText(2131891735);
+        a.f1646c.setOnClickListener(new WidgetSettingsUserProfile$handleBackPressed$2(this, create));
+        create.show();
+        return true;
+    }
+
+    private final void handleEvent(SettingsUserProfileViewModel.Event event) {
+        if (m.areEqual(event, SettingsUserProfileViewModel.Event.UserUpdateRequestCompleted.INSTANCE)) {
+            DimmerView.setDimmed$default(getBinding().g, false, false, 2, null);
+        }
+    }
+
+    private final void setCurrentBioFromEditor() {
+        TextInputEditText textInputEditText = getBinding().f1945c;
+        m.checkNotNullExpressionValue(textInputEditText, "binding.bioEditorTextInputField");
+        getViewModel().updateBio(String.valueOf(textInputEditText.getText()));
+        getViewModel().updateIsEditingBio(false);
+        getBinding().d.clearFocus();
+        hideKeyboard(getBinding().d);
+    }
+
+    @Override // com.discord.app.AppFragment
+    public void onImageChosen(Uri uri, String str) {
+        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(str, "mimeType");
+        super.onImageChosen(uri, str);
+        MGImages.requestImageCrop(requireContext(), this, uri, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 5.0f : 1.0f, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 2.0f : 1.0f, m.areEqual(this.imageSelectedResult, this.bannerSelectedResult) ? 1080 : 240);
+    }
+
+    /* JADX WARN: Multi-variable type inference failed */
+    /* JADX WARNING: Unknown variable types count: 1 */
+    @Override // com.discord.app.AppFragment
+    public void onImageCropped(Uri uri, String str) {
+        m.checkNotNullParameter(uri, "uri");
+        m.checkNotNullParameter(str, "mimeType");
+        super.onImageCropped(uri, str);
+        Context context = getContext();
+        Function1<? super String, Unit> function1 = this.imageSelectedResult;
+        if (function1 != null) {
+            function1 = new WidgetSettingsUserProfile$sam$rx_functions_Action1$0(function1);
+        }
+        MGImages.requestDataUrl(context, uri, str, (Action1) function1);
+    }
+
+    @Override // com.discord.app.AppFragment
+    public void onViewBound(View view) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewBound(view);
+        setActionBarTitle(2131894500);
+        setActionBarSubtitle(2131894357);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
+        getBinding().h.setOnClickListener(new WidgetSettingsUserProfile$onViewBound$1(this, view));
+        ((TouchInterceptingCoordinatorLayout) view).setOnInterceptTouchEvent(new WidgetSettingsUserProfile$onViewBound$2(this));
+        getBinding().f1945c.setRawInputType(1);
+        TextInputLayout textInputLayout = getBinding().d;
+        m.checkNotNullExpressionValue(textInputLayout, "binding.bioEditorTextInputFieldWrap");
+        ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsUserProfile$onViewBound$3(this), 1, null);
+        getBinding().e.setOnClickListener(new WidgetSettingsUserProfile$onViewBound$4(this));
+    }
+
+    @Override // com.discord.app.AppFragment
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        Observable<SettingsUserProfileViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel.observeViewSta…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetSettingsUserProfile.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsUserProfile$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        UserProfileHeaderView.Companion companion = UserProfileHeaderView.Companion;
+        UserProfileHeaderView userProfileHeaderView = getBinding().i;
+        m.checkNotNullExpressionValue(userProfileHeaderView, "binding.userSettingsProfileHeaderView");
+        companion.bind(userProfileHeaderView, this, getViewModel().observeHeaderViewState());
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetSettingsUserProfile.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsUserProfile$onViewBoundOrOnResume$2(this), 62, (Object) null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java
index 178581a467..0263c94e49 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java
@@ -25,44 +25,44 @@ public final /* synthetic */ class WidgetIncomingShare$binding$2 extends k imple
 
     public final WidgetIncomingShareBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131363147;
-            ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363147);
+            i = 2131363172;
+            ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363172);
             if (viewEmbedGameInvite != null) {
-                i = 2131363148;
-                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363148);
+                i = 2131363173;
+                TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363173);
                 if (textInputLayout != null) {
-                    i = 2131363149;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363149);
+                    i = 2131363174;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363174);
                     if (recyclerView != null) {
-                        i = 2131363150;
-                        CardView cardView = (CardView) view.findViewById(2131363150);
+                        i = 2131363175;
+                        CardView cardView = (CardView) view.findViewById(2131363175);
                         if (cardView != null) {
-                            i = 2131363151;
-                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363151);
+                            i = 2131363176;
+                            TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363176);
                             if (textInputLayout2 != null) {
-                                i = 2131363152;
-                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363152);
+                                i = 2131363177;
+                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363177);
                                 if (recyclerView2 != null) {
-                                    i = 2131363566;
-                                    ImageView imageView = (ImageView) view.findViewById(2131363566);
+                                    i = 2131363607;
+                                    ImageView imageView = (ImageView) view.findViewById(2131363607);
                                     if (imageView != null) {
-                                        i = 2131363567;
-                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363567);
+                                        i = 2131363608;
+                                        AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363608);
                                         if (appViewFlipper != null) {
-                                            i = 2131364528;
-                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528);
+                                            i = 2131364567;
+                                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364567);
                                             if (nestedScrollView != null) {
-                                                i = 2131364537;
-                                                AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364537);
+                                                i = 2131364576;
+                                                AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364576);
                                                 if (appViewFlipper2 != null) {
-                                                    i = 2131365584;
-                                                    ViewGlobalSearchItem viewGlobalSearchItem = (ViewGlobalSearchItem) view.findViewById(2131365584);
+                                                    i = 2131365645;
+                                                    ViewGlobalSearchItem viewGlobalSearchItem = (ViewGlobalSearchItem) view.findViewById(2131365645);
                                                     if (viewGlobalSearchItem != null) {
-                                                        i = 2131365585;
-                                                        ImageView imageView2 = (ImageView) view.findViewById(2131365585);
+                                                        i = 2131365646;
+                                                        ImageView imageView2 = (ImageView) view.findViewById(2131365646);
                                                         if (imageView2 != null) {
                                                             return new WidgetIncomingShareBinding((CoordinatorLayout) view, dimmerView, viewEmbedGameInvite, textInputLayout, recyclerView, cardView, textInputLayout2, recyclerView2, imageView, appViewFlipper, nestedScrollView, appViewFlipper2, viewGlobalSearchItem, imageView2);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java
index f1d9c7228e..c78869dbb7 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java
@@ -17,7 +17,7 @@ public final class WidgetIncomingShare$configureUi$2<T1, T2> implements Action2<
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363902) {
+        if (menuItem.getItemId() == 2131363943) {
             WidgetIncomingShare widgetIncomingShare = this.this$0;
             m.checkNotNullExpressionValue(context, "ctx");
             WidgetIncomingShare.access$onSendClicked(widgetIncomingShare, context, this.$this_configureUi.getReceiver(), this.$this_configureUi.getGameInviteModel(), this.$this_configureUi.getContentModel(), this.$this_configureUi.isOnCooldown(), this.$this_configureUi.getMaxFileSizeMB(), this.$this_configureUi.isUserPremium());
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java
index 628941f6c4..2244734b1d 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$2.java
@@ -42,7 +42,7 @@ public final class WidgetIncomingShare$onSendClicked$2<T, R> implements b<Pair<?
             return c.j;
         }
         StoreMessages messages = StoreStream.Companion.getMessages();
-        long g = component2.g();
+        long h = component2.h();
         m.checkNotNullExpressionValue(component1, "meUser");
         TextInputLayout textInputLayout = WidgetIncomingShare.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(textInputLayout, "binding.externalShareComment");
@@ -53,6 +53,6 @@ public final class WidgetIncomingShare$onSendClicked$2<T, R> implements b<Pair<?
         ViewEmbedGameInvite.Model model2 = this.$gameInviteModel;
         Activity activity = model2 != null ? model2.getActivity() : null;
         ViewEmbedGameInvite.Model model3 = this.$gameInviteModel;
-        return StoreMessages.sendMessage$default(messages, g, component1, textOrEmpty, null, list, null, null, null, application, activity, model3 != null ? model3.getMessageActivity() : null, null, null, null, 14464, null).G(new WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1(this, component1));
+        return StoreMessages.sendMessage$default(messages, h, component1, textOrEmpty, null, list, null, null, null, application, activity, model3 != null ? model3.getMessageActivity() : null, null, null, null, 14464, null).F(new WidgetIncomingShare$onSendClicked$2$$special$$inlined$let$lambda$1(this, component1));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java
index 126b04da46..fd3b1264a9 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java
@@ -3,7 +3,7 @@ package com.discord.widgets.share;
 import android.content.Context;
 import android.content.res.Resources;
 import androidx.fragment.app.FragmentManager;
-import c.a.a.b;
+import c.a.a.a;
 import com.discord.app.AppActivity;
 import com.discord.models.guild.Guild;
 import com.discord.models.user.MeUser;
@@ -61,7 +61,7 @@ public final class WidgetIncomingShare$onSendClicked$3 extends o implements Func
                 i = GuildUtilsKt.getMaxFileSizeMB(guild);
             }
             int max = Math.max(i, PremiumUtils.INSTANCE.getMaxFileSizeMB(this.$me));
-            b.C0005b bVar = b.j;
+            a.b bVar = a.j;
             FragmentManager parentFragmentManager = this.this$0.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             UserUtils userUtils = UserUtils.INSTANCE;
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.java
index 9a48fa7ea1..6937953eb5 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.java
@@ -22,6 +22,6 @@ public final class WidgetIncomingShare$onSendClicked$filter$1 extends o implemen
     }
 
     public final boolean invoke(Channel channel) {
-        return channel != null && channel.g() == ((WidgetGlobalSearchModel.ItemChannel) this.$receiver).getChannel().g();
+        return channel != null && channel.h() == ((WidgetGlobalSearchModel.ItemChannel) this.$receiver).getChannel().h();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.java
index 60a25c9ca5..ce78550bbe 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.java
@@ -22,6 +22,6 @@ public final class WidgetIncomingShare$onSendClicked$filter$3 extends o implemen
     }
 
     public final boolean invoke(Channel channel) {
-        return channel != null && channel.e() == ((WidgetGlobalSearchModel.ItemGuild) this.$receiver).getGuild().getId();
+        return channel != null && channel.f() == ((WidgetGlobalSearchModel.ItemGuild) this.$receiver).getGuild().getId();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java
index b344b1480c..0b1ec28d07 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1.java
@@ -80,7 +80,7 @@ public final class WidgetIncomingShare$onViewBoundOrOnResume$1<T, R> implements
     public final Observable<? extends WidgetIncomingShare.Model> call(WidgetGlobalSearchModel.ItemDataPayload itemDataPayload) {
         Channel channel;
         BehaviorSubject access$getContentPublisher$p = WidgetIncomingShare.access$getContentPublisher$p(this.this$0);
-        Observable<R> Z = WidgetIncomingShare.access$getContentPublisher$p(this.this$0).Z(AnonymousClass1.INSTANCE);
+        Observable<R> Y = WidgetIncomingShare.access$getContentPublisher$p(this.this$0).Y(AnonymousClass1.INSTANCE);
         BehaviorSubject access$getCommentPublisher$p = WidgetIncomingShare.access$getCommentPublisher$p(this.this$0);
         m.checkNotNullExpressionValue(access$getCommentPublisher$p, "commentPublisher");
         Observable leadingEdgeThrottle = ObservableExtensionsKt.leadingEdgeThrottle(access$getCommentPublisher$p, 500, TimeUnit.MILLISECONDS);
@@ -89,6 +89,6 @@ public final class WidgetIncomingShare$onViewBoundOrOnResume$1<T, R> implements
         m.checkNotNullExpressionValue(access$getSearchQueryPublisher$p, "searchQueryPublisher");
         Observable forSend$default = WidgetGlobalSearchModel.Companion.getForSend$default(companion, access$getSearchQueryPublisher$p, null, 2, null);
         StoreStream.Companion companion2 = StoreStream.Companion;
-        return Observable.f(access$getContentPublisher$p, Z, leadingEdgeThrottle, forSend$default, companion2.getSlowMode().getCooldownSecs((itemDataPayload == null || (channel = itemDataPayload.getChannel()) == null) ? null : Long.valueOf(channel.g())).G(AnonymousClass2.INSTANCE).s(), StoreUser.observeMe$default(companion2.getUsers(), false, 1, null), new AnonymousClass3(itemDataPayload));
+        return Observable.f(access$getContentPublisher$p, Y, leadingEdgeThrottle, forSend$default, companion2.getSlowMode().getCooldownSecs((itemDataPayload == null || (channel = itemDataPayload.getChannel()) == null) ? null : Long.valueOf(channel.h())).F(AnonymousClass2.INSTANCE).r(), StoreUser.observeMe$default(companion2.getUsers(), false, 1, null), new AnonymousClass3(itemDataPayload));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
index 294086d9d3..1f68bb2500 100644
--- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
+++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java
@@ -16,7 +16,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.a.b;
+import c.a.a.a;
 import c.a.d.l;
 import c.a.d.q;
 import c.d.b.a.a;
@@ -79,13 +79,13 @@ public final class WidgetIncomingShare extends AppFragment {
     private static final int FLIPPER_SEARCH = 0;
     private static final int FLIPPER_SELECTED = 1;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetIncomingShare$binding$2.INSTANCE, null, 2, null);
-    private final BehaviorSubject<String> commentPublisher = BehaviorSubject.m0("");
-    private final BehaviorSubject<ContentModel> contentPublisher = BehaviorSubject.l0();
+    private final BehaviorSubject<String> commentPublisher = BehaviorSubject.l0("");
+    private final BehaviorSubject<ContentModel> contentPublisher = BehaviorSubject.k0();
     private Adapter previewAdapter;
     private String queryString;
     private WidgetGlobalSearchAdapter resultsAdapter;
-    private final BehaviorSubject<String> searchQueryPublisher = BehaviorSubject.m0("");
-    private final BehaviorSubject<WidgetGlobalSearchModel.ItemDataPayload> selectedReceiverPublisher = BehaviorSubject.l0();
+    private final BehaviorSubject<String> searchQueryPublisher = BehaviorSubject.l0("");
+    private final BehaviorSubject<WidgetGlobalSearchModel.ItemDataPayload> selectedReceiverPublisher = BehaviorSubject.k0();
 
     /* compiled from: WidgetIncomingShare.kt */
     public final class Adapter extends RecyclerView.Adapter<ViewHolder> {
@@ -447,7 +447,7 @@ public final class WidgetIncomingShare extends AppFragment {
     }
 
     public WidgetIncomingShare() {
-        super(2131559069);
+        super(2131559075);
     }
 
     public static final /* synthetic */ void access$configureUi(WidgetIncomingShare widgetIncomingShare, Model model, Clock clock) {
@@ -525,7 +525,7 @@ public final class WidgetIncomingShare extends AppFragment {
             i = 8;
         }
         cardView.setVisibility(i);
-        getBinding().d.setHint(z2 ? 2131886235 : 2131894113);
+        getBinding().d.setHint(z2 ? 2131886235 : 2131894214);
     }
 
     private final void configureUi(Model model, Clock clock) {
@@ -596,7 +596,7 @@ public final class WidgetIncomingShare extends AppFragment {
         }
         widgetGlobalSearchAdapter.setData(arrayList);
         widgetGlobalSearchAdapter.setOnSelectedListener(new WidgetIncomingShare$configureUi$$inlined$apply$lambda$2(this, model));
-        ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f1822c;
+        ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f1824c;
         m.checkNotNullExpressionValue(viewEmbedGameInvite, "binding.externalShareActivityActionPreview");
         if (model.getGameInviteModel() == null) {
             z2 = false;
@@ -607,7 +607,7 @@ public final class WidgetIncomingShare extends AppFragment {
         viewEmbedGameInvite.setVisibility(i);
         ViewEmbedGameInvite.Model gameInviteModel = model.getGameInviteModel();
         if (gameInviteModel != null) {
-            getBinding().f1822c.bind(gameInviteModel, clock);
+            getBinding().f1824c.bind(gameInviteModel, clock);
         }
     }
 
@@ -748,7 +748,7 @@ public final class WidgetIncomingShare extends AppFragment {
         i2 = i;
         z6 = false;
         if (sumOfFloat > ((float) i2)) {
-            b.C0005b bVar = b.j;
+            a.b bVar = c.a.a.a.j;
             FragmentManager parentFragmentManager = getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             bVar.a(parentFragmentManager, z3, i, floatValue, sumOfFloat, null, list.size(), z4, z5, z6);
@@ -758,13 +758,13 @@ public final class WidgetIncomingShare extends AppFragment {
         Observable observeMe$default = StoreUser.observeMe$default(companion2.getUsers(), false, 1, null);
         Observable<R> k = companion2.getChannelsSelected().observeSelectedChannel().k(cVar);
         m.checkNotNullExpressionValue(k, "StoreStream\n            …         .compose(filter)");
-        Observable A = Observable.j(observeMe$default, ObservableExtensionsKt.takeSingleUntilTimeout$default(k, 1000, false, 2, null), WidgetIncomingShare$onSendClicked$1.INSTANCE).a0(1).A(new WidgetIncomingShare$onSendClicked$2(this, list, model));
-        m.checkNotNullExpressionValue(A, "Observable\n        .comb…ervable.empty()\n        }");
+        Observable z8 = Observable.j(observeMe$default, ObservableExtensionsKt.takeSingleUntilTimeout$default(k, 1000, false, 2, null), WidgetIncomingShare$onSendClicked$1.INSTANCE).Z(1).z(new WidgetIncomingShare$onSendClicked$2(this, list, model));
+        m.checkNotNullExpressionValue(z8, "Observable\n        .comb…ervable.empty()\n        }");
         WidgetGlobalSearchAdapter widgetGlobalSearchAdapter = this.resultsAdapter;
         if (widgetGlobalSearchAdapter == null) {
             m.throwUninitializedPropertyAccessException("resultsAdapter");
         }
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui(A, this, widgetGlobalSearchAdapter), getBinding().b, 0), WidgetIncomingShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetIncomingShare$onSendClicked$3(this, list, context, itemDataPayload, z4, z5, z6), 62, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui(z8, this, widgetGlobalSearchAdapter), getBinding().b, 0), WidgetIncomingShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetIncomingShare$onSendClicked$3(this, list, context, itemDataPayload, z4, z5, z6), 62, (Object) null);
     }
 
     private final void onSendCompleted() {
@@ -826,9 +826,9 @@ public final class WidgetIncomingShare extends AppFragment {
         m.checkNotNullExpressionValue(behaviorSubject, "searchQueryPublisher");
         StoreGuilds.Actions.requestMembers(this, behaviorSubject, false);
         Clock clock = ClockFactory.get();
-        Observable<R> Z = this.selectedReceiverPublisher.s().Z(new WidgetIncomingShare$onViewBoundOrOnResume$1(this));
-        m.checkNotNullExpressionValue(Z, "selectedReceiverPublishe…  )\n          }\n        }");
-        Observable computationLatest = ObservableExtensionsKt.computationLatest(Z);
+        Observable<R> Y = this.selectedReceiverPublisher.r().Y(new WidgetIncomingShare$onViewBoundOrOnResume$1(this));
+        m.checkNotNullExpressionValue(Y, "selectedReceiverPublishe…  )\n          }\n        }");
+        Observable computationLatest = ObservableExtensionsKt.computationLatest(Y);
         WidgetGlobalSearchAdapter widgetGlobalSearchAdapter = this.resultsAdapter;
         if (widgetGlobalSearchAdapter == null) {
             m.throwUninitializedPropertyAccessException("resultsAdapter");
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper$connectToStage$2$channelVoiceStateUserIds$1.java b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper$connectToStage$2$channelVoiceStateUserIds$1.java
index 43d5571d38..a6967899e2 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper$connectToStage$2$channelVoiceStateUserIds$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper$connectToStage$2$channelVoiceStateUserIds$1.java
@@ -25,6 +25,6 @@ public final class StageChannelJoinHelper$connectToStage$2$channelVoiceStateUser
     public final boolean invoke(VoiceState voiceState) {
         m.checkNotNullParameter(voiceState, "it");
         Long a = voiceState.a();
-        return a != null && a.longValue() == this.$channel.g();
+        return a != null && a.longValue() == this.$channel.h();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
index d9c58d7402..7be6381ecd 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java
@@ -118,7 +118,7 @@ public final class StageChannelJoinHelper {
         StoreVoiceChannelSelected storeVoiceChannelSelected2;
         StageChannelJoinHelper stageChannelJoinHelper2;
         boolean z4;
-        Observable<Channel> z5;
+        Observable<Channel> y2;
         StageChannelJoinHelper stageChannelJoinHelper3;
         Object obj;
         StoreVoiceChannelSelected storeVoiceChannelSelected3;
@@ -126,7 +126,7 @@ public final class StageChannelJoinHelper {
         StoreLurking storeLurking4;
         StoreGuilds storeGuilds2;
         FragmentManager fragmentManager4;
-        boolean z6;
+        boolean z5;
         if (continuation instanceof StageChannelJoinHelper$lurkAndJoinStageAsync$1) {
             stageChannelJoinHelper$lurkAndJoinStageAsync$1 = (StageChannelJoinHelper$lurkAndJoinStageAsync$1) continuation;
             int i2 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.label;
@@ -167,9 +167,9 @@ public final class StageChannelJoinHelper {
                     obj = u;
                     storeVoiceChannelSelected3 = storeVoiceChannelSelected;
                     context4 = context;
-                    z6 = z2;
+                    z5 = z2;
                 } else if (i == 1) {
-                    boolean z7 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0;
+                    boolean z6 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0;
                     j6 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1;
                     j5 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$0;
                     StoreGuilds storeGuilds3 = (StoreGuilds) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$3;
@@ -178,7 +178,7 @@ public final class StageChannelJoinHelper {
                     storeVoiceChannelSelected3 = (StoreVoiceChannelSelected) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$5;
                     storeLurking4 = (StoreLurking) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$4;
                     obj = obj2;
-                    z6 = z7;
+                    z5 = z6;
                     fragmentManager4 = (FragmentManager) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2;
                     stageChannelJoinHelper3 = (StageChannelJoinHelper) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0;
                     storeGuilds2 = storeGuilds3;
@@ -192,8 +192,8 @@ public final class StageChannelJoinHelper {
                     context3 = (Context) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1;
                     stageChannelJoinHelper2 = (StageChannelJoinHelper) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0;
                     l.throwOnFailure(obj2);
-                    z5 = storeVoiceChannelSelected2.observeSelectedChannel().y(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).z();
-                    m.checkNotNullExpressionValue(z5, "selectedVoiceChannelStor…= null }\n        .first()");
+                    y2 = storeVoiceChannelSelected2.observeSelectedChannel().x(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).y();
+                    m.checkNotNullExpressionValue(y2, "selectedVoiceChannelStor…= null }\n        .first()");
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0 = stageChannelJoinHelper2;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1 = context3;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2 = fragmentManager3;
@@ -203,7 +203,7 @@ public final class StageChannelJoinHelper {
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j6;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z4;
                     stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 3;
-                    if (RxCoroutineUtilsKt.awaitSingle(z5, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
+                    if (RxCoroutineUtilsKt.awaitSingle(y2, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
                         return coroutine_suspended;
                     }
                     z3 = z4;
@@ -216,13 +216,13 @@ public final class StageChannelJoinHelper {
                     connectToStage$default(stageChannelJoinHelper, context2, fragmentManager2, j3, false, z3, null, null, null, null, new StageChannelJoinHelper$lurkAndJoinStageAsync$5(storeLurking2, j4), 488, null);
                     return d0.w.h.a.b.boxBoolean(true);
                 } else if (i == 3) {
-                    boolean z8 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0;
+                    boolean z7 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0;
                     long j7 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1;
                     j4 = stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$0;
                     storeLurking2 = (StoreLurking) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$3;
                     l.throwOnFailure(obj2);
                     stageChannelJoinHelper = (StageChannelJoinHelper) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0;
-                    z3 = z8;
+                    z3 = z7;
                     j3 = j7;
                     fragmentManager2 = (FragmentManager) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2;
                     context2 = (Context) stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1;
@@ -234,8 +234,8 @@ public final class StageChannelJoinHelper {
                 if (((Unit) obj) != null) {
                     return d0.w.h.a.b.boxBoolean(false);
                 }
-                Observable<Set<Long>> z9 = storeGuilds2.observeGuildIds().y(new StageChannelJoinHelper$lurkAndJoinStageAsync$3(j5)).z();
-                m.checkNotNullExpressionValue(z9, "guildsStore\n        .obs…in ids }\n        .first()");
+                Observable<Set<Long>> y3 = storeGuilds2.observeGuildIds().x(new StageChannelJoinHelper$lurkAndJoinStageAsync$3(j5)).y();
+                m.checkNotNullExpressionValue(y3, "guildsStore\n        .obs…in ids }\n        .first()");
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0 = stageChannelJoinHelper3;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1 = context4;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2 = fragmentManager4;
@@ -244,9 +244,9 @@ public final class StageChannelJoinHelper {
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$5 = null;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$0 = j5;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j6;
-                stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z6;
+                stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z5;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 2;
-                if (RxCoroutineUtilsKt.awaitSingle(z9, stageChannelJoinHelper$lurkAndJoinStageAsync$1) == coroutine_suspended) {
+                if (RxCoroutineUtilsKt.awaitSingle(y3, stageChannelJoinHelper$lurkAndJoinStageAsync$1) == coroutine_suspended) {
                     return coroutine_suspended;
                 }
                 storeLurking3 = storeLurking4;
@@ -254,9 +254,9 @@ public final class StageChannelJoinHelper {
                 storeVoiceChannelSelected2 = storeVoiceChannelSelected3;
                 stageChannelJoinHelper2 = stageChannelJoinHelper3;
                 fragmentManager3 = fragmentManager4;
-                z4 = z6;
-                z5 = storeVoiceChannelSelected2.observeSelectedChannel().y(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).z();
-                m.checkNotNullExpressionValue(z5, "selectedVoiceChannelStor…= null }\n        .first()");
+                z4 = z5;
+                y2 = storeVoiceChannelSelected2.observeSelectedChannel().x(StageChannelJoinHelper$lurkAndJoinStageAsync$4.INSTANCE).y();
+                m.checkNotNullExpressionValue(y2, "selectedVoiceChannelStor…= null }\n        .first()");
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$0 = stageChannelJoinHelper2;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$1 = context3;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.L$2 = fragmentManager3;
@@ -266,7 +266,7 @@ public final class StageChannelJoinHelper {
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j6;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z4;
                 stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 3;
-                if (RxCoroutineUtilsKt.awaitSingle(z5, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
+                if (RxCoroutineUtilsKt.awaitSingle(y2, stageChannelJoinHelper$lurkAndJoinStageAsync$1) != coroutine_suspended) {
                 }
             }
         }
@@ -293,9 +293,9 @@ public final class StageChannelJoinHelper {
         } else if (ordinal == 2) {
             c.a.a.l.j.a(fragmentManager);
         } else if (ordinal == 3) {
-            o.g(context, 2131894039, 0, null, 12);
+            o.g(context, 2131894139, 0, null, 12);
         } else if (ordinal == 4) {
-            o.g(context, 2131889872, 0, null, 12);
+            o.g(context, 2131889880, 0, null, 12);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java
index 429aa57c85..93f11a16c0 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1.java
@@ -48,10 +48,10 @@ public final class StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$i
         if (i == 0) {
             l.throwOnFailure(obj);
             Observable<Bitmap> bitmap = MGImagesBitmap.INSTANCE.getBitmap(this.$iconUrl$inlined, true);
-            Observable i02 = Observable.i0(new r(bitmap.i, new f1(StageChannelNotifications$onInvitedToSpeak$1$bitmap$1$1$1.INSTANCE)));
-            m.checkNotNullExpressionValue(i02, "MGImagesBitmap.getBitmap…nErrorResumeNext { null }");
+            Observable h02 = Observable.h0(new r(bitmap.i, new f1(StageChannelNotifications$onInvitedToSpeak$1$bitmap$1$1$1.INSTANCE)));
+            m.checkNotNullExpressionValue(h02, "MGImagesBitmap.getBitmap…nErrorResumeNext { null }");
             this.label = 1;
-            obj = RxCoroutineUtilsKt.awaitSingle(i02, this);
+            obj = RxCoroutineUtilsKt.awaitSingle(h02, this);
             if (obj == coroutine_suspended) {
                 return coroutine_suspended;
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1.java b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1.java
index 872aed1138..fabca0ba3b 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications$onInvitedToSpeak$1.java
@@ -57,7 +57,7 @@ public final class StageChannelNotifications$onInvitedToSpeak$1 extends k implem
             l.throwOnFailure(obj);
             String forChannel$default = IconUtils.getForChannel$default(this.$channel, null, 2, null);
             if (forChannel$default == null) {
-                forChannel$default = IconUtils.getForGuild$default(StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(this.$channel.e())), null, false, null, 14, null);
+                forChannel$default = IconUtils.getForGuild$default(StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(this.$channel.f())), null, false, null, 14, null);
             }
             if (forChannel$default != null) {
                 StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1 stageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1 = new StageChannelNotifications$onInvitedToSpeak$1$invokeSuspend$$inlined$let$lambda$1(null, this, forChannel$default);
diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java
index 15c6118684..8d16c12767 100644
--- a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java
+++ b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java
@@ -92,11 +92,11 @@ public final class StageChannelNotifications {
 
     private final NotificationCompat.Builder createChannelNotificationBuilder(Context context, Channel channel) {
         NotificationCompat.Builder color = new NotificationCompat.Builder(context, "Calls").setAutoCancel(true).setOnlyAlertOnce(true).setColor(ColorCompat.getThemedColor(context, 2130969007));
-        String y2 = channel.y();
-        if (y2 == null) {
-            y2 = channel.l();
+        String z2 = channel.z();
+        if (z2 == null) {
+            z2 = channel.m();
         }
-        return color.setContentTitle(y2).setSmallIcon(2131231480).setContentIntent(VoiceEngineNotificationBuilder.getCallScreenNavigationIntent$default(VoiceEngineNotificationBuilder.INSTANCE, context, channel.g(), null, null, 6, null));
+        return color.setContentTitle(z2).setSmallIcon(2131231486).setContentIntent(VoiceEngineNotificationBuilder.getCallScreenNavigationIntent$default(VoiceEngineNotificationBuilder.INSTANCE, context, channel.h(), null, null, 6, null));
     }
 
     public final void onInviteToSpeakRescinded() {
@@ -109,7 +109,7 @@ public final class StageChannelNotifications {
         if (d.a && (channel = this.channelsStore.getChannel(j)) != null) {
             Application application = ApplicationProvider.INSTANCE.get();
             VoiceEngineForegroundService.Companion companion = VoiceEngineForegroundService.Companion;
-            a.G(w0.i, j0.b, null, new StageChannelNotifications$onInvitedToSpeak$1(channel, createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131893444)).addAction(0, application.getString(2131893441), companion.stageInviteAckPendingIntent(application, j, true)).addAction(0, application.getString(2131893443), companion.stageInviteAckPendingIntent(application, j, false)), application, null), 2, null);
+            a.G(w0.i, j0.b, null, new StageChannelNotifications$onInvitedToSpeak$1(channel, createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131893527)).addAction(0, application.getString(2131893524), companion.stageInviteAckPendingIntent(application, j, true)).addAction(0, application.getString(2131893526), companion.stageInviteAckPendingIntent(application, j, false)), application, null), 2, null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java b/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java
index 49bf644f1d..37b95b10b2 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java
@@ -13,17 +13,17 @@ public final class IntroductionCardViewHolder extends MGRecyclerViewHolder<Disco
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public IntroductionCardViewHolder(DiscoveryAdapter discoveryAdapter) {
-        super(2131558987, discoveryAdapter);
+        super(2131558991, discoveryAdapter);
         m.checkNotNullParameter(discoveryAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131362919;
-        ImageView imageView = (ImageView) view.findViewById(2131362919);
+        int i = 2131362944;
+        ImageView imageView = (ImageView) view.findViewById(2131362944);
         if (imageView != null) {
-            i = 2131362920;
-            TextView textView = (TextView) view.findViewById(2131362920);
+            i = 2131362945;
+            TextView textView = (TextView) view.findViewById(2131362945);
             if (textView != null) {
-                i = 2131362921;
-                TextView textView2 = (TextView) view.findViewById(2131362921);
+                i = 2131362946;
+                TextView textView2 = (TextView) view.findViewById(2131362946);
                 if (textView2 != null) {
                     WidgetDiscoveryIntroCardBinding widgetDiscoveryIntroCardBinding = new WidgetDiscoveryIntroCardBinding((ConstraintLayout) view, imageView, textView, textView2);
                     m.checkNotNullExpressionValue(widgetDiscoveryIntroCardBinding, "WidgetDiscoveryIntroCardBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java b/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java
index a1eedf3345..450c94b557 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/StageCardViewHolder.java
@@ -40,27 +40,27 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StageCardViewHolder(DiscoveryAdapter discoveryAdapter) {
-        super(2131558989, discoveryAdapter);
+        super(2131558993, discoveryAdapter);
         m.checkNotNullParameter(discoveryAdapter, "adapter");
         View view = this.itemView;
         LinearLayout linearLayout = (LinearLayout) view;
-        int i = 2131362925;
-        DiscoveryStageCardBodyView discoveryStageCardBodyView = (DiscoveryStageCardBodyView) view.findViewById(2131362925);
+        int i = 2131362950;
+        DiscoveryStageCardBodyView discoveryStageCardBodyView = (DiscoveryStageCardBodyView) view.findViewById(2131362950);
         if (discoveryStageCardBodyView != null) {
-            i = 2131362926;
-            DiscoveryStageCardControlsView discoveryStageCardControlsView = (DiscoveryStageCardControlsView) view.findViewById(2131362926);
+            i = 2131362951;
+            DiscoveryStageCardControlsView discoveryStageCardControlsView = (DiscoveryStageCardControlsView) view.findViewById(2131362951);
             if (discoveryStageCardControlsView != null) {
-                i = 2131362927;
-                TextView textView = (TextView) view.findViewById(2131362927);
+                i = 2131362952;
+                TextView textView = (TextView) view.findViewById(2131362952);
                 if (textView != null) {
-                    i = 2131362930;
-                    DiscoveryStageCardTopHatView discoveryStageCardTopHatView = (DiscoveryStageCardTopHatView) view.findViewById(2131362930);
+                    i = 2131362955;
+                    DiscoveryStageCardTopHatView discoveryStageCardTopHatView = (DiscoveryStageCardTopHatView) view.findViewById(2131362955);
                     if (discoveryStageCardTopHatView != null) {
-                        i = 2131364970;
-                        View findViewById = view.findViewById(2131364970);
+                        i = 2131365020;
+                        View findViewById = view.findViewById(2131365020);
                         if (findViewById != null) {
-                            i = 2131364971;
-                            View findViewById2 = view.findViewById(2131364971);
+                            i = 2131365021;
+                            View findViewById2 = view.findViewById(2131365021);
                             if (findViewById2 != null) {
                                 WidgetDiscoveryStageCardBinding widgetDiscoveryStageCardBinding = new WidgetDiscoveryStageCardBinding((LinearLayout) view, linearLayout, discoveryStageCardBodyView, discoveryStageCardControlsView, textView, discoveryStageCardTopHatView, findViewById, findViewById2);
                                 m.checkNotNullExpressionValue(widgetDiscoveryStageCardBinding, "WidgetDiscoveryStageCardBinding.bind(itemView)");
@@ -93,13 +93,13 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
         StageRoles r18 = stageCardItem.m33component8twRsX0();
         StageCardUserFriend component9 = stageCardItem.component9();
         this.binding.b.setOnClickListener(new StageCardViewHolder$onConfigure$1(this, component2));
-        DiscoveryStageCardBodyView discoveryStageCardBodyView = this.binding.f1763c;
+        DiscoveryStageCardBodyView discoveryStageCardBodyView = this.binding.f1764c;
         Objects.requireNonNull(discoveryStageCardBodyView);
         m.checkNotNullParameter(component3, "guild");
         m.checkNotNullParameter(component4, "speakers");
         TextView textView = discoveryStageCardBodyView.i.e;
         textView.setText(component3.getName());
-        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, component3.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231812 : component3.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232037 : 0, 0, 11, (Object) null);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView, 0, 0, component3.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231820 : component3.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232045 : 0, 0, 11, (Object) null);
         TextView textView2 = discoveryStageCardBodyView.i.g;
         m.checkNotNullExpressionValue(textView2, "binding.stageDiscoveryStageName");
         if (component1 == null) {
@@ -117,11 +117,11 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
         TextView textView4 = discoveryStageCardBodyView.i.d;
         m.checkNotNullExpressionValue(textView4, "binding.stageDiscoveryGuildIconText");
         textView4.setVisibility(hasIcon ^ true ? 0 : 8);
-        SimpleDraweeView simpleDraweeView = discoveryStageCardBodyView.i.f160c;
+        SimpleDraweeView simpleDraweeView = discoveryStageCardBodyView.i.f171c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.stageDiscoveryGuildIcon");
         simpleDraweeView.setVisibility(hasIcon ? 0 : 8);
         if (hasIcon) {
-            SimpleDraweeView simpleDraweeView2 = discoveryStageCardBodyView.i.f160c;
+            SimpleDraweeView simpleDraweeView2 = discoveryStageCardBodyView.i.f171c;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.stageDiscoveryGuildIcon");
             i2 = 0;
             SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView2, true, component3, (float) DimenUtils.dpToPixels(4), Integer.valueOf(IconUtils.getMediaProxySize(20)), null, null, null, false, null, 496, null);
@@ -150,9 +150,9 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
             m.checkNotNullParameter(stageCardViewHolder$onConfigure$3, "onExitStageClick");
             discoveryStageCardControlsView2.i.b.setOnClickListener(new j(i2, stageCardViewHolder$onConfigure$3));
             discoveryStageCardControlsView2.i.d.setOnClickListener(new j(1, stageCardViewHolder$onConfigure$2));
-            TextView textView7 = discoveryStageCardControlsView2.i.f166c;
+            TextView textView7 = discoveryStageCardControlsView2.i.f177c;
             m.checkNotNullExpressionValue(textView7, "binding.discoveryControlJoinedAs");
-            textView7.setText((r18 == null || !StageRoles.m26isSpeakerimpl(r18.m28unboximpl())) ? discoveryStageCardControlsView2.getContext().getString(2131893365) : discoveryStageCardControlsView2.getContext().getString(2131893399));
+            textView7.setText((r18 == null || !StageRoles.m26isSpeakerimpl(r18.m28unboximpl())) ? discoveryStageCardControlsView2.getContext().getString(2131893448) : discoveryStageCardControlsView2.getContext().getString(2131893482));
         } else if (ordinal != 3) {
             TextView textView8 = this.binding.e;
             m.checkNotNullExpressionValue(textView8, "binding.discoveryStageCardError");
@@ -188,8 +188,8 @@ public final class StageCardViewHolder extends MGRecyclerViewHolder<DiscoveryAda
             boolean isSpeaker = component9.isSpeaker();
             Objects.requireNonNull(discoveryStageCardTopHatView2);
             m.checkNotNullParameter(displayName, "displayName");
-            int i3 = isSpeaker ? 2131893384 : 2131893382;
-            TextView textView10 = discoveryStageCardTopHatView2.i.f175c;
+            int i3 = isSpeaker ? 2131893467 : 2131893465;
+            TextView textView10 = discoveryStageCardTopHatView2.i.f188c;
             m.checkNotNullExpressionValue(textView10, "binding.discoveryStageCardTopHatText");
             Object[] objArr = new Object[1];
             objArr[i2] = displayName;
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryGuildsFeatureFlag.java b/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryGuildsFeatureFlag.java
index 903ca8b023..a49d403e49 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryGuildsFeatureFlag.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryGuildsFeatureFlag.java
@@ -63,15 +63,15 @@ public final class StageDiscoveryGuildsFeatureFlag {
         if (channel == null) {
             return false;
         }
-        Experiment guildExperiment = this.storeExperiments.getGuildExperiment("2021-04_stage_discovery_public_guilds", channel.e(), true);
+        Experiment guildExperiment = this.storeExperiments.getGuildExperiment("2021-04_stage_discovery_public_guilds", channel.f(), true);
         boolean z2 = guildExperiment != null && guildExperiment.getBucket() == 1;
         Experiment userExperiment = this.storeExperiments.getUserExperiment("2021-05_stage_public_toggle_users", true);
         return z2 && (userExperiment != null && userExperiment.getBucket() == 1);
     }
 
     public final Observable<Boolean> observeCanGuildAccessStageDiscovery(long j) {
-        Observable<Boolean> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeChannels, this.storeExperiments}, false, null, null, new StageDiscoveryGuildsFeatureFlag$observeCanGuildAccessStageDiscovery$1(this, j), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeChannels, this.storeExperiments}, false, null, null, new StageDiscoveryGuildsFeatureFlag$observeCanGuildAccessStageDiscovery$1(this, j), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryUsersFeatureFlag.java b/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryUsersFeatureFlag.java
index 2053961420..1e5b7464f8 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryUsersFeatureFlag.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/StageDiscoveryUsersFeatureFlag.java
@@ -59,8 +59,8 @@ public final class StageDiscoveryUsersFeatureFlag {
     }
 
     public final Observable<Boolean> observeCanAccessStageDiscovery() {
-        Observable<Boolean> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeExperiments}, false, null, null, new StageDiscoveryUsersFeatureFlag$observeCanAccessStageDiscovery$1(this), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeExperiments}, false, null, null, new StageDiscoveryUsersFeatureFlag$observeCanAccessStageDiscovery$1(this), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java
index 80fdd82b71..ac38a55c46 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$binding$2.java
@@ -20,29 +20,29 @@ public final /* synthetic */ class WidgetDiscovery$binding$2 extends k implement
 
     public final WidgetDiscoveryBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362915;
-        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362915);
+        int i = 2131362940;
+        ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131362940);
         if (constraintLayout != null) {
-            i = 2131362916;
-            TextView textView = (TextView) view.findViewById(2131362916);
+            i = 2131362941;
+            TextView textView = (TextView) view.findViewById(2131362941);
             if (textView != null) {
-                i = 2131362917;
-                TextView textView2 = (TextView) view.findViewById(2131362917);
+                i = 2131362942;
+                TextView textView2 = (TextView) view.findViewById(2131362942);
                 if (textView2 != null) {
-                    i = 2131362918;
-                    ImageView imageView = (ImageView) view.findViewById(2131362918);
+                    i = 2131362943;
+                    ImageView imageView = (ImageView) view.findViewById(2131362943);
                     if (imageView != null) {
-                        i = 2131362922;
-                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362922);
+                        i = 2131362947;
+                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362947);
                         if (recyclerView != null) {
-                            i = 2131362933;
-                            TextView textView3 = (TextView) view.findViewById(2131362933);
+                            i = 2131362958;
+                            TextView textView3 = (TextView) view.findViewById(2131362958);
                             if (textView3 != null) {
-                                i = 2131362934;
-                                TextView textView4 = (TextView) view.findViewById(2131362934);
+                                i = 2131362959;
+                                TextView textView4 = (TextView) view.findViewById(2131362959);
                                 if (textView4 != null) {
-                                    i = 2131365156;
-                                    SwipeRefreshLayout swipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(2131365156);
+                                    i = 2131365211;
+                                    SwipeRefreshLayout swipeRefreshLayout = (SwipeRefreshLayout) view.findViewById(2131365211);
                                     if (swipeRefreshLayout != null) {
                                         return new WidgetDiscoveryBinding((ConstraintLayout) view, constraintLayout, textView, textView2, imageView, recyclerView, textView3, textView4, swipeRefreshLayout);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$onViewBound$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$onViewBound$1.java
index a7712fa9e0..47682fdc95 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery$onViewBound$1.java
@@ -46,7 +46,7 @@ public final class WidgetDiscovery$onViewBound$1 extends o implements Function2<
                     swipeRefreshLayout2.setRefreshing(false);
                     linearLayoutManager.scrollToPositionWithOffset(0, 0);
                 }
-                RecyclerView recyclerView = WidgetDiscovery.access$getBinding$p(this.this$0).f1762c;
+                RecyclerView recyclerView = WidgetDiscovery.access$getBinding$p(this.this$0).f1763c;
                 m.checkNotNullExpressionValue(recyclerView, "binding.discoveryRecycler");
                 recyclerView.addOnLayoutChangeListener(new WidgetDiscovery$onViewBound$1$$special$$inlined$doOnNextLayout$1(this, linearLayoutManager));
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java
index 8e8e53a626..b0bd2bea67 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscovery.java
@@ -40,7 +40,7 @@ public final class WidgetDiscovery extends AppFragment implements OnTabSelectedL
     private final Lazy viewModel$delegate;
 
     public WidgetDiscovery() {
-        super(2131558986);
+        super(2131558990);
         WidgetDiscovery$viewModel$2 widgetDiscovery$viewModel$2 = WidgetDiscovery$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetDiscoveryViewModel.class), new WidgetDiscovery$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetDiscovery$viewModel$2));
@@ -118,7 +118,7 @@ public final class WidgetDiscovery extends AppFragment implements OnTabSelectedL
             ConstraintLayout constraintLayout = getBinding().b;
             m.checkNotNullExpressionValue(constraintLayout, "binding.discoveryEmptyState");
             constraintLayout.setVisibility(0);
-            RecyclerView recyclerView = getBinding().f1762c;
+            RecyclerView recyclerView = getBinding().f1763c;
             m.checkNotNullExpressionValue(recyclerView, "binding.discoveryRecycler");
             recyclerView.setVisibility(8);
         } else if (viewState instanceof WidgetDiscoveryViewModel.ViewState.Loaded) {
@@ -127,7 +127,7 @@ public final class WidgetDiscovery extends AppFragment implements OnTabSelectedL
             ConstraintLayout constraintLayout2 = getBinding().b;
             m.checkNotNullExpressionValue(constraintLayout2, "binding.discoveryEmptyState");
             constraintLayout2.setVisibility(loaded.isEmpty() ? 0 : 8);
-            RecyclerView recyclerView2 = getBinding().f1762c;
+            RecyclerView recyclerView2 = getBinding().f1763c;
             m.checkNotNullExpressionValue(recyclerView2, "binding.discoveryRecycler");
             if (!loaded.isEmpty()) {
                 i = 0;
@@ -182,7 +182,7 @@ public final class WidgetDiscovery extends AppFragment implements OnTabSelectedL
         if (widgetTabsHost != null) {
             widgetTabsHost.registerTabSelectionListener(NavigationTab.DISCOVERY, this);
         }
-        RecyclerView recyclerView = getBinding().f1762c;
+        RecyclerView recyclerView = getBinding().f1763c;
         m.checkNotNullExpressionValue(recyclerView, "binding.discoveryRecycler");
         DiscoveryAdapter discoveryAdapter = (DiscoveryAdapter) MGRecyclerAdapter.Companion.configure(new DiscoveryAdapter(recyclerView));
         this.discoveryAdapter = discoveryAdapter;
@@ -195,15 +195,15 @@ public final class WidgetDiscovery extends AppFragment implements OnTabSelectedL
             m.throwUninitializedPropertyAccessException("discoveryAdapter");
         }
         discoveryAdapter2.setOnUpdated(new WidgetDiscovery$onViewBound$1(this));
-        getBinding().f1762c.addOnScrollListener(new WidgetDiscovery$onViewBound$2(this));
+        getBinding().f1763c.addOnScrollListener(new WidgetDiscovery$onViewBound$2(this));
         getBinding().d.setOnClickListener(new WidgetDiscovery$onViewBound$3(this));
     }
 
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<R> Z = StageDiscoveryUsersFeatureFlag.Companion.getINSTANCE().observeCanAccessStageDiscovery().Z(new WidgetDiscovery$onViewBoundOrOnResume$1(this));
-        m.checkNotNullExpressionValue(Z, "StageDiscoveryUsersFeatu…y()\n          }\n        }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(Z, this), WidgetDiscovery.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDiscovery$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable<R> Y = StageDiscoveryUsersFeatureFlag.Companion.getINSTANCE().observeCanAccessStageDiscovery().Y(new WidgetDiscovery$onViewBoundOrOnResume$1(this));
+        m.checkNotNullExpressionValue(Y, "StageDiscoveryUsersFeatu…y()\n          }\n        }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(Y, this), WidgetDiscovery.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDiscovery$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1.java
index c46e47f98c..974f446306 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1.java
@@ -82,8 +82,8 @@ public final class WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1<T
 
     public final Observable<? extends List<DiscoveryModel>> call(Consents consents) {
         if (!consents.getPersonalization().getConsented()) {
-            return this.$recommendedFetchStateObservable.y(AnonymousClass1.INSTANCE).G(AnonymousClass2.INSTANCE);
+            return this.$recommendedFetchStateObservable.x(AnonymousClass1.INSTANCE).F(AnonymousClass2.INSTANCE);
         }
-        return Observable.i0(new q2(WidgetDiscoveryViewModel.Companion.observeCompositeDiscoveryModelsFetchState(this.$recommendedFetchStateObservable, this.$presenceFetchStateObservable).y(AnonymousClass3.INSTANCE), new Observable[]{this.$presenceObservable, this.$guildsObservable}, null, new e(AnonymousClass4.INSTANCE)));
+        return Observable.h0(new q2(WidgetDiscoveryViewModel.Companion.observeCompositeDiscoveryModelsFetchState(this.$recommendedFetchStateObservable, this.$presenceFetchStateObservable).x(AnonymousClass3.INSTANCE), new Observable[]{this.$presenceObservable, this.$guildsObservable}, null, new e(AnonymousClass4.INSTANCE)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java
index ddd88485e6..0aaf5c8bd2 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryModels$1.java
@@ -132,6 +132,6 @@ public final class WidgetDiscoveryViewModel$Companion$observePresenceDiscoveryMo
 
     @Override // rx.functions.Func0, java.util.concurrent.Callable
     public final Observable<Map<Long, DiscoveryModel>> call() {
-        return ModelStageRichPresence.Companion.observeStageRichPresence$default(ModelStageRichPresence.Companion, null, 1, null).Z(new AnonymousClass1(this));
+        return ModelStageRichPresence.Companion.observeStageRichPresence$default(ModelStageRichPresence.Companion, null, 1, null).Y(new AnonymousClass1(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceFetchStateObservable$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceFetchStateObservable$1.java
index 2acaccbc26..1ecd5f4291 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceFetchStateObservable$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observePresenceFetchStateObservable$1.java
@@ -57,6 +57,6 @@ public final class WidgetDiscoveryViewModel$Companion$observePresenceFetchStateO
 
     @Override // rx.functions.Func0, java.util.concurrent.Callable
     public final Observable<WidgetDiscoveryViewModel.DiscoveryModelsFetchState> call() {
-        return Observable.j(this.$requestedStageChannelsStore.observeRequestedStageChannels(), this.$presenceDiscoveryModelsObservable, AnonymousClass1.INSTANCE).s();
+        return Observable.j(this.$requestedStageChannelsStore.observeRequestedStageChannels(), this.$presenceDiscoveryModelsObservable, AnonymousClass1.INSTANCE).r();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java
index 8c6bd18997..37a190817c 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryModels$1.java
@@ -74,9 +74,9 @@ public final class WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryM
                 Guild guild;
                 GuildMember guildMember;
                 m.checkNotNullParameter(stageChannel, "stageChannel");
-                long g = stageChannel.getChannel().g();
+                long h = stageChannel.getChannel().h();
                 StageInstance stageInstance = stageChannel.getStageInstance();
-                if (stageInstance == null || (guild = (Guild) this.$guilds.get(Long.valueOf(stageChannel.getChannel().e()))) == null) {
+                if (stageInstance == null || (guild = (Guild) this.$guilds.get(Long.valueOf(stageChannel.getChannel().f()))) == null) {
                     return null;
                 }
                 List<UserGuildMember> speakers = stageChannel.getSpeakers();
@@ -88,7 +88,7 @@ public final class WidgetDiscoveryViewModel$Companion$observeUserGuildDiscoveryM
                     Map map = (Map) this.$guildMembers.get(Long.valueOf(guild.getId()));
                     arrayList.add(new DiscoverySpeakerModel(id2, avatar, (map == null || (guildMember = (GuildMember) a.e(user, map)) == null) ? null : guildMember.getNick(), user.getUsername()));
                 }
-                return new DiscoveryModel(stageInstance.f(), Long.valueOf((stageInstance.c() >>> 22) + 1420070400000L), g, guild, stageInstance.c(), arrayList, arrayList.size(), stageChannel.getAudienceSize(), DiscoverySource.USER_GUILDS, 3, null);
+                return new DiscoveryModel(stageInstance.f(), Long.valueOf((stageInstance.c() >>> 22) + 1420070400000L), h, guild, stageInstance.c(), arrayList, arrayList.size(), stageChannel.getAudienceSize(), DiscoverySource.USER_GUILDS, 3, null);
             }
         }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java
index 310e8745f3..d76633a26e 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java
@@ -34,7 +34,7 @@ public final class WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1
         }
 
         public final Boolean call(RtcConnection.Metadata metadata) {
-            Long l = metadata != null ? metadata.f2079c : null;
+            Long l = metadata != null ? metadata.f2085c : null;
             return Boolean.valueOf(l != null && l.longValue() == this.this$0.this$0.$channelId);
         }
     }
@@ -92,10 +92,10 @@ public final class WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1
         if (!((Boolean) obj2).booleanValue()) {
             return null;
         }
-        Observable<RtcConnection.Metadata> y2 = StoreStream.Companion.getRtcConnection().observeRtcConnectionMetadata().y(new AnonymousClass1(this));
-        m.checkNotNullExpressionValue(y2, "StoreStream.getRtcConnec….channelId == channelId }");
+        Observable<RtcConnection.Metadata> x2 = StoreStream.Companion.getRtcConnection().observeRtcConnectionMetadata().x(new AnonymousClass1(this));
+        m.checkNotNullExpressionValue(x2, "StoreStream.getRtcConnec….channelId == channelId }");
         this.label = 2;
-        Object awaitFirst = RxCoroutineUtilsKt.awaitFirst(y2, this);
+        Object awaitFirst = RxCoroutineUtilsKt.awaitFirst(x2, this);
         return awaitFirst == coroutine_suspended ? coroutine_suspended : awaitFirst;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java
index ae721ece2a..c4b47aee04 100644
--- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java
@@ -286,9 +286,9 @@ public final class WidgetDiscoveryViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<List<DiscoveryModel>> combineDiscoveryModels(Observable<DiscoveryModelsFetchState> observable, Observable<DiscoveryModelsFetchState> observable2, Observable<Map<Long, DiscoveryModel>> observable3, Observable<Map<Long, DiscoveryModel>> observable4, StoreUserSettings storeUserSettings) {
-            Observable<R> Z = storeUserSettings.observeConsents().Z(new WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1(observable, observable2, observable3, observable4));
-            m.checkNotNullExpressionValue(Z, "userSettingsStore.observ…      }\n        }\n      }");
-            return Z;
+            Observable<R> Y = storeUserSettings.observeConsents().Y(new WidgetDiscoveryViewModel$Companion$combineDiscoveryModels$1(observable, observable2, observable3, observable4));
+            m.checkNotNullExpressionValue(Y, "userSettingsStore.observ…      }\n        }\n      }");
+            return Y;
         }
 
         private final DiscoveryItem.StageCardItem.StageConnectionState computeConnectionState(DiscoveryModel discoveryModel, Long l, ConnectingState connectingState) {
@@ -996,13 +996,13 @@ public final class WidgetDiscoveryViewModel extends AppViewModel<ViewState> {
         RestAPI api = (i & 512) != 0 ? RestAPI.Companion.getApi() : restAPI;
         Clock clock2 = (i & 1024) != 0 ? ClockFactory.get() : clock;
         if ((i & 2048) != 0) {
-            behaviorSubject3 = BehaviorSubject.m0(DiscoveryModelsFetchState.Uninitialized.INSTANCE);
+            behaviorSubject3 = BehaviorSubject.l0(DiscoveryModelsFetchState.Uninitialized.INSTANCE);
             m.checkNotNullExpressionValue(behaviorSubject3, "BehaviorSubject.create(D…FetchState.Uninitialized)");
         } else {
             behaviorSubject3 = behaviorSubject;
         }
         if ((i & 4096) != 0) {
-            behaviorSubject4 = BehaviorSubject.m0(ConnectingState.Idle.INSTANCE);
+            behaviorSubject4 = BehaviorSubject.l0(ConnectingState.Idle.INSTANCE);
             m.checkNotNullExpressionValue(behaviorSubject4, "BehaviorSubject.create(ConnectingState.Idle)");
         } else {
             behaviorSubject4 = behaviorSubject2;
@@ -1047,19 +1047,19 @@ public final class WidgetDiscoveryViewModel extends AppViewModel<ViewState> {
 
     private final void fetchRecommendedStages(Context context) {
         DiscoveryModelsFetchState.Refreshing refreshing;
-        DiscoveryModelsFetchState o0 = this.recommendedFetchStateObservable.o0();
+        DiscoveryModelsFetchState n0 = this.recommendedFetchStateObservable.n0();
         BehaviorSubject<DiscoveryModelsFetchState> behaviorSubject = this.recommendedFetchStateObservable;
-        if (!(o0 instanceof DiscoveryModelsFetchState.Refreshing)) {
-            if (o0 instanceof DiscoveryModelsFetchState.Uninitialized) {
+        if (!(n0 instanceof DiscoveryModelsFetchState.Refreshing)) {
+            if (n0 instanceof DiscoveryModelsFetchState.Uninitialized) {
                 refreshing = new DiscoveryModelsFetchState.Refreshing(null, 1, null);
-            } else if (o0 instanceof DiscoveryModelsFetchState.Loaded) {
-                refreshing = new DiscoveryModelsFetchState.Refreshing(o0);
+            } else if (n0 instanceof DiscoveryModelsFetchState.Loaded) {
+                refreshing = new DiscoveryModelsFetchState.Refreshing(n0);
             } else {
                 throw new NoWhenBranchMatchedException();
             }
             behaviorSubject.onNext(refreshing);
             Logger.v$default(AppLog.g, "Fetching recommended stages", null, 2, null);
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getRecommendedStageInstances(), false, 1, null), this, null, 2, null), WidgetDiscoveryViewModel.class, context, (Function1) null, new WidgetDiscoveryViewModel$fetchRecommendedStages$1(this, o0), (Function0) null, (Function0) null, new WidgetDiscoveryViewModel$fetchRecommendedStages$2(this), 52, (Object) null);
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getRecommendedStageInstances(), false, 1, null), this, null, 2, null), WidgetDiscoveryViewModel.class, context, (Function1) null, new WidgetDiscoveryViewModel$fetchRecommendedStages$1(this, n0), (Function0) null, (Function0) null, new WidgetDiscoveryViewModel$fetchRecommendedStages$2(this), 52, (Object) null);
         }
     }
 
@@ -1072,7 +1072,7 @@ public final class WidgetDiscoveryViewModel extends AppViewModel<ViewState> {
         if (discoveryModel == null) {
             discoveryModel = this.userGuildDiscoveryModels.get(Long.valueOf(j));
         }
-        return discoveryModel != null ? discoveryModel : this.recommendedFetchStateObservable.o0().getModels().get(Long.valueOf(j));
+        return discoveryModel != null ? discoveryModel : this.recommendedFetchStateObservable.n0().getModels().get(Long.valueOf(j));
     }
 
     @MainThread
@@ -1163,11 +1163,11 @@ public final class WidgetDiscoveryViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && j != loaded.getSelectedVoiceChannelId()) {
-            ConnectingState o0 = this.connectingStateSubject.o0();
-            if (!(o0 instanceof ConnectingState.InProgress)) {
-                o0 = null;
+            ConnectingState n0 = this.connectingStateSubject.n0();
+            if (!(n0 instanceof ConnectingState.InProgress)) {
+                n0 = null;
             }
-            ConnectingState.InProgress inProgress = (ConnectingState.InProgress) o0;
+            ConnectingState.InProgress inProgress = (ConnectingState.InProgress) n0;
             if (!(inProgress == null || (job = inProgress.getJob()) == null)) {
                 c.q.a.k.a.k(job, null, 1, null);
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/model/StageCallModel$Companion$observeStageCallModel$1.java b/app/src/main/java/com/discord/widgets/stage/model/StageCallModel$Companion$observeStageCallModel$1.java
index 84f2ffdfdc..5144c28781 100644
--- a/app/src/main/java/com/discord/widgets/stage/model/StageCallModel$Companion$observeStageCallModel$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/model/StageCallModel$Companion$observeStageCallModel$1.java
@@ -55,10 +55,10 @@ public final class StageCallModel$Companion$observeStageCallModel$1<T, R> implem
         if (channel == null) {
             return new j(null);
         }
-        if (!AnimatableValueParser.u1(channel)) {
+        if (!AnimatableValueParser.v1(channel)) {
             return new j(null);
         }
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.f(ObservableExtensionsKt.leadingEdgeThrottle(companion.getVoiceParticipants().get(channel.g()), 250, TimeUnit.MILLISECONDS), companion.getGuilds().observeComputed(channel.e()), companion.getGuilds().observeRoles(channel.e()), companion.getGuilds().observeGuild(channel.e()), companion.getUserRelationships().observeForType(2), companion.getStageInstances().observeStageInstanceForChannel(this.$channelId), new AnonymousClass1(channel));
+        return Observable.f(ObservableExtensionsKt.leadingEdgeThrottle(companion.getVoiceParticipants().get(channel.h()), 250, TimeUnit.MILLISECONDS), companion.getGuilds().observeComputed(channel.f()), companion.getGuilds().observeRoles(channel.f()), companion.getGuilds().observeGuild(channel.f()), companion.getUserRelationships().observeForType(2), companion.getStageInstances().observeStageInstanceForChannel(this.$channelId), new AnonymousClass1(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java b/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java
index 09237e4b61..7bcb0f9a91 100644
--- a/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/model/StageCallModel.java
@@ -71,7 +71,7 @@ public final class StageCallModel {
             LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size()));
             for (Map.Entry entry : linkedHashMap.entrySet()) {
                 Object key = entry.getKey();
-                StageRoles r5 = storeStageChannels.m12getUserRolesuOBN1zc(((Number) entry.getKey()).longValue(), channel.g());
+                StageRoles r5 = storeStageChannels.m12getUserRolesuOBN1zc(((Number) entry.getKey()).longValue(), channel.h());
                 linkedHashMap2.put(key, StageRoles.m18boximpl(r5 != null ? r5.m28unboximpl() : StageRoles.Companion.m30getAUDIENCE1LxfuJo()));
             }
             Collection<StageRoles> values2 = linkedHashMap2.values();
@@ -125,7 +125,7 @@ public final class StageCallModel {
                 i4 = i4;
                 i2 = 3;
             }
-            StageRoles r0 = storeStageChannels.m10getMyRolesvisDeB4(channel.g());
+            StageRoles r0 = storeStageChannels.m10getMyRolesvisDeB4(channel.h());
             return new StageCallModel(r0 != null ? r0.m28unboximpl() : StageRoles.Companion.m30getAUDIENCE1LxfuJo(), arrayList2, u.sorted(arrayList3), q.toList(q.map(q.filter(u.asSequence(arrayList2), StageCallModel$Companion$create$2.INSTANCE), StageCallModel$Companion$create$3.INSTANCE)), i3, stageInstance, i4, guild, null);
         }
 
@@ -134,9 +134,9 @@ public final class StageCallModel {
         }
 
         public final Observable<StageCallModel> observeStageCallModel(long j) {
-            Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new StageCallModel$Companion$observeStageCallModel$1(j));
-            m.checkNotNullExpressionValue(Z, "StoreStream\n          .g…            }\n          }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new StageCallModel$Companion$observeStageCallModel$1(j));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java
index ddfac6eb32..e9712dfb0a 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java
@@ -25,44 +25,44 @@ public final /* synthetic */ class WidgetStageSettings$binding$2 extends k imple
 
     public final WidgetStageSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364954;
-        TextView textView = (TextView) view.findViewById(2131364954);
+        int i = 2131365004;
+        TextView textView = (TextView) view.findViewById(2131365004);
         if (textView != null) {
-            i = 2131365024;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365024);
+            i = 2131365074;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365074);
             if (linearLayout != null) {
-                i = 2131365025;
-                View findViewById = view.findViewById(2131365025);
+                i = 2131365075;
+                View findViewById = view.findViewById(2131365075);
                 if (findViewById != null) {
-                    i = 2131365026;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365026);
+                    i = 2131365076;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365076);
                     if (linkifiedTextView != null) {
-                        i = 2131365027;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365027);
+                        i = 2131365077;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365077);
                         if (checkedSetting != null) {
-                            i = 2131365028;
-                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131365028);
+                            i = 2131365078;
+                            LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131365078);
                             if (linkifiedTextView2 != null) {
-                                i = 2131365029;
-                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365029);
+                                i = 2131365079;
+                                CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365079);
                                 if (checkedSetting2 != null) {
-                                    i = 2131365030;
-                                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131365030);
+                                    i = 2131365080;
+                                    ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131365080);
                                     if (screenTitleView != null) {
-                                        i = 2131365031;
-                                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365031);
+                                        i = 2131365081;
+                                        TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365081);
                                         if (textInputLayout != null) {
-                                            i = 2131365032;
-                                            TextView textView2 = (TextView) view.findViewById(2131365032);
+                                            i = 2131365082;
+                                            TextView textView2 = (TextView) view.findViewById(2131365082);
                                             if (textView2 != null) {
-                                                i = 2131365040;
-                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365040);
+                                                i = 2131365090;
+                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365090);
                                                 if (materialButton != null) {
-                                                    i = 2131365041;
-                                                    Space space = (Space) view.findViewById(2131365041);
+                                                    i = 2131365091;
+                                                    Space space = (Space) view.findViewById(2131365091);
                                                     if (space != null) {
-                                                        i = 2131365302;
-                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365302);
+                                                        i = 2131365357;
+                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365357);
                                                         if (textInputEditText != null) {
                                                             return new WidgetStageSettingsBinding((CoordinatorLayout) view, textView, linearLayout, findViewById, linkifiedTextView, checkedSetting, linkifiedTextView2, checkedSetting2, screenTitleView, textInputLayout, textView2, materialButton, space, textInputEditText);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java
index 24dd8d3917..8cf49657f2 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java
@@ -78,7 +78,7 @@ public final class WidgetStageSettings$configureUI$5 extends o implements Functi
                 m.checkNotNullParameter(view, "<anonymous parameter 1>");
                 WidgetChannelSelector.Companion companion = WidgetChannelSelector.Companion;
                 WidgetStageSettings$configureUI$5 widgetStageSettings$configureUI$5 = this.this$0.this$0;
-                WidgetChannelSelector.Companion.launchForInactiveStages$default(companion, widgetStageSettings$configureUI$5.this$0, ((WidgetStageSettingsViewModel.ViewState.Loaded) widgetStageSettings$configureUI$5.$viewState).getChannel().e(), "REQUEST_KEY_STAGE_CHANNEL", false, 0, 24, null);
+                WidgetChannelSelector.Companion.launchForInactiveStages$default(companion, widgetStageSettings$configureUI$5.this$0, ((WidgetStageSettingsViewModel.ViewState.Loaded) widgetStageSettings$configureUI$5.$viewState).getChannel().f(), "REQUEST_KEY_STAGE_CHANNEL", false, 0, 24, null);
             }
         }
 
@@ -105,7 +105,7 @@ public final class WidgetStageSettings$configureUI$5 extends o implements Functi
             hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), 2130968986)));
             AnonymousClass2 r0 = new AnonymousClass2(this);
             m.checkNotNullParameter(r0, "onClick");
-            hook.f2011c = new Hook.a(null, r0);
+            hook.f2016c = new Hook.a(null, r0);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java
index b8baa5ec78..e85d6b603c 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java
@@ -91,7 +91,7 @@ public final class WidgetStageSettings extends AppFragment {
     }
 
     public WidgetStageSettings() {
-        super(2131559232);
+        super(2131559239);
         WidgetStageSettings$viewModel$2 widgetStageSettings$viewModel$2 = new WidgetStageSettings$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetStageSettingsViewModel.class), new WidgetStageSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStageSettings$viewModel$2));
@@ -130,13 +130,13 @@ public final class WidgetStageSettings extends AppFragment {
             }
             boolean z2 = loaded.getStageInstance() == null;
             ScreenTitleView screenTitleView = getBinding().g;
-            String string = getString(z2 ? 2131893460 : 2131888208);
+            String string = getString(z2 ? 2131893544 : 2131888208);
             m.checkNotNullExpressionValue(string, "getString(\n            i…e\n            }\n        )");
             screenTitleView.setTitle(string);
-            getBinding().g.setSubtitle(getString(z2 ? 2131893459 : 2131888207));
+            getBinding().g.setSubtitle(getString(z2 ? 2131893543 : 2131888207));
             MaterialButton materialButton = getBinding().i;
             materialButton.setEnabled(loaded.getStagePrivacyLevel() != null);
-            materialButton.setText(getString(z2 ? 2131893457 : 2131892968));
+            materialButton.setText(getString(z2 ? 2131893541 : 2131893049));
             TextView textView = getBinding().b;
             m.checkNotNullExpressionValue(textView, "binding.speakerHint");
             textView.setVisibility(z2 ? 0 : 8);
@@ -148,7 +148,7 @@ public final class WidgetStageSettings extends AppFragment {
             boolean canEveryoneJoin = loaded.getCanEveryoneJoin();
             CheckedSetting checkedSetting = getBinding().f;
             checkedSetting.setChecked(loaded.getStagePrivacyLevel() == stageInstancePrivacyLevel);
-            checkedSetting.setLabelTagText(2131892540);
+            checkedSetting.setLabelTagText(2131892619);
             checkedSetting.setLabelTagVisibility(loaded.isPublicRecommended());
             if (z3) {
                 checkedSetting.e(WidgetStageSettings$configureUI$2$1.INSTANCE);
@@ -160,13 +160,13 @@ public final class WidgetStageSettings extends AppFragment {
             LinkifiedTextView linkifiedTextView = getBinding().e;
             boolean z4 = loaded.getStagePrivacyLevel() == stageInstancePrivacyLevel;
             if (z3) {
-                charSequence = getString(2131893467);
+                charSequence = getString(2131893551);
             } else if (!canInvite) {
-                charSequence = getString(2131893468);
+                charSequence = getString(2131893552);
             } else if (!canEveryoneJoin) {
-                charSequence = getString(2131893465);
+                charSequence = getString(2131893549);
             } else if (z4) {
-                String string2 = getString(2131893466);
+                String string2 = getString(2131893550);
                 m.checkNotNullExpressionValue(string2, "getString(R.string.start…event_public_explanation)");
                 charSequence = b.k(string2, new Object[]{f.a.a(1500010879761L, null)}, null, 2);
             } else {
@@ -180,13 +180,13 @@ public final class WidgetStageSettings extends AppFragment {
             } else if (!z3) {
                 checkedSetting2.e(new WidgetStageSettings$configureUI$$inlined$apply$lambda$2(this, viewState, z3));
             }
-            LinkifiedTextView linkifiedTextView2 = getBinding().f1957c;
+            LinkifiedTextView linkifiedTextView2 = getBinding().f1960c;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.stageStartHelpText");
             linkifiedTextView2.setVisibility(z2 ? 0 : 8);
             if (z2) {
-                LinkifiedTextView linkifiedTextView3 = getBinding().f1957c;
+                LinkifiedTextView linkifiedTextView3 = getBinding().f1960c;
                 m.checkNotNullExpressionValue(linkifiedTextView3, "binding.stageStartHelpText");
-                linkifiedTextView3.setText(b.d(this, loaded.getHasOtherStageChannels() ? 2131893486 : 2131893488, new Object[]{loaded.getChannel().l()}, new WidgetStageSettings$configureUI$5(this, viewState)));
+                linkifiedTextView3.setText(b.d(this, loaded.getHasOtherStageChannels() ? 2131893570 : 2131893572, new Object[]{loaded.getChannel().m()}, new WidgetStageSettings$configureUI$5(this, viewState)));
             }
         }
     }
@@ -210,8 +210,8 @@ public final class WidgetStageSettings extends AppFragment {
             if (loaded != null) {
                 Intent intent = new Intent();
                 intent.putExtra("com.discord.intent.extra.EXTRA_STAGE_INSTANCE_ID", ((WidgetStageSettingsViewModel.Event.EditStageInstanceSuccess) event).getStageInstance().c());
-                intent.putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", loaded.getChannel().g());
-                intent.putExtra("com.discord.intent.extra.EXTRA_GUILD_ID", loaded.getChannel().e());
+                intent.putExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", loaded.getChannel().h());
+                intent.putExtra("com.discord.intent.extra.EXTRA_GUILD_ID", loaded.getChannel().f());
                 requireAppActivity.setResult(-1, intent);
             }
             requireAppActivity.finish();
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel$Companion$observeStoreState$2.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel$Companion$observeStoreState$2.java
index c2dc14da27..8b61021004 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel$Companion$observeStoreState$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel$Companion$observeStoreState$2.java
@@ -42,11 +42,11 @@ public final class WidgetStageSettingsViewModel$Companion$observeStoreState$2<T,
 
         public final WidgetStageSettingsViewModel.StoreState.Loaded call(StageInstance stageInstance, Guild guild, Long l, Long l2, Map<Long, GuildRole> map) {
             Channel channel = this.$channel;
-            Collection<Channel> values = this.this$0.$channelsStore.getChannelsForGuild(channel.e()).values();
+            Collection<Channel> values = this.this$0.$channelsStore.getChannelsForGuild(channel.f()).values();
             ArrayList arrayList = new ArrayList();
             for (T t : values) {
                 T t2 = t;
-                if (AnimatableValueParser.u1(t2) && t2.g() != this.$channel.g() && this.this$0.$stageInstancesStore.getStageInstanceForChannel(t2.g()) == null) {
+                if (AnimatableValueParser.v1(t2) && t2.h() != this.$channel.h() && this.this$0.$stageInstancesStore.getStageInstanceForChannel(t2.h()) == null) {
                     arrayList.add(t);
                 }
             }
@@ -73,6 +73,6 @@ public final class WidgetStageSettingsViewModel$Companion$observeStoreState$2<T,
     }
 
     public final Observable<? extends WidgetStageSettingsViewModel.StoreState> call(Channel channel) {
-        return channel == null ? new j(WidgetStageSettingsViewModel.StoreState.Invalid.INSTANCE) : Observable.g(this.$stageInstancesStore.observeStageInstanceForChannel(channel.g()).z(), this.$guildsStore.observeFromChannelId(channel.g()), this.$permissionsStore.observePermissionsForChannel(channel.g()), this.$usersStore.observeMeId(), this.$guildsStore.observeRoles(channel.e()), new AnonymousClass1(this, channel));
+        return channel == null ? new j(WidgetStageSettingsViewModel.StoreState.Invalid.INSTANCE) : Observable.g(this.$stageInstancesStore.observeStageInstanceForChannel(channel.h()).y(), this.$guildsStore.observeFromChannelId(channel.h()), this.$permissionsStore.observePermissionsForChannel(channel.h()), this.$usersStore.observeMeId(), this.$guildsStore.observeRoles(channel.f()), new AnonymousClass1(this, channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java
index fb2f3c22c0..dbef7f484e 100644
--- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java
@@ -81,9 +81,9 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
         }
 
         private final Observable<StoreState> observeStoreState(Observable<Long> observable, StoreChannels storeChannels, StorePermissions storePermissions, StoreStageInstances storeStageInstances, StoreUser storeUser, StoreGuilds storeGuilds) {
-            Observable<StoreState> Z = observable.Z(new WidgetStageSettingsViewModel$Companion$observeStoreState$1(storeChannels)).s().Z(new WidgetStageSettingsViewModel$Companion$observeStoreState$2(storeStageInstances, storeGuilds, storePermissions, storeUser, storeChannels));
-            m.checkNotNullExpressionValue(Z, "channelObservable\n      …          }\n            }");
-            return Z;
+            Observable<StoreState> Y = observable.Y(new WidgetStageSettingsViewModel$Companion$observeStoreState$1(storeChannels)).r().Y(new WidgetStageSettingsViewModel$Companion$observeStoreState$2(storeStageInstances, storeGuilds, storePermissions, storeUser, storeChannels));
+            m.checkNotNullExpressionValue(Y, "channelObservable\n      …          }\n            }");
+            return Y;
         }
     }
 
@@ -570,7 +570,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
         m.checkNotNullParameter(behaviorSubject, "channelSubject");
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.channelSubject = behaviorSubject;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetStageSettingsViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -578,7 +578,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
     public /* synthetic */ WidgetStageSettingsViewModel(long j, BehaviorSubject behaviorSubject, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
         this(j, behaviorSubject, observable);
         if ((i & 2) != 0) {
-            behaviorSubject = BehaviorSubject.m0(Long.valueOf(j));
+            behaviorSubject = BehaviorSubject.l0(Long.valueOf(j));
             m.checkNotNullExpressionValue(behaviorSubject, "BehaviorSubject.create(channelId)");
         }
         if ((i & 4) != 0) {
@@ -719,18 +719,18 @@ public final class WidgetStageSettingsViewModel extends AppViewModel<ViewState>
                 }
                 if (loaded.getStageInstance() == null) {
                     StageChannelAPI stageChannelAPI = StageChannelAPI.INSTANCE;
-                    Long o0 = this.channelSubject.o0();
-                    m.checkNotNullExpressionValue(o0, "channelSubject.value");
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(stageChannelAPI.startStageInstance(o0.longValue(), obj, stagePrivacyLevel), false, 1, null), this, null, 2, null), WidgetStageSettingsViewModel.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageSettingsViewModel$openStage$1(this, z2), 60, (Object) null);
+                    Long n0 = this.channelSubject.n0();
+                    m.checkNotNullExpressionValue(n0, "channelSubject.value");
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(stageChannelAPI.startStageInstance(n0.longValue(), obj, stagePrivacyLevel), false, 1, null), this, null, 2, null), WidgetStageSettingsViewModel.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageSettingsViewModel$openStage$1(this, z2), 60, (Object) null);
                     return;
                 }
                 StageChannelAPI stageChannelAPI2 = StageChannelAPI.INSTANCE;
-                Long o02 = this.channelSubject.o0();
-                m.checkNotNullExpressionValue(o02, "channelSubject.value");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(stageChannelAPI2.updateStageInstance(o02.longValue(), obj, loaded.getStagePrivacyLevel()), false, 1, null), this, null, 2, null), WidgetStageSettingsViewModel.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageSettingsViewModel$openStage$2(this), 60, (Object) null);
+                Long n02 = this.channelSubject.n0();
+                m.checkNotNullExpressionValue(n02, "channelSubject.value");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(stageChannelAPI2.updateStageInstance(n02.longValue(), obj, loaded.getStagePrivacyLevel()), false, 1, null), this, null, 2, null), WidgetStageSettingsViewModel.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageSettingsViewModel$openStage$2(this), 60, (Object) null);
                 return;
             }
-            this.eventSubject.j.onNext(new Event.InvalidTopic(2131893463));
+            this.eventSubject.j.onNext(new Event.InvalidTopic(2131893547));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java
index 6649e92cae..555e5389f5 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java
@@ -48,14 +48,14 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(StageAudienceBlockedBottomSheetAdapter stageAudienceBlockedBottomSheetAdapter) {
-            super(2131558662, stageAudienceBlockedBottomSheetAdapter);
+            super(2131558661, stageAudienceBlockedBottomSheetAdapter);
             m.checkNotNullParameter(stageAudienceBlockedBottomSheetAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131362846;
-            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362846);
+            int i = 2131362871;
+            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362871);
             if (materialTextView != null) {
-                i = 2131365286;
-                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131365286);
+                i = 2131365341;
+                MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131365341);
                 if (materialTextView2 != null) {
                     StageAudienceBlockedBottomSheetHeaderItemBinding stageAudienceBlockedBottomSheetHeaderItemBinding = new StageAudienceBlockedBottomSheetHeaderItemBinding((ConstraintLayout) view, materialTextView, materialTextView2);
                     m.checkNotNullExpressionValue(stageAudienceBlockedBottomSheetHeaderItemBinding, "StageAudienceBlockedBott…temBinding.bind(itemView)");
@@ -70,13 +70,13 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
             m.checkNotNullParameter(mGRecyclerDataPayload, "data");
             super.onConfigure(i, (int) mGRecyclerDataPayload);
             if (mGRecyclerDataPayload instanceof ListItem.Header) {
-                MaterialTextView materialTextView = this.binding.f1627c;
+                MaterialTextView materialTextView = this.binding.f1623c;
                 m.checkNotNullExpressionValue(materialTextView, "binding.title");
                 ListItem.Header header = (ListItem.Header) mGRecyclerDataPayload;
-                materialTextView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893326, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755322, header.getNumBlockedUsers(), new Object[0])}, null, 4));
+                materialTextView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893409, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755323, header.getNumBlockedUsers(), new Object[0])}, null, 4));
                 MaterialTextView materialTextView2 = this.binding.b;
                 m.checkNotNullExpressionValue(materialTextView2, "binding.description");
-                materialTextView2.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893322, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755320, header.getNumBlockedUsers(), Integer.valueOf(header.getNumBlockedUsers()))}, null, 4));
+                materialTextView2.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893405, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755321, header.getNumBlockedUsers(), Integer.valueOf(header.getNumBlockedUsers()))}, null, 4));
             }
         }
     }
@@ -243,30 +243,30 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ParticipantViewHolder(StageAudienceBlockedBottomSheetAdapter stageAudienceBlockedBottomSheetAdapter) {
-            super(2131558663, stageAudienceBlockedBottomSheetAdapter);
+            super(2131558662, stageAudienceBlockedBottomSheetAdapter);
             m.checkNotNullParameter(stageAudienceBlockedBottomSheetAdapter, "adapter");
             View view = this.itemView;
             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-            int i = 2131364980;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364980);
+            int i = 2131365030;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365030);
             if (simpleDraweeView != null) {
-                i = 2131364981;
-                CutoutView cutoutView = (CutoutView) view.findViewById(2131364981);
+                i = 2131365031;
+                CutoutView cutoutView = (CutoutView) view.findViewById(2131365031);
                 if (cutoutView != null) {
-                    i = 2131364982;
-                    TextView textView = (TextView) view.findViewById(2131364982);
+                    i = 2131365032;
+                    TextView textView = (TextView) view.findViewById(2131365032);
                     if (textView != null) {
-                        i = 2131364983;
-                        ImageView imageView = (ImageView) view.findViewById(2131364983);
+                        i = 2131365033;
+                        ImageView imageView = (ImageView) view.findViewById(2131365033);
                         if (imageView != null) {
-                            i = 2131364984;
-                            TextView textView2 = (TextView) view.findViewById(2131364984);
+                            i = 2131365034;
+                            TextView textView2 = (TextView) view.findViewById(2131365034);
                             if (textView2 != null) {
-                                i = 2131364985;
-                                View findViewById = view.findViewById(2131364985);
+                                i = 2131365035;
+                                View findViewById = view.findViewById(2131365035);
                                 if (findViewById != null) {
-                                    i = 2131364986;
-                                    TextView textView3 = (TextView) view.findViewById(2131364986);
+                                    i = 2131365036;
+                                    TextView textView3 = (TextView) view.findViewById(2131365036);
                                     if (textView3 != null) {
                                         StageAudienceBlockedBottomSheetItemBinding stageAudienceBlockedBottomSheetItemBinding = new StageAudienceBlockedBottomSheetItemBinding((ConstraintLayout) view, constraintLayout, simpleDraweeView, cutoutView, textView, imageView, textView2, findViewById, textView3);
                                         m.checkNotNullExpressionValue(stageAudienceBlockedBottomSheetItemBinding, "StageAudienceBlockedBott…temBinding.bind(itemView)");
@@ -287,10 +287,10 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
             super.onConfigure(i, (int) mGRecyclerDataPayload);
             if (mGRecyclerDataPayload instanceof ListItem.Participant) {
                 ListItem.Participant participant = (ListItem.Participant) mGRecyclerDataPayload;
-                this.binding.f1628c.setCutoutEnabled(participant.isSpeaker());
+                this.binding.f1624c.setCutoutEnabled(participant.isSpeaker());
                 ImageView imageView = this.binding.e;
-                imageView.setBackgroundResource(2131231254);
-                imageView.setImageResource(2131231739);
+                imageView.setBackgroundResource(2131231259);
+                imageView.setImageResource(2131231747);
                 imageView.setVisibility(participant.isSpeaker() ? 0 : 4);
                 imageView.setActivated(participant.isSpeaker());
                 View view = this.itemView;
@@ -298,13 +298,13 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap
                 Resources resources = view.getResources();
                 TextView textView = this.binding.f;
                 m.checkNotNullExpressionValue(textView, "binding.stageChannelBlockedTextSpeaker");
-                textView.setText(participant.isSpeaker() ? resources.getString(2131893448) : resources.getString(2131893320));
+                textView.setText(participant.isSpeaker() ? resources.getString(2131893531) : resources.getString(2131893403));
                 TextView textView2 = this.binding.d;
                 User user = participant.getParticipant().getUser();
                 String nickname = participant.getParticipant().getNickname();
                 Context context = textView2.getContext();
                 m.checkNotNullExpressionValue(context, "context");
-                textView2.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nickname, context, 2130968932, 2130969326, 2131427361, 2130968988, 2130969325, 2131427362));
+                textView2.setText(UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nickname, context, 2130968932, 2130969326, 2131427362, 2130968988, 2130969325, 2131427363));
                 SimpleDraweeView simpleDraweeView = this.binding.b;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.stageChannelBlockedMemberIcon");
                 IconUtils.setIcon$default(simpleDraweeView, participant.getParticipant().getUser().getUsername(), Long.valueOf(participant.getParticipant().getUser().getId()), participant.getParticipant().getUser().getAvatar(), 2131165289, 0, null, null, participant.getParticipant().getGuildMember(), 224, null);
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java
index d07a9e1e60..6c9a056f17 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet$binding$2.java
@@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetEndStageBottomSheet$binding$2 extends k
 
     public final WidgetEndStageBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362213;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362213);
+        int i = 2131362224;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131362224);
         if (materialButton != null) {
-            i = 2131362672;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362672);
+            i = 2131362696;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362696);
             if (materialButton2 != null) {
                 return new WidgetEndStageBottomSheetBinding((NestedScrollView) view, materialButton, materialButton2);
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
index dacbd110da..ebf66b75eb 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java
@@ -93,7 +93,7 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131558999;
+        return 2131559003;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -101,6 +101,6 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         getBinding().b.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$1(this));
-        getBinding().f1773c.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$2(this));
+        getBinding().f1774c.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java
index 64cedd381c..88b33b5213 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$binding$2.java
@@ -21,11 +21,11 @@ public final /* synthetic */ class WidgetStageAudienceBlockedBottomSheet$binding
         int i = 2131361812;
         MaterialButton materialButton = (MaterialButton) view.findViewById(2131361812);
         if (materialButton != null) {
-            i = 2131362106;
-            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131362106);
+            i = 2131362117;
+            MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131362117);
             if (maxHeightRecyclerView != null) {
-                i = 2131362215;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362215);
+                i = 2131362226;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362226);
                 if (materialButton2 != null) {
                     return new WidgetStageAudienceBlockedBottomSheetBinding((ConstraintLayout) view, materialButton, maxHeightRecyclerView, materialButton2);
                 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$configureUI$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$configureUI$1.java
index 3d7d572d22..12e6fb5c8a 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet$configureUI$1.java
@@ -44,6 +44,6 @@ public final class WidgetStageAudienceBlockedBottomSheet$configureUI$1 implement
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
         FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, ((StageAudienceBlockedBottomSheetViewModel.ViewState.Loaded) this.$viewState).getChannel().g(), true, WidgetStageAudienceBlockedBottomSheet.access$getLaunchStageFullScreen$p(this.this$0), null, null, null, null, new AnonymousClass1(this), 480, null);
+        StageChannelJoinHelper.connectToStage$default(stageChannelJoinHelper, requireContext, parentFragmentManager, ((StageAudienceBlockedBottomSheetViewModel.ViewState.Loaded) this.$viewState).getChannel().h(), true, WidgetStageAudienceBlockedBottomSheet.access$getLaunchStageFullScreen$p(this.this$0), null, null, null, null, new AnonymousClass1(this), 480, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
index 29e55d66f1..6b7494133e 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java
@@ -112,7 +112,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559220;
+        return 2131559227;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -128,7 +128,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet
         WidgetStageAudienceBlockedBottomSheetBinding binding = getBinding();
         m.checkNotNullExpressionValue(binding, "binding");
         setPeekHeightBottomView(binding.a);
-        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1949c;
+        MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1952c;
         m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.blockedUsers");
         this.adapter = new StageAudienceBlockedBottomSheetAdapter(maxHeightRecyclerView);
     }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java
index b0ca64e388..ced6060173 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java
@@ -20,41 +20,41 @@ public final /* synthetic */ class WidgetStageAudienceNoticeBottomSheet$binding$
 
     public final WidgetStageAudienceNoticeBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362152;
-        Barrier barrier = (Barrier) view.findViewById(2131362152);
+        int i = 2131362163;
+        Barrier barrier = (Barrier) view.findViewById(2131362163);
         if (barrier != null) {
-            i = 2131362175;
-            ImageView imageView = (ImageView) view.findViewById(2131362175);
+            i = 2131362186;
+            ImageView imageView = (ImageView) view.findViewById(2131362186);
             if (imageView != null) {
-                i = 2131362176;
-                TextView textView = (TextView) view.findViewById(2131362176);
+                i = 2131362187;
+                TextView textView = (TextView) view.findViewById(2131362187);
                 if (textView != null) {
-                    i = 2131362177;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131362177);
+                    i = 2131362188;
+                    ImageView imageView2 = (ImageView) view.findViewById(2131362188);
                     if (imageView2 != null) {
-                        i = 2131362178;
-                        TextView textView2 = (TextView) view.findViewById(2131362178);
+                        i = 2131362189;
+                        TextView textView2 = (TextView) view.findViewById(2131362189);
                         if (textView2 != null) {
-                            i = 2131362179;
-                            ImageView imageView3 = (ImageView) view.findViewById(2131362179);
+                            i = 2131362190;
+                            ImageView imageView3 = (ImageView) view.findViewById(2131362190);
                             if (imageView3 != null) {
-                                i = 2131362180;
-                                TextView textView3 = (TextView) view.findViewById(2131362180);
+                                i = 2131362191;
+                                TextView textView3 = (TextView) view.findViewById(2131362191);
                                 if (textView3 != null) {
-                                    i = 2131362181;
-                                    ImageView imageView4 = (ImageView) view.findViewById(2131362181);
+                                    i = 2131362192;
+                                    ImageView imageView4 = (ImageView) view.findViewById(2131362192);
                                     if (imageView4 != null) {
-                                        i = 2131362182;
-                                        TextView textView4 = (TextView) view.findViewById(2131362182);
+                                        i = 2131362193;
+                                        TextView textView4 = (TextView) view.findViewById(2131362193);
                                         if (textView4 != null) {
-                                            i = 2131362183;
-                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362183);
+                                            i = 2131362194;
+                                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131362194);
                                             if (materialButton != null) {
-                                                i = 2131364952;
-                                                ImageView imageView5 = (ImageView) view.findViewById(2131364952);
+                                                i = 2131365002;
+                                                ImageView imageView5 = (ImageView) view.findViewById(2131365002);
                                                 if (imageView5 != null) {
-                                                    i = 2131365286;
-                                                    TextView textView5 = (TextView) view.findViewById(2131365286);
+                                                    i = 2131365341;
+                                                    TextView textView5 = (TextView) view.findViewById(2131365341);
                                                     if (textView5 != null) {
                                                         return new WidgetStageAudienceNoticeBottomSheetBinding((CoordinatorLayout) view, barrier, imageView, textView, imageView2, textView2, imageView3, textView3, imageView4, textView4, materialButton, imageView5, textView5);
                                                     }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
index dd221071cd..51d7f51817 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java
@@ -71,7 +71,7 @@ public final class WidgetStageAudienceNoticeBottomSheet extends AppBottomSheet {
         ImageView imageView = getBinding().b;
         m.checkNotNullExpressionValue(imageView, "binding.bullet4Icon");
         imageView.setVisibility(z2 ? 0 : 8);
-        TextView textView = getBinding().f1950c;
+        TextView textView = getBinding().f1953c;
         m.checkNotNullExpressionValue(textView, "binding.bullet4Label");
         if (!z2) {
             i = 8;
@@ -89,7 +89,7 @@ public final class WidgetStageAudienceNoticeBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559221;
+        return 2131559228;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java
index 0a939fa9cc..d426a943cf 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetStageModeratorJoinBottomSheet$binding$2
 
     public final WidgetStageModeratorJoinBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363719;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363719);
+        int i = 2131363760;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363760);
         if (materialButton != null) {
-            i = 2131363721;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363721);
+            i = 2131363762;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363762);
             if (materialButton2 != null) {
-                i = 2131364952;
-                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364952);
+                i = 2131365002;
+                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131365002);
                 if (appCompatImageView != null) {
-                    i = 2131365133;
-                    TextView textView = (TextView) view.findViewById(2131365133);
+                    i = 2131365188;
+                    TextView textView = (TextView) view.findViewById(2131365188);
                     if (textView != null) {
-                        i = 2131365286;
-                        TextView textView2 = (TextView) view.findViewById(2131365286);
+                        i = 2131365341;
+                        TextView textView2 = (TextView) view.findViewById(2131365341);
                         if (textView2 != null) {
                             return new WidgetStageModeratorJoinBottomSheetBinding((CoordinatorLayout) view, materialButton, materialButton2, appCompatImageView, textView, textView2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java
index a029265e2c..1873320320 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java
@@ -22,7 +22,7 @@ public final class WidgetStageModeratorJoinBottomSheet$onViewCreated$1 implement
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12);
+            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893437, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
index de27471fd5..24cb111df0 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java
@@ -76,14 +76,14 @@ public final class WidgetStageModeratorJoinBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559229;
+        return 2131559236;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f1954c.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$1(this));
+        getBinding().f1957c.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$1(this));
         getBinding().b.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java
index 500c7c0cf5..5cc4445e14 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java
@@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetStagePublicNoticeBottomSheet$binding$2
 
     public final WidgetStagePublicNoticeBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364376;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364376);
+        int i = 2131364414;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364414);
         if (materialButton != null) {
-            i = 2131364377;
-            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364377);
+            i = 2131364415;
+            MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364415);
             if (materialButton2 != null) {
-                i = 2131364378;
-                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364378);
+                i = 2131364416;
+                AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364416);
                 if (appCompatImageView != null) {
-                    i = 2131364379;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364379);
+                    i = 2131364417;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364417);
                     if (linearLayout != null) {
-                        i = 2131364380;
-                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364380);
+                        i = 2131364418;
+                        ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364418);
                         if (screenTitleView != null) {
-                            i = 2131364561;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364561);
+                            i = 2131364600;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364600);
                             if (linkifiedTextView != null) {
                                 return new WidgetStagePublicNoticeBottomSheetBinding((CoordinatorLayout) view, materialButton, materialButton2, appCompatImageView, linearLayout, screenTitleView, linkifiedTextView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java
index c608aad461..1a0021bebd 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java
@@ -64,7 +64,7 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559230;
+        return 2131559237;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -74,10 +74,10 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet {
         WidgetStagePublicNoticeBottomSheetBinding binding = getBinding();
         m.checkNotNullExpressionValue(binding, "binding");
         setPeekHeightBottomView(binding.a);
-        getBinding().f1955c.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$1(this));
+        getBinding().f1958c.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$1(this));
         getBinding().b.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$2(this));
         LinkifiedTextView linkifiedTextView = getBinding().d;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.sectionThree");
-        b.n(linkifiedTextView, 2131893496, new Object[]{f.a.a(1500010879761L, null)}, null, 4);
+        b.m(linkifiedTextView, 2131893580, new Object[]{f.a.a(1500010879761L, null)}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java
index e2a194285a..1434f8dcab 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java
@@ -21,45 +21,45 @@ public final /* synthetic */ class WidgetStageRaisedHandsBottomSheet$binding$2 e
 
     public final WidgetStageRaisedHandsBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363505;
-        View findViewById = view.findViewById(2131363505);
+        int i = 2131363546;
+        View findViewById = view.findViewById(2131363546);
         if (findViewById != null) {
-            i = 2131364390;
-            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364390);
+            i = 2131364428;
+            MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364428);
             if (materialTextView != null) {
-                i = 2131364391;
-                Group group = (Group) view.findViewById(2131364391);
+                i = 2131364429;
+                Group group = (Group) view.findViewById(2131364429);
                 if (group != null) {
-                    i = 2131364392;
-                    ImageView imageView = (ImageView) view.findViewById(2131364392);
+                    i = 2131364430;
+                    ImageView imageView = (ImageView) view.findViewById(2131364430);
                     if (imageView != null) {
-                        i = 2131364393;
-                        MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131364393);
+                        i = 2131364431;
+                        MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131364431);
                         if (materialTextView2 != null) {
-                            i = 2131364394;
-                            MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131364394);
+                            i = 2131364432;
+                            MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131364432);
                             if (materialTextView3 != null) {
-                                i = 2131365016;
-                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365016);
+                                i = 2131365066;
+                                SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365066);
                                 if (switchMaterial != null) {
                                     CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
-                                    i = 2131365023;
-                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365023);
+                                    i = 2131365073;
+                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365073);
                                     if (maxHeightRecyclerView != null) {
-                                        i = 2131365133;
-                                        MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(2131365133);
+                                        i = 2131365188;
+                                        MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(2131365188);
                                         if (materialTextView4 != null) {
-                                            i = 2131365286;
-                                            MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(2131365286);
+                                            i = 2131365341;
+                                            MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(2131365341);
                                             if (materialTextView5 != null) {
-                                                i = 2131365291;
-                                                MaterialTextView materialTextView6 = (MaterialTextView) view.findViewById(2131365291);
+                                                i = 2131365346;
+                                                MaterialTextView materialTextView6 = (MaterialTextView) view.findViewById(2131365346);
                                                 if (materialTextView6 != null) {
-                                                    i = 2131365292;
-                                                    Group group2 = (Group) view.findViewById(2131365292);
+                                                    i = 2131365347;
+                                                    Group group2 = (Group) view.findViewById(2131365347);
                                                     if (group2 != null) {
-                                                        i = 2131365293;
-                                                        ImageView imageView2 = (ImageView) view.findViewById(2131365293);
+                                                        i = 2131365348;
+                                                        ImageView imageView2 = (ImageView) view.findViewById(2131365348);
                                                         if (imageView2 != null) {
                                                             return new WidgetStageRaisedHandsBottomSheetBinding(coordinatorLayout, findViewById, materialTextView, group, imageView, materialTextView2, materialTextView3, switchMaterial, coordinatorLayout, maxHeightRecyclerView, materialTextView4, materialTextView5, materialTextView6, group2, imageView2);
                                                         }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java
index 18e9c08f70..12a7d553c1 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java
@@ -24,7 +24,7 @@ public final class WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12);
+            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893437, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
index 39e6dc5699..ac92702f21 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java
@@ -104,9 +104,9 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
         m.checkNotNullExpressionValue(materialTextView, "binding.toggleSpeakerStateButton");
         boolean isSpeaker = loaded.isSpeaker();
         if (isSpeaker) {
-            str = getString(2131891252);
+            str = getString(2131891323);
         } else if (!isSpeaker) {
-            str = getString(2131891241);
+            str = getString(2131891312);
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -114,9 +114,9 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
         ImageView imageView = getBinding().h;
         boolean isSpeaker2 = loaded.isSpeaker();
         if (isSpeaker2) {
-            i = 2131231950;
+            i = 2131231958;
         } else if (!isSpeaker2) {
-            i = 2131231951;
+            i = 2131231959;
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -126,7 +126,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
     private final void configureUI(WidgetStageRaisedHandsBottomSheetViewModel.ViewState viewState) {
         if (viewState instanceof WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded) {
             WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded loaded = (WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded) viewState;
-            getBinding().f.setText(loaded.isRequestToSpeakEnabled() ? 2131892620 : 2131892621);
+            getBinding().f.setText(loaded.isRequestToSpeakEnabled() ? 2131892701 : 2131892702);
             SwitchMaterial switchMaterial = getBinding().d;
             switchMaterial.setEnabled(!loaded.isUpdatingRequestToSpeakPermissions());
             if (!loaded.isUpdatingRequestToSpeakPermissions()) {
@@ -136,12 +136,12 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
                 this.hasReceivedInitialRaisedHandsState = true;
                 switchMaterial.jumpDrawablesToCurrentState();
             }
-            Group group = getBinding().f1956c;
+            Group group = getBinding().f1959c;
             m.checkNotNullExpressionValue(group, "binding.raisedHandsEmptyGroup");
             group.setVisibility(loaded.isEmpty() ? 0 : 8);
             MaterialTextView materialTextView = getBinding().b;
             m.checkNotNullExpressionValue(materialTextView, "binding.raisedHandsCountLabel");
-            b.n(materialTextView, 2131892629, new Object[]{Integer.valueOf(loaded.getRaisedHandsParticipants().size())}, null, 4);
+            b.m(materialTextView, 2131892710, new Object[]{Integer.valueOf(loaded.getRaisedHandsParticipants().size())}, null, 4);
             configureToggleSpeakerState(loaded);
             getAdapter().setData(loaded.getRaisedHandsParticipants());
         }
@@ -173,7 +173,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559231;
+        return 2131559238;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -190,7 +190,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet {
         this.hasReceivedInitialRaisedHandsState = false;
         MaxHeightRecyclerView maxHeightRecyclerView = getBinding().e;
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(getContext(), 1);
-        Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131232348);
+        Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131232358);
         if (drawable != null) {
             dividerItemDecoration.setDrawable(drawable);
         }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java
index e1b961acb3..630a3503eb 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java
@@ -1,5 +1,6 @@
 package com.discord.widgets.stage.sheet;
 
+import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -10,11 +11,14 @@ import c.d.b.a.a;
 import com.discord.api.role.GuildRole;
 import com.discord.api.utcdatetime.UtcDateTime;
 import com.discord.databinding.StageRaisedHandsItemUserBinding;
+import com.discord.models.member.GuildMember;
+import com.discord.models.user.User;
 import com.discord.stores.StoreVoiceParticipants;
 import com.discord.utilities.extensions.SimpleDraweeViewExtensionsKt;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
 import com.discord.utilities.mg_recycler.MGRecyclerViewHolder;
+import com.discord.utilities.time.ClockFactory;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.facebook.drawee.view.SimpleDraweeView;
 import d0.z.d.m;
@@ -24,6 +28,8 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: WidgetStageRaisedHandsBottomSheetAdapter.kt */
 public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAdapterSimple<ListItem> {
     public static final Companion Companion = new Companion(null);
+    private static final int MILLIS_PER_DAY = 86400000;
+    private static final int NEW_USER_DAYS_THRESOLD = 7;
     private static final int VIEW_TYPE_PARTICIPANT = 0;
     private Function1<? super StoreVoiceParticipants.VoiceUser, Unit> onDismissRequest = WidgetStageRaisedHandsBottomSheetAdapter$onDismissRequest$1.INSTANCE;
     private Function1<? super StoreVoiceParticipants.VoiceUser, Unit> onInviteToSpeak = WidgetStageRaisedHandsBottomSheetAdapter$onInviteToSpeak$1.INSTANCE;
@@ -45,22 +51,24 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
         /* compiled from: WidgetStageRaisedHandsBottomSheetAdapter.kt */
         public static final class Participant extends ListItem {
             private final String key;
+            private final GuildMember member;
             private final StoreVoiceParticipants.VoiceUser participant;
             private final UtcDateTime requestToSpeakTimestamp;
             private final GuildRole role;
             private final int type;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Participant(StoreVoiceParticipants.VoiceUser voiceUser, UtcDateTime utcDateTime, GuildRole guildRole) {
+            public Participant(StoreVoiceParticipants.VoiceUser voiceUser, UtcDateTime utcDateTime, GuildMember guildMember, GuildRole guildRole) {
                 super(null);
                 m.checkNotNullParameter(voiceUser, "participant");
                 this.participant = voiceUser;
                 this.requestToSpeakTimestamp = utcDateTime;
+                this.member = guildMember;
                 this.role = guildRole;
                 this.key = String.valueOf(voiceUser.getUser().getId());
             }
 
-            public static /* synthetic */ Participant copy$default(Participant participant, StoreVoiceParticipants.VoiceUser voiceUser, UtcDateTime utcDateTime, GuildRole guildRole, int i, Object obj) {
+            public static /* synthetic */ Participant copy$default(Participant participant, StoreVoiceParticipants.VoiceUser voiceUser, UtcDateTime utcDateTime, GuildMember guildMember, GuildRole guildRole, int i, Object obj) {
                 if ((i & 1) != 0) {
                     voiceUser = participant.participant;
                 }
@@ -68,9 +76,12 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                     utcDateTime = participant.requestToSpeakTimestamp;
                 }
                 if ((i & 4) != 0) {
+                    guildMember = participant.member;
+                }
+                if ((i & 8) != 0) {
                     guildRole = participant.role;
                 }
-                return participant.copy(voiceUser, utcDateTime, guildRole);
+                return participant.copy(voiceUser, utcDateTime, guildMember, guildRole);
             }
 
             public final StoreVoiceParticipants.VoiceUser component1() {
@@ -81,13 +92,17 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                 return this.requestToSpeakTimestamp;
             }
 
-            public final GuildRole component3() {
+            public final GuildMember component3() {
+                return this.member;
+            }
+
+            public final GuildRole component4() {
                 return this.role;
             }
 
-            public final Participant copy(StoreVoiceParticipants.VoiceUser voiceUser, UtcDateTime utcDateTime, GuildRole guildRole) {
+            public final Participant copy(StoreVoiceParticipants.VoiceUser voiceUser, UtcDateTime utcDateTime, GuildMember guildMember, GuildRole guildRole) {
                 m.checkNotNullParameter(voiceUser, "participant");
-                return new Participant(voiceUser, utcDateTime, guildRole);
+                return new Participant(voiceUser, utcDateTime, guildMember, guildRole);
             }
 
             public boolean equals(Object obj) {
@@ -98,7 +113,7 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                     return false;
                 }
                 Participant participant = (Participant) obj;
-                return m.areEqual(this.participant, participant.participant) && m.areEqual(this.requestToSpeakTimestamp, participant.requestToSpeakTimestamp) && m.areEqual(this.role, participant.role);
+                return m.areEqual(this.participant, participant.participant) && m.areEqual(this.requestToSpeakTimestamp, participant.requestToSpeakTimestamp) && m.areEqual(this.member, participant.member) && m.areEqual(this.role, participant.role);
             }
 
             @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -106,6 +121,10 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                 return this.key;
             }
 
+            public final GuildMember getMember() {
+                return this.member;
+            }
+
             public final StoreVoiceParticipants.VoiceUser getParticipant() {
                 return this.participant;
             }
@@ -129,11 +148,13 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                 int hashCode = (voiceUser != null ? voiceUser.hashCode() : 0) * 31;
                 UtcDateTime utcDateTime = this.requestToSpeakTimestamp;
                 int hashCode2 = (hashCode + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31;
+                GuildMember guildMember = this.member;
+                int hashCode3 = (hashCode2 + (guildMember != null ? guildMember.hashCode() : 0)) * 31;
                 GuildRole guildRole = this.role;
                 if (guildRole != null) {
                     i = guildRole.hashCode();
                 }
-                return hashCode2 + i;
+                return hashCode3 + i;
             }
 
             public String toString() {
@@ -141,6 +162,8 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
                 L.append(this.participant);
                 L.append(", requestToSpeakTimestamp=");
                 L.append(this.requestToSpeakTimestamp);
+                L.append(", member=");
+                L.append(this.member);
                 L.append(", role=");
                 L.append(this.role);
                 L.append(")");
@@ -162,23 +185,23 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderParticipant(WidgetStageRaisedHandsBottomSheetAdapter widgetStageRaisedHandsBottomSheetAdapter) {
-            super(2131558664, widgetStageRaisedHandsBottomSheetAdapter);
+            super(2131558663, widgetStageRaisedHandsBottomSheetAdapter);
             m.checkNotNullParameter(widgetStageRaisedHandsBottomSheetAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131365018;
-            ImageView imageView = (ImageView) view.findViewById(2131365018);
+            int i = 2131365068;
+            ImageView imageView = (ImageView) view.findViewById(2131365068);
             if (imageView != null) {
-                i = 2131365019;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365019);
+                i = 2131365069;
+                ImageView imageView2 = (ImageView) view.findViewById(2131365069);
                 if (imageView2 != null) {
-                    i = 2131365020;
-                    TextView textView = (TextView) view.findViewById(2131365020);
+                    i = 2131365070;
+                    TextView textView = (TextView) view.findViewById(2131365070);
                     if (textView != null) {
-                        i = 2131365021;
-                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365021);
+                        i = 2131365071;
+                        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365071);
                         if (simpleDraweeView != null) {
-                            i = 2131365022;
-                            TextView textView2 = (TextView) view.findViewById(2131365022);
+                            i = 2131365072;
+                            TextView textView2 = (TextView) view.findViewById(2131365072);
                             if (textView2 != null) {
                                 StageRaisedHandsItemUserBinding stageRaisedHandsItemUserBinding = new StageRaisedHandsItemUserBinding((ConstraintLayout) view, imageView, imageView2, textView, simpleDraweeView, textView2);
                                 m.checkNotNullExpressionValue(stageRaisedHandsItemUserBinding, "StageRaisedHandsItemUserBinding.bind(itemView)");
@@ -196,14 +219,50 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
             return (WidgetStageRaisedHandsBottomSheetAdapter) viewHolderParticipant.adapter;
         }
 
+        private final String getParticipantMemberInfo(Context context, ListItem.Participant participant) {
+            String f;
+            if (isNewUser(participant.getParticipant().getUser())) {
+                String string = context.getString(2131892714);
+                m.checkNotNullExpressionValue(string, "context.getString(R.stri…mber_info_new_to_discord)");
+                return string;
+            }
+            GuildMember member = participant.getMember();
+            UtcDateTime joinedAt = member != null ? member.getJoinedAt() : null;
+            if (joinedAt == null) {
+                String string2 = context.getString(2131892715);
+                m.checkNotNullExpressionValue(string2, "context.getString(R.stri…k_member_info_non_member)");
+                return string2;
+            } else if (!participant.getMember().getRoles().isEmpty()) {
+                GuildRole role = participant.getRole();
+                if (role != null && (f = role.f()) != null) {
+                    return f;
+                }
+                String string3 = context.getString(2131892712);
+                m.checkNotNullExpressionValue(string3, "context.getString(R.stri…member_info_member_roles)");
+                return string3;
+            } else if (ClockFactory.get().currentTimeMillis() - joinedAt.f() < ((long) 86400000)) {
+                String string4 = context.getString(2131892713);
+                m.checkNotNullExpressionValue(string4, "context.getString(R.stri…k_member_info_new_member)");
+                return string4;
+            } else {
+                String string5 = context.getString(2131892711);
+                m.checkNotNullExpressionValue(string5, "context.getString(R.stri…speak_member_info_member)");
+                return string5;
+            }
+        }
+
+        private final boolean isNewUser(User user) {
+            return ClockFactory.get().currentTimeMillis() - ((user.getId() >>> 22) + 1420070400000L) <= ((long) 604800000);
+        }
+
         public void onConfigure(int i, ListItem listItem) {
             m.checkNotNullParameter(listItem, "data");
             super.onConfigure(i, (int) listItem);
             ListItem.Participant participant = (ListItem.Participant) listItem;
             StoreVoiceParticipants.VoiceUser component1 = participant.component1();
-            GuildRole component3 = participant.component3();
+            GuildMember component3 = participant.component3();
             this.binding.e.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$1(this, component1));
-            ImageView imageView = this.binding.f1629c;
+            ImageView imageView = this.binding.f1625c;
             ViewExtensions.setEnabledAndAlpha$default(imageView, !component1.isInvitedToSpeak(), 0.0f, 2, null);
             imageView.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$$inlined$apply$lambda$1(this, component1));
             this.binding.b.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$3(this, component1));
@@ -213,12 +272,13 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd
             TextView textView = this.binding.f;
             m.checkNotNullExpressionValue(textView, "binding.stageRaisedHandsItemUserName");
             textView.setText(component1.getDisplayName());
-            TextView textView2 = this.binding.d;
-            if (component3 != null) {
-                textView2.setText(component3.f());
-            } else {
-                textView2.setText(2131887313);
+            if (!(component3 == null || component3.getColor() == -16777216)) {
+                this.binding.f.setTextColor(component3.getColor());
             }
+            TextView textView2 = this.binding.d;
+            Context context = textView2.getContext();
+            m.checkNotNullExpressionValue(context, "context");
+            textView2.setText(getParticipantMemberInfo(context, participant));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1.java
index ad17458721..3caa741740 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1.java
@@ -69,8 +69,8 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeS
             public AnonymousClass2(AnonymousClass1 r1, Map map, Map map2) {
                 super(1);
                 this.this$0 = r1;
-                this.$roles = map;
-                this.$members = map2;
+                this.$members = map;
+                this.$roles = map2;
             }
 
             public final WidgetStageRaisedHandsBottomSheetAdapter.ListItem.Participant invoke(StoreVoiceParticipants.VoiceUser voiceUser) {
@@ -82,7 +82,7 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeS
                 }
                 Map map = this.$roles;
                 m.checkNotNullExpressionValue(map, "roles");
-                return new WidgetStageRaisedHandsBottomSheetAdapter.ListItem.Participant(voiceUser, utcDateTime, RoleUtils.getHighestRole(map, (GuildMember) this.$members.get(Long.valueOf(voiceUser.getUser().getId()))));
+                return new WidgetStageRaisedHandsBottomSheetAdapter.ListItem.Participant(voiceUser, utcDateTime, (GuildMember) this.$members.get(Long.valueOf(voiceUser.getUser().getId())), RoleUtils.getHighestHoistedRole(map, (GuildMember) this.$members.get(Long.valueOf(voiceUser.getUser().getId()))));
             }
         }
 
@@ -95,7 +95,7 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeS
             Channel channel = this.$channel;
             m.checkNotNullExpressionValue(channel, "channel");
             m.checkNotNullExpressionValue(map, "roles");
-            return new WidgetStageRaisedHandsBottomSheetViewModel.StoreState(channel, map, q.toList(q.sortedWith(q.map(q.filter(u.asSequence(map3.values()), AnonymousClass1.INSTANCE), new AnonymousClass2(this, map, map2)), new WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1$1$$special$$inlined$sortedBy$1())), stageRoles != null ? stageRoles.m28unboximpl() : StageRoles.Companion.m30getAUDIENCE1LxfuJo(), null);
+            return new WidgetStageRaisedHandsBottomSheetViewModel.StoreState(channel, map, q.toList(q.sortedWith(q.map(q.filter(u.asSequence(map3.values()), AnonymousClass1.INSTANCE), new AnonymousClass2(this, map2, map)), new WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1$1$$special$$inlined$sortedBy$1())), stageRoles != null ? stageRoles.m28unboximpl() : StageRoles.Companion.m30getAUDIENCE1LxfuJo(), null);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -115,6 +115,6 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeS
     }
 
     public final Observable<? extends WidgetStageRaisedHandsBottomSheetViewModel.StoreState> call(Channel channel) {
-        return Observable.h(this.$guildsStore.observeRoles(channel.e()), this.$guildsStore.observeComputed(channel.e()), this.$voiceParticipants.get(this.$channelId), this.$stageChannels.observeMyRoles(this.$channelId), new AnonymousClass1(this, channel));
+        return Observable.h(this.$guildsStore.observeRoles(channel.f()), this.$guildsStore.observeComputed(channel.f()), this.$voiceParticipants.get(this.$channelId), this.$stageChannels.observeMyRoles(this.$channelId), new AnonymousClass1(this, channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
index 12eb15824a..18ee338fac 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetViewModel.java
@@ -86,11 +86,11 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreVoiceParticipants storeVoiceParticipants, StoreChannels storeChannels, StoreGuilds storeGuilds, StoreStageChannels storeStageChannels, Clock clock) {
-            Observable<R> G = storeChannels.observeChannel(j).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            Observable<StoreState> Z = G.s().Z(new WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1(storeGuilds, storeVoiceParticipants, j, storeStageChannels, clock));
-            m.checkNotNullExpressionValue(Z, "channelsStore.observeCha…          }\n            }");
-            return Z;
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> Y = F.r().Y(new WidgetStageRaisedHandsBottomSheetViewModel$Companion$observeStoreState$1(storeGuilds, storeVoiceParticipants, j, storeStageChannels, clock));
+            m.checkNotNullExpressionValue(Y, "channelsStore.observeCha…          }\n            }");
+            return Y;
         }
     }
 
@@ -503,7 +503,7 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
         this.channelsStore = storeChannels;
         this.usersStore = storeUser;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetStageRaisedHandsBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -557,11 +557,11 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
     }
 
     private final Observable<Void> setUserSuppressed(long j, boolean z2) {
-        Observable<R> G = this.channelsStore.observeChannel(this.channelId).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable A = G.z().A(new WidgetStageRaisedHandsBottomSheetViewModel$setUserSuppressed$1(j, z2));
-        m.checkNotNullExpressionValue(A, "channelSingle\n        .f…stSubscribeOn()\n        }");
-        return ObservableExtensionsKt.ui$default(A, this, null, 2, null);
+        Observable<R> F = this.channelsStore.observeChannel(this.channelId).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable z3 = F.y().z(new WidgetStageRaisedHandsBottomSheetViewModel$setUserSuppressed$1(j, z2));
+        m.checkNotNullExpressionValue(z3, "channelSingle\n        .f…stSubscribeOn()\n        }");
+        return ObservableExtensionsKt.ui$default(z3, this, null, 2, null);
     }
 
     public final void dismissRequestToSpeak(StoreVoiceParticipants.VoiceUser voiceUser) {
@@ -588,14 +588,14 @@ public final class WidgetStageRaisedHandsBottomSheetViewModel extends AppViewMod
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null) {
             updateViewState(ViewState.Loaded.copy$default(loaded, null, null, false, false, true, false, 47, null));
-            Pair<Long, Long> computeAllowDenyUpdateBits = PermissionOverwriteUtilsKt.computeAllowDenyUpdateBits(AnimatableValueParser.F0(loaded.getChannel(), loaded.getChannel().e()), 4294967296L, z2);
+            Pair<Long, Long> computeAllowDenyUpdateBits = PermissionOverwriteUtilsKt.computeAllowDenyUpdateBits(AnimatableValueParser.F0(loaded.getChannel(), loaded.getChannel().f()), 4294967296L, z2);
             long longValue = computeAllowDenyUpdateBits.component1().longValue();
             long longValue2 = computeAllowDenyUpdateBits.component2().longValue();
             Subscription subscription = this.lastRequestToSpeakSubscription;
             if (subscription != null) {
                 subscription.unsubscribe();
             }
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updatePermissionOverwrites(loaded.getChannel().g(), loaded.getChannel().e(), RestAPIParams.ChannelPermissionOverwrites.Companion.createForRole(loaded.getChannel().e(), Long.valueOf(longValue), Long.valueOf(longValue2))), false, 1, null), this, null, 2, null), WidgetStageRaisedHandsBottomSheetViewModel.class, (Context) null, new WidgetStageRaisedHandsBottomSheetViewModel$setRequestToSpeakEnabled$1(this), new WidgetStageRaisedHandsBottomSheetViewModel$setRequestToSpeakEnabled$2(this), (Function0) null, (Function0) null, new WidgetStageRaisedHandsBottomSheetViewModel$setRequestToSpeakEnabled$3(this, z2), 50, (Object) null);
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updatePermissionOverwrites(loaded.getChannel().h(), loaded.getChannel().f(), RestAPIParams.ChannelPermissionOverwrites.Companion.createForRole(loaded.getChannel().f(), Long.valueOf(longValue), Long.valueOf(longValue2))), false, 1, null), this, null, 2, null), WidgetStageRaisedHandsBottomSheetViewModel.class, (Context) null, new WidgetStageRaisedHandsBottomSheetViewModel$setRequestToSpeakEnabled$1(this), new WidgetStageRaisedHandsBottomSheetViewModel$setRequestToSpeakEnabled$2(this), (Function0) null, (Function0) null, new WidgetStageRaisedHandsBottomSheetViewModel$setRequestToSpeakEnabled$3(this, z2), 50, (Object) null);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java
index ae245176e8..452ecaa6ed 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java
@@ -21,29 +21,29 @@ public final /* synthetic */ class WidgetStageStartEventBottomSheet$binding$2 ex
 
     public final WidgetStageStartEventBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364952;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364952);
+        int i = 2131365002;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131365002);
         if (appCompatImageView != null) {
-            i = 2131364954;
-            TextView textView = (TextView) view.findViewById(2131364954);
+            i = 2131365004;
+            TextView textView = (TextView) view.findViewById(2131365004);
             if (textView != null) {
-                i = 2131365040;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365040);
+                i = 2131365090;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365090);
                 if (materialButton != null) {
-                    i = 2131365133;
-                    TextView textView2 = (TextView) view.findViewById(2131365133);
+                    i = 2131365188;
+                    TextView textView2 = (TextView) view.findViewById(2131365188);
                     if (textView2 != null) {
-                        i = 2131365286;
-                        TextView textView3 = (TextView) view.findViewById(2131365286);
+                        i = 2131365341;
+                        TextView textView3 = (TextView) view.findViewById(2131365341);
                         if (textView3 != null) {
-                            i = 2131365302;
-                            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365302);
+                            i = 2131365357;
+                            TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365357);
                             if (textInputEditText != null) {
-                                i = 2131365303;
-                                TextView textView4 = (TextView) view.findViewById(2131365303);
+                                i = 2131365358;
+                                TextView textView4 = (TextView) view.findViewById(2131365358);
                                 if (textView4 != null) {
-                                    i = 2131365304;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365304);
+                                    i = 2131365359;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365359);
                                     if (textInputLayout != null) {
                                         return new WidgetStageStartEventBottomSheetBinding((CoordinatorLayout) view, appCompatImageView, textView, materialButton, textView2, textView3, textInputEditText, textView4, textInputLayout);
                                     }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
index 7b392fbd87..1984bcc5f4 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java
@@ -90,7 +90,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
 
     private final void configureUI(WidgetStageStartEventBottomSheetViewModel.ViewState viewState) {
         if (viewState instanceof WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded) {
-            MaterialButton materialButton = getBinding().f1958c;
+            MaterialButton materialButton = getBinding().f1961c;
             m.checkNotNullExpressionValue(materialButton, "binding.startStageButton");
             WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded loaded = (WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded) viewState;
             boolean z2 = true;
@@ -104,13 +104,13 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
             }
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.title");
-            textView.setText(getString(loaded.getStageInstance() == null ? 2131893460 : 2131888210));
+            textView.setText(getString(loaded.getStageInstance() == null ? 2131893544 : 2131888210));
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.subtitle");
-            textView2.setText(getString(loaded.getStageInstance() == null ? 2131893459 : 2131888209));
-            MaterialButton materialButton2 = getBinding().f1958c;
+            textView2.setText(getString(loaded.getStageInstance() == null ? 2131893543 : 2131888209));
+            MaterialButton materialButton2 = getBinding().f1961c;
             m.checkNotNullExpressionValue(materialButton2, "binding.startStageButton");
-            materialButton2.setText(getString(loaded.getStageInstance() == null ? 2131893457 : 2131892968));
+            materialButton2.setText(getString(loaded.getStageInstance() == null ? 2131893541 : 2131893049));
             TextView textView3 = getBinding().b;
             m.checkNotNullExpressionValue(textView3, "binding.speakerHint");
             if (loaded.getStageInstance() != null) {
@@ -150,7 +150,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559233;
+        return 2131559240;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -167,6 +167,6 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet {
         TextInputEditText textInputEditText = getBinding().f;
         m.checkNotNullExpressionValue(textInputEditText, "binding.topicInput");
         TextWatcherKt.addBindedTextWatcher(textInputEditText, this, new WidgetStageStartEventBottomSheet$onViewCreated$1(this));
-        getBinding().f1958c.setOnClickListener(new WidgetStageStartEventBottomSheet$onViewCreated$2(this));
+        getBinding().f1961c.setOnClickListener(new WidgetStageStartEventBottomSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
index b1f625b281..42ba206ed2 100644
--- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java
@@ -73,9 +73,9 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreChannels storeChannels, StoreStageInstances storeStageInstances) {
-            Observable<R> G = storeChannels.observeChannel(j).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-            Observable<StoreState> j2 = Observable.j(G, storeStageInstances.observeStageInstanceForChannel(j).z(), WidgetStageStartEventBottomSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            Observable<R> F = storeChannels.observeChannel(j).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+            Observable<StoreState> j2 = Observable.j(F, storeStageInstances.observeStageInstanceForChannel(j).y(), WidgetStageStartEventBottomSheetViewModel$Companion$observeStoreState$1.INSTANCE);
             m.checkNotNullExpressionValue(j2, "Observable.combineLatest… stageInstance)\n        }");
             return j2;
         }
@@ -433,7 +433,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
         this.channelsStore = storeChannels;
         this.stageInstanceStore = storeStageInstances;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetStageStartEventBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -461,7 +461,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
 
     private final void emitSetStatusFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.SetTopicFailure(2131888049));
+        publishSubject.j.onNext(new Event.SetTopicFailure(2131888048));
     }
 
     private final void emitSetStatusSuccessEvent(Channel channel) {
@@ -507,7 +507,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode
             String obj = w.trim(topic).toString();
             String str = obj.length() > 0 ? obj : null;
             if (str == null) {
-                this.eventSubject.j.onNext(new Event.InvalidTopic(2131893463));
+                this.eventSubject.j.onNext(new Event.InvalidTopic(2131893547));
             } else if (loaded.getStageInstance() == null) {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.INSTANCE.startStageInstance(this.channelId, str, StageInstancePrivacyLevel.GUILD_ONLY), false, 1, null), this, null, 2, null), WidgetStageStartEventBottomSheetViewModel.class, (Context) null, (Function1) null, new WidgetStageStartEventBottomSheetViewModel$openStage$1(this), (Function0) null, (Function0) null, new WidgetStageStartEventBottomSheetViewModel$openStage$2(this, z2, loaded), 54, (Object) null);
             } else {
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2.java
new file mode 100644
index 0000000000..b08b0302be
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.stage.start;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: StartStageEventGuildsFeatureFlag.kt */
+public final class StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2 extends o implements Function0<StartStageEventGuildsFeatureFlag> {
+    public static final StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2 INSTANCE = new StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2();
+
+    public StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final StartStageEventGuildsFeatureFlag mo1invoke() {
+        return new StartStageEventGuildsFeatureFlag(null, null, 3, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageEventGuildsFeatureFlag.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageEventGuildsFeatureFlag.java
new file mode 100644
index 0000000000..6991553309
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageEventGuildsFeatureFlag.java
@@ -0,0 +1,58 @@
+package com.discord.widgets.stage.start;
+
+import com.discord.models.experiments.domain.Experiment;
+import com.discord.stores.StoreExperiments;
+import com.discord.stores.StoreGuilds;
+import com.discord.stores.StoreStream;
+import d0.g;
+import d0.z.d.m;
+import kotlin.Lazy;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+/* compiled from: StartStageEventGuildsFeatureFlag.kt */
+public final class StartStageEventGuildsFeatureFlag {
+    public static final Companion Companion = new Companion(null);
+    private static final Lazy INSTANCE$delegate = g.lazy(StartStageEventGuildsFeatureFlag$Companion$INSTANCE$2.INSTANCE);
+    private final StoreExperiments experimentsStore;
+    private final StoreGuilds guildsStore;
+
+    /* compiled from: StartStageEventGuildsFeatureFlag.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final StartStageEventGuildsFeatureFlag getINSTANCE() {
+            Lazy access$getINSTANCE$cp = StartStageEventGuildsFeatureFlag.access$getINSTANCE$cp();
+            Companion companion = StartStageEventGuildsFeatureFlag.Companion;
+            return (StartStageEventGuildsFeatureFlag) access$getINSTANCE$cp.getValue();
+        }
+    }
+
+    public StartStageEventGuildsFeatureFlag() {
+        this(null, null, 3, null);
+    }
+
+    public StartStageEventGuildsFeatureFlag(StoreGuilds storeGuilds, StoreExperiments storeExperiments) {
+        m.checkNotNullParameter(storeGuilds, "guildsStore");
+        m.checkNotNullParameter(storeExperiments, "experimentsStore");
+        this.guildsStore = storeGuilds;
+        this.experimentsStore = storeExperiments;
+    }
+
+    /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+    public /* synthetic */ StartStageEventGuildsFeatureFlag(StoreGuilds storeGuilds, StoreExperiments storeExperiments, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this((i & 1) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 2) != 0 ? StoreStream.Companion.getExperiments() : storeExperiments);
+    }
+
+    public static final /* synthetic */ Lazy access$getINSTANCE$cp() {
+        return INSTANCE$delegate;
+    }
+
+    public final boolean canGuildAccessStartStageEvent(long j) {
+        Experiment guildExperiment;
+        return (this.guildsStore.getGuild(j) == null || (guildExperiment = this.experimentsStore.getGuildExperiment("2021-06_stage_events", j, true)) == null || guildExperiment.getBucket() != 1) ? false : true;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter$GuildViewHolder$onConfigure$1.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter$GuildViewHolder$onConfigure$1.java
index 950b2d19a3..5657218126 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter$GuildViewHolder$onConfigure$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter$GuildViewHolder$onConfigure$1.java
@@ -15,6 +15,6 @@ public final class StartStageServerSelectionAdapter$GuildViewHolder$onConfigure$
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        StartStageServerSelectionAdapter.GuildViewHolder.access$getAdapter$p(this.this$0).getOnGuildItemClicked().invoke(Long.valueOf(((StartStageServerSelectionItem.GuildItem) this.$data).getDefaultStageChannel().g()));
+        StartStageServerSelectionAdapter.GuildViewHolder.access$getAdapter$p(this.this$0).getOnGuildItemClicked().invoke(Long.valueOf(((StartStageServerSelectionItem.GuildItem) this.$data).getDefaultStageChannel().h()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java
index 395a7aa0d9..f957fd02c4 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java
@@ -34,18 +34,18 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public BulletViewHolder(StartStageServerSelectionAdapter startStageServerSelectionAdapter) {
-            super(2131559236, startStageServerSelectionAdapter);
+            super(2131559244, startStageServerSelectionAdapter);
             m.checkNotNullParameter(startStageServerSelectionAdapter, "adapter");
             View view = this.itemView;
             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-            int i = 2131365045;
-            ImageView imageView = (ImageView) view.findViewById(2131365045);
+            int i = 2131365096;
+            ImageView imageView = (ImageView) view.findViewById(2131365096);
             if (imageView != null) {
-                i = 2131365046;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365046);
+                i = 2131365097;
+                ImageView imageView2 = (ImageView) view.findViewById(2131365097);
                 if (imageView2 != null) {
-                    i = 2131365047;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365047);
+                    i = 2131365098;
+                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365098);
                     if (linkifiedTextView != null) {
                         WidgetStartStageServerSelectionBulletItemBinding widgetStartStageServerSelectionBulletItemBinding = new WidgetStartStageServerSelectionBulletItemBinding((ConstraintLayout) view, constraintLayout, imageView, imageView2, linkifiedTextView);
                         m.checkNotNullExpressionValue(widgetStartStageServerSelectionBulletItemBinding, "WidgetStartStageServerSe…temBinding.bind(itemView)");
@@ -70,7 +70,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
 
         @Override // com.discord.widgets.stage.start.StartStageServerSelectionAdapter.ListItemViewHolder
         public View getDivider() {
-            ImageView imageView = this.binding.f1961c;
+            ImageView imageView = this.binding.f1964c;
             m.checkNotNullExpressionValue(imageView, "binding.startStageServerSelectionBulletItemDivider");
             return imageView;
         }
@@ -91,7 +91,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
                 this.binding.d.setImageResource(bulletItem.getImageRes());
                 LinkifiedTextView linkifiedTextView = this.binding.e;
                 m.checkNotNullExpressionValue(linkifiedTextView, "binding.startStageServerSelectionBulletItemText");
-                if (bulletItem.getStringRes() != 2131893477) {
+                if (bulletItem.getStringRes() != 2131893561) {
                     m.checkNotNullExpressionValue(context, "context");
                     charSequence = b.g(context, bulletItem.getStringRes(), new Object[0], null, 4);
                 } else {
@@ -109,21 +109,21 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public GuildViewHolder(StartStageServerSelectionAdapter startStageServerSelectionAdapter) {
-            super(2131559237, startStageServerSelectionAdapter);
+            super(2131559245, startStageServerSelectionAdapter);
             m.checkNotNullParameter(startStageServerSelectionAdapter, "adapter");
             View view = this.itemView;
-            int i = 2131365050;
-            ImageView imageView = (ImageView) view.findViewById(2131365050);
+            int i = 2131365101;
+            ImageView imageView = (ImageView) view.findViewById(2131365101);
             if (imageView != null) {
                 ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                i = 2131365052;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365052);
+                i = 2131365103;
+                ImageView imageView2 = (ImageView) view.findViewById(2131365103);
                 if (imageView2 != null) {
-                    i = 2131365053;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365053);
+                    i = 2131365104;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365104);
                     if (simpleDraweeView != null) {
-                        i = 2131365054;
-                        TextView textView = (TextView) view.findViewById(2131365054);
+                        i = 2131365105;
+                        TextView textView = (TextView) view.findViewById(2131365105);
                         if (textView != null) {
                             WidgetStartStageServerSelectionGuildItemBinding widgetStartStageServerSelectionGuildItemBinding = new WidgetStartStageServerSelectionGuildItemBinding(constraintLayout, imageView, constraintLayout, imageView2, simpleDraweeView, textView);
                             m.checkNotNullExpressionValue(widgetStartStageServerSelectionGuildItemBinding, "WidgetStartStageServerSe…temBinding.bind(itemView)");
@@ -153,7 +153,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
 
         @Override // com.discord.widgets.stage.start.StartStageServerSelectionAdapter.ListItemViewHolder
         public View getDivider() {
-            ImageView imageView = this.binding.f1962c;
+            ImageView imageView = this.binding.f1965c;
             m.checkNotNullExpressionValue(imageView, "binding.startStageServerSelectionGuildItemDivider");
             return imageView;
         }
@@ -208,13 +208,13 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim
             int ordinal = startStageServerSelectionItem.getPosition().ordinal();
             boolean z2 = true;
             if (ordinal == 0) {
-                i2 = 2131231037;
+                i2 = 2131231042;
             } else if (ordinal == 1) {
-                i2 = 2131231035;
+                i2 = 2131231040;
             } else if (ordinal == 2) {
-                i2 = 2131231034;
+                i2 = 2131231039;
             } else if (ordinal == 3) {
-                i2 = 2131231036;
+                i2 = 2131231041;
             } else {
                 throw new NoWhenBranchMatchedException();
             }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel$Companion$observeStoreState$1.java
index b1f85d7843..2188a47fa6 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel$Companion$observeStoreState$1.java
@@ -44,9 +44,9 @@ public final class StartStageServerSelectionViewModel$Companion$observeStoreStat
                 obj = it.next();
                 Channel channel = (Channel) obj;
                 boolean z2 = true;
-                if (AnimatableValueParser.u1(channel) && (map5 = (Map) map3.get(Long.valueOf(longValue))) != null && (l = (Long) a.d(channel, map5)) != null && AnimatableValueParser.S0(l, 20971536)) {
+                if (AnimatableValueParser.v1(channel) && (map5 = (Map) map3.get(Long.valueOf(longValue))) != null && (l = (Long) a.d(channel, map5)) != null && AnimatableValueParser.S0(l, 20971536)) {
                     m.checkNotNullExpressionValue(map4, "stageInstances");
-                    if (!map4.containsKey(Long.valueOf(channel.g()))) {
+                    if (!map4.containsKey(Long.valueOf(channel.h()))) {
                         continue;
                         if (z2) {
                             break;
diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java
index 750e1e0f58..9cf6a8f22b 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java
@@ -196,7 +196,7 @@ public final class StartStageServerSelectionViewModel extends AppViewModel<ViewS
 
     static {
         StartStageServerSelectionItem.ItemPosition itemPosition = StartStageServerSelectionItem.ItemPosition.Middle;
-        bulletItems = n.listOf((Object[]) new StartStageServerSelectionItem.BulletItem[]{new StartStageServerSelectionItem.BulletItem(2131231700, 2131893477, StartStageServerSelectionItem.ItemPosition.Top, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131231478, 2131893478, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131232057, 2131893479, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131231878, 2131893480, StartStageServerSelectionItem.ItemPosition.Bottom, 0, null, 24, null)});
+        bulletItems = n.listOf((Object[]) new StartStageServerSelectionItem.BulletItem[]{new StartStageServerSelectionItem.BulletItem(2131231706, 2131893561, StartStageServerSelectionItem.ItemPosition.Top, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131231484, 2131893562, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131232065, 2131893563, itemPosition, 0, null, 24, null), new StartStageServerSelectionItem.BulletItem(2131231886, 2131893564, StartStageServerSelectionItem.ItemPosition.Bottom, 0, null, 24, null)});
     }
 
     public StartStageServerSelectionViewModel() {
@@ -233,7 +233,7 @@ public final class StartStageServerSelectionViewModel extends AppViewModel<ViewS
         if (getViewState() == null) {
             StageDiscoveryAnalyticsTracker.INSTANCE.trackStageDiscoveryStartStageClicked(z2);
         }
-        int i = !z2 ? 2131893483 : 2131893485;
+        int i = !z2 ? 2131893567 : 2131893569;
         if (!z2) {
             list = bulletItems;
         } else {
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$binding$2.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$binding$2.java
new file mode 100644
index 0000000000..beacd28980
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$binding$2.java
@@ -0,0 +1,61 @@
+package com.discord.widgets.stage.start;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import c.a.i.j1;
+import com.discord.databinding.WidgetStartStageBinding;
+import com.google.android.material.textview.MaterialTextView;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetStartStage.kt */
+public final /* synthetic */ class WidgetStartStage$binding$2 extends k implements Function1<View, WidgetStartStageBinding> {
+    public static final WidgetStartStage$binding$2 INSTANCE = new WidgetStartStage$binding$2();
+
+    public WidgetStartStage$binding$2() {
+        super(1, WidgetStartStageBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetStartStageBinding;", 0);
+    }
+
+    public final WidgetStartStageBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = 2131365093;
+        ImageView imageView = (ImageView) view.findViewById(2131365093);
+        if (imageView != null) {
+            i = 2131365108;
+            View findViewById = view.findViewById(2131365108);
+            if (findViewById != null) {
+                int i2 = 2131363566;
+                ImageView imageView2 = (ImageView) findViewById.findViewById(2131363566);
+                if (imageView2 != null) {
+                    i2 = 2131364273;
+                    ImageView imageView3 = (ImageView) findViewById.findViewById(2131364273);
+                    if (imageView3 != null) {
+                        i2 = 2131365188;
+                        MaterialTextView materialTextView = (MaterialTextView) findViewById.findViewById(2131365188);
+                        if (materialTextView != null) {
+                            i2 = 2131365341;
+                            MaterialTextView materialTextView2 = (MaterialTextView) findViewById.findViewById(2131365341);
+                            if (materialTextView2 != null) {
+                                j1 j1Var = new j1((ConstraintLayout) findViewById, imageView2, imageView3, materialTextView, materialTextView2);
+                                TextView textView = (TextView) view.findViewById(2131365109);
+                                if (textView != null) {
+                                    TextView textView2 = (TextView) view.findViewById(2131365110);
+                                    if (textView2 != null) {
+                                        return new WidgetStartStageBinding((ConstraintLayout) view, imageView, j1Var, textView, textView2);
+                                    }
+                                    i = 2131365110;
+                                } else {
+                                    i = 2131365109;
+                                }
+                            }
+                        }
+                    }
+                }
+                throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(i2)));
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$channelId$2.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$channelId$2.java
new file mode 100644
index 0000000000..de22447173
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$channelId$2.java
@@ -0,0 +1,22 @@
+package com.discord.widgets.stage.start;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetStartStage.kt */
+public final class WidgetStartStage$channelId$2 extends o implements Function0<Long> {
+    public final /* synthetic */ WidgetStartStage this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetStartStage$channelId$2(WidgetStartStage widgetStartStage) {
+        super(0);
+        this.this$0 = widgetStartStage;
+    }
+
+    /* Return type fixed from 'long' to match base method */
+    /* JADX WARNING: Unknown variable types count: 1 */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final Long mo1invoke() {
+        return WidgetStartStage.access$getMostRecentIntent$p(this.this$0).getLongExtra("INTENT_EXTRA_CHANNEL_ID", -1);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$onViewBoundOrOnResume$1.java
new file mode 100644
index 0000000000..0b35b9bdae
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$onViewBoundOrOnResume$1.java
@@ -0,0 +1,17 @@
+package com.discord.widgets.stage.start;
+
+import android.view.View;
+import com.discord.widgets.stage.settings.WidgetStageSettings;
+/* compiled from: WidgetStartStage.kt */
+public final class WidgetStartStage$onViewBoundOrOnResume$1 implements View.OnClickListener {
+    public final /* synthetic */ WidgetStartStage this$0;
+
+    public WidgetStartStage$onViewBoundOrOnResume$1(WidgetStartStage widgetStartStage) {
+        this.this$0 = widgetStartStage;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetStageSettings.Companion.launch(this.this$0.requireContext(), WidgetStartStage.access$getChannelId$p(this.this$0), WidgetStartStage.access$getSettingsLauncher$p(this.this$0));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$settingsLauncher$1.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$settingsLauncher$1.java
new file mode 100644
index 0000000000..da00804202
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage$settingsLauncher$1.java
@@ -0,0 +1,39 @@
+package com.discord.widgets.stage.start;
+
+import android.content.Intent;
+import androidx.fragment.app.FragmentActivity;
+import com.discord.app.AppTransitionActivity;
+import com.discord.utilities.intent.IntentUtilsKt;
+import com.discord.widgets.voice.fullscreen.WidgetCallFullscreen;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetStartStage.kt */
+public final class WidgetStartStage$settingsLauncher$1 extends o implements Function1<Intent, Unit> {
+    public final /* synthetic */ WidgetStartStage this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetStartStage$settingsLauncher$1(WidgetStartStage widgetStartStage) {
+        super(1);
+        this.this$0 = widgetStartStage;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Intent intent) {
+        invoke(intent);
+        return Unit.a;
+    }
+
+    public final void invoke(Intent intent) {
+        Long longExtraOrNull;
+        if (!(intent == null || (longExtraOrNull = IntentUtilsKt.getLongExtraOrNull(intent, "com.discord.intent.extra.EXTRA_CHANNEL_ID")) == null)) {
+            WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.this$0.requireContext(), longExtraOrNull.longValue(), true, null, AppTransitionActivity.Transition.TYPE_SLIDE_VERTICAL_WITH_FADE, 8, null);
+        }
+        FragmentActivity activity = this.this$0.getActivity();
+        if (activity != null) {
+            activity.finish();
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage.java
new file mode 100644
index 0000000000..3c46c2cfc3
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStage.java
@@ -0,0 +1,77 @@
+package com.discord.widgets.stage.start;
+
+import android.content.Context;
+import android.content.Intent;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.fragment.app.Fragment;
+import c.a.d.l;
+import c.a.i.j1;
+import c.d.b.a.a;
+import com.discord.app.AppFragment;
+import com.discord.databinding.WidgetStartStageBinding;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.stage.settings.WidgetStageSettings;
+import d0.g;
+import d0.z.d.m;
+import kotlin.Lazy;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+/* compiled from: WidgetStartStage.kt */
+public final class WidgetStartStage extends AppFragment {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetStartStage.class, "binding", "getBinding()Lcom/discord/databinding/WidgetStartStageBinding;", 0)};
+    public static final Companion Companion = new Companion(null);
+    private static final String INTENT_EXTRA_CHANNEL_ID = "INTENT_EXTRA_CHANNEL_ID";
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetStartStage$binding$2.INSTANCE, null, 2, null);
+    private final Lazy channelId$delegate = g.lazy(new WidgetStartStage$channelId$2(this));
+    private final ActivityResultLauncher<Intent> settingsLauncher = WidgetStageSettings.Companion.registerForResult(this, new WidgetStartStage$settingsLauncher$1(this));
+
+    /* compiled from: WidgetStartStage.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void launch(Context context, long j) {
+            m.checkNotNullParameter(context, "context");
+            Intent intent = new Intent();
+            intent.putExtra("INTENT_EXTRA_CHANNEL_ID", j);
+            l.d(context, WidgetStartStage.class, intent);
+        }
+    }
+
+    public WidgetStartStage() {
+        super(2131559242);
+    }
+
+    public static final /* synthetic */ long access$getChannelId$p(WidgetStartStage widgetStartStage) {
+        return widgetStartStage.getChannelId();
+    }
+
+    public static final /* synthetic */ Intent access$getMostRecentIntent$p(WidgetStartStage widgetStartStage) {
+        return widgetStartStage.getMostRecentIntent();
+    }
+
+    public static final /* synthetic */ ActivityResultLauncher access$getSettingsLauncher$p(WidgetStartStage widgetStartStage) {
+        return widgetStartStage.settingsLauncher;
+    }
+
+    private final WidgetStartStageBinding getBinding() {
+        return (WidgetStartStageBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    private final long getChannelId() {
+        return ((Number) this.channelId$delegate.getValue()).longValue();
+    }
+
+    @Override // com.discord.app.AppFragment
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        j1 j1Var = getBinding().b;
+        m.checkNotNullExpressionValue(j1Var, "binding.startStageStartButton");
+        j1Var.a.setOnClickListener(new WidgetStartStage$onViewBoundOrOnResume$1(this));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java
index 7867cd5f16..53ca77f3d1 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection$binding$2.java
@@ -20,26 +20,26 @@ public final /* synthetic */ class WidgetStartStageServerSelection$binding$2 ext
 
     public final WidgetStartStageServerSelectionBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362632;
-        ImageView imageView = (ImageView) view.findViewById(2131362632);
+        int i = 2131362656;
+        ImageView imageView = (ImageView) view.findViewById(2131362656);
         if (imageView != null) {
-            i = 2131364399;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364399);
+            i = 2131364437;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364437);
             if (recyclerView != null) {
-                i = 2131365043;
-                ImageView imageView2 = (ImageView) view.findViewById(2131365043);
+                i = 2131365094;
+                ImageView imageView2 = (ImageView) view.findViewById(2131365094);
                 if (imageView2 != null) {
-                    i = 2131365048;
-                    Button button = (Button) view.findViewById(2131365048);
+                    i = 2131365099;
+                    Button button = (Button) view.findViewById(2131365099);
                     if (button != null) {
-                        i = 2131365049;
-                        TextView textView = (TextView) view.findViewById(2131365049);
+                        i = 2131365100;
+                        TextView textView = (TextView) view.findViewById(2131365100);
                         if (textView != null) {
-                            i = 2131365055;
-                            TextView textView2 = (TextView) view.findViewById(2131365055);
+                            i = 2131365106;
+                            TextView textView2 = (TextView) view.findViewById(2131365106);
                             if (textView2 != null) {
-                                i = 2131365056;
-                                TextView textView3 = (TextView) view.findViewById(2131365056);
+                                i = 2131365107;
+                                TextView textView3 = (TextView) view.findViewById(2131365107);
                                 if (textView3 != null) {
                                     return new WidgetStartStageServerSelectionBinding((ConstraintLayout) view, imageView, recyclerView, imageView2, button, textView, textView2, textView3);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java
index 1858db38e9..2d1ab52258 100644
--- a/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java
+++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetStartStageServerSelection.java
@@ -77,7 +77,7 @@ public final class WidgetStartStageServerSelection extends AppFragment {
     }
 
     public WidgetStartStageServerSelection() {
-        super(2131559235);
+        super(2131559243);
         WidgetStartStageServerSelection$viewModel$2 widgetStartStageServerSelection$viewModel$2 = WidgetStartStageServerSelection$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(StartStageServerSelectionViewModel.class), new WidgetStartStageServerSelection$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStartStageServerSelection$viewModel$2));
@@ -115,7 +115,7 @@ public final class WidgetStartStageServerSelection extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        RecyclerView recyclerView = getBinding().f1960c;
+        RecyclerView recyclerView = getBinding().f1963c;
         m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView");
         StartStageServerSelectionAdapter startStageServerSelectionAdapter = new StartStageServerSelectionAdapter(recyclerView);
         this.adapter = startStageServerSelectionAdapter;
diff --git a/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java b/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java
index 5bc270e6b0..5cd422f1be 100644
--- a/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java
+++ b/app/src/main/java/com/discord/widgets/stage/usersheet/UserProfileStageActionsView.java
@@ -214,11 +214,11 @@ public final class UserProfileStageActionsView extends LinearLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558712, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365415;
-        TextView textView = (TextView) inflate.findViewById(2131365415);
+        int i = 2131365475;
+        TextView textView = (TextView) inflate.findViewById(2131365475);
         if (textView != null) {
-            i = 2131365416;
-            TextView textView2 = (TextView) inflate.findViewById(2131365416);
+            i = 2131365476;
+            TextView textView2 = (TextView) inflate.findViewById(2131365476);
             if (textView2 != null) {
                 UserProfileStageActionsViewBinding userProfileStageActionsViewBinding = new UserProfileStageActionsViewBinding((LinearLayout) inflate, textView, textView2);
                 m.checkNotNullExpressionValue(userProfileStageActionsViewBinding, "UserProfileStageActionsV…rom(context), this, true)");
@@ -236,7 +236,7 @@ public final class UserProfileStageActionsView extends LinearLayout {
 
     public final void setOnMoveToAudience(Function0<Unit> function0) {
         m.checkNotNullParameter(function0, "onMoveToAudience");
-        this.binding.f1639c.setOnClickListener(new UserProfileStageActionsView$setOnMoveToAudience$1(function0));
+        this.binding.f1636c.setOnClickListener(new UserProfileStageActionsView$setOnMoveToAudience$1(function0));
     }
 
     public final void updateView(ViewState viewState) {
@@ -251,9 +251,9 @@ public final class UserProfileStageActionsView extends LinearLayout {
         TextView textView = this.binding.b;
         textView.setVisibility(viewState.getUserRequestToSpeakState().getCanBeInvitedToSpeak() ? 0 : 8);
         textView.setEnabled(!viewState.isInvitingToSpeak());
-        textView.setText(viewState.isMe() ? 2131891241 : 2131893359);
-        DrawableCompat.setCompoundDrawablesCompat$default(textView, viewState.isMe() ? 2131231951 : 2131231948, 0, 0, 0, 14, (Object) null);
-        TextView textView2 = this.binding.f1639c;
+        textView.setText(viewState.isMe() ? 2131891312 : 2131893442);
+        DrawableCompat.setCompoundDrawablesCompat$default(textView, viewState.isMe() ? 2131231959 : 2131231956, 0, 0, 0, 14, (Object) null);
+        TextView textView2 = this.binding.f1636c;
         StageRoles r4 = viewState.m53getUserStageRoletwRsX0();
         if (r4 != null && StageRoles.m26isSpeakerimpl(r4.m28unboximpl())) {
             i = 0;
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java
index 891a976564..5fbfdb232a 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.java
@@ -17,6 +17,6 @@ public final class WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1<T, R>
         m.checkNotNullExpressionValue(l, "selectedChannelId");
         Observable<StoreMessageAck.Ack> observeForChannel = messageAck.observeForChannel(l.longValue());
         TimeUnit timeUnit = TimeUnit.MILLISECONDS;
-        return Observable.m(new j(Boolean.FALSE), Observable.j(observeForChannel.o(200, timeUnit), companion.getMessagesMostRecent().observeRecentMessageIds(l.longValue()).o(200, timeUnit).a0(1), WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.INSTANCE).c0(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.INSTANCE));
+        return Observable.m(new j(Boolean.FALSE), Observable.j(observeForChannel.o(200, timeUnit), companion.getMessagesMostRecent().observeRecentMessageIds(l.longValue()).o(200, timeUnit).Z(1), WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$1.INSTANCE).b0(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1$isLastAckOlderThanMostRecent$2.INSTANCE));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java
index 45d7f0448f..ded7077a56 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus$binding$2.java
@@ -19,11 +19,11 @@ public final /* synthetic */ class WidgetChatStatus$binding$2 extends k implemen
     public final WidgetChatStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         LinearLayout linearLayout = (LinearLayout) view;
-        int i = 2131362598;
-        ImageView imageView = (ImageView) view.findViewById(2131362598);
+        int i = 2131362611;
+        ImageView imageView = (ImageView) view.findViewById(2131362611);
         if (imageView != null) {
-            i = 2131362599;
-            TextView textView = (TextView) view.findViewById(2131362599);
+            i = 2131362612;
+            TextView textView = (TextView) view.findViewById(2131362612);
             if (textView != null) {
                 return new WidgetChatStatusBinding((LinearLayout) view, linearLayout, imageView, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
index efaa470c91..0ded4ec38a 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java
@@ -71,11 +71,11 @@ public final class WidgetChatStatus extends AppFragment {
 
             public final Observable<Model> get() {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getChannelsSelected().observeId().s().Z(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.INSTANCE).s(), companion.getMessages().getAllDetached(), companion.getReadStates().getUnreadMarkerForSelectedChannel(), new WidgetChatStatus$sam$rx_functions_Func3$0(new WidgetChatStatus$Model$Companion$get$1(this)), 500, TimeUnit.MILLISECONDS);
+                Observable combineLatest = ObservableWithLeadingEdgeThrottle.combineLatest(companion.getChannelsSelected().observeId().r().Y(WidgetChatStatus$Model$Companion$get$isUnreadValidObs$1.INSTANCE).r(), companion.getMessages().getAllDetached(), companion.getReadStates().getUnreadMarkerForSelectedChannel(), new WidgetChatStatus$sam$rx_functions_Func3$0(new WidgetChatStatus$Model$Companion$get$1(this)), 500, TimeUnit.MILLISECONDS);
                 m.checkNotNullExpressionValue(combineLatest, "ObservableWithLeadingEdg…ILLISECONDS\n            )");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(combineLatest).s();
-                m.checkNotNullExpressionValue(s2, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(combineLatest).r();
+                m.checkNotNullExpressionValue(r, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -194,7 +194,7 @@ public final class WidgetChatStatus extends AppFragment {
     }
 
     public WidgetChatStatus() {
-        super(2131558970);
+        super(2131558973);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetChatStatus widgetChatStatus, Model model) {
@@ -222,14 +222,14 @@ public final class WidgetChatStatus extends AppFragment {
         if (z2) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            return c.a.l.b.h(resources, 2131891344, new Object[]{String.valueOf(i), renderUtcDate$default}, null, 4);
+            return c.a.l.b.h(resources, 2131891415, new Object[]{String.valueOf(i), renderUtcDate$default}, null, 4);
         }
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755222, i, Integer.valueOf(i));
+        CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755223, i, Integer.valueOf(i));
         Resources resources3 = getResources();
         m.checkNotNullExpressionValue(resources3, "resources");
-        return c.a.l.b.h(resources3, 2131891342, new Object[]{quantityString, renderUtcDate$default}, null, 4);
+        return c.a.l.b.h(resources3, 2131891413, new Object[]{quantityString, renderUtcDate$default}, null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java
index 49526f178d..33c08a2b37 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java
@@ -23,23 +23,23 @@ public final /* synthetic */ class WidgetGlobalStatusIndicator$binding$2 extends
         TextView textView = (TextView) view.findViewById(2131361943);
         if (textView != null) {
             LinearLayout linearLayout = (LinearLayout) view;
-            i = 2131363570;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363570);
+            i = 2131363611;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363611);
             if (materialButton != null) {
-                i = 2131363571;
-                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363571);
+                i = 2131363612;
+                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363612);
                 if (linearLayout2 != null) {
-                    i = 2131363572;
-                    LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363572);
+                    i = 2131363613;
+                    LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363613);
                     if (linearLayout3 != null) {
-                        i = 2131363573;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363573);
+                        i = 2131363614;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363614);
                         if (materialButton2 != null) {
-                            i = 2131363574;
-                            ImageView imageView = (ImageView) view.findViewById(2131363574);
+                            i = 2131363615;
+                            ImageView imageView = (ImageView) view.findViewById(2131363615);
                             if (imageView != null) {
-                                i = 2131363575;
-                                TextView textView2 = (TextView) view.findViewById(2131363575);
+                                i = 2131363616;
+                                TextView textView2 = (TextView) view.findViewById(2131363616);
                                 if (textView2 != null) {
                                     return new WidgetGlobalStatusIndicatorBinding(linearLayout, textView, linearLayout, materialButton, linearLayout2, linearLayout3, materialButton2, imageView, textView2);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupContainerClicks$1.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupContainerClicks$1.java
index b116a9f831..fcc1e0841b 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupContainerClicks$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupContainerClicks$1.java
@@ -23,13 +23,13 @@ public final class WidgetGlobalStatusIndicator$setupContainerClicks$1 implements
         StreamContext streamContext = this.$viewState.getStreamContext();
         if (streamContext != null && streamContext.isCurrentUserParticipating()) {
             WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.this$0.requireContext(), this.$viewState.getStreamContext().getStream().getChannelId(), false, this.$viewState.getStreamContext().getStream().getEncodedStreamKey(), null, 20, null);
-        } else if (AnimatableValueParser.r1(this.$viewState.getSelectedVoiceChannel())) {
-            WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.this$0.requireContext(), this.$viewState.getSelectedVoiceChannel().g(), false, null, null, 28, null);
+        } else if (AnimatableValueParser.s1(this.$viewState.getSelectedVoiceChannel())) {
+            WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.this$0.requireContext(), this.$viewState.getSelectedVoiceChannel().h(), false, null, null, 28, null);
         } else {
             WidgetVoiceBottomSheet.Companion companion = WidgetVoiceBottomSheet.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-            companion.show(parentFragmentManager, this.$viewState.getSelectedVoiceChannel().g(), true, WidgetVoiceBottomSheet.FeatureContext.HOME);
+            companion.show(parentFragmentManager, this.$viewState.getSelectedVoiceChannel().h(), true, WidgetVoiceBottomSheet.FeatureContext.HOME);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$1.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$1.java
index 40939c0d55..78b8c81e48 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$1.java
@@ -15,6 +15,6 @@ public final class WidgetGlobalStatusIndicator$setupStageContainerClicks$1 imple
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.this$0.requireContext(), this.$viewState.getSelectedVoiceChannel().g(), false, null, null, 28, null);
+        WidgetCallFullscreen.Companion.launch$default(WidgetCallFullscreen.Companion, this.this$0.requireContext(), this.$viewState.getSelectedVoiceChannel().h(), false, null, null, 28, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java
index c8b73b35e8..77817d5e38 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java
@@ -22,7 +22,7 @@ public final class WidgetGlobalStatusIndicator$setupStageContainerClicks$2 imple
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12);
+            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893437, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
index 6a19b5bc06..e5b826c0c4 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java
@@ -56,7 +56,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     private final Lazy viewModel$delegate;
 
     public WidgetGlobalStatusIndicator() {
-        super(2131559024);
+        super(2131559028);
         WidgetGlobalStatusIndicator$viewModel$2 widgetGlobalStatusIndicator$viewModel$2 = WidgetGlobalStatusIndicator$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGlobalStatusIndicatorViewModel.class), new WidgetGlobalStatusIndicator$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGlobalStatusIndicator$viewModel$2));
@@ -104,7 +104,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     }
 
     private final Observable<WidgetGlobalStatusIndicatorViewModel.ViewState> bindDelay(Observable<WidgetGlobalStatusIndicatorViewModel.ViewState> observable) {
-        return observable.Z(new WidgetGlobalStatusIndicator$bindDelay$1(observable));
+        return observable.Y(new WidgetGlobalStatusIndicator$bindDelay$1(observable));
     }
 
     private final void configureUI(WidgetGlobalStatusIndicatorViewModel.ViewState viewState) {
@@ -135,7 +135,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         }
         WidgetGlobalStatusIndicatorState.State state = this.lastIndicatorState;
         if (state != null && state.isViewingCall()) {
-            LinearLayout linearLayout = getBinding().f1789c;
+            LinearLayout linearLayout = getBinding().f1790c;
             m.checkNotNullExpressionValue(linearLayout, "binding.indicator");
             LinearLayout linearLayout2 = getBinding().e;
             m.checkNotNullExpressionValue(linearLayout2, "binding.indicatorActions");
@@ -152,7 +152,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void configureUIVisibility(WidgetGlobalStatusIndicatorState.State state) {
         this.lastIndicatorState = state;
-        LinearLayout linearLayout = getBinding().f1789c;
+        LinearLayout linearLayout = getBinding().f1790c;
         m.checkNotNullExpressionValue(linearLayout, "binding.indicator");
         linearLayout.setVisibility(state.isVisible() ? 0 : 8);
     }
@@ -173,9 +173,9 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         LinearLayout linearLayout = getBinding().f;
         m.checkNotNullExpressionValue(linearLayout, "binding.indicatorContent");
         if (linearLayout.getVisibility() == 0) {
-            Observable<Long> e02 = Observable.e0(500, TimeUnit.MILLISECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable.timer(500, TimeUnit.MILLISECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetGlobalStatusIndicator.class, (Context) null, new WidgetGlobalStatusIndicator$pulseFadeIndicatorContent$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalStatusIndicator$pulseFadeIndicatorContent$2(this), 58, (Object) null);
+            Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(500, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetGlobalStatusIndicator.class, (Context) null, new WidgetGlobalStatusIndicator$pulseFadeIndicatorContent$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalStatusIndicator$pulseFadeIndicatorContent$2(this), 58, (Object) null);
         } else {
             ViewExtensions.fadeIn$default(getBinding().f, 1000, null, null, new WidgetGlobalStatusIndicator$pulseFadeIndicatorContent$3(this), 6, null);
         }
@@ -204,7 +204,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void setupConnectingState() {
         resetContentAnimationsAndVisibility(getBinding());
-        getBinding().f1789c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907));
+        getBinding().f1790c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907));
         getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130968932));
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.indicatorText");
@@ -225,7 +225,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     }
 
     private final void setupContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) {
-        getBinding().f1789c.setOnClickListener(new WidgetGlobalStatusIndicator$setupContainerClicks$1(this, callOngoing));
+        getBinding().f1790c.setOnClickListener(new WidgetGlobalStatusIndicator$setupContainerClicks$1(this, callOngoing));
     }
 
     private final void setupIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) {
@@ -237,7 +237,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         LinearLayout linearLayout = getBinding().e;
         m.checkNotNullExpressionValue(linearLayout, "binding.indicatorActions");
         linearLayout.setVisibility(8);
-        LinearLayout linearLayout2 = getBinding().f1789c;
+        LinearLayout linearLayout2 = getBinding().f1790c;
         VoiceViewUtils voiceViewUtils = VoiceViewUtils.INSTANCE;
         linearLayout2.setBackgroundColor(voiceViewUtils.getConnectionStatusColor(callOngoing.getConnectionState(), callOngoing.getConnectionQuality(), requireContext()));
         String A0 = AnimatableValueParser.A0(callOngoing.getSelectedVoiceChannel(), requireContext(), false, 2);
@@ -258,16 +258,16 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
 
     private final void setupOfflineState(boolean z2) {
         resetContentAnimationsAndVisibility(getBinding());
-        getBinding().f1789c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907));
+        getBinding().f1790c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907));
         getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130968932));
-        getBinding().i.setText(z2 ? 2131891331 : 2131891330);
+        getBinding().i.setText(z2 ? 2131891402 : 2131891401);
         ImageView imageView = getBinding().h;
         imageView.setVisibility(0);
         imageView.setImageResource(z2 ? DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969428, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969430, 0, 2, (Object) null));
     }
 
     private final void setupStageContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) {
-        getBinding().f1789c.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$1(this, stageChannelOngoing));
+        getBinding().f1790c.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$1(this, stageChannelOngoing));
         getBinding().d.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$2(this));
         getBinding().g.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$3(this));
     }
@@ -276,7 +276,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
     private final void setupStageIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) {
         resetContentAnimationsAndVisibility(getBinding());
         int color = stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100428) : ColorCompat.getThemedColor(requireContext(), 2130968932);
-        getBinding().f1789c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100249) : ColorCompat.getThemedColor(requireContext(), 2130968907));
+        getBinding().f1790c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100249) : ColorCompat.getThemedColor(requireContext(), 2130968907));
         getBinding().i.setTextColor(color);
         getBinding().g.setTextColor(color);
         LinearLayout linearLayout = getBinding().e;
@@ -286,7 +286,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         ImageView imageView = getBinding().h;
         WidgetGlobalStatusIndicatorState.State state = this.lastIndicatorState;
         imageView.setVisibility(state != null && !state.isViewingCall() ? 0 : 8);
-        Drawable drawable = ContextCompat.getDrawable(imageView.getContext(), 2131231477);
+        Drawable drawable = ContextCompat.getDrawable(imageView.getContext(), 2131231483);
         CharSequence charSequence = null;
         if (drawable != null) {
             m.checkNotNullExpressionValue(drawable, "drawable");
@@ -296,12 +296,12 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         }
         imageView.setImageDrawable(drawable);
         if (stageChannelOngoing.isInvitedToSpeak()) {
-            getBinding().i.setText(2131893444);
-            getBinding().d.setText(2131893441);
+            getBinding().i.setText(2131893527);
+            getBinding().d.setText(2131893524);
             MaterialButton materialButton = getBinding().d;
             m.checkNotNullExpressionValue(materialButton, "binding.indicatorAccept");
             materialButton.setEnabled(!stageChannelOngoing.isAckingInvitation());
-            getBinding().g.setText(2131893443);
+            getBinding().g.setText(2131893526);
             MaterialButton materialButton2 = getBinding().g;
             m.checkNotNullExpressionValue(materialButton2, "binding.indicatorDecline");
             materialButton2.setEnabled(!stageChannelOngoing.isAckingInvitation());
@@ -317,8 +317,8 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
             if (context != null) {
                 Object[] objArr = new Object[1];
                 Context context2 = getContext();
-                objArr[0] = context2 != null ? StringResourceUtilsKt.getI18nPluralString(context2, 2131755332, stageChannelOngoing.getBlockedUsersOnStage(), Integer.valueOf(stageChannelOngoing.getBlockedUsersOnStage())) : null;
-                charSequence = b.g(context, 2131893442, objArr, null, 4);
+                objArr[0] = context2 != null ? StringResourceUtilsKt.getI18nPluralString(context2, 2131755333, stageChannelOngoing.getBlockedUsersOnStage(), Integer.valueOf(stageChannelOngoing.getBlockedUsersOnStage())) : null;
+                charSequence = b.g(context, 2131893525, objArr, null, 4);
             }
             textView2.setText(charSequence);
             return;
@@ -329,7 +329,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         if (guild != null) {
             charSequence = guild.getName();
         }
-        String l = stageChannelOngoing.getSelectedVoiceChannel().l();
+        String m = stageChannelOngoing.getSelectedVoiceChannel().m();
         Context requireContext = requireContext();
         TextView textView3 = getBinding().i;
         m.checkNotNullExpressionValue(textView3, "binding.indicatorText");
@@ -342,8 +342,8 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
             SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969325, charSequence);
             SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969325, ": ");
         }
-        if (l != null) {
-            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969325, l);
+        if (m != null) {
+            SpannableUtilsKt.appendWithFont(spannableStringBuilder, requireContext, 2130969325, m);
         }
         textView3.setText(spannableStringBuilder);
     }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java
index 3908e7b5c3..348f1bdda8 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorState.java
@@ -10,7 +10,7 @@ import rx.subjects.BehaviorSubject;
 public final class WidgetGlobalStatusIndicatorState {
     public static final Provider Provider = new Provider(null);
     private static final WidgetGlobalStatusIndicatorState callIndicatorState = new WidgetGlobalStatusIndicatorState();
-    private final BehaviorSubject<State> stateSubject = BehaviorSubject.l0();
+    private final BehaviorSubject<State> stateSubject = BehaviorSubject.k0();
 
     /* compiled from: WidgetGlobalStatusIndicatorState.kt */
     public static final class Provider {
@@ -133,28 +133,28 @@ public final class WidgetGlobalStatusIndicatorState {
         if ((i & 1) != 0) {
             BehaviorSubject<State> behaviorSubject = widgetGlobalStatusIndicatorState.stateSubject;
             m.checkNotNullExpressionValue(behaviorSubject, "stateSubject");
-            State o0 = behaviorSubject.o0();
-            z2 = o0 != null ? o0.isVisible() : false;
+            State n0 = behaviorSubject.n0();
+            z2 = n0 != null ? n0.isVisible() : false;
         }
         if ((i & 2) != 0) {
             BehaviorSubject<State> behaviorSubject2 = widgetGlobalStatusIndicatorState.stateSubject;
             m.checkNotNullExpressionValue(behaviorSubject2, "stateSubject");
-            State o02 = behaviorSubject2.o0();
-            z3 = o02 != null ? o02.isCustomBackground() : false;
+            State n02 = behaviorSubject2.n0();
+            z3 = n02 != null ? n02.isCustomBackground() : false;
         }
         if ((i & 4) != 0) {
             BehaviorSubject<State> behaviorSubject3 = widgetGlobalStatusIndicatorState.stateSubject;
             m.checkNotNullExpressionValue(behaviorSubject3, "stateSubject");
-            State o03 = behaviorSubject3.o0();
-            z4 = o03 != null ? o03.isViewingCall() : false;
+            State n03 = behaviorSubject3.n0();
+            z4 = n03 != null ? n03.isViewingCall() : false;
         }
         widgetGlobalStatusIndicatorState.updateState(z2, z3, z4);
     }
 
     public final Observable<State> observeState() {
-        Observable<State> s2 = this.stateSubject.s();
-        m.checkNotNullExpressionValue(s2, "stateSubject.distinctUntilChanged()");
-        return s2;
+        Observable<State> r = this.stateSubject.r();
+        m.checkNotNullExpressionValue(r, "stateSubject.distinctUntilChanged()");
+        return r;
     }
 
     @MainThread
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java
index d38a1e0eed..3c0e0b95e4 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1.java
@@ -74,7 +74,7 @@ public final class WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreSt
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Integer mo1invoke() {
-            Map<Long, StageRoles> channelRoles = this.this$0.$storeStageChannels.getChannelRoles(this.$channel.g());
+            Map<Long, StageRoles> channelRoles = this.this$0.$storeStageChannels.getChannelRoles(this.$channel.h());
             Map<Long, Integer> relationships = this.this$0.$storeUserRelationships.getRelationships();
             LinkedHashMap linkedHashMap = new LinkedHashMap();
             for (Map.Entry<Long, Integer> entry : relationships.entrySet()) {
@@ -138,17 +138,17 @@ public final class WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreSt
             if (r2 != null) {
                 r2 = new WidgetGlobalStatusIndicatorViewModel$sam$rx_functions_Func1$0(r2);
             }
-            return observeState.G((b) r2);
+            return observeState.F((b) r2);
         }
         j jVar = new j(channel);
         Observable<RtcConnection.StateChange> connectionState = this.$storeRtcConnection.getConnectionState();
         Observable<RtcConnection.Quality> quality = this.$storeRtcConnection.getQuality();
-        Observable<Guild> observeGuild = this.$storeGuilds.observeGuild(channel.e());
-        Observable<Map<Long, StoreVoiceParticipants.VoiceUser>> observable = this.$storeVoiceParticipants.get(channel.g());
+        Observable<Guild> observeGuild = this.$storeGuilds.observeGuild(channel.f());
+        Observable<Map<Long, StoreVoiceParticipants.VoiceUser>> observable = this.$storeVoiceParticipants.get(channel.h());
         Observable<StreamContext> forActiveStream = this.$streamContextService.getForActiveStream();
-        Observable<StageRequestToSpeakState> observeMyRequestToSpeakState = this.$storeStageChannels.observeMyRequestToSpeakState(channel.g());
+        Observable<StageRequestToSpeakState> observeMyRequestToSpeakState = this.$storeStageChannels.observeMyRequestToSpeakState(channel.h());
         Observable connectRx$default = ObservationDeck.connectRx$default(this.$observationDeck, new ObservationDeck.UpdateSource[]{this.$storeUserRelationships, this.$storeStageChannels}, false, null, null, new AnonymousClass2(this, channel), 14, null);
-        Observable<StageInstance> observeStageInstanceForChannel = this.$storeStageInstances.observeStageInstanceForChannel(channel.g());
+        Observable<StageInstance> observeStageInstanceForChannel = this.$storeStageInstances.observeStageInstanceForChannel(channel.h());
         AnonymousClass3 r1 = AnonymousClass3.INSTANCE;
         if (r1 != null) {
             r1 = new WidgetGlobalStatusIndicatorViewModel$sam$rx_functions_Func9$0(r1);
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$ackStageInvitationToSpeak$1.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$ackStageInvitationToSpeak$1.java
index abda57ad3a..5c5244533f 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$ackStageInvitationToSpeak$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel$ackStageInvitationToSpeak$1.java
@@ -29,7 +29,7 @@ public final class WidgetGlobalStatusIndicatorViewModel$ackStageInvitationToSpea
 
     public final void invoke(Void r14) {
         if (this.$accept) {
-            AnalyticsTracker.INSTANCE.promotedToSpeaker(this.$stageState.getSelectedVoiceChannel().g());
+            AnalyticsTracker.INSTANCE.promotedToSpeaker(this.$stageState.getSelectedVoiceChannel().h());
         }
         WidgetGlobalStatusIndicatorViewModel.ViewState access$getViewState$p = WidgetGlobalStatusIndicatorViewModel.access$getViewState$p(this.this$0);
         if (!(access$getViewState$p instanceof WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing)) {
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java
index 2154e17b34..85ee9007eb 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicatorViewModel.java
@@ -74,7 +74,7 @@ public final class WidgetGlobalStatusIndicatorViewModel extends AppViewModel<Vie
         }
 
         private final Observable<StoreState> observeStoreState(StreamContextService streamContextService, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreConnectivity storeConnectivity, StoreRtcConnection storeRtcConnection, StoreGuilds storeGuilds, StoreVoiceParticipants storeVoiceParticipants, StoreStageChannels storeStageChannels, StoreUserRelationships storeUserRelationships, StoreStageInstances storeStageInstances, ObservationDeck observationDeck) {
-            return storeVoiceChannelSelected.observeSelectedChannel().Z(new WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1(storeConnectivity, storeRtcConnection, storeGuilds, storeVoiceParticipants, streamContextService, storeStageChannels, observationDeck, storeUserRelationships, storeStageInstances));
+            return storeVoiceChannelSelected.observeSelectedChannel().Y(new WidgetGlobalStatusIndicatorViewModel$Companion$observeStoreState$1(storeConnectivity, storeRtcConnection, storeGuilds, storeVoiceParticipants, streamContextService, storeStageChannels, observationDeck, storeUserRelationships, storeStageInstances));
         }
 
         public static /* synthetic */ Observable observeStoreState$default(Companion companion, StreamContextService streamContextService, StoreVoiceChannelSelected storeVoiceChannelSelected, StoreConnectivity storeConnectivity, StoreRtcConnection storeRtcConnection, StoreGuilds storeGuilds, StoreVoiceParticipants storeVoiceParticipants, StoreStageChannels storeStageChannels, StoreUserRelationships storeUserRelationships, StoreStageInstances storeStageInstances, ObservationDeck observationDeck, int i, Object obj) {
@@ -869,9 +869,9 @@ public final class WidgetGlobalStatusIndicatorViewModel extends AppViewModel<Vie
     public WidgetGlobalStatusIndicatorViewModel(Observable<StoreState> observable) {
         super(ViewState.Inactive.INSTANCE);
         m.checkNotNullParameter(observable, "storeStateObservable");
-        Observable<StoreState> s2 = observable.s();
-        m.checkNotNullExpressionValue(s2, "storeStateObservable\n   …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetGlobalStatusIndicatorViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<StoreState> r = observable.r();
+        m.checkNotNullExpressionValue(r, "storeStateObservable\n   …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetGlobalStatusIndicatorViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -919,7 +919,7 @@ public final class WidgetGlobalStatusIndicatorViewModel extends AppViewModel<Vie
             }
         } else if (storeState instanceof StoreState.CallOngoing) {
             StoreState.CallOngoing callOngoing = (StoreState.CallOngoing) storeState;
-            if (AnimatableValueParser.u1(callOngoing.getSelectedVoiceChannel())) {
+            if (AnimatableValueParser.v1(callOngoing.getSelectedVoiceChannel())) {
                 boolean z4 = callOngoing.getRequestToSpeakState() == StageRequestToSpeakState.REQUESTED_TO_SPEAK_AND_AWAITING_USER_ACK;
                 boolean z5 = callOngoing.getRequestToSpeakState() == StageRequestToSpeakState.ON_STAGE;
                 ViewState viewState = getViewState();
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$observeStoreState$1.java
index 9d4c1cb470..bce2e33283 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$observeStoreState$1.java
@@ -47,6 +47,6 @@ public final class WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$obse
     }
 
     public final Observable<? extends WidgetThreadStatus.WidgetThreadStatusViewModel.StoreState> call(Channel channel) {
-        return Observable.j(this.$storeThreadsActiveJoined.observeActiveJoinedThreadsForGuild(channel.e()), this.$storePermissions.observePermissionsForChannel(channel.g()), new AnonymousClass1(channel)).s();
+        return Observable.j(this.$storeThreadsActiveJoined.observeActiveJoinedThreadsForGuild(channel.f()), this.$storePermissions.observePermissionsForChannel(channel.h()), new AnonymousClass1(channel)).r();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java
index 01a138dbb8..14a0999130 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java
@@ -19,11 +19,11 @@ public final /* synthetic */ class WidgetThreadStatus$binding$2 extends k implem
     public final WidgetThreadStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         ConstraintLayout constraintLayout = (ConstraintLayout) view;
-        int i = 2131365277;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365277);
+        int i = 2131365332;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365332);
         if (loadingButton != null) {
-            i = 2131365278;
-            TextView textView = (TextView) view.findViewById(2131365278);
+            i = 2131365333;
+            TextView textView = (TextView) view.findViewById(2131365333);
             if (textView != null) {
                 return new WidgetThreadStatusBinding((ConstraintLayout) view, constraintLayout, loadingButton, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
index 86fd6a319c..56257edcf5 100644
--- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
+++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java
@@ -144,11 +144,11 @@ public final class WidgetThreadStatus extends AppFragment {
             }
 
             private final Observable<StoreState> observeStoreState(StoreThreadsActiveJoined storeThreadsActiveJoined, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions) {
-                Observable<R> G = storeChannelsSelected.observeSelectedChannel().y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-                m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-                Observable<StoreState> Z = G.Z(new WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$observeStoreState$1(storeThreadsActiveJoined, storePermissions));
-                m.checkNotNullExpressionValue(Z, "storeChannelsSelected.ob…ilChanged()\n            }");
-                return Z;
+                Observable<R> F = storeChannelsSelected.observeSelectedChannel().x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+                Observable<StoreState> Y = F.Y(new WidgetThreadStatus$WidgetThreadStatusViewModel$Companion$observeStoreState$1(storeThreadsActiveJoined, storePermissions));
+                m.checkNotNullExpressionValue(Y, "storeChannelsSelected.ob…ilChanged()\n            }");
+                return Y;
             }
 
             public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreThreadsActiveJoined storeThreadsActiveJoined, StoreChannelsSelected storeChannelsSelected, StorePermissions storePermissions, int i, Object obj) {
@@ -457,7 +457,7 @@ public final class WidgetThreadStatus extends AppFragment {
         public WidgetThreadStatusViewModel(Observable<StoreState> observable) {
             super(null, 1, null);
             m.checkNotNullParameter(observable, "storeStateObservable");
-            this.eventSubject = PublishSubject.l0();
+            this.eventSubject = PublishSubject.k0();
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(observable, this, null, 2, null), WidgetThreadStatusViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         }
 
@@ -490,27 +490,27 @@ public final class WidgetThreadStatus extends AppFragment {
             Map<Long, Map<Long, StoreThreadsActiveJoined.ActiveJoinedThread>> activeJoinedThreads = storeState.getActiveJoinedThreads();
             Channel selectedChannel2 = storeState.getSelectedChannel();
             StoreThreadsActiveJoined.ActiveJoinedThread activeJoinedThread = null;
-            Map<Long, StoreThreadsActiveJoined.ActiveJoinedThread> map = activeJoinedThreads.get(selectedChannel2 != null ? Long.valueOf(selectedChannel2.q()) : null);
+            Map<Long, StoreThreadsActiveJoined.ActiveJoinedThread> map = activeJoinedThreads.get(selectedChannel2 != null ? Long.valueOf(selectedChannel2.r()) : null);
             if (map != null) {
                 Channel selectedChannel3 = storeState.getSelectedChannel();
                 if (selectedChannel3 != null) {
-                    activeJoinedThread = Long.valueOf(selectedChannel3.g());
+                    activeJoinedThread = Long.valueOf(selectedChannel3.h());
                 }
                 activeJoinedThread = map.get(activeJoinedThread);
             }
             boolean z2 = false;
             boolean z3 = activeJoinedThread != null;
-            if (selectedChannel == null || !AnimatableValueParser.y1(selectedChannel)) {
+            if (selectedChannel == null || !AnimatableValueParser.z1(selectedChannel)) {
                 status = Status.Hide.INSTANCE;
             } else if (z3) {
                 status = Status.Hide.INSTANCE;
             } else {
-                ThreadMetadata x2 = selectedChannel.x();
-                if (x2 == null || !x2.b()) {
+                ThreadMetadata y2 = selectedChannel.y();
+                if (y2 == null || !y2.b()) {
                     status = Status.Unjoined.INSTANCE;
                 } else {
-                    ThreadMetadata x3 = selectedChannel.x();
-                    if (x3 != null && x3.d()) {
+                    ThreadMetadata y3 = selectedChannel.y();
+                    if (y3 != null && y3.d()) {
                         z2 = true;
                     }
                     status = new Status.Archived(z2, storeState.getCanArchive());
@@ -540,7 +540,7 @@ public final class WidgetThreadStatus extends AppFragment {
             StoreState storeState = this.currentStoreState;
             if (storeState != null) {
                 if (storeState.getSelectedChannel() != null) {
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().joinThread(storeState.getSelectedChannel().g(), "Banner", new RestAPIParams.EmptyBody()), false, 1, null), WidgetThreadStatusViewModel.class, (Context) null, (Function1) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onJoinTapped$$inlined$let$lambda$1(this), (Function0) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onJoinTapped$$inlined$let$lambda$2(this), WidgetThreadStatus$WidgetThreadStatusViewModel$onJoinTapped$1$2.INSTANCE, 22, (Object) null);
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().joinThread(storeState.getSelectedChannel().h(), "Banner", new RestAPIParams.EmptyBody()), false, 1, null), WidgetThreadStatusViewModel.class, (Context) null, (Function1) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onJoinTapped$$inlined$let$lambda$1(this), (Function0) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onJoinTapped$$inlined$let$lambda$2(this), WidgetThreadStatus$WidgetThreadStatusViewModel$onJoinTapped$1$2.INSTANCE, 22, (Object) null);
                 } else {
                     return;
                 }
@@ -552,7 +552,7 @@ public final class WidgetThreadStatus extends AppFragment {
             StoreState storeState = this.currentStoreState;
             if (storeState != null) {
                 if (storeState.getSelectedChannel() != null) {
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(storeState.getSelectedChannel().g(), new RestAPIParams.ThreadSettings(Boolean.FALSE, null, 2, null)), false, 1, null), WidgetThreadStatusViewModel.class, (Context) null, (Function1) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onUnarchiveTapped$$inlined$let$lambda$1(this), (Function0) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onUnarchiveTapped$$inlined$let$lambda$2(this), WidgetThreadStatus$WidgetThreadStatusViewModel$onUnarchiveTapped$1$2.INSTANCE, 22, (Object) null);
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().editThread(storeState.getSelectedChannel().h(), new RestAPIParams.ThreadSettings(Boolean.FALSE, null, 2, null)), false, 1, null), WidgetThreadStatusViewModel.class, (Context) null, (Function1) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onUnarchiveTapped$$inlined$let$lambda$1(this), (Function0) null, new WidgetThreadStatus$WidgetThreadStatusViewModel$onUnarchiveTapped$$inlined$let$lambda$2(this), WidgetThreadStatus$WidgetThreadStatusViewModel$onUnarchiveTapped$1$2.INSTANCE, 22, (Object) null);
                 } else {
                     return;
                 }
@@ -562,7 +562,7 @@ public final class WidgetThreadStatus extends AppFragment {
     }
 
     public WidgetThreadStatus() {
-        super(2131559252);
+        super(2131559260);
         WidgetThreadStatus$viewModel$2 widgetThreadStatus$viewModel$2 = WidgetThreadStatus$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadStatusViewModel.class), new WidgetThreadStatus$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadStatus$viewModel$2));
@@ -591,13 +591,13 @@ public final class WidgetThreadStatus extends AppFragment {
     private final void handleEvent(Event event) {
         if (event instanceof Event.Error) {
             Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(((Event.Error) event).getCode());
-            c.a.d.o.i(this, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891320, 0, 4);
+            c.a.d.o.i(this, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891391, 0, 4);
         }
     }
 
     @MainThread
     private final void updateView(WidgetThreadStatusViewModel.ViewState viewState) {
-        getBinding().f1976c.setIsLoading(viewState.isLoading());
+        getBinding().f1980c.setIsLoading(viewState.isLoading());
         WidgetThreadStatusViewModel.Status threadStatus = viewState.getThreadStatus();
         int i = 8;
         if (m.areEqual(threadStatus, WidgetThreadStatusViewModel.Status.Hide.INSTANCE)) {
@@ -608,7 +608,7 @@ public final class WidgetThreadStatus extends AppFragment {
             ConstraintLayout constraintLayout2 = getBinding().b;
             m.checkNotNullExpressionValue(constraintLayout2, "binding.threadStatus");
             constraintLayout2.setVisibility(0);
-            LoadingButton loadingButton = getBinding().f1976c;
+            LoadingButton loadingButton = getBinding().f1980c;
             m.checkNotNullExpressionValue(loadingButton, "binding.threadStatusButton");
             WidgetThreadStatusViewModel.Status.Archived archived = (WidgetThreadStatusViewModel.Status.Archived) threadStatus;
             if (archived.getCanArchive()) {
@@ -617,27 +617,27 @@ public final class WidgetThreadStatus extends AppFragment {
             loadingButton.setVisibility(i);
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.threadStatusText");
-            textView.setText(archived.isLocked() ? getResources().getString(2131893876) : getResources().getString(2131893874));
-            getBinding().f1976c.setText(getResources().getString(2131894043));
-            LoadingButton loadingButton2 = getBinding().f1976c;
+            textView.setText(archived.isLocked() ? getResources().getString(2131893974) : getResources().getString(2131893972));
+            getBinding().f1980c.setText(getResources().getString(2131894144));
+            LoadingButton loadingButton2 = getBinding().f1980c;
             m.checkNotNullExpressionValue(loadingButton2, "binding.threadStatusButton");
             loadingButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968892)));
-            getBinding().f1976c.setOnClickListener(new WidgetThreadStatus$updateView$1(this));
+            getBinding().f1980c.setOnClickListener(new WidgetThreadStatus$updateView$1(this));
         } else if (m.areEqual(threadStatus, WidgetThreadStatusViewModel.Status.Unjoined.INSTANCE)) {
             ConstraintLayout constraintLayout3 = getBinding().b;
             m.checkNotNullExpressionValue(constraintLayout3, "binding.threadStatus");
             constraintLayout3.setVisibility(0);
-            LoadingButton loadingButton3 = getBinding().f1976c;
+            LoadingButton loadingButton3 = getBinding().f1980c;
             m.checkNotNullExpressionValue(loadingButton3, "binding.threadStatusButton");
             loadingButton3.setVisibility(0);
             TextView textView2 = getBinding().d;
             m.checkNotNullExpressionValue(textView2, "binding.threadStatusText");
-            textView2.setText(getResources().getString(2131893875));
-            getBinding().f1976c.setText(getResources().getString(2131890642));
-            LoadingButton loadingButton4 = getBinding().f1976c;
+            textView2.setText(getResources().getString(2131893973));
+            getBinding().f1980c.setText(getResources().getString(2131890710));
+            LoadingButton loadingButton4 = getBinding().f1980c;
             m.checkNotNullExpressionValue(loadingButton4, "binding.threadStatusButton");
             loadingButton4.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130969007)));
-            getBinding().f1976c.setOnClickListener(new WidgetThreadStatus$updateView$2(this));
+            getBinding().f1980c.setOnClickListener(new WidgetThreadStatus$updateView$2(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1.java
new file mode 100644
index 0000000000..29556596c8
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1.java
@@ -0,0 +1,21 @@
+package com.discord.widgets.stickers;
+
+import com.discord.api.sticker.Sticker;
+import com.discord.models.guild.Guild;
+import com.discord.stores.StoreGuilds;
+import java.util.concurrent.Callable;
+/* compiled from: GuildStickerSheetViewModel.kt */
+public final class GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1<V> implements Callable<Guild> {
+    public final /* synthetic */ Sticker $sticker;
+    public final /* synthetic */ StoreGuilds $storeGuilds;
+
+    public GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1(StoreGuilds storeGuilds, Sticker sticker) {
+        this.$storeGuilds = storeGuilds;
+        this.$sticker = sticker;
+    }
+
+    @Override // java.util.concurrent.Callable
+    public final Guild call() {
+        return this.$storeGuilds.getGuilds().get(this.$sticker.g());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java
new file mode 100644
index 0000000000..32267310ff
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2.java
@@ -0,0 +1,94 @@
+package com.discord.widgets.stickers;
+
+import com.discord.api.guild.GuildFeature;
+import com.discord.api.sticker.Sticker;
+import com.discord.models.guild.Guild;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.widgets.stickers.GuildStickerSheetViewModel;
+import d0.z.d.m;
+import j0.k.b;
+import j0.l.e.j;
+import retrofit2.HttpException;
+import rx.Observable;
+/* compiled from: GuildStickerSheetViewModel.kt */
+public final class GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2<T, R> implements b<Guild, Observable<? extends GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo>> {
+    public final /* synthetic */ RestAPI $restAPI;
+    public final /* synthetic */ Sticker $sticker;
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2$1  reason: invalid class name */
+    public static final class AnonymousClass1<T, R> implements b<com.discord.api.guild.Guild, Guild> {
+        public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
+
+        public final Guild call(com.discord.api.guild.Guild guild) {
+            m.checkNotNullExpressionValue(guild, "it");
+            return new Guild(guild);
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2$2  reason: invalid class name */
+    public static final class AnonymousClass2<T, R> implements b<Guild, GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo> {
+        public static final AnonymousClass2 INSTANCE = new AnonymousClass2();
+
+        public final GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo call(Guild guild) {
+            m.checkNotNullExpressionValue(guild, "responseGuild");
+            return new GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known(guild, true, true, Integer.valueOf(guild.getApproximatePresenceCount()));
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2$3  reason: invalid class name */
+    public static final class AnonymousClass3<T, R> implements b<Throwable, GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo> {
+        public final /* synthetic */ Guild $localGuild;
+
+        public AnonymousClass3(Guild guild) {
+            this.$localGuild = guild;
+        }
+
+        public final GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo call(Throwable th) {
+            return (!(th instanceof HttpException) || ((HttpException) th).a() != 404) ? GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Unknown.INSTANCE : new GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known(this.$localGuild, false, true, null);
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2$4  reason: invalid class name */
+    public static final class AnonymousClass4<T, R> implements b<com.discord.api.guild.Guild, Guild> {
+        public static final AnonymousClass4 INSTANCE = new AnonymousClass4();
+
+        public final Guild call(com.discord.api.guild.Guild guild) {
+            m.checkNotNullExpressionValue(guild, "it");
+            return new Guild(guild);
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2$5  reason: invalid class name */
+    public static final class AnonymousClass5<T, R> implements b<Guild, GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo> {
+        public static final AnonymousClass5 INSTANCE = new AnonymousClass5();
+
+        public final GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo call(Guild guild) {
+            m.checkNotNullExpressionValue(guild, "responseGuild");
+            return new GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known(guild, true, false, Integer.valueOf(guild.getApproximatePresenceCount()));
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2$6  reason: invalid class name */
+    public static final class AnonymousClass6<T, R> implements b<Throwable, GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo> {
+        public static final AnonymousClass6 INSTANCE = new AnonymousClass6();
+
+        public final GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo call(Throwable th) {
+            return GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Unknown.INSTANCE;
+        }
+    }
+
+    public GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2(RestAPI restAPI, Sticker sticker) {
+        this.$restAPI = restAPI;
+        this.$sticker = sticker;
+    }
+
+    public final Observable<? extends GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo> call(Guild guild) {
+        return guild != null ? guild.getFeatures().contains(GuildFeature.DISCOVERABLE) ? this.$restAPI.getStickerGuild(this.$sticker.getId()).F(AnonymousClass1.INSTANCE).F(AnonymousClass2.INSTANCE).L(new AnonymousClass3(guild)) : new j(new GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known(guild, false, true, null)) : this.$restAPI.getStickerGuild(this.$sticker.getId()).F(AnonymousClass4.INSTANCE).F(AnonymousClass5.INSTANCE).L(AnonymousClass6.INSTANCE);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$observeStoreState$1.java
new file mode 100644
index 0000000000..fa714fadf2
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$Companion$observeStoreState$1.java
@@ -0,0 +1,28 @@
+package com.discord.widgets.stickers;
+
+import com.discord.api.channel.Channel;
+import com.discord.models.guild.Guild;
+import com.discord.models.user.MeUser;
+import com.discord.widgets.stickers.GuildStickerSheetViewModel;
+import d0.z.d.m;
+import java.util.Map;
+import rx.functions.Func4;
+/* compiled from: GuildStickerSheetViewModel.kt */
+public final class GuildStickerSheetViewModel$Companion$observeStoreState$1<T1, T2, T3, T4, R> implements Func4<GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo, MeUser, Channel, Map<Long, ? extends Guild>, GuildStickerSheetViewModel.StoreState> {
+    public static final GuildStickerSheetViewModel$Companion$observeStoreState$1 INSTANCE = new GuildStickerSheetViewModel$Companion$observeStoreState$1();
+
+    public final GuildStickerSheetViewModel.StoreState call(GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo guildStickerGuildInfo, MeUser meUser, Channel channel, Map<Long, Guild> map) {
+        m.checkNotNullExpressionValue(meUser, "meUser");
+        Long valueOf = channel != null ? Long.valueOf(channel.f()) : null;
+        m.checkNotNullExpressionValue(map, "userGuilds");
+        m.checkNotNullExpressionValue(guildStickerGuildInfo, "guildStickerGuildInfo");
+        return new GuildStickerSheetViewModel.StoreState(meUser, valueOf, map, guildStickerGuildInfo);
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */
+    @Override // rx.functions.Func4
+    public /* bridge */ /* synthetic */ GuildStickerSheetViewModel.StoreState call(GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo guildStickerGuildInfo, MeUser meUser, Channel channel, Map<Long, ? extends Guild> map) {
+        return call(guildStickerGuildInfo, meUser, channel, (Map<Long, Guild>) map);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$joinGuild$1.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$joinGuild$1.java
new file mode 100644
index 0000000000..f49651731d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel$joinGuild$1.java
@@ -0,0 +1,31 @@
+package com.discord.widgets.stickers;
+
+import com.discord.api.guild.Guild;
+import com.discord.widgets.stickers.GuildStickerSheetViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: GuildStickerSheetViewModel.kt */
+public final class GuildStickerSheetViewModel$joinGuild$1 extends o implements Function1<Guild, Unit> {
+    public final /* synthetic */ GuildStickerSheetViewModel this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public GuildStickerSheetViewModel$joinGuild$1(GuildStickerSheetViewModel guildStickerSheetViewModel) {
+        super(1);
+        this.this$0 = guildStickerSheetViewModel;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Guild guild) {
+        invoke(guild);
+        return Unit.a;
+    }
+
+    public final void invoke(Guild guild) {
+        m.checkNotNullParameter(guild, "it");
+        GuildStickerSheetViewModel.access$updateViewState(this.this$0, GuildStickerSheetViewModel.ViewState.Dismiss.INSTANCE);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java
new file mode 100644
index 0000000000..381ae1926d
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/GuildStickerSheetViewModel.java
@@ -0,0 +1,548 @@
+package com.discord.widgets.stickers;
+
+import android.content.Context;
+import androidx.annotation.MainThread;
+import c.d.b.a.a;
+import com.discord.api.premium.PremiumTier;
+import com.discord.api.sticker.Sticker;
+import com.discord.app.AppViewModel;
+import com.discord.models.guild.Guild;
+import com.discord.models.user.MeUser;
+import com.discord.stores.StoreChannelsSelected;
+import com.discord.stores.StoreGuilds;
+import com.discord.stores.StoreStream;
+import com.discord.stores.StoreUser;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.Map;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import rx.Observable;
+/* compiled from: GuildStickerSheetViewModel.kt */
+public final class GuildStickerSheetViewModel extends AppViewModel<ViewState> {
+    public static final Companion Companion = new Companion(null);
+    private final RestAPI restAPI;
+    private final Sticker sticker;
+    private final StoreUser storeUser;
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    /* renamed from: com.discord.widgets.stickers.GuildStickerSheetViewModel$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends o implements Function1<StoreState, Unit> {
+        public final /* synthetic */ GuildStickerSheetViewModel this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(GuildStickerSheetViewModel guildStickerSheetViewModel) {
+            super(1);
+            this.this$0 = guildStickerSheetViewModel;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(StoreState storeState) {
+            invoke(storeState);
+            return Unit.a;
+        }
+
+        public final void invoke(StoreState storeState) {
+            m.checkNotNullParameter(storeState, "storeState");
+            GuildStickerSheetViewModel.access$handleStoreState(this.this$0, storeState);
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    public static final class Companion {
+
+        /* compiled from: GuildStickerSheetViewModel.kt */
+        public static abstract class GuildStickerGuildInfo {
+
+            /* compiled from: GuildStickerSheetViewModel.kt */
+            public static final class Known extends GuildStickerGuildInfo {
+                private final Integer approximateOnline;
+                private final Guild guild;
+                private final boolean isPublic;
+                private final boolean isUserInGuild;
+
+                /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+                public Known(Guild guild, boolean z2, boolean z3, Integer num) {
+                    super(null);
+                    m.checkNotNullParameter(guild, "guild");
+                    this.guild = guild;
+                    this.isPublic = z2;
+                    this.isUserInGuild = z3;
+                    this.approximateOnline = num;
+                }
+
+                public static /* synthetic */ Known copy$default(Known known, Guild guild, boolean z2, boolean z3, Integer num, int i, Object obj) {
+                    if ((i & 1) != 0) {
+                        guild = known.guild;
+                    }
+                    if ((i & 2) != 0) {
+                        z2 = known.isPublic();
+                    }
+                    if ((i & 4) != 0) {
+                        z3 = known.isUserInGuild();
+                    }
+                    if ((i & 8) != 0) {
+                        num = known.approximateOnline;
+                    }
+                    return known.copy(guild, z2, z3, num);
+                }
+
+                public final Guild component1() {
+                    return this.guild;
+                }
+
+                public final boolean component2() {
+                    return isPublic();
+                }
+
+                public final boolean component3() {
+                    return isUserInGuild();
+                }
+
+                public final Integer component4() {
+                    return this.approximateOnline;
+                }
+
+                public final Known copy(Guild guild, boolean z2, boolean z3, Integer num) {
+                    m.checkNotNullParameter(guild, "guild");
+                    return new Known(guild, z2, z3, num);
+                }
+
+                public boolean equals(Object obj) {
+                    if (this == obj) {
+                        return true;
+                    }
+                    if (!(obj instanceof Known)) {
+                        return false;
+                    }
+                    Known known = (Known) obj;
+                    return m.areEqual(this.guild, known.guild) && isPublic() == known.isPublic() && isUserInGuild() == known.isUserInGuild() && m.areEqual(this.approximateOnline, known.approximateOnline);
+                }
+
+                public final Integer getApproximateOnline() {
+                    return this.approximateOnline;
+                }
+
+                public final Guild getGuild() {
+                    return this.guild;
+                }
+
+                /* JADX WARN: Multi-variable type inference failed */
+                /* JADX WARNING: Unknown variable types count: 1 */
+                public int hashCode() {
+                    Guild guild = this.guild;
+                    int i = 0;
+                    int hashCode = (guild != null ? guild.hashCode() : 0) * 31;
+                    boolean isPublic = isPublic();
+                    ?? r3 = 1;
+                    if (isPublic) {
+                        isPublic = true;
+                    }
+                    int i2 = isPublic ? 1 : 0;
+                    int i3 = isPublic ? 1 : 0;
+                    int i4 = isPublic ? 1 : 0;
+                    int i5 = (hashCode + i2) * 31;
+                    boolean isUserInGuild = isUserInGuild();
+                    if (!isUserInGuild) {
+                        r3 = isUserInGuild;
+                    }
+                    int i6 = (i5 + (r3 == true ? 1 : 0)) * 31;
+                    Integer num = this.approximateOnline;
+                    if (num != null) {
+                        i = num.hashCode();
+                    }
+                    return i6 + i;
+                }
+
+                @Override // com.discord.widgets.stickers.GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo
+                public boolean isPublic() {
+                    return this.isPublic;
+                }
+
+                @Override // com.discord.widgets.stickers.GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo
+                public boolean isUserInGuild() {
+                    return this.isUserInGuild;
+                }
+
+                public String toString() {
+                    StringBuilder L = a.L("Known(guild=");
+                    L.append(this.guild);
+                    L.append(", isPublic=");
+                    L.append(isPublic());
+                    L.append(", isUserInGuild=");
+                    L.append(isUserInGuild());
+                    L.append(", approximateOnline=");
+                    return a.B(L, this.approximateOnline, ")");
+                }
+            }
+
+            /* compiled from: GuildStickerSheetViewModel.kt */
+            public static final class Unknown extends GuildStickerGuildInfo {
+                public static final Unknown INSTANCE = new Unknown();
+                private static final boolean isPublic = false;
+                private static final boolean isUserInGuild = false;
+
+                private Unknown() {
+                    super(null);
+                }
+
+                @Override // com.discord.widgets.stickers.GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo
+                public boolean isPublic() {
+                    return isPublic;
+                }
+
+                @Override // com.discord.widgets.stickers.GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo
+                public boolean isUserInGuild() {
+                    return isUserInGuild;
+                }
+            }
+
+            private GuildStickerGuildInfo() {
+            }
+
+            public /* synthetic */ GuildStickerGuildInfo(DefaultConstructorMarker defaultConstructorMarker) {
+                this();
+            }
+
+            public abstract boolean isPublic();
+
+            public abstract boolean isUserInGuild();
+        }
+
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, RestAPI restAPI, Sticker sticker, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreGuilds storeGuilds) {
+            return companion.observeStoreState(restAPI, sticker, storeUser, storeChannelsSelected, storeGuilds);
+        }
+
+        private final Observable<GuildStickerGuildInfo> getGuildForGuildSticker(RestAPI restAPI, Sticker sticker, StoreGuilds storeGuilds) {
+            Observable<GuildStickerGuildInfo> z2 = Observable.C(new GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$1(storeGuilds, sticker)).z(new GuildStickerSheetViewModel$Companion$getGuildForGuildSticker$2(restAPI, sticker));
+            m.checkNotNullExpressionValue(z2, "Observable.fromCallable …      }\n        }\n      }");
+            return z2;
+        }
+
+        private final Observable<StoreState> observeStoreState(RestAPI restAPI, Sticker sticker, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreGuilds storeGuilds) {
+            Observable<StoreState> h = Observable.h(getGuildForGuildSticker(restAPI, sticker, storeGuilds), StoreUser.observeMe$default(storeUser, false, 1, null), storeChannelsSelected.observeSelectedChannel(), storeGuilds.observeGuilds(), GuildStickerSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(h, "Observable.combineLatest…erGuildInfo\n      )\n    }");
+            return h;
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    public static final class StoreState {
+        private final Long currentGuildId;
+        private final Companion.GuildStickerGuildInfo guildStickerGuildInfo;
+        private final MeUser meUser;
+        private final Map<Long, Guild> userGuilds;
+
+        public StoreState(MeUser meUser, Long l, Map<Long, Guild> map, Companion.GuildStickerGuildInfo guildStickerGuildInfo) {
+            m.checkNotNullParameter(meUser, "meUser");
+            m.checkNotNullParameter(map, "userGuilds");
+            m.checkNotNullParameter(guildStickerGuildInfo, "guildStickerGuildInfo");
+            this.meUser = meUser;
+            this.currentGuildId = l;
+            this.userGuilds = map;
+            this.guildStickerGuildInfo = guildStickerGuildInfo;
+        }
+
+        /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.stickers.GuildStickerSheetViewModel$StoreState */
+        /* JADX WARN: Multi-variable type inference failed */
+        public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, Long l, Map map, Companion.GuildStickerGuildInfo guildStickerGuildInfo, int i, Object obj) {
+            if ((i & 1) != 0) {
+                meUser = storeState.meUser;
+            }
+            if ((i & 2) != 0) {
+                l = storeState.currentGuildId;
+            }
+            if ((i & 4) != 0) {
+                map = storeState.userGuilds;
+            }
+            if ((i & 8) != 0) {
+                guildStickerGuildInfo = storeState.guildStickerGuildInfo;
+            }
+            return storeState.copy(meUser, l, map, guildStickerGuildInfo);
+        }
+
+        public final MeUser component1() {
+            return this.meUser;
+        }
+
+        public final Long component2() {
+            return this.currentGuildId;
+        }
+
+        public final Map<Long, Guild> component3() {
+            return this.userGuilds;
+        }
+
+        public final Companion.GuildStickerGuildInfo component4() {
+            return this.guildStickerGuildInfo;
+        }
+
+        public final StoreState copy(MeUser meUser, Long l, Map<Long, Guild> map, Companion.GuildStickerGuildInfo guildStickerGuildInfo) {
+            m.checkNotNullParameter(meUser, "meUser");
+            m.checkNotNullParameter(map, "userGuilds");
+            m.checkNotNullParameter(guildStickerGuildInfo, "guildStickerGuildInfo");
+            return new StoreState(meUser, l, map, guildStickerGuildInfo);
+        }
+
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof StoreState)) {
+                return false;
+            }
+            StoreState storeState = (StoreState) obj;
+            return m.areEqual(this.meUser, storeState.meUser) && m.areEqual(this.currentGuildId, storeState.currentGuildId) && m.areEqual(this.userGuilds, storeState.userGuilds) && m.areEqual(this.guildStickerGuildInfo, storeState.guildStickerGuildInfo);
+        }
+
+        public final Long getCurrentGuildId() {
+            return this.currentGuildId;
+        }
+
+        public final Companion.GuildStickerGuildInfo getGuildStickerGuildInfo() {
+            return this.guildStickerGuildInfo;
+        }
+
+        public final MeUser getMeUser() {
+            return this.meUser;
+        }
+
+        public final Map<Long, Guild> getUserGuilds() {
+            return this.userGuilds;
+        }
+
+        public int hashCode() {
+            MeUser meUser = this.meUser;
+            int i = 0;
+            int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
+            Long l = this.currentGuildId;
+            int hashCode2 = (hashCode + (l != null ? l.hashCode() : 0)) * 31;
+            Map<Long, Guild> map = this.userGuilds;
+            int hashCode3 = (hashCode2 + (map != null ? map.hashCode() : 0)) * 31;
+            Companion.GuildStickerGuildInfo guildStickerGuildInfo = this.guildStickerGuildInfo;
+            if (guildStickerGuildInfo != null) {
+                i = guildStickerGuildInfo.hashCode();
+            }
+            return hashCode3 + i;
+        }
+
+        public String toString() {
+            StringBuilder L = a.L("StoreState(meUser=");
+            L.append(this.meUser);
+            L.append(", currentGuildId=");
+            L.append(this.currentGuildId);
+            L.append(", userGuilds=");
+            L.append(this.userGuilds);
+            L.append(", guildStickerGuildInfo=");
+            L.append(this.guildStickerGuildInfo);
+            L.append(")");
+            return L.toString();
+        }
+    }
+
+    /* compiled from: GuildStickerSheetViewModel.kt */
+    public static abstract class ViewState {
+
+        /* compiled from: GuildStickerSheetViewModel.kt */
+        public static final class Dismiss extends ViewState {
+            public static final Dismiss INSTANCE = new Dismiss();
+
+            private Dismiss() {
+                super(null);
+            }
+        }
+
+        /* compiled from: GuildStickerSheetViewModel.kt */
+        public static final class Loaded extends ViewState {
+            private final Companion.GuildStickerGuildInfo guildStickerGuildInfo;
+            private final boolean isCurrentGuild;
+            private final boolean isUserPremium;
+            private final Sticker sticker;
+
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public Loaded(Sticker sticker, boolean z2, boolean z3, Companion.GuildStickerGuildInfo guildStickerGuildInfo) {
+                super(null);
+                m.checkNotNullParameter(sticker, "sticker");
+                m.checkNotNullParameter(guildStickerGuildInfo, "guildStickerGuildInfo");
+                this.sticker = sticker;
+                this.isUserPremium = z2;
+                this.isCurrentGuild = z3;
+                this.guildStickerGuildInfo = guildStickerGuildInfo;
+            }
+
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, Sticker sticker, boolean z2, boolean z3, Companion.GuildStickerGuildInfo guildStickerGuildInfo, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    sticker = loaded.sticker;
+                }
+                if ((i & 2) != 0) {
+                    z2 = loaded.isUserPremium;
+                }
+                if ((i & 4) != 0) {
+                    z3 = loaded.isCurrentGuild;
+                }
+                if ((i & 8) != 0) {
+                    guildStickerGuildInfo = loaded.guildStickerGuildInfo;
+                }
+                return loaded.copy(sticker, z2, z3, guildStickerGuildInfo);
+            }
+
+            public final Sticker component1() {
+                return this.sticker;
+            }
+
+            public final boolean component2() {
+                return this.isUserPremium;
+            }
+
+            public final boolean component3() {
+                return this.isCurrentGuild;
+            }
+
+            public final Companion.GuildStickerGuildInfo component4() {
+                return this.guildStickerGuildInfo;
+            }
+
+            public final Loaded copy(Sticker sticker, boolean z2, boolean z3, Companion.GuildStickerGuildInfo guildStickerGuildInfo) {
+                m.checkNotNullParameter(sticker, "sticker");
+                m.checkNotNullParameter(guildStickerGuildInfo, "guildStickerGuildInfo");
+                return new Loaded(sticker, z2, z3, guildStickerGuildInfo);
+            }
+
+            public boolean equals(Object obj) {
+                if (this == obj) {
+                    return true;
+                }
+                if (!(obj instanceof Loaded)) {
+                    return false;
+                }
+                Loaded loaded = (Loaded) obj;
+                return m.areEqual(this.sticker, loaded.sticker) && this.isUserPremium == loaded.isUserPremium && this.isCurrentGuild == loaded.isCurrentGuild && m.areEqual(this.guildStickerGuildInfo, loaded.guildStickerGuildInfo);
+            }
+
+            public final Companion.GuildStickerGuildInfo getGuildStickerGuildInfo() {
+                return this.guildStickerGuildInfo;
+            }
+
+            public final Sticker getSticker() {
+                return this.sticker;
+            }
+
+            public int hashCode() {
+                Sticker sticker = this.sticker;
+                int i = 0;
+                int hashCode = (sticker != null ? sticker.hashCode() : 0) * 31;
+                boolean z2 = this.isUserPremium;
+                int i2 = 1;
+                if (z2) {
+                    z2 = true;
+                }
+                int i3 = z2 ? 1 : 0;
+                int i4 = z2 ? 1 : 0;
+                int i5 = z2 ? 1 : 0;
+                int i6 = (hashCode + i3) * 31;
+                boolean z3 = this.isCurrentGuild;
+                if (!z3) {
+                    i2 = z3 ? 1 : 0;
+                }
+                int i7 = (i6 + i2) * 31;
+                Companion.GuildStickerGuildInfo guildStickerGuildInfo = this.guildStickerGuildInfo;
+                if (guildStickerGuildInfo != null) {
+                    i = guildStickerGuildInfo.hashCode();
+                }
+                return i7 + i;
+            }
+
+            public final boolean isCurrentGuild() {
+                return this.isCurrentGuild;
+            }
+
+            public final boolean isUserPremium() {
+                return this.isUserPremium;
+            }
+
+            public String toString() {
+                StringBuilder L = a.L("Loaded(sticker=");
+                L.append(this.sticker);
+                L.append(", isUserPremium=");
+                L.append(this.isUserPremium);
+                L.append(", isCurrentGuild=");
+                L.append(this.isCurrentGuild);
+                L.append(", guildStickerGuildInfo=");
+                L.append(this.guildStickerGuildInfo);
+                L.append(")");
+                return L.toString();
+            }
+        }
+
+        /* compiled from: GuildStickerSheetViewModel.kt */
+        public static final class Loading extends ViewState {
+            public static final Loading INSTANCE = new Loading();
+
+            private Loading() {
+                super(null);
+            }
+        }
+
+        private ViewState() {
+        }
+
+        public /* synthetic */ ViewState(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+    }
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public GuildStickerSheetViewModel(Sticker sticker, RestAPI restAPI, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreGuilds storeGuilds, Observable<StoreState> observable) {
+        super(ViewState.Loading.INSTANCE);
+        m.checkNotNullParameter(sticker, "sticker");
+        m.checkNotNullParameter(restAPI, "restAPI");
+        m.checkNotNullParameter(storeUser, "storeUser");
+        m.checkNotNullParameter(storeChannelsSelected, "storeChannelsSelected");
+        m.checkNotNullParameter(storeGuilds, "storeGuilds");
+        m.checkNotNullParameter(observable, "storeStateObservable");
+        this.sticker = sticker;
+        this.restAPI = restAPI;
+        this.storeUser = storeUser;
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), GuildStickerSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+    }
+
+    /* JADX WARNING: Illegal instructions before constructor call */
+    public /* synthetic */ GuildStickerSheetViewModel(Sticker sticker, RestAPI restAPI, StoreUser storeUser, StoreChannelsSelected storeChannelsSelected, StoreGuilds storeGuilds, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        this(sticker, restAPI, storeUser, storeChannelsSelected, storeGuilds, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, restAPI, sticker, storeUser, storeChannelsSelected, storeGuilds) : observable);
+        restAPI = (i & 2) != 0 ? RestAPI.Companion.getApi() : restAPI;
+        storeUser = (i & 4) != 0 ? StoreStream.Companion.getUsers() : storeUser;
+        storeChannelsSelected = (i & 8) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected;
+        storeGuilds = (i & 16) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds;
+    }
+
+    public static final /* synthetic */ void access$handleStoreState(GuildStickerSheetViewModel guildStickerSheetViewModel, StoreState storeState) {
+        guildStickerSheetViewModel.handleStoreState(storeState);
+    }
+
+    public static final /* synthetic */ void access$updateViewState(GuildStickerSheetViewModel guildStickerSheetViewModel, ViewState viewState) {
+        guildStickerSheetViewModel.updateViewState(viewState);
+    }
+
+    @MainThread
+    private final void handleStoreState(StoreState storeState) {
+        updateViewState(new ViewState.Loaded(this.sticker, storeState.getMeUser().getPremiumTier() == PremiumTier.TIER_2, m.areEqual(storeState.getCurrentGuildId(), this.sticker.g()), storeState.getGuildStickerGuildInfo()));
+    }
+
+    public final void joinGuild(Guild guild) {
+        m.checkNotNullParameter(guild, "guild");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.joinGuild(guild.getId(), false, null), false, 1, null)), GuildStickerSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new GuildStickerSheetViewModel$joinGuild$1(this), 62, (Object) null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java b/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java
index c78ba5e1e1..09909d6608 100644
--- a/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java
@@ -73,9 +73,9 @@ public final class StickerSheetViewModel extends AppViewModel<ViewState> {
         }
 
         private final Observable<StoreState> observeStoreState(StoreStickers storeStickers, StoreUser storeUser, Sticker sticker) {
-            Long h = sticker.h();
-            m.checkNotNull(h);
-            Observable<StoreState> j = Observable.j(storeStickers.observeStickerPack(h.longValue()), StoreUser.observeMe$default(storeUser, false, 1, null), StickerSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            Long i = sticker.i();
+            m.checkNotNull(i);
+            Observable<StoreState> j = Observable.j(storeStickers.observeStickerPack(i.longValue()), StoreUser.observeMe$default(storeUser, false, 1, null), StickerSheetViewModel$Companion$observeStoreState$1.INSTANCE);
             m.checkNotNullExpressionValue(j, "Observable.combineLatest…ser\n          )\n        }");
             return j;
         }
@@ -305,9 +305,9 @@ public final class StickerSheetViewModel extends AppViewModel<ViewState> {
 
     private final void fetchStickersData() {
         StoreStickers storeStickers = this.storeStickers;
-        Long h = this.sticker.h();
-        m.checkNotNull(h);
-        storeStickers.fetchStickerPack(h.longValue());
+        Long i = this.sticker.i();
+        m.checkNotNull(i);
+        storeStickers.fetchStickerPack(i.longValue());
         this.storeStickers.fetchEnabledStickerDirectory();
     }
 
@@ -322,9 +322,9 @@ public final class StickerSheetViewModel extends AppViewModel<ViewState> {
         if (!this.hasFiredAnalytics && this.location != null) {
             StickerPurchaseLocation popoutPurchaseLocation = StickerPurchaseLocation.Companion.getPopoutPurchaseLocation(stickerPack2.canBePurchased());
             AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-            Long h = this.sticker.h();
-            m.checkNotNull(h);
-            analyticsTracker.stickerPopoutOpened(h.longValue(), this.location, new Traits.Location(null, popoutPurchaseLocation.getAnalyticsValue(), null, null, null, 29, null));
+            Long i = this.sticker.i();
+            m.checkNotNull(i);
+            analyticsTracker.stickerPopoutOpened(i.longValue(), this.location, new Traits.Location(null, popoutPurchaseLocation.getAnalyticsValue(), null, null, null, 29, null));
             this.hasFiredAnalytics = true;
         }
         Sticker sticker = this.sticker;
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$appViewModels$$inlined$viewModels$1.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$appViewModels$$inlined$viewModels$1.java
new file mode 100644
index 0000000000..6e42eb5e98
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$appViewModels$$inlined$viewModels$1.java
@@ -0,0 +1,25 @@
+package com.discord.widgets.stickers;
+
+import androidx.lifecycle.ViewModelStore;
+import androidx.lifecycle.ViewModelStoreOwner;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: FragmentViewModelLazy.kt */
+public final class WidgetGuildStickerSheet$appViewModels$$inlined$viewModels$1 extends o implements Function0<ViewModelStore> {
+    public final /* synthetic */ Function0 $ownerProducer;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetGuildStickerSheet$appViewModels$$inlined$viewModels$1(Function0 function0) {
+        super(0);
+        this.$ownerProducer = function0;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final ViewModelStore mo1invoke() {
+        ViewModelStore viewModelStore = ((ViewModelStoreOwner) this.$ownerProducer.mo1invoke()).getViewModelStore();
+        m.checkNotNullExpressionValue(viewModelStore, "ownerProducer().viewModelStore");
+        return viewModelStore;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$bindSubscriptions$1.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$bindSubscriptions$1.java
new file mode 100644
index 0000000000..b346fbc536
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$bindSubscriptions$1.java
@@ -0,0 +1,35 @@
+package com.discord.widgets.stickers;
+
+import com.discord.widgets.stickers.GuildStickerSheetViewModel;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetGuildStickerSheet.kt */
+public final class WidgetGuildStickerSheet$bindSubscriptions$1 extends o implements Function1<GuildStickerSheetViewModel.ViewState, Unit> {
+    public final /* synthetic */ WidgetGuildStickerSheet this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetGuildStickerSheet$bindSubscriptions$1(WidgetGuildStickerSheet widgetGuildStickerSheet) {
+        super(1);
+        this.this$0 = widgetGuildStickerSheet;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(GuildStickerSheetViewModel.ViewState viewState) {
+        invoke(viewState);
+        return Unit.a;
+    }
+
+    public final void invoke(GuildStickerSheetViewModel.ViewState viewState) {
+        if (m.areEqual(viewState, GuildStickerSheetViewModel.ViewState.Loading.INSTANCE)) {
+            WidgetGuildStickerSheet.access$showLoading(this.this$0);
+        } else if (m.areEqual(viewState, GuildStickerSheetViewModel.ViewState.Dismiss.INSTANCE)) {
+            this.this$0.dismiss();
+        } else if (viewState instanceof GuildStickerSheetViewModel.ViewState.Loaded) {
+            WidgetGuildStickerSheet.access$configureUI(this.this$0, (GuildStickerSheetViewModel.ViewState.Loaded) viewState);
+        }
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java
new file mode 100644
index 0000000000..64fb986320
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$binding$2.java
@@ -0,0 +1,85 @@
+package com.discord.widgets.stickers;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.discord.app.AppViewFlipper;
+import com.discord.databinding.WidgetGuildStickerSheetBinding;
+import com.discord.views.sticker.StickerView;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetGuildStickerSheet.kt */
+public final /* synthetic */ class WidgetGuildStickerSheet$binding$2 extends k implements Function1<View, WidgetGuildStickerSheetBinding> {
+    public static final WidgetGuildStickerSheet$binding$2 INSTANCE = new WidgetGuildStickerSheet$binding$2();
+
+    public WidgetGuildStickerSheet$binding$2() {
+        super(1, WidgetGuildStickerSheetBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetGuildStickerSheetBinding;", 0);
+    }
+
+    public final WidgetGuildStickerSheetBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = 2131362964;
+        View findViewById = view.findViewById(2131362964);
+        if (findViewById != null) {
+            i = 2131363475;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363475);
+            if (frameLayout != null) {
+                i = 2131363476;
+                TextView textView = (TextView) view.findViewById(2131363476);
+                if (textView != null) {
+                    AppViewFlipper appViewFlipper = (AppViewFlipper) view;
+                    i = 2131363478;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363478);
+                    if (linearLayout != null) {
+                        i = 2131363479;
+                        TextView textView2 = (TextView) view.findViewById(2131363479);
+                        if (textView2 != null) {
+                            i = 2131363480;
+                            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363480);
+                            if (simpleDraweeView != null) {
+                                i = 2131363481;
+                                TextView textView3 = (TextView) view.findViewById(2131363481);
+                                if (textView3 != null) {
+                                    i = 2131363482;
+                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363482);
+                                    if (frameLayout2 != null) {
+                                        i = 2131363483;
+                                        TextView textView4 = (TextView) view.findViewById(2131363483);
+                                        if (textView4 != null) {
+                                            i = 2131363484;
+                                            TextView textView5 = (TextView) view.findViewById(2131363484);
+                                            if (textView5 != null) {
+                                                i = 2131363485;
+                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363485);
+                                                if (materialButton != null) {
+                                                    i = 2131363486;
+                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363486);
+                                                    if (materialButton2 != null) {
+                                                        i = 2131363487;
+                                                        StickerView stickerView = (StickerView) view.findViewById(2131363487);
+                                                        if (stickerView != null) {
+                                                            i = 2131363488;
+                                                            TextView textView6 = (TextView) view.findViewById(2131363488);
+                                                            if (textView6 != null) {
+                                                                return new WidgetGuildStickerSheetBinding(appViewFlipper, findViewById, frameLayout, textView, appViewFlipper, linearLayout, textView2, simpleDraweeView, textView3, frameLayout2, textView4, textView5, materialButton, materialButton2, stickerView, textView6);
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java
new file mode 100644
index 0000000000..4b10e50578
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1.java
@@ -0,0 +1,30 @@
+package com.discord.widgets.stickers;
+
+import android.content.Context;
+import android.view.View;
+import com.discord.models.guild.Guild;
+import com.discord.widgets.settings.premium.WidgetSettingsPremium;
+import d0.z.d.m;
+/* compiled from: WidgetGuildStickerSheet.kt */
+public final class WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1 implements View.OnClickListener {
+    public final /* synthetic */ Guild $guild$inlined;
+    public final /* synthetic */ boolean $isUserInGuild$inlined;
+    public final /* synthetic */ boolean $isUserPremium$inlined;
+    public final /* synthetic */ WidgetGuildStickerSheet this$0;
+
+    public WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1(WidgetGuildStickerSheet widgetGuildStickerSheet, Guild guild, boolean z2, boolean z3) {
+        this.this$0 = widgetGuildStickerSheet;
+        this.$guild$inlined = guild;
+        this.$isUserPremium$inlined = z2;
+        this.$isUserInGuild$inlined = z3;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        this.this$0.dismiss();
+        WidgetSettingsPremium.Companion companion = WidgetSettingsPremium.Companion;
+        Context requireContext = this.this$0.requireContext();
+        m.checkNotNullExpressionValue(requireContext, "requireContext()");
+        WidgetSettingsPremium.Companion.launch$default(companion, requireContext, null, "Sticker Upsell Popout", 2, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$2.java
new file mode 100644
index 0000000000..5b1a2e0067
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$2.java
@@ -0,0 +1,23 @@
+package com.discord.widgets.stickers;
+
+import android.view.View;
+import com.discord.models.guild.Guild;
+/* compiled from: WidgetGuildStickerSheet.kt */
+public final class WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$2 implements View.OnClickListener {
+    public final /* synthetic */ Guild $guild$inlined;
+    public final /* synthetic */ boolean $isUserInGuild$inlined;
+    public final /* synthetic */ boolean $isUserPremium$inlined;
+    public final /* synthetic */ WidgetGuildStickerSheet this$0;
+
+    public WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$2(WidgetGuildStickerSheet widgetGuildStickerSheet, Guild guild, boolean z2, boolean z3) {
+        this.this$0 = widgetGuildStickerSheet;
+        this.$guild$inlined = guild;
+        this.$isUserPremium$inlined = z2;
+        this.$isUserInGuild$inlined = z3;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        WidgetGuildStickerSheet.access$getViewModel$p(this.this$0).joinGuild(this.$guild$inlined);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$viewModel$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$viewModel$2.java
new file mode 100644
index 0000000000..c00808eee7
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet$viewModel$2.java
@@ -0,0 +1,27 @@
+package com.discord.widgets.stickers;
+
+import com.discord.api.sticker.Sticker;
+import com.discord.app.AppViewModel;
+import com.discord.widgets.stickers.GuildStickerSheetViewModel;
+import d0.z.d.o;
+import java.io.Serializable;
+import java.util.Objects;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetGuildStickerSheet.kt */
+public final class WidgetGuildStickerSheet$viewModel$2 extends o implements Function0<AppViewModel<GuildStickerSheetViewModel.ViewState>> {
+    public final /* synthetic */ WidgetGuildStickerSheet this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetGuildStickerSheet$viewModel$2(WidgetGuildStickerSheet widgetGuildStickerSheet) {
+        super(0);
+        this.this$0 = widgetGuildStickerSheet;
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final AppViewModel<GuildStickerSheetViewModel.ViewState> mo1invoke() {
+        Serializable serializable = WidgetGuildStickerSheet.access$getArgumentsOrDefault$p(this.this$0).getSerializable("com.discord.intent.extra.EXTRA_STICKER");
+        Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.api.sticker.Sticker");
+        return new GuildStickerSheetViewModel((Sticker) serializable, null, null, null, null, null, 62, null);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java
new file mode 100644
index 0000000000..e7479054c9
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java
@@ -0,0 +1,260 @@
+package com.discord.widgets.stickers;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentViewModelLazyKt;
+import c.a.d.h0;
+import c.a.d.j0;
+import c.a.l.b;
+import c.d.b.a.a;
+import com.discord.api.guild.GuildFeature;
+import com.discord.api.sticker.Sticker;
+import com.discord.api.sticker.StickerType;
+import com.discord.app.AppBottomSheet;
+import com.discord.app.AppViewFlipper;
+import com.discord.databinding.WidgetGuildStickerSheetBinding;
+import com.discord.models.guild.Guild;
+import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.drawable.DrawableCompat;
+import com.discord.utilities.icon.IconUtils;
+import com.discord.utilities.images.MGImages;
+import com.discord.utilities.locale.LocaleManager;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.discord.widgets.stickers.GuildStickerSheetViewModel;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
+import d0.z.d.a0;
+import d0.z.d.m;
+import java.text.NumberFormat;
+import kotlin.Lazy;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+import rx.Observable;
+import rx.subscriptions.CompositeSubscription;
+/* compiled from: WidgetGuildStickerSheet.kt */
+public final class WidgetGuildStickerSheet extends AppBottomSheet {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetGuildStickerSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetGuildStickerSheetBinding;", 0)};
+    public static final Companion Companion = new Companion(null);
+    private static final int VIEW_CONTENT = 0;
+    private static final int VIEW_LOADING = 1;
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGuildStickerSheet$binding$2.INSTANCE, null, 2, null);
+    private final Lazy viewModel$delegate;
+
+    /* compiled from: WidgetGuildStickerSheet.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void show(FragmentManager fragmentManager, Sticker sticker) {
+            m.checkNotNullParameter(fragmentManager, "fragmentManager");
+            m.checkNotNullParameter(sticker, "sticker");
+            if (sticker.k() == StickerType.GUILD) {
+                WidgetGuildStickerSheet widgetGuildStickerSheet = new WidgetGuildStickerSheet();
+                Bundle bundle = new Bundle();
+                bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", sticker);
+                widgetGuildStickerSheet.setArguments(bundle);
+                widgetGuildStickerSheet.show(fragmentManager, WidgetGuildStickerSheet.class.getName());
+            }
+        }
+    }
+
+    public WidgetGuildStickerSheet() {
+        super(false, 1, null);
+        WidgetGuildStickerSheet$viewModel$2 widgetGuildStickerSheet$viewModel$2 = new WidgetGuildStickerSheet$viewModel$2(this);
+        h0 h0Var = new h0(this);
+        this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildStickerSheetViewModel.class), new WidgetGuildStickerSheet$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildStickerSheet$viewModel$2));
+    }
+
+    public static final /* synthetic */ void access$configureUI(WidgetGuildStickerSheet widgetGuildStickerSheet, GuildStickerSheetViewModel.ViewState.Loaded loaded) {
+        widgetGuildStickerSheet.configureUI(loaded);
+    }
+
+    public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(WidgetGuildStickerSheet widgetGuildStickerSheet) {
+        return widgetGuildStickerSheet.getArgumentsOrDefault();
+    }
+
+    public static final /* synthetic */ GuildStickerSheetViewModel access$getViewModel$p(WidgetGuildStickerSheet widgetGuildStickerSheet) {
+        return widgetGuildStickerSheet.getViewModel();
+    }
+
+    public static final /* synthetic */ void access$showLoading(WidgetGuildStickerSheet widgetGuildStickerSheet) {
+        widgetGuildStickerSheet.showLoading();
+    }
+
+    private final void configureButtons(boolean z2, boolean z3, Guild guild) {
+        WidgetGuildStickerSheetBinding binding = getBinding();
+        if (guild == null) {
+            FrameLayout frameLayout = binding.b;
+            m.checkNotNullExpressionValue(frameLayout, "guildStickerSheetButtonContainer");
+            frameLayout.setVisibility(8);
+        } else if (!z2) {
+            FrameLayout frameLayout2 = binding.b;
+            m.checkNotNullExpressionValue(frameLayout2, "guildStickerSheetButtonContainer");
+            frameLayout2.setVisibility(0);
+            MaterialButton materialButton = binding.l;
+            m.checkNotNullExpressionValue(materialButton, "guildStickerSheetPremiumBtn");
+            materialButton.setVisibility(0);
+            MaterialButton materialButton2 = binding.k;
+            m.checkNotNullExpressionValue(materialButton2, "guildStickerSheetJoinBtn");
+            materialButton2.setVisibility(8);
+            binding.l.setOnClickListener(new WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$1(this, guild, z2, z3));
+        } else if (!z3) {
+            FrameLayout frameLayout3 = binding.b;
+            m.checkNotNullExpressionValue(frameLayout3, "guildStickerSheetButtonContainer");
+            frameLayout3.setVisibility(0);
+            MaterialButton materialButton3 = binding.l;
+            m.checkNotNullExpressionValue(materialButton3, "guildStickerSheetPremiumBtn");
+            materialButton3.setVisibility(8);
+            MaterialButton materialButton4 = binding.k;
+            m.checkNotNullExpressionValue(materialButton4, "guildStickerSheetJoinBtn");
+            materialButton4.setVisibility(0);
+            binding.k.setOnClickListener(new WidgetGuildStickerSheet$configureButtons$$inlined$with$lambda$2(this, guild, z2, z3));
+        } else {
+            FrameLayout frameLayout4 = binding.b;
+            m.checkNotNullExpressionValue(frameLayout4, "guildStickerSheetButtonContainer");
+            frameLayout4.setVisibility(8);
+        }
+    }
+
+    private final void configureGuildSection(Guild guild, boolean z2, boolean z3, Integer num) {
+        WidgetGuildStickerSheetBinding binding = getBinding();
+        if (guild == null || z2) {
+            LinearLayout linearLayout = binding.e;
+            m.checkNotNullExpressionValue(linearLayout, "guildStickerSheetGuildContainer");
+            linearLayout.setVisibility(8);
+            return;
+        }
+        LinearLayout linearLayout2 = binding.e;
+        m.checkNotNullExpressionValue(linearLayout2, "guildStickerSheetGuildContainer");
+        linearLayout2.setVisibility(0);
+        if (guild.hasIcon()) {
+            SimpleDraweeView simpleDraweeView = binding.f;
+            m.checkNotNullExpressionValue(simpleDraweeView, "guildStickerSheetGuildIcon");
+            IconUtils.setIcon$default((ImageView) simpleDraweeView, guild, 0, (MGImages.ChangeDetector) null, true, 12, (Object) null);
+        } else {
+            binding.h.setBackgroundResource(2131231075);
+            int themedColor = ColorCompat.getThemedColor(requireContext(), 2130968905);
+            FrameLayout frameLayout = binding.h;
+            m.checkNotNullExpressionValue(frameLayout, "guildStickerSheetGuildIconWrapper");
+            frameLayout.setBackgroundTintList(ColorStateList.valueOf(themedColor));
+            TextView textView = binding.g;
+            m.checkNotNullExpressionValue(textView, "guildStickerSheetGuildIconText");
+            textView.setText(guild.getShortName());
+        }
+        int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231820 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232045 : 0;
+        TextView textView2 = binding.j;
+        m.checkNotNullExpressionValue(textView2, "guildStickerSheetGuildName");
+        DrawableCompat.setCompoundDrawablesCompat(textView2, i, 0, 0, 0);
+        TextView textView3 = binding.j;
+        m.checkNotNullExpressionValue(textView3, "guildStickerSheetGuildName");
+        textView3.setText(guild.getName());
+        int i2 = z3 ? 2131893648 : 2131893647;
+        String str = null;
+        CharSequence j = b.j(this, i2, new Object[0], null, 4);
+        if (num != null) {
+            String format = NumberFormat.getNumberInstance(new LocaleManager().getPrimaryLocale(requireContext())).format(Integer.valueOf(num.intValue()));
+            str = b.j(this, 2131890435, new Object[]{format}, null, 4).toString() + " • ";
+        }
+        if (str == null) {
+            str = "";
+        }
+        TextView textView4 = binding.i;
+        m.checkNotNullExpressionValue(textView4, "guildStickerSheetGuildInfo");
+        textView4.setText(str + j);
+    }
+
+    private final void configureUI(GuildStickerSheetViewModel.ViewState.Loaded loaded) {
+        Sticker component1 = loaded.component1();
+        boolean component2 = loaded.component2();
+        boolean component3 = loaded.component3();
+        boolean isPublic = loaded.getGuildStickerGuildInfo().isPublic();
+        boolean isUserInGuild = loaded.getGuildStickerGuildInfo().isUserInGuild();
+        GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo guildStickerGuildInfo = loaded.getGuildStickerGuildInfo();
+        Integer num = null;
+        if (!(guildStickerGuildInfo instanceof GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known)) {
+            guildStickerGuildInfo = null;
+        }
+        GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known known = (GuildStickerSheetViewModel.Companion.GuildStickerGuildInfo.Known) guildStickerGuildInfo;
+        getBinding().m.c(component1, 0);
+        TextView textView = getBinding().n;
+        m.checkNotNullExpressionValue(textView, "binding.guildStickerSheetStickerName");
+        textView.setText(component1.h());
+        TextView textView2 = getBinding().f1812c;
+        m.checkNotNullExpressionValue(textView2, "binding.guildStickerSheetDescription");
+        textView2.setText(getString(getCustomStickerInfoText(component3, isUserInGuild, isPublic, component2)));
+        configureButtons(component2, isUserInGuild, known != null ? known.getGuild() : null);
+        Guild guild = known != null ? known.getGuild() : null;
+        if (known != null) {
+            num = known.getApproximateOnline();
+        }
+        configureGuildSection(guild, component3, isPublic, num);
+        AppViewFlipper appViewFlipper = getBinding().d;
+        m.checkNotNullExpressionValue(appViewFlipper, "binding.guildStickerSheetFlipper");
+        appViewFlipper.setDisplayedChild(0);
+    }
+
+    private final WidgetGuildStickerSheetBinding getBinding() {
+        return (WidgetGuildStickerSheetBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    private final int getCustomStickerInfoText(boolean z2, boolean z3, boolean z4, boolean z5) {
+        if (z2 && !z5) {
+            return 2131893635;
+        }
+        if (z2 && z5) {
+            return 2131893643;
+        }
+        if (z3 && !z5) {
+            return 2131893637;
+        }
+        if (z3 && z5) {
+            return 2131893644;
+        }
+        if (!z4 || z5) {
+            return (!z4 || !z5) ? 2131893646 : 2131893645;
+        }
+        return 2131893649;
+    }
+
+    private final GuildStickerSheetViewModel getViewModel() {
+        return (GuildStickerSheetViewModel) this.viewModel$delegate.getValue();
+    }
+
+    public static final void show(FragmentManager fragmentManager, Sticker sticker) {
+        Companion.show(fragmentManager, sticker);
+    }
+
+    private final void showLoading() {
+        AppViewFlipper appViewFlipper = getBinding().d;
+        m.checkNotNullExpressionValue(appViewFlipper, "binding.guildStickerSheetFlipper");
+        appViewFlipper.setDisplayedChild(1);
+    }
+
+    @Override // com.discord.app.AppBottomSheet
+    public void bindSubscriptions(CompositeSubscription compositeSubscription) {
+        m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
+        Observable r = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, WidgetGuildStickerSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildStickerSheet$bindSubscriptions$1(this), 62, (Object) null);
+    }
+
+    @Override // com.discord.app.AppBottomSheet
+    public int getContentViewResId() {
+        return 2131559051;
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java
index 34c7ed3437..8300a71845 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java
@@ -17,20 +17,20 @@ public final /* synthetic */ class WidgetStickerPackDetailsDialog$binding$2 exte
 
     public final StickerPackDetailsDialogBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365078;
-        TextView textView = (TextView) view.findViewById(2131365078);
+        int i = 2131365133;
+        TextView textView = (TextView) view.findViewById(2131365133);
         if (textView != null) {
-            i = 2131365079;
-            TextView textView2 = (TextView) view.findViewById(2131365079);
+            i = 2131365134;
+            TextView textView2 = (TextView) view.findViewById(2131365134);
             if (textView2 != null) {
-                i = 2131365080;
-                TextView textView3 = (TextView) view.findViewById(2131365080);
+                i = 2131365135;
+                TextView textView3 = (TextView) view.findViewById(2131365135);
                 if (textView3 != null) {
-                    i = 2131365081;
-                    TextView textView4 = (TextView) view.findViewById(2131365081);
+                    i = 2131365136;
+                    TextView textView4 = (TextView) view.findViewById(2131365136);
                     if (textView4 != null) {
-                        i = 2131365082;
-                        TextView textView5 = (TextView) view.findViewById(2131365082);
+                        i = 2131365137;
+                        TextView textView5 = (TextView) view.findViewById(2131365137);
                         if (textView5 != null) {
                             return new StickerPackDetailsDialogBinding((FrameLayout) view, textView, textView2, textView3, textView4, textView5);
                         }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java
index 9f6ce3634b..b1cb4b0767 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java
@@ -79,20 +79,20 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
             ModelStickerPack stickerPack = ((StoreStickers.StickerPackState.Loaded) stickerPackState).getStickerPack();
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.stickerPackDetailsPack");
-            textView.setText(b.j(this, 2131893540, new Object[]{stickerPack.getName()}, null, 4));
+            textView.setText(b.j(this, 2131893624, new Object[]{stickerPack.getName()}, null, 4));
             TextView textView2 = getBinding().b;
             m.checkNotNullExpressionValue(textView2, "binding.stickerPackDetailsAnimated");
             int i = 8;
             textView2.setVisibility(stickerPack.isAnimatedPack() ? 0 : 8);
             TextView textView3 = getBinding().b;
             m.checkNotNullExpressionValue(textView3, "binding.stickerPackDetailsAnimated");
-            textView3.setText("・ " + getString(2131893541));
+            textView3.setText("・ " + getString(2131893625));
             TextView textView4 = getBinding().f;
             m.checkNotNullExpressionValue(textView4, "binding.stickerPackDetailsPremium");
             textView4.setVisibility(stickerPack.isPremiumPack() ? 0 : 8);
             TextView textView5 = getBinding().f;
             m.checkNotNullExpressionValue(textView5, "binding.stickerPackDetailsPremium");
-            textView5.setText("・ " + getString(2131893543));
+            textView5.setText("・ " + getString(2131893627));
             TextView textView6 = getBinding().d;
             m.checkNotNullExpressionValue(textView6, "binding.stickerPackDetailsLimited");
             if (stickerPack.isLimitedPack()) {
@@ -106,7 +106,7 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
             StickerUtils stickerUtils = StickerUtils.INSTANCE;
             Context requireContext = requireContext();
             m.checkNotNullExpressionValue(requireContext, "requireContext()");
-            sb.append(b.j(this, 2131893542, new Object[]{stickerUtils.getLimitedTimeLeftString(requireContext, stickerPack.getStoreListing())}, null, 4));
+            sb.append(b.j(this, 2131893626, new Object[]{stickerUtils.getLimitedTimeLeftString(requireContext, stickerPack.getStoreListing())}, null, 4));
             textView7.setText(sb.toString());
         }
     }
@@ -141,7 +141,7 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f1631c.setOnClickListener(new WidgetStickerPackDetailsDialog$onViewBound$1(this));
+        getBinding().f1628c.setOnClickListener(new WidgetStickerPackDetailsDialog$onViewBound$1(this));
     }
 
     @Override // com.discord.app.AppDialog
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java
index 3d0ec9aaba..ee2674c878 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java
@@ -22,38 +22,38 @@ public final /* synthetic */ class WidgetStickerSheet$binding$2 extends k implem
 
     public final WidgetStickerSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365093;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365093);
+        int i = 2131365148;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365148);
         if (loadingButton != null) {
-            i = 2131365094;
-            TextView textView = (TextView) view.findViewById(2131365094);
+            i = 2131365149;
+            TextView textView = (TextView) view.findViewById(2131365149);
             if (textView != null) {
-                i = 2131365095;
-                TextView textView2 = (TextView) view.findViewById(2131365095);
+                i = 2131365150;
+                TextView textView2 = (TextView) view.findViewById(2131365150);
                 if (textView2 != null) {
-                    i = 2131365097;
-                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365097);
+                    i = 2131365152;
+                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365152);
                     if (linearLayout != null) {
-                        i = 2131365098;
-                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365098);
+                        i = 2131365153;
+                        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365153);
                         if (materialButton != null) {
-                            i = 2131365099;
-                            Chip chip = (Chip) view.findViewById(2131365099);
+                            i = 2131365154;
+                            Chip chip = (Chip) view.findViewById(2131365154);
                             if (chip != null) {
-                                i = 2131365100;
-                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365100);
+                                i = 2131365155;
+                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365155);
                                 if (relativeLayout != null) {
-                                    i = 2131365116;
-                                    StickerView stickerView = (StickerView) view.findViewById(2131365116);
+                                    i = 2131365171;
+                                    StickerView stickerView = (StickerView) view.findViewById(2131365171);
                                     if (stickerView != null) {
-                                        i = 2131365117;
-                                        StickerView stickerView2 = (StickerView) view.findViewById(2131365117);
+                                        i = 2131365172;
+                                        StickerView stickerView2 = (StickerView) view.findViewById(2131365172);
                                         if (stickerView2 != null) {
-                                            i = 2131365118;
-                                            StickerView stickerView3 = (StickerView) view.findViewById(2131365118);
+                                            i = 2131365173;
+                                            StickerView stickerView3 = (StickerView) view.findViewById(2131365173);
                                             if (stickerView3 != null) {
-                                                i = 2131365119;
-                                                StickerView stickerView4 = (StickerView) view.findViewById(2131365119);
+                                                i = 2131365174;
+                                                StickerView stickerView4 = (StickerView) view.findViewById(2131365174);
                                                 if (stickerView4 != null) {
                                                     return new WidgetStickerSheetBinding((LinearLayout) view, loadingButton, textView, textView2, linearLayout, materialButton, chip, relativeLayout, stickerView, stickerView2, stickerView3, stickerView4);
                                                 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java
index b5758f6d84..3b3e69c4cc 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java
@@ -36,7 +36,7 @@ public final class WidgetStickerSheet$configureUI$4 implements View.OnClickListe
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
             companion.show(parentFragmentManager, this.$sticker, StickerPackStoreSheetViewType.STICKER_POPOUT_VIEW_ALL, this.$location, StickerPurchaseLocation.Companion.getPopoutPurchaseLocation(this.$stickerPack.canBePurchased()));
         } else {
-            ExpressionPickerEventBus.Companion.getINSTANCE().emitEvent(new ExpressionPickerEvent.OpenStickerPicker(this.$sticker.h(), null, false, 2, null));
+            ExpressionPickerEventBus.Companion.getINSTANCE().emitEvent(new ExpressionPickerEvent.OpenStickerPicker(this.$sticker.i(), null, false, 2, null));
         }
         this.this$0.dismiss();
     }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
index 47bffa9d95..e19d6dfaaa 100644
--- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
@@ -57,8 +57,8 @@ public final class WidgetStickerSheet extends AppBottomSheet {
             Channel findChannelByIdInternal$app_productionGoogleRelease;
             m.checkNotNullParameter(fragmentManager, "fragmentManager");
             m.checkNotNullParameter(sticker, "sticker");
-            if (sticker.j() == StickerType.STANDARD && (findChannelByIdInternal$app_productionGoogleRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(j)) != null) {
-                String str = findChannelByIdInternal$app_productionGoogleRelease.e() == 0 ? "DM Channel" : "Guild Channel";
+            if (sticker.k() == StickerType.STANDARD && (findChannelByIdInternal$app_productionGoogleRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(j)) != null) {
+                String str = findChannelByIdInternal$app_productionGoogleRelease.f() == 0 ? "DM Channel" : "Guild Channel";
                 WidgetStickerSheet widgetStickerSheet = new WidgetStickerSheet();
                 Bundle bundle = new Bundle();
                 bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", sticker);
@@ -91,15 +91,15 @@ public final class WidgetStickerSheet extends AppBottomSheet {
         boolean component4 = viewState.component4();
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.stickerSheetStickerName");
-        textView.setText(component2.g());
+        textView.setText(component2.h());
         if (!viewState.isUserPremiumTier2()) {
-            getBinding().f1966c.setOnClickListener(new WidgetStickerSheet$configureUI$1(this));
+            getBinding().f1969c.setOnClickListener(new WidgetStickerSheet$configureUI$1(this));
         }
-        TextView textView2 = getBinding().f1966c;
+        TextView textView2 = getBinding().f1969c;
         m.checkNotNullExpressionValue(textView2, "binding.stickerSheetStickerInfo");
         boolean z2 = true;
         int i = 0;
-        textView2.setText((component4 || viewState.isUserPremiumTier2() || component1.isPremiumPack()) ? b.j(this, 2131893553, new Object[]{component1.getName()}, null, 4) : !component1.canBePurchased() ? b.j(this, 2131893554, new Object[]{component1.getName()}, null, 4) : b.d(this, 2131893551, new Object[]{component1.getName(), String.valueOf(StickerUtils.INSTANCE.calculatePremiumStickerPackDiscount())}, WidgetStickerSheet$configureUI$2.INSTANCE));
+        textView2.setText((component4 || viewState.isUserPremiumTier2() || component1.isPremiumPack()) ? b.j(this, 2131893641, new Object[]{component1.getName()}, null, 4) : !component1.canBePurchased() ? b.j(this, 2131893642, new Object[]{component1.getName()}, null, 4) : b.d(this, 2131893639, new Object[]{component1.getName(), String.valueOf(StickerUtils.INSTANCE.calculatePremiumStickerPackDiscount())}, WidgetStickerSheet$configureUI$2.INSTANCE));
         try {
             getBinding().h.c(component1.getStickers().get(0), 0);
             getBinding().i.c(component1.getStickers().get(1), 0);
@@ -153,13 +153,13 @@ public final class WidgetStickerSheet extends AppBottomSheet {
     @Override // com.discord.app.AppBottomSheet
     public void bindSubscriptions(CompositeSubscription compositeSubscription) {
         m.checkNotNullParameter(compositeSubscription, "compositeSubscription");
-        Observable s2 = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).s();
-        m.checkNotNullExpressionValue(s2, "viewModel\n        .obser…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(s2, WidgetStickerSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStickerSheet$bindSubscriptions$1(this), 62, (Object) null);
+        Observable r = ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this).r();
+        m.checkNotNullExpressionValue(r, "viewModel\n        .obser…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(r, WidgetStickerSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStickerSheet$bindSubscriptions$1(this), 62, (Object) null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559241;
+        return 2131559249;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java
new file mode 100644
index 0000000000..df32c72e83
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet$binding$2.java
@@ -0,0 +1,32 @@
+package com.discord.widgets.stickers;
+
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.discord.databinding.WidgetUnknownStickerSheetBinding;
+import com.discord.views.sticker.StickerView;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetUnknownStickerSheet.kt */
+public final /* synthetic */ class WidgetUnknownStickerSheet$binding$2 extends k implements Function1<View, WidgetUnknownStickerSheetBinding> {
+    public static final WidgetUnknownStickerSheet$binding$2 INSTANCE = new WidgetUnknownStickerSheet$binding$2();
+
+    public WidgetUnknownStickerSheet$binding$2() {
+        super(1, WidgetUnknownStickerSheetBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetUnknownStickerSheetBinding;", 0);
+    }
+
+    public final WidgetUnknownStickerSheetBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = 2131365394;
+        StickerView stickerView = (StickerView) view.findViewById(2131365394);
+        if (stickerView != null) {
+            i = 2131365395;
+            TextView textView = (TextView) view.findViewById(2131365395);
+            if (textView != null) {
+                return new WidgetUnknownStickerSheetBinding((LinearLayout) view, stickerView, textView);
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
new file mode 100644
index 0000000000..bcbb088ebe
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/stickers/WidgetUnknownStickerSheet.java
@@ -0,0 +1,74 @@
+package com.discord.widgets.stickers;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import c.d.b.a.a;
+import com.discord.api.sticker.StickerPartial;
+import com.discord.app.AppBottomSheet;
+import com.discord.databinding.WidgetUnknownStickerSheetBinding;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import d0.z.d.m;
+import java.io.Serializable;
+import java.util.Objects;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+/* compiled from: WidgetUnknownStickerSheet.kt */
+public final class WidgetUnknownStickerSheet extends AppBottomSheet {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetUnknownStickerSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetUnknownStickerSheetBinding;", 0)};
+    public static final Companion Companion = new Companion(null);
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetUnknownStickerSheet$binding$2.INSTANCE, null, 2, null);
+
+    /* compiled from: WidgetUnknownStickerSheet.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void show(FragmentManager fragmentManager, StickerPartial stickerPartial) {
+            m.checkNotNullParameter(fragmentManager, "fragmentManager");
+            m.checkNotNullParameter(stickerPartial, "sticker");
+            WidgetUnknownStickerSheet widgetUnknownStickerSheet = new WidgetUnknownStickerSheet();
+            Bundle bundle = new Bundle();
+            bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", stickerPartial);
+            widgetUnknownStickerSheet.setArguments(bundle);
+            widgetUnknownStickerSheet.show(fragmentManager, WidgetUnknownStickerSheet.class.getName());
+        }
+    }
+
+    public WidgetUnknownStickerSheet() {
+        super(false, 1, null);
+    }
+
+    private final WidgetUnknownStickerSheetBinding getBinding() {
+        return (WidgetUnknownStickerSheetBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    public static final void show(FragmentManager fragmentManager, StickerPartial stickerPartial) {
+        Companion.show(fragmentManager, stickerPartial);
+    }
+
+    @Override // com.discord.app.AppBottomSheet
+    public int getContentViewResId() {
+        return 2131559264;
+    }
+
+    @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
+    public void onViewCreated(View view, Bundle bundle) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewCreated(view, bundle);
+        Serializable serializable = getArgumentsOrDefault().getSerializable("com.discord.intent.extra.EXTRA_STICKER");
+        Objects.requireNonNull(serializable, "null cannot be cast to non-null type com.discord.api.sticker.StickerPartial");
+        StickerPartial stickerPartial = (StickerPartial) serializable;
+        getBinding().b.c(stickerPartial, 0);
+        TextView textView = getBinding().f1984c;
+        m.checkNotNullExpressionValue(textView, "binding.unknownStickerSheetStickerName");
+        textView.setText(stickerPartial.d());
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java b/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java
index 7d319a8373..2dd2e5533d 100644
--- a/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java
+++ b/app/src/main/java/com/discord/widgets/tabs/BottomNavViewObserver.java
@@ -11,7 +11,7 @@ import rx.subjects.BehaviorSubject;
 public final class BottomNavViewObserver implements TabsHostBottomNavigationView.HeightChangedListener {
     public static final Companion Companion = new Companion(null);
     private static final Lazy INSTANCE$delegate = g.lazy(BottomNavViewObserver$Companion$INSTANCE$2.INSTANCE);
-    private final BehaviorSubject<Integer> heightSubject = BehaviorSubject.m0(0);
+    private final BehaviorSubject<Integer> heightSubject = BehaviorSubject.l0(0);
 
     /* compiled from: BottomNavViewObserver.kt */
     public static final class Companion {
diff --git a/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java b/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java
index 4e6f0024c3..61adb00167 100644
--- a/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java
+++ b/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java
@@ -119,7 +119,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         UserAvatarPresenceView userAvatarPresenceView = this.binding.o;
         NavigationTab navigationTab6 = NavigationTab.SETTINGS;
         this.iconToNavigationTabMap = h0.mapOf(o.to(this.binding.e, navigationTab), o.to(this.binding.b, navigationTab2), o.to(this.binding.j, navigationTab3), o.to(this.binding.h, navigationTab4), o.to(userAvatarPresenceView, navigationTab6), o.to(this.binding.l, navigationTab5));
-        this.navigationTabToViewMap = h0.mapOf(o.to(navigationTab, this.binding.f), o.to(navigationTab2, this.binding.f1634c), o.to(navigationTab3, this.binding.k), o.to(navigationTab4, this.binding.i), o.to(navigationTab6, this.binding.p), o.to(navigationTab5, this.binding.m));
+        this.navigationTabToViewMap = h0.mapOf(o.to(navigationTab, this.binding.f), o.to(navigationTab2, this.binding.f1631c), o.to(navigationTab3, this.binding.k), o.to(navigationTab4, this.binding.i), o.to(navigationTab6, this.binding.p), o.to(navigationTab5, this.binding.m));
         UserAvatarPresenceView userAvatarPresenceView2 = this.binding.o;
         m.checkNotNullExpressionValue(userAvatarPresenceView2, "binding.tabsHostBottomNavUserAvatarPresenceView");
         this.userAvatarPresenceViewController = new UserAvatarPresenceViewController(userAvatarPresenceView2, null, null, null, 14);
@@ -137,7 +137,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         m.checkNotNullExpressionValue(textView3, "binding.tabsHostBottomNavHomeNotificationsBadge");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        textView3.setContentDescription(b.h(resources, 2131891156, new Object[]{String.valueOf(i)}, null, 4));
+        textView3.setContentDescription(b.h(resources, 2131891227, new Object[]{String.valueOf(i)}, null, 4));
         TextView textView4 = this.binding.d;
         m.checkNotNullExpressionValue(textView4, "binding.tabsHostBottomNavFriendsNotificationsBadge");
         textView4.setText(String.valueOf(i2));
@@ -151,7 +151,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         m.checkNotNullExpressionValue(textView6, "binding.tabsHostBottomNavFriendsNotificationsBadge");
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        textView6.setContentDescription(b.h(resources2, 2131890338, new Object[]{String.valueOf(i2)}, null, 4));
+        textView6.setContentDescription(b.h(resources2, 2131890404, new Object[]{String.valueOf(i2)}, null, 4));
     }
 
     public final void addHeightChangedListener(HeightChangedListener heightChangedListener) {
@@ -181,7 +181,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         m.checkNotNullExpressionValue(constraintLayout, "binding.tabsHostBottomNavHomeItem");
         int i3 = 8;
         constraintLayout.setVisibility(set.contains(NavigationTab.HOME) ? 0 : 8);
-        ConstraintLayout constraintLayout2 = this.binding.f1634c;
+        ConstraintLayout constraintLayout2 = this.binding.f1631c;
         m.checkNotNullExpressionValue(constraintLayout2, "binding.tabsHostBottomNavFriendsItem");
         constraintLayout2.setVisibility(set.contains(NavigationTab.FRIENDS) ? 0 : 8);
         FrameLayout frameLayout = this.binding.k;
@@ -238,7 +238,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
         updateNotificationBadges(i, i2);
         if (z2) {
             this.binding.f.setOnClickListener(new TabsHostBottomNavigationView$updateView$4(function1));
-            this.binding.f1634c.setOnClickListener(new TabsHostBottomNavigationView$updateView$5(function1));
+            this.binding.f1631c.setOnClickListener(new TabsHostBottomNavigationView$updateView$5(function1));
             this.binding.k.setOnClickListener(new TabsHostBottomNavigationView$updateView$6(function0));
             this.binding.i.setOnClickListener(new TabsHostBottomNavigationView$updateView$7(function1));
             this.binding.p.setOnClickListener(new TabsHostBottomNavigationView$updateView$8(function1));
@@ -255,7 +255,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout {
             return;
         }
         this.binding.f.setOnClickListener(TabsHostBottomNavigationView$updateView$12.INSTANCE);
-        this.binding.f1634c.setOnClickListener(TabsHostBottomNavigationView$updateView$13.INSTANCE);
+        this.binding.f1631c.setOnClickListener(TabsHostBottomNavigationView$updateView$13.INSTANCE);
         this.binding.k.setOnClickListener(TabsHostBottomNavigationView$updateView$14.INSTANCE);
         this.binding.i.setOnClickListener(TabsHostBottomNavigationView$updateView$15.INSTANCE);
         this.binding.m.setOnClickListener(TabsHostBottomNavigationView$updateView$16.INSTANCE);
diff --git a/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java b/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java
index 87b7f6ed85..0543248cff 100644
--- a/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java
+++ b/app/src/main/java/com/discord/widgets/tabs/TabsHostViewModel.java
@@ -515,7 +515,7 @@ public final class TabsHostViewModel extends AppViewModel<ViewState> {
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeTabsNavigation = storeTabsNavigation;
         this.storeNavigation = storeNavigation;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), TabsHostViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(bottomNavViewObserver.observeHeight(), this, null, 2, null), TabsHostViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(storeTabsNavigation.observeDismissTabsDialogEvent(), this, null, 2, null), TabsHostViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass3(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java
index 8936a80530..c4c537b50f 100644
--- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java
@@ -18,33 +18,33 @@ public final /* synthetic */ class WidgetTabsHost$binding$2 extends k implements
 
     public final WidgetTabsHostBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365638;
-        TabsHostBottomNavigationView tabsHostBottomNavigationView = (TabsHostBottomNavigationView) view.findViewById(2131365638);
+        int i = 2131365699;
+        TabsHostBottomNavigationView tabsHostBottomNavigationView = (TabsHostBottomNavigationView) view.findViewById(2131365699);
         if (tabsHostBottomNavigationView != null) {
             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-            i = 2131365640;
-            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365640);
+            i = 2131365701;
+            FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365701);
             if (fragmentContainerView != null) {
-                i = 2131365641;
-                FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365641);
+                i = 2131365702;
+                FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365702);
                 if (fragmentContainerView2 != null) {
-                    i = 2131365642;
-                    FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131365642);
+                    i = 2131365703;
+                    FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131365703);
                     if (fragmentContainerView3 != null) {
-                        i = 2131365643;
-                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131365643);
+                        i = 2131365704;
+                        FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131365704);
                         if (fragmentContainerView4 != null) {
-                            i = 2131365644;
-                            FragmentContainerView fragmentContainerView5 = (FragmentContainerView) view.findViewById(2131365644);
+                            i = 2131365705;
+                            FragmentContainerView fragmentContainerView5 = (FragmentContainerView) view.findViewById(2131365705);
                             if (fragmentContainerView5 != null) {
-                                i = 2131365645;
-                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365645);
+                                i = 2131365706;
+                                FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365706);
                                 if (frameLayout != null) {
-                                    i = 2131365646;
-                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365646);
+                                    i = 2131365707;
+                                    FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365707);
                                     if (frameLayout2 != null) {
-                                        i = 2131365647;
-                                        FragmentContainerView fragmentContainerView6 = (FragmentContainerView) view.findViewById(2131365647);
+                                        i = 2131365708;
+                                        FragmentContainerView fragmentContainerView6 = (FragmentContainerView) view.findViewById(2131365708);
                                         if (fragmentContainerView6 != null) {
                                             return new WidgetTabsHostBinding(constraintLayout, tabsHostBottomNavigationView, constraintLayout, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, frameLayout, frameLayout2, fragmentContainerView6);
                                         }
diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
index c59ef66451..0ea168b7e8 100644
--- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
+++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java
@@ -67,7 +67,7 @@ public final class WidgetTabsHost extends AppFragment {
     }
 
     public WidgetTabsHost() {
-        super(2131559243);
+        super(2131559251);
         WidgetTabsHost$viewModel$2 widgetTabsHost$viewModel$2 = WidgetTabsHost$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(TabsHostViewModel.class), new WidgetTabsHost$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetTabsHost$viewModel$2));
@@ -187,14 +187,14 @@ public final class WidgetTabsHost extends AppFragment {
     }
 
     private final void setPanelWindowInsetsListeners(boolean z2) {
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1967c, WidgetTabsHost$setPanelWindowInsetsListeners$1.INSTANCE);
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1970c, WidgetTabsHost$setPanelWindowInsetsListeners$1.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().f, new WidgetTabsHost$setPanelWindowInsetsListeners$2(z2));
         FrameLayout frameLayout = getBinding().h;
         m.checkNotNullExpressionValue(frameLayout, "binding.widgetTabsHostNavHost");
         ViewExtensions.setForwardingWindowInsetsListener(frameLayout);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().i, new WidgetTabsHost$setPanelWindowInsetsListeners$3(z2));
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, WidgetTabsHost$setPanelWindowInsetsListeners$4.INSTANCE);
-        getBinding().f1967c.requestApplyInsets();
+        getBinding().f1970c.requestApplyInsets();
     }
 
     public static /* synthetic */ void setPanelWindowInsetsListeners$default(WidgetTabsHost widgetTabsHost, boolean z2, int i, Object obj) {
@@ -291,9 +291,9 @@ public final class WidgetTabsHost extends AppFragment {
     @Override // com.discord.app.AppFragment
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<TabsHostViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel.observeViewSta…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetTabsHost.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetTabsHost$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<TabsHostViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel.observeViewSta…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetTabsHost.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetTabsHost$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetTabsHost.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetTabsHost$onViewBoundOrOnResume$2(this), 62, (Object) null);
         configureSystemStatusBar();
     }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java
index fab6d6b98d..b84e9fb8a9 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java
@@ -13,7 +13,7 @@ public final class WidgetTosAccept$configureUI$1 implements CompoundButton.OnChe
 
     @Override // android.widget.CompoundButton.OnCheckedChangeListener
     public final void onCheckedChanged(CompoundButton compoundButton, boolean z2) {
-        MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).f1977c;
+        MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).f1981c;
         m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
         materialButton.setEnabled(z2);
     }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java
index 53c1ebabfa..4467b9eb2f 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java
@@ -11,7 +11,7 @@ public final class WidgetTosAccept$onViewBound$2<T1, T2> implements Action2<Menu
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363907) {
+        if (menuItem.getItemId() == 2131363948) {
             StoreStream.Companion.getAuthentication().logout();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
index ca1de4068c..27fa822fe0 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java
@@ -43,7 +43,7 @@ public final class WidgetTosAccept extends AppFragment {
     }
 
     public WidgetTosAccept() {
-        super(2131559253);
+        super(2131559261);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetTosAccept widgetTosAccept, RequiredAction requiredAction) {
@@ -58,17 +58,17 @@ public final class WidgetTosAccept extends AppFragment {
         if (requiredAction == RequiredAction.AGREEMENTS) {
             LinkifiedTextView linkifiedTextView = getBinding().e;
             m.checkNotNullExpressionValue(linkifiedTextView, "binding.alertTosTermsOfService");
-            b.n(linkifiedTextView, 2131893817, new Object[0], null, 4);
+            b.m(linkifiedTextView, 2131893915, new Object[0], null, 4);
             LinkifiedTextView linkifiedTextView2 = getBinding().d;
             m.checkNotNullExpressionValue(linkifiedTextView2, "binding.alertTosPrivacyPolicy");
-            b.n(linkifiedTextView2, 2131892376, new Object[0], null, 4);
+            b.m(linkifiedTextView2, 2131892453, new Object[0], null, 4);
             getBinding().b.setOnCheckedChangeListener(new WidgetTosAccept$configureUI$1(this));
-            MaterialButton materialButton = getBinding().f1977c;
+            MaterialButton materialButton = getBinding().f1981c;
             m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
             CheckBox checkBox = getBinding().b;
             m.checkNotNullExpressionValue(checkBox, "binding.alertTosAck");
             materialButton.setEnabled(checkBox.isChecked());
-            getBinding().f1977c.setOnClickListener(new WidgetTosAccept$configureUI$2(this));
+            getBinding().f1981c.setOnClickListener(new WidgetTosAccept$configureUI$2(this));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java
index 7e43f852cd..7cbdd2fb32 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation$binding$2.java
@@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetTosReportViolation$binding$2 extends k
 
     public final WidgetTosReportViolationBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364412;
-        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364412);
+        int i = 2131364450;
+        LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364450);
         if (loadingButton != null) {
-            i = 2131364413;
-            TextView textView = (TextView) view.findViewById(2131364413);
+            i = 2131364451;
+            TextView textView = (TextView) view.findViewById(2131364451);
             if (textView != null) {
-                i = 2131364424;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364424);
+                i = 2131364462;
+                LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364462);
                 if (linearLayout != null) {
-                    i = 2131364425;
-                    TextView textView2 = (TextView) view.findViewById(2131364425);
+                    i = 2131364463;
+                    TextView textView2 = (TextView) view.findViewById(2131364463);
                     if (textView2 != null) {
-                        i = 2131364426;
-                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131364426);
+                        i = 2131364464;
+                        ProgressBar progressBar = (ProgressBar) view.findViewById(2131364464);
                         if (progressBar != null) {
-                            i = 2131364427;
-                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364427);
+                            i = 2131364465;
+                            LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364465);
                             if (linkifiedTextView != null) {
                                 return new WidgetTosReportViolationBinding((CoordinatorLayout) view, loadingButton, textView, linearLayout, textView2, progressBar, linkifiedTextView);
                             }
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
index f3218f7ce3..9e86faf712 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolation.java
@@ -163,7 +163,7 @@ public final class WidgetTosReportViolation extends AppFragment {
     }
 
     public WidgetTosReportViolation() {
-        super(2131559254);
+        super(2131559262);
         WidgetTosReportViolation$viewModel$2 widgetTosReportViolation$viewModel$2 = new WidgetTosReportViolation$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetTosReportViolationViewModel.class), new WidgetTosReportViolation$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetTosReportViolation$viewModel$2));
@@ -262,11 +262,11 @@ public final class WidgetTosReportViolation extends AppFragment {
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, c.a.l.b.j(this, 2131891459, new Object[0], null, 4), c.a.l.b.j(this, 2131892602, new Object[]{"https://dis.gd/request"}, null, 4), c.a.l.b.j(this, 2131891666, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, new WidgetTosReportViolation$handleReportSubmissionError$1(this), 8176, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, c.a.l.b.j(this, 2131891530, new Object[0], null, 4), c.a.l.b.j(this, 2131892683, new Object[]{"https://dis.gd/request"}, null, 4), c.a.l.b.j(this, 2131891735, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, new WidgetTosReportViolation$handleReportSubmissionError$1(this), 8176, null);
     }
 
     private final void handleReportSubmitted() {
-        o.i(this, 2131892611, 0, 4);
+        o.i(this, 2131892692, 0, 4);
         AppActivity appActivity = getAppActivity();
         if (appActivity != null) {
             appActivity.finish();
@@ -290,14 +290,14 @@ public final class WidgetTosReportViolation extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131892595);
+        setActionBarTitle(2131892676);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        TextView textView = getBinding().f1978c;
+        TextView textView = getBinding().f1982c;
         m.checkNotNullExpressionValue(textView, "binding.reportHeader");
-        c.a.l.b.n(textView, 2131892596, new Object[]{getArgs().getTarget()}, null, 4);
+        c.a.l.b.m(textView, 2131892677, new Object[]{getArgs().getTarget()}, null, 4);
         LinkifiedTextView linkifiedTextView = getBinding().g;
         m.checkNotNullExpressionValue(linkifiedTextView, "binding.reportTooltip");
-        c.a.l.b.n(linkifiedTextView, 2131888775, new Object[]{"https://discord.com/guidelines"}, null, 4);
+        c.a.l.b.m(linkifiedTextView, 2131888776, new Object[]{"https://discord.com/guidelines"}, null, 4);
         getBinding().b.setIsLoading(false);
         LoadingButton loadingButton = getBinding().b;
         m.checkNotNullExpressionValue(loadingButton, "binding.reportButton");
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
index c672ce9a3d..576726513a 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationReasonView.java
@@ -30,16 +30,16 @@ public final class WidgetTosReportViolationReasonView extends RelativeLayout {
     public WidgetTosReportViolationReasonView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "context");
-        View inflate = LayoutInflater.from(context).inflate(2131559255, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(2131559263, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131364421;
-        TextView textView = (TextView) inflate.findViewById(2131364421);
+        int i2 = 2131364459;
+        TextView textView = (TextView) inflate.findViewById(2131364459);
         if (textView != null) {
-            i2 = 2131364422;
-            TextView textView2 = (TextView) inflate.findViewById(2131364422);
+            i2 = 2131364460;
+            TextView textView2 = (TextView) inflate.findViewById(2131364460);
             if (textView2 != null) {
-                i2 = 2131364423;
-                MaterialRadioButton materialRadioButton = (MaterialRadioButton) inflate.findViewById(2131364423);
+                i2 = 2131364461;
+                MaterialRadioButton materialRadioButton = (MaterialRadioButton) inflate.findViewById(2131364461);
                 if (materialRadioButton != null) {
                     WidgetTosReportViolationReasonBinding widgetTosReportViolationReasonBinding = new WidgetTosReportViolationReasonBinding((RelativeLayout) inflate, textView, textView2, materialRadioButton);
                     m.checkNotNullExpressionValue(widgetTosReportViolationReasonBinding, "WidgetTosReportViolation…rom(context), this, true)");
@@ -97,7 +97,7 @@ public final class WidgetTosReportViolationReasonView extends RelativeLayout {
 
     public final void setReason(ReportReason reportReason) {
         this.reason = reportReason;
-        TextView textView = this.binding.f1979c;
+        TextView textView = this.binding.f1983c;
         m.checkNotNullExpressionValue(textView, "binding.reportReasonHeader");
         String str = null;
         textView.setText(reportReason != null ? reportReason.b() : null);
diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java
index ef99c82357..ae557729cb 100644
--- a/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java
+++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosReportViolationViewModel.java
@@ -249,9 +249,9 @@ public final class WidgetTosReportViolationViewModel extends AppViewModel<ViewSt
         super(ViewState.Loading.INSTANCE);
         this.channelId = j;
         this.messageId = j2;
-        Observable<StoreState> s2 = observeStoreState().s();
-        m.checkNotNullExpressionValue(s2, "observeStoreState()\n    …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetTosReportViolationViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        Observable<StoreState> r = observeStoreState().r();
+        m.checkNotNullExpressionValue(r, "observeStoreState()\n    …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetTosReportViolationViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     public static final /* synthetic */ void access$generateViewState(WidgetTosReportViolationViewModel widgetTosReportViolationViewModel, StoreState storeState) {
@@ -271,9 +271,9 @@ public final class WidgetTosReportViolationViewModel extends AppViewModel<ViewSt
     }
 
     private final Observable<StoreState> observeStoreState() {
-        Observable<StoreState> G = ObservableExtensionsKt.restSubscribeOn$default(RestAPIInterface.DefaultImpls.report$default(RestAPI.Companion.getApi(), Long.valueOf(this.channelId), null, Long.valueOf(this.messageId), null, 2, null), false, 1, null).G(WidgetTosReportViolationViewModel$observeStoreState$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "RestAPI\n          .api\n …eportReasons)\n          }");
-        return G;
+        Observable<StoreState> F = ObservableExtensionsKt.restSubscribeOn$default(RestAPIInterface.DefaultImpls.report$default(RestAPI.Companion.getApi(), Long.valueOf(this.channelId), null, Long.valueOf(this.messageId), null, 2, null), false, 1, null).F(WidgetTosReportViolationViewModel$observeStoreState$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "RestAPI\n          .api\n …eportReasons)\n          }");
+        return F;
     }
 
     public final ReportReason getReasonSelected() {
diff --git a/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java b/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java
index 5727c676af..c6b54641d7 100644
--- a/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java
+++ b/app/src/main/java/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.java
@@ -2,7 +2,7 @@ package com.discord.widgets.user;
 
 import android.content.Context;
 import androidx.fragment.app.FragmentManager;
-import c.a.a.a.a;
+import c.a.a.e.a;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -30,7 +30,7 @@ public final class Badge$Companion$onBadgeClick$1 extends o implements Function1
     public final void invoke(Badge badge) {
         m.checkNotNullParameter(badge, "badge");
         if (badge.getShowPremiumUpSell()) {
-            a.b.a(a.j, this.$fragmentManager, 5, this.$context.getString(2131892329), null, null, "Profile Modal", "Badge", badge.getObjectType(), false, false, 792);
+            a.b.a(a.j, this.$fragmentManager, 5, this.$context.getString(2131892406), null, null, "Profile Modal", "Badge", badge.getObjectType(), false, false, 792);
             return;
         }
         Context context = this.$context;
diff --git a/app/src/main/java/com/discord/widgets/user/Badge.java b/app/src/main/java/com/discord/widgets/user/Badge.java
index bb59ce76a8..9021bd0e76 100644
--- a/app/src/main/java/com/discord/widgets/user/Badge.java
+++ b/app/src/main/java/com/discord/widgets/user/Badge.java
@@ -48,66 +48,66 @@ public final class Badge {
             ArrayList arrayList = new ArrayList(8);
             UserUtils userUtils = UserUtils.INSTANCE;
             if (userUtils.isStaff(user)) {
-                arrayList.add(new Badge(2131231872, context.getString(2131893319), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231880, context.getString(2131893402), null, false, null, 28, null));
             }
             if (userUtils.isPartner(user)) {
-                arrayList.add(new Badge(2131231861, context.getString(2131891768), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231869, context.getString(2131891840), null, false, null, 28, null));
             }
             if (userUtils.isCertifiedModerator(user)) {
-                arrayList.add(new Badge(2131231858, context.getString(2131887215), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231866, context.getString(2131887215), null, false, null, 28, null));
             }
             if (userUtils.isHypeSquad(user)) {
-                arrayList.add(new Badge(2131231859, context.getString(2131890193), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231867, context.getString(2131890259), null, false, null, 28, null));
             }
             boolean z4 = false;
             if (userUtils.isHypesquadHouse1(user)) {
-                arrayList.add(new Badge(i == 1 ? 2131231702 : 2131231701, context.getString(2131890201), b.g(context, 2131890210, new Object[]{b.g(context, 2131890201, new Object[0], null, 4)}, null, 4), false, null, 24, null));
+                arrayList.add(new Badge(i == 1 ? 2131231709 : 2131231708, context.getString(2131890267), b.g(context, 2131890276, new Object[]{b.g(context, 2131890267, new Object[0], null, 4)}, null, 4), false, null, 24, null));
             }
             if (userUtils.isHypesquadHouse2(user)) {
-                arrayList.add(new Badge(i == 2 ? 2131231704 : 2131231703, b.g(context, 2131890202, new Object[0], null, 4), b.g(context, 2131890210, new Object[]{context.getString(2131890202)}, null, 4), false, null, 24, null));
+                arrayList.add(new Badge(i == 2 ? 2131231711 : 2131231710, b.g(context, 2131890268, new Object[0], null, 4), b.g(context, 2131890276, new Object[]{context.getString(2131890268)}, null, 4), false, null, 24, null));
             }
             if (userUtils.isHypesquadHouse3(user)) {
-                arrayList.add(new Badge(i == 3 ? 2131231706 : 2131231705, context.getString(2131890203), b.g(context, 2131890210, new Object[]{b.g(context, 2131890203, new Object[0], null, 4)}, null, 4), false, null, 24, null));
+                arrayList.add(new Badge(i == 3 ? 2131231713 : 2131231712, context.getString(2131890269), b.g(context, 2131890276, new Object[]{b.g(context, 2131890269, new Object[0], null, 4)}, null, 4), false, null, 24, null));
             }
             if (userUtils.isBugHunterLevel1(user)) {
-                arrayList.add(new Badge(2131231856, context.getString(2131887073), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231864, context.getString(2131887073), null, false, null, 28, null));
             }
             if (userUtils.isBugHunterLevel2(user)) {
-                arrayList.add(new Badge(2131231857, context.getString(2131887073), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231865, context.getString(2131887073), null, false, null, 28, null));
             }
             if (userUtils.isVerifiedDeveloper(user)) {
-                arrayList.add(new Badge(2131231873, context.getString(2131894452), null, false, null, 28, null));
+                arrayList.add(new Badge(2131231881, context.getString(2131894571), null, false, null, 28, null));
             }
             if (userUtils.isPremiumEarlySupporter(user)) {
-                arrayList.add(new Badge(2131231862, context.getString(2131888197), null, !z2 && z3, "PREMIUM_EARLY_SUPPORTER", 4, null));
+                arrayList.add(new Badge(2131231870, context.getString(2131888196), null, !z2 && z3, "PREMIUM_EARLY_SUPPORTER", 4, null));
             }
             if (modelUserProfile.isPremium()) {
-                arrayList.add(new Badge(2131231860, context.getString(2131892307), b.g(context, 2131891924, new Object[]{modelUserProfile.getPremiumSince(context)}, null, 4), !z2 && z3, "PREMIUM"));
+                arrayList.add(new Badge(2131231868, context.getString(2131892384), b.g(context, 2131891996, new Object[]{modelUserProfile.getPremiumSince(context)}, null, 4), !z2 && z3, "PREMIUM"));
             }
             if (modelUserProfile.isPremiumGuildSubscriber()) {
                 Integer premiumGuildMonthsSubscribed = modelUserProfile.getPremiumGuildMonthsSubscribed();
-                int i2 = 2131231863;
+                int i2 = 2131231871;
                 if (premiumGuildMonthsSubscribed.intValue() >= 24) {
-                    i2 = 2131231871;
+                    i2 = 2131231879;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 18) {
-                    i2 = 2131231870;
+                    i2 = 2131231878;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 15) {
-                    i2 = 2131231869;
+                    i2 = 2131231877;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 12) {
-                    i2 = 2131231868;
+                    i2 = 2131231876;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 9) {
-                    i2 = 2131231867;
+                    i2 = 2131231875;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 6) {
-                    i2 = 2131231866;
+                    i2 = 2131231874;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 3) {
-                    i2 = 2131231865;
+                    i2 = 2131231873;
                 } else if (premiumGuildMonthsSubscribed.intValue() >= 2) {
-                    i2 = 2131231864;
+                    i2 = 2131231872;
                 } else {
                     premiumGuildMonthsSubscribed.intValue();
                 }
-                String string = context.getString(2131892307);
-                CharSequence g = b.g(context, 2131892141, new Object[]{modelUserProfile.getPremiumGuildSince(context)}, null, 4);
+                String string = context.getString(2131892384);
+                CharSequence g = b.g(context, 2131892212, new Object[]{modelUserProfile.getPremiumGuildSince(context)}, null, 4);
                 if (!z2 && z3) {
                     z4 = true;
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/UserMutualGuildsManager.java b/app/src/main/java/com/discord/widgets/user/UserMutualGuildsManager.java
index 94b2c6641e..66f9845a67 100644
--- a/app/src/main/java/com/discord/widgets/user/UserMutualGuildsManager.java
+++ b/app/src/main/java/com/discord/widgets/user/UserMutualGuildsManager.java
@@ -46,8 +46,8 @@ public final class UserMutualGuildsManager {
 
     public final Observable<Map<Long, List<Guild>>> observeMutualGuilds(Collection<Long> collection) {
         m.checkNotNullParameter(collection, "userIds");
-        Observable<Map<Long, List<Guild>>> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeGuildsSorted, this.storeGuilds}, false, null, null, new UserMutualGuildsManager$observeMutualGuilds$1(this, collection), 14, null).s();
-        m.checkNotNullExpressionValue(s2, "observationDeck.connectR…  .distinctUntilChanged()");
-        return s2;
+        Observable<Map<Long, List<Guild>>> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this.storeGuildsSorted, this.storeGuilds}, false, null, null, new UserMutualGuildsManager$observeMutualGuilds$1(this, collection), 14, null).r();
+        m.checkNotNullExpressionValue(r, "observationDeck.connectR…  .distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java
index ecb1ee2525..fceb8e5aa0 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$binding$2.java
@@ -20,32 +20,32 @@ public final /* synthetic */ class WidgetBanUser$binding$2 extends k implements
 
     public final WidgetBanUserBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362082;
-        TextView textView = (TextView) view.findViewById(2131362082);
+        int i = 2131362086;
+        TextView textView = (TextView) view.findViewById(2131362086);
         if (textView != null) {
-            i = 2131362083;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362083);
+            i = 2131362087;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362087);
             if (linearLayout != null) {
-                i = 2131362084;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362084);
+                i = 2131362088;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362088);
                 if (materialButton != null) {
-                    i = 2131362085;
-                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362085);
+                    i = 2131362089;
+                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362089);
                     if (materialButton2 != null) {
-                        i = 2131362086;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362086);
+                        i = 2131362090;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362090);
                         if (checkedSetting != null) {
-                            i = 2131362087;
-                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362087);
+                            i = 2131362091;
+                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362091);
                             if (checkedSetting2 != null) {
-                                i = 2131362088;
-                                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362088);
+                                i = 2131362092;
+                                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362092);
                                 if (checkedSetting3 != null) {
-                                    i = 2131362089;
-                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362089);
+                                    i = 2131362093;
+                                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362093);
                                     if (textInputLayout != null) {
-                                        i = 2131362090;
-                                        TextView textView2 = (TextView) view.findViewById(2131362090);
+                                        i = 2131362094;
+                                        TextView textView2 = (TextView) view.findViewById(2131362094);
                                         if (textView2 != null) {
                                             LinearLayout linearLayout2 = (LinearLayout) view;
                                             return new WidgetBanUserBinding(linearLayout2, textView, linearLayout, materialButton, materialButton2, checkedSetting, checkedSetting2, checkedSetting3, textInputLayout, textView2, linearLayout2);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java
index 85097a6d6c..bfcdd31b23 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java
@@ -64,13 +64,13 @@ public final class WidgetBanUser$onViewBound$3 implements View.OnClickListener {
         List access$getHistoryRadios$p = WidgetBanUser.access$getHistoryRadios$p(this.this$0);
         RadioManager access$getDeleteHistoryRadioManager$p = WidgetBanUser.access$getDeleteHistoryRadioManager$p(this.this$0);
         switch (((CheckedSetting) access$getHistoryRadios$p.get(access$getDeleteHistoryRadioManager$p != null ? access$getDeleteHistoryRadioManager$p.b() : 0)).getId()) {
-            case 2131362086:
+            case 2131362090:
                 i = 1;
                 break;
-            case 2131362087:
+            case 2131362091:
                 i = 7;
                 break;
-            case 2131362088:
+            case 2131362092:
             default:
                 i = 0;
                 break;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java
index 8e94c994d5..377b5b9dfe 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java
@@ -49,7 +49,7 @@ public final class WidgetBanUser extends AppDialog {
     }
 
     public WidgetBanUser() {
-        super(2131558855);
+        super(2131558858);
     }
 
     public static final /* synthetic */ WidgetBanUserBinding access$getBinding$p(WidgetBanUser widgetBanUser) {
@@ -99,11 +99,11 @@ public final class WidgetBanUser extends AppDialog {
         long j2 = getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", -1);
         TextView textView = getBinding().i;
         m.checkNotNullExpressionValue(textView, "binding.banUserTitle");
-        b.n(textView, 2131886823, new Object[]{string}, null, 4);
+        b.m(textView, 2131886823, new Object[]{string}, null, 4);
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.banUserBody");
-        b.n(textView2, 2131886819, new Object[]{string}, null, 4);
-        getBinding().f1683c.setOnClickListener(new WidgetBanUser$onViewBound$2(this));
+        b.m(textView2, 2131886819, new Object[]{string}, null, 4);
+        getBinding().f1680c.setOnClickListener(new WidgetBanUser$onViewBound$2(this));
         getBinding().d.setOnClickListener(new WidgetBanUser$onViewBound$3(this, j, j2, string));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java
index d5893dc748..383fc0c7e5 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java
@@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetKickUser$binding$2 extends k implements
 
     public final WidgetKickUserBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363725;
-        TextView textView = (TextView) view.findViewById(2131363725);
+        int i = 2131363766;
+        TextView textView = (TextView) view.findViewById(2131363766);
         if (textView != null) {
-            i = 2131363726;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363726);
+            i = 2131363767;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131363767);
             if (materialButton != null) {
-                i = 2131363727;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363727);
+                i = 2131363768;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363768);
                 if (materialButton2 != null) {
-                    i = 2131363728;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363728);
+                    i = 2131363769;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363769);
                     if (textInputLayout != null) {
-                        i = 2131363729;
-                        TextView textView2 = (TextView) view.findViewById(2131363729);
+                        i = 2131363770;
+                        TextView textView2 = (TextView) view.findViewById(2131363770);
                         if (textView2 != null) {
                             return new WidgetKickUserBinding((LinearLayout) view, textView, materialButton, materialButton2, textInputLayout, textView2);
                         }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
index ad3c160291..a109fbf53c 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
@@ -42,7 +42,7 @@ public final class WidgetKickUser$onViewBoundOrOnResume$2 implements View.OnClic
         public final void invoke(Void r7) {
             Context context = this.this$0.this$0.getContext();
             Context context2 = this.this$0.this$0.getContext();
-            c.a.d.o.h(context, context2 != null ? b.g(context2, 2131890762, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
+            c.a.d.o.h(context, context2 != null ? b.g(context2, 2131890830, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
             this.this$0.this$0.dismiss();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
index cac34ea806..d9ae123240 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
@@ -42,7 +42,7 @@ public final class WidgetKickUser extends AppDialog {
     }
 
     public WidgetKickUser() {
-        super(2131559071);
+        super(2131559077);
     }
 
     public static final /* synthetic */ WidgetKickUserBinding access$getBinding$p(WidgetKickUser widgetKickUser) {
@@ -65,11 +65,11 @@ public final class WidgetKickUser extends AppDialog {
         long j2 = getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", -1);
         TextView textView = getBinding().f;
         m.checkNotNullExpressionValue(textView, "binding.kickUserTitle");
-        b.n(textView, 2131890765, new Object[]{string}, null, 4);
+        b.m(textView, 2131890833, new Object[]{string}, null, 4);
         TextView textView2 = getBinding().b;
         m.checkNotNullExpressionValue(textView2, "binding.kickUserBody");
-        b.n(textView2, 2131890761, new Object[]{string}, null, 4);
-        getBinding().f1824c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this));
+        b.m(textView2, 2131890829, new Object[]{string}, null, 4);
+        getBinding().f1826c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this));
         getBinding().d.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$2(this, j, j2, string));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java
index c393ce417f..e010d0636f 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java
@@ -20,26 +20,26 @@ public final /* synthetic */ class WidgetPruneUsers$binding$2 extends k implemen
 
     public final WidgetPruneUsersBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364367;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364367);
+        int i = 2131364405;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364405);
         if (materialButton != null) {
-            i = 2131364368;
-            TextView textView = (TextView) view.findViewById(2131364368);
+            i = 2131364406;
+            TextView textView = (TextView) view.findViewById(2131364406);
             if (textView != null) {
-                i = 2131364369;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364369);
+                i = 2131364407;
+                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364407);
                 if (materialButton2 != null) {
-                    i = 2131364370;
-                    TextView textView2 = (TextView) view.findViewById(2131364370);
+                    i = 2131364408;
+                    TextView textView2 = (TextView) view.findViewById(2131364408);
                     if (textView2 != null) {
-                        i = 2131364371;
-                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364371);
+                        i = 2131364409;
+                        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364409);
                         if (checkedSetting != null) {
-                            i = 2131364372;
-                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364372);
+                            i = 2131364410;
+                            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364410);
                             if (checkedSetting2 != null) {
-                                i = 2131364373;
-                                ProgressBar progressBar = (ProgressBar) view.findViewById(2131364373);
+                                i = 2131364411;
+                                ProgressBar progressBar = (ProgressBar) view.findViewById(2131364411);
                                 if (progressBar != null) {
                                     return new WidgetPruneUsersBinding((ScrollView) view, materialButton, textView, materialButton2, textView2, checkedSetting, checkedSetting2, progressBar);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
index 155930faea..957fc765ba 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java
@@ -77,7 +77,7 @@ public final class WidgetPruneUsers extends AppDialog {
     }
 
     public WidgetPruneUsers() {
-        super(2131559111);
+        super(2131559117);
         WidgetPruneUsers$viewModel$2 widgetPruneUsers$viewModel$2 = new WidgetPruneUsers$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetPruneUsersViewModel.class), new WidgetPruneUsers$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPruneUsers$viewModel$2));
@@ -138,12 +138,12 @@ public final class WidgetPruneUsers extends AppDialog {
         CheckedSetting checkedSetting;
         if (viewState instanceof WidgetPruneUsersViewModel.ViewState.Loading) {
             StringBuilder sb = new StringBuilder();
-            sb.append(b.j(this, 2131892438, new Object[0], null, 4));
+            sb.append(b.j(this, 2131892517, new Object[0], null, 4));
             sb.append(" - ");
             WidgetPruneUsersViewModel.ViewState.Loading loading = (WidgetPruneUsersViewModel.ViewState.Loading) viewState;
             sb.append(loading.getGuildName());
             String sb2 = sb.toString();
-            TextView textView = getBinding().f1848c;
+            TextView textView = getBinding().f1850c;
             m.checkNotNullExpressionValue(textView, "binding.pruneUserHeader");
             textView.setText(sb2);
             int ordinal = loading.getWhichPruneDays().ordinal();
@@ -179,7 +179,7 @@ public final class WidgetPruneUsers extends AppDialog {
             m.checkNotNullExpressionValue(requireContext2, "requireContext()");
             CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext2, 2131755079, loaded.getPruneDays().getCount(), Integer.valueOf(loaded.getPruneDays().getCount()));
             TextView textView3 = getBinding().e;
-            b.n(textView3, 2131888583, new Object[]{i18nPluralString, i18nPluralString2}, null, 4);
+            b.m(textView3, 2131888584, new Object[]{i18nPluralString, i18nPluralString2}, null, 4);
             textView3.setVisibility(0);
             MaterialButton materialButton2 = getBinding().d;
             m.checkNotNullExpressionValue(materialButton2, "binding.pruneUserPrune");
@@ -212,12 +212,12 @@ public final class WidgetPruneUsers extends AppDialog {
         CheckedSetting checkedSetting = getBinding().f;
         Context context = checkedSetting.getContext();
         m.checkNotNullExpressionValue(context, "context");
-        checkedSetting.setText(StringResourceUtilsKt.getI18nPluralString(context, 2131755209, 7, 7));
+        checkedSetting.setText(StringResourceUtilsKt.getI18nPluralString(context, 2131755210, 7, 7));
         checkedSetting.e(new WidgetPruneUsers$onViewBound$$inlined$apply$lambda$1(this));
         CheckedSetting checkedSetting2 = getBinding().g;
         Context context2 = checkedSetting2.getContext();
         m.checkNotNullExpressionValue(context2, "context");
-        checkedSetting2.setText(StringResourceUtilsKt.getI18nPluralString(context2, 2131755209, 30, 30));
+        checkedSetting2.setText(StringResourceUtilsKt.getI18nPluralString(context2, 2131755210, 30, 30));
         checkedSetting2.e(new WidgetPruneUsers$onViewBound$$inlined$apply$lambda$2(this));
         getBinding().b.setOnClickListener(new WidgetPruneUsers$onViewBound$3(this));
         getBinding().d.setOnClickListener(new WidgetPruneUsers$onViewBound$4(this));
@@ -226,9 +226,9 @@ public final class WidgetPruneUsers extends AppDialog {
     @Override // com.discord.app.AppDialog
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
-        Observable<WidgetPruneUsersViewModel.ViewState> s2 = getViewModel().observeViewState().s();
-        m.checkNotNullExpressionValue(s2, "viewModel.observeViewSta…  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetPruneUsers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsers$onViewBoundOrOnResume$1(this), 62, (Object) null);
+        Observable<WidgetPruneUsersViewModel.ViewState> r = getViewModel().observeViewState().r();
+        m.checkNotNullExpressionValue(r, "viewModel.observeViewSta…  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(r, this), WidgetPruneUsers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsers$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetPruneUsers.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsers$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java
index 47649ddc16..c15b42aa43 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsersViewModel.java
@@ -519,13 +519,13 @@ public final class WidgetPruneUsersViewModel extends AppViewModel<ViewState> {
         this.storeUsers = storeUser;
         this.guildName = str;
         this.restAPI = restAPI;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         ViewState viewState = getViewState();
         Objects.requireNonNull(viewState, "null cannot be cast to non-null type com.discord.widgets.user.WidgetPruneUsersViewModel.ViewState.Loading");
         this.whichPruneDays = ((ViewState.Loading) viewState).getWhichPruneDays();
-        Observable s2 = observable.G(AnonymousClass1.INSTANCE).s();
-        m.checkNotNullExpressionValue(s2, "storeDataObservable\n    …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
+        Observable r = observable.F(AnonymousClass1.INSTANCE).r();
+        m.checkNotNullExpressionValue(r, "storeDataObservable\n    …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null);
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -591,9 +591,9 @@ public final class WidgetPruneUsersViewModel extends AppViewModel<ViewState> {
 
     private final void getUpdatedPruneCount() {
         updateViewState(getLoadingState());
-        Observable M = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getPruneCount(this.guildId, this.whichPruneDays.getCount()), false, 1, null).G(WidgetPruneUsersViewModel$getUpdatedPruneCount$1.INSTANCE).G(new WidgetPruneUsersViewModel$getUpdatedPruneCount$2(this)).t(new WidgetPruneUsersViewModel$getUpdatedPruneCount$3(this)).M(WidgetPruneUsersViewModel$getUpdatedPruneCount$4.INSTANCE);
-        m.checkNotNullExpressionValue(M, "restAPI.getPruneCount(gu…Failed(dismiss = false) }");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(M, this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$5(this), (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$6(this), 58, (Object) null);
+        Observable L = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getPruneCount(this.guildId, this.whichPruneDays.getCount()), false, 1, null).F(WidgetPruneUsersViewModel$getUpdatedPruneCount$1.INSTANCE).F(new WidgetPruneUsersViewModel$getUpdatedPruneCount$2(this)).s(new WidgetPruneUsersViewModel$getUpdatedPruneCount$3(this)).L(WidgetPruneUsersViewModel$getUpdatedPruneCount$4.INSTANCE);
+        m.checkNotNullExpressionValue(L, "restAPI.getPruneCount(gu…Failed(dismiss = false) }");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(L, this, null, 2, null), WidgetPruneUsersViewModel.class, (Context) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$5(this), (Function1) null, (Function0) null, (Function0) null, new WidgetPruneUsersViewModel$getUpdatedPruneCount$6(this), 58, (Object) null);
     }
 
     private final void pruneInProgress(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java
index 7e262bdebf..61a03daf53 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java
@@ -2,11 +2,11 @@ package com.discord.widgets.user;
 
 import c.d.b.a.a;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.MessageReference;
 import com.discord.api.role.GuildRole;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreMessageReplies;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.embed.InviteEmbedModel;
@@ -49,9 +49,9 @@ public final class WidgetUserMentions$Model$Companion$get$1 extends o implements
         Set emptySet = n0.emptySet();
         Map<Long, StoreMessageReplies.MessageState> allMessageReferences = StoreStream.Companion.getRepliedMessages().getAllMessageReferences();
         for (Message message : loadingState.getMentions()) {
-            Channel channel = map6.get(Long.valueOf(message.i()));
+            Channel channel = map6.get(Long.valueOf(message.getChannelId()));
             if (channel != null) {
-                Object obj = map5.get(Long.valueOf(message.i()));
+                Object obj = map5.get(Long.valueOf(message.getChannelId()));
                 if (obj == null) {
                     obj = h0.emptyMap();
                 }
@@ -62,8 +62,8 @@ public final class WidgetUserMentions$Model$Companion$get$1 extends o implements
                 }
                 Map map8 = (Map) c2;
                 LinkedHashMap linkedHashMap = new LinkedHashMap();
-                MessageReference A = message.A();
-                Long c3 = A != null ? A.c() : null;
+                MessageReference messageReference = message.getMessageReference();
+                Long c3 = messageReference != null ? messageReference.c() : null;
                 if (c3 != null) {
                     Object obj2 = (StoreMessageReplies.MessageState) allMessageReferences.get(c3);
                     if (obj2 == null) {
@@ -71,7 +71,7 @@ public final class WidgetUserMentions$Model$Companion$get$1 extends o implements
                     }
                     linkedHashMap.put(c3, obj2);
                 }
-                arrayList.add(MessageHeaderEntry.Companion.create(message, channel, (Guild) a.c(channel, map3)));
+                arrayList.add(new MessageHeaderEntry(message, channel, (Guild) a.c(channel, map3)));
                 arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map7, map8, h0.emptyMap(), null, null, message, null, linkedHashMap, false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, h0.emptyMap(), inviteEmbedModel, false, 262144, null));
             }
             map6 = map;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.java
index 65b2998c77..4c6d9eacd7 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$2.java
@@ -1,31 +1,30 @@
 package com.discord.widgets.user;
 
-import com.discord.utilities.error.Error;
-import com.discord.widgets.user.WidgetUserMentions;
+import com.discord.api.message.Message;
+import d0.t.o;
 import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
+import j0.k.b;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 /* compiled from: WidgetUserMentions.kt */
-public final class WidgetUserMentions$Model$MessageLoader$tryLoad$2 extends o implements Function1<Error, Unit> {
-    public final /* synthetic */ WidgetUserMentions.Model.MessageLoader this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetUserMentions$Model$MessageLoader$tryLoad$2(WidgetUserMentions.Model.MessageLoader messageLoader) {
-        super(1);
-        this.this$0 = messageLoader;
-    }
+public final class WidgetUserMentions$Model$MessageLoader$tryLoad$2<T, R> implements b<List<? extends Message>, List<? extends com.discord.models.message.Message>> {
+    public static final WidgetUserMentions$Model$MessageLoader$tryLoad$2 INSTANCE = new WidgetUserMentions$Model$MessageLoader$tryLoad$2();
 
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
-        invoke(error);
-        return Unit.a;
+    @Override // j0.k.b
+    public /* bridge */ /* synthetic */ List<? extends com.discord.models.message.Message> call(List<? extends Message> list) {
+        return call((List<Message>) list);
     }
 
-    public final void invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
-        WidgetUserMentions.Model.MessageLoader.access$handleLoadError(this.this$0);
+    public final List<com.discord.models.message.Message> call(List<Message> list) {
+        m.checkNotNullExpressionValue(list, "messages");
+        ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
+        Iterator<T> it = list.iterator();
+        while (it.hasNext()) {
+            arrayList.add(new com.discord.models.message.Message(it.next()));
+        }
+        return arrayList;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java
index d41f59a611..13f30050b4 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java
@@ -1,14 +1,13 @@
 package com.discord.widgets.user;
 
-import com.discord.api.message.Message;
+import com.discord.utilities.error.Error;
 import com.discord.widgets.user.WidgetUserMentions;
 import d0.z.d.m;
 import d0.z.d.o;
-import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetUserMentions.kt */
-public final class WidgetUserMentions$Model$MessageLoader$tryLoad$3 extends o implements Function1<List<? extends Message>, Unit> {
+public final class WidgetUserMentions$Model$MessageLoader$tryLoad$3 extends o implements Function1<Error, Unit> {
     public final /* synthetic */ WidgetUserMentions.Model.MessageLoader this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -20,13 +19,13 @@ public final class WidgetUserMentions$Model$MessageLoader$tryLoad$3 extends o im
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Message> list) {
-        invoke((List<Message>) list);
+    public /* bridge */ /* synthetic */ Unit invoke(Error error) {
+        invoke(error);
         return Unit.a;
     }
 
-    public final void invoke(List<Message> list) {
-        m.checkNotNullParameter(list, "it");
-        WidgetUserMentions.Model.MessageLoader.access$handleLoaded(this.this$0, list);
+    public final void invoke(Error error) {
+        m.checkNotNullParameter(error, "it");
+        WidgetUserMentions.Model.MessageLoader.access$handleLoadError(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$4.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$4.java
index 8ff6973714..f33089ab7c 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$4.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$4.java
@@ -1,13 +1,14 @@
 package com.discord.widgets.user;
 
+import com.discord.models.message.Message;
 import com.discord.widgets.user.WidgetUserMentions;
 import d0.z.d.m;
 import d0.z.d.o;
+import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
-import rx.Subscription;
 /* compiled from: WidgetUserMentions.kt */
-public final class WidgetUserMentions$Model$MessageLoader$tryLoad$4 extends o implements Function1<Subscription, Unit> {
+public final class WidgetUserMentions$Model$MessageLoader$tryLoad$4 extends o implements Function1<List<? extends Message>, Unit> {
     public final /* synthetic */ WidgetUserMentions.Model.MessageLoader this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -19,13 +20,14 @@ public final class WidgetUserMentions$Model$MessageLoader$tryLoad$4 extends o im
     /* Return type fixed from 'java.lang.Object' to match base method */
     /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
     @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(Subscription subscription) {
-        invoke(subscription);
+    public /* bridge */ /* synthetic */ Unit invoke(List<? extends Message> list) {
+        invoke((List<Message>) list);
         return Unit.a;
     }
 
-    public final void invoke(Subscription subscription) {
-        m.checkNotNullParameter(subscription, "it");
-        WidgetUserMentions.Model.MessageLoader.access$setLoadSubscription$p(this.this$0, subscription);
+    public final void invoke(List<Message> list) {
+        WidgetUserMentions.Model.MessageLoader messageLoader = this.this$0;
+        m.checkNotNullExpressionValue(list, "it");
+        WidgetUserMentions.Model.MessageLoader.access$handleLoaded(messageLoader, list);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$5.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$5.java
new file mode 100644
index 0000000000..47f218b827
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$5.java
@@ -0,0 +1,31 @@
+package com.discord.widgets.user;
+
+import com.discord.widgets.user.WidgetUserMentions;
+import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+import rx.Subscription;
+/* compiled from: WidgetUserMentions.kt */
+public final class WidgetUserMentions$Model$MessageLoader$tryLoad$5 extends o implements Function1<Subscription, Unit> {
+    public final /* synthetic */ WidgetUserMentions.Model.MessageLoader this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetUserMentions$Model$MessageLoader$tryLoad$5(WidgetUserMentions.Model.MessageLoader messageLoader) {
+        super(1);
+        this.this$0 = messageLoader;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Subscription subscription) {
+        invoke(subscription);
+        return Unit.a;
+    }
+
+    public final void invoke(Subscription subscription) {
+        m.checkNotNullParameter(subscription, "it");
+        WidgetUserMentions.Model.MessageLoader.access$setLoadSubscription$p(this.this$0, subscription);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java
index c8c6161245..045600212e 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java
@@ -17,14 +17,14 @@ public final /* synthetic */ class WidgetUserMentions$WidgetUserMentionFilter$bi
 
     public final WidgetUserMentionsFilterBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365376;
-        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365376);
+        int i = 2131365436;
+        CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365436);
         if (checkedSetting != null) {
-            i = 2131365377;
-            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365377);
+            i = 2131365437;
+            CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365437);
             if (checkedSetting2 != null) {
-                i = 2131365378;
-                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365378);
+                i = 2131365438;
+                CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365438);
                 if (checkedSetting3 != null) {
                     return new WidgetUserMentionsFilterBinding((NestedScrollView) view, checkedSetting, checkedSetting2, checkedSetting3);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java
index 2ed4757684..73b194c8b7 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java
@@ -15,7 +15,7 @@ public final class WidgetUserMentions$WidgetUserMentionFilter$onResume$3<T> impl
     public final void call(Boolean bool) {
         WidgetUserMentions.WidgetUserMentionFilter widgetUserMentionFilter = this.this$0;
         WidgetUserMentions.Model.MessageLoader.Filters access$getFilters$p = WidgetUserMentions.WidgetUserMentionFilter.access$getFilters$p(widgetUserMentionFilter);
-        CheckedSetting checkedSetting = WidgetUserMentions.WidgetUserMentionFilter.access$getBinding$p(this.this$0).f1985c;
+        CheckedSetting checkedSetting = WidgetUserMentions.WidgetUserMentionFilter.access$getBinding$p(this.this$0).f1990c;
         m.checkNotNullExpressionValue(checkedSetting, "binding.userMentionsFilterIncludeRoles");
         WidgetUserMentions.WidgetUserMentionFilter.access$updateFilters(widgetUserMentionFilter, WidgetUserMentions.Model.MessageLoader.Filters.copy$default(access$getFilters$p, 0, false, false, checkedSetting.isChecked(), 7, null));
         WidgetUserMentions.WidgetUserMentionFilter.access$delayedDismiss(this.this$0);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java
index 845b4fdae5..9b54e6f3c8 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java
@@ -21,8 +21,8 @@ public final /* synthetic */ class WidgetUserMentions$binding$2 extends k implem
         int i = 2131361871;
         Toolbar toolbar = (Toolbar) view.findViewById(2131361871);
         if (toolbar != null) {
-            i = 2131365379;
-            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365379);
+            i = 2131365439;
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365439);
             if (recyclerView != null) {
                 return new WidgetUserMentionsBinding((CoordinatorLayout) view, toolbar, recyclerView);
             }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java
index f320637001..60e6416194 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java
@@ -46,7 +46,7 @@ public final class WidgetUserMentions$configureToolbar$1<T1, T2> implements Acti
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363915) {
+        if (menuItem.getItemId() == 2131363956) {
             WidgetUserMentions.WidgetUserMentionFilter.Companion companion = WidgetUserMentions.WidgetUserMentionFilter.Companion;
             FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
             m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java
index 05f3d838ff..25aa33effc 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java
@@ -4,11 +4,11 @@ import android.net.Uri;
 import com.discord.api.activity.Activity;
 import com.discord.api.application.Application;
 import com.discord.api.channel.Channel;
-import com.discord.api.message.Message;
 import com.discord.api.message.activity.MessageActivityType;
 import com.discord.api.message.reaction.MessageReaction;
 import com.discord.api.sticker.BaseSticker;
 import com.discord.api.sticker.Sticker;
+import com.discord.models.message.Message;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.StoreChat;
 import com.discord.stores.StoreNavigation;
@@ -29,7 +29,7 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA
 
     private final void jumpToMessage(Message message) {
         StoreStream.Companion companion = StoreStream.Companion;
-        companion.getMessagesLoader().jumpToMessage(message.i(), message.r());
+        companion.getMessagesLoader().jumpToMessage(message.getChannelId(), message.getId());
         companion.getTabsNavigation().selectHomeTab(StoreNavigation.PanelAction.CLOSE, WidgetUserMentions.access$isEmbedded$p(this.this$0));
     }
 
@@ -142,7 +142,7 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA
     public void onStickerClicked(Message message, BaseSticker baseSticker) {
         m.checkNotNullParameter(message, "message");
         m.checkNotNullParameter(baseSticker, "sticker");
-        StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r());
+        StoreStream.Companion.getMessagesLoader().jumpToMessage(message.getChannelId(), message.getId());
     }
 
     @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java
index c6916ec8e8..15d59ed76c 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$observeModel$1.java
@@ -20,6 +20,6 @@ public final class WidgetUserMentions$observeModel$1<T, R> implements b<Navigati
         WidgetUserMentions.Model.Companion companion = WidgetUserMentions.Model.Companion;
         WidgetUserMentions.Model.MessageLoader access$getMentionsLoader$p = WidgetUserMentions.access$getMentionsLoader$p(this.this$0);
         m.checkNotNullExpressionValue(navigationTab, "selectedTab");
-        return companion.get(access$getMentionsLoader$p, navigationTab).a0(1);
+        return companion.get(access$getMentionsLoader$p, navigationTab).Z(1);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
index 4d0226f72b..ed0e21c7f8 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java
@@ -13,12 +13,12 @@ import androidx.recyclerview.widget.RecyclerView;
 import c.a.d.h0;
 import c.a.d.j0;
 import c.d.b.a.a;
-import com.discord.api.message.Message;
 import com.discord.app.AppBottomSheet;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserMentionsBinding;
 import com.discord.databinding.WidgetUserMentionsFilterBinding;
 import com.discord.models.guild.Guild;
+import com.discord.models.message.Message;
 import com.discord.stores.StoreChat;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreTabsNavigation;
@@ -131,9 +131,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                 BehaviorSubject<MessageLoader.LoadingState> mentionsLoadingStateSubject = messageLoader.getMentionsLoadingStateSubject();
                 StoreStream.Companion companion = StoreStream.Companion;
                 Observable combineLatest = ObservableCombineLatestOverloadsKt.combineLatest(mentionsLoadingStateSubject, companion.getGuildSelected().observeSelectedGuild(), companion.getChannels().observeGuildAndPrivateChannels(), companion.getChannels().observeNames(), companion.getGuilds().observeGuilds(), companion.getGuilds().observeRoles(), companion.getGuilds().observeComputed(), companion.getUsers().observeMeId(), StoreUserSettings.observeIsAnimatedEmojisEnabled$default(companion.getUserSettings(), false, 1, null), StoreUserSettings.observeIsAutoPlayGifsEnabled$default(companion.getUserSettings(), false, 1, null), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetUserMentions$Model$Companion$get$1(navigationTab));
-                Observable<Model> s2 = Observable.i0(new r(combineLatest.i, new LeadingEdgeThrottle(300, TimeUnit.MILLISECONDS, j0.p.a.a()))).s();
-                m.checkNotNullExpressionValue(s2, "combineLatest(\n         …  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = Observable.h0(new r(combineLatest.i, new LeadingEdgeThrottle(300, TimeUnit.MILLISECONDS, j0.p.a.a()))).r();
+                m.checkNotNullExpressionValue(r, "combineLatest(\n         …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -384,9 +384,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
             public MessageLoader(long j) {
                 this.retryDelayMs = j;
-                BehaviorSubject<LoadingState> m0 = BehaviorSubject.m0(this.mentionsLoadingState);
-                m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(mentionsLoadingState)");
-                this.mentionsLoadingStateSubject = m0;
+                BehaviorSubject<LoadingState> l0 = BehaviorSubject.l0(this.mentionsLoadingState);
+                m.checkNotNullExpressionValue(l0, "BehaviorSubject.create(mentionsLoadingState)");
+                this.mentionsLoadingStateSubject = l0;
             }
 
             public static final /* synthetic */ Subscription access$getLoadSubscription$p(MessageLoader messageLoader) {
@@ -422,7 +422,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
             private final void handleLoaded(List<Message> list) {
                 boolean z2 = list.isEmpty() || list.size() < this.mentionLimit;
                 Message message = (Message) u.lastOrNull((List<? extends Object>) list);
-                this.loadBeforeMessageId = message != null ? Long.valueOf(message.r()) : null;
+                this.loadBeforeMessageId = message != null ? Long.valueOf(message.getId()) : null;
                 this.mentions.addAll(list);
                 setMentionsLoadingState(LoadingState.copy$default(this.mentionsLoadingState, false, false, new ArrayList(this.mentions), 3, null));
                 retry(new WidgetUserMentions$Model$MessageLoader$handleLoaded$1(this, z2));
@@ -434,9 +434,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                     subscription.unsubscribe();
                 }
                 this.retryAction = function0;
-                Observable<Long> e02 = Observable.e0(this.retryDelayMs, TimeUnit.MILLISECONDS);
-                m.checkNotNullExpressionValue(e02, "Observable.timer(retryDe…s, TimeUnit.MILLISECONDS)");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(e02), MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$retry$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$retry$2(function0), 58, (Object) null);
+                Observable<Long> d02 = Observable.d0(this.retryDelayMs, TimeUnit.MILLISECONDS);
+                m.checkNotNullExpressionValue(d02, "Observable.timer(retryDe…s, TimeUnit.MILLISECONDS)");
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(d02), MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$retry$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$retry$2(function0), 58, (Object) null);
             }
 
             private final void setMentionsLoadingState(LoadingState loadingState) {
@@ -498,7 +498,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                 setMentionsLoadingState(function1.invoke(this.mentionsLoadingState));
                 if (!this.mentionsLoadingState.isLoading() && !this.mentionsLoadingState.isAllLoaded() && (interactionState = this.interactionState) != null && interactionState.isAtTopIgnoringTouch() && this.isFocused) {
                     setMentionsLoadingState(LoadingState.copy$default(this.mentionsLoadingState, true, false, null, 6, null));
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getMentions(this.mentionLimit, this.filters.getIncludeRoles(), this.filters.getIncludeEveryone(), Long.valueOf(this.filters.getAllGuilds() ? 0 : this.filters.getGuildId()), this.loadBeforeMessageId), false, 1, null)), MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$4(this), new WidgetUserMentions$Model$MessageLoader$tryLoad$2(this), (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$3(this), 50, (Object) null);
+                    Observable F = ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getMentions(this.mentionLimit, this.filters.getIncludeRoles(), this.filters.getIncludeEveryone(), Long.valueOf(this.filters.getAllGuilds() ? 0 : this.filters.getGuildId()), this.loadBeforeMessageId), false, 1, null)).F(WidgetUserMentions$Model$MessageLoader$tryLoad$2.INSTANCE);
+                    m.checkNotNullExpressionValue(F, "RestAPI\n            .api…messages.map(::Message) }");
+                    ObservableExtensionsKt.appSubscribe$default(F, MessageLoader.class, (Context) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$5(this), new WidgetUserMentions$Model$MessageLoader$tryLoad$3(this), (Function0) null, (Function0) null, new WidgetUserMentions$Model$MessageLoader$tryLoad$4(this), 50, (Object) null);
                 }
             }
         }
@@ -834,7 +836,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
 
         @Override // com.discord.app.AppBottomSheet
         public int getContentViewResId() {
-            return 2131559263;
+            return 2131559272;
         }
 
         @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -862,7 +864,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
                 Context context = getContext();
                 CharSequence charSequence = null;
                 if (context != null) {
-                    charSequence = c.a.l.b.g(context, 2131893846, new Object[]{this.guildName}, null, 4);
+                    charSequence = c.a.l.b.g(context, 2131893944, new Object[]{this.guildName}, null, 4);
                 }
                 checkedSetting3.setText(charSequence);
                 getBinding().d.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$1(this));
@@ -879,19 +881,19 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
             }
             checkedSetting5.setChecked(filters2.getIncludeEveryone());
             getBinding().b.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$2(this));
-            CheckedSetting checkedSetting6 = getBinding().f1985c;
+            CheckedSetting checkedSetting6 = getBinding().f1990c;
             m.checkNotNullExpressionValue(checkedSetting6, "binding.userMentionsFilterIncludeRoles");
             Model.MessageLoader.Filters filters3 = this.filters;
             if (filters3 == null) {
                 m.throwUninitializedPropertyAccessException("filters");
             }
             checkedSetting6.setChecked(filters3.getIncludeRoles());
-            getBinding().f1985c.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$3(this));
+            getBinding().f1990c.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$3(this));
         }
     }
 
     public WidgetUserMentions() {
-        super(2131559262);
+        super(2131559271);
         WidgetUserMentions$viewModel$2 widgetUserMentions$viewModel$2 = WidgetUserMentions$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetUserMentionsViewModel.class), new WidgetUserMentions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetUserMentions$viewModel$2));
@@ -945,7 +947,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
     }
 
     private final WidgetChatListAdapter createAdapter(Function1<? super StoreChat.InteractionState, Unit> function1) {
-        RecyclerView recyclerView = getBinding().f1984c;
+        RecyclerView recyclerView = getBinding().f1989c;
         m.checkNotNullExpressionValue(recyclerView, "binding.userMentionsList");
         FragmentManager parentFragmentManager = getParentFragmentManager();
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
@@ -976,9 +978,9 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
         if (isEmbedded()) {
             return Model.Companion.get(this.mentionsLoader, NavigationTab.MENTIONS);
         }
-        Observable<R> Z = StoreStream.Companion.getTabsNavigation().observeSelectedTab().Z(new WidgetUserMentions$observeModel$1(this));
-        m.checkNotNullExpressionValue(Z, "StoreStream.getTabsNavig…            }\n          }");
-        return Z;
+        Observable<R> Y = StoreStream.Companion.getTabsNavigation().observeSelectedTab().Y(new WidgetUserMentions$observeModel$1(this));
+        m.checkNotNullExpressionValue(Y, "StoreStream.getTabsNavig…            }\n          }");
+        return Y;
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -1019,7 +1021,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect
             AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
             getBinding().b.setNavigationOnClickListener(new WidgetUserMentions$onViewBound$1(this));
         } else {
-            setActionBarTitle(2131892527);
+            setActionBarTitle(2131892606);
         }
         WidgetChatListAdapter widgetChatListAdapter = (WidgetChatListAdapter) MGRecyclerAdapter.Companion.configure(createAdapter(new WidgetUserMentions$onViewBound$2(this.mentionsLoader)));
         this.mentionsAdapter = widgetChatListAdapter;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java
index d1b07f532f..c486b8b76c 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetUserMutualFriends$binding$2 extends k i
 
     public final WidgetUserMutualFriendsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365380);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365440);
         if (recyclerView != null) {
             return new WidgetUserMutualFriendsBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365380)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365440)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
index b97a3ae61d..48a13dd9e2 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java
@@ -12,7 +12,7 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import c.a.d.l;
-import c.a.i.j5;
+import c.a.i.m5;
 import c.d.b.a.a;
 import com.discord.app.AppFragment;
 import com.discord.databinding.WidgetUserMutualFriendsBinding;
@@ -89,11 +89,11 @@ public final class WidgetUserMutualFriends extends AppFragment {
             }
 
             public final Observable<Model> get(long j) {
-                Observable Z = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getRelationships(j), false, 1, null).Z(new WidgetUserMutualFriends$Model$Companion$get$1(j));
-                m.checkNotNullExpressionValue(Z, "RestAPI\n            .api…          )\n            }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "RestAPI\n            .api…  .distinctUntilChanged()");
-                return s2;
+                Observable Y = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getRelationships(j), false, 1, null).Y(new WidgetUserMutualFriends$Model$Companion$get$1(j));
+                m.checkNotNullExpressionValue(Y, "RestAPI\n            .api…          )\n            }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "RestAPI\n            .api…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -382,39 +382,39 @@ public final class WidgetUserMutualFriends extends AppFragment {
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
             public ViewHolder(MutualFriendsAdapter mutualFriendsAdapter) {
-                super(2131559270, mutualFriendsAdapter);
+                super(2131559279, mutualFriendsAdapter);
                 m.checkNotNullParameter(mutualFriendsAdapter, "adapter");
                 View view = this.itemView;
-                int i = 2131363988;
-                View findViewById = view.findViewById(2131363988);
+                int i = 2131364029;
+                View findViewById = view.findViewById(2131364029);
                 if (findViewById != null) {
-                    j5 a = j5.a(findViewById);
-                    i = 2131363989;
-                    View findViewById2 = view.findViewById(2131363989);
+                    m5 a = m5.a(findViewById);
+                    i = 2131364030;
+                    View findViewById2 = view.findViewById(2131364030);
                     if (findViewById2 != null) {
-                        j5 a2 = j5.a(findViewById2);
-                        i = 2131363990;
-                        View findViewById3 = view.findViewById(2131363990);
+                        m5 a2 = m5.a(findViewById2);
+                        i = 2131364031;
+                        View findViewById3 = view.findViewById(2131364031);
                         if (findViewById3 != null) {
-                            j5 a3 = j5.a(findViewById3);
-                            i = 2131363991;
-                            View findViewById4 = view.findViewById(2131363991);
+                            m5 a3 = m5.a(findViewById3);
+                            i = 2131364032;
+                            View findViewById4 = view.findViewById(2131364032);
                             if (findViewById4 != null) {
-                                j5 a4 = j5.a(findViewById4);
-                                i = 2131365388;
-                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365388);
+                                m5 a4 = m5.a(findViewById4);
+                                i = 2131365448;
+                                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365448);
                                 if (simpleDraweeView != null) {
-                                    i = 2131365389;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365389);
+                                    i = 2131365449;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365449);
                                     if (linearLayout != null) {
-                                        i = 2131365392;
-                                        StatusView statusView = (StatusView) view.findViewById(2131365392);
+                                        i = 2131365452;
+                                        StatusView statusView = (StatusView) view.findViewById(2131365452);
                                         if (statusView != null) {
-                                            i = 2131365393;
-                                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365393);
+                                            i = 2131365453;
+                                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365453);
                                             if (simpleDraweeSpanTextView != null) {
-                                                i = 2131365394;
-                                                TextView textView = (TextView) view.findViewById(2131365394);
+                                                i = 2131365454;
+                                                TextView textView = (TextView) view.findViewById(2131365454);
                                                 if (textView != null) {
                                                     WidgetUserProfileAdapterItemFriendBinding widgetUserProfileAdapterItemFriendBinding = new WidgetUserProfileAdapterItemFriendBinding((RelativeLayout) view, a, a2, a3, a4, simpleDraweeView, linearLayout, statusView, simpleDraweeSpanTextView, textView);
                                                     m.checkNotNullExpressionValue(widgetUserProfileAdapterItemFriendBinding, "WidgetUserProfileAdapter…endBinding.bind(itemView)");
@@ -457,34 +457,34 @@ public final class WidgetUserMutualFriends extends AppFragment {
                 IconUtils.setIcon$default(simpleDraweeView, mutualFriend.getUser(), 2131165296, null, null, null, 56, null);
                 int i2 = 0;
                 while (i2 <= 3) {
-                    j5 j5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f1990c : this.binding.b;
-                    m.checkNotNullExpressionValue(j5Var, "when (i) {\n            1…mutualServer4\n          }");
-                    RelativeLayout relativeLayout = j5Var.a;
+                    m5 m5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f1995c : this.binding.b;
+                    m.checkNotNullExpressionValue(m5Var, "when (i) {\n            1…mutualServer4\n          }");
+                    RelativeLayout relativeLayout = m5Var.a;
                     m.checkNotNullExpressionValue(relativeLayout, "item.root");
                     relativeLayout.setVisibility(8);
-                    TextView textView2 = j5Var.f113c;
+                    TextView textView2 = m5Var.f129c;
                     m.checkNotNullExpressionValue(textView2, "item.userProfileAdapterItemFriendMutualText");
                     textView2.setVisibility(8);
-                    SimpleDraweeView simpleDraweeView2 = j5Var.b;
+                    SimpleDraweeView simpleDraweeView2 = m5Var.b;
                     m.checkNotNullExpressionValue(simpleDraweeView2, "item.userProfileAdapterItemFriendMutualImage");
                     simpleDraweeView2.setVisibility(8);
                     Guild guild = (Guild) u.getOrNull(mutualFriend.getMutualGuilds(), i2);
                     if (guild != null) {
-                        RelativeLayout relativeLayout2 = j5Var.a;
+                        RelativeLayout relativeLayout2 = m5Var.a;
                         m.checkNotNullExpressionValue(relativeLayout2, "item.root");
                         relativeLayout2.setVisibility(0);
                         if (guild.getIcon() != null) {
-                            SimpleDraweeView simpleDraweeView3 = j5Var.b;
+                            SimpleDraweeView simpleDraweeView3 = m5Var.b;
                             m.checkNotNullExpressionValue(simpleDraweeView3, "item.userProfileAdapterItemFriendMutualImage");
                             simpleDraweeView3.setVisibility(0);
-                            SimpleDraweeView simpleDraweeView4 = j5Var.b;
+                            SimpleDraweeView simpleDraweeView4 = m5Var.b;
                             m.checkNotNullExpressionValue(simpleDraweeView4, "imageView");
                             IconUtils.setIcon$default((ImageView) simpleDraweeView4, guild, 0, (MGImages.ChangeDetector) null, false, 28, (Object) null);
                         } else {
-                            TextView textView3 = j5Var.f113c;
+                            TextView textView3 = m5Var.f129c;
                             m.checkNotNullExpressionValue(textView3, "item.userProfileAdapterItemFriendMutualText");
                             textView3.setVisibility(0);
-                            TextView textView4 = j5Var.f113c;
+                            TextView textView4 = m5Var.f129c;
                             m.checkNotNullExpressionValue(textView4, "item.userProfileAdapterItemFriendMutualText");
                             textView4.setText(guild.getShortName());
                         }
@@ -510,7 +510,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
         public MGRecyclerViewHolder<?, Model.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
             if (i == 0) {
-                return new WidgetUserProfileEmptyListItem(2131559269, this, 2130969513, 2131891402);
+                return new WidgetUserProfileEmptyListItem(2131559278, this, 2130969513, 2131891473);
             }
             if (i == 1) {
                 return new ViewHolder(this);
@@ -520,7 +520,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
     }
 
     public WidgetUserMutualFriends() {
-        super(2131559264);
+        super(2131559273);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserMutualFriends widgetUserMutualFriends, Model model) {
@@ -534,7 +534,7 @@ public final class WidgetUserMutualFriends extends AppFragment {
     private final void configureUI(Model model) {
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        setActionBarTitle(StringResourceUtilsKt.getQuantityString(resources, 2131755352, 2131891313, model.getNumMutualFriends(), Integer.valueOf(model.getNumMutualFriends())));
+        setActionBarTitle(StringResourceUtilsKt.getQuantityString(resources, 2131755353, 2131891384, model.getNumMutualFriends(), Integer.valueOf(model.getNumMutualFriends())));
         User user = model.getUser();
         setActionBarSubtitle(user != null ? user.getUsername() : null);
         MutualFriendsAdapter mutualFriendsAdapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java
index 35b60fe61e..d1ed4ca246 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetUserMutualGuilds$binding$2 extends k im
 
     public final WidgetUserMutualGuildsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365381);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365441);
         if (recyclerView != null) {
             return new WidgetUserMutualGuildsBinding((CoordinatorLayout) view, recyclerView);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365381)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365441)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
index 0fc0ff9133..c028173410 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java
@@ -61,20 +61,20 @@ public final class WidgetUserMutualGuilds extends AppFragment {
                 super(i, adapter);
                 m.checkNotNullParameter(adapter, "adapter");
                 View view = this.itemView;
-                int i2 = 2131365395;
-                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365395);
+                int i2 = 2131365455;
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365455);
                 if (simpleDraweeView != null) {
-                    i2 = 2131365396;
-                    TextView textView = (TextView) view.findViewById(2131365396);
+                    i2 = 2131365456;
+                    TextView textView = (TextView) view.findViewById(2131365456);
                     if (textView != null) {
-                        i2 = 2131365397;
-                        TextView textView2 = (TextView) view.findViewById(2131365397);
+                        i2 = 2131365457;
+                        TextView textView2 = (TextView) view.findViewById(2131365457);
                         if (textView2 != null) {
-                            i2 = 2131365398;
-                            TextView textView3 = (TextView) view.findViewById(2131365398);
+                            i2 = 2131365458;
+                            TextView textView3 = (TextView) view.findViewById(2131365458);
                             if (textView3 != null) {
-                                i2 = 2131365399;
-                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365399);
+                                i2 = 2131365459;
+                                RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365459);
                                 if (relativeLayout != null) {
                                     WidgetUserProfileAdapterItemServerBinding widgetUserProfileAdapterItemServerBinding = new WidgetUserProfileAdapterItemServerBinding((RelativeLayout) view, simpleDraweeView, textView, textView2, textView3, relativeLayout);
                                     m.checkNotNullExpressionValue(widgetUserProfileAdapterItemServerBinding, "WidgetUserProfileAdapter…verBinding.bind(itemView)");
@@ -108,7 +108,7 @@ public final class WidgetUserMutualGuilds extends AppFragment {
                 textView.setVisibility((guild2 != null ? guild2.getIcon() : null) == null ? 0 : 8);
                 Guild guild3 = item.getGuild();
                 textView.setText(guild3 != null ? guild3.getShortName() : null);
-                TextView textView2 = this.binding.f1991c;
+                TextView textView2 = this.binding.f1996c;
                 Guild guild4 = item.getGuild();
                 if (guild4 != null) {
                     str = guild4.getName();
@@ -139,10 +139,10 @@ public final class WidgetUserMutualGuilds extends AppFragment {
         public MGRecyclerViewHolder<?, Model.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
             if (i == 0) {
-                return new WidgetUserProfileEmptyListItem(2131559269, this, 2130969514, 2131891403);
+                return new WidgetUserProfileEmptyListItem(2131559278, this, 2130969514, 2131891474);
             }
             if (i == 1) {
-                return new ViewHolder(2131559272, this);
+                return new ViewHolder(2131559281, this);
             }
             throw invalidViewTypeException(i);
         }
@@ -185,9 +185,9 @@ public final class WidgetUserMutualGuilds extends AppFragment {
 
             public final Observable<Model> get(long j) {
                 StoreStream.Companion companion = StoreStream.Companion;
-                Observable<Model> s2 = Observable.i(companion.getUserProfile().observeUserProfile(j), companion.getGuildsSorted().observeOrderedGuilds(), companion.getUsers().observeUser(j), WidgetUserMutualGuilds$Model$Companion$get$1.INSTANCE).s();
-                m.checkNotNullExpressionValue(s2, "Observable\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = Observable.i(companion.getUserProfile().observeUserProfile(j), companion.getGuildsSorted().observeOrderedGuilds(), companion.getUsers().observeUser(j), WidgetUserMutualGuilds$Model$Companion$get$1.INSTANCE).r();
+                m.checkNotNullExpressionValue(r, "Observable\n            .…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -415,7 +415,7 @@ public final class WidgetUserMutualGuilds extends AppFragment {
     }
 
     public WidgetUserMutualGuilds() {
-        super(2131559265);
+        super(2131559274);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserMutualGuilds widgetUserMutualGuilds, Model model) {
@@ -424,7 +424,7 @@ public final class WidgetUserMutualGuilds extends AppFragment {
 
     private final void configureUI(Model model) {
         int numMutualGuilds = model.getNumMutualGuilds();
-        setActionBarTitle(StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755353, 2131891314, Integer.valueOf(numMutualGuilds), Integer.valueOf(numMutualGuilds)));
+        setActionBarTitle(StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755354, 2131891385, Integer.valueOf(numMutualGuilds), Integer.valueOf(numMutualGuilds)));
         User user = model.getUser();
         setActionBarSubtitle(user != null ? user.getUsername() : null);
         Adapter adapter = this.adapter;
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java
index 7752c57e09..cd92e5beac 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetUserPasswordVerify$binding$2 extends k
 
     public final WidgetUserPasswordVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131362962;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362962);
+            i = 2131362987;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362987);
             if (textInputLayout != null) {
-                i = 2131364772;
-                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772);
+                i = 2131364821;
+                FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364821);
                 if (floatingActionButton != null) {
                     return new WidgetUserPasswordVerifyBinding((CoordinatorLayout) view, dimmerView, textInputLayout, floatingActionButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
index 329834363e..fff8dee0db 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java
@@ -21,8 +21,8 @@ public final class WidgetUserPasswordVerify$validationManager$2 extends o implem
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final ValidationManager mo1invoke() {
-        TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f1986c;
+        TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f1991c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
-        return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131891781), AuthUtils.INSTANCE.createPasswordInputValidator(2131891770)));
+        return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131891853), AuthUtils.INSTANCE.createPasswordInputValidator(2131891842)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
index 5ad57b10ea..e76d11d5b5 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java
@@ -48,7 +48,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     private static final String INTENT_EXTRA_PHONE_TOKEN = "INTENT_EXTRA_PHONE_TOKEN";
     private static final String INTENT_EXTRA_USERNAME = "INTENT_EXTRA_USERNAME";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetUserPasswordVerify$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131362962);
+    private final StatefulViews state = new StatefulViews(2131362987);
     private final Lazy validationManager$delegate = g.lazy(new WidgetUserPasswordVerify$validationManager$2(this));
 
     /* compiled from: WidgetUserPasswordVerify.kt */
@@ -129,7 +129,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     }
 
     public WidgetUserPasswordVerify() {
-        super(2131559266);
+        super(2131559275);
     }
 
     public static final /* synthetic */ void access$finishWithSuccess(WidgetUserPasswordVerify widgetUserPasswordVerify) {
@@ -150,7 +150,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
 
     private final void finishWithSuccess() {
         StatefulViews.clear$default(this.state, false, 1, null);
-        o.i(this, 2131892974, 0, 4);
+        o.i(this, 2131893055, 0, 4);
         FragmentActivity activity = getActivity();
         if (activity != null) {
             activity.setResult(-1);
@@ -188,7 +188,7 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     private final void saveInfo() {
         if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
             AppFragment.hideKeyboard$default(this, null, 1, null);
-            TextInputLayout textInputLayout = getBinding().f1986c;
+            TextInputLayout textInputLayout = getBinding().f1991c;
             m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
             String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
             Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_ACTION");
@@ -222,15 +222,15 @@ public final class WidgetUserPasswordVerify extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarSubtitle(2131894256);
-        setActionBarTitle(2131894279);
+        setActionBarSubtitle(2131894357);
+        setActionBarTitle(2131894381);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
         StatefulViews statefulViews = this.state;
         FloatingActionButton floatingActionButton = getBinding().d;
-        TextInputLayout textInputLayout = getBinding().f1986c;
+        TextInputLayout textInputLayout = getBinding().f1991c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap");
         statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout);
-        TextInputLayout textInputLayout2 = getBinding().f1986c;
+        TextInputLayout textInputLayout2 = getBinding().f1991c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountPasswordWrap");
         ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserPasswordVerify$onViewBound$1(this), 1, null);
         getBinding().d.setOnClickListener(new WidgetUserPasswordVerify$onViewBound$2(this));
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java
index e782c25677..97fce6111f 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java
@@ -22,35 +22,35 @@ public final /* synthetic */ class WidgetUserSetCustomStatus$binding$2 extends k
 
     public final WidgetUserSetCustomStatusBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364714;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364714);
+        int i = 2131364763;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364763);
         if (simpleDraweeView != null) {
-            i = 2131364715;
-            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364715);
+            i = 2131364764;
+            FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364764);
             if (frameLayout != null) {
-                i = 2131364716;
-                RadioGroup radioGroup = (RadioGroup) view.findViewById(2131364716);
+                i = 2131364765;
+                RadioGroup radioGroup = (RadioGroup) view.findViewById(2131364765);
                 if (radioGroup != null) {
-                    i = 2131364717;
-                    MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(2131364717);
+                    i = 2131364766;
+                    MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(2131364766);
                     if (materialRadioButton != null) {
-                        i = 2131364718;
-                        MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(2131364718);
+                        i = 2131364767;
+                        MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(2131364767);
                         if (materialRadioButton2 != null) {
-                            i = 2131364719;
-                            MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(2131364719);
+                            i = 2131364768;
+                            MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(2131364768);
                             if (materialRadioButton3 != null) {
-                                i = 2131364720;
-                                MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(2131364720);
+                                i = 2131364769;
+                                MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(2131364769);
                                 if (materialRadioButton4 != null) {
-                                    i = 2131364721;
-                                    MaterialRadioButton materialRadioButton5 = (MaterialRadioButton) view.findViewById(2131364721);
+                                    i = 2131364770;
+                                    MaterialRadioButton materialRadioButton5 = (MaterialRadioButton) view.findViewById(2131364770);
                                     if (materialRadioButton5 != null) {
-                                        i = 2131364722;
-                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364722);
+                                        i = 2131364771;
+                                        FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364771);
                                         if (floatingActionButton != null) {
-                                            i = 2131364723;
-                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364723);
+                                            i = 2131364772;
+                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364772);
                                             if (textInputLayout != null) {
                                                 return new WidgetUserSetCustomStatusBinding((CoordinatorLayout) view, simpleDraweeView, frameLayout, radioGroup, materialRadioButton, materialRadioButton2, materialRadioButton3, materialRadioButton4, materialRadioButton5, floatingActionButton, textInputLayout);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
index 6d480e76e5..8654bd692f 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java
@@ -83,7 +83,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
     }
 
     public WidgetUserSetCustomStatus() {
-        super(2131559274);
+        super(2131559283);
         WidgetUserSetCustomStatus$viewModel$2 widgetUserSetCustomStatus$viewModel$2 = WidgetUserSetCustomStatus$viewModel$2.INSTANCE;
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetUserSetCustomStatusViewModel.class), new WidgetUserSetCustomStatus$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetUserSetCustomStatus$viewModel$2));
@@ -151,7 +151,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
                     this.currentEmojiUri = imageUri;
                 }
             } else {
-                getBinding().b.setActualImageResource(2131231932);
+                getBinding().b.setActualImageResource(2131231940);
                 this.currentEmojiUri = null;
             }
             TextInputLayout textInputLayout = getBinding().j;
@@ -209,9 +209,9 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
             window.setSoftInputMode(32);
         }
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        setActionBarTitle(2131887989);
+        setActionBarTitle(2131887988);
         this.expirationRadioManager = new RadioManager(n.listOf((Object[]) new MaterialRadioButton[]{getBinding().g, getBinding().e, getBinding().d, getBinding().f, getBinding().h}));
-        getBinding().f1992c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this));
+        getBinding().f1997c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this));
         getBinding().j.setEndIconOnClickListener(new WidgetUserSetCustomStatus$onViewBound$2(this));
         TextInputLayout textInputLayout = getBinding().j;
         m.checkNotNullExpressionValue(textInputLayout, "binding.setCustomStatusText");
@@ -224,7 +224,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
         CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755057, 30, 30);
         MaterialRadioButton materialRadioButton2 = getBinding().e;
         m.checkNotNullExpressionValue(materialRadioButton2, "binding.setCustomStatusExpiration30Minutes");
-        materialRadioButton2.setText(b.j(this, 2131887993, new Object[]{quantityString}, null, 4));
+        materialRadioButton2.setText(b.j(this, 2131887992, new Object[]{quantityString}, null, 4));
         MaterialRadioButton materialRadioButton3 = getBinding().e;
         m.checkNotNullExpressionValue(materialRadioButton3, "binding.setCustomStatusExpiration30Minutes");
         setExpirationOnCheck(materialRadioButton3, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_30_MINUTES);
@@ -233,7 +233,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
         CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755056, 1, 1);
         MaterialRadioButton materialRadioButton4 = getBinding().d;
         m.checkNotNullExpressionValue(materialRadioButton4, "binding.setCustomStatusExpiration1Hour");
-        materialRadioButton4.setText(b.j(this, 2131887992, new Object[]{quantityString2}, null, 4));
+        materialRadioButton4.setText(b.j(this, 2131887991, new Object[]{quantityString2}, null, 4));
         MaterialRadioButton materialRadioButton5 = getBinding().d;
         m.checkNotNullExpressionValue(materialRadioButton5, "binding.setCustomStatusExpiration1Hour");
         setExpirationOnCheck(materialRadioButton5, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_1_HOUR);
@@ -242,7 +242,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment {
         CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources3, requireContext(), 2131755056, 4, 4);
         MaterialRadioButton materialRadioButton6 = getBinding().f;
         m.checkNotNullExpressionValue(materialRadioButton6, "binding.setCustomStatusExpiration4Hours");
-        materialRadioButton6.setText(b.j(this, 2131887992, new Object[]{quantityString3}, null, 4));
+        materialRadioButton6.setText(b.j(this, 2131887991, new Object[]{quantityString3}, null, 4));
         MaterialRadioButton materialRadioButton7 = getBinding().f;
         m.checkNotNullExpressionValue(materialRadioButton7, "binding.setCustomStatusExpiration4Hours");
         setExpirationOnCheck(materialRadioButton7, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_4_HOURS);
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
index f6f5fd3f78..9d7a7dc180 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java
@@ -76,9 +76,9 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
         }
 
         private final Observable<StoreState> observeStoreState(StoreUserSettings storeUserSettings, StoreEmoji storeEmoji) {
-            Observable<StoreState> a02 = Observable.j(storeUserSettings.observeCustomStatus(), storeEmoji.getEmojiSet(StoreEmoji.EmojiContext.Global.INSTANCE, false, false), WidgetUserSetCustomStatusViewModel$Companion$observeStoreState$1.INSTANCE).a0(1);
-            m.checkNotNullExpressionValue(a02, "Observable.combineLatest…        )\n      }.take(1)");
-            return a02;
+            Observable<StoreState> Z = Observable.j(storeUserSettings.observeCustomStatus(), storeEmoji.getEmojiSet(StoreEmoji.EmojiContext.Global.INSTANCE, false, false), WidgetUserSetCustomStatusViewModel$Companion$observeStoreState$1.INSTANCE).Z(1);
+            m.checkNotNullExpressionValue(Z, "Observable.combineLatest…        )\n      }.take(1)");
+            return Z;
         }
 
         public final FormState.Expiration getDEFAULT_EXPIRATION() {
@@ -474,7 +474,7 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
         this.storeUserSettings = storeUserSettings;
         this.clock = clock;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetUserSetCustomStatusViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -507,12 +507,12 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel<ViewS
 
     private final void emitSetStatusFailureEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.SetStatusFailure(2131888049));
+        publishSubject.j.onNext(new Event.SetStatusFailure(2131888048));
     }
 
     private final void emitSetStatusSuccessEvent() {
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.SetStatusSuccess(2131888004));
+        publishSubject.j.onNext(new Event.SetStatusSuccess(2131888003));
     }
 
     private final Emoji getEmojiFromSetting(ModelCustomStatusSetting modelCustomStatusSetting, EmojiSet emojiSet) {
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java
index ca1f1e3313..2b476fadf7 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java
@@ -3,7 +3,7 @@ package com.discord.widgets.user;
 import android.view.View;
 import android.widget.TextView;
 import androidx.core.widget.NestedScrollView;
-import c.a.i.q3;
+import c.a.i.t3;
 import com.discord.databinding.WidgetUserStatusUpdateBinding;
 import com.discord.widgets.user.profile.UserStatusPresenceCustomView;
 import d0.z.d.k;
@@ -19,28 +19,28 @@ public final /* synthetic */ class WidgetUserStatusSheet$binding$2 extends k imp
 
     public final WidgetUserStatusUpdateBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363342;
-        TextView textView = (TextView) view.findViewById(2131363342);
+        int i = 2131363368;
+        TextView textView = (TextView) view.findViewById(2131363368);
         if (textView != null) {
-            i = 2131365464;
-            UserStatusPresenceCustomView userStatusPresenceCustomView = (UserStatusPresenceCustomView) view.findViewById(2131365464);
+            i = 2131365524;
+            UserStatusPresenceCustomView userStatusPresenceCustomView = (UserStatusPresenceCustomView) view.findViewById(2131365524);
             if (userStatusPresenceCustomView != null) {
-                i = 2131365465;
-                View findViewById = view.findViewById(2131365465);
+                i = 2131365525;
+                View findViewById = view.findViewById(2131365525);
                 if (findViewById != null) {
-                    q3 a = q3.a(findViewById);
-                    i = 2131365466;
-                    View findViewById2 = view.findViewById(2131365466);
+                    t3 a = t3.a(findViewById);
+                    i = 2131365526;
+                    View findViewById2 = view.findViewById(2131365526);
                     if (findViewById2 != null) {
-                        q3 a2 = q3.a(findViewById2);
-                        i = 2131365467;
-                        View findViewById3 = view.findViewById(2131365467);
+                        t3 a2 = t3.a(findViewById2);
+                        i = 2131365527;
+                        View findViewById3 = view.findViewById(2131365527);
                         if (findViewById3 != null) {
-                            q3 a3 = q3.a(findViewById3);
-                            i = 2131365468;
-                            View findViewById4 = view.findViewById(2131365468);
+                            t3 a3 = t3.a(findViewById3);
+                            i = 2131365528;
+                            View findViewById4 = view.findViewById(2131365528);
                             if (findViewById4 != null) {
-                                return new WidgetUserStatusUpdateBinding((NestedScrollView) view, textView, userStatusPresenceCustomView, a, a2, a3, q3.a(findViewById4));
+                                return new WidgetUserStatusUpdateBinding((NestedScrollView) view, textView, userStatusPresenceCustomView, a, a2, a3, t3.a(findViewById4));
                             }
                         }
                     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
index 218ede0191..12df908834 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java
@@ -9,7 +9,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentViewModelLazyKt;
 import c.a.d.h0;
 import c.a.d.j0;
-import c.a.i.q3;
+import c.a.i.t3;
 import c.d.b.a.a;
 import com.discord.api.presence.ClientStatus;
 import com.discord.app.AppBottomSheet;
@@ -109,7 +109,7 @@ public final class WidgetUserStatusSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559276;
+        return 2131559285;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -128,28 +128,28 @@ public final class WidgetUserStatusSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f.b.setImageResource(2131231962);
-        getBinding().f.d.setText(2131893511);
-        q3 q3Var = getBinding().f;
-        m.checkNotNullExpressionValue(q3Var, "binding.userStatusUpdateOnline");
-        q3Var.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$1(this));
-        getBinding().d.b.setImageResource(2131231960);
-        getBinding().d.d.setText(2131893507);
-        q3 q3Var2 = getBinding().d;
-        m.checkNotNullExpressionValue(q3Var2, "binding.userStatusUpdateIdle");
-        q3Var2.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$2(this));
-        getBinding().f1998c.b.setImageResource(2131231959);
-        getBinding().f1998c.d.setText(2131893505);
-        getBinding().f1998c.f143c.setText(2131893506);
-        q3 q3Var3 = getBinding().f1998c;
-        m.checkNotNullExpressionValue(q3Var3, "binding.userStatusUpdateDnd");
-        q3Var3.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$3(this));
-        getBinding().e.b.setImageResource(2131231961);
-        getBinding().e.d.setText(2131893508);
-        getBinding().e.f143c.setText(2131893509);
-        q3 q3Var4 = getBinding().e;
-        m.checkNotNullExpressionValue(q3Var4, "binding.userStatusUpdateInvisible");
-        q3Var4.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$4(this));
+        getBinding().f.b.setImageResource(2131231970);
+        getBinding().f.d.setText(2131893595);
+        t3 t3Var = getBinding().f;
+        m.checkNotNullExpressionValue(t3Var, "binding.userStatusUpdateOnline");
+        t3Var.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$1(this));
+        getBinding().d.b.setImageResource(2131231968);
+        getBinding().d.d.setText(2131893591);
+        t3 t3Var2 = getBinding().d;
+        m.checkNotNullExpressionValue(t3Var2, "binding.userStatusUpdateIdle");
+        t3Var2.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$2(this));
+        getBinding().f2003c.b.setImageResource(2131231967);
+        getBinding().f2003c.d.setText(2131893589);
+        getBinding().f2003c.f159c.setText(2131893590);
+        t3 t3Var3 = getBinding().f2003c;
+        m.checkNotNullExpressionValue(t3Var3, "binding.userStatusUpdateDnd");
+        t3Var3.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$3(this));
+        getBinding().e.b.setImageResource(2131231969);
+        getBinding().e.d.setText(2131893592);
+        getBinding().e.f159c.setText(2131893593);
+        t3 t3Var4 = getBinding().e;
+        m.checkNotNullExpressionValue(t3Var4, "binding.userStatusUpdateInvisible");
+        t3Var4.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$4(this));
         getBinding().b.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$5(this));
         getBinding().b.setOnClear(new WidgetUserStatusSheet$onViewCreated$6(this));
     }
diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java
index ce2026a7bb..ee41385d94 100644
--- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheetViewModel.java
@@ -75,9 +75,9 @@ public final class WidgetUserStatusSheetViewModel extends AppViewModel<ViewState
         }
 
         private final Observable<StoreState> observeStoreState(StoreUserPresence storeUserPresence) {
-            Observable<R> G = storeUserPresence.observeLocalPresence().G(WidgetUserStatusSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "storePresences\n         …          )\n            }");
-            return G;
+            Observable<R> F = storeUserPresence.observeLocalPresence().F(WidgetUserStatusSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storePresences\n         …          )\n            }");
+            return F;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java
index 59b99fc340..19bebaa13c 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java
@@ -18,17 +18,17 @@ public final /* synthetic */ class WidgetUserAccountVerify$binding$2 extends k i
 
     public final WidgetUserAccountVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365476;
-        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365476);
+        int i = 2131365537;
+        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365537);
         if (relativeLayout != null) {
-            i = 2131365477;
-            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365477);
+            i = 2131365538;
+            RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365538);
             if (relativeLayout2 != null) {
-                i = 2131365478;
-                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365478);
+                i = 2131365539;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365539);
                 if (linkifiedTextView != null) {
-                    i = 2131365479;
-                    TextView textView = (TextView) view.findViewById(2131365479);
+                    i = 2131365540;
+                    TextView textView = (TextView) view.findViewById(2131365540);
                     if (textView != null) {
                         return new WidgetUserAccountVerifyBinding((RelativeLayout) view, relativeLayout, relativeLayout2, linkifiedTextView, textView);
                     }
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
index 16ea30527d..62d6b03e07 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java
@@ -51,7 +51,7 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserAccountVerify() {
-        super(2131559259);
+        super(2131559268);
     }
 
     private final WidgetUserAccountVerifyBinding getBinding() {
@@ -67,14 +67,14 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase {
         WidgetUserAccountVerifyBinding binding = getBinding();
         TextView textView = binding.e;
         m.checkNotNullExpressionValue(textView, "verifyAccountTextBody");
-        textView.setText(b.j(this, 2131894426, new Object[0], null, 4));
+        textView.setText(b.j(this, 2131894545, new Object[0], null, 4));
         LinkifiedTextView linkifiedTextView = binding.d;
         m.checkNotNullExpressionValue(linkifiedTextView, "verifyAccountSupport");
-        linkifiedTextView.setText(b.j(this, 2131894434, new Object[]{f.c()}, null, 4));
+        linkifiedTextView.setText(b.j(this, 2131894553, new Object[]{f.c()}, null, 4));
         RelativeLayout relativeLayout = binding.b;
         relativeLayout.setVisibility(isEmailAllowed() ? 0 : 8);
         relativeLayout.setOnClickListener(new WidgetUserAccountVerify$onViewBound$$inlined$with$lambda$1(this));
-        RelativeLayout relativeLayout2 = binding.f1981c;
+        RelativeLayout relativeLayout2 = binding.f1986c;
         if (!isPhoneAllowed()) {
             i = 8;
         }
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java
index b7308a0505..3b646b5cd4 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java
@@ -11,7 +11,7 @@ public final class WidgetUserAccountVerifyBase$setOptionsMenu$1<T1, T2> implemen
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363907) {
+        if (menuItem.getItemId() == 2131363948) {
             StoreStream.Companion.getAuthentication().logout();
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java
index 9805c9a5c7..44ba745694 100644
--- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java
+++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.java
@@ -96,9 +96,9 @@ public abstract class WidgetUserAccountVerifyBase extends AppFragment {
         StoreStream.Companion companion = StoreStream.Companion;
         Observable j = Observable.j(companion.getUserRequiredActions().observeUserRequiredAction(), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), new WidgetUserAccountVerifyBase$getShouldDismissObservable$1(this));
         m.checkNotNullExpressionValue(j, "Observable\n        .comb…requiredAction)\n        }");
-        Observable<Boolean> s2 = ObservableExtensionsKt.computationBuffered(j).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n        .comb…  .distinctUntilChanged()");
-        return s2;
+        Observable<Boolean> r = ObservableExtensionsKt.computationBuffered(j).r();
+        m.checkNotNullExpressionValue(r, "Observable\n        .comb…  .distinctUntilChanged()");
+        return r;
     }
 
     private final void handleIsAuthorized(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java
index e43c702d40..4fc031500c 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$binding$2.java
@@ -32,8 +32,8 @@ public final /* synthetic */ class WidgetUserEmailUpdate$binding$2 extends k imp
                     i = 2131361954;
                     TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131361954);
                     if (textInputLayout2 != null) {
-                        i = 2131362896;
-                        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+                        i = 2131362921;
+                        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
                         if (dimmerView != null) {
                             return new WidgetUserEmailUpdateBinding((RelativeLayout) view, linearLayout, materialButton, textInputLayout, textInputLayout2, dimmerView);
                         }
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java
index d4ad7c6c03..495427631a 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java
@@ -36,7 +36,7 @@ public final class WidgetUserEmailUpdate$onViewBound$3 implements View.OnClickLi
     public final void onClick(View view) {
         RestAPI api = RestAPI.Companion.getApi();
         RestAPIParams.UserInfo.Companion companion = RestAPIParams.UserInfo.Companion;
-        TextInputLayout textInputLayout = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).f1982c;
+        TextInputLayout textInputLayout = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).f1987c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangeEmail");
         String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
         TextInputLayout textInputLayout2 = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).d;
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
index 286a08968c..cac76fa351 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java
@@ -69,7 +69,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserEmailUpdate() {
-        super(2131559260);
+        super(2131559269);
     }
 
     public static final /* synthetic */ WidgetUserEmailUpdateBinding access$getBinding$p(WidgetUserEmailUpdate widgetUserEmailUpdate) {
@@ -94,7 +94,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase {
         m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangePassword");
         if (ViewExtensions.getTextOrEmpty(textInputLayout).length() >= 3) {
             Pattern pattern = Patterns.EMAIL_ADDRESS;
-            TextInputLayout textInputLayout2 = getBinding().f1982c;
+            TextInputLayout textInputLayout2 = getBinding().f1987c;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.alertVerifyEmailChangeEmail");
             if (pattern.matcher(ViewExtensions.getTextOrEmpty(textInputLayout2)).matches()) {
                 z2 = true;
@@ -125,7 +125,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
         AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null);
-        TextInputLayout textInputLayout = getBinding().f1982c;
+        TextInputLayout textInputLayout = getBinding().f1987c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangeEmail");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetUserEmailUpdate$onViewBound$1(this));
         TextInputLayout textInputLayout2 = getBinding().d;
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java
index 5b55dd48bc..91dd04e8d3 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java
@@ -37,7 +37,7 @@ public final class WidgetUserEmailVerify$configureUI$2 implements View.OnClickLi
         public final void invoke(Void r6) {
             WidgetUserEmailVerify$configureUI$2 widgetUserEmailVerify$configureUI$2 = this.this$0;
             WidgetUserEmailVerify widgetUserEmailVerify = widgetUserEmailVerify$configureUI$2.this$0;
-            c.a.d.o.j(widgetUserEmailVerify, b.j(widgetUserEmailVerify, 2131894428, new Object[]{widgetUserEmailVerify$configureUI$2.$model.getEmail()}, null, 4), 0, 4);
+            c.a.d.o.j(widgetUserEmailVerify, b.j(widgetUserEmailVerify, 2131894547, new Object[]{widgetUserEmailVerify$configureUI$2.$model.getEmail()}, null, 4), 0, 4);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
index 31611c2de8..4385fec247 100644
--- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java
@@ -49,7 +49,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
         private final String email;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2150me;
+        private final MeUser f2156me;
         private final boolean verified;
 
         /* compiled from: WidgetUserEmailVerify.kt */
@@ -62,28 +62,28 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
             }
 
             public final Observable<Model> get() {
-                Observable<Model> s2 = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).G(WidgetUserEmailVerify$Model$Companion$get$1.INSTANCE).s();
-                m.checkNotNullExpressionValue(s2, "getUsers()\n            .…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = StoreUser.observeMe$default(StoreStream.Companion.getUsers(), false, 1, null).F(WidgetUserEmailVerify$Model$Companion$get$1.INSTANCE).r();
+                m.checkNotNullExpressionValue(r, "getUsers()\n            .…  .distinctUntilChanged()");
+                return r;
             }
         }
 
         public Model(MeUser meUser) {
             m.checkNotNullParameter(meUser, "me");
-            this.f2150me = meUser;
+            this.f2156me = meUser;
             this.email = meUser.getEmail();
             this.verified = meUser.isVerified();
         }
 
         public static /* synthetic */ Model copy$default(Model model, MeUser meUser, int i, Object obj) {
             if ((i & 1) != 0) {
-                meUser = model.f2150me;
+                meUser = model.f2156me;
             }
             return model.copy(meUser);
         }
 
         public final MeUser component1() {
-            return this.f2150me;
+            return this.f2156me;
         }
 
         public final Model copy(MeUser meUser) {
@@ -93,7 +93,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
 
         public boolean equals(Object obj) {
             if (this != obj) {
-                return (obj instanceof Model) && m.areEqual(this.f2150me, ((Model) obj).f2150me);
+                return (obj instanceof Model) && m.areEqual(this.f2156me, ((Model) obj).f2156me);
             }
             return true;
         }
@@ -103,7 +103,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
         }
 
         public final MeUser getMe() {
-            return this.f2150me;
+            return this.f2156me;
         }
 
         public final boolean getVerified() {
@@ -111,7 +111,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2150me;
+            MeUser meUser = this.f2156me;
             if (meUser != null) {
                 return meUser.hashCode();
             }
@@ -120,14 +120,14 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
 
         public String toString() {
             StringBuilder L = a.L("Model(me=");
-            L.append(this.f2150me);
+            L.append(this.f2156me);
             L.append(")");
             return L.toString();
         }
     }
 
     public WidgetUserEmailVerify() {
-        super(2131559261);
+        super(2131559270);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserEmailVerify widgetUserEmailVerify, Model model) {
@@ -150,7 +150,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase {
             WidgetUserEmailUpdate.Companion.launch(requireContext(), getMode(), this.emailUpdateLauncher);
         } else {
             getBinding().b.setOnClickListener(new WidgetUserEmailVerify$configureUI$1(this));
-            getBinding().f1983c.setOnClickListener(new WidgetUserEmailVerify$configureUI$2(this, model));
+            getBinding().f1988c.setOnClickListener(new WidgetUserEmailVerify$configureUI$2(this, model));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java
index 25e55ce593..75b0c1e750 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java
@@ -20,23 +20,23 @@ public final /* synthetic */ class WidgetUserPhoneManage$binding$2 extends k imp
 
     public final WidgetUserPhoneManageBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362896;
-        DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+        int i = 2131362921;
+        DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
         if (dimmerView != null) {
-            i = 2131364411;
-            TextView textView = (TextView) view.findViewById(2131364411);
+            i = 2131364449;
+            TextView textView = (TextView) view.findViewById(2131364449);
             if (textView != null) {
-                i = 2131365382;
-                TextView textView2 = (TextView) view.findViewById(2131365382);
+                i = 2131365442;
+                TextView textView2 = (TextView) view.findViewById(2131365442);
                 if (textView2 != null) {
-                    i = 2131365383;
-                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365383);
+                    i = 2131365443;
+                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365443);
                     if (materialButton != null) {
-                        i = 2131365384;
-                        PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131365384);
+                        i = 2131365444;
+                        PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131365444);
                         if (phoneOrEmailInputView != null) {
-                            i = 2131365385;
-                            TextView textView3 = (TextView) view.findViewById(2131365385);
+                            i = 2131365445;
+                            TextView textView3 = (TextView) view.findViewById(2131365445);
                             if (textView3 != null) {
                                 return new WidgetUserPhoneManageBinding((FrameLayout) view, dimmerView, textView, textView2, materialButton, phoneOrEmailInputView, textView3);
                             }
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
index acfe655ea4..5346f1a6db 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java
@@ -65,7 +65,7 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserPhoneManage() {
-        super(2131559267);
+        super(2131559276);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetUserPhoneManage widgetUserPhoneManage, MeUser meUser) {
@@ -102,22 +102,22 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
 
     private final void configureUI(MeUser meUser) {
         if (meUser.getPhoneNumber() != null) {
-            getBinding().g.setText(2131891879);
+            getBinding().g.setText(2131891951);
             TextView textView = getBinding().d;
             m.checkNotNullExpressionValue(textView, "binding.userPhoneAddDescriptionNote");
-            b.n(textView, 2131891875, new Object[]{meUser.getPhoneNumber()}, null, 4);
-            TextView textView2 = getBinding().f1987c;
+            b.m(textView, 2131891947, new Object[]{meUser.getPhoneNumber()}, null, 4);
+            TextView textView2 = getBinding().f1992c;
             m.checkNotNullExpressionValue(textView2, "binding.removePhone");
             textView2.setVisibility(0);
         } else {
             getBinding().g.setText(2131888375);
             getBinding().d.setText(2131888372);
-            TextView textView3 = getBinding().f1987c;
+            TextView textView3 = getBinding().f1992c;
             m.checkNotNullExpressionValue(textView3, "binding.removePhone");
             textView3.setVisibility(8);
         }
         if (meUser.getEmail() == null) {
-            TextView textView4 = getBinding().f1987c;
+            TextView textView4 = getBinding().f1992c;
             m.checkNotNullExpressionValue(textView4, "binding.removePhone");
             textView4.setVisibility(8);
         }
@@ -148,16 +148,16 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
         m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
         Resources resources = getResources();
         m.checkNotNullExpressionValue(resources, "resources");
-        CharSequence h = b.h(resources, 2131894275, new Object[0], null, 4);
+        CharSequence h = b.h(resources, 2131894377, new Object[0], null, 4);
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        CharSequence h2 = b.h(resources2, 2131894274, new Object[0], null, 4);
+        CharSequence h2 = b.h(resources2, 2131894376, new Object[0], null, 4);
         Resources resources3 = getResources();
         m.checkNotNullExpressionValue(resources3, "resources");
-        CharSequence h3 = b.h(resources3, 2131892558, new Object[0], null, 4);
+        CharSequence h3 = b.h(resources3, 2131892639, new Object[0], null, 4);
         Resources resources4 = getResources();
         m.checkNotNullExpressionValue(resources4, "resources");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, h, h2, h3, b.h(resources4, 2131887178, new Object[0], null, 4), g0.mapOf(o.to(2131364032, new WidgetUserPhoneManage$removePhoneNumber$1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, h, h2, h3, b.h(resources4, 2131887178, new Object[0], null, 4), g0.mapOf(o.to(2131364075, new WidgetUserPhoneManage$removePhoneNumber$1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
     }
 
     @Override // com.discord.widgets.user.account.WidgetUserAccountVerifyBase, com.discord.app.AppFragment
@@ -170,7 +170,7 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase {
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{phone}, false, null, null, new WidgetUserPhoneManage$onViewBound$1(phone), 14, null), this, null, 2, null), WidgetUserPhoneManage.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserPhoneManage$onViewBound$2(this), 62, (Object) null);
         getBinding().f.a(this, new WidgetUserPhoneManage$onViewBound$3(this));
         getBinding().e.setOnClickListener(new WidgetUserPhoneManage$onViewBound$4(this));
-        getBinding().f1987c.setOnClickListener(new WidgetUserPhoneManage$onViewBound$5(this));
+        getBinding().f1992c.setOnClickListener(new WidgetUserPhoneManage$onViewBound$5(this));
     }
 
     @Override // com.discord.widgets.user.account.WidgetUserAccountVerifyBase, com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java
index 16d53f3366..609cbf1bc6 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetUserPhoneVerify$binding$2 extends k imp
 
     public final WidgetUserPhoneVerifyBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362632;
-        ImageView imageView = (ImageView) view.findViewById(2131362632);
+        int i = 2131362656;
+        ImageView imageView = (ImageView) view.findViewById(2131362656);
         if (imageView != null) {
-            i = 2131362896;
-            DimmerView dimmerView = (DimmerView) view.findViewById(2131362896);
+            i = 2131362921;
+            DimmerView dimmerView = (DimmerView) view.findViewById(2131362921);
             if (dimmerView != null) {
-                i = 2131364213;
-                CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131364213);
+                i = 2131364257;
+                CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131364257);
                 if (codeVerificationView != null) {
                     return new WidgetUserPhoneVerifyBinding((RelativeLayout) view, imageView, dimmerView, codeVerificationView);
                 }
diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
index cc1eb45d19..50f2ce107f 100644
--- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
+++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java
@@ -63,7 +63,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     }
 
     public WidgetUserPhoneVerify() {
-        super(2131559268);
+        super(2131559277);
     }
 
     public static final /* synthetic */ WidgetUserPhoneVerifyBinding access$getBinding$p(WidgetUserPhoneVerify widgetUserPhoneVerify) {
@@ -94,7 +94,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
         String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_PHONE_NUMBER");
         if (stringExtra != null) {
             m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…A_PHONE_NUMBER) ?: return");
-            ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), false, 1, null), getBinding().f1988c, 0, 2, null), this, null, 2, null).k(q.h(new WidgetUserPhoneVerify$handleCodeEntered$1(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$2(this)));
+            ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), false, 1, null), getBinding().f1993c, 0, 2, null), this, null, 2, null).k(q.h(new WidgetUserPhoneVerify$handleCodeEntered$1(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$2(this)));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java
index 6d7d50507f..901c9de1ef 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence$Companion$get$1.java
@@ -17,6 +17,6 @@ public final class ModelRichPresence$Companion$get$1<T, R> implements b<Presence
             return new j(null);
         }
         Activity primaryActivity = PresenceUtils.INSTANCE.getPrimaryActivity(presence);
-        return (primaryActivity == null || (a = primaryActivity.a()) == null) ? new j(new ModelRichPresence(presence, null, 2, null)) : StoreStream.Companion.getApplication().observeApplication(Long.valueOf(a.longValue())).G(new ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1(presence));
+        return (primaryActivity == null || (a = primaryActivity.a()) == null) ? new j(new ModelRichPresence(presence, null, 2, null)) : StoreStream.Companion.getApplication().observeApplication(Long.valueOf(a.longValue())).F(new ModelRichPresence$Companion$get$1$$special$$inlined$let$lambda$1(presence));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java
index 99b926570f..0ec14118f7 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelRichPresence.java
@@ -34,9 +34,9 @@ public final class ModelRichPresence {
 
         public final Observable<ModelRichPresence> get(long j, StoreUserPresence storeUserPresence) {
             m.checkNotNullParameter(storeUserPresence, "storeUserPresence");
-            Observable<R> Z = storeUserPresence.observePresenceForUser(j).Z(ModelRichPresence$Companion$get$1.INSTANCE);
-            m.checkNotNullExpressionValue(Z, "storeUserPresence\n      …          }\n            }");
-            return Z;
+            Observable<R> Y = storeUserPresence.observePresenceForUser(j).Y(ModelRichPresence$Companion$get$1.INSTANCE);
+            m.checkNotNullExpressionValue(Y, "storeUserPresence\n      …          }\n            }");
+            return Y;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
index 7aa8b2cdb1..708b1bafff 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ModelStageRichPresence.java
@@ -44,9 +44,9 @@ public final class ModelStageRichPresence {
 
         public final Observable<List<ModelStageRichPresence>> observeStageRichPresence(StoreUserPresence storeUserPresence) {
             m.checkNotNullParameter(storeUserPresence, "storeUserPresence");
-            Observable<R> G = storeUserPresence.observeAllPresences().G(ModelStageRichPresence$Companion$observeStageRichPresence$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "storeUserPresence\n      …   }.toList()\n          }");
-            return G;
+            Observable<R> F = storeUserPresence.observeAllPresences().F(ModelStageRichPresence$Companion$observeStageRichPresence$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storeUserPresence\n      …   }.toList()\n          }");
+            return F;
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java
index 1c104c98c9..301c1b7702 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java
@@ -54,7 +54,7 @@ public final class ViewHolderGameRichPresence extends ViewHolderUserRichPresence
                 ActivityParty i = activity.i();
                 if (i != null) {
                     PresenceUtils presenceUtils = PresenceUtils.INSTANCE;
-                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = getRoot().getContext()) == null) ? null : b.g(context, 2131894206, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
+                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = getRoot().getContext()) == null) ? null : b.g(context, 2131894307, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
                 }
                 charSequence = "";
                 String str2 = l + ' ' + charSequence;
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java
index 2eac0edfa4..00fecfd532 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java
@@ -87,14 +87,14 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc
         TextView richPresenceDetails = getRichPresenceDetails();
         if (richPresenceDetails != null) {
             m.checkNotNullExpressionValue(context2, "context");
-            ViewExtensions.setTextAndVisibilityBy(richPresenceDetails, b.g(context2, 2131894199, new Object[]{replace$default}, null, 4));
+            ViewExtensions.setTextAndVisibilityBy(richPresenceDetails, b.g(context2, 2131894300, new Object[]{replace$default}, null, 4));
         }
         TextView richPresenceTime = getRichPresenceTime();
         m.checkNotNullExpressionValue(context2, "context");
         Object[] objArr = new Object[1];
         ActivityAssets b = primaryActivity.b();
         objArr[0] = b != null ? b.b() : null;
-        ViewExtensions.setTextAndVisibilityBy(richPresenceTime, b.g(context2, 2131894198, objArr, null, 4));
+        ViewExtensions.setTextAndVisibilityBy(richPresenceTime, b.g(context2, 2131894299, objArr, null, 4));
         getRichPresenceTextContainer().setSelected(true);
         configureAssetUi(primaryActivity, streamContext);
         Button richPresencePrimaryButton = getRichPresencePrimaryButton();
@@ -111,7 +111,7 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc
         if (z2) {
             Button richPresencePrimaryButton2 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton2 != null) {
-                b.n(richPresencePrimaryButton2, 2131894177, new Object[0], null, 4);
+                b.m(richPresencePrimaryButton2, 2131894278, new Object[0], null, 4);
             }
             Button richPresencePrimaryButton3 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton3 != null) {
@@ -120,7 +120,7 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc
         } else {
             Button richPresencePrimaryButton4 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton4 != null) {
-                b.n(richPresencePrimaryButton4, 2131894202, new Object[]{primaryActivity.h()}, null, 4);
+                b.m(richPresencePrimaryButton4, 2131894303, new Object[]{primaryActivity.h()}, null, 4);
             }
             Button richPresencePrimaryButton5 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton5 != null) {
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java
index ae3a4d4b1a..ffe33ff059 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java
@@ -118,12 +118,12 @@ public final class ViewHolderPlatformRichPresence extends ViewHolderUserRichPres
         if (richPresencePrimaryButton2 != null) {
             Context context3 = getRoot().getContext();
             m.checkNotNullExpressionValue(context3, "root.context");
-            richPresencePrimaryButton2.setText(b.g(context3, 2131894180, new Object[]{from.getProperName()}, null, 4));
+            richPresencePrimaryButton2.setText(b.g(context3, 2131894281, new Object[]{from.getProperName()}, null, 4));
         }
         if (from.getEnabled()) {
-            Observable s2 = StoreStream.Companion.getUserConnections().observeConnectedAccounts().G(new ViewHolderPlatformRichPresence$configureUi$1(from)).s();
-            m.checkNotNullExpressionValue(s2, "StoreStream\n          .g…  .distinctUntilChanged()");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(s2), ViewHolderPlatformRichPresence.class, (Context) null, new ViewHolderPlatformRichPresence$configureUi$2(this.subscriptions), (Function1) null, (Function0) null, (Function0) null, new ViewHolderPlatformRichPresence$configureUi$3(this), 58, (Object) null);
+            Observable r = StoreStream.Companion.getUserConnections().observeConnectedAccounts().F(new ViewHolderPlatformRichPresence$configureUi$1(from)).r();
+            m.checkNotNullExpressionValue(r, "StoreStream\n          .g…  .distinctUntilChanged()");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(r), ViewHolderPlatformRichPresence.class, (Context) null, new ViewHolderPlatformRichPresence$configureUi$2(this.subscriptions), (Function1) null, (Function0) null, (Function0) null, new ViewHolderPlatformRichPresence$configureUi$3(this), 58, (Object) null);
             Button richPresencePrimaryButton3 = getRichPresencePrimaryButton();
             if (richPresencePrimaryButton3 != null) {
                 richPresencePrimaryButton3.setOnClickListener(new ViewHolderPlatformRichPresence$configureUi$4(from));
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java
index 1ec96defa0..1a3a90b484 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java
@@ -116,7 +116,7 @@ public final class ViewHolderStageChannelRichPresence extends ViewHolderUserRich
                 richPresenceDetails.setVisibility((b != null ? b.d() : null) != null ? 0 : 8);
                 ActivityAssets b2 = activity.b();
                 if (b2 != null && (d = b2.d()) != null) {
-                    b.n(richPresenceDetails, 2131893397, new Object[]{d}, null, 4);
+                    b.m(richPresenceDetails, 2131893480, new Object[]{d}, null, 4);
                     return;
                 }
                 return;
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java
index d20450ca19..2f8a464db2 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java
@@ -63,7 +63,7 @@ public final class ViewHolderStreamRichPresence extends ViewHolderUserRichPresen
         if (activityParty != null) {
             PresenceUtils presenceUtils = PresenceUtils.INSTANCE;
             if (presenceUtils.getMaxSize(activityParty) != 0) {
-                charSequence = b.i(getRoot(), 2131894206, new Object[]{String.valueOf(presenceUtils.getCurrentSize(activityParty)), String.valueOf(presenceUtils.getMaxSize(activityParty))}, null, 4);
+                charSequence = b.i(getRoot(), 2131894307, new Object[]{String.valueOf(presenceUtils.getCurrentSize(activityParty)), String.valueOf(presenceUtils.getMaxSize(activityParty))}, null, 4);
             }
         }
         charSequence = "";
@@ -84,7 +84,7 @@ public final class ViewHolderStreamRichPresence extends ViewHolderUserRichPresen
             Guild guild = streamContext.getGuild();
             CharSequence charSequence = null;
             String name = guild != null ? guild.getName() : null;
-            getRichPresenceHeader().setText(name != null ? b.i(getRichPresenceHeader(), 2131894187, new Object[]{name}, null, 4) : b.i(getRichPresenceHeader(), 2131894186, new Object[0], null, 4));
+            getRichPresenceHeader().setText(name != null ? b.i(getRichPresenceHeader(), 2131894288, new Object[]{name}, null, 4) : b.i(getRichPresenceHeader(), 2131894287, new Object[0], null, 4));
             if (activity == null || !ActivityUtilsKt.isGameActivity(activity)) {
                 getRichPresenceTextContainer().setVisibility(8);
                 return;
diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
index 608b1190c9..68aefc1339 100644
--- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
+++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java
@@ -17,11 +17,11 @@ import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.view.ViewKt;
 import androidx.fragment.app.FragmentManager;
-import c.a.i.g5;
-import c.a.i.h5;
+import c.a.i.a5;
+import c.a.i.b5;
+import c.a.i.j5;
 import c.a.i.k5;
-import c.a.i.x4;
-import c.a.i.y4;
+import c.a.i.n5;
 import c.a.l.b;
 import com.discord.api.activity.Activity;
 import com.discord.api.activity.ActivityAssets;
@@ -100,7 +100,7 @@ public class ViewHolderUserRichPresence {
             int i5;
             LayoutInflater from = LayoutInflater.from(viewGroup.getContext());
             if (i == 1) {
-                k5 a = k5.a(from, viewGroup, true);
+                n5 a = n5.a(from, viewGroup, true);
                 m.checkNotNullExpressionValue(a, "WidgetUserRichPresenceBi…e(inflater, parent, true)");
                 SimpleDraweeView simpleDraweeView = a.e;
                 m.checkNotNullExpressionValue(simpleDraweeView, "binding.richPresenceImageLarge");
@@ -110,7 +110,7 @@ public class ViewHolderUserRichPresence {
                 m.checkNotNullExpressionValue(textView, "binding.richPresenceHeader");
                 TextView textView2 = a.k;
                 m.checkNotNullExpressionValue(textView2, "binding.richPresenceTitle");
-                TextView textView3 = a.f119c;
+                TextView textView3 = a.f135c;
                 m.checkNotNullExpressionValue(textView3, "binding.richPresenceDetails");
                 TextView textView4 = a.j;
                 m.checkNotNullExpressionValue(textView4, "binding.richPresenceTime");
@@ -125,27 +125,27 @@ public class ViewHolderUserRichPresence {
                 return new ViewHolderGameRichPresence(viewGroup, simpleDraweeView, simpleDraweeView2, textView, textView2, textView3, textView4, textView5, linearLayout, materialButton, materialButton2);
             } else if (i != 2) {
                 if (i == 3) {
-                    View inflate = from.inflate(2131559108, viewGroup, false);
+                    View inflate = from.inflate(2131559114, viewGroup, false);
                     viewGroup.addView(inflate);
-                    Barrier barrier = (Barrier) inflate.findViewById(2131362092);
+                    Barrier barrier = (Barrier) inflate.findViewById(2131362097);
                     if (barrier != null) {
-                        Space space = (Space) inflate.findViewById(2131363540);
+                        Space space = (Space) inflate.findViewById(2131363581);
                         if (space != null) {
-                            LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131364438);
+                            LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131364476);
                             if (linearLayout2 != null) {
-                                TextView textView6 = (TextView) inflate.findViewById(2131364440);
+                                TextView textView6 = (TextView) inflate.findViewById(2131364478);
                                 if (textView6 != null) {
-                                    SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) inflate.findViewById(2131364441);
+                                    SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) inflate.findViewById(2131364479);
                                     if (simpleDraweeView3 != null) {
-                                        SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) inflate.findViewById(2131364444);
+                                        SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) inflate.findViewById(2131364482);
                                         if (simpleDraweeView4 != null) {
-                                            MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131364448);
+                                            MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131364486);
                                             if (materialButton3 != null) {
-                                                TextView textView7 = (TextView) inflate.findViewById(2131364452);
+                                                TextView textView7 = (TextView) inflate.findViewById(2131364490);
                                                 if (textView7 != null) {
-                                                    TextView textView8 = (TextView) inflate.findViewById(2131364453);
+                                                    TextView textView8 = (TextView) inflate.findViewById(2131364491);
                                                     if (textView8 != null) {
-                                                        m.checkNotNullExpressionValue(new y4((LinearLayout) inflate, barrier, space, linearLayout2, textView6, simpleDraweeView3, simpleDraweeView4, materialButton3, textView7, textView8), "WidgetPlatformRichPresen…e(inflater, parent, true)");
+                                                        m.checkNotNullExpressionValue(new b5((LinearLayout) inflate, barrier, space, linearLayout2, textView6, simpleDraweeView3, simpleDraweeView4, materialButton3, textView7, textView8), "WidgetPlatformRichPresen…e(inflater, parent, true)");
                                                         m.checkNotNullExpressionValue(simpleDraweeView3, "binding.richPresenceImageLarge");
                                                         m.checkNotNullExpressionValue(simpleDraweeView4, "binding.richPresenceImageSmall");
                                                         m.checkNotNullExpressionValue(textView6, "binding.richPresenceHeader");
@@ -155,54 +155,54 @@ public class ViewHolderUserRichPresence {
                                                         m.checkNotNullExpressionValue(materialButton3, "binding.richPresencePrimaryButton");
                                                         viewHolderUserRichPresence = new ViewHolderPlatformRichPresence(viewGroup, simpleDraweeView3, simpleDraweeView4, textView6, textView8, textView7, linearLayout2, materialButton3);
                                                     } else {
-                                                        i3 = 2131364453;
+                                                        i3 = 2131364491;
                                                     }
                                                 } else {
-                                                    i3 = 2131364452;
+                                                    i3 = 2131364490;
                                                 }
                                             } else {
-                                                i3 = 2131364448;
+                                                i3 = 2131364486;
                                             }
                                         } else {
-                                            i3 = 2131364444;
+                                            i3 = 2131364482;
                                         }
                                     } else {
-                                        i3 = 2131364441;
+                                        i3 = 2131364479;
                                     }
                                 } else {
-                                    i3 = 2131364440;
+                                    i3 = 2131364478;
                                 }
                             } else {
-                                i3 = 2131364438;
+                                i3 = 2131364476;
                             }
                         } else {
-                            i3 = 2131363540;
+                            i3 = 2131363581;
                         }
                     } else {
-                        i3 = 2131362092;
+                        i3 = 2131362097;
                     }
                     throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i3)));
                 } else if (i == 4) {
-                    View inflate2 = from.inflate(2131559242, viewGroup, false);
+                    View inflate2 = from.inflate(2131559250, viewGroup, false);
                     viewGroup.addView(inflate2);
-                    LinearLayout linearLayout3 = (LinearLayout) inflate2.findViewById(2131364438);
+                    LinearLayout linearLayout3 = (LinearLayout) inflate2.findViewById(2131364476);
                     if (linearLayout3 != null) {
-                        TextView textView9 = (TextView) inflate2.findViewById(2131364439);
+                        TextView textView9 = (TextView) inflate2.findViewById(2131364477);
                         if (textView9 != null) {
-                            TextView textView10 = (TextView) inflate2.findViewById(2131364440);
+                            TextView textView10 = (TextView) inflate2.findViewById(2131364478);
                             if (textView10 != null) {
-                                SimpleDraweeView simpleDraweeView5 = (SimpleDraweeView) inflate2.findViewById(2131364441);
+                                SimpleDraweeView simpleDraweeView5 = (SimpleDraweeView) inflate2.findViewById(2131364479);
                                 if (simpleDraweeView5 != null) {
-                                    TextView textView11 = (TextView) inflate2.findViewById(2131364451);
+                                    TextView textView11 = (TextView) inflate2.findViewById(2131364489);
                                     if (textView11 != null) {
-                                        TextView textView12 = (TextView) inflate2.findViewById(2131364452);
+                                        TextView textView12 = (TextView) inflate2.findViewById(2131364490);
                                         if (textView12 != null) {
-                                            TextView textView13 = (TextView) inflate2.findViewById(2131364453);
+                                            TextView textView13 = (TextView) inflate2.findViewById(2131364491);
                                             str2 = "Missing required view with ID: ";
                                             if (textView13 != null) {
-                                                StreamPreviewView streamPreviewView = (StreamPreviewView) inflate2.findViewById(2131365123);
+                                                StreamPreviewView streamPreviewView = (StreamPreviewView) inflate2.findViewById(2131365178);
                                                 if (streamPreviewView != null) {
-                                                    m.checkNotNullExpressionValue(new h5((ConstraintLayout) inflate2, linearLayout3, textView9, textView10, simpleDraweeView5, textView11, textView12, textView13, streamPreviewView), "WidgetStreamRichPresence…e(inflater, parent, true)");
+                                                    m.checkNotNullExpressionValue(new k5((ConstraintLayout) inflate2, linearLayout3, textView9, textView10, simpleDraweeView5, textView11, textView12, textView13, streamPreviewView), "WidgetStreamRichPresence…e(inflater, parent, true)");
                                                     m.checkNotNullExpressionValue(simpleDraweeView5, "binding.richPresenceImageLarge");
                                                     m.checkNotNullExpressionValue(textView10, "binding.richPresenceHeader");
                                                     m.checkNotNullExpressionValue(textView13, "binding.richPresenceTitle");
@@ -213,38 +213,38 @@ public class ViewHolderUserRichPresence {
                                                     m.checkNotNullExpressionValue(streamPreviewView, "binding.streamPreview");
                                                     viewHolderUserRichPresence = new ViewHolderStreamRichPresence(viewGroup, simpleDraweeView5, textView10, textView13, textView9, textView12, textView11, linearLayout3, streamPreviewView);
                                                 } else {
-                                                    i4 = 2131365123;
+                                                    i4 = 2131365178;
                                                 }
                                             } else {
-                                                i4 = 2131364453;
+                                                i4 = 2131364491;
                                             }
                                         } else {
                                             str2 = "Missing required view with ID: ";
-                                            i4 = 2131364452;
+                                            i4 = 2131364490;
                                         }
                                     } else {
                                         str2 = "Missing required view with ID: ";
-                                        i4 = 2131364451;
+                                        i4 = 2131364489;
                                     }
                                 } else {
                                     str2 = "Missing required view with ID: ";
-                                    i4 = 2131364441;
+                                    i4 = 2131364479;
                                 }
                             } else {
                                 str2 = "Missing required view with ID: ";
-                                i4 = 2131364440;
+                                i4 = 2131364478;
                             }
                         } else {
                             str2 = "Missing required view with ID: ";
-                            i4 = 2131364439;
+                            i4 = 2131364477;
                         }
                     } else {
                         str2 = "Missing required view with ID: ";
-                        i4 = 2131364438;
+                        i4 = 2131364476;
                     }
                     throw new NullPointerException(str2.concat(inflate2.getResources().getResourceName(i4)));
                 } else if (i != 5) {
-                    k5 a2 = k5.a(from, viewGroup, true);
+                    n5 a2 = n5.a(from, viewGroup, true);
                     m.checkNotNullExpressionValue(a2, "WidgetUserRichPresenceBi…e(inflater, parent, true)");
                     SimpleDraweeView simpleDraweeView6 = a2.e;
                     m.checkNotNullExpressionValue(simpleDraweeView6, "binding.richPresenceImageLarge");
@@ -253,7 +253,7 @@ public class ViewHolderUserRichPresence {
                     m.checkNotNullExpressionValue(textView14, "binding.richPresenceHeader");
                     TextView textView15 = a2.k;
                     m.checkNotNullExpressionValue(textView15, "binding.richPresenceTitle");
-                    TextView textView16 = a2.f119c;
+                    TextView textView16 = a2.f135c;
                     TextView textView17 = a2.j;
                     m.checkNotNullExpressionValue(textView17, "binding.richPresenceTime");
                     TextView textView18 = a2.i;
@@ -261,32 +261,32 @@ public class ViewHolderUserRichPresence {
                     m.checkNotNullExpressionValue(linearLayout4, "binding.richPresenceContainerData");
                     return new ViewHolderUserRichPresence(viewGroup, simpleDraweeView6, simpleDraweeView7, textView14, textView15, textView16, textView17, textView18, linearLayout4, a2.g, a2.h, 0, 2048, null);
                 } else {
-                    View inflate3 = from.inflate(2131559227, viewGroup, false);
+                    View inflate3 = from.inflate(2131559234, viewGroup, false);
                     viewGroup.addView(inflate3);
-                    Barrier barrier2 = (Barrier) inflate3.findViewById(2131362092);
+                    Barrier barrier2 = (Barrier) inflate3.findViewById(2131362097);
                     if (barrier2 != null) {
-                        Space space2 = (Space) inflate3.findViewById(2131363540);
+                        Space space2 = (Space) inflate3.findViewById(2131363581);
                         if (space2 != null) {
-                            LinearLayout linearLayout5 = (LinearLayout) inflate3.findViewById(2131364438);
+                            LinearLayout linearLayout5 = (LinearLayout) inflate3.findViewById(2131364476);
                             if (linearLayout5 != null) {
-                                TextView textView19 = (TextView) inflate3.findViewById(2131364439);
+                                TextView textView19 = (TextView) inflate3.findViewById(2131364477);
                                 if (textView19 != null) {
-                                    TextView textView20 = (TextView) inflate3.findViewById(2131364440);
+                                    TextView textView20 = (TextView) inflate3.findViewById(2131364478);
                                     if (textView20 != null) {
-                                        SimpleDraweeView simpleDraweeView8 = (SimpleDraweeView) inflate3.findViewById(2131364441);
+                                        SimpleDraweeView simpleDraweeView8 = (SimpleDraweeView) inflate3.findViewById(2131364479);
                                         if (simpleDraweeView8 != null) {
-                                            TextView textView21 = (TextView) inflate3.findViewById(2131364442);
+                                            TextView textView21 = (TextView) inflate3.findViewById(2131364480);
                                             if (textView21 != null) {
-                                                FrameLayout frameLayout = (FrameLayout) inflate3.findViewById(2131364443);
+                                                FrameLayout frameLayout = (FrameLayout) inflate3.findViewById(2131364481);
                                                 if (frameLayout != null) {
-                                                    MaterialButton materialButton4 = (MaterialButton) inflate3.findViewById(2131364448);
+                                                    MaterialButton materialButton4 = (MaterialButton) inflate3.findViewById(2131364486);
                                                     if (materialButton4 != null) {
-                                                        TextView textView22 = (TextView) inflate3.findViewById(2131364452);
+                                                        TextView textView22 = (TextView) inflate3.findViewById(2131364490);
                                                         str3 = "Missing required view with ID: ";
                                                         if (textView22 != null) {
-                                                            TextView textView23 = (TextView) inflate3.findViewById(2131364453);
+                                                            TextView textView23 = (TextView) inflate3.findViewById(2131364491);
                                                             if (textView23 != null) {
-                                                                m.checkNotNullExpressionValue(new g5((LinearLayout) inflate3, barrier2, space2, linearLayout5, textView19, textView20, simpleDraweeView8, textView21, frameLayout, materialButton4, textView22, textView23), "WidgetStageChannelRichPr…e(inflater, parent, true)");
+                                                                m.checkNotNullExpressionValue(new j5((LinearLayout) inflate3, barrier2, space2, linearLayout5, textView19, textView20, simpleDraweeView8, textView21, frameLayout, materialButton4, textView22, textView23), "WidgetStageChannelRichPr…e(inflater, parent, true)");
                                                                 m.checkNotNullExpressionValue(simpleDraweeView8, "binding.richPresenceImageLarge");
                                                                 m.checkNotNullExpressionValue(textView20, "binding.richPresenceHeader");
                                                                 m.checkNotNullExpressionValue(textView23, "binding.richPresenceTitle");
@@ -297,84 +297,84 @@ public class ViewHolderUserRichPresence {
                                                                 m.checkNotNullExpressionValue(textView21, "binding.richPresenceImageLargeText");
                                                                 viewHolderUserRichPresence = new ViewHolderStageChannelRichPresence(viewGroup, simpleDraweeView8, textView20, textView23, textView19, textView22, linearLayout5, materialButton4, textView21);
                                                             } else {
-                                                                i5 = 2131364453;
+                                                                i5 = 2131364491;
                                                             }
                                                         } else {
-                                                            i5 = 2131364452;
+                                                            i5 = 2131364490;
                                                         }
                                                     } else {
                                                         str3 = "Missing required view with ID: ";
-                                                        i5 = 2131364448;
+                                                        i5 = 2131364486;
                                                     }
                                                 } else {
                                                     str3 = "Missing required view with ID: ";
-                                                    i5 = 2131364443;
+                                                    i5 = 2131364481;
                                                 }
                                             } else {
                                                 str3 = "Missing required view with ID: ";
-                                                i5 = 2131364442;
+                                                i5 = 2131364480;
                                             }
                                         } else {
                                             str3 = "Missing required view with ID: ";
-                                            i5 = 2131364441;
+                                            i5 = 2131364479;
                                         }
                                     } else {
                                         str3 = "Missing required view with ID: ";
-                                        i5 = 2131364440;
+                                        i5 = 2131364478;
                                     }
                                 } else {
                                     str3 = "Missing required view with ID: ";
-                                    i5 = 2131364439;
+                                    i5 = 2131364477;
                                 }
                             } else {
                                 str3 = "Missing required view with ID: ";
-                                i5 = 2131364438;
+                                i5 = 2131364476;
                             }
                         } else {
                             str3 = "Missing required view with ID: ";
-                            i5 = 2131363540;
+                            i5 = 2131363581;
                         }
                     } else {
                         str3 = "Missing required view with ID: ";
-                        i5 = 2131362092;
+                        i5 = 2131362097;
                     }
                     throw new NullPointerException(str3.concat(inflate3.getResources().getResourceName(i5)));
                 }
                 return viewHolderUserRichPresence;
             } else {
-                View inflate4 = from.inflate(2131559090, viewGroup, false);
+                View inflate4 = from.inflate(2131559096, viewGroup, false);
                 viewGroup.addView(inflate4);
-                Barrier barrier3 = (Barrier) inflate4.findViewById(2131362092);
+                Barrier barrier3 = (Barrier) inflate4.findViewById(2131362097);
                 if (barrier3 != null) {
-                    Space space3 = (Space) inflate4.findViewById(2131363540);
+                    Space space3 = (Space) inflate4.findViewById(2131363581);
                     if (space3 != null) {
-                        LinearLayout linearLayout6 = (LinearLayout) inflate4.findViewById(2131364438);
+                        LinearLayout linearLayout6 = (LinearLayout) inflate4.findViewById(2131364476);
                         if (linearLayout6 != null) {
-                            TextView textView24 = (TextView) inflate4.findViewById(2131364439);
+                            TextView textView24 = (TextView) inflate4.findViewById(2131364477);
                             if (textView24 != null) {
-                                TextView textView25 = (TextView) inflate4.findViewById(2131364440);
+                                TextView textView25 = (TextView) inflate4.findViewById(2131364478);
                                 if (textView25 != null) {
-                                    i2 = 2131364441;
-                                    SimpleDraweeView simpleDraweeView9 = (SimpleDraweeView) inflate4.findViewById(2131364441);
+                                    i2 = 2131364479;
+                                    SimpleDraweeView simpleDraweeView9 = (SimpleDraweeView) inflate4.findViewById(2131364479);
                                     if (simpleDraweeView9 != null) {
-                                        SimpleDraweeView simpleDraweeView10 = (SimpleDraweeView) inflate4.findViewById(2131364444);
+                                        SimpleDraweeView simpleDraweeView10 = (SimpleDraweeView) inflate4.findViewById(2131364482);
                                         if (simpleDraweeView10 != null) {
-                                            TextView textView26 = (TextView) inflate4.findViewById(2131364445);
+                                            TextView textView26 = (TextView) inflate4.findViewById(2131364483);
                                             str = "Missing required view with ID: ";
                                             if (textView26 != null) {
-                                                TextView textView27 = (TextView) inflate4.findViewById(2131364446);
+                                                TextView textView27 = (TextView) inflate4.findViewById(2131364484);
                                                 if (textView27 != null) {
-                                                    FrameLayout frameLayout2 = (FrameLayout) inflate4.findViewById(2131364447);
+                                                    FrameLayout frameLayout2 = (FrameLayout) inflate4.findViewById(2131364485);
                                                     if (frameLayout2 != null) {
-                                                        MaterialButton materialButton5 = (MaterialButton) inflate4.findViewById(2131364448);
+                                                        MaterialButton materialButton5 = (MaterialButton) inflate4.findViewById(2131364486);
                                                         if (materialButton5 != null) {
-                                                            SeekBar seekBar = (SeekBar) inflate4.findViewById(2131364450);
+                                                            SeekBar seekBar = (SeekBar) inflate4.findViewById(2131364488);
                                                             if (seekBar != null) {
-                                                                TextView textView28 = (TextView) inflate4.findViewById(2131364452);
+                                                                TextView textView28 = (TextView) inflate4.findViewById(2131364490);
                                                                 if (textView28 != null) {
-                                                                    TextView textView29 = (TextView) inflate4.findViewById(2131364453);
+                                                                    TextView textView29 = (TextView) inflate4.findViewById(2131364491);
                                                                     if (textView29 != null) {
-                                                                        m.checkNotNullExpressionValue(new x4((LinearLayout) inflate4, barrier3, space3, linearLayout6, textView24, textView25, simpleDraweeView9, simpleDraweeView10, textView26, textView27, frameLayout2, materialButton5, seekBar, textView28, textView29), "WidgetMusicRichPresenceB…e(inflater, parent, true)");
+                                                                        m.checkNotNullExpressionValue(new a5((LinearLayout) inflate4, barrier3, space3, linearLayout6, textView24, textView25, simpleDraweeView9, simpleDraweeView10, textView26, textView27, frameLayout2, materialButton5, seekBar, textView28, textView29), "WidgetMusicRichPresenceB…e(inflater, parent, true)");
                                                                         m.checkNotNullExpressionValue(simpleDraweeView9, "binding.richPresenceImageLarge");
                                                                         m.checkNotNullExpressionValue(simpleDraweeView10, "binding.richPresenceImageSmall");
                                                                         m.checkNotNullExpressionValue(textView25, "binding.richPresenceHeader");
@@ -388,51 +388,51 @@ public class ViewHolderUserRichPresence {
                                                                         m.checkNotNullExpressionValue(textView27, "binding.richPresenceMusicElapsed");
                                                                         return new ViewHolderMusicRichPresence(viewGroup, simpleDraweeView9, simpleDraweeView10, textView25, textView29, textView24, textView28, linearLayout6, materialButton5, seekBar, textView26, textView27);
                                                                     }
-                                                                    i2 = 2131364453;
+                                                                    i2 = 2131364491;
                                                                 } else {
-                                                                    i2 = 2131364452;
+                                                                    i2 = 2131364490;
                                                                 }
                                                             } else {
-                                                                i2 = 2131364450;
+                                                                i2 = 2131364488;
                                                             }
                                                         } else {
-                                                            i2 = 2131364448;
+                                                            i2 = 2131364486;
                                                         }
                                                     } else {
-                                                        i2 = 2131364447;
+                                                        i2 = 2131364485;
                                                     }
                                                 } else {
-                                                    i2 = 2131364446;
+                                                    i2 = 2131364484;
                                                 }
                                             } else {
-                                                i2 = 2131364445;
+                                                i2 = 2131364483;
                                             }
                                         } else {
                                             str = "Missing required view with ID: ";
-                                            i2 = 2131364444;
+                                            i2 = 2131364482;
                                         }
                                     } else {
                                         str = "Missing required view with ID: ";
                                     }
                                 } else {
                                     str = "Missing required view with ID: ";
-                                    i2 = 2131364440;
+                                    i2 = 2131364478;
                                 }
                             } else {
                                 str = "Missing required view with ID: ";
-                                i2 = 2131364439;
+                                i2 = 2131364477;
                             }
                         } else {
                             str = "Missing required view with ID: ";
-                            i2 = 2131364438;
+                            i2 = 2131364476;
                         }
                     } else {
                         str = "Missing required view with ID: ";
-                        i2 = 2131363540;
+                        i2 = 2131363581;
                     }
                 } else {
                     str = "Missing required view with ID: ";
-                    i2 = 2131362092;
+                    i2 = 2131362097;
                 }
                 throw new NullPointerException(str.concat(inflate4.getResources().getResourceName(i2)));
             }
@@ -608,7 +608,7 @@ public class ViewHolderUserRichPresence {
                 ActivityParty i = activity.i();
                 if (i != null) {
                     PresenceUtils presenceUtils = PresenceUtils.INSTANCE;
-                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = this.root.getContext()) == null) ? null : b.g(context, 2131894206, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
+                    charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = this.root.getContext()) == null) ? null : b.g(context, 2131894307, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4);
                 }
                 charSequence = "";
                 String str2 = l + ' ' + charSequence;
@@ -664,9 +664,9 @@ public class ViewHolderUserRichPresence {
             ActivityTimestamps o = activity.o();
             if ((o != null ? friendlyTime(o) : null) != null) {
                 if (this.perSecondTimerSubscription == null) {
-                    Observable<Long> E = Observable.E(0, 1, TimeUnit.SECONDS);
-                    m.checkNotNullExpressionValue(E, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
-                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(E, appComponent, null, 2, null), getClass(), (Context) null, new ViewHolderUserRichPresence$configureUiTimestamp$1(this), (Function1) null, (Function0) null, (Function0) null, new ViewHolderUserRichPresence$configureUiTimestamp$2(this, activity), 58, (Object) null);
+                    Observable<Long> D = Observable.D(0, 1, TimeUnit.SECONDS);
+                    m.checkNotNullExpressionValue(D, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
+                    ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(D, appComponent, null, 2, null), getClass(), (Context) null, new ViewHolderUserRichPresence$configureUiTimestamp$1(this), (Function1) null, (Function0) null, (Function0) null, new ViewHolderUserRichPresence$configureUiTimestamp$2(this, activity), 58, (Object) null);
                     return;
                 }
                 return;
@@ -691,10 +691,10 @@ public class ViewHolderUserRichPresence {
     public final CharSequence friendlyTime(ActivityTimestamps activityTimestamps) {
         m.checkNotNullParameter(activityTimestamps, "$this$friendlyTime");
         if (activityTimestamps.b() > 0) {
-            return TimeUtils.INSTANCE.toFriendlyString(ClockFactory.get().currentTimeMillis(), activityTimestamps.b(), getString(2131894208), "timeDelta");
+            return TimeUtils.INSTANCE.toFriendlyString(ClockFactory.get().currentTimeMillis(), activityTimestamps.b(), getString(2131894309), "timeDelta");
         }
         if (activityTimestamps.c() > 0) {
-            return TimeUtils.INSTANCE.toFriendlyString(activityTimestamps.c(), ClockFactory.get().currentTimeMillis(), getString(2131894210), "timeDelta");
+            return TimeUtils.INSTANCE.toFriendlyString(activityTimestamps.c(), ClockFactory.get().currentTimeMillis(), getString(2131894311), "timeDelta");
         }
         return null;
     }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java b/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java
index d50a8bb42a..b9ce2c737d 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/DraweeSpanStringBuilderExtensionsKt.java
@@ -38,7 +38,7 @@ public final class DraweeSpanStringBuilderExtensionsKt {
                 cVar.a(intValue2);
             }
             a aVar = new a(context.getResources());
-            aVar.f = ContextCompat.getDrawable(context, 2131230883);
+            aVar.f = ContextCompat.getDrawable(context, 2131230886);
             aVar.r = cVar;
             ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
             aVar.n = v.l;
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java
index 7733549adf..12f12330e7 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java
@@ -275,26 +275,26 @@ public final class UserProfileAdminView extends LinearLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558708, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365400;
-        TextView textView = (TextView) inflate.findViewById(2131365400);
+        int i = 2131365460;
+        TextView textView = (TextView) inflate.findViewById(2131365460);
         if (textView != null) {
-            i = 2131365401;
-            TextView textView2 = (TextView) inflate.findViewById(2131365401);
+            i = 2131365461;
+            TextView textView2 = (TextView) inflate.findViewById(2131365461);
             if (textView2 != null) {
-                i = 2131365402;
-                TextView textView3 = (TextView) inflate.findViewById(2131365402);
+                i = 2131365462;
+                TextView textView3 = (TextView) inflate.findViewById(2131365462);
                 if (textView3 != null) {
-                    i = 2131365403;
-                    TextView textView4 = (TextView) inflate.findViewById(2131365403);
+                    i = 2131365463;
+                    TextView textView4 = (TextView) inflate.findViewById(2131365463);
                     if (textView4 != null) {
-                        i = 2131365404;
-                        TextView textView5 = (TextView) inflate.findViewById(2131365404);
+                        i = 2131365464;
+                        TextView textView5 = (TextView) inflate.findViewById(2131365464);
                         if (textView5 != null) {
-                            i = 2131365405;
-                            TextView textView6 = (TextView) inflate.findViewById(2131365405);
+                            i = 2131365465;
+                            TextView textView6 = (TextView) inflate.findViewById(2131365465);
                             if (textView6 != null) {
-                                i = 2131365406;
-                                TextView textView7 = (TextView) inflate.findViewById(2131365406);
+                                i = 2131365466;
+                                TextView textView7 = (TextView) inflate.findViewById(2131365466);
                                 if (textView7 != null) {
                                     UserProfileAdminViewBinding userProfileAdminViewBinding = new UserProfileAdminViewBinding((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6, textView7);
                                     m.checkNotNullExpressionValue(userProfileAdminViewBinding, "UserProfileAdminViewBind…rom(context), this, true)");
@@ -322,7 +322,7 @@ public final class UserProfileAdminView extends LinearLayout {
 
     public final void setOnEditMember(Function0<Unit> function0) {
         m.checkNotNullParameter(function0, "onEditMember");
-        this.binding.f1636c.setOnClickListener(new UserProfileAdminView$setOnEditMember$1(function0));
+        this.binding.f1633c.setOnClickListener(new UserProfileAdminView$setOnEditMember$1(function0));
     }
 
     public final void setOnKick(Function0<Unit> function0) {
@@ -347,14 +347,14 @@ public final class UserProfileAdminView extends LinearLayout {
 
     public final void updateView(ViewState viewState) {
         m.checkNotNullParameter(viewState, "viewState");
-        TextView textView = this.binding.f1636c;
+        TextView textView = this.binding.f1633c;
         m.checkNotNullExpressionValue(textView, "binding.userProfileAdminEditMember");
         int i = 8;
         textView.setVisibility(viewState.getShowEditMemberButton() ? 0 : 8);
         TextView textView2 = this.binding.d;
         m.checkNotNullExpressionValue(textView2, "binding.userProfileAdminKick");
         textView2.setVisibility(viewState.getShowKickButton() ? 0 : 8);
-        this.binding.d.setText(viewState.isMultiUserDM() ? 2131892568 : 2131890757);
+        this.binding.d.setText(viewState.isMultiUserDM() ? 2131892649 : 2131890825);
         TextView textView3 = this.binding.b;
         m.checkNotNullExpressionValue(textView3, "binding.userProfileAdminBan");
         textView3.setVisibility(viewState.getShowBanButton() ? 0 : 8);
@@ -364,7 +364,7 @@ public final class UserProfileAdminView extends LinearLayout {
         boolean isServerMuted = viewState.isServerMuted();
         boolean isMe = viewState.isMe();
         int themedDrawableRes$default = isServerMuted ? DrawableCompat.getThemedDrawableRes$default(this, 2130969423, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969421, 0, 2, (Object) null);
-        int i2 = isServerMuted ? 2131893189 : 2131893176;
+        int i2 = isServerMuted ? 2131893272 : 2131893259;
         TextView textView5 = this.binding.h;
         m.checkNotNullExpressionValue(textView5, "binding.userProfileAdminServerMute");
         ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView5, themedDrawableRes$default, 0, 0, 0, 14, null);
@@ -374,8 +374,8 @@ public final class UserProfileAdminView extends LinearLayout {
         textView6.setVisibility(viewState.getShowServerDeafenButton() ? 0 : 8);
         boolean isServerDeafened = viewState.isServerDeafened();
         int themedDrawableRes$default2 = isServerDeafened ? DrawableCompat.getThemedDrawableRes$default(this, 2130969413, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969413, 0, 2, (Object) null);
-        int i3 = isServerDeafened ? 2131893188 : 2131893165;
-        int i4 = isMe ? 2131888146 : 2131888145;
+        int i3 = isServerDeafened ? 2131893271 : 2131893248;
+        int i4 = isMe ? 2131888145 : 2131888144;
         TextView textView7 = this.binding.e;
         m.checkNotNullExpressionValue(textView7, "binding.userProfileAdminServerDeafen");
         ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView7, themedDrawableRes$default2, 0, 0, 0, 14, null);
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java
index f800868511..04d63e8138 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java
@@ -265,14 +265,14 @@ public final class UserProfileConnectionsView extends LinearLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558709, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365407;
-        TextView textView = (TextView) inflate.findViewById(2131365407);
+        int i = 2131365467;
+        TextView textView = (TextView) inflate.findViewById(2131365467);
         if (textView != null) {
-            i = 2131365408;
-            TextView textView2 = (TextView) inflate.findViewById(2131365408);
+            i = 2131365468;
+            TextView textView2 = (TextView) inflate.findViewById(2131365468);
             if (textView2 != null) {
-                i = 2131365409;
-                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365409);
+                i = 2131365469;
+                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365469);
                 if (recyclerView != null) {
                     UserProfileConnectionsViewBinding userProfileConnectionsViewBinding = new UserProfileConnectionsViewBinding((LinearLayout) inflate, textView, textView2, recyclerView);
                     m.checkNotNullExpressionValue(userProfileConnectionsViewBinding, "UserProfileConnectionsVi…rom(context), this, true)");
@@ -301,8 +301,8 @@ public final class UserProfileConnectionsView extends LinearLayout {
         m.checkNotNullParameter(function02, "onMutualFriendsItemClick");
         this.connectedAccountsAdapter.setOnConnectedAccountClick(new UserProfileConnectionsView$updateViewState$1(function3));
         this.connectedAccountsAdapter.setData(viewState.getConnectedAccountItems());
-        this.binding.f1637c.setOnClickListener(new UserProfileConnectionsView$updateViewState$2(function0));
-        TextView textView = this.binding.f1637c;
+        this.binding.f1634c.setOnClickListener(new UserProfileConnectionsView$updateViewState$2(function0));
+        TextView textView = this.binding.f1634c;
         m.checkNotNullExpressionValue(textView, "binding.userProfileConnectionsMutualGuildsItem");
         int i = 0;
         textView.setVisibility(viewState.getShowMutualGuildsAndFriends() ? 0 : 8);
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$3.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$3.java
index ac8acb7a5b..e82c3bb1e8 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$3.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$3.java
@@ -23,7 +23,7 @@ public final class UserProfileHeaderView$configureBanner$3 extends o implements
 
     public final void invoke(Integer num) {
         if (num != null) {
-            UserProfileHeaderView.access$getBinding$p(this.this$0).b.setBackgroundColor(num.intValue());
+            UserProfileHeaderView.access$getBinding$p(this.this$0).f1635c.setBackgroundColor(num.intValue());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$4.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$4.java
new file mode 100644
index 0000000000..c1daea77de
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$4.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.user.profile;
+
+import android.view.View;
+import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+/* compiled from: UserProfileHeaderView.kt */
+public final class UserProfileHeaderView$configureBanner$4 implements View.OnClickListener {
+    public final /* synthetic */ UserProfileHeaderViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ UserProfileHeaderView this$0;
+
+    public UserProfileHeaderView$configureBanner$4(UserProfileHeaderView userProfileHeaderView, UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        this.this$0 = userProfileHeaderView;
+        this.$viewState = loaded;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        UserProfileHeaderView.access$editBanner(this.this$0, this.$viewState);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$5.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$5.java
new file mode 100644
index 0000000000..955975d05f
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$configureBanner$5.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.user.profile;
+
+import android.view.View;
+import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+/* compiled from: UserProfileHeaderView.kt */
+public final class UserProfileHeaderView$configureBanner$5 implements View.OnClickListener {
+    public final /* synthetic */ UserProfileHeaderViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ UserProfileHeaderView this$0;
+
+    public UserProfileHeaderView$configureBanner$5(UserProfileHeaderView userProfileHeaderView, UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        this.this$0 = userProfileHeaderView;
+        this.$viewState = loaded;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        UserProfileHeaderView.access$editBanner(this.this$0, this.$viewState);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarEdit$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarEdit$1.java
new file mode 100644
index 0000000000..9bde4814d6
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onAvatarEdit$1.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.user.profile;
+
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: UserProfileHeaderView.kt */
+public final class UserProfileHeaderView$onAvatarEdit$1 extends o implements Function0<Unit> {
+    public static final UserProfileHeaderView$onAvatarEdit$1 INSTANCE = new UserProfileHeaderView$onAvatarEdit$1();
+
+    public UserProfileHeaderView$onAvatarEdit$1() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onBannerEdit$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onBannerEdit$1.java
new file mode 100644
index 0000000000..12bfc4efa8
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onBannerEdit$1.java
@@ -0,0 +1,18 @@
+package com.discord.widgets.user.profile;
+
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+/* compiled from: UserProfileHeaderView.kt */
+public final class UserProfileHeaderView$onBannerEdit$1 extends o implements Function0<Unit> {
+    public static final UserProfileHeaderView$onBannerEdit$1 INSTANCE = new UserProfileHeaderView$onBannerEdit$1();
+
+    public UserProfileHeaderView$onBannerEdit$1() {
+        super(0);
+    }
+
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final void mo1invoke() {
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java
index a16e0ea034..ce35e769d5 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java
@@ -23,6 +23,6 @@ public final class UserProfileHeaderView$onFinishInflate$1 extends o implements
 
     public final void invoke(View view) {
         m.checkNotNullParameter(view, "view");
-        c.a.d.o.g(view.getContext(), 2131892414, 1, null, 8);
+        c.a.d.o.g(view.getContext(), 2131892492, 1, null, 8);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$2.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$2.java
new file mode 100644
index 0000000000..9aae13d6cc
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$2.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.user.profile;
+
+import android.view.View;
+import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+/* compiled from: UserProfileHeaderView.kt */
+public final class UserProfileHeaderView$updateViewState$2 implements View.OnClickListener {
+    public final /* synthetic */ UserProfileHeaderViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ UserProfileHeaderView this$0;
+
+    public UserProfileHeaderView$updateViewState$2(UserProfileHeaderView userProfileHeaderView, UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        this.this$0 = userProfileHeaderView;
+        this.$viewState = loaded;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        UserProfileHeaderView.access$editAvatar(this.this$0, this.$viewState);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$3.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$3.java
new file mode 100644
index 0000000000..0120761d5f
--- /dev/null
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$updateViewState$3.java
@@ -0,0 +1,19 @@
+package com.discord.widgets.user.profile;
+
+import android.view.View;
+import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
+/* compiled from: UserProfileHeaderView.kt */
+public final class UserProfileHeaderView$updateViewState$3 implements View.OnClickListener {
+    public final /* synthetic */ UserProfileHeaderViewModel.ViewState.Loaded $viewState;
+    public final /* synthetic */ UserProfileHeaderView this$0;
+
+    public UserProfileHeaderView$updateViewState$3(UserProfileHeaderView userProfileHeaderView, UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        this.this$0 = userProfileHeaderView;
+        this.$viewState = loaded;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        UserProfileHeaderView.access$editAvatar(this.this$0, this.$viewState);
+    }
+}
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
index 8f86531e08..8a937d8948 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java
@@ -33,7 +33,6 @@ import com.discord.utilities.images.MGImages;
 import com.discord.utilities.premium.GuildMemberAvatarsFeatureFlag;
 import com.discord.utilities.presence.PresenceUtils;
 import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.streams.StreamContext;
 import com.discord.utilities.textprocessing.node.EmojiNode;
 import com.discord.utilities.user.UserUtils;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -64,7 +63,9 @@ public final class UserProfileHeaderView extends ConstraintLayout {
     public static final Companion Companion = new Companion(null);
     private final SimpleRecyclerAdapter<Badge, BadgeViewHolder> badgesAdapter;
     private final UserProfileHeaderViewBinding binding;
+    private Function0<Unit> onAvatarEdit;
     private Function1<? super Badge, Unit> onBadgeClick;
+    private Function0<Unit> onBannerEdit;
     private Subscription representativeColorSubscription;
     private int userProfileHeaderBackgroundColor;
 
@@ -129,13 +130,13 @@ public final class UserProfileHeaderView extends ConstraintLayout {
             this();
         }
 
-        public final void bind(UserProfileHeaderView userProfileHeaderView, AppComponent appComponent, UserProfileHeaderViewModel userProfileHeaderViewModel) {
+        public final void bind(UserProfileHeaderView userProfileHeaderView, AppComponent appComponent, Observable<UserProfileHeaderViewModel.ViewState> observable) {
             m.checkNotNullParameter(userProfileHeaderView, "$this$bind");
             m.checkNotNullParameter(appComponent, "appComponent");
-            m.checkNotNullParameter(userProfileHeaderViewModel, "userProfileHeaderViewModel");
-            Observable<R> G = userProfileHeaderViewModel.observeViewState().y(UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.INSTANCE).G(UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.INSTANCE);
-            m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(G, appComponent), appComponent.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$Companion$bind$1(userProfileHeaderView), 62, (Object) null);
+            m.checkNotNullParameter(observable, "observable");
+            Observable<R> F = observable.x(UserProfileHeaderView$Companion$bind$$inlined$filterIs$1.INSTANCE).F(UserProfileHeaderView$Companion$bind$$inlined$filterIs$2.INSTANCE);
+            m.checkNotNullExpressionValue(F, "filter { it is T }.map { it as T }");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(F, appComponent), appComponent.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$Companion$bind$1(userProfileHeaderView), 62, (Object) null);
         }
     }
 
@@ -146,50 +147,60 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558711, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131362091;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362091);
-        if (simpleDraweeView != null) {
-            i = 2131362097;
-            CardView cardView = (CardView) inflate.findViewById(2131362097);
-            if (cardView != null) {
-                i = 2131363736;
-                UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131363736);
-                if (userAvatarPresenceView != null) {
-                    i = 2131363737;
-                    Barrier barrier = (Barrier) inflate.findViewById(2131363737);
-                    if (barrier != null) {
-                        i = 2131365410;
-                        RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365410);
-                        if (recyclerView != null) {
-                            i = 2131365411;
-                            SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131365411);
-                            if (simpleDraweeSpanTextView != null) {
-                                i = 2131365412;
-                                LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365412);
-                                if (linearLayout != null) {
-                                    i = 2131365413;
-                                    UsernameView usernameView = (UsernameView) inflate.findViewById(2131365413);
-                                    if (usernameView != null) {
-                                        i = 2131365414;
-                                        SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = (SimpleDraweeSpanTextView) inflate.findViewById(2131365414);
-                                        if (simpleDraweeSpanTextView2 != null) {
-                                            ConstraintLayout constraintLayout = (ConstraintLayout) inflate;
-                                            UserProfileHeaderViewBinding userProfileHeaderViewBinding = new UserProfileHeaderViewBinding(constraintLayout, simpleDraweeView, cardView, userAvatarPresenceView, barrier, recyclerView, simpleDraweeSpanTextView, linearLayout, usernameView, simpleDraweeSpanTextView2, constraintLayout);
-                                            m.checkNotNullExpressionValue(userProfileHeaderViewBinding, "UserProfileHeaderViewBin…rom(context), this, true)");
-                                            this.binding = userProfileHeaderViewBinding;
-                                            this.onBadgeClick = UserProfileHeaderView$onBadgeClick$1.INSTANCE;
-                                            RightToLeftGridLayoutManager rightToLeftGridLayoutManager = new RightToLeftGridLayoutManager(context, 3, 1, true);
-                                            m.checkNotNullExpressionValue(recyclerView, "binding.userProfileHeaderBadgesRecycler");
-                                            recyclerView.setLayoutManager(rightToLeftGridLayoutManager);
-                                            SimpleRecyclerAdapter<Badge, BadgeViewHolder> simpleRecyclerAdapter = new SimpleRecyclerAdapter<>(null, new AnonymousClass1(this), 1, null);
-                                            this.badgesAdapter = simpleRecyclerAdapter;
-                                            m.checkNotNullExpressionValue(recyclerView, "binding.userProfileHeaderBadgesRecycler");
-                                            recyclerView.setAdapter(simpleRecyclerAdapter);
-                                            TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.UserProfileHeaderView);
-                                            m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.UserProfileHeaderView)");
-                                            this.userProfileHeaderBackgroundColor = obtainStyledAttributes.getColor(0, ColorCompat.getThemedColor(this, 2130969896));
-                                            obtainStyledAttributes.recycle();
-                                            return;
+        int i = 2131362078;
+        CardView cardView = (CardView) inflate.findViewById(2131362078);
+        if (cardView != null) {
+            i = 2131362095;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131362095);
+            if (simpleDraweeView != null) {
+                i = 2131362096;
+                CardView cardView2 = (CardView) inflate.findViewById(2131362096);
+                if (cardView2 != null) {
+                    i = 2131362102;
+                    CardView cardView3 = (CardView) inflate.findViewById(2131362102);
+                    if (cardView3 != null) {
+                        i = 2131363777;
+                        UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131363777);
+                        if (userAvatarPresenceView != null) {
+                            i = 2131363778;
+                            Barrier barrier = (Barrier) inflate.findViewById(2131363778);
+                            if (barrier != null) {
+                                i = 2131365470;
+                                RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365470);
+                                if (recyclerView != null) {
+                                    i = 2131365471;
+                                    SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131365471);
+                                    if (simpleDraweeSpanTextView != null) {
+                                        i = 2131365472;
+                                        LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365472);
+                                        if (linearLayout != null) {
+                                            i = 2131365473;
+                                            UsernameView usernameView = (UsernameView) inflate.findViewById(2131365473);
+                                            if (usernameView != null) {
+                                                i = 2131365474;
+                                                SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = (SimpleDraweeSpanTextView) inflate.findViewById(2131365474);
+                                                if (simpleDraweeSpanTextView2 != null) {
+                                                    ConstraintLayout constraintLayout = (ConstraintLayout) inflate;
+                                                    UserProfileHeaderViewBinding userProfileHeaderViewBinding = new UserProfileHeaderViewBinding(constraintLayout, cardView, simpleDraweeView, cardView2, cardView3, userAvatarPresenceView, barrier, recyclerView, simpleDraweeSpanTextView, linearLayout, usernameView, simpleDraweeSpanTextView2, constraintLayout);
+                                                    m.checkNotNullExpressionValue(userProfileHeaderViewBinding, "UserProfileHeaderViewBin…rom(context), this, true)");
+                                                    this.binding = userProfileHeaderViewBinding;
+                                                    this.onBadgeClick = UserProfileHeaderView$onBadgeClick$1.INSTANCE;
+                                                    this.onAvatarEdit = UserProfileHeaderView$onAvatarEdit$1.INSTANCE;
+                                                    this.onBannerEdit = UserProfileHeaderView$onBannerEdit$1.INSTANCE;
+                                                    RightToLeftGridLayoutManager rightToLeftGridLayoutManager = new RightToLeftGridLayoutManager(context, 3, 1, true);
+                                                    m.checkNotNullExpressionValue(recyclerView, "binding.userProfileHeaderBadgesRecycler");
+                                                    recyclerView.setLayoutManager(rightToLeftGridLayoutManager);
+                                                    SimpleRecyclerAdapter<Badge, BadgeViewHolder> simpleRecyclerAdapter = new SimpleRecyclerAdapter<>(null, new AnonymousClass1(this), 1, null);
+                                                    this.badgesAdapter = simpleRecyclerAdapter;
+                                                    m.checkNotNullExpressionValue(recyclerView, "binding.userProfileHeaderBadgesRecycler");
+                                                    recyclerView.setAdapter(simpleRecyclerAdapter);
+                                                    TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.a.UserProfileHeaderView);
+                                                    m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.UserProfileHeaderView)");
+                                                    this.userProfileHeaderBackgroundColor = obtainStyledAttributes.getColor(0, ColorCompat.getThemedColor(this, 2130969896));
+                                                    obtainStyledAttributes.recycle();
+                                                    return;
+                                                }
+                                            }
                                         }
                                     }
                                 }
@@ -202,6 +213,14 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i)));
     }
 
+    public static final /* synthetic */ void access$editAvatar(UserProfileHeaderView userProfileHeaderView, UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        userProfileHeaderView.editAvatar(loaded);
+    }
+
+    public static final /* synthetic */ void access$editBanner(UserProfileHeaderView userProfileHeaderView, UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        userProfileHeaderView.editBanner(loaded);
+    }
+
     public static final /* synthetic */ UserProfileHeaderViewBinding access$getBinding$p(UserProfileHeaderView userProfileHeaderView) {
         return userProfileHeaderView.binding;
     }
@@ -220,17 +239,19 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         int i = resources.getDisplayMetrics().widthPixels;
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        String forUserBanner = IconUtils.INSTANCE.getForUserBanner(loaded.getUser().getId(), loaded.getBannerHash(), Integer.valueOf(Math.max(i, resources2.getDisplayMetrics().heightPixels)), true);
+        int max = Math.max(i, resources2.getDisplayMetrics().heightPixels);
+        String bannerHash = loaded.getBannerHash();
+        Integer num = null;
         int i2 = 0;
+        String forUserBanner = (bannerHash == null || !t.startsWith$default(bannerHash, "data:", false, 2, null)) ? IconUtils.INSTANCE.getForUserBanner(loaded.getUser().getId(), loaded.getBannerHash(), Integer.valueOf(max), true) : loaded.getBannerHash();
         boolean z2 = !(forUserBanner == null || t.isBlank(forUserBanner));
-        SimpleDraweeView simpleDraweeView = this.binding.b;
+        SimpleDraweeView simpleDraweeView = this.binding.f1635c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.banner");
         simpleDraweeView.setAspectRatio(!z2 ? 5.0f : 2.5f);
-        SimpleDraweeView simpleDraweeView2 = this.binding.b;
+        SimpleDraweeView simpleDraweeView2 = this.binding.f1635c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.banner");
         MGImages.setImage$default(simpleDraweeView2, forUserBanner, 0, 0, false, null, null, 124, null);
         String bannerColorHex = loaded.getBannerColorHex();
-        Integer num = null;
         if (bannerColorHex != null) {
             try {
                 num = Integer.valueOf(Color.parseColor(bannerColorHex));
@@ -243,27 +264,29 @@ public final class UserProfileHeaderView extends ConstraintLayout {
             subscription.unsubscribe();
         }
         if (num != null) {
-            this.binding.b.setBackgroundColor(num.intValue());
+            this.binding.f1635c.setBackgroundColor(num.intValue());
         } else {
             GuildMember guildMember = loaded.getGuildMember();
-            Observable<Integer> c02 = ((guildMember == null || !guildMember.hasAvatar()) ? RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(Long.valueOf(loaded.getUser().getId())) : RepresentativeColorsKt.getGuildMemberRepresentativeColors().observeRepresentativeColor(new Pair<>(Long.valueOf(guildMember.getGuildId()), Long.valueOf(guildMember.getUserId())))).b0(new ViewDetachedFromWindowObservable(this).observe()).c0(UserProfileHeaderView$configureBanner$1.INSTANCE);
-            m.checkNotNullExpressionValue(c02, "representativeColorObser….takeUntil { it != null }");
-            ObservableExtensionsKt.appSubscribe$default(c02, UserProfileHeaderView.class, (Context) null, new UserProfileHeaderView$configureBanner$2(this), (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$configureBanner$3(this), 58, (Object) null);
+            Observable<Integer> b02 = ((guildMember == null || !guildMember.hasAvatar()) ? RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(Long.valueOf(loaded.getUser().getId())) : RepresentativeColorsKt.getGuildMemberRepresentativeColors().observeRepresentativeColor(new Pair<>(Long.valueOf(guildMember.getGuildId()), Long.valueOf(guildMember.getUserId())))).a0(new ViewDetachedFromWindowObservable(this).observe()).b0(UserProfileHeaderView$configureBanner$1.INSTANCE);
+            m.checkNotNullExpressionValue(b02, "representativeColorObser….takeUntil { it != null }");
+            ObservableExtensionsKt.appSubscribe$default(b02, UserProfileHeaderView.class, (Context) null, new UserProfileHeaderView$configureBanner$2(this), (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$configureBanner$3(this), 58, (Object) null);
         }
-        CardView cardView = this.binding.f1638c;
+        CardView cardView = this.binding.e;
         m.checkNotNullExpressionValue(cardView, "binding.betaTag");
         if (!z2) {
             i2 = 8;
         }
         cardView.setVisibility(i2);
+        this.binding.f1635c.setOnClickListener(new UserProfileHeaderView$configureBanner$4(this, loaded));
+        this.binding.d.setOnClickListener(new UserProfileHeaderView$configureBanner$5(this, loaded));
     }
 
     private final void configurePrimaryName(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
         User user = loaded.getUser();
         GuildMember guildMember = loaded.getGuildMember();
         int dimension = (int) getResources().getDimension(2131165290);
-        this.binding.g.b(getPrimaryNameTextForUser(user, guildMember), loaded.getShowMediumAvatar() ? IconUtils.getForUser(loaded.getUser(), true, Integer.valueOf(dimension)) : null, true, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor));
-        this.binding.g.a(user.isBot(), user.isSystemUser() ? 2131893725 : 2131887050, UserUtils.INSTANCE.isVerifiedBot(user));
+        this.binding.i.b(getPrimaryNameTextForUser(user, guildMember), loaded.getShowMediumAvatar() ? IconUtils.getForUser(loaded.getUser(), true, Integer.valueOf(dimension)) : null, true, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor));
+        this.binding.i.a(user.isBot(), user.isSystemUser() ? 2131893822 : 2131887050, UserUtils.INSTANCE.isVerifiedBot(user));
     }
 
     private final void configureSecondaryName(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
@@ -279,7 +302,7 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         CharSequence secondaryNameTextForUser = getSecondaryNameTextForUser(user, guildMember);
         int i = 0;
         boolean z2 = !(secondaryNameTextForUser == null || t.isBlank(secondaryNameTextForUser));
-        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.h;
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.j;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.userProfileHeaderSecondaryName");
         if (!z2) {
             i = 8;
@@ -287,7 +310,19 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         simpleDraweeSpanTextView.setVisibility(i);
         if (z2) {
             draweeSpanStringBuilder.append(secondaryNameTextForUser);
-            this.binding.h.setDraweeSpanStringBuilder(draweeSpanStringBuilder);
+            this.binding.j.setDraweeSpanStringBuilder(draweeSpanStringBuilder);
+        }
+    }
+
+    private final void editAvatar(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        if (loaded.getEditable()) {
+            this.onAvatarEdit.mo1invoke();
+        }
+    }
+
+    private final void editBanner(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
+        if (loaded.getEditable()) {
+            this.onBannerEdit.mo1invoke();
         }
     }
 
@@ -316,7 +351,7 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         String nick = guildMember != null ? guildMember.getNick() : null;
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        return UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nick, context, 2130968932, 2130969320, 2131427363, 2130968933, 2130969326, 2131427363);
+        return UserNameFormatterKt.getSpannableForUserNameWithDiscrim(user, nick, context, 2130968932, 2130969320, 2131427364, 2130968933, 2130969326, 2131427364);
     }
 
     private final CharSequence getSecondaryNameTextForUser(User user, GuildMember guildMember) {
@@ -326,67 +361,86 @@ public final class UserProfileHeaderView extends ConstraintLayout {
         return UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user, null, null, 3, null);
     }
 
+    public final Function0<Unit> getOnAvatarEdit() {
+        return this.onAvatarEdit;
+    }
+
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super com.discord.widgets.user.Badge, kotlin.Unit>, kotlin.jvm.functions.Function1<com.discord.widgets.user.Badge, kotlin.Unit> */
     public final Function1<Badge, Unit> getOnBadgeClick() {
         return this.onBadgeClick;
     }
 
+    public final Function0<Unit> getOnBannerEdit() {
+        return this.onBannerEdit;
+    }
+
     @Override // android.view.View
     public void onFinishInflate() {
         super.onFinishInflate();
         int i = this.userProfileHeaderBackgroundColor;
         if (i != 0) {
             setBackgroundColor(i);
-            this.binding.d.setAvatarBackgroundColor(this.userProfileHeaderBackgroundColor);
+            this.binding.f.setAvatarBackgroundColor(this.userProfileHeaderBackgroundColor);
         }
-        CardView cardView = this.binding.f1638c;
+        CardView cardView = this.binding.e;
         m.checkNotNullExpressionValue(cardView, "binding.betaTag");
         ViewExtensions.setOnLongClickListenerConsumeClick(cardView, UserProfileHeaderView$onFinishInflate$1.INSTANCE);
     }
 
+    public final void setOnAvatarEdit(Function0<Unit> function0) {
+        m.checkNotNullParameter(function0, "<set-?>");
+        this.onAvatarEdit = function0;
+    }
+
     public final void setOnBadgeClick(Function1<? super Badge, Unit> function1) {
         m.checkNotNullParameter(function1, "<set-?>");
         this.onBadgeClick = function1;
     }
 
+    public final void setOnBannerEdit(Function0<Unit> function0) {
+        m.checkNotNullParameter(function0, "<set-?>");
+        this.onBannerEdit = function0;
+    }
+
     public final void updateViewState(UserProfileHeaderViewModel.ViewState.Loaded loaded) {
         m.checkNotNullParameter(loaded, "viewState");
-        this.binding.d.setOnAvatarBitmapLoadedListener(new UserProfileHeaderView$updateViewState$1(loaded));
+        this.binding.f.setOnAvatarBitmapLoadedListener(new UserProfileHeaderView$updateViewState$1(loaded));
+        this.binding.f.setOnClickListener(new UserProfileHeaderView$updateViewState$2(this, loaded));
+        this.binding.b.setOnClickListener(new UserProfileHeaderView$updateViewState$3(this, loaded));
         configureBanner(loaded);
         GuildMember guildMember = loaded.getGuildMember();
-        UserAvatarPresenceView userAvatarPresenceView = this.binding.d;
-        User user = loaded.getUser();
-        Presence presence = loaded.getPresence();
-        StreamContext streamContext = loaded.getStreamContext();
         Activity activity = null;
-        if (guildMember == null || !GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled()) {
-            guildMember = null;
-        }
-        userAvatarPresenceView.a(new UserAvatarPresenceView.a(user, presence, streamContext, guildMember));
+        this.binding.f.a(new UserAvatarPresenceView.a(loaded.getUser(), loaded.getPresence(), loaded.getStreamContext(), loaded.getShowPresence(), (guildMember == null || !GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled()) ? null : guildMember));
         configurePrimaryName(loaded);
         configureSecondaryName(loaded);
         Badge.Companion companion = Badge.Companion;
-        User user2 = loaded.getUser();
+        User user = loaded.getUser();
         ModelUserProfile userProfile = loaded.getUserProfile();
         int snowsGivingHypeSquadEventWinner = loaded.getSnowsGivingHypeSquadEventWinner();
         boolean isMeUserPremium = loaded.isMeUserPremium();
         boolean isMeUserVerified = loaded.isMeUserVerified();
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
-        this.badgesAdapter.setData(companion.getBadgesForUser(user2, userProfile, snowsGivingHypeSquadEventWinner, isMeUserPremium, isMeUserVerified, context));
-        Presence presence2 = loaded.getPresence();
-        if (presence2 != null) {
-            activity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence2);
+        this.badgesAdapter.setData(companion.getBadgesForUser(user, userProfile, snowsGivingHypeSquadEventWinner, isMeUserPremium, isMeUserVerified, context));
+        Presence presence = loaded.getPresence();
+        if (presence != null) {
+            activity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence);
         }
         if (activity != null) {
-            this.binding.f.setDraweeSpanStringBuilder(getCustomStatusDraweeSpanStringBuilder(activity, loaded.getAllowAnimatedEmojis()));
+            this.binding.h.setDraweeSpanStringBuilder(getCustomStatusDraweeSpanStringBuilder(activity, loaded.getAllowAnimatedEmojis()));
         }
-        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f;
+        SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.h;
         m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.userProfileHeaderCustomStatus");
         int i = 0;
-        if (!(activity != null)) {
+        simpleDraweeSpanTextView.setVisibility(activity != null ? 0 : 8);
+        CardView cardView = this.binding.b;
+        m.checkNotNullExpressionValue(cardView, "binding.avatarEdit");
+        cardView.setVisibility(loaded.getEditable() ? 0 : 8);
+        CardView cardView2 = this.binding.d;
+        m.checkNotNullExpressionValue(cardView2, "binding.bannerEdit");
+        if (!loaded.getEditable()) {
             i = 8;
         }
-        simpleDraweeSpanTextView.setVisibility(i);
+        cardView2.setVisibility(i);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeComputedMembers$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeComputedMembers$1.java
index ee578a6dd5..d76c2317f5 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeComputedMembers$1.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeComputedMembers$1.java
@@ -21,6 +21,6 @@ public final class UserProfileHeaderViewModel$Companion$observeComputedMembers$1
 
     public final Observable<? extends Map<Long, GuildMember>> call(Channel channel) {
         Observable<Map<Long, GuildMember>> observeComputed;
-        return (channel == null || (observeComputed = this.$storeGuilds.observeComputed(channel.e(), this.$users)) == null) ? new j(h0.emptyMap()) : observeComputed;
+        return (channel == null || (observeComputed = this.$storeGuilds.observeComputed(channel.f(), this.$users)) == null) ? new j(h0.emptyMap()) : observeComputed;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java
index 503b18de73..38ff5854db 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Companion$observeStoreState$1.java
@@ -33,6 +33,6 @@ public final class UserProfileHeaderViewModel$Companion$observeStoreState$1<T, R
 
     public final Observable<? extends Pair<MeUser, User>> call(MeUser meUser) {
         long j = this.$userId;
-        return j == -1 ? new j(new Pair(meUser, meUser)) : this.$storeUser.observeUser(j).G(new AnonymousClass1(meUser));
+        return j == -1 ? new j(new Pair(meUser, meUser)) : this.$storeUser.observeUser(j).F(new AnonymousClass1(meUser));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java
index 968d56019e..2b6e698198 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderViewModel.java
@@ -41,6 +41,7 @@ import rx.Observable;
 public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
     public static final Companion Companion = new Companion(null);
     public static final long ME = -1;
+    private final long userId;
 
     /* compiled from: UserProfileHeaderViewModel.kt */
     /* renamed from: com.discord.widgets.user.profile.UserProfileHeaderViewModel$1  reason: invalid class name */
@@ -82,9 +83,9 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
 
         private final Observable<Map<Long, GuildMember>> observeComputedMembers(Long l, Collection<Long> collection, StoreChannels storeChannels, StoreGuilds storeGuilds) {
             if (l != null) {
-                Observable<R> Z = storeChannels.observeChannel(l.longValue()).Z(new UserProfileHeaderViewModel$Companion$observeComputedMembers$1(storeGuilds, collection));
-                m.checkNotNullExpressionValue(Z, "storeChannels\n          …emptyMap())\n            }");
-                return Z;
+                Observable<R> Y = storeChannels.observeChannel(l.longValue()).Y(new UserProfileHeaderViewModel$Companion$observeComputedMembers$1(storeGuilds, collection));
+                m.checkNotNullExpressionValue(Y, "storeChannels\n          …emptyMap())\n            }");
+                return Y;
             }
             j jVar = new j(h0.emptyMap());
             m.checkNotNullExpressionValue(jVar, "Observable.just(emptyMap())");
@@ -105,9 +106,9 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(storeExperiments, "storeExperiments");
             m.checkNotNullParameter(storeUserSettings, "storeUserSettings");
             m.checkNotNullParameter(streamContextService, "streamContextService");
-            Observable<StoreState> Z = StoreUser.observeMe$default(storeUser, false, 1, null).Z(new UserProfileHeaderViewModel$Companion$observeStoreState$1(j, storeUser)).Z(new UserProfileHeaderViewModel$Companion$observeStoreState$2(storeChannels, storeGuilds, l, storeUserPresence, streamContextService, storeUserProfile, storeExperiments, storeUserSettings));
-            m.checkNotNullExpressionValue(Z, "storeUser.observeMe()\n  …            }\n          }");
-            return Z;
+            Observable<StoreState> Y = StoreUser.observeMe$default(storeUser, false, 1, null).Y(new UserProfileHeaderViewModel$Companion$observeStoreState$1(j, storeUser)).Y(new UserProfileHeaderViewModel$Companion$observeStoreState$2(storeChannels, storeGuilds, l, storeUserPresence, streamContextService, storeUserProfile, storeExperiments, storeUserSettings));
+            m.checkNotNullExpressionValue(Y, "storeUser.observeMe()\n  …            }\n          }");
+            return Y;
         }
     }
 
@@ -117,7 +118,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         private final Map<Long, GuildMember> computedMembers;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2151me;
+        private final MeUser f2157me;
         private final ModelRichPresence richPresence;
         private final StreamContext streamContext;
         private final User user;
@@ -129,7 +130,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             m.checkNotNullParameter(user, "user");
             m.checkNotNullParameter(map, "computedMembers");
             m.checkNotNullParameter(modelUserProfile, "userProfile");
-            this.f2151me = meUser;
+            this.f2157me = meUser;
             this.user = user;
             this.computedMembers = map;
             this.richPresence = modelRichPresence;
@@ -140,11 +141,11 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         }
 
         public static /* synthetic */ StoreState copy$default(StoreState storeState, MeUser meUser, User user, Map map, ModelRichPresence modelRichPresence, StreamContext streamContext, ModelUserProfile modelUserProfile, Experiment experiment, boolean z2, int i, Object obj) {
-            return storeState.copy((i & 1) != 0 ? storeState.f2151me : meUser, (i & 2) != 0 ? storeState.user : user, (i & 4) != 0 ? storeState.computedMembers : map, (i & 8) != 0 ? storeState.richPresence : modelRichPresence, (i & 16) != 0 ? storeState.streamContext : streamContext, (i & 32) != 0 ? storeState.userProfile : modelUserProfile, (i & 64) != 0 ? storeState.winnerBadgeExperiment : experiment, (i & 128) != 0 ? storeState.allowAnimatedEmojis : z2);
+            return storeState.copy((i & 1) != 0 ? storeState.f2157me : meUser, (i & 2) != 0 ? storeState.user : user, (i & 4) != 0 ? storeState.computedMembers : map, (i & 8) != 0 ? storeState.richPresence : modelRichPresence, (i & 16) != 0 ? storeState.streamContext : streamContext, (i & 32) != 0 ? storeState.userProfile : modelUserProfile, (i & 64) != 0 ? storeState.winnerBadgeExperiment : experiment, (i & 128) != 0 ? storeState.allowAnimatedEmojis : z2);
         }
 
         public final MeUser component1() {
-            return this.f2151me;
+            return this.f2157me;
         }
 
         public final User component2() {
@@ -191,7 +192,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.f2151me, storeState.f2151me) && m.areEqual(this.user, storeState.user) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.winnerBadgeExperiment, storeState.winnerBadgeExperiment) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis;
+            return m.areEqual(this.f2157me, storeState.f2157me) && m.areEqual(this.user, storeState.user) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.winnerBadgeExperiment, storeState.winnerBadgeExperiment) && this.allowAnimatedEmojis == storeState.allowAnimatedEmojis;
         }
 
         public final boolean getAllowAnimatedEmojis() {
@@ -203,7 +204,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser getMe() {
-            return this.f2151me;
+            return this.f2157me;
         }
 
         public final ModelRichPresence getRichPresence() {
@@ -227,7 +228,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         }
 
         public int hashCode() {
-            MeUser meUser = this.f2151me;
+            MeUser meUser = this.f2157me;
             int i = 0;
             int hashCode = (meUser != null ? meUser.hashCode() : 0) * 31;
             User user = this.user;
@@ -257,7 +258,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
 
         public String toString() {
             StringBuilder L = a.L("StoreState(me=");
-            L.append(this.f2151me);
+            L.append(this.f2157me);
             L.append(", user=");
             L.append(this.user);
             L.append(", computedMembers=");
@@ -283,6 +284,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             private final boolean allowAnimatedEmojis;
             private final String bannerColorHex;
             private final String bannerHash;
+            private final boolean editable;
             private final GuildMember guildMember;
             private final boolean hasGuildMemberAvatar;
             private final boolean hasNickname;
@@ -290,6 +292,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             private final boolean isMeUserVerified;
             private final Presence presence;
             private final boolean showMediumAvatar;
+            private final boolean showPresence;
             private final boolean showSmallAvatar;
             private final int snowsGivingHypeSquadEventWinner;
             private final StreamContext streamContext;
@@ -297,7 +300,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
             private final ModelUserProfile userProfile;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Loaded(User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4) {
+            public Loaded(User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4, boolean z5, boolean z6) {
                 super(null);
                 String str3;
                 m.checkNotNullParameter(user, "user");
@@ -313,20 +316,27 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 this.isMeUserVerified = z3;
                 this.snowsGivingHypeSquadEventWinner = i;
                 this.allowAnimatedEmojis = z4;
-                boolean z5 = false;
-                boolean z6 = guildMember != null && guildMember.hasAvatar();
-                this.hasGuildMemberAvatar = z6;
-                boolean z7 = !t.isBlank((guildMember == null || (str3 = guildMember.getNick()) == null) ? "" : str3);
-                this.hasNickname = z7;
-                this.showMediumAvatar = z6 && !z7 && GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled();
-                if (z6 && z7 && GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled()) {
-                    z5 = true;
+                this.showPresence = z5;
+                this.editable = z6;
+                boolean z7 = false;
+                boolean z8 = guildMember != null && guildMember.hasAvatar();
+                this.hasGuildMemberAvatar = z8;
+                boolean z9 = !t.isBlank((guildMember == null || (str3 = guildMember.getNick()) == null) ? "" : str3);
+                this.hasNickname = z9;
+                this.showMediumAvatar = z8 && !z9 && GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled();
+                if (z8 && z9 && GuildMemberAvatarsFeatureFlag.Companion.getINSTANCE().isEnabled()) {
+                    z7 = true;
                 }
-                this.showSmallAvatar = z5;
+                this.showSmallAvatar = z7;
             }
 
-            public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4, int i2, Object obj) {
-                return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.bannerHash : str, (i2 & 4) != 0 ? loaded.bannerColorHex : str2, (i2 & 8) != 0 ? loaded.guildMember : guildMember, (i2 & 16) != 0 ? loaded.presence : presence, (i2 & 32) != 0 ? loaded.streamContext : streamContext, (i2 & 64) != 0 ? loaded.userProfile : modelUserProfile, (i2 & 128) != 0 ? loaded.isMeUserPremium : z2, (i2 & 256) != 0 ? loaded.isMeUserVerified : z3, (i2 & 512) != 0 ? loaded.snowsGivingHypeSquadEventWinner : i, (i2 & 1024) != 0 ? loaded.allowAnimatedEmojis : z4);
+            /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+            public /* synthetic */ Loaded(User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4, boolean z5, boolean z6, int i2, DefaultConstructorMarker defaultConstructorMarker) {
+                this(user, str, str2, (i2 & 8) != 0 ? null : guildMember, (i2 & 16) != 0 ? null : presence, (i2 & 32) != 0 ? null : streamContext, (i2 & 64) != 0 ? new ModelUserProfile() : modelUserProfile, z2, z3, (i2 & 512) != 0 ? -1 : i, (i2 & 1024) != 0 ? false : z4, z5, (i2 & 4096) != 0 ? false : z6);
+            }
+
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4, boolean z5, boolean z6, int i2, Object obj) {
+                return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.bannerHash : str, (i2 & 4) != 0 ? loaded.bannerColorHex : str2, (i2 & 8) != 0 ? loaded.guildMember : guildMember, (i2 & 16) != 0 ? loaded.presence : presence, (i2 & 32) != 0 ? loaded.streamContext : streamContext, (i2 & 64) != 0 ? loaded.userProfile : modelUserProfile, (i2 & 128) != 0 ? loaded.isMeUserPremium : z2, (i2 & 256) != 0 ? loaded.isMeUserVerified : z3, (i2 & 512) != 0 ? loaded.snowsGivingHypeSquadEventWinner : i, (i2 & 1024) != 0 ? loaded.allowAnimatedEmojis : z4, (i2 & 2048) != 0 ? loaded.showPresence : z5, (i2 & 4096) != 0 ? loaded.editable : z6);
             }
 
             public final User component1() {
@@ -341,6 +351,14 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 return this.allowAnimatedEmojis;
             }
 
+            public final boolean component12() {
+                return this.showPresence;
+            }
+
+            public final boolean component13() {
+                return this.editable;
+            }
+
             public final String component2() {
                 return this.bannerHash;
             }
@@ -373,10 +391,10 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 return this.isMeUserVerified;
             }
 
-            public final Loaded copy(User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4) {
+            public final Loaded copy(User user, String str, String str2, GuildMember guildMember, Presence presence, StreamContext streamContext, ModelUserProfile modelUserProfile, boolean z2, boolean z3, int i, boolean z4, boolean z5, boolean z6) {
                 m.checkNotNullParameter(user, "user");
                 m.checkNotNullParameter(modelUserProfile, "userProfile");
-                return new Loaded(user, str, str2, guildMember, presence, streamContext, modelUserProfile, z2, z3, i, z4);
+                return new Loaded(user, str, str2, guildMember, presence, streamContext, modelUserProfile, z2, z3, i, z4, z5, z6);
             }
 
             public boolean equals(Object obj) {
@@ -387,7 +405,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.user, loaded.user) && m.areEqual(this.bannerHash, loaded.bannerHash) && m.areEqual(this.bannerColorHex, loaded.bannerColorHex) && m.areEqual(this.guildMember, loaded.guildMember) && m.areEqual(this.presence, loaded.presence) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.userProfile, loaded.userProfile) && this.isMeUserPremium == loaded.isMeUserPremium && this.isMeUserVerified == loaded.isMeUserVerified && this.snowsGivingHypeSquadEventWinner == loaded.snowsGivingHypeSquadEventWinner && this.allowAnimatedEmojis == loaded.allowAnimatedEmojis;
+                return m.areEqual(this.user, loaded.user) && m.areEqual(this.bannerHash, loaded.bannerHash) && m.areEqual(this.bannerColorHex, loaded.bannerColorHex) && m.areEqual(this.guildMember, loaded.guildMember) && m.areEqual(this.presence, loaded.presence) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.userProfile, loaded.userProfile) && this.isMeUserPremium == loaded.isMeUserPremium && this.isMeUserVerified == loaded.isMeUserVerified && this.snowsGivingHypeSquadEventWinner == loaded.snowsGivingHypeSquadEventWinner && this.allowAnimatedEmojis == loaded.allowAnimatedEmojis && this.showPresence == loaded.showPresence && this.editable == loaded.editable;
             }
 
             public final boolean getAllowAnimatedEmojis() {
@@ -402,6 +420,10 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 return this.bannerHash;
             }
 
+            public final boolean getEditable() {
+                return this.editable;
+            }
+
             public final GuildMember getGuildMember() {
                 return this.guildMember;
             }
@@ -422,6 +444,10 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 return this.showMediumAvatar;
             }
 
+            public final boolean getShowPresence() {
+                return this.showPresence;
+            }
+
             public final boolean getShowSmallAvatar() {
                 return this.showSmallAvatar;
             }
@@ -479,10 +505,26 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 int i10 = z3 ? 1 : 0;
                 int i11 = (((i7 + i8) * 31) + this.snowsGivingHypeSquadEventWinner) * 31;
                 boolean z4 = this.allowAnimatedEmojis;
-                if (!z4) {
-                    i3 = z4 ? 1 : 0;
+                if (z4) {
+                    z4 = true;
                 }
-                return i11 + i3;
+                int i12 = z4 ? 1 : 0;
+                int i13 = z4 ? 1 : 0;
+                int i14 = z4 ? 1 : 0;
+                int i15 = (i11 + i12) * 31;
+                boolean z5 = this.showPresence;
+                if (z5) {
+                    z5 = true;
+                }
+                int i16 = z5 ? 1 : 0;
+                int i17 = z5 ? 1 : 0;
+                int i18 = z5 ? 1 : 0;
+                int i19 = (i15 + i16) * 31;
+                boolean z6 = this.editable;
+                if (!z6) {
+                    i3 = z6 ? 1 : 0;
+                }
+                return i19 + i3;
             }
 
             public final boolean isMeUserPremium() {
@@ -515,7 +557,11 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
                 L.append(", snowsGivingHypeSquadEventWinner=");
                 L.append(this.snowsGivingHypeSquadEventWinner);
                 L.append(", allowAnimatedEmojis=");
-                return a.G(L, this.allowAnimatedEmojis, ")");
+                L.append(this.allowAnimatedEmojis);
+                L.append(", showPresence=");
+                L.append(this.showPresence);
+                L.append(", editable=");
+                return a.G(L, this.editable, ")");
             }
         }
 
@@ -540,6 +586,7 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
     public UserProfileHeaderViewModel(long j, Long l, Observable<StoreState> observable) {
         super(ViewState.Uninitialized.INSTANCE);
         m.checkNotNullParameter(observable, "storeObservable");
+        this.userId = j;
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), UserProfileHeaderViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
@@ -577,6 +624,6 @@ public final class UserProfileHeaderViewModel extends AppViewModel<ViewState> {
         User user = storeState.getUser();
         String c2 = storeState.getUserProfile().getUser().c();
         ModelRichPresence richPresence = storeState.getRichPresence();
-        updateViewState(new ViewState.Loaded(user, str, c2, guildMember, richPresence != null ? richPresence.getPresence() : null, storeState.getStreamContext(), storeState.getUserProfile(), UserUtils.INSTANCE.isPremium(storeState.getMe()), storeState.getMe().isVerified(), bucket, storeState.getAllowAnimatedEmojis()));
+        updateViewState(new ViewState.Loaded(user, str, c2, guildMember, richPresence != null ? richPresence.getPresence() : null, storeState.getStreamContext(), storeState.getUserProfile(), UserUtils.INSTANCE.isPremium(storeState.getMe()), storeState.getMe().isVerified(), bucket, storeState.getAllowAnimatedEmojis(), true, false, 4096, null));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
index 10730af348..32ffa52cff 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java
@@ -41,19 +41,19 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
     public static final class Emoji {
 
         /* renamed from: id  reason: collision with root package name */
-        private final String f2152id;
+        private final String f2158id;
         private final boolean isAnimated;
         private final String name;
 
         public Emoji(String str, String str2, boolean z2) {
-            this.f2152id = str;
+            this.f2158id = str;
             this.name = str2;
             this.isAnimated = z2;
         }
 
         public static /* synthetic */ Emoji copy$default(Emoji emoji, String str, String str2, boolean z2, int i, Object obj) {
             if ((i & 1) != 0) {
-                str = emoji.f2152id;
+                str = emoji.f2158id;
             }
             if ((i & 2) != 0) {
                 str2 = emoji.name;
@@ -65,7 +65,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         }
 
         public final String component1() {
-            return this.f2152id;
+            return this.f2158id;
         }
 
         public final String component2() {
@@ -88,11 +88,11 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
                 return false;
             }
             Emoji emoji = (Emoji) obj;
-            return m.areEqual(this.f2152id, emoji.f2152id) && m.areEqual(this.name, emoji.name) && this.isAnimated == emoji.isAnimated;
+            return m.areEqual(this.f2158id, emoji.f2158id) && m.areEqual(this.name, emoji.name) && this.isAnimated == emoji.isAnimated;
         }
 
         public final String getId() {
-            return this.f2152id;
+            return this.f2158id;
         }
 
         public final String getName() {
@@ -100,7 +100,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         }
 
         public int hashCode() {
-            String str = this.f2152id;
+            String str = this.f2158id;
             int i = 0;
             int hashCode = (str != null ? str.hashCode() : 0) * 31;
             String str2 = this.name;
@@ -124,7 +124,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
 
         public String toString() {
             StringBuilder L = a.L("Emoji(id=");
-            L.append(this.f2152id);
+            L.append(this.f2158id);
             L.append(", name=");
             L.append(this.name);
             L.append(", isAnimated=");
@@ -273,16 +273,16 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
         super(context, attributeSet);
         m.checkNotNullParameter(context, "context");
         m.checkNotNullParameter(attributeSet, "attrs");
-        View inflate = LayoutInflater.from(context).inflate(2131558823, (ViewGroup) this, false);
+        View inflate = LayoutInflater.from(context).inflate(2131558826, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365458;
-        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131365458);
+        int i = 2131365518;
+        AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131365518);
         if (appCompatImageView != null) {
-            i = 2131365459;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365459);
+            i = 2131365519;
+            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365519);
             if (simpleDraweeView != null) {
-                i = 2131365460;
-                TextView textView = (TextView) inflate.findViewById(2131365460);
+                i = 2131365520;
+                TextView textView = (TextView) inflate.findViewById(2131365520);
                 if (textView != null) {
                     ViewUserStatusPresenceCustomBinding viewUserStatusPresenceCustomBinding = new ViewUserStatusPresenceCustomBinding((LinearLayout) inflate, appCompatImageView, simpleDraweeView, textView);
                     m.checkNotNullExpressionValue(viewUserStatusPresenceCustomBinding, "ViewUserStatusPresenceCu…rom(context), this, true)");
@@ -299,10 +299,10 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
     }
 
     private final void configurePlaceholderEmoji(ModelEmojiUnicode modelEmojiUnicode) {
-        SimpleDraweeView simpleDraweeView = this.binding.f1664c;
+        SimpleDraweeView simpleDraweeView = this.binding.f1661c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.userStatusPresenceCustomEmoji");
         MGImages.setImage$default(simpleDraweeView, ModelEmojiUnicode.getImageUri(modelEmojiUnicode.getCodePoints(), getContext()), 0, 0, false, UserStatusPresenceCustomView$configurePlaceholderEmoji$1.INSTANCE, null, 92, null);
-        SimpleDraweeView simpleDraweeView2 = this.binding.f1664c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.f1661c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.userStatusPresenceCustomEmoji");
         simpleDraweeView2.setVisibility(0);
     }
@@ -319,10 +319,10 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
                 }
             }
         }
-        SimpleDraweeView simpleDraweeView = this.binding.f1664c;
+        SimpleDraweeView simpleDraweeView = this.binding.f1661c;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.userStatusPresenceCustomEmoji");
         MGImages.setImage$default(simpleDraweeView, str, 0, 0, false, null, null, 124, null);
-        SimpleDraweeView simpleDraweeView2 = this.binding.f1664c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.f1661c;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.userStatusPresenceCustomEmoji");
         int i = 0;
         if (!(str != null)) {
@@ -349,7 +349,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout {
             appCompatImageView.setVisibility(0);
         } else if (viewState instanceof ViewState.WithPlaceholder) {
             configurePlaceholderEmoji(((ViewState.WithPlaceholder) viewState).getPlaceholderEmoji());
-            this.binding.d.setText(2131888001);
+            this.binding.d.setText(2131888000);
             AppCompatImageView appCompatImageView2 = this.binding.b;
             m.checkNotNullExpressionValue(appCompatImageView2, "binding.userStatusPresenceCustomClear");
             appCompatImageView2.setVisibility(8);
diff --git a/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java b/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java
index 66c36710f4..ec7adc7103 100644
--- a/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java
+++ b/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java
@@ -21,11 +21,11 @@ public final class WidgetUserProfileEmptyListItem<T extends MGRecyclerAdapter<D>
         super(i, t);
         m.checkNotNullParameter(t, "adapter");
         View view = this.itemView;
-        int i4 = 2131365386;
-        ImageView imageView = (ImageView) view.findViewById(2131365386);
+        int i4 = 2131365446;
+        ImageView imageView = (ImageView) view.findViewById(2131365446);
         if (imageView != null) {
-            i4 = 2131365387;
-            TextView textView = (TextView) view.findViewById(2131365387);
+            i4 = 2131365447;
+            TextView textView = (TextView) view.findViewById(2131365447);
             if (textView != null) {
                 WidgetUserProfileAdapterItemEmptyBinding widgetUserProfileAdapterItemEmptyBinding = new WidgetUserProfileAdapterItemEmptyBinding((LinearLayout) view, imageView, textView);
                 m.checkNotNullExpressionValue(widgetUserProfileAdapterItemEmptyBinding, "WidgetUserProfileAdapter…ptyBinding.bind(itemView)");
diff --git a/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java b/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java
index ba1812105d..24889cfd2c 100644
--- a/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java
+++ b/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java
@@ -44,26 +44,26 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "ctx");
         LayoutInflater.from(context).inflate(2131558751, this);
-        int i2 = 2131363339;
-        Guideline guideline = (Guideline) findViewById(2131363339);
+        int i2 = 2131363365;
+        Guideline guideline = (Guideline) findViewById(2131363365);
         if (guideline != null) {
-            i2 = 2131363648;
-            TextView textView = (TextView) findViewById(2131363648);
+            i2 = 2131363689;
+            TextView textView = (TextView) findViewById(2131363689);
             if (textView != null) {
-                i2 = 2131363670;
-                TextView textView2 = (TextView) findViewById(2131363670);
+                i2 = 2131363711;
+                TextView textView2 = (TextView) findViewById(2131363711);
                 if (textView2 != null) {
-                    i2 = 2131363682;
-                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363682);
+                    i2 = 2131363723;
+                    SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363723);
                     if (simpleDraweeView != null) {
-                        i2 = 2131363709;
-                        TextView textView3 = (TextView) findViewById(2131363709);
+                        i2 = 2131363750;
+                        TextView textView3 = (TextView) findViewById(2131363750);
                         if (textView3 != null) {
-                            i2 = 2131363711;
-                            TextView textView4 = (TextView) findViewById(2131363711);
+                            i2 = 2131363752;
+                            TextView textView4 = (TextView) findViewById(2131363752);
                             if (textView4 != null) {
-                                i2 = 2131363715;
-                                ImageView imageView = (ImageView) findViewById(2131363715);
+                                i2 = 2131363756;
+                                ImageView imageView = (ImageView) findViewById(2131363756);
                                 if (imageView != null) {
                                     ViewGlobalSearchItemBinding viewGlobalSearchItemBinding = new ViewGlobalSearchItemBinding(this, guideline, textView, textView2, simpleDraweeView, textView3, textView4, imageView);
                                     m.checkNotNullExpressionValue(viewGlobalSearchItemBinding, "ViewGlobalSearchItemBind…Inflater.from(ctx), this)");
@@ -122,35 +122,35 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv");
         String str = null;
         simpleDraweeView.setController(null);
-        if (AnimatableValueParser.r1(itemChannel.getChannel())) {
+        if (AnimatableValueParser.s1(itemChannel.getChannel())) {
             SimpleDraweeView simpleDraweeView2 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.itemIconIv");
             IconUtils.setIcon$default(simpleDraweeView2, itemChannel.getChannel(), 2131165296, null, 8, null);
-        } else if (AnimatableValueParser.k1(itemChannel.getChannel())) {
+        } else if (AnimatableValueParser.l1(itemChannel.getChannel())) {
             MGImages mGImages = MGImages.INSTANCE;
             SimpleDraweeView simpleDraweeView3 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView3, "binding.itemIconIv");
-            MGImages.setImage$default(mGImages, simpleDraweeView3, 2131231494, (MGImages.ChangeDetector) null, 4, (Object) null);
+            MGImages.setImage$default(mGImages, simpleDraweeView3, 2131231500, (MGImages.ChangeDetector) null, 4, (Object) null);
         } else {
             MGImages mGImages2 = MGImages.INSTANCE;
             SimpleDraweeView simpleDraweeView4 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView4, "binding.itemIconIv");
-            MGImages.setImage$default(mGImages2, simpleDraweeView4, 2131231485, (MGImages.ChangeDetector) null, 4, (Object) null);
+            MGImages.setImage$default(mGImages2, simpleDraweeView4, 2131231491, (MGImages.ChangeDetector) null, 4, (Object) null);
         }
-        TextView textView = this.binding.f1653c;
+        TextView textView = this.binding.f1650c;
         m.checkNotNullExpressionValue(textView, "binding.itemGroupTv");
         Guild guild = itemChannel.getGuild();
         ViewExtensions.setTextAndVisibilityBy(textView, guild != null ? guild.getName() : null);
         TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.itemNameTv");
         textView2.setText(toStyledText(itemChannel.getMatchedResult(), AnimatableValueParser.y0(itemChannel.getChannel())));
-        int z2 = itemChannel.getChannel().z();
-        if (z2 != 0) {
-            if (z2 == 1) {
+        int A = itemChannel.getChannel().A();
+        if (A != 0) {
+            if (A == 1) {
                 TextView textView3 = this.binding.b;
                 m.checkNotNullExpressionValue(textView3, "binding.itemDescriptionTv");
                 textView3.setVisibility(8);
-                TextView textView4 = this.binding.f1653c;
+                TextView textView4 = this.binding.f1650c;
                 m.checkNotNullExpressionValue(textView4, "binding.itemGroupTv");
                 User v0 = AnimatableValueParser.v0(itemChannel.getChannel());
                 if (v0 != null) {
@@ -158,8 +158,8 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
                 }
                 ViewExtensions.setTextAndVisibilityBy(textView4, str);
                 return;
-            } else if (z2 != 2) {
-                if (z2 == 3) {
+            } else if (A != 2) {
+                if (A == 3) {
                     TextView textView5 = this.binding.b;
                     m.checkNotNullExpressionValue(textView5, "binding.itemDescriptionTv");
                     int color = ColorCompat.getColor(textView5, 2131100465);
@@ -173,7 +173,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
                     m.checkNotNullExpressionValue(textView8, "binding.itemDescriptionTv");
                     textView8.setAllCaps(false);
                     return;
-                } else if (!(z2 == 5 || z2 == 13)) {
+                } else if (!(A == 5 || A == 13)) {
                     return;
                 }
             }
@@ -199,7 +199,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.itemNameTv");
         textView.setText(toStyledText(itemGuild.getMatchedResult(), itemGuild.getGuild().getName()));
-        TextView textView2 = this.binding.f1653c;
+        TextView textView2 = this.binding.f1650c;
         m.checkNotNullExpressionValue(textView2, "binding.itemGroupTv");
         ViewExtensions.setTextAndVisibilityBy(textView2, null);
         TextView textView3 = this.binding.b;
@@ -214,9 +214,9 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv");
         IconUtils.setIcon$default(simpleDraweeView, itemUser.getUser(), 0, null, null, null, 60, null);
         if (itemUser.isFriend()) {
-            this.binding.f1653c.setText(2131888810);
+            this.binding.f1650c.setText(2131888811);
         } else {
-            TextView textView = this.binding.f1653c;
+            TextView textView = this.binding.f1650c;
             m.checkNotNullExpressionValue(textView, "binding.itemGroupTv");
             textView.setText((CharSequence) null);
         }
@@ -226,7 +226,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout {
         TextView textView3 = this.binding.f;
         m.checkNotNullExpressionValue(textView3, "binding.itemNameTv");
         textView3.setImportantForAccessibility(2);
-        TextView textView4 = this.binding.f1653c;
+        TextView textView4 = this.binding.f1650c;
         m.checkNotNullExpressionValue(textView4, "binding.itemGroupTv");
         ViewExtensions.setTextAndVisibilityBy(textView4, (CharSequence) u.firstOrNull((List<? extends Object>) itemUser.getAliases()));
         TextView textView5 = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java
index 7d36166249..4e07c4d553 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java
@@ -21,26 +21,26 @@ public final /* synthetic */ class WidgetGlobalSearch$binding$2 extends k implem
 
     public final WidgetGlobalSearchBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363315;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363315);
+        int i = 2131363341;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131363341);
         if (materialButton != null) {
-            i = 2131363316;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363316);
+            i = 2131363342;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363342);
             if (textInputLayout != null) {
-                i = 2131363317;
-                TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363317);
+                i = 2131363343;
+                TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363343);
                 if (textInputEditText != null) {
-                    i = 2131363318;
-                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363318);
+                    i = 2131363344;
+                    RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363344);
                     if (recyclerView != null) {
-                        i = 2131363319;
-                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363319);
+                        i = 2131363345;
+                        MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363345);
                         if (materialButton2 != null) {
-                            i = 2131363320;
-                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363320);
+                            i = 2131363346;
+                            RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363346);
                             if (recyclerView2 != null) {
-                                i = 2131363321;
-                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363321);
+                                i = 2131363347;
+                                AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363347);
                                 if (appViewFlipper != null) {
                                     return new WidgetGlobalSearchBinding((CoordinatorLayout) view, materialButton, textInputLayout, textInputEditText, recyclerView, materialButton2, recyclerView2, appViewFlipper);
                                 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java
index e54f7efc1c..7d3d79a680 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java
@@ -12,7 +12,7 @@ public final class WidgetGlobalSearch$onViewBound$4 implements View.OnClickListe
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetGlobalSearch widgetGlobalSearch = this.this$0;
-        widgetGlobalSearch.hideKeyboard(WidgetGlobalSearch.access$getBinding$p(widgetGlobalSearch).f1787c);
+        widgetGlobalSearch.hideKeyboard(WidgetGlobalSearch.access$getBinding$p(widgetGlobalSearch).f1788c);
         WidgetGlobalSearch.access$getDismissViewModel$p(this.this$0).dismiss();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
index 9dcab51fbe..50a180d461 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java
@@ -21,7 +21,7 @@ public final class WidgetGlobalSearch$onViewBound$6 implements View.OnClickListe
     public final void onClick(View view) {
         WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion;
         Context T = a.T(view, "it", "it.context");
-        TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f1787c;
+        TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f1788c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         companion.show(T, w.trimStart(ViewExtensions.getTextOrEmpty(textInputLayout), '@', '#', '*'), "QuickSwitcher");
         WidgetGlobalSearch.onSelected$default(this.this$0, NavigationTab.FRIENDS, null, 2, null);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
index 92a7ec170f..adeae29b9e 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java
@@ -67,7 +67,7 @@ public final class WidgetGlobalSearch extends AppFragment {
     private static final int INDEX_RESULTS_NOT_FOUND = 2;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGlobalSearch$binding$2.INSTANCE, null, 2, null);
     private final Lazy dismissViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGlobalSearchDismissModel.class), new WidgetGlobalSearch$$special$$inlined$activityViewModels$1(this), new WidgetGlobalSearch$$special$$inlined$activityViewModels$2(this));
-    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.m0("");
+    private final BehaviorSubject<String> filterPublisher = BehaviorSubject.l0("");
     private String filterString;
     private WidgetGlobalSearchGuildsAdapter guildsAdapter;
     private WidgetGlobalSearchAdapter resultsAdapter;
@@ -98,7 +98,7 @@ public final class WidgetGlobalSearch extends AppFragment {
         }
 
         private final Pair<Integer, Character>[] getFILTER_OPTIONS_LIST() {
-            return new Pair[]{o.to(2131894409, '@'), o.to(2131893829, '#'), o.to(2131894527, '!'), o.to(2131893192, '*')};
+            return new Pair[]{o.to(2131894528, '@'), o.to(2131893927, '#'), o.to(2131894647, '!'), o.to(2131893275, '*')};
         }
 
         private final WidgetGlobalSearchModel.ItemDataPayload toWidgetGlobalSearchModelItem(WidgetGlobalSearchGuildsModel.Item item) {
@@ -110,7 +110,7 @@ public final class WidgetGlobalSearch extends AppFragment {
             if (v0 != null) {
                 return new WidgetGlobalSearchModel.ItemUser(WidgetGlobalSearchModel.Companion.getEMPTY_MATCH_RESULT(), v0, n.emptyList(), false, null, channel, 0, false, 192, null);
             }
-            if (channel == null || !AnimatableValueParser.p1(channel)) {
+            if (channel == null || !AnimatableValueParser.q1(channel)) {
                 return null;
             }
             return new WidgetGlobalSearchModel.ItemChannel(WidgetGlobalSearchModel.Companion.getEMPTY_MATCH_RESULT(), channel, null, null, 0, false, 48, null);
@@ -124,7 +124,7 @@ public final class WidgetGlobalSearch extends AppFragment {
     }
 
     public WidgetGlobalSearch() {
-        super(2131559019);
+        super(2131559023);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetGlobalSearch widgetGlobalSearch, WidgetGlobalSearchModel widgetGlobalSearchModel) {
@@ -256,7 +256,7 @@ public final class WidgetGlobalSearch extends AppFragment {
                 instance.findAndSetDirectMessage(context, ((WidgetGlobalSearchModel.ItemUser) itemDataPayload).getUser().getId());
             }
         } else if (itemDataPayload instanceof WidgetGlobalSearchModel.ItemChannel) {
-            ChannelSelector.Companion.getInstance().findAndSet(getContext(), ((WidgetGlobalSearchModel.ItemChannel) itemDataPayload).getChannel().g());
+            ChannelSelector.Companion.getInstance().findAndSet(getContext(), ((WidgetGlobalSearchModel.ItemChannel) itemDataPayload).getChannel().h());
         } else if (itemDataPayload instanceof WidgetGlobalSearchModel.ItemGuild) {
             StoreStream.Companion.getGuildSelected().set(((WidgetGlobalSearchModel.ItemGuild) itemDataPayload).getGuild().getId());
         }
@@ -289,7 +289,7 @@ public final class WidgetGlobalSearch extends AppFragment {
     @MainThread
     private final void setSearchPrefix(String str) {
         CharSequence charSequence;
-        TextInputLayout textInputLayout = getBinding().f1787c;
+        TextInputLayout textInputLayout = getBinding().f1788c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(ViewExtensions.getTextOrEmpty(textInputLayout));
         if (spannableStringBuilder.length() == 0) {
@@ -304,7 +304,7 @@ public final class WidgetGlobalSearch extends AppFragment {
         }
         m.checkNotNullExpressionValue(charSequence, "newQuery");
         if (!t.isBlank(charSequence)) {
-            TextInputLayout textInputLayout2 = getBinding().f1787c;
+            TextInputLayout textInputLayout2 = getBinding().f1788c;
             ViewExtensions.setText(textInputLayout2, charSequence);
             textInputLayout2.post(new WidgetGlobalSearch$setSearchPrefix$1$1(textInputLayout2));
         }
@@ -321,13 +321,13 @@ public final class WidgetGlobalSearch extends AppFragment {
         m.a aVar = c.a.a.m.j;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         d0.z.d.m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        String string = getString(2131888517);
+        String string = getString(2131888518);
         d0.z.d.m.checkNotNullExpressionValue(string, "getString(R.string.filter_options)");
         aVar.a(parentFragmentManager, string, (String[]) array, new WidgetGlobalSearch$showFilterPickerDialog$1(this));
     }
 
     public final void onDismiss() {
-        hideKeyboard(getBinding().f1787c);
+        hideKeyboard(getBinding().f1788c);
     }
 
     @Override // com.discord.app.AppFragment
@@ -342,20 +342,20 @@ public final class WidgetGlobalSearch extends AppFragment {
         RecyclerView recyclerView2 = getBinding().e;
         d0.z.d.m.checkNotNullExpressionValue(recyclerView2, "binding.globalSearchGuildList");
         this.guildsAdapter = (WidgetGlobalSearchGuildsAdapter) companion.configure(new WidgetGlobalSearchGuildsAdapter(recyclerView2, ColorCompat.getThemedColor(view, 2130969890)));
-        TextInputLayout textInputLayout = getBinding().f1787c;
+        TextInputLayout textInputLayout = getBinding().f1788c;
         d0.z.d.m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetGlobalSearch$onViewBound$1(this));
         Bundle arguments = getArguments();
         if (!(arguments == null || (string = arguments.getString("EXTRA_SEARCH_TEXT")) == null)) {
-            TextInputLayout textInputLayout2 = getBinding().f1787c;
+            TextInputLayout textInputLayout2 = getBinding().f1788c;
             d0.z.d.m.checkNotNullExpressionValue(textInputLayout2, "binding.globalSearchBar");
             ViewExtensions.setText(textInputLayout2, string);
-            TextInputLayout textInputLayout3 = getBinding().f1787c;
+            TextInputLayout textInputLayout3 = getBinding().f1788c;
             d0.z.d.m.checkNotNullExpressionValue(textInputLayout3, "binding.globalSearchBar");
             ViewExtensions.setSelectionEnd(textInputLayout3);
         }
-        getBinding().f1787c.setEndIconOnClickListener(new WidgetGlobalSearch$onViewBound$3(this));
-        getBinding().f1787c.setStartIconOnClickListener(new WidgetGlobalSearch$onViewBound$4(this));
+        getBinding().f1788c.setEndIconOnClickListener(new WidgetGlobalSearch$onViewBound$3(this));
+        getBinding().f1788c.setStartIconOnClickListener(new WidgetGlobalSearch$onViewBound$4(this));
         j jVar = new j(Unit.a);
         d0.z.d.m.checkNotNullExpressionValue(jVar, "Observable.just(Unit)");
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(jVar, this, null, 2, null), WidgetGlobalSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearch$onViewBound$5(this), 62, (Object) null);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java
index 52e62d92cd..1900b0db9e 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchAdapter.java
@@ -55,7 +55,7 @@ public final class WidgetGlobalSearchAdapter extends MGRecyclerAdapterSimple<Wid
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public HeaderViewHolder(WidgetGlobalSearchAdapter widgetGlobalSearchAdapter) {
-            super(2131558875, widgetGlobalSearchAdapter);
+            super(2131558878, widgetGlobalSearchAdapter);
             m.checkNotNullParameter(widgetGlobalSearchAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -86,7 +86,7 @@ public final class WidgetGlobalSearchAdapter extends MGRecyclerAdapterSimple<Wid
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public SearchViewHolder(WidgetGlobalSearchAdapter widgetGlobalSearchAdapter) {
-            super(2131558874, widgetGlobalSearchAdapter);
+            super(2131558877, widgetGlobalSearchAdapter);
             m.checkNotNullParameter(widgetGlobalSearchAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "null cannot be cast to non-null type com.discord.widgets.user.search.ViewGlobalSearchItem");
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
index 00ad9b49f9..d0c30458e3 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java
@@ -63,7 +63,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
     }
 
     public WidgetGlobalSearchDialog() {
-        super(2131559020);
+        super(2131559024);
     }
 
     private final WidgetGlobalSearchDismissModel getDismissViewModel() {
@@ -71,7 +71,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
     }
 
     private final WidgetGlobalSearch getFragment() {
-        Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365606);
+        Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365667);
         Objects.requireNonNull(findFragmentById, "null cannot be cast to non-null type com.discord.widgets.user.search.WidgetGlobalSearch");
         return (WidgetGlobalSearch) findFragmentById;
     }
@@ -107,8 +107,8 @@ public final class WidgetGlobalSearchDialog extends AppDialog {
     public void onViewBoundOrOnResume() {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getDismissViewModel().getDismissEvents(), this, null, 2, null), WidgetGlobalSearchDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearchDialog$onViewBoundOrOnResume$1(this), 62, (Object) null);
-        Observable T = ObservableExtensionsKt.computationLatest(StoreStream.Companion.getChannelsSelected().observeId()).s().T(1);
-        m.checkNotNullExpressionValue(T, "StoreStream\n        .get…hanged()\n        .skip(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(T, this, null, 2, null), WidgetGlobalSearchDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearchDialog$onViewBoundOrOnResume$2(this), 62, (Object) null);
+        Observable S = ObservableExtensionsKt.computationLatest(StoreStream.Companion.getChannelsSelected().observeId()).r().S(1);
+        m.checkNotNullExpressionValue(S, "StoreStream\n        .get…hanged()\n        .skip(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(S, this, null, 2, null), WidgetGlobalSearchDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearchDialog$onViewBoundOrOnResume$2(this), 62, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java
index fc9ae2af48..3e90343c1e 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDismissModel.java
@@ -7,7 +7,7 @@ import rx.Observable;
 import rx.subjects.PublishSubject;
 /* compiled from: WidgetGlobalSearchDismissModel.kt */
 public final class WidgetGlobalSearchDismissModel extends AppViewModel<Unit> {
-    private final PublishSubject<Unit> dismissEventsSubject = PublishSubject.l0();
+    private final PublishSubject<Unit> dismissEventsSubject = PublishSubject.k0();
 
     public WidgetGlobalSearchDismissModel() {
         super(null, 1, null);
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java
index dfca2dffbd..22f6759351 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java
@@ -55,7 +55,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             Context context = textView.getContext();
             m.checkNotNullExpressionValue(context, "context");
             textView.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969804, 0, 2, (Object) null));
-            textView.setContentDescription(b.g(context, 2131891156, new Object[]{String.valueOf(i)}, null, 4));
+            textView.setContentDescription(b.g(context, 2131891227, new Object[]{String.valueOf(i)}, null, 4));
         }
 
         public void onConfigure(int i, WidgetGlobalSearchGuildsModel.Item item) {
@@ -85,7 +85,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
         public void onConfigure(int i, WidgetGlobalSearchGuildsModel.Item item) {
             m.checkNotNullParameter(item, "data");
             super.onConfigure(i, item);
-            TextView textView = this.binding.f1815c;
+            TextView textView = this.binding.f1817c;
             m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount");
             configureMentionsCount(textView, item.getMentionCount());
             SimpleDraweeView simpleDraweeView = this.binding.b;
@@ -115,11 +115,11 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             m.checkNotNullParameter(widgetGlobalSearchGuildsAdapter, "adapter");
             this.overlayColor = i2;
             View view = this.itemView;
-            int i3 = 2131363497;
-            ImageView imageView = (ImageView) view.findViewById(2131363497);
+            int i3 = 2131363538;
+            ImageView imageView = (ImageView) view.findViewById(2131363538);
             if (imageView != null) {
-                i3 = 2131363498;
-                ImageView imageView2 = (ImageView) view.findViewById(2131363498);
+                i3 = 2131363539;
+                ImageView imageView2 = (ImageView) view.findViewById(2131363539);
                 if (imageView2 != null) {
                     WidgetGlobalSearchItemGuildBinding widgetGlobalSearchItemGuildBinding = new WidgetGlobalSearchItemGuildBinding((RelativeLayout) view, imageView, imageView2);
                     m.checkNotNullExpressionValue(widgetGlobalSearchItemGuildBinding, "WidgetGlobalSearchItemGuildBinding.bind(itemView)");
@@ -165,7 +165,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
             ImageView imageView = this.bindingGuild.h;
             m.checkNotNullExpressionValue(imageView, "bindingGuild.guildsItemVoice");
             imageView.setVisibility(item.getConnectedToVoice() ? 0 : 8);
-            ImageView imageView2 = this.binding.f1788c;
+            ImageView imageView2 = this.binding.f1789c;
             m.checkNotNullExpressionValue(imageView2, "binding.guildsItemUnread");
             imageView2.setVisibility(item.isUnread() ? 0 : 8);
             ImageView imageView3 = this.binding.b;
@@ -198,13 +198,13 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp
     public MGRecyclerViewHolder<?, WidgetGlobalSearchGuildsModel.Item> onCreateViewHolder(ViewGroup viewGroup, int i) {
         m.checkNotNullParameter(viewGroup, "parent");
         if (i == 1) {
-            return new ItemDivider(this, 2131559021);
+            return new ItemDivider(this, 2131559025);
         }
         if (i == 2) {
-            return new ItemDirectMessage(this, 2131559022);
+            return new ItemDirectMessage(this, 2131559026);
         }
         if (i == 3) {
-            return new ItemGuild(this, 2131559023, this.overlayColor);
+            return new ItemGuild(this, 2131559027, this.overlayColor);
         }
         throw invalidViewTypeException(i);
     }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.java
index 4716b1a90f..55631a1f2c 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$1.java
@@ -29,6 +29,6 @@ public final class WidgetGlobalSearchGuildsModel$Companion$asDirectMessageItems$
         ModelNotificationSettings modelNotificationSettings;
         ModelNotificationSettings.ChannelOverride channelOverride;
         m.checkNotNullParameter(channel, "it");
-        return this.$mentionCounts.containsKey(Long.valueOf(channel.g())) && ((modelNotificationSettings = this.$dmSettings) == null || (channelOverride = modelNotificationSettings.getChannelOverride(channel.g())) == null || !channelOverride.isMuted());
+        return this.$mentionCounts.containsKey(Long.valueOf(channel.h())) && ((modelNotificationSettings = this.$dmSettings) == null || (channelOverride = modelNotificationSettings.getChannelOverride(channel.h())) == null || !channelOverride.isMuted());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
index 593e34c90a..f467dad937 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsModel.java
@@ -65,7 +65,7 @@ public final class WidgetGlobalSearchGuildsModel {
         private final Guild guild;
 
         /* renamed from: id  reason: collision with root package name */
-        private final long f2153id;
+        private final long f2159id;
         private final boolean isSelected;
         private final boolean isUnread;
         private final String key;
@@ -84,7 +84,7 @@ public final class WidgetGlobalSearchGuildsModel {
 
             public final Item createDirectMessage$app_productionGoogleRelease(Channel channel, int i) {
                 m.checkNotNullParameter(channel, "channel");
-                return new Item(2, channel.g(), channel, null, i, false, false, false, 0, 488, null);
+                return new Item(2, channel.h(), channel, null, i, false, false, false, 0, 488, null);
             }
 
             public final Item createDivider$app_productionGoogleRelease() {
@@ -104,7 +104,7 @@ public final class WidgetGlobalSearchGuildsModel {
         /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x001c: INVOKE  (r4v1 int) = (r0v0 'this' com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel$Item A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.user.search.WidgetGlobalSearchGuildsModel.Item.getType():int), ('-' char), (r2v0 long)] */
         public Item(int i, long j, Channel channel, Guild guild, int i2, boolean z2, boolean z3, boolean z4, int i3) {
             this._type = i;
-            this.f2153id = j;
+            this.f2159id = j;
             this.channel = channel;
             this.guild = guild;
             this.mentionCount = i2;
@@ -130,11 +130,11 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public static /* synthetic */ Item copy$default(Item item, int i, long j, Channel channel, Guild guild, int i2, boolean z2, boolean z3, boolean z4, int i3, int i4, Object obj) {
-            return item.copy((i4 & 1) != 0 ? item._type : i, (i4 & 2) != 0 ? item.f2153id : j, (i4 & 4) != 0 ? item.channel : channel, (i4 & 8) != 0 ? item.guild : guild, (i4 & 16) != 0 ? item.mentionCount : i2, (i4 & 32) != 0 ? item.isUnread : z2, (i4 & 64) != 0 ? item.isSelected : z3, (i4 & 128) != 0 ? item.connectedToVoice : z4, (i4 & 256) != 0 ? item.unavailableGuildCount : i3);
+            return item.copy((i4 & 1) != 0 ? item._type : i, (i4 & 2) != 0 ? item.f2159id : j, (i4 & 4) != 0 ? item.channel : channel, (i4 & 8) != 0 ? item.guild : guild, (i4 & 16) != 0 ? item.mentionCount : i2, (i4 & 32) != 0 ? item.isUnread : z2, (i4 & 64) != 0 ? item.isSelected : z3, (i4 & 128) != 0 ? item.connectedToVoice : z4, (i4 & 256) != 0 ? item.unavailableGuildCount : i3);
         }
 
         public final long component2() {
-            return this.f2153id;
+            return this.f2159id;
         }
 
         public final Channel component3() {
@@ -177,7 +177,7 @@ public final class WidgetGlobalSearchGuildsModel {
                 return false;
             }
             Item item = (Item) obj;
-            return this._type == item._type && this.f2153id == item.f2153id && m.areEqual(this.channel, item.channel) && m.areEqual(this.guild, item.guild) && this.mentionCount == item.mentionCount && this.isUnread == item.isUnread && this.isSelected == item.isSelected && this.connectedToVoice == item.connectedToVoice && this.unavailableGuildCount == item.unavailableGuildCount;
+            return this._type == item._type && this.f2159id == item.f2159id && m.areEqual(this.channel, item.channel) && m.areEqual(this.guild, item.guild) && this.mentionCount == item.mentionCount && this.isUnread == item.isUnread && this.isSelected == item.isSelected && this.connectedToVoice == item.connectedToVoice && this.unavailableGuildCount == item.unavailableGuildCount;
         }
 
         public final Channel getChannel() {
@@ -193,7 +193,7 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public final long getId() {
-            return this.f2153id;
+            return this.f2159id;
         }
 
         @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider
@@ -215,7 +215,7 @@ public final class WidgetGlobalSearchGuildsModel {
         }
 
         public int hashCode() {
-            int a = (b.a(this.f2153id) + (this._type * 31)) * 31;
+            int a = (b.a(this.f2159id) + (this._type * 31)) * 31;
             Channel channel = this.channel;
             int i = 0;
             int hashCode = (a + (channel != null ? channel.hashCode() : 0)) * 31;
@@ -260,7 +260,7 @@ public final class WidgetGlobalSearchGuildsModel {
             StringBuilder L = a.L("Item(_type=");
             L.append(this._type);
             L.append(", id=");
-            L.append(this.f2153id);
+            L.append(this.f2159id);
             L.append(", channel=");
             L.append(this.channel);
             L.append(", guild=");
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.java
index 8d5ca24089..6e48e76641 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.java
@@ -22,7 +22,7 @@ public final class WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1<
         boolean z2 = true;
         int i2 = Integer.MAX_VALUE;
         if (channel2 != null) {
-            Integer valueOf = Integer.valueOf(this.$searchContext$inlined.getRecentGuildIds().indexOf(Long.valueOf(channel2.e())));
+            Integer valueOf = Integer.valueOf(this.$searchContext$inlined.getRecentGuildIds().indexOf(Long.valueOf(channel2.f())));
             if (!(valueOf.intValue() != -1)) {
                 valueOf = null;
             }
@@ -31,7 +31,7 @@ public final class WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1<
                 Integer valueOf2 = Integer.valueOf(i);
                 channel = t2.getChannel();
                 if (channel != null) {
-                    Integer valueOf3 = Integer.valueOf(this.$searchContext$inlined.getRecentGuildIds().indexOf(Long.valueOf(channel.e())));
+                    Integer valueOf3 = Integer.valueOf(this.$searchContext$inlined.getRecentGuildIds().indexOf(Long.valueOf(channel.f())));
                     if (valueOf3.intValue() == -1) {
                         z2 = false;
                     }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.java
index e506e7051f..38b231c6ab 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$2.java
@@ -105,6 +105,6 @@ public final class WidgetGlobalSearchModel$Companion$create$2 extends o implemen
         for (WidgetGlobalSearchModel.MatchedResult matchedResult4 : arrayList3) {
             arrayList5.add(matchedResult4.getValue());
         }
-        return new WidgetGlobalSearchModel.ItemUser(matchedResult2, user, u.distinct(u.plus((Collection) plus, (Iterable) arrayList5)), z2, (Presence) a.e(user, this.$usersContext.getPresences()), channel, (channel == null || (num = (Integer) a.d(channel, this.$searchContext.getMentionCounts())) == null) ? 0 : num.intValue(), channel != null ? this.$channelContext.getUnreadChannelIds().contains(Long.valueOf(channel.g())) : false);
+        return new WidgetGlobalSearchModel.ItemUser(matchedResult2, user, u.distinct(u.plus((Collection) plus, (Iterable) arrayList5)), z2, (Presence) a.e(user, this.$usersContext.getPresences()), channel, (channel == null || (num = (Integer) a.d(channel, this.$searchContext.getMentionCounts())) == null) ? 0 : num.intValue(), channel != null ? this.$channelContext.getUnreadChannelIds().contains(Long.valueOf(channel.h())) : false);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.java
index 1e2e1dad5d..e1faf133b9 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$4.java
@@ -45,7 +45,7 @@ public final class WidgetGlobalSearchModel$Companion$create$4 extends o implemen
             if (guild == null || (str = guild.getName()) == null) {
                 str = str2;
             }
-            Channel channel = this.this$0.$channelContext.getChannels().get(Long.valueOf(this.$this_toItemChannel.q()));
+            Channel channel = this.this$0.$channelContext.getChannels().get(Long.valueOf(this.$this_toItemChannel.r()));
             if (channel != null) {
                 str2 = AnimatableValueParser.y0(channel);
             }
@@ -80,7 +80,7 @@ public final class WidgetGlobalSearchModel$Companion$create$4 extends o implemen
         m.checkNotNullParameter(channel, "$this$toItemChannel");
         m.checkNotNullParameter(str, "channelFilter");
         AnonymousClass1 r0 = new AnonymousClass1(this, channel, str);
-        if (channel.z() != 1) {
+        if (channel.A() != 1) {
             WidgetGlobalSearchModel.MatchedResult matchedResult = WidgetGlobalSearchModel.Companion.toMatchedResult(AnimatableValueParser.y0(channel), str);
             if (matchedResult == null) {
                 matchedResult = r0.mo1invoke();
@@ -88,10 +88,10 @@ public final class WidgetGlobalSearchModel$Companion$create$4 extends o implemen
             if (matchedResult == null) {
                 return null;
             }
-            Channel channel2 = this.$channelContext.getChannels().get(Long.valueOf(channel.q()));
+            Channel channel2 = this.$channelContext.getChannels().get(Long.valueOf(channel.r()));
             Guild guild = (Guild) a.c(channel, this.$channelContext.getGuilds());
             Integer num = (Integer) a.d(channel, this.$searchContext.getMentionCounts());
-            return new WidgetGlobalSearchModel.ItemChannel(matchedResult, channel, channel2, guild, num != null ? num.intValue() : 0, this.$channelContext.getUnreadChannelIds().contains(Long.valueOf(channel.g())));
+            return new WidgetGlobalSearchModel.ItemChannel(matchedResult, channel, channel2, guild, num != null ? num.intValue() : 0, this.$channelContext.getUnreadChannelIds().contains(Long.valueOf(channel.h())));
         }
         User v0 = AnimatableValueParser.v0(channel);
         if (v0 != null) {
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.java
index 7241adaa83..ee894f0d99 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$10.java
@@ -22,6 +22,6 @@ public final class WidgetGlobalSearchModel$Companion$create$filteredResults$10 e
 
     public final boolean invoke(Channel channel) {
         m.checkNotNullParameter(channel, "it");
-        return AnimatableValueParser.x1(channel);
+        return AnimatableValueParser.y1(channel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.java
index d5d39a9d56..674b9049ad 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$3.java
@@ -22,6 +22,6 @@ public final class WidgetGlobalSearchModel$Companion$create$filteredResults$3 ex
 
     public final boolean invoke(Channel channel) {
         m.checkNotNullParameter(channel, "it");
-        return AnimatableValueParser.j1(channel);
+        return AnimatableValueParser.k1(channel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.java
index 61117ecef4..5dcdbf513f 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$5.java
@@ -22,6 +22,6 @@ public final class WidgetGlobalSearchModel$Companion$create$filteredResults$5 ex
 
     public final boolean invoke(Channel channel) {
         m.checkNotNullParameter(channel, "it");
-        return AnimatableValueParser.z1(channel);
+        return AnimatableValueParser.B1(channel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.java
index 022530b3b8..34d0d87feb 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$filteredResults$channelResults$1.java
@@ -22,6 +22,6 @@ public final class WidgetGlobalSearchModel$Companion$create$filteredResults$chan
 
     public final boolean invoke(Channel channel) {
         m.checkNotNullParameter(channel, "it");
-        return AnimatableValueParser.x1(channel);
+        return AnimatableValueParser.y1(channel);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.java
index ab0b3f6c93..245736c53d 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$results$1.java
@@ -24,8 +24,8 @@ public final class WidgetGlobalSearchModel$Companion$create$results$1 extends o
 
     public final boolean invoke(WidgetGlobalSearchModel.ItemDataPayload itemDataPayload) {
         m.checkNotNullParameter(itemDataPayload, "it");
-        long g = this.$lastChannel.g();
+        long h = this.$lastChannel.h();
         Channel channel = itemDataPayload.getChannel();
-        return channel != null && g == channel.g();
+        return channel != null && h == channel.h();
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java
index 7f72b0d7fc..ed63e3570d 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$getForSend$1.java
@@ -26,7 +26,7 @@ public final class WidgetGlobalSearchModel$Companion$getForSend$1 extends o impl
     public final boolean invoke(Channel channel, Map<Long, Long> map) {
         m.checkNotNullParameter(channel, "channel");
         m.checkNotNullParameter(map, "permissions");
-        if (AnimatableValueParser.x1(channel)) {
+        if (AnimatableValueParser.y1(channel)) {
             PermissionUtils permissionUtils = PermissionUtils.INSTANCE;
             long d = a.d(channel, map);
             if (d == null) {
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
index e74d40b0df..448ae011df 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java
@@ -289,10 +289,10 @@ public final class WidgetGlobalSearchModel {
             if (widgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1 != null) {
                 widgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1 = new WidgetGlobalSearchModel$sam$rx_functions_Func7$0(widgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1);
             }
-            Observable s2 = ObservableWithLeadingEdgeThrottle.combineLatest(jVar, observeRecentSelectedGuildIds, observeId, observePreviousId, observeSelectedVoiceChannelId, leadingEdgeThrottle, observeMentionCounts, (Func7) widgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1, 2, timeUnit).s();
+            Observable r = ObservableWithLeadingEdgeThrottle.combineLatest(jVar, observeRecentSelectedGuildIds, observeId, observePreviousId, observeSelectedVoiceChannelId, leadingEdgeThrottle, observeMentionCounts, (Func7) widgetGlobalSearchModel$Companion$get$partialSearchContextObservable$1, 2, timeUnit).r();
             WidgetGlobalSearchModel$Companion$get$searchContextObservable$1 widgetGlobalSearchModel$Companion$get$searchContextObservable$1 = WidgetGlobalSearchModel$Companion$get$searchContextObservable$1.INSTANCE;
             TimeUnit timeUnit2 = TimeUnit.MILLISECONDS;
-            Observable s3 = ObservableWithLeadingEdgeThrottle.combineLatest(observable, s2, widgetGlobalSearchModel$Companion$get$searchContextObservable$1, 250, timeUnit2).s();
+            Observable r2 = ObservableWithLeadingEdgeThrottle.combineLatest(observable, r, widgetGlobalSearchModel$Companion$get$searchContextObservable$1, 250, timeUnit2).r();
             Observable<Map<Long, User>> observeAllUsers = companion.getUsers().observeAllUsers();
             Observable<Map<Long, Presence>> observeAllPresences = companion.getPresences().observeAllPresences();
             Observable<Map<Long, Integer>> observe = companion.getUserRelationships().observe();
@@ -301,7 +301,7 @@ public final class WidgetGlobalSearchModel {
             if (widgetGlobalSearchModel$Companion$get$usersContextObservable$1 != null) {
                 widgetGlobalSearchModel$Companion$get$usersContextObservable$1 = new WidgetGlobalSearchModel$sam$rx_functions_Func4$0(widgetGlobalSearchModel$Companion$get$usersContextObservable$1);
             }
-            Observable s4 = ObservableWithLeadingEdgeThrottle.combineLatest(observeAllUsers, observeAllPresences, observe, observeComputed, (Func4) widgetGlobalSearchModel$Companion$get$usersContextObservable$1, 10, timeUnit).s();
+            Observable r3 = ObservableWithLeadingEdgeThrottle.combineLatest(observeAllUsers, observeAllPresences, observe, observeComputed, (Func4) widgetGlobalSearchModel$Companion$get$usersContextObservable$1, 10, timeUnit).r();
             Observable<Map<Long, Guild>> observeGuilds = companion.getGuilds().observeGuilds();
             Observable<Map<Long, Channel>> observeGuildAndPrivateChannels = companion.getChannels().observeGuildAndPrivateChannels();
             Observable<Map<Long, Long>> observePermissionsForAllChannels = companion.getPermissions().observePermissionsForAllChannels();
@@ -313,10 +313,10 @@ public final class WidgetGlobalSearchModel {
             if (widgetGlobalSearchModel$Companion$get$channelContextObservable$1 != null) {
                 widgetGlobalSearchModel$Companion$get$channelContextObservable$1 = new WidgetGlobalSearchModel$sam$rx_functions_Func7$0(widgetGlobalSearchModel$Companion$get$channelContextObservable$1);
             }
-            Observable s5 = ObservableWithLeadingEdgeThrottle.combineLatest(observeGuilds, observeGuildAndPrivateChannels, observePermissionsForAllChannels, observePrivateChannels, observeIds$default, unreadChannelIds, unreadGuildIds, (Func7) widgetGlobalSearchModel$Companion$get$channelContextObservable$1, 3, timeUnit).G(new WidgetGlobalSearchModel$Companion$get$channelContextObservable$2(function2)).s();
-            Observable<WidgetGlobalSearchModel> s6 = ObservableWithLeadingEdgeThrottle.combineLatest(s3, s4, s5, ObservableWithLeadingEdgeThrottle.combineLatest(s3, s5, companion.getUserGuildSettings().observeGuildSettings(), companion.getGuildsSorted().observeOrderedGuilds(), WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.INSTANCE, 5, timeUnit).s(), new j(function1), new j(function12), new WidgetGlobalSearchModel$sam$rx_functions_Func6$0(new WidgetGlobalSearchModel$Companion$get$1(this)), 200, timeUnit2).s();
-            m.checkNotNullExpressionValue(s6, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
-            return s6;
+            Observable r4 = ObservableWithLeadingEdgeThrottle.combineLatest(observeGuilds, observeGuildAndPrivateChannels, observePermissionsForAllChannels, observePrivateChannels, observeIds$default, unreadChannelIds, unreadGuildIds, (Func7) widgetGlobalSearchModel$Companion$get$channelContextObservable$1, 3, timeUnit).F(new WidgetGlobalSearchModel$Companion$get$channelContextObservable$2(function2)).r();
+            Observable<WidgetGlobalSearchModel> r5 = ObservableWithLeadingEdgeThrottle.combineLatest(r2, r3, r4, ObservableWithLeadingEdgeThrottle.combineLatest(r2, r4, companion.getUserGuildSettings().observeGuildSettings(), companion.getGuildsSorted().observeOrderedGuilds(), WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.INSTANCE, 5, timeUnit).r(), new j(function1), new j(function12), new WidgetGlobalSearchModel$sam$rx_functions_Func6$0(new WidgetGlobalSearchModel$Companion$get$1(this)), 200, timeUnit2).r();
+            m.checkNotNullExpressionValue(r5, "ObservableWithLeadingEdg…  .distinctUntilChanged()");
+            return r5;
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.user.search.WidgetGlobalSearchModel$Companion */
@@ -388,10 +388,10 @@ public final class WidgetGlobalSearchModel {
             if (searchType == 0 && t.isBlank(searchContext.getFilter())) {
                 Channel channel = channelContext.getChannels().get(function12.invoke(searchContext));
                 ItemDataPayload invoke = channel != null ? widgetGlobalSearchModel$Companion$create$4.invoke(channel, "") : null;
-                return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(invoke == null ? q.plus(n.sequenceOf(new ItemHeader(2131893683, 0, false, 6, null)), take) : q.plus(q.plus(n.sequenceOf(new ItemHeader(2131892482, 0, false, 6, null), invoke), n.sequenceOf(new ItemHeader(2131893683, 0, false, 6, null))), q.filterNot(take, new WidgetGlobalSearchModel$Companion$create$results$1(channel)))), widgetGlobalSearchGuildsModel.getItems());
+                return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(invoke == null ? q.plus(n.sequenceOf(new ItemHeader(2131893780, 0, false, 6, null)), take) : q.plus(q.plus(n.sequenceOf(new ItemHeader(2131892561, 0, false, 6, null), invoke), n.sequenceOf(new ItemHeader(2131893780, 0, false, 6, null))), q.filterNot(take, new WidgetGlobalSearchModel$Companion$create$results$1(channel)))), widgetGlobalSearchGuildsModel.getItems());
             }
             if (q.firstOrNull(take) != null) {
-                take = q.plus(n.sequenceOf(new ItemHeader(2131893683, 0, false, 6, null)), take);
+                take = q.plus(n.sequenceOf(new ItemHeader(2131893780, 0, false, 6, null)), take);
             }
             return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(take), null, 8, null);
         }
@@ -458,7 +458,7 @@ public final class WidgetGlobalSearchModel {
             this.guild = guild;
             this.mentions = i;
             this.unread = z2;
-            this.key = String.valueOf(getChannel().g());
+            this.key = String.valueOf(getChannel().h());
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.java
index cd73bdd779..cc11e6594f 100644
--- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.java
+++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchScoreStrategy.java
@@ -60,7 +60,7 @@ public final class WidgetGlobalSearchScoreStrategy {
         m.checkNotNullParameter(itemDataPayload, "$this$score");
         m.checkNotNullParameter(collection, "frecencyChannels");
         Channel channel = itemDataPayload.getChannel();
-        int scoreFrecency = scoreFrecency(collection, channel != null ? channel.g() : 0);
+        int scoreFrecency = scoreFrecency(collection, channel != null ? channel.h() : 0);
         if (itemDataPayload instanceof WidgetGlobalSearchModel.ItemUser) {
             scoreChannel = scoreUser((WidgetGlobalSearchModel.ItemUser) itemDataPayload, i);
         } else {
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java b/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java
index f3d3c449d9..9b7ace2019 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java
@@ -122,17 +122,17 @@ public final class UserProfileVoiceSettingsView extends LinearLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558713, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131365430;
-        SwitchMaterial switchMaterial = (SwitchMaterial) inflate.findViewById(2131365430);
+        int i = 2131365490;
+        SwitchMaterial switchMaterial = (SwitchMaterial) inflate.findViewById(2131365490);
         if (switchMaterial != null) {
-            i = 2131365442;
-            SwitchMaterial switchMaterial2 = (SwitchMaterial) inflate.findViewById(2131365442);
+            i = 2131365502;
+            SwitchMaterial switchMaterial2 = (SwitchMaterial) inflate.findViewById(2131365502);
             if (switchMaterial2 != null) {
-                i = 2131365456;
-                TextView textView = (TextView) inflate.findViewById(2131365456);
+                i = 2131365516;
+                TextView textView = (TextView) inflate.findViewById(2131365516);
                 if (textView != null) {
-                    i = 2131365457;
-                    VolumeSliderView volumeSliderView = (VolumeSliderView) inflate.findViewById(2131365457);
+                    i = 2131365517;
+                    VolumeSliderView volumeSliderView = (VolumeSliderView) inflate.findViewById(2131365517);
                     if (volumeSliderView != null) {
                         UserProfileVoiceSettingsViewBinding userProfileVoiceSettingsViewBinding = new UserProfileVoiceSettingsViewBinding((LinearLayout) inflate, switchMaterial, switchMaterial2, textView, volumeSliderView);
                         m.checkNotNullExpressionValue(userProfileVoiceSettingsViewBinding, "UserProfileVoiceSettings…rom(context), this, true)");
@@ -152,7 +152,7 @@ public final class UserProfileVoiceSettingsView extends LinearLayout {
 
     public final void setOnMuteChecked(Function1<? super Boolean, Unit> function1) {
         m.checkNotNullParameter(function1, "onChecked");
-        this.binding.f1640c.setOnCheckedChangeListener(new UserProfileVoiceSettingsView$setOnMuteChecked$1(function1));
+        this.binding.f1637c.setOnCheckedChangeListener(new UserProfileVoiceSettingsView$setOnMuteChecked$1(function1));
     }
 
     public final void setOnVolumeChange(Function2<? super Float, ? super Boolean, Unit> function2) {
@@ -177,7 +177,7 @@ public final class UserProfileVoiceSettingsView extends LinearLayout {
         TextView textView = this.binding.d;
         m.checkNotNullExpressionValue(textView, "binding.userSheetVolumeLabel");
         textView.setVisibility(viewState.getOutputVolume() != null ? 0 : 8);
-        SwitchMaterial switchMaterial = this.binding.f1640c;
+        SwitchMaterial switchMaterial = this.binding.f1637c;
         m.checkNotNullExpressionValue(switchMaterial, "binding.userSheetMuted");
         switchMaterial.setChecked(viewState.isMuted());
         SwitchMaterial switchMaterial2 = this.binding.b;
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java
index e177823a95..599fae3b7b 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java
@@ -41,107 +41,107 @@ public final /* synthetic */ class WidgetUserSheet$binding$2 extends k implement
                 i = 2131361810;
                 LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131361810);
                 if (linkifiedTextView != null) {
-                    i = 2131363770;
-                    ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(2131363770);
+                    i = 2131363811;
+                    ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(2131363811);
                     if (contentLoadingProgressBar != null) {
-                        i = 2131364437;
-                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364437);
+                        i = 2131364475;
+                        FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364475);
                         if (frameLayout != null) {
-                            i = 2131365421;
-                            Button button = (Button) view.findViewById(2131365421);
+                            i = 2131365481;
+                            Button button = (Button) view.findViewById(2131365481);
                             if (button != null) {
-                                i = 2131365422;
-                                CardView cardView2 = (CardView) view.findViewById(2131365422);
+                                i = 2131365482;
+                                CardView cardView2 = (CardView) view.findViewById(2131365482);
                                 if (cardView2 != null) {
-                                    i = 2131365423;
-                                    UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(2131365423);
+                                    i = 2131365483;
+                                    UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(2131365483);
                                     if (userProfileAdminView != null) {
-                                        i = 2131365425;
-                                        Button button2 = (Button) view.findViewById(2131365425);
+                                        i = 2131365485;
+                                        Button button2 = (Button) view.findViewById(2131365485);
                                         if (button2 != null) {
-                                            i = 2131365426;
-                                            TextView textView2 = (TextView) view.findViewById(2131365426);
+                                            i = 2131365486;
+                                            TextView textView2 = (TextView) view.findViewById(2131365486);
                                             if (textView2 != null) {
-                                                i = 2131365427;
-                                                UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(2131365427);
+                                                i = 2131365487;
+                                                UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(2131365487);
                                                 if (userProfileConnectionsView != null) {
-                                                    i = 2131365428;
-                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365428);
+                                                    i = 2131365488;
+                                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365488);
                                                     if (linearLayout != null) {
-                                                        i = 2131365429;
-                                                        TextView textView3 = (TextView) view.findViewById(2131365429);
+                                                        i = 2131365489;
+                                                        TextView textView3 = (TextView) view.findViewById(2131365489);
                                                         if (textView3 != null) {
-                                                            i = 2131365431;
-                                                            TextView textView4 = (TextView) view.findViewById(2131365431);
+                                                            i = 2131365491;
+                                                            TextView textView4 = (TextView) view.findViewById(2131365491);
                                                             if (textView4 != null) {
-                                                                i = 2131365432;
-                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365432);
+                                                                i = 2131365492;
+                                                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131365492);
                                                                 if (materialButton != null) {
-                                                                    i = 2131365433;
-                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365433);
+                                                                    i = 2131365493;
+                                                                    MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365493);
                                                                     if (materialButton2 != null) {
-                                                                        i = 2131365434;
-                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365434);
+                                                                        i = 2131365494;
+                                                                        LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365494);
                                                                         if (linearLayout2 != null) {
-                                                                            i = 2131365435;
-                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365435);
+                                                                            i = 2131365495;
+                                                                            LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365495);
                                                                             if (linearLayout3 != null) {
-                                                                                i = 2131365436;
-                                                                                TextView textView5 = (TextView) view.findViewById(2131365436);
+                                                                                i = 2131365496;
+                                                                                TextView textView5 = (TextView) view.findViewById(2131365496);
                                                                                 if (textView5 != null) {
-                                                                                    i = 2131365438;
-                                                                                    TextView textView6 = (TextView) view.findViewById(2131365438);
+                                                                                    i = 2131365498;
+                                                                                    TextView textView6 = (TextView) view.findViewById(2131365498);
                                                                                     if (textView6 != null) {
-                                                                                        i = 2131365439;
-                                                                                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365439);
+                                                                                        i = 2131365499;
+                                                                                        FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365499);
                                                                                         if (frameLayout2 != null) {
-                                                                                            i = 2131365440;
-                                                                                            Button button3 = (Button) view.findViewById(2131365440);
+                                                                                            i = 2131365500;
+                                                                                            Button button3 = (Button) view.findViewById(2131365500);
                                                                                             if (button3 != null) {
-                                                                                                i = 2131365441;
-                                                                                                ImageView imageView = (ImageView) view.findViewById(2131365441);
+                                                                                                i = 2131365501;
+                                                                                                ImageView imageView = (ImageView) view.findViewById(2131365501);
                                                                                                 if (imageView != null) {
-                                                                                                    i = 2131365443;
-                                                                                                    TextView textView7 = (TextView) view.findViewById(2131365443);
+                                                                                                    i = 2131365503;
+                                                                                                    TextView textView7 = (TextView) view.findViewById(2131365503);
                                                                                                     if (textView7 != null) {
-                                                                                                        i = 2131365444;
-                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365444);
+                                                                                                        i = 2131365504;
+                                                                                                        TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365504);
                                                                                                         if (textInputEditText != null) {
-                                                                                                            i = 2131365445;
-                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365445);
+                                                                                                            i = 2131365505;
+                                                                                                            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365505);
                                                                                                             if (textInputLayout != null) {
-                                                                                                                i = 2131365446;
-                                                                                                                Button button4 = (Button) view.findViewById(2131365446);
+                                                                                                                i = 2131365506;
+                                                                                                                Button button4 = (Button) view.findViewById(2131365506);
                                                                                                                 if (button4 != null) {
-                                                                                                                    i = 2131365447;
-                                                                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131365447);
+                                                                                                                    i = 2131365507;
+                                                                                                                    LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131365507);
                                                                                                                     if (linearLayout4 != null) {
-                                                                                                                        i = 2131365448;
-                                                                                                                        View findViewById = view.findViewById(2131365448);
+                                                                                                                        i = 2131365508;
+                                                                                                                        View findViewById = view.findViewById(2131365508);
                                                                                                                         if (findViewById != null) {
-                                                                                                                            i = 2131365449;
-                                                                                                                            UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365449);
+                                                                                                                            i = 2131365509;
+                                                                                                                            UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365509);
                                                                                                                             if (userProfileHeaderView != null) {
-                                                                                                                                i = 2131365450;
-                                                                                                                                CardView cardView3 = (CardView) view.findViewById(2131365450);
+                                                                                                                                i = 2131365510;
+                                                                                                                                CardView cardView3 = (CardView) view.findViewById(2131365510);
                                                                                                                                 if (cardView3 != null) {
-                                                                                                                                    i = 2131365451;
-                                                                                                                                    UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(2131365451);
+                                                                                                                                    i = 2131365511;
+                                                                                                                                    UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(2131365511);
                                                                                                                                     if (userProfileStageActionsView != null) {
-                                                                                                                                        i = 2131365452;
-                                                                                                                                        TextView textView8 = (TextView) view.findViewById(2131365452);
+                                                                                                                                        i = 2131365512;
+                                                                                                                                        TextView textView8 = (TextView) view.findViewById(2131365512);
                                                                                                                                         if (textView8 != null) {
-                                                                                                                                            i = 2131365453;
-                                                                                                                                            UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(2131365453);
+                                                                                                                                            i = 2131365513;
+                                                                                                                                            UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(2131365513);
                                                                                                                                             if (userProfileVoiceSettingsView != null) {
-                                                                                                                                                i = 2131365454;
-                                                                                                                                                RolesListView rolesListView = (RolesListView) view.findViewById(2131365454);
+                                                                                                                                                i = 2131365514;
+                                                                                                                                                RolesListView rolesListView = (RolesListView) view.findViewById(2131365514);
                                                                                                                                                 if (rolesListView != null) {
-                                                                                                                                                    i = 2131365455;
-                                                                                                                                                    Button button5 = (Button) view.findViewById(2131365455);
+                                                                                                                                                    i = 2131365515;
+                                                                                                                                                    Button button5 = (Button) view.findViewById(2131365515);
                                                                                                                                                     if (button5 != null) {
-                                                                                                                                                        i = 2131365552;
-                                                                                                                                                        CardView cardView4 = (CardView) view.findViewById(2131365552);
+                                                                                                                                                        i = 2131365613;
+                                                                                                                                                        CardView cardView4 = (CardView) view.findViewById(2131365613);
                                                                                                                                                         if (cardView4 != null) {
                                                                                                                                                             return new WidgetUserSheetBinding((NestedScrollView) view, cardView, textView, linkifiedTextView, contentLoadingProgressBar, frameLayout, button, cardView2, userProfileAdminView, button2, textView2, userProfileConnectionsView, linearLayout, textView3, textView4, materialButton, materialButton2, linearLayout2, linearLayout3, textView5, textView6, frameLayout2, button3, imageView, textView7, textInputEditText, textInputLayout, button4, linearLayout4, findViewById, userProfileHeaderView, cardView3, userProfileStageActionsView, textView8, userProfileVoiceSettingsView, rolesListView, button5, cardView4);
                                                                                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java
index 790b22ce3a..36a8358534 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java
@@ -98,7 +98,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$5 implements Vi
             m.checkNotNullParameter(requireContext, "context");
             m.checkNotNullParameter(r9, "onAccept");
             m.checkNotNullParameter(r10, "onIgnore");
-            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager, b.g(requireContext, 2131890336, new Object[0], null, 4), b.g(requireContext, 2131894244, new Object[0], null, 4), b.g(requireContext, 2131888794, new Object[0], null, 4), b.g(requireContext, 2131888800, new Object[0], null, 4), h0.mapOf(d0.o.to(2131364032, new k(0, r9)), d0.o.to(2131364027, new k(1, r10))), null, null, null, null, null, null, 0, null, 16320, null);
+            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager, b.g(requireContext, 2131890402, new Object[0], null, 4), b.g(requireContext, 2131894345, new Object[0], null, 4), b.g(requireContext, 2131888795, new Object[0], null, 4), b.g(requireContext, 2131888801, new Object[0], null, 4), h0.mapOf(d0.o.to(2131364075, new k(0, r9)), d0.o.to(2131364070, new k(1, r10))), null, null, null, null, null, null, 0, null, 16320, null);
         } else if (i == 4) {
             User user = this.$viewState.getUser();
             Context requireContext2 = this.this$0.requireContext();
@@ -110,7 +110,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$5 implements Vi
             m.checkNotNullParameter(requireContext2, "context");
             m.checkNotNullParameter(parentFragmentManager2, "fragmentManager");
             m.checkNotNullParameter(r102, "onConfirm");
-            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager2, b.g(requireContext2, 2131891706, new Object[0], null, 4), b.g(requireContext2, 2131891707, new Object[]{user.getUsername()}, null, 4), b.g(requireContext2, 2131888052, new Object[0], null, 4), b.g(requireContext2, 2131887178, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364032, new c.a.a.k(r102))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
+            WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager2, b.g(requireContext2, 2131891778, new Object[0], null, 4), b.g(requireContext2, 2131891779, new Object[]{user.getUsername()}, null, 4), b.g(requireContext2, 2131888051, new Object[0], null, 4), b.g(requireContext2, 2131887178, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364075, new c.a.a.k(r102))), null, null, null, 2130969788, null, null, 0, null, 15808, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.java
index bac9e6333e..019297bb11 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.java
@@ -3,7 +3,7 @@ package com.discord.widgets.user.usersheet;
 import android.os.Bundle;
 import android.view.View;
 import androidx.fragment.app.FragmentManager;
-import c.a.a.c.a;
+import c.a.a.b.a;
 import d0.z.d.m;
 import java.util.Objects;
 /* compiled from: WidgetUserSheet.kt */
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java
index e1449eaf3e..ff9ce0de9b 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java
@@ -1,29 +1,26 @@
 package com.discord.widgets.user.usersheet;
 
+import android.content.Context;
+import android.view.View;
+import com.discord.utilities.view.extensions.ViewExtensions;
+import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetUserSheet.kt */
-public final class WidgetUserSheet$onViewCreated$14 extends o implements Function1<String, Unit> {
+public final class WidgetUserSheet$onViewCreated$14 implements View.OnFocusChangeListener {
     public final /* synthetic */ WidgetUserSheet this$0;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetUserSheet$onViewCreated$14(WidgetUserSheet widgetUserSheet) {
-        super(1);
         this.this$0 = widgetUserSheet;
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(String str) {
-        invoke(str);
-        return Unit.a;
-    }
-
-    public final void invoke(String str) {
-        m.checkNotNullParameter(str, "noteText");
-        WidgetUserSheet.access$getViewModel$p(this.this$0).updateUserNote(str);
+    @Override // android.view.View.OnFocusChangeListener
+    public final void onFocusChange(View view, boolean z2) {
+        if (!z2) {
+            WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0);
+            Context context = this.this$0.getContext();
+            TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2002z;
+            m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
+            access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
+        }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java
index 4d72a3ee6a..cbad73f3e5 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java
@@ -2,25 +2,41 @@ package com.discord.widgets.user.usersheet;
 
 import android.content.Context;
 import android.view.View;
+import android.widget.TextView;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetUserSheet.kt */
-public final class WidgetUserSheet$onViewCreated$15 implements View.OnFocusChangeListener {
+public final class WidgetUserSheet$onViewCreated$15 extends o implements Function1<TextView, Unit> {
+    public final /* synthetic */ View $view;
     public final /* synthetic */ WidgetUserSheet this$0;
 
-    public WidgetUserSheet$onViewCreated$15(WidgetUserSheet widgetUserSheet) {
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetUserSheet$onViewCreated$15(WidgetUserSheet widgetUserSheet, View view) {
+        super(1);
         this.this$0 = widgetUserSheet;
+        this.$view = view;
     }
 
-    @Override // android.view.View.OnFocusChangeListener
-    public final void onFocusChange(View view, boolean z2) {
-        if (!z2) {
-            WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0);
-            Context context = this.this$0.getContext();
-            TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f1997z;
-            m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
-            access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
-        }
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(TextView textView) {
+        invoke(textView);
+        return Unit.a;
+    }
+
+    public final void invoke(TextView textView) {
+        m.checkNotNullParameter(textView, "it");
+        WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0);
+        Context context = this.this$0.getContext();
+        TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f2002z;
+        m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
+        access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
+        WidgetUserSheet.access$getBinding$p(this.this$0).f2002z.clearFocus();
+        this.this$0.hideKeyboard(this.$view);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java
index f9174f15a0..0f26b66bcb 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java
@@ -1,42 +1,22 @@
 package com.discord.widgets.user.usersheet;
 
-import android.content.Context;
 import android.view.View;
-import android.widget.TextView;
-import com.discord.utilities.view.extensions.ViewExtensions;
-import com.google.android.material.textfield.TextInputLayout;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetUserSheet.kt */
-public final class WidgetUserSheet$onViewCreated$16 extends o implements Function1<TextView, Unit> {
-    public final /* synthetic */ View $view;
+public final class WidgetUserSheet$onViewCreated$16 extends AccessibilityDelegateCompat {
     public final /* synthetic */ WidgetUserSheet this$0;
 
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetUserSheet$onViewCreated$16(WidgetUserSheet widgetUserSheet, View view) {
-        super(1);
+    public WidgetUserSheet$onViewCreated$16(WidgetUserSheet widgetUserSheet) {
         this.this$0 = widgetUserSheet;
-        this.$view = view;
     }
 
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function1
-    public /* bridge */ /* synthetic */ Unit invoke(TextView textView) {
-        invoke(textView);
-        return Unit.a;
-    }
-
-    public final void invoke(TextView textView) {
-        m.checkNotNullParameter(textView, "it");
-        WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0);
-        Context context = this.this$0.getContext();
-        TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f1997z;
-        m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
-        access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
-        WidgetUserSheet.access$getBinding$p(this.this$0).f1997z.clearFocus();
-        this.this$0.hideKeyboard(this.$view);
+    @Override // androidx.core.view.AccessibilityDelegateCompat
+    public void onInitializeAccessibilityNodeInfo(View view, AccessibilityNodeInfoCompat accessibilityNodeInfoCompat) {
+        m.checkNotNullParameter(view, "host");
+        m.checkNotNullParameter(accessibilityNodeInfoCompat, "info");
+        super.onInitializeAccessibilityNodeInfo(view, accessibilityNodeInfoCompat);
+        accessibilityNodeInfoCompat.setTraversalAfter(WidgetUserSheet.access$getBinding$p(this.this$0).m);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java
index f16fe58417..192f2ccece 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java
@@ -1,22 +1,29 @@
 package com.discord.widgets.user.usersheet;
 
-import android.view.View;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import d0.z.d.m;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
 /* compiled from: WidgetUserSheet.kt */
-public final class WidgetUserSheet$onViewCreated$17 extends AccessibilityDelegateCompat {
+public final class WidgetUserSheet$onViewCreated$17 extends o implements Function2<Long, String, Unit> {
     public final /* synthetic */ WidgetUserSheet this$0;
 
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public WidgetUserSheet$onViewCreated$17(WidgetUserSheet widgetUserSheet) {
+        super(2);
         this.this$0 = widgetUserSheet;
     }
 
-    @Override // androidx.core.view.AccessibilityDelegateCompat
-    public void onInitializeAccessibilityNodeInfo(View view, AccessibilityNodeInfoCompat accessibilityNodeInfoCompat) {
-        m.checkNotNullParameter(view, "host");
-        m.checkNotNullParameter(accessibilityNodeInfoCompat, "info");
-        super.onInitializeAccessibilityNodeInfo(view, accessibilityNodeInfoCompat);
-        accessibilityNodeInfoCompat.setTraversalAfter(WidgetUserSheet.access$getBinding$p(this.this$0).m);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function2
+    public /* bridge */ /* synthetic */ Unit invoke(Long l, String str) {
+        invoke(l.longValue(), str);
+        return Unit.a;
+    }
+
+    public final void invoke(long j, String str) {
+        m.checkNotNullParameter(str, "<anonymous parameter 1>");
+        WidgetUserSheet.access$getViewModel$p(this.this$0).moveUserToChannel(j);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$18.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$18.java
deleted file mode 100644
index 97af9bfa47..0000000000
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$18.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.discord.widgets.user.usersheet;
-
-import d0.z.d.m;
-import d0.z.d.o;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-/* compiled from: WidgetUserSheet.kt */
-public final class WidgetUserSheet$onViewCreated$18 extends o implements Function2<Long, String, Unit> {
-    public final /* synthetic */ WidgetUserSheet this$0;
-
-    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetUserSheet$onViewCreated$18(WidgetUserSheet widgetUserSheet) {
-        super(2);
-        this.this$0 = widgetUserSheet;
-    }
-
-    /* Return type fixed from 'java.lang.Object' to match base method */
-    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
-    @Override // kotlin.jvm.functions.Function2
-    public /* bridge */ /* synthetic */ Unit invoke(Long l, String str) {
-        invoke(l.longValue(), str);
-        return Unit.a;
-    }
-
-    public final void invoke(long j, String str) {
-        m.checkNotNullParameter(str, "<anonymous parameter 1>");
-        WidgetUserSheet.access$getViewModel$p(this.this$0).moveUserToChannel(j);
-    }
-}
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java
index 3a1c3dbf75..db65326a9d 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java
@@ -22,7 +22,7 @@ public final class WidgetUserSheet$onViewCreated$2 extends o implements Function
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final void mo1invoke() {
-            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12);
+            c.a.d.o.g(this.this$0.this$0.getContext(), 2131893437, 0, null, 12);
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
index 706799fa32..52c406693c 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java
@@ -23,7 +23,6 @@ import c.a.d.o;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.activity.Activity;
-import com.discord.api.activity.ActivityPlatform;
 import com.discord.api.channel.Channel;
 import com.discord.api.role.GuildRole;
 import com.discord.app.AppBottomSheet;
@@ -48,7 +47,6 @@ import com.discord.utilities.textprocessing.AstRenderer;
 import com.discord.utilities.textprocessing.MessageRenderContext;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.view.text.LinkifiedTextView;
-import com.discord.utilities.view.text.TextWatcherKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
 import com.discord.widgets.channels.WidgetChannelSelector;
@@ -68,7 +66,6 @@ import com.discord.widgets.user.profile.UserProfileHeaderViewModel;
 import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView;
 import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel;
 import com.discord.widgets.voice.fullscreen.WidgetCallFullscreen;
-import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import d0.t.n;
 import d0.z.d.a0;
@@ -229,12 +226,12 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void addFriend(String str) {
-        getViewModel().addRelationship(null, str, 2131888809);
+        getViewModel().addRelationship(null, str, 2131888810);
     }
 
     private final void configureAboutMe(WidgetUserSheetViewModel.ViewState.Loaded loaded) {
         List<Node<MessageRenderContext>> bioAst = loaded.getBioAst();
-        TextView textView = getBinding().f1993c;
+        TextView textView = getBinding().f1998c;
         m.checkNotNullExpressionValue(textView, "binding.aboutMeHeader");
         boolean z2 = true;
         int i = 0;
@@ -315,7 +312,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
         rolesListView2.updateView(roleItems, ColorCompat.getThemedColor(rolesListView3.getContext(), 2130969877));
         String guildSectionHeaderText = loaded.getGuildSectionHeaderText();
         if (guildSectionHeaderText != null) {
-            TextView textView = getBinding().f1994s;
+            TextView textView = getBinding().f1999s;
             m.checkNotNullExpressionValue(textView, "binding.userSheetGuildHeader");
             textView.setText(guildSectionHeaderText);
         }
@@ -350,38 +347,34 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void configureNote(WidgetUserSheetViewModel.ViewState.Loaded loaded) {
-        getBinding().f1996y.setRawInputType(1);
+        getBinding().f2001y.setRawInputType(1);
         StoreUserNotes.UserNoteState userNoteFetchState = loaded.getUserNoteFetchState();
         if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Empty) {
-            TextInputLayout textInputLayout = getBinding().f1997z;
+            TextInputLayout textInputLayout = getBinding().f2002z;
             m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout.setHint(getString(2131891446));
-            TextInputLayout textInputLayout2 = getBinding().f1997z;
+            textInputLayout.setHint(getString(2131891517));
+            TextInputLayout textInputLayout2 = getBinding().f2002z;
             m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap");
             textInputLayout2.setEnabled(true);
-            TextInputLayout textInputLayout3 = getBinding().f1997z;
-            m.checkNotNullExpressionValue(textInputLayout3, "binding.userSheetNoteTextFieldWrap");
-            ViewExtensions.setTextIfDifferent(textInputLayout3, loaded.getUserNote());
         } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loading) {
-            TextInputLayout textInputLayout4 = getBinding().f1997z;
+            TextInputLayout textInputLayout3 = getBinding().f2002z;
+            m.checkNotNullExpressionValue(textInputLayout3, "binding.userSheetNoteTextFieldWrap");
+            textInputLayout3.setHint(getString(2131890913));
+            TextInputLayout textInputLayout4 = getBinding().f2002z;
             m.checkNotNullExpressionValue(textInputLayout4, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout4.setHint(getString(2131890843));
-            TextInputLayout textInputLayout5 = getBinding().f1997z;
-            m.checkNotNullExpressionValue(textInputLayout5, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout5.setEnabled(false);
-            TextInputLayout textInputLayout6 = getBinding().f1997z;
-            m.checkNotNullExpressionValue(textInputLayout6, "binding.userSheetNoteTextFieldWrap");
-            ViewExtensions.setTextIfDifferent(textInputLayout6, loaded.getUserNote());
+            textInputLayout4.setEnabled(false);
         } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded) {
-            TextInputLayout textInputLayout7 = getBinding().f1997z;
+            TextInputLayout textInputLayout5 = getBinding().f2002z;
+            m.checkNotNullExpressionValue(textInputLayout5, "binding.userSheetNoteTextFieldWrap");
+            textInputLayout5.setHint(getString(2131891517));
+            TextInputLayout textInputLayout6 = getBinding().f2002z;
+            m.checkNotNullExpressionValue(textInputLayout6, "binding.userSheetNoteTextFieldWrap");
+            textInputLayout6.setEnabled(true);
+        }
+        if (loaded.getUserNote() != null) {
+            TextInputLayout textInputLayout7 = getBinding().f2002z;
             m.checkNotNullExpressionValue(textInputLayout7, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout7.setHint(getString(2131891446));
-            TextInputLayout textInputLayout8 = getBinding().f1997z;
-            m.checkNotNullExpressionValue(textInputLayout8, "binding.userSheetNoteTextFieldWrap");
-            textInputLayout8.setEnabled(true);
-            TextInputLayout textInputLayout9 = getBinding().f1997z;
-            m.checkNotNullExpressionValue(textInputLayout9, "binding.userSheetNoteTextFieldWrap");
-            ViewExtensions.setTextIfDifferent(textInputLayout9, loaded.getUserNote());
+            ViewExtensions.setTextIfDifferent(textInputLayout7, loaded.getUserNote());
         }
     }
 
@@ -403,7 +396,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
             Button button = getBinding().v;
             m.checkNotNullExpressionValue(button, "binding.userSheetMessageActionButton");
             Channel channel = loaded.getChannel();
-            button.setVisibility(channel == null || channel.z() != 1 ? 0 : 8);
+            button.setVisibility(channel == null || channel.A() != 1 ? 0 : 8);
             getBinding().v.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$1(this, loaded));
             getBinding().j.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(this));
             getBinding().J.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$3(this));
@@ -468,13 +461,21 @@ public final class WidgetUserSheet extends AppBottomSheet {
             frameLayout2.setVisibility(8);
             WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) viewState;
             Presence presence = loaded.getPresence();
-            ActivityPlatform activityPlatform = null;
+            ViewHolderStreamRichPresence viewHolderStreamRichPresence = null;
             Activity primaryActivity = presence != null ? PresenceUtils.INSTANCE.getPrimaryActivity(presence) : null;
             boolean isMe = loaded.isMe();
             boolean isSystemUser = loaded.getUser().isSystemUser();
+            boolean z2 = true;
+            if (!getViewModel().getOpenPopoutLogged() && loaded.getProfileLoaded()) {
+                AnalyticsTracker.INSTANCE.openUserSheet(loaded.getHasPremiumCustomization(), primaryActivity != null ? primaryActivity.h() : null, primaryActivity != null ? ActivityUtilsKt.getGamePlatform(primaryActivity) : null);
+                getViewModel().setOpenPopoutLogged(true);
+            }
             ImageView imageView = getBinding().w;
             m.checkNotNullExpressionValue(imageView, "binding.userSheetMoreButton");
-            if (!(!isMe && !isSystemUser)) {
+            if (isMe || isSystemUser) {
+                z2 = false;
+            }
+            if (!z2) {
                 i = 8;
             }
             imageView.setVisibility(i);
@@ -495,12 +496,12 @@ public final class WidgetUserSheet extends AppBottomSheet {
             richPresence.configureUi(parentFragmentManager, streamContext, isMe2, user, applicationContext, loaded.getRichPresence(), loaded.getUserInSameVoiceChannel());
             richPresence.configureUiTimestamp(primaryActivity, this);
             this.activityViewHolder = richPresence;
-            if (!(richPresence instanceof ViewHolderStreamRichPresence)) {
-                richPresence = null;
+            if (richPresence instanceof ViewHolderStreamRichPresence) {
+                viewHolderStreamRichPresence = richPresence;
             }
-            ViewHolderStreamRichPresence viewHolderStreamRichPresence = (ViewHolderStreamRichPresence) richPresence;
-            if (!(loaded.getStreamContext() == null || viewHolderStreamRichPresence == null)) {
-                viewHolderStreamRichPresence.setOnStreamPreviewClicked(new WidgetUserSheet$configureUI$2(this, viewState));
+            ViewHolderStreamRichPresence viewHolderStreamRichPresence2 = viewHolderStreamRichPresence;
+            if (!(loaded.getStreamContext() == null || viewHolderStreamRichPresence2 == null)) {
+                viewHolderStreamRichPresence2.setOnStreamPreviewClicked(new WidgetUserSheet$configureUI$2(this, viewState));
             }
             ViewHolderUserRichPresence viewHolderUserRichPresence = this.activityViewHolder;
             if (viewHolderUserRichPresence != null) {
@@ -515,12 +516,6 @@ public final class WidgetUserSheet extends AppBottomSheet {
             configureConnectionsSection(loaded);
             configureNote(loaded);
             configureDeveloperSection(loaded);
-            AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE;
-            String h = primaryActivity != null ? primaryActivity.h() : null;
-            if (primaryActivity != null) {
-                activityPlatform = ActivityUtilsKt.getGamePlatform(primaryActivity);
-            }
-            analyticsTracker.openUserSheet(h, activityPlatform);
         } else {
             throw new NoWhenBranchMatchedException();
         }
@@ -584,7 +579,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
         } else if (event instanceof WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream) {
             handleRequestPermissionsForSpectateStream((WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream) event);
         } else if (event instanceof WidgetUserSheetViewModel.Event.UserNotFound) {
-            o.i(this, 2131894242, 0, 4);
+            o.i(this, 2131894343, 0, 4);
             handleDismissSheet();
         } else if (event instanceof WidgetUserSheetViewModel.Event.DismissSheet) {
             handleDismissSheet();
@@ -645,7 +640,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void handleRequestPermissionsForSpectateStream(WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream requestPermissionsForSpectateStream) {
-        AnimatableValueParser.o2(this, null, new WidgetUserSheet$handleRequestPermissionsForSpectateStream$1(this, requestPermissionsForSpectateStream), 1, null);
+        AnimatableValueParser.q2(this, null, new WidgetUserSheet$handleRequestPermissionsForSpectateStream$1(this, requestPermissionsForSpectateStream), 1, null);
     }
 
     private final void handleShowFriendRequestErrorToast(WidgetUserSheetViewModel.Event.ShowFriendRequestErrorToast showFriendRequestErrorToast) {
@@ -657,7 +652,7 @@ public final class WidgetUserSheet extends AppBottomSheet {
     }
 
     private final void ignoreFriendRequest() {
-        getViewModel().removeRelationship(2131888801);
+        getViewModel().removeRelationship(2131888802);
     }
 
     private final void onStreamPreviewClicked(StreamContext streamContext) {
@@ -696,12 +691,12 @@ public final class WidgetUserSheet extends AppBottomSheet {
         UserProfileHeaderView.Companion companion = UserProfileHeaderView.Companion;
         UserProfileHeaderView userProfileHeaderView = getBinding().D;
         m.checkNotNullExpressionValue(userProfileHeaderView, "binding.userSheetProfileHeaderView");
-        companion.bind(userProfileHeaderView, this, getViewModelUserProfileHeader());
+        companion.bind(userProfileHeaderView, this, getViewModelUserProfileHeader().observeViewState());
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559275;
+        return 2131559284;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
@@ -726,10 +721,10 @@ public final class WidgetUserSheet extends AppBottomSheet {
         if (j > 0 && j2 > 0) {
             StoreStream.Companion.getGuildSubscriptions().unsubscribeUser(j2, j);
         }
-        hideKeyboard(getBinding().f1997z);
+        hideKeyboard(getBinding().f2002z);
         WidgetUserSheetViewModel viewModel = getViewModel();
         Context context = getContext();
-        TextInputLayout textInputLayout = getBinding().f1997z;
+        TextInputLayout textInputLayout = getBinding().f2002z;
         m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
         viewModel.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout));
         super.onPause();
@@ -772,23 +767,20 @@ public final class WidgetUserSheet extends AppBottomSheet {
         getBinding().i.setOnServerDeafen(new WidgetUserSheet$onViewCreated$11(this));
         getBinding().i.setOnServerMove(new WidgetUserSheet$onViewCreated$12(this));
         getBinding().i.setOnDisconnect(new WidgetUserSheet$onViewCreated$13(this));
-        TextInputEditText textInputEditText = getBinding().f1996y;
-        m.checkNotNullExpressionValue(textInputEditText, "binding.userSheetNoteTextField");
-        TextWatcherKt.addLifecycleAwareTextWatcher(textInputEditText, this, new WidgetUserSheet$onViewCreated$14(this));
-        TextInputLayout textInputLayout = getBinding().f1997z;
+        TextInputLayout textInputLayout = getBinding().f2002z;
         m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap");
-        ViewExtensions.setOnEditTextFocusChangeListener(textInputLayout, new WidgetUserSheet$onViewCreated$15(this));
-        TextInputLayout textInputLayout2 = getBinding().f1997z;
+        ViewExtensions.setOnEditTextFocusChangeListener(textInputLayout, new WidgetUserSheet$onViewCreated$14(this));
+        TextInputLayout textInputLayout2 = getBinding().f2002z;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap");
-        ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserSheet$onViewCreated$16(this, view), 1, null);
-        ViewCompat.setAccessibilityDelegate(getBinding().w, new WidgetUserSheet$onViewCreated$17(this));
-        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().f1994s, getBinding().f1995x, getBinding().n, getBinding().t, getBinding().G})) {
+        ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserSheet$onViewCreated$15(this, view), 1, null);
+        ViewCompat.setAccessibilityDelegate(getBinding().w, new WidgetUserSheet$onViewCreated$16(this));
+        for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().f1999s, getBinding().f2000x, getBinding().n, getBinding().t, getBinding().G})) {
             AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE;
             m.checkNotNullExpressionValue(textView, "header");
             accessibilityUtils.setViewIsHeading(textView);
         }
-        WidgetChannelSelector.Companion.registerForResult$default(WidgetChannelSelector.Companion, this, "REQUEST_KEY_MOVE_USER", false, new WidgetUserSheet$onViewCreated$18(this), 4, null);
-        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c;
+        WidgetChannelSelector.Companion.registerForResult$default(WidgetChannelSelector.Companion, this, "REQUEST_KEY_MOVE_USER", false, new WidgetUserSheet$onViewCreated$17(this), 4, null);
+        RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1591c;
         int color = RebrandFeatureFlag.b ? ColorCompat.getColor(view, 2131099764) : ColorCompat.getColor(view, 2131099736);
         ContentLoadingProgressBar contentLoadingProgressBar = getBinding().e;
         m.checkNotNullExpressionValue(contentLoadingProgressBar, "binding.loadingProgressBar");
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
index a87ca5cd8e..e0c1314daf 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java
@@ -50,7 +50,7 @@ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implemen
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Boolean mo1invoke() {
-            WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888049);
+            WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888048);
             return null;
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java
index 4a62c6e01f..1d2d18fe8c 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java
@@ -22,6 +22,6 @@ public final class WidgetUserSheetViewModel$disconnectUser$1 extends o implement
     }
 
     public final void invoke(Void r2) {
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888147);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888146);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java
index b6bd78476a..2428315fac 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$disconnectUser$2 extends o implement
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java
index 63257590f9..7e83f69bf5 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$guildDeafenUser$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java
index 72856eb4fc..798f18f1c1 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$guildMuteUser$2 extends o implements
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java
index 350714a551..466f99fff3 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java
@@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$inviteUserToSpeak$1 extends o implem
         return Unit.a;
     }
 
-    public final void invoke(Void r25) {
+    public final void invoke(Void r26) {
         WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0);
         if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) {
             access$getViewState$p = null;
         }
         WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p;
         if (loaded != null) {
-            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 127, null), null, null, null, 0, null, null, null, false, null, 523775, null));
+            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 127, null), null, null, null, 0, null, null, null, false, null, false, 1048063, null));
             WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.java
index 4390a49db2..115459ccd0 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$launchVideoCall$1 extends o implemen
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        WidgetUserSheetViewModel.access$emitLaunchVideoCallEvent(this.this$0, channel.g());
+        WidgetUserSheetViewModel.access$emitLaunchVideoCallEvent(this.this$0, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java
index 114403e5e3..c0334b72f4 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$launchVideoCall$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.java
index f380625c76..46d6cba3db 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$launchVoiceCall$1 extends o implemen
 
     public final void invoke(Channel channel) {
         m.checkNotNullParameter(channel, "channel");
-        WidgetUserSheetViewModel.access$emitLaunchVoiceCallEvent(this.this$0, channel.g());
+        WidgetUserSheetViewModel.access$emitLaunchVoiceCallEvent(this.this$0, channel.h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java
index 1fbc046e48..13df8a05be 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$launchVoiceCall$2 extends o implemen
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java
index a89e754a48..abe6cae5cb 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java
@@ -22,6 +22,6 @@ public final class WidgetUserSheetViewModel$moveUserToChannel$1 extends o implem
     }
 
     public final void invoke(Void r2) {
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131891256);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131891327);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java
index 8a64f2c906..0025969667 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$moveUserToChannel$2 extends o implem
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java
index 64044bcede..13501ea011 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java
@@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$removeRelationship$2 extends o imple
 
     public final void invoke(Error error) {
         m.checkNotNullParameter(error, "it");
-        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049);
+        WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java
index cf2b87b9e5..f96d8be444 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java
@@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$setUserSuppressedInChannel$1 extends
         return Unit.a;
     }
 
-    public final void invoke(Void r25) {
+    public final void invoke(Void r26) {
         WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0);
         if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) {
             access$getViewState$p = null;
         }
         WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p;
         if (loaded != null) {
-            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 191, null), null, null, null, 0, null, null, null, false, null, 523775, null));
+            WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 191, null), null, null, null, 0, null, null, null, false, null, false, 1048063, null));
             WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0);
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
index 03177c408a..82c330ab6b 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java
@@ -19,8 +19,10 @@ import com.discord.models.domain.ModelUserRelationship;
 import com.discord.models.guild.Guild;
 import com.discord.models.member.GuildMember;
 import com.discord.models.presence.Presence;
+import com.discord.models.user.CoreUser;
 import com.discord.models.user.MeUser;
 import com.discord.models.user.User;
+import com.discord.nullserializable.NullSerializable;
 import com.discord.restapi.RestAPIParams;
 import com.discord.simpleast.core.node.Node;
 import com.discord.simpleast.core.parser.Parser;
@@ -29,7 +31,9 @@ import com.discord.stores.StoreApplicationStreaming;
 import com.discord.stores.StoreMediaSettings;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserNotes;
+import com.discord.stores.StoreUserProfile;
 import com.discord.utilities.guilds.RoleUtils;
+import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.permissions.ManageUserContext;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -75,6 +79,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
     private final String friendToken;
     private final boolean isVoiceContext;
     private StoreState mostRecentStoreState;
+    private boolean openPopoutLogged;
     private final RestAPI restAPI;
     private final RestAPI restAPISerializeNulls;
     private final Set<Integer> revealedBioIndices;
@@ -742,7 +747,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         private final Map<Long, GuildRole> guildRoles;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2154me;
+        private final MeUser f2160me;
         private final boolean muted;
         private final Map<Long, VoiceState> mySelectedVoiceChannelVoiceStates;
         private final StageRoles myStageRoles;
@@ -762,7 +767,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
 
         private StoreState(User user, MeUser meUser, Channel channel, Map<Long, GuildMember> map, Map<Long, GuildRole> map2, Map<Long, VoiceState> map3, Map<Long, VoiceState> map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) {
             this.user = user;
-            this.f2154me = meUser;
+            this.f2160me = meUser;
             this.channel = channel;
             this.computedMembers = map;
             this.guildRoles = map2;
@@ -791,7 +796,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
 
         /* renamed from: copy-1YV1AGg$default  reason: not valid java name */
         public static /* synthetic */ StoreState m54copy1YV1AGg$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, int i, Object obj) {
-            return storeState.m57copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2154me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : modelUserProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2);
+            return storeState.m57copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2160me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : modelUserProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2);
         }
 
         public final User component1() {
@@ -839,7 +844,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser component2() {
-            return this.f2154me;
+            return this.f2160me;
         }
 
         /* renamed from: component20-twRsX-0  reason: not valid java name */
@@ -906,7 +911,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return false;
             }
             StoreState storeState = (StoreState) obj;
-            return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2154me, storeState.f2154me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles);
+            return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2160me, storeState.f2160me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles);
         }
 
         public final Channel getChannel() {
@@ -930,7 +935,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
 
         public final MeUser getMe() {
-            return this.f2154me;
+            return this.f2160me;
         }
 
         public final boolean getMuted() {
@@ -1003,7 +1008,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             User user = this.user;
             int i = 0;
             int hashCode = (user != null ? user.hashCode() : 0) * 31;
-            MeUser meUser = this.f2154me;
+            MeUser meUser = this.f2160me;
             int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
             Channel channel = this.channel;
             int hashCode3 = (hashCode2 + (channel != null ? channel.hashCode() : 0)) * 31;
@@ -1068,7 +1073,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             StringBuilder L = a.L("StoreState(user=");
             L.append(this.user);
             L.append(", me=");
-            L.append(this.f2154me);
+            L.append(this.f2160me);
             L.append(", channel=");
             L.append(this.channel);
             L.append(", computedMembers=");
@@ -1126,7 +1131,9 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             private final UserProfileConnectionsView.ViewState connectionsViewState;
             private final String guildName;
             private final String guildSectionHeaderText;
+            private final boolean hasPremiumCustomization;
             private final boolean isMe;
+            private final boolean profileLoaded;
             private final ModelRichPresence richPresence;
             private final List<GuildRole> roleItems;
             private final boolean showVoiceSettings;
@@ -1140,15 +1147,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             private final UserProfileVoiceSettingsView.ViewState voiceSettingsViewState;
 
             /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-            public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2) {
+            public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2, boolean z5) {
                 super(null);
+                String avatar;
                 m.checkNotNullParameter(user, "user");
                 m.checkNotNullParameter(viewState, "voiceSettingsViewState");
                 m.checkNotNullParameter(list, "roleItems");
                 m.checkNotNullParameter(viewState3, "stageViewState");
                 m.checkNotNullParameter(viewState4, "connectionsViewState");
                 m.checkNotNullParameter(userNoteState, "userNoteFetchState");
-                m.checkNotNullParameter(str3, "userNote");
                 this.user = user;
                 this.isMe = z2;
                 this.showVoiceSettings = z3;
@@ -1168,10 +1175,16 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 this.userNote = str3;
                 this.userInSameVoiceChannel = z4;
                 this.bioAst = list2;
+                this.profileLoaded = z5;
+                boolean z6 = true;
+                if (user.getBanner() == null && ((avatar = user.getAvatar()) == null || !IconUtils.INSTANCE.isImageHashAnimated(avatar))) {
+                    z6 = false;
+                }
+                this.hasPremiumCustomization = z6;
             }
 
-            public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List list2, int i2, Object obj) {
-                return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 65536) != 0 ? loaded.userNote : str3, (i2 & 131072) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 262144) != 0 ? loaded.bioAst : list2);
+            public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List list2, boolean z5, int i2, Object obj) {
+                return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 65536) != 0 ? loaded.userNote : str3, (i2 & 131072) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 262144) != 0 ? loaded.bioAst : list2, (i2 & 524288) != 0 ? loaded.profileLoaded : z5);
             }
 
             public final User component1() {
@@ -1222,6 +1235,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return this.isMe;
             }
 
+            public final boolean component20() {
+                return this.profileLoaded;
+            }
+
             public final boolean component3() {
                 return this.showVoiceSettings;
             }
@@ -1250,15 +1267,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return this.adminViewState;
             }
 
-            public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2) {
+            public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List<GuildRole> list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List<Node<MessageRenderContext>> list2, boolean z5) {
                 m.checkNotNullParameter(user, "user");
                 m.checkNotNullParameter(viewState, "voiceSettingsViewState");
                 m.checkNotNullParameter(list, "roleItems");
                 m.checkNotNullParameter(viewState3, "stageViewState");
                 m.checkNotNullParameter(viewState4, "connectionsViewState");
                 m.checkNotNullParameter(userNoteState, "userNoteFetchState");
-                m.checkNotNullParameter(str3, "userNote");
-                return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, str3, z4, list2);
+                return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, str3, z4, list2, z5);
             }
 
             public boolean equals(Object obj) {
@@ -1269,7 +1285,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                     return false;
                 }
                 Loaded loaded = (Loaded) obj;
-                return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst);
+                return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst) && this.profileLoaded == loaded.profileLoaded;
             }
 
             public final UserProfileAdminView.ViewState getAdminViewState() {
@@ -1300,6 +1316,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return this.guildSectionHeaderText;
             }
 
+            public final boolean getHasPremiumCustomization() {
+                return this.hasPremiumCustomization;
+            }
+
             public final Presence getPresence() {
                 ModelRichPresence modelRichPresence = this.richPresence;
                 if (modelRichPresence != null) {
@@ -1308,6 +1328,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 return null;
             }
 
+            public final boolean getProfileLoaded() {
+                return this.profileLoaded;
+            }
+
             public final ModelRichPresence getRichPresence() {
                 return this.richPresence;
             }
@@ -1400,15 +1424,23 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 String str3 = this.userNote;
                 int hashCode14 = (hashCode13 + (str3 != null ? str3.hashCode() : 0)) * 31;
                 boolean z4 = this.userInSameVoiceChannel;
-                if (!z4) {
-                    i2 = z4 ? 1 : 0;
+                if (z4) {
+                    z4 = true;
                 }
-                int i11 = (hashCode14 + i2) * 31;
+                int i11 = z4 ? 1 : 0;
+                int i12 = z4 ? 1 : 0;
+                int i13 = z4 ? 1 : 0;
+                int i14 = (hashCode14 + i11) * 31;
                 List<Node<MessageRenderContext>> list2 = this.bioAst;
                 if (list2 != null) {
                     i = list2.hashCode();
                 }
-                return i11 + i;
+                int i15 = (i14 + i) * 31;
+                boolean z5 = this.profileLoaded;
+                if (!z5) {
+                    i2 = z5 ? 1 : 0;
+                }
+                return i15 + i2;
             }
 
             public final boolean isMe() {
@@ -1453,7 +1485,9 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 L.append(", userInSameVoiceChannel=");
                 L.append(this.userInSameVoiceChannel);
                 L.append(", bioAst=");
-                return a.E(L, this.bioAst, ")");
+                L.append(this.bioAst);
+                L.append(", profileLoaded=");
+                return a.G(L, this.profileLoaded, ")");
             }
         }
 
@@ -1515,7 +1549,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         this.restAPISerializeNulls = restAPI2;
         this.storeApplicationStreamPreviews = storeApplicationStreamPreviews;
         this.bioParser = parser;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.fetchedPreviews = new LinkedHashSet();
         this.revealedBioIndices = new LinkedHashSet();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
@@ -1570,10 +1604,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         } else {
             z4 = false;
         }
-        boolean z6 = !AnimatableValueParser.p1(channel) ? !(manageUserContext == null || !manageUserContext.getCanKick()) : !(AnimatableValueParser.o1(channel) || !z2 || z3);
-        boolean p1 = AnimatableValueParser.p1(channel);
+        boolean z6 = !AnimatableValueParser.q1(channel) ? !(manageUserContext == null || !manageUserContext.getCanKick()) : !(AnimatableValueParser.p1(channel) || !z2 || z3);
+        boolean q1 = AnimatableValueParser.q1(channel);
         boolean z7 = manageUserContext != null && manageUserContext.getCanBan();
-        boolean z8 = voiceState != null && manageUserContext != null && manageUserContext.getCanMute() && !AnimatableValueParser.u1(channel);
+        boolean z8 = voiceState != null && manageUserContext != null && manageUserContext.getCanMute() && !AnimatableValueParser.v1(channel);
         boolean z9 = voiceState != null && voiceState.e();
         boolean z10 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanDeafen()) ? false : true;
         boolean z11 = voiceState != null && voiceState.b();
@@ -1591,7 +1625,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 i++;
             }
         }
-        return new UserProfileAdminView.ViewState(z4, z6, p1, z7, z8, z9, z10, z11, z12, z5, z3);
+        return new UserProfileAdminView.ViewState(z4, z6, q1, z7, z8, z9, z10, z11, z12, z5, z3);
     }
 
     private final List<Node<MessageRenderContext>> createAndProcessBioAstFromText(String str) {
@@ -1675,28 +1709,26 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
 
     /* JADX DEBUG: Multi-variable search result rejected for r14v1, resolved type: java.lang.Boolean */
     /* JADX DEBUG: Multi-variable search result rejected for r1v7, resolved type: java.lang.Float */
-    /* JADX DEBUG: Multi-variable search result rejected for r1v23, resolved type: java.lang.Float */
+    /* JADX DEBUG: Multi-variable search result rejected for r1v31, resolved type: java.lang.Float */
     /* JADX DEBUG: Multi-variable search result rejected for r14v4, resolved type: java.lang.Boolean */
     /* JADX WARN: Multi-variable type inference failed */
-    /* JADX WARNING: Code restructure failed: missing block: B:105:0x022a, code lost:
-        if ((r5 == null || r5.length() == 0) == false) goto L_0x022f;
-     */
     /* JADX WARNING: Code restructure failed: missing block: B:19:0x008c, code lost:
         if (r8 != null) goto L_0x0093;
      */
-    /* JADX WARNING: Removed duplicated region for block: B:100:0x021e  */
-    /* JADX WARNING: Removed duplicated region for block: B:113:0x023d  */
-    /* JADX WARNING: Removed duplicated region for block: B:117:0x024a  */
-    /* JADX WARNING: Removed duplicated region for block: B:118:0x024f  */
-    /* JADX WARNING: Removed duplicated region for block: B:68:0x01c6  */
-    /* JADX WARNING: Removed duplicated region for block: B:69:0x01cb  */
-    /* JADX WARNING: Removed duplicated region for block: B:72:0x01d6  */
-    /* JADX WARNING: Removed duplicated region for block: B:75:0x01db  */
-    /* JADX WARNING: Removed duplicated region for block: B:76:0x01e0  */
-    /* JADX WARNING: Removed duplicated region for block: B:79:0x01e9  */
-    /* JADX WARNING: Removed duplicated region for block: B:88:0x0202  */
-    /* JADX WARNING: Removed duplicated region for block: B:91:0x0207  */
-    /* JADX WARNING: Removed duplicated region for block: B:92:0x020c  */
+    /* JADX WARNING: Removed duplicated region for block: B:105:0x0248  */
+    /* JADX WARNING: Removed duplicated region for block: B:113:0x025a A[ADDED_TO_REGION] */
+    /* JADX WARNING: Removed duplicated region for block: B:117:0x0264  */
+    /* JADX WARNING: Removed duplicated region for block: B:120:0x026f  */
+    /* JADX WARNING: Removed duplicated region for block: B:121:0x0274  */
+    /* JADX WARNING: Removed duplicated region for block: B:68:0x01c9  */
+    /* JADX WARNING: Removed duplicated region for block: B:79:0x01fd  */
+    /* JADX WARNING: Removed duplicated region for block: B:80:0x0202  */
+    /* JADX WARNING: Removed duplicated region for block: B:83:0x020d  */
+    /* JADX WARNING: Removed duplicated region for block: B:86:0x0212  */
+    /* JADX WARNING: Removed duplicated region for block: B:92:0x0226  */
+    /* JADX WARNING: Removed duplicated region for block: B:95:0x022b  */
+    /* JADX WARNING: Removed duplicated region for block: B:96:0x0230  */
+    /* JADX WARNING: Removed duplicated region for block: B:99:0x0235  */
     private final void handleStoreState(StoreState storeState) {
         List list;
         ManageUserContext manageUserContext;
@@ -1706,31 +1738,31 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         String str2;
         StreamContext streamContext;
         String encodedStreamKey;
-        ViewState viewState;
-        String userNote;
+        boolean z3;
+        User user;
         StoreUserNotes.UserNoteState userNoteFetchState;
         String note;
-        ViewState viewState2;
-        boolean z3;
-        String str3;
+        ViewState viewState;
+        boolean z4;
         ModelUserNote note2;
+        User merge;
         ModelApplicationStream stream;
-        String str4;
+        String str3;
         List<Long> roles;
         if (storeState == null) {
             this.eventSubject.j.onNext(Event.UserNotFound.INSTANCE);
             return;
         }
-        User user = storeState.getUser();
+        User user2 = storeState.getUser();
         MeUser me2 = storeState.getMe();
         Channel channel = storeState.getChannel();
         Map<Long, GuildMember> computedMembers = storeState.getComputedMembers();
         Map<Long, GuildRole> guildRoles = storeState.getGuildRoles();
         Guild guild = storeState.getGuild();
-        boolean z4 = true;
-        boolean z5 = me2.getId() == user.getId();
-        boolean isSystemUser = user.isSystemUser();
-        GuildMember guildMember = (GuildMember) a.e(user, computedMembers);
+        boolean z5 = false;
+        boolean z6 = me2.getId() == user2.getId();
+        boolean isSystemUser = user2.isSystemUser();
+        GuildMember guildMember = (GuildMember) a.e(user2, computedMembers);
         GuildMember guildMember2 = computedMembers.get(Long.valueOf(me2.getId()));
         if (!(guildMember == null || (roles = guildMember.getRoles()) == null)) {
             ArrayList arrayList = new ArrayList();
@@ -1748,120 +1780,142 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             manageUserContext = null;
         } else {
             str = null;
-            manageUserContext = ManageUserContext.Companion.from(guild, me2, user, guildMember2.getRoles(), guildMember.getRoles(), storeState.getPermissions(), guildRoles);
+            manageUserContext = ManageUserContext.Companion.from(guild, me2, user2, guildMember2.getRoles(), guildMember.getRoles(), storeState.getPermissions(), guildRoles);
         }
-        boolean z6 = channel != null && channel.p() == me2.getId();
+        boolean z7 = channel != null && channel.q() == me2.getId();
         int type = ModelUserRelationship.getType(storeState.getUserRelationshipType());
-        VoiceState voiceState = (VoiceState) a.e(user, storeState.getMySelectedVoiceChannelVoiceStates());
+        VoiceState voiceState = (VoiceState) a.e(user2, storeState.getMySelectedVoiceChannelVoiceStates());
         VoiceState voiceState2 = storeState.getMySelectedVoiceChannelVoiceStates().get(Long.valueOf(me2.getId()));
         boolean isInSameVoiceChannel = isInSameVoiceChannel(voiceState2, voiceState);
-        boolean z7 = this.isVoiceContext || isInSameVoiceChannel;
-        boolean selfMuted = z5 ? storeState.getSelfMuted() : storeState.getMuted();
-        Boolean valueOf = z5 ? Boolean.valueOf(storeState.getSelfDeafened()) : str;
-        if (!z5) {
+        boolean z8 = this.isVoiceContext || isInSameVoiceChannel;
+        boolean selfMuted = z6 ? storeState.getSelfMuted() : storeState.getMuted();
+        Boolean valueOf = z6 ? Boolean.valueOf(storeState.getSelfDeafened()) : str;
+        if (!z6) {
             z2 = isSystemUser;
             f = Float.valueOf(PerceptualVolumeUtils.amplitudeToPerceptual$default(PerceptualVolumeUtils.INSTANCE, storeState.getOutputVolume(), 0.0f, 2, str));
         } else {
             z2 = isSystemUser;
             f = str;
         }
-        UserProfileVoiceSettingsView.ViewState viewState3 = new UserProfileVoiceSettingsView.ViewState(selfMuted, valueOf, f);
-        VoiceState voiceState3 = (VoiceState) a.e(user, storeState.getCurrentChannelVoiceStates());
+        UserProfileVoiceSettingsView.ViewState viewState2 = new UserProfileVoiceSettingsView.ViewState(selfMuted, valueOf, f);
+        VoiceState voiceState3 = (VoiceState) a.e(user2, storeState.getCurrentChannelVoiceStates());
         if (channel != null) {
-            if (AnimatableValueParser.p1(channel)) {
-                str4 = AnimatableValueParser.y0(channel);
+            if (AnimatableValueParser.q1(channel)) {
+                str3 = AnimatableValueParser.y0(channel);
             } else if (guild != null) {
-                str4 = guild.getName();
+                str3 = guild.getName();
             }
-            str2 = str4;
-            UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z6, z5, manageUserContext, voiceState3);
+            str2 = str3;
+            UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z7, z6, manageUserContext, voiceState3);
             ModelUserProfile userProfile = storeState.getUserProfile();
-            UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z5, z2);
+            UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z6, z2);
             streamContext = storeState.getStreamContext();
             encodedStreamKey = (streamContext != null || (stream = streamContext.getStream()) == null) ? null : stream.getEncodedStreamKey();
             if (encodedStreamKey != null && !this.fetchedPreviews.contains(encodedStreamKey)) {
                 this.storeApplicationStreamPreviews.fetchStreamPreviewIfNotFetching(streamContext);
                 this.fetchedPreviews.add(encodedStreamKey);
             }
-            UserProfileStageActionsView.ViewState viewState4 = new UserProfileStageActionsView.ViewState(z5, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null);
-            String d = userProfile.getUser().d();
-            List<Node<MessageRenderContext>> createAndProcessBioAstFromText = d == null ? createAndProcessBioAstFromText(d) : null;
-            viewState = getViewState();
-            if (!(viewState instanceof ViewState.Loaded)) {
-                viewState = null;
-            }
-            ViewState.Loaded loaded = (ViewState.Loaded) viewState;
-            userNote = loaded == null ? loaded.getUserNote() : null;
-            userNoteFetchState = storeState.getUserNoteFetchState();
-            if (!(userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded)) {
-                userNoteFetchState = null;
-            }
-            StoreUserNotes.UserNoteState.Loaded loaded2 = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState;
-            note = (loaded2 != null || (note2 = loaded2.getNote()) == null) ? null : note2.getNote();
-            viewState2 = getViewState();
-            if (!(viewState2 instanceof ViewState.Loaded)) {
-                viewState2 = null;
-            }
-            ViewState.Loaded loaded3 = (ViewState.Loaded) viewState2;
-            z3 = !((loaded3 == null ? loaded3.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading) && !(storeState.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Loading);
-            if (userNote == null) {
-            }
-            z4 = false;
-            if (!z3 || z4) {
-                if (note != null) {
-                    str3 = note;
-                    updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText));
-                    this.mostRecentStoreState = storeState;
+            UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z6, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null);
+            z3 = !m.areEqual(userProfile, StoreUserProfile.Companion.getEMPTY_PROFILE());
+            if (z3) {
+                if (user2 instanceof MeUser) {
+                    com.discord.api.user.User user3 = userProfile.getUser();
+                    m.checkNotNullExpressionValue(user3, "userProfile.user");
+                    merge = MeUser.Companion.merge((MeUser) user2, user3);
+                } else if (user2 instanceof CoreUser) {
+                    com.discord.api.user.User user4 = userProfile.getUser();
+                    m.checkNotNullExpressionValue(user4, "userProfile.user");
+                    merge = CoreUser.Companion.merge((CoreUser) user2, user4);
                 }
-            } else if (userNote != null) {
-                str3 = userNote;
-                updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText));
+                user = merge;
+                String bio = user.getBio();
+                List<Node<MessageRenderContext>> createAndProcessBioAstFromText = bio != null ? createAndProcessBioAstFromText(bio) : null;
+                userNoteFetchState = storeState.getUserNoteFetchState();
+                if (!(userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded)) {
+                    userNoteFetchState = null;
+                }
+                StoreUserNotes.UserNoteState.Loaded loaded = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState;
+                note = (loaded != null || (note2 = loaded.getNote()) == null) ? null : note2.getNote();
+                viewState = getViewState();
+                if (!(viewState instanceof ViewState.Loaded)) {
+                    viewState = null;
+                }
+                ViewState.Loaded loaded2 = (ViewState.Loaded) viewState;
+                z4 = !((loaded2 != null ? loaded2.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading) && !(storeState.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Loading);
+                if (getViewState() instanceof ViewState.Uninitialized) {
+                    if (!(note == null || note.length() == 0)) {
+                        z5 = true;
+                    }
+                }
+                if (z4 && !z5) {
+                    note = null;
+                } else if (note == null) {
+                    note = "";
+                }
+                updateViewState(new ViewState.Loaded(user, z6, z8, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild != null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), note, isInSameVoiceChannel, createAndProcessBioAstFromText, z3));
                 this.mostRecentStoreState = storeState;
             }
-            str3 = "";
-            updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText));
+            user = user2;
+            String bio = user.getBio();
+            if (bio != null) {
+            }
+            userNoteFetchState = storeState.getUserNoteFetchState();
+            if (!(userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded)) {
+            }
+            StoreUserNotes.UserNoteState.Loaded loaded = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState;
+            if (loaded != null) {
+            }
+            viewState = getViewState();
+            if (!(viewState instanceof ViewState.Loaded)) {
+            }
+            ViewState.Loaded loaded2 = (ViewState.Loaded) viewState;
+            if (!((loaded2 != null ? loaded2.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading)) {
+            }
+            if (getViewState() instanceof ViewState.Uninitialized) {
+            }
+            if (z4) {
+            }
+            if (note == null) {
+            }
+            updateViewState(new ViewState.Loaded(user, z6, z8, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild != null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), note, isInSameVoiceChannel, createAndProcessBioAstFromText, z3));
             this.mostRecentStoreState = storeState;
         }
         str2 = str;
-        UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z6, z5, manageUserContext, voiceState3);
+        UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z7, z6, manageUserContext, voiceState3);
         ModelUserProfile userProfile = storeState.getUserProfile();
-        UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z5, z2);
+        UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z6, z2);
         streamContext = storeState.getStreamContext();
         if (streamContext != null) {
         }
         this.storeApplicationStreamPreviews.fetchStreamPreviewIfNotFetching(streamContext);
         this.fetchedPreviews.add(encodedStreamKey);
-        UserProfileStageActionsView.ViewState viewState4 = new UserProfileStageActionsView.ViewState(z5, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null);
-        String d = userProfile.getUser().d();
-        if (d == null) {
+        UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z6, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null);
+        z3 = !m.areEqual(userProfile, StoreUserProfile.Companion.getEMPTY_PROFILE());
+        if (z3) {
         }
-        viewState = getViewState();
-        if (!(viewState instanceof ViewState.Loaded)) {
-        }
-        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
-        if (loaded == null) {
+        user = user2;
+        String bio = user.getBio();
+        if (bio != null) {
         }
         userNoteFetchState = storeState.getUserNoteFetchState();
         if (!(userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded)) {
         }
-        StoreUserNotes.UserNoteState.Loaded loaded2 = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState;
-        if (loaded2 != null) {
+        StoreUserNotes.UserNoteState.Loaded loaded = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState;
+        if (loaded != null) {
         }
-        viewState2 = getViewState();
-        if (!(viewState2 instanceof ViewState.Loaded)) {
+        viewState = getViewState();
+        if (!(viewState instanceof ViewState.Loaded)) {
         }
-        ViewState.Loaded loaded3 = (ViewState.Loaded) viewState2;
-        if (!((loaded3 == null ? loaded3.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading)) {
+        ViewState.Loaded loaded2 = (ViewState.Loaded) viewState;
+        if (!((loaded2 != null ? loaded2.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading)) {
         }
-        if (userNote == null) {
+        if (getViewState() instanceof ViewState.Uninitialized) {
         }
-        z4 = false;
-        if (!z3) {
+        if (z4) {
         }
-        if (note != null) {
+        if (note == null) {
         }
-        str3 = "";
-        updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText));
+        updateViewState(new ViewState.Loaded(user, z6, z8, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild != null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), note, isInSameVoiceChannel, createAndProcessBioAstFromText, z3));
         this.mostRecentStoreState = storeState;
     }
 
@@ -1891,7 +1945,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getChannel()) != null) {
             User user = loaded.getUser();
-            this.eventSubject.j.onNext(new Event.LaunchBanUser(user.getUsername(), channel.e(), user.getId()));
+            this.eventSubject.j.onNext(new Event.LaunchBanUser(user.getUsername(), channel.f(), user.getId()));
         }
     }
 
@@ -1906,7 +1960,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
                 channel = loaded.getChannel();
             }
             if (channel != null) {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPISerializeNulls.disconnectGuildMember(channel.e(), loaded.getUser().getId(), new RestAPIParams.GuildMemberDisconnect(null, 1, null)), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$disconnectUser$2(this), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$disconnectUser$1(this), 54, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPISerializeNulls.disconnectGuildMember(channel.f(), loaded.getUser().getId(), new RestAPIParams.GuildMemberDisconnect(null, 1, null)), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$disconnectUser$2(this), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$disconnectUser$1(this), 54, (Object) null);
             }
         }
     }
@@ -1919,10 +1973,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getChannel()) != null) {
-            this.eventSubject.j.onNext(new Event.LaunchEditMember(channel.e(), this.userId));
+            this.eventSubject.j.onNext(new Event.LaunchEditMember(channel.f(), this.userId));
         }
     }
 
+    public final boolean getOpenPopoutLogged() {
+        return this.openPopoutLogged;
+    }
+
     public final void guildDeafenUser() {
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
@@ -1934,7 +1992,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             User user = loaded.getUser();
             UserProfileAdminView.ViewState adminViewState = loaded.getAdminViewState();
             if (channel != null && adminViewState != null) {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildMember(channel.e(), user.getId(), RestAPIParams.GuildMember.Companion.createWithDeaf(!adminViewState.isServerDeafened())), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$guildDeafenUser$2(this), (Function0) null, (Function0) null, WidgetUserSheetViewModel$guildDeafenUser$1.INSTANCE, 54, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildMember(channel.f(), user.getId(), RestAPIParams.GuildMember.Companion.createWithDeaf(!adminViewState.isServerDeafened())), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$guildDeafenUser$2(this), (Function0) null, (Function0) null, WidgetUserSheetViewModel$guildDeafenUser$1.INSTANCE, 54, (Object) null);
             }
         }
     }
@@ -1947,7 +2005,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getChannel()) != null) {
-            this.eventSubject.j.onNext(new Event.LaunchMoveUser(channel.e()));
+            this.eventSubject.j.onNext(new Event.LaunchMoveUser(channel.f()));
         }
     }
 
@@ -1962,7 +2020,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             UserProfileAdminView.ViewState adminViewState = loaded.getAdminViewState();
             User user = loaded.getUser();
             if (channel != null && adminViewState != null) {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildMember(channel.e(), user.getId(), RestAPIParams.GuildMember.Companion.createWithMute(!loaded.getAdminViewState().isServerMuted())), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$guildMuteUser$2(this), (Function0) null, (Function0) null, WidgetUserSheetViewModel$guildMuteUser$1.INSTANCE, 54, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildMember(channel.f(), user.getId(), RestAPIParams.GuildMember.Companion.createWithMute(!loaded.getAdminViewState().isServerMuted())), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$guildMuteUser$2(this), (Function0) null, (Function0) null, WidgetUserSheetViewModel$guildMuteUser$1.INSTANCE, 54, (Object) null);
             }
         }
     }
@@ -1972,16 +2030,17 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         StoreState storeState;
         ModelUserProfile userProfile;
         com.discord.api.user.User user;
-        String d;
+        NullSerializable<String> d;
+        String a;
         m.checkNotNullParameter(spoilerNode, "spoilerNode");
         ViewState viewState = getViewState();
         if (!(viewState instanceof ViewState.Loaded)) {
             viewState = null;
         }
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
-        if (loaded != null && (storeState = this.mostRecentStoreState) != null && (userProfile = storeState.getUserProfile()) != null && (user = userProfile.getUser()) != null && (d = user.d()) != null) {
+        if (loaded != null && (storeState = this.mostRecentStoreState) != null && (userProfile = storeState.getUserProfile()) != null && (user = userProfile.getUser()) != null && (d = user.d()) != null && (a = d.a()) != null) {
             this.revealedBioIndices.add(Integer.valueOf(spoilerNode.getId()));
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(d), 262143, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(a), false, 786431, null));
         }
     }
 
@@ -1994,7 +2053,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) {
             long id2 = loaded.getUser().getId();
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, true, 127, null), null, null, null, 0, null, null, null, false, null, 523775, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, true, 127, null), null, null, null, 0, null, null, null, false, null, false, 1048063, null));
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, false, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$inviteUserToSpeak$1(this), 62, (Object) null);
         }
     }
@@ -2008,11 +2067,11 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getChannel()) != null) {
             User user = loaded.getUser();
-            if (AnimatableValueParser.p1(channel)) {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeChannelRecipient(channel.g(), user.getId()), false, 1, null), 0, false, 1, null), this, null, 2, null), (Context) null, "REST: remove group member", (Function1) null, new WidgetUserSheetViewModel$kickUser$1(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
+            if (AnimatableValueParser.q1(channel)) {
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeChannelRecipient(channel.h(), user.getId()), false, 1, null), 0, false, 1, null), this, null, 2, null), (Context) null, "REST: remove group member", (Function1) null, new WidgetUserSheetViewModel$kickUser$1(this), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null);
                 return;
             }
-            this.eventSubject.j.onNext(new Event.LaunchKickUser(user.getUsername(), channel.e(), user.getId()));
+            this.eventSubject.j.onNext(new Event.LaunchKickUser(user.getUsername(), channel.f(), user.getId()));
         }
     }
 
@@ -2034,7 +2093,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             Channel channel = loaded.getChannel();
             User user = loaded.getUser();
             if (channel != null) {
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildMember(channel.e(), user.getId(), RestAPIParams.GuildMember.Companion.createWithChannelId(j)), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$moveUserToChannel$2(this), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$moveUserToChannel$1(this), 54, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.changeGuildMember(channel.f(), user.getId(), RestAPIParams.GuildMember.Companion.createWithChannelId(j)), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$moveUserToChannel$2(this), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$moveUserToChannel$1(this), 54, (Object) null);
             }
         }
     }
@@ -2094,6 +2153,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         }
     }
 
+    public final void setOpenPopoutLogged(boolean z2) {
+        this.openPopoutLogged = z2;
+    }
+
     public final void setUserOutputVolume(float f) {
         this.storeMediaSettings.setUserOutputVolume(this.userId, PerceptualVolumeUtils.perceptualToAmplitude$default(PerceptualVolumeUtils.INSTANCE, f, 0.0f, 2, null));
     }
@@ -2107,7 +2170,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
         ViewState.Loaded loaded = (ViewState.Loaded) viewState;
         if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) {
             long id2 = loaded.getUser().getId();
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, true, false, 191, null), null, null, null, 0, null, null, null, false, null, 523775, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, true, false, 191, null), null, null, null, 0, null, null, null, false, null, false, 1048063, null));
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, z2, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$setUserSuppressedInChannel$1(this), 62, (Object) null);
         }
     }
@@ -2133,7 +2196,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             if (loaded.isMe()) {
                 StoreMediaSettings.SelfMuteFailure selfMuteFailure = this.storeMediaSettings.toggleSelfMuted();
                 if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) {
-                    emitShowToastEvent(2131894415);
+                    emitShowToastEvent(2131894534);
                     return;
                 }
                 return;
@@ -2141,19 +2204,4 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
             this.storeMediaSettings.toggleUserMuted(this.userId);
         }
     }
-
-    public final void updateUserNote(String str) {
-        m.checkNotNullParameter(str, "noteText");
-        ViewState viewState = getViewState();
-        if (!(viewState instanceof ViewState.Loaded)) {
-            viewState = null;
-        }
-        ViewState.Loaded loaded = (ViewState.Loaded) viewState;
-        if (loaded == null) {
-            return;
-        }
-        if ((!m.areEqual(loaded.getUserNote(), str)) && !(loaded.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Loading)) {
-            updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, str, false, null, 458751, null));
-        }
-    }
 }
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java
index 3eb49ba29b..1bc9af6373 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java
@@ -96,7 +96,7 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
             MeUser meUser = this.$me;
             Channel channel = this.$channel;
             Channel channel2 = this.$selectedVoiceChannel;
-            return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, (channel2 == null || !AnimatableValueParser.u1(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, null);
+            return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, (channel2 == null || !AnimatableValueParser.v1(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, null);
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -145,17 +145,17 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
         Channel component3 = bootstrapData.component3();
         Channel component4 = bootstrapData.component4();
         if (component1 == null) {
-            return Observable.e0(5, TimeUnit.SECONDS).G(AnonymousClass1.INSTANCE);
+            return Observable.d0(5, TimeUnit.SECONDS).F(AnonymousClass1.INSTANCE);
         }
-        Observable<Map<Long, GuildMember>> jVar = (component3 == null || (observeComputed = this.$storeGuilds.observeComputed(component3.e(), n.listOf(new Long[]{Long.valueOf(component1.getId()), Long.valueOf(component2.getId())}))) == null) ? new j(h0.emptyMap()) : observeComputed;
-        Observable<Map<Long, GuildRole>> jVar2 = (component3 == null || (observeRoles = this.$storeGuilds.observeRoles(component3.e())) == null) ? new j(h0.emptyMap()) : observeRoles;
-        Observable<Map<Long, VoiceState>> jVar3 = (component4 == null || (observe2 = this.$storeVoiceStates.observe(component4.e(), component4.g())) == null) ? new j(h0.emptyMap()) : observe2;
-        Observable<Map<Long, VoiceState>> jVar4 = (component3 == null || (observe = this.$storeVoiceStates.observe(component3.e(), component3.g())) == null) ? new j(h0.emptyMap()) : observe;
+        Observable<Map<Long, GuildMember>> jVar = (component3 == null || (observeComputed = this.$storeGuilds.observeComputed(component3.f(), n.listOf(new Long[]{Long.valueOf(component1.getId()), Long.valueOf(component2.getId())}))) == null) ? new j(h0.emptyMap()) : observeComputed;
+        Observable<Map<Long, GuildRole>> jVar2 = (component3 == null || (observeRoles = this.$storeGuilds.observeRoles(component3.f())) == null) ? new j(h0.emptyMap()) : observeRoles;
+        Observable<Map<Long, VoiceState>> jVar3 = (component4 == null || (observe2 = this.$storeVoiceStates.observe(component4.f(), component4.h())) == null) ? new j(h0.emptyMap()) : observe2;
+        Observable<Map<Long, VoiceState>> jVar4 = (component3 == null || (observe = this.$storeVoiceStates.observe(component3.f(), component3.h())) == null) ? new j(h0.emptyMap()) : observe;
         Observable<ModelRichPresence> observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence);
-        if (component3 == null || (observable = this.$storeGuilds.observeGuild(component3.e())) == null) {
+        if (component3 == null || (observable = this.$storeGuilds.observeGuild(component3.f())) == null) {
             observable = new j<>(null);
         }
-        if (component3 == null || (observable2 = this.$storePermissions.observePermissionsForChannel(component3.g())) == null) {
+        if (component3 == null || (observable2 = this.$storePermissions.observePermissionsForChannel(component3.h())) == null) {
             observable2 = new j<>(null);
         }
         Observable<StreamContext> forUser = this.$streamContextService.getForUser(component1.getId(), true);
@@ -163,7 +163,7 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
             observable3 = observable7;
             meUser = component2;
             channel = component3;
-            observable4 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.g());
+            observable4 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h());
         } else {
             meUser = component2;
             channel = component3;
@@ -172,12 +172,12 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3<T, R>
         observable4 = new j<>(null);
         if (component4 != null) {
             meUser2 = meUser;
-            observable5 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.g());
+            observable5 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h());
         } else {
             meUser2 = meUser;
         }
         observable5 = new j(StageRequestToSpeakState.NONE);
-        if (component4 == null || (observable6 = this.$storeStageChannels.observeMyRoles(component4.g())) == null) {
+        if (component4 == null || (observable6 = this.$storeStageChannels.observeMyRoles(component4.h())) == null) {
             observable6 = new j<>(null);
         }
         m.checkNotNullExpressionValue(jVar, "computedMembersObservable");
diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java
index 5c55f2c994..e9d49b5032 100644
--- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java
+++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState.java
@@ -36,14 +36,14 @@ public final class WidgetUserSheetViewModelStoreState {
         private final Channel channel;
 
         /* renamed from: me  reason: collision with root package name */
-        private final MeUser f2155me;
+        private final MeUser f2161me;
         private final Channel selectedVoiceChannel;
         private final User user;
 
         public BootstrapData(User user, MeUser meUser, Channel channel, Channel channel2) {
             m.checkNotNullParameter(meUser, "me");
             this.user = user;
-            this.f2155me = meUser;
+            this.f2161me = meUser;
             this.channel = channel;
             this.selectedVoiceChannel = channel2;
         }
@@ -53,7 +53,7 @@ public final class WidgetUserSheetViewModelStoreState {
                 user = bootstrapData.user;
             }
             if ((i & 2) != 0) {
-                meUser = bootstrapData.f2155me;
+                meUser = bootstrapData.f2161me;
             }
             if ((i & 4) != 0) {
                 channel = bootstrapData.channel;
@@ -69,7 +69,7 @@ public final class WidgetUserSheetViewModelStoreState {
         }
 
         public final MeUser component2() {
-            return this.f2155me;
+            return this.f2161me;
         }
 
         public final Channel component3() {
@@ -93,7 +93,7 @@ public final class WidgetUserSheetViewModelStoreState {
                 return false;
             }
             BootstrapData bootstrapData = (BootstrapData) obj;
-            return m.areEqual(this.user, bootstrapData.user) && m.areEqual(this.f2155me, bootstrapData.f2155me) && m.areEqual(this.channel, bootstrapData.channel) && m.areEqual(this.selectedVoiceChannel, bootstrapData.selectedVoiceChannel);
+            return m.areEqual(this.user, bootstrapData.user) && m.areEqual(this.f2161me, bootstrapData.f2161me) && m.areEqual(this.channel, bootstrapData.channel) && m.areEqual(this.selectedVoiceChannel, bootstrapData.selectedVoiceChannel);
         }
 
         public final Channel getChannel() {
@@ -101,7 +101,7 @@ public final class WidgetUserSheetViewModelStoreState {
         }
 
         public final MeUser getMe() {
-            return this.f2155me;
+            return this.f2161me;
         }
 
         public final Channel getSelectedVoiceChannel() {
@@ -116,7 +116,7 @@ public final class WidgetUserSheetViewModelStoreState {
             User user = this.user;
             int i = 0;
             int hashCode = (user != null ? user.hashCode() : 0) * 31;
-            MeUser meUser = this.f2155me;
+            MeUser meUser = this.f2161me;
             int hashCode2 = (hashCode + (meUser != null ? meUser.hashCode() : 0)) * 31;
             Channel channel = this.channel;
             int hashCode3 = (hashCode2 + (channel != null ? channel.hashCode() : 0)) * 31;
@@ -131,7 +131,7 @@ public final class WidgetUserSheetViewModelStoreState {
             StringBuilder L = a.L("BootstrapData(user=");
             L.append(this.user);
             L.append(", me=");
-            L.append(this.f2155me);
+            L.append(this.f2161me);
             L.append(", channel=");
             L.append(this.channel);
             L.append(", selectedVoiceChannel=");
@@ -198,8 +198,8 @@ public final class WidgetUserSheetViewModelStoreState {
         if (widgetUserSheetViewModelStoreState$observeStoreState$2 != null) {
             widgetUserSheetViewModelStoreState$observeStoreState$2 = new WidgetUserSheetViewModelStoreState$sam$rx_functions_Func4$0(widgetUserSheetViewModelStoreState$observeStoreState$2);
         }
-        Observable<WidgetUserSheetViewModel.StoreState> s2 = Observable.i0(new r(Observable.h(observeUser, observeMe$default, observable, observeSelectedChannel, (Func4) widgetUserSheetViewModelStoreState$observeStoreState$2).Z(new WidgetUserSheetViewModelStoreState$observeStoreState$3(storeGuilds, storeVoiceStates, storeUserPresence, storePermissions, streamContextService, storeStageChannels, storeMediaSettings, storeUserProfile, storeUserRelationships, storeUserNotes)).i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS, scheduler))).s();
-        m.checkNotNullExpressionValue(s2, "Observable\n          .co…  .distinctUntilChanged()");
-        return s2;
+        Observable<WidgetUserSheetViewModel.StoreState> r = Observable.h0(new r(Observable.h(observeUser, observeMe$default, observable, observeSelectedChannel, (Func4) widgetUserSheetViewModelStoreState$observeStoreState$2).Y(new WidgetUserSheetViewModelStoreState$observeStoreState$3(storeGuilds, storeVoiceStates, storeUserPresence, storePermissions, streamContextService, storeStageChannels, storeMediaSettings, storeUserProfile, storeUserRelationships, storeUserNotes)).i, new LeadingEdgeThrottle(250, TimeUnit.MILLISECONDS, scheduler))).r();
+        m.checkNotNullExpressionValue(r, "Observable\n          .co…  .distinctUntilChanged()");
+        return r;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
index 31e961790a..c3c126cd56 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java
@@ -46,7 +46,7 @@ public final class PrivateCallLaunchUtilsKt$callAndLaunch$1 extends o implements
         public static final AnonymousClass2 INSTANCE = new AnonymousClass2();
 
         public final Long call(Channel channel) {
-            return Long.valueOf(channel != null ? channel.g() : -1);
+            return Long.valueOf(channel != null ? channel.h() : -1);
         }
     }
 
@@ -177,7 +177,7 @@ public final class PrivateCallLaunchUtilsKt$callAndLaunch$1 extends o implements
             if (str != null) {
                 this.$doCall$6.mo1invoke();
             } else {
-                c.a.d.o.g(this.this$0.$context, 2131891426, 0, null, 12);
+                c.a.d.o.g(this.this$0.$context, 2131891497, 0, null, 12);
             }
         }
     }
@@ -197,9 +197,9 @@ public final class PrivateCallLaunchUtilsKt$callAndLaunch$1 extends o implements
     /* renamed from: invoke */
     public final void mo1invoke() {
         StoreStream.Companion companion = StoreStream.Companion;
-        Observable a02 = Observable.j(companion.getRtcConnection().getConnectionState().y(AnonymousClass1.INSTANCE), companion.getVoiceChannelSelected().observeSelectedChannel().G(AnonymousClass2.INSTANCE), AnonymousClass3.INSTANCE).k(q.c(new AnonymousClass4(this), -1L, 250, TimeUnit.MILLISECONDS)).a0(1);
-        m.checkNotNullExpressionValue(a02, "Observable\n        .comb…       )\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), WidgetCallFullscreen.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass5(this), 62, (Object) null);
+        Observable Z = Observable.j(companion.getRtcConnection().getConnectionState().x(AnonymousClass1.INSTANCE), companion.getVoiceChannelSelected().observeSelectedChannel().F(AnonymousClass2.INSTANCE), AnonymousClass3.INSTANCE).k(q.c(new AnonymousClass4(this), -1L, 250, TimeUnit.MILLISECONDS)).Z(1);
+        m.checkNotNullExpressionValue(Z, "Observable\n        .comb…       )\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(Z), WidgetCallFullscreen.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass5(this), 62, (Object) null);
         AnonymousClass6 r1 = new AnonymousClass6(this);
         if (this.$isVideo) {
             companion.getMediaEngine().selectDefaultVideoDevice(new AnonymousClass7(this, r1));
diff --git a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.java b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.java
index 5ab4c4b678..0014840276 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt.java
@@ -18,7 +18,7 @@ public final class PrivateCallLaunchUtilsKt {
         if (z2) {
             appPermissionsRequests.requestVideoCallPermissions(new PrivateCallLaunchUtilsKt$callAndLaunch$2(privateCallLaunchUtilsKt$callAndLaunch$1));
         } else {
-            AnimatableValueParser.o2(appPermissionsRequests, null, new PrivateCallLaunchUtilsKt$callAndLaunch$3(privateCallLaunchUtilsKt$callAndLaunch$1), 1, null);
+            AnimatableValueParser.q2(appPermissionsRequests, null, new PrivateCallLaunchUtilsKt$callAndLaunch$3(privateCallLaunchUtilsKt$callAndLaunch$1), 1, null);
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
index f346fb430d..69519d296d 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java
@@ -22,6 +22,6 @@ public final class WidgetCallFailed$sendFriendRequest$1 extends o implements Fun
     }
 
     public final void invoke(Void r4) {
-        c.a.d.o.i(this.this$0, 2131888809, 0, 4);
+        c.a.d.o.i(this.this$0, 2131888810, 0, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
index 252171a4e7..7d9193ce47 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java
@@ -65,8 +65,8 @@ public final class WidgetCallFailed extends AppDialog {
         if (user != null) {
             TextView textView = getBinding().e;
             m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationText");
-            b.n(textView, 2131887133, new Object[]{user.getUsername()}, null, 4);
-            MaterialButton materialButton = getBinding().f1649c;
+            b.m(textView, 2131887133, new Object[]{user.getUsername()}, null, 4);
+            MaterialButton materialButton = getBinding().f1646c;
             m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm");
             setOnClickAndDismissListener(materialButton, new WidgetCallFailed$configureUI$$inlined$let$lambda$1(this, user));
             return;
@@ -88,13 +88,13 @@ public final class WidgetCallFailed extends AppDialog {
         super.onViewBound(view);
         TextView textView = getBinding().d;
         m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader");
-        textView.setText(getString(2131893452));
-        MaterialButton materialButton = getBinding().f1649c;
+        textView.setText(getString(2131893535));
+        MaterialButton materialButton = getBinding().f1646c;
         m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm");
         materialButton.setText(getString(2131886252));
         MaterialButton materialButton2 = getBinding().b;
         m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationCancel");
-        materialButton2.setText(getString(2131891666));
+        materialButton2.setText(getString(2131891735));
         getBinding().b.setOnClickListener(new WidgetCallFailed$onViewBound$1(this));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java
index 3737843bce..1f5f9f7915 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.java
@@ -43,7 +43,7 @@ public final class WidgetVoiceCallIncoming$Model$Companion$get$1<T, R> implement
 
             public final boolean invoke(StoreVoiceParticipants.VoiceUser voiceUser) {
                 m.checkNotNullParameter(voiceUser, "participant");
-                if (AnimatableValueParser.p1(this.$callModel.getChannel())) {
+                if (AnimatableValueParser.q1(this.$callModel.getChannel())) {
                     if (voiceUser.isConnected() || voiceUser.isRinging()) {
                         return true;
                     }
@@ -87,6 +87,6 @@ public final class WidgetVoiceCallIncoming$Model$Companion$get$1<T, R> implement
         }
         CallModel.Companion companion = CallModel.Companion;
         m.checkNotNullExpressionValue(set, "incomingCalls");
-        return companion.get(((Number) u.first(set)).longValue()).G(new AnonymousClass1(set));
+        return companion.get(((Number) u.first(set)).longValue()).F(new AnonymousClass1(set));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java
index 4bf77ae5d6..e26a642395 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java
@@ -22,35 +22,35 @@ public final /* synthetic */ class WidgetVoiceCallIncoming$binding$2 extends k i
 
     public final WidgetVoiceCallIncomingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363556;
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363556);
+        int i = 2131363597;
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363597);
         if (linearLayout != null) {
-            i = 2131363557;
-            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363557);
+            i = 2131363598;
+            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363598);
             if (floatingActionButton != null) {
-                i = 2131363558;
-                FloatingActionButton floatingActionButton2 = (FloatingActionButton) view.findViewById(2131363558);
+                i = 2131363599;
+                FloatingActionButton floatingActionButton2 = (FloatingActionButton) view.findViewById(2131363599);
                 if (floatingActionButton2 != null) {
-                    i = 2131363559;
-                    PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) view.findViewById(2131363559);
+                    i = 2131363600;
+                    PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) view.findViewById(2131363600);
                     if (privateCallBlurredGridView != null) {
-                        i = 2131363560;
-                        FloatingActionButton floatingActionButton3 = (FloatingActionButton) view.findViewById(2131363560);
+                        i = 2131363601;
+                        FloatingActionButton floatingActionButton3 = (FloatingActionButton) view.findViewById(2131363601);
                         if (floatingActionButton3 != null) {
-                            i = 2131363561;
-                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363561);
+                            i = 2131363602;
+                            LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363602);
                             if (linearLayout2 != null) {
-                                i = 2131363562;
-                                TextView textView = (TextView) view.findViewById(2131363562);
+                                i = 2131363603;
+                                TextView textView = (TextView) view.findViewById(2131363603);
                                 if (textView != null) {
-                                    i = 2131363563;
-                                    TextView textView2 = (TextView) view.findViewById(2131363563);
+                                    i = 2131363604;
+                                    TextView textView2 = (TextView) view.findViewById(2131363604);
                                     if (textView2 != null) {
-                                        i = 2131363564;
-                                        Guideline guideline = (Guideline) view.findViewById(2131363564);
+                                        i = 2131363605;
+                                        Guideline guideline = (Guideline) view.findViewById(2131363605);
                                         if (guideline != null) {
-                                            i = 2131363565;
-                                            PrivateCallGridView privateCallGridView = (PrivateCallGridView) view.findViewById(2131363565);
+                                            i = 2131363606;
+                                            PrivateCallGridView privateCallGridView = (PrivateCallGridView) view.findViewById(2131363606);
                                             if (privateCallGridView != null) {
                                                 return new WidgetVoiceCallIncomingBinding((ConstraintLayout) view, linearLayout, floatingActionButton, floatingActionButton2, privateCallBlurredGridView, floatingActionButton3, linearLayout2, textView, textView2, guideline, privateCallGridView);
                                             }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
index 971e1e20ef..c5d7c2443a 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java
@@ -65,11 +65,11 @@ public class WidgetVoiceCallIncoming extends AppFragment {
             }
 
             public final Observable<Model> get() {
-                Observable<R> Z = StoreStream.Companion.getCallsIncoming().observeIncoming().Z(WidgetVoiceCallIncoming$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(Z, "StoreStream\n            …          }\n            }");
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(Z).s();
-                m.checkNotNullExpressionValue(s2, "StoreStream\n            …  .distinctUntilChanged()");
-                return s2;
+                Observable<R> Y = StoreStream.Companion.getCallsIncoming().observeIncoming().Y(WidgetVoiceCallIncoming$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(Y, "StoreStream\n            …          }\n            }");
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(Y).r();
+                m.checkNotNullExpressionValue(r, "StoreStream\n            …  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -130,7 +130,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         }
 
         public final long getChannelId() {
-            return this.callModel.getChannel().g();
+            return this.callModel.getChannel().h();
         }
 
         public final int getNumIncomingCalls() {
@@ -211,14 +211,14 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         public void onViewCreated(View view, Bundle bundle) {
             m.checkNotNullParameter(view, "view");
             super.onViewCreated(view, bundle);
-            Observable<Long> e02 = Observable.e0(15, TimeUnit.SECONDS);
-            m.checkNotNullExpressionValue(e02, "Observable.timer(15, TimeUnit.SECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), SystemCallIncoming.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1(this), 62, (Object) null);
+            Observable<Long> d02 = Observable.d0(15, TimeUnit.SECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable.timer(15, TimeUnit.SECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), SystemCallIncoming.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1(this), 62, (Object) null);
         }
     }
 
     public WidgetVoiceCallIncoming() {
-        super(2131559278);
+        super(2131559287);
     }
 
     private final WidgetVoiceCallIncomingBinding getBinding() {
@@ -239,7 +239,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         AppSoundManager.Provider.INSTANCE.get().play(AppSound.Companion.getSOUND_CALL_RINGING());
         TextView textView = getBinding().g;
         m.checkNotNullExpressionValue(textView, "binding.incomingCallStatusPrimary");
-        if (AnimatableValueParser.p1(component1.getChannel())) {
+        if (AnimatableValueParser.q1(component1.getChannel())) {
             str = AnimatableValueParser.y0(component1.getChannel());
         } else {
             StoreVoiceParticipants.VoiceUser dmRecipient = component1.getDmRecipient();
@@ -248,7 +248,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
             }
         }
         textView.setText(str);
-        getBinding().h.setText(component1.isVideoCall() ? 2131890339 : 2131890333);
+        getBinding().h.setText(component1.isVideoCall() ? 2131890405 : 2131890399);
         getBinding().i.configure(component2);
         getBinding().e.configure(component2);
         LinearLayout linearLayout = getBinding().b;
@@ -258,7 +258,7 @@ public class WidgetVoiceCallIncoming extends AppFragment {
         }
         linearLayout.setVisibility(i);
         getBinding().d.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$2(this, model));
-        getBinding().f2000c.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$3(this, model));
+        getBinding().f2005c.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$3(this, model));
         getBinding().f.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$4(this, model));
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java
index 45607e84a9..27dce34d6f 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java
@@ -18,10 +18,10 @@ public final /* synthetic */ class WidgetVoiceCallInline$binding$2 extends k imp
     public final WidgetVoiceCallInlineBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
         LinearLayout linearLayout = (LinearLayout) view;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365537);
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131365598);
         if (materialButton != null) {
             return new WidgetVoiceCallInlineBinding((LinearLayout) view, linearLayout, materialButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365537)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365598)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
index c31011ba78..6aa22088f2 100644
--- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
+++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java
@@ -47,9 +47,9 @@ public final class WidgetVoiceCallInline extends AppFragment {
             }
 
             public final Observable<Model> get() {
-                Observable<R> G = VoiceConnected.Companion.get().G(WidgetVoiceCallInline$Model$Companion$get$1.INSTANCE);
-                m.checkNotNullExpressionValue(G, "VoiceConnected\n         …eConnected)\n            }");
-                return G;
+                Observable<R> F = VoiceConnected.Companion.get().F(WidgetVoiceCallInline$Model$Companion$get$1.INSTANCE);
+                m.checkNotNullExpressionValue(F, "VoiceConnected\n         …eConnected)\n            }");
+                return F;
             }
         }
 
@@ -70,9 +70,9 @@ public final class WidgetVoiceCallInline extends AppFragment {
                 }
 
                 public final Observable<VoiceConnected> get() {
-                    Observable<R> Z = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().Z(WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.INSTANCE);
-                    m.checkNotNullExpressionValue(Z, "StoreStream\n            …        }\n              }");
-                    return ObservableExtensionsKt.computationLatest(Z);
+                    Observable<R> Y = StoreStream.Companion.getVoiceChannelSelected().observeSelectedChannel().Y(WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.INSTANCE);
+                    m.checkNotNullExpressionValue(Y, "StoreStream\n            …        }\n              }");
+                    return ObservableExtensionsKt.computationLatest(Y);
                 }
             }
 
@@ -210,7 +210,7 @@ public final class WidgetVoiceCallInline extends AppFragment {
     }
 
     public WidgetVoiceCallInline() {
-        super(2131559279);
+        super(2131559288);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetVoiceCallInline widgetVoiceCallInline, Model model) {
@@ -239,7 +239,7 @@ public final class WidgetVoiceCallInline extends AppFragment {
 
     private final void onViewBindingDestroy(WidgetVoiceCallInlineBinding widgetVoiceCallInlineBinding) {
         b a = b.C0032b.a();
-        MaterialButton materialButton = widgetVoiceCallInlineBinding.f2001c;
+        MaterialButton materialButton = widgetVoiceCallInlineBinding.f2006c;
         m.checkNotNullExpressionValue(materialButton, "binding.voiceConnectedPtt");
         a.i.remove(Integer.valueOf(materialButton.getId()));
         a.a();
@@ -253,9 +253,9 @@ public final class WidgetVoiceCallInline extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        getBinding().f2001c.setOnClickListener(WidgetVoiceCallInline$onViewBound$1.INSTANCE);
-        getBinding().f2001c.setOnTouchListener(new OnPressListener(WidgetVoiceCallInline$onViewBound$2.INSTANCE));
-        getBinding().f2001c.addOnLayoutChangeListener(b.C0032b.a());
+        getBinding().f2006c.setOnClickListener(WidgetVoiceCallInline$onViewBound$1.INSTANCE);
+        getBinding().f2006c.setOnTouchListener(new OnPressListener(WidgetVoiceCallInline$onViewBound$2.INSTANCE));
+        getBinding().f2006c.addOnLayoutChangeListener(b.C0032b.a());
         setWindowInsetsListeners();
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
index 1b168d3d39..0b1597271c 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java
@@ -11,13 +11,13 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import androidx.fragment.app.FragmentManager;
 import c.a.j.a;
-import c.a.w.c;
 import com.discord.app.AppComponent;
 import com.discord.app.AppLog;
 import com.discord.databinding.AnchoredVoiceControlsViewBinding;
 import com.discord.floating_view_manager.FloatingViewGravity;
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import com.discord.stores.StoreAudioDevices;
+import com.discord.tooltips.SparkleView;
 import com.discord.tooltips.TooltipManager;
 import com.discord.utilities.color.ColorCompat;
 import com.discord.utilities.press.OnPressListener;
@@ -63,26 +63,26 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
         m.checkNotNullParameter(context, "context");
         View inflate = LayoutInflater.from(context).inflate(2131558432, (ViewGroup) this, false);
         addView(inflate);
-        int i2 = 2131365539;
-        ImageView imageView = (ImageView) inflate.findViewById(2131365539);
+        int i2 = 2131365600;
+        ImageView imageView = (ImageView) inflate.findViewById(2131365600);
         if (imageView != null) {
-            i2 = 2131365540;
-            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365540);
+            i2 = 2131365601;
+            LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365601);
             if (linearLayout != null) {
-                i2 = 2131365541;
-                ImageView imageView2 = (ImageView) inflate.findViewById(2131365541);
+                i2 = 2131365602;
+                ImageView imageView2 = (ImageView) inflate.findViewById(2131365602);
                 if (imageView2 != null) {
-                    i2 = 2131365542;
-                    ImageView imageView3 = (ImageView) inflate.findViewById(2131365542);
+                    i2 = 2131365603;
+                    ImageView imageView3 = (ImageView) inflate.findViewById(2131365603);
                     if (imageView3 != null) {
-                        i2 = 2131365543;
-                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365543);
+                        i2 = 2131365604;
+                        MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365604);
                         if (materialButton != null) {
-                            i2 = 2131365544;
-                            ImageView imageView4 = (ImageView) inflate.findViewById(2131365544);
+                            i2 = 2131365605;
+                            ImageView imageView4 = (ImageView) inflate.findViewById(2131365605);
                             if (imageView4 != null) {
-                                i2 = 2131365545;
-                                ImageView imageView5 = (ImageView) inflate.findViewById(2131365545);
+                                i2 = 2131365606;
+                                ImageView imageView5 = (ImageView) inflate.findViewById(2131365606);
                                 if (imageView5 != null) {
                                     AnchoredVoiceControlsViewBinding anchoredVoiceControlsViewBinding = new AnchoredVoiceControlsViewBinding((LinearLayout) inflate, imageView, linearLayout, imageView2, imageView3, materialButton, imageView4, imageView5);
                                     m.checkNotNullExpressionValue(anchoredVoiceControlsViewBinding, "AnchoredVoiceControlsVie…rom(context), this, true)");
@@ -101,7 +101,7 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
                                     WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
                                     tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
                                     if (tooltipManager == null) {
-                                        tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+                                        tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
                                         TooltipManager.a.a = new WeakReference<>(tooltipManager);
                                     }
                                     this.tooltipManager = tooltipManager;
@@ -136,15 +136,15 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
                 m.checkNotNullExpressionValue(imageView, "binding.voiceFullscreenControlsScreenshare");
                 Context context = imageView.getContext();
                 m.checkNotNullExpressionValue(context, "binding.voiceFullscreenControlsScreenshare.context");
-                c cVar = new c(context, null, 2);
-                cVar.setOnClickListener(new AnchoredVoiceControlsView$configureScreenShareButtonSparkle$1(this, fragmentManager, j, z3, featureContext, function0, function02));
+                SparkleView sparkleView = new SparkleView(context, null);
+                sparkleView.setOnClickListener(new AnchoredVoiceControlsView$configureScreenShareButtonSparkle$1(this, fragmentManager, j, z3, featureContext, function0, function02));
                 TooltipManager tooltipManager2 = this.tooltipManager;
                 ImageView imageView2 = this.binding.f;
                 m.checkNotNullExpressionValue(imageView2, "binding.voiceFullscreenControlsScreenshare");
                 FloatingViewGravity floatingViewGravity = FloatingViewGravity.CENTER;
-                Observable<Void> G = appComponent.getUnsubscribeSignal().G(AnchoredVoiceControlsView$configureScreenShareButtonSparkle$2.INSTANCE);
-                m.checkNotNullExpressionValue(G, "appComponent.unsubscribeSignal.map { Unit }");
-                TooltipManager.e(tooltipManager2, imageView2, cVar, screenShareButtonSparkleTooltip, floatingViewGravity, 0, 0, false, G, 48, null);
+                Observable<Void> F = appComponent.getUnsubscribeSignal().F(AnchoredVoiceControlsView$configureScreenShareButtonSparkle$2.INSTANCE);
+                m.checkNotNullExpressionValue(F, "appComponent.unsubscribeSignal.map { Unit }");
+                TooltipManager.e(tooltipManager2, imageView2, sparkleView, screenShareButtonSparkleTooltip, floatingViewGravity, 0, 0, false, F, 48, null);
                 return;
             }
         }
@@ -194,9 +194,9 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
             imageView5.setContentDescription(getContext().getString(2131887144));
         }
         if (audioDevicesState.getSelectedOutputDevice() instanceof StoreAudioDevices.OutputDevice.BluetoothAudio) {
-            this.binding.g.setImageResource(2131231402);
+            this.binding.g.setImageResource(2131231408);
         } else {
-            this.binding.g.setImageResource(2131231403);
+            this.binding.g.setImageResource(2131231409);
         }
         if ((audioDevicesState.getSelectedOutputDevice() instanceof StoreAudioDevices.OutputDevice.Earpiece) || (audioDevicesState.getSelectedOutputDevice() instanceof StoreAudioDevices.OutputDevice.WiredAudio)) {
             ImageView imageView6 = this.binding.g;
@@ -222,24 +222,24 @@ public final class AnchoredVoiceControlsView extends FrameLayout {
         imageView11.setActivated(z2);
         ImageView imageView12 = this.binding.d;
         m.checkNotNullExpressionValue(imageView12, "binding.voiceFullscreenControlsMuteState");
-        imageView12.setContentDescription(getContext().getString(z2 ? 2131894063 : 2131891294));
+        imageView12.setContentDescription(getContext().getString(z2 ? 2131894164 : 2131891365));
         this.binding.d.setOnClickListener(new AnchoredVoiceControlsView$configureUI$3(function0));
         ImageView imageView13 = this.binding.f;
         m.checkNotNullExpressionValue(imageView13, "binding.voiceFullscreenControlsScreenshare");
         imageView13.setActivated(z3);
-        this.binding.f.setImageResource(z3 ? 2131231758 : 2131231757);
+        this.binding.f.setImageResource(z3 ? 2131231766 : 2131231765);
         ImageView imageView14 = this.binding.f;
         m.checkNotNullExpressionValue(imageView14, "binding.voiceFullscreenControlsScreenshare");
         Context context = getContext();
         if (context != null) {
-            str = context.getString(z3 ? 2131893590 : 2131893037);
+            str = context.getString(z3 ? 2131893687 : 2131893120);
         } else {
             str = null;
         }
         imageView14.setContentDescription(str);
         this.binding.f.setOnClickListener(new AnchoredVoiceControlsView$configureUI$4(function02));
         configureScreenShareButtonSparkle(z4, appComponent, fragmentManager, j, z5, featureContext, function06, function02);
-        this.binding.f1600c.setOnClickListener(new AnchoredVoiceControlsView$configureUI$5(function05));
+        this.binding.f1596c.setOnClickListener(new AnchoredVoiceControlsView$configureUI$5(function05));
     }
 
     public final void hidePtt() {
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java
index 2112db8d51..61e7619384 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java
@@ -3,11 +3,11 @@ package com.discord.widgets.voice.controls;
 import androidx.annotation.DrawableRes;
 /* compiled from: VoiceControlsOutputSelectorState.kt */
 public enum VoiceControlsOutputSelectorState {
-    SPEAKER_ON(2131231935, true, false),
-    SPEAKER_OFF(2131231937, false, false),
-    BLUETOOTH_ON_AND_MORE(2131231936, true, true),
-    SPEAKER_ON_AND_MORE(2131231935, true, true),
-    SPEAKER_OFF_AND_MORE(2131231937, false, true);
+    SPEAKER_ON(2131231943, true, false),
+    SPEAKER_OFF(2131231945, false, false),
+    BLUETOOTH_ON_AND_MORE(2131231944, true, true),
+    SPEAKER_ON_AND_MORE(2131231943, true, true),
+    SPEAKER_OFF_AND_MORE(2131231945, false, true);
     
     private final int audioOutputIconRes;
     private final boolean isButtonActive;
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java
index 6c138191d7..5837ef5593 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java
@@ -150,13 +150,13 @@ public final class VoiceControlsSheetView extends LinearLayout {
             ImageView imageView2 = this.binding.k;
             m.checkNotNullExpressionValue(imageView2, "binding.muteButton");
             imageView2.setBackgroundTintList(ColorStateList.valueOf(defaultButtonBackgroundTint));
-            this.binding.k.setImageResource(isMeMutedByAnySource ? 2131231743 : 2131231754);
+            this.binding.k.setImageResource(isMeMutedByAnySource ? 2131231751 : 2131231762);
             this.binding.k.setOnClickListener(new VoiceControlsSheetView$configureMuteButton$1(function0));
             ImageView imageView3 = this.binding.k;
             m.checkNotNullExpressionValue(imageView3, "binding.muteButton");
             Context context2 = getContext();
             m.checkNotNullExpressionValue(context2, "context");
-            imageView3.setContentDescription(b.g(context2, isMeMutedByAnySource ? 2131894063 : 2131891294, new Object[0], null, 4));
+            imageView3.setContentDescription(b.g(context2, isMeMutedByAnySource ? 2131894164 : 2131891365, new Object[0], null, 4));
             return;
         }
         ImageView imageView4 = this.binding.k;
@@ -165,7 +165,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
     }
 
     private final void configureOutputSelectors(VoiceControlsOutputSelectorState voiceControlsOutputSelectorState, Function0<Unit> function0, boolean z2) {
-        FrameLayout frameLayout = this.binding.f1665c;
+        FrameLayout frameLayout = this.binding.f1662c;
         m.checkNotNullExpressionValue(frameLayout, "binding.audioOutputContainer");
         int i = 0;
         frameLayout.setVisibility(z2 ? 0 : 8);
@@ -217,13 +217,13 @@ public final class VoiceControlsSheetView extends LinearLayout {
         numericBadgingView2.setBadgeNumber(i);
         ImageView imageView = this.binding.o;
         if (StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) {
-            imageView.setContentDescription(imageView.getResources().getString(2131892624));
+            imageView.setContentDescription(imageView.getResources().getString(2131892705));
             ViewExtensions.setEnabledAndAlpha$default(imageView, true, 0.0f, 2, null);
-            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231955));
+            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231963));
         } else {
             imageView.setContentDescription(imageView.getResources().getString(!callModel.canRequestToSpeak() ? 2131886740 : callModel.isMyHandRaised() ? 2131886737 : 2131886738));
             ViewExtensions.setEnabledAndAlpha(imageView, !z2 && callModel.canRequestToSpeak(), 0.2f);
-            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231952));
+            imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231960));
         }
         if (callModel.isMyHandRaised() && !StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) {
             z3 = true;
@@ -241,14 +241,14 @@ public final class VoiceControlsSheetView extends LinearLayout {
 
     private final void configureScreenshareButtons(CallModel callModel, Function0<Unit> function0, boolean z2) {
         boolean z3 = true;
-        boolean z4 = !AnimatableValueParser.u1(callModel.getChannel());
+        boolean z4 = !AnimatableValueParser.v1(callModel.getChannel());
         boolean isStreaming = callModel.isStreaming();
-        int i = isStreaming ? 2131893590 : 2131891236;
+        int i = isStreaming ? 2131893687 : 2131891307;
         ImageView imageView = this.binding.p;
         m.checkNotNullExpressionValue(imageView, "binding.screenShareButton");
         int i2 = 0;
         imageView.setVisibility(z4 && z2 ? 0 : 8);
-        int i3 = isStreaming ? 2131231758 : 2131231757;
+        int i3 = isStreaming ? 2131231766 : 2131231765;
         int i4 = isStreaming ? -16777216 : -1;
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
@@ -363,12 +363,12 @@ public final class VoiceControlsSheetView extends LinearLayout {
         imageView.setVisibility(z6 ? 0 : 8);
         this.binding.t.setOnClickListener(new VoiceControlsSheetView$configureUI$1(function0));
         if (stageRoles == null || StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) {
-            MaterialTextView materialTextView = this.binding.f1666s;
+            MaterialTextView materialTextView = this.binding.f1663s;
             m.checkNotNullExpressionValue(materialTextView, "binding.stageDisconnectButtonLarge");
             i2 = 8;
             materialTextView.setVisibility(8);
             ImageView imageView2 = this.binding.g;
-            imageView2.setImageResource(stageRoles == null ? 2131231449 : 2131231949);
+            imageView2.setImageResource(stageRoles == null ? 2131231455 : 2131231957);
             imageView2.setVisibility(z7 ? 0 : 8);
             imageView2.setOnClickListener(new VoiceControlsSheetView$configureUI$$inlined$apply$lambda$2(stageRoles, z7, function02));
             m.checkNotNullExpressionValue(imageView2, "binding.disconnectButton…sconnectClick() }\n      }");
@@ -376,7 +376,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
             ImageView imageView3 = this.binding.g;
             m.checkNotNullExpressionValue(imageView3, "binding.disconnectButton");
             imageView3.setVisibility(8);
-            MaterialTextView materialTextView2 = this.binding.f1666s;
+            MaterialTextView materialTextView2 = this.binding.f1663s;
             materialTextView2.setVisibility(z7 ? 0 : 8);
             materialTextView2.setOnClickListener(new VoiceControlsSheetView$configureUI$$inlined$apply$lambda$1(z7, function02));
             m.checkNotNullExpressionValue(materialTextView2, "binding.stageDisconnectB…Click()\n        }\n      }");
@@ -390,7 +390,7 @@ public final class VoiceControlsSheetView extends LinearLayout {
         button.setVisibility(i2);
         TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.deafenSecondaryButton");
-        b.n(textView, z4 ? 2131894055 : 2131888041, new Object[0], null, 4);
+        b.m(textView, z4 ? 2131894156 : 2131888040, new Object[0], null, 4);
         this.binding.f.setOnClickListener(new VoiceControlsSheetView$configureUI$4(function08));
         TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.deafenSecondaryButton");
@@ -398,11 +398,11 @@ public final class VoiceControlsSheetView extends LinearLayout {
         m60configureMoveToAudienceButtonyox5PQY(stageRoles, function010);
         m62configureRaiseHandButtonfw_bWyM(callModel, stageRoles, i, z9, function09);
         m61configureMuteButtonP2fzehM(callModel, stageRoles, function05);
-        configureOutputSelectors(voiceControlsOutputSelectorState, function03, !z5 && !AnimatableValueParser.u1(callModel.getChannel()));
+        configureOutputSelectors(voiceControlsOutputSelectorState, function03, !z5 && !AnimatableValueParser.v1(callModel.getChannel()));
         configureVideoButton(callModel, function04, z2);
         configureScreenshareButtons(callModel, function07, z5);
         configureStreamVolume(z8, f, function2);
-        configureInviteButtons(callModel, function06, AnimatableValueParser.u1(callModel.getChannel()));
+        configureInviteButtons(callModel, function06, AnimatableValueParser.v1(callModel.getChannel()));
     }
 
     public final int getPeekHeight() {
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java
index ba6c22f51c..84b32b2579 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetScreenShareNfxSheet$binding$2 extends k
 
     public final WidgetScreenShareNfxSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364518;
-        TextView textView = (TextView) view.findViewById(2131364518);
+        int i = 2131364557;
+        TextView textView = (TextView) view.findViewById(2131364557);
         if (textView != null) {
-            i = 2131364519;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364519);
+            i = 2131364558;
+            MaterialButton materialButton = (MaterialButton) view.findViewById(2131364558);
             if (materialButton != null) {
                 return new WidgetScreenShareNfxSheetBinding((NestedScrollView) view, textView, materialButton);
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
index ebb4aee2bb..1d0d2e03b5 100644
--- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java
@@ -172,7 +172,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559118;
+        return 2131559124;
     }
 
     @Override // androidx.fragment.app.Fragment
@@ -192,7 +192,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet {
     public void onViewCreated(View view, Bundle bundle) {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
-        getBinding().f1852c.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$1(this));
+        getBinding().f1854c.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$1(this));
         getBinding().b.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$2(this));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java
index 3dedf60856..342b0790bd 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java
@@ -14,20 +14,20 @@ public enum FeedbackIssue implements MGRecyclerDataPayload {
     BACKGROUND_NOISE_TOO_LOUD(2131887121),
     SPEAKERPHONE_ISSUE(2131887127),
     HEADSET_OR_BLUETOOTH_ISSUE(2131887124),
-    STREAM_REPORT_ENDED_BLACK(2131893638),
-    STREAM_REPORT_ENDED_BLURRY(2131893639),
-    STREAM_REPORT_ENDED_LAGGING(2131893640),
-    STREAM_REPORT_ENDED_OUT_OF_SYNC(2131893641),
-    STREAM_REPORT_ENDED_AUDIO_MISSING(2131893636),
-    STREAM_REPORT_ENDED_AUDIO_POOR(2131893637),
-    STREAM_REPORT_ENDED_STREAM_STOPPED_UNEXPECTEDLY(2131893642),
-    GUILD_DELETE_TOO_HARD(2131889199),
-    GUILD_DELETE_TEST(2131889198),
-    GUILD_DELETE_ACCIDENT(2131889190),
-    GUILD_DELETE_TEMPLATE(2131889197),
-    GUILD_DELETE_LONELY(2131889194),
-    GUILD_DELETE_INACTIVE(2131889193),
-    GUILD_DELETE_OTHER(2131889195);
+    STREAM_REPORT_ENDED_BLACK(2131893735),
+    STREAM_REPORT_ENDED_BLURRY(2131893736),
+    STREAM_REPORT_ENDED_LAGGING(2131893737),
+    STREAM_REPORT_ENDED_OUT_OF_SYNC(2131893738),
+    STREAM_REPORT_ENDED_AUDIO_MISSING(2131893733),
+    STREAM_REPORT_ENDED_AUDIO_POOR(2131893734),
+    STREAM_REPORT_ENDED_STREAM_STOPPED_UNEXPECTEDLY(2131893739),
+    GUILD_DELETE_TOO_HARD(2131889203),
+    GUILD_DELETE_TEST(2131889202),
+    GUILD_DELETE_ACCIDENT(2131889194),
+    GUILD_DELETE_TEMPLATE(2131889201),
+    GUILD_DELETE_LONELY(2131889198),
+    GUILD_DELETE_INACTIVE(2131889197),
+    GUILD_DELETE_OTHER(2131889199);
     
     private final String key = String.valueOf(hashCode());
     private final int reasonStringRes;
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java
index 24d2983088..8f332d8f66 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java
@@ -77,7 +77,7 @@ public final class FeedbackView extends LinearLayout {
         @Override // androidx.recyclerview.widget.RecyclerView.Adapter
         public MGRecyclerViewHolder<IssuesAdapter, FeedbackIssue> onCreateViewHolder(ViewGroup viewGroup, int i) {
             m.checkNotNullParameter(viewGroup, "parent");
-            return new IssueViewHolder(2131558654, this);
+            return new IssueViewHolder(2131558652, this);
         }
 
         public final void setOnIssueClick(Function1<? super FeedbackIssue, Unit> function1) {
@@ -93,29 +93,29 @@ public final class FeedbackView extends LinearLayout {
         m.checkNotNullParameter(attributeSet, "attrs");
         View inflate = LayoutInflater.from(context).inflate(2131558502, (ViewGroup) this, false);
         addView(inflate);
-        int i = 2131363172;
-        ImageButton imageButton = (ImageButton) inflate.findViewById(2131363172);
+        int i = 2131363197;
+        ImageButton imageButton = (ImageButton) inflate.findViewById(2131363197);
         if (imageButton != null) {
-            i = 2131363173;
-            TextView textView = (TextView) inflate.findViewById(2131363173);
+            i = 2131363198;
+            TextView textView = (TextView) inflate.findViewById(2131363198);
             if (textView != null) {
-                i = 2131363174;
-                CardView cardView = (CardView) inflate.findViewById(2131363174);
+                i = 2131363199;
+                CardView cardView = (CardView) inflate.findViewById(2131363199);
                 if (cardView != null) {
-                    i = 2131363175;
-                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363175);
+                    i = 2131363200;
+                    RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363200);
                     if (recyclerView != null) {
-                        i = 2131363176;
-                        ImageButton imageButton2 = (ImageButton) inflate.findViewById(2131363176);
+                        i = 2131363201;
+                        ImageButton imageButton2 = (ImageButton) inflate.findViewById(2131363201);
                         if (imageButton2 != null) {
-                            i = 2131363177;
-                            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363177);
+                            i = 2131363202;
+                            ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363202);
                             if (constraintLayout != null) {
-                                i = 2131363178;
-                                TextView textView2 = (TextView) inflate.findViewById(2131363178);
+                                i = 2131363203;
+                                TextView textView2 = (TextView) inflate.findViewById(2131363203);
                                 if (textView2 != null) {
-                                    i = 2131363179;
-                                    ImageView imageView = (ImageView) inflate.findViewById(2131363179);
+                                    i = 2131363204;
+                                    ImageView imageView = (ImageView) inflate.findViewById(2131363204);
                                     if (imageView != null) {
                                         FeedbackViewBinding feedbackViewBinding = new FeedbackViewBinding((LinearLayout) inflate, imageButton, textView, cardView, recyclerView, imageButton2, constraintLayout, textView2, imageView);
                                         m.checkNotNullExpressionValue(feedbackViewBinding, "FeedbackViewBinding.infl…rom(context), this, true)");
@@ -162,10 +162,10 @@ public final class FeedbackView extends LinearLayout {
             ((View) entry.getKey()).setSelected(feedbackRating == ((FeedbackRating) entry.getValue()));
         }
         boolean z3 = !list.isEmpty();
-        TextView textView2 = this.binding.f1609c;
+        TextView textView2 = this.binding.f1605c;
         m.checkNotNullExpressionValue(textView2, "binding.feedbackIssueSectionHeader");
         textView2.setText(str2);
-        TextView textView3 = this.binding.f1609c;
+        TextView textView3 = this.binding.f1605c;
         m.checkNotNullExpressionValue(textView3, "binding.feedbackIssueSectionHeader");
         textView3.setVisibility(z3 ? 0 : 8);
         CardView cardView = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java
index 182d415c34..03f1c42978 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/IssueDetailsFormViewModel.java
@@ -40,9 +40,9 @@ public final class IssueDetailsFormViewModel extends AppViewModel<Unit> {
         m.checkNotNullParameter(feedbackSubmitter, "feedbackSubmitter");
         this.pendingFeedback = pendingFeedback;
         this.feedbackSubmitter = feedbackSubmitter;
-        PublishSubject<Event> l0 = PublishSubject.l0();
-        m.checkNotNullExpressionValue(l0, "PublishSubject.create()");
-        this.eventSubject = l0;
+        PublishSubject<Event> k0 = PublishSubject.k0();
+        m.checkNotNullExpressionValue(k0, "PublishSubject.create()");
+        this.eventSubject = k0;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java
index fddd77aa91..bc94a6f994 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java
@@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetIssueDetailsForm$binding$2 extends k im
 
     public final WidgetIssueDetailsFormBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363641;
-        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363641);
+        int i = 2131363682;
+        LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363682);
         if (linkifiedTextView != null) {
-            i = 2131363642;
-            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363642);
+            i = 2131363683;
+            TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363683);
             if (textInputLayout != null) {
-                i = 2131363643;
-                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363643);
+                i = 2131363684;
+                MaterialButton materialButton = (MaterialButton) view.findViewById(2131363684);
                 if (materialButton != null) {
                     return new WidgetIssueDetailsFormBinding((NestedScrollView) view, linkifiedTextView, textInputLayout, materialButton);
                 }
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java
index 0a4091cdda..ac22331e5e 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java
@@ -14,7 +14,7 @@ public final class WidgetIssueDetailsForm$onViewBound$1 implements View.OnClickL
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f1823c;
+        TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f1825c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput");
         WidgetIssueDetailsForm.access$getViewModel$p(this.this$0).submitForm(ViewExtensions.getTextOrEmpty(textInputLayout));
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java
index 2294cda9f5..61897cb50e 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java
@@ -61,7 +61,7 @@ public final class WidgetIssueDetailsForm extends AppFragment {
     }
 
     public WidgetIssueDetailsForm() {
-        super(2131559070);
+        super(2131559076);
         WidgetIssueDetailsForm$viewModel$2 widgetIssueDetailsForm$viewModel$2 = new WidgetIssueDetailsForm$viewModel$2(this);
         h0 h0Var = new h0(this);
         this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(IssueDetailsFormViewModel.class), new WidgetIssueDetailsForm$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetIssueDetailsForm$viewModel$2));
@@ -102,7 +102,7 @@ public final class WidgetIssueDetailsForm extends AppFragment {
             o.i(this, 2131887116, 0, 4);
             AppActivity appActivity = getAppActivity();
             if (appActivity != null) {
-                appActivity.hideKeyboard(getBinding().f1823c);
+                appActivity.hideKeyboard(getBinding().f1825c);
             }
             requireActivity().onBackPressed();
         }
@@ -116,15 +116,15 @@ public final class WidgetIssueDetailsForm extends AppFragment {
     public void onViewBound(View view) {
         m.checkNotNullParameter(view, "view");
         super.onViewBound(view);
-        setActionBarTitle(2131888502);
+        setActionBarTitle(2131888503);
         MaterialButton materialButton = getBinding().d;
         m.checkNotNullExpressionValue(materialButton, "binding.issueDetailsSubmitButton");
         materialButton.setEnabled(false);
         getBinding().d.setOnClickListener(new WidgetIssueDetailsForm$onViewBound$1(this));
-        TextInputLayout textInputLayout = getBinding().f1823c;
+        TextInputLayout textInputLayout = getBinding().f1825c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput");
         ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetIssueDetailsForm$onViewBound$2(this));
-        TextInputLayout textInputLayout2 = getBinding().f1823c;
+        TextInputLayout textInputLayout2 = getBinding().f1825c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.issueDetailsInput");
         showKeyboard(textInputLayout2);
         LinkifiedTextView linkifiedTextView = getBinding().b;
@@ -132,7 +132,7 @@ public final class WidgetIssueDetailsForm extends AppFragment {
         linkifiedTextView.setVisibility(shouldShowCxPrompt() ? 0 : 8);
         LinkifiedTextView linkifiedTextView2 = getBinding().b;
         m.checkNotNullExpressionValue(linkifiedTextView2, "binding.issueDetailsCxPrompt");
-        b.n(linkifiedTextView2, 2131888503, new Object[]{f.c()}, null, 4);
+        b.m(linkifiedTextView2, 2131888504, new Object[]{f.c()}, null, 4);
     }
 
     @Override // com.discord.app.AppFragment
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
index 015b62fbe5..bacb3bce28 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java
@@ -86,9 +86,9 @@ public final class CallFeedbackSheetViewModel extends AppViewModel<FeedbackSheet
         }
 
         private final Observable<StoreState> observeStoreState(StoreExperiments storeExperiments) {
-            Observable<R> G = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).G(CallFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "storeExperiments\n       …            )\n          }");
-            return G;
+            Observable<R> F = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).F(CallFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storeExperiments\n       …            )\n          }");
+            return F;
         }
 
         public final List<FeedbackIssue> getISSUES_UI_OPTIONS() {
@@ -344,7 +344,7 @@ public final class CallFeedbackSheetViewModel extends AppViewModel<FeedbackSheet
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeAnalytics = storeAnalytics;
         this.storeExperiments = storeExperiments;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.submitOnDismiss = true;
         this.pendingCallFeedback = new PendingFeedback.CallFeedback(config.getChannelId(), config.getRtcConnectionId(), config.getCallDurationMs(), config.getMediaSessionId(), null, null, null, null, 240, null);
         this.issuesUiOptions = u.plus((Collection<? extends FeedbackIssue>) d0.t.m.shuffled(ISSUES_UI_OPTIONS), FeedbackIssue.OTHER);
diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
index d28beadb72..47a59e7072 100644
--- a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java
@@ -77,9 +77,9 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
         }
 
         private final Observable<StoreState> observeStoreState(StoreExperiments storeExperiments) {
-            Observable<R> G = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).G(StreamFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "storeExperiments\n       …            )\n          }");
-            return G;
+            Observable<R> F = storeExperiments.observeUserExperiment("2020-08_feedback_modal_helpdesk_link", true).F(StreamFeedbackSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "storeExperiments\n       …            )\n          }");
+            return F;
         }
 
         public final List<FeedbackIssue> getISSUES_UI_OPTIONS() {
@@ -158,14 +158,14 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public StreamFeedbackSheetViewModel(String str, String str2, StoreExperiments storeExperiments, StoreAnalytics storeAnalytics, Observable<StoreState> observable) {
-        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131893631, 2131893653, 2131893647));
+        super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131893728, 2131893750, 2131893744));
         m.checkNotNullParameter(str, "streamKey");
         m.checkNotNullParameter(storeExperiments, "storeExperiments");
         m.checkNotNullParameter(storeAnalytics, "storeAnalytics");
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.storeExperiments = storeExperiments;
         this.storeAnalytics = storeAnalytics;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.submitOnDismiss = true;
         ModelApplicationStream decodeStreamKey = ModelApplicationStream.Companion.decodeStreamKey(str);
         this.stream = decodeStreamKey;
@@ -193,7 +193,7 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel<FeedbackShe
     }
 
     private final FeedbackSheetViewModel.ViewState createViewState(FeedbackRating feedbackRating, List<? extends FeedbackIssue> list) {
-        return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131893631, 2131893653, 2131893647);
+        return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131893728, 2131893750, 2131893744);
     }
 
     private final void emitSubmittedEvent(boolean z2) {
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java
index 13630e495e..0f45541ead 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java
@@ -12,8 +12,8 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.a4;
-import c.a.i.z3;
+import c.a.i.c4;
+import c.a.i.d4;
 import com.discord.databinding.WidgetCallFullscreenBinding;
 import com.discord.views.calls.StageCallVisitCommunityView;
 import com.discord.views.calls.VideoCallParticipantView;
@@ -49,99 +49,99 @@ public final /* synthetic */ class WidgetCallFullscreen$binding$2 extends k impl
                     i = 2131361995;
                     View findViewById = view.findViewById(2131361995);
                     if (findViewById != null) {
-                        z3 z3Var = new z3(findViewById, findViewById);
-                        Barrier barrier = (Barrier) view.findViewById(2131362187);
+                        c4 c4Var = new c4(findViewById, findViewById);
+                        Barrier barrier = (Barrier) view.findViewById(2131362198);
                         if (barrier != null) {
                             ConstraintLayout constraintLayout = (ConstraintLayout) view;
-                            CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view.findViewById(2131362189);
+                            CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view.findViewById(2131362200);
                             if (coordinatorLayout != null) {
-                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362190);
+                                MaterialButton materialButton = (MaterialButton) view.findViewById(2131362201);
                                 if (materialButton != null) {
-                                    TextView textView = (TextView) view.findViewById(2131362191);
+                                    TextView textView = (TextView) view.findViewById(2131362202);
                                     if (textView != null) {
-                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131362192);
+                                        ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131362203);
                                         if (constraintLayout2 != null) {
-                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362193);
+                                            LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362204);
                                             if (linearLayout != null) {
-                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362194);
+                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362205);
                                                 if (materialButton2 != null) {
-                                                    VideoCallParticipantView videoCallParticipantView = (VideoCallParticipantView) view.findViewById(2131362195);
+                                                    VideoCallParticipantView videoCallParticipantView = (VideoCallParticipantView) view.findViewById(2131362206);
                                                     if (videoCallParticipantView != null) {
-                                                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362196);
+                                                        RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362207);
                                                         if (recyclerView != null) {
-                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362197);
+                                                            MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131362208);
                                                             if (materialButton3 != null) {
-                                                                ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131362198);
+                                                                ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131362209);
                                                                 if (constraintLayout3 != null) {
-                                                                    TextView textView2 = (TextView) view.findViewById(2131362199);
+                                                                    TextView textView2 = (TextView) view.findViewById(2131362210);
                                                                     if (textView2 != null) {
-                                                                        TextView textView3 = (TextView) view.findViewById(2131362200);
+                                                                        TextView textView3 = (TextView) view.findViewById(2131362211);
                                                                         if (textView3 != null) {
-                                                                            ImageView imageView = (ImageView) view.findViewById(2131362201);
+                                                                            ImageView imageView = (ImageView) view.findViewById(2131362212);
                                                                             if (imageView != null) {
-                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362203);
+                                                                                RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131362214);
                                                                                 if (recyclerView2 != null) {
-                                                                                    StageCallVisitCommunityView stageCallVisitCommunityView = (StageCallVisitCommunityView) view.findViewById(2131362204);
+                                                                                    StageCallVisitCommunityView stageCallVisitCommunityView = (StageCallVisitCommunityView) view.findViewById(2131362215);
                                                                                     if (stageCallVisitCommunityView != null) {
-                                                                                        View findViewById2 = view.findViewById(2131364337);
+                                                                                        View findViewById2 = view.findViewById(2131364373);
                                                                                         if (findViewById2 != null) {
-                                                                                            int i2 = 2131364338;
-                                                                                            PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) findViewById2.findViewById(2131364338);
+                                                                                            int i2 = 2131364374;
+                                                                                            PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) findViewById2.findViewById(2131364374);
                                                                                             if (privateCallBlurredGridView != null) {
-                                                                                                i2 = 2131364339;
-                                                                                                TextView textView4 = (TextView) findViewById2.findViewById(2131364339);
+                                                                                                i2 = 2131364375;
+                                                                                                TextView textView4 = (TextView) findViewById2.findViewById(2131364375);
                                                                                                 if (textView4 != null) {
                                                                                                     RelativeLayout relativeLayout2 = (RelativeLayout) findViewById2;
-                                                                                                    i2 = 2131364341;
-                                                                                                    LinearLayout linearLayout2 = (LinearLayout) findViewById2.findViewById(2131364341);
+                                                                                                    i2 = 2131364377;
+                                                                                                    LinearLayout linearLayout2 = (LinearLayout) findViewById2.findViewById(2131364377);
                                                                                                     if (linearLayout2 != null) {
-                                                                                                        i2 = 2131364342;
-                                                                                                        PrivateCallGridView privateCallGridView = (PrivateCallGridView) findViewById2.findViewById(2131364342);
+                                                                                                        i2 = 2131364378;
+                                                                                                        PrivateCallGridView privateCallGridView = (PrivateCallGridView) findViewById2.findViewById(2131364378);
                                                                                                         if (privateCallGridView != null) {
-                                                                                                            i2 = 2131364343;
-                                                                                                            TextView textView5 = (TextView) findViewById2.findViewById(2131364343);
+                                                                                                            i2 = 2131364379;
+                                                                                                            TextView textView5 = (TextView) findViewById2.findViewById(2131364379);
                                                                                                             if (textView5 != null) {
-                                                                                                                i2 = 2131364344;
-                                                                                                                TextView textView6 = (TextView) findViewById2.findViewById(2131364344);
+                                                                                                                i2 = 2131364380;
+                                                                                                                TextView textView6 = (TextView) findViewById2.findViewById(2131364380);
                                                                                                                 if (textView6 != null) {
-                                                                                                                    i2 = 2131364345;
-                                                                                                                    TextView textView7 = (TextView) findViewById2.findViewById(2131364345);
+                                                                                                                    i2 = 2131364381;
+                                                                                                                    TextView textView7 = (TextView) findViewById2.findViewById(2131364381);
                                                                                                                     if (textView7 != null) {
-                                                                                                                        a4 a4Var = new a4(relativeLayout2, privateCallBlurredGridView, textView4, relativeLayout2, linearLayout2, privateCallGridView, textView5, textView6, textView7);
-                                                                                                                        ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131364967);
+                                                                                                                        d4 d4Var = new d4(relativeLayout2, privateCallBlurredGridView, textView4, relativeLayout2, linearLayout2, privateCallGridView, textView5, textView6, textView7);
+                                                                                                                        ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131365017);
                                                                                                                         if (constraintLayout4 != null) {
-                                                                                                                            UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131364968);
+                                                                                                                            UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131365018);
                                                                                                                             if (userSummaryView != null) {
-                                                                                                                                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364969);
+                                                                                                                                MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131365019);
                                                                                                                                 if (materialTextView != null) {
-                                                                                                                                    ViewStub viewStub = (ViewStub) view.findViewById(2131365042);
+                                                                                                                                    ViewStub viewStub = (ViewStub) view.findViewById(2131365092);
                                                                                                                                     if (viewStub != null) {
-                                                                                                                                        Barrier barrier2 = (Barrier) view.findViewById(2131365300);
+                                                                                                                                        Barrier barrier2 = (Barrier) view.findViewById(2131365355);
                                                                                                                                         if (barrier2 != null) {
-                                                                                                                                            VoiceControlsSheetView voiceControlsSheetView = (VoiceControlsSheetView) view.findViewById(2131365538);
+                                                                                                                                            VoiceControlsSheetView voiceControlsSheetView = (VoiceControlsSheetView) view.findViewById(2131365599);
                                                                                                                                             if (voiceControlsSheetView != null) {
-                                                                                                                                                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365607);
+                                                                                                                                                FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365668);
                                                                                                                                                 if (fragmentContainerView != null) {
-                                                                                                                                                    return new WidgetCallFullscreenBinding(constraintLayout, toolbar, appBarLayout, relativeLayout, z3Var, barrier, constraintLayout, coordinatorLayout, materialButton, textView, constraintLayout2, linearLayout, materialButton2, videoCallParticipantView, recyclerView, materialButton3, constraintLayout3, textView2, textView3, imageView, recyclerView2, stageCallVisitCommunityView, a4Var, constraintLayout4, userSummaryView, materialTextView, viewStub, barrier2, voiceControlsSheetView, fragmentContainerView);
+                                                                                                                                                    return new WidgetCallFullscreenBinding(constraintLayout, toolbar, appBarLayout, relativeLayout, c4Var, barrier, constraintLayout, coordinatorLayout, materialButton, textView, constraintLayout2, linearLayout, materialButton2, videoCallParticipantView, recyclerView, materialButton3, constraintLayout3, textView2, textView3, imageView, recyclerView2, stageCallVisitCommunityView, d4Var, constraintLayout4, userSummaryView, materialTextView, viewStub, barrier2, voiceControlsSheetView, fragmentContainerView);
                                                                                                                                                 }
-                                                                                                                                                i = 2131365607;
+                                                                                                                                                i = 2131365668;
                                                                                                                                             } else {
-                                                                                                                                                i = 2131365538;
+                                                                                                                                                i = 2131365599;
                                                                                                                                             }
                                                                                                                                         } else {
-                                                                                                                                            i = 2131365300;
+                                                                                                                                            i = 2131365355;
                                                                                                                                         }
                                                                                                                                     } else {
-                                                                                                                                        i = 2131365042;
+                                                                                                                                        i = 2131365092;
                                                                                                                                     }
                                                                                                                                 } else {
-                                                                                                                                    i = 2131364969;
+                                                                                                                                    i = 2131365019;
                                                                                                                                 }
                                                                                                                             } else {
-                                                                                                                                i = 2131364968;
+                                                                                                                                i = 2131365018;
                                                                                                                             }
                                                                                                                         } else {
-                                                                                                                            i = 2131364967;
+                                                                                                                            i = 2131365017;
                                                                                                                         }
                                                                                                                     }
                                                                                                                 }
@@ -152,54 +152,54 @@ public final /* synthetic */ class WidgetCallFullscreen$binding$2 extends k impl
                                                                                             }
                                                                                             throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i2)));
                                                                                         }
-                                                                                        i = 2131364337;
+                                                                                        i = 2131364373;
                                                                                     } else {
-                                                                                        i = 2131362204;
+                                                                                        i = 2131362215;
                                                                                     }
                                                                                 } else {
-                                                                                    i = 2131362203;
+                                                                                    i = 2131362214;
                                                                                 }
                                                                             } else {
-                                                                                i = 2131362201;
+                                                                                i = 2131362212;
                                                                             }
                                                                         } else {
-                                                                            i = 2131362200;
+                                                                            i = 2131362211;
                                                                         }
                                                                     } else {
-                                                                        i = 2131362199;
+                                                                        i = 2131362210;
                                                                     }
                                                                 } else {
-                                                                    i = 2131362198;
+                                                                    i = 2131362209;
                                                                 }
                                                             } else {
-                                                                i = 2131362197;
+                                                                i = 2131362208;
                                                             }
                                                         } else {
-                                                            i = 2131362196;
+                                                            i = 2131362207;
                                                         }
                                                     } else {
-                                                        i = 2131362195;
+                                                        i = 2131362206;
                                                     }
                                                 } else {
-                                                    i = 2131362194;
+                                                    i = 2131362205;
                                                 }
                                             } else {
-                                                i = 2131362193;
+                                                i = 2131362204;
                                             }
                                         } else {
-                                            i = 2131362192;
+                                            i = 2131362203;
                                         }
                                     } else {
-                                        i = 2131362191;
+                                        i = 2131362202;
                                     }
                                 } else {
-                                    i = 2131362190;
+                                    i = 2131362201;
                                 }
                             } else {
-                                i = 2131362189;
+                                i = 2131362200;
                             }
                         } else {
-                            i = 2131362187;
+                            i = 2131362198;
                         }
                     }
                 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3.java
index 83a6f06080..789f705634 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureBottomControls$3.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.voice.fullscreen;
 
 import androidx.fragment.app.FragmentManager;
-import c.a.a.e.a.a;
+import c.a.a.d.a.a;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Objects;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
index 1d58c776bb..aed03b7a47 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java
@@ -51,23 +51,23 @@ public final class WidgetCallFullscreen$configureMenu$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case 2131363864:
+            case 2131363905:
                 DiscordOverlayService.Companion companion = DiscordOverlayService.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launchForConnect(context);
                 return;
-            case 2131363865:
+            case 2131363906:
                 WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed();
                 return;
-            case 2131363866:
+            case 2131363907:
                 WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-                companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().g(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this));
+                companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this));
                 return;
-            case 2131363867:
+            case 2131363908:
                 WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion;
-                Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().g());
+                Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h());
                 FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager");
                 companion3.show(valueOf, parentFragmentManager2);
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java
index 4eb2808d38..9f3ab82d9e 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java
@@ -14,16 +14,16 @@ public final class WidgetCallFullscreen$configureMenu$2<T> implements Action1<Me
     }
 
     public final void call(Menu menu) {
-        MenuItem findItem = menu.findItem(2131363865);
+        MenuItem findItem = menu.findItem(2131363906);
         m.checkNotNullExpressionValue(findItem, "switchCameraMenuItem");
         findItem.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.SWITCH_CAMERA));
-        MenuItem findItem2 = menu.findItem(2131363867);
+        MenuItem findItem2 = menu.findItem(2131363908);
         m.checkNotNullExpressionValue(findItem2, "voiceSettingsMenuItem");
         findItem2.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.VOICE_SETTINGS));
-        MenuItem findItem3 = menu.findItem(2131363864);
+        MenuItem findItem3 = menu.findItem(2131363905);
         m.checkNotNullExpressionValue(findItem3, "overlayLauncherMenuItem");
         findItem3.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.LAUNCH_OVERLAY));
-        MenuItem findItem4 = menu.findItem(2131363866);
+        MenuItem findItem4 = menu.findItem(2131363907);
         m.checkNotNullExpressionValue(findItem4, "listMenuItem");
         findItem4.setVisible(this.$viewState.getMenuItems().contains(WidgetCallFullscreenViewModel.MenuItem.SHOW_PARTICIPANT_LIST));
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java
index 5b286c3fd2..bea577fe04 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$initializeSystemUiListeners$5.java
@@ -37,7 +37,7 @@ public final class WidgetCallFullscreen$initializeSystemUiListeners$5 implements
         WindowInsetsCompat build = new WindowInsetsCompat.Builder().setSystemWindowInsets(Insets.of(Math.max(windowInsetsCompat.getSystemWindowInsetLeft(), safeInsetLeft), Math.max(windowInsetsCompat.getSystemWindowInsetTop(), safeInsetTop), Math.max(windowInsetsCompat.getSystemWindowInsetRight(), safeInsetRight), Math.max(windowInsetsCompat.getSystemWindowInsetBottom(), i))).build();
         m.checkNotNullExpressionValue(build, "WindowInsetsCompat.Build…        )\n      ).build()");
         VideoCallGridAdapter access$getGridAdapter$p2 = WidgetCallFullscreen.access$getGridAdapter$p(this.this$0);
-        AppBarLayout appBarLayout = WidgetCallFullscreen.access$getBinding$p(this.this$0).f1685c;
+        AppBarLayout appBarLayout = WidgetCallFullscreen.access$getBinding$p(this.this$0).f1682c;
         m.checkNotNullExpressionValue(appBarLayout, "binding.actionBarToolbarLayout");
         access$getGridAdapter$p2.setInsetsForAvoidingCallUiOverlap(appBarLayout.getMeasuredHeight(), windowInsetsCompat.getSystemWindowInsetBottom(), windowInsetsCompat.getSystemWindowInsetLeft(), windowInsetsCompat.getSystemWindowInsetRight());
         ViewCompat.dispatchApplyWindowInsets(WidgetCallFullscreen.access$getBinding$p(this.this$0).f, build);
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
index 2dc2215f1e..79e326eb71 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$onViewBound$3.java
@@ -16,7 +16,7 @@ public final class WidgetCallFullscreen$onViewBound$3 extends o implements Funct
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        c.a.d.o.g(this.this$0.getContext(), 2131891855, 0, null, 12);
+        c.a.d.o.g(this.this$0.getContext(), 2131891927, 0, null, 12);
         WidgetCallFullscreen.access$leaveActivity(this.this$0);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$stageSpeakerPillManagingScrollListener$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$stageSpeakerPillManagingScrollListener$1.java
index dea98fa5cb..60cefaa7cf 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$stageSpeakerPillManagingScrollListener$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$stageSpeakerPillManagingScrollListener$1.java
@@ -40,7 +40,7 @@ public final class WidgetCallFullscreen$stageSpeakerPillManagingScrollListener$1
             }
         }
         z2 = false;
-        ConstraintLayout constraintLayout = WidgetCallFullscreen.access$getBinding$p(this.this$0).f1686s;
+        ConstraintLayout constraintLayout = WidgetCallFullscreen.access$getBinding$p(this.this$0).f1683s;
         m.checkNotNullExpressionValue(constraintLayout, "binding.stageCallSpeakingChip");
         if (!z2) {
             i3 = 8;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
index 526a4e3984..a994948d11 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java
@@ -209,7 +209,7 @@ public final class WidgetCallFullscreen extends AppFragment {
     }
 
     public WidgetCallFullscreen() {
-        super(2131558857);
+        super(2131558860);
         AppLog appLog = AppLog.g;
         m.checkNotNullParameter(appLog, "logger");
         WeakReference<c.a.j.a> weakReference = a.b.a;
@@ -224,7 +224,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
         tooltipManager = weakReference2 != null ? weakReference2.get() : tooltipManager;
         if (tooltipManager == null) {
-            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+            tooltipManager = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
             TooltipManager.a.a = new WeakReference<>(tooltipManager);
         }
         this.tooltipManager = tooltipManager;
@@ -351,7 +351,7 @@ public final class WidgetCallFullscreen extends AppFragment {
             TextView textView2 = getBinding().h;
             m.checkNotNullExpressionValue(textView2, "binding.callFullscreenMentions");
             if (textView2.getVisibility() == 0) {
-                i = 2131231460;
+                i = 2131231466;
                 toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i));
                 StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q;
                 m.checkNotNullExpressionValue(stageCallVisitCommunityView, "binding.callVisitCommunity");
@@ -369,7 +369,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                             SimpleDraweeView simpleDraweeView = stageCallVisitCommunityView2.i.b;
                             m.checkNotNullExpressionValue(simpleDraweeView, "binding.visitCommunityIcon");
                             SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, true, guild, (float) stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165445), Integer.valueOf(IconUtils.getMediaProxySize(stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165290))), null, null, null, false, null, 496, null);
-                            TextView textView3 = stageCallVisitCommunityView2.i.f111c;
+                            TextView textView3 = stageCallVisitCommunityView2.i.f127c;
                             m.checkNotNullExpressionValue(textView3, "binding.visitCommunityIconText");
                             textView3.setText(!z3 ? null : guild.getShortName());
                             stageCallVisitCommunityView2.setOnClickListener(new WidgetCallFullscreen$configureActionBar$$inlined$let$lambda$1(guild, this));
@@ -380,7 +380,7 @@ public final class WidgetCallFullscreen extends AppFragment {
                     SimpleDraweeView simpleDraweeView = stageCallVisitCommunityView2.i.b;
                     m.checkNotNullExpressionValue(simpleDraweeView, "binding.visitCommunityIcon");
                     SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, true, guild, (float) stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165445), Integer.valueOf(IconUtils.getMediaProxySize(stageCallVisitCommunityView2.getResources().getDimensionPixelSize(2131165290))), null, null, null, false, null, 496, null);
-                    TextView textView3 = stageCallVisitCommunityView2.i.f111c;
+                    TextView textView3 = stageCallVisitCommunityView2.i.f127c;
                     m.checkNotNullExpressionValue(textView3, "binding.visitCommunityIconText");
                     textView3.setText(!z3 ? null : guild.getShortName());
                     stageCallVisitCommunityView2.setOnClickListener(new WidgetCallFullscreen$configureActionBar$$inlined$let$lambda$1(guild, this));
@@ -394,17 +394,17 @@ public final class WidgetCallFullscreen extends AppFragment {
                 }
                 setActionBarTitle(titleText);
                 setActionBarTitleColor(-1);
-                ViewExtensions.fadeBy(getBinding().f1685c, valid.getShowControls(), 200);
+                ViewExtensions.fadeBy(getBinding().f1682c, valid.getShowControls(), 200);
                 ColorCompat.setStatusBarTranslucent(this);
                 ColorCompat.setStatusBarColor((Fragment) this, color, true);
             }
         }
         if (valid.getDisplayMode() == displayMode2) {
-            i = 2131231459;
+            i = 2131231465;
         } else {
             TextView textView4 = getBinding().h;
             m.checkNotNullExpressionValue(textView4, "binding.callFullscreenMentions");
-            i = textView4.getVisibility() == 0 ? 2131231458 : 2131231457;
+            i = textView4.getVisibility() == 0 ? 2131231464 : 2131231463;
         }
         toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i));
         StageCallVisitCommunityView stageCallVisitCommunityView = getBinding().q;
@@ -420,7 +420,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         }
         setActionBarTitle(titleText);
         setActionBarTitleColor(-1);
-        ViewExtensions.fadeBy(getBinding().f1685c, valid.getShowControls(), 200);
+        ViewExtensions.fadeBy(getBinding().f1682c, valid.getShowControls(), 200);
         ColorCompat.setStatusBarTranslucent(this);
         ColorCompat.setStatusBarColor((Fragment) this, color, true);
     }
@@ -464,9 +464,9 @@ public final class WidgetCallFullscreen extends AppFragment {
     private final void configureConnectionStatusText(CallModel callModel) {
         Subscription subscription = this.connectedTimerSubscription;
         if (subscription == null || subscription.isUnsubscribed()) {
-            Observable<Long> E = Observable.E(0, 1, TimeUnit.SECONDS);
-            m.checkNotNullExpressionValue(E, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(E, this, null, 2, null), WidgetCallFullscreen.class, (Context) null, new WidgetCallFullscreen$configureConnectionStatusText$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreen$configureConnectionStatusText$1(this, callModel), 58, (Object) null);
+            Observable<Long> D = Observable.D(0, 1, TimeUnit.SECONDS);
+            m.checkNotNullExpressionValue(D, "Observable\n          .in…0L, 1L, TimeUnit.SECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(D, this, null, 2, null), WidgetCallFullscreen.class, (Context) null, new WidgetCallFullscreen$configureConnectionStatusText$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreen$configureConnectionStatusText$1(this, callModel), 58, (Object) null);
         }
     }
 
@@ -490,7 +490,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         RecyclerView recyclerView = getBinding().m;
         m.checkNotNullExpressionValue(recyclerView, "binding.callStageRecycler");
         recyclerView.setVisibility(8);
-        ConstraintLayout constraintLayout = getBinding().f1686s;
+        ConstraintLayout constraintLayout = getBinding().f1683s;
         m.checkNotNullExpressionValue(constraintLayout, "binding.stageCallSpeakingChip");
         constraintLayout.setVisibility(8);
         getBinding().j.setOnClickListener(new WidgetCallFullscreen$configureGridUi$1(this));
@@ -586,7 +586,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullExpressionValue(relativeLayout, "binding.privateCall.privateCallContainer");
         relativeLayout.setVisibility(0);
         getBinding().r.b.configure(valid.getPrivateCallUserListItems());
-        TextView textView = getBinding().r.f63c;
+        TextView textView = getBinding().r.f81c;
         m.checkNotNullExpressionValue(textView, "binding.privateCall.priv…CallConnectivityStatusBar");
         if (!valid.getShowLowConnectivityBar()) {
             i = 8;
@@ -602,16 +602,16 @@ public final class WidgetCallFullscreen extends AppFragment {
         RecyclerView recyclerView2 = getBinding().m;
         m.checkNotNullExpressionValue(recyclerView2, "binding.callStageRecycler");
         recyclerView2.setVisibility(8);
-        ConstraintLayout constraintLayout = getBinding().f1686s;
+        ConstraintLayout constraintLayout = getBinding().f1683s;
         m.checkNotNullExpressionValue(constraintLayout, "binding.stageCallSpeakingChip");
         constraintLayout.setVisibility(8);
         configureMenu(valid);
         configureActionBar(valid);
         enableWakeLock();
-        getBinding().r.i.setText(valid.getCallModel().isConnected() ? 2131891670 : 2131894541);
+        getBinding().r.i.setText(valid.getCallModel().isConnected() ? 2131891739 : 2131894661);
         TextView textView2 = getBinding().r.h;
         m.checkNotNullExpressionValue(textView2, "binding.privateCall.privateCallStatusPrimary");
-        if (AnimatableValueParser.p1(valid.getCallModel().getChannel())) {
+        if (AnimatableValueParser.q1(valid.getCallModel().getChannel())) {
             str = AnimatableValueParser.y0(valid.getCallModel().getChannel());
         } else {
             StoreVoiceParticipants.VoiceUser dmRecipient = valid.getCallModel().getDmRecipient();
@@ -661,7 +661,7 @@ public final class WidgetCallFullscreen extends AppFragment {
             }
             Channel channel = valid.getCallModel().getChannel();
             List<StoreVoiceParticipants.VoiceUser> speakingVoiceUsers = stageCallModel.getSpeakingVoiceUsers();
-            ConstraintLayout constraintLayout = getBinding().f1686s;
+            ConstraintLayout constraintLayout = getBinding().f1683s;
             m.checkNotNullExpressionValue(constraintLayout, "binding.stageCallSpeakingChip");
             if (!speakingVoiceUsers.isEmpty()) {
                 if (!(speakingVoiceUsers instanceof Collection) || !speakingVoiceUsers.isEmpty()) {
@@ -695,13 +695,13 @@ public final class WidgetCallFullscreen extends AppFragment {
                         m.checkNotNullExpressionValue(materialTextView, "binding.stageCallSpeakingUserSummaryLabel");
                         Resources resources = getResources();
                         m.checkNotNullExpressionValue(resources, "resources");
-                        materialTextView.setText(b.d(this, 2131893432, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, 2131755331, 2131893433, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$4(this)));
+                        materialTextView.setText(b.d(this, 2131893515, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, 2131755332, 2131893516, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$4(this)));
                     }
                     arrayList = new ArrayList();
                     boolean z4 = !stageCallModel.getSpeakers().isEmpty();
                     isEmpty = true ^ stageCallModel.getAudience().isEmpty();
                     if (stageCallModel.getStageInstance() != null) {
-                        arrayList.add(new StageCallItem.DetailsItem(stageCallModel.getStageInstance().f(), AnimatableValueParser.y0(channel), valid.getCallModel().getNumUsersConnected(), stageCallModel.getSpeakers().size(), stageCallModel.getAudience().size(), stageCallModel.getNumBlockedUsers(), AnimatableValueParser.s1(stageCallModel.getStageInstance())));
+                        arrayList.add(new StageCallItem.DetailsItem(stageCallModel.getStageInstance().f(), AnimatableValueParser.y0(channel), valid.getCallModel().getNumUsersConnected(), stageCallModel.getSpeakers().size(), stageCallModel.getAudience().size(), stageCallModel.getNumBlockedUsers(), AnimatableValueParser.t1(stageCallModel.getStageInstance())));
                     }
                     arrayList.addAll(stageCallModel.getSpeakers());
                     if (z4 && isEmpty) {
@@ -754,12 +754,12 @@ public final class WidgetCallFullscreen extends AppFragment {
             VoiceControlsSheetView voiceControlsSheetView = getBinding().w;
             m.checkNotNullExpressionValue(voiceControlsSheetView, "binding.voiceControlsSheetView");
             VoiceControlsSheetSwipeTooltip voiceControlsSheetSwipeTooltip = VoiceControlsSheetSwipeTooltip.INSTANCE;
-            String string = getResources().getString(2131894529);
+            String string = getResources().getString(2131894649);
             m.checkNotNullExpressionValue(string, "resources.getString(R.st…s_sheet_tooltip_swipe_up)");
             int dpToPixels = DimenUtils.dpToPixels(-12);
-            Observable<Unit> G = getUnsubscribeSignal().G(WidgetCallFullscreen$configureSwipeTooltip$1.INSTANCE);
-            m.checkNotNullExpressionValue(G, "this.unsubscribeSignal.map { }");
-            defaultTooltipCreator.a(voiceControlsSheetView, string, voiceControlsSheetSwipeTooltip, FloatingViewGravity.TOP, 0, dpToPixels, true, G);
+            Observable<Unit> F = getUnsubscribeSignal().F(WidgetCallFullscreen$configureSwipeTooltip$1.INSTANCE);
+            m.checkNotNullExpressionValue(F, "this.unsubscribeSignal.map { }");
+            defaultTooltipCreator.a(voiceControlsSheetView, string, voiceControlsSheetSwipeTooltip, FloatingViewGravity.TOP, 0, dpToPixels, true, F);
             return;
         }
         this.tooltipManager.c(VoiceControlsSheetSwipeTooltip.INSTANCE);
@@ -867,7 +867,7 @@ public final class WidgetCallFullscreen extends AppFragment {
 
     private final void initializeSystemUiListeners(ViewGroup viewGroup) {
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().w, new WidgetCallFullscreen$initializeSystemUiListeners$1(this));
-        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1685c, WidgetCallFullscreen$initializeSystemUiListeners$2.INSTANCE);
+        ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1682c, WidgetCallFullscreen$initializeSystemUiListeners$2.INSTANCE);
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().h, new WidgetCallFullscreen$initializeSystemUiListeners$3(this));
         ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, WidgetCallFullscreen$initializeSystemUiListeners$4.INSTANCE);
         CoordinatorLayout coordinatorLayout = getBinding().f;
@@ -931,7 +931,7 @@ public final class WidgetCallFullscreen extends AppFragment {
     private final void onDisconnectClicked(CallModel callModel) {
         leaveActivity();
         CallFeedbackSheetNavigator callFeedbackSheetNavigator = CallFeedbackSheetNavigator.INSTANCE;
-        long g = callModel.getChannel().g();
+        long h = callModel.getChannel().h();
         RtcConnection.Metadata rtcConnectionMetadata = callModel.getRtcConnectionMetadata();
         String str = null;
         String str2 = rtcConnectionMetadata != null ? rtcConnectionMetadata.a : null;
@@ -939,7 +939,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         if (rtcConnectionMetadata2 != null) {
             str = rtcConnectionMetadata2.b;
         }
-        callFeedbackSheetNavigator.enqueueNotice(g, str2, str, Long.valueOf(callModel.getCallDurationMs(ClockFactory.get())), callModel.getCallFeedbackSampleRateDenominator());
+        callFeedbackSheetNavigator.enqueueNotice(h, str2, str, Long.valueOf(callModel.getCallDurationMs(ClockFactory.get())), callModel.getCallFeedbackSampleRateDenominator());
     }
 
     private final void onViewBindingDestroy(WidgetCallFullscreenBinding widgetCallFullscreenBinding) {
@@ -1069,10 +1069,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891428);
-        String string2 = requireContext.getString(2131891415);
+        String string = requireContext.getString(2131891499);
+        String string2 = requireContext.getString(2131891486);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…e_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showNoVadPermissionDialog() {
@@ -1082,10 +1082,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131894416);
-        String string2 = requireContext.getString(2131894412);
+        String string = requireContext.getString(2131894535);
+        String string2 = requireContext.getString(2131894531);
         m.checkNotNullExpressionValue(string2, "context.getString(R.string.vad_permission_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showNoVideoPermissionDialog() {
@@ -1095,10 +1095,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891428);
-        String string2 = requireContext.getString(2131891427);
+        String string = requireContext.getString(2131891499);
+        String string2 = requireContext.getString(2131891498);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…o_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerDeafenedDialog() {
@@ -1108,10 +1108,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893168);
-        String string2 = requireContext.getString(2131893167);
+        String string = requireContext.getString(2131893251);
+        String string2 = requireContext.getString(2131893250);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ver_deafened_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerMutedDialog() {
@@ -1121,10 +1121,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893179);
-        String string2 = requireContext.getString(2131893178);
+        String string = requireContext.getString(2131893262);
+        String string2 = requireContext.getString(2131893261);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…server_muted_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showSuppressedDialog() {
@@ -1134,10 +1134,10 @@ public final class WidgetCallFullscreen extends AppFragment {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893691);
-        String string2 = requireContext.getString(2131893694);
+        String string = requireContext.getString(2131893788);
+        String string2 = requireContext.getString(2131893791);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ppressed_permission_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     public final void handleEvent(WidgetCallFullscreenViewModel.Event event) {
@@ -1260,7 +1260,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         initializeSystemUiListeners(viewGroup);
         Context context = viewGroup.getContext();
         m.checkNotNullExpressionValue(context, "view.context");
-        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(context, 2130969370, 0, 2, (Object) null)), 2131888158, null, 8, null);
+        AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(context, 2130969370, 0, 2, (Object) null)), 2131888157, null, 8, null);
         AppTransitionActivity.a aVar = requireAppActivity().j;
         setUpGridRecycler();
         setUpStageRecycler();
@@ -1284,13 +1284,13 @@ public final class WidgetCallFullscreen extends AppFragment {
         getBinding().g.setOnTouchListener(onPressListener);
         getBinding().w.setOnPTTListener(onPressListener);
         Channel channel = StoreStream.Companion.getChannels().getChannel(getChannelId());
-        if (channel != null && AnimatableValueParser.u1(channel)) {
+        if (channel != null && AnimatableValueParser.v1(channel)) {
             requireAppActivity().j = AppTransitionActivity.Transition.TYPE_SLIDE_VERTICAL_WITH_FADE.getAnimations();
         }
         if (!getMostRecentIntent().getBooleanExtra("INTENT_EXTRA_CONNECT_ON_LAUNCH", false)) {
             return;
         }
-        if (channel == null || !AnimatableValueParser.u1(channel)) {
+        if (channel == null || !AnimatableValueParser.v1(channel)) {
             requestMicrophone(new WidgetCallFullscreen$onViewBound$3(this), new WidgetCallFullscreen$onViewBound$4(this));
         } else {
             getViewModel().tryConnectToVoice();
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java
index b185b3176e..9495761f60 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java
@@ -30,6 +30,6 @@ public final class WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2 ext
             }
         }
         WidgetCallFullscreenViewModel.ViewState.Valid valid = this.this$0;
-        return WidgetCallFullscreenViewModel.ViewState.Valid.access$computeMenuItems(valid, PermissionUtils.can(16, valid.getCallModel().getChannelPermissions()), this.this$0.getCallModel().isConnected(), AnimatableValueParser.u1(this.this$0.getCallModel().getChannel()), this.this$0.getCallModel().getSelectedVideoDevice(), this.this$0.getCallModel().getVideoDevices());
+        return WidgetCallFullscreenViewModel.ViewState.Valid.access$computeMenuItems(valid, PermissionUtils.can(16, valid.getCallModel().getChannelPermissions()), this.this$0.getCallModel().isConnected(), AnimatableValueParser.v1(this.this$0.getCallModel().getChannel()), this.this$0.getCallModel().getSelectedVideoDevice(), this.this$0.getCallModel().getVideoDevices());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.java
index 0fdd54d359..7b12562ddc 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2.java
@@ -19,10 +19,10 @@ public final class WidgetCallFullscreenViewModel$ViewState$Valid$titleText$2 ext
     /* renamed from: invoke */
     public final String mo1invoke() {
         Channel channel = this.this$0.getCallModel().getChannel();
-        if (AnimatableValueParser.u1(channel)) {
+        if (AnimatableValueParser.v1(channel)) {
             return null;
         }
         String y0 = AnimatableValueParser.y0(channel);
-        return (!this.this$0.getCallModel().isStreaming() && this.this$0.getVisibleVideoParticipants().size() == 1 && AnimatableValueParser.r1(channel)) ? this.this$0.getVisibleVideoParticipants().get(0).b.getDisplayName() : y0;
+        return (!this.this$0.getCallModel().isStreaming() && this.this$0.getVisibleVideoParticipants().size() == 1 && AnimatableValueParser.s1(channel)) ? this.this$0.getVisibleVideoParticipants().get(0).b.getDisplayName() : y0;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$toggleRequestToSpeak$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$toggleRequestToSpeak$2.java
index 7c0842d89b..0d7a2e5f2b 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$toggleRequestToSpeak$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$toggleRequestToSpeak$2.java
@@ -27,7 +27,7 @@ public final class WidgetCallFullscreenViewModel$toggleRequestToSpeak$2 extends
 
     public final void invoke(Void r3) {
         if (this.$isRaisingMyHand) {
-            AnalyticsTracker.INSTANCE.requestToSpeakInitiated(this.$channel.g());
+            AnalyticsTracker.INSTANCE.requestToSpeakInitiated(this.$channel.h());
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
index dacf448878..bb21e1eb08 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java
@@ -1590,16 +1590,16 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
         this.experimentsStore = storeExperiments;
         this.showStageCallBottomSheet = j != StoreStream.Companion.getVoiceChannelSelected().getSelectedVoiceChannelId();
         this.logStreamQualityIndicatorViewed = true;
-        this.eventSubject = PublishSubject.l0();
-        PublishSubject<List<VideoCallParticipantView.ParticipantData>> l0 = PublishSubject.l0();
-        this.offScreenSubject = l0;
+        this.eventSubject = PublishSubject.k0();
+        PublishSubject<List<VideoCallParticipantView.ParticipantData>> k0 = PublishSubject.k0();
+        this.offScreenSubject = k0;
         this.videoPlayerIdleDetector = new VideoPlayerIdleDetector(0, null, null, new WidgetCallFullscreenViewModel$videoPlayerIdleDetector$1(this), 7, null);
         this.allVideoParticipants = n.emptyList();
         if (str != null) {
             this.autotargetStreamKey = str;
             storeVoiceChannelSelected.selectVoiceChannel(ModelApplicationStream.Companion.decodeStreamKey(str).getChannelId());
         }
-        Observable<List<VideoCallParticipantView.ParticipantData>> o = l0.o(1000, TimeUnit.MILLISECONDS);
+        Observable<List<VideoCallParticipantView.ParticipantData>> o = k0.o(1000, TimeUnit.MILLISECONDS);
         m.checkNotNullExpressionValue(o, "offScreenSubject\n       …0, TimeUnit.MILLISECONDS)");
         ObservableExtensionsKt.appSubscribe$default(o, WidgetCallFullscreenViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -1666,7 +1666,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
             return participantData;
         }
         m.checkNotNullParameter(applicationStreamMetadata, "metadata");
-        VideoCallParticipantView.StreamResolution aVar = applicationStreamMetadata.e == Payloads.ResolutionType.Source ? VideoCallParticipantView.StreamResolution.b.a : new VideoCallParticipantView.StreamResolution.a(applicationStreamMetadata.f2080c);
+        VideoCallParticipantView.StreamResolution aVar = applicationStreamMetadata.e == Payloads.ResolutionType.Source ? VideoCallParticipantView.StreamResolution.b.a : new VideoCallParticipantView.StreamResolution.a(applicationStreamMetadata.f2086c);
         Integer num = applicationStreamMetadata.d;
         if (num != null) {
             streamFps = new VideoCallParticipantView.StreamFps(num.intValue());
@@ -1974,7 +1974,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
     }
 
     private final Observable<StoreState> observeStoreState() {
-        Observable<StoreState> c2 = Observable.c(CallModel.Companion.get(this.channelId), StageCallModel.Companion.observeStageCallModel(this.channelId), this.permissionsStore.observePermissionsForChannel(this.channelId), this.streamRtcConnectionStore.observeStreamVolume().s(), this.streamRtcConnectionStore.observeConnectionQuality().s(), this.mentionsStore.observeTotalMentions(), this.connectivityStore.observeState(), this.stageStore.observeMyRoles(this.channelId).s(), observeChunk(), WidgetCallFullscreenViewModel$observeStoreState$1.INSTANCE);
+        Observable<StoreState> c2 = Observable.c(CallModel.Companion.get(this.channelId), StageCallModel.Companion.observeStageCallModel(this.channelId), this.permissionsStore.observePermissionsForChannel(this.channelId), this.streamRtcConnectionStore.observeStreamVolume().r(), this.streamRtcConnectionStore.observeConnectionQuality().r(), this.mentionsStore.observeTotalMentions(), this.connectivityStore.observeState(), this.stageStore.observeMyRoles(this.channelId).r(), observeChunk(), WidgetCallFullscreenViewModel$observeStoreState$1.INSTANCE);
         m.checkNotNullExpressionValue(c2, "Observable.combineLatest…ate.Invalid\n      }\n    }");
         return c2;
     }
@@ -2030,9 +2030,9 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
     @MainThread
     private final void startTapForwardingJob() {
         cancelTapForwardingJob();
-        Observable<Long> f02 = Observable.f0(255, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler);
-        m.checkNotNullExpressionValue(f02, "Observable\n        .time…ackgroundThreadScheduler)");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(f02, this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$2(this), 58, (Object) null);
+        Observable<Long> e02 = Observable.e0(255, TimeUnit.MILLISECONDS, this.backgroundThreadScheduler);
+        m.checkNotNullExpressionValue(e02, "Observable\n        .time…ackgroundThreadScheduler)");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(e02, this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$startTapForwardingJob$2(this), 58, (Object) null);
     }
 
     @MainThread
@@ -2161,7 +2161,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
         	at jadx.core.codegen.ClassGen.addMethod(ClassGen.java:298)
         	at jadx.core.codegen.ClassGen.lambda$addInnerClsAndMethods$3(ClassGen.java:267)
         	at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:183)
-        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1541)
+        	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
         	at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395)
         	at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258)
         */
@@ -2272,7 +2272,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
             }
             ViewState.Valid valid3 = valid;
             if (valid3 != null) {
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(valid3.isDeafened() ? 2131894525 : 2131894516));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(valid3.isDeafened() ? 2131894645 : 2131894636));
                 return;
             }
             return;
@@ -2340,7 +2340,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
         if (selfMuteFailure == null) {
             if (valid != null) {
                 boolean isMeMutedByAnySource = valid.getCallModel().isMeMutedByAnySource();
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(isMeMutedByAnySource ? 2131894526 : 2131894521));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(isMeMutedByAnySource ? 2131894646 : 2131894641));
             }
         } else if (selfMuteFailure.ordinal() == 0) {
             emitShowNoVadPermissionDialogEvent();
@@ -2447,9 +2447,9 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel<ViewState>
             subscription.unsubscribe();
         }
         this.channelId = j;
-        Observable<StoreState> s2 = observeStoreState().s();
-        m.checkNotNullExpressionValue(s2, "observeStoreState()\n    …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$setTargetChannelId$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$setTargetChannelId$2(this), 58, (Object) null);
+        Observable<StoreState> r = observeStoreState().r();
+        m.checkNotNullExpressionValue(r, "observeStoreState()\n    …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$setTargetChannelId$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$setTargetChannelId$2(this), 58, (Object) null);
     }
 
     @MainThread
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java
index f1c5654ab0..9f13100f23 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java
@@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetGuildCallOnboardingSheet$binding$2 exte
 
     public final WidgetGuildCallOnboardingBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        JoinVoiceChannelButton joinVoiceChannelButton = (JoinVoiceChannelButton) view.findViewById(2131363344);
+        JoinVoiceChannelButton joinVoiceChannelButton = (JoinVoiceChannelButton) view.findViewById(2131363370);
         if (joinVoiceChannelButton != null) {
             return new WidgetGuildCallOnboardingBinding((LinearLayout) view, joinVoiceChannelButton);
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363344)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363370)));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$configureUI$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$configureUI$1.java
index 4d8644d498..460dab9f6a 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$configureUI$1.java
@@ -42,6 +42,6 @@ public final class WidgetGuildCallOnboardingSheet$configureUI$1 extends o implem
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo1invoke() {
-        AnimatableValueParser.o2(this.this$0, null, new AnonymousClass1(this), 1, null);
+        AnimatableValueParser.q2(this.this$0, null, new AnonymousClass1(this), 1, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
index 8cb7012112..5fa0d2b81d 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java
@@ -105,12 +105,12 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet {
                     return;
                 } else if (ordinal != 2) {
                     if (ordinal == 3) {
-                        joinVoiceChannelButton.setText(2131894039);
-                        joinVoiceChannelButton.a(joinVoiceChannelButton, 2131894039);
+                        joinVoiceChannelButton.setText(2131894139);
+                        joinVoiceChannelButton.a(joinVoiceChannelButton, 2131894139);
                         return;
                     } else if (ordinal == 4) {
                         joinVoiceChannelButton.setText(2131887505);
-                        joinVoiceChannelButton.a(joinVoiceChannelButton, 2131889872);
+                        joinVoiceChannelButton.a(joinVoiceChannelButton, 2131889880);
                         return;
                     } else {
                         return;
@@ -148,7 +148,7 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559027;
+        return 2131559031;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java
index 4375e82531..0254fe7250 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheetViewModel.java
@@ -272,10 +272,10 @@ public final class WidgetGuildCallOnboardingSheetViewModel extends AppViewModel<
         this.channelsStore = storeChannels;
         this.guildsStore = storeGuilds;
         this.voiceStatesStore = storeVoiceStates;
-        this.eventSubject = PublishSubject.l0();
-        Observable<StoreState> s2 = observeStoreState().s();
-        m.checkNotNullExpressionValue(s2, "observeStoreState()\n    …  .distinctUntilChanged()");
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetGuildCallOnboardingSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
+        this.eventSubject = PublishSubject.k0();
+        Observable<StoreState> r = observeStoreState().r();
+        m.checkNotNullExpressionValue(r, "observeStoreState()\n    …  .distinctUntilChanged()");
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(r), this, null, 2, null), WidgetGuildCallOnboardingSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -293,9 +293,9 @@ public final class WidgetGuildCallOnboardingSheetViewModel extends AppViewModel<
     }
 
     private final Observable<StoreState> observeStoreState() {
-        Observable<StoreState> G = VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.channelId, this.channelsStore, this.guildsStore, this.permissionsStore, this.voiceStatesStore, null, null, 96, null).G(WidgetGuildCallOnboardingSheetViewModel$observeStoreState$1.INSTANCE);
-        m.checkNotNullExpressionValue(G, "VoiceChannelJoinabilityU…StoreState(joinability) }");
-        return G;
+        Observable<StoreState> F = VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.channelId, this.channelsStore, this.guildsStore, this.permissionsStore, this.voiceStatesStore, null, null, 96, null).F(WidgetGuildCallOnboardingSheetViewModel$observeStoreState$1.INSTANCE);
+        m.checkNotNullExpressionValue(F, "VoiceChannelJoinabilityU…StoreState(joinability) }");
+        return F;
     }
 
     public final Observable<Event> observeEvents() {
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java
index cb10538504..bd319164ee 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java
@@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetStartCallSheet$binding$2 extends k impl
 
     public final WidgetStartCallSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365038;
-        TextView textView = (TextView) view.findViewById(2131365038);
+        int i = 2131365088;
+        TextView textView = (TextView) view.findViewById(2131365088);
         if (textView != null) {
-            i = 2131365039;
-            TextView textView2 = (TextView) view.findViewById(2131365039);
+            i = 2131365089;
+            TextView textView2 = (TextView) view.findViewById(2131365089);
             if (textView2 != null) {
                 return new WidgetStartCallSheetBinding((LinearLayout) view, textView, textView2);
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
index 58294ee333..954f2941f2 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java
@@ -67,7 +67,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559234;
+        return 2131559241;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment
@@ -85,7 +85,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet {
         m.checkNotNullParameter(view, "view");
         super.onViewCreated(view, bundle);
         long j = getArgumentsOrDefault().getLong("ARG_VOICE_CHANNEL_ID");
-        getBinding().f1959c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j));
+        getBinding().f1962c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j));
         getBinding().b.setOnClickListener(new WidgetStartCallSheet$onViewCreated$2(this, j));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java
index d6f8cd277e..be9848b0d9 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridAdapter.java
@@ -7,7 +7,7 @@ import androidx.core.view.DisplayCutoutCompat;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import c.a.i.m1;
+import c.a.i.o1;
 import c.d.b.a.a;
 import com.discord.views.calls.VideoCallParticipantView;
 import d0.t.n;
@@ -207,7 +207,7 @@ public final class VideoCallGridAdapter extends RecyclerView.Adapter<VideoCallGr
         View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558714, viewGroup, false);
         Objects.requireNonNull(inflate, "rootView");
         VideoCallParticipantView videoCallParticipantView = (VideoCallParticipantView) inflate;
-        m.checkNotNullExpressionValue(new m1(videoCallParticipantView), "VideoCallGridItemBinding…parent, false\n          )");
+        m.checkNotNullExpressionValue(new o1(videoCallParticipantView), "VideoCallGridItemBinding…parent, false\n          )");
         m.checkNotNullExpressionValue(videoCallParticipantView, "VideoCallGridItemBinding…t, false\n          ).root");
         return new VideoCallGridViewHolder(videoCallParticipantView);
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java
index 9dab28cc48..8fff63a93d 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/grid/VideoCallGridViewHolder.java
@@ -47,7 +47,7 @@ public final class VideoCallGridViewHolder extends RecyclerView.ViewHolder {
         Objects.requireNonNull(videoCallParticipantView);
         m.checkNotNullParameter(function2, "onShown");
         m.checkNotNullParameter(function22, "onClicked");
-        videoCallParticipantView.f2117x = function2;
+        videoCallParticipantView.f2124x = function2;
         videoCallParticipantView.w = function22;
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java
index ace93d87ad..381616002b 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java
@@ -17,10 +17,10 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public AudienceHeaderViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559223, stageCallAdapter, null);
+        super(2131559230, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
-        TextView textView = (TextView) view.findViewById(2131364978);
+        TextView textView = (TextView) view.findViewById(2131365028);
         if (textView != null) {
             WidgetStageChannelAudienceRoleBinding widgetStageChannelAudienceRoleBinding = new WidgetStageChannelAudienceRoleBinding((ConstraintLayout) view, textView);
             m.checkNotNullExpressionValue(widgetStageChannelAudienceRoleBinding, "WidgetStageChannelAudien…oleBinding.bind(itemView)");
@@ -31,7 +31,7 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder {
             this.numberFormatter = NumberFormat.getNumberInstance(localeManager.getPrimaryLocale(view2.getContext()));
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364978)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365028)));
     }
 
     @SuppressLint({"SetTextI18n"})
@@ -41,6 +41,6 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder {
         String format = this.numberFormatter.format(Integer.valueOf(((StageCallItem.AudienceHeaderItem) stageCallItem).getAudienceSize()));
         TextView textView = this.binding.b;
         m.checkNotNullExpressionValue(textView, "binding.stageChannelAudienceRoleText");
-        b.n(textView, 2131886741, new Object[]{format}, null, 4);
+        b.m(textView, 2131886741, new Object[]{format}, null, 4);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
index c89b7f9ea8..5a0e085426 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java
@@ -20,21 +20,21 @@ public final class AudienceViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public AudienceViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559222, stageCallAdapter, null);
+        super(2131559229, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
         ConstraintLayout constraintLayout = (ConstraintLayout) view;
-        int i = 2131364974;
-        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364974);
+        int i = 2131365024;
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365024);
         if (simpleDraweeView != null) {
-            i = 2131364975;
-            CutoutView cutoutView = (CutoutView) view.findViewById(2131364975);
+            i = 2131365025;
+            CutoutView cutoutView = (CutoutView) view.findViewById(2131365025);
             if (cutoutView != null) {
-                i = 2131364976;
-                TextView textView = (TextView) view.findViewById(2131364976);
+                i = 2131365026;
+                TextView textView = (TextView) view.findViewById(2131365026);
                 if (textView != null) {
-                    i = 2131364977;
-                    ImageView imageView = (ImageView) view.findViewById(2131364977);
+                    i = 2131365027;
+                    ImageView imageView = (ImageView) view.findViewById(2131365027);
                     if (imageView != null) {
                         WidgetStageChannelAudienceBinding widgetStageChannelAudienceBinding = new WidgetStageChannelAudienceBinding((ConstraintLayout) view, constraintLayout, simpleDraweeView, cutoutView, textView, imageView);
                         m.checkNotNullExpressionValue(widgetStageChannelAudienceBinding, "WidgetStageChannelAudienceBinding.bind(itemView)");
@@ -52,7 +52,7 @@ public final class AudienceViewHolder extends StageCallViewHolder {
         m.checkNotNullParameter(stageCallItem, "data");
         super.onConfigure(i, (int) stageCallItem);
         StageCallItem.AudienceItem audienceItem = (StageCallItem.AudienceItem) stageCallItem;
-        this.binding.f1951c.setCutoutEnabled(audienceItem.getVoiceUser().isRequestingToSpeak());
+        this.binding.f1954c.setCutoutEnabled(audienceItem.getVoiceUser().isRequestingToSpeak());
         ImageView imageView = this.binding.e;
         imageView.setVisibility(audienceItem.getVoiceUser().isRequestingToSpeak() ? 0 : 8);
         imageView.setActivated(audienceItem.getVoiceUser().isInvitedToSpeak());
@@ -60,7 +60,7 @@ public final class AudienceViewHolder extends StageCallViewHolder {
         textView.setText(audienceItem.getVoiceUser().getDisplayName());
         Drawable drawable2 = null;
         if (audienceItem.isBlocked()) {
-            drawable = ContextCompat.getDrawable(textView.getContext(), 2131231438);
+            drawable = ContextCompat.getDrawable(textView.getContext(), 2131231444);
             if (drawable != null) {
                 drawable.setTint(ContextCompat.getColor(textView.getContext(), 2131100324));
             }
@@ -68,7 +68,7 @@ public final class AudienceViewHolder extends StageCallViewHolder {
             drawable = null;
         }
         if (audienceItem.getVoiceUser().isBooster()) {
-            drawable2 = ContextCompat.getDrawable(textView.getContext(), 2131231441);
+            drawable2 = ContextCompat.getDrawable(textView.getContext(), 2131231447);
         }
         DrawableCompat.setCompoundDrawablesCompat$default(textView, drawable, (Drawable) null, drawable2, (Drawable) null, 10, (Object) null);
         User user = audienceItem.getVoiceUser().getUser();
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
index 9e0905aa5e..e7467174c7 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java
@@ -19,44 +19,44 @@ public final class DetailsViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public DetailsViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559224, stageCallAdapter, null);
+        super(2131559231, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
-        int i = 2131364374;
-        ImageView imageView = (ImageView) view.findViewById(2131364374);
+        int i = 2131364412;
+        ImageView imageView = (ImageView) view.findViewById(2131364412);
         if (imageView != null) {
-            i = 2131364375;
-            ImageView imageView2 = (ImageView) view.findViewById(2131364375);
+            i = 2131364413;
+            ImageView imageView2 = (ImageView) view.findViewById(2131364413);
             if (imageView2 != null) {
-                i = 2131364381;
-                TextView textView = (TextView) view.findViewById(2131364381);
+                i = 2131364419;
+                TextView textView = (TextView) view.findViewById(2131364419);
                 if (textView != null) {
-                    i = 2131365628;
-                    TextView textView2 = (TextView) view.findViewById(2131365628);
+                    i = 2131365689;
+                    TextView textView2 = (TextView) view.findViewById(2131365689);
                     if (textView2 != null) {
-                        i = 2131365629;
-                        ImageView imageView3 = (ImageView) view.findViewById(2131365629);
+                        i = 2131365690;
+                        ImageView imageView3 = (ImageView) view.findViewById(2131365690);
                         if (imageView3 != null) {
-                            i = 2131365630;
-                            ImageView imageView4 = (ImageView) view.findViewById(2131365630);
+                            i = 2131365691;
+                            ImageView imageView4 = (ImageView) view.findViewById(2131365691);
                             if (imageView4 != null) {
-                                i = 2131365631;
-                                TextView textView3 = (TextView) view.findViewById(2131365631);
+                                i = 2131365692;
+                                TextView textView3 = (TextView) view.findViewById(2131365692);
                                 if (textView3 != null) {
-                                    i = 2131365632;
-                                    ImageView imageView5 = (ImageView) view.findViewById(2131365632);
+                                    i = 2131365693;
+                                    ImageView imageView5 = (ImageView) view.findViewById(2131365693);
                                     if (imageView5 != null) {
-                                        i = 2131365633;
-                                        TextView textView4 = (TextView) view.findViewById(2131365633);
+                                        i = 2131365694;
+                                        TextView textView4 = (TextView) view.findViewById(2131365694);
                                         if (textView4 != null) {
-                                            i = 2131365634;
-                                            TextView textView5 = (TextView) view.findViewById(2131365634);
+                                            i = 2131365695;
+                                            TextView textView5 = (TextView) view.findViewById(2131365695);
                                             if (textView5 != null) {
-                                                i = 2131365635;
-                                                ImageView imageView6 = (ImageView) view.findViewById(2131365635);
+                                                i = 2131365696;
+                                                ImageView imageView6 = (ImageView) view.findViewById(2131365696);
                                                 if (imageView6 != null) {
-                                                    i = 2131365636;
-                                                    TextView textView6 = (TextView) view.findViewById(2131365636);
+                                                    i = 2131365697;
+                                                    TextView textView6 = (TextView) view.findViewById(2131365697);
                                                     if (textView6 != null) {
                                                         WidgetStageChannelDetailsBinding widgetStageChannelDetailsBinding = new WidgetStageChannelDetailsBinding((ConstraintLayout) view, imageView, imageView2, textView, textView2, imageView3, imageView4, textView3, imageView5, textView4, textView5, imageView6, textView6);
                                                         m.checkNotNullExpressionValue(widgetStageChannelDetailsBinding, "WidgetStageChannelDetailsBinding.bind(itemView)");
@@ -128,7 +128,7 @@ public final class DetailsViewHolder extends StageCallViewHolder {
         ImageView imageView4 = this.binding.b;
         m.checkNotNullExpressionValue(imageView4, "binding.publicDot");
         imageView4.setVisibility(detailsItem.isPublic() ? 0 : 8);
-        ImageView imageView5 = this.binding.f1952c;
+        ImageView imageView5 = this.binding.f1955c;
         m.checkNotNullExpressionValue(imageView5, "binding.publicIcon");
         imageView5.setVisibility(detailsItem.isPublic() ? 0 : 8);
         TextView textView9 = this.binding.d;
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java
index 8ca7d93989..a8b9184df4 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java
@@ -5,7 +5,7 @@ import d0.z.d.m;
 public final class DividerViewHolder extends StageCallViewHolder {
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public DividerViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559225, stageCallAdapter, null);
+        super(2131559232, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
index 9b5fceba74..a2f65fc6bf 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java
@@ -31,17 +31,17 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public SpeakerViewHolder(StageCallAdapter stageCallAdapter) {
-        super(2131559228, stageCallAdapter, null);
+        super(2131559235, stageCallAdapter, null);
         m.checkNotNullParameter(stageCallAdapter, "adapter");
         View view = this.itemView;
-        StageCallSpeakerView stageCallSpeakerView = (StageCallSpeakerView) view.findViewById(2131364992);
+        StageCallSpeakerView stageCallSpeakerView = (StageCallSpeakerView) view.findViewById(2131365042);
         if (stageCallSpeakerView != null) {
             WidgetStageChannelSpeakerBinding widgetStageChannelSpeakerBinding = new WidgetStageChannelSpeakerBinding((ConstraintLayout) view, stageCallSpeakerView);
             m.checkNotNullExpressionValue(widgetStageChannelSpeakerBinding, "WidgetStageChannelSpeakerBinding.bind(itemView)");
             this.binding = widgetStageChannelSpeakerBinding;
             return;
         }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364992)));
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365042)));
     }
 
     public void onConfigure(int i, StageCallItem stageCallItem) {
@@ -81,7 +81,7 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
         TextView textView = stageCallSpeakerView2.i.g;
         m.checkNotNullExpressionValue(textView, "binding.stageChannelSpeakerName");
         textView.setText(voiceUser.getDisplayName());
-        ImageView imageView4 = stageCallSpeakerView2.i.f105c;
+        ImageView imageView4 = stageCallSpeakerView2.i.f121c;
         m.checkNotNullExpressionValue(imageView4, "binding.stageChannelSpeakerBlocked");
         if (!isBlocked) {
             i2 = 8;
@@ -91,10 +91,10 @@ public final class SpeakerViewHolder extends StageCallViewHolder {
         if (subscription != null) {
             subscription.unsubscribe();
         }
-        Observable<R> G = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(Long.valueOf(voiceUser.getUser().getId())).y(ObservableExtensionsKt$filterNull$1.INSTANCE).G(ObservableExtensionsKt$filterNull$2.INSTANCE);
-        m.checkNotNullExpressionValue(G, "filter { it != null }.map { it!! }");
-        Observable a02 = G.a0(1);
-        m.checkNotNullExpressionValue(a02, "UserRepresentativeColors…erNull()\n        .take(1)");
-        ObservableExtensionsKt.appSubscribe$default(a02, StageCallSpeakerView.class, (Context) null, new h(stageCallSpeakerView2), (Function1) null, (Function0) null, (Function0) null, new i(stageCallSpeakerView2), 58, (Object) null);
+        Observable<R> F = RepresentativeColorsKt.getUserRepresentativeColors().observeRepresentativeColor(Long.valueOf(voiceUser.getUser().getId())).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE);
+        m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }");
+        Observable Z = F.Z(1);
+        m.checkNotNullExpressionValue(Z, "UserRepresentativeColors…erNull()\n        .take(1)");
+        ObservableExtensionsKt.appSubscribe$default(Z, StageCallSpeakerView.class, (Context) null, new h(stageCallSpeakerView2), (Function1) null, (Function0) null, (Function0) null, new i(stageCallSpeakerView2), 58, (Object) null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallAdapter.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallAdapter.java
index fc49a738e8..fb1521e4e4 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallAdapter.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallAdapter.java
@@ -56,7 +56,7 @@ public final class StageCallAdapter extends MGRecyclerAdapterSimple<StageCallIte
     }
 
     private final void openWidgetUserSheet(long j, Channel channel) {
-        WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, j, Long.valueOf(channel.g()), this.fragmentManager, Long.valueOf(channel.e()), Boolean.TRUE, null, null, 96, null);
+        WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, j, Long.valueOf(channel.h()), this.fragmentManager, Long.valueOf(channel.f()), Boolean.TRUE, null, null, 96, null);
     }
 
     public final RecyclerView.ItemDecoration getItemDecoration() {
diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallBottomSheetManager.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallBottomSheetManager.java
index 63c006a419..68cda13544 100644
--- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallBottomSheetManager.java
+++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/StageCallBottomSheetManager.java
@@ -23,20 +23,20 @@ public final class StageCallBottomSheetManager {
         Map map = (Map) a.c(channel, companion.getVoiceStates().get());
         boolean z3 = false;
         if (map != null) {
-            StageRoles r4 = companion.getStageChannels().m10getMyRolesvisDeB4(channel.g());
+            StageRoles r4 = companion.getStageChannels().m10getMyRolesvisDeB4(channel.h());
             long id2 = companion.getUsers().getMe().getId();
-            if (AnimatableValueParser.u1(channel) && r4 != null && map.containsKey(Long.valueOf(id2))) {
-                if (StageRoles.m25isModeratorimpl(r4.m28unboximpl()) && companion.getStageInstances().getStageInstanceForChannel(channel.g()) == null) {
+            if (AnimatableValueParser.v1(channel) && r4 != null && map.containsKey(Long.valueOf(id2))) {
+                if (StageRoles.m25isModeratorimpl(r4.m28unboximpl()) && companion.getStageInstances().getStageInstanceForChannel(channel.h()) == null) {
                     z3 = true;
                 }
                 if (StageRoles.m23isAudienceimpl(r4.m28unboximpl())) {
-                    WidgetStageAudienceNoticeBottomSheet.Companion.show(fragmentManager, channel.g());
+                    WidgetStageAudienceNoticeBottomSheet.Companion.show(fragmentManager, channel.h());
                 } else if (z3 && !z2) {
-                    WidgetStageStartEventBottomSheet.Companion.show(fragmentManager, channel.g());
+                    WidgetStageStartEventBottomSheet.Companion.show(fragmentManager, channel.h());
                 } else if (z3 && z2) {
-                    WidgetStageSettings.Companion.launch$default(WidgetStageSettings.Companion, context, channel.g(), null, 4, null);
+                    WidgetStageSettings.Companion.launch$default(WidgetStageSettings.Companion, context, channel.h(), null, 4, null);
                 } else if (StageRoles.m25isModeratorimpl(r4.m28unboximpl()) && !StageRoles.m26isSpeakerimpl(r4.m28unboximpl())) {
-                    WidgetStageModeratorJoinBottomSheet.Companion.show(fragmentManager, channel.g());
+                    WidgetStageModeratorJoinBottomSheet.Companion.show(fragmentManager, channel.h());
                 }
                 return true;
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java
index 8365fcae5c..2575e6ff3e 100644
--- a/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/model/CallModel$Companion$get$1.java
@@ -62,7 +62,7 @@ public final class CallModel$Companion$get$1<T, R> implements b<Channel, Observa
             Map<Long, StoreVoiceParticipants.VoiceUser> voiceParticipants = chunk.getVoiceParticipants();
             Long channelPermissions = chunk.getChannelPermissions();
             List<VideoInputDeviceDescription> videoDevices = chunk.getVideoDevices();
-            boolean z2 = l != null && this.$channel.g() == l.longValue();
+            boolean z2 = l != null && this.$channel.h() == l.longValue();
             VideoInputDeviceDescription selectedVideoDevice = chunk.getSelectedVideoDevice();
             m.checkNotNullExpressionValue(num, "callFeedbackSampleRateDenominator");
             int intValue = num.intValue();
@@ -84,6 +84,6 @@ public final class CallModel$Companion$get$1<T, R> implements b<Channel, Observa
         }
         Observable access$observeChunk = CallModel.Companion.access$observeChunk(CallModel.Companion, channel);
         StoreStream.Companion companion = StoreStream.Companion;
-        return Observable.d(access$observeChunk, companion.getApplicationStreaming().observeActiveStream(), companion.getRtcConnection().observeRtcConnectionMetadata(), companion.getExperiments().observeUserExperiment("2019-12_android_call_feedback_sheet_sample_rate_denominator", true).G(AnonymousClass1.INSTANCE), companion.getExperiments().observeUserExperiment("2020-09_stream_feedback_sheet_sample_rate_denominator", true).G(AnonymousClass2.INSTANCE), VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.$channelId, null, null, null, null, null, null, 126, null), companion.getGuilds().observeFromChannelId(this.$channelId), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), new AnonymousClass3(channel));
+        return Observable.d(access$observeChunk, companion.getApplicationStreaming().observeActiveStream(), companion.getRtcConnection().observeRtcConnectionMetadata(), companion.getExperiments().observeUserExperiment("2019-12_android_call_feedback_sheet_sample_rate_denominator", true).F(AnonymousClass1.INSTANCE), companion.getExperiments().observeUserExperiment("2020-09_stream_feedback_sheet_sample_rate_denominator", true).F(AnonymousClass2.INSTANCE), VoiceChannelJoinabilityUtils.observeJoinability$default(VoiceChannelJoinabilityUtils.INSTANCE, this.$channelId, null, null, null, null, null, null, 126, null), companion.getGuilds().observeFromChannelId(this.$channelId), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), new AnonymousClass3(channel));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
index 0a1cbcbc02..51fdc36d03 100644
--- a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java
@@ -265,15 +265,15 @@ public final class CallModel {
 
         private final Observable<Chunk> observeChunk(Channel channel) {
             StoreStream.Companion companion = StoreStream.Companion;
-            Observable<Chunk> c2 = Observable.c(companion.getUsers().observeMeId(), companion.getVoiceChannelSelected().observeTimeSelectedMs(), companion.getMediaSettings().getVoiceConfiguration(), companion.getAudioDevices().observeAudioDevicesState(), ObservableExtensionsKt.leadingEdgeThrottle(companion.getVoiceParticipants().get(channel.g()), 250, TimeUnit.MILLISECONDS), companion.getPermissions().observePermissionsForChannel(channel.g()), companion.getMediaEngine().getVideoInputDevices(), companion.getMediaEngine().getSelectedVideoInputDevice(), companion.getAudioManagerV2().observeAudioManagerState(), new CallModel$Companion$observeChunk$1(channel));
+            Observable<Chunk> c2 = Observable.c(companion.getUsers().observeMeId(), companion.getVoiceChannelSelected().observeTimeSelectedMs(), companion.getMediaSettings().getVoiceConfiguration(), companion.getAudioDevices().observeAudioDevicesState(), ObservableExtensionsKt.leadingEdgeThrottle(companion.getVoiceParticipants().get(channel.h()), 250, TimeUnit.MILLISECONDS), companion.getPermissions().observePermissionsForChannel(channel.h()), companion.getMediaEngine().getVideoInputDevices(), companion.getMediaEngine().getSelectedVideoInputDevice(), companion.getAudioManagerV2().observeAudioManagerState(), new CallModel$Companion$observeChunk$1(channel));
             m.checkNotNullExpressionValue(c2, "Observable\n          .co…            )\n          }");
             return c2;
         }
 
         public final Observable<CallModel> get(long j) {
-            Observable<R> Z = StoreStream.Companion.getChannels().observeChannel(j).Z(new CallModel$Companion$get$1(j));
-            m.checkNotNullExpressionValue(Z, "StoreStream\n          .g…            }\n          }");
-            return Z;
+            Observable<R> Y = StoreStream.Companion.getChannels().observeChannel(j).Y(new CallModel$Companion$get$1(j));
+            m.checkNotNullExpressionValue(Y, "StoreStream\n          .g…            }\n          }");
+            return Y;
         }
     }
 
@@ -361,14 +361,14 @@ public final class CallModel {
     }
 
     public final boolean canInvite() {
-        boolean r1 = AnimatableValueParser.r1(this.channel);
-        boolean z2 = AnimatableValueParser.k1(this.channel) && PermissionUtils.can(1, this.channelPermissions);
-        StageInstance stageInstanceForChannel = StoreStream.Companion.getStageInstances().getStageInstanceForChannel(this.channel.g());
-        return r1 || z2 || ((stageInstanceForChannel != null ? stageInstanceForChannel.d() : null) != null);
+        boolean s1 = AnimatableValueParser.s1(this.channel);
+        boolean z2 = AnimatableValueParser.l1(this.channel) && PermissionUtils.can(1, this.channelPermissions);
+        StageInstance stageInstanceForChannel = StoreStream.Companion.getStageInstances().getStageInstanceForChannel(this.channel.h());
+        return s1 || z2 || ((stageInstanceForChannel != null ? stageInstanceForChannel.d() : null) != null);
     }
 
     public final boolean canRequestToSpeak() {
-        return AnimatableValueParser.u1(this.channel) && PermissionUtils.can(4294967296L, this.channelPermissions);
+        return AnimatableValueParser.v1(this.channel) && PermissionUtils.can(4294967296L, this.channelPermissions);
     }
 
     public final Map<Long, StoreVoiceParticipants.VoiceUser> component1() {
@@ -485,7 +485,7 @@ public final class CallModel {
     public final StoreVoiceParticipants.VoiceUser getDmRecipient() {
         boolean z2;
         Object obj = null;
-        if (this.channel.z() != 1) {
+        if (this.channel.A() != 1) {
             return null;
         }
         Iterator<T> it = this.participants.values().iterator();
@@ -628,7 +628,7 @@ public final class CallModel {
         if (voiceUser == null || (voiceState = voiceUser.getVoiceState()) == null) {
             return false;
         }
-        return AnimatableValueParser.q1(voiceState);
+        return AnimatableValueParser.r1(voiceState);
     }
 
     public final boolean isMuted() {
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java
index 5c8c473f95..96e8f4b464 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java
@@ -21,68 +21,68 @@ public final /* synthetic */ class WidgetVoiceChannelSettings$binding$2 extends
 
     public final WidgetVoiceChannelSettingsBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131362098;
-        View findViewById = view.findViewById(2131362098);
+        int i = 2131362109;
+        View findViewById = view.findViewById(2131362109);
         if (findViewById != null) {
-            i = 2131362099;
-            SeekBar seekBar = (SeekBar) view.findViewById(2131362099);
+            i = 2131362110;
+            SeekBar seekBar = (SeekBar) view.findViewById(2131362110);
             if (seekBar != null) {
-                i = 2131362100;
-                TextView textView = (TextView) view.findViewById(2131362100);
+                i = 2131362111;
+                TextView textView = (TextView) view.findViewById(2131362111);
                 if (textView != null) {
-                    i = 2131362328;
-                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362328);
+                    i = 2131362342;
+                    TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362342);
                     if (textInputLayout != null) {
-                        i = 2131362329;
-                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362329);
+                        i = 2131362343;
+                        TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362343);
                         if (textInputLayout2 != null) {
-                            i = 2131362336;
-                            TextView textView2 = (TextView) view.findViewById(2131362336);
+                            i = 2131362350;
+                            TextView textView2 = (TextView) view.findViewById(2131362350);
                             if (textView2 != null) {
-                                i = 2131362344;
-                                TextView textView3 = (TextView) view.findViewById(2131362344);
+                                i = 2131362358;
+                                TextView textView3 = (TextView) view.findViewById(2131362358);
                                 if (textView3 != null) {
-                                    i = 2131362345;
-                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362345);
+                                    i = 2131362359;
+                                    LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362359);
                                     if (linearLayout != null) {
-                                        i = 2131362346;
-                                        TextView textView4 = (TextView) view.findViewById(2131362346);
+                                        i = 2131362360;
+                                        TextView textView4 = (TextView) view.findViewById(2131362360);
                                         if (textView4 != null) {
-                                            i = 2131362347;
-                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362347);
+                                            i = 2131362361;
+                                            FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362361);
                                             if (floatingActionButton != null) {
-                                                i = 2131362350;
-                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362350);
+                                                i = 2131362365;
+                                                LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362365);
                                                 if (linearLayout2 != null) {
-                                                    i = 2131362825;
-                                                    TextView textView5 = (TextView) view.findViewById(2131362825);
+                                                    i = 2131362850;
+                                                    TextView textView5 = (TextView) view.findViewById(2131362850);
                                                     if (textView5 != null) {
-                                                        i = 2131362826;
-                                                        TextView textView6 = (TextView) view.findViewById(2131362826);
+                                                        i = 2131362851;
+                                                        TextView textView6 = (TextView) view.findViewById(2131362851);
                                                         if (textView6 != null) {
-                                                            i = 2131364402;
-                                                            View findViewById2 = view.findViewById(2131364402);
+                                                            i = 2131364440;
+                                                            View findViewById2 = view.findViewById(2131364440);
                                                             if (findViewById2 != null) {
-                                                                i = 2131364807;
-                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364807);
+                                                                i = 2131364856;
+                                                                LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364856);
                                                                 if (linearLayout3 != null) {
-                                                                    i = 2131364808;
-                                                                    TextView textView7 = (TextView) view.findViewById(2131364808);
+                                                                    i = 2131364857;
+                                                                    TextView textView7 = (TextView) view.findViewById(2131364857);
                                                                     if (textView7 != null) {
-                                                                        i = 2131364894;
-                                                                        LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364894);
+                                                                        i = 2131364944;
+                                                                        LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364944);
                                                                         if (linearLayout4 != null) {
-                                                                            i = 2131364895;
-                                                                            TextView textView8 = (TextView) view.findViewById(2131364895);
+                                                                            i = 2131364945;
+                                                                            TextView textView8 = (TextView) view.findViewById(2131364945);
                                                                             if (textView8 != null) {
-                                                                                i = 2131365369;
-                                                                                View findViewById3 = view.findViewById(2131365369);
+                                                                                i = 2131365429;
+                                                                                View findViewById3 = view.findViewById(2131365429);
                                                                                 if (findViewById3 != null) {
-                                                                                    i = 2131365370;
-                                                                                    SeekBar seekBar2 = (SeekBar) view.findViewById(2131365370);
+                                                                                    i = 2131365430;
+                                                                                    SeekBar seekBar2 = (SeekBar) view.findViewById(2131365430);
                                                                                     if (seekBar2 != null) {
-                                                                                        i = 2131365371;
-                                                                                        TextView textView9 = (TextView) view.findViewById(2131365371);
+                                                                                        i = 2131365431;
+                                                                                        TextView textView9 = (TextView) view.findViewById(2131365431);
                                                                                         if (textView9 != null) {
                                                                                             return new WidgetVoiceChannelSettingsBinding((CoordinatorLayout) view, findViewById, seekBar, textView, textInputLayout, textInputLayout2, textView2, textView3, linearLayout, textView4, floatingActionButton, linearLayout2, textView5, textView6, findViewById2, linearLayout3, textView7, linearLayout4, textView8, findViewById3, seekBar2, textView9);
                                                                                         }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java
index f577a5d8d7..38a46f2a42 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java
@@ -17,7 +17,7 @@ public final class WidgetVoiceChannelSettings$configureUI$1<T1, T2> implements A
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
-        if (menuItem.getItemId() == 2131363868) {
+        if (menuItem.getItemId() == 2131363909) {
             WidgetVoiceChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel());
         }
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.java
index 2b70f20391..1eec64047e 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$5.java
@@ -15,6 +15,6 @@ public final class WidgetVoiceChannelSettings$configureUI$5 implements View.OnCl
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        WidgetChannelSettingsPermissionsOverview.Companion.launch(this.this$0.requireContext(), this.$this_configureUI.getChannel().g());
+        WidgetChannelSettingsPermissionsOverview.Companion.launch(this.this$0.requireContext(), this.$this_configureUI.getChannel().h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java
index cc9f5476df..681cd2de50 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java
@@ -22,21 +22,21 @@ public final class WidgetVoiceChannelSettings$configureUI$6 implements View.OnCl
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetVoiceChannelSettings widgetVoiceChannelSettings = this.this$0;
-        long g = this.$this_configureUI.getChannel().g();
+        long h = this.$this_configureUI.getChannel().h();
         StatefulViews access$getState$p = WidgetVoiceChannelSettings.access$getState$p(this.this$0);
-        TextInputLayout textInputLayout = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2002c;
+        TextInputLayout textInputLayout = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2007c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         String str = (String) access$getState$p.get(textInputLayout.getId(), AnimatableValueParser.y0(this.$this_configureUI.getChannel()));
         StatefulViews access$getState$p2 = WidgetVoiceChannelSettings.access$getState$p(this.this$0);
         TextInputLayout textInputLayout2 = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).d;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditTopic");
         int id2 = textInputLayout2.getId();
-        String y2 = this.$this_configureUI.getChannel().y();
-        if (y2 == null) {
-            y2 = "";
+        String z2 = this.$this_configureUI.getChannel().z();
+        if (z2 == null) {
+            z2 = "";
         }
-        String str2 = (String) access$getState$p2.get(id2, y2);
-        int z2 = this.$this_configureUI.getChannel().z();
+        String str2 = (String) access$getState$p2.get(id2, z2);
+        int A = this.$this_configureUI.getChannel().A();
         SeekBar seekBar = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).r;
         m.checkNotNullExpressionValue(seekBar, "binding.userLimitSeekbar");
         int progress = seekBar.getProgress();
@@ -46,6 +46,6 @@ public final class WidgetVoiceChannelSettings$configureUI$6 implements View.OnCl
         StatefulViews access$getState$p3 = WidgetVoiceChannelSettings.access$getState$p(this.this$0);
         TextView textView = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsRegionOverride");
-        WidgetVoiceChannelSettings.access$saveChannel(widgetVoiceChannelSettings, g, str, z2, str2, progress, (Bitrate.MIN.getKbps() + progress2) * 1000, (String) access$getState$p3.get(textView.getId(), this.$this_configureUI.getChannel().w()));
+        WidgetVoiceChannelSettings.access$saveChannel(widgetVoiceChannelSettings, h, str, A, str2, progress, (Bitrate.MIN.getKbps() + progress2) * 1000, (String) access$getState$p3.get(textView.getId(), this.$this_configureUI.getChannel().x()));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.java
index 39b06dbfb3..820c91c181 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$confirmDelete$2.java
@@ -51,7 +51,7 @@ public final class WidgetVoiceChannelSettings$confirmDelete$2 implements View.On
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteChannel(this.$channel.g()), false, 1, null), this.this$0, null, 2, null);
+        Observable ui$default = ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteChannel(this.$channel.h()), false, 1, null), this.this$0, null, 2, null);
         m.checkNotNullExpressionValue(view, "v");
         ObservableExtensionsKt.appSubscribe$default(ui$default, view.getContext(), "javaClass", (Function1) null, new AnonymousClass2(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null);
     }
diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
index ffb43f56af..6c95cbb19b 100644
--- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
+++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java
@@ -16,7 +16,7 @@ import androidx.fragment.app.FragmentManager;
 import c.a.a.m;
 import c.a.d.l;
 import c.a.d.q;
-import c.a.i.c4;
+import c.a.i.f4;
 import c.d.b.a.a;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.discord.api.channel.Channel;
@@ -61,7 +61,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_EXTRA_CHANNEL_ID = "INTENT_EXTRA_CHANNEL_ID";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetVoiceChannelSettings$binding$2.INSTANCE, null, 2, null);
-    private final StatefulViews state = new StatefulViews(2131362328, 2131362329, 2131362826, 2131362825, 2131362344);
+    private final StatefulViews state = new StatefulViews(2131362342, 2131362343, 2131362851, 2131362850, 2131362358);
 
     /* compiled from: WidgetVoiceChannelSettings.kt */
     public static final class Companion {
@@ -108,9 +108,9 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
                 StorePermissions permissions = companion.getPermissions();
                 StoreGuildVoiceRegions guildVoiceRegions = companion.getGuildVoiceRegions();
                 StoreExperiments experiments = companion.getExperiments();
-                Observable<Model> s2 = ObservableExtensionsKt.computationLatest(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels, guilds, StoreUser.Companion.getMeUpdate(), permissions, guildVoiceRegions, experiments}, false, null, null, new WidgetVoiceChannelSettings$Model$Companion$get$1(channels, j, guilds, permissions, users, guildVoiceRegions, experiments), 14, null)).s();
-                m.checkNotNullExpressionValue(s2, "ObservationDeckProvider.…  .distinctUntilChanged()");
-                return s2;
+                Observable<Model> r = ObservableExtensionsKt.computationLatest(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{channels, guilds, StoreUser.Companion.getMeUpdate(), permissions, guildVoiceRegions, experiments}, false, null, null, new WidgetVoiceChannelSettings$Model$Companion$get$1(channels, j, guilds, permissions, users, guildVoiceRegions, experiments), 14, null)).r();
+                m.checkNotNullExpressionValue(r, "ObservationDeckProvider.…  .distinctUntilChanged()");
+                return r;
             }
         }
 
@@ -257,7 +257,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
     }
 
     public WidgetVoiceChannelSettings() {
-        super(2131559280);
+        super(2131559289);
     }
 
     public static final /* synthetic */ void access$configureUI(WidgetVoiceChannelSettings widgetVoiceChannelSettings, Model model) {
@@ -331,15 +331,15 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         StatefulViews statefulViews = this.state;
         TextView textView2 = getBinding().l;
         m.checkNotNullExpressionValue(textView2, "binding.currentUserLimitDisplay");
-        textView.setText((CharSequence) statefulViews.get(textView2.getId(), getUserLimitDisplayString(model.getChannel().A())));
+        textView.setText((CharSequence) statefulViews.get(textView2.getId(), getUserLimitDisplayString(model.getChannel().B())));
         TextView textView3 = getBinding().p;
         m.checkNotNullExpressionValue(textView3, "binding.settingsUserLimitHelp");
-        c.a.l.b.n(textView3, 2131888600, new Object[0], null, 4);
+        c.a.l.b.m(textView3, 2131888601, new Object[0], null, 4);
         SeekBar seekBar = getBinding().r;
         m.checkNotNullExpressionValue(seekBar, "binding.userLimitSeekbar");
-        seekBar.setProgress(model.getChannel().A());
+        seekBar.setProgress(model.getChannel().B());
         getBinding().r.setOnSeekBarChangeListener(new WidgetVoiceChannelSettings$configureUI$2(this));
-        configureUserLimitVisibility(model.getChannel().z() == 2);
+        configureUserLimitVisibility(model.getChannel().A() == 2);
         int c2 = model.getChannel().c() / 1000;
         TextView textView4 = getBinding().k;
         m.checkNotNullExpressionValue(textView4, "binding.currentBitrateDisplay");
@@ -349,7 +349,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         textView4.setText((CharSequence) statefulViews2.get(textView5.getId(), getBitrateDisplayString(c2)));
         TextView textView6 = getBinding().n;
         m.checkNotNullExpressionValue(textView6, "binding.settingsBitrateHelp");
-        c.a.l.b.n(textView6, 2131888570, new Object[]{"64"}, null, 4);
+        c.a.l.b.m(textView6, 2131888571, new Object[]{"64"}, null, 4);
         SeekBar seekBar2 = getBinding().b;
         m.checkNotNullExpressionValue(seekBar2, "binding.bitrateSeekbar");
         int maxBitrate = model.getMaxBitrate();
@@ -362,7 +362,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         StatefulViews statefulViews3 = this.state;
         TextView textView7 = getBinding().f;
         m.checkNotNullExpressionValue(textView7, "binding.channelSettingsRegionOverride");
-        String str2 = (String) statefulViews3.get(textView7.getId(), model.getChannel().w());
+        String str2 = (String) statefulViews3.get(textView7.getId(), model.getChannel().x());
         Iterator<T> it = model.getRegions().iterator();
         while (true) {
             if (!it.hasNext()) {
@@ -384,16 +384,16 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         textView8.setText(str);
         TextView textView9 = getBinding().h;
         m.checkNotNullExpressionValue(textView9, "binding.channelSettingsRegionOverrideHelp");
-        c.a.l.b.n(textView9, 2131888590, new Object[0], null, 4);
+        c.a.l.b.m(textView9, 2131888591, new Object[0], null, 4);
         getBinding().g.setOnClickListener(new WidgetVoiceChannelSettings$configureUI$4(this, model));
         if (!model.getCanManageChannel() || !model.getShouldShowRtcRegionOption()) {
             z2 = false;
         }
         configureRegionOverrideVisibility(z2);
-        TextInputLayout textInputLayout = getBinding().f2002c;
+        TextInputLayout textInputLayout = getBinding().f2007c;
         m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName");
         StatefulViews statefulViews4 = this.state;
-        TextInputLayout textInputLayout2 = getBinding().f2002c;
+        TextInputLayout textInputLayout2 = getBinding().f2007c;
         m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews4.get(textInputLayout2.getId(), AnimatableValueParser.y0(model.getChannel())));
         TextInputLayout textInputLayout3 = getBinding().d;
@@ -405,11 +405,11 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         TextInputLayout textInputLayout5 = getBinding().d;
         m.checkNotNullExpressionValue(textInputLayout5, "binding.channelSettingsEditTopic");
         int id2 = textInputLayout5.getId();
-        String y2 = model.getChannel().y();
-        if (y2 == null) {
-            y2 = "";
+        String z3 = model.getChannel().z();
+        if (z3 == null) {
+            z3 = "";
         }
-        ViewExtensions.setText(textInputLayout4, (CharSequence) statefulViews5.get(id2, y2));
+        ViewExtensions.setText(textInputLayout4, (CharSequence) statefulViews5.get(id2, z3));
         LinearLayout linearLayout = getBinding().j;
         m.checkNotNullExpressionValue(linearLayout, "binding.channelSettingsSectionUserManagement");
         if (!model.getCanManagePermissions()) {
@@ -426,7 +426,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         m.checkNotNullExpressionValue(view, "binding.userLimitDivider");
         int i = 0;
         view.setVisibility(z2 ? 0 : 8);
-        TextView textView = getBinding().f2003s;
+        TextView textView = getBinding().f2008s;
         m.checkNotNullExpressionValue(textView, "binding.userLimitTitle");
         textView.setVisibility(z2 ? 0 : 8);
         LinearLayout linearLayout = getBinding().o;
@@ -441,13 +441,13 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
     }
 
     private final void confirmDelete(Channel channel) {
-        c4 a = c4.a(LayoutInflater.from(getContext()), null, false);
+        f4 a = f4.a(LayoutInflater.from(getContext()), null, false);
         m.checkNotNullExpressionValue(a, "WidgetChannelSettingsDel…om(context), null, false)");
         LinearLayout linearLayout = a.a;
         m.checkNotNullExpressionValue(linearLayout, "binding.root");
         AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(a.a).create();
         m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()");
-        a.f75c.setOnClickListener(new WidgetVoiceChannelSettings$confirmDelete$1(create));
+        a.f92c.setOnClickListener(new WidgetVoiceChannelSettings$confirmDelete$1(create));
         a.d.setOnClickListener(new WidgetVoiceChannelSettings$confirmDelete$2(this, channel));
         TextView textView = a.b;
         m.checkNotNullExpressionValue(textView, "binding.channelSettingsDeleteBody");
@@ -455,7 +455,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         m.checkNotNullExpressionValue(linearLayout2, "binding.root");
         Context context = linearLayout2.getContext();
         m.checkNotNullExpressionValue(context, "binding.root.context");
-        c.a.l.b.n(textView, 2131888061, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
+        c.a.l.b.m(textView, 2131888060, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4);
         create.show();
     }
 
@@ -471,11 +471,11 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         if (i == 0) {
             Resources resources = getResources();
             m.checkNotNullExpressionValue(resources, "resources");
-            return c.a.l.b.h(resources, 2131891425, new Object[0], null, 4);
+            return c.a.l.b.h(resources, 2131891496, new Object[0], null, 4);
         }
         Resources resources2 = getResources();
         m.checkNotNullExpressionValue(resources2, "resources");
-        return StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755231, i, Integer.valueOf(i));
+        return StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755232, i, Integer.valueOf(i));
     }
 
     public static final void launch(long j, Context context) {
@@ -490,7 +490,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         m.a aVar = c.a.a.m.j;
         FragmentManager parentFragmentManager = getParentFragmentManager();
         d0.z.d.m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
-        CharSequence j = c.a.l.b.j(this, 2131888722, new Object[0], null, 4);
+        CharSequence j = c.a.l.b.j(this, 2131888723, new Object[0], null, 4);
         List listOf = d0.t.m.listOf(c.a.l.b.j(this, 2131886797, new Object[0], null, 4));
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10));
         for (ModelVoiceRegion modelVoiceRegion : list) {
@@ -517,7 +517,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment {
         statefulViews2.addOptionalFields(textView);
         StatefulViews statefulViews3 = this.state;
         FloatingActionButton floatingActionButton = getBinding().i;
-        TextInputLayout textInputLayout2 = getBinding().f2002c;
+        TextInputLayout textInputLayout2 = getBinding().f2007c;
         d0.z.d.m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName");
         TextInputLayout textInputLayout3 = getBinding().d;
         d0.z.d.m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic");
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
index 9cf612d98d..82780796fa 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java
@@ -337,7 +337,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
     public static final class ViewHolderDivider extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderDivider(CallParticipantsAdapter callParticipantsAdapter) {
-            super(2131558830, callParticipantsAdapter);
+            super(2131558833, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
         }
     }
@@ -348,7 +348,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderHeader(CallParticipantsAdapter callParticipantsAdapter) {
-            super(2131558831, callParticipantsAdapter);
+            super(2131558834, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
             View view = this.itemView;
             Objects.requireNonNull(view, "rootView");
@@ -368,7 +368,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
                 m.checkNotNullExpressionValue(textView, "binding.voiceUserListItemHeaderLabel");
                 TextView textView2 = this.binding.b;
                 m.checkNotNullExpressionValue(textView2, "binding.voiceUserListItemHeaderLabel");
-                textView.setText(b.i(textView2, 2131889128, new Object[]{((ListItem.SpectatorsHeader) mGRecyclerDataPayload).getStreamerName()}, null, 4));
+                textView.setText(b.i(textView2, 2131889132, new Object[]{((ListItem.SpectatorsHeader) mGRecyclerDataPayload).getStreamerName()}, null, 4));
             }
         }
     }
@@ -377,7 +377,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
     public static final class ViewHolderInvite extends MGRecyclerViewHolder<CallParticipantsAdapter, MGRecyclerDataPayload> {
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderInvite(CallParticipantsAdapter callParticipantsAdapter) {
-            super(2131558832, callParticipantsAdapter);
+            super(2131558835, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
         }
 
@@ -401,36 +401,36 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public ViewHolderUser(CallParticipantsAdapter callParticipantsAdapter, boolean z2) {
-            super(2131558833, callParticipantsAdapter);
+            super(2131558836, callParticipantsAdapter);
             m.checkNotNullParameter(callParticipantsAdapter, "adapter");
             this.quantizeUserAvatar = z2;
             View view = this.itemView;
-            int i = 2131365557;
-            ImageView imageView = (ImageView) view.findViewById(2131365557);
+            int i = 2131365618;
+            ImageView imageView = (ImageView) view.findViewById(2131365618);
             if (imageView != null) {
-                i = 2131365559;
-                TextView textView = (TextView) view.findViewById(2131365559);
+                i = 2131365620;
+                TextView textView = (TextView) view.findViewById(2131365620);
                 if (textView != null) {
-                    i = 2131365560;
-                    ImageView imageView2 = (ImageView) view.findViewById(2131365560);
+                    i = 2131365621;
+                    ImageView imageView2 = (ImageView) view.findViewById(2131365621);
                     if (imageView2 != null) {
-                        i = 2131365561;
-                        ImageView imageView3 = (ImageView) view.findViewById(2131365561);
+                        i = 2131365622;
+                        ImageView imageView3 = (ImageView) view.findViewById(2131365622);
                         if (imageView3 != null) {
-                            i = 2131365562;
-                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365562);
+                            i = 2131365623;
+                            MaterialButton materialButton = (MaterialButton) view.findViewById(2131365623);
                             if (materialButton != null) {
-                                i = 2131365563;
-                                VoiceUserView voiceUserView = (VoiceUserView) view.findViewById(2131365563);
+                                i = 2131365624;
+                                VoiceUserView voiceUserView = (VoiceUserView) view.findViewById(2131365624);
                                 if (voiceUserView != null) {
-                                    i = 2131365564;
-                                    TextView textView2 = (TextView) view.findViewById(2131365564);
+                                    i = 2131365625;
+                                    TextView textView2 = (TextView) view.findViewById(2131365625);
                                     if (textView2 != null) {
-                                        i = 2131365565;
-                                        StreamPreviewView streamPreviewView = (StreamPreviewView) view.findViewById(2131365565);
+                                        i = 2131365626;
+                                        StreamPreviewView streamPreviewView = (StreamPreviewView) view.findViewById(2131365626);
                                         if (streamPreviewView != null) {
-                                            i = 2131365566;
-                                            ImageView imageView4 = (ImageView) view.findViewById(2131365566);
+                                            i = 2131365627;
+                                            ImageView imageView4 = (ImageView) view.findViewById(2131365627);
                                             if (imageView4 != null) {
                                                 VoiceUserListItemUserBinding voiceUserListItemUserBinding = new VoiceUserListItemUserBinding((LinearLayout) view, imageView, textView, imageView2, imageView3, materialButton, voiceUserView, textView2, streamPreviewView, imageView4);
                                                 m.checkNotNullExpressionValue(voiceUserListItemUserBinding, "VoiceUserListItemUserBinding.bind(itemView)");
@@ -477,11 +477,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
             if (participant.isRinging()) {
                 MaterialButton materialButton3 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton3, "binding.voiceUserListItemToggleRinging");
-                charSequence = b.i(materialButton3, 2131893587, new Object[0], null, 4);
+                charSequence = b.i(materialButton3, 2131893684, new Object[0], null, 4);
             } else {
                 MaterialButton materialButton4 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton4, "binding.voiceUserListItemToggleRinging");
-                charSequence = b.i(materialButton4, 2131892659, new Object[0], null, 4);
+                charSequence = b.i(materialButton4, 2131892740, new Object[0], null, 4);
             }
             materialButton2.setText(charSequence);
             this.binding.f.setOnClickListener(new CallParticipantsAdapter$ViewHolderUser$onConfigure$3(this, participant));
@@ -490,11 +490,11 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
             if (participant.isRinging()) {
                 MaterialButton materialButton6 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton6, "binding.voiceUserListItemToggleRinging");
-                charSequence2 = b.i(materialButton6, 2131893588, new Object[]{participant.getDisplayName()}, null, 4);
+                charSequence2 = b.i(materialButton6, 2131893685, new Object[]{participant.getDisplayName()}, null, 4);
             } else {
                 MaterialButton materialButton7 = this.binding.f;
                 m.checkNotNullExpressionValue(materialButton7, "binding.voiceUserListItemToggleRinging");
-                charSequence2 = b.i(materialButton7, 2131892660, new Object[]{participant.getDisplayName()}, null, 4);
+                charSequence2 = b.i(materialButton7, 2131892741, new Object[]{participant.getDisplayName()}, null, 4);
             }
             materialButton5.setContentDescription(charSequence2);
             if (!participant.isConnected() || participant.getVoiceState() == null) {
@@ -513,7 +513,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
                 ImageView imageView4 = this.binding.e;
                 m.checkNotNullExpressionValue(imageView4, "binding.voiceUserListItemSpectatingIndicator");
                 imageView4.setVisibility(8);
-                TextView textView2 = this.binding.f1667c;
+                TextView textView2 = this.binding.f1664c;
                 m.checkNotNullExpressionValue(textView2, "binding.voiceUserListItemLiveIndicator");
                 textView2.setVisibility(8);
                 return;
@@ -541,7 +541,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple<MGRec
             m.checkNotNullExpressionValue(imageView10, "binding.voiceUserListItemVideoIndicator");
             imageView10.setVisibility(j ? 0 : 8);
             StreamContext streamContext = participant.getStreamContext();
-            TextView textView3 = this.binding.f1667c;
+            TextView textView3 = this.binding.f1664c;
             m.checkNotNullExpressionValue(textView3, "binding.voiceUserListItemLiveIndicator");
             textView3.setVisibility(streamContext != null ? 0 : 8);
             StoreApplicationStreamPreviews.StreamPreview preview = streamContext != null ? streamContext.getPreview() : null;
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java
index 93d9a3ffa1..501ceabead 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet$binding$2.java
@@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetNoiseCancellationBottomSheet$binding$2
 
     public final WidgetVoiceNoiseCancellationBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131364020;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364020);
+        int i = 2131364063;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(2131364063);
         if (materialButton != null) {
-            i = 2131364021;
-            TextView textView = (TextView) view.findViewById(2131364021);
+            i = 2131364064;
+            TextView textView = (TextView) view.findViewById(2131364064);
             if (textView != null) {
                 return new WidgetVoiceNoiseCancellationBottomSheetBinding((LinearLayout) view, materialButton, textView);
             }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
index d398f1b1b4..048cdbe742 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheet.java
@@ -66,10 +66,10 @@ public final class WidgetNoiseCancellationBottomSheet extends AppBottomSheet {
     }
 
     private final void configureUI() {
-        TextView textView = getBinding().f2004c;
+        TextView textView = getBinding().f2009c;
         m.checkNotNullExpressionValue(textView, "binding.noiseCancellationLearnMore");
-        b.n(textView, 2131890783, new Object[]{f.a.a(360040843952L, null)}, null, 4);
-        TextView textView2 = getBinding().f2004c;
+        b.m(textView, 2131890851, new Object[]{f.a.a(360040843952L, null)}, null, 4);
+        TextView textView2 = getBinding().f2009c;
         m.checkNotNullExpressionValue(textView2, "binding.noiseCancellationLearnMore");
         textView2.setMovementMethod(LinkMovementMethod.getInstance());
         getBinding().b.setOnClickListener(new WidgetNoiseCancellationBottomSheet$configureUI$1(this));
@@ -91,7 +91,7 @@ public final class WidgetNoiseCancellationBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559281;
+        return 2131559290;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
index 3fc26fc255..dc7e476a15 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetNoiseCancellationBottomSheetViewModel.java
@@ -85,7 +85,7 @@ public final class WidgetNoiseCancellationBottomSheetViewModel extends AppViewMo
         super(null, 1, null);
         m.checkNotNullParameter(storeMediaSettings, "mediaSettingsStore");
         this.mediaSettingsStore = storeMediaSettings;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -103,6 +103,6 @@ public final class WidgetNoiseCancellationBottomSheetViewModel extends AppViewMo
     public final void onNoiseCancellationButtonPressed() {
         this.mediaSettingsStore.setVoiceConfiguration(StoreMediaSettings.NoiseProcessing.Cancellation);
         PublishSubject<Event> publishSubject = this.eventSubject;
-        publishSubject.j.onNext(new Event.ShowToast(2131891431));
+        publishSubject.j.onNext(new Event.ShowToast(2131891502));
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java
index 451340f77b..a8be3b1709 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java
@@ -27,68 +27,68 @@ public final /* synthetic */ class WidgetVoiceBottomSheet$binding$2 extends k im
 
     public final WidgetVoiceBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131363026;
-        View findViewById = view.findViewById(2131363026);
+        int i = 2131363051;
+        View findViewById = view.findViewById(2131363051);
         if (findViewById != null) {
             k0 k0Var = new k0((LinearLayout) findViewById);
-            i = 2131363505;
-            View findViewById2 = view.findViewById(2131363505);
+            i = 2131363546;
+            View findViewById2 = view.findViewById(2131363546);
             if (findViewById2 != null) {
-                int i2 = 2131365289;
-                Barrier barrier = (Barrier) findViewById2.findViewById(2131365289);
+                int i2 = 2131365344;
+                Barrier barrier = (Barrier) findViewById2.findViewById(2131365344);
                 if (barrier != null) {
-                    i2 = 2131365526;
-                    ImageView imageView = (ImageView) findViewById2.findViewById(2131365526);
+                    i2 = 2131365587;
+                    ImageView imageView = (ImageView) findViewById2.findViewById(2131365587);
                     if (imageView != null) {
-                        i2 = 2131365527;
-                        ImageView imageView2 = (ImageView) findViewById2.findViewById(2131365527);
+                        i2 = 2131365588;
+                        ImageView imageView2 = (ImageView) findViewById2.findViewById(2131365588);
                         if (imageView2 != null) {
-                            i2 = 2131365528;
-                            ImageView imageView3 = (ImageView) findViewById2.findViewById(2131365528);
+                            i2 = 2131365589;
+                            ImageView imageView3 = (ImageView) findViewById2.findViewById(2131365589);
                             if (imageView3 != null) {
-                                i2 = 2131365529;
-                                ImageView imageView4 = (ImageView) findViewById2.findViewById(2131365529);
+                                i2 = 2131365590;
+                                ImageView imageView4 = (ImageView) findViewById2.findViewById(2131365590);
                                 if (imageView4 != null) {
-                                    i2 = 2131365530;
-                                    ImageView imageView5 = (ImageView) findViewById2.findViewById(2131365530);
+                                    i2 = 2131365591;
+                                    ImageView imageView5 = (ImageView) findViewById2.findViewById(2131365591);
                                     if (imageView5 != null) {
-                                        i2 = 2131365531;
-                                        TextView textView = (TextView) findViewById2.findViewById(2131365531);
+                                        i2 = 2131365592;
+                                        TextView textView = (TextView) findViewById2.findViewById(2131365592);
                                         if (textView != null) {
-                                            i2 = 2131365532;
-                                            TextView textView2 = (TextView) findViewById2.findViewById(2131365532);
+                                            i2 = 2131365593;
+                                            TextView textView2 = (TextView) findViewById2.findViewById(2131365593);
                                             if (textView2 != null) {
                                                 l0 l0Var = new l0((ConstraintLayout) findViewById2, barrier, imageView, imageView2, imageView3, imageView4, imageView5, textView, textView2);
-                                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365522);
+                                                ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365583);
                                                 if (constraintLayout != null) {
-                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365523);
+                                                    MaterialButton materialButton = (MaterialButton) view.findViewById(2131365584);
                                                     if (materialButton != null) {
-                                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365524);
+                                                        RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365585);
                                                         if (relativeLayout != null) {
-                                                            AnchoredVoiceControlsView anchoredVoiceControlsView = (AnchoredVoiceControlsView) view.findViewById(2131365525);
+                                                            AnchoredVoiceControlsView anchoredVoiceControlsView = (AnchoredVoiceControlsView) view.findViewById(2131365586);
                                                             if (anchoredVoiceControlsView != null) {
-                                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365533);
+                                                                MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365594);
                                                                 if (materialButton2 != null) {
-                                                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365534);
+                                                                    MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365595);
                                                                     if (maxHeightRecyclerView != null) {
                                                                         CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view;
                                                                         return new WidgetVoiceBottomSheetBinding(coordinatorLayout, k0Var, l0Var, constraintLayout, materialButton, relativeLayout, anchoredVoiceControlsView, materialButton2, maxHeightRecyclerView, coordinatorLayout);
                                                                     }
-                                                                    i = 2131365534;
+                                                                    i = 2131365595;
                                                                 } else {
-                                                                    i = 2131365533;
+                                                                    i = 2131365594;
                                                                 }
                                                             } else {
-                                                                i = 2131365525;
+                                                                i = 2131365586;
                                                             }
                                                         } else {
-                                                            i = 2131365524;
+                                                            i = 2131365585;
                                                         }
                                                     } else {
-                                                        i = 2131365523;
+                                                        i = 2131365584;
                                                     }
                                                 } else {
-                                                    i = 2131365522;
+                                                    i = 2131365583;
                                                 }
                                             }
                                         }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.java
index 6cca31c63c..146a4f4b0e 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$3.java
@@ -1,7 +1,7 @@
 package com.discord.widgets.voice.sheet;
 
 import androidx.fragment.app.FragmentManager;
-import c.a.a.e.a.a;
+import c.a.a.d.a.a;
 import d0.z.d.m;
 import d0.z.d.o;
 import java.util.Objects;
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7.java
index b4ef434325..5c40cc1f8e 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureBottomContent$7.java
@@ -33,6 +33,6 @@ public final class WidgetVoiceBottomSheet$configureBottomContent$7 implements Vi
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        AnimatableValueParser.o2(this.this$0, null, new AnonymousClass1(this), 1, null);
+        AnimatableValueParser.q2(this.this$0, null, new AnonymousClass1(this), 1, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.java
index b220f90868..7986351c95 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$configureCenterContent$2.java
@@ -32,9 +32,9 @@ public final class WidgetVoiceBottomSheet$configureCenterContent$2 extends o imp
         m.checkNotNullParameter(voiceUser, "clickedUser");
         WidgetUserSheet.Companion companion = WidgetUserSheet.Companion;
         long id2 = voiceUser.getUser().getId();
-        Long valueOf = Long.valueOf(this.$channel.g());
+        Long valueOf = Long.valueOf(this.$channel.h());
         FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
         m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
-        WidgetUserSheet.Companion.show$default(companion, id2, valueOf, childFragmentManager, Long.valueOf(this.$channel.e()), Boolean.TRUE, null, null, 96, null);
+        WidgetUserSheet.Companion.show$default(companion, id2, valueOf, childFragmentManager, Long.valueOf(this.$channel.f()), Boolean.TRUE, null, null, 96, null);
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
index 853587129f..67c76e2163 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java
@@ -525,7 +525,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
             relativeLayout3.setVisibility(0);
             BottomContent.Connect connect = (BottomContent.Connect) bottomContent;
             if (connect.isConnectEnabled()) {
-                getBinding().d.setText(2131890669);
+                getBinding().d.setText(2131890737);
                 MaterialButton materialButton = getBinding().d;
                 m.checkNotNullExpressionValue(materialButton, "binding.voiceBottomSheetConnect");
                 materialButton.setEnabled(true);
@@ -602,36 +602,36 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
     }
 
     private final void configureUI(WidgetVoiceBottomSheetViewModel.ViewState viewState) {
-        TextView textView = getBinding().f1999c.g;
+        TextView textView = getBinding().f2004c.g;
         m.checkNotNullExpressionValue(textView, "binding.header.voiceBottomSheetHeaderTitle");
         textView.setText(viewState.getTitle());
-        TextView textView2 = getBinding().f1999c.f;
+        TextView textView2 = getBinding().f2004c.f;
         m.checkNotNullExpressionValue(textView2, "binding.header.voiceBottomSheetHeaderSubtitle");
         ViewExtensions.setTextAndVisibilityBy(textView2, viewState.getSubtitle());
-        ImageView imageView = getBinding().f1999c.b;
+        ImageView imageView = getBinding().f2004c.b;
         m.checkNotNullExpressionValue(imageView, "binding.header.voiceBottomSheetHeaderDeafen");
         imageView.setActivated(viewState.isDeafened());
-        ImageView imageView2 = getBinding().f1999c.b;
+        ImageView imageView2 = getBinding().f2004c.b;
         m.checkNotNullExpressionValue(imageView2, "binding.header.voiceBottomSheetHeaderDeafen");
-        imageView2.setContentDescription(viewState.isDeafened() ? getString(2131894055) : getString(2131888041));
-        getBinding().f1999c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this));
-        ImageView imageView3 = getBinding().f1999c.f121c;
+        imageView2.setContentDescription(viewState.isDeafened() ? getString(2131894156) : getString(2131888040));
+        getBinding().f2004c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this));
+        ImageView imageView3 = getBinding().f2004c.f118c;
         m.checkNotNullExpressionValue(imageView3, "binding.header.voiceBottomSheetHeaderInvite");
         imageView3.setVisibility(viewState.getShowInviteOption() ? 0 : 8);
-        getBinding().f1999c.f121c.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$2(this, viewState));
-        getBinding().f1999c.e.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$3(this));
-        getBinding().f1999c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this));
+        getBinding().f2004c.f118c.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$2(this, viewState));
+        getBinding().f2004c.e.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$3(this));
+        getBinding().f2004c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this));
         if (viewState.isNoiseCancellationActive() != null) {
             if (m.areEqual(viewState.isNoiseCancellationActive(), Boolean.TRUE)) {
-                getBinding().f1999c.d.setImageResource(2131231789);
+                getBinding().f2004c.d.setImageResource(2131231797);
             } else {
-                getBinding().f1999c.d.setImageResource(2131231790);
+                getBinding().f2004c.d.setImageResource(2131231798);
             }
-            ImageView imageView4 = getBinding().f1999c.d;
+            ImageView imageView4 = getBinding().f2004c.d;
             m.checkNotNullExpressionValue(imageView4, "binding.header.voiceBott…etHeaderNoiseCancellation");
             imageView4.setVisibility(0);
         } else {
-            ImageView imageView5 = getBinding().f1999c.d;
+            ImageView imageView5 = getBinding().f2004c.d;
             m.checkNotNullExpressionValue(imageView5, "binding.header.voiceBott…etHeaderNoiseCancellation");
             imageView5.setVisibility(8);
         }
@@ -736,7 +736,7 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
     private final void onStreamPreviewClicked(StreamContext streamContext) {
         int ordinal = getFeatureContext().ordinal();
         if (ordinal == 0) {
-            AnimatableValueParser.o2(this, null, new WidgetVoiceBottomSheet$onStreamPreviewClicked$1(this, streamContext), 1, null);
+            AnimatableValueParser.q2(this, null, new WidgetVoiceBottomSheet$onStreamPreviewClicked$1(this, streamContext), 1, null);
         } else if (ordinal == 1) {
             dismiss();
             this.onStreamPreviewClickedListener.invoke(streamContext);
@@ -753,14 +753,14 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891428);
-        String string2 = requireContext.getString(2131891415);
+        String string = requireContext.getString(2131891499);
+        String string2 = requireContext.getString(2131891486);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…e_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showNoVideoDevicesToast() {
-        o.i(this, 2131891426, 0, 4);
+        o.i(this, 2131891497, 0, 4);
     }
 
     private final void showNoVideoPermissionDialog() {
@@ -771,10 +771,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131891428);
-        String string2 = requireContext.getString(2131891427);
+        String string = requireContext.getString(2131891499);
+        String string2 = requireContext.getString(2131891498);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…o_permission_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerDeafenedDialog() {
@@ -785,10 +785,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893168);
-        String string2 = requireContext.getString(2131893167);
+        String string = requireContext.getString(2131893251);
+        String string2 = requireContext.getString(2131893250);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ver_deafened_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showServerMutedDialog() {
@@ -799,10 +799,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893179);
-        String string2 = requireContext.getString(2131893178);
+        String string = requireContext.getString(2131893262);
+        String string2 = requireContext.getString(2131893261);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…server_muted_dialog_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     private final void showSuppressedDialog() {
@@ -813,15 +813,15 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet {
         m.checkNotNullParameter(parentFragmentManager, "fragmentManager");
         m.checkNotNullParameter(requireContext, "context");
         WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion;
-        String string = requireContext.getString(2131893691);
-        String string2 = requireContext.getString(2131893694);
+        String string = requireContext.getString(2131893788);
+        String string2 = requireContext.getString(2131893791);
         m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ppressed_permission_body)");
-        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null);
+        WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891735), null, null, null, null, null, null, null, null, 0, null, 16368, null);
     }
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559277;
+        return 2131559286;
     }
 
     /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1<? super com.discord.utilities.streams.StreamContext, kotlin.Unit>, kotlin.jvm.functions.Function1<com.discord.utilities.streams.StreamContext, kotlin.Unit> */
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java
index 79f0cae49e..fbbcabad68 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1.java
@@ -12,7 +12,7 @@ public final class WidgetVoiceBottomSheetViewModel$Companion$observeStoreState$1
     public final WidgetVoiceBottomSheetViewModel.StoreState call(CallModel callModel, Long l) {
         if (callModel != null) {
             boolean z2 = false;
-            if (n0.setOf((Object[]) new Integer[]{2, 13, 1, 3}).contains(Integer.valueOf(callModel.getChannel().z()))) {
+            if (n0.setOf((Object[]) new Integer[]{2, 13, 1, 3}).contains(Integer.valueOf(callModel.getChannel().A()))) {
                 if (callModel.getVoiceSettings().getNoiseProcessing() == StoreMediaSettings.NoiseProcessing.Cancellation) {
                     z2 = true;
                 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java
index d1471903be..338834ff2d 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java
@@ -916,7 +916,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
         this.voiceEngineServiceController = voiceEngineServiceController;
         this.clock = clock;
         this.tooltipManager = tooltipManager;
-        this.eventSubject = PublishSubject.l0();
+        this.eventSubject = PublishSubject.k0();
         this.fetchedPreviews = new LinkedHashSet();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetVoiceBottomSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null);
     }
@@ -951,7 +951,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
             WeakReference<TooltipManager> weakReference2 = TooltipManager.a.a;
             tooltipManager4 = weakReference2 != null ? weakReference2.get() : tooltipManager4;
             if (tooltipManager4 == null) {
-                tooltipManager3 = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2102c.getValue(), 0, aVar, 4);
+                tooltipManager3 = new TooltipManager((c.a.w.a) TooltipManager.a.b.getValue(), (Set) TooltipManager.a.f2108c.getValue(), 0, aVar, 4);
                 TooltipManager.a.a = new WeakReference<>(tooltipManager3);
             } else {
                 tooltipManager3 = tooltipManager4;
@@ -982,7 +982,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
         ArrayList arrayList = new ArrayList();
         ArrayList arrayList2 = new ArrayList();
         for (StoreVoiceParticipants.VoiceUser voiceUser : map.values()) {
-            if (voiceUser.isConnected() || AnimatableValueParser.r1(channel)) {
+            if (voiceUser.isConnected() || AnimatableValueParser.s1(channel)) {
                 arrayList2.add(voiceUser);
             }
         }
@@ -992,7 +992,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
             List<StoreVoiceParticipants.VoiceUser> sortedWith = u.sortedWith(arrayList2, createUserItemsComparator(str));
             ArrayList arrayList3 = new ArrayList(d0.t.o.collectionSizeOrDefault(sortedWith, 10));
             for (StoreVoiceParticipants.VoiceUser voiceUser2 : sortedWith) {
-                arrayList3.add(new CallParticipantsAdapter.ListItem.VoiceUser(voiceUser2, AnimatableValueParser.r1(channel) && !voiceUser2.isConnected(), z3 && m.areEqual(str, voiceUser2.getWatchingStream())));
+                arrayList3.add(new CallParticipantsAdapter.ListItem.VoiceUser(voiceUser2, AnimatableValueParser.s1(channel) && !voiceUser2.isConnected(), z3 && m.areEqual(str, voiceUser2.getWatchingStream())));
             }
             arrayList.addAll(arrayList3);
         }
@@ -1046,11 +1046,11 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
         if (storeState instanceof StoreState.Valid) {
             StoreState.Valid valid = (StoreState.Valid) storeState;
             boolean z2 = valid.getCallModel().isConnected() && valid.getCallModel().isVideoCall() && this.forwardToFullscreenIfVideoActivated;
-            if (valid.getCallModel().isConnected() && AnimatableValueParser.u1(valid.getCallModel().getChannel())) {
-                this.eventSubject.j.onNext(new Event.LaunchStageChannel(valid.getCallModel().getChannel().g()));
+            if (valid.getCallModel().isConnected() && AnimatableValueParser.v1(valid.getCallModel().getChannel())) {
+                this.eventSubject.j.onNext(new Event.LaunchStageChannel(valid.getCallModel().getChannel().h()));
             }
             if (z2) {
-                this.eventSubject.j.onNext(new Event.LaunchVideoCall(valid.getCallModel().getChannel().g(), null));
+                this.eventSubject.j.onNext(new Event.LaunchVideoCall(valid.getCallModel().getChannel().h(), null));
                 return;
             }
             Channel channel = valid.getCallModel().getChannel();
@@ -1077,7 +1077,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
                 emitSuppressedDialogEvent();
             }
             this.wasConnected = Boolean.valueOf(isConnected);
-            updateViewState(new ViewState(y0, name, valid.getCallModel().getChannel(), valid.getCallModel().canInvite() && !AnimatableValueParser.u1(valid.getCallModel().getChannel()), valid.getNoiseCancellation(), valid.getCallModel().isDeafenedByAnySource(), listItems, !isConnected ? new WidgetVoiceBottomSheet.BottomContent.Connect(z3) : new WidgetVoiceBottomSheet.BottomContent.Controls(valid.getCallModel().getInputMode(), valid.getCallModel().getAudioDevicesState(), valid.getCallModel().isMeMutedByAnySource(), valid.getCallModel().getCameraState(), hasVideoPermission(), valid.getCallModel().isStreaming())));
+            updateViewState(new ViewState(y0, name, valid.getCallModel().getChannel(), valid.getCallModel().canInvite() && !AnimatableValueParser.v1(valid.getCallModel().getChannel()), valid.getNoiseCancellation(), valid.getCallModel().isDeafenedByAnySource(), listItems, !isConnected ? new WidgetVoiceBottomSheet.BottomContent.Connect(z3) : new WidgetVoiceBottomSheet.BottomContent.Controls(valid.getCallModel().getInputMode(), valid.getCallModel().getAudioDevicesState(), valid.getCallModel().isMeMutedByAnySource(), valid.getCallModel().getCameraState(), hasVideoPermission(), valid.getCallModel().isStreaming())));
         }
     }
 
@@ -1170,7 +1170,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
                 return;
             }
             this.mediaSettingsStore.toggleSelfDeafened();
-            this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(callModel.isDeafenedByAnySource() ? 2131894525 : 2131894516));
+            this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(callModel.isDeafenedByAnySource() ? 2131894645 : 2131894636));
         }
     }
 
@@ -1218,10 +1218,10 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
         if (selfMuteFailure == null) {
             WidgetVoiceBottomSheet.BottomContent bottomContent = requireViewState().getBottomContent();
             if (bottomContent != null && (bottomContent instanceof WidgetVoiceBottomSheet.BottomContent.Controls)) {
-                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(((WidgetVoiceBottomSheet.BottomContent.Controls) bottomContent).isMuted() ? 2131894526 : 2131894521));
+                this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(((WidgetVoiceBottomSheet.BottomContent.Controls) bottomContent).isMuted() ? 2131894646 : 2131894641));
             }
         } else if (selfMuteFailure.ordinal() == 0) {
-            this.eventSubject.j.onNext(new Event.ShowToast(2131894415));
+            this.eventSubject.j.onNext(new Event.ShowToast(2131894534));
         }
     }
 
@@ -1241,11 +1241,11 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel<ViewStat
             this.mediaSettingsStore.toggleNoiseCancellation();
             if (booleanValue) {
                 PublishSubject<Event> publishSubject2 = this.eventSubject;
-                publishSubject2.j.onNext(new Event.ShowToast(2131891430));
+                publishSubject2.j.onNext(new Event.ShowToast(2131891501));
                 return;
             }
             PublishSubject<Event> publishSubject3 = this.eventSubject;
-            publishSubject3.j.onNext(new Event.ShowToast(2131891431));
+            publishSubject3.j.onNext(new Event.ShowToast(2131891502));
         }
     }
 
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java
index 261c234d74..7c7dec5186 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java
@@ -18,24 +18,24 @@ public final /* synthetic */ class WidgetVoiceSettingsBottomSheet$binding$2 exte
 
     public final WidgetVoiceSettingsBottomSheetBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = 2131365546;
-        TextView textView = (TextView) view.findViewById(2131365546);
+        int i = 2131365607;
+        TextView textView = (TextView) view.findViewById(2131365607);
         if (textView != null) {
-            i = 2131365547;
-            SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365547);
+            i = 2131365608;
+            SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365608);
             if (switchMaterial != null) {
-                i = 2131365548;
-                TextView textView2 = (TextView) view.findViewById(2131365548);
+                i = 2131365609;
+                TextView textView2 = (TextView) view.findViewById(2131365609);
                 if (textView2 != null) {
                     NestedScrollView nestedScrollView = (NestedScrollView) view;
-                    i = 2131365550;
-                    TextView textView3 = (TextView) view.findViewById(2131365550);
+                    i = 2131365611;
+                    TextView textView3 = (TextView) view.findViewById(2131365611);
                     if (textView3 != null) {
-                        i = 2131365551;
-                        SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131365551);
+                        i = 2131365612;
+                        SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131365612);
                         if (switchMaterial2 != null) {
-                            i = 2131365553;
-                            TextView textView4 = (TextView) view.findViewById(2131365553);
+                            i = 2131365614;
+                            TextView textView4 = (TextView) view.findViewById(2131365614);
                             if (textView4 != null) {
                                 return new WidgetVoiceSettingsBottomSheetBinding(nestedScrollView, textView, switchMaterial, textView2, nestedScrollView, textView3, switchMaterial2, textView4);
                             }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$6.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$6.java
index 7c76add7ec..faf3e8a32a 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$6.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$configureUI$6.java
@@ -20,6 +20,6 @@ public final class WidgetVoiceSettingsBottomSheet$configureUI$6 implements View.
         WidgetMobileReports.Companion companion = WidgetMobileReports.Companion;
         Context requireContext = this.this$0.requireContext();
         m.checkNotNullExpressionValue(requireContext, "requireContext()");
-        companion.launchStageChannelReport(requireContext, this.$viewState.getChannel().g());
+        companion.launchStageChannelReport(requireContext, this.$viewState.getChannel().h());
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
index d6ca0d74ab..57086bf543 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java
@@ -121,8 +121,8 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet {
         textView2.setVisibility(viewState.getShowStageSettings() ? 0 : 8);
         getBinding().e.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$3(this));
         getBinding().g.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$4(this));
-        getBinding().f2005c.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$5(this));
-        SwitchMaterial switchMaterial3 = getBinding().f2005c;
+        getBinding().f2010c.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$5(this));
+        SwitchMaterial switchMaterial3 = getBinding().f2010c;
         m.checkNotNullExpressionValue(switchMaterial3, "binding.voiceSettingsNoiseSuppression");
         switchMaterial3.setChecked(viewState.getNoiseCancellationEnabled());
         TextView textView3 = getBinding().d;
@@ -148,7 +148,7 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet {
 
     @Override // com.discord.app.AppBottomSheet
     public int getContentViewResId() {
-        return 2131559282;
+        return 2131559291;
     }
 
     @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java
index 382ed9af82..6aa00e8363 100644
--- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java
+++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheetViewModel.java
@@ -66,7 +66,7 @@ public final class WidgetVoiceSettingsBottomSheetViewModel extends AppViewModel<
         }
 
         private final Observable<StoreState> observeStoreState(long j, StoreStageChannels storeStageChannels) {
-            Observable<StoreState> j2 = Observable.j(ObservableExtensionsKt.computationLatest(CallModel.Companion.get(j)).s(), storeStageChannels.observeMyRoles(j), WidgetVoiceSettingsBottomSheetViewModel$Companion$observeStoreState$1.INSTANCE);
+            Observable<StoreState> j2 = Observable.j(ObservableExtensionsKt.computationLatest(CallModel.Companion.get(j)).r(), storeStageChannels.observeMyRoles(j), WidgetVoiceSettingsBottomSheetViewModel$Companion$observeStoreState$1.INSTANCE);
             m.checkNotNullExpressionValue(j2, "Observable.combineLatest…es)\n          }\n        }");
             return j2;
         }
@@ -397,12 +397,12 @@ public final class WidgetVoiceSettingsBottomSheetViewModel extends AppViewModel<
         if (storeState instanceof StoreState.Valid) {
             StoreState.Valid valid = (StoreState.Valid) storeState;
             boolean z2 = valid.getCallModel().isVideoCall() || valid.getCallModel().getActiveStream() != null;
-            boolean u1 = AnimatableValueParser.u1(valid.getCallModel().getChannel());
-            boolean z3 = valid.getCallModel().canInvite() && !u1;
-            boolean u12 = AnimatableValueParser.u1(valid.getCallModel().getChannel());
+            boolean v1 = AnimatableValueParser.v1(valid.getCallModel().getChannel());
+            boolean z3 = valid.getCallModel().canInvite() && !v1;
+            boolean v12 = AnimatableValueParser.v1(valid.getCallModel().getChannel());
             boolean z4 = valid.getCallModel().getVoiceSettings().getNoiseProcessing() == StoreMediaSettings.NoiseProcessing.Cancellation;
             StageRoles r3 = valid.m75getMyStageRolestwRsX0();
-            updateViewState(new ViewState(valid.getCallModel().getChannel(), !valid.getCallModel().getVoiceSettings().getVoiceParticipantsHidden(), z2, z3, z4, u1 && (r3 != null && StageRoles.m25isModeratorimpl(r3.m28unboximpl())), u12));
+            updateViewState(new ViewState(valid.getCallModel().getChannel(), !valid.getCallModel().getVoiceSettings().getVoiceParticipantsHidden(), z2, z3, z4, v1 && (r3 != null && StageRoles.m25isModeratorimpl(r3.m28unboximpl())), v12));
         }
     }
 
diff --git a/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java b/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java
index b1657895b6..7fd2856341 100644
--- a/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java
+++ b/app/src/main/java/com/discord/workers/BackgroundMessageSendWorker.java
@@ -40,7 +40,7 @@ public final class BackgroundMessageSendWorker extends Worker {
         if (application != null) {
             StoreStream.Companion companion = StoreStream.Companion;
             companion.initialize(application);
-            new j0.m.b(companion.getMessages().observeInitResendFinished().y(a.i).a0(1)).a();
+            new j0.m.b(companion.getMessages().observeInitResendFinished().x(a.i).Z(1)).a();
             ListenableWorker.Result success = ListenableWorker.Result.success();
             m.checkNotNullExpressionValue(success, "Result.success()");
             return success;
diff --git a/app/src/main/java/com/discord/workers/MessageSendWorker.java b/app/src/main/java/com/discord/workers/MessageSendWorker.java
index 108c86040d..0ee5fdf0ee 100644
--- a/app/src/main/java/com/discord/workers/MessageSendWorker.java
+++ b/app/src/main/java/com/discord/workers/MessageSendWorker.java
@@ -124,7 +124,7 @@ public final class MessageSendWorker extends Worker {
                             m.checkNotNullExpressionValue(simpleName3, "javaClass.simpleName");
                             z2 = false;
                             try {
-                                Logger.d$default(appLog, simpleName3, "Direct reply: " + j + '-' + message.r(), null, 4, null);
+                                Logger.d$default(appLog, simpleName3, "Direct reply: " + j + '-' + message.o(), null, 4, null);
                                 StoreStream.Companion.getAnalytics().ackMessage(j);
                                 ListenableWorker.Result success = ListenableWorker.Result.success();
                                 m.checkNotNullExpressionValue(success, "Result.success()");
diff --git a/app/src/main/java/com/esotericsoftware/kryo/Registration.java b/app/src/main/java/com/esotericsoftware/kryo/Registration.java
index 98bf3c4f4b..df98c246a3 100644
--- a/app/src/main/java/com/esotericsoftware/kryo/Registration.java
+++ b/app/src/main/java/com/esotericsoftware/kryo/Registration.java
@@ -6,7 +6,7 @@ import h0.b.a.a;
 public class Registration {
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f2156id;
+    private final int f2162id;
     private a instantiator;
     private Serializer serializer;
     private final Class type;
@@ -17,14 +17,14 @@ public class Registration {
         } else if (serializer != null) {
             this.type = cls;
             this.serializer = serializer;
-            this.f2156id = i;
+            this.f2162id = i;
         } else {
             throw new IllegalArgumentException("serializer cannot be null.");
         }
     }
 
     public int getId() {
-        return this.f2156id;
+        return this.f2162id;
     }
 
     public a getInstantiator() {
@@ -58,7 +58,7 @@ public class Registration {
 
     public String toString() {
         StringBuilder L = c.d.b.a.a.L("[");
-        L.append(this.f2156id);
+        L.append(this.f2162id);
         L.append(", ");
         L.append(Util.className(this.type));
         L.append("]");
diff --git a/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java b/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
index baa70f77fc..05ccb30345 100644
--- a/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
+++ b/app/src/main/java/com/facebook/cache/disk/DiskCacheConfig.java
@@ -13,7 +13,7 @@ public class DiskCacheConfig {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Supplier<File> f2157c;
+    public final Supplier<File> f2163c;
     public final long d;
     public final long e;
     public final long f;
@@ -40,7 +40,7 @@ public class DiskCacheConfig {
         public Supplier<File> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public long f2158c = 41943040;
+        public long f2164c = 41943040;
         public g d = new c.f.b.b.b();
         public final Context e;
 
@@ -65,8 +65,8 @@ public class DiskCacheConfig {
         this.b = str;
         Supplier<File> supplier = bVar.b;
         Objects.requireNonNull(supplier);
-        this.f2157c = supplier;
-        this.d = bVar.f2158c;
+        this.f2163c = supplier;
+        this.d = bVar.f2164c;
         this.e = 10485760;
         this.f = 2097152;
         g gVar = bVar.d;
diff --git a/app/src/main/java/com/facebook/common/references/CloseableReference.java b/app/src/main/java/com/facebook/common/references/CloseableReference.java
index f6d23c3005..5c75b00917 100644
--- a/app/src/main/java/com/facebook/common/references/CloseableReference.java
+++ b/app/src/main/java/com/facebook/common/references/CloseableReference.java
@@ -64,7 +64,7 @@ public abstract class CloseableReference<T> implements Cloneable, Closeable {
         this.n = sharedReference;
         synchronized (sharedReference) {
             sharedReference.b();
-            sharedReference.f2159c++;
+            sharedReference.f2165c++;
         }
         this.o = cVar;
         this.p = th;
diff --git a/app/src/main/java/com/facebook/common/references/SharedReference.java b/app/src/main/java/com/facebook/common/references/SharedReference.java
index a9436a0394..ad43fb9592 100644
--- a/app/src/main/java/com/facebook/common/references/SharedReference.java
+++ b/app/src/main/java/com/facebook/common/references/SharedReference.java
@@ -13,7 +13,7 @@ public class SharedReference<T> {
     public T b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2159c = 1;
+    public int f2165c = 1;
     public final f<T> d;
 
     public static class NullReferenceException extends RuntimeException {
@@ -45,9 +45,9 @@ public class SharedReference<T> {
         T t;
         synchronized (this) {
             b();
-            AnimatableValueParser.j(Boolean.valueOf(this.f2159c > 0));
-            i = this.f2159c - 1;
-            this.f2159c = i;
+            AnimatableValueParser.j(Boolean.valueOf(this.f2165c > 0));
+            i = this.f2165c - 1;
+            this.f2165c = i;
         }
         if (i == 0) {
             synchronized (this) {
@@ -76,7 +76,7 @@ public class SharedReference<T> {
         boolean z3;
         synchronized (this) {
             z2 = false;
-            z3 = this.f2159c > 0;
+            z3 = this.f2165c > 0;
         }
         if (z3) {
             z2 = true;
diff --git a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java
index facb3ab9f0..7a5b212159 100644
--- a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java
+++ b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeController.java
@@ -29,7 +29,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public static final Map<String, Object> b = f.of("origin", "memory_bitmap", "origin_sub", "shortcut");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Class<?> f2160c = AbstractDraweeController.class;
+    public static final Class<?> f2166c = AbstractDraweeController.class;
     public final c d;
     public final c.f.g.b.a e;
     public final Executor f;
@@ -47,7 +47,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public String f2161s;
+    public String f2167s;
     public DataSource<T> t;
     public T u;
     public boolean v;
@@ -182,7 +182,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         this.t = j;
         B(j, null);
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2160c, "controller %x %s: submitRequest: dataSource: %x", Integer.valueOf(System.identityHashCode(this)), this.m, Integer.valueOf(System.identityHashCode(this.t)));
+            c.f.d.e.a.j(f2166c, "controller %x %s: submitRequest: dataSource: %x", Integer.valueOf(System.identityHashCode(this)), this.m, Integer.valueOf(System.identityHashCode(this.t)));
         }
         this.t.f(new a(this.m, this.t.b()), this.f);
         c.f.j.r.b.b();
@@ -235,7 +235,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public void d() {
         c.f.j.r.b.b();
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2160c, "controller %x %s: onAttach: %s", Integer.valueOf(System.identityHashCode(this)), this.m, this.p ? "request already submitted" : "request needs submit");
+            c.f.d.e.a.j(f2166c, "controller %x %s: onAttach: %s", Integer.valueOf(System.identityHashCode(this)), this.m, this.p ? "request already submitted" : "request needs submit");
         }
         this.d.a(c.a.ON_ATTACH_CONTROLLER);
         Objects.requireNonNull(this.k);
@@ -250,7 +250,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     @Override // com.facebook.drawee.interfaces.DraweeController
     public void e(DraweeHierarchy draweeHierarchy) {
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2160c, "controller %x %s: setHierarchy: %s", Integer.valueOf(System.identityHashCode(this)), this.m, draweeHierarchy);
+            c.f.d.e.a.j(f2166c, "controller %x %s: setHierarchy: %s", Integer.valueOf(System.identityHashCode(this)), this.m, draweeHierarchy);
         }
         this.d.a(draweeHierarchy != null ? c.a.ON_SET_HIERARCHY : c.a.ON_CLEAR_HIERARCHY);
         if (this.p) {
@@ -352,7 +352,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         }
         this.l = null;
         if (c.f.d.e.a.h(2)) {
-            c.f.d.e.a.j(f2160c, "controller %x %s -> %s: initialize", Integer.valueOf(System.identityHashCode(this)), this.m, str);
+            c.f.d.e.a.j(f2166c, "controller %x %s -> %s: initialize", Integer.valueOf(System.identityHashCode(this)), this.m, str);
         }
         this.m = str;
         this.n = obj;
@@ -371,7 +371,7 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         a.AbstractC0057a aVar;
         boolean h = c.f.d.e.a.h(2);
         if (h) {
-            c.f.d.e.a.j(f2160c, "controller %x %s: onTouchEvent %s", Integer.valueOf(System.identityHashCode(this)), this.m, motionEvent);
+            c.f.d.e.a.j(f2166c, "controller %x %s: onTouchEvent %s", Integer.valueOf(System.identityHashCode(this)), this.m, motionEvent);
         }
         c.f.g.g.a aVar2 = this.h;
         if (aVar2 == null) {
@@ -490,13 +490,13 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
     public abstract Map<String, Object> t(INFO info);
 
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
-        D2.b("isAttached", this.o);
-        D2.b("isRequestSubmitted", this.p);
-        D2.b("hasFetchFailed", this.q);
-        D2.a("fetchedImage", k(this.u));
-        D2.c("events", this.d.toString());
-        return D2.toString();
+        i F2 = AnimatableValueParser.F2(this);
+        F2.b("isAttached", this.o);
+        F2.b("isRequestSubmitted", this.p);
+        F2.b("hasFetchFailed", this.q);
+        F2.a("fetchedImage", k(this.u));
+        F2.c("events", this.d.toString());
+        return F2.toString();
     }
 
     public final void u(String str, DataSource<T> dataSource, Throwable th, boolean z2) {
@@ -618,8 +618,8 @@ public abstract class AbstractDraweeController<T, INFO> implements DraweeControl
         if (drawable != null) {
             x(drawable);
         }
-        if (this.f2161s != null) {
-            this.f2161s = null;
+        if (this.f2167s != null) {
+            this.f2167s = null;
         }
         this.w = null;
         T t = this.u;
diff --git a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java
index 99c1810e64..b55b9db631 100644
--- a/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java
+++ b/app/src/main/java/com/facebook/drawee/controller/AbstractDraweeControllerBuilder.java
@@ -19,7 +19,7 @@ public abstract class AbstractDraweeControllerBuilder<BUILDER extends AbstractDr
     public static final NullPointerException b = new NullPointerException("No image request was specified!");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicLong f2163c = new AtomicLong();
+    public static final AtomicLong f2169c = new AtomicLong();
     public final Context d;
     public final Set<ControllerListener> e;
     public final Set<c.f.h.b.a.b> f;
@@ -62,7 +62,7 @@ public abstract class AbstractDraweeControllerBuilder<BUILDER extends AbstractDr
         c.f.j.r.b.b();
         AbstractDraweeController d = d();
         d.r = false;
-        d.f2161s = null;
+        d.f2167s = null;
         boolean z2 = this.l;
         if (z2) {
             if (d.g == null) {
diff --git a/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java b/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java
index e4f1432d16..fdd0bf8887 100644
--- a/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java
+++ b/app/src/main/java/com/facebook/drawee/drawable/ScalingUtils$ScaleType.java
@@ -18,7 +18,7 @@ public interface ScalingUtils$ScaleType {
     public static final ScalingUtils$ScaleType b = y.l;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ScalingUtils$ScaleType f2164c = a0.l;
+    public static final ScalingUtils$ScaleType f2170c = a0.l;
     public static final ScalingUtils$ScaleType d = x.l;
     public static final ScalingUtils$ScaleType e = v.l;
     public static final ScalingUtils$ScaleType f = w.l;
diff --git a/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java b/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java
index 11302021b6..4be31312b1 100644
--- a/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java
+++ b/app/src/main/java/com/facebook/drawee/generic/GenericDraweeHierarchy.java
@@ -26,7 +26,7 @@ public class GenericDraweeHierarchy implements a {
     public final Resources b;
 
     /* renamed from: c  reason: collision with root package name */
-    public c f2165c;
+    public c f2171c;
     public final b d;
     public final f e;
     public final g f;
@@ -37,7 +37,7 @@ public class GenericDraweeHierarchy implements a {
         this.a = colorDrawable;
         c.f.j.r.b.b();
         this.b = aVar.f396c;
-        this.f2165c = aVar.r;
+        this.f2171c = aVar.r;
         g gVar = new g(colorDrawable);
         this.f = gVar;
         List<Drawable> list = aVar.p;
@@ -74,7 +74,7 @@ public class GenericDraweeHierarchy implements a {
         if (fVar.u == 1) {
             fVar.u = 0;
         }
-        b bVar = new b(d.d(fVar, this.f2165c));
+        b bVar = new b(d.d(fVar, this.f2171c));
         this.d = bVar;
         bVar.mutate();
         m();
@@ -116,7 +116,7 @@ public class GenericDraweeHierarchy implements a {
     public void d(float f, boolean z2) {
         if (this.e.a(3) != null) {
             this.e.e();
-            p(f);
+            q(f);
             if (z2) {
                 this.e.g();
             }
@@ -131,13 +131,13 @@ public class GenericDraweeHierarchy implements a {
 
     @Override // c.f.g.h.a
     public void f(Drawable drawable, float f, boolean z2) {
-        Drawable c2 = d.c(drawable, this.f2165c, this.b);
+        Drawable c2 = d.c(drawable, this.f2171c, this.b);
         c2.mutate();
         this.f.o(c2);
         this.e.e();
         i();
         h(2);
-        p(f);
+        q(f);
         if (z2) {
             this.e.g();
         }
@@ -145,7 +145,7 @@ public class GenericDraweeHierarchy implements a {
     }
 
     public final Drawable g(Drawable drawable, ScalingUtils$ScaleType scalingUtils$ScaleType) {
-        return d.e(d.c(drawable, this.f2165c, this.b), scalingUtils$ScaleType, null);
+        return d.e(d.c(drawable, this.f2171c, this.b), scalingUtils$ScaleType, null);
     }
 
     @Override // com.facebook.drawee.interfaces.DraweeHierarchy
@@ -226,19 +226,24 @@ public class GenericDraweeHierarchy implements a {
         }
     }
 
-    public final void n(int i, Drawable drawable) {
+    public void n(ScalingUtils$ScaleType scalingUtils$ScaleType) {
+        Objects.requireNonNull(scalingUtils$ScaleType);
+        l(2).r(scalingUtils$ScaleType);
+    }
+
+    public final void o(int i, Drawable drawable) {
         if (drawable == null) {
             this.e.c(i, null);
             return;
         }
-        k(i).g(d.c(drawable, this.f2165c, this.b));
+        k(i).g(d.c(drawable, this.f2171c, this.b));
     }
 
-    public void o(int i) {
-        n(1, this.b.getDrawable(i));
+    public void p(int i) {
+        o(1, this.b.getDrawable(i));
     }
 
-    public final void p(float f) {
+    public final void q(float f) {
         Drawable a = this.e.a(3);
         if (a != null) {
             if (f >= 0.999f) {
@@ -256,8 +261,8 @@ public class GenericDraweeHierarchy implements a {
         }
     }
 
-    public void q(c cVar) {
-        this.f2165c = cVar;
+    public void r(c cVar) {
+        this.f2171c = cVar;
         b bVar = this.d;
         Drawable drawable = d.a;
         Drawable drawable2 = bVar.j;
@@ -277,7 +282,7 @@ public class GenericDraweeHierarchy implements a {
         }
         for (int i = 0; i < this.e.k.length; i++) {
             c.f.g.e.d k = k(i);
-            c cVar2 = this.f2165c;
+            c cVar2 = this.f2171c;
             Resources resources = this.b;
             while (true) {
                 Drawable l = k.l();
diff --git a/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java b/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java
index 38f2f233cb..860026f4ec 100644
--- a/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java
+++ b/app/src/main/java/com/facebook/drawee/span/DraweeSpanStringBuilder.java
@@ -64,12 +64,12 @@ public class DraweeSpanStringBuilder extends SpannableStringBuilder {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2166c;
+        public final int f2172c;
 
         public c(c.f.g.i.a aVar, boolean z2, int i) {
             this.a = aVar;
             this.b = z2;
-            this.f2166c = i;
+            this.f2172c = i;
         }
 
         @Override // c.f.g.c.c, com.facebook.drawee.controller.ControllerListener
@@ -78,11 +78,11 @@ public class DraweeSpanStringBuilder extends SpannableStringBuilder {
             if (this.b && imageInfo != null && this.a.o.d() != null) {
                 Drawable d = this.a.o.d();
                 Rect bounds = d.getBounds();
-                int i = this.f2166c;
+                int i = this.f2172c;
                 if (i != -1) {
                     int height = (int) ((((float) i) / ((float) imageInfo.getHeight())) * ((float) imageInfo.getWidth()));
-                    if (bounds.width() != height || bounds.height() != this.f2166c) {
-                        d.setBounds(0, 0, height, this.f2166c);
+                    if (bounds.width() != height || bounds.height() != this.f2172c) {
+                        d.setBounds(0, 0, height, this.f2172c);
                         DraweeSpanStringBuilder draweeSpanStringBuilder = DraweeSpanStringBuilder.this;
                         int i2 = DraweeSpanStringBuilder.i;
                         Objects.requireNonNull(draweeSpanStringBuilder);
diff --git a/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java b/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java
index 555e02dad8..f73220ba51 100644
--- a/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java
+++ b/app/src/main/java/com/facebook/drawee/view/DraweeHolder.java
@@ -14,7 +14,7 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     public boolean b = false;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2167c = true;
+    public boolean f2173c = true;
     public DH d;
     public DraweeController e = null;
     public final c f;
@@ -38,7 +38,7 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     }
 
     public final void b() {
-        if (!this.b || !this.f2167c) {
+        if (!this.b || !this.f2173c) {
             c();
         } else {
             a();
@@ -69,9 +69,9 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     }
 
     public void f(boolean z2) {
-        if (this.f2167c != z2) {
+        if (this.f2173c != z2) {
             this.f.a(z2 ? c.a.ON_DRAWABLE_SHOW : c.a.ON_DRAWABLE_HIDE);
-            this.f2167c = z2;
+            this.f2173c = z2;
             b();
         }
     }
@@ -118,11 +118,11 @@ public class DraweeHolder<DH extends DraweeHierarchy> implements g0 {
     }
 
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
-        D2.b("controllerAttached", this.a);
-        D2.b("holderAttached", this.b);
-        D2.b("drawableVisible", this.f2167c);
-        D2.c("events", this.f.toString());
-        return D2.toString();
+        i F2 = AnimatableValueParser.F2(this);
+        F2.b("controllerAttached", this.a);
+        F2.b("holderAttached", this.b);
+        F2.b("drawableVisible", this.f2173c);
+        F2.c("events", this.f.toString());
+        return F2.toString();
     }
 }
diff --git a/app/src/main/java/com/facebook/drawee/view/DraweeView.java b/app/src/main/java/com/facebook/drawee/view/DraweeView.java
index 87b6b07b77..aa24475a3b 100644
--- a/app/src/main/java/com/facebook/drawee/view/DraweeView.java
+++ b/app/src/main/java/com/facebook/drawee/view/DraweeView.java
@@ -260,9 +260,9 @@ public class DraweeView<DH extends DraweeHierarchy> extends ImageView {
 
     @Override // android.view.View, java.lang.Object
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
+        i F2 = AnimatableValueParser.F2(this);
         DraweeHolder<DH> draweeHolder = this.mDraweeHolder;
-        D2.c("holder", draweeHolder != null ? draweeHolder.toString() : "<no holder set>");
-        return D2.toString();
+        F2.c("holder", draweeHolder != null ? draweeHolder.toString() : "<no holder set>");
+        return F2.toString();
     }
 }
diff --git a/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java b/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java
index f133771e40..c5838bcf1c 100644
--- a/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java
+++ b/app/src/main/java/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.java
@@ -20,7 +20,7 @@ public class AnimatedFactoryV2Impl implements c.f.j.a.b.a {
     public final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final m<CacheKey, c.f.j.j.c> f2168c;
+    public final m<CacheKey, c.f.j.j.c> f2174c;
     public final boolean d;
     public d e;
     public c.f.j.a.c.b f;
@@ -95,7 +95,7 @@ public class AnimatedFactoryV2Impl implements c.f.j.a.b.a {
     public AnimatedFactoryV2Impl(PlatformBitmapFactory platformBitmapFactory, e eVar, m<CacheKey, c.f.j.j.c> mVar, boolean z2) {
         this.a = platformBitmapFactory;
         this.b = eVar;
-        this.f2168c = mVar;
+        this.f2174c = mVar;
         this.d = z2;
     }
 
@@ -112,7 +112,7 @@ public class AnimatedFactoryV2Impl implements c.f.j.a.b.a {
             if (f.j == null) {
                 f.j = new f();
             }
-            this.h = new c.f.h.a.d.e(bVar2, f.j, cVar, RealtimeSinceBootClock.get(), this.a, this.f2168c, aVar, bVar);
+            this.h = new c.f.h.a.d.e(bVar2, f.j, cVar, RealtimeSinceBootClock.get(), this.a, this.f2174c, aVar, bVar);
         }
         return this.h;
     }
diff --git a/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java b/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java
index b7cda3fa0a..bb6180d2f7 100644
--- a/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java
+++ b/app/src/main/java/com/facebook/imagepipeline/cache/MemoryCacheParams.java
@@ -4,7 +4,7 @@ public class MemoryCacheParams {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2169c;
+    public final int f2175c;
     public final int d;
     public final int e;
     public final long f;
@@ -12,7 +12,7 @@ public class MemoryCacheParams {
     public MemoryCacheParams(int i, int i2, int i3, int i4, int i5, long j) {
         this.a = i;
         this.b = i2;
-        this.f2169c = i3;
+        this.f2175c = i3;
         this.d = i4;
         this.e = i5;
         this.f = j;
diff --git a/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java b/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java
index 124b4da569..4648d7c4da 100644
--- a/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java
+++ b/app/src/main/java/com/facebook/imagepipeline/memory/BasePool.java
@@ -20,7 +20,7 @@ public abstract class BasePool<V> implements e<V> {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final y f2170c;
+    public final y f2176c;
     @VisibleForTesting
     public final SparseArray<f<V>> d;
     @VisibleForTesting
@@ -85,7 +85,7 @@ public abstract class BasePool<V> implements e<V> {
         Objects.requireNonNull(cVar);
         this.b = cVar;
         Objects.requireNonNull(yVar);
-        this.f2170c = yVar;
+        this.f2176c = yVar;
         Objects.requireNonNull(zVar);
         this.i = zVar;
         SparseArray<f<V>> sparseArray = new SparseArray<>();
@@ -101,7 +101,7 @@ public abstract class BasePool<V> implements e<V> {
                     int i2 = sparseIntArray.get(keyAt, 0);
                     SparseArray<f<V>> sparseArray2 = this.d;
                     int k = k(keyAt);
-                    Objects.requireNonNull(this.f2170c);
+                    Objects.requireNonNull(this.f2176c);
                     sparseArray2.put(keyAt, new f<>(k, valueAt, i2, false));
                 }
                 this.f = false;
@@ -121,7 +121,7 @@ public abstract class BasePool<V> implements e<V> {
         if (this.j) {
             return true;
         }
-        y yVar = this.f2170c;
+        y yVar = this.f2176c;
         int i2 = yVar.a;
         int i3 = this.g.b;
         if (i > i2 - i3) {
@@ -168,7 +168,7 @@ public abstract class BasePool<V> implements e<V> {
                         h.e++;
                     }
                 } else {
-                    throw new PoolSizeViolationException(this.f2170c.a, this.g.b, this.h.b, k);
+                    throw new PoolSizeViolationException(this.f2176c.a, this.g.b, this.h.b, k);
                 }
             } else {
                 AnimatableValueParser.B(this.e.add(l));
@@ -200,7 +200,7 @@ public abstract class BasePool<V> implements e<V> {
             AnimatableValueParser.B(this.e.add(v));
             synchronized (this) {
                 if (n()) {
-                    r(this.f2170c.b);
+                    r(this.f2176c.b);
                 }
             }
             return v;
@@ -250,7 +250,7 @@ public abstract class BasePool<V> implements e<V> {
     @VisibleForTesting
     public synchronized boolean n() {
         boolean z2;
-        z2 = this.g.b + this.h.b > this.f2170c.b;
+        z2 = this.g.b + this.h.b > this.f2176c.b;
         if (z2) {
             this.i.d();
         }
@@ -275,7 +275,7 @@ public abstract class BasePool<V> implements e<V> {
 
     public f<V> q(int i) {
         int k = k(i);
-        Objects.requireNonNull(this.f2170c);
+        Objects.requireNonNull(this.f2176c);
         return new f<>(k, Integer.MAX_VALUE, 0, false);
     }
 
diff --git a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java
index 694f1953f9..181bb50753 100644
--- a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoder.java
@@ -18,12 +18,12 @@ public class NativeJpegTranscoder implements b {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2171c;
+    public boolean f2177c;
 
     public NativeJpegTranscoder(boolean z2, int i, boolean z3, boolean z4) {
         this.a = z2;
         this.b = i;
-        this.f2171c = z3;
+        this.f2177c = z3;
         if (z4) {
             AnimatableValueParser.g0();
         }
@@ -114,7 +114,7 @@ public class NativeJpegTranscoder implements b {
             int c2 = d.c(fVar, eVar2, eVar, this.a);
             int i = 1;
             int max = Math.max(1, 8 / c02);
-            if (this.f2171c) {
+            if (this.f2177c) {
                 c2 = max;
             }
             InputStream e = eVar.e();
diff --git a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java
index fcadafdad8..b4bc74741c 100644
--- a/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java
+++ b/app/src/main/java/com/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory.java
@@ -8,13 +8,13 @@ public class NativeJpegTranscoderFactory implements c.f.j.s.c {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2172c;
+    public final boolean f2178c;
 
     @c
     public NativeJpegTranscoderFactory(int i, boolean z2, boolean z3) {
         this.a = i;
         this.b = z2;
-        this.f2172c = z3;
+        this.f2178c = z3;
     }
 
     @Override // c.f.j.s.c
@@ -23,6 +23,6 @@ public class NativeJpegTranscoderFactory implements c.f.j.s.c {
         if (cVar != c.f.i.b.a) {
             return null;
         }
-        return new NativeJpegTranscoder(z2, this.a, this.b, this.f2172c);
+        return new NativeJpegTranscoder(z2, this.a, this.b, this.f2178c);
     }
 }
diff --git a/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java b/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java
index abece1d15d..a52fd53f06 100644
--- a/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/platform/GingerbreadPurgeableDecoder.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 public class GingerbreadPurgeableDecoder extends DalvikPurgeableDecoder {
 
     /* renamed from: c  reason: collision with root package name */
-    public static Method f2173c;
+    public static Method f2179c;
     public final b d = c.f.d.m.c.c();
 
     /* JADX WARNING: Removed duplicated region for block: B:27:0x0059  */
@@ -157,15 +157,15 @@ public class GingerbreadPurgeableDecoder extends DalvikPurgeableDecoder {
     }
 
     public final synchronized Method i() {
-        if (f2173c == null) {
+        if (f2179c == null) {
             try {
-                f2173c = MemoryFile.class.getDeclaredMethod("getFileDescriptor", new Class[0]);
+                f2179c = MemoryFile.class.getDeclaredMethod("getFileDescriptor", new Class[0]);
             } catch (Exception e) {
                 m.a(e);
                 throw new RuntimeException(e);
             }
         }
-        return f2173c;
+        return f2179c;
     }
 
     public final FileDescriptor j(MemoryFile memoryFile) {
diff --git a/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java b/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
index 70316be279..faa292fcf4 100644
--- a/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/platform/KitKatPurgeableDecoder.java
@@ -14,18 +14,18 @@ import com.facebook.imagepipeline.nativecode.DalvikPurgeableDecoder;
 public class KitKatPurgeableDecoder extends DalvikPurgeableDecoder {
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f2174c;
+    public final n f2180c;
 
     @c
     public KitKatPurgeableDecoder(n nVar) {
-        this.f2174c = nVar;
+        this.f2180c = nVar;
     }
 
     @Override // com.facebook.imagepipeline.nativecode.DalvikPurgeableDecoder
     public Bitmap c(CloseableReference<PooledByteBuffer> closeableReference, BitmapFactory.Options options) {
         PooledByteBuffer w = closeableReference.w();
         int size = w.size();
-        CloseableReference<byte[]> a = this.f2174c.a(size);
+        CloseableReference<byte[]> a = this.f2180c.a(size);
         try {
             byte[] w2 = a.w();
             w.i(0, w2, 0, size);
@@ -47,7 +47,7 @@ public class KitKatPurgeableDecoder extends DalvikPurgeableDecoder {
         PooledByteBuffer w = closeableReference.w();
         AnimatableValueParser.j(Boolean.valueOf(i <= w.size()));
         int i2 = i + 2;
-        CloseableReference<byte[]> a = this.f2174c.a(i2);
+        CloseableReference<byte[]> a = this.f2180c.a(i2);
         try {
             byte[] w2 = a.w();
             w.i(0, w2, 0, i);
diff --git a/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java b/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
index 3dbf10e621..cf67a40e66 100644
--- a/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
+++ b/app/src/main/java/com/facebook/imagepipeline/producers/LocalExifThumbnailProducer.java
@@ -35,7 +35,7 @@ public class LocalExifThumbnailProducer implements j1<e> {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ContentResolver f2175c;
+    public final ContentResolver f2181c;
 
     @d
     public class Api24Utils {
@@ -78,9 +78,9 @@ public class LocalExifThumbnailProducer implements j1<e> {
             int i;
             Throwable th;
             int columnIndex;
-            Uri uri = this.n.f2176c;
+            Uri uri = this.n.f2182c;
             LocalExifThumbnailProducer localExifThumbnailProducer = LocalExifThumbnailProducer.this;
-            ContentResolver contentResolver = localExifThumbnailProducer.f2175c;
+            ContentResolver contentResolver = localExifThumbnailProducer.f2181c;
             e eVar = null;
             Cursor cursor = null;
             r8 = null;
@@ -134,7 +134,7 @@ public class LocalExifThumbnailProducer implements j1<e> {
             if (z2) {
                 exifInterface = new ExifInterface(str);
             } else {
-                ContentResolver contentResolver2 = localExifThumbnailProducer.f2175c;
+                ContentResolver contentResolver2 = localExifThumbnailProducer.f2181c;
                 if (c.f.d.l.b.c(uri)) {
                     try {
                         assetFileDescriptor = contentResolver2.openAssetFileDescriptor(uri, "r");
@@ -216,12 +216,12 @@ public class LocalExifThumbnailProducer implements j1<e> {
     public LocalExifThumbnailProducer(Executor executor, g gVar, ContentResolver contentResolver) {
         this.a = executor;
         this.b = gVar;
-        this.f2175c = contentResolver;
+        this.f2181c = contentResolver;
     }
 
     @Override // c.f.j.p.j1
     public boolean a(c.f.j.d.e eVar) {
-        return AnimatableValueParser.l1(512, 512, eVar);
+        return AnimatableValueParser.m1(512, 512, eVar);
     }
 
     @Override // c.f.j.p.v0
diff --git a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
index cf335c99be..daae8f6182 100644
--- a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
+++ b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequest.java
@@ -16,7 +16,7 @@ public class ImageRequest {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Uri f2176c;
+    public final Uri f2182c;
     public final int d;
     public File e;
     public final boolean f;
@@ -34,7 +34,7 @@ public class ImageRequest {
     public final c.f.j.k.e r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final int f2177s;
+    public final int f2183s;
 
     public static class a implements d<ImageRequest, Uri> {
     }
@@ -68,7 +68,7 @@ public class ImageRequest {
     public ImageRequest(ImageRequestBuilder imageRequestBuilder) {
         this.b = imageRequestBuilder.f;
         Uri uri = imageRequestBuilder.a;
-        this.f2176c = uri;
+        this.f2182c = uri;
         boolean z2 = true;
         int i = -1;
         if (uri != null) {
@@ -105,7 +105,7 @@ public class ImageRequest {
         this.f = imageRequestBuilder.g;
         this.g = imageRequestBuilder.h;
         this.h = imageRequestBuilder.e;
-        this.i = imageRequestBuilder.f2178c;
+        this.i = imageRequestBuilder.f2184c;
         f fVar = imageRequestBuilder.d;
         this.j = fVar == null ? f.a : fVar;
         this.k = imageRequestBuilder.o;
@@ -116,12 +116,12 @@ public class ImageRequest {
         this.p = imageRequestBuilder.m;
         this.q = imageRequestBuilder.j;
         this.r = imageRequestBuilder.n;
-        this.f2177s = imageRequestBuilder.p;
+        this.f2183s = imageRequestBuilder.p;
     }
 
     public synchronized File a() {
         if (this.e == null) {
-            this.e = new File(this.f2176c.getPath());
+            this.e = new File(this.f2182c.getPath());
         }
         return this.e;
     }
@@ -131,7 +131,7 @@ public class ImageRequest {
             return false;
         }
         ImageRequest imageRequest = (ImageRequest) obj;
-        if (this.g != imageRequest.g || this.n != imageRequest.n || this.o != imageRequest.o || !AnimatableValueParser.i0(this.f2176c, imageRequest.f2176c) || !AnimatableValueParser.i0(this.b, imageRequest.b) || !AnimatableValueParser.i0(this.e, imageRequest.e) || !AnimatableValueParser.i0(this.k, imageRequest.k) || !AnimatableValueParser.i0(this.h, imageRequest.h) || !AnimatableValueParser.i0(this.i, imageRequest.i) || !AnimatableValueParser.i0(this.l, imageRequest.l) || !AnimatableValueParser.i0(this.m, imageRequest.m) || !AnimatableValueParser.i0(this.p, imageRequest.p)) {
+        if (this.g != imageRequest.g || this.n != imageRequest.n || this.o != imageRequest.o || !AnimatableValueParser.i0(this.f2182c, imageRequest.f2182c) || !AnimatableValueParser.i0(this.b, imageRequest.b) || !AnimatableValueParser.i0(this.e, imageRequest.e) || !AnimatableValueParser.i0(this.k, imageRequest.k) || !AnimatableValueParser.i0(this.h, imageRequest.h) || !AnimatableValueParser.i0(this.i, imageRequest.i) || !AnimatableValueParser.i0(this.l, imageRequest.l) || !AnimatableValueParser.i0(this.m, imageRequest.m) || !AnimatableValueParser.i0(this.p, imageRequest.p)) {
             return false;
         }
         CacheKey cacheKey = null;
@@ -144,32 +144,32 @@ public class ImageRequest {
         if (bVar2 != null) {
             cacheKey = bVar2.getPostprocessorCacheKey();
         }
-        return AnimatableValueParser.i0(postprocessorCacheKey, cacheKey) && this.f2177s == imageRequest.f2177s;
+        return AnimatableValueParser.i0(postprocessorCacheKey, cacheKey) && this.f2183s == imageRequest.f2183s;
     }
 
     public int hashCode() {
         c.f.j.q.b bVar = this.q;
-        return Arrays.hashCode(new Object[]{this.b, this.f2176c, Boolean.valueOf(this.g), this.k, this.l, this.m, Boolean.valueOf(this.n), Boolean.valueOf(this.o), this.h, this.p, this.i, this.j, bVar != null ? bVar.getPostprocessorCacheKey() : null, null, Integer.valueOf(this.f2177s)});
+        return Arrays.hashCode(new Object[]{this.b, this.f2182c, Boolean.valueOf(this.g), this.k, this.l, this.m, Boolean.valueOf(this.n), Boolean.valueOf(this.o), this.h, this.p, this.i, this.j, bVar != null ? bVar.getPostprocessorCacheKey() : null, null, Integer.valueOf(this.f2183s)});
     }
 
     public String toString() {
-        i D2 = AnimatableValueParser.D2(this);
-        D2.c("uri", this.f2176c);
-        D2.c("cacheChoice", this.b);
-        D2.c("decodeOptions", this.h);
-        D2.c("postprocessor", this.q);
-        D2.c("priority", this.l);
-        D2.c("resizeOptions", this.i);
-        D2.c("rotationOptions", this.j);
-        D2.c("bytesRange", this.k);
-        D2.c("resizingAllowedOverride", null);
-        D2.b("progressiveRenderingEnabled", this.f);
-        D2.b("localThumbnailPreviewsEnabled", this.g);
-        D2.c("lowestPermittedRequestLevel", this.m);
-        D2.b("isDiskCacheEnabled", this.n);
-        D2.b("isMemoryCacheEnabled", this.o);
-        D2.c("decodePrefetches", this.p);
-        D2.a("delayMs", this.f2177s);
-        return D2.toString();
+        i F2 = AnimatableValueParser.F2(this);
+        F2.c("uri", this.f2182c);
+        F2.c("cacheChoice", this.b);
+        F2.c("decodeOptions", this.h);
+        F2.c("postprocessor", this.q);
+        F2.c("priority", this.l);
+        F2.c("resizeOptions", this.i);
+        F2.c("rotationOptions", this.j);
+        F2.c("bytesRange", this.k);
+        F2.c("resizingAllowedOverride", null);
+        F2.b("progressiveRenderingEnabled", this.f);
+        F2.b("localThumbnailPreviewsEnabled", this.g);
+        F2.c("lowestPermittedRequestLevel", this.m);
+        F2.b("isDiskCacheEnabled", this.n);
+        F2.b("isMemoryCacheEnabled", this.o);
+        F2.c("decodePrefetches", this.p);
+        F2.a("delayMs", this.f2183s);
+        return F2.toString();
     }
 }
diff --git a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
index 260085fd17..b94001f768 100644
--- a/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
+++ b/app/src/main/java/com/facebook/imagepipeline/request/ImageRequestBuilder.java
@@ -13,7 +13,7 @@ public class ImageRequestBuilder {
     public ImageRequest.c b = ImageRequest.c.FULL_FETCH;
 
     /* renamed from: c  reason: collision with root package name */
-    public e f2178c = null;
+    public e f2184c = null;
     public f d = null;
     public b e = b.a;
     public ImageRequest.b f = ImageRequest.b.DEFAULT;
diff --git a/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java b/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java
index c541f3a03c..0cc308dd2b 100644
--- a/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java
+++ b/app/src/main/java/com/facebook/samples/zoomable/ZoomableDraweeView.java
@@ -36,7 +36,7 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy> imple
     public final e.a r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final d f2179s;
+    public final d f2185s;
 
     public class a extends c<Object> {
         public a() {
@@ -76,11 +76,11 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy> imple
         b bVar = new b();
         this.r = bVar;
         d dVar = new d();
-        this.f2179s = dVar;
+        this.f2185s = dVar;
         c.f.g.f.a aVar = new c.f.g.f.a(context.getResources());
         ScalingUtils$ScaleType scalingUtils$ScaleType = ScalingUtils$ScaleType.a;
         aVar.n = v.l;
-        AnimatableValueParser.H2(aVar, context, attributeSet);
+        AnimatableValueParser.J2(aVar, context, attributeSet);
         setAspectRatio(aVar.e);
         setHierarchy(aVar.a());
         c.f.l.b.b bVar2 = new c.f.l.b.b(new c.f.l.a.b(new c.f.l.a.a()));
@@ -235,10 +235,10 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy> imple
 
     public void setTapListener(@Nullable GestureDetector.SimpleOnGestureListener simpleOnGestureListener) {
         if (simpleOnGestureListener == null) {
-            this.f2179s.i = new GestureDetector.SimpleOnGestureListener();
+            this.f2185s.i = new GestureDetector.SimpleOnGestureListener();
             return;
         }
-        this.f2179s.i = simpleOnGestureListener;
+        this.f2185s.i = simpleOnGestureListener;
     }
 
     public void setZoomableController(e eVar) {
diff --git a/app/src/main/java/com/facebook/soloader/SoLoader.java b/app/src/main/java/com/facebook/soloader/SoLoader.java
index c1b1eda9b7..285a5281a5 100644
--- a/app/src/main/java/com/facebook/soloader/SoLoader.java
+++ b/app/src/main/java/com/facebook/soloader/SoLoader.java
@@ -38,7 +38,7 @@ public class SoLoader {
     public static k b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ReentrantReadWriteLock f2180c = new ReentrantReadWriteLock();
+    public static final ReentrantReadWriteLock f2186c = new ReentrantReadWriteLock();
     public static l[] d = null;
     public static volatile int e = 0;
     public static m[] f;
@@ -77,14 +77,14 @@ public class SoLoader {
         public final /* synthetic */ String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ String f2181c;
+        public final /* synthetic */ String f2187c;
         public final /* synthetic */ Runtime d;
         public final /* synthetic */ Method e;
 
         public a(boolean z2, String str, String str2, Runtime runtime, Method method) {
             this.a = z2;
             this.b = str;
-            this.f2181c = str2;
+            this.f2187c = str2;
             this.d = runtime;
             this.e = method;
         }
@@ -152,7 +152,7 @@ public class SoLoader {
             Throwable e;
             Throwable th2;
             if (this.a) {
-                String str2 = (i & 4) == 4 ? this.b : this.f2181c;
+                String str2 = (i & 4) == 4 ? this.b : this.f2187c;
                 String str3 = null;
                 try {
                     synchronized (this.d) {
@@ -240,7 +240,7 @@ public class SoLoader {
         Throwable th;
         int i3;
         String message;
-        ReentrantReadWriteLock reentrantReadWriteLock2 = f2180c;
+        ReentrantReadWriteLock reentrantReadWriteLock2 = f2186c;
         reentrantReadWriteLock2.readLock().lock();
         try {
             if (d != null) {
@@ -291,7 +291,7 @@ public class SoLoader {
                                     }
                                 }
                             } catch (Throwable th2) {
-                                f2180c.readLock().unlock();
+                                f2186c.readLock().unlock();
                                 throw th2;
                             }
                         }
@@ -319,7 +319,7 @@ public class SoLoader {
                                 P.append(d2.getAbsolutePath());
                                 P.append("\n");
                             }
-                            f2180c.readLock().unlock();
+                            f2186c.readLock().unlock();
                             P.append(" result: ");
                             P.append(i3);
                             String sb = P.toString();
@@ -377,7 +377,7 @@ public class SoLoader {
                 throw new UnsatisfiedLinkError("couldn't find DSO to load: " + str);
             }
         } finally {
-            f2180c.readLock().unlock();
+            f2186c.readLock().unlock();
         }
     }
 
@@ -437,7 +437,7 @@ public class SoLoader {
         boolean z2;
         String str = "init exiting";
         String str2 = "SoLoader";
-        f2180c.writeLock().lock();
+        f2186c.writeLock().lock();
         try {
             if (d == null) {
                 Log.d("SoLoader", "init start");
@@ -509,7 +509,7 @@ public class SoLoader {
                     }
                 }
                 l[] lVarArr = (l[]) arrayList.toArray(new l[arrayList.size()]);
-                ReentrantReadWriteLock reentrantReadWriteLock = f2180c;
+                ReentrantReadWriteLock reentrantReadWriteLock = f2186c;
                 reentrantReadWriteLock.writeLock().lock();
                 try {
                     if ((k & 2) != 0) {
@@ -530,13 +530,13 @@ public class SoLoader {
                     e++;
                     Log.d("SoLoader", "init finish: " + d.length + " SO sources prepared");
                 } catch (Throwable th) {
-                    f2180c.writeLock().unlock();
+                    f2186c.writeLock().unlock();
                     throw th;
                 }
             }
         } finally {
             Log.d(str2, str);
-            f2180c.writeLock().unlock();
+            f2186c.writeLock().unlock();
         }
     }
 
diff --git a/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java b/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java
index 2bd1930b33..49dc2e6de0 100644
--- a/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java
+++ b/app/src/main/java/com/franmontiel/persistentcookiejar/PersistentCookieJar.java
@@ -13,18 +13,18 @@ public class PersistentCookieJar implements ClearableCookieJar {
     public CookieCache b;
 
     /* renamed from: c  reason: collision with root package name */
-    public CookiePersistor f2182c;
+    public CookiePersistor f2188c;
 
     public PersistentCookieJar(CookieCache cookieCache, CookiePersistor cookiePersistor) {
         this.b = cookieCache;
-        this.f2182c = cookiePersistor;
+        this.f2188c = cookiePersistor;
         ((SetCookieCache) cookieCache).addAll(((SharedPrefsCookiePersistor) cookiePersistor).c());
     }
 
     @Override // f0.p
     public synchronized void a(w wVar, List<n> list) {
         this.b.addAll(list);
-        CookiePersistor cookiePersistor = this.f2182c;
+        CookiePersistor cookiePersistor = this.f2188c;
         ArrayList arrayList = new ArrayList();
         for (n nVar : list) {
             if (nVar.m) {
@@ -49,7 +49,7 @@ public class PersistentCookieJar implements ClearableCookieJar {
                 arrayList.add(next);
             }
         }
-        this.f2182c.removeAll(arrayList2);
+        this.f2188c.removeAll(arrayList2);
         return arrayList;
     }
 }
diff --git a/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java b/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
index 4189da266a..d2c85f5b08 100644
--- a/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
+++ b/app/src/main/java/com/github/mmin18/widget/RealtimeBlurView.java
@@ -29,20 +29,20 @@ public class RealtimeBlurView extends View {
     public Bitmap r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Canvas f2183s;
+    public Canvas f2189s;
     public boolean t;
     public Paint u;
     public final Rect v = new Rect();
     public final Rect w = new Rect();
 
     /* renamed from: x  reason: collision with root package name */
-    public View f2184x;
+    public View f2190x;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f2185y;
+    public boolean f2191y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final ViewTreeObserver.OnPreDrawListener f2186z = new a();
+    public final ViewTreeObserver.OnPreDrawListener f2192z = new a();
 
     public class a implements ViewTreeObserver.OnPreDrawListener {
         public a() {
@@ -57,7 +57,7 @@ public class RealtimeBlurView extends View {
             int[] iArr = new int[2];
             RealtimeBlurView realtimeBlurView2 = RealtimeBlurView.this;
             Bitmap bitmap2 = realtimeBlurView2.r;
-            View view = realtimeBlurView2.f2184x;
+            View view = realtimeBlurView2.f2190x;
             if (view != null && realtimeBlurView2.isShown()) {
                 RealtimeBlurView realtimeBlurView3 = RealtimeBlurView.this;
                 float f = realtimeBlurView3.n;
@@ -75,13 +75,13 @@ public class RealtimeBlurView extends View {
                     int max = Math.max(1, (int) (((float) width) / f2));
                     int max2 = Math.max(1, (int) (((float) height) / f2));
                     boolean z3 = realtimeBlurView3.p;
-                    if (realtimeBlurView3.f2183s == null || (bitmap = realtimeBlurView3.r) == null || bitmap.getWidth() != max || realtimeBlurView3.r.getHeight() != max2) {
+                    if (realtimeBlurView3.f2189s == null || (bitmap = realtimeBlurView3.r) == null || bitmap.getWidth() != max || realtimeBlurView3.r.getHeight() != max2) {
                         realtimeBlurView3.c();
                         try {
                             Bitmap createBitmap = Bitmap.createBitmap(max, max2, Bitmap.Config.ARGB_8888);
                             realtimeBlurView3.q = createBitmap;
                             if (createBitmap != null) {
-                                realtimeBlurView3.f2183s = new Canvas(realtimeBlurView3.q);
+                                realtimeBlurView3.f2189s = new Canvas(realtimeBlurView3.q);
                                 Bitmap createBitmap2 = Bitmap.createBitmap(max, max2, Bitmap.Config.ARGB_8888);
                                 realtimeBlurView3.r = createBitmap2;
                                 if (createBitmap2 != null) {
@@ -106,17 +106,17 @@ public class RealtimeBlurView extends View {
                         int i2 = (-iArr[1]) + iArr[1];
                         RealtimeBlurView realtimeBlurView4 = RealtimeBlurView.this;
                         realtimeBlurView4.q.eraseColor(realtimeBlurView4.m & 16777215);
-                        int save = RealtimeBlurView.this.f2183s.save();
+                        int save = RealtimeBlurView.this.f2189s.save();
                         RealtimeBlurView realtimeBlurView5 = RealtimeBlurView.this;
                         realtimeBlurView5.t = true;
                         RealtimeBlurView.i++;
                         try {
-                            realtimeBlurView5.f2183s.scale((((float) realtimeBlurView5.q.getWidth()) * 1.0f) / ((float) RealtimeBlurView.this.getWidth()), (((float) RealtimeBlurView.this.q.getHeight()) * 1.0f) / ((float) RealtimeBlurView.this.getHeight()));
-                            RealtimeBlurView.this.f2183s.translate((float) (-i), (float) (-i2));
+                            realtimeBlurView5.f2189s.scale((((float) realtimeBlurView5.q.getWidth()) * 1.0f) / ((float) RealtimeBlurView.this.getWidth()), (((float) RealtimeBlurView.this.q.getHeight()) * 1.0f) / ((float) RealtimeBlurView.this.getHeight()));
+                            RealtimeBlurView.this.f2189s.translate((float) (-i), (float) (-i2));
                             if (view.getBackground() != null) {
-                                view.getBackground().draw(RealtimeBlurView.this.f2183s);
+                                view.getBackground().draw(RealtimeBlurView.this.f2189s);
                             }
-                            view.draw(RealtimeBlurView.this.f2183s);
+                            view.draw(RealtimeBlurView.this.f2189s);
                             RealtimeBlurView.this.t = false;
                             RealtimeBlurView.a();
                             realtimeBlurView = RealtimeBlurView.this;
@@ -127,13 +127,13 @@ public class RealtimeBlurView extends View {
                         } catch (Throwable th) {
                             RealtimeBlurView.this.t = false;
                             RealtimeBlurView.a();
-                            RealtimeBlurView.this.f2183s.restoreToCount(save);
+                            RealtimeBlurView.this.f2189s.restoreToCount(save);
                             throw th;
                         }
-                        realtimeBlurView.f2183s.restoreToCount(save);
+                        realtimeBlurView.f2189s.restoreToCount(save);
                         RealtimeBlurView realtimeBlurView6 = RealtimeBlurView.this;
                         realtimeBlurView6.o.a(realtimeBlurView6.q, realtimeBlurView6.r);
-                        if (z4 || RealtimeBlurView.this.f2185y) {
+                        if (z4 || RealtimeBlurView.this.f2191y) {
                             RealtimeBlurView.this.invalidate();
                         }
                     }
@@ -252,28 +252,28 @@ public class RealtimeBlurView extends View {
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
         View activityDecorView = getActivityDecorView();
-        this.f2184x = activityDecorView;
+        this.f2190x = activityDecorView;
         boolean z2 = false;
         if (activityDecorView != null) {
-            activityDecorView.getViewTreeObserver().addOnPreDrawListener(this.f2186z);
-            if (this.f2184x.getRootView() != getRootView()) {
+            activityDecorView.getViewTreeObserver().addOnPreDrawListener(this.f2192z);
+            if (this.f2190x.getRootView() != getRootView()) {
                 z2 = true;
             }
-            this.f2185y = z2;
+            this.f2191y = z2;
             if (z2) {
-                this.f2184x.postInvalidate();
+                this.f2190x.postInvalidate();
                 return;
             }
             return;
         }
-        this.f2185y = false;
+        this.f2191y = false;
     }
 
     @Override // android.view.View
     public void onDetachedFromWindow() {
-        View view = this.f2184x;
+        View view = this.f2190x;
         if (view != null) {
-            view.getViewTreeObserver().removeOnPreDrawListener(this.f2186z);
+            view.getViewTreeObserver().removeOnPreDrawListener(this.f2192z);
         }
         b();
         super.onDetachedFromWindow();
diff --git a/app/src/main/java/com/google/android/exoplayer2/Format.java b/app/src/main/java/com/google/android/exoplayer2/Format.java
index c2d3f3e9a9..fd35583973 100644
--- a/app/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/app/src/main/java/com/google/android/exoplayer2/Format.java
@@ -51,7 +51,7 @@ public final class Format implements Parcelable {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public final String f2187s;
+    public final String f2193s;
     @Nullable
     public final String t;
     public final int u;
@@ -60,13 +60,13 @@ public final class Format implements Parcelable {
     public final DrmInitData w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final long f2188x;
+    public final long f2194x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2189y;
+    public final int f2195y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final int f2190z;
+    public final int f2196z;
 
     public class a implements Parcelable.Creator<Format> {
         /* Return type fixed from 'java.lang.Object' to match base method */
@@ -95,7 +95,7 @@ public final class Format implements Parcelable {
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public String f2191c;
+        public String f2197c;
         public int d;
         public int e;
         public int f;
@@ -119,7 +119,7 @@ public final class Format implements Parcelable {
         public float r;
 
         /* renamed from: s  reason: collision with root package name */
-        public int f2192s;
+        public int f2198s;
         public float t;
         @Nullable
         public byte[] u;
@@ -128,13 +128,13 @@ public final class Format implements Parcelable {
         public ColorInfo w;
 
         /* renamed from: x  reason: collision with root package name */
-        public int f2193x;
+        public int f2199x;
 
         /* renamed from: y  reason: collision with root package name */
-        public int f2194y;
+        public int f2200y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f2195z;
+        public int f2201z;
 
         public b() {
             this.f = -1;
@@ -146,39 +146,39 @@ public final class Format implements Parcelable {
             this.r = -1.0f;
             this.t = 1.0f;
             this.v = -1;
-            this.f2193x = -1;
-            this.f2194y = -1;
-            this.f2195z = -1;
+            this.f2199x = -1;
+            this.f2200y = -1;
+            this.f2201z = -1;
             this.C = -1;
         }
 
         public b(Format format, a aVar) {
             this.a = format.i;
             this.b = format.j;
-            this.f2191c = format.k;
+            this.f2197c = format.k;
             this.d = format.l;
             this.e = format.m;
             this.f = format.n;
             this.g = format.o;
             this.h = format.q;
             this.i = format.r;
-            this.j = format.f2187s;
+            this.j = format.f2193s;
             this.k = format.t;
             this.l = format.u;
             this.m = format.v;
             this.n = format.w;
-            this.o = format.f2188x;
-            this.p = format.f2189y;
-            this.q = format.f2190z;
+            this.o = format.f2194x;
+            this.p = format.f2195y;
+            this.q = format.f2196z;
             this.r = format.A;
-            this.f2192s = format.B;
+            this.f2198s = format.B;
             this.t = format.C;
             this.u = format.D;
             this.v = format.E;
             this.w = format.F;
-            this.f2193x = format.G;
-            this.f2194y = format.H;
-            this.f2195z = format.I;
+            this.f2199x = format.G;
+            this.f2200y = format.H;
+            this.f2201z = format.I;
             this.A = format.J;
             this.B = format.K;
             this.C = format.L;
@@ -208,7 +208,7 @@ public final class Format implements Parcelable {
         this.p = readInt2 != -1 ? readInt2 : readInt;
         this.q = parcel.readString();
         this.r = (Metadata) parcel.readParcelable(Metadata.class.getClassLoader());
-        this.f2187s = parcel.readString();
+        this.f2193s = parcel.readString();
         this.t = parcel.readString();
         this.u = parcel.readInt();
         int readInt3 = parcel.readInt();
@@ -222,9 +222,9 @@ public final class Format implements Parcelable {
         }
         DrmInitData drmInitData = (DrmInitData) parcel.readParcelable(DrmInitData.class.getClassLoader());
         this.w = drmInitData;
-        this.f2188x = parcel.readLong();
-        this.f2189y = parcel.readInt();
-        this.f2190z = parcel.readInt();
+        this.f2194x = parcel.readLong();
+        this.f2195y = parcel.readInt();
+        this.f2196z = parcel.readInt();
         this.A = parcel.readFloat();
         this.B = parcel.readInt();
         this.C = parcel.readFloat();
@@ -245,7 +245,7 @@ public final class Format implements Parcelable {
     public Format(b bVar, a aVar) {
         this.i = bVar.a;
         this.j = bVar.b;
-        this.k = f0.B(bVar.f2191c);
+        this.k = f0.B(bVar.f2197c);
         this.l = bVar.d;
         this.m = bVar.e;
         int i = bVar.f;
@@ -255,18 +255,18 @@ public final class Format implements Parcelable {
         this.p = i2 != -1 ? i2 : i;
         this.q = bVar.h;
         this.r = bVar.i;
-        this.f2187s = bVar.j;
+        this.f2193s = bVar.j;
         this.t = bVar.k;
         this.u = bVar.l;
         List<byte[]> list = bVar.m;
         this.v = list == null ? Collections.emptyList() : list;
         DrmInitData drmInitData = bVar.n;
         this.w = drmInitData;
-        this.f2188x = bVar.o;
-        this.f2189y = bVar.p;
-        this.f2190z = bVar.q;
+        this.f2194x = bVar.o;
+        this.f2195y = bVar.p;
+        this.f2196z = bVar.q;
         this.A = bVar.r;
-        int i3 = bVar.f2192s;
+        int i3 = bVar.f2198s;
         int i4 = 0;
         this.B = i3 == -1 ? 0 : i3;
         float f = bVar.t;
@@ -274,9 +274,9 @@ public final class Format implements Parcelable {
         this.D = bVar.u;
         this.E = bVar.v;
         this.F = bVar.w;
-        this.G = bVar.f2193x;
-        this.H = bVar.f2194y;
-        this.I = bVar.f2195z;
+        this.G = bVar.f2199x;
+        this.H = bVar.f2200y;
+        this.I = bVar.f2201z;
         int i5 = bVar.A;
         this.J = i5 == -1 ? 0 : i5;
         int i6 = bVar.B;
@@ -322,7 +322,7 @@ public final class Format implements Parcelable {
         }
         Format format = (Format) obj;
         int i2 = this.N;
-        return (i2 == 0 || (i = format.N) == 0 || i2 == i) && this.l == format.l && this.m == format.m && this.n == format.n && this.o == format.o && this.u == format.u && this.f2188x == format.f2188x && this.f2189y == format.f2189y && this.f2190z == format.f2190z && this.B == format.B && this.E == format.E && this.G == format.G && this.H == format.H && this.I == format.I && this.J == format.J && this.K == format.K && this.L == format.L && Float.compare(this.A, format.A) == 0 && Float.compare(this.C, format.C) == 0 && f0.a(this.M, format.M) && f0.a(this.i, format.i) && f0.a(this.j, format.j) && f0.a(this.q, format.q) && f0.a(this.f2187s, format.f2187s) && f0.a(this.t, format.t) && f0.a(this.k, format.k) && Arrays.equals(this.D, format.D) && f0.a(this.r, format.r) && f0.a(this.F, format.F) && f0.a(this.w, format.w) && b(format);
+        return (i2 == 0 || (i = format.N) == 0 || i2 == i) && this.l == format.l && this.m == format.m && this.n == format.n && this.o == format.o && this.u == format.u && this.f2194x == format.f2194x && this.f2195y == format.f2195y && this.f2196z == format.f2196z && this.B == format.B && this.E == format.E && this.G == format.G && this.H == format.H && this.I == format.I && this.J == format.J && this.K == format.K && this.L == format.L && Float.compare(this.A, format.A) == 0 && Float.compare(this.C, format.C) == 0 && f0.a(this.M, format.M) && f0.a(this.i, format.i) && f0.a(this.j, format.j) && f0.a(this.q, format.q) && f0.a(this.f2193s, format.f2193s) && f0.a(this.t, format.t) && f0.a(this.k, format.k) && Arrays.equals(this.D, format.D) && f0.a(this.r, format.r) && f0.a(this.F, format.F) && f0.a(this.w, format.w) && b(format);
     }
 
     @Override // java.lang.Object
@@ -339,10 +339,10 @@ public final class Format implements Parcelable {
             int hashCode4 = (hashCode3 + (str4 == null ? 0 : str4.hashCode())) * 31;
             Metadata metadata = this.r;
             int hashCode5 = (hashCode4 + (metadata == null ? 0 : metadata.hashCode())) * 31;
-            String str5 = this.f2187s;
+            String str5 = this.f2193s;
             int hashCode6 = (hashCode5 + (str5 == null ? 0 : str5.hashCode())) * 31;
             String str6 = this.t;
-            int b2 = (((((((((((((c.d.b.a.a.b(this.C, (c.d.b.a.a.b(this.A, (((((((((hashCode6 + (str6 == null ? 0 : str6.hashCode())) * 31) + this.u) * 31) + ((int) this.f2188x)) * 31) + this.f2189y) * 31) + this.f2190z) * 31, 31) + this.B) * 31, 31) + this.E) * 31) + this.G) * 31) + this.H) * 31) + this.I) * 31) + this.J) * 31) + this.K) * 31) + this.L) * 31;
+            int b2 = (((((((((((((c.d.b.a.a.b(this.C, (c.d.b.a.a.b(this.A, (((((((((hashCode6 + (str6 == null ? 0 : str6.hashCode())) * 31) + this.u) * 31) + ((int) this.f2194x)) * 31) + this.f2195y) * 31) + this.f2196z) * 31, 31) + this.B) * 31, 31) + this.E) * 31) + this.G) * 31) + this.H) * 31) + this.I) * 31) + this.J) * 31) + this.K) * 31) + this.L) * 31;
             Class<? extends w> cls = this.M;
             if (cls != null) {
                 i = cls.hashCode();
@@ -359,7 +359,7 @@ public final class Format implements Parcelable {
         L.append(", ");
         L.append(this.j);
         L.append(", ");
-        L.append(this.f2187s);
+        L.append(this.f2193s);
         L.append(", ");
         L.append(this.t);
         L.append(", ");
@@ -369,9 +369,9 @@ public final class Format implements Parcelable {
         L.append(", ");
         L.append(this.k);
         L.append(", [");
-        L.append(this.f2189y);
+        L.append(this.f2195y);
         L.append(", ");
-        L.append(this.f2190z);
+        L.append(this.f2196z);
         L.append(", ");
         L.append(this.A);
         L.append("], [");
@@ -392,7 +392,7 @@ public final class Format implements Parcelable {
         parcel.writeString(this.q);
         int i2 = 0;
         parcel.writeParcelable(this.r, 0);
-        parcel.writeString(this.f2187s);
+        parcel.writeString(this.f2193s);
         parcel.writeString(this.t);
         parcel.writeInt(this.u);
         int size = this.v.size();
@@ -401,9 +401,9 @@ public final class Format implements Parcelable {
             parcel.writeByteArray(this.v.get(i3));
         }
         parcel.writeParcelable(this.w, 0);
-        parcel.writeLong(this.f2188x);
-        parcel.writeInt(this.f2189y);
-        parcel.writeInt(this.f2190z);
+        parcel.writeLong(this.f2194x);
+        parcel.writeInt(this.f2195y);
+        parcel.writeInt(this.f2196z);
         parcel.writeFloat(this.A);
         parcel.writeInt(this.B);
         parcel.writeFloat(this.C);
diff --git a/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
index e6aee6e0c3..b459216792 100644
--- a/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
+++ b/app/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
@@ -17,13 +17,13 @@ public interface AudioProcessor {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2196c;
+        public final int f2202c;
         public final int d;
         public final int e;
 
         public a(int i, int i2, int i3) {
             this.b = i;
-            this.f2196c = i2;
+            this.f2202c = i2;
             this.d = i3;
             this.e = f0.z(i3) ? f0.s(i3, i2) : -1;
         }
@@ -32,7 +32,7 @@ public interface AudioProcessor {
             StringBuilder L = c.d.b.a.a.L("AudioFormat[sampleRate=");
             L.append(this.b);
             L.append(", channelCount=");
-            L.append(this.f2196c);
+            L.append(this.f2202c);
             L.append(", encoding=");
             return c.d.b.a.a.y(L, this.d, ']');
         }
diff --git a/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 2195cf0404..4e7210a731 100644
--- a/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/app/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -81,7 +81,7 @@ public final class DefaultAudioSink implements AudioSink {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2197c;
+    public final boolean f2203c;
     public final v d;
     public final e0 e;
     public final AudioProcessor[] f;
@@ -102,7 +102,7 @@ public final class DefaultAudioSink implements AudioSink {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public AudioTrack f2198s;
+    public AudioTrack f2204s;
     public n t;
     @Nullable
     public e u;
@@ -111,13 +111,13 @@ public final class DefaultAudioSink implements AudioSink {
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public ByteBuffer f2199x;
+    public ByteBuffer f2205x;
 
     /* renamed from: y  reason: collision with root package name */
-    public int f2200y;
+    public int f2206y;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f2201z;
+    public long f2207z;
 
     public static final class InvalidAudioTrackTimestampException extends RuntimeException {
     }
@@ -157,7 +157,7 @@ public final class DefaultAudioSink implements AudioSink {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2202c;
+        public final int f2208c;
         public final int d;
         public final int e;
         public final int f;
@@ -169,7 +169,7 @@ public final class DefaultAudioSink implements AudioSink {
             int i8;
             this.a = format;
             this.b = i;
-            this.f2202c = i2;
+            this.f2208c = i2;
             this.d = i3;
             this.e = i4;
             this.f = i5;
@@ -226,7 +226,7 @@ public final class DefaultAudioSink implements AudioSink {
                 AudioAttributes d = d(nVar, z2);
                 boolean z3 = true;
                 AudioTrack.Builder sessionId = new AudioTrack.Builder().setAudioAttributes(d).setAudioFormat(y2).setTransferMode(1).setBufferSizeInBytes(this.h).setSessionId(i);
-                if (this.f2202c != 1) {
+                if (this.f2208c != 1) {
                     z3 = false;
                 }
                 return sessionId.setOffloadedPlayback(z3).build();
@@ -294,7 +294,7 @@ public final class DefaultAudioSink implements AudioSink {
         }
 
         public boolean f() {
-            return this.f2202c == 1;
+            return this.f2208c == 1;
         }
     }
 
@@ -303,7 +303,7 @@ public final class DefaultAudioSink implements AudioSink {
         public final b0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final d0 f2203c;
+        public final d0 f2209c;
 
         public d(AudioProcessor... audioProcessorArr) {
             b0 b0Var = new b0();
@@ -312,14 +312,14 @@ public final class DefaultAudioSink implements AudioSink {
             this.a = audioProcessorArr2;
             System.arraycopy(audioProcessorArr, 0, audioProcessorArr2, 0, audioProcessorArr.length);
             this.b = b0Var;
-            this.f2203c = d0Var;
+            this.f2209c = d0Var;
             audioProcessorArr2[audioProcessorArr.length] = b0Var;
             audioProcessorArr2[audioProcessorArr.length + 1] = d0Var;
         }
 
         @Override // com.google.android.exoplayer2.audio.DefaultAudioSink.b
         public d1 a(d1 d1Var) {
-            d0 d0Var = this.f2203c;
+            d0 d0Var = this.f2209c;
             float f = d1Var.b;
             if (d0Var.f985c != f) {
                 d0Var.f985c = f;
@@ -335,7 +335,7 @@ public final class DefaultAudioSink implements AudioSink {
 
         @Override // com.google.android.exoplayer2.audio.DefaultAudioSink.b
         public long b(long j) {
-            d0 d0Var = this.f2203c;
+            d0 d0Var = this.f2209c;
             if (d0Var.o < 1024) {
                 return (long) (((double) d0Var.f985c) * ((double) j));
             }
@@ -365,13 +365,13 @@ public final class DefaultAudioSink implements AudioSink {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2204c;
+        public final long f2210c;
         public final long d;
 
         public e(d1 d1Var, boolean z2, long j, long j2, a aVar) {
             this.a = d1Var;
             this.b = z2;
-            this.f2204c = j;
+            this.f2210c = j;
             this.d = j2;
         }
     }
@@ -446,7 +446,7 @@ public final class DefaultAudioSink implements AudioSink {
             O.append(", ");
             DefaultAudioSink defaultAudioSink = DefaultAudioSink.this;
             c cVar = defaultAudioSink.r;
-            O.append(cVar.f2202c == 0 ? defaultAudioSink.f2201z / ((long) cVar.b) : defaultAudioSink.A);
+            O.append(cVar.f2208c == 0 ? defaultAudioSink.f2207z / ((long) cVar.b) : defaultAudioSink.A);
             O.append(", ");
             O.append(DefaultAudioSink.this.D());
             Log.w("DefaultAudioSink", O.toString());
@@ -463,7 +463,7 @@ public final class DefaultAudioSink implements AudioSink {
             O.append(", ");
             DefaultAudioSink defaultAudioSink = DefaultAudioSink.this;
             c cVar = defaultAudioSink.r;
-            O.append(cVar.f2202c == 0 ? defaultAudioSink.f2201z / ((long) cVar.b) : defaultAudioSink.A);
+            O.append(cVar.f2208c == 0 ? defaultAudioSink.f2207z / ((long) cVar.b) : defaultAudioSink.A);
             O.append(", ");
             O.append(DefaultAudioSink.this.D());
             Log.w("DefaultAudioSink", O.toString());
@@ -482,7 +482,7 @@ public final class DefaultAudioSink implements AudioSink {
             @Override // android.media.AudioTrack.StreamEventCallback
             public void onDataRequest(AudioTrack audioTrack, int i) {
                 k1.a aVar;
-                AnimatableValueParser.D(audioTrack == DefaultAudioSink.this.f2198s);
+                AnimatableValueParser.D(audioTrack == DefaultAudioSink.this.f2204s);
                 DefaultAudioSink defaultAudioSink = DefaultAudioSink.this;
                 AudioSink.a aVar2 = defaultAudioSink.p;
                 if (aVar2 != null && defaultAudioSink.S && (aVar = y.this.Z0) != null) {
@@ -493,7 +493,7 @@ public final class DefaultAudioSink implements AudioSink {
             @Override // android.media.AudioTrack.StreamEventCallback
             public void onTearDown(@NonNull AudioTrack audioTrack) {
                 k1.a aVar;
-                AnimatableValueParser.D(audioTrack == DefaultAudioSink.this.f2198s);
+                AnimatableValueParser.D(audioTrack == DefaultAudioSink.this.f2204s);
                 DefaultAudioSink defaultAudioSink = DefaultAudioSink.this;
                 AudioSink.a aVar2 = defaultAudioSink.p;
                 if (aVar2 != null && defaultAudioSink.S && (aVar = y.this.Z0) != null) {
@@ -511,7 +511,7 @@ public final class DefaultAudioSink implements AudioSink {
         this.a = oVar;
         this.b = bVar;
         int i = f0.a;
-        this.f2197c = i >= 21 && z2;
+        this.f2203c = i >= 21 && z2;
         this.k = i >= 23 && z3;
         this.l = i >= 29 && z4;
         this.h = new ConditionVariable(true);
@@ -657,7 +657,7 @@ public final class DefaultAudioSink implements AudioSink {
 
     public final long D() {
         c cVar = this.r;
-        return cVar.f2202c == 0 ? this.B / ((long) cVar.d) : this.C;
+        return cVar.f2208c == 0 ? this.B / ((long) cVar.d) : this.C;
     }
 
     public final void E() throws AudioSink.InitializationException {
@@ -668,9 +668,9 @@ public final class DefaultAudioSink implements AudioSink {
             c cVar = this.r;
             Objects.requireNonNull(cVar);
             AudioTrack a2 = cVar.a(this.W, this.t, this.U);
-            this.f2198s = a2;
+            this.f2204s = a2;
             if (G(a2)) {
-                AudioTrack audioTrack = this.f2198s;
+                AudioTrack audioTrack = this.f2204s;
                 if (this.m == null) {
                     this.m = new h();
                 }
@@ -678,20 +678,20 @@ public final class DefaultAudioSink implements AudioSink {
                 Handler handler2 = hVar.a;
                 Objects.requireNonNull(handler2);
                 audioTrack.registerStreamEventCallback(new j(handler2), hVar.b);
-                AudioTrack audioTrack2 = this.f2198s;
+                AudioTrack audioTrack2 = this.f2204s;
                 Format format = this.r.a;
                 audioTrack2.setOffloadDelayPadding(format.J, format.K);
             }
-            this.U = this.f2198s.getAudioSessionId();
+            this.U = this.f2204s.getAudioSessionId();
             s sVar = this.i;
-            AudioTrack audioTrack3 = this.f2198s;
+            AudioTrack audioTrack3 = this.f2204s;
             c cVar2 = this.r;
-            sVar.e(audioTrack3, cVar2.f2202c == 2, cVar2.g, cVar2.d, cVar2.h);
+            sVar.e(audioTrack3, cVar2.f2208c == 2, cVar2.g, cVar2.d, cVar2.h);
             N();
             int i = this.V.a;
             if (i != 0) {
-                this.f2198s.attachAuxEffect(i);
-                this.f2198s.setAuxEffectSendLevel(this.V.b);
+                this.f2204s.attachAuxEffect(i);
+                this.f2204s.setAuxEffectSendLevel(this.V.b);
             }
             this.F = true;
         } catch (AudioSink.InitializationException e2) {
@@ -707,7 +707,7 @@ public final class DefaultAudioSink implements AudioSink {
     }
 
     public final boolean F() {
-        return this.f2198s != null;
+        return this.f2204s != null;
     }
 
     public final void I() {
@@ -718,8 +718,8 @@ public final class DefaultAudioSink implements AudioSink {
             sVar.f997z = sVar.b();
             sVar.f995x = SystemClock.elapsedRealtime() * 1000;
             sVar.A = D;
-            this.f2198s.stop();
-            this.f2200y = 0;
+            this.f2204s.stop();
+            this.f2206y = 0;
         }
     }
 
@@ -758,7 +758,7 @@ public final class DefaultAudioSink implements AudioSink {
     }
 
     public final void K() {
-        this.f2201z = 0;
+        this.f2207z = 0;
         this.A = 0;
         this.B = 0;
         this.C = 0;
@@ -774,8 +774,8 @@ public final class DefaultAudioSink implements AudioSink {
         this.R = false;
         this.Q = false;
         this.P = -1;
-        this.f2199x = null;
-        this.f2200y = 0;
+        this.f2205x = null;
+        this.f2206y = 0;
         this.e.o = 0;
         x();
     }
@@ -796,11 +796,11 @@ public final class DefaultAudioSink implements AudioSink {
     public final void M(d1 d1Var) {
         if (F()) {
             try {
-                this.f2198s.setPlaybackParams(new PlaybackParams().allowDefaults().setSpeed(d1Var.b).setPitch(d1Var.f777c).setAudioFallbackMode(2));
+                this.f2204s.setPlaybackParams(new PlaybackParams().allowDefaults().setSpeed(d1Var.b).setPitch(d1Var.f777c).setAudioFallbackMode(2));
             } catch (IllegalArgumentException e2) {
                 p.c("DefaultAudioSink", "Failed to set playback params", e2);
             }
-            d1Var = new d1(this.f2198s.getPlaybackParams().getSpeed(), this.f2198s.getPlaybackParams().getPitch());
+            d1Var = new d1(this.f2204s.getPlaybackParams().getSpeed(), this.f2204s.getPlaybackParams().getPitch());
             s sVar = this.i;
             sVar.j = d1Var.b;
             r rVar = sVar.f;
@@ -814,10 +814,10 @@ public final class DefaultAudioSink implements AudioSink {
     public final void N() {
         if (F()) {
             if (f0.a >= 21) {
-                this.f2198s.setVolume(this.H);
+                this.f2204s.setVolume(this.H);
                 return;
             }
-            AudioTrack audioTrack = this.f2198s;
+            AudioTrack audioTrack = this.f2204s;
             float f2 = this.H;
             audioTrack.setStereoVolume(f2, f2);
         }
@@ -827,7 +827,7 @@ public final class DefaultAudioSink implements AudioSink {
         if (this.W || !"audio/raw".equals(this.r.a.t)) {
             return false;
         }
-        return !(this.f2197c && f0.y(this.r.a.I));
+        return !(this.f2203c && f0.y(this.r.a.I));
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:44:0x00e2, code lost:
@@ -865,7 +865,7 @@ public final class DefaultAudioSink implements AudioSink {
                 s sVar = this.i;
                 int b2 = sVar.e - ((int) (this.B - (sVar.b() * ((long) sVar.d))));
                 if (b2 > 0) {
-                    i = this.f2198s.write(this.N, this.O, Math.min(remaining2, b2));
+                    i = this.f2204s.write(this.N, this.O, Math.min(remaining2, b2));
                     if (i > 0) {
                         this.O += i;
                         byteBuffer.position(byteBuffer.position() + i);
@@ -890,7 +890,7 @@ public final class DefaultAudioSink implements AudioSink {
                         throw writeException;
                     }
                     this.o.a = null;
-                    if (G(this.f2198s)) {
+                    if (G(this.f2204s)) {
                         long j2 = this.C;
                         if (j2 > 0) {
                             this.Z = false;
@@ -904,7 +904,7 @@ public final class DefaultAudioSink implements AudioSink {
                             }
                         }
                     }
-                    int i3 = this.r.f2202c;
+                    int i3 = this.r.f2208c;
                     if (i3 == 0) {
                         this.B += (long) i;
                     }
@@ -924,39 +924,39 @@ public final class DefaultAudioSink implements AudioSink {
             } else {
                 if (this.W) {
                     AnimatableValueParser.D(j != -9223372036854775807L);
-                    AudioTrack audioTrack = this.f2198s;
+                    AudioTrack audioTrack = this.f2204s;
                     if (i2 >= 26) {
                         i = audioTrack.write(byteBuffer, remaining2, 1, j * 1000);
                     } else {
-                        if (this.f2199x == null) {
+                        if (this.f2205x == null) {
                             ByteBuffer allocate = ByteBuffer.allocate(16);
-                            this.f2199x = allocate;
+                            this.f2205x = allocate;
                             allocate.order(ByteOrder.BIG_ENDIAN);
-                            this.f2199x.putInt(1431633921);
+                            this.f2205x.putInt(1431633921);
                         }
-                        if (this.f2200y == 0) {
-                            this.f2199x.putInt(4, remaining2);
-                            this.f2199x.putLong(8, j * 1000);
-                            this.f2199x.position(0);
-                            this.f2200y = remaining2;
+                        if (this.f2206y == 0) {
+                            this.f2205x.putInt(4, remaining2);
+                            this.f2205x.putLong(8, j * 1000);
+                            this.f2205x.position(0);
+                            this.f2206y = remaining2;
                         }
-                        int remaining3 = this.f2199x.remaining();
+                        int remaining3 = this.f2205x.remaining();
                         if (remaining3 > 0) {
-                            int write = audioTrack.write(this.f2199x, remaining3, 1);
+                            int write = audioTrack.write(this.f2205x, remaining3, 1);
                             if (write < 0) {
-                                this.f2200y = 0;
+                                this.f2206y = 0;
                                 i = write;
                             }
                         }
                         i = audioTrack.write(byteBuffer, remaining2, 1);
                         if (i < 0) {
-                            this.f2200y = 0;
+                            this.f2206y = 0;
                         } else {
-                            this.f2200y -= i;
+                            this.f2206y -= i;
                         }
                     }
                 } else {
-                    i = this.f2198s.write(byteBuffer, remaining2, 1);
+                    i = this.f2204s.write(byteBuffer, remaining2, 1);
                 }
                 this.X = SystemClock.elapsedRealtime();
                 if (i < 0) {
@@ -1034,16 +1034,16 @@ public final class DefaultAudioSink implements AudioSink {
             AudioTrack audioTrack = this.i.f993c;
             Objects.requireNonNull(audioTrack);
             if (audioTrack.getPlayState() == 3) {
-                this.f2198s.pause();
+                this.f2204s.pause();
             }
-            if (G(this.f2198s)) {
+            if (G(this.f2204s)) {
                 h hVar = this.m;
                 Objects.requireNonNull(hVar);
-                this.f2198s.unregisterStreamEventCallback(hVar.b);
+                this.f2204s.unregisterStreamEventCallback(hVar.b);
                 hVar.a.removeCallbacksAndMessages(null);
             }
-            AudioTrack audioTrack2 = this.f2198s;
-            this.f2198s = null;
+            AudioTrack audioTrack2 = this.f2204s;
+            this.f2204s = null;
             if (f0.a < 21 && !this.T) {
                 this.U = 0;
             }
@@ -1094,7 +1094,7 @@ public final class DefaultAudioSink implements AudioSink {
                 z2 = true;
             }
             if (z2) {
-                this.f2198s.pause();
+                this.f2204s.pause();
             }
         }
     }
@@ -1278,12 +1278,12 @@ public final class DefaultAudioSink implements AudioSink {
         e eVar = this.v;
         long j9 = min - eVar.d;
         if (eVar.a.equals(d1.a)) {
-            j2 = this.v.f2204c + j9;
+            j2 = this.v.f2210c + j9;
         } else if (this.j.isEmpty()) {
-            j2 = this.b.b(j9) + this.v.f2204c;
+            j2 = this.b.b(j9) + this.v.f2210c;
         } else {
             e first = this.j.getFirst();
-            j2 = first.f2204c - f0.p(first.d - min, this.v.a.b);
+            j2 = first.f2210c - f0.p(first.d - min, this.v.a.b);
         }
         return this.r.c(this.b.c()) + j2;
     }
@@ -1336,7 +1336,7 @@ public final class DefaultAudioSink implements AudioSink {
             r rVar = this.i.f;
             Objects.requireNonNull(rVar);
             rVar.a();
-            this.f2198s.play();
+            this.f2204s.play();
         }
     }
 
@@ -1363,7 +1363,7 @@ public final class DefaultAudioSink implements AudioSink {
             c cVar = this.q;
             c cVar2 = this.r;
             Objects.requireNonNull(cVar);
-            if (!(cVar2.f2202c == cVar.f2202c && cVar2.g == cVar.g && cVar2.e == cVar.e && cVar2.f == cVar.f && cVar2.d == cVar.d)) {
+            if (!(cVar2.f2208c == cVar.f2208c && cVar2.g == cVar.g && cVar2.e == cVar.e && cVar2.f == cVar.f && cVar2.d == cVar.d)) {
                 I();
                 if (g()) {
                     return false;
@@ -1372,9 +1372,9 @@ public final class DefaultAudioSink implements AudioSink {
             } else {
                 this.r = this.q;
                 this.q = null;
-                if (G(this.f2198s)) {
-                    this.f2198s.setOffloadEndOfStream();
-                    AudioTrack audioTrack = this.f2198s;
+                if (G(this.f2204s)) {
+                    this.f2204s.setOffloadEndOfStream();
+                    AudioTrack audioTrack = this.f2204s;
                     Format format = this.r.a;
                     audioTrack.setOffloadDelayPadding(format.J, format.K);
                     this.Z = true;
@@ -1426,7 +1426,7 @@ public final class DefaultAudioSink implements AudioSink {
                     return true;
                 }
                 c cVar3 = this.r;
-                if (cVar3.f2202c != 0 && this.D == 0) {
+                if (cVar3.f2208c != 0 && this.D == 0) {
                     int i6 = cVar3.g;
                     switch (i6) {
                         case 5:
@@ -1542,7 +1542,7 @@ public final class DefaultAudioSink implements AudioSink {
                 }
                 long j2 = this.G;
                 c cVar4 = this.r;
-                long j3 = ((((cVar4.f2202c == 0 ? this.f2201z / ((long) cVar4.b) : this.A) - this.e.o) * 1000000) / ((long) cVar4.a.H)) + j2;
+                long j3 = ((((cVar4.f2208c == 0 ? this.f2207z / ((long) cVar4.b) : this.A) - this.e.o) * 1000000) / ((long) cVar4.a.H)) + j2;
                 if (!this.E && Math.abs(j3 - j) > 200000) {
                     StringBuilder O = c.d.b.a.a.O("Discontinuity detected [expected ", j3, ", got ");
                     O.append(j);
@@ -1563,8 +1563,8 @@ public final class DefaultAudioSink implements AudioSink {
                         y.this.X0 = true;
                     }
                 }
-                if (this.r.f2202c == 0) {
-                    this.f2201z += (long) byteBuffer.remaining();
+                if (this.r.f2208c == 0) {
+                    this.f2207z += (long) byteBuffer.remaining();
                 } else {
                     this.A += (long) (this.D * i);
                 }
@@ -1625,7 +1625,7 @@ public final class DefaultAudioSink implements AudioSink {
                 return 0;
             }
             int i = format.I;
-            return (i == 2 || (this.f2197c && i == 4)) ? 2 : 1;
+            return (i == 2 || (this.f2203c && i == 4)) ? 2 : 1;
         } else if (this.l && !this.Y && H(format, this.t)) {
             return 2;
         } else {
@@ -1652,7 +1652,7 @@ public final class DefaultAudioSink implements AudioSink {
             AnimatableValueParser.k(f0.z(format.I));
             int s2 = f0.s(format.I, format.G);
             int i10 = format.I;
-            if (!this.f2197c || !f0.y(i10)) {
+            if (!this.f2203c || !f0.y(i10)) {
                 i9 = 0;
             }
             AudioProcessor[] audioProcessorArr2 = i9 != 0 ? this.g : this.f;
@@ -1683,10 +1683,10 @@ public final class DefaultAudioSink implements AudioSink {
             }
             int i14 = aVar.d;
             i4 = aVar.b;
-            i3 = f0.n(aVar.f2196c);
+            i3 = f0.n(aVar.f2202c);
             audioProcessorArr = audioProcessorArr2;
             i2 = i14;
-            i5 = f0.s(i14, aVar.f2196c);
+            i5 = f0.s(i14, aVar.f2202c);
             i6 = s2;
             i7 = 0;
         } else {
@@ -1739,13 +1739,13 @@ public final class DefaultAudioSink implements AudioSink {
         if (!this.V.equals(tVar)) {
             int i = tVar.a;
             float f2 = tVar.b;
-            AudioTrack audioTrack = this.f2198s;
+            AudioTrack audioTrack = this.f2204s;
             if (audioTrack != null) {
                 if (this.V.a != i) {
                     audioTrack.attachAuxEffect(i);
                 }
                 if (i != 0) {
-                    this.f2198s.setAuxEffectSendLevel(f2);
+                    this.f2204s.setAuxEffectSendLevel(f2);
                 }
             }
             this.V = tVar;
diff --git a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
index 2a77799189..6d7e7c8c4f 100644
--- a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
+++ b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -53,7 +53,7 @@ public class DefaultDrmSession implements DrmSession {
     public final x b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2206c;
+    public final a f2212c;
     public final b d;
     public final int e;
     public final boolean f;
@@ -75,7 +75,7 @@ public class DefaultDrmSession implements DrmSession {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public DrmSession.DrmSessionException f2207s;
+    public DrmSession.DrmSessionException f2213s;
     @Nullable
     public byte[] t;
     public byte[] u;
@@ -175,14 +175,14 @@ public class DefaultDrmSession implements DrmSession {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2208c;
+        public final long f2214c;
         public final Object d;
         public int e;
 
         public d(long j, boolean z2, long j2, Object obj) {
             this.a = j;
             this.b = z2;
-            this.f2208c = j2;
+            this.f2214c = j2;
             this.d = obj;
         }
     }
@@ -207,12 +207,12 @@ public class DefaultDrmSession implements DrmSession {
                 if (defaultDrmSession.n == 2 || defaultDrmSession.i()) {
                     defaultDrmSession.w = null;
                     if (obj2 instanceof Exception) {
-                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2206c).a((Exception) obj2);
+                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2212c).a((Exception) obj2);
                         return;
                     }
                     try {
                         defaultDrmSession.b.j((byte[]) obj2);
-                        DefaultDrmSessionManager.d dVar = (DefaultDrmSessionManager.d) defaultDrmSession.f2206c;
+                        DefaultDrmSessionManager.d dVar = (DefaultDrmSessionManager.d) defaultDrmSession.f2212c;
                         for (DefaultDrmSession defaultDrmSession2 : DefaultDrmSessionManager.this.n) {
                             if (defaultDrmSession2.l(false)) {
                                 defaultDrmSession2.h(true);
@@ -220,7 +220,7 @@ public class DefaultDrmSession implements DrmSession {
                         }
                         DefaultDrmSessionManager.this.n.clear();
                     } catch (Exception e) {
-                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2206c).a(e);
+                        ((DefaultDrmSessionManager.d) defaultDrmSession.f2212c).a(e);
                     }
                 }
             } else if (i == 1) {
@@ -261,7 +261,7 @@ public class DefaultDrmSession implements DrmSession {
             Objects.requireNonNull(bArr);
         }
         this.l = uuid;
-        this.f2206c = aVar;
+        this.f2212c = aVar;
         this.d = bVar;
         this.b = xVar;
         this.e = i;
@@ -347,7 +347,7 @@ public class DefaultDrmSession implements DrmSession {
             this.p.quit();
             this.p = null;
             this.r = null;
-            this.f2207s = null;
+            this.f2213s = null;
             this.v = null;
             this.w = null;
             byte[] bArr = this.t;
@@ -399,8 +399,8 @@ public class DefaultDrmSession implements DrmSession {
             if (defaultDrmSessionManager2.r == this) {
                 defaultDrmSessionManager2.r = null;
             }
-            if (defaultDrmSessionManager2.f2210s == this) {
-                defaultDrmSessionManager2.f2210s = null;
+            if (defaultDrmSessionManager2.f2216s == this) {
+                defaultDrmSessionManager2.f2216s = null;
             }
             if (defaultDrmSessionManager2.n.size() > 1 && DefaultDrmSessionManager.this.n.get(0) == this) {
                 DefaultDrmSessionManager.this.n.get(1).n();
@@ -436,7 +436,7 @@ public class DefaultDrmSession implements DrmSession {
     @Nullable
     public final DrmSession.DrmSessionException f() {
         if (this.n == 1) {
-            return this.f2207s;
+            return this.f2213s;
         }
         return null;
     }
@@ -537,7 +537,7 @@ public class DefaultDrmSession implements DrmSession {
     }
 
     public final void j(Exception exc) {
-        this.f2207s = new DrmSession.DrmSessionException(exc);
+        this.f2213s = new DrmSession.DrmSessionException(exc);
         g(new c.i.a.c.z1.c(exc));
         if (this.n != 4) {
             this.n = 1;
@@ -546,7 +546,7 @@ public class DefaultDrmSession implements DrmSession {
 
     public final void k(Exception exc) {
         if (exc instanceof NotProvisionedException) {
-            ((DefaultDrmSessionManager.d) this.f2206c).b(this);
+            ((DefaultDrmSessionManager.d) this.f2212c).b(this);
         } else {
             j(exc);
         }
@@ -567,7 +567,7 @@ public class DefaultDrmSession implements DrmSession {
             return true;
         } catch (NotProvisionedException e3) {
             if (z2) {
-                ((DefaultDrmSessionManager.d) this.f2206c).b(this);
+                ((DefaultDrmSessionManager.d) this.f2212c).b(this);
                 return false;
             }
             j(e3);
diff --git a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
index 1421b3d63f..afcab4900a 100644
--- a/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
+++ b/app/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
@@ -41,7 +41,7 @@ public class DefaultDrmSessionManager implements s {
     public final UUID b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final x.c f2209c;
+    public final x.c f2215c;
     public final b0 d;
     public final HashMap<String, String> e;
     public final boolean f;
@@ -62,7 +62,7 @@ public class DefaultDrmSessionManager implements s {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public DefaultDrmSession f2210s;
+    public DefaultDrmSession f2216s;
     @Nullable
     public Looper t;
     public Handler u;
@@ -72,7 +72,7 @@ public class DefaultDrmSessionManager implements s {
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public volatile c f2211x;
+    public volatile c f2217x;
 
     public static final class MissingSchemeDataException extends Exception {
         public MissingSchemeDataException(UUID uuid, a aVar) {
@@ -139,7 +139,7 @@ public class DefaultDrmSessionManager implements s {
         Objects.requireNonNull(uuid);
         AnimatableValueParser.n(!h0.b.equals(uuid), "Use C.CLEARKEY_UUID instead");
         this.b = uuid;
-        this.f2209c = cVar;
+        this.f2215c = cVar;
         this.d = b0Var;
         this.e = hashMap;
         this.f = z2;
@@ -166,7 +166,7 @@ public class DefaultDrmSessionManager implements s {
         this.p = i + 1;
         if (i == 0) {
             AnimatableValueParser.D(this.q == null);
-            x a2 = this.f2209c.a(this.b);
+            x a2 = this.f2215c.a(this.b);
             this.q = a2;
             a2.h(new b(null));
         }
@@ -184,8 +184,8 @@ public class DefaultDrmSessionManager implements s {
         } else {
             AnimatableValueParser.D(looper2 == looper);
         }
-        if (this.f2211x == null) {
-            this.f2211x = new c(looper);
+        if (this.f2217x == null) {
+            this.f2217x = new c(looper);
         }
         DrmInitData drmInitData = format.w;
         DefaultDrmSession defaultDrmSession = null;
@@ -247,12 +247,12 @@ public class DefaultDrmSessionManager implements s {
                 }
             }
         } else {
-            defaultDrmSession = this.f2210s;
+            defaultDrmSession = this.f2216s;
         }
         if (defaultDrmSession == null) {
             defaultDrmSession = e(list, false, aVar);
             if (!this.f) {
-                this.f2210s = defaultDrmSession;
+                this.f2216s = defaultDrmSession;
             }
             this.m.add(defaultDrmSession);
         } else {
diff --git a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index c9c53d4341..b291e85bba 100644
--- a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -101,34 +101,34 @@ public abstract class MediaCodecRenderer extends g0 {
     public int Z;
 
     /* renamed from: a0  reason: collision with root package name */
-    public boolean f2212a0;
+    public boolean f2218a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public boolean f2213b0;
+    public boolean f2219b0;
 
     /* renamed from: c0  reason: collision with root package name */
-    public boolean f2214c0;
+    public boolean f2220c0;
 
     /* renamed from: d0  reason: collision with root package name */
-    public boolean f2215d0;
+    public boolean f2221d0;
 
     /* renamed from: e0  reason: collision with root package name */
-    public boolean f2216e0;
+    public boolean f2222e0;
 
     /* renamed from: f0  reason: collision with root package name */
-    public boolean f2217f0;
+    public boolean f2223f0;
 
     /* renamed from: g0  reason: collision with root package name */
-    public boolean f2218g0;
+    public boolean f2224g0;
 
     /* renamed from: h0  reason: collision with root package name */
-    public boolean f2219h0;
+    public boolean f2225h0;
 
     /* renamed from: i0  reason: collision with root package name */
-    public boolean f2220i0;
+    public boolean f2226i0;
 
     /* renamed from: j0  reason: collision with root package name */
-    public boolean f2221j0;
+    public boolean f2227j0;
     @Nullable
     public q k0;
     public long l0;
@@ -149,15 +149,15 @@ public abstract class MediaCodecRenderer extends g0 {
     public int w0;
 
     /* renamed from: x  reason: collision with root package name */
-    public final float f2222x;
+    public final float f2228x;
     public int x0;
 
     /* renamed from: y  reason: collision with root package name */
-    public final DecoderInputBuffer f2223y = new DecoderInputBuffer(0);
+    public final DecoderInputBuffer f2229y = new DecoderInputBuffer(0);
     public boolean y0;
 
     /* renamed from: z  reason: collision with root package name */
-    public final DecoderInputBuffer f2224z = new DecoderInputBuffer(0);
+    public final DecoderInputBuffer f2230z = new DecoderInputBuffer(0);
     public boolean z0;
 
     public static class DecoderInitializationException extends Exception {
@@ -195,7 +195,7 @@ public abstract class MediaCodecRenderer extends g0 {
         Objects.requireNonNull(tVar);
         this.v = tVar;
         this.w = z2;
-        this.f2222x = f;
+        this.f2228x = f;
         p pVar = new p();
         this.B = pVar;
         this.C = new d0<>();
@@ -424,7 +424,7 @@ public abstract class MediaCodecRenderer extends g0 {
     public final boolean P() throws ExoPlaybackException {
         if (this.y0) {
             this.w0 = 1;
-            if (this.f2213b0 || this.f2215d0) {
+            if (this.f2219b0 || this.f2221d0) {
                 this.x0 = 3;
                 return false;
             }
@@ -442,7 +442,7 @@ public abstract class MediaCodecRenderer extends g0 {
         int i;
         boolean z5;
         if (!(this.n0 >= 0)) {
-            if (!this.f2216e0 || !this.z0) {
+            if (!this.f2222e0 || !this.z0) {
                 i = this.R.d(this.E);
             } else {
                 try {
@@ -460,9 +460,9 @@ public abstract class MediaCodecRenderer extends g0 {
                     this.A0 = true;
                     MediaFormat outputFormat = this.R.getOutputFormat();
                     if (this.Z != 0 && outputFormat.getInteger("width") == 32 && outputFormat.getInteger("height") == 32) {
-                        this.f2220i0 = true;
+                        this.f2226i0 = true;
                     } else {
-                        if (this.f2218g0) {
+                        if (this.f2224g0) {
                             outputFormat.setInteger("channel-count", 1);
                         }
                         this.T = outputFormat;
@@ -470,12 +470,12 @@ public abstract class MediaCodecRenderer extends g0 {
                     }
                     return true;
                 }
-                if (this.f2221j0 && (this.D0 || this.w0 == 2)) {
+                if (this.f2227j0 && (this.D0 || this.w0 == 2)) {
                     k0();
                 }
                 return false;
-            } else if (this.f2220i0) {
-                this.f2220i0 = false;
+            } else if (this.f2226i0) {
+                this.f2226i0 = false;
                 this.R.releaseOutputBuffer(i, false);
                 return true;
             } else {
@@ -490,7 +490,7 @@ public abstract class MediaCodecRenderer extends g0 {
                         MediaCodec.BufferInfo bufferInfo2 = this.E;
                         byteBuffer.limit(bufferInfo2.offset + bufferInfo2.size);
                     }
-                    if (this.f2217f0) {
+                    if (this.f2223f0) {
                         MediaCodec.BufferInfo bufferInfo3 = this.E;
                         if (bufferInfo3.presentationTimeUs == 0 && (bufferInfo3.flags & 4) != 0) {
                             long j3 = this.B0;
@@ -525,7 +525,7 @@ public abstract class MediaCodecRenderer extends g0 {
                 }
             }
         }
-        if (!this.f2216e0 || !this.z0) {
+        if (!this.f2222e0 || !this.z0) {
             z3 = true;
             z2 = false;
             r rVar = this.R;
@@ -578,20 +578,20 @@ public abstract class MediaCodecRenderer extends g0 {
             if (c2 < 0) {
                 return false;
             }
-            this.f2224z.k = this.R.g(c2);
-            this.f2224z.p();
+            this.f2230z.k = this.R.g(c2);
+            this.f2230z.p();
         }
         if (this.w0 == 1) {
-            if (!this.f2221j0) {
+            if (!this.f2227j0) {
                 this.z0 = true;
                 this.R.queueInputBuffer(this.m0, 0, 0, 0, 4);
                 r0();
             }
             this.w0 = 2;
             return false;
-        } else if (this.f2219h0) {
-            this.f2219h0 = false;
-            ByteBuffer byteBuffer = this.f2224z.k;
+        } else if (this.f2225h0) {
+            this.f2225h0 = false;
+            ByteBuffer byteBuffer = this.f2230z.k;
             byte[] bArr = t;
             byteBuffer.put(bArr);
             this.R.queueInputBuffer(this.m0, 0, bArr.length, 0, 0);
@@ -601,13 +601,13 @@ public abstract class MediaCodecRenderer extends g0 {
         } else {
             if (this.v0 == 1) {
                 for (int i = 0; i < this.S.v.size(); i++) {
-                    this.f2224z.k.put(this.S.v.get(i));
+                    this.f2230z.k.put(this.S.v.get(i));
                 }
                 this.v0 = 2;
             }
-            int position = this.f2224z.k.position();
+            int position = this.f2230z.k.position();
             s0 A = A();
-            int I = I(A, this.f2224z, false);
+            int I = I(A, this.f2230z, false);
             if (i()) {
                 this.C0 = this.B0;
             }
@@ -616,14 +616,14 @@ public abstract class MediaCodecRenderer extends g0 {
             }
             if (I == -5) {
                 if (this.v0 == 2) {
-                    this.f2224z.p();
+                    this.f2230z.p();
                     this.v0 = 1;
                 }
                 f0(A);
                 return true;
-            } else if (this.f2224z.n()) {
+            } else if (this.f2230z.n()) {
                 if (this.v0 == 2) {
-                    this.f2224z.p();
+                    this.f2230z.p();
                     this.v0 = 1;
                 }
                 this.D0 = true;
@@ -632,7 +632,7 @@ public abstract class MediaCodecRenderer extends g0 {
                     return false;
                 }
                 try {
-                    if (!this.f2221j0) {
+                    if (!this.f2227j0) {
                         this.z0 = true;
                         this.R.queueInputBuffer(this.m0, 0, 0, 0, 4);
                         r0();
@@ -641,10 +641,10 @@ public abstract class MediaCodecRenderer extends g0 {
                 } catch (MediaCodec.CryptoException e) {
                     throw z(e, this.I, false);
                 }
-            } else if (this.y0 || this.f2224z.o()) {
-                boolean t2 = this.f2224z.t();
+            } else if (this.y0 || this.f2230z.o()) {
+                boolean t2 = this.f2230z.t();
                 if (t2) {
-                    b bVar = this.f2224z.j;
+                    b bVar = this.f2230z.j;
                     Objects.requireNonNull(bVar);
                     if (position != 0) {
                         if (bVar.d == null) {
@@ -656,8 +656,8 @@ public abstract class MediaCodecRenderer extends g0 {
                         iArr2[0] = iArr2[0] + position;
                     }
                 }
-                if (this.f2212a0 && !t2) {
-                    ByteBuffer byteBuffer2 = this.f2224z.k;
+                if (this.f2218a0 && !t2) {
+                    ByteBuffer byteBuffer2 = this.f2230z.k;
                     byte[] bArr2 = u.a;
                     int position2 = byteBuffer2.position();
                     int i2 = 0;
@@ -686,12 +686,12 @@ public abstract class MediaCodecRenderer extends g0 {
                         }
                         i2 = i4;
                     }
-                    if (this.f2224z.k.position() == 0) {
+                    if (this.f2230z.k.position() == 0) {
                         return true;
                     }
-                    this.f2212a0 = false;
+                    this.f2218a0 = false;
                 }
-                DecoderInputBuffer decoderInputBuffer = this.f2224z;
+                DecoderInputBuffer decoderInputBuffer = this.f2230z;
                 long j = decoderInputBuffer.m;
                 q qVar = this.k0;
                 if (qVar != null) {
@@ -722,7 +722,7 @@ public abstract class MediaCodecRenderer extends g0 {
                         }
                     }
                 }
-                if (this.f2224z.m()) {
+                if (this.f2230z.m()) {
                     this.D.add(Long.valueOf(j));
                 }
                 if (this.F0) {
@@ -730,23 +730,23 @@ public abstract class MediaCodecRenderer extends g0 {
                     this.F0 = false;
                 }
                 if (this.k0 != null) {
-                    this.B0 = Math.max(this.B0, this.f2224z.m);
+                    this.B0 = Math.max(this.B0, this.f2230z.m);
                 } else {
                     this.B0 = Math.max(this.B0, j);
                 }
-                this.f2224z.s();
-                if (this.f2224z.l()) {
-                    Z(this.f2224z);
+                this.f2230z.s();
+                if (this.f2230z.l()) {
+                    Z(this.f2230z);
                 }
-                j0(this.f2224z);
+                j0(this.f2230z);
                 if (t2) {
                     try {
-                        this.R.a(this.m0, 0, this.f2224z.j, j, 0);
+                        this.R.a(this.m0, 0, this.f2230z.j, j, 0);
                     } catch (MediaCodec.CryptoException e2) {
                         throw z(e2, this.I, false);
                     }
                 } else {
-                    this.R.queueInputBuffer(this.m0, 0, this.f2224z.k.limit(), j, 0);
+                    this.R.queueInputBuffer(this.m0, 0, this.f2230z.k.limit(), j, 0);
                 }
                 r0();
                 this.y0 = true;
@@ -754,7 +754,7 @@ public abstract class MediaCodecRenderer extends g0 {
                 this.L0.f1004c++;
                 return true;
             } else {
-                this.f2224z.p();
+                this.f2230z.p();
                 if (this.v0 == 2) {
                     this.v0 = 1;
                 }
@@ -775,7 +775,7 @@ public abstract class MediaCodecRenderer extends g0 {
         if (this.R == null) {
             return false;
         }
-        if (this.x0 == 3 || this.f2213b0 || ((this.f2214c0 && !this.A0) || (this.f2215d0 && this.z0))) {
+        if (this.x0 == 3 || this.f2219b0 || ((this.f2220c0 && !this.A0) || (this.f2221d0 && this.z0))) {
             n0();
             return true;
         }
@@ -863,7 +863,7 @@ public abstract class MediaCodecRenderer extends g0 {
             Objects.requireNonNull(formatArr);
             f = W(f2, format, formatArr);
         }
-        float f3 = f <= this.f2222x ? -1.0f : f;
+        float f3 = f <= this.f2228x ? -1.0f : f;
         r rVar = null;
         try {
             long elapsedRealtime = SystemClock.elapsedRealtime();
@@ -893,9 +893,9 @@ public abstract class MediaCodecRenderer extends g0 {
                     if (str2.startsWith("SM-T585") || str2.startsWith("SM-A510") || str2.startsWith("SM-A520") || str2.startsWith("SM-J700")) {
                         i = 2;
                         this.Z = i;
-                        this.f2212a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
-                        this.f2213b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
-                        this.f2214c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
+                        this.f2218a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
+                        this.f2219b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
+                        this.f2220c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
                         if (i2 > 23 || !"OMX.google.vorbis.decoder".equals(str)) {
                             if (i2 <= 19) {
                                 String str3 = f0.b;
@@ -905,16 +905,16 @@ public abstract class MediaCodecRenderer extends g0 {
                                 }
                             }
                             z2 = false;
-                            this.f2215d0 = z2;
-                            this.f2216e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                            this.f2221d0 = z2;
+                            this.f2222e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                             if (i2 < 21 && "OMX.SEC.mp3.dec".equals(str) && "samsung".equals(f0.f899c)) {
                                 String str4 = f0.b;
                                 if (str4.startsWith("baffin") || str4.startsWith("grand") || str4.startsWith("fortuna") || str4.startsWith("gprimelte") || str4.startsWith("j2y18lte") || str4.startsWith("ms01")) {
                                     z3 = true;
-                                    this.f2217f0 = z3;
-                                    this.f2218g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                                    this.f2223f0 = z3;
+                                    this.f2224g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                                     String str5 = sVar.a;
-                                    this.f2221j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
+                                    this.f2227j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                                     if ("c2.android.mp3.decoder".equals(sVar.a)) {
                                         this.k0 = new q();
                                     }
@@ -926,10 +926,10 @@ public abstract class MediaCodecRenderer extends g0 {
                                 }
                             }
                             z3 = false;
-                            this.f2217f0 = z3;
-                            this.f2218g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                            this.f2223f0 = z3;
+                            this.f2224g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                             String str5 = sVar.a;
-                            this.f2221j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
+                            this.f2227j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                             if ("c2.android.mp3.decoder".equals(sVar.a)) {
                             }
                             if (this.m == 2) {
@@ -938,14 +938,14 @@ public abstract class MediaCodecRenderer extends g0 {
                             d0(str, elapsedRealtime2, elapsedRealtime2 - elapsedRealtime);
                         }
                         z2 = true;
-                        this.f2215d0 = z2;
-                        this.f2216e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                        this.f2221d0 = z2;
+                        this.f2222e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                         String str4 = f0.b;
                         z3 = true;
-                        this.f2217f0 = z3;
-                        this.f2218g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                        this.f2223f0 = z3;
+                        this.f2224g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                         String str5 = sVar.a;
-                        this.f2221j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
+                        this.f2227j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                         if ("c2.android.mp3.decoder".equals(sVar.a)) {
                         }
                         if (this.m == 2) {
@@ -959,20 +959,20 @@ public abstract class MediaCodecRenderer extends g0 {
                     if ("flounder".equals(str6) || "flounder_lte".equals(str6) || "grouper".equals(str6) || "tilapia".equals(str6)) {
                         i = 1;
                         this.Z = i;
-                        this.f2212a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
-                        this.f2213b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
-                        this.f2214c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
+                        this.f2218a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
+                        this.f2219b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
+                        this.f2220c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
                         if (i2 <= 19) {
                         }
                         z2 = false;
-                        this.f2215d0 = z2;
-                        this.f2216e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                        this.f2221d0 = z2;
+                        this.f2222e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                         String str4 = f0.b;
                         z3 = true;
-                        this.f2217f0 = z3;
-                        this.f2218g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                        this.f2223f0 = z3;
+                        this.f2224g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                         String str5 = sVar.a;
-                        this.f2221j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
+                        this.f2227j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                         if ("c2.android.mp3.decoder".equals(sVar.a)) {
                         }
                         if (this.m == 2) {
@@ -983,20 +983,20 @@ public abstract class MediaCodecRenderer extends g0 {
                 }
                 i = 0;
                 this.Z = i;
-                this.f2212a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
-                this.f2213b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
-                this.f2214c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
+                this.f2218a0 = i2 >= 21 && this.S.v.isEmpty() && "OMX.MTK.VIDEO.DECODER.AVC".equals(str);
+                this.f2219b0 = i2 >= 18 || (i2 == 18 && ("OMX.SEC.avc.dec".equals(str) || "OMX.SEC.avc.dec.secure".equals(str))) || (i2 == 19 && f0.d.startsWith("SM-G800") && ("OMX.Exynos.avc.dec".equals(str) || "OMX.Exynos.avc.dec.secure".equals(str)));
+                this.f2220c0 = i2 != 29 && "c2.android.aac.decoder".equals(str);
                 if (i2 <= 19) {
                 }
                 z2 = false;
-                this.f2215d0 = z2;
-                this.f2216e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
+                this.f2221d0 = z2;
+                this.f2222e0 = i2 != 21 && "OMX.google.aac.decoder".equals(str);
                 String str4 = f0.b;
                 z3 = true;
-                this.f2217f0 = z3;
-                this.f2218g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
+                this.f2223f0 = z3;
+                this.f2224g0 = i2 > 18 && this.S.G == 1 && "OMX.MTK.AUDIO.DECODER.MP3".equals(str);
                 String str5 = sVar.a;
-                this.f2221j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
+                this.f2227j0 = !((i2 > 25 && "OMX.rk.video_decoder.avc".equals(str5)) || ((i2 <= 17 && "OMX.allwinner.video.decoder.avc".equals(str5)) || ((i2 <= 29 && ("OMX.broadcom.video_decoder.tunnel".equals(str5) || "OMX.broadcom.video_decoder.tunnel.secure".equals(str5))) || ("Amazon".equals(f0.f899c) && "AFTS".equals(f0.d) && sVar.f)))) || V();
                 if ("c2.android.mp3.decoder".equals(sVar.a)) {
                 }
                 if (this.m == 2) {
@@ -1246,10 +1246,10 @@ public abstract class MediaCodecRenderer extends g0 {
                             this.u0 = true;
                             this.v0 = 1;
                             int i3 = this.Z;
-                            if (!(i3 == 2 || (i3 == 1 && format.f2189y == format2.f2189y && format.f2190z == format2.f2190z))) {
+                            if (!(i3 == 2 || (i3 == 1 && format.f2195y == format2.f2195y && format.f2196z == format2.f2196z))) {
                                 z4 = false;
                             }
-                            this.f2219h0 = z4;
+                            this.f2225h0 = z4;
                             this.S = format;
                             if (z5) {
                             }
@@ -1259,7 +1259,7 @@ public abstract class MediaCodecRenderer extends g0 {
                         if (!z5) {
                             if (this.y0) {
                                 this.w0 = 1;
-                                if (this.f2213b0 || this.f2215d0) {
+                                if (this.f2219b0 || this.f2221d0) {
                                     this.x0 = 3;
                                     z4 = false;
                                 } else {
@@ -1333,12 +1333,12 @@ public abstract class MediaCodecRenderer extends g0 {
 
     public final boolean m0(boolean z2) throws ExoPlaybackException {
         s0 A = A();
-        this.f2223y.p();
-        int I = I(A, this.f2223y, z2);
+        this.f2229y.p();
+        int I = I(A, this.f2229y, z2);
         if (I == -5) {
             f0(A);
             return true;
-        } else if (I != -4 || !this.f2223y.n()) {
+        } else if (I != -4 || !this.f2229y.n()) {
             return false;
         } else {
             this.D0 = true;
@@ -1409,8 +1409,8 @@ public abstract class MediaCodecRenderer extends g0 {
         this.l0 = -9223372036854775807L;
         this.z0 = false;
         this.y0 = false;
-        this.f2219h0 = false;
-        this.f2220i0 = false;
+        this.f2225h0 = false;
+        this.f2226i0 = false;
         this.p0 = false;
         this.q0 = false;
         this.D.clear();
@@ -1498,14 +1498,14 @@ public abstract class MediaCodecRenderer extends g0 {
         this.A0 = false;
         this.V = -1.0f;
         this.Z = 0;
-        this.f2212a0 = false;
-        this.f2213b0 = false;
-        this.f2214c0 = false;
-        this.f2215d0 = false;
-        this.f2216e0 = false;
-        this.f2217f0 = false;
-        this.f2218g0 = false;
-        this.f2221j0 = false;
+        this.f2218a0 = false;
+        this.f2219b0 = false;
+        this.f2220c0 = false;
+        this.f2221d0 = false;
+        this.f2222e0 = false;
+        this.f2223f0 = false;
+        this.f2224g0 = false;
+        this.f2227j0 = false;
         this.u0 = false;
         this.v0 = 0;
         this.N = false;
@@ -1513,7 +1513,7 @@ public abstract class MediaCodecRenderer extends g0 {
 
     public final void r0() {
         this.m0 = -1;
-        this.f2224z.k = null;
+        this.f2230z.k = null;
     }
 
     public final void s0(@Nullable DrmSession drmSession) {
@@ -1571,7 +1571,7 @@ public abstract class MediaCodecRenderer extends g0 {
         if (W == -1.0f) {
             O();
             return false;
-        } else if (f2 == -1.0f && W <= this.f2222x) {
+        } else if (f2 == -1.0f && W <= this.f2228x) {
             return true;
         } else {
             Bundle bundle = new Bundle();
diff --git a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index b0f04766a9..a2115d8fd5 100644
--- a/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/app/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -27,7 +27,7 @@ public final class MediaCodecUtil {
     public static final HashMap<b, List<s>> b = new HashMap<>();
 
     /* renamed from: c  reason: collision with root package name */
-    public static int f2225c = -1;
+    public static int f2231c = -1;
 
     public static class DecoderQueryException extends Exception {
         public DecoderQueryException(Throwable th, a aVar) {
@@ -40,12 +40,12 @@ public final class MediaCodecUtil {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2226c;
+        public final boolean f2232c;
 
         public b(String str, boolean z2, boolean z3) {
             this.a = str;
             this.b = z2;
-            this.f2226c = z3;
+            this.f2232c = z3;
         }
 
         public boolean equals(@Nullable Object obj) {
@@ -56,13 +56,13 @@ public final class MediaCodecUtil {
                 return false;
             }
             b bVar = (b) obj;
-            return TextUtils.equals(this.a, bVar.a) && this.b == bVar.b && this.f2226c == bVar.f2226c;
+            return TextUtils.equals(this.a, bVar.a) && this.b == bVar.b && this.f2232c == bVar.f2232c;
         }
 
         public int hashCode() {
             int i = 1231;
             int x2 = (c.d.b.a.a.x(this.a, 31, 31) + (this.b ? 1231 : 1237)) * 31;
-            if (!this.f2226c) {
+            if (!this.f2232c) {
                 i = 1237;
             }
             return x2 + i;
@@ -1304,7 +1304,7 @@ public final class MediaCodecUtil {
                                 MediaCodecInfo.CodecCapabilities capabilitiesForType = a2.getCapabilitiesForType(b2);
                                 boolean b3 = cVar.b("tunneled-playback", b2, capabilitiesForType);
                                 boolean c2 = cVar.c("tunneled-playback", b2, capabilitiesForType);
-                                boolean z5 = bVar2.f2226c;
+                                boolean z5 = bVar2.f2232c;
                                 if (z5 || !c2) {
                                     if (!z5 || b3) {
                                         boolean b4 = cVar.b("secure-playback", b2, capabilitiesForType);
@@ -1489,7 +1489,7 @@ public final class MediaCodecUtil {
 
     public static int i() throws DecoderQueryException {
         int i;
-        if (f2225c == -1) {
+        if (f2231c == -1) {
             int i2 = 0;
             s d2 = d("video/avc", false, false);
             if (d2 != null) {
@@ -1544,9 +1544,9 @@ public final class MediaCodecUtil {
                 }
                 i2 = Math.max(i3, f0.a >= 21 ? 345600 : 172800);
             }
-            f2225c = i2;
+            f2231c = i2;
         }
-        return f2225c;
+        return f2231c;
     }
 
     public static <T> void j(List<T> list, f<T> fVar) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
index 89e73acbdb..57f0d77e5f 100644
--- a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
+++ b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
@@ -19,7 +19,7 @@ public final class SpliceInsertCommand extends SpliceCommand {
     public final long r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final int f2227s;
+    public final int f2233s;
     public final int t;
     public final int u;
 
@@ -42,18 +42,18 @@ public final class SpliceInsertCommand extends SpliceCommand {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2228c;
+        public final long f2234c;
 
         public b(int i, long j, long j2) {
             this.a = i;
             this.b = j;
-            this.f2228c = j2;
+            this.f2234c = j2;
         }
 
         public b(int i, long j, long j2, a aVar) {
             this.a = i;
             this.b = j;
-            this.f2228c = j2;
+            this.f2234c = j2;
         }
     }
 
@@ -68,7 +68,7 @@ public final class SpliceInsertCommand extends SpliceCommand {
         this.p = Collections.unmodifiableList(list);
         this.q = z6;
         this.r = j4;
-        this.f2227s = i;
+        this.f2233s = i;
         this.t = i2;
         this.u = i3;
     }
@@ -90,7 +90,7 @@ public final class SpliceInsertCommand extends SpliceCommand {
         this.p = Collections.unmodifiableList(arrayList);
         this.q = parcel.readByte() == 1 ? true : z2;
         this.r = parcel.readLong();
-        this.f2227s = parcel.readInt();
+        this.f2233s = parcel.readInt();
         this.t = parcel.readInt();
         this.u = parcel.readInt();
     }
@@ -110,11 +110,11 @@ public final class SpliceInsertCommand extends SpliceCommand {
             b bVar = this.p.get(i2);
             parcel.writeInt(bVar.a);
             parcel.writeLong(bVar.b);
-            parcel.writeLong(bVar.f2228c);
+            parcel.writeLong(bVar.f2234c);
         }
         parcel.writeByte(this.q ? (byte) 1 : 0);
         parcel.writeLong(this.r);
-        parcel.writeInt(this.f2227s);
+        parcel.writeInt(this.f2233s);
         parcel.writeInt(this.t);
         parcel.writeInt(this.u);
     }
diff --git a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
index 2a36bea257..c3f4dd12e3 100644
--- a/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
+++ b/app/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
@@ -43,7 +43,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2229c;
+        public final boolean f2235c;
         public final boolean d;
         public final long e;
         public final List<b> f;
@@ -56,7 +56,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
         public c(long j, boolean z2, boolean z3, boolean z4, List<b> list, long j2, boolean z5, long j3, int i, int i2, int i3) {
             this.a = j;
             this.b = z2;
-            this.f2229c = z3;
+            this.f2235c = z3;
             this.d = z4;
             this.f = Collections.unmodifiableList(list);
             this.e = j2;
@@ -71,7 +71,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
             this.a = parcel.readLong();
             boolean z2 = false;
             this.b = parcel.readByte() == 1;
-            this.f2229c = parcel.readByte() == 1;
+            this.f2235c = parcel.readByte() == 1;
             this.d = parcel.readByte() == 1;
             int readInt = parcel.readInt();
             ArrayList arrayList = new ArrayList(readInt);
@@ -109,7 +109,7 @@ public final class SpliceScheduleCommand extends SpliceCommand {
             c cVar = this.i.get(i2);
             parcel.writeLong(cVar.a);
             parcel.writeByte(cVar.b ? (byte) 1 : 0);
-            parcel.writeByte(cVar.f2229c ? (byte) 1 : 0);
+            parcel.writeByte(cVar.f2235c ? (byte) 1 : 0);
             parcel.writeByte(cVar.d ? (byte) 1 : 0);
             int size2 = cVar.f.size();
             parcel.writeInt(size2);
diff --git a/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
index 200ba6bfd1..f4bcdd6654 100644
--- a/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/app/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -40,7 +40,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 public class DefaultTrackSelector extends i {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f2230c = new int[0];
+    public static final int[] f2236c = new int[0];
     public static final p0<Integer> d = p0.a(c.i.a.c.f2.c.i);
     public static final p0<Integer> e = p0.a(c.i.a.c.f2.b.i);
     public final g.b f;
@@ -72,20 +72,20 @@ public class DefaultTrackSelector extends i {
         public final int r;
 
         /* renamed from: s  reason: collision with root package name */
-        public final int f2231s;
+        public final int f2237s;
         public final int t;
         public final int u;
         public final int v;
         public final int w;
 
         /* renamed from: x  reason: collision with root package name */
-        public final int f2232x;
+        public final int f2238x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final boolean f2233y;
+        public final boolean f2239y;
 
         /* renamed from: z  reason: collision with root package name */
-        public final boolean f2234z;
+        public final boolean f2240z;
 
         public class a implements Parcelable.Creator<Parameters> {
             /* Return type fixed from 'java.lang.Object' to match base method */
@@ -105,14 +105,14 @@ public class DefaultTrackSelector extends i {
             super(uVar2, i11, uVar4, i14, z10, i15);
             this.q = i;
             this.r = i2;
-            this.f2231s = i3;
+            this.f2237s = i3;
             this.t = i4;
             this.u = i5;
             this.v = i6;
             this.w = i7;
-            this.f2232x = i8;
-            this.f2233y = z2;
-            this.f2234z = z3;
+            this.f2238x = i8;
+            this.f2239y = z2;
+            this.f2240z = z3;
             this.A = z4;
             this.B = i9;
             this.C = i10;
@@ -138,16 +138,16 @@ public class DefaultTrackSelector extends i {
             super(parcel);
             this.q = parcel.readInt();
             this.r = parcel.readInt();
-            this.f2231s = parcel.readInt();
+            this.f2237s = parcel.readInt();
             this.t = parcel.readInt();
             this.u = parcel.readInt();
             this.v = parcel.readInt();
             this.w = parcel.readInt();
-            this.f2232x = parcel.readInt();
+            this.f2238x = parcel.readInt();
             int i = f0.a;
             boolean z2 = true;
-            this.f2233y = parcel.readInt() != 0;
-            this.f2234z = parcel.readInt() != 0;
+            this.f2239y = parcel.readInt() != 0;
+            this.f2240z = parcel.readInt() != 0;
             this.A = parcel.readInt() != 0;
             this.B = parcel.readInt();
             this.C = parcel.readInt();
@@ -204,7 +204,7 @@ public class DefaultTrackSelector extends i {
                 return false;
             }
             Parameters parameters = (Parameters) obj;
-            if (super.equals(obj) && this.q == parameters.q && this.r == parameters.r && this.f2231s == parameters.f2231s && this.t == parameters.t && this.u == parameters.u && this.v == parameters.v && this.w == parameters.w && this.f2232x == parameters.f2232x && this.f2233y == parameters.f2233y && this.f2234z == parameters.f2234z && this.A == parameters.A && this.D == parameters.D && this.B == parameters.B && this.C == parameters.C && this.E.equals(parameters.E) && this.F == parameters.F && this.G == parameters.G && this.H == parameters.H && this.I == parameters.I && this.J == parameters.J && this.K == parameters.K && this.L.equals(parameters.L) && this.M == parameters.M && this.N == parameters.N && this.O == parameters.O && this.P == parameters.P && this.Q == parameters.Q) {
+            if (super.equals(obj) && this.q == parameters.q && this.r == parameters.r && this.f2237s == parameters.f2237s && this.t == parameters.t && this.u == parameters.u && this.v == parameters.v && this.w == parameters.w && this.f2238x == parameters.f2238x && this.f2239y == parameters.f2239y && this.f2240z == parameters.f2240z && this.A == parameters.A && this.D == parameters.D && this.B == parameters.B && this.C == parameters.C && this.E.equals(parameters.E) && this.F == parameters.F && this.G == parameters.G && this.H == parameters.H && this.I == parameters.I && this.J == parameters.J && this.K == parameters.K && this.L.equals(parameters.L) && this.M == parameters.M && this.N == parameters.N && this.O == parameters.O && this.P == parameters.P && this.Q == parameters.Q) {
                 SparseBooleanArray sparseBooleanArray = this.S;
                 SparseBooleanArray sparseBooleanArray2 = parameters.S;
                 int size = sparseBooleanArray.size();
@@ -279,7 +279,7 @@ public class DefaultTrackSelector extends i {
         @Override // com.google.android.exoplayer2.trackselection.TrackSelectionParameters, java.lang.Object
         public int hashCode() {
             int hashCode = this.E.hashCode();
-            return ((((((((((this.L.hashCode() + ((((((((((((((hashCode + (((((((((((((((((((((((((((((super.hashCode() * 31) + this.q) * 31) + this.r) * 31) + this.f2231s) * 31) + this.t) * 31) + this.u) * 31) + this.v) * 31) + this.w) * 31) + this.f2232x) * 31) + (this.f2233y ? 1 : 0)) * 31) + (this.f2234z ? 1 : 0)) * 31) + (this.A ? 1 : 0)) * 31) + (this.D ? 1 : 0)) * 31) + this.B) * 31) + this.C) * 31)) * 31) + this.F) * 31) + this.G) * 31) + (this.H ? 1 : 0)) * 31) + (this.I ? 1 : 0)) * 31) + (this.J ? 1 : 0)) * 31) + (this.K ? 1 : 0)) * 31)) * 31) + (this.M ? 1 : 0)) * 31) + (this.N ? 1 : 0)) * 31) + (this.O ? 1 : 0)) * 31) + (this.P ? 1 : 0)) * 31) + (this.Q ? 1 : 0);
+            return ((((((((((this.L.hashCode() + ((((((((((((((hashCode + (((((((((((((((((((((((((((((super.hashCode() * 31) + this.q) * 31) + this.r) * 31) + this.f2237s) * 31) + this.t) * 31) + this.u) * 31) + this.v) * 31) + this.w) * 31) + this.f2238x) * 31) + (this.f2239y ? 1 : 0)) * 31) + (this.f2240z ? 1 : 0)) * 31) + (this.A ? 1 : 0)) * 31) + (this.D ? 1 : 0)) * 31) + this.B) * 31) + this.C) * 31)) * 31) + this.F) * 31) + this.G) * 31) + (this.H ? 1 : 0)) * 31) + (this.I ? 1 : 0)) * 31) + (this.J ? 1 : 0)) * 31) + (this.K ? 1 : 0)) * 31)) * 31) + (this.M ? 1 : 0)) * 31) + (this.N ? 1 : 0)) * 31) + (this.O ? 1 : 0)) * 31) + (this.P ? 1 : 0)) * 31) + (this.Q ? 1 : 0);
         }
 
         @Override // com.google.android.exoplayer2.trackselection.TrackSelectionParameters, android.os.Parcelable
@@ -287,16 +287,16 @@ public class DefaultTrackSelector extends i {
             super.writeToParcel(parcel, i);
             parcel.writeInt(this.q);
             parcel.writeInt(this.r);
-            parcel.writeInt(this.f2231s);
+            parcel.writeInt(this.f2237s);
             parcel.writeInt(this.t);
             parcel.writeInt(this.u);
             parcel.writeInt(this.v);
             parcel.writeInt(this.w);
-            parcel.writeInt(this.f2232x);
-            boolean z2 = this.f2233y;
+            parcel.writeInt(this.f2238x);
+            boolean z2 = this.f2239y;
             int i2 = f0.a;
             parcel.writeInt(z2 ? 1 : 0);
-            parcel.writeInt(this.f2234z ? 1 : 0);
+            parcel.writeInt(this.f2240z ? 1 : 0);
             parcel.writeInt(this.A ? 1 : 0);
             parcel.writeInt(this.B);
             parcel.writeInt(this.C);
@@ -411,7 +411,7 @@ public class DefaultTrackSelector extends i {
         public final boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public final int f2235s;
+        public final int f2241s;
         public final int t;
         public final int u;
         public final int v;
@@ -445,7 +445,7 @@ public class DefaultTrackSelector extends i {
             this.o = Integer.bitCount(format.m & parameters.k);
             this.r = (format.l & 1) != 0;
             int i7 = format.G;
-            this.f2235s = i7;
+            this.f2241s = i7;
             this.t = format.H;
             int i8 = format.p;
             this.u = i8;
@@ -500,7 +500,7 @@ public class DefaultTrackSelector extends i {
             Integer valueOf = Integer.valueOf(this.n);
             Integer valueOf2 = Integer.valueOf(aVar.n);
             t0 t0Var = t0.i;
-            n b2 = c2.b(valueOf, valueOf2, t0Var).a(this.m, aVar.m).a(this.o, aVar.o).c(this.i, aVar.i).b(Integer.valueOf(this.v), Integer.valueOf(aVar.v), t0Var).b(Integer.valueOf(this.u), Integer.valueOf(aVar.u), this.k.M ? DefaultTrackSelector.d.b() : DefaultTrackSelector.e).c(this.r, aVar.r).b(Integer.valueOf(this.p), Integer.valueOf(aVar.p), t0Var).a(this.q, aVar.q).b(Integer.valueOf(this.f2235s), Integer.valueOf(aVar.f2235s), b).b(Integer.valueOf(this.t), Integer.valueOf(aVar.t), b);
+            n b2 = c2.b(valueOf, valueOf2, t0Var).a(this.m, aVar.m).a(this.o, aVar.o).c(this.i, aVar.i).b(Integer.valueOf(this.v), Integer.valueOf(aVar.v), t0Var).b(Integer.valueOf(this.u), Integer.valueOf(aVar.u), this.k.M ? DefaultTrackSelector.d.b() : DefaultTrackSelector.e).c(this.r, aVar.r).b(Integer.valueOf(this.p), Integer.valueOf(aVar.p), t0Var).a(this.q, aVar.q).b(Integer.valueOf(this.f2241s), Integer.valueOf(aVar.f2241s), b).b(Integer.valueOf(this.t), Integer.valueOf(aVar.t), b);
             Integer valueOf3 = Integer.valueOf(this.u);
             Integer valueOf4 = Integer.valueOf(aVar.u);
             if (!f0.a(this.j, aVar.j)) {
@@ -543,7 +543,7 @@ public class DefaultTrackSelector extends i {
         public boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public boolean f2236s;
+        public boolean f2242s;
         public final SparseArray<Map<TrackGroupArray, SelectionOverride>> t = new SparseArray<>();
         public final SparseBooleanArray u = new SparseBooleanArray();
 
@@ -617,7 +617,7 @@ public class DefaultTrackSelector extends i {
         }
 
         public Parameters b() {
-            return new Parameters(this.d, this.e, this.f, this.g, 0, 0, 0, 0, this.h, false, this.i, this.j, this.k, this.l, this.m, this.a, 0, this.n, this.o, this.p, false, false, false, this.q, this.b, this.f2237c, false, 0, false, false, this.r, false, this.f2236s, this.t, this.u);
+            return new Parameters(this.d, this.e, this.f, this.g, 0, 0, 0, 0, this.h, false, this.i, this.j, this.k, this.l, this.m, this.a, 0, this.n, this.o, this.p, false, false, false, this.q, this.b, this.f2243c, false, 0, false, false, this.r, false, this.f2242s, this.t, this.u);
         }
 
         /* JADX DEBUG: Type inference failed for r2v1. Raw type applied. Possible types: c.i.b.b.u<java.lang.Object>, c.i.b.b.u<java.lang.String> */
@@ -640,7 +640,7 @@ public class DefaultTrackSelector extends i {
             this.p = true;
             this.q = uVar;
             this.r = true;
-            this.f2236s = true;
+            this.f2242s = true;
         }
     }
 
@@ -726,7 +726,7 @@ public class DefaultTrackSelector extends i {
             if (r10 < ((float) r8.w)) goto L_0x005e;
          */
         /* JADX WARNING: Code restructure failed: missing block: B:37:0x005b, code lost:
-            if (r10 < r8.f2232x) goto L_0x005e;
+            if (r10 < r8.f2238x) goto L_0x005e;
          */
         /* JADX WARNING: Removed duplicated region for block: B:32:0x004e  */
         /* JADX WARNING: Removed duplicated region for block: B:36:0x0059  */
@@ -747,12 +747,12 @@ public class DefaultTrackSelector extends i {
             int i10 = 0;
             boolean z4 = true;
             int i11 = -1;
-            if (z2 && (((i7 = format.f2189y) == -1 || i7 <= parameters.q) && ((i8 = format.f2190z) == -1 || i8 <= parameters.r))) {
+            if (z2 && (((i7 = format.f2195y) == -1 || i7 <= parameters.q) && ((i8 = format.f2196z) == -1 || i8 <= parameters.r))) {
                 float f2 = format.A;
-                if ((f2 == -1.0f || f2 <= ((float) parameters.f2231s)) && ((i9 = format.p) == -1 || i9 <= parameters.t)) {
+                if ((f2 == -1.0f || f2 <= ((float) parameters.f2237s)) && ((i9 = format.p) == -1 || i9 <= parameters.t)) {
                     z3 = true;
                     this.i = z3;
-                    if (z2 && (((i4 = format.f2189y) == -1 || i4 >= parameters.u) && ((i5 = format.f2190z) == -1 || i5 >= parameters.v))) {
+                    if (z2 && (((i4 = format.f2195y) == -1 || i4 >= parameters.u) && ((i5 = format.f2196z) == -1 || i5 >= parameters.v))) {
                         f = format.A;
                         if (f != -1.0f) {
                         }
@@ -762,8 +762,8 @@ public class DefaultTrackSelector extends i {
                         this.k = z4;
                         this.l = DefaultTrackSelector.e(i, false);
                         this.m = format.p;
-                        i2 = format.f2189y;
-                        if (!(i2 == -1 || (i3 = format.f2190z) == -1)) {
+                        i2 = format.f2195y;
+                        if (!(i2 == -1 || (i3 = format.f2196z) == -1)) {
                             i11 = i2 * i3;
                         }
                         this.n = i11;
@@ -786,7 +786,7 @@ public class DefaultTrackSelector extends i {
                     this.k = z4;
                     this.l = DefaultTrackSelector.e(i, false);
                     this.m = format.p;
-                    i2 = format.f2189y;
+                    i2 = format.f2195y;
                     i11 = i2 * i3;
                     this.n = i11;
                     int i12 = Integer.MAX_VALUE;
@@ -809,7 +809,7 @@ public class DefaultTrackSelector extends i {
             this.k = z4;
             this.l = DefaultTrackSelector.e(i, false);
             this.m = format.p;
-            i2 = format.f2189y;
+            i2 = format.f2195y;
             i11 = i2 * i3;
             this.n = i11;
             int i12 = Integer.MAX_VALUE;
@@ -880,8 +880,8 @@ public class DefaultTrackSelector extends i {
                     break;
                 }
                 Format format = trackGroup.j[i9];
-                int i11 = format.f2189y;
-                if (i11 > 0 && (i4 = format.f2190z) > 0) {
+                int i11 = format.f2195y;
+                if (i11 > 0 && (i4 = format.f2196z) > 0) {
                     if (z2) {
                         boolean z4 = i11 > i4;
                         if (i <= i2) {
@@ -893,8 +893,8 @@ public class DefaultTrackSelector extends i {
                             int i12 = i11 * i6;
                             int i13 = i4 * i5;
                             Point point = i12 < i13 ? new Point(i5, f0.f(i13, i11)) : new Point(f0.f(i12, i4), i6);
-                            int i14 = format.f2189y;
-                            int i15 = format.f2190z;
+                            int i14 = format.f2195y;
+                            int i15 = format.f2196z;
                             i7 = i14 * i15;
                             if (i14 >= ((int) (((float) point.x) * 0.98f)) && i15 >= ((int) (((float) point.y) * 0.98f)) && i7 < i10) {
                                 i10 = i7;
@@ -907,8 +907,8 @@ public class DefaultTrackSelector extends i {
                     int i13 = i4 * i5;
                     if (i12 < i13) {
                     }
-                    int i14 = format.f2189y;
-                    int i15 = format.f2190z;
+                    int i14 = format.f2195y;
+                    int i15 = format.f2196z;
                     i7 = i14 * i15;
                     i10 = i7;
                 }
@@ -917,8 +917,8 @@ public class DefaultTrackSelector extends i {
             if (i10 != Integer.MAX_VALUE) {
                 for (int size = arrayList.size() - 1; size >= 0; size--) {
                     Format format2 = trackGroup.j[((Integer) arrayList.get(size)).intValue()];
-                    int i16 = format2.f2189y;
-                    int i17 = (i16 == -1 || (i3 = format2.f2190z) == -1) ? -1 : i16 * i3;
+                    int i16 = format2.f2195y;
+                    int i17 = (i16 == -1 || (i3 = format2.f2196z) == -1) ? -1 : i16 * i3;
                     if (i17 == -1 || i17 > i10) {
                         arrayList.remove(size);
                     }
@@ -940,11 +940,11 @@ public class DefaultTrackSelector extends i {
         if (str != null && !f0.a(format.t, str)) {
             return false;
         }
-        int i11 = format.f2189y;
+        int i11 = format.f2195y;
         if (i11 != -1 && (i7 > i11 || i11 > i3)) {
             return false;
         }
-        int i12 = format.f2190z;
+        int i12 = format.f2196z;
         if (i12 != -1 && (i8 > i12 || i12 > i4)) {
             return false;
         }
diff --git a/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
index 16592aa2c3..b9ec5dded6 100644
--- a/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
+++ b/app/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -40,7 +40,7 @@ public class TrackSelectionParameters implements Parcelable {
         public u<String> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2237c = 0;
+        public int f2243c = 0;
 
         /* JADX DEBUG: Type inference failed for r0v1. Raw type applied. Possible types: c.i.b.b.u<java.lang.Object>, c.i.b.b.u<java.lang.String> */
         @Deprecated
@@ -55,7 +55,7 @@ public class TrackSelectionParameters implements Parcelable {
             CaptioningManager captioningManager;
             int i = f0.a;
             if (i >= 19 && ((i >= 23 || Looper.myLooper() != null) && (captioningManager = (CaptioningManager) context.getSystemService("captioning")) != null && captioningManager.isEnabled())) {
-                this.f2237c = 1088;
+                this.f2243c = 1088;
                 Locale locale = captioningManager.getLocale();
                 if (locale != null) {
                     this.b = u.t(i >= 21 ? locale.toLanguageTag() : locale.toString());
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
index 7260e90768..fcf1c5abfb 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -67,20 +67,20 @@ public class DefaultTimeBar extends View implements k {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public final Drawable f2238s;
+    public final Drawable f2244s;
     public final int t;
     public final int u;
     public final int v;
     public final int w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final int f2239x;
+    public final int f2245x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2240y;
+    public final int f2246y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final int f2241z;
+    public final int f2247z;
 
     public DefaultTimeBar(Context context, @Nullable AttributeSet attributeSet) {
         this(context, attributeSet, 0, attributeSet);
@@ -120,7 +120,7 @@ public class DefaultTimeBar extends View implements k {
             TypedArray obtainStyledAttributes = context.getTheme().obtainStyledAttributes(attributeSet2, R.g.DefaultTimeBar, i, 0);
             try {
                 Drawable drawable = obtainStyledAttributes.getDrawable(R.g.DefaultTimeBar_scrubber_drawable);
-                this.f2238s = drawable;
+                this.f2244s = drawable;
                 if (drawable != null) {
                     int i2 = f0.a;
                     if (i2 >= 23) {
@@ -135,9 +135,9 @@ public class DefaultTimeBar extends View implements k {
                 this.u = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_touch_target_height, c3);
                 this.v = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_bar_gravity, 0);
                 this.w = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_ad_marker_width, c4);
-                this.f2239x = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_enabled_size, c5);
-                this.f2240y = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_disabled_size, c6);
-                this.f2241z = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_dragged_size, c7);
+                this.f2245x = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_enabled_size, c5);
+                this.f2246y = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_disabled_size, c6);
+                this.f2247z = obtainStyledAttributes.getDimensionPixelSize(R.g.DefaultTimeBar_scrubber_dragged_size, c7);
                 int i3 = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_played_color, -1);
                 int i4 = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_scrubber_color, -1);
                 int i5 = obtainStyledAttributes.getInt(R.g.DefaultTimeBar_buffered_color, -855638017);
@@ -158,26 +158,26 @@ public class DefaultTimeBar extends View implements k {
             this.u = c3;
             this.v = 0;
             this.w = c4;
-            this.f2239x = c5;
-            this.f2240y = c6;
-            this.f2241z = c7;
+            this.f2245x = c5;
+            this.f2246y = c6;
+            this.f2247z = c7;
             paint.setColor(-1);
             paint6.setColor(-1);
             paint2.setColor(-855638017);
             paint3.setColor(872415231);
             paint4.setColor(-1291845888);
             paint5.setColor(872414976);
-            this.f2238s = null;
+            this.f2244s = null;
         }
         StringBuilder sb = new StringBuilder();
         this.C = sb;
         this.D = new Formatter(sb, Locale.getDefault());
         this.E = new b(this);
-        Drawable drawable2 = this.f2238s;
+        Drawable drawable2 = this.f2244s;
         if (drawable2 != null) {
             this.A = (drawable2.getMinimumWidth() + 1) / 2;
         } else {
-            this.A = (Math.max(this.f2240y, Math.max(this.f2239x, this.f2241z)) + 1) / 2;
+            this.A = (Math.max(this.f2246y, Math.max(this.f2245x, this.f2247z)) + 1) / 2;
         }
         this.N = 1.0f;
         ValueAnimator valueAnimator = new ValueAnimator();
@@ -328,8 +328,8 @@ public class DefaultTimeBar extends View implements k {
     }
 
     public final void i() {
-        Drawable drawable = this.f2238s;
-        if (drawable != null && drawable.isStateful() && this.f2238s.setState(getDrawableState())) {
+        Drawable drawable = this.f2244s;
+        if (drawable != null && drawable.isStateful() && this.f2244s.setState(getDrawableState())) {
             invalidate();
         }
     }
@@ -347,7 +347,7 @@ public class DefaultTimeBar extends View implements k {
     @Override // android.view.View
     public void jumpDrawablesToCurrentState() {
         super.jumpDrawablesToCurrentState();
-        Drawable drawable = this.f2238s;
+        Drawable drawable = this.f2244s;
         if (drawable != null) {
             drawable.jumpToCurrentState();
         }
@@ -397,14 +397,14 @@ public class DefaultTimeBar extends View implements k {
             Rect rect5 = this.l;
             int h = f0.h(rect5.right, rect5.left, this.j.right);
             int centerY2 = this.l.centerY();
-            Drawable drawable = this.f2238s;
+            Drawable drawable = this.f2244s;
             if (drawable == null) {
-                canvas.drawCircle((float) h, (float) centerY2, (float) ((int) ((((float) ((this.O || isFocused()) ? this.f2241z : isEnabled() ? this.f2239x : this.f2240y)) * this.N) / 2.0f)), this.r);
+                canvas.drawCircle((float) h, (float) centerY2, (float) ((int) ((((float) ((this.O || isFocused()) ? this.f2247z : isEnabled() ? this.f2245x : this.f2246y)) * this.N) / 2.0f)), this.r);
             } else {
                 int intrinsicWidth = ((int) (((float) drawable.getIntrinsicWidth()) * this.N)) / 2;
-                int intrinsicHeight = ((int) (((float) this.f2238s.getIntrinsicHeight()) * this.N)) / 2;
-                this.f2238s.setBounds(h - intrinsicWidth, centerY2 - intrinsicHeight, h + intrinsicWidth, centerY2 + intrinsicHeight);
-                this.f2238s.draw(canvas);
+                int intrinsicHeight = ((int) (((float) this.f2244s.getIntrinsicHeight()) * this.N)) / 2;
+                this.f2244s.setBounds(h - intrinsicWidth, centerY2 - intrinsicHeight, h + intrinsicWidth, centerY2 + intrinsicHeight);
+                this.f2244s.draw(canvas);
             }
         }
         canvas.restore();
@@ -517,7 +517,7 @@ public class DefaultTimeBar extends View implements k {
 
     @Override // android.view.View
     public void onRtlPropertiesChanged(int i) {
-        Drawable drawable = this.f2238s;
+        Drawable drawable = this.f2244s;
         if (drawable != null) {
             if (f0.a >= 23 && drawable.setLayoutDirection(i)) {
                 invalidate();
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index ad6ff359f6..bdfff7d196 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -68,35 +68,35 @@ public class PlayerControlView extends FrameLayout {
     public boolean W;
 
     /* renamed from: a0  reason: collision with root package name */
-    public int f2242a0;
+    public int f2248a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public int f2243b0;
+    public int f2249b0;
 
     /* renamed from: c0  reason: collision with root package name */
-    public int f2244c0;
+    public int f2250c0;
 
     /* renamed from: d0  reason: collision with root package name */
-    public boolean f2245d0;
+    public boolean f2251d0;
 
     /* renamed from: e0  reason: collision with root package name */
-    public boolean f2246e0;
+    public boolean f2252e0;
 
     /* renamed from: f0  reason: collision with root package name */
-    public boolean f2247f0;
+    public boolean f2253f0;
 
     /* renamed from: g0  reason: collision with root package name */
-    public boolean f2248g0;
+    public boolean f2254g0;
 
     /* renamed from: h0  reason: collision with root package name */
-    public boolean f2249h0;
+    public boolean f2255h0;
 
     /* renamed from: i0  reason: collision with root package name */
-    public long f2250i0;
+    public long f2256i0;
     public final b j;
 
     /* renamed from: j0  reason: collision with root package name */
-    public long[] f2251j0;
+    public long[] f2257j0;
     public final CopyOnWriteArrayList<d> k;
     public boolean[] k0;
     @Nullable
@@ -119,7 +119,7 @@ public class PlayerControlView extends FrameLayout {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public final ImageView f2252s;
+    public final ImageView f2258s;
     @Nullable
     public final View t;
     @Nullable
@@ -130,13 +130,13 @@ public class PlayerControlView extends FrameLayout {
     public final k w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final StringBuilder f2253x;
+    public final StringBuilder f2259x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final Formatter f2254y;
+    public final Formatter f2260y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final r1.b f2255z;
+    public final r1.b f2261z;
 
     public final class b implements g1.a, k.a, View.OnClickListener {
         public b(a aVar) {
@@ -192,7 +192,7 @@ public class PlayerControlView extends FrameLayout {
             PlayerControlView playerControlView = PlayerControlView.this;
             TextView textView = playerControlView.v;
             if (textView != null) {
-                textView.setText(f0.u(playerControlView.f2253x, playerControlView.f2254y, j));
+                textView.setText(f0.u(playerControlView.f2259x, playerControlView.f2260y, j));
             }
         }
 
@@ -247,7 +247,7 @@ public class PlayerControlView extends FrameLayout {
             playerControlView.W = true;
             TextView textView = playerControlView.v;
             if (textView != null) {
-                textView.setText(f0.u(playerControlView.f2253x, playerControlView.f2254y, j));
+                textView.setText(f0.u(playerControlView.f2259x, playerControlView.f2260y, j));
             }
         }
 
@@ -292,7 +292,7 @@ public class PlayerControlView extends FrameLayout {
                 } else if (playerControlView.r == view) {
                     i0 i0Var = playerControlView.Q;
                     int B = g1Var.B();
-                    int i = PlayerControlView.this.f2244c0;
+                    int i = PlayerControlView.this.f2250c0;
                     int i2 = 1;
                     while (true) {
                         if (i2 > 2) {
@@ -315,7 +315,7 @@ public class PlayerControlView extends FrameLayout {
                     }
                     Objects.requireNonNull((j0) i0Var);
                     g1Var.x(B);
-                } else if (playerControlView.f2252s == view) {
+                } else if (playerControlView.f2258s == view) {
                     Objects.requireNonNull((j0) playerControlView.Q);
                     g1Var.h(!g1Var.F());
                 }
@@ -402,41 +402,41 @@ public class PlayerControlView extends FrameLayout {
         super(context, attributeSet, i2);
         int i3 = R.e.exo_player_control_view;
         int i4 = 5000;
-        this.f2242a0 = 5000;
-        this.f2244c0 = 0;
-        this.f2243b0 = 200;
-        this.f2250i0 = -9223372036854775807L;
-        this.f2245d0 = true;
-        this.f2246e0 = true;
-        this.f2247f0 = true;
-        this.f2248g0 = true;
-        this.f2249h0 = false;
+        this.f2248a0 = 5000;
+        this.f2250c0 = 0;
+        this.f2249b0 = 200;
+        this.f2256i0 = -9223372036854775807L;
+        this.f2251d0 = true;
+        this.f2252e0 = true;
+        this.f2253f0 = true;
+        this.f2254g0 = true;
+        this.f2255h0 = false;
         int i5 = 15000;
         if (attributeSet2 != null) {
             TypedArray obtainStyledAttributes = context.getTheme().obtainStyledAttributes(attributeSet2, R.g.PlayerControlView, 0, 0);
             try {
                 i4 = obtainStyledAttributes.getInt(R.g.PlayerControlView_rewind_increment, 5000);
                 i5 = obtainStyledAttributes.getInt(R.g.PlayerControlView_fastforward_increment, 15000);
-                this.f2242a0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_show_timeout, this.f2242a0);
+                this.f2248a0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_show_timeout, this.f2248a0);
                 i3 = obtainStyledAttributes.getResourceId(R.g.PlayerControlView_controller_layout_id, i3);
-                this.f2244c0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_repeat_toggle_modes, this.f2244c0);
-                this.f2245d0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_rewind_button, this.f2245d0);
-                this.f2246e0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_fastforward_button, this.f2246e0);
-                this.f2247f0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_previous_button, this.f2247f0);
-                this.f2248g0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_next_button, this.f2248g0);
-                this.f2249h0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_shuffle_button, this.f2249h0);
-                setTimeBarMinUpdateInterval(obtainStyledAttributes.getInt(R.g.PlayerControlView_time_bar_min_update_interval, this.f2243b0));
+                this.f2250c0 = obtainStyledAttributes.getInt(R.g.PlayerControlView_repeat_toggle_modes, this.f2250c0);
+                this.f2251d0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_rewind_button, this.f2251d0);
+                this.f2252e0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_fastforward_button, this.f2252e0);
+                this.f2253f0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_previous_button, this.f2253f0);
+                this.f2254g0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_next_button, this.f2254g0);
+                this.f2255h0 = obtainStyledAttributes.getBoolean(R.g.PlayerControlView_show_shuffle_button, this.f2255h0);
+                setTimeBarMinUpdateInterval(obtainStyledAttributes.getInt(R.g.PlayerControlView_time_bar_min_update_interval, this.f2249b0));
             } finally {
                 obtainStyledAttributes.recycle();
             }
         }
         this.k = new CopyOnWriteArrayList<>();
-        this.f2255z = new r1.b();
+        this.f2261z = new r1.b();
         this.A = new r1.c();
         StringBuilder sb = new StringBuilder();
-        this.f2253x = sb;
-        this.f2254y = new Formatter(sb, Locale.getDefault());
-        this.f2251j0 = new long[0];
+        this.f2259x = sb;
+        this.f2260y = new Formatter(sb, Locale.getDefault());
+        this.f2257j0 = new long[0];
         this.k0 = new boolean[0];
         this.l0 = new long[0];
         this.m0 = new boolean[0];
@@ -506,7 +506,7 @@ public class PlayerControlView extends FrameLayout {
             imageView.setOnClickListener(bVar);
         }
         ImageView imageView2 = (ImageView) findViewById(R.c.exo_shuffle);
-        this.f2252s = imageView2;
+        this.f2258s = imageView2;
         if (imageView2 != null) {
             imageView2.setOnClickListener(bVar);
         }
@@ -596,23 +596,23 @@ public class PlayerControlView extends FrameLayout {
             }
             removeCallbacks(this.B);
             removeCallbacks(this.C);
-            this.f2250i0 = -9223372036854775807L;
+            this.f2256i0 = -9223372036854775807L;
         }
     }
 
     public final void d() {
         removeCallbacks(this.C);
-        if (this.f2242a0 > 0) {
+        if (this.f2248a0 > 0) {
             long uptimeMillis = SystemClock.uptimeMillis();
-            int i2 = this.f2242a0;
-            this.f2250i0 = uptimeMillis + ((long) i2);
+            int i2 = this.f2248a0;
+            this.f2256i0 = uptimeMillis + ((long) i2);
             if (this.T) {
                 postDelayed(this.C, (long) i2);
                 return;
             }
             return;
         }
-        this.f2250i0 = -9223372036854775807L;
+        this.f2256i0 = -9223372036854775807L;
     }
 
     @Override // android.view.View, android.view.ViewGroup
@@ -656,15 +656,15 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public int getRepeatToggleModes() {
-        return this.f2244c0;
+        return this.f2250c0;
     }
 
     public boolean getShowShuffleButton() {
-        return this.f2249h0;
+        return this.f2255h0;
     }
 
     public int getShowTimeoutMs() {
-        return this.f2242a0;
+        return this.f2248a0;
     }
 
     public boolean getShowVrButton() {
@@ -726,10 +726,10 @@ public class PlayerControlView extends FrameLayout {
                     }
                     z5 = z6;
                     z6 = z7;
-                    j(this.f2247f0, z6, this.l);
-                    j(this.f2245d0, z3, this.q);
-                    j(this.f2246e0, z2, this.p);
-                    j(this.f2248g0, z5, this.m);
+                    j(this.f2253f0, z6, this.l);
+                    j(this.f2251d0, z3, this.q);
+                    j(this.f2252e0, z2, this.p);
+                    j(this.f2254g0, z5, this.m);
                     kVar = this.w;
                     if (kVar == null) {
                         kVar.setEnabled(z4);
@@ -742,10 +742,10 @@ public class PlayerControlView extends FrameLayout {
             z4 = false;
             z3 = false;
             z2 = false;
-            j(this.f2247f0, z6, this.l);
-            j(this.f2245d0, z3, this.q);
-            j(this.f2246e0, z2, this.p);
-            j(this.f2248g0, z5, this.m);
+            j(this.f2253f0, z6, this.l);
+            j(this.f2251d0, z3, this.q);
+            j(this.f2252e0, z2, this.p);
+            j(this.f2254g0, z5, this.m);
             kVar = this.w;
             if (kVar == null) {
             }
@@ -796,7 +796,7 @@ public class PlayerControlView extends FrameLayout {
             }
             TextView textView = this.v;
             if (textView != null && !this.W) {
-                textView.setText(f0.u(this.f2253x, this.f2254y, j2));
+                textView.setText(f0.u(this.f2259x, this.f2260y, j2));
             }
             k kVar = this.w;
             if (kVar != null) {
@@ -817,7 +817,7 @@ public class PlayerControlView extends FrameLayout {
                 if (f > 0.0f) {
                     j3 = (long) (((float) min) / f);
                 }
-                postDelayed(this.B, f0.i(j3, (long) this.f2243b0, 1000));
+                postDelayed(this.B, f0.i(j3, (long) this.f2249b0, 1000));
             } else if (u != 4 && u != 1) {
                 postDelayed(this.B, 1000);
             }
@@ -827,7 +827,7 @@ public class PlayerControlView extends FrameLayout {
     public final void n() {
         ImageView imageView;
         if (e() && this.T && (imageView = this.r) != null) {
-            if (this.f2244c0 == 0) {
+            if (this.f2250c0 == 0) {
                 j(false, false, imageView);
                 return;
             }
@@ -856,18 +856,18 @@ public class PlayerControlView extends FrameLayout {
 
     public final void o() {
         ImageView imageView;
-        if (e() && this.T && (imageView = this.f2252s) != null) {
+        if (e() && this.T && (imageView = this.f2258s) != null) {
             g1 g1Var = this.P;
-            if (!this.f2249h0) {
+            if (!this.f2255h0) {
                 j(false, false, imageView);
             } else if (g1Var == null) {
                 j(true, false, imageView);
-                this.f2252s.setImageDrawable(this.K);
-                this.f2252s.setContentDescription(this.O);
+                this.f2258s.setImageDrawable(this.K);
+                this.f2258s.setContentDescription(this.O);
             } else {
                 j(true, true, imageView);
-                this.f2252s.setImageDrawable(g1Var.F() ? this.J : this.K);
-                this.f2252s.setContentDescription(g1Var.F() ? this.N : this.O);
+                this.f2258s.setImageDrawable(g1Var.F() ? this.J : this.K);
+                this.f2258s.setContentDescription(g1Var.F() ? this.N : this.O);
             }
         }
     }
@@ -876,7 +876,7 @@ public class PlayerControlView extends FrameLayout {
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
         this.T = true;
-        long j = this.f2250i0;
+        long j = this.f2256i0;
         if (j != -9223372036854775807L) {
             long uptimeMillis = j - SystemClock.uptimeMillis();
             if (uptimeMillis <= 0) {
@@ -964,13 +964,13 @@ public class PlayerControlView extends FrameLayout {
                                 if (i5 > cVar.p) {
                                     break;
                                 }
-                                D.f(i5, this.f2255z);
-                                int i6 = this.f2255z.f.f796c;
+                                D.f(i5, this.f2261z);
+                                int i6 = this.f2261z.f.f796c;
                                 int i7 = 0;
                                 while (i7 < i6) {
-                                    long d2 = this.f2255z.d(i7);
+                                    long d2 = this.f2261z.d(i7);
                                     if (d2 == Long.MIN_VALUE) {
-                                        long j4 = this.f2255z.d;
+                                        long j4 = this.f2261z.d;
                                         if (j4 == j) {
                                             i7++;
                                             j = -9223372036854775807L;
@@ -978,16 +978,16 @@ public class PlayerControlView extends FrameLayout {
                                             d2 = j4;
                                         }
                                     }
-                                    long j5 = d2 + this.f2255z.e;
+                                    long j5 = d2 + this.f2261z.e;
                                     if (j5 >= 0) {
-                                        long[] jArr = this.f2251j0;
+                                        long[] jArr = this.f2257j0;
                                         if (i2 == jArr.length) {
                                             int length = jArr.length == 0 ? 1 : jArr.length * 2;
-                                            this.f2251j0 = Arrays.copyOf(jArr, length);
+                                            this.f2257j0 = Arrays.copyOf(jArr, length);
                                             this.k0 = Arrays.copyOf(this.k0, length);
                                         }
-                                        this.f2251j0[i2] = h0.b(j5 + j3);
-                                        this.k0[i2] = !this.f2255z.f.e[i7].b();
+                                        this.f2257j0[i2] = h0.b(j5 + j3);
+                                        this.k0[i2] = !this.f2261z.f.e[i7].b();
                                         i2++;
                                         i7++;
                                         j = -9223372036854775807L;
@@ -1010,21 +1010,21 @@ public class PlayerControlView extends FrameLayout {
                     long b2 = h0.b(j2);
                     textView = this.u;
                     if (textView != null) {
-                        textView.setText(f0.u(this.f2253x, this.f2254y, b2));
+                        textView.setText(f0.u(this.f2259x, this.f2260y, b2));
                     }
                     kVar = this.w;
                     if (kVar != null) {
                         kVar.setDuration(b2);
                         int length2 = this.l0.length;
                         int i8 = i2 + length2;
-                        long[] jArr2 = this.f2251j0;
+                        long[] jArr2 = this.f2257j0;
                         if (i8 > jArr2.length) {
-                            this.f2251j0 = Arrays.copyOf(jArr2, i8);
+                            this.f2257j0 = Arrays.copyOf(jArr2, i8);
                             this.k0 = Arrays.copyOf(this.k0, i8);
                         }
-                        System.arraycopy(this.l0, 0, this.f2251j0, i2, length2);
+                        System.arraycopy(this.l0, 0, this.f2257j0, i2, length2);
                         System.arraycopy(this.m0, 0, this.k0, i2, length2);
-                        this.w.a(this.f2251j0, this.k0, i8);
+                        this.w.a(this.f2257j0, this.k0, i8);
                     }
                     m();
                 }
@@ -1093,7 +1093,7 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setRepeatToggleModes(int i2) {
-        this.f2244c0 = i2;
+        this.f2250c0 = i2;
         g1 g1Var = this.P;
         if (g1Var != null) {
             int B = g1Var.B();
@@ -1127,7 +1127,7 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setShowFastForwardButton(boolean z2) {
-        this.f2246e0 = z2;
+        this.f2252e0 = z2;
         k();
     }
 
@@ -1137,27 +1137,27 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setShowNextButton(boolean z2) {
-        this.f2248g0 = z2;
+        this.f2254g0 = z2;
         k();
     }
 
     public void setShowPreviousButton(boolean z2) {
-        this.f2247f0 = z2;
+        this.f2253f0 = z2;
         k();
     }
 
     public void setShowRewindButton(boolean z2) {
-        this.f2245d0 = z2;
+        this.f2251d0 = z2;
         k();
     }
 
     public void setShowShuffleButton(boolean z2) {
-        this.f2249h0 = z2;
+        this.f2255h0 = z2;
         o();
     }
 
     public void setShowTimeoutMs(int i2) {
-        this.f2242a0 = i2;
+        this.f2248a0 = i2;
         if (e()) {
             d();
         }
@@ -1171,7 +1171,7 @@ public class PlayerControlView extends FrameLayout {
     }
 
     public void setTimeBarMinUpdateInterval(int i2) {
-        this.f2243b0 = f0.h(i2, 16, 1000);
+        this.f2249b0 = f0.h(i2, 16, 1000);
     }
 
     public void setVrButtonListener(@Nullable View.OnClickListener onClickListener) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 47486ed8ee..a1ea4ae8d2 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -87,7 +87,7 @@ public class PlayerView extends FrameLayout {
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public final FrameLayout f2256s;
+    public final FrameLayout f2262s;
     @Nullable
     public final FrameLayout t;
     @Nullable
@@ -97,14 +97,14 @@ public class PlayerView extends FrameLayout {
     public PlayerControlView.d w;
 
     /* renamed from: x  reason: collision with root package name */
-    public boolean f2257x;
+    public boolean f2263x;
     @Nullable
 
     /* renamed from: y  reason: collision with root package name */
-    public Drawable f2258y;
+    public Drawable f2264y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2259z;
+    public int f2265z;
 
     public final class a implements g1.a, k, v, View.OnLayoutChangeListener, g, PlayerControlView.d {
         public final r1.b i = new r1.b();
@@ -353,7 +353,7 @@ public class PlayerView extends FrameLayout {
             this.p = null;
             this.q = null;
             this.r = null;
-            this.f2256s = null;
+            this.f2262s = null;
             this.t = null;
             ImageView imageView = new ImageView(context);
             if (f0.a >= 23) {
@@ -452,13 +452,13 @@ public class PlayerView extends FrameLayout {
             this.m.setLayoutParams(layoutParams);
             aspectRatioFrameLayout.addView(this.m, 0);
         }
-        this.f2256s = (FrameLayout) findViewById(R.c.exo_ad_overlay);
+        this.f2262s = (FrameLayout) findViewById(R.c.exo_ad_overlay);
         this.t = (FrameLayout) findViewById(R.c.exo_overlay);
         ImageView imageView2 = (ImageView) findViewById(R.c.exo_artwork);
         this.n = imageView2;
-        this.f2257x = z3 && imageView2 != null;
+        this.f2263x = z3 && imageView2 != null;
         if (i3 != 0) {
-            this.f2258y = ContextCompat.getDrawable(getContext(), i3);
+            this.f2264y = ContextCompat.getDrawable(getContext(), i3);
         }
         SubtitleView subtitleView = (SubtitleView) findViewById(R.c.exo_subtitles);
         this.o = subtitleView;
@@ -471,7 +471,7 @@ public class PlayerView extends FrameLayout {
         if (findViewById2 != null) {
             findViewById2.setVisibility(8);
         }
-        this.f2259z = i7;
+        this.f2265z = i7;
         TextView textView = (TextView) findViewById(R.c.exo_error_message);
         this.q = textView;
         if (textView != null) {
@@ -626,7 +626,7 @@ public class PlayerView extends FrameLayout {
     }
 
     public ViewGroup getAdViewGroup() {
-        FrameLayout frameLayout = this.f2256s;
+        FrameLayout frameLayout = this.f2262s;
         AnimatableValueParser.I(frameLayout, "exo_ad_overlay must be present for ad playback");
         return frameLayout;
     }
@@ -645,7 +645,7 @@ public class PlayerView extends FrameLayout {
 
     @Nullable
     public Drawable getDefaultArtwork() {
-        return this.f2258y;
+        return this.f2264y;
     }
 
     @Nullable
@@ -669,7 +669,7 @@ public class PlayerView extends FrameLayout {
     }
 
     public boolean getUseArtwork() {
-        return this.f2257x;
+        return this.f2263x;
     }
 
     public boolean getUseController() {
@@ -715,7 +715,7 @@ public class PlayerView extends FrameLayout {
             g1 g1Var = this.u;
             boolean z2 = true;
             int i3 = 0;
-            if (g1Var == null || g1Var.u() != 2 || ((i2 = this.f2259z) != 2 && (i2 != 1 || !this.u.g()))) {
+            if (g1Var == null || g1Var.u() != 2 || ((i2 = this.f2265z) != 2 && (i2 != 1 || !this.u.g()))) {
                 z2 = false;
             }
             View view = this.p;
@@ -779,7 +779,7 @@ public class PlayerView extends FrameLayout {
                 }
             }
             b();
-            if (this.f2257x) {
+            if (this.f2263x) {
                 AnimatableValueParser.H(this.n);
                 z3 = true;
             } else {
@@ -825,7 +825,7 @@ public class PlayerView extends FrameLayout {
                         return;
                     }
                 }
-                if (g(this.f2258y)) {
+                if (g(this.f2264y)) {
                     return;
                 }
             }
@@ -933,8 +933,8 @@ public class PlayerView extends FrameLayout {
     }
 
     public void setDefaultArtwork(@Nullable Drawable drawable) {
-        if (this.f2258y != drawable) {
-            this.f2258y = drawable;
+        if (this.f2264y != drawable) {
+            this.f2264y = drawable;
             n(false);
         }
     }
@@ -1057,8 +1057,8 @@ public class PlayerView extends FrameLayout {
     }
 
     public void setShowBuffering(int i2) {
-        if (this.f2259z != i2) {
-            this.f2259z = i2;
+        if (this.f2265z != i2) {
+            this.f2265z = i2;
             k();
         }
     }
@@ -1102,8 +1102,8 @@ public class PlayerView extends FrameLayout {
 
     public void setUseArtwork(boolean z2) {
         AnimatableValueParser.D(!z2 || this.n != null);
-        if (this.f2257x != z2) {
-            this.f2257x = z2;
+        if (this.f2263x != z2) {
+            this.f2263x = z2;
             n(false);
         }
     }
diff --git a/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index 0567de2501..e96ebb55f2 100644
--- a/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/app/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -30,7 +30,7 @@ public class TrackSelectionView extends LinearLayout {
     public TrackGroupArray r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f2260s;
+    public boolean f2266s;
 
     public class b implements View.OnClickListener {
         public b(a aVar) {
@@ -40,13 +40,13 @@ public class TrackSelectionView extends LinearLayout {
         public void onClick(View view) {
             TrackSelectionView trackSelectionView = TrackSelectionView.this;
             if (view == trackSelectionView.k) {
-                trackSelectionView.f2260s = true;
+                trackSelectionView.f2266s = true;
                 trackSelectionView.n.clear();
             } else if (view == trackSelectionView.l) {
-                trackSelectionView.f2260s = false;
+                trackSelectionView.f2266s = false;
                 trackSelectionView.n.clear();
             } else {
-                trackSelectionView.f2260s = false;
+                trackSelectionView.f2266s = false;
                 Object tag = view.getTag();
                 Objects.requireNonNull(tag);
                 trackSelectionView.n.get(((c) tag).a);
@@ -96,8 +96,8 @@ public class TrackSelectionView extends LinearLayout {
     }
 
     public final void a() {
-        this.k.setChecked(this.f2260s);
-        this.l.setChecked(!this.f2260s && this.n.size() == 0);
+        this.k.setChecked(this.f2266s);
+        this.l.setChecked(!this.f2266s && this.n.size() == 0);
         throw null;
     }
 
@@ -116,7 +116,7 @@ public class TrackSelectionView extends LinearLayout {
     }
 
     public boolean getIsDisabled() {
-        return this.f2260s;
+        return this.f2266s;
     }
 
     public List<DefaultTrackSelector.SelectionOverride> getOverrides() {
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
index bce4e5513f..25eeb8a692 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
@@ -23,7 +23,7 @@ public final class Loader {
     public static final c b = new c(3, -9223372036854775807L, null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final ExecutorService f2261c;
+    public final ExecutorService f2267c;
     @Nullable
     public d<? extends e> d;
     @Nullable
@@ -119,7 +119,7 @@ public final class Loader {
                 return;
             }
             this.m = null;
-            loader.f2261c.execute(this);
+            loader.f2267c.execute(this);
         }
 
         @Override // android.os.Handler
@@ -129,7 +129,7 @@ public final class Loader {
                 if (i == 0) {
                     this.m = null;
                     Loader loader = Loader.this;
-                    ExecutorService executorService = loader.f2261c;
+                    ExecutorService executorService = loader.f2267c;
                     d<? extends e> dVar = loader.d;
                     Objects.requireNonNull(dVar);
                     executorService.execute(dVar);
@@ -262,7 +262,7 @@ public final class Loader {
 
     public Loader(String str) {
         int i = f0.a;
-        this.f2261c = Executors.newSingleThreadExecutor(new c.i.a.c.i2.e(str));
+        this.f2267c = Executors.newSingleThreadExecutor(new c.i.a.c.i2.e(str));
     }
 
     public static c a(boolean z2, long j) {
diff --git a/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
index 6aebcc6541..3ac2313d18 100644
--- a/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
+++ b/app/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
@@ -18,7 +18,7 @@ public final class CacheDataSink implements h {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2262c;
+    public final int f2268c;
     @Nullable
     public l d;
     public long e;
@@ -45,7 +45,7 @@ public final class CacheDataSink implements h {
         Objects.requireNonNull(cache);
         this.a = cache;
         this.b = i == 0 ? Long.MAX_VALUE : j;
-        this.f2262c = 20480;
+        this.f2268c = 20480;
     }
 
     @Override // c.i.a.c.h2.h
@@ -111,10 +111,10 @@ public final class CacheDataSink implements h {
         int i = f0.a;
         this.f = cache.a(str, lVar.f + this.i, j2);
         FileOutputStream fileOutputStream = new FileOutputStream(this.f);
-        if (this.f2262c > 0) {
+        if (this.f2268c > 0) {
             y yVar = this.j;
             if (yVar == null) {
-                this.j = new y(fileOutputStream, this.f2262c);
+                this.j = new y(fileOutputStream, this.f2268c);
             } else {
                 yVar.a(fileOutputStream);
             }
diff --git a/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
index 5ec285b92d..2f53db106b 100644
--- a/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
+++ b/app/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -32,17 +32,17 @@ public class FlexboxLayout extends ViewGroup implements a {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2263s;
+    public int f2269s;
     public int t;
     public int[] u;
     public SparseIntArray v;
     public c w = new c(this);
 
     /* renamed from: x  reason: collision with root package name */
-    public List<b> f2264x = new ArrayList();
+    public List<b> f2270x = new ArrayList();
 
     /* renamed from: y  reason: collision with root package name */
-    public c.b f2265y = new c.b();
+    public c.b f2271y = new c.b();
 
     public static class LayoutParams extends ViewGroup.MarginLayoutParams implements FlexItem {
         public static final Parcelable.Creator<LayoutParams> CREATOR = new a();
@@ -298,7 +298,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             return;
         }
         int i5 = bVar.e;
-        int i6 = this.f2263s;
+        int i6 = this.f2269s;
         bVar.e = i5 + i6;
         bVar.f += i6;
     }
@@ -344,7 +344,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             }
         } else if ((this.q & 4) > 0) {
             int i3 = bVar.e;
-            int i4 = this.f2263s;
+            int i4 = this.f2269s;
             bVar.e = i3 + i4;
             bVar.f += i4;
         }
@@ -388,12 +388,12 @@ public class FlexboxLayout extends ViewGroup implements a {
             i3 = this.t;
         } else {
             if (p(i, i2)) {
-                i4 = 0 + this.f2263s;
+                i4 = 0 + this.f2269s;
             }
             if ((this.q & 4) <= 0) {
                 return i4;
             }
-            i3 = this.f2263s;
+            i3 = this.f2269s;
         }
         return i4 + i3;
     }
@@ -439,8 +439,8 @@ public class FlexboxLayout extends ViewGroup implements a {
     }
 
     public List<b> getFlexLines() {
-        ArrayList arrayList = new ArrayList(this.f2264x.size());
-        for (b bVar : this.f2264x) {
+        ArrayList arrayList = new ArrayList(this.f2270x.size());
+        for (b bVar : this.f2270x) {
             if (bVar.a() != 0) {
                 arrayList.add(bVar);
             }
@@ -450,7 +450,7 @@ public class FlexboxLayout extends ViewGroup implements a {
 
     @Override // c.i.a.e.a
     public List<b> getFlexLinesInternal() {
-        return this.f2264x;
+        return this.f2270x;
     }
 
     @Override // c.i.a.e.a
@@ -465,7 +465,7 @@ public class FlexboxLayout extends ViewGroup implements a {
     @Override // c.i.a.e.a
     public int getLargestMainSize() {
         int i = Integer.MIN_VALUE;
-        for (b bVar : this.f2264x) {
+        for (b bVar : this.f2270x) {
             i = Math.max(i, bVar.e);
         }
         return i;
@@ -486,15 +486,15 @@ public class FlexboxLayout extends ViewGroup implements a {
 
     @Override // c.i.a.e.a
     public int getSumOfCrossSize() {
-        int size = this.f2264x.size();
+        int size = this.f2270x.size();
         int i = 0;
         for (int i2 = 0; i2 < size; i2++) {
-            b bVar = this.f2264x.get(i2);
+            b bVar = this.f2270x.get(i2);
             if (q(i2)) {
-                i += i() ? this.f2263s : this.t;
+                i += i() ? this.f2269s : this.t;
             }
             if (r(i2)) {
-                i += i() ? this.f2263s : this.t;
+                i += i() ? this.f2269s : this.t;
             }
             i += bVar.g;
         }
@@ -520,9 +520,9 @@ public class FlexboxLayout extends ViewGroup implements a {
     public final void k(Canvas canvas, boolean z2, boolean z3) {
         int paddingLeft = getPaddingLeft();
         int max = Math.max(0, (getWidth() - getPaddingRight()) - paddingLeft);
-        int size = this.f2264x.size();
+        int size = this.f2270x.size();
         for (int i = 0; i < size; i++) {
-            b bVar = this.f2264x.get(i);
+            b bVar = this.f2270x.get(i);
             for (int i2 = 0; i2 < bVar.h; i2++) {
                 int i3 = bVar.o + i2;
                 View o = o(i3);
@@ -537,10 +537,10 @@ public class FlexboxLayout extends ViewGroup implements a {
                 }
             }
             if (q(i)) {
-                m(canvas, paddingLeft, z3 ? bVar.d : bVar.b - this.f2263s, max);
+                m(canvas, paddingLeft, z3 ? bVar.d : bVar.b - this.f2269s, max);
             }
             if (r(i) && (this.q & 4) > 0) {
-                m(canvas, paddingLeft, z3 ? bVar.b - this.f2263s : bVar.d, max);
+                m(canvas, paddingLeft, z3 ? bVar.b - this.f2269s : bVar.d, max);
             }
         }
     }
@@ -548,19 +548,19 @@ public class FlexboxLayout extends ViewGroup implements a {
     public final void l(Canvas canvas, boolean z2, boolean z3) {
         int paddingTop = getPaddingTop();
         int max = Math.max(0, (getHeight() - getPaddingBottom()) - paddingTop);
-        int size = this.f2264x.size();
+        int size = this.f2270x.size();
         for (int i = 0; i < size; i++) {
-            b bVar = this.f2264x.get(i);
+            b bVar = this.f2270x.get(i);
             for (int i2 = 0; i2 < bVar.h; i2++) {
                 int i3 = bVar.o + i2;
                 View o = o(i3);
                 if (!(o == null || o.getVisibility() == 8)) {
                     LayoutParams layoutParams = (LayoutParams) o.getLayoutParams();
                     if (p(i3, i2)) {
-                        m(canvas, bVar.a, z3 ? o.getBottom() + ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin : (o.getTop() - ((ViewGroup.MarginLayoutParams) layoutParams).topMargin) - this.f2263s, bVar.g);
+                        m(canvas, bVar.a, z3 ? o.getBottom() + ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin : (o.getTop() - ((ViewGroup.MarginLayoutParams) layoutParams).topMargin) - this.f2269s, bVar.g);
                     }
                     if (i2 == bVar.h - 1 && (this.q & 4) > 0) {
-                        m(canvas, bVar.a, z3 ? (o.getTop() - ((ViewGroup.MarginLayoutParams) layoutParams).topMargin) - this.f2263s : o.getBottom() + ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin, bVar.g);
+                        m(canvas, bVar.a, z3 ? (o.getTop() - ((ViewGroup.MarginLayoutParams) layoutParams).topMargin) - this.f2269s : o.getBottom() + ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin, bVar.g);
                     }
                 }
             }
@@ -576,7 +576,7 @@ public class FlexboxLayout extends ViewGroup implements a {
     public final void m(Canvas canvas, int i, int i2, int i3) {
         Drawable drawable = this.o;
         if (drawable != null) {
-            drawable.setBounds(i, i2, i3 + i, this.f2263s + i2);
+            drawable.setBounds(i, i2, i3 + i, this.f2269s + i2);
             this.o.draw(canvas);
         }
     }
@@ -706,13 +706,13 @@ public class FlexboxLayout extends ViewGroup implements a {
             }
             i3 = this.i;
             if (i3 != 0 || i3 == 1) {
-                this.f2264x.clear();
-                this.f2265y.a();
-                this.w.b(this.f2265y, i, i2, Integer.MAX_VALUE, 0, -1, null);
-                this.f2264x = this.f2265y.a;
+                this.f2270x.clear();
+                this.f2271y.a();
+                this.w.b(this.f2271y, i, i2, Integer.MAX_VALUE, 0, -1, null);
+                this.f2270x = this.f2271y.a;
                 this.w.h(i, i2, 0);
                 if (this.l == 3) {
-                    for (b bVar : this.f2264x) {
+                    for (b bVar : this.f2270x) {
                         int i5 = Integer.MIN_VALUE;
                         for (int i6 = 0; i6 < bVar.h; i6++) {
                             View o = o(bVar.o + i6);
@@ -726,16 +726,16 @@ public class FlexboxLayout extends ViewGroup implements a {
                 }
                 this.w.g(i, i2, getPaddingBottom() + getPaddingTop());
                 this.w.A(0);
-                u(this.i, i, i2, this.f2265y.b);
+                u(this.i, i, i2, this.f2271y.b);
             } else if (i3 == 2 || i3 == 3) {
-                this.f2264x.clear();
-                this.f2265y.a();
-                this.w.b(this.f2265y, i2, i, Integer.MAX_VALUE, 0, -1, null);
-                this.f2264x = this.f2265y.a;
+                this.f2270x.clear();
+                this.f2271y.a();
+                this.w.b(this.f2271y, i2, i, Integer.MAX_VALUE, 0, -1, null);
+                this.f2270x = this.f2271y.a;
                 this.w.h(i, i2, 0);
                 this.w.g(i, i2, getPaddingRight() + getPaddingLeft());
                 this.w.A(0);
-                u(this.i, i, i2, this.f2265y.b);
+                u(this.i, i, i2, this.f2271y.b);
                 return;
             } else {
                 StringBuilder L = c.d.b.a.a.L("Invalid value for the flex direction is set: ");
@@ -749,16 +749,16 @@ public class FlexboxLayout extends ViewGroup implements a {
         i3 = this.i;
         if (i3 != 0) {
         }
-        this.f2264x.clear();
-        this.f2265y.a();
-        this.w.b(this.f2265y, i, i2, Integer.MAX_VALUE, 0, -1, null);
-        this.f2264x = this.f2265y.a;
+        this.f2270x.clear();
+        this.f2271y.a();
+        this.w.b(this.f2271y, i, i2, Integer.MAX_VALUE, 0, -1, null);
+        this.f2270x = this.f2271y.a;
         this.w.h(i, i2, 0);
         if (this.l == 3) {
         }
         this.w.g(i, i2, getPaddingBottom() + getPaddingTop());
         this.w.A(0);
-        u(this.i, i, i2, this.f2265y.b);
+        u(this.i, i, i2, this.f2271y.b);
     }
 
     public final boolean p(int i, int i2) {
@@ -781,7 +781,7 @@ public class FlexboxLayout extends ViewGroup implements a {
 
     public final boolean q(int i) {
         boolean z2;
-        if (i < 0 || i >= this.f2264x.size()) {
+        if (i < 0 || i >= this.f2270x.size()) {
             return false;
         }
         int i2 = 0;
@@ -789,7 +789,7 @@ public class FlexboxLayout extends ViewGroup implements a {
             if (i2 >= i) {
                 z2 = true;
                 break;
-            } else if (this.f2264x.get(i2).a() > 0) {
+            } else if (this.f2270x.get(i2).a() > 0) {
                 z2 = false;
                 break;
             } else {
@@ -800,11 +800,11 @@ public class FlexboxLayout extends ViewGroup implements a {
     }
 
     public final boolean r(int i) {
-        if (i < 0 || i >= this.f2264x.size()) {
+        if (i < 0 || i >= this.f2270x.size()) {
             return false;
         }
-        for (int i2 = i + 1; i2 < this.f2264x.size(); i2++) {
-            if (this.f2264x.get(i2).a() > 0) {
+        for (int i2 = i + 1; i2 < this.f2270x.size(); i2++) {
+            if (this.f2270x.get(i2).a() > 0) {
                 return false;
             }
         }
@@ -828,12 +828,12 @@ public class FlexboxLayout extends ViewGroup implements a {
         int i9 = i3 - i;
         int paddingBottom = (i4 - i2) - getPaddingBottom();
         int paddingTop = getPaddingTop();
-        int size = this.f2264x.size();
+        int size = this.f2270x.size();
         int i10 = 0;
         while (i10 < size) {
-            b bVar = this.f2264x.get(i10);
+            b bVar = this.f2270x.get(i10);
             if (q(i10)) {
-                int i11 = this.f2263s;
+                int i11 = this.f2269s;
                 paddingBottom -= i11;
                 paddingTop += i11;
             }
@@ -972,9 +972,9 @@ public class FlexboxLayout extends ViewGroup implements a {
         if (drawable != this.o) {
             this.o = drawable;
             if (drawable != null) {
-                this.f2263s = drawable.getIntrinsicHeight();
+                this.f2269s = drawable.getIntrinsicHeight();
             } else {
-                this.f2263s = 0;
+                this.f2269s = 0;
             }
             if (this.o == null && this.p == null) {
                 setWillNotDraw(true);
@@ -1011,7 +1011,7 @@ public class FlexboxLayout extends ViewGroup implements a {
 
     @Override // c.i.a.e.a
     public void setFlexLines(List<b> list) {
-        this.f2264x = list;
+        this.f2270x = list;
     }
 
     public void setFlexWrap(int i) {
@@ -1073,9 +1073,9 @@ public class FlexboxLayout extends ViewGroup implements a {
         int paddingLeft = getPaddingLeft();
         int i9 = i4 - i2;
         int i10 = (i3 - i) - paddingRight;
-        int size = this.f2264x.size();
+        int size = this.f2270x.size();
         for (int i11 = 0; i11 < size; i11++) {
-            b bVar = this.f2264x.get(i11);
+            b bVar = this.f2270x.get(i11);
             if (q(i11)) {
                 int i12 = this.t;
                 paddingLeft += i12;
@@ -1123,7 +1123,7 @@ public class FlexboxLayout extends ViewGroup implements a {
                         float f8 = f3 + ((float) ((ViewGroup.MarginLayoutParams) layoutParams2).topMargin);
                         float f9 = f - ((float) ((ViewGroup.MarginLayoutParams) layoutParams2).bottomMargin);
                         if (p(i15, i5)) {
-                            int i16 = this.f2263s;
+                            int i16 = this.f2269s;
                             float f10 = (float) i16;
                             f5 = f8 + f10;
                             i7 = i16;
@@ -1133,7 +1133,7 @@ public class FlexboxLayout extends ViewGroup implements a {
                             f4 = f9;
                             i7 = 0;
                         }
-                        int i17 = (i5 != bVar.h + -1 || (this.q & 4) <= 0) ? 0 : this.f2263s;
+                        int i17 = (i5 != bVar.h + -1 || (this.q & 4) <= 0) ? 0 : this.f2269s;
                         if (!z2) {
                             layoutParams = layoutParams2;
                             i6 = i5;
diff --git a/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
index 461bb4e5ad..b29b261f7d 100644
--- a/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
+++ b/app/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
@@ -36,20 +36,20 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     public RecyclerView.Recycler r;
 
     /* renamed from: s  reason: collision with root package name */
-    public RecyclerView.State f2266s;
+    public RecyclerView.State f2272s;
     public c t;
     public b u = new b(null);
     public OrientationHelper v;
     public OrientationHelper w;
 
     /* renamed from: x  reason: collision with root package name */
-    public SavedState f2267x;
+    public SavedState f2273x;
 
     /* renamed from: y  reason: collision with root package name */
-    public int f2268y = -1;
+    public int f2274y = -1;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2269z = Integer.MIN_VALUE;
+    public int f2275z = Integer.MIN_VALUE;
 
     public static class LayoutParams extends RecyclerView.LayoutParams implements FlexItem {
         public static final Parcelable.Creator<LayoutParams> CREATOR = new a();
@@ -276,7 +276,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         public int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2270c;
+        public int f2276c;
         public int d = 0;
         public boolean e;
         public boolean f;
@@ -289,17 +289,17 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             if (!FlexboxLayoutManager.this.i()) {
                 FlexboxLayoutManager flexboxLayoutManager = FlexboxLayoutManager.this;
                 if (flexboxLayoutManager.n) {
-                    bVar.f2270c = bVar.e ? flexboxLayoutManager.v.getEndAfterPadding() : flexboxLayoutManager.getWidth() - FlexboxLayoutManager.this.v.getStartAfterPadding();
+                    bVar.f2276c = bVar.e ? flexboxLayoutManager.v.getEndAfterPadding() : flexboxLayoutManager.getWidth() - FlexboxLayoutManager.this.v.getStartAfterPadding();
                     return;
                 }
             }
-            bVar.f2270c = bVar.e ? FlexboxLayoutManager.this.v.getEndAfterPadding() : FlexboxLayoutManager.this.v.getStartAfterPadding();
+            bVar.f2276c = bVar.e ? FlexboxLayoutManager.this.v.getEndAfterPadding() : FlexboxLayoutManager.this.v.getStartAfterPadding();
         }
 
         public static void b(b bVar) {
             bVar.a = -1;
             bVar.b = -1;
-            bVar.f2270c = Integer.MIN_VALUE;
+            bVar.f2276c = Integer.MIN_VALUE;
             boolean z2 = false;
             bVar.f = false;
             bVar.g = false;
@@ -340,7 +340,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             L.append(", mFlexLinePosition=");
             L.append(this.b);
             L.append(", mCoordinate=");
-            L.append(this.f2270c);
+            L.append(this.f2276c);
             L.append(", mPerpendicularCoordinate=");
             L.append(this.d);
             L.append(", mLayoutFromEnd=");
@@ -359,7 +359,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2271c;
+        public int f2277c;
         public int d;
         public int e;
         public int f;
@@ -375,7 +375,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             StringBuilder L = c.d.b.a.a.L("LayoutState{mAvailable=");
             L.append(this.a);
             L.append(", mFlexLinePosition=");
-            L.append(this.f2271c);
+            L.append(this.f2277c);
             L.append(", mPosition=");
             L.append(this.d);
             L.append(", mOffset=");
@@ -455,21 +455,21 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.t.b = false;
         }
         if (i() || !this.n) {
-            this.t.a = bVar.f2270c - this.v.getStartAfterPadding();
+            this.t.a = bVar.f2276c - this.v.getStartAfterPadding();
         } else {
-            this.t.a = (this.E.getWidth() - bVar.f2270c) - this.v.getStartAfterPadding();
+            this.t.a = (this.E.getWidth() - bVar.f2276c) - this.v.getStartAfterPadding();
         }
         c cVar = this.t;
         cVar.d = bVar.a;
         cVar.h = 1;
         cVar.i = -1;
-        cVar.e = bVar.f2270c;
+        cVar.e = bVar.f2276c;
         cVar.f = Integer.MIN_VALUE;
         int i3 = bVar.b;
-        cVar.f2271c = i3;
+        cVar.f2277c = i3;
         if (z2 && i3 > 0 && this.p.size() > (i2 = bVar.b)) {
             c cVar2 = this.t;
-            cVar2.f2271c--;
+            cVar2.f2277c--;
             cVar2.d -= this.p.get(i2).h;
         }
     }
@@ -730,7 +730,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
 
     @Override // c.i.a.e.a
     public int getFlexItemCount() {
-        return this.f2266s.getItemCount();
+        return this.f2272s.getItemCount();
     }
 
     @Override // c.i.a.e.a
@@ -856,10 +856,10 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             }
             List<c.i.a.e.b> list = this.p;
             int i23 = cVar.d;
-            if (!(i23 >= 0 && i23 < state.getItemCount() && (i16 = cVar.f2271c) >= 0 && i16 < list.size())) {
+            if (!(i23 >= 0 && i23 < state.getItemCount() && (i16 = cVar.f2277c) >= 0 && i16 < list.size())) {
                 break;
             }
-            c.i.a.e.b bVar = this.p.get(cVar.f2271c);
+            c.i.a.e.b bVar = this.p.get(cVar.f2277c);
             cVar.d = bVar.o;
             if (i()) {
                 int paddingLeft = getPaddingLeft();
@@ -926,7 +926,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                     i26 = i12;
                 }
                 i3 = i19;
-                cVar.f2271c += this.t.i;
+                cVar.f2277c += this.t.i;
                 i5 = bVar.g;
                 i4 = i21;
                 i2 = i22;
@@ -1018,7 +1018,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 }
                 i4 = i21;
                 i2 = i22;
-                cVar.f2271c += this.t.i;
+                cVar.f2277c += this.t.i;
                 i5 = bVar.g;
             }
             i22 = i2 + i5;
@@ -1128,7 +1128,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
         boolean z4;
         int i5;
         this.r = recycler;
-        this.f2266s = state;
+        this.f2272s = state;
         int itemCount = state.getItemCount();
         if (itemCount != 0 || !state.isPreLayout()) {
             int layoutDirection = getLayoutDirection();
@@ -1165,32 +1165,32 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.q.k(itemCount);
             this.q.i(itemCount);
             this.t.j = false;
-            SavedState savedState = this.f2267x;
+            SavedState savedState = this.f2273x;
             if (savedState != null) {
                 int i7 = savedState.i;
                 if (i7 >= 0 && i7 < itemCount) {
-                    this.f2268y = i7;
+                    this.f2274y = i7;
                 }
             }
             b bVar = this.u;
-            if (!(bVar.f && this.f2268y == -1 && savedState == null)) {
+            if (!(bVar.f && this.f2274y == -1 && savedState == null)) {
                 b.b(bVar);
                 b bVar2 = this.u;
-                SavedState savedState2 = this.f2267x;
-                if (!state.isPreLayout() && (i5 = this.f2268y) != -1) {
+                SavedState savedState2 = this.f2273x;
+                if (!state.isPreLayout() && (i5 = this.f2274y) != -1) {
                     if (i5 < 0 || i5 >= state.getItemCount()) {
-                        this.f2268y = -1;
-                        this.f2269z = Integer.MIN_VALUE;
+                        this.f2274y = -1;
+                        this.f2275z = Integer.MIN_VALUE;
                     } else {
-                        int i8 = this.f2268y;
+                        int i8 = this.f2274y;
                         bVar2.a = i8;
                         bVar2.b = this.q.f1016c[i8];
-                        SavedState savedState3 = this.f2267x;
+                        SavedState savedState3 = this.f2273x;
                         if (savedState3 != null) {
                             int itemCount2 = state.getItemCount();
                             int i9 = savedState3.i;
                             if (i9 >= 0 && i9 < itemCount2) {
-                                bVar2.f2270c = this.v.getStartAfterPadding() + savedState2.j;
+                                bVar2.f2276c = this.v.getStartAfterPadding() + savedState2.j;
                                 bVar2.g = true;
                                 bVar2.b = -1;
                                 z3 = true;
@@ -1202,14 +1202,14 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                                             OrientationHelper orientationHelper = flexboxLayoutManager.k == 0 ? flexboxLayoutManager.w : flexboxLayoutManager.v;
                                             if (flexboxLayoutManager.i() || !FlexboxLayoutManager.this.n) {
                                                 if (bVar2.e) {
-                                                    bVar2.f2270c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedEnd(p);
+                                                    bVar2.f2276c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedEnd(p);
                                                 } else {
-                                                    bVar2.f2270c = orientationHelper.getDecoratedStart(p);
+                                                    bVar2.f2276c = orientationHelper.getDecoratedStart(p);
                                                 }
                                             } else if (bVar2.e) {
-                                                bVar2.f2270c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedStart(p);
+                                                bVar2.f2276c = orientationHelper.getTotalSpaceChange() + orientationHelper.getDecoratedStart(p);
                                             } else {
-                                                bVar2.f2270c = orientationHelper.getDecoratedEnd(p);
+                                                bVar2.f2276c = orientationHelper.getDecoratedEnd(p);
                                             }
                                             int position = FlexboxLayoutManager.this.getPosition(p);
                                             bVar2.a = position;
@@ -1231,7 +1231,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                                             }
                                             if (!state.isPreLayout() && supportsPredictiveItemAnimations()) {
                                                 if (this.v.getDecoratedStart(p) >= this.v.getEndAfterPadding() || this.v.getDecoratedEnd(p) < this.v.getStartAfterPadding()) {
-                                                    bVar2.f2270c = bVar2.e ? this.v.getEndAfterPadding() : this.v.getStartAfterPadding();
+                                                    bVar2.f2276c = bVar2.e ? this.v.getEndAfterPadding() : this.v.getStartAfterPadding();
                                                 }
                                             }
                                             z4 = true;
@@ -1249,28 +1249,28 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                                 this.u.f = true;
                             }
                         }
-                        if (this.f2269z == Integer.MIN_VALUE) {
-                            View findViewByPosition = findViewByPosition(this.f2268y);
+                        if (this.f2275z == Integer.MIN_VALUE) {
+                            View findViewByPosition = findViewByPosition(this.f2274y);
                             if (findViewByPosition == null) {
                                 if (getChildCount() > 0) {
-                                    bVar2.e = this.f2268y < getPosition(getChildAt(0));
+                                    bVar2.e = this.f2274y < getPosition(getChildAt(0));
                                 }
                                 b.a(bVar2);
                             } else if (this.v.getDecoratedMeasurement(findViewByPosition) > this.v.getTotalSpace()) {
                                 b.a(bVar2);
                             } else if (this.v.getDecoratedStart(findViewByPosition) - this.v.getStartAfterPadding() < 0) {
-                                bVar2.f2270c = this.v.getStartAfterPadding();
+                                bVar2.f2276c = this.v.getStartAfterPadding();
                                 bVar2.e = false;
                             } else if (this.v.getEndAfterPadding() - this.v.getDecoratedEnd(findViewByPosition) < 0) {
-                                bVar2.f2270c = this.v.getEndAfterPadding();
+                                bVar2.f2276c = this.v.getEndAfterPadding();
                                 bVar2.e = true;
                             } else {
-                                bVar2.f2270c = bVar2.e ? this.v.getTotalSpaceChange() + this.v.getDecoratedEnd(findViewByPosition) : this.v.getDecoratedStart(findViewByPosition);
+                                bVar2.f2276c = bVar2.e ? this.v.getTotalSpaceChange() + this.v.getDecoratedEnd(findViewByPosition) : this.v.getDecoratedStart(findViewByPosition);
                             }
                         } else if (i() || !this.n) {
-                            bVar2.f2270c = this.v.getStartAfterPadding() + this.f2269z;
+                            bVar2.f2276c = this.v.getStartAfterPadding() + this.f2275z;
                         } else {
-                            bVar2.f2270c = this.f2269z - this.v.getEndPadding();
+                            bVar2.f2276c = this.f2275z - this.v.getEndPadding();
                         }
                         z3 = true;
                         if (!z3) {
@@ -1308,7 +1308,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.A = width;
             this.B = height;
             int i14 = this.F;
-            if (i14 != -1 || (this.f2268y == -1 && !z2)) {
+            if (i14 != -1 || (this.f2274y == -1 && !z2)) {
                 int min = i14 != -1 ? Math.min(i14, this.u.a) : this.u.a;
                 this.G.a();
                 if (i()) {
@@ -1343,7 +1343,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 b bVar4 = this.u;
                 int i15 = this.q.f1016c[bVar4.a];
                 bVar4.b = i15;
-                this.t.f2271c = i15;
+                this.t.f2277c = i15;
             }
             if (this.u.e) {
                 m(recycler, state, this.t);
@@ -1372,9 +1372,9 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public void onLayoutCompleted(RecyclerView.State state) {
         super.onLayoutCompleted(state);
-        this.f2267x = null;
-        this.f2268y = -1;
-        this.f2269z = Integer.MIN_VALUE;
+        this.f2273x = null;
+        this.f2274y = -1;
+        this.f2275z = Integer.MIN_VALUE;
         this.F = -1;
         b.b(this.u);
         this.C.clear();
@@ -1383,14 +1383,14 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public void onRestoreInstanceState(Parcelable parcelable) {
         if (parcelable instanceof SavedState) {
-            this.f2267x = (SavedState) parcelable;
+            this.f2273x = (SavedState) parcelable;
             requestLayout();
         }
     }
 
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public Parcelable onSaveInstanceState() {
-        SavedState savedState = this.f2267x;
+        SavedState savedState = this.f2273x;
         if (savedState != null) {
             return new SavedState(savedState, (a) null);
         }
@@ -1505,9 +1505,9 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
 
     @Override // androidx.recyclerview.widget.RecyclerView.LayoutManager
     public void scrollToPosition(int i2) {
-        this.f2268y = i2;
-        this.f2269z = Integer.MIN_VALUE;
-        SavedState savedState = this.f2267x;
+        this.f2274y = i2;
+        this.f2275z = Integer.MIN_VALUE;
+        SavedState savedState = this.f2273x;
         if (savedState != null) {
             savedState.i = -1;
         }
@@ -1565,9 +1565,9 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             cVar.d = i6;
             int[] iArr = this.q.f1016c;
             if (iArr.length <= i6) {
-                cVar.f2271c = -1;
+                cVar.f2277c = -1;
             } else {
-                cVar.f2271c = iArr[i6];
+                cVar.f2277c = iArr[i6];
             }
             if (z3) {
                 cVar.e = this.v.getDecoratedStart(q);
@@ -1582,7 +1582,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 cVar.e = this.v.getDecoratedEnd(q);
                 this.t.f = this.v.getDecoratedEnd(q) - this.v.getEndAfterPadding();
             }
-            int i8 = this.t.f2271c;
+            int i8 = this.t.f2277c;
             if ((i8 == -1 || i8 > this.p.size() - 1) && this.t.d <= getFlexItemCount()) {
                 int i9 = abs - this.t.f;
                 this.G.a();
@@ -1613,7 +1613,7 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 cVar3.d = -1;
             }
             c cVar4 = this.t;
-            cVar4.f2271c = i10 > 0 ? i10 - 1 : 0;
+            cVar4.f2277c = i10 > 0 ? i10 - 1 : 0;
             if (z3) {
                 cVar4.e = this.v.getDecoratedEnd(o);
                 this.t.f = this.v.getDecoratedEnd(o) - this.v.getEndAfterPadding();
@@ -1789,12 +1789,12 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
                 this.F = i2;
                 View childAt = getChildAt(0);
                 if (childAt != null) {
-                    this.f2268y = getPosition(childAt);
+                    this.f2274y = getPosition(childAt);
                     if (i() || !this.n) {
-                        this.f2269z = this.v.getDecoratedStart(childAt) - this.v.getStartAfterPadding();
+                        this.f2275z = this.v.getDecoratedStart(childAt) - this.v.getStartAfterPadding();
                         return;
                     }
-                    this.f2269z = this.v.getEndPadding() + this.v.getDecoratedEnd(childAt);
+                    this.f2275z = this.v.getEndPadding() + this.v.getDecoratedEnd(childAt);
                 }
             }
         }
@@ -1808,20 +1808,20 @@ public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements
             this.t.b = false;
         }
         if (i() || !this.n) {
-            this.t.a = this.v.getEndAfterPadding() - bVar.f2270c;
+            this.t.a = this.v.getEndAfterPadding() - bVar.f2276c;
         } else {
-            this.t.a = bVar.f2270c - getPaddingRight();
+            this.t.a = bVar.f2276c - getPaddingRight();
         }
         c cVar = this.t;
         cVar.d = bVar.a;
         cVar.h = 1;
         cVar.i = 1;
-        cVar.e = bVar.f2270c;
+        cVar.e = bVar.f2276c;
         cVar.f = Integer.MIN_VALUE;
-        cVar.f2271c = bVar.b;
+        cVar.f2277c = bVar.b;
         if (z2 && this.p.size() > 1 && (i2 = bVar.b) >= 0 && i2 < this.p.size() - 1) {
             c cVar2 = this.t;
-            cVar2.f2271c++;
+            cVar2.f2277c++;
             cVar2.d += this.p.get(bVar.b).h;
         }
     }
diff --git a/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java b/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java
index 41ec86ecd6..edd5089ded 100644
--- a/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java
+++ b/app/src/main/java/com/google/android/gms/ads/identifier/AdvertisingIdClient.java
@@ -29,7 +29,7 @@ public class AdvertisingIdClient {
     public b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2272c;
+    public boolean f2278c;
     public final Object d = new Object();
     @Nullable
     public a e;
@@ -103,7 +103,7 @@ public class AdvertisingIdClient {
             context = applicationContext;
         }
         this.f = context;
-        this.f2272c = false;
+        this.f2278c = false;
         this.h = j;
         this.g = z3;
     }
@@ -204,13 +204,13 @@ public class AdvertisingIdClient {
         synchronized (this) {
             if (this.f != null && this.a != null) {
                 try {
-                    if (this.f2272c) {
+                    if (this.f2278c) {
                         c.i.a.f.e.n.a.b().c(this.f, this.a);
                     }
                 } catch (Throwable th) {
                     Log.i("AdvertisingIdClient", "AdvertisingIdClient unbindService failed.", th);
                 }
-                this.f2272c = false;
+                this.f2278c = false;
                 this.b = null;
                 this.a = null;
             }
@@ -221,7 +221,7 @@ public class AdvertisingIdClient {
         Info info;
         AnimatableValueParser.x("Calling this from your main thread can lead to deadlock");
         synchronized (this) {
-            if (!this.f2272c) {
+            if (!this.f2278c) {
                 synchronized (this.d) {
                     a aVar = this.e;
                     if (aVar == null || !aVar.l) {
@@ -230,7 +230,7 @@ public class AdvertisingIdClient {
                 }
                 try {
                     f(false);
-                    if (!this.f2272c) {
+                    if (!this.f2278c) {
                         throw new IOException("AdvertisingIdClient cannot reconnect.");
                     }
                 } catch (Exception e) {
@@ -240,7 +240,7 @@ public class AdvertisingIdClient {
             Objects.requireNonNull(this.a, "null reference");
             Objects.requireNonNull(this.b, "null reference");
             try {
-                info = new Info(this.b.getId(), this.b.D(true));
+                info = new Info(this.b.getId(), this.b.E(true));
             } catch (RemoteException e2) {
                 Log.i("AdvertisingIdClient", "GMS remote exception ", e2);
                 throw new IOException("Remote exception");
@@ -269,13 +269,13 @@ public class AdvertisingIdClient {
     public final void f(boolean z2) throws IOException, IllegalStateException, GooglePlayServicesNotAvailableException, GooglePlayServicesRepairableException {
         AnimatableValueParser.x("Calling this from your main thread can lead to deadlock");
         synchronized (this) {
-            if (this.f2272c) {
+            if (this.f2278c) {
                 a();
             }
             c.i.a.f.e.a c2 = c(this.f, this.g);
             this.a = c2;
             this.b = d(c2);
-            this.f2272c = true;
+            this.f2278c = true;
             if (z2) {
                 e();
             }
diff --git a/app/src/main/java/com/google/android/gms/analytics/AnalyticsJobService.java b/app/src/main/java/com/google/android/gms/analytics/AnalyticsJobService.java
index e577c4c087..b312302dd8 100644
--- a/app/src/main/java/com/google/android/gms/analytics/AnalyticsJobService.java
+++ b/app/src/main/java/com/google/android/gms/analytics/AnalyticsJobService.java
@@ -36,13 +36,13 @@ public final class AnalyticsJobService extends JobService implements x0 {
     @RequiresPermission(allOf = {"android.permission.INTERNET", "android.permission.ACCESS_NETWORK_STATE"})
     public final void onCreate() {
         super.onCreate();
-        g.b(c().f1081c).c().C("Local AnalyticsService is starting up");
+        g.b(c().f1079c).c().C("Local AnalyticsService is starting up");
     }
 
     @Override // android.app.Service
     @RequiresPermission(allOf = {"android.permission.INTERNET", "android.permission.ACCESS_NETWORK_STATE"})
     public final void onDestroy() {
-        g.b(c().f1081c).c().C("Local AnalyticsService is shutting down");
+        g.b(c().f1079c).c().C("Local AnalyticsService is shutting down");
         super.onDestroy();
     }
 
@@ -56,7 +56,7 @@ public final class AnalyticsJobService extends JobService implements x0 {
     @Override // android.app.job.JobService
     public final boolean onStartJob(JobParameters jobParameters) {
         t0<AnalyticsJobService> c2 = c();
-        m0 c3 = g.b(c2.f1081c).c();
+        m0 c3 = g.b(c2.f1079c).c();
         String string = jobParameters.getExtras().getString("action");
         c3.b("Local AnalyticsJobService called. action", string);
         if (!"com.google.android.gms.analytics.ANALYTICS_DISPATCH".equals(string)) {
diff --git a/app/src/main/java/com/google/android/gms/analytics/AnalyticsReceiver.java b/app/src/main/java/com/google/android/gms/analytics/AnalyticsReceiver.java
index 520ca0e504..2f6433cbe0 100644
--- a/app/src/main/java/com/google/android/gms/analytics/AnalyticsReceiver.java
+++ b/app/src/main/java/com/google/android/gms/analytics/AnalyticsReceiver.java
@@ -39,7 +39,7 @@ public final class AnalyticsReceiver extends BroadcastReceiver {
                         if (s0.b == null) {
                             a aVar = new a(context, 1, "Analytics WakeLock");
                             s0.b = aVar;
-                            aVar.f1217c.setReferenceCounted(false);
+                            aVar.f1214c.setReferenceCounted(false);
                             aVar.h = false;
                         }
                         s0.b.a(1000);
diff --git a/app/src/main/java/com/google/android/gms/analytics/AnalyticsService.java b/app/src/main/java/com/google/android/gms/analytics/AnalyticsService.java
index f06614a029..6c746cb583 100644
--- a/app/src/main/java/com/google/android/gms/analytics/AnalyticsService.java
+++ b/app/src/main/java/com/google/android/gms/analytics/AnalyticsService.java
@@ -38,13 +38,13 @@ public final class AnalyticsService extends Service implements x0 {
     @RequiresPermission(allOf = {"android.permission.INTERNET", "android.permission.ACCESS_NETWORK_STATE"})
     public final void onCreate() {
         super.onCreate();
-        g.b(c().f1081c).c().C("Local AnalyticsService is starting up");
+        g.b(c().f1079c).c().C("Local AnalyticsService is starting up");
     }
 
     @Override // android.app.Service
     @RequiresPermission(allOf = {"android.permission.INTERNET", "android.permission.ACCESS_NETWORK_STATE"})
     public final void onDestroy() {
-        g.b(c().f1081c).c().C("Local AnalyticsService is shutting down");
+        g.b(c().f1079c).c().C("Local AnalyticsService is shutting down");
         super.onDestroy();
     }
 
diff --git a/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java b/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
index 468ec05ec8..85e0b44a3b 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
@@ -38,7 +38,7 @@ public class Credential extends AbstractSafeParcelable implements ReflectedParce
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public Uri f2273c;
+        public Uri f2279c;
         @Nullable
         public String d;
 
@@ -47,7 +47,7 @@ public class Credential extends AbstractSafeParcelable implements ReflectedParce
         }
 
         public Credential a() {
-            return new Credential(this.a, this.b, this.f2273c, null, this.d, null, null, null);
+            return new Credential(this.a, this.b, this.f2279c, null, this.d, null, null, null);
         }
     }
 
@@ -106,15 +106,15 @@ public class Credential extends AbstractSafeParcelable implements ReflectedParce
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
-        AnimatableValueParser.S2(parcel, 4, this.l, false);
-        AnimatableValueParser.P2(parcel, 5, this.m, false);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
-        AnimatableValueParser.P2(parcel, 9, this.o, false);
-        AnimatableValueParser.P2(parcel, 10, this.p, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.U2(parcel, 4, this.l, false);
+        AnimatableValueParser.R2(parcel, 5, this.m, false);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
+        AnimatableValueParser.R2(parcel, 9, this.o, false);
+        AnimatableValueParser.R2(parcel, 10, this.p, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java b/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java
index 9e50eebd45..993f7ecdeb 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java
@@ -28,25 +28,25 @@ public final class CredentialPickerConfig extends AbstractSafeParcelable impleme
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         boolean z2 = this.j;
         int i2 = 1;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.k;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(z3 ? 1 : 0);
         if (this.l != 3) {
             i2 = 0;
         }
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i2);
         int i3 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(i3);
         int i4 = this.i;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java b/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java
index ac2249a97e..d4e27d55ae 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java
@@ -43,24 +43,24 @@ public final class CredentialRequest extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         boolean z2 = this.j;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.Q2(parcel, 2, this.k, false);
-        AnimatableValueParser.O2(parcel, 3, this.l, i, false);
-        AnimatableValueParser.O2(parcel, 4, this.m, i, false);
+        AnimatableValueParser.S2(parcel, 2, this.k, false);
+        AnimatableValueParser.Q2(parcel, 3, this.l, i, false);
+        AnimatableValueParser.Q2(parcel, 4, this.m, i, false);
         boolean z3 = this.n;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 6, this.o, false);
-        AnimatableValueParser.P2(parcel, 7, this.p, false);
+        AnimatableValueParser.R2(parcel, 6, this.o, false);
+        AnimatableValueParser.R2(parcel, 7, this.p, false);
         boolean z4 = this.q;
-        AnimatableValueParser.W2(parcel, 8, 4);
+        AnimatableValueParser.Y2(parcel, 8, 4);
         parcel.writeInt(z4 ? 1 : 0);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java b/app/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java
index 6ab4a8714f..8bd736d660 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java
@@ -38,9 +38,9 @@ public final class IdToken extends AbstractSafeParcelable implements ReflectedPa
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
index feced0da9d..113db573db 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInAccount.java
@@ -41,7 +41,7 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
     @Nullable
 
     /* renamed from: s  reason: collision with root package name */
-    public String f2274s;
+    public String f2280s;
     @Nullable
     public String t;
     public Set<Scope> u = new HashSet();
@@ -57,7 +57,7 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
         this.p = j;
         this.q = str6;
         this.r = list;
-        this.f2274s = str7;
+        this.f2280s = str7;
         this.t = str8;
     }
 
@@ -123,23 +123,23 @@ public class GoogleSignInAccount extends AbstractSafeParcelable implements Refle
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.P2(parcel, 3, this.k, false);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.P2(parcel, 5, this.m, false);
-        AnimatableValueParser.O2(parcel, 6, this.n, i, false);
-        AnimatableValueParser.P2(parcel, 7, this.o, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.R2(parcel, 3, this.k, false);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.R2(parcel, 5, this.m, false);
+        AnimatableValueParser.Q2(parcel, 6, this.n, i, false);
+        AnimatableValueParser.R2(parcel, 7, this.o, false);
         long j = this.p;
-        AnimatableValueParser.W2(parcel, 8, 8);
+        AnimatableValueParser.Y2(parcel, 8, 8);
         parcel.writeLong(j);
-        AnimatableValueParser.P2(parcel, 9, this.q, false);
-        AnimatableValueParser.S2(parcel, 10, this.r, false);
-        AnimatableValueParser.P2(parcel, 11, this.f2274s, false);
-        AnimatableValueParser.P2(parcel, 12, this.t, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 9, this.q, false);
+        AnimatableValueParser.U2(parcel, 10, this.r, false);
+        AnimatableValueParser.R2(parcel, 11, this.f2280s, false);
+        AnimatableValueParser.R2(parcel, 12, this.t, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
index 8fc7927cfc..d7a8f9f685 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/GoogleSignInOptions.java
@@ -42,7 +42,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final boolean f2275s;
+    public final boolean f2281s;
     public final boolean t;
     @Nullable
     public String u;
@@ -52,10 +52,10 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
     @Nullable
 
     /* renamed from: x  reason: collision with root package name */
-    public String f2276x;
+    public String f2282x;
 
     /* renamed from: y  reason: collision with root package name */
-    public Map<Integer, GoogleSignInOptionsExtensionParcelable> f2277y;
+    public Map<Integer, GoogleSignInOptionsExtensionParcelable> f2283y;
 
     /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
     public static final class a {
@@ -63,7 +63,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f2278c;
+        public boolean f2284c;
         public boolean d;
         @Nullable
         public String e;
@@ -80,14 +80,14 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
 
         public a(@NonNull GoogleSignInOptions googleSignInOptions) {
             this.a = new HashSet(googleSignInOptions.p);
-            this.b = googleSignInOptions.f2275s;
-            this.f2278c = googleSignInOptions.t;
+            this.b = googleSignInOptions.f2281s;
+            this.f2284c = googleSignInOptions.t;
             this.d = googleSignInOptions.r;
             this.e = googleSignInOptions.u;
             this.f = googleSignInOptions.q;
             this.g = googleSignInOptions.v;
             this.h = GoogleSignInOptions.x0(googleSignInOptions.w);
-            this.i = googleSignInOptions.f2276x;
+            this.i = googleSignInOptions.f2282x;
         }
 
         public final GoogleSignInOptions a() {
@@ -101,7 +101,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
             if (this.d && (this.f == null || !this.a.isEmpty())) {
                 this.a.add(GoogleSignInOptions.j);
             }
-            return new GoogleSignInOptions(3, new ArrayList(this.a), this.f, this.d, this.b, this.f2278c, this.e, this.g, this.h, this.i);
+            return new GoogleSignInOptions(3, new ArrayList(this.a), this.f, this.d, this.b, this.f2284c, this.e, this.g, this.h, this.i);
         }
     }
 
@@ -138,13 +138,13 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         this.p = arrayList;
         this.q = account;
         this.r = z2;
-        this.f2275s = z3;
+        this.f2281s = z3;
         this.t = z4;
         this.u = str;
         this.v = str2;
         this.w = new ArrayList<>(map.values());
-        this.f2277y = map;
-        this.f2276x = str3;
+        this.f2283y = map;
+        this.f2282x = str3;
     }
 
     @Nullable
@@ -210,7 +210,7 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
                                 if (TextUtils.isEmpty(googleSignInOptions.u)) {
                                 }
                             }
-                            if (this.t == googleSignInOptions.t && this.r == googleSignInOptions.r && this.f2275s == googleSignInOptions.f2275s && TextUtils.equals(this.f2276x, googleSignInOptions.f2276x)) {
+                            if (this.t == googleSignInOptions.t && this.r == googleSignInOptions.r && this.f2281s == googleSignInOptions.f2281s && TextUtils.equals(this.f2282x, googleSignInOptions.f2282x)) {
                                 return true;
                             }
                         }
@@ -238,8 +238,8 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
         Account account = this.q;
         int hashCode = ((arrayList.hashCode() + 31) * 31) + (account == null ? 0 : account.hashCode());
         String str = this.u;
-        int hashCode2 = (((((((hashCode * 31) + (str == null ? 0 : str.hashCode())) * 31) + (this.t ? 1 : 0)) * 31) + (this.r ? 1 : 0)) * 31) + (this.f2275s ? 1 : 0);
-        String str2 = this.f2276x;
+        int hashCode2 = (((((((hashCode * 31) + (str == null ? 0 : str.hashCode())) * 31) + (this.t ? 1 : 0)) * 31) + (this.r ? 1 : 0)) * 31) + (this.f2281s ? 1 : 0);
+        String str2 = this.f2282x;
         int i4 = hashCode2 * 31;
         if (str2 != null) {
             i2 = str2.hashCode();
@@ -253,25 +253,25 @@ public class GoogleSignInOptions extends AbstractSafeParcelable implements a.d,
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i3 = this.o;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.S2(parcel, 2, v0(), false);
-        AnimatableValueParser.O2(parcel, 3, this.q, i2, false);
+        AnimatableValueParser.U2(parcel, 2, v0(), false);
+        AnimatableValueParser.Q2(parcel, 3, this.q, i2, false);
         boolean z2 = this.r;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        boolean z3 = this.f2275s;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        boolean z3 = this.f2281s;
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(z3 ? 1 : 0);
         boolean z4 = this.t;
-        AnimatableValueParser.W2(parcel, 6, 4);
+        AnimatableValueParser.Y2(parcel, 6, 4);
         parcel.writeInt(z4 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 7, this.u, false);
-        AnimatableValueParser.P2(parcel, 8, this.v, false);
-        AnimatableValueParser.S2(parcel, 9, this.w, false);
-        AnimatableValueParser.P2(parcel, 10, this.f2276x, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 7, this.u, false);
+        AnimatableValueParser.R2(parcel, 8, this.v, false);
+        AnimatableValueParser.U2(parcel, 9, this.w, false);
+        AnimatableValueParser.R2(parcel, 10, this.f2282x, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/SignInAccount.java b/app/src/main/java/com/google/android/gms/auth/api/signin/SignInAccount.java
index 8e211df71e..8bcf5057a2 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/SignInAccount.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/SignInAccount.java
@@ -25,10 +25,10 @@ public class SignInAccount extends AbstractSafeParcelable implements ReflectedPa
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 4, this.i, false);
-        AnimatableValueParser.O2(parcel, 7, this.j, i, false);
-        AnimatableValueParser.P2(parcel, 8, this.k, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 4, this.i, false);
+        AnimatableValueParser.Q2(parcel, 7, this.j, i, false);
+        AnimatableValueParser.R2(parcel, 8, this.k, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/internal/GoogleSignInOptionsExtensionParcelable.java b/app/src/main/java/com/google/android/gms/auth/api/signin/internal/GoogleSignInOptionsExtensionParcelable.java
index 696bd43808..af7045e604 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/internal/GoogleSignInOptionsExtensionParcelable.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/internal/GoogleSignInOptionsExtensionParcelable.java
@@ -21,14 +21,14 @@ public class GoogleSignInOptionsExtensionParcelable extends AbstractSafeParcelab
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.L2(parcel, 3, this.k, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.N2(parcel, 3, this.k, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/auth/api/signin/internal/SignInConfiguration.java b/app/src/main/java/com/google/android/gms/auth/api/signin/internal/SignInConfiguration.java
index 4c2278522c..842d2e2fc0 100644
--- a/app/src/main/java/com/google/android/gms/auth/api/signin/internal/SignInConfiguration.java
+++ b/app/src/main/java/com/google/android/gms/auth/api/signin/internal/SignInConfiguration.java
@@ -54,9 +54,9 @@ public final class SignInConfiguration extends AbstractSafeParcelable implements
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.O2(parcel, 5, this.j, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.Q2(parcel, 5, this.j, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/cloudmessaging/CloudMessage.java b/app/src/main/java/com/google/android/gms/cloudmessaging/CloudMessage.java
index 102a57db61..d41199efe7 100644
--- a/app/src/main/java/com/google/android/gms/cloudmessaging/CloudMessage.java
+++ b/app/src/main/java/com/google/android/gms/cloudmessaging/CloudMessage.java
@@ -20,8 +20,8 @@ public final class CloudMessage extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(@NonNull Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/ConnectionResult.java b/app/src/main/java/com/google/android/gms/common/ConnectionResult.java
index a1d2821881..6ceeacc3a3 100644
--- a/app/src/main/java/com/google/android/gms/common/ConnectionResult.java
+++ b/app/src/main/java/com/google/android/gms/common/ConnectionResult.java
@@ -162,15 +162,15 @@ public final class ConnectionResult extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i3);
         int i4 = this.k;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.O2(parcel, 3, this.l, i2, false);
-        AnimatableValueParser.P2(parcel, 4, this.m, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 3, this.l, i2, false);
+        AnimatableValueParser.R2(parcel, 4, this.m, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/Feature.java b/app/src/main/java/com/google/android/gms/common/Feature.java
index 9c9cdca3a5..d9881ef14c 100644
--- a/app/src/main/java/com/google/android/gms/common/Feature.java
+++ b/app/src/main/java/com/google/android/gms/common/Feature.java
@@ -24,12 +24,6 @@ public class Feature extends AbstractSafeParcelable {
         this.k = j;
     }
 
-    public Feature(@RecentlyNonNull String str, @RecentlyNonNull long j) {
-        this.i = str;
-        this.k = j;
-        this.j = -1;
-    }
-
     @Override // java.lang.Object
     @RecentlyNonNull
     public boolean equals(@Nullable Object obj) {
@@ -66,14 +60,14 @@ public class Feature extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
         int i2 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i2);
         long v0 = v0();
-        AnimatableValueParser.W2(parcel, 3, 8);
+        AnimatableValueParser.Y2(parcel, 3, 8);
         parcel.writeLong(v0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java b/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
index b119675956..1f24215aa1 100644
--- a/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
+++ b/app/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java
@@ -43,7 +43,7 @@ import com.google.android.gms.tasks.TaskCompletionSource;
 public class GoogleApiAvailability extends c {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Object f2279c = new Object();
+    public static final Object f2285c = new Object();
     public static final GoogleApiAvailability d = new GoogleApiAvailability();
     public static final int e = c.a;
 
@@ -211,7 +211,7 @@ public class GoogleApiAvailability extends c {
             }
             if (c.i.a.f.e.o.c.R()) {
                 AnimatableValueParser.F(c.i.a.f.e.o.c.R());
-                synchronized (f2279c) {
+                synchronized (f2285c) {
                 }
                 NotificationChannel notificationChannel = notificationManager.getNotificationChannel("com.google.android.gms.availability");
                 SimpleArrayMap<String, String> simpleArrayMap = m.a;
diff --git a/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java b/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java
index ecc38062dc..4847967634 100644
--- a/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java
+++ b/app/src/main/java/com/google/android/gms/common/api/GoogleApiActivity.java
@@ -81,7 +81,7 @@ public class GoogleApiActivity extends Activity implements DialogInterface.OnCan
                     finish();
                 }
             } else {
-                Object obj = GoogleApiAvailability.f2279c;
+                Object obj = GoogleApiAvailability.f2285c;
                 GoogleApiAvailability.d.f(this, num == null ? 8 : num.intValue(), 2, this);
                 this.j = 1;
             }
diff --git a/app/src/main/java/com/google/android/gms/common/api/Scope.java b/app/src/main/java/com/google/android/gms/common/api/Scope.java
index f0f949c925..334a80f9ab 100644
--- a/app/src/main/java/com/google/android/gms/common/api/Scope.java
+++ b/app/src/main/java/com/google/android/gms/common/api/Scope.java
@@ -53,11 +53,11 @@ public final class Scope extends AbstractSafeParcelable implements ReflectedParc
 
     @Override // android.os.Parcelable
     public final void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/api/Status.java b/app/src/main/java/com/google/android/gms/common/api/Status.java
index 61f7e98d85..df744c16eb 100644
--- a/app/src/main/java/com/google/android/gms/common/api/Status.java
+++ b/app/src/main/java/com/google/android/gms/common/api/Status.java
@@ -109,16 +109,16 @@ public final class Status extends AbstractSafeParcelable implements h, Reflected
 
     @Override // android.os.Parcelable
     public final void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i3 = this.o;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.P2(parcel, 2, this.p, false);
-        AnimatableValueParser.O2(parcel, 3, this.q, i2, false);
-        AnimatableValueParser.O2(parcel, 4, this.r, i2, false);
+        AnimatableValueParser.R2(parcel, 2, this.p, false);
+        AnimatableValueParser.Q2(parcel, 3, this.q, i2, false);
+        AnimatableValueParser.Q2(parcel, 4, this.r, i2, false);
         int i4 = this.n;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java b/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java
index 96d2861079..1d74c9cda4 100644
--- a/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java
+++ b/app/src/main/java/com/google/android/gms/common/api/internal/BasePendingResult.java
@@ -10,8 +10,8 @@ import c.i.a.f.e.h.d;
 import c.i.a.f.e.h.f;
 import c.i.a.f.e.h.h;
 import c.i.a.f.e.h.i;
-import c.i.a.f.e.h.j.l0;
-import c.i.a.f.e.h.j.w0;
+import c.i.a.f.e.h.j.j0;
+import c.i.a.f.e.h.j.u0;
 import c.i.a.f.h.e.c;
 import com.airbnb.lottie.parser.AnimatableValueParser;
 import com.google.android.gms.common.annotation.KeepName;
@@ -24,14 +24,14 @@ import java.util.concurrent.atomic.AtomicReference;
 /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
 @KeepName
 public abstract class BasePendingResult<R extends h> extends d<R> {
-    public static final ThreadLocal<Boolean> a = new w0();
+    public static final ThreadLocal<Boolean> a = new u0();
     public final Object b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a<R> f2280c;
+    public final a<R> f2286c;
     public final CountDownLatch d;
     public final ArrayList<d.a> e;
-    public final AtomicReference<l0> f;
+    public final AtomicReference<j0> f;
     @Nullable
     public R g;
     public Status h;
@@ -72,7 +72,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
 
     /* compiled from: com.google.android.gms:play-services-base@@17.3.0 */
     public final class b {
-        public b(w0 w0Var) {
+        public b(u0 u0Var) {
         }
 
         public final void finalize() throws Throwable {
@@ -88,7 +88,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
         this.e = new ArrayList<>();
         this.f = new AtomicReference<>();
         this.k = false;
-        this.f2280c = new a<>(Looper.getMainLooper());
+        this.f2286c = new a<>(Looper.getMainLooper());
         new WeakReference(null);
     }
 
@@ -98,7 +98,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
         this.e = new ArrayList<>();
         this.f = new AtomicReference<>();
         this.k = false;
-        this.f2280c = new a<>(cVar != null ? cVar.c() : Looper.getMainLooper());
+        this.f2286c = new a<>(cVar != null ? cVar.c() : Looper.getMainLooper());
         new WeakReference(cVar);
     }
 
@@ -190,7 +190,7 @@ public abstract class BasePendingResult<R extends h> extends d<R> {
             this.g = null;
             this.i = true;
         }
-        l0 andSet = this.f.getAndSet(null);
+        j0 andSet = this.f.getAndSet(null);
         if (andSet != null) {
             andSet.a(this);
         }
diff --git a/app/src/main/java/com/google/android/gms/common/api/internal/LifecycleCallback.java b/app/src/main/java/com/google/android/gms/common/api/internal/LifecycleCallback.java
index 53704f80f5..4070de9504 100644
--- a/app/src/main/java/com/google/android/gms/common/api/internal/LifecycleCallback.java
+++ b/app/src/main/java/com/google/android/gms/common/api/internal/LifecycleCallback.java
@@ -8,8 +8,8 @@ import androidx.annotation.MainThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.RecentlyNonNull;
 import androidx.fragment.app.FragmentActivity;
-import c.i.a.f.e.h.j.d1;
-import c.i.a.f.e.h.j.e1;
+import c.i.a.f.e.h.j.b1;
+import c.i.a.f.e.h.j.c1;
 import c.i.a.f.e.h.j.i;
 import c.i.a.f.e.h.j.j;
 import com.airbnb.lottie.parser.AnimatableValueParser;
@@ -43,41 +43,41 @@ public class LifecycleCallback {
         AnimatableValueParser.z(activity, "Activity must not be null");
         if (activity instanceof FragmentActivity) {
             FragmentActivity fragmentActivity = (FragmentActivity) activity;
-            WeakReference<e1> weakReference = e1.i.get(fragmentActivity);
+            WeakReference<c1> weakReference = c1.i.get(fragmentActivity);
             if (weakReference != null) {
-                j jVar4 = (e1) weakReference.get();
+                j jVar4 = (c1) weakReference.get();
                 jVar = jVar4;
             }
             try {
-                e1 e1Var = (e1) fragmentActivity.getSupportFragmentManager().findFragmentByTag("SupportLifecycleFragmentImpl");
-                if (e1Var != null) {
-                    boolean isRemoving = e1Var.isRemoving();
-                    jVar3 = e1Var;
+                c1 c1Var = (c1) fragmentActivity.getSupportFragmentManager().findFragmentByTag("SupportLifecycleFragmentImpl");
+                if (c1Var != null) {
+                    boolean isRemoving = c1Var.isRemoving();
+                    jVar3 = c1Var;
                 }
-                e1 e1Var2 = new e1();
-                fragmentActivity.getSupportFragmentManager().beginTransaction().add(e1Var2, "SupportLifecycleFragmentImpl").commitAllowingStateLoss();
-                jVar3 = e1Var2;
-                e1.i.put(fragmentActivity, new WeakReference<>(jVar3));
+                c1 c1Var2 = new c1();
+                fragmentActivity.getSupportFragmentManager().beginTransaction().add(c1Var2, "SupportLifecycleFragmentImpl").commitAllowingStateLoss();
+                jVar3 = c1Var2;
+                c1.i.put(fragmentActivity, new WeakReference<>(jVar3));
                 jVar = jVar3;
             } catch (ClassCastException e) {
                 throw new IllegalStateException("Fragment with tag SupportLifecycleFragmentImpl is not a SupportLifecycleFragmentImpl", e);
             }
         } else {
-            WeakReference<d1> weakReference2 = d1.i.get(activity);
+            WeakReference<b1> weakReference2 = b1.i.get(activity);
             if (weakReference2 != null) {
-                j jVar5 = (d1) weakReference2.get();
+                j jVar5 = (b1) weakReference2.get();
                 jVar = jVar5;
             }
             try {
-                d1 d1Var = (d1) activity.getFragmentManager().findFragmentByTag("LifecycleFragmentImpl");
-                if (d1Var != null) {
-                    boolean isRemoving2 = d1Var.isRemoving();
-                    jVar2 = d1Var;
+                b1 b1Var = (b1) activity.getFragmentManager().findFragmentByTag("LifecycleFragmentImpl");
+                if (b1Var != null) {
+                    boolean isRemoving2 = b1Var.isRemoving();
+                    jVar2 = b1Var;
                 }
-                d1 d1Var2 = new d1();
-                activity.getFragmentManager().beginTransaction().add(d1Var2, "LifecycleFragmentImpl").commitAllowingStateLoss();
-                jVar2 = d1Var2;
-                d1.i.put(activity, new WeakReference<>(jVar2));
+                b1 b1Var2 = new b1();
+                activity.getFragmentManager().beginTransaction().add(b1Var2, "LifecycleFragmentImpl").commitAllowingStateLoss();
+                jVar2 = b1Var2;
+                b1.i.put(activity, new WeakReference<>(jVar2));
                 jVar = jVar2;
             } catch (ClassCastException e2) {
                 throw new IllegalStateException("Fragment with tag LifecycleFragmentImpl is not a LifecycleFragmentImpl", e2);
diff --git a/app/src/main/java/com/google/android/gms/common/data/DataHolder.java b/app/src/main/java/com/google/android/gms/common/data/DataHolder.java
index 68c24c3f33..c558931086 100644
--- a/app/src/main/java/com/google/android/gms/common/data/DataHolder.java
+++ b/app/src/main/java/com/google/android/gms/common/data/DataHolder.java
@@ -90,17 +90,17 @@ public final class DataHolder extends AbstractSafeParcelable implements Closeabl
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.Q2(parcel, 1, this.j, false);
-        AnimatableValueParser.R2(parcel, 2, this.l, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.S2(parcel, 1, this.j, false);
+        AnimatableValueParser.T2(parcel, 2, this.l, i, false);
         int i2 = this.m;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.L2(parcel, 4, this.n, false);
+        AnimatableValueParser.N2(parcel, 4, this.n, false);
         int i3 = this.i;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
         if ((i & 1) != 0) {
             close();
         }
diff --git a/app/src/main/java/com/google/android/gms/common/internal/ConnectionTelemetryConfiguration.java b/app/src/main/java/com/google/android/gms/common/internal/ConnectionTelemetryConfiguration.java
index 3604b630c1..be61312909 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/ConnectionTelemetryConfiguration.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/ConnectionTelemetryConfiguration.java
@@ -28,23 +28,23 @@ public class ConnectionTelemetryConfiguration extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
         boolean z2 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z3 ? 1 : 0);
         int[] iArr = this.l;
         if (iArr != null) {
-            int T22 = AnimatableValueParser.T2(parcel, 4);
+            int V22 = AnimatableValueParser.V2(parcel, 4);
             parcel.writeIntArray(iArr);
-            AnimatableValueParser.Y2(parcel, T22);
+            AnimatableValueParser.a3(parcel, V22);
         }
         int i2 = this.m;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
index 231446d64d..043c4b533d 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
@@ -35,7 +35,7 @@ public class GetServiceRequest extends AbstractSafeParcelable {
     public Feature[] r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f2281s;
+    public boolean f2287s;
     public int t;
     public boolean u;
 
@@ -43,7 +43,7 @@ public class GetServiceRequest extends AbstractSafeParcelable {
         this.i = 5;
         this.k = c.a;
         this.j = i;
-        this.f2281s = true;
+        this.f2287s = true;
     }
 
     public GetServiceRequest(int i, int i2, int i3, String str, IBinder iBinder, Scope[] scopeArr, Bundle bundle, Account account, Feature[] featureArr, Feature[] featureArr2, boolean z2, int i4, boolean z3) {
@@ -80,39 +80,39 @@ public class GetServiceRequest extends AbstractSafeParcelable {
         this.o = bundle;
         this.q = featureArr;
         this.r = featureArr2;
-        this.f2281s = z2;
+        this.f2287s = z2;
         this.t = i4;
         this.u = z3;
     }
 
     @Override // android.os.Parcelable
     public void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i3);
         int i4 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.N2(parcel, 5, this.m, false);
-        AnimatableValueParser.R2(parcel, 6, this.n, i, false);
-        AnimatableValueParser.L2(parcel, 7, this.o, false);
-        AnimatableValueParser.O2(parcel, 8, this.p, i, false);
-        AnimatableValueParser.R2(parcel, 10, this.q, i, false);
-        AnimatableValueParser.R2(parcel, 11, this.r, i, false);
-        boolean z2 = this.f2281s;
-        AnimatableValueParser.W2(parcel, 12, 4);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.P2(parcel, 5, this.m, false);
+        AnimatableValueParser.T2(parcel, 6, this.n, i, false);
+        AnimatableValueParser.N2(parcel, 7, this.o, false);
+        AnimatableValueParser.Q2(parcel, 8, this.p, i, false);
+        AnimatableValueParser.T2(parcel, 10, this.q, i, false);
+        AnimatableValueParser.T2(parcel, 11, this.r, i, false);
+        boolean z2 = this.f2287s;
+        AnimatableValueParser.Y2(parcel, 12, 4);
         parcel.writeInt(z2 ? 1 : 0);
         int i5 = this.t;
-        AnimatableValueParser.W2(parcel, 13, 4);
+        AnimatableValueParser.Y2(parcel, 13, 4);
         parcel.writeInt(i5);
         boolean z3 = this.u;
-        AnimatableValueParser.W2(parcel, 14, 4);
+        AnimatableValueParser.Y2(parcel, 14, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/internal/RootTelemetryConfiguration.java b/app/src/main/java/com/google/android/gms/common/internal/RootTelemetryConfiguration.java
index 97f163695c..d370fc763d 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/RootTelemetryConfiguration.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/RootTelemetryConfiguration.java
@@ -26,22 +26,22 @@ public class RootTelemetryConfiguration extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(@RecentlyNonNull Parcel parcel, @RecentlyNonNull int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         boolean z2 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z3 ? 1 : 0);
         int i3 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(i3);
         int i4 = this.m;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/internal/zas.java b/app/src/main/java/com/google/android/gms/common/internal/zas.java
index 8bab40e85b..df2709b5d9 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/zas.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/zas.java
@@ -33,15 +33,15 @@ public final class zas extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
         int i3 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.O2(parcel, 4, this.l, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 4, this.l, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/internal/zau.java b/app/src/main/java/com/google/android/gms/common/internal/zau.java
index 80984de882..c0daf72937 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/zau.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/zau.java
@@ -53,18 +53,18 @@ public final class zau extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.N2(parcel, 2, this.j, false);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.P2(parcel, 2, this.j, false);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
         boolean z2 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.m;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/internal/zzc.java b/app/src/main/java/com/google/android/gms/common/internal/zzc.java
index 12f27fee49..ccf768cb9e 100644
--- a/app/src/main/java/com/google/android/gms/common/internal/zzc.java
+++ b/app/src/main/java/com/google/android/gms/common/internal/zzc.java
@@ -25,13 +25,13 @@ public final class zzc extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.L2(parcel, 1, this.i, false);
-        AnimatableValueParser.R2(parcel, 2, this.j, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.N2(parcel, 1, this.i, false);
+        AnimatableValueParser.T2(parcel, 2, this.j, i, false);
         int i2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 4, null, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 4, null, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/common/zzj.java b/app/src/main/java/com/google/android/gms/common/zzj.java
index f009561bcd..b02a483185 100644
--- a/app/src/main/java/com/google/android/gms/common/zzj.java
+++ b/app/src/main/java/com/google/android/gms/common/zzj.java
@@ -57,8 +57,8 @@ public final class zzj extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
         t tVar = this.j;
         if (tVar == null) {
             Log.w("GoogleCertificatesQuery", "certificate binder is null");
@@ -66,13 +66,13 @@ public final class zzj extends AbstractSafeParcelable {
         } else {
             Objects.requireNonNull(tVar);
         }
-        AnimatableValueParser.N2(parcel, 2, tVar, false);
+        AnimatableValueParser.P2(parcel, 2, tVar, false);
         boolean z2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java b/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
index 8826897b2b..dc59b0575b 100644
--- a/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
+++ b/app/src/main/java/com/google/android/gms/dynamite/DynamiteModule.java
@@ -33,7 +33,7 @@ public final class DynamiteModule {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public static i f2282c = null;
+    public static i f2288c = null;
     @Nullable
     public static String d = null;
     public static int e = -1;
@@ -75,7 +75,7 @@ public final class DynamiteModule {
             public int b = 0;
 
             /* renamed from: c  reason: collision with root package name */
-            public int f2283c = 0;
+            public int f2289c = 0;
         }
 
         /* compiled from: com.google.android.gms:play-services-basement@@17.4.0 */
@@ -177,7 +177,7 @@ public final class DynamiteModule {
             sb.append(":");
             sb.append(i3);
             Log.i("DynamiteModule", sb.toString());
-            int i4 = a2.f2283c;
+            int i4 = a2.f2289c;
             if (i4 == 0 || ((i4 == -1 && a2.a == 0) || (i4 == 1 && a2.b == 0))) {
                 int i5 = a2.a;
                 int i6 = a2.b;
@@ -209,13 +209,13 @@ public final class DynamiteModule {
                     String valueOf = String.valueOf(e3.getMessage());
                     Log.w("DynamiteModule", valueOf.length() != 0 ? "Failed to load remote module: ".concat(valueOf) : new String("Failed to load remote module: "));
                     int i7 = a2.a;
-                    if (i7 == 0 || aVar.a(context, str, new c(i7)).f2283c != -1) {
+                    if (i7 == 0 || aVar.a(context, str, new c(i7)).f2289c != -1) {
                         throw new LoadingException("Remote load failed. No local fallback found.", e3, null);
                     }
                     return e(context, str);
                 }
             } else {
-                int i8 = a2.f2283c;
+                int i8 = a2.f2289c;
                 StringBuilder sb3 = new StringBuilder(47);
                 sb3.append("VersionPolicy returned invalid code:");
                 sb3.append(i8);
@@ -354,7 +354,7 @@ public final class DynamiteModule {
                         aVar = g2.h0(new c.i.a.f.f.b(context), str, i2);
                     } else {
                         Log.w("DynamiteModule", "Dynamite loader version < 2, falling back to createModuleContext");
-                        aVar = g2.A(new c.i.a.f.f.b(context), str, i2);
+                        aVar = g2.B(new c.i.a.f.f.b(context), str, i2);
                     }
                     if (c.i.a.f.f.b.h(aVar) != null) {
                         return new DynamiteModule((Context) c.i.a.f.f.b.h(aVar));
@@ -415,7 +415,7 @@ public final class DynamiteModule {
                 IInterface queryLocalInterface = iBinder.queryLocalInterface("com.google.android.gms.dynamite.IDynamiteLoaderV2");
                 iVar = queryLocalInterface instanceof i ? (i) queryLocalInterface : new h(iBinder);
             }
-            f2282c = iVar;
+            f2288c = iVar;
         } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e2) {
             throw new LoadingException("Failed to instantiate dynamite loader", e2, null);
         }
@@ -503,7 +503,7 @@ public final class DynamiteModule {
                 }
             } else if (b2 == 2) {
                 Log.w("DynamiteModule", "IDynamite loader version = 2, no high precision latency measurement.");
-                return g2.O(new c.i.a.f.f.b(context), str, z2);
+                return g2.P(new c.i.a.f.f.b(context), str, z2);
             } else {
                 Log.w("DynamiteModule", "IDynamite loader version < 2, falling back to getModuleVersion2");
                 return g2.d0(new c.i.a.f.f.b(context), str, z2);
@@ -530,7 +530,7 @@ public final class DynamiteModule {
         sb.append(i2);
         Log.i("DynamiteModule", sb.toString());
         synchronized (DynamiteModule.class) {
-            iVar = f2282c;
+            iVar = f2288c;
         }
         if (iVar != null) {
             b bVar = f.get();
@@ -545,7 +545,7 @@ public final class DynamiteModule {
             }
             if (valueOf.booleanValue()) {
                 Log.v("DynamiteModule", "Dynamite loader version >= 2, using loadModule2NoCrashUtils");
-                aVar = iVar.q(new c.i.a.f.f.b(applicationContext), str, i2, new c.i.a.f.f.b(cursor));
+                aVar = iVar.r(new c.i.a.f.f.b(applicationContext), str, i2, new c.i.a.f.f.b(cursor));
             } else {
                 Log.w("DynamiteModule", "Dynamite loader version < 2, falling back to loadModule2");
                 aVar = iVar.d(new c.i.a.f.f.b(applicationContext), str, i2, new c.i.a.f.f.b(cursor));
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzh.java b/app/src/main/java/com/google/android/gms/internal/icing/zzh.java
index 298ca5a07b..c5f83b511b 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzh.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzh.java
@@ -40,13 +40,13 @@ public final class zzh extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.R2(parcel, 1, this.i, i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.T2(parcel, 1, this.i, i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
         boolean z2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.O2(parcel, 4, this.l, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 4, this.l, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzi.java b/app/src/main/java/com/google/android/gms/internal/icing/zzi.java
index 7874a5bc51..2d5d254913 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzi.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzi.java
@@ -25,10 +25,10 @@ public final class zzi extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.P2(parcel, 3, this.k, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.R2(parcel, 3, this.k, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzk.java b/app/src/main/java/com/google/android/gms/internal/icing/zzk.java
index 5cd8a76688..35f223b2fb 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzk.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzk.java
@@ -98,13 +98,13 @@ public final class zzk extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.j, false);
-        AnimatableValueParser.O2(parcel, 3, this.k, i2, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.j, false);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i2, false);
         int i3 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.M2(parcel, 5, this.m, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.O2(parcel, 5, this.m, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzm.java b/app/src/main/java/com/google/android/gms/internal/icing/zzm.java
index 4e9642f9a3..e7b53c12a8 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzm.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzm.java
@@ -65,11 +65,11 @@ public final class zzm extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.L2(parcel, 2, this.j, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.N2(parcel, 2, this.j, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzo.java b/app/src/main/java/com/google/android/gms/internal/icing/zzo.java
index 05e6aa2d13..7806b337bb 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzo.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzo.java
@@ -32,10 +32,10 @@ public final class zzo extends AbstractSafeParcelable implements h {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
-        AnimatableValueParser.S2(parcel, 2, this.j, false);
-        AnimatableValueParser.Q2(parcel, 3, this.k, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
+        AnimatableValueParser.U2(parcel, 2, this.j, false);
+        AnimatableValueParser.S2(parcel, 3, this.k, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzt.java b/app/src/main/java/com/google/android/gms/internal/icing/zzt.java
index d1570889c4..973d61358d 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzt.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzt.java
@@ -50,22 +50,22 @@ public final class zzt extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
         boolean z2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
         int i2 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(i2);
         boolean z3 = this.m;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
-        AnimatableValueParser.R2(parcel, 7, this.o, i, false);
-        AnimatableValueParser.P2(parcel, 11, this.p, false);
-        AnimatableValueParser.O2(parcel, 12, this.q, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
+        AnimatableValueParser.T2(parcel, 7, this.o, i, false);
+        AnimatableValueParser.R2(parcel, 11, this.p, false);
+        AnimatableValueParser.Q2(parcel, 12, this.q, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzu.java b/app/src/main/java/com/google/android/gms/internal/icing/zzu.java
index 06c47c496e..48815146d1 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzu.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzu.java
@@ -29,10 +29,10 @@ public final class zzu extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         boolean z2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/icing/zzw.java b/app/src/main/java/com/google/android/gms/internal/icing/zzw.java
index 00f0827f38..52b2ae503a 100644
--- a/app/src/main/java/com/google/android/gms/internal/icing/zzw.java
+++ b/app/src/main/java/com/google/android/gms/internal/icing/zzw.java
@@ -38,26 +38,26 @@ public final class zzw extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
         long j = this.j;
-        AnimatableValueParser.W2(parcel, 2, 8);
+        AnimatableValueParser.Y2(parcel, 2, 8);
         parcel.writeLong(j);
         int i2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.O2(parcel, 5, this.m, i, false);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.Q2(parcel, 5, this.m, i, false);
         boolean z2 = this.n;
-        AnimatableValueParser.W2(parcel, 6, 4);
+        AnimatableValueParser.Y2(parcel, 6, 4);
         parcel.writeInt(z2 ? 1 : 0);
         int i3 = this.o;
-        AnimatableValueParser.W2(parcel, 7, 4);
+        AnimatableValueParser.Y2(parcel, 7, 4);
         parcel.writeInt(i3);
         int i4 = this.p;
-        AnimatableValueParser.W2(parcel, 8, 4);
+        AnimatableValueParser.Y2(parcel, 8, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.P2(parcel, 9, this.q, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 9, this.q, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/measurement/zzae.java b/app/src/main/java/com/google/android/gms/internal/measurement/zzae.java
index adf42ca328..7d15fa808a 100644
--- a/app/src/main/java/com/google/android/gms/internal/measurement/zzae.java
+++ b/app/src/main/java/com/google/android/gms/internal/measurement/zzae.java
@@ -29,20 +29,20 @@ public final class zzae extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         long j = this.i;
-        AnimatableValueParser.W2(parcel, 1, 8);
+        AnimatableValueParser.Y2(parcel, 1, 8);
         parcel.writeLong(j);
         long j2 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 8);
+        AnimatableValueParser.Y2(parcel, 2, 8);
         parcel.writeLong(j2);
         boolean z2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.P2(parcel, 5, this.m, false);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
-        AnimatableValueParser.L2(parcel, 7, this.o, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.R2(parcel, 5, this.m, false);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
+        AnimatableValueParser.N2(parcel, 7, this.o, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java b/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java
index b3d1a25ef5..15c7ae13e2 100644
--- a/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java
+++ b/app/src/main/java/com/google/android/gms/internal/measurement/zzhi.java
@@ -22,7 +22,7 @@ public abstract class zzhi extends u3 {
     public static final boolean b = j7.g;
 
     /* renamed from: c  reason: collision with root package name */
-    public g4 f2284c;
+    public g4 f2290c;
 
     /* compiled from: com.google.android.gms:play-services-measurement-base@@18.0.0 */
     public static class a extends zzhi {
@@ -215,7 +215,7 @@ public abstract class zzhi extends u3 {
                 l3Var.l(e);
             }
             r(e);
-            q6Var.g(c6Var, this.f2284c);
+            q6Var.g(c6Var, this.f2290c);
         }
 
         @Override // com.google.android.gms.internal.measurement.zzhi
diff --git a/app/src/main/java/com/google/android/gms/internal/nearby/zzgp.java b/app/src/main/java/com/google/android/gms/internal/nearby/zzgp.java
index c7c0c12c5b..d0901041a0 100644
--- a/app/src/main/java/com/google/android/gms/internal/nearby/zzgp.java
+++ b/app/src/main/java/com/google/android/gms/internal/nearby/zzgp.java
@@ -60,20 +60,20 @@ public final class zzgp extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 4, this.j, i, false);
-        AnimatableValueParser.O2(parcel, 5, this.k, i, false);
-        AnimatableValueParser.O2(parcel, 6, this.l, i, false);
-        AnimatableValueParser.M2(parcel, 7, this.m, false);
-        AnimatableValueParser.M2(parcel, 8, this.n, false);
+        AnimatableValueParser.Q2(parcel, 4, this.j, i, false);
+        AnimatableValueParser.Q2(parcel, 5, this.k, i, false);
+        AnimatableValueParser.Q2(parcel, 6, this.l, i, false);
+        AnimatableValueParser.O2(parcel, 7, this.m, false);
+        AnimatableValueParser.O2(parcel, 8, this.n, false);
         int i3 = this.o;
-        AnimatableValueParser.W2(parcel, 9, 4);
+        AnimatableValueParser.Y2(parcel, 9, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.M2(parcel, 10, this.p, false);
-        AnimatableValueParser.M2(parcel, 11, this.q, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.O2(parcel, 10, this.p, false);
+        AnimatableValueParser.O2(parcel, 11, this.q, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/nearby/zzgs.java b/app/src/main/java/com/google/android/gms/internal/nearby/zzgs.java
index 2a851e43a4..a424636600 100644
--- a/app/src/main/java/com/google/android/gms/internal/nearby/zzgs.java
+++ b/app/src/main/java/com/google/android/gms/internal/nearby/zzgs.java
@@ -53,12 +53,12 @@ public final class zzgs extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 3, this.k, false);
-        AnimatableValueParser.P2(parcel, 6, this.l, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 3, this.k, false);
+        AnimatableValueParser.R2(parcel, 6, this.l, false);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/nearby/zzgu.java b/app/src/main/java/com/google/android/gms/internal/nearby/zzgu.java
index 54fc0c288a..26e7add486 100644
--- a/app/src/main/java/com/google/android/gms/internal/nearby/zzgu.java
+++ b/app/src/main/java/com/google/android/gms/internal/nearby/zzgu.java
@@ -21,17 +21,17 @@ public final class zzgu extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.j;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.M2(parcel, 2, this.k, false);
+        AnimatableValueParser.O2(parcel, 2, this.k, false);
         boolean z2 = this.l;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
         int i3 = this.i;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java
index ccd5395057..dd28c4c979 100644
--- a/app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java
+++ b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java
@@ -18,8 +18,8 @@ public final class zzt extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java
index 88c5e7af07..265a666674 100644
--- a/app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java
+++ b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java
@@ -18,8 +18,8 @@ public final class zzz extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java b/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
index c35500a588..5f19365617 100644
--- a/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
+++ b/app/src/main/java/com/google/android/gms/measurement/AppMeasurement.java
@@ -37,7 +37,7 @@ public class AppMeasurement {
     public final u4 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b7 f2285c;
+    public final b7 f2291c;
     public final boolean d;
 
     /* compiled from: com.google.android.gms:play-services-measurement-impl@@18.0.0 */
@@ -154,7 +154,7 @@ public class AppMeasurement {
     }
 
     public AppMeasurement(b7 b7Var) {
-        this.f2285c = b7Var;
+        this.f2291c = b7Var;
         this.b = null;
         this.d = true;
     }
@@ -162,7 +162,7 @@ public class AppMeasurement {
     public AppMeasurement(u4 u4Var) {
         Objects.requireNonNull(u4Var, "null reference");
         this.b = u4Var;
-        this.f2285c = null;
+        this.f2291c = null;
         this.d = false;
     }
 
@@ -193,7 +193,7 @@ public class AppMeasurement {
     @Keep
     public void beginAdUnitExposure(@NonNull @Size(min = 1) String str) {
         if (this.d) {
-            this.f2285c.g(str);
+            this.f2291c.g(str);
             return;
         }
         a A = this.b.A();
@@ -204,7 +204,7 @@ public class AppMeasurement {
     @Keep
     public void clearConditionalUserProperty(@NonNull @Size(max = 24, min = 1) String str, @Nullable String str2, @Nullable Bundle bundle) {
         if (this.d) {
-            this.f2285c.l(str, str2, bundle);
+            this.f2291c.l(str, str2, bundle);
         } else {
             this.b.s().R(str, str2, bundle);
         }
@@ -213,7 +213,7 @@ public class AppMeasurement {
     @Keep
     public void endAdUnitExposure(@NonNull @Size(min = 1) String str) {
         if (this.d) {
-            this.f2285c.j(str);
+            this.f2291c.j(str);
             return;
         }
         a A = this.b.A();
@@ -223,13 +223,13 @@ public class AppMeasurement {
 
     @Keep
     public long generateEventId() {
-        return this.d ? this.f2285c.e() : this.b.t().t0();
+        return this.d ? this.f2291c.e() : this.b.t().t0();
     }
 
     @Nullable
     @Keep
     public String getAppInstanceId() {
-        return this.d ? this.f2285c.c() : this.b.s().g.get();
+        return this.d ? this.f2291c.c() : this.b.s().g.get();
     }
 
     @Keep
@@ -238,7 +238,7 @@ public class AppMeasurement {
         List<Bundle> list;
         int i = 0;
         if (this.d) {
-            list = this.f2285c.i(str, str2);
+            list = this.f2291c.i(str, str2);
         } else {
             c6 s2 = this.b.s();
             if (s2.f().y()) {
@@ -273,9 +273,9 @@ public class AppMeasurement {
     @Keep
     public String getCurrentScreenClass() {
         if (this.d) {
-            return this.f2285c.b();
+            return this.f2291c.b();
         }
-        i7 i7Var = this.b.s().a.w().f1156c;
+        i7 i7Var = this.b.s().a.w().f1154c;
         if (i7Var != null) {
             return i7Var.b;
         }
@@ -286,9 +286,9 @@ public class AppMeasurement {
     @Keep
     public String getCurrentScreenName() {
         if (this.d) {
-            return this.f2285c.a();
+            return this.f2291c.a();
         }
-        i7 i7Var = this.b.s().a.w().f1156c;
+        i7 i7Var = this.b.s().a.w().f1154c;
         if (i7Var != null) {
             return i7Var.a;
         }
@@ -298,14 +298,14 @@ public class AppMeasurement {
     @Nullable
     @Keep
     public String getGmpAppId() {
-        return this.d ? this.f2285c.d() : this.b.s().O();
+        return this.d ? this.f2291c.d() : this.b.s().O();
     }
 
     @Keep
     @WorkerThread
     public int getMaxUserProperties(@NonNull @Size(min = 1) String str) {
         if (this.d) {
-            return this.f2285c.h(str);
+            return this.f2291c.h(str);
         }
         this.b.s();
         AnimatableValueParser.w(str);
@@ -316,7 +316,7 @@ public class AppMeasurement {
     @WorkerThread
     public Map<String, Object> getUserProperties(@Nullable String str, @Nullable @Size(max = 24, min = 1) String str2, boolean z2) {
         if (this.d) {
-            return this.f2285c.k(str, str2, z2);
+            return this.f2291c.k(str, str2, z2);
         }
         c6 s2 = this.b.s();
         if (s2.f().y()) {
@@ -344,7 +344,7 @@ public class AppMeasurement {
     @Keep
     public void logEventInternal(String str, String str2, Bundle bundle) {
         if (this.d) {
-            this.f2285c.m(str, str2, bundle);
+            this.f2291c.m(str, str2, bundle);
         } else {
             this.b.s().H(str, str2, bundle);
         }
@@ -354,7 +354,7 @@ public class AppMeasurement {
     public void setConditionalUserProperty(@NonNull ConditionalUserProperty conditionalUserProperty) {
         Objects.requireNonNull(conditionalUserProperty, "null reference");
         if (this.d) {
-            this.f2285c.f(conditionalUserProperty.a());
+            this.f2291c.f(conditionalUserProperty.a());
             return;
         }
         c6 s2 = this.b.s();
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.java b/app/src/main/java/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.java
index 89135cdebc..dedece5a7c 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/AppMeasurementDynamiteService.java
@@ -136,14 +136,14 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void getCurrentScreenClass(fc fcVar) throws RemoteException {
         g();
-        i7 i7Var = this.a.s().a.w().f1156c;
+        i7 i7Var = this.a.s().a.w().f1154c;
         this.a.t().M(fcVar, i7Var != null ? i7Var.b : null);
     }
 
     @Override // c.i.a.f.h.l.ec
     public void getCurrentScreenName(fc fcVar) throws RemoteException {
         g();
-        i7 i7Var = this.a.s().a.w().f1156c;
+        i7 i7Var = this.a.s().a.w().f1154c;
         this.a.t().M(fcVar, i7Var != null ? i7Var.a : null);
     }
 
@@ -261,7 +261,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivityCreated(c.i.a.f.f.a aVar, Bundle bundle, long j) throws RemoteException {
         g();
-        y6 y6Var = this.a.s().f1142c;
+        y6 y6Var = this.a.s().f1140c;
         if (y6Var != null) {
             this.a.s().M();
             y6Var.onActivityCreated((Activity) c.i.a.f.f.b.h(aVar), bundle);
@@ -271,7 +271,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivityDestroyed(c.i.a.f.f.a aVar, long j) throws RemoteException {
         g();
-        y6 y6Var = this.a.s().f1142c;
+        y6 y6Var = this.a.s().f1140c;
         if (y6Var != null) {
             this.a.s().M();
             y6Var.onActivityDestroyed((Activity) c.i.a.f.f.b.h(aVar));
@@ -281,7 +281,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivityPaused(c.i.a.f.f.a aVar, long j) throws RemoteException {
         g();
-        y6 y6Var = this.a.s().f1142c;
+        y6 y6Var = this.a.s().f1140c;
         if (y6Var != null) {
             this.a.s().M();
             y6Var.onActivityPaused((Activity) c.i.a.f.f.b.h(aVar));
@@ -291,7 +291,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivityResumed(c.i.a.f.f.a aVar, long j) throws RemoteException {
         g();
-        y6 y6Var = this.a.s().f1142c;
+        y6 y6Var = this.a.s().f1140c;
         if (y6Var != null) {
             this.a.s().M();
             y6Var.onActivityResumed((Activity) c.i.a.f.f.b.h(aVar));
@@ -301,7 +301,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivitySaveInstanceState(c.i.a.f.f.a aVar, fc fcVar, long j) throws RemoteException {
         g();
-        y6 y6Var = this.a.s().f1142c;
+        y6 y6Var = this.a.s().f1140c;
         Bundle bundle = new Bundle();
         if (y6Var != null) {
             this.a.s().M();
@@ -317,7 +317,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivityStarted(c.i.a.f.f.a aVar, long j) throws RemoteException {
         g();
-        if (this.a.s().f1142c != null) {
+        if (this.a.s().f1140c != null) {
             this.a.s().M();
             Activity activity = (Activity) c.i.a.f.f.b.h(aVar);
         }
@@ -326,7 +326,7 @@ public class AppMeasurementDynamiteService extends dc {
     @Override // c.i.a.f.h.l.ec
     public void onActivityStopped(c.i.a.f.f.a aVar, long j) throws RemoteException {
         g();
-        if (this.a.s().f1142c != null) {
+        if (this.a.s().f1140c != null) {
             this.a.s().M();
             Activity activity = (Activity) c.i.a.f.f.b.h(aVar);
         }
@@ -399,7 +399,7 @@ public class AppMeasurementDynamiteService extends dc {
         Activity activity = (Activity) c.i.a.f.f.b.h(aVar);
         if (!w.a.h.z().booleanValue()) {
             w.g().k.a("setCurrentScreen cannot be called while screen reporting is disabled.");
-        } else if (w.f1156c == null) {
+        } else if (w.f1154c == null) {
             w.g().k.a("setCurrentScreen cannot be called while no activity active");
         } else if (w.f.get(activity) == null) {
             w.g().k.a("setCurrentScreen must be called with an activity in the activity lifecycle");
@@ -407,8 +407,8 @@ public class AppMeasurementDynamiteService extends dc {
             if (str2 == null) {
                 str2 = h7.x(activity.getClass().getCanonicalName());
             }
-            boolean q0 = t9.q0(w.f1156c.b, str2);
-            boolean q02 = t9.q0(w.f1156c.a, str);
+            boolean q0 = t9.q0(w.f1154c.b, str2);
+            boolean q02 = t9.q0(w.f1154c.a, str);
             if (q0 && q02) {
                 w.g().k.a("setCurrentScreen cannot be called with the same class and name");
             } else if (str != null && (str.length() <= 0 || str.length() > 100)) {
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzap.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzap.java
index bac2ea16be..046d989a48 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzap.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzap.java
@@ -37,9 +37,9 @@ public final class zzap extends AbstractSafeParcelable implements Iterable<Strin
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.L2(parcel, 2, w0(), false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.N2(parcel, 2, w0(), false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 
     public final Long x0(String str) {
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzaq.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzaq.java
index 91a35f0b22..b89e05c53c 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzaq.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzaq.java
@@ -40,13 +40,13 @@ public final class zzaq extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.O2(parcel, 3, this.j, i, false);
-        AnimatableValueParser.P2(parcel, 4, this.k, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.Q2(parcel, 3, this.j, i, false);
+        AnimatableValueParser.R2(parcel, 4, this.k, false);
         long j = this.l;
-        AnimatableValueParser.W2(parcel, 5, 8);
+        AnimatableValueParser.Y2(parcel, 5, 8);
         parcel.writeLong(j);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzku.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzku.java
index f267e6a13b..8ffc0c3d9d 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzku.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzku.java
@@ -32,7 +32,7 @@ public final class zzku extends AbstractSafeParcelable {
     }
 
     public zzku(u9 u9Var) {
-        this(u9Var.f1203c, u9Var.d, u9Var.e, u9Var.b);
+        this(u9Var.f1201c, u9Var.d, u9Var.e, u9Var.b);
     }
 
     public zzku(String str, long j, Object obj, String str2) {
@@ -80,26 +80,26 @@ public final class zzku extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
         long j = this.k;
-        AnimatableValueParser.W2(parcel, 3, 8);
+        AnimatableValueParser.Y2(parcel, 3, 8);
         parcel.writeLong(j);
         Long l = this.l;
         if (l != null) {
-            AnimatableValueParser.W2(parcel, 4, 8);
+            AnimatableValueParser.Y2(parcel, 4, 8);
             parcel.writeLong(l.longValue());
         }
-        AnimatableValueParser.P2(parcel, 6, this.m, false);
-        AnimatableValueParser.P2(parcel, 7, this.n, false);
+        AnimatableValueParser.R2(parcel, 6, this.m, false);
+        AnimatableValueParser.R2(parcel, 7, this.n, false);
         Double d = this.o;
         if (d != null) {
-            AnimatableValueParser.W2(parcel, 8, 8);
+            AnimatableValueParser.Y2(parcel, 8, 8);
             parcel.writeDouble(d.doubleValue());
         }
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java
index 37204186db..4f4b72df36 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzn.java
@@ -27,20 +27,20 @@ public final class zzn extends AbstractSafeParcelable {
     public final long r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final String f2286s;
+    public final String f2292s;
     public final long t;
     public final long u;
     public final int v;
     public final boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final boolean f2287x;
+    public final boolean f2293x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final boolean f2288y;
+    public final boolean f2294y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final String f2289z;
+    public final String f2295z;
 
     public zzn(String str, String str2, String str3, long j, String str4, long j2, long j3, String str5, boolean z2, boolean z3, String str6, long j4, long j5, int i, boolean z4, boolean z5, boolean z6, String str7, Boolean bool, long j6, List<String> list, String str8, String str9) {
         AnimatableValueParser.w(str);
@@ -54,14 +54,14 @@ public final class zzn extends AbstractSafeParcelable {
         this.o = str5;
         this.p = z2;
         this.q = z3;
-        this.f2286s = str6;
+        this.f2292s = str6;
         this.t = j4;
         this.u = j5;
         this.v = i;
         this.w = z4;
-        this.f2287x = z5;
-        this.f2288y = z6;
-        this.f2289z = str7;
+        this.f2293x = z5;
+        this.f2294y = z6;
+        this.f2295z = str7;
         this.A = bool;
         this.B = j6;
         this.C = list;
@@ -80,14 +80,14 @@ public final class zzn extends AbstractSafeParcelable {
         this.o = str5;
         this.p = z2;
         this.q = z3;
-        this.f2286s = str6;
+        this.f2292s = str6;
         this.t = j4;
         this.u = j5;
         this.v = i;
         this.w = z4;
-        this.f2287x = z5;
-        this.f2288y = z6;
-        this.f2289z = str7;
+        this.f2293x = z5;
+        this.f2294y = z6;
+        this.f2295z = str7;
         this.A = bool;
         this.B = j6;
         this.C = list;
@@ -97,63 +97,63 @@ public final class zzn extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.P2(parcel, 3, this.j, false);
-        AnimatableValueParser.P2(parcel, 4, this.k, false);
-        AnimatableValueParser.P2(parcel, 5, this.l, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.R2(parcel, 3, this.j, false);
+        AnimatableValueParser.R2(parcel, 4, this.k, false);
+        AnimatableValueParser.R2(parcel, 5, this.l, false);
         long j = this.m;
-        AnimatableValueParser.W2(parcel, 6, 8);
+        AnimatableValueParser.Y2(parcel, 6, 8);
         parcel.writeLong(j);
         long j2 = this.n;
-        AnimatableValueParser.W2(parcel, 7, 8);
+        AnimatableValueParser.Y2(parcel, 7, 8);
         parcel.writeLong(j2);
-        AnimatableValueParser.P2(parcel, 8, this.o, false);
+        AnimatableValueParser.R2(parcel, 8, this.o, false);
         boolean z2 = this.p;
-        AnimatableValueParser.W2(parcel, 9, 4);
+        AnimatableValueParser.Y2(parcel, 9, 4);
         parcel.writeInt(z2 ? 1 : 0);
         boolean z3 = this.q;
-        AnimatableValueParser.W2(parcel, 10, 4);
+        AnimatableValueParser.Y2(parcel, 10, 4);
         parcel.writeInt(z3 ? 1 : 0);
         long j3 = this.r;
-        AnimatableValueParser.W2(parcel, 11, 8);
+        AnimatableValueParser.Y2(parcel, 11, 8);
         parcel.writeLong(j3);
-        AnimatableValueParser.P2(parcel, 12, this.f2286s, false);
+        AnimatableValueParser.R2(parcel, 12, this.f2292s, false);
         long j4 = this.t;
-        AnimatableValueParser.W2(parcel, 13, 8);
+        AnimatableValueParser.Y2(parcel, 13, 8);
         parcel.writeLong(j4);
         long j5 = this.u;
-        AnimatableValueParser.W2(parcel, 14, 8);
+        AnimatableValueParser.Y2(parcel, 14, 8);
         parcel.writeLong(j5);
         int i2 = this.v;
-        AnimatableValueParser.W2(parcel, 15, 4);
+        AnimatableValueParser.Y2(parcel, 15, 4);
         parcel.writeInt(i2);
         boolean z4 = this.w;
-        AnimatableValueParser.W2(parcel, 16, 4);
+        AnimatableValueParser.Y2(parcel, 16, 4);
         parcel.writeInt(z4 ? 1 : 0);
-        boolean z5 = this.f2287x;
-        AnimatableValueParser.W2(parcel, 17, 4);
+        boolean z5 = this.f2293x;
+        AnimatableValueParser.Y2(parcel, 17, 4);
         parcel.writeInt(z5 ? 1 : 0);
-        boolean z6 = this.f2288y;
-        AnimatableValueParser.W2(parcel, 18, 4);
+        boolean z6 = this.f2294y;
+        AnimatableValueParser.Y2(parcel, 18, 4);
         parcel.writeInt(z6 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 19, this.f2289z, false);
+        AnimatableValueParser.R2(parcel, 19, this.f2295z, false);
         Boolean bool = this.A;
         if (bool != null) {
-            AnimatableValueParser.W2(parcel, 21, 4);
+            AnimatableValueParser.Y2(parcel, 21, 4);
             parcel.writeInt(bool.booleanValue() ? 1 : 0);
         }
         long j6 = this.B;
-        AnimatableValueParser.W2(parcel, 22, 8);
+        AnimatableValueParser.Y2(parcel, 22, 8);
         parcel.writeLong(j6);
         List<String> list = this.C;
         if (list != null) {
-            int T22 = AnimatableValueParser.T2(parcel, 23);
+            int V22 = AnimatableValueParser.V2(parcel, 23);
             parcel.writeStringList(list);
-            AnimatableValueParser.Y2(parcel, T22);
+            AnimatableValueParser.a3(parcel, V22);
         }
-        AnimatableValueParser.P2(parcel, 24, this.D, false);
-        AnimatableValueParser.P2(parcel, 25, this.E, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 24, this.D, false);
+        AnimatableValueParser.R2(parcel, 25, this.E, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java b/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java
index e0c20f45da..afaf70484f 100644
--- a/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java
+++ b/app/src/main/java/com/google/android/gms/measurement/internal/zzz.java
@@ -20,7 +20,7 @@ public final class zzz extends AbstractSafeParcelable {
     public long r;
 
     /* renamed from: s  reason: collision with root package name */
-    public zzaq f2290s;
+    public zzaq f2296s;
 
     public zzz(zzz zzz) {
         this.i = zzz.i;
@@ -33,7 +33,7 @@ public final class zzz extends AbstractSafeParcelable {
         this.p = zzz.p;
         this.q = zzz.q;
         this.r = zzz.r;
-        this.f2290s = zzz.f2290s;
+        this.f2296s = zzz.f2296s;
     }
 
     public zzz(String str, String str2, zzku zzku, long j, boolean z2, String str3, zzaq zzaq, long j2, zzaq zzaq2, long j3, zzaq zzaq3) {
@@ -47,31 +47,31 @@ public final class zzz extends AbstractSafeParcelable {
         this.p = j2;
         this.q = zzaq2;
         this.r = j3;
-        this.f2290s = zzaq3;
+        this.f2296s = zzaq3;
     }
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.P2(parcel, 3, this.j, false);
-        AnimatableValueParser.O2(parcel, 4, this.k, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.R2(parcel, 3, this.j, false);
+        AnimatableValueParser.Q2(parcel, 4, this.k, i, false);
         long j = this.l;
-        AnimatableValueParser.W2(parcel, 5, 8);
+        AnimatableValueParser.Y2(parcel, 5, 8);
         parcel.writeLong(j);
         boolean z2 = this.m;
-        AnimatableValueParser.W2(parcel, 6, 4);
+        AnimatableValueParser.Y2(parcel, 6, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 7, this.n, false);
-        AnimatableValueParser.O2(parcel, 8, this.o, i, false);
+        AnimatableValueParser.R2(parcel, 7, this.n, false);
+        AnimatableValueParser.Q2(parcel, 8, this.o, i, false);
         long j2 = this.p;
-        AnimatableValueParser.W2(parcel, 9, 8);
+        AnimatableValueParser.Y2(parcel, 9, 8);
         parcel.writeLong(j2);
-        AnimatableValueParser.O2(parcel, 10, this.q, i, false);
+        AnimatableValueParser.Q2(parcel, 10, this.q, i, false);
         long j3 = this.r;
-        AnimatableValueParser.W2(parcel, 11, 8);
+        AnimatableValueParser.Y2(parcel, 11, 8);
         parcel.writeLong(j3);
-        AnimatableValueParser.O2(parcel, 12, this.f2290s, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 12, this.f2296s, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/Message.java b/app/src/main/java/com/google/android/gms/nearby/messages/Message.java
index 9dc79ccb2d..cdc95a8243 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/Message.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/Message.java
@@ -68,17 +68,17 @@ public class Message extends AbstractSafeParcelable implements ReflectedParcelab
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.M2(parcel, 1, this.k, false);
-        AnimatableValueParser.P2(parcel, 2, this.l, false);
-        AnimatableValueParser.P2(parcel, 3, this.m, false);
-        AnimatableValueParser.R2(parcel, 4, this.n, i2, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.O2(parcel, 1, this.k, false);
+        AnimatableValueParser.R2(parcel, 2, this.l, false);
+        AnimatableValueParser.R2(parcel, 3, this.m, false);
+        AnimatableValueParser.T2(parcel, 4, this.n, i2, false);
         long j = this.o;
-        AnimatableValueParser.W2(parcel, 5, 8);
+        AnimatableValueParser.Y2(parcel, 5, 8);
         parcel.writeLong(j);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/MessageFilter.java b/app/src/main/java/com/google/android/gms/nearby/messages/MessageFilter.java
index 3612e66bf9..144c40ad74 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/MessageFilter.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/MessageFilter.java
@@ -74,19 +74,19 @@ public class MessageFilter extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.S2(parcel, 1, this.k, false);
-        AnimatableValueParser.S2(parcel, 2, this.l, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.U2(parcel, 1, this.k, false);
+        AnimatableValueParser.U2(parcel, 2, this.l, false);
         boolean z2 = this.m;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.S2(parcel, 4, this.n, false);
+        AnimatableValueParser.U2(parcel, 4, this.n, false);
         int i3 = this.o;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(i3);
         int i4 = this.j;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java b/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java
index 3730cc8d43..aa486abb93 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/Strategy.java
@@ -132,31 +132,31 @@ public class Strategy extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i2) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i3 = this.l;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i3);
         int i4 = this.m;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i4);
         int i5 = this.n;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i5);
         boolean z2 = this.o;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(z2 ? 1 : 0);
         int i6 = this.p;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(i6);
         int i7 = this.q;
-        AnimatableValueParser.W2(parcel, 6, 4);
+        AnimatableValueParser.Y2(parcel, 6, 4);
         parcel.writeInt(i7);
         int i8 = this.r;
-        AnimatableValueParser.W2(parcel, 7, 4);
+        AnimatableValueParser.Y2(parcel, 7, 4);
         parcel.writeInt(i8);
         int i9 = this.k;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i9);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java b/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java
index 42de3e587f..bb63d57951 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/SubscribeOptions.java
@@ -9,7 +9,7 @@ public final class SubscribeOptions {
     @Nullable
 
     /* renamed from: c  reason: collision with root package name */
-    public final d f2291c = null;
+    public final d f2297c = null;
     public final boolean d = false;
 
     static {
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/ClientAppContext.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/ClientAppContext.java
index 7663ed9575..082f39e842 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/ClientAppContext.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/ClientAppContext.java
@@ -80,19 +80,19 @@ public final class ClientAppContext extends AbstractSafeParcelable implements Re
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.P2(parcel, 3, this.k, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.R2(parcel, 3, this.k, false);
         boolean z2 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(z2 ? 1 : 0);
         int i3 = this.m;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java
index 8ad95d260b..c4c9b47401 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/SubscribeRequest.java
@@ -41,7 +41,7 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
     @Deprecated
 
     /* renamed from: s  reason: collision with root package name */
-    public final boolean f2292s;
+    public final boolean f2298s;
     @Nullable
     public final a t;
     @Deprecated
@@ -51,10 +51,10 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
     public final boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final int f2293x;
+    public final int f2299x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2294y;
+    public final int f2300y;
 
     public SubscribeRequest(int i, @Nullable IBinder iBinder, Strategy strategy, IBinder iBinder2, MessageFilter messageFilter, @Nullable PendingIntent pendingIntent, int i2, @Nullable String str, @Nullable String str2, @Nullable byte[] bArr, boolean z2, @Nullable IBinder iBinder3, boolean z3, @Nullable ClientAppContext clientAppContext, boolean z4, int i3, int i4) {
         o0 o0Var;
@@ -82,7 +82,7 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         this.p = str;
         this.q = str2;
         this.r = bArr;
-        this.f2292s = z2;
+        this.f2298s = z2;
         if (iBinder3 != null) {
             IInterface queryLocalInterface3 = iBinder3.queryLocalInterface("com.google.android.gms.nearby.messages.internal.ISubscribeCallback");
             aVar = queryLocalInterface3 instanceof a ? (a) queryLocalInterface3 : new c(iBinder3);
@@ -91,8 +91,8 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         this.u = z3;
         this.v = ClientAppContext.v0(clientAppContext, str2, str, z3);
         this.w = z4;
-        this.f2293x = i3;
-        this.f2294y = i4;
+        this.f2299x = i3;
+        this.f2300y = i4;
     }
 
     @Override // java.lang.Object
@@ -120,8 +120,8 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
         boolean z3 = this.w;
         String str2 = this.p;
         String str3 = this.q;
-        boolean z4 = this.f2292s;
-        int i = this.f2294y;
+        boolean z4 = this.f2298s;
+        int i = this.f2300y;
         StringBuilder K = c.d.b.a.a.K(c.d.b.a.a.m(str3, c.d.b.a.a.m(str2, valueOf7.length() + valueOf6.length() + c.d.b.a.a.m(str, valueOf5.length() + valueOf4.length() + valueOf3.length() + valueOf2.length() + valueOf.length() + 291))), "SubscribeRequest{messageListener=", valueOf, ", strategy=", valueOf2);
         c.d.b.a.a.k0(K, ", callback=", valueOf3, ", filter=", valueOf4);
         c.d.b.a.a.k0(K, ", pendingIntent=", valueOf5, ", hint=", str);
@@ -144,45 +144,45 @@ public final class SubscribeRequest extends AbstractSafeParcelable implements Re
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         o0 o0Var = this.j;
         IBinder iBinder = null;
-        AnimatableValueParser.N2(parcel, 2, o0Var == null ? null : o0Var.asBinder(), false);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.P2(parcel, 2, o0Var == null ? null : o0Var.asBinder(), false);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
         r0 r0Var = this.l;
-        AnimatableValueParser.N2(parcel, 4, r0Var == null ? null : r0Var.asBinder(), false);
-        AnimatableValueParser.O2(parcel, 5, this.m, i, false);
-        AnimatableValueParser.O2(parcel, 6, this.n, i, false);
+        AnimatableValueParser.P2(parcel, 4, r0Var == null ? null : r0Var.asBinder(), false);
+        AnimatableValueParser.Q2(parcel, 5, this.m, i, false);
+        AnimatableValueParser.Q2(parcel, 6, this.n, i, false);
         int i3 = this.o;
-        AnimatableValueParser.W2(parcel, 7, 4);
+        AnimatableValueParser.Y2(parcel, 7, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.P2(parcel, 8, this.p, false);
-        AnimatableValueParser.P2(parcel, 9, this.q, false);
-        AnimatableValueParser.M2(parcel, 10, this.r, false);
-        boolean z2 = this.f2292s;
-        AnimatableValueParser.W2(parcel, 11, 4);
+        AnimatableValueParser.R2(parcel, 8, this.p, false);
+        AnimatableValueParser.R2(parcel, 9, this.q, false);
+        AnimatableValueParser.O2(parcel, 10, this.r, false);
+        boolean z2 = this.f2298s;
+        AnimatableValueParser.Y2(parcel, 11, 4);
         parcel.writeInt(z2 ? 1 : 0);
         a aVar = this.t;
         if (aVar != null) {
             iBinder = aVar.asBinder();
         }
-        AnimatableValueParser.N2(parcel, 12, iBinder, false);
+        AnimatableValueParser.P2(parcel, 12, iBinder, false);
         boolean z3 = this.u;
-        AnimatableValueParser.W2(parcel, 13, 4);
+        AnimatableValueParser.Y2(parcel, 13, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.O2(parcel, 14, this.v, i, false);
+        AnimatableValueParser.Q2(parcel, 14, this.v, i, false);
         boolean z4 = this.w;
-        AnimatableValueParser.W2(parcel, 15, 4);
+        AnimatableValueParser.Y2(parcel, 15, 4);
         parcel.writeInt(z4 ? 1 : 0);
-        int i4 = this.f2293x;
-        AnimatableValueParser.W2(parcel, 16, 4);
+        int i4 = this.f2299x;
+        AnimatableValueParser.Y2(parcel, 16, 4);
         parcel.writeInt(i4);
-        int i5 = this.f2294y;
-        AnimatableValueParser.W2(parcel, 17, 4);
+        int i5 = this.f2300y;
+        AnimatableValueParser.Y2(parcel, 17, 4);
         parcel.writeInt(i5);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java
index 8dc1810601..8e3c776120 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/Update.java
@@ -216,18 +216,18 @@ public class Update extends AbstractSafeParcelable implements ReflectedParcelabl
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
-        AnimatableValueParser.O2(parcel, 4, this.l, i, false);
-        AnimatableValueParser.O2(parcel, 5, this.m, i, false);
-        AnimatableValueParser.O2(parcel, 6, this.n, i, false);
-        AnimatableValueParser.M2(parcel, 7, this.o, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.Q2(parcel, 4, this.l, i, false);
+        AnimatableValueParser.Q2(parcel, 5, this.m, i, false);
+        AnimatableValueParser.Q2(parcel, 6, this.n, i, false);
+        AnimatableValueParser.O2(parcel, 7, this.o, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zza.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zza.java
index 5ac7da3a57..d330275955 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zza.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zza.java
@@ -61,16 +61,16 @@ public final class zza extends AbstractSafeParcelable implements BleSignal {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i3);
         int i4 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i4);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzad.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzad.java
index f16e2df193..1eeb897c74 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzad.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzad.java
@@ -50,12 +50,12 @@ public final class zzad extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.j, false);
-        AnimatableValueParser.P2(parcel, 2, this.k, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.j, false);
+        AnimatableValueParser.R2(parcel, 2, this.k, false);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzaf.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzaf.java
index 43102131c1..659ed95d70 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzaf.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzaf.java
@@ -44,11 +44,11 @@ public final class zzaf extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.j, i, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.j, i, false);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1000, 4);
+        AnimatableValueParser.Y2(parcel, 1000, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java
index 5a4527214f..a1881cad20 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzbz.java
@@ -35,7 +35,7 @@ public final class zzbz extends AbstractSafeParcelable {
     public final ClientAppContext r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final int f2295s;
+    public final int f2301s;
 
     public zzbz(int i, zzaf zzaf, Strategy strategy, IBinder iBinder, @Nullable String str, @Nullable String str2, boolean z2, @Nullable IBinder iBinder2, boolean z3, @Nullable ClientAppContext clientAppContext, int i2) {
         r0 r0Var;
@@ -60,32 +60,32 @@ public final class zzbz extends AbstractSafeParcelable {
         this.p = w0Var;
         this.q = z3;
         this.r = ClientAppContext.v0(clientAppContext, str2, str, z3);
-        this.f2295s = i2;
+        this.f2301s = i2;
     }
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
-        AnimatableValueParser.N2(parcel, 4, this.l.asBinder(), false);
-        AnimatableValueParser.P2(parcel, 5, this.m, false);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.P2(parcel, 4, this.l.asBinder(), false);
+        AnimatableValueParser.R2(parcel, 5, this.m, false);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
         boolean z2 = this.o;
-        AnimatableValueParser.W2(parcel, 7, 4);
+        AnimatableValueParser.Y2(parcel, 7, 4);
         parcel.writeInt(z2 ? 1 : 0);
         w0 w0Var = this.p;
-        AnimatableValueParser.N2(parcel, 8, w0Var == null ? null : w0Var.asBinder(), false);
+        AnimatableValueParser.P2(parcel, 8, w0Var == null ? null : w0Var.asBinder(), false);
         boolean z3 = this.q;
-        AnimatableValueParser.W2(parcel, 9, 4);
+        AnimatableValueParser.Y2(parcel, 9, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.O2(parcel, 10, this.r, i, false);
-        int i3 = this.f2295s;
-        AnimatableValueParser.W2(parcel, 11, 4);
+        AnimatableValueParser.Q2(parcel, 10, this.r, i, false);
+        int i3 = this.f2301s;
+        AnimatableValueParser.Y2(parcel, 11, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcb.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcb.java
index c282c6eea4..4d84660628 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcb.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcb.java
@@ -50,17 +50,17 @@ public final class zzcb extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.N2(parcel, 2, this.j.asBinder(), false);
-        AnimatableValueParser.N2(parcel, 3, this.k.asBinder(), false);
+        AnimatableValueParser.P2(parcel, 2, this.j.asBinder(), false);
+        AnimatableValueParser.P2(parcel, 3, this.k.asBinder(), false);
         boolean z2 = this.l;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 5, this.m, false);
-        AnimatableValueParser.O2(parcel, 6, this.n, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 5, this.m, false);
+        AnimatableValueParser.Q2(parcel, 6, this.n, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzce.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzce.java
index ed193dfc3d..c4a1a1377e 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzce.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzce.java
@@ -46,18 +46,18 @@ public final class zzce extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
-        AnimatableValueParser.N2(parcel, 3, this.k.asBinder(), false);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.P2(parcel, 5, this.m, false);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.P2(parcel, 3, this.k.asBinder(), false);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.R2(parcel, 5, this.m, false);
         boolean z2 = this.n;
-        AnimatableValueParser.W2(parcel, 6, 4);
+        AnimatableValueParser.Y2(parcel, 6, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.O2(parcel, 7, this.o, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 7, this.o, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcg.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcg.java
index 950eb51972..fd4a5ca675 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcg.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzcg.java
@@ -63,23 +63,23 @@ public final class zzcg extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         o0 o0Var = this.j;
-        AnimatableValueParser.N2(parcel, 2, o0Var == null ? null : o0Var.asBinder(), false);
-        AnimatableValueParser.N2(parcel, 3, this.k.asBinder(), false);
-        AnimatableValueParser.O2(parcel, 4, this.l, i, false);
+        AnimatableValueParser.P2(parcel, 2, o0Var == null ? null : o0Var.asBinder(), false);
+        AnimatableValueParser.P2(parcel, 3, this.k.asBinder(), false);
+        AnimatableValueParser.Q2(parcel, 4, this.l, i, false);
         int i3 = this.m;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
-        AnimatableValueParser.P2(parcel, 7, this.o, false);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
+        AnimatableValueParser.R2(parcel, 7, this.o, false);
         boolean z2 = this.p;
-        AnimatableValueParser.W2(parcel, 8, 4);
+        AnimatableValueParser.Y2(parcel, 8, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.O2(parcel, 9, this.q, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 9, this.q, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zze.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zze.java
index 4650888bbf..331189ac21 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zze.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zze.java
@@ -69,16 +69,16 @@ public final class zze extends AbstractSafeParcelable implements Distance {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i3);
         double d = this.k;
-        AnimatableValueParser.W2(parcel, 3, 8);
+        AnimatableValueParser.Y2(parcel, 3, 8);
         parcel.writeDouble(d);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzj.java b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzj.java
index adb11581b0..833c7e9f73 100644
--- a/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzj.java
+++ b/app/src/main/java/com/google/android/gms/nearby/messages/internal/zzj.java
@@ -28,14 +28,14 @@ public final class zzj extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
         int i3 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/safetynet/HarmfulAppsData.java b/app/src/main/java/com/google/android/gms/safetynet/HarmfulAppsData.java
index 384be79614..430acd8133 100644
--- a/app/src/main/java/com/google/android/gms/safetynet/HarmfulAppsData.java
+++ b/app/src/main/java/com/google/android/gms/safetynet/HarmfulAppsData.java
@@ -19,12 +19,12 @@ public class HarmfulAppsData extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.M2(parcel, 3, this.j, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.O2(parcel, 3, this.j, false);
         int i2 = this.k;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/safetynet/SafetyNetClient.java b/app/src/main/java/com/google/android/gms/safetynet/SafetyNetClient.java
index 2d9c3b44da..387b909a73 100644
--- a/app/src/main/java/com/google/android/gms/safetynet/SafetyNetClient.java
+++ b/app/src/main/java/com/google/android/gms/safetynet/SafetyNetClient.java
@@ -1,19 +1,12 @@
 package com.google.android.gms.safetynet;
 
 import android.app.Activity;
-import android.os.Looper;
 import androidx.annotation.NonNull;
 import c.i.a.f.e.h.a;
 import c.i.a.f.e.h.b;
-import com.airbnb.lottie.parser.AnimatableValueParser;
+import c.i.a.f.e.h.j.n;
 public class SafetyNetClient extends b<a.d.c> {
-    /* JADX WARNING: Illegal instructions before constructor call */
     public SafetyNetClient(@NonNull Activity activity) {
-        super(activity, (a<a.d>) r0, (a.d) null, new b.a(r1, null, r2));
-        a<a.d.c> aVar = c.i.a.f.k.a.f1215c;
-        c.i.a.f.e.h.j.a aVar2 = new c.i.a.f.e.h.j.a();
-        AnimatableValueParser.z(aVar2, "StatusExceptionMapper must not be null.");
-        Looper mainLooper = activity.getMainLooper();
-        AnimatableValueParser.z(mainLooper, "Looper must not be null.");
+        super(activity, (a<a.d>) c.i.a.f.k.a.f1212c, (a.d) null, (n) new c.i.a.f.e.h.j.a());
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/safetynet/zza.java b/app/src/main/java/com/google/android/gms/safetynet/zza.java
index 64a504216d..24a70d881c 100644
--- a/app/src/main/java/com/google/android/gms/safetynet/zza.java
+++ b/app/src/main/java/com/google/android/gms/safetynet/zza.java
@@ -15,8 +15,8 @@ public final class zza extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/safetynet/zzd.java b/app/src/main/java/com/google/android/gms/safetynet/zzd.java
index f93de66a81..cc87f2b11d 100644
--- a/app/src/main/java/com/google/android/gms/safetynet/zzd.java
+++ b/app/src/main/java/com/google/android/gms/safetynet/zzd.java
@@ -25,17 +25,17 @@ public final class zzd extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         long j = this.i;
-        AnimatableValueParser.W2(parcel, 2, 8);
+        AnimatableValueParser.Y2(parcel, 2, 8);
         parcel.writeLong(j);
-        AnimatableValueParser.R2(parcel, 3, this.j, i, false);
+        AnimatableValueParser.T2(parcel, 3, this.j, i, false);
         int i2 = this.k;
-        AnimatableValueParser.W2(parcel, 4, 4);
+        AnimatableValueParser.Y2(parcel, 4, 4);
         parcel.writeInt(i2);
         boolean z2 = this.l;
-        AnimatableValueParser.W2(parcel, 5, 4);
+        AnimatableValueParser.Y2(parcel, 5, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/safetynet/zzf.java b/app/src/main/java/com/google/android/gms/safetynet/zzf.java
index 8ee0e541fb..9aacf1a5af 100644
--- a/app/src/main/java/com/google/android/gms/safetynet/zzf.java
+++ b/app/src/main/java/com/google/android/gms/safetynet/zzf.java
@@ -15,8 +15,8 @@ public final class zzf extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/safetynet/zzh.java b/app/src/main/java/com/google/android/gms/safetynet/zzh.java
index 8b4b6548e6..7b29de1366 100644
--- a/app/src/main/java/com/google/android/gms/safetynet/zzh.java
+++ b/app/src/main/java/com/google/android/gms/safetynet/zzh.java
@@ -17,13 +17,13 @@ public final class zzh extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i2);
         boolean z2 = this.j;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/signin/internal/zab.java b/app/src/main/java/com/google/android/gms/signin/internal/zab.java
index 52de3bc514..d711d1bab7 100644
--- a/app/src/main/java/com/google/android/gms/signin/internal/zab.java
+++ b/app/src/main/java/com/google/android/gms/signin/internal/zab.java
@@ -36,14 +36,14 @@ public final class zab extends AbstractSafeParcelable implements h {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         int i3 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(i3);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/signin/internal/zag.java b/app/src/main/java/com/google/android/gms/signin/internal/zag.java
index 6564c5910f..2c2a5e16ec 100644
--- a/app/src/main/java/com/google/android/gms/signin/internal/zag.java
+++ b/app/src/main/java/com/google/android/gms/signin/internal/zag.java
@@ -27,14 +27,14 @@ public final class zag extends AbstractSafeParcelable implements h {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         List<String> list = this.i;
         if (list != null) {
-            int T22 = AnimatableValueParser.T2(parcel, 1);
+            int V22 = AnimatableValueParser.V2(parcel, 1);
             parcel.writeStringList(list);
-            AnimatableValueParser.Y2(parcel, T22);
+            AnimatableValueParser.a3(parcel, V22);
         }
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/signin/internal/zak.java b/app/src/main/java/com/google/android/gms/signin/internal/zak.java
index 7b8489b244..543e96762c 100644
--- a/app/src/main/java/com/google/android/gms/signin/internal/zak.java
+++ b/app/src/main/java/com/google/android/gms/signin/internal/zak.java
@@ -24,11 +24,11 @@ public final class zak extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/signin/internal/zam.java b/app/src/main/java/com/google/android/gms/signin/internal/zam.java
index 5e853d3f3b..0f94806463 100644
--- a/app/src/main/java/com/google/android/gms/signin/internal/zam.java
+++ b/app/src/main/java/com/google/android/gms/signin/internal/zam.java
@@ -31,12 +31,12 @@ public final class zam extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
-        AnimatableValueParser.O2(parcel, 3, this.k, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.Q2(parcel, 3, this.k, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/android/gms/tasks/TaskCompletionSource.java b/app/src/main/java/com/google/android/gms/tasks/TaskCompletionSource.java
index 63d841fa48..c92aef2c9a 100644
--- a/app/src/main/java/com/google/android/gms/tasks/TaskCompletionSource.java
+++ b/app/src/main/java/com/google/android/gms/tasks/TaskCompletionSource.java
@@ -14,10 +14,10 @@ public class TaskCompletionSource<TResult> {
         Objects.requireNonNull(b0Var);
         AnimatableValueParser.z(exc, "Exception must not be null");
         synchronized (b0Var.a) {
-            if (b0Var.f1218c) {
+            if (b0Var.f1215c) {
                 return false;
             }
-            b0Var.f1218c = true;
+            b0Var.f1215c = true;
             b0Var.f = exc;
             b0Var.b.a(b0Var);
             return true;
@@ -27,10 +27,10 @@ public class TaskCompletionSource<TResult> {
     public boolean b(@Nullable TResult tresult) {
         b0<TResult> b0Var = this.a;
         synchronized (b0Var.a) {
-            if (b0Var.f1218c) {
+            if (b0Var.f1215c) {
                 return false;
             }
-            b0Var.f1218c = true;
+            b0Var.f1215c = true;
             b0Var.e = tresult;
             b0Var.b.a(b0Var);
             return true;
diff --git a/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java b/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
index a0fec9be3f..485dc8b4ec 100644
--- a/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
+++ b/app/src/main/java/com/google/android/material/appbar/AppBarLayout.java
@@ -167,13 +167,13 @@ public class AppBarLayout extends LinearLayout implements CoordinatorLayout.Atta
             public final /* synthetic */ AppBarLayout b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ View f2297c;
+            public final /* synthetic */ View f2303c;
             public final /* synthetic */ int d;
 
             public b(CoordinatorLayout coordinatorLayout, AppBarLayout appBarLayout, View view, int i) {
                 this.a = coordinatorLayout;
                 this.b = appBarLayout;
-                this.f2297c = view;
+                this.f2303c = view;
                 this.d = i;
             }
 
@@ -181,7 +181,7 @@ public class AppBarLayout extends LinearLayout implements CoordinatorLayout.Atta
             /* JADX WARN: Multi-variable type inference failed */
             @Override // androidx.core.view.accessibility.AccessibilityViewCommand
             public boolean perform(@NonNull View view, @Nullable AccessibilityViewCommand.CommandArguments commandArguments) {
-                BaseBehavior.this.onNestedPreScroll(this.a, (CoordinatorLayout) this.b, this.f2297c, 0, this.d, new int[]{0, 0}, 1);
+                BaseBehavior.this.onNestedPreScroll(this.a, (CoordinatorLayout) this.b, this.f2303c, 0, this.d, new int[]{0, 0}, 1);
                 return true;
             }
         }
diff --git a/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java b/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
index a81f1dc1ac..2237b440ef 100644
--- a/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
+++ b/app/src/main/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
@@ -623,7 +623,7 @@ public class CollapsingToolbarLayout extends FrameLayout {
         for (int i6 = 0; i6 < childCount2; i6++) {
             d viewOffsetHelper = getViewOffsetHelper(getChildAt(i6));
             viewOffsetHelper.b = viewOffsetHelper.a.getTop();
-            viewOffsetHelper.f1228c = viewOffsetHelper.a.getLeft();
+            viewOffsetHelper.f1225c = viewOffsetHelper.a.getLeft();
         }
         if (this.collapsingTitleEnabled && (view = this.dummyView) != null) {
             boolean z3 = true;
diff --git a/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java b/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java
index 96b9682c7e..e24a0fb0d1 100644
--- a/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java
+++ b/app/src/main/java/com/google/android/material/behavior/SwipeDismissBehavior.java
@@ -120,7 +120,7 @@ public class SwipeDismissBehavior<V extends View> extends CoordinatorLayout.Beha
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:21:0x0054, code lost:
-            if (java.lang.Math.abs(r8.getLeft() - r7.a) >= java.lang.Math.round(((float) r8.getWidth()) * r7.f2298c.dragDismissThreshold)) goto L_0x002a;
+            if (java.lang.Math.abs(r8.getLeft() - r7.a) >= java.lang.Math.round(((float) r8.getWidth()) * r7.f2304c.dragDismissThreshold)) goto L_0x002a;
          */
         /* JADX WARNING: Removed duplicated region for block: B:23:0x0059  */
         /* JADX WARNING: Removed duplicated region for block: B:28:0x0066  */
diff --git a/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java b/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
index 394ae37014..a1f7387d6d 100644
--- a/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
+++ b/app/src/main/java/com/google/android/material/bottomappbar/BottomAppBar.java
@@ -353,12 +353,12 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
         public final /* synthetic */ ActionMenuView b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ int f2299c;
+        public final /* synthetic */ int f2305c;
         public final /* synthetic */ boolean d;
 
         public g(ActionMenuView actionMenuView, int i, boolean z2) {
             this.b = actionMenuView;
-            this.f2299c = i;
+            this.f2305c = i;
             this.d = z2;
         }
 
@@ -373,7 +373,7 @@ public class BottomAppBar extends Toolbar implements CoordinatorLayout.AttachedB
                 boolean z2 = BottomAppBar.access$2000(BottomAppBar.this) != 0;
                 BottomAppBar bottomAppBar = BottomAppBar.this;
                 bottomAppBar.replaceMenu(BottomAppBar.access$2000(bottomAppBar));
-                BottomAppBar.access$2100(BottomAppBar.this, this.b, this.f2299c, this.d, z2);
+                BottomAppBar.access$2100(BottomAppBar.this, this.b, this.f2305c, this.d, z2);
             }
         }
     }
diff --git a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java
index 32c7f1b194..5e54d1c1b2 100644
--- a/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java
+++ b/app/src/main/java/com/google/android/material/bottomnavigation/BottomNavigationPresenter.java
@@ -18,7 +18,7 @@ import com.google.android.material.internal.ParcelableSparseArray;
 public class BottomNavigationPresenter implements MenuPresenter {
 
     /* renamed from: id  reason: collision with root package name */
-    private int f2300id;
+    private int f2306id;
     private MenuBuilder menu;
     private BottomNavigationMenuView menuView;
     private boolean updateSuspended = false;
@@ -82,7 +82,7 @@ public class BottomNavigationPresenter implements MenuPresenter {
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
     public int getId() {
-        return this.f2300id;
+        return this.f2306id;
     }
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
@@ -132,7 +132,7 @@ public class BottomNavigationPresenter implements MenuPresenter {
     }
 
     public void setId(int i) {
-        this.f2300id = i;
+        this.f2306id = i;
     }
 
     public void setUpdateSuspended(boolean z2) {
diff --git a/app/src/main/java/com/google/android/material/button/MaterialButton.java b/app/src/main/java/com/google/android/material/button/MaterialButton.java
index 51af22a4a2..433bcc20df 100644
--- a/app/src/main/java/com/google/android/material/button/MaterialButton.java
+++ b/app/src/main/java/com/google/android/material/button/MaterialButton.java
@@ -165,7 +165,7 @@ public class MaterialButton extends AppCompatButton implements Checkable, Shapea
         c.i.a.g.b.a aVar = new c.i.a.g.b.a(this, ShapeAppearanceModel.builder(context2, attributeSet, i, i2).build());
         this.materialButtonHelper = aVar;
         Objects.requireNonNull(aVar);
-        aVar.f1229c = obtainStyledAttributes.getDimensionPixelOffset(R.styleable.MaterialButton_android_insetLeft, 0);
+        aVar.f1226c = obtainStyledAttributes.getDimensionPixelOffset(R.styleable.MaterialButton_android_insetLeft, 0);
         aVar.d = obtainStyledAttributes.getDimensionPixelOffset(R.styleable.MaterialButton_android_insetRight, 0);
         aVar.e = obtainStyledAttributes.getDimensionPixelOffset(R.styleable.MaterialButton_android_insetTop, 0);
         aVar.f = obtainStyledAttributes.getDimensionPixelOffset(R.styleable.MaterialButton_android_insetBottom, 0);
@@ -182,7 +182,7 @@ public class MaterialButton extends AppCompatButton implements Checkable, Shapea
         aVar.k = MaterialResources.getColorStateList(getContext(), obtainStyledAttributes, R.styleable.MaterialButton_strokeColor);
         aVar.l = MaterialResources.getColorStateList(getContext(), obtainStyledAttributes, R.styleable.MaterialButton_rippleColor);
         aVar.q = obtainStyledAttributes.getBoolean(R.styleable.MaterialButton_android_checkable, false);
-        aVar.f1230s = obtainStyledAttributes.getDimensionPixelSize(R.styleable.MaterialButton_elevation, 0);
+        aVar.f1227s = obtainStyledAttributes.getDimensionPixelSize(R.styleable.MaterialButton_elevation, 0);
         int paddingStart = ViewCompat.getPaddingStart(this);
         int paddingTop = getPaddingTop();
         int paddingEnd = ViewCompat.getPaddingEnd(this);
@@ -194,7 +194,7 @@ public class MaterialButton extends AppCompatButton implements Checkable, Shapea
         } else {
             aVar.g();
         }
-        ViewCompat.setPaddingRelative(this, paddingStart + aVar.f1229c, paddingTop + aVar.e, paddingEnd + aVar.d, paddingBottom + aVar.f);
+        ViewCompat.setPaddingRelative(this, paddingStart + aVar.f1226c, paddingTop + aVar.e, paddingEnd + aVar.d, paddingBottom + aVar.f);
         obtainStyledAttributes.recycle();
         setCompoundDrawablePadding(this.iconPadding);
         updateIcon(this.icon != null ? true : z2);
@@ -511,7 +511,7 @@ public class MaterialButton extends AppCompatButton implements Checkable, Shapea
             int i6 = i3 - i;
             Drawable drawable = aVar.m;
             if (drawable != null) {
-                drawable.setBounds(aVar.f1229c, aVar.e, i6 - aVar.d, i5 - aVar.f);
+                drawable.setBounds(aVar.f1226c, aVar.e, i6 - aVar.d, i5 - aVar.f);
             }
         }
     }
diff --git a/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java b/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java
index afc052c96e..7839b481ac 100644
--- a/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java
+++ b/app/src/main/java/com/google/android/material/button/MaterialButtonToggleGroup.java
@@ -104,13 +104,13 @@ public class MaterialButtonToggleGroup extends LinearLayout {
         public CornerSize b;
 
         /* renamed from: c  reason: collision with root package name */
-        public CornerSize f2301c;
+        public CornerSize f2307c;
         public CornerSize d;
         public CornerSize e;
 
         public d(CornerSize cornerSize, CornerSize cornerSize2, CornerSize cornerSize3, CornerSize cornerSize4) {
             this.b = cornerSize;
-            this.f2301c = cornerSize3;
+            this.f2307c = cornerSize3;
             this.d = cornerSize4;
             this.e = cornerSize2;
         }
@@ -265,7 +265,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
                 CornerSize cornerSize = d.a;
                 if (ViewUtils.isLayoutRtl(this)) {
                     CornerSize cornerSize2 = d.a;
-                    return new d(cornerSize2, cornerSize2, dVar.f2301c, dVar.d);
+                    return new d(cornerSize2, cornerSize2, dVar.f2307c, dVar.d);
                 }
                 CornerSize cornerSize3 = dVar.b;
                 CornerSize cornerSize4 = dVar.e;
@@ -274,7 +274,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
             }
             CornerSize cornerSize6 = dVar.b;
             CornerSize cornerSize7 = d.a;
-            return new d(cornerSize6, cornerSize7, dVar.f2301c, cornerSize7);
+            return new d(cornerSize6, cornerSize7, dVar.f2307c, cornerSize7);
         } else if (i != i3) {
             return null;
         } else {
@@ -287,7 +287,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
                     return new d(cornerSize9, cornerSize10, cornerSize11, cornerSize11);
                 }
                 CornerSize cornerSize12 = d.a;
-                return new d(cornerSize12, cornerSize12, dVar.f2301c, dVar.d);
+                return new d(cornerSize12, cornerSize12, dVar.f2307c, dVar.d);
             }
             CornerSize cornerSize13 = d.a;
             return new d(cornerSize13, dVar.e, cornerSize13, dVar.d);
@@ -356,7 +356,7 @@ public class MaterialButtonToggleGroup extends LinearLayout {
         if (dVar == null) {
             builder.setAllCornerSizes(0.0f);
         } else {
-            builder.setTopLeftCornerSize(dVar.b).setBottomLeftCornerSize(dVar.e).setTopRightCornerSize(dVar.f2301c).setBottomRightCornerSize(dVar.d);
+            builder.setTopLeftCornerSize(dVar.b).setBottomLeftCornerSize(dVar.e).setTopRightCornerSize(dVar.f2307c).setBottomRightCornerSize(dVar.d);
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/card/MaterialCardView.java b/app/src/main/java/com/google/android/material/card/MaterialCardView.java
index 057343353f..3228c81443 100644
--- a/app/src/main/java/com/google/android/material/card/MaterialCardView.java
+++ b/app/src/main/java/com/google/android/material/card/MaterialCardView.java
@@ -75,7 +75,7 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
         aVar.e.setFillColor(super.getCardBackgroundColor());
         aVar.d.set(super.getContentPaddingLeft(), super.getContentPaddingTop(), super.getContentPaddingRight(), super.getContentPaddingBottom());
         aVar.k();
-        ColorStateList colorStateList = MaterialResources.getColorStateList(aVar.f1231c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_strokeColor);
+        ColorStateList colorStateList = MaterialResources.getColorStateList(aVar.f1228c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_strokeColor);
         aVar.o = colorStateList;
         if (colorStateList == null) {
             aVar.o = ColorStateList.valueOf(-1);
@@ -83,25 +83,25 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
         aVar.i = obtainStyledAttributes.getDimensionPixelSize(R.styleable.MaterialCardView_strokeWidth, 0);
         boolean z2 = obtainStyledAttributes.getBoolean(R.styleable.MaterialCardView_android_checkable, false);
         aVar.u = z2;
-        aVar.f1231c.setLongClickable(z2);
-        aVar.m = MaterialResources.getColorStateList(aVar.f1231c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_checkedIconTint);
-        aVar.g(MaterialResources.getDrawable(aVar.f1231c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_checkedIcon));
+        aVar.f1228c.setLongClickable(z2);
+        aVar.m = MaterialResources.getColorStateList(aVar.f1228c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_checkedIconTint);
+        aVar.g(MaterialResources.getDrawable(aVar.f1228c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_checkedIcon));
         aVar.h = obtainStyledAttributes.getDimensionPixelSize(R.styleable.MaterialCardView_checkedIconSize, 0);
         aVar.g = obtainStyledAttributes.getDimensionPixelSize(R.styleable.MaterialCardView_checkedIconMargin, 0);
-        ColorStateList colorStateList2 = MaterialResources.getColorStateList(aVar.f1231c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_rippleColor);
+        ColorStateList colorStateList2 = MaterialResources.getColorStateList(aVar.f1228c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_rippleColor);
         aVar.l = colorStateList2;
         if (colorStateList2 == null) {
-            aVar.l = ColorStateList.valueOf(MaterialColors.getColor(aVar.f1231c, R.attr.colorControlHighlight));
+            aVar.l = ColorStateList.valueOf(MaterialColors.getColor(aVar.f1228c, R.attr.colorControlHighlight));
         }
-        ColorStateList colorStateList3 = MaterialResources.getColorStateList(aVar.f1231c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_cardForegroundColor);
+        ColorStateList colorStateList3 = MaterialResources.getColorStateList(aVar.f1228c.getContext(), obtainStyledAttributes, R.styleable.MaterialCardView_cardForegroundColor);
         aVar.f.setFillColor(colorStateList3 == null ? ColorStateList.valueOf(0) : colorStateList3);
         aVar.m();
-        aVar.e.setElevation(aVar.f1231c.getCardElevation());
+        aVar.e.setElevation(aVar.f1228c.getCardElevation());
         aVar.n();
-        aVar.f1231c.setBackgroundInternal(aVar.f(aVar.e));
-        Drawable e = aVar.f1231c.isClickable() ? aVar.e() : aVar.f;
+        aVar.f1228c.setBackgroundInternal(aVar.f(aVar.e));
+        Drawable e = aVar.f1228c.isClickable() ? aVar.e() : aVar.f;
         aVar.j = e;
-        aVar.f1231c.setForeground(aVar.f(e));
+        aVar.f1228c.setForeground(aVar.f(e));
         obtainStyledAttributes.recycle();
     }
 
@@ -286,12 +286,12 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
             int i6 = aVar.h;
             int i7 = (measuredWidth - i5) - i6;
             int i8 = (measuredHeight - i5) - i6;
-            if (aVar.f1231c.getUseCompatPadding()) {
+            if (aVar.f1228c.getUseCompatPadding()) {
                 i8 -= (int) Math.ceil((double) (aVar.d() * 2.0f));
                 i7 -= (int) Math.ceil((double) (aVar.c() * 2.0f));
             }
             int i9 = aVar.g;
-            if (ViewCompat.getLayoutDirection(aVar.f1231c) == 1) {
+            if (ViewCompat.getLayoutDirection(aVar.f1228c) == 1) {
                 i3 = i7;
                 i4 = i9;
             } else {
@@ -341,7 +341,7 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
     public void setCardElevation(float f) {
         super.setCardElevation(f);
         a aVar = this.cardViewHelper;
-        aVar.e.setElevation(aVar.f1231c.getCardElevation());
+        aVar.e.setElevation(aVar.f1228c.getCardElevation());
     }
 
     public void setCardForegroundColor(@Nullable ColorStateList colorStateList) {
@@ -406,15 +406,15 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
         a aVar = this.cardViewHelper;
         if (aVar != null) {
             Drawable drawable = aVar.j;
-            Drawable e = aVar.f1231c.isClickable() ? aVar.e() : aVar.f;
+            Drawable e = aVar.f1228c.isClickable() ? aVar.e() : aVar.f;
             aVar.j = e;
             if (drawable == e) {
                 return;
             }
-            if (Build.VERSION.SDK_INT < 23 || !(aVar.f1231c.getForeground() instanceof InsetDrawable)) {
-                aVar.f1231c.setForeground(aVar.f(e));
+            if (Build.VERSION.SDK_INT < 23 || !(aVar.f1228c.getForeground() instanceof InsetDrawable)) {
+                aVar.f1228c.setForeground(aVar.f(e));
             } else {
-                ((InsetDrawable) aVar.f1231c.getForeground()).setDrawable(e);
+                ((InsetDrawable) aVar.f1228c.getForeground()).setDrawable(e);
             }
         }
     }
@@ -459,7 +459,7 @@ public class MaterialCardView extends CardView implements Checkable, Shapeable {
         if (materialShapeDrawable != null) {
             materialShapeDrawable.setInterpolation(f);
         }
-        MaterialShapeDrawable materialShapeDrawable2 = aVar.f1232s;
+        MaterialShapeDrawable materialShapeDrawable2 = aVar.f1229s;
         if (materialShapeDrawable2 != null) {
             materialShapeDrawable2.setInterpolation(f);
         }
diff --git a/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java b/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java
index 58701929fe..3ed8c1faef 100644
--- a/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java
+++ b/app/src/main/java/com/google/android/material/datepicker/MonthsPagerAdapter.java
@@ -19,7 +19,7 @@ public class MonthsPagerAdapter extends RecyclerView.Adapter<ViewHolder> {
     public final CalendarConstraints b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final DateSelector<?> f2304c;
+    public final DateSelector<?> f2310c;
     public final MaterialCalendar.l d;
     public final int e;
 
@@ -51,7 +51,7 @@ public class MonthsPagerAdapter extends RecyclerView.Adapter<ViewHolder> {
             this.a = context;
             this.e = dayHeight + dayHeight2;
             this.b = calendarConstraints;
-            this.f2304c = dateSelector;
+            this.f2310c = dateSelector;
             this.d = lVar;
             setHasStableIds(true);
         } else {
@@ -86,7 +86,7 @@ public class MonthsPagerAdapter extends RecyclerView.Adapter<ViewHolder> {
         viewHolder2.monthTitle.setText(m.l(viewHolder2.itemView.getContext()));
         MaterialCalendarGridView materialCalendarGridView = (MaterialCalendarGridView) viewHolder2.monthGrid.findViewById(R.id.month_grid);
         if (materialCalendarGridView.getAdapter() == null || !m.equals(materialCalendarGridView.getAdapter().j)) {
-            g gVar = new g(m, this.f2304c, this.b);
+            g gVar = new g(m, this.f2310c, this.b);
             materialCalendarGridView.setNumColumns(m.l);
             materialCalendarGridView.setAdapter((ListAdapter) gVar);
         } else {
diff --git a/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java b/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
index 7e7baa16c1..829e9aaf6e 100644
--- a/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
+++ b/app/src/main/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
@@ -278,11 +278,11 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
         public final /* synthetic */ c.i.a.g.e.j b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ OnChangedCallback f2305c;
+        public final /* synthetic */ OnChangedCallback f2311c;
 
         public c(ExtendedFloatingActionButton extendedFloatingActionButton, c.i.a.g.e.j jVar, OnChangedCallback onChangedCallback) {
             this.b = jVar;
-            this.f2305c = onChangedCallback;
+            this.f2311c = onChangedCallback;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
@@ -295,7 +295,7 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
         public void onAnimationEnd(Animator animator) {
             this.b.e();
             if (!this.a) {
-                this.b.g(this.f2305c);
+                this.b.g(this.f2311c);
             }
         }
 
@@ -737,7 +737,7 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
             measure(0, 0);
             AnimatorSet f2 = jVar.f();
             f2.addListener(new c(this, jVar, onChangedCallback));
-            for (Animator.AnimatorListener animatorListener : ((c.i.a.g.e.b) jVar).f1236c) {
+            for (Animator.AnimatorListener animatorListener : ((c.i.a.g.e.b) jVar).f1233c) {
                 f2.addListener(animatorListener);
             }
             f2.start();
@@ -753,19 +753,19 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
     }
 
     public void addOnExtendAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.extendStrategy).f1236c.add(animatorListener);
+        ((c.i.a.g.e.b) this.extendStrategy).f1233c.add(animatorListener);
     }
 
     public void addOnHideAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.hideStrategy).f1236c.add(animatorListener);
+        ((c.i.a.g.e.b) this.hideStrategy).f1233c.add(animatorListener);
     }
 
     public void addOnShowAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.showStrategy).f1236c.add(animatorListener);
+        ((c.i.a.g.e.b) this.showStrategy).f1233c.add(animatorListener);
     }
 
     public void addOnShrinkAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.shrinkStrategy).f1236c.add(animatorListener);
+        ((c.i.a.g.e.b) this.shrinkStrategy).f1233c.add(animatorListener);
     }
 
     public void extend() {
@@ -834,19 +834,19 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Coor
     }
 
     public void removeOnExtendAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.extendStrategy).f1236c.remove(animatorListener);
+        ((c.i.a.g.e.b) this.extendStrategy).f1233c.remove(animatorListener);
     }
 
     public void removeOnHideAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.hideStrategy).f1236c.remove(animatorListener);
+        ((c.i.a.g.e.b) this.hideStrategy).f1233c.remove(animatorListener);
     }
 
     public void removeOnShowAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.showStrategy).f1236c.remove(animatorListener);
+        ((c.i.a.g.e.b) this.showStrategy).f1233c.remove(animatorListener);
     }
 
     public void removeOnShrinkAnimationListener(@NonNull Animator.AnimatorListener animatorListener) {
-        ((c.i.a.g.e.b) this.shrinkStrategy).f1236c.remove(animatorListener);
+        ((c.i.a.g.e.b) this.shrinkStrategy).f1233c.remove(animatorListener);
     }
 
     public void setAnimateShowBeforeLayout(boolean z2) {
diff --git a/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java b/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
index 30dfd63d04..60131b2975 100644
--- a/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
+++ b/app/src/main/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
@@ -420,10 +420,10 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
         int i3 = this.maxImageSize;
         if (impl4.A != i3) {
             impl4.A = i3;
-            impl4.o(impl4.f1244z);
+            impl4.o(impl4.f1241z);
         }
         getImpl().w = createFromAttribute;
-        getImpl().f1242x = createFromAttribute2;
+        getImpl().f1239x = createFromAttribute2;
         getImpl().m = z2;
         setScaleType(ImageView.ScaleType.MATRIX);
     }
@@ -598,7 +598,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
 
     @Nullable
     public MotionSpec getHideMotionSpec() {
-        return getImpl().f1242x;
+        return getImpl().f1239x;
     }
 
     public void getMeasuredContentRect(@NonNull Rect rect) {
@@ -685,7 +685,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
                 animator.cancel();
             }
             if (impl.s()) {
-                MotionSpec motionSpec = impl.f1242x;
+                MotionSpec motionSpec = impl.f1239x;
                 if (motionSpec == null) {
                     if (impl.u == null) {
                         impl.u = MotionSpec.createFromResource(impl.F.getContext(), R.animator.design_fab_hide_motion_spec);
@@ -938,7 +938,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
     }
 
     public void setHideMotionSpec(@Nullable MotionSpec motionSpec) {
-        getImpl().f1242x = motionSpec;
+        getImpl().f1239x = motionSpec;
     }
 
     public void setHideMotionSpecResource(@AnimatorRes int i) {
@@ -950,7 +950,7 @@ public class FloatingActionButton extends VisibilityAwareImageButton implements
         if (getDrawable() != drawable) {
             super.setImageDrawable(drawable);
             f impl = getImpl();
-            impl.o(impl.f1244z);
+            impl.o(impl.f1241z);
             if (this.imageTint != null) {
                 onApplySupportImageTint();
             }
diff --git a/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java b/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
index 3648d21661..7b06096055 100644
--- a/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
+++ b/app/src/main/java/com/google/android/material/internal/NavigationMenuPresenter.java
@@ -43,7 +43,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
     public ColorStateList iconTintList;
 
     /* renamed from: id  reason: collision with root package name */
-    private int f2306id;
+    private int f2312id;
     public boolean isBehindStatusBar = true;
     public Drawable itemBackground;
     public int itemHorizontalPadding;
@@ -95,15 +95,15 @@ public class NavigationMenuPresenter implements MenuPresenter {
         public MenuItemImpl b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f2307c;
+        public boolean f2313c;
 
         public c() {
             a();
         }
 
         public final void a() {
-            if (!this.f2307c) {
-                this.f2307c = true;
+            if (!this.f2313c) {
+                this.f2313c = true;
                 this.a.clear();
                 this.a.add(new d());
                 int i = -1;
@@ -186,7 +186,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                     i2++;
                     z2 = false;
                 }
-                this.f2307c = false;
+                this.f2313c = false;
             }
         }
 
@@ -418,7 +418,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
 
     @Override // androidx.appcompat.view.menu.MenuPresenter
     public int getId() {
-        return this.f2306id;
+        return this.f2312id;
     }
 
     @Nullable
@@ -510,7 +510,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                 Objects.requireNonNull(cVar);
                 int i2 = bundle2.getInt("android:menu:checked", 0);
                 if (i2 != 0) {
-                    cVar.f2307c = true;
+                    cVar.f2313c = true;
                     int size = cVar.a.size();
                     int i3 = 0;
                     while (true) {
@@ -524,7 +524,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
                         }
                         i3++;
                     }
-                    cVar.f2307c = false;
+                    cVar.f2313c = false;
                     cVar.a();
                 }
                 SparseArray sparseParcelableArray2 = bundle2.getSparseParcelableArray("android:menu:action_views");
@@ -617,7 +617,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
     }
 
     public void setId(int i2) {
-        this.f2306id = i2;
+        this.f2312id = i2;
     }
 
     public void setItemBackground(@Nullable Drawable drawable) {
@@ -675,7 +675,7 @@ public class NavigationMenuPresenter implements MenuPresenter {
     public void setUpdateSuspended(boolean z2) {
         c cVar = this.adapter;
         if (cVar != null) {
-            cVar.f2307c = z2;
+            cVar.f2313c = z2;
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/internal/ViewUtils.java b/app/src/main/java/com/google/android/material/internal/ViewUtils.java
index 8ea3dcc97c..585046c68c 100644
--- a/app/src/main/java/com/google/android/material/internal/ViewUtils.java
+++ b/app/src/main/java/com/google/android/material/internal/ViewUtils.java
@@ -67,13 +67,13 @@ public class ViewUtils {
         public final /* synthetic */ boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ boolean f2308c;
+        public final /* synthetic */ boolean f2314c;
         public final /* synthetic */ OnApplyWindowInsetsListener d;
 
         public b(boolean z2, boolean z3, boolean z4, OnApplyWindowInsetsListener onApplyWindowInsetsListener) {
             this.a = z2;
             this.b = z3;
-            this.f2308c = z4;
+            this.f2314c = z4;
             this.d = onApplyWindowInsetsListener;
         }
 
@@ -91,7 +91,7 @@ public class ViewUtils {
                     relativePadding.start = windowInsetsCompat.getSystemWindowInsetLeft() + relativePadding.start;
                 }
             }
-            if (this.f2308c) {
+            if (this.f2314c) {
                 if (isLayoutRtl) {
                     relativePadding.start = windowInsetsCompat.getSystemWindowInsetRight() + relativePadding.start;
                 } else {
diff --git a/app/src/main/java/com/google/android/material/progressindicator/IndeterminateDrawable.java b/app/src/main/java/com/google/android/material/progressindicator/IndeterminateDrawable.java
index b3bcf78ab4..46ca53680c 100644
--- a/app/src/main/java/com/google/android/material/progressindicator/IndeterminateDrawable.java
+++ b/app/src/main/java/com/google/android/material/progressindicator/IndeterminateDrawable.java
@@ -57,7 +57,7 @@ public final class IndeterminateDrawable<S extends BaseProgressIndicatorSpec> ex
             int i = 0;
             while (true) {
                 g<ObjectAnimator> gVar = this.animatorDelegate;
-                int[] iArr = gVar.f1248c;
+                int[] iArr = gVar.f1245c;
                 if (i < iArr.length) {
                     f<S> fVar2 = this.drawingDelegate;
                     Paint paint = this.paint;
diff --git a/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java b/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java
index 9bf48caee9..94f17876a2 100644
--- a/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java
+++ b/app/src/main/java/com/google/android/material/shape/MaterialShapeDrawable.java
@@ -118,7 +118,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public ColorFilter f2310c;
+        public ColorFilter f2316c;
         @Nullable
         public ColorStateList d = null;
         @Nullable
@@ -142,7 +142,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
         public int r = 0;
 
         /* renamed from: s  reason: collision with root package name */
-        public int f2311s = 0;
+        public int f2317s = 0;
         public int t = 0;
         public boolean u = false;
         public Paint.Style v = Paint.Style.FILL_AND_STROKE;
@@ -151,14 +151,14 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
             this.a = cVar.a;
             this.b = cVar.b;
             this.l = cVar.l;
-            this.f2310c = cVar.f2310c;
+            this.f2316c = cVar.f2316c;
             this.d = cVar.d;
             this.e = cVar.e;
             this.h = cVar.h;
             this.g = cVar.g;
             this.m = cVar.m;
             this.j = cVar.j;
-            this.f2311s = cVar.f2311s;
+            this.f2317s = cVar.f2317s;
             this.q = cVar.q;
             this.u = cVar.u;
             this.k = cVar.k;
@@ -322,7 +322,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
         if (this.containsIncompatibleShadowOp.cardinality() > 0) {
             Log.w(TAG, "Compatibility shadow requested but can't be drawn for all operations in this shape.");
         }
-        if (this.drawableState.f2311s != 0) {
+        if (this.drawableState.f2317s != 0) {
             canvas.drawPath(this.path, this.shadowRenderer.getShadowPaint());
         }
         for (int i = 0; i < 4; i++) {
@@ -464,7 +464,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
     private void updateZ() {
         float z2 = getZ();
         this.drawableState.r = (int) Math.ceil((double) (0.75f * z2));
-        this.drawableState.f2311s = (int) Math.ceil((double) (z2 * 0.25f));
+        this.drawableState.f2317s = (int) Math.ceil((double) (z2 * 0.25f));
         updateTintFilter();
         invalidateSelfIgnoreShape();
     }
@@ -612,12 +612,12 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
 
     public int getShadowOffsetX() {
         c cVar = this.drawableState;
-        return (int) (Math.sin(Math.toRadians((double) cVar.t)) * ((double) cVar.f2311s));
+        return (int) (Math.sin(Math.toRadians((double) cVar.t)) * ((double) cVar.f2317s));
     }
 
     public int getShadowOffsetY() {
         c cVar = this.drawableState;
-        return (int) (Math.cos(Math.toRadians((double) cVar.t)) * ((double) cVar.f2311s));
+        return (int) (Math.cos(Math.toRadians((double) cVar.t)) * ((double) cVar.f2317s));
     }
 
     public int getShadowRadius() {
@@ -626,7 +626,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
 
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
     public int getShadowVerticalOffset() {
-        return this.drawableState.f2311s;
+        return this.drawableState.f2317s;
     }
 
     @Override // com.google.android.material.shape.Shapeable
@@ -770,7 +770,7 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
 
     @Override // android.graphics.drawable.Drawable
     public void setColorFilter(@Nullable ColorFilter colorFilter) {
-        this.drawableState.f2310c = colorFilter;
+        this.drawableState.f2316c = colorFilter;
         invalidateSelfIgnoreShape();
     }
 
@@ -887,8 +887,8 @@ public class MaterialShapeDrawable extends Drawable implements TintAwareDrawable
     @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP})
     public void setShadowVerticalOffset(int i) {
         c cVar = this.drawableState;
-        if (cVar.f2311s != i) {
-            cVar.f2311s = i;
+        if (cVar.f2317s != i) {
+            cVar.f2317s = i;
             invalidateSelfIgnoreShape();
         }
     }
diff --git a/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java b/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java
index e6d65e8c07..a310a60eea 100644
--- a/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java
+++ b/app/src/main/java/com/google/android/material/shape/ShapeAppearancePathProvider.java
@@ -42,7 +42,7 @@ public class ShapeAppearancePathProvider {
         @NonNull
 
         /* renamed from: c  reason: collision with root package name */
-        public final RectF f2312c;
+        public final RectF f2318c;
         @Nullable
         public final PathListener d;
         public final float e;
@@ -51,7 +51,7 @@ public class ShapeAppearancePathProvider {
             this.d = pathListener;
             this.a = shapeAppearanceModel;
             this.e = f;
-            this.f2312c = rectF;
+            this.f2318c = rectF;
             this.b = path;
         }
     }
@@ -100,7 +100,7 @@ public class ShapeAppearancePathProvider {
         float f = fArr[0];
         float[] fArr2 = this.scratch2;
         float max = Math.max(((float) Math.hypot((double) (f - fArr2[0]), (double) (fArr[1] - fArr2[1]))) - 0.001f, 0.0f);
-        float edgeCenterForIndex = getEdgeCenterForIndex(bVar.f2312c, i);
+        float edgeCenterForIndex = getEdgeCenterForIndex(bVar.f2318c, i);
         this.shapePath.reset(0.0f, 0.0f);
         EdgeTreatment edgeTreatmentForIndex = getEdgeTreatmentForIndex(i, bVar.a);
         edgeTreatmentForIndex.getEdgePath(max, edgeCenterForIndex, bVar.e, this.shapePath);
@@ -181,10 +181,10 @@ public class ShapeAppearancePathProvider {
     }
 
     private void setCornerPathAndTransform(@NonNull b bVar, int i) {
-        getCornerTreatmentForIndex(i, bVar.a).getCornerPath(this.cornerPaths[i], 90.0f, bVar.e, bVar.f2312c, getCornerSizeForIndex(i, bVar.a));
+        getCornerTreatmentForIndex(i, bVar.a).getCornerPath(this.cornerPaths[i], 90.0f, bVar.e, bVar.f2318c, getCornerSizeForIndex(i, bVar.a));
         float angleOfEdge = angleOfEdge(i);
         this.cornerTransforms[i].reset();
-        getCoordinatesOfCorner(i, bVar.f2312c, this.pointF);
+        getCoordinatesOfCorner(i, bVar.f2318c, this.pointF);
         Matrix matrix = this.cornerTransforms[i];
         PointF pointF = this.pointF;
         matrix.setTranslate(pointF.x, pointF.y);
diff --git a/app/src/main/java/com/google/android/material/shape/ShapePath.java b/app/src/main/java/com/google/android/material/shape/ShapePath.java
index 01921267ab..73fc5f5b5f 100644
--- a/app/src/main/java/com/google/android/material/shape/ShapePath.java
+++ b/app/src/main/java/com/google/android/material/shape/ShapePath.java
@@ -220,26 +220,26 @@ public class ShapePath {
     public static class PathLineOperation extends PathOperation {
 
         /* renamed from: x  reason: collision with root package name */
-        private float f2313x;
+        private float f2319x;
 
         /* renamed from: y  reason: collision with root package name */
-        private float f2314y;
+        private float f2320y;
 
         public static /* synthetic */ float access$000(PathLineOperation pathLineOperation) {
-            return pathLineOperation.f2313x;
+            return pathLineOperation.f2319x;
         }
 
         public static /* synthetic */ float access$002(PathLineOperation pathLineOperation, float f) {
-            pathLineOperation.f2313x = f;
+            pathLineOperation.f2319x = f;
             return f;
         }
 
         public static /* synthetic */ float access$100(PathLineOperation pathLineOperation) {
-            return pathLineOperation.f2314y;
+            return pathLineOperation.f2320y;
         }
 
         public static /* synthetic */ float access$102(PathLineOperation pathLineOperation, float f) {
-            pathLineOperation.f2314y = f;
+            pathLineOperation.f2320y = f;
             return f;
         }
 
@@ -248,7 +248,7 @@ public class ShapePath {
             Matrix matrix2 = this.matrix;
             matrix.invert(matrix2);
             path.transform(matrix2);
-            path.lineTo(this.f2313x, this.f2314y);
+            path.lineTo(this.f2319x, this.f2320y);
             path.transform(matrix);
         }
     }
@@ -331,17 +331,17 @@ public class ShapePath {
         public final /* synthetic */ List b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ Matrix f2315c;
+        public final /* synthetic */ Matrix f2321c;
 
         public a(ShapePath shapePath, List list, Matrix matrix) {
             this.b = list;
-            this.f2315c = matrix;
+            this.f2321c = matrix;
         }
 
         @Override // com.google.android.material.shape.ShapePath.d
         public void a(Matrix matrix, ShadowRenderer shadowRenderer, int i, Canvas canvas) {
             for (d dVar : this.b) {
-                dVar.a(this.f2315c, shadowRenderer, i, canvas);
+                dVar.a(this.f2321c, shadowRenderer, i, canvas);
             }
         }
     }
@@ -363,26 +363,26 @@ public class ShapePath {
         public final PathLineOperation b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final float f2316c;
+        public final float f2322c;
         public final float d;
 
         public c(PathLineOperation pathLineOperation, float f, float f2) {
             this.b = pathLineOperation;
-            this.f2316c = f;
+            this.f2322c = f;
             this.d = f2;
         }
 
         @Override // com.google.android.material.shape.ShapePath.d
         public void a(Matrix matrix, @NonNull ShadowRenderer shadowRenderer, int i, @NonNull Canvas canvas) {
-            RectF rectF = new RectF(0.0f, 0.0f, (float) Math.hypot((double) (PathLineOperation.access$100(this.b) - this.d), (double) (PathLineOperation.access$000(this.b) - this.f2316c)), 0.0f);
+            RectF rectF = new RectF(0.0f, 0.0f, (float) Math.hypot((double) (PathLineOperation.access$100(this.b) - this.d), (double) (PathLineOperation.access$000(this.b) - this.f2322c)), 0.0f);
             Matrix matrix2 = new Matrix(matrix);
-            matrix2.preTranslate(this.f2316c, this.d);
+            matrix2.preTranslate(this.f2322c, this.d);
             matrix2.preRotate(b());
             shadowRenderer.drawEdgeShadow(canvas, matrix2, rectF, i);
         }
 
         public float b() {
-            return (float) Math.toDegrees(Math.atan((double) ((PathLineOperation.access$100(this.b) - this.d) / (PathLineOperation.access$000(this.b) - this.f2316c))));
+            return (float) Math.toDegrees(Math.atan((double) ((PathLineOperation.access$100(this.b) - this.d) / (PathLineOperation.access$000(this.b) - this.f2322c))));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java b/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
index 64a910611b..c3e3517b87 100644
--- a/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
+++ b/app/src/main/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
@@ -1165,7 +1165,7 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
             if (b2.c(bVar)) {
                 a.c cVar = b2.d;
                 cVar.b = duration;
-                b2.f1250c.removeCallbacksAndMessages(cVar);
+                b2.f1247c.removeCallbacksAndMessages(cVar);
                 b2.g(b2.d);
                 return;
             }
diff --git a/app/src/main/java/com/google/android/material/tabs/TabLayout.java b/app/src/main/java/com/google/android/material/tabs/TabLayout.java
index c569ff98ad..b928ed9412 100644
--- a/app/src/main/java/com/google/android/material/tabs/TabLayout.java
+++ b/app/src/main/java/com/google/android/material/tabs/TabLayout.java
@@ -181,7 +181,7 @@ public class TabLayout extends HorizontalScrollView {
         private Drawable icon;
 
         /* renamed from: id  reason: collision with root package name */
-        private int f2319id = -1;
+        private int f2325id = -1;
         @LabelVisibility
         private int labelVisibilityMode = 1;
         @Nullable
@@ -195,7 +195,7 @@ public class TabLayout extends HorizontalScrollView {
         public TabView view;
 
         public static /* synthetic */ int access$000(Tab tab) {
-            return tab.f2319id;
+            return tab.f2325id;
         }
 
         public static /* synthetic */ int access$1100(Tab tab) {
@@ -235,7 +235,7 @@ public class TabLayout extends HorizontalScrollView {
         }
 
         public int getId() {
-            return this.f2319id;
+            return this.f2325id;
         }
 
         @NonNull
@@ -279,7 +279,7 @@ public class TabLayout extends HorizontalScrollView {
             this.view = null;
             this.tag = null;
             this.icon = null;
-            this.f2319id = -1;
+            this.f2325id = -1;
             this.text = null;
             this.contentDesc = null;
             this.position = -1;
@@ -348,7 +348,7 @@ public class TabLayout extends HorizontalScrollView {
 
         @NonNull
         public Tab setId(int i) {
-            this.f2319id = i;
+            this.f2325id = i;
             TabView tabView = this.view;
             if (tabView != null) {
                 tabView.setId(i);
diff --git a/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java b/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java
index 33b2b200a3..39abfbb92f 100644
--- a/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java
+++ b/app/src/main/java/com/google/android/material/tabs/TabLayoutMediator.java
@@ -69,7 +69,7 @@ public final class TabLayoutMediator {
         public int b = 0;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2321c = 0;
+        public int f2327c = 0;
 
         public b(TabLayout tabLayout) {
             this.a = new WeakReference<>(tabLayout);
@@ -77,15 +77,15 @@ public final class TabLayoutMediator {
 
         @Override // androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
         public void onPageScrollStateChanged(int i) {
-            this.b = this.f2321c;
-            this.f2321c = i;
+            this.b = this.f2327c;
+            this.f2327c = i;
         }
 
         @Override // androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
         public void onPageScrolled(int i, float f, int i2) {
             TabLayout tabLayout = this.a.get();
             if (tabLayout != null) {
-                int i3 = this.f2321c;
+                int i3 = this.f2327c;
                 boolean z2 = false;
                 boolean z3 = i3 != 2 || this.b == 1;
                 if (!(i3 == 2 && this.b == 0)) {
@@ -99,7 +99,7 @@ public final class TabLayoutMediator {
         public void onPageSelected(int i) {
             TabLayout tabLayout = this.a.get();
             if (tabLayout != null && tabLayout.getSelectedTabPosition() != i && i < tabLayout.getTabCount()) {
-                int i2 = this.f2321c;
+                int i2 = this.f2327c;
                 tabLayout.selectTab(tabLayout.getTabAt(i), i2 == 0 || (i2 == 2 && this.b == 0));
             }
         }
diff --git a/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java b/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java
index ae4c373e08..1ac1dab867 100644
--- a/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java
+++ b/app/src/main/java/com/google/android/material/textfield/TextInputLayout.java
@@ -2489,8 +2489,8 @@ public class TextInputLayout extends LinearLayout {
                 }
                 nVar.r.setVisibility(4);
                 ViewCompat.setAccessibilityLiveRegion(nVar.r, 1);
-                int i = nVar.f1254s;
-                nVar.f1254s = i;
+                int i = nVar.f1251s;
+                nVar.f1251s = i;
                 TextView textView = nVar.r;
                 if (textView != null) {
                     TextViewCompat.setTextAppearance(textView, i);
@@ -2520,7 +2520,7 @@ public class TextInputLayout extends LinearLayout {
 
     public void setHelperTextTextAppearance(@StyleRes int i) {
         n nVar = this.indicatorViewController;
-        nVar.f1254s = i;
+        nVar.f1251s = i;
         TextView textView = nVar.r;
         if (textView != null) {
             TextViewCompat.setTextAppearance(textView, i);
diff --git a/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java b/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java
index 0b0aad737e..eb9094ee81 100644
--- a/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java
+++ b/app/src/main/java/com/google/android/material/timepicker/ClockFaceView.java
@@ -38,7 +38,7 @@ public class ClockFaceView extends e implements ClockHandView.OnRotateListener {
     public final float[] r = {0.0f, 0.9f, 1.0f};
 
     /* renamed from: s  reason: collision with root package name */
-    public final int f2322s;
+    public final int f2328s;
     public String[] t;
     public float u;
     public final ColorStateList v;
@@ -54,7 +54,7 @@ public class ClockFaceView extends e implements ClockHandView.OnRotateListener {
         LayoutInflater.from(context).inflate(R.layout.material_clockface_view, (ViewGroup) this, true);
         ClockHandView clockHandView = (ClockHandView) findViewById(R.id.material_clock_hand);
         this.l = clockHandView;
-        this.f2322s = resources.getDimensionPixelSize(R.dimen.material_clock_hand_padding);
+        this.f2328s = resources.getDimensionPixelSize(R.dimen.material_clock_hand_padding);
         int colorForState = colorStateList.getColorForState(new int[]{16842913}, colorStateList.getDefaultColor());
         this.q = new int[]{colorForState, colorForState, colorStateList.getDefaultColor()};
         clockHandView.p.add(this);
diff --git a/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java b/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java
index 77326696ba..77b8e01b81 100644
--- a/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java
+++ b/app/src/main/java/com/google/android/material/timepicker/ClockHandView.java
@@ -35,7 +35,7 @@ public class ClockHandView extends View {
     public final float r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final Paint f2323s;
+    public final Paint f2329s;
     public final RectF t;
     @Px
     public final int u;
@@ -43,13 +43,13 @@ public class ClockHandView extends View {
     public boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public OnActionUpListener f2324x;
+    public OnActionUpListener f2330x;
 
     /* renamed from: y  reason: collision with root package name */
-    public double f2325y;
+    public double f2331y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2326z;
+    public int f2332z;
 
     public interface OnActionUpListener {
         void onActionUp(@FloatRange(from = 0.0d, to = 360.0d) float f, boolean z2);
@@ -87,10 +87,10 @@ public class ClockHandView extends View {
         super(context, attributeSet, r0);
         int i2 = R.attr.materialClockStyle;
         Paint paint = new Paint();
-        this.f2323s = paint;
+        this.f2329s = paint;
         this.t = new RectF();
         TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, R.styleable.ClockHandView, i2, R.style.Widget_MaterialComponents_TimePicker_Clock);
-        this.f2326z = obtainStyledAttributes.getDimensionPixelSize(R.styleable.ClockHandView_materialCircleRadius, 0);
+        this.f2332z = obtainStyledAttributes.getDimensionPixelSize(R.styleable.ClockHandView_materialCircleRadius, 0);
         this.q = obtainStyledAttributes.getDimensionPixelSize(R.styleable.ClockHandView_selectorSize, 0);
         Resources resources = getResources();
         this.u = resources.getDimensionPixelSize(R.dimen.material_clock_hand_stroke_width);
@@ -139,9 +139,9 @@ public class ClockHandView extends View {
     public final void c(@FloatRange(from = 0.0d, to = 360.0d) float f, boolean z2) {
         float f2 = f % 360.0f;
         this.v = f2;
-        this.f2325y = Math.toRadians((double) (f2 - 90.0f));
-        float cos = (((float) this.f2326z) * ((float) Math.cos(this.f2325y))) + ((float) (getWidth() / 2));
-        float sin = (((float) this.f2326z) * ((float) Math.sin(this.f2325y))) + ((float) (getHeight() / 2));
+        this.f2331y = Math.toRadians((double) (f2 - 90.0f));
+        float cos = (((float) this.f2332z) * ((float) Math.cos(this.f2331y))) + ((float) (getWidth() / 2));
+        float sin = (((float) this.f2332z) * ((float) Math.sin(this.f2331y))) + ((float) (getHeight() / 2));
         RectF rectF = this.t;
         int i2 = this.q;
         rectF.set(cos - ((float) i2), sin - ((float) i2), cos + ((float) i2), sin + ((float) i2));
@@ -158,14 +158,14 @@ public class ClockHandView extends View {
         int width = getWidth() / 2;
         float f = (float) width;
         float f2 = (float) height;
-        this.f2323s.setStrokeWidth(0.0f);
-        canvas.drawCircle((((float) this.f2326z) * ((float) Math.cos(this.f2325y))) + f, (((float) this.f2326z) * ((float) Math.sin(this.f2325y))) + f2, (float) this.q, this.f2323s);
-        double sin = Math.sin(this.f2325y);
-        double cos = Math.cos(this.f2325y);
-        double d = (double) ((float) (this.f2326z - this.q));
-        this.f2323s.setStrokeWidth((float) this.u);
-        canvas.drawLine(f, f2, (float) (width + ((int) (cos * d))), (float) (height + ((int) (d * sin))), this.f2323s);
-        canvas.drawCircle(f, f2, this.r, this.f2323s);
+        this.f2329s.setStrokeWidth(0.0f);
+        canvas.drawCircle((((float) this.f2332z) * ((float) Math.cos(this.f2331y))) + f, (((float) this.f2332z) * ((float) Math.sin(this.f2331y))) + f2, (float) this.q, this.f2329s);
+        double sin = Math.sin(this.f2331y);
+        double cos = Math.cos(this.f2331y);
+        double d = (double) ((float) (this.f2332z - this.q));
+        this.f2329s.setStrokeWidth((float) this.u);
+        canvas.drawLine(f, f2, (float) (width + ((int) (cos * d))), (float) (height + ((int) (d * sin))), this.f2329s);
+        canvas.drawCircle(f, f2, this.r, this.f2329s);
     }
 
     @Override // android.view.View
@@ -218,7 +218,7 @@ public class ClockHandView extends View {
             }
             boolean z8 = z5 | z6;
             this.w = z8;
-            if (z8 && z4 && (onActionUpListener = this.f2324x) != null) {
+            if (z8 && z4 && (onActionUpListener = this.f2330x) != null) {
                 onActionUpListener.onActionUp((float) a(x2, y2), this.n);
             }
             return true;
diff --git a/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java b/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
index 63b6790784..6f8a8c516e 100644
--- a/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
+++ b/app/src/main/java/com/google/android/material/transformation/FabTransformationBehavior.java
@@ -59,20 +59,20 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation
         public final /* synthetic */ View b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ View f2327c;
+        public final /* synthetic */ View f2333c;
 
         public a(FabTransformationBehavior fabTransformationBehavior, boolean z2, View view, View view2) {
             this.a = z2;
             this.b = view;
-            this.f2327c = view2;
+            this.f2333c = view2;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
             if (!this.a) {
                 this.b.setVisibility(4);
-                this.f2327c.setAlpha(1.0f);
-                this.f2327c.setVisibility(0);
+                this.f2333c.setAlpha(1.0f);
+                this.f2333c.setVisibility(0);
             }
         }
 
@@ -80,8 +80,8 @@ public abstract class FabTransformationBehavior extends ExpandableTransformation
         public void onAnimationStart(Animator animator) {
             if (this.a) {
                 this.b.setVisibility(0);
-                this.f2327c.setAlpha(0.0f);
-                this.f2327c.setVisibility(4);
+                this.f2333c.setAlpha(0.0f);
+                this.f2333c.setVisibility(4);
             }
         }
     }
diff --git a/app/src/main/java/com/google/android/material/transition/FadeProvider.java b/app/src/main/java/com/google/android/material/transition/FadeProvider.java
index 7635339959..de0ade5945 100644
--- a/app/src/main/java/com/google/android/material/transition/FadeProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/FadeProvider.java
@@ -17,21 +17,21 @@ public final class FadeProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2328c;
+        public final /* synthetic */ float f2334c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2328c = f2;
+            this.f2334c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2328c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2334c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java b/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java
index 9ca53b50ae..dcf3f6625c 100644
--- a/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/FadeThroughProvider.java
@@ -17,21 +17,21 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2329c;
+        public final /* synthetic */ float f2335c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2329c = f2;
+            this.f2335c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2329c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2335c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java b/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
index 33db568890..a5952303dc 100644
--- a/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
+++ b/app/src/main/java/com/google/android/material/transition/MaterialContainerTransform.java
@@ -178,13 +178,13 @@ public final class MaterialContainerTransform extends Transition {
         public final /* synthetic */ d b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ View f2330c;
+        public final /* synthetic */ View f2336c;
         public final /* synthetic */ View d;
 
         public b(View view, d dVar, View view2, View view3) {
             this.a = view;
             this.b = dVar;
-            this.f2330c = view2;
+            this.f2336c = view2;
             this.d = view3;
         }
 
@@ -192,7 +192,7 @@ public final class MaterialContainerTransform extends Transition {
         public void onTransitionEnd(@NonNull Transition transition) {
             MaterialContainerTransform.this.removeListener(this);
             if (!MaterialContainerTransform.access$300(MaterialContainerTransform.this)) {
-                this.f2330c.setAlpha(1.0f);
+                this.f2336c.setAlpha(1.0f);
                 this.d.setAlpha(1.0f);
                 ViewUtils.getOverlay(this.a).remove(this.b);
             }
@@ -201,7 +201,7 @@ public final class MaterialContainerTransform extends Transition {
         @Override // androidx.transition.Transition.TransitionListener
         public void onTransitionStart(@NonNull Transition transition) {
             ViewUtils.getOverlay(this.a).add(this.b);
-            this.f2330c.setAlpha(0.0f);
+            this.f2336c.setAlpha(0.0f);
             this.d.setAlpha(0.0f);
         }
     }
@@ -214,14 +214,14 @@ public final class MaterialContainerTransform extends Transition {
         @NonNull
 
         /* renamed from: c  reason: collision with root package name */
-        public final ProgressThresholds f2331c;
+        public final ProgressThresholds f2337c;
         @NonNull
         public final ProgressThresholds d;
 
         public c(ProgressThresholds progressThresholds, ProgressThresholds progressThresholds2, ProgressThresholds progressThresholds3, ProgressThresholds progressThresholds4, a aVar) {
             this.a = progressThresholds;
             this.b = progressThresholds2;
-            this.f2331c = progressThresholds3;
+            this.f2337c = progressThresholds3;
             this.d = progressThresholds4;
         }
     }
@@ -243,7 +243,7 @@ public final class MaterialContainerTransform extends Transition {
         public final RectF b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ShapeAppearanceModel f2332c;
+        public final ShapeAppearanceModel f2338c;
         public final float d;
         public final View e;
         public final RectF f;
@@ -261,20 +261,20 @@ public final class MaterialContainerTransform extends Transition {
         public final boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public final float f2333s;
+        public final float f2339s;
         public final float t;
         public final boolean u;
         public final MaterialShapeDrawable v;
         public final RectF w;
 
         /* renamed from: x  reason: collision with root package name */
-        public final RectF f2334x;
+        public final RectF f2340x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final RectF f2335y;
+        public final RectF f2341y;
 
         /* renamed from: z  reason: collision with root package name */
-        public final RectF f2336z;
+        public final RectF f2342z;
 
         public class a implements k.a {
             public a() {
@@ -315,7 +315,7 @@ public final class MaterialContainerTransform extends Transition {
             this.F = new Path();
             this.a = view;
             this.b = rectF;
-            this.f2332c = shapeAppearanceModel;
+            this.f2338c = shapeAppearanceModel;
             this.d = f;
             this.e = view2;
             this.f = rectF2;
@@ -329,7 +329,7 @@ public final class MaterialContainerTransform extends Transition {
             this.D = z4;
             DisplayMetrics displayMetrics = new DisplayMetrics();
             ((WindowManager) view.getContext().getSystemService("window")).getDefaultDisplay().getMetrics(displayMetrics);
-            this.f2333s = (float) displayMetrics.widthPixels;
+            this.f2339s = (float) displayMetrics.widthPixels;
             this.t = (float) displayMetrics.heightPixels;
             paint.setColor(i);
             paint2.setColor(i2);
@@ -340,10 +340,10 @@ public final class MaterialContainerTransform extends Transition {
             materialShapeDrawable.setShadowColor(-7829368);
             RectF rectF3 = new RectF(rectF);
             this.w = rectF3;
-            this.f2334x = new RectF(rectF3);
+            this.f2340x = new RectF(rectF3);
             RectF rectF4 = new RectF(rectF3);
-            this.f2335y = rectF4;
-            this.f2336z = new RectF(rectF4);
+            this.f2341y = rectF4;
+            this.f2342z = new RectF(rectF4);
             PointF c2 = c(rectF);
             PointF c3 = c(rectF2);
             PathMeasure pathMeasure = new PathMeasure(pathMotion.getPath(c2.x, c2.y, c3.x, c3.y), false);
@@ -366,7 +366,7 @@ public final class MaterialContainerTransform extends Transition {
         public final void a(Canvas canvas) {
             d(canvas, this.k);
             Rect bounds = getBounds();
-            RectF rectF = this.f2335y;
+            RectF rectF = this.f2341y;
             k.h(canvas, bounds, rectF.left, rectF.top, this.H.b, this.G.b, new b());
         }
 
@@ -416,10 +416,10 @@ public final class MaterialContainerTransform extends Transition {
                 canvas.clipPath(gVar.a);
             } else {
                 canvas.clipPath(gVar.b);
-                canvas.clipPath(gVar.f1259c, Region.Op.UNION);
+                canvas.clipPath(gVar.f1256c, Region.Op.UNION);
             }
             d(canvas, this.i);
-            if (this.G.f1257c) {
+            if (this.G.f1254c) {
                 b(canvas);
                 a(canvas);
             } else {
@@ -439,16 +439,16 @@ public final class MaterialContainerTransform extends Transition {
                     this.E.setColor(-65281);
                     canvas.drawPath(path, this.E);
                 }
-                RectF rectF3 = this.f2334x;
+                RectF rectF3 = this.f2340x;
                 this.E.setColor(-256);
                 canvas.drawRect(rectF3, this.E);
                 RectF rectF4 = this.w;
                 this.E.setColor(-16711936);
                 canvas.drawRect(rectF4, this.E);
-                RectF rectF5 = this.f2336z;
+                RectF rectF5 = this.f2342z;
                 this.E.setColor(-16711681);
                 canvas.drawRect(rectF5, this.E);
-                RectF rectF6 = this.f2335y;
+                RectF rectF6 = this.f2341y;
                 this.E.setColor(-16776961);
                 canvas.drawRect(rectF6, this.E);
             }
@@ -483,30 +483,30 @@ public final class MaterialContainerTransform extends Transition {
             f a2 = this.C.a(f, ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.b)))).floatValue(), ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.b)))).floatValue(), this.b.width(), this.b.height(), this.f.width(), this.f.height());
             this.H = a2;
             RectF rectF = this.w;
-            float f8 = a2.f1258c / 2.0f;
+            float f8 = a2.f1255c / 2.0f;
             rectF.set(f4 - f8, f5, f8 + f4, a2.d + f5);
-            RectF rectF2 = this.f2335y;
+            RectF rectF2 = this.f2341y;
             f fVar = this.H;
             float f9 = fVar.e / 2.0f;
             rectF2.set(f4 - f9, f5, f9 + f4, fVar.f + f5);
-            this.f2334x.set(this.w);
-            this.f2336z.set(this.f2335y);
-            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2331c)))).floatValue();
-            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2331c)))).floatValue();
+            this.f2340x.set(this.w);
+            this.f2342z.set(this.f2341y);
+            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2337c)))).floatValue();
+            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2337c)))).floatValue();
             boolean b2 = this.C.b(this.H);
-            RectF rectF3 = b2 ? this.f2334x : this.f2336z;
+            RectF rectF3 = b2 ? this.f2340x : this.f2342z;
             float e = k.e(0.0f, 1.0f, floatValue, floatValue2, f);
             if (!b2) {
                 e = 1.0f - e;
             }
             this.C.c(rectF3, e, this.H);
-            this.I = new RectF(Math.min(this.f2334x.left, this.f2336z.left), Math.min(this.f2334x.top, this.f2336z.top), Math.max(this.f2334x.right, this.f2336z.right), Math.max(this.f2334x.bottom, this.f2336z.bottom));
+            this.I = new RectF(Math.min(this.f2340x.left, this.f2342z.left), Math.min(this.f2340x.top, this.f2342z.top), Math.max(this.f2340x.right, this.f2342z.right), Math.max(this.f2340x.bottom, this.f2342z.bottom));
             g gVar = this.n;
-            ShapeAppearanceModel shapeAppearanceModel = this.f2332c;
+            ShapeAppearanceModel shapeAppearanceModel = this.f2338c;
             ShapeAppearanceModel shapeAppearanceModel2 = this.g;
             RectF rectF4 = this.w;
-            RectF rectF5 = this.f2334x;
-            RectF rectF6 = this.f2336z;
+            RectF rectF5 = this.f2340x;
+            RectF rectF6 = this.f2342z;
             ProgressThresholds progressThresholds = this.A.d;
             Objects.requireNonNull(gVar);
             float start = progressThresholds.getStart();
@@ -524,13 +524,13 @@ public final class MaterialContainerTransform extends Transition {
             }
             gVar.e = shapeAppearanceModel;
             gVar.d.calculatePath(shapeAppearanceModel, 1.0f, rectF5, gVar.b);
-            gVar.d.calculatePath(gVar.e, 1.0f, rectF6, gVar.f1259c);
+            gVar.d.calculatePath(gVar.e, 1.0f, rectF6, gVar.f1256c);
             if (Build.VERSION.SDK_INT >= 23) {
-                gVar.a.op(gVar.b, gVar.f1259c, Path.Op.UNION);
+                gVar.a.op(gVar.b, gVar.f1256c, Path.Op.UNION);
             }
             this.J = k.d(this.d, this.h, f);
             RectF rectF8 = this.I;
-            float f10 = this.f2333s;
+            float f10 = this.f2339s;
             RectF rectF9 = this.I;
             float f11 = this.t;
             float f12 = this.J;
@@ -649,7 +649,7 @@ public final class MaterialContainerTransform extends Transition {
         if (!z2) {
             cVar = cVar2;
         }
-        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2331c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
+        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2337c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
     }
 
     @StyleRes
@@ -736,7 +736,7 @@ public final class MaterialContainerTransform extends Transition {
                 } else if (i5 == 1) {
                     aVar = isEntering ? c.i.a.g.l.b.b : c.i.a.g.l.b.a;
                 } else if (i5 == 2) {
-                    aVar = c.i.a.g.l.b.f1256c;
+                    aVar = c.i.a.g.l.b.f1253c;
                 } else if (i5 == 3) {
                     aVar = c.i.a.g.l.b.d;
                 } else {
diff --git a/app/src/main/java/com/google/android/material/transition/ScaleProvider.java b/app/src/main/java/com/google/android/material/transition/ScaleProvider.java
index da12efff92..b2ed9d8311 100644
--- a/app/src/main/java/com/google/android/material/transition/ScaleProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/ScaleProvider.java
@@ -21,18 +21,18 @@ public final class ScaleProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2337c;
+        public final /* synthetic */ float f2343c;
 
         public a(View view, float f, float f2) {
             this.a = view;
             this.b = f;
-            this.f2337c = f2;
+            this.f2343c = f2;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
             this.a.setScaleX(this.b);
-            this.a.setScaleY(this.f2337c);
+            this.a.setScaleY(this.f2343c);
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java b/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java
index 319386197d..59c972115c 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/FadeProvider.java
@@ -19,21 +19,21 @@ public final class FadeProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2338c;
+        public final /* synthetic */ float f2344c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2338c = f2;
+            this.f2344c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2338c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2344c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java b/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java
index 54ff470440..4aa99e30fb 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/FadeThroughProvider.java
@@ -19,21 +19,21 @@ public final class FadeThroughProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2339c;
+        public final /* synthetic */ float f2345c;
         public final /* synthetic */ float d;
         public final /* synthetic */ float e;
 
         public a(View view, float f, float f2, float f3, float f4) {
             this.a = view;
             this.b = f;
-            this.f2339c = f2;
+            this.f2345c = f2;
             this.d = f3;
             this.e = f4;
         }
 
         @Override // android.animation.ValueAnimator.AnimatorUpdateListener
         public void onAnimationUpdate(ValueAnimator valueAnimator) {
-            this.a.setAlpha(k.e(this.b, this.f2339c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
+            this.a.setAlpha(k.e(this.b, this.f2345c, this.d, this.e, ((Float) valueAnimator.getAnimatedValue()).floatValue()));
         }
     }
 
diff --git a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
index 68e7138803..2f85f5b0e5 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
@@ -180,13 +180,13 @@ public final class MaterialContainerTransform extends Transition {
         public final /* synthetic */ d b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ View f2340c;
+        public final /* synthetic */ View f2346c;
         public final /* synthetic */ View d;
 
         public b(View view, d dVar, View view2, View view3) {
             this.a = view;
             this.b = dVar;
-            this.f2340c = view2;
+            this.f2346c = view2;
             this.d = view3;
         }
 
@@ -194,7 +194,7 @@ public final class MaterialContainerTransform extends Transition {
         public void onTransitionEnd(@NonNull Transition transition) {
             MaterialContainerTransform.this.removeListener(this);
             if (!MaterialContainerTransform.access$300(MaterialContainerTransform.this)) {
-                this.f2340c.setAlpha(1.0f);
+                this.f2346c.setAlpha(1.0f);
                 this.d.setAlpha(1.0f);
                 ViewUtils.getOverlay(this.a).remove(this.b);
             }
@@ -203,7 +203,7 @@ public final class MaterialContainerTransform extends Transition {
         @Override // c.i.a.g.l.l.i, android.transition.Transition.TransitionListener
         public void onTransitionStart(@NonNull Transition transition) {
             ViewUtils.getOverlay(this.a).add(this.b);
-            this.f2340c.setAlpha(0.0f);
+            this.f2346c.setAlpha(0.0f);
             this.d.setAlpha(0.0f);
         }
     }
@@ -216,14 +216,14 @@ public final class MaterialContainerTransform extends Transition {
         @NonNull
 
         /* renamed from: c  reason: collision with root package name */
-        public final ProgressThresholds f2341c;
+        public final ProgressThresholds f2347c;
         @NonNull
         public final ProgressThresholds d;
 
         public c(ProgressThresholds progressThresholds, ProgressThresholds progressThresholds2, ProgressThresholds progressThresholds3, ProgressThresholds progressThresholds4, a aVar) {
             this.a = progressThresholds;
             this.b = progressThresholds2;
-            this.f2341c = progressThresholds3;
+            this.f2347c = progressThresholds3;
             this.d = progressThresholds4;
         }
     }
@@ -245,7 +245,7 @@ public final class MaterialContainerTransform extends Transition {
         public final RectF b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ShapeAppearanceModel f2342c;
+        public final ShapeAppearanceModel f2348c;
         public final float d;
         public final View e;
         public final RectF f;
@@ -263,20 +263,20 @@ public final class MaterialContainerTransform extends Transition {
         public final boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public final float f2343s;
+        public final float f2349s;
         public final float t;
         public final boolean u;
         public final MaterialShapeDrawable v;
         public final RectF w;
 
         /* renamed from: x  reason: collision with root package name */
-        public final RectF f2344x;
+        public final RectF f2350x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final RectF f2345y;
+        public final RectF f2351y;
 
         /* renamed from: z  reason: collision with root package name */
-        public final RectF f2346z;
+        public final RectF f2352z;
 
         public class a implements k.a {
             public a() {
@@ -317,7 +317,7 @@ public final class MaterialContainerTransform extends Transition {
             this.F = new Path();
             this.a = view;
             this.b = rectF;
-            this.f2342c = shapeAppearanceModel;
+            this.f2348c = shapeAppearanceModel;
             this.d = f;
             this.e = view2;
             this.f = rectF2;
@@ -331,7 +331,7 @@ public final class MaterialContainerTransform extends Transition {
             this.D = z4;
             DisplayMetrics displayMetrics = new DisplayMetrics();
             ((WindowManager) view.getContext().getSystemService("window")).getDefaultDisplay().getMetrics(displayMetrics);
-            this.f2343s = (float) displayMetrics.widthPixels;
+            this.f2349s = (float) displayMetrics.widthPixels;
             this.t = (float) displayMetrics.heightPixels;
             paint.setColor(i);
             paint2.setColor(i2);
@@ -342,10 +342,10 @@ public final class MaterialContainerTransform extends Transition {
             materialShapeDrawable.setShadowColor(-7829368);
             RectF rectF3 = new RectF(rectF);
             this.w = rectF3;
-            this.f2344x = new RectF(rectF3);
+            this.f2350x = new RectF(rectF3);
             RectF rectF4 = new RectF(rectF3);
-            this.f2345y = rectF4;
-            this.f2346z = new RectF(rectF4);
+            this.f2351y = rectF4;
+            this.f2352z = new RectF(rectF4);
             PointF c2 = c(rectF);
             PointF c3 = c(rectF2);
             PathMeasure pathMeasure = new PathMeasure(pathMotion.getPath(c2.x, c2.y, c3.x, c3.y), false);
@@ -368,7 +368,7 @@ public final class MaterialContainerTransform extends Transition {
         public final void a(Canvas canvas) {
             d(canvas, this.k);
             Rect bounds = getBounds();
-            RectF rectF = this.f2345y;
+            RectF rectF = this.f2351y;
             k.h(canvas, bounds, rectF.left, rectF.top, this.H.b, this.G.b, new b());
         }
 
@@ -418,10 +418,10 @@ public final class MaterialContainerTransform extends Transition {
                 canvas.clipPath(gVar.a);
             } else {
                 canvas.clipPath(gVar.b);
-                canvas.clipPath(gVar.f1263c, Region.Op.UNION);
+                canvas.clipPath(gVar.f1260c, Region.Op.UNION);
             }
             d(canvas, this.i);
-            if (this.G.f1261c) {
+            if (this.G.f1258c) {
                 b(canvas);
                 a(canvas);
             } else {
@@ -441,16 +441,16 @@ public final class MaterialContainerTransform extends Transition {
                     this.E.setColor(-65281);
                     canvas.drawPath(path, this.E);
                 }
-                RectF rectF3 = this.f2344x;
+                RectF rectF3 = this.f2350x;
                 this.E.setColor(-256);
                 canvas.drawRect(rectF3, this.E);
                 RectF rectF4 = this.w;
                 this.E.setColor(-16711936);
                 canvas.drawRect(rectF4, this.E);
-                RectF rectF5 = this.f2346z;
+                RectF rectF5 = this.f2352z;
                 this.E.setColor(-16711681);
                 canvas.drawRect(rectF5, this.E);
-                RectF rectF6 = this.f2345y;
+                RectF rectF6 = this.f2351y;
                 this.E.setColor(-16776961);
                 canvas.drawRect(rectF6, this.E);
             }
@@ -485,30 +485,30 @@ public final class MaterialContainerTransform extends Transition {
             f a2 = this.C.a(f, ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.b)))).floatValue(), ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.b)))).floatValue(), this.b.width(), this.b.height(), this.f.width(), this.f.height());
             this.H = a2;
             RectF rectF = this.w;
-            float f8 = a2.f1262c / 2.0f;
+            float f8 = a2.f1259c / 2.0f;
             rectF.set(f4 - f8, f5, f8 + f4, a2.d + f5);
-            RectF rectF2 = this.f2345y;
+            RectF rectF2 = this.f2351y;
             f fVar = this.H;
             float f9 = fVar.e / 2.0f;
             rectF2.set(f4 - f9, f5, f9 + f4, fVar.f + f5);
-            this.f2344x.set(this.w);
-            this.f2346z.set(this.f2345y);
-            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2341c)))).floatValue();
-            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2341c)))).floatValue();
+            this.f2350x.set(this.w);
+            this.f2352z.set(this.f2351y);
+            float floatValue = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1000(this.A.f2347c)))).floatValue();
+            float floatValue2 = ((Float) Preconditions.checkNotNull(Float.valueOf(ProgressThresholds.access$1100(this.A.f2347c)))).floatValue();
             boolean b2 = this.C.b(this.H);
-            RectF rectF3 = b2 ? this.f2344x : this.f2346z;
+            RectF rectF3 = b2 ? this.f2350x : this.f2352z;
             float e = k.e(0.0f, 1.0f, floatValue, floatValue2, f);
             if (!b2) {
                 e = 1.0f - e;
             }
             this.C.c(rectF3, e, this.H);
-            this.I = new RectF(Math.min(this.f2344x.left, this.f2346z.left), Math.min(this.f2344x.top, this.f2346z.top), Math.max(this.f2344x.right, this.f2346z.right), Math.max(this.f2344x.bottom, this.f2346z.bottom));
+            this.I = new RectF(Math.min(this.f2350x.left, this.f2352z.left), Math.min(this.f2350x.top, this.f2352z.top), Math.max(this.f2350x.right, this.f2352z.right), Math.max(this.f2350x.bottom, this.f2352z.bottom));
             g gVar = this.n;
-            ShapeAppearanceModel shapeAppearanceModel = this.f2342c;
+            ShapeAppearanceModel shapeAppearanceModel = this.f2348c;
             ShapeAppearanceModel shapeAppearanceModel2 = this.g;
             RectF rectF4 = this.w;
-            RectF rectF5 = this.f2344x;
-            RectF rectF6 = this.f2346z;
+            RectF rectF5 = this.f2350x;
+            RectF rectF6 = this.f2352z;
             ProgressThresholds progressThresholds = this.A.d;
             Objects.requireNonNull(gVar);
             float start = progressThresholds.getStart();
@@ -526,13 +526,13 @@ public final class MaterialContainerTransform extends Transition {
             }
             gVar.e = shapeAppearanceModel;
             gVar.d.calculatePath(shapeAppearanceModel, 1.0f, rectF5, gVar.b);
-            gVar.d.calculatePath(gVar.e, 1.0f, rectF6, gVar.f1263c);
+            gVar.d.calculatePath(gVar.e, 1.0f, rectF6, gVar.f1260c);
             if (Build.VERSION.SDK_INT >= 23) {
-                gVar.a.op(gVar.b, gVar.f1263c, Path.Op.UNION);
+                gVar.a.op(gVar.b, gVar.f1260c, Path.Op.UNION);
             }
             this.J = k.d(this.d, this.h, f);
             RectF rectF8 = this.I;
-            float f10 = this.f2343s;
+            float f10 = this.f2349s;
             RectF rectF9 = this.I;
             float f11 = this.t;
             float f12 = this.J;
@@ -651,7 +651,7 @@ public final class MaterialContainerTransform extends Transition {
         if (!z2) {
             cVar = cVar2;
         }
-        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2341c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
+        return new c((ProgressThresholds) k.a(this.fadeProgressThresholds, cVar.a), (ProgressThresholds) k.a(this.scaleProgressThresholds, cVar.b), (ProgressThresholds) k.a(this.scaleMaskProgressThresholds, cVar.f2347c), (ProgressThresholds) k.a(this.shapeMaskProgressThresholds, cVar.d), null);
     }
 
     @StyleRes
@@ -738,7 +738,7 @@ public final class MaterialContainerTransform extends Transition {
                 } else if (i5 == 1) {
                     aVar = isEntering ? c.i.a.g.l.l.b.b : c.i.a.g.l.l.b.a;
                 } else if (i5 == 2) {
-                    aVar = c.i.a.g.l.l.b.f1260c;
+                    aVar = c.i.a.g.l.l.b.f1257c;
                 } else if (i5 == 3) {
                     aVar = c.i.a.g.l.l.b.d;
                 } else {
diff --git a/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java b/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java
index ced75ba06f..254e9b0609 100644
--- a/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java
+++ b/app/src/main/java/com/google/android/material/transition/platform/ScaleProvider.java
@@ -23,18 +23,18 @@ public final class ScaleProvider implements VisibilityAnimatorProvider {
         public final /* synthetic */ float b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ float f2347c;
+        public final /* synthetic */ float f2353c;
 
         public a(View view, float f, float f2) {
             this.a = view;
             this.b = f;
-            this.f2347c = f2;
+            this.f2353c = f2;
         }
 
         @Override // android.animation.AnimatorListenerAdapter, android.animation.Animator.AnimatorListener
         public void onAnimationEnd(Animator animator) {
             this.a.setScaleX(this.b);
-            this.a.setScaleY(this.f2347c);
+            this.a.setScaleY(this.f2353c);
         }
     }
 
diff --git a/app/src/main/java/com/google/firebase/appindexing/internal/zza.java b/app/src/main/java/com/google/firebase/appindexing/internal/zza.java
index 37ad2506bd..67b9476537 100644
--- a/app/src/main/java/com/google/firebase/appindexing/internal/zza.java
+++ b/app/src/main/java/com/google/firebase/appindexing/internal/zza.java
@@ -69,14 +69,14 @@ public final class zza extends AbstractSafeParcelable implements a {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
-        AnimatableValueParser.P2(parcel, 3, this.k, false);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.O2(parcel, 5, this.m, i, false);
-        AnimatableValueParser.P2(parcel, 6, this.n, false);
-        AnimatableValueParser.L2(parcel, 7, this.o, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
+        AnimatableValueParser.R2(parcel, 3, this.k, false);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.Q2(parcel, 5, this.m, i, false);
+        AnimatableValueParser.R2(parcel, 6, this.n, false);
+        AnimatableValueParser.N2(parcel, 7, this.o, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/firebase/appindexing/internal/zzc.java b/app/src/main/java/com/google/firebase/appindexing/internal/zzc.java
index 920a91909c..403cd19874 100644
--- a/app/src/main/java/com/google/firebase/appindexing/internal/zzc.java
+++ b/app/src/main/java/com/google/firebase/appindexing/internal/zzc.java
@@ -70,19 +70,19 @@ public final class zzc extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
         int i2 = this.i;
-        AnimatableValueParser.W2(parcel, 1, 4);
+        AnimatableValueParser.Y2(parcel, 1, 4);
         parcel.writeInt(i2);
         boolean z2 = this.j;
-        AnimatableValueParser.W2(parcel, 2, 4);
+        AnimatableValueParser.Y2(parcel, 2, 4);
         parcel.writeInt(z2 ? 1 : 0);
-        AnimatableValueParser.P2(parcel, 3, this.k, false);
-        AnimatableValueParser.P2(parcel, 4, this.l, false);
-        AnimatableValueParser.M2(parcel, 5, this.m, false);
+        AnimatableValueParser.R2(parcel, 3, this.k, false);
+        AnimatableValueParser.R2(parcel, 4, this.l, false);
+        AnimatableValueParser.O2(parcel, 5, this.m, false);
         boolean z3 = this.n;
-        AnimatableValueParser.W2(parcel, 6, 4);
+        AnimatableValueParser.Y2(parcel, 6, 4);
         parcel.writeInt(z3 ? 1 : 0);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java b/app/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java
index caa6d3ba9b..9605bbd5f1 100644
--- a/app/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java
+++ b/app/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java
@@ -28,21 +28,21 @@ public class DynamicLinkData extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 1, this.i, false);
-        AnimatableValueParser.P2(parcel, 2, this.j, false);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 1, this.i, false);
+        AnimatableValueParser.R2(parcel, 2, this.j, false);
         int i2 = this.k;
-        AnimatableValueParser.W2(parcel, 3, 4);
+        AnimatableValueParser.Y2(parcel, 3, 4);
         parcel.writeInt(i2);
         long j = this.l;
-        AnimatableValueParser.W2(parcel, 4, 8);
+        AnimatableValueParser.Y2(parcel, 4, 8);
         parcel.writeLong(j);
         Bundle bundle = this.m;
         if (bundle == null) {
             bundle = new Bundle();
         }
-        AnimatableValueParser.L2(parcel, 5, bundle, false);
-        AnimatableValueParser.O2(parcel, 6, this.n, i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        AnimatableValueParser.N2(parcel, 5, bundle, false);
+        AnimatableValueParser.Q2(parcel, 6, this.n, i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzo.java b/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzo.java
index b00e7f8392..7222b324de 100644
--- a/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzo.java
+++ b/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzo.java
@@ -22,10 +22,10 @@ public final class zzo extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.O2(parcel, 1, this.i, i, false);
-        AnimatableValueParser.O2(parcel, 2, this.j, i, false);
-        AnimatableValueParser.S2(parcel, 3, this.k, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.Q2(parcel, 1, this.i, i, false);
+        AnimatableValueParser.Q2(parcel, 2, this.j, i, false);
+        AnimatableValueParser.U2(parcel, 3, this.k, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzr.java b/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzr.java
index 23d143d03b..879251a959 100644
--- a/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzr.java
+++ b/app/src/main/java/com/google/firebase/dynamiclinks/internal/zzr.java
@@ -16,8 +16,8 @@ public final class zzr extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.P2(parcel, 2, this.i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.R2(parcel, 2, this.i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java b/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java
index a0e0a3c66a..9cb7101bfe 100644
--- a/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java
+++ b/app/src/main/java/com/google/firebase/iid/FirebaseInstanceId.java
@@ -46,7 +46,7 @@ public class FirebaseInstanceId {
     public static w b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pattern f2348c = Pattern.compile("\\AA[\\w-]{38}\\z");
+    public static final Pattern f2354c = Pattern.compile("\\AA[\\w-]{38}\\z");
     public static ScheduledExecutorService d;
     public final Executor e;
     public final c f;
@@ -106,7 +106,7 @@ public class FirebaseInstanceId {
         cVar.a();
         AnimatableValueParser.p(cVar.f.b.contains(":"), "Please set your Application ID. A valid Firebase App ID is required to communicate with Firebase server APIs: It identifies your application with Firebase.Please refer to https://firebase.google.com/support/privacy/init-options.");
         cVar.a();
-        AnimatableValueParser.p(f2348c.matcher(cVar.f.a).matches(), "Please set a valid API key. A Firebase API key is required to communicate with Firebase server APIs: It authenticates your project with Google.Please refer to https://firebase.google.com/support/privacy/init-options.");
+        AnimatableValueParser.p(f2354c.matcher(cVar.f.a).matches(), "Please set a valid API key. A Firebase API key is required to communicate with Firebase server APIs: It authenticates your project with Google.Please refer to https://firebase.google.com/support/privacy/init-options.");
     }
 
     @NonNull
@@ -168,7 +168,7 @@ public class FirebaseInstanceId {
             w wVar = b;
             String c2 = this.f.c();
             synchronized (wVar) {
-                wVar.f1367c.put(c2, Long.valueOf(wVar.d(c2)));
+                wVar.f1362c.put(c2, Long.valueOf(wVar.d(c2)));
             }
             return (String) a(this.j.getId());
         } catch (InterruptedException e) {
@@ -212,7 +212,7 @@ public class FirebaseInstanceId {
         if (j == null) {
             return null;
         }
-        return j.f1368c;
+        return j.f1363c;
     }
 
     @Nullable
@@ -236,7 +236,7 @@ public class FirebaseInstanceId {
         String e = e();
         w.a k = k(str, str2);
         if (!p(k)) {
-            return c.i.a.f.e.o.c.F(new p(e, k.f1368c));
+            return c.i.a.f.e.o.c.F(new p(e, k.f1363c));
         }
         u uVar = this.i;
         synchronized (uVar) {
diff --git a/app/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java b/app/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java
index bf96e1ec59..361bea7952 100644
--- a/app/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java
+++ b/app/src/main/java/com/google/firebase/messaging/EnhancedIntentService.java
@@ -51,9 +51,9 @@ public abstract class EnhancedIntentService extends Service {
     private void finishTask(Intent intent) {
         if (intent != null) {
             synchronized (y.b) {
-                if (y.f1369c != null && intent.getBooleanExtra("com.google.firebase.iid.WakeLockHolder.wakefulintent", false)) {
+                if (y.f1364c != null && intent.getBooleanExtra("com.google.firebase.iid.WakeLockHolder.wakefulintent", false)) {
                     intent.putExtra("com.google.firebase.iid.WakeLockHolder.wakefulintent", false);
-                    y.f1369c.b();
+                    y.f1364c.b();
                 }
             }
         }
diff --git a/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
index 04316c367c..36719edc7c 100644
--- a/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
+++ b/app/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
@@ -40,7 +40,7 @@ public class FirebaseMessaging {
     public final Context b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f2349c;
+    public final c f2355c;
     public final FirebaseInstanceId d;
     public final a e;
     public final Executor f;
@@ -53,7 +53,7 @@ public class FirebaseMessaging {
         @Nullable
 
         /* renamed from: c  reason: collision with root package name */
-        public b<c.i.c.a> f2350c;
+        public b<c.i.c.a> f2356c;
         @Nullable
         public Boolean d;
 
@@ -67,7 +67,7 @@ public class FirebaseMessaging {
                 this.d = c2;
                 if (c2 == null) {
                     j jVar = new j(this);
-                    this.f2350c = jVar;
+                    this.f2356c = jVar;
                     this.a.a(c.i.c.a.class, jVar);
                 }
                 this.b = true;
@@ -80,14 +80,14 @@ public class FirebaseMessaging {
             if (bool != null) {
                 return bool.booleanValue();
             }
-            return FirebaseMessaging.this.f2349c.g();
+            return FirebaseMessaging.this.f2355c.g();
         }
 
         @Nullable
         public final Boolean c() {
             ApplicationInfo applicationInfo;
             Bundle bundle;
-            c cVar = FirebaseMessaging.this.f2349c;
+            c cVar = FirebaseMessaging.this.f2355c;
             cVar.a();
             Context context = cVar.d;
             SharedPreferences sharedPreferences = context.getSharedPreferences("com.google.firebase.messaging", 0);
@@ -110,7 +110,7 @@ public class FirebaseMessaging {
         try {
             Class.forName("com.google.firebase.iid.FirebaseInstanceIdReceiver");
             a = gVar2;
-            this.f2349c = cVar;
+            this.f2355c = cVar;
             this.d = firebaseInstanceId;
             this.e = new a(dVar);
             cVar.a();
diff --git a/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java b/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java
index 91761688af..21cb4608ee 100644
--- a/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java
+++ b/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java
@@ -20,8 +20,8 @@ public final class RemoteMessage extends AbstractSafeParcelable {
 
     @Override // android.os.Parcelable
     public final void writeToParcel(@NonNull Parcel parcel, int i) {
-        int T2 = AnimatableValueParser.T2(parcel, 20293);
-        AnimatableValueParser.L2(parcel, 2, this.i, false);
-        AnimatableValueParser.Y2(parcel, T2);
+        int V2 = AnimatableValueParser.V2(parcel, 20293);
+        AnimatableValueParser.N2(parcel, 2, this.i, false);
+        AnimatableValueParser.a3(parcel, V2);
     }
 }
diff --git a/app/src/main/java/com/google/gson/Gson.java b/app/src/main/java/com/google/gson/Gson.java
index 418ee71366..229b4071c0 100644
--- a/app/src/main/java/com/google/gson/Gson.java
+++ b/app/src/main/java/com/google/gson/Gson.java
@@ -46,7 +46,7 @@ public final class Gson {
     public final ThreadLocal<Map<TypeToken<?>, FutureTypeAdapter<?>>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<TypeToken<?>, TypeAdapter<?>> f2351c;
+    public final Map<TypeToken<?>, TypeAdapter<?>> f2357c;
     public final g d;
     public final JsonAdapterAnnotationTypeAdapterFactory e;
     public final List<o> f;
@@ -227,7 +227,7 @@ public final class Gson {
 
     public Gson(Excluder excluder, d dVar, Map<Type, f<?>> map, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, boolean z8, n nVar, String str, int i, int i2, List<o> list, List<o> list2, List<o> list3) {
         this.b = new ThreadLocal<>();
-        this.f2351c = new ConcurrentHashMap();
+        this.f2357c = new ConcurrentHashMap();
         this.g = map;
         this.d = new g(map);
         this.h = z2;
@@ -251,13 +251,13 @@ public final class Gson {
         arrayList.add(new TypeAdapters.AnonymousClass33(Long.TYPE, Long.class, r3));
         arrayList.add(new TypeAdapters.AnonymousClass33(Double.TYPE, Double.class, z8 ? TypeAdapters.v : new AnonymousClass1(this)));
         arrayList.add(new TypeAdapters.AnonymousClass33(Float.TYPE, Float.class, z8 ? TypeAdapters.u : new AnonymousClass2(this)));
-        arrayList.add(TypeAdapters.f2360x);
+        arrayList.add(TypeAdapters.f2366x);
         arrayList.add(TypeAdapters.o);
         arrayList.add(TypeAdapters.q);
         arrayList.add(new TypeAdapters.AnonymousClass32(AtomicLong.class, new AnonymousClass4(r3).nullSafe()));
         arrayList.add(new TypeAdapters.AnonymousClass32(AtomicLongArray.class, new AnonymousClass5(r3).nullSafe()));
-        arrayList.add(TypeAdapters.f2359s);
-        arrayList.add(TypeAdapters.f2362z);
+        arrayList.add(TypeAdapters.f2365s);
+        arrayList.add(TypeAdapters.f2368z);
         arrayList.add(TypeAdapters.F);
         arrayList.add(TypeAdapters.H);
         arrayList.add(new TypeAdapters.AnonymousClass32(BigDecimal.class, TypeAdapters.B));
@@ -362,7 +362,7 @@ public final class Gson {
     }
 
     public <T> TypeAdapter<T> h(TypeToken<T> typeToken) {
-        TypeAdapter<T> typeAdapter = (TypeAdapter<T>) this.f2351c.get(typeToken == null ? a : typeToken);
+        TypeAdapter<T> typeAdapter = (TypeAdapter<T>) this.f2357c.get(typeToken == null ? a : typeToken);
         if (typeAdapter != null) {
             return typeAdapter;
         }
@@ -385,7 +385,7 @@ public final class Gson {
                 if (create != null) {
                     if (futureTypeAdapter2.a == null) {
                         futureTypeAdapter2.a = create;
-                        this.f2351c.put(typeToken, create);
+                        this.f2357c.put(typeToken, create);
                         return create;
                     }
                     throw new AssertionError();
@@ -437,7 +437,7 @@ public final class Gson {
             jsonWriter.n = "  ";
             jsonWriter.o = ": ";
         }
-        jsonWriter.f2366s = this.h;
+        jsonWriter.f2372s = this.h;
         return jsonWriter;
     }
 
@@ -468,13 +468,13 @@ public final class Gson {
         jsonWriter.p = true;
         boolean z3 = jsonWriter.q;
         jsonWriter.q = this.j;
-        boolean z4 = jsonWriter.f2366s;
-        jsonWriter.f2366s = this.h;
+        boolean z4 = jsonWriter.f2372s;
+        jsonWriter.f2372s = this.h;
         try {
             TypeAdapters.X.write(jsonWriter, jsonElement);
             jsonWriter.p = z2;
             jsonWriter.q = z3;
-            jsonWriter.f2366s = z4;
+            jsonWriter.f2372s = z4;
         } catch (IOException e) {
             throw new JsonIOException(e);
         } catch (AssertionError e2) {
@@ -484,7 +484,7 @@ public final class Gson {
         } catch (Throwable th) {
             jsonWriter.p = z2;
             jsonWriter.q = z3;
-            jsonWriter.f2366s = z4;
+            jsonWriter.f2372s = z4;
             throw th;
         }
     }
@@ -495,13 +495,13 @@ public final class Gson {
         jsonWriter.p = true;
         boolean z3 = jsonWriter.q;
         jsonWriter.q = this.j;
-        boolean z4 = jsonWriter.f2366s;
-        jsonWriter.f2366s = this.h;
+        boolean z4 = jsonWriter.f2372s;
+        jsonWriter.f2372s = this.h;
         try {
             h.write(jsonWriter, obj);
             jsonWriter.p = z2;
             jsonWriter.q = z3;
-            jsonWriter.f2366s = z4;
+            jsonWriter.f2372s = z4;
         } catch (IOException e) {
             throw new JsonIOException(e);
         } catch (AssertionError e2) {
@@ -511,7 +511,7 @@ public final class Gson {
         } catch (Throwable th) {
             jsonWriter.p = z2;
             jsonWriter.q = z3;
-            jsonWriter.f2366s = z4;
+            jsonWriter.f2372s = z4;
             throw th;
         }
     }
diff --git a/app/src/main/java/com/google/gson/TypeAdapter.java b/app/src/main/java/com/google/gson/TypeAdapter.java
index 5370249214..5410b36339 100644
--- a/app/src/main/java/com/google/gson/TypeAdapter.java
+++ b/app/src/main/java/com/google/gson/TypeAdapter.java
@@ -77,7 +77,7 @@ public abstract class TypeAdapter<T> {
             b bVar = new b();
             write(bVar, t);
             if (bVar.v.isEmpty()) {
-                return bVar.f1391x;
+                return bVar.f1386x;
             }
             throw new IllegalStateException("Expected one JSON element but was " + bVar.v);
         } catch (IOException e) {
diff --git a/app/src/main/java/com/google/gson/internal/Excluder.java b/app/src/main/java/com/google/gson/internal/Excluder.java
index 56e19e69c1..1cd527bf66 100644
--- a/app/src/main/java/com/google/gson/internal/Excluder.java
+++ b/app/src/main/java/com/google/gson/internal/Excluder.java
@@ -26,13 +26,13 @@ public final class Excluder implements o, Cloneable {
         public final /* synthetic */ boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ boolean f2352c;
+        public final /* synthetic */ boolean f2358c;
         public final /* synthetic */ Gson d;
         public final /* synthetic */ TypeToken e;
 
         public AnonymousClass1(boolean z2, boolean z3, Gson gson, TypeToken typeToken) {
             this.b = z2;
-            this.f2352c = z3;
+            this.f2358c = z3;
             this.d = gson;
             this.e = typeToken;
         }
@@ -54,7 +54,7 @@ public final class Excluder implements o, Cloneable {
 
         @Override // com.google.gson.TypeAdapter
         public void write(JsonWriter jsonWriter, T t) throws IOException {
-            if (this.f2352c) {
+            if (this.f2358c) {
                 jsonWriter.s();
                 return;
             }
diff --git a/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java b/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
index 75066bb135..41b058d9ed 100644
--- a/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
+++ b/app/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
@@ -18,7 +18,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
     public final Class<E> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final TypeAdapter<E> f2353c;
+    public final TypeAdapter<E> f2359c;
 
     /* renamed from: com.google.gson.internal.bind.ArrayTypeAdapter$1  reason: invalid class name */
     public class AnonymousClass1 implements o {
@@ -35,7 +35,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
     }
 
     public ArrayTypeAdapter(Gson gson, TypeAdapter<E> typeAdapter, Class<E> cls) {
-        this.f2353c = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter, cls);
+        this.f2359c = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter, cls);
         this.b = cls;
     }
 
@@ -48,7 +48,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
         ArrayList arrayList = new ArrayList();
         jsonReader.a();
         while (jsonReader.r()) {
-            arrayList.add(this.f2353c.read(jsonReader));
+            arrayList.add(this.f2359c.read(jsonReader));
         }
         jsonReader.e();
         int size = arrayList.size();
@@ -70,7 +70,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
         jsonWriter.b();
         int length = Array.getLength(obj);
         for (int i = 0; i < length; i++) {
-            this.f2353c.write(jsonWriter, Array.get(obj, i));
+            this.f2359c.write(jsonWriter, Array.get(obj, i));
         }
         jsonWriter.e();
     }
diff --git a/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java b/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
index 0c50186b77..b025436327 100644
--- a/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/app/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java
@@ -33,12 +33,12 @@ public final class MapTypeAdapterFactory implements o {
         public final TypeAdapter<V> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final r<? extends Map<K, V>> f2354c;
+        public final r<? extends Map<K, V>> f2360c;
 
         public Adapter(Gson gson, Type type, TypeAdapter<K> typeAdapter, Type type2, TypeAdapter<V> typeAdapter2, r<? extends Map<K, V>> rVar) {
             this.a = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter, type);
             this.b = new TypeAdapterRuntimeTypeWrapper(gson, typeAdapter2, type2);
-            this.f2354c = rVar;
+            this.f2360c = rVar;
         }
 
         @Override // com.google.gson.TypeAdapter
@@ -48,7 +48,7 @@ public final class MapTypeAdapterFactory implements o {
                 jsonReader.H();
                 return null;
             }
-            Map map = (Map) this.f2354c.a();
+            Map map = (Map) this.f2360c.a();
             if (N == JsonToken.BEGIN_ARRAY) {
                 jsonReader.a();
                 while (jsonReader.r()) {
diff --git a/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 42d8b3be97..4eadf99b74 100644
--- a/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/app/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -51,7 +51,7 @@ public final class ReflectiveTypeAdapterFactory implements o {
                 while (jsonReader.r()) {
                     a aVar = this.b.get(jsonReader.C());
                     if (aVar != null) {
-                        if (aVar.f2355c) {
+                        if (aVar.f2361c) {
                             aVar.a(jsonReader, a);
                         }
                     }
@@ -92,12 +92,12 @@ public final class ReflectiveTypeAdapterFactory implements o {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2355c;
+        public final boolean f2361c;
 
         public a(String str, boolean z2, boolean z3) {
             this.a = str;
             this.b = z2;
-            this.f2355c = z3;
+            this.f2361c = z3;
         }
 
         public abstract void a(JsonReader jsonReader, Object obj) throws IOException, IllegalAccessException;
diff --git a/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java b/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
index 2d80b6bb7c..72959c67ac 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TreeTypeAdapter.java
@@ -20,7 +20,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
     public final i<T> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Gson f2356c;
+    public final Gson f2362c;
     public final TypeToken<T> d;
     public final o e;
     public final TreeTypeAdapter<T>.b f = new b(this, null);
@@ -62,7 +62,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
     public TreeTypeAdapter(m<T> mVar, i<T> iVar, Gson gson, TypeToken<T> typeToken, o oVar) {
         this.a = mVar;
         this.b = iVar;
-        this.f2356c = gson;
+        this.f2362c = gson;
         this.d = typeToken;
         this.e = oVar;
     }
@@ -72,7 +72,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
         if (this.b == null) {
             TypeAdapter<T> typeAdapter = this.g;
             if (typeAdapter == null) {
-                typeAdapter = this.f2356c.j(this.e, this.d);
+                typeAdapter = this.f2362c.j(this.e, this.d);
                 this.g = typeAdapter;
             }
             return typeAdapter.read(jsonReader);
@@ -91,7 +91,7 @@ public final class TreeTypeAdapter<T> extends TypeAdapter<T> {
         if (mVar == null) {
             TypeAdapter<T> typeAdapter = this.g;
             if (typeAdapter == null) {
-                typeAdapter = this.f2356c.j(this.e, this.d);
+                typeAdapter = this.f2362c.j(this.e, this.d);
                 this.g = typeAdapter;
             }
             typeAdapter.write(jsonWriter, t);
diff --git a/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java b/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
index d4f824e3f7..0b1a2ecfdb 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TypeAdapterRuntimeTypeWrapper.java
@@ -14,12 +14,12 @@ public final class TypeAdapterRuntimeTypeWrapper<T> extends TypeAdapter<T> {
     public final TypeAdapter<T> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Type f2357c;
+    public final Type f2363c;
 
     public TypeAdapterRuntimeTypeWrapper(Gson gson, TypeAdapter<T> typeAdapter, Type type) {
         this.a = gson;
         this.b = typeAdapter;
-        this.f2357c = type;
+        this.f2363c = type;
     }
 
     @Override // com.google.gson.TypeAdapter
@@ -30,11 +30,11 @@ public final class TypeAdapterRuntimeTypeWrapper<T> extends TypeAdapter<T> {
     @Override // com.google.gson.TypeAdapter
     public void write(JsonWriter jsonWriter, T t) throws IOException {
         TypeAdapter<T> typeAdapter = this.b;
-        Type type = this.f2357c;
+        Type type = this.f2363c;
         if (t != null && (type == Object.class || (type instanceof TypeVariable) || (type instanceof Class))) {
             type = t.getClass();
         }
-        if (type != this.f2357c) {
+        if (type != this.f2363c) {
             typeAdapter = this.a.h(TypeToken.get(type));
             if (typeAdapter instanceof ReflectiveTypeAdapterFactory.Adapter) {
                 TypeAdapter<T> typeAdapter2 = this.b;
diff --git a/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java b/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
index 2a2dc9f627..869947fa5e 100644
--- a/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
+++ b/app/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
@@ -74,7 +74,7 @@ public final class TypeAdapters {
     public static final o b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final TypeAdapter<BitSet> f2358c;
+    public static final TypeAdapter<BitSet> f2364c;
     public static final o d;
     public static final TypeAdapter<Boolean> e;
     public static final TypeAdapter<Boolean> f = new AnonymousClass4();
@@ -92,20 +92,20 @@ public final class TypeAdapters {
     public static final TypeAdapter<AtomicIntegerArray> r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final o f2359s;
+    public static final o f2365s;
     public static final TypeAdapter<Number> t = new AnonymousClass11();
     public static final TypeAdapter<Number> u = new AnonymousClass12();
     public static final TypeAdapter<Number> v = new AnonymousClass13();
     public static final TypeAdapter<Number> w;
 
     /* renamed from: x  reason: collision with root package name */
-    public static final o f2360x;
+    public static final o f2366x;
 
     /* renamed from: y  reason: collision with root package name */
-    public static final TypeAdapter<Character> f2361y;
+    public static final TypeAdapter<Character> f2367y;
 
     /* renamed from: z  reason: collision with root package name */
-    public static final o f2362z;
+    public static final o f2368z;
 
     /* renamed from: com.google.gson.internal.bind.TypeAdapters$1  reason: invalid class name */
     public class AnonymousClass1 extends TypeAdapter<Class> {
@@ -1141,7 +1141,7 @@ public final class TypeAdapters {
         a = nullSafe;
         b = new AnonymousClass32(Class.class, nullSafe);
         TypeAdapter<BitSet> nullSafe2 = new AnonymousClass2().nullSafe();
-        f2358c = nullSafe2;
+        f2364c = nullSafe2;
         d = new AnonymousClass32(BitSet.class, nullSafe2);
         AnonymousClass3 r0 = new AnonymousClass3();
         e = r0;
@@ -1163,13 +1163,13 @@ public final class TypeAdapters {
         q = new AnonymousClass32(AtomicBoolean.class, nullSafe4);
         TypeAdapter<AtomicIntegerArray> nullSafe5 = new AnonymousClass10().nullSafe();
         r = nullSafe5;
-        f2359s = new AnonymousClass32(AtomicIntegerArray.class, nullSafe5);
+        f2365s = new AnonymousClass32(AtomicIntegerArray.class, nullSafe5);
         AnonymousClass14 r05 = new AnonymousClass14();
         w = r05;
-        f2360x = new AnonymousClass32(Number.class, r05);
+        f2366x = new AnonymousClass32(Number.class, r05);
         AnonymousClass15 r06 = new AnonymousClass15();
-        f2361y = r06;
-        f2362z = new AnonymousClass33(Character.TYPE, Character.class, r06);
+        f2367y = r06;
+        f2368z = new AnonymousClass33(Character.TYPE, Character.class, r06);
         AnonymousClass16 r07 = new AnonymousClass16();
         A = r07;
         D = new AnonymousClass32(String.class, r07);
diff --git a/app/src/main/java/com/google/gson/stream/JsonReader.java b/app/src/main/java/com/google/gson/stream/JsonReader.java
index 548ac8d771..ef6d3ad1c6 100644
--- a/app/src/main/java/com/google/gson/stream/JsonReader.java
+++ b/app/src/main/java/com/google/gson/stream/JsonReader.java
@@ -20,14 +20,14 @@ public class JsonReader implements Closeable {
     public long r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2363s;
+    public int f2369s;
     public String t;
     public int[] u;
     public int v;
     public String[] w;
 
     /* renamed from: x  reason: collision with root package name */
-    public int[] f2364x;
+    public int[] f2370x;
 
     public class a extends p {
     }
@@ -43,7 +43,7 @@ public class JsonReader implements Closeable {
         this.v = 0 + 1;
         iArr[0] = 6;
         this.w = new String[32];
-        this.f2364x = new int[32];
+        this.f2370x = new int[32];
         Objects.requireNonNull(reader, "in == null");
         this.j = reader;
     }
@@ -55,14 +55,14 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 15) {
             this.q = 0;
-            int[] iArr = this.f2364x;
+            int[] iArr = this.f2370x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
             return this.r;
         }
         if (i2 == 16) {
-            this.t = new String(this.l, this.m, this.f2363s);
-            this.m += this.f2363s;
+            this.t = new String(this.l, this.m, this.f2369s);
+            this.m += this.f2369s;
         } else if (i2 == 8 || i2 == 9 || i2 == 10) {
             if (i2 == 10) {
                 this.t = M();
@@ -72,7 +72,7 @@ public class JsonReader implements Closeable {
             try {
                 long parseLong = Long.parseLong(this.t);
                 this.q = 0;
-                int[] iArr2 = this.f2364x;
+                int[] iArr2 = this.f2370x;
                 int i4 = this.v - 1;
                 iArr2[i4] = iArr2[i4] + 1;
                 return parseLong;
@@ -90,7 +90,7 @@ public class JsonReader implements Closeable {
         if (((double) j) == parseDouble) {
             this.t = null;
             this.q = 0;
-            int[] iArr3 = this.f2364x;
+            int[] iArr3 = this.f2370x;
             int i5 = this.v - 1;
             iArr3[i5] = iArr3[i5] + 1;
             return j;
@@ -219,7 +219,7 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 7) {
             this.q = 0;
-            int[] iArr = this.f2364x;
+            int[] iArr = this.f2370x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
             return;
@@ -301,8 +301,8 @@ public class JsonReader implements Closeable {
         } else if (i2 == 15) {
             str = Long.toString(this.r);
         } else if (i2 == 16) {
-            str = new String(this.l, this.m, this.f2363s);
-            this.m += this.f2363s;
+            str = new String(this.l, this.m, this.f2369s);
+            this.m += this.f2369s;
         } else {
             StringBuilder L = c.d.b.a.a.L("Expected a string but was ");
             L.append(N());
@@ -310,7 +310,7 @@ public class JsonReader implements Closeable {
             throw new IllegalStateException(L.toString());
         }
         this.q = 0;
-        int[] iArr = this.f2364x;
+        int[] iArr = this.f2370x;
         int i3 = this.v - 1;
         iArr[i3] = iArr[i3] + 1;
         return str;
@@ -418,7 +418,7 @@ public class JsonReader implements Closeable {
         if (i3 == iArr.length) {
             int i4 = i3 * 2;
             this.u = Arrays.copyOf(iArr, i4);
-            this.f2364x = Arrays.copyOf(this.f2364x, i4);
+            this.f2370x = Arrays.copyOf(this.f2370x, i4);
             this.w = (String[]) Arrays.copyOf(this.w, i4);
         }
         int[] iArr2 = this.u;
@@ -608,7 +608,7 @@ public class JsonReader implements Closeable {
                     this.q = 0;
                 } else {
                     if (i4 == 16) {
-                        this.m += this.f2363s;
+                        this.m += this.f2369s;
                     }
                     this.q = 0;
                 }
@@ -618,7 +618,7 @@ public class JsonReader implements Closeable {
             i3++;
             this.q = 0;
         } while (i3 != 0);
-        int[] iArr = this.f2364x;
+        int[] iArr = this.f2370x;
         int i6 = this.v;
         int i7 = i6 - 1;
         iArr[i7] = iArr[i7] + 1;
@@ -638,7 +638,7 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 3) {
             Q(1);
-            this.f2364x[this.v - 1] = 0;
+            this.f2370x[this.v - 1] = 0;
             this.q = 0;
             return;
         }
@@ -722,7 +722,7 @@ public class JsonReader implements Closeable {
         if (r13 != 7) goto L_0x018a;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:161:0x0231, code lost:
-        r19.f2363s = r9;
+        r19.f2369s = r9;
         r6 = 16;
         r19.q = 16;
      */
@@ -1019,7 +1019,7 @@ public class JsonReader implements Closeable {
         if (i2 == 4) {
             int i3 = this.v - 1;
             this.v = i3;
-            int[] iArr = this.f2364x;
+            int[] iArr = this.f2370x;
             int i4 = i3 - 1;
             iArr[i4] = iArr[i4] + 1;
             this.q = 0;
@@ -1040,7 +1040,7 @@ public class JsonReader implements Closeable {
             int i3 = this.v - 1;
             this.v = i3;
             this.w[i3] = null;
-            int[] iArr = this.f2364x;
+            int[] iArr = this.f2370x;
             int i4 = i3 - 1;
             iArr[i4] = iArr[i4] + 1;
             this.q = 0;
@@ -1059,7 +1059,7 @@ public class JsonReader implements Closeable {
             int i4 = this.u[i3];
             if (i4 == 1 || i4 == 2) {
                 J.append('[');
-                J.append(this.f2364x[i3]);
+                J.append(this.f2370x[i3]);
                 J.append(']');
             } else if (i4 == 3 || i4 == 4 || i4 == 5) {
                 J.append('.');
@@ -1162,13 +1162,13 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 5) {
             this.q = 0;
-            int[] iArr = this.f2364x;
+            int[] iArr = this.f2370x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
             return true;
         } else if (i2 == 6) {
             this.q = 0;
-            int[] iArr2 = this.f2364x;
+            int[] iArr2 = this.f2370x;
             int i4 = this.v - 1;
             iArr2[i4] = iArr2[i4] + 1;
             return false;
@@ -1187,14 +1187,14 @@ public class JsonReader implements Closeable {
         }
         if (i2 == 15) {
             this.q = 0;
-            int[] iArr = this.f2364x;
+            int[] iArr = this.f2370x;
             int i3 = this.v - 1;
             iArr[i3] = iArr[i3] + 1;
             return (double) this.r;
         }
         if (i2 == 16) {
-            this.t = new String(this.l, this.m, this.f2363s);
-            this.m += this.f2363s;
+            this.t = new String(this.l, this.m, this.f2369s);
+            this.m += this.f2369s;
         } else if (i2 == 8 || i2 == 9) {
             this.t = I(i2 == 8 ? '\'' : '\"');
         } else if (i2 == 10) {
@@ -1210,7 +1210,7 @@ public class JsonReader implements Closeable {
         if (this.k || (!Double.isNaN(parseDouble) && !Double.isInfinite(parseDouble))) {
             this.t = null;
             this.q = 0;
-            int[] iArr2 = this.f2364x;
+            int[] iArr2 = this.f2370x;
             int i4 = this.v - 1;
             iArr2[i4] = iArr2[i4] + 1;
             return parseDouble;
@@ -1228,7 +1228,7 @@ public class JsonReader implements Closeable {
             int i3 = (int) j;
             if (j == ((long) i3)) {
                 this.q = 0;
-                int[] iArr = this.f2364x;
+                int[] iArr = this.f2370x;
                 int i4 = this.v - 1;
                 iArr[i4] = iArr[i4] + 1;
                 return i3;
@@ -1239,8 +1239,8 @@ public class JsonReader implements Closeable {
             throw new NumberFormatException(L.toString());
         }
         if (i2 == 16) {
-            this.t = new String(this.l, this.m, this.f2363s);
-            this.m += this.f2363s;
+            this.t = new String(this.l, this.m, this.f2369s);
+            this.m += this.f2369s;
         } else if (i2 == 8 || i2 == 9 || i2 == 10) {
             if (i2 == 10) {
                 this.t = M();
@@ -1250,7 +1250,7 @@ public class JsonReader implements Closeable {
             try {
                 int parseInt = Integer.parseInt(this.t);
                 this.q = 0;
-                int[] iArr2 = this.f2364x;
+                int[] iArr2 = this.f2370x;
                 int i5 = this.v - 1;
                 iArr2[i5] = iArr2[i5] + 1;
                 return parseInt;
@@ -1268,7 +1268,7 @@ public class JsonReader implements Closeable {
         if (((double) i6) == parseDouble) {
             this.t = null;
             this.q = 0;
-            int[] iArr3 = this.f2364x;
+            int[] iArr3 = this.f2370x;
             int i7 = this.v - 1;
             iArr3[i7] = iArr3[i7] + 1;
             return i6;
diff --git a/app/src/main/java/com/google/gson/stream/JsonWriter.java b/app/src/main/java/com/google/gson/stream/JsonWriter.java
index 3ea1c9bfb3..e920157312 100644
--- a/app/src/main/java/com/google/gson/stream/JsonWriter.java
+++ b/app/src/main/java/com/google/gson/stream/JsonWriter.java
@@ -20,7 +20,7 @@ public class JsonWriter implements Closeable, Flushable {
     public String r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f2366s;
+    public boolean f2372s;
 
     static {
         for (int i2 = 0; i2 <= 31; i2++) {
@@ -46,7 +46,7 @@ public class JsonWriter implements Closeable, Flushable {
     public JsonWriter(Writer writer) {
         w(6);
         this.o = ":";
-        this.f2366s = true;
+        this.f2372s = true;
         Objects.requireNonNull(writer, "out == null");
         this.k = writer;
     }
@@ -224,7 +224,7 @@ public class JsonWriter implements Closeable, Flushable {
 
     public JsonWriter s() throws IOException {
         if (this.r != null) {
-            if (this.f2366s) {
+            if (this.f2372s) {
                 K();
             } else {
                 this.r = null;
diff --git a/app/src/main/java/com/google/zxing/Result.java b/app/src/main/java/com/google/zxing/Result.java
index 17fa35aa1e..2ed1fb97c2 100644
--- a/app/src/main/java/com/google/zxing/Result.java
+++ b/app/src/main/java/com/google/zxing/Result.java
@@ -10,14 +10,14 @@ public final class Result {
     public final byte[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public k[] f2367c;
+    public k[] f2373c;
     public final a d;
     public Map<j, Object> e = null;
 
     public Result(String str, byte[] bArr, int i, k[] kVarArr, a aVar, long j) {
         this.a = str;
         this.b = bArr;
-        this.f2367c = kVarArr;
+        this.f2373c = kVarArr;
         this.d = aVar;
     }
 
@@ -25,7 +25,7 @@ public final class Result {
         System.currentTimeMillis();
         this.a = str;
         this.b = bArr;
-        this.f2367c = kVarArr;
+        this.f2373c = kVarArr;
         this.d = aVar;
     }
 
diff --git a/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java b/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java
index e169491cf2..5ad2309375 100644
--- a/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java
+++ b/app/src/main/java/com/hcaptcha/sdk/HCaptchaConfig.java
@@ -21,7 +21,7 @@ public class HCaptchaConfig implements Serializable {
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Boolean f2368c;
+        public Boolean f2374c;
         public String d;
         public boolean e;
         public String f;
@@ -40,7 +40,7 @@ public class HCaptchaConfig implements Serializable {
             StringBuilder L = c.d.b.a.a.L("HCaptchaConfig.HCaptchaConfigBuilder(siteKey=");
             L.append(this.a);
             L.append(", sentry$value=");
-            L.append(this.f2368c);
+            L.append(this.f2374c);
             L.append(", rqdata=");
             L.append(this.d);
             L.append(", apiEndpoint$value=");
@@ -319,7 +319,7 @@ public class HCaptchaConfig implements Serializable {
         String str = this.siteKey;
         Objects.requireNonNull(str, "siteKey is marked non-null but is null");
         aVar.a = str;
-        aVar.f2368c = this.sentry;
+        aVar.f2374c = this.sentry;
         aVar.b = true;
         aVar.d = this.rqdata;
         aVar.f = this.apiEndpoint;
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
index bdfb4c107f..687e9cfaab 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPanelView.java
@@ -36,7 +36,7 @@ public class ColorPanelView extends View {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2369s = -9539986;
+    public int f2375s = -9539986;
     public int t = -16777216;
     public int u;
 
@@ -47,11 +47,11 @@ public class ColorPanelView extends View {
         boolean z2 = obtainStyledAttributes.getBoolean(R.f.ColorPanelView_cpv_showOldColor, false);
         this.q = z2;
         if (!z2 || this.u == 1) {
-            this.f2369s = obtainStyledAttributes.getColor(R.f.ColorPanelView_cpv_borderColor, -9539986);
+            this.f2375s = obtainStyledAttributes.getColor(R.f.ColorPanelView_cpv_borderColor, -9539986);
             obtainStyledAttributes.recycle();
-            if (this.f2369s == -9539986) {
+            if (this.f2375s == -9539986) {
                 TypedArray obtainStyledAttributes2 = context.obtainStyledAttributes(new TypedValue().data, new int[]{16842808});
-                this.f2369s = obtainStyledAttributes2.getColor(0, this.f2369s);
+                this.f2375s = obtainStyledAttributes2.getColor(0, this.f2375s);
                 obtainStyledAttributes2.recycle();
             }
             this.r = c.z(context, 1.0f);
@@ -107,7 +107,7 @@ public class ColorPanelView extends View {
     }
 
     public int getBorderColor() {
-        return this.f2369s;
+        return this.f2375s;
     }
 
     public int getColor() {
@@ -120,7 +120,7 @@ public class ColorPanelView extends View {
 
     @Override // android.view.View
     public void onDraw(Canvas canvas) {
-        this.j.setColor(this.f2369s);
+        this.j.setColor(this.f2375s);
         this.k.setColor(this.t);
         int i = this.u;
         if (i == 0) {
@@ -208,7 +208,7 @@ public class ColorPanelView extends View {
     }
 
     public void setBorderColor(int i) {
-        this.f2369s = i;
+        this.f2375s = i;
         invalidate();
     }
 
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
index 9ed6a02b11..4b1e7c69b5 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
@@ -47,27 +47,27 @@ public class ColorPickerView extends View {
     public Paint r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Paint f2370s;
+    public Paint f2376s;
     public Paint t;
     public Shader u;
     public Shader v;
     public Shader w;
 
     /* renamed from: x  reason: collision with root package name */
-    public b f2371x;
+    public b f2377x;
 
     /* renamed from: y  reason: collision with root package name */
-    public b f2372y;
+    public b f2378y;
 
     /* renamed from: z  reason: collision with root package name */
-    public int f2373z = 255;
+    public int f2379z = 255;
 
     public class b {
         public Canvas a;
         public Bitmap b;
 
         /* renamed from: c  reason: collision with root package name */
-        public float f2374c;
+        public float f2380c;
 
         public b(ColorPickerView colorPickerView, a aVar) {
         }
@@ -100,17 +100,17 @@ public class ColorPickerView extends View {
         this.m = c.i.a.f.e.o.c.z(getContext(), 2.0f);
         this.o = new Paint();
         this.p = new Paint();
-        this.f2370s = new Paint();
+        this.f2376s = new Paint();
         this.q = new Paint();
         this.r = new Paint();
         this.t = new Paint();
         this.p.setStyle(Paint.Style.STROKE);
         this.p.setStrokeWidth((float) c.i.a.f.e.o.c.z(getContext(), 2.0f));
         this.p.setAntiAlias(true);
-        this.f2370s.setColor(this.F);
-        this.f2370s.setStyle(Paint.Style.STROKE);
-        this.f2370s.setStrokeWidth((float) c.i.a.f.e.o.c.z(getContext(), 2.0f));
-        this.f2370s.setAntiAlias(true);
+        this.f2376s.setColor(this.F);
+        this.f2376s.setStyle(Paint.Style.STROKE);
+        this.f2376s.setStrokeWidth((float) c.i.a.f.e.o.c.z(getContext(), 2.0f));
+        this.f2376s.setAntiAlias(true);
         this.r.setColor(-14935012);
         this.r.setTextSize((float) c.i.a.f.e.o.c.z(getContext(), 14.0f));
         this.r.setAntiAlias(true);
@@ -181,7 +181,7 @@ public class ColorPickerView extends View {
             if (x3 >= i4) {
                 i = x3 > rect4.right ? width2 : x3 - i4;
             }
-            this.f2373z = 255 - ((i * 255) / width2);
+            this.f2379z = 255 - ((i * 255) / width2);
         }
         return true;
     }
@@ -191,7 +191,7 @@ public class ColorPickerView extends View {
         int alpha = Color.alpha(i);
         float[] fArr = new float[3];
         Color.RGBToHSV(Color.red(i), Color.green(i), Color.blue(i), fArr);
-        this.f2373z = alpha;
+        this.f2379z = alpha;
         float f = fArr[0];
         this.A = f;
         float f2 = fArr[1];
@@ -213,7 +213,7 @@ public class ColorPickerView extends View {
     }
 
     public int getColor() {
-        return Color.HSVToColor(this.f2373z, new float[]{this.A, this.B, this.C});
+        return Color.HSVToColor(this.f2379z, new float[]{this.A, this.B, this.C});
     }
 
     @Override // android.view.View
@@ -252,28 +252,28 @@ public class ColorPickerView extends View {
                 float f = (float) rect2.left;
                 this.u = new LinearGradient(f, (float) rect2.top, f, (float) rect2.bottom, -1, -16777216, Shader.TileMode.CLAMP);
             }
-            b bVar = this.f2371x;
-            if (bVar == null || bVar.f2374c != this.A) {
+            b bVar = this.f2377x;
+            if (bVar == null || bVar.f2380c != this.A) {
                 if (bVar == null) {
-                    this.f2371x = new b(this, null);
+                    this.f2377x = new b(this, null);
                 }
-                b bVar2 = this.f2371x;
+                b bVar2 = this.f2377x;
                 if (bVar2.b == null) {
                     bVar2.b = Bitmap.createBitmap(rect2.width(), rect2.height(), Bitmap.Config.ARGB_8888);
                 }
-                b bVar3 = this.f2371x;
+                b bVar3 = this.f2377x;
                 if (bVar3.a == null) {
-                    bVar3.a = new Canvas(this.f2371x.b);
+                    bVar3.a = new Canvas(this.f2377x.b);
                 }
                 int HSVToColor = Color.HSVToColor(new float[]{this.A, 1.0f, 1.0f});
                 float f2 = (float) rect2.top;
                 this.v = new LinearGradient((float) rect2.left, f2, (float) rect2.right, f2, -1, HSVToColor, Shader.TileMode.CLAMP);
                 this.o.setShader(new ComposeShader(this.u, this.v, PorterDuff.Mode.MULTIPLY));
-                b bVar4 = this.f2371x;
-                bVar4.a.drawRect(0.0f, 0.0f, (float) bVar4.b.getWidth(), (float) this.f2371x.b.getHeight(), this.o);
-                this.f2371x.f2374c = this.A;
+                b bVar4 = this.f2377x;
+                bVar4.a.drawRect(0.0f, 0.0f, (float) bVar4.b.getWidth(), (float) this.f2377x.b.getHeight(), this.o);
+                this.f2377x.f2380c = this.A;
             }
-            canvas.drawBitmap(this.f2371x.b, (Rect) null, rect2, (Paint) null);
+            canvas.drawBitmap(this.f2377x.b, (Rect) null, rect2, (Paint) null);
             float f3 = this.B;
             float f4 = this.C;
             Rect rect4 = this.I;
@@ -287,11 +287,11 @@ public class ColorPickerView extends View {
             Rect rect5 = this.J;
             this.t.setColor(this.G);
             canvas.drawRect((float) (rect5.left - 1), (float) (rect5.top - 1), (float) (rect5.right + 1), (float) (rect5.bottom + 1), this.t);
-            if (this.f2372y == null) {
+            if (this.f2378y == null) {
                 b bVar5 = new b(this, null);
-                this.f2372y = bVar5;
+                this.f2378y = bVar5;
                 bVar5.b = Bitmap.createBitmap(rect5.width(), rect5.height(), Bitmap.Config.ARGB_8888);
-                this.f2372y.a = new Canvas(this.f2372y.b);
+                this.f2378y.a = new Canvas(this.f2378y.b);
                 int height = (int) (((float) rect5.height()) + 0.5f);
                 int[] iArr = new int[height];
                 float f5 = 360.0f;
@@ -303,12 +303,12 @@ public class ColorPickerView extends View {
                 paint.setStrokeWidth(0.0f);
                 for (int i2 = 0; i2 < height; i2++) {
                     paint.setColor(iArr[i2]);
-                    b bVar6 = this.f2372y;
+                    b bVar6 = this.f2378y;
                     float f6 = (float) i2;
                     bVar6.a.drawLine(0.0f, f6, (float) bVar6.b.getWidth(), f6, paint);
                 }
             }
-            canvas.drawBitmap(this.f2372y.b, (Rect) null, rect5, (Paint) null);
+            canvas.drawBitmap(this.f2378y.b, (Rect) null, rect5, (Paint) null);
             float f7 = this.A;
             Rect rect6 = this.J;
             float height2 = (float) rect6.height();
@@ -324,7 +324,7 @@ public class ColorPickerView extends View {
             int i6 = this.n / 2;
             rectF.top = (float) (i5 - i6);
             rectF.bottom = (float) (i6 + i5);
-            canvas.drawRoundRect(rectF, 2.0f, 2.0f, this.f2370s);
+            canvas.drawRoundRect(rectF, 2.0f, 2.0f, this.f2376s);
             if (!(!this.D || (rect = this.K) == null || this.M == null)) {
                 this.t.setColor(this.G);
                 canvas.drawRect((float) (rect.left - 1), (float) (rect.top - 1), (float) (rect.right + 1), (float) (rect.bottom + 1), this.t);
@@ -341,7 +341,7 @@ public class ColorPickerView extends View {
                 if (str != null && !str.equals("")) {
                     canvas.drawText(this.E, (float) rect.centerX(), (float) (c.i.a.f.e.o.c.z(getContext(), 4.0f) + rect.centerY()), this.r);
                 }
-                int i7 = this.f2373z;
+                int i7 = this.f2379z;
                 Rect rect7 = this.K;
                 float width = (float) rect7.width();
                 Point point3 = new Point();
@@ -356,7 +356,7 @@ public class ColorPickerView extends View {
                 int i11 = this.m;
                 rectF2.top = (float) (i10 - i11);
                 rectF2.bottom = (float) (rect.bottom + i11);
-                canvas.drawRoundRect(rectF2, 2.0f, 2.0f, this.f2370s);
+                canvas.drawRoundRect(rectF2, 2.0f, 2.0f, this.f2376s);
             }
         }
     }
@@ -426,7 +426,7 @@ public class ColorPickerView extends View {
     public void onRestoreInstanceState(Parcelable parcelable) {
         if (parcelable instanceof Bundle) {
             Bundle bundle = (Bundle) parcelable;
-            this.f2373z = bundle.getInt("alpha");
+            this.f2379z = bundle.getInt("alpha");
             this.A = bundle.getFloat("hue");
             this.B = bundle.getFloat("sat");
             this.C = bundle.getFloat("val");
@@ -441,7 +441,7 @@ public class ColorPickerView extends View {
     public Parcelable onSaveInstanceState() {
         Bundle bundle = new Bundle();
         bundle.putParcelable("instanceState", super.onSaveInstanceState());
-        bundle.putInt("alpha", this.f2373z);
+        bundle.putInt("alpha", this.f2379z);
         bundle.putFloat("hue", this.A);
         bundle.putFloat("sat", this.B);
         bundle.putFloat("val", this.C);
@@ -462,8 +462,8 @@ public class ColorPickerView extends View {
         this.u = null;
         this.v = null;
         this.w = null;
-        this.f2371x = null;
-        this.f2372y = null;
+        this.f2377x = null;
+        this.f2378y = null;
         Rect rect2 = this.H;
         int i5 = rect2.left + 1;
         int i6 = rect2.top + 1;
@@ -505,7 +505,7 @@ public class ColorPickerView extends View {
         }
         c cVar = this.N;
         if (cVar != null) {
-            ((e) cVar).k(Color.HSVToColor(this.f2373z, new float[]{this.A, this.B, this.C}));
+            ((e) cVar).k(Color.HSVToColor(this.f2379z, new float[]{this.A, this.B, this.C}));
         }
         invalidate();
         return true;
@@ -526,8 +526,8 @@ public class ColorPickerView extends View {
             this.u = null;
             this.v = null;
             this.w = null;
-            this.f2372y = null;
-            this.f2371x = null;
+            this.f2378y = null;
+            this.f2377x = null;
             requestLayout();
         }
     }
@@ -547,7 +547,7 @@ public class ColorPickerView extends View {
 
     public void setSliderTrackerColor(int i) {
         this.F = i;
-        this.f2370s.setColor(i);
+        this.f2376s.setColor(i);
         invalidate();
     }
 }
diff --git a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
index 0d1663e394..5dc41ad00f 100644
--- a/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
+++ b/app/src/main/java/com/jaredrummler/android/colorpicker/ColorPreferenceCompat.java
@@ -26,7 +26,7 @@ public class ColorPreferenceCompat extends Preference implements g {
     public int[] r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2375s;
+    public int f2381s;
 
     public ColorPreferenceCompat(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
@@ -41,7 +41,7 @@ public class ColorPreferenceCompat extends Preference implements g {
         this.p = obtainStyledAttributes.getBoolean(R.f.ColorPreference_cpv_showColorShades, true);
         this.q = obtainStyledAttributes.getInt(R.f.ColorPreference_cpv_previewSize, 0);
         int resourceId = obtainStyledAttributes.getResourceId(R.f.ColorPreference_cpv_colorPresets, 0);
-        this.f2375s = obtainStyledAttributes.getResourceId(R.f.ColorPreference_cpv_dialogTitle, R.e.cpv_default_title);
+        this.f2381s = obtainStyledAttributes.getResourceId(R.f.ColorPreference_cpv_dialogTitle, R.e.cpv_default_title);
         if (resourceId != 0) {
             this.r = getContext().getResources().getIntArray(resourceId);
         } else {
@@ -99,7 +99,7 @@ public class ColorPreferenceCompat extends Preference implements g {
             int[] iArr = e.i;
             e.k kVar = new e.k();
             kVar.f = this.k;
-            kVar.a = this.f2375s;
+            kVar.a = this.f2381s;
             kVar.n = this.l;
             kVar.g = this.r;
             kVar.j = this.m;
diff --git a/app/src/main/java/com/linecorp/apng/decoder/Apng.java b/app/src/main/java/com/linecorp/apng/decoder/Apng.java
index 05e926b162..b5f6ee37ce 100644
--- a/app/src/main/java/com/linecorp/apng/decoder/Apng.java
+++ b/app/src/main/java/com/linecorp/apng/decoder/Apng.java
@@ -19,7 +19,7 @@ public final class Apng {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2376c;
+    public final int f2382c;
     public final int d;
     public final int e;
     public final int f;
@@ -150,7 +150,7 @@ public final class Apng {
 
     public Apng(int i, int i2, int i3, @IntRange(from = 1, to = 2147483647L) int i4, int[] iArr, @IntRange(from = 0, to = 2147483647L) int i5, @IntRange(from = 0, to = 2147483647L) long j) {
         m.checkNotNullParameter(iArr, "frameDurations");
-        this.f2376c = i;
+        this.f2382c = i;
         this.d = i2;
         this.e = i3;
         this.f = i4;
@@ -167,7 +167,7 @@ public final class Apng {
     }
 
     public static final /* synthetic */ int access$getId$p(Apng apng) {
-        return apng.f2376c;
+        return apng.f2382c;
     }
 
     public final Apng copy() {
@@ -179,7 +179,7 @@ public final class Apng {
         m.checkNotNullParameter(rect2, "dst");
         m.checkNotNullParameter(paint, "paint");
         Trace.beginSection("Apng#draw");
-        ApngDecoderJni.draw(this.f2376c, i, this.a);
+        ApngDecoderJni.draw(this.f2382c, i, this.a);
         Trace.endSection();
         canvas.drawBitmap(this.a, rect, rect2, paint);
     }
@@ -231,6 +231,6 @@ public final class Apng {
     }
 
     public final void recycle() {
-        ApngDecoderJni.recycle(this.f2376c);
+        ApngDecoderJni.recycle(this.f2382c);
     }
 }
diff --git a/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java b/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java
index af814ac0fe..2a724f2b8c 100644
--- a/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java
+++ b/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java
@@ -39,7 +39,7 @@ public final class AttachmentPreviewAdapter<T extends Attachment<? extends Objec
             this.o = bVar;
             Context context = a().getContext();
             m.checkNotNullExpressionValue(context, "imageView.context");
-            a().getHierarchy().o(DrawableCompat.getThemedDrawableRes$default(context, R.b.ic_flex_input_file, 0, 2, (Object) null));
+            a().getHierarchy().p(DrawableCompat.getThemedDrawableRes$default(context, R.b.ic_flex_input_file, 0, 2, (Object) null));
         }
 
         @Override // c.b.a.d.j
@@ -79,7 +79,7 @@ public final class AttachmentPreviewAdapter<T extends Attachment<? extends Objec
             int i2 = aVar.a().getLayoutParams().height;
             ImageRequestBuilder b = ImageRequestBuilder.b(t.getUri());
             b.d = f.a;
-            b.f2178c = new e(i2, i2);
+            b.f2184c = new e(i2, i2);
             d a2 = c.f.g.a.a.b.a();
             a2.n = aVar.a().getController();
             a2.m = true;
diff --git a/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java b/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
index 9341ee7e35..97b2710dfa 100644
--- a/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
+++ b/app/src/main/java/com/lytefast/flexinput/adapters/FileListAdapter.java
@@ -47,7 +47,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
     public List<? extends Attachment<? extends File>> b = n.emptyList();
 
     /* renamed from: c  reason: collision with root package name */
-    public final ContentResolver f2378c;
+    public final ContentResolver f2384c;
 
     /* compiled from: FileListAdapter.kt */
     public static final class a extends AsyncTask<File, Boolean, List<? extends Attachment<? extends File>>> {
@@ -101,7 +101,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
         public final AnimatorSet b;
 
         /* renamed from: c  reason: collision with root package name */
-        public SimpleDraweeView f2379c;
+        public SimpleDraweeView f2385c;
         public ImageView d;
         public TextView e;
         public TextView f;
@@ -169,7 +169,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             this.h = fileListAdapter;
             View findViewById = view.findViewById(R.e.thumb_iv);
             m.checkNotNullExpressionValue(findViewById, "itemView.findViewById(R.id.thumb_iv)");
-            this.f2379c = (SimpleDraweeView) findViewById;
+            this.f2385c = (SimpleDraweeView) findViewById;
             View findViewById2 = view.findViewById(R.e.type_iv);
             m.checkNotNullExpressionValue(findViewById2, "itemView.findViewById(R.id.type_iv)");
             this.d = (ImageView) findViewById2;
@@ -187,12 +187,12 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             Objects.requireNonNull(loadAnimator, "null cannot be cast to non-null type android.animation.AnimatorSet");
             AnimatorSet animatorSet = (AnimatorSet) loadAnimator;
             this.a = animatorSet;
-            animatorSet.setTarget(this.f2379c);
+            animatorSet.setTarget(this.f2385c);
             Animator loadAnimator2 = AnimatorInflater.loadAnimator(view.getContext(), R.a.selection_grow);
             Objects.requireNonNull(loadAnimator2, "null cannot be cast to non-null type android.animation.AnimatorSet");
             AnimatorSet animatorSet2 = (AnimatorSet) loadAnimator2;
             this.b = animatorSet2;
-            animatorSet2.setTarget(this.f2379c);
+            animatorSet2.setTarget(this.f2385c);
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:25:0x009d, code lost:
@@ -215,7 +215,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
          */
         public final void a(File file) {
             Bitmap thumbnail;
-            Cursor query = this.h.f2378c.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, new String[]{"_id", "mini_thumb_magic"}, "_data=?", new String[]{file.getPath()}, null);
+            Cursor query = this.h.f2384c.query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, new String[]{"_id", "mini_thumb_magic"}, "_data=?", new String[]{file.getPath()}, null);
             if (query == null) {
                 return;
             }
@@ -224,10 +224,10 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                 return;
             }
             long j = query.getLong(0);
-            if (query.getLong(1) == 0 && (thumbnail = MediaStore.Images.Thumbnails.getThumbnail(this.h.f2378c, j, 1, null)) != null) {
+            if (query.getLong(1) == 0 && (thumbnail = MediaStore.Images.Thumbnails.getThumbnail(this.h.f2384c, j, 1, null)) != null) {
                 thumbnail.recycle();
             }
-            Cursor query2 = this.h.f2378c.query(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, new String[]{"_id"}, "image_id=?", new String[]{String.valueOf(j)}, null);
+            Cursor query2 = this.h.f2384c.query(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, new String[]{"_id"}, "image_id=?", new String[]{String.valueOf(j)}, null);
             if (query2 != null) {
                 if (!query2.moveToFirst()) {
                     d0.y.b.closeFinally(query2, null);
@@ -235,9 +235,9 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                     return;
                 }
                 String string = query2.getString(0);
-                SimpleDraweeView simpleDraweeView = this.f2379c;
+                SimpleDraweeView simpleDraweeView = this.f2385c;
                 d a2 = c.f.g.a.a.b.a();
-                a2.n = this.f2379c.getController();
+                a2.n = this.f2385c.getController();
                 d f = a2.f(Uri.withAppendedPath(MediaStore.Images.Thumbnails.EXTERNAL_CONTENT_URI, string));
                 f.l = true;
                 simpleDraweeView.setController(f.a());
@@ -252,10 +252,10 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             view.setSelected(z2);
             C0187b bVar = new C0187b(z3);
             if (z2) {
-                if (this.f2379c.getScaleX() == 1.0f) {
+                if (this.f2385c.getScaleX() == 1.0f) {
                     bVar.a(this.a);
                 }
-            } else if (this.f2379c.getScaleX() != 1.0f) {
+            } else if (this.f2385c.getScaleX() != 1.0f) {
                 bVar.a(this.b);
             }
         }
@@ -264,7 +264,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
     public FileListAdapter(ContentResolver contentResolver, SelectionCoordinator<?, Attachment<File>> selectionCoordinator) {
         m.checkNotNullParameter(contentResolver, "contentResolver");
         m.checkNotNullParameter(selectionCoordinator, "selectionCoordinator");
-        this.f2378c = contentResolver;
+        this.f2384c = contentResolver;
         Objects.requireNonNull(selectionCoordinator);
         m.checkNotNullParameter(this, "adapter");
         selectionCoordinator.a = this;
@@ -312,7 +312,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
             bVar2.e.setText((CharSequence) null);
             bVar2.f.setText((CharSequence) null);
         }
-        SimpleDraweeView simpleDraweeView = bVar2.f2379c;
+        SimpleDraweeView simpleDraweeView = bVar2.f2385c;
         simpleDraweeView.setImageURI((Uri) null, simpleDraweeView.getContext());
         bVar2.d.setVisibility(8);
         boolean z2 = true;
@@ -329,7 +329,7 @@ public final class FileListAdapter extends RecyclerView.Adapter<b> {
                     z2 = false;
                 }
                 if (z2) {
-                    bVar2.f2379c.setImageURI(Uri.fromFile(file), bVar2.f2379c.getContext());
+                    bVar2.f2385c.setImageURI(Uri.fromFile(file), bVar2.f2385c.getContext());
                     if (t.startsWith$default(str, "image", false, 2, null)) {
                         ImageView imageView = bVar2.d;
                         imageView.setImageResource(DrawableCompat.getThemedDrawableRes$default(imageView, R.b.ic_flex_input_image, 0, 2, (Object) null));
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java
index d75c76af70..add6754a47 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/CameraFragment.java
@@ -194,7 +194,7 @@ public class CameraFragment extends Fragment {
                 if (cameraView8 == null) {
                     m.throwUninitializedPropertyAccessException("cameraView");
                 }
-                cameraView8.f2386x.O0(new l.a());
+                cameraView8.f2392x.O0(new l.a());
             }
         }
     }
@@ -501,7 +501,7 @@ public class CameraFragment extends Fragment {
                 inflate.findViewById(R.e.permissions_required_action_btn).setOnClickListener(new c(this));
                 View findViewById = inflate.findViewById(R.e.permissions_required_text);
                 m.checkNotNullExpressionValue(findViewById, "view.findViewById<TextVi…ermissions_required_text)");
-                c.a.l.b.n((TextView) findViewById, R.g.system_permission_request_camera, new Object[0], null, 4);
+                c.a.l.b.m((TextView) findViewById, R.g.system_permission_request_camera, new Object[0], null, 4);
                 return;
             }
             ViewStub viewStub4 = this.l;
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
index a81dd71f13..9239577a6e 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/FilesFragment.java
@@ -230,7 +230,7 @@ public class FilesFragment extends Fragment {
     public void onDestroyView() {
         SelectionCoordinator<Attachment<Object>, Attachment<File>> selectionCoordinator = this.selectionCoordinator;
         if (selectionCoordinator != null) {
-            selectionCoordinator.f2383c.unregister();
+            selectionCoordinator.f2389c.unregister();
         }
         super.onDestroyView();
     }
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java
index 8e5ec1641f..2675cbfaf1 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/FlexInputFragment.java
@@ -74,7 +74,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
     public FlexInputViewModel r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Subscription f2380s;
+    public Subscription f2386s;
     public Subscription t;
     public Subscription u;
     public final List<Function0<Unit>> v = new ArrayList();
@@ -286,7 +286,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                 if (flexInputState2.e) {
                     String str = flexInputState2.a;
                     Objects.requireNonNull(str, "null cannot be cast to non-null type kotlin.CharSequence");
-                    if ((w.trim(str).toString().length() > 0) || flexInputState2.f2384c.size() > 0) {
+                    if ((w.trim(str).toString().length() > 0) || flexInputState2.f2390c.size() > 0) {
                         z2 = true;
                         ImageView imageView = flexInputFragment.j().p;
                         m.checkNotNullExpressionValue(imageView, "binding.sendBtnImage");
@@ -294,7 +294,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                         FrameLayout frameLayout = flexInputFragment.j().o;
                         m.checkNotNullExpressionValue(frameLayout, "binding.sendBtnContainer");
                         frameLayout.setEnabled(z2);
-                        boolean z4 = !(flexInputState2.a.length() <= 0) || flexInputState2.f2384c.size() > 0;
+                        boolean z4 = !(flexInputState2.a.length() <= 0) || flexInputState2.f2390c.size() > 0;
                         FrameLayout frameLayout2 = flexInputFragment.j().o;
                         m.checkNotNullExpressionValue(frameLayout2, "binding.sendBtnContainer");
                         frameLayout2.setVisibility(!z4 ? 0 : 8);
@@ -307,7 +307,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                         LinearLayout linearLayout2 = flexInputFragment.j().n;
                         m.checkNotNullExpressionValue(linearLayout2, "binding.mainInputContainer");
                         linearLayout2.setLayoutParams(layoutParams2);
-                        if (flexInputState2.f2384c.isEmpty()) {
+                        if (flexInputState2.f2390c.isEmpty()) {
                             AttachmentPreviewAdapter<Attachment<Object>> attachmentPreviewAdapter = flexInputFragment.p;
                             if (attachmentPreviewAdapter == null) {
                                 m.throwUninitializedPropertyAccessException("attachmentPreviewAdapter");
@@ -317,7 +317,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                         }
                         LinearLayout linearLayout3 = flexInputFragment.j().f243c;
                         m.checkNotNullExpressionValue(linearLayout3, "binding.attachmentPreviewContainer");
-                        linearLayout3.setVisibility((flexInputState2.f2384c.size() > 0 || !flexInputState2.e) ? 8 : 0);
+                        linearLayout3.setVisibility((flexInputState2.f2390c.size() > 0 || !flexInputState2.e) ? 8 : 0);
                         AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().l;
                         m.checkNotNullExpressionValue(appCompatImageButton4, "binding.galleryBtn");
                         ViewExtensions.setEnabledAlpha$default(appCompatImageButton4, !flexInputState2.e && flexInputState2.f, 0.0f, 2, null);
@@ -374,11 +374,11 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
                 LinearLayout linearLayout2 = flexInputFragment.j().n;
                 m.checkNotNullExpressionValue(linearLayout2, "binding.mainInputContainer");
                 linearLayout2.setLayoutParams(layoutParams2);
-                if (flexInputState2.f2384c.isEmpty()) {
+                if (flexInputState2.f2390c.isEmpty()) {
                 }
                 LinearLayout linearLayout3 = flexInputFragment.j().f243c;
                 m.checkNotNullExpressionValue(linearLayout3, "binding.attachmentPreviewContainer");
-                linearLayout3.setVisibility((flexInputState2.f2384c.size() > 0 || !flexInputState2.e) ? 8 : 0);
+                linearLayout3.setVisibility((flexInputState2.f2390c.size() > 0 || !flexInputState2.e) ? 8 : 0);
                 AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().l;
                 m.checkNotNullExpressionValue(appCompatImageButton4, "binding.galleryBtn");
                 ViewExtensions.setEnabledAlpha$default(appCompatImageButton4, !flexInputState2.e && flexInputState2.f, 0.0f, 2, null);
@@ -528,7 +528,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
         SelectionCoordinator<Attachment<Object>, ?> selectionCoordinator = new SelectionCoordinator<>(null, null, 3);
         b().registerSelectionCoordinator(selectionCoordinator);
         selectionCoordinator.c(attachment, 0);
-        selectionCoordinator.f2383c.unregister();
+        selectionCoordinator.f2389c.unregister();
         FlexInputViewModel flexInputViewModel = this.r;
         if (flexInputViewModel != null) {
             flexInputViewModel.onAttachmentsUpdated(b().getAttachments());
@@ -606,7 +606,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
         if (flexInputViewModel != null) {
             flexInputViewModel.onFlexInputFragmentPause();
         }
-        Subscription subscription = this.f2380s;
+        Subscription subscription = this.f2386s;
         if (subscription != null) {
             subscription.unsubscribe();
         }
@@ -626,10 +626,10 @@ public class FlexInputFragment extends Fragment implements c.b.a.b<Object> {
         super.onResume();
         FlexInputViewModel flexInputViewModel = this.r;
         if (flexInputViewModel != null) {
-            this.f2380s = flexInputViewModel.observeState().s().W(new c.b.a.a.n(new d(this)));
+            this.f2386s = flexInputViewModel.observeState().r().V(new c.b.a.a.n(new d(this)));
             FlexInputViewModel flexInputViewModel2 = this.r;
             if (flexInputViewModel2 != null) {
-                this.t = flexInputViewModel2.observeEvents().W(new c.b.a.a.n(new e(this)));
+                this.t = flexInputViewModel2.observeEvents().V(new c.b.a.a.n(new e(this)));
             }
         }
     }
diff --git a/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java b/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
index c8f53c8cd3..b6639d6073 100644
--- a/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
+++ b/app/src/main/java/com/lytefast/flexinput/fragment/MediaFragment.java
@@ -99,19 +99,19 @@ public class MediaFragment extends Fragment {
         public final /* synthetic */ i b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ MediaFragment f2381c;
+        public final /* synthetic */ MediaFragment f2387c;
         public final /* synthetic */ c.b.a.b d;
 
         public b(View view, i iVar, MediaFragment mediaFragment, c.b.a.b bVar) {
             this.a = view;
             this.b = iVar;
-            this.f2381c = mediaFragment;
+            this.f2387c = mediaFragment;
             this.d = bVar;
         }
 
         @Override // androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
         public final void onRefresh() {
-            if (MediaFragment.access$hasPermissions(this.f2381c, "android.permission.READ_EXTERNAL_STORAGE")) {
+            if (MediaFragment.access$hasPermissions(this.f2387c, "android.permission.READ_EXTERNAL_STORAGE")) {
                 i iVar = this.b;
                 Context context = this.a.getContext();
                 m.checkNotNullExpressionValue(context, "context");
@@ -119,7 +119,7 @@ public class MediaFragment extends Fragment {
                 m.checkNotNullExpressionValue(contentResolver, "context.contentResolver");
                 iVar.b(contentResolver);
             }
-            SwipeRefreshLayout access$getSwipeRefreshLayout$p = MediaFragment.access$getSwipeRefreshLayout$p(this.f2381c);
+            SwipeRefreshLayout access$getSwipeRefreshLayout$p = MediaFragment.access$getSwipeRefreshLayout$p(this.f2387c);
             if (access$getSwipeRefreshLayout$p != null) {
                 access$getSwipeRefreshLayout$p.setRefreshing(false);
             }
@@ -219,7 +219,7 @@ public class MediaFragment extends Fragment {
     public void onDestroyView() {
         SelectionCoordinator<Attachment<Object>, Media> selectionCoordinator = this.selectionCoordinator;
         m.checkNotNull(selectionCoordinator);
-        selectionCoordinator.f2383c.unregister();
+        selectionCoordinator.f2389c.unregister();
         super.onDestroyView();
     }
 
diff --git a/app/src/main/java/com/lytefast/flexinput/model/Attachment.java b/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
index 7ace23c989..20969e2813 100644
--- a/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
+++ b/app/src/main/java/com/lytefast/flexinput/model/Attachment.java
@@ -22,7 +22,7 @@ public class Attachment<T> implements Parcelable {
     private final String displayName;
 
     /* renamed from: id  reason: collision with root package name */
-    private final long f2382id;
+    private final long f2388id;
     private final Uri uri;
 
     /* compiled from: Attachment.kt */
@@ -156,7 +156,7 @@ public class Attachment<T> implements Parcelable {
     public Attachment(long j, Uri uri, String str, T t) {
         m.checkNotNullParameter(uri, "uri");
         m.checkNotNullParameter(str, "displayName");
-        this.f2382id = j;
+        this.f2388id = j;
         this.uri = uri;
         this.displayName = str;
         this.data = t;
@@ -201,7 +201,7 @@ public class Attachment<T> implements Parcelable {
             return false;
         }
         Attachment attachment = (Attachment) obj;
-        return this.f2382id == attachment.f2382id && m.areEqual(this.uri, attachment.uri);
+        return this.f2388id == attachment.f2388id && m.areEqual(this.uri, attachment.uri);
     }
 
     public final T getData() {
@@ -213,7 +213,7 @@ public class Attachment<T> implements Parcelable {
     }
 
     public final long getId() {
-        return this.f2382id;
+        return this.f2388id;
     }
 
     public final Uri getUri() {
@@ -222,14 +222,14 @@ public class Attachment<T> implements Parcelable {
 
     @Override // java.lang.Object
     public int hashCode() {
-        return AnimatableValueParser.W0(Long.valueOf(this.f2382id), this.uri);
+        return AnimatableValueParser.W0(Long.valueOf(this.f2388id), this.uri);
     }
 
     @Override // android.os.Parcelable
     @CallSuper
     public void writeToParcel(Parcel parcel, int i) {
         m.checkNotNullParameter(parcel, "dest");
-        parcel.writeLong(this.f2382id);
+        parcel.writeLong(this.f2388id);
         parcel.writeParcelable(this.uri, i);
         parcel.writeString(this.displayName);
     }
diff --git a/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java b/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
index d645948d8b..cd5bd72f82 100644
--- a/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
+++ b/app/src/main/java/com/lytefast/flexinput/utils/SelectionAggregator.java
@@ -233,7 +233,7 @@ public class SelectionAggregator<T extends Attachment<? extends Object>> {
         a aVar = new a(this, selectionCoordinator);
         Objects.requireNonNull(selectionCoordinator);
         m.checkNotNullParameter(aVar, "<set-?>");
-        selectionCoordinator.f2383c = aVar;
+        selectionCoordinator.f2389c = aVar;
         this.childSelectionCoordinators.add(selectionCoordinator);
     }
 
diff --git a/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java b/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
index d6f6b9fd09..af9d504c23 100644
--- a/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
+++ b/app/src/main/java/com/lytefast/flexinput/utils/SelectionCoordinator.java
@@ -14,7 +14,7 @@ public class SelectionCoordinator<I, T extends I> {
     public final ArrayMap<T, Integer> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public ItemSelectionListener<? super I> f2383c;
+    public ItemSelectionListener<? super I> f2389c;
 
     /* compiled from: SelectionCoordinator.kt */
     public interface ItemSelectionListener<I> {
@@ -87,7 +87,7 @@ public class SelectionCoordinator<I, T extends I> {
         m.checkNotNullParameter(arrayMap2, "selectedItemPositionMap");
         m.checkNotNullParameter(bVar, "itemSelectionListener");
         this.b = arrayMap2;
-        this.f2383c = bVar;
+        this.f2389c = bVar;
     }
 
     public final boolean a(T t, int i) {
@@ -126,7 +126,7 @@ public class SelectionCoordinator<I, T extends I> {
         if (adapter != null) {
             adapter.notifyItemChanged(i, new a(t, true));
         }
-        this.f2383c.onItemSelected(t);
+        this.f2389c.onItemSelected(t);
     }
 
     public final boolean d(I i) {
@@ -141,7 +141,7 @@ public class SelectionCoordinator<I, T extends I> {
         if (adapter != null) {
             adapter.notifyItemChanged(intValue, new a(i, false));
         }
-        this.f2383c.onItemUnselected(i);
+        this.f2389c.onItemUnselected(i);
         return true;
     }
 }
diff --git a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
index 67eb0cd1b9..3dbd3c90d8 100644
--- a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
+++ b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java
@@ -12,7 +12,7 @@ public final class FlexInputState {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<Attachment<Object>> f2384c;
+    public final List<Attachment<Object>> f2390c;
     public final Integer d;
     public final boolean e;
     public final boolean f;
@@ -31,7 +31,7 @@ public final class FlexInputState {
         m.checkNotNullParameter(list, "attachments");
         this.a = str;
         this.b = z2;
-        this.f2384c = list;
+        this.f2390c = list;
         this.d = num;
         this.e = z3;
         this.f = z4;
@@ -49,7 +49,7 @@ public final class FlexInputState {
     public static FlexInputState a(FlexInputState flexInputState, String str, boolean z2, List list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, int i) {
         String str2 = (i & 1) != 0 ? flexInputState.a : str;
         boolean z8 = (i & 2) != 0 ? flexInputState.b : z2;
-        List list2 = (i & 4) != 0 ? flexInputState.f2384c : list;
+        List list2 = (i & 4) != 0 ? flexInputState.f2390c : list;
         Integer num2 = (i & 8) != 0 ? flexInputState.d : num;
         boolean z9 = (i & 16) != 0 ? flexInputState.e : z3;
         boolean z10 = (i & 32) != 0 ? flexInputState.f : z4;
@@ -70,7 +70,7 @@ public final class FlexInputState {
             return false;
         }
         FlexInputState flexInputState = (FlexInputState) obj;
-        return m.areEqual(this.a, flexInputState.a) && this.b == flexInputState.b && m.areEqual(this.f2384c, flexInputState.f2384c) && m.areEqual(this.d, flexInputState.d) && this.e == flexInputState.e && this.f == flexInputState.f && this.g == flexInputState.g && this.h == flexInputState.h && this.i == flexInputState.i;
+        return m.areEqual(this.a, flexInputState.a) && this.b == flexInputState.b && m.areEqual(this.f2390c, flexInputState.f2390c) && m.areEqual(this.d, flexInputState.d) && this.e == flexInputState.e && this.f == flexInputState.f && this.g == flexInputState.g && this.h == flexInputState.h && this.i == flexInputState.i;
     }
 
     public int hashCode() {
@@ -86,7 +86,7 @@ public final class FlexInputState {
         int i4 = z2 ? 1 : 0;
         int i5 = z2 ? 1 : 0;
         int i6 = (hashCode + i3) * 31;
-        List<Attachment<Object>> list = this.f2384c;
+        List<Attachment<Object>> list = this.f2390c;
         int hashCode2 = (i6 + (list != null ? list.hashCode() : 0)) * 31;
         Integer num = this.d;
         if (num != null) {
@@ -138,7 +138,7 @@ public final class FlexInputState {
         L.append(", showExpandedButtons=");
         L.append(this.b);
         L.append(", attachments=");
-        L.append(this.f2384c);
+        L.append(this.f2390c);
         L.append(", showContentDialogIndex=");
         L.append(this.d);
         L.append(", ableToSendMessages=");
diff --git a/app/src/main/java/com/otaliastudios/cameraview/CameraView.java b/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
index b87e3c8893..56bc6a8d77 100644
--- a/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
+++ b/app/src/main/java/com/otaliastudios/cameraview/CameraView.java
@@ -88,7 +88,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Handler f2385s;
+    public Handler f2391s;
     public Executor t;
     @VisibleForTesting
     public b u;
@@ -96,13 +96,13 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     public c.o.a.r.f w;
 
     /* renamed from: x  reason: collision with root package name */
-    public i f2386x;
+    public i f2392x;
 
     /* renamed from: y  reason: collision with root package name */
-    public c.o.a.x.b f2387y;
+    public c.o.a.x.b f2393y;
 
     /* renamed from: z  reason: collision with root package name */
-    public MediaActionSound f2388z;
+    public MediaActionSound f2394z;
 
     public class a implements ThreadFactory {
         public final AtomicInteger i = new AtomicInteger(1);
@@ -252,10 +252,10 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                 CameraView cameraView;
                 boolean z2;
                 if (this.i && (z2 = (cameraView = CameraView.this).k) && z2) {
-                    if (cameraView.f2388z == null) {
-                        cameraView.f2388z = new MediaActionSound();
+                    if (cameraView.f2394z == null) {
+                        cameraView.f2394z = new MediaActionSound();
                     }
-                    cameraView.f2388z.play(1);
+                    cameraView.f2394z.play(1);
                 }
                 c.o.a.s.a aVar = CameraView.this.A;
                 if (aVar != null) {
@@ -275,7 +275,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
         public void a(CameraException cameraException) {
             this.b.a(1, "dispatchError", cameraException);
-            CameraView.this.f2385s.post(new d(cameraException));
+            CameraView.this.f2391s.post(new d(cameraException));
         }
 
         public void b(@NonNull c.o.a.p.b bVar) {
@@ -289,22 +289,22 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
         public void c(float f2, @NonNull float[] fArr, @Nullable PointF[] pointFArr) {
             this.b.a(1, "dispatchOnExposureCorrectionChanged", Float.valueOf(f2));
-            CameraView.this.f2385s.post(new RunnableC0190b(f2, fArr, pointFArr));
+            CameraView.this.f2391s.post(new RunnableC0190b(f2, fArr, pointFArr));
         }
 
         public void d(@Nullable c.o.a.q.a aVar, boolean z2, @NonNull PointF pointF) {
             this.b.a(1, "dispatchOnFocusEnd", aVar, Boolean.valueOf(z2), pointF);
-            CameraView.this.f2385s.post(new g(z2, aVar, pointF));
+            CameraView.this.f2391s.post(new g(z2, aVar, pointF));
         }
 
         public void e(@Nullable c.o.a.q.a aVar, @NonNull PointF pointF) {
             this.b.a(1, "dispatchOnFocusStart", aVar, pointF);
-            CameraView.this.f2385s.post(new f(pointF, aVar));
+            CameraView.this.f2391s.post(new f(pointF, aVar));
         }
 
         public void f(float f2, @Nullable PointF[] pointFArr) {
             this.b.a(1, "dispatchOnZoomChanged", Float.valueOf(f2));
-            CameraView.this.f2385s.post(new a(f2, pointFArr));
+            CameraView.this.f2391s.post(new a(f2, pointFArr));
         }
 
         @NonNull
@@ -313,14 +313,14 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         }
 
         public void h() {
-            c.o.a.x.b C = CameraView.this.f2386x.C(c.o.a.n.t.b.VIEW);
+            c.o.a.x.b C = CameraView.this.f2392x.C(c.o.a.n.t.b.VIEW);
             if (C == null) {
                 throw new RuntimeException("Preview stream size should not be null here.");
-            } else if (C.equals(CameraView.this.f2387y)) {
+            } else if (C.equals(CameraView.this.f2393y)) {
                 this.b.a(1, "onCameraPreviewStreamSizeChanged:", "swallowing because the preview size has not changed.", C);
             } else {
                 this.b.a(1, "onCameraPreviewStreamSizeChanged: posting a requestLayout call.", "Preview stream size:", C);
-                CameraView.this.f2385s.post(new e());
+                CameraView.this.f2391s.post(new e());
             }
         }
     }
@@ -495,7 +495,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             }
             obtainStyledAttributes.recycle();
             this.u = new b();
-            this.f2385s = new Handler(Looper.getMainLooper());
+            this.f2391s = new Handler(Looper.getMainLooper());
             this.E = new e(this.u);
             this.F = new g(this.u);
             this.G = new c.o.a.q.f(this.u);
@@ -618,13 +618,13 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         } else {
             iVar = new c.o.a.n.d(bVar2);
         }
-        this.f2386x = iVar;
+        this.f2392x = iVar;
         bVar.a(2, "doInstantiateEngine:", "instantiated. engine:", iVar.getClass().getSimpleName());
-        this.f2386x.o0(this.L);
+        this.f2392x.o0(this.L);
     }
 
     public final boolean c() {
-        i iVar = this.f2386x;
+        i iVar = this.f2392x;
         return iVar.m.f == c.o.a.n.v.e.OFF && !iVar.O();
     }
 
@@ -639,7 +639,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                 fVar.g = -1;
                 fVar.e = -1;
             }
-            this.f2386x.L0(false);
+            this.f2392x.L0(false);
             c.o.a.w.a aVar = this.v;
             if (aVar != null) {
                 aVar.p();
@@ -648,9 +648,9 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public boolean d() {
-        c.o.a.n.v.e eVar = this.f2386x.m.f;
+        c.o.a.n.v.e eVar = this.f2392x.m.f;
         c.o.a.n.v.e eVar2 = c.o.a.n.v.e.ENGINE;
-        return eVar.f(eVar2) && this.f2386x.m.g.f(eVar2);
+        return eVar.f(eVar2) && this.f2392x.m.g.f(eVar2);
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
@@ -660,9 +660,9 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             boolean z2 = this.C.size() > 0;
             this.C.clear();
             if (z2) {
-                this.f2386x.k0(false);
+                this.f2392x.k0(false);
             }
-            this.f2386x.d(true, 0);
+            this.f2392x.d(true, 0);
             c.o.a.w.a aVar = this.v;
             if (aVar != null) {
                 aVar.o();
@@ -716,7 +716,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     public final void g(@NonNull c.o.a.q.c cVar, @NonNull c.o.a.c cVar2) {
         c.o.a.q.a aVar = cVar.b;
-        PointF[] pointFArr = cVar.f1502c;
+        PointF[] pointFArr = cVar.f1497c;
         switch (this.n.get(aVar).ordinal()) {
             case 1:
                 float width = (float) getWidth();
@@ -738,29 +738,29 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                     rectF2.set(Math.max(rectF.left, aVar2.i.left), Math.max(rectF.top, aVar2.i.top), Math.min(rectF.right, aVar2.i.right), Math.min(rectF.bottom, aVar2.i.bottom));
                     arrayList2.add(new c.o.a.t.a(rectF2, aVar2.j));
                 }
-                this.f2386x.I0(aVar, new c.o.a.t.b(arrayList2), pointFArr[0]);
+                this.f2392x.I0(aVar, new c.o.a.t.b(arrayList2), pointFArr[0]);
                 return;
             case 2:
-                this.f2386x.O0(new l.a());
+                this.f2392x.O0(new l.a());
                 return;
             case 3:
-                this.f2386x.P0(new l.a());
+                this.f2392x.P0(new l.a());
                 return;
             case 4:
-                float N = this.f2386x.N();
+                float N = this.f2392x.N();
                 float a3 = cVar.a(N, 0.0f, 1.0f);
                 if (a3 != N) {
-                    this.f2386x.G0(a3, pointFArr, true);
+                    this.f2392x.G0(a3, pointFArr, true);
                     return;
                 }
                 return;
             case 5:
-                float k = this.f2386x.k();
+                float k = this.f2392x.k();
                 float f = cVar2.m;
                 float f2 = cVar2.n;
                 float a4 = cVar.a(k, f, f2);
                 if (a4 != k) {
-                    this.f2386x.d0(a4, new float[]{f, f2}, pointFArr, true);
+                    this.f2392x.d0(a4, new float[]{f, f2}, pointFArr, true);
                     return;
                 }
                 return;
@@ -815,25 +815,25 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @NonNull
     public c.o.a.m.a getAudio() {
-        return this.f2386x.f();
+        return this.f2392x.f();
     }
 
     public int getAudioBitRate() {
-        return this.f2386x.g();
+        return this.f2392x.g();
     }
 
     @NonNull
     public c.o.a.m.b getAudioCodec() {
-        return this.f2386x.h();
+        return this.f2392x.h();
     }
 
     public long getAutoFocusResetDelay() {
-        return this.f2386x.i();
+        return this.f2392x.i();
     }
 
     @Nullable
     public c.o.a.c getCameraOptions() {
-        return this.f2386x.j();
+        return this.f2392x.j();
     }
 
     @NonNull
@@ -842,12 +842,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public float getExposureCorrection() {
-        return this.f2386x.k();
+        return this.f2392x.k();
     }
 
     @NonNull
     public c.o.a.m.e getFacing() {
-        return this.f2386x.l();
+        return this.f2392x.l();
     }
 
     @NonNull
@@ -866,7 +866,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @NonNull
     public c.o.a.m.f getFlash() {
-        return this.f2386x.m();
+        return this.f2392x.m();
     }
 
     public int getFrameProcessingExecutors() {
@@ -874,19 +874,19 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public int getFrameProcessingFormat() {
-        return this.f2386x.n();
+        return this.f2392x.n();
     }
 
     public int getFrameProcessingMaxHeight() {
-        return this.f2386x.o();
+        return this.f2392x.o();
     }
 
     public int getFrameProcessingMaxWidth() {
-        return this.f2386x.p();
+        return this.f2392x.p();
     }
 
     public int getFrameProcessingPoolSize() {
-        return this.f2386x.q();
+        return this.f2392x.q();
     }
 
     @NonNull
@@ -900,35 +900,35 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @NonNull
     public h getHdr() {
-        return this.f2386x.r();
+        return this.f2392x.r();
     }
 
     @Nullable
     public Location getLocation() {
-        return this.f2386x.s();
+        return this.f2392x.s();
     }
 
     @NonNull
     public c.o.a.m.i getMode() {
-        return this.f2386x.t();
+        return this.f2392x.t();
     }
 
     @NonNull
     public j getPictureFormat() {
-        return this.f2386x.u();
+        return this.f2392x.u();
     }
 
     public boolean getPictureMetering() {
-        return this.f2386x.v();
+        return this.f2392x.v();
     }
 
     @Nullable
     public c.o.a.x.b getPictureSize() {
-        return this.f2386x.w(c.o.a.n.t.b.OUTPUT);
+        return this.f2392x.w(c.o.a.n.t.b.OUTPUT);
     }
 
     public boolean getPictureSnapshotMetering() {
-        return this.f2386x.y();
+        return this.f2392x.y();
     }
 
     public boolean getPlaySounds() {
@@ -941,26 +941,26 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public float getPreviewFrameRate() {
-        return this.f2386x.A();
+        return this.f2392x.A();
     }
 
     public boolean getPreviewFrameRateExact() {
-        return this.f2386x.B();
+        return this.f2392x.B();
     }
 
     public int getSnapshotMaxHeight() {
-        return this.f2386x.D();
+        return this.f2392x.D();
     }
 
     public int getSnapshotMaxWidth() {
-        return this.f2386x.E();
+        return this.f2392x.E();
     }
 
     @Nullable
     public c.o.a.x.b getSnapshotSize() {
         c.o.a.x.b bVar = null;
         if (!(getWidth() == 0 || getHeight() == 0)) {
-            i iVar = this.f2386x;
+            i iVar = this.f2392x;
             c.o.a.n.t.b bVar2 = c.o.a.n.t.b.VIEW;
             c.o.a.x.b F = iVar.F(bVar2);
             if (F == null) {
@@ -968,7 +968,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             }
             Rect v = c.i.a.f.e.o.c.v(F, c.o.a.x.a.f(getWidth(), getHeight()));
             bVar = new c.o.a.x.b(v.width(), v.height());
-            if (this.f2386x.e().b(bVar2, c.o.a.n.t.b.OUTPUT)) {
+            if (this.f2392x.e().b(bVar2, c.o.a.n.t.b.OUTPUT)) {
                 return bVar.f();
             }
         }
@@ -980,34 +980,34 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public int getVideoBitRate() {
-        return this.f2386x.G();
+        return this.f2392x.G();
     }
 
     @NonNull
     public c.o.a.m.l getVideoCodec() {
-        return this.f2386x.H();
+        return this.f2392x.H();
     }
 
     public int getVideoMaxDuration() {
-        return this.f2386x.I();
+        return this.f2392x.I();
     }
 
     public long getVideoMaxSize() {
-        return this.f2386x.J();
+        return this.f2392x.J();
     }
 
     @Nullable
     public c.o.a.x.b getVideoSize() {
-        return this.f2386x.K(c.o.a.n.t.b.OUTPUT);
+        return this.f2392x.K(c.o.a.n.t.b.OUTPUT);
     }
 
     @NonNull
     public m getWhiteBalance() {
-        return this.f2386x.M();
+        return this.f2392x.M();
     }
 
     public float getZoom() {
-        return this.f2386x.N();
+        return this.f2392x.N();
     }
 
     @Override // android.view.View, android.view.ViewGroup
@@ -1030,7 +1030,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             }
             this.v = aVar;
             bVar.a(2, "doInstantiateEngine:", "instantiated. preview:", aVar.getClass().getSimpleName());
-            this.f2386x.u0(this.v);
+            this.f2392x.u0(this.v);
             c.o.a.o.b bVar2 = this.q;
             if (bVar2 != null) {
                 setFilter(bVar2);
@@ -1041,7 +1041,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @Override // android.view.View, android.view.ViewGroup
     public void onDetachedFromWindow() {
-        this.f2387y = null;
+        this.f2393y = null;
         super.onDetachedFromWindow();
     }
 
@@ -1056,8 +1056,8 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             super.onMeasure(View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i2), 1073741824), View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(i3), 1073741824));
             return;
         }
-        c.o.a.x.b C = this.f2386x.C(c.o.a.n.t.b.VIEW);
-        this.f2387y = C;
+        c.o.a.x.b C = this.f2392x.C(c.o.a.n.t.b.VIEW);
+        this.f2393y = C;
         if (C == null) {
             j.a(2, "onMeasure:", "surface is not ready. Calling default behavior.");
             super.onMeasure(i2, i3);
@@ -1067,7 +1067,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         int mode2 = View.MeasureSpec.getMode(i3);
         int size = View.MeasureSpec.getSize(i2);
         int size2 = View.MeasureSpec.getSize(i3);
-        c.o.a.x.b bVar = this.f2387y;
+        c.o.a.x.b bVar = this.f2393y;
         float f = (float) bVar.i;
         float f2 = (float) bVar.j;
         ViewGroup.LayoutParams layoutParams = getLayoutParams();
@@ -1140,7 +1140,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         if (!d()) {
             return true;
         }
-        c.o.a.c j2 = this.f2386x.j();
+        c.o.a.c j2 = this.f2392x.j();
         if (j2 != null) {
             e eVar = this.E;
             if (!eVar.a ? false : eVar.c(motionEvent)) {
@@ -1179,12 +1179,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
                     ((DisplayManager) fVar.b.getSystemService("display")).registerDisplayListener(fVar.f, fVar.a);
                     fVar.d.enable();
                 }
-                c.o.a.n.t.a e = this.f2386x.e();
+                c.o.a.n.t.a e = this.f2392x.e();
                 int i2 = this.w.g;
                 e.e(i2);
                 e.d = i2;
                 e.d();
-                this.f2386x.H0();
+                this.f2392x.H0();
             }
         }
     }
@@ -1232,20 +1232,20 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     public void setAudio(@NonNull c.o.a.m.a aVar) {
         if (aVar == getAudio() || c()) {
-            this.f2386x.Z(aVar);
+            this.f2392x.Z(aVar);
         } else if (a(aVar)) {
-            this.f2386x.Z(aVar);
+            this.f2392x.Z(aVar);
         } else {
             close();
         }
     }
 
     public void setAudioBitRate(int i2) {
-        this.f2386x.a0(i2);
+        this.f2392x.a0(i2);
     }
 
     public void setAudioCodec(@NonNull c.o.a.m.b bVar) {
-        this.f2386x.b0(bVar);
+        this.f2392x.b0(bVar);
     }
 
     public void setAutoFocusMarker(@Nullable c.o.a.s.a aVar) {
@@ -1263,17 +1263,17 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setAutoFocusResetDelay(long j2) {
-        this.f2386x.c0(j2);
+        this.f2392x.c0(j2);
     }
 
     public void setEngine(@NonNull c.o.a.m.d dVar) {
         if (c()) {
             this.p = dVar;
-            i iVar = this.f2386x;
+            i iVar = this.f2392x;
             b();
             c.o.a.w.a aVar = this.v;
             if (aVar != null) {
-                this.f2386x.u0(aVar);
+                this.f2392x.u0(aVar);
             }
             setFacing(iVar.l());
             setFlash(iVar.m());
@@ -1299,7 +1299,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             setFrameProcessingMaxHeight(iVar.o());
             setFrameProcessingFormat(0);
             setFrameProcessingPoolSize(iVar.q());
-            this.f2386x.k0(!this.C.isEmpty());
+            this.f2392x.k0(!this.C.isEmpty());
         }
     }
 
@@ -1318,12 +1318,12 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
             if (f > f3) {
                 f = f3;
             }
-            this.f2386x.d0(f, new float[]{f2, f3}, null, false);
+            this.f2392x.d0(f, new float[]{f2, f3}, null, false);
         }
     }
 
     public void setFacing(@NonNull c.o.a.m.e eVar) {
-        this.f2386x.e0(eVar);
+        this.f2392x.e0(eVar);
     }
 
     public void setFilter(@NonNull c.o.a.o.b bVar) {
@@ -1343,7 +1343,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setFlash(@NonNull c.o.a.m.f fVar) {
-        this.f2386x.f0(fVar);
+        this.f2392x.f0(fVar);
     }
 
     public void setFrameProcessingExecutors(int i2) {
@@ -1358,19 +1358,19 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setFrameProcessingFormat(int i2) {
-        this.f2386x.g0(i2);
+        this.f2392x.g0(i2);
     }
 
     public void setFrameProcessingMaxHeight(int i2) {
-        this.f2386x.h0(i2);
+        this.f2392x.h0(i2);
     }
 
     public void setFrameProcessingMaxWidth(int i2) {
-        this.f2386x.i0(i2);
+        this.f2392x.i0(i2);
     }
 
     public void setFrameProcessingPoolSize(int i2) {
-        this.f2386x.j0(i2);
+        this.f2392x.j0(i2);
     }
 
     public void setGrid(@NonNull c.o.a.m.g gVar) {
@@ -1382,7 +1382,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setHdr(@NonNull h hVar) {
-        this.f2386x.l0(hVar);
+        this.f2392x.l0(hVar);
     }
 
     public void setLifecycleOwner(@Nullable LifecycleOwner lifecycleOwner) {
@@ -1406,32 +1406,32 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setLocation(@Nullable Location location) {
-        this.f2386x.m0(location);
+        this.f2392x.m0(location);
     }
 
     public void setMode(@NonNull c.o.a.m.i iVar) {
-        this.f2386x.n0(iVar);
+        this.f2392x.n0(iVar);
     }
 
     public void setPictureFormat(@NonNull j jVar) {
-        this.f2386x.p0(jVar);
+        this.f2392x.p0(jVar);
     }
 
     public void setPictureMetering(boolean z2) {
-        this.f2386x.q0(z2);
+        this.f2392x.q0(z2);
     }
 
     public void setPictureSize(@NonNull c.o.a.x.c cVar) {
-        this.f2386x.r0(cVar);
+        this.f2392x.r0(cVar);
     }
 
     public void setPictureSnapshotMetering(boolean z2) {
-        this.f2386x.s0(z2);
+        this.f2392x.s0(z2);
     }
 
     public void setPlaySounds(boolean z2) {
         this.k = z2;
-        this.f2386x.t0(z2);
+        this.f2392x.t0(z2);
     }
 
     public void setPreview(@NonNull k kVar) {
@@ -1450,15 +1450,15 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setPreviewFrameRate(float f) {
-        this.f2386x.v0(f);
+        this.f2392x.v0(f);
     }
 
     public void setPreviewFrameRateExact(boolean z2) {
-        this.f2386x.w0(z2);
+        this.f2392x.w0(z2);
     }
 
     public void setPreviewStreamSize(@NonNull c.o.a.x.c cVar) {
-        this.f2386x.x0(cVar);
+        this.f2392x.x0(cVar);
     }
 
     public void setRequestPermissions(boolean z2) {
@@ -1466,11 +1466,11 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setSnapshotMaxHeight(int i2) {
-        this.f2386x.y0(i2);
+        this.f2392x.y0(i2);
     }
 
     public void setSnapshotMaxWidth(int i2) {
-        this.f2386x.z0(i2);
+        this.f2392x.z0(i2);
     }
 
     public void setUseDeviceOrientation(boolean z2) {
@@ -1478,27 +1478,27 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
     }
 
     public void setVideoBitRate(int i2) {
-        this.f2386x.A0(i2);
+        this.f2392x.A0(i2);
     }
 
     public void setVideoCodec(@NonNull c.o.a.m.l lVar) {
-        this.f2386x.B0(lVar);
+        this.f2392x.B0(lVar);
     }
 
     public void setVideoMaxDuration(int i2) {
-        this.f2386x.C0(i2);
+        this.f2392x.C0(i2);
     }
 
     public void setVideoMaxSize(long j2) {
-        this.f2386x.D0(j2);
+        this.f2392x.D0(j2);
     }
 
     public void setVideoSize(@NonNull c.o.a.x.c cVar) {
-        this.f2386x.E0(cVar);
+        this.f2392x.E0(cVar);
     }
 
     public void setWhiteBalance(@NonNull m mVar) {
-        this.f2386x.F0(mVar);
+        this.f2392x.F0(mVar);
     }
 
     public void setZoom(float f) {
@@ -1508,6 +1508,6 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
         if (f > 1.0f) {
             f = 1.0f;
         }
-        this.f2386x.G0(f, null, false);
+        this.f2392x.G0(f, null, false);
     }
 }
diff --git a/app/src/main/java/com/yalantis/ucrop/UCropActivity.java b/app/src/main/java/com/yalantis/ucrop/UCropActivity.java
index e63e0da706..3d88edb782 100644
--- a/app/src/main/java/com/yalantis/ucrop/UCropActivity.java
+++ b/app/src/main/java/com/yalantis/ucrop/UCropActivity.java
@@ -76,20 +76,20 @@ public class UCropActivity extends AppCompatActivity {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f2390s;
+    public boolean f2396s;
     public boolean t = true;
     public UCropView u;
     public GestureCropImageView v;
     public OverlayView w;
 
     /* renamed from: x  reason: collision with root package name */
-    public ViewGroup f2391x;
+    public ViewGroup f2397x;
 
     /* renamed from: y  reason: collision with root package name */
-    public ViewGroup f2392y;
+    public ViewGroup f2398y;
 
     /* renamed from: z  reason: collision with root package name */
-    public ViewGroup f2393z;
+    public ViewGroup f2399z;
 
     public class a implements c.a {
         public a() {
@@ -147,14 +147,14 @@ public class UCropActivity extends AppCompatActivity {
     }
 
     public final void c(@IdRes int i2) {
-        if (this.f2390s) {
-            ViewGroup viewGroup = this.f2391x;
+        if (this.f2396s) {
+            ViewGroup viewGroup = this.f2397x;
             int i3 = R.d.state_aspect_ratio;
             viewGroup.setSelected(i2 == i3);
-            ViewGroup viewGroup2 = this.f2392y;
+            ViewGroup viewGroup2 = this.f2398y;
             int i4 = R.d.state_rotate;
             viewGroup2.setSelected(i2 == i4);
-            ViewGroup viewGroup3 = this.f2393z;
+            ViewGroup viewGroup3 = this.f2399z;
             int i5 = R.d.state_scale;
             viewGroup3.setSelected(i2 == i5);
             int i6 = 8;
@@ -162,9 +162,9 @@ public class UCropActivity extends AppCompatActivity {
             this.B.setVisibility(i2 == i4 ? 0 : 8);
             this.C.setVisibility(i2 == i5 ? 0 : 8);
             TransitionManager.beginDelayedTransition((ViewGroup) findViewById(R.d.ucrop_photobox), this.H);
-            this.f2393z.findViewById(R.d.text_view_scale).setVisibility(i2 == i5 ? 0 : 8);
-            this.f2391x.findViewById(R.d.text_view_crop).setVisibility(i2 == i3 ? 0 : 8);
-            View findViewById = this.f2392y.findViewById(R.d.text_view_rotate);
+            this.f2399z.findViewById(R.d.text_view_scale).setVisibility(i2 == i5 ? 0 : 8);
+            this.f2397x.findViewById(R.d.text_view_crop).setVisibility(i2 == i3 ? 0 : 8);
+            View findViewById = this.f2398y.findViewById(R.d.text_view_rotate);
             if (i2 == i4) {
                 i6 = 0;
             }
@@ -197,7 +197,7 @@ public class UCropActivity extends AppCompatActivity {
         }
         this.j = stringExtra;
         this.r = intent.getIntExtra("com.yalantis.ucrop.UcropLogoColor", ContextCompat.getColor(this, R.a.ucrop_color_default_logo));
-        this.f2390s = !intent.getBooleanExtra("com.yalantis.ucrop.HideBottomControls", false);
+        this.f2396s = !intent.getBooleanExtra("com.yalantis.ucrop.HideBottomControls", false);
         this.o = intent.getIntExtra("com.yalantis.ucrop.UcropRootViewBackgroundColor", ContextCompat.getColor(this, R.a.ucrop_color_crop_background));
         int i2 = this.l;
         Window window = getWindow();
@@ -227,12 +227,12 @@ public class UCropActivity extends AppCompatActivity {
         ((ImageView) findViewById(R.d.image_view_logo)).setColorFilter(this.r, PorterDuff.Mode.SRC_ATOP);
         int i3 = R.d.ucrop_frame;
         findViewById(i3).setBackgroundColor(this.o);
-        if (!this.f2390s) {
+        if (!this.f2396s) {
             ((RelativeLayout.LayoutParams) findViewById(i3).getLayoutParams()).bottomMargin = 0;
             findViewById(i3).requestLayout();
         }
         ViewGroup viewGroup = null;
-        if (this.f2390s) {
+        if (this.f2396s) {
             ViewGroup viewGroup2 = (ViewGroup) ((ViewGroup) findViewById(R.d.ucrop_photobox)).findViewById(R.d.controls_wrapper);
             viewGroup2.setVisibility(0);
             LayoutInflater.from(this).inflate(R.e.ucrop_controls, viewGroup2, true);
@@ -240,13 +240,13 @@ public class UCropActivity extends AppCompatActivity {
             this.H = autoTransition;
             autoTransition.setDuration(50L);
             ViewGroup viewGroup3 = (ViewGroup) findViewById(R.d.state_aspect_ratio);
-            this.f2391x = viewGroup3;
+            this.f2397x = viewGroup3;
             viewGroup3.setOnClickListener(this.M);
             ViewGroup viewGroup4 = (ViewGroup) findViewById(R.d.state_rotate);
-            this.f2392y = viewGroup4;
+            this.f2398y = viewGroup4;
             viewGroup4.setOnClickListener(this.M);
             ViewGroup viewGroup5 = (ViewGroup) findViewById(R.d.state_scale);
-            this.f2393z = viewGroup5;
+            this.f2399z = viewGroup5;
             viewGroup5.setOnClickListener(this.M);
             int i4 = R.d.layout_aspect_ratio;
             this.A = (ViewGroup) findViewById(i4);
@@ -340,7 +340,7 @@ public class UCropActivity extends AppCompatActivity {
         int intExtra2 = intent.getIntExtra("com.yalantis.ucrop.AspectRatioSelectedByDefault", 0);
         ArrayList parcelableArrayListExtra2 = intent.getParcelableArrayListExtra("com.yalantis.ucrop.AspectRatioOptions");
         if (floatExtra > 0.0f && floatExtra2 > 0.0f) {
-            ViewGroup viewGroup7 = this.f2391x;
+            ViewGroup viewGroup7 = this.f2397x;
             if (viewGroup7 != null) {
                 viewGroup7.setVisibility(8);
             }
@@ -369,9 +369,9 @@ public class UCropActivity extends AppCompatActivity {
                 finish();
             }
         }
-        if (!this.f2390s) {
+        if (!this.f2396s) {
             a(0);
-        } else if (this.f2391x.getVisibility() == 0) {
+        } else if (this.f2397x.getVisibility() == 0) {
             c(R.d.state_aspect_ratio);
         } else {
             c(R.d.state_scale);
@@ -423,7 +423,7 @@ public class UCropActivity extends AppCompatActivity {
             g gVar = new g(this);
             gestureCropImageView.i();
             gestureCropImageView.setImageToWrapCropBounds(false);
-            new c.q.a.j.a(gestureCropImageView.getContext(), gestureCropImageView.getViewBitmap(), new c.q.a.i.c(gestureCropImageView.f1534x, c.q.a.k.a.g0(gestureCropImageView.i), gestureCropImageView.getCurrentScale(), gestureCropImageView.getCurrentAngle()), new c.q.a.i.a(gestureCropImageView.G, gestureCropImageView.H, compressFormat, i2, gestureCropImageView.getImageInputPath(), gestureCropImageView.getImageOutputPath(), gestureCropImageView.getExifInfo()), gVar).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+            new c.q.a.j.a(gestureCropImageView.getContext(), gestureCropImageView.getViewBitmap(), new c.q.a.i.c(gestureCropImageView.f1529x, c.q.a.k.a.g0(gestureCropImageView.i), gestureCropImageView.getCurrentScale(), gestureCropImageView.getCurrentAngle()), new c.q.a.i.a(gestureCropImageView.G, gestureCropImageView.H, compressFormat, i2, gestureCropImageView.getImageInputPath(), gestureCropImageView.getImageOutputPath(), gestureCropImageView.getExifInfo()), gVar).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
             return true;
         } else if (menuItem.getItemId() != 16908332) {
             return super.onOptionsItemSelected(menuItem);
diff --git a/app/src/main/java/com/yalantis/ucrop/view/GestureCropImageView.java b/app/src/main/java/com/yalantis/ucrop/view/GestureCropImageView.java
index 205aa693df..5e023102e3 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/GestureCropImageView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/GestureCropImageView.java
@@ -103,7 +103,7 @@ public class GestureCropImageView extends c.q.a.l.a {
             Objects.requireNonNull(dVar);
             int actionMasked = motionEvent.getActionMasked();
             if (actionMasked == 0) {
-                dVar.f1533c = motionEvent.getX();
+                dVar.f1528c = motionEvent.getX();
                 dVar.d = motionEvent.getY();
                 dVar.e = motionEvent.findPointerIndex(motionEvent.getPointerId(0));
                 dVar.g = 0.0f;
@@ -130,7 +130,7 @@ public class GestureCropImageView extends c.q.a.l.a {
                     dVar.h = false;
                 } else {
                     float f = dVar.a;
-                    float degrees = (((float) Math.toDegrees((double) ((float) Math.atan2((double) (y3 - y2), (double) (x3 - x2))))) % 360.0f) - (((float) Math.toDegrees((double) ((float) Math.atan2((double) (dVar.b - dVar.d), (double) (f - dVar.f1533c))))) % 360.0f);
+                    float degrees = (((float) Math.toDegrees((double) ((float) Math.atan2((double) (y3 - y2), (double) (x3 - x2))))) % 360.0f) - (((float) Math.toDegrees((double) ((float) Math.atan2((double) (dVar.b - dVar.d), (double) (f - dVar.f1528c))))) % 360.0f);
                     dVar.g = degrees;
                     if (degrees < -180.0f) {
                         dVar.g = degrees + 360.0f;
@@ -145,7 +145,7 @@ public class GestureCropImageView extends c.q.a.l.a {
                 }
                 dVar.a = x3;
                 dVar.b = y3;
-                dVar.f1533c = x2;
+                dVar.f1528c = x2;
                 dVar.d = y2;
             }
         }
diff --git a/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java b/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java
index ac3a590f01..0aaefbb74e 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java
@@ -38,20 +38,20 @@ public class OverlayView extends View {
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f2394s;
+    public boolean f2400s;
     public boolean t;
     public int u;
     public Path v = new Path();
     public Paint w = new Paint(1);
 
     /* renamed from: x  reason: collision with root package name */
-    public Paint f2395x = new Paint(1);
+    public Paint f2401x = new Paint(1);
 
     /* renamed from: y  reason: collision with root package name */
-    public Paint f2396y = new Paint(1);
+    public Paint f2402y = new Paint(1);
 
     /* renamed from: z  reason: collision with root package name */
-    public Paint f2397z = new Paint(1);
+    public Paint f2403z = new Paint(1);
 
     public OverlayView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet, 0);
@@ -92,7 +92,7 @@ public class OverlayView extends View {
         if (this.t) {
             canvas.drawCircle(this.i.centerX(), this.i.centerY(), Math.min(this.i.width(), this.i.height()) / 2.0f, this.w);
         }
-        if (this.f2394s) {
+        if (this.f2400s) {
             if (this.q == null && !this.i.isEmpty()) {
                 this.q = new float[((this.o * 4) + (this.n * 4))];
                 int i = 0;
@@ -132,11 +132,11 @@ public class OverlayView extends View {
             }
             float[] fArr5 = this.q;
             if (fArr5 != null) {
-                canvas.drawLines(fArr5, this.f2395x);
+                canvas.drawLines(fArr5, this.f2401x);
             }
         }
         if (this.r) {
-            canvas.drawRect(this.i, this.f2396y);
+            canvas.drawRect(this.i, this.f2402y);
         }
         if (this.A != 0) {
             canvas.save();
@@ -150,7 +150,7 @@ public class OverlayView extends View {
             int i11 = this.G;
             rectF6.inset((float) (-i11), (float) i11);
             canvas.clipRect(this.j, Region.Op.DIFFERENCE);
-            canvas.drawRect(this.i, this.f2397z);
+            canvas.drawRect(this.i, this.f2403z);
             canvas.restore();
         }
     }
@@ -261,15 +261,15 @@ public class OverlayView extends View {
     }
 
     public void setCropFrameColor(@ColorInt int i) {
-        this.f2396y.setColor(i);
+        this.f2402y.setColor(i);
     }
 
     public void setCropFrameStrokeWidth(@IntRange(from = 0) int i) {
-        this.f2396y.setStrokeWidth((float) i);
+        this.f2402y.setStrokeWidth((float) i);
     }
 
     public void setCropGridColor(@ColorInt int i) {
-        this.f2395x.setColor(i);
+        this.f2401x.setColor(i);
     }
 
     public void setCropGridColumnCount(@IntRange(from = 0) int i) {
@@ -283,7 +283,7 @@ public class OverlayView extends View {
     }
 
     public void setCropGridStrokeWidth(@IntRange(from = 0) int i) {
-        this.f2395x.setStrokeWidth((float) i);
+        this.f2401x.setStrokeWidth((float) i);
     }
 
     public void setDimmedColor(@ColorInt int i) {
@@ -309,7 +309,7 @@ public class OverlayView extends View {
     }
 
     public void setShowCropGrid(boolean z2) {
-        this.f2394s = z2;
+        this.f2400s = z2;
     }
 
     public void setTargetAspectRatio(float f) {
diff --git a/app/src/main/java/com/yalantis/ucrop/view/UCropView.java b/app/src/main/java/com/yalantis/ucrop/view/UCropView.java
index 18b67ede48..3429843f3e 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/UCropView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/UCropView.java
@@ -31,28 +31,28 @@ public class UCropView extends FrameLayout {
         overlayView.w.setStrokeWidth(1.0f);
         int dimensionPixelSize = obtainStyledAttributes.getDimensionPixelSize(R.h.ucrop_UCropView_ucrop_frame_stroke_size, overlayView.getResources().getDimensionPixelSize(R.b.ucrop_default_crop_frame_stoke_width));
         int color2 = obtainStyledAttributes.getColor(R.h.ucrop_UCropView_ucrop_frame_color, overlayView.getResources().getColor(R.a.ucrop_color_default_crop_frame));
-        overlayView.f2396y.setStrokeWidth((float) dimensionPixelSize);
-        overlayView.f2396y.setColor(color2);
-        overlayView.f2396y.setStyle(Paint.Style.STROKE);
-        overlayView.f2397z.setStrokeWidth((float) (dimensionPixelSize * 3));
-        overlayView.f2397z.setColor(color2);
-        overlayView.f2397z.setStyle(Paint.Style.STROKE);
+        overlayView.f2402y.setStrokeWidth((float) dimensionPixelSize);
+        overlayView.f2402y.setColor(color2);
+        overlayView.f2402y.setStyle(Paint.Style.STROKE);
+        overlayView.f2403z.setStrokeWidth((float) (dimensionPixelSize * 3));
+        overlayView.f2403z.setColor(color2);
+        overlayView.f2403z.setStyle(Paint.Style.STROKE);
         overlayView.r = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_show_frame, true);
         int dimensionPixelSize2 = obtainStyledAttributes.getDimensionPixelSize(R.h.ucrop_UCropView_ucrop_grid_stroke_size, overlayView.getResources().getDimensionPixelSize(R.b.ucrop_default_crop_grid_stoke_width));
         int color3 = obtainStyledAttributes.getColor(R.h.ucrop_UCropView_ucrop_grid_color, overlayView.getResources().getColor(R.a.ucrop_color_default_crop_grid));
-        overlayView.f2395x.setStrokeWidth((float) dimensionPixelSize2);
-        overlayView.f2395x.setColor(color3);
+        overlayView.f2401x.setStrokeWidth((float) dimensionPixelSize2);
+        overlayView.f2401x.setColor(color3);
         overlayView.n = obtainStyledAttributes.getInt(R.h.ucrop_UCropView_ucrop_grid_row_count, 2);
         overlayView.o = obtainStyledAttributes.getInt(R.h.ucrop_UCropView_ucrop_grid_column_count, 2);
-        overlayView.f2394s = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_show_grid, true);
+        overlayView.f2400s = obtainStyledAttributes.getBoolean(R.h.ucrop_UCropView_ucrop_show_grid, true);
         GestureCropImageView gestureCropImageView = this.i;
         Objects.requireNonNull(gestureCropImageView);
         float abs = Math.abs(obtainStyledAttributes.getFloat(R.h.ucrop_UCropView_ucrop_aspect_ratio_x, 0.0f));
         float abs2 = Math.abs(obtainStyledAttributes.getFloat(R.h.ucrop_UCropView_ucrop_aspect_ratio_y, 0.0f));
         if (abs == 0.0f || abs2 == 0.0f) {
-            gestureCropImageView.f1536z = 0.0f;
+            gestureCropImageView.f1531z = 0.0f;
         } else {
-            gestureCropImageView.f1536z = abs / abs2;
+            gestureCropImageView.f1531z = abs / abs2;
         }
         obtainStyledAttributes.recycle();
         this.i.setCropBoundsChangeListener(new d(this));
diff --git a/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java b/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
index 0854e74ea4..a070720609 100644
--- a/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
+++ b/app/src/main/java/com/yalantis/ucrop/view/widget/HorizontalProgressWheelView.java
@@ -23,7 +23,7 @@ public class HorizontalProgressWheelView extends View {
     public float r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2398s = ContextCompat.getColor(getContext(), R.a.ucrop_color_widget_rotate_mid_line);
+    public int f2404s = ContextCompat.getColor(getContext(), R.a.ucrop_color_widget_rotate_mid_line);
 
     public interface a {
         void a();
@@ -42,7 +42,7 @@ public class HorizontalProgressWheelView extends View {
         this.l.setColor(getResources().getColor(R.a.ucrop_color_progress_wheel_line));
         Paint paint2 = new Paint(this.l);
         this.m = paint2;
-        paint2.setColor(this.f2398s);
+        paint2.setColor(this.f2404s);
         this.m.setStrokeCap(Paint.Cap.ROUND);
         this.m.setStrokeWidth((float) getContext().getResources().getDimensionPixelSize(R.b.ucrop_width_middle_wheel_progress_line));
     }
@@ -109,7 +109,7 @@ public class HorizontalProgressWheelView extends View {
     }
 
     public void setMiddleLineColor(@ColorInt int i) {
-        this.f2398s = i;
+        this.f2404s = i;
         this.m.setColor(i);
         invalidate();
     }
diff --git a/app/src/main/java/d0/c0/b.java b/app/src/main/java/d0/c0/b.java
index 48c45f44bf..2faddcea40 100644
--- a/app/src/main/java/d0/c0/b.java
+++ b/app/src/main/java/d0/c0/b.java
@@ -6,7 +6,7 @@ import java.util.Random;
 public final class b extends a {
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2399c = new a();
+    public final a f2405c = new a();
 
     /* compiled from: PlatformRandom.kt */
     public static final class a extends ThreadLocal<Random> {
@@ -19,7 +19,7 @@ public final class b extends a {
 
     @Override // d0.c0.a
     public Random getImpl() {
-        Random random = this.f2399c.get();
+        Random random = this.f2405c.get();
         m.checkNotNullExpressionValue(random, "implStorage.get()");
         return random;
     }
diff --git a/app/src/main/java/d0/c0/c.java b/app/src/main/java/d0/c0/c.java
index 673980d9a8..9b2b2fe743 100644
--- a/app/src/main/java/d0/c0/c.java
+++ b/app/src/main/java/d0/c0/c.java
@@ -54,11 +54,6 @@ public abstract class c {
         public long nextLong() {
             return c.access$getDefaultRandom$cp().nextLong();
         }
-
-        @Override // d0.c0.c
-        public long nextLong(long j, long j2) {
-            return c.access$getDefaultRandom$cp().nextLong(j, j2);
-        }
     }
 
     public static final /* synthetic */ c access$getDefaultRandom$cp() {
@@ -153,40 +148,4 @@ public abstract class c {
     public long nextLong() {
         return (((long) nextInt()) << 32) + ((long) nextInt());
     }
-
-    public long nextLong(long j, long j2) {
-        long j3;
-        long nextLong;
-        long j4;
-        int nextInt;
-        d.checkRangeBounds(j, j2);
-        long j5 = j2 - j;
-        if (j5 > 0) {
-            if (((-j5) & j5) == j5) {
-                int i = (int) j5;
-                int i2 = (int) (j5 >>> 32);
-                if (i != 0) {
-                    nextInt = nextBits(d.fastLog2(i));
-                } else if (i2 == 1) {
-                    nextInt = nextInt();
-                } else {
-                    j3 = (((long) nextBits(d.fastLog2(i2))) << 32) + ((long) nextInt());
-                }
-                j3 = ((long) nextInt) & 4294967295L;
-            } else {
-                do {
-                    nextLong = nextLong() >>> 1;
-                    j4 = nextLong % j5;
-                } while ((j5 - 1) + (nextLong - j4) < 0);
-                j3 = j4;
-            }
-            return j + j3;
-        }
-        while (true) {
-            long nextLong2 = nextLong();
-            if (j <= nextLong2 && j2 > nextLong2) {
-                return nextLong2;
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/d0/c0/d.java b/app/src/main/java/d0/c0/d.java
index f110311b8b..ccd56586a4 100644
--- a/app/src/main/java/d0/c0/d.java
+++ b/app/src/main/java/d0/c0/d.java
@@ -2,7 +2,6 @@ package d0.c0;
 
 import d0.z.d.m;
 import kotlin.ranges.IntRange;
-import kotlin.ranges.LongRange;
 /* compiled from: Random.kt */
 public final class d {
     public static final c Random(long j) {
@@ -21,12 +20,6 @@ public final class d {
         }
     }
 
-    public static final void checkRangeBounds(long j, long j2) {
-        if (!(j2 > j)) {
-            throw new IllegalArgumentException(boundsErrorMessage(Long.valueOf(j), Long.valueOf(j2)).toString());
-        }
-    }
-
     public static final int fastLog2(int i) {
         return 31 - Integer.numberOfLeadingZeros(i);
     }
@@ -40,15 +33,6 @@ public final class d {
         throw new IllegalArgumentException("Cannot get random in empty range: " + intRange);
     }
 
-    public static final long nextLong(c cVar, LongRange longRange) {
-        m.checkNotNullParameter(cVar, "$this$nextLong");
-        m.checkNotNullParameter(longRange, "range");
-        if (!longRange.isEmpty()) {
-            return longRange.getLast() < Long.MAX_VALUE ? cVar.nextLong(longRange.getFirst(), longRange.getLast() + 1) : longRange.getFirst() > Long.MIN_VALUE ? cVar.nextLong(longRange.getFirst() - 1, longRange.getLast()) + 1 : cVar.nextLong();
-        }
-        throw new IllegalArgumentException("Cannot get random in empty range: " + longRange);
-    }
-
     public static final int takeUpperBits(int i, int i2) {
         return (i >>> (32 - i2)) & ((-i2) >> 31);
     }
diff --git a/app/src/main/java/d0/c0/e.java b/app/src/main/java/d0/c0/e.java
index c97d0906f7..12b190a7b0 100644
--- a/app/src/main/java/d0/c0/e.java
+++ b/app/src/main/java/d0/c0/e.java
@@ -3,7 +3,7 @@ package d0.c0;
 public final class e extends c {
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2400c;
+    public int f2406c;
     public int d;
     public int e;
     public int f;
@@ -15,7 +15,7 @@ public final class e extends c {
     }
 
     public e(int i, int i2, int i3, int i4, int i5, int i6) {
-        this.f2400c = i;
+        this.f2406c = i;
         this.d = i2;
         this.e = i3;
         this.f = i4;
@@ -38,9 +38,9 @@ public final class e extends c {
 
     @Override // d0.c0.c
     public int nextInt() {
-        int i = this.f2400c;
+        int i = this.f2406c;
         int i2 = i ^ (i >>> 2);
-        this.f2400c = this.d;
+        this.f2406c = this.d;
         this.d = this.e;
         this.e = this.f;
         int i3 = this.g;
diff --git a/app/src/main/java/d0/d0/f.java b/app/src/main/java/d0/d0/f.java
index 6af567ff4f..a60b1aef3c 100644
--- a/app/src/main/java/d0/d0/f.java
+++ b/app/src/main/java/d0/d0/f.java
@@ -6,7 +6,6 @@ import d0.z.d.m;
 import java.util.NoSuchElementException;
 import kotlin.ranges.IntProgression;
 import kotlin.ranges.IntRange;
-import kotlin.ranges.LongRange;
 /* compiled from: _Ranges.kt */
 public class f extends e {
     public static final int coerceAtLeast(int i, int i2) {
@@ -55,16 +54,6 @@ public class f extends e {
         }
     }
 
-    public static final long random(LongRange longRange, c cVar) {
-        m.checkNotNullParameter(longRange, "$this$random");
-        m.checkNotNullParameter(cVar, "random");
-        try {
-            return d.nextLong(cVar, longRange);
-        } catch (IllegalArgumentException e) {
-            throw new NoSuchElementException(e.getMessage());
-        }
-    }
-
     public static final IntProgression step(IntProgression intProgression, int i) {
         m.checkNotNullParameter(intProgression, "$this$step");
         e.checkStepIsPositive(i > 0, Integer.valueOf(i));
diff --git a/app/src/main/java/d0/e0/i.java b/app/src/main/java/d0/e0/i.java
index 873ba1fd06..449234015c 100644
--- a/app/src/main/java/d0/e0/i.java
+++ b/app/src/main/java/d0/e0/i.java
@@ -10,7 +10,7 @@ public final class i {
     public static final a b = new a(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final j f2401c;
+    public final j f2407c;
     public final KType d;
 
     /* compiled from: KTypeProjection.kt */
@@ -40,7 +40,7 @@ public final class i {
 
     public i(j jVar, KType kType) {
         String str;
-        this.f2401c = jVar;
+        this.f2407c = jVar;
         this.d = kType;
         if (!((jVar == null) != (kType == null) ? false : true)) {
             if (jVar == null) {
@@ -53,7 +53,7 @@ public final class i {
     }
 
     public final j component1() {
-        return this.f2401c;
+        return this.f2407c;
     }
 
     public final KType component2() {
@@ -68,7 +68,7 @@ public final class i {
             return false;
         }
         i iVar = (i) obj;
-        return m.areEqual(this.f2401c, iVar.f2401c) && m.areEqual(this.d, iVar.d);
+        return m.areEqual(this.f2407c, iVar.f2407c) && m.areEqual(this.d, iVar.d);
     }
 
     public final KType getType() {
@@ -76,11 +76,11 @@ public final class i {
     }
 
     public final j getVariance() {
-        return this.f2401c;
+        return this.f2407c;
     }
 
     public int hashCode() {
-        j jVar = this.f2401c;
+        j jVar = this.f2407c;
         int i = 0;
         int hashCode = (jVar != null ? jVar.hashCode() : 0) * 31;
         KType kType = this.d;
@@ -91,7 +91,7 @@ public final class i {
     }
 
     public String toString() {
-        j jVar = this.f2401c;
+        j jVar = this.f2407c;
         if (jVar == null) {
             return "*";
         }
diff --git a/app/src/main/java/d0/e0/p/d/e.java b/app/src/main/java/d0/e0/p/d/e.java
index eb57d7a06c..c9f62831b4 100644
--- a/app/src/main/java/d0/e0/p/d/e.java
+++ b/app/src/main/java/d0/e0/p/d/e.java
@@ -83,7 +83,7 @@ public abstract class e {
         public final n0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final n f2402c;
+        public final n f2408c;
         public final a.d d;
         public final d0.e0.p.d.m0.f.z.c e;
         public final g f;
@@ -99,7 +99,7 @@ public abstract class e {
             m.checkNotNullParameter(cVar, "nameResolver");
             m.checkNotNullParameter(gVar, "typeTable");
             this.b = n0Var;
-            this.f2402c = nVar;
+            this.f2408c = nVar;
             this.d = dVar;
             this.e = cVar;
             this.f = gVar;
@@ -170,7 +170,7 @@ public abstract class e {
         }
 
         public final n getProto() {
-            return this.f2402c;
+            return this.f2408c;
         }
 
         public final a.d getSignature() {
diff --git a/app/src/main/java/d0/e0/p/d/i.java b/app/src/main/java/d0/e0/p/d/i.java
index 800aeeaa48..c6b41ddfe2 100644
--- a/app/src/main/java/d0/e0/p/d/i.java
+++ b/app/src/main/java/d0/e0/p/d/i.java
@@ -100,7 +100,7 @@ public abstract class i implements d0.z.d.e {
 
         public final CharSequence invoke(x xVar) {
             m.checkNotNullParameter(xVar, "descriptor");
-            return d0.e0.p.d.m0.j.c.f2599c.render(xVar) + " | " + f0.b.mapSignature(xVar).asString();
+            return d0.e0.p.d.m0.j.c.f2605c.render(xVar) + " | " + f0.b.mapSignature(xVar).asString();
         }
     }
 
@@ -114,7 +114,7 @@ public abstract class i implements d0.z.d.e {
 
         public final CharSequence invoke(n0 n0Var) {
             m.checkNotNullParameter(n0Var, "descriptor");
-            return d0.e0.p.d.m0.j.c.f2599c.render(n0Var) + " | " + f0.b.mapPropertySignature(n0Var).asString();
+            return d0.e0.p.d.m0.j.c.f2605c.render(n0Var) + " | " + f0.b.mapPropertySignature(n0Var).asString();
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/j.java b/app/src/main/java/d0/e0/p/d/j.java
index 7815bef194..d325b36ef3 100644
--- a/app/src/main/java/d0/e0/p/d/j.java
+++ b/app/src/main/java/d0/e0/p/d/j.java
@@ -36,7 +36,7 @@ public final class j extends f<Object> implements i<Object>, KFunction<Object>,
     public final String r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final Object f2404s;
+    public final Object f2410s;
 
     /* compiled from: KFunctionImpl.kt */
     public static final class a extends o implements Function0<d<? extends Member>> {
@@ -210,7 +210,7 @@ public final class j extends f<Object> implements i<Object>, KFunction<Object>,
     public j(i iVar, String str, String str2, x xVar, Object obj) {
         this.q = iVar;
         this.r = str2;
-        this.f2404s = obj;
+        this.f2410s = obj;
         this.n = c0.lazySoft(xVar, new c(this, str));
         this.o = c0.lazy(new a(this));
         this.p = c0.lazy(new b(this));
@@ -247,7 +247,7 @@ public final class j extends f<Object> implements i<Object>, KFunction<Object>,
 
     public boolean equals(Object obj) {
         j asKFunctionImpl = j0.asKFunctionImpl(obj);
-        return asKFunctionImpl != null && m.areEqual(getContainer(), asKFunctionImpl.getContainer()) && m.areEqual(getName(), asKFunctionImpl.getName()) && m.areEqual(this.r, asKFunctionImpl.r) && m.areEqual(this.f2404s, asKFunctionImpl.f2404s);
+        return asKFunctionImpl != null && m.areEqual(getContainer(), asKFunctionImpl.getContainer()) && m.areEqual(getName(), asKFunctionImpl.getName()) && m.areEqual(this.r, asKFunctionImpl.r) && m.areEqual(this.f2410s, asKFunctionImpl.f2410s);
     }
 
     @Override // d0.z.d.i
@@ -256,7 +256,7 @@ public final class j extends f<Object> implements i<Object>, KFunction<Object>,
     }
 
     public final Object getBoundReceiver() {
-        return h.coerceToExpectedReceiverType(this.f2404s, getDescriptor());
+        return h.coerceToExpectedReceiverType(this.f2410s, getDescriptor());
     }
 
     @Override // d0.e0.p.d.f
@@ -374,7 +374,7 @@ public final class j extends f<Object> implements i<Object>, KFunction<Object>,
 
     @Override // d0.e0.p.d.f
     public boolean isBound() {
-        return !m.areEqual(this.f2404s, d0.z.d.d.NO_RECEIVER);
+        return !m.areEqual(this.f2410s, d0.z.d.d.NO_RECEIVER);
     }
 
     @Override // kotlin.reflect.KFunction
diff --git a/app/src/main/java/d0/e0/p/d/j0.java b/app/src/main/java/d0/e0/p/d/j0.java
index d7b9790d4e..a6083bbf90 100644
--- a/app/src/main/java/d0/e0/p/d/j0.java
+++ b/app/src/main/java/d0/e0/p/d/j0.java
@@ -354,7 +354,7 @@ public final class j0 {
         if (d0.z.d.m.areEqual(uVar, d0.e0.p.d.m0.c.t.e)) {
             return KVisibility.PUBLIC;
         }
-        if (d0.z.d.m.areEqual(uVar, d0.e0.p.d.m0.c.t.f2497c)) {
+        if (d0.z.d.m.areEqual(uVar, d0.e0.p.d.m0.c.t.f2503c)) {
             return KVisibility.PROTECTED;
         }
         if (d0.z.d.m.areEqual(uVar, d0.e0.p.d.m0.c.t.d)) {
diff --git a/app/src/main/java/d0/e0/p/d/l0/a.java b/app/src/main/java/d0/e0/p/d/l0/a.java
index 293e9daa8d..0e3120b008 100644
--- a/app/src/main/java/d0/e0/p/d/l0/a.java
+++ b/app/src/main/java/d0/e0/p/d/l0/a.java
@@ -17,7 +17,7 @@ public final class a implements d {
     public final List<Class<?>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<Object> f2405c;
+    public final List<Object> f2411c;
     public final Class<?> d;
     public final List<String> e;
     public final EnumC0198a f;
@@ -68,7 +68,7 @@ public final class a implements d {
         for (Method method3 : list4) {
             arrayList3.add(method3.getDefaultValue());
         }
-        this.f2405c = arrayList3;
+        this.f2411c = arrayList3;
         if (this.f == EnumC0198a.POSITIONAL_CALL && bVar == b.JAVA && (!u.minus(this.e, "value").isEmpty())) {
             throw new UnsupportedOperationException("Positional call of a Java annotation constructor is allowed only if there are no parameters or one parameter named \"value\". This restriction exists because Java annotations (in contrast to Kotlin)do not impose any order on their arguments. Use KCallable#callBy instead.");
         }
@@ -97,7 +97,7 @@ public final class a implements d {
         while (i < length) {
             Object obj = objArr[i];
             int i3 = i2 + 1;
-            Object access$transformKotlinToJvm = (obj == null && this.f == EnumC0198a.CALL_BY_NAME) ? this.f2405c.get(i2) : b.access$transformKotlinToJvm(obj, this.b.get(i2));
+            Object access$transformKotlinToJvm = (obj == null && this.f == EnumC0198a.CALL_BY_NAME) ? this.f2411c.get(i2) : b.access$transformKotlinToJvm(obj, this.b.get(i2));
             if (access$transformKotlinToJvm != null) {
                 arrayList.add(access$transformKotlinToJvm);
                 i++;
diff --git a/app/src/main/java/d0/e0/p/d/l0/b.java b/app/src/main/java/d0/e0/p/d/l0/b.java
index 3dac72e710..21bb824805 100644
--- a/app/src/main/java/d0/e0/p/d/l0/b.java
+++ b/app/src/main/java/d0/e0/p/d/l0/b.java
@@ -151,14 +151,14 @@ public final class b {
         public final /* synthetic */ Lazy b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ Lazy f2406c;
+        public final /* synthetic */ Lazy f2412c;
         public final /* synthetic */ a d;
         public final /* synthetic */ Map e;
 
         public c(Class cls, Lazy lazy, KProperty kProperty, Lazy lazy2, KProperty kProperty2, a aVar, Map map) {
             this.a = cls;
             this.b = lazy;
-            this.f2406c = lazy2;
+            this.f2412c = lazy2;
             this.d = aVar;
             this.e = map;
         }
@@ -175,7 +175,7 @@ public final class b {
                             return this.a;
                         }
                     } else if (name.equals("hashCode")) {
-                        return this.f2406c.getValue();
+                        return this.f2412c.getValue();
                     }
                 } else if (name.equals("toString")) {
                     return this.b.getValue();
diff --git a/app/src/main/java/d0/e0/p/d/l0/e.java b/app/src/main/java/d0/e0/p/d/l0/e.java
index 9058cb55eb..81cda45dbf 100644
--- a/app/src/main/java/d0/e0/p/d/l0/e.java
+++ b/app/src/main/java/d0/e0/p/d/l0/e.java
@@ -23,7 +23,7 @@ public abstract class e<M extends Member> implements d<M> {
     public final List<Type> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final M f2407c;
+    public final M f2413c;
     public final Type d;
     public final Class<?> e;
 
@@ -507,7 +507,7 @@ public abstract class e<M extends Member> implements d<M> {
      */
     public e(Member member, Type type, Class cls, Type[] typeArr, DefaultConstructorMarker defaultConstructorMarker) {
         List<Type> list;
-        this.f2407c = member;
+        this.f2413c = member;
         this.d = type;
         this.e = cls;
         if (cls != null) {
@@ -521,7 +521,7 @@ public abstract class e<M extends Member> implements d<M> {
     }
 
     public final void a(Object obj) {
-        if (obj == null || !this.f2407c.getDeclaringClass().isInstance(obj)) {
+        if (obj == null || !this.f2413c.getDeclaringClass().isInstance(obj)) {
             throw new IllegalArgumentException("An object member requires the object instance passed as the first argument.");
         }
     }
@@ -537,7 +537,7 @@ public abstract class e<M extends Member> implements d<M> {
 
     @Override // d0.e0.p.d.l0.d
     public final M getMember() {
-        return this.f2407c;
+        return this.f2413c;
     }
 
     @Override // d0.e0.p.d.l0.d
diff --git a/app/src/main/java/d0/e0/p/d/l0/g.java b/app/src/main/java/d0/e0/p/d/l0/g.java
index a2196d9bfd..58bede1093 100644
--- a/app/src/main/java/d0/e0/p/d/l0/g.java
+++ b/app/src/main/java/d0/e0/p/d/l0/g.java
@@ -25,7 +25,7 @@ public final class g<M extends Member> implements d<M> {
     public final d<M> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2408c;
+    public final boolean f2414c;
 
     /* compiled from: InlineClassAwareCaller.kt */
     public static final class a {
@@ -33,14 +33,14 @@ public final class g<M extends Member> implements d<M> {
         public final Method[] b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Method f2409c;
+        public final Method f2415c;
 
         public a(IntRange intRange, Method[] methodArr, Method method) {
             m.checkNotNullParameter(intRange, "argumentRange");
             m.checkNotNullParameter(methodArr, "unbox");
             this.a = intRange;
             this.b = methodArr;
-            this.f2409c = method;
+            this.f2415c = method;
         }
 
         public final IntRange component1() {
@@ -52,7 +52,7 @@ public final class g<M extends Member> implements d<M> {
         }
 
         public final Method component3() {
-            return this.f2409c;
+            return this.f2415c;
         }
     }
 
@@ -67,7 +67,7 @@ public final class g<M extends Member> implements d<M> {
         m.checkNotNullParameter(bVar, "descriptor");
         m.checkNotNullParameter(dVar, "caller");
         this.b = dVar;
-        this.f2408c = z2;
+        this.f2414c = z2;
         c0 returnType = bVar.getReturnType();
         m.checkNotNull(returnType);
         m.checkNotNullExpressionValue(returnType, "descriptor.returnType!!");
@@ -137,7 +137,7 @@ public final class g<M extends Member> implements d<M> {
                 L.append(getParameterTypes());
                 L.append(")\n");
                 L.append("Default: ");
-                L.append(this.f2408c);
+                L.append(this.f2414c);
                 throw new a0(L.toString());
             }
         }
diff --git a/app/src/main/java/d0/e0/p/d/l0/i.java b/app/src/main/java/d0/e0/p/d/l0/i.java
index 07fc935a3f..1498a472d9 100644
--- a/app/src/main/java/d0/e0/p/d/l0/i.java
+++ b/app/src/main/java/d0/e0/p/d/l0/i.java
@@ -17,7 +17,7 @@ public abstract class i implements d<Method> {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<Type> f2410c;
+    public final List<Type> f2416c;
 
     /* compiled from: InternalUnderlyingValOfInlineClass.kt */
     public static final class a extends i implements c {
@@ -68,7 +68,7 @@ public abstract class i implements d<Method> {
 
     public i(Method method, List list, DefaultConstructorMarker defaultConstructorMarker) {
         this.b = method;
-        this.f2410c = list;
+        this.f2416c = list;
         Class<?> returnType = method.getReturnType();
         m.checkNotNullExpressionValue(returnType, "unboxMethod.returnType");
         this.a = returnType;
@@ -86,7 +86,7 @@ public abstract class i implements d<Method> {
 
     @Override // d0.e0.p.d.l0.d
     public final List<Type> getParameterTypes() {
-        return this.f2410c;
+        return this.f2416c;
     }
 
     @Override // d0.e0.p.d.l0.d
diff --git a/app/src/main/java/d0/e0/p/d/m0/a.java b/app/src/main/java/d0/e0/p/d/m0/a.java
index 00a0191e3d..d9410ef67c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/a.java
@@ -12,7 +12,7 @@ public final class a {
     public static final Set<d0.e0.p.d.m0.g.a> b;
 
     static {
-        List<b> listOf = n.listOf((Object[]) new b[]{a0.a, a0.h, a0.i, a0.f2502c, a0.d, a0.f});
+        List<b> listOf = n.listOf((Object[]) new b[]{a0.a, a0.h, a0.i, a0.f2508c, a0.d, a0.f});
         LinkedHashSet linkedHashSet = new LinkedHashSet();
         for (b bVar : listOf) {
             linkedHashSet.add(d0.e0.p.d.m0.g.a.topLevel(bVar));
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/g.java b/app/src/main/java/d0/e0/p/d/m0/b/g.java
index bbf5f9e80f..c858eab5af 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/g.java
@@ -48,7 +48,7 @@ public final class g {
     public static final e extractParameterNameFromFunctionTypeArgument(c0 c0Var) {
         String str;
         m.checkNotNullParameter(c0Var, "<this>");
-        c findAnnotation = c0Var.getAnnotations().findAnnotation(k.a.f2428y);
+        c findAnnotation = c0Var.getAnnotations().findAnnotation(k.a.f2434y);
         if (findAnnotation == null) {
             return null;
         }
@@ -88,7 +88,7 @@ public final class g {
                 eVar = null;
             }
             if (eVar != null) {
-                b bVar = k.a.f2428y;
+                b bVar = k.a.f2434y;
                 e identifier = e.identifier("name");
                 String asString = eVar.asString();
                 m.checkNotNullExpressionValue(asString, "name.asString()");
@@ -121,7 +121,7 @@ public final class g {
     public static final c0 getReceiverTypeFromFunctionType(c0 c0Var) {
         m.checkNotNullParameter(c0Var, "<this>");
         isBuiltinFunctionalType(c0Var);
-        if (c0Var.getAnnotations().findAnnotation(k.a.f2427x) != null) {
+        if (c0Var.getAnnotations().findAnnotation(k.a.f2433x) != null) {
             return ((w0) u.first((List<? extends Object>) c0Var.getArguments())).getType();
         }
         return null;
@@ -147,7 +147,7 @@ public final class g {
         if (!isBuiltinFunctionalType(c0Var)) {
             return false;
         }
-        return c0Var.getAnnotations().findAnnotation(k.a.f2427x) != null;
+        return c0Var.getAnnotations().findAnnotation(k.a.f2433x) != null;
     }
 
     public static final boolean isBuiltinFunctionalClassDescriptor(d0.e0.p.d.m0.c.m mVar) {
@@ -177,7 +177,7 @@ public final class g {
     public static final d0.e0.p.d.m0.c.g1.g withExtensionFunctionAnnotation(d0.e0.p.d.m0.c.g1.g gVar, h hVar) {
         m.checkNotNullParameter(gVar, "<this>");
         m.checkNotNullParameter(hVar, "builtIns");
-        b bVar = k.a.f2427x;
+        b bVar = k.a.f2433x;
         return gVar.hasAnnotation(bVar) ? gVar : d0.e0.p.d.m0.c.g1.g.f.create(u.plus(gVar, new j(hVar, bVar, h0.emptyMap())));
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/h.java b/app/src/main/java/d0/e0/p/d/m0/b/h.java
index 305220129f..aba7f66296 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/h.java
@@ -39,7 +39,7 @@ public abstract class h {
     public y b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final j<e> f2411c;
+    public final j<e> f2417c;
     public final d0.e0.p.d.m0.m.h<d0.e0.p.d.m0.g.e, d0.e0.p.d.m0.c.e> d;
     public final o e;
 
@@ -130,12 +130,12 @@ public abstract class h {
         public final Map<c0, d0.e0.p.d.m0.n.j0> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Map<d0.e0.p.d.m0.n.j0, d0.e0.p.d.m0.n.j0> f2412c;
+        public final Map<d0.e0.p.d.m0.n.j0, d0.e0.p.d.m0.n.j0> f2418c;
 
         public e(Map map, Map map2, Map map3, a aVar) {
             this.a = map;
             this.b = map2;
-            this.f2412c = map3;
+            this.f2418c = map3;
         }
     }
 
@@ -143,7 +143,7 @@ public abstract class h {
         if (oVar != null) {
             this.e = oVar;
             oVar.createLazyValue(new a());
-            this.f2411c = oVar.createLazyValue(new b());
+            this.f2417c = oVar.createLazyValue(new b());
             this.d = oVar.createMemoizedFunction(new c());
             return;
         }
@@ -1385,7 +1385,7 @@ public abstract class h {
 
     public static boolean isNothingOrNullableNothing(c0 c0Var) {
         if (c0Var != null) {
-            return i(c0Var, k.a.f2417c);
+            return i(c0Var, k.a.f2423c);
         }
         a(137);
         throw null;
@@ -1443,7 +1443,7 @@ public abstract class h {
 
     public static boolean isSpecialClassWithNoSupertypes(d0.e0.p.d.m0.c.e eVar) {
         if (eVar != null) {
-            return c(eVar, k.a.b) || c(eVar, k.a.f2417c);
+            return c(eVar, k.a.b) || c(eVar, k.a.f2423c);
         }
         a(106);
         throw null;
@@ -1468,7 +1468,7 @@ public abstract class h {
 
     public static boolean isUByteArray(c0 c0Var) {
         if (c0Var != null) {
-            return j(c0Var, k.a.f2424i0.toUnsafe());
+            return j(c0Var, k.a.f2430i0.toUnsafe());
         }
         a(127);
         throw null;
@@ -1492,7 +1492,7 @@ public abstract class h {
 
     public static boolean isUShortArray(c0 c0Var) {
         if (c0Var != null) {
-            return j(c0Var, k.a.f2425j0.toUnsafe());
+            return j(c0Var, k.a.f2431j0.toUnsafe());
         }
         a(128);
         throw null;
@@ -1613,7 +1613,7 @@ public abstract class h {
             throw null;
         } else if (!isArray(c0Var)) {
             c0 makeNotNullable = e1.makeNotNullable(c0Var);
-            d0.e0.p.d.m0.n.j0 j0Var2 = this.f2411c.mo1invoke().f2412c.get(makeNotNullable);
+            d0.e0.p.d.m0.n.j0 j0Var2 = this.f2417c.mo1invoke().f2418c.get(makeNotNullable);
             if (j0Var2 != null) {
                 return j0Var2;
             }
@@ -1860,7 +1860,7 @@ public abstract class h {
 
     public d0.e0.p.d.m0.n.j0 getPrimitiveArrayKotlinType(i iVar) {
         if (iVar != null) {
-            d0.e0.p.d.m0.n.j0 j0Var = this.f2411c.mo1invoke().a.get(iVar);
+            d0.e0.p.d.m0.n.j0 j0Var = this.f2417c.mo1invoke().a.get(iVar);
             if (j0Var != null) {
                 return j0Var;
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/j.java b/app/src/main/java/d0/e0/p/d/m0/b/j.java
index fda67c6355..f6942dd2b1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/j.java
@@ -29,7 +29,7 @@ public final class j {
     public static final /* synthetic */ KProperty<Object>[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0 f2413c;
+    public final d0 f2419c;
     public final Lazy d;
     public final a e = new a(1);
 
@@ -102,7 +102,7 @@ public final class j {
     public j(d0.e0.p.d.m0.c.c0 c0Var, d0 d0Var) {
         m.checkNotNullParameter(c0Var, "module");
         m.checkNotNullParameter(d0Var, "notFoundClasses");
-        this.f2413c = d0Var;
+        this.f2419c = d0Var;
         this.d = d0.g.lazy(d0.i.PUBLICATION, new c(c0Var));
         new a(1);
         new a(1);
@@ -119,7 +119,7 @@ public final class j {
         m.checkNotNullExpressionValue(identifier, "identifier(className)");
         h contributedClassifier = ((i) jVar.d.getValue()).getContributedClassifier(identifier, d.FROM_REFLECTION);
         e eVar = contributedClassifier instanceof e ? (e) contributedClassifier : null;
-        return eVar == null ? jVar.f2413c.getClass(new d0.e0.p.d.m0.g.a(k.i, identifier), d0.t.m.listOf(Integer.valueOf(i))) : eVar;
+        return eVar == null ? jVar.f2419c.getClass(new d0.e0.p.d.m0.g.a(k.i, identifier), d0.t.m.listOf(Integer.valueOf(i))) : eVar;
     }
 
     public final e getKClass() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/k.java b/app/src/main/java/d0/e0/p/d/m0/b/k.java
index cbddcbea67..1dd7a1553c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/k.java
@@ -17,7 +17,7 @@ public final class k {
     public static final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f2414c;
+    public static final e f2420c;
     public static final b d;
     public static final b e;
     public static final b f;
@@ -63,45 +63,45 @@ public final class k {
         public static final a a;
 
         /* renamed from: a0  reason: collision with root package name */
-        public static final b f2415a0;
+        public static final b f2421a0;
         public static final c b;
 
         /* renamed from: b0  reason: collision with root package name */
-        public static final b f2416b0;
+        public static final b f2422b0;
 
         /* renamed from: c  reason: collision with root package name */
-        public static final c f2417c;
+        public static final c f2423c;
 
         /* renamed from: c0  reason: collision with root package name */
-        public static final b f2418c0;
+        public static final b f2424c0;
         public static final c d;
 
         /* renamed from: d0  reason: collision with root package name */
-        public static final b f2419d0;
+        public static final b f2425d0;
         public static final c e;
 
         /* renamed from: e0  reason: collision with root package name */
-        public static final d0.e0.p.d.m0.g.a f2420e0;
+        public static final d0.e0.p.d.m0.g.a f2426e0;
         public static final c f;
 
         /* renamed from: f0  reason: collision with root package name */
-        public static final d0.e0.p.d.m0.g.a f2421f0;
+        public static final d0.e0.p.d.m0.g.a f2427f0;
         public static final c g;
 
         /* renamed from: g0  reason: collision with root package name */
-        public static final d0.e0.p.d.m0.g.a f2422g0;
+        public static final d0.e0.p.d.m0.g.a f2428g0;
         public static final c h;
 
         /* renamed from: h0  reason: collision with root package name */
-        public static final d0.e0.p.d.m0.g.a f2423h0;
+        public static final d0.e0.p.d.m0.g.a f2429h0;
         public static final c i;
 
         /* renamed from: i0  reason: collision with root package name */
-        public static final b f2424i0;
+        public static final b f2430i0;
         public static final c j;
 
         /* renamed from: j0  reason: collision with root package name */
-        public static final b f2425j0;
+        public static final b f2431j0;
         public static final c k;
         public static final b k0;
         public static final c l;
@@ -118,20 +118,20 @@ public final class k {
         public static final c r;
 
         /* renamed from: s  reason: collision with root package name */
-        public static final b f2426s;
+        public static final b f2432s;
         public static final b t;
         public static final b u;
         public static final b v;
         public static final b w;
 
         /* renamed from: x  reason: collision with root package name */
-        public static final b f2427x;
+        public static final b f2433x;
 
         /* renamed from: y  reason: collision with root package name */
-        public static final b f2428y;
+        public static final b f2434y;
 
         /* renamed from: z  reason: collision with root package name */
-        public static final b f2429z;
+        public static final b f2435z;
 
         static {
             a aVar = new a();
@@ -141,7 +141,7 @@ public final class k {
             b = unsafe;
             c unsafe2 = aVar.c("Nothing").toUnsafe();
             m.checkNotNullExpressionValue(unsafe2, "fqName(simpleName).toUnsafe()");
-            f2417c = unsafe2;
+            f2423c = unsafe2;
             c unsafe3 = aVar.c("Cloneable").toUnsafe();
             m.checkNotNullExpressionValue(unsafe3, "fqName(simpleName).toUnsafe()");
             d = unsafe3;
@@ -189,7 +189,7 @@ public final class k {
             m.checkNotNullExpressionValue(unsafe17, "fqName(simpleName).toUnsafe()");
             r = unsafe17;
             m.checkNotNullExpressionValue(aVar.c("Function").toUnsafe(), "fqName(simpleName).toUnsafe()");
-            f2426s = aVar.c("Throwable");
+            f2432s = aVar.c("Throwable");
             t = aVar.c("Comparable");
             b bVar = k.o;
             m.checkNotNullExpressionValue(bVar.child(e.identifier("IntRange")).toUnsafe(), "RANGES_PACKAGE_FQ_NAME.child(Name.identifier(simpleName)).toUnsafe()");
@@ -198,9 +198,9 @@ public final class k {
             aVar.c("DeprecatedSinceKotlin");
             v = aVar.c("DeprecationLevel");
             w = aVar.c("ReplaceWith");
-            f2427x = aVar.c("ExtensionFunctionType");
-            f2428y = aVar.c("ParameterName");
-            f2429z = aVar.c("Annotation");
+            f2433x = aVar.c("ExtensionFunctionType");
+            f2434y = aVar.c("ParameterName");
+            f2435z = aVar.c("Annotation");
             A = aVar.a("Target");
             B = aVar.a("AnnotationTarget");
             C = aVar.a("AnnotationRetention");
@@ -247,27 +247,27 @@ public final class k {
             Z = aVar3;
             reflect("KDeclarationContainer");
             b c2 = aVar2.c("UByte");
-            f2415a0 = c2;
+            f2421a0 = c2;
             b c3 = aVar2.c("UShort");
-            f2416b0 = c3;
+            f2422b0 = c3;
             b c4 = aVar2.c("UInt");
-            f2418c0 = c4;
+            f2424c0 = c4;
             b c5 = aVar2.c("ULong");
-            f2419d0 = c5;
+            f2425d0 = c5;
             d0.e0.p.d.m0.g.a aVar4 = d0.e0.p.d.m0.g.a.topLevel(c2);
             m.checkNotNullExpressionValue(aVar4, "topLevel(uByteFqName)");
-            f2420e0 = aVar4;
+            f2426e0 = aVar4;
             d0.e0.p.d.m0.g.a aVar5 = d0.e0.p.d.m0.g.a.topLevel(c3);
             m.checkNotNullExpressionValue(aVar5, "topLevel(uShortFqName)");
-            f2421f0 = aVar5;
+            f2427f0 = aVar5;
             d0.e0.p.d.m0.g.a aVar6 = d0.e0.p.d.m0.g.a.topLevel(c4);
             m.checkNotNullExpressionValue(aVar6, "topLevel(uIntFqName)");
-            f2422g0 = aVar6;
+            f2428g0 = aVar6;
             d0.e0.p.d.m0.g.a aVar7 = d0.e0.p.d.m0.g.a.topLevel(c5);
             m.checkNotNullExpressionValue(aVar7, "topLevel(uLongFqName)");
-            f2423h0 = aVar7;
-            f2424i0 = aVar2.c("UByteArray");
-            f2425j0 = aVar2.c("UShortArray");
+            f2429h0 = aVar7;
+            f2430i0 = aVar2.c("UByteArray");
+            f2431j0 = aVar2.c("UShortArray");
             k0 = aVar2.c("UIntArray");
             l0 = aVar2.c("ULongArray");
             i.values();
@@ -350,7 +350,7 @@ public final class k {
         b = identifier;
         e identifier2 = e.identifier("valueOf");
         m.checkNotNullExpressionValue(identifier2, "identifier(\"valueOf\")");
-        f2414c = identifier2;
+        f2420c = identifier2;
         b bVar = new b("kotlin.coroutines");
         d = bVar;
         b child = bVar.child(e.identifier("experimental"));
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/o.java b/app/src/main/java/d0/e0/p/d/m0/b/o.java
index f1bde46069..133c0c2378 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/o.java
@@ -19,7 +19,7 @@ public final class o {
     public static final Set<e> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final HashMap<a, a> f2430c = new HashMap<>();
+    public static final HashMap<a, a> f2436c = new HashMap<>();
     public static final HashMap<a, a> d = new HashMap<>();
     public static final Set<e> e;
 
@@ -48,7 +48,7 @@ public final class o {
         while (i < 4) {
             n nVar = values4[i];
             i++;
-            f2430c.put(nVar.getArrayClassId(), nVar.getClassId());
+            f2436c.put(nVar.getArrayClassId(), nVar.getClassId());
             d.put(nVar.getClassId(), nVar.getArrayClassId());
         }
     }
@@ -64,7 +64,7 @@ public final class o {
 
     public final a getUnsignedClassIdByArrayClassId(a aVar) {
         m.checkNotNullParameter(aVar, "arrayClassId");
-        return f2430c.get(aVar);
+        return f2436c.get(aVar);
     }
 
     public final boolean isShortNameOfUnsignedArray(e eVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/p/b.java b/app/src/main/java/d0/e0/p/d/m0/b/p/b.java
index 727f4bb9cd..d8c15e3cca 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/p/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/p/b.java
@@ -39,7 +39,7 @@ public final class b extends d0.e0.p.d.m0.c.i1.a {
     public final c r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final int f2431s;
+    public final int f2437s;
     public final C0206b t = new C0206b(this);
     public final d u;
     public final List<z0> v;
@@ -55,31 +55,31 @@ public final class b extends d0.e0.p.d.m0.c.i1.a {
     public final class C0206b extends d0.e0.p.d.m0.n.b {
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ b f2432c;
+        public final /* synthetic */ b f2438c;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public C0206b(b bVar) {
             super(b.access$getStorageManager$p(bVar));
             m.checkNotNullParameter(bVar, "this$0");
-            this.f2432c = bVar;
+            this.f2438c = bVar;
         }
 
         @Override // d0.e0.p.d.m0.n.g
         public Collection<c0> a() {
             List<d0.e0.p.d.m0.g.a> list;
-            int ordinal = this.f2432c.getFunctionKind().ordinal();
+            int ordinal = this.f2438c.getFunctionKind().ordinal();
             if (ordinal == 0) {
                 list = d0.t.m.listOf(b.access$getFunctionClassId$cp());
             } else if (ordinal == 1) {
                 list = d0.t.m.listOf(b.access$getFunctionClassId$cp());
             } else if (ordinal == 2) {
-                list = n.listOf((Object[]) new d0.e0.p.d.m0.g.a[]{b.access$getKFunctionClassId$cp(), new d0.e0.p.d.m0.g.a(k.l, c.Function.numberedClassName(this.f2432c.getArity()))});
+                list = n.listOf((Object[]) new d0.e0.p.d.m0.g.a[]{b.access$getKFunctionClassId$cp(), new d0.e0.p.d.m0.g.a(k.l, c.Function.numberedClassName(this.f2438c.getArity()))});
             } else if (ordinal == 3) {
-                list = n.listOf((Object[]) new d0.e0.p.d.m0.g.a[]{b.access$getKFunctionClassId$cp(), new d0.e0.p.d.m0.g.a(k.d, c.SuspendFunction.numberedClassName(this.f2432c.getArity()))});
+                list = n.listOf((Object[]) new d0.e0.p.d.m0.g.a[]{b.access$getKFunctionClassId$cp(), new d0.e0.p.d.m0.g.a(k.d, c.SuspendFunction.numberedClassName(this.f2438c.getArity()))});
             } else {
                 throw new NoWhenBranchMatchedException();
             }
-            d0.e0.p.d.m0.c.c0 containingDeclaration = b.access$getContainingDeclaration$p(this.f2432c).getContainingDeclaration();
+            d0.e0.p.d.m0.c.c0 containingDeclaration = b.access$getContainingDeclaration$p(this.f2438c).getContainingDeclaration();
             ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(list, 10));
             for (d0.e0.p.d.m0.g.a aVar : list) {
                 d0.e0.p.d.m0.c.e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(containingDeclaration, aVar);
@@ -105,12 +105,12 @@ public final class b extends d0.e0.p.d.m0.c.i1.a {
 
         @Override // d0.e0.p.d.m0.n.b, d0.e0.p.d.m0.n.g, d0.e0.p.d.m0.n.u0
         public b getDeclarationDescriptor() {
-            return this.f2432c;
+            return this.f2438c;
         }
 
         @Override // d0.e0.p.d.m0.n.u0
         public List<z0> getParameters() {
-            return b.access$getParameters$p(this.f2432c);
+            return b.access$getParameters$p(this.f2438c);
         }
 
         @Override // d0.e0.p.d.m0.n.u0
@@ -136,7 +136,7 @@ public final class b extends d0.e0.p.d.m0.c.i1.a {
         this.p = oVar;
         this.q = e0Var;
         this.r = cVar;
-        this.f2431s = i;
+        this.f2437s = i;
         this.u = new d(oVar, this);
         ArrayList arrayList = new ArrayList();
         IntRange intRange = new IntRange(1, i);
@@ -180,7 +180,7 @@ public final class b extends d0.e0.p.d.m0.c.i1.a {
     }
 
     public final int getArity() {
-        return this.f2431s;
+        return this.f2437s;
     }
 
     @Override // d0.e0.p.d.m0.c.e
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/p/d.java b/app/src/main/java/d0/e0/p/d/m0/b/p/d.java
index d2c3f52a39..6538830d07 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/p/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/p/d.java
@@ -17,7 +17,7 @@ public final class d extends e {
 
     @Override // d0.e0.p.d.m0.k.a0.e
     public List<x> a() {
-        int ordinal = ((b) this.f2611c).getFunctionKind().ordinal();
-        return ordinal != 0 ? ordinal != 1 ? n.emptyList() : d0.t.m.listOf(e.L.create((b) this.f2611c, true)) : d0.t.m.listOf(e.L.create((b) this.f2611c, false));
+        int ordinal = ((b) this.f2617c).getFunctionKind().ordinal();
+        return ordinal != 0 ? ordinal != 1 ? n.emptyList() : d0.t.m.listOf(e.L.create((b) this.f2617c, true)) : d0.t.m.listOf(e.L.create((b) this.f2617c, false));
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/a.java b/app/src/main/java/d0/e0/p/d/m0/b/q/a.java
index 1538decc25..ea060985a9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/a.java
@@ -50,8 +50,8 @@ public final class a extends e {
 
     @Override // d0.e0.p.d.m0.k.a0.e
     public List<x> a() {
-        g0 create = g0.create(this.f2611c, g.f.getEMPTY(), e.getCLONE_NAME(), b.a.DECLARATION, u0.a);
-        create.initialize((q0) null, this.f2611c.getThisAsReceiverParameter(), n.emptyList(), n.emptyList(), (c0) d0.e0.p.d.m0.k.x.a.getBuiltIns(this.f2611c).getAnyType(), z.OPEN, t.f2497c);
+        g0 create = g0.create(this.f2617c, g.f.getEMPTY(), e.getCLONE_NAME(), b.a.DECLARATION, u0.a);
+        create.initialize((q0) null, this.f2617c.getThisAsReceiverParameter(), n.emptyList(), n.emptyList(), (c0) d0.e0.p.d.m0.k.x.a.getBuiltIns(this.f2617c).getAnyType(), z.OPEN, t.f2503c);
         return d0.t.m.listOf(create);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/c.java b/app/src/main/java/d0/e0/p/d/m0/b/q/c.java
index 73bc8eacfe..372cbc5754 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/c.java
@@ -25,7 +25,7 @@ public final class c {
     public static final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String f2433c;
+    public static final String f2439c;
     public static final String d;
     public static final String e;
     public static final d0.e0.p.d.m0.g.a f;
@@ -43,7 +43,7 @@ public final class c {
         public final d0.e0.p.d.m0.g.a b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final d0.e0.p.d.m0.g.a f2434c;
+        public final d0.e0.p.d.m0.g.a f2440c;
 
         public a(d0.e0.p.d.m0.g.a aVar, d0.e0.p.d.m0.g.a aVar2, d0.e0.p.d.m0.g.a aVar3) {
             m.checkNotNullParameter(aVar, "javaClass");
@@ -51,7 +51,7 @@ public final class c {
             m.checkNotNullParameter(aVar3, "kotlinMutable");
             this.a = aVar;
             this.b = aVar2;
-            this.f2434c = aVar3;
+            this.f2440c = aVar3;
         }
 
         public final d0.e0.p.d.m0.g.a component1() {
@@ -63,7 +63,7 @@ public final class c {
         }
 
         public final d0.e0.p.d.m0.g.a component3() {
-            return this.f2434c;
+            return this.f2440c;
         }
 
         public boolean equals(Object obj) {
@@ -74,7 +74,7 @@ public final class c {
                 return false;
             }
             a aVar = (a) obj;
-            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2434c, aVar.f2434c);
+            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2440c, aVar.f2440c);
         }
 
         public final d0.e0.p.d.m0.g.a getJavaClass() {
@@ -83,7 +83,7 @@ public final class c {
 
         public int hashCode() {
             int hashCode = this.b.hashCode();
-            return this.f2434c.hashCode() + ((hashCode + (this.a.hashCode() * 31)) * 31);
+            return this.f2440c.hashCode() + ((hashCode + (this.a.hashCode() * 31)) * 31);
         }
 
         public String toString() {
@@ -92,7 +92,7 @@ public final class c {
             L.append(", kotlinReadOnly=");
             L.append(this.b);
             L.append(", kotlinMutable=");
-            L.append(this.f2434c);
+            L.append(this.f2440c);
             L.append(')');
             return L.toString();
         }
@@ -112,7 +112,7 @@ public final class c {
         sb2.append(cVar3.getPackageFqName().toString());
         sb2.append('.');
         sb2.append(cVar3.getClassNamePrefix());
-        f2433c = sb2.toString();
+        f2439c = sb2.toString();
         StringBuilder sb3 = new StringBuilder();
         d0.e0.p.d.m0.b.p.c cVar4 = d0.e0.p.d.m0.b.p.c.SuspendFunction;
         sb3.append(cVar4.getPackageFqName().toString());
@@ -199,12 +199,12 @@ public final class c {
         cVar.d(Object.class, k.a.b);
         cVar.d(String.class, k.a.g);
         cVar.d(CharSequence.class, k.a.f);
-        cVar.c(Throwable.class, k.a.f2426s);
+        cVar.c(Throwable.class, k.a.f2432s);
         cVar.d(Cloneable.class, k.a.d);
         cVar.d(Number.class, k.a.q);
         cVar.c(Comparable.class, k.a.t);
         cVar.d(Enum.class, k.a.r);
-        cVar.c(Annotation.class, k.a.f2429z);
+        cVar.c(Annotation.class, k.a.f2435z);
         for (a aVar17 : listOf) {
             c cVar6 = a;
             Objects.requireNonNull(cVar6);
@@ -265,7 +265,7 @@ public final class c {
             m.checkNotNullExpressionValue(aVar22, "topLevel(FqName(\"kotlin.jvm.functions.Function$i\"))");
             k kVar2 = k.a;
             cVar9.a(aVar22, k.getFunctionClassId(i4));
-            cVar9.b(new b(m.stringPlus(f2433c, Integer.valueOf(i4))), h);
+            cVar9.b(new b(m.stringPlus(f2439c, Integer.valueOf(i4))), h);
             if (i5 >= 23) {
                 break;
             }
@@ -277,7 +277,7 @@ public final class c {
             c cVar11 = a;
             cVar11.b(new b(m.stringPlus(cVar10.getPackageFqName().toString() + '.' + cVar10.getClassNamePrefix(), Integer.valueOf(i2))), h);
             if (i6 >= 22) {
-                b safe = k.a.f2417c.toSafe();
+                b safe = k.a.f2423c.toSafe();
                 m.checkNotNullExpressionValue(safe, "nothing.toSafe()");
                 cVar11.b(safe, cVar11.e(Void.class));
                 return;
@@ -373,7 +373,7 @@ public final class c {
 
     public final d0.e0.p.d.m0.g.a mapKotlinToJava(d0.e0.p.d.m0.g.c cVar) {
         m.checkNotNullParameter(cVar, "kotlinFqName");
-        return f(cVar, b) ? f : f(cVar, d) ? f : f(cVar, f2433c) ? h : f(cVar, e) ? h : j.get(cVar);
+        return f(cVar, b) ? f : f(cVar, d) ? f : f(cVar, f2439c) ? h : f(cVar, e) ? h : j.get(cVar);
     }
 
     public final b mutableToReadOnly(d0.e0.p.d.m0.g.c cVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/e.java b/app/src/main/java/d0/e0/p/d/m0/b/q/e.java
index 401b4323fe..cea9cb1c24 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/e.java
@@ -29,7 +29,7 @@ public final class e implements d0.e0.p.d.m0.c.h1.b {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(e.class), "cloneable", "getCloneable()Lorg/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d0.e0.p.d.m0.g.b f2435c = k.l;
+    public static final d0.e0.p.d.m0.g.b f2441c = k.l;
     public static final d0.e0.p.d.m0.g.e d;
     public static final d0.e0.p.d.m0.g.a e;
     public final c0 f;
@@ -127,7 +127,7 @@ public final class e implements d0.e0.p.d.m0.c.h1.b {
     }
 
     public static final /* synthetic */ d0.e0.p.d.m0.g.b access$getKOTLIN_FQ_NAME$cp() {
-        return f2435c;
+        return f2441c;
     }
 
     public static final /* synthetic */ c0 access$getModuleDescriptor$p(e eVar) {
@@ -146,13 +146,13 @@ public final class e implements d0.e0.p.d.m0.c.h1.b {
     @Override // d0.e0.p.d.m0.c.h1.b
     public Collection<d0.e0.p.d.m0.c.e> getAllContributedClassesIfPossible(d0.e0.p.d.m0.g.b bVar) {
         d0.z.d.m.checkNotNullParameter(bVar, "packageFqName");
-        return d0.z.d.m.areEqual(bVar, f2435c) ? m0.setOf((i) n.getValue(this.h, this, b[0])) : n0.emptySet();
+        return d0.z.d.m.areEqual(bVar, f2441c) ? m0.setOf((i) n.getValue(this.h, this, b[0])) : n0.emptySet();
     }
 
     @Override // d0.e0.p.d.m0.c.h1.b
     public boolean shouldCreateClass(d0.e0.p.d.m0.g.b bVar, d0.e0.p.d.m0.g.e eVar) {
         d0.z.d.m.checkNotNullParameter(bVar, "packageFqName");
         d0.z.d.m.checkNotNullParameter(eVar, "name");
-        return d0.z.d.m.areEqual(eVar, d) && d0.z.d.m.areEqual(bVar, f2435c);
+        return d0.z.d.m.areEqual(eVar, d) && d0.z.d.m.areEqual(bVar, f2441c);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/g.java b/app/src/main/java/d0/e0/p/d/m0/b/q/g.java
index b2c97b96bd..2448fef08b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/g.java
@@ -45,7 +45,7 @@ public final class g implements d0.e0.p.d.m0.c.h1.a, d0.e0.p.d.m0.c.h1.c {
     public final c0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d f2436c = d.a;
+    public final d f2442c = d.a;
     public final j d;
     public final d0.e0.p.d.m0.n.c0 e;
     public final j f;
@@ -130,7 +130,7 @@ public final class g implements d0.e0.p.d.m0.c.h1.a, d0.e0.p.d.m0.c.h1.c {
     }
 
     public static final /* synthetic */ d access$getJ2kClassMapper$p(g gVar) {
-        return gVar.f2436c;
+        return gVar.f2442c;
     }
 
     public static final /* synthetic */ d0.e0.p.d.m0.e.a.i0.l.f access$getJavaAnalogue(g gVar, e eVar) {
@@ -182,7 +182,7 @@ public final class g implements d0.e0.p.d.m0.c.h1.a, d0.e0.p.d.m0.c.h1.c {
         if (a2 == null) {
             return d0.t.n.emptyList();
         }
-        e mapJavaToKotlin$default = d.mapJavaToKotlin$default(this.f2436c, d0.e0.p.d.m0.k.x.a.getFqNameSafe(a2), b.f.getInstance(), null, 4, null);
+        e mapJavaToKotlin$default = d.mapJavaToKotlin$default(this.f2442c, d0.e0.p.d.m0.k.x.a.getFqNameSafe(a2), b.f.getInstance(), null, 4, null);
         if (mapJavaToKotlin$default == null) {
             return d0.t.n.emptyList();
         }
@@ -315,7 +315,7 @@ public final class g implements d0.e0.p.d.m0.c.h1.a, d0.e0.p.d.m0.c.h1.c {
             if (a2 == null) {
                 list = d0.t.n.emptyList();
             } else {
-                Collection<e> mapPlatformClass = this.f2436c.mapPlatformClass(d0.e0.p.d.m0.k.x.a.getFqNameSafe(a2), b.f.getInstance());
+                Collection<e> mapPlatformClass = this.f2442c.mapPlatformClass(d0.e0.p.d.m0.k.x.a.getFqNameSafe(a2), b.f.getInstance());
                 e eVar3 = (e) u.lastOrNull(mapPlatformClass);
                 if (eVar3 == null) {
                     list = d0.t.n.emptyList();
@@ -326,7 +326,7 @@ public final class g implements d0.e0.p.d.m0.c.h1.a, d0.e0.p.d.m0.c.h1.c {
                         arrayList.add(d0.e0.p.d.m0.k.x.a.getFqNameSafe(eVar4));
                     }
                     d0.e0.p.d.m0.p.j create = bVar.create(arrayList);
-                    boolean isMutable = this.f2436c.isMutable(eVar2);
+                    boolean isMutable = this.f2442c.isMutable(eVar2);
                     i unsubstitutedMemberScope = ((e) ((f.d) this.g).computeIfAbsent(d0.e0.p.d.m0.k.x.a.getFqNameSafe(a2), new j(a2, eVar3))).getUnsubstitutedMemberScope();
                     m.checkNotNullExpressionValue(unsubstitutedMemberScope, "fakeJavaClassDescriptor.unsubstitutedMemberScope");
                     ArrayList arrayList2 = new ArrayList();
diff --git a/app/src/main/java/d0/e0/p/d/m0/b/q/p.java b/app/src/main/java/d0/e0/p/d/m0/b/q/p.java
index 8f3b29641c..697f14e2f9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/b/q/p.java
+++ b/app/src/main/java/d0/e0/p/d/m0/b/q/p.java
@@ -20,7 +20,7 @@ public final class p {
     public static final Set<String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Set<String> f2437c;
+    public static final Set<String> f2443c;
     public static final Set<String> d;
     public static final Set<String> e;
     public static final Set<String> f;
@@ -39,7 +39,7 @@ public final class p {
             m.checkNotNullExpressionValue(asString, "it.wrapperFqName.shortName().asString()");
             r.addAll(linkedHashSet, wVar.inJavaLang(asString, dVar.getJavaKeywordName() + "Value()" + dVar.getDesc()));
         }
-        f2437c = o0.plus(o0.plus(o0.plus(o0.plus(o0.plus(o0.plus((Set) linkedHashSet, (Iterable) wVar.inJavaUtil("List", "sort(Ljava/util/Comparator;)V")), (Iterable) wVar.inJavaLang("String", "codePointAt(I)I", "codePointBefore(I)I", "codePointCount(II)I", "compareToIgnoreCase(Ljava/lang/String;)I", "concat(Ljava/lang/String;)Ljava/lang/String;", "contains(Ljava/lang/CharSequence;)Z", "contentEquals(Ljava/lang/CharSequence;)Z", "contentEquals(Ljava/lang/StringBuffer;)Z", "endsWith(Ljava/lang/String;)Z", "equalsIgnoreCase(Ljava/lang/String;)Z", "getBytes()[B", "getBytes(II[BI)V", "getBytes(Ljava/lang/String;)[B", "getBytes(Ljava/nio/charset/Charset;)[B", "getChars(II[CI)V", "indexOf(I)I", "indexOf(II)I", "indexOf(Ljava/lang/String;)I", "indexOf(Ljava/lang/String;I)I", "intern()Ljava/lang/String;", "isEmpty()Z", "lastIndexOf(I)I", "lastIndexOf(II)I", "lastIndexOf(Ljava/lang/String;)I", "lastIndexOf(Ljava/lang/String;I)I", "matches(Ljava/lang/String;)Z", "offsetByCodePoints(II)I", "regionMatches(ILjava/lang/String;II)Z", "regionMatches(ZILjava/lang/String;II)Z", "replaceAll(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", "replace(CC)Ljava/lang/String;", "replaceFirst(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", "replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;", "split(Ljava/lang/String;I)[Ljava/lang/String;", "split(Ljava/lang/String;)[Ljava/lang/String;", "startsWith(Ljava/lang/String;I)Z", "startsWith(Ljava/lang/String;)Z", "substring(II)Ljava/lang/String;", "substring(I)Ljava/lang/String;", "toCharArray()[C", "toLowerCase()Ljava/lang/String;", "toLowerCase(Ljava/util/Locale;)Ljava/lang/String;", "toUpperCase()Ljava/lang/String;", "toUpperCase(Ljava/util/Locale;)Ljava/lang/String;", "trim()Ljava/lang/String;", "isBlank()Z", "lines()Ljava/util/stream/Stream;", "repeat(I)Ljava/lang/String;")), (Iterable) wVar.inJavaLang("Double", "isInfinite()Z", "isNaN()Z")), (Iterable) wVar.inJavaLang("Float", "isInfinite()Z", "isNaN()Z")), (Iterable) wVar.inJavaLang("Enum", "getDeclaringClass()Ljava/lang/Class;", "finalize()V")), (Iterable) wVar.inJavaLang("CharSequence", "isEmpty()Z"));
+        f2443c = o0.plus(o0.plus(o0.plus(o0.plus(o0.plus(o0.plus((Set) linkedHashSet, (Iterable) wVar.inJavaUtil("List", "sort(Ljava/util/Comparator;)V")), (Iterable) wVar.inJavaLang("String", "codePointAt(I)I", "codePointBefore(I)I", "codePointCount(II)I", "compareToIgnoreCase(Ljava/lang/String;)I", "concat(Ljava/lang/String;)Ljava/lang/String;", "contains(Ljava/lang/CharSequence;)Z", "contentEquals(Ljava/lang/CharSequence;)Z", "contentEquals(Ljava/lang/StringBuffer;)Z", "endsWith(Ljava/lang/String;)Z", "equalsIgnoreCase(Ljava/lang/String;)Z", "getBytes()[B", "getBytes(II[BI)V", "getBytes(Ljava/lang/String;)[B", "getBytes(Ljava/nio/charset/Charset;)[B", "getChars(II[CI)V", "indexOf(I)I", "indexOf(II)I", "indexOf(Ljava/lang/String;)I", "indexOf(Ljava/lang/String;I)I", "intern()Ljava/lang/String;", "isEmpty()Z", "lastIndexOf(I)I", "lastIndexOf(II)I", "lastIndexOf(Ljava/lang/String;)I", "lastIndexOf(Ljava/lang/String;I)I", "matches(Ljava/lang/String;)Z", "offsetByCodePoints(II)I", "regionMatches(ILjava/lang/String;II)Z", "regionMatches(ZILjava/lang/String;II)Z", "replaceAll(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", "replace(CC)Ljava/lang/String;", "replaceFirst(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", "replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;", "split(Ljava/lang/String;I)[Ljava/lang/String;", "split(Ljava/lang/String;)[Ljava/lang/String;", "startsWith(Ljava/lang/String;I)Z", "startsWith(Ljava/lang/String;)Z", "substring(II)Ljava/lang/String;", "substring(I)Ljava/lang/String;", "toCharArray()[C", "toLowerCase()Ljava/lang/String;", "toLowerCase(Ljava/util/Locale;)Ljava/lang/String;", "toUpperCase()Ljava/lang/String;", "toUpperCase(Ljava/util/Locale;)Ljava/lang/String;", "trim()Ljava/lang/String;", "isBlank()Z", "lines()Ljava/util/stream/Stream;", "repeat(I)Ljava/lang/String;")), (Iterable) wVar.inJavaLang("Double", "isInfinite()Z", "isNaN()Z")), (Iterable) wVar.inJavaLang("Float", "isInfinite()Z", "isNaN()Z")), (Iterable) wVar.inJavaLang("Enum", "getDeclaringClass()Ljava/lang/Class;", "finalize()V")), (Iterable) wVar.inJavaLang("CharSequence", "isEmpty()Z"));
         w wVar2 = w.a;
         d = o0.plus(o0.plus(o0.plus(o0.plus(o0.plus(o0.plus((Set) wVar2.inJavaLang("CharSequence", "codePoints()Ljava/util/stream/IntStream;", "chars()Ljava/util/stream/IntStream;"), (Iterable) wVar2.inJavaUtil("Iterator", "forEachRemaining(Ljava/util/function/Consumer;)V")), (Iterable) wVar2.inJavaLang("Iterable", "forEach(Ljava/util/function/Consumer;)V", "spliterator()Ljava/util/Spliterator;")), (Iterable) wVar2.inJavaLang("Throwable", "setStackTrace([Ljava/lang/StackTraceElement;)V", "fillInStackTrace()Ljava/lang/Throwable;", "getLocalizedMessage()Ljava/lang/String;", "printStackTrace()V", "printStackTrace(Ljava/io/PrintStream;)V", "printStackTrace(Ljava/io/PrintWriter;)V", "getStackTrace()[Ljava/lang/StackTraceElement;", "initCause(Ljava/lang/Throwable;)Ljava/lang/Throwable;", "getSuppressed()[Ljava/lang/Throwable;", "addSuppressed(Ljava/lang/Throwable;)V")), (Iterable) wVar2.inJavaUtil("Collection", "spliterator()Ljava/util/Spliterator;", "parallelStream()Ljava/util/stream/Stream;", "stream()Ljava/util/stream/Stream;", "removeIf(Ljava/util/function/Predicate;)Z")), (Iterable) wVar2.inJavaUtil("List", "replaceAll(Ljava/util/function/UnaryOperator;)V")), (Iterable) wVar2.inJavaUtil("Map", "getOrDefault(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", "forEach(Ljava/util/function/BiConsumer;)V", "replaceAll(Ljava/util/function/BiFunction;)V", "merge(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", "computeIfPresent(Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", "putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", "replace(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z", "replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", "computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", "compute(Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;"));
         e = o0.plus(o0.plus((Set) wVar2.inJavaUtil("Collection", "removeIf(Ljava/util/function/Predicate;)Z"), (Iterable) wVar2.inJavaUtil("List", "replaceAll(Ljava/util/function/UnaryOperator;)V", "sort(Ljava/util/Comparator;)V")), (Iterable) wVar2.inJavaUtil("Map", "computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", "computeIfPresent(Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", "compute(Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", "merge(Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;", "putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", "remove(Ljava/lang/Object;Ljava/lang/Object;)Z", "replaceAll(Ljava/util/function/BiFunction;)V", "replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", "replace(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z"));
@@ -79,7 +79,7 @@ public final class p {
     }
 
     public final Set<String> getHIDDEN_METHOD_SIGNATURES() {
-        return f2437c;
+        return f2443c;
     }
 
     public final Set<String> getMUTABLE_METHOD_SIGNATURES() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/d0.java b/app/src/main/java/d0/e0/p/d/m0/c/d0.java
index bdd9bf21c5..b4d39f8f42 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/d0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/d0.java
@@ -28,7 +28,7 @@ public final class d0 {
     public final c0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final h<d0.e0.p.d.m0.g.b, e0> f2438c;
+    public final h<d0.e0.p.d.m0.g.b, e0> f2444c;
     public final h<a, e> d;
 
     /* compiled from: NotFoundClasses.kt */
@@ -82,7 +82,7 @@ public final class d0 {
         public final List<z0> r;
 
         /* renamed from: s  reason: collision with root package name */
-        public final i f2439s;
+        public final i f2445s;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public b(o oVar, m mVar, e eVar, boolean z2, int i) {
@@ -99,7 +99,7 @@ public final class d0 {
                 arrayList.add(k0.createWithDefaultBound(this, g.f.getEMPTY(), false, j1.INVARIANT, e.identifier(m.stringPlus("T", Integer.valueOf(nextInt))), nextInt, oVar));
             }
             this.r = arrayList;
-            this.f2439s = new i(this, a1.computeConstructorTypeParameters(this), m0.setOf(d0.e0.p.d.m0.k.x.a.getModule(this).getBuiltIns().getAnyType()), oVar);
+            this.f2445s = new i(this, a1.computeConstructorTypeParameters(this), m0.setOf(d0.e0.p.d.m0.k.x.a.getModule(this).getBuiltIns().getAnyType()), oVar);
         }
 
         @Override // d0.e0.p.d.m0.c.g1.a
@@ -144,7 +144,7 @@ public final class d0 {
 
         @Override // d0.e0.p.d.m0.c.h
         public d0.e0.p.d.m0.n.i getTypeConstructor() {
-            return this.f2439s;
+            return this.f2445s;
         }
 
         @Override // d0.e0.p.d.m0.c.i1.u
@@ -273,7 +273,7 @@ public final class d0 {
         m.checkNotNullParameter(c0Var, "module");
         this.a = oVar;
         this.b = c0Var;
-        this.f2438c = oVar.createMemoizedFunction(new d(this));
+        this.f2444c = oVar.createMemoizedFunction(new d(this));
         this.d = oVar.createMemoizedFunction(new c(this));
     }
 
@@ -282,7 +282,7 @@ public final class d0 {
     }
 
     public static final /* synthetic */ h access$getPackageFragments$p(d0 d0Var) {
-        return d0Var.f2438c;
+        return d0Var.f2444c;
     }
 
     public static final /* synthetic */ o access$getStorageManager$p(d0 d0Var) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/e1.java b/app/src/main/java/d0/e0/p/d/m0/c/e1.java
index e42cda7e30..7b9d74a045 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/e1.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/e1.java
@@ -12,7 +12,7 @@ public final class e1 {
     public static final class a extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final a f2440c = new a();
+        public static final a f2446c = new a();
 
         public a() {
             super("inherited", false);
@@ -23,7 +23,7 @@ public final class e1 {
     public static final class b extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final b f2441c = new b();
+        public static final b f2447c = new b();
 
         public b() {
             super("internal", false);
@@ -34,7 +34,7 @@ public final class e1 {
     public static final class c extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final c f2442c = new c();
+        public static final c f2448c = new c();
 
         public c() {
             super("invisible_fake", false);
@@ -45,7 +45,7 @@ public final class e1 {
     public static final class d extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final d f2443c = new d();
+        public static final d f2449c = new d();
 
         public d() {
             super("local", false);
@@ -56,7 +56,7 @@ public final class e1 {
     public static final class e extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final e f2444c = new e();
+        public static final e f2450c = new e();
 
         public e() {
             super("private", false);
@@ -67,7 +67,7 @@ public final class e1 {
     public static final class f extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final f f2445c = new f();
+        public static final f f2451c = new f();
 
         public f() {
             super("private_to_this", false);
@@ -83,7 +83,7 @@ public final class e1 {
     public static final class g extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final g f2446c = new g();
+        public static final g f2452c = new g();
 
         public g() {
             super("protected", true);
@@ -94,7 +94,7 @@ public final class e1 {
     public static final class h extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final h f2447c = new h();
+        public static final h f2453c = new h();
 
         public h() {
             super("public", true);
@@ -105,7 +105,7 @@ public final class e1 {
     public static final class i extends f1 {
 
         /* renamed from: c  reason: collision with root package name */
-        public static final i f2448c = new i();
+        public static final i f2454c = new i();
 
         public i() {
             super("unknown", false);
@@ -114,11 +114,11 @@ public final class e1 {
 
     static {
         Map createMapBuilder = g0.createMapBuilder();
-        createMapBuilder.put(f.f2445c, 0);
-        createMapBuilder.put(e.f2444c, 0);
-        createMapBuilder.put(b.f2441c, 1);
-        createMapBuilder.put(g.f2446c, 1);
-        createMapBuilder.put(h.f2447c, 2);
+        createMapBuilder.put(f.f2451c, 0);
+        createMapBuilder.put(e.f2450c, 0);
+        createMapBuilder.put(b.f2447c, 1);
+        createMapBuilder.put(g.f2452c, 1);
+        createMapBuilder.put(h.f2453c, 2);
         b = g0.build(createMapBuilder);
     }
 
@@ -139,6 +139,6 @@ public final class e1 {
 
     public final boolean isPrivate(f1 f1Var) {
         m.checkNotNullParameter(f1Var, "visibility");
-        return f1Var == e.f2444c || f1Var == f.f2445c;
+        return f1Var == e.f2450c || f1Var == f.f2451c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/g1/d.java b/app/src/main/java/d0/e0/p/d/m0/c/g1/d.java
index 4db41a7b4a..e6cc3fecca 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/g1/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/g1/d.java
@@ -13,7 +13,7 @@ public class d implements c {
     public final Map<e, g<?>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final u0 f2449c;
+    public final u0 f2455c;
 
     public d(c0 c0Var, Map<e, g<?>> map, u0 u0Var) {
         if (c0Var == null) {
@@ -25,7 +25,7 @@ public class d implements c {
         } else if (u0Var != null) {
             this.a = c0Var;
             this.b = map;
-            this.f2449c = u0Var;
+            this.f2455c = u0Var;
         } else {
             a(2);
             throw null;
@@ -80,7 +80,7 @@ public class d implements c {
 
     @Override // d0.e0.p.d.m0.c.g1.c
     public u0 getSource() {
-        u0 u0Var = this.f2449c;
+        u0 u0Var = this.f2455c;
         if (u0Var != null) {
             return u0Var;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/g1/f.java b/app/src/main/java/d0/e0/p/d/m0/c/g1/f.java
index 408e25820c..a160d299b6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/g1/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/g1/f.java
@@ -20,7 +20,7 @@ public final class f {
     public static final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f2450c;
+    public static final e f2456c;
     public static final e d;
     public static final e e;
 
@@ -51,7 +51,7 @@ public final class f {
         b = identifier2;
         e identifier3 = e.identifier("level");
         m.checkNotNullExpressionValue(identifier3, "identifier(\"level\")");
-        f2450c = identifier3;
+        f2456c = identifier3;
         e identifier4 = e.identifier("expression");
         m.checkNotNullExpressionValue(identifier4, "identifier(\"expression\")");
         d = identifier4;
@@ -67,7 +67,7 @@ public final class f {
         m.checkNotNullParameter(str3, "level");
         j jVar = new j(hVar, k.a.w, h0.mapOf(d0.o.to(d, new w(str2)), d0.o.to(e, new b(n.emptyList(), new a(hVar)))));
         d0.e0.p.d.m0.g.b bVar = k.a.u;
-        e eVar = f2450c;
+        e eVar = f2456c;
         d0.e0.p.d.m0.g.a aVar = d0.e0.p.d.m0.g.a.topLevel(k.a.v);
         m.checkNotNullExpressionValue(aVar, "topLevel(StandardNames.FqNames.deprecationLevel)");
         e identifier = e.identifier(str3);
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/g1/j.java b/app/src/main/java/d0/e0/p/d/m0/c/g1/j.java
index 721064c929..7885cc57e7 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/g1/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/g1/j.java
@@ -19,7 +19,7 @@ public final class j implements c {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Map<e, g<?>> f2451c;
+    public final Map<e, g<?>> f2457c;
     public final Lazy d = d0.g.lazy(i.PUBLICATION, new a(this));
 
     /* compiled from: BuiltInAnnotationDescriptor.kt */
@@ -47,7 +47,7 @@ public final class j implements c {
         m.checkNotNullParameter(map, "allValueArguments");
         this.a = hVar;
         this.b = bVar;
-        this.f2451c = map;
+        this.f2457c = map;
     }
 
     public static final /* synthetic */ h access$getBuiltIns$p(j jVar) {
@@ -56,7 +56,7 @@ public final class j implements c {
 
     @Override // d0.e0.p.d.m0.c.g1.c
     public Map<e, g<?>> getAllValueArguments() {
-        return this.f2451c;
+        return this.f2457c;
     }
 
     @Override // d0.e0.p.d.m0.c.g1.c
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java
index 6eebfc12ab..c6c0de099d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/b0.java
@@ -28,7 +28,7 @@ public abstract class b0 extends l implements m0 {
     public final b.a r;
 
     /* renamed from: s  reason: collision with root package name */
-    public u f2456s;
+    public u f2462s;
     public x t;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -52,7 +52,7 @@ public abstract class b0 extends l implements m0 {
         } else if (u0Var != null) {
             this.t = null;
             this.o = zVar;
-            this.f2456s = uVar;
+            this.f2462s = uVar;
             this.p = n0Var;
             this.m = z2;
             this.n = z3;
@@ -276,7 +276,7 @@ public abstract class b0 extends l implements m0 {
 
     @Override // d0.e0.p.d.m0.c.q, d0.e0.p.d.m0.c.y
     public u getVisibility() {
-        u uVar = this.f2456s;
+        u uVar = this.f2462s;
         if (uVar != null) {
             return uVar;
         }
@@ -361,7 +361,7 @@ public abstract class b0 extends l implements m0 {
     }
 
     public void setVisibility(u uVar) {
-        this.f2456s = uVar;
+        this.f2462s = uVar;
     }
 
     /* Return type fixed from 'd0.e0.p.d.m0.c.x' to match base method */
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java
index 8d531c8f2c..61062c2e6b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/c0.java
@@ -40,20 +40,20 @@ public class c0 extends n0 implements n0 {
     public Collection<? extends n0> r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final n0 f2457s;
+    public final n0 f2463s;
     public final b.a t;
     public final boolean u;
     public final boolean v;
     public final boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final boolean f2458x;
+    public final boolean f2464x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final boolean f2459y;
+    public final boolean f2465y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final boolean f2460z;
+    public final boolean f2466z;
 
     /* compiled from: PropertyDescriptorImpl */
     public class a {
@@ -61,7 +61,7 @@ public class c0 extends n0 implements n0 {
         public z b;
 
         /* renamed from: c  reason: collision with root package name */
-        public u f2461c;
+        public u f2467c;
         public n0 d = null;
         public b.a e;
         public d0.e0.p.d.m0.n.z0 f;
@@ -73,7 +73,7 @@ public class c0 extends n0 implements n0 {
         public a() {
             this.a = c0.this.getContainingDeclaration();
             this.b = c0.this.getModality();
-            this.f2461c = c0.this.getVisibility();
+            this.f2467c = c0.this.getVisibility();
             this.e = c0.this.getKind();
             this.f = d0.e0.p.d.m0.n.z0.a;
             this.g = true;
@@ -212,7 +212,7 @@ public class c0 extends n0 implements n0 {
             p pVar = null;
             m mVar = this.a;
             z zVar = this.b;
-            u uVar = this.f2461c;
+            u uVar = this.f2467c;
             n0 n0Var = this.d;
             b.a aVar2 = this.e;
             e eVar = this.i;
@@ -367,7 +367,7 @@ public class c0 extends n0 implements n0 {
 
         public a setVisibility(u uVar) {
             if (uVar != null) {
-                this.f2461c = uVar;
+                this.f2467c = uVar;
                 return this;
             }
             a(8);
@@ -400,14 +400,14 @@ public class c0 extends n0 implements n0 {
             this.r = null;
             this.p = zVar;
             this.q = uVar;
-            this.f2457s = n0Var == null ? this : n0Var;
+            this.f2463s = n0Var == null ? this : n0Var;
             this.t = aVar;
             this.u = z3;
             this.v = z4;
             this.w = z5;
-            this.f2458x = z6;
-            this.f2459y = z7;
-            this.f2460z = z8;
+            this.f2464x = z6;
+            this.f2465y = z7;
+            this.f2466z = z8;
         } else {
             a(6);
             throw null;
@@ -823,7 +823,7 @@ public class c0 extends n0 implements n0 {
 
     @Override // d0.e0.p.d.m0.c.i1.l, d0.e0.p.d.m0.c.i1.k, d0.e0.p.d.m0.c.m
     public n0 getOriginal() {
-        n0 n0Var = this.f2457s;
+        n0 n0Var = this.f2463s;
         n0 original = n0Var == this ? this : n0Var.getOriginal();
         if (original != null) {
             return original;
@@ -894,7 +894,7 @@ public class c0 extends n0 implements n0 {
 
     @Override // d0.e0.p.d.m0.c.y
     public boolean isActual() {
-        return this.f2458x;
+        return this.f2464x;
     }
 
     @Override // d0.e0.p.d.m0.c.d1
@@ -904,7 +904,7 @@ public class c0 extends n0 implements n0 {
 
     @Override // d0.e0.p.d.m0.c.n0
     public boolean isDelegated() {
-        return this.f2460z;
+        return this.f2466z;
     }
 
     @Override // d0.e0.p.d.m0.c.y
@@ -914,7 +914,7 @@ public class c0 extends n0 implements n0 {
 
     @Override // d0.e0.p.d.m0.c.y
     public boolean isExternal() {
-        return this.f2459y;
+        return this.f2465y;
     }
 
     @Override // d0.e0.p.d.m0.c.d1
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java
index 38a8563bf5..4d530960a6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/e.java
@@ -72,7 +72,7 @@ public abstract class e extends l implements y0 {
         /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: java.util.List<? extends d0.e0.p.d.m0.c.z0>, java.util.List<d0.e0.p.d.m0.c.z0> */
         @Override // d0.e0.p.d.m0.n.u0
         public List<z0> getParameters() {
-            List list = ((l) this.a).f2637y;
+            List list = ((l) this.a).f2643y;
             if (list != null) {
                 return list;
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java
index 6cc522f0a3..b7bea6088a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/f.java
@@ -79,13 +79,13 @@ public abstract class f extends l implements z0 {
         public final x0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ f f2462c;
+        public final /* synthetic */ f f2468c;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public c(f fVar, o oVar, x0 x0Var) {
             super(oVar);
             if (oVar != null) {
-                this.f2462c = fVar;
+                this.f2468c = fVar;
                 this.b = x0Var;
                 return;
             }
@@ -157,7 +157,7 @@ public abstract class f extends l implements z0 {
 
         @Override // d0.e0.p.d.m0.n.g
         public Collection<c0> a() {
-            List<c0> d = this.f2462c.d();
+            List<c0> d = this.f2468c.d();
             if (d != null) {
                 return d;
             }
@@ -183,7 +183,7 @@ public abstract class f extends l implements z0 {
         @Override // d0.e0.p.d.m0.n.g
         public List<c0> e(List<c0> list) {
             if (list != null) {
-                List<c0> b = this.f2462c.b(list);
+                List<c0> b = this.f2468c.b(list);
                 if (b != null) {
                     return b;
                 }
@@ -197,7 +197,7 @@ public abstract class f extends l implements z0 {
         @Override // d0.e0.p.d.m0.n.g
         public void f(c0 c0Var) {
             if (c0Var != null) {
-                this.f2462c.c(c0Var);
+                this.f2468c.c(c0Var);
             } else {
                 g(6);
                 throw null;
@@ -206,7 +206,7 @@ public abstract class f extends l implements z0 {
 
         @Override // d0.e0.p.d.m0.n.u0
         public d0.e0.p.d.m0.b.h getBuiltIns() {
-            d0.e0.p.d.m0.b.h builtIns = d0.e0.p.d.m0.k.x.a.getBuiltIns(this.f2462c);
+            d0.e0.p.d.m0.b.h builtIns = d0.e0.p.d.m0.k.x.a.getBuiltIns(this.f2468c);
             if (builtIns != null) {
                 return builtIns;
             }
@@ -216,7 +216,7 @@ public abstract class f extends l implements z0 {
 
         @Override // d0.e0.p.d.m0.n.g, d0.e0.p.d.m0.n.u0
         public d0.e0.p.d.m0.c.h getDeclarationDescriptor() {
-            f fVar = this.f2462c;
+            f fVar = this.f2468c;
             if (fVar != null) {
                 return fVar;
             }
@@ -240,7 +240,7 @@ public abstract class f extends l implements z0 {
         }
 
         public String toString() {
-            return this.f2462c.getName().toString();
+            return this.f2468c.getName().toString();
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java
index fa6586bf69..45078dfb7e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/h0.java
@@ -20,13 +20,13 @@ public class h0 extends j {
     public final c0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final b f2463c;
+    public final b f2469c;
 
     public h0(c0 c0Var, b bVar) {
         m.checkNotNullParameter(c0Var, "moduleDescriptor");
         m.checkNotNullParameter(bVar, "fqName");
         this.b = c0Var;
-        this.f2463c = bVar;
+        this.f2469c = bVar;
     }
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
@@ -41,10 +41,10 @@ public class h0 extends j {
         if (!dVar.acceptsKinds(d.a.getPACKAGES_MASK())) {
             return n.emptyList();
         }
-        if (this.f2463c.isRoot() && dVar.getExcludes().contains(c.b.a)) {
+        if (this.f2469c.isRoot() && dVar.getExcludes().contains(c.b.a)) {
             return n.emptyList();
         }
-        Collection<b> subPackagesOf = this.b.getSubPackagesOf(this.f2463c, function1);
+        Collection<b> subPackagesOf = this.b.getSubPackagesOf(this.f2469c, function1);
         ArrayList arrayList = new ArrayList(subPackagesOf.size());
         for (b bVar : subPackagesOf) {
             e shortName = bVar.shortName();
@@ -54,7 +54,7 @@ public class h0 extends j {
                 j0 j0Var = null;
                 if (!shortName.isSpecial()) {
                     c0 c0Var = this.b;
-                    b child = this.f2463c.child(shortName);
+                    b child = this.f2469c.child(shortName);
                     m.checkNotNullExpressionValue(child, "fqName.child(name)");
                     j0 j0Var2 = c0Var.getPackage(child);
                     if (!j0Var2.isEmpty()) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java
index df9c2d48e7..57aa205c07 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/i.java
@@ -24,7 +24,7 @@ public class i extends h {
     public final f r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final u0 f2464s;
+    public final u0 f2470s;
     public d0.e0.p.d.m0.k.a0.i t;
     public Set<d> u;
     public d v;
@@ -53,7 +53,7 @@ public class i extends h {
         } else if (oVar != null) {
             this.q = zVar;
             this.r = fVar;
-            this.f2464s = new d0.e0.p.d.m0.n.i(this, Collections.emptyList(), collection, oVar);
+            this.f2470s = new d0.e0.p.d.m0.n.i(this, Collections.emptyList(), collection, oVar);
         } else {
             a(6);
             throw null;
@@ -299,7 +299,7 @@ public class i extends h {
 
     @Override // d0.e0.p.d.m0.c.h
     public u0 getTypeConstructor() {
-        u0 u0Var = this.f2464s;
+        u0 u0Var = this.f2470s;
         if (u0Var != null) {
             return u0Var;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java
index 6e2bc98e35..996b181e9d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/k.java
@@ -69,7 +69,7 @@ public abstract class k extends b implements m {
     public static String toString(m mVar) {
         if (mVar != null) {
             try {
-                String str = c.f2599c.render(mVar) + "[" + mVar.getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(mVar)) + "]";
+                String str = c.f2605c.render(mVar) + "[" + mVar.getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(mVar)) + "]";
                 if (str != null) {
                     return str;
                 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java
index 0f379e3189..a9cf06c67f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/k0.java
@@ -18,7 +18,7 @@ import kotlin.jvm.functions.Function1;
 public class k0 extends f {
 
     /* renamed from: s  reason: collision with root package name */
-    public final Function1<c0, Void> f2465s;
+    public final Function1<c0, Void> f2471s;
     public final List<c0> t;
     public boolean u;
 
@@ -46,7 +46,7 @@ public class k0 extends f {
         } else if (oVar != null) {
             this.t = new ArrayList(1);
             this.u = false;
-            this.f2465s = function1;
+            this.f2471s = function1;
         } else {
             a(25);
             throw null;
@@ -252,7 +252,7 @@ public class k0 extends f {
     @Override // d0.e0.p.d.m0.c.i1.f
     public void c(c0 c0Var) {
         if (c0Var != null) {
-            Function1<c0, Void> function1 = this.f2465s;
+            Function1<c0, Void> function1 = this.f2471s;
             if (function1 != null) {
                 function1.invoke(c0Var);
                 return;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java
index a40be6f0c3..d658e64902 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/l0.java
@@ -25,7 +25,7 @@ public class l0 extends m0 implements c1 {
     public final boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final c0 f2466s;
+    public final c0 f2472s;
     public final c1 t;
 
     /* compiled from: ValueParameterDescriptorImpl.kt */
@@ -111,7 +111,7 @@ public class l0 extends m0 implements c1 {
         this.p = z2;
         this.q = z3;
         this.r = z4;
-        this.f2466s = c0Var2;
+        this.f2472s = c0Var2;
         this.t = c1Var == null ? this : c1Var;
     }
 
@@ -181,7 +181,7 @@ public class l0 extends m0 implements c1 {
 
     @Override // d0.e0.p.d.m0.c.c1
     public c0 getVarargElementType() {
-        return this.f2466s;
+        return this.f2472s;
     }
 
     @Override // d0.e0.p.d.m0.c.q, d0.e0.p.d.m0.c.y
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java
index ba329211fe..059caaca7c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/o.java
@@ -32,7 +32,7 @@ public class o extends h {
     public final i r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final j<Set<e>> f2467s;
+    public final j<Set<e>> f2473s;
     public final g t;
 
     /* compiled from: EnumEntrySyntheticClassDescriptor */
@@ -40,7 +40,7 @@ public class o extends h {
         public final h<e, Collection<? extends t0>> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<e, Collection<? extends n0>> f2468c;
+        public final h<e, Collection<? extends n0>> f2474c;
         public final j<Collection<m>> d;
         public final /* synthetic */ o e;
 
@@ -88,7 +88,7 @@ public class o extends h {
                 a aVar = a.this;
                 Objects.requireNonNull(aVar);
                 HashSet hashSet = new HashSet();
-                for (e eVar : aVar.e.f2467s.mo1invoke()) {
+                for (e eVar : aVar.e.f2473s.mo1invoke()) {
                     d0.e0.p.d.m0.d.b.d dVar = d0.e0.p.d.m0.d.b.d.FOR_NON_TRACKED_SCOPE;
                     hashSet.addAll(aVar.getContributedFunctions(eVar, dVar));
                     hashSet.addAll(aVar.getContributedVariables(eVar, dVar));
@@ -150,7 +150,7 @@ public class o extends h {
             if (oVar2 != null) {
                 this.e = oVar;
                 this.b = oVar2.createMemoizedFunction(new C0214a(oVar));
-                this.f2468c = oVar2.createMemoizedFunction(new b(oVar));
+                this.f2474c = oVar2.createMemoizedFunction(new b(oVar));
                 this.d = oVar2.createLazyValue(new c(oVar));
                 return;
             }
@@ -441,7 +441,7 @@ public class o extends h {
                 a(1);
                 throw null;
             } else if (bVar != null) {
-                Collection<? extends n0> collection = (Collection) ((f.m) this.f2468c).invoke(eVar);
+                Collection<? extends n0> collection = (Collection) ((f.m) this.f2474c).invoke(eVar);
                 if (collection != null) {
                     return collection;
                 }
@@ -455,7 +455,7 @@ public class o extends h {
 
         @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
         public Set<e> getFunctionNames() {
-            Set<e> invoke = this.e.f2467s.mo1invoke();
+            Set<e> invoke = this.e.f2473s.mo1invoke();
             if (invoke != null) {
                 return invoke;
             }
@@ -465,7 +465,7 @@ public class o extends h {
 
         @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.i
         public Set<e> getVariableNames() {
-            Set<e> invoke = this.e.f2467s.mo1invoke();
+            Set<e> invoke = this.e.f2473s.mo1invoke();
             if (invoke != null) {
                 return invoke;
             }
@@ -496,7 +496,7 @@ public class o extends h {
             this.t = gVar;
             this.q = new d0.e0.p.d.m0.n.i(this, Collections.emptyList(), Collections.singleton(c0Var), oVar);
             this.r = new a(this, oVar);
-            this.f2467s = jVar;
+            this.f2473s = jVar;
         } else {
             a(12);
             throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java
index 80a2b4b57a..23c303b6c3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/q.java
@@ -48,20 +48,20 @@ public abstract class q extends l implements x {
     public z r;
 
     /* renamed from: s  reason: collision with root package name */
-    public u f2469s;
+    public u f2475s;
     public boolean t;
     public boolean u;
     public boolean v;
     public boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public boolean f2470x;
+    public boolean f2476x;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f2471y;
+    public boolean f2477y;
 
     /* renamed from: z  reason: collision with root package name */
-    public boolean f2472z;
+    public boolean f2478z;
 
     /* compiled from: FunctionDescriptorImpl */
     public class a implements Function0<Collection<x>> {
@@ -103,7 +103,7 @@ public abstract class q extends l implements x {
         public m b;
 
         /* renamed from: c  reason: collision with root package name */
-        public z f2473c;
+        public z f2479c;
         public u d;
         public x e;
         public b.a f;
@@ -121,7 +121,7 @@ public abstract class q extends l implements x {
         public g r;
 
         /* renamed from: s  reason: collision with root package name */
-        public boolean f2474s;
+        public boolean f2480s;
         public Map<a.AbstractC0209a<?>, Object> t;
         public Boolean u;
         public boolean v;
@@ -157,13 +157,13 @@ public abstract class q extends l implements x {
                 this.p = qVar.isHiddenToOvercomeSignatureClash();
                 this.q = null;
                 this.r = null;
-                this.f2474s = qVar.isHiddenForResolutionEverywhereBesideSupercalls();
+                this.f2480s = qVar.isHiddenForResolutionEverywhereBesideSupercalls();
                 this.t = new LinkedHashMap();
                 this.u = null;
                 this.v = false;
                 this.a = z0Var;
                 this.b = mVar;
-                this.f2473c = zVar;
+                this.f2479c = zVar;
                 this.d = uVar;
                 this.f = aVar;
                 this.g = list;
@@ -566,7 +566,7 @@ public abstract class q extends l implements x {
         /* Return type fixed from 'd0.e0.p.d.m0.c.i1.q$c' to match base method */
         @Override // d0.e0.p.d.m0.c.x.a
         public x.a<x> setHiddenForResolutionEverywhereBesideSupercalls() {
-            this.f2474s = true;
+            this.f2480s = true;
             return this;
         }
 
@@ -597,7 +597,7 @@ public abstract class q extends l implements x {
         @Override // d0.e0.p.d.m0.c.x.a
         public x.a<x> setModality(z zVar) {
             if (zVar != null) {
-                this.f2473c = zVar;
+                this.f2479c = zVar;
                 return this;
             }
             a(9);
@@ -719,14 +719,14 @@ public abstract class q extends l implements x {
             a(3);
             throw null;
         } else if (u0Var != null) {
-            this.f2469s = t.i;
+            this.f2475s = t.i;
             this.t = false;
             this.u = false;
             this.v = false;
             this.w = false;
-            this.f2470x = false;
-            this.f2471y = false;
-            this.f2472z = false;
+            this.f2476x = false;
+            this.f2477y = false;
+            this.f2478z = false;
             this.A = false;
             this.B = false;
             this.C = false;
@@ -1083,18 +1083,18 @@ public abstract class q extends l implements x {
                 if (!zArr[0] && cVar.v) {
                     return this;
                 }
-                b2.initialize(f0Var, q0Var, arrayList, substitutedValueParameters, substitute, cVar.f2473c, cVar.d);
+                b2.initialize(f0Var, q0Var, arrayList, substitutedValueParameters, substitute, cVar.f2479c, cVar.d);
                 b2.setOperator(this.t);
                 b2.setInfix(this.u);
                 b2.setExternal(this.v);
                 b2.setInline(this.w);
-                b2.setTailrec(this.f2470x);
+                b2.setTailrec(this.f2476x);
                 b2.setSuspend(this.C);
-                b2.setExpect(this.f2471y);
-                b2.setActual(this.f2472z);
+                b2.setExpect(this.f2477y);
+                b2.setActual(this.f2478z);
                 b2.setHasStableParameterNames(this.D);
                 b2.A = cVar.p;
-                b2.B = cVar.f2474s;
+                b2.B = cVar.f2480s;
                 Boolean bool = cVar.u;
                 b2.setHasSynthesizedParameterNames(bool != null ? bool.booleanValue() : this.E);
                 if (!cVar.t.isEmpty() || this.K != null) {
@@ -1254,7 +1254,7 @@ public abstract class q extends l implements x {
 
     @Override // d0.e0.p.d.m0.c.q, d0.e0.p.d.m0.c.y
     public u getVisibility() {
-        u uVar = this.f2469s;
+        u uVar = this.f2475s;
         if (uVar != null) {
             return uVar;
         }
@@ -1283,7 +1283,7 @@ public abstract class q extends l implements x {
             this.n = d0.t.u.toList(list2);
             this.o = c0Var;
             this.r = zVar;
-            this.f2469s = uVar;
+            this.f2475s = uVar;
             this.p = q0Var;
             this.q = q0Var2;
             for (int i = 0; i < list.size(); i++) {
@@ -1307,12 +1307,12 @@ public abstract class q extends l implements x {
 
     @Override // d0.e0.p.d.m0.c.y
     public boolean isActual() {
-        return this.f2472z;
+        return this.f2478z;
     }
 
     @Override // d0.e0.p.d.m0.c.y
     public boolean isExpect() {
-        return this.f2471y;
+        return this.f2477y;
     }
 
     @Override // d0.e0.p.d.m0.c.y
@@ -1368,7 +1368,7 @@ public abstract class q extends l implements x {
 
     @Override // d0.e0.p.d.m0.c.x
     public boolean isTailrec() {
-        return this.f2470x;
+        return this.f2476x;
     }
 
     @Override // d0.e0.p.d.m0.c.x, d0.e0.p.d.m0.c.t0
@@ -1384,11 +1384,11 @@ public abstract class q extends l implements x {
     }
 
     public void setActual(boolean z2) {
-        this.f2472z = z2;
+        this.f2478z = z2;
     }
 
     public void setExpect(boolean z2) {
-        this.f2471y = z2;
+        this.f2477y = z2;
     }
 
     public void setExternal(boolean z2) {
@@ -1448,12 +1448,12 @@ public abstract class q extends l implements x {
     }
 
     public void setTailrec(boolean z2) {
-        this.f2470x = z2;
+        this.f2476x = z2;
     }
 
     public void setVisibility(u uVar) {
         if (uVar != null) {
-            this.f2469s = uVar;
+            this.f2475s = uVar;
         } else {
             a(9);
             throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/x.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/x.java
index c62e74531f..9cfe7c2a0d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/x.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/x.java
@@ -9,7 +9,7 @@ public final class x implements w {
     public final Set<y> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<y> f2475c;
+    public final List<y> f2481c;
 
     public x(List<y> list, Set<y> set, List<y> list2, Set<y> set2) {
         m.checkNotNullParameter(list, "allDependencies");
@@ -18,7 +18,7 @@ public final class x implements w {
         m.checkNotNullParameter(set2, "allExpectedByDependencies");
         this.a = list;
         this.b = set;
-        this.f2475c = list2;
+        this.f2481c = list2;
     }
 
     @Override // d0.e0.p.d.m0.c.i1.w
@@ -28,7 +28,7 @@ public final class x implements w {
 
     @Override // d0.e0.p.d.m0.c.i1.w
     public List<y> getDirectExpectedByDependencies() {
-        return this.f2475c;
+        return this.f2481c;
     }
 
     @Override // d0.e0.p.d.m0.c.i1.w
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java b/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java
index ac42a0e0b4..8eb50ee4bf 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/i1/z.java
@@ -25,14 +25,14 @@ public class z extends h {
     public final boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public d0.e0.p.d.m0.c.z f2476s;
+    public d0.e0.p.d.m0.c.z f2482s;
     public u t;
     public u0 u;
     public List<z0> v;
     public final Collection<c0> w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final o f2477x;
+    public final o f2483x;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public z(m mVar, f fVar, boolean z2, boolean z3, e eVar, d0.e0.p.d.m0.c.u0 u0Var, o oVar) {
@@ -51,7 +51,7 @@ public class z extends h {
             throw null;
         } else if (oVar != null) {
             this.w = new ArrayList();
-            this.f2477x = oVar;
+            this.f2483x = oVar;
             this.q = fVar;
             this.r = z2;
         } else {
@@ -247,7 +247,7 @@ public class z extends h {
     }
 
     public void createTypeConstructor() {
-        this.u = new i(this, this.v, this.w, this.f2477x);
+        this.u = new i(this, this.v, this.w, this.f2483x);
         Iterator<d> it = getConstructors().iterator();
         while (it.hasNext()) {
             ((g) it.next()).setReturnType(getDefaultType());
@@ -301,7 +301,7 @@ public class z extends h {
 
     @Override // d0.e0.p.d.m0.c.e, d0.e0.p.d.m0.c.y
     public d0.e0.p.d.m0.c.z getModality() {
-        d0.e0.p.d.m0.c.z zVar = this.f2476s;
+        d0.e0.p.d.m0.c.z zVar = this.f2482s;
         if (zVar != null) {
             return zVar;
         }
@@ -410,7 +410,7 @@ public class z extends h {
 
     public void setModality(d0.e0.p.d.m0.c.z zVar) {
         if (zVar != null) {
-            this.f2476s = zVar;
+            this.f2482s = zVar;
         } else {
             a(6);
             throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/j1/a.java b/app/src/main/java/d0/e0/p/d/m0/c/j1/a.java
index 0a697e9497..5367a34533 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/j1/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/j1/a.java
@@ -7,7 +7,7 @@ import d0.z.d.m;
 public final class a extends f1 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2478c = new a();
+    public static final a f2484c = new a();
 
     public a() {
         super("package", false);
@@ -29,6 +29,6 @@ public final class a extends f1 {
 
     @Override // d0.e0.p.d.m0.c.f1
     public f1 normalize() {
-        return e1.g.f2446c;
+        return e1.g.f2452c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/j1/b.java b/app/src/main/java/d0/e0/p/d/m0/c/j1/b.java
index 3e127e23ed..17e859c5e2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/j1/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/j1/b.java
@@ -7,7 +7,7 @@ import d0.z.d.m;
 public final class b extends f1 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b f2479c = new b();
+    public static final b f2485c = new b();
 
     public b() {
         super("protected_and_package", true);
@@ -19,7 +19,7 @@ public final class b extends f1 {
         if (m.areEqual(this, f1Var)) {
             return 0;
         }
-        if (f1Var == e1.b.f2441c) {
+        if (f1Var == e1.b.f2447c) {
             return null;
         }
         return Integer.valueOf(e1.a.isPrivate(f1Var) ? 1 : -1);
@@ -32,6 +32,6 @@ public final class b extends f1 {
 
     @Override // d0.e0.p.d.m0.c.f1
     public f1 normalize() {
-        return e1.g.f2446c;
+        return e1.g.f2452c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/j1/c.java b/app/src/main/java/d0/e0/p/d/m0/c/j1/c.java
index 4342b631e5..ed3734e613 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/j1/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/j1/c.java
@@ -6,7 +6,7 @@ import d0.e0.p.d.m0.c.f1;
 public final class c extends f1 {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2480c = new c();
+    public static final c f2486c = new c();
 
     public c() {
         super("protected_static", true);
@@ -19,6 +19,6 @@ public final class c extends f1 {
 
     @Override // d0.e0.p.d.m0.c.f1
     public f1 normalize() {
-        return e1.g.f2446c;
+        return e1.g.f2452c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/a.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/a.java
index ca4d56b0cc..b26a4660d6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/a.java
@@ -21,7 +21,7 @@ public final class a {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ConcurrentHashMap<d0.e0.p.d.m0.g.a, i> f2481c = new ConcurrentHashMap<>();
+    public final ConcurrentHashMap<d0.e0.p.d.m0.g.a, i> f2487c = new ConcurrentHashMap<>();
 
     public a(f fVar, g gVar) {
         m.checkNotNullParameter(fVar, "resolver");
@@ -33,7 +33,7 @@ public final class a {
     public final i getPackagePartScope(f fVar) {
         Collection<p> collection;
         m.checkNotNullParameter(fVar, "fileClass");
-        ConcurrentHashMap<d0.e0.p.d.m0.g.a, i> concurrentHashMap = this.f2481c;
+        ConcurrentHashMap<d0.e0.p.d.m0.g.a, i> concurrentHashMap = this.f2487c;
         d0.e0.p.d.m0.g.a classId = fVar.getClassId();
         i iVar = concurrentHashMap.get(classId);
         if (iVar == null) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java
index 49477e5019..4b86da9e97 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/f.java
@@ -11,7 +11,7 @@ public final class f implements p {
     public final Class<?> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0.e0.p.d.m0.e.b.b0.a f2482c;
+    public final d0.e0.p.d.m0.e.b.b0.a f2488c;
 
     /* compiled from: ReflectKotlinClass.kt */
     public static final class a {
@@ -32,7 +32,7 @@ public final class f implements p {
 
     public f(Class cls, d0.e0.p.d.m0.e.b.b0.a aVar, DefaultConstructorMarker defaultConstructorMarker) {
         this.b = cls;
-        this.f2482c = aVar;
+        this.f2488c = aVar;
     }
 
     public boolean equals(Object obj) {
@@ -41,7 +41,7 @@ public final class f implements p {
 
     @Override // d0.e0.p.d.m0.e.b.p
     public d0.e0.p.d.m0.e.b.b0.a getClassHeader() {
-        return this.f2482c;
+        return this.f2488c;
     }
 
     @Override // d0.e0.p.d.m0.e.b.p
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/k.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/k.java
index f2876e64cc..b81c874bab 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/a/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/a/k.java
@@ -23,7 +23,7 @@ public final class k {
     public final j b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2483c;
+    public final a f2489c;
 
     /* compiled from: RuntimeModuleData.kt */
     public static final class a {
@@ -61,7 +61,7 @@ public final class k {
 
     public k(j jVar, a aVar, DefaultConstructorMarker defaultConstructorMarker) {
         this.b = jVar;
-        this.f2483c = aVar;
+        this.f2489c = aVar;
     }
 
     public final j getDeserialization() {
@@ -73,6 +73,6 @@ public final class k {
     }
 
     public final a getPackagePartScopeCache() {
-        return this.f2483c;
+        return this.f2489c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java
index c567612fba..c676acc763 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java
@@ -43,7 +43,7 @@ public final class b {
     public static final Map<Class<? extends Object>, Class<? extends Object>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<Class<? extends Object>, Class<? extends Object>> f2484c;
+    public static final Map<Class<? extends Object>, Class<? extends Object>> f2490c;
     public static final Map<Class<? extends d0.c<?>>, Integer> d;
 
     /* compiled from: reflectClassUtil.kt */
@@ -99,7 +99,7 @@ public final class b {
             c cVar2 = (c) it2.next();
             arrayList2.add(d0.o.to(d0.z.a.getJavaPrimitiveType(cVar2), d0.z.a.getJavaObjectType(cVar2)));
         }
-        f2484c = h0.toMap(arrayList2);
+        f2490c = h0.toMap(arrayList2);
         List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, g.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, d0.z.c.b.class, d0.z.c.c.class, d.class, e.class, f.class});
         ArrayList arrayList3 = new ArrayList(d0.t.o.collectionSizeOrDefault(listOf2, 10));
         for (Object obj : listOf2) {
@@ -187,7 +187,7 @@ public final class b {
 
     public static final Class<?> getWrapperByPrimitive(Class<?> cls) {
         m.checkNotNullParameter(cls, "<this>");
-        return f2484c.get(cls);
+        return f2490c.get(cls);
     }
 
     public static final boolean isEnumClassOrSpecializedEnumEntryClass(Class<?> cls) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/e.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/e.java
index af6f954f96..c60342ce3e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/e.java
@@ -8,17 +8,17 @@ import java.lang.annotation.Annotation;
 public final class e extends d implements c {
 
     /* renamed from: c  reason: collision with root package name */
-    public final Annotation f2485c;
+    public final Annotation f2491c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public e(d0.e0.p.d.m0.g.e eVar, Annotation annotation) {
         super(eVar);
         m.checkNotNullParameter(annotation, "annotation");
-        this.f2485c = annotation;
+        this.f2491c = annotation;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.c
     public a getAnnotation() {
-        return new c(this.f2485c);
+        return new c(this.f2491c);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/h.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/h.java
index e9e11bcb6e..e0fd873463 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/h.java
@@ -9,18 +9,18 @@ import java.util.List;
 public final class h extends d implements e {
 
     /* renamed from: c  reason: collision with root package name */
-    public final Object[] f2486c;
+    public final Object[] f2492c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public h(d0.e0.p.d.m0.g.e eVar, Object[] objArr) {
         super(eVar);
         m.checkNotNullParameter(objArr, "values");
-        this.f2486c = objArr;
+        this.f2492c = objArr;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.e
     public List<d> getElements() {
-        Object[] objArr = this.f2486c;
+        Object[] objArr = this.f2492c;
         ArrayList arrayList = new ArrayList(objArr.length);
         for (Object obj : objArr) {
             d.a aVar = d.a;
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/i.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/i.java
index a8968752f6..1bc1818643 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/i.java
@@ -13,7 +13,7 @@ public final class i extends w implements f {
     public final Type b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final w f2487c;
+    public final w f2493c;
     public final Collection<a> d;
 
     public i(Type type) {
@@ -41,7 +41,7 @@ public final class i extends w implements f {
             L.append(type);
             throw new IllegalArgumentException(L.toString());
         }
-        this.f2487c = wVar;
+        this.f2493c = wVar;
         this.d = n.emptyList();
     }
 
@@ -52,7 +52,7 @@ public final class i extends w implements f {
 
     @Override // d0.e0.p.d.m0.e.a.k0.f
     public w getComponentType() {
-        return this.f2487c;
+        return this.f2493c;
     }
 
     @Override // d0.e0.p.d.m0.c.k1.b.w
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/k.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/k.java
index 3d156b08e4..434b2f2ce2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/k.java
@@ -8,17 +8,17 @@ import d0.z.d.m;
 public final class k extends d implements h {
 
     /* renamed from: c  reason: collision with root package name */
-    public final Class<?> f2488c;
+    public final Class<?> f2494c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public k(e eVar, Class<?> cls) {
         super(eVar);
         m.checkNotNullParameter(cls, "klass");
-        this.f2488c = cls;
+        this.f2494c = cls;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.h
     public x getReferencedType() {
-        return w.a.create(this.f2488c);
+        return w.a.create(this.f2494c);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/l.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/l.java
index 32792b2025..8b0fe8bf82 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/l.java
@@ -21,7 +21,7 @@ public final class l extends w implements j {
     public final Type b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final i f2489c;
+    public final i f2495c;
 
     public l(Type type) {
         i iVar;
@@ -43,7 +43,7 @@ public final class l extends w implements j {
             L.append(reflectType);
             throw new IllegalStateException(L.toString());
         }
-        this.f2489c = iVar;
+        this.f2495c = iVar;
     }
 
     @Override // d0.e0.p.d.m0.c.k1.b.w, d0.e0.p.d.m0.e.a.k0.d
@@ -59,7 +59,7 @@ public final class l extends w implements j {
 
     @Override // d0.e0.p.d.m0.e.a.k0.j
     public i getClassifier() {
-        return this.f2489c;
+        return this.f2495c;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.j
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/o.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/o.java
index 0ba0111d52..59d8f20dfd 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/o.java
@@ -7,23 +7,23 @@ import d0.e0.p.d.m0.g.e;
 public final class o extends d implements m {
 
     /* renamed from: c  reason: collision with root package name */
-    public final Enum<?> f2490c;
+    public final Enum<?> f2496c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public o(e eVar, Enum<?> r3) {
         super(eVar);
         d0.z.d.m.checkNotNullParameter(r3, "value");
-        this.f2490c = r3;
+        this.f2496c = r3;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.m
     public e getEntryName() {
-        return e.identifier(this.f2490c.name());
+        return e.identifier(this.f2496c.name());
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.m
     public a getEnumClassId() {
-        Class<?> cls = this.f2490c.getClass();
+        Class<?> cls = this.f2496c.getClass();
         if (!cls.isEnum()) {
             cls = cls.getEnclosingClass();
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/q.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/q.java
index ab20b2e6c0..9b1a1439bd 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/q.java
@@ -7,17 +7,17 @@ import d0.z.d.m;
 public final class q extends d implements o {
 
     /* renamed from: c  reason: collision with root package name */
-    public final Object f2491c;
+    public final Object f2497c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public q(e eVar, Object obj) {
         super(eVar);
         m.checkNotNullParameter(obj, "value");
-        this.f2491c = obj;
+        this.f2497c = obj;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.o
     public Object getValue() {
-        return this.f2491c;
+        return this.f2497c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/t.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/t.java
index eeea71b6ce..e826b103a5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/t.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/t.java
@@ -15,7 +15,7 @@ public interface t extends s {
         public static f1 getVisibility(t tVar) {
             m.checkNotNullParameter(tVar, "this");
             int modifiers = tVar.getModifiers();
-            return Modifier.isPublic(modifiers) ? e1.h.f2447c : Modifier.isPrivate(modifiers) ? e1.e.f2444c : Modifier.isProtected(modifiers) ? Modifier.isStatic(modifiers) ? c.f2480c : b.f2479c : d0.e0.p.d.m0.c.j1.a.f2478c;
+            return Modifier.isPublic(modifiers) ? e1.h.f2453c : Modifier.isPrivate(modifiers) ? e1.e.f2450c : Modifier.isProtected(modifiers) ? Modifier.isStatic(modifiers) ? c.f2486c : b.f2485c : d0.e0.p.d.m0.c.j1.a.f2484c;
         }
 
         public static boolean isAbstract(t tVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/v.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/v.java
index 4d2e94769e..6a64cc0eb3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/v.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/v.java
@@ -12,7 +12,7 @@ public final class v extends w implements d0.e0.p.d.m0.e.a.k0.v {
     public final Class<?> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Collection<a> f2492c = n.emptyList();
+    public final Collection<a> f2498c = n.emptyList();
 
     public v(Class<?> cls) {
         m.checkNotNullParameter(cls, "reflectType");
@@ -21,7 +21,7 @@ public final class v extends w implements d0.e0.p.d.m0.e.a.k0.v {
 
     @Override // d0.e0.p.d.m0.e.a.k0.d
     public Collection<a> getAnnotations() {
-        return this.f2492c;
+        return this.f2498c;
     }
 
     @Override // d0.e0.p.d.m0.c.k1.b.w
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/y.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/y.java
index 3de1e33a9e..8a326e171b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/y.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/y.java
@@ -12,7 +12,7 @@ public final class y extends n implements a0 {
     public final Annotation[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2493c;
+    public final String f2499c;
     public final boolean d;
 
     public y(w wVar, Annotation[] annotationArr, String str, boolean z2) {
@@ -20,7 +20,7 @@ public final class y extends n implements a0 {
         m.checkNotNullParameter(annotationArr, "reflectAnnotations");
         this.a = wVar;
         this.b = annotationArr;
-        this.f2493c = str;
+        this.f2499c = str;
         this.d = z2;
     }
 
@@ -37,7 +37,7 @@ public final class y extends n implements a0 {
 
     @Override // d0.e0.p.d.m0.e.a.k0.a0
     public e getName() {
-        String str = this.f2493c;
+        String str = this.f2499c;
         if (str == null) {
             return null;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/z.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/z.java
index a6158fae15..1588e7e9da 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/z.java
@@ -14,7 +14,7 @@ public final class z extends w implements b0 {
     public final WildcardType b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Collection<a> f2494c = n.emptyList();
+    public final Collection<a> f2500c = n.emptyList();
 
     public z(WildcardType wildcardType) {
         m.checkNotNullParameter(wildcardType, "reflectType");
@@ -23,7 +23,7 @@ public final class z extends w implements b0 {
 
     @Override // d0.e0.p.d.m0.e.a.k0.d
     public Collection<a> getAnnotations() {
-        return this.f2494c;
+        return this.f2500c;
     }
 
     @Override // d0.e0.p.d.m0.e.a.k0.b0
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/l0.java b/app/src/main/java/d0/e0/p/d/m0/c/l0.java
index 9a468e1d38..4f758be7ae 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/l0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/l0.java
@@ -9,7 +9,7 @@ public final class l0 {
     public final List<w0> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final l0 f2495c;
+    public final l0 f2501c;
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends d0.e0.p.d.m0.n.w0> */
     /* JADX WARN: Multi-variable type inference failed */
@@ -18,7 +18,7 @@ public final class l0 {
         m.checkNotNullParameter(list, "arguments");
         this.a = iVar;
         this.b = list;
-        this.f2495c = l0Var;
+        this.f2501c = l0Var;
     }
 
     public final List<w0> getArguments() {
@@ -30,6 +30,6 @@ public final class l0 {
     }
 
     public final l0 getOuterType() {
-        return this.f2495c;
+        return this.f2501c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/r0.java b/app/src/main/java/d0/e0/p/d/m0/c/r0.java
index f7d99e3eac..3f8ada530d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/r0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/r0.java
@@ -19,7 +19,7 @@ public final class r0<T extends i> {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(r0.class), "scopeForOwnerModule", "getScopeForOwnerModule()Lorg/jetbrains/kotlin/resolve/scopes/MemberScope;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f2496c;
+    public final e f2502c;
     public final Function1<g, T> d;
     public final g e;
     public final j f;
@@ -58,7 +58,7 @@ public final class r0<T extends i> {
     }
 
     public r0(e eVar, o oVar, Function1 function1, g gVar, DefaultConstructorMarker defaultConstructorMarker) {
-        this.f2496c = eVar;
+        this.f2502c = eVar;
         this.d = function1;
         this.e = gVar;
         this.f = oVar.createLazyValue(new s0(this));
@@ -74,11 +74,11 @@ public final class r0<T extends i> {
 
     public final T getScope(g gVar) {
         m.checkNotNullParameter(gVar, "kotlinTypeRefiner");
-        if (!gVar.isRefinementNeededForModule(d0.e0.p.d.m0.k.x.a.getModule(this.f2496c))) {
+        if (!gVar.isRefinementNeededForModule(d0.e0.p.d.m0.k.x.a.getModule(this.f2502c))) {
             return (T) ((i) n.getValue(this.f, this, b[0]));
         }
-        u0 typeConstructor = this.f2496c.getTypeConstructor();
+        u0 typeConstructor = this.f2502c.getTypeConstructor();
         m.checkNotNullExpressionValue(typeConstructor, "classDescriptor.typeConstructor");
-        return !gVar.isRefinementNeededForTypeConstructor(typeConstructor) ? (T) ((i) n.getValue(this.f, this, b[0])) : (T) gVar.getOrPutScopeForClass(this.f2496c, new b(this, gVar));
+        return !gVar.isRefinementNeededForTypeConstructor(typeConstructor) ? (T) ((i) n.getValue(this.f, this, b[0])) : (T) gVar.getOrPutScopeForClass(this.f2502c, new b(this, gVar));
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/c/t.java b/app/src/main/java/d0/e0/p/d/m0/c/t.java
index d283a445ed..a9c518847b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/c/t.java
+++ b/app/src/main/java/d0/e0/p/d/m0/c/t.java
@@ -16,7 +16,7 @@ public class t {
     public static final u b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final u f2497c;
+    public static final u f2503c;
     public static final u d;
     public static final u e;
     public static final u f;
@@ -455,23 +455,23 @@ public class t {
     }
 
     static {
-        d dVar = new d(e1.e.f2444c);
+        d dVar = new d(e1.e.f2450c);
         a = dVar;
-        e eVar = new e(e1.f.f2445c);
+        e eVar = new e(e1.f.f2451c);
         b = eVar;
-        f fVar = new f(e1.g.f2446c);
-        f2497c = fVar;
-        g gVar = new g(e1.b.f2441c);
+        f fVar = new f(e1.g.f2452c);
+        f2503c = fVar;
+        g gVar = new g(e1.b.f2447c);
         d = gVar;
-        h hVar = new h(e1.h.f2447c);
+        h hVar = new h(e1.h.f2453c);
         e = hVar;
-        i iVar = new i(e1.d.f2443c);
+        i iVar = new i(e1.d.f2449c);
         f = iVar;
-        j jVar = new j(e1.a.f2440c);
+        j jVar = new j(e1.a.f2446c);
         g = jVar;
-        k kVar = new k(e1.c.f2442c);
+        k kVar = new k(e1.c.f2448c);
         h = kVar;
-        l lVar = new l(e1.i.f2448c);
+        l lVar = new l(e1.i.f2454c);
         i = lVar;
         Collections.unmodifiableSet(n0.setOf((Object[]) new u[]{dVar, eVar, gVar, iVar}));
         HashMap newHashMapWithExpectedSize = d0.e0.p.d.m0.p.a.newHashMapWithExpectedSize(4);
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/a0.java b/app/src/main/java/d0/e0/p/d/m0/e/a/a0.java
index 774ffc8481..3b85d98429 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/a0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/a0.java
@@ -12,7 +12,7 @@ public final class a0 {
     public static final e b = e.identifier("value");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b f2502c = new b(Target.class.getCanonicalName());
+    public static final b f2508c = new b(Target.class.getCanonicalName());
     public static final b d = new b(Retention.class.getCanonicalName());
     public static final b e = new b(Deprecated.class.getCanonicalName());
     public static final b f = new b(Documented.class.getCanonicalName());
@@ -30,7 +30,7 @@ public final class a0 {
     public static final b r = new b("kotlin.annotations.jvm.internal.DefaultValue");
 
     /* renamed from: s  reason: collision with root package name */
-    public static final b f2503s = new b("kotlin.annotations.jvm.internal.DefaultNull");
+    public static final b f2509s = new b("kotlin.annotations.jvm.internal.DefaultNull");
 
     static {
         b bVar = new b("kotlin.Metadata");
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/b.java b/app/src/main/java/d0/e0/p/d/m0/e/a/b.java
index 51798f8388..e84612e326 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/b.java
@@ -17,7 +17,7 @@ public final class b {
     public static final d0.e0.p.d.m0.g.b b = new d0.e0.p.d.m0.g.b("javax.annotation.meta.TypeQualifier");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d0.e0.p.d.m0.g.b f2504c = new d0.e0.p.d.m0.g.b("javax.annotation.meta.TypeQualifierDefault");
+    public static final d0.e0.p.d.m0.g.b f2510c = new d0.e0.p.d.m0.g.b("javax.annotation.meta.TypeQualifierDefault");
     public static final d0.e0.p.d.m0.g.b d = new d0.e0.p.d.m0.g.b("kotlin.annotations.jvm.UnderMigration");
     public static final List<a> e;
     public static final Map<d0.e0.p.d.m0.g.b, u> f;
@@ -52,7 +52,7 @@ public final class b {
     }
 
     public static final d0.e0.p.d.m0.g.b getTYPE_QUALIFIER_DEFAULT_FQNAME() {
-        return f2504c;
+        return f2510c;
     }
 
     public static final d0.e0.p.d.m0.g.b getTYPE_QUALIFIER_FQNAME() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/b0.java b/app/src/main/java/d0/e0/p/d/m0/e/a/b0.java
index 6fe99b78be..f802873c7f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/b0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/b0.java
@@ -12,7 +12,7 @@ public final class b0 {
     public static final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b f2505c;
+    public static final b f2511c;
     public static final List<b> d;
     public static final b e;
     public static final b f = new b("javax.annotation.CheckForNull");
@@ -30,7 +30,7 @@ public final class b0 {
         b bVar2 = new b("org.jspecify.annotations.NullnessUnspecified");
         b = bVar2;
         b bVar3 = new b("org.jspecify.annotations.DefaultNonNull");
-        f2505c = bVar3;
+        f2511c = bVar3;
         List<b> listOf = n.listOf((Object[]) new b[]{a0.i, new b("androidx.annotation.Nullable"), new b("androidx.annotation.Nullable"), new b("android.annotation.Nullable"), new b("com.android.annotations.Nullable"), new b("org.eclipse.jdt.annotation.Nullable"), new b("org.checkerframework.checker.nullness.qual.Nullable"), new b("javax.annotation.Nullable"), new b("javax.annotation.CheckForNull"), new b("edu.umd.cs.findbugs.annotations.CheckForNull"), new b("edu.umd.cs.findbugs.annotations.Nullable"), new b("edu.umd.cs.findbugs.annotations.PossiblyNull"), new b("io.reactivex.annotations.Nullable")});
         d = listOf;
         b bVar4 = new b("javax.annotation.Nonnull");
@@ -73,7 +73,7 @@ public final class b0 {
     }
 
     public static final b getJSPECIFY_DEFAULT_NOT_NULL() {
-        return f2505c;
+        return f2511c;
     }
 
     public static final b getJSPECIFY_NULLABLE() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/c.java b/app/src/main/java/d0/e0/p/d/m0/e/a/c.java
index 4447589734..8e4a9478e0 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/c.java
@@ -153,7 +153,7 @@ public final class c {
             return null;
         }
         d0.e0.p.d.m0.c.g1.g annotations = annotationClass.getAnnotations();
-        d0.e0.p.d.m0.g.b bVar = a0.f2502c;
+        d0.e0.p.d.m0.g.b bVar = a0.f2508c;
         m.checkNotNullExpressionValue(bVar, "TARGET_ANNOTATION");
         d0.e0.p.d.m0.c.g1.c findAnnotation = annotations.findAnnotation(bVar);
         if (findAnnotation == null) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java b/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java
index 2339092c94..7d7f4b4054 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/e0.java
@@ -25,7 +25,7 @@ public class e0 {
     public static final List<a.C0217a> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final List<String> f2506c;
+    public static final List<String> f2512c;
     public static final Map<a.C0217a, c> d;
     public static final Map<String, c> e;
     public static final Set<e> f;
@@ -213,7 +213,7 @@ public class e0 {
         for (a.C0217a aVar2 : arrayList) {
             arrayList2.add(aVar2.getSignature());
         }
-        f2506c = arrayList2;
+        f2512c = arrayList2;
         List<a.C0217a> list = b;
         ArrayList arrayList3 = new ArrayList(o.collectionSizeOrDefault(list, 10));
         for (a.C0217a aVar3 : list) {
@@ -335,7 +335,7 @@ public class e0 {
     }
 
     public static final /* synthetic */ List access$getERASED_COLLECTION_PARAMETER_SIGNATURES$cp() {
-        return f2506c;
+        return f2512c;
     }
 
     public static final /* synthetic */ Set access$getERASED_VALUE_PARAMETERS_SHORT_NAMES$cp() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java
index e2b9152044..522fb43f20 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/a.java
@@ -22,7 +22,7 @@ public final class a {
         public final /* synthetic */ Set b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ boolean f2507c;
+        public final /* synthetic */ boolean f2513c;
 
         /* compiled from: DescriptorResolverUtils */
         /* renamed from: d0.e0.p.d.m0.e.a.g0.a$a$a  reason: collision with other inner class name */
@@ -42,7 +42,7 @@ public final class a {
         public C0218a(p pVar, Set set, boolean z2) {
             this.a = pVar;
             this.b = set;
-            this.f2507c = z2;
+            this.f2513c = z2;
         }
 
         public static /* synthetic */ void a(int i) {
@@ -99,7 +99,7 @@ public final class a {
             } else if (collection == null) {
                 a(4);
                 throw null;
-            } else if (!this.f2507c || bVar.getKind() == b.a.FAKE_OVERRIDE) {
+            } else if (!this.f2513c || bVar.getKind() == b.a.FAKE_OVERRIDE) {
                 super.setOverriddenDescriptors(bVar, collection);
             }
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/b.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/b.java
index 263d431f96..d6730618fb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/b.java
@@ -24,7 +24,7 @@ public class b implements c, i {
     public final d0.e0.p.d.m0.g.b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final u0 f2508c;
+    public final u0 f2514c;
     public final j d;
     public final d0.e0.p.d.m0.e.a.k0.b e;
     public final boolean f;
@@ -61,7 +61,7 @@ public class b implements c, i {
             source = u0.a;
             m.checkNotNullExpressionValue(source, "NO_SOURCE");
         }
-        this.f2508c = source;
+        this.f2514c = source;
         this.d = gVar.getStorageManager().createLazyValue(new a(gVar, this));
         this.e = (aVar == null || (arguments = aVar.getArguments()) == null) ? null : (d0.e0.p.d.m0.e.a.k0.b) u.firstOrNull(arguments);
         this.f = m.areEqual(aVar != null ? Boolean.valueOf(aVar.isIdeExternalAnnotation()) : bool, Boolean.TRUE);
@@ -79,7 +79,7 @@ public class b implements c, i {
 
     @Override // d0.e0.p.d.m0.c.g1.c
     public u0 getSource() {
-        return this.f2508c;
+        return this.f2514c;
     }
 
     @Override // d0.e0.p.d.m0.c.g1.c
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/c.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/c.java
index b1e7a01dec..84a984177f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/c.java
@@ -17,7 +17,7 @@ public final class c {
     public static final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f2509c;
+    public static final e f2515c;
     public static final e d;
     public static final Map<b, b> e;
     public static final Map<b, b> f;
@@ -28,12 +28,12 @@ public final class c {
         b = identifier;
         e identifier2 = e.identifier("allowedTargets");
         m.checkNotNullExpressionValue(identifier2, "identifier(\"allowedTargets\")");
-        f2509c = identifier2;
+        f2515c = identifier2;
         e identifier3 = e.identifier("value");
         m.checkNotNullExpressionValue(identifier3, "identifier(\"value\")");
         d = identifier3;
         b bVar = k.a.A;
-        b bVar2 = a0.f2502c;
+        b bVar2 = a0.f2508c;
         b bVar3 = k.a.D;
         b bVar4 = a0.d;
         b bVar5 = k.a.E;
@@ -80,14 +80,14 @@ public final class c {
     }
 
     public final e getTARGET_ANNOTATION_ALLOWED_TARGETS$descriptors_jvm() {
-        return f2509c;
+        return f2515c;
     }
 
     public final d0.e0.p.d.m0.c.g1.c mapOrResolveJavaAnnotation(a aVar, g gVar, boolean z2) {
         m.checkNotNullParameter(aVar, "annotation");
         m.checkNotNullParameter(gVar, "c");
         d0.e0.p.d.m0.g.a classId = aVar.getClassId();
-        if (m.areEqual(classId, d0.e0.p.d.m0.g.a.topLevel(a0.f2502c))) {
+        if (m.areEqual(classId, d0.e0.p.d.m0.g.a.topLevel(a0.f2508c))) {
             return new i(aVar, gVar);
         }
         if (m.areEqual(classId, d0.e0.p.d.m0.g.a.topLevel(a0.d))) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/d.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/d.java
index 1022386e5c..54ae1ee35a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/d.java
@@ -27,7 +27,7 @@ public final class d {
     public static final Map<String, EnumSet<n>> b = h0.mapOf(o.to("PACKAGE", EnumSet.noneOf(n.class)), o.to("TYPE", EnumSet.of(n.CLASS, n.FILE)), o.to("ANNOTATION_TYPE", EnumSet.of(n.ANNOTATION_CLASS)), o.to("TYPE_PARAMETER", EnumSet.of(n.TYPE_PARAMETER)), o.to("FIELD", EnumSet.of(n.FIELD)), o.to("LOCAL_VARIABLE", EnumSet.of(n.LOCAL_VARIABLE)), o.to("PARAMETER", EnumSet.of(n.VALUE_PARAMETER)), o.to("CONSTRUCTOR", EnumSet.of(n.CONSTRUCTOR)), o.to("METHOD", EnumSet.of(n.FUNCTION, n.PROPERTY_GETTER, n.PROPERTY_SETTER)), o.to("TYPE_USE", EnumSet.of(n.TYPE)));
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<String, m> f2510c = h0.mapOf(o.to("RUNTIME", m.RUNTIME), o.to("CLASS", m.BINARY), o.to("SOURCE", m.SOURCE));
+    public static final Map<String, m> f2516c = h0.mapOf(o.to("RUNTIME", m.RUNTIME), o.to("CLASS", m.BINARY), o.to("SOURCE", m.SOURCE));
 
     /* compiled from: JavaAnnotationMapper.kt */
     public static final class a extends d0.z.d.o implements Function1<c0, d0.e0.p.d.m0.n.c0> {
@@ -55,7 +55,7 @@ public final class d {
         if (mVar == null) {
             return null;
         }
-        Map<String, m> map = f2510c;
+        Map<String, m> map = f2516c;
         e entryName = mVar.getEntryName();
         m mVar2 = map.get(entryName == null ? null : entryName.asString());
         if (mVar2 == null) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/j.java b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/j.java
index f85dc2bc16..923055a917 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/g0/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/g0/j.java
@@ -87,7 +87,7 @@ public interface j {
         public final c0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<c1> f2511c;
+        public final List<c1> f2517c;
         public final List<z0> d;
         public final List<String> e;
         public final boolean f;
@@ -105,7 +105,7 @@ public interface j {
             } else if (list3 != null) {
                 this.a = c0Var;
                 this.b = c0Var2;
-                this.f2511c = list;
+                this.f2517c = list;
                 this.d = list2;
                 this.e = list3;
                 this.f = z2;
@@ -191,7 +191,7 @@ public interface j {
         }
 
         public List<c1> getValueParameters() {
-            List<c1> list = this.f2511c;
+            List<c1> list = this.f2517c;
             if (list != null) {
                 return list;
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/h0/k.java b/app/src/main/java/d0/e0/p/d/m0/e/a/h0/k.java
index 958a61866b..ba4bf71e52 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/h0/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/h0/k.java
@@ -69,7 +69,7 @@ public final class k {
             return new j(str);
         }
         g annotations2 = c1Var.getAnnotations();
-        b bVar2 = a0.f2503s;
+        b bVar2 = a0.f2509s;
         m.checkNotNullExpressionValue(bVar2, "DEFAULT_NULL_FQ_NAME");
         if (annotations2.hasAnnotation(bVar2)) {
             return h.a;
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i.java
index 5cc359d328..d6129a14e9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i.java
@@ -22,7 +22,7 @@ public final class i {
     public static final Map<b, e> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<e, List<e>> f2512c;
+    public static final Map<e, List<e>> f2518c;
     public static final Set<b> d;
     public static final Set<e> e;
 
@@ -48,7 +48,7 @@ public final class i {
             }
             ((List) obj).add((e) pair.getFirst());
         }
-        f2512c = linkedHashMap;
+        f2518c = linkedHashMap;
         Set<b> keySet = b.keySet();
         d = keySet;
         ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(keySet, 10));
@@ -64,7 +64,7 @@ public final class i {
 
     public final List<e> getPropertyNameCandidatesBySpecialGetterName(e eVar) {
         m.checkNotNullParameter(eVar, "name1");
-        List<e> list = f2512c.get(eVar);
+        List<e> list = f2518c.get(eVar);
         return list == null ? n.emptyList() : list;
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/b.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/b.java
index a2fdcdbdfa..20a17c5606 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/b.java
@@ -22,7 +22,7 @@ public final class b {
     public final s b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f2513c;
+    public final n f2519c;
     public final f d;
     public final j e;
     public final p f;
@@ -40,7 +40,7 @@ public final class b {
     public final l r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final t f2514s;
+    public final t f2520s;
     public final c t;
     public final d0.e0.p.d.m0.n.l1.l u;
     public final e v;
@@ -70,7 +70,7 @@ public final class b {
         m.checkNotNullParameter(eVar, "javaTypeEnhancementState");
         this.a = oVar;
         this.b = sVar;
-        this.f2513c = nVar;
+        this.f2519c = nVar;
         this.d = fVar;
         this.e = jVar;
         this.f = pVar;
@@ -86,7 +86,7 @@ public final class b {
         this.p = jVar2;
         this.q = cVar2;
         this.r = lVar;
-        this.f2514s = tVar;
+        this.f2520s = tVar;
         this.t = cVar3;
         this.u = lVar2;
         this.v = eVar;
@@ -109,7 +109,7 @@ public final class b {
     }
 
     public final t getJavaClassesTracker() {
-        return this.f2514s;
+        return this.f2520s;
     }
 
     public final d0.e0.p.d.m0.e.a.g0.f getJavaPropertyInitializerEvaluator() {
@@ -125,7 +125,7 @@ public final class b {
     }
 
     public final n getKotlinClassFinder() {
-        return this.f2513c;
+        return this.f2519c;
     }
 
     public final d0.e0.p.d.m0.n.l1.l getKotlinTypeChecker() {
@@ -178,6 +178,6 @@ public final class b {
 
     public final b replace(g gVar) {
         m.checkNotNullParameter(gVar, "javaResolverCache");
-        return new b(this.a, this.b, this.f2513c, this.d, this.e, this.f, gVar, this.h, this.i, this.j, this.k, this.l, this.m, this.n, this.o, this.p, this.q, this.r, this.f2514s, this.t, this.u, this.v);
+        return new b(this.a, this.b, this.f2519c, this.d, this.e, this.f, gVar, this.h, this.i, this.j, this.k, this.l, this.m, this.n, this.o, this.p, this.q, this.r, this.f2520s, this.t, this.u, this.v);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/g.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/g.java
index d746fbb5cd..00fa01922f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/g.java
@@ -12,7 +12,7 @@ public final class g {
     public final k b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Lazy<y> f2515c;
+    public final Lazy<y> f2521c;
     public final Lazy d;
     public final d e;
 
@@ -22,7 +22,7 @@ public final class g {
         m.checkNotNullParameter(lazy, "delegateForDefaultTypeQualifiers");
         this.a = bVar;
         this.b = kVar;
-        this.f2515c = lazy;
+        this.f2521c = lazy;
         this.d = lazy;
         this.e = new d(this, kVar);
     }
@@ -36,7 +36,7 @@ public final class g {
     }
 
     public final Lazy<y> getDelegateForDefaultTypeQualifiers$descriptors_jvm() {
-        return this.f2515c;
+        return this.f2521c;
     }
 
     public final c0 getModule() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/h.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/h.java
index 6601bb5309..9723ee4940 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/h.java
@@ -15,7 +15,7 @@ public final class h implements k {
     public final m b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2516c;
+    public final int f2522c;
     public final Map<y, Integer> d;
     public final i<y, s> e;
 
@@ -46,7 +46,7 @@ public final class h implements k {
         d0.z.d.m.checkNotNullParameter(zVar, "typeParameterOwner");
         this.a = gVar;
         this.b = mVar;
-        this.f2516c = i;
+        this.f2522c = i;
         this.d = d0.e0.p.d.m0.p.a.mapToIndex(zVar.getTypeParameters());
         this.e = gVar.getStorageManager().createMemoizedFunctionWithNullableValues(new a(this));
     }
@@ -64,7 +64,7 @@ public final class h implements k {
     }
 
     public static final /* synthetic */ int access$getTypeParametersIndexOffset$p(h hVar) {
-        return hVar.f2516c;
+        return hVar.f2522c;
     }
 
     @Override // d0.e0.p.d.m0.e.a.i0.k
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java
index 0caeae185f..4842f56586 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/a.java
@@ -28,7 +28,7 @@ public class a implements b {
     public final Function1<q, Boolean> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<r, Boolean> f2517c;
+    public final Function1<r, Boolean> f2523c;
     public final Map<e, List<r>> d;
     public final Map<e, n> e;
     public final Map<e, w> f;
@@ -65,7 +65,7 @@ public class a implements b {
         this.a = gVar;
         this.b = function1;
         C0221a aVar = new C0221a(this);
-        this.f2517c = aVar;
+        this.f2523c = aVar;
         Sequence filter = d0.f0.q.filter(u.asSequence(gVar.getMethods()), aVar);
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Object obj : filter) {
@@ -134,7 +134,7 @@ public class a implements b {
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.b
     public Set<e> getMethodNames() {
-        Sequence<t> filter = d0.f0.q.filter(u.asSequence(this.a.getMethods()), this.f2517c);
+        Sequence<t> filter = d0.f0.q.filter(u.asSequence(this.a.getMethods()), this.f2523c);
         LinkedHashSet linkedHashSet = new LinkedHashSet();
         for (t tVar : filter) {
             linkedHashSet.add(tVar.getName());
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java
index 66c1cef99f..df73c3f304 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/d.java
@@ -30,7 +30,7 @@ public final class d implements i {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(d.class), "kotlinScopes", "getKotlinScopes()[Lorg/jetbrains/kotlin/resolve/scopes/MemberScope;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public final g f2518c;
+    public final g f2524c;
     public final i d;
     public final j e;
     public final j f;
@@ -67,14 +67,14 @@ public final class d implements i {
         m.checkNotNullParameter(gVar, "c");
         m.checkNotNullParameter(uVar, "jPackage");
         m.checkNotNullParameter(iVar, "packageFragment");
-        this.f2518c = gVar;
+        this.f2524c = gVar;
         this.d = iVar;
         this.e = new j(gVar, uVar, iVar);
         this.f = gVar.getStorageManager().createLazyValue(new a(this));
     }
 
     public static final /* synthetic */ g access$getC$p(d dVar) {
-        return dVar.f2518c;
+        return dVar.f2524c;
     }
 
     public static final /* synthetic */ i access$getPackageFragment$p(d dVar) {
@@ -208,6 +208,6 @@ public final class d implements i {
     public void recordLookup(e eVar, b bVar) {
         m.checkNotNullParameter(eVar, "name");
         m.checkNotNullParameter(bVar, "location");
-        d0.e0.p.d.m0.d.a.record(this.f2518c.getComponents().getLookupTracker(), bVar, this.d, eVar);
+        d0.e0.p.d.m0.d.a.record(this.f2524c.getComponents().getLookupTracker(), bVar, this.d, eVar);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/e.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/e.java
index b061e19722..90699a6d5c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/e.java
@@ -34,7 +34,7 @@ public final class e implements d0.e0.p.d.m0.c.g1.c, i {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0.e0.p.d.m0.e.a.k0.a f2519c;
+    public final d0.e0.p.d.m0.e.a.k0.a f2525c;
     public final k d;
     public final j e;
     public final d0.e0.p.d.m0.e.a.j0.a f;
@@ -128,7 +128,7 @@ public final class e implements d0.e0.p.d.m0.c.g1.c, i {
         m.checkNotNullParameter(gVar, "c");
         m.checkNotNullParameter(aVar, "javaAnnotation");
         this.b = gVar;
-        this.f2519c = aVar;
+        this.f2525c = aVar;
         this.d = gVar.getStorageManager().createNullableLazyValue(new b(this));
         this.e = gVar.getStorageManager().createLazyValue(new c(this));
         this.f = gVar.getComponents().getSourceElementFactory().source(aVar);
@@ -154,7 +154,7 @@ public final class e implements d0.e0.p.d.m0.c.g1.c, i {
     }
 
     public static final /* synthetic */ d0.e0.p.d.m0.e.a.k0.a access$getJavaAnnotation$p(e eVar) {
-        return eVar.f2519c;
+        return eVar.f2525c;
     }
 
     public static final /* synthetic */ d0.e0.p.d.m0.k.v.g access$resolveAnnotationArgument(e eVar, d0.e0.p.d.m0.e.a.k0.b bVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/f.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/f.java
index e9c13cc9dc..8900eff1c6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/f.java
@@ -52,20 +52,20 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
     public final d0.e0.p.d.m0.e.a.k0.g r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final e f2520s;
+    public final e f2526s;
     public final d0.e0.p.d.m0.e.a.i0.g t;
     public final d0.e0.p.d.m0.c.f u;
     public final z v;
     public final f1 w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final boolean f2521x;
+    public final boolean f2527x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final b f2522y;
+    public final b f2528y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final h f2523z;
+    public final h f2529z;
 
     /* compiled from: LazyJavaClassDescriptor.kt */
     public static final class a {
@@ -77,7 +77,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
     public final class b extends d0.e0.p.d.m0.n.b {
 
         /* renamed from: c  reason: collision with root package name */
-        public final j<List<z0>> f2524c;
+        public final j<List<z0>> f2530c;
         public final /* synthetic */ f d;
 
         /* compiled from: LazyJavaClassDescriptor.kt */
@@ -103,7 +103,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
             super(f.access$getC$p(fVar).getStorageManager());
             m.checkNotNullParameter(fVar, "this$0");
             this.d = fVar;
-            this.f2524c = f.access$getC$p(fVar).getStorageManager().createLazyValue(new a(fVar));
+            this.f2530c = f.access$getC$p(fVar).getStorageManager().createLazyValue(new a(fVar));
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:22:0x0073, code lost:
@@ -249,7 +249,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
 
         @Override // d0.e0.p.d.m0.n.u0
         public List<z0> getParameters() {
-            return this.f2524c.mo1invoke();
+            return this.f2530c.mo1invoke();
         }
 
         @Override // d0.e0.p.d.m0.n.u0
@@ -325,7 +325,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
         m.checkNotNullParameter(gVar2, "jClass");
         this.q = gVar;
         this.r = gVar2;
-        this.f2520s = eVar;
+        this.f2526s = eVar;
         d0.e0.p.d.m0.e.a.i0.g childForClassOrPackage$default = d0.e0.p.d.m0.e.a.i0.a.childForClassOrPackage$default(gVar, this, gVar2, 0, 4, null);
         this.t = childForClassOrPackage$default;
         ((g.a) childForClassOrPackage$default.getComponents().getJavaResolverCache()).recordClass(gVar2, this);
@@ -338,10 +338,10 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
         }
         this.v = zVar;
         this.w = gVar2.getVisibility();
-        this.f2521x = gVar2.getOuterClass() != null && !gVar2.isStatic();
-        this.f2522y = new b(this);
+        this.f2527x = gVar2.getOuterClass() != null && !gVar2.isStatic();
+        this.f2528y = new b(this);
         h hVar = new h(childForClassOrPackage$default, this, gVar2, eVar != null, null, 16, null);
-        this.f2523z = hVar;
+        this.f2529z = hVar;
         this.A = r0.a.create(this, childForClassOrPackage$default.getStorageManager(), childForClassOrPackage$default.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner(), new d(this));
         this.B = new d0.e0.p.d.m0.k.a0.g(hVar);
         this.C = new o(childForClassOrPackage$default, gVar2, this);
@@ -355,7 +355,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
     }
 
     public static final /* synthetic */ e access$getAdditionalSupertypeClassDescriptor$p(f fVar) {
-        return fVar.f2520s;
+        return fVar.f2526s;
     }
 
     public static final /* synthetic */ d0.e0.p.d.m0.e.a.i0.g access$getC$p(f fVar) {
@@ -363,7 +363,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
     }
 
     public static final /* synthetic */ h access$getUnsubstitutedMemberScope$p(f fVar) {
-        return fVar.f2523z;
+        return fVar.f2529z;
     }
 
     public final f copy$descriptors_jvm(d0.e0.p.d.m0.e.a.g0.g gVar, e eVar) {
@@ -387,7 +387,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
 
     @Override // d0.e0.p.d.m0.c.e
     public List<d0.e0.p.d.m0.c.d> getConstructors() {
-        return this.f2523z.getConstructors$descriptors_jvm().mo1invoke();
+        return this.f2529z.getConstructors$descriptors_jvm().mo1invoke();
     }
 
     @Override // d0.e0.p.d.m0.c.e, d0.e0.p.d.m0.c.i
@@ -434,7 +434,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
 
     @Override // d0.e0.p.d.m0.c.h
     public u0 getTypeConstructor() {
-        return this.f2522y;
+        return this.f2528y;
     }
 
     @Override // d0.e0.p.d.m0.c.i1.a, d0.e0.p.d.m0.c.e
@@ -500,7 +500,7 @@ public final class f extends h implements d0.e0.p.d.m0.e.a.h0.d {
 
     @Override // d0.e0.p.d.m0.c.i
     public boolean isInner() {
-        return this.f2521x;
+        return this.f2527x;
     }
 
     @Override // d0.e0.p.d.m0.c.e
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java
index 929cec1330..2a7370653e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/h.java
@@ -58,7 +58,7 @@ public final class h extends k {
     public final j<Set<d0.e0.p.d.m0.g.e>> r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final j<Map<d0.e0.p.d.m0.g.e, n>> f2525s;
+    public final j<Map<d0.e0.p.d.m0.g.e, n>> f2531s;
     public final d0.e0.p.d.m0.m.i<d0.e0.p.d.m0.g.e, d0.e0.p.d.m0.c.i1.h> t;
 
     /* compiled from: LazyJavaClassMemberScope.kt */
@@ -334,7 +334,7 @@ public final class h extends k {
         this.p = z2;
         this.q = gVar.getStorageManager().createLazyValue(new e(this, gVar));
         this.r = gVar.getStorageManager().createLazyValue(new C0222h(this));
-        this.f2525s = gVar.getStorageManager().createLazyValue(new f(this));
+        this.f2531s = gVar.getStorageManager().createLazyValue(new f(this));
         this.t = gVar.getStorageManager().createMemoizedFunctionWithNullableValues(new i(this, gVar));
     }
 
@@ -351,7 +351,7 @@ public final class h extends k {
             return null;
         }
         d0.e0.p.d.m0.c.e eVar = hVar.n;
-        d0.e0.p.d.m0.e.a.h0.c createJavaConstructor = d0.e0.p.d.m0.e.a.h0.c.createJavaConstructor(eVar, d0.e0.p.d.m0.c.g1.g.f.getEMPTY(), true, hVar.f2527c.getComponents().getSourceElementFactory().source(hVar.o));
+        d0.e0.p.d.m0.e.a.h0.c createJavaConstructor = d0.e0.p.d.m0.e.a.h0.c.createJavaConstructor(eVar, d0.e0.p.d.m0.c.g1.g.f.getEMPTY(), true, hVar.f2533c.getComponents().getSourceElementFactory().source(hVar.o));
         m.checkNotNullExpressionValue(createJavaConstructor, "createJavaConstructor(\n            classDescriptor, Annotations.EMPTY, /* isPrimary = */ true, c.components.sourceElementFactory.source(jClass)\n        )");
         if (isAnnotationType) {
             Collection<r> methods = hVar.o.getMethods();
@@ -375,16 +375,16 @@ public final class h extends k {
                 x returnType = rVar.getReturnType();
                 if (returnType instanceof d0.e0.p.d.m0.e.a.k0.f) {
                     d0.e0.p.d.m0.e.a.k0.f fVar = (d0.e0.p.d.m0.e.a.k0.f) returnType;
-                    pair = new Pair(hVar.f2527c.getTypeResolver().transformArrayType(fVar, attributes$default, true), hVar.f2527c.getTypeResolver().transformJavaType(fVar.getComponentType(), attributes$default));
+                    pair = new Pair(hVar.f2533c.getTypeResolver().transformArrayType(fVar, attributes$default, true), hVar.f2533c.getTypeResolver().transformJavaType(fVar.getComponentType(), attributes$default));
                 } else {
-                    pair = new Pair(hVar.f2527c.getTypeResolver().transformJavaType(returnType, attributes$default), null);
+                    pair = new Pair(hVar.f2533c.getTypeResolver().transformJavaType(returnType, attributes$default), null);
                 }
                 hVar.o(list, createJavaConstructor, 0, rVar, (c0) pair.component1(), (c0) pair.component2());
             }
             int i2 = rVar != null ? 1 : 0;
             int i3 = 0;
             for (r rVar2 : list3) {
-                hVar.o(list, createJavaConstructor, i3 + i2, rVar2, hVar.f2527c.getTypeResolver().transformJavaType(rVar2.getReturnType(), attributes$default), null);
+                hVar.o(list, createJavaConstructor, i3 + i2, rVar2, hVar.f2533c.getTypeResolver().transformJavaType(rVar2.getReturnType(), attributes$default), null);
                 i3++;
             }
         } else {
@@ -394,13 +394,13 @@ public final class h extends k {
         createJavaConstructor.initialize(list, hVar.B(eVar));
         createJavaConstructor.setHasStableParameterNames(true);
         createJavaConstructor.setReturnType(eVar.getDefaultType());
-        ((g.a) hVar.f2527c.getComponents().getJavaResolverCache()).recordConstructor(hVar.o, createJavaConstructor);
+        ((g.a) hVar.f2533c.getComponents().getJavaResolverCache()).recordConstructor(hVar.o, createJavaConstructor);
         return createJavaConstructor;
     }
 
     public static final d0.e0.p.d.m0.c.d access$createDefaultRecordConstructor(h hVar) {
         d0.e0.p.d.m0.c.e eVar = hVar.n;
-        d0.e0.p.d.m0.e.a.h0.c createJavaConstructor = d0.e0.p.d.m0.e.a.h0.c.createJavaConstructor(eVar, d0.e0.p.d.m0.c.g1.g.f.getEMPTY(), true, hVar.f2527c.getComponents().getSourceElementFactory().source(hVar.o));
+        d0.e0.p.d.m0.e.a.h0.c createJavaConstructor = d0.e0.p.d.m0.e.a.h0.c.createJavaConstructor(eVar, d0.e0.p.d.m0.c.g1.g.f.getEMPTY(), true, hVar.f2533c.getComponents().getSourceElementFactory().source(hVar.o));
         m.checkNotNullExpressionValue(createJavaConstructor, "createJavaConstructor(\n            classDescriptor, Annotations.EMPTY, /* isPrimary = */ true, c.components.sourceElementFactory.source(jClass)\n        )");
         Collection<w> recordComponents = hVar.o.getRecordComponents();
         ArrayList arrayList = new ArrayList(recordComponents.size());
@@ -409,8 +409,8 @@ public final class h extends k {
         int i2 = 0;
         for (w wVar : recordComponents) {
             int i3 = i2 + 1;
-            c0 transformJavaType = hVar.f2527c.getTypeResolver().transformJavaType(wVar.getType(), attributes$default);
-            arrayList.add(new l0(createJavaConstructor, null, i2, d0.e0.p.d.m0.c.g1.g.f.getEMPTY(), wVar.getName(), transformJavaType, false, false, false, wVar.isVararg() ? hVar.f2527c.getComponents().getModule().getBuiltIns().getArrayElementType(transformJavaType) : c0Var, hVar.f2527c.getComponents().getSourceElementFactory().source(wVar)));
+            c0 transformJavaType = hVar.f2533c.getTypeResolver().transformJavaType(wVar.getType(), attributes$default);
+            arrayList.add(new l0(createJavaConstructor, null, i2, d0.e0.p.d.m0.c.g1.g.f.getEMPTY(), wVar.getName(), transformJavaType, false, false, false, wVar.isVararg() ? hVar.f2533c.getComponents().getModule().getBuiltIns().getArrayElementType(transformJavaType) : c0Var, hVar.f2533c.getComponents().getSourceElementFactory().source(wVar)));
             i2 = i3;
             attributes$default = attributes$default;
             c0Var = c0Var;
@@ -423,7 +423,7 @@ public final class h extends k {
     }
 
     public static final /* synthetic */ j access$getEnumEntryIndex$p(h hVar) {
-        return hVar.f2525s;
+        return hVar.f2531s;
     }
 
     public static final /* synthetic */ d0.e0.p.d.m0.e.a.k0.g access$getJClass$p(h hVar) {
@@ -436,9 +436,9 @@ public final class h extends k {
 
     public static final d0.e0.p.d.m0.e.a.h0.c access$resolveConstructor(h hVar, k kVar) {
         d0.e0.p.d.m0.c.e eVar = hVar.n;
-        d0.e0.p.d.m0.e.a.h0.c createJavaConstructor = d0.e0.p.d.m0.e.a.h0.c.createJavaConstructor(eVar, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(hVar.f2527c, kVar), false, hVar.f2527c.getComponents().getSourceElementFactory().source(kVar));
+        d0.e0.p.d.m0.e.a.h0.c createJavaConstructor = d0.e0.p.d.m0.e.a.h0.c.createJavaConstructor(eVar, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(hVar.f2533c, kVar), false, hVar.f2533c.getComponents().getSourceElementFactory().source(kVar));
         m.checkNotNullExpressionValue(createJavaConstructor, "createJavaConstructor(\n            classDescriptor,\n            c.resolveAnnotations(constructor), /* isPrimary = */\n            false,\n            c.components.sourceElementFactory.source(constructor)\n        )");
-        d0.e0.p.d.m0.e.a.i0.g childForMethod = d0.e0.p.d.m0.e.a.i0.a.childForMethod(hVar.f2527c, createJavaConstructor, kVar, eVar.getDeclaredTypeParameters().size());
+        d0.e0.p.d.m0.e.a.i0.g childForMethod = d0.e0.p.d.m0.e.a.i0.a.childForMethod(hVar.f2533c, createJavaConstructor, kVar, eVar.getDeclaredTypeParameters().size());
         k.b n = hVar.n(childForMethod, createJavaConstructor, kVar.getValueParameters());
         List<z0> declaredTypeParameters = eVar.getDeclaredTypeParameters();
         m.checkNotNullExpressionValue(declaredTypeParameters, "classDescriptor.declaredTypeParameters");
@@ -526,7 +526,7 @@ public final class h extends k {
         if (!m.areEqual(visibility, d0.e0.p.d.m0.e.a.w.b)) {
             return visibility;
         }
-        d0.e0.p.d.m0.c.u uVar = d0.e0.p.d.m0.e.a.w.f2543c;
+        d0.e0.p.d.m0.c.u uVar = d0.e0.p.d.m0.e.a.w.f2549c;
         m.checkNotNullExpressionValue(uVar, "PROTECTED_AND_PACKAGE");
         return uVar;
     }
@@ -752,7 +752,7 @@ public final class h extends k {
     @Override // d0.e0.p.d.m0.e.a.i0.l.k
     public Set<d0.e0.p.d.m0.g.e> a(d0.e0.p.d.m0.k.a0.d dVar, Function1<? super d0.e0.p.d.m0.g.e, Boolean> function1) {
         m.checkNotNullParameter(dVar, "kindFilter");
-        return o0.plus((Set) this.r.mo1invoke(), (Iterable) this.f2525s.mo1invoke().keySet());
+        return o0.plus((Set) this.r.mo1invoke(), (Iterable) this.f2531s.mo1invoke().keySet());
     }
 
     @Override // d0.e0.p.d.m0.e.a.i0.l.k
@@ -793,11 +793,11 @@ public final class h extends k {
             if (z2) {
                 w findRecordComponentByName = this.f.mo1invoke().findRecordComponentByName(eVar);
                 m.checkNotNull(findRecordComponentByName);
-                d0.e0.p.d.m0.e.a.h0.f createJavaMethod = d0.e0.p.d.m0.e.a.h0.f.createJavaMethod(this.n, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2527c, findRecordComponentByName), findRecordComponentByName.getName(), this.f2527c.getComponents().getSourceElementFactory().source(findRecordComponentByName), true);
+                d0.e0.p.d.m0.e.a.h0.f createJavaMethod = d0.e0.p.d.m0.e.a.h0.f.createJavaMethod(this.n, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2533c, findRecordComponentByName), findRecordComponentByName.getName(), this.f2533c.getComponents().getSourceElementFactory().source(findRecordComponentByName), true);
                 m.checkNotNullExpressionValue(createJavaMethod, "createJavaMethod(\n            ownerDescriptor, annotations, recordComponent.name, c.components.sourceElementFactory.source(recordComponent), true\n        )");
-                createJavaMethod.initialize(null, i(), d0.t.n.emptyList(), d0.t.n.emptyList(), this.f2527c.getTypeResolver().transformJavaType(findRecordComponentByName.getType(), d0.e0.p.d.m0.e.a.i0.m.e.toAttributes$default(d0.e0.p.d.m0.e.a.g0.k.COMMON, false, null, 2, null)), d0.e0.p.d.m0.c.z.i.convertFromFlags(false, false, true), t.e, null);
+                createJavaMethod.initialize(null, i(), d0.t.n.emptyList(), d0.t.n.emptyList(), this.f2533c.getTypeResolver().transformJavaType(findRecordComponentByName.getType(), d0.e0.p.d.m0.e.a.i0.m.e.toAttributes$default(d0.e0.p.d.m0.e.a.g0.k.COMMON, false, null, 2, null)), d0.e0.p.d.m0.c.z.i.convertFromFlags(false, false, true), t.e, null);
                 createJavaMethod.setParameterNamesStatus(false, false);
-                ((g.a) this.f2527c.getComponents().getJavaResolverCache()).recordMethod(findRecordComponentByName, createJavaMethod);
+                ((g.a) this.f2533c.getComponents().getJavaResolverCache()).recordMethod(findRecordComponentByName, createJavaMethod);
                 collection.add(createJavaMethod);
             }
         }
@@ -841,7 +841,7 @@ public final class h extends k {
             }
         }
         Collection<t0> create = d0.e0.p.d.m0.p.j.i.create();
-        Collection<? extends t0> resolveOverridesForNonStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForNonStaticMembers(eVar, C, d0.t.n.emptyList(), this.n, p.a, this.f2527c.getComponents().getKotlinTypeChecker().getOverridingUtil());
+        Collection<? extends t0> resolveOverridesForNonStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForNonStaticMembers(eVar, C, d0.t.n.emptyList(), this.n, p.a, this.f2533c.getComponents().getKotlinTypeChecker().getOverridingUtil());
         m.checkNotNullExpressionValue(resolveOverridesForNonStaticMembers, "resolveOverridesForNonStaticMembers(\n            name, functionsFromSupertypes, emptyList(), ownerDescriptor, ErrorReporter.DO_NOTHING,\n            c.components.kotlinTypeChecker.overridingUtil\n        )");
         q(eVar, collection, resolveOverridesForNonStaticMembers, collection, new a(this));
         q(eVar, collection, resolveOverridesForNonStaticMembers, create, new b(this));
@@ -860,12 +860,12 @@ public final class h extends k {
         m.checkNotNullParameter(eVar, "name");
         m.checkNotNullParameter(collection, "result");
         if (this.o.isAnnotationType() && (rVar = (r) d0.t.u.singleOrNull(this.f.mo1invoke().findMethodsByName(eVar))) != null) {
-            d0.e0.p.d.m0.e.a.h0.g create = d0.e0.p.d.m0.e.a.h0.g.create(this.n, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2527c, rVar), d0.e0.p.d.m0.c.z.FINAL, f0.toDescriptorVisibility(rVar.getVisibility()), false, rVar.getName(), this.f2527c.getComponents().getSourceElementFactory().source(rVar), false);
+            d0.e0.p.d.m0.e.a.h0.g create = d0.e0.p.d.m0.e.a.h0.g.create(this.n, d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2533c, rVar), d0.e0.p.d.m0.c.z.FINAL, f0.toDescriptorVisibility(rVar.getVisibility()), false, rVar.getName(), this.f2533c.getComponents().getSourceElementFactory().source(rVar), false);
             m.checkNotNullExpressionValue(create, "create(\n            ownerDescriptor, annotations, modality, method.visibility.toDescriptorVisibility(),\n            /* isVar = */ false, method.name, c.components.sourceElementFactory.source(method),\n            /* isStaticFinal = */ false\n        )");
             d0.e0.p.d.m0.c.i1.d0 createDefaultGetter = d0.e0.p.d.m0.k.d.createDefaultGetter(create, d0.e0.p.d.m0.c.g1.g.f.getEMPTY());
             m.checkNotNullExpressionValue(createDefaultGetter, "createDefaultGetter(propertyDescriptor, Annotations.EMPTY)");
             create.initialize(createDefaultGetter, null);
-            c0 e2 = e(rVar, d0.e0.p.d.m0.e.a.i0.a.childForMethod$default(this.f2527c, create, rVar, 0, 4, null));
+            c0 e2 = e(rVar, d0.e0.p.d.m0.e.a.i0.a.childForMethod$default(this.f2533c, create, rVar, 0, 4, null));
             create.setType(e2, d0.t.n.emptyList(), i(), null);
             createDefaultGetter.initialize(e2);
             collection.add(create);
@@ -877,7 +877,7 @@ public final class h extends k {
             d0.e0.p.d.m0.p.j create3 = bVar.create();
             r(D, collection, create2, new c(this));
             r(o0.minus((Set) D, (Iterable) create2), create3, null, new d(this));
-            Collection<? extends n0> resolveOverridesForNonStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForNonStaticMembers(eVar, o0.plus((Set) D, (Iterable) create3), collection, this.n, this.f2527c.getComponents().getErrorReporter(), this.f2527c.getComponents().getKotlinTypeChecker().getOverridingUtil());
+            Collection<? extends n0> resolveOverridesForNonStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForNonStaticMembers(eVar, o0.plus((Set) D, (Iterable) create3), collection, this.n, this.f2533c.getComponents().getErrorReporter(), this.f2533c.getComponents().getKotlinTypeChecker().getOverridingUtil());
             m.checkNotNullExpressionValue(resolveOverridesForNonStaticMembers, "resolveOverridesForNonStaticMembers(\n                name,\n                propertiesFromSupertypes + propertiesOverridesFromSuperTypes,\n                result,\n                ownerDescriptor,\n                c.components.errorReporter,\n                c.components.kotlinTypeChecker.overridingUtil\n            )");
             collection.addAll(resolveOverridesForNonStaticMembers);
         }
@@ -957,7 +957,7 @@ public final class h extends k {
         m.checkNotNullParameter(list, "methodTypeParameters");
         m.checkNotNullParameter(c0Var, "returnType");
         m.checkNotNullParameter(list2, "valueParameters");
-        j.b resolvePropagatedSignature = ((j.a) this.f2527c.getComponents().getSignaturePropagator()).resolvePropagatedSignature(rVar, this.n, c0Var, null, list2, list);
+        j.b resolvePropagatedSignature = ((j.a) this.f2533c.getComponents().getSignaturePropagator()).resolvePropagatedSignature(rVar, this.n, c0Var, null, list2, list);
         m.checkNotNullExpressionValue(resolvePropagatedSignature, "c.components.signaturePropagator.resolvePropagatedSignature(\n            method, ownerDescriptor, returnType, null, valueParameters, methodTypeParameters\n        )");
         c0 returnType = resolvePropagatedSignature.getReturnType();
         m.checkNotNullExpressionValue(returnType, "propagated.returnType");
@@ -977,11 +977,11 @@ public final class h extends k {
         d0.e0.p.d.m0.g.e name = rVar.getName();
         c0 makeNotNullable = e1.makeNotNullable(c0Var);
         m.checkNotNullExpressionValue(makeNotNullable, "makeNotNullable(returnType)");
-        list.add(new l0(lVar, null, i2, empty, name, makeNotNullable, rVar.getHasAnnotationParameterDefaultValue(), false, false, c0Var2 == null ? null : e1.makeNotNullable(c0Var2), this.f2527c.getComponents().getSourceElementFactory().source(rVar)));
+        list.add(new l0(lVar, null, i2, empty, name, makeNotNullable, rVar.getHasAnnotationParameterDefaultValue(), false, false, c0Var2 == null ? null : e1.makeNotNullable(c0Var2), this.f2533c.getComponents().getSourceElementFactory().source(rVar)));
     }
 
     public final void p(Collection<t0> collection, d0.e0.p.d.m0.g.e eVar, Collection<? extends t0> collection2, boolean z2) {
-        Collection<? extends t0> resolveOverridesForNonStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForNonStaticMembers(eVar, collection2, collection, this.n, this.f2527c.getComponents().getErrorReporter(), this.f2527c.getComponents().getKotlinTypeChecker().getOverridingUtil());
+        Collection<? extends t0> resolveOverridesForNonStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForNonStaticMembers(eVar, collection2, collection, this.n, this.f2533c.getComponents().getErrorReporter(), this.f2533c.getComponents().getKotlinTypeChecker().getOverridingUtil());
         m.checkNotNullExpressionValue(resolveOverridesForNonStaticMembers, "resolveOverridesForNonStaticMembers(\n            name, functionsFromSupertypes, result, ownerDescriptor, c.components.errorReporter,\n            c.components.kotlinTypeChecker.overridingUtil\n        )");
         if (!z2) {
             collection.addAll(resolveOverridesForNonStaticMembers);
@@ -1184,12 +1184,12 @@ public final class h extends k {
     public void recordLookup(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
         m.checkNotNullParameter(eVar, "name");
         m.checkNotNullParameter(bVar, "location");
-        d0.e0.p.d.m0.d.a.record(this.f2527c.getComponents().getLookupTracker(), bVar, this.n, eVar);
+        d0.e0.p.d.m0.d.a.record(this.f2533c.getComponents().getLookupTracker(), bVar, this.n, eVar);
     }
 
     public final Collection<c0> s() {
         if (!this.p) {
-            return this.f2527c.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner().refineSupertypes(this.n);
+            return this.f2533c.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner().refineSupertypes(this.n);
         }
         Collection<c0> supertypes = this.n.getTypeConstructor().getSupertypes();
         m.checkNotNullExpressionValue(supertypes, "ownerDescriptor.typeConstructor.supertypes");
@@ -1233,7 +1233,7 @@ public final class h extends k {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:15:0x004d, code lost:
-        if (d0.e0.p.d.m0.b.l.isContinuation(r3, r5.f2527c.getComponents().getSettings().isReleaseCoroutines()) == false) goto L_0x0012;
+        if (d0.e0.p.d.m0.b.l.isContinuation(r3, r5.f2533c.getComponents().getSettings().isReleaseCoroutines()) == false) goto L_0x0012;
      */
     public final t0 u(t0 t0Var) {
         d0.e0.p.d.m0.g.b bVar;
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/i.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/i.java
index f1bd0325d9..f5a9ea30da 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/i.java
@@ -31,7 +31,7 @@ public final class i extends a0 {
     public final d r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final j<List<d0.e0.p.d.m0.g.b>> f2526s;
+    public final j<List<d0.e0.p.d.m0.g.b>> f2532s;
     public final d0.e0.p.d.m0.c.g1.g t;
 
     /* compiled from: LazyJavaPackageFragment.kt */
@@ -132,7 +132,7 @@ public final class i extends a0 {
         this.p = childForClassOrPackage$default;
         this.q = childForClassOrPackage$default.getStorageManager().createLazyValue(new a(this));
         this.r = new d(childForClassOrPackage$default, uVar, this);
-        this.f2526s = childForClassOrPackage$default.getStorageManager().createRecursionTolerantLazyValue(new c(this), n.emptyList());
+        this.f2532s = childForClassOrPackage$default.getStorageManager().createRecursionTolerantLazyValue(new c(this), n.emptyList());
         this.t = childForClassOrPackage$default.getComponents().getJavaTypeEnhancementState().getDisabledDefaultAnnotations() ? d0.e0.p.d.m0.c.g1.g.f.getEMPTY() : e.resolveAnnotations(childForClassOrPackage$default, uVar);
         childForClassOrPackage$default.getStorageManager().createLazyValue(new b(this));
     }
@@ -170,7 +170,7 @@ public final class i extends a0 {
     }
 
     public final List<d0.e0.p.d.m0.g.b> getSubPackageFqNames$descriptors_jvm() {
-        return this.f2526s.mo1invoke();
+        return this.f2532s.mo1invoke();
     }
 
     @Override // d0.e0.p.d.m0.c.i1.a0, d0.e0.p.d.m0.c.i1.k
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java
index 82ad8ae7ea..3da4087946 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/j.java
@@ -204,7 +204,7 @@ public final class j extends r {
         if (pVar.getClassHeader().getKind() != a.EnumC0231a.CLASS) {
             return b.c.a;
         }
-        e resolveClass = jVar.f2527c.getComponents().getDeserializedDescriptorResolver().resolveClass(pVar);
+        e resolveClass = jVar.f2533c.getComponents().getDeserializedDescriptorResolver().resolveClass(pVar);
         return resolveClass != null ? new b.a(resolveClass) : b.C0223b.a;
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java
index 8e4f3ec202..d0ef3dfee2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/k.java
@@ -43,7 +43,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(k.class), "functionNamesLazy", "getFunctionNamesLazy()Ljava/util/Set;")), a0.property1(new y(a0.getOrCreateKotlinClass(k.class), "propertyNamesLazy", "getPropertyNamesLazy()Ljava/util/Set;")), a0.property1(new y(a0.getOrCreateKotlinClass(k.class), "classNamesLazy", "getClassNamesLazy()Ljava/util/Set;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0.e0.p.d.m0.e.a.i0.g f2527c;
+    public final d0.e0.p.d.m0.e.a.i0.g f2533c;
     public final k d;
     public final d0.e0.p.d.m0.m.j<Collection<m>> e;
     public final d0.e0.p.d.m0.m.j<b> f;
@@ -61,7 +61,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         public final c0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<c1> f2528c;
+        public final List<c1> f2534c;
         public final List<z0> d;
         public final boolean e;
         public final List<String> f;
@@ -76,7 +76,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
             d0.z.d.m.checkNotNullParameter(list3, "errors");
             this.a = c0Var;
             this.b = c0Var2;
-            this.f2528c = list;
+            this.f2534c = list;
             this.d = list2;
             this.e = z2;
             this.f = list3;
@@ -90,7 +90,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
                 return false;
             }
             a aVar = (a) obj;
-            return d0.z.d.m.areEqual(this.a, aVar.a) && d0.z.d.m.areEqual(this.b, aVar.b) && d0.z.d.m.areEqual(this.f2528c, aVar.f2528c) && d0.z.d.m.areEqual(this.d, aVar.d) && this.e == aVar.e && d0.z.d.m.areEqual(this.f, aVar.f);
+            return d0.z.d.m.areEqual(this.a, aVar.a) && d0.z.d.m.areEqual(this.b, aVar.b) && d0.z.d.m.areEqual(this.f2534c, aVar.f2534c) && d0.z.d.m.areEqual(this.d, aVar.d) && this.e == aVar.e && d0.z.d.m.areEqual(this.f, aVar.f);
         }
 
         public final List<String> getErrors() {
@@ -114,14 +114,14 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         }
 
         public final List<c1> getValueParameters() {
-            return this.f2528c;
+            return this.f2534c;
         }
 
         public int hashCode() {
             int hashCode = this.a.hashCode() * 31;
             c0 c0Var = this.b;
             int hashCode2 = c0Var == null ? 0 : c0Var.hashCode();
-            int hashCode3 = (this.d.hashCode() + ((this.f2528c.hashCode() + ((hashCode + hashCode2) * 31)) * 31)) * 31;
+            int hashCode3 = (this.d.hashCode() + ((this.f2534c.hashCode() + ((hashCode + hashCode2) * 31)) * 31)) * 31;
             boolean z2 = this.e;
             if (z2) {
                 z2 = true;
@@ -138,7 +138,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
             L.append(", receiverType=");
             L.append(this.b);
             L.append(", valueParameters=");
-            L.append(this.f2528c);
+            L.append(this.f2534c);
             L.append(", typeParameters=");
             L.append(this.d);
             L.append(", hasStableParameterNames=");
@@ -282,7 +282,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
             for (r rVar : this.this$0.f.mo1invoke().findMethodsByName(eVar)) {
                 d0.e0.p.d.m0.e.a.h0.f m = this.this$0.m(rVar);
                 if (this.this$0.k(m)) {
-                    ((g.a) this.this$0.f2527c.getComponents().getJavaResolverCache()).recordMethod(rVar, m);
+                    ((g.a) this.this$0.f2533c.getComponents().getJavaResolverCache()).recordMethod(rVar, m);
                     arrayList.add(m);
                 }
             }
@@ -341,7 +341,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
             LinkedHashSet linkedHashSet = new LinkedHashSet((Collection) ((f.m) k.access$getDeclaredFunctions$p(this.this$0)).invoke(eVar));
             k.access$retainMostSpecificMethods(this.this$0, linkedHashSet);
             this.this$0.f(linkedHashSet, eVar);
-            return u.toList(this.this$0.f2527c.getComponents().getSignatureEnhancement().enhanceSignatures(this.this$0.f2527c, linkedHashSet));
+            return u.toList(this.this$0.f2533c.getComponents().getSignatureEnhancement().enhanceSignatures(this.this$0.f2533c, linkedHashSet));
         }
     }
 
@@ -360,7 +360,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
             ArrayList arrayList = new ArrayList();
             d0.e0.p.d.m0.p.a.addIfNotNull(arrayList, k.access$getDeclaredField$p(this.this$0).invoke(eVar));
             this.this$0.g(eVar, arrayList);
-            return d0.e0.p.d.m0.k.e.isAnnotationClass(this.this$0.j()) ? u.toList(arrayList) : u.toList(this.this$0.f2527c.getComponents().getSignatureEnhancement().enhanceSignatures(this.this$0.f2527c, arrayList));
+            return d0.e0.p.d.m0.k.e.isAnnotationClass(this.this$0.j()) ? u.toList(arrayList) : u.toList(this.this$0.f2533c.getComponents().getSignatureEnhancement().enhanceSignatures(this.this$0.f2533c, arrayList));
         }
     }
 
@@ -385,7 +385,7 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
 
     public k(d0.e0.p.d.m0.e.a.i0.g gVar, k kVar) {
         d0.z.d.m.checkNotNullParameter(gVar, "c");
-        this.f2527c = gVar;
+        this.f2533c = gVar;
         this.d = kVar;
         this.e = gVar.getStorageManager().createRecursionTolerantLazyValue(new c(this), d0.t.n.emptyList());
         this.f = gVar.getStorageManager().createLazyValue(new g(this));
@@ -417,10 +417,10 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
     public static final n0 access$resolveProperty(k kVar, n nVar) {
         Objects.requireNonNull(kVar);
         boolean z2 = true;
-        d0.e0.p.d.m0.e.a.h0.g create = d0.e0.p.d.m0.e.a.h0.g.create(kVar.j(), d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(kVar.f2527c, nVar), z.FINAL, f0.toDescriptorVisibility(nVar.getVisibility()), !nVar.isFinal(), nVar.getName(), kVar.f2527c.getComponents().getSourceElementFactory().source(nVar), nVar.isFinal() && nVar.isStatic());
+        d0.e0.p.d.m0.e.a.h0.g create = d0.e0.p.d.m0.e.a.h0.g.create(kVar.j(), d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(kVar.f2533c, nVar), z.FINAL, f0.toDescriptorVisibility(nVar.getVisibility()), !nVar.isFinal(), nVar.getName(), kVar.f2533c.getComponents().getSourceElementFactory().source(nVar), nVar.isFinal() && nVar.isStatic());
         d0.z.d.m.checkNotNullExpressionValue(create, "create(\n            ownerDescriptor, annotations, Modality.FINAL, field.visibility.toDescriptorVisibility(), isVar, field.name,\n            c.components.sourceElementFactory.source(field), /* isConst = */ field.isFinalStatic\n        )");
         create.initialize(null, null, null, null);
-        c0 transformJavaType = kVar.f2527c.getTypeResolver().transformJavaType(nVar.getType(), d0.e0.p.d.m0.e.a.i0.m.e.toAttributes$default(d0.e0.p.d.m0.e.a.g0.k.COMMON, false, null, 3, null));
+        c0 transformJavaType = kVar.f2533c.getTypeResolver().transformJavaType(nVar.getType(), d0.e0.p.d.m0.e.a.i0.m.e.toAttributes$default(d0.e0.p.d.m0.e.a.g0.k.COMMON, false, null, 3, null));
         if (d0.e0.p.d.m0.b.h.isPrimitiveType(transformJavaType) || d0.e0.p.d.m0.b.h.isString(transformJavaType)) {
             if (nVar.isFinal() && nVar.isStatic()) {
             }
@@ -432,9 +432,9 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
         }
         create.setType(transformJavaType, d0.t.n.emptyList(), kVar.i(), null);
         if (d0.e0.p.d.m0.k.e.shouldRecordInitializerForProperty(create, create.getType())) {
-            create.setCompileTimeInitializer(kVar.f2527c.getStorageManager().createNullableLazyValue(new l(kVar, nVar, create)));
+            create.setCompileTimeInitializer(kVar.f2533c.getStorageManager().createNullableLazyValue(new l(kVar, nVar, create)));
         }
-        ((g.a) kVar.f2527c.getComponents().getJavaResolverCache()).recordField(nVar, create);
+        ((g.a) kVar.f2533c.getComponents().getJavaResolverCache()).recordField(nVar, create);
         return create;
     }
 
@@ -531,9 +531,9 @@ public abstract class k extends d0.e0.p.d.m0.k.a0.j {
 
     public final d0.e0.p.d.m0.e.a.h0.f m(r rVar) {
         d0.z.d.m.checkNotNullParameter(rVar, "method");
-        d0.e0.p.d.m0.e.a.h0.f createJavaMethod = d0.e0.p.d.m0.e.a.h0.f.createJavaMethod(j(), d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2527c, rVar), rVar.getName(), this.f2527c.getComponents().getSourceElementFactory().source(rVar), this.f.mo1invoke().findRecordComponentByName(rVar.getName()) != null && rVar.getValueParameters().isEmpty());
+        d0.e0.p.d.m0.e.a.h0.f createJavaMethod = d0.e0.p.d.m0.e.a.h0.f.createJavaMethod(j(), d0.e0.p.d.m0.e.a.i0.e.resolveAnnotations(this.f2533c, rVar), rVar.getName(), this.f2533c.getComponents().getSourceElementFactory().source(rVar), this.f.mo1invoke().findRecordComponentByName(rVar.getName()) != null && rVar.getValueParameters().isEmpty());
         d0.z.d.m.checkNotNullExpressionValue(createJavaMethod, "createJavaMethod(\n            ownerDescriptor, annotations, method.name, c.components.sourceElementFactory.source(method),\n            declaredMemberIndex().findRecordComponentByName(method.name) != null && method.valueParameters.isEmpty()\n        )");
-        d0.e0.p.d.m0.e.a.i0.g childForMethod$default = d0.e0.p.d.m0.e.a.i0.a.childForMethod$default(this.f2527c, createJavaMethod, rVar, 0, 4, null);
+        d0.e0.p.d.m0.e.a.i0.g childForMethod$default = d0.e0.p.d.m0.e.a.i0.a.childForMethod$default(this.f2533c, createJavaMethod, rVar, 0, 4, null);
         List<d0.e0.p.d.m0.e.a.k0.y> typeParameters = rVar.getTypeParameters();
         List<? extends z0> arrayList = new ArrayList<>(d0.t.o.collectionSizeOrDefault(typeParameters, 10));
         for (d0.e0.p.d.m0.e.a.k0.y yVar : typeParameters) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/l.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/l.java
index a8f0e905ce..ff0465febc 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/l.java
@@ -22,6 +22,6 @@ public final class l extends o implements Function0<g<?>> {
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final g<?> mo1invoke() {
-        return this.this$0.f2527c.getComponents().getJavaPropertyInitializerEvaluator().getInitializerConstant(this.$field, this.$propertyDescriptor);
+        return this.this$0.f2533c.getComponents().getJavaPropertyInitializerEvaluator().getInitializerConstant(this.$field, this.$propertyDescriptor);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java
index 4590569b0b..2f5fc35c2f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/o.java
@@ -82,7 +82,7 @@ public final class o extends r {
         }
         mutableSet.addAll(functionNames);
         if (this.n.isEnum()) {
-            mutableSet.addAll(n.listOf((Object[]) new e[]{d0.e0.p.d.m0.b.k.f2414c, d0.e0.p.d.m0.b.k.b}));
+            mutableSet.addAll(n.listOf((Object[]) new e[]{d0.e0.p.d.m0.b.k.f2420c, d0.e0.p.d.m0.b.k.b}));
         }
         return mutableSet;
     }
@@ -97,13 +97,13 @@ public final class o extends r {
         m.checkNotNullParameter(collection, "result");
         m.checkNotNullParameter(eVar, "name");
         o parentJavaStaticClassScope = k.getParentJavaStaticClassScope(this.o);
-        Collection<? extends t0> resolveOverridesForStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, parentJavaStaticClassScope == null ? d0.t.n0.emptySet() : u.toSet(parentJavaStaticClassScope.getContributedFunctions(eVar, d.WHEN_GET_SUPER_MEMBERS)), collection, this.o, this.f2527c.getComponents().getErrorReporter(), this.f2527c.getComponents().getKotlinTypeChecker().getOverridingUtil());
+        Collection<? extends t0> resolveOverridesForStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, parentJavaStaticClassScope == null ? d0.t.n0.emptySet() : u.toSet(parentJavaStaticClassScope.getContributedFunctions(eVar, d.WHEN_GET_SUPER_MEMBERS)), collection, this.o, this.f2533c.getComponents().getErrorReporter(), this.f2533c.getComponents().getKotlinTypeChecker().getOverridingUtil());
         m.checkNotNullExpressionValue(resolveOverridesForStaticMembers, "resolveOverridesForStaticMembers(\n            name,\n            functionsFromSupertypes,\n            result,\n            ownerDescriptor,\n            c.components.errorReporter,\n            c.components.kotlinTypeChecker.overridingUtil\n        )");
         collection.addAll(resolveOverridesForStaticMembers);
         if (!this.n.isEnum()) {
             return;
         }
-        if (m.areEqual(eVar, d0.e0.p.d.m0.b.k.f2414c)) {
+        if (m.areEqual(eVar, d0.e0.p.d.m0.b.k.f2420c)) {
             t0 createEnumValueOfMethod = d0.e0.p.d.m0.k.d.createEnumValueOfMethod(this.o);
             m.checkNotNullExpressionValue(createEnumValueOfMethod, "createEnumValueOfMethod(ownerDescriptor)");
             collection.add(createEnumValueOfMethod);
@@ -122,7 +122,7 @@ public final class o extends r {
         LinkedHashSet linkedHashSet = new LinkedHashSet();
         d0.e0.p.d.m0.p.b.dfs(d0.t.m.listOf(fVar), p.a, new q(fVar, linkedHashSet, new a(eVar)));
         if (!collection.isEmpty()) {
-            Collection<? extends n0> resolveOverridesForStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, linkedHashSet, collection, this.o, this.f2527c.getComponents().getErrorReporter(), this.f2527c.getComponents().getKotlinTypeChecker().getOverridingUtil());
+            Collection<? extends n0> resolveOverridesForStaticMembers = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, linkedHashSet, collection, this.o, this.f2533c.getComponents().getErrorReporter(), this.f2533c.getComponents().getKotlinTypeChecker().getOverridingUtil());
             m.checkNotNullExpressionValue(resolveOverridesForStaticMembers, "resolveOverridesForStaticMembers(\n                    name,\n                    propertiesFromSupertypes,\n                    result,\n                    ownerDescriptor,\n                    c.components.errorReporter,\n                    c.components.kotlinTypeChecker.overridingUtil\n                )");
             collection.addAll(resolveOverridesForStaticMembers);
             return;
@@ -139,7 +139,7 @@ public final class o extends r {
         }
         ArrayList arrayList = new ArrayList();
         for (Map.Entry entry : linkedHashMap.entrySet()) {
-            Collection resolveOverridesForStaticMembers2 = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, (Collection) entry.getValue(), collection, this.o, this.f2527c.getComponents().getErrorReporter(), this.f2527c.getComponents().getKotlinTypeChecker().getOverridingUtil());
+            Collection resolveOverridesForStaticMembers2 = d0.e0.p.d.m0.e.a.g0.a.resolveOverridesForStaticMembers(eVar, (Collection) entry.getValue(), collection, this.o, this.f2533c.getComponents().getErrorReporter(), this.f2533c.getComponents().getKotlinTypeChecker().getOverridingUtil());
             m.checkNotNullExpressionValue(resolveOverridesForStaticMembers2, "resolveOverridesForStaticMembers(\n                    name, it.value, result, ownerDescriptor, c.components.errorReporter,\n                    c.components.kotlinTypeChecker.overridingUtil\n                )");
             r.addAll(arrayList, resolveOverridesForStaticMembers2);
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/q.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/q.java
index 9796264397..f5fab08b8e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/q.java
@@ -14,14 +14,14 @@ public final class q extends b.AbstractC0287b<e, Unit> {
     public final /* synthetic */ Set<R> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Function1<i, Collection<R>> f2529c;
+    public final /* synthetic */ Function1<i, Collection<R>> f2535c;
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.jvm.functions.Function1<? super d0.e0.p.d.m0.k.a0.i, ? extends java.util.Collection<? extends R>> */
     /* JADX WARN: Multi-variable type inference failed */
     public q(e eVar, Set<R> set, Function1<? super i, ? extends Collection<? extends R>> function1) {
         this.a = eVar;
         this.b = set;
-        this.f2529c = function1;
+        this.f2535c = function1;
     }
 
     public boolean beforeChildren(e eVar) {
@@ -34,7 +34,7 @@ public final class q extends b.AbstractC0287b<e, Unit> {
         if (!(staticScope instanceof r)) {
             return true;
         }
-        this.b.addAll((Collection) this.f2529c.invoke(staticScope));
+        this.b.addAll((Collection) this.f2535c.invoke(staticScope));
         return false;
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/s.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/s.java
index 44fbc26565..d4e8d65a76 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/s.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/l/s.java
@@ -21,7 +21,7 @@ import java.util.List;
 public final class s extends b {
 
     /* renamed from: s  reason: collision with root package name */
-    public final g f2530s;
+    public final g f2536s;
     public final y t;
     public final d u;
 
@@ -31,7 +31,7 @@ public final class s extends b {
         d0.z.d.m.checkNotNullParameter(gVar, "c");
         d0.z.d.m.checkNotNullParameter(yVar, "javaTypeParameter");
         d0.z.d.m.checkNotNullParameter(mVar, "containingDeclaration");
-        this.f2530s = gVar;
+        this.f2536s = gVar;
         this.t = yVar;
         this.u = new d(gVar, yVar, false, 4, null);
     }
@@ -39,7 +39,7 @@ public final class s extends b {
     @Override // d0.e0.p.d.m0.c.i1.f
     public List<c0> b(List<? extends c0> list) {
         d0.z.d.m.checkNotNullParameter(list, "bounds");
-        return this.f2530s.getComponents().getSignatureEnhancement().enhanceTypeParameterBounds(this, list, this.f2530s);
+        return this.f2536s.getComponents().getSignatureEnhancement().enhanceTypeParameterBounds(this, list, this.f2536s);
     }
 
     @Override // d0.e0.p.d.m0.c.i1.f
@@ -52,15 +52,15 @@ public final class s extends b {
         Collection<j> upperBounds = this.t.getUpperBounds();
         if (upperBounds.isEmpty()) {
             d0 d0Var = d0.a;
-            j0 anyType = this.f2530s.getModule().getBuiltIns().getAnyType();
+            j0 anyType = this.f2536s.getModule().getBuiltIns().getAnyType();
             d0.z.d.m.checkNotNullExpressionValue(anyType, "c.module.builtIns.anyType");
-            j0 nullableAnyType = this.f2530s.getModule().getBuiltIns().getNullableAnyType();
+            j0 nullableAnyType = this.f2536s.getModule().getBuiltIns().getNullableAnyType();
             d0.z.d.m.checkNotNullExpressionValue(nullableAnyType, "c.module.builtIns.nullableAnyType");
             return d0.t.m.listOf(d0.flexibleType(anyType, nullableAnyType));
         }
         ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(upperBounds, 10));
         for (j jVar : upperBounds) {
-            arrayList.add(this.f2530s.getTypeResolver().transformJavaType(jVar, e.toAttributes$default(k.COMMON, false, this, 1, null)));
+            arrayList.add(this.f2536s.getTypeResolver().transformJavaType(jVar, e.toAttributes$default(k.COMMON, false, this, 1, null)));
         }
         return arrayList;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/a.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/a.java
index 3d39c90508..91cd7984b4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/a.java
@@ -10,7 +10,7 @@ public final class a {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2531c;
+    public final boolean f2537c;
     public final z0 d;
 
     public a(k kVar, b bVar, boolean z2, z0 z0Var) {
@@ -18,7 +18,7 @@ public final class a {
         m.checkNotNullParameter(bVar, "flexibility");
         this.a = kVar;
         this.b = bVar;
-        this.f2531c = z2;
+        this.f2537c = z2;
         this.d = z0Var;
     }
 
@@ -35,7 +35,7 @@ public final class a {
             bVar = aVar.b;
         }
         if ((i & 4) != 0) {
-            z2 = aVar.f2531c;
+            z2 = aVar.f2537c;
         }
         if ((i & 8) != 0) {
             z0Var = aVar.d;
@@ -57,7 +57,7 @@ public final class a {
             return false;
         }
         a aVar = (a) obj;
-        return this.a == aVar.a && this.b == aVar.b && this.f2531c == aVar.f2531c && m.areEqual(this.d, aVar.d);
+        return this.a == aVar.a && this.b == aVar.b && this.f2537c == aVar.f2537c && m.areEqual(this.d, aVar.d);
     }
 
     public final b getFlexibility() {
@@ -74,7 +74,7 @@ public final class a {
 
     public int hashCode() {
         int hashCode = (this.b.hashCode() + (this.a.hashCode() * 31)) * 31;
-        boolean z2 = this.f2531c;
+        boolean z2 = this.f2537c;
         if (z2) {
             z2 = true;
         }
@@ -87,7 +87,7 @@ public final class a {
     }
 
     public final boolean isForAnnotationParameter() {
-        return this.f2531c;
+        return this.f2537c;
     }
 
     public String toString() {
@@ -96,7 +96,7 @@ public final class a {
         L.append(", flexibility=");
         L.append(this.b);
         L.append(", isForAnnotationParameter=");
-        L.append(this.f2531c);
+        L.append(this.f2537c);
         L.append(", upperBoundOfTypeParameter=");
         L.append(this.d);
         L.append(')');
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/f.java b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/f.java
index 2059975d27..fbd854724c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/i0/m/f.java
@@ -28,7 +28,7 @@ public final class f extends z0 {
     public static final f b = new f();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2532c;
+    public static final a f2538c;
     public static final a d;
 
     /* compiled from: RawType.kt */
@@ -64,7 +64,7 @@ public final class f extends z0 {
 
     static {
         k kVar = k.COMMON;
-        f2532c = e.toAttributes$default(kVar, false, null, 3, null).withFlexibility(b.FLEXIBLE_LOWER_BOUND);
+        f2538c = e.toAttributes$default(kVar, false, null, 3, null).withFlexibility(b.FLEXIBLE_LOWER_BOUND);
         d = e.toAttributes$default(kVar, false, null, 3, null).withFlexibility(b.FLEXIBLE_UPPER_BOUND);
     }
 
@@ -121,7 +121,7 @@ public final class f extends z0 {
         if (declarationDescriptor instanceof e) {
             d0.e0.p.d.m0.c.h declarationDescriptor2 = y.upperIfFlexible(c0Var).getConstructor().getDeclarationDescriptor();
             if (declarationDescriptor2 instanceof e) {
-                Pair<j0, Boolean> a2 = a(y.lowerIfFlexible(c0Var), (e) declarationDescriptor, f2532c);
+                Pair<j0, Boolean> a2 = a(y.lowerIfFlexible(c0Var), (e) declarationDescriptor, f2538c);
                 j0 component1 = a2.component1();
                 boolean booleanValue = a2.component2().booleanValue();
                 Pair<j0, Boolean> a3 = a(y.upperIfFlexible(c0Var), (e) declarationDescriptor2, d);
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/d.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/d.java
index 3cbb0378bc..15dfa431d5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/d.java
@@ -34,13 +34,13 @@ public final class d {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2533c;
+        public final boolean f2539c;
 
         public a(c0 c0Var, int i, boolean z2) {
             m.checkNotNullParameter(c0Var, "type");
             this.a = c0Var;
             this.b = i;
-            this.f2533c = z2;
+            this.f2539c = z2;
         }
 
         public final int getSubtreeSize() {
@@ -60,7 +60,7 @@ public final class d {
         }
 
         public final boolean getWereChanges() {
-            return this.f2533c;
+            return this.f2539c;
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/e.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/e.java
index 1c0a432e3f..347d0f1535 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/e.java
@@ -7,7 +7,7 @@ public final class e {
     public static final e b = new e(null, null, false, false, 8, null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final h f2534c;
+    public final h f2540c;
     public final f d;
     public final boolean e;
     public final boolean f;
@@ -23,7 +23,7 @@ public final class e {
     }
 
     public e(h hVar, f fVar, boolean z2, boolean z3) {
-        this.f2534c = hVar;
+        this.f2540c = hVar;
         this.d = fVar;
         this.e = z2;
         this.f = z3;
@@ -43,7 +43,7 @@ public final class e {
     }
 
     public final h getNullability() {
-        return this.f2534c;
+        return this.f2540c;
     }
 
     public final boolean isNotNullTypeParameter() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/j.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/j.java
index 47bb06f0e8..7e9263510e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/j.java
@@ -10,7 +10,7 @@ public final class j {
     public static final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f2535c;
+    public static final e f2541c;
     public static final Map<String, k> d;
 
     /* compiled from: predefinedEnhancementInfo.kt */
@@ -727,7 +727,7 @@ public final class j {
     static {
         h hVar = h.NOT_NULL;
         b = new e(hVar, null, false, false, 8, null);
-        f2535c = new e(hVar, null, true, false, 8, null);
+        f2541c = new e(hVar, null, true, false, 8, null);
         d0.e0.p.d.m0.e.b.w wVar = d0.e0.p.d.m0.e.b.w.a;
         String javaLang = wVar.javaLang("Object");
         String javaFunction = wVar.javaFunction("Predicate");
@@ -774,7 +774,7 @@ public final class j {
     }
 
     public static final /* synthetic */ e access$getNOT_NULLABLE$p$s1730278749() {
-        return f2535c;
+        return f2541c;
     }
 
     public static final /* synthetic */ e access$getNOT_PLATFORM$p$s1730278749() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/l.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/l.java
index ba9f1c6020..dfeb4dd31b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/l.java
@@ -48,7 +48,7 @@ public final class l {
     public final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final d f2536c;
+    public final d f2542c;
 
     /* compiled from: signatureEnhancement.kt */
     public static class a {
@@ -56,17 +56,17 @@ public final class l {
         public final boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2537c;
+        public final boolean f2543c;
 
         public a(c0 c0Var, boolean z2, boolean z3) {
             m.checkNotNullParameter(c0Var, "type");
             this.a = c0Var;
             this.b = z2;
-            this.f2537c = z3;
+            this.f2543c = z3;
         }
 
         public final boolean getContainsFunctionN() {
-            return this.f2537c;
+            return this.f2543c;
         }
 
         public final c0 getType() {
@@ -84,7 +84,7 @@ public final class l {
         public final c0 b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Collection<c0> f2538c;
+        public final Collection<c0> f2544c;
         public final boolean d;
         public final g e;
         public final d0.e0.p.d.m0.e.a.a f;
@@ -148,7 +148,7 @@ public final class l {
             l.this = lVar;
             this.a = aVar;
             this.b = c0Var;
-            this.f2538c = collection;
+            this.f2544c = collection;
             this.d = z2;
             this.e = gVar;
             this.f = aVar2;
@@ -409,7 +409,7 @@ public final class l {
             i nullabilityQualifier;
             d0.e0.p.d.m0.c.g1.a aVar;
             boolean z8;
-            Collection<c0> collection = this.f2538c;
+            Collection<c0> collection = this.f2544c;
             int i3 = 10;
             ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(collection, 10));
             Iterator it2 = collection.iterator();
@@ -426,7 +426,7 @@ public final class l {
             ArrayList arrayList4 = new ArrayList(1);
             d(this, arrayList4, c0Var, this.e, null);
             if (this.d) {
-                Collection<c0> collection2 = this.f2538c;
+                Collection<c0> collection2 = this.f2544c;
                 if (!(collection2 instanceof Collection) || !collection2.isEmpty()) {
                     Iterator it3 = collection2.iterator();
                     while (true) {
@@ -809,7 +809,7 @@ public final class l {
                                     m.checkNotNullParameter(dVar, "typeEnhancement");
                                     this.a = cVar;
                                     this.b = eVar;
-                                    this.f2536c = dVar;
+                                    this.f2542c = dVar;
                                 }
 
                                 public static final /* synthetic */ d0.e0.p.d.m0.e.a.c access$getAnnotationTypeQualifierResolver$p(l lVar) {
@@ -817,7 +817,7 @@ public final class l {
                                 }
 
                                 public static final /* synthetic */ d access$getTypeEnhancement$p(l lVar) {
-                                    return lVar.f2536c;
+                                    return lVar.f2542c;
                                 }
 
                                 /* JADX INFO: Can't fix incorrect switch cases order, some code will duplicate */
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java
index 53e17f54d6..1995551e68 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/q.java
@@ -32,7 +32,7 @@ public final class q {
             public final List<Pair<String, w>> b = new ArrayList();
 
             /* renamed from: c  reason: collision with root package name */
-            public Pair<String, w> f2539c = o.to("V", null);
+            public Pair<String, w> f2545c = o.to("V", null);
             public final /* synthetic */ a d;
 
             public C0228a(a aVar, String str) {
@@ -52,8 +52,8 @@ public final class q {
                 while (it.hasNext()) {
                     arrayList.add((String) ((Pair) it.next()).getFirst());
                 }
-                String signature = wVar.signature(className, wVar.jvmDescriptor(functionName, arrayList, this.f2539c.getFirst()));
-                w second = this.f2539c.getSecond();
+                String signature = wVar.signature(className, wVar.jvmDescriptor(functionName, arrayList, this.f2545c.getFirst()));
+                w second = this.f2545c.getSecond();
                 List<Pair<String, w>> list2 = this.b;
                 ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(list2, 10));
                 Iterator<T> it2 = list2.iterator();
@@ -89,7 +89,7 @@ public final class q {
                 m.checkNotNullParameter(dVar, "type");
                 String desc = dVar.getDesc();
                 m.checkNotNullExpressionValue(desc, "type.desc");
-                this.f2539c = o.to(desc, null);
+                this.f2545c = o.to(desc, null);
             }
 
             public final void returns(String str, e... eVarArr) {
@@ -100,7 +100,7 @@ public final class q {
                 for (z zVar : withIndex) {
                     linkedHashMap.put(Integer.valueOf(zVar.getIndex()), (e) zVar.getValue());
                 }
-                this.f2539c = o.to(str, new w(linkedHashMap));
+                this.f2545c = o.to(str, new w(linkedHashMap));
             }
         }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/s.java b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/s.java
index 249012ad27..5082d4380a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/l0/s.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/l0/s.java
@@ -11,14 +11,14 @@ public final class s {
     public final u b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final z0 f2540c;
+    public final z0 f2546c;
     public final boolean d;
 
     public s(c0 c0Var, u uVar, z0 z0Var, boolean z2) {
         m.checkNotNullParameter(c0Var, "type");
         this.a = c0Var;
         this.b = uVar;
-        this.f2540c = z0Var;
+        this.f2546c = z0Var;
         this.d = z2;
     }
 
@@ -31,7 +31,7 @@ public final class s {
     }
 
     public final z0 component3() {
-        return this.f2540c;
+        return this.f2546c;
     }
 
     public final boolean component4() {
@@ -46,7 +46,7 @@ public final class s {
             return false;
         }
         s sVar = (s) obj;
-        return m.areEqual(this.a, sVar.a) && m.areEqual(this.b, sVar.b) && m.areEqual(this.f2540c, sVar.f2540c) && this.d == sVar.d;
+        return m.areEqual(this.a, sVar.a) && m.areEqual(this.b, sVar.b) && m.areEqual(this.f2546c, sVar.f2546c) && this.d == sVar.d;
     }
 
     public final c0 getType() {
@@ -58,7 +58,7 @@ public final class s {
         u uVar = this.b;
         int i = 0;
         int hashCode2 = (hashCode + (uVar == null ? 0 : uVar.hashCode())) * 31;
-        z0 z0Var = this.f2540c;
+        z0 z0Var = this.f2546c;
         if (z0Var != null) {
             i = z0Var.hashCode();
         }
@@ -79,7 +79,7 @@ public final class s {
         L.append(", defaultQualifiers=");
         L.append(this.b);
         L.append(", typeParameterForArgument=");
-        L.append(this.f2540c);
+        L.append(this.f2546c);
         L.append(", isFromStarProjection=");
         L.append(this.d);
         L.append(')');
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/s.java b/app/src/main/java/d0/e0/p/d/m0/e/a/s.java
index d545c4b6f9..e1f5e47be4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/s.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/s.java
@@ -16,13 +16,13 @@ public interface s {
         public final byte[] b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final g f2541c;
+        public final g f2547c;
 
         public a(d0.e0.p.d.m0.g.a aVar, byte[] bArr, g gVar) {
             m.checkNotNullParameter(aVar, "classId");
             this.a = aVar;
             this.b = bArr;
-            this.f2541c = gVar;
+            this.f2547c = gVar;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -38,7 +38,7 @@ public interface s {
                 return false;
             }
             a aVar = (a) obj;
-            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2541c, aVar.f2541c);
+            return m.areEqual(this.a, aVar.a) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2547c, aVar.f2547c);
         }
 
         public final d0.e0.p.d.m0.g.a getClassId() {
@@ -50,7 +50,7 @@ public interface s {
             byte[] bArr = this.b;
             int i = 0;
             int hashCode2 = (hashCode + (bArr == null ? 0 : Arrays.hashCode(bArr))) * 31;
-            g gVar = this.f2541c;
+            g gVar = this.f2547c;
             if (gVar != null) {
                 i = gVar.hashCode();
             }
@@ -63,7 +63,7 @@ public interface s {
             L.append(", previouslyFoundClassFileContent=");
             L.append(Arrays.toString(this.b));
             L.append(", outerClass=");
-            L.append(this.f2541c);
+            L.append(this.f2547c);
             L.append(')');
             return L.toString();
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/u.java b/app/src/main/java/d0/e0/p/d/m0/e/a/u.java
index 6e371e4ee4..b3e5e7264e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/u.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/u.java
@@ -12,7 +12,7 @@ public final class u {
     public final Collection<a> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2542c;
+    public final boolean f2548c;
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Collection<? extends d0.e0.p.d.m0.e.a.a> */
     /* JADX WARN: Multi-variable type inference failed */
@@ -21,7 +21,7 @@ public final class u {
         m.checkNotNullParameter(collection, "qualifierApplicabilityTypes");
         this.a = iVar;
         this.b = collection;
-        this.f2542c = z2;
+        this.f2548c = z2;
     }
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -39,7 +39,7 @@ public final class u {
             collection = uVar.b;
         }
         if ((i & 4) != 0) {
-            z2 = uVar.f2542c;
+            z2 = uVar.f2548c;
         }
         return uVar.copy(iVar, collection, z2);
     }
@@ -58,15 +58,15 @@ public final class u {
             return false;
         }
         u uVar = (u) obj;
-        return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && this.f2542c == uVar.f2542c;
+        return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && this.f2548c == uVar.f2548c;
     }
 
     public final boolean getAffectsTypeParameterBasedTypes() {
-        return this.f2542c;
+        return this.f2548c;
     }
 
     public final boolean getMakesTypeParameterNotNull() {
-        return this.a.getQualifier() == h.NOT_NULL && this.f2542c;
+        return this.a.getQualifier() == h.NOT_NULL && this.f2548c;
     }
 
     public final i getNullabilityQualifier() {
@@ -79,7 +79,7 @@ public final class u {
 
     public int hashCode() {
         int hashCode = (this.b.hashCode() + (this.a.hashCode() * 31)) * 31;
-        boolean z2 = this.f2542c;
+        boolean z2 = this.f2548c;
         if (z2) {
             z2 = true;
         }
@@ -95,7 +95,7 @@ public final class u {
         L.append(", qualifierApplicabilityTypes=");
         L.append(this.b);
         L.append(", affectsTypeParameterBasedTypes=");
-        L.append(this.f2542c);
+        L.append(this.f2548c);
         L.append(')');
         return L.toString();
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/a/w.java b/app/src/main/java/d0/e0/p/d/m0/e/a/w.java
index 8a54e8fee6..5e31de275d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/a/w.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/a/w.java
@@ -17,7 +17,7 @@ public class w {
     public static final u b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final u f2543c;
+    public static final u f2549c;
     public static final Map<f1, u> d = new HashMap();
 
     /* compiled from: JavaDescriptorVisibilities */
@@ -117,12 +117,12 @@ public class w {
     }
 
     static {
-        a aVar = new a(d0.e0.p.d.m0.c.j1.a.f2478c);
+        a aVar = new a(d0.e0.p.d.m0.c.j1.a.f2484c);
         a = aVar;
-        b bVar = new b(d0.e0.p.d.m0.c.j1.c.f2480c);
+        b bVar = new b(d0.e0.p.d.m0.c.j1.c.f2486c);
         b = bVar;
-        c cVar = new c(d0.e0.p.d.m0.c.j1.b.f2479c);
-        f2543c = cVar;
+        c cVar = new c(d0.e0.p.d.m0.c.j1.b.f2485c);
+        f2549c = cVar;
         d(aVar);
         d(bVar);
         d(cVar);
@@ -181,7 +181,7 @@ public class w {
         } else if (c(e.unwrapFakeOverrideToAnyDeclaration(qVar), mVar)) {
             return true;
         } else {
-            return t.f2497c.isVisible(dVar, qVar, mVar);
+            return t.f2503c.isVisible(dVar, qVar, mVar);
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/a.java b/app/src/main/java/d0/e0/p/d/m0/e/b/a.java
index 061be2f299..322a7dffe7 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/a.java
@@ -274,7 +274,7 @@ public abstract class a<A, C> implements d0.e0.p.d.m0.l.b.c<A, C> {
     public abstract p.a h(d0.e0.p.d.m0.g.a aVar, u0 u0Var, List<A> list);
 
     public final List<A> i(y yVar, d0.e0.p.d.m0.f.n nVar, EnumC0229a aVar) {
-        Boolean bool = d0.e0.p.d.m0.f.z.b.f2582z.get(nVar.getFlags());
+        Boolean bool = d0.e0.p.d.m0.f.z.b.f2588z.get(nVar.getFlags());
         m.checkNotNullExpressionValue(bool, "IS_CONST.get(proto.flags)");
         boolean booleanValue = bool.booleanValue();
         d0.e0.p.d.m0.f.a0.b.h hVar = d0.e0.p.d.m0.f.a0.b.h.a;
@@ -366,7 +366,7 @@ public abstract class a<A, C> implements d0.e0.p.d.m0.l.b.c<A, C> {
         m.checkNotNullParameter(yVar, "container");
         m.checkNotNullParameter(nVar, "proto");
         m.checkNotNullParameter(c0Var, "expectedType");
-        Boolean bool = d0.e0.p.d.m0.f.z.b.f2582z.get(nVar.getFlags());
+        Boolean bool = d0.e0.p.d.m0.f.z.b.f2588z.get(nVar.getFlags());
         d0.e0.p.d.m0.f.a0.b.h hVar = d0.e0.p.d.m0.f.a0.b.h.a;
         p g = g(yVar, true, true, bool, d0.e0.p.d.m0.f.a0.b.h.isMovedFromInterfaceCompanion(nVar));
         if (g == null) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/b.java b/app/src/main/java/d0/e0/p/d/m0/e/b/b.java
index a936255a2d..170574ae13 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/b.java
@@ -18,7 +18,7 @@ public final class b implements p.d {
     public final /* synthetic */ HashMap<s, List<A>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ HashMap<s, C> f2544c;
+    public final /* synthetic */ HashMap<s, C> f2550c;
 
     /* compiled from: AbstractBinaryClassAnnotationAndConstantLoader.kt */
     public final class a extends C0230b implements p.e {
@@ -53,12 +53,12 @@ public final class b implements p.d {
         public final ArrayList<A> b = new ArrayList<>();
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ b f2545c;
+        public final /* synthetic */ b f2551c;
 
         public C0230b(b bVar, s sVar) {
             m.checkNotNullParameter(bVar, "this$0");
             m.checkNotNullParameter(sVar, "signature");
-            this.f2545c = bVar;
+            this.f2551c = bVar;
             this.a = sVar;
         }
 
@@ -66,13 +66,13 @@ public final class b implements p.d {
         public p.a visitAnnotation(d0.e0.p.d.m0.g.a aVar, u0 u0Var) {
             m.checkNotNullParameter(aVar, "classId");
             m.checkNotNullParameter(u0Var, "source");
-            return a.access$loadAnnotationIfNotSpecial(this.f2545c.a, aVar, u0Var, this.b);
+            return a.access$loadAnnotationIfNotSpecial(this.f2551c.a, aVar, u0Var, this.b);
         }
 
         @Override // d0.e0.p.d.m0.e.b.p.c
         public void visitEnd() {
             if (!this.b.isEmpty()) {
-                this.f2545c.b.put(this.a, this.b);
+                this.f2551c.b.put(this.a, this.b);
             }
         }
     }
@@ -80,7 +80,7 @@ public final class b implements p.d {
     public b(a<A, C> aVar, HashMap<s, List<A>> hashMap, HashMap<s, C> hashMap2) {
         this.a = aVar;
         this.b = hashMap;
-        this.f2544c = hashMap2;
+        this.f2550c = hashMap2;
     }
 
     @Override // d0.e0.p.d.m0.e.b.p.d
@@ -121,7 +121,7 @@ public final class b implements p.d {
             }
             g<?> createConstantValue = h.a.createConstantValue(obj);
             if (createConstantValue != null) {
-                this.f2544c.put(fromFieldNameAndDesc, createConstantValue);
+                this.f2550c.put(fromFieldNameAndDesc, createConstantValue);
             }
         }
         return new C0230b(this, fromFieldNameAndDesc);
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/b0/a.java b/app/src/main/java/d0/e0/p/d/m0/e/b/b0/a.java
index 88ce7a20ec..43784c9431 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/b0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/b0/a.java
@@ -16,7 +16,7 @@ public final class a {
     public final f b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String[] f2546c;
+    public final String[] f2552c;
     public final String[] d;
     public final String[] e;
     public final String f;
@@ -36,7 +36,7 @@ public final class a {
         public static final Map<Integer, EnumC0231a> j;
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f2547id;
+        private final int f2553id;
 
         /* compiled from: KotlinClassHeader.kt */
         /* renamed from: d0.e0.p.d.m0.e.b.b0.a$a$a  reason: collision with other inner class name */
@@ -61,7 +61,7 @@ public final class a {
         }
 
         public EnumC0231a(int i2) {
-            this.f2547id = i2;
+            this.f2553id = i2;
         }
 
         public static final /* synthetic */ Map access$getEntryById$cp() {
@@ -73,7 +73,7 @@ public final class a {
         }
 
         public final int getId() {
-            return this.f2547id;
+            return this.f2553id;
         }
     }
 
@@ -83,7 +83,7 @@ public final class a {
         m.checkNotNullParameter(cVar, "bytecodeVersion");
         this.a = aVar;
         this.b = fVar;
-        this.f2546c = strArr;
+        this.f2552c = strArr;
         this.d = strArr2;
         this.e = strArr3;
         this.f = str;
@@ -95,7 +95,7 @@ public final class a {
     }
 
     public final String[] getData() {
-        return this.f2546c;
+        return this.f2552c;
     }
 
     public final String[] getIncompatibleData() {
@@ -119,7 +119,7 @@ public final class a {
     }
 
     public final List<String> getMultifilePartNames() {
-        String[] strArr = this.f2546c;
+        String[] strArr = this.f2552c;
         List<String> list = null;
         if (!(getKind() == EnumC0231a.MULTIFILE_CLASS)) {
             strArr = null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java b/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java
index 3b623afc8b..3e18933f8c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/b0/b.java
@@ -16,7 +16,7 @@ public class b implements p.c {
     public static final Map<d0.e0.p.d.m0.g.a, a.EnumC0231a> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int[] f2548c = null;
+    public int[] f2554c = null;
     public d0.e0.p.d.m0.f.a0.b.c d = null;
     public String e = null;
     public int f = 0;
@@ -132,7 +132,7 @@ public class b implements p.c {
                     }
                 } else if ("mv".equals(asString)) {
                     if (obj instanceof int[]) {
-                        b.this.f2548c = (int[]) obj;
+                        b.this.f2554c = (int[]) obj;
                     }
                 } else if ("bv".equals(asString)) {
                     if (obj instanceof int[]) {
@@ -258,7 +258,7 @@ public class b implements p.c {
                     if (obj instanceof int[]) {
                         b bVar = b.this;
                         int[] iArr = (int[]) obj;
-                        bVar.f2548c = iArr;
+                        bVar.f2554c = iArr;
                         if (bVar.d == null) {
                             bVar.d = new d0.e0.p.d.m0.f.a0.b.c(iArr);
                         }
@@ -351,11 +351,11 @@ public class b implements p.c {
     }
 
     public a createHeader() {
-        if (this.k == null || this.f2548c == null) {
+        if (this.k == null || this.f2554c == null) {
             return null;
         }
         boolean z2 = true;
-        d0.e0.p.d.m0.f.a0.b.f fVar = new d0.e0.p.d.m0.f.a0.b.f(this.f2548c, (this.f & 8) != 0);
+        d0.e0.p.d.m0.f.a0.b.f fVar = new d0.e0.p.d.m0.f.a0.b.f(this.f2554c, (this.f & 8) != 0);
         if (!fVar.isCompatible()) {
             this.j = this.h;
             this.h = null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/c.java b/app/src/main/java/d0/e0/p/d/m0/e/b/c.java
index f862d2c6d7..e3f55ced7e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/c.java
@@ -24,7 +24,7 @@ import java.util.List;
 public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
     /* renamed from: c  reason: collision with root package name */
-    public final c0 f2549c;
+    public final c0 f2555c;
     public final d0 d;
     public final e e;
 
@@ -34,7 +34,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
         public final /* synthetic */ d0.e0.p.d.m0.c.e b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ c f2550c;
+        public final /* synthetic */ c f2556c;
         public final /* synthetic */ List<d0.e0.p.d.m0.c.g1.c> d;
         public final /* synthetic */ u0 e;
 
@@ -45,13 +45,13 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
             public final /* synthetic */ p.a b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ a f2551c;
+            public final /* synthetic */ a f2557c;
             public final /* synthetic */ d0.e0.p.d.m0.g.e d;
             public final /* synthetic */ ArrayList<d0.e0.p.d.m0.c.g1.c> e;
 
             public C0234a(p.a aVar, a aVar2, d0.e0.p.d.m0.g.e eVar, ArrayList<d0.e0.p.d.m0.c.g1.c> arrayList) {
                 this.b = aVar;
-                this.f2551c = aVar2;
+                this.f2557c = aVar2;
                 this.d = eVar;
                 this.e = arrayList;
                 this.a = aVar;
@@ -85,7 +85,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
             @Override // d0.e0.p.d.m0.e.b.p.a
             public void visitEnd() {
                 this.b.visitEnd();
-                a.access$getArguments$p(this.f2551c).put(this.d, new d0.e0.p.d.m0.k.v.a((d0.e0.p.d.m0.c.g1.c) u.single((List<? extends Object>) this.e)));
+                a.access$getArguments$p(this.f2557c).put(this.d, new d0.e0.p.d.m0.k.v.a((d0.e0.p.d.m0.c.g1.c) u.single((List<? extends Object>) this.e)));
             }
 
             @Override // d0.e0.p.d.m0.e.b.p.a
@@ -103,18 +103,18 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
             public final /* synthetic */ a b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ d0.e0.p.d.m0.g.e f2552c;
+            public final /* synthetic */ d0.e0.p.d.m0.g.e f2558c;
             public final /* synthetic */ d0.e0.p.d.m0.c.e d;
 
             public b(a aVar, d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.c.e eVar2) {
                 this.b = aVar;
-                this.f2552c = eVar;
+                this.f2558c = eVar;
                 this.d = eVar2;
             }
 
             @Override // d0.e0.p.d.m0.e.b.p.b
             public void visit(Object obj) {
-                this.a.add(a.access$createConstant(this.b, this.f2552c, obj));
+                this.a.add(a.access$createConstant(this.b, this.f2558c, obj));
             }
 
             @Override // d0.e0.p.d.m0.e.b.p.b
@@ -125,10 +125,10 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
             @Override // d0.e0.p.d.m0.e.b.p.b
             public void visitEnd() {
-                c1 annotationParameterByName = d0.e0.p.d.m0.e.a.g0.a.getAnnotationParameterByName(this.f2552c, this.d);
+                c1 annotationParameterByName = d0.e0.p.d.m0.e.a.g0.a.getAnnotationParameterByName(this.f2558c, this.d);
                 if (annotationParameterByName != null) {
                     HashMap access$getArguments$p = a.access$getArguments$p(this.b);
-                    d0.e0.p.d.m0.g.e eVar = this.f2552c;
+                    d0.e0.p.d.m0.g.e eVar = this.f2558c;
                     h hVar = h.a;
                     List<? extends g<?>> compact = d0.e0.p.d.m0.p.a.compact(this.a);
                     d0.e0.p.d.m0.n.c0 type = annotationParameterByName.getType();
@@ -147,7 +147,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
 
         public a(d0.e0.p.d.m0.c.e eVar, c cVar, List<d0.e0.p.d.m0.c.g1.c> list, u0 u0Var) {
             this.b = eVar;
-            this.f2550c = cVar;
+            this.f2556c = cVar;
             this.d = list;
             this.e = u0Var;
         }
@@ -177,7 +177,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
             m.checkNotNullParameter(eVar, "name");
             m.checkNotNullParameter(aVar, "classId");
             ArrayList arrayList = new ArrayList();
-            c cVar = this.f2550c;
+            c cVar = this.f2556c;
             u0 u0Var = u0.a;
             m.checkNotNullExpressionValue(u0Var, "NO_SOURCE");
             p.a h = cVar.h(aVar, u0Var, arrayList);
@@ -219,7 +219,7 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
         m.checkNotNullParameter(d0Var, "notFoundClasses");
         m.checkNotNullParameter(oVar, "storageManager");
         m.checkNotNullParameter(nVar, "kotlinClassFinder");
-        this.f2549c = c0Var;
+        this.f2555c = c0Var;
         this.d = d0Var;
         this.e = new e(c0Var, d0Var);
     }
@@ -229,6 +229,6 @@ public final class c extends a<d0.e0.p.d.m0.c.g1.c, g<?>> {
         m.checkNotNullParameter(aVar, "annotationClassId");
         m.checkNotNullParameter(u0Var, "source");
         m.checkNotNullParameter(list, "result");
-        return new a(w.findNonGenericClassAcrossDependencies(this.f2549c, aVar, this.d), this, list, u0Var);
+        return new a(w.findNonGenericClassAcrossDependencies(this.f2555c, aVar, this.d), this, list, u0Var);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/f.java b/app/src/main/java/d0/e0/p/d/m0/e/b/f.java
index 5246a4bbc4..ac81907e3b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/f.java
@@ -27,7 +27,7 @@ public final class f {
     public static final Set<a.EnumC0231a> b = m0.setOf(a.EnumC0231a.CLASS);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Set<a.EnumC0231a> f2553c = n0.setOf((Object[]) new a.EnumC0231a[]{a.EnumC0231a.FILE_FACADE, a.EnumC0231a.MULTIFILE_CLASS_PART});
+    public static final Set<a.EnumC0231a> f2559c = n0.setOf((Object[]) new a.EnumC0231a[]{a.EnumC0231a.FILE_FACADE, a.EnumC0231a.MULTIFILE_CLASS_PART});
     public static final d0.e0.p.d.m0.f.a0.b.f d = new d0.e0.p.d.m0.f.a0.b.f(1, 1, 2);
     public static final d0.e0.p.d.m0.f.a0.b.f e = new d0.e0.p.d.m0.f.a0.b.f(1, 1, 11);
     public static final d0.e0.p.d.m0.f.a0.b.f f = new d0.e0.p.d.m0.f.a0.b.f(1, 1, 13);
@@ -101,7 +101,7 @@ public final class f {
         Pair<g, l> pair;
         m.checkNotNullParameter(e0Var, "descriptor");
         m.checkNotNullParameter(pVar, "kotlinClass");
-        String[] d2 = d(pVar, f2553c);
+        String[] d2 = d(pVar, f2559c);
         if (d2 == null || (strings = pVar.getClassHeader().getStrings()) == null) {
             return null;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/j.java b/app/src/main/java/d0/e0/p/d/m0/e/b/j.java
index 07e4eeccfd..0d2aa21d88 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/j.java
@@ -15,7 +15,7 @@ public final class j implements f {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f2554c;
+    public final c f2560c;
     public final p d;
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -42,7 +42,7 @@ public final class j implements f {
         m.checkNotNullParameter(cVar3, "nameResolver");
         m.checkNotNullParameter(eVar, "abiStability");
         this.b = cVar;
-        this.f2554c = cVar2;
+        this.f2560c = cVar2;
         this.d = pVar;
         g.f<l, Integer> fVar = a.m;
         m.checkNotNullExpressionValue(fVar, "packageModuleName");
@@ -64,7 +64,7 @@ public final class j implements f {
     }
 
     public final c getFacadeClassName() {
-        return this.f2554c;
+        return this.f2560c;
     }
 
     public final p getKnownJvmBinaryClass() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/k.java b/app/src/main/java/d0/e0/p/d/m0/e/b/k.java
index 00a1bdcf69..dc18b49c81 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/k.java
@@ -8,7 +8,7 @@ public abstract class k {
     public static final d b = new d(d0.e0.p.d.m0.k.y.d.BOOLEAN);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d f2555c = new d(d0.e0.p.d.m0.k.y.d.CHAR);
+    public static final d f2561c = new d(d0.e0.p.d.m0.k.y.d.CHAR);
     public static final d d = new d(d0.e0.p.d.m0.k.y.d.BYTE);
     public static final d e = new d(d0.e0.p.d.m0.k.y.d.SHORT);
     public static final d f = new d(d0.e0.p.d.m0.k.y.d.INT);
@@ -115,7 +115,7 @@ public abstract class k {
     }
 
     public static final /* synthetic */ d access$getCHAR$cp() {
-        return f2555c;
+        return f2561c;
     }
 
     public static final /* synthetic */ d access$getDOUBLE$cp() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/u.java b/app/src/main/java/d0/e0/p/d/m0/e/b/u.java
index 9339fe0e1c..1cb1fc7299 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/u.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/u.java
@@ -145,6 +145,6 @@ public final class u {
 
     public static final k mapToJvmType(c0 c0Var) {
         m.checkNotNullParameter(c0Var, "<this>");
-        return (k) d.mapType$default(c0Var, m.a, z.f2556c, y.a, null, null, 32, null);
+        return (k) d.mapType$default(c0Var, m.a, z.f2562c, y.a, null, null, 32, null);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/e/b/z.java b/app/src/main/java/d0/e0/p/d/m0/e/b/z.java
index b55d986430..4dc30e8d1d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/e/b/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/e/b/z.java
@@ -9,7 +9,7 @@ public final class z {
     public static final z b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final z f2556c;
+    public static final z f2562c;
     public final boolean d;
     public final boolean e;
     public final boolean f;
@@ -34,7 +34,7 @@ public final class z {
         z zVar2 = new z(false, false, false, false, false, null, false, null, null, true, 511, null);
         b = zVar2;
         new z(false, true, false, false, false, null, false, null, null, false, 1021, null);
-        f2556c = new z(false, false, false, false, false, zVar, false, null, null, false, 988, null);
+        f2562c = new z(false, false, false, false, false, zVar, false, null, null, false, 988, null);
         new z(false, false, false, false, false, zVar2, false, null, null, true, 476, null);
         new z(false, true, false, false, false, zVar, false, null, null, false, 988, null);
         new z(false, false, false, true, false, zVar, false, null, null, false, 983, null);
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/a0/a.java b/app/src/main/java/d0/e0/p/d/m0/f/a0/a.java
index 5d1b9008a4..33569fcb10 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/a0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/a0/a.java
@@ -26,7 +26,7 @@ public final class a {
     public static final g.f<i, c> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final g.f<i, Integer> f2557c;
+    public static final g.f<i, Integer> f2563c;
     public static final g.f<n, d> d;
     public static final g.f<n, Integer> e;
     public static final g.f<q, List<d0.e0.p.d.m0.f.b>> f;
@@ -1894,7 +1894,7 @@ public final class a {
         b = g.newSingularGeneratedExtension(i.getDefaultInstance(), c.getDefaultInstance(), c.getDefaultInstance(), null, 100, bVar, c.class);
         i defaultInstance4 = i.getDefaultInstance();
         w.b bVar2 = w.b.INT32;
-        f2557c = g.newSingularGeneratedExtension(defaultInstance4, 0, null, null, 101, bVar2, Integer.class);
+        f2563c = g.newSingularGeneratedExtension(defaultInstance4, 0, null, null, 101, bVar2, Integer.class);
         d = g.newSingularGeneratedExtension(n.getDefaultInstance(), d.getDefaultInstance(), d.getDefaultInstance(), null, 100, bVar, d.class);
         e = g.newSingularGeneratedExtension(n.getDefaultInstance(), 0, null, null, 101, bVar2, Integer.class);
         f = g.newRepeatedGeneratedExtension(q.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 100, bVar, false, d0.e0.p.d.m0.f.b.class);
@@ -1910,7 +1910,7 @@ public final class a {
     public static void registerAllExtensions(d0.e0.p.d.m0.i.e eVar) {
         eVar.add(a);
         eVar.add(b);
-        eVar.add(f2557c);
+        eVar.add(f2563c);
         eVar.add(d);
         eVar.add(e);
         eVar.add(f);
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java
index af383d805b..3c2eb75643 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/b.java
@@ -15,7 +15,7 @@ public final class b {
     public static final String b = u.joinToString$default(n.listOf((Object[]) new Character[]{'k', 'o', 't', 'l', 'i', 'n'}), "", null, null, 0, null, null, 62, null);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Map<String, String> f2558c;
+    public static final Map<String, String> f2564c;
 
     static {
         int i = 0;
@@ -76,7 +76,7 @@ public final class b {
         for (String str5 : n.listOf((Object[]) new String[]{"Char", "Byte", "Short", "Int", "Float", "Long", "Double", "String", "Enum"})) {
             a(linkedHashMap, m.stringPlus(str5, ".Companion"), b + "/jvm/internal/" + str5 + "CompanionObject");
         }
-        f2558c = linkedHashMap;
+        f2564c = linkedHashMap;
     }
 
     public static final void a(Map<String, String> map, String str, String str2) {
@@ -85,7 +85,7 @@ public final class b {
 
     public static final String mapClass(String str) {
         m.checkNotNullParameter(str, "classId");
-        String str2 = f2558c.get(str);
+        String str2 = f2564c.get(str);
         if (str2 != null) {
             return str2;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/d.java b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/d.java
index 351edd314c..e0a2c2bfb5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/d.java
@@ -7,11 +7,11 @@ public final class d {
     public static final b.C0253b b = b.d.booleanFirst();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b.C0253b f2559c;
+    public static final b.C0253b f2565c;
 
     static {
         b.C0253b booleanFirst = b.d.booleanFirst();
-        f2559c = booleanFirst;
+        f2565c = booleanFirst;
         b.d.booleanAfter(booleanFirst);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/g.java b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/g.java
index 62502cb004..1bd383e3c4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/a0/b/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/a0/b/g.java
@@ -22,7 +22,7 @@ public final class g implements c {
     public static final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final List<String> f2560c;
+    public static final List<String> f2566c;
     public final a.e d;
     public final String[] e;
     public final Set<Integer> f;
@@ -43,7 +43,7 @@ public final class g implements c {
         a = aVar;
         String joinToString$default = u.joinToString$default(n.listOf((Object[]) new Character[]{'k', 'o', 't', 'l', 'i', 'n'}), "", null, null, 0, null, null, 62, null);
         b = joinToString$default;
-        f2560c = n.listOf((Object[]) new String[]{m.stringPlus(joinToString$default, "/Any"), m.stringPlus(joinToString$default, "/Nothing"), m.stringPlus(joinToString$default, "/Unit"), m.stringPlus(joinToString$default, "/Throwable"), m.stringPlus(joinToString$default, "/Number"), m.stringPlus(joinToString$default, "/Byte"), m.stringPlus(joinToString$default, "/Double"), m.stringPlus(joinToString$default, "/Float"), m.stringPlus(joinToString$default, "/Int"), m.stringPlus(joinToString$default, "/Long"), m.stringPlus(joinToString$default, "/Short"), m.stringPlus(joinToString$default, "/Boolean"), m.stringPlus(joinToString$default, "/Char"), m.stringPlus(joinToString$default, "/CharSequence"), m.stringPlus(joinToString$default, "/String"), m.stringPlus(joinToString$default, "/Comparable"), m.stringPlus(joinToString$default, "/Enum"), m.stringPlus(joinToString$default, "/Array"), m.stringPlus(joinToString$default, "/ByteArray"), m.stringPlus(joinToString$default, "/DoubleArray"), m.stringPlus(joinToString$default, "/FloatArray"), m.stringPlus(joinToString$default, "/IntArray"), m.stringPlus(joinToString$default, "/LongArray"), m.stringPlus(joinToString$default, "/ShortArray"), m.stringPlus(joinToString$default, "/BooleanArray"), m.stringPlus(joinToString$default, "/CharArray"), m.stringPlus(joinToString$default, "/Cloneable"), m.stringPlus(joinToString$default, "/Annotation"), m.stringPlus(joinToString$default, "/collections/Iterable"), m.stringPlus(joinToString$default, "/collections/MutableIterable"), m.stringPlus(joinToString$default, "/collections/Collection"), m.stringPlus(joinToString$default, "/collections/MutableCollection"), m.stringPlus(joinToString$default, "/collections/List"), m.stringPlus(joinToString$default, "/collections/MutableList"), m.stringPlus(joinToString$default, "/collections/Set"), m.stringPlus(joinToString$default, "/collections/MutableSet"), m.stringPlus(joinToString$default, "/collections/Map"), m.stringPlus(joinToString$default, "/collections/MutableMap"), m.stringPlus(joinToString$default, "/collections/Map.Entry"), m.stringPlus(joinToString$default, "/collections/MutableMap.MutableEntry"), m.stringPlus(joinToString$default, "/collections/Iterator"), m.stringPlus(joinToString$default, "/collections/MutableIterator"), m.stringPlus(joinToString$default, "/collections/ListIterator"), m.stringPlus(joinToString$default, "/collections/MutableListIterator")});
+        f2566c = n.listOf((Object[]) new String[]{m.stringPlus(joinToString$default, "/Any"), m.stringPlus(joinToString$default, "/Nothing"), m.stringPlus(joinToString$default, "/Unit"), m.stringPlus(joinToString$default, "/Throwable"), m.stringPlus(joinToString$default, "/Number"), m.stringPlus(joinToString$default, "/Byte"), m.stringPlus(joinToString$default, "/Double"), m.stringPlus(joinToString$default, "/Float"), m.stringPlus(joinToString$default, "/Int"), m.stringPlus(joinToString$default, "/Long"), m.stringPlus(joinToString$default, "/Short"), m.stringPlus(joinToString$default, "/Boolean"), m.stringPlus(joinToString$default, "/Char"), m.stringPlus(joinToString$default, "/CharSequence"), m.stringPlus(joinToString$default, "/String"), m.stringPlus(joinToString$default, "/Comparable"), m.stringPlus(joinToString$default, "/Enum"), m.stringPlus(joinToString$default, "/Array"), m.stringPlus(joinToString$default, "/ByteArray"), m.stringPlus(joinToString$default, "/DoubleArray"), m.stringPlus(joinToString$default, "/FloatArray"), m.stringPlus(joinToString$default, "/IntArray"), m.stringPlus(joinToString$default, "/LongArray"), m.stringPlus(joinToString$default, "/ShortArray"), m.stringPlus(joinToString$default, "/BooleanArray"), m.stringPlus(joinToString$default, "/CharArray"), m.stringPlus(joinToString$default, "/Cloneable"), m.stringPlus(joinToString$default, "/Annotation"), m.stringPlus(joinToString$default, "/collections/Iterable"), m.stringPlus(joinToString$default, "/collections/MutableIterable"), m.stringPlus(joinToString$default, "/collections/Collection"), m.stringPlus(joinToString$default, "/collections/MutableCollection"), m.stringPlus(joinToString$default, "/collections/List"), m.stringPlus(joinToString$default, "/collections/MutableList"), m.stringPlus(joinToString$default, "/collections/Set"), m.stringPlus(joinToString$default, "/collections/MutableSet"), m.stringPlus(joinToString$default, "/collections/Map"), m.stringPlus(joinToString$default, "/collections/MutableMap"), m.stringPlus(joinToString$default, "/collections/Map.Entry"), m.stringPlus(joinToString$default, "/collections/MutableMap.MutableEntry"), m.stringPlus(joinToString$default, "/collections/Iterator"), m.stringPlus(joinToString$default, "/collections/MutableIterator"), m.stringPlus(joinToString$default, "/collections/ListIterator"), m.stringPlus(joinToString$default, "/collections/MutableListIterator")});
         Iterable<z> withIndex = u.withIndex(aVar.getPREDEFINED_STRINGS());
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(withIndex, 10)), 16));
         for (z zVar : withIndex) {
@@ -79,7 +79,7 @@ public final class g implements c {
     }
 
     public static final /* synthetic */ List access$getPREDEFINED_STRINGS$cp() {
-        return f2560c;
+        return f2566c;
     }
 
     @Override // d0.e0.p.d.m0.f.z.c
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/b.java b/app/src/main/java/d0/e0/p/d/m0/f/b.java
index 0808a9ac6e..230f180d7f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/b.java
@@ -191,7 +191,7 @@ public final class b extends g implements o {
                 public b r = b.getDefaultInstance();
 
                 /* renamed from: s  reason: collision with root package name */
-                public List<c> f2561s = Collections.emptyList();
+                public List<c> f2567s = Collections.emptyList();
                 public int t;
                 public int u;
 
@@ -241,10 +241,10 @@ public final class b extends g implements o {
                     }
                     c.h(cVar, this.r);
                     if ((this.j & 256) == 256) {
-                        this.f2561s = Collections.unmodifiableList(this.f2561s);
+                        this.f2567s = Collections.unmodifiableList(this.f2567s);
                         this.j &= -257;
                     }
-                    c.j(cVar, this.f2561s);
+                    c.j(cVar, this.f2567s);
                     if ((i & 512) == 512) {
                         i2 |= 256;
                     }
@@ -301,15 +301,15 @@ public final class b extends g implements o {
                         mergeAnnotation(cVar.getAnnotation());
                     }
                     if (!c.i(cVar).isEmpty()) {
-                        if (this.f2561s.isEmpty()) {
-                            this.f2561s = c.i(cVar);
+                        if (this.f2567s.isEmpty()) {
+                            this.f2567s = c.i(cVar);
                             this.j &= -257;
                         } else {
                             if ((this.j & 256) != 256) {
-                                this.f2561s = new ArrayList(this.f2561s);
+                                this.f2567s = new ArrayList(this.f2567s);
                                 this.j |= 256;
                             }
-                            this.f2561s.addAll(c.i(cVar));
+                            this.f2567s.addAll(c.i(cVar));
                         }
                     }
                     if (cVar.hasArrayDimensionCount()) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/c.java b/app/src/main/java/d0/e0/p/d/m0/f/c.java
index 82998637e5..36982d7d29 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/c.java
@@ -66,20 +66,20 @@ public final class c extends g.d<c> implements o {
         public List<Integer> r = Collections.emptyList();
 
         /* renamed from: s  reason: collision with root package name */
-        public List<Integer> f2563s = Collections.emptyList();
+        public List<Integer> f2569s = Collections.emptyList();
         public List<d> t = Collections.emptyList();
         public List<i> u = Collections.emptyList();
         public List<n> v = Collections.emptyList();
         public List<r> w = Collections.emptyList();
 
         /* renamed from: x  reason: collision with root package name */
-        public List<g> f2564x = Collections.emptyList();
+        public List<g> f2570x = Collections.emptyList();
 
         /* renamed from: y  reason: collision with root package name */
-        public List<Integer> f2565y = Collections.emptyList();
+        public List<Integer> f2571y = Collections.emptyList();
 
         /* renamed from: z  reason: collision with root package name */
-        public t f2566z = t.getDefaultInstance();
+        public t f2572z = t.getDefaultInstance();
 
         @Override // d0.e0.p.d.m0.i.n.a
         public c build() {
@@ -122,10 +122,10 @@ public final class c extends g.d<c> implements o {
             }
             c.z(cVar, this.r);
             if ((this.l & 64) == 64) {
-                this.f2563s = Collections.unmodifiableList(this.f2563s);
+                this.f2569s = Collections.unmodifiableList(this.f2569s);
                 this.l &= -65;
             }
-            c.B(cVar, this.f2563s);
+            c.B(cVar, this.f2569s);
             if ((this.l & 128) == 128) {
                 this.t = Collections.unmodifiableList(this.t);
                 this.l &= -129;
@@ -147,19 +147,19 @@ public final class c extends g.d<c> implements o {
             }
             c.J(cVar, this.w);
             if ((this.l & 2048) == 2048) {
-                this.f2564x = Collections.unmodifiableList(this.f2564x);
+                this.f2570x = Collections.unmodifiableList(this.f2570x);
                 this.l &= -2049;
             }
-            c.i(cVar, this.f2564x);
+            c.i(cVar, this.f2570x);
             if ((this.l & 4096) == 4096) {
-                this.f2565y = Collections.unmodifiableList(this.f2565y);
+                this.f2571y = Collections.unmodifiableList(this.f2571y);
                 this.l &= -4097;
             }
-            c.k(cVar, this.f2565y);
+            c.k(cVar, this.f2571y);
             if ((i & 8192) == 8192) {
                 i2 |= 8;
             }
-            c.l(cVar, this.f2566z);
+            c.l(cVar, this.f2572z);
             if ((this.l & 16384) == 16384) {
                 this.A = Collections.unmodifiableList(this.A);
                 this.l &= -16385;
@@ -228,15 +228,15 @@ public final class c extends g.d<c> implements o {
                 }
             }
             if (!c.A(cVar).isEmpty()) {
-                if (this.f2563s.isEmpty()) {
-                    this.f2563s = c.A(cVar);
+                if (this.f2569s.isEmpty()) {
+                    this.f2569s = c.A(cVar);
                     this.l &= -65;
                 } else {
                     if ((this.l & 64) != 64) {
-                        this.f2563s = new ArrayList(this.f2563s);
+                        this.f2569s = new ArrayList(this.f2569s);
                         this.l |= 64;
                     }
-                    this.f2563s.addAll(c.A(cVar));
+                    this.f2569s.addAll(c.A(cVar));
                 }
             }
             if (!c.C(cVar).isEmpty()) {
@@ -288,27 +288,27 @@ public final class c extends g.d<c> implements o {
                 }
             }
             if (!c.h(cVar).isEmpty()) {
-                if (this.f2564x.isEmpty()) {
-                    this.f2564x = c.h(cVar);
+                if (this.f2570x.isEmpty()) {
+                    this.f2570x = c.h(cVar);
                     this.l &= -2049;
                 } else {
                     if ((this.l & 2048) != 2048) {
-                        this.f2564x = new ArrayList(this.f2564x);
+                        this.f2570x = new ArrayList(this.f2570x);
                         this.l |= 2048;
                     }
-                    this.f2564x.addAll(c.h(cVar));
+                    this.f2570x.addAll(c.h(cVar));
                 }
             }
             if (!c.j(cVar).isEmpty()) {
-                if (this.f2565y.isEmpty()) {
-                    this.f2565y = c.j(cVar);
+                if (this.f2571y.isEmpty()) {
+                    this.f2571y = c.j(cVar);
                     this.l &= -4097;
                 } else {
                     if ((this.l & 4096) != 4096) {
-                        this.f2565y = new ArrayList(this.f2565y);
+                        this.f2571y = new ArrayList(this.f2571y);
                         this.l |= 4096;
                     }
-                    this.f2565y.addAll(c.j(cVar));
+                    this.f2571y.addAll(c.j(cVar));
                 }
             }
             if (cVar.hasTypeTable()) {
@@ -359,10 +359,10 @@ public final class c extends g.d<c> implements o {
         }
 
         public b mergeTypeTable(t tVar) {
-            if ((this.l & 8192) != 8192 || this.f2566z == t.getDefaultInstance()) {
-                this.f2566z = tVar;
+            if ((this.l & 8192) != 8192 || this.f2572z == t.getDefaultInstance()) {
+                this.f2572z = tVar;
             } else {
-                this.f2566z = t.newBuilder(this.f2566z).mergeFrom(tVar).buildPartial();
+                this.f2572z = t.newBuilder(this.f2572z).mergeFrom(tVar).buildPartial();
             }
             this.l |= 8192;
             return this;
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/i.java b/app/src/main/java/d0/e0/p/d/m0/f/i.java
index 4c628daaf1..cea1dfaf79 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/i.java
@@ -57,14 +57,14 @@ public final class i extends g.d<i> implements o {
         public List<s> r = Collections.emptyList();
 
         /* renamed from: s  reason: collision with root package name */
-        public q f2567s = q.getDefaultInstance();
+        public q f2573s = q.getDefaultInstance();
         public int t;
         public List<u> u = Collections.emptyList();
         public t v = t.getDefaultInstance();
         public List<Integer> w = Collections.emptyList();
 
         /* renamed from: x  reason: collision with root package name */
-        public e f2568x = e.getDefaultInstance();
+        public e f2574x = e.getDefaultInstance();
 
         @Override // d0.e0.p.d.m0.i.n.a
         public i build() {
@@ -107,7 +107,7 @@ public final class i extends g.d<i> implements o {
             if ((i & 64) == 64) {
                 i2 |= 32;
             }
-            i.o(iVar, this.f2567s);
+            i.o(iVar, this.f2573s);
             if ((i & 128) == 128) {
                 i2 |= 64;
             }
@@ -129,7 +129,7 @@ public final class i extends g.d<i> implements o {
             if ((i & 2048) == 2048) {
                 i2 |= 256;
             }
-            i.v(iVar, this.f2568x);
+            i.v(iVar, this.f2574x);
             i.w(iVar, i2);
             return iVar;
         }
@@ -140,10 +140,10 @@ public final class i extends g.d<i> implements o {
         }
 
         public b mergeContract(e eVar) {
-            if ((this.l & 2048) != 2048 || this.f2568x == e.getDefaultInstance()) {
-                this.f2568x = eVar;
+            if ((this.l & 2048) != 2048 || this.f2574x == e.getDefaultInstance()) {
+                this.f2574x = eVar;
             } else {
-                this.f2568x = e.newBuilder(this.f2568x).mergeFrom(eVar).buildPartial();
+                this.f2574x = e.newBuilder(this.f2574x).mergeFrom(eVar).buildPartial();
             }
             this.l |= 2048;
             return this;
@@ -246,10 +246,10 @@ public final class i extends g.d<i> implements o {
         }
 
         public b mergeReceiverType(q qVar) {
-            if ((this.l & 64) != 64 || this.f2567s == q.getDefaultInstance()) {
-                this.f2567s = qVar;
+            if ((this.l & 64) != 64 || this.f2573s == q.getDefaultInstance()) {
+                this.f2573s = qVar;
             } else {
-                this.f2567s = q.newBuilder(this.f2567s).mergeFrom(qVar).buildPartial();
+                this.f2573s = q.newBuilder(this.f2573s).mergeFrom(qVar).buildPartial();
             }
             this.l |= 64;
             return this;
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/n.java b/app/src/main/java/d0/e0/p/d/m0/f/n.java
index f153ee58c2..cf925cfba4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/n.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/n.java
@@ -55,14 +55,14 @@ public final class n extends g.d<n> implements o {
         public List<s> r = Collections.emptyList();
 
         /* renamed from: s  reason: collision with root package name */
-        public q f2569s = q.getDefaultInstance();
+        public q f2575s = q.getDefaultInstance();
         public int t;
         public u u = u.getDefaultInstance();
         public int v;
         public int w;
 
         /* renamed from: x  reason: collision with root package name */
-        public List<Integer> f2570x = Collections.emptyList();
+        public List<Integer> f2576x = Collections.emptyList();
 
         @Override // d0.e0.p.d.m0.i.n.a
         public n build() {
@@ -105,7 +105,7 @@ public final class n extends g.d<n> implements o {
             if ((i & 64) == 64) {
                 i2 |= 32;
             }
-            n.o(nVar, this.f2569s);
+            n.o(nVar, this.f2575s);
             if ((i & 128) == 128) {
                 i2 |= 64;
             }
@@ -123,10 +123,10 @@ public final class n extends g.d<n> implements o {
             }
             n.s(nVar, this.w);
             if ((this.l & 2048) == 2048) {
-                this.f2570x = Collections.unmodifiableList(this.f2570x);
+                this.f2576x = Collections.unmodifiableList(this.f2576x);
                 this.l &= -2049;
             }
-            n.u(nVar, this.f2570x);
+            n.u(nVar, this.f2576x);
             n.v(nVar, i2);
             return nVar;
         }
@@ -183,15 +183,15 @@ public final class n extends g.d<n> implements o {
                 setSetterFlags(nVar.getSetterFlags());
             }
             if (!n.t(nVar).isEmpty()) {
-                if (this.f2570x.isEmpty()) {
-                    this.f2570x = n.t(nVar);
+                if (this.f2576x.isEmpty()) {
+                    this.f2576x = n.t(nVar);
                     this.l &= -2049;
                 } else {
                     if ((this.l & 2048) != 2048) {
-                        this.f2570x = new ArrayList(this.f2570x);
+                        this.f2576x = new ArrayList(this.f2576x);
                         this.l |= 2048;
                     }
-                    this.f2570x.addAll(n.t(nVar));
+                    this.f2576x.addAll(n.t(nVar));
                 }
             }
             b(nVar);
@@ -224,10 +224,10 @@ public final class n extends g.d<n> implements o {
         }
 
         public b mergeReceiverType(q qVar) {
-            if ((this.l & 64) != 64 || this.f2569s == q.getDefaultInstance()) {
-                this.f2569s = qVar;
+            if ((this.l & 64) != 64 || this.f2575s == q.getDefaultInstance()) {
+                this.f2575s = qVar;
             } else {
-                this.f2569s = q.newBuilder(this.f2569s).mergeFrom(qVar).buildPartial();
+                this.f2575s = q.newBuilder(this.f2575s).mergeFrom(qVar).buildPartial();
             }
             this.l |= 64;
             return this;
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/q.java b/app/src/main/java/d0/e0/p/d/m0/f/q.java
index 113508295c..9ef8b746b6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/q.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/q.java
@@ -429,20 +429,20 @@ public final class q extends g.d<q> implements o {
         public int r;
 
         /* renamed from: s  reason: collision with root package name */
-        public int f2571s;
+        public int f2577s;
         public int t;
         public int u;
         public q v = q.getDefaultInstance();
         public int w;
 
         /* renamed from: x  reason: collision with root package name */
-        public q f2572x = q.getDefaultInstance();
+        public q f2578x = q.getDefaultInstance();
 
         /* renamed from: y  reason: collision with root package name */
-        public int f2573y;
+        public int f2579y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f2574z;
+        public int f2580z;
 
         @Override // d0.e0.p.d.m0.i.n.a
         public q build() {
@@ -485,7 +485,7 @@ public final class q extends g.d<q> implements o {
             if ((i & 64) == 64) {
                 i2 |= 32;
             }
-            q.o(qVar, this.f2571s);
+            q.o(qVar, this.f2577s);
             if ((i & 128) == 128) {
                 i2 |= 64;
             }
@@ -505,15 +505,15 @@ public final class q extends g.d<q> implements o {
             if ((i & 2048) == 2048) {
                 i2 |= 1024;
             }
-            q.t(qVar, this.f2572x);
+            q.t(qVar, this.f2578x);
             if ((i & 4096) == 4096) {
                 i2 |= 2048;
             }
-            q.u(qVar, this.f2573y);
+            q.u(qVar, this.f2579y);
             if ((i & 8192) == 8192) {
                 i2 |= 4096;
             }
-            q.v(qVar, this.f2574z);
+            q.v(qVar, this.f2580z);
             q.w(qVar, i2);
             return qVar;
         }
@@ -524,10 +524,10 @@ public final class q extends g.d<q> implements o {
         }
 
         public c mergeAbbreviatedType(q qVar) {
-            if ((this.l & 2048) != 2048 || this.f2572x == q.getDefaultInstance()) {
-                this.f2572x = qVar;
+            if ((this.l & 2048) != 2048 || this.f2578x == q.getDefaultInstance()) {
+                this.f2578x = qVar;
             } else {
-                this.f2572x = q.newBuilder(this.f2572x).mergeFrom(qVar).buildPartial();
+                this.f2578x = q.newBuilder(this.f2578x).mergeFrom(qVar).buildPartial();
             }
             this.l |= 2048;
             return this;
@@ -639,7 +639,7 @@ public final class q extends g.d<q> implements o {
 
         public c setAbbreviatedTypeId(int i) {
             this.l |= 4096;
-            this.f2573y = i;
+            this.f2579y = i;
             return this;
         }
 
@@ -651,7 +651,7 @@ public final class q extends g.d<q> implements o {
 
         public c setFlags(int i) {
             this.l |= 8192;
-            this.f2574z = i;
+            this.f2580z = i;
             return this;
         }
 
@@ -687,7 +687,7 @@ public final class q extends g.d<q> implements o {
 
         public c setTypeParameter(int i) {
             this.l |= 64;
-            this.f2571s = i;
+            this.f2577s = i;
             return this;
         }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/r.java b/app/src/main/java/d0/e0/p/d/m0/f/r.java
index f78758d14d..c69b88ff01 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/r.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/r.java
@@ -52,7 +52,7 @@ public final class r extends g.d<r> implements o {
         public q r = q.getDefaultInstance();
 
         /* renamed from: s  reason: collision with root package name */
-        public int f2575s;
+        public int f2581s;
         public List<b> t = Collections.emptyList();
         public List<Integer> u = Collections.emptyList();
 
@@ -97,7 +97,7 @@ public final class r extends g.d<r> implements o {
             if ((i & 64) == 64) {
                 i2 |= 32;
             }
-            r.o(rVar, this.f2575s);
+            r.o(rVar, this.f2581s);
             if ((this.l & 128) == 128) {
                 this.t = Collections.unmodifiableList(this.t);
                 this.l &= -129;
@@ -226,7 +226,7 @@ public final class r extends g.d<r> implements o {
 
         public b setExpandedTypeId(int i) {
             this.l |= 64;
-            this.f2575s = i;
+            this.f2581s = i;
             return this;
         }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/y/b.java b/app/src/main/java/d0/e0/p/d/m0/f/y/b.java
index 725a36ee59..240a0e81d5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/y/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/y/b.java
@@ -19,7 +19,7 @@ public final class b {
     public static final g.f<c, List<d0.e0.p.d.m0.f.b>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final g.f<d, List<d0.e0.p.d.m0.f.b>> f2576c;
+    public static final g.f<d, List<d0.e0.p.d.m0.f.b>> f2582c;
     public static final g.f<i, List<d0.e0.p.d.m0.f.b>> d;
     public static final g.f<n, List<d0.e0.p.d.m0.f.b>> e;
     public static final g.f<n, List<d0.e0.p.d.m0.f.b>> f;
@@ -35,7 +35,7 @@ public final class b {
         d0.e0.p.d.m0.f.b defaultInstance2 = d0.e0.p.d.m0.f.b.getDefaultInstance();
         w.b bVar = w.b.MESSAGE;
         b = g.newRepeatedGeneratedExtension(defaultInstance, defaultInstance2, null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
-        f2576c = g.newRepeatedGeneratedExtension(d.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
+        f2582c = g.newRepeatedGeneratedExtension(d.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
         d = g.newRepeatedGeneratedExtension(i.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
         e = g.newRepeatedGeneratedExtension(n.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 150, bVar, false, d0.e0.p.d.m0.f.b.class);
         f = g.newRepeatedGeneratedExtension(n.getDefaultInstance(), d0.e0.p.d.m0.f.b.getDefaultInstance(), null, 152, bVar, false, d0.e0.p.d.m0.f.b.class);
@@ -50,7 +50,7 @@ public final class b {
     public static void registerAllExtensions(e eVar) {
         eVar.add(a);
         eVar.add(b);
-        eVar.add(f2576c);
+        eVar.add(f2582c);
         eVar.add(d);
         eVar.add(e);
         eVar.add(f);
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/a.java b/app/src/main/java/d0/e0/p/d/m0/f/z/a.java
index 1d6497f1eb..5bc2d614fd 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/a.java
@@ -14,7 +14,7 @@ public abstract class a {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2577c;
+    public final int f2583c;
     public final int d;
     public final List<Integer> e;
 
@@ -36,7 +36,7 @@ public abstract class a {
         int i = -1;
         this.b = orNull == null ? -1 : orNull.intValue();
         Integer orNull2 = k.getOrNull(iArr, 1);
-        this.f2577c = orNull2 == null ? -1 : orNull2.intValue();
+        this.f2583c = orNull2 == null ? -1 : orNull2.intValue();
         Integer orNull3 = k.getOrNull(iArr, 2);
         this.d = orNull3 != null ? orNull3.intValue() : i;
         this.e = iArr.length > 3 ? u.toList(j.asList(iArr).subList(3, iArr.length)) : n.emptyList();
@@ -46,10 +46,10 @@ public abstract class a {
         m.checkNotNullParameter(aVar, "ourVersion");
         int i = this.b;
         if (i == 0) {
-            if (aVar.b == 0 && this.f2577c == aVar.f2577c) {
+            if (aVar.b == 0 && this.f2583c == aVar.f2583c) {
                 return true;
             }
-        } else if (i == aVar.b && this.f2577c <= aVar.f2577c) {
+        } else if (i == aVar.b && this.f2583c <= aVar.f2583c) {
             return true;
         }
         return false;
@@ -58,7 +58,7 @@ public abstract class a {
     public boolean equals(Object obj) {
         if (obj != null && m.areEqual(getClass(), obj.getClass())) {
             a aVar = (a) obj;
-            if (this.b == aVar.b && this.f2577c == aVar.f2577c && this.d == aVar.d && m.areEqual(this.e, aVar.e)) {
+            if (this.b == aVar.b && this.f2583c == aVar.f2583c && this.d == aVar.d && m.areEqual(this.e, aVar.e)) {
                 return true;
             }
         }
@@ -70,12 +70,12 @@ public abstract class a {
     }
 
     public final int getMinor() {
-        return this.f2577c;
+        return this.f2583c;
     }
 
     public int hashCode() {
         int i = this.b;
-        int i2 = (i * 31) + this.f2577c + i;
+        int i2 = (i * 31) + this.f2583c + i;
         int i3 = (i2 * 31) + this.d + i2;
         return this.e.hashCode() + (i3 * 31) + i3;
     }
@@ -88,7 +88,7 @@ public abstract class a {
         if (i4 < i) {
             return false;
         }
-        int i5 = this.f2577c;
+        int i5 = this.f2583c;
         if (i5 > i2) {
             return true;
         }
@@ -97,7 +97,7 @@ public abstract class a {
 
     public final boolean isAtLeast(a aVar) {
         m.checkNotNullParameter(aVar, "version");
-        return isAtLeast(aVar.b, aVar.f2577c, aVar.d);
+        return isAtLeast(aVar.b, aVar.f2583c, aVar.d);
     }
 
     public final boolean isAtMost(int i, int i2, int i3) {
@@ -108,7 +108,7 @@ public abstract class a {
         if (i4 > i) {
             return false;
         }
-        int i5 = this.f2577c;
+        int i5 = this.f2583c;
         if (i5 < i2) {
             return true;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/b.java b/app/src/main/java/d0/e0/p/d/m0/f/z/b.java
index 150584462f..20eab519f2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/b.java
@@ -24,7 +24,7 @@ public class b {
     public static final C0253b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d<x> f2578c;
+    public static final d<x> f2584c;
     public static final d<k> d;
     public static final d<c.EnumC0248c> e;
     public static final C0253b f;
@@ -42,20 +42,20 @@ public class b {
     public static final C0253b r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final C0253b f2579s;
+    public static final C0253b f2585s;
     public static final C0253b t;
     public static final C0253b u;
     public static final C0253b v;
     public static final C0253b w;
 
     /* renamed from: x  reason: collision with root package name */
-    public static final C0253b f2580x;
+    public static final C0253b f2586x;
 
     /* renamed from: y  reason: collision with root package name */
-    public static final C0253b f2581y;
+    public static final C0253b f2587y;
 
     /* renamed from: z  reason: collision with root package name */
-    public static final C0253b f2582z;
+    public static final C0253b f2588z;
 
     /* compiled from: Flags */
     /* renamed from: d0.e0.p.d.m0.f.z.b$b  reason: collision with other inner class name */
@@ -85,7 +85,7 @@ public class b {
     public static class c<E extends h.a> extends d<E> {
 
         /* renamed from: c  reason: collision with root package name */
-        public final E[] f2583c;
+        public final E[] f2589c;
 
         /* JADX WARNING: Illegal instructions before constructor call */
         public c(int i, E[] eArr) {
@@ -103,7 +103,7 @@ public class b {
                     L.append(eArr.getClass());
                     throw new IllegalStateException(L.toString());
                 }
-                this.f2583c = eArr;
+                this.f2589c = eArr;
                 return;
             }
             throw new IllegalArgumentException(String.format("Argument for @NotNull parameter '%s' of %s.%s must not be null", "enumEntries", "kotlin/reflect/jvm/internal/impl/metadata/deserialization/Flags$EnumLiteFlagField", "bitWidth"));
@@ -113,7 +113,7 @@ public class b {
         public E get(int i) {
             int i2 = this.a;
             int i3 = (i & (((1 << this.b) - 1) << i2)) >> i2;
-            E[] eArr = this.f2583c;
+            E[] eArr = this.f2589c;
             for (E e : eArr) {
                 if (e.getNumber() == i3) {
                     return e;
@@ -165,7 +165,7 @@ public class b {
         C0253b booleanFirst = d.booleanFirst();
         b = booleanFirst;
         d<x> after = d.after(booleanFirst, x.values());
-        f2578c = after;
+        f2584c = after;
         d<k> after2 = d.after(after, k.values());
         d = after2;
         d<c.EnumC0248c> after3 = d.after(after2, c.EnumC0248c.values());
@@ -195,7 +195,7 @@ public class b {
         C0253b booleanAfter10 = d.booleanAfter(booleanAfter9);
         r = booleanAfter10;
         C0253b booleanAfter11 = d.booleanAfter(booleanAfter10);
-        f2579s = booleanAfter11;
+        f2585s = booleanAfter11;
         C0253b booleanAfter12 = d.booleanAfter(booleanAfter11);
         t = booleanAfter12;
         C0253b booleanAfter13 = d.booleanAfter(booleanAfter12);
@@ -204,11 +204,11 @@ public class b {
         C0253b booleanAfter14 = d.booleanAfter(after4);
         w = booleanAfter14;
         C0253b booleanAfter15 = d.booleanAfter(booleanAfter14);
-        f2580x = booleanAfter15;
+        f2586x = booleanAfter15;
         C0253b booleanAfter16 = d.booleanAfter(booleanAfter15);
-        f2581y = booleanAfter16;
+        f2587y = booleanAfter16;
         C0253b booleanAfter17 = d.booleanAfter(booleanAfter16);
-        f2582z = booleanAfter17;
+        f2588z = booleanAfter17;
         C0253b booleanAfter18 = d.booleanAfter(booleanAfter17);
         A = booleanAfter18;
         C0253b booleanAfter19 = d.booleanAfter(booleanAfter18);
@@ -292,7 +292,7 @@ public class b {
             a(10);
             throw null;
         } else if (kVar != null) {
-            return b.toFlags(Boolean.valueOf(z2)) | d.toFlags(kVar) | f2578c.toFlags(xVar) | I.toFlags(Boolean.valueOf(z3)) | J.toFlags(Boolean.valueOf(z4)) | K.toFlags(Boolean.valueOf(z5));
+            return b.toFlags(Boolean.valueOf(z2)) | d.toFlags(kVar) | f2584c.toFlags(xVar) | I.toFlags(Boolean.valueOf(z3)) | J.toFlags(Boolean.valueOf(z4)) | K.toFlags(Boolean.valueOf(z5));
         } else {
             a(11);
             throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/h.java b/app/src/main/java/d0/e0/p/d/m0/f/z/h.java
index 43ceb77986..5664407057 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/h.java
@@ -17,7 +17,7 @@ public final class h {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final v.d f2584c;
+    public final v.d f2590c;
     public final d0.a d;
     public final Integer e;
     public final String f;
@@ -94,7 +94,7 @@ public final class h {
         public static final b b = new b(256, 256, 256);
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2585c;
+        public final int f2591c;
         public final int d;
         public final int e;
 
@@ -109,7 +109,7 @@ public final class h {
         }
 
         public b(int i, int i2, int i3) {
-            this.f2585c = i;
+            this.f2591c = i;
             this.d = i2;
             this.e = i3;
         }
@@ -124,12 +124,12 @@ public final class h {
             StringBuilder sb;
             if (this.e == 0) {
                 sb = new StringBuilder();
-                sb.append(this.f2585c);
+                sb.append(this.f2591c);
                 sb.append('.');
                 i = this.d;
             } else {
                 sb = new StringBuilder();
-                sb.append(this.f2585c);
+                sb.append(this.f2591c);
                 sb.append('.');
                 sb.append(this.d);
                 sb.append('.');
@@ -147,11 +147,11 @@ public final class h {
                 return false;
             }
             b bVar = (b) obj;
-            return this.f2585c == bVar.f2585c && this.d == bVar.d && this.e == bVar.e;
+            return this.f2591c == bVar.f2591c && this.d == bVar.d && this.e == bVar.e;
         }
 
         public int hashCode() {
-            return (((this.f2585c * 31) + this.d) * 31) + this.e;
+            return (((this.f2591c * 31) + this.d) * 31) + this.e;
         }
 
         public String toString() {
@@ -164,14 +164,14 @@ public final class h {
         m.checkNotNullParameter(dVar, "kind");
         m.checkNotNullParameter(aVar, "level");
         this.b = bVar;
-        this.f2584c = dVar;
+        this.f2590c = dVar;
         this.d = aVar;
         this.e = num;
         this.f = str;
     }
 
     public final v.d getKind() {
-        return this.f2584c;
+        return this.f2590c;
     }
 
     public final b getVersion() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/f/z/i.java b/app/src/main/java/d0/e0/p/d/m0/f/z/i.java
index 85dec5e4d7..94e23460c8 100644
--- a/app/src/main/java/d0/e0/p/d/m0/f/z/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/f/z/i.java
@@ -13,7 +13,7 @@ public final class i {
     public static final i b = new i(n.emptyList());
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<v> f2586c;
+    public final List<v> f2592c;
 
     /* compiled from: VersionRequirement.kt */
     public static final class a {
@@ -36,11 +36,11 @@ public final class i {
     }
 
     public i(List<v> list) {
-        this.f2586c = list;
+        this.f2592c = list;
     }
 
     public i(List list, DefaultConstructorMarker defaultConstructorMarker) {
-        this.f2586c = list;
+        this.f2592c = list;
     }
 
     public static final /* synthetic */ i access$getEMPTY$cp() {
@@ -48,6 +48,6 @@ public final class i {
     }
 
     public final v get(int i) {
-        return (v) u.getOrNull(this.f2586c, i);
+        return (v) u.getOrNull(this.f2592c, i);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/a.java b/app/src/main/java/d0/e0/p/d/m0/g/a.java
index 0811e9400a..287be33b00 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/a.java
@@ -7,7 +7,7 @@ public final class a {
     public final b b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2587c;
+    public final boolean f2593c;
 
     public a(b bVar, b bVar2, boolean z2) {
         if (bVar == null) {
@@ -16,7 +16,7 @@ public final class a {
         } else if (bVar2 != null) {
             this.a = bVar;
             this.b = bVar2;
-            this.f2587c = z2;
+            this.f2593c = z2;
         } else {
             a(2);
             throw null;
@@ -175,7 +175,7 @@ public final class a {
 
     public a createNestedClassId(e eVar) {
         if (eVar != null) {
-            return new a(getPackageFqName(), this.b.child(eVar), this.f2587c);
+            return new a(getPackageFqName(), this.b.child(eVar), this.f2593c);
         }
         a(8);
         throw null;
@@ -189,7 +189,7 @@ public final class a {
             return false;
         }
         a aVar = (a) obj;
-        return this.a.equals(aVar.a) && this.b.equals(aVar.b) && this.f2587c == aVar.f2587c;
+        return this.a.equals(aVar.a) && this.b.equals(aVar.b) && this.f2593c == aVar.f2593c;
     }
 
     public a getOuterClassId() {
@@ -197,7 +197,7 @@ public final class a {
         if (parent.isRoot()) {
             return null;
         }
-        return new a(getPackageFqName(), parent, this.f2587c);
+        return new a(getPackageFqName(), parent, this.f2593c);
     }
 
     public b getPackageFqName() {
@@ -229,11 +229,11 @@ public final class a {
 
     public int hashCode() {
         int hashCode = this.b.hashCode();
-        return Boolean.valueOf(this.f2587c).hashCode() + ((hashCode + (this.a.hashCode() * 31)) * 31);
+        return Boolean.valueOf(this.f2593c).hashCode() + ((hashCode + (this.a.hashCode() * 31)) * 31);
     }
 
     public boolean isLocal() {
-        return this.f2587c;
+        return this.f2593c;
     }
 
     public boolean isNestedClass() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/b.java b/app/src/main/java/d0/e0/p/d/m0/g/b.java
index bfd59ecef6..6409c272a7 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/b.java
@@ -7,7 +7,7 @@ public final class b {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public transient b f2588c;
+    public transient b f2594c;
 
     public b(c cVar) {
         if (cVar != null) {
@@ -21,7 +21,7 @@ public final class b {
     public b(c cVar, b bVar) {
         if (cVar != null) {
             this.b = cVar;
-            this.f2588c = bVar;
+            this.f2594c = bVar;
             return;
         }
         a(3);
@@ -208,7 +208,7 @@ public final class b {
     }
 
     public b parent() {
-        b bVar = this.f2588c;
+        b bVar = this.f2594c;
         if (bVar != null) {
             if (bVar != null) {
                 return bVar;
@@ -217,7 +217,7 @@ public final class b {
             throw null;
         } else if (!isRoot()) {
             b bVar2 = new b(this.b.parent());
-            this.f2588c = bVar2;
+            this.f2594c = bVar2;
             if (bVar2 != null) {
                 return bVar2;
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/c.java b/app/src/main/java/d0/e0/p/d/m0/g/c.java
index 7df4157f38..69e792ddd1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/c.java
@@ -11,7 +11,7 @@ public final class c {
     public static final Pattern b = Pattern.compile("\\.");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Function1<String, e> f2589c = new a();
+    public static final Function1<String, e> f2595c = new a();
     public final String d;
     public transient b e;
     public transient c f;
@@ -295,7 +295,7 @@ public final class c {
     }
 
     public List<e> pathSegments() {
-        List<e> emptyList = isRoot() ? Collections.emptyList() : k.map(b.split(this.d), f2589c);
+        List<e> emptyList = isRoot() ? Collections.emptyList() : k.map(b.split(this.d), f2595c);
         if (emptyList != null) {
             return emptyList;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/g/g.java b/app/src/main/java/d0/e0/p/d/m0/g/g.java
index daa1aa3bb3..3c1b9b1ce9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/g/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/g/g.java
@@ -5,7 +5,7 @@ public class g {
     public static final e b = e.identifier("Companion");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f2590c = e.identifier("no_name_in_PSI_3d19d79d_1ba9_4cd0_b7f5_b46aa3cd5d40");
+    public static final e f2596c = e.identifier("no_name_in_PSI_3d19d79d_1ba9_4cd0_b7f5_b46aa3cd5d40");
 
     static {
         e.special("<root package>");
@@ -45,7 +45,7 @@ public class g {
 
     public static e safeIdentifier(e eVar) {
         if (eVar == null || eVar.isSpecial()) {
-            eVar = f2590c;
+            eVar = f2596c;
         }
         if (eVar != null) {
             return eVar;
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/d.java b/app/src/main/java/d0/e0/p/d/m0/i/d.java
index e532c0d823..2264f63aa0 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/d.java
@@ -13,7 +13,7 @@ public final class d {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2591c = 0;
+    public int f2597c = 0;
     public int d;
     public int e = 0;
     public final InputStream f;
@@ -81,9 +81,9 @@ public final class d {
                 throw InvalidProtocolBufferException.c();
             } else if (i < 4096) {
                 byte[] bArr = new byte[i];
-                int i6 = this.f2591c - i3;
+                int i6 = this.f2597c - i3;
                 System.arraycopy(this.a, i3, bArr, 0, i6);
-                int i7 = this.f2591c;
+                int i7 = this.f2597c;
                 this.e = i7;
                 int i8 = i - i6;
                 if (i7 - i7 >= i8 || e(i8)) {
@@ -93,10 +93,10 @@ public final class d {
                 }
                 throw InvalidProtocolBufferException.c();
             } else {
-                int i9 = this.f2591c;
+                int i9 = this.f2597c;
                 this.h = i2 + i9;
                 this.e = 0;
-                this.f2591c = 0;
+                this.f2597c = 0;
                 int i10 = i9 - i3;
                 int i11 = i - i10;
                 ArrayList arrayList = new ArrayList();
@@ -147,14 +147,14 @@ public final class d {
     }
 
     public final void c() {
-        int i = this.f2591c + this.d;
-        this.f2591c = i;
+        int i = this.f2597c + this.d;
+        this.f2597c = i;
         int i2 = this.h + i;
         int i3 = this.i;
         if (i2 > i3) {
             int i4 = i2 - i3;
             this.d = i4;
-            this.f2591c = i - i4;
+            this.f2597c = i - i4;
             return;
         }
         this.d = 0;
@@ -175,7 +175,7 @@ public final class d {
     public final boolean e(int i) throws IOException {
         int i2 = this.e;
         int i3 = i2 + i;
-        int i4 = this.f2591c;
+        int i4 = this.f2597c;
         if (i3 > i4) {
             if (this.h + i2 + i <= this.i && this.f != null) {
                 if (i2 > 0) {
@@ -184,12 +184,12 @@ public final class d {
                         System.arraycopy(bArr, i2, bArr, 0, i4 - i2);
                     }
                     this.h += i2;
-                    this.f2591c -= i2;
+                    this.f2597c -= i2;
                     this.e = 0;
                 }
                 InputStream inputStream = this.f;
                 byte[] bArr2 = this.a;
-                int i5 = this.f2591c;
+                int i5 = this.f2597c;
                 int read = inputStream.read(bArr2, i5, bArr2.length - i5);
                 if (read == 0 || read < -1 || read > this.a.length) {
                     StringBuilder sb = new StringBuilder(102);
@@ -198,10 +198,10 @@ public final class d {
                     sb.append("\nThe InputStream implementation is buggy.");
                     throw new IllegalStateException(sb.toString());
                 } else if (read > 0) {
-                    this.f2591c += read;
+                    this.f2597c += read;
                     if ((this.h + i) - 67108864 <= 0) {
                         c();
-                        if (this.f2591c >= i) {
+                        if (this.f2597c >= i) {
                             return true;
                         }
                         return e(i);
@@ -227,7 +227,7 @@ public final class d {
     }
 
     public boolean isAtEnd() throws IOException {
-        return this.e == this.f2591c && !e(1);
+        return this.e == this.f2597c && !e(1);
     }
 
     public void popLimit(int i) {
@@ -255,7 +255,7 @@ public final class d {
 
     public c readBytes() throws IOException {
         int readRawVarint32 = readRawVarint32();
-        int i = this.f2591c;
+        int i = this.f2597c;
         int i2 = this.e;
         if (readRawVarint32 > i - i2 || readRawVarint32 <= 0) {
             return readRawVarint32 == 0 ? c.i : new m(a(readRawVarint32));
@@ -335,7 +335,7 @@ public final class d {
     }
 
     public byte readRawByte() throws IOException {
-        if (this.e == this.f2591c) {
+        if (this.e == this.f2597c) {
             d(1);
         }
         byte[] bArr = this.a;
@@ -346,7 +346,7 @@ public final class d {
 
     public int readRawLittleEndian32() throws IOException {
         int i = this.e;
-        if (this.f2591c - i < 4) {
+        if (this.f2597c - i < 4) {
             d(4);
             i = this.e;
         }
@@ -357,7 +357,7 @@ public final class d {
 
     public long readRawLittleEndian64() throws IOException {
         int i = this.e;
-        if (this.f2591c - i < 8) {
+        if (this.f2597c - i < 8) {
             d(8);
             i = this.e;
         }
@@ -373,7 +373,7 @@ public final class d {
         int i;
         long j;
         int i2 = this.e;
-        int i3 = this.f2591c;
+        int i3 = this.f2597c;
         if (i3 != i2) {
             byte[] bArr = this.a;
             int i4 = i2 + 1;
@@ -442,7 +442,7 @@ public final class d {
         long j2;
         long j3;
         int i = this.e;
-        int i2 = this.f2591c;
+        int i2 = this.f2597c;
         if (i2 != i) {
             byte[] bArr = this.a;
             int i3 = i + 1;
@@ -529,7 +529,7 @@ public final class d {
 
     public String readString() throws IOException {
         int readRawVarint32 = readRawVarint32();
-        if (readRawVarint32 > this.f2591c - this.e || readRawVarint32 <= 0) {
+        if (readRawVarint32 > this.f2597c - this.e || readRawVarint32 <= 0) {
             return readRawVarint32 == 0 ? "" : new String(a(readRawVarint32), "UTF-8");
         }
         String str = new String(this.a, this.e, readRawVarint32, "UTF-8");
@@ -541,7 +541,7 @@ public final class d {
         byte[] bArr;
         int readRawVarint32 = readRawVarint32();
         int i = this.e;
-        if (readRawVarint32 <= this.f2591c - i && readRawVarint32 > 0) {
+        if (readRawVarint32 <= this.f2597c - i && readRawVarint32 > 0) {
             bArr = this.a;
             this.e = i + readRawVarint32;
         } else if (readRawVarint32 == 0) {
@@ -625,7 +625,7 @@ public final class d {
     }
 
     public void skipRawBytes(int i) throws IOException {
-        int i2 = this.f2591c;
+        int i2 = this.f2597c;
         int i3 = this.e;
         if (i <= i2 - i3 && i >= 0) {
             this.e = i3 + i;
@@ -639,7 +639,7 @@ public final class d {
                 d(1);
                 while (true) {
                     int i8 = i - i7;
-                    int i9 = this.f2591c;
+                    int i9 = this.f2597c;
                     if (i8 > i9) {
                         i7 += i9;
                         this.e = i9;
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/f.java b/app/src/main/java/d0/e0/p/d/m0/i/f.java
index 4c91cf1621..5973bf5a2a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/f.java
@@ -18,7 +18,7 @@ public final class f<FieldDescriptorType extends a<FieldDescriptorType>> {
     public final t<FieldDescriptorType, Object> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2592c;
+    public boolean f2598c;
     public boolean d = false;
 
     /* compiled from: FieldSet */
@@ -504,9 +504,9 @@ public final class f<FieldDescriptorType extends a<FieldDescriptorType>> {
     }
 
     public void makeImmutable() {
-        if (!this.f2592c) {
+        if (!this.f2598c) {
             this.b.makeImmutable();
-            this.f2592c = true;
+            this.f2598c = true;
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/i/g.java b/app/src/main/java/d0/e0/p/d/m0/i/g.java
index 82f4124a35..68e43ebceb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/i/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/i/g.java
@@ -63,7 +63,7 @@ public abstract class g extends a implements Serializable {
             public Map.Entry<e, Object> b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final boolean f2593c;
+            public final boolean f2599c;
 
             public a(boolean z2, a aVar) {
                 Iterator<Map.Entry<e, Object>> it = d.a(d.this).iterator();
@@ -71,7 +71,7 @@ public abstract class g extends a implements Serializable {
                 if (it.hasNext()) {
                     this.b = it.next();
                 }
-                this.f2593c = z2;
+                this.f2599c = z2;
             }
 
             public void writeUntil(int i, CodedOutputStream codedOutputStream) throws IOException {
@@ -79,7 +79,7 @@ public abstract class g extends a implements Serializable {
                     Map.Entry<e, Object> entry = this.b;
                     if (entry != null && entry.getKey().getNumber() < i) {
                         e key = this.b.getKey();
-                        if (!this.f2593c || key.getLiteJavaType() != w.c.MESSAGE || key.isRepeated()) {
+                        if (!this.f2599c || key.getLiteJavaType() != w.c.MESSAGE || key.isRepeated()) {
                             f.writeField(key, this.b.getValue(), codedOutputStream);
                         } else {
                             codedOutputStream.writeMessageSetExtension(key.getNumber(), (n) this.b.getValue());
@@ -315,7 +315,7 @@ public abstract class g extends a implements Serializable {
         public final Type b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final n f2594c;
+        public final n f2600c;
         public final e d;
         public final Method e;
 
@@ -327,7 +327,7 @@ public abstract class g extends a implements Serializable {
             } else {
                 this.a = containingtype;
                 this.b = type;
-                this.f2594c = nVar;
+                this.f2600c = nVar;
                 this.d = eVar;
                 if (h.a.class.isAssignableFrom(cls)) {
                     try {
@@ -374,7 +374,7 @@ public abstract class g extends a implements Serializable {
         }
 
         public n getMessageDefaultInstance() {
-            return this.f2594c;
+            return this.f2600c;
         }
 
         public int getNumber() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/j/c.java b/app/src/main/java/d0/e0/p/d/m0/j/c.java
index 95b8997128..22fcaa4756 100644
--- a/app/src/main/java/d0/e0/p/d/m0/j/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/j/c.java
@@ -18,7 +18,7 @@ public abstract class c {
     public static final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2599c;
+    public static final c f2605c;
 
     /* compiled from: DescriptorRenderer.kt */
     public static final class a extends o implements Function1<h, Unit> {
@@ -361,7 +361,7 @@ public abstract class c {
         b = kVar.withOptions(f.i);
         kVar.withOptions(g.i);
         kVar.withOptions(j.i);
-        f2599c = kVar.withOptions(e.i);
+        f2605c = kVar.withOptions(e.i);
         kVar.withOptions(h.i);
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/j/d.java b/app/src/main/java/d0/e0/p/d/m0/j/d.java
index 6949e075c4..c5846f611b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/j/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/j/d.java
@@ -317,7 +317,7 @@ public final class d extends c implements h {
 
             public final void invoke(h hVar) {
                 m.checkNotNullParameter(hVar, "<this>");
-                hVar.setExcludedTypeAnnotationClasses(d0.t.o0.plus((Set) hVar.getExcludedTypeAnnotationClasses(), (Iterable) d0.t.m.listOf(k.a.f2427x)));
+                hVar.setExcludedTypeAnnotationClasses(d0.t.o0.plus((Set) hVar.getExcludedTypeAnnotationClasses(), (Iterable) d0.t.m.listOf(k.a.f2433x)));
                 hVar.setAnnotationArgumentsRenderingPolicy(a.ALWAYS_PARENTHESIZED);
             }
         }
@@ -1320,7 +1320,7 @@ public final class d extends c implements h {
             Set<d0.e0.p.d.m0.g.b> excludedTypeAnnotationClasses = aVar instanceof d0.e0.p.d.m0.n.c0 ? getExcludedTypeAnnotationClasses() : getExcludedAnnotationClasses();
             Function1<d0.e0.p.d.m0.c.g1.c, Boolean> annotationFilter = getAnnotationFilter();
             for (d0.e0.p.d.m0.c.g1.c cVar : aVar.getAnnotations()) {
-                if (!d0.t.u.contains(excludedTypeAnnotationClasses, cVar.getFqName()) && !m.areEqual(cVar.getFqName(), k.a.f2428y)) {
+                if (!d0.t.u.contains(excludedTypeAnnotationClasses, cVar.getFqName()) && !m.areEqual(cVar.getFqName(), k.a.f2434y)) {
                     if (annotationFilter == null || annotationFilter.invoke(cVar).booleanValue()) {
                         sb.append(renderAnnotation(cVar, eVar));
                         if (getEachAnnotationOnNewLine()) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/j/i.java b/app/src/main/java/d0/e0/p/d/m0/j/i.java
index 6380c01ff9..ea64c523d2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/j/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/j/i.java
@@ -46,7 +46,7 @@ public final class i implements h {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ReadWriteProperty f2603c;
+    public final ReadWriteProperty f2609c;
     public final ReadWriteProperty d;
     public final ReadWriteProperty e;
     public final ReadWriteProperty f;
@@ -64,20 +64,20 @@ public final class i implements h {
     public final ReadWriteProperty r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final ReadWriteProperty f2604s;
+    public final ReadWriteProperty f2610s;
     public final ReadWriteProperty t;
     public final ReadWriteProperty u;
     public final ReadWriteProperty v;
     public final ReadWriteProperty w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final ReadWriteProperty f2605x;
+    public final ReadWriteProperty f2611x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final ReadWriteProperty f2606y;
+    public final ReadWriteProperty f2612y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final ReadWriteProperty f2607z;
+    public final ReadWriteProperty f2613z;
 
     /* compiled from: DescriptorRendererOptionsImpl.kt */
     public static final class a extends o implements Function1<c1, String> {
@@ -109,7 +109,7 @@ public final class i implements h {
 
     public i() {
         b.c cVar = b.c.a;
-        this.f2603c = new j(cVar, cVar, this);
+        this.f2609c = new j(cVar, cVar, this);
         Boolean bool = Boolean.TRUE;
         this.d = new j(bool, bool, this);
         this.e = new j(bool, bool, this);
@@ -128,16 +128,16 @@ public final class i implements h {
         this.p = new j(bool, bool, this);
         this.q = new j(bool, bool, this);
         this.r = new j(bool2, bool2, this);
-        this.f2604s = new j(bool2, bool2, this);
+        this.f2610s = new j(bool2, bool2, this);
         this.t = new j(bool2, bool2, this);
         this.u = new j(bool2, bool2, this);
         this.v = new j(bool2, bool2, this);
         this.w = new j(bool2, bool2, this);
-        this.f2605x = new j(bool2, bool2, this);
+        this.f2611x = new j(bool2, bool2, this);
         b bVar = b.i;
-        this.f2606y = new j(bVar, bVar, this);
+        this.f2612y = new j(bVar, bVar, this);
         a aVar = a.i;
-        this.f2607z = new j(aVar, aVar, this);
+        this.f2613z = new j(aVar, aVar, this);
         this.A = new j(bool, bool, this);
         m mVar = m.RENDER_OPEN;
         this.B = new j(mVar, mVar, this);
@@ -226,7 +226,7 @@ public final class i implements h {
     }
 
     public b getClassifierNamePolicy() {
-        return (b) this.f2603c.getValue(this, a[0]);
+        return (b) this.f2609c.getValue(this, a[0]);
     }
 
     @Override // d0.e0.p.d.m0.j.h
@@ -235,7 +235,7 @@ public final class i implements h {
     }
 
     public Function1<c1, String> getDefaultParameterValueRenderer() {
-        return (Function1) this.f2607z.getValue(this, a[23]);
+        return (Function1) this.f2613z.getValue(this, a[23]);
     }
 
     public boolean getEachAnnotationOnNewLine() {
@@ -333,7 +333,7 @@ public final class i implements h {
     }
 
     public boolean getRenderPrimaryConstructorParametersAsProperties() {
-        return ((Boolean) this.f2604s.getValue(this, a[16])).booleanValue();
+        return ((Boolean) this.f2610s.getValue(this, a[16])).booleanValue();
     }
 
     public boolean getRenderTypeExpansions() {
@@ -361,7 +361,7 @@ public final class i implements h {
     }
 
     public Function1<c0, c0> getTypeNormalizer() {
-        return (Function1) this.f2606y.getValue(this, a[22]);
+        return (Function1) this.f2612y.getValue(this, a[22]);
     }
 
     public boolean getUninferredTypeParameterAsName() {
@@ -393,7 +393,7 @@ public final class i implements h {
     }
 
     public boolean getWithoutSuperTypes() {
-        return ((Boolean) this.f2605x.getValue(this, a[21])).booleanValue();
+        return ((Boolean) this.f2611x.getValue(this, a[21])).booleanValue();
     }
 
     public boolean getWithoutTypeParameters() {
@@ -417,7 +417,7 @@ public final class i implements h {
     @Override // d0.e0.p.d.m0.j.h
     public void setClassifierNamePolicy(b bVar) {
         m.checkNotNullParameter(bVar, "<set-?>");
-        this.f2603c.setValue(this, a[0], bVar);
+        this.f2609c.setValue(this, a[0], bVar);
     }
 
     @Override // d0.e0.p.d.m0.j.h
@@ -471,7 +471,7 @@ public final class i implements h {
 
     @Override // d0.e0.p.d.m0.j.h
     public void setWithoutSuperTypes(boolean z2) {
-        this.f2605x.setValue(this, a[21], Boolean.valueOf(z2));
+        this.f2611x.setValue(this, a[21], Boolean.valueOf(z2));
     }
 
     @Override // d0.e0.p.d.m0.j.h
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java
index bda2fc98af..7949f2e520 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/b.java
@@ -22,7 +22,7 @@ public final class b implements i {
     public static final a b = new a(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2608c;
+    public final String f2614c;
     public final i[] d;
 
     /* compiled from: ChainedMemberScope.kt */
@@ -63,7 +63,7 @@ public final class b implements i {
     }
 
     public b(String str, i[] iVarArr, DefaultConstructorMarker defaultConstructorMarker) {
-        this.f2608c = str;
+        this.f2614c = str;
         this.d = iVarArr;
     }
 
@@ -192,6 +192,6 @@ public final class b implements i {
     }
 
     public String toString() {
-        return this.f2608c;
+        return this.f2614c;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java
index 8bc3d21c2a..579bf364ad 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/d.java
@@ -16,7 +16,7 @@ public final class d {
     public static int b = 1;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f2609c;
+    public static final int f2615c;
     public static final int d;
     public static final int e;
     public static final int f;
@@ -34,7 +34,7 @@ public final class d {
     public static final List<a.C0261a> r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final List<a.C0261a> f2610s;
+    public static final List<a.C0261a> f2616s;
     public final List<c> t;
     public final int u;
 
@@ -118,7 +118,7 @@ public final class d {
         a.C0261a aVar2;
         a aVar3 = new a(null);
         a = aVar3;
-        f2609c = a.access$nextMask(aVar3);
+        f2615c = a.access$nextMask(aVar3);
         d = a.access$nextMask(aVar3);
         e = a.access$nextMask(aVar3);
         f = a.access$nextMask(aVar3);
@@ -193,7 +193,7 @@ public final class d {
                 arrayList5.add(aVar);
             }
         }
-        f2610s = arrayList5;
+        f2616s = arrayList5;
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List<? extends d0.e0.p.d.m0.k.a0.c> */
@@ -229,7 +229,7 @@ public final class d {
     }
 
     public static final /* synthetic */ int access$getNON_SINGLETON_CLASSIFIERS_MASK$cp() {
-        return f2609c;
+        return f2615c;
     }
 
     public static final /* synthetic */ int access$getNextMaskValue$cp() {
@@ -304,7 +304,7 @@ public final class d {
         a.C0261a aVar = (a.C0261a) obj;
         String name = aVar == null ? null : aVar.getName();
         if (name == null) {
-            List<a.C0261a> list = f2610s;
+            List<a.C0261a> list = f2616s;
             ArrayList arrayList = new ArrayList();
             for (a.C0261a aVar2 : list) {
                 String name2 = acceptsKinds(aVar2.getMask()) ? aVar2.getName() : null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java
index fa28d68446..d67a3aa89c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/e.java
@@ -31,7 +31,7 @@ public abstract class e extends j {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(e.class), "allDescriptors", "getAllDescriptors()Ljava/util/List;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public final d0.e0.p.d.m0.c.e f2611c;
+    public final d0.e0.p.d.m0.c.e f2617c;
     public final j d;
 
     /* compiled from: GivenFunctionsMemberScope.kt */
@@ -56,7 +56,7 @@ public abstract class e extends j {
     public e(d0.e0.p.d.m0.m.o oVar, d0.e0.p.d.m0.c.e eVar) {
         d0.z.d.m.checkNotNullParameter(oVar, "storageManager");
         d0.z.d.m.checkNotNullParameter(eVar, "containingClass");
-        this.f2611c = eVar;
+        this.f2617c = eVar;
         this.d = oVar.createLazyValue(new a(this));
     }
 
@@ -68,7 +68,7 @@ public abstract class e extends j {
         ?? r5;
         Objects.requireNonNull(eVar);
         ArrayList arrayList = new ArrayList(3);
-        Collection<c0> supertypes = eVar.f2611c.getTypeConstructor().getSupertypes();
+        Collection<c0> supertypes = eVar.f2617c.getTypeConstructor().getSupertypes();
         d0.z.d.m.checkNotNullExpressionValue(supertypes, "containingClass.typeConstructor.supertypes");
         ArrayList arrayList2 = new ArrayList();
         for (c0 c0Var : supertypes) {
@@ -120,7 +120,7 @@ public abstract class e extends j {
                 } else {
                     r5 = n.emptyList();
                 }
-                r4.generateOverridesInFunctionGroup(eVar2, list2, r5, eVar.f2611c, new f(arrayList, eVar));
+                r4.generateOverridesInFunctionGroup(eVar2, list2, r5, eVar.f2617c, new f(arrayList, eVar));
             }
         }
         return d0.e0.p.d.m0.p.a.compact(arrayList);
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/f.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/f.java
index df21486401..d8623478e8 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/f.java
@@ -26,6 +26,6 @@ public final class f extends i {
     public void conflict(b bVar, b bVar2) {
         d0.z.d.m.checkNotNullParameter(bVar, "fromSuper");
         d0.z.d.m.checkNotNullParameter(bVar2, "fromCurrent");
-        throw new IllegalStateException(("Conflict in scope of " + this.b.f2611c + ": " + bVar + " vs " + bVar2).toString());
+        throw new IllegalStateException(("Conflict in scope of " + this.b.f2617c + ": " + bVar + " vs " + bVar2).toString());
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java
index 4f1991a354..d72c6d4699 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/m.java
@@ -20,7 +20,7 @@ public final class m extends j {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(m.class), "functions", "getFunctions()Ljava/util/List;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f2612c;
+    public final e f2618c;
     public final j d;
 
     /* compiled from: StaticScopeForKotlinEnum.kt */
@@ -44,14 +44,14 @@ public final class m extends j {
     public m(d0.e0.p.d.m0.m.o oVar, e eVar) {
         d0.z.d.m.checkNotNullParameter(oVar, "storageManager");
         d0.z.d.m.checkNotNullParameter(eVar, "containingClass");
-        this.f2612c = eVar;
+        this.f2618c = eVar;
         eVar.getKind();
         f fVar = f.ENUM_CLASS;
         this.d = oVar.createLazyValue(new a(this));
     }
 
     public static final /* synthetic */ e access$getContainingClass$p(m mVar) {
-        return mVar.f2612c;
+        return mVar.f2618c;
     }
 
     @Override // d0.e0.p.d.m0.k.a0.j, d0.e0.p.d.m0.k.a0.l
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java
index 79b094f5b5..98f0e41da9 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/n.java
@@ -27,7 +27,7 @@ public final class n implements i {
     public final i b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c1 f2613c;
+    public final c1 f2619c;
     public Map<m, m> d;
     public final Lazy e = g.lazy(new a(this));
 
@@ -56,7 +56,7 @@ public final class n implements i {
         this.b = iVar;
         z0 substitution = c1Var.getSubstitution();
         d0.z.d.m.checkNotNullExpressionValue(substitution, "givenSubstitutor.substitution");
-        this.f2613c = d.wrapWithCapturingSubstitution$default(substitution, false, 1, null).buildSubstitutor();
+        this.f2619c = d.wrapWithCapturingSubstitution$default(substitution, false, 1, null).buildSubstitutor();
     }
 
     public static final /* synthetic */ i access$getWorkerScope$p(n nVar) {
@@ -71,7 +71,7 @@ public final class n implements i {
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.Collection<? extends D extends d0.e0.p.d.m0.c.m> */
     /* JADX WARN: Multi-variable type inference failed */
     public final <D extends m> Collection<D> a(Collection<? extends D> collection) {
-        if (this.f2613c.isEmpty() || collection.isEmpty()) {
+        if (this.f2619c.isEmpty() || collection.isEmpty()) {
             return collection;
         }
         LinkedHashSet newLinkedHashSetWithExpectedSize = d0.e0.p.d.m0.p.a.newLinkedHashSetWithExpectedSize(collection.size());
@@ -83,7 +83,7 @@ public final class n implements i {
     }
 
     public final <D extends m> D b(D d) {
-        if (this.f2613c.isEmpty()) {
+        if (this.f2619c.isEmpty()) {
             return d;
         }
         if (this.d == null) {
@@ -94,7 +94,7 @@ public final class n implements i {
         m mVar = map.get(d);
         if (mVar == null) {
             if (d instanceof w0) {
-                mVar = ((w0) d).substitute(this.f2613c);
+                mVar = ((w0) d).substitute(this.f2619c);
                 if (mVar != null) {
                     map.put(d, mVar);
                 } else {
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java
index 0dcb30ea48..0852900db5 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/o.java
@@ -19,7 +19,7 @@ public final class o extends a {
     public static final a b = new a(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final i f2614c;
+    public final i f2620c;
 
     /* compiled from: TypeIntersectionScope.kt */
     public static final class a {
@@ -82,7 +82,7 @@ public final class o extends a {
     }
 
     public o(String str, i iVar, DefaultConstructorMarker defaultConstructorMarker) {
-        this.f2614c = iVar;
+        this.f2620c = iVar;
     }
 
     public static final i create(String str, Collection<? extends c0> collection) {
@@ -91,7 +91,7 @@ public final class o extends a {
 
     @Override // d0.e0.p.d.m0.k.a0.a
     public i a() {
-        return this.f2614c;
+        return this.f2620c;
     }
 
     @Override // d0.e0.p.d.m0.k.a0.a, d0.e0.p.d.m0.k.a0.l
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/a0/p/b.java b/app/src/main/java/d0/e0/p/d/m0/k/a0/p/b.java
index dfc207fcc2..b146236a9a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/a0/p/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/a0/p/b.java
@@ -6,7 +6,7 @@ import d0.e0.p.d.m0.n.c0;
 public class b extends a implements d {
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2615c;
+    public final a f2621c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public b(a aVar, c0 c0Var, d dVar) {
@@ -15,7 +15,7 @@ public class b extends a implements d {
             a(0);
             throw null;
         } else if (c0Var != null) {
-            this.f2615c = aVar;
+            this.f2621c = aVar;
         } else {
             a(1);
             throw null;
@@ -54,6 +54,6 @@ public class b extends a implements d {
     }
 
     public String toString() {
-        return getType() + ": Ext {" + this.f2615c + "}";
+        return getType() + ": Ext {" + this.f2621c + "}";
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/b.java b/app/src/main/java/d0/e0/p/d/m0/k/b.java
index d10b33482b..47b0398a1a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/b.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/b.java
@@ -46,7 +46,7 @@ public final class b {
         public final /* synthetic */ boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ d0.e0.p.d.m0.c.a f2616c;
+        public final /* synthetic */ d0.e0.p.d.m0.c.a f2622c;
         public final /* synthetic */ d0.e0.p.d.m0.c.a d;
 
         /* compiled from: DescriptorEquivalenceForOverrides.kt */
@@ -77,7 +77,7 @@ public final class b {
         public C0263b(b bVar, boolean z2, d0.e0.p.d.m0.c.a aVar, d0.e0.p.d.m0.c.a aVar2) {
             this.a = bVar;
             this.b = z2;
-            this.f2616c = aVar;
+            this.f2622c = aVar;
             this.d = aVar2;
         }
 
@@ -93,7 +93,7 @@ public final class b {
             if (!(declarationDescriptor instanceof z0) || !(declarationDescriptor2 instanceof z0)) {
                 return false;
             }
-            return b.access$areTypeParametersEquivalent(this.a, (z0) declarationDescriptor, (z0) declarationDescriptor2, this.b, new a(this.f2616c, this.d));
+            return b.access$areTypeParametersEquivalent(this.a, (z0) declarationDescriptor, (z0) declarationDescriptor2, this.b, new a(this.f2622c, this.d));
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/d.java b/app/src/main/java/d0/e0/p/d/m0/k/d.java
index 7d62248221..d2099fb932 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/d.java
@@ -215,7 +215,7 @@ public class d {
     public static t0 createEnumValueOfMethod(e eVar) {
         if (eVar != null) {
             g.a aVar = d0.e0.p.d.m0.c.g1.g.f;
-            g0 create = g0.create(eVar, aVar.getEMPTY(), k.f2414c, b.a.SYNTHESIZED, eVar.getSource());
+            g0 create = g0.create(eVar, aVar.getEMPTY(), k.f2420c, b.a.SYNTHESIZED, eVar.getSource());
             g0 initialize = create.initialize((q0) null, (q0) null, Collections.emptyList(), Collections.singletonList(new l0(create, null, 0, aVar.getEMPTY(), d0.e0.p.d.m0.g.e.identifier("value"), d0.e0.p.d.m0.k.x.a.getBuiltIns(eVar).getStringType(), false, false, false, null, eVar.getSource())), (c0) eVar.getDefaultType(), z.FINAL, t.e);
             if (initialize != null) {
                 return initialize;
@@ -336,7 +336,7 @@ public class d {
 
     public static boolean isEnumValueOfMethod(x xVar) {
         if (xVar != null) {
-            return xVar.getName().equals(k.f2414c) && b(xVar);
+            return xVar.getName().equals(k.f2420c) && b(xVar);
         }
         a(27);
         throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/k.java b/app/src/main/java/d0/e0/p/d/m0/k/k.java
index 1c7f975dac..14a8eea17f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/k.java
@@ -46,7 +46,7 @@ public class k {
     public static final k b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final f.a f2617c;
+    public static final f.a f2623c;
     public final g d;
     public final f.a e;
 
@@ -285,7 +285,7 @@ public class k {
 
     static {
         a aVar = new a();
-        f2617c = aVar;
+        f2623c = aVar;
         b = new k(aVar, g.a.a);
     }
 
@@ -1015,7 +1015,7 @@ public class k {
 
     public static k createWithTypeRefiner(g gVar) {
         if (gVar != null) {
-            return new k(f2617c, gVar);
+            return new k(f2623c, gVar);
         }
         a(1);
         throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/u/a/d.java b/app/src/main/java/d0/e0/p/d/m0/k/u/a/d.java
index a8b0b3b461..87dd64f418 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/u/a/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/u/a/d.java
@@ -44,17 +44,17 @@ public final class d {
     public static final class b extends l {
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ boolean f2618c;
+        public final /* synthetic */ boolean f2624c;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
         public b(boolean z2, z0 z0Var) {
             super(z0Var);
-            this.f2618c = z2;
+            this.f2624c = z2;
         }
 
         @Override // d0.e0.p.d.m0.n.z0
         public boolean approximateContravariantCapturedTypes() {
-            return this.f2618c;
+            return this.f2624c;
         }
 
         @Override // d0.e0.p.d.m0.n.l, d0.e0.p.d.m0.n.z0
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/a0.java b/app/src/main/java/d0/e0/p/d/m0/k/v/a0.java
index b022299b93..20f2c73458 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/a0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/a0.java
@@ -16,7 +16,7 @@ public final class a0 extends b0<Short> {
     @Override // d0.e0.p.d.m0.k.v.g
     public c0 getType(d0.e0.p.d.m0.c.c0 c0Var) {
         m.checkNotNullParameter(c0Var, "module");
-        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2421f0);
+        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2427f0);
         j0 defaultType = findClassAcrossModuleDependencies == null ? null : findClassAcrossModuleDependencies.getDefaultType();
         if (defaultType != null) {
             return defaultType;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/j.java b/app/src/main/java/d0/e0/p/d/m0/k/v/j.java
index d584a969a4..60a0266c08 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/j.java
@@ -14,7 +14,7 @@ public final class j extends g<Pair<? extends a, ? extends e>> {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f2619c;
+    public final e f2625c;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
     public j(a aVar, e eVar) {
@@ -22,11 +22,11 @@ public final class j extends g<Pair<? extends a, ? extends e>> {
         m.checkNotNullParameter(aVar, "enumClassId");
         m.checkNotNullParameter(eVar, "enumEntryName");
         this.b = aVar;
-        this.f2619c = eVar;
+        this.f2625c = eVar;
     }
 
     public final e getEnumEntryName() {
-        return this.f2619c;
+        return this.f2625c;
     }
 
     @Override // d0.e0.p.d.m0.k.v.g
@@ -48,7 +48,7 @@ public final class j extends g<Pair<? extends a, ? extends e>> {
         StringBuilder L = c.d.b.a.a.L("Containing class for error-class based enum entry ");
         L.append(this.b);
         L.append('.');
-        L.append(this.f2619c);
+        L.append(this.f2625c);
         j0 createErrorType = t.createErrorType(L.toString());
         m.checkNotNullExpressionValue(createErrorType, "createErrorType(\"Containing class for error-class based enum entry $enumClassId.$enumEntryName\")");
         return createErrorType;
@@ -62,7 +62,7 @@ public final class j extends g<Pair<? extends a, ? extends e>> {
         StringBuilder sb = new StringBuilder();
         sb.append(this.b.getShortClassName());
         sb.append('.');
-        sb.append(this.f2619c);
+        sb.append(this.f2625c);
         return sb.toString();
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/k.java b/app/src/main/java/d0/e0/p/d/m0/k/v/k.java
index f8f12ad5b6..addf2af78c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/k.java
@@ -25,24 +25,24 @@ public abstract class k extends g<Unit> {
     public static final class b extends k {
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f2620c;
+        public final String f2626c;
 
         public b(String str) {
             m.checkNotNullParameter(str, "message");
-            this.f2620c = str;
+            this.f2626c = str;
         }
 
         @Override // d0.e0.p.d.m0.k.v.g
         public j0 getType(c0 c0Var) {
             m.checkNotNullParameter(c0Var, "module");
-            j0 createErrorType = t.createErrorType(this.f2620c);
+            j0 createErrorType = t.createErrorType(this.f2626c);
             m.checkNotNullExpressionValue(createErrorType, "createErrorType(message)");
             return createErrorType;
         }
 
         @Override // d0.e0.p.d.m0.k.v.g
         public String toString() {
-            return this.f2620c;
+            return this.f2626c;
         }
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/n.java b/app/src/main/java/d0/e0/p/d/m0/k/v/n.java
index b07ab806c8..87fef101d2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/n.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/n.java
@@ -26,7 +26,7 @@ public final class n implements u0 {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c0 f2621c;
+    public final c0 f2627c;
     public final Set<d0.e0.p.d.m0.n.c0> d;
     public final j0 e = d0.integerLiteralType(g.f.getEMPTY(), this, false);
     public final Lazy f = d0.g.lazy(new b(this));
@@ -102,12 +102,12 @@ public final class n implements u0 {
     public n(long j, c0 c0Var, Set set, DefaultConstructorMarker defaultConstructorMarker) {
         d0 d0Var = d0.a;
         this.b = j;
-        this.f2621c = c0Var;
+        this.f2627c = c0Var;
         this.d = set;
     }
 
     public static final /* synthetic */ c0 access$getModule$p(n nVar) {
-        return nVar.f2621c;
+        return nVar.f2627c;
     }
 
     public static final /* synthetic */ j0 access$getType$p(n nVar) {
@@ -119,7 +119,7 @@ public final class n implements u0 {
     }
 
     public static final boolean access$isContainsOnlyUnsignedTypes(n nVar) {
-        Collection<d0.e0.p.d.m0.n.c0> allSignedLiteralTypes = u.getAllSignedLiteralTypes(nVar.f2621c);
+        Collection<d0.e0.p.d.m0.n.c0> allSignedLiteralTypes = u.getAllSignedLiteralTypes(nVar.f2627c);
         if ((allSignedLiteralTypes instanceof Collection) && allSignedLiteralTypes.isEmpty()) {
             return true;
         }
@@ -147,7 +147,7 @@ public final class n implements u0 {
 
     @Override // d0.e0.p.d.m0.n.u0
     public h getBuiltIns() {
-        return this.f2621c.getBuiltIns();
+        return this.f2627c.getBuiltIns();
     }
 
     @Override // d0.e0.p.d.m0.n.u0
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/x.java b/app/src/main/java/d0/e0/p/d/m0/k/v/x.java
index 8a1a23bed5..9a471d698c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/x.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/x.java
@@ -16,7 +16,7 @@ public final class x extends b0<Byte> {
     @Override // d0.e0.p.d.m0.k.v.g
     public c0 getType(d0.e0.p.d.m0.c.c0 c0Var) {
         m.checkNotNullParameter(c0Var, "module");
-        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2420e0);
+        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2426e0);
         j0 defaultType = findClassAcrossModuleDependencies == null ? null : findClassAcrossModuleDependencies.getDefaultType();
         if (defaultType != null) {
             return defaultType;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/y.java b/app/src/main/java/d0/e0/p/d/m0/k/v/y.java
index c96c91edeb..99a0dffb9d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/y.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/y.java
@@ -16,7 +16,7 @@ public final class y extends b0<Integer> {
     @Override // d0.e0.p.d.m0.k.v.g
     public c0 getType(d0.e0.p.d.m0.c.c0 c0Var) {
         m.checkNotNullParameter(c0Var, "module");
-        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2422g0);
+        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2428g0);
         j0 defaultType = findClassAcrossModuleDependencies == null ? null : findClassAcrossModuleDependencies.getDefaultType();
         if (defaultType != null) {
             return defaultType;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/v/z.java b/app/src/main/java/d0/e0/p/d/m0/k/v/z.java
index 902ab624e5..59375068c6 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/v/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/v/z.java
@@ -16,7 +16,7 @@ public final class z extends b0<Long> {
     @Override // d0.e0.p.d.m0.k.v.g
     public c0 getType(d0.e0.p.d.m0.c.c0 c0Var) {
         m.checkNotNullParameter(c0Var, "module");
-        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2423h0);
+        e findClassAcrossModuleDependencies = w.findClassAcrossModuleDependencies(c0Var, k.a.f2429h0);
         j0 defaultType = findClassAcrossModuleDependencies == null ? null : findClassAcrossModuleDependencies.getDefaultType();
         if (defaultType != null) {
             return defaultType;
diff --git a/app/src/main/java/d0/e0/p/d/m0/k/y/d.java b/app/src/main/java/d0/e0/p/d/m0/k/y/d.java
index f7921e2647..2ad3336d94 100644
--- a/app/src/main/java/d0/e0/p/d/m0/k/y/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/k/y/d.java
@@ -23,7 +23,7 @@ public enum d {
     public static final Map<String, d> r = new HashMap();
 
     /* renamed from: s  reason: collision with root package name */
-    public static final Map<i, d> f2622s = new EnumMap(i.class);
+    public static final Map<i, d> f2628s = new EnumMap(i.class);
     public static final Map<String, d> t = new HashMap();
     private final String desc;
     private final String name;
@@ -36,7 +36,7 @@ public enum d {
             d dVar = values[i];
             q.add(dVar.getWrapperFqName());
             r.put(dVar.getJavaKeywordName(), dVar);
-            f2622s.put(dVar.getPrimitiveType(), dVar);
+            f2628s.put(dVar.getPrimitiveType(), dVar);
             t.put(dVar.getDesc(), dVar);
         }
     }
@@ -223,7 +223,7 @@ public enum d {
 
     public static d get(i iVar) {
         if (iVar != null) {
-            d dVar = f2622s.get(iVar);
+            d dVar = f2628s.get(iVar);
             if (dVar != null) {
                 return dVar;
             }
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/a.java b/app/src/main/java/d0/e0/p/d/m0/l/a.java
index 30be812d4f..5fa14017da 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/a.java
@@ -19,7 +19,7 @@ public class a {
     public final g.f<d, List<b>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final g.f<c, List<b>> f2623c;
+    public final g.f<c, List<b>> f2629c;
     public final g.f<i, List<b>> d;
     public final g.f<n, List<b>> e;
     public final g.f<n, List<b>> f;
@@ -46,7 +46,7 @@ public class a {
         m.checkNotNullParameter(fVar12, "typeParameterAnnotation");
         this.a = eVar;
         this.b = fVar2;
-        this.f2623c = fVar3;
+        this.f2629c = fVar3;
         this.d = fVar4;
         this.e = fVar5;
         this.f = fVar6;
@@ -59,7 +59,7 @@ public class a {
     }
 
     public final g.f<c, List<b>> getClassAnnotation() {
-        return this.f2623c;
+        return this.f2629c;
     }
 
     public final g.f<n, b.C0244b.c> getCompileTimeValue() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/a.java b/app/src/main/java/d0/e0/p/d/m0/l/b/a.java
index 2be6bee03b..dc55ad80d3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/a.java
@@ -22,7 +22,7 @@ public abstract class a implements i0 {
     public final s b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c0 f2624c;
+    public final c0 f2630c;
     public j d;
     public final i<b, e0> e;
 
@@ -43,7 +43,7 @@ public abstract class a implements i0 {
             Objects.requireNonNull(oVar);
             m.checkNotNullParameter(bVar, "fqName");
             InputStream findBuiltInsData = oVar.b.findBuiltInsData(bVar);
-            c create = findBuiltInsData == null ? null : c.u.create(bVar, oVar.a, oVar.f2624c, findBuiltInsData, false);
+            c create = findBuiltInsData == null ? null : c.u.create(bVar, oVar.a, oVar.f2630c, findBuiltInsData, false);
             if (create == null) {
                 return null;
             }
@@ -63,7 +63,7 @@ public abstract class a implements i0 {
         m.checkNotNullParameter(c0Var, "moduleDescriptor");
         this.a = oVar;
         this.b = sVar;
-        this.f2624c = c0Var;
+        this.f2630c = c0Var;
         this.e = oVar.createMemoizedFunctionWithNullableValues(new C0267a(this));
     }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/a0.java b/app/src/main/java/d0/e0/p/d/m0/l/b/a0.java
index a3c487f0b8..da195f0a0e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/a0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/a0.java
@@ -37,7 +37,7 @@ public final class a0 {
                 m.checkNotNullExpressionValue(uVar3, "PRIVATE_TO_THIS");
                 return uVar3;
             case 4:
-                u uVar4 = t.f2497c;
+                u uVar4 = t.f2503c;
                 m.checkNotNullExpressionValue(uVar4, "PROTECTED");
                 return uVar4;
             case 5:
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/c0.java b/app/src/main/java/d0/e0/p/d/m0/l/b/c0.java
index 33123b8d87..2638b5dd12 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/c0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/c0.java
@@ -41,7 +41,7 @@ public final class c0 {
     public final c0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2625c;
+    public final String f2631c;
     public final String d;
     public boolean e;
     public final Function1<Integer, h> f;
@@ -186,7 +186,7 @@ public final class c0 {
         m.checkNotNullParameter(str2, "containerPresentableName");
         this.a = lVar;
         this.b = c0Var;
-        this.f2625c = str;
+        this.f2631c = str;
         this.d = str2;
         this.e = z2;
         this.f = lVar.getStorageManager().createMemoizedFunctionWithNullableValues(new a(this));
@@ -469,9 +469,9 @@ public final class c0 {
     }
 
     public String toString() {
-        String str = this.f2625c;
+        String str = this.f2631c;
         c0 c0Var = this.b;
-        return m.stringPlus(str, c0Var == null ? "" : m.stringPlus(". Child of ", c0Var.f2625c));
+        return m.stringPlus(str, c0Var == null ? "" : m.stringPlus(". Child of ", c0Var.f2631c));
     }
 
     public final d0.e0.p.d.m0.n.c0 type(q qVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java b/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java
index a4a1c99642..50def25962 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/d0/a.java
@@ -27,7 +27,7 @@ public final class a extends d0.e0.p.d.m0.l.a {
         m.checkNotNullExpressionValue(newInstance, "newInstance().apply(BuiltInsProtoBuf::registerAllExtensions)");
         g.f<l, Integer> fVar = b.a;
         m.checkNotNullExpressionValue(fVar, "packageFqName");
-        g.f<d, List<d0.e0.p.d.m0.f.b>> fVar2 = b.f2576c;
+        g.f<d, List<d0.e0.p.d.m0.f.b>> fVar2 = b.f2582c;
         m.checkNotNullExpressionValue(fVar2, "constructorAnnotation");
         g.f<c, List<d0.e0.p.d.m0.f.b>> fVar3 = b.b;
         m.checkNotNullExpressionValue(fVar3, "classAnnotation");
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java
index 70b7616565..dc50edb289 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/d.java
@@ -58,20 +58,20 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
     public final z r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final u f2626s;
+    public final u f2632s;
     public final d0.e0.p.d.m0.c.f t;
     public final l u;
     public final d0.e0.p.d.m0.k.a0.j v;
     public final b w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final r0<a> f2627x;
+    public final r0<a> f2633x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final c f2628y;
+    public final c f2634y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final m f2629z;
+    public final m f2635z;
 
     /* compiled from: DeserializedClassDescriptor.kt */
     public final class a extends h {
@@ -179,8 +179,8 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
                 arrayList.add(w.getName(nameResolver, number.intValue()));
             }
             this.g = gVar;
-            this.h = this.f2632c.getStorageManager().createLazyValue(new b(this));
-            this.i = this.f2632c.getStorageManager().createLazyValue(new C0269d(this));
+            this.h = this.f2638c.getStorageManager().createLazyValue(new b(this));
+            this.i = this.f2638c.getStorageManager().createLazyValue(new C0269d(this));
         }
 
         public static final d access$getClassDescriptor(a aVar) {
@@ -211,7 +211,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
             for (c0 c0Var : this.i.mo1invoke()) {
                 arrayList.addAll(c0Var.getMemberScope().getContributedFunctions(eVar, d0.e0.p.d.m0.d.b.d.FOR_ALREADY_TRACKED));
             }
-            list.addAll(this.f2632c.getComponents().getAdditionalClassPartsProvider().getFunctions(eVar, this.j));
+            list.addAll(this.f2638c.getComponents().getAdditionalClassPartsProvider().getFunctions(eVar, this.j));
             k(eVar, arrayList, list);
         }
 
@@ -255,7 +255,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
             for (c0 c0Var : supertypes) {
                 d0.t.r.addAll(linkedHashSet, c0Var.getMemberScope().getFunctionNames());
             }
-            linkedHashSet.addAll(this.f2632c.getComponents().getAdditionalClassPartsProvider().getFunctionsNames(this.j));
+            linkedHashSet.addAll(this.f2638c.getComponents().getAdditionalClassPartsProvider().getFunctionsNames(this.j));
             return linkedHashSet;
         }
 
@@ -305,17 +305,17 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         @Override // d0.e0.p.d.m0.l.b.e0.h
         public boolean j(t0 t0Var) {
             d0.z.d.m.checkNotNullParameter(t0Var, "function");
-            return this.f2632c.getComponents().getPlatformDependentDeclarationFilter().isFunctionAvailable(this.j, t0Var);
+            return this.f2638c.getComponents().getPlatformDependentDeclarationFilter().isFunctionAvailable(this.j, t0Var);
         }
 
         public final <D extends d0.e0.p.d.m0.c.b> void k(d0.e0.p.d.m0.g.e eVar, Collection<? extends D> collection, List<D> list) {
-            this.f2632c.getComponents().getKotlinTypeChecker().getOverridingUtil().generateOverridesInFunctionGroup(eVar, collection, new ArrayList(list), this.j, new c(list));
+            this.f2638c.getComponents().getKotlinTypeChecker().getOverridingUtil().generateOverridesInFunctionGroup(eVar, collection, new ArrayList(list), this.j, new c(list));
         }
 
         public void recordLookup(d0.e0.p.d.m0.g.e eVar, d0.e0.p.d.m0.d.b.b bVar) {
             d0.z.d.m.checkNotNullParameter(eVar, "name");
             d0.z.d.m.checkNotNullParameter(bVar, "location");
-            d0.e0.p.d.m0.d.a.record(this.f2632c.getComponents().getLookupTracker(), bVar, this.j, eVar);
+            d0.e0.p.d.m0.d.a.record(this.f2638c.getComponents().getLookupTracker(), bVar, this.j, eVar);
         }
     }
 
@@ -323,7 +323,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
     public final class b extends d0.e0.p.d.m0.n.b {
 
         /* renamed from: c  reason: collision with root package name */
-        public final j<List<z0>> f2630c;
+        public final j<List<z0>> f2636c;
         public final /* synthetic */ d d;
 
         /* compiled from: DeserializedClassDescriptor.kt */
@@ -349,7 +349,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
             super(dVar.getC().getStorageManager());
             d0.z.d.m.checkNotNullParameter(dVar, "this$0");
             this.d = dVar;
-            this.f2630c = dVar.getC().getStorageManager().createLazyValue(new a(dVar));
+            this.f2636c = dVar.getC().getStorageManager().createLazyValue(new a(dVar));
         }
 
         @Override // d0.e0.p.d.m0.n.g
@@ -406,7 +406,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
         @Override // d0.e0.p.d.m0.n.u0
         public List<z0> getParameters() {
-            return this.f2630c.mo1invoke();
+            return this.f2636c.mo1invoke();
         }
 
         @Override // d0.e0.p.d.m0.n.u0
@@ -427,7 +427,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         public final d0.e0.p.d.m0.m.i<d0.e0.p.d.m0.g.e, d0.e0.p.d.m0.c.e> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final j<Set<d0.e0.p.d.m0.g.e>> f2631c;
+        public final j<Set<d0.e0.p.d.m0.g.e>> f2637c;
         public final /* synthetic */ d d;
 
         /* compiled from: DeserializedClassDescriptor.kt */
@@ -503,7 +503,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
             }
             this.a = linkedHashMap;
             this.b = this.d.getC().getStorageManager().createMemoizedFunctionWithNullableValues(new a(this, this.d));
-            this.f2631c = this.d.getC().getStorageManager().createLazyValue(new b(this));
+            this.f2637c = this.d.getC().getStorageManager().createLazyValue(new b(this));
         }
 
         public static final Set access$computeEnumMemberNames(c cVar) {
@@ -536,7 +536,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         }
 
         public static final /* synthetic */ j access$getEnumMemberNames$p(c cVar) {
-            return cVar.f2631c;
+            return cVar.f2637c;
         }
 
         public final Collection<d0.e0.p.d.m0.c.e> all() {
@@ -687,7 +687,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         this.q = w.getClassId(cVar2, cVar.getFqName());
         d0.e0.p.d.m0.l.b.z zVar = d0.e0.p.d.m0.l.b.z.a;
         this.r = zVar.modality(d0.e0.p.d.m0.f.z.b.d.get(cVar.getFlags()));
-        this.f2626s = d0.e0.p.d.m0.l.b.a0.descriptorVisibility(zVar, d0.e0.p.d.m0.f.z.b.f2578c.get(cVar.getFlags()));
+        this.f2632s = d0.e0.p.d.m0.l.b.a0.descriptorVisibility(zVar, d0.e0.p.d.m0.f.z.b.f2584c.get(cVar.getFlags()));
         d0.e0.p.d.m0.c.f classKind = zVar.classKind(d0.e0.p.d.m0.f.z.b.e.get(cVar.getFlags()));
         this.t = classKind;
         List<s> typeParameterList = cVar.getTypeParameterList();
@@ -703,11 +703,11 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
         d0.e0.p.d.m0.c.f fVar = d0.e0.p.d.m0.c.f.ENUM_CLASS;
         this.v = classKind == fVar ? new d0.e0.p.d.m0.k.a0.m(childContext.getStorageManager(), this) : i.b.b;
         this.w = new b(this);
-        this.f2627x = r0.a.create(this, childContext.getStorageManager(), childContext.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner(), new g(this));
+        this.f2633x = r0.a.create(this, childContext.getStorageManager(), childContext.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner(), new g(this));
         y.a aVar3 = null;
-        this.f2628y = classKind == fVar ? new c(this) : null;
+        this.f2634y = classKind == fVar ? new c(this) : null;
         m containingDeclaration = lVar.getContainingDeclaration();
-        this.f2629z = containingDeclaration;
+        this.f2635z = containingDeclaration;
         this.A = childContext.getStorageManager().createNullableLazyValue(new h(this));
         this.B = childContext.getStorageManager().createLazyValue(new f(this));
         this.C = childContext.getStorageManager().createNullableLazyValue(new e(this));
@@ -805,7 +805,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
     }
 
     public static final /* synthetic */ c access$getEnumEntries$p(d dVar) {
-        return dVar.f2628y;
+        return dVar.f2634y;
     }
 
     public static final /* synthetic */ b access$getTypeConstructor$p(d dVar) {
@@ -813,7 +813,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
     }
 
     public final a b() {
-        return this.f2627x.getScope(this.u.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner());
+        return this.f2633x.getScope(this.u.getComponents().getKotlinTypeChecker().getKotlinTypeRefiner());
     }
 
     @Override // d0.e0.p.d.m0.c.g1.a
@@ -841,7 +841,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
     @Override // d0.e0.p.d.m0.c.e, d0.e0.p.d.m0.c.n, d0.e0.p.d.m0.c.m
     public m getContainingDeclaration() {
-        return this.f2629z;
+        return this.f2635z;
     }
 
     @Override // d0.e0.p.d.m0.c.e, d0.e0.p.d.m0.c.i
@@ -890,7 +890,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
     @Override // d0.e0.p.d.m0.c.i1.u
     public d0.e0.p.d.m0.k.a0.i getUnsubstitutedMemberScope(d0.e0.p.d.m0.n.l1.g gVar) {
         d0.z.d.m.checkNotNullParameter(gVar, "kotlinTypeRefiner");
-        return this.f2627x.getScope(gVar);
+        return this.f2633x.getScope(gVar);
     }
 
     @Override // d0.e0.p.d.m0.c.e
@@ -900,7 +900,7 @@ public final class d extends d0.e0.p.d.m0.c.i1.a implements m {
 
     @Override // d0.e0.p.d.m0.c.e, d0.e0.p.d.m0.c.q, d0.e0.p.d.m0.c.y
     public u getVisibility() {
-        return this.f2626s;
+        return this.f2632s;
     }
 
     public final boolean hasNestedClass$deserialization(d0.e0.p.d.m0.g.e eVar) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java
index 3cc3f57633..5c07ca2133 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/h.java
@@ -42,7 +42,7 @@ public abstract class h extends j {
     public static final /* synthetic */ KProperty<Object>[] b = {a0.property1(new y(a0.getOrCreateKotlinClass(h.class), "classNames", "getClassNames$deserialization()Ljava/util/Set;")), a0.property1(new y(a0.getOrCreateKotlinClass(h.class), "classifierNamesLazy", "getClassifierNamesLazy()Ljava/util/Set;"))};
 
     /* renamed from: c  reason: collision with root package name */
-    public final l f2632c;
+    public final l f2638c;
     public final a d;
     public final d0.e0.p.d.m0.m.j e;
     public final k f;
@@ -70,7 +70,7 @@ public abstract class h extends j {
         public final List<d0.e0.p.d.m0.f.i> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<n> f2633c;
+        public final List<n> f2639c;
         public final List<r> d;
         public final d0.e0.p.d.m0.m.j e;
         public final d0.e0.p.d.m0.m.j f;
@@ -322,18 +322,18 @@ public abstract class h extends j {
             d0.z.d.m.checkNotNullParameter(list3, "typeAliasList");
             this.o = hVar;
             this.b = list;
-            this.f2633c = list2;
-            this.d = !hVar.f2632c.getComponents().getConfiguration().getTypeAliasesAllowed() ? d0.t.n.emptyList() : list3;
-            this.e = hVar.f2632c.getStorageManager().createLazyValue(new d(this));
-            this.f = hVar.f2632c.getStorageManager().createLazyValue(new e(this));
-            this.g = hVar.f2632c.getStorageManager().createLazyValue(new c(this));
-            this.h = hVar.f2632c.getStorageManager().createLazyValue(new a(this));
-            this.i = hVar.f2632c.getStorageManager().createLazyValue(new C0272b(this));
-            this.j = hVar.f2632c.getStorageManager().createLazyValue(new i(this));
-            this.k = hVar.f2632c.getStorageManager().createLazyValue(new g(this));
-            this.l = hVar.f2632c.getStorageManager().createLazyValue(new C0273h(this));
-            this.m = hVar.f2632c.getStorageManager().createLazyValue(new f(this, hVar));
-            this.n = hVar.f2632c.getStorageManager().createLazyValue(new j(this, hVar));
+            this.f2639c = list2;
+            this.d = !hVar.f2638c.getComponents().getConfiguration().getTypeAliasesAllowed() ? d0.t.n.emptyList() : list3;
+            this.e = hVar.f2638c.getStorageManager().createLazyValue(new d(this));
+            this.f = hVar.f2638c.getStorageManager().createLazyValue(new e(this));
+            this.g = hVar.f2638c.getStorageManager().createLazyValue(new c(this));
+            this.h = hVar.f2638c.getStorageManager().createLazyValue(new a(this));
+            this.i = hVar.f2638c.getStorageManager().createLazyValue(new C0272b(this));
+            this.j = hVar.f2638c.getStorageManager().createLazyValue(new i(this));
+            this.k = hVar.f2638c.getStorageManager().createLazyValue(new g(this));
+            this.l = hVar.f2638c.getStorageManager().createLazyValue(new C0273h(this));
+            this.m = hVar.f2638c.getStorageManager().createLazyValue(new f(this, hVar));
+            this.n = hVar.f2638c.getStorageManager().createLazyValue(new j(this, hVar));
         }
 
         public static final List access$computeAllNonDeclaredFunctions(b bVar) {
@@ -389,7 +389,7 @@ public abstract class h extends j {
         }
 
         public static final List access$computeProperties(b bVar) {
-            List<n> list = bVar.f2633c;
+            List<n> list = bVar.f2639c;
             h hVar = bVar.o;
             ArrayList arrayList = new ArrayList();
             for (d0.e0.p.d.m0.i.n nVar : list) {
@@ -439,7 +439,7 @@ public abstract class h extends j {
         }
 
         public static final /* synthetic */ List access$getPropertyList$p(b bVar) {
-            return bVar.f2633c;
+            return bVar.f2639c;
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.Collection<d0.e0.p.d.m0.c.m> */
@@ -526,7 +526,7 @@ public abstract class h extends j {
         public final Map<d0.e0.p.d.m0.g.e, byte[]> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Map<d0.e0.p.d.m0.g.e, byte[]> f2634c;
+        public final Map<d0.e0.p.d.m0.g.e, byte[]> f2640c;
         public final Map<d0.e0.p.d.m0.g.e, byte[]> d;
         public final d0.e0.p.d.m0.m.h<d0.e0.p.d.m0.g.e, Collection<t0>> e;
         public final d0.e0.p.d.m0.m.h<d0.e0.p.d.m0.g.e, Collection<n0>> f;
@@ -553,7 +553,7 @@ public abstract class h extends j {
             @Override // kotlin.jvm.functions.Function0
             /* renamed from: invoke */
             public final M mo1invoke() {
-                return (d0.e0.p.d.m0.i.n) ((d0.e0.p.d.m0.i.b) this.$parser).parseDelimitedFrom((InputStream) this.$inputStream, this.this$0.f2632c.getComponents().getExtensionRegistryLite());
+                return (d0.e0.p.d.m0.i.n) ((d0.e0.p.d.m0.i.b) this.$parser).parseDelimitedFrom((InputStream) this.$inputStream, this.this$0.f2638c.getComponents().getExtensionRegistryLite());
             }
         }
 
@@ -675,8 +675,8 @@ public abstract class h extends j {
                 }
                 ((List) obj4).add(obj3);
             }
-            this.f2634c = a(linkedHashMap2);
-            if (this.j.f2632c.getComponents().getConfiguration().getTypeAliasesAllowed()) {
+            this.f2640c = a(linkedHashMap2);
+            if (this.j.f2638c.getComponents().getConfiguration().getTypeAliasesAllowed()) {
                 h hVar3 = this.j;
                 LinkedHashMap linkedHashMap3 = new LinkedHashMap();
                 for (Object obj5 : list3) {
@@ -693,11 +693,11 @@ public abstract class h extends j {
                 map = h0.emptyMap();
             }
             this.d = map;
-            this.e = this.j.f2632c.getStorageManager().createMemoizedFunction(new C0274c(this));
-            this.f = this.j.f2632c.getStorageManager().createMemoizedFunction(new d(this));
-            this.g = this.j.f2632c.getStorageManager().createMemoizedFunctionWithNullableValues(new e(this));
-            this.h = this.j.f2632c.getStorageManager().createLazyValue(new b(this, this.j));
-            this.i = this.j.f2632c.getStorageManager().createLazyValue(new f(this, this.j));
+            this.e = this.j.f2638c.getStorageManager().createMemoizedFunction(new C0274c(this));
+            this.f = this.j.f2638c.getStorageManager().createMemoizedFunction(new d(this));
+            this.g = this.j.f2638c.getStorageManager().createMemoizedFunctionWithNullableValues(new e(this));
+            this.h = this.j.f2638c.getStorageManager().createLazyValue(new b(this, this.j));
+            this.i = this.j.f2638c.getStorageManager().createLazyValue(new f(this, this.j));
         }
 
         public static final Collection access$computeFunctions(c cVar, d0.e0.p.d.m0.g.e eVar) {
@@ -712,7 +712,7 @@ public abstract class h extends j {
             }
             ArrayList arrayList = new ArrayList(list.size());
             for (d0.e0.p.d.m0.f.i iVar : list) {
-                d0.e0.p.d.m0.l.b.u memberDeserializer = hVar.f2632c.getMemberDeserializer();
+                d0.e0.p.d.m0.l.b.u memberDeserializer = hVar.f2638c.getMemberDeserializer();
                 d0.z.d.m.checkNotNullExpressionValue(iVar, "it");
                 t0 loadFunction = memberDeserializer.loadFunction(iVar);
                 if (!hVar.j(loadFunction)) {
@@ -727,7 +727,7 @@ public abstract class h extends j {
         }
 
         public static final Collection access$computeProperties(c cVar, d0.e0.p.d.m0.g.e eVar) {
-            Map<d0.e0.p.d.m0.g.e, byte[]> map = cVar.f2634c;
+            Map<d0.e0.p.d.m0.g.e, byte[]> map = cVar.f2640c;
             p<n> pVar = n.j;
             d0.z.d.m.checkNotNullExpressionValue(pVar, "PARSER");
             h hVar = cVar.j;
@@ -738,7 +738,7 @@ public abstract class h extends j {
             }
             ArrayList arrayList = new ArrayList(list.size());
             for (n nVar : list) {
-                d0.e0.p.d.m0.l.b.u memberDeserializer = hVar.f2632c.getMemberDeserializer();
+                d0.e0.p.d.m0.l.b.u memberDeserializer = hVar.f2638c.getMemberDeserializer();
                 d0.z.d.m.checkNotNullExpressionValue(nVar, "it");
                 n0 loadProperty = memberDeserializer.loadProperty(nVar);
                 if (loadProperty != null) {
@@ -752,10 +752,10 @@ public abstract class h extends j {
         public static final y0 access$createTypeAlias(c cVar, d0.e0.p.d.m0.g.e eVar) {
             r parseDelimitedFrom;
             byte[] bArr = cVar.d.get(eVar);
-            if (bArr == null || (parseDelimitedFrom = r.parseDelimitedFrom(new ByteArrayInputStream(bArr), cVar.j.f2632c.getComponents().getExtensionRegistryLite())) == null) {
+            if (bArr == null || (parseDelimitedFrom = r.parseDelimitedFrom(new ByteArrayInputStream(bArr), cVar.j.f2638c.getComponents().getExtensionRegistryLite())) == null) {
                 return null;
             }
-            return cVar.j.f2632c.getMemberDeserializer().loadTypeAlias(parseDelimitedFrom);
+            return cVar.j.f2638c.getMemberDeserializer().loadTypeAlias(parseDelimitedFrom);
         }
 
         public static final /* synthetic */ Map access$getFunctionProtosBytes$p(c cVar) {
@@ -763,7 +763,7 @@ public abstract class h extends j {
         }
 
         public static final /* synthetic */ Map access$getPropertyProtosBytes$p(c cVar) {
-            return cVar.f2634c;
+            return cVar.f2640c;
         }
 
         public final Map<d0.e0.p.d.m0.g.e, byte[]> a(Map<d0.e0.p.d.m0.g.e, ? extends Collection<? extends d0.e0.p.d.m0.i.a>> map) {
@@ -902,14 +902,14 @@ public abstract class h extends j {
         d0.z.d.m.checkNotNullParameter(list2, "propertyList");
         d0.z.d.m.checkNotNullParameter(list3, "typeAliasList");
         d0.z.d.m.checkNotNullParameter(function0, "classNames");
-        this.f2632c = lVar;
+        this.f2638c = lVar;
         this.d = lVar.getComponents().getConfiguration().getPreserveDeclarationsOrdering() ? new b(this, list, list2, list3) : new c(this, list, list2, list3);
         this.e = lVar.getStorageManager().createLazyValue(new d(function0));
         this.f = lVar.getStorageManager().createNullableLazyValue(new e(this));
     }
 
     public static final /* synthetic */ l access$getC(h hVar) {
-        return hVar.f2632c;
+        return hVar.f2638c;
     }
 
     public static final /* synthetic */ a access$getImpl$p(h hVar) {
@@ -931,7 +931,7 @@ public abstract class h extends j {
         if (dVar.acceptsKinds(aVar.getCLASSIFIERS_MASK())) {
             for (d0.e0.p.d.m0.g.e eVar : getClassNames$deserialization()) {
                 if (function1.invoke(eVar).booleanValue()) {
-                    d0.e0.p.d.m0.p.a.addIfNotNull(arrayList, this.f2632c.getComponents().deserializeClass(e(eVar)));
+                    d0.e0.p.d.m0.p.a.addIfNotNull(arrayList, this.f2638c.getComponents().deserializeClass(e(eVar)));
                 }
             }
         }
@@ -975,7 +975,7 @@ public abstract class h extends j {
         d0.z.d.m.checkNotNullParameter(eVar, "name");
         d0.z.d.m.checkNotNullParameter(bVar, "location");
         if (i(eVar)) {
-            return this.f2632c.getComponents().deserializeClass(e(eVar));
+            return this.f2638c.getComponents().deserializeClass(e(eVar));
         }
         if (this.d.getTypeAliasNames().contains(eVar)) {
             return this.d.getTypeAliasByName(eVar);
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java
index 7d71a5ebd0..60e29c0e4a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/i.java
@@ -91,7 +91,7 @@ public class i extends h {
         m.checkNotNullParameter(dVar, "kindFilter");
         m.checkNotNullParameter(function1, "nameFilter");
         Collection<d0.e0.p.d.m0.c.m> b = b(dVar, function1, d0.e0.p.d.m0.d.b.d.WHEN_GET_ALL_DESCRIPTORS);
-        Iterable<d0.e0.p.d.m0.c.h1.b> fictitiousClassDescriptorFactories = this.f2632c.getComponents().getFictitiousClassDescriptorFactories();
+        Iterable<d0.e0.p.d.m0.c.h1.b> fictitiousClassDescriptorFactories = this.f2638c.getComponents().getFictitiousClassDescriptorFactories();
         ArrayList arrayList = new ArrayList();
         for (d0.e0.p.d.m0.c.h1.b bVar : fictitiousClassDescriptorFactories) {
             d0.t.r.addAll(arrayList, bVar.getAllContributedClassesIfPossible(this.h));
@@ -112,7 +112,7 @@ public class i extends h {
         if (getClassNames$deserialization().contains(eVar)) {
             return true;
         }
-        Iterable<d0.e0.p.d.m0.c.h1.b> fictitiousClassDescriptorFactories = this.f2632c.getComponents().getFictitiousClassDescriptorFactories();
+        Iterable<d0.e0.p.d.m0.c.h1.b> fictitiousClassDescriptorFactories = this.f2638c.getComponents().getFictitiousClassDescriptorFactories();
         if (!(fictitiousClassDescriptorFactories instanceof Collection) || !((Collection) fictitiousClassDescriptorFactories).isEmpty()) {
             Iterator<d0.e0.p.d.m0.c.h1.b> it = fictitiousClassDescriptorFactories.iterator();
             while (true) {
@@ -133,6 +133,6 @@ public class i extends h {
     public void recordLookup(e eVar, d0.e0.p.d.m0.d.b.b bVar) {
         m.checkNotNullParameter(eVar, "name");
         m.checkNotNullParameter(bVar, "location");
-        d0.e0.p.d.m0.d.a.record(this.f2632c.getComponents().getLookupTracker(), bVar, this.g, eVar);
+        d0.e0.p.d.m0.d.a.record(this.f2638c.getComponents().getLookupTracker(), bVar, this.g, eVar);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java
index c1297ccc45..d37c7df24b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/l.java
@@ -31,20 +31,20 @@ public final class l extends e implements g {
     public final c r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final d0.e0.p.d.m0.f.z.g f2635s;
+    public final d0.e0.p.d.m0.f.z.g f2641s;
     public final i t;
     public final f u;
     public Collection<? extends i0> v;
     public j0 w;
 
     /* renamed from: x  reason: collision with root package name */
-    public j0 f2636x;
+    public j0 f2642x;
 
     /* renamed from: y  reason: collision with root package name */
-    public List<? extends z0> f2637y;
+    public List<? extends z0> f2643y;
 
     /* renamed from: z  reason: collision with root package name */
-    public j0 f2638z;
+    public j0 f2644z;
 
     /* JADX WARNING: Illegal instructions before constructor call */
     public l(o oVar, m mVar, d0.e0.p.d.m0.c.g1.g gVar, d0.e0.p.d.m0.g.e eVar, u uVar, r rVar, c cVar, d0.e0.p.d.m0.f.z.g gVar2, i iVar, f fVar) {
@@ -63,7 +63,7 @@ public final class l extends e implements g {
         this.p = oVar;
         this.q = rVar;
         this.r = cVar;
-        this.f2635s = gVar2;
+        this.f2641s = gVar2;
         this.t = iVar;
         this.u = fVar;
     }
@@ -91,7 +91,7 @@ public final class l extends e implements g {
 
     @Override // d0.e0.p.d.m0.c.h
     public j0 getDefaultType() {
-        j0 j0Var = this.f2638z;
+        j0 j0Var = this.f2644z;
         if (j0Var != null) {
             return j0Var;
         }
@@ -101,7 +101,7 @@ public final class l extends e implements g {
 
     @Override // d0.e0.p.d.m0.c.y0
     public j0 getExpandedType() {
-        j0 j0Var = this.f2636x;
+        j0 j0Var = this.f2642x;
         if (j0Var != null) {
             return j0Var;
         }
@@ -121,7 +121,7 @@ public final class l extends e implements g {
 
     @Override // d0.e0.p.d.m0.l.b.e0.g
     public d0.e0.p.d.m0.f.z.g getTypeTable() {
-        return this.f2635s;
+        return this.f2641s;
     }
 
     @Override // d0.e0.p.d.m0.c.y0
@@ -151,8 +151,8 @@ public final class l extends e implements g {
         d0.z.d.m.checkNotNullParameter(aVar, "isExperimentalCoroutineInReleaseEnvironment");
         initialize(list);
         this.w = j0Var;
-        this.f2636x = j0Var2;
-        this.f2637y = a1.computeConstructorTypeParameters(this);
+        this.f2642x = j0Var2;
+        this.f2643y = a1.computeConstructorTypeParameters(this);
         d0.e0.p.d.m0.c.e classDescriptor = getClassDescriptor();
         d0.e0.p.d.m0.k.a0.i unsubstitutedMemberScope = classDescriptor == null ? null : classDescriptor.getUnsubstitutedMemberScope();
         if (unsubstitutedMemberScope == null) {
@@ -160,7 +160,7 @@ public final class l extends e implements g {
         }
         j0 makeUnsubstitutedType = e1.makeUnsubstitutedType(this, unsubstitutedMemberScope, new d(this));
         d0.z.d.m.checkNotNullExpressionValue(makeUnsubstitutedType, "@OptIn(TypeRefinement::class)\n    protected fun computeDefaultType(): SimpleType =\n        TypeUtils.makeUnsubstitutedType(this, classDescriptor?.unsubstitutedMemberScope ?: MemberScope.Empty) { kotlinTypeRefiner ->\n            kotlinTypeRefiner.refineDescriptor(this)?.defaultType\n        }");
-        this.f2638z = makeUnsubstitutedType;
+        this.f2644z = makeUnsubstitutedType;
         this.v = getTypeAliasConstructors();
         this.A = aVar;
     }
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/m.java b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/m.java
index 331f6242fa..f16b5bb391 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/e0/m.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/e0/m.java
@@ -21,7 +21,7 @@ import kotlin.jvm.functions.Function0;
 public final class m extends b {
 
     /* renamed from: s  reason: collision with root package name */
-    public final l f2639s;
+    public final l f2645s;
     public final s t;
     public final a u;
 
@@ -54,13 +54,13 @@ public final class m extends b {
         z zVar = z.a;
         s.c variance = sVar.getVariance();
         d0.z.d.m.checkNotNullExpressionValue(variance, "proto.variance");
-        this.f2639s = lVar;
+        this.f2645s = lVar;
         this.t = sVar;
         this.u = new a(lVar.getStorageManager(), new a(this));
     }
 
     public static final /* synthetic */ l access$getC$p(m mVar) {
-        return mVar.f2639s;
+        return mVar.f2645s;
     }
 
     @Override // d0.e0.p.d.m0.c.i1.f
@@ -71,11 +71,11 @@ public final class m extends b {
 
     @Override // d0.e0.p.d.m0.c.i1.f
     public List<c0> d() {
-        List<q> upperBounds = f.upperBounds(this.t, this.f2639s.getTypeTable());
+        List<q> upperBounds = f.upperBounds(this.t, this.f2645s.getTypeTable());
         if (upperBounds.isEmpty()) {
             return d0.t.m.listOf(d0.e0.p.d.m0.k.x.a.getBuiltIns(this).getDefaultBound());
         }
-        d0.e0.p.d.m0.l.b.c0 typeDeserializer = this.f2639s.getTypeDeserializer();
+        d0.e0.p.d.m0.l.b.c0 typeDeserializer = this.f2645s.getTypeDeserializer();
         ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(upperBounds, 10));
         for (q qVar : upperBounds) {
             arrayList.add(typeDeserializer.type(qVar));
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/f.java b/app/src/main/java/d0/e0/p/d/m0/l/b/f.java
index acb84a4122..f413a22b90 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/f.java
@@ -10,7 +10,7 @@ public final class f {
     public final d0.e0.p.d.m0.f.c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2640c;
+    public final a f2646c;
     public final u0 d;
 
     public f(c cVar, d0.e0.p.d.m0.f.c cVar2, a aVar, u0 u0Var) {
@@ -20,7 +20,7 @@ public final class f {
         m.checkNotNullParameter(u0Var, "sourceElement");
         this.a = cVar;
         this.b = cVar2;
-        this.f2640c = aVar;
+        this.f2646c = aVar;
         this.d = u0Var;
     }
 
@@ -33,7 +33,7 @@ public final class f {
     }
 
     public final a component3() {
-        return this.f2640c;
+        return this.f2646c;
     }
 
     public final u0 component4() {
@@ -48,12 +48,12 @@ public final class f {
             return false;
         }
         f fVar = (f) obj;
-        return m.areEqual(this.a, fVar.a) && m.areEqual(this.b, fVar.b) && m.areEqual(this.f2640c, fVar.f2640c) && m.areEqual(this.d, fVar.d);
+        return m.areEqual(this.a, fVar.a) && m.areEqual(this.b, fVar.b) && m.areEqual(this.f2646c, fVar.f2646c) && m.areEqual(this.d, fVar.d);
     }
 
     public int hashCode() {
         int hashCode = this.b.hashCode();
-        int hashCode2 = this.f2640c.hashCode();
+        int hashCode2 = this.f2646c.hashCode();
         return this.d.hashCode() + ((hashCode2 + ((hashCode + (this.a.hashCode() * 31)) * 31)) * 31);
     }
 
@@ -63,7 +63,7 @@ public final class f {
         L.append(", classProto=");
         L.append(this.b);
         L.append(", metadataVersion=");
-        L.append(this.f2640c);
+        L.append(this.f2646c);
         L.append(", sourceElement=");
         L.append(this.d);
         L.append(')');
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/h.java b/app/src/main/java/d0/e0/p/d/m0/l/b/h.java
index 5111b67d7e..9c3dc97090 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/h.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/h.java
@@ -25,7 +25,7 @@ public final class h {
     public static final Set<d0.e0.p.d.m0.g.a> b = m0.setOf(d0.e0.p.d.m0.g.a.topLevel(k.a.d.toSafe()));
 
     /* renamed from: c  reason: collision with root package name */
-    public final j f2641c;
+    public final j f2647c;
     public final Function1<a, e> d;
 
     /* compiled from: ClassDeserializer.kt */
@@ -84,7 +84,7 @@ public final class h {
 
     public h(j jVar) {
         m.checkNotNullParameter(jVar, "components");
-        this.f2641c = jVar;
+        this.f2647c = jVar;
         this.d = jVar.getStorageManager().createMemoizedFunctionWithNullableValues(new c(this));
     }
 
@@ -95,7 +95,7 @@ public final class h {
         boolean z2;
         Objects.requireNonNull(hVar);
         d0.e0.p.d.m0.g.a classId = aVar.getClassId();
-        for (d0.e0.p.d.m0.c.h1.b bVar : hVar.f2641c.getFictitiousClassDescriptorFactories()) {
+        for (d0.e0.p.d.m0.c.h1.b bVar : hVar.f2647c.getFictitiousClassDescriptorFactories()) {
             e createClass = bVar.createClass(classId);
             if (createClass != null) {
                 return createClass;
@@ -105,7 +105,7 @@ public final class h {
             return null;
         }
         f classData = aVar.getClassData();
-        if (classData == null && (classData = hVar.f2641c.getClassDataFinder().findClassData(classId)) == null) {
+        if (classData == null && (classData = hVar.f2647c.getClassDataFinder().findClassData(classId)) == null) {
             return null;
         }
         d0.e0.p.d.m0.f.z.c component1 = classData.component1();
@@ -126,7 +126,7 @@ public final class h {
             }
             lVar = dVar.getC();
         } else {
-            f0 packageFragmentProvider = hVar.f2641c.getPackageFragmentProvider();
+            f0 packageFragmentProvider = hVar.f2647c.getPackageFragmentProvider();
             d0.e0.p.d.m0.g.b packageFqName = classId.getPackageFqName();
             m.checkNotNullExpressionValue(packageFqName, "classId.packageFqName");
             Iterator<T> it = h0.packageFragments(packageFragmentProvider, packageFqName).iterator();
@@ -157,7 +157,7 @@ public final class h {
             if (e0Var2 == null) {
                 return null;
             }
-            j jVar = hVar.f2641c;
+            j jVar = hVar.f2647c;
             t typeTable = component2.getTypeTable();
             m.checkNotNullExpressionValue(typeTable, "classProto.typeTable");
             g gVar = new g(typeTable);
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/j.java b/app/src/main/java/d0/e0/p/d/m0/l/b/j.java
index b046bb9d53..8974012eb3 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/j.java
@@ -24,7 +24,7 @@ public final class j {
     public final c0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final k f2642c;
+    public final k f2648c;
     public final g d;
     public final c<c, g<?>> e;
     public final f0 f;
@@ -42,7 +42,7 @@ public final class j {
     public final d0.e0.p.d.m0.k.z.a r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final d0.e0.p.d.m0.c.h1.e f2643s;
+    public final d0.e0.p.d.m0.c.h1.e f2649s;
     public final h t;
 
     /* JADX DEBUG: Multi-variable search result rejected for r21v0, resolved type: d0.e0.p.d.m0.l.b.c<? extends d0.e0.p.d.m0.c.g1.c, ? extends d0.e0.p.d.m0.k.v.g<?>> */
@@ -70,7 +70,7 @@ public final class j {
         m.checkNotNullParameter(eVar2, "platformDependentTypeTransformer");
         this.a = oVar;
         this.b = c0Var;
-        this.f2642c = kVar;
+        this.f2648c = kVar;
         this.d = gVar;
         this.e = cVar;
         this.f = f0Var;
@@ -86,7 +86,7 @@ public final class j {
         this.p = eVar;
         this.q = lVar;
         this.r = aVar2;
-        this.f2643s = eVar2;
+        this.f2649s = eVar2;
         this.t = new h(this);
     }
 
@@ -126,7 +126,7 @@ public final class j {
     }
 
     public final k getConfiguration() {
-        return this.f2642c;
+        return this.f2648c;
     }
 
     public final i getContractDeserializer() {
@@ -178,7 +178,7 @@ public final class j {
     }
 
     public final d0.e0.p.d.m0.c.h1.e getPlatformDependentTypeTransformer() {
-        return this.f2643s;
+        return this.f2649s;
     }
 
     public final o getStorageManager() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/l.java b/app/src/main/java/d0/e0/p/d/m0/l/b/l.java
index 24bceb7bd9..78cb9179b1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/l.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/l.java
@@ -16,7 +16,7 @@ public final class l {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final m f2644c;
+    public final m f2650c;
     public final g d;
     public final i e;
     public final a f;
@@ -35,7 +35,7 @@ public final class l {
         d0.z.d.m.checkNotNullParameter(list, "typeParameters");
         this.a = jVar;
         this.b = cVar;
-        this.f2644c = mVar;
+        this.f2650c = mVar;
         this.d = gVar;
         this.e = iVar;
         this.f = aVar;
@@ -87,7 +87,7 @@ public final class l {
     }
 
     public final m getContainingDeclaration() {
-        return this.f2644c;
+        return this.f2650c;
     }
 
     public final u getMemberDeserializer() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/o.java b/app/src/main/java/d0/e0/p/d/m0/l/b/o.java
index eff9bc5067..cf9cc61a04 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/o.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/o.java
@@ -21,7 +21,7 @@ public abstract class o extends n {
     public final x r;
 
     /* renamed from: s  reason: collision with root package name */
-    public m f2645s;
+    public m f2651s;
     public i t;
 
     /* compiled from: DeserializedPackageFragmentImpl.kt */
@@ -93,7 +93,7 @@ public abstract class o extends n {
         d dVar = new d(strings, qualifiedNames);
         this.q = dVar;
         this.r = new x(mVar, dVar, aVar, new a(this));
-        this.f2645s = mVar;
+        this.f2651s = mVar;
     }
 
     public static final /* synthetic */ f access$getContainerSource$p(o oVar) {
@@ -117,9 +117,9 @@ public abstract class o extends n {
 
     public void initialize(j jVar) {
         d0.z.d.m.checkNotNullParameter(jVar, "components");
-        m mVar = this.f2645s;
+        m mVar = this.f2651s;
         if (mVar != null) {
-            this.f2645s = null;
+            this.f2651s = null;
             l lVar = mVar.getPackage();
             d0.z.d.m.checkNotNullExpressionValue(lVar, "proto.`package`");
             this.t = new d0.e0.p.d.m0.l.b.e0.i(this, lVar, this.q, this.o, this.p, jVar, new b(this));
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/r.java b/app/src/main/java/d0/e0/p/d/m0/l/b/r.java
index bc0cad663c..ac2f81319b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/r.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/r.java
@@ -8,7 +8,7 @@ public final class r<T> {
     public final T b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2646c;
+    public final String f2652c;
     public final a d;
 
     public r(T t, T t2, String str, a aVar) {
@@ -16,7 +16,7 @@ public final class r<T> {
         m.checkNotNullParameter(aVar, "classId");
         this.a = t;
         this.b = t2;
-        this.f2646c = str;
+        this.f2652c = str;
         this.d = aVar;
     }
 
@@ -28,7 +28,7 @@ public final class r<T> {
             return false;
         }
         r rVar = (r) obj;
-        return m.areEqual(this.a, rVar.a) && m.areEqual(this.b, rVar.b) && m.areEqual(this.f2646c, rVar.f2646c) && m.areEqual(this.d, rVar.d);
+        return m.areEqual(this.a, rVar.a) && m.areEqual(this.b, rVar.b) && m.areEqual(this.f2652c, rVar.f2652c) && m.areEqual(this.d, rVar.d);
     }
 
     public int hashCode() {
@@ -39,7 +39,7 @@ public final class r<T> {
         if (t2 != null) {
             i = t2.hashCode();
         }
-        return this.d.hashCode() + c.d.b.a.a.x(this.f2646c, (hashCode + i) * 31, 31);
+        return this.d.hashCode() + c.d.b.a.a.x(this.f2652c, (hashCode + i) * 31, 31);
     }
 
     public String toString() {
@@ -48,7 +48,7 @@ public final class r<T> {
         L.append(", expectedVersion=");
         L.append((Object) this.b);
         L.append(", filePath=");
-        L.append(this.f2646c);
+        L.append(this.f2652c);
         L.append(", classId=");
         L.append(this.d);
         L.append(')');
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/u.java b/app/src/main/java/d0/e0/p/d/m0/l/b/u.java
index f1a2238cdf..a31f204a9b 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/u.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/u.java
@@ -426,7 +426,7 @@ public final class u {
         u memberDeserializer = l.childContext$default(this.a, cVar2, d0.t.n.emptyList(), null, null, null, null, 60, null).getMemberDeserializer();
         List<d0.e0.p.d.m0.f.u> valueParameterList = dVar.getValueParameterList();
         m.checkNotNullExpressionValue(valueParameterList, "proto.valueParameterList");
-        cVar2.initialize(memberDeserializer.h(valueParameterList, dVar, bVar), a0.descriptorVisibility(z.a, d0.e0.p.d.m0.f.z.b.f2578c.get(dVar.getFlags())));
+        cVar2.initialize(memberDeserializer.h(valueParameterList, dVar, bVar), a0.descriptorVisibility(z.a, d0.e0.p.d.m0.f.z.b.f2584c.get(dVar.getFlags())));
         cVar2.setReturnType(eVar.getDefaultType());
         boolean z3 = true;
         cVar2.setHasStableParameterNames(!d0.e0.p.d.m0.f.z.b.m.get(dVar.getFlags()).booleanValue());
@@ -487,7 +487,7 @@ public final class u {
         List<c1> h = memberDeserializer.h(valueParameterList, iVar, bVar);
         c0 type2 = childContext$default.getTypeDeserializer().type(f.returnType(iVar, this.a.getTypeTable()));
         z modality = zVar.modality(d0.e0.p.d.m0.f.z.b.d.get(i));
-        d0.e0.p.d.m0.c.u descriptorVisibility = a0.descriptorVisibility(zVar, d0.e0.p.d.m0.f.z.b.f2578c.get(i));
+        d0.e0.p.d.m0.c.u descriptorVisibility = a0.descriptorVisibility(zVar, d0.e0.p.d.m0.f.z.b.f2584c.get(i));
         Map<? extends a.AbstractC0209a<?>, ?> emptyMap = h0.emptyMap();
         b.C0253b bVar2 = d0.e0.p.d.m0.f.z.b.t;
         kVar.initialize(createExtensionReceiverParameterForCallable, f, ownTypeParameters, h, type2, modality, descriptorVisibility, emptyMap, c(kVar, createExtensionReceiverParameterForCallable, h, ownTypeParameters, type2, c.d.b.a.a.m0(bVar2, i, "IS_SUSPEND.get(flags)")));
@@ -497,7 +497,7 @@ public final class u {
         Boolean bool2 = d0.e0.p.d.m0.f.z.b.p.get(i);
         m.checkNotNullExpressionValue(bool2, "IS_INFIX.get(flags)");
         kVar.setInfix(bool2.booleanValue());
-        Boolean bool3 = d0.e0.p.d.m0.f.z.b.f2579s.get(i);
+        Boolean bool3 = d0.e0.p.d.m0.f.z.b.f2585s.get(i);
         m.checkNotNullExpressionValue(bool3, "IS_EXTERNAL_FUNCTION.get(flags)");
         kVar.setExternal(bool3.booleanValue());
         Boolean bool4 = d0.e0.p.d.m0.f.z.b.q.get(i);
@@ -545,13 +545,13 @@ public final class u {
         z zVar2 = z.a;
         b.d<d0.e0.p.d.m0.f.k> dVar = d0.e0.p.d.m0.f.z.b.d;
         z modality = zVar2.modality(dVar.get(i));
-        b.d<d0.e0.p.d.m0.f.x> dVar2 = d0.e0.p.d.m0.f.z.b.f2578c;
-        j jVar2 = new j(containingDeclaration, null, e2, modality, a0.descriptorVisibility(zVar2, dVar2.get(i)), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.w, i, "IS_VAR.get(flags)"), w.getName(this.a.getNameResolver(), nVar.getName()), a0.memberKind(zVar2, d0.e0.p.d.m0.f.z.b.n.get(i)), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.A, i, "IS_LATEINIT.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.f2582z, i, "IS_CONST.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.C, i, "IS_EXTERNAL_PROPERTY.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.D, i, "IS_DELEGATED.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.E, i, "IS_EXPECT_PROPERTY.get(flags)"), nVar, this.a.getNameResolver(), this.a.getTypeTable(), this.a.getVersionRequirementTable(), this.a.getContainerSource());
+        b.d<d0.e0.p.d.m0.f.x> dVar2 = d0.e0.p.d.m0.f.z.b.f2584c;
+        j jVar2 = new j(containingDeclaration, null, e2, modality, a0.descriptorVisibility(zVar2, dVar2.get(i)), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.w, i, "IS_VAR.get(flags)"), w.getName(this.a.getNameResolver(), nVar.getName()), a0.memberKind(zVar2, d0.e0.p.d.m0.f.z.b.n.get(i)), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.A, i, "IS_LATEINIT.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.f2588z, i, "IS_CONST.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.C, i, "IS_EXTERNAL_PROPERTY.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.D, i, "IS_DELEGATED.get(flags)"), c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.E, i, "IS_EXPECT_PROPERTY.get(flags)"), nVar, this.a.getNameResolver(), this.a.getTypeTable(), this.a.getVersionRequirementTable(), this.a.getContainerSource());
         l lVar = this.a;
         List<s> typeParameterList = nVar.getTypeParameterList();
         m.checkNotNullExpressionValue(typeParameterList, "proto.typeParameterList");
         l childContext$default = l.childContext$default(lVar, jVar2, typeParameterList, null, null, null, null, 60, null);
-        boolean m0 = c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.f2580x, i, "HAS_GETTER.get(flags)");
+        boolean m0 = c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.f2586x, i, "HAS_GETTER.get(flags)");
         if (!m0 || !f.hasReceiver(nVar)) {
             nVar2 = nVar;
             bVar = bVar2;
@@ -594,7 +594,7 @@ public final class u {
             zVar = zVar2;
             d0Var = null;
         }
-        if (c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.f2581y, i, "HAS_SETTER.get(flags)")) {
+        if (c.d.b.a.a.m0(d0.e0.p.d.m0.f.z.b.f2587y, i, "HAS_SETTER.get(flags)")) {
             if (nVar.hasSetterFlags()) {
                 accessorFlags = nVar.getSetterFlags();
             }
@@ -633,7 +633,7 @@ public final class u {
             m.checkNotNullExpressionValue(bVar, "it");
             arrayList.add(eVar.deserializeAnnotation(bVar, this.a.getNameResolver()));
         }
-        l lVar = new l(this.a.getStorageManager(), this.a.getContainingDeclaration(), aVar.create(arrayList), w.getName(this.a.getNameResolver(), rVar.getName()), a0.descriptorVisibility(z.a, d0.e0.p.d.m0.f.z.b.f2578c.get(rVar.getFlags())), rVar, this.a.getNameResolver(), this.a.getTypeTable(), this.a.getVersionRequirementTable(), this.a.getContainerSource());
+        l lVar = new l(this.a.getStorageManager(), this.a.getContainingDeclaration(), aVar.create(arrayList), w.getName(this.a.getNameResolver(), rVar.getName()), a0.descriptorVisibility(z.a, d0.e0.p.d.m0.f.z.b.f2584c.get(rVar.getFlags())), rVar, this.a.getNameResolver(), this.a.getTypeTable(), this.a.getVersionRequirementTable(), this.a.getContainerSource());
         l lVar2 = this.a;
         List<s> typeParameterList = rVar.getTypeParameterList();
         m.checkNotNullExpressionValue(typeParameterList, "proto.typeParameterList");
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/x.java b/app/src/main/java/d0/e0/p/d/m0/l/b/x.java
index 7fbd23e1d4..843341b95a 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/x.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/x.java
@@ -18,7 +18,7 @@ public final class x implements g {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<d0.e0.p.d.m0.g.a, u0> f2647c;
+    public final Function1<d0.e0.p.d.m0.g.a, u0> f2653c;
     public final Map<d0.e0.p.d.m0.g.a, d0.e0.p.d.m0.f.c> d;
 
     /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: kotlin.jvm.functions.Function1<? super d0.e0.p.d.m0.g.a, ? extends d0.e0.p.d.m0.c.u0> */
@@ -30,7 +30,7 @@ public final class x implements g {
         d0.z.d.m.checkNotNullParameter(function1, "classSource");
         this.a = cVar;
         this.b = aVar;
-        this.f2647c = function1;
+        this.f2653c = function1;
         List<d0.e0.p.d.m0.f.c> class_List = mVar.getClass_List();
         d0.z.d.m.checkNotNullExpressionValue(class_List, "proto.class_List");
         LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(class_List, 10)), 16));
@@ -47,7 +47,7 @@ public final class x implements g {
         if (cVar == null) {
             return null;
         }
-        return new f(this.a, cVar, this.b, this.f2647c.invoke(aVar));
+        return new f(this.a, cVar, this.b, this.f2653c.invoke(aVar));
     }
 
     public final Collection<d0.e0.p.d.m0.g.a> getAllClassIds() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/y.java b/app/src/main/java/d0/e0/p/d/m0/l/b/y.java
index 3b9e868d1f..379b0103e4 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/y.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/y.java
@@ -12,7 +12,7 @@ public abstract class y {
     public final g b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final u0 f2648c;
+    public final u0 f2654c;
 
     /* compiled from: ProtoContainer.kt */
     public static final class a extends y {
@@ -88,7 +88,7 @@ public abstract class y {
     public y(d0.e0.p.d.m0.f.z.c cVar, g gVar, u0 u0Var, DefaultConstructorMarker defaultConstructorMarker) {
         this.a = cVar;
         this.b = gVar;
-        this.f2648c = u0Var;
+        this.f2654c = u0Var;
     }
 
     public abstract d0.e0.p.d.m0.g.b debugFqName();
@@ -98,7 +98,7 @@ public abstract class y {
     }
 
     public final u0 getSource() {
-        return this.f2648c;
+        return this.f2654c;
     }
 
     public final g getTypeTable() {
diff --git a/app/src/main/java/d0/e0/p/d/m0/l/b/z.java b/app/src/main/java/d0/e0/p/d/m0/l/b/z.java
index cf5f01d8f0..3be1accc3d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/l/b/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/l/b/z.java
@@ -19,7 +19,7 @@ public final class z {
         public static final /* synthetic */ int[] b = {1, 2, 3, 4, 5, 6, 7};
 
         /* renamed from: c  reason: collision with root package name */
-        public static final /* synthetic */ int[] f2649c = {1, 2, 3};
+        public static final /* synthetic */ int[] f2655c = {1, 2, 3};
         public static final /* synthetic */ int[] d = {1, 2, 3, 4};
 
         static {
diff --git a/app/src/main/java/d0/e0/p/d/m0/m/c.java b/app/src/main/java/d0/e0/p/d/m0/m/c.java
index c7d8035555..8005c8c592 100644
--- a/app/src/main/java/d0/e0/p/d/m0/m/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/m/c.java
@@ -10,7 +10,7 @@ import kotlin.jvm.functions.Function1;
 public final class c extends d {
 
     /* renamed from: c  reason: collision with root package name */
-    public final Runnable f2650c;
+    public final Runnable f2656c;
     public final Function1<InterruptedException, Unit> d;
 
     /* JADX INFO: this call moved to the top of the method (can break code semantics) */
@@ -28,7 +28,7 @@ public final class c extends d {
         m.checkNotNullParameter(lock, "lock");
         m.checkNotNullParameter(runnable, "checkCancelled");
         m.checkNotNullParameter(function1, "interruptedExceptionHandler");
-        this.f2650c = runnable;
+        this.f2656c = runnable;
         this.d = function1;
     }
 
@@ -36,7 +36,7 @@ public final class c extends d {
     public void lock() {
         while (!this.b.tryLock(50, TimeUnit.MILLISECONDS)) {
             try {
-                this.f2650c.run();
+                this.f2656c.run();
             } catch (InterruptedException e) {
                 this.d.invoke(e);
                 return;
diff --git a/app/src/main/java/d0/e0/p/d/m0/m/f.java b/app/src/main/java/d0/e0/p/d/m0/m/f.java
index e03c1792ce..fbaabb69a1 100644
--- a/app/src/main/java/d0/e0/p/d/m0/m/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/m/f.java
@@ -16,7 +16,7 @@ public class f implements o {
     public static final o b = new a("NO_LOCKS", AbstractC0276f.a, e.b);
 
     /* renamed from: c  reason: collision with root package name */
-    public final l f2651c;
+    public final l f2657c;
     public final AbstractC0276f d;
     public final String e;
 
@@ -337,7 +337,7 @@ public class f implements o {
             if (!(obj instanceof n)) {
                 return (T) WrappedValues.unescapeThrowable(obj);
             }
-            this.i.f2651c.lock();
+            this.i.f2657c.lock();
             try {
                 Object obj2 = this.k;
                 if (!(obj2 instanceof n)) {
@@ -374,7 +374,7 @@ public class f implements o {
                 }
                 return t;
             } finally {
-                this.i.f2651c.unlock();
+                this.i.f2657c.unlock();
             }
         }
 
@@ -609,7 +609,7 @@ public class f implements o {
             if (obj != null && obj != nVar2) {
                 return (V) WrappedValues.unescapeExceptionOrNull(obj);
             }
-            this.i.f2651c.lock();
+            this.i.f2657c.lock();
             try {
                 Object obj2 = this.j.get(k);
                 if (obj2 == nVar2) {
@@ -643,7 +643,7 @@ public class f implements o {
                     V v2 = (V) this.k.invoke(k);
                     Object put = this.j.put(k, WrappedValues.escapeNull(v2));
                     if (put == nVar2) {
-                        this.i.f2651c.unlock();
+                        this.i.f2657c.unlock();
                         return v2;
                     }
                     throw b(k, put);
@@ -662,7 +662,7 @@ public class f implements o {
                     }
                 }
             } finally {
-                this.i.f2651c.unlock();
+                this.i.f2657c.unlock();
             }
         }
     }
@@ -773,7 +773,7 @@ public class f implements o {
             a(5);
             throw null;
         } else if (lVar != null) {
-            this.f2651c = lVar;
+            this.f2657c = lVar;
             this.d = fVar;
             this.e = str;
         } else {
@@ -998,13 +998,13 @@ public class f implements o {
     @Override // d0.e0.p.d.m0.m.o
     public <T> T compute(Function0<? extends T> function0) {
         if (function0 != null) {
-            this.f2651c.lock();
+            this.f2657c.lock();
             try {
                 T t = (T) function0.mo1invoke();
-                this.f2651c.unlock();
+                this.f2657c.unlock();
                 return t;
             } catch (Throwable th) {
-                this.f2651c.unlock();
+                this.f2657c.unlock();
                 throw th;
             }
         } else {
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/a0.java b/app/src/main/java/d0/e0/p/d/m0/n/a0.java
index 2227ec8a2f..f2a8decbff 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/a0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/a0.java
@@ -19,7 +19,7 @@ public final class a0 implements u0, g {
     public final LinkedHashSet<c0> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2652c;
+    public final int f2658c;
 
     /* compiled from: IntersectionTypeConstructor.kt */
     public static final class a extends o implements Function1<d0.e0.p.d.m0.n.l1.g, j0> {
@@ -42,7 +42,7 @@ public final class a0 implements u0, g {
         collection.isEmpty();
         LinkedHashSet<c0> linkedHashSet = new LinkedHashSet<>(collection);
         this.b = linkedHashSet;
-        this.f2652c = linkedHashSet.hashCode();
+        this.f2658c = linkedHashSet.hashCode();
     }
 
     public final i createScopeForKotlinType() {
@@ -91,7 +91,7 @@ public final class a0 implements u0, g {
     }
 
     public int hashCode() {
-        return this.f2652c;
+        return this.f2658c;
     }
 
     @Override // d0.e0.p.d.m0.n.u0
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/e1.java b/app/src/main/java/d0/e0/p/d/m0/n/e1.java
index 8d5b4fc88c..bcc2c8db7e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/e1.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/e1.java
@@ -17,7 +17,7 @@ public class e1 {
     public static final j0 b = t.createErrorType("Cannot be inferred");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final j0 f2653c = new a("NO_EXPECTED_TYPE");
+    public static final j0 f2659c = new a("NO_EXPECTED_TYPE");
     public static final j0 d = new a("UNIT_EXPECTED_TYPE");
 
     /* compiled from: TypeUtils */
@@ -836,7 +836,7 @@ public class e1 {
 
     public static boolean noExpectedType(c0 c0Var) {
         if (c0Var != null) {
-            return c0Var == f2653c || c0Var == d;
+            return c0Var == f2659c || c0Var == d;
         }
         a(0);
         throw null;
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/f.java b/app/src/main/java/d0/e0/p/d/m0/n/f.java
index 48b372b8e1..1e45067d4c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/f.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/f.java
@@ -18,7 +18,7 @@ public abstract class f implements n {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public ArrayDeque<i> f2654c;
+    public ArrayDeque<i> f2660c;
     public Set<i> d;
 
     /* compiled from: AbstractTypeChecker.kt */
@@ -118,7 +118,7 @@ public abstract class f implements n {
     }
 
     public final void clear() {
-        ArrayDeque<i> arrayDeque = this.f2654c;
+        ArrayDeque<i> arrayDeque = this.f2660c;
         m.checkNotNull(arrayDeque);
         arrayDeque.clear();
         Set<i> set = this.d;
@@ -152,7 +152,7 @@ public abstract class f implements n {
     }
 
     public final ArrayDeque<i> getSupertypesDeque() {
-        return this.f2654c;
+        return this.f2660c;
     }
 
     public final Set<i> getSupertypesSet() {
@@ -165,8 +165,8 @@ public abstract class f implements n {
 
     public final void initialize() {
         this.b = true;
-        if (this.f2654c == null) {
-            this.f2654c = new ArrayDeque<>(4);
+        if (this.f2660c == null) {
+            this.f2660c = new ArrayDeque<>(4);
         }
         if (this.d == null) {
             this.d = d0.e0.p.d.m0.p.j.i.create();
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/g.java b/app/src/main/java/d0/e0/p/d/m0/n/g.java
index 8db9161733..096c8bc6c8 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/g.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/g.java
@@ -26,7 +26,7 @@ public abstract class g implements u0 {
         public final Lazy b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ g f2655c;
+        public final /* synthetic */ g f2661c;
 
         /* compiled from: AbstractTypeConstructor.kt */
         /* renamed from: d0.e0.p.d.m0.n.g$a$a  reason: collision with other inner class name */
@@ -52,7 +52,7 @@ public abstract class g implements u0 {
         public a(g gVar, d0.e0.p.d.m0.n.l1.g gVar2) {
             m.checkNotNullParameter(gVar, "this$0");
             m.checkNotNullParameter(gVar2, "kotlinTypeRefiner");
-            this.f2655c = gVar;
+            this.f2661c = gVar;
             this.a = gVar2;
             this.b = d0.g.lazy(i.PUBLICATION, new C0278a(this, gVar));
         }
@@ -62,24 +62,24 @@ public abstract class g implements u0 {
         }
 
         public boolean equals(Object obj) {
-            return this.f2655c.equals(obj);
+            return this.f2661c.equals(obj);
         }
 
         @Override // d0.e0.p.d.m0.n.u0
         public d0.e0.p.d.m0.b.h getBuiltIns() {
-            d0.e0.p.d.m0.b.h builtIns = this.f2655c.getBuiltIns();
+            d0.e0.p.d.m0.b.h builtIns = this.f2661c.getBuiltIns();
             m.checkNotNullExpressionValue(builtIns, "this@AbstractTypeConstructor.builtIns");
             return builtIns;
         }
 
         @Override // d0.e0.p.d.m0.n.u0
         public d0.e0.p.d.m0.c.h getDeclarationDescriptor() {
-            return this.f2655c.getDeclarationDescriptor();
+            return this.f2661c.getDeclarationDescriptor();
         }
 
         @Override // d0.e0.p.d.m0.n.u0
         public List<z0> getParameters() {
-            List<z0> parameters = this.f2655c.getParameters();
+            List<z0> parameters = this.f2661c.getParameters();
             m.checkNotNullExpressionValue(parameters, "this@AbstractTypeConstructor.parameters");
             return parameters;
         }
@@ -90,29 +90,29 @@ public abstract class g implements u0 {
         }
 
         public int hashCode() {
-            return this.f2655c.hashCode();
+            return this.f2661c.hashCode();
         }
 
         @Override // d0.e0.p.d.m0.n.u0
         public boolean isDenotable() {
-            return this.f2655c.isDenotable();
+            return this.f2661c.isDenotable();
         }
 
         @Override // d0.e0.p.d.m0.n.u0
         public u0 refine(d0.e0.p.d.m0.n.l1.g gVar) {
             m.checkNotNullParameter(gVar, "kotlinTypeRefiner");
-            return this.f2655c.refine(gVar);
+            return this.f2661c.refine(gVar);
         }
 
         public String toString() {
-            return this.f2655c.toString();
+            return this.f2661c.toString();
         }
     }
 
     /* compiled from: AbstractTypeConstructor.kt */
     public static final class b {
         public final Collection<c0> a;
-        public List<? extends c0> b = d0.t.m.listOf(t.f2664c);
+        public List<? extends c0> b = d0.t.m.listOf(t.f2670c);
 
         /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.Collection<? extends d0.e0.p.d.m0.n.c0> */
         /* JADX WARN: Multi-variable type inference failed */
@@ -162,7 +162,7 @@ public abstract class g implements u0 {
         }
 
         public final b invoke(boolean z2) {
-            return new b(d0.t.m.listOf(t.f2664c));
+            return new b(d0.t.m.listOf(t.f2670c));
         }
 
         /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/i.java b/app/src/main/java/d0/e0/p/d/m0/n/i.java
index 01552c79bd..24559de264 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/i.java
@@ -12,7 +12,7 @@ import java.util.List;
 public class i extends b implements u0 {
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f2656c;
+    public final e f2662c;
     public final List<z0> d;
     public final Collection<c0> e;
 
@@ -29,7 +29,7 @@ public class i extends b implements u0 {
             g(2);
             throw null;
         } else if (oVar != null) {
-            this.f2656c = eVar;
+            this.f2662c = eVar;
             this.d = Collections.unmodifiableList(new ArrayList(list));
             this.e = Collections.unmodifiableCollection(collection);
         } else {
@@ -99,7 +99,7 @@ public class i extends b implements u0 {
 
     @Override // d0.e0.p.d.m0.n.b, d0.e0.p.d.m0.n.g, d0.e0.p.d.m0.n.u0
     public e getDeclarationDescriptor() {
-        e eVar = this.f2656c;
+        e eVar = this.f2662c;
         if (eVar != null) {
             return eVar;
         }
@@ -123,6 +123,6 @@ public class i extends b implements u0 {
     }
 
     public String toString() {
-        return d0.e0.p.d.m0.k.e.getFqName(this.f2656c).asString();
+        return d0.e0.p.d.m0.k.e.getFqName(this.f2662c).asString();
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/j0.java b/app/src/main/java/d0/e0/p/d/m0/n/j0.java
index fb21b76ec6..1e63376022 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/j0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/j0.java
@@ -24,7 +24,7 @@ public abstract class j0 extends i1 implements i, j {
         StringBuilder sb = new StringBuilder();
         Iterator<c> it = getAnnotations().iterator();
         while (it.hasNext()) {
-            q.append(sb, "[", d0.e0.p.d.m0.j.c.renderAnnotation$default(d0.e0.p.d.m0.j.c.f2599c, it.next(), null, 2, null), "] ");
+            q.append(sb, "[", d0.e0.p.d.m0.j.c.renderAnnotation$default(d0.e0.p.d.m0.j.c.f2605c, it.next(), null, 2, null), "] ");
         }
         sb.append(getConstructor());
         if (!getArguments().isEmpty()) {
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/l1/c.java b/app/src/main/java/d0/e0/p/d/m0/n/l1/c.java
index 058f345c2d..6988054d57 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/l1/c.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/l1/c.java
@@ -419,7 +419,7 @@ public interface c extends d1, p {
             m.checkNotNullParameter(cVar, "this");
             m.checkNotNullParameter(lVar, "receiver");
             if (lVar instanceof u0) {
-                return d0.e0.p.d.m0.b.h.isTypeConstructorForGivenClass((u0) lVar, k.a.f2417c);
+                return d0.e0.p.d.m0.b.h.isTypeConstructorForGivenClass((u0) lVar, k.a.f2423c);
             }
             throw new IllegalArgumentException(("ClassicTypeSystemContext couldn't handle: " + lVar + ", " + a0.getOrCreateKotlinClass(lVar.getClass())).toString());
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/l1/j.java b/app/src/main/java/d0/e0/p/d/m0/n/l1/j.java
index d7ca141bbd..28a1afd23f 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/l1/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/l1/j.java
@@ -22,7 +22,7 @@ public final class j implements d0.e0.p.d.m0.k.u.a.b {
     public Function0<? extends List<? extends i1>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final j f2657c;
+    public final j f2663c;
     public final z0 d;
     public final Lazy e;
 
@@ -130,7 +130,7 @@ public final class j implements d0.e0.p.d.m0.k.u.a.b {
         m.checkNotNullParameter(w0Var, "projection");
         this.a = w0Var;
         this.b = function0;
-        this.f2657c = jVar;
+        this.f2663c = jVar;
         this.d = z0Var;
         this.e = g.lazy(i.PUBLICATION, new b(this));
     }
@@ -153,11 +153,11 @@ public final class j implements d0.e0.p.d.m0.k.u.a.b {
         }
         Objects.requireNonNull(obj, "null cannot be cast to non-null type org.jetbrains.kotlin.types.checker.NewCapturedTypeConstructor");
         j jVar = (j) obj;
-        j jVar2 = this.f2657c;
+        j jVar2 = this.f2663c;
         if (jVar2 == null) {
             jVar2 = this;
         }
-        j jVar3 = jVar.f2657c;
+        j jVar3 = jVar.f2663c;
         if (jVar3 != null) {
             jVar = jVar3;
         }
@@ -193,7 +193,7 @@ public final class j implements d0.e0.p.d.m0.k.u.a.b {
     }
 
     public int hashCode() {
-        j jVar = this.f2657c;
+        j jVar = this.f2663c;
         return jVar == null ? super.hashCode() : jVar.hashCode();
     }
 
@@ -214,7 +214,7 @@ public final class j implements d0.e0.p.d.m0.k.u.a.b {
         w0 refine = getProjection().refine(gVar);
         m.checkNotNullExpressionValue(refine, "projection.refine(kotlinTypeRefiner)");
         d dVar = this.b == null ? null : new d(this, gVar);
-        j jVar = this.f2657c;
+        j jVar = this.f2663c;
         if (jVar == null) {
             jVar = this;
         }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/l1/m.java b/app/src/main/java/d0/e0/p/d/m0/n/l1/m.java
index 4429f08b50..e17f7bed13 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/l1/m.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/l1/m.java
@@ -26,12 +26,12 @@ import kotlin.NoWhenBranchMatchedException;
 public final class m implements l {
 
     /* renamed from: c  reason: collision with root package name */
-    public final g f2658c;
+    public final g f2664c;
     public final k d;
 
     public m(g gVar) {
         d0.z.d.m.checkNotNullParameter(gVar, "kotlinTypeRefiner");
-        this.f2658c = gVar;
+        this.f2664c = gVar;
         k createWithTypeRefiner = k.createWithTypeRefiner(getKotlinTypeRefiner());
         d0.z.d.m.checkNotNullExpressionValue(createWithTypeRefiner, "createWithTypeRefiner(kotlinTypeRefiner)");
         this.d = createWithTypeRefiner;
@@ -53,7 +53,7 @@ public final class m implements l {
 
     @Override // d0.e0.p.d.m0.n.l1.l
     public g getKotlinTypeRefiner() {
-        return this.f2658c;
+        return this.f2664c;
     }
 
     @Override // d0.e0.p.d.m0.n.l1.l
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/p.java b/app/src/main/java/d0/e0/p/d/m0/n/p.java
index a91be78eca..71b781eec2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/p.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/p.java
@@ -8,7 +8,7 @@ public final class p extends z0 {
     public static final a b = new a(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final z0 f2659c;
+    public final z0 f2665c;
     public final z0 d;
 
     /* compiled from: DisjointKeysUnionTypeSubstitution.kt */
@@ -24,7 +24,7 @@ public final class p extends z0 {
     }
 
     public p(z0 z0Var, z0 z0Var2, DefaultConstructorMarker defaultConstructorMarker) {
-        this.f2659c = z0Var;
+        this.f2665c = z0Var;
         this.d = z0Var2;
     }
 
@@ -34,24 +34,24 @@ public final class p extends z0 {
 
     @Override // d0.e0.p.d.m0.n.z0
     public boolean approximateCapturedTypes() {
-        return this.f2659c.approximateCapturedTypes() || this.d.approximateCapturedTypes();
+        return this.f2665c.approximateCapturedTypes() || this.d.approximateCapturedTypes();
     }
 
     @Override // d0.e0.p.d.m0.n.z0
     public boolean approximateContravariantCapturedTypes() {
-        return this.f2659c.approximateContravariantCapturedTypes() || this.d.approximateContravariantCapturedTypes();
+        return this.f2665c.approximateContravariantCapturedTypes() || this.d.approximateContravariantCapturedTypes();
     }
 
     @Override // d0.e0.p.d.m0.n.z0
     public g filterAnnotations(g gVar) {
         m.checkNotNullParameter(gVar, "annotations");
-        return this.d.filterAnnotations(this.f2659c.filterAnnotations(gVar));
+        return this.d.filterAnnotations(this.f2665c.filterAnnotations(gVar));
     }
 
     @Override // d0.e0.p.d.m0.n.z0
     public w0 get(c0 c0Var) {
         m.checkNotNullParameter(c0Var, "key");
-        w0 w0Var = this.f2659c.get(c0Var);
+        w0 w0Var = this.f2665c.get(c0Var);
         return w0Var == null ? this.d.get(c0Var) : w0Var;
     }
 
@@ -64,6 +64,6 @@ public final class p extends z0 {
     public c0 prepareTopLevelType(c0 c0Var, j1 j1Var) {
         m.checkNotNullParameter(c0Var, "topLevelType");
         m.checkNotNullParameter(j1Var, "position");
-        return this.d.prepareTopLevelType(this.f2659c.prepareTopLevelType(c0Var, j1Var), j1Var);
+        return this.d.prepareTopLevelType(this.f2665c.prepareTopLevelType(c0Var, j1Var), j1Var);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/p0.java b/app/src/main/java/d0/e0/p/d/m0/n/p0.java
index 8ef77d3786..b5bd3b27a0 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/p0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/p0.java
@@ -16,18 +16,18 @@ public final class p0 {
     public static final class a extends v0 {
 
         /* renamed from: c  reason: collision with root package name */
-        public final /* synthetic */ List<u0> f2660c;
+        public final /* synthetic */ List<u0> f2666c;
 
         /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: java.util.List<? extends d0.e0.p.d.m0.n.u0> */
         /* JADX WARN: Multi-variable type inference failed */
         public a(List<? extends u0> list) {
-            this.f2660c = list;
+            this.f2666c = list;
         }
 
         @Override // d0.e0.p.d.m0.n.v0
         public w0 get(u0 u0Var) {
             m.checkNotNullParameter(u0Var, "key");
-            if (!this.f2660c.contains(u0Var)) {
+            if (!this.f2666c.contains(u0Var)) {
                 return null;
             }
             h declarationDescriptor = u0Var.getDeclarationDescriptor();
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/p1/d.java b/app/src/main/java/d0/e0/p/d/m0/n/p1/d.java
index 5c4897d05b..ec39ffde5d 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/p1/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/p1/d.java
@@ -10,7 +10,7 @@ public final class d {
     public final c0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c0 f2661c;
+    public final c0 f2667c;
 
     public d(z0 z0Var, c0 c0Var, c0 c0Var2) {
         m.checkNotNullParameter(z0Var, "typeParameter");
@@ -18,7 +18,7 @@ public final class d {
         m.checkNotNullParameter(c0Var2, "outProjection");
         this.a = z0Var;
         this.b = c0Var;
-        this.f2661c = c0Var2;
+        this.f2667c = c0Var2;
     }
 
     public final c0 getInProjection() {
@@ -26,7 +26,7 @@ public final class d {
     }
 
     public final c0 getOutProjection() {
-        return this.f2661c;
+        return this.f2667c;
     }
 
     public final z0 getTypeParameter() {
@@ -34,6 +34,6 @@ public final class d {
     }
 
     public final boolean isConsistent() {
-        return f.a.isSubtypeOf(this.b, this.f2661c);
+        return f.a.isSubtypeOf(this.b, this.f2667c);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/q0.java b/app/src/main/java/d0/e0/p/d/m0/n/q0.java
index 2d61a30223..75a0b99369 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/q0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/q0.java
@@ -24,7 +24,7 @@ public final class q0 {
     public final s0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2662c;
+    public final boolean f2668c;
 
     /* compiled from: TypeAliasExpander.kt */
     public static final class a {
@@ -61,7 +61,7 @@ public final class q0 {
     public q0(s0 s0Var, boolean z2) {
         m.checkNotNullParameter(s0Var, "reportStrategy");
         this.b = s0Var;
-        this.f2662c = z2;
+        this.f2668c = z2;
     }
 
     public final void a(g gVar, g gVar2) {
@@ -176,7 +176,7 @@ public final class q0 {
                     if (!d0.e0.p.d.m0.n.o1.a.containsTypeAliasParameters(type2)) {
                         w0 w0Var4 = asSimpleType.getArguments().get(i2);
                         z0 z0Var2 = asSimpleType.getConstructor().getParameters().get(i2);
-                        if (this.f2662c) {
+                        if (this.f2668c) {
                             a aVar = a;
                             s0 s0Var = this.b;
                             c0 type3 = w0Var4.getType();
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/r0.java b/app/src/main/java/d0/e0/p/d/m0/n/r0.java
index 10769905c6..07264f6b6e 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/r0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/r0.java
@@ -17,7 +17,7 @@ public final class r0 {
     public final r0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final y0 f2663c;
+    public final y0 f2669c;
     public final List<w0> d;
     public final Map<z0, w0> e;
 
@@ -41,7 +41,7 @@ public final class r0 {
 
     public r0(r0 r0Var, y0 y0Var, List list, Map map, DefaultConstructorMarker defaultConstructorMarker) {
         this.b = r0Var;
-        this.f2663c = y0Var;
+        this.f2669c = y0Var;
         this.d = list;
         this.e = map;
     }
@@ -51,7 +51,7 @@ public final class r0 {
     }
 
     public final y0 getDescriptor() {
-        return this.f2663c;
+        return this.f2669c;
     }
 
     public final w0 getReplacement(u0 u0Var) {
@@ -65,7 +65,7 @@ public final class r0 {
 
     public final boolean isRecursion(y0 y0Var) {
         m.checkNotNullParameter(y0Var, "descriptor");
-        if (!m.areEqual(this.f2663c, y0Var)) {
+        if (!m.areEqual(this.f2669c, y0Var)) {
             r0 r0Var = this.b;
             if (!(r0Var == null ? false : r0Var.isRecursion(y0Var))) {
                 return false;
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/t.java b/app/src/main/java/d0/e0/p/d/m0/n/t.java
index 7973422381..2495101828 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/t.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/t.java
@@ -27,7 +27,7 @@ public class t {
     public static final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final j0 f2664c = createErrorType("<LOOP IN SUPERTYPES>");
+    public static final j0 f2670c = createErrorType("<LOOP IN SUPERTYPES>");
     public static final c0 d;
     public static final n0 e;
     public static final Set<n0> f;
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/v.java b/app/src/main/java/d0/e0/p/d/m0/n/v.java
index 77d32defad..be97564c08 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/v.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/v.java
@@ -59,6 +59,6 @@ public abstract class v extends i1 implements f {
     public abstract String render(c cVar, h hVar);
 
     public String toString() {
-        return c.f2599c.renderType(this);
+        return c.f2605c.renderType(this);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/v0.java b/app/src/main/java/d0/e0/p/d/m0/n/v0.java
index f17450bd10..742228b2ae 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/v0.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/v0.java
@@ -21,13 +21,13 @@ public abstract class v0 extends z0 {
         public static final class C0284a extends v0 {
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ Map<u0, w0> f2665c;
+            public final /* synthetic */ Map<u0, w0> f2671c;
             public final /* synthetic */ boolean d;
 
             /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: java.util.Map<d0.e0.p.d.m0.n.u0, ? extends d0.e0.p.d.m0.n.w0> */
             /* JADX WARN: Multi-variable type inference failed */
             public C0284a(Map<u0, ? extends w0> map, boolean z2) {
-                this.f2665c = map;
+                this.f2671c = map;
                 this.d = z2;
             }
 
@@ -39,12 +39,12 @@ public abstract class v0 extends z0 {
             @Override // d0.e0.p.d.m0.n.v0
             public w0 get(u0 u0Var) {
                 m.checkNotNullParameter(u0Var, "key");
-                return this.f2665c.get(u0Var);
+                return this.f2671c.get(u0Var);
             }
 
             @Override // d0.e0.p.d.m0.n.z0
             public boolean isEmpty() {
-                return this.f2665c.isEmpty();
+                return this.f2671c.isEmpty();
             }
         }
 
diff --git a/app/src/main/java/d0/e0/p/d/m0/n/z.java b/app/src/main/java/d0/e0/p/d/m0/n/z.java
index b5ee41c634..71425d6feb 100644
--- a/app/src/main/java/d0/e0/p/d/m0/n/z.java
+++ b/app/src/main/java/d0/e0/p/d/m0/n/z.java
@@ -11,7 +11,7 @@ public final class z extends z0 {
     public final z0[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final w0[] f2666c;
+    public final w0[] f2672c;
     public final boolean d;
 
     /* JADX WARNING: Illegal instructions before constructor call */
@@ -30,7 +30,7 @@ public final class z extends z0 {
         m.checkNotNullParameter(z0VarArr, "parameters");
         m.checkNotNullParameter(w0VarArr, "arguments");
         this.b = z0VarArr;
-        this.f2666c = w0VarArr;
+        this.f2672c = w0VarArr;
         this.d = z2;
         int length = z0VarArr.length;
         int length2 = w0VarArr.length;
@@ -59,11 +59,11 @@ public final class z extends z0 {
         if (index >= z0VarArr.length || !m.areEqual(z0VarArr[index].getTypeConstructor(), z0Var.getTypeConstructor())) {
             return null;
         }
-        return this.f2666c[index];
+        return this.f2672c[index];
     }
 
     public final w0[] getArguments() {
-        return this.f2666c;
+        return this.f2672c;
     }
 
     public final z0[] getParameters() {
@@ -72,6 +72,6 @@ public final class z extends z0 {
 
     @Override // d0.e0.p.d.m0.n.z0
     public boolean isEmpty() {
-        return this.f2666c.length == 0;
+        return this.f2672c.length == 0;
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/o/d.java b/app/src/main/java/d0/e0/p/d/m0/o/d.java
index 56dbab5fff..ce3cfebc6c 100644
--- a/app/src/main/java/d0/e0/p/d/m0/o/d.java
+++ b/app/src/main/java/d0/e0/p/d/m0/o/d.java
@@ -15,7 +15,7 @@ public final class d {
     public final Regex b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Collection<e> f2667c;
+    public final Collection<e> f2673c;
     public final Function1<x, String> d;
     public final b[] e;
 
@@ -66,7 +66,7 @@ public final class d {
     public d(e eVar, Regex regex, Collection<e> collection, Function1<? super x, String> function1, b... bVarArr) {
         this.a = null;
         this.b = regex;
-        this.f2667c = collection;
+        this.f2673c = collection;
         this.d = function1;
         this.e = bVarArr;
     }
@@ -81,7 +81,7 @@ public final class d {
         System.arraycopy(bVarArr, 0, bVarArr2, 0, bVarArr.length);
         this.a = eVar;
         this.b = null;
-        this.f2667c = null;
+        this.f2673c = null;
         this.d = function1;
         this.e = bVarArr2;
     }
@@ -150,7 +150,7 @@ public final class d {
                 return false;
             }
         }
-        Collection<e> collection = this.f2667c;
+        Collection<e> collection = this.f2673c;
         return collection == null || collection.contains(xVar.getName());
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/m0/o/i.java b/app/src/main/java/d0/e0/p/d/m0/o/i.java
index 56105179f6..9dbed84a58 100644
--- a/app/src/main/java/d0/e0/p/d/m0/o/i.java
+++ b/app/src/main/java/d0/e0/p/d/m0/o/i.java
@@ -155,7 +155,7 @@ public final class i extends a {
         k.a aVar = k.a.d;
         d0.e0.p.d.m0.g.e eVar6 = j.h;
         l.c cVar = l.c.b;
-        b = n.listOf((Object[]) new d[]{new d(eVar, bVarArr, (Function1) null, 4, (DefaultConstructorMarker) null), new d(eVar2, bVarArr2, a.i), new d(eVar3, new b[]{bVar, hVar, new l.a(2), eVar4}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.b, new b[]{bVar, hVar, new l.a(3), eVar4}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.f2668c, new b[]{bVar, hVar, new l.b(2), eVar4}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.g, new b[]{bVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(eVar5, new b[]{bVar, dVar, hVar, aVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(eVar6, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.k, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.l, new b[]{bVar, cVar, aVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.f2671y, new b[]{bVar, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.d, new b[]{f.a.b}, b.i), new d(j.e, new b[]{bVar, k.b.d, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.G, new b[]{bVar, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.F, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(n.listOf((Object[]) new d0.e0.p.d.m0.g.e[]{j.n, j.o}), new b[]{bVar}, c.i), new d(j.H, new b[]{bVar, k.c.d, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.m, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null)});
+        b = n.listOf((Object[]) new d[]{new d(eVar, bVarArr, (Function1) null, 4, (DefaultConstructorMarker) null), new d(eVar2, bVarArr2, a.i), new d(eVar3, new b[]{bVar, hVar, new l.a(2), eVar4}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.b, new b[]{bVar, hVar, new l.a(3), eVar4}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.f2674c, new b[]{bVar, hVar, new l.b(2), eVar4}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.g, new b[]{bVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(eVar5, new b[]{bVar, dVar, hVar, aVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(eVar6, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.k, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.l, new b[]{bVar, cVar, aVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.f2677y, new b[]{bVar, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.d, new b[]{f.a.b}, b.i), new d(j.e, new b[]{bVar, k.b.d, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.G, new b[]{bVar, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.F, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(n.listOf((Object[]) new d0.e0.p.d.m0.g.e[]{j.n, j.o}), new b[]{bVar}, c.i), new d(j.H, new b[]{bVar, k.c.d, dVar, hVar}, (Function1) null, 4, (DefaultConstructorMarker) null), new d(j.m, new b[]{bVar, cVar}, (Function1) null, 4, (DefaultConstructorMarker) null)});
     }
 
     @Override // d0.e0.p.d.m0.o.a
diff --git a/app/src/main/java/d0/e0/p/d/m0/o/j.java b/app/src/main/java/d0/e0/p/d/m0/o/j.java
index eebeb409be..c212ace480 100644
--- a/app/src/main/java/d0/e0/p/d/m0/o/j.java
+++ b/app/src/main/java/d0/e0/p/d/m0/o/j.java
@@ -19,7 +19,7 @@ public final class j {
     public static final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final e f2668c;
+    public static final e f2674c;
     public static final e d;
     public static final e e;
     public static final e f;
@@ -37,20 +37,20 @@ public final class j {
     public static final e r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final e f2669s;
+    public static final e f2675s;
     public static final e t;
     public static final e u;
     public static final e v;
     public static final e w;
 
     /* renamed from: x  reason: collision with root package name */
-    public static final e f2670x;
+    public static final e f2676x;
 
     /* renamed from: y  reason: collision with root package name */
-    public static final e f2671y;
+    public static final e f2677y;
 
     /* renamed from: z  reason: collision with root package name */
-    public static final e f2672z;
+    public static final e f2678z;
 
     static {
         e identifier = e.identifier("getValue");
@@ -61,7 +61,7 @@ public final class j {
         b = identifier2;
         e identifier3 = e.identifier("provideDelegate");
         m.checkNotNullExpressionValue(identifier3, "identifier(\"provideDelegate\")");
-        f2668c = identifier3;
+        f2674c = identifier3;
         e identifier4 = e.identifier("equals");
         m.checkNotNullExpressionValue(identifier4, "identifier(\"equals\")");
         d = identifier4;
@@ -109,7 +109,7 @@ public final class j {
         r = identifier17;
         e identifier18 = e.identifier("unaryMinus");
         m.checkNotNullExpressionValue(identifier18, "identifier(\"unaryMinus\")");
-        f2669s = identifier18;
+        f2675s = identifier18;
         e identifier19 = e.identifier("unaryPlus");
         m.checkNotNullExpressionValue(identifier19, "identifier(\"unaryPlus\")");
         t = identifier19;
@@ -124,13 +124,13 @@ public final class j {
         w = identifier22;
         e identifier23 = e.identifier("rem");
         m.checkNotNullExpressionValue(identifier23, "identifier(\"rem\")");
-        f2670x = identifier23;
+        f2676x = identifier23;
         e identifier24 = e.identifier("rangeTo");
         m.checkNotNullExpressionValue(identifier24, "identifier(\"rangeTo\")");
-        f2671y = identifier24;
+        f2677y = identifier24;
         e identifier25 = e.identifier("timesAssign");
         m.checkNotNullExpressionValue(identifier25, "identifier(\"timesAssign\")");
-        f2672z = identifier25;
+        f2678z = identifier25;
         e identifier26 = e.identifier("divAssign");
         m.checkNotNullExpressionValue(identifier26, "identifier(\"divAssign\")");
         A = identifier26;
diff --git a/app/src/main/java/d0/e0/p/d/m0/o/k.java b/app/src/main/java/d0/e0/p/d/m0/o/k.java
index 131acd110e..05e2c58b92 100644
--- a/app/src/main/java/d0/e0/p/d/m0/o/k.java
+++ b/app/src/main/java/d0/e0/p/d/m0/o/k.java
@@ -15,7 +15,7 @@ public abstract class k implements b {
     public final Function1<h, c0> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2673c;
+    public final String f2679c;
 
     /* compiled from: modifierChecks.kt */
     public static final class a extends k {
@@ -96,7 +96,7 @@ public abstract class k implements b {
     public k(String str, Function1 function1, DefaultConstructorMarker defaultConstructorMarker) {
         this.a = str;
         this.b = function1;
-        this.f2673c = m.stringPlus("must return ", str);
+        this.f2679c = m.stringPlus("must return ", str);
     }
 
     @Override // d0.e0.p.d.m0.o.b
@@ -107,7 +107,7 @@ public abstract class k implements b {
 
     @Override // d0.e0.p.d.m0.o.b
     public String getDescription() {
-        return this.f2673c;
+        return this.f2679c;
     }
 
     @Override // d0.e0.p.d.m0.o.b
diff --git a/app/src/main/java/d0/e0/p/d/m0/p/e.java b/app/src/main/java/d0/e0/p/d/m0/p/e.java
index d5232d3d28..31f57a40c2 100644
--- a/app/src/main/java/d0/e0/p/d/m0/p/e.java
+++ b/app/src/main/java/d0/e0/p/d/m0/p/e.java
@@ -16,7 +16,7 @@ public final class e {
     public static final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final h f2674c;
+    public final h f2680c;
     public final h d;
     public final Map<String, h> e;
     public final boolean f;
@@ -80,7 +80,7 @@ public final class e {
         m.checkNotNullParameter(hVar, "globalJsr305Level");
         m.checkNotNullParameter(map, "userDefinedLevelForSpecificJsr305Annotation");
         m.checkNotNullParameter(hVar3, "jspecifyReportLevel");
-        this.f2674c = hVar;
+        this.f2680c = hVar;
         this.d = hVar2;
         this.e = map;
         this.f = z2;
@@ -114,7 +114,7 @@ public final class e {
     }
 
     public final h getGlobalJsr305Level() {
-        return this.f2674c;
+        return this.f2680c;
     }
 
     public final h getJspecifyReportLevel() {
diff --git a/app/src/main/java/d0/e0/p/d/n0/b.java b/app/src/main/java/d0/e0/p/d/n0/b.java
index 28fc9e799b..cb78e18ab4 100644
--- a/app/src/main/java/d0/e0/p/d/n0/b.java
+++ b/app/src/main/java/d0/e0/p/d/n0/b.java
@@ -5,11 +5,11 @@ public final class b<K, V> {
     public final d<a<e<K, V>>> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2675c;
+    public final int f2681c;
 
     public b(d<a<e<K, V>>> dVar, int i) {
         this.b = dVar;
-        this.f2675c = i;
+        this.f2681c = i;
     }
 
     public static <K, V> b<K, V> empty() {
@@ -58,6 +58,6 @@ public final class b<K, V> {
             aVar = aVar.minus(i);
         }
         a<e<K, V>> plus = aVar.plus(new e<>(k, v));
-        return new b<>(this.b.plus(k.hashCode(), plus), plus.size() + (this.f2675c - size));
+        return new b<>(this.b.plus(k.hashCode(), plus), plus.size() + (this.f2681c - size));
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/n0/c.java b/app/src/main/java/d0/e0/p/d/n0/c.java
index a1e4774aad..407cd65553 100644
--- a/app/src/main/java/d0/e0/p/d/n0/c.java
+++ b/app/src/main/java/d0/e0/p/d/n0/c.java
@@ -5,7 +5,7 @@ public final class c<V> {
     public final long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final V f2676c;
+    public final V f2682c;
     public final c<V> d;
     public final c<V> e;
     public final int f;
@@ -13,14 +13,14 @@ public final class c<V> {
     public c() {
         this.f = 0;
         this.b = 0;
-        this.f2676c = null;
+        this.f2682c = null;
         this.d = null;
         this.e = null;
     }
 
     public c(long j, V v, c<V> cVar, c<V> cVar2) {
         this.b = j;
-        this.f2676c = v;
+        this.f2682c = v;
         this.d = cVar;
         this.e = cVar2;
         this.f = cVar.f + 1 + cVar2.f;
@@ -31,7 +31,7 @@ public final class c<V> {
             return null;
         }
         long j2 = this.b;
-        return j < j2 ? this.d.a(j - j2) : j > j2 ? this.e.a(j - j2) : this.f2676c;
+        return j < j2 ? this.d.a(j - j2) : j > j2 ? this.e.a(j - j2) : this.f2682c;
     }
 
     public c<V> b(long j, V v) {
@@ -39,7 +39,7 @@ public final class c<V> {
             return new c<>(j, v, this, this);
         }
         long j2 = this.b;
-        return j < j2 ? c(this.d.b(j - j2, v), this.e) : j > j2 ? c(this.d, this.e.b(j - j2, v)) : v == this.f2676c ? this : new c<>(j, v, this.d, this.e);
+        return j < j2 ? c(this.d.b(j - j2, v), this.e) : j > j2 ? c(this.d, this.e.b(j - j2, v)) : v == this.f2682c ? this : new c<>(j, v, this.d, this.e);
     }
 
     public final c<V> c(c<V> cVar, c<V> cVar2) {
@@ -47,7 +47,7 @@ public final class c<V> {
             return this;
         }
         long j = this.b;
-        V v = this.f2676c;
+        V v = this.f2682c;
         int i = cVar.f;
         int i2 = cVar2.f;
         if (i + i2 > 1) {
@@ -56,14 +56,14 @@ public final class c<V> {
                 c<V> cVar4 = cVar.e;
                 if (cVar4.f < cVar3.f * 2) {
                     long j2 = cVar.b;
-                    return new c<>(j2 + j, cVar.f2676c, cVar3, new c(-j2, v, cVar4.d(cVar4.b + j2), cVar2));
+                    return new c<>(j2 + j, cVar.f2682c, cVar3, new c(-j2, v, cVar4.d(cVar4.b + j2), cVar2));
                 }
                 c<V> cVar5 = cVar4.d;
                 c<V> cVar6 = cVar4.e;
                 long j3 = cVar4.b;
                 long j4 = cVar.b + j3 + j;
-                V v2 = cVar4.f2676c;
-                c cVar7 = new c(-j3, cVar.f2676c, cVar3, cVar5.d(cVar5.b + j3));
+                V v2 = cVar4.f2682c;
+                c cVar7 = new c(-j3, cVar.f2682c, cVar3, cVar5.d(cVar5.b + j3));
                 long j5 = cVar.b;
                 long j6 = cVar4.b;
                 return new c<>(j4, v2, cVar7, new c((-j5) - j6, v, cVar6.d(cVar6.b + j6 + j5), cVar2));
@@ -72,23 +72,23 @@ public final class c<V> {
                 c<V> cVar9 = cVar2.e;
                 if (cVar8.f < cVar9.f * 2) {
                     long j7 = cVar2.b;
-                    return new c<>(j7 + j, cVar2.f2676c, new c(-j7, v, cVar, cVar8.d(cVar8.b + j7)), cVar9);
+                    return new c<>(j7 + j, cVar2.f2682c, new c(-j7, v, cVar, cVar8.d(cVar8.b + j7)), cVar9);
                 }
                 c<V> cVar10 = cVar8.d;
                 c<V> cVar11 = cVar8.e;
                 long j8 = cVar8.b;
                 long j9 = cVar2.b;
                 long j10 = j8 + j9 + j;
-                V v3 = cVar8.f2676c;
+                V v3 = cVar8.f2682c;
                 c cVar12 = new c((-j9) - j8, v, cVar, cVar10.d(cVar10.b + j8 + j9));
                 long j11 = cVar8.b;
-                return new c<>(j10, v3, cVar12, new c(-j11, cVar2.f2676c, cVar11.d(cVar11.b + j11), cVar9));
+                return new c<>(j10, v3, cVar12, new c(-j11, cVar2.f2682c, cVar11.d(cVar11.b + j11), cVar9));
             }
         }
         return new c<>(j, v, cVar, cVar2);
     }
 
     public final c<V> d(long j) {
-        return (this.f == 0 || j == this.b) ? this : new c<>(j, this.f2676c, this.d, this.e);
+        return (this.f == 0 || j == this.b) ? this : new c<>(j, this.f2682c, this.d, this.e);
     }
 }
diff --git a/app/src/main/java/d0/e0/p/d/s.java b/app/src/main/java/d0/e0/p/d/s.java
index 8185dd6d09..90be147da3 100644
--- a/app/src/main/java/d0/e0/p/d/s.java
+++ b/app/src/main/java/d0/e0/p/d/s.java
@@ -32,7 +32,7 @@ public abstract class s<V> extends f<V> implements KProperty<V> {
     public final String r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final Object f2677s;
+    public final Object f2683s;
 
     /* compiled from: KPropertyImpl.kt */
     public static abstract class a<PropertyType, ReturnType> extends f<ReturnType> implements KFunction<ReturnType> {
@@ -294,7 +294,7 @@ public abstract class s<V> extends f<V> implements KProperty<V> {
         this.p = iVar;
         this.q = str;
         this.r = str2;
-        this.f2677s = obj;
+        this.f2683s = obj;
         c0.b<Field> lazy = c0.lazy(new f(this));
         d0.z.d.m.checkNotNullExpressionValue(lazy, "ReflectProperties.lazy {…y -> null\n        }\n    }");
         this.n = lazy;
@@ -320,11 +320,11 @@ public abstract class s<V> extends f<V> implements KProperty<V> {
 
     public boolean equals(Object obj) {
         s<?> asKPropertyImpl = j0.asKPropertyImpl(obj);
-        return asKPropertyImpl != null && d0.z.d.m.areEqual(getContainer(), asKPropertyImpl.getContainer()) && d0.z.d.m.areEqual(getName(), asKPropertyImpl.getName()) && d0.z.d.m.areEqual(this.r, asKPropertyImpl.r) && d0.z.d.m.areEqual(this.f2677s, asKPropertyImpl.f2677s);
+        return asKPropertyImpl != null && d0.z.d.m.areEqual(getContainer(), asKPropertyImpl.getContainer()) && d0.z.d.m.areEqual(getName(), asKPropertyImpl.getName()) && d0.z.d.m.areEqual(this.r, asKPropertyImpl.r) && d0.z.d.m.areEqual(this.f2683s, asKPropertyImpl.f2683s);
     }
 
     public final Object getBoundReceiver() {
-        return d0.e0.p.d.l0.h.coerceToExpectedReceiverType(this.f2677s, getDescriptor());
+        return d0.e0.p.d.l0.h.coerceToExpectedReceiverType(this.f2683s, getDescriptor());
     }
 
     @Override // d0.e0.p.d.f
@@ -372,7 +372,7 @@ public abstract class s<V> extends f<V> implements KProperty<V> {
 
     @Override // d0.e0.p.d.f
     public boolean isBound() {
-        return !d0.z.d.m.areEqual(this.f2677s, d0.z.d.d.NO_RECEIVER);
+        return !d0.z.d.m.areEqual(this.f2683s, d0.z.d.d.NO_RECEIVER);
     }
 
     @Override // kotlin.reflect.KProperty
diff --git a/app/src/main/java/d0/f0/g.java b/app/src/main/java/d0/f0/g.java
index f8f48b8278..ea0f03d2e8 100644
--- a/app/src/main/java/d0/f0/g.java
+++ b/app/src/main/java/d0/f0/g.java
@@ -11,7 +11,7 @@ public final class g<T> implements Sequence<T> {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<T, Boolean> f2678c;
+    public final Function1<T, Boolean> f2684c;
 
     /* compiled from: Sequences.kt */
     public static final class a implements Iterator<T>, d0.z.d.g0.a {
@@ -73,11 +73,11 @@ public final class g<T> implements Sequence<T> {
         m.checkNotNullParameter(function1, "predicate");
         this.a = sequence;
         this.b = z2;
-        this.f2678c = function1;
+        this.f2684c = function1;
     }
 
     public static final /* synthetic */ Function1 access$getPredicate$p(g gVar) {
-        return gVar.f2678c;
+        return gVar.f2684c;
     }
 
     public static final /* synthetic */ boolean access$getSendWhen$p(g gVar) {
diff --git a/app/src/main/java/d0/f0/h.java b/app/src/main/java/d0/f0/h.java
index 5eb0477154..30c2db7ad3 100644
--- a/app/src/main/java/d0/f0/h.java
+++ b/app/src/main/java/d0/f0/h.java
@@ -11,7 +11,7 @@ public final class h<T, R, E> implements Sequence<E> {
     public final Function1<T, R> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<R, Iterator<E>> f2679c;
+    public final Function1<R, Iterator<E>> f2685c;
 
     /* compiled from: Sequences.kt */
     public static final class a implements Iterator<E>, d0.z.d.g0.a {
@@ -78,11 +78,11 @@ public final class h<T, R, E> implements Sequence<E> {
         m.checkNotNullParameter(function12, "iterator");
         this.a = sequence;
         this.b = function1;
-        this.f2679c = function12;
+        this.f2685c = function12;
     }
 
     public static final /* synthetic */ Function1 access$getIterator$p(h hVar) {
-        return hVar.f2679c;
+        return hVar.f2685c;
     }
 
     public static final /* synthetic */ Sequence access$getSequence$p(h hVar) {
diff --git a/app/src/main/java/d0/f0/r.java b/app/src/main/java/d0/f0/r.java
index fb6accfb1c..cc047d2e4b 100644
--- a/app/src/main/java/d0/f0/r.java
+++ b/app/src/main/java/d0/f0/r.java
@@ -10,7 +10,7 @@ public final class r<T> implements Sequence<T>, e<T> {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2680c;
+    public final int f2686c;
 
     /* compiled from: Sequences.kt */
     public static final class a implements Iterator<T>, d0.z.d.g0.a {
@@ -58,7 +58,7 @@ public final class r<T> implements Sequence<T>, e<T> {
         m.checkNotNullParameter(sequence, "sequence");
         this.a = sequence;
         this.b = i;
-        this.f2680c = i2;
+        this.f2686c = i2;
         boolean z2 = true;
         if (i >= 0) {
             if (i2 >= 0) {
@@ -73,7 +73,7 @@ public final class r<T> implements Sequence<T>, e<T> {
     }
 
     public static final /* synthetic */ int access$getEndIndex$p(r rVar) {
-        return rVar.f2680c;
+        return rVar.f2686c;
     }
 
     public static final /* synthetic */ Sequence access$getSequence$p(r rVar) {
@@ -86,7 +86,7 @@ public final class r<T> implements Sequence<T>, e<T> {
 
     @Override // d0.f0.e
     public Sequence<T> drop(int i) {
-        int i2 = this.f2680c;
+        int i2 = this.f2686c;
         int i3 = this.b;
         return i >= i2 - i3 ? n.emptySequence() : new r(this.a, i3 + i, i2);
     }
@@ -98,7 +98,7 @@ public final class r<T> implements Sequence<T>, e<T> {
 
     @Override // d0.f0.e
     public Sequence<T> take(int i) {
-        int i2 = this.f2680c;
+        int i2 = this.f2686c;
         int i3 = this.b;
         return i >= i2 - i3 ? this : new r(this.a, i3, i + i3);
     }
diff --git a/app/src/main/java/d0/g0/c.java b/app/src/main/java/d0/g0/c.java
index 13b081a26a..a9bff9ced2 100644
--- a/app/src/main/java/d0/g0/c.java
+++ b/app/src/main/java/d0/g0/c.java
@@ -8,7 +8,7 @@ public final class c {
     public static Charset b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static Charset f2681c;
+    public static Charset f2687c;
     public static final c d = new c();
 
     static {
@@ -23,13 +23,13 @@ public final class c {
     }
 
     public final Charset UTF32_BE() {
-        Charset charset = f2681c;
+        Charset charset = f2687c;
         if (charset != null) {
             return charset;
         }
         Charset forName = Charset.forName("UTF-32BE");
         m.checkNotNullExpressionValue(forName, "Charset.forName(\"UTF-32BE\")");
-        f2681c = forName;
+        f2687c = forName;
         return forName;
     }
 
diff --git a/app/src/main/java/d0/g0/d.java b/app/src/main/java/d0/g0/d.java
index 37a708fda2..dbbc7cd42a 100644
--- a/app/src/main/java/d0/g0/d.java
+++ b/app/src/main/java/d0/g0/d.java
@@ -15,7 +15,7 @@ public final class d implements Sequence<IntRange> {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2682c;
+    public final int f2688c;
     public final Function2<CharSequence, Integer, Pair<Integer, Integer>> d;
 
     /* compiled from: Strings.kt */
@@ -107,7 +107,7 @@ public final class d implements Sequence<IntRange> {
         m.checkNotNullParameter(function2, "getNextMatch");
         this.a = charSequence;
         this.b = i;
-        this.f2682c = i2;
+        this.f2688c = i2;
         this.d = function2;
     }
 
@@ -120,7 +120,7 @@ public final class d implements Sequence<IntRange> {
     }
 
     public static final /* synthetic */ int access$getLimit$p(d dVar) {
-        return dVar.f2682c;
+        return dVar.f2688c;
     }
 
     public static final /* synthetic */ int access$getStartIndex$p(d dVar) {
diff --git a/app/src/main/java/d0/g0/g.java b/app/src/main/java/d0/g0/g.java
index e4b491853c..35230cb49e 100644
--- a/app/src/main/java/d0/g0/g.java
+++ b/app/src/main/java/d0/g0/g.java
@@ -18,7 +18,7 @@ public final class g implements MatchResult {
     public List<String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Matcher f2683c;
+    public final Matcher f2689c;
     public final CharSequence d;
 
     /* compiled from: Regex.kt */
@@ -148,12 +148,12 @@ public final class g implements MatchResult {
     public g(Matcher matcher, CharSequence charSequence) {
         m.checkNotNullParameter(matcher, "matcher");
         m.checkNotNullParameter(charSequence, "input");
-        this.f2683c = matcher;
+        this.f2689c = matcher;
         this.d = charSequence;
     }
 
     public static final java.util.regex.MatchResult access$getMatchResult$p(g gVar) {
-        return gVar.f2683c;
+        return gVar.f2689c;
     }
 
     @Override // kotlin.text.MatchResult
@@ -178,23 +178,23 @@ public final class g implements MatchResult {
 
     @Override // kotlin.text.MatchResult
     public IntRange getRange() {
-        return h.access$range(this.f2683c);
+        return h.access$range(this.f2689c);
     }
 
     @Override // kotlin.text.MatchResult
     public String getValue() {
-        String group = this.f2683c.group();
+        String group = this.f2689c.group();
         m.checkNotNullExpressionValue(group, "matchResult.group()");
         return group;
     }
 
     @Override // kotlin.text.MatchResult
     public MatchResult next() {
-        int end = this.f2683c.end() + (this.f2683c.end() == this.f2683c.start() ? 1 : 0);
+        int end = this.f2689c.end() + (this.f2689c.end() == this.f2689c.start() ? 1 : 0);
         if (end > this.d.length()) {
             return null;
         }
-        Matcher matcher = this.f2683c.pattern().matcher(this.d);
+        Matcher matcher = this.f2689c.pattern().matcher(this.d);
         m.checkNotNullExpressionValue(matcher, "matcher.pattern().matcher(input)");
         return h.access$findNext(matcher, end, this.d);
     }
diff --git a/app/src/main/java/d0/t/m0.java b/app/src/main/java/d0/t/m0.java
index d6217a2baf..02f54ccdb6 100644
--- a/app/src/main/java/d0/t/m0.java
+++ b/app/src/main/java/d0/t/m0.java
@@ -2,7 +2,9 @@ package d0.t;
 
 import d0.z.d.m;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Set;
+import java.util.TreeSet;
 /* compiled from: SetsJVM.kt */
 public class m0 {
     public static final <T> Set<T> setOf(T t) {
@@ -10,4 +12,10 @@ public class m0 {
         m.checkNotNullExpressionValue(singleton, "java.util.Collections.singleton(element)");
         return singleton;
     }
+
+    public static final <T> TreeSet<T> sortedSetOf(Comparator<? super T> comparator, T... tArr) {
+        m.checkNotNullParameter(comparator, "comparator");
+        m.checkNotNullParameter(tArr, "elements");
+        return (TreeSet) k.toCollection(tArr, new TreeSet(comparator));
+    }
 }
diff --git a/app/src/main/java/d0/t/q0/c.java b/app/src/main/java/d0/t/q0/c.java
index a2d3dd228e..63fc631008 100644
--- a/app/src/main/java/d0/t/q0/c.java
+++ b/app/src/main/java/d0/t/q0/c.java
@@ -24,7 +24,7 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
     public int[] r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int[] f2684s;
+    public int[] f2690s;
     public int t;
     public int u;
 
@@ -294,7 +294,7 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
         this.p = (K[]) b.arrayOfUninitializedElements(i2);
         this.q = null;
         this.r = iArr;
-        this.f2684s = new int[access$computeHashSize];
+        this.f2690s = new int[access$computeHashSize];
         this.t = 2;
         this.u = 0;
         this.j = a.access$computeShift(aVar, access$computeHashSize);
@@ -338,10 +338,10 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
         checkIsMutable$kotlin_stdlib();
         while (true) {
             int e2 = e(k);
-            int coerceAtMost = d0.d0.f.coerceAtMost(this.t * 2, this.f2684s.length / 2);
+            int coerceAtMost = d0.d0.f.coerceAtMost(this.t * 2, this.f2690s.length / 2);
             int i2 = 0;
             while (true) {
-                int[] iArr = this.f2684s;
+                int[] iArr = this.f2690s;
                 int i3 = iArr[e2];
                 if (i3 <= 0) {
                     int i4 = this.u;
@@ -365,10 +365,10 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
                 } else {
                     i2++;
                     if (i2 > coerceAtMost) {
-                        f(this.f2684s.length * 2);
+                        f(this.f2690s.length * 2);
                         break;
                     }
-                    e2 = e2 == 0 ? this.f2684s.length - 1 : e2 - 1;
+                    e2 = e2 == 0 ? this.f2690s.length - 1 : e2 - 1;
                 }
             }
         }
@@ -390,11 +390,11 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
             m.checkNotNullExpressionValue(copyOf, "java.util.Arrays.copyOf(this, newSize)");
             this.r = copyOf;
             int access$computeHashSize = a.access$computeHashSize(i, i4);
-            if (access$computeHashSize > this.f2684s.length) {
+            if (access$computeHashSize > this.f2690s.length) {
                 f(access$computeHashSize);
             }
         } else if ((i3 + i4) - size() > this.p.length) {
-            f(this.f2684s.length);
+            f(this.f2690s.length);
         }
     }
 
@@ -408,7 +408,7 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
         int e2 = e(k);
         int i2 = this.t;
         while (true) {
-            int i3 = this.f2684s[e2];
+            int i3 = this.f2690s[e2];
             if (i3 == 0) {
                 return -1;
             }
@@ -422,7 +422,7 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
             if (i2 < 0) {
                 return -1;
             }
-            e2 = e2 == 0 ? this.f2684s.length - 1 : e2 - 1;
+            e2 = e2 == 0 ? this.f2690s.length - 1 : e2 - 1;
         }
     }
 
@@ -442,7 +442,7 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
                 int[] iArr = this.r;
                 int i4 = iArr[i3];
                 if (i4 >= 0) {
-                    this.f2684s[i4] = 0;
+                    this.f2690s[i4] = 0;
                     iArr[i3] = -1;
                 }
                 if (i3 == i2) {
@@ -574,9 +574,9 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
             }
             this.u = i5;
         }
-        int[] iArr = this.f2684s;
+        int[] iArr = this.f2690s;
         if (i2 != iArr.length) {
-            this.f2684s = new int[i2];
+            this.f2690s = new int[i2];
             this.j = a.access$computeShift(i, i2);
         } else {
             j.fill(iArr, 0, 0, iArr.length);
@@ -587,7 +587,7 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
             int e2 = e(this.p[i6]);
             int i8 = this.t;
             while (true) {
-                int[] iArr2 = this.f2684s;
+                int[] iArr2 = this.f2690s;
                 z2 = true;
                 if (iArr2[e2] == 0) {
                     iArr2[e2] = i7;
@@ -613,17 +613,17 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
     public final void g(int i2) {
         b.resetAt(this.p, i2);
         int i3 = this.r[i2];
-        int coerceAtMost = d0.d0.f.coerceAtMost(this.t * 2, this.f2684s.length / 2);
+        int coerceAtMost = d0.d0.f.coerceAtMost(this.t * 2, this.f2690s.length / 2);
         int i4 = 0;
         int i5 = i3;
         while (true) {
-            i3 = i3 == 0 ? this.f2684s.length - 1 : i3 - 1;
+            i3 = i3 == 0 ? this.f2690s.length - 1 : i3 - 1;
             i4++;
             if (i4 > this.t) {
-                this.f2684s[i5] = 0;
+                this.f2690s[i5] = 0;
                 break;
             }
-            int[] iArr = this.f2684s;
+            int[] iArr = this.f2690s;
             int i6 = iArr[i3];
             if (i6 == 0) {
                 iArr[i5] = 0;
@@ -631,14 +631,14 @@ public final class c<K, V> implements Map<K, V>, d0.z.d.g0.d {
             }
             if (i6 >= 0) {
                 int i7 = i6 - 1;
-                int[] iArr2 = this.f2684s;
+                int[] iArr2 = this.f2690s;
                 if (((e(this.p[i7]) - i3) & (iArr2.length - 1)) >= i4) {
                     iArr2[i5] = i6;
                     this.r[i7] = i5;
                 }
                 coerceAtMost--;
                 if (coerceAtMost < 0) {
-                    this.f2684s[i5] = -1;
+                    this.f2690s[i5] = -1;
                     break;
                 }
             } else {
diff --git a/app/src/main/java/d0/t/t.java b/app/src/main/java/d0/t/t.java
index 841b74c4c1..f2fef9128a 100644
--- a/app/src/main/java/d0/t/t.java
+++ b/app/src/main/java/d0/t/t.java
@@ -1,6 +1,8 @@
 package d0.t;
 
 import d0.z.d.m;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -8,6 +10,24 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 /* compiled from: _CollectionsJvm.kt */
 public class t extends s {
+    public static final <R> List<R> filterIsInstance(Iterable<?> iterable, Class<R> cls) {
+        m.checkNotNullParameter(iterable, "$this$filterIsInstance");
+        m.checkNotNullParameter(cls, "klass");
+        return (List) filterIsInstanceTo(iterable, new ArrayList(), cls);
+    }
+
+    public static final <C extends Collection<? super R>, R> C filterIsInstanceTo(Iterable<?> iterable, C c2, Class<R> cls) {
+        m.checkNotNullParameter(iterable, "$this$filterIsInstanceTo");
+        m.checkNotNullParameter(c2, "destination");
+        m.checkNotNullParameter(cls, "klass");
+        for (Object obj : iterable) {
+            if (cls.isInstance(obj)) {
+                c2.add(obj);
+            }
+        }
+        return c2;
+    }
+
     public static final <T> void reverse(List<T> list) {
         m.checkNotNullParameter(list, "$this$reverse");
         Collections.reverse(list);
diff --git a/app/src/main/java/d0/w/h/a/f.java b/app/src/main/java/d0/w/h/a/f.java
index ee42473ff7..fbeb69347e 100644
--- a/app/src/main/java/d0/w/h/a/f.java
+++ b/app/src/main/java/d0/w/h/a/f.java
@@ -33,7 +33,7 @@ public final class f {
             if (i >= 0) {
                 i2 = eVar.l()[i];
             }
-            String moduleName = h.f2685c.getModuleName(aVar);
+            String moduleName = h.f2691c.getModuleName(aVar);
             if (moduleName == null) {
                 str = eVar.c();
             } else {
diff --git a/app/src/main/java/d0/w/h/a/h.java b/app/src/main/java/d0/w/h/a/h.java
index d188c159c6..96ec366bf8 100644
--- a/app/src/main/java/d0/w/h/a/h.java
+++ b/app/src/main/java/d0/w/h/a/h.java
@@ -8,7 +8,7 @@ public final class h {
     public static a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final h f2685c = new h();
+    public static final h f2691c = new h();
 
     /* compiled from: DebugMetadata.kt */
     public static final class a {
@@ -16,12 +16,12 @@ public final class h {
         public final Method b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Method f2686c;
+        public final Method f2692c;
 
         public a(Method method, Method method2, Method method3) {
             this.a = method;
             this.b = method2;
-            this.f2686c = method3;
+            this.f2692c = method3;
         }
     }
 
@@ -46,7 +46,7 @@ public final class h {
         if (aVar2 == a || (method = aVar2.a) == null || (invoke = method.invoke(aVar.getClass(), new Object[0])) == null || (method2 = aVar2.b) == null || (invoke2 = method2.invoke(invoke, new Object[0])) == null) {
             return null;
         }
-        Method method3 = aVar2.f2686c;
+        Method method3 = aVar2.f2692c;
         Object invoke3 = method3 != null ? method3.invoke(invoke2, new Object[0]) : null;
         if (invoke3 instanceof String) {
             str = invoke3;
diff --git a/app/src/main/java/d0/y/d.java b/app/src/main/java/d0/y/d.java
index 4c94e7037c..1deba34b42 100644
--- a/app/src/main/java/d0/y/d.java
+++ b/app/src/main/java/d0/y/d.java
@@ -17,7 +17,7 @@ public final class d implements Sequence<File> {
     public final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<File, Boolean> f2687c = null;
+    public final Function1<File, Boolean> f2693c = null;
     public final Function1<File, Unit> d = null;
     public final Function2<File, IOException, Unit> e = null;
     public final int f = Integer.MAX_VALUE;
@@ -40,7 +40,7 @@ public final class d implements Sequence<File> {
             public boolean b;
 
             /* renamed from: c  reason: collision with root package name */
-            public File[] f2688c;
+            public File[] f2694c;
             public int d;
             public boolean e;
             public final /* synthetic */ b f;
@@ -54,13 +54,13 @@ public final class d implements Sequence<File> {
 
             @Override // d0.y.d.c
             public File step() {
-                if (!this.e && this.f2688c == null) {
+                if (!this.e && this.f2694c == null) {
                     Function1 access$getOnEnter$p = d.access$getOnEnter$p(d.this);
                     if (access$getOnEnter$p != null && !((Boolean) access$getOnEnter$p.invoke(getRoot())).booleanValue()) {
                         return null;
                     }
                     File[] listFiles = getRoot().listFiles();
-                    this.f2688c = listFiles;
+                    this.f2694c = listFiles;
                     if (listFiles == null) {
                         Function2 access$getOnFail$p = d.access$getOnFail$p(d.this);
                         if (access$getOnFail$p != null) {
@@ -69,12 +69,12 @@ public final class d implements Sequence<File> {
                         this.e = true;
                     }
                 }
-                File[] fileArr = this.f2688c;
+                File[] fileArr = this.f2694c;
                 if (fileArr != null) {
                     int i = this.d;
                     m.checkNotNull(fileArr);
                     if (i < fileArr.length) {
-                        File[] fileArr2 = this.f2688c;
+                        File[] fileArr2 = this.f2694c;
                         m.checkNotNull(fileArr2);
                         int i2 = this.d;
                         this.d = i2 + 1;
@@ -119,7 +119,7 @@ public final class d implements Sequence<File> {
             public boolean b;
 
             /* renamed from: c  reason: collision with root package name */
-            public File[] f2689c;
+            public File[] f2695c;
             public int d;
             public final /* synthetic */ b e;
 
@@ -144,7 +144,7 @@ public final class d implements Sequence<File> {
                     this.b = true;
                     return getRoot();
                 }
-                File[] fileArr = this.f2689c;
+                File[] fileArr = this.f2695c;
                 if (fileArr != null) {
                     int i = this.d;
                     m.checkNotNull(fileArr);
@@ -156,13 +156,13 @@ public final class d implements Sequence<File> {
                         return null;
                     }
                 }
-                if (this.f2689c == null) {
+                if (this.f2695c == null) {
                     File[] listFiles = getRoot().listFiles();
-                    this.f2689c = listFiles;
+                    this.f2695c = listFiles;
                     if (listFiles == null && (access$getOnFail$p = d.access$getOnFail$p(d.this)) != null) {
                         Unit unit2 = (Unit) access$getOnFail$p.invoke(getRoot(), new AccessDeniedException(getRoot(), null, "Cannot list files in a directory", 2, null));
                     }
-                    File[] fileArr2 = this.f2689c;
+                    File[] fileArr2 = this.f2695c;
                     if (fileArr2 != null) {
                         m.checkNotNull(fileArr2);
                     }
@@ -172,7 +172,7 @@ public final class d implements Sequence<File> {
                     }
                     return null;
                 }
-                File[] fileArr3 = this.f2689c;
+                File[] fileArr3 = this.f2695c;
                 m.checkNotNull(fileArr3);
                 int i2 = this.d;
                 this.d = i2 + 1;
@@ -267,7 +267,7 @@ public final class d implements Sequence<File> {
     }
 
     public static final /* synthetic */ Function1 access$getOnEnter$p(d dVar) {
-        return dVar.f2687c;
+        return dVar.f2693c;
     }
 
     public static final /* synthetic */ Function2 access$getOnFail$p(d dVar) {
diff --git a/app/src/main/java/defpackage/e.java b/app/src/main/java/defpackage/e.java
index 3060ae8833..9389a1d518 100644
--- a/app/src/main/java/defpackage/e.java
+++ b/app/src/main/java/defpackage/e.java
@@ -32,17 +32,17 @@ public final class e implements View.OnClickListener {
         int i = this.i;
         if (i == 0) {
             OverlayMenuView overlayMenuView = (OverlayMenuView) this.j;
-            Long valueOf = Long.valueOf(((OverlayMenuView.a) this.k).f2114c.getChannel().g());
+            Long valueOf = Long.valueOf(((OverlayMenuView.a) this.k).f2121c.getChannel().h());
             int i2 = OverlayMenuView.i;
             Objects.requireNonNull(overlayMenuView);
             if (valueOf != null) {
                 ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), valueOf.longValue(), null, 2, null), overlayMenuView, null, 2, null), OverlayMenuView.class, (Context) null, (Function1) null, new r(overlayMenuView), (Function0) null, (Function0) null, new s(overlayMenuView), 54, (Object) null);
             } else {
-                o.g(overlayMenuView.getContext(), 2131890364, 0, null, 12);
+                o.g(overlayMenuView.getContext(), 2131890430, 0, null, 12);
             }
         } else if (i == 1) {
             OverlayMenuView overlayMenuView2 = (OverlayMenuView) this.j;
-            Long valueOf2 = Long.valueOf(((OverlayMenuView.a) this.k).f2114c.getChannel().g());
+            Long valueOf2 = Long.valueOf(((OverlayMenuView.a) this.k).f2121c.getChannel().h());
             int i3 = OverlayMenuView.i;
             Objects.requireNonNull(overlayMenuView2);
             overlayMenuView2.getContext().startActivity(IntentUtils.RouteBuilders.INSTANCE.connectVoice(valueOf2 != null ? valueOf2.longValue() : 0).setClass(overlayMenuView2.getContext(), AppActivity.Main.class).addFlags(268435456));
diff --git a/app/src/main/java/defpackage/h.java b/app/src/main/java/defpackage/h.java
index 17692dc8bd..6b62ad7b5b 100644
--- a/app/src/main/java/defpackage/h.java
+++ b/app/src/main/java/defpackage/h.java
@@ -26,7 +26,7 @@ public final class h implements View.OnClickListener {
         if (i != 0) {
             boolean z2 = true;
             if (i == 1) {
-                if (((OverlayMenuView.a) this.j).f2114c.getAudioDevicesState().getAvailableOutputDevices().size() <= 1) {
+                if (((OverlayMenuView.a) this.j).f2121c.getAudioDevicesState().getAvailableOutputDevices().size() <= 1) {
                     z2 = false;
                 }
                 if (z2) {
@@ -48,17 +48,17 @@ public final class h implements View.OnClickListener {
                     return;
                 }
                 throw null;
-            } else if (((OverlayMenuView.a) this.j).f2114c.isSuppressed()) {
+            } else if (((OverlayMenuView.a) this.j).f2121c.isSuppressed()) {
                 m.checkNotNullExpressionValue(view, "view");
-                o.g(view.getContext(), 2131893694, 0, null, 12);
-            } else if (((OverlayMenuView.a) this.j).f2114c.isMuted()) {
+                o.g(view.getContext(), 2131893791, 0, null, 12);
+            } else if (((OverlayMenuView.a) this.j).f2121c.isMuted()) {
                 m.checkNotNullExpressionValue(view, "view");
-                o.g(view.getContext(), 2131893178, 0, null, 12);
+                o.g(view.getContext(), 2131893261, 0, null, 12);
             } else {
                 StoreMediaSettings.SelfMuteFailure selfMuteFailure = StoreStream.Companion.getMediaSettings().toggleSelfMuted();
                 if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) {
                     m.checkNotNullExpressionValue(view, "view");
-                    o.g(view.getContext(), 2131894415, 0, null, 12);
+                    o.g(view.getContext(), 2131894534, 0, null, 12);
                 }
             }
         } else {
diff --git a/app/src/main/java/defpackage/l.java b/app/src/main/java/defpackage/l.java
index 01ca0875f7..15358a5bf4 100644
--- a/app/src/main/java/defpackage/l.java
+++ b/app/src/main/java/defpackage/l.java
@@ -1,6 +1,6 @@
 package defpackage;
 
-import c.a.r.j0.c.e;
+import c.a.r.k0.c.e;
 import com.discord.rtcconnection.mediaengine.MediaEngineConnection;
 import d0.g0.w;
 import d0.z.d.m;
diff --git a/app/src/main/java/e0/a/a/a/a.java b/app/src/main/java/e0/a/a/a/a.java
index 1956282b08..5f49b1aa2d 100644
--- a/app/src/main/java/e0/a/a/a/a.java
+++ b/app/src/main/java/e0/a/a/a/a.java
@@ -28,20 +28,20 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     @ColorInt
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2690s = getResources().getColor(R.a.viewfinder_border);
+    public int f2696s = getResources().getColor(R.a.viewfinder_border);
     public int t = getResources().getColor(R.a.viewfinder_mask);
     public int u = getResources().getInteger(R.b.viewfinder_border_width);
     public int v = getResources().getInteger(R.b.viewfinder_border_length);
     public boolean w = false;
 
     /* renamed from: x  reason: collision with root package name */
-    public int f2691x = 0;
+    public int f2697x = 0;
 
     /* renamed from: y  reason: collision with root package name */
-    public boolean f2692y = false;
+    public boolean f2698y = false;
 
     /* renamed from: z  reason: collision with root package name */
-    public float f2693z = 1.0f;
+    public float f2699z = 1.0f;
 
     /* JADX INFO: finally extract failed */
     public a(Context context, AttributeSet attributeSet) {
@@ -51,26 +51,26 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
             setShouldScaleToFill(obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_shouldScaleToFill, true));
             this.q = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_laserEnabled, this.q);
             this.r = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_laserColor, this.r);
-            this.f2690s = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_borderColor, this.f2690s);
+            this.f2696s = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_borderColor, this.f2696s);
             this.t = obtainStyledAttributes.getColor(R.c.BarcodeScannerView_maskColor, this.t);
             this.u = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_borderWidth, this.u);
             this.v = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_borderLength, this.v);
             this.w = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_roundedCorner, this.w);
-            this.f2691x = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_cornerRadius, this.f2691x);
-            this.f2692y = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_squaredFinder, this.f2692y);
-            this.f2693z = obtainStyledAttributes.getFloat(R.c.BarcodeScannerView_borderAlpha, this.f2693z);
+            this.f2697x = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_cornerRadius, this.f2697x);
+            this.f2698y = obtainStyledAttributes.getBoolean(R.c.BarcodeScannerView_squaredFinder, this.f2698y);
+            this.f2699z = obtainStyledAttributes.getFloat(R.c.BarcodeScannerView_borderAlpha, this.f2699z);
             this.A = obtainStyledAttributes.getDimensionPixelSize(R.c.BarcodeScannerView_finderOffset, this.A);
             obtainStyledAttributes.recycle();
             g gVar = new g(getContext());
-            gVar.setBorderColor(this.f2690s);
+            gVar.setBorderColor(this.f2696s);
             gVar.setLaserColor(this.r);
             gVar.setLaserEnabled(this.q);
             gVar.setBorderStrokeWidth(this.u);
             gVar.setBorderLineLength(this.v);
             gVar.setMaskColor(this.t);
             gVar.setBorderCornerRounded(this.w);
-            gVar.setBorderCornerRadius(this.f2691x);
-            gVar.setSquareViewFinder(this.f2692y);
+            gVar.setBorderCornerRadius(this.f2697x);
+            gVar.setSquareViewFinder(this.f2698y);
             gVar.setViewFinderOffset(this.A);
             this.k = gVar;
         } catch (Throwable th) {
@@ -117,7 +117,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setBorderAlpha(float f) {
-        this.f2693z = f;
+        this.f2699z = f;
         ((g) this.k).setBorderAlpha(f);
         g gVar = (g) this.k;
         gVar.a();
@@ -125,7 +125,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setBorderColor(int i) {
-        this.f2690s = i;
+        this.f2696s = i;
         ((g) this.k).setBorderColor(i);
         g gVar = (g) this.k;
         gVar.a();
@@ -133,7 +133,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setBorderCornerRadius(int i) {
-        this.f2691x = i;
+        this.f2697x = i;
         ((g) this.k).setBorderCornerRadius(i);
         g gVar = (g) this.k;
         gVar.a();
@@ -213,7 +213,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback {
     }
 
     public void setSquareViewFinder(boolean z2) {
-        this.f2692y = z2;
+        this.f2698y = z2;
         ((g) this.k).setSquareViewFinder(z2);
         g gVar = (g) this.k;
         gVar.a();
diff --git a/app/src/main/java/e0/a/a/a/g.java b/app/src/main/java/e0/a/a/a/g.java
index 00d025c054..c4dfc1f546 100644
--- a/app/src/main/java/e0/a/a/a/g.java
+++ b/app/src/main/java/e0/a/a/a/g.java
@@ -24,7 +24,7 @@ public class g extends View implements f {
     public Paint r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Paint f2694s;
+    public Paint f2700s;
     public int t;
     public boolean u;
     public boolean v;
@@ -50,11 +50,11 @@ public class g extends View implements f {
         this.r = paint2;
         paint2.setColor(color2);
         Paint paint3 = new Paint();
-        this.f2694s = paint3;
+        this.f2700s = paint3;
         paint3.setColor(color3);
-        this.f2694s.setStyle(Paint.Style.STROKE);
-        this.f2694s.setStrokeWidth((float) integer);
-        this.f2694s.setAntiAlias(true);
+        this.f2700s.setStyle(Paint.Style.STROKE);
+        this.f2700s.setStrokeWidth((float) integer);
+        this.f2700s.setAntiAlias(true);
         this.t = integer2;
     }
 
@@ -106,19 +106,19 @@ public class g extends View implements f {
             path.moveTo((float) framingRect2.left, (float) (framingRect2.top + this.t));
             path.lineTo((float) framingRect2.left, (float) framingRect2.top);
             path.lineTo((float) (framingRect2.left + this.t), (float) framingRect2.top);
-            canvas.drawPath(path, this.f2694s);
+            canvas.drawPath(path, this.f2700s);
             path.moveTo((float) framingRect2.right, (float) (framingRect2.top + this.t));
             path.lineTo((float) framingRect2.right, (float) framingRect2.top);
             path.lineTo((float) (framingRect2.right - this.t), (float) framingRect2.top);
-            canvas.drawPath(path, this.f2694s);
+            canvas.drawPath(path, this.f2700s);
             path.moveTo((float) framingRect2.right, (float) (framingRect2.bottom - this.t));
             path.lineTo((float) framingRect2.right, (float) framingRect2.bottom);
             path.lineTo((float) (framingRect2.right - this.t), (float) framingRect2.bottom);
-            canvas.drawPath(path, this.f2694s);
+            canvas.drawPath(path, this.f2700s);
             path.moveTo((float) framingRect2.left, (float) (framingRect2.bottom - this.t));
             path.lineTo((float) framingRect2.left, (float) framingRect2.bottom);
             path.lineTo((float) (framingRect2.left + this.t), (float) framingRect2.bottom);
-            canvas.drawPath(path, this.f2694s);
+            canvas.drawPath(path, this.f2700s);
             if (this.v) {
                 Rect framingRect3 = getFramingRect();
                 Paint paint = this.q;
@@ -138,22 +138,22 @@ public class g extends View implements f {
     }
 
     public void setBorderAlpha(float f) {
-        this.f2694s.setAlpha((int) (f * 255.0f));
+        this.f2700s.setAlpha((int) (f * 255.0f));
     }
 
     public void setBorderColor(int i2) {
-        this.f2694s.setColor(i2);
+        this.f2700s.setColor(i2);
     }
 
     public void setBorderCornerRadius(int i2) {
-        this.f2694s.setPathEffect(new CornerPathEffect((float) i2));
+        this.f2700s.setPathEffect(new CornerPathEffect((float) i2));
     }
 
     public void setBorderCornerRounded(boolean z2) {
         if (z2) {
-            this.f2694s.setStrokeJoin(Paint.Join.ROUND);
+            this.f2700s.setStrokeJoin(Paint.Join.ROUND);
         } else {
-            this.f2694s.setStrokeJoin(Paint.Join.BEVEL);
+            this.f2700s.setStrokeJoin(Paint.Join.BEVEL);
         }
     }
 
@@ -162,7 +162,7 @@ public class g extends View implements f {
     }
 
     public void setBorderStrokeWidth(int i2) {
-        this.f2694s.setStrokeWidth((float) i2);
+        this.f2700s.setStrokeWidth((float) i2);
     }
 
     public void setLaserColor(int i2) {
diff --git a/app/src/main/java/f0/a.java b/app/src/main/java/f0/a.java
index cb640a3e45..95a9ea8e65 100644
--- a/app/src/main/java/f0/a.java
+++ b/app/src/main/java/f0/a.java
@@ -17,7 +17,7 @@ public final class a {
     public final List<y> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<m> f2695c;
+    public final List<m> f2701c;
     public final s d;
     public final SocketFactory e;
     public final SSLSocketFactory f;
@@ -62,7 +62,7 @@ public final class a {
                 aVar.f = i;
                 this.a = aVar.b();
                 this.b = c.z(list);
-                this.f2695c = c.z(list2);
+                this.f2701c = c.z(list2);
                 return;
             }
             throw new IllegalArgumentException(c.d.b.a.a.l("unexpected port: ", i).toString());
@@ -72,7 +72,7 @@ public final class a {
 
     public final boolean a(a aVar) {
         m.checkParameterIsNotNull(aVar, "that");
-        return m.areEqual(this.d, aVar.d) && m.areEqual(this.i, aVar.i) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2695c, aVar.f2695c) && m.areEqual(this.k, aVar.k) && m.areEqual(this.j, aVar.j) && m.areEqual(this.f, aVar.f) && m.areEqual(this.g, aVar.g) && m.areEqual(this.h, aVar.h) && this.a.h == aVar.a.h;
+        return m.areEqual(this.d, aVar.d) && m.areEqual(this.i, aVar.i) && m.areEqual(this.b, aVar.b) && m.areEqual(this.f2701c, aVar.f2701c) && m.areEqual(this.k, aVar.k) && m.areEqual(this.j, aVar.j) && m.areEqual(this.f, aVar.f) && m.areEqual(this.g, aVar.g) && m.areEqual(this.h, aVar.h) && this.a.h == aVar.a.h;
     }
 
     public boolean equals(Object obj) {
@@ -89,7 +89,7 @@ public final class a {
         int hashCode = this.d.hashCode();
         int hashCode2 = this.i.hashCode();
         int hashCode3 = this.b.hashCode();
-        int hashCode4 = this.f2695c.hashCode();
+        int hashCode4 = this.f2701c.hashCode();
         int hashCode5 = this.k.hashCode();
         int hashCode6 = Objects.hashCode(this.j);
         int hashCode7 = Objects.hashCode(this.f);
diff --git a/app/src/main/java/f0/d.java b/app/src/main/java/f0/d.java
index 46bca1d24d..3a15e9ea32 100644
--- a/app/src/main/java/f0/d.java
+++ b/app/src/main/java/f0/d.java
@@ -14,7 +14,7 @@ public final class d {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2696c;
+    public final boolean f2702c;
     public final int d;
     public final int e;
     public final boolean f;
@@ -204,7 +204,7 @@ public final class d {
 
     public d(boolean z2, boolean z3, int i, int i2, boolean z4, boolean z5, boolean z6, int i3, int i4, boolean z7, boolean z8, boolean z9, String str, DefaultConstructorMarker defaultConstructorMarker) {
         this.b = z2;
-        this.f2696c = z3;
+        this.f2702c = z3;
         this.d = i;
         this.e = i2;
         this.f = z4;
@@ -227,7 +227,7 @@ public final class d {
         if (this.b) {
             sb.append("no-cache, ");
         }
-        if (this.f2696c) {
+        if (this.f2702c) {
             sb.append("no-store, ");
         }
         if (this.d != -1) {
diff --git a/app/src/main/java/f0/d0.java b/app/src/main/java/f0/d0.java
index f081336270..fbff2bc5f9 100644
--- a/app/src/main/java/f0/d0.java
+++ b/app/src/main/java/f0/d0.java
@@ -10,7 +10,7 @@ public final class d0 {
     public final Proxy b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final InetSocketAddress f2697c;
+    public final InetSocketAddress f2703c;
 
     public d0(a aVar, Proxy proxy, InetSocketAddress inetSocketAddress) {
         m.checkParameterIsNotNull(aVar, "address");
@@ -18,7 +18,7 @@ public final class d0 {
         m.checkParameterIsNotNull(inetSocketAddress, "socketAddress");
         this.a = aVar;
         this.b = proxy;
-        this.f2697c = inetSocketAddress;
+        this.f2703c = inetSocketAddress;
     }
 
     public final boolean a() {
@@ -28,7 +28,7 @@ public final class d0 {
     public boolean equals(Object obj) {
         if (obj instanceof d0) {
             d0 d0Var = (d0) obj;
-            if (m.areEqual(d0Var.a, this.a) && m.areEqual(d0Var.b, this.b) && m.areEqual(d0Var.f2697c, this.f2697c)) {
+            if (m.areEqual(d0Var.a, this.a) && m.areEqual(d0Var.b, this.b) && m.areEqual(d0Var.f2703c, this.f2703c)) {
                 return true;
             }
         }
@@ -37,12 +37,12 @@ public final class d0 {
 
     public int hashCode() {
         int hashCode = this.b.hashCode();
-        return this.f2697c.hashCode() + ((hashCode + ((this.a.hashCode() + 527) * 31)) * 31);
+        return this.f2703c.hashCode() + ((hashCode + ((this.a.hashCode() + 527) * 31)) * 31);
     }
 
     public String toString() {
         StringBuilder L = a.L("Route{");
-        L.append(this.f2697c);
+        L.append(this.f2703c);
         L.append('}');
         return L.toString();
     }
diff --git a/app/src/main/java/f0/f0/c.java b/app/src/main/java/f0/f0/c.java
index 447332e998..f5bf2f3c03 100644
--- a/app/src/main/java/f0/f0/c.java
+++ b/app/src/main/java/f0/f0/c.java
@@ -38,7 +38,7 @@ public final class c {
     public static final Headers b = Headers.i.c(new String[0]);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ResponseBody f2698c;
+    public static final ResponseBody f2704c;
     public static final o d;
     public static final TimeZone e;
     public static final Regex f = new Regex("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)");
@@ -51,7 +51,7 @@ public final class c {
         e eVar = new e();
         eVar.R(bArr);
         m.checkParameterIsNotNull(eVar, "$this$asResponseBody");
-        f2698c = new c0(eVar, null, (long) 0);
+        f2704c = new c0(eVar, null, (long) 0);
         RequestBody.Companion.d(RequestBody.Companion, bArr, null, 0, 0, 7);
         o.a aVar = o.j;
         ByteString.a aVar2 = ByteString.j;
diff --git a/app/src/main/java/f0/f0/d/b.java b/app/src/main/java/f0/f0/d/b.java
index 9b0ff17ccc..9e75677cb3 100644
--- a/app/src/main/java/f0/f0/d/b.java
+++ b/app/src/main/java/f0/f0/d/b.java
@@ -135,7 +135,7 @@ public final class b implements c {
                             m.checkParameterIsNotNull(zVar, "request");
                             new LinkedHashMap();
                             wVar = zVar.b;
-                            String str8 = zVar.f2767c;
+                            String str8 = zVar.f2773c;
                             RequestBody requestBody = zVar.e;
                             Map linkedHashMap = !zVar.f.isEmpty() ? new LinkedHashMap() : h0.toMutableMap(zVar.f);
                             Headers.a e3 = zVar.d.e();
@@ -177,7 +177,7 @@ public final class b implements c {
                         m.checkParameterIsNotNull(zVar, "request");
                         new LinkedHashMap();
                         wVar = zVar.b;
-                        String str8 = zVar.f2767c;
+                        String str8 = zVar.f2773c;
                         RequestBody requestBody = zVar.e;
                         if (!zVar.f.isEmpty()) {
                         }
@@ -213,7 +213,7 @@ public final class b implements c {
                 try {
                     e.b(eVar, arrayList);
                 } catch (EOFException e4) {
-                    h.a aVar3 = h.f2731c;
+                    h.a aVar3 = h.f2737c;
                     h.a.i("Unable to parse challenge", 5, e4);
                 }
             }
diff --git a/app/src/main/java/f0/f0/e/a.java b/app/src/main/java/f0/f0/e/a.java
index 1ae906758e..0ea0789df8 100644
--- a/app/src/main/java/f0/f0/e/a.java
+++ b/app/src/main/java/f0/f0/e/a.java
@@ -41,7 +41,7 @@ public final class a implements Interceptor {
             Response response2 = response.p;
             Response response3 = response.q;
             Response response4 = response.r;
-            long j = response.f2855s;
+            long j = response.f2861s;
             long j2 = response.t;
             c cVar = response.u;
             if (!(i >= 0)) {
@@ -88,9 +88,9 @@ public final class a implements Interceptor {
             Response.a aVar = new Response.a();
             aVar.g(gVar.f);
             aVar.f(y.HTTP_1_1);
-            aVar.f2856c = 504;
+            aVar.f2862c = 504;
             aVar.e("Unsatisfiable Request (only-if-cached)");
-            aVar.g = f0.f0.c.f2698c;
+            aVar.g = f0.f0.c.f2704c;
             aVar.k = -1;
             aVar.l = System.currentTimeMillis();
             Response a = aVar.a();
@@ -161,7 +161,7 @@ public final class a implements Interceptor {
                     Object[] array = arrayList.toArray(new String[0]);
                     if (array != null) {
                         aVar3.d(new Headers((String[]) array, null));
-                        aVar3.k = a3.f2855s;
+                        aVar3.k = a3.f2861s;
                         aVar3.l = a3.t;
                         C0302a aVar5 = b;
                         aVar3.b(C0302a.a(aVar5, response));
diff --git a/app/src/main/java/f0/f0/f/a.java b/app/src/main/java/f0/f0/f/a.java
index 3be5709363..b880e8b8a8 100644
--- a/app/src/main/java/f0/f0/f/a.java
+++ b/app/src/main/java/f0/f0/f/a.java
@@ -7,12 +7,12 @@ public abstract class a {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2699c;
+    public final String f2705c;
     public final boolean d;
 
     public a(String str, boolean z2) {
         m.checkParameterIsNotNull(str, "name");
-        this.f2699c = str;
+        this.f2705c = str;
         this.d = z2;
         this.b = -1;
     }
@@ -25,6 +25,6 @@ public abstract class a {
     public abstract long a();
 
     public String toString() {
-        return this.f2699c;
+        return this.f2705c;
     }
 }
diff --git a/app/src/main/java/f0/f0/f/c.java b/app/src/main/java/f0/f0/f/c.java
index 1e4d5bbc3b..681c53ae63 100644
--- a/app/src/main/java/f0/f0/f/c.java
+++ b/app/src/main/java/f0/f0/f/c.java
@@ -15,7 +15,7 @@ public final class c {
     public a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<a> f2700c = new ArrayList();
+    public final List<a> f2706c = new ArrayList();
     public boolean d;
     public final d e;
     public final String f;
@@ -54,14 +54,14 @@ public final class c {
             }
         }
         boolean z2 = false;
-        for (int size = this.f2700c.size() - 1; size >= 0; size--) {
-            if (this.f2700c.get(size).d) {
-                a aVar2 = this.f2700c.get(size);
-                Objects.requireNonNull(d.f2701c);
+        for (int size = this.f2706c.size() - 1; size >= 0; size--) {
+            if (this.f2706c.get(size).d) {
+                a aVar2 = this.f2706c.get(size);
+                Objects.requireNonNull(d.f2707c);
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar2, this, "canceled");
                 }
-                this.f2700c.remove(size);
+                this.f2706c.remove(size);
                 z2 = true;
             }
         }
@@ -76,12 +76,12 @@ public final class c {
                     this.e.e(this);
                 }
             } else if (aVar.d) {
-                Objects.requireNonNull(d.f2701c);
+                Objects.requireNonNull(d.f2707c);
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar, this, "schedule canceled (queue is shutdown)");
                 }
             } else {
-                Objects.requireNonNull(d.f2701c);
+                Objects.requireNonNull(d.f2707c);
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar, this, "schedule failed (queue is shutdown)");
                 }
@@ -105,19 +105,19 @@ public final class c {
         }
         long c2 = this.e.j.c();
         long j2 = c2 + j;
-        int indexOf = this.f2700c.indexOf(aVar);
+        int indexOf = this.f2706c.indexOf(aVar);
         if (indexOf != -1) {
             if (aVar.b <= j2) {
-                d.b bVar = d.f2701c;
+                d.b bVar = d.f2707c;
                 if (d.b.isLoggable(Level.FINE)) {
                     a.c(aVar, this, "already scheduled");
                 }
                 return false;
             }
-            this.f2700c.remove(indexOf);
+            this.f2706c.remove(indexOf);
         }
         aVar.b = j2;
-        d.b bVar2 = d.f2701c;
+        d.b bVar2 = d.f2707c;
         if (d.b.isLoggable(Level.FINE)) {
             if (z2) {
                 StringBuilder L = c.d.b.a.a.L("run again after ");
@@ -130,7 +130,7 @@ public final class c {
             }
             a.c(aVar, this, str);
         }
-        Iterator<a> it = this.f2700c.iterator();
+        Iterator<a> it = this.f2706c.iterator();
         int i = 0;
         while (true) {
             if (!it.hasNext()) {
@@ -143,9 +143,9 @@ public final class c {
             i++;
         }
         if (i == -1) {
-            i = this.f2700c.size();
+            i = this.f2706c.size();
         }
-        this.f2700c.add(i, aVar);
+        this.f2706c.add(i, aVar);
         return i == 0;
     }
 
diff --git a/app/src/main/java/f0/f0/f/d.java b/app/src/main/java/f0/f0/f/d.java
index 33fe97295c..ee82eb98f8 100644
--- a/app/src/main/java/f0/f0/f/d.java
+++ b/app/src/main/java/f0/f0/f/d.java
@@ -18,7 +18,7 @@ public final class d {
     public static final Logger b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final b f2701c = new b(null);
+    public static final b f2707c = new b(null);
     public int d = 10000;
     public boolean e;
     public long f;
@@ -103,7 +103,7 @@ public final class d {
                         m.throwNpe();
                     }
                     long j = -1;
-                    b bVar = d.f2701c;
+                    b bVar = d.f2707c;
                     boolean isLoggable = d.b.isLoggable(Level.FINE);
                     if (isLoggable) {
                         j = cVar.e.j.c();
@@ -153,7 +153,7 @@ public final class d {
         Thread currentThread = Thread.currentThread();
         m.checkExpressionValueIsNotNull(currentThread, "currentThread");
         String name = currentThread.getName();
-        currentThread.setName(aVar.f2699c);
+        currentThread.setName(aVar.f2705c);
         try {
             long a2 = aVar.a();
             synchronized (dVar) {
@@ -183,7 +183,7 @@ public final class d {
             if (j != -1 && !z2 && !cVar.a) {
                 cVar.e(aVar, j, true);
             }
-            if (!cVar.f2700c.isEmpty()) {
+            if (!cVar.f2706c.isEmpty()) {
                 this.h.add(cVar);
                 return;
             }
@@ -205,7 +205,7 @@ public final class d {
                     z2 = false;
                     break;
                 }
-                a aVar2 = it.next().f2700c.get(0);
+                a aVar2 = it.next().f2706c.get(0);
                 long max = Math.max(0L, aVar2.b - c2);
                 if (max > 0) {
                     j = Math.min(max, j);
@@ -223,7 +223,7 @@ public final class d {
                 if (cVar == null) {
                     m.throwNpe();
                 }
-                cVar.f2700c.remove(aVar);
+                cVar.f2706c.remove(aVar);
                 this.h.remove(cVar);
                 cVar.b = aVar;
                 this.g.add(cVar);
@@ -260,7 +260,7 @@ public final class d {
         for (int size2 = this.h.size() - 1; size2 >= 0; size2--) {
             c cVar = this.h.get(size2);
             cVar.b();
-            if (cVar.f2700c.isEmpty()) {
+            if (cVar.f2706c.isEmpty()) {
                 this.h.remove(size2);
             }
         }
@@ -270,7 +270,7 @@ public final class d {
         m.checkParameterIsNotNull(cVar, "taskQueue");
         byte[] bArr = f0.f0.c.a;
         if (cVar.b == null) {
-            if (!cVar.f2700c.isEmpty()) {
+            if (!cVar.f2706c.isEmpty()) {
                 List<c> list = this.h;
                 m.checkParameterIsNotNull(list, "$this$addIfAbsent");
                 if (!list.contains(cVar)) {
diff --git a/app/src/main/java/f0/f0/g/a.java b/app/src/main/java/f0/f0/g/a.java
index 06ffdb36e1..f1b3045835 100644
--- a/app/src/main/java/f0/f0/g/a.java
+++ b/app/src/main/java/f0/f0/g/a.java
@@ -22,7 +22,7 @@ public final class a implements Interceptor {
         synchronized (eVar) {
             if (!eVar.t) {
                 throw new IllegalStateException("released".toString());
-            } else if (!(!eVar.f2705s)) {
+            } else if (!(!eVar.f2711s)) {
                 throw new IllegalStateException("Check failed.".toString());
             } else if (!(!eVar.r)) {
                 throw new IllegalStateException("Check failed.".toString());
@@ -32,17 +32,17 @@ public final class a implements Interceptor {
         if (dVar == null) {
             m.throwNpe();
         }
-        x xVar = eVar.f2706x;
+        x xVar = eVar.f2712x;
         Objects.requireNonNull(dVar);
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(gVar, "chain");
         try {
-            c cVar = new c(eVar, eVar.j, dVar, dVar.a(gVar.g, gVar.h, gVar.i, xVar.L, xVar.q, !m.areEqual(gVar.f.f2767c, "GET")).k(xVar, gVar));
+            c cVar = new c(eVar, eVar.j, dVar, dVar.a(gVar.g, gVar.h, gVar.i, xVar.L, xVar.q, !m.areEqual(gVar.f.f2773c, "GET")).k(xVar, gVar));
             eVar.q = cVar;
             eVar.v = cVar;
             synchronized (eVar) {
                 eVar.r = true;
-                eVar.f2705s = true;
+                eVar.f2711s = true;
             }
             if (!eVar.u) {
                 return g.d(gVar, 0, cVar, null, 0, 0, 0, 61).a(gVar.f);
diff --git a/app/src/main/java/f0/f0/g/b.java b/app/src/main/java/f0/f0/g/b.java
index b522ee08c0..2548e3ef57 100644
--- a/app/src/main/java/f0/f0/g/b.java
+++ b/app/src/main/java/f0/f0/g/b.java
@@ -17,7 +17,7 @@ public final class b {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public boolean f2702c;
+    public boolean f2708c;
     public final List<m> d;
 
     public b(List<m> list) {
@@ -47,7 +47,7 @@ public final class b {
         }
         if (mVar == null) {
             StringBuilder L = a.L("Unable to find acceptable protocols. isFallback=");
-            L.append(this.f2702c);
+            L.append(this.f2708c);
             L.append(',');
             L.append(" modes=");
             L.append(this.d);
@@ -76,13 +76,13 @@ public final class b {
             }
         }
         this.b = z2;
-        boolean z3 = this.f2702c;
+        boolean z3 = this.f2708c;
         d0.z.d.m.checkParameterIsNotNull(sSLSocket, "sslSocket");
         if (mVar.g != null) {
             String[] enabledCipherSuites = sSLSocket.getEnabledCipherSuites();
             d0.z.d.m.checkExpressionValueIsNotNull(enabledCipherSuites, "sslSocket.enabledCipherSuites");
             String[] strArr3 = mVar.g;
-            j.b bVar = j.f2748s;
+            j.b bVar = j.f2754s;
             Comparator<String> comparator = j.a;
             strArr = c.q(enabledCipherSuites, strArr3, j.a);
         } else {
@@ -97,7 +97,7 @@ public final class b {
         }
         String[] supportedCipherSuites = sSLSocket.getSupportedCipherSuites();
         d0.z.d.m.checkExpressionValueIsNotNull(supportedCipherSuites, "supportedCipherSuites");
-        j.b bVar2 = j.f2748s;
+        j.b bVar2 = j.f2754s;
         Comparator<String> comparator2 = j.a;
         Comparator<String> comparator3 = j.a;
         byte[] bArr = c.a;
diff --git a/app/src/main/java/f0/f0/g/c.java b/app/src/main/java/f0/f0/g/c.java
index 9113ef135f..97bbbda598 100644
--- a/app/src/main/java/f0/f0/g/c.java
+++ b/app/src/main/java/f0/f0/g/c.java
@@ -27,7 +27,7 @@ public final class c {
     public final j b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final e f2703c;
+    public final e f2709c;
     public final t d;
     public final d e;
     public final d f;
@@ -137,7 +137,7 @@ public final class c {
                 this.k = false;
                 c cVar = this.o;
                 t tVar = cVar.d;
-                e eVar = cVar.f2703c;
+                e eVar = cVar.f2709c;
                 Objects.requireNonNull(tVar);
                 m.checkParameterIsNotNull(eVar, "call");
             }
@@ -167,7 +167,7 @@ public final class c {
                         this.k = false;
                         c cVar = this.o;
                         t tVar = cVar.d;
-                        e eVar2 = cVar.f2703c;
+                        e eVar2 = cVar.f2709c;
                         Objects.requireNonNull(tVar);
                         m.checkParameterIsNotNull(eVar2, "call");
                     }
@@ -201,7 +201,7 @@ public final class c {
         m.checkParameterIsNotNull(tVar, "eventListener");
         m.checkParameterIsNotNull(dVar, "finder");
         m.checkParameterIsNotNull(dVar2, "codec");
-        this.f2703c = eVar;
+        this.f2709c = eVar;
         this.d = tVar;
         this.e = dVar;
         this.f = dVar2;
@@ -215,13 +215,13 @@ public final class c {
         if (z3) {
             if (e != null) {
                 t tVar = this.d;
-                e eVar = this.f2703c;
+                e eVar = this.f2709c;
                 Objects.requireNonNull(tVar);
                 m.checkParameterIsNotNull(eVar, "call");
                 m.checkParameterIsNotNull(e, "ioe");
             } else {
                 t tVar2 = this.d;
-                e eVar2 = this.f2703c;
+                e eVar2 = this.f2709c;
                 Objects.requireNonNull(tVar2);
                 m.checkParameterIsNotNull(eVar2, "call");
             }
@@ -229,18 +229,18 @@ public final class c {
         if (z2) {
             if (e != null) {
                 t tVar3 = this.d;
-                e eVar3 = this.f2703c;
+                e eVar3 = this.f2709c;
                 Objects.requireNonNull(tVar3);
                 m.checkParameterIsNotNull(eVar3, "call");
                 m.checkParameterIsNotNull(e, "ioe");
             } else {
                 t tVar4 = this.d;
-                e eVar4 = this.f2703c;
+                e eVar4 = this.f2709c;
                 Objects.requireNonNull(tVar4);
                 m.checkParameterIsNotNull(eVar4, "call");
             }
         }
-        return (E) this.f2703c.k(this, z3, z2, e);
+        return (E) this.f2709c.k(this, z3, z2, e);
     }
 
     public final v b(z zVar, boolean z2) throws IOException {
@@ -252,7 +252,7 @@ public final class c {
         }
         long contentLength = requestBody.contentLength();
         t tVar = this.d;
-        e eVar = this.f2703c;
+        e eVar = this.f2709c;
         Objects.requireNonNull(tVar);
         m.checkParameterIsNotNull(eVar, "call");
         return new a(this, this.f.h(zVar, contentLength), contentLength);
@@ -263,7 +263,7 @@ public final class c {
             this.f.f();
         } catch (IOException e) {
             t tVar = this.d;
-            e eVar = this.f2703c;
+            e eVar = this.f2709c;
             Objects.requireNonNull(tVar);
             m.checkParameterIsNotNull(eVar, "call");
             m.checkParameterIsNotNull(e, "ioe");
@@ -273,11 +273,11 @@ public final class c {
     }
 
     public final d.c d() throws SocketException {
-        this.f2703c.n();
+        this.f2709c.n();
         j e = this.f.e();
         Objects.requireNonNull(e);
         m.checkParameterIsNotNull(this, "exchange");
-        Socket socket = e.f2709c;
+        Socket socket = e.f2715c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -304,7 +304,7 @@ public final class c {
             return d;
         } catch (IOException e) {
             t tVar = this.d;
-            e eVar = this.f2703c;
+            e eVar = this.f2709c;
             Objects.requireNonNull(tVar);
             m.checkParameterIsNotNull(eVar, "call");
             m.checkParameterIsNotNull(e, "ioe");
@@ -315,7 +315,7 @@ public final class c {
 
     public final void f() {
         t tVar = this.d;
-        e eVar = this.f2703c;
+        e eVar = this.f2709c;
         Objects.requireNonNull(tVar);
         m.checkParameterIsNotNull(eVar, "call");
     }
@@ -323,7 +323,7 @@ public final class c {
     public final void g(IOException iOException) {
         this.e.c(iOException);
         j e = this.f.e();
-        e eVar = this.f2703c;
+        e eVar = this.f2709c;
         synchronized (e) {
             m.checkParameterIsNotNull(eVar, "call");
             if (iOException instanceof StreamResetException) {
@@ -341,7 +341,7 @@ public final class c {
             } else if (!e.j() || (iOException instanceof ConnectionShutdownException)) {
                 e.i = true;
                 if (e.l == 0) {
-                    e.d(eVar.f2706x, e.q, iOException);
+                    e.d(eVar.f2712x, e.q, iOException);
                     e.k++;
                 }
             }
diff --git a/app/src/main/java/f0/f0/g/d.java b/app/src/main/java/f0/f0/g/d.java
index eee809cd09..1037b534f8 100644
--- a/app/src/main/java/f0/f0/g/d.java
+++ b/app/src/main/java/f0/f0/g/d.java
@@ -28,7 +28,7 @@ public final class d {
     public m b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2704c;
+    public int f2710c;
     public int d;
     public int e;
     public d0 f;
@@ -110,7 +110,7 @@ public final class d {
                     d0.z.d.m.checkParameterIsNotNull(jVar, "connection");
                 }
             }
-            this.f2704c = 0;
+            this.f2710c = 0;
             this.d = 0;
             this.e = 0;
             if (this.g.a(this.h, this.i, null, false)) {
@@ -130,7 +130,7 @@ public final class d {
                         if (mVar2 == null) {
                             a aVar3 = this.h;
                             e eVar2 = this.i;
-                            mVar2 = new m(aVar3, eVar2.f2706x.N, eVar2, this.j);
+                            mVar2 = new m(aVar3, eVar2.f2712x.N, eVar2, this.j);
                             this.b = mVar2;
                         }
                         if (mVar2.a()) {
@@ -142,7 +142,7 @@ public final class d {
                                     mVar2.b = i6 + 1;
                                     Proxy proxy = (Proxy) list2.get(i6);
                                     ArrayList arrayList2 = new ArrayList();
-                                    mVar2.f2711c = arrayList2;
+                                    mVar2.f2717c = arrayList2;
                                     if (proxy.type() == Proxy.Type.DIRECT || proxy.type() == Proxy.Type.SOCKS) {
                                         w wVar = mVar2.e.a;
                                         str = wVar.g;
@@ -191,7 +191,7 @@ public final class d {
                                                 throw new UnknownHostException(mVar2.e.d + " returned no addresses for " + str);
                                             }
                                         }
-                                        for (InetSocketAddress inetSocketAddress2 : mVar2.f2711c) {
+                                        for (InetSocketAddress inetSocketAddress2 : mVar2.f2717c) {
                                             d0 d0Var2 = new d0(mVar2.e, proxy, inetSocketAddress2);
                                             l lVar2 = mVar2.f;
                                             synchronized (lVar2) {
@@ -239,7 +239,7 @@ public final class d {
                                 this.i.w = jVar2;
                                 jVar2.c(i, i2, i3, i4, z2, this.i, this.j);
                                 this.i.w = null;
-                                lVar = this.i.f2706x.N;
+                                lVar = this.i.f2712x.N;
                                 d0 d0Var3 = jVar2.q;
                                 synchronized (lVar) {
                                     d0.z.d.m.checkParameterIsNotNull(d0Var3, "route");
@@ -261,7 +261,7 @@ public final class d {
                                         d0.z.d.m.checkParameterIsNotNull(jVar2, "connection");
                                         byte[] bArr = c.a;
                                         kVar.d.add(jVar2);
-                                        f0.f0.f.c.d(kVar.b, kVar.f2710c, 0, 2);
+                                        f0.f0.f.c.d(kVar.b, kVar.f2716c, 0, 2);
                                         this.i.f(jVar2);
                                     }
                                     t tVar4 = this.j;
@@ -292,7 +292,7 @@ public final class d {
                 try {
                     jVar2.c(i, i2, i3, i4, z2, this.i, this.j);
                     this.i.w = null;
-                    lVar = this.i.f2706x.N;
+                    lVar = this.i.f2712x.N;
                     d0 d0Var3 = jVar2.q;
                     synchronized (lVar) {
                     }
@@ -318,7 +318,7 @@ public final class d {
         d0.z.d.m.checkParameterIsNotNull(iOException, "e");
         this.f = null;
         if ((iOException instanceof StreamResetException) && ((StreamResetException) iOException).errorCode == f0.f0.j.a.REFUSED_STREAM) {
-            this.f2704c++;
+            this.f2710c++;
         } else if (iOException instanceof ConnectionShutdownException) {
             this.d++;
         } else {
diff --git a/app/src/main/java/f0/f0/g/e.java b/app/src/main/java/f0/f0/g/e.java
index a81dcd7f70..927bebe19b 100644
--- a/app/src/main/java/f0/f0/g/e.java
+++ b/app/src/main/java/f0/f0/g/e.java
@@ -37,20 +37,20 @@ public final class e implements f0.e {
     public boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public boolean f2705s;
+    public boolean f2711s;
     public boolean t = true;
     public volatile boolean u;
     public volatile c v;
     public volatile j w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final x f2706x;
+    public final x f2712x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final z f2707y;
+    public final z f2713y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final boolean f2708z;
+    public final boolean f2714z;
 
     /* compiled from: RealCall.kt */
     public final class a implements Runnable {
@@ -65,7 +65,7 @@ public final class e implements f0.e {
         }
 
         public final String a() {
-            return this.k.f2707y.b.g;
+            return this.k.f2713y.b.g;
         }
 
         /* JADX WARNING: Removed duplicated region for block: B:18:0x0053 A[Catch:{ IOException -> 0x0076, all -> 0x004b, all -> 0x0074 }] */
@@ -77,7 +77,7 @@ public final class e implements f0.e {
             e eVar;
             Throwable th;
             StringBuilder L = c.d.b.a.a.L("OkHttp ");
-            L.append(this.k.f2707y.b.h());
+            L.append(this.k.f2713y.b.h());
             String sb = L.toString();
             Thread currentThread = Thread.currentThread();
             m.checkExpressionValueIsNotNull(currentThread, "currentThread");
@@ -96,7 +96,7 @@ public final class e implements f0.e {
                         if (!z2) {
                         }
                         eVar = this.k;
-                        eVar.f2706x.l.c(this);
+                        eVar.f2712x.l.c(this);
                     } catch (Throwable th2) {
                         th = th2;
                         z2 = true;
@@ -108,19 +108,19 @@ public final class e implements f0.e {
                 } catch (IOException e3) {
                     e = e3;
                     if (!z2) {
-                        h.a aVar = h.f2731c;
+                        h.a aVar = h.f2737c;
                         h hVar = h.a;
                         hVar.i("Callback failure for " + e.b(this.k), 4, e);
                     } else {
                         this.j.b(this.k, e);
                     }
                     eVar = this.k;
-                    eVar.f2706x.l.c(this);
+                    eVar.f2712x.l.c(this);
                 } catch (Throwable th3) {
-                    this.k.f2706x.l.c(this);
+                    this.k.f2712x.l.c(this);
                     throw th3;
                 }
-                eVar.f2706x.l.c(this);
+                eVar.f2712x.l.c(this);
             } finally {
                 currentThread.setName(name);
             }
@@ -156,9 +156,9 @@ public final class e implements f0.e {
     public e(x xVar, z zVar, boolean z2) {
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(zVar, "originalRequest");
-        this.f2706x = xVar;
-        this.f2707y = zVar;
-        this.f2708z = z2;
+        this.f2712x = xVar;
+        this.f2713y = zVar;
+        this.f2714z = z2;
         this.i = xVar.m.a;
         this.j = xVar.p.a(this);
         c cVar = new c(this);
@@ -169,15 +169,15 @@ public final class e implements f0.e {
     public static final String b(e eVar) {
         StringBuilder sb = new StringBuilder();
         sb.append(eVar.u ? "canceled " : "");
-        sb.append(eVar.f2708z ? "web socket" : "call");
+        sb.append(eVar.f2714z ? "web socket" : "call");
         sb.append(" to ");
-        sb.append(eVar.f2707y.b.h());
+        sb.append(eVar.f2713y.b.h());
         return sb.toString();
     }
 
     @Override // f0.e
     public z c() {
-        return this.f2707y;
+        return this.f2713y;
     }
 
     @Override // f0.e
@@ -200,7 +200,7 @@ public final class e implements f0.e {
 
     @Override // java.lang.Object
     public Object clone() {
-        return new e(this.f2706x, this.f2707y, this.f2708z);
+        return new e(this.f2712x, this.f2713y, this.f2714z);
     }
 
     @Override // f0.e
@@ -214,15 +214,15 @@ public final class e implements f0.e {
         m.checkParameterIsNotNull(fVar, "responseCallback");
         if (this.l.compareAndSet(false, true)) {
             h();
-            q qVar = this.f2706x.l;
+            q qVar = this.f2712x.l;
             a aVar2 = new a(this, fVar);
             Objects.requireNonNull(qVar);
             m.checkParameterIsNotNull(aVar2, "call");
             synchronized (qVar) {
                 qVar.b.add(aVar2);
-                if (!aVar2.k.f2708z) {
+                if (!aVar2.k.f2714z) {
                     String a2 = aVar2.a();
-                    Iterator<a> it = qVar.f2752c.iterator();
+                    Iterator<a> it = qVar.f2758c.iterator();
                     while (true) {
                         if (!it.hasNext()) {
                             Iterator<a> it2 = qVar.b.iterator();
@@ -262,14 +262,14 @@ public final class e implements f0.e {
             this.k.i();
             h();
             try {
-                q qVar2 = this.f2706x.l;
+                q qVar2 = this.f2712x.l;
                 synchronized (qVar2) {
                     m.checkParameterIsNotNull(this, "call");
                     qVar2.d.add(this);
                 }
                 return j();
             } finally {
-                qVar = this.f2706x.l;
+                qVar = this.f2712x.l;
                 Objects.requireNonNull(qVar);
                 m.checkParameterIsNotNull(this, "call");
                 qVar.b(qVar.d, this);
@@ -338,7 +338,7 @@ public final class e implements f0.e {
     }
 
     public final void h() {
-        h.a aVar = h.f2731c;
+        h.a aVar = h.f2737c;
         this.m = h.a.g("response.body().close()");
         Objects.requireNonNull(this.j);
         m.checkParameterIsNotNull(this, "call");
@@ -353,7 +353,7 @@ public final class e implements f0.e {
         }
         if (z2 && (cVar = this.v) != null) {
             cVar.f.cancel();
-            cVar.f2703c.k(cVar, true, true, null);
+            cVar.f2709c.k(cVar, true, true, null);
         }
         this.q = null;
     }
@@ -397,22 +397,22 @@ public final class e implements f0.e {
     /* JADX WARNING: Removed duplicated region for block: B:28:0x0095  */
     public final Response j() throws IOException {
         ArrayList arrayList = new ArrayList();
-        r.addAll(arrayList, this.f2706x.n);
-        arrayList.add(new i(this.f2706x));
-        arrayList.add(new f0.f0.h.a(this.f2706x.u));
-        Objects.requireNonNull(this.f2706x);
+        r.addAll(arrayList, this.f2712x.n);
+        arrayList.add(new i(this.f2712x));
+        arrayList.add(new f0.f0.h.a(this.f2712x.u));
+        Objects.requireNonNull(this.f2712x);
         arrayList.add(new f0.f0.e.a());
         arrayList.add(a.b);
-        if (!this.f2708z) {
-            r.addAll(arrayList, this.f2706x.o);
+        if (!this.f2714z) {
+            r.addAll(arrayList, this.f2712x.o);
         }
-        arrayList.add(new f0.f0.h.b(this.f2708z));
-        z zVar = this.f2707y;
-        x xVar = this.f2706x;
+        arrayList.add(new f0.f0.h.b(this.f2714z));
+        z zVar = this.f2713y;
+        x xVar = this.f2712x;
         g gVar = new g(this, arrayList, 0, null, zVar, xVar.I, xVar.J, xVar.K);
         boolean z2 = false;
         try {
-            Response a2 = gVar.a(this.f2707y);
+            Response a2 = gVar.a(this.f2713y);
             if (!this.u) {
                 l(null);
                 return a2;
@@ -446,11 +446,11 @@ public final class e implements f0.e {
                         this.r = false;
                     }
                     if (z3) {
-                        this.f2705s = false;
+                        this.f2711s = false;
                     }
                     boolean z6 = this.r;
-                    boolean z7 = z6 && !this.f2705s;
-                    if (!z6 && !this.f2705s && !this.t) {
+                    boolean z7 = z6 && !this.f2711s;
+                    if (!z6 && !this.f2711s && !this.t) {
                         z4 = true;
                     }
                     z5 = z4;
@@ -459,7 +459,7 @@ public final class e implements f0.e {
                     throw th;
                 }
             }
-            if (!z3 || !this.f2705s) {
+            if (!z3 || !this.f2711s) {
                 z5 = false;
             }
             if (z2) {
@@ -491,7 +491,7 @@ public final class e implements f0.e {
             z2 = false;
             if (this.t) {
                 this.t = false;
-                if (!this.r && !this.f2705s) {
+                if (!this.r && !this.f2711s) {
                     z2 = true;
                 }
             }
@@ -536,7 +536,7 @@ public final class e implements f0.e {
                     }
                     z2 = true;
                 } else {
-                    f0.f0.f.c.d(kVar.b, kVar.f2710c, 0, 2);
+                    f0.f0.f.c.d(kVar.b, kVar.f2716c, 0, 2);
                 }
                 if (z2) {
                     return jVar.n();
diff --git a/app/src/main/java/f0/f0/g/j.java b/app/src/main/java/f0/f0/g/j.java
index 07a68799f1..bab3df83b3 100644
--- a/app/src/main/java/f0/f0/g/j.java
+++ b/app/src/main/java/f0/f0/g/j.java
@@ -63,7 +63,7 @@ public final class j extends e.c implements k {
     public Socket b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Socket f2709c;
+    public Socket f2715c;
     public v d;
     public y e;
     public e f;
@@ -112,13 +112,13 @@ public final class j extends e.c implements k {
         m.checkParameterIsNotNull(eVar, "call");
         m.checkParameterIsNotNull(tVar, "eventListener");
         if (this.e == null) {
-            List<f0.m> list = this.q.a.f2695c;
+            List<f0.m> list = this.q.a.f2701c;
             b bVar = new b(list);
             f0.a aVar = this.q.a;
             if (aVar.f == null) {
                 if (list.contains(f0.m.d)) {
                     String str = this.q.a.a.g;
-                    h.a aVar2 = h.f2731c;
+                    h.a aVar2 = h.f2737c;
                     if (!h.a.h(str)) {
                         throw new RouteException(new UnknownServiceException(c.d.b.a.a.v("CLEARTEXT communication to ", str, " not permitted by network security policy")));
                     }
@@ -145,13 +145,13 @@ public final class j extends e.c implements k {
                             e(i, i2, eVar, tVar);
                         } catch (IOException e2) {
                             e = e2;
-                            socket = this.f2709c;
+                            socket = this.f2715c;
                             if (socket != null) {
                             }
                             socket2 = this.b;
                             if (socket2 != null) {
                             }
-                            this.f2709c = null;
+                            this.f2715c = null;
                             this.b = null;
                             this.g = null;
                             this.h = null;
@@ -160,7 +160,7 @@ public final class j extends e.c implements k {
                             this.f = null;
                             this.n = 1;
                             d0 d0Var = this.q;
-                            InetSocketAddress inetSocketAddress = d0Var.f2697c;
+                            InetSocketAddress inetSocketAddress = d0Var.f2703c;
                             Proxy proxy = d0Var.b;
                             Objects.requireNonNull(tVar);
                             m.checkParameterIsNotNull(eVar, "call");
@@ -177,7 +177,7 @@ public final class j extends e.c implements k {
                     try {
                         g(bVar, i4, eVar, tVar);
                         d0 d0Var2 = this.q;
-                        InetSocketAddress inetSocketAddress2 = d0Var2.f2697c;
+                        InetSocketAddress inetSocketAddress2 = d0Var2.f2703c;
                         Proxy proxy2 = d0Var2.b;
                         Objects.requireNonNull(tVar);
                         m.checkParameterIsNotNull(eVar, "call");
@@ -192,7 +192,7 @@ public final class j extends e.c implements k {
                     }
                 } catch (IOException e4) {
                     e = e4;
-                    socket = this.f2709c;
+                    socket = this.f2715c;
                     if (socket != null) {
                         c.e(socket);
                     }
@@ -200,7 +200,7 @@ public final class j extends e.c implements k {
                     if (socket2 != null) {
                         c.e(socket2);
                     }
-                    this.f2709c = null;
+                    this.f2715c = null;
                     this.b = null;
                     this.g = null;
                     this.h = null;
@@ -209,7 +209,7 @@ public final class j extends e.c implements k {
                     this.f = null;
                     this.n = 1;
                     d0 d0Var = this.q;
-                    InetSocketAddress inetSocketAddress = d0Var.f2697c;
+                    InetSocketAddress inetSocketAddress = d0Var.f2703c;
                     Proxy proxy = d0Var.b;
                     Objects.requireNonNull(tVar);
                     m.checkParameterIsNotNull(eVar, "call");
@@ -225,7 +225,7 @@ public final class j extends e.c implements k {
                         break;
                     }
                     m.checkParameterIsNotNull(e, "e");
-                    bVar.f2702c = true;
+                    bVar.f2708c = true;
                     if (bVar.b && !(e instanceof ProtocolException) && !(e instanceof InterruptedIOException) && ((!(e instanceof SSLHandshakeException) || !(e.getCause() instanceof CertificateException)) && !(e instanceof SSLPeerUnverifiedException) && (e instanceof SSLException))) {
                         z3 = true;
                         continue;
@@ -274,15 +274,15 @@ public final class j extends e.c implements k {
             socket = new Socket(proxy);
         }
         this.b = socket;
-        InetSocketAddress inetSocketAddress = this.q.f2697c;
+        InetSocketAddress inetSocketAddress = this.q.f2703c;
         Objects.requireNonNull(tVar);
         m.checkParameterIsNotNull(eVar, "call");
         m.checkParameterIsNotNull(inetSocketAddress, "inetSocketAddress");
         m.checkParameterIsNotNull(proxy, "proxy");
         socket.setSoTimeout(i2);
         try {
-            h.a aVar2 = h.f2731c;
-            h.a.e(socket, this.q.f2697c, i);
+            h.a aVar2 = h.f2737c;
+            h.a.e(socket, this.q.f2703c, i);
             try {
                 g0.x Q = c.q.a.k.a.Q(socket);
                 m.checkParameterIsNotNull(Q, "$this$buffer");
@@ -297,7 +297,7 @@ public final class j extends e.c implements k {
             }
         } catch (ConnectException e2) {
             StringBuilder L = c.d.b.a.a.L("Failed to connect to ");
-            L.append(this.q.f2697c);
+            L.append(this.q.f2703c);
             ConnectException connectException = new ConnectException(L.toString());
             connectException.initCause(e2);
             throw connectException;
@@ -317,9 +317,9 @@ public final class j extends e.c implements k {
         Response.a aVar2 = new Response.a();
         aVar2.g(a);
         aVar2.f(y.HTTP_1_1);
-        aVar2.f2856c = 407;
+        aVar2.f2862c = 407;
         aVar2.e("Preemptive Authenticate");
-        aVar2.g = c.f2698c;
+        aVar2.g = c.f2704c;
         aVar2.k = -1;
         aVar2.l = -1;
         m.checkParameterIsNotNull("Proxy-Authenticate", "name");
@@ -407,7 +407,7 @@ public final class j extends e.c implements k {
                 this.h = null;
                 this.g = null;
                 d0 d0Var3 = this.q;
-                InetSocketAddress inetSocketAddress = d0Var3.f2697c;
+                InetSocketAddress inetSocketAddress = d0Var3.f2703c;
                 Proxy proxy = d0Var3.b;
                 Objects.requireNonNull(tVar);
                 m.checkParameterIsNotNull(eVar, "call");
@@ -433,12 +433,12 @@ public final class j extends e.c implements k {
             List<y> list = aVar.b;
             y yVar2 = y.H2_PRIOR_KNOWLEDGE;
             if (list.contains(yVar2)) {
-                this.f2709c = this.b;
+                this.f2715c = this.b;
                 this.e = yVar2;
                 o(i);
                 return;
             }
-            this.f2709c = this.b;
+            this.f2715c = this.b;
             this.e = yVar;
             return;
         }
@@ -467,7 +467,7 @@ public final class j extends e.c implements k {
             try {
                 f0.m a = bVar.a(sSLSocket);
                 if (a.f) {
-                    h.a aVar3 = h.f2731c;
+                    h.a aVar3 = h.f2737c;
                     h.a.d(sSLSocket, aVar2.a.g, aVar2.b);
                 }
                 sSLSocket.startHandshake();
@@ -508,15 +508,15 @@ public final class j extends e.c implements k {
                 if (gVar == null) {
                     m.throwNpe();
                 }
-                this.d = new v(a2.b, a2.f2755c, a2.d, new g(gVar, a2, aVar2));
+                this.d = new v(a2.b, a2.f2761c, a2.d, new g(gVar, a2, aVar2));
                 gVar.a(aVar2.a.g, new h(this));
                 if (a.f) {
-                    h.a aVar4 = h.f2731c;
+                    h.a aVar4 = h.f2737c;
                     str = h.a.f(sSLSocket);
                 } else {
                     str = null;
                 }
-                this.f2709c = sSLSocket;
+                this.f2715c = sSLSocket;
                 g0.x Q = c.q.a.k.a.Q(sSLSocket);
                 m.checkParameterIsNotNull(Q, "$this$buffer");
                 this.g = new r(Q);
@@ -527,7 +527,7 @@ public final class j extends e.c implements k {
                     yVar = y.p.a(str);
                 }
                 this.e = yVar;
-                h.a aVar5 = h.f2731c;
+                h.a aVar5 = h.f2737c;
                 h.a.a(sSLSocket);
                 m.checkParameterIsNotNull(eVar, "call");
                 if (this.e == y.HTTP_2) {
@@ -536,7 +536,7 @@ public final class j extends e.c implements k {
             } catch (Throwable th3) {
                 th = th3;
                 if (sSLSocket != null) {
-                    h.a aVar6 = h.f2731c;
+                    h.a aVar6 = h.f2737c;
                     h.a.a(sSLSocket);
                 }
                 if (sSLSocket != null) {
@@ -580,7 +580,7 @@ public final class j extends e.c implements k {
                         break;
                     }
                     d0 d0Var = (d0) it.next();
-                    if (d0Var.b.type() == Proxy.Type.DIRECT && this.q.b.type() == Proxy.Type.DIRECT && m.areEqual(this.q.f2697c, d0Var.f2697c)) {
+                    if (d0Var.b.type() == Proxy.Type.DIRECT && this.q.b.type() == Proxy.Type.DIRECT && m.areEqual(this.q.f2703c, d0Var.f2703c)) {
                         z5 = true;
                         continue;
                     } else {
@@ -665,7 +665,7 @@ public final class j extends e.c implements k {
         if (socket == null) {
             m.throwNpe();
         }
-        Socket socket2 = this.f2709c;
+        Socket socket2 = this.f2715c;
         if (socket2 == null) {
             m.throwNpe();
         }
@@ -682,7 +682,7 @@ public final class j extends e.c implements k {
                 if (eVar.q) {
                     return false;
                 }
-                return eVar.f2724z >= eVar.f2723y || nanoTime < eVar.B;
+                return eVar.f2730z >= eVar.f2729y || nanoTime < eVar.B;
             }
         }
         synchronized (this) {
@@ -718,7 +718,7 @@ public final class j extends e.c implements k {
     public final f0.f0.h.d k(x xVar, f0.f0.h.g gVar) throws SocketException {
         m.checkParameterIsNotNull(xVar, "client");
         m.checkParameterIsNotNull(gVar, "chain");
-        Socket socket = this.f2709c;
+        Socket socket = this.f2715c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -754,7 +754,7 @@ public final class j extends e.c implements k {
     }
 
     public Socket n() {
-        Socket socket = this.f2709c;
+        Socket socket = this.f2715c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -763,7 +763,7 @@ public final class j extends e.c implements k {
 
     public final void o(int i) throws IOException {
         String str;
-        Socket socket = this.f2709c;
+        Socket socket = this.f2715c;
         if (socket == null) {
             m.throwNpe();
         }
@@ -790,7 +790,7 @@ public final class j extends e.c implements k {
             str = c.d.b.a.a.u("MockWebServer ", str2);
         }
         bVar.b = str;
-        bVar.f2725c = gVar;
+        bVar.f2731c = gVar;
         bVar.d = bufferedSink;
         m.checkParameterIsNotNull(this, "listener");
         bVar.e = this;
@@ -852,10 +852,10 @@ public final class j extends e.c implements k {
         L.append(" proxy=");
         L.append(this.q.b);
         L.append(" hostAddress=");
-        L.append(this.q.f2697c);
+        L.append(this.q.f2703c);
         L.append(" cipherSuite=");
         v vVar = this.d;
-        if (vVar == null || (obj = vVar.f2755c) == null) {
+        if (vVar == null || (obj = vVar.f2761c) == null) {
             obj = "none";
         }
         L.append(obj);
diff --git a/app/src/main/java/f0/f0/g/k.java b/app/src/main/java/f0/f0/g/k.java
index 4efe65d91d..26f1f75c36 100644
--- a/app/src/main/java/f0/f0/g/k.java
+++ b/app/src/main/java/f0/f0/g/k.java
@@ -17,7 +17,7 @@ public final class k {
     public final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final a f2710c = new a(this, c.d.b.a.a.D(new StringBuilder(), f0.f0.c.g, " ConnectionPool"));
+    public final a f2716c = new a(this, c.d.b.a.a.D(new StringBuilder(), f0.f0.c.g, " ConnectionPool"));
     public final ConcurrentLinkedQueue<j> d = new ConcurrentLinkedQueue<>();
     public final int e;
 
@@ -134,7 +134,7 @@ public final class k {
                 L.append(" was leaked. ");
                 L.append("Did you forget to close a response body?");
                 String sb = L.toString();
-                h.a aVar = h.f2731c;
+                h.a aVar = h.f2737c;
                 h.a.k(sb, ((e.b) reference).a);
                 list.remove(i);
                 jVar.i = true;
diff --git a/app/src/main/java/f0/f0/g/m.java b/app/src/main/java/f0/f0/g/m.java
index fefbd84931..8ccea90ee5 100644
--- a/app/src/main/java/f0/f0/g/m.java
+++ b/app/src/main/java/f0/f0/g/m.java
@@ -17,7 +17,7 @@ public final class m {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public List<? extends InetSocketAddress> f2711c = n.emptyList();
+    public List<? extends InetSocketAddress> f2717c = n.emptyList();
     public final List<d0> d = new ArrayList();
     public final f0.a e;
     public final l f;
diff --git a/app/src/main/java/f0/f0/h/b.java b/app/src/main/java/f0/f0/h/b.java
index 4304771242..78d6554020 100644
--- a/app/src/main/java/f0/f0/h/b.java
+++ b/app/src/main/java/f0/f0/h/b.java
@@ -49,18 +49,18 @@ public final class b implements Interceptor {
         m.checkParameterIsNotNull(zVar, "request");
         try {
             t tVar = cVar.d;
-            e eVar = cVar.f2703c;
+            e eVar = cVar.f2709c;
             Objects.requireNonNull(tVar);
             m.checkParameterIsNotNull(eVar, "call");
             cVar.f.b(zVar);
             t tVar2 = cVar.d;
-            e eVar2 = cVar.f2703c;
+            e eVar2 = cVar.f2709c;
             Objects.requireNonNull(tVar2);
             m.checkParameterIsNotNull(eVar2, "call");
             m.checkParameterIsNotNull(zVar, "request");
             Response.a aVar2 = null;
-            if (!f.a(zVar.f2767c) || requestBody == null) {
-                cVar.f2703c.k(cVar, true, false, null);
+            if (!f.a(zVar.f2773c) || requestBody == null) {
+                cVar.f2709c.k(cVar, true, false, null);
                 z2 = true;
             } else {
                 if (d0.g0.t.equals("100-continue", zVar.b("Expect"), true)) {
@@ -73,7 +73,7 @@ public final class b implements Interceptor {
                     aVar = null;
                 }
                 if (aVar != null) {
-                    cVar.f2703c.k(cVar, true, false, null);
+                    cVar.f2709c.k(cVar, true, false, null);
                     if (!cVar.b.j()) {
                         cVar.f.e().l();
                     }
@@ -96,7 +96,7 @@ public final class b implements Interceptor {
                     cVar.f.a();
                 } catch (IOException e) {
                     t tVar3 = cVar.d;
-                    e eVar3 = cVar.f2703c;
+                    e eVar3 = cVar.f2709c;
                     Objects.requireNonNull(tVar3);
                     m.checkParameterIsNotNull(eVar3, "call");
                     m.checkParameterIsNotNull(e, "ioe");
@@ -137,7 +137,7 @@ public final class b implements Interceptor {
             }
             m.checkParameterIsNotNull(a, "response");
             t tVar4 = cVar.d;
-            e eVar4 = cVar.f2703c;
+            e eVar4 = cVar.f2709c;
             Objects.requireNonNull(tVar4);
             m.checkParameterIsNotNull(eVar4, "call");
             m.checkParameterIsNotNull(a, "response");
@@ -152,7 +152,7 @@ public final class b implements Interceptor {
                 Response response2 = a.p;
                 Response response3 = a.q;
                 Response response4 = a.r;
-                long j = a.f2855s;
+                long j = a.f2861s;
                 long j2 = a.t;
                 c cVar2 = a.u;
                 m.checkParameterIsNotNull(a, "response");
@@ -176,7 +176,7 @@ public final class b implements Interceptor {
                     }
                 } catch (IOException e4) {
                     t tVar5 = cVar.d;
-                    e eVar5 = cVar.f2703c;
+                    e eVar5 = cVar.f2709c;
                     Objects.requireNonNull(tVar5);
                     m.checkParameterIsNotNull(eVar5, "call");
                     m.checkParameterIsNotNull(e4, "ioe");
@@ -194,10 +194,10 @@ public final class b implements Interceptor {
                 Response response5 = a.p;
                 Response response6 = a.q;
                 Response response7 = a.r;
-                long j3 = a.f2855s;
+                long j3 = a.f2861s;
                 long j4 = a.t;
                 c cVar3 = a.u;
-                ResponseBody responseBody = f0.f0.c.f2698c;
+                ResponseBody responseBody = f0.f0.c.f2704c;
                 if (!(i4 >= 0)) {
                     throw new IllegalStateException(a.l("code < 0: ", i4).toString());
                 } else if (zVar3 == null) {
@@ -232,7 +232,7 @@ public final class b implements Interceptor {
             return response;
         } catch (IOException e6) {
             t tVar6 = cVar.d;
-            e eVar6 = cVar.f2703c;
+            e eVar6 = cVar.f2709c;
             Objects.requireNonNull(tVar6);
             m.checkParameterIsNotNull(eVar6, "call");
             m.checkParameterIsNotNull(e6, "ioe");
diff --git a/app/src/main/java/f0/f0/h/c.java b/app/src/main/java/f0/f0/h/c.java
index 5205f44b21..fc7bb87425 100644
--- a/app/src/main/java/f0/f0/h/c.java
+++ b/app/src/main/java/f0/f0/h/c.java
@@ -9,7 +9,7 @@ public final class c {
     public static final String[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final DateFormat[] f2712c;
+    public static final DateFormat[] f2718c;
 
     /* compiled from: dates.kt */
     public static final class a extends ThreadLocal<DateFormat> {
@@ -26,6 +26,6 @@ public final class c {
     static {
         String[] strArr = {"EEE, dd MMM yyyy HH:mm:ss zzz", "EEEE, dd-MMM-yy HH:mm:ss zzz", "EEE MMM d HH:mm:ss yyyy", "EEE, dd-MMM-yyyy HH:mm:ss z", "EEE, dd-MMM-yyyy HH-mm-ss z", "EEE, dd MMM yy HH:mm:ss z", "EEE dd-MMM-yyyy HH:mm:ss z", "EEE dd MMM yyyy HH:mm:ss z", "EEE dd-MMM-yyyy HH-mm-ss z", "EEE dd-MMM-yy HH:mm:ss z", "EEE dd MMM yy HH:mm:ss z", "EEE,dd-MMM-yy HH:mm:ss z", "EEE,dd-MMM-yyyy HH:mm:ss z", "EEE, dd-MM-yyyy HH:mm:ss z", "EEE MMM d yyyy HH:mm:ss z"};
         b = strArr;
-        f2712c = new DateFormat[strArr.length];
+        f2718c = new DateFormat[strArr.length];
     }
 }
diff --git a/app/src/main/java/f0/f0/h/e.java b/app/src/main/java/f0/f0/h/e.java
index c4d6b24b74..c1901e219f 100644
--- a/app/src/main/java/f0/f0/h/e.java
+++ b/app/src/main/java/f0/f0/h/e.java
@@ -35,7 +35,7 @@ public final class e {
 
     public static final boolean a(Response response) {
         m.checkParameterIsNotNull(response, "$this$promisesBody");
-        if (m.areEqual(response.i.f2767c, "HEAD")) {
+        if (m.areEqual(response.i.f2773c, "HEAD")) {
             return false;
         }
         int i = response.l;
@@ -157,7 +157,7 @@ public final class e {
         if (r5.b(r0, r8) == false) goto L_0x0225;
      */
     /* JADX WARNING: Code restructure failed: missing block: B:110:0x0223, code lost:
-        if (okhttp3.internal.publicsuffix.PublicSuffixDatabase.f2857c.a(r8) == null) goto L_0x0225;
+        if (okhttp3.internal.publicsuffix.PublicSuffixDatabase.f2863c.a(r8) == null) goto L_0x0225;
      */
     /* JADX WARNING: Removed duplicated region for block: B:129:0x0277  */
     /* JADX WARNING: Removed duplicated region for block: B:150:0x0282 A[SYNTHETIC] */
diff --git a/app/src/main/java/f0/f0/h/g.java b/app/src/main/java/f0/f0/h/g.java
index 192f3073ff..671cbc9ffe 100644
--- a/app/src/main/java/f0/f0/h/g.java
+++ b/app/src/main/java/f0/f0/h/g.java
@@ -16,7 +16,7 @@ public final class g implements Interceptor.Chain {
     public final e b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<Interceptor> f2713c;
+    public final List<Interceptor> f2719c;
     public final int d;
     public final c e;
     public final z f;
@@ -31,7 +31,7 @@ public final class g implements Interceptor.Chain {
         m.checkParameterIsNotNull(list, "interceptors");
         m.checkParameterIsNotNull(zVar, "request");
         this.b = eVar;
-        this.f2713c = list;
+        this.f2719c = list;
         this.d = i;
         this.e = cVar;
         this.f = zVar;
@@ -48,37 +48,37 @@ public final class g implements Interceptor.Chain {
         int i8 = (i5 & 16) != 0 ? gVar.h : i3;
         int i9 = (i5 & 32) != 0 ? gVar.i : i4;
         m.checkParameterIsNotNull(zVar2, "request");
-        return new g(gVar.b, gVar.f2713c, i6, cVar2, zVar2, i7, i8, i9);
+        return new g(gVar.b, gVar.f2719c, i6, cVar2, zVar2, i7, i8, i9);
     }
 
     @Override // okhttp3.Interceptor.Chain
     public Response a(z zVar) throws IOException {
         m.checkParameterIsNotNull(zVar, "request");
         boolean z2 = false;
-        if (this.d < this.f2713c.size()) {
+        if (this.d < this.f2719c.size()) {
             this.a++;
             c cVar = this.e;
             if (cVar != null) {
                 if (cVar.e.b(zVar.b)) {
                     if (!(this.a == 1)) {
                         StringBuilder L = a.L("network interceptor ");
-                        L.append(this.f2713c.get(this.d - 1));
+                        L.append(this.f2719c.get(this.d - 1));
                         L.append(" must call proceed() exactly once");
                         throw new IllegalStateException(L.toString().toString());
                     }
                 } else {
                     StringBuilder L2 = a.L("network interceptor ");
-                    L2.append(this.f2713c.get(this.d - 1));
+                    L2.append(this.f2719c.get(this.d - 1));
                     L2.append(" must retain the same host and port");
                     throw new IllegalStateException(L2.toString().toString());
                 }
             }
             g d = d(this, this.d + 1, null, zVar, 0, 0, 0, 58);
-            Interceptor interceptor = this.f2713c.get(this.d);
+            Interceptor interceptor = this.f2719c.get(this.d);
             Response intercept = interceptor.intercept(d);
             if (intercept != null) {
                 if (this.e != null) {
-                    if (!(this.d + 1 >= this.f2713c.size() || d.a == 1)) {
+                    if (!(this.d + 1 >= this.f2719c.size() || d.a == 1)) {
                         throw new IllegalStateException(("network interceptor " + interceptor + " must call proceed() exactly once").toString());
                     }
                 }
diff --git a/app/src/main/java/f0/f0/h/h.java b/app/src/main/java/f0/f0/h/h.java
index 0fef6c3636..55e31e568e 100644
--- a/app/src/main/java/f0/f0/h/h.java
+++ b/app/src/main/java/f0/f0/h/h.java
@@ -28,7 +28,7 @@ public final class h extends ResponseBody {
         if (str == null) {
             return null;
         }
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
         return MediaType.a.b(str);
     }
 
diff --git a/app/src/main/java/f0/f0/h/i.java b/app/src/main/java/f0/f0/h/i.java
index 2f330c1615..c2a30d5da2 100644
--- a/app/src/main/java/f0/f0/h/i.java
+++ b/app/src/main/java/f0/f0/h/i.java
@@ -55,7 +55,7 @@ public final class i implements Interceptor {
         d0 d0Var = (cVar == null || (jVar = cVar.b) == null) ? null : jVar.q;
         int i = response.l;
         z zVar = response.i;
-        String str = zVar.f2767c;
+        String str = zVar.f2773c;
         boolean z2 = false;
         if (!(i == 307 || i == 308)) {
             if (i == 401) {
@@ -82,7 +82,7 @@ public final class i implements Interceptor {
                     m.throwNpe();
                 }
                 if (d0Var.b.type() == Proxy.Type.HTTP) {
-                    return this.b.f2760y.a(d0Var, response);
+                    return this.b.f2766y.a(d0Var, response);
                 }
                 throw new ProtocolException("Received HTTP_PROXY_AUTH (407) code while not using proxy");
             } else if (i != 408) {
@@ -109,7 +109,7 @@ public final class i implements Interceptor {
                 return null;
             }
         }
-        if (!this.b.f2758s || (a = Response.a(response, "Location", null, 2)) == null) {
+        if (!this.b.f2764s || (a = Response.a(response, "Location", null, 2)) == null) {
             return null;
         }
         w wVar = response.i.b;
@@ -172,7 +172,7 @@ public final class i implements Interceptor {
         if (dVar == null) {
             m.throwNpe();
         }
-        int i = dVar.f2704c;
+        int i = dVar.f2710c;
         if (i == 0 && dVar.d == 0 && dVar.e == 0) {
             z3 = false;
         } else {
@@ -259,7 +259,7 @@ public final class i implements Interceptor {
             if (eVar4.q == null) {
                 synchronized (eVar4) {
                     try {
-                        if (!(eVar4.f2705s ^ z3)) {
+                        if (!(eVar4.f2711s ^ z3)) {
                             throw new IllegalStateException("cannot make a new request because the previous response is still open: please call response.close()".toString());
                         } else if (!(eVar4.r ^ z3)) {
                             eVar = eVar4;
@@ -279,8 +279,8 @@ public final class i implements Interceptor {
                 if (z4) {
                     k kVar = eVar4.i;
                     w wVar = zVar3.b;
-                    if (wVar.f2756c) {
-                        x xVar = eVar4.f2706x;
+                    if (wVar.f2762c) {
+                        x xVar = eVar4.f2712x;
                         SSLSocketFactory sSLSocketFactory2 = xVar.A;
                         if (sSLSocketFactory2 != null) {
                             HostnameVerifier hostnameVerifier2 = xVar.E;
@@ -297,11 +297,11 @@ public final class i implements Interceptor {
                     }
                     String str2 = wVar.g;
                     int i4 = wVar.h;
-                    x xVar2 = eVar4.f2706x;
+                    x xVar2 = eVar4.f2712x;
                     list = emptyList;
                     i = i3;
                     response = response5;
-                    eVar4.n = new d(kVar, new a(str2, i4, xVar2.v, xVar2.f2761z, sSLSocketFactory, hostnameVerifier, gVar2, xVar2.f2760y, xVar2.w, xVar2.D, xVar2.C, xVar2.f2759x), eVar4, eVar4.j);
+                    eVar4.n = new d(kVar, new a(str2, i4, xVar2.v, xVar2.f2767z, sSLSocketFactory, hostnameVerifier, gVar2, xVar2.f2766y, xVar2.w, xVar2.D, xVar2.C, xVar2.f2765x), eVar4, eVar4.j);
                 } else {
                     list = emptyList;
                     response = response5;
@@ -323,7 +323,7 @@ public final class i implements Interceptor {
                                     responseBody = a.o;
                                     response3 = a.p;
                                     response4 = a.q;
-                                    j = a.f2855s;
+                                    j = a.f2861s;
                                     gVar = gVar3;
                                     eVar3 = eVar4;
                                 } catch (Throwable th5) {
@@ -346,7 +346,7 @@ public final class i implements Interceptor {
                                     Response response6 = response.p;
                                     Response response7 = response.q;
                                     Response response8 = response.r;
-                                    long j3 = response.f2855s;
+                                    long j3 = response.f2861s;
                                     long j4 = response.t;
                                     c cVar2 = response.u;
                                     if (!(i5 >= 0)) {
diff --git a/app/src/main/java/f0/f0/h/j.java b/app/src/main/java/f0/f0/h/j.java
index 5509034667..2aeb905e41 100644
--- a/app/src/main/java/f0/f0/h/j.java
+++ b/app/src/main/java/f0/f0/h/j.java
@@ -12,14 +12,14 @@ public final class j {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2714c;
+    public final String f2720c;
 
     public j(y yVar, int i, String str) {
         m.checkParameterIsNotNull(yVar, "protocol");
         m.checkParameterIsNotNull(str, "message");
         this.a = yVar;
         this.b = i;
-        this.f2714c = str;
+        this.f2720c = str;
     }
 
     public static final j a(String str) throws IOException {
@@ -77,7 +77,7 @@ public final class j {
         sb.append(' ');
         sb.append(this.b);
         sb.append(' ');
-        sb.append(this.f2714c);
+        sb.append(this.f2720c);
         String sb2 = sb.toString();
         m.checkExpressionValueIsNotNull(sb2, "StringBuilder().apply(builderAction).toString()");
         return sb2;
diff --git a/app/src/main/java/f0/f0/i/b.java b/app/src/main/java/f0/f0/i/b.java
index 343b81492b..c0dded306a 100644
--- a/app/src/main/java/f0/f0/i/b.java
+++ b/app/src/main/java/f0/f0/i/b.java
@@ -29,7 +29,7 @@ public final class b implements f0.f0.h.d {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public Headers f2715c;
+    public Headers f2721c;
     public final x d;
     public final j e;
     public final g f;
@@ -178,14 +178,14 @@ public final class b implements f0.f0.h.d {
                                     if (this.l == 0) {
                                         this.m = false;
                                         b bVar = this.o;
-                                        bVar.f2715c = bVar.b.a();
+                                        bVar.f2721c = bVar.b.a();
                                         x xVar = this.o.d;
                                         if (xVar == null) {
                                             m.throwNpe();
                                         }
                                         p pVar = xVar.u;
                                         w wVar = this.n;
-                                        Headers headers = this.o.f2715c;
+                                        Headers headers = this.o.f2721c;
                                         if (headers == null) {
                                             m.throwNpe();
                                         }
@@ -384,10 +384,10 @@ public final class b implements f0.f0.h.d {
         m.checkParameterIsNotNull(zVar, "request");
         m.checkParameterIsNotNull(type, "proxyType");
         StringBuilder sb = new StringBuilder();
-        sb.append(zVar.f2767c);
+        sb.append(zVar.f2773c);
         sb.append(' ');
         w wVar = zVar.b;
-        if (!wVar.f2756c && type == Proxy.Type.HTTP) {
+        if (!wVar.f2762c && type == Proxy.Type.HTTP) {
             sb.append(wVar);
         } else {
             m.checkParameterIsNotNull(wVar, "url");
@@ -461,8 +461,8 @@ public final class b implements f0.f0.h.d {
                 f0.f0.h.j a2 = f0.f0.h.j.a(this.b.b());
                 Response.a aVar = new Response.a();
                 aVar.f(a2.a);
-                aVar.f2856c = a2.b;
-                aVar.e(a2.f2714c);
+                aVar.f2862c = a2.b;
+                aVar.e(a2.f2720c);
                 aVar.d(this.b.a());
                 if (z2 && a2.b == 100) {
                     return null;
diff --git a/app/src/main/java/f0/f0/j/b.java b/app/src/main/java/f0/f0/j/b.java
index 1f8b20e18d..c6a7bd9f18 100644
--- a/app/src/main/java/f0/f0/j/b.java
+++ b/app/src/main/java/f0/f0/j/b.java
@@ -8,7 +8,7 @@ public final class b {
     public static final ByteString b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final ByteString f2716c;
+    public static final ByteString f2722c;
     public static final ByteString d;
     public static final ByteString e;
     public static final ByteString f;
@@ -20,7 +20,7 @@ public final class b {
         ByteString.a aVar = ByteString.j;
         a = aVar.b(":");
         b = aVar.b(":status");
-        f2716c = aVar.b(":method");
+        f2722c = aVar.b(":method");
         d = aVar.b(":path");
         e = aVar.b(":scheme");
         f = aVar.b(":authority");
diff --git a/app/src/main/java/f0/f0/j/c.java b/app/src/main/java/f0/f0/j/c.java
index 369faf529f..c9727fbae0 100644
--- a/app/src/main/java/f0/f0/j/c.java
+++ b/app/src/main/java/f0/f0/j/c.java
@@ -22,7 +22,7 @@ public final class c {
     public static final Map<ByteString, Integer> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2717c = new c();
+    public static final c f2723c = new c();
 
     /* compiled from: Hpack.kt */
     public static final class a {
@@ -30,7 +30,7 @@ public final class c {
         public final g b;
 
         /* renamed from: c  reason: collision with root package name */
-        public b[] f2718c;
+        public b[] f2724c;
         public int d;
         public int e;
         public int f;
@@ -45,13 +45,13 @@ public final class c {
             this.a = new ArrayList();
             m.checkParameterIsNotNull(xVar, "$this$buffer");
             this.b = new r(xVar);
-            this.f2718c = new b[8];
+            this.f2724c = new b[8];
             this.d = 7;
         }
 
         public final void a() {
-            j.fill$default(this.f2718c, null, 0, 0, 6, null);
-            this.d = this.f2718c.length - 1;
+            j.fill$default(this.f2724c, null, 0, 0, 6, null);
+            this.d = this.f2724c.length - 1;
             this.e = 0;
             this.f = 0;
         }
@@ -64,14 +64,14 @@ public final class c {
             int i2;
             int i3 = 0;
             if (i > 0) {
-                int length = this.f2718c.length;
+                int length = this.f2724c.length;
                 while (true) {
                     length--;
                     i2 = this.d;
                     if (length < i2 || i <= 0) {
                         break;
                     }
-                    b bVar = this.f2718c[length];
+                    b bVar = this.f2724c[length];
                     if (bVar == null) {
                         m.throwNpe();
                     }
@@ -81,7 +81,7 @@ public final class c {
                     this.e--;
                     i3++;
                 }
-                b[] bVarArr = this.f2718c;
+                b[] bVarArr = this.f2724c;
                 System.arraycopy(bVarArr, i2 + 1, bVarArr, i2 + 1 + i3, this.e);
                 this.d += i3;
             }
@@ -93,17 +93,17 @@ public final class c {
         public final ByteString d(int i) throws IOException {
             boolean z2;
             if (i >= 0) {
-                c cVar = c.f2717c;
+                c cVar = c.f2723c;
                 if (i <= c.a.length - 1) {
                     z2 = true;
                     if (!z2) {
-                        c cVar2 = c.f2717c;
+                        c cVar2 = c.f2723c;
                         return c.a[i].h;
                     }
-                    c cVar3 = c.f2717c;
+                    c cVar3 = c.f2723c;
                     int b = b(i - c.a.length);
                     if (b >= 0) {
-                        b[] bVarArr = this.f2718c;
+                        b[] bVarArr = this.f2724c;
                         if (b < bVarArr.length) {
                             b bVar = bVarArr[b];
                             if (bVar == null) {
@@ -126,7 +126,7 @@ public final class c {
             this.a.add(bVar);
             int i2 = bVar.g;
             if (i != -1) {
-                b bVar2 = this.f2718c[this.d + 1 + i];
+                b bVar2 = this.f2724c[this.d + 1 + i];
                 if (bVar2 == null) {
                     m.throwNpe();
                 }
@@ -140,19 +140,19 @@ public final class c {
             int c2 = c((this.f + i2) - i3);
             if (i == -1) {
                 int i4 = this.e + 1;
-                b[] bVarArr = this.f2718c;
+                b[] bVarArr = this.f2724c;
                 if (i4 > bVarArr.length) {
                     b[] bVarArr2 = new b[(bVarArr.length * 2)];
                     System.arraycopy(bVarArr, 0, bVarArr2, bVarArr.length, bVarArr.length);
-                    this.d = this.f2718c.length - 1;
-                    this.f2718c = bVarArr2;
+                    this.d = this.f2724c.length - 1;
+                    this.f2724c = bVarArr2;
                 }
                 int i5 = this.d;
                 this.d = i5 - 1;
-                this.f2718c[i5] = bVar;
+                this.f2724c[i5] = bVar;
                 this.e++;
             } else {
-                this.f2718c[this.d + 1 + i + c2 + i] = bVar;
+                this.f2724c[this.d + 1 + i + c2 + i] = bVar;
             }
             this.f += i2;
         }
@@ -172,7 +172,7 @@ public final class c {
             g gVar = this.b;
             m.checkParameterIsNotNull(gVar, "source");
             m.checkParameterIsNotNull(eVar, "sink");
-            p.a aVar = p.f2728c;
+            p.a aVar = p.f2734c;
             int i3 = 0;
             for (long j = 0; j < g; j++) {
                 byte readByte2 = gVar.readByte();
@@ -192,8 +192,8 @@ public final class c {
                     }
                     if (aVar.a == null) {
                         eVar.T(aVar.b);
-                        i3 -= aVar.f2729c;
-                        aVar = p.f2728c;
+                        i3 -= aVar.f2735c;
+                        aVar = p.f2734c;
                     } else {
                         i3 = i4;
                     }
@@ -209,12 +209,12 @@ public final class c {
                 if (aVar2 == null) {
                     m.throwNpe();
                 }
-                if (aVar2.a != null || aVar2.f2729c > i3) {
+                if (aVar2.a != null || aVar2.f2735c > i3) {
                     break;
                 }
                 eVar.T(aVar2.b);
-                i3 -= aVar2.f2729c;
-                aVar = p.f2728c;
+                i3 -= aVar2.f2735c;
+                aVar = p.f2734c;
             }
             return eVar.x();
         }
@@ -244,7 +244,7 @@ public final class c {
         public boolean b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2719c;
+        public int f2725c;
         public b[] d;
         public int e;
         public int f;
@@ -261,7 +261,7 @@ public final class c {
             this.i = z2;
             this.j = eVar;
             this.a = Integer.MAX_VALUE;
-            this.f2719c = i;
+            this.f2725c = i;
             this.d = new b[8];
             this.e = 7;
         }
@@ -310,7 +310,7 @@ public final class c {
 
         public final void c(b bVar) {
             int i = bVar.g;
-            int i2 = this.f2719c;
+            int i2 = this.f2725c;
             if (i > i2) {
                 a();
                 return;
@@ -386,19 +386,19 @@ public final class c {
             m.checkParameterIsNotNull(list, "headerBlock");
             if (this.b) {
                 int i3 = this.a;
-                if (i3 < this.f2719c) {
+                if (i3 < this.f2725c) {
                     f(i3, 31, 32);
                 }
                 this.b = false;
                 this.a = Integer.MAX_VALUE;
-                f(this.f2719c, 31, 32);
+                f(this.f2725c, 31, 32);
             }
             int size = list.size();
             for (int i4 = 0; i4 < size; i4++) {
                 b bVar = list.get(i4);
                 ByteString p = bVar.h.p();
                 ByteString byteString = bVar.i;
-                c cVar = c.f2717c;
+                c cVar = c.f2723c;
                 Integer num = c.b.get(p);
                 if (num != null) {
                     i2 = num.intValue() + 1;
@@ -435,11 +435,11 @@ public final class c {
                             }
                             if (m.areEqual(bVar3.i, byteString)) {
                                 int i6 = i5 - this.e;
-                                c cVar2 = c.f2717c;
+                                c cVar2 = c.f2723c;
                                 i2 = c.a.length + i6;
                                 break;
                             } else if (i == -1) {
-                                c cVar3 = c.f2717c;
+                                c cVar3 = c.f2723c;
                                 i = (i5 - this.e) + c.a.length;
                             }
                         }
@@ -486,7 +486,7 @@ public final class c {
 
     static {
         b bVar = new b(b.f, "");
-        ByteString byteString = b.f2716c;
+        ByteString byteString = b.f2722c;
         ByteString byteString2 = b.d;
         ByteString byteString3 = b.e;
         ByteString byteString4 = b.b;
diff --git a/app/src/main/java/f0/f0/j/d.java b/app/src/main/java/f0/f0/j/d.java
index f16902d893..aafd0306cb 100644
--- a/app/src/main/java/f0/f0/j/d.java
+++ b/app/src/main/java/f0/f0/j/d.java
@@ -11,7 +11,7 @@ public final class d {
     public static final String[] b = {"DATA", "HEADERS", "PRIORITY", "RST_STREAM", "SETTINGS", "PUSH_PROMISE", "PING", "GOAWAY", "WINDOW_UPDATE", "CONTINUATION"};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final String[] f2720c = new String[64];
+    public static final String[] f2726c = new String[64];
     public static final String[] d;
     public static final d e = new d();
 
@@ -23,17 +23,17 @@ public final class d {
             strArr[i] = t.replace$default(c.j("%8s", binaryString), ' ', '0', false, 4, (Object) null);
         }
         d = strArr;
-        String[] strArr2 = f2720c;
+        String[] strArr2 = f2726c;
         strArr2[0] = "";
         strArr2[1] = "END_STREAM";
         int[] iArr = {1};
         strArr2[8] = "PADDED";
         for (int i2 = 0; i2 < 1; i2++) {
             int i3 = iArr[i2];
-            String[] strArr3 = f2720c;
+            String[] strArr3 = f2726c;
             strArr3[i3 | 8] = m.stringPlus(strArr3[i3], "|PADDED");
         }
-        String[] strArr4 = f2720c;
+        String[] strArr4 = f2726c;
         strArr4[4] = "END_HEADERS";
         strArr4[32] = "PRIORITY";
         strArr4[36] = "END_HEADERS|PRIORITY";
@@ -42,7 +42,7 @@ public final class d {
             int i5 = iArr2[i4];
             for (int i6 = 0; i6 < 1; i6++) {
                 int i7 = iArr[i6];
-                String[] strArr5 = f2720c;
+                String[] strArr5 = f2726c;
                 int i8 = i7 | i5;
                 strArr5[i8] = strArr5[i7] + "|" + strArr5[i5];
                 StringBuilder sb = new StringBuilder();
@@ -51,9 +51,9 @@ public final class d {
                 strArr5[i8 | 8] = a.D(sb, strArr5[i5], "|PADDED");
             }
         }
-        int length = f2720c.length;
+        int length = f2726c.length;
         for (int i9 = 0; i9 < length; i9++) {
-            String[] strArr6 = f2720c;
+            String[] strArr6 = f2726c;
             if (strArr6[i9] == null) {
                 strArr6[i9] = d[i9];
             }
@@ -76,7 +76,7 @@ public final class d {
                 if (i3 == 4 || i3 == 6) {
                     str = i4 == 1 ? "ACK" : d[i4];
                 } else if (!(i3 == 7 || i3 == 8)) {
-                    String[] strArr = f2720c;
+                    String[] strArr = f2726c;
                     if (i4 < strArr.length) {
                         str2 = strArr[i4];
                         if (str2 == null) {
diff --git a/app/src/main/java/f0/f0/j/e.java b/app/src/main/java/f0/f0/j/e.java
index 45f754c224..bda1778b46 100644
--- a/app/src/main/java/f0/f0/j/e.java
+++ b/app/src/main/java/f0/f0/j/e.java
@@ -51,20 +51,20 @@ public final class e implements Closeable {
     public final f0.f0.f.d r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final f0.f0.f.c f2721s;
+    public final f0.f0.f.c f2727s;
     public final f0.f0.f.c t;
     public final f0.f0.f.c u;
     public final r v;
     public long w;
 
     /* renamed from: x  reason: collision with root package name */
-    public long f2722x;
+    public long f2728x;
 
     /* renamed from: y  reason: collision with root package name */
-    public long f2723y;
+    public long f2729y;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f2724z;
+    public long f2730z;
 
     /* compiled from: TaskQueue.kt */
     public static final class a extends f0.f0.f.a {
@@ -84,7 +84,7 @@ public final class e implements Closeable {
             boolean z2;
             synchronized (this.e) {
                 eVar = this.e;
-                long j = eVar.f2722x;
+                long j = eVar.f2728x;
                 long j2 = eVar.w;
                 if (j < j2) {
                     z2 = true;
@@ -109,7 +109,7 @@ public final class e implements Closeable {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public g f2725c;
+        public g f2731c;
         public BufferedSink d;
         public c e = c.a;
         public r f = r.a;
@@ -170,7 +170,7 @@ public final class e implements Closeable {
                     this.f.j.l.b(this.e);
                     return -1;
                 } catch (IOException e) {
-                    h.a aVar = h.f2731c;
+                    h.a aVar = h.f2737c;
                     h hVar = h.a;
                     StringBuilder L = c.d.b.a.a.L("Http2Connection.Listener failure for ");
                     L.append(this.f.j.n);
@@ -357,7 +357,7 @@ public final class e implements Closeable {
         @Override // f0.f0.j.m.b
         public void b(boolean z2, s sVar) {
             d0.z.d.m.checkParameterIsNotNull(sVar, "settings");
-            f0.f0.f.c cVar = this.j.f2721s;
+            f0.f0.f.c cVar = this.j.f2727s;
             String D = c.d.b.a.a.D(new StringBuilder(), this.j.n, " applyAndAckSettings");
             cVar.c(new c(D, true, D, true, this, z2, sVar), 0);
         }
@@ -511,9 +511,9 @@ public final class e implements Closeable {
             if (z2) {
                 synchronized (this.j) {
                     if (i == 1) {
-                        this.j.f2722x++;
+                        this.j.f2728x++;
                     } else if (i == 2) {
-                        this.j.f2724z++;
+                        this.j.f2730z++;
                     } else if (i == 3) {
                         e eVar = this.j;
                         eVar.A++;
@@ -522,7 +522,7 @@ public final class e implements Closeable {
                 }
                 return;
             }
-            f0.f0.f.c cVar = this.j.f2721s;
+            f0.f0.f.c cVar = this.j.f2727s;
             String D = c.d.b.a.a.D(new StringBuilder(), this.j.n, " ping");
             cVar.c(new b(D, true, D, true, this, i, i2), 0);
         }
@@ -720,7 +720,7 @@ public final class e implements Closeable {
         f0.f0.f.d dVar = bVar.i;
         this.r = dVar;
         f0.f0.f.c f2 = dVar.f();
-        this.f2721s = f2;
+        this.f2727s = f2;
         this.t = dVar.f();
         this.u = dVar.f();
         this.v = bVar.f;
@@ -742,7 +742,7 @@ public final class e implements Closeable {
             d0.z.d.m.throwUninitializedPropertyAccessException("sink");
         }
         this.J = new o(bufferedSink, z2);
-        g gVar = bVar.f2725c;
+        g gVar = bVar.f2731c;
         if (gVar == null) {
             d0.z.d.m.throwUninitializedPropertyAccessException("source");
         }
@@ -793,7 +793,7 @@ public final class e implements Closeable {
             this.I.close();
         } catch (IOException unused4) {
         }
-        this.f2721s.f();
+        this.f2727s.f();
         this.t.f();
         this.u.f();
     }
@@ -890,11 +890,11 @@ public final class e implements Closeable {
     public final void s(int i2, a aVar) {
         d0.z.d.m.checkParameterIsNotNull(aVar, "errorCode");
         String str = this.n + '[' + i2 + "] writeSynReset";
-        this.f2721s.c(new C0306e(str, true, str, true, this, i2, aVar), 0);
+        this.f2727s.c(new C0306e(str, true, str, true, this, i2, aVar), 0);
     }
 
     public final void t(int i2, long j2) {
         String str = this.n + '[' + i2 + "] windowUpdate";
-        this.f2721s.c(new f(str, true, str, true, this, i2, j2), 0);
+        this.f2727s.c(new f(str, true, str, true, this, i2, j2), 0);
     }
 }
diff --git a/app/src/main/java/f0/f0/j/l.java b/app/src/main/java/f0/f0/j/l.java
index 33de608830..08b755a5c2 100644
--- a/app/src/main/java/f0/f0/j/l.java
+++ b/app/src/main/java/f0/f0/j/l.java
@@ -31,7 +31,7 @@ public final class l implements d {
     public static final List<String> b = c.m("connection", "host", "keep-alive", "proxy-connection", "te", "transfer-encoding", "encoding", "upgrade");
 
     /* renamed from: c  reason: collision with root package name */
-    public volatile n f2726c;
+    public volatile n f2732c;
     public final y d;
     public volatile boolean e;
     public final j f;
@@ -53,7 +53,7 @@ public final class l implements d {
 
     @Override // f0.f0.h.d
     public void a() {
-        n nVar = this.f2726c;
+        n nVar = this.f2732c;
         if (nVar == null) {
             m.throwNpe();
         }
@@ -65,13 +65,13 @@ public final class l implements d {
         int i;
         n nVar;
         m.checkParameterIsNotNull(zVar, "request");
-        if (this.f2726c == null) {
+        if (this.f2732c == null) {
             boolean z2 = false;
             boolean z3 = zVar.e != null;
             m.checkParameterIsNotNull(zVar, "request");
             Headers headers = zVar.d;
             ArrayList arrayList = new ArrayList(headers.size() + 4);
-            arrayList.add(new b(b.f2716c, zVar.f2767c));
+            arrayList.add(new b(b.f2722c, zVar.f2773c));
             ByteString byteString = b.d;
             w wVar = zVar.b;
             m.checkParameterIsNotNull(wVar, "url");
@@ -114,7 +114,7 @@ public final class l implements d {
                         i = eVar.p;
                         eVar.p = i + 2;
                         nVar = new n(i, eVar, z4, false, null);
-                        if (!z3 || eVar.G >= eVar.H || nVar.f2727c >= nVar.d) {
+                        if (!z3 || eVar.G >= eVar.H || nVar.f2733c >= nVar.d) {
                             z2 = true;
                         }
                         if (nVar.i()) {
@@ -129,22 +129,22 @@ public final class l implements d {
             if (z2) {
                 eVar.J.flush();
             }
-            this.f2726c = nVar;
+            this.f2732c = nVar;
             if (this.e) {
-                n nVar2 = this.f2726c;
+                n nVar2 = this.f2732c;
                 if (nVar2 == null) {
                     m.throwNpe();
                 }
                 nVar2.e(a.CANCEL);
                 throw new IOException("Canceled");
             }
-            n nVar3 = this.f2726c;
+            n nVar3 = this.f2732c;
             if (nVar3 == null) {
                 m.throwNpe();
             }
             TimeUnit timeUnit = TimeUnit.MILLISECONDS;
             nVar3.i.g((long) this.g.h, timeUnit);
-            n nVar4 = this.f2726c;
+            n nVar4 = this.f2732c;
             if (nVar4 == null) {
                 m.throwNpe();
             }
@@ -155,7 +155,7 @@ public final class l implements d {
     @Override // f0.f0.h.d
     public g0.x c(Response response) {
         m.checkParameterIsNotNull(response, "response");
-        n nVar = this.f2726c;
+        n nVar = this.f2732c;
         if (nVar == null) {
             m.throwNpe();
         }
@@ -165,7 +165,7 @@ public final class l implements d {
     @Override // f0.f0.h.d
     public void cancel() {
         this.e = true;
-        n nVar = this.f2726c;
+        n nVar = this.f2732c;
         if (nVar != null) {
             nVar.e(a.CANCEL);
         }
@@ -175,7 +175,7 @@ public final class l implements d {
     @Override // f0.f0.h.d
     public Response.a d(boolean z2) {
         Headers headers;
-        n nVar = this.f2726c;
+        n nVar = this.f2732c;
         if (nVar == null) {
             m.throwNpe();
         }
@@ -227,12 +227,12 @@ public final class l implements d {
         if (jVar != null) {
             Response.a aVar2 = new Response.a();
             aVar2.f(yVar);
-            aVar2.f2856c = jVar.b;
-            aVar2.e(jVar.f2714c);
+            aVar2.f2862c = jVar.b;
+            aVar2.e(jVar.f2720c);
             Object[] array = arrayList.toArray(new String[0]);
             if (array != null) {
                 aVar2.d(new Headers((String[]) array, null));
-                if (!z2 || aVar2.f2856c != 100) {
+                if (!z2 || aVar2.f2862c != 100) {
                     return aVar2;
                 }
                 return null;
@@ -264,7 +264,7 @@ public final class l implements d {
     @Override // f0.f0.h.d
     public v h(z zVar, long j) {
         m.checkParameterIsNotNull(zVar, "request");
-        n nVar = this.f2726c;
+        n nVar = this.f2732c;
         if (nVar == null) {
             m.throwNpe();
         }
diff --git a/app/src/main/java/f0/f0/j/m.java b/app/src/main/java/f0/f0/j/m.java
index e91dd84aac..fc1e2de911 100644
--- a/app/src/main/java/f0/f0/j/m.java
+++ b/app/src/main/java/f0/f0/j/m.java
@@ -423,17 +423,17 @@ public final class m implements Closeable {
             } else if ((i6 & 128) == 128) {
                 int g = aVar2.g(i6, 127) - 1;
                 if (g >= 0) {
-                    c cVar = c.f2717c;
+                    c cVar = c.f2723c;
                     if (g <= c.a.length - 1) {
                         z2 = true;
                         if (!z2) {
-                            c cVar2 = c.f2717c;
+                            c cVar2 = c.f2723c;
                             aVar2.a.add(c.a[g]);
                         } else {
-                            c cVar3 = c.f2717c;
+                            c cVar3 = c.f2723c;
                             int b2 = aVar2.b(g - c.a.length);
                             if (b2 >= 0) {
-                                b[] bVarArr = aVar2.f2718c;
+                                b[] bVarArr = aVar2.f2724c;
                                 if (b2 < bVarArr.length) {
                                     List<b> list = aVar2.a;
                                     b bVar = bVarArr[b2];
@@ -453,7 +453,7 @@ public final class m implements Closeable {
                 if (!z2) {
                 }
             } else if (i6 == 64) {
-                c cVar4 = c.f2717c;
+                c cVar4 = c.f2723c;
                 ByteString f = aVar2.f();
                 cVar4.a(f);
                 aVar2.e(-1, new b(f, aVar2.f()));
@@ -476,7 +476,7 @@ public final class m implements Closeable {
                     }
                 }
             } else if (i6 == 16 || i6 == 0) {
-                c cVar5 = c.f2717c;
+                c cVar5 = c.f2723c;
                 ByteString f2 = aVar2.f();
                 cVar5.a(f2);
                 aVar2.a.add(new b(f2, aVar2.f()));
diff --git a/app/src/main/java/f0/f0/j/n.java b/app/src/main/java/f0/f0/j/n.java
index 8ba8423949..5bc4a88e04 100644
--- a/app/src/main/java/f0/f0/j/n.java
+++ b/app/src/main/java/f0/f0/j/n.java
@@ -19,7 +19,7 @@ public final class n {
     public long b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f2727c;
+    public long f2733c;
     public long d;
     public final ArrayDeque<Headers> e;
     public boolean f;
@@ -56,7 +56,7 @@ public final class n {
                         n.this.j.m();
                         throw th;
                     }
-                    if (nVar.f2727c < nVar.d || this.k || this.j || nVar.f() != null) {
+                    if (nVar.f2733c < nVar.d || this.k || this.j || nVar.f() != null) {
                         break;
                     }
                     n.this.l();
@@ -64,9 +64,9 @@ public final class n {
                 n.this.j.m();
                 n.this.b();
                 n nVar2 = n.this;
-                min = Math.min(nVar2.d - nVar2.f2727c, this.i.j);
+                min = Math.min(nVar2.d - nVar2.f2733c, this.i.j);
                 n nVar3 = n.this;
-                nVar3.f2727c += min;
+                nVar3.f2733c += min;
                 z3 = z2 && min == this.i.j && nVar3.f() == null;
             }
             n.this.j.i();
@@ -276,12 +276,12 @@ public final class n {
             n.this.e(a.CANCEL);
             e eVar = n.this.n;
             synchronized (eVar) {
-                long j = eVar.f2724z;
-                long j2 = eVar.f2723y;
+                long j = eVar.f2730z;
+                long j2 = eVar.f2729y;
                 if (j >= j2) {
-                    eVar.f2723y = j2 + 1;
+                    eVar.f2729y = j2 + 1;
                     eVar.B = System.nanoTime() + ((long) 1000000000);
-                    f0.f0.f.c cVar = eVar.f2721s;
+                    f0.f0.f.c cVar = eVar.f2727s;
                     String D = c.d.b.a.a.D(new StringBuilder(), eVar.n, " ping");
                     cVar.c(new k(D, true, D, true, eVar), 0);
                 }
diff --git a/app/src/main/java/f0/f0/j/o.java b/app/src/main/java/f0/f0/j/o.java
index dce1255199..ac6991fd36 100644
--- a/app/src/main/java/f0/f0/j/o.java
+++ b/app/src/main/java/f0/f0/j/o.java
@@ -47,13 +47,13 @@ public final class o implements Closeable {
                 }
                 bVar.h = i5;
                 int min = Math.min(i5, 16384);
-                int i6 = bVar.f2719c;
+                int i6 = bVar.f2725c;
                 if (i6 != min) {
                     if (min < i6) {
                         bVar.a = Math.min(bVar.a, min);
                     }
                     bVar.b = true;
-                    bVar.f2719c = min;
+                    bVar.f2725c = min;
                     int i7 = bVar.g;
                     if (min < i7) {
                         if (min == 0) {
diff --git a/app/src/main/java/f0/f0/j/p.java b/app/src/main/java/f0/f0/j/p.java
index 90e091d574..7d5b6922ec 100644
--- a/app/src/main/java/f0/f0/j/p.java
+++ b/app/src/main/java/f0/f0/j/p.java
@@ -8,7 +8,7 @@ public final class p {
     public static final byte[] b = {13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28, 6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10, 13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6, 15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5, 6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28, 20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23, 24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24, 22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23, 21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23, 26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25, 19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27, 20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23, 26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26};
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2728c = new a();
+    public static final a f2734c = new a();
     public static final p d;
 
     /* compiled from: Huffman.kt */
@@ -17,19 +17,19 @@ public final class p {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final int f2729c;
+        public final int f2735c;
 
         public a() {
             this.a = new a[256];
             this.b = 0;
-            this.f2729c = 0;
+            this.f2735c = 0;
         }
 
         public a(int i, int i2) {
             this.a = null;
             this.b = i;
             int i3 = i2 & 7;
-            this.f2729c = i3 == 0 ? 8 : i3;
+            this.f2735c = i3 == 0 ? 8 : i3;
         }
     }
 
@@ -43,7 +43,7 @@ public final class p {
 
     public final void a(int i, int i2, int i3) {
         a aVar = new a(i, i3);
-        a aVar2 = f2728c;
+        a aVar2 = f2734c;
         while (i3 > 8) {
             i3 -= 8;
             int i4 = (i2 >>> i3) & 255;
diff --git a/app/src/main/java/f0/f0/k/a.java b/app/src/main/java/f0/f0/k/a.java
index 1d9a7d0e6c..2553dc2625 100644
--- a/app/src/main/java/f0/f0/k/a.java
+++ b/app/src/main/java/f0/f0/k/a.java
@@ -21,7 +21,7 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.X509TrustManager;
 /* compiled from: Android10Platform.kt */
 public final class a extends h {
-    public static final boolean d = (h.f2731c.c() && Build.VERSION.SDK_INT >= 29);
+    public static final boolean d = (h.f2737c.c() && Build.VERSION.SDK_INT >= 29);
     public static final a e = null;
     public final List<k> f;
 
diff --git a/app/src/main/java/f0/f0/k/b.java b/app/src/main/java/f0/f0/k/b.java
index 3257512a8e..63e0493f27 100644
--- a/app/src/main/java/f0/f0/k/b.java
+++ b/app/src/main/java/f0/f0/k/b.java
@@ -106,7 +106,7 @@ public final class b extends h {
 
     static {
         boolean z2 = false;
-        if (h.f2731c.c() && Build.VERSION.SDK_INT < 30) {
+        if (h.f2737c.c() && Build.VERSION.SDK_INT < 30) {
             z2 = true;
         }
         d = z2;
@@ -291,7 +291,7 @@ public final class b extends h {
         boolean z2 = false;
         if (obj != null) {
             try {
-                Method method = hVar.f2734c;
+                Method method = hVar.f2740c;
                 if (method == null) {
                     m.throwNpe();
                 }
diff --git a/app/src/main/java/f0/f0/k/e.java b/app/src/main/java/f0/f0/k/e.java
index 44a9915da0..f859be71f9 100644
--- a/app/src/main/java/f0/f0/k/e.java
+++ b/app/src/main/java/f0/f0/k/e.java
@@ -27,11 +27,11 @@ public final class e extends h {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<String> f2730c;
+        public final List<String> f2736c;
 
         public a(List<String> list) {
             m.checkParameterIsNotNull(list, "protocols");
-            this.f2730c = list;
+            this.f2736c = list;
         }
 
         @Override // java.lang.reflect.InvocationHandler
@@ -49,7 +49,7 @@ public final class e extends h {
             if (!m.areEqual(name, "unsupported") || !m.areEqual(Void.TYPE, returnType)) {
                 if (m.areEqual(name, "protocols")) {
                     if (objArr.length == 0) {
-                        return this.f2730c;
+                        return this.f2736c;
                     }
                 }
                 if ((m.areEqual(name, "selectProtocol") || m.areEqual(name, "select")) && m.areEqual(String.class, returnType) && objArr.length == 1 && (objArr[0] instanceof List)) {
@@ -63,7 +63,7 @@ public final class e extends h {
                                 Object obj3 = list.get(i);
                                 if (obj3 != null) {
                                     String str = (String) obj3;
-                                    if (!this.f2730c.contains(str)) {
+                                    if (!this.f2736c.contains(str)) {
                                         if (i == size) {
                                             break;
                                         }
@@ -77,7 +77,7 @@ public final class e extends h {
                                 }
                             }
                         }
-                        String str2 = this.f2730c.get(0);
+                        String str2 = this.f2736c.get(0);
                         this.b = str2;
                         return str2;
                     }
diff --git a/app/src/main/java/f0/f0/k/h.java b/app/src/main/java/f0/f0/k/h.java
index 2dd8e2dbfe..947a0abd64 100644
--- a/app/src/main/java/f0/f0/k/h.java
+++ b/app/src/main/java/f0/f0/k/h.java
@@ -43,7 +43,7 @@ public class h {
     public static final Logger b = Logger.getLogger(x.class.getName());
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2731c;
+    public static final a f2737c;
 
     /* compiled from: Platform.kt */
     public static final class a {
@@ -99,9 +99,9 @@ public class h {
         h hVar;
         h hVar2 = null;
         a aVar = new a(null);
-        f2731c = aVar;
+        f2737c = aVar;
         if (aVar.c()) {
-            c cVar = c.f2732c;
+            c cVar = c.f2738c;
             for (Map.Entry<String, String> entry : c.b.entrySet()) {
                 String value = entry.getValue();
                 Logger logger = Logger.getLogger(entry.getKey());
diff --git a/app/src/main/java/f0/f0/k/i/a.java b/app/src/main/java/f0/f0/k/i/a.java
index 4d6ac88a4d..b4cc885c24 100644
--- a/app/src/main/java/f0/f0/k/i/a.java
+++ b/app/src/main/java/f0/f0/k/i/a.java
@@ -22,7 +22,7 @@ public final class a implements k {
 
     @Override // f0.f0.k.i.k
     public boolean b() {
-        return h.f2731c.c() && Build.VERSION.SDK_INT >= 29;
+        return h.f2737c.c() && Build.VERSION.SDK_INT >= 29;
     }
 
     @Override // f0.f0.k.i.k
@@ -45,7 +45,7 @@ public final class a implements k {
             SSLSockets.setUseSessionTickets(sSLSocket, true);
             SSLParameters sSLParameters = sSLSocket.getSSLParameters();
             m.checkExpressionValueIsNotNull(sSLParameters, "sslParameters");
-            Object[] array = h.f2731c.a(list).toArray(new String[0]);
+            Object[] array = h.f2737c.a(list).toArray(new String[0]);
             if (array != null) {
                 sSLParameters.setApplicationProtocols((String[]) array);
                 sSLSocket.setSSLParameters(sSLParameters);
diff --git a/app/src/main/java/f0/f0/k/i/c.java b/app/src/main/java/f0/f0/k/i/c.java
index b6b4f4cbea..42ac6aaac1 100644
--- a/app/src/main/java/f0/f0/k/i/c.java
+++ b/app/src/main/java/f0/f0/k/i/c.java
@@ -14,7 +14,7 @@ public final class c {
     public static final Map<String, String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2732c = null;
+    public static final c f2738c = null;
 
     static {
         LinkedHashMap linkedHashMap = new LinkedHashMap();
diff --git a/app/src/main/java/f0/f0/k/i/d.java b/app/src/main/java/f0/f0/k/i/d.java
index b41618d490..1a66bd95d1 100644
--- a/app/src/main/java/f0/f0/k/i/d.java
+++ b/app/src/main/java/f0/f0/k/i/d.java
@@ -24,7 +24,7 @@ public final class d extends Handler {
     public void publish(LogRecord logRecord) {
         int min;
         m.checkParameterIsNotNull(logRecord, "record");
-        c cVar = c.f2732c;
+        c cVar = c.f2738c;
         String loggerName = logRecord.getLoggerName();
         m.checkExpressionValueIsNotNull(loggerName, "record.loggerName");
         int i = logRecord.getLevel().intValue() > Level.INFO.intValue() ? 5 : logRecord.getLevel().intValue() == Level.INFO.intValue() ? 4 : 3;
diff --git a/app/src/main/java/f0/f0/k/i/f.java b/app/src/main/java/f0/f0/k/i/f.java
index 852f76fe57..d817430583 100644
--- a/app/src/main/java/f0/f0/k/i/f.java
+++ b/app/src/main/java/f0/f0/k/i/f.java
@@ -19,7 +19,7 @@ public class f implements k {
     public static final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Method f2733c;
+    public final Method f2739c;
     public final Method d;
     public final Method e;
     public final Method f;
@@ -43,7 +43,7 @@ public class f implements k {
         this.g = cls;
         Method declaredMethod = cls.getDeclaredMethod("setUseSessionTickets", Boolean.TYPE);
         m.checkExpressionValueIsNotNull(declaredMethod, "sslSocketClass.getDeclar…:class.javaPrimitiveType)");
-        this.f2733c = declaredMethod;
+        this.f2739c = declaredMethod;
         this.d = cls.getMethod("setHostname", String.class);
         this.e = cls.getMethod("getAlpnSelectedProtocol", new Class[0]);
         this.f = cls.getMethod("setAlpnProtocols", byte[].class);
@@ -93,11 +93,11 @@ public class f implements k {
         m.checkParameterIsNotNull(list, "protocols");
         if (a(sSLSocket)) {
             try {
-                this.f2733c.invoke(sSLSocket, Boolean.TRUE);
+                this.f2739c.invoke(sSLSocket, Boolean.TRUE);
                 if (str != null) {
                     this.d.invoke(sSLSocket, str);
                 }
-                this.f.invoke(sSLSocket, h.f2731c.b(list));
+                this.f.invoke(sSLSocket, h.f2737c.b(list));
             } catch (IllegalAccessException e) {
                 throw new AssertionError(e);
             } catch (InvocationTargetException e2) {
diff --git a/app/src/main/java/f0/f0/k/i/g.java b/app/src/main/java/f0/f0/k/i/g.java
index 7a984ed2d1..808022ef3a 100644
--- a/app/src/main/java/f0/f0/k/i/g.java
+++ b/app/src/main/java/f0/f0/k/i/g.java
@@ -60,7 +60,7 @@ public final class g implements k {
             BCSSLSocket bCSSLSocket = (BCSSLSocket) sSLSocket;
             BCSSLParameters parameters = bCSSLSocket.getParameters();
             m.checkExpressionValueIsNotNull(parameters, "sslParameters");
-            Object[] array = h.f2731c.a(list).toArray(new String[0]);
+            Object[] array = h.f2737c.a(list).toArray(new String[0]);
             if (array != null) {
                 parameters.setApplicationProtocols((String[]) array);
                 bCSSLSocket.setParameters(parameters);
diff --git a/app/src/main/java/f0/f0/k/i/h.java b/app/src/main/java/f0/f0/k/i/h.java
index 4fbc5d34f0..409b9a2b77 100644
--- a/app/src/main/java/f0/f0/k/i/h.java
+++ b/app/src/main/java/f0/f0/k/i/h.java
@@ -7,11 +7,11 @@ public final class h {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Method f2734c;
+    public final Method f2740c;
 
     public h(Method method, Method method2, Method method3) {
         this.a = method;
         this.b = method2;
-        this.f2734c = method3;
+        this.f2740c = method3;
     }
 }
diff --git a/app/src/main/java/f0/f0/k/i/i.java b/app/src/main/java/f0/f0/k/i/i.java
index d18917af94..bf2fc88226 100644
--- a/app/src/main/java/f0/f0/k/i/i.java
+++ b/app/src/main/java/f0/f0/k/i/i.java
@@ -56,7 +56,7 @@ public final class i implements k {
         m.checkParameterIsNotNull(list, "protocols");
         if (a(sSLSocket)) {
             Conscrypt.setUseSessionTickets(sSLSocket, true);
-            Object[] array = h.f2731c.a(list).toArray(new String[0]);
+            Object[] array = h.f2737c.a(list).toArray(new String[0]);
             if (array != null) {
                 Conscrypt.setApplicationProtocols(sSLSocket, (String[]) array);
                 return;
diff --git a/app/src/main/java/f0/f0/n/d.java b/app/src/main/java/f0/f0/n/d.java
index 699d778dde..260d3b111f 100644
--- a/app/src/main/java/f0/f0/n/d.java
+++ b/app/src/main/java/f0/f0/n/d.java
@@ -30,7 +30,7 @@ public final class d implements WebSocket, h.a {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public f0.e f2735c;
+    public f0.e f2741c;
     public f0.f0.f.a d;
     public h e;
     public i f;
@@ -48,20 +48,20 @@ public final class d implements WebSocket, h.a {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2736s;
+    public int f2742s;
     public boolean t;
     public final z u;
     public final WebSocketListener v;
     public final Random w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final long f2737x;
+    public final long f2743x;
 
     /* renamed from: y  reason: collision with root package name */
-    public f f2738y = null;
+    public f f2744y = null;
 
     /* renamed from: z  reason: collision with root package name */
-    public long f2739z;
+    public long f2745z;
 
     /* compiled from: RealWebSocket.kt */
     public static final class a {
@@ -69,12 +69,12 @@ public final class d implements WebSocket, h.a {
         public final ByteString b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final long f2740c;
+        public final long f2746c;
 
         public a(int i, ByteString byteString, long j) {
             this.a = i;
             this.b = byteString;
-            this.f2740c = j;
+            this.f2746c = j;
         }
     }
 
@@ -147,7 +147,7 @@ public final class d implements WebSocket, h.a {
                         dVar.t = true;
                         if (i != -1) {
                             StringBuilder L = c.d.b.a.a.L("sent ping but didn't receive pong within ");
-                            L.append(dVar.f2737x);
+                            L.append(dVar.f2743x);
                             L.append("ms (after ");
                             L.append(i - 1);
                             L.append(" successful ping/pongs)");
@@ -180,7 +180,7 @@ public final class d implements WebSocket, h.a {
 
         @Override // f0.f0.f.a
         public long a() {
-            f0.e eVar = this.e.f2735c;
+            f0.e eVar = this.e.f2741c;
             if (eVar == null) {
                 d0.z.d.m.throwNpe();
             }
@@ -197,13 +197,13 @@ public final class d implements WebSocket, h.a {
         this.u = zVar;
         this.v = webSocketListener;
         this.w = random;
-        this.f2737x = j;
-        this.f2739z = j2;
+        this.f2743x = j;
+        this.f2745z = j2;
         this.g = dVar.f();
         this.j = new ArrayDeque<>();
         this.k = new ArrayDeque<>();
         this.n = -1;
-        if (d0.z.d.m.areEqual("GET", zVar.f2767c)) {
+        if (d0.z.d.m.areEqual("GET", zVar.f2773c)) {
             ByteString.a aVar = ByteString.j;
             byte[] bArr = new byte[16];
             random.nextBytes(bArr);
@@ -211,7 +211,7 @@ public final class d implements WebSocket, h.a {
             return;
         }
         StringBuilder L = c.d.b.a.a.L("Request must be GET: ");
-        L.append(zVar.f2767c);
+        L.append(zVar.f2773c);
         throw new IllegalArgumentException(L.toString().toString());
     }
 
@@ -299,7 +299,7 @@ public final class d implements WebSocket, h.a {
     @Override // f0.f0.n.h.a
     public synchronized void f(ByteString byteString) {
         d0.z.d.m.checkParameterIsNotNull(byteString, "payload");
-        this.f2736s++;
+        this.f2742s++;
         this.t = false;
     }
 
@@ -521,7 +521,7 @@ public final class d implements WebSocket, h.a {
     public final void j(String str, c cVar) throws IOException {
         d0.z.d.m.checkParameterIsNotNull(str, "name");
         d0.z.d.m.checkParameterIsNotNull(cVar, "streams");
-        f fVar = this.f2738y;
+        f fVar = this.f2744y;
         if (fVar == null) {
             d0.z.d.m.throwNpe();
         }
@@ -529,9 +529,9 @@ public final class d implements WebSocket, h.a {
             this.h = str;
             this.i = cVar;
             boolean z2 = cVar.i;
-            this.f = new i(z2, cVar.k, this.w, fVar.a, z2 ? fVar.f2741c : fVar.e, this.f2739z);
+            this.f = new i(z2, cVar.k, this.w, fVar.a, z2 ? fVar.f2747c : fVar.e, this.f2745z);
             this.d = new C0308d();
-            long j = this.f2737x;
+            long j = this.f2743x;
             if (j != 0) {
                 long nanos = TimeUnit.MILLISECONDS.toNanos(j);
                 String str2 = str + " ping";
@@ -542,7 +542,7 @@ public final class d implements WebSocket, h.a {
             }
         }
         boolean z3 = cVar.i;
-        this.e = new h(z3, cVar.j, this, fVar.a, z3 ^ true ? fVar.f2741c : fVar.e);
+        this.e = new h(z3, cVar.j, this, fVar.a, z3 ^ true ? fVar.f2747c : fVar.e);
     }
 
     public final void k() throws IOException {
@@ -563,26 +563,26 @@ public final class d implements WebSocket, h.a {
                             hVar.u.A(hVar.p, j);
                             if (!hVar.t) {
                                 g0.e eVar = hVar.p;
-                                e.a aVar = hVar.f2742s;
+                                e.a aVar = hVar.f2748s;
                                 if (aVar == null) {
                                     d0.z.d.m.throwNpe();
                                 }
                                 eVar.w(aVar);
-                                hVar.f2742s.b(hVar.p.j - hVar.k);
-                                e.a aVar2 = hVar.f2742s;
+                                hVar.f2748s.b(hVar.p.j - hVar.k);
+                                e.a aVar2 = hVar.f2748s;
                                 byte[] bArr = hVar.r;
                                 if (bArr == null) {
                                     d0.z.d.m.throwNpe();
                                 }
                                 g.a(aVar2, bArr);
-                                hVar.f2742s.close();
+                                hVar.f2748s.close();
                             }
                         }
                         if (hVar.l) {
                             if (hVar.n) {
                                 c cVar = hVar.q;
                                 if (cVar == null) {
-                                    cVar = new c(hVar.f2743x);
+                                    cVar = new c(hVar.f2749x);
                                     hVar.q = cVar;
                                 }
                                 g0.e eVar2 = hVar.p;
@@ -699,7 +699,7 @@ public final class d implements WebSocket, h.a {
                     } else {
                         a aVar = ref$ObjectRef8.element;
                         if (aVar != null) {
-                            long j = aVar.f2740c;
+                            long j = aVar.f2746c;
                             String str = this.h + " cancel";
                             byteString = poll;
                             iVar = iVar4;
diff --git a/app/src/main/java/f0/f0/n/e.java b/app/src/main/java/f0/f0/n/e.java
index 4314f7a648..1435027dc2 100644
--- a/app/src/main/java/f0/f0/n/e.java
+++ b/app/src/main/java/f0/f0/n/e.java
@@ -110,7 +110,7 @@ public final class e implements f {
                 i2++;
                 i = 0;
             }
-            this.a.f2738y = new f(z2, num, z3, num2, z4, z5);
+            this.a.f2744y = new f(z2, num, z3, num2, z4, z5);
             if (!(!z5 && num == null && (num2 == null || (8 <= (intValue = num2.intValue()) && 15 >= intValue)))) {
                 synchronized (this.a) {
                     this.a.k.clear();
diff --git a/app/src/main/java/f0/f0/n/f.java b/app/src/main/java/f0/f0/n/f.java
index 327b2ca320..e40120212c 100644
--- a/app/src/main/java/f0/f0/n/f.java
+++ b/app/src/main/java/f0/f0/n/f.java
@@ -8,7 +8,7 @@ public final class f {
     public final Integer b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2741c;
+    public final boolean f2747c;
     public final Integer d;
     public final boolean e;
     public final boolean f;
@@ -16,7 +16,7 @@ public final class f {
     public f() {
         this.a = false;
         this.b = null;
-        this.f2741c = false;
+        this.f2747c = false;
         this.d = null;
         this.e = false;
         this.f = false;
@@ -25,7 +25,7 @@ public final class f {
     public f(boolean z2, Integer num, boolean z3, Integer num2, boolean z4, boolean z5) {
         this.a = z2;
         this.b = num;
-        this.f2741c = z3;
+        this.f2747c = z3;
         this.d = num2;
         this.e = z4;
         this.f = z5;
@@ -39,7 +39,7 @@ public final class f {
             return false;
         }
         f fVar = (f) obj;
-        return this.a == fVar.a && m.areEqual(this.b, fVar.b) && this.f2741c == fVar.f2741c && m.areEqual(this.d, fVar.d) && this.e == fVar.e && this.f == fVar.f;
+        return this.a == fVar.a && m.areEqual(this.b, fVar.b) && this.f2747c == fVar.f2747c && m.areEqual(this.d, fVar.d) && this.e == fVar.e && this.f == fVar.f;
     }
 
     public int hashCode() {
@@ -55,7 +55,7 @@ public final class f {
         Integer num = this.b;
         int i6 = 0;
         int hashCode = (i5 + (num != null ? num.hashCode() : 0)) * 31;
-        boolean z3 = this.f2741c;
+        boolean z3 = this.f2747c;
         if (z3) {
             z3 = true;
         }
@@ -89,7 +89,7 @@ public final class f {
         L.append(", clientMaxWindowBits=");
         L.append(this.b);
         L.append(", clientNoContextTakeover=");
-        L.append(this.f2741c);
+        L.append(this.f2747c);
         L.append(", serverMaxWindowBits=");
         L.append(this.d);
         L.append(", serverNoContextTakeover=");
diff --git a/app/src/main/java/f0/f0/n/h.java b/app/src/main/java/f0/f0/n/h.java
index 52cbf95efd..56c4a4313a 100644
--- a/app/src/main/java/f0/f0/n/h.java
+++ b/app/src/main/java/f0/f0/n/h.java
@@ -23,14 +23,14 @@ public final class h implements Closeable {
     public final byte[] r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final e.a f2742s;
+    public final e.a f2748s;
     public final boolean t;
     public final g u;
     public final a v;
     public final boolean w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final boolean f2743x;
+    public final boolean f2749x;
 
     /* compiled from: WebSocketReader.kt */
     public interface a {
@@ -52,10 +52,10 @@ public final class h implements Closeable {
         this.u = gVar;
         this.v = aVar;
         this.w = z3;
-        this.f2743x = z4;
+        this.f2749x = z4;
         e.a aVar2 = null;
         this.r = z2 ? null : new byte[4];
-        this.f2742s = !z2 ? new e.a() : aVar2;
+        this.f2748s = !z2 ? new e.a() : aVar2;
     }
 
     public final void a() throws IOException {
@@ -65,19 +65,19 @@ public final class h implements Closeable {
             this.u.A(this.o, j);
             if (!this.t) {
                 e eVar = this.o;
-                e.a aVar = this.f2742s;
+                e.a aVar = this.f2748s;
                 if (aVar == null) {
                     m.throwNpe();
                 }
                 eVar.w(aVar);
-                this.f2742s.b(0);
-                e.a aVar2 = this.f2742s;
+                this.f2748s.b(0);
+                e.a aVar2 = this.f2748s;
                 byte[] bArr = this.r;
                 if (bArr == null) {
                     m.throwNpe();
                 }
                 g.a(aVar2, bArr);
-                this.f2742s.close();
+                this.f2748s.close();
             }
         }
         switch (this.j) {
diff --git a/app/src/main/java/f0/f0/n/i.java b/app/src/main/java/f0/f0/n/i.java
index 076353938e..244cc6e93b 100644
--- a/app/src/main/java/f0/f0/n/i.java
+++ b/app/src/main/java/f0/f0/n/i.java
@@ -24,7 +24,7 @@ public final class i implements Closeable {
     public final boolean r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final boolean f2744s;
+    public final boolean f2750s;
     public final long t;
 
     public i(boolean z2, BufferedSink bufferedSink, Random random, boolean z3, boolean z4, long j) {
@@ -34,7 +34,7 @@ public final class i implements Closeable {
         this.p = bufferedSink;
         this.q = random;
         this.r = z3;
-        this.f2744s = z4;
+        this.f2750s = z4;
         this.t = j;
         this.j = bufferedSink.g();
         e.a aVar = null;
@@ -128,7 +128,7 @@ public final class i implements Closeable {
             if (this.r && ((long) byteString.j()) >= this.t) {
                 a aVar = this.l;
                 if (aVar == null) {
-                    aVar = new a(this.f2744s);
+                    aVar = new a(this.f2750s);
                     this.l = aVar;
                 }
                 e eVar = this.i;
@@ -194,7 +194,7 @@ public final class i implements Closeable {
                 e eVar5 = this.j;
                 s N = eVar5.N(8);
                 byte[] bArr = N.a;
-                int i5 = N.f2769c;
+                int i5 = N.f2775c;
                 int i6 = i5 + 1;
                 bArr[i5] = (byte) ((int) ((j4 >>> 56) & 255));
                 int i7 = i6 + 1;
@@ -210,7 +210,7 @@ public final class i implements Closeable {
                 int i12 = i11 + 1;
                 bArr[i11] = (byte) ((int) ((j4 >>> 8) & 255));
                 bArr[i12] = (byte) ((int) (j4 & 255));
-                N.f2769c = i12 + 1;
+                N.f2775c = i12 + 1;
                 eVar5.j += 8;
             }
             if (this.o) {
diff --git a/app/src/main/java/f0/g.java b/app/src/main/java/f0/g.java
index 769c3189f0..597aa95e01 100644
--- a/app/src/main/java/f0/g.java
+++ b/app/src/main/java/f0/g.java
@@ -25,7 +25,7 @@ public final class g {
     public static final a b = new a(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final Set<b> f2745c;
+    public final Set<b> f2751c;
     public final c d;
 
     /* compiled from: CertificatePinner.kt */
@@ -85,14 +85,14 @@ public final class g {
 
     public g(Set<b> set, c cVar) {
         m.checkParameterIsNotNull(set, "pins");
-        this.f2745c = set;
+        this.f2751c = set;
         this.d = cVar;
     }
 
     public g(Set set, c cVar, int i) {
         int i2 = i & 2;
         m.checkParameterIsNotNull(set, "pins");
-        this.f2745c = set;
+        this.f2751c = set;
         this.d = null;
     }
 
@@ -100,7 +100,7 @@ public final class g {
         m.checkParameterIsNotNull(str, "hostname");
         m.checkParameterIsNotNull(function0, "cleanedPeerCertificatesFn");
         m.checkParameterIsNotNull(str, "hostname");
-        Set<b> set = this.f2745c;
+        Set<b> set = this.f2751c;
         List<b> emptyList = n.emptyList();
         for (Object obj : set) {
             Objects.requireNonNull((b) obj);
@@ -163,13 +163,13 @@ public final class g {
 
     public final g b(c cVar) {
         m.checkParameterIsNotNull(cVar, "certificateChainCleaner");
-        return m.areEqual(this.d, cVar) ? this : new g(this.f2745c, cVar);
+        return m.areEqual(this.d, cVar) ? this : new g(this.f2751c, cVar);
     }
 
     public boolean equals(Object obj) {
         if (obj instanceof g) {
             g gVar = (g) obj;
-            if (m.areEqual(gVar.f2745c, this.f2745c) && m.areEqual(gVar.d, this.d)) {
+            if (m.areEqual(gVar.f2751c, this.f2751c) && m.areEqual(gVar.d, this.d)) {
                 return true;
             }
         }
@@ -177,7 +177,7 @@ public final class g {
     }
 
     public int hashCode() {
-        int hashCode = (this.f2745c.hashCode() + 1517) * 41;
+        int hashCode = (this.f2751c.hashCode() + 1517) * 41;
         c cVar = this.d;
         return hashCode + (cVar != null ? cVar.hashCode() : 0);
     }
diff --git a/app/src/main/java/f0/g0/a.java b/app/src/main/java/f0/g0/a.java
index c236152f60..3100362995 100644
--- a/app/src/main/java/f0/g0/a.java
+++ b/app/src/main/java/f0/g0/a.java
@@ -25,7 +25,7 @@ public final class a implements Interceptor {
     public volatile Set<String> b = n0.emptySet();
 
     /* renamed from: c  reason: collision with root package name */
-    public volatile EnumC0309a f2746c = EnumC0309a.NONE;
+    public volatile EnumC0309a f2752c = EnumC0309a.NONE;
     public final b d;
 
     /* compiled from: HttpLoggingInterceptor.kt */
@@ -76,7 +76,7 @@ public final class a implements Interceptor {
         Charset charset;
         Charset charset2;
         m.checkParameterIsNotNull(chain, "chain");
-        EnumC0309a aVar = this.f2746c;
+        EnumC0309a aVar = this.f2752c;
         g gVar = (g) chain;
         z zVar = gVar.f;
         if (aVar == EnumC0309a.NONE) {
@@ -87,7 +87,7 @@ public final class a implements Interceptor {
         RequestBody requestBody = zVar.e;
         k b2 = gVar.b();
         StringBuilder L = c.d.b.a.a.L("--> ");
-        L.append(zVar.f2767c);
+        L.append(zVar.f2773c);
         L.append(' ');
         L.append(zVar.b);
         if (b2 != null) {
@@ -127,24 +127,24 @@ public final class a implements Interceptor {
             if (!z2 || requestBody == null) {
                 b bVar2 = this.d;
                 StringBuilder L4 = c.d.b.a.a.L("--> END ");
-                L4.append(zVar.f2767c);
+                L4.append(zVar.f2773c);
                 bVar2.log(L4.toString());
             } else if (a(zVar.d)) {
                 b bVar3 = this.d;
                 StringBuilder L5 = c.d.b.a.a.L("--> END ");
-                L5.append(zVar.f2767c);
+                L5.append(zVar.f2773c);
                 L5.append(" (encoded body omitted)");
                 bVar3.log(L5.toString());
             } else if (requestBody.isDuplex()) {
                 b bVar4 = this.d;
                 StringBuilder L6 = c.d.b.a.a.L("--> END ");
-                L6.append(zVar.f2767c);
+                L6.append(zVar.f2773c);
                 L6.append(" (duplex request body omitted)");
                 bVar4.log(L6.toString());
             } else if (requestBody.isOneShot()) {
                 b bVar5 = this.d;
                 StringBuilder L7 = c.d.b.a.a.L("--> END ");
-                L7.append(zVar.f2767c);
+                L7.append(zVar.f2773c);
                 L7.append(" (one-shot body omitted)");
                 bVar5.log(L7.toString());
             } else {
@@ -160,7 +160,7 @@ public final class a implements Interceptor {
                     this.d.log(eVar.L(charset2));
                     b bVar6 = this.d;
                     StringBuilder L8 = c.d.b.a.a.L("--> END ");
-                    L8.append(zVar.f2767c);
+                    L8.append(zVar.f2773c);
                     L8.append(" (");
                     L8.append(requestBody.contentLength());
                     L8.append("-byte body)");
@@ -168,7 +168,7 @@ public final class a implements Interceptor {
                 } else {
                     b bVar7 = this.d;
                     StringBuilder L9 = c.d.b.a.a.L("--> END ");
-                    L9.append(zVar.f2767c);
+                    L9.append(zVar.f2773c);
                     L9.append(" (binary ");
                     L9.append(requestBody.contentLength());
                     L9.append("-byte body omitted)");
diff --git a/app/src/main/java/f0/j.java b/app/src/main/java/f0/j.java
index d99dc4260a..fd358a38ed 100644
--- a/app/src/main/java/f0/j.java
+++ b/app/src/main/java/f0/j.java
@@ -13,7 +13,7 @@ public final class j {
     public static final Map<String, j> b = new LinkedHashMap();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final j f2747c;
+    public static final j f2753c;
     public static final j d;
     public static final j e;
     public static final j f;
@@ -31,7 +31,7 @@ public final class j {
     public static final j r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final b f2748s;
+    public static final b f2754s;
     public final String t;
 
     /* compiled from: CipherSuite.kt */
@@ -122,7 +122,7 @@ public final class j {
 
     static {
         b bVar = new b(null);
-        f2748s = bVar;
+        f2754s = bVar;
         b.a(bVar, "SSL_RSA_WITH_NULL_MD5", 1);
         b.a(bVar, "SSL_RSA_WITH_NULL_SHA", 2);
         b.a(bVar, "SSL_RSA_EXPORT_WITH_RC4_40_MD5", 3);
@@ -130,7 +130,7 @@ public final class j {
         b.a(bVar, "SSL_RSA_WITH_RC4_128_SHA", 5);
         b.a(bVar, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", 8);
         b.a(bVar, "SSL_RSA_WITH_DES_CBC_SHA", 9);
-        f2747c = b.a(bVar, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", 10);
+        f2753c = b.a(bVar, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", 10);
         b.a(bVar, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", 17);
         b.a(bVar, "SSL_DHE_DSS_WITH_DES_CBC_SHA", 18);
         b.a(bVar, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", 19);
diff --git a/app/src/main/java/f0/m.java b/app/src/main/java/f0/m.java
index f0a8156b6b..c7978e6c5a 100644
--- a/app/src/main/java/f0/m.java
+++ b/app/src/main/java/f0/m.java
@@ -16,7 +16,7 @@ public final class m {
     public static final j[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final m f2749c;
+    public static final m f2755c;
     public static final m d = new m(false, false, null, null);
     public final boolean e;
     public final boolean f;
@@ -29,14 +29,14 @@ public final class m {
         public String[] b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String[] f2750c;
+        public String[] f2756c;
         public boolean d;
 
         public a(m mVar) {
             d0.z.d.m.checkParameterIsNotNull(mVar, "connectionSpec");
             this.a = mVar.e;
             this.b = mVar.g;
-            this.f2750c = mVar.h;
+            this.f2756c = mVar.h;
             this.d = mVar.f;
         }
 
@@ -45,7 +45,7 @@ public final class m {
         }
 
         public final m a() {
-            return new m(this.a, this.d, this.b, this.f2750c);
+            return new m(this.a, this.d, this.b, this.f2756c);
         }
 
         public final a b(String... strArr) {
@@ -96,7 +96,7 @@ public final class m {
                 if (!(strArr.length == 0)) {
                     Object clone = strArr.clone();
                     if (clone != null) {
-                        this.f2750c = (String[]) clone;
+                        this.f2756c = (String[]) clone;
                         return this;
                     }
                     throw new TypeCastException("null cannot be cast to non-null type kotlin.Array<kotlin.String>");
@@ -137,7 +137,7 @@ public final class m {
         j jVar9 = j.n;
         j[] jVarArr = {jVar, jVar2, jVar3, jVar4, jVar5, jVar6, jVar7, jVar8, jVar9};
         a = jVarArr;
-        j[] jVarArr2 = {jVar, jVar2, jVar3, jVar4, jVar5, jVar6, jVar7, jVar8, jVar9, j.h, j.i, j.f, j.g, j.d, j.e, j.f2747c};
+        j[] jVarArr2 = {jVar, jVar2, jVar3, jVar4, jVar5, jVar6, jVar7, jVar8, jVar9, j.h, j.i, j.f, j.g, j.d, j.e, j.f2753c};
         b = jVarArr2;
         a aVar = new a(true);
         aVar.c((j[]) Arrays.copyOf(jVarArr, jVarArr.length));
@@ -150,7 +150,7 @@ public final class m {
         aVar2.c((j[]) Arrays.copyOf(jVarArr2, jVarArr2.length));
         aVar2.f(e0Var, e0Var2);
         aVar2.d(true);
-        f2749c = aVar2.a();
+        f2755c = aVar2.a();
         a aVar3 = new a(true);
         aVar3.c((j[]) Arrays.copyOf(jVarArr2, jVarArr2.length));
         aVar3.f(e0Var, e0Var2, e0.TLS_1_1, e0.TLS_1_0);
@@ -172,7 +172,7 @@ public final class m {
         }
         ArrayList arrayList = new ArrayList(strArr.length);
         for (String str : strArr) {
-            arrayList.add(j.f2748s.b(str));
+            arrayList.add(j.f2754s.b(str));
         }
         return u.toList(arrayList);
     }
@@ -191,7 +191,7 @@ public final class m {
             return true;
         }
         String[] enabledCipherSuites = sSLSocket.getEnabledCipherSuites();
-        j.b bVar = j.f2748s;
+        j.b bVar = j.f2754s;
         Comparator<String> comparator = j.a;
         return c.k(strArr2, enabledCipherSuites, j.a);
     }
diff --git a/app/src/main/java/f0/n.java b/app/src/main/java/f0/n.java
index a9d1db6b74..79f2f38b74 100644
--- a/app/src/main/java/f0/n.java
+++ b/app/src/main/java/f0/n.java
@@ -20,7 +20,7 @@ public final class n {
     public static final Pattern b = Pattern.compile("(?i)(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Pattern f2751c = Pattern.compile("(\\d{1,2})[^\\d]*");
+    public static final Pattern f2757c = Pattern.compile("(\\d{1,2})[^\\d]*");
     public static final Pattern d = Pattern.compile("(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[^\\d]*");
     public static final a e = new a(null);
     public final String f;
@@ -85,7 +85,7 @@ public final class n {
                     String group3 = matcher.group(3);
                     m.checkExpressionValueIsNotNull(group3, "matcher.group(3)");
                     i8 = Integer.parseInt(group3);
-                } else if (i5 != -1 || !matcher.usePattern(n.f2751c).matches()) {
+                } else if (i5 != -1 || !matcher.usePattern(n.f2757c).matches()) {
                     if (i6 == -1) {
                         Pattern pattern = n.b;
                         if (matcher.usePattern(pattern).matches()) {
@@ -193,7 +193,7 @@ public final class n {
         if (!(m.areEqual(b2, str3) || (t.startsWith$default(b2, str3, false, 2, null) && (t.endsWith$default(str3, "/", false, 2, null) || b2.charAt(str3.length()) == '/')))) {
             return false;
         }
-        return !this.k || wVar.f2756c;
+        return !this.k || wVar.f2762c;
     }
 
     public boolean equals(Object obj) {
diff --git a/app/src/main/java/f0/q.java b/app/src/main/java/f0/q.java
index 230a131424..b7e6f36bea 100644
--- a/app/src/main/java/f0/q.java
+++ b/app/src/main/java/f0/q.java
@@ -21,7 +21,7 @@ public final class q {
     public final ArrayDeque<e.a> b = new ArrayDeque<>();
 
     /* renamed from: c  reason: collision with root package name */
-    public final ArrayDeque<e.a> f2752c = new ArrayDeque<>();
+    public final ArrayDeque<e.a> f2758c = new ArrayDeque<>();
     public final ArrayDeque<e> d = new ArrayDeque<>();
 
     public final synchronized void a() {
@@ -29,7 +29,7 @@ public final class q {
         while (it.hasNext()) {
             it.next().k.cancel();
         }
-        Iterator<e.a> it2 = this.f2752c.iterator();
+        Iterator<e.a> it2 = this.f2758c.iterator();
         while (it2.hasNext()) {
             it2.next().k.cancel();
         }
@@ -51,7 +51,7 @@ public final class q {
     public final void c(e.a aVar) {
         m.checkParameterIsNotNull(aVar, "call");
         aVar.i.decrementAndGet();
-        b(this.f2752c, aVar);
+        b(this.f2758c, aVar);
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:25:0x0067  */
@@ -70,18 +70,18 @@ public final class q {
                     break;
                 }
                 e.a next = it.next();
-                if (this.f2752c.size() >= 64) {
+                if (this.f2758c.size() >= 64) {
                     break;
                 } else if (next.i.get() < 5) {
                     it.remove();
                     next.i.incrementAndGet();
                     m.checkExpressionValueIsNotNull(next, "asyncCall");
                     arrayList.add(next);
-                    this.f2752c.add(next);
+                    this.f2758c.add(next);
                 }
             }
             synchronized (this) {
-                size = this.f2752c.size() + this.d.size();
+                size = this.f2758c.size() + this.d.size();
             }
             size2 = arrayList.size();
             for (i = 0; i < size2; i++) {
@@ -101,7 +101,7 @@ public final class q {
                 }
                 Objects.requireNonNull(aVar);
                 m.checkParameterIsNotNull(executorService, "executorService");
-                q qVar = aVar.k.f2706x.l;
+                q qVar = aVar.k.f2712x.l;
                 byte[] bArr2 = c.a;
                 try {
                     executorService.execute(aVar);
@@ -110,9 +110,9 @@ public final class q {
                     interruptedIOException.initCause(e);
                     aVar.k.l(interruptedIOException);
                     aVar.j.b(aVar.k, interruptedIOException);
-                    aVar.k.f2706x.l.c(aVar);
+                    aVar.k.f2712x.l.c(aVar);
                 } catch (Throwable th) {
-                    aVar.k.f2706x.l.c(aVar);
+                    aVar.k.f2712x.l.c(aVar);
                     throw th;
                 }
             }
diff --git a/app/src/main/java/f0/u.java b/app/src/main/java/f0/u.java
index a0f7bb3590..502ec5b8e1 100644
--- a/app/src/main/java/f0/u.java
+++ b/app/src/main/java/f0/u.java
@@ -16,7 +16,7 @@ public final class u extends RequestBody {
     public final List<String> b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final List<String> f2753c;
+    public final List<String> f2759c;
 
     /* compiled from: FormBody.kt */
     public static final class a {
@@ -24,18 +24,18 @@ public final class u extends RequestBody {
         public final List<String> b = new ArrayList();
 
         /* renamed from: c  reason: collision with root package name */
-        public final Charset f2754c = null;
+        public final Charset f2760c = null;
     }
 
     static {
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
     }
 
     public u(List<String> list, List<String> list2) {
         m.checkParameterIsNotNull(list, "encodedNames");
         m.checkParameterIsNotNull(list2, "encodedValues");
         this.b = c.z(list);
-        this.f2753c = c.z(list2);
+        this.f2759c = c.z(list2);
     }
 
     public final long a(BufferedSink bufferedSink, boolean z2) {
@@ -55,7 +55,7 @@ public final class u extends RequestBody {
             }
             eVar.b0(this.b.get(i));
             eVar.T(61);
-            eVar.b0(this.f2753c.get(i));
+            eVar.b0(this.f2759c.get(i));
         }
         if (!z2) {
             return 0;
diff --git a/app/src/main/java/f0/v.java b/app/src/main/java/f0/v.java
index 8a5cc9a7e0..188795f4b4 100644
--- a/app/src/main/java/f0/v.java
+++ b/app/src/main/java/f0/v.java
@@ -21,7 +21,7 @@ public final class v {
     public final e0 b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final j f2755c;
+    public final j f2761c;
     public final List<Certificate> d;
 
     /* compiled from: Handshake.kt */
@@ -72,7 +72,7 @@ public final class v {
         m.checkParameterIsNotNull(list, "localCertificates");
         m.checkParameterIsNotNull(function0, "peerCertificatesFn");
         this.b = e0Var;
-        this.f2755c = jVar;
+        this.f2761c = jVar;
         this.d = list;
         this.a = g.lazy(new b(function0));
     }
@@ -86,7 +86,7 @@ public final class v {
             if (hashCode == 1019404634 ? cipherSuite.equals("TLS_NULL_WITH_NULL_NULL") : hashCode == 1208658923 && cipherSuite.equals("SSL_NULL_WITH_NULL_NULL")) {
                 throw new IOException(c.d.b.a.a.u("cipherSuite == ", cipherSuite));
             }
-            j b2 = j.f2748s.b(cipherSuite);
+            j b2 = j.f2754s.b(cipherSuite);
             String protocol = sSLSession.getProtocol();
             if (protocol == null) {
                 throw new IllegalStateException("tlsVersion == null".toString());
@@ -126,7 +126,7 @@ public final class v {
     public boolean equals(Object obj) {
         if (obj instanceof v) {
             v vVar = (v) obj;
-            if (vVar.b == this.b && m.areEqual(vVar.f2755c, this.f2755c) && m.areEqual(vVar.c(), c()) && m.areEqual(vVar.d, this.d)) {
+            if (vVar.b == this.b && m.areEqual(vVar.f2761c, this.f2761c) && m.areEqual(vVar.c(), c()) && m.areEqual(vVar.d, this.d)) {
                 return true;
             }
         }
@@ -134,7 +134,7 @@ public final class v {
     }
 
     public int hashCode() {
-        int hashCode = this.f2755c.hashCode();
+        int hashCode = this.f2761c.hashCode();
         int hashCode2 = c().hashCode();
         return this.d.hashCode() + ((hashCode2 + ((hashCode + ((this.b.hashCode() + 527) * 31)) * 31)) * 31);
     }
@@ -150,7 +150,7 @@ public final class v {
         P.append(this.b);
         P.append(' ');
         P.append("cipherSuite=");
-        P.append(this.f2755c);
+        P.append(this.f2761c);
         P.append(' ');
         P.append("peerCertificates=");
         P.append(obj);
diff --git a/app/src/main/java/f0/w.java b/app/src/main/java/f0/w.java
index 5d793284f0..ae56e40e38 100644
--- a/app/src/main/java/f0/w.java
+++ b/app/src/main/java/f0/w.java
@@ -23,7 +23,7 @@ public final class w {
     public static final b b = new b(null);
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2756c;
+    public final boolean f2762c;
     public final String d;
     public final String e;
     public final String f;
@@ -40,7 +40,7 @@ public final class w {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public String f2757c = "";
+        public String f2763c = "";
         public String d = "";
         public String e;
         public int f = -1;
@@ -85,7 +85,7 @@ public final class w {
             String str = this.b;
             if (str != null) {
                 b bVar = w.b;
-                String d = b.d(bVar, this.f2757c, 0, 0, false, 7);
+                String d = b.d(bVar, this.f2763c, 0, 0, false, 7);
                 String d2 = b.d(bVar, this.d, 0, 0, false, 7);
                 String str2 = this.e;
                 if (str2 != null) {
@@ -275,9 +275,9 @@ public final class w {
                             i19 = g;
                             String a2 = b.a(bVar, str, i22, f, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240);
                             if (z4) {
-                                a2 = this.f2757c + "%40" + a2;
+                                a2 = this.f2763c + "%40" + a2;
                             }
-                            this.f2757c = a2;
+                            this.f2763c = a2;
                             if (f != i19) {
                                 this.d = b.a(bVar, str, f + 1, i19, " \"':;<=>@[]^`{}|/\\?#", true, false, false, false, null, 240);
                                 z2 = true;
@@ -382,7 +382,7 @@ public final class w {
                     throw new IllegalArgumentException(L3.toString().toString());
                 }
             } else {
-                this.f2757c = wVar.e();
+                this.f2763c = wVar.e();
                 this.d = wVar.a();
                 this.e = wVar.g;
                 this.f = wVar.h;
@@ -553,9 +553,9 @@ public final class w {
                 sb.append("//");
             }
             boolean z2 = true;
-            if (!(this.f2757c.length() > 0)) {
+            if (!(this.f2763c.length() > 0)) {
             }
-            sb.append(this.f2757c);
+            sb.append(this.f2763c);
             if (this.d.length() <= 0) {
                 z2 = false;
             }
@@ -874,7 +874,7 @@ public final class w {
         this.j = list2;
         this.k = str5;
         this.l = str6;
-        this.f2756c = m.areEqual(str, "https");
+        this.f2762c = m.areEqual(str, "https");
     }
 
     public final String a() {
@@ -972,7 +972,7 @@ public final class w {
         aVar.b = this.d;
         String e = e();
         m.checkParameterIsNotNull(e, "<set-?>");
-        aVar.f2757c = e;
+        aVar.f2763c = e;
         String a2 = a();
         m.checkParameterIsNotNull(a2, "<set-?>");
         aVar.d = a2;
@@ -1052,7 +1052,7 @@ public final class w {
         Objects.requireNonNull(g);
         m.checkParameterIsNotNull("", "username");
         b bVar = b;
-        g.f2757c = b.a(bVar, "", 0, 0, " \"':;<=>@[]^`{}|/\\?#", false, false, false, false, null, 251);
+        g.f2763c = b.a(bVar, "", 0, 0, " \"':;<=>@[]^`{}|/\\?#", false, false, false, false, null, 251);
         m.checkParameterIsNotNull("", "password");
         g.d = b.a(bVar, "", 0, 0, " \"':;<=>@[]^`{}|/\\?#", false, false, false, false, null, 251);
         return g.b().l;
diff --git a/app/src/main/java/f0/x.java b/app/src/main/java/f0/x.java
index 11dd3c8daf..2a54e6b1ef 100644
--- a/app/src/main/java/f0/x.java
+++ b/app/src/main/java/f0/x.java
@@ -32,7 +32,7 @@ import okhttp3.WebSocketListener;
 /* compiled from: OkHttpClient.kt */
 public class x implements Cloneable, e.a {
     public static final List<y> i = c.m(y.HTTP_2, y.HTTP_1_1);
-    public static final List<m> j = c.m(m.f2749c, m.d);
+    public static final List<m> j = c.m(m.f2755c, m.d);
     public static final b k = new b(null);
     public final SSLSocketFactory A;
     public final X509TrustManager B;
@@ -57,20 +57,20 @@ public class x implements Cloneable, e.a {
     public final c r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final boolean f2758s;
+    public final boolean f2764s;
     public final boolean t;
     public final p u;
     public final s v;
     public final Proxy w;
 
     /* renamed from: x  reason: collision with root package name */
-    public final ProxySelector f2759x;
+    public final ProxySelector f2765x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final c f2760y;
+    public final c f2766y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final SocketFactory f2761z;
+    public final SocketFactory f2767z;
 
     /* compiled from: OkHttpClient.kt */
     public static final class a {
@@ -81,7 +81,7 @@ public class x implements Cloneable, e.a {
         public l b = new l();
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<Interceptor> f2762c = new ArrayList();
+        public final List<Interceptor> f2768c = new ArrayList();
         public final List<Interceptor> d = new ArrayList();
         public t.b e;
         public boolean f;
@@ -99,20 +99,20 @@ public class x implements Cloneable, e.a {
         public List<m> r;
 
         /* renamed from: s  reason: collision with root package name */
-        public List<? extends y> f2763s;
+        public List<? extends y> f2769s;
         public HostnameVerifier t;
         public g u;
         public f0.f0.m.c v;
         public int w;
 
         /* renamed from: x  reason: collision with root package name */
-        public int f2764x;
+        public int f2770x;
 
         /* renamed from: y  reason: collision with root package name */
-        public int f2765y;
+        public int f2771y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f2766z;
+        public int f2772z;
 
         public a() {
             t tVar = t.a;
@@ -131,18 +131,18 @@ public class x implements Cloneable, e.a {
             this.o = socketFactory;
             b bVar = x.k;
             this.r = x.j;
-            this.f2763s = x.i;
+            this.f2769s = x.i;
             this.t = d.a;
             this.u = g.a;
-            this.f2764x = 10000;
-            this.f2765y = 10000;
-            this.f2766z = 10000;
+            this.f2770x = 10000;
+            this.f2771y = 10000;
+            this.f2772z = 10000;
             this.B = 1024;
         }
 
         public final a a(long j, TimeUnit timeUnit) {
             m.checkParameterIsNotNull(timeUnit, "unit");
-            this.f2765y = c.b("timeout", j, timeUnit);
+            this.f2771y = c.b("timeout", j, timeUnit);
             return this;
         }
 
@@ -154,7 +154,7 @@ public class x implements Cloneable, e.a {
             }
             this.p = sSLSocketFactory;
             m.checkParameterIsNotNull(x509TrustManager, "trustManager");
-            h.a aVar = h.f2731c;
+            h.a aVar = h.f2737c;
             this.v = h.a.b(x509TrustManager);
             this.q = x509TrustManager;
             return this;
@@ -184,12 +184,12 @@ public class x implements Cloneable, e.a {
         m.checkParameterIsNotNull(aVar, "builder");
         this.l = aVar.a;
         this.m = aVar.b;
-        this.n = c.z(aVar.f2762c);
+        this.n = c.z(aVar.f2768c);
         this.o = c.z(aVar.d);
         this.p = aVar.e;
         this.q = aVar.f;
         this.r = aVar.g;
-        this.f2758s = aVar.h;
+        this.f2764s = aVar.h;
         this.t = aVar.i;
         this.u = aVar.j;
         this.v = aVar.k;
@@ -204,17 +204,17 @@ public class x implements Cloneable, e.a {
                 proxySelector = f0.f0.l.a.a;
             }
         }
-        this.f2759x = proxySelector;
-        this.f2760y = aVar.n;
-        this.f2761z = aVar.o;
+        this.f2765x = proxySelector;
+        this.f2766y = aVar.n;
+        this.f2767z = aVar.o;
         List<m> list2 = aVar.r;
         this.C = list2;
-        this.D = aVar.f2763s;
+        this.D = aVar.f2769s;
         this.E = aVar.t;
         this.H = aVar.w;
-        this.I = aVar.f2764x;
-        this.J = aVar.f2765y;
-        this.K = aVar.f2766z;
+        this.I = aVar.f2770x;
+        this.J = aVar.f2771y;
+        this.K = aVar.f2772z;
         this.L = aVar.A;
         this.M = aVar.B;
         l lVar = aVar.C;
@@ -257,7 +257,7 @@ public class x implements Cloneable, e.a {
                     }
                     this.F = gVar.b(cVar);
                 } else {
-                    h.a aVar2 = h.f2731c;
+                    h.a aVar2 = h.f2737c;
                     X509TrustManager n = h.a.n();
                     this.B = n;
                     h hVar = h.a;
@@ -361,30 +361,30 @@ public class x implements Cloneable, e.a {
         a aVar = new a();
         aVar.a = this.l;
         aVar.b = this.m;
-        r.addAll(aVar.f2762c, this.n);
+        r.addAll(aVar.f2768c, this.n);
         r.addAll(aVar.d, this.o);
         aVar.e = this.p;
         aVar.f = this.q;
         aVar.g = this.r;
-        aVar.h = this.f2758s;
+        aVar.h = this.f2764s;
         aVar.i = this.t;
         aVar.j = this.u;
         aVar.k = this.v;
         aVar.l = this.w;
-        aVar.m = this.f2759x;
-        aVar.n = this.f2760y;
-        aVar.o = this.f2761z;
+        aVar.m = this.f2765x;
+        aVar.n = this.f2766y;
+        aVar.o = this.f2767z;
         aVar.p = this.A;
         aVar.q = this.B;
         aVar.r = this.C;
-        aVar.f2763s = this.D;
+        aVar.f2769s = this.D;
         aVar.t = this.E;
         aVar.u = this.F;
         aVar.v = this.G;
         aVar.w = this.H;
-        aVar.f2764x = this.I;
-        aVar.f2765y = this.J;
-        aVar.f2766z = this.K;
+        aVar.f2770x = this.I;
+        aVar.f2771y = this.J;
+        aVar.f2772z = this.K;
         aVar.A = this.L;
         aVar.B = this.M;
         aVar.C = this.N;
@@ -420,12 +420,12 @@ public class x implements Cloneable, e.a {
                     throw new IllegalArgumentException(("protocols must not contain http/1.0: " + mutableList).toString());
                 } else if (!mutableList.contains(null)) {
                     mutableList.remove(y.SPDY_3);
-                    if (!m.areEqual(mutableList, f.f2763s)) {
+                    if (!m.areEqual(mutableList, f.f2769s)) {
                         f.C = null;
                     }
                     List<? extends y> unmodifiableList = Collections.unmodifiableList(mutableList);
                     m.checkExpressionValueIsNotNull(unmodifiableList, "Collections.unmodifiableList(protocolsCopy)");
-                    f.f2763s = unmodifiableList;
+                    f.f2769s = unmodifiableList;
                     x xVar = new x(f);
                     z.a aVar = new z.a(dVar.u);
                     aVar.b("Upgrade", "websocket");
@@ -435,7 +435,7 @@ public class x implements Cloneable, e.a {
                     aVar.b("Sec-WebSocket-Extensions", "permessage-deflate");
                     z a2 = aVar.a();
                     f0.f0.g.e eVar = new f0.f0.g.e(xVar, a2, true);
-                    dVar.f2735c = eVar;
+                    dVar.f2741c = eVar;
                     eVar.e(new f0.f0.n.e(dVar, a2));
                 } else {
                     throw new IllegalArgumentException("protocols must not contain null".toString());
diff --git a/app/src/main/java/f0/z.java b/app/src/main/java/f0/z.java
index f10a313389..e97b82b281 100644
--- a/app/src/main/java/f0/z.java
+++ b/app/src/main/java/f0/z.java
@@ -20,7 +20,7 @@ public final class z {
     public final w b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2767c;
+    public final String f2773c;
     public final Headers d;
     public final RequestBody e;
     public final Map<Class<?>, Object> f;
@@ -31,24 +31,24 @@ public final class z {
         public String b;
 
         /* renamed from: c  reason: collision with root package name */
-        public Headers.a f2768c;
+        public Headers.a f2774c;
         public RequestBody d;
         public Map<Class<?>, Object> e;
 
         public a() {
             this.e = new LinkedHashMap();
             this.b = "GET";
-            this.f2768c = new Headers.a();
+            this.f2774c = new Headers.a();
         }
 
         public a(z zVar) {
             m.checkParameterIsNotNull(zVar, "request");
             this.e = new LinkedHashMap();
             this.a = zVar.b;
-            this.b = zVar.f2767c;
+            this.b = zVar.f2773c;
             this.d = zVar.e;
             this.e = zVar.f.isEmpty() ? new LinkedHashMap<>() : h0.toMutableMap(zVar.f);
-            this.f2768c = zVar.d.e();
+            this.f2774c = zVar.d.e();
         }
 
         public z a() {
@@ -56,7 +56,7 @@ public final class z {
             w wVar = this.a;
             if (wVar != null) {
                 String str = this.b;
-                Headers c2 = this.f2768c.c();
+                Headers c2 = this.f2774c.c();
                 RequestBody requestBody = this.d;
                 Map<Class<?>, Object> map2 = this.e;
                 byte[] bArr = c.a;
@@ -75,7 +75,7 @@ public final class z {
         public a b(String str, String str2) {
             m.checkParameterIsNotNull(str, "name");
             m.checkParameterIsNotNull(str2, "value");
-            Headers.a aVar = this.f2768c;
+            Headers.a aVar = this.f2774c;
             Objects.requireNonNull(aVar);
             m.checkParameterIsNotNull(str, "name");
             m.checkParameterIsNotNull(str2, "value");
@@ -111,7 +111,7 @@ public final class z {
 
         public a d(String str) {
             m.checkParameterIsNotNull(str, "name");
-            this.f2768c.d(str);
+            this.f2774c.d(str);
             return this;
         }
 
@@ -168,7 +168,7 @@ public final class z {
         m.checkParameterIsNotNull(headers, "headers");
         m.checkParameterIsNotNull(map, "tags");
         this.b = wVar;
-        this.f2767c = str;
+        this.f2773c = str;
         this.d = headers;
         this.e = requestBody;
         this.f = map;
@@ -191,7 +191,7 @@ public final class z {
 
     public String toString() {
         StringBuilder L = c.d.b.a.a.L("Request{method=");
-        L.append(this.f2767c);
+        L.append(this.f2773c);
         L.append(", url=");
         L.append(this.b);
         if (this.d.size() != 0) {
diff --git a/app/src/main/java/g0/c.java b/app/src/main/java/g0/c.java
index e1b5085dad..c8af768651 100644
--- a/app/src/main/java/g0/c.java
+++ b/app/src/main/java/g0/c.java
@@ -79,7 +79,7 @@ public final class c implements v {
                     if (j2 >= ((long) 65536)) {
                         break;
                     }
-                    j2 += (long) (sVar.f2769c - sVar.b);
+                    j2 += (long) (sVar.f2775c - sVar.b);
                     if (j2 >= j) {
                         j2 = j;
                         break;
diff --git a/app/src/main/java/g0/e.java b/app/src/main/java/g0/e.java
index 2f87545dc6..f7ceedbffb 100644
--- a/app/src/main/java/g0/e.java
+++ b/app/src/main/java/g0/e.java
@@ -50,10 +50,10 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 if (sVar2 == null) {
                                     m.throwNpe();
                                 }
-                                int i3 = sVar2.f2769c;
+                                int i3 = sVar2.f2775c;
                                 long j4 = (long) (i3 - sVar2.b);
                                 if (j4 > j3) {
-                                    sVar2.f2769c = i3 - ((int) j3);
+                                    sVar2.f2775c = i3 - ((int) j3);
                                     break;
                                 }
                                 eVar.i = sVar2.a();
@@ -76,9 +76,9 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     boolean z2 = true;
                     while (j5 > 0) {
                         s N = eVar.N(i);
-                        int min = (int) Math.min(j5, (long) (8192 - N.f2769c));
-                        int i4 = N.f2769c + min;
-                        N.f2769c = i4;
+                        int min = (int) Math.min(j5, (long) (8192 - N.f2775c));
+                        int i4 = N.f2775c + min;
+                        N.f2775c = i4;
                         j5 -= (long) min;
                         if (z2) {
                             this.k = N;
@@ -140,7 +140,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 if (sVar == null) {
                                     m.throwNpe();
                                 }
-                                int i2 = sVar.f2769c;
+                                int i2 = sVar.f2775c;
                                 int i3 = sVar.b;
                                 if (j < ((long) (i2 - i3)) + j2) {
                                     break;
@@ -157,7 +157,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 if (sVar2 == null) {
                                     m.throwNpe();
                                 }
-                                j3 -= (long) (sVar2.f2769c - sVar2.b);
+                                j3 -= (long) (sVar2.f2775c - sVar2.b);
                             }
                             sVar = sVar2;
                             j2 = j3;
@@ -170,7 +170,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 byte[] bArr = sVar.a;
                                 byte[] copyOf = Arrays.copyOf(bArr, bArr.length);
                                 m.checkExpressionValueIsNotNull(copyOf, "java.util.Arrays.copyOf(this, size)");
-                                s sVar4 = new s(copyOf, sVar.b, sVar.f2769c, false, true);
+                                s sVar4 = new s(copyOf, sVar.b, sVar.f2775c, false, true);
                                 if (eVar.i == sVar) {
                                     eVar.i = sVar4;
                                 }
@@ -191,7 +191,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         this.m = sVar.a;
                         int i4 = sVar.b + ((int) (j - j2));
                         this.n = i4;
-                        int i5 = sVar.f2769c;
+                        int i5 = sVar.f2775c;
                         this.o = i5;
                         return i5 - i4;
                     }
@@ -283,7 +283,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i2 = sVar.b;
-            if (((long) i2) + j > ((long) sVar.f2769c)) {
+            if (((long) i2) + j > ((long) sVar.f2775c)) {
                 return new String(Y(j), charset);
             }
             int i3 = (int) j;
@@ -291,7 +291,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             int i4 = sVar.b + i3;
             sVar.b = i4;
             this.j -= j;
-            if (i4 == sVar.f2769c) {
+            if (i4 == sVar.f2775c) {
                 this.i = sVar.a();
                 t.a(sVar);
             }
@@ -422,7 +422,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             if (sVar == null) {
                 m.throwNpe();
             }
-            int i5 = sVar.f2769c;
+            int i5 = sVar.f2775c;
             int i6 = sVar.b;
             if (i5 != i6) {
                 i3 += i5 - i6;
@@ -441,7 +441,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             bArr[i7] = sVar2.a;
-            i2 += sVar2.f2769c - sVar2.b;
+            i2 += sVar2.f2775c - sVar2.b;
             iArr[i7] = Math.min(i2, i);
             iArr[i7 + i4] = sVar2.b;
             sVar2.d = true;
@@ -472,7 +472,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             if (sVar2 == null) {
                 m.throwNpe();
             }
-            if (sVar2.f2769c + i <= 8192 && sVar2.e) {
+            if (sVar2.f2775c + i <= 8192 && sVar2.e) {
                 return sVar2;
             }
             s b3 = t.b();
@@ -514,10 +514,10 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         int i3 = i2 + i;
         while (i < i3) {
             s N = N(1);
-            int min = Math.min(i3 - i, 8192 - N.f2769c);
+            int min = Math.min(i3 - i, 8192 - N.f2775c);
             int i4 = i + min;
-            j.copyInto(bArr, N.a, N.f2769c, i, i4);
-            N.f2769c += min;
+            j.copyInto(bArr, N.a, N.f2775c, i, i4);
+            N.f2775c += min;
             i = i4;
         }
         this.j += j;
@@ -527,8 +527,8 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     public e T(int i) {
         s N = N(1);
         byte[] bArr = N.a;
-        int i2 = N.f2769c;
-        N.f2769c = i2 + 1;
+        int i2 = N.f2775c;
+        N.f2775c = i2 + 1;
         bArr[i2] = (byte) i;
         this.j++;
         return this;
@@ -564,7 +564,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             }
             s N = N(i2);
             byte[] bArr = N.a;
-            int i3 = N.f2769c + i2;
+            int i3 = N.f2775c + i2;
             while (j != 0) {
                 long j2 = (long) 10;
                 i3--;
@@ -574,7 +574,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             if (z2) {
                 bArr[i3 - 1] = (byte) 45;
             }
-            N.f2769c += i2;
+            N.f2775c += i2;
             this.j += (long) i2;
         }
         return this;
@@ -599,12 +599,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             int i = (int) ((((j12 & 63) + ((j12 >>> 32) & 63)) + ((long) 3)) / ((long) 4));
             s N = N(i);
             byte[] bArr = N.a;
-            int i2 = N.f2769c;
+            int i2 = N.f2775c;
             for (int i3 = (i2 + i) - 1; i3 >= i2; i3--) {
                 bArr[i3] = g0.z.a.a[(int) (15 & j)];
                 j >>>= 4;
             }
-            N.f2769c += i;
+            N.f2775c += i;
             this.j += (long) i;
         }
         return this;
@@ -613,7 +613,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     public e W(int i) {
         s N = N(4);
         byte[] bArr = N.a;
-        int i2 = N.f2769c;
+        int i2 = N.f2775c;
         int i3 = i2 + 1;
         bArr[i2] = (byte) ((i >>> 24) & 255);
         int i4 = i3 + 1;
@@ -621,7 +621,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         int i5 = i4 + 1;
         bArr[i4] = (byte) ((i >>> 8) & 255);
         bArr[i5] = (byte) (i & 255);
-        N.f2769c = i5 + 1;
+        N.f2775c = i5 + 1;
         this.j += 4;
         return this;
     }
@@ -647,11 +647,11 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
     public e a0(int i) {
         s N = N(2);
         byte[] bArr = N.a;
-        int i2 = N.f2769c;
+        int i2 = N.f2775c;
         int i3 = i2 + 1;
         bArr[i2] = (byte) ((i >>> 8) & 255);
         bArr[i3] = (byte) (i & 255);
-        N.f2769c = i3 + 1;
+        N.f2775c = i3 + 1;
         this.j += 2;
         return this;
     }
@@ -700,7 +700,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         if (charAt2 < 128) {
                             s N = N(1);
                             byte[] bArr = N.a;
-                            int i3 = N.f2769c - i;
+                            int i3 = N.f2775c - i;
                             int min = Math.min(i2, 8192 - i3);
                             int i4 = i + 1;
                             bArr[i + i3] = (byte) charAt2;
@@ -712,27 +712,27 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 i4 = i + 1;
                                 bArr[i + i3] = (byte) charAt;
                             }
-                            int i5 = N.f2769c;
+                            int i5 = N.f2775c;
                             int i6 = (i3 + i) - i5;
-                            N.f2769c = i5 + i6;
+                            N.f2775c = i5 + i6;
                             this.j += (long) i6;
                         } else {
                             if (charAt2 < 2048) {
                                 s N2 = N(2);
                                 byte[] bArr2 = N2.a;
-                                int i7 = N2.f2769c;
+                                int i7 = N2.f2775c;
                                 bArr2[i7] = (byte) ((charAt2 >> 6) | 192);
                                 bArr2[i7 + 1] = (byte) ((charAt2 & '?') | 128);
-                                N2.f2769c = i7 + 2;
+                                N2.f2775c = i7 + 2;
                                 this.j += 2;
                             } else if (charAt2 < 55296 || charAt2 > 57343) {
                                 s N3 = N(3);
                                 byte[] bArr3 = N3.a;
-                                int i8 = N3.f2769c;
+                                int i8 = N3.f2775c;
                                 bArr3[i8] = (byte) ((charAt2 >> '\f') | 224);
                                 bArr3[i8 + 1] = (byte) ((63 & (charAt2 >> 6)) | 128);
                                 bArr3[i8 + 2] = (byte) ((charAt2 & '?') | 128);
-                                N3.f2769c = i8 + 3;
+                                N3.f2775c = i8 + 3;
                                 this.j += 3;
                             } else {
                                 int i9 = i + 1;
@@ -744,12 +744,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                     int i10 = (((charAt2 & 1023) << 10) | (charAt3 & 1023)) + 65536;
                                     s N4 = N(4);
                                     byte[] bArr4 = N4.a;
-                                    int i11 = N4.f2769c;
+                                    int i11 = N4.f2775c;
                                     bArr4[i11] = (byte) ((i10 >> 18) | 240);
                                     bArr4[i11 + 1] = (byte) (((i10 >> 12) & 63) | 128);
                                     bArr4[i11 + 2] = (byte) (((i10 >> 6) & 63) | 128);
                                     bArr4[i11 + 3] = (byte) ((i10 & 63) | 128);
-                                    N4.f2769c = i11 + 4;
+                                    N4.f2775c = i11 + 4;
                                     this.j += 4;
                                     i += 2;
                                 }
@@ -785,31 +785,31 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         } else if (i < 2048) {
             s N = N(2);
             byte[] bArr = N.a;
-            int i2 = N.f2769c;
+            int i2 = N.f2775c;
             bArr[i2] = (byte) ((i >> 6) | 192);
             bArr[i2 + 1] = (byte) ((i & 63) | 128);
-            N.f2769c = i2 + 2;
+            N.f2775c = i2 + 2;
             this.j += 2;
         } else if (55296 <= i && 57343 >= i) {
             T(63);
         } else if (i < 65536) {
             s N2 = N(3);
             byte[] bArr2 = N2.a;
-            int i3 = N2.f2769c;
+            int i3 = N2.f2775c;
             bArr2[i3] = (byte) ((i >> 12) | 224);
             bArr2[i3 + 1] = (byte) (((i >> 6) & 63) | 128);
             bArr2[i3 + 2] = (byte) ((i & 63) | 128);
-            N2.f2769c = i3 + 3;
+            N2.f2775c = i3 + 3;
             this.j += 3;
         } else if (i <= 1114111) {
             s N3 = N(4);
             byte[] bArr3 = N3.a;
-            int i4 = N3.f2769c;
+            int i4 = N3.f2775c;
             bArr3[i4] = (byte) ((i >> 18) | 240);
             bArr3[i4 + 1] = (byte) (((i >> 12) & 63) | 128);
             bArr3[i4 + 2] = (byte) (((i >> 6) & 63) | 128);
             bArr3[i4 + 3] = (byte) ((i & 63) | 128);
-            N3.f2769c = i4 + 4;
+            N3.f2775c = i4 + 4;
             this.j += 4;
         } else {
             StringBuilder L = c.d.b.a.a.L("Unexpected code point: 0x");
@@ -854,7 +854,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 int i2 = sVar2.b;
                 long j2 = 0;
                 while (j2 < this.j) {
-                    long min = (long) Math.min(sVar.f2769c - i, sVar2.f2769c - i2);
+                    long min = (long) Math.min(sVar.f2775c - i, sVar2.f2775c - i2);
                     long j3 = 0;
                     while (j3 < min) {
                         int i3 = i + 1;
@@ -866,14 +866,14 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         i = i3;
                         i2 = i4;
                     }
-                    if (i == sVar.f2769c) {
+                    if (i == sVar.f2775c) {
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
                         }
                         i = sVar.b;
                     }
-                    if (i2 == sVar2.f2769c) {
+                    if (i2 == sVar2.f2775c) {
                         sVar2 = sVar2.f;
                         if (sVar2 == null) {
                             m.throwNpe();
@@ -900,7 +900,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         if (sVar2 == null) {
             m.throwNpe();
         }
-        int i = sVar2.f2769c;
+        int i = sVar2.f2775c;
         if (i < 8192 && sVar2.e) {
             j -= (long) (i - sVar2.b);
         }
@@ -941,7 +941,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         }
         int i = 1;
         do {
-            int i2 = sVar.f2769c;
+            int i2 = sVar.f2775c;
             for (int i3 = sVar.b; i3 < i2; i3++) {
                 i = (i * 31) + sVar.a[i3];
             }
@@ -1010,7 +1010,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 if (sVar == null) {
                     m.throwNpe();
                 }
-                int i = sVar.f2769c;
+                int i = sVar.f2775c;
                 int i2 = sVar.b;
                 if (j < ((long) (i - i2))) {
                     break;
@@ -1025,7 +1025,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 s c2 = sVar.c();
                 int i3 = c2.b + ((int) j);
                 c2.b = i3;
-                c2.f2769c = Math.min(i3 + ((int) j2), c2.f2769c);
+                c2.f2775c = Math.min(i3 + ((int) j2), c2.f2775c);
                 s sVar2 = eVar.i;
                 if (sVar2 == null) {
                     c2.g = c2;
@@ -1041,7 +1041,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     sVar3.b(c2);
                 }
-                j2 -= (long) (c2.f2769c - c2.b);
+                j2 -= (long) (c2.f2775c - c2.b);
                 sVar = sVar.f;
                 j = 0;
             }
@@ -1060,13 +1060,13 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     if (sVar == null) {
                         m.throwNpe();
                     }
-                    j2 -= (long) (sVar.f2769c - sVar.b);
+                    j2 -= (long) (sVar.f2775c - sVar.b);
                 }
                 return sVar.a[(int) ((((long) sVar.b) + j) - j2)];
             }
             long j3 = 0;
             while (true) {
-                int i = sVar.f2769c;
+                int i = sVar.f2775c;
                 int i2 = sVar.b;
                 long j4 = ((long) (i - i2)) + j3;
                 if (j4 > j) {
@@ -1099,7 +1099,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 }
                 byte[] bArr = sVar.a;
                 int i3 = sVar.b;
-                int i4 = sVar.f2769c;
+                int i4 = sVar.f2775c;
                 while (true) {
                     if (i3 >= i4) {
                         break;
@@ -1158,12 +1158,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         if (sVar == null) {
             return -1;
         }
-        int min = Math.min(byteBuffer.remaining(), sVar.f2769c - sVar.b);
+        int min = Math.min(byteBuffer.remaining(), sVar.f2775c - sVar.b);
         byteBuffer.put(sVar.a, sVar.b, min);
         int i = sVar.b + min;
         sVar.b = i;
         this.j -= (long) min;
-        if (i == sVar.f2769c) {
+        if (i == sVar.f2775c) {
             this.i = sVar.a();
             t.a(sVar);
         }
@@ -1177,14 +1177,14 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         if (sVar == null) {
             return -1;
         }
-        int min = Math.min(i2, sVar.f2769c - sVar.b);
+        int min = Math.min(i2, sVar.f2775c - sVar.b);
         byte[] bArr2 = sVar.a;
         int i3 = sVar.b;
         j.copyInto(bArr2, bArr, i, i3, i3 + min);
         int i4 = sVar.b + min;
         sVar.b = i4;
         this.j -= (long) min;
-        if (i4 != sVar.f2769c) {
+        if (i4 != sVar.f2775c) {
             return min;
         }
         this.i = sVar.a();
@@ -1200,7 +1200,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f2769c;
+            int i2 = sVar.f2775c;
             int i3 = i + 1;
             byte b2 = sVar.a[i];
             this.j--;
@@ -1237,7 +1237,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f2769c;
+            int i2 = sVar.f2775c;
             if (((long) (i2 - i)) < 4) {
                 return ((readByte() & 255) << 24) | ((readByte() & 255) << 16) | ((readByte() & 255) << 8) | (readByte() & 255);
             }
@@ -1269,7 +1269,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f2769c;
+            int i2 = sVar.f2775c;
             if (((long) (i2 - i)) < 8) {
                 return ((((long) readInt()) & 4294967295L) << 32) | (4294967295L & ((long) readInt()));
             }
@@ -1306,7 +1306,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 m.throwNpe();
             }
             int i = sVar.b;
-            int i2 = sVar.f2769c;
+            int i2 = sVar.f2775c;
             if (i2 - i < 2) {
                 return (short) (((readByte() & 255) << 8) | (readByte() & 255));
             }
@@ -1341,17 +1341,17 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         if (sVar == null) {
                             m.throwNpe();
                         }
-                        j4 -= (long) (sVar.f2769c - sVar.b);
+                        j4 -= (long) (sVar.f2775c - sVar.b);
                     }
                     while (j4 < j2) {
                         byte[] bArr = sVar.a;
-                        int min = (int) Math.min((long) sVar.f2769c, (((long) sVar.b) + j2) - j4);
+                        int min = (int) Math.min((long) sVar.f2775c, (((long) sVar.b) + j2) - j4);
                         for (int i = (int) ((((long) sVar.b) + j) - j4); i < min; i++) {
                             if (bArr[i] == b2) {
                                 return ((long) (i - sVar.b)) + j4;
                             }
                         }
-                        j4 += (long) (sVar.f2769c - sVar.b);
+                        j4 += (long) (sVar.f2775c - sVar.b);
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
@@ -1360,7 +1360,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                 } else {
                     while (true) {
-                        long j5 = ((long) (sVar.f2769c - sVar.b)) + j3;
+                        long j5 = ((long) (sVar.f2775c - sVar.b)) + j3;
                         if (j5 > j) {
                             break;
                         }
@@ -1372,13 +1372,13 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     while (j3 < j2) {
                         byte[] bArr2 = sVar.a;
-                        int min2 = (int) Math.min((long) sVar.f2769c, (((long) sVar.b) + j2) - j3);
+                        int min2 = (int) Math.min((long) sVar.f2775c, (((long) sVar.b) + j2) - j3);
                         for (int i2 = (int) ((((long) sVar.b) + j) - j3); i2 < min2; i2++) {
                             if (bArr2[i2] == b2) {
                                 return ((long) (i2 - sVar.b)) + j3;
                             }
                         }
-                        j3 += (long) (sVar.f2769c - sVar.b);
+                        j3 += (long) (sVar.f2775c - sVar.b);
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
@@ -1403,13 +1403,13 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         while (j > 0) {
             s sVar = this.i;
             if (sVar != null) {
-                int min = (int) Math.min(j, (long) (sVar.f2769c - sVar.b));
+                int min = (int) Math.min(j, (long) (sVar.f2775c - sVar.b));
                 long j2 = (long) min;
                 this.j -= j2;
                 j -= j2;
                 int i = sVar.b + min;
                 sVar.b = i;
-                if (i == sVar.f2769c) {
+                if (i == sVar.f2775c) {
                     this.i = sVar.a();
                     t.a(sVar);
                 }
@@ -1439,7 +1439,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     if (sVar == null) {
                         m.throwNpe();
                     }
-                    j4 -= (long) (sVar.f2769c - sVar.b);
+                    j4 -= (long) (sVar.f2775c - sVar.b);
                 }
                 if (byteString.j() == 2) {
                     byte m = byteString.m(0);
@@ -1447,7 +1447,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     while (j4 < this.j) {
                         byte[] bArr = sVar.a;
                         i3 = (int) ((((long) sVar.b) + j2) - j4);
-                        int i5 = sVar.f2769c;
+                        int i5 = sVar.f2775c;
                         while (i3 < i5) {
                             byte b2 = bArr[i3];
                             if (b2 == m || b2 == m2) {
@@ -1456,7 +1456,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                                 i3++;
                             }
                         }
-                        j4 += (long) (sVar.f2769c - sVar.b);
+                        j4 += (long) (sVar.f2775c - sVar.b);
                         sVar = sVar.f;
                         if (sVar == null) {
                             m.throwNpe();
@@ -1469,7 +1469,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 while (j4 < this.j) {
                     byte[] bArr2 = sVar.a;
                     i3 = (int) ((((long) sVar.b) + j2) - j4);
-                    int i6 = sVar.f2769c;
+                    int i6 = sVar.f2775c;
                     while (i3 < i6) {
                         byte b3 = bArr2[i3];
                         for (byte b4 : l) {
@@ -1479,7 +1479,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         }
                         i3++;
                     }
-                    j4 += (long) (sVar.f2769c - sVar.b);
+                    j4 += (long) (sVar.f2775c - sVar.b);
                     sVar = sVar.f;
                     if (sVar == null) {
                         m.throwNpe();
@@ -1490,7 +1490,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 return ((long) (i3 - i4)) + j4;
             }
             while (true) {
-                long j5 = ((long) (sVar.f2769c - sVar.b)) + j3;
+                long j5 = ((long) (sVar.f2775c - sVar.b)) + j3;
                 if (j5 > j2) {
                     break;
                 }
@@ -1506,7 +1506,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 while (j3 < this.j) {
                     byte[] bArr3 = sVar.a;
                     i = (int) ((((long) sVar.b) + j2) - j3);
-                    int i7 = sVar.f2769c;
+                    int i7 = sVar.f2775c;
                     while (i < i7) {
                         byte b5 = bArr3[i];
                         if (b5 == m3 || b5 == m4) {
@@ -1515,7 +1515,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                             i++;
                         }
                     }
-                    j3 += (long) (sVar.f2769c - sVar.b);
+                    j3 += (long) (sVar.f2775c - sVar.b);
                     sVar = sVar.f;
                     if (sVar == null) {
                         m.throwNpe();
@@ -1528,7 +1528,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
             while (j3 < this.j) {
                 byte[] bArr4 = sVar.a;
                 i = (int) ((((long) sVar.b) + j2) - j3);
-                int i8 = sVar.f2769c;
+                int i8 = sVar.f2775c;
                 while (i < i8) {
                     byte b6 = bArr4[i];
                     for (byte b7 : l2) {
@@ -1538,7 +1538,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     i++;
                 }
-                j3 += (long) (sVar.f2769c - sVar.b);
+                j3 += (long) (sVar.f2775c - sVar.b);
                 sVar = sVar.f;
                 if (sVar == null) {
                     m.throwNpe();
@@ -1605,10 +1605,10 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
         int i = remaining;
         while (i > 0) {
             s N = N(1);
-            int min = Math.min(i, 8192 - N.f2769c);
-            byteBuffer.get(N.a, N.f2769c, min);
+            int min = Math.min(i, 8192 - N.f2775c);
+            byteBuffer.get(N.a, N.f2775c, min);
             i -= min;
-            N.f2769c += min;
+            N.f2775c += min;
         }
         this.j += (long) remaining;
         return remaining;
@@ -1640,7 +1640,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 if (sVar3 == null) {
                     m.throwNpe();
                 }
-                int i2 = sVar3.f2769c;
+                int i2 = sVar3.f2775c;
                 s sVar4 = eVar.i;
                 if (sVar4 == null) {
                     m.throwNpe();
@@ -1656,7 +1656,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                         sVar = null;
                     }
                     if (sVar != null && sVar.e) {
-                        if ((((long) sVar.f2769c) + j2) - ((long) (sVar.d ? 0 : sVar.b)) <= ((long) 8192)) {
+                        if ((((long) sVar.f2775c) + j2) - ((long) (sVar.d ? 0 : sVar.b)) <= ((long) 8192)) {
                             s sVar6 = eVar.i;
                             if (sVar6 == null) {
                                 m.throwNpe();
@@ -1673,7 +1673,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                     }
                     int i3 = (int) j2;
                     Objects.requireNonNull(sVar7);
-                    if (i3 > 0 && i3 <= sVar7.f2769c - sVar7.b) {
+                    if (i3 > 0 && i3 <= sVar7.f2775c - sVar7.b) {
                         if (i3 >= 1024) {
                             sVar2 = sVar7.c();
                         } else {
@@ -1683,7 +1683,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                             int i4 = sVar7.b;
                             j.copyInto$default(bArr, bArr2, 0, i4, i4 + i3, 2, (Object) null);
                         }
-                        sVar2.f2769c = sVar2.b + i3;
+                        sVar2.f2775c = sVar2.b + i3;
                         sVar7.b += i3;
                         s sVar8 = sVar7.g;
                         if (sVar8 == null) {
@@ -1699,7 +1699,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                 if (sVar9 == null) {
                     m.throwNpe();
                 }
-                long j3 = (long) (sVar9.f2769c - sVar9.b);
+                long j3 = (long) (sVar9.f2775c - sVar9.b);
                 eVar.i = sVar9.a();
                 s sVar10 = this.i;
                 if (sVar10 == null) {
@@ -1721,12 +1721,12 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel {
                             m.throwNpe();
                         }
                         if (sVar12.e) {
-                            int i5 = sVar9.f2769c - sVar9.b;
+                            int i5 = sVar9.f2775c - sVar9.b;
                             s sVar13 = sVar9.g;
                             if (sVar13 == null) {
                                 m.throwNpe();
                             }
-                            int i6 = 8192 - sVar13.f2769c;
+                            int i6 = 8192 - sVar13.f2775c;
                             s sVar14 = sVar9.g;
                             if (sVar14 == null) {
                                 m.throwNpe();
diff --git a/app/src/main/java/g0/h.java b/app/src/main/java/g0/h.java
index 9dd52a0814..b959040b4c 100644
--- a/app/src/main/java/g0/h.java
+++ b/app/src/main/java/g0/h.java
@@ -33,23 +33,23 @@ public final class h implements v {
             if (z2) {
                 Deflater deflater = this.k;
                 byte[] bArr = N.a;
-                int i2 = N.f2769c;
+                int i2 = N.f2775c;
                 i = deflater.deflate(bArr, i2, 8192 - i2, 2);
             } else {
                 Deflater deflater2 = this.k;
                 byte[] bArr2 = N.a;
-                int i3 = N.f2769c;
+                int i3 = N.f2775c;
                 i = deflater2.deflate(bArr2, i3, 8192 - i3);
             }
             if (i > 0) {
-                N.f2769c += i;
+                N.f2775c += i;
                 g.j += (long) i;
                 this.j.E();
             } else if (this.k.needsInput()) {
                 break;
             }
         }
-        if (N.b == N.f2769c) {
+        if (N.b == N.f2775c) {
             g.i = N.a();
             t.a(N);
         }
@@ -114,14 +114,14 @@ public final class h implements v {
             if (sVar == null) {
                 m.throwNpe();
             }
-            int min = (int) Math.min(j, (long) (sVar.f2769c - sVar.b));
+            int min = (int) Math.min(j, (long) (sVar.f2775c - sVar.b));
             this.k.setInput(sVar.a, sVar.b, min);
             a(false);
             long j2 = (long) min;
             eVar.j -= j2;
             int i = sVar.b + min;
             sVar.b = i;
-            if (i == sVar.f2769c) {
+            if (i == sVar.f2775c) {
                 eVar.i = sVar.a();
                 t.a(sVar);
             }
diff --git a/app/src/main/java/g0/l.java b/app/src/main/java/g0/l.java
index 99794b685c..ec6b1ceee5 100644
--- a/app/src/main/java/g0/l.java
+++ b/app/src/main/java/g0/l.java
@@ -38,7 +38,7 @@ public final class l implements x {
             m.throwNpe();
         }
         while (true) {
-            int i = sVar.f2769c;
+            int i = sVar.f2775c;
             int i2 = sVar.b;
             if (j < ((long) (i - i2))) {
                 break;
@@ -51,7 +51,7 @@ public final class l implements x {
         }
         while (j2 > 0) {
             int i3 = (int) (((long) sVar.b) + j);
-            int min = (int) Math.min((long) (sVar.f2769c - i3), j2);
+            int min = (int) Math.min((long) (sVar.f2775c - i3), j2);
             this.m.update(sVar.a, i3, min);
             j2 -= (long) min;
             sVar = sVar.f;
diff --git a/app/src/main/java/g0/m.java b/app/src/main/java/g0/m.java
index f92be8b7b6..a420137ffa 100644
--- a/app/src/main/java/g0/m.java
+++ b/app/src/main/java/g0/m.java
@@ -42,21 +42,21 @@ public final class m implements x {
         } else {
             try {
                 s N = eVar.N(1);
-                int min = (int) Math.min(j, (long) (8192 - N.f2769c));
+                int min = (int) Math.min(j, (long) (8192 - N.f2775c));
                 if (this.l.needsInput()) {
                     if (!this.k.v()) {
                         s sVar = this.k.g().i;
                         if (sVar == null) {
                             d0.z.d.m.throwNpe();
                         }
-                        int i2 = sVar.f2769c;
+                        int i2 = sVar.f2775c;
                         int i3 = sVar.b;
                         int i4 = i2 - i3;
                         this.i = i4;
                         this.l.setInput(sVar.a, i3, i4);
                     }
                 }
-                int inflate = this.l.inflate(N.a, N.f2769c, min);
+                int inflate = this.l.inflate(N.a, N.f2775c, min);
                 int i5 = this.i;
                 if (i5 != 0) {
                     int remaining = i5 - this.l.getRemaining();
@@ -64,12 +64,12 @@ public final class m implements x {
                     this.k.skip((long) remaining);
                 }
                 if (inflate > 0) {
-                    N.f2769c += inflate;
+                    N.f2775c += inflate;
                     long j2 = (long) inflate;
                     eVar.j += j2;
                     return j2;
                 }
-                if (N.b == N.f2769c) {
+                if (N.b == N.f2775c) {
                     eVar.i = N.a();
                     t.a(N);
                 }
diff --git a/app/src/main/java/g0/n.java b/app/src/main/java/g0/n.java
index ad6869812c..987bdb712c 100644
--- a/app/src/main/java/g0/n.java
+++ b/app/src/main/java/g0/n.java
@@ -32,13 +32,13 @@ public final class n implements x {
             try {
                 this.j.f();
                 s N = eVar.N(1);
-                int read = this.i.read(N.a, N.f2769c, (int) Math.min(j, (long) (8192 - N.f2769c)));
+                int read = this.i.read(N.a, N.f2775c, (int) Math.min(j, (long) (8192 - N.f2775c)));
                 if (read != -1) {
-                    N.f2769c += read;
+                    N.f2775c += read;
                     long j2 = (long) read;
                     eVar.j += j2;
                     return j2;
-                } else if (N.b != N.f2769c) {
+                } else if (N.b != N.f2775c) {
                     return -1;
                 } else {
                     eVar.i = N.a();
diff --git a/app/src/main/java/g0/p.java b/app/src/main/java/g0/p.java
index 6aefa03618..2248ea00b3 100644
--- a/app/src/main/java/g0/p.java
+++ b/app/src/main/java/g0/p.java
@@ -48,14 +48,14 @@ public final class p implements v {
             if (sVar == null) {
                 m.throwNpe();
             }
-            int min = (int) Math.min(j, (long) (sVar.f2769c - sVar.b));
+            int min = (int) Math.min(j, (long) (sVar.f2775c - sVar.b));
             this.i.write(sVar.a, sVar.b, min);
             int i = sVar.b + min;
             sVar.b = i;
             long j2 = (long) min;
             j -= j2;
             eVar.j -= j2;
-            if (i == sVar.f2769c) {
+            if (i == sVar.f2775c) {
                 eVar.i = sVar.a();
                 t.a(sVar);
             }
diff --git a/app/src/main/java/g0/s.java b/app/src/main/java/g0/s.java
index 2c11b8a1ed..83c25066c1 100644
--- a/app/src/main/java/g0/s.java
+++ b/app/src/main/java/g0/s.java
@@ -8,7 +8,7 @@ public final class s {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2769c;
+    public int f2775c;
     public boolean d;
     public boolean e;
     public s f;
@@ -24,7 +24,7 @@ public final class s {
         m.checkParameterIsNotNull(bArr, "data");
         this.a = bArr;
         this.b = i;
-        this.f2769c = i2;
+        this.f2775c = i2;
         this.d = z2;
         this.e = z3;
     }
@@ -64,20 +64,20 @@ public final class s {
 
     public final s c() {
         this.d = true;
-        return new s(this.a, this.b, this.f2769c, true, false);
+        return new s(this.a, this.b, this.f2775c, true, false);
     }
 
     public final void d(s sVar, int i) {
         m.checkParameterIsNotNull(sVar, "sink");
         if (sVar.e) {
-            int i2 = sVar.f2769c;
+            int i2 = sVar.f2775c;
             if (i2 + i > 8192) {
                 if (!sVar.d) {
                     int i3 = sVar.b;
                     if ((i2 + i) - i3 <= 8192) {
                         byte[] bArr = sVar.a;
                         j.copyInto$default(bArr, bArr, 0, i3, i2, 2, (Object) null);
-                        sVar.f2769c -= sVar.b;
+                        sVar.f2775c -= sVar.b;
                         sVar.b = 0;
                     } else {
                         throw new IllegalArgumentException();
@@ -88,10 +88,10 @@ public final class s {
             }
             byte[] bArr2 = this.a;
             byte[] bArr3 = sVar.a;
-            int i4 = sVar.f2769c;
+            int i4 = sVar.f2775c;
             int i5 = this.b;
             j.copyInto(bArr2, bArr3, i4, i5, i5 + i);
-            sVar.f2769c += i;
+            sVar.f2775c += i;
             this.b += i;
             return;
         }
diff --git a/app/src/main/java/g0/t.java b/app/src/main/java/g0/t.java
index 4d41da5f6a..52e481c818 100644
--- a/app/src/main/java/g0/t.java
+++ b/app/src/main/java/g0/t.java
@@ -8,7 +8,7 @@ public final class t {
     public static final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicReference<s>[] f2770c;
+    public static final AtomicReference<s>[] f2776c;
     public static final t d = new t();
 
     static {
@@ -18,7 +18,7 @@ public final class t {
         for (int i = 0; i < highestOneBit; i++) {
             atomicReferenceArr[i] = new AtomicReference<>();
         }
-        f2770c = atomicReferenceArr;
+        f2776c = atomicReferenceArr;
     }
 
     public static final void a(s sVar) {
@@ -28,14 +28,14 @@ public final class t {
         } else if (!sVar.d) {
             Thread currentThread = Thread.currentThread();
             m.checkExpressionValueIsNotNull(currentThread, "Thread.currentThread()");
-            AtomicReference<s> atomicReference = f2770c[(int) (currentThread.getId() & (((long) b) - 1))];
+            AtomicReference<s> atomicReference = f2776c[(int) (currentThread.getId() & (((long) b) - 1))];
             s sVar2 = atomicReference.get();
             if (sVar2 != a) {
-                int i = sVar2 != null ? sVar2.f2769c : 0;
+                int i = sVar2 != null ? sVar2.f2775c : 0;
                 if (i < 65536) {
                     sVar.f = sVar2;
                     sVar.b = 0;
-                    sVar.f2769c = i + 8192;
+                    sVar.f2775c = i + 8192;
                     if (!atomicReference.compareAndSet(sVar2, sVar)) {
                         sVar.f = null;
                     }
@@ -47,7 +47,7 @@ public final class t {
     public static final s b() {
         Thread currentThread = Thread.currentThread();
         m.checkExpressionValueIsNotNull(currentThread, "Thread.currentThread()");
-        AtomicReference<s> atomicReference = f2770c[(int) (currentThread.getId() & (((long) b) - 1))];
+        AtomicReference<s> atomicReference = f2776c[(int) (currentThread.getId() & (((long) b) - 1))];
         s sVar = a;
         s andSet = atomicReference.getAndSet(sVar);
         if (andSet == sVar) {
@@ -59,7 +59,7 @@ public final class t {
         }
         atomicReference.set(andSet.f);
         andSet.f = null;
-        andSet.f2769c = 0;
+        andSet.f2775c = 0;
         return andSet;
     }
 }
diff --git a/app/src/main/java/g0/y.java b/app/src/main/java/g0/y.java
index 4aff5a3a2a..022d2d764f 100644
--- a/app/src/main/java/g0/y.java
+++ b/app/src/main/java/g0/y.java
@@ -10,7 +10,7 @@ public class y {
     public boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public long f2771c;
+    public long f2777c;
     public long d;
 
     /* compiled from: Timeout.kt */
@@ -43,14 +43,14 @@ public class y {
 
     public long c() {
         if (this.b) {
-            return this.f2771c;
+            return this.f2777c;
         }
         throw new IllegalStateException("No deadline".toString());
     }
 
     public y d(long j) {
         this.b = true;
-        this.f2771c = j;
+        this.f2777c = j;
         return this;
     }
 
@@ -62,7 +62,7 @@ public class y {
         if (Thread.interrupted()) {
             Thread.currentThread().interrupt();
             throw new InterruptedIOException("interrupted");
-        } else if (this.b && this.f2771c - System.nanoTime() <= 0) {
+        } else if (this.b && this.f2777c - System.nanoTime() <= 0) {
             throw new InterruptedIOException("deadline reached");
         }
     }
diff --git a/app/src/main/java/g0/z/a.java b/app/src/main/java/g0/z/a.java
index b6773376f5..82f0de0a22 100644
--- a/app/src/main/java/g0/z/a.java
+++ b/app/src/main/java/g0/z/a.java
@@ -45,7 +45,7 @@ public final class a {
         }
         byte[] bArr = sVar2.a;
         int i5 = sVar2.b;
-        int i6 = sVar2.f2769c;
+        int i6 = sVar2.f2775c;
         int[] iArr = oVar.l;
         s sVar3 = sVar2;
         int i7 = 0;
@@ -81,7 +81,7 @@ public final class a {
                         }
                         i4 = sVar4.b;
                         byte[] bArr2 = sVar4.a;
-                        i3 = sVar4.f2769c;
+                        i3 = sVar4.f2775c;
                         if (sVar4 != sVar2) {
                             sVar = sVar4;
                             bArr = bArr2;
@@ -122,7 +122,7 @@ public final class a {
                             }
                             i = sVar3.b;
                             bArr = sVar3.a;
-                            i6 = sVar3.f2769c;
+                            i6 = sVar3.f2775c;
                             if (sVar3 == sVar2) {
                                 sVar3 = null;
                             }
diff --git a/app/src/main/java/h0/a/a/a.java b/app/src/main/java/h0/a/a/a.java
index 163035269a..9dfe861667 100644
--- a/app/src/main/java/h0/a/a/a.java
+++ b/app/src/main/java/h0/a/a/a.java
@@ -7,7 +7,7 @@ public final class a {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final c f2772c;
+    public final c f2778c;
     public final int d;
     public int e;
     public final a f;
@@ -16,7 +16,7 @@ public final class a {
     public a(v vVar, boolean z2, c cVar, a aVar) {
         this.a = vVar;
         this.b = z2;
-        this.f2772c = cVar;
+        this.f2778c = cVar;
         int i = cVar.b;
         this.d = i == 0 ? -1 : i - 2;
         this.f = aVar;
@@ -53,7 +53,7 @@ public final class a {
             }
             cVar.j(i6);
             while (aVar2 != null) {
-                c cVar2 = aVar2.f2772c;
+                c cVar2 = aVar2.f2778c;
                 cVar.h(cVar2.a, 0, cVar2.b);
                 aVar2 = aVar2.g;
             }
@@ -66,7 +66,7 @@ public final class a {
         }
         int i = 8;
         for (a aVar = this; aVar != null; aVar = aVar.f) {
-            i += aVar.f2772c.b;
+            i += aVar.f2778c.b;
         }
         return i;
     }
@@ -77,7 +77,7 @@ public final class a {
         a aVar = null;
         for (a aVar2 = this; aVar2 != null; aVar2 = aVar2.f) {
             aVar2.g();
-            i2 += aVar2.f2772c.b;
+            i2 += aVar2.f2778c.b;
             i3++;
             aVar = aVar2;
         }
@@ -85,7 +85,7 @@ public final class a {
         cVar.i(i2);
         cVar.j(i3);
         while (aVar != null) {
-            c cVar2 = aVar.f2772c;
+            c cVar2 = aVar.f2778c;
             cVar.h(cVar2.a, 0, cVar2.b);
             aVar = aVar.g;
         }
@@ -94,77 +94,77 @@ public final class a {
     public void e(String str, Object obj) {
         this.e++;
         if (this.b) {
-            this.f2772c.j(this.a.l(str));
+            this.f2778c.j(this.a.l(str));
         }
         if (obj instanceof String) {
-            this.f2772c.e(115, this.a.l((String) obj));
+            this.f2778c.e(115, this.a.l((String) obj));
         } else if (obj instanceof Byte) {
-            this.f2772c.e(66, this.a.e(((Byte) obj).byteValue()).a);
+            this.f2778c.e(66, this.a.e(((Byte) obj).byteValue()).a);
         } else if (obj instanceof Boolean) {
-            this.f2772c.e(90, this.a.e(((Boolean) obj).booleanValue() ? 1 : 0).a);
+            this.f2778c.e(90, this.a.e(((Boolean) obj).booleanValue() ? 1 : 0).a);
         } else if (obj instanceof Character) {
-            this.f2772c.e(67, this.a.e(((Character) obj).charValue()).a);
+            this.f2778c.e(67, this.a.e(((Character) obj).charValue()).a);
         } else if (obj instanceof Short) {
-            this.f2772c.e(83, this.a.e(((Short) obj).shortValue()).a);
+            this.f2778c.e(83, this.a.e(((Short) obj).shortValue()).a);
         } else if (obj instanceof w) {
-            this.f2772c.e(99, this.a.l(((w) obj).d()));
+            this.f2778c.e(99, this.a.l(((w) obj).d()));
         } else {
             int i = 0;
             if (obj instanceof byte[]) {
                 byte[] bArr = (byte[]) obj;
-                this.f2772c.e(91, bArr.length);
+                this.f2778c.e(91, bArr.length);
                 int length = bArr.length;
                 while (i < length) {
-                    this.f2772c.e(66, this.a.e(bArr[i]).a);
+                    this.f2778c.e(66, this.a.e(bArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof boolean[]) {
                 boolean[] zArr = (boolean[]) obj;
-                this.f2772c.e(91, zArr.length);
+                this.f2778c.e(91, zArr.length);
                 int length2 = zArr.length;
                 while (i < length2) {
-                    this.f2772c.e(90, this.a.e(zArr[i] ? 1 : 0).a);
+                    this.f2778c.e(90, this.a.e(zArr[i] ? 1 : 0).a);
                     i++;
                 }
             } else if (obj instanceof short[]) {
                 short[] sArr = (short[]) obj;
-                this.f2772c.e(91, sArr.length);
+                this.f2778c.e(91, sArr.length);
                 int length3 = sArr.length;
                 while (i < length3) {
-                    this.f2772c.e(83, this.a.e(sArr[i]).a);
+                    this.f2778c.e(83, this.a.e(sArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof char[]) {
                 char[] cArr = (char[]) obj;
-                this.f2772c.e(91, cArr.length);
+                this.f2778c.e(91, cArr.length);
                 int length4 = cArr.length;
                 while (i < length4) {
-                    this.f2772c.e(67, this.a.e(cArr[i]).a);
+                    this.f2778c.e(67, this.a.e(cArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof int[]) {
                 int[] iArr = (int[]) obj;
-                this.f2772c.e(91, iArr.length);
+                this.f2778c.e(91, iArr.length);
                 int length5 = iArr.length;
                 while (i < length5) {
-                    this.f2772c.e(73, this.a.e(iArr[i]).a);
+                    this.f2778c.e(73, this.a.e(iArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof long[]) {
                 long[] jArr = (long[]) obj;
-                this.f2772c.e(91, jArr.length);
+                this.f2778c.e(91, jArr.length);
                 int length6 = jArr.length;
                 while (i < length6) {
-                    this.f2772c.e(74, this.a.g(5, jArr[i]).a);
+                    this.f2778c.e(74, this.a.g(5, jArr[i]).a);
                     i++;
                 }
             } else if (obj instanceof float[]) {
                 float[] fArr = (float[]) obj;
-                this.f2772c.e(91, fArr.length);
+                this.f2778c.e(91, fArr.length);
                 int length7 = fArr.length;
                 while (i < length7) {
                     float f = fArr[i];
-                    c cVar = this.f2772c;
+                    c cVar = this.f2778c;
                     v vVar = this.a;
                     Objects.requireNonNull(vVar);
                     cVar.e(70, vVar.f(4, Float.floatToRawIntBits(f)).a);
@@ -172,11 +172,11 @@ public final class a {
                 }
             } else if (obj instanceof double[]) {
                 double[] dArr = (double[]) obj;
-                this.f2772c.e(91, dArr.length);
+                this.f2778c.e(91, dArr.length);
                 int length8 = dArr.length;
                 while (i < length8) {
                     double d = dArr[i];
-                    c cVar2 = this.f2772c;
+                    c cVar2 = this.f2778c;
                     v vVar2 = this.a;
                     Objects.requireNonNull(vVar2);
                     cVar2.e(68, vVar2.g(6, Double.doubleToRawLongBits(d)).a);
@@ -184,7 +184,7 @@ public final class a {
                 }
             } else {
                 u b = this.a.b(obj);
-                this.f2772c.e(".s.IFJDCS".charAt(b.b), b.a);
+                this.f2778c.e(".s.IFJDCS".charAt(b.b), b.a);
             }
         }
     }
@@ -192,16 +192,16 @@ public final class a {
     public a f(String str) {
         this.e++;
         if (this.b) {
-            this.f2772c.j(this.a.l(str));
+            this.f2778c.j(this.a.l(str));
         }
-        this.f2772c.e(91, 0);
-        return new a(this.a, false, this.f2772c, null);
+        this.f2778c.e(91, 0);
+        return new a(this.a, false, this.f2778c, null);
     }
 
     public void g() {
         int i = this.d;
         if (i != -1) {
-            byte[] bArr = this.f2772c.a;
+            byte[] bArr = this.f2778c.a;
             int i2 = this.e;
             bArr[i] = (byte) (i2 >>> 8);
             bArr[i + 1] = (byte) i2;
diff --git a/app/src/main/java/h0/a/a/b.java b/app/src/main/java/h0/a/a/b.java
index 3df9954cbc..aabddc7767 100644
--- a/app/src/main/java/h0/a/a/b.java
+++ b/app/src/main/java/h0/a/a/b.java
@@ -5,7 +5,7 @@ public class b {
     public byte[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public b f2773c;
+    public b f2779c;
 
     /* compiled from: Attribute */
     public static final class a {
@@ -40,7 +40,7 @@ public class b {
                     this.a = i3 + 1;
                     bVarArr3[i3] = bVar;
                 }
-                bVar = bVar.f2773c;
+                bVar = bVar.f2779c;
             }
         }
     }
@@ -56,7 +56,7 @@ public class b {
     public final int b(v vVar, byte[] bArr, int i, int i2, int i3) {
         f fVar = vVar.a;
         int i4 = 0;
-        for (b bVar = this; bVar != null; bVar = bVar.f2773c) {
+        for (b bVar = this; bVar != null; bVar = bVar.f2779c) {
             vVar.l(bVar.a);
             i4 += bVar.b.length + 6;
         }
@@ -65,7 +65,7 @@ public class b {
 
     public final int c() {
         int i = 0;
-        for (b bVar = this; bVar != null; bVar = bVar.f2773c) {
+        for (b bVar = this; bVar != null; bVar = bVar.f2779c) {
             i++;
         }
         return i;
@@ -77,7 +77,7 @@ public class b {
 
     public final void e(v vVar, byte[] bArr, int i, int i2, int i3, c cVar) {
         f fVar = vVar.a;
-        for (b bVar = this; bVar != null; bVar = bVar.f2773c) {
+        for (b bVar = this; bVar != null; bVar = bVar.f2779c) {
             byte[] bArr2 = bVar.b;
             int length = bArr2.length;
             c.d.b.a.a.l0(vVar, bVar.a, cVar, length);
diff --git a/app/src/main/java/h0/a/a/d.java b/app/src/main/java/h0/a/a/d.java
index a64236895c..b8745716bc 100644
--- a/app/src/main/java/h0/a/a/d.java
+++ b/app/src/main/java/h0/a/a/d.java
@@ -8,7 +8,7 @@ public class d {
     public final int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String[] f2774c;
+    public final String[] f2780c;
     public final g[] d;
     public final int[] e;
     public final int f;
@@ -28,7 +28,7 @@ public class d {
         }
         int u = u(i + 8);
         this.b = new int[u];
-        this.f2774c = new String[u];
+        this.f2780c = new String[u];
         int i4 = i + 10;
         int i5 = 1;
         int i6 = 0;
@@ -314,7 +314,7 @@ public class d {
         int i37;
         int i38;
         byte[] bArr = this.a;
-        char[] cArr = hVar.f2781c;
+        char[] cArr = hVar.f2787c;
         int u3 = u(i);
         int u4 = u(i + 2);
         int l = l(i + 4);
@@ -756,7 +756,7 @@ public class d {
                                         i31 = i50;
                                         i30 = i33;
                                         b e = e(hVar.a, t2, i57, l4, cArr, i, pVarArr5);
-                                        e.f2773c = bVar3;
+                                        e.f2779c = bVar3;
                                         bVar3 = e;
                                         iArr8 = iArr6;
                                     } else if ((hVar.b & 4) == 0) {
@@ -801,8 +801,8 @@ public class d {
                                     int i62 = i60 + 4;
                                     a(u10, pVarArr8);
                                     p pVar = pVarArr8[u10];
-                                    if (pVar.f2788c == 0) {
-                                        pVar.f2788c = (short) u11;
+                                    if (pVar.f2794c == 0) {
+                                        pVar.f2794c = (short) u11;
                                         i35 = i62;
                                         iArr7 = iArr8;
                                         pVarArr7 = pVarArr8;
@@ -865,14 +865,14 @@ public class d {
                             Object[] objArr = new Object[u4];
                             hVar.q = objArr;
                             hVar.r = 0;
-                            hVar.f2782s = new Object[u3];
+                            hVar.f2788s = new Object[u3];
                             if (z12) {
                                 String str2 = hVar.f;
                                 if ((hVar.d & 8) == 0) {
                                     if ("<init>".equals(hVar.e)) {
                                         objArr[0] = t.g;
                                     } else {
-                                        objArr[0] = g(this.g + 2, hVar.f2781c);
+                                        objArr[0] = g(this.g + 2, hVar.f2787c);
                                     }
                                     i28 = 1;
                                 } else {
@@ -885,7 +885,7 @@ public class d {
                                     char charAt = str2.charAt(i67);
                                     if (charAt == 'F') {
                                         i29 = i66 + 1;
-                                        objArr[i66] = t.f2797c;
+                                        objArr[i66] = t.f2803c;
                                     } else if (charAt != 'L') {
                                         if (!(charAt == 'S' || charAt == 'I')) {
                                             if (charAt == 'J') {
@@ -1003,7 +1003,7 @@ public class d {
                             if (pVar2 != null) {
                                 boolean z14 = (hVar.b & 2) == 0;
                                 qVar.i(pVar2);
-                                if (z14 && (s2 = pVar2.f2788c) != 0) {
+                                if (z14 && (s2 = pVar2.f2794c) != 0) {
                                     qVar.k(s2 & 65535, pVar2);
                                     if (pVar2.d != null) {
                                         i7 = i75;
@@ -1028,14 +1028,14 @@ public class d {
                                                                 i19 = u4;
                                                                 i20 = i6;
                                                                 i21 = i8;
-                                                                qVar.c(-1, hVar.o, hVar.q, hVar.r, hVar.f2782s);
+                                                                qVar.c(-1, hVar.o, hVar.q, hVar.r, hVar.f2788s);
                                                             } else {
                                                                 i19 = u4;
                                                                 i21 = i8;
                                                                 i20 = i6;
                                                                 iArr4 = iArr13;
                                                                 iArr3 = iArr12;
-                                                                qVar.c(hVar.n, hVar.p, hVar.q, hVar.r, hVar.f2782s);
+                                                                qVar.c(hVar.n, hVar.p, hVar.q, hVar.r, hVar.f2788s);
                                                             }
                                                             z10 = false;
                                                         } else {
@@ -1047,7 +1047,7 @@ public class d {
                                                             z10 = z2;
                                                         }
                                                         if (i21 < i2) {
-                                                            char[] cArr2 = hVar.f2781c;
+                                                            char[] cArr2 = hVar.f2787c;
                                                             p[] pVarArr10 = hVar.g;
                                                             if (z11) {
                                                                 i23 = i21 + 1;
@@ -1071,7 +1071,7 @@ public class d {
                                                                     u = i22 - 64;
                                                                     i25 = i2;
                                                                     pVarArr3 = pVarArr10;
-                                                                    i26 = x(i23, hVar.f2782s, 0, cArr2, pVarArr3);
+                                                                    i26 = x(i23, hVar.f2788s, 0, cArr2, pVarArr3);
                                                                     hVar.n = 4;
                                                                     hVar.r = 1;
                                                                 } else {
@@ -1081,7 +1081,7 @@ public class d {
                                                                         u = u(i23);
                                                                         int i82 = i23 + 2;
                                                                         if (i22 == 247) {
-                                                                            i26 = x(i82, hVar.f2782s, 0, cArr2, pVarArr3);
+                                                                            i26 = x(i82, hVar.f2788s, 0, cArr2, pVarArr3);
                                                                             hVar.n = 4;
                                                                             hVar.r = 1;
                                                                         } else {
@@ -1122,7 +1122,7 @@ public class d {
                                                                                 i82 = i87 + 2;
                                                                                 hVar.r = u13;
                                                                                 for (int i89 = 0; i89 < u13; i89++) {
-                                                                                    i82 = x(i82, hVar.f2782s, i89, cArr2, pVarArr3);
+                                                                                    i82 = x(i82, hVar.f2788s, i89, cArr2, pVarArr3);
                                                                                 }
                                                                             }
                                                                             i26 = i82;
@@ -2286,10 +2286,10 @@ public class d {
                         }
                         b bVar4 = bVar;
                         while (bVar4 != null) {
-                            b bVar5 = bVar4.f2773c;
-                            bVar4.f2773c = null;
+                            b bVar5 = bVar4.f2779c;
+                            bVar4.f2779c = null;
                             r rVar5 = (r) qVar;
-                            bVar4.f2773c = rVar5.M;
+                            bVar4.f2779c = rVar5.M;
                             rVar5.M = bVar4;
                             bVar4 = bVar5;
                         }
@@ -2376,9 +2376,9 @@ public class d {
                     String t3 = t(i4 + 2, cArr);
                     aVar.e++;
                     if (aVar.b) {
-                        aVar.f2772c.j(aVar.a.l(str));
+                        aVar.f2778c.j(aVar.a.l(str));
                     }
-                    c cVar = aVar.f2772c;
+                    c cVar = aVar.f2778c;
                     cVar.e(101, aVar.a.l(t2));
                     cVar.j(aVar.a.l(t3));
                     return i4 + 4;
@@ -2494,12 +2494,12 @@ public class d {
         String t4 = t(i4, cArr);
         aVar.e++;
         if (aVar.b) {
-            aVar.f2772c.j(aVar.a.l(str));
+            aVar.f2778c.j(aVar.a.l(str));
         }
-        c cVar2 = aVar.f2772c;
+        c cVar2 = aVar.f2778c;
         cVar2.e(64, aVar.a.l(t4));
         cVar2.j(0);
-        return k(new a(aVar.a, true, aVar.f2772c, null), i4 + 2, true, cArr);
+        return k(new a(aVar.a, true, aVar.f2778c, null), i4 + 2, true, cArr);
     }
 
     public final int k(a aVar, int i, boolean z2, char[] cArr) {
@@ -2557,7 +2557,7 @@ public class d {
         } else {
             rVar.F = i3;
         }
-        char[] cArr = hVar.f2781c;
+        char[] cArr = hVar.f2787c;
         for (int i4 = 0; i4 < i3; i4++) {
             int u = u(i2);
             i2 += 2;
@@ -2682,7 +2682,7 @@ public class d {
     public final int[] s(q qVar, h hVar, int i, boolean z2) {
         int i2;
         a aVar;
-        char[] cArr = hVar.f2781c;
+        char[] cArr = hVar.f2787c;
         int u = u(i);
         int[] iArr = new int[u];
         int i3 = i + 2;
@@ -2753,8 +2753,8 @@ public class d {
                         aVar = new a(rVar.d, true, cVar, rVar.w);
                         rVar.w = aVar;
                     } else {
-                        aVar = new a(rVar.d, true, cVar, rVar.f2793x);
-                        rVar.f2793x = aVar;
+                        aVar = new a(rVar.d, true, cVar, rVar.f2799x);
+                        rVar.f2799x = aVar;
                     }
                     i3 = k(aVar, i8, true, cArr);
                 } else {
@@ -2812,7 +2812,7 @@ public class d {
     }
 
     public final String w(int i, char[] cArr) {
-        String[] strArr = this.f2774c;
+        String[] strArr = this.f2780c;
         String str = strArr[i];
         if (str != null) {
             return str;
@@ -2833,7 +2833,7 @@ public class d {
                 objArr[i2] = t.b;
                 return i3;
             case 2:
-                objArr[i2] = t.f2797c;
+                objArr[i2] = t.f2803c;
                 return i3;
             case 3:
                 objArr[i2] = t.d;
diff --git a/app/src/main/java/h0/a/a/f.java b/app/src/main/java/h0/a/a/f.java
index e153998e8d..93503a46c2 100644
--- a/app/src/main/java/h0/a/a/f.java
+++ b/app/src/main/java/h0/a/a/f.java
@@ -12,7 +12,7 @@ public class f extends e {
     public final v b = new v(this);
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2775c;
+    public int f2781c;
     public int d;
     public int e;
     public int f;
@@ -30,20 +30,20 @@ public class f extends e {
     public c r;
 
     /* renamed from: s  reason: collision with root package name */
-    public a f2776s;
+    public a f2782s;
     public a t;
     public a u;
     public a v;
     public s w;
 
     /* renamed from: x  reason: collision with root package name */
-    public int f2777x;
+    public int f2783x;
 
     /* renamed from: y  reason: collision with root package name */
-    public int f2778y;
+    public int f2784y;
 
     /* renamed from: z  reason: collision with root package name */
-    public c f2779z;
+    public c f2785z;
 
     public f(int i) {
         super(458752);
@@ -57,7 +57,7 @@ public class f extends e {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:395:0x0aa5, code lost:
-        if (r1.f2794y != 0) goto L_0x0acf;
+        if (r1.f2800y != 0) goto L_0x0acf;
      */
     /* JADX WARNING: Removed duplicated region for block: B:407:0x0ad2  */
     /* JADX WARNING: Removed duplicated region for block: B:408:0x0ad7  */
@@ -133,14 +133,14 @@ public class f extends e {
         this.i = null;
         this.j = null;
         this.k = null;
-        this.f2776s = null;
+        this.f2782s = null;
         this.t = null;
         this.u = null;
         this.v = null;
         this.w = null;
-        this.f2777x = 0;
-        this.f2778y = 0;
-        this.f2779z = null;
+        this.f2783x = 0;
+        this.f2784y = 0;
+        this.f2785z = null;
         this.A = null;
         this.B = z2 ? 3 : 0;
         d dVar2 = new d(bArr, 0, false);
@@ -149,7 +149,7 @@ public class f extends e {
         hVar2.a = bVarArr;
         hVar2.b = i10;
         char[] cArr = new char[dVar2.f];
-        hVar2.f2781c = cArr;
+        hVar2.f2787c = cArr;
         int i11 = dVar2.g;
         int u = dVar2.u(i11);
         String g = dVar2.g(i11 + 2, cArr);
@@ -242,7 +242,7 @@ public class f extends e {
                         i7 = i14;
                         strArr3 = strArr5;
                         bVar = dVar2.e(bVarArr, t, i6, l, cArr, -1, null);
-                        bVar.f2773c = bVar;
+                        bVar.f2779c = bVar;
                     } else {
                         str33 = str34;
                         i6 = i24;
@@ -299,7 +299,7 @@ public class f extends e {
             }
         }
         if (i15 != 0) {
-            char[] cArr2 = hVar3.f2781c;
+            char[] cArr2 = hVar3.f2787c;
             String t2 = dVar3.t(dVar3.b[dVar3.u(i15)], cArr2);
             int u4 = dVar3.u(i15 + 2);
             String t3 = dVar3.t(i15 + 4, cArr2);
@@ -459,7 +459,7 @@ public class f extends e {
             str6 = str2;
         }
         if (str36 != null) {
-            fVar.f2777x = fVar.b.m(7, str36).a;
+            fVar.f2783x = fVar.b.m(7, str36).a;
         }
         if (i17 != 0) {
             String g4 = dVar3.g(i17, cArr);
@@ -523,9 +523,9 @@ public class f extends e {
         }
         b bVar2 = bVar;
         while (bVar2 != null) {
-            b bVar3 = bVar2.f2773c;
-            bVar2.f2773c = null;
-            bVar2.f2773c = fVar.A;
+            b bVar3 = bVar2.f2779c;
+            bVar2.f2779c = null;
+            bVar2.f2779c = fVar.A;
             fVar.A = bVar2;
             bVar2 = bVar3;
         }
@@ -538,11 +538,11 @@ public class f extends e {
                     break;
                 }
                 String g5 = dVar3.g(i53, cArr);
-                if (fVar.f2779z == null) {
-                    fVar.f2779z = new c();
+                if (fVar.f2785z == null) {
+                    fVar.f2785z = new c();
                 }
-                fVar.f2778y++;
-                fVar.f2779z.j(fVar.b.m(7, g5).a);
+                fVar.f2784y++;
+                fVar.f2785z.j(fVar.b.m(7, g5).a);
                 i53 += 2;
                 u22 = i54;
             }
@@ -582,7 +582,7 @@ public class f extends e {
             if (u25 <= 0) {
                 break;
             }
-            char[] cArr3 = hVar3.f2781c;
+            char[] cArr3 = hVar3.f2787c;
             int u26 = dVar3.u(i57);
             String t8 = dVar3.t(i57 + 2, cArr3);
             String t9 = dVar3.t(i57 + 4, cArr3);
@@ -729,7 +729,7 @@ public class f extends e {
                                         str22 = str31;
                                         hVar = hVar3;
                                         b e = dVar3.e(hVar3.a, t10, i66, l2, cArr3, -1, null);
-                                        e.f2773c = bVar4;
+                                        e.f2779c = bVar4;
                                         bVar4 = e;
                                         i60 = i60;
                                         i64 = i4;
@@ -854,9 +854,9 @@ public class f extends e {
             }
             b bVar5 = bVar4;
             while (bVar5 != null) {
-                b bVar6 = bVar5.f2773c;
-                bVar5.f2773c = null;
-                bVar5.f2773c = lVar2.l;
+                b bVar6 = bVar5.f2779c;
+                bVar5.f2779c = null;
+                bVar5.f2779c = lVar2.l;
                 lVar2.l = bVar5;
                 bVar5 = bVar6;
             }
@@ -888,7 +888,7 @@ public class f extends e {
             if (u33 <= 0) {
                 return b();
             }
-            char[] cArr4 = hVar4.f2781c;
+            char[] cArr4 = hVar4.f2787c;
             hVar4.d = dVar4.u(i76);
             hVar4.e = dVar4.t(i76 + 2, cArr4);
             int i78 = i76 + 4;
@@ -1095,7 +1095,7 @@ public class f extends e {
                                                         str11 = str47;
                                                         str13 = str15;
                                                         b e2 = dVar4.e(hVar4.a, t11, i93, l3, cArr4, -1, null);
-                                                        e2.f2773c = bVar7;
+                                                        e2.f2779c = bVar7;
                                                         z5 = z5;
                                                         i82 = i82;
                                                         bVar7 = e2;
@@ -1193,15 +1193,15 @@ public class f extends e {
             if (dVar4 == vVar2.b && u36 == rVar2.h && i85 == rVar2.A) {
                 int i98 = rVar2.e;
                 if (z6 == ((i98 & 131072) != 0)) {
-                    if (z3 == (vVar2.f2799c < 49 && (i98 & 4096) != 0)) {
+                    if (z3 == (vVar2.f2805c < 49 && (i98 & 4096) != 0)) {
                         if (i82 != 0) {
-                            if (dVar4.u(i82) == rVar2.f2794y) {
+                            if (dVar4.u(i82) == rVar2.f2800y) {
                                 int i99 = i82 + 2;
                                 int i100 = 0;
                                 while (true) {
-                                    if (i100 >= rVar2.f2794y) {
+                                    if (i100 >= rVar2.f2800y) {
                                         break;
-                                    } else if (dVar4.u(i99) != rVar2.f2795z[i100]) {
+                                    } else if (dVar4.u(i99) != rVar2.f2801z[i100]) {
                                         break;
                                     } else {
                                         i99 += 2;
@@ -1210,8 +1210,8 @@ public class f extends e {
                                 }
                             }
                         }
-                        rVar2.f2790a0 = i79;
-                        rVar2.f2791b0 = i97 - 6;
+                        rVar2.f2796a0 = i79;
+                        rVar2.f2797b0 = i97 - 6;
                         z4 = true;
                         if (z4) {
                             if (i83 != 0) {
@@ -1300,9 +1300,9 @@ public class f extends e {
                             }
                             b bVar8 = bVar7;
                             while (bVar8 != null) {
-                                b bVar9 = bVar8.f2773c;
-                                bVar8.f2773c = null;
-                                bVar8.f2773c = rVar2.M;
+                                b bVar9 = bVar8.f2779c;
+                                bVar8.f2779c = null;
+                                bVar8.f2779c = rVar2.M;
                                 rVar2.M = bVar8;
                                 bVar8 = bVar9;
                             }
@@ -1377,9 +1377,9 @@ public class f extends e {
             } else {
                 i = 8;
             }
-            if ((lVar.f2784c & 4096) != 0) {
+            if ((lVar.f2790c & 4096) != 0) {
                 v vVar = lVar.b;
-                if (vVar.f2799c < 49) {
+                if (vVar.f2805c < 49) {
                     vVar.l("Synthetic");
                     i += 6;
                 }
@@ -1388,7 +1388,7 @@ public class f extends e {
                 lVar.b.l("Signature");
                 i += 8;
             }
-            if ((lVar.f2784c & 131072) != 0) {
+            if ((lVar.f2790c & 131072) != 0) {
                 lVar.b.l("Deprecated");
                 i += 6;
             }
@@ -1421,8 +1421,8 @@ public class f extends e {
             boolean z2 = true;
             if (rVar != null) {
                 int i14 = i13 + 1;
-                if (rVar.f2790a0 != 0) {
-                    i9 = rVar.f2791b0 + 6;
+                if (rVar.f2796a0 != 0) {
+                    i9 = rVar.f2797b0 + 6;
                     i8 = i14;
                 } else {
                     int i15 = rVar.l.b;
@@ -1440,7 +1440,7 @@ public class f extends e {
                         if (rVar.v != null) {
                             v vVar2 = rVar.d;
                             i8 = i14;
-                            vVar2.l(vVar2.f2799c >= 50 ? "StackMapTable" : "StackMap");
+                            vVar2.l(vVar2.f2805c >= 50 ? "StackMapTable" : "StackMap");
                             i10 += rVar.v.b + 8;
                         } else {
                             i8 = i14;
@@ -1461,19 +1461,19 @@ public class f extends e {
                         if (aVar5 != null) {
                             i10 += aVar5.a("RuntimeVisibleTypeAnnotations");
                         }
-                        a aVar6 = rVar.f2793x;
+                        a aVar6 = rVar.f2799x;
                         if (aVar6 != null) {
                             i10 += aVar6.a("RuntimeInvisibleTypeAnnotations");
                         }
                     } else {
                         throw new MethodTooLargeException(rVar.d.d, rVar.g, rVar.i, rVar.l.b);
                     }
-                    if (rVar.f2794y > 0) {
+                    if (rVar.f2800y > 0) {
                         rVar.d.l("Exceptions");
-                        i10 += (rVar.f2794y * 2) + 8;
+                        i10 += (rVar.f2800y * 2) + 8;
                     }
                     v vVar3 = rVar.d;
-                    if (vVar3.f2799c >= 49) {
+                    if (vVar3.f2805c >= 49) {
                         z2 = false;
                     }
                     if ((rVar.e & 4096) != 0 && z2) {
@@ -1553,7 +1553,7 @@ public class f extends e {
                     i11 += 10;
                     this.b.l("EnclosingMethod");
                 }
-                if ((this.f2775c & 4096) != 0) {
+                if ((this.f2781c & 4096) != 0) {
                     str = "EnclosingMethod";
                     if ((this.a & 65535) < 49) {
                         i2++;
@@ -1579,12 +1579,12 @@ public class f extends e {
                     i11 += cVar2.b + 6;
                     this.b.l("SourceDebugExtension");
                 }
-                if ((this.f2775c & 131072) != 0) {
+                if ((this.f2781c & 131072) != 0) {
                     i2++;
                     i11 += 6;
                     this.b.l("Deprecated");
                 }
-                a aVar11 = this.f2776s;
+                a aVar11 = this.f2782s;
                 if (aVar11 != null) {
                     i2++;
                     i11 += aVar11.a("RuntimeVisibleAnnotations");
@@ -1643,12 +1643,12 @@ public class f extends e {
                     str3 = "RuntimeInvisibleTypeAnnotations";
                     str2 = "RuntimeVisibleTypeAnnotations";
                 }
-                if (this.f2777x != 0) {
+                if (this.f2783x != 0) {
                     i2++;
                     i11 += 8;
                     this.b.l("NestHost");
                 }
-                c cVar3 = this.f2779z;
+                c cVar3 = this.f2785z;
                 if (cVar3 != null) {
                     i2++;
                     i11 += cVar3.b + 8;
@@ -1671,7 +1671,7 @@ public class f extends e {
                     cVar4.j(vVar7.g);
                     c cVar5 = vVar7.h;
                     cVar4.h(cVar5.a, 0, cVar5.b);
-                    cVar4.j((~((this.a & 65535) < 49 ? 4096 : 0)) & this.f2775c);
+                    cVar4.j((~((this.a & 65535) < 49 ? 4096 : 0)) & this.f2781c);
                     cVar4.j(this.d);
                     cVar4.j(this.e);
                     cVar4.j(this.f);
@@ -1681,12 +1681,12 @@ public class f extends e {
                     cVar4.j(i12);
                     l lVar2 = this.h;
                     while (lVar2 != null) {
-                        boolean z3 = lVar2.b.f2799c < 49;
-                        cVar4.j((~(z3 ? 4096 : 0)) & lVar2.f2784c);
+                        boolean z3 = lVar2.b.f2805c < 49;
+                        cVar4.j((~(z3 ? 4096 : 0)) & lVar2.f2790c);
                         cVar4.j(lVar2.d);
                         cVar4.j(lVar2.e);
                         int i24 = lVar2.g != 0 ? 1 : 0;
-                        int i25 = lVar2.f2784c;
+                        int i25 = lVar2.f2790c;
                         if ((i25 & 4096) != 0 && z3) {
                             i24++;
                         }
@@ -1717,14 +1717,14 @@ public class f extends e {
                             a.l0(lVar2.b, "ConstantValue", cVar4, 2);
                             cVar4.j(lVar2.g);
                         }
-                        if ((lVar2.f2784c & 4096) != 0 && z3) {
+                        if ((lVar2.f2790c & 4096) != 0 && z3) {
                             a.l0(lVar2.b, "Synthetic", cVar4, 0);
                         }
                         if (lVar2.f != 0) {
                             a.l0(lVar2.b, "Signature", cVar4, 2);
                             cVar4.j(lVar2.f);
                         }
-                        if ((lVar2.f2784c & 131072) != 0) {
+                        if ((lVar2.f2790c & 131072) != 0) {
                             a.l0(lVar2.b, "Deprecated", cVar4, 0);
                         }
                         a aVar15 = lVar2.h;
@@ -1779,7 +1779,7 @@ public class f extends e {
                         cVar4.j(this.n);
                         cVar4.j(this.o);
                     }
-                    if ((this.f2775c & 4096) != 0 && (this.a & 65535) < 49) {
+                    if ((this.f2781c & 4096) != 0 && (this.a & 65535) < 49) {
                         a.l0(this.b, "Synthetic", cVar4, 0);
                     }
                     if (this.p != 0) {
@@ -1802,10 +1802,10 @@ public class f extends e {
                     } else {
                         i5 = 0;
                     }
-                    if ((this.f2775c & 131072) != 0) {
+                    if ((this.f2781c & 131072) != 0) {
                         a.l0(this.b, "Deprecated", cVar4, i5);
                     }
-                    a aVar19 = this.f2776s;
+                    a aVar19 = this.f2782s;
                     if (aVar19 != null) {
                         aVar19.c(this.b.l("RuntimeVisibleAnnotations"), cVar4);
                     }
@@ -1833,7 +1833,7 @@ public class f extends e {
                     if (sVar2 != null) {
                         a.l0(sVar2.a, "Module", cVar4, sVar2.f.b + 16 + sVar2.h.b + sVar2.j.b + sVar2.l.b + sVar2.n.b);
                         cVar4.j(sVar2.b);
-                        cVar4.j(sVar2.f2796c);
+                        cVar4.j(sVar2.f2802c);
                         cVar4.j(sVar2.d);
                         cVar4.j(sVar2.e);
                         c cVar9 = sVar2.f;
@@ -1861,15 +1861,15 @@ public class f extends e {
                             i6 = 2;
                             a.l0(sVar2.a, str6, cVar4, 2);
                             cVar4.j(sVar2.q);
-                            if (this.f2777x != 0) {
+                            if (this.f2783x != 0) {
                                 a.l0(this.b, "NestHost", cVar4, i6);
-                                cVar4.j(this.f2777x);
+                                cVar4.j(this.f2783x);
                             }
-                            if (this.f2779z != null) {
+                            if (this.f2785z != null) {
                                 cVar4.j(this.b.l("NestMembers"));
-                                cVar4.i(this.f2779z.b + 2);
-                                cVar4.j(this.f2778y);
-                                c cVar15 = this.f2779z;
+                                cVar4.i(this.f2785z.b + 2);
+                                cVar4.j(this.f2784y);
+                                c cVar15 = this.f2785z;
                                 cVar4.h(cVar15.a, 0, cVar15.b);
                             }
                             bVar = this.A;
@@ -1880,9 +1880,9 @@ public class f extends e {
                         }
                     }
                     i6 = 2;
-                    if (this.f2777x != 0) {
+                    if (this.f2783x != 0) {
                     }
-                    if (this.f2779z != null) {
+                    if (this.f2785z != null) {
                     }
                     bVar = this.A;
                     if (bVar != null) {
@@ -1898,10 +1898,10 @@ public class f extends e {
 
     public final void c(int i, int i2, String str, String str2, String str3, String[] strArr) {
         this.a = i;
-        this.f2775c = i2;
+        this.f2781c = i2;
         v vVar = this.b;
         int i3 = i & 65535;
-        vVar.f2799c = i3;
+        vVar.f2805c = i3;
         vVar.d = str;
         this.d = vVar.m(7, str).a;
         if (str2 != null) {
@@ -1926,8 +1926,8 @@ public class f extends e {
         cVar.j(this.b.l(str));
         cVar.j(0);
         if (z2) {
-            a aVar = new a(this.b, true, cVar, this.f2776s);
-            this.f2776s = aVar;
+            a aVar = new a(this.b, true, cVar, this.f2782s);
+            this.f2782s = aVar;
             return aVar;
         }
         a aVar2 = new a(this.b, true, cVar, this.t);
diff --git a/app/src/main/java/h0/a/a/g.java b/app/src/main/java/h0/a/a/g.java
index 1eb008b69f..a64f167b2e 100644
--- a/app/src/main/java/h0/a/a/g.java
+++ b/app/src/main/java/h0/a/a/g.java
@@ -7,13 +7,13 @@ public final class g {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final n f2780c;
+    public final n f2786c;
     public final Object[] d;
 
     public g(String str, String str2, n nVar, Object... objArr) {
         this.a = str;
         this.b = str2;
-        this.f2780c = nVar;
+        this.f2786c = nVar;
         this.d = objArr;
     }
 
@@ -25,14 +25,14 @@ public final class g {
             return false;
         }
         g gVar = (g) obj;
-        return this.a.equals(gVar.a) && this.b.equals(gVar.b) && this.f2780c.equals(gVar.f2780c) && Arrays.equals(this.d, gVar.d);
+        return this.a.equals(gVar.a) && this.b.equals(gVar.b) && this.f2786c.equals(gVar.f2786c) && Arrays.equals(this.d, gVar.d);
     }
 
     public int hashCode() {
-        return ((this.a.hashCode() ^ Integer.rotateLeft(this.b.hashCode(), 8)) ^ Integer.rotateLeft(this.f2780c.hashCode(), 16)) ^ Integer.rotateLeft(Arrays.hashCode(this.d), 24);
+        return ((this.a.hashCode() ^ Integer.rotateLeft(this.b.hashCode(), 8)) ^ Integer.rotateLeft(this.f2786c.hashCode(), 16)) ^ Integer.rotateLeft(Arrays.hashCode(this.d), 24);
     }
 
     public String toString() {
-        return this.a + " : " + this.b + ' ' + this.f2780c + ' ' + Arrays.toString(this.d);
+        return this.a + " : " + this.b + ' ' + this.f2786c + ' ' + Arrays.toString(this.d);
     }
 }
diff --git a/app/src/main/java/h0/a/a/h.java b/app/src/main/java/h0/a/a/h.java
index 3a3115d391..a9c1a6118e 100644
--- a/app/src/main/java/h0/a/a/h.java
+++ b/app/src/main/java/h0/a/a/h.java
@@ -5,7 +5,7 @@ public final class h {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public char[] f2781c;
+    public char[] f2787c;
     public int d;
     public String e;
     public String f;
@@ -23,5 +23,5 @@ public final class h {
     public int r;
 
     /* renamed from: s  reason: collision with root package name */
-    public Object[] f2782s;
+    public Object[] f2788s;
 }
diff --git a/app/src/main/java/h0/a/a/i.java b/app/src/main/java/h0/a/a/i.java
index c4258da52f..1d11d2cb3b 100644
--- a/app/src/main/java/h0/a/a/i.java
+++ b/app/src/main/java/h0/a/a/i.java
@@ -11,7 +11,7 @@ public final class i extends m {
         m mVar = new m(null);
         h(vVar, mVar, 0);
         this.b = mVar.b;
-        this.f2785c = mVar.f2785c;
+        this.f2791c = mVar.f2791c;
         this.f = 0;
         this.d = mVar.d;
         this.e = mVar.e;
diff --git a/app/src/main/java/h0/a/a/j.java b/app/src/main/java/h0/a/a/j.java
index 889aab7b3b..9724fe09c0 100644
--- a/app/src/main/java/h0/a/a/j.java
+++ b/app/src/main/java/h0/a/a/j.java
@@ -5,11 +5,11 @@ public final class j {
     public final p b;
 
     /* renamed from: c  reason: collision with root package name */
-    public j f2783c;
+    public j f2789c;
 
     public j(int i, p pVar, j jVar) {
         this.a = i;
         this.b = pVar;
-        this.f2783c = jVar;
+        this.f2789c = jVar;
     }
 }
diff --git a/app/src/main/java/h0/a/a/l.java b/app/src/main/java/h0/a/a/l.java
index c23075a764..ce4e662144 100644
--- a/app/src/main/java/h0/a/a/l.java
+++ b/app/src/main/java/h0/a/a/l.java
@@ -6,7 +6,7 @@ public final class l extends k {
     public final v b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2784c;
+    public final int f2790c;
     public final int d;
     public final int e;
     public int f;
@@ -20,7 +20,7 @@ public final class l extends k {
     public l(v vVar, int i, String str, String str2, String str3, Object obj) {
         super(458752);
         this.b = vVar;
-        this.f2784c = i;
+        this.f2790c = i;
         this.d = vVar.l(str);
         this.e = vVar.l(str2);
         if (str3 != null) {
diff --git a/app/src/main/java/h0/a/a/m.java b/app/src/main/java/h0/a/a/m.java
index b5b93af9ce..2ac974c9d0 100644
--- a/app/src/main/java/h0/a/a/m.java
+++ b/app/src/main/java/h0/a/a/m.java
@@ -8,7 +8,7 @@ public class m {
     public int[] b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int[] f2785c;
+    public int[] f2791c;
     public int[] d;
     public int[] e;
     public short f;
@@ -220,7 +220,7 @@ public class m {
             } while (i == 16777216);
             i4 += i5;
         }
-        int[] iArr2 = this.f2785c;
+        int[] iArr2 = this.f2791c;
         int i7 = 0;
         int i8 = 0;
         while (i7 < iArr2.length) {
@@ -305,7 +305,7 @@ public class m {
                     i2 = this.b[i7];
                 } else {
                     if (i6 == 83886080) {
-                        int[] iArr = this.f2785c;
+                        int[] iArr = this.f2791c;
                         i2 = iArr[iArr.length - i7];
                     }
                     if (i != i4) {
@@ -356,7 +356,7 @@ public class m {
         int i3;
         int i4;
         int length = this.b.length;
-        int length2 = this.f2785c.length;
+        int length2 = this.f2791c.length;
         if (mVar.b == null) {
             mVar.b = new int[length];
             z2 = true;
@@ -382,7 +382,7 @@ public class m {
                         }
                         i3 = i4;
                     } else if (i8 == 83886080) {
-                        i4 = i7 + this.f2785c[length2 - (i6 & 1048575)];
+                        i4 = i7 + this.f2791c[length2 - (i6 & 1048575)];
                         if ((i6 & 1048576) != 0) {
                             if (i4 != 16777220) {
                             }
@@ -403,27 +403,27 @@ public class m {
             for (int i9 = 0; i9 < length; i9++) {
                 z2 |= g(vVar, this.b[i9], mVar.b, i9);
             }
-            if (mVar.f2785c == null) {
-                mVar.f2785c = new int[1];
+            if (mVar.f2791c == null) {
+                mVar.f2791c = new int[1];
                 z4 = true;
             } else {
                 z4 = z2;
             }
-            return g(vVar, i, mVar.f2785c, 0) | z4;
+            return g(vVar, i, mVar.f2791c, 0) | z4;
         }
-        int length3 = this.f2785c.length + this.f;
-        if (mVar.f2785c == null) {
-            mVar.f2785c = new int[(this.g + length3)];
+        int length3 = this.f2791c.length + this.f;
+        if (mVar.f2791c == null) {
+            mVar.f2791c = new int[(this.g + length3)];
             z3 = true;
         } else {
             z3 = z2;
         }
         for (int i10 = 0; i10 < length3; i10++) {
-            int i11 = this.f2785c[i10];
+            int i11 = this.f2791c[i10];
             if (this.i != null) {
                 i11 = e(vVar, i11);
             }
-            z3 |= g(vVar, i11, mVar.f2785c, i10);
+            z3 |= g(vVar, i11, mVar.f2791c, i10);
         }
         for (int i12 = 0; i12 < this.g; i12++) {
             int i13 = this.e[i12];
@@ -439,10 +439,10 @@ public class m {
                 if (this.i != null) {
                     i13 = e(vVar, i13);
                 }
-                z3 |= g(vVar, i13, mVar.f2785c, length3 + i12);
+                z3 |= g(vVar, i13, mVar.f2791c, length3 + i12);
             } else {
                 if (i15 == 83886080) {
-                    i2 = i14 + this.f2785c[length2 - (i13 & 1048575)];
+                    i2 = i14 + this.f2791c[length2 - (i13 & 1048575)];
                     if ((i13 & 1048576) != 0) {
                         if (i2 != 16777220) {
                         }
@@ -451,12 +451,12 @@ public class m {
                 }
                 if (this.i != null) {
                 }
-                z3 |= g(vVar, i13, mVar.f2785c, length3 + i12);
+                z3 |= g(vVar, i13, mVar.f2791c, length3 + i12);
             }
             i13 = 16777216;
             if (this.i != null) {
             }
-            z3 |= g(vVar, i13, mVar.f2785c, length3 + i12);
+            z3 |= g(vVar, i13, mVar.f2791c, length3 + i12);
         }
         return z3;
     }
@@ -535,7 +535,7 @@ public class m {
     public final void n(v vVar, int i, String str, int i2) {
         int[] iArr = new int[i2];
         this.b = iArr;
-        this.f2785c = new int[0];
+        this.f2791c = new int[0];
         int i3 = 1;
         if ((i & 8) != 0) {
             i3 = 0;
diff --git a/app/src/main/java/h0/a/a/n.java b/app/src/main/java/h0/a/a/n.java
index bf3acc1f66..0cc75d5347 100644
--- a/app/src/main/java/h0/a/a/n.java
+++ b/app/src/main/java/h0/a/a/n.java
@@ -5,14 +5,14 @@ public final class n {
     public final String b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2786c;
+    public final String f2792c;
     public final String d;
     public final boolean e;
 
     public n(int i, String str, String str2, String str3, boolean z2) {
         this.a = i;
         this.b = str;
-        this.f2786c = str2;
+        this.f2792c = str2;
         this.d = str3;
         this.e = z2;
     }
@@ -25,18 +25,18 @@ public final class n {
             return false;
         }
         n nVar = (n) obj;
-        return this.a == nVar.a && this.e == nVar.e && this.b.equals(nVar.b) && this.f2786c.equals(nVar.f2786c) && this.d.equals(nVar.d);
+        return this.a == nVar.a && this.e == nVar.e && this.b.equals(nVar.b) && this.f2792c.equals(nVar.f2792c) && this.d.equals(nVar.d);
     }
 
     public int hashCode() {
-        return (this.d.hashCode() * this.f2786c.hashCode() * this.b.hashCode()) + this.a + (this.e ? 64 : 0);
+        return (this.d.hashCode() * this.f2792c.hashCode() * this.b.hashCode()) + this.a + (this.e ? 64 : 0);
     }
 
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(this.b);
         sb.append('.');
-        sb.append(this.f2786c);
+        sb.append(this.f2792c);
         sb.append(this.d);
         sb.append(" (");
         sb.append(this.a);
diff --git a/app/src/main/java/h0/a/a/o.java b/app/src/main/java/h0/a/a/o.java
index 1558a90a6b..dc049f69cb 100644
--- a/app/src/main/java/h0/a/a/o.java
+++ b/app/src/main/java/h0/a/a/o.java
@@ -5,18 +5,18 @@ public final class o {
     public final p b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final p f2787c;
+    public final p f2793c;
     public final int d;
     public final String e;
     public o f;
 
     public o(o oVar, p pVar, p pVar2) {
-        p pVar3 = oVar.f2787c;
+        p pVar3 = oVar.f2793c;
         int i = oVar.d;
         String str = oVar.e;
         this.a = pVar;
         this.b = pVar2;
-        this.f2787c = pVar3;
+        this.f2793c = pVar3;
         this.d = i;
         this.e = str;
         this.f = oVar.f;
@@ -25,7 +25,7 @@ public final class o {
     public o(p pVar, p pVar2, p pVar3, int i, String str) {
         this.a = pVar;
         this.b = pVar2;
-        this.f2787c = pVar3;
+        this.f2793c = pVar3;
         this.d = i;
         this.e = str;
     }
diff --git a/app/src/main/java/h0/a/a/p.java b/app/src/main/java/h0/a/a/p.java
index a6b4c3a20f..f8d5133232 100644
--- a/app/src/main/java/h0/a/a/p.java
+++ b/app/src/main/java/h0/a/a/p.java
@@ -7,7 +7,7 @@ public class p {
     public short b;
 
     /* renamed from: c  reason: collision with root package name */
-    public short f2788c;
+    public short f2794c;
     public int[] d;
     public int e;
     public int[] f;
@@ -62,14 +62,14 @@ public class p {
     public final p d(p pVar) {
         j jVar = this.m;
         while (jVar != null) {
-            if (!((this.b & 16) != 0 && jVar == this.m.f2783c)) {
+            if (!((this.b & 16) != 0 && jVar == this.m.f2789c)) {
                 p pVar2 = jVar.b;
                 if (pVar2.n == null) {
                     pVar2.n = pVar;
                     pVar = pVar2;
                 }
             }
-            jVar = jVar.f2783c;
+            jVar = jVar.f2789c;
         }
         return pVar;
     }
diff --git a/app/src/main/java/h0/a/a/r.java b/app/src/main/java/h0/a/a/r.java
index 24e5ef4189..74ba39e101 100644
--- a/app/src/main/java/h0/a/a/r.java
+++ b/app/src/main/java/h0/a/a/r.java
@@ -6,7 +6,7 @@ import h0.a.a.v;
 public final class r extends q {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int[] f2789c = {0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 1, 0, 0, 1, 2, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, -1, -1, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3, -4, -3, -4, -3, -3, -3, -3, -1, -2, 1, 1, 1, 2, 2, 2, 0, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -2, -1, -2, -1, -2, 0, 1, 0, 1, -1, -1, 0, 0, 1, 1, -1, 0, -1, 0, 0, 0, -3, -1, -1, -3, -3, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 0, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, -1, -1, 0, 0};
+    public static final int[] f2795c = {0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 2, 1, 1, 1, 0, 0, 1, 2, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, -1, -1, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -3, -4, -3, -4, -3, -3, -3, -3, -1, -2, 1, 1, 1, 2, 2, 2, 0, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, -1, -2, 0, 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -2, -1, -2, -1, -2, 0, 1, 0, 1, -1, -1, 0, 0, 1, 1, -1, 0, -1, 0, 0, 0, -3, -1, -1, -3, -3, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 0, -1, -1, -1, -2, -1, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, -1, -1, 0, 0};
     public final int A;
     public a B;
     public a C;
@@ -35,10 +35,10 @@ public final class r extends q {
     public int Z;
 
     /* renamed from: a0  reason: collision with root package name */
-    public int f2790a0;
+    public int f2796a0;
 
     /* renamed from: b0  reason: collision with root package name */
-    public int f2791b0;
+    public int f2797b0;
     public final v d;
     public final int e;
     public final int f;
@@ -56,20 +56,20 @@ public final class r extends q {
     public c r;
 
     /* renamed from: s  reason: collision with root package name */
-    public int f2792s;
+    public int f2798s;
     public c t;
     public int u;
     public c v;
     public a w;
 
     /* renamed from: x  reason: collision with root package name */
-    public a f2793x;
+    public a f2799x;
 
     /* renamed from: y  reason: collision with root package name */
-    public final int f2794y;
+    public final int f2800y;
 
     /* renamed from: z  reason: collision with root package name */
-    public final int[] f2795z;
+    public final int[] f2801z;
 
     public r(v vVar, int i, String str, String str2, String str3, String[] strArr, int i2) {
         super(458752);
@@ -81,14 +81,14 @@ public final class r extends q {
         this.i = str2;
         this.A = str3 == null ? 0 : vVar.l(str3);
         if (strArr == null || strArr.length <= 0) {
-            this.f2794y = 0;
-            this.f2795z = null;
+            this.f2800y = 0;
+            this.f2801z = null;
         } else {
             int length = strArr.length;
-            this.f2794y = length;
-            this.f2795z = new int[length];
-            for (int i3 = 0; i3 < this.f2794y; i3++) {
-                this.f2795z[i3] = vVar.c(strArr[i3]).a;
+            this.f2800y = length;
+            this.f2801z = new int[length];
+            for (int i3 = 0; i3 < this.f2800y; i3++) {
+                this.f2801z[i3] = vVar.c(strArr[i3]).a;
             }
         }
         this.N = i2;
@@ -254,13 +254,13 @@ public final class r extends q {
                                 i10++;
                             }
                         }
-                        mVar.f2785c = new int[(i10 + i3)];
+                        mVar.f2791c = new int[(i10 + i3)];
                         int i12 = 0;
                         for (int i13 = 0; i13 < i3; i13++) {
                             int i14 = i12 + 1;
-                            mVar.f2785c[i12] = m.c(vVar, objArr2[i13]);
+                            mVar.f2791c[i12] = m.c(vVar, objArr2[i13]);
                             if (objArr2[i13] == t.e || objArr2[i13] == t.d) {
-                                mVar.f2785c[i14] = 16777216;
+                                mVar.f2791c[i14] = 16777216;
                                 i12 = i14 + 1;
                             } else {
                                 i12 = i14;
@@ -405,7 +405,7 @@ public final class r extends q {
             if (i2 == 4 || i2 == 3) {
                 pVar.k.b(i, 0, null, null);
             } else {
-                int i3 = this.R + f2789c[i];
+                int i3 = this.R + f2795c[i];
                 if (i3 > this.S) {
                     this.S = i3;
                 }
@@ -429,8 +429,8 @@ public final class r extends q {
             this.w = aVar;
             return aVar;
         }
-        a aVar2 = new a(this.d, true, cVar, this.f2793x);
-        this.f2793x = aVar2;
+        a aVar2 = new a(this.d, true, cVar, this.f2799x);
+        this.f2799x = aVar2;
         return aVar2;
     }
 
@@ -509,7 +509,7 @@ public final class r extends q {
             } else if (i4 == 3) {
                 pVar2.k.b(i3, 0, null, null);
             } else if (i4 == 2) {
-                this.R += f2789c[i3];
+                this.R += f2795c[i3];
             } else if (i3 == 168) {
                 short s2 = pVar.b;
                 if ((s2 & 32) == 0) {
@@ -520,7 +520,7 @@ public final class r extends q {
                 u(this.R + 1, pVar);
                 pVar3 = new p();
             } else {
-                int i5 = this.R + f2789c[i3];
+                int i5 = this.R + f2795c[i3];
                 this.R = i5;
                 u(i5, pVar);
             }
@@ -646,7 +646,7 @@ public final class r extends q {
             if (this.t == null) {
                 this.t = new c();
             }
-            this.f2792s++;
+            this.f2798s++;
             c cVar = this.t;
             cVar.j(pVar.e);
             cVar.j(pVar2.e - pVar.e);
@@ -694,8 +694,8 @@ public final class r extends q {
             this.w = aVar;
             return aVar;
         }
-        a aVar2 = new a(this.d, true, cVar, this.f2793x);
-        this.f2793x = aVar2;
+        a aVar2 = new a(this.d, true, cVar, this.f2799x);
+        this.f2799x = aVar2;
         return aVar2;
     }
 
@@ -715,7 +715,7 @@ public final class r extends q {
                     str = str2;
                 }
                 int n = 33554432 | this.d.n(str);
-                p b = oVar.f2787c.b();
+                p b = oVar.f2793c.b();
                 b.b = (short) (b.b | 2);
                 p b2 = oVar.b.b();
                 for (p b3 = oVar.a.b(); b3 != b2; b3 = b3.l) {
@@ -733,11 +733,11 @@ public final class r extends q {
                 p pVar2 = pVar.n;
                 pVar.n = null;
                 pVar.b = (short) (pVar.b | 8);
-                int length = pVar.k.f2785c.length + pVar.i;
+                int length = pVar.k.f2791c.length + pVar.i;
                 if (length > i4) {
                     i4 = length;
                 }
-                for (j jVar = pVar.m; jVar != null; jVar = jVar.f2783c) {
+                for (j jVar = pVar.m; jVar != null; jVar = jVar.f2789c) {
                     p b4 = jVar.b.b();
                     if (pVar.k.h(this.d, b4.k, jVar.a) && b4.n == null) {
                         b4.n = pVar2;
@@ -770,14 +770,14 @@ public final class r extends q {
             this.j = i4;
         } else if (i3 == 1) {
             for (o oVar2 = this.m; oVar2 != null; oVar2 = oVar2.f) {
-                p pVar5 = oVar2.f2787c;
+                p pVar5 = oVar2.f2793c;
                 p pVar6 = oVar2.b;
                 for (p pVar7 = oVar2.a; pVar7 != pVar6; pVar7 = pVar7.l) {
                     if ((pVar7.b & 16) == 0) {
                         pVar7.m = new j(Integer.MAX_VALUE, pVar5, pVar7.m);
                     } else {
-                        j jVar2 = pVar7.m.f2783c;
-                        jVar2.f2783c = new j(Integer.MAX_VALUE, pVar5, jVar2.f2783c);
+                        j jVar2 = pVar7.m.f2789c;
+                        jVar2.f2789c = new j(Integer.MAX_VALUE, pVar5, jVar2.f2789c);
                     }
                 }
             }
@@ -787,7 +787,7 @@ public final class r extends q {
                 for (short s3 = 1; s3 <= s2; s3 = (short) (s3 + 1)) {
                     for (p pVar8 = this.O; pVar8 != null; pVar8 = pVar8.l) {
                         if ((pVar8.b & 16) != 0 && pVar8.j == s3) {
-                            p pVar9 = pVar8.m.f2783c.b;
+                            p pVar9 = pVar8.m.f2789c.b;
                             if (pVar9.j == 0) {
                                 s2 = (short) (s2 + 1);
                                 pVar9.c(s2);
@@ -797,7 +797,7 @@ public final class r extends q {
                 }
                 for (p pVar10 = this.O; pVar10 != null; pVar10 = pVar10.l) {
                     if ((pVar10.b & 16) != 0) {
-                        p pVar11 = pVar10.m.f2783c.b;
+                        p pVar11 = pVar10.m.f2789c.b;
                         p pVar12 = p.a;
                         pVar11.n = pVar12;
                         while (pVar11 != p.a) {
@@ -829,7 +829,7 @@ public final class r extends q {
                 }
                 j jVar3 = pVar15.m;
                 if ((pVar15.b & 16) != 0) {
-                    jVar3 = jVar3.f2783c;
+                    jVar3 = jVar3.f2789c;
                 }
                 pVar15 = pVar16;
                 while (jVar3 != null) {
@@ -840,7 +840,7 @@ public final class r extends q {
                         pVar17.n = pVar15;
                         pVar15 = pVar17;
                     }
-                    jVar3 = jVar3.f2783c;
+                    jVar3 = jVar3.f2789c;
                 }
             }
             this.j = i8;
@@ -955,7 +955,7 @@ public final class r extends q {
                 pVar.h = (short) this.R;
                 v();
             } else {
-                int i4 = this.R + f2789c[i];
+                int i4 = this.R + f2795c[i];
                 if (i4 > this.S) {
                     this.S = i4;
                 }
@@ -1081,17 +1081,17 @@ public final class r extends q {
 
     public void y(c cVar) {
         int i;
-        boolean z2 = this.d.f2799c < 49;
+        boolean z2 = this.d.f2805c < 49;
         cVar.j((~(z2 ? 4096 : 0)) & this.e);
         cVar.j(this.f);
         cVar.j(this.h);
-        int i2 = this.f2790a0;
+        int i2 = this.f2796a0;
         if (i2 != 0) {
-            cVar.h(this.d.b.a, i2, this.f2791b0);
+            cVar.h(this.d.b.a, i2, this.f2797b0);
             return;
         }
         int i3 = this.l.b > 0 ? 1 : 0;
-        if (this.f2794y > 0) {
+        if (this.f2800y > 0) {
             i3++;
         }
         int i4 = this.e;
@@ -1168,7 +1168,7 @@ public final class r extends q {
                 i8 += aVar.a("RuntimeVisibleTypeAnnotations");
                 i++;
             }
-            a aVar2 = this.f2793x;
+            a aVar2 = this.f2799x;
             if (aVar2 != null) {
                 i8 += aVar2.a("RuntimeInvisibleTypeAnnotations");
                 i++;
@@ -1188,14 +1188,14 @@ public final class r extends q {
             while (oVar2 != null) {
                 cVar.j(oVar2.a.e);
                 cVar.j(oVar2.b.e);
-                cVar.j(oVar2.f2787c.e);
+                cVar.j(oVar2.f2793c.e);
                 cVar.j(oVar2.d);
                 oVar2 = oVar2.f;
             }
             cVar.j(i);
             if (this.v != null) {
                 v vVar = this.d;
-                cVar.j(vVar.l(vVar.f2799c >= 50 ? "StackMapTable" : "StackMap"));
+                cVar.j(vVar.l(vVar.f2805c >= 50 ? "StackMapTable" : "StackMap"));
                 cVar.i(this.v.b + 2);
                 cVar.j(this.u);
                 c cVar7 = this.v;
@@ -1218,7 +1218,7 @@ public final class r extends q {
             if (this.t != null) {
                 cVar.j(this.d.l("LocalVariableTypeTable"));
                 cVar.i(this.t.b + 2);
-                cVar.j(this.f2792s);
+                cVar.j(this.f2798s);
                 c cVar10 = this.t;
                 cVar.h(cVar10.a, 0, cVar10.b);
             }
@@ -1226,16 +1226,16 @@ public final class r extends q {
             if (aVar3 != null) {
                 aVar3.c(this.d.l("RuntimeVisibleTypeAnnotations"), cVar);
             }
-            a aVar4 = this.f2793x;
+            a aVar4 = this.f2799x;
             if (aVar4 != null) {
                 aVar4.c(this.d.l("RuntimeInvisibleTypeAnnotations"), cVar);
             }
         }
-        if (this.f2794y > 0) {
+        if (this.f2800y > 0) {
             cVar.j(this.d.l("Exceptions"));
-            cVar.i((this.f2794y * 2) + 2);
-            cVar.j(this.f2794y);
-            for (int i10 : this.f2795z) {
+            cVar.i((this.f2800y * 2) + 2);
+            cVar.j(this.f2800y);
+            for (int i10 : this.f2801z) {
                 cVar.j(i10);
             }
         }
@@ -1316,7 +1316,7 @@ public final class r extends q {
             int i = iArr2[1];
             int i2 = iArr2[2];
             int i3 = 0;
-            if (this.d.f2799c < 50) {
+            if (this.d.f2805c < 50) {
                 c cVar = this.v;
                 cVar.j(iArr2[0]);
                 cVar.j(i);
diff --git a/app/src/main/java/h0/a/a/s.java b/app/src/main/java/h0/a/a/s.java
index 9fa1e1d218..b740925e07 100644
--- a/app/src/main/java/h0/a/a/s.java
+++ b/app/src/main/java/h0/a/a/s.java
@@ -5,7 +5,7 @@ public final class s {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final int f2796c;
+    public final int f2802c;
     public final int d;
     public int e;
     public final c f = new c();
@@ -24,7 +24,7 @@ public final class s {
     public s(v vVar, int i, int i2, int i3) {
         this.a = vVar;
         this.b = i;
-        this.f2796c = i2;
+        this.f2802c = i2;
         this.d = i3;
     }
 }
diff --git a/app/src/main/java/h0/a/a/t.java b/app/src/main/java/h0/a/a/t.java
index 64bb600225..4aed32dd76 100644
--- a/app/src/main/java/h0/a/a/t.java
+++ b/app/src/main/java/h0/a/a/t.java
@@ -5,7 +5,7 @@ public interface t {
     public static final Integer b = 1;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Integer f2797c = 2;
+    public static final Integer f2803c = 2;
     public static final Integer d = 3;
     public static final Integer e = 4;
     public static final Integer f = 5;
diff --git a/app/src/main/java/h0/a/a/u.java b/app/src/main/java/h0/a/a/u.java
index 6938a79d11..8361f707ee 100644
--- a/app/src/main/java/h0/a/a/u.java
+++ b/app/src/main/java/h0/a/a/u.java
@@ -5,7 +5,7 @@ public abstract class u {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2798c;
+    public final String f2804c;
     public final String d;
     public final String e;
     public final long f;
@@ -14,7 +14,7 @@ public abstract class u {
     public u(int i, int i2, String str, String str2, String str3, long j) {
         this.a = i;
         this.b = i2;
-        this.f2798c = str;
+        this.f2804c = str;
         this.d = str2;
         this.e = str3;
         this.f = j;
diff --git a/app/src/main/java/h0/a/a/v.java b/app/src/main/java/h0/a/a/v.java
index 55ceae6b34..be696c07cd 100644
--- a/app/src/main/java/h0/a/a/v.java
+++ b/app/src/main/java/h0/a/a/v.java
@@ -5,7 +5,7 @@ public final class v {
     public final d b = null;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2799c;
+    public int f2805c;
     public String d;
     public int e;
     public a[] f = new a[256];
@@ -78,7 +78,7 @@ public final class v {
             b(obj);
         }
         int i = cVar.b;
-        cVar.j(i(nVar.a, nVar.b, nVar.f2786c, nVar.d, nVar.e).a);
+        cVar.j(i(nVar.a, nVar.b, nVar.f2792c, nVar.d, nVar.e).a);
         cVar.j(objArr.length);
         for (Object obj2 : objArr) {
             cVar.j(b(obj2).a);
@@ -153,10 +153,10 @@ public final class v {
             return i == 10 ? c(wVar.g()) : i == 11 ? m(16, wVar.d()) : c(wVar.d());
         } else if (obj instanceof n) {
             n nVar = (n) obj;
-            return i(nVar.a, nVar.b, nVar.f2786c, nVar.d, nVar.e);
+            return i(nVar.a, nVar.b, nVar.f2792c, nVar.d, nVar.e);
         } else if (obj instanceof g) {
             g gVar = (g) obj;
-            return d(17, gVar.a, gVar.b, a(gVar.f2780c, gVar.d).a);
+            return d(17, gVar.a, gVar.b, a(gVar.f2786c, gVar.d).a);
         } else {
             throw new IllegalArgumentException(c.d.b.a.a.t("value ", obj));
         }
@@ -244,7 +244,7 @@ public final class v {
     public final a h(int i, String str, String str2, String str3) {
         int t = t(i, str, str2, str3);
         for (a q = q(t); q != null; q = q.i) {
-            if (q.b == i && q.h == t && q.f2798c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
+            if (q.b == i && q.h == t && q.f2804c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
                 return q;
             }
         }
@@ -259,7 +259,7 @@ public final class v {
     public u i(int i, String str, String str2, String str3, boolean z2) {
         int u = u(15, str, str2, str3, i);
         for (a q = q(u); q != null; q = q.i) {
-            if (q.b == 15 && q.h == u && q.f == ((long) i) && q.f2798c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
+            if (q.b == 15 && q.h == u && q.f == ((long) i) && q.f2804c.equals(str) && q.d.equals(str2) && q.e.equals(str3)) {
                 return q;
             }
         }
diff --git a/app/src/main/java/h0/a/a/w.java b/app/src/main/java/h0/a/a/w.java
index 4642dc230a..467bf92d03 100644
--- a/app/src/main/java/h0/a/a/w.java
+++ b/app/src/main/java/h0/a/a/w.java
@@ -7,7 +7,7 @@ public final class w {
     public static final w b = new w(1, "VZCBSIFJD", 1, 2);
 
     /* renamed from: c  reason: collision with root package name */
-    public static final w f2800c = new w(2, "VZCBSIFJD", 2, 3);
+    public static final w f2806c = new w(2, "VZCBSIFJD", 2, 3);
     public static final w d = new w(3, "VZCBSIFJD", 3, 4);
     public static final w e = new w(4, "VZCBSIFJD", 4, 5);
     public static final w f = new w(5, "VZCBSIFJD", 5, 6);
@@ -155,7 +155,7 @@ public final class w {
                 return d;
             }
             if (cls == Character.TYPE) {
-                return f2800c;
+                return f2806c;
             }
             if (cls == Short.TYPE) {
                 return e;
@@ -206,7 +206,7 @@ public final class w {
             case 'B':
                 return d;
             case 'C':
-                return f2800c;
+                return f2806c;
             case 'D':
                 return i;
             default:
diff --git a/app/src/main/java/h0/b/a/b/b.java b/app/src/main/java/h0/b/a/b/b.java
index 7a7dbf85ea..e949406cba 100644
--- a/app/src/main/java/h0/b/a/b/b.java
+++ b/app/src/main/java/h0/b/a/b/b.java
@@ -11,7 +11,7 @@ public class b<T> implements a<T> {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Integer f2801c;
+    public final Integer f2807c;
 
     public b(Class<T> cls) {
         this.a = cls;
@@ -22,7 +22,7 @@ public class b<T> implements a<T> {
             try {
                 Method declaredMethod2 = ObjectStreamClass.class.getDeclaredMethod("getConstructorId", Class.class);
                 declaredMethod2.setAccessible(true);
-                this.f2801c = (Integer) declaredMethod2.invoke(null, Object.class);
+                this.f2807c = (Integer) declaredMethod2.invoke(null, Object.class);
             } catch (RuntimeException e) {
                 throw new ObjenesisException(e);
             } catch (NoSuchMethodException e2) {
@@ -43,7 +43,7 @@ public class b<T> implements a<T> {
     public T newInstance() {
         try {
             Class<T> cls = this.a;
-            return cls.cast(this.b.invoke(null, cls, this.f2801c));
+            return cls.cast(this.b.invoke(null, cls, this.f2807c));
         } catch (Exception e) {
             throw new ObjenesisException(e);
         }
diff --git a/app/src/main/java/h0/b/a/b/c.java b/app/src/main/java/h0/b/a/b/c.java
index d2905829b8..fedbd09807 100644
--- a/app/src/main/java/h0/b/a/b/c.java
+++ b/app/src/main/java/h0/b/a/b/c.java
@@ -11,7 +11,7 @@ public class c<T> implements a<T> {
     public final Method b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Long f2802c;
+    public final Long f2808c;
 
     public c(Class<T> cls) {
         this.a = cls;
@@ -22,7 +22,7 @@ public class c<T> implements a<T> {
             try {
                 Method declaredMethod2 = ObjectStreamClass.class.getDeclaredMethod("getConstructorId", Class.class);
                 declaredMethod2.setAccessible(true);
-                this.f2802c = (Long) declaredMethod2.invoke(null, Object.class);
+                this.f2808c = (Long) declaredMethod2.invoke(null, Object.class);
             } catch (RuntimeException e) {
                 throw new ObjenesisException(e);
             } catch (NoSuchMethodException e2) {
@@ -43,7 +43,7 @@ public class c<T> implements a<T> {
     public T newInstance() {
         try {
             Class<T> cls = this.a;
-            return cls.cast(this.b.invoke(null, cls, this.f2802c));
+            return cls.cast(this.b.invoke(null, cls, this.f2808c));
         } catch (Exception e) {
             throw new ObjenesisException(e);
         }
diff --git a/app/src/main/java/h0/b/a/d/a.java b/app/src/main/java/h0/b/a/d/a.java
index 6e1ec5976b..caa0fee4e4 100644
--- a/app/src/main/java/h0/b/a/d/a.java
+++ b/app/src/main/java/h0/b/a/d/a.java
@@ -11,7 +11,7 @@ public class a<T> extends b<T> {
     @Override // h0.b.a.a
     public T newInstance() {
         try {
-            Class<T> cls = this.f2803c;
+            Class<T> cls = this.f2809c;
             return cls.cast(b.a.invoke(b.b, cls, Object.class));
         } catch (RuntimeException e) {
             throw new ObjenesisException(e);
diff --git a/app/src/main/java/h0/b/a/d/b.java b/app/src/main/java/h0/b/a/d/b.java
index ff3bbe8951..60c77cf255 100644
--- a/app/src/main/java/h0/b/a/d/b.java
+++ b/app/src/main/java/h0/b/a/d/b.java
@@ -10,14 +10,14 @@ public abstract class b<T> implements h0.b.a.a<T> {
     public static ObjectInputStream b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Class<T> f2803c;
+    public final Class<T> f2809c;
 
     /* compiled from: GCJInstantiatorBase */
     public static class a extends ObjectInputStream {
     }
 
     public b(Class<T> cls) {
-        this.f2803c = cls;
+        this.f2809c = cls;
         if (a == null) {
             try {
                 Method declaredMethod = ObjectInputStream.class.getDeclaredMethod("newObject", Class.class, Class.class);
diff --git a/app/src/main/java/h0/b/b/b.java b/app/src/main/java/h0/b/b/b.java
index 8724c31a39..fe7d96f09c 100644
--- a/app/src/main/java/h0/b/b/b.java
+++ b/app/src/main/java/h0/b/b/b.java
@@ -7,7 +7,7 @@ public final class b {
     public static final int b = a();
 
     /* renamed from: c  reason: collision with root package name */
-    public static final boolean f2804c;
+    public static final boolean f2810c;
     public static final String d = System.getProperty("com.google.appengine.runtime.version");
 
     static {
@@ -21,7 +21,7 @@ public final class b {
         if (!(a() == 0 || (property = System.getProperty("java.boot.class.path")) == null || !property.toLowerCase().contains("core-oj.jar"))) {
             z2 = true;
         }
-        f2804c = z2;
+        f2810c = z2;
     }
 
     public static int a() {
diff --git a/app/src/main/java/h0/b/b/c.java b/app/src/main/java/h0/b/b/c.java
index 10fe25c37c..846b16b121 100644
--- a/app/src/main/java/h0/b/b/c.java
+++ b/app/src/main/java/h0/b/b/c.java
@@ -12,7 +12,7 @@ public class c implements a {
         } else if (!b.b("Dalvik")) {
             return b.b("BEA") ? new h0.b.a.f.a(cls) : b.b("GNU libgcj") ? new h0.b.a.d.a(cls) : b.b("PERC") ? new h0.b.a.e.a(cls) : new h0.b.a.f.b(cls);
         } else {
-            if (b.f2804c) {
+            if (b.f2810c) {
                 return new h0.b.a.f.b(cls);
             }
             int i = b.b;
diff --git a/app/src/main/java/i0/a0.java b/app/src/main/java/i0/a0.java
index 7565563f9f..e5d00b3f63 100644
--- a/app/src/main/java/i0/a0.java
+++ b/app/src/main/java/i0/a0.java
@@ -106,13 +106,13 @@ public abstract class a0<T> {
                 }
             } else if (annotation instanceof l) {
                 if (!aVar.r) {
-                    aVar.f2821s = true;
+                    aVar.f2827s = true;
                 } else {
                     throw d0.j(aVar.d, "Only one encoding annotation is allowed.", new Object[0]);
                 }
             } else if (!(annotation instanceof e)) {
                 continue;
-            } else if (!aVar.f2821s) {
+            } else if (!aVar.f2827s) {
                 aVar.r = true;
             } else {
                 throw d0.j(aVar.d, "Only one encoding annotation is allowed.", new Object[0]);
@@ -120,18 +120,18 @@ public abstract class a0<T> {
         }
         if (aVar.p != null) {
             if (!aVar.q) {
-                if (aVar.f2821s) {
+                if (aVar.f2827s) {
                     throw d0.j(aVar.d, "Multipart can only be specified on HTTP methods with request body (e.g., @POST).", new Object[0]);
                 } else if (aVar.r) {
                     throw d0.j(aVar.d, "FormUrlEncoded can only be specified on HTTP methods with request body (e.g., @POST).", new Object[0]);
                 }
             }
             int length = aVar.f.length;
-            aVar.f2822x = new t[length];
+            aVar.f2828x = new t[length];
             int i7 = length - 1;
             int i8 = 0;
             while (i8 < length) {
-                t<?>[] tVarArr = aVar.f2822x;
+                t<?>[] tVarArr = aVar.f2828x;
                 Type type2 = aVar.g[i8];
                 Annotation[] annotationArr2 = aVar.f[i8];
                 boolean z3 = i8 == i7;
@@ -187,7 +187,7 @@ public abstract class a0<T> {
                                     } else if (aVar.w.contains(value2)) {
                                         i3 = i9;
                                         i6 = length2;
-                                        tVar3 = new t.i<>(aVar.d, i8, value2, aVar.f2820c.e(type2, annotationArr2), sVar.encoded());
+                                        tVar3 = new t.i<>(aVar.d, i8, value2, aVar.f2826c.e(type2, annotationArr2), sVar.encoded());
                                     } else {
                                         throw d0.l(aVar.d, i8, "URL \"%s\" does not contain \"{%s}\".", aVar.t, value2);
                                     }
@@ -206,14 +206,14 @@ public abstract class a0<T> {
                                     aVar.l = true;
                                     if (Iterable.class.isAssignableFrom(f)) {
                                         if (type2 instanceof ParameterizedType) {
-                                            tVar3 = new r(new t.j(value3, aVar.f2820c.e(d0.e(0, (ParameterizedType) type2), annotationArr2), encoded));
+                                            tVar3 = new r(new t.j(value3, aVar.f2826c.e(d0.e(0, (ParameterizedType) type2), annotationArr2), encoded));
                                         } else {
                                             throw d0.l(aVar.d, i8, a.k(f, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                         }
                                     } else if (f.isArray()) {
-                                        tVar3 = new s(new t.j(value3, aVar.f2820c.e(w.a.a(f.getComponentType()), annotationArr2), encoded));
+                                        tVar3 = new s(new t.j(value3, aVar.f2826c.e(w.a.a(f.getComponentType()), annotationArr2), encoded));
                                     } else {
-                                        tVar4 = new t.j<>(value3, aVar.f2820c.e(type2, annotationArr2), encoded);
+                                        tVar4 = new t.j<>(value3, aVar.f2826c.e(type2, annotationArr2), encoded);
                                     }
                                 } else {
                                     if (annotation2 instanceof v) {
@@ -223,14 +223,14 @@ public abstract class a0<T> {
                                         aVar.m = true;
                                         if (Iterable.class.isAssignableFrom(f2)) {
                                             if (type2 instanceof ParameterizedType) {
-                                                tVar3 = new r(new t.l(aVar.f2820c.e(d0.e(0, (ParameterizedType) type2), annotationArr2), encoded2));
+                                                tVar3 = new r(new t.l(aVar.f2826c.e(d0.e(0, (ParameterizedType) type2), annotationArr2), encoded2));
                                             } else {
                                                 throw d0.l(aVar.d, i8, a.k(f2, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                             }
                                         } else if (f2.isArray()) {
-                                            tVar3 = new s(new t.l(aVar.f2820c.e(w.a.a(f2.getComponentType()), annotationArr2), encoded2));
+                                            tVar3 = new s(new t.l(aVar.f2826c.e(w.a.a(f2.getComponentType()), annotationArr2), encoded2));
                                         } else {
-                                            cVar = new t.l<>(aVar.f2820c.e(type2, annotationArr2), encoded2);
+                                            cVar = new t.l<>(aVar.f2826c.e(type2, annotationArr2), encoded2);
                                         }
                                     } else if (annotation2 instanceof u) {
                                         aVar.c(i8, type2);
@@ -242,7 +242,7 @@ public abstract class a0<T> {
                                                 ParameterizedType parameterizedType = (ParameterizedType) g;
                                                 Type e2 = d0.e(0, parameterizedType);
                                                 if (String.class == e2) {
-                                                    cVar = new t.k<>(aVar.d, i8, aVar.f2820c.e(d0.e(1, parameterizedType), annotationArr2), ((u) annotation2).encoded());
+                                                    cVar = new t.k<>(aVar.d, i8, aVar.f2826c.e(d0.e(1, parameterizedType), annotationArr2), ((u) annotation2).encoded());
                                                 } else {
                                                     throw d0.l(aVar.d, i8, a.w("@QueryMap keys must be of type String: ", e2), new Object[0]);
                                                 }
@@ -258,14 +258,14 @@ public abstract class a0<T> {
                                         Class<?> f4 = d0.f(type2);
                                         if (Iterable.class.isAssignableFrom(f4)) {
                                             if (type2 instanceof ParameterizedType) {
-                                                tVar3 = new r(new t.d(value4, aVar.f2820c.e(d0.e(0, (ParameterizedType) type2), annotationArr2)));
+                                                tVar3 = new r(new t.d(value4, aVar.f2826c.e(d0.e(0, (ParameterizedType) type2), annotationArr2)));
                                             } else {
                                                 throw d0.l(aVar.d, i8, a.k(f4, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                             }
                                         } else if (f4.isArray()) {
-                                            tVar3 = new s(new t.d(value4, aVar.f2820c.e(w.a.a(f4.getComponentType()), annotationArr2)));
+                                            tVar3 = new s(new t.d(value4, aVar.f2826c.e(w.a.a(f4.getComponentType()), annotationArr2)));
                                         } else {
-                                            cVar = new t.d<>(value4, aVar.f2820c.e(type2, annotationArr2));
+                                            cVar = new t.d<>(value4, aVar.f2826c.e(type2, annotationArr2));
                                         }
                                     } else {
                                         if (annotation2 instanceof j) {
@@ -280,7 +280,7 @@ public abstract class a0<T> {
                                                         ParameterizedType parameterizedType2 = (ParameterizedType) g2;
                                                         Type e3 = d0.e(0, parameterizedType2);
                                                         if (String.class == e3) {
-                                                            tVar5 = new t.e<>(aVar.d, i8, aVar.f2820c.e(d0.e(1, parameterizedType2), annotationArr2));
+                                                            tVar5 = new t.e<>(aVar.d, i8, aVar.f2826c.e(d0.e(1, parameterizedType2), annotationArr2));
                                                         } else {
                                                             throw d0.l(aVar.d, i8, a.w("@HeaderMap keys must be of type String: ", e3), new Object[0]);
                                                         }
@@ -301,14 +301,14 @@ public abstract class a0<T> {
                                                 Class<?> f6 = d0.f(type2);
                                                 if (Iterable.class.isAssignableFrom(f6)) {
                                                     if (type2 instanceof ParameterizedType) {
-                                                        tVar3 = new r(new t.b(value5, aVar.f2820c.e(d0.e(0, (ParameterizedType) type2), annotationArr2), encoded3));
+                                                        tVar3 = new r(new t.b(value5, aVar.f2826c.e(d0.e(0, (ParameterizedType) type2), annotationArr2), encoded3));
                                                     } else {
                                                         throw d0.l(aVar.d, i8, a.k(f6, new StringBuilder(), " must include generic type (e.g., ", "<String>)"), new Object[0]);
                                                     }
                                                 } else if (f6.isArray()) {
-                                                    tVar3 = new s(new t.b(value5, aVar.f2820c.e(w.a.a(f6.getComponentType()), annotationArr2), encoded3));
+                                                    tVar3 = new s(new t.b(value5, aVar.f2826c.e(w.a.a(f6.getComponentType()), annotationArr2), encoded3));
                                                 } else {
-                                                    tVar4 = new t.b<>(value5, aVar.f2820c.e(type2, annotationArr2), encoded3);
+                                                    tVar4 = new t.b<>(value5, aVar.f2826c.e(type2, annotationArr2), encoded3);
                                                 }
                                             } else {
                                                 throw d0.l(aVar.d, i8, "@Field parameters can only be used with form encoding.", new Object[0]);
@@ -323,7 +323,7 @@ public abstract class a0<T> {
                                                         ParameterizedType parameterizedType3 = (ParameterizedType) g3;
                                                         Type e4 = d0.e(0, parameterizedType3);
                                                         if (String.class == e4) {
-                                                            h<T, String> e5 = aVar.f2820c.e(d0.e(1, parameterizedType3), annotationArr2);
+                                                            h<T, String> e5 = aVar.f2826c.e(d0.e(1, parameterizedType3), annotationArr2);
                                                             aVar.h = true;
                                                             cVar = new t.c<>(aVar.d, i8, e5, ((d) annotation2).encoded());
                                                         } else {
@@ -340,7 +340,7 @@ public abstract class a0<T> {
                                             }
                                         } else if (annotation2 instanceof q) {
                                             aVar.c(i8, type2);
-                                            if (aVar.f2821s) {
+                                            if (aVar.f2827s) {
                                                 q qVar = (q) annotation2;
                                                 aVar.i = true;
                                                 String value6 = qVar.value();
@@ -352,7 +352,7 @@ public abstract class a0<T> {
                                                         if (type2 instanceof ParameterizedType) {
                                                             Type e6 = d0.e(0, (ParameterizedType) type2);
                                                             if (!MultipartBody.Part.class.isAssignableFrom(d0.f(e6))) {
-                                                                tVar2 = new r(new t.g(aVar.d, i8, c2, aVar.f2820c.c(e6, annotationArr2, aVar.e)));
+                                                                tVar2 = new r(new t.g(aVar.d, i8, c2, aVar.f2826c.c(e6, annotationArr2, aVar.e)));
                                                             } else {
                                                                 throw d0.l(aVar.d, i8, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation.", new Object[0]);
                                                             }
@@ -362,12 +362,12 @@ public abstract class a0<T> {
                                                     } else if (f8.isArray()) {
                                                         Class<?> a = w.a.a(f8.getComponentType());
                                                         if (!MultipartBody.Part.class.isAssignableFrom(a)) {
-                                                            tVar2 = new s(new t.g(aVar.d, i8, c2, aVar.f2820c.c(a, annotationArr2, aVar.e)));
+                                                            tVar2 = new s(new t.g(aVar.d, i8, c2, aVar.f2826c.c(a, annotationArr2, aVar.e)));
                                                         } else {
                                                             throw d0.l(aVar.d, i8, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation.", new Object[0]);
                                                         }
                                                     } else if (!MultipartBody.Part.class.isAssignableFrom(f8)) {
-                                                        tVar3 = new t.g<>(aVar.d, i8, c2, aVar.f2820c.c(type2, annotationArr2, aVar.e));
+                                                        tVar3 = new t.g<>(aVar.d, i8, c2, aVar.f2826c.c(type2, annotationArr2, aVar.e));
                                                         tVar2 = tVar3;
                                                     } else {
                                                         throw d0.l(aVar.d, i8, "@Part parameters using the MultipartBody.Part must not include a part name in the annotation.", new Object[0]);
@@ -398,7 +398,7 @@ public abstract class a0<T> {
                                             i4 = i6;
                                             if (annotation2 instanceof r) {
                                                 aVar.c(i8, type2);
-                                                if (aVar.f2821s) {
+                                                if (aVar.f2827s) {
                                                     aVar.i = true;
                                                     Class<?> f9 = d0.f(type2);
                                                     if (Map.class.isAssignableFrom(f9)) {
@@ -409,7 +409,7 @@ public abstract class a0<T> {
                                                             if (String.class == e7) {
                                                                 Type e8 = d0.e(1, parameterizedType4);
                                                                 if (!MultipartBody.Part.class.isAssignableFrom(d0.f(e8))) {
-                                                                    tVar2 = new t.h<>(aVar.d, i8, aVar.f2820c.c(e8, annotationArr2, aVar.e), ((r) annotation2).encoding());
+                                                                    tVar2 = new t.h<>(aVar.d, i8, aVar.f2826c.c(e8, annotationArr2, aVar.e), ((r) annotation2).encoding());
                                                                 } else {
                                                                     throw d0.l(aVar.d, i8, "@PartMap values cannot be MultipartBody.Part. Use @Part List<Part> or a different value type instead.", new Object[0]);
                                                                 }
@@ -427,11 +427,11 @@ public abstract class a0<T> {
                                                 }
                                             } else if (annotation2 instanceof i0.g0.a) {
                                                 aVar.c(i8, type2);
-                                                if (aVar.r || aVar.f2821s) {
+                                                if (aVar.r || aVar.f2827s) {
                                                     throw d0.l(aVar.d, i8, "@Body parameters cannot be used with form or multi-part encoding.", new Object[0]);
                                                 } else if (!aVar.j) {
                                                     try {
-                                                        h<T, RequestBody> c3 = aVar.f2820c.c(type2, annotationArr2, aVar.e);
+                                                        h<T, RequestBody> c3 = aVar.f2826c.c(type2, annotationArr2, aVar.e);
                                                         aVar.j = true;
                                                         tVar2 = new t.a<>(aVar.d, i8, c3);
                                                     } catch (RuntimeException e9) {
@@ -444,7 +444,7 @@ public abstract class a0<T> {
                                                 aVar.c(i8, type2);
                                                 Class<?> f10 = d0.f(type2);
                                                 for (int i10 = i8 - 1; i10 >= 0; i10--) {
-                                                    t<?> tVar7 = aVar.f2822x[i10];
+                                                    t<?> tVar7 = aVar.f2828x[i10];
                                                     if ((tVar7 instanceof t.o) && ((t.o) tVar7).a.equals(f10)) {
                                                         Method method2 = aVar.d;
                                                         StringBuilder L = a.L("@Tag type ");
@@ -495,7 +495,7 @@ public abstract class a0<T> {
                     if (z3) {
                         try {
                             if (d0.f(type2) == Continuation.class) {
-                                aVar.f2823y = true;
+                                aVar.f2829y = true;
                                 tVar = null;
                             }
                         } catch (NoClassDefFoundError unused) {
@@ -510,11 +510,11 @@ public abstract class a0<T> {
             }
             if (aVar.t != null || aVar.o) {
                 boolean z4 = aVar.r;
-                if (!z4 && !aVar.f2821s && !aVar.q && aVar.j) {
+                if (!z4 && !aVar.f2827s && !aVar.q && aVar.j) {
                     throw d0.j(aVar.d, "Non-body HTTP method cannot contain @Body.", new Object[0]);
                 } else if (z4 && !aVar.h) {
                     throw d0.j(aVar.d, "Form-encoded method must contain at least one @Field.", new Object[0]);
-                } else if (!aVar.f2821s || aVar.i) {
+                } else if (!aVar.f2827s || aVar.i) {
                     w wVar = new w(aVar);
                     Type genericReturnType = method.getGenericReturnType();
                     if (d0.h(genericReturnType)) {
@@ -555,7 +555,7 @@ public abstract class a0<T> {
                                 throw d0.j(method, L2.toString(), new Object[0]);
                             } else if (a3 == x.class) {
                                 throw d0.j(method, "Response must include generic type (e.g., Response<String>)", new Object[0]);
-                            } else if (!wVar.f2819c.equals("HEAD") || Void.class.equals(a3)) {
+                            } else if (!wVar.f2825c.equals("HEAD") || Void.class.equals(a3)) {
                                 try {
                                     h<ResponseBody, T> d = zVar.d(a3, method.getAnnotations());
                                     e.a aVar3 = zVar.b;
diff --git a/app/src/main/java/i0/e0/a/f.java b/app/src/main/java/i0/e0/a/f.java
index ff8e7cb554..70898d9299 100644
--- a/app/src/main/java/i0/e0/a/f.java
+++ b/app/src/main/java/i0/e0/a/f.java
@@ -15,14 +15,14 @@ public final class f<R> implements e<R, Object> {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final boolean f2805c;
+    public final boolean f2811c;
     public final boolean d;
     public final boolean e;
 
     public f(Type type, Scheduler scheduler, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6) {
         this.a = type;
         this.b = z3;
-        this.f2805c = z4;
+        this.f2811c = z4;
         this.d = z5;
         this.e = z6;
     }
@@ -41,7 +41,7 @@ public final class f<R> implements e<R, Object> {
         if (this.b) {
             aVar = new e(cVar);
         } else {
-            if (this.f2805c) {
+            if (this.f2811c) {
                 aVar = new a(cVar);
             }
             Observable observable = new Observable(l.a(cVar));
diff --git a/app/src/main/java/i0/f0/a/b.java b/app/src/main/java/i0/f0/a/b.java
index 5fc542ea3b..71e8038d49 100644
--- a/app/src/main/java/i0/f0/a/b.java
+++ b/app/src/main/java/i0/f0/a/b.java
@@ -17,15 +17,15 @@ public final class b<T> implements h<T, RequestBody> {
     public static final Charset b = Charset.forName("UTF-8");
 
     /* renamed from: c  reason: collision with root package name */
-    public final Gson f2806c;
+    public final Gson f2812c;
     public final TypeAdapter<T> d;
 
     static {
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
     }
 
     public b(Gson gson, TypeAdapter<T> typeAdapter) {
-        this.f2806c = gson;
+        this.f2812c = gson;
         this.d = typeAdapter;
     }
 
@@ -33,7 +33,7 @@ public final class b<T> implements h<T, RequestBody> {
     @Override // i0.h
     public RequestBody convert(Object obj) throws IOException {
         e eVar = new e();
-        JsonWriter l = this.f2806c.l(new OutputStreamWriter(new f(eVar), b));
+        JsonWriter l = this.f2812c.l(new OutputStreamWriter(new f(eVar), b));
         this.d.write(l, obj);
         l.close();
         return RequestBody.create(a, eVar.x());
diff --git a/app/src/main/java/i0/f0/b/a.java b/app/src/main/java/i0/f0/b/a.java
index e36de2f222..9f0c407dc9 100644
--- a/app/src/main/java/i0/f0/b/a.java
+++ b/app/src/main/java/i0/f0/b/a.java
@@ -10,7 +10,7 @@ public final class a<T> implements h<T, RequestBody> {
     public static final MediaType b = MediaType.a.a("text/plain; charset=UTF-8");
 
     static {
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
diff --git a/app/src/main/java/i0/j.java b/app/src/main/java/i0/j.java
index f81db60859..1da059c0d3 100644
--- a/app/src/main/java/i0/j.java
+++ b/app/src/main/java/i0/j.java
@@ -11,7 +11,7 @@ public abstract class j<ResponseT, ReturnT> extends a0<ReturnT> {
     public final e.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final h<ResponseBody, ResponseT> f2807c;
+    public final h<ResponseBody, ResponseT> f2813c;
 
     /* compiled from: HttpServiceMethod */
     public static final class a<ResponseT, ReturnT> extends j<ResponseT, ReturnT> {
@@ -87,12 +87,12 @@ public abstract class j<ResponseT, ReturnT> extends a0<ReturnT> {
     public j(w wVar, e.a aVar, h<ResponseBody, ResponseT> hVar) {
         this.a = wVar;
         this.b = aVar;
-        this.f2807c = hVar;
+        this.f2813c = hVar;
     }
 
     @Override // i0.a0
     public final ReturnT a(Object[] objArr) {
-        return c(new p(this.a, objArr, this.b, this.f2807c), objArr);
+        return c(new p(this.a, objArr, this.b, this.f2813c), objArr);
     }
 
     public abstract ReturnT c(d<ResponseT> dVar, Object[] objArr);
diff --git a/app/src/main/java/i0/p.java b/app/src/main/java/i0/p.java
index 604d767f9a..1fe6059676 100644
--- a/app/src/main/java/i0/p.java
+++ b/app/src/main/java/i0/p.java
@@ -200,7 +200,7 @@ public final class p<T> implements d<T> {
         t<?>[] tVarArr = wVar2.j;
         int length = objArr.length;
         if (length == tVarArr.length) {
-            v vVar = new v(wVar2.f2819c, wVar2.b, wVar2.d, wVar2.e, wVar2.f, wVar2.g, wVar2.h, wVar2.i);
+            v vVar = new v(wVar2.f2825c, wVar2.b, wVar2.d, wVar2.e, wVar2.f, wVar2.g, wVar2.h, wVar2.i);
             if (wVar2.k) {
                 length--;
             }
@@ -255,8 +255,8 @@ public final class p<T> implements d<T> {
             aVar6.g(wVar);
             Headers c2 = vVar.h.c();
             m.checkParameterIsNotNull(c2, "headers");
-            aVar6.f2768c = c2.e();
-            aVar6.c(vVar.f2818c, aVar5);
+            aVar6.f2774c = c2.e();
+            aVar6.c(vVar.f2824c, aVar5);
             aVar6.e(k.class, new k(wVar2.a, arrayList));
             e b2 = aVar.b(aVar6.a());
             Objects.requireNonNull(b2, "Call.Factory returned null.");
@@ -360,7 +360,7 @@ public final class p<T> implements d<T> {
         Response response2 = response.p;
         Response response3 = response.q;
         Response response4 = response.r;
-        long j = response.f2855s;
+        long j = response.f2861s;
         long j2 = response.t;
         f0.f0.g.c cVar = response.u;
         c cVar2 = new c(responseBody.b(), responseBody.a());
diff --git a/app/src/main/java/i0/t.java b/app/src/main/java/i0/t.java
index 41fd800d24..e6b1473b1d 100644
--- a/app/src/main/java/i0/t.java
+++ b/app/src/main/java/i0/t.java
@@ -16,19 +16,19 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, RequestBody> f2808c;
+        public final h<T, RequestBody> f2814c;
 
         public a(Method method, int i, h<T, RequestBody> hVar) {
             this.a = method;
             this.b = i;
-            this.f2808c = hVar;
+            this.f2814c = hVar;
         }
 
         @Override // i0.t
         public void a(v vVar, T t) {
             if (t != null) {
                 try {
-                    vVar.m = this.f2808c.convert(t);
+                    vVar.m = this.f2814c.convert(t);
                 } catch (IOException e) {
                     Method method = this.a;
                     int i = this.b;
@@ -46,20 +46,20 @@ public abstract class t<T> {
         public final h<T, String> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2809c;
+        public final boolean f2815c;
 
         public b(String str, h<T, String> hVar, boolean z2) {
             Objects.requireNonNull(str, "name == null");
             this.a = str;
             this.b = hVar;
-            this.f2809c = z2;
+            this.f2815c = z2;
         }
 
         @Override // i0.t
         public void a(v vVar, T t) throws IOException {
             String convert;
             if (t != null && (convert = this.b.convert(t)) != null) {
-                vVar.a(this.a, convert, this.f2809c);
+                vVar.a(this.a, convert, this.f2815c);
             }
         }
     }
@@ -70,13 +70,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, String> f2810c;
+        public final h<T, String> f2816c;
         public final boolean d;
 
         public c(Method method, int i, h<T, String> hVar, boolean z2) {
             this.a = method;
             this.b = i;
-            this.f2810c = hVar;
+            this.f2816c = hVar;
             this.d = z2;
         }
 
@@ -91,13 +91,13 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            String str2 = (String) this.f2810c.convert(value);
+                            String str2 = (String) this.f2816c.convert(value);
                             if (str2 != null) {
                                 vVar.a(str, str2, this.d);
                             } else {
                                 Method method = this.a;
                                 int i = this.b;
-                                throw d0.l(method, i, "Field map value '" + value + "' converted to null by " + this.f2810c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
+                                throw d0.l(method, i, "Field map value '" + value + "' converted to null by " + this.f2816c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
                             }
                         } else {
                             throw d0.l(this.a, this.b, c.d.b.a.a.v("Field map contained null value for key '", str, "'."), new Object[0]);
@@ -138,12 +138,12 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, String> f2811c;
+        public final h<T, String> f2817c;
 
         public e(Method method, int i, h<T, String> hVar) {
             this.a = method;
             this.b = i;
-            this.f2811c = hVar;
+            this.f2817c = hVar;
         }
 
         /* JADX DEBUG: Multi-variable search result rejected for r3v1, resolved type: i0.h<T, java.lang.String> */
@@ -157,7 +157,7 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            vVar.b(str, (String) this.f2811c.convert(value));
+                            vVar.b(str, (String) this.f2817c.convert(value));
                         } else {
                             throw d0.l(this.a, this.b, c.d.b.a.a.v("Header map contained null value for key '", str, "'."), new Object[0]);
                         }
@@ -205,13 +205,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final Headers f2812c;
+        public final Headers f2818c;
         public final h<T, RequestBody> d;
 
         public g(Method method, int i, Headers headers, h<T, RequestBody> hVar) {
             this.a = method;
             this.b = i;
-            this.f2812c = headers;
+            this.f2818c = headers;
             this.d = hVar;
         }
 
@@ -219,7 +219,7 @@ public abstract class t<T> {
         public void a(v vVar, T t) {
             if (t != null) {
                 try {
-                    vVar.c(this.f2812c, this.d.convert(t));
+                    vVar.c(this.f2818c, this.d.convert(t));
                 } catch (IOException e) {
                     Method method = this.a;
                     int i = this.b;
@@ -235,13 +235,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, RequestBody> f2813c;
+        public final h<T, RequestBody> f2819c;
         public final String d;
 
         public h(Method method, int i, h<T, RequestBody> hVar, String str) {
             this.a = method;
             this.b = i;
-            this.f2813c = hVar;
+            this.f2819c = hVar;
             this.d = str;
         }
 
@@ -256,7 +256,7 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            vVar.c(Headers.i.c("Content-Disposition", c.d.b.a.a.v("form-data; name=\"", str, "\""), "Content-Transfer-Encoding", this.d), (RequestBody) this.f2813c.convert(value));
+                            vVar.c(Headers.i.c("Content-Disposition", c.d.b.a.a.v("form-data; name=\"", str, "\""), "Content-Transfer-Encoding", this.d), (RequestBody) this.f2819c.convert(value));
                         } else {
                             throw d0.l(this.a, this.b, c.d.b.a.a.v("Part map contained null value for key '", str, "'."), new Object[0]);
                         }
@@ -276,7 +276,7 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final String f2814c;
+        public final String f2820c;
         public final h<T, String> d;
         public final boolean e;
 
@@ -284,7 +284,7 @@ public abstract class t<T> {
             this.a = method;
             this.b = i;
             Objects.requireNonNull(str, "name == null");
-            this.f2814c = str;
+            this.f2820c = str;
             this.d = hVar;
             this.e = z2;
         }
@@ -295,7 +295,7 @@ public abstract class t<T> {
             int i;
             int i2;
             if (t != null) {
-                String str2 = this.f2814c;
+                String str2 = this.f2820c;
                 String convert = this.d.convert(t);
                 boolean z2 = this.e;
                 if (vVar.e != null) {
@@ -351,7 +351,7 @@ public abstract class t<T> {
                 }
                 throw new AssertionError();
             }
-            throw d0.l(this.a, this.b, c.d.b.a.a.D(c.d.b.a.a.L("Path parameter \""), this.f2814c, "\" value must not be null."), new Object[0]);
+            throw d0.l(this.a, this.b, c.d.b.a.a.D(c.d.b.a.a.L("Path parameter \""), this.f2820c, "\" value must not be null."), new Object[0]);
         }
     }
 
@@ -361,20 +361,20 @@ public abstract class t<T> {
         public final h<T, String> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final boolean f2815c;
+        public final boolean f2821c;
 
         public j(String str, h<T, String> hVar, boolean z2) {
             Objects.requireNonNull(str, "name == null");
             this.a = str;
             this.b = hVar;
-            this.f2815c = z2;
+            this.f2821c = z2;
         }
 
         @Override // i0.t
         public void a(v vVar, T t) throws IOException {
             String convert;
             if (t != null && (convert = this.b.convert(t)) != null) {
-                vVar.d(this.a, convert, this.f2815c);
+                vVar.d(this.a, convert, this.f2821c);
             }
         }
     }
@@ -385,13 +385,13 @@ public abstract class t<T> {
         public final int b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final h<T, String> f2816c;
+        public final h<T, String> f2822c;
         public final boolean d;
 
         public k(Method method, int i, h<T, String> hVar, boolean z2) {
             this.a = method;
             this.b = i;
-            this.f2816c = hVar;
+            this.f2822c = hVar;
             this.d = z2;
         }
 
@@ -406,13 +406,13 @@ public abstract class t<T> {
                     if (str != null) {
                         Object value = entry.getValue();
                         if (value != null) {
-                            String str2 = (String) this.f2816c.convert(value);
+                            String str2 = (String) this.f2822c.convert(value);
                             if (str2 != null) {
                                 vVar.d(str, str2, this.d);
                             } else {
                                 Method method = this.a;
                                 int i = this.b;
-                                throw d0.l(method, i, "Query map value '" + value + "' converted to null by " + this.f2816c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
+                                throw d0.l(method, i, "Query map value '" + value + "' converted to null by " + this.f2822c.getClass().getName() + " for key '" + str + "'.", new Object[0]);
                             }
                         } else {
                             throw d0.l(this.a, this.b, c.d.b.a.a.v("Query map contained null value for key '", str, "'."), new Object[0]);
diff --git a/app/src/main/java/i0/u.java b/app/src/main/java/i0/u.java
index 99147e834f..be7ea39222 100644
--- a/app/src/main/java/i0/u.java
+++ b/app/src/main/java/i0/u.java
@@ -14,7 +14,7 @@ public class u {
     public final boolean b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Constructor<MethodHandles.Lookup> f2817c;
+    public final Constructor<MethodHandles.Lookup> f2823c;
 
     /* compiled from: Platform */
     public static final class a extends u {
@@ -59,7 +59,7 @@ public class u {
             } catch (NoClassDefFoundError | NoSuchMethodException unused) {
             }
         }
-        this.f2817c = constructor;
+        this.f2823c = constructor;
     }
 
     public Executor a() {
@@ -68,7 +68,7 @@ public class u {
 
     @IgnoreJRERequirement
     public Object b(Method method, Class<?> cls, Object obj, Object... objArr) throws Throwable {
-        Constructor<MethodHandles.Lookup> constructor = this.f2817c;
+        Constructor<MethodHandles.Lookup> constructor = this.f2823c;
         return (constructor != null ? constructor.newInstance(cls, -1) : MethodHandles.lookup()).unreflectSpecial(method, cls).bindTo(obj).invokeWithArguments(objArr);
     }
 }
diff --git a/app/src/main/java/i0/v.java b/app/src/main/java/i0/v.java
index 46b97dffdc..f8a64b26a6 100644
--- a/app/src/main/java/i0/v.java
+++ b/app/src/main/java/i0/v.java
@@ -20,7 +20,7 @@ public final class v {
     public static final Pattern b = Pattern.compile("(.*/)?(\\.|%2e|%2E){1,2}(/.*)?");
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2818c;
+    public final String f2824c;
     public final w d;
     public String e;
     public w.a f;
@@ -59,7 +59,7 @@ public final class v {
     }
 
     public v(String str, w wVar, String str2, Headers headers, MediaType mediaType, boolean z2, boolean z3, boolean z4) {
-        this.f2818c = str;
+        this.f2824c = str;
         this.d = wVar;
         this.e = str2;
         this.i = mediaType;
@@ -86,8 +86,8 @@ public final class v {
             m.checkParameterIsNotNull(str2, "value");
             List<String> list = aVar.a;
             w.b bVar = w.b;
-            list.add(w.b.a(bVar, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f2754c, 83));
-            aVar.b.add(w.b.a(bVar, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f2754c, 83));
+            list.add(w.b.a(bVar, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f2760c, 83));
+            aVar.b.add(w.b.a(bVar, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", true, false, true, false, aVar.f2760c, 83));
             return;
         }
         u.a aVar2 = this.l;
@@ -96,14 +96,14 @@ public final class v {
         m.checkParameterIsNotNull(str2, "value");
         List<String> list2 = aVar2.a;
         w.b bVar2 = w.b;
-        list2.add(w.b.a(bVar2, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f2754c, 91));
-        aVar2.b.add(w.b.a(bVar2, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f2754c, 91));
+        list2.add(w.b.a(bVar2, str, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f2760c, 91));
+        aVar2.b.add(w.b.a(bVar2, str2, 0, 0, " \"':;<=>@[]^`{}|/\\?#&!$(),~", false, false, true, false, aVar2.f2760c, 91));
     }
 
     public void b(String str, String str2) {
         if ("Content-Type".equalsIgnoreCase(str)) {
             try {
-                MediaType.a aVar = MediaType.f2851c;
+                MediaType.a aVar = MediaType.f2857c;
                 this.i = MediaType.a.a(str2);
             } catch (IllegalArgumentException e) {
                 throw new IllegalArgumentException(c.d.b.a.a.u("Malformed content type: ", str2), e);
diff --git a/app/src/main/java/i0/w.java b/app/src/main/java/i0/w.java
index 8dc34e4b30..40fa8f5827 100644
--- a/app/src/main/java/i0/w.java
+++ b/app/src/main/java/i0/w.java
@@ -15,7 +15,7 @@ public final class w {
     public final f0.w b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final String f2819c;
+    public final String f2825c;
     public final String d;
     public final Headers e;
     public final MediaType f;
@@ -31,7 +31,7 @@ public final class w {
         public static final Pattern b = Pattern.compile("[a-zA-Z][a-zA-Z0-9_-]*");
 
         /* renamed from: c  reason: collision with root package name */
-        public final z f2820c;
+        public final z f2826c;
         public final Method d;
         public final Annotation[] e;
         public final Annotation[][] f;
@@ -49,20 +49,20 @@ public final class w {
         public boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public boolean f2821s;
+        public boolean f2827s;
         public String t;
         public Headers u;
         public MediaType v;
         public Set<String> w;
 
         /* renamed from: x  reason: collision with root package name */
-        public t<?>[] f2822x;
+        public t<?>[] f2828x;
 
         /* renamed from: y  reason: collision with root package name */
-        public boolean f2823y;
+        public boolean f2829y;
 
         public a(z zVar, Method method) {
-            this.f2820c = zVar;
+            this.f2826c = zVar;
             this.d = method;
             this.e = method.getAnnotations();
             this.g = method.getGenericParameterTypes();
@@ -109,15 +109,15 @@ public final class w {
 
     public w(a aVar) {
         this.a = aVar.d;
-        this.b = aVar.f2820c.f2826c;
-        this.f2819c = aVar.p;
+        this.b = aVar.f2826c.f2832c;
+        this.f2825c = aVar.p;
         this.d = aVar.t;
         this.e = aVar.u;
         this.f = aVar.v;
         this.g = aVar.q;
         this.h = aVar.r;
-        this.i = aVar.f2821s;
-        this.j = aVar.f2822x;
-        this.k = aVar.f2823y;
+        this.i = aVar.f2827s;
+        this.j = aVar.f2828x;
+        this.k = aVar.f2829y;
     }
 }
diff --git a/app/src/main/java/i0/x.java b/app/src/main/java/i0/x.java
index a7341379fc..d13918e798 100644
--- a/app/src/main/java/i0/x.java
+++ b/app/src/main/java/i0/x.java
@@ -8,12 +8,12 @@ public final class x<T> {
     public final T b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final ResponseBody f2824c;
+    public final ResponseBody f2830c;
 
     public x(Response response, T t, ResponseBody responseBody) {
         this.a = response;
         this.b = t;
-        this.f2824c = responseBody;
+        this.f2830c = responseBody;
     }
 
     public static <T> x<T> b(T t, Response response) {
diff --git a/app/src/main/java/i0/y.java b/app/src/main/java/i0/y.java
index efe17786a6..7b206f9c98 100644
--- a/app/src/main/java/i0/y.java
+++ b/app/src/main/java/i0/y.java
@@ -8,12 +8,12 @@ public class y implements InvocationHandler {
     public final Object[] b = new Object[0];
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Class f2825c;
+    public final /* synthetic */ Class f2831c;
     public final /* synthetic */ z d;
 
     public y(z zVar, Class cls) {
         this.d = zVar;
-        this.f2825c = cls;
+        this.f2831c = cls;
     }
 
     @Override // java.lang.reflect.InvocationHandler
@@ -24,6 +24,6 @@ public class y implements InvocationHandler {
         if (objArr == null) {
             objArr = this.b;
         }
-        return this.a.b && method.isDefault() ? this.a.b(method, this.f2825c, obj, objArr) : this.d.b(method).a(objArr);
+        return this.a.b && method.isDefault() ? this.a.b(method, this.f2831c, obj, objArr) : this.d.b(method).a(objArr);
     }
 }
diff --git a/app/src/main/java/i0/z.java b/app/src/main/java/i0/z.java
index 972e5e8438..2b3e59802c 100644
--- a/app/src/main/java/i0/z.java
+++ b/app/src/main/java/i0/z.java
@@ -21,14 +21,14 @@ public final class z {
     public final e.a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final w f2826c;
+    public final w f2832c;
     public final List<h.a> d;
     public final List<e.a> e;
     public final boolean f;
 
     public z(e.a aVar, w wVar, List<h.a> list, List<e.a> list2, Executor executor, boolean z2) {
         this.b = aVar;
-        this.f2826c = wVar;
+        this.f2832c = wVar;
         this.d = list;
         this.e = list2;
         this.f = z2;
diff --git a/app/src/main/java/j0/c.java b/app/src/main/java/j0/c.java
index 029bc42d95..c687bfda57 100644
--- a/app/src/main/java/j0/c.java
+++ b/app/src/main/java/j0/c.java
@@ -16,6 +16,6 @@ public final class c implements d.a {
         e eVar2 = eVar;
         b bVar = new b(this, eVar2);
         eVar2.a(bVar);
-        this.i.j0(bVar);
+        this.i.i0(bVar);
     }
 }
diff --git a/app/src/main/java/j0/f.java b/app/src/main/java/j0/f.java
index fa150dd494..9797298f30 100644
--- a/app/src/main/java/j0/f.java
+++ b/app/src/main/java/j0/f.java
@@ -5,7 +5,7 @@ public final class f<T> {
     public final a b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Throwable f2827c;
+    public final Throwable f2833c;
     public final T d;
 
     /* compiled from: Notification */
@@ -17,12 +17,12 @@ public final class f<T> {
 
     public f(a aVar, T t, Throwable th) {
         this.d = t;
-        this.f2827c = th;
+        this.f2833c = th;
         this.b = aVar;
     }
 
     public boolean a() {
-        return (this.b == a.OnError) && this.f2827c != null;
+        return (this.b == a.OnError) && this.f2833c != null;
     }
 
     public boolean b() {
@@ -48,8 +48,8 @@ public final class f<T> {
         if (t != t2 && (t == null || !t.equals(t2))) {
             return false;
         }
-        Throwable th = this.f2827c;
-        Throwable th2 = fVar.f2827c;
+        Throwable th = this.f2833c;
+        Throwable th2 = fVar.f2833c;
         return th == th2 || (th != null && th.equals(th2));
     }
 
@@ -58,7 +58,7 @@ public final class f<T> {
         if (b()) {
             hashCode = (hashCode * 31) + this.d.hashCode();
         }
-        return a() ? (hashCode * 31) + this.f2827c.hashCode() : hashCode;
+        return a() ? (hashCode * 31) + this.f2833c.hashCode() : hashCode;
     }
 
     public String toString() {
@@ -73,7 +73,7 @@ public final class f<T> {
         }
         if (a()) {
             sb.append(' ');
-            sb.append(this.f2827c.getMessage());
+            sb.append(this.f2833c.getMessage());
         }
         sb.append(']');
         return sb.toString();
diff --git a/app/src/main/java/j0/h.java b/app/src/main/java/j0/h.java
index e4ebc48a5e..959ea47406 100644
--- a/app/src/main/java/j0/h.java
+++ b/app/src/main/java/j0/h.java
@@ -12,7 +12,7 @@ public class h<T> {
     }
 
     public h(a<T> aVar) {
-        b<a, a> bVar = l.f2845c;
+        b<a, a> bVar = l.f2851c;
         this.a = bVar != null ? bVar.call(aVar) : aVar;
     }
 }
diff --git a/app/src/main/java/j0/l/a/c.java b/app/src/main/java/j0/l/a/c.java
index a0b651960e..ca1f23972c 100644
--- a/app/src/main/java/j0/l/a/c.java
+++ b/app/src/main/java/j0/l/a/c.java
@@ -6,7 +6,7 @@ import rx.Subscriber;
 public enum c implements Observable.a<Object> {
     INSTANCE;
     
-    public static final Observable<Object> j = Observable.i0(INSTANCE);
+    public static final Observable<Object> j = Observable.h0(INSTANCE);
 
     @Override // rx.functions.Action1
     public void call(Object obj) {
diff --git a/app/src/main/java/j0/l/a/c0.java b/app/src/main/java/j0/l/a/c0.java
index 3b5c58f51e..8d17aa08fe 100644
--- a/app/src/main/java/j0/l/a/c0.java
+++ b/app/src/main/java/j0/l/a/c0.java
@@ -26,7 +26,7 @@ public final class c0<T> implements Observable.a<T> {
         if (this.k.incrementAndGet() == 1) {
             AtomicBoolean atomicBoolean = new AtomicBoolean(true);
             try {
-                this.i.l0(new z(this, subscriber, atomicBoolean));
+                this.i.k0(new z(this, subscriber, atomicBoolean));
             } finally {
                 if (atomicBoolean.get()) {
                     this.l.unlock();
@@ -36,7 +36,7 @@ public final class c0<T> implements Observable.a<T> {
             try {
                 CompositeSubscription compositeSubscription = this.j;
                 subscriber.add(new a(new b0(this, compositeSubscription)));
-                this.i.j0(new a0(this, subscriber, subscriber, compositeSubscription));
+                this.i.i0(new a0(this, subscriber, subscriber, compositeSubscription));
             } finally {
                 this.l.unlock();
             }
diff --git a/app/src/main/java/j0/l/a/d.java b/app/src/main/java/j0/l/a/d.java
index 3bd4f6b8e8..13a4a41dc3 100644
--- a/app/src/main/java/j0/l/a/d.java
+++ b/app/src/main/java/j0/l/a/d.java
@@ -6,7 +6,7 @@ import rx.Subscriber;
 public enum d implements Observable.a<Object> {
     INSTANCE;
     
-    public static final Observable<Object> j = Observable.i0(INSTANCE);
+    public static final Observable<Object> j = Observable.h0(INSTANCE);
 
     @Override // rx.functions.Action1
     public void call(Object obj) {
diff --git a/app/src/main/java/j0/l/a/e0.java b/app/src/main/java/j0/l/a/e0.java
index fa7bd67730..d3c5fed112 100644
--- a/app/src/main/java/j0/l/a/e0.java
+++ b/app/src/main/java/j0/l/a/e0.java
@@ -16,6 +16,6 @@ public class e0<T> implements h.a<T> {
         i iVar = (i) obj;
         d0 d0Var = new d0(this, iVar);
         iVar.i.a(d0Var);
-        this.i.j0(d0Var);
+        this.i.i0(d0Var);
     }
 }
diff --git a/app/src/main/java/j0/l/a/e1.java b/app/src/main/java/j0/l/a/e1.java
index 803c2695bb..f8bba315e4 100644
--- a/app/src/main/java/j0/l/a/e1.java
+++ b/app/src/main/java/j0/l/a/e1.java
@@ -71,7 +71,7 @@ public class e1 extends Subscriber<T> {
             if (j != 0) {
                 this.l.b(j);
             }
-            ((Observable) this.n.i.call(th)).j0(aVar);
+            ((Observable) this.n.i.call(th)).i0(aVar);
         } catch (Throwable th2) {
             Subscriber subscriber = this.k;
             c.q.a.k.a.a0(th2);
diff --git a/app/src/main/java/j0/l/a/f.java b/app/src/main/java/j0/l/a/f.java
index c0981f0f5d..d109ba566f 100644
--- a/app/src/main/java/j0/l/a/f.java
+++ b/app/src/main/java/j0/l/a/f.java
@@ -324,7 +324,7 @@ public final class f<T, R> implements Observable.a<R> {
         bVar.actual.add(bVar);
         bVar.actual.setProducer(bVar);
         for (int i4 = 0; i4 < length && !bVar.cancelled; i4++) {
-            observableArr[i4].V(aVarArr[i4]);
+            observableArr[i4].U(aVarArr[i4]);
         }
     }
 }
diff --git a/app/src/main/java/j0/l/a/f2.java b/app/src/main/java/j0/l/a/f2.java
index 3a614d8bdd..5274b693b9 100644
--- a/app/src/main/java/j0/l/a/f2.java
+++ b/app/src/main/java/j0/l/a/f2.java
@@ -20,7 +20,7 @@ public final class f2<T, E> implements Observable.b<T, T> {
         serializedSubscriber.add(d2Var);
         serializedSubscriber.add(e2Var);
         subscriber.add(serializedSubscriber);
-        this.i.j0(e2Var);
+        this.i.i0(e2Var);
         return d2Var;
     }
 }
diff --git a/app/src/main/java/j0/l/a/g0.java b/app/src/main/java/j0/l/a/g0.java
index 1aaeaa5817..8d93201d7c 100644
--- a/app/src/main/java/j0/l/a/g0.java
+++ b/app/src/main/java/j0/l/a/g0.java
@@ -85,7 +85,7 @@ public final class g0<T> implements Observable.a<T> {
                     }
                     a aVar = new a(bVar.i, bVar.n);
                     if (bVar.q.a(aVar)) {
-                        bVar.m.V(aVar);
+                        bVar.m.U(aVar);
                     }
                 }
             }
@@ -162,6 +162,6 @@ public final class g0<T> implements Observable.a<T> {
         subscriber.add(bVar.q);
         subscriber.setProducer(bVar.n);
         bVar.p.a(bVar.l.b(new b.a(0), bVar.j, bVar.k));
-        this.i.V(bVar);
+        this.i.U(bVar);
     }
 }
diff --git a/app/src/main/java/j0/l/a/h.java b/app/src/main/java/j0/l/a/h.java
index 2ad8962611..12077d3cbc 100644
--- a/app/src/main/java/j0/l/a/h.java
+++ b/app/src/main/java/j0/l/a/h.java
@@ -153,7 +153,7 @@ public final class h<T, R> implements Observable.a<R> {
                                             this.p.a(bVar);
                                             if (!bVar.isUnsubscribed()) {
                                                 this.r = true;
-                                                observable.j0(bVar);
+                                                observable.i0(bVar);
                                             } else {
                                                 return;
                                             }
@@ -249,7 +249,7 @@ public final class h<T, R> implements Observable.a<R> {
         subscriber.add(cVar.p);
         subscriber.setProducer(new g(this, cVar));
         if (!subscriber.isUnsubscribed()) {
-            this.i.j0(cVar);
+            this.i.i0(cVar);
         }
     }
 }
diff --git a/app/src/main/java/j0/l/a/h1.java b/app/src/main/java/j0/l/a/h1.java
index 8a7b691fd1..2d5108c572 100644
--- a/app/src/main/java/j0/l/a/h1.java
+++ b/app/src/main/java/j0/l/a/h1.java
@@ -355,7 +355,7 @@ public final class h1<T> extends c<T> {
     }
 
     @Override // j0.m.c
-    public void l0(Action1<? super Subscription> action1) {
+    public void k0(Action1<? super Subscription> action1) {
         b<T> bVar;
         while (true) {
             bVar = this.k.get();
@@ -375,7 +375,7 @@ public final class h1<T> extends c<T> {
         }
         ((z) action1).call(bVar);
         if (z2) {
-            this.j.j0(bVar);
+            this.j.i0(bVar);
         }
     }
 }
diff --git a/app/src/main/java/j0/l/a/j.java b/app/src/main/java/j0/l/a/j.java
index 43b6e0d0f2..7243ac725d 100644
--- a/app/src/main/java/j0/l/a/j.java
+++ b/app/src/main/java/j0/l/a/j.java
@@ -17,7 +17,7 @@ public final class j<T> implements Observable.a<T> {
     public void call(Object obj) {
         Subscriber subscriber = (Subscriber) obj;
         try {
-            ((Observable) this.i.call()).j0(new e(subscriber, subscriber));
+            ((Observable) this.i.call()).i0(new e(subscriber, subscriber));
         } catch (Throwable th) {
             a.a0(th);
             subscriber.onError(th);
diff --git a/app/src/main/java/j0/l/a/j1.java b/app/src/main/java/j0/l/a/j1.java
index d1dc077e32..42bb4c5e0d 100644
--- a/app/src/main/java/j0/l/a/j1.java
+++ b/app/src/main/java/j0/l/a/j1.java
@@ -307,14 +307,14 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
         public boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public boolean f2828s;
+        public boolean f2834s;
         public long t;
         public long u;
         public volatile Producer v;
         public List<c<T>> w;
 
         /* renamed from: x  reason: collision with root package name */
-        public boolean f2829x;
+        public boolean f2835x;
 
         public f(e<T> eVar) {
             this.j = eVar;
@@ -372,9 +372,9 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                             }
                             list2.add(cVar);
                         } else {
-                            this.f2829x = true;
+                            this.f2835x = true;
                         }
-                        this.f2828s = true;
+                        this.f2834s = true;
                         return;
                     }
                     this.r = true;
@@ -395,15 +395,15 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
                 b(j, j3);
                 while (!isUnsubscribed()) {
                     synchronized (this) {
-                        if (!this.f2828s) {
+                        if (!this.f2834s) {
                             this.r = false;
                             return;
                         }
-                        this.f2828s = false;
+                        this.f2834s = false;
                         list = this.w;
                         this.w = null;
-                        z2 = this.f2829x;
-                        this.f2829x = false;
+                        z2 = this.f2835x;
+                        this.f2835x = false;
                     }
                     long j5 = this.t;
                     if (list != null) {
@@ -619,7 +619,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
     }
 
     @Override // j0.m.c
-    public void l0(Action1<? super Subscription> action1) {
+    public void k0(Action1<? super Subscription> action1) {
         f<T> fVar;
         while (true) {
             fVar = this.l.get();
@@ -639,7 +639,7 @@ public final class j1<T> extends j0.m.c<T> implements Subscription {
         }
         ((z) action1).call(fVar);
         if (z2) {
-            this.k.j0(fVar);
+            this.k.i0(fVar);
         }
     }
 
diff --git a/app/src/main/java/j0/l/a/k.java b/app/src/main/java/j0/l/a/k.java
index dd6b2a386b..b320e491aa 100644
--- a/app/src/main/java/j0/l/a/k.java
+++ b/app/src/main/java/j0/l/a/k.java
@@ -73,6 +73,6 @@ public class k<T> implements Observable.a<T> {
 
     @Override // rx.functions.Action1
     public void call(Object obj) {
-        this.j.j0(new a((Subscriber) obj, this.i));
+        this.j.i0(new a((Subscriber) obj, this.i));
     }
 }
diff --git a/app/src/main/java/j0/l/a/l.java b/app/src/main/java/j0/l/a/l.java
index 869750e377..a8ce6b168f 100644
--- a/app/src/main/java/j0/l/a/l.java
+++ b/app/src/main/java/j0/l/a/l.java
@@ -71,6 +71,6 @@ public final class l<T> implements Observable.a<T> {
         Subscriber subscriber = (Subscriber) obj;
         a aVar = new a(subscriber, this.j);
         subscriber.add(aVar);
-        this.i.j0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/j0/l/a/l0.java b/app/src/main/java/j0/l/a/l0.java
index 77b46b4321..b4b74630af 100644
--- a/app/src/main/java/j0/l/a/l0.java
+++ b/app/src/main/java/j0/l/a/l0.java
@@ -70,7 +70,7 @@ public final class l0<T, K, V> implements Observable.a<Map<K, V>>, Func0<Map<K,
             Subscriber<? super R> subscriber2 = aVar.i;
             subscriber2.add(aVar);
             subscriber2.setProducer(new a.C0319a(aVar));
-            observable.j0(aVar);
+            observable.i0(aVar);
         } catch (Throwable th) {
             c.q.a.k.a.a0(th);
             subscriber.onError(th);
diff --git a/app/src/main/java/j0/l/a/n.java b/app/src/main/java/j0/l/a/n.java
index 78791cc826..26b4204fc7 100644
--- a/app/src/main/java/j0/l/a/n.java
+++ b/app/src/main/java/j0/l/a/n.java
@@ -266,6 +266,6 @@ public final class n<T, R> implements Observable.a<R> {
         a aVar = new a(subscriber, this.j, this.k);
         subscriber.add(aVar);
         subscriber.setProducer(new m(this, aVar));
-        this.i.j0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/j0/l/a/p0.java b/app/src/main/java/j0/l/a/p0.java
index b691118e75..6db8a5496d 100644
--- a/app/src/main/java/j0/l/a/p0.java
+++ b/app/src/main/java/j0/l/a/p0.java
@@ -32,11 +32,11 @@ public class p0 extends Subscriber<T> {
             SerializedSubscriber serializedSubscriber = p0Var.m;
             Subscriber<?> subscriber = p0Var.j;
             synchronized (aVar) {
-                if (!aVar.e && aVar.f2830c) {
+                if (!aVar.e && aVar.f2836c) {
                     if (i == aVar.a) {
                         t = aVar.b;
                         aVar.b = null;
-                        aVar.f2830c = false;
+                        aVar.f2836c = false;
                         aVar.e = true;
                     }
                 }
@@ -78,9 +78,9 @@ public class p0 extends Subscriber<T> {
                 return;
             }
             t = aVar.b;
-            z2 = aVar.f2830c;
+            z2 = aVar.f2836c;
             aVar.b = null;
-            aVar.f2830c = false;
+            aVar.f2836c = false;
             aVar.e = true;
         }
         if (z2) {
@@ -102,7 +102,7 @@ public class p0 extends Subscriber<T> {
         synchronized (aVar) {
             aVar.a++;
             aVar.b = null;
-            aVar.f2830c = false;
+            aVar.f2836c = false;
         }
     }
 
@@ -112,7 +112,7 @@ public class p0 extends Subscriber<T> {
         q0.a<T> aVar = this.i;
         synchronized (aVar) {
             aVar.b = t;
-            aVar.f2830c = true;
+            aVar.f2836c = true;
             i = aVar.a + 1;
             aVar.a = i;
         }
diff --git a/app/src/main/java/j0/l/a/q0.java b/app/src/main/java/j0/l/a/q0.java
index 892b349ca8..d4d569d8a3 100644
--- a/app/src/main/java/j0/l/a/q0.java
+++ b/app/src/main/java/j0/l/a/q0.java
@@ -18,7 +18,7 @@ public final class q0<T> implements Observable.b<T, T> {
         public T b;
 
         /* renamed from: c  reason: collision with root package name */
-        public boolean f2830c;
+        public boolean f2836c;
         public boolean d;
         public boolean e;
     }
diff --git a/app/src/main/java/j0/l/a/q2.java b/app/src/main/java/j0/l/a/q2.java
index 9a7c5e08a3..7c042a6e82 100644
--- a/app/src/main/java/j0/l/a/q2.java
+++ b/app/src/main/java/j0/l/a/q2.java
@@ -139,12 +139,12 @@ public final class q2<T, R> implements Observable.a<R> {
                 int i2 = i + 1;
                 b bVar = new b(aVar, i2);
                 aVar.add(bVar);
-                observableArr[i].j0(bVar);
+                observableArr[i].i0(bVar);
                 i = i2;
             } else {
                 return;
             }
         }
-        this.i.j0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/j0/l/a/r2.java b/app/src/main/java/j0/l/a/r2.java
index 7422fe5d80..880929d3bc 100644
--- a/app/src/main/java/j0/l/a/r2.java
+++ b/app/src/main/java/j0/l/a/r2.java
@@ -85,7 +85,7 @@ public final class r2<R> implements Observable.b<R, Observable<?>[]> {
             this.requested = atomicLong;
             this.subscribers = objArr;
             for (int i3 = 0; i3 < observableArr.length; i3++) {
-                observableArr[i3].j0((C0320a) objArr[i3]);
+                observableArr[i3].i0((C0320a) objArr[i3]);
             }
         }
 
diff --git a/app/src/main/java/j0/l/a/s.java b/app/src/main/java/j0/l/a/s.java
index 16b0260c98..045989741a 100644
--- a/app/src/main/java/j0/l/a/s.java
+++ b/app/src/main/java/j0/l/a/s.java
@@ -66,6 +66,6 @@ public final class s<T, R> implements Observable.a<R> {
         Subscriber subscriber = (Subscriber) obj;
         a aVar = new a(subscriber, this.j);
         subscriber.add(aVar);
-        this.i.j0(aVar);
+        this.i.i0(aVar);
     }
 }
diff --git a/app/src/main/java/j0/l/a/t.java b/app/src/main/java/j0/l/a/t.java
index 7bc5bb0c70..0032ce8fea 100644
--- a/app/src/main/java/j0/l/a/t.java
+++ b/app/src/main/java/j0/l/a/t.java
@@ -76,7 +76,7 @@ public class t implements Action0 {
         if (!this.i.isUnsubscribed()) {
             a aVar = new a();
             this.m.a(aVar);
-            this.n.i.j0(aVar);
+            this.n.i.i0(aVar);
         }
     }
 }
diff --git a/app/src/main/java/j0/l/a/u.java b/app/src/main/java/j0/l/a/u.java
index a96824ca1e..57846df4e5 100644
--- a/app/src/main/java/j0/l/a/u.java
+++ b/app/src/main/java/j0/l/a/u.java
@@ -37,7 +37,7 @@ public class u extends Subscriber<f<?>> {
             if (!z2 || !this.j.i.l) {
                 this.i.onNext(fVar);
             } else {
-                this.i.onError(fVar.f2827c);
+                this.i.onError(fVar.f2833c);
             }
         } else {
             this.i.onCompleted();
diff --git a/app/src/main/java/j0/l/a/w.java b/app/src/main/java/j0/l/a/w.java
index a495237cb0..ddce781d27 100644
--- a/app/src/main/java/j0/l/a/w.java
+++ b/app/src/main/java/j0/l/a/w.java
@@ -62,6 +62,6 @@ public class w implements Action0 {
 
     @Override // rx.functions.Action0
     public void call() {
-        this.i.j0(new a(this.j));
+        this.i.i0(new a(this.j));
     }
 }
diff --git a/app/src/main/java/j0/l/a/x0.java b/app/src/main/java/j0/l/a/x0.java
index 6e393485b1..71a46b9d55 100644
--- a/app/src/main/java/j0/l/a/x0.java
+++ b/app/src/main/java/j0/l/a/x0.java
@@ -111,11 +111,11 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                 }
                 a(1);
                 synchronized (eVar) {
-                    if (!eVar.f2831s) {
+                    if (!eVar.f2837s) {
                         eVar.r = false;
                         return;
                     }
-                    eVar.f2831s = false;
+                    eVar.f2837s = false;
                     eVar.c();
                     return;
                 }
@@ -180,31 +180,31 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
         public boolean r;
 
         /* renamed from: s  reason: collision with root package name */
-        public boolean f2831s;
+        public boolean f2837s;
         public final Object t = new Object();
         public volatile c<?>[] u = i;
         public long v;
         public long w;
 
         /* renamed from: x  reason: collision with root package name */
-        public int f2832x;
+        public int f2838x;
 
         /* renamed from: y  reason: collision with root package name */
-        public final int f2833y;
+        public final int f2839y;
 
         /* renamed from: z  reason: collision with root package name */
-        public int f2834z;
+        public int f2840z;
 
         public e(Subscriber<? super T> subscriber, boolean z2, int i2) {
             this.j = subscriber;
             this.k = z2;
             this.l = i2;
             if (i2 == Integer.MAX_VALUE) {
-                this.f2833y = Integer.MAX_VALUE;
+                this.f2839y = Integer.MAX_VALUE;
                 request(Long.MAX_VALUE);
                 return;
             }
-            this.f2833y = Math.max(1, i2 >> 1);
+            this.f2839y = Math.max(1, i2 >> 1);
             request((long) i2);
         }
 
@@ -227,7 +227,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
         public void b() {
             synchronized (this) {
                 if (this.r) {
-                    this.f2831s = true;
+                    this.f2837s = true;
                     return;
                 }
                 this.r = true;
@@ -324,7 +324,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                 if (!z5 || ((queue2 != null && !queue2.isEmpty()) || length != 0)) {
                     if (length > 0) {
                         long j4 = this.w;
-                        int i6 = this.f2832x;
+                        int i6 = this.f2838x;
                         if (length <= i6 || cVarArr[i6].k != j4) {
                             if (length <= i6) {
                                 i6 = 0;
@@ -335,7 +335,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                     i6 = 0;
                                 }
                             }
-                            this.f2832x = i6;
+                            this.f2838x = i6;
                             this.w = cVarArr[i6].k;
                         }
                         int i8 = 0;
@@ -413,7 +413,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                 return;
                             }
                         }
-                        this.f2832x = i6;
+                        this.f2838x = i6;
                         this.w = cVarArr[i6].k;
                     } else {
                         subscriber2 = subscriber;
@@ -425,7 +425,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                     if (!z3) {
                         synchronized (this) {
                             try {
-                                if (!this.f2831s) {
+                                if (!this.f2837s) {
                                     try {
                                         this.r = false;
                                         return;
@@ -442,7 +442,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                                         throw th2;
                                     }
                                 } else {
-                                    this.f2831s = false;
+                                    this.f2837s = false;
                                 }
                             } catch (Throwable th8) {
                                 th2 = th8;
@@ -592,13 +592,13 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
             if (observable != null) {
                 z2 = true;
                 if (observable == c.j) {
-                    int i2 = this.f2834z + 1;
-                    if (i2 == this.f2833y) {
-                        this.f2834z = 0;
+                    int i2 = this.f2840z + 1;
+                    if (i2 == this.f2839y) {
+                        this.f2840z = 0;
                         request((long) i2);
                         return;
                     }
-                    this.f2834z = i2;
+                    this.f2840z = i2;
                     return;
                 } else if (observable instanceof j) {
                     T t = ((j) observable).k;
@@ -627,19 +627,19 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                             if (j != Long.MAX_VALUE) {
                                 this.m.a(1);
                             }
-                            int i3 = this.f2834z + 1;
-                            if (i3 == this.f2833y) {
-                                this.f2834z = 0;
+                            int i3 = this.f2840z + 1;
+                            if (i3 == this.f2839y) {
+                                this.f2840z = 0;
                                 request((long) i3);
                             } else {
-                                this.f2834z = i3;
+                                this.f2840z = i3;
                             }
                             synchronized (this) {
-                                if (!this.f2831s) {
+                                if (!this.f2837s) {
                                     this.r = false;
                                     return;
                                 }
-                                this.f2831s = false;
+                                this.f2837s = false;
                                 c();
                                 return;
                             }
@@ -679,7 +679,7 @@ public final class x0<T> implements Observable.b<T, Observable<? extends T>> {
                         cVarArr2[length] = cVar;
                         this.u = cVarArr2;
                     }
-                    observable.j0(cVar);
+                    observable.i0(cVar);
                     b();
                     return;
                 }
diff --git a/app/src/main/java/j0/l/a/x1.java b/app/src/main/java/j0/l/a/x1.java
index f0b408cfd4..cdfb0e48e2 100644
--- a/app/src/main/java/j0/l/a/x1.java
+++ b/app/src/main/java/j0/l/a/x1.java
@@ -68,7 +68,7 @@ public final class x1<T> implements Observable.a<T> {
             Observable<T> observable = this.l;
             this.l = null;
             this.m = Thread.currentThread();
-            observable.j0(this);
+            observable.i0(this);
         }
 
         @Override // j0.g
diff --git a/app/src/main/java/j0/l/a/y.java b/app/src/main/java/j0/l/a/y.java
index 2763ba3696..fd14c1a109 100644
--- a/app/src/main/java/j0/l/a/y.java
+++ b/app/src/main/java/j0/l/a/y.java
@@ -36,11 +36,11 @@ public final class y<T> implements Observable.a<T> {
         subscriber.add(aVar);
         SerialSubscription serialSubscription = new SerialSubscription();
         subscriber.add(serialSubscription);
-        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.l0());
-        serializedSubject.V(new d(a.a));
+        SerializedSubject serializedSubject = new SerializedSubject(BehaviorSubject.k0());
+        serializedSubject.U(new d(a.a));
         j0.l.b.a aVar2 = new j0.l.b.a();
         t tVar = new t(this, subscriber, serializedSubject, aVar2, atomicLong, serialSubscription);
-        aVar.a(new w(this, (Observable) this.j.call(Observable.i0(new r(serializedSubject.i, new v(this)))), subscriber, atomicLong, aVar, tVar, atomicBoolean));
+        aVar.a(new w(this, (Observable) this.j.call(Observable.h0(new r(serializedSubject.i, new v(this)))), subscriber, atomicLong, aVar, tVar, atomicBoolean));
         subscriber.setProducer(new x(this, atomicLong, aVar2, atomicBoolean, aVar, tVar));
     }
 }
diff --git a/app/src/main/java/j0/l/a/y1.java b/app/src/main/java/j0/l/a/y1.java
index ea3d03be4b..3d27910d47 100644
--- a/app/src/main/java/j0/l/a/y1.java
+++ b/app/src/main/java/j0/l/a/y1.java
@@ -107,7 +107,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
         public Producer r;
 
         /* renamed from: s  reason: collision with root package name */
-        public volatile boolean f2835s;
+        public volatile boolean f2841s;
         public Throwable t;
         public boolean u;
 
@@ -166,7 +166,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
             Subscriber<? super T> subscriber = this.j;
             long j2 = j;
             Throwable th4 = th;
-            boolean z3 = this.f2835s;
+            boolean z3 = this.f2841s;
             while (true) {
                 long j3 = 0;
                 while (true) {
@@ -191,7 +191,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
                         return;
                     }
                 }
-                if (i2 != 0 || (!subscriber.isUnsubscribed() && !a(this.f2835s, z2, th4, eVar, subscriber, eVar.isEmpty()))) {
+                if (i2 != 0 || (!subscriber.isUnsubscribed() && !a(this.f2841s, z2, th4, eVar, subscriber, eVar.isEmpty()))) {
                     synchronized (this) {
                         long j4 = this.q;
                         if (j4 != Long.MAX_VALUE) {
@@ -204,7 +204,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
                             return;
                         }
                         this.p = false;
-                        z3 = this.f2835s;
+                        z3 = this.f2841s;
                         z2 = this.u;
                         th4 = this.t;
                         if (!(th4 == null || th4 == (th2 = i) || this.l)) {
@@ -236,7 +236,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
 
         @Override // j0.g
         public void onCompleted() {
-            this.f2835s = true;
+            this.f2841s = true;
             b();
         }
 
@@ -247,7 +247,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
                 c2 = c(th);
             }
             if (c2) {
-                this.f2835s = true;
+                this.f2841s = true;
                 b();
                 return;
             }
@@ -272,7 +272,7 @@ public final class y1<T> implements Observable.b<T, Observable<? extends T>> {
                 this.r = null;
             }
             this.k.a(bVar);
-            observable.j0(bVar);
+            observable.i0(bVar);
         }
     }
 
diff --git a/app/src/main/java/j0/l/a/z.java b/app/src/main/java/j0/l/a/z.java
index 3c21d75aa9..9cb7eb5056 100644
--- a/app/src/main/java/j0/l/a/z.java
+++ b/app/src/main/java/j0/l/a/z.java
@@ -28,7 +28,7 @@ public class z implements Action1<Subscription> {
             Subscriber subscriber = this.i;
             CompositeSubscription compositeSubscription = c0Var.j;
             subscriber.add(new a(new b0(c0Var, compositeSubscription)));
-            c0Var.i.j0(new a0(c0Var, subscriber, subscriber, compositeSubscription));
+            c0Var.i.i0(new a0(c0Var, subscriber, subscriber, compositeSubscription));
         } finally {
             this.k.l.unlock();
             this.j.set(z2);
diff --git a/app/src/main/java/j0/l/c/a.java b/app/src/main/java/j0/l/c/a.java
index f8089067f8..6515413840 100644
--- a/app/src/main/java/j0/l/c/a.java
+++ b/app/src/main/java/j0/l/c/a.java
@@ -23,7 +23,7 @@ public final class a extends Scheduler implements k {
     public static final TimeUnit b = TimeUnit.SECONDS;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final c f2836c;
+    public static final c f2842c;
     public static final C0324a d;
     public final ThreadFactory e;
     public final AtomicReference<C0324a> f;
@@ -35,7 +35,7 @@ public final class a extends Scheduler implements k {
         public final long b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final ConcurrentLinkedQueue<c> f2837c;
+        public final ConcurrentLinkedQueue<c> f2843c;
         public final CompositeSubscription d;
         public final ScheduledExecutorService e;
         public final Future<?> f;
@@ -66,15 +66,15 @@ public final class a extends Scheduler implements k {
             @Override // java.lang.Runnable
             public void run() {
                 C0324a aVar = C0324a.this;
-                if (!aVar.f2837c.isEmpty()) {
+                if (!aVar.f2843c.isEmpty()) {
                     long nanoTime = System.nanoTime();
-                    Iterator<c> it = aVar.f2837c.iterator();
+                    Iterator<c> it = aVar.f2843c.iterator();
                     while (it.hasNext()) {
                         c next = it.next();
                         if (next.q > nanoTime) {
                             return;
                         }
-                        if (aVar.f2837c.remove(next)) {
+                        if (aVar.f2843c.remove(next)) {
                             aVar.d.c(next);
                         }
                     }
@@ -87,7 +87,7 @@ public final class a extends Scheduler implements k {
             this.a = threadFactory;
             long nanos = timeUnit != null ? timeUnit.toNanos(j) : 0;
             this.b = nanos;
-            this.f2837c = new ConcurrentLinkedQueue<>();
+            this.f2843c = new ConcurrentLinkedQueue<>();
             this.d = new CompositeSubscription();
             ScheduledExecutorService scheduledExecutorService = null;
             if (timeUnit != null) {
@@ -147,15 +147,15 @@ public final class a extends Scheduler implements k {
             this.j = aVar;
             this.l = new AtomicBoolean();
             if (aVar.d.j) {
-                cVar = a.f2836c;
+                cVar = a.f2842c;
             } else {
                 while (true) {
-                    if (aVar.f2837c.isEmpty()) {
+                    if (aVar.f2843c.isEmpty()) {
                         cVar2 = new c(aVar.a);
                         aVar.d.a(cVar2);
                         break;
                     }
-                    cVar2 = aVar.f2837c.poll();
+                    cVar2 = aVar.f2843c.poll();
                     if (cVar2 != null) {
                         break;
                     }
@@ -187,7 +187,7 @@ public final class a extends Scheduler implements k {
             c cVar = this.k;
             Objects.requireNonNull(aVar);
             cVar.q = System.nanoTime() + aVar.b;
-            aVar.f2837c.offer(cVar);
+            aVar.f2843c.offer(cVar);
         }
 
         @Override // rx.Subscription
@@ -215,7 +215,7 @@ public final class a extends Scheduler implements k {
 
     static {
         c cVar = new c(i.i);
-        f2836c = cVar;
+        f2842c = cVar;
         cVar.unsubscribe();
         C0324a aVar = new C0324a(null, 0, null);
         d = aVar;
diff --git a/app/src/main/java/j0/l/c/b.java b/app/src/main/java/j0/l/c/b.java
index e6b053a021..b6c1744955 100644
--- a/app/src/main/java/j0/l/c/b.java
+++ b/app/src/main/java/j0/l/c/b.java
@@ -17,7 +17,7 @@ public final class b extends Scheduler implements k {
     public static final c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final C0329b f2838c = new C0329b(null, 0);
+    public static final C0329b f2844c = new C0329b(null, 0);
     public final ThreadFactory d;
     public final AtomicReference<C0329b> e;
 
@@ -119,7 +119,7 @@ public final class b extends Scheduler implements k {
         public final c[] b;
 
         /* renamed from: c  reason: collision with root package name */
-        public long f2839c;
+        public long f2845c;
 
         public C0329b(ThreadFactory threadFactory, int i) {
             this.a = i;
@@ -135,8 +135,8 @@ public final class b extends Scheduler implements k {
                 return b.b;
             }
             c[] cVarArr = this.b;
-            long j = this.f2839c;
-            this.f2839c = 1 + j;
+            long j = this.f2845c;
+            this.f2845c = 1 + j;
             return cVarArr[(int) (j % ((long) i))];
         }
     }
@@ -162,7 +162,7 @@ public final class b extends Scheduler implements k {
 
     public b(ThreadFactory threadFactory) {
         this.d = threadFactory;
-        C0329b bVar = f2838c;
+        C0329b bVar = f2844c;
         AtomicReference<C0329b> atomicReference = new AtomicReference<>(bVar);
         this.e = atomicReference;
         C0329b bVar2 = new C0329b(threadFactory, a);
@@ -184,7 +184,7 @@ public final class b extends Scheduler implements k {
         C0329b bVar2;
         do {
             bVar = this.e.get();
-            bVar2 = f2838c;
+            bVar2 = f2844c;
             if (bVar == bVar2) {
                 return;
             }
diff --git a/app/src/main/java/j0/l/c/c.java b/app/src/main/java/j0/l/c/c.java
index a55ec0fe3a..26fdf95b42 100644
--- a/app/src/main/java/j0/l/c/c.java
+++ b/app/src/main/java/j0/l/c/c.java
@@ -65,7 +65,7 @@ public final class c extends Scheduler {
         public a(Executor executor) {
             ScheduledExecutorService scheduledExecutorService;
             this.i = executor;
-            ScheduledExecutorService[] scheduledExecutorServiceArr = d.f2840c.e.get();
+            ScheduledExecutorService[] scheduledExecutorServiceArr = d.f2846c.e.get();
             if (scheduledExecutorServiceArr == d.a) {
                 scheduledExecutorService = d.b;
             } else {
diff --git a/app/src/main/java/j0/l/c/d.java b/app/src/main/java/j0/l/c/d.java
index c71bbdc11e..dbe5fbf3c1 100644
--- a/app/src/main/java/j0/l/c/d.java
+++ b/app/src/main/java/j0/l/c/d.java
@@ -10,7 +10,7 @@ public final class d implements k {
     public static final ScheduledExecutorService b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final d f2840c = new d();
+    public static final d f2846c = new d();
     public static int d;
     public final AtomicReference<ScheduledExecutorService[]> e = new AtomicReference<>(a);
 
diff --git a/app/src/main/java/j0/l/c/j.java b/app/src/main/java/j0/l/c/j.java
index 483c19bfeb..b802257353 100644
--- a/app/src/main/java/j0/l/c/j.java
+++ b/app/src/main/java/j0/l/c/j.java
@@ -45,16 +45,16 @@ public final class j extends AtomicReference<Thread> implements Runnable, Subscr
         public final SubscriptionList parent;
 
         /* renamed from: s  reason: collision with root package name */
-        public final j f2841s;
+        public final j f2847s;
 
         public b(j jVar, SubscriptionList subscriptionList) {
-            this.f2841s = jVar;
+            this.f2847s = jVar;
             this.parent = subscriptionList;
         }
 
         @Override // rx.Subscription
         public boolean isUnsubscribed() {
-            return this.f2841s.cancel.j;
+            return this.f2847s.cancel.j;
         }
 
         @Override // rx.Subscription
@@ -62,7 +62,7 @@ public final class j extends AtomicReference<Thread> implements Runnable, Subscr
             boolean remove;
             if (compareAndSet(false, true)) {
                 SubscriptionList subscriptionList = this.parent;
-                j jVar = this.f2841s;
+                j jVar = this.f2847s;
                 if (!subscriptionList.j) {
                     synchronized (subscriptionList) {
                         List<Subscription> list = subscriptionList.i;
@@ -87,22 +87,22 @@ public final class j extends AtomicReference<Thread> implements Runnable, Subscr
         public final CompositeSubscription parent;
 
         /* renamed from: s  reason: collision with root package name */
-        public final j f2842s;
+        public final j f2848s;
 
         public c(j jVar, CompositeSubscription compositeSubscription) {
-            this.f2842s = jVar;
+            this.f2848s = jVar;
             this.parent = compositeSubscription;
         }
 
         @Override // rx.Subscription
         public boolean isUnsubscribed() {
-            return this.f2842s.cancel.j;
+            return this.f2848s.cancel.j;
         }
 
         @Override // rx.Subscription
         public void unsubscribe() {
             if (compareAndSet(false, true)) {
-                this.parent.c(this.f2842s);
+                this.parent.c(this.f2848s);
             }
         }
     }
diff --git a/app/src/main/java/j0/l/e/e.java b/app/src/main/java/j0/l/e/e.java
index 6b91842dd9..d4a4ba5028 100644
--- a/app/src/main/java/j0/l/e/e.java
+++ b/app/src/main/java/j0/l/e/e.java
@@ -27,7 +27,7 @@ public enum e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // j0.k.b
         public Throwable call(f<?> fVar) {
-            return fVar.f2827c;
+            return fVar.f2833c;
         }
     }
 
@@ -43,7 +43,7 @@ public enum e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // j0.k.b
         public Observable<?> call(Observable<? extends f<?>> observable) {
-            return (Observable) this.i.call(observable.G(e.i));
+            return (Observable) this.i.call(observable.F(e.i));
         }
     }
 
@@ -59,7 +59,7 @@ public enum e {
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
         @Override // j0.k.b
         public Observable<?> call(Observable<? extends f<?>> observable) {
-            return (Observable) this.i.call(observable.G(e.j));
+            return (Observable) this.i.call(observable.F(e.j));
         }
     }
 
diff --git a/app/src/main/java/j0/l/e/f.java b/app/src/main/java/j0/l/e/f.java
index 620609610e..50a154dcea 100644
--- a/app/src/main/java/j0/l/e/f.java
+++ b/app/src/main/java/j0/l/e/f.java
@@ -7,13 +7,13 @@ public final class f<T> {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2843c;
+    public int f2849c;
     public T[] d;
 
     public f() {
         int N = a.N(16);
         this.a = N - 1;
-        this.f2843c = (int) (((float) N) * 0.75f);
+        this.f2849c = (int) (((float) N) * 0.75f);
         this.d = (T[]) new Object[N];
     }
 
@@ -43,7 +43,7 @@ public final class f<T> {
         tArr[b] = t;
         int i2 = this.b + 1;
         this.b = i2;
-        if (i2 >= this.f2843c) {
+        if (i2 >= this.f2849c) {
             T[] tArr2 = this.d;
             int length = tArr2.length;
             int i3 = length << 1;
@@ -67,7 +67,7 @@ public final class f<T> {
                 i2 = i5;
             }
             this.a = i4;
-            this.f2843c = (int) (((float) i3) * 0.75f);
+            this.f2849c = (int) (((float) i3) * 0.75f);
             this.d = tArr3;
         }
         return true;
diff --git a/app/src/main/java/j0/l/e/j.java b/app/src/main/java/j0/l/e/j.java
index 8820c9d308..aadd67296b 100644
--- a/app/src/main/java/j0/l/e/j.java
+++ b/app/src/main/java/j0/l/e/j.java
@@ -65,7 +65,7 @@ public final class j<T> extends Observable<T> {
                 subscriber.setProducer(j.j ? new j0.l.b.c(subscriber, t) : new g(subscriber, t));
                 return;
             }
-            observable.j0(new j0.n.e(subscriber, subscriber));
+            observable.i0(new j0.n.e(subscriber, subscriber));
         }
     }
 
@@ -193,11 +193,11 @@ public final class j<T> extends Observable<T> {
         this.k = t;
     }
 
-    public <R> Observable<R> l0(j0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
-        return Observable.i0(new c(bVar));
+    public <R> Observable<R> k0(j0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
+        return Observable.h0(new c(bVar));
     }
 
-    public Observable<T> m0(Scheduler scheduler) {
-        return Observable.i0(new e(this.k, scheduler instanceof j0.l.c.b ? new a(this, (j0.l.c.b) scheduler) : new b(this, scheduler)));
+    public Observable<T> l0(Scheduler scheduler) {
+        return Observable.h0(new e(this.k, scheduler instanceof j0.l.c.b ? new a(this, (j0.l.c.b) scheduler) : new b(this, scheduler)));
     }
 }
diff --git a/app/src/main/java/j0/l/e/n/t.java b/app/src/main/java/j0/l/e/n/t.java
index 0ec920f8c9..23659fa415 100644
--- a/app/src/main/java/j0/l/e/n/t.java
+++ b/app/src/main/java/j0/l/e/n/t.java
@@ -12,16 +12,16 @@ public class t<E> extends v<E> {
     public static final long r;
 
     /* renamed from: s  reason: collision with root package name */
-    public static final int f2844s;
+    public static final int f2850s;
     public static final Object t = new Object();
 
     static {
         Unsafe unsafe = y.a;
         int arrayIndexScale = unsafe.arrayIndexScale(Object[].class);
         if (4 == arrayIndexScale) {
-            f2844s = 2;
+            f2850s = 2;
         } else if (8 == arrayIndexScale) {
-            f2844s = 3;
+            f2850s = 3;
         } else {
             throw new IllegalStateException("Unknown pointer size");
         }
@@ -56,7 +56,7 @@ public class t<E> extends v<E> {
     }
 
     public static long c(long j) {
-        return r + (j << f2844s);
+        return r + (j << f2850s);
     }
 
     public static long d(long j, long j2) {
diff --git a/app/src/main/java/j0/m/b.java b/app/src/main/java/j0/m/b.java
index 0e3502159b..3d1ea8d26b 100644
--- a/app/src/main/java/j0/m/b.java
+++ b/app/src/main/java/j0/m/b.java
@@ -14,16 +14,16 @@ public final class b<T> {
     }
 
     public T a() {
-        Observable<? extends T> S = this.a.S();
+        Observable<? extends T> R = this.a.R();
         AtomicReference atomicReference = new AtomicReference();
         AtomicReference atomicReference2 = new AtomicReference();
         CountDownLatch countDownLatch = new CountDownLatch(1);
-        Subscription V = S.V(new a(this, countDownLatch, atomicReference2, atomicReference));
+        Subscription U = R.U(new a(this, countDownLatch, atomicReference2, atomicReference));
         if (countDownLatch.getCount() != 0) {
             try {
                 countDownLatch.await();
             } catch (InterruptedException e) {
-                V.unsubscribe();
+                U.unsubscribe();
                 Thread.currentThread().interrupt();
                 throw new IllegalStateException("Interrupted while waiting for subscription to complete.", e);
             }
diff --git a/app/src/main/java/j0/m/c.java b/app/src/main/java/j0/m/c.java
index 3d5c31852c..4ce3bc6fcf 100644
--- a/app/src/main/java/j0/m/c.java
+++ b/app/src/main/java/j0/m/c.java
@@ -9,5 +9,5 @@ public abstract class c<T> extends Observable<T> {
         super(aVar);
     }
 
-    public abstract void l0(Action1<? super Subscription> action1);
+    public abstract void k0(Action1<? super Subscription> action1);
 }
diff --git a/app/src/main/java/j0/o/l.java b/app/src/main/java/j0/o/l.java
index 2eafb18246..96a0d9efb6 100644
--- a/app/src/main/java/j0/o/l.java
+++ b/app/src/main/java/j0/o/l.java
@@ -16,7 +16,7 @@ public final class l {
     public static volatile b<Observable.a, Observable.a> b = new c();
 
     /* renamed from: c  reason: collision with root package name */
-    public static volatile b<h.a, h.a> f2845c = new d();
+    public static volatile b<h.a, h.a> f2851c = new d();
     public static volatile b<d.a, d.a> d = new e();
     public static volatile Func2<Observable, Observable.a, Observable.a> e = new g();
     public static volatile b<Action0, Action0> f = new i();
diff --git a/app/src/main/java/j0/o/o.java b/app/src/main/java/j0/o/o.java
index c1c72a11c0..5ea29f76e9 100644
--- a/app/src/main/java/j0/o/o.java
+++ b/app/src/main/java/j0/o/o.java
@@ -10,7 +10,7 @@ public class o {
     public static final b b = new a();
 
     /* renamed from: c  reason: collision with root package name */
-    public final AtomicReference<b> f2846c = new AtomicReference<>();
+    public final AtomicReference<b> f2852c = new AtomicReference<>();
     public final AtomicReference<m> d = new AtomicReference<>();
     public final AtomicReference<q> e = new AtomicReference<>();
     public final AtomicReference<a> f = new AtomicReference<>();
@@ -88,15 +88,15 @@ public class o {
     }
 
     public b b() {
-        if (this.f2846c.get() == null) {
+        if (this.f2852c.get() == null) {
             Object d = d(b.class, g());
             if (d == null) {
-                this.f2846c.compareAndSet(null, b);
+                this.f2852c.compareAndSet(null, b);
             } else {
-                this.f2846c.compareAndSet(null, (b) d);
+                this.f2852c.compareAndSet(null, (b) d);
             }
         }
-        return this.f2846c.get();
+        return this.f2852c.get();
     }
 
     public m c() {
diff --git a/app/src/main/java/j0/p/a.java b/app/src/main/java/j0/p/a.java
index a164594471..14bd9a5860 100644
--- a/app/src/main/java/j0/p/a.java
+++ b/app/src/main/java/j0/p/a.java
@@ -14,7 +14,7 @@ public final class a {
     public final Scheduler b = new b(new i("RxComputationScheduler-"));
 
     /* renamed from: c  reason: collision with root package name */
-    public final Scheduler f2847c = new j0.l.c.a(new i("RxIoScheduler-"));
+    public final Scheduler f2853c = new j0.l.c.a(new i("RxIoScheduler-"));
     public final Scheduler d = new f(new i("RxNewThreadScheduler-"));
 
     public a() {
@@ -41,7 +41,7 @@ public final class a {
                 if (scheduler instanceof k) {
                     ((k) scheduler).shutdown();
                 }
-                Scheduler scheduler2 = aVar2.f2847c;
+                Scheduler scheduler2 = aVar2.f2853c;
                 if (scheduler2 instanceof k) {
                     ((k) scheduler2).shutdown();
                 }
@@ -54,6 +54,6 @@ public final class a {
     }
 
     public static Scheduler c() {
-        return b().f2847c;
+        return b().f2853c;
     }
 }
diff --git a/app/src/main/java/j0/q/a.java b/app/src/main/java/j0/q/a.java
index bfc7063a36..3126f630d0 100644
--- a/app/src/main/java/j0/q/a.java
+++ b/app/src/main/java/j0/q/a.java
@@ -64,7 +64,7 @@ public final class a<T> extends Subject<T, T> {
         public volatile C0335a<T> b;
 
         /* renamed from: c  reason: collision with root package name */
-        public C0335a<T> f2848c;
+        public C0335a<T> f2854c;
         public int d;
         public volatile boolean e;
         public Throwable f;
@@ -83,7 +83,7 @@ public final class a<T> extends Subject<T, T> {
         public c(int i) {
             this.a = i;
             C0335a<T> aVar = new C0335a<>(null);
-            this.f2848c = aVar;
+            this.f2854c = aVar;
             this.b = aVar;
         }
 
@@ -275,8 +275,8 @@ public final class a<T> extends Subject<T, T> {
             c cVar = (c) aVar;
             Objects.requireNonNull(cVar);
             c.C0335a<T> aVar2 = new c.C0335a<>(t);
-            cVar.f2848c.set(aVar2);
-            cVar.f2848c = aVar2;
+            cVar.f2854c.set(aVar2);
+            cVar.f2854c = aVar2;
             int i2 = cVar.d;
             if (i2 == cVar.a) {
                 cVar.b = cVar.b.get();
diff --git a/app/src/main/java/j0/q/c.java b/app/src/main/java/j0/q/c.java
index 932dbe15cf..4965ccd3c8 100644
--- a/app/src/main/java/j0/q/c.java
+++ b/app/src/main/java/j0/q/c.java
@@ -24,7 +24,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
         public static final a b;
 
         /* renamed from: c  reason: collision with root package name */
-        public static final a f2849c;
+        public static final a f2855c;
         public final boolean d;
         public final b[] e;
 
@@ -32,7 +32,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
             b[] bVarArr = new b[0];
             a = bVarArr;
             b = new a(true, bVarArr);
-            f2849c = new a(false, bVarArr);
+            f2855c = new a(false, bVarArr);
         }
 
         public a(boolean z2, b[] bVarArr) {
@@ -87,7 +87,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
     }
 
     public c() {
-        super(a.f2849c);
+        super(a.f2855c);
         a.C0318a aVar = j0.k.a.a;
         this.onStart = aVar;
         this.onAdded = aVar;
@@ -103,7 +103,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
                 b<T>[] bVarArr = aVar.e;
                 int length = bVarArr.length;
                 if (length == 1 && bVarArr[0] == bVar) {
-                    aVar2 = a.f2849c;
+                    aVar2 = a.f2855c;
                 } else {
                     if (length != 0) {
                         int i = length - 1;
@@ -122,7 +122,7 @@ public final class c<T> extends AtomicReference<a<T>> implements Observable.a<T>
                                 }
                                 i2++;
                             } else if (i3 == 0) {
-                                aVar2 = a.f2849c;
+                                aVar2 = a.f2855c;
                             } else {
                                 if (i3 < i) {
                                     b[] bVarArr3 = new b[i3];
diff --git a/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java b/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
index 544df45d56..59f6322d49 100644
--- a/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
+++ b/app/src/main/java/kotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream.java
@@ -12,7 +12,7 @@ public final class CodedOutputStream {
     public final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2850c;
+    public int f2856c;
     public int d = 0;
     public final OutputStream e;
 
@@ -25,7 +25,7 @@ public final class CodedOutputStream {
     public CodedOutputStream(OutputStream outputStream, byte[] bArr) {
         this.e = outputStream;
         this.a = bArr;
-        this.f2850c = 0;
+        this.f2856c = 0;
         this.b = bArr.length;
     }
 
@@ -211,8 +211,8 @@ public final class CodedOutputStream {
     public final void a() throws IOException {
         OutputStream outputStream = this.e;
         if (outputStream != null) {
-            outputStream.write(this.a, 0, this.f2850c);
-            this.f2850c = 0;
+            outputStream.write(this.a, 0, this.f2856c);
+            this.f2856c = 0;
             return;
         }
         throw new OutOfSpaceException();
@@ -328,12 +328,12 @@ public final class CodedOutputStream {
     }
 
     public void writeRawByte(byte b) throws IOException {
-        if (this.f2850c == this.b) {
+        if (this.f2856c == this.b) {
             a();
         }
         byte[] bArr = this.a;
-        int i = this.f2850c;
-        this.f2850c = i + 1;
+        int i = this.f2856c;
+        this.f2856c = i + 1;
         bArr[i] = b;
         this.d++;
     }
@@ -348,10 +348,10 @@ public final class CodedOutputStream {
 
     public void writeRawBytes(c cVar, int i, int i2) throws IOException {
         int i3 = this.b;
-        int i4 = this.f2850c;
+        int i4 = this.f2856c;
         if (i3 - i4 >= i2) {
             cVar.copyTo(this.a, i, i4, i2);
-            this.f2850c += i2;
+            this.f2856c += i2;
             this.d += i2;
             return;
         }
@@ -359,12 +359,12 @@ public final class CodedOutputStream {
         cVar.copyTo(this.a, i, i4, i5);
         int i6 = i + i5;
         int i7 = i2 - i5;
-        this.f2850c = this.b;
+        this.f2856c = this.b;
         this.d += i5;
         a();
         if (i7 <= this.b) {
             cVar.copyTo(this.a, i6, 0, i7);
-            this.f2850c = i7;
+            this.f2856c = i7;
         } else {
             OutputStream outputStream = this.e;
             if (i6 < 0) {
@@ -389,10 +389,10 @@ public final class CodedOutputStream {
 
     public void writeRawBytes(byte[] bArr, int i, int i2) throws IOException {
         int i3 = this.b;
-        int i4 = this.f2850c;
+        int i4 = this.f2856c;
         if (i3 - i4 >= i2) {
             System.arraycopy(bArr, i, this.a, i4, i2);
-            this.f2850c += i2;
+            this.f2856c += i2;
             this.d += i2;
             return;
         }
@@ -400,12 +400,12 @@ public final class CodedOutputStream {
         System.arraycopy(bArr, i, this.a, i4, i5);
         int i6 = i + i5;
         int i7 = i2 - i5;
-        this.f2850c = this.b;
+        this.f2856c = this.b;
         this.d += i5;
         a();
         if (i7 <= this.b) {
             System.arraycopy(bArr, i6, this.a, 0, i7);
-            this.f2850c = i7;
+            this.f2856c = i7;
         } else {
             this.e.write(bArr, i6, i7);
         }
diff --git a/app/src/main/java/okhttp3/MediaType.java b/app/src/main/java/okhttp3/MediaType.java
index 73b6f5bac8..8cc1bc7d6e 100644
--- a/app/src/main/java/okhttp3/MediaType.java
+++ b/app/src/main/java/okhttp3/MediaType.java
@@ -18,7 +18,7 @@ public final class MediaType {
     public static final Pattern b = Pattern.compile(";\\s*(?:([a-zA-Z0-9-!#$%&'*+.^_`{|}~]+)=(?:([a-zA-Z0-9-!#$%&'*+.^_`{|}~]+)|\"([^\"]*)\"))?");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final a f2851c = null;
+    public static final a f2857c = null;
     public final String d;
     public final String e;
     public final String f;
diff --git a/app/src/main/java/okhttp3/MultipartBody.java b/app/src/main/java/okhttp3/MultipartBody.java
index e1827af3f7..43e5c55272 100644
--- a/app/src/main/java/okhttp3/MultipartBody.java
+++ b/app/src/main/java/okhttp3/MultipartBody.java
@@ -19,7 +19,7 @@ public final class MultipartBody extends RequestBody {
     public static final MediaType b = MediaType.a.a("multipart/form-data");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final byte[] f2852c = {(byte) 58, (byte) 32};
+    public static final byte[] f2858c = {(byte) 58, (byte) 32};
     public static final byte[] d = {(byte) 13, (byte) 10};
     public static final byte[] e;
     public static final b f = new b(null);
@@ -97,7 +97,7 @@ public final class MultipartBody extends RequestBody {
         public MediaType b = MultipartBody.a;
 
         /* renamed from: c  reason: collision with root package name */
-        public final List<Part> f2853c = new ArrayList();
+        public final List<Part> f2859c = new ArrayList();
 
         public a() {
             String uuid = UUID.randomUUID().toString();
@@ -108,13 +108,13 @@ public final class MultipartBody extends RequestBody {
 
         public final a a(Part part) {
             m.checkParameterIsNotNull(part, "part");
-            this.f2853c.add(part);
+            this.f2859c.add(part);
             return this;
         }
 
         public final MultipartBody b() {
-            if (!this.f2853c.isEmpty()) {
-                return new MultipartBody(this.a, this.b, c.z(this.f2853c));
+            if (!this.f2859c.isEmpty()) {
+                return new MultipartBody(this.a, this.b, c.z(this.f2859c));
             }
             throw new IllegalStateException("Multipart body must have at least one part.".toString());
         }
@@ -156,7 +156,7 @@ public final class MultipartBody extends RequestBody {
     }
 
     static {
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
         MediaType.a.a("multipart/alternative");
         MediaType.a.a("multipart/digest");
         MediaType.a.a("multipart/parallel");
@@ -171,7 +171,7 @@ public final class MultipartBody extends RequestBody {
         this.i = byteString;
         this.j = mediaType;
         this.k = list;
-        MediaType.a aVar = MediaType.f2851c;
+        MediaType.a aVar = MediaType.f2857c;
         this.g = MediaType.a.a(mediaType + "; boundary=" + byteString.q());
     }
 
@@ -202,7 +202,7 @@ public final class MultipartBody extends RequestBody {
             if (headers != null) {
                 int size2 = headers.size();
                 for (int i2 = 0; i2 < size2; i2++) {
-                    bufferedSink.J(headers.d(i2)).write(f2852c).J(headers.g(i2)).write(d);
+                    bufferedSink.J(headers.d(i2)).write(f2858c).J(headers.g(i2)).write(d);
                 }
             }
             MediaType contentType = requestBody.contentType();
diff --git a/app/src/main/java/okhttp3/RequestBody.java b/app/src/main/java/okhttp3/RequestBody.java
index 3c7085fb30..f9fe98ba53 100644
--- a/app/src/main/java/okhttp3/RequestBody.java
+++ b/app/src/main/java/okhttp3/RequestBody.java
@@ -26,19 +26,19 @@ public abstract class RequestBody {
             public final /* synthetic */ MediaType b;
 
             /* renamed from: c  reason: collision with root package name */
-            public final /* synthetic */ int f2854c;
+            public final /* synthetic */ int f2860c;
             public final /* synthetic */ int d;
 
             public a(byte[] bArr, MediaType mediaType, int i, int i2) {
                 this.a = bArr;
                 this.b = mediaType;
-                this.f2854c = i;
+                this.f2860c = i;
                 this.d = i2;
             }
 
             @Override // okhttp3.RequestBody
             public long contentLength() {
-                return (long) this.f2854c;
+                return (long) this.f2860c;
             }
 
             @Override // okhttp3.RequestBody
@@ -49,7 +49,7 @@ public abstract class RequestBody {
             @Override // okhttp3.RequestBody
             public void writeTo(BufferedSink bufferedSink) {
                 m.checkParameterIsNotNull(bufferedSink, "sink");
-                bufferedSink.write(this.a, this.d, this.f2854c);
+                bufferedSink.write(this.a, this.d, this.f2860c);
             }
         }
 
@@ -91,7 +91,7 @@ public abstract class RequestBody {
                 Pattern pattern = MediaType.a;
                 Charset a2 = mediaType.a(null);
                 if (a2 == null) {
-                    MediaType.a aVar = MediaType.f2851c;
+                    MediaType.a aVar = MediaType.f2857c;
                     mediaType = MediaType.a.b(mediaType + "; charset=utf-8");
                 } else {
                     charset = a2;
diff --git a/app/src/main/java/okhttp3/Response.java b/app/src/main/java/okhttp3/Response.java
index 0e0711a704..69e8c8d9d9 100644
--- a/app/src/main/java/okhttp3/Response.java
+++ b/app/src/main/java/okhttp3/Response.java
@@ -22,7 +22,7 @@ public final class Response implements Closeable {
     public final Response r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final long f2855s;
+    public final long f2861s;
     public final long t;
     public final c u;
 
@@ -32,7 +32,7 @@ public final class Response implements Closeable {
         public y b;
 
         /* renamed from: c  reason: collision with root package name */
-        public int f2856c;
+        public int f2862c;
         public String d;
         public v e;
         public Headers.a f;
@@ -45,16 +45,16 @@ public final class Response implements Closeable {
         public c m;
 
         public a() {
-            this.f2856c = -1;
+            this.f2862c = -1;
             this.f = new Headers.a();
         }
 
         public a(Response response) {
             m.checkParameterIsNotNull(response, "response");
-            this.f2856c = -1;
+            this.f2862c = -1;
             this.a = response.i;
             this.b = response.j;
-            this.f2856c = response.l;
+            this.f2862c = response.l;
             this.d = response.k;
             this.e = response.m;
             this.f = response.n.e();
@@ -62,13 +62,13 @@ public final class Response implements Closeable {
             this.h = response.p;
             this.i = response.q;
             this.j = response.r;
-            this.k = response.f2855s;
+            this.k = response.f2861s;
             this.l = response.t;
             this.m = response.u;
         }
 
         public Response a() {
-            int i = this.f2856c;
+            int i = this.f2862c;
             if (i >= 0) {
                 z zVar = this.a;
                 if (zVar != null) {
@@ -85,7 +85,7 @@ public final class Response implements Closeable {
                 throw new IllegalStateException("request == null".toString());
             }
             StringBuilder L = c.d.b.a.a.L("code < 0: ");
-            L.append(this.f2856c);
+            L.append(this.f2862c);
             throw new IllegalStateException(L.toString().toString());
         }
 
@@ -157,7 +157,7 @@ public final class Response implements Closeable {
         this.p = response;
         this.q = response2;
         this.r = response3;
-        this.f2855s = j;
+        this.f2861s = j;
         this.t = j2;
         this.u = cVar;
     }
diff --git a/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java b/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java
index 6794627232..0614571f0d 100644
--- a/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java
+++ b/app/src/main/java/okhttp3/internal/publicsuffix/PublicSuffixDatabase.java
@@ -28,7 +28,7 @@ public final class PublicSuffixDatabase {
     public static final List<String> b = m.listOf("*");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final PublicSuffixDatabase f2857c = new PublicSuffixDatabase();
+    public static final PublicSuffixDatabase f2863c = new PublicSuffixDatabase();
     public static final a d = new a(null);
     public final AtomicBoolean e = new AtomicBoolean(false);
     public final CountDownLatch f = new CountDownLatch(1);
@@ -153,7 +153,7 @@ public final class PublicSuffixDatabase {
                     Thread.interrupted();
                     z2 = true;
                 } catch (IOException e) {
-                    h.a aVar = h.f2731c;
+                    h.a aVar = h.f2737c;
                     h.a.i("Failed to read public suffix list", 5, e);
                     if (z2) {
                         Thread.currentThread().interrupt();
diff --git a/app/src/main/java/org/webrtc/DataChannel.java b/app/src/main/java/org/webrtc/DataChannel.java
index d967a1f349..73ade6d607 100644
--- a/app/src/main/java/org/webrtc/DataChannel.java
+++ b/app/src/main/java/org/webrtc/DataChannel.java
@@ -19,7 +19,7 @@ public class DataChannel {
     public static class Init {
 
         /* renamed from: id  reason: collision with root package name */
-        public int f2858id = -1;
+        public int f2864id = -1;
         public int maxRetransmitTimeMs = -1;
         public int maxRetransmits = -1;
         public boolean negotiated;
@@ -28,7 +28,7 @@ public class DataChannel {
 
         @CalledByNative("Init")
         public int getId() {
-            return this.f2858id;
+            return this.f2864id;
         }
 
         @CalledByNative("Init")
diff --git a/app/src/main/java/org/webrtc/RTCStats.java b/app/src/main/java/org/webrtc/RTCStats.java
index 27dd200fec..dff91e4d8b 100644
--- a/app/src/main/java/org/webrtc/RTCStats.java
+++ b/app/src/main/java/org/webrtc/RTCStats.java
@@ -5,7 +5,7 @@ import java.util.Map;
 public class RTCStats {
 
     /* renamed from: id  reason: collision with root package name */
-    private final String f2859id;
+    private final String f2865id;
     private final Map<String, Object> members;
     private final long timestampUs;
     private final String type;
@@ -13,7 +13,7 @@ public class RTCStats {
     public RTCStats(long j, String str, String str2, Map<String, Object> map) {
         this.timestampUs = j;
         this.type = str;
-        this.f2859id = str2;
+        this.f2865id = str2;
         this.members = map;
     }
 
@@ -43,7 +43,7 @@ public class RTCStats {
     }
 
     public String getId() {
-        return this.f2859id;
+        return this.f2865id;
     }
 
     public Map<String, Object> getMembers() {
@@ -64,7 +64,7 @@ public class RTCStats {
         L.append(", type: ");
         L.append(this.type);
         L.append(", id: ");
-        L.append(this.f2859id);
+        L.append(this.f2865id);
         for (Map.Entry<String, Object> entry : this.members.entrySet()) {
             L.append(", ");
             L.append(entry.getKey());
diff --git a/app/src/main/java/org/webrtc/RtpParameters.java b/app/src/main/java/org/webrtc/RtpParameters.java
index 01a2933c31..452193a24b 100644
--- a/app/src/main/java/org/webrtc/RtpParameters.java
+++ b/app/src/main/java/org/webrtc/RtpParameters.java
@@ -173,13 +173,13 @@ public class RtpParameters {
         private final boolean encrypted;
 
         /* renamed from: id  reason: collision with root package name */
-        private final int f2860id;
+        private final int f2866id;
         private final String uri;
 
         @CalledByNative("HeaderExtension")
         public HeaderExtension(String str, int i, boolean z2) {
             this.uri = str;
-            this.f2860id = i;
+            this.f2866id = i;
             this.encrypted = z2;
         }
 
@@ -190,7 +190,7 @@ public class RtpParameters {
 
         @CalledByNative("HeaderExtension")
         public int getId() {
-            return this.f2860id;
+            return this.f2866id;
         }
 
         @CalledByNative("HeaderExtension")
diff --git a/app/src/main/java/org/webrtc/StatsReport.java b/app/src/main/java/org/webrtc/StatsReport.java
index 7a7711267e..cc1c1a4a14 100644
--- a/app/src/main/java/org/webrtc/StatsReport.java
+++ b/app/src/main/java/org/webrtc/StatsReport.java
@@ -4,7 +4,7 @@ import c.d.b.a.a;
 public class StatsReport {
 
     /* renamed from: id  reason: collision with root package name */
-    public final String f2861id;
+    public final String f2867id;
     public final double timestamp;
     public final String type;
     public final Value[] values;
@@ -29,7 +29,7 @@ public class StatsReport {
 
     @CalledByNative
     public StatsReport(String str, String str2, double d, Value[] valueArr) {
-        this.f2861id = str;
+        this.f2867id = str;
         this.type = str2;
         this.timestamp = d;
         this.values = valueArr;
@@ -37,7 +37,7 @@ public class StatsReport {
 
     public String toString() {
         StringBuilder L = a.L("id: ");
-        L.append(this.f2861id);
+        L.append(this.f2867id);
         L.append(", type: ");
         L.append(this.type);
         L.append(", timestamp: ");
diff --git a/app/src/main/java/org/webrtc/TextureBufferImpl.java b/app/src/main/java/org/webrtc/TextureBufferImpl.java
index ae9c7a92e1..9634a4a324 100644
--- a/app/src/main/java/org/webrtc/TextureBufferImpl.java
+++ b/app/src/main/java/org/webrtc/TextureBufferImpl.java
@@ -10,7 +10,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
     private final int height;
 
     /* renamed from: id  reason: collision with root package name */
-    private final int f2862id;
+    private final int f2868id;
     private final RefCountDelegate refCountDelegate;
     private final RefCountMonitor refCountMonitor;
     private final Handler toI420Handler;
@@ -81,7 +81,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
         this.width = i3;
         this.height = i4;
         this.type = type;
-        this.f2862id = i5;
+        this.f2868id = i5;
         this.transformMatrix = matrix;
         this.toI420Handler = handler;
         this.yuvConverter = yuvConverter;
@@ -105,7 +105,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
         Matrix matrix2 = new Matrix(this.transformMatrix);
         matrix2.preConcat(matrix);
         retain();
-        return new TextureBufferImpl(i, i2, i3, i4, this.type, this.f2862id, matrix2, this.toI420Handler, this.yuvConverter, new AnonymousClass2());
+        return new TextureBufferImpl(i, i2, i3, i4, this.type, this.f2868id, matrix2, this.toI420Handler, this.yuvConverter, new AnonymousClass2());
     }
 
     public /* synthetic */ VideoFrame.I420Buffer a() {
@@ -132,7 +132,7 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
 
     @Override // org.webrtc.VideoFrame.TextureBuffer
     public int getTextureId() {
-        return this.f2862id;
+        return this.f2868id;
     }
 
     public Handler getToI420Handler() {
diff --git a/app/src/main/java/rx/Observable.java b/app/src/main/java/rx/Observable.java
index d732f8efac..9b3e4d361f 100644
--- a/app/src/main/java/rx/Observable.java
+++ b/app/src/main/java/rx/Observable.java
@@ -91,40 +91,40 @@ public class Observable<T> {
         this.i = aVar;
     }
 
-    public static <T> Observable<T> B(Iterable<? extends T> iterable) {
-        return i0(new q(iterable));
+    public static <T> Observable<T> A(Iterable<? extends T> iterable) {
+        return h0(new q(iterable));
     }
 
-    public static <T> Observable<T> C(T[] tArr) {
+    public static <T> Observable<T> B(T[] tArr) {
         int length = tArr.length;
-        return length == 0 ? (Observable<T>) j0.l.a.c.j : length == 1 ? new j(tArr[0]) : i0(new o(tArr));
+        return length == 0 ? (Observable<T>) j0.l.a.c.j : length == 1 ? new j(tArr[0]) : h0(new o(tArr));
     }
 
-    public static <T> Observable<T> D(Callable<? extends T> callable) {
-        return i0(new p(callable));
+    public static <T> Observable<T> C(Callable<? extends T> callable) {
+        return h0(new p(callable));
     }
 
-    public static Observable<Long> E(long j, long j2, TimeUnit timeUnit) {
-        return F(j, j2, timeUnit, j0.p.a.a());
+    public static Observable<Long> D(long j, long j2, TimeUnit timeUnit) {
+        return E(j, j2, timeUnit, j0.p.a.a());
     }
 
-    public static Observable<Long> F(long j, long j2, TimeUnit timeUnit, Scheduler scheduler) {
-        return i0(new k0(j, j2, timeUnit, scheduler));
+    public static Observable<Long> E(long j, long j2, TimeUnit timeUnit, Scheduler scheduler) {
+        return h0(new k0(j, j2, timeUnit, scheduler));
     }
 
-    public static <T> Observable<T> H(Observable<? extends Observable<? extends T>> observable) {
+    public static <T> Observable<T> G(Observable<? extends Observable<? extends T>> observable) {
         if (observable.getClass() == j.class) {
-            return ((j) observable).l0(l.INSTANCE);
+            return ((j) observable).k0(l.INSTANCE);
         }
-        return i0(new r(observable.i, x0.b.a));
+        return h0(new r(observable.i, x0.b.a));
     }
 
-    public static <T> Observable<T> I(Observable<? extends T> observable, Observable<? extends T> observable2) {
-        return H(C(new Observable[]{observable, observable2}));
+    public static <T> Observable<T> H(Observable<? extends T> observable, Observable<? extends T> observable2) {
+        return G(B(new Observable[]{observable, observable2}));
     }
 
     public static <T, R> Observable<R> b(List<? extends Observable<? extends T>> list, FuncN<? extends R> funcN) {
-        return i0(new f(list, funcN));
+        return h0(new f(list, funcN));
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> c(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Observable<? extends T8> observable8, Observable<? extends T9> observable9, Func9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> func9) {
@@ -135,22 +135,22 @@ public class Observable<T> {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8), new j0.k.j(func8));
     }
 
+    public static Observable<Long> d0(long j, TimeUnit timeUnit) {
+        return e0(j, timeUnit, j0.p.a.a());
+    }
+
     public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> e(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Observable<? extends T7> observable7, Func7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> func7) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6, observable7), new i(func7));
     }
 
-    public static Observable<Long> e0(long j, TimeUnit timeUnit) {
-        return f0(j, timeUnit, j0.p.a.a());
+    public static Observable<Long> e0(long j, TimeUnit timeUnit, Scheduler scheduler) {
+        return h0(new i0(j, timeUnit, scheduler));
     }
 
     public static <T1, T2, T3, T4, T5, T6, R> Observable<R> f(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Observable<? extends T6> observable6, Func6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> func6) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5, observable6), new h(func6));
     }
 
-    public static Observable<Long> f0(long j, TimeUnit timeUnit, Scheduler scheduler) {
-        return i0(new i0(j, timeUnit, scheduler));
-    }
-
     public static <T1, T2, T3, T4, T5, R> Observable<R> g(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Observable<? extends T4> observable4, Observable<? extends T5> observable5, Func5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> func5) {
         return b(Arrays.asList(observable, observable2, observable3, observable4, observable5), new g(func5));
     }
@@ -159,75 +159,69 @@ public class Observable<T> {
         return b(Arrays.asList(observable, observable2, observable3, observable4), new j0.k.f(func4));
     }
 
-    public static <T1, T2, T3, R> Observable<R> i(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Func3<? super T1, ? super T2, ? super T3, ? extends R> func3) {
-        return b(Arrays.asList(observable, observable2, observable3), new e(func3));
+    public static <T> Observable<T> h0(a<T> aVar) {
+        return new Observable<>(j0.o.l.a(aVar));
     }
 
-    public static <T> Observable<T> i0(a<T> aVar) {
-        return new Observable<>(j0.o.l.a(aVar));
+    public static <T1, T2, T3, R> Observable<R> i(Observable<? extends T1> observable, Observable<? extends T2> observable2, Observable<? extends T3> observable3, Func3<? super T1, ? super T2, ? super T3, ? extends R> func3) {
+        return b(Arrays.asList(observable, observable2, observable3), new e(func3));
     }
 
     public static <T1, T2, R> Observable<R> j(Observable<? extends T1> observable, Observable<? extends T2> observable2, Func2<? super T1, ? super T2, ? extends R> func2) {
         return b(Arrays.asList(observable, observable2), new d(func2));
     }
 
-    public static <T1, T2, R> Observable<R> k0(Observable<? extends T1> observable, Observable<? extends T2> observable2, Func2<? super T1, ? super T2, ? extends R> func2) {
-        return i0(new r(new j(new Observable[]{observable, observable2}).i, new r2(func2)));
+    public static <T1, T2, R> Observable<R> j0(Observable<? extends T1> observable, Observable<? extends T2> observable2, Func2<? super T1, ? super T2, ? extends R> func2) {
+        return h0(new r(new j(new Observable[]{observable, observable2}).i, new r2(func2)));
     }
 
     public static <T> Observable<T> l(Observable<? extends Observable<? extends T>> observable) {
         l lVar = l.INSTANCE;
         Objects.requireNonNull(observable);
-        return observable instanceof j ? ((j) observable).l0(lVar) : i0(new j0.l.a.h(observable, lVar, 2, 0));
+        return observable instanceof j ? ((j) observable).k0(lVar) : h0(new j0.l.a.h(observable, lVar, 2, 0));
     }
 
     public static <T> Observable<T> m(Observable<? extends T> observable, Observable<? extends T> observable2) {
-        return l(C(new Object[]{observable, observable2}));
+        return l(B(new Object[]{observable, observable2}));
     }
 
     public static <T> Observable<T> n(Action1<Emitter<T>> action1, Emitter.BackpressureMode backpressureMode) {
-        return i0(new j0.l.a.i(action1, backpressureMode));
+        return h0(new j0.l.a.i(action1, backpressureMode));
     }
 
     public static <T> Observable<T> p(Func0<Observable<T>> func0) {
-        return i0(new j0.l.a.j(func0));
+        return h0(new j0.l.a.j(func0));
     }
 
-    public static <T> Observable<T> x(Throwable th) {
-        return i0(new f0(th));
+    public static <T> Observable<T> w(Throwable th) {
+        return h0(new f0(th));
     }
 
-    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: j0.k.b<? super T, ? extends rx.Observable<? extends R>> */
-    /* JADX WARN: Multi-variable type inference failed */
-    public final <R> Observable<R> A(j0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
-        return getClass() == j.class ? ((j) this).l0(bVar) : H(G(bVar));
+    public final <R> Observable<R> F(j0.k.b<? super T, ? extends R> bVar) {
+        return h0(new s(this, bVar));
     }
 
-    public final <R> Observable<R> G(j0.k.b<? super T, ? extends R> bVar) {
-        return i0(new s(this, bVar));
-    }
-
-    public final Observable<T> J(Scheduler scheduler) {
+    public final Observable<T> I(Scheduler scheduler) {
         int i = j0.l.e.h.i;
         if (this instanceof j) {
-            return ((j) this).m0(scheduler);
+            return ((j) this).l0(scheduler);
         }
-        return i0(new r(this.i, new z0(scheduler, false, i)));
+        return h0(new r(this.i, new z0(scheduler, false, i)));
+    }
+
+    public final Observable<T> J() {
+        return h0(new r(this.i, a1.b.a));
     }
 
     public final Observable<T> K() {
-        return i0(new r(this.i, a1.b.a));
+        return h0(new r(this.i, b1.a.a));
     }
 
-    public final Observable<T> L() {
-        return i0(new r(this.i, b1.a.a));
+    public final Observable<T> L(j0.k.b<? super Throwable, ? extends T> bVar) {
+        return h0(new r(this.i, new f1(new c1(bVar))));
     }
 
-    public final Observable<T> M(j0.k.b<? super Throwable, ? extends T> bVar) {
-        return i0(new r(this.i, new f1(new c1(bVar))));
-    }
-
-    public final j0.m.c<T> N(int i) {
+    public final j0.m.c<T> M(int i) {
         if (i == Integer.MAX_VALUE) {
             Func0 func0 = j1.j;
             AtomicReference atomicReference = new AtomicReference();
@@ -238,41 +232,41 @@ public class Observable<T> {
         return new j1(new l1(atomicReference2, k1Var), this, atomicReference2, k1Var);
     }
 
-    public final Observable<T> O(j0.k.b<? super Observable<? extends Throwable>, ? extends Observable<?>> bVar) {
+    public final Observable<T> N(j0.k.b<? super Observable<? extends Throwable>, ? extends Observable<?>> bVar) {
         e.d dVar = new e.d(bVar);
         AtomicReference<j0.p.a> atomicReference = j0.p.a.a;
-        return i0(new y(this, dVar, true, false, m.a));
+        return h0(new y(this, dVar, true, false, m.a));
     }
 
-    public final Observable<T> P(long j, TimeUnit timeUnit) {
-        return i0(new r(this.i, new n1(j, timeUnit, j0.p.a.a())));
+    public final Observable<T> O(long j, TimeUnit timeUnit) {
+        return h0(new r(this.i, new n1(j, timeUnit, j0.p.a.a())));
     }
 
-    public final <R> Observable<R> Q(R r, Func2<R, ? super T, R> func2) {
-        return i0(new r(this.i, new o1(r, func2)));
+    public final <R> Observable<R> P(R r, Func2<R, ? super T, R> func2) {
+        return h0(new r(this.i, new o1(r, func2)));
+    }
+
+    public final Observable<T> Q() {
+        AtomicReference atomicReference = new AtomicReference();
+        return h0(new c0(new h1(new g1(atomicReference), this, atomicReference)));
     }
 
     public final Observable<T> R() {
-        AtomicReference atomicReference = new AtomicReference();
-        return i0(new c0(new h1(new g1(atomicReference), this, atomicReference)));
+        return h0(new r(this.i, r1.a.a));
     }
 
-    public final Observable<T> S() {
-        return i0(new r(this.i, r1.a.a));
+    public final Observable<T> S(int i) {
+        return h0(new r(this.i, new t1(i)));
     }
 
-    public final Observable<T> T(int i) {
-        return i0(new r(this.i, new t1(i)));
-    }
-
-    public final Observable<T> U(Func2<? super T, ? super T, Integer> func2) {
-        Observable i02 = i0(new r(this.i, new o2(func2, 10)));
+    public final Observable<T> T(Func2<? super T, ? super T, Integer> func2) {
+        Observable h02 = h0(new r(this.i, new o2(func2, 10)));
         l lVar = l.INSTANCE;
-        return i02 instanceof j ? i0(new n.b(((j) i02).k, lVar)) : i0(new n(i02, lVar, j0.l.e.h.i));
+        return h02 instanceof j ? h0(new n.b(((j) h02).k, lVar)) : h0(new n(h02, lVar, j0.l.e.h.i));
     }
 
     /* JADX WARN: Multi-variable type inference failed */
-    public final Subscription V(Subscriber<? super T> subscriber) {
+    public final Subscription U(Subscriber<? super T> subscriber) {
         if (subscriber == null) {
             throw new IllegalArgumentException("subscriber can not be null");
         } else if (this.i != null) {
@@ -304,60 +298,60 @@ public class Observable<T> {
         }
     }
 
-    public final Subscription W(Action1<? super T> action1) {
-        return V(new j0.l.e.b(action1, j0.l.e.e.k, j0.k.a.a));
+    public final Subscription V(Action1<? super T> action1) {
+        return U(new j0.l.e.b(action1, j0.l.e.e.k, j0.k.a.a));
     }
 
-    public final Subscription X(Action1<? super T> action1, Action1<Throwable> action12) {
+    public final Subscription W(Action1<? super T> action1, Action1<Throwable> action12) {
         if (action1 == null) {
             throw new IllegalArgumentException("onNext can not be null");
         } else if (action12 != null) {
-            return V(new j0.l.e.b(action1, action12, j0.k.a.a));
+            return U(new j0.l.e.b(action1, action12, j0.k.a.a));
         } else {
             throw new IllegalArgumentException("onError can not be null");
         }
     }
 
-    public final Observable<T> Y(Scheduler scheduler) {
-        return this instanceof j ? ((j) this).m0(scheduler) : i0(new x1(this, scheduler, !(this.i instanceof j0.l.a.i)));
+    public final Observable<T> X(Scheduler scheduler) {
+        return this instanceof j ? ((j) this).l0(scheduler) : h0(new x1(this, scheduler, !(this.i instanceof j0.l.a.i)));
     }
 
     /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: j0.k.b<? super T, ? extends rx.Observable<? extends R>> */
     /* JADX WARN: Multi-variable type inference failed */
-    public final <R> Observable<R> Z(j0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
-        Observable<R> G = G(bVar);
-        return i0(new r(G.i, y1.a.a));
+    public final <R> Observable<R> Y(j0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
+        Observable<R> F = F(bVar);
+        return h0(new r(F.i, y1.a.a));
+    }
+
+    public final Observable<T> Z(int i) {
+        return h0(new r(this.i, new c2(i)));
     }
 
     public final Observable<List<T>> a(long j, TimeUnit timeUnit) {
-        return i0(new r(this.i, new n0(j, j, timeUnit, Integer.MAX_VALUE, j0.p.a.a())));
+        return h0(new r(this.i, new n0(j, j, timeUnit, Integer.MAX_VALUE, j0.p.a.a())));
     }
 
-    public final Observable<T> a0(int i) {
-        return i0(new r(this.i, new c2(i)));
+    public final <E> Observable<T> a0(Observable<? extends E> observable) {
+        return h0(new r(this.i, new f2(observable)));
     }
 
-    public final <E> Observable<T> b0(Observable<? extends E> observable) {
-        return i0(new r(this.i, new f2(observable)));
+    public final Observable<T> b0(j0.k.b<? super T, Boolean> bVar) {
+        return h0(new r(this.i, new h2(bVar)));
     }
 
-    public final Observable<T> c0(j0.k.b<? super T, Boolean> bVar) {
-        return i0(new r(this.i, new h2(bVar)));
+    public final Observable<T> c0(long j, TimeUnit timeUnit) {
+        return h0(new g0(this, j, timeUnit, j0.p.a.a(), null));
     }
 
-    public final Observable<T> d0(long j, TimeUnit timeUnit) {
-        return i0(new g0(this, j, timeUnit, j0.p.a.a(), null));
+    public final Observable<List<T>> f0() {
+        return h0(new r(this.i, n2.a.a));
     }
 
-    public final Observable<List<T>> g0() {
-        return i0(new r(this.i, n2.a.a));
+    public final <K, V> Observable<Map<K, V>> g0(j0.k.b<? super T, ? extends K> bVar, j0.k.b<? super T, ? extends V> bVar2) {
+        return h0(new l0(this, bVar, bVar2));
     }
 
-    public final <K, V> Observable<Map<K, V>> h0(j0.k.b<? super T, ? extends K> bVar, j0.k.b<? super T, ? extends V> bVar2) {
-        return i0(new l0(this, bVar, bVar2));
-    }
-
-    public final Subscription j0(Subscriber<? super T> subscriber) {
+    public final Subscription i0(Subscriber<? super T> subscriber) {
         try {
             subscriber.onStart();
             a aVar = this.i;
@@ -384,44 +378,46 @@ public class Observable<T> {
     }
 
     public final Observable<T> o(long j, TimeUnit timeUnit) {
-        return i0(new r(this.i, new q0(j, timeUnit, j0.p.a.a())));
+        return h0(new r(this.i, new q0(j, timeUnit, j0.p.a.a())));
     }
 
     public final Observable<T> q(long j, TimeUnit timeUnit) {
-        return r(j, timeUnit, j0.p.a.a());
+        return h0(new r(this.i, new s0(j, timeUnit, j0.p.a.a())));
     }
 
-    public final Observable<T> r(long j, TimeUnit timeUnit, Scheduler scheduler) {
-        return i0(new r(this.i, new s0(j, timeUnit, scheduler)));
+    public final Observable<T> r() {
+        return h0(new r(this.i, u0.a.a));
     }
 
-    public final Observable<T> s() {
-        return i0(new r(this.i, u0.a.a));
-    }
-
-    public final Observable<T> t(Action1<? super Throwable> action1) {
+    public final Observable<T> s(Action1<? super Throwable> action1) {
         a.C0318a aVar = j0.k.a.a;
-        return i0(new k(this, new j0.l.e.a(aVar, action1, aVar)));
+        return h0(new k(this, new j0.l.e.a(aVar, action1, aVar)));
     }
 
-    public final Observable<T> u(Action1<? super T> action1) {
+    public final Observable<T> t(Action1<? super T> action1) {
         a.C0318a aVar = j0.k.a.a;
-        return i0(new k(this, new j0.l.e.a(action1, aVar, aVar)));
+        return h0(new k(this, new j0.l.e.a(action1, aVar, aVar)));
+    }
+
+    public final Observable<T> u(Action0 action0) {
+        return h0(new r(this.i, new v0(action0)));
     }
 
     public final Observable<T> v(Action0 action0) {
-        return i0(new r(this.i, new v0(action0)));
+        return h0(new r(this.i, new w0(action0)));
     }
 
-    public final Observable<T> w(Action0 action0) {
-        return i0(new r(this.i, new w0(action0)));
+    public final Observable<T> x(j0.k.b<? super T, Boolean> bVar) {
+        return h0(new j0.l.a.l(this, bVar));
     }
 
-    public final Observable<T> y(j0.k.b<? super T, Boolean> bVar) {
-        return i0(new j0.l.a.l(this, bVar));
+    public final Observable<T> y() {
+        return Z(1).R();
     }
 
-    public final Observable<T> z() {
-        return a0(1).S();
+    /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: j0.k.b<? super T, ? extends rx.Observable<? extends R>> */
+    /* JADX WARN: Multi-variable type inference failed */
+    public final <R> Observable<R> z(j0.k.b<? super T, ? extends Observable<? extends R>> bVar) {
+        return getClass() == j.class ? ((j) this).k0(bVar) : G(F(bVar));
     }
 }
diff --git a/app/src/main/java/rx/subjects/BehaviorSubject.java b/app/src/main/java/rx/subjects/BehaviorSubject.java
index eb2493a246..0ea91f519e 100644
--- a/app/src/main/java/rx/subjects/BehaviorSubject.java
+++ b/app/src/main/java/rx/subjects/BehaviorSubject.java
@@ -92,15 +92,15 @@ public final class BehaviorSubject<T> extends Subject<T, T> {
         this.k = cVar;
     }
 
-    public static <T> BehaviorSubject<T> l0() {
-        return n0(null, false);
+    public static <T> BehaviorSubject<T> k0() {
+        return m0(null, false);
     }
 
-    public static <T> BehaviorSubject<T> m0(T t) {
-        return n0(t, true);
+    public static <T> BehaviorSubject<T> l0(T t) {
+        return m0(t, true);
     }
 
-    public static <T> BehaviorSubject<T> n0(T t, boolean z2) {
+    public static <T> BehaviorSubject<T> m0(T t, boolean z2) {
         c cVar = new c();
         if (z2) {
             if (t == null) {
@@ -114,7 +114,7 @@ public final class BehaviorSubject<T> extends Subject<T, T> {
         return new BehaviorSubject<>(cVar, cVar);
     }
 
-    public T o0() {
+    public T n0() {
         Object obj = this.k.latest;
         if (obj != null && !(obj instanceof e.c) && !e.c(obj)) {
             return (T) e.b(obj);
diff --git a/app/src/main/java/rx/subjects/PublishSubject.java b/app/src/main/java/rx/subjects/PublishSubject.java
index 1b7c855cdb..65416bed2e 100644
--- a/app/src/main/java/rx/subjects/PublishSubject.java
+++ b/app/src/main/java/rx/subjects/PublishSubject.java
@@ -196,7 +196,7 @@ public final class PublishSubject<T> extends Subject<T, T> {
         this.j = bVar;
     }
 
-    public static <T> PublishSubject<T> l0() {
+    public static <T> PublishSubject<T> k0() {
         return new PublishSubject<>(new b());
     }
 
diff --git a/app/src/main/java/rx/subjects/SerializedSubject.java b/app/src/main/java/rx/subjects/SerializedSubject.java
index 98ebb99161..e62b587583 100644
--- a/app/src/main/java/rx/subjects/SerializedSubject.java
+++ b/app/src/main/java/rx/subjects/SerializedSubject.java
@@ -15,7 +15,7 @@ public class SerializedSubject<T, R> extends Subject<T, R> {
 
         @Override // rx.functions.Action1
         public void call(Object obj) {
-            this.i.j0((Subscriber) obj);
+            this.i.i0((Subscriber) obj);
         }
     }
 
diff --git a/app/src/main/java/s/a/a/a.java b/app/src/main/java/s/a/a/a.java
index 6c5de0ed98..c16677ed6c 100644
--- a/app/src/main/java/s/a/a/a.java
+++ b/app/src/main/java/s/a/a/a.java
@@ -12,7 +12,7 @@ public final class a {
     public static final Function2<Object, CoroutineContext.Element, Object> b = b.i;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final Function2<s1<?>, CoroutineContext.Element, s1<?>> f2863c = c.i;
+    public static final Function2<s1<?>, CoroutineContext.Element, s1<?>> f2869c = c.i;
     public static final Function2<x, CoroutineContext.Element, x> d = C0338a.j;
     public static final Function2<x, CoroutineContext.Element, x> e = C0338a.i;
 
@@ -38,7 +38,7 @@ public final class a {
                 x xVar2 = xVar;
                 CoroutineContext.Element element2 = element;
                 if (element2 instanceof s1) {
-                    CoroutineContext coroutineContext = xVar2.f2867c;
+                    CoroutineContext coroutineContext = xVar2.f2873c;
                     Object[] objArr = xVar2.a;
                     int i3 = xVar2.b;
                     xVar2.b = i3 + 1;
@@ -49,7 +49,7 @@ public final class a {
                 x xVar3 = xVar;
                 CoroutineContext.Element element3 = element;
                 if (element3 instanceof s1) {
-                    Object C = ((s1) element3).C(xVar3.f2867c);
+                    Object C = ((s1) element3).C(xVar3.f2873c);
                     Object[] objArr2 = xVar3.a;
                     int i4 = xVar3.b;
                     xVar3.b = i4 + 1;
@@ -117,7 +117,7 @@ public final class a {
                 coroutineContext.fold(obj, e);
                 return;
             }
-            Object fold = coroutineContext.fold(null, f2863c);
+            Object fold = coroutineContext.fold(null, f2869c);
             Objects.requireNonNull(fold, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement<kotlin.Any?>");
             ((s1) fold).x(coroutineContext, obj);
         }
diff --git a/app/src/main/java/s/a/a/b.java b/app/src/main/java/s/a/a/b.java
index 6d272e8707..d200daf65c 100644
--- a/app/src/main/java/s/a/a/b.java
+++ b/app/src/main/java/s/a/a/b.java
@@ -5,5 +5,5 @@ public class b<T> {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public int f2864c;
+    public int f2870c;
 }
diff --git a/app/src/main/java/s/a/a/k.java b/app/src/main/java/s/a/a/k.java
index 81c18ba3e6..0c56dfa096 100644
--- a/app/src/main/java/s/a/a/k.java
+++ b/app/src/main/java/s/a/a/k.java
@@ -17,10 +17,10 @@ public class k {
         public k b;
 
         /* renamed from: c  reason: collision with root package name */
-        public final k f2865c;
+        public final k f2871c;
 
         public a(k kVar) {
-            this.f2865c = kVar;
+            this.f2871c = kVar;
         }
 
         /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */
@@ -28,9 +28,9 @@ public class k {
         public void b(k kVar, Object obj) {
             k kVar2 = kVar;
             boolean z2 = obj == null;
-            k kVar3 = z2 ? this.f2865c : this.b;
+            k kVar3 = z2 ? this.f2871c : this.b;
             if (kVar3 != null && k.i.compareAndSet(kVar2, this, kVar3) && z2) {
-                k kVar4 = this.f2865c;
+                k kVar4 = this.f2871c;
                 k kVar5 = this.b;
                 m.checkNotNull(kVar5);
                 kVar4.g(kVar5);
diff --git a/app/src/main/java/s/a/a/l.java b/app/src/main/java/s/a/a/l.java
index 4bec2bef85..302c189c65 100644
--- a/app/src/main/java/s/a/a/l.java
+++ b/app/src/main/java/s/a/a/l.java
@@ -45,7 +45,7 @@ public class l<E> {
         while (true) {
             m mVar = (m) this._cur;
             E e = (E) mVar.e();
-            if (e != m.f2866c) {
+            if (e != m.f2872c) {
                 return e;
             }
             a.compareAndSet(this, mVar, mVar.d());
diff --git a/app/src/main/java/s/a/a/m.java b/app/src/main/java/s/a/a/m.java
index 33f64f3469..8a50bedd62 100644
--- a/app/src/main/java/s/a/a/m.java
+++ b/app/src/main/java/s/a/a/m.java
@@ -10,7 +10,7 @@ public final class m<E> {
     public static final AtomicLongFieldUpdater b = AtomicLongFieldUpdater.newUpdater(m.class, "_state");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final t f2866c = new t("REMOVE_FROZEN");
+    public static final t f2872c = new t("REMOVE_FROZEN");
     public static final a d = new a(null);
     public volatile Object _next = null;
     public volatile long _state = 0;
@@ -156,7 +156,7 @@ public final class m<E> {
         while (true) {
             long j = this._state;
             if ((j & 1152921504606846976L) != 0) {
-                return f2866c;
+                return f2872c;
             }
             int i = (int) ((j & 1073741823) >> 0);
             int i2 = this.e;
diff --git a/app/src/main/java/s/a/a/x.java b/app/src/main/java/s/a/a/x.java
index d34c423e1d..3b32aadea6 100644
--- a/app/src/main/java/s/a/a/x.java
+++ b/app/src/main/java/s/a/a/x.java
@@ -7,10 +7,10 @@ public final class x {
     public int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final CoroutineContext f2867c;
+    public final CoroutineContext f2873c;
 
     public x(CoroutineContext coroutineContext, int i) {
-        this.f2867c = coroutineContext;
+        this.f2873c = coroutineContext;
         this.a = new Object[i];
     }
 }
diff --git a/app/src/main/java/s/a/b2/a.java b/app/src/main/java/s/a/b2/a.java
index c6a7f97318..66d285182e 100644
--- a/app/src/main/java/s/a/b2/a.java
+++ b/app/src/main/java/s/a/b2/a.java
@@ -31,7 +31,7 @@ public final class a implements Executor, Closeable {
     public final long r;
 
     /* renamed from: s  reason: collision with root package name */
-    public final String f2868s;
+    public final String f2874s;
 
     /* compiled from: CoroutineScheduler.kt */
     /* renamed from: s.a.b2.a$a  reason: collision with other inner class name */
@@ -139,7 +139,7 @@ public final class a implements Executor, Closeable {
 
         public final void d(int i2) {
             StringBuilder sb = new StringBuilder();
-            sb.append(a.this.f2868s);
+            sb.append(a.this.f2874s);
             sb.append("-worker-");
             sb.append(i2 == 0 ? "TERMINATED" : String.valueOf(i2));
             setName(sb.toString());
@@ -329,7 +329,7 @@ public final class a implements Executor, Closeable {
         this.p = i2;
         this.q = i3;
         this.r = j2;
-        this.f2868s = str;
+        this.f2874s = str;
         if (i2 >= 1) {
             if (i3 >= i2) {
                 if (i3 <= 2097150) {
@@ -499,7 +499,7 @@ public final class a implements Executor, Closeable {
         }
         if (hVar != null) {
             if (!(hVar.j.s() == 1 ? this.n.a(hVar) : this.m.a(hVar))) {
-                throw new RejectedExecutionException(c.d.b.a.a.D(new StringBuilder(), this.f2868s, " was terminated"));
+                throw new RejectedExecutionException(c.d.b.a.a.D(new StringBuilder(), this.f2874s, " was terminated"));
             }
         }
         if (!z2 || c2 == null) {
@@ -611,7 +611,7 @@ public final class a implements Executor, Closeable {
             }
         }
         long j2 = this.controlState;
-        return this.f2868s + '@' + c.q.a.k.a.u(this) + "[Pool Size {core = " + this.p + ", max = " + this.q + "}, Worker States {CPU = " + i2 + ", blocking = " + i3 + ", parked = " + i4 + ", dormant = " + i5 + ", terminated = " + i6 + "}, running workers queues = " + arrayList + ", global CPU queue size = " + this.m.c() + ", global blocking queue size = " + this.n.c() + ", Control State {created workers= " + ((int) (2097151 & j2)) + ", blocking tasks = " + ((int) ((4398044413952L & j2) >> 21)) + ", CPUs acquired = " + (this.p - ((int) ((9223367638808264704L & j2) >> 42))) + "}]";
+        return this.f2874s + '@' + c.q.a.k.a.u(this) + "[Pool Size {core = " + this.p + ", max = " + this.q + "}, Worker States {CPU = " + i2 + ", blocking = " + i3 + ", parked = " + i4 + ", dormant = " + i5 + ", terminated = " + i6 + "}, running workers queues = " + arrayList + ", global CPU queue size = " + this.m.c() + ", global blocking queue size = " + this.n.c() + ", Control State {created workers= " + ((int) (2097151 & j2)) + ", blocking tasks = " + ((int) ((4398044413952L & j2) >> 21)) + ", CPUs acquired = " + (this.p - ((int) ((9223367638808264704L & j2) >> 42))) + "}]";
     }
 
     public final boolean w() {
diff --git a/app/src/main/java/s/a/b2/c.java b/app/src/main/java/s/a/b2/c.java
index e11d17984f..890683a657 100644
--- a/app/src/main/java/s/a/b2/c.java
+++ b/app/src/main/java/s/a/b2/c.java
@@ -14,7 +14,7 @@ public class c extends ExecutorCoroutineDispatcher {
 
     public c(int i, int i2, String str, int i3) {
         i = (i3 & 1) != 0 ? k.b : i;
-        i2 = (i3 & 2) != 0 ? k.f2869c : i2;
+        i2 = (i3 & 2) != 0 ? k.f2875c : i2;
         String str2 = (i3 & 4) != 0 ? "DefaultDispatcher" : null;
         long j = k.d;
         this.j = i;
diff --git a/app/src/main/java/s/a/b2/k.java b/app/src/main/java/s/a/b2/k.java
index 6106357400..7f7e6f16b3 100644
--- a/app/src/main/java/s/a/b2/k.java
+++ b/app/src/main/java/s/a/b2/k.java
@@ -10,7 +10,7 @@ public final class k {
     public static final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f2869c;
+    public static final int f2875c;
     public static final long d = TimeUnit.SECONDS.toNanos(a.Y("kotlinx.coroutines.scheduler.keep.alive.sec", 60, 0, 0, 12, null));
     public static l e = f.a;
 
@@ -19,6 +19,6 @@ public final class k {
         int i = u.a;
         int X = a.X("kotlinx.coroutines.scheduler.core.pool.size", f.coerceAtLeast(i, 2), 1, 0, 8, null);
         b = X;
-        f2869c = a.X("kotlinx.coroutines.scheduler.max.pool.size", f.coerceIn(i * 128, X, 2097150), 0, 2097150, 4, null);
+        f2875c = a.X("kotlinx.coroutines.scheduler.max.pool.size", f.coerceIn(i * 128, X, 2097150), 0, 2097150, 4, null);
     }
 }
diff --git a/app/src/main/java/s/a/b2/m.java b/app/src/main/java/s/a/b2/m.java
index ea2d982d19..b25517cb04 100644
--- a/app/src/main/java/s/a/b2/m.java
+++ b/app/src/main/java/s/a/b2/m.java
@@ -9,7 +9,7 @@ public final class m {
     public static final AtomicIntegerFieldUpdater b = AtomicIntegerFieldUpdater.newUpdater(m.class, "producerIndex");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicIntegerFieldUpdater f2870c = AtomicIntegerFieldUpdater.newUpdater(m.class, "consumerIndex");
+    public static final AtomicIntegerFieldUpdater f2876c = AtomicIntegerFieldUpdater.newUpdater(m.class, "consumerIndex");
     public static final AtomicIntegerFieldUpdater d = AtomicIntegerFieldUpdater.newUpdater(m.class, "blockingTasksInBuffer");
     public volatile int blockingTasksInBuffer = 0;
     public volatile int consumerIndex = 0;
@@ -69,7 +69,7 @@ public final class m {
                 return null;
             }
             int i2 = i & 127;
-            if (f2870c.compareAndSet(this, i, i + 1) && (andSet = this.e.getAndSet(i2, null)) != null) {
+            if (f2876c.compareAndSet(this, i, i + 1) && (andSet = this.e.getAndSet(i2, null)) != null) {
                 boolean z2 = true;
                 if (andSet.j.s() != 1) {
                     z2 = false;
diff --git a/app/src/main/java/s/a/g1.java b/app/src/main/java/s/a/g1.java
index af4f390d25..59d550a35e 100644
--- a/app/src/main/java/s/a/g1.java
+++ b/app/src/main/java/s/a/g1.java
@@ -407,7 +407,7 @@ public class g1 implements Job, q, o1 {
                 }
                 throw new IllegalStateException(str, th);
             }
-        } while (V == h1.f2871c);
+        } while (V == h1.f2877c);
         return V;
     }
 
@@ -528,12 +528,12 @@ public class g1 implements Job, q, o1 {
                 Q(obj2);
                 u(y0Var, obj2);
             }
-            return z2 ? obj2 : h1.f2871c;
+            return z2 ? obj2 : h1.f2877c;
         }
         y0 y0Var2 = (y0) obj;
         l1 E = E(y0Var2);
         if (E == null) {
-            return h1.f2871c;
+            return h1.f2877c;
         }
         p pVar = null;
         b bVar = (b) (!(y0Var2 instanceof b) ? null : y0Var2);
@@ -556,7 +556,7 @@ public class g1 implements Job, q, o1 {
                     th = null;
                 }
             } else {
-                return h1.f2871c;
+                return h1.f2877c;
             }
         }
         if (th != null) {
@@ -723,7 +723,7 @@ public class g1 implements Job, q, o1 {
                 Object F = F();
                 if ((F instanceof y0) && (!(F instanceof b) || ((b) F)._isCompleting == 0)) {
                     tVar2 = V(F, new v(v(obj), false, 2));
-                    if (tVar2 != h1.f2871c) {
+                    if (tVar2 != h1.f2877c) {
                         break;
                     }
                 } else {
@@ -766,7 +766,7 @@ public class g1 implements Job, q, o1 {
                     } else {
                         Object V = V(F2, new v(th2, false, 2));
                         if (V != h1.a) {
-                            if (V != h1.f2871c) {
+                            if (V != h1.f2877c) {
                                 tVar2 = V;
                                 break;
                             }
diff --git a/app/src/main/java/s/a/h1.java b/app/src/main/java/s/a/h1.java
index 25ae27cdb9..a1c96fdd51 100644
--- a/app/src/main/java/s/a/h1.java
+++ b/app/src/main/java/s/a/h1.java
@@ -7,7 +7,7 @@ public final class h1 {
     public static final t b = new t("COMPLETING_WAITING_CHILDREN");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final t f2871c = new t("COMPLETING_RETRY");
+    public static final t f2877c = new t("COMPLETING_RETRY");
     public static final t d = new t("TOO_LATE_TO_CANCEL");
     public static final t e = new t("SEALED");
     public static final o0 f = new o0(false);
diff --git a/app/src/main/java/s/a/k.java b/app/src/main/java/s/a/k.java
index 6a5c1ece5d..a6176284c4 100644
--- a/app/src/main/java/s/a/k.java
+++ b/app/src/main/java/s/a/k.java
@@ -125,7 +125,7 @@ public class k<T> extends i0<T> implements CancellableContinuation<T>, Coroutine
                             if (iVar != null) {
                                 p(iVar, th);
                             }
-                            Function1<Throwable, Unit> function1 = uVar.f2873c;
+                            Function1<Throwable, Unit> function1 = uVar.f2879c;
                             if (function1 != null) {
                                 q(function1, th);
                                 return;
@@ -457,7 +457,7 @@ public class k<T> extends i0<T> implements CancellableContinuation<T>, Coroutine
                 if (obj2 instanceof m) {
                     m mVar = (m) obj2;
                     Objects.requireNonNull(mVar);
-                    if (m.f2872c.compareAndSet(mVar, 0, 1)) {
+                    if (m.f2878c.compareAndSet(mVar, 0, 1)) {
                         if (function1 != null) {
                             q(function1, mVar.b);
                             return;
diff --git a/app/src/main/java/s/a/m.java b/app/src/main/java/s/a/m.java
index a79362d07d..d505f580c4 100644
--- a/app/src/main/java/s/a/m.java
+++ b/app/src/main/java/s/a/m.java
@@ -7,7 +7,7 @@ import kotlin.coroutines.Continuation;
 public final class m extends v {
 
     /* renamed from: c  reason: collision with root package name */
-    public static final AtomicIntegerFieldUpdater f2872c = AtomicIntegerFieldUpdater.newUpdater(m.class, "_resumed");
+    public static final AtomicIntegerFieldUpdater f2878c = AtomicIntegerFieldUpdater.newUpdater(m.class, "_resumed");
     public volatile int _resumed;
 
     /* JADX WARNING: Illegal instructions before constructor call */
diff --git a/app/src/main/java/s/a/p0.java b/app/src/main/java/s/a/p0.java
index 8fe44f909c..6b1b9d1bc6 100644
--- a/app/src/main/java/s/a/p0.java
+++ b/app/src/main/java/s/a/p0.java
@@ -29,10 +29,10 @@ public abstract class p0 extends CoroutineDispatcher {
             this.k = bVar;
         }
         Object[] objArr = bVar.a;
-        int i = bVar.f2864c;
+        int i = bVar.f2870c;
         objArr[i] = i0Var;
         int length = (objArr.length - 1) & (i + 1);
-        bVar.f2864c = length;
+        bVar.f2870c = length;
         int i2 = bVar.b;
         if (length == i2) {
             int length2 = objArr.length;
@@ -44,7 +44,7 @@ public abstract class p0 extends CoroutineDispatcher {
             j.copyInto$default(objArr3, objArr2, length3 - i3, 0, i3, 4, (Object) null);
             bVar.a = objArr2;
             bVar.b = 0;
-            bVar.f2864c = length2;
+            bVar.f2870c = length2;
         }
     }
 
@@ -66,7 +66,7 @@ public abstract class p0 extends CoroutineDispatcher {
         if (bVar != null) {
             int i = bVar.b;
             i0 i0Var = null;
-            if (i != bVar.f2864c) {
+            if (i != bVar.f2870c) {
                 ?? r3 = bVar.a;
                 ?? r6 = r3[i];
                 r3[i] = 0;
diff --git a/app/src/main/java/s/a/q0.java b/app/src/main/java/s/a/q0.java
index 5fa3c67756..2de9f740e7 100644
--- a/app/src/main/java/s/a/q0.java
+++ b/app/src/main/java/s/a/q0.java
@@ -194,7 +194,7 @@ public abstract class q0 extends r0 implements g0 {
 
     public boolean U() {
         s.a.a.b<i0<?>> bVar = this.k;
-        if (!(bVar == null || bVar.b == bVar.f2864c)) {
+        if (!(bVar == null || bVar.b == bVar.f2870c)) {
             return false;
         }
         d dVar = (d) this._delayed;
@@ -251,7 +251,7 @@ public abstract class q0 extends r0 implements g0 {
                 } else {
                     m mVar = (m) obj;
                     Object e = mVar.e();
-                    if (e != m.f2866c) {
+                    if (e != m.f2872c) {
                         runnable = (Runnable) e;
                         break;
                     }
@@ -267,7 +267,7 @@ public abstract class q0 extends r0 implements g0 {
         }
         s.a.a.b<i0<?>> bVar = this.k;
         if (bVar != null) {
-            if (bVar.b != bVar.f2864c) {
+            if (bVar.b != bVar.f2870c) {
                 z2 = false;
             }
             if (!z2) {
diff --git a/app/src/main/java/s/a/u.java b/app/src/main/java/s/a/u.java
index 06ad069729..85b155c226 100644
--- a/app/src/main/java/s/a/u.java
+++ b/app/src/main/java/s/a/u.java
@@ -11,7 +11,7 @@ public final class u {
     public final i b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Function1<Throwable, Unit> f2873c;
+    public final Function1<Throwable, Unit> f2879c;
     public final Object d;
     public final Throwable e;
 
@@ -20,7 +20,7 @@ public final class u {
     public u(Object obj, i iVar, Function1<? super Throwable, Unit> function1, Object obj2, Throwable th) {
         this.a = obj;
         this.b = iVar;
-        this.f2873c = function1;
+        this.f2879c = function1;
         this.d = obj2;
         this.e = th;
     }
@@ -32,7 +32,7 @@ public final class u {
         th = (i & 16) != 0 ? null : th;
         this.a = obj;
         this.b = iVar;
-        this.f2873c = function1;
+        this.f2879c = function1;
         this.d = obj2;
         this.e = th;
     }
@@ -43,7 +43,7 @@ public final class u {
         if ((i & 2) != 0) {
             iVar = uVar.b;
         }
-        Function1<Throwable, Unit> function12 = (i & 4) != 0 ? uVar.f2873c : null;
+        Function1<Throwable, Unit> function12 = (i & 4) != 0 ? uVar.f2879c : null;
         if ((i & 8) != 0) {
             obj3 = uVar.d;
         }
@@ -62,7 +62,7 @@ public final class u {
             return false;
         }
         u uVar = (u) obj;
-        return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && m.areEqual(this.f2873c, uVar.f2873c) && m.areEqual(this.d, uVar.d) && m.areEqual(this.e, uVar.e);
+        return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && m.areEqual(this.f2879c, uVar.f2879c) && m.areEqual(this.d, uVar.d) && m.areEqual(this.e, uVar.e);
     }
 
     public int hashCode() {
@@ -71,7 +71,7 @@ public final class u {
         int hashCode = (obj != null ? obj.hashCode() : 0) * 31;
         i iVar = this.b;
         int hashCode2 = (hashCode + (iVar != null ? iVar.hashCode() : 0)) * 31;
-        Function1<Throwable, Unit> function1 = this.f2873c;
+        Function1<Throwable, Unit> function1 = this.f2879c;
         int hashCode3 = (hashCode2 + (function1 != null ? function1.hashCode() : 0)) * 31;
         Object obj2 = this.d;
         int hashCode4 = (hashCode3 + (obj2 != null ? obj2.hashCode() : 0)) * 31;
@@ -88,7 +88,7 @@ public final class u {
         L.append(", cancelHandler=");
         L.append(this.b);
         L.append(", onCancellation=");
-        L.append(this.f2873c);
+        L.append(this.f2879c);
         L.append(", idempotentResume=");
         L.append(this.d);
         L.append(", cancelCause=");
diff --git a/app/src/main/java/s/a/z1/b.java b/app/src/main/java/s/a/z1/b.java
index 8e2d8770f6..fd6cdc228b 100644
--- a/app/src/main/java/s/a/z1/b.java
+++ b/app/src/main/java/s/a/z1/b.java
@@ -7,6 +7,6 @@ public final class b {
     public static final t b = new t("OFFER_SUCCESS");
 
     /* renamed from: c  reason: collision with root package name */
-    public static final t f2874c = new t("OFFER_FAILED");
+    public static final t f2880c = new t("OFFER_FAILED");
     public static final t d = new t("POLL_FAILED");
 }
diff --git a/app/src/main/java/s/a/z1/c.java b/app/src/main/java/s/a/z1/c.java
index db75546e2d..f3deaec808 100644
--- a/app/src/main/java/s/a/z1/c.java
+++ b/app/src/main/java/s/a/z1/c.java
@@ -99,7 +99,7 @@ public abstract class c<E> implements l<E> {
         if (e2 == b.b) {
             return true;
         }
-        if (e2 == b.f2874c) {
+        if (e2 == b.f2880c) {
             f<?> b = b();
             if (b == null) {
                 return false;
diff --git a/app/src/main/java/s/a/z1/g.java b/app/src/main/java/s/a/z1/g.java
index fe5433403d..d1ed547a16 100644
--- a/app/src/main/java/s/a/z1/g.java
+++ b/app/src/main/java/s/a/z1/g.java
@@ -11,7 +11,7 @@ import s.a.a.t;
 public class g<E> extends a<E> {
 
     /* renamed from: c  reason: collision with root package name */
-    public final ReentrantLock f2875c = new ReentrantLock();
+    public final ReentrantLock f2881c = new ReentrantLock();
     public Object d = b.a;
 
     public g(Function1<? super E, Unit> function1) {
@@ -30,7 +30,7 @@ public class g<E> extends a<E> {
     public Object e(E e) {
         Function1<E, Unit> function1;
         j<E> j;
-        ReentrantLock reentrantLock = this.f2875c;
+        ReentrantLock reentrantLock = this.f2881c;
         reentrantLock.lock();
         try {
             f<?> b = b();
@@ -74,7 +74,7 @@ public class g<E> extends a<E> {
 
     @Override // s.a.z1.a
     public boolean f(h<? super E> hVar) {
-        ReentrantLock reentrantLock = this.f2875c;
+        ReentrantLock reentrantLock = this.f2881c;
         reentrantLock.lock();
         try {
             return super.f(hVar);
@@ -95,7 +95,7 @@ public class g<E> extends a<E> {
 
     @Override // s.a.z1.a
     public Object i() {
-        ReentrantLock reentrantLock = this.f2875c;
+        ReentrantLock reentrantLock = this.f2881c;
         reentrantLock.lock();
         try {
             Object obj = this.d;
diff --git a/app/src/main/java/s/b/a.java b/app/src/main/java/s/b/a.java
new file mode 100644
index 0000000000..482bc07338
--- /dev/null
+++ b/app/src/main/java/s/b/a.java
@@ -0,0 +1,9 @@
+package s.b;
+
+import android.os.Parcel;
+/* compiled from: Parceler.kt */
+public interface a<T> {
+    T create(Parcel parcel);
+
+    void write(T t, Parcel parcel, int i);
+}
diff --git a/app/src/main/java/x/a/b/b/a/a.java b/app/src/main/java/x/a/b/b/a/a.java
index 843f8b843d..d4df292e0f 100644
--- a/app/src/main/java/x/a/b/b/a/a.java
+++ b/app/src/main/java/x/a/b/b/a/a.java
@@ -46,7 +46,7 @@ public interface a extends IInterface {
                         return true;
                     case 2:
                         parcel.enforceInterface("android.support.v4.media.session.IMediaControllerCallback");
-                        U();
+                        V();
                         return true;
                     case 3:
                         parcel.enforceInterface("android.support.v4.media.session.IMediaControllerCallback");
@@ -60,25 +60,25 @@ public interface a extends IInterface {
                         if (parcel.readInt() != 0) {
                             mediaMetadataCompat = MediaMetadataCompat.CREATOR.createFromParcel(parcel);
                         }
-                        V(mediaMetadataCompat);
+                        W(mediaMetadataCompat);
                         return true;
                     case 5:
                         parcel.enforceInterface("android.support.v4.media.session.IMediaControllerCallback");
-                        y(parcel.createTypedArrayList(MediaSessionCompat.QueueItem.CREATOR));
+                        z(parcel.createTypedArrayList(MediaSessionCompat.QueueItem.CREATOR));
                         return true;
                     case 6:
                         parcel.enforceInterface("android.support.v4.media.session.IMediaControllerCallback");
                         if (parcel.readInt() != 0) {
                             charSequence = (CharSequence) TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel);
                         }
-                        T(charSequence);
+                        U(charSequence);
                         return true;
                     case 7:
                         parcel.enforceInterface("android.support.v4.media.session.IMediaControllerCallback");
                         if (parcel.readInt() != 0) {
                             bundle = (Bundle) Bundle.CREATOR.createFromParcel(parcel);
                         }
-                        x(bundle);
+                        y(bundle);
                         return true;
                     case 8:
                         parcel.enforceInterface("android.support.v4.media.session.IMediaControllerCallback");
@@ -120,15 +120,15 @@ public interface a extends IInterface {
         }
     }
 
-    void T(CharSequence charSequence) throws RemoteException;
+    void U(CharSequence charSequence) throws RemoteException;
 
-    void U() throws RemoteException;
+    void V() throws RemoteException;
 
-    void V(MediaMetadataCompat mediaMetadataCompat) throws RemoteException;
-
-    void x(Bundle bundle) throws RemoteException;
+    void W(MediaMetadataCompat mediaMetadataCompat) throws RemoteException;
 
     void x0(ParcelableVolumeInfo parcelableVolumeInfo) throws RemoteException;
 
-    void y(List<MediaSessionCompat.QueueItem> list) throws RemoteException;
+    void y(Bundle bundle) throws RemoteException;
+
+    void z(List<MediaSessionCompat.QueueItem> list) throws RemoteException;
 }
diff --git a/app/src/main/java/x/a/b/b/a/b.java b/app/src/main/java/x/a/b/b/a/b.java
index a73e3b152d..24283cfb88 100644
--- a/app/src/main/java/x/a/b/b/a/b.java
+++ b/app/src/main/java/x/a/b/b/a/b.java
@@ -28,7 +28,7 @@ public interface b extends IInterface {
             }
 
             @Override // x.a.b.b.a.b
-            public void j(a aVar) throws RemoteException {
+            public void k(a aVar) throws RemoteException {
                 Parcel obtain = Parcel.obtain();
                 Parcel obtain2 = Parcel.obtain();
                 try {
@@ -54,5 +54,5 @@ public interface b extends IInterface {
         }
     }
 
-    void j(a aVar) throws RemoteException;
+    void k(a aVar) throws RemoteException;
 }
diff --git a/app/src/main/java/x/a/b/b/a/c.java b/app/src/main/java/x/a/b/b/a/c.java
index 67ca8128f9..7e51c52f4e 100644
--- a/app/src/main/java/x/a/b/b/a/c.java
+++ b/app/src/main/java/x/a/b/b/a/c.java
@@ -147,22 +147,17 @@ public abstract class c implements IBinder.DeathRecipient {
         }
 
         @Override // x.a.b.b.a.a
-        public void T(CharSequence charSequence) throws RemoteException {
+        public void U(CharSequence charSequence) throws RemoteException {
             this.a.get();
         }
 
         @Override // x.a.b.b.a.a
-        public void U() throws RemoteException {
+        public void V() throws RemoteException {
             this.a.get();
         }
 
         @Override // x.a.b.b.a.a
-        public void V(MediaMetadataCompat mediaMetadataCompat) throws RemoteException {
-            this.a.get();
-        }
-
-        @Override // x.a.b.b.a.a
-        public void x(Bundle bundle) throws RemoteException {
+        public void W(MediaMetadataCompat mediaMetadataCompat) throws RemoteException {
             this.a.get();
         }
 
@@ -174,7 +169,12 @@ public abstract class c implements IBinder.DeathRecipient {
         }
 
         @Override // x.a.b.b.a.a
-        public void y(List<MediaSessionCompat.QueueItem> list) throws RemoteException {
+        public void y(Bundle bundle) throws RemoteException {
+            this.a.get();
+        }
+
+        @Override // x.a.b.b.a.a
+        public void z(List<MediaSessionCompat.QueueItem> list) throws RemoteException {
             this.a.get();
         }
     }
diff --git a/app/src/main/java/z/a.java b/app/src/main/java/z/a.java
index 8a2a26ad52..4205d7c50c 100644
--- a/app/src/main/java/z/a.java
+++ b/app/src/main/java/z/a.java
@@ -9,7 +9,7 @@ public final class a {
     public static final int b;
 
     /* renamed from: c  reason: collision with root package name */
-    public static final int f2876c;
+    public static final int f2882c;
     public static final int d;
     public final Executor e = new b(null);
 
@@ -27,7 +27,7 @@ public final class a {
     static {
         int availableProcessors = Runtime.getRuntime().availableProcessors();
         b = availableProcessors;
-        f2876c = availableProcessors + 1;
+        f2882c = availableProcessors + 1;
         d = (availableProcessors * 2) + 1;
     }
 }
diff --git a/app/src/main/java/z/b.java b/app/src/main/java/z/b.java
index bec3f16897..9f6b884e95 100644
--- a/app/src/main/java/z/b.java
+++ b/app/src/main/java/z/b.java
@@ -13,7 +13,7 @@ public final class b {
     public final ExecutorService b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final Executor f2877c;
+    public final Executor f2883c;
 
     /* compiled from: BoltsExecutors */
     /* renamed from: z.b$b  reason: collision with other inner class name */
@@ -66,12 +66,12 @@ public final class b {
             threadPoolExecutor = Executors.newCachedThreadPool();
         } else {
             a aVar = a.a;
-            ThreadPoolExecutor threadPoolExecutor2 = new ThreadPoolExecutor(a.f2876c, a.d, 1, TimeUnit.SECONDS, new LinkedBlockingQueue());
+            ThreadPoolExecutor threadPoolExecutor2 = new ThreadPoolExecutor(a.f2882c, a.d, 1, TimeUnit.SECONDS, new LinkedBlockingQueue());
             threadPoolExecutor2.allowCoreThreadTimeOut(true);
             threadPoolExecutor = threadPoolExecutor2;
         }
         this.b = threadPoolExecutor;
         Executors.newSingleThreadScheduledExecutor();
-        this.f2877c = new ExecutorC0358b(null);
+        this.f2883c = new ExecutorC0358b(null);
     }
 }
diff --git a/app/src/main/java/z/d.java b/app/src/main/java/z/d.java
index fed9593188..4d24f510eb 100644
--- a/app/src/main/java/z/d.java
+++ b/app/src/main/java/z/d.java
@@ -8,12 +8,12 @@ public class d implements c<TResult, Void> {
     public final /* synthetic */ c b;
 
     /* renamed from: c  reason: collision with root package name */
-    public final /* synthetic */ Executor f2878c;
+    public final /* synthetic */ Executor f2884c;
 
     public d(g gVar, h hVar, c cVar, Executor executor) {
         this.a = hVar;
         this.b = cVar;
-        this.f2878c = executor;
+        this.f2884c = executor;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -22,7 +22,7 @@ public class d implements c<TResult, Void> {
         h hVar = this.a;
         c cVar = this.b;
         try {
-            this.f2878c.execute(new e(hVar, cVar, gVar));
+            this.f2884c.execute(new e(hVar, cVar, gVar));
             return null;
         } catch (Exception e) {
             hVar.b(new ExecutorException(e));
diff --git a/app/src/main/java/z/g.java b/app/src/main/java/z/g.java
index 61d460e9fa..4bad075fba 100644
--- a/app/src/main/java/z/g.java
+++ b/app/src/main/java/z/g.java
@@ -12,7 +12,7 @@ public class g<TResult> {
     public static g<?> b = new g<>((Object) null);
 
     /* renamed from: c  reason: collision with root package name */
-    public static g<Boolean> f2879c = new g<>(Boolean.TRUE);
+    public static g<Boolean> f2885c = new g<>(Boolean.TRUE);
     public static g<Boolean> d = new g<>(Boolean.FALSE);
     public final Object e = new Object();
     public boolean f;
@@ -25,7 +25,7 @@ public class g<TResult> {
     static {
         b bVar = b.a;
         ExecutorService executorService = bVar.b;
-        a = bVar.f2877c;
+        a = bVar.f2883c;
         Executor executor = a.a.e;
         new g(true);
     }
diff --git a/app/src/main/res/drawable-anydpi-v24/claim_promo_success.xml b/app/src/main/res/drawable-anydpi-v24/claim_promo_success.xml
new file mode 100644
index 0000000000..3cb2859ce4
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/claim_promo_success.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="95dp" android:width="189dp" android:viewportWidth="189" android:viewportHeight="95">
+    <group>
+        <clip-path android:pathData="M0.5,0h192v96h-192z"/>
+        <path android:fillColor="#c7caff" android:pathData="M180.556,83.288C179.283,83.288 178.062,82.782 177.162,81.882C176.262,80.982 175.756,79.761 175.756,78.488V42.008C175.754,35.838 173.304,29.92 168.944,25.555C164.584,21.188 158.67,18.731 152.5,18.72H80.5C76.763,18.719 73.078,19.604 69.748,21.3C66.418,22.996 63.537,25.457 61.34,28.48L51.572,41.928C49.378,44.95 46.499,47.409 43.172,49.104C39.844,50.799 36.162,51.682 32.428,51.68H22.828C19.897,51.678 16.993,52.253 14.285,53.374C11.576,54.494 9.114,56.137 7.041,58.209C4.967,60.281 3.322,62.742 2.2,65.45C1.078,68.158 0.5,71.061 0.5,73.992L0.5,96H192.5V95.424C192.522,93.622 192.145,91.839 191.396,90.2C190.431,88.138 188.899,86.394 186.98,85.17C185.06,83.946 182.832,83.293 180.556,83.288Z"/>
+        <path android:fillColor="#5960fa" android:pathData="M160.884,88.376H146.396V91.392H160.884V88.376Z"/>
+        <path android:fillColor="#5960fa" android:pathData="M150.22,80.296L147.34,96H143.924L146.812,80.296H150.22Z"/>
+        <path android:fillColor="#5960fa" android:pathData="M163.356,96H159.948L157.068,80.296H160.5L163.356,96Z"/>
+        <path android:fillColor="#373be1" android:pathData="M149.756,82.824L149.02,86.888H145.612L146.356,82.824H149.756Z"/>
+        <path android:fillColor="#373be1" android:pathData="M161.684,86.888H158.284L157.532,82.824H160.948L161.684,86.888Z"/>
+        <path android:fillColor="#5960fa" android:pathData="M161.564,77.736H146.028C145.373,77.773 144.757,78.059 144.306,78.536C143.855,79.012 143.604,79.644 143.604,80.3C143.604,80.956 143.855,81.588 144.306,82.065C144.757,82.541 145.373,82.827 146.028,82.864H161.564C162.219,82.827 162.836,82.541 163.287,82.065C163.738,81.588 163.989,80.956 163.989,80.3C163.989,79.644 163.738,79.012 163.287,78.536C162.836,78.059 162.219,77.773 161.564,77.736Z"/>
+        <path android:fillColor="#801384" android:pathData="M96.716,3.808C96.671,4.761 97.005,5.692 97.644,6.4L103.7,13.04L104.028,4.072C104.046,3.592 103.969,3.114 103.801,2.664C103.633,2.214 103.378,1.803 103.05,1.452C102.722,1.102 102.327,0.82 101.89,0.623C101.452,0.426 100.98,0.317 100.5,0.304C100.021,0.285 99.543,0.36 99.094,0.526C98.644,0.692 98.232,0.945 97.88,1.27C97.529,1.596 97.245,1.988 97.045,2.423C96.845,2.859 96.733,3.329 96.716,3.808Z"/>
+        <path android:fillColor="#801384" android:pathData="M99.628,12.888L95.588,8.416L95.436,12.728L99.628,12.888Z"/>
+        <path android:fillColor="#e30085" android:pathData="M110.764,6.016C111.066,5.503 111.239,4.923 111.268,4.328C111.302,3.365 110.954,2.428 110.299,1.721C109.643,1.015 108.735,0.597 107.772,0.56L99.54,0.256L92.268,0L92.036,6.32C91.649,5.929 91.178,5.631 90.66,5.448V5.272L87.124,5.136V6.136C86.758,6.456 86.463,6.847 86.255,7.287C86.047,7.726 85.932,8.203 85.916,8.688V8.8C85.883,9.737 86.219,10.65 86.852,11.343C87.484,12.035 88.363,12.452 89.3,12.504L97.876,12.824L92.66,7.032L99.252,7.152V7.264L103.844,7.432L103.7,11.24L101.892,12.968L110.468,13.288C110.939,13.306 111.41,13.231 111.852,13.067C112.294,12.903 112.7,12.653 113.045,12.332C113.391,12.011 113.67,11.625 113.866,11.196C114.062,10.767 114.171,10.304 114.188,9.832V9.736C114.223,8.79 113.882,7.868 113.241,7.172C112.6,6.475 111.71,6.06 110.764,6.016Z"/>
+        <path android:fillColor="#801384" android:pathData="M95.436,12.72L99.788,8.552L99.628,12.872L95.436,12.72Z"/>
+        <path android:fillColor="#ff29a1" android:pathData="M104.26,5.768C103.366,5.739 102.493,6.044 101.812,6.624L101.924,6.52C102.609,5.856 103.01,4.953 103.044,4C103.072,3.04 102.719,2.108 102.063,1.406C101.407,0.705 100.5,0.291 99.54,0.256C98.577,0.221 97.64,0.57 96.933,1.225C96.227,1.881 95.809,2.789 95.772,3.752L95.7,5.96L95.78,3.768C95.797,3.29 95.72,2.813 95.552,2.365C95.385,1.917 95.131,1.506 94.805,1.156C94.479,0.806 94.087,0.524 93.651,0.325C93.216,0.127 92.746,0.016 92.268,-0C91.554,-0.025 90.849,0.161 90.24,0.534C89.631,0.908 89.145,1.452 88.843,2.099C88.541,2.747 88.437,3.468 88.542,4.175C88.647,4.881 88.958,5.541 89.436,6.072L89.572,6.216C89.08,5.711 88.451,5.362 87.762,5.212C87.074,5.063 86.356,5.12 85.7,5.376C85.043,5.632 84.477,6.076 84.071,6.652C83.666,7.228 83.439,7.912 83.42,8.616V8.72C83.405,9.191 83.483,9.661 83.65,10.102C83.817,10.543 84.069,10.947 84.393,11.29C84.716,11.634 85.104,11.91 85.534,12.103C85.964,12.296 86.428,12.403 86.9,12.416L95.452,12.728L104.028,13.048C104.97,13.072 105.884,12.723 106.572,12.078C107.259,11.432 107.664,10.542 107.7,9.6V9.496C107.734,8.546 107.392,7.622 106.748,6.923C106.103,6.225 105.209,5.81 104.26,5.768Z"/>
+        <path android:fillColor="#7196ff" android:pathData="M90.14,95.328C89.53,95.274 88.936,95.1 88.394,94.816C87.851,94.532 87.369,94.143 86.977,93.673C86.585,93.202 86.289,92.659 86.107,92.074C85.925,91.489 85.86,90.874 85.916,90.264C86.316,85.848 86.916,79.24 87.316,74.84C87.43,73.608 88.028,72.471 88.979,71.679C89.929,70.887 91.156,70.505 92.388,70.616C93.62,70.732 94.756,71.331 95.547,72.284C96.337,73.236 96.717,74.464 96.604,75.696L95.204,91.104C95.149,91.715 94.974,92.308 94.689,92.851C94.404,93.394 94.015,93.875 93.544,94.268C93.073,94.66 92.529,94.955 91.943,95.137C91.358,95.319 90.743,95.384 90.132,95.328H90.14Z"/>
+        <path android:fillColor="#7196ff" android:pathData="M108.412,91.376L103.516,76.848C103.14,75.761 103.166,74.576 103.591,73.507C104.015,72.438 104.809,71.557 105.828,71.024C106.425,70.731 107.079,70.568 107.744,70.548C108.409,70.527 109.071,70.649 109.685,70.905C110.299,71.161 110.852,71.545 111.306,72.032C111.759,72.519 112.104,73.097 112.316,73.728L117.3,88.392C117.693,89.565 117.605,90.847 117.055,91.955C116.504,93.064 115.537,93.908 114.364,94.304C113.781,94.506 113.164,94.591 112.548,94.553C111.932,94.515 111.33,94.355 110.777,94.083C110.223,93.81 109.729,93.431 109.323,92.966C108.917,92.502 108.608,91.961 108.412,91.376Z"/>
+        <path android:fillColor="#578bfa" android:pathData="M70.836,75.472C70.836,75.384 70.836,75.304 70.836,75.216C71.86,68.512 73.796,62.6 79.908,55.52C80.255,55.113 80.678,54.779 81.154,54.536C81.63,54.293 82.149,54.146 82.682,54.104C83.214,54.062 83.75,54.125 84.258,54.29C84.767,54.454 85.238,54.717 85.644,55.064C86.051,55.411 86.385,55.834 86.628,56.31C86.871,56.786 87.018,57.305 87.06,57.838C87.103,58.37 87.04,58.906 86.875,59.414C86.71,59.923 86.447,60.394 86.1,60.8C81.22,66.456 79.772,70.808 78.9,76.416C78.771,77.487 78.221,78.462 77.373,79.127C76.953,79.456 76.472,79.7 75.958,79.844C75.444,79.987 74.906,80.028 74.376,79.964C73.306,79.835 72.331,79.285 71.665,78.437C71,77.589 70.699,76.51 70.828,75.44L70.836,75.472Z"/>
+        <path android:fillColor="#4981fa" android:pathData="M81.22,49.24L73.583,50.83C72.572,51.041 71.518,50.841 70.654,50.274C69.79,49.708 69.186,48.821 68.975,47.81L67.182,39.194C66.971,38.183 67.171,37.129 67.737,36.265C68.304,35.401 69.19,34.797 70.202,34.586L77.838,32.996L81.22,49.24Z"/>
+        <path android:fillColor="#bacfff" android:pathData="M77.518,47.017L73.703,47.811C73.453,47.864 73.194,47.868 72.942,47.821C72.69,47.774 72.449,47.678 72.234,47.539C72.019,47.399 71.834,47.218 71.689,47.007C71.544,46.796 71.442,46.558 71.388,46.307L69.997,39.627C69.892,39.12 69.992,38.592 70.276,38.159C70.56,37.726 71.004,37.423 71.511,37.318L75.333,36.522L77.518,47.017Z"/>
+        <path android:fillColor="#4981fa" android:pathData="M113.482,25.594L121.119,24.004C121.62,23.9 122.136,23.895 122.639,23.99C123.141,24.086 123.62,24.279 124.048,24.56C124.476,24.84 124.845,25.202 125.133,25.625C125.421,26.048 125.623,26.523 125.727,27.024L127.521,35.639C127.724,36.648 127.52,37.697 126.953,38.556C126.387,39.415 125.503,40.014 124.495,40.224L116.859,41.814L113.482,25.594Z"/>
+        <path android:fillColor="#bacfff" android:pathData="M117.177,27.816L120.984,27.024C121.49,26.918 122.018,27.018 122.451,27.302C122.884,27.586 123.187,28.03 123.293,28.537L124.683,35.217C124.786,35.723 124.685,36.25 124.401,36.681C124.117,37.112 123.674,37.413 123.169,37.519L119.354,38.313L117.169,27.818L117.177,27.816Z"/>
+        <path android:fillColor="@drawable/res_2131230734_claim_promo_success__0" android:pathData="M112.78,43.84L82.508,51.528L80.196,65.336C79.768,67.896 80.216,70.526 81.468,72.8C82.463,74.608 83.922,76.116 85.696,77.17C87.47,78.224 89.493,78.784 91.556,78.792L109.476,78.856C111.631,78.862 113.734,78.199 115.495,76.958C117.257,75.716 118.589,73.959 119.308,71.928C120.05,69.819 120.092,67.527 119.428,65.392L112.78,43.84Z"/>
+        <path android:fillColor="@drawable/res_2131230735_claim_promo_success__1" android:pathData="M133.5,46.4C133.444,46.48 133.396,46.56 133.34,46.632C128.964,52.632 124.108,57.408 114.604,61.216C114.061,61.434 113.481,61.542 112.897,61.535C112.312,61.529 111.735,61.407 111.197,61.177C110.66,60.947 110.173,60.613 109.764,60.195C109.356,59.777 109.034,59.283 108.816,58.74C108.599,58.197 108.49,57.617 108.497,57.033C108.504,56.448 108.625,55.871 108.855,55.333C109.085,54.796 109.419,54.309 109.837,53.9C110.255,53.492 110.749,53.17 111.292,52.952C118.884,49.904 122.492,46.408 126.14,41.392C126.828,40.476 127.843,39.86 128.973,39.673C130.103,39.485 131.262,39.74 132.209,40.384C133.157,41.029 133.819,42.014 134.06,43.134C134.3,44.254 134.1,45.424 133.5,46.4Z"/>
+        <path android:fillColor="#366feb" android:pathData="M113.828,47.224L82.3,52.736L81.06,60.136L114.468,49.336L113.828,47.224Z"/>
+        <path android:fillColor="#578bfa" android:pathData="M108.662,17.715L78.383,24.018C73.638,25.006 70.592,29.653 71.58,34.398L74.361,47.76C75.349,52.505 79.997,55.551 84.742,54.563L115.021,48.26C119.766,47.272 122.812,42.624 121.824,37.879L119.042,24.518C118.054,19.772 113.407,16.727 108.662,17.715Z"/>
+        <path android:fillColor="@drawable/res_2131230736_claim_promo_success__2" android:pathData="M121.116,24L119.02,24.432C118.523,22.166 117.152,20.188 115.204,18.928C113.257,17.669 110.89,17.229 108.62,17.704L78.38,24C77.112,24.265 75.918,24.807 74.884,25.587C73.849,26.367 73,27.366 72.396,28.512C94.796,33.184 117.516,34.84 127.516,35.6L125.724,27.016C125.512,26.005 124.908,25.12 124.044,24.554C123.18,23.989 122.127,23.789 121.116,24Z"/>
+        <path android:fillColor="#bacfff" android:pathData="M84.663,30.679L102.076,27.126C102.805,26.977 103.564,27.124 104.186,27.535C104.807,27.945 105.24,28.586 105.389,29.316L106.757,36.019C107.124,37.82 106.762,39.693 105.748,41.226C104.735,42.759 103.154,43.827 101.353,44.194L92.596,45.981C90.65,46.379 88.625,45.986 86.968,44.891C85.311,43.796 84.157,42.087 83.76,40.141L82.506,33.994C82.357,33.264 82.504,32.505 82.914,31.884C83.325,31.263 83.966,30.83 84.696,30.681L84.663,30.679Z"/>
+        <path android:fillColor="#181a1c" android:pathData="M111.612,32.344C113.066,32.344 114.244,31.166 114.244,29.712C114.244,28.258 113.066,27.08 111.612,27.08C110.158,27.08 108.98,28.258 108.98,29.712C108.98,31.166 110.158,32.344 111.612,32.344Z"/>
+        <path android:fillColor="#181a1c" android:pathData="M78.316,39.28C79.77,39.28 80.948,38.102 80.948,36.648C80.948,35.194 79.77,34.016 78.316,34.016C76.863,34.016 75.684,35.194 75.684,36.648C75.684,38.102 76.863,39.28 78.316,39.28Z"/>
+        <path android:fillColor="#5f92ff" android:pathData="M91.469,39.13L89.081,39.627C88.423,39.764 88.001,40.408 88.138,41.066L88.14,41.074C88.276,41.731 88.92,42.153 89.578,42.016L91.967,41.519C92.624,41.382 93.046,40.738 92.909,40.081L92.908,40.073C92.771,39.415 92.127,38.993 91.469,39.13Z"/>
+        <path android:fillColor="#5f92ff" android:pathData="M100.605,37.223L97.26,37.919C96.603,38.056 96.181,38.7 96.318,39.357L96.319,39.365C96.456,40.022 97.1,40.445 97.758,40.308L101.102,39.611C101.759,39.475 102.181,38.831 102.045,38.173L102.043,38.165C101.906,37.508 101.262,37.086 100.605,37.223Z"/>
+        <path android:fillColor="#7196ff" android:pathData="M124.5,70.536L120.38,75.536C120.307,75.626 120.26,75.734 120.244,75.849C120.227,75.964 120.243,76.081 120.288,76.188C120.333,76.295 120.406,76.387 120.5,76.456C120.594,76.524 120.704,76.566 120.82,76.576L127.22,77.176C127.881,77.241 128.548,77.143 129.163,76.891C129.777,76.639 130.321,76.24 130.746,75.73C131.172,75.219 131.466,74.613 131.602,73.963C131.739,73.313 131.715,72.639 131.532,72C131.324,71.293 130.928,70.655 130.386,70.154C129.844,69.654 129.177,69.311 128.455,69.16C127.733,69.01 126.983,69.059 126.287,69.301C125.59,69.543 124.973,69.97 124.5,70.536Z"/>
+        <path android:fillColor="#ff29a1" android:pathData="M113.852,63.44H134.012C134.156,63.44 134.295,63.497 134.397,63.599C134.499,63.701 134.556,63.84 134.556,63.984V95.984H113.852V63.44Z"/>
+        <path android:fillColor="#e30085" android:pathData="M127.66,63.44H121.34V96H127.66V63.44Z"/>
+        <path android:fillColor="#ff29a1" android:pathData="M113.815,13.423L134.657,14.194C135.081,14.21 135.482,14.393 135.77,14.704C136.059,15.015 136.213,15.428 136.197,15.852L135.907,23.679C135.891,24.103 135.708,24.503 135.397,24.792C135.086,25.081 134.673,25.234 134.249,25.219L113.407,24.447L113.815,13.423Z"/>
+        <path android:fillColor="#ff6cba" android:pathData="M62.772,63.44H113.852V96H62.228V64C62.226,63.927 62.238,63.855 62.264,63.787C62.291,63.719 62.331,63.657 62.381,63.605C62.432,63.553 62.493,63.511 62.56,63.483C62.627,63.454 62.699,63.44 62.772,63.44Z"/>
+        <path android:fillColor="#ff29a1" android:pathData="M91.396,63.44H82.116V96H91.396V63.44Z"/>
+        <path android:fillColor="#ff6cba" android:pathData="M114.385,13.437L62.7,11.524C61.813,11.491 61.067,12.184 61.034,13.071L60.744,20.898C60.711,21.786 61.404,22.532 62.292,22.565L113.976,24.478C114.864,24.511 115.61,23.818 115.642,22.93L115.932,15.104C115.965,14.216 115.272,13.47 114.385,13.437Z"/>
+        <path android:fillColor="#ff29a1" android:pathData="M84.1,12.312C83.657,12.297 83.225,12.456 82.897,12.755C82.57,13.054 82.373,13.469 82.348,13.912L81.86,27.24L86.66,23.44L91.148,27.584L91.644,14.256C91.665,13.813 91.86,13.396 92.186,13.097C92.513,12.797 92.945,12.639 93.388,12.656L84.1,12.312Z"/>
+        <path android:fillColor="#e30085" android:pathData="M128.436,13.952L125.396,13.792L122.116,13.72C122.497,13.733 122.857,13.895 123.118,14.173C123.379,14.45 123.519,14.819 123.508,15.2L122.852,34.4L126.196,31.32L129.172,34.64L129.828,15.44C129.837,15.059 129.696,14.69 129.436,14.412C129.176,14.134 128.817,13.969 128.436,13.952Z"/>
+        <path android:fillColor="#5960fa" android:pathData="M161.908,33.896C161.166,33.418 160.534,32.788 160.054,32.047C159.574,31.307 159.257,30.472 159.124,29.6L158.676,26.584C158.663,26.513 158.626,26.448 158.57,26.401C158.515,26.354 158.445,26.329 158.372,26.328C158.301,26.329 158.232,26.355 158.177,26.402C158.123,26.449 158.087,26.513 158.076,26.584L157.628,29.6C157.497,30.475 157.181,31.313 156.701,32.056C156.221,32.8 155.588,33.432 154.844,33.912L154.452,34.16C154.408,34.187 154.372,34.225 154.347,34.269C154.322,34.314 154.309,34.364 154.308,34.416C154.309,34.467 154.322,34.518 154.347,34.562C154.372,34.607 154.408,34.645 154.452,34.672L154.844,34.928C155.584,35.402 156.215,36.028 156.695,36.765C157.175,37.501 157.493,38.331 157.628,39.2L158.076,42.216C158.087,42.287 158.123,42.351 158.177,42.398C158.232,42.445 158.301,42.471 158.372,42.472C158.445,42.473 158.516,42.447 158.572,42.4C158.628,42.353 158.665,42.288 158.676,42.216L159.124,39.2C159.255,38.326 159.571,37.489 160.051,36.747C160.531,36.005 161.164,35.374 161.908,34.896L162.3,34.64C162.344,34.613 162.38,34.575 162.405,34.53C162.43,34.486 162.444,34.435 162.444,34.384C162.444,34.333 162.43,34.282 162.405,34.237C162.38,34.193 162.344,34.155 162.3,34.128L161.908,33.896Z"/>
+        <path android:fillColor="#fff29a" android:pathData="M39.828,64.616C39.136,64.17 38.547,63.584 38.097,62.894C37.648,62.205 37.349,61.429 37.22,60.616L36.796,57.792C36.786,57.725 36.753,57.664 36.701,57.619C36.65,57.575 36.584,57.551 36.516,57.552C36.449,57.553 36.384,57.577 36.333,57.621C36.281,57.665 36.247,57.726 36.236,57.792L35.812,60.616C35.685,61.429 35.386,62.206 34.937,62.896C34.487,63.585 33.897,64.171 33.204,64.616L32.844,64.848C32.804,64.874 32.771,64.91 32.747,64.952C32.724,64.993 32.71,65.04 32.708,65.088C32.71,65.136 32.724,65.183 32.747,65.224C32.771,65.266 32.804,65.302 32.844,65.328L33.204,65.56C33.897,66.005 34.487,66.591 34.937,67.28C35.386,67.97 35.685,68.747 35.812,69.56L36.236,72.384C36.247,72.451 36.281,72.511 36.333,72.555C36.384,72.599 36.449,72.623 36.516,72.624C36.584,72.625 36.65,72.601 36.701,72.557C36.753,72.512 36.786,72.451 36.796,72.384L37.22,69.6C37.349,68.787 37.648,68.011 38.097,67.322C38.547,66.632 39.136,66.046 39.828,65.6L40.196,65.368C40.235,65.341 40.267,65.305 40.289,65.264C40.312,65.222 40.323,65.175 40.324,65.128C40.323,65.081 40.312,65.034 40.289,64.992C40.267,64.951 40.235,64.915 40.196,64.888L39.828,64.616Z"/>
+        <path android:fillColor="#00f67a" android:pathData="M175.612,17.2C175.093,16.866 174.65,16.425 174.315,15.906C173.98,15.387 173.759,14.803 173.668,14.192L173.356,12.096C173.349,12.046 173.324,12 173.286,11.966C173.248,11.933 173.199,11.913 173.148,11.912C173.096,11.911 173.045,11.93 173.006,11.964C172.966,11.998 172.94,12.045 172.932,12.096L172.62,14.192C172.529,14.802 172.309,15.386 171.975,15.904C171.642,16.423 171.202,16.865 170.684,17.2L170.412,17.376C170.381,17.393 170.354,17.419 170.336,17.45C170.318,17.481 170.308,17.516 170.308,17.552C170.309,17.589 170.319,17.625 170.337,17.657C170.355,17.689 170.381,17.716 170.412,17.736L170.684,17.912C171.202,18.245 171.643,18.685 171.977,19.203C172.31,19.72 172.53,20.303 172.62,20.912L172.932,23.016C172.942,23.066 172.968,23.111 173.008,23.144C173.047,23.176 173.097,23.193 173.148,23.192C173.198,23.191 173.245,23.173 173.283,23.141C173.321,23.109 173.347,23.065 173.356,23.016L173.668,20.912C173.758,20.302 173.979,19.718 174.314,19.201C174.649,18.683 175.092,18.244 175.612,17.912L175.884,17.736C175.913,17.715 175.937,17.687 175.954,17.656C175.97,17.624 175.979,17.588 175.98,17.552C175.98,17.517 175.971,17.483 175.955,17.452C175.938,17.421 175.914,17.395 175.884,17.376L175.612,17.2Z"/>
+        <path android:fillColor="#8086ff" android:pathData="M31.316,47.288C30.351,46.674 29.53,45.862 28.906,44.904C28.282,43.946 27.871,42.866 27.7,41.736L27.116,37.848C27.103,37.755 27.056,37.671 26.986,37.609C26.916,37.547 26.826,37.513 26.732,37.512C26.637,37.513 26.546,37.547 26.474,37.608C26.403,37.67 26.355,37.755 26.34,37.848L25.764,41.736C25.596,42.864 25.188,43.943 24.568,44.901C23.949,45.858 23.132,46.672 22.172,47.288L21.668,47.616C21.612,47.651 21.566,47.699 21.534,47.757C21.502,47.814 21.485,47.878 21.484,47.944C21.485,48.01 21.502,48.074 21.534,48.132C21.566,48.189 21.612,48.237 21.668,48.272L22.172,48.6C23.137,49.221 23.958,50.043 24.578,51.009C25.197,51.975 25.602,53.063 25.764,54.2L26.34,58.08C26.355,58.173 26.403,58.258 26.474,58.32C26.546,58.381 26.637,58.415 26.732,58.416C26.826,58.415 26.916,58.381 26.986,58.319C27.056,58.257 27.103,58.173 27.116,58.08L27.7,54.184C27.862,53.048 28.266,51.959 28.886,50.993C29.506,50.027 30.326,49.205 31.292,48.584L31.796,48.256C31.851,48.221 31.896,48.172 31.926,48.115C31.957,48.057 31.973,47.993 31.972,47.928C31.973,47.863 31.957,47.799 31.926,47.741C31.896,47.684 31.851,47.635 31.796,47.6L31.316,47.288Z"/>
+        <path android:fillColor="#62ffa4" android:pathData="M112.954,71.558L110.531,73.194L114.621,79.256L117.045,77.621L112.954,71.558Z"/>
+        <path android:fillColor="#44bcff" android:pathData="M141.674,49.886L139.25,51.521L143.341,57.584L145.764,55.949L141.674,49.886Z"/>
+        <path android:fillColor="#62ffa4" android:pathData="M54.429,44.453L55.103,41.612L47.996,39.926L47.322,42.768L54.429,44.453Z"/>
+        <path android:fillColor="#8086ff" android:pathData="M61.362,48.715L59.699,47.274L56.105,51.422L57.768,52.863L61.362,48.715Z"/>
+        <path android:fillColor="#fff29a" android:pathData="M93.958,87.778L92.464,86.484L89.232,90.215L90.725,91.509L93.958,87.778Z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/discovery_empty_state.xml b/app/src/main/res/drawable-anydpi-v24/discovery_empty_state.xml
index d931378086..7eaa026ec4 100644
--- a/app/src/main/res/drawable-anydpi-v24/discovery_empty_state.xml
+++ b/app/src/main/res/drawable-anydpi-v24/discovery_empty_state.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="70dp" android:width="80dp" android:viewportWidth="80" android:viewportHeight="70">
     <path android:fillColor="#7196ff" android:pathData="M39.8509,67.7393C39.3441,67.7412 38.8418,67.643 38.3729,67.4501C37.904,67.2573 37.4776,66.9737 37.1181,66.6155C36.7587,66.2573 36.4732,65.8315 36.2781,65.3626C36.0829,64.8937 35.9819,64.3908 35.9808,63.8828C35.971,60.2068 35.9563,54.7086 35.9497,51.0425C35.948,50.017 36.3523,49.0328 37.074,48.306C37.7956,47.5792 38.7756,47.1693 39.7985,47.1663C40.8213,47.1658 41.8025,47.5725 42.5263,48.2969C43.2502,49.0212 43.6575,50.0041 43.6588,51.0293C43.6588,54.6938 43.6801,60.1871 43.6899,63.8614C43.6912,64.3695 43.5926,64.8729 43.3998,65.3428C43.207,65.8127 42.9237,66.2399 42.5661,66.6C42.2086,66.9601 41.7837,67.2461 41.3159,67.4416C40.848,67.637 40.3463,67.7382 39.8395,67.7393H39.8509Z"/>
     <path android:fillColor="#7196ff" android:pathData="M54.5929,63.0635C53.1189,59.7439 50.9275,54.7989 49.4453,51.4497C48.651,49.6536 49.2275,47.4832 50.9046,46.4636C51.3738,46.1759 51.8989,45.9919 52.4447,45.924C52.9906,45.8561 53.5446,45.9058 54.0697,46.0697C54.5949,46.2337 55.079,46.5082 55.4898,46.8748C55.9007,47.2414 56.2286,47.6918 56.4518,48.1957C57.9259,51.5433 60.1598,56.5687 61.6486,59.9228C61.8542,60.3874 61.9665,60.8881 61.979,61.3962C61.9916,61.9043 61.904,62.4099 61.7215,62.8841C61.539,63.3583 61.265,63.7918 60.9153,64.1597C60.5655,64.5277 60.1469,64.823 59.6832,65.0287C58.7482,65.4443 57.6868,65.4708 56.7323,65.1023C55.7778,64.7338 55.0083,64.0005 54.5929,63.0635Z"/>
-    <path android:fillColor="@drawable/res_2131230734_discovery_empty_state__0" android:pathData="M22.4282,52.8353C22.4282,52.7631 22.4282,52.6925 22.4282,52.6186C22.7558,47.0071 23.9022,41.9767 28.3865,35.6592C28.9035,34.9301 29.6881,34.4367 30.5679,34.2875C31.4478,34.1383 32.3507,34.3456 33.078,34.8638C33.8054,35.3819 34.2976,36.1685 34.4464,37.0504C34.5952,37.9324 34.3884,38.8375 33.8715,39.5666C30.288,44.6117 29.4266,48.3172 29.1514,53.0094C29.1041,53.8864 28.7173,54.7103 28.0732,55.3058C27.4292,55.9013 26.5788,56.2215 25.703,56.1982C24.8271,56.1749 23.9949,55.8099 23.3833,55.181C22.7717,54.552 22.4291,53.7087 22.4282,52.8304V52.8353Z"/>
+    <path android:fillColor="@drawable/res_2131230737_discovery_empty_state__0" android:pathData="M22.4282,52.8353C22.4282,52.7631 22.4282,52.6925 22.4282,52.6186C22.7558,47.0071 23.9022,41.9767 28.3865,35.6592C28.9035,34.9301 29.6881,34.4367 30.5679,34.2875C31.4478,34.1383 32.3507,34.3456 33.078,34.8638C33.8054,35.3819 34.2976,36.1685 34.4464,37.0504C34.5952,37.9324 34.3884,38.8375 33.8715,39.5666C30.288,44.6117 29.4266,48.3172 29.1514,53.0094C29.1041,53.8864 28.7173,54.7103 28.0732,55.3058C27.4292,55.9013 26.5788,56.2215 25.703,56.1982C24.8271,56.1749 23.9949,55.8099 23.3833,55.181C22.7717,54.552 22.4291,53.7087 22.4282,52.8304V52.8353Z"/>
     <path android:fillColor="#7196ff" android:pathData="M28.9627,30.3771L22.7966,32.2786C21.9791,32.5307 21.0952,32.4469 20.3393,32.0458C19.5835,31.6446 19.0175,30.9588 18.7661,30.1394L16.6322,23.1863C16.3807,22.3669 16.4642,21.4808 16.8645,20.7231C17.2647,19.9654 17.9487,19.3981 18.7662,19.146L24.9323,17.2445L28.9631,30.3786L28.9627,30.3771Z"/>
     <path android:fillColor="#bacfff" android:pathData="M25.7424,28.8337L22.6633,29.7833C22.2543,29.9094 21.8122,29.8675 21.4341,29.6668C21.0559,29.4661 20.7728,29.1231 20.647,28.7131L18.9875,23.3057C18.8617,22.8958 18.9035,22.4525 19.1037,22.0735C19.3039,21.6945 19.6461,21.4107 20.0551,21.2846L23.1342,20.335L25.7424,28.8337Z"/>
     <path android:fillColor="#7196ff" android:pathData="M53.7053,8.3679L59.8714,6.4663C60.2764,6.3412 60.702,6.2973 61.1239,6.3372C61.5458,6.3771 61.9557,6.4999 62.3302,6.6987C62.7047,6.8974 63.0365,7.1683 63.3065,7.4956C63.5766,7.823 63.7796,8.2005 63.904,8.6066L66.0379,15.5597C66.2893,16.3791 66.2058,17.2652 65.8056,18.0229C65.4054,18.7806 64.7213,19.3479 63.9038,19.6L57.7361,21.502L53.7053,8.3679Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_create.xml b/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_create.xml
index 870b76054c..8549c31d69 100644
--- a/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_create.xml
+++ b/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_create.xml
@@ -16,7 +16,7 @@
     <path android:fillColor="#cbd5e0" android:pathData="M23.4337,28.3415L23.4375,28.3377C24.4167,27.3586 24.4167,25.7712 23.4375,24.7922L19.6936,21.0487C18.7144,20.0697 17.1269,20.0697 16.1477,21.0487L16.1439,21.0525C15.1647,22.0316 15.1647,23.619 16.1439,24.5981L19.8877,28.3415C20.8669,29.3206 22.4545,29.3206 23.4337,28.3415Z"/>
     <path android:fillColor="#cbd5e0" android:pathData="M19.8839,31.8888L19.8877,31.885C20.8669,30.9059 20.8669,29.3185 19.8877,28.3394L16.1438,24.596C15.1646,23.6169 13.5771,23.6169 12.5979,24.596L12.5941,24.5998C11.6149,25.5789 11.6149,27.1663 12.5941,28.1454L16.3379,31.8888C17.3171,32.8679 18.9047,32.8679 19.8839,31.8888Z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M30.3682,19.6599V19.6546C30.3682,18.2699 29.2456,17.1475 27.8608,17.1475H23.4809C22.0961,17.1475 20.9735,18.2699 20.9735,19.6546V19.6599C20.9735,21.0446 22.0961,22.167 23.4809,22.167H27.8608C29.2456,22.167 30.3682,21.0446 30.3682,19.6599Z"/>
-    <path android:fillColor="@drawable/res_2131230735_drawable_guild_template_create__0" android:pathData="M25.6424,37.7917L35.2759,28.1593L34.4312,27.3148L24.7977,36.9472L25.6424,37.7917Z"/>
+    <path android:fillColor="@drawable/res_2131230738_drawable_guild_template_create__0" android:pathData="M25.6424,37.7917L35.2759,28.1593L34.4312,27.3148L24.7977,36.9472L25.6424,37.7917Z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M27.1781,39.3244L36.7165,29.7871C37.2145,29.2892 37.2153,28.4827 36.7184,27.9858C36.2214,27.4889 35.4148,27.4897 34.9168,27.9877L25.3785,37.525C24.8804,38.0229 24.8796,38.8294 25.3765,39.3263C25.8735,39.8232 26.6801,39.8224 27.1781,39.3244Z"/>
     <path android:fillColor="#f7d036" android:pathData="M42.0607,12.978C42.0607,12.7938 41.9126,12.6444 41.7298,12.6444C41.5471,12.6444 41.3989,12.7938 41.3989,12.978V13.3062C41.3989,13.4904 41.5471,13.6397 41.7298,13.6397C41.9126,13.6397 42.0607,13.4904 42.0607,13.3062V12.978Z"/>
     <path android:fillColor="#f7d036" android:pathData="M42.0607,15.6303C42.0607,15.4461 41.9126,15.2968 41.7298,15.2968C41.5471,15.2968 41.3989,15.4461 41.3989,15.6303V15.9585C41.3989,16.1427 41.5471,16.2921 41.7298,16.2921C41.9126,16.2921 42.0607,16.1427 42.0607,15.9585V15.6303Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_study.xml b/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_study.xml
index 9649364cab..f1dcfafa2e 100644
--- a/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_study.xml
+++ b/app/src/main/res/drawable-anydpi-v24/drawable_guild_template_study.xml
@@ -14,7 +14,7 @@
     <path android:fillColor="#f47fff" android:pathData="M15.6164,15.6841H26.0595C26.2018,15.6841 26.3383,15.7406 26.4389,15.8412C26.5395,15.9419 26.5961,16.0784 26.5961,16.2207V23.1965H15.1211V16.2207C15.1207,16.0852 15.1715,15.9547 15.2634,15.8551C15.3553,15.7556 15.4814,15.6945 15.6164,15.6841Z"/>
     <path android:fillColor="#d4e4ff" android:pathData="M28.247,16.427H27.2563V23.1799H28.247V16.427Z"/>
     <path android:fillColor="#00000000" android:pathData="M31.1776,22.7424V19.399C31.0131,16.8232 29.8739,14.4067 27.9916,12.6408C26.1093,10.8748 23.6251,9.892 21.0441,9.892C18.4631,9.892 15.9789,10.8748 14.0966,12.6408C12.2143,14.4067 11.0751,16.8232 10.9106,19.399V22.7424" android:strokeColor="#000000" android:strokeWidth="1" android:strokeLineCap="round"/>
-    <path android:fillColor="@drawable/res_2131230736_drawable_guild_template_study__0" android:pathData="M31.1776,33.1029V22.7424C31.1776,20.7611 29.2375,19.2339 27.3801,19.853C26.8915,20.0174 26.4517,20.3011 26.1005,20.6786H9.1357V33.1029H31.1776Z"/>
+    <path android:fillColor="@drawable/res_2131230739_drawable_guild_template_study__0" android:pathData="M31.1776,33.1029V22.7424C31.1776,20.7611 29.2375,19.2339 27.3801,19.853C26.8915,20.0174 26.4517,20.3011 26.1005,20.6786H9.1357V33.1029H31.1776Z"/>
     <path android:fillColor="#4a76e6" android:pathData="M28.3296,19.688C27.8995,19.688 27.4743,19.7801 27.0827,19.9581C26.6911,20.1361 26.3422,20.3958 26.0594,20.7199C24.9901,21.8794 23.7843,22.905 22.4683,23.7744C19.744,25.6319 16.6483,26.7463 13.8827,26.7463C11.1172,26.7463 9.0946,25.6319 8.1452,23.8157C7.9381,23.3792 7.8437,22.8977 7.8707,22.4153C7.8977,21.9329 8.0453,21.465 8.2999,21.0544C8.5545,20.6438 8.908,20.3035 9.328,20.0648C9.7481,19.8261 10.2213,19.6965 10.7044,19.688H28.3296Z"/>
     <path android:fillColor="#00000000" android:pathData="M31.1777,21.0088V32.6489" android:strokeColor="#000000" android:strokeWidth="1" android:strokeLineCap="round"/>
     <path android:fillColor="#000000" android:pathData="M35.5119,17.4177V20.7612C35.5119,20.8159 35.5336,20.8684 35.5724,20.9071C35.6111,20.9458 35.6636,20.9675 35.7183,20.9675C35.773,20.9675 35.8255,20.9458 35.8642,20.9071C35.9029,20.8684 35.9247,20.8159 35.9247,20.7612V17.4177C35.9284,15.3342 35.2988,13.2987 34.1194,11.5811C32.9399,9.8635 31.2663,8.545 29.3204,7.8002C28.8516,7.5982 28.3448,7.4997 27.8344,7.5113H25.6055C28.2295,7.5222 30.7429,8.5694 32.5984,10.4248C34.4538,12.2803 35.501,14.7937 35.5119,17.4177Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro.xml b/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro.xml
index 2934f9d623..cb21966e84 100644
--- a/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro.xml
+++ b/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="80dp" android:width="80dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="@drawable/res_2131230737_drawable_ic_nitro__0" android:pathData="M5,0L75,0A5,5 0,0 1,80 5L80,75A5,5 0,0 1,75 80L5,80A5,5 0,0 1,0 75L0,5A5,5 0,0 1,5 0z" android:fillType="evenOdd"/>
+    <path android:fillColor="@drawable/res_2131230740_drawable_ic_nitro__0" android:pathData="M5,0L75,0A5,5 0,0 1,80 5L80,75A5,5 0,0 1,75 80L5,80A5,5 0,0 1,0 75L0,5A5,5 0,0 1,5 0z" android:fillType="evenOdd"/>
     <path android:fillColor="#ffffff" android:pathData="M14.4742,33.3947C14.4742,34.4396 13.5861,35.3101 12.5202,35.3101L11.4543,35.3101C10.3884,35.3101 9.4999,34.4396 9.4999,33.3947C9.4999,32.3499 10.3884,31.4793 11.4543,31.4793L12.5202,31.4793C13.5861,31.4793 14.4742,32.3499 14.4742,33.3947ZM62.6169,32.8723C67.2356,42.4501 62.9721,53.9432 52.8461,58.4707C43.0757,62.8243 31.3509,58.645 26.9095,49.0672C26.0214,47.1518 25.4885,45.0622 25.3107,42.9725L21.4023,42.9725C20.3364,42.9725 19.4483,42.1015 19.4483,41.0567C19.4483,40.0119 20.3364,39.1413 21.4023,39.1413L27.0873,39.1413C28.1532,39.1413 29.0413,38.2708 29.0413,37.2259C29.0413,36.1811 28.1532,35.3101 27.0873,35.3101L18.0273,35.3101C16.9614,35.3101 16.0728,34.4396 16.0728,33.3947C16.0728,32.3499 16.9614,31.4793 18.0273,31.4793L30.6402,31.4793C31.7061,31.4793 32.5942,30.6084 32.5942,29.5635C32.5942,28.5187 31.7061,27.6481 30.6402,27.6481L25.4885,27.6481C23.8897,27.6481 22.4682,26.429 22.4682,24.6879C22.4682,23.1207 23.7119,21.7273 25.4885,21.7273L45.5626,21.7273C52.6687,22.0758 59.4192,26.0809 62.6169,32.8723ZM40.1657,30.9514C34.5485,33.4799 32.0854,39.9934 34.6649,45.4997C37.2443,51.0059 43.8891,53.4203 49.5064,50.8918C55.124,48.3633 57.5867,41.8498 55.0072,36.3436C52.4278,30.8373 45.783,28.4229 40.1657,30.9514ZM49.1156,34.6137L52.6685,40.5346C52.8463,40.8827 52.8463,41.057 52.6685,41.4051L49.1156,47.326C48.9379,47.6741 48.5827,47.6741 48.4049,47.6741L41.4766,47.6741C41.1215,47.6741 40.9437,47.4998 40.7663,47.326L37.2131,41.4051C37.0357,41.057 37.0357,40.8827 37.2131,40.5346L40.7663,34.6137C40.9437,34.2656 41.2993,34.2656 41.4766,34.2656L48.4049,34.2656C48.7605,34.0913 48.9379,34.2656 49.1156,34.6137Z" android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro_classic.xml b/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro_classic.xml
index 505e0b65cb..a2032f52fc 100644
--- a/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro_classic.xml
+++ b/app/src/main/res/drawable-anydpi-v24/drawable_ic_nitro_classic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="80dp" android:width="80dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="@drawable/res_2131230738_drawable_ic_nitro_classic__0" android:pathData="M5,0L75,0A5,5 0,0 1,80 5L80,75A5,5 0,0 1,75 80L5,80A5,5 0,0 1,0 75L0,5A5,5 0,0 1,5 0z" android:fillType="evenOdd"/>
+    <path android:fillColor="@drawable/res_2131230741_drawable_ic_nitro_classic__0" android:pathData="M5,0L75,0A5,5 0,0 1,80 5L80,75A5,5 0,0 1,75 80L5,80A5,5 0,0 1,0 75L0,5A5,5 0,0 1,5 0z" android:fillType="evenOdd"/>
     <path android:fillColor="#ffffff" android:pathData="M14.4742,33.3947C14.4742,34.4396 13.5861,35.3101 12.5202,35.3101L11.4543,35.3101C10.3884,35.3101 9.4999,34.4396 9.4999,33.3947C9.4999,32.3499 10.3884,31.4793 11.4543,31.4793L12.5202,31.4793C13.5861,31.4793 14.4742,32.3499 14.4742,33.3947ZM62.6169,32.8723C67.2356,42.4501 62.9721,53.9432 52.8461,58.4707C43.0757,62.8243 31.3509,58.645 26.9095,49.0672C26.0214,47.1518 25.4885,45.0622 25.3107,42.9725L21.4023,42.9725C20.3364,42.9725 19.4483,42.1015 19.4483,41.0567C19.4483,40.0119 20.3364,39.1413 21.4023,39.1413L27.0873,39.1413C28.1532,39.1413 29.0413,38.2708 29.0413,37.2259C29.0413,36.1811 28.1532,35.3101 27.0873,35.3101L18.0273,35.3101C16.9614,35.3101 16.0728,34.4396 16.0728,33.3947C16.0728,32.3499 16.9614,31.4793 18.0273,31.4793L30.6402,31.4793C31.7061,31.4793 32.5942,30.6084 32.5942,29.5635C32.5942,28.5187 31.7061,27.6481 30.6402,27.6481L25.4885,27.6481C23.8897,27.6481 22.4682,26.429 22.4682,24.6879C22.4682,23.1207 23.7119,21.7273 25.4885,21.7273L45.5626,21.7273C52.6687,22.0758 59.4192,26.0809 62.6169,32.8723ZM40.1657,30.9514C34.5485,33.4799 32.0854,39.9934 34.6649,45.4997C37.2443,51.0059 43.8891,53.4203 49.5064,50.8918C55.124,48.3633 57.5867,41.8498 55.0072,36.3436C52.4278,30.8373 45.783,28.4229 40.1657,30.9514ZM49.1156,34.6137L52.6685,40.5346C52.8463,40.8827 52.8463,41.057 52.6685,41.4051L49.1156,47.326C48.9379,47.6741 48.5827,47.6741 48.4049,47.6741L41.4766,47.6741C41.1215,47.6741 40.9437,47.4998 40.7663,47.326L37.2131,41.4051C37.0357,41.057 37.0357,40.8827 37.2131,40.5346L40.7663,34.6137C40.9437,34.2656 41.2993,34.2656 41.4766,34.2656L48.4049,34.2656C48.7605,34.0913 48.9379,34.2656 49.1156,34.6137Z" android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_1.xml b/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_1.xml
index 8c5ad37c6d..f56f465e93 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_1.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_1.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="32dp" android:width="32dp" android:viewportWidth="32" android:viewportHeight="32">
-    <path android:fillColor="@drawable/res_2131230739_ic_boosted_guild_tier_1__0" android:pathData="M16,1L7,10V22L16,31L25,22V10L16,1ZM20.62,11.27L16.5,7.16V2.91L23.62,10.03L20.62,11.27ZM12,19.93V12.07L16,8.07L20,12.07V19.93L16,23.93L12,19.93ZM15.5,7.16L11.38,11.28L8.38,10.04L15.5,2.91V7.16ZM11,12.2V19.8L8,21.04V10.96L11,12.2ZM11.38,20.73L15.5,24.85V29.09L8.38,21.97L11.38,20.73ZM16.5,24.84L20.62,20.72L23.62,21.96L16.5,29.09V24.84ZM21,19.8V12.2L24,10.96V21.05L21,19.8Z"/>
+    <path android:fillColor="@drawable/res_2131230742_ic_boosted_guild_tier_1__0" android:pathData="M16,1L7,10V22L16,31L25,22V10L16,1ZM20.62,11.27L16.5,7.16V2.91L23.62,10.03L20.62,11.27ZM12,19.93V12.07L16,8.07L20,12.07V19.93L16,23.93L12,19.93ZM15.5,7.16L11.38,11.28L8.38,10.04L15.5,2.91V7.16ZM11,12.2V19.8L8,21.04V10.96L11,12.2ZM11.38,20.73L15.5,24.85V29.09L8.38,21.97L11.38,20.73ZM16.5,24.84L20.62,20.72L23.62,21.96L16.5,29.09V24.84ZM21,19.8V12.2L24,10.96V21.05L21,19.8Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_2.xml b/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_2.xml
index eff906e98d..1ae102593f 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_2.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_2.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="32dp" android:width="32dp" android:viewportWidth="32" android:viewportHeight="32">
-    <path android:fillColor="@drawable/res_2131230740_ic_boosted_guild_tier_2__0" android:pathData="M16.5,1.46L24.62,9.58L20.62,11.23L16.5,7.12V1.46ZM11,12.16L7,10.5V21.42L11,19.76V12.16ZM16.5,24.8001V30.4601L24.62,22.3401L20.62,20.6801L16.5,24.8001ZM15.5,7.12V1.46L7.38,9.58L11.38,11.23L15.5,7.12ZM15.5,30.46L7.38,22.34L11.38,20.68L15.5,24.8V30.46ZM21,19.76L25,21.42V10.5L21,12.16V19.76ZM16,8.03L20,12.03V19.89L16,23.89L12,19.89V12.03L16,8.03Z" android:fillType="evenOdd"/>
+    <path android:fillColor="@drawable/res_2131230743_ic_boosted_guild_tier_2__0" android:pathData="M16.5,1.46L24.62,9.58L20.62,11.23L16.5,7.12V1.46ZM11,12.16L7,10.5V21.42L11,19.76V12.16ZM16.5,24.8001V30.4601L24.62,22.3401L20.62,20.6801L16.5,24.8001ZM15.5,7.12V1.46L7.38,9.58L11.38,11.23L15.5,7.12ZM15.5,30.46L7.38,22.34L11.38,20.68L15.5,24.8V30.46ZM21,19.76L25,21.42V10.5L21,12.16V19.76ZM16,8.03L20,12.03V19.89L16,23.89L12,19.89V12.03L16,8.03Z" android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_3.xml b/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_3.xml
index 599f9df403..35f2a2f7c0 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_3.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_boosted_guild_tier_3.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="32dp" android:width="32dp" android:viewportWidth="32" android:viewportHeight="32">
-    <path android:fillColor="@drawable/res_2131230741_ic_boosted_guild_tier_3__0" android:pathData="M29,2C29,2.55 28.55,3 28,3C27.45,3 27,2.55 27,2V1C27,0.45 27.45,0 28,0C28.55,0 29,0.45 29,1V2ZM2.94,25.94L4,24L5.06,25.94L7,27L5.06,28.06L4,30L2.94,28.06L1,27L2.94,25.94ZM28,5C27.45,5 27,5.45 27,6V7C27,7.55 27.45,8 28,8C28.55,8 29,7.55 29,7V6C29,5.45 28.56,5 28,5ZM30,3H31C31.56,3 32,3.45 32,4C32,4.55 31.55,5 31,5H30C29.45,5 29,4.55 29,4C29,3.45 29.45,3 30,3ZM26,3H25C24.45,3 24,3.45 24,4C24,4.55 24.45,5 25,5H26C26.55,5 27,4.55 27,4C27,3.45 26.56,3 26,3ZM15.6201,1.46V7.12L11.5001,11.23L7.5001,9.58L15.6201,1.46ZM24.7401,9.58L16.6201,1.46V7.12L20.7401,11.23L24.7401,9.58ZM7.1201,10.5L11.1201,12.16V19.76L7.1201,21.42V10.5ZM16.6201,24.8V30.46L24.7401,22.34L20.7401,20.68L16.6201,24.8ZM15.6201,30.46L7.5001,22.34L11.5001,20.68L15.6201,24.8V30.46ZM21.1201,19.76L25.1201,21.42V10.5L21.1201,12.16V19.76ZM19.7301,11.64L20.1201,12.03V19.89L16.1201,23.89L12.1201,19.89V19.38L19.7301,11.64ZM12.1201,17.95L19.0201,10.93L18.2401,10.15L12.1201,16.38V17.95ZM17.5301,9.44L12.1201,14.95V12.03L16.1201,8.03L17.5301,9.44Z" android:fillType="evenOdd"/>
+    <path android:fillColor="@drawable/res_2131230744_ic_boosted_guild_tier_3__0" android:pathData="M29,2C29,2.55 28.55,3 28,3C27.45,3 27,2.55 27,2V1C27,0.45 27.45,0 28,0C28.55,0 29,0.45 29,1V2ZM2.94,25.94L4,24L5.06,25.94L7,27L5.06,28.06L4,30L2.94,28.06L1,27L2.94,25.94ZM28,5C27.45,5 27,5.45 27,6V7C27,7.55 27.45,8 28,8C28.55,8 29,7.55 29,7V6C29,5.45 28.56,5 28,5ZM30,3H31C31.56,3 32,3.45 32,4C32,4.55 31.55,5 31,5H30C29.45,5 29,4.55 29,4C29,3.45 29.45,3 30,3ZM26,3H25C24.45,3 24,3.45 24,4C24,4.55 24.45,5 25,5H26C26.55,5 27,4.55 27,4C27,3.45 26.56,3 26,3ZM15.6201,1.46V7.12L11.5001,11.23L7.5001,9.58L15.6201,1.46ZM24.7401,9.58L16.6201,1.46V7.12L20.7401,11.23L24.7401,9.58ZM7.1201,10.5L11.1201,12.16V19.76L7.1201,21.42V10.5ZM16.6201,24.8V30.46L24.7401,22.34L20.7401,20.68L16.6201,24.8ZM15.6201,30.46L7.5001,22.34L11.5001,20.68L15.6201,24.8V30.46ZM21.1201,19.76L25.1201,21.42V10.5L21.1201,12.16V19.76ZM19.7301,11.64L20.1201,12.03V19.89L16.1201,23.89L12.1201,19.89V19.38L19.7301,11.64ZM12.1201,17.95L19.0201,10.93L18.2401,10.15L12.1201,16.38V17.95ZM17.5301,9.44L12.1201,14.95V12.03L16.1201,8.03L17.5301,9.44Z" android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_hub_24dp.xml b/app/src/main/res/drawable-anydpi-v24/ic_hub_24dp.xml
new file mode 100644
index 0000000000..36563b8218
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_hub_24dp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#ffffff" android:pathData="M12.75,18L12.75,6L11.25,6L11.25,18L12.75,18Z" android:fillType="evenOdd"/>
+    <path android:fillColor="#ffffff" android:pathData="M6.5,12.75C5.8096,12.75 5.25,13.3096 5.25,14V18H3.75V14C3.75,12.4812 4.9812,11.25 6.5,11.25H17.5C19.0188,11.25 20.25,12.4812 20.25,14V18H18.75V14C18.75,13.3096 18.1904,12.75 17.5,12.75H6.5Z" android:fillType="evenOdd"/>
+    <path android:fillColor="#ffffff" android:pathData="M12,7C10.6193,7 9.5,5.8807 9.5,4.5C9.5,3.1193 10.6193,2 12,2C13.3807,2 14.5,3.1193 14.5,4.5C14.5,5.8807 13.3807,7 12,7Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M19.5,22C18.1193,22 17,20.8807 17,19.5C17,18.1193 18.1193,17 19.5,17C20.8807,17 22,18.1193 22,19.5C22,20.8807 20.8807,22 19.5,22Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M12,22C10.6193,22 9.5,20.8807 9.5,19.5C9.5,18.1193 10.6193,17 12,17C13.3807,17 14.5,18.1193 14.5,19.5C14.5,20.8807 13.3807,22 12,22Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M4.5,22C3.1193,22 2,20.8807 2,19.5C2,18.1193 3.1193,17 4.5,17C5.8807,17 7,18.1193 7,19.5C7,20.8807 5.8807,22 4.5,22Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_mentions_empty.xml b/app/src/main/res/drawable-anydpi-v24/ic_mentions_empty.xml
new file mode 100644
index 0000000000..3d5b7bb5b1
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_mentions_empty.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="80dp" android:width="121dp" android:viewportWidth="121" android:viewportHeight="80">
+    <path android:fillColor="#36393f" android:pathData="M60.5,40m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"/>
+    <path android:fillColor="#ffffff" android:pathData="M63.833,41.667C63.833,43.5 62.333,45 60.5,45C58.667,45 57.167,43.5 57.167,41.667C57.167,39.833 58.667,38.333 60.5,38.333C62.333,38.333 63.833,39.833 63.833,41.667ZM54.667,53.333V52.5C54.667,49.667 57.067,47.5 60.5,47.5C63.933,47.5 66.333,49.667 66.333,52.5V53.333H54.667ZM52.167,41.667C52.167,37.067 55.9,33.333 60.5,33.333C65.1,33.333 68.833,37.067 68.833,41.667C68.833,43.183 68.4,44.583 67.683,45.817L69.867,47.083C70.783,45.483 71.333,43.65 71.333,41.667C71.333,35.7 66.467,30.833 60.5,30.833C54.533,30.833 49.667,35.7 49.667,41.667C49.667,43.633 50.2,45.483 51.133,47.083L53.317,45.817C52.6,44.583 52.167,43.183 52.167,41.667ZM44.667,41.667C44.667,32.917 51.75,25.833 60.5,25.833C69.25,25.833 76.333,32.917 76.333,41.667C76.333,44.55 75.55,47.25 74.2,49.583L76.35,50.833C77.917,48.133 78.833,45 78.833,41.667C78.833,31.55 70.617,23.333 60.5,23.333C50.383,23.333 42.167,31.55 42.167,41.667C42.167,45 43.083,48.133 44.633,50.817L46.783,49.567C45.45,47.25 44.667,44.55 44.667,41.667Z" android:fillType="evenOdd"/>
+    <path android:fillColor="#58f287" android:pathData="M104.171,1.806C104.171,0.809 103.363,0 102.365,0C101.368,0 100.559,0.809 100.559,1.806V3.643C100.559,4.64 101.368,5.449 102.365,5.449C103.363,5.449 104.171,4.64 104.171,3.643V1.806Z"/>
+    <path android:fillColor="#58f287" android:pathData="M104.171,16.357C104.171,15.36 103.362,14.551 102.365,14.551C101.367,14.551 100.558,15.36 100.558,16.357V18.194C100.558,19.191 101.367,20 102.365,20C103.362,20 104.171,19.191 104.171,18.194V16.357Z"/>
+    <path android:fillColor="#58f287" android:pathData="M110.694,11.841C111.691,11.841 112.5,11.032 112.5,10.035C112.5,9.037 111.691,8.228 110.694,8.228H108.857C107.86,8.228 107.051,9.037 107.051,10.035C107.051,11.032 107.86,11.841 108.857,11.841H110.694Z"/>
+    <path android:fillColor="#58f287" android:pathData="M96.143,11.741C97.141,11.741 97.95,10.932 97.95,9.935C97.95,8.937 97.141,8.129 96.143,8.129H94.307C93.309,8.129 92.501,8.937 92.501,9.935C92.501,10.932 93.309,11.741 94.307,11.741H96.143Z"/>
+    <path android:fillColor="#ffd01a" android:pathData="M19.65,74.457L23.815,73.068C24.019,72.975 24.192,72.824 24.314,72.635C24.435,72.445 24.5,72.225 24.5,72C24.5,71.775 24.435,71.555 24.314,71.365C24.192,71.176 24.019,71.025 23.815,70.932L19.65,69.543C19.366,69.414 19.138,69.186 19.009,68.902L17.514,64.735C17.444,64.521 17.308,64.335 17.126,64.203C16.944,64.071 16.725,64 16.5,64C16.275,64 16.056,64.071 15.874,64.203C15.692,64.335 15.556,64.521 15.486,64.735L13.991,68.902C13.862,69.186 13.634,69.414 13.35,69.543L9.185,70.932C8.981,71.025 8.808,71.176 8.686,71.365C8.565,71.555 8.5,71.775 8.5,72C8.5,72.225 8.565,72.445 8.686,72.635C8.808,72.824 8.981,72.975 9.185,73.068L13.35,74.457C13.501,74.503 13.639,74.586 13.75,74.698C13.862,74.809 13.945,74.947 13.991,75.098L15.486,79.265C15.556,79.479 15.692,79.665 15.874,79.797C16.056,79.929 16.275,80 16.5,80C16.725,80 16.944,79.929 17.126,79.797C17.308,79.665 17.444,79.479 17.514,79.265L19.009,75.098C19.055,74.947 19.138,74.809 19.25,74.698C19.361,74.586 19.499,74.503 19.65,74.457Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_nitro_badge_nitro_gradient_16dp.xml b/app/src/main/res/drawable-anydpi-v24/ic_nitro_badge_nitro_gradient_16dp.xml
index 9c1c56e761..8cd1b196ef 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_nitro_badge_nitro_gradient_16dp.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_nitro_badge_nitro_gradient_16dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="16dp" android:width="16dp" android:viewportWidth="16" android:viewportHeight="16">
-    <path android:fillColor="@drawable/res_2131230752_ic_nitro_badge_nitro_gradient_16dp__0" android:pathData="M1.472,6.7494C1.7563,6.7494 1.9931,6.5172 1.9931,6.2386C1.9931,5.96 1.7563,5.7278 1.472,5.7278H1.1878C0.9036,5.7278 0.6666,5.96 0.6666,6.2386C0.6666,6.5172 0.9036,6.7494 1.1878,6.7494H1.472ZM12.2256,12.9255C14.9259,11.7182 16.0628,8.6534 14.8312,6.0993C13.9785,4.2882 12.1783,3.2202 10.2834,3.1273H4.9303C4.4565,3.1273 4.1248,3.4989 4.1248,3.9168C4.1248,4.3811 4.5039,4.7062 4.9303,4.7062H6.304C6.5883,4.7062 6.8251,4.9383 6.8251,5.2169C6.8251,5.4956 6.5883,5.7278 6.304,5.7278H2.9406C2.6564,5.7278 2.4194,5.96 2.4194,6.2386C2.4194,6.5172 2.6564,6.7494 2.9406,6.7494H5.3566C5.6409,6.7494 5.8777,6.9816 5.8777,7.2603C5.8777,7.5389 5.6409,7.771 5.3566,7.771H3.8406C3.5564,7.771 3.3195,8.0032 3.3195,8.2818C3.3195,8.5604 3.5564,8.7927 3.8406,8.7927H4.8829C4.9303,9.3499 5.0724,9.9072 5.3092,10.4179C6.4936,12.972 9.6202,14.0865 12.2256,12.9255ZM7.3773,9.4666C6.6894,7.9982 7.3463,6.2613 8.8442,5.587C10.3421,4.9128 12.1141,5.5566 12.8019,7.025C13.4898,8.4933 12.8331,10.2302 11.335,10.9045C9.8371,11.5788 8.0652,10.9349 7.3773,9.4666Z" android:fillType="evenOdd"/>
-    <path android:fillColor="@drawable/res_2131230753_ic_nitro_badge_nitro_gradient_16dp__1" android:pathData="M11.2308,6.5637L12.1783,8.1426C12.2257,8.2354 12.2257,8.2819 12.1783,8.3747L11.2308,9.9536C11.1834,10.0464 11.0887,10.0464 11.0413,10.0464H9.1938C9.099,10.0464 9.0516,10 9.0043,9.9536L8.0568,8.3747C8.0095,8.2819 8.0095,8.2354 8.0568,8.1426L9.0043,6.5637C9.0516,6.4708 9.1465,6.4708 9.1938,6.4708H11.0413C11.1361,6.4243 11.1834,6.4708 11.2308,6.5637Z"/>
+    <path android:fillColor="@drawable/res_2131230755_ic_nitro_badge_nitro_gradient_16dp__0" android:pathData="M1.472,6.7494C1.7563,6.7494 1.9931,6.5172 1.9931,6.2386C1.9931,5.96 1.7563,5.7278 1.472,5.7278H1.1878C0.9036,5.7278 0.6666,5.96 0.6666,6.2386C0.6666,6.5172 0.9036,6.7494 1.1878,6.7494H1.472ZM12.2256,12.9255C14.9259,11.7182 16.0628,8.6534 14.8312,6.0993C13.9785,4.2882 12.1783,3.2202 10.2834,3.1273H4.9303C4.4565,3.1273 4.1248,3.4989 4.1248,3.9168C4.1248,4.3811 4.5039,4.7062 4.9303,4.7062H6.304C6.5883,4.7062 6.8251,4.9383 6.8251,5.2169C6.8251,5.4956 6.5883,5.7278 6.304,5.7278H2.9406C2.6564,5.7278 2.4194,5.96 2.4194,6.2386C2.4194,6.5172 2.6564,6.7494 2.9406,6.7494H5.3566C5.6409,6.7494 5.8777,6.9816 5.8777,7.2603C5.8777,7.5389 5.6409,7.771 5.3566,7.771H3.8406C3.5564,7.771 3.3195,8.0032 3.3195,8.2818C3.3195,8.5604 3.5564,8.7927 3.8406,8.7927H4.8829C4.9303,9.3499 5.0724,9.9072 5.3092,10.4179C6.4936,12.972 9.6202,14.0865 12.2256,12.9255ZM7.3773,9.4666C6.6894,7.9982 7.3463,6.2613 8.8442,5.587C10.3421,4.9128 12.1141,5.5566 12.8019,7.025C13.4898,8.4933 12.8331,10.2302 11.335,10.9045C9.8371,11.5788 8.0652,10.9349 7.3773,9.4666Z" android:fillType="evenOdd"/>
+    <path android:fillColor="@drawable/res_2131230756_ic_nitro_badge_nitro_gradient_16dp__1" android:pathData="M11.2308,6.5637L12.1783,8.1426C12.2257,8.2354 12.2257,8.2819 12.1783,8.3747L11.2308,9.9536C11.1834,10.0464 11.0887,10.0464 11.0413,10.0464H9.1938C9.099,10.0464 9.0516,10 9.0043,9.9536L8.0568,8.3747C8.0095,8.2819 8.0095,8.2354 8.0568,8.1426L9.0043,6.5637C9.0516,6.4708 9.1465,6.4708 9.1938,6.4708H11.0413C11.1361,6.4243 11.1834,6.4708 11.2308,6.5637Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_sticker_icon_20dp.xml b/app/src/main/res/drawable-anydpi-v24/ic_sticker_icon_24dp.xml
similarity index 92%
rename from app/src/main/res/drawable-anydpi-v24/ic_sticker_icon_20dp.xml
rename to app/src/main/res/drawable-anydpi-v24/ic_sticker_icon_24dp.xml
index 14d081aa6a..032ba6a6b1 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_sticker_icon_20dp.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_sticker_icon_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="20dp" android:width="20dp" android:viewportWidth="20" android:viewportHeight="20">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
     <path android:fillColor="#83ddc5" android:pathData="M12.0002,0.6626V5.402C12.0002,6.8397 13.1605,7.9998 14.5986,7.9998H19.3393C19.9245,7.9998 20.222,7.2958 19.8055,6.8794L13.1209,0.1966C12.7043,-0.2199 12.0002,0.0677 12.0002,0.6626ZM14.5759,10.0282C12.0336,10.0282 9.9699,7.9644 9.9699,5.4221V0.0583H1.994C0.8973,0.0583 0,0.9556 0,2.0523V18.0041C0,19.1007 0.8973,19.998 1.994,19.998H17.9457C19.0424,19.998 19.9397,19.1007 19.9397,18.0041V10.0282H14.5759ZM11.9998,12.2201C11.9998,13.3245 11.1046,14.2198 10.0002,14.2198C8.8958,14.2198 8.0005,13.3245 8.0005,12.2201H6.6674C6.6674,14.0607 8.1595,15.5529 10.0002,15.5529C11.8408,15.5529 13.3329,14.0607 13.3329,12.2201H11.9998ZM4.4456,13.331C4.4456,13.9446 3.9482,14.442 3.3347,14.442C2.7211,14.442 2.2238,13.9446 2.2238,13.331C2.2238,12.7175 2.7211,12.2201 3.3347,12.2201C3.9482,12.2201 4.4456,12.7175 4.4456,13.331ZM16.6657,14.442C17.2793,14.442 17.7766,13.9446 17.7766,13.331C17.7766,12.7175 17.2793,12.2201 16.6657,12.2201C16.0522,12.2201 15.5548,12.7175 15.5548,13.331C15.5548,13.9446 16.0522,14.442 16.6657,14.442Z" android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_age_gate_failure.xml b/app/src/main/res/drawable-anydpi-v24/img_age_gate_failure.xml
index db5f83719d..a9b3b9dd21 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_age_gate_failure.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_age_gate_failure.xml
@@ -3,10 +3,10 @@
     <group>
         <clip-path android:pathData="M0,0h252v167.618h-252z"/>
         <path android:fillColor="#9ecdff" android:pathData="M199.061,167.588L198.841,166.233L194.028,136.424L189.354,106.636L180.155,46.95C178.267,34.639 172.242,23.338 163.073,14.909C153.999,6.578 142.45,1.444 130.186,0.289C117.887,-0.885 105.556,2.177 95.235,8.969C84.827,15.862 77.071,26.089 73.24,37.97C72.822,39.465 72.323,40.96 71.994,42.455L71.127,47.02L69.951,54.992L67.569,70.938L62.716,102.65L60.254,118.595L57.723,134.481C56.029,145.075 54.354,155.669 52.571,166.243L52.341,167.598H72.841L74.276,166.99L74.217,167.598H177.185L177.096,166.691L178.571,167.598L199.061,167.588ZM161.03,156.775H75.233C75.851,150.168 76.509,143.57 77.157,136.973L78.731,120.957L80.386,104.962L83.714,72.971L85.428,57.025L86.315,49.053L86.824,45.694C87.013,44.578 87.362,43.512 87.611,42.405C88.84,38.046 90.801,33.928 93.411,30.227C97.416,24.596 102.8,20.087 109.047,17.132C115.295,14.178 122.196,12.877 129.089,13.354C138.392,14.041 147.134,18.065 153.705,24.686C160.166,31.196 164.216,39.713 165.186,48.833L171.415,108.898L174.405,138.946L176.129,156.775H161.03Z"/>
-        <path android:fillColor="@drawable/res_2131230754_img_age_gate_failure__0" android:pathData="M188.078,167.618H63.324L78.731,47.837C79.875,38.882 83.562,30.443 89.355,23.52C90.352,22.334 91.408,21.198 92.504,20.111C95.207,17.467 98.218,15.158 101.474,13.235C102.42,12.657 103.397,12.119 104.394,11.62C107.096,10.246 109.926,9.141 112.845,8.322C113.782,8.053 114.719,7.823 115.675,7.614C118.971,6.912 122.332,6.565 125.701,6.578C129.086,6.573 132.461,6.938 135.767,7.664C136.763,7.863 137.66,8.102 138.597,8.361C141.516,9.184 144.347,10.293 147.048,11.67C148.045,12.168 149.041,12.667 149.958,13.265C153.211,15.195 156.223,17.507 158.928,20.151C160.024,21.237 161.08,22.374 162.077,23.56C167.852,30.474 171.525,38.899 172.661,47.837L188.078,167.618Z"/>
-        <path android:fillColor="@drawable/res_2131230755_img_age_gate_failure__1" android:pathData="M230.045,146.42C241.846,146.42 251.412,136.854 251.412,125.053C251.412,113.253 241.846,103.686 230.045,103.686C218.244,103.686 208.678,113.253 208.678,125.053C208.678,136.854 218.244,146.42 230.045,146.42Z"/>
-        <path android:fillColor="@drawable/res_2131230756_img_age_gate_failure__2" android:pathData="M230.045,111.201C241.846,111.201 251.412,101.634 251.412,89.834C251.412,78.033 241.846,68.466 230.045,68.466C218.244,68.466 208.678,78.033 208.678,89.834C208.678,101.634 218.244,111.201 230.045,111.201Z"/>
-        <path android:fillColor="@drawable/res_2131230757_img_age_gate_failure__3" android:pathData="M125.701,6.578C137.205,6.576 148.315,10.764 156.957,18.356C165.599,25.949 171.181,36.429 172.661,47.837L188.078,167.578H63.324L78.731,47.837C80.209,36.426 85.792,25.944 94.436,18.351C103.081,10.757 114.195,6.572 125.701,6.578V6.578Z"/>
+        <path android:fillColor="@drawable/res_2131230757_img_age_gate_failure__0" android:pathData="M188.078,167.618H63.324L78.731,47.837C79.875,38.882 83.562,30.443 89.355,23.52C90.352,22.334 91.408,21.198 92.504,20.111C95.207,17.467 98.218,15.158 101.474,13.235C102.42,12.657 103.397,12.119 104.394,11.62C107.096,10.246 109.926,9.141 112.845,8.322C113.782,8.053 114.719,7.823 115.675,7.614C118.971,6.912 122.332,6.565 125.701,6.578C129.086,6.573 132.461,6.938 135.767,7.664C136.763,7.863 137.66,8.102 138.597,8.361C141.516,9.184 144.347,10.293 147.048,11.67C148.045,12.168 149.041,12.667 149.958,13.265C153.211,15.195 156.223,17.507 158.928,20.151C160.024,21.237 161.08,22.374 162.077,23.56C167.852,30.474 171.525,38.899 172.661,47.837L188.078,167.618Z"/>
+        <path android:fillColor="@drawable/res_2131230758_img_age_gate_failure__1" android:pathData="M230.045,146.42C241.846,146.42 251.412,136.854 251.412,125.053C251.412,113.253 241.846,103.686 230.045,103.686C218.244,103.686 208.678,113.253 208.678,125.053C208.678,136.854 218.244,146.42 230.045,146.42Z"/>
+        <path android:fillColor="@drawable/res_2131230759_img_age_gate_failure__2" android:pathData="M230.045,111.201C241.846,111.201 251.412,101.634 251.412,89.834C251.412,78.033 241.846,68.466 230.045,68.466C218.244,68.466 208.678,78.033 208.678,89.834C208.678,101.634 218.244,111.201 230.045,111.201Z"/>
+        <path android:fillColor="@drawable/res_2131230760_img_age_gate_failure__3" android:pathData="M125.701,6.578C137.205,6.576 148.315,10.764 156.957,18.356C165.599,25.949 171.181,36.429 172.661,47.837L188.078,167.578H63.324L78.731,47.837C80.209,36.426 85.792,25.944 94.436,18.351C103.081,10.757 114.195,6.572 125.701,6.578V6.578Z"/>
         <path android:fillColor="#365dec" android:pathData="M176.089,167.618H173.269L158.888,20.121C159.984,21.208 161.04,22.344 162.037,23.53L176.089,167.618Z"/>
         <path android:fillColor="#365dec" android:pathData="M160.064,167.618H157.253L147.048,11.67C148.045,12.168 149.041,12.667 149.958,13.265L160.064,167.618Z"/>
         <path android:fillColor="#365dec" android:pathData="M143.839,167.618H141.039L135.767,7.664C136.763,7.863 137.66,8.102 138.597,8.361L143.839,167.618Z"/>
@@ -29,8 +29,8 @@
         <path android:fillColor="#00000000" android:pathData="M57.418,113.949L64.289,115.981C66.474,116.628 68.77,115.381 69.416,113.195C70.062,111.01 68.815,108.715 66.63,108.069L59.759,106.036C57.574,105.389 55.278,106.637 54.632,108.822C53.986,111.007 55.233,113.302 57.418,113.949Z" android:strokeColor="#cce0ff" android:strokeWidth="3.7205" android:strokeLineCap="round" android:strokeLineJoin="round"/>
         <path android:fillColor="#cce0ff" android:pathData="M244.864,143.53H215.853C214.318,143.53 213.073,144.775 213.073,146.311V164.818C213.073,166.353 214.318,167.598 215.853,167.598H244.864C246.4,167.598 247.645,166.353 247.645,164.818V146.311C247.645,144.775 246.4,143.53 244.864,143.53Z"/>
         <path android:fillColor="#00000000" android:pathData="M213.073,149.898H247.645" android:strokeColor="#270813" android:strokeWidth="2.8119"/>
-        <path android:fillColor="@drawable/res_2131230758_img_age_gate_failure__4" android:pathData="M21.367,146.42C33.168,146.42 42.734,136.854 42.734,125.053C42.734,113.253 33.168,103.686 21.367,103.686C9.566,103.686 0,113.253 0,125.053C0,136.854 9.566,146.42 21.367,146.42Z"/>
-        <path android:fillColor="@drawable/res_2131230759_img_age_gate_failure__5" android:pathData="M21.367,111.201C33.168,111.201 42.734,101.634 42.734,89.834C42.734,78.033 33.168,68.466 21.367,68.466C9.566,68.466 0,78.033 0,89.834C0,101.634 9.566,111.201 21.367,111.201Z"/>
+        <path android:fillColor="@drawable/res_2131230761_img_age_gate_failure__4" android:pathData="M21.367,146.42C33.168,146.42 42.734,136.854 42.734,125.053C42.734,113.253 33.168,103.686 21.367,103.686C9.566,103.686 0,113.253 0,125.053C0,136.854 9.566,146.42 21.367,146.42Z"/>
+        <path android:fillColor="@drawable/res_2131230762_img_age_gate_failure__5" android:pathData="M21.367,111.201C33.168,111.201 42.734,101.634 42.734,89.834C42.734,78.033 33.168,68.466 21.367,68.466C9.566,68.466 0,78.033 0,89.834C0,101.634 9.566,111.201 21.367,111.201Z"/>
         <path android:fillColor="#cce0ff" android:pathData="M6.548,167.588H35.559C37.094,167.588 38.339,166.343 38.339,164.808V146.301C38.339,144.765 37.094,143.52 35.559,143.52H6.548C5.012,143.52 3.767,144.765 3.767,146.301V164.808C3.767,166.343 5.012,167.588 6.548,167.588Z"/>
         <path android:fillColor="#00000000" android:pathData="M38.339,149.898H3.767" android:strokeColor="#270813" android:strokeWidth="2.8119"/>
         <path android:fillColor="#ff87ff" android:pathData="M207.293,48.156L210.601,47C210.774,46.942 210.924,46.832 211.03,46.684C211.136,46.536 211.193,46.359 211.193,46.177C211.193,45.996 211.136,45.818 211.03,45.671C210.924,45.523 210.774,45.413 210.601,45.355L207.293,44.199C207.17,44.156 207.058,44.086 206.965,43.995C206.872,43.904 206.8,43.793 206.754,43.671L205.598,40.352C205.538,40.183 205.428,40.037 205.281,39.934C205.135,39.831 204.96,39.775 204.781,39.775C204.602,39.775 204.427,39.831 204.281,39.934C204.135,40.037 204.024,40.183 203.964,40.352L202.808,43.671C202.762,43.793 202.691,43.904 202.598,43.995C202.505,44.086 202.393,44.156 202.27,44.199L198.961,45.355C198.789,45.413 198.639,45.523 198.533,45.671C198.426,45.818 198.369,45.996 198.369,46.177C198.369,46.359 198.426,46.536 198.533,46.684C198.639,46.832 198.789,46.942 198.961,47L202.31,48.156C202.433,48.199 202.545,48.268 202.638,48.36C202.731,48.451 202.802,48.562 202.848,48.684L204.004,52.002C204.064,52.171 204.174,52.318 204.321,52.421C204.467,52.524 204.642,52.58 204.821,52.58C205,52.58 205.175,52.524 205.321,52.421C205.468,52.318 205.578,52.171 205.638,52.002L206.794,48.684C206.835,48.566 206.901,48.458 206.987,48.366C207.073,48.275 207.177,48.204 207.293,48.156V48.156Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_age_gate_safety.xml b/app/src/main/res/drawable-anydpi-v24/img_age_gate_safety.xml
index 7aef2e4fff..f689a74f7e 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_age_gate_safety.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_age_gate_safety.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="90dp" android:width="120dp" android:viewportWidth="120" android:viewportHeight="90">
-    <path android:fillColor="@drawable/res_2131230760_img_age_gate_safety__0" android:pathData="M83.7,65.31H36.3V23.71a23.7,23.7 0,0 1,47.4 0ZM49.21,52.41H70.79V23.71a10.79,10.79 0,0 0,-21.58 0Z"/>
+    <path android:fillColor="@drawable/res_2131230763_img_age_gate_safety__0" android:pathData="M83.7,65.31H36.3V23.71a23.7,23.7 0,0 1,47.4 0ZM49.21,52.41H70.79V23.71a10.79,10.79 0,0 0,-21.58 0Z"/>
     <path android:fillColor="#776bff" android:pathData="M9.13,17.87l3.39,-1.19a0.89,0.89 0,0 0,0 -1.68L9.13,13.82a0.88,0.88 0,0 1,-0.55 -0.55L7.4,9.88a0.89,0.89 0,0 0,-1.68 0L4.53,13.27a0.89,0.89 0,0 1,-0.54 0.55L0.59,15a0.89,0.89 0,0 0,0 1.68L4,17.87a0.9,0.9 0,0 1,0.54 0.54L5.72,21.8a0.89,0.89 0,0 0,1.68 0l1.18,-3.39A0.89,0.89 0,0 1,9.13 17.87Z"/>
     <path android:fillColor="#00e0a7" android:pathData="M108.454,19.083L108.454,19.083A1.43,1.43 90,0 1,110.476 19.083L111.487,20.094A1.43,1.43 90,0 1,111.487 22.116L111.487,22.116A1.43,1.43 90,0 1,109.465 22.116L108.454,21.105A1.43,1.43 90,0 1,108.454 19.083z"/>
     <path android:fillColor="#00e0a7" android:pathData="M116.545,27.183L116.545,27.183A1.43,1.43 0,0 1,118.567 27.183L119.578,28.194A1.43,1.43 90,0 1,119.578 30.216L119.578,30.216A1.43,1.43 0,0 1,117.556 30.216L116.545,29.205A1.43,1.43 90,0 1,116.545 27.183z"/>
     <path android:fillColor="#00e0a7" android:pathData="M119.578,19.084L119.578,19.084A1.43,1.43 90,0 1,119.578 21.107L118.567,22.118A1.43,1.43 90,0 1,116.544 22.118L116.544,22.118A1.43,1.43 0,0 1,116.544 20.095L117.556,19.084A1.43,1.43 90,0 1,119.578 19.084z"/>
     <path android:fillColor="#00e0a7" android:pathData="M111.487,27.184L111.487,27.184A1.43,1.43 0,0 1,111.487 29.207L110.476,30.218A1.43,1.43 90,0 1,108.453 30.218L108.453,30.218A1.43,1.43 90,0 1,108.453 28.195L109.465,27.184A1.43,1.43 90,0 1,111.487 27.184z"/>
     <path android:fillColor="#ff87ff" android:pathData="M110.16,71.6m-2.22,0a2.22,2.22 0,1 1,4.44 0a2.22,2.22 0,1 1,-4.44 0"/>
-    <path android:fillColor="@drawable/res_2131230761_img_age_gate_safety__1" android:pathData="M20.66,33.33L99.33,33.33A3.23,3.23 0,0 1,102.56 36.56L102.56,86.77A3.23,3.23 0,0 1,99.33 90L20.66,90A3.23,3.23 0,0 1,17.43 86.77L17.43,36.56A3.23,3.23 0,0 1,20.66 33.33z"/>
+    <path android:fillColor="@drawable/res_2131230764_img_age_gate_safety__1" android:pathData="M20.66,33.33L99.33,33.33A3.23,3.23 0,0 1,102.56 36.56L102.56,86.77A3.23,3.23 0,0 1,99.33 90L20.66,90A3.23,3.23 0,0 1,17.43 86.77L17.43,36.56A3.23,3.23 0,0 1,20.66 33.33z"/>
     <path android:fillColor="#ffd01a" android:pathData="M20.66,33.33L81.15,33.33A3.23,3.23 0,0 1,84.38 36.56L84.38,86.77A3.23,3.23 0,0 1,81.15 90L20.66,90A3.23,3.23 0,0 1,17.43 86.77L17.43,36.56A3.23,3.23 0,0 1,20.66 33.33z"/>
     <path android:fillColor="#00000000" android:pathData="M17.43,81.75L102.57,81.75" android:strokeColor="#ffa600" android:strokeWidth="2.2621"/>
     <path android:fillColor="#00000000" android:pathData="M17.43,41.58L84.38,41.58" android:strokeColor="#ffa600" android:strokeWidth="2.2621"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_boost_activated_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_boost_activated_dark.xml
index 14ac541617..5892caa39e 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_boost_activated_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_boost_activated_dark.xml
@@ -14,5 +14,5 @@
     <path android:fillColor="#ffffff" android:pathData="M210.016,17.646L208.235,30.425C208.201,30.663 207.995,30.841 207.751,30.841H204.158C203.862,30.841 203.634,30.583 203.674,30.293L205.419,17.777C205.459,17.488 205.231,17.23 204.936,17.23H201.228C200.931,17.23 200.702,16.969 200.746,16.678L201.21,13.546C201.245,13.309 201.45,13.134 201.693,13.134H214.948C215.246,13.134 215.474,13.395 215.431,13.685L214.966,16.818C214.931,17.054 214.726,17.23 214.484,17.23H210.499C210.256,17.23 210.049,17.407 210.016,17.646" android:fillType="evenOdd"/>
     <path android:fillColor="#ffffff" android:pathData="M221.631,20.002H227.768C228.064,20.002 228.292,20.26 228.251,20.55L227.83,23.557C227.797,23.795 227.59,23.973 227.347,23.973H220.936C220.693,23.973 220.487,24.149 220.453,24.387L220.211,26.071C220.17,26.361 220.398,26.62 220.694,26.62H227.466C227.762,26.62 227.989,26.878 227.949,27.167L227.5,30.424C227.468,30.663 227.261,30.841 227.017,30.841H215.533C215.237,30.841 215.009,30.582 215.05,30.292L217.418,13.574C217.451,13.336 217.658,13.159 217.901,13.159H229.385C229.682,13.159 229.91,13.418 229.868,13.708L229.4,16.965C229.366,17.203 229.16,17.38 228.916,17.38H221.871C221.628,17.38 221.422,17.556 221.388,17.793L221.148,19.452C221.106,19.742 221.334,20.002 221.631,20.002" android:fillType="evenOdd"/>
     <path android:fillColor="#ffffff" android:pathData="M237.364,26.646C238.604,26.646 239.717,25.971 239.843,25.022L240.703,19.078C240.83,18.104 239.944,17.33 238.705,17.33H236.827C236.584,17.33 236.378,17.506 236.343,17.744L235.141,26.096C235.1,26.386 235.328,26.646 235.625,26.646H237.364ZM239.135,13.159C242.727,13.159 245.838,14.958 245.256,19.078L244.396,25.022C243.815,29.093 240.223,30.841 236.631,30.841H230.488C230.192,30.841 229.964,30.583 230.005,30.293L232.373,13.574C232.406,13.336 232.613,13.159 232.856,13.159H239.135Z" android:fillType="evenOdd"/>
-    <path android:fillColor="#00000000" android:pathData="M267.455,1H9.273C4.704,1 1,4.704 1,9.273V34.727C1,39.296 4.704,43 9.273,43H267.455C272.023,43 275.727,39.296 275.727,34.727V9.273C275.727,4.704 272.023,1 267.455,1Z" android:strokeColor="@drawable/res_2131230762_img_boost_activated_dark__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M267.455,1H9.273C4.704,1 1,4.704 1,9.273V34.727C1,39.296 4.704,43 9.273,43H267.455C272.023,43 275.727,39.296 275.727,34.727V9.273C275.727,4.704 272.023,1 267.455,1Z" android:strokeColor="@drawable/res_2131230765_img_boost_activated_dark__0" android:strokeWidth="2"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_boost_activated_light.xml b/app/src/main/res/drawable-anydpi-v24/img_boost_activated_light.xml
index 46ee5c91e1..89bf0ca735 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_boost_activated_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_boost_activated_light.xml
@@ -14,5 +14,5 @@
     <path android:fillColor="#060607" android:pathData="M210.016,17.646L208.235,30.425C208.201,30.663 207.995,30.841 207.751,30.841H204.158C203.862,30.841 203.634,30.583 203.674,30.293L205.419,17.777C205.459,17.488 205.231,17.23 204.936,17.23H201.228C200.931,17.23 200.702,16.969 200.746,16.678L201.21,13.546C201.245,13.309 201.45,13.134 201.693,13.134H214.948C215.246,13.134 215.474,13.395 215.431,13.685L214.966,16.818C214.931,17.054 214.726,17.23 214.484,17.23H210.499C210.256,17.23 210.049,17.407 210.016,17.646" android:fillType="evenOdd"/>
     <path android:fillColor="#060607" android:pathData="M221.631,20.002H227.768C228.064,20.002 228.292,20.26 228.251,20.55L227.83,23.557C227.797,23.795 227.59,23.973 227.347,23.973H220.936C220.693,23.973 220.487,24.149 220.453,24.387L220.211,26.071C220.17,26.361 220.398,26.62 220.694,26.62H227.466C227.762,26.62 227.989,26.878 227.949,27.167L227.5,30.424C227.468,30.663 227.261,30.841 227.017,30.841H215.533C215.237,30.841 215.009,30.582 215.05,30.292L217.418,13.574C217.451,13.336 217.658,13.159 217.901,13.159H229.385C229.682,13.159 229.91,13.418 229.868,13.708L229.4,16.965C229.366,17.203 229.16,17.38 228.916,17.38H221.871C221.628,17.38 221.422,17.556 221.388,17.793L221.148,19.452C221.106,19.742 221.334,20.002 221.631,20.002" android:fillType="evenOdd"/>
     <path android:fillColor="#060607" android:pathData="M237.364,26.646C238.604,26.646 239.717,25.971 239.843,25.022L240.703,19.078C240.83,18.104 239.944,17.33 238.705,17.33H236.827C236.584,17.33 236.378,17.506 236.343,17.744L235.141,26.096C235.1,26.386 235.328,26.646 235.625,26.646H237.364ZM239.135,13.159C242.727,13.159 245.838,14.958 245.256,19.078L244.396,25.022C243.815,29.093 240.223,30.841 236.631,30.841H230.488C230.192,30.841 229.964,30.583 230.005,30.293L232.373,13.574C232.406,13.336 232.613,13.159 232.856,13.159H239.135Z" android:fillType="evenOdd"/>
-    <path android:fillColor="#00000000" android:pathData="M267.455,1H9.273C4.704,1 1,4.704 1,9.273V34.727C1,39.296 4.704,43 9.273,43H267.455C272.023,43 275.727,39.296 275.727,34.727V9.273C275.727,4.704 272.023,1 267.455,1Z" android:strokeColor="@drawable/res_2131230763_img_boost_activated_light__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M267.455,1H9.273C4.704,1 1,4.704 1,9.273V34.727C1,39.296 4.704,43 9.273,43H267.455C272.023,43 275.727,39.296 275.727,34.727V9.273C275.727,4.704 272.023,1 267.455,1Z" android:strokeColor="@drawable/res_2131230766_img_boost_activated_light__0" android:strokeWidth="2"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_krisp_onboarding.xml b/app/src/main/res/drawable-anydpi-v24/img_krisp_onboarding.xml
index 70a4f201a5..a28ada9702 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_krisp_onboarding.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_krisp_onboarding.xml
@@ -29,7 +29,7 @@
     <path android:fillColor="#6a94ff" android:pathData="M140.69,73.431L105.3,74.811L102.91,91.611C102.467,94.362 102.967,97.181 104.33,99.611C105.409,101.546 106.986,103.157 108.897,104.277C110.809,105.397 112.985,105.985 115.2,105.981L134.46,105.931C136.776,105.927 139.034,105.202 140.919,103.856C142.804,102.51 144.224,100.611 144.98,98.421C145.757,96.157 145.785,93.703 145.06,91.421L140.69,73.431Z"/>
     <path android:fillColor="#6a94ff" android:pathData="M99.56,96.421L103.93,102.861C104.008,102.977 104.053,103.112 104.06,103.252C104.067,103.391 104.036,103.53 103.971,103.653C103.905,103.777 103.807,103.88 103.687,103.952C103.567,104.024 103.43,104.061 103.29,104.061H95.51C94.715,104.062 93.932,103.87 93.229,103.5C92.525,103.131 91.922,102.596 91.472,101.941C91.022,101.286 90.738,100.531 90.646,99.742C90.553,98.952 90.654,98.153 90.94,97.411C91.26,96.575 91.802,95.843 92.509,95.295C93.216,94.746 94.061,94.402 94.95,94.3C95.839,94.198 96.739,94.341 97.551,94.715C98.365,95.09 99.059,95.679 99.56,96.421Z"/>
     <path android:fillColor="#6a94ff" android:pathData="M147.58,86.711H143.61C141.301,86.711 139.43,88.583 139.43,90.891C139.43,93.2 141.301,95.071 143.61,95.071H147.58C149.889,95.071 151.76,93.2 151.76,90.891C151.76,88.583 149.889,86.711 147.58,86.711Z"/>
-    <path android:fillColor="@drawable/res_2131230764_img_krisp_onboarding__0" android:pathData="M130.96,104.561C131.777,104.487 132.578,104.295 133.34,103.991C133.791,103.866 134.248,103.766 134.71,103.691C132.92,104.041 134.1,103.771 134.6,103.751C134.93,103.751 135.26,103.751 135.6,103.751C135.94,103.751 136.35,103.751 136.73,103.831C137.73,103.921 135.73,103.651 136.44,103.831L137.16,103.961C138.245,104.177 139.315,104.468 140.36,104.831C140.97,105.031 141.57,105.271 142.17,105.501C142.59,105.671 142.51,105.641 141.93,105.391L142.46,105.631L143.55,106.131C145.24,106.941 146.87,107.851 148.48,108.811C149.451,109.317 150.579,109.431 151.631,109.127C152.683,108.824 153.578,108.127 154.129,107.182C154.681,106.236 154.848,105.114 154.595,104.049C154.342,102.984 153.688,102.057 152.77,101.461C148.62,98.981 144.04,96.621 139.23,95.721C136.532,95.109 133.727,95.153 131.05,95.851C130.79,95.931 130.53,96.021 130.28,96.121C129.45,96.411 130.52,96.121 130.96,96.121C130.384,96.093 129.808,96.183 129.267,96.384C128.727,96.585 128.233,96.894 127.815,97.292C127.398,97.69 127.065,98.168 126.838,98.698C126.611,99.229 126.494,99.799 126.494,100.376C126.494,100.953 126.611,101.524 126.838,102.054C127.065,102.584 127.398,103.063 127.815,103.46C128.233,103.858 128.727,104.167 129.267,104.368C129.808,104.57 130.384,104.659 130.96,104.631V104.561Z"/>
+    <path android:fillColor="@drawable/res_2131230767_img_krisp_onboarding__0" android:pathData="M130.96,104.561C131.777,104.487 132.578,104.295 133.34,103.991C133.791,103.866 134.248,103.766 134.71,103.691C132.92,104.041 134.1,103.771 134.6,103.751C134.93,103.751 135.26,103.751 135.6,103.751C135.94,103.751 136.35,103.751 136.73,103.831C137.73,103.921 135.73,103.651 136.44,103.831L137.16,103.961C138.245,104.177 139.315,104.468 140.36,104.831C140.97,105.031 141.57,105.271 142.17,105.501C142.59,105.671 142.51,105.641 141.93,105.391L142.46,105.631L143.55,106.131C145.24,106.941 146.87,107.851 148.48,108.811C149.451,109.317 150.579,109.431 151.631,109.127C152.683,108.824 153.578,108.127 154.129,107.182C154.681,106.236 154.848,105.114 154.595,104.049C154.342,102.984 153.688,102.057 152.77,101.461C148.62,98.981 144.04,96.621 139.23,95.721C136.532,95.109 133.727,95.153 131.05,95.851C130.79,95.931 130.53,96.021 130.28,96.121C129.45,96.411 130.52,96.121 130.96,96.121C130.384,96.093 129.808,96.183 129.267,96.384C128.727,96.585 128.233,96.894 127.815,97.292C127.398,97.69 127.065,98.168 126.838,98.698C126.611,99.229 126.494,99.799 126.494,100.376C126.494,100.953 126.611,101.524 126.838,102.054C127.065,102.584 127.398,103.063 127.815,103.46C128.233,103.858 128.727,104.167 129.267,104.368C129.808,104.57 130.384,104.659 130.96,104.631V104.561Z"/>
     <path android:fillColor="#316ee5" android:pathData="M104.74,78.471L140.69,75.431L139.9,70.721L105.55,73.151L104.74,78.471Z" android:strokeAlpha="0.5" android:fillAlpha="0.5"/>
     <path android:fillColor="#6a94ff" android:pathData="M120.75,104.311C121.35,104.311 121.95,104.371 122.55,104.431C122.78,104.431 123.78,104.581 122.88,104.431C121.98,104.281 123.11,104.431 123.36,104.511C124.12,104.631 124.87,104.781 125.62,104.951C127.545,105.385 129.439,105.946 131.29,106.631C131.784,106.792 132.269,106.982 132.74,107.201C131.79,106.701 132.74,107.201 132.92,107.281L133.68,107.631C134.91,108.201 136.11,108.841 137.29,109.511C137.772,109.793 138.305,109.977 138.858,110.053C139.411,110.128 139.973,110.095 140.513,109.953C141.053,109.811 141.56,109.565 142.005,109.227C142.449,108.89 142.823,108.468 143.105,107.986C143.387,107.504 143.571,106.971 143.646,106.418C143.722,105.865 143.688,105.303 143.547,104.763C143.405,104.223 143.159,103.716 142.821,103.271C142.484,102.827 142.062,102.453 141.58,102.171C137.313,99.69 132.699,97.863 127.89,96.751C125.552,96.164 123.159,95.829 120.75,95.751C119.657,95.804 118.627,96.276 117.872,97.068C117.117,97.86 116.696,98.912 116.696,100.006C116.696,101.1 117.117,102.152 117.872,102.945C118.627,103.737 119.657,104.208 120.75,104.261V104.311Z"/>
     <path android:fillColor="#6a94ff" android:pathData="M137.91,43.071H105.78C100.743,43.071 96.66,47.154 96.66,52.191V66.361C96.66,71.398 100.743,75.481 105.78,75.481H137.91C142.947,75.481 147.03,71.398 147.03,66.361V52.191C147.03,47.154 142.947,43.071 137.91,43.071Z"/>
@@ -51,7 +51,7 @@
     <path android:fillColor="#ef9504" android:pathData="M146.57,81.811H127.85V100.311H145.59C146.12,100.311 146.629,100.1 147.004,99.725C147.379,99.35 147.59,98.842 147.59,98.311L146.57,81.811Z"/>
     <path android:fillColor="#f5ce37" android:pathData="M138.07,95.881C140.831,95.881 143.07,93.643 143.07,90.881C143.07,88.12 140.831,85.881 138.07,85.881C135.309,85.881 133.07,88.12 133.07,90.881C133.07,93.643 135.309,95.881 138.07,95.881Z"/>
     <path android:fillColor="#e57003" android:pathData="M143.374,90.095L133.809,87.623C133.242,87.477 132.663,87.818 132.517,88.384L132.004,90.369C131.858,90.936 132.198,91.514 132.765,91.661L142.331,94.133C142.898,94.279 143.476,93.939 143.622,93.372L144.135,91.387C144.282,90.82 143.941,90.242 143.374,90.095Z"/>
-    <path android:fillColor="@drawable/res_2131230765_img_krisp_onboarding__1" android:pathData="M106.65,85.031C106.65,88.721 108.89,91.731 111.89,93.691C114.962,95.537 118.497,96.467 122.08,96.371C122.656,96.399 123.232,96.31 123.773,96.108C124.313,95.907 124.807,95.598 125.225,95.201C125.642,94.803 125.975,94.324 126.202,93.794C126.429,93.264 126.546,92.693 126.546,92.116C126.546,91.539 126.429,90.968 126.202,90.438C125.975,89.908 125.642,89.43 125.225,89.032C124.807,88.634 124.313,88.325 123.773,88.124C123.232,87.923 122.656,87.833 122.08,87.861C121.234,87.863 120.389,87.809 119.55,87.701L120.68,87.851C119.42,87.669 118.188,87.334 117.01,86.851L118.01,87.281C117.15,86.925 116.337,86.465 115.59,85.911L116.45,86.571C115.928,86.174 115.458,85.714 115.05,85.201L115.71,86.061C115.418,85.671 115.167,85.252 114.96,84.811L115.39,85.811C115.208,85.376 115.083,84.919 115.02,84.451L115.17,85.581C115.17,85.381 115.17,85.181 115.17,84.991C115.17,83.864 114.722,82.783 113.925,81.986C113.128,81.189 112.047,80.741 110.92,80.741C109.793,80.741 108.712,81.189 107.915,81.986C107.118,82.783 106.67,83.864 106.67,84.991L106.65,85.031Z"/>
+    <path android:fillColor="@drawable/res_2131230768_img_krisp_onboarding__1" android:pathData="M106.65,85.031C106.65,88.721 108.89,91.731 111.89,93.691C114.962,95.537 118.497,96.467 122.08,96.371C122.656,96.399 123.232,96.31 123.773,96.108C124.313,95.907 124.807,95.598 125.225,95.201C125.642,94.803 125.975,94.324 126.202,93.794C126.429,93.264 126.546,92.693 126.546,92.116C126.546,91.539 126.429,90.968 126.202,90.438C125.975,89.908 125.642,89.43 125.225,89.032C124.807,88.634 124.313,88.325 123.773,88.124C123.232,87.923 122.656,87.833 122.08,87.861C121.234,87.863 120.389,87.809 119.55,87.701L120.68,87.851C119.42,87.669 118.188,87.334 117.01,86.851L118.01,87.281C117.15,86.925 116.337,86.465 115.59,85.911L116.45,86.571C115.928,86.174 115.458,85.714 115.05,85.201L115.71,86.061C115.418,85.671 115.167,85.252 114.96,84.811L115.39,85.811C115.208,85.376 115.083,84.919 115.02,84.451L115.17,85.581C115.17,85.381 115.17,85.181 115.17,84.991C115.17,83.864 114.722,82.783 113.925,81.986C113.128,81.189 112.047,80.741 110.92,80.741C109.793,80.741 108.712,81.189 107.915,81.986C107.118,82.783 106.67,83.864 106.67,84.991L106.65,85.031Z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M54.8,87.641H92.68C94.118,87.641 95.496,88.212 96.512,89.229C97.529,90.245 98.1,91.624 98.1,93.061V116.911H49.37V93.061C49.37,92.349 49.511,91.643 49.784,90.985C50.056,90.326 50.457,89.729 50.961,89.225C51.465,88.722 52.064,88.323 52.723,88.051C53.382,87.779 54.087,87.64 54.8,87.641Z"/>
     <path android:fillColor="#ffffff" android:pathData="M92.68,87.641C94.118,87.641 95.496,88.212 96.513,89.229C97.529,90.245 98.1,91.624 98.1,93.061V116.911H87.3V93.061C87.3,91.631 87.866,90.258 88.873,89.243C89.881,88.227 91.249,87.652 92.68,87.641Z"/>
     <path android:fillColor="#a9c7ff" android:pathData="M150.91,59.971C150.82,60.312 150.707,60.646 150.57,60.971L150.48,61.201C150.37,61.491 150.48,61.131 150.48,61.301C150.48,61.471 150.3,61.711 150.2,61.911C149.952,62.402 149.678,62.879 149.38,63.341C147.705,65.872 145.277,67.813 142.44,68.891C139.911,69.818 137.234,70.275 134.54,70.241C134.26,70.268 134,70.397 133.811,70.606C133.621,70.814 133.516,71.085 133.516,71.366C133.516,71.647 133.621,71.919 133.811,72.127C134,72.335 134.26,72.465 134.54,72.491C139.21,72.491 143.93,71.391 147.67,68.491C149.853,66.792 151.559,64.556 152.62,62.001C152.827,61.529 152.994,61.041 153.12,60.541C153.44,59.131 151.27,58.541 150.95,59.941L150.91,59.971Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml b/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml
index 62bc948175..cd9587121d 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_nitro_pattern.xml
@@ -2,11 +2,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="301dp" android:width="375dp" android:alpha="0.1" android:viewportWidth="375" android:viewportHeight="301">
     <group>
         <clip-path android:pathData="M0,0h502v301h-502z M 0,0"/>
-        <path android:fillColor="@drawable/res_2131230766_img_nitro_pattern__0" android:pathData="M-27.6802 230.729C-34.4561 241.24 -39.8533 256.352 -34.8695 268.502C-30.809 278.402 -21.6316 281.992 -13.3836 284.671C-5.02671 287.386 3.33064 290.101 11.6884 292.815C19.6665 295.406 28.5982 297.836 35.6808 292.316C41.4873 287.79 44.5471 278.928 46.2119 270.266C48.2807 259.503 48.7358 248.197 47.5422 237.202C46.4343 227.001 43.7454 216.714 38.2428 209.445C32.678 202.092 24.6426 198.539 16.7923 198.663C-0.534393 198.936 -16.8352 213.906 -27.6802 230.729Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230767_img_nitro_pattern__1" android:pathData="M310.149 1.87836C312.236 10.3679 317.672 16.6476 323.366 21.4193C338.929 34.4632 358.247 39.8166 371.43 56.8553C377.857 65.1615 382.352 75.702 386.414 86.3104C389.157 93.4742 391.79 100.833 395.746 106.92C403.119 118.27 415.012 124.142 426.192 121.955C437.372 119.768 447.475 109.592 452.06 95.9032C455.088 86.8659 455.767 76.7647 455.813 66.8779C455.93 41.9824 452.246 17.0673 445.049 -5.92896C444.9 -6.40583 444.746 -6.8821 444.593 -7.35778H309.255C309.148 -4.23283 309.415 -1.10668 310.149 1.87836Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230768_img_nitro_pattern__2" android:pathData="M298.727 195.559C292.439 191.296 286.422 185.578 282.952 177.432C278.673 167.389 278.837 155.237 278.457 143.719C278.077 132.202 276.668 119.689 270.326 111.787C265.015 105.17 257.213 103.201 249.932 103.771C236.134 104.852 223.334 113.88 212.374 125.028C203.794 133.756 191.594 146.543 181.271 161.292C168.776 179.144 159.03 199.87 161.776 219.75C163.79 234.325 172.611 246.014 182.743 252.311C192.876 258.608 204.251 260.319 215.415 261.404C250.328 264.795 285.868 262.809 319.56 250.231C330.611 246.105 347.886 232.013 337.48 213.807C330.265 201.183 309.198 202.658 298.727 195.559Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230769_img_nitro_pattern__3" android:pathData="M155.541 -15.3248C148.298 -25.0966 137.418 -28.1121 127.171 -30.0672C72.5229 -40.4937 12.8167 -27.4737 -31.4119 18.7266C-46.2977 34.2764 -59.7173 54.1777 -64.0877 78.5728C-67.14 95.6097 -65.9889 118.247 -56.5985 132.187C-56.1366 132.873 -55.6624 133.52 -55.1771 134.131C-42.3872 150.233 -21.6233 141.258 -5.70481 144.538C4.67279 146.676 15.0848 148.865 25.5859 149.136C32.4327 149.312 39.395 148.642 45.8325 145.556C50.9427 143.106 55.5926 139.191 59.8411 134.711C81.7423 111.614 92.7611 74.523 113.593 49.7603C125.54 35.5585 139.28 29.3084 153.077 19.8163C163.084 12.9314 164.043 -3.85456 155.541 -15.3248Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
-        <path android:fillColor="@drawable/res_2131230770_img_nitro_pattern__4" android:pathData="M242.18 29.9086C254.381 32.6766 270.436 32.5765 280.157 23.741C288.077 16.5417 288.314 6.6956 288.013 -1.96615C287.707 -10.7424 287.401 -19.519 287.095 -28.2959C286.803 -36.674 286.033 -45.8926 278.42 -50.6555C272.178 -54.5603 262.798 -54.4026 254.084 -53.0035C243.255 -51.2649 232.469 -47.8255 222.538 -42.9441C213.325 -38.4149 204.572 -32.3715 199.618 -24.7178C194.608 -16.9775 194.015 -8.21646 196.817 -0.886903C202.999 15.2908 222.651 25.4783 242.18 29.9086Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230769_img_nitro_pattern__0" android:pathData="M-27.6802 230.729C-34.4561 241.24 -39.8533 256.352 -34.8695 268.502C-30.809 278.402 -21.6316 281.992 -13.3836 284.671C-5.02671 287.386 3.33064 290.101 11.6884 292.815C19.6665 295.406 28.5982 297.836 35.6808 292.316C41.4873 287.79 44.5471 278.928 46.2119 270.266C48.2807 259.503 48.7358 248.197 47.5422 237.202C46.4343 227.001 43.7454 216.714 38.2428 209.445C32.678 202.092 24.6426 198.539 16.7923 198.663C-0.534393 198.936 -16.8352 213.906 -27.6802 230.729Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230770_img_nitro_pattern__1" android:pathData="M310.149 1.87836C312.236 10.3679 317.672 16.6476 323.366 21.4193C338.929 34.4632 358.247 39.8166 371.43 56.8553C377.857 65.1615 382.352 75.702 386.414 86.3104C389.157 93.4742 391.79 100.833 395.746 106.92C403.119 118.27 415.012 124.142 426.192 121.955C437.372 119.768 447.475 109.592 452.06 95.9032C455.088 86.8659 455.767 76.7647 455.813 66.8779C455.93 41.9824 452.246 17.0673 445.049 -5.92896C444.9 -6.40583 444.746 -6.8821 444.593 -7.35778H309.255C309.148 -4.23283 309.415 -1.10668 310.149 1.87836Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230771_img_nitro_pattern__2" android:pathData="M298.727 195.559C292.439 191.296 286.422 185.578 282.952 177.432C278.673 167.389 278.837 155.237 278.457 143.719C278.077 132.202 276.668 119.689 270.326 111.787C265.015 105.17 257.213 103.201 249.932 103.771C236.134 104.852 223.334 113.88 212.374 125.028C203.794 133.756 191.594 146.543 181.271 161.292C168.776 179.144 159.03 199.87 161.776 219.75C163.79 234.325 172.611 246.014 182.743 252.311C192.876 258.608 204.251 260.319 215.415 261.404C250.328 264.795 285.868 262.809 319.56 250.231C330.611 246.105 347.886 232.013 337.48 213.807C330.265 201.183 309.198 202.658 298.727 195.559Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230772_img_nitro_pattern__3" android:pathData="M155.541 -15.3248C148.298 -25.0966 137.418 -28.1121 127.171 -30.0672C72.5229 -40.4937 12.8167 -27.4737 -31.4119 18.7266C-46.2977 34.2764 -59.7173 54.1777 -64.0877 78.5728C-67.14 95.6097 -65.9889 118.247 -56.5985 132.187C-56.1366 132.873 -55.6624 133.52 -55.1771 134.131C-42.3872 150.233 -21.6233 141.258 -5.70481 144.538C4.67279 146.676 15.0848 148.865 25.5859 149.136C32.4327 149.312 39.395 148.642 45.8325 145.556C50.9427 143.106 55.5926 139.191 59.8411 134.711C81.7423 111.614 92.7611 74.523 113.593 49.7603C125.54 35.5585 139.28 29.3084 153.077 19.8163C163.084 12.9314 164.043 -3.85456 155.541 -15.3248Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
+        <path android:fillColor="@drawable/res_2131230773_img_nitro_pattern__4" android:pathData="M242.18 29.9086C254.381 32.6766 270.436 32.5765 280.157 23.741C288.077 16.5417 288.314 6.6956 288.013 -1.96615C287.707 -10.7424 287.401 -19.519 287.095 -28.2959C286.803 -36.674 286.033 -45.8926 278.42 -50.6555C272.178 -54.5603 262.798 -54.4026 254.084 -53.0035C243.255 -51.2649 232.469 -47.8255 222.538 -42.9441C213.325 -38.4149 204.572 -32.3715 199.618 -24.7178C194.608 -16.9775 194.015 -8.21646 196.817 -0.886903C202.999 15.2908 222.651 25.4783 242.18 29.9086Z" android:strokeAlpha="0.613" android:fillAlpha="0.613" android:fillType="evenOdd"/>
         <path android:fillColor="#00000000" android:pathData="M257.411 -20.5892C265.142 20.2152 252.288 22.8779 225.827 50.6683C218.239 58.637 216.023 69.202 208.461 77.4474C198.256 88.573 167.839 104.686 174.719 124.554C175.336 126.336 177.41 127.39 179.185 128.027C183.98 129.747 189.031 130.747 194.07 131.497C220.727 135.463 224.061 116.293 235.752 98.7682C237.68 95.8769 243.078 94.4827 246.173 95.7948C272.338 106.888 260.209 121.226 272.968 133.976C286.612 147.612 301.905 136.042 309.19 123.564C311.201 120.12 311.2 115.987 309.19 111.166C305.884 103.238 288.615 89.2123 299.268 78.9341C313.516 65.1869 330.075 61.6259 348.887 59.5938C357.269 58.6885 374.886 55.0436 367.247 45.7091C349.697 24.2655 313.603 60.4918 311.175 22.4025C310.07 5.08229 327.399 -1.62873 324.574 -19.2515C322.609 -31.5125 303.206 -26.1313 297.777 -20.2417C284.836 -6.20164 290.921 9.34213 288.349 26.3715C286.751 36.9556 286.665 48.1914 277.93 63.5627C269.195 78.9341 257.411 71.4299 263.043 51.6612C268.475 32.5918 274.686 13.8359 279.418 -5.3668C280.169 -8.41548 280.475 -11.8293 279.418 -14.7861C277.89 -19.0612 274.455 -22.3912 271.974 -26.1938M-21.458 91.8494C-8.49512 62.3039 11.4903 73.9239 45.2086 75.9581C55.4227 76.5743 60.1926 82.3901 72.4997 77.4474C84.8472 72.4885 96.0179 64.6374 106.241 56.124C122.791 42.341 121.289 3.04734 136.013 -14.2923C138.36 -17.0562 141.121 -19.4641 143.954 -21.7284C148.579 -25.4256 153.366 -28.9369 158.344 -32.1433C160.831 -33.7448 163.483 -35.1542 166.282 -36.1096C170.307 -37.483 174.462 -38.6162 178.688 -39.0856C181.98 -39.4511 185.336 -39.0849 188.611 -38.5892C190.836 -38.2522 193.244 -37.9286 195.063 -36.606C200.651 -32.5451 205.629 -27.672 210.445 -22.7213C211.476 -21.6615 212.214 -20.2174 212.43 -18.755C213.056 -14.4995 213.263 -10.1488 212.926 -5.86063C210.56 24.2894 187.652 43.4581 163.801 57.6107C149.555 66.0641 131.676 71.227 121.625 85.38C108.431 103.959 131.537 138.704 121.128 154.307C110.863 169.694 86.752 170.982 71.0094 169.184C66.8528 168.71 63.2344 165.874 59.1025 165.218C42.3243 162.557 25.4021 160.839 8.48682 159.266C-14.9961 157.083 -32.0616 176.279 -45.1017 148.357C-49.6747 138.566 -24.2402 130.067 -21.2854 129.514C-3.16055 126.117 33.3061 136.355 45.7028 131.993C51.1183 130.088 53.0554 123.158 57.1155 119.101C59.0343 117.184 61.0742 115.21 63.5683 114.142C72.5747 110.285 94.0798 110.102 89.8657 94.3055C89.0993 91.4326 84.9169 90.9712 78.2805 92.3223C66.7233 94.6754 55.304 97.7441 44.0425 101.248C37.7373 103.21 31.6622 105.885 25.6829 108.687C14.5527 113.901 -22.9457 133.896 -22.9457 108.19L-21.458 91.8494Z" android:strokeColor="#ffffff" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0.2"/>
         <path android:fillColor="#00000000" android:pathData="M-20.7312 191.498C-0.494293 189.68 20.4215 180.542 39.9795 186.045C47.5631 188.179 31.3975 199.669 25.0946 204.393C20.9683 207.485 -3.67696 212.662 -8.64918 213.318C-12.1506 213.78 -16.4866 215.673 -19.2435 213.467C-23.2401 210.269 -26.335 192.468 -17.0838 192.468M384.396 -5.3668C379.765 3.72504 372.978 12.0114 370.502 21.9087C369.819 24.639 373.59 26.8328 375.959 28.3546C380.692 31.3952 387.67 31.037 391.343 35.2969C397.475 42.4094 400.904 51.6386 403.746 60.5867C404.492 62.934 399.488 69.1916 397.793 70.5051C388.158 77.9729 342.876 105.936 366.036 125.051C371.297 129.393 378.548 129.613 384.89 130.01C397.607 130.805 417.757 126.327 420.122 110.67C421.061 104.45 420.513 98.087 421.115 91.8259C421.342 89.4702 421.515 86.9855 422.603 84.8835C428.738 73.0332 447.582 77.504 448.406 63.0663C448.997 52.7154 439.467 32.3295 443.444 27.8582C454.768 15.1252 493.278 14.6101 496.041 -9.3331C496.363 -12.1243 497.271 -15.2356 496.041 -17.7621C481.549 -47.5339 438.168 -36.2205 422.106 -15.2826C409.741 0.836828 427.158 17.9222 430.047 33.3138C432.442 46.0787 417.439 40.6956 413.175 34.3041C407.037 25.1047 406.506 18.5361 407.718 7.03116C409.012 -5.24426 419.479 -25.0718 402.086 -30.6565L384.396 -5.3668ZM42.981 -26.0423C32.8916 -18.3141 30.5039 -19.1249 26.2581 -11.1673C16.679 6.7863 26.5166 37.4345 45.1145 44.8678C63.2619 52.121 78.034 31.6383 91.2619 22.0576C97.335 17.6591 102.223 11.7946 108.134 7.18009C121.237 -3.04993 137.993 -8.49933 135.922 -28.5218C135.425 -33.3185 129.871 -35.7601 125.801 -34.9677C112.012 -32.2834 98.1444 -29.8217 84.6156 -26.0423C75.7248 -23.5585 74.3017 -7.75577 75.1874 -1.24895C78.5678 23.5823 54.5645 31.1747 55.4892 4.20667C56.119 -14.1632 74.0027 -30.0529 82.2834 -37.9438L42.981 -26.0423ZM12.4923 233.152C12.4923 233.152 31.7119 213.109 52.1896 216.119C61.8145 217.534 97.768 231.917 111.237 220.582C156.191 182.749 129.998 194.144 158.872 172.482C173.805 161.279 183.344 165.066 186.166 169.012C188.647 172.482 189.633 185.214 186.166 191.225C180.475 201.092 178.746 200.473 170.782 207.194C168.545 209.081 159.92 213.317 158.872 218.102C155.784 232.217 164.267 244.54 162.844 258.766C160.936 277.839 134.227 278.265 120.169 272.651C96.5754 263.229 84.5424 256.002 79.9774 256.783C61.8257 259.885 25.5358 276.586 8.52341 263.229C-10.3028 248.447 12.4923 233.152 12.4923 233.152ZM221.395 183.691C213.737 187.786 205.806 202.469 211.473 210.964C229.108 237.399 242.818 226.079 263.077 238.733C272.278 244.481 270.791 251.451 276.476 262.04C280.389 269.327 308.903 266.685 315.677 264.519C326.564 261.039 319.883 253.246 325.599 239.726C327.582 235.035 331.17 231.156 334.531 227.328C344.962 215.449 376.543 189.749 356.862 173.773C344.518 163.752 304.587 176.274 291.858 185.178C285.407 189.69 283.459 196.697 275.98 195.096C265.646 192.885 273.052 176.969 265.063 171.754C250.695 162.374 232.864 177.558 221.395 183.691ZM366.278 144.06C362.714 137.674 302.013 137.242 351.599 157.236C362.602 161.673 369.843 150.446 366.278 144.06ZM141.851 111.119C140.033 120.16 137.629 129.104 136.395 138.243C135.107 147.779 152.66 156.018 157.259 150.641C166.046 140.368 160.885 129.354 155.769 119.896C154.204 117.002 146.303 103.158 142.845 108.987L141.851 111.119Z" android:strokeColor="#ffffff" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0.2"/>
     </group>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml
index 2f66b4561f..f26de96ed2 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_dark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="42dp" android:width="302dp" android:viewportWidth="302" android:viewportHeight="42">
-    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230771_img_plan_activated_dark__0" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230774_img_plan_activated_dark__0" android:strokeWidth="1"/>
     <path android:fillColor="#ffffff" android:pathData="M37.159,29.587C37.075,30.188 37.542,30.725 38.15,30.725H41.048C41.547,30.725 41.969,30.358 42.038,29.864L42.594,25.9C42.663,25.406 43.085,25.038 43.584,25.038H45.819C50.516,25.038 53.236,21.962 53.648,18.28C54.033,14.764 52.247,11.275 47.494,11.275H40.59C40.091,11.275 39.668,11.642 39.599,12.136L37.159,29.587ZM44.472,20.67C43.863,20.67 43.396,20.131 43.482,19.529L43.883,16.721C43.953,16.229 44.375,15.863 44.873,15.863H46.863C48.291,15.863 48.923,16.852 48.758,18.143C48.593,19.462 47.714,20.698 46.176,20.67H44.472Z"/>
     <path android:fillColor="#ffffff" android:pathData="M55.542,29.587C55.458,30.188 55.925,30.725 56.533,30.725H67.367C67.867,30.725 68.29,30.355 68.357,29.86L68.746,26.997C68.827,26.397 68.36,25.863 67.755,25.863H62.139C61.531,25.863 61.063,25.325 61.148,24.723L62.887,12.415C62.972,11.813 62.505,11.275 61.897,11.275H58.973C58.474,11.275 58.051,11.642 57.982,12.136L55.542,29.587Z"/>
     <path android:fillColor="#ffffff" android:pathData="M83.91,12.062C83.81,11.602 83.403,11.275 82.932,11.275H79.885C79.503,11.275 79.154,11.492 78.986,11.836L70.458,29.286C70.133,29.951 70.617,30.725 71.356,30.725H74.379C74.775,30.725 75.133,30.492 75.293,30.131L76.496,27.419C76.657,27.057 77.015,26.824 77.411,26.824H81.125C81.605,26.824 82.018,27.166 82.107,27.637L82.54,29.912C82.629,30.384 83.042,30.725 83.522,30.725H86.728C87.366,30.725 87.841,30.136 87.705,29.513L83.91,12.062ZM79.937,22.456C79.238,22.456 78.754,21.757 79.001,21.103L80.604,16.847C80.622,16.8 80.667,16.769 80.717,16.769V16.769C80.779,16.769 80.831,16.816 80.837,16.878L81.291,21.355C81.351,21.944 80.889,22.456 80.297,22.456H79.937Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml
index c246f8651b..d29f619cce 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_plan_activated_light.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="42dp" android:width="302dp" android:viewportWidth="302" android:viewportHeight="42">
-    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230772_img_plan_activated_light__0" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000" android:pathData="M6,0.5L296,0.5A5.5,5.5 0,0 1,301.5 6L301.5,36A5.5,5.5 0,0 1,296 41.5L6,41.5A5.5,5.5 0,0 1,0.5 36L0.5,6A5.5,5.5 0,0 1,6 0.5z" android:strokeColor="@drawable/res_2131230775_img_plan_activated_light__0" android:strokeWidth="1"/>
     <path android:fillColor="#060607" android:pathData="M37.159,29.587C37.075,30.188 37.542,30.725 38.15,30.725H41.048C41.547,30.725 41.969,30.358 42.038,29.864L42.594,25.9C42.663,25.406 43.085,25.038 43.584,25.038H45.819C50.516,25.038 53.236,21.962 53.648,18.28C54.033,14.764 52.247,11.275 47.494,11.275H40.59C40.091,11.275 39.668,11.642 39.599,12.136L37.159,29.587ZM44.472,20.67C43.863,20.67 43.396,20.131 43.482,19.529L43.883,16.721C43.953,16.229 44.375,15.863 44.873,15.863H46.863C48.291,15.863 48.923,16.852 48.758,18.143C48.593,19.462 47.714,20.698 46.176,20.67H44.472Z"/>
     <path android:fillColor="#060607" android:pathData="M55.542,29.587C55.458,30.188 55.925,30.725 56.533,30.725H67.367C67.867,30.725 68.29,30.355 68.357,29.86L68.746,26.997C68.827,26.397 68.36,25.863 67.755,25.863H62.139C61.531,25.863 61.063,25.325 61.148,24.723L62.887,12.415C62.972,11.813 62.505,11.275 61.897,11.275H58.973C58.474,11.275 58.051,11.642 57.982,12.136L55.542,29.587Z"/>
     <path android:fillColor="#060607" android:pathData="M83.91,12.062C83.81,11.602 83.403,11.275 82.932,11.275H79.885C79.503,11.275 79.154,11.492 78.986,11.836L70.458,29.286C70.133,29.951 70.617,30.725 71.356,30.725H74.379C74.775,30.725 75.133,30.492 75.293,30.131L76.496,27.419C76.657,27.057 77.015,26.824 77.411,26.824H81.125C81.605,26.824 82.018,27.166 82.107,27.637L82.54,29.912C82.629,30.384 83.042,30.725 83.522,30.725H86.728C87.366,30.725 87.841,30.136 87.705,29.513L83.91,12.062ZM79.937,22.456C79.238,22.456 78.754,21.757 79.001,21.103L80.604,16.847C80.622,16.8 80.667,16.769 80.717,16.769V16.769C80.779,16.769 80.831,16.816 80.837,16.878L81.291,21.355C81.351,21.944 80.889,22.456 80.297,22.456H79.937Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml
index 78774f3f15..af67d77170 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230773_img_premium_activated_tier_1_dark__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230776_img_premium_activated_tier_1_dark__0" android:strokeWidth="2"/>
     <path android:fillColor="#ffffff" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml
index 6b653e7225..fb111d96c5 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_1_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230774_img_premium_activated_tier_1_light__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230777_img_premium_activated_tier_1_light__0" android:strokeWidth="2"/>
     <path android:fillColor="#060607" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml
index 511f2e1ad4..a085db8703 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_dark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230775_img_premium_activated_tier_2_dark__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230778_img_premium_activated_tier_2_dark__0" android:strokeWidth="2"/>
     <path android:fillColor="#ffffff" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml
index 91a278f303..7a3625fd26 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_activated_tier_2_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:height="48dp" android:width="298dp" android:viewportWidth="298" android:viewportHeight="48">
-    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230776_img_premium_activated_tier_2_light__0" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000" android:pathData="M9,1L289,1A8,8 0,0 1,297 9L297,39A8,8 0,0 1,289 47L9,47A8,8 0,0 1,1 39L1,9A8,8 0,0 1,9 1z" android:strokeColor="@drawable/res_2131230779_img_premium_activated_tier_2_light__0" android:strokeWidth="2"/>
     <path android:fillColor="#060607" android:pathData="M112.46,20.67l-1,6.52c-0.22,1.54 -2,2.25 -3.59,2.25s-3,-0.71 -2.78,-2.11l1,-6.66c0.23,-1.45 2,-2.2 3.59,-2.2s3,0.75 2.79,2.2m-2,-6.67L100,14a0.55,0.55 0,0 0,-0.54 0.46l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h1.91a0.26,0.26 0,0 1,0.25 0.37,7.23 7.23,0 0,0 -0.51,1.8l-1,6.66c-0.64,4.45 3.12,6.68 7.21,6.68 4.28,0 8.49,-2.23 9.13,-6.68l1,-6.66c0.63,-4.36 -3,-6.59 -7,-6.67m-63,9.1 l0.06,3.23a0.14,0.14 0,0 1,-0.11 0.14l-1.11,-3.89v0l-3.45,-8a0.54,0.54 0,0 0,-0.49 -0.32L38.42,14.27a0.53,0.53 0,0 0,-0.53 0.46L35.28,33.12a0.54,0.54 0,0 0,0.54 0.61h3.89a0.52,0.52 0,0 0,0.53 -0.46l1,-7.31v0l-0.06,-3.75 0.11,0 1.17,3.89v0l3.23,7.34a0.52,0.52 0,0 0,0.49 0.32h4.22a0.54,0.54 0,0 0,0.53 -0.46l2.6,-18.39a0.53,0.53 0,0 0,-0.53 -0.61L49.17,14.3a0.54,0.54 0,0 0,-0.54 0.46l-1.18,8.35a0,0 0,0 0,0 0M55,33.73h3.9a0.53,0.53 0,0 0,0.53 -0.46L62,14.88a0.53,0.53 0,0 0,-0.53 -0.61L57.58,14.27a0.54,0.54 0,0 0,-0.54 0.46l-2.6,18.39a0.53,0.53 0,0 0,0.53 0.61m9.66,-19 l-0.51,3.44a0.54,0.54 0,0 0,0.54 0.61h4.07a0.52,0.52 0,0 1,0.53 0.6L67.35,33.13a0.52,0.52 0,0 0,0.53 0.6h4a0.52,0.52 0,0 0,0.53 -0.46l2,-14.06a0.55,0.55 0,0 1,0.54 -0.46h4.38a0.54,0.54 0,0 0,0.53 -0.46l0.51,-3.44a0.53,0.53 0,0 0,-0.53 -0.61L65.17,14.24a0.55,0.55 0,0 0,-0.54 0.46m27.59,6.36a2.52,2.52 0,0 1,-2.56 2.25h-2.3a0.53,0.53 0,0 1,-0.53 -0.61l0.48,-3.38a0.54,0.54 0,0 1,0.54 -0.46L90.3,18.86a1.8,1.8 0,0 1,1.92 2.2m-1.36,-6.79L83.45,14.27a0.52,0.52 0,0 0,-0.53 0.46L80.31,33.12a0.54,0.54 0,0 0,0.54 0.61h3.94a0.54,0.54 0,0 0,0.54 -0.46l0.76,-5.49a0.27,0.27 0,0 1,0.27 -0.23h0.51a0.27,0.27 0,0 1,0.23 0.12l3.77,5.82a0.54,0.54 0,0 0,0.45 0.24L96.2,33.73a0.53,0.53 0,0 0,0.44 -0.84l-4,-5.58a0.27,0.27 0,0 1,0.11 -0.39c2.52,-1.22 4,-2.47 4.47,-5.94 0.56,-4.57 -2.34,-6.71 -6.4,-6.71M133,24.88l-0.52,-5a0.11,0.11 0,0 0,-0.12 -0.1h0a0.11,0.11 0,0 0,-0.11 0.07l-1.87,4.9a0.53,0.53 0,0 0,0.5 0.71h1.58a0.54,0.54 0,0 0,0.54 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.59,-3a0.52,0.52 0,0 0,-0.52 -0.43h-4.47a0.53,0.53 0,0 0,-0.49 0.32l-1.47,3.27a0.52,0.52 0,0 1,-0.49 0.31h-4.13a0.53,0.53 0,0 1,-0.48 -0.76l9.1,-18.39a0.55,0.55 0,0 1,0.48 -0.3L135,14.32a0.54,0.54 0,0 1,0.52 0.42l4.05,18.39a0.53,0.53 0,0 1,-0.52 0.64m15.63,-4.37a0.53,0.53 0,0 1,0.19 0.8A9,9 0,0 1,147.47 34c-3.86,0 -7.42,-2.23 -6.81,-6.65l0.94,-6.7c0.62,-4.4 4.84,-6.65 8.79,-6.65a6.16,6.16 0,0 1,6.12 4,0.53 0.53,0 0,1 -0.32,0.68l-3.35,1.27a0.54,0.54 0,0 1,-0.64 -0.22,3 3,0 0,0 -2.59,-1.18c-1.41,0 -2.83,0.8 -3,2.12l-0.94,6.7c-0.2,1.26 1,2.06 2.42,2.06A3.54,3.54 0,0 0,150.91 28a0.54,0.54 0,0 1,0.67 -0.17ZM168,19.22l-2,14.05a0.52,0.52 0,0 1,-0.53 0.46h-3.95a0.52,0.52 0,0 1,-0.53 -0.6L163,19.36a0.54,0.54 0,0 0,-0.54 -0.6h-4.07a0.53,0.53 0,0 1,-0.53 -0.61l0.51,-3.44a0.54,0.54 0,0 1,0.53 -0.46h14.57a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.52,0.52 0,0 1,-0.53 0.45h-4.38a0.54,0.54 0,0 0,-0.53 0.46m10.14,14.51h-3.89a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46h3.89a0.54,0.54 0,0 1,0.54 0.61l-2.61,18.39a0.52,0.52 0,0 1,-0.53 0.45m19,-19.48h4.13a0.53,0.53 0,0 1,0.48 0.77l-9.31,18.42a0.53,0.53 0,0 1,-0.48 0.29h-3.79a0.54,0.54 0,0 1,-0.53 -0.41l-4.1,-18.42a0.54,0.54 0,0 1,0.52 -0.65h4.23a0.55,0.55 0,0 1,0.53 0.44l1.66,9a0.13,0.13 0,0 1,0 0.06l0.28,4.61h0.05l1.49,-4.58 0,-0.06 4.32,-9.2a0.54,0.54 0,0 1,0.48 -0.31m10.26,10.63 l-0.51,-5a0.12,0.12 0,0 0,-0.12 -0.1h0a0.14,0.14 0,0 0,-0.12 0.07l-1.86,4.9a0.52,0.52 0,0 0,0.5 0.71h1.58a0.53,0.53 0,0 0,0.53 -0.58m6,8.85h-4.23a0.54,0.54 0,0 1,-0.53 -0.43l-0.58,-3a0.54,0.54 0,0 0,-0.53 -0.43h-4.46a0.52,0.52 0,0 0,-0.49 0.32l-1.47,3.27a0.54,0.54 0,0 1,-0.49 0.31h-4.13A0.53,0.53 0,0 1,196 33l9.1,-18.39a0.55,0.55 0,0 1,0.49 -0.3h3.76a0.56,0.56 0,0 1,0.53 0.42l4,18.39a0.54,0.54 0,0 1,-0.53 0.64M223.9,19.22l-2,14.05a0.54,0.54 0,0 1,-0.53 0.46h-4a0.53,0.53 0,0 1,-0.53 -0.6l1.92,-13.77a0.52,0.52 0,0 0,-0.53 -0.6h-4.08a0.54,0.54 0,0 1,-0.53 -0.61l0.51,-3.44a0.55,0.55 0,0 1,0.53 -0.46h14.58a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.45a0.54,0.54 0,0 1,-0.53 0.45h-4.38a0.53,0.53 0,0 0,-0.53 0.46m12.77,2.59h6.75a0.53,0.53 0,0 1,0.53 0.6l-0.47,3.31a0.53,0.53 0,0 1,-0.53 0.46h-7a0.54,0.54 0,0 0,-0.53 0.45l-0.26,1.86a0.53,0.53 0,0 0,0.53 0.6h7.44a0.52,0.52 0,0 1,0.53 0.6l-0.49,3.58a0.53,0.53 0,0 1,-0.53 0.46L230,33.73a0.53,0.53 0,0 1,-0.53 -0.6L232,14.74a0.55,0.55 0,0 1,0.54 -0.46h12.62a0.53,0.53 0,0 1,0.53 0.61l-0.51,3.58a0.53,0.53 0,0 1,-0.53 0.45h-7.75a0.54,0.54 0,0 0,-0.53 0.46l-0.26,1.82a0.53,0.53 0,0 0,0.53 0.61M254,29.12c1.36,0 2.58,-0.74 2.72,-1.79l0.95,-6.54c0.14,-1.07 -0.84,-1.92 -2.2,-1.92h-2.06a0.54,0.54 0,0 0,-0.54 0.45l-1.32,9.19a0.54,0.54 0,0 0,0.53 0.61ZM255.94,14.28c4,0 7.37,2 6.73,6.51l-0.94,6.54c-0.64,4.48 -4.59,6.4 -8.54,6.4h-6.75a0.54,0.54 0,0 1,-0.54 -0.6l2.61,-18.39a0.54,0.54 0,0 1,0.53 -0.46Z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml
index 1522490e51..8f44733d8d 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="36dp" android:width="51dp" android:viewportWidth="51" android:viewportHeight="36">
     <group>
         <clip-path android:pathData="M0,3h51v33h-51z M 0,0"/>
-        <path android:fillColor="#d90c36" android:pathData="M27.735,34.4719H0.7475C0.3347,34.4719 0,34.814 0,35.236C0,35.6579 0.3347,36 0.7475,36H27.735C28.1478,36 28.4825,35.6579 28.4825,35.236C28.4825,34.814 28.1478,34.4719 27.735,34.4719Z"/>
-        <path android:fillColor="#d90c36" android:pathData="M49.3674,29.5005H6.501C5.5994,29.5005 4.8684,30.2477 4.8684,31.1693C4.8684,32.091 5.5994,32.8382 6.501,32.8382H49.3674C50.2691,32.8382 51,32.091 51,31.1693C51,30.2477 50.2691,29.5005 49.3674,29.5005Z"/>
+        <path android:fillColor="#72767d" android:pathData="M27.735,34.4719H0.7475C0.3347,34.4719 0,34.814 0,35.236C0,35.6579 0.3347,36 0.7475,36H27.735C28.1478,36 28.4825,35.6579 28.4825,35.236C28.4825,34.814 28.1478,34.4719 27.735,34.4719Z"/>
+        <path android:fillColor="#72767d" android:pathData="M49.3674,29.5005H6.501C5.5994,29.5005 4.8684,30.2477 4.8684,31.1693C4.8684,32.091 5.5994,32.8382 6.501,32.8382H49.3674C50.2691,32.8382 51,32.091 51,31.1693C51,30.2477 50.2691,29.5005 49.3674,29.5005Z"/>
         <path android:fillColor="#cf171d" android:pathData="M17.8802,24.9111L13.7544,25.9164C13.6704,25.9365 13.5834,25.9395 13.4983,25.925C13.4132,25.9106 13.3318,25.8791 13.2587,25.8324C13.1855,25.7857 13.1222,25.7247 13.0722,25.6528C13.0223,25.581 12.9867,25.4997 12.9676,25.4138L12.4414,23.1065C12.4217,23.0204 12.4188,22.9311 12.4328,22.8438C12.4469,22.7565 12.4776,22.6729 12.5233,22.5978C12.5689,22.5226 12.6286,22.4574 12.699,22.4058C12.7693,22.3543 12.8489,22.3174 12.9331,22.2972L17.0639,21.2919C17.1475,21.2719 17.2343,21.269 17.319,21.2835C17.4038,21.298 17.4848,21.3295 17.5576,21.3763C17.6303,21.423 17.6932,21.4841 17.7427,21.5559C17.7922,21.6277 17.8272,21.7088 17.8458,21.7946L18.367,24.1119C18.4041,24.2837 18.3739,24.4635 18.2829,24.6129C18.1919,24.7622 18.0474,24.8693 17.8802,24.9111Z" android:fillType="evenOdd"/>
         <path android:fillColor="#505e7e" android:pathData="M40.1075,10.9221C40.0092,10.7863 39.9059,10.6607 39.8027,10.53C39.5747,10.2651 39.2794,10.07 38.9496,9.9662C38.6197,9.8624 38.2682,9.8539 37.934,9.9419L18.5293,14.6719C18.1911,14.7474 17.8805,14.9184 17.6328,15.1655C17.385,15.4125 17.21,15.7257 17.1278,16.0694C16.6668,18.0357 16.6426,20.0827 17.0571,22.0599C17.4715,24.0371 18.314,25.8942 19.5226,27.4949C19.6603,27.6809 19.8079,27.8619 19.9554,28.0378C20.1528,28.2931 20.2959,28.5877 20.3755,28.9028C20.4551,29.2179 20.4694,29.5465 20.4176,29.8675C20.3931,30.0988 20.2455,30.2747 20.334,30.526C20.4521,30.8578 20.6488,30.8879 20.9487,30.9734C21.47,31.1192 37.2308,31.0136 37.8356,30.9734C38.4405,30.9332 39.183,31.0287 39.7289,30.6265C39.7614,30.6042 39.7887,30.5747 39.8087,30.5403C39.8288,30.5059 39.8411,30.4673 39.8449,30.4274C39.8487,30.3875 39.8437,30.3473 39.8305,30.3096C39.8172,30.2719 39.796,30.2377 39.7682,30.2093C39.5104,30.0173 39.3297,29.7359 39.2601,29.4177C39.1904,29.0995 39.2364,28.7662 39.3896,28.4802C39.7387,27.6508 40.5796,26.8264 40.9484,26.2081C42.3328,23.8632 42.9926,21.1459 42.8417,18.4114C42.6908,15.677 41.7362,13.0527 40.1026,10.8818L40.1075,10.9221Z" android:fillType="evenOdd"/>
         <path android:fillColor="#000000" android:pathData="M32.4558,15.0942C32.5764,15.6224 32.4894,16.178 32.2135,16.6414C31.9376,17.1048 31.4949,17.439 30.9805,17.5723L18.5686,20.5933C18.3099,20.6561 18.0417,20.666 17.7793,20.6226C17.5169,20.5792 17.2654,20.4833 17.0393,20.3405C16.8132,20.1976 16.6169,20.0105 16.4616,19.79C16.3063,19.5694 16.1951,19.3197 16.1344,19.0552L14.9001,13.6465C14.7789,13.1147 14.8687,12.5554 15.1498,12.0911C15.4308,11.6267 15.8803,11.295 16.3999,11.1684L28.7774,8.1524C29.0361,8.0883 29.3047,8.0773 29.5676,8.1201C29.8305,8.1629 30.0824,8.2586 30.3089,8.4017C30.5353,8.5447 30.7317,8.7323 30.8867,8.9536C31.0416,9.1748 31.1521,9.4253 31.2116,9.6905L32.4558,15.0942Z" android:fillType="evenOdd"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml b/app/src/main/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml
index d6e8e2731d..066632368c 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="36dp" android:width="51dp" android:viewportWidth="51" android:viewportHeight="36">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="96dp" android:width="126dp" android:viewportWidth="126" android:viewportHeight="96">
     <group>
-        <clip-path android:pathData="M3,0h44.82v35.999h-44.82z M 0,0"/>
-        <path android:fillColor="#d90c36" android:pathData="M29.384,34.6392H4.8071C4.4316,34.6392 4.1272,34.9436 4.1272,35.319C4.1272,35.6945 4.4316,35.9989 4.8071,35.9989H29.384C29.7595,35.9989 30.0638,35.6945 30.0638,35.319C30.0638,34.9436 29.7595,34.6392 29.384,34.6392Z"/>
-        <path android:fillColor="#d90c36" android:pathData="M46.3331,30.6914H10.0578C9.2366,30.6914 8.5708,31.3571 8.5708,32.1784C8.5708,32.9996 9.2366,33.6654 10.0578,33.6654H46.3331C47.1544,33.6654 47.8201,32.9996 47.8201,32.1784C47.8201,31.3571 47.1544,30.6914 46.3331,30.6914Z"/>
-        <path android:fillColor="#c4cddb" android:pathData="M16.0188,7.7024L16.8873,8.6893L14.1721,15.0013L16.0188,7.7024Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#e3e8f5" android:pathData="M45.2496,25.8532L37.2137,26.5857C37.1684,26.5898 37.1232,26.5756 37.0883,26.5464C37.0533,26.5172 37.0314,26.4753 37.0273,26.43C37.0232,26.3846 37.0373,26.3395 37.0666,26.3045C37.0958,26.2696 37.1376,26.2476 37.183,26.2436L45.2408,25.511C45.2854,25.5066 45.3265,25.4848 45.3552,25.4503C45.384,25.4159 45.398,25.3715 45.3943,25.3268L45.2803,24.0372C45.2762,23.9918 45.2903,23.9467 45.3195,23.9117C45.3487,23.8768 45.3906,23.8549 45.436,23.8508C45.4814,23.8467 45.5265,23.8608 45.5614,23.89C45.5964,23.9192 45.6183,23.9611 45.6224,24.0065L45.7408,25.2961C45.7462,25.3652 45.7376,25.4346 45.7157,25.5003C45.6937,25.566 45.6588,25.6266 45.613,25.6785C45.5672,25.7305 45.5114,25.7727 45.449,25.8027C45.3866,25.8327 45.3187,25.8499 45.2496,25.8532Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#000000" android:pathData="M46.1005,24.7393L44.8987,24.849C44.8762,24.8514 44.8534,24.8493 44.8317,24.8429C44.8101,24.8365 44.7899,24.8258 44.7723,24.8116C44.7548,24.7973 44.7402,24.7797 44.7296,24.7597C44.7189,24.7398 44.7122,24.718 44.71,24.6954L44.3767,21.0109C44.3743,20.9881 44.3765,20.965 44.3832,20.943C44.3899,20.9211 44.4009,20.9007 44.4156,20.8831C44.4304,20.8655 44.4485,20.851 44.4689,20.8406C44.4894,20.8301 44.5117,20.8239 44.5346,20.8223L45.7321,20.7126C45.7549,20.7102 45.778,20.7124 45.7999,20.7191C45.8219,20.7258 45.8423,20.7368 45.8599,20.7516C45.8775,20.7663 45.8919,20.7844 45.9024,20.8049C45.9128,20.8253 45.919,20.8476 45.9207,20.8705L46.2541,24.5551C46.2565,24.5773 46.2544,24.5998 46.2479,24.6213C46.2414,24.6427 46.2307,24.6626 46.2164,24.6798C46.2021,24.697 46.1844,24.7111 46.1645,24.7213C46.1446,24.7316 46.1229,24.7377 46.1005,24.7393Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M32.5115,13.8741L17.8303,3.0398L19.0015,9.2334C19.2289,10.4439 19.9058,11.5236 20.8964,12.2556L32.5817,20.8792L33.3976,19.7738L32.5115,13.8741Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ebeef5" android:pathData="M36.455,14.4311L16.9488,0.035C16.9213,0.0141 16.8882,0.002 16.8538,0.0002C16.8193,-0.0015 16.7852,0.0072 16.7557,0.0252C16.7263,0.0432 16.7031,0.0697 16.689,0.1012C16.6749,0.1327 16.6707,0.1677 16.6768,0.2017L17.0102,2.136C17.0492,2.355 17.1699,2.551 17.3479,2.6843L17.8304,3.0396L32.5116,13.874L33.3889,19.7737L32.5818,20.879L31.9502,21.7124L36.8629,25.34L38.2973,23.4012L37.113,15.5627C37.0505,15.1138 36.8142,14.7074 36.455,14.4311Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M33.3976,19.7738L32.5203,13.8741L17.8303,3.0398L18.0672,4.2811L31.722,14.3698L32.5466,19.844L32.0597,20.502L32.5817,20.8836L33.3976,19.7738Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#505e7e" android:pathData="M30.0947,11.9793C27.1893,11.852 24.3523,12.8841 22.2078,14.8484C20.0633,16.8128 18.7869,19.5485 18.6594,22.4539L40.5913,23.4146C40.6543,21.9742 40.4326,20.5355 39.9389,19.1809C39.4453,17.8263 38.6893,16.5823 37.7144,15.5202C36.7394,14.458 35.5646,13.5986 34.2571,12.991C32.9497,12.3834 31.5352,12.0396 30.0947,11.9793Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#505e7e" android:pathData="M38.2709,16.2297C38.1876,16.12 38.0999,16.0148 38.0121,15.9095C37.8208,15.6915 37.5726,15.531 37.2953,15.4458C37.0181,15.3606 36.7226,15.3541 36.4418,15.427L20.1464,19.3001C19.8645,19.36 19.6048,19.4972 19.3964,19.6963C19.188,19.8954 19.0392,20.1486 18.9665,20.4274C18.579,22.0455 18.5592,23.7298 18.9083,25.3565C19.2575,26.9832 19.9669,28.511 20.9842,29.8275C21.1027,29.981 21.2211,30.1257 21.3483,30.2661C21.5134,30.4765 21.6333,30.7187 21.7005,30.9776C21.7677,31.2365 21.7807,31.5065 21.7387,31.7706C21.7387,31.9592 21.5939,32.104 21.6641,32.3101C21.765,32.5865 21.9317,32.6084 22.1817,32.6786C22.6203,32.797 35.8584,32.7093 36.3629,32.7005C36.8673,32.6918 37.4989,32.7444 37.9551,32.4154C37.983,32.3976 38.0065,32.3738 38.0239,32.3456C38.0413,32.3175 38.0521,32.2857 38.0554,32.2528C38.0588,32.2199 38.0547,32.1867 38.0434,32.1556C38.0321,32.1245 38.0139,32.0964 37.9902,32.0733C37.7827,31.9207 37.6353,31.7002 37.5736,31.4501C37.5119,31.2001 37.5398,30.9363 37.6525,30.7047C37.9463,30.0205 38.6525,29.345 38.9684,28.8361C40.1352,26.909 40.6929,24.6745 40.5684,22.4251C40.444,20.1757 39.6432,18.0163 38.2709,16.2297Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#7787af" android:pathData="M35.7576,19.3001C36.474,20.5143 36.8142,21.9137 36.7353,23.3213C36.6563,24.7289 36.1617,26.0815 35.314,27.208C34.4662,28.3345 33.3035,29.1843 31.9728,29.6499C30.6421,30.1156 29.2032,30.1761 27.8381,29.824C26.4729,29.4718 25.2429,28.7227 24.3035,27.6714C23.3641,26.6202 22.7576,25.3139 22.5606,23.9179C22.3637,22.5219 22.5851,21.0989 23.1969,19.8287C23.8088,18.5586 24.7835,17.4984 25.9979,16.7823C27.6261,15.8221 29.5689,15.548 31.3991,16.0202C33.2294,16.4923 34.7971,17.6721 35.7576,19.3001Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ff8283" android:pathData="M36.126,13.6416C36.3015,15.3128 32.266,19.7825 29.5903,22.3003C26.9585,22.5591 20.3175,22.8837 18.6244,21.5151C18.5504,21.4605 18.4883,21.3916 18.4415,21.3125C18.3948,21.2334 18.3645,21.1456 18.3524,21.0545C18.3441,20.9875 18.3441,20.9198 18.3524,20.8528C18.6326,19.232 19.2619,17.6915 20.1965,16.3381C21.1311,14.9846 22.3488,13.8505 23.7652,13.0143C27.3752,10.8869 31.9107,10.9834 35.8979,13.2775C35.964,13.3135 36.0196,13.3659 36.0596,13.4297C36.0995,13.4934 36.1224,13.5664 36.126,13.6416Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#eb7374" android:pathData="M23.6424,13.0276C22.0402,13.9672 20.703,15.2985 19.7561,16.8964C19.1858,17.8614 20.0017,19.0106 20.9141,19.6554C21.3258,19.9474 21.6798,20.3133 21.958,20.7344C22.4581,21.4933 23.1774,22.3223 24.0547,22.3311C25.8093,22.353 27.6384,22.2478 28.8797,22.1381C29.2432,22.1056 29.5849,21.951 29.8491,21.6995C32.4546,19.1729 35.9901,15.1199 35.8365,13.5803C35.831,13.5062 35.8068,13.4348 35.7661,13.3726C35.7255,13.3105 35.6697,13.2597 35.6041,13.225C31.6739,10.9967 27.191,10.9265 23.6424,13.0276Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ffb0b1" android:pathData="M29.8314,22.8091C29.8314,22.8091 18.7558,17.5016 19.7032,16.0979C20.6839,14.6458 21.9774,13.4318 23.4887,12.545C27.5549,10.1456 32.3404,10.5974 36.1697,12.8038C38.8893,14.3653 29.8314,22.8091 29.8314,22.8091Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ff8788" android:pathData="M21.6861,15.6593C22.809,16.0979 22.2475,15.1198 22.3177,14.668C22.4361,13.8916 23.2871,14.0539 23.831,13.8477C24.6469,13.5363 24.1951,12.9704 24.5679,12.3695C24.6557,12.2291 24.5109,12.0449 24.3662,12.1151C24.0591,12.2599 23.7608,12.4221 23.4626,12.5976C22.8194,12.9774 22.2142,13.418 21.6554,13.9135C21.0939,14.4004 20.9843,15.3786 21.6861,15.6593ZM33.2968,13.9047C33.3083,14.132 33.2712,14.3591 33.188,14.5709C33.1048,14.7826 32.9774,14.9743 32.8143,15.1329C31.7002,16.0585 30.1825,14.4881 29.0333,15.8304C28.099,16.9313 28.6385,18.6596 27.498,19.7474C27.0594,20.186 26.8532,21.287 27.4103,21.5721C28.134,21.9362 28.7613,22.2476 29.2043,22.4494C29.4031,22.5466 29.627,22.5797 29.8454,22.5444C30.0637,22.509 30.2658,22.4069 30.4237,22.252C32.3318,20.3922 38.4947,14.1109 36.1699,12.8038C35.451,12.397 34.6981,12.0536 33.9197,11.7773C33.3144,11.5624 32.5599,11.8388 32.7792,12.4485C32.9415,12.9046 33.2661,13.3828 33.2968,13.8916V13.9047Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ff8788" android:pathData="M30.042,13.1064V13.1459C30.0968,13.1464 30.1496,13.1667 30.1906,13.2029C30.2317,13.2392 30.2584,13.289 30.2657,13.3432C30.2724,13.3706 30.2724,13.3992 30.2657,13.4266C30.3093,13.4256 30.3521,13.4378 30.3886,13.4617C30.4982,13.5231 30.5552,13.6591 30.6737,13.7029C30.8667,13.7819 31.0597,13.7687 31.1386,13.5055C31.1855,13.3212 31.158,13.1258 31.0619,12.9617C30.9659,12.7975 30.8091,12.6777 30.6254,12.6283C30.2921,12.5493 29.9675,12.6853 30.042,13.1064Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#eaeef6" android:pathData="M34.8101,19.8702C35.4164,20.8978 35.7044,22.082 35.6375,23.2732C35.5707,24.4645 35.1521,25.6091 34.4346,26.5623C33.7171,27.5156 32.733,28.2346 31.6068,28.6285C30.4806,29.0223 29.2629,29.0733 28.1077,28.775C26.9525,28.4767 25.9118,27.8425 25.1171,26.9526C24.3224,26.0627 23.8095,24.9571 23.6433,23.7756C23.4771,22.5942 23.665,21.39 24.1833,20.3153C24.7015,19.2407 25.5269,18.3439 26.5549,17.7384C27.9325,16.9271 29.5758,16.6959 31.1238,17.0956C32.6717,17.4954 33.9976,18.4933 34.8101,19.8702Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M33.9853,20.3573C34.495,21.221 34.7372,22.2164 34.6813,23.2178C34.6253,24.2191 34.2736,25.1813 33.6707,25.9828C33.0678,26.7843 32.2408,27.389 31.2943,27.7204C30.3477,28.0519 29.3241,28.0952 28.353,27.8449C27.3818,27.5946 26.5067,27.0619 25.8382,26.3142C25.1698,25.5665 24.7381,24.6374 24.5978,23.6444C24.4574,22.6513 24.6147,21.639 25.0497,20.7353C25.4847,19.8317 26.1779,19.0773 27.0416,18.5676C28.1997,17.8842 29.5819,17.6889 30.8841,18.0245C32.1862,18.3601 33.3017,19.1992 33.9853,20.3573Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M26.41,21.0545L29.0067,19.1772C29.0845,19.1209 29.1756,19.086 29.2711,19.076C29.3665,19.066 29.4629,19.0812 29.5506,19.1201L32.4764,20.436C32.564,20.4739 32.6399,20.5346 32.6962,20.6117C32.7525,20.6889 32.7872,20.7796 32.7966,20.8747L33.1255,24.0636C33.1354,24.1592 33.1199,24.2558 33.0806,24.3435C33.0413,24.4313 32.9797,24.5072 32.9018,24.5636L30.3051,26.4498C30.2265,26.506 30.1346,26.5409 30.0385,26.5509C29.9424,26.5609 29.8453,26.5457 29.7568,26.5068L26.8311,25.1909C26.7447,25.1512 26.67,25.09 26.6139,25.0132C26.5579,24.9364 26.5224,24.8466 26.5109,24.7522L26.1819,21.5633C26.1709,21.4659 26.1863,21.3673 26.2264,21.2778C26.2666,21.1883 26.3299,21.1112 26.41,21.0545Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#b6c1cc" android:pathData="M31.1297,22.0414C31.3054,22.3405 31.3885,22.685 31.3685,23.0313C31.3485,23.3777 31.2262,23.7103 31.0172,23.9872C30.8082,24.2641 30.5218,24.4728 30.1942,24.5869C29.8666,24.7011 29.5126,24.7156 29.1767,24.6285C28.8409,24.5415 28.5384,24.3569 28.3075,24.098C28.0766,23.8391 27.9276,23.5176 27.8794,23.1741C27.8311,22.8305 27.8858,22.4804 28.0365,22.1679C28.1872,21.8555 28.4271,21.5947 28.726,21.4185C28.9247,21.3014 29.1445,21.2247 29.3729,21.1926C29.6012,21.1605 29.8337,21.1738 30.057,21.2316C30.2802,21.2895 30.4899,21.3908 30.674,21.5297C30.858,21.6687 31.0129,21.8426 31.1297,22.0414Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#2f3848" android:pathData="M38.9684,30.0949H38.8017L30.7615,29.415C30.5018,29.3993 30.2479,29.332 30.0146,29.2171C29.7812,29.1021 29.5732,28.9418 29.4025,28.7454C29.2319,28.5491 29.1022,28.3207 29.0209,28.0736C28.9396,27.8265 28.9084,27.5657 28.9291,27.3064C28.9498,27.0471 29.022,26.7946 29.1415,26.5635C29.2609,26.3325 29.4253,26.1276 29.6249,25.9608C29.8246,25.7941 30.0554,25.6688 30.3041,25.5923C30.5527,25.5158 30.814,25.4897 31.0729,25.5155L39.1482,26.1866C39.6624,26.2161 40.1442,26.4471 40.489,26.8296C40.8339,27.2121 41.0141,27.7152 40.9904,28.2296C40.9667,28.7441 40.7411,29.2285 40.3626,29.5777C39.984,29.9269 39.4831,30.1127 38.9684,30.0949Z"/>
-        <path android:fillColor="#e3e8f5" android:pathData="M38.5295,26.4498L30.4586,27.1955C30.4361,27.1975 30.4135,27.1951 30.392,27.1884C30.3704,27.1816 30.3504,27.1707 30.3331,27.1563C30.3158,27.1418 30.3015,27.1241 30.2911,27.1041C30.2806,27.0841 30.2742,27.0623 30.2722,27.0398C30.2702,27.0173 30.2726,26.9947 30.2793,26.9732C30.2861,26.9516 30.297,26.9317 30.3114,26.9143C30.3259,26.897 30.3436,26.8827 30.3636,26.8723C30.3836,26.8618 30.4054,26.8554 30.4279,26.8534L38.4813,26.1252C38.5271,26.1208 38.5693,26.0985 38.5988,26.0632C38.6284,26.028 38.6428,25.9825 38.6392,25.9366L38.5295,24.6295C38.5275,24.607 38.5299,24.5844 38.5367,24.5629C38.5434,24.5413 38.5543,24.5213 38.5688,24.504C38.5832,24.4867 38.601,24.4724 38.6209,24.462C38.6409,24.4515 38.6628,24.4451 38.6852,24.4431C38.7077,24.4411 38.7303,24.4435 38.7519,24.4502C38.7734,24.457 38.7934,24.4679 38.8107,24.4823C38.828,24.4968 38.8423,24.5145 38.8528,24.5345C38.8632,24.5545 38.8696,24.5763 38.8717,24.5988L38.9682,25.8796C38.9833,26.013 38.9459,26.147 38.8641,26.2534C38.7823,26.3598 38.6623,26.4302 38.5295,26.4498Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#000000" android:pathData="M39.363,25.3358L38.1656,25.4411C38.1427,25.4435 38.1197,25.4413 38.0977,25.4346C38.0757,25.4279 38.0554,25.4169 38.0378,25.4021C38.0202,25.3874 38.0057,25.3693 37.9953,25.3488C37.9848,25.3284 37.9786,25.3061 37.9769,25.2832L37.6524,21.603C37.6499,21.5805 37.652,21.5578 37.6584,21.5361C37.6648,21.5144 37.6755,21.4942 37.6898,21.4767C37.704,21.4591 37.7217,21.4446 37.7416,21.4339C37.7615,21.4232 37.7834,21.4166 37.8059,21.4144L39.0077,21.3047C39.0302,21.3029 39.0528,21.3056 39.0743,21.3126C39.0957,21.3196 39.1156,21.3307 39.1327,21.3454C39.1498,21.3601 39.1639,21.378 39.174,21.3981C39.1842,21.4182 39.1903,21.4402 39.192,21.4627L39.5297,25.1472C39.5322,25.1707 39.5297,25.1945 39.5225,25.217C39.5152,25.2396 39.5034,25.2603 39.4878,25.2781C39.4721,25.2958 39.4529,25.3101 39.4315,25.32C39.41,25.33 39.3867,25.3353 39.363,25.3358Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#b6c1cc" android:pathData="M33.1606,27.3797L26.6206,29.5158L25.8091,27.0331L32.3448,24.897L33.1606,27.3797Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M27.783,29.8582L19.6682,33.4857C19.5924,33.5205 19.5092,33.5363 19.4259,33.5317C19.3426,33.5271 19.2616,33.5023 19.1901,33.4594C18.8129,33.2269 18.1023,32.6084 17.6066,31.0995C17.1109,29.5906 17.3259,28.6695 17.4926,28.2571C17.5252,28.1809 17.5757,28.1135 17.6399,28.0609C17.704,28.0082 17.7798,27.9717 17.861,27.9545L26.5636,26.0727C26.6471,26.0556 26.7339,26.0699 26.8076,26.1128C26.8812,26.1556 26.9364,26.2242 26.9627,26.3052L27.9848,29.4371C28.0107,29.5198 28.0043,29.6092 27.9669,29.6874C27.9294,29.7656 27.8637,29.8266 27.783,29.8582Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#adb7c2" android:pathData="M17.3479,30.1037C17.4026,30.4417 17.4847,30.7747 17.5935,31.0994C17.5921,31.1096 17.5921,31.1199 17.5935,31.1301C17.8523,29.9107 18.7252,29.0641 20.2955,29.2045C21.2474,29.2878 21.6992,29.2045 21.9887,28.1693C22.0135,28.0162 22.0695,27.8698 22.1533,27.7393C22.2371,27.6088 22.3467,27.4968 22.4756,27.4105C22.7958,27.1999 22.8309,26.9718 22.6335,26.9148L17.8436,27.9544C17.7624,27.9716 17.6865,28.0081 17.6224,28.0607C17.5583,28.1134 17.5078,28.1807 17.4751,28.257C17.278,28.8521 17.2342,29.4872 17.3479,30.1037Z" android:fillAlpha="0.6"/>
-        <path android:fillColor="#adb7c2" android:pathData="M22.6027,28.5114C22.5787,28.6049 22.5787,28.7029 22.6027,28.7965C22.6685,28.9675 22.8045,29.1342 22.9843,29.1211C23.1641,29.1079 23.3089,28.7614 23.2519,28.5772C23.2217,28.4932 23.1688,28.4192 23.0992,28.3634C23.0295,28.3076 22.9457,28.2723 22.8571,28.2613C22.7036,28.2394 22.6334,28.3622 22.6027,28.5114Z" android:fillAlpha="0.6"/>
-        <path android:fillColor="#b6c1cc" android:pathData="M25.2433,27.6736C25.2689,27.7511 25.2709,27.8346 25.2491,27.9133C25.2272,27.992 25.1824,28.0624 25.1205,28.1157C25.0585,28.1689 24.9821,28.2026 24.901,28.2123C24.8199,28.2221 24.7377,28.2075 24.6649,28.1705C24.5921,28.1334 24.5319,28.0756 24.492,28.0043C24.4521,27.933 24.4343,27.8515 24.4408,27.7701C24.4473,27.6886 24.4778,27.611 24.5286,27.5469C24.5793,27.4829 24.6479,27.4354 24.7257,27.4104C24.8292,27.3771 24.9417,27.3861 25.0387,27.4354C25.1356,27.4847 25.2091,27.5703 25.2433,27.6736Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#000000" android:pathData="M33.2879,28.5992L31.0947,28.801L30.406,21.4275L33.4765,21.1467L34.0642,27.6649C34.0804,27.8907 34.0086,28.114 33.8639,28.2882C33.7192,28.4623 33.5128,28.5737 33.2879,28.5992Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M15.3389,10.387L14.1722,15.0014L12.4176,14.7383C11.2079,14.5453 10.1133,13.9089 9.3471,12.953L6.2065,9.0053L5.3906,8.0271L15.5495,9.5492L15.3389,10.387Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M25.9057,18.6026L25.3574,19.8615L24.7652,19.6071L14.1721,15.0014L16.4706,10.8431L16.8917,10.0842L23.7169,13.0494L25.9057,18.6026Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ebeef5" android:pathData="M3.1974,5.7814L16.0188,7.7026L15.5495,9.5493L5.3906,8.0272L4.7941,7.9395C4.5755,7.9048 4.3781,7.7889 4.2414,7.6149L3.0351,6.0577C3.0154,6.0301 3.0041,5.9974 3.0026,5.9636C3.0011,5.9297 3.0094,5.8961 3.0266,5.8669C3.0438,5.8376 3.069,5.814 3.0993,5.7988C3.1297,5.7837 3.1637,5.7776 3.1974,5.7814Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ebeef5" android:pathData="M31.5114,21.0546L30.5464,23.2478L24.9318,20.809L25.3705,19.8659L25.9188,18.6027L23.7256,13.0539L16.8916,10.0887L17.8127,8.4263L27.6865,12.7205C28.1036,12.9052 28.4324,13.245 28.6032,13.668L31.5114,21.0546Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M5.3906,8.0271L15.5495,9.5492L15.3389,10.387L6.1758,9.014L5.3906,8.0271Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M25.9056,18.6026L25.3573,19.8615L24.7651,19.6071L25.0853,18.857L23.0588,13.7074L16.4705,10.8431L16.8916,10.0842L23.7168,13.0494L25.9056,18.6026Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M5.237,6.6981C5.1702,6.6884 5.102,6.6988 5.041,6.7279C4.9801,6.757 4.9291,6.8035 4.8945,6.8615C4.8599,6.9195 4.8432,6.9864 4.8466,7.0539C4.85,7.1213 4.8733,7.1863 4.9135,7.2405C4.9537,7.2948 5.0091,7.3359 5.0727,7.3587C5.1363,7.3815 5.2052,7.385 5.2707,7.3688C5.3362,7.3525 5.3955,7.3172 5.4411,7.2674C5.4866,7.2175 5.5163,7.1552 5.5265,7.0884C5.5391,6.9984 5.5159,6.907 5.4617,6.834C5.4075,6.761 5.3268,6.7122 5.237,6.6981Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M6.6846,6.9174C6.6399,6.91 6.5941,6.9116 6.55,6.9222C6.5059,6.9329 6.4644,6.9523 6.428,6.9793C6.3916,7.0063 6.3609,7.0404 6.338,7.0795C6.315,7.1186 6.3001,7.162 6.2943,7.2069C6.2809,7.2971 6.3039,7.3889 6.3582,7.4621C6.4124,7.5353 6.4936,7.5839 6.5837,7.5973C6.6739,7.6107 6.7657,7.5877 6.8389,7.5334C6.9121,7.4791 6.9608,7.398 6.9741,7.3078C6.9868,7.2178 6.9635,7.1264 6.9093,7.0534C6.8552,6.9803 6.7745,6.9315 6.6846,6.9174Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M27.6296,13.3434C27.5472,13.3131 27.4565,13.3147 27.3753,13.348C27.2941,13.3813 27.2283,13.4438 27.1909,13.5232C27.1585,13.6054 27.159,13.697 27.1926,13.7787C27.2261,13.8605 27.2899,13.9261 27.3708,13.9618C27.413,13.9857 27.4597,14.0004 27.508,14.0051C27.5562,14.0097 27.6049,14.0042 27.6509,13.9889C27.6969,13.9735 27.7392,13.9487 27.775,13.916C27.8108,13.8833 27.8393,13.8435 27.8587,13.7991C27.8782,13.7546 27.8881,13.7066 27.8878,13.6582C27.8875,13.6097 27.8771,13.5618 27.8571,13.5176C27.8372,13.4734 27.8082,13.4339 27.772,13.4016C27.7358,13.3693 27.6933,13.345 27.6471,13.3302L27.6296,13.3434Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#fb5d60" android:pathData="M32.3493,22.8486L28.8007,23.1688C28.7289,23.176 28.6563,23.1689 28.5873,23.1478C28.5182,23.1267 28.4541,23.0921 28.3986,23.046C28.343,22.9998 28.2972,22.9431 28.2639,22.8791C28.2305,22.8151 28.2102,22.7451 28.2041,22.6731L28.0331,20.7607C28.0221,20.6177 28.0681,20.4762 28.1609,20.367C28.2537,20.2578 28.3859,20.1896 28.5287,20.1773L32.0773,19.8527C32.149,19.846 32.2214,19.8536 32.2902,19.8749C32.359,19.8962 32.4229,19.9309 32.4783,19.9769C32.5337,20.0229 32.5795,20.0794 32.613,20.1432C32.6466,20.2069 32.6673,20.2766 32.6739,20.3483L32.8493,22.2608C32.8591,22.4046 32.8123,22.5466 32.7189,22.6564C32.6255,22.7662 32.4928,22.8352 32.3493,22.8486Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#cfd8e8" android:pathData="M33.7266,23.6863L30.9369,23.9407C30.5734,23.9736 30.2117,23.8609 29.9313,23.6274C29.6508,23.3938 29.4745,23.0584 29.4412,22.695L29.2438,20.5018C29.212,20.1386 29.3252,19.7775 29.5585,19.4973C29.7919,19.2171 30.1265,19.0405 30.4895,19.006L33.2661,18.7736C33.4021,18.7613 33.5374,18.8033 33.6425,18.8904C33.7477,18.9775 33.8142,19.1026 33.8275,19.2385L34.1784,23.1249C34.1909,23.2588 34.1506,23.3923 34.0663,23.4971C33.982,23.6019 33.8602,23.6698 33.7266,23.6863Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#9ba9c9" android:pathData="M14.988,14.2822C14.6303,14.1132 14.2428,14.0163 13.8476,13.9971C13.8155,13.9982 13.784,14.0057 13.7548,14.0192C13.7257,14.0326 13.6996,14.0517 13.6779,14.0754C13.6563,14.0991 13.6395,14.1269 13.6288,14.1571C13.618,14.1874 13.6133,14.2194 13.6151,14.2515C13.6196,14.3162 13.6492,14.3767 13.6974,14.4201C13.7457,14.4635 13.809,14.4864 13.8739,14.484H13.9046L13.966,14.4752H14.0932C14.1745,14.4866 14.2551,14.5027 14.3345,14.5234L14.4529,14.5585H14.5187C14.5187,14.5585 14.5889,14.5585 14.5187,14.5585C14.6028,14.5845 14.6837,14.6199 14.76,14.6638C14.818,14.6909 14.8841,14.6951 14.945,14.6755C15.006,14.656 15.0574,14.6142 15.0889,14.5585C15.1035,14.5077 15.1016,14.4536 15.0834,14.4039C15.0653,14.3543 15.0319,14.3117 14.988,14.2822Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#9ba9c9" android:pathData="M15.5582,13.111C15.2331,12.8903 14.8914,12.6953 14.5362,12.5276C14.5065,12.5155 14.4748,12.5095 14.4428,12.5098C14.4108,12.5101 14.3792,12.5168 14.3498,12.5294C14.3204,12.5421 14.2938,12.5605 14.2716,12.5835C14.2494,12.6065 14.2319,12.6337 14.2203,12.6636C14.197,12.7241 14.1981,12.7914 14.2235,12.8512C14.2489,12.9109 14.2965,12.9585 14.3563,12.9838L14.6063,13.1066L14.716,13.168L14.7686,13.1943H14.7993C14.9572,13.285 15.1108,13.3815 15.2599,13.4838C15.3117,13.5234 15.377,13.5407 15.4416,13.5321C15.5062,13.5235 15.5647,13.4895 15.6042,13.4378C15.6438,13.386 15.6612,13.3206 15.6525,13.256C15.6439,13.1915 15.61,13.133 15.5582,13.0934V13.111Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#9ba9c9" android:pathData="M15.5625,11.1721C15.5689,11.1083 15.5517,11.0443 15.5143,10.9922L15.4704,10.9484C15.4341,10.9223 15.3919,10.9057 15.3476,10.9001H14.9791C14.9494,10.8894 14.9168,10.8894 14.887,10.9001C14.8558,10.9042 14.8266,10.918 14.8037,10.9396C14.7775,10.9591 14.7564,10.9847 14.7423,11.0142C14.7231,11.0412 14.7124,11.0732 14.7116,11.1063C14.705,11.1688 14.7223,11.2314 14.7598,11.2817L14.8037,11.33C14.8402,11.3549 14.8825,11.37 14.9265,11.3739H15.2818C15.3121,11.3804 15.3435,11.3804 15.3739,11.3739C15.4039,11.3661 15.4322,11.3527 15.4572,11.3344C15.5077,11.2923 15.5405,11.2328 15.5494,11.1677L15.5625,11.1721Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#a8b0bd" android:pathData="M15.5494,9.5491L16.2995,10.0579L15.9968,10.7597L15.3389,10.3869L15.5494,9.5491Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M33.266,18.7738L31.7,18.9142C30.9412,18.9844 31.1035,19.5414 31.8623,19.4669C32.6212,19.3923 32.5466,19.5283 32.5159,19.8441C32.4852,20.1599 32.5904,20.9451 33.1124,20.581C33.6344,20.2169 33.9151,20.2082 33.8713,19.7037L33.8274,19.2168C33.8088,19.0849 33.7401,18.9653 33.6355,18.8827C33.5309,18.8002 33.3986,18.7612 33.266,18.7738Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M32.2658,20.5327C32.2568,20.5016 32.2384,20.474 32.2132,20.4537C32.1923,20.4322 32.1668,20.4157 32.1386,20.4054C32.109,20.3895 32.0757,20.3819 32.0421,20.3835H31.9763C31.9368,20.3952 31.9006,20.4162 31.871,20.4449L31.8316,20.4976C31.8088,20.5345 31.7967,20.577 31.7965,20.6204C31.7898,20.6522 31.7898,20.6851 31.7965,20.7169C31.8055,20.748 31.8239,20.7755 31.8491,20.7958C31.8709,20.8184 31.8981,20.835 31.9281,20.8441C31.9581,20.8532 31.9902,20.8532 32.0202,20.8441H32.086C32.1259,20.8333 32.1622,20.8121 32.1912,20.7827L32.2307,20.73C32.2534,20.6931 32.2656,20.6506 32.2658,20.6072C32.2698,20.5825 32.2698,20.5574 32.2658,20.5327Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M33.1081,22.0459C33.0492,22.0538 32.9951,22.0829 32.956,22.1276C32.9168,22.1724 32.8953,22.2299 32.8953,22.2893C32.8953,22.3488 32.9168,22.4063 32.956,22.451C32.9951,22.4958 33.0492,22.5249 33.1081,22.5328C33.1671,22.5249 33.2212,22.4958 33.2603,22.451C33.2995,22.4063 33.321,22.3488 33.321,22.2893C33.321,22.2299 33.2995,22.1724 33.2603,22.1276C33.2212,22.0829 33.1671,22.0538 33.1081,22.0459Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M11.5534,7.0183L8.1935,6.5138C7.6408,6.4305 7.4215,6.9525 7.9478,7.1279C8.1279,7.1907 8.2921,7.2919 8.4292,7.4244C8.5663,7.557 8.6729,7.7177 8.7418,7.8955C8.7771,7.9673 8.8285,8.0299 8.8919,8.0786C8.9553,8.1273 9.0291,8.1608 9.1075,8.1765C9.186,8.1922 9.2669,8.1896 9.3442,8.1691C9.4215,8.1485 9.493,8.1104 9.5532,8.0578C9.9919,7.7903 10.3428,7.4394 10.8428,7.6982C11.3429,7.957 11.9263,7.7859 11.5534,7.0183Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ced6e0" android:pathData="M10.9481,10.6809C10.978,10.6345 10.996,10.5814 11.0006,10.5263C11.0052,10.4712 10.9962,10.4159 10.9744,10.3651C10.8779,10.1502 10.6367,10.1809 10.4349,10.2116C10.4161,10.1851 10.3919,10.1627 10.364,10.1461C10.336,10.1295 10.3049,10.1189 10.2726,10.1151C10.1614,10.104 10.0491,10.1175 9.9436,10.1546C9.9095,10.1693 9.8792,10.1918 9.8552,10.2201C9.8312,10.2485 9.8141,10.2821 9.8051,10.3182C9.7962,10.3543 9.7958,10.3919 9.8038,10.4282C9.8118,10.4645 9.8282,10.4985 9.8515,10.5274L10.0489,10.738C10.0029,10.7851 9.9711,10.8443 9.9571,10.9087C9.9432,10.973 9.9476,11.0401 9.9699,11.102C10.0489,11.3345 10.3165,11.3784 10.5314,11.3521C10.7225,11.3373 10.901,11.2511 11.0314,11.1108C11.0558,11.0776 11.073,11.0398 11.082,10.9997C11.091,10.9596 11.0916,10.918 11.0837,10.8777C11.0759,10.8373 11.0598,10.799 11.0365,10.7651C11.0131,10.7313 10.983,10.7026 10.9481,10.6809Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ced6e0" android:pathData="M16.6768,0.2017L16.8742,1.3377C16.9707,1.908 17.4094,2.1624 17.7252,1.886C18.041,1.6097 18.5542,1.7544 18.7384,2.5396C18.9227,3.3247 19.4622,3.3555 19.7692,3.0352C20.0763,2.715 20.7386,3.0352 21.3483,3.6186C21.958,4.202 22.2256,3.9257 22.2256,3.9257L16.9488,0.035C16.9213,0.0141 16.8882,0.002 16.8538,0.0002C16.8193,-0.0015 16.7852,0.0072 16.7557,0.0252C16.7263,0.0432 16.7031,0.0697 16.689,0.1012C16.6749,0.1327 16.6707,0.1677 16.6768,0.2017Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M41.0607,32.7706H39.1877C39.0941,32.7605 39.0075,32.7162 38.9446,32.6461C38.8817,32.5761 38.8469,32.4853 38.8469,32.3911C38.8469,32.297 38.8817,32.2062 38.9446,32.1361C39.0075,32.0661 39.0941,32.0218 39.1877,32.0117H41.0607C41.1543,32.0218 41.2408,32.0661 41.3037,32.1361C41.3666,32.2062 41.4014,32.297 41.4014,32.3911C41.4014,32.4853 41.3666,32.5761 41.3037,32.6461C41.2408,32.7162 41.1543,32.7605 41.0607,32.7706Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M41.4289,33.2444H40.6832C40.6332,33.2444 40.5852,33.2245 40.5499,33.1892C40.5145,33.1538 40.4946,33.1058 40.4946,33.0558V31.7399C40.4946,31.7151 40.4995,31.6906 40.509,31.6677C40.5185,31.6448 40.5324,31.624 40.5499,31.6065C40.5674,31.589 40.5882,31.5751 40.6111,31.5656C40.6339,31.5561 40.6585,31.5513 40.6832,31.5513H41.4289C41.4537,31.5513 41.4782,31.5561 41.5011,31.5656C41.524,31.5751 41.5448,31.589 41.5623,31.6065C41.5798,31.624 41.5937,31.6448 41.6032,31.6677C41.6127,31.6906 41.6175,31.7151 41.6175,31.7399V33.0558C41.6175,33.1058 41.5977,33.1538 41.5623,33.1892C41.5269,33.2245 41.479,33.2444 41.4289,33.2444Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#c4cddb" android:pathData="M42.8721,33.4373V31.9239C42.8664,31.8713 42.8718,31.818 42.8881,31.7676C42.9043,31.7172 42.931,31.6708 42.9664,31.6314C43.0017,31.5919 43.045,31.5604 43.0934,31.5388C43.1418,31.5173 43.1941,31.5061 43.2471,31.5061C43.3001,31.5061 43.3524,31.5173 43.4008,31.5388C43.4492,31.5604 43.4925,31.5919 43.5278,31.6314C43.5632,31.6708 43.5899,31.7172 43.6061,31.7676C43.6224,31.818 43.6278,31.8713 43.6221,31.9239V33.4373C43.6278,33.4899 43.6224,33.5432 43.6061,33.5936C43.5899,33.644 43.5632,33.6904 43.5278,33.7298C43.4925,33.7693 43.4492,33.8008 43.4008,33.8224C43.3524,33.8439 43.3001,33.8551 43.2471,33.8551C43.1941,33.8551 43.1418,33.8439 43.0934,33.8224C43.045,33.8008 43.0017,33.7693 42.9664,33.7298C42.931,33.6904 42.9043,33.644 42.8881,33.5936C42.8718,33.5432 42.8664,33.4899 42.8721,33.4373Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M43.7144,34.0032C43.808,33.9931 43.8946,33.9488 43.9575,33.8788C44.0204,33.8088 44.0552,33.7179 44.0552,33.6238C44.0552,33.5297 44.0204,33.4389 43.9575,33.3688C43.8946,33.2988 43.808,33.2545 43.7144,33.2444H42.7845C42.7313,33.2386 42.6774,33.2442 42.6264,33.2606C42.5755,33.2771 42.5285,33.3041 42.4887,33.3399C42.4488,33.3757 42.417,33.4194 42.3952,33.4684C42.3733,33.5173 42.3621,33.5702 42.3621,33.6238C42.3621,33.6774 42.3733,33.7303 42.3952,33.7792C42.417,33.8282 42.4488,33.8719 42.4887,33.9077C42.5285,33.9435 42.5755,33.9705 42.6264,33.987C42.6774,34.0034 42.7313,34.009 42.7845,34.0032H43.7144Z"/>
-        <path android:fillColor="#cfd8e8" android:pathData="M22.4362,33.3584C22.4214,33.6757 22.2816,33.9742 22.0473,34.1887C21.8131,34.4033 21.5034,34.5163 21.186,34.5032L19.4315,34.4199C19.274,34.4127 19.1194,34.3745 18.9766,34.3076C18.8338,34.2406 18.7056,34.1462 18.5993,34.0297C18.493,33.9133 18.4106,33.777 18.357,33.6287C18.3034,33.4803 18.2795,33.3229 18.2867,33.1654C18.2939,33.0078 18.332,32.8533 18.399,32.7105C18.4659,32.5677 18.5603,32.4395 18.6768,32.3331C18.7933,32.2268 18.9296,32.1445 19.0779,32.0909C19.2262,32.0372 19.3836,32.0133 19.5412,32.0205L21.2957,32.0995C21.4534,32.1068 21.6081,32.1452 21.7509,32.2125C21.8937,32.2798 22.0218,32.3747 22.1278,32.4917C22.2338,32.6087 22.3156,32.7455 22.3685,32.8943C22.4214,33.043 22.4444,33.2007 22.4362,33.3584Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#eaeef6" android:pathData="M18.8479,35.0383L8.6715,35.4111C8.5742,35.4155 8.4774,35.3953 8.39,35.3524C8.3026,35.3095 8.2274,35.2452 8.1715,35.1655C7.9258,34.8146 7.5661,34.0645 7.6276,32.6872C7.689,31.3099 8.1101,30.5993 8.3908,30.2703C8.4534,30.1964 8.5337,30.1396 8.6242,30.1051C8.7147,30.0706 8.8125,30.0595 8.9084,30.0729L18.997,31.3625C19.1451,31.3821 19.2803,31.4565 19.3762,31.571C19.472,31.6855 19.5214,31.8318 19.5146,31.981L19.405,34.468C19.3998,34.6154 19.3398,34.7555 19.2368,34.8609C19.1337,34.9664 18.9951,35.0296 18.8479,35.0383Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M16.2249,34.9594C15.6152,34.9594 15.2555,35.0822 14.7072,34.7181C13.9265,34.1961 13.365,33.5908 12.3474,33.604C11.0622,33.604 9.9392,34.4374 8.654,33.8628C8.2768,33.6961 7.6803,33.9461 7.7768,34.3453C7.8551,34.6381 7.9827,34.9154 8.154,35.1655C8.21,35.2452 8.2851,35.3095 8.3725,35.3524C8.4599,35.3954 8.5568,35.4156 8.654,35.4112L16.1942,35.1348C16.3872,35.1304 16.4004,34.9506 16.2249,34.9594Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#d9e1ec" android:pathData="M26.1118,35.3236L21.7649,35.1262C21.7257,35.1245 21.6873,35.1151 21.6517,35.0985C21.6162,35.082 21.5842,35.0585 21.5578,35.0296C21.5313,35.0007 21.5108,34.9668 21.4974,34.93C21.484,34.8931 21.478,34.8539 21.4798,34.8148L21.6114,31.8233C21.6131,31.7841 21.6225,31.7456 21.639,31.7101C21.6556,31.6745 21.679,31.6426 21.708,31.6161C21.7369,31.5896 21.7708,31.5691 21.8076,31.5557C21.8445,31.5424 21.8836,31.5364 21.9228,31.5381L26.2697,31.7355C26.3737,31.7412 26.4712,31.7877 26.541,31.8649C26.6108,31.9422 26.6473,32.0438 26.6426,32.1479L26.5197,34.9464C26.518,34.998 26.5061,35.0488 26.4846,35.0958C26.4632,35.1429 26.4326,35.1851 26.3946,35.2202C26.3567,35.2553 26.3121,35.2825 26.2636,35.3003C26.215,35.318 26.1634,35.3259 26.1118,35.3236Z" android:fillType="evenOdd"/>
-        <path android:fillColor="#b6c1cc" android:pathData="M17.6547,32.3407C17.6503,32.4141 17.6244,32.4845 17.58,32.5432C17.5357,32.6018 17.4751,32.6461 17.4057,32.6704C17.3363,32.6946 17.2613,32.6978 17.1901,32.6796C17.1188,32.6614 17.0546,32.6225 17.0054,32.5678C16.9563,32.5132 16.9243,32.4452 16.9137,32.3725C16.903,32.2998 16.9141,32.2255 16.9455,32.1591C16.9769,32.0926 17.0273,32.0369 17.0903,31.999C17.1532,31.9611 17.226,31.9426 17.2995,31.946C17.3988,31.9516 17.4918,31.9963 17.5583,32.0702C17.6249,32.1442 17.6595,32.2414 17.6547,32.3407ZM15.5317,32.0688C15.5271,32.1677 15.4833,32.2606 15.4101,32.3273C15.3369,32.3939 15.2402,32.4287 15.1414,32.4241C15.0425,32.4194 14.9495,32.3757 14.8829,32.3025C14.8162,32.2293 14.7814,32.1326 14.7861,32.0337C14.7872,31.9845 14.7981,31.9361 14.8182,31.8912C14.8384,31.8464 14.8673,31.806 14.9032,31.7725C14.9392,31.739 14.9815,31.713 15.0277,31.6961C15.0739,31.6792 15.1229,31.6717 15.1721,31.674C15.2216,31.6763 15.2702,31.6883 15.3152,31.7093C15.3601,31.7304 15.4004,31.7601 15.4338,31.7968C15.4672,31.8335 15.493,31.8764 15.5099,31.923C15.5267,31.9697 15.5341,32.0192 15.5317,32.0688Z" android:fillType="evenOdd"/>
+        <clip-path android:pathData="M0.813,-3h124.348v99h-124.348z"/>
+        <path android:fillColor="#72767d" android:pathData="M74.012,92.26H5.826C4.784,92.26 3.94,93.098 3.94,94.13C3.94,95.163 4.784,96 5.826,96H74.012C75.054,96 75.898,95.163 75.898,94.13C75.898,93.098 75.054,92.26 74.012,92.26Z"/>
+        <path android:fillColor="#72767d" android:pathData="M121.035,81.404H20.393C18.115,81.404 16.268,83.235 16.268,85.493C16.268,87.752 18.115,89.583 20.393,89.583H121.035C123.313,89.583 125.16,87.752 125.16,85.493C125.16,83.235 123.313,81.404 121.035,81.404Z"/>
+        <path android:fillColor="#c4cddb" android:pathData="M36.931,18.182L39.341,20.896L31.808,38.255L36.931,18.182Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#e3e8f5" android:pathData="M118.029,68.099L95.734,70.113C95.609,70.124 95.483,70.086 95.386,70.005C95.289,69.925 95.229,69.81 95.217,69.685C95.206,69.56 95.245,69.436 95.326,69.34C95.407,69.244 95.523,69.184 95.649,69.172L118.005,67.158C118.128,67.146 118.242,67.086 118.322,66.991C118.402,66.896 118.441,66.774 118.431,66.651L118.114,63.105C118.103,62.98 118.142,62.856 118.223,62.76C118.304,62.664 118.42,62.603 118.546,62.592C118.672,62.581 118.797,62.62 118.894,62.7C118.991,62.78 119.052,62.895 119.063,63.02L119.392,66.567C119.407,66.757 119.383,66.948 119.322,67.128C119.261,67.309 119.164,67.476 119.037,67.618C118.91,67.761 118.755,67.877 118.582,67.96C118.409,68.042 118.221,68.09 118.029,68.099Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#000000" android:pathData="M120.39,65.035L117.055,65.336C116.993,65.343 116.93,65.337 116.87,65.32C116.809,65.302 116.753,65.272 116.705,65.233C116.656,65.194 116.616,65.146 116.586,65.091C116.556,65.036 116.538,64.976 116.532,64.914L115.607,54.781C115.6,54.718 115.607,54.655 115.625,54.595C115.644,54.534 115.674,54.478 115.715,54.43C115.756,54.381 115.806,54.341 115.863,54.313C115.92,54.284 115.982,54.267 116.045,54.262L119.367,53.961C119.431,53.954 119.495,53.96 119.556,53.979C119.617,53.997 119.673,54.028 119.722,54.068C119.771,54.109 119.811,54.158 119.84,54.215C119.869,54.271 119.886,54.332 119.891,54.395L120.816,64.528C120.822,64.589 120.817,64.651 120.799,64.71C120.781,64.769 120.751,64.824 120.711,64.871C120.671,64.918 120.622,64.957 120.567,64.985C120.512,65.013 120.452,65.03 120.39,65.035Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M82.689,35.155L41.958,5.36L45.207,22.392C45.838,25.721 47.716,28.691 50.464,30.704L82.883,54.419L85.147,51.38L82.689,35.155Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ebeef5" android:pathData="M93.629,36.687L39.512,-2.904C39.436,-2.961 39.344,-2.994 39.248,-2.999C39.153,-3.004 39.058,-2.98 38.976,-2.93C38.895,-2.881 38.83,-2.808 38.791,-2.721C38.752,-2.635 38.74,-2.539 38.757,-2.445L39.682,2.875C39.79,3.477 40.125,4.016 40.619,4.382L41.958,5.359L82.689,35.155L85.123,51.379L82.884,54.419L81.131,56.711L94.761,66.687L98.741,61.355L95.455,39.799C95.282,38.564 94.626,37.447 93.629,36.687Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M85.147,51.38L82.713,35.155L41.958,5.36L42.615,8.773L80.498,36.518L82.786,51.572L81.435,53.382L82.883,54.431L85.147,51.38Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#505e7e" android:pathData="M75.984,29.944C67.923,29.594 60.052,32.432 54.102,37.834C48.153,43.236 44.611,50.76 44.258,58.75L105.105,61.392C105.28,57.431 104.665,53.474 103.295,49.749C101.926,46.023 99.828,42.603 97.124,39.681C94.419,36.761 91.159,34.397 87.532,32.726C83.904,31.055 79.98,30.11 75.984,29.944Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#505e7e" android:pathData="M98.667,41.633C98.436,41.331 98.193,41.042 97.949,40.752C97.418,40.153 96.73,39.711 95.961,39.477C95.191,39.243 94.372,39.225 93.593,39.425L48.383,50.077C47.601,50.241 46.881,50.618 46.302,51.166C45.724,51.714 45.311,52.41 45.11,53.177C44.035,57.626 43.979,62.258 44.948,66.732C45.917,71.206 47.885,75.407 50.708,79.027C51.036,79.45 51.365,79.848 51.717,80.234C52.176,80.813 52.508,81.479 52.695,82.191C52.881,82.902 52.917,83.645 52.801,84.371C52.801,84.89 52.399,85.288 52.594,85.855C52.874,86.615 53.336,86.675 54.03,86.868C55.247,87.194 91.974,86.953 93.374,86.929C94.773,86.905 96.526,87.049 97.791,86.145C97.869,86.096 97.934,86.03 97.982,85.953C98.03,85.875 98.06,85.788 98.07,85.698C98.079,85.607 98.067,85.516 98.036,85.43C98.005,85.345 97.954,85.267 97.888,85.204C97.313,84.784 96.904,84.178 96.733,83.49C96.562,82.802 96.639,82.077 96.951,81.44C97.767,79.558 99.726,77.701 100.602,76.301C103.84,71.002 105.387,64.856 105.041,58.671C104.696,52.485 102.475,46.546 98.667,41.633Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#7787af" android:pathData="M91.694,50.077C93.682,53.416 94.626,57.264 94.407,61.136C94.188,65.007 92.815,68.726 90.463,71.824C88.111,74.922 84.885,77.259 81.194,78.54C77.502,79.82 73.51,79.987 69.722,79.018C65.935,78.05 62.522,75.99 59.916,73.099C57.31,70.208 55.627,66.615 55.081,62.776C54.534,58.937 55.149,55.024 56.846,51.531C58.543,48.038 61.248,45.122 64.617,43.153C69.134,40.512 74.524,39.758 79.602,41.057C84.68,42.355 89.029,45.6 91.694,50.077Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ff8283" android:pathData="M92.717,34.516C93.203,39.112 82.008,51.404 74.584,58.328C67.283,59.039 48.858,59.932 44.16,56.168C43.955,56.018 43.783,55.829 43.653,55.611C43.524,55.394 43.439,55.152 43.406,54.902C43.383,54.718 43.383,54.531 43.406,54.347C44.183,49.89 45.929,45.653 48.522,41.931C51.115,38.209 54.493,35.09 58.423,32.791C68.439,26.94 81.022,27.205 92.084,33.514C92.267,33.613 92.422,33.758 92.532,33.933C92.643,34.108 92.707,34.309 92.717,34.516Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#eb7374" android:pathData="M58.082,32.827C53.637,35.411 49.927,39.072 47.3,43.466C45.718,46.12 47.981,49.28 50.513,51.054C51.655,51.857 52.637,52.863 53.409,54.021C54.796,56.108 56.792,58.388 59.226,58.412C64.094,58.472 69.168,58.183 72.612,57.881C73.62,57.792 74.569,57.367 75.302,56.675C82.53,49.727 92.339,38.581 91.913,34.347C91.898,34.143 91.831,33.946 91.718,33.776C91.605,33.605 91.45,33.465 91.268,33.37C80.364,27.242 67.927,27.049 58.082,32.827Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ffb0b1" android:pathData="M75.254,59.727C75.254,59.727 44.526,45.131 47.154,41.271C49.875,37.277 53.464,33.939 57.656,31.5C68.938,24.902 82.214,26.144 92.838,32.212C100.383,36.506 75.254,59.727 75.254,59.727Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ff8788" android:pathData="M52.655,40.064C55.77,41.271 54.212,38.581 54.407,37.338C54.736,35.203 57.096,35.649 58.605,35.082C60.869,34.226 59.616,32.67 60.65,31.017C60.893,30.631 60.492,30.125 60.09,30.317C59.238,30.716 58.411,31.162 57.583,31.644C55.799,32.689 54.12,33.901 52.569,35.263C51.012,36.602 50.707,39.292 52.655,40.064ZM84.867,35.239C84.899,35.864 84.796,36.489 84.565,37.071C84.334,37.653 83.981,38.18 83.529,38.617C80.438,41.162 76.227,36.843 73.038,40.535C70.446,43.563 71.943,48.315 68.779,51.307C67.562,52.513 66.99,55.541 68.536,56.325C70.544,57.326 72.284,58.183 73.513,58.738C74.064,59.005 74.686,59.096 75.292,58.999C75.897,58.902 76.458,58.621 76.896,58.195C82.19,53.08 99.288,35.806 92.838,32.211C90.844,31.093 88.755,30.148 86.595,29.389C84.916,28.798 82.823,29.558 83.431,31.234C83.882,32.489 84.782,33.804 84.867,35.203V35.239Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ff8788" android:pathData="M75.838,33.044V33.153C75.99,33.154 76.136,33.21 76.25,33.309C76.364,33.409 76.438,33.546 76.458,33.695C76.477,33.771 76.477,33.849 76.458,33.924C76.579,33.922 76.698,33.955 76.799,34.021C77.103,34.19 77.261,34.564 77.59,34.685C78.125,34.902 78.661,34.865 78.88,34.142C79.01,33.635 78.934,33.097 78.667,32.646C78.401,32.194 77.966,31.865 77.456,31.729C76.531,31.512 75.631,31.886 75.838,33.044Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#eaeef6" android:pathData="M89.066,51.645C90.748,54.471 91.547,57.727 91.361,61.003C91.176,64.279 90.014,67.427 88.024,70.049C86.033,72.67 83.303,74.647 80.178,75.731C77.054,76.814 73.676,76.954 70.471,76.134C67.266,75.313 64.378,73.569 62.174,71.122C59.969,68.674 58.546,65.634 58.085,62.385C57.623,59.136 58.145,55.824 59.583,52.869C61.021,49.914 63.31,47.447 66.163,45.782C69.984,43.551 74.544,42.915 78.838,44.014C83.133,45.114 86.811,47.858 89.066,51.645Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M86.778,52.984C88.192,55.359 88.864,58.097 88.709,60.85C88.553,63.604 87.578,66.25 85.905,68.454C84.232,70.659 81.938,72.322 79.312,73.233C76.686,74.145 73.846,74.264 71.152,73.575C68.457,72.887 66.029,71.422 64.175,69.366C62.32,67.31 61.123,64.755 60.733,62.024C60.344,59.293 60.78,56.509 61.987,54.023C63.194,51.538 65.117,49.464 67.513,48.062C70.727,46.183 74.561,45.646 78.174,46.569C81.786,47.492 84.881,49.799 86.778,52.984Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M65.761,54.902L72.965,49.739C73.181,49.584 73.434,49.488 73.699,49.461C73.964,49.433 74.231,49.475 74.474,49.582L82.591,53.201C82.835,53.305 83.045,53.472 83.201,53.684C83.358,53.896 83.454,54.146 83.48,54.407L84.393,63.177C84.42,63.44 84.377,63.705 84.268,63.947C84.159,64.188 83.988,64.397 83.772,64.552L76.567,69.739C76.35,69.894 76.095,69.99 75.828,70.017C75.561,70.045 75.292,70.003 75.046,69.896L66.929,66.277C66.69,66.168 66.482,66 66.327,65.788C66.171,65.577 66.073,65.33 66.041,65.071L65.128,56.301C65.098,56.033 65.14,55.762 65.252,55.516C65.363,55.27 65.539,55.058 65.761,54.902Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#b6c1cc" android:pathData="M78.855,57.616C79.343,58.438 79.574,59.386 79.518,60.338C79.463,61.291 79.123,62.205 78.544,62.967C77.964,63.728 77.169,64.302 76.26,64.616C75.351,64.93 74.369,64.97 73.437,64.731C72.506,64.491 71.666,63.984 71.026,63.272C70.385,62.56 69.972,61.675 69.838,60.731C69.704,59.786 69.856,58.823 70.274,57.964C70.692,57.104 71.357,56.387 72.187,55.903C72.738,55.581 73.348,55.37 73.981,55.282C74.615,55.193 75.26,55.23 75.879,55.389C76.499,55.548 77.08,55.827 77.591,56.209C78.102,56.591 78.532,57.069 78.855,57.616Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#2f3848" android:pathData="M100.603,79.763H100.14L77.833,77.894C77.113,77.851 76.409,77.666 75.761,77.349C75.114,77.033 74.537,76.592 74.063,76.052C73.59,75.512 73.23,74.884 73.004,74.205C72.779,73.525 72.692,72.808 72.75,72.095C72.807,71.382 73.007,70.687 73.339,70.052C73.67,69.417 74.126,68.853 74.68,68.395C75.234,67.936 75.875,67.591 76.564,67.381C77.254,67.171 77.979,67.099 78.697,67.17L101.101,69.015C102.528,69.096 103.865,69.732 104.821,70.784C105.778,71.836 106.278,73.219 106.212,74.634C106.147,76.049 105.521,77.381 104.471,78.341C103.42,79.301 102.03,79.813 100.603,79.763Z"/>
+        <path android:fillColor="#e3e8f5" android:pathData="M99.386,69.739L76.994,71.79C76.931,71.795 76.869,71.789 76.809,71.77C76.749,71.752 76.694,71.722 76.646,71.682C76.598,71.642 76.558,71.593 76.529,71.538C76.5,71.483 76.482,71.423 76.477,71.362C76.471,71.3 76.478,71.238 76.496,71.178C76.515,71.119 76.545,71.064 76.585,71.017C76.626,70.969 76.675,70.93 76.73,70.901C76.786,70.872 76.846,70.854 76.909,70.849L99.252,68.846C99.379,68.834 99.496,68.773 99.578,68.676C99.66,68.579 99.7,68.454 99.69,68.328L99.386,64.733C99.38,64.671 99.387,64.609 99.405,64.55C99.424,64.491 99.454,64.436 99.494,64.388C99.535,64.34 99.584,64.301 99.639,64.272C99.695,64.244 99.755,64.226 99.818,64.22C99.88,64.215 99.943,64.221 100.002,64.24C100.062,64.259 100.118,64.289 100.166,64.328C100.214,64.368 100.253,64.417 100.282,64.472C100.311,64.527 100.329,64.587 100.335,64.649L100.603,68.171C100.644,68.538 100.541,68.906 100.314,69.199C100.087,69.492 99.754,69.685 99.386,69.739Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#000000" android:pathData="M101.698,66.675L98.375,66.965C98.312,66.971 98.248,66.965 98.187,66.947C98.126,66.928 98.07,66.898 98.021,66.858C97.972,66.817 97.932,66.767 97.903,66.711C97.874,66.655 97.857,66.593 97.852,66.53L96.951,56.41C96.945,56.348 96.95,56.285 96.968,56.226C96.986,56.166 97.016,56.111 97.055,56.062C97.095,56.014 97.144,55.974 97.199,55.945C97.254,55.915 97.315,55.897 97.377,55.891L100.712,55.589C100.774,55.584 100.837,55.592 100.896,55.611C100.956,55.63 101.011,55.661 101.059,55.701C101.106,55.742 101.145,55.791 101.173,55.846C101.201,55.902 101.218,55.962 101.223,56.024L102.16,66.157C102.167,66.221 102.16,66.287 102.14,66.349C102.12,66.41 102.087,66.468 102.044,66.516C102,66.565 101.947,66.604 101.887,66.632C101.828,66.659 101.763,66.674 101.698,66.675Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#b6c1cc" android:pathData="M84.49,72.296L66.345,78.171L64.094,71.343L82.226,65.469L84.49,72.296Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M69.57,79.112L47.057,89.088C46.846,89.184 46.616,89.227 46.384,89.215C46.153,89.202 45.929,89.134 45.73,89.016C44.684,88.376 42.712,86.675 41.337,82.526C39.962,78.376 40.558,75.843 41.021,74.709C41.111,74.499 41.251,74.314 41.429,74.169C41.607,74.024 41.818,73.924 42.043,73.877L66.187,68.702C66.419,68.655 66.66,68.694 66.864,68.812C67.068,68.93 67.222,69.118 67.295,69.341L70.13,77.954C70.202,78.181 70.184,78.427 70.08,78.642C69.977,78.857 69.794,79.025 69.57,79.112Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#adb7c2" android:pathData="M40.619,79.787C40.771,80.717 40.999,81.633 41.301,82.526C41.297,82.554 41.297,82.582 41.301,82.61C42.019,79.257 44.44,76.929 48.797,77.315C51.438,77.544 52.691,77.315 53.494,74.468C53.563,74.047 53.719,73.644 53.951,73.285C54.183,72.926 54.488,72.618 54.845,72.381C55.734,71.802 55.831,71.175 55.283,71.018L41.994,73.877C41.769,73.924 41.559,74.024 41.381,74.169C41.203,74.314 41.063,74.499 40.972,74.709C40.425,76.345 40.304,78.092 40.619,79.787Z" android:fillAlpha="0.6"/>
+        <path android:fillColor="#adb7c2" android:pathData="M55.198,75.409C55.131,75.666 55.131,75.936 55.198,76.193C55.38,76.663 55.758,77.122 56.257,77.085C56.756,77.049 57.157,76.096 56.999,75.59C56.915,75.359 56.769,75.155 56.575,75.002C56.382,74.849 56.149,74.751 55.904,74.721C55.478,74.661 55.283,74.999 55.198,75.409Z" android:fillAlpha="0.6"/>
+        <path android:fillColor="#b6c1cc" android:pathData="M62.524,73.105C62.595,73.318 62.601,73.548 62.54,73.764C62.479,73.98 62.355,74.174 62.183,74.321C62.011,74.467 61.799,74.56 61.575,74.586C61.349,74.613 61.121,74.573 60.919,74.471C60.717,74.369 60.55,74.211 60.44,74.014C60.329,73.818 60.279,73.594 60.298,73.37C60.316,73.146 60.4,72.933 60.541,72.757C60.682,72.58 60.872,72.45 61.088,72.381C61.375,72.289 61.687,72.314 61.956,72.45C62.225,72.585 62.429,72.821 62.524,73.105Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#000000" android:pathData="M84.843,75.65L78.758,76.205L76.848,55.927L85.366,55.155L86.997,73.08C87.042,73.701 86.843,74.316 86.441,74.795C86.04,75.273 85.467,75.58 84.843,75.65Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M35.045,25.565L31.808,38.255L26.94,37.531C23.584,37 20.547,35.25 18.422,32.622L9.708,21.765L7.445,19.075L35.629,23.261L35.045,25.565Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M64.362,48.159L62.84,51.621L61.197,50.921L31.808,38.255L38.185,26.819L39.353,24.733L58.289,32.887L64.362,48.159Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ebeef5" android:pathData="M1.36,12.899L36.932,18.183L35.63,23.261L7.445,19.075L5.79,18.834C5.184,18.739 4.636,18.42 4.257,17.941L0.91,13.659C0.855,13.583 0.824,13.493 0.82,13.4C0.816,13.307 0.839,13.215 0.886,13.134C0.934,13.054 1.004,12.989 1.088,12.947C1.172,12.905 1.267,12.889 1.36,12.899Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ebeef5" android:pathData="M79.914,54.902L77.237,60.933L61.66,54.226L62.877,51.633L64.398,48.159L58.314,32.899L39.354,24.745L41.909,20.173L69.303,31.982C70.46,32.49 71.372,33.425 71.846,34.588L79.914,54.902Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M7.445,19.075L35.629,23.261L35.045,25.565L9.623,21.789L7.445,19.075Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M64.362,48.159L62.84,51.621L61.198,50.921L62.086,48.858L56.464,34.697L38.185,26.819L39.353,24.733L58.289,32.887L64.362,48.159Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M7.019,15.42C6.833,15.394 6.644,15.422 6.475,15.502C6.306,15.582 6.165,15.71 6.069,15.869C5.973,16.029 5.926,16.213 5.936,16.399C5.945,16.584 6.01,16.763 6.121,16.912C6.233,17.061 6.387,17.174 6.563,17.237C6.739,17.3 6.93,17.309 7.112,17.264C7.294,17.22 7.459,17.123 7.585,16.986C7.711,16.848 7.794,16.677 7.822,16.494C7.857,16.246 7.792,15.995 7.642,15.794C7.492,15.593 7.268,15.459 7.019,15.42Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M11.035,16.023C10.911,16.003 10.784,16.007 10.661,16.036C10.539,16.066 10.424,16.119 10.323,16.193C10.222,16.268 10.137,16.361 10.073,16.469C10.009,16.576 9.968,16.696 9.952,16.819C9.915,17.067 9.978,17.32 10.129,17.521C10.28,17.722 10.505,17.856 10.755,17.893C11.005,17.93 11.26,17.866 11.463,17.717C11.666,17.568 11.801,17.345 11.838,17.097C11.873,16.849 11.808,16.598 11.658,16.397C11.508,16.196 11.284,16.062 11.035,16.023Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M69.144,33.695C68.916,33.612 68.664,33.617 68.439,33.708C68.214,33.8 68.031,33.972 67.927,34.19C67.837,34.416 67.839,34.668 67.932,34.893C68.025,35.118 68.202,35.298 68.426,35.396C68.543,35.462 68.673,35.502 68.807,35.515C68.941,35.528 69.076,35.513 69.203,35.471C69.331,35.428 69.448,35.36 69.548,35.27C69.647,35.18 69.726,35.071 69.78,34.949C69.834,34.826 69.861,34.694 69.861,34.561C69.86,34.428 69.831,34.296 69.775,34.174C69.72,34.053 69.64,33.944 69.539,33.856C69.439,33.767 69.321,33.7 69.193,33.659L69.144,33.695Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#fb5d60" android:pathData="M82.239,59.835L72.393,60.716C72.194,60.736 71.993,60.716 71.801,60.658C71.61,60.6 71.432,60.505 71.278,60.378C71.124,60.251 70.997,60.095 70.904,59.919C70.811,59.743 70.755,59.551 70.738,59.353L70.264,54.093C70.233,53.7 70.361,53.311 70.618,53.011C70.876,52.71 71.243,52.523 71.639,52.489L81.484,51.597C81.683,51.578 81.884,51.599 82.075,51.658C82.265,51.716 82.443,51.812 82.596,51.938C82.75,52.065 82.877,52.22 82.97,52.395C83.063,52.571 83.121,52.762 83.139,52.96L83.626,58.219C83.653,58.615 83.523,59.005 83.264,59.307C83.005,59.609 82.637,59.799 82.239,59.835Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#cfd8e8" android:pathData="M86.06,62.139L78.32,62.839C77.311,62.93 76.308,62.62 75.53,61.977C74.752,61.335 74.263,60.413 74.17,59.413L73.622,53.382C73.534,52.383 73.848,51.39 74.496,50.619C75.143,49.849 76.072,49.363 77.079,49.268L84.782,48.629C85.159,48.595 85.535,48.711 85.826,48.95C86.118,49.19 86.303,49.534 86.34,49.908L87.313,60.595C87.348,60.964 87.236,61.331 87.002,61.619C86.768,61.907 86.43,62.094 86.06,62.139Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#9ba9c9" android:pathData="M34.072,36.277C33.079,35.812 32.004,35.546 30.908,35.493C30.819,35.496 30.731,35.516 30.65,35.553C30.57,35.59 30.497,35.643 30.437,35.708C30.377,35.773 30.33,35.85 30.301,35.933C30.271,36.016 30.258,36.104 30.263,36.192C30.275,36.37 30.357,36.537 30.491,36.656C30.625,36.775 30.801,36.838 30.981,36.832H31.066L31.236,36.807H31.589C31.815,36.839 32.038,36.883 32.258,36.94L32.587,37.037H32.77C32.77,37.037 32.964,37.037 32.77,37.037C33.003,37.108 33.227,37.205 33.439,37.326C33.6,37.401 33.783,37.412 33.952,37.359C34.122,37.305 34.264,37.19 34.352,37.037C34.392,36.897 34.387,36.748 34.336,36.612C34.286,36.475 34.194,36.358 34.072,36.277Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#9ba9c9" android:pathData="M35.654,33.056C34.752,32.449 33.804,31.913 32.818,31.452C32.736,31.418 32.648,31.402 32.559,31.403C32.47,31.403 32.382,31.422 32.301,31.457C32.22,31.492 32.146,31.542 32.084,31.605C32.022,31.669 31.974,31.743 31.942,31.826C31.877,31.992 31.88,32.177 31.951,32.341C32.021,32.506 32.153,32.637 32.319,32.706L33.013,33.044L33.317,33.213L33.463,33.285H33.548C33.986,33.534 34.412,33.8 34.826,34.081C34.97,34.19 35.151,34.238 35.33,34.214C35.509,34.19 35.672,34.097 35.781,33.955C35.891,33.812 35.939,33.632 35.915,33.455C35.891,33.277 35.797,33.117 35.654,33.008V33.056Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#9ba9c9" android:pathData="M35.666,27.724C35.684,27.549 35.636,27.373 35.532,27.229L35.41,27.109C35.31,27.037 35.193,26.992 35.07,26.976H34.047C33.965,26.947 33.874,26.947 33.792,26.976C33.705,26.987 33.624,27.025 33.561,27.085C33.488,27.138 33.429,27.209 33.39,27.29C33.337,27.364 33.307,27.452 33.305,27.543C33.287,27.715 33.335,27.887 33.439,28.026L33.561,28.158C33.662,28.227 33.779,28.268 33.901,28.279H34.887C34.971,28.297 35.058,28.297 35.143,28.279C35.226,28.258 35.304,28.221 35.374,28.17C35.514,28.055 35.605,27.891 35.629,27.712L35.666,27.724Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#a8b0bd" android:pathData="M35.63,23.261L37.71,24.66L36.871,26.59L35.045,25.565L35.63,23.261Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M84.782,48.629L80.437,49.015C78.332,49.208 78.782,50.74 80.887,50.535C82.993,50.33 82.786,50.704 82.701,51.572C82.616,52.441 82.908,54.6 84.356,53.599C85.804,52.598 86.583,52.574 86.461,51.187L86.339,49.847C86.288,49.485 86.097,49.156 85.807,48.929C85.517,48.702 85.15,48.595 84.782,48.629Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M82.007,53.466C81.982,53.381 81.931,53.305 81.861,53.249C81.803,53.19 81.733,53.145 81.654,53.117C81.572,53.073 81.48,53.052 81.387,53.056H81.204C81.094,53.088 80.994,53.146 80.912,53.225L80.802,53.37C80.74,53.472 80.706,53.588 80.705,53.708C80.687,53.795 80.687,53.886 80.705,53.973C80.73,54.058 80.781,54.134 80.851,54.19C80.912,54.252 80.987,54.298 81.07,54.323C81.154,54.348 81.243,54.348 81.326,54.323H81.508C81.619,54.293 81.72,54.235 81.8,54.154L81.91,54.009C81.973,53.908 82.007,53.791 82.007,53.672C82.018,53.604 82.018,53.534 82.007,53.466Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M84.344,57.628C84.18,57.65 84.031,57.73 83.922,57.853C83.813,57.976 83.753,58.134 83.753,58.297C83.753,58.461 83.813,58.619 83.922,58.742C84.031,58.865 84.18,58.945 84.344,58.967C84.508,58.945 84.658,58.865 84.766,58.742C84.875,58.619 84.935,58.461 84.935,58.297C84.935,58.134 84.875,57.976 84.766,57.853C84.658,57.73 84.508,57.65 84.344,57.628Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M24.543,16.301L15.221,14.913C13.688,14.684 13.079,16.12 14.54,16.602C15.039,16.775 15.495,17.053 15.875,17.417C16.256,17.782 16.551,18.224 16.742,18.713C16.84,18.91 16.983,19.083 17.159,19.216C17.335,19.351 17.54,19.443 17.757,19.486C17.975,19.529 18.199,19.522 18.414,19.465C18.628,19.409 18.827,19.304 18.994,19.159C20.211,18.424 21.184,17.458 22.572,18.17C23.959,18.882 25.577,18.412 24.543,16.301Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ced6e0" android:pathData="M22.863,26.373C22.946,26.245 22.996,26.099 23.009,25.948C23.022,25.796 22.997,25.644 22.936,25.505C22.669,24.913 21.999,24.998 21.44,25.082C21.387,25.009 21.32,24.948 21.243,24.902C21.165,24.857 21.079,24.827 20.989,24.817C20.681,24.787 20.369,24.824 20.077,24.926C19.982,24.966 19.898,25.028 19.831,25.106C19.765,25.184 19.717,25.276 19.692,25.375C19.668,25.475 19.666,25.578 19.689,25.678C19.711,25.778 19.756,25.871 19.821,25.951L20.369,26.53C20.241,26.66 20.153,26.822 20.114,26.999C20.075,27.176 20.088,27.361 20.15,27.531C20.369,28.17 21.111,28.291 21.707,28.219C22.237,28.178 22.733,27.941 23.095,27.555C23.162,27.464 23.21,27.36 23.235,27.25C23.26,27.139 23.261,27.025 23.24,26.914C23.218,26.803 23.173,26.698 23.109,26.605C23.044,26.511 22.96,26.433 22.863,26.373Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#ced6e0" android:pathData="M38.757,-2.445L39.305,0.679C39.572,2.247 40.79,2.947 41.666,2.187C42.542,1.427 43.966,1.825 44.477,3.984C44.988,6.144 46.485,6.228 47.337,5.347C48.188,4.467 50.026,5.347 51.718,6.952C53.409,8.556 54.152,7.796 54.152,7.796L39.512,-2.904C39.436,-2.961 39.344,-2.994 39.248,-2.999C39.153,-3.004 39.058,-2.98 38.976,-2.93C38.895,-2.881 38.83,-2.808 38.791,-2.721C38.752,-2.635 38.74,-2.539 38.757,-2.445Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M106.407,87.122H101.211C100.951,87.094 100.711,86.972 100.537,86.78C100.362,86.587 100.266,86.337 100.266,86.078C100.266,85.82 100.362,85.57 100.537,85.377C100.711,85.185 100.951,85.063 101.211,85.035H106.407C106.667,85.063 106.907,85.185 107.082,85.377C107.256,85.57 107.353,85.82 107.353,86.078C107.353,86.337 107.256,86.587 107.082,86.78C106.907,86.972 106.667,87.094 106.407,87.122Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M107.43,88.425H105.361C105.222,88.425 105.089,88.37 104.991,88.273C104.893,88.175 104.837,88.043 104.837,87.906V84.287C104.837,84.219 104.851,84.151 104.877,84.089C104.904,84.026 104.942,83.968 104.991,83.92C105.039,83.872 105.097,83.834 105.16,83.808C105.224,83.782 105.292,83.768 105.361,83.768H107.43C107.498,83.768 107.566,83.782 107.63,83.808C107.693,83.834 107.751,83.872 107.8,83.92C107.848,83.968 107.887,84.026 107.913,84.089C107.939,84.151 107.953,84.219 107.953,84.287V87.906C107.953,88.043 107.898,88.175 107.8,88.273C107.701,88.37 107.568,88.425 107.43,88.425Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#c4cddb" android:pathData="M111.433,88.955V84.794C111.418,84.649 111.433,84.502 111.478,84.364C111.523,84.225 111.597,84.097 111.695,83.989C111.793,83.881 111.913,83.794 112.047,83.734C112.182,83.675 112.327,83.645 112.474,83.645C112.621,83.645 112.766,83.675 112.9,83.734C113.034,83.794 113.155,83.881 113.253,83.989C113.351,84.097 113.425,84.225 113.47,84.364C113.515,84.502 113.53,84.649 113.514,84.794V88.955C113.53,89.1 113.515,89.247 113.47,89.385C113.425,89.524 113.351,89.652 113.253,89.76C113.155,89.868 113.034,89.955 112.9,90.014C112.766,90.074 112.621,90.104 112.474,90.104C112.327,90.104 112.182,90.074 112.047,90.014C111.913,89.955 111.793,89.868 111.695,89.76C111.597,89.652 111.523,89.524 111.478,89.385C111.433,89.247 111.418,89.1 111.433,88.955Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M113.77,90.511C114.029,90.484 114.269,90.362 114.444,90.169C114.618,89.977 114.715,89.727 114.715,89.468C114.715,89.209 114.618,88.959 114.444,88.767C114.269,88.574 114.029,88.452 113.77,88.424H111.19C111.042,88.409 110.892,88.424 110.751,88.469C110.61,88.515 110.479,88.589 110.369,88.687C110.258,88.785 110.17,88.906 110.109,89.04C110.049,89.175 110.018,89.321 110.018,89.468C110.018,89.615 110.049,89.761 110.109,89.895C110.17,90.03 110.258,90.15 110.369,90.249C110.479,90.347 110.61,90.421 110.751,90.467C110.892,90.512 111.042,90.527 111.19,90.511H113.77Z"/>
+        <path android:fillColor="#cfd8e8" android:pathData="M54.736,88.738C54.694,89.611 54.307,90.432 53.657,91.022C53.007,91.612 52.148,91.923 51.267,91.887L46.399,91.658C45.962,91.638 45.534,91.533 45.137,91.349C44.741,91.165 44.385,90.905 44.09,90.585C43.796,90.264 43.567,89.889 43.418,89.481C43.27,89.074 43.203,88.641 43.223,88.207C43.243,87.774 43.349,87.349 43.535,86.956C43.721,86.564 43.982,86.211 44.306,85.919C44.629,85.626 45.007,85.4 45.418,85.253C45.83,85.105 46.267,85.039 46.704,85.059L51.571,85.276C52.009,85.296 52.438,85.402 52.834,85.587C53.231,85.772 53.586,86.033 53.88,86.355C54.174,86.677 54.401,87.053 54.548,87.462C54.695,87.871 54.758,88.305 54.736,88.738Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#eaeef6" android:pathData="M44.781,93.358L16.547,94.384C16.278,94.396 16.009,94.34 15.766,94.222C15.524,94.104 15.315,93.927 15.16,93.708C14.479,92.743 13.481,90.68 13.651,86.893C13.821,83.105 14.99,81.151 15.769,80.246C15.942,80.043 16.165,79.887 16.416,79.792C16.667,79.697 16.938,79.666 17.205,79.703L45.194,83.25C45.605,83.304 45.98,83.508 46.246,83.823C46.512,84.138 46.649,84.54 46.63,84.951L46.326,91.79C46.312,92.195 46.145,92.581 45.86,92.871C45.574,93.161 45.189,93.335 44.781,93.358Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M37.503,93.141C35.812,93.141 34.814,93.479 33.293,92.478C31.127,91.042 29.569,89.378 26.746,89.414C23.18,89.414 20.065,91.706 16.499,90.125C15.452,89.667 13.797,90.355 14.065,91.452C14.282,92.257 14.636,93.02 15.112,93.708C15.267,93.927 15.475,94.104 15.718,94.222C15.96,94.34 16.229,94.396 16.499,94.384L37.418,93.624C37.954,93.612 37.99,93.117 37.503,93.141Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#d9e1ec" android:pathData="M64.933,94.142L52.873,93.6C52.765,93.595 52.658,93.569 52.559,93.523C52.461,93.478 52.372,93.413 52.299,93.334C52.225,93.254 52.168,93.161 52.131,93.06C52.094,92.958 52.077,92.851 52.082,92.743L52.447,84.516C52.452,84.408 52.478,84.303 52.524,84.205C52.57,84.107 52.635,84.019 52.715,83.947C52.796,83.874 52.89,83.817 52.992,83.78C53.094,83.744 53.203,83.727 53.312,83.732L65.371,84.275C65.66,84.29 65.93,84.418 66.124,84.631C66.318,84.843 66.419,85.123 66.406,85.409L66.065,93.105C66.06,93.247 66.027,93.387 65.968,93.516C65.908,93.645 65.823,93.761 65.718,93.858C65.613,93.955 65.489,94.029 65.354,94.078C65.22,94.127 65.077,94.149 64.933,94.142Z" android:fillType="evenOdd"/>
+        <path android:fillColor="#b6c1cc" android:pathData="M41.471,85.939C41.458,86.141 41.386,86.335 41.264,86.496C41.14,86.658 40.972,86.779 40.78,86.846C40.587,86.913 40.379,86.922 40.181,86.871C39.984,86.821 39.806,86.714 39.669,86.564C39.533,86.414 39.444,86.227 39.415,86.027C39.385,85.827 39.416,85.623 39.503,85.44C39.59,85.257 39.73,85.104 39.905,85C40.079,84.895 40.281,84.845 40.485,84.854C40.761,84.869 41.019,84.992 41.203,85.196C41.388,85.399 41.484,85.666 41.471,85.939ZM35.581,85.192C35.568,85.464 35.446,85.719 35.243,85.902C35.04,86.086 34.772,86.181 34.498,86.169C34.223,86.156 33.965,86.035 33.78,85.834C33.596,85.633 33.499,85.367 33.512,85.095C33.515,84.96 33.545,84.827 33.601,84.703C33.657,84.58 33.737,84.469 33.837,84.377C33.937,84.285 34.054,84.213 34.182,84.167C34.31,84.12 34.446,84.099 34.583,84.106C34.72,84.112 34.855,84.145 34.98,84.203C35.104,84.261 35.216,84.343 35.309,84.444C35.402,84.544 35.473,84.662 35.52,84.791C35.567,84.919 35.587,85.055 35.581,85.192Z" android:fillType="evenOdd"/>
     </group>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml b/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml
index 33d0490c0c..1b8f86ad34 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_remote_auth_loaded.xml
@@ -16,7 +16,7 @@
     <path android:fillColor="#cbd5e0" android:pathData="M43.5589,41.5195L43.5518,41.5266A4.66,4.66 0,0 1,36.9616 41.5266L30.0036,34.5687A4.66,4.66 90,0 1,30.0036 27.9784L30.0107,27.9713A4.66,4.66 90,0 1,36.6009 27.9713L43.5589,34.9293A4.66,4.66 0,0 1,43.5589 41.5195z"/>
     <path android:fillColor="#cbd5e0" android:pathData="M36.9618,48.1128L36.9547,48.1198A4.66,4.66 0,0 1,30.3645 48.1198L23.4066,41.1619A4.66,4.66 90,0 1,23.4066 34.5717L23.4136,34.5646A4.66,4.66 0,0 1,30.0039 34.5646L36.9618,41.5225A4.66,4.66 90,0 1,36.9618 48.1128z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M56.44,25.38L56.44,25.39A4.66,4.66 0,0 1,51.78 30.05L43.64,30.05A4.66,4.66 0,0 1,38.98 25.39L38.98,25.38A4.66,4.66 0,0 1,43.64 20.72L51.78,20.72A4.66,4.66 0,0 1,56.44 25.38z"/>
-    <path android:fillColor="@drawable/res_2131230777_img_remote_auth_loaded__0" android:pathData="M65.5604,41.1879l-17.9039,17.9039l-1.5698,-1.5698l17.9039,-17.9039z"/>
+    <path android:fillColor="@drawable/res_2131230780_img_remote_auth_loaded__0" android:pathData="M65.5604,41.1879l-17.9039,17.9039l-1.5698,-1.5698l17.9039,-17.9039z"/>
     <path android:fillColor="#ebf0f7" android:pathData="M68.2376,44.2135L50.5104,61.9407A2.37,2.365 134.9993,0 1,47.1623 61.9442L47.1623,61.9442A2.37,2.365 134.9993,0 1,47.1658 58.596L64.893,40.8689A2.37,2.365 134.9993,0 1,68.2411 40.8653L68.2411,40.8653A2.37,2.365 134.9993,0 1,68.2376 44.2135z"/>
     <path android:fillColor="#f7d036" android:pathData="M77.555,12.35L77.555,12.35A0.615,0.62 0,0 1,78.17 12.97L78.17,13.58A0.615,0.62 0,0 1,77.555 14.2L77.555,14.2A0.615,0.62 0,0 1,76.94 13.58L76.94,12.97A0.615,0.62 0,0 1,77.555 12.35z"/>
     <path android:fillColor="#f7d036" android:pathData="M77.555,17.28L77.555,17.28A0.615,0.62 0,0 1,78.17 17.9L78.17,18.51A0.615,0.62 0,0 1,77.555 19.13L77.555,19.13A0.615,0.62 0,0 1,76.94 18.51L76.94,17.9A0.615,0.62 0,0 1,77.555 17.28z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml b/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml
index 4937c4349b..8200516968 100644
--- a/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml
+++ b/app/src/main/res/drawable-anydpi-v24/img_wumpus_playing_with_friends.xml
@@ -47,7 +47,7 @@
     <path android:fillColor="#dae1ea" android:pathData="M559.27,146.32H451.32a12,12 0,0 1,12 12v3.25c0,6.63 -5.38,12.47 -12,12.47h108c6.63,0 12,-5.84 12,-12.47v-3.25A12,12 0,0 0,559.27 146.32Z"/>
     <path android:fillColor="#9babbf" android:pathData="M463.32,161.57v-3.25a12,12 0,0 0,-12 -12H433.41a12,12 0,0 1,12 12v3.25c0,6.63 -5.37,12.47 -12,12.47h17.91C457.94,174 463.32,168.2 463.32,161.57Z"/>
     <path android:fillColor="#dae1ea" android:pathData="M445.41,161.57v-3.25a12,12 0,0 0,-12 -12h-107a12,12 0,0 1,12 12v3.25c0,6.63 -5.37,12.47 -12,12.47h107C440,174 445.41,168.2 445.41,161.57Z"/>
-    <path android:fillColor="@drawable/res_2131230778_img_wumpus_playing_with_friends__0" android:pathData="M378,143.76c2.36,-0.07 4.47,-1.24 6.79,-1.55l-2,0.26a24.43,24.43 0,0 1,6.22 0.09l-2,-0.27a47.61,47.61 0,0 1,11.61 3.4l-1.8,-0.76a96.87,96.87 0,0 1,12.06 6.24c3.37,2 8.38,0.86 10.26,-2.69a7.65,7.65 0,0 0,-2.69 -10.27A107.9,107.9 0,0 0,402.1 131a48.28,48.28 0,0 0,-9.56 -2.94c-4.71,-0.87 -9.65,-1.19 -14.31,0.2a19.29,19.29 0,0 1,-2.18 0.74l2,-0.27H378c-3.91,0.11 -7.68,3.37 -7.5,7.5 0.18,4 3.3,7.62 7.5,7.5Z"/>
+    <path android:fillColor="@drawable/res_2131230781_img_wumpus_playing_with_friends__0" android:pathData="M378,143.76c2.36,-0.07 4.47,-1.24 6.79,-1.55l-2,0.26a24.43,24.43 0,0 1,6.22 0.09l-2,-0.27a47.61,47.61 0,0 1,11.61 3.4l-1.8,-0.76a96.87,96.87 0,0 1,12.06 6.24c3.37,2 8.38,0.86 10.26,-2.69a7.65,7.65 0,0 0,-2.69 -10.27A107.9,107.9 0,0 0,402.1 131a48.28,48.28 0,0 0,-9.56 -2.94c-4.71,-0.87 -9.65,-1.19 -14.31,0.2a19.29,19.29 0,0 1,-2.18 0.74l2,-0.27H378c-3.91,0.11 -7.68,3.37 -7.5,7.5 0.18,4 3.3,7.62 7.5,7.5Z"/>
     <path android:fillColor="#3e70dd" android:pathData="M331.74,101.21l63.39,-12.35l-1.38,-4.77l-60.58,7.73l-1.43,9.39z" android:strokeAlpha="0.5" android:fillAlpha="0.5"/>
     <path android:fillColor="#7196ff" android:pathData="M360,143.32a38.69,38.69 0,0 1,4.81 0.41l-2,-0.27a75.7,75.7 0,0 1,19 5.28L380,148a84.21,84.21 0,0 1,9.17 4.57c3.41,2 8.37,0.91 10.27,-2.69a7.64,7.64 0,0 0,-2.69 -10.26A87,87 0,0 0,372.56 130,58.9 58.9,0 0,0 360,128.32c-3.92,0 -7.68,3.46 -7.5,7.5a7.63,7.63 0,0 0,7.5 7.5Z"/>
     <path android:fillColor="#7196ff" android:pathData="M327.015,85.641l-14.196,1.633a7.14,7.14 128.44,0 1,-7.909 -6.278L303.072,65.022A7.14,7.14 128.44,0 1,309.344 57.063L323.541,55.431a0,0 0,0 1,-0 0L327.015,85.641a0,0 0,0 1,-0 0Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230734_claim_promo_success__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230734_claim_promo_success__0.xml
new file mode 100644
index 0000000000..135731aa2a
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/res_2131230734_claim_promo_success__0.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:angle="0" android:type="linear" android:startX="99.9642" android:startY="78.1441" android:endX="99.9642" android:endY="52.7521">
+    <item android:color="#ff3264f0" android:offset="0"/>
+    <item android:color="#ff578bfa" android:offset="1"/>
+</gradient>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230735_claim_promo_success__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230735_claim_promo_success__1.xml
new file mode 100644
index 0000000000..fc192096d9
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/res_2131230735_claim_promo_success__1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:angle="0" android:type="linear" android:startX="3944" android:startY="4,111.4502" android:endX="3,988.54" android:endY="3,417.04">
+    <item android:color="#ff3264f0" android:offset="0"/>
+    <item android:color="#ff578bfa" android:offset="1"/>
+</gradient>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230736_claim_promo_success__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230736_claim_promo_success__2.xml
new file mode 100644
index 0000000000..362a64e198
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/res_2131230736_claim_promo_success__2.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gradient xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:angle="0" android:type="linear" android:startX="99.956" android:startY="18.2401" android:endX="99.956" android:endY="39.9921">
+    <item android:color="#ff2951f0" android:offset="0.01"/>
+    <item android:color="#002951f0" android:offset="1"/>
+</gradient>
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230734_discovery_empty_state__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230737_discovery_empty_state__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230734_discovery_empty_state__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230737_discovery_empty_state__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230735_drawable_guild_template_create__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230738_drawable_guild_template_create__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230735_drawable_guild_template_create__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230738_drawable_guild_template_create__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230736_drawable_guild_template_study__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230739_drawable_guild_template_study__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230736_drawable_guild_template_study__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230739_drawable_guild_template_study__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230737_drawable_ic_nitro__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230740_drawable_ic_nitro__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230737_drawable_ic_nitro__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230740_drawable_ic_nitro__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230738_drawable_ic_nitro_classic__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230741_drawable_ic_nitro_classic__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230738_drawable_ic_nitro_classic__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230741_drawable_ic_nitro_classic__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230739_ic_boosted_guild_tier_1__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230742_ic_boosted_guild_tier_1__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230739_ic_boosted_guild_tier_1__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230742_ic_boosted_guild_tier_1__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230740_ic_boosted_guild_tier_2__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230743_ic_boosted_guild_tier_2__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230740_ic_boosted_guild_tier_2__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230743_ic_boosted_guild_tier_2__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230741_ic_boosted_guild_tier_3__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230744_ic_boosted_guild_tier_3__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230741_ic_boosted_guild_tier_3__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230744_ic_boosted_guild_tier_3__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230752_ic_nitro_badge_nitro_gradient_16dp__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230755_ic_nitro_badge_nitro_gradient_16dp__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230752_ic_nitro_badge_nitro_gradient_16dp__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230755_ic_nitro_badge_nitro_gradient_16dp__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230753_ic_nitro_badge_nitro_gradient_16dp__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230756_ic_nitro_badge_nitro_gradient_16dp__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230753_ic_nitro_badge_nitro_gradient_16dp__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230756_ic_nitro_badge_nitro_gradient_16dp__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230754_img_age_gate_failure__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230757_img_age_gate_failure__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230754_img_age_gate_failure__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230757_img_age_gate_failure__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230755_img_age_gate_failure__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230758_img_age_gate_failure__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230755_img_age_gate_failure__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230758_img_age_gate_failure__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230756_img_age_gate_failure__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230759_img_age_gate_failure__2.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230756_img_age_gate_failure__2.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230759_img_age_gate_failure__2.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230757_img_age_gate_failure__3.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230760_img_age_gate_failure__3.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230757_img_age_gate_failure__3.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230760_img_age_gate_failure__3.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230758_img_age_gate_failure__4.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230761_img_age_gate_failure__4.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230758_img_age_gate_failure__4.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230761_img_age_gate_failure__4.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230759_img_age_gate_failure__5.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230762_img_age_gate_failure__5.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230759_img_age_gate_failure__5.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230762_img_age_gate_failure__5.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230760_img_age_gate_safety__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230763_img_age_gate_safety__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230760_img_age_gate_safety__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230763_img_age_gate_safety__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230761_img_age_gate_safety__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230764_img_age_gate_safety__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230761_img_age_gate_safety__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230764_img_age_gate_safety__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230762_img_boost_activated_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230765_img_boost_activated_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230762_img_boost_activated_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230765_img_boost_activated_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230763_img_boost_activated_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230766_img_boost_activated_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230763_img_boost_activated_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230766_img_boost_activated_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230764_img_krisp_onboarding__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230767_img_krisp_onboarding__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230764_img_krisp_onboarding__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230767_img_krisp_onboarding__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230765_img_krisp_onboarding__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230768_img_krisp_onboarding__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230765_img_krisp_onboarding__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230768_img_krisp_onboarding__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230766_img_nitro_pattern__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230769_img_nitro_pattern__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230766_img_nitro_pattern__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230769_img_nitro_pattern__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230767_img_nitro_pattern__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230770_img_nitro_pattern__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230767_img_nitro_pattern__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230770_img_nitro_pattern__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230768_img_nitro_pattern__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230771_img_nitro_pattern__2.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230768_img_nitro_pattern__2.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230771_img_nitro_pattern__2.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230769_img_nitro_pattern__3.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230772_img_nitro_pattern__3.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230769_img_nitro_pattern__3.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230772_img_nitro_pattern__3.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230770_img_nitro_pattern__4.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230773_img_nitro_pattern__4.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230770_img_nitro_pattern__4.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230773_img_nitro_pattern__4.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230771_img_plan_activated_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230774_img_plan_activated_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230771_img_plan_activated_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230774_img_plan_activated_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230772_img_plan_activated_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230775_img_plan_activated_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230772_img_plan_activated_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230775_img_plan_activated_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230773_img_premium_activated_tier_1_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230776_img_premium_activated_tier_1_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230773_img_premium_activated_tier_1_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230776_img_premium_activated_tier_1_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230774_img_premium_activated_tier_1_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230777_img_premium_activated_tier_1_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230774_img_premium_activated_tier_1_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230777_img_premium_activated_tier_1_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230775_img_premium_activated_tier_2_dark__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230778_img_premium_activated_tier_2_dark__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230775_img_premium_activated_tier_2_dark__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230778_img_premium_activated_tier_2_dark__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230776_img_premium_activated_tier_2_light__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230779_img_premium_activated_tier_2_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230776_img_premium_activated_tier_2_light__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230779_img_premium_activated_tier_2_light__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230777_img_remote_auth_loaded__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230780_img_remote_auth_loaded__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230777_img_remote_auth_loaded__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230780_img_remote_auth_loaded__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230778_img_wumpus_playing_with_friends__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230781_img_wumpus_playing_with_friends__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230778_img_wumpus_playing_with_friends__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230781_img_wumpus_playing_with_friends__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230779_screen_share_nfx_illustration__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230782_screen_share_nfx_illustration__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230779_screen_share_nfx_illustration__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230782_screen_share_nfx_illustration__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230780_screen_share_nfx_illustration__1.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230783_screen_share_nfx_illustration__1.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230780_screen_share_nfx_illustration__1.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230783_screen_share_nfx_illustration__1.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230781_screen_share_nfx_illustration__2.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230784_screen_share_nfx_illustration__2.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230781_screen_share_nfx_illustration__2.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230784_screen_share_nfx_illustration__2.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/res_2131230788_video_call_illustration__0.xml b/app/src/main/res/drawable-anydpi-v24/res_2131230791_video_call_illustration__0.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/res_2131230788_video_call_illustration__0.xml
rename to app/src/main/res/drawable-anydpi-v24/res_2131230791_video_call_illustration__0.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml b/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml
index 961ecb1956..f8f069b079 100644
--- a/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml
+++ b/app/src/main/res/drawable-anydpi-v24/screen_share_nfx_illustration.xml
@@ -28,11 +28,11 @@
     <path android:fillColor="#dd8fff" android:pathData="M253.21,98.06C252.491,97.66 251.72,97.36 250.92,97.17C249.077,96.659 247.106,96.888 245.43,97.81C247.64,100.9 250.81,103.48 253.21,98.06Z"/>
     <path android:fillColor="#c69c00" android:pathData="M225.588,95.484C226.344,95.393 226.921,95.013 226.876,94.634C226.83,94.256 226.18,94.023 225.423,94.114C224.666,94.204 224.09,94.585 224.135,94.963C224.181,95.341 224.831,95.575 225.588,95.484Z"/>
     <path android:fillColor="#00000000" android:pathData="M256.51,88.09C257.37,84.73 260.02,84 262.45,86.46" android:strokeColor="#23242e" android:strokeWidth="1.54" android:strokeLineCap="round"/>
-    <path android:fillColor="@drawable/res_2131230779_screen_share_nfx_illustration__0" android:pathData="M65.56,113H65.5L47.69,113.7C35.95,114.11 31.47,118.61 27.37,127.07L27.09,127.71L20.94,140.81L19.7,143.41C17.84,148.76 20.24,152.2 27.57,150.41C35.061,148.378 42.223,145.287 48.84,141.23C55.26,137.37 64.84,131.75 71.11,122.8L71.39,122.41L71.52,122.19L71.89,121.65L72.02,121.43C75.49,115.66 71.78,112.81 65.56,113Z"/>
-    <path android:fillColor="@drawable/res_2131230780_screen_share_nfx_illustration__1" android:pathData="M72,121.43L71.87,121.65L71.5,122.19L71.37,122.41L71.09,122.8C64.83,131.8 55.24,137.37 48.82,141.23C42.204,145.29 35.042,148.381 27.55,150.41C22.24,151.7 19.55,150.24 19.17,147.41C20.91,142.34 30.73,133.41 42.7,126C54.67,118.59 66.08,114.19 71.7,114.41C73.66,115.69 74.07,118.05 72,121.43Z"/>
+    <path android:fillColor="@drawable/res_2131230782_screen_share_nfx_illustration__0" android:pathData="M65.56,113H65.5L47.69,113.7C35.95,114.11 31.47,118.61 27.37,127.07L27.09,127.71L20.94,140.81L19.7,143.41C17.84,148.76 20.24,152.2 27.57,150.41C35.061,148.378 42.223,145.287 48.84,141.23C55.26,137.37 64.84,131.75 71.11,122.8L71.39,122.41L71.52,122.19L71.89,121.65L72.02,121.43C75.49,115.66 71.78,112.81 65.56,113Z"/>
+    <path android:fillColor="@drawable/res_2131230783_screen_share_nfx_illustration__1" android:pathData="M72,121.43L71.87,121.65L71.5,122.19L71.37,122.41L71.09,122.8C64.83,131.8 55.24,137.37 48.82,141.23C42.204,145.29 35.042,148.381 27.55,150.41C22.24,151.7 19.55,150.24 19.17,147.41C20.91,142.34 30.73,133.41 42.7,126C54.67,118.59 66.08,114.19 71.7,114.41C73.66,115.69 74.07,118.05 72,121.43Z"/>
     <path android:fillColor="#6b3043" android:pathData="M26.58,146.81C25.21,144.59 33.51,136.97 45.12,129.81C56.73,122.65 67.26,118.6 68.63,120.81C70,123.02 61.7,130.65 50.09,137.81C38.48,144.97 28,149 26.58,146.81Z"/>
     <path android:fillColor="#7a384c" android:pathData="M55.87,130.82L55.26,131.41L65.75,126.13C64.928,126.989 64.06,127.804 63.15,128.57L53.56,132.93H53.5L60.07,131.13L56.39,133.84L51.9,134.1L49,136.06L46.46,137.53L42.32,142.39L39.15,144L45.15,138.28L44.74,138.39L35,145.71L33.32,146.33L43.32,139.01C42.605,139.34 41.874,139.634 41.13,139.89L28.28,147.5C27.756,147.53 27.236,147.398 26.79,147.12L39.88,140.12C39.768,140.084 39.665,140.022 39.58,139.94C39.5,139.94 39.58,139.77 39.58,139.57L26.74,145.33C27.021,144.71 27.38,144.128 27.81,143.6L40.09,138.87L40.69,138.21L30.28,140.87L32.19,139.18L41.57,137.48L42.88,136.38L35.88,136.14L37.88,134.69L43.78,135.69L44.91,134.89L40,133.24L41.61,132.13L45.84,134.28L46.92,133.56L43.67,130.78L45.04,129.92L47.42,133.3L47.85,133L47.68,133.05L47.23,128.6L49.1,127.49L48.95,132.34L50.61,131.41L51.27,126.3L52.89,125.45L51.28,131.05L53.83,129.89L56.31,123.75L58.07,122.92L54.53,129.65C55.028,129.391 55.579,129.25 56.14,129.24L63.62,120.86C64.039,120.691 64.48,120.58 64.93,120.53L56.76,129.46L68.41,120.52L68.74,120.82C68.866,121.109 68.904,121.429 68.85,121.74L55.87,130.82Z"/>
-    <path android:fillColor="@drawable/res_2131230781_screen_share_nfx_illustration__2" android:pathData="M45.17,169.73C43.985,168.035 43.293,166.045 43.17,163.98C42.78,157.4 40.69,149.19 37.17,140.33C36.76,139.65 41.17,136.23 47.06,132.67C52.95,129.11 58.06,126.86 58.47,127.67C61.7,136.31 66.83,148.82 67.07,164.67C67.102,167.193 66.273,169.651 64.721,171.639C63.168,173.628 60.985,175.028 58.53,175.61L57.86,175.77C55.681,176.289 53.397,176.138 51.306,175.336C49.215,174.535 47.414,173.121 46.14,171.28L45.17,169.73Z"/>
+    <path android:fillColor="@drawable/res_2131230784_screen_share_nfx_illustration__2" android:pathData="M45.17,169.73C43.985,168.035 43.293,166.045 43.17,163.98C42.78,157.4 40.69,149.19 37.17,140.33C36.76,139.65 41.17,136.23 47.06,132.67C52.95,129.11 58.06,126.86 58.47,127.67C61.7,136.31 66.83,148.82 67.07,164.67C67.102,167.193 66.273,169.651 64.721,171.639C63.168,173.628 60.985,175.028 58.53,175.61L57.86,175.77C55.681,176.289 53.397,176.138 51.306,175.336C49.215,174.535 47.414,173.121 46.14,171.28L45.17,169.73Z"/>
     <path android:fillColor="#a5387e" android:pathData="M63.11,140.58C55.28,140.22 45.39,141.64 38.7,144.22C38.28,142.898 37.789,141.6 37.23,140.33C36.82,139.65 41.23,136.23 47.12,132.67C53.01,129.11 58.12,126.86 58.53,127.67C59.87,131.3 61.6,135.6 63.11,140.58Z" android:strokeAlpha="0.3" android:fillAlpha="0.3"/>
     <path android:fillColor="#543247" android:pathData="M62.83,149.93C62.28,149.93 61.83,149.34 61.76,148.54C61.69,147.74 62.12,147.06 62.67,147.03C63.22,147 63.67,147.63 63.74,148.43C63.81,149.23 63.38,149.9 62.83,149.93Z"/>
     <path android:fillColor="#543247" android:pathData="M52.9,151.09C52.789,150.882 52.738,150.646 52.754,150.41C52.769,150.174 52.85,149.948 52.987,149.755C53.125,149.563 53.313,149.413 53.531,149.322C53.749,149.231 53.988,149.202 54.222,149.239C54.455,149.277 54.673,149.378 54.852,149.533C55.031,149.688 55.163,149.889 55.233,150.115C55.304,150.34 55.31,150.581 55.251,150.81C55.192,151.039 55.07,151.247 54.9,151.41C54.59,151.626 54.208,151.713 53.835,151.653C53.463,151.594 53.127,151.392 52.9,151.09Z"/>
diff --git a/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml b/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml
index 14a0ae2edc..13ad7b90b5 100644
--- a/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml
+++ b/app/src/main/res/drawable-anydpi-v24/video_call_illustration.xml
@@ -4,7 +4,7 @@
     <path android:fillColor="#3e70dd" android:pathData="M124,58.5H227.9V112a5,5 0,0 1,-5 5H124Z"/>
     <path android:fillColor="#fff" android:pathData="M25.1,0H124V58.5H20.1V5A5,5 0,0 1,25.1 0Z"/>
     <path android:fillColor="#f7c9f7" android:pathData="M20.1,58.5H124V117H25.1a5,5 0,0 1,-5 -5Z"/>
-    <path android:fillColor="@drawable/res_2131230788_video_call_illustration__0" android:pathData="M106,32.4l0.43,-2.55a4.76,4.76 0,0 0,-3.68 2.06A31.84,31.84 0,0 1,92.57 42a9,9 0,0 1,-3.83 2.59l0.6,2.47 1.58,6.49 0.16,-0.05c10,-4.42 15.06,-9.7 19.52,-16.28 0.06,-0.08 0.11,-0.17 0.16,-0.25a4.73,4.73 0,0 0,0.6 -1.67l-3.77,-0.64A2,2 0,0 1,106 32.4Z"/>
+    <path android:fillColor="@drawable/res_2131230791_video_call_illustration__0" android:pathData="M106,32.4l0.43,-2.55a4.76,4.76 0,0 0,-3.68 2.06A31.84,31.84 0,0 1,92.57 42a9,9 0,0 1,-3.83 2.59l0.6,2.47 1.58,6.49 0.16,-0.05c10,-4.42 15.06,-9.7 19.52,-16.28 0.06,-0.08 0.11,-0.17 0.16,-0.25a4.73,4.73 0,0 0,0.6 -1.67l-3.77,-0.64A2,2 0,0 1,106 32.4Z"/>
     <path android:pathData="M52.9,48.68a9.87,9.87 0,0 1,-1.21 -0.21,3.55 3.55,0 0,0 -0.47,0.32 45.41,45.41 0,0 0,-8.93 9.71H51.5l0.82,-5.7Z"/>
     <path android:fillColor="#6a94ff" android:pathData="M52.32,52.8l-0.81,5.7l40.61,0l-1.2,-4.91l-1.58,-6.49l-37.02,5.7z"/>
     <path android:fillColor="#6a94ff" android:pathData="M54.81,48.67a9.39,9.39 0,0 1,-1.91 0l-0.58,4.12 37,-5.7 -0.6,-2.47a8.71,8.71 0,0 1,-2 0.47Z"/>
diff --git a/app/src/main/res/drawable-hdpi/claim_promo_success.png b/app/src/main/res/drawable-hdpi/claim_promo_success.png
new file mode 100644
index 0000000000..e758997a92
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/claim_promo_success.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_hub_24dp.png b/app/src/main/res/drawable-hdpi/ic_hub_24dp.png
new file mode 100644
index 0000000000..987c34679b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_hub_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mentions_empty.png b/app/src/main/res/drawable-hdpi/ic_mentions_empty.png
new file mode 100644
index 0000000000..1e32b9e6df
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_mentions_empty.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sticker_icon_20dp.png b/app/src/main/res/drawable-hdpi/ic_sticker_icon_20dp.png
deleted file mode 100644
index 79c9805e12..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_sticker_icon_20dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sticker_icon_24dp.png b/app/src/main/res/drawable-hdpi/ic_sticker_icon_24dp.png
new file mode 100644
index 0000000000..43306c022b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_sticker_icon_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_premium_classic_subscription_header_error.png b/app/src/main/res/drawable-hdpi/img_premium_classic_subscription_header_error.png
index 57c2b4b952..57b0fe88fb 100644
Binary files a/app/src/main/res/drawable-hdpi/img_premium_classic_subscription_header_error.png and b/app/src/main/res/drawable-hdpi/img_premium_classic_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_premium_subscription_header_error.png b/app/src/main/res/drawable-hdpi/img_premium_subscription_header_error.png
index 2b2739eb6e..3d07d12f74 100644
Binary files a/app/src/main/res/drawable-hdpi/img_premium_subscription_header_error.png and b/app/src/main/res/drawable-hdpi/img_premium_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-ldpi/claim_promo_success.png b/app/src/main/res/drawable-ldpi/claim_promo_success.png
new file mode 100644
index 0000000000..dd28afc714
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/claim_promo_success.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_hub_24dp.png b/app/src/main/res/drawable-ldpi/ic_hub_24dp.png
new file mode 100644
index 0000000000..b9287f6344
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_hub_24dp.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_mentions_empty.png b/app/src/main/res/drawable-ldpi/ic_mentions_empty.png
new file mode 100644
index 0000000000..1c897ba19d
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_mentions_empty.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_sticker_icon_20dp.png b/app/src/main/res/drawable-ldpi/ic_sticker_icon_20dp.png
deleted file mode 100644
index 247b8a97fd..0000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_sticker_icon_20dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_sticker_icon_24dp.png b/app/src/main/res/drawable-ldpi/ic_sticker_icon_24dp.png
new file mode 100644
index 0000000000..7c2e048a3d
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_sticker_icon_24dp.png differ
diff --git a/app/src/main/res/drawable-ldpi/img_premium_classic_subscription_header_error.png b/app/src/main/res/drawable-ldpi/img_premium_classic_subscription_header_error.png
index 84ad050e87..affca08b95 100644
Binary files a/app/src/main/res/drawable-ldpi/img_premium_classic_subscription_header_error.png and b/app/src/main/res/drawable-ldpi/img_premium_classic_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-ldpi/img_premium_subscription_header_error.png b/app/src/main/res/drawable-ldpi/img_premium_subscription_header_error.png
index 624acbec60..28105928a5 100644
Binary files a/app/src/main/res/drawable-ldpi/img_premium_subscription_header_error.png and b/app/src/main/res/drawable-ldpi/img_premium_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-mdpi/claim_promo_success.png b/app/src/main/res/drawable-mdpi/claim_promo_success.png
new file mode 100644
index 0000000000..65daf54a41
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/claim_promo_success.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hub_24dp.png b/app/src/main/res/drawable-mdpi/ic_hub_24dp.png
new file mode 100644
index 0000000000..64444cd3ee
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_hub_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mentions_empty.png b/app/src/main/res/drawable-mdpi/ic_mentions_empty.png
new file mode 100644
index 0000000000..d8b1e4c82a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_mentions_empty.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sticker_icon_20dp.png b/app/src/main/res/drawable-mdpi/ic_sticker_icon_20dp.png
deleted file mode 100644
index 826e1b3410..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_sticker_icon_20dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sticker_icon_24dp.png b/app/src/main/res/drawable-mdpi/ic_sticker_icon_24dp.png
new file mode 100644
index 0000000000..f405d430fd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_sticker_icon_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_premium_classic_subscription_header_error.png b/app/src/main/res/drawable-mdpi/img_premium_classic_subscription_header_error.png
index 980db49fa1..81cc688035 100644
Binary files a/app/src/main/res/drawable-mdpi/img_premium_classic_subscription_header_error.png and b/app/src/main/res/drawable-mdpi/img_premium_classic_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_premium_subscription_header_error.png b/app/src/main/res/drawable-mdpi/img_premium_subscription_header_error.png
index 4b68680634..09a9fc5e62 100644
Binary files a/app/src/main/res/drawable-mdpi/img_premium_subscription_header_error.png and b/app/src/main/res/drawable-mdpi/img_premium_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-xhdpi/claim_promo_success.png b/app/src/main/res/drawable-xhdpi/claim_promo_success.png
new file mode 100644
index 0000000000..3d6ecbb61d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/claim_promo_success.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hub_24dp.png b/app/src/main/res/drawable-xhdpi/ic_hub_24dp.png
new file mode 100644
index 0000000000..5e02ae18c0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_hub_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mentions_empty.png b/app/src/main/res/drawable-xhdpi/ic_mentions_empty.png
new file mode 100644
index 0000000000..bbfce62e20
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_mentions_empty.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sticker_icon_20dp.png b/app/src/main/res/drawable-xhdpi/ic_sticker_icon_20dp.png
deleted file mode 100644
index 8b43d072c0..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_sticker_icon_20dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sticker_icon_24dp.png b/app/src/main/res/drawable-xhdpi/ic_sticker_icon_24dp.png
new file mode 100644
index 0000000000..5bda466295
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_sticker_icon_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png b/app/src/main/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png
index baa78f188d..94e8507e3a 100644
Binary files a/app/src/main/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png and b/app/src/main/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_premium_subscription_header_error.png b/app/src/main/res/drawable-xhdpi/img_premium_subscription_header_error.png
index 217e32bb77..d19bb4a809 100644
Binary files a/app/src/main/res/drawable-xhdpi/img_premium_subscription_header_error.png and b/app/src/main/res/drawable-xhdpi/img_premium_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_profile_banner_value_prop.png b/app/src/main/res/drawable-xhdpi/img_profile_banner_value_prop.png
new file mode 100644
index 0000000000..43dfae82fc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_profile_banner_value_prop.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/claim_promo_success.png b/app/src/main/res/drawable-xxhdpi/claim_promo_success.png
new file mode 100644
index 0000000000..d881c8df7e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/claim_promo_success.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hub_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_hub_24dp.png
new file mode 100644
index 0000000000..d644a2738e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_hub_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mentions_empty.png b/app/src/main/res/drawable-xxhdpi/ic_mentions_empty.png
new file mode 100644
index 0000000000..3ef2158259
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_mentions_empty.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sticker_icon_20dp.png b/app/src/main/res/drawable-xxhdpi/ic_sticker_icon_20dp.png
deleted file mode 100644
index ef2c7ed0ba..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_sticker_icon_20dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sticker_icon_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_sticker_icon_24dp.png
new file mode 100644
index 0000000000..224fa24299
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_sticker_icon_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png b/app/src/main/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png
index 6a5de0d937..11e7d87bf7 100644
Binary files a/app/src/main/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png and b/app/src/main/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_premium_subscription_header_error.png b/app/src/main/res/drawable-xxhdpi/img_premium_subscription_header_error.png
index 67635a4eac..075270c385 100644
Binary files a/app/src/main/res/drawable-xxhdpi/img_premium_subscription_header_error.png and b/app/src/main/res/drawable-xxhdpi/img_premium_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/mg_profile_banner_value_prop.png b/app/src/main/res/drawable-xxhdpi/mg_profile_banner_value_prop.png
new file mode 100644
index 0000000000..4ab09f09f7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/mg_profile_banner_value_prop.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/claim_promo_success.png b/app/src/main/res/drawable-xxxhdpi/claim_promo_success.png
new file mode 100644
index 0000000000..05cb93ef45
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/claim_promo_success.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hub_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_hub_24dp.png
new file mode 100644
index 0000000000..880a44dc3c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_hub_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mentions_empty.png b/app/src/main/res/drawable-xxxhdpi/ic_mentions_empty.png
new file mode 100644
index 0000000000..9ae4305573
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_mentions_empty.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sticker_icon_20dp.png b/app/src/main/res/drawable-xxxhdpi/ic_sticker_icon_20dp.png
deleted file mode 100644
index 6aee8f3eff..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_sticker_icon_20dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sticker_icon_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_sticker_icon_24dp.png
new file mode 100644
index 0000000000..1411e45707
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_sticker_icon_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png b/app/src/main/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png
index ffe6f9c9b7..0a24c570ed 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png and b/app/src/main/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_premium_subscription_header_error.png b/app/src/main/res/drawable-xxxhdpi/img_premium_subscription_header_error.png
index 8df3dd47f3..b645376ec2 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/img_premium_subscription_header_error.png and b/app/src/main/res/drawable-xxxhdpi/img_premium_subscription_header_error.png differ
diff --git a/app/src/main/res/drawable/bg_server_discovery_header.png b/app/src/main/res/drawable/bg_server_discovery_header.png
new file mode 100644
index 0000000000..e3a83e539e
Binary files /dev/null and b/app/src/main/res/drawable/bg_server_discovery_header.png differ
diff --git a/app/src/main/res/drawable/gradient_transparent_colorbackgroundsecondary.xml b/app/src/main/res/drawable/gradient_transparent_colorbackgroundsecondary.xml
new file mode 100644
index 0000000000..4ae7ac8231
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_transparent_colorbackgroundsecondary.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#00000000" android:endColor="?attr/colorBackgroundSecondary" android:angle="0" android:type="linear" android:centerX="0.7"/>
+</shape>
diff --git a/app/src/main/res/drawable/ic_network_connecting_animated_vector.xml b/app/src/main/res/drawable/ic_network_connecting_animated_vector.xml
index fffc186901..194d3b31bc 100644
--- a/app/src/main/res/drawable/ic_network_connecting_animated_vector.xml
+++ b/app/src/main/res/drawable/ic_network_connecting_animated_vector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230742_ic_network_connecting_animated_vector__0">
-    <target android:name="one" android:animation="@drawable/res_2131230743_ic_network_connecting_animated_vector__1"/>
-    <target android:name="two" android:animation="@drawable/res_2131230744_ic_network_connecting_animated_vector__2"/>
-    <target android:name="three" android:animation="@drawable/res_2131230745_ic_network_connecting_animated_vector__3"/>
-    <target android:name="three" android:animation="@drawable/res_2131230746_ic_network_connecting_animated_vector__4"/>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230745_ic_network_connecting_animated_vector__0">
+    <target android:name="one" android:animation="@drawable/res_2131230746_ic_network_connecting_animated_vector__1"/>
+    <target android:name="two" android:animation="@drawable/res_2131230747_ic_network_connecting_animated_vector__2"/>
+    <target android:name="three" android:animation="@drawable/res_2131230748_ic_network_connecting_animated_vector__3"/>
+    <target android:name="three" android:animation="@drawable/res_2131230749_ic_network_connecting_animated_vector__4"/>
 </animated-vector>
diff --git a/app/src/main/res/drawable/ic_network_connecting_animated_vector_light.xml b/app/src/main/res/drawable/ic_network_connecting_animated_vector_light.xml
index 24562101d0..dc7a3a7b2c 100644
--- a/app/src/main/res/drawable/ic_network_connecting_animated_vector_light.xml
+++ b/app/src/main/res/drawable/ic_network_connecting_animated_vector_light.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230747_ic_network_connecting_animated_vector_light__0">
-    <target android:name="one" android:animation="@drawable/res_2131230748_ic_network_connecting_animated_vector_light__1"/>
-    <target android:name="two" android:animation="@drawable/res_2131230749_ic_network_connecting_animated_vector_light__2"/>
-    <target android:name="three" android:animation="@drawable/res_2131230750_ic_network_connecting_animated_vector_light__3"/>
-    <target android:name="three" android:animation="@drawable/res_2131230751_ic_network_connecting_animated_vector_light__4"/>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230750_ic_network_connecting_animated_vector_light__0">
+    <target android:name="one" android:animation="@drawable/res_2131230751_ic_network_connecting_animated_vector_light__1"/>
+    <target android:name="two" android:animation="@drawable/res_2131230752_ic_network_connecting_animated_vector_light__2"/>
+    <target android:name="three" android:animation="@drawable/res_2131230753_ic_network_connecting_animated_vector_light__3"/>
+    <target android:name="three" android:animation="@drawable/res_2131230754_ic_network_connecting_animated_vector_light__4"/>
 </animated-vector>
diff --git a/app/src/main/res/drawable/res_2131230742_ic_network_connecting_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230745_ic_network_connecting_animated_vector__0.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230742_ic_network_connecting_animated_vector__0.xml
rename to app/src/main/res/drawable/res_2131230745_ic_network_connecting_animated_vector__0.xml
diff --git a/app/src/main/res/drawable/res_2131230743_ic_network_connecting_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230746_ic_network_connecting_animated_vector__1.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230743_ic_network_connecting_animated_vector__1.xml
rename to app/src/main/res/drawable/res_2131230746_ic_network_connecting_animated_vector__1.xml
diff --git a/app/src/main/res/drawable/res_2131230744_ic_network_connecting_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230747_ic_network_connecting_animated_vector__2.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230744_ic_network_connecting_animated_vector__2.xml
rename to app/src/main/res/drawable/res_2131230747_ic_network_connecting_animated_vector__2.xml
diff --git a/app/src/main/res/drawable/res_2131230745_ic_network_connecting_animated_vector__3.xml b/app/src/main/res/drawable/res_2131230748_ic_network_connecting_animated_vector__3.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230745_ic_network_connecting_animated_vector__3.xml
rename to app/src/main/res/drawable/res_2131230748_ic_network_connecting_animated_vector__3.xml
diff --git a/app/src/main/res/drawable/res_2131230746_ic_network_connecting_animated_vector__4.xml b/app/src/main/res/drawable/res_2131230749_ic_network_connecting_animated_vector__4.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230746_ic_network_connecting_animated_vector__4.xml
rename to app/src/main/res/drawable/res_2131230749_ic_network_connecting_animated_vector__4.xml
diff --git a/app/src/main/res/drawable/res_2131230747_ic_network_connecting_animated_vector_light__0.xml b/app/src/main/res/drawable/res_2131230750_ic_network_connecting_animated_vector_light__0.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230747_ic_network_connecting_animated_vector_light__0.xml
rename to app/src/main/res/drawable/res_2131230750_ic_network_connecting_animated_vector_light__0.xml
diff --git a/app/src/main/res/drawable/res_2131230748_ic_network_connecting_animated_vector_light__1.xml b/app/src/main/res/drawable/res_2131230751_ic_network_connecting_animated_vector_light__1.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230748_ic_network_connecting_animated_vector_light__1.xml
rename to app/src/main/res/drawable/res_2131230751_ic_network_connecting_animated_vector_light__1.xml
diff --git a/app/src/main/res/drawable/res_2131230749_ic_network_connecting_animated_vector_light__2.xml b/app/src/main/res/drawable/res_2131230752_ic_network_connecting_animated_vector_light__2.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230749_ic_network_connecting_animated_vector_light__2.xml
rename to app/src/main/res/drawable/res_2131230752_ic_network_connecting_animated_vector_light__2.xml
diff --git a/app/src/main/res/drawable/res_2131230750_ic_network_connecting_animated_vector_light__3.xml b/app/src/main/res/drawable/res_2131230753_ic_network_connecting_animated_vector_light__3.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230750_ic_network_connecting_animated_vector_light__3.xml
rename to app/src/main/res/drawable/res_2131230753_ic_network_connecting_animated_vector_light__3.xml
diff --git a/app/src/main/res/drawable/res_2131230751_ic_network_connecting_animated_vector_light__4.xml b/app/src/main/res/drawable/res_2131230754_ic_network_connecting_animated_vector_light__4.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230751_ic_network_connecting_animated_vector_light__4.xml
rename to app/src/main/res/drawable/res_2131230754_ic_network_connecting_animated_vector_light__4.xml
diff --git a/app/src/main/res/drawable/res_2131230782_sparkle_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230785_sparkle_animated_vector__0.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230782_sparkle_animated_vector__0.xml
rename to app/src/main/res/drawable/res_2131230785_sparkle_animated_vector__0.xml
diff --git a/app/src/main/res/drawable/res_2131230783_sparkle_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230786_sparkle_animated_vector__1.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230783_sparkle_animated_vector__1.xml
rename to app/src/main/res/drawable/res_2131230786_sparkle_animated_vector__1.xml
diff --git a/app/src/main/res/drawable/res_2131230784_sparkle_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230787_sparkle_animated_vector__2.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230784_sparkle_animated_vector__2.xml
rename to app/src/main/res/drawable/res_2131230787_sparkle_animated_vector__2.xml
diff --git a/app/src/main/res/drawable/res_2131230785_sparkle_yellow_animated_vector__0.xml b/app/src/main/res/drawable/res_2131230788_sparkle_yellow_animated_vector__0.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230785_sparkle_yellow_animated_vector__0.xml
rename to app/src/main/res/drawable/res_2131230788_sparkle_yellow_animated_vector__0.xml
diff --git a/app/src/main/res/drawable/res_2131230786_sparkle_yellow_animated_vector__1.xml b/app/src/main/res/drawable/res_2131230789_sparkle_yellow_animated_vector__1.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230786_sparkle_yellow_animated_vector__1.xml
rename to app/src/main/res/drawable/res_2131230789_sparkle_yellow_animated_vector__1.xml
diff --git a/app/src/main/res/drawable/res_2131230787_sparkle_yellow_animated_vector__2.xml b/app/src/main/res/drawable/res_2131230790_sparkle_yellow_animated_vector__2.xml
similarity index 100%
rename from app/src/main/res/drawable/res_2131230787_sparkle_yellow_animated_vector__2.xml
rename to app/src/main/res/drawable/res_2131230790_sparkle_yellow_animated_vector__2.xml
diff --git a/app/src/main/res/drawable/sparkle_animated_vector.xml b/app/src/main/res/drawable/sparkle_animated_vector.xml
index 85574c383d..d088380207 100644
--- a/app/src/main/res/drawable/sparkle_animated_vector.xml
+++ b/app/src/main/res/drawable/sparkle_animated_vector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230782_sparkle_animated_vector__0">
-    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230783_sparkle_animated_vector__1"/>
-    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230784_sparkle_animated_vector__2"/>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230785_sparkle_animated_vector__0">
+    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230786_sparkle_animated_vector__1"/>
+    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230787_sparkle_animated_vector__2"/>
 </animated-vector>
diff --git a/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml b/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml
index 74461159e8..baa6da39ab 100644
--- a/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml
+++ b/app/src/main/res/drawable/sparkle_yellow_animated_vector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230785_sparkle_yellow_animated_vector__0">
-    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230786_sparkle_yellow_animated_vector__1"/>
-    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230787_sparkle_yellow_animated_vector__2"/>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:drawable="@drawable/res_2131230788_sparkle_yellow_animated_vector__0">
+    <target android:name="yellow_sparkle_group" android:animation="@drawable/res_2131230789_sparkle_yellow_animated_vector__1"/>
+    <target android:name="blue_sparkle_group" android:animation="@drawable/res_2131230790_sparkle_yellow_animated_vector__2"/>
 </animated-vector>
diff --git a/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml b/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml
new file mode 100644
index 0000000000..06b465e9dd
--- /dev/null
+++ b/app/src/main/res/layout-v22/single_value_prop_premium_upsell_dialog.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="312dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+    <androidx.constraintlayout.widget.ConstraintLayout app:layout_constraintBottom_toTopOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+        <View android:id="@+id/transparent_space" android:layout_width="match_parent" android:layout_height="64dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <View android:id="@+id/content_background" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/transparent_space"/>
+        <ImageView android:layout_gravity="center_horizontal" android:id="@+id/value_prop_image" android:layout_width="224dp" android:layout_height="154dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:layout_marginHorizontal="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_header_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/upsell_header_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="24dp" android:fontFamily="@font/ginto_medium" android:textAlignment="center" android:paddingHorizontal="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_body_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/value_prop_image" style="@style/res_2131952561_uikit_textview"/>
+        <TextView android:id="@+id/upsell_body_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="4dp" android:layout_marginBottom="24dp" android:textAlignment="center" android:paddingHorizontal="20dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/upsell_header_text" style="@style/res_2131952561_uikit_textview"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <LinearLayout android:id="@+id/button_container" style="@style/res_2131952416_uikit_dialog_buttoncontainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952469_uikit_material_button_transparent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/get_premium_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:layout_marginStart="8dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952459_uikit_material_button_green_fit"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout-v22/user_profile_header_view.xml b/app/src/main/res/layout-v22/user_profile_header_view.xml
index 1228a0a8f7..26ede5aed5 100644
--- a/app/src/main/res/layout-v22/user_profile_header_view.xml
+++ b/app/src/main/res/layout-v22/user_profile_header_view.xml
@@ -4,7 +4,13 @@
     <androidx.cardview.widget.CardView android:id="@+id/beta_tag" android:padding="6dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:foreground="?attr/bg_pressed_highlight" android:layout_marginStart="16dp" app:cardBackgroundColor="?attr/color_brand" app:cardCornerRadius="12dp" app:cardElevation="0dp" app:layout_constraintStart_toStartOf="@+id/banner" app:layout_constraintTop_toTopOf="@+id/banner">
         <TextView android:textSize="14dp" android:textColor="@color/white" android:layout_marginLeft="6dp" android:layout_marginRight="6dp" android:text="@string/beta" android:textAllCaps="true" android:layout_marginHorizontal="6dp" style="@style/res_2131952562_uikit_textview_bold"/>
     </androidx.cardview.widget.CardView>
+    <androidx.cardview.widget.CardView android:id="@+id/banner_edit" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginTop="12dp" android:foreground="?attr/bg_pressed_highlight" android:layout_marginEnd="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="12dp" app:contentPadding="4dp" app:layout_constraintEnd_toEndOf="@+id/banner" app:layout_constraintTop_toTopOf="@+id/banner">
+        <ImageView android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_edit_24dp" android:scaleType="fitCenter" android:contentDescription="@string/user_settings_change_banner_a11y_label" app:tint="?attr/colorInteractiveNormal"/>
+    </androidx.cardview.widget.CardView>
     <com.discord.views.user.UserAvatarPresenceView android:layout_gravity="center" android:id="@+id/large_avatar" android:clipChildren="false" android:layout_width="@dimen/avatar_wrap_size_xxlarge" android:layout_height="@dimen/avatar_wrap_size_xxlarge" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/banner" app:layout_constraintStart_toStartOf="@+id/banner" app:layout_constraintTop_toBottomOf="@+id/banner" app:user_avatar_background_color="?attr/colorBackgroundTertiary" app:user_avatar_cutout_space="4dp"/>
+    <androidx.cardview.widget.CardView android:id="@+id/avatar_edit" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:foreground="?attr/bg_pressed_highlight" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="12dp" app:contentPadding="4dp" app:layout_constraintEnd_toEndOf="@+id/large_avatar" app:layout_constraintTop_toTopOf="@+id/large_avatar">
+        <ImageView android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_edit_24dp" android:scaleType="fitCenter" android:contentDescription="@string/user_settings_change_avatar_a11y_label" app:tint="?attr/colorInteractiveNormal"/>
+    </androidx.cardview.widget.CardView>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/large_avatar_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="large_avatar"/>
     <LinearLayout android:id="@+id/user_profile_header_name_wrap" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/large_avatar_barrier" app:layout_goneMarginEnd="16dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
         <com.discord.views.UsernameView android:id="@+id/user_profile_header_primary_name" android:layout_width="wrap_content" android:layout_height="wrap_content" app:username_line_spacing_multiplier="1" app:username_singleline="false" app:username_text_appearance="@style/res_2131952532_uikit_textappearance_bold" app:username_text_size="@dimen/uikit_textsize_xxlarge"/>
diff --git a/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml b/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml
index 089d049492..6323f23f51 100644
--- a/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml
+++ b/app/src/main/res/layout-v22/view_mobile_reports_bottom_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
     <View android:background="?attr/colorBackgroundModifierAccent" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/res_2131952422_uikit_divider"/>
-    <TextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952579_uikit_textview_subtext"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952579_uikit_textview_subtext"/>
     <com.discord.views.LoadingButton android:id="@+id/report_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:elevation="0dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952456_uikit_material_button"/>
     <com.google.android.material.button.MaterialButton android:id="@+id/report_node_bottom_button_cancel" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:elevation="0dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952469_uikit_material_button_transparent"/>
     <TextView android:textColor="@color/status_red" android:id="@+id/report_node_bottom_button_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAlignment="center" android:layout_marginHorizontal="16dp" style="@style/res_2131952579_uikit_textview_subtext"/>
diff --git a/app/src/main/res/layout-v22/widget_chat_input.xml b/app/src/main/res/layout-v22/widget_chat_input.xml
index 23ab348077..c91edd7307 100644
--- a/app/src/main/res/layout-v22/widget_chat_input.xml
+++ b/app/src/main/res/layout-v22/widget_chat_input.xml
@@ -11,7 +11,7 @@
         <FrameLayout android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content">
             <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_emoji_matching_header" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" android:layout_marginHorizontal="12dp" android:layout_marginVertical="8dp" style="@style/res_2131952561_uikit_textview"/>
         </FrameLayout>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_mentions_recycler" android:background="?attr/colorBackgroundSecondary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_mentions_recycler" android:background="?attr/colorBackgroundSecondary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
         <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/chat_input_categories_recycler" android:background="?attr/colorBackgroundTertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height" android:paddingHorizontal="8dp"/>
         <include android:id="@+id/application_commands_root" android:visibility="gone" layout="@layout/widget_chat_input_application_commands"/>
         <RelativeLayout android:id="@+id/chat_input_context_bar" android:background="?attr/colorBackgroundSecondary" android:visibility="gone" android:layout_width="match_parent" android:layout_height="40dp">
diff --git a/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml b/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml
new file mode 100644
index 0000000000..2a08649711
--- /dev/null
+++ b/app/src/main/res/layout-v22/widget_guild_sticker_sheet.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_sticker_sheet_flipper" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952600_uikit_viewgroup_page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="14dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+            <com.discord.views.sticker.StickerView android:id="@+id/guild_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
+            <LinearLayout style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952562_uikit_textview_bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_description" style="@style/res_2131952561_uikit_textview"/>
+            </LinearLayout>
+        </LinearLayout>
+        <FrameLayout android:id="@+id/guild_sticker_sheet_button_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp">
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_join_btn" android:text="@string/sticker_popout_join_server" style="@style/res_2131952456_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952458_uikit_material_button_green"/>
+        </FrameLayout>
+        <LinearLayout android:id="@+id/guild_sticker_sheet_guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="16dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952422_uikit_divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_header" android:layout_marginTop="16dp" android:text="@string/sticker_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/res_2131952562_uikit_textview_bold"/>
+            <LinearLayout android:layout_marginTop="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+                <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/guild_sticker_sheet_guild_icon_wrapper" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_sticker_sheet_guild_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/res_2131952448_uikit_imageview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guild_sticker_sheet_guild_icon_text" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952561_uikit_textview"/>
+                </FrameLayout>
+                <LinearLayout style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_guild_name" android:drawablePadding="8dp" style="@style/res_2131952562_uikit_textview_bold"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_info" android:layout_marginTop="4dp" style="@style/res_2131952561_uikit_textview"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+    <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp"/>
+</com.discord.app.AppViewFlipper>
diff --git a/app/src/main/res/layout-v22/widget_start_stage.xml b/app/src/main/res/layout-v22/widget_start_stage.xml
new file mode 100644
index 0000000000..1ea14a53ac
--- /dev/null
+++ b/app/src/main/res/layout-v22/widget_start_stage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952600_uikit_viewgroup_page">
+    <ImageView android:id="@+id/start_stage_icon" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_mentions_empty" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/start_stage_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:layout_constraintWidth_percent="0.33"/>
+    <TextView android:textAppearance="@style/res_2131952532_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/start_stage_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_channel_start_title" app:layout_constraintBottom_toTopOf="@+id/start_stage_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_icon"/>
+    <TextView android:id="@+id/start_stage_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/stage_channel_start_subtitle" app:layout_constraintBottom_toTopOf="@+id/start_stage_start_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_title" style="@style/res_2131952579_uikit_textview_subtext"/>
+    <include android:id="@+id/start_stage_start_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" android:layout_marginHorizontal="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_subtitle" layout="@layout/stub_call_fullscreen_start_stage_event_button"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml b/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml
new file mode 100644
index 0000000000..4c0bcb5e67
--- /dev/null
+++ b/app/src/main/res/layout-v22/widget_unknown_sticker_sheet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952600_uikit_viewgroup_page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" android:layout_marginHorizontal="14dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+            <com.discord.views.sticker.StickerView android:id="@+id/unknown_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
+            <LinearLayout style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/unknown_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952562_uikit_textview_bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/sticker_popout_premium_unjoined_private_guild_description" style="@style/res_2131952561_uikit_textview"/>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/group_invite_friends_sheet_item.xml b/app/src/main/res/layout/group_invite_friends_sheet_item.xml
index 9df2949832..8efb820fc0 100644
--- a/app/src/main/res/layout/group_invite_friends_sheet_item.xml
+++ b/app/src/main/res/layout/group_invite_friends_sheet_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingTop="8dp" android:paddingBottom="8dp" android:clipChildren="false" style="@style/res_2131952589_uikit_viewgroup_constraintlayout">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/friends_list_item_avatar" android:layout_width="34dp" android:layout_height="34dp" android:layout_marginTop="2dp" android:importantForAccessibility="no" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951681_avatar_standard"/>
-    <TextView android:textColor="?attr/primary_100" android:id="@+id/friends_list_item_name" android:layout_width="0dp" android:text="@string/sample_user_name" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_selected_checkbox" app:layout_constraintStart_toEndOf="@+id/friends_list_item_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952562_uikit_textview_bold"/>
+    <TextView android:textColor="?attr/colorInteractiveActive" android:id="@+id/friends_list_item_name" android:layout_width="0dp" android:text="@string/sample_user_name" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_selected_checkbox" app:layout_constraintStart_toEndOf="@+id/friends_list_item_avatar" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952568_uikit_textview_large"/>
     <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/user_selected_checkbox" android:saveEnabled="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" android:buttonTint="?attr/colorCompoundButton" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/premium_upsell_dialog.xml b/app/src/main/res/layout/multi_value_prop_premium_upsell_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/premium_upsell_dialog.xml
rename to app/src/main/res/layout/multi_value_prop_premium_upsell_dialog.xml
diff --git a/app/src/main/res/layout/premium_sticker_pack_upsell_tier_1_dialog.xml b/app/src/main/res/layout/premium_sticker_pack_upsell_tier_1_dialog.xml
deleted file mode 100644
index a08c9e96d1..0000000000
--- a/app/src/main/res/layout/premium_sticker_pack_upsell_tier_1_dialog.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView style="@style/res_2131952608_uikit_viewgroup_scrollview">
-    <RelativeLayout style="@style/res_2131952600_uikit_viewgroup_page">
-        <ImageView android:id="@+id/premium_sticker_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="12dp" android:src="@drawable/img_premium_stickers_upsell" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_sticker_upsell_description" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952561_uikit_textview"/>
-            <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-                <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-                    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/premium_sticker_upsell_perk_free_pack" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_sticker_icon_20dp" app:drawableTint="#fed648" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                    <View android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952423_uikit_divider_thick"/>
-                    <TextView android:id="@+id/premium_sticker_upsell_perk_boost_discount" android:layout_width="match_parent" android:text="@string/sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                    <View android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952423_uikit_divider_thick"/>
-                    <TextView android:layout_width="match_parent" android:text="@string/premium_upsell_feature_stream" app:drawableStartCompat="@drawable/ic_nitro_perk_stream_24dp" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                    <View android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952423_uikit_divider_thick"/>
-                    <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_1_upsell_perk_premium_subscription" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-            <LinearLayout android:layout_marginBottom="32dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-                <com.google.android.material.button.MaterialButton android:id="@+id/premium_sticker_upsell_upgrade" android:layout_marginBottom="16dp" android:text="@string/premium_upsell_upgrade" android:backgroundTint="@color/status_green_600" style="@style/res_2131952415_uikit_dialog_button"/>
-                <TextView android:id="@+id/premium_sticker_upsell_continue" android:text="@string/_continue" style="@style/res_2131952419_uikit_dialog_textview_dismiss"/>
-            </LinearLayout>
-        </LinearLayout>
-    </RelativeLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/premium_sticker_pack_upsell_tier_2_dialog.xml b/app/src/main/res/layout/premium_sticker_pack_upsell_tier_2_dialog.xml
deleted file mode 100644
index cc56042fd4..0000000000
--- a/app/src/main/res/layout/premium_sticker_pack_upsell_tier_2_dialog.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView style="@style/res_2131952608_uikit_viewgroup_scrollview">
-    <RelativeLayout style="@style/res_2131952600_uikit_viewgroup_page">
-        <ImageView android:id="@+id/premium_sticker_upsell_close" android:padding="16dp" android:src="@drawable/ic_close_white_18dp" android:layout_alignParentTop="true" android:contentDescription="@string/close_window" android:layout_alignParentEnd="true" style="@style/res_2131952449_uikit_imageview_clickable"/>
-        <LinearLayout android:layout_marginLeft="24dp" android:layout_marginRight="24dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-            <ImageView android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginTop="32dp" android:layout_marginBottom="12dp" android:src="@drawable/img_premium_stickers_upsell" android:importantForAccessibility="no" style="@style/res_2131952448_uikit_imageview"/>
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/premium_sticker_upsell_description" android:layout_marginBottom="16dp" android:lineSpacingMultiplier="1" style="@style/res_2131952561_uikit_textview"/>
-            <androidx.cardview.widget.CardView android:background="@color/transparent" android:layout_marginBottom="16dp" app:cardCornerRadius="8dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-                <LinearLayout android:background="?attr/colorBackgroundSecondary" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" android:paddingBottom="8dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-                    <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/premium_sticker_upsell_perk_sticker_discount" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_sticker_icon_20dp" app:drawableTint="#aec7ff" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                    <View android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952423_uikit_divider_thick"/>
-                    <TextView android:id="@+id/premium_sticker_upsell_perk_free_pack" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_sticker_icon_20dp" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                    <View android:id="@+id/premium_sticker_upsell_perk_free_pack_divider" android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952423_uikit_divider_thick"/>
-                    <TextView android:id="@+id/premium_sticker_upsell_perk_boost_discount" android:layout_width="match_parent" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                    <View android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952423_uikit_divider_thick"/>
-                    <TextView android:layout_width="match_parent" android:text="@string/sticker_premium_tier_2_upsell_perk_premium_subscription" app:drawableStartCompat="@drawable/ic_emoji_blue_24dp" app:drawableTint="#fed648" style="@style/res_2131952576_uikit_textview_perk_small"/>
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-            <LinearLayout android:layout_marginBottom="32dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
-                <com.google.android.material.button.MaterialButton android:id="@+id/premium_sticker_upsell_upgrade" android:layout_marginBottom="16dp" android:text="@string/premium_upsell_upgrade" android:backgroundTint="@color/status_green_600" style="@style/res_2131952415_uikit_dialog_button"/>
-                <TextView android:id="@+id/premium_sticker_upsell_continue" android:text="@string/_continue" style="@style/res_2131952419_uikit_dialog_textview_dismiss"/>
-            </LinearLayout>
-        </LinearLayout>
-    </RelativeLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml b/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml
new file mode 100644
index 0000000000..f884066212
--- /dev/null
+++ b/app/src/main/res/layout/single_value_prop_premium_upsell_dialog.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:maxWidth="312dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+    <androidx.constraintlayout.widget.ConstraintLayout app:layout_constraintBottom_toTopOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+        <View android:id="@+id/transparent_space" android:layout_width="match_parent" android:layout_height="64dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <View android:id="@+id/content_background" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/transparent_space"/>
+        <ImageView android:layout_gravity="center_horizontal" android:id="@+id/value_prop_image" android:layout_width="224dp" android:layout_height="154dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" app:layout_constraintBottom_toTopOf="@+id/upsell_header_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorInteractiveActive" android:id="@+id/upsell_header_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="24dp" android:fontFamily="@font/ginto_medium" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/upsell_body_text" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/value_prop_image" style="@style/res_2131952561_uikit_textview"/>
+        <TextView android:id="@+id/upsell_body_text" android:paddingLeft="20dp" android:paddingRight="20dp" android:layout_marginTop="4dp" android:layout_marginBottom="24dp" android:textAlignment="center" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/upsell_header_text" style="@style/res_2131952561_uikit_textview"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    <LinearLayout android:id="@+id/button_container" style="@style/res_2131952416_uikit_dialog_buttoncontainer">
+        <com.google.android.material.button.MaterialButton android:textColor="?attr/colorHeaderPrimary" android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952469_uikit_material_button_transparent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/get_premium_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_settings_get" android:layout_marginStart="8dp" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952459_uikit_material_button_green_fit"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/sticker_category_item_guild.xml b/app/src/main/res/layout/sticker_category_item_guild.xml
new file mode 100644
index 0000000000..6240860574
--- /dev/null
+++ b/app/src/main/res/layout/sticker_category_item_guild.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/ExpressionPickerCategoryItem">
+    <com.discord.widgets.chat.input.emoji.GuildIcon android:layout_gravity="center" android:id="@+id/sticker_category_item_guild_icon" android:layout_width="24dp" android:layout_height="24dp" android:scaleType="fitCenter" app:placeholderImage="?attr/theme_expression_picker_item_placeholder" app:roundAsCircle="true"/>
+    <include android:id="@+id/overline" layout="@layout/expression_picker_category_selection_overline_view"/>
+</FrameLayout>
diff --git a/app/src/main/res/layout/user_profile_header_view.xml b/app/src/main/res/layout/user_profile_header_view.xml
index eb007d7d16..78de62bbfe 100644
--- a/app/src/main/res/layout/user_profile_header_view.xml
+++ b/app/src/main/res/layout/user_profile_header_view.xml
@@ -4,7 +4,13 @@
     <androidx.cardview.widget.CardView android:id="@+id/beta_tag" android:padding="6dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:foreground="?attr/bg_pressed_highlight" android:layout_marginStart="16dp" app:cardBackgroundColor="?attr/color_brand" app:cardCornerRadius="12dp" app:cardElevation="0dp" app:layout_constraintStart_toStartOf="@+id/banner" app:layout_constraintTop_toTopOf="@+id/banner">
         <TextView android:textSize="14dp" android:textColor="@color/white" android:layout_marginLeft="6dp" android:layout_marginRight="6dp" android:text="@string/beta" android:textAllCaps="true" style="@style/res_2131952562_uikit_textview_bold"/>
     </androidx.cardview.widget.CardView>
+    <androidx.cardview.widget.CardView android:id="@+id/banner_edit" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="24dp" android:layout_height="24dp" android:layout_marginTop="12dp" android:foreground="?attr/bg_pressed_highlight" android:layout_marginEnd="16dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="12dp" app:contentPadding="4dp" app:layout_constraintEnd_toEndOf="@+id/banner" app:layout_constraintTop_toTopOf="@+id/banner">
+        <ImageView android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_edit_24dp" android:scaleType="fitCenter" android:contentDescription="@string/user_settings_change_banner_a11y_label" app:tint="?attr/colorInteractiveNormal"/>
+    </androidx.cardview.widget.CardView>
     <com.discord.views.user.UserAvatarPresenceView android:layout_gravity="center" android:id="@+id/large_avatar" android:clipChildren="false" android:layout_width="@dimen/avatar_wrap_size_xxlarge" android:layout_height="@dimen/avatar_wrap_size_xxlarge" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="@+id/banner" app:layout_constraintStart_toStartOf="@+id/banner" app:layout_constraintTop_toBottomOf="@+id/banner" app:user_avatar_background_color="?attr/colorBackgroundTertiary" app:user_avatar_cutout_space="4dp"/>
+    <androidx.cardview.widget.CardView android:id="@+id/avatar_edit" android:visibility="gone" android:layout_width="24dp" android:layout_height="24dp" android:foreground="?attr/bg_pressed_highlight" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="12dp" app:contentPadding="4dp" app:layout_constraintEnd_toEndOf="@+id/large_avatar" app:layout_constraintTop_toTopOf="@+id/large_avatar">
+        <ImageView android:layout_width="16dp" android:layout_height="16dp" android:src="@drawable/ic_edit_24dp" android:scaleType="fitCenter" android:contentDescription="@string/user_settings_change_avatar_a11y_label" app:tint="?attr/colorInteractiveNormal"/>
+    </androidx.cardview.widget.CardView>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/large_avatar_barrier" android:layout_width="match_parent" android:layout_height="0dp" app:barrierDirection="3" app:constraint_referenced_ids="large_avatar"/>
     <LinearLayout android:id="@+id/user_profile_header_name_wrap" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/large_avatar_barrier" app:layout_goneMarginEnd="16dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
         <com.discord.views.UsernameView android:id="@+id/user_profile_header_primary_name" android:layout_width="wrap_content" android:layout_height="wrap_content" app:username_line_spacing_multiplier="1" app:username_singleline="false" app:username_text_appearance="@style/res_2131952532_uikit_textappearance_bold" app:username_text_size="@dimen/uikit_textsize_xxlarge"/>
diff --git a/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml b/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml
index 613d1fbf1a..9a00ac5172 100644
--- a/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml
+++ b/app/src/main/res/layout/view_gift_outbound_promo_list_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout android:padding="16dp" android:layout_width="match_parent" android:layout_height="match_parent">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/giftPromoImage" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="4dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0"/>
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/giftPromoImage" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginTop="4dp" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:roundedCornerRadius="4dp"/>
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/giftPromoTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@+id/giftPromoButton" app:layout_constraintStart_toEndOf="@+id/giftPromoImage" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952577_uikit_textview_semibold"/>
         <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/giftPromoDescription" android:layout_width="0dp" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="@+id/giftPromoTitle" app:layout_constraintStart_toStartOf="@+id/giftPromoTitle" app:layout_constraintTop_toBottomOf="@+id/giftPromoTitle" style="@style/res_2131952572_uikit_textview_medium"/>
         <TextView android:id="@+id/giftPromoMoreDetails" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/more_details" app:layout_constraintEnd_toEndOf="@+id/giftPromoTitle" app:layout_constraintStart_toStartOf="@+id/giftPromoTitle" app:layout_constraintTop_toBottomOf="@+id/giftPromoDescription" style="@style/res_2131952570_uikit_textview_link"/>
-        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/giftPromoButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/promotion_card_action_claim" android:paddingStart="12dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952456_uikit_material_button"/>
+        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/giftPromoButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/promotion_card_action_claim" android:insetTop="0dp" android:insetBottom="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952456_uikit_material_button"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/view_mobile_reports_bottom_button.xml b/app/src/main/res/layout/view_mobile_reports_bottom_button.xml
index f034e218ae..0a0116d3fa 100644
--- a/app/src/main/res/layout/view_mobile_reports_bottom_button.xml
+++ b/app/src/main/res/layout/view_mobile_reports_bottom_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
     <View android:background="?attr/colorBackgroundModifierAccent" android:layout_height="1dp" android:layout_marginBottom="16dp" style="@style/res_2131952422_uikit_divider"/>
-    <TextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/res_2131952579_uikit_textview_subtext"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:id="@+id/report_node_bottom_button_description" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" android:textAlignment="center" style="@style/res_2131952579_uikit_textview_subtext"/>
     <com.discord.views.LoadingButton android:id="@+id/report_node_bottom_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:elevation="0dp" style="@style/res_2131952456_uikit_material_button"/>
     <com.google.android.material.button.MaterialButton android:id="@+id/report_node_bottom_button_cancel" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:text="@string/cancel" android:elevation="0dp" style="@style/res_2131952469_uikit_material_button_transparent"/>
     <TextView android:textColor="@color/status_red" android:id="@+id/report_node_bottom_button_error_text" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" android:textAlignment="center" style="@style/res_2131952579_uikit_textview_subtext"/>
diff --git a/app/src/main/res/layout/view_premium_settings_perks.xml b/app/src/main/res/layout/view_premium_settings_perks.xml
index b3b9ead0db..6aa954cb0c 100644
--- a/app/src/main/res/layout/view_premium_settings_perks.xml
+++ b/app/src/main/res/layout/view_premium_settings_perks.xml
@@ -11,5 +11,5 @@
     <TextView android:text="@string/premium_chat_perks_premium_guild_subscription" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/res_2131952575_uikit_textview_perk"/>
     <TextView android:id="@+id/premium_perks_max_guilds" android:visibility="gone" android:text="@string/premium_chat_perks_max_guilds" app:drawableStartCompat="@drawable/ic_increased_max_guilds_24dp" style="@style/res_2131952575_uikit_textview_perk"/>
     <TextView android:id="@+id/premium_perks_max_message_length" android:visibility="gone" android:text="@string/premium_chat_perks_max_message_length" app:drawableStartCompat="@drawable/ic_increased_message_length_24dp" style="@style/res_2131952575_uikit_textview_perk"/>
-    <TextView android:id="@+id/premium_perks_stickers" android:visibility="gone" android:text="@string/premium_chat_perks_custom_stickers" app:drawableStartCompat="@drawable/ic_sticker_icon_20dp" style="@style/res_2131952575_uikit_textview_perk"/>
+    <TextView android:id="@+id/premium_perks_stickers" android:visibility="gone" android:text="@string/premium_chat_perks_custom_stickers" app:drawableStartCompat="@drawable/ic_sticker_icon_24dp" style="@style/res_2131952575_uikit_textview_perk"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_server_discovery_header.xml b/app/src/main/res/layout/view_server_discovery_header.xml
new file mode 100644
index 0000000000..584bdbe768
--- /dev/null
+++ b/app/src/main/res/layout/view_server_discovery_header.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" android:animateLayoutChanges="true">
+    <ImageView android:id="@+id/server_discovery_header_image" android:layout_width="0dp" android:src="@drawable/bg_server_discovery_header" android:scaleType="centerCrop" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952448_uikit_imageview"/>
+    <TextView android:id="@+id/server_discovery_header_title" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_header_description" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintTop_toTopOf="@+id/server_discovery_header_image" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952563_uikit_textview_h1"/>
+    <TextView android:gravity="center" android:id="@+id/server_discovery_header_description" android:layout_width="0dp" android:layout_marginTop="4dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_header_search_layout" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintTop_toBottomOf="@+id/server_discovery_header_title" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952572_uikit_textview_medium"/>
+    <FrameLayout android:id="@+id/server_discovery_header_search_layout" android:background="@drawable/rounded_rectangle_4dp_radius" android:padding="8dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:layout_marginStart="24dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toBottomOf="@+id/server_discovery_header_image" app:layout_constraintEnd_toEndOf="@+id/server_discovery_header_image" app:layout_constraintStart_toStartOf="@+id/server_discovery_header_image" app:layout_constraintVertical_bias="1">
+        <TextView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/directory_search_placeholder" style="@style/res_2131952572_uikit_textview_medium"/>
+        <ImageView android:layout_gravity="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_grey_24dp" android:importantForAccessibility="no"/>
+    </FrameLayout>
+</merge>
diff --git a/app/src/main/res/layout/view_server_discovery_item.xml b/app/src/main/res/layout/view_server_discovery_item.xml
new file mode 100644
index 0000000000..30b3c35827
--- /dev/null
+++ b/app/src/main/res/layout/view_server_discovery_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/colorBackgroundPrimary" android:padding="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" android:animateLayoutChanges="true">
+    <ImageView android:id="@+id/server_discovery_item_image" android:background="@drawable/rounded_rectangle_4dp_radius" android:layout_width="40dp" android:layout_height="40dp" android:src="@drawable/bg_server_discovery_header" android:scaleType="centerCrop" android:importantForAccessibility="no" android:layout_marginEnd="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toStartOf="@+id/server_discovery_item_barrier" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_bias="0" style="@style/res_2131952448_uikit_imageview"/>
+    <androidx.constraintlayout.widget.Barrier android:id="@+id/server_discovery_item_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="6" app:constraint_referenced_ids="server_discovery_item_image"/>
+    <TextView android:id="@+id/server_discovery_item_title" android:layout_width="0dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_description" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952563_uikit_textview_h1"/>
+    <TextView android:id="@+id/server_discovery_item_description" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_count_container" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/server_discovery_item_title" style="@style/res_2131952572_uikit_textview_medium"/>
+    <include android:id="@+id/server_discovery_item_count_container" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" app:layout_constraintBottom_toTopOf="@+id/server_discovery_item_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/server_discovery_item_description" layout="@layout/view_server_member_count"/>
+    <com.google.android.material.button.MaterialButton android:id="@+id/server_discovery_item_button" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/join" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toEndOf="@+id/server_discovery_item_barrier" app:layout_constraintTop_toBottomOf="@+id/server_discovery_item_count_container" style="@style/res_2131952458_uikit_material_button_green"/>
+</merge>
diff --git a/app/src/main/res/layout/view_server_member_count.xml b/app/src/main/res/layout/view_server_member_count.xml
new file mode 100644
index 0000000000..e524de1294
--- /dev/null
+++ b/app/src/main/res/layout/view_server_member_count.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:layout_width="match_parent" android:layout_marginTop="4dp" android:minWidth="100dp" android:minHeight="16dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+    <ImageView android:id="@+id/item_invite_online_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_circle_green" android:contentDescription="@string/instant_invite_guild_members_online" android:layout_marginEnd="4dp" style="@style/res_2131952448_uikit_imageview"/>
+    <TextView android:id="@+id/item_invite_online_text" android:singleLine="true" android:layout_marginEnd="8dp" style="@style/res_2131952398_uikit_chat_embed_subtext"/>
+    <ImageView android:id="@+id/item_invite_total_member_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_grey_user_icon" android:contentDescription="@string/instant_invite_guild_members_total" android:layout_marginEnd="4dp" style="@style/res_2131952448_uikit_imageview"/>
+    <TextView android:id="@+id/item_invite_total_member_text" android:singleLine="true" style="@style/res_2131952398_uikit_chat_embed_subtext"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_auth_phone_verify.xml b/app/src/main/res/layout/widget_auth_phone_verify.xml
index 0c1bafbf35..17317a013c 100644
--- a/app/src/main/res/layout/widget_auth_phone_verify.xml
+++ b/app/src/main/res/layout/widget_auth_phone_verify.xml
@@ -11,6 +11,11 @@
                 <TextView android:id="@+id/auth_phone_verify_action_separator" android:padding="4dp" android:visibility="gone" android:text="•" style="@style/res_2131952572_uikit_textview_medium"/>
                 <TextView android:id="@+id/auth_phone_verify_call" android:padding="4dp" android:visibility="gone" android:text="@string/call_me_instead" style="@style/res_2131952570_uikit_textview_link"/>
             </LinearLayout>
+            <LinearLayout android:gravity="bottom" android:orientation="vertical" android:paddingBottom="12dp" android:layout_width="match_parent" android:layout_height="match_parent">
+                <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                    <TextView android:id="@+id/auth_phone_bailout" android:padding="4dp" android:visibility="gone" android:text="@string/verify_by_phone_bail" style="@style/res_2131952570_uikit_textview_link"/>
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952421_uikit_dimmerview"/>
diff --git a/app/src/main/res/layout/widget_chat_input.xml b/app/src/main/res/layout/widget_chat_input.xml
index dfb91e6234..18c8dc3fb5 100644
--- a/app/src/main/res/layout/widget_chat_input.xml
+++ b/app/src/main/res/layout/widget_chat_input.xml
@@ -11,7 +11,7 @@
         <FrameLayout android:background="?attr/colorBackgroundSecondary" android:layout_width="match_parent" android:layout_height="wrap_content">
             <TextView android:textColor="?attr/colorTextNormal" android:id="@+id/chat_input_emoji_matching_header" android:visibility="gone" android:layout_marginLeft="12dp" android:layout_marginTop="8dp" android:layout_marginRight="12dp" android:layout_marginBottom="8dp" style="@style/res_2131952561_uikit_textview"/>
         </FrameLayout>
-        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_mentions_recycler" android:background="?attr/colorBackgroundSecondary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+        <androidx.recyclerview.widget.RecyclerView android:id="@+id/chat_input_mentions_recycler" android:background="?attr/colorBackgroundSecondary" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
         <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@+id/chat_input_categories_recycler" android:background="?attr/colorBackgroundTertiary" android:paddingLeft="8dp" android:paddingRight="8dp" android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/expression_picker_category_bar_height"/>
         <include android:id="@+id/application_commands_root" android:visibility="gone" layout="@layout/widget_chat_input_application_commands"/>
         <RelativeLayout android:id="@+id/chat_input_context_bar" android:background="?attr/colorBackgroundSecondary" android:visibility="gone" android:layout_width="match_parent" android:layout_height="40dp">
diff --git a/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml b/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml
index d8b0ece238..24b9158d8f 100644
--- a/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml
+++ b/app/src/main/res/layout/widget_chat_input_autocomplete_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/AutocompleteItemContainer">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_input_item_avatar" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951681_avatar_standard"/>
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/chat_input_item_avatar" android:visibility="gone" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131951681_avatar_standard"/>
     <com.discord.views.StatusView android:id="@+id/chat_input_item_status" android:layout_width="8dp" android:layout_height="8dp" android:translationX="1.5dp" android:translationY="1.5dp" app:layout_constraintBottom_toBottomOf="@+id/chat_input_item_avatar" app:layout_constraintEnd_toEndOf="@+id/chat_input_item_avatar" app:sv_background_color="?attr/colorPrimary" app:sv_border_width="1dp" app:sv_show_mobile="false"/>
     <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center" android:id="@+id/chat_input_item_emoji" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_marginStart="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" style="@style/res_2131952561_uikit_textview"/>
     <androidx.constraintlayout.widget.Barrier android:id="@+id/chat_input_icon_barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="6" app:constraint_referenced_ids="chat_input_item_avatar, chat_input_item_emoji" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintTop_toTopOf="0"/>
diff --git a/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml b/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml
index 23134b2118..5cdba66553 100644
--- a/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml
+++ b/app/src/main/res/layout/widget_chat_input_sticker_suggestions.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_vertical" android:background="@drawable/drawable_bg_corners_4dp" android:visibility="gone" android:layout_width="wrap_content" android:backgroundTint="?attr/colorBackgroundFloating" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="center_vertical" android:background="@drawable/drawable_bg_corners_4dp" android:visibility="gone" android:layout_width="wrap_content" android:elevation="4dp" android:backgroundTint="?attr/colorBackgroundFloating" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
     <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_1" android:paddingLeft="4dp" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginRight="8dp"/>
     <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_2" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginRight="8dp"/>
     <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_3" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginRight="8dp"/>
-    <FrameLayout android:id="@+id/chat_input_suggested_sticker_4_container" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="wrap_content" android:layout_height="wrap_content">
-        <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_4" android:layout_width="48dp" android:layout_height="48dp"/>
-        <ImageView android:layout_gravity="bottom|right|center_vertical|center_horizontal|center" android:id="@+id/chat_input_suggested_sticker_4_lock" android:background="@drawable/drawable_circle_white" android:padding="4dp" android:layout_width="16dp" android:layout_height="16dp" android:src="?attr/ic_lock" android:contentDescription="@string/close" android:backgroundTint="?attr/colorBackgroundAccent" app:tint="?attr/colorInteractiveNormal"/>
-    </FrameLayout>
+    <com.discord.views.sticker.StickerView android:id="@+id/chat_input_suggested_sticker_4" android:paddingTop="4dp" android:paddingBottom="4dp" android:layout_width="48dp" android:layout_height="48dp"/>
     <ImageView android:id="@+id/chat_input_suggested_sticker_cancel" android:background="@drawable/ripple_brighten" android:paddingLeft="4dp" android:paddingRight="4dp" android:layout_width="36dp" android:layout_height="56dp" android:src="@drawable/ic_close_24dp" android:scaleType="center" android:contentDescription="@string/close"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml b/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml
index 94f094fd41..d9640cb3ad 100644
--- a/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml
+++ b/app/src/main/res/layout/widget_chat_list_adapter_item_invite.xml
@@ -5,12 +5,7 @@
     <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@+id/item_invite_image_text" android:layout_width="42dp" android:layout_height="42dp" android:layout_marginTop="8dp" android:maxLines="1" android:singleLine="true" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintLeft_toLeftOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" style="@style/res_2131952561_uikit_textview"/>
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/primary_100" android:id="@+id/item_invite_name" android:layout_width="0dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintLeft_toRightOf="@+id/item_invite_image" app:layout_constraintRight_toRightOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/item_invite_header" style="@style/res_2131952571_uikit_textview_marquee"/>
     <TextView android:gravity="center_vertical" android:id="@+id/item_invite_channel_name" android:visibility="gone" android:layout_width="0dp" android:layout_marginTop="4dp" android:drawablePadding="4dp" app:drawableStartCompat="@drawable/ic_channel_voice_16dp" app:drawableTint="?attr/colorChannelDefault" app:layout_constraintEnd_toEndOf="@+id/item_invite_name" app:layout_constraintStart_toStartOf="@+id/item_invite_name" app:layout_constraintTop_toBottomOf="@+id/item_invite_name" style="@style/res_2131952398_uikit_chat_embed_subtext"/>
-    <LinearLayout android:gravity="center_vertical" android:id="@+id/item_invite_member_container" android:layout_width="0dp" android:layout_marginTop="4dp" android:minWidth="100dp" android:minHeight="16dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/item_invite_channel_name" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
-        <ImageView android:id="@+id/item_invite_online_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_circle_green" android:contentDescription="@string/instant_invite_guild_members_online" android:layout_marginEnd="4dp" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:id="@+id/item_invite_online_text" android:singleLine="true" android:layout_marginEnd="8dp" style="@style/res_2131952398_uikit_chat_embed_subtext"/>
-        <ImageView android:id="@+id/item_invite_total_member_dot" android:visibility="gone" android:layout_width="4dp" android:layout_height="4dp" android:src="@drawable/drawable_grey_user_icon" android:contentDescription="@string/instant_invite_guild_members_total" android:layout_marginEnd="4dp" style="@style/res_2131952448_uikit_imageview"/>
-        <TextView android:id="@+id/item_invite_total_member_text" android:singleLine="true" style="@style/res_2131952398_uikit_chat_embed_subtext"/>
-    </LinearLayout>
+    <include android:id="@+id/item_invite_member_container" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginStart="8dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toEndOf="@+id/item_invite_image" app:layout_constraintTop_toBottomOf="@+id/item_invite_channel_name" layout="@layout/view_server_member_count"/>
     <FrameLayout android:paddingBottom="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginRight="8dp" android:layout_marginBottom="8dp" android:text="@string/join_guild" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/item_invite_image">
         <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_joined_button" android:visibility="gone" android:text="@string/joined_guild" style="@style/res_2131952467_uikit_material_button_secondary_outline"/>
         <com.google.android.material.button.MaterialButton android:id="@+id/item_invite_join_button" android:text="@string/join_guild" style="@style/res_2131952458_uikit_material_button_green"/>
diff --git a/app/src/main/res/layout/widget_claim_outbound_promo.xml b/app/src/main/res/layout/widget_claim_outbound_promo.xml
new file mode 100644
index 0000000000..8f3d9071db
--- /dev/null
+++ b/app/src/main/res/layout/widget_claim_outbound_promo.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952601_uikit_viewgroup_page_linearlayout">
+    <com.discord.app.AppViewFlipper android:id="@+id/claimPromoFlipper" android:paddingTop="32dp" android:paddingBottom="32dp" android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="24dp" android:paddingEnd="24dp">
+        <FrameLayout android:id="@+id/claimPromoLoading" android:layout_width="match_parent" android:layout_height="match_parent">
+            <ProgressBar android:layout_gravity="center" android:padding="32dp" android:layout_width="match_parent" android:layout_height="wrap_content"/>
+        </FrameLayout>
+        <androidx.appcompat.widget.LinearLayoutCompat android:gravity="center_horizontal" android:orientation="vertical" android:id="@+id/claimPromoSuccess" android:layout_width="match_parent" android:layout_height="wrap_content">
+            <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:importantForAccessibility="no" app:srcCompat="@drawable/claim_promo_success"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/outbound_promotion_redemption_modal_title" style="@style/res_2131952562_uikit_textview_bold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_horizontal" android:id="@+id/claimPromoBody" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp" android:lineSpacingMultiplier="1" style="@style/res_2131952572_uikit_textview_medium"/>
+            <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="32dp" app:cardBackgroundColor="?attr/colorBackgroundSecondary" app:cardCornerRadius="8dp" app:cardElevation="0dp" app:contentPadding="12dp">
+                <androidx.appcompat.widget.LinearLayoutCompat android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/redemption_code" style="@style/res_2131952577_uikit_textview_semibold"/>
+                    <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/claimPromoCodeBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp">
+                        <FrameLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1">
+                            <HorizontalScrollView android:scrollbars="none" android:layout_width="match_parent" android:layout_height="wrap_content">
+                                <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@+id/claimPromoCode" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:textIsSelectable="true" android:paddingStart="8dp" android:paddingEnd="8dp" style="@style/res_2131952572_uikit_textview_medium"/>
+                            </HorizontalScrollView>
+                            <ImageView android:layout_gravity="end" android:layout_width="16dp" android:layout_height="match_parent" android:importantForAccessibility="no" app:srcCompat="@drawable/gradient_transparent_colorbackgroundsecondary"/>
+                        </FrameLayout>
+                        <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/claimPromoCopyButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:minWidth="0dp" android:minHeight="0dp" android:text="@string/copy" android:insetTop="0dp" android:insetBottom="0dp" android:paddingStart="12dp" android:paddingEnd="12dp" android:layout_marginEnd="8dp" style="@style/res_2131952456_uikit_material_button"/>
+                    </LinearLayout>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorTextMuted" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/outbound_promotion_code_confirmation_email" style="@style/res_2131952572_uikit_textview_medium"/>
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </com.google.android.material.card.MaterialCardView>
+            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoRedeemButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/redeem" style="@style/res_2131952456_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoMaybeLaterButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/maybe_later" style="@style/res_2131952469_uikit_material_button_transparent"/>
+        </androidx.appcompat.widget.LinearLayoutCompat>
+        <androidx.appcompat.widget.LinearLayoutCompat android:gravity="center_horizontal" android:orientation="vertical" android:id="@+id/claimPromoFailure" android:layout_width="match_parent" android:layout_height="wrap_content">
+            <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:importantForAccessibility="no" app:srcCompat="@drawable/img_premium_subscription_header_error"/>
+            <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/generic_error_title" style="@style/res_2131952562_uikit_textview_bold"/>
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="32dp" android:text="@string/generic_error_body" android:lineSpacingMultiplier="1" style="@style/res_2131952572_uikit_textview_medium"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/claimPromoFailureCloseButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952456_uikit_material_button"/>
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </com.discord.app.AppViewFlipper>
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/widget_edit_role.xml b/app/src/main/res/layout/widget_edit_role.xml
index 03ffea5f3a..5ff977e055 100644
--- a/app/src/main/res/layout/widget_edit_role.xml
+++ b/app/src/main/res/layout/widget_edit_role.xml
@@ -28,7 +28,7 @@
             <com.discord.views.CheckedSetting android:id="@+id/role_settings_read_messages" app:cs_subtext="@string/role_permissions_view_channel_description" app:cs_text="@string/role_permissions_view_channel" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
             <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_channels" app:cs_subtext="@string/role_permissions_manage_channels_description" app:cs_text="@string/manage_channels" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
             <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_roles" app:cs_subtext="@string/role_permissions_manage_roles_description" app:cs_text="@string/manage_roles" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
-            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_emojis" app:cs_subtext="@string/role_permissions_manage_emojis_description" app:cs_text="@string/manage_emojis" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
+            <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_emojis" app:cs_subtext="@string/role_permissions_manage_emojis_and_stickers_description" app:cs_text="@string/manage_emojis_and_stickers" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
             <com.discord.views.CheckedSetting android:id="@+id/role_settings_view_audit_log" app:cs_subtext="@string/role_permissions_view_audit_log_description" app:cs_text="@string/view_audit_log" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
             <com.discord.views.CheckedSetting android:id="@+id/role_settings_view_guild_analytics" app:cs_subtext="@string/role_permissions_view_guild_analytics_description" app:cs_text="@string/view_guild_analytics" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
             <com.discord.views.CheckedSetting android:id="@+id/role_settings_manage_webhooks" app:cs_subtext="@string/role_permissions_manage_webhooks_description" app:cs_text="@string/manage_webhooks" style="@style/res_2131952404_uikit_checkedsetting_themed"/>
diff --git a/app/src/main/res/layout/widget_guild_sticker_sheet.xml b/app/src/main/res/layout/widget_guild_sticker_sheet.xml
new file mode 100644
index 0000000000..7add079bd1
--- /dev/null
+++ b/app/src/main/res/layout/widget_guild_sticker_sheet.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.discord.app.AppViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/guild_sticker_sheet_flipper" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952600_uikit_viewgroup_page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+            <com.discord.views.sticker.StickerView android:id="@+id/guild_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
+            <LinearLayout style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952562_uikit_textview_bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_description" style="@style/res_2131952561_uikit_textview"/>
+            </LinearLayout>
+        </LinearLayout>
+        <FrameLayout android:id="@+id/guild_sticker_sheet_button_container" android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp">
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_join_btn" android:text="@string/sticker_popout_join_server" style="@style/res_2131952456_uikit_material_button"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/guild_sticker_sheet_premium_btn" android:text="@string/emoji_popout_premium_cta" app:icon="@drawable/ic_nitro_badge_white" app:iconGravity="2" app:iconSize="@dimen/uikit_textsize_large" app:iconTint="@color/white" style="@style/res_2131952458_uikit_material_button_green"/>
+        </FrameLayout>
+        <LinearLayout android:id="@+id/guild_sticker_sheet_guild_container" android:visibility="gone" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="16dp" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+            <View android:id="@+id/divider" android:background="?attr/colorBackgroundAccent" style="@style/res_2131952422_uikit_divider"/>
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_header" android:layout_marginTop="16dp" android:text="@string/sticker_popout_unjoined_guild_emoji_description" android:textAllCaps="true" style="@style/res_2131952562_uikit_textview_bold"/>
+            <LinearLayout android:layout_marginTop="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+                <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/guild_sticker_sheet_guild_icon_wrapper" android:layout_width="32dp" android:layout_height="32dp" android:layout_marginEnd="16dp">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/guild_sticker_sheet_guild_icon" android:layout_width="match_parent" android:layout_height="match_parent" android:adjustViewBounds="true" app:actualImageScaleType="2" app:roundWithOverlayColor="?attr/colorBackgroundPrimary" app:roundedCornerRadius="@dimen/guild_icon_radius" style="@style/res_2131952448_uikit_imageview"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderPrimary" android:gravity="center" android:id="@+id/guild_sticker_sheet_guild_icon_text" android:layout_width="match_parent" android:layout_height="match_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/res_2131952561_uikit_textview"/>
+                </FrameLayout>
+                <LinearLayout style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/guild_sticker_sheet_guild_name" android:drawablePadding="8dp" style="@style/res_2131952562_uikit_textview_bold"/>
+                    <TextView android:textColor="?attr/colorHeaderSecondary" android:id="@+id/guild_sticker_sheet_guild_info" android:layout_marginTop="4dp" style="@style/res_2131952561_uikit_textview"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+    <ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp"/>
+</com.discord.app.AppViewFlipper>
diff --git a/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml b/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml
new file mode 100644
index 0000000000..45ee04fa3f
--- /dev/null
+++ b/app/src/main/res/layout/widget_guilds_list_item_hub_verification.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_gravity="center" android:layout_width="match_parent" android:layout_marginBottom="@dimen/guild_item_spacing" style="@style/res_2131952435_uikit_guildslisticon">
+    <com.facebook.drawee.view.SimpleDraweeView android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="match_parent" android:layout_height="match_parent" app:placeholderImage="?attr/colorBackgroundSecondary" app:roundAsCircle="true"/>
+    <ImageView android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_hub_24dp" android:contentDescription="@string/create_server_button_cta_mobile" app:tint="@color/status_green_600"/>
+    <com.discord.tooltips.SparkleView android:layout_gravity="center" android:id="@+id/guild_item_sparkle" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+</FrameLayout>
diff --git a/app/src/main/res/layout/widget_home.xml b/app/src/main/res/layout/widget_home.xml
index ebff1824a0..0e96ed1cde 100644
--- a/app/src/main/res/layout/widget_home.xml
+++ b/app/src/main/res/layout/widget_home.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_home_container" style="@style/res_2131952600_uikit_viewgroup_page">
-    <com.discord.widgets.home.HomePanelsLayout android:id="@+id/overlapping_panels" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="match_parent" app:maxSidePanelNonFullScreenWidth="360dp">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/widget_home_container" android:background="?attr/colorBackgroundTertiary" style="@style/res_2131952600_uikit_viewgroup_page">
+    <ImageView android:id="@+id/peek_transition_bitmap" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent"/>
+    <com.discord.widgets.home.HomePanelsLayout android:id="@+id/overlapping_panels" android:layout_width="match_parent" android:layout_height="match_parent" app:maxSidePanelNonFullScreenWidth="360dp">
         <include android:id="@+id/panel_left" layout="@layout/widget_home_panel_left"/>
         <include android:id="@+id/panel_center" layout="@layout/widget_home_panel_center"/>
         <include android:id="@+id/panel_right" layout="@layout/widget_home_panel_right"/>
diff --git a/app/src/main/res/layout/widget_outbound_promo_terms_sheet.xml b/app/src/main/res/layout/widget_outbound_promo_terms.xml
similarity index 69%
rename from app/src/main/res/layout/widget_outbound_promo_terms_sheet.xml
rename to app/src/main/res/layout/widget_outbound_promo_terms.xml
index 6caa434b8f..8eddec703b 100644
--- a/app/src/main/res/layout/widget_outbound_promo_terms_sheet.xml
+++ b/app/src/main/res/layout/widget_outbound_promo_terms.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:background="?attr/colorBackgroundPrimary" android:layout_width="match_parent" android:layout_height="wrap_content">
     <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:background="?attr/colorBackgroundTertiary" android:layout_width="match_parent" android:layout_height="wrap_content">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="18dp" android:text="Terms &amp; Conditions" android:layout_weight="1" style="@style/res_2131952577_uikit_textview_semibold"/>
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="18dp" android:text="@string/terms_and_conditions" android:layout_weight="1" style="@style/res_2131952577_uikit_textview_semibold"/>
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/color_brand" android:id="@+id/promoTermsClose" android:background="?attr/selectableItemBackgroundBorderless" android:padding="18dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/res_2131952577_uikit_textview_semibold"/>
     </LinearLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/promoTermsContent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" style="@style/res_2131952561_uikit_textview"/>
+    <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/promoTermsContent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" style="@style/res_2131952561_uikit_textview"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_settings.xml b/app/src/main/res/layout/widget_settings.xml
index ef26e9a419..2fc100dd33 100644
--- a/app/src/main/res/layout/widget_settings.xml
+++ b/app/src/main/res/layout/widget_settings.xml
@@ -15,6 +15,7 @@
                 <TextView android:id="@+id/settings_presence_text" android:background="@color/transparent" android:layout_width="wrap_content" android:layout_marginEnd="8dp" style="@style/res_2131952490_uikit_settings_item"/>
             </LinearLayout>
             <TextView android:id="@+id/account" android:text="@string/user_settings_my_account" app:drawableStartCompat="@drawable/ic_my_account_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
+            <TextView android:id="@+id/profile" android:text="@string/user_settings_user_profile" app:drawableStartCompat="@drawable/ic_edit_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
             <TextView android:id="@+id/privacy" android:text="@string/privacy_and_safety" app:drawableStartCompat="@drawable/ic_privacy_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
             <TextView android:id="@+id/authorized_apps" android:text="@string/authorized_apps" app:drawableStartCompat="@drawable/ic_authed_apps_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
             <TextView android:id="@+id/connections" android:text="@string/connections" app:drawableStartCompat="@drawable/ic_phonelink_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
@@ -25,7 +26,10 @@
                 <TextView android:id="@+id/nitro_header" android:text="@string/premium_settings" style="@style/res_2131952494_uikit_settings_item_header"/>
                 <TextView android:textColor="?attr/colorControlBrandForeground" android:id="@+id/settings_nitro" app:drawableStartCompat="@drawable/ic_nitro_rep" app:drawableTint="?attr/colorControlBrandForeground" style="@style/res_2131952495_uikit_settings_item_icon"/>
                 <TextView android:id="@+id/nitro_boosting" android:text="@string/premium_guild_subscription_title" app:drawableStartCompat="@drawable/ic_settings_boost_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
-                <TextView android:id="@+id/nitro_gifting" android:text="@string/premium_gifting_title" app:drawableStartCompat="@drawable/ic_gift_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
+                <LinearLayout android:gravity="center_vertical" android:orientation="horizontal" android:id="@+id/nitroGiftingContainer" android:background="?attr/selectableItemBackground" android:layout_width="match_parent" android:layout_height="wrap_content">
+                    <TextView android:id="@+id/nitro_gifting" android:background="@null" android:layout_width="0dp" android:text="@string/premium_gifting_title" android:layout_weight="1" app:drawableStartCompat="@drawable/ic_gift_24dp" app:drawableTint="?attr/colorInteractiveNormal" style="@style/res_2131952495_uikit_settings_item_icon"/>
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@+id/nitroGiftingBadge" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" android:paddingStart="4dp" android:paddingEnd="4dp" android:layout_marginEnd="20dp" style="@style/res_2131952577_uikit_textview_semibold"/>
+                </LinearLayout>
             </LinearLayout>
             <View style="@style/res_2131952489_uikit_settings_divider"/>
             <TextView android:id="@+id/app_settings_header" android:text="@string/app_settings" style="@style/res_2131952494_uikit_settings_item_header"/>
diff --git a/app/src/main/res/layout/widget_settings_account.xml b/app/src/main/res/layout/widget_settings_account.xml
index 00e4a53686..4f78419c4e 100644
--- a/app/src/main/res/layout/widget_settings_account.xml
+++ b/app/src/main/res/layout/widget_settings_account.xml
@@ -9,7 +9,7 @@
                 <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@+id/settings_account_verification_title" android:text="@string/verify_your_email" android:layout_centerInParent="true" android:layout_toStartOf="@+id/settings_account_verification_button" style="@style/res_2131952577_uikit_textview_semibold"/>
                 <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@+id/settings_account_verification_button" android:layout_width="wrap_content" android:minHeight="0dp" android:text="@string/verify_account" android:layout_centerVertical="true" android:layout_marginStart="8dp" android:layout_alignParentEnd="true" style="@style/res_2131952472_uikit_material_button_white_outline"/>
             </RelativeLayout>
-            <RelativeLayout android:background="?attr/primary_630" android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/res_2131952606_uikit_viewgroup_relativelayout">
+            <RelativeLayout android:id="@+id/avatar_edit_section" android:background="?attr/primary_630" android:paddingTop="16dp" android:paddingBottom="16dp" style="@style/res_2131952606_uikit_viewgroup_relativelayout">
                 <LinearLayout android:gravity="center_vertical" android:id="@+id/settings_account_avatar_wrap" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
                     <FrameLayout android:id="@+id/settings_account_avatar_container" android:background="?attr/selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/change_avatar">
                         <com.facebook.drawee.view.SimpleDraweeView android:id="@+id/settings_account_avatar" app:roundWithOverlayColor="?attr/primary_630" style="@style/res_2131951678_avatar_large_extraaccount"/>
@@ -21,7 +21,7 @@
                     </LinearLayout>
                 </LinearLayout>
             </RelativeLayout>
-            <View style="@style/res_2131952422_uikit_divider"/>
+            <View android:id="@+id/avatar_edit_section_bottom_divider" style="@style/res_2131952422_uikit_divider"/>
             <TextView android:id="@+id/settings_account_information_header" android:text="@string/form_label_account_information" style="@style/res_2131952494_uikit_settings_item_header"/>
             <LinearLayout android:id="@+id/settings_account_information_data_wrap" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
                 <LinearLayout android:id="@+id/settings_account_tag_container" android:background="?attr/selectableItemBackground" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
diff --git a/app/src/main/res/layout/widget_settings_user_profile.xml b/app/src/main/res/layout/widget_settings_user_profile.xml
new file mode 100644
index 0000000000..483b9e3453
--- /dev/null
+++ b/app/src/main/res/layout/widget_settings_user_profile.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.discord.widgets.settings.profile.TouchInterceptingCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/res_2131952600_uikit_viewgroup_page">
+    <com.google.android.material.appbar.AppBarLayout style="@style/res_2131951638_apptheme_appbarlayout_flat">
+        <androidx.appcompat.widget.Toolbar style="@style/res_2131951666_apptheme_toolbar"/>
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.core.widget.NestedScrollView android:id="@+id/settings_profile_scroll" style="@style/res_2131952598_uikit_viewgroup_nestedscrollview_appbarscrollingviewbehavior">
+        <LinearLayout android:id="@+id/profile_container" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+            <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@+id/user_settings_profile_header_view" android:layout_width="match_parent" android:layout_height="wrap_content" app:user_profile_header_background_color="?attr/colorBackgroundSecondary"/>
+            <TextView android:id="@+id/bio_header" android:text="@string/user_popout_about_me" style="@style/res_2131952618_userprofile_section_header"/>
+            <androidx.cardview.widget.CardView android:id="@+id/bio_preview_card" app:cardBackgroundColor="?attr/colorBackgroundSecondary" style="@style/res_2131952617_userprofile_section_card">
+                <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?attr/colorHeaderSecondary" android:id="@+id/bio_preview_text" android:padding="16dp" android:maxLines="6" android:lineSpacingMultiplier="1.25" style="@style/res_2131952561_uikit_textview"/>
+            </androidx.cardview.widget.CardView>
+            <androidx.cardview.widget.CardView android:id="@+id/bio_editor_card" app:cardBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:strokeColor="?attr/colorBackgroundTertiary" app:strokeWidth="1dp" style="@style/res_2131952617_userprofile_section_card">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/bio_editor_text_input_field_wrap" android:layout_marginBottom="8dp" android:hint="@string/user_settings_about_me_hint" app:boxBackgroundColor="?attr/colorBackgroundSecondaryAlt" app:counterEnabled="true" app:counterMaxLength="@integer/custom_profiles_bio_max_length" style="@style/res_2131952543_uikit_textinputlayout">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/bio_editor_text_input_field" android:maxLines="6" android:maxLength="@integer/custom_profiles_bio_max_length" android:imeOptions="actionDone" style="@style/res_2131952545_uikit_textinputlayout_edittext_multiline"/>
+                </com.google.android.material.textfield.TextInputLayout>
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/save_fab" android:contentDescription="@string/save" style="@style/res_2131952121_settings_floatingactionbutton_save"/>
+    <com.discord.utilities.dimmer.DimmerView android:id="@+id/dimmer_view" style="@style/res_2131952421_uikit_dimmerview"/>
+</com.discord.widgets.settings.profile.TouchInterceptingCoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_start_stage.xml b/app/src/main/res/layout/widget_start_stage.xml
new file mode 100644
index 0000000000..0138e87bb0
--- /dev/null
+++ b/app/src/main/res/layout/widget_start_stage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" style="@style/res_2131952600_uikit_viewgroup_page">
+    <ImageView android:id="@+id/start_stage_icon" android:layout_width="0dp" android:layout_height="wrap_content" android:src="@drawable/ic_mentions_empty" android:adjustViewBounds="true" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@+id/start_stage_title" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" app:layout_constraintWidth_percent="0.33"/>
+    <TextView android:textAppearance="@style/res_2131952532_uikit_textappearance_bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/start_stage_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/stage_channel_start_title" app:layout_constraintBottom_toTopOf="@+id/start_stage_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_icon"/>
+    <TextView android:id="@+id/start_stage_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/stage_channel_start_subtitle" app:layout_constraintBottom_toTopOf="@+id/start_stage_start_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_title" style="@style/res_2131952579_uikit_textview_subtext"/>
+    <include android:id="@+id/start_stage_start_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginTop="16dp" android:layout_marginRight="16dp" app:layout_constraintBottom_toBottomOf="0" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/start_stage_subtitle" layout="@layout/stub_call_fullscreen_start_stage_event_button"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/widget_text_channel_settings.xml b/app/src/main/res/layout/widget_text_channel_settings.xml
index b162aa4544..9aa1e12b13 100644
--- a/app/src/main/res/layout/widget_text_channel_settings.xml
+++ b/app/src/main/res/layout/widget_text_channel_settings.xml
@@ -42,6 +42,16 @@
                 <SeekBar android:id="@+id/channel_settings_slow_mode_cooldown_slider" android:progress="0" style="@style/res_2131952486_uikit_seekbar"/>
                 <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_slowmode" style="@style/res_2131952579_uikit_textview_subtext"/>
             </LinearLayout>
+            <LinearLayout android:id="@+id/channel_settings_section_default_auto_archive_duration" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                <View android:layout_marginTop="24dp" style="@style/res_2131952489_uikit_settings_divider"/>
+                <TextView android:text="@string/auto_archive" style="@style/res_2131952494_uikit_settings_item_header"/>
+                <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/res_2131952587_uikit_viewgroup">
+                    <TextView android:id="@+id/channel_settings_default_auto_archive_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_thread_auto_archive_section_label" android:layout_alignParentStart="true" android:labelFor="@+id/channel_settings_default_auto_archive_duration_slider" style="@style/res_2131952561_uikit_textview"/>
+                    <TextView android:layout_gravity="end" android:id="@+id/channel_settings_default_auto_archive_duration_label" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_alignBaseline="@+id/channel_settings_default_auto_archive_label" android:layout_alignParentEnd="true" style="@style/res_2131952579_uikit_textview_subtext"/>
+                </RelativeLayout>
+                <SeekBar android:id="@+id/channel_settings_default_auto_archive_duration_slider" android:progress="0" style="@style/res_2131952486_uikit_seekbar"/>
+                <TextView android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:text="@string/form_help_default_auto_archive_duration" style="@style/res_2131952579_uikit_textview_subtext"/>
+            </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/channel_settings_save" android:visibility="gone" android:src="@drawable/icon_save" android:contentDescription="@string/save_changes" style="@style/res_2131952120_settings_floatingactionbutton"/>
diff --git a/app/src/main/res/layout/widget_unknown_sticker_sheet.xml b/app/src/main/res/layout/widget_unknown_sticker_sheet.xml
new file mode 100644
index 0000000000..7ef4cba58c
--- /dev/null
+++ b/app/src/main/res/layout/widget_unknown_sticker_sheet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/res_2131952600_uikit_viewgroup_page">
+    <LinearLayout android:background="?attr/colorBackgroundPrimary" style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+        <LinearLayout android:layout_marginLeft="14dp" android:layout_marginTop="16dp" android:layout_marginRight="14dp" android:layout_marginBottom="16dp" style="@style/res_2131952594_uikit_viewgroup_linearlayout_horizontal">
+            <com.discord.views.sticker.StickerView android:id="@+id/unknown_sticker_sheet_sticker" android:layout_width="48dp" android:layout_height="48dp" android:layout_marginEnd="16dp"/>
+            <LinearLayout style="@style/res_2131952592_uikit_viewgroup_linearlayout">
+                <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?attr/colorHeaderPrimary" android:id="@+id/unknown_sticker_sheet_sticker_name" android:layout_marginBottom="4dp" style="@style/res_2131952562_uikit_textview_bold"/>
+                <TextView android:textColor="?attr/colorHeaderSecondary" android:text="@string/sticker_popout_premium_unjoined_private_guild_description" style="@style/res_2131952561_uikit_textview"/>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml
index 72ddeb15d9..9aeca16ae9 100644
--- a/app/src/main/res/values-ar-rXB/plurals.xml
+++ b/app/src/main/res/values-ar-rXB/plurals.xml
@@ -596,14 +596,6 @@
         <item quantity="one">‏‮1‬‏ ‏‮week‬‏</item>
         <item quantity="other">‏‮{minimumGuildAge}‬‏ ‏‮weeks‬‏</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">‏‮name‬‏</item>
-        <item quantity="other">‏‮names‬‏</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">‏‮name‬‏</item>
-        <item quantity="other">‏‮names‬‏</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">‏‮Pending‬‏ ‏‮Application‬‏</item>
         <item quantity="other">‏‮{count}‬‏ ‏‮Pending‬‏ ‏‮Applications‬‏</item>
@@ -708,6 +700,10 @@
         <item quantity="one">‏‮{#}‬‏ ‏‮mention,‬‏</item>
         <item quantity="other">‏‮{#}‬‏ ‏‮mentions,‬‏</item>
     </plurals>
+    <plurals name="hub_email_connection_invite_header_count">
+        <item quantity="one">‏‮{count}‬‏ ‏‮other‬‏ ‏‮member‬‏</item>
+        <item quantity="other">‏‮{count}‬‏ ‏‮other‬‏ ‏‮members‬‏</item>
+    </plurals>
     <plurals name="humanize_duration_days_time">
         <item quantity="one">‏‮1‬‏ ‏‮day‬‏</item>
         <item quantity="other">‏‮{#}‬‏ ‏‮days‬‏</item>
diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml
index 6b63f8e05a..43de562326 100644
--- a/app/src/main/res/values-ar-rXB/strings.xml
+++ b/app/src/main/res/values-ar-rXB/strings.xml
@@ -1531,7 +1531,6 @@
     <string name="contact_sync_we_found_your_friends_title">‏‮We‬‏ ‏‮found‬‏ ‏‮your‬‏ ‏‮friends!‬‏</string>
     <string name="contacts_invite_placeholder">‏‮hey‬‏ ‏‮come‬‏ ‏‮check‬‏ ‏‮out‬‏ ‏‮Discord‬‏ ‏‮with‬‏ ‏‮me‬‏ ‏‮!!‬‏‏‮{link}‬‏‏‮!!‬‏</string>
     <string name="content_matching">‏‮!!‬‏‏‮{command}‬‏‏‮!!‬‏ ‏‮content‬‏ ‏‮matching‬‏ ‏‮**!!‬‏‏‮{query}‬‏‏‮!!**‬‏</string>
-    <string name="context_menu_hint">‏‮Right‬‏ ‏‮click‬‏ ‏‮user‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮actions‬‏</string>
     <string name="continue_in_browser">‏‮Continue‬‏ ‏‮in‬‏ ‏‮browser‬‏</string>
     <string name="continue_to_webapp">‏‮Continue‬‏ ‏‮to‬‏ ‏‮Discord‬‏</string>
     <string name="control_volume">‏‮Control‬‏ ‏‮volume‬‏</string>
@@ -2120,6 +2119,7 @@
     <string name="edit_message">‏‮Edit‬‏ ‏‮Message‬‏</string>
     <string name="edit_note">‏‮Edit‬‏ ‏‮Note‬‏</string>
     <string name="edit_overview">‏‮Edit‬‏ ‏‮Overview‬‏</string>
+    <string name="edit_profile">‏‮Edit‬‏ ‏‮Profile‬‏</string>
     <string name="edit_roles">‏‮Edit‬‏ ‏‮Roles‬‏</string>
     <string name="edit_stage_channel_subtitle">‏‮Change‬‏ ‏‮the‬‏ ‏‮topic‬‏ ‏‮or‬‏ ‏‮privacy‬‏ ‏‮settings‬‏</string>
     <string name="edit_stage_channel_title">‏‮Edit‬‏ ‏‮Stage‬‏</string>
@@ -2391,6 +2391,7 @@
     <string name="explicit_end_stage_confirm_mobile">‏‮Exit‬‏ ‏‮and‬‏ ‏‮end‬‏ ‏‮the‬‏ ‏‮Stage‬‏</string>
     <string name="explicit_end_stage_subtitle">‏‮A‬‏ ‏‮Stage‬‏ ‏‮with‬‏ ‏‮no‬‏ ‏‮speakers‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮end‬‏ ‏‮after‬‏ ‏‮a‬‏ ‏‮few‬‏ ‏‮minutes.‬‏</string>
     <string name="explicit_end_stage_title">‏‮Do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮also‬‏ ‏‮end‬‏ ‏‮the‬‏ ‏‮Stage?‬‏</string>
+    <string name="explicit_end_ticketed_guild_event_subtitle">‏‮You’re‬‏ ‏‮the‬‏ ‏‮last‬‏ ‏‮event‬‏ ‏‮manager‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮Stage.‬‏</string>
     <string name="exposed_dropdown_menu_content_description">‏‮Show‬‏ ‏‮dropdown‬‏ ‏‮menu‬‏</string>
     <string name="expression_picker_emoji">‏‮Emoji‬‏</string>
     <string name="expression_picker_gif">‏‮GIFs‬‏</string>
@@ -2868,8 +2869,11 @@
     <string name="general_permissions">‏‮General‬‏ ‏‮Permissions‬‏</string>
     <string name="generate_a_new_link">‏‮Generate‬‏ ‏‮a‬‏ ‏‮New‬‏ ‏‮Link‬‏</string>
     <string name="generic_actions_menu_label">‏‮Actions‬‏</string>
+    <string name="generic_error_body">‏‮Seems‬‏ ‏‮like‬‏ ‏‮something\'s‬‏ ‏‮gone‬‏ ‏‮wrong.‬‏ ‏‮Sorry‬‏ ‏‮about‬‏ ‏‮that.‬‏</string>
+    <string name="generic_error_title">‏‮Oh‬‏ ‏‮no!‬‏</string>
     <string name="get_mobile_app">‏‮Get‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮app‬‏</string>
     <string name="get_mobile_app_cta">‏‮Get‬‏ ‏‮the‬‏ ‏‮App‬‏</string>
+    <string name="get_mobile_app_skip">‏‮Skip‬‏ ‏‮for‬‏ ‏‮now‬‏</string>
     <string name="get_mobile_app_subtitle">‏‮Discord‬‏ ‏‮isn\'t‬‏ ‏‮supported‬‏ ‏‮on‬‏ ‏‮mobile‬‏ ‏‮web‬‏ ‏‮browsers.‬‏ ‏‮Join‬‏ ‏‮over‬‏ ‏‮100‬‏ ‏‮million‬‏ ‏‮people‬‏ ‏‮who‬‏ ‏‮use‬‏ ‏‮Discord‬‏ ‏‮to‬‏ ‏‮talk‬‏ ‏‮with‬‏ ‏‮communities‬‏ ‏‮and‬‏ ‏‮friends.‬‏</string>
     <string name="get_started">‏‮Get‬‏ ‏‮Started‬‏</string>
     <string name="gif">‏‮GIF‬‏</string>
@@ -3143,7 +3147,10 @@
     <string name="guild_discovery_search_results_header">‏‮{count}‬‏ ‏‮for‬‏ ‏‮{query}‬‏</string>
     <string name="guild_discovery_tooltip">‏‮Explore‬‏ ‏‮Public‬‏ ‏‮Servers‬‏</string>
     <string name="guild_discovery_view_button">‏‮View‬‏</string>
+    <string name="guild_event_add_moderators_label">‏‮Add‬‏ ‏‮Moderators‬‏</string>
+    <string name="guild_event_moderators_description">‏‮Stage‬‏ ‏‮moderators‬‏ ‏‮are‬‏ ‏‮Speakers‬‏ ‏‮who‬‏ ‏‮can‬‏ ‏‮add‬‏ ‏‮and‬‏ ‏‮remove‬‏ ‏‮other‬‏ ‏‮Speakers.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮end‬‏ ‏‮the‬‏ ‏‮Stage.‬‏ ‏‮Stage‬‏ ‏‮moderators‬‏ ‏‮don\'t‬‏ ‏‮have‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮mods‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮server.‬‏</string>
     <string name="guild_event_ticket_billing_invoice_total_tax_inclusive">‏‮**Total**‬‏ ‏‮(Tax‬‏ ‏‮Included)‬‏</string>
+    <string name="guild_events">‏‮Events‬‏</string>
     <string name="guild_folder_color">‏‮Folder‬‏ ‏‮Color‬‏</string>
     <string name="guild_folder_name">‏‮Folder‬‏ ‏‮Name‬‏</string>
     <string name="guild_folder_tooltip_a11y_label">‏‮!!‬‏‏‮{folderName}‬‏‏‮!!,‬‏ ‏‮folder‬‏ ‏‮{mentions}‬‏</string>
@@ -3518,8 +3525,7 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">‏‮Servers‬‏ ‏‮in‬‏ ‏‮Discovery‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮{minimumGuildAge}‬‏ ‏‮old.‬‏ ‏‮Please‬‏ ‏‮check‬‏ ‏‮back‬‏ ‏‮on‬‏ ‏‮{passDate}‬‏‏‮.‬‏</string>
     <string name="guild_settings_discovery_checklist_age_failing">‏‮Server‬‏ ‏‮Too‬‏ ‏‮Young‬‏</string>
     <string name="guild_settings_discovery_checklist_bad_standing">‏‮Your‬‏ ‏‮server‬‏ ‏‮**$[does‬‏ ‏‮not](doesNotHook)**‬‏ ‏‮meet‬‏ ‏‮all‬‏ ‏‮the‬‏ ‏‮requirements‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮in‬‏ ‏‮Server‬‏ ‏‮Discovery.‬‏</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">‏‮You‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮category‬‏ ‏‮{numCategories}‬‏‏‮:‬‏ ‏‮$[‬‏‏‮{categoryNames}‬‏‏‮](categoryHook)‬‏</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">‏‮You‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮channel‬‏ ‏‮{numChannels}‬‏‏‮:‬‏ ‏‮$[‬‏‏‮{channelNames}‬‏‏‮](channelHook)‬‏</string>
+    <string name="guild_settings_discovery_checklist_change_channel_names_2">‏‮You‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮$[one‬‏ ‏‮or‬‏ ‏‮more‬‏ ‏‮channel‬‏ ‏‮names](channelHook)‬‏</string>
     <string name="guild_settings_discovery_checklist_change_description">‏‮You‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮$[description](descriptionHook)‬‏</string>
     <string name="guild_settings_discovery_checklist_change_name">‏‮You‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮$[server‬‏ ‏‮name](nameHook)‬‏</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">‏‮Increase‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮weekly‬‏ ‏‮communicators‬‏</string>
@@ -3797,8 +3803,9 @@
     <string name="guild_settings_stickers">‏‮Stickers‬‏</string>
     <string name="guild_settings_stickers_boost_server">‏‮Boost‬‏ ‏‮Server‬‏</string>
     <string name="guild_settings_stickers_upload_heading">‏‮Upload‬‏ ‏‮Requirements‬‏</string>
-    <string name="guild_settings_stickers_upload_requirements">‏‮Before‬‏ ‏‮uploading‬‏ ‏‮your‬‏ ‏‮sticker‬‏ ‏‮file,‬‏ ‏‮maker‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮meet‬‏ ‏‮the‬‏ ‏‮following‬‏ ‏‮requirements‬‏</string>
-    <string name="guild_settings_stickers_upload_requirements_1">‏‮File‬‏ ‏‮type:‬‏ ‏‮PNG,‬‏ ‏‮APNG,‬‏ ‏‮and‬‏ ‏‮Lottie‬‏ ‏‮(Read‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮file‬‏ ‏‮types‬‏ ‏‮here)‬‏</string>
+    <string name="guild_settings_stickers_upload_help">‏‮For‬‏ ‏‮more‬‏ ‏‮information‬‏ ‏‮about‬‏ ‏‮file‬‏ ‏‮types,‬‏ ‏‮and‬‏ ‏‮tips‬‏ ‏‮on‬‏ ‏‮uploading‬‏ ‏‮custom‬‏ ‏‮stickers,‬‏ ‏‮check‬‏ ‏‮out‬‏ ‏‮this‬‏ ‏‮[Help‬‏ ‏‮Center‬‏ ‏‮article](‬‏‏‮{articleUrl}‬‏‏‮).‬‏</string>
+    <string name="guild_settings_stickers_upload_requirements">‏‮Before‬‏ ‏‮uploading‬‏ ‏‮your‬‏ ‏‮sticker‬‏ ‏‮file,‬‏ ‏‮make‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮meet‬‏ ‏‮the‬‏ ‏‮following‬‏ ‏‮requirements‬‏</string>
+    <string name="guild_settings_stickers_upload_requirements_1">‏‮File‬‏ ‏‮type:‬‏ ‏‮PNG,‬‏ ‏‮APNG,‬‏ ‏‮and‬‏ ‏‮Lottie‬‏</string>
     <string name="guild_settings_stickers_upload_requirements_2">‏‮File‬‏ ‏‮size:‬‏ ‏‮{fileSize}‬‏</string>
     <string name="guild_settings_stickers_upload_requirements_3">‏‮Dimensions:‬‏ ‏‮320‬‏ ‏‮x‬‏ ‏‮320‬‏</string>
     <string name="guild_settings_stickers_upload_requirements_4">‏‮Emoji‬‏ ‏‮Tag:‬‏ ‏‮You‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮required‬‏ ‏‮to‬‏ ‏‮select‬‏ ‏‮a‬‏ ‏‮unicode‬‏ ‏‮emoji‬‏ ‏‮that‬‏ ‏‮matches‬‏ ‏‮your‬‏ ‏‮sticker‬‏ ‏‮the‬‏ ‏‮closest.‬‏</string>
@@ -3886,13 +3893,17 @@
     <string name="guild_template_default_server_name_local_communities">‏‮{username}‬‏‏‮\'s‬‏ ‏‮Community‬‏</string>
     <string name="guild_template_default_server_name_study_groups">‏‮{username}‬‏‏‮\'s‬‏ ‏‮Study‬‏ ‏‮Group‬‏</string>
     <string name="guild_template_embed_view_in_app">‏‮Available‬‏ ‏‮in‬‏ ‏‮App‬‏</string>
+    <string name="guild_template_header_class">‏‮Class‬‏</string>
     <string name="guild_template_header_clubs">‏‮Clubs‬‏</string>
     <string name="guild_template_header_community">‏‮Local‬‏ ‏‮Community‬‏</string>
     <string name="guild_template_header_create">‏‮Create‬‏ ‏‮My‬‏ ‏‮Own‬‏</string>
     <string name="guild_template_header_creator">‏‮Artists‬‏ ‏‮&amp;‬‏ ‏‮Creators‬‏</string>
+    <string name="guild_template_header_dorm">‏‮Dorm‬‏</string>
     <string name="guild_template_header_friend">‏‮Friends‬‏</string>
     <string name="guild_template_header_gaming">‏‮Gaming‬‏</string>
+    <string name="guild_template_header_major">‏‮Subject‬‏ ‏‮or‬‏ ‏‮Major‬‏</string>
     <string name="guild_template_header_school_club">‏‮School‬‏ ‏‮Club‬‏</string>
+    <string name="guild_template_header_social">‏‮Social‬‏</string>
     <string name="guild_template_header_study">‏‮Study‬‏ ‏‮Group‬‏</string>
     <string name="guild_template_invalid_subtitle">‏‮You‬‏ ‏‮can‬‏ ‏‮ask‬‏ ‏‮the‬‏ ‏‮owner‬‏ ‏‮to‬‏ ‏‮make‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮one‬‏ ‏‮though‬‏</string>
     <string name="guild_template_invalid_title">‏‮Invalid‬‏ ‏‮server‬‏ ‏‮template‬‏</string>
@@ -3927,19 +3938,25 @@
     <string name="guild_template_modal_title_local_communities">‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮community‬‏</string>
     <string name="guild_template_modal_title_study_groups">‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮study‬‏ ‏‮group‬‏</string>
     <string name="guild_template_name_announcements">‏‮announcements‬‏</string>
+    <string name="guild_template_name_assignments">‏‮assignments‬‏</string>
+    <string name="guild_template_name_category_chat">‏‮Chat‬‏</string>
+    <string name="guild_template_name_category_info">‏‮Info‬‏</string>
     <string name="guild_template_name_category_information">‏‮Information‬‏</string>
     <string name="guild_template_name_category_text">‏‮Text‬‏ ‏‮Channels‬‏</string>
     <string name="guild_template_name_category_voice">‏‮Voice‬‏ ‏‮Channels‬‏</string>
     <string name="guild_template_name_clips_and_highlights">‏‮clips-and-highlights‬‏</string>
+    <string name="guild_template_name_dorm_news">‏‮dorm-news‬‏</string>
     <string name="guild_template_name_events">‏‮events‬‏</string>
     <string name="guild_template_name_game">‏‮games‬‏</string>
     <string name="guild_template_name_game_new">‏‮new-games‬‏</string>
     <string name="guild_template_name_game_room">‏‮game-room-‬‏‏‮{number}‬‏</string>
     <string name="guild_template_name_general">‏‮general‬‏</string>
     <string name="guild_template_name_giveaways">‏‮giveaways‬‏</string>
+    <string name="guild_template_name_help_questions">‏‮help-and-questions‬‏</string>
     <string name="guild_template_name_homework">‏‮homework‬‏</string>
     <string name="guild_template_name_homework_help">‏‮homework-help‬‏</string>
     <string name="guild_template_name_ideas_and_feedback">‏‮ideas-and-feedback‬‏</string>
+    <string name="guild_template_name_introductions">‏‮introductions‬‏</string>
     <string name="guild_template_name_meeting_plans">‏‮meeting-plans‬‏</string>
     <string name="guild_template_name_meetups">‏‮meetups‬‏</string>
     <string name="guild_template_name_memes">‏‮memes‬‏</string>
@@ -3953,6 +3970,7 @@
     <string name="guild_template_name_social">‏‮social-posts‬‏</string>
     <string name="guild_template_name_strategy">‏‮strategy-discussion‬‏</string>
     <string name="guild_template_name_voice_community_hangout">‏‮Community‬‏ ‏‮Hangout‬‏</string>
+    <string name="guild_template_name_voice_couches">‏‮Couches‬‏</string>
     <string name="guild_template_name_voice_gaming">‏‮Gaming‬‏</string>
     <string name="guild_template_name_voice_general">‏‮General‬‏</string>
     <string name="guild_template_name_voice_lobby">‏‮Lobby‬‏</string>
@@ -3960,8 +3978,10 @@
     <string name="guild_template_name_voice_meeting_room">‏‮Meeting‬‏ ‏‮Room‬‏</string>
     <string name="guild_template_name_voice_meeting_room_1">‏‮Meeting‬‏ ‏‮Room‬‏ ‏‮1‬‏</string>
     <string name="guild_template_name_voice_meeting_room_2">‏‮Meeting‬‏ ‏‮Room‬‏ ‏‮2‬‏</string>
+    <string name="guild_template_name_voice_movie_room">‏‮Movie‬‏ ‏‮Room‬‏</string>
     <string name="guild_template_name_voice_stream_room">‏‮Stream‬‏ ‏‮Room‬‏</string>
     <string name="guild_template_name_voice_study_room">‏‮Study‬‏ ‏‮Room‬‏ ‏‮{number}‬‏</string>
+    <string name="guild_template_name_voice_unnumbered_study_room">‏‮Study‬‏ ‏‮Room‬‏</string>
     <string name="guild_template_name_welcome">‏‮welcome‬‏</string>
     <string name="guild_template_name_welcome_and_rules">‏‮welcome-and-rules‬‏</string>
     <string name="guild_template_open">‏‮View‬‏ ‏‮Template‬‏</string>
@@ -4063,17 +4083,26 @@
     <string name="how_to_invite_others">‏‮Hello.‬‏ ‏‮Beep.‬‏ ‏‮Boop.‬‏ ‏‮If‬‏ ‏‮you‬‏ ‏‮wanna‬‏ ‏‮invite‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮server,‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮name‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮top‬‏ ‏‮left‬‏ ‏‮and‬‏ ‏‮select‬‏ ‏‮!!‬‏‏‮{invitePeople}‬‏‏‮!!.‬‏ ‏‮Beep!‬‏</string>
     <string name="hr">‏‮Croatian‬‏</string>
     <string name="hu">‏‮Hungarian‬‏</string>
-    <string name="hub_add_guild_description_help">‏‮The‬‏ ‏‮server‬‏ ‏‮description‬‏ ‏‮will‬‏ ‏‮appear‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮hub.‬‏ ‏‮Use‬‏ ‏‮it‬‏ ‏‮to‬‏ ‏‮help‬‏ ‏‮students‬‏ ‏‮decide‬‏ ‏‮whether‬‏ ‏‮to‬‏ ‏‮join.‬‏</string>
-    <string name="hub_add_guild_description_placeholder">‏‮Description‬‏ ‏‮of‬‏ ‏‮class,‬‏ ‏‮professor,‬‏ ‏‮and‬‏ ‏‮server‬‏ ‏‮goals‬‏ ‏‮(study‬‏ ‏‮group),‬‏ ‏‮etc.‬‏</string>
+    <string name="hub_add_guild_description_help">‏‮This‬‏ ‏‮server‬‏ ‏‮description‬‏ ‏‮will‬‏ ‏‮appear‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Hub.‬‏</string>
+    <string name="hub_add_guild_description_placeholder">‏‮What\'s‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮about?‬‏ ‏‮What‬‏ ‏‮do‬‏ ‏‮people‬‏ ‏‮do‬‏ ‏‮there?‬‏</string>
     <string name="hub_add_guild_description_title">‏‮Server‬‏ ‏‮Description‬‏</string>
+    <string name="hub_add_or_create_server_confirmation_title">‏‮Success!‬‏</string>
+    <string name="hub_add_server_confirmation_button">‏‮Got‬‏ ‏‮it!‬‏</string>
+    <string name="hub_add_server_confirmation_subtitle">‏‮Your‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮added‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!!‬‏</string>
     <string name="hub_add_server_cta">‏‮Add‬‏ ‏‮Server‬‏</string>
-    <string name="hub_choose_guild_subtitle">‏‮Choose‬‏ ‏‮a‬‏ ‏‮relevant‬‏ ‏‮server‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮list‬‏ ‏‮of‬‏ ‏‮servers‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮an‬‏ ‏‮admin‬‏ ‏‮for.‬‏ ‏‮It‬‏ ‏‮will‬‏ ‏‮still‬‏ ‏‮be‬‏ ‏‮accessible‬‏ ‏‮to‬‏ ‏‮people‬‏ ‏‮outside‬‏ ‏‮the‬‏ ‏‮hub.‬‏</string>
+    <string name="hub_choose_guild_empty">‏‮You‬‏ ‏‮are‬‏ ‏‮not‬‏ ‏‮an‬‏ ‏‮admin‬‏ ‏‮of‬‏ ‏‮any‬‏ ‏‮unlisted‬‏ ‏‮servers.‬‏</string>
+    <string name="hub_choose_guild_subtitle">‏‮Your‬‏ ‏‮server‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮discoverable‬‏ ‏‮by‬‏ ‏‮students‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮Hub.‬‏ ‏‮Only‬‏ ‏‮servers‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮admin‬‏ ‏‮permissions‬‏ ‏‮in‬‏ ‏‮are‬‏ ‏‮shown.‬‏</string>
     <string name="hub_choose_guild_title">‏‮Add‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏</string>
     <string name="hub_create_guild_cta">‏‮Create‬‏ ‏‮New‬‏ ‏‮Server‬‏</string>
-    <string name="hub_create_guild_label">‏‮Have‬‏ ‏‮an‬‏ ‏‮idea‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮server?‬‏</string>
-    <string name="hub_create_or_add_guild_subtitle">‏‮When‬‏ ‏‮you‬‏ ‏‮add‬‏ ‏‮a‬‏ ‏‮server,‬‏ ‏‮it‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮to‬‏ ‏‮other‬‏ ‏‮students‬‏ ‏‮and‬‏ ‏‮members,‬‏ ‏‮so‬‏ ‏‮make‬‏ ‏‮sure‬‏ ‏‮it\'s‬‏ ‏‮school‬‏ ‏‮appropriate.‬‏</string>
+    <string name="hub_create_guild_label">‏‮Want‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮group?‬‏</string>
+    <string name="hub_create_or_add_guild_subtitle">‏‮Your‬‏ ‏‮server‬‏ ‏‮will‬‏ ‏‮still‬‏ ‏‮be‬‏ ‏‮accessible‬‏ ‏‮to‬‏ ‏‮people‬‏ ‏‮outside‬‏ ‏‮the‬‏ ‏‮Hub.‬‏</string>
     <string name="hub_create_or_add_guild_title">‏‮Help‬‏ ‏‮grow‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏</string>
+    <string name="hub_create_server_confirmation_go">‏‮Go‬‏ ‏‮to‬‏ ‏‮Server‬‏</string>
+    <string name="hub_create_server_confirmation_stay">‏‮Back‬‏ ‏‮to‬‏ ‏‮Hub‬‏</string>
+    <string name="hub_create_server_confirmation_subtitle">‏‮Your‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮created‬‏ ‏‮and‬‏ ‏‮added‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!!‬‏</string>
     <string name="hub_customize_existing_guild_title">‏‮Help‬‏ ‏‮other‬‏ ‏‮students‬‏ ‏‮find‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏</string>
+    <string name="hub_customize_new_guild_subtitle">‏‮This‬‏ ‏‮server‬‏ ‏‮description‬‏ ‏‮will‬‏ ‏‮appear‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Hub.‬‏ ‏‮Use‬‏ ‏‮it‬‏ ‏‮to‬‏ ‏‮help‬‏ ‏‮students‬‏ ‏‮decide‬‏ ‏‮whether‬‏ ‏‮to‬‏ ‏‮join.‬‏</string>
+    <string name="hub_directory_card_joined_guild_button">‏‮Go‬‏ ‏‮to‬‏ ‏‮server‬‏</string>
     <string name="hub_directory_channel_empty_add_server">‏‮Add‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮Hub‬‏</string>
     <string name="hub_directory_channel_empty_invite">‏‮Invite‬‏ ‏‮people‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮Hub‬‏</string>
     <string name="hub_directory_channel_empty_subtitle">‏‮You\'re‬‏ ‏‮one‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮first‬‏ ‏‮people‬‏ ‏‮here!‬‏ ‏‮Let\'s‬‏ ‏‮start‬‏ ‏‮by‬‏ ‏‮adding‬‏ ‏‮some‬‏ ‏‮servers‬‏ ‏‮and‬‏ ‏‮members.‬‏</string>
@@ -4081,13 +4110,48 @@
     <string name="hub_directory_channel_title">‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏</string>
     <string name="hub_directory_search_subtitle">‏‮From‬‏ ‏‮clubs‬‏ ‏‮to‬‏ ‏‮study‬‏ ‏‮groups,‬‏ ‏‮stay‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮date‬‏ ‏‮with‬‏ ‏‮what\'s‬‏ ‏‮happening‬‏</string>
     <string name="hub_directory_search_title">‏‮Find‬‏ ‏‮your‬‏ ‏‮school-related‬‏ ‏‮servers‬‏</string>
+    <string name="hub_discord_hub">‏‮Discord‬‏ ‏‮Hub‬‏</string>
+    <string name="hub_discord_hubs">‏‮Discord‬‏ ‏‮Hubs‬‏</string>
+    <string name="hub_discovery_description">‏‮From‬‏ ‏‮clubs,‬‏ ‏‮to‬‏ ‏‮study‬‏ ‏‮groups,‬‏ ‏‮stay‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮date‬‏ ‏‮with‬‏ ‏‮what\'s‬‏ ‏‮happening.‬‏</string>
+    <string name="hub_discovery_footer_description">‏‮Hubs‬‏ ‏‮connect‬‏ ‏‮multiple‬‏ ‏‮related‬‏ ‏‮servers‬‏ ‏‮that‬‏ ‏‮are‬‏ ‏‮part‬‏ ‏‮of‬‏ ‏‮a‬‏ ‏‮broader‬‏ ‏‮community.‬‏ ‏‮Hubs‬‏ ‏‮related‬‏ ‏‮to‬‏ ‏‮education‬‏ ‏‮are‬‏ ‏‮student-run‬‏ ‏‮and‬‏ ‏‮not‬‏ ‏‮officially‬‏ ‏‮affiliated‬‏ ‏‮with‬‏ ‏‮schools.‬‏</string>
+    <string name="hub_discovery_header">‏‮Find‬‏ ‏‮Discord‬‏ ‏‮Hubs‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮schools‬‏</string>
+    <string name="hub_email_confirmation_description">‏‮Confirm‬‏ ‏‮the‬‏ ‏‮link‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮email‬‏ ‏‮to‬‏ ‏‮continue‬‏ ‏‮verification.‬‏ ‏‮This‬‏ ‏‮page‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮refresh.‬‏</string>
+    <string name="hub_email_confirmation_different_email">‏‮Try‬‏ ‏‮A‬‏ ‏‮Different‬‏ ‏‮Email‬‏</string>
+    <string name="hub_email_confirmation_header">‏‮We’ve‬‏ ‏‮sent‬‏ ‏‮a‬‏ ‏‮confirmation‬‏ ‏‮link‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{email}‬‏‏‮!!‬‏</string>
+    <string name="hub_email_confirmation_resend">‏‮Resend‬‏ ‏‮Confirmation‬‏ ‏‮Link‬‏</string>
+    <string name="hub_email_connection_add_description">‏‮You‬‏ ‏‮can‬‏ ‏‮join‬‏ ‏‮the‬‏ ‏‮hub‬‏ ‏‮of‬‏ ‏‮any‬‏ ‏‮school‬‏ ‏‮you’re‬‏ ‏‮attending.‬‏</string>
+    <string name="hub_email_connection_add_header">‏‮Attend‬‏ ‏‮multiple‬‏ ‏‮schools?‬‏</string>
+    <string name="hub_email_connection_content_button">‏‮Join‬‏ ‏‮My‬‏ ‏‮School‬‏</string>
+    <string name="hub_email_connection_content_description">‏‮Easily‬‏ ‏‮find‬‏ ‏‮student-run‬‏ ‏‮servers‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮study‬‏ ‏‮groups,‬‏ ‏‮clubs,‬‏ ‏‮sports,‬‏ ‏‮free‬‏ ‏‮food,‬‏ ‏‮and‬‏ ‏‮more.‬‏</string>
+    <string name="hub_email_connection_content_header">‏‮Are‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮current‬‏ ‏‮student?‬‏ ‏‮Join‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮school‬‏</string>
+    <string name="hub_email_connection_content_input_description">‏‮Enter‬‏ ‏‮your‬‏ ‏‮official‬‏ ‏‮school‬‏ ‏‮email‬‏ ‏‮address‬‏</string>
+    <string name="hub_email_connection_content_input_header">‏‮School‬‏ ‏‮Email‬‏</string>
+    <string name="hub_email_connection_content_input_placeholder">‏‮name@school.edu‬‏</string>
+    <string name="hub_email_connection_invite_header">‏‮Join‬‏ ‏‮{count}‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!!‬‏</string>
+    <string name="hub_email_connection_join_another">‏‮Join‬‏ ‏‮Another‬‏ ‏‮Hub‬‏</string>
+    <string name="hub_email_connection_sidebar_description">‏‮Hubs‬‏ ‏‮connect‬‏ ‏‮multiple‬‏ ‏‮related‬‏ ‏‮servers‬‏ ‏‮that‬‏ ‏‮are‬‏ ‏‮part‬‏ ‏‮of‬‏ ‏‮a‬‏ ‏‮broader‬‏ ‏‮school‬‏ ‏‮community.‬‏ ‏‮Hubs‬‏ ‏‮related‬‏ ‏‮to‬‏ ‏‮education‬‏ ‏‮are‬‏ ‏‮student-run‬‏ ‏‮and‬‏ ‏‮not‬‏ ‏‮officially‬‏ ‏‮affiliated‬‏ ‏‮with‬‏ ‏‮schools.‬‏</string>
+    <string name="hub_email_connection_sidebar_header">‏‮Discord‬‏ ‏‮Hubs‬‏</string>
     <string name="hub_entry_invite_subtitle">‏‮If‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮is‬‏ ‏‮intended‬‏ ‏‮for‬‏ ‏‮students‬‏ ‏‮only,‬‏ ‏‮just‬‏ ‏‮invite‬‏ ‏‮your‬‏ ‏‮classmates.‬‏ ‏‮They‬‏ ‏‮don\'t‬‏ ‏‮need‬‏ ‏‮a‬‏ ‏‮.edu‬‏ ‏‮address‬‏ ‏‮to‬‏ ‏‮join‬‏</string>
     <string name="hub_entry_remove">‏‮Remove‬‏ ‏‮from‬‏ ‏‮Hub‬‏</string>
-    <string name="hub_entry_remove_body">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮remove‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮directory?‬‏</string>
+    <string name="hub_entry_remove_body">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮remove‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮Hub?‬‏</string>
+    <string name="hub_entry_update">‏‮Update‬‏ ‏‮description‬‏</string>
+    <string name="hub_entry_update_description_title">‏‮Update‬‏ ‏‮description‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏</string>
+    <string name="hub_invite_another_school_link">‏‮Go‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮school?‬‏ ‏‮[Join‬‏ ‏‮here](onClick)‬‏</string>
+    <string name="hub_invite_button_title_invited">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮Hub‬‏</string>
+    <string name="hub_invite_button_title_inviter">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮Hub‬‏</string>
+    <string name="hub_real_name_cta">‏‮Let\'s‬‏ ‏‮go!‬‏</string>
+    <string name="hub_real_name_modal_form_placeholder">‏‮First‬‏ ‏‮Last‬‏</string>
+    <string name="hub_real_name_modal_form_title">‏‮Real‬‏ ‏‮Name‬‏</string>
+    <string name="hub_real_name_modal_header">‏‮Welcome‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!!‬‏</string>
+    <string name="hub_real_name_modal_subheader">‏‮Add‬‏ ‏‮your‬‏ ‏‮real‬‏ ‏‮name‬‏ ‏‮so‬‏ ‏‮people‬‏ ‏‮will‬‏ ‏‮recognize‬‏ ‏‮you.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮this‬‏ ‏‮anytime‬‏ ‏‮via‬‏ ‏‮the‬‏ ‏‮Hub‬‏ ‏‮Settings.‬‏</string>
+    <string name="hub_sidebar_add_servers">‏‮Add‬‏ ‏‮Servers‬‏</string>
+    <string name="hub_sidebar_invite_members">‏‮Invite‬‏ ‏‮Members‬‏</string>
+    <string name="hub_sidebar_join_servers">‏‮Join‬‏ ‏‮Servers‬‏</string>
+    <string name="hub_verified_discord_hub">‏‮Verified‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏</string>
     <string name="hub_waitlist_modal_form_description">‏‮Enter‬‏ ‏‮your‬‏ ‏‮official‬‏ ‏‮school‬‏ ‏‮email‬‏ ‏‮address‬‏</string>
     <string name="hub_waitlist_modal_form_placeholder">‏‮sam@college.edu‬‏</string>
     <string name="hub_waitlist_modal_form_title">‏‮School‬‏ ‏‮Email‬‏</string>
-    <string name="hub_waitlist_modal_join_header">‏‮Are‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮current‬‏ ‏‮student?‬‏ ‏‮Join‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮hub‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮school!‬‏</string>
+    <string name="hub_waitlist_modal_join_header">‏‮Are‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮current‬‏ ‏‮student?‬‏ ‏‮Join‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮school!‬‏</string>
     <string name="hub_waitlist_modal_join_subheader">‏‮Get‬‏ ‏‮notified‬‏ ‏‮when‬‏ ‏‮your‬‏ ‏‮hub‬‏ ‏‮launches‬‏ ‏‮so‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮easily‬‏ ‏‮find‬‏ ‏‮student-run‬‏ ‏‮servers‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮study‬‏ ‏‮groups‬‏ ‏‮and‬‏ ‏‮clubs.‬‏</string>
     <string name="hub_waitlist_modal_joined_header">‏‮We’ll‬‏ ‏‮let‬‏ ‏‮you‬‏ ‏‮know‬‏ ‏‮when‬‏ ‏‮your‬‏ ‏‮school‬‏ ‏‮hub‬‏ ‏‮is‬‏ ‏‮live!‬‏</string>
     <string name="humanize_duration_a_few_seconds">‏‮a‬‏ ‏‮few‬‏ ‏‮seconds‬‏</string>
@@ -4397,12 +4461,14 @@
     <string name="invite_button_streaming_subtext">‏‮in‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏</string>
     <string name="invite_button_title_invited">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮server‬‏</string>
     <string name="invite_button_title_invited_group_dm">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮group‬‏ ‏‮DM‬‏</string>
+    <string name="invite_button_title_invited_hub">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮Hub‬‏</string>
     <string name="invite_button_title_invited_invalid">‏‮You‬‏ ‏‮received‬‏ ‏‮an‬‏ ‏‮invite,‬‏ ‏‮but…‬‏</string>
     <string name="invite_button_title_invited_stream">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮watch‬‏ ‏‮a‬‏ ‏‮stream‬‏</string>
     <string name="invite_button_title_invited_to_play">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮play‬‏</string>
     <string name="invite_button_title_invited_voice_channel">‏‮You\'ve‬‏ ‏‮been‬‏ ‏‮invited‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮voice‬‏ ‏‮channel‬‏</string>
     <string name="invite_button_title_inviter">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮server‬‏</string>
     <string name="invite_button_title_inviter_group_dm">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮group‬‏ ‏‮DM‬‏</string>
+    <string name="invite_button_title_inviter_hub">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮Hub‬‏</string>
     <string name="invite_button_title_inviter_invalid">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite,‬‏ ‏‮but…‬‏</string>
     <string name="invite_button_title_inviter_stream">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮to‬‏ ‏‮watch‬‏ ‏‮a‬‏ ‏‮stream‬‏</string>
     <string name="invite_button_title_inviter_voice_channel">‏‮You‬‏ ‏‮sent‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮a‬‏ ‏‮voice‬‏ ‏‮channel‬‏</string>
@@ -4693,6 +4759,8 @@
     <string name="leave_group_dm_managed_body">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮leave?‬‏ ‏‮You‬‏ ‏‮won\'t‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮rejoin‬‏ ‏‮this‬‏ ‏‮group‬‏ ‏‮unless‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**‬‏ ‏‮adds‬‏ ‏‮you‬‏ ‏‮again.‬‏</string>
     <string name="leave_group_dm_managed_title">‏‮Leave‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮Group‬‏</string>
     <string name="leave_group_dm_title">‏‮Leave‬‏ ‏‮\'!!‬‏‏‮{name}‬‏</string>
+    <string name="leave_hub">‏‮Leave‬‏ ‏‮Hub‬‏</string>
+    <string name="leave_hub_body">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮leave‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**?‬‏ ‏‮You‬‏ ‏‮won\'t‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮rejoin‬‏ ‏‮this‬‏ ‏‮Hub‬‏ ‏‮unless‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮re-invited.‬‏</string>
     <string name="leave_server">‏‮Leave‬‏ ‏‮Server‬‏</string>
     <string name="leave_server_body">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮leave‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**?‬‏ ‏‮You‬‏ ‏‮won\'t‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮rejoin‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮unless‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮re-invited.‬‏</string>
     <string name="leave_server_body_mobile">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮leave‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!?‬‏</string>
@@ -4840,6 +4908,7 @@
     <string name="marked_as_read">‏‮Marked‬‏ ‏‮As‬‏ ‏‮Read‬‏</string>
     <string name="marketing_premium_tier_1_perk_list_omit_guild_cap">‏‮Does‬‏ ‏‮not‬‏ ‏‮include‬‏ ‏‮more‬‏ ‏‮servers‬‏</string>
     <string name="marketing_premium_tier_1_perk_list_omit_message_length">‏‮Does‬‏ ‏‮not‬‏ ‏‮include‬‏ ‏‮longer‬‏ ‏‮messages‬‏</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_profile_customization">‏‮Does‬‏ ‏‮not‬‏ ‏‮include‬‏ ‏‮profile‬‏ ‏‮banner‬‏</string>
     <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages">‏‮Does‬‏ ‏‮not‬‏ ‏‮include‬‏ ‏‮longer‬‏ ‏‮messages‬‏</string>
     <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds">‏‮Does‬‏ ‏‮not‬‏ ‏‮include‬‏ ‏‮more‬‏ ‏‮servers‬‏</string>
     <string name="marketing_refresh_premium_features_badge_heading">‏‮Rep‬‏ ‏‮Your‬‏ ‏‮Support‬‏</string>
@@ -5158,8 +5227,8 @@
     <string name="move_members_description">‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏</string>
     <string name="move_to">‏‮Move‬‏ ‏‮To‬‏</string>
     <string name="move_to_success">‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏</string>
-    <string name="res_2131891257_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
-    <string name="res_2131891258_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
+    <string name="res_2131891328_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
+    <string name="res_2131891329_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
     <string name="mtrl_badge_numberless_content_description">‏‮New‬‏ ‏‮notification‬‏</string>
     <string name="mtrl_chip_close_icon_content_description">‏‮Remove‬‏ ‏‮%1$s‬‏</string>
     <string name="mtrl_exceed_max_badge_number_content_description">‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏</string>
@@ -5397,8 +5466,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">‏‮You‬‏ ‏‮have‬‏ ‏‮{days}‬‏ ‏‮left‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮a‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮of‬‏ ‏‮Nitro‬‏</string>
     <string name="notice_premium_tier_2_trial_ending_hours">‏‮You‬‏ ‏‮have‬‏ ‏‮{hours}‬‏ ‏‮left‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮a‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮of‬‏ ‏‮Nitro‬‏</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">‏‮You‬‏ ‏‮have‬‏ ‏‮{minutes}‬‏ ‏‮left‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮a‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮of‬‏ ‏‮Nitro‬‏</string>
-    <string name="notice_premium_xbox_game_pass_promotion">‏‮Hey‬‏ ‏‮Nitro‬‏ ‏‮subscriber,‬‏ ‏‮congrats!‬‏ ‏‮You‬‏ ‏‮get‬‏ ‏‮3‬‏ ‏‮months‬‏ ‏‮of‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC,‬‏ ‏‮on‬‏ ‏‮us!‬‏</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">‏‮Claim‬‏</string>
     <string name="notice_product_feedback_survey">‏‮Would‬‏ ‏‮you‬‏ ‏‮like‬‏ ‏‮to‬‏ ‏‮participate‬‏ ‏‮in‬‏ ‏‮product‬‏ ‏‮feedback‬‏ ‏‮discussions‬‏ ‏‮with‬‏ ‏‮us?‬‏</string>
     <string name="notice_product_feedback_survey_cta">‏‮Let‬‏ ‏‮us‬‏ ‏‮know‬‏ ‏‮here!‬‏</string>
     <string name="notice_register_to_vote">‏‮Are‬‏ ‏‮you‬‏ ‏‮registered‬‏ ‏‮to‬‏ ‏‮vote?‬‏ ‏‮Check‬‏ ‏‮your‬‏ ‏‮status‬‏ ‏‮and‬‏ ‏‮register‬‏ ‏‮in‬‏ ‏‮two‬‏ ‏‮minutes.‬‏</string>
@@ -5601,8 +5668,11 @@
     <string name="outbound_promotion_card_claimed_unexpanded_body">‏‮Use‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮before‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[More‬‏ ‏‮Details](onClickDetails)‬‏</string>
     <string name="outbound_promotion_card_unclaimed_expanded_body">‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[Less‬‏ ‏‮Details](onClickDetails)‬‏</string>
     <string name="outbound_promotion_card_unclaimed_unexpanded_body">‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[More‬‏ ‏‮Details](onClickDetails)‬‏</string>
+    <string name="outbound_promotion_code_confirmation_email">‏‮This‬‏ ‏‮code‬‏ ‏‮is‬‏ ‏‮included‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮confirmation‬‏ ‏‮email‬‏ ‏‮we‬‏ ‏‮just‬‏ ‏‮sent‬‏ ‏‮you.‬‏</string>
     <string name="outbound_promotion_less_details">‏‮[Less‬‏ ‏‮Details](onClick)‬‏</string>
     <string name="outbound_promotion_more_details">‏‮[More‬‏ ‏‮Details](onClick)‬‏</string>
+    <string name="outbound_promotion_notice">‏‮Hey,‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮something‬‏ ‏‮waiting‬‏ ‏‮for‬‏ ‏‮you‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮gift‬‏ ‏‮inventory!‬‏ ‏‮Don’t‬‏ ‏‮forget‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮it‬‏ ‏‮before‬‏ ‏‮it’s‬‏ ‏‮lost.‬‏</string>
+    <string name="outbound_promotion_redemption_modal_title">‏‮Awesome!‬‏</string>
     <string name="outbound_promotion_see_code">‏‮See‬‏ ‏‮Code‬‏</string>
     <string name="outgoing_friend_request">‏‮Outgoing‬‏ ‏‮Friend‬‏ ‏‮Request‬‏</string>
     <string name="outgoing_friend_request_delete_msg">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮delete‬‏ ‏‮your‬‏ ‏‮friend‬‏ ‏‮request‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**?‬‏</string>
@@ -6077,6 +6147,9 @@
     <string name="premium_marketing_feature_premium_upload_size_title">‏‮Bigger‬‏ ‏‮Uploads‬‏</string>
     <string name="premium_marketing_feature_profile_description">‏‮Personalize‬‏ ‏‮your‬‏ ‏‮profile‬‏ ‏‮with‬‏ ‏‮an‬‏ ‏‮animated‬‏ ‏‮avatar‬‏ ‏‮and‬‏ ‏‮custom‬‏ ‏‮tag.‬‏</string>
     <string name="premium_marketing_feature_profile_title">‏‮Personalized‬‏ ‏‮Profile‬‏</string>
+    <string name="premium_marketing_feature_stickers_description">‏‮Use‬‏ ‏‮custom‬‏ ‏‮stickers‬‏ ‏‮anywhere‬‏ ‏‮and‬‏ ‏‮access‬‏ ‏‮300‬‏ ‏‮Nitro-exclusive‬‏ ‏‮stickers.‬‏ ‏‮$[Info](infoHook)‬‏</string>
+    <string name="premium_marketing_feature_stickers_info">‏‮Boosted‬‏ ‏‮servers‬‏ ‏‮can‬‏ ‏‮upload‬‏ ‏‮custom‬‏ ‏‮stickers‬‏ ‏‮through‬‏ ‏‮Server‬‏ ‏‮Settings‬‏ ‏‮&gt;‬‏ ‏‮Stickers.‬‏ ‏‮Nitro‬‏ ‏‮users‬‏ ‏‮can‬‏ ‏‮use‬‏ ‏‮custom‬‏ ‏‮stickers‬‏ ‏‮anywhere.‬‏</string>
+    <string name="premium_marketing_feature_stickers_title">‏‮Special‬‏ ‏‮Stickers‬‏ ‏‮Access‬‏</string>
     <string name="premium_marketing_hero_body">‏‮Upgrade‬‏ ‏‮your‬‏ ‏‮emoji,‬‏ ‏‮personalize‬‏ ‏‮your‬‏ ‏‮profile,‬‏ ‏‮and‬‏ ‏‮stand‬‏ ‏‮out‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮servers.‬‏</string>
     <string name="premium_marketing_hero_header">‏‮Make‬‏ ‏‮Discord‬‏ ‏‮yours‬‏</string>
     <string name="premium_message_length_chatbox_flair">‏‮Nitro‬‏ ‏‮is‬‏ ‏‮powering‬‏ ‏‮you‬‏ ‏‮with‬‏ ‏‮{maxLength}‬‏ ‏‮characters‬‏ ‏‮per‬‏ ‏‮message!‬‏</string>
@@ -6116,7 +6189,9 @@
     <string name="premium_plan_year_tier_2">‏‮Nitro‬‏ ‏‮Yearly‬‏</string>
     <string name="premium_plan_year_tier_2_trial">‏‮Nitro‬‏ ‏‮Yearly‬‏ ‏‮**(+‬‏‏‮{months}‬‏ ‏‮{months}‬‏ ‏‮free)**‬‏</string>
     <string name="premium_profile_customization_upsell_body">‏‮Get‬‏ ‏‮more‬‏ ‏‮customization‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮profile‬‏ ‏‮banner,‬‏ ‏‮an‬‏ ‏‮animated‬‏ ‏‮avatar,‬‏ ‏‮a‬‏ ‏‮custom‬‏ ‏‮tag,‬‏ ‏‮[and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!](onLearnMore)‬‏</string>
-    <string name="premium_profile_customization_upsell_header">‏‮Unlock‬‏ ‏‮Profile‬‏ ‏‮Customization‬‏</string>
+    <string name="premium_profile_customization_upsell_body_mobile">‏‮Get‬‏ ‏‮more‬‏ ‏‮customization‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮profile‬‏ ‏‮banner,‬‏ ‏‮an‬‏ ‏‮animated‬‏ ‏‮avatar,‬‏ ‏‮a‬‏ ‏‮custom‬‏ ‏‮tag,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮**Discord‬‏ ‏‮Nitro!**‬‏</string>
+    <string name="premium_profile_customization_upsell_header">‏‮Wanna‬‏ ‏‮upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮banner?‬‏</string>
+    <string name="premium_profile_customization_upsell_header_mobile">‏‮Wanna‬‏ ‏‮upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮profile‬‏ ‏‮banner?‬‏</string>
     <string name="premium_promo_description">‏‮Lift‬‏ ‏‮off‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮animated‬‏ ‏‮and‬‏ ‏‮custom‬‏ ‏‮emoji‬‏ ‏‮anywhere.‬‏</string>
     <string name="premium_promo_description_search_upsell">‏‮Lift‬‏ ‏‮off‬‏ ‏‮with‬‏ ‏‮**Discord‬‏ ‏‮Nitro**‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮animated‬‏ ‏‮and‬‏ ‏‮custom‬‏ ‏‮emojis‬‏ ‏‮anywhere.‬‏ ‏‮[Learn‬‏ ‏‮more](onClick)‬‏</string>
     <string name="premium_promo_description_trial">‏‮Claim‬‏ ‏‮your‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮of‬‏ ‏‮Discord‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮animated‬‏ ‏‮and‬‏ ‏‮custom‬‏ ‏‮emojis‬‏ ‏‮anywhere.‬‏</string>
@@ -6183,6 +6258,7 @@
     <string name="premium_subscription_renewal_footer_trial">‏‮Your‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮credit‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮applied‬‏ ‏‮until‬‏ ‏‮it‬‏ ‏‮runs‬‏ ‏‮out,‬‏ ‏‮and‬‏ ‏‮we\'ll‬‏ ‏‮send‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮reminder‬‏ ‏‮email‬‏ ‏‮**‬‏‏‮{days}‬‏‏‮**‬‏ ‏‮before‬‏ ‏‮your‬‏ ‏‮free‬‏ ‏‮period‬‏ ‏‮ends.‬‏ ‏‮Have‬‏ ‏‮questions?‬‏ ‏‮[Check‬‏ ‏‮out‬‏ ‏‮our‬‏ ‏‮offer‬‏ ‏‮FAQ](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ ‏‮or‬‏ ‏‮[contact‬‏ ‏‮our‬‏ ‏‮support‬‏ ‏‮team](‬‏‏‮{contactLink}‬‏‏‮).‬‏</string>
     <string name="premium_subscription_required_body">‏‮Hold‬‏ ‏‮up!‬‏ ‏‮You‬‏ ‏‮need‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮this‬‏ ‏‮loot.‬‏</string>
     <string name="premium_subscription_show_details">‏‮Show‬‏ ‏‮Subscription‬‏ ‏‮Details‬‏</string>
+    <string name="premium_subscription_subscriptions_link">‏‮Trying‬‏ ‏‮to‬‏ ‏‮manage‬‏ ‏‮your‬‏ ‏‮Nitro‬‏ ‏‮subscription?‬‏ ‏‮Go‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮[Subscriptions](onSubscriptionsClick)‬‏ ‏‮page.‬‏</string>
     <string name="premium_subscription_updates">‏‮Subscription‬‏ ‏‮Updates‬‏</string>
     <string name="premium_switch_plan_disabled_in_trial">‏‮You‬‏ ‏‮cannot‬‏ ‏‮switch‬‏ ‏‮plans‬‏ ‏‮during‬‏ ‏‮your‬‏ ‏‮trial.‬‏</string>
     <string name="premium_switch_plan_disabled_pending_mutation_plan">‏‮You‬‏ ‏‮have‬‏ ‏‮to‬‏ ‏‮cancel‬‏ ‏‮your‬‏ ‏‮pending‬‏ ‏‮plan‬‏ ‏‮change‬‏ ‏‮before‬‏ ‏‮choosing‬‏ ‏‮another‬‏ ‏‮plan.‬‏</string>
@@ -6307,19 +6383,21 @@
     <string name="private_voice_channel_creation_permission_missing_hint">‏‮**View‬‏ ‏‮Channels**‬‏ ‏‮and‬‏ ‏‮**Connect**‬‏ ‏‮permissions‬‏ ‏‮required‬‏ ‏‮to‬‏ ‏‮create‬‏ ‏‮this‬‏ ‏‮private‬‏ ‏‮channel.‬‏</string>
     <string name="profile">‏‮Profile‬‏</string>
     <string name="profile_banner_icon_tooltip_upsell">‏‮Upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮personalized‬‏ ‏‮banner‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!‬‏</string>
+    <string name="profile_customization_activity_time">‏‮$[](renderTimeHook)‬‏ ‏‮elapsed‬‏</string>
     <string name="profile_customization_beta_tooltip">‏‮Profile‬‏ ‏‮Customization‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮limited‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮people.‬‏</string>
     <string name="profile_customization_bio_placeholder">‏‮Tell‬‏ ‏‮the‬‏ ‏‮world‬‏ ‏‮a‬‏ ‏‮little‬‏ ‏‮about‬‏ ‏‮yourself‬‏</string>
     <string name="profile_customization_marketing_tooltip_body">‏‮Express‬‏ ‏‮yourself‬‏ ‏‮with‬‏ ‏‮an‬‏ ‏‮about‬‏ ‏‮me‬‏ ‏‮and,‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮Nitro,‬‏ ‏‮a‬‏ ‏‮profile‬‏ ‏‮banner!‬‏</string>
     <string name="profile_customization_marketing_tooltip_cta">‏‮Got‬‏ ‏‮it‬‏</string>
-    <string name="profile_customization_marketing_tooltip_header">‏‮New‬‏ ‏‮Profile‬‏ ‏‮Customization!‬‏</string>
+    <string name="profile_customization_marketing_tooltip_header">‏‮New‬‏ ‏‮User‬‏ ‏‮Profiles!‬‏</string>
     <string name="profile_customization_nitro_icon_tooltip">‏‮Exclusive‬‏ ‏‮to‬‏ ‏‮Nitro‬‏</string>
+    <string name="profile_customization_preview">‏‮Preview‬‏</string>
+    <string name="profile_user_badges">‏‮User‬‏ ‏‮Badges‬‏</string>
     <string name="progress_completed">‏‮You‬‏ ‏‮are‬‏ ‏‮all‬‏ ‏‮set!‬‏</string>
     <string name="progress_completed_description">‏‮Wow‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮is‬‏ ‏‮looking‬‏ ‏‮all‬‏ ‏‮snazzy!‬‏ ‏‮Here‬‏ ‏‮are‬‏ ‏‮a‬‏ ‏‮few‬‏ ‏‮more‬‏ ‏‮things‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮do‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮Have‬‏ ‏‮fun!‬‏</string>
     <string name="progress_steps">‏‮Step‬‏ ‏‮{step}‬‏ ‏‮of‬‏ ‏‮4‬‏</string>
     <string name="progress_steps_finished">‏‮Completed!‬‏</string>
     <string name="promotion_account_identifier">‏‮Signed‬‏ ‏‮in‬‏ ‏‮as‬‏ ‏‮$[](avatarHook)‬‏ ‏‮{tag}‬‏‏‮.‬‏ ‏‮[Not‬‏ ‏‮You?](logoutHook)‬‏</string>
     <string name="promotion_card_action_claim">‏‮Claim‬‏</string>
-    <string name="promotion_card_body_claimed_hidden">‏‮You\'ve‬‏ ‏‮claimed‬‏ ‏‮this,‬‏ ‏‮but‬‏ ‏‮the‬‏ ‏‮code‬‏ ‏‮is‬‏ ‏‮hidden‬‏ ‏‮due‬‏ ‏‮to‬‏ ‏‮Streamer‬‏ ‏‮Mode.‬‏</string>
     <string name="promotion_error_body">‏‮Seems‬‏ ‏‮like‬‏ ‏‮something’s‬‏ ‏‮gone‬‏ ‏‮wrong‬‏ ‏‮and‬‏ ‏‮you‬‏ ‏‮can’t‬‏ ‏‮use‬‏ ‏‮that‬‏ ‏‮code.‬‏ ‏‮Sorry‬‏ ‏‮about‬‏ ‏‮that.‬‏</string>
     <string name="promotion_error_claimed_body">‏‮Sorry,‬‏ ‏‮looks‬‏ ‏‮like‬‏ ‏‮this‬‏ ‏‮code‬‏ ‏‮has‬‏ ‏‮already‬‏ ‏‮been‬‏ ‏‮redeemed.‬‏</string>
     <string name="promotion_error_no_code_body">‏‮Looks‬‏ ‏‮like‬‏ ‏‮this‬‏ ‏‮code‬‏ ‏‮didn\'t‬‏ ‏‮work.‬‏ ‏‮Make‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮the‬‏ ‏‮right‬‏ ‏‮code‬‏ ‏‮and‬‏ ‏‮try‬‏ ‏‮again.‬‏</string>
@@ -6435,6 +6513,8 @@
     <string name="recommended">‏‮Recommended‬‏</string>
     <string name="reconnect">‏‮Reconnect‬‏</string>
     <string name="reconnecting">‏‮Reconnecting‬‏</string>
+    <string name="redeem">‏‮Redeem‬‏</string>
+    <string name="redemption_code">‏‮Redemption‬‏ ‏‮Code‬‏</string>
     <string name="refund">‏‮Refund‬‏</string>
     <string name="region">‏‮region‬‏</string>
     <string name="region_select_footer">‏‮Server‬‏ ‏‮region‬‏ ‏‮can‬‏ ‏‮be‬‏ ‏‮changed‬‏ ‏‮anytime‬‏ ‏‮with‬‏ ‏‮less‬‏ ‏‮than‬‏ ‏‮a‬‏ ‏‮second‬‏ ‏‮of‬‏ ‏‮voice‬‏ ‏‮interruption.‬‏</string>
@@ -6867,6 +6947,8 @@
     <string name="save_media_failure_mobile">‏‮Save‬‏ ‏‮Failed‬‏</string>
     <string name="save_media_success_mobile">‏‮Saved‬‏</string>
     <string name="saved_settings">‏‮Settings‬‏ ‏‮successfully‬‏ ‏‮updated.‬‏</string>
+    <string name="schedule_event">‏‮Schedule‬‏ ‏‮Event‬‏</string>
+    <string name="schedule_event_description">‏‮Create‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮started‬‏ ‏‮later.‬‏</string>
     <string name="scope_activities_read">‏‮Access‬‏ ‏‮your‬‏ ‏‮Active‬‏ ‏‮Now‬‏ ‏‮activities‬‏</string>
     <string name="scope_activities_read_description">‏‮This‬‏ ‏‮allows‬‏ ‏‮the‬‏ ‏‮app‬‏ ‏‮to‬‏ ‏‮read‬‏ ‏‮the‬‏ ‏‮information‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮Active‬‏ ‏‮Now‬‏ ‏‮section‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮Friends‬‏ ‏‮page.‬‏</string>
     <string name="scope_activities_write">‏‮Update‬‏ ‏‮your‬‏ ‏‮current‬‏ ‏‮activity‬‏</string>
@@ -7345,6 +7427,7 @@
     <string name="stage_voice_channel">‏‮Stage‬‏ ‏‮Channel‬‏</string>
     <string name="start">‏‮Start‬‏</string>
     <string name="start_call">‏‮Start‬‏ ‏‮Call‬‏</string>
+    <string name="start_scheduled_event">‏‮Start‬‏ ‏‮a‬‏ ‏‮Scheduled‬‏ ‏‮Event‬‏</string>
     <string name="start_stage_button_text">‏‮Start‬‏ ‏‮a‬‏ ‏‮Stage‬‏</string>
     <string name="start_stage_button_text_mobile">‏‮Start‬‏ ‏‮a‬‏ ‏‮Stage‬‏</string>
     <string name="start_stage_channel_event_members_subtitle">‏‮Only‬‏ ‏‮members‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮can‬‏ ‏‮join.‬‏</string>
@@ -7443,10 +7526,23 @@
     <string name="sticker_picker_price_with_premium_tier_2">‏‮!!‬‏‏‮{price}‬‏‏‮!!‬‏ ‏‮with‬‏ ‏‮Nitro‬‏</string>
     <string name="sticker_picker_view_all">‏‮View‬‏ ‏‮All‬‏</string>
     <string name="sticker_popout_countdown_header">‏‮Limited‬‏ ‏‮time‬‏ ‏‮left‬‏</string>
+    <string name="sticker_popout_current_guild_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮server.‬‏ ‏‮Get‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮it‬‏ ‏‮everywhere.‬‏</string>
+    <string name="sticker_popout_join_server">‏‮Join‬‏ ‏‮Server‬‏</string>
+    <string name="sticker_popout_joined_guild_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮one‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers.‬‏ ‏‮Get‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮it‬‏ ‏‮everywhere.‬‏</string>
+    <string name="sticker_popout_joined_guild_emoji_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏</string>
     <string name="sticker_popout_pack_info">‏‮This‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮**‬‏‏‮{stickerPackName}‬‏‏‮**‬‏ ‏‮sticker‬‏ ‏‮pack.‬‏ ‏‮Get‬‏ ‏‮{discount}‬‏‏‮%%‬‏ ‏‮off‬‏ ‏‮with‬‏ ‏‮[Nitro](onClick).‬‏</string>
     <string name="sticker_popout_pack_info_nonpremium">‏‮Feelin\'‬‏ ‏‮it?‬‏ ‏‮Get‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮300‬‏ ‏‮stickers‬‏ ‏‮like‬‏ ‏‮this‬‏ ‏‮and‬‏ ‏‮more.‬‏</string>
     <string name="sticker_popout_pack_info_premium">‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮**‬‏‏‮{stickerPackName}‬‏‏‮**‬‏ ‏‮sticker.‬‏</string>
     <string name="sticker_popout_pack_info_unavailable">‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮**‬‏‏‮{stickerPackName}‬‏‏‮**‬‏ ‏‮sticker.‬‏ ‏‮They‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮longer‬‏ ‏‮available.‬‏</string>
+    <string name="sticker_popout_premium_current_guild_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮server.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮use‬‏ ‏‮it‬‏ ‏‮everywhere.‬‏</string>
+    <string name="sticker_popout_premium_joined_guild_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮one‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers.‬‏ ‏‮Type‬‏ ‏‮its‬‏ ‏‮name‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮chat‬‏ ‏‮bar‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮it.‬‏</string>
+    <string name="sticker_popout_premium_unjoined_discoverable_guild_description">‏‮Want‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮this‬‏ ‏‮sticker‬‏ ‏‮everywhere?‬‏ ‏‮Join‬‏ ‏‮the‬‏ ‏‮server.‬‏</string>
+    <string name="sticker_popout_premium_unjoined_private_guild_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮that‬‏ ‏‮is‬‏ ‏‮either‬‏ ‏‮private‬‏ ‏‮or‬‏ ‏‮unavailable.‬‏</string>
+    <string name="sticker_popout_private_server">‏‮Private‬‏ ‏‮server‬‏</string>
+    <string name="sticker_popout_public_server">‏‮Public‬‏ ‏‮Server‬‏</string>
+    <string name="sticker_popout_unjoined_discoverable_guild_description">‏‮Want‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮this‬‏ ‏‮sticker‬‏ ‏‮everywhere?‬‏ ‏‮Get‬‏ ‏‮Nitro‬‏ ‏‮and‬‏ ‏‮join‬‏ ‏‮the‬‏ ‏‮server.‬‏</string>
+    <string name="sticker_popout_unjoined_guild_emoji_description">‏‮Get‬‏ ‏‮this‬‏ ‏‮sticker‬‏ ‏‮from‬‏</string>
+    <string name="sticker_popout_unjoined_private_guild_description">‏‮This‬‏ ‏‮sticker‬‏ ‏‮is‬‏ ‏‮from‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮that‬‏ ‏‮is‬‏ ‏‮either‬‏ ‏‮private‬‏ ‏‮or‬‏ ‏‮unavailable.‬‏ ‏‮[Learn‬‏ ‏‮more](openPremiumSettings)‬‏ ‏‮about‬‏ ‏‮using‬‏ ‏‮custom‬‏ ‏‮stickers.‬‏</string>
     <string name="sticker_premium_tier_1_upsell_alert_upgrade_cta">‏‮Subscribe‬‏ ‏‮to‬‏ ‏‮Nitro‬‏ ‏‮Classic‬‏</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount">‏‮Get‬‏ ‏‮{percent}‬‏ ‏‮off‬‏ ‏‮on‬‏ ‏‮Boost‬‏ ‏‮purchases‬‏</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_subscription">‏‮Extra‬‏ ‏‮chat‬‏ ‏‮perks:‬‏ ‏‮animated‬‏ ‏‮emoji,‬‏ ‏‮custom‬‏ ‏‮Discord‬‏ ‏‮tag,‬‏ ‏‮and‬‏ ‏‮more‬‏</string>
@@ -7701,6 +7797,7 @@
     <string name="tabs_search_accessibility_label">‏‮Search‬‏ ‏‮tab‬‏</string>
     <string name="tabs_settings_accessibility_label">‏‮Settings‬‏ ‏‮tab‬‏</string>
     <string name="take_a_photo">‏‮Take‬‏ ‏‮a‬‏ ‏‮Photo‬‏</string>
+    <string name="take_me_there">‏‮Take‬‏ ‏‮me‬‏ ‏‮there‬‏</string>
     <string name="take_survey">‏‮Take‬‏ ‏‮Survey‬‏</string>
     <string name="tan">‏‮Tan‬‏</string>
     <string name="tap_add_nickname">‏‮Tap‬‏ ‏‮to‬‏ ‏‮add‬‏ ‏‮a‬‏ ‏‮nickname‬‏</string>
@@ -7769,6 +7866,8 @@
     <string name="thread_header_notice_archived">‏‮This‬‏ ‏‮thread‬‏ ‏‮is‬‏ ‏‮archived.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮to‬‏ ‏‮unarchive‬‏ ‏‮it.‬‏</string>
     <string name="thread_header_notice_join">‏‮Join‬‏ ‏‮this‬‏ ‏‮thread‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮notifications‬‏ ‏‮and‬‏ ‏‮to‬‏ ‏‮save‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮channel‬‏ ‏‮list.‬‏</string>
     <string name="thread_header_notice_locked">‏‮This‬‏ ‏‮thread‬‏ ‏‮was‬‏ ‏‮archived‬‏ ‏‮by‬‏ ‏‮a‬‏ ‏‮moderator.‬‏ ‏‮Only‬‏ ‏‮moderators‬‏ ‏‮can‬‏ ‏‮unarchive‬‏ ‏‮it.‬‏</string>
+    <string name="thread_member_list_empty_state_header">‏‮There’s‬‏ ‏‮no‬‏ ‏‮one‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮thread.‬‏</string>
+    <string name="thread_member_list_empty_state_subtext">‏‮You‬‏ ‏‮can‬‏ ‏‮invite‬‏ ‏‮people‬‏ ‏‮by‬‏ ‏‮@mentioning‬‏ ‏‮them‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮message.‬‏</string>
     <string name="thread_member_without_access">‏‮Cannot‬‏ ‏‮view‬‏ ‏‮this‬‏ ‏‮thread‬‏</string>
     <string name="thread_message_count">‏‮{count}‬‏</string>
     <string name="thread_message_count_max">‏‮50+‬‏ ‏‮Messages‬‏ ‏‮›‬‏</string>
@@ -7933,6 +8032,7 @@
     <string name="unable_to_join_channel_full_modal_body">‏‮Sorry,‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮has‬‏ ‏‮the‬‏ ‏‮max‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮people!‬‏</string>
     <string name="unable_to_join_channel_full_modal_header">‏‮Channel‬‏ ‏‮is‬‏ ‏‮full‬‏</string>
     <string name="unable_to_open_media_chooser">‏‮Unable‬‏ ‏‮to‬‏ ‏‮open‬‏ ‏‮media‬‏ ‏‮chooser.‬‏ ‏‮%1$s‬‏</string>
+    <string name="unable_to_process_image">‏‮Unable‬‏ ‏‮to‬‏ ‏‮process‬‏ ‏‮image‬‏</string>
     <string name="unarchive">‏‮Unarchive‬‏</string>
     <string name="unarchive_thread">‏‮Unarchive‬‏ ‏‮Thread‬‏</string>
     <string name="unban">‏‮Unban‬‏</string>
@@ -8149,6 +8249,7 @@
     <string name="user_settings">‏‮User‬‏ ‏‮Settings‬‏</string>
     <string name="user_settings_about_me">‏‮About‬‏ ‏‮Me‬‏</string>
     <string name="user_settings_about_me_description">‏‮Write‬‏ ‏‮anything‬‏ ‏‮you’d‬‏ ‏‮like‬‏ ‏‮about‬‏ ‏‮yourself‬‏ ‏‮—‬‏ ‏‮as‬‏ ‏‮long‬‏ ‏‮as‬‏ ‏‮you‬‏ ‏‮do‬‏ ‏‮it‬‏ ‏‮in‬‏ ‏‮under‬‏ ‏‮{maxLength}‬‏ ‏‮characters.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮use‬‏ ‏‮markdown‬‏ ‏‮and‬‏ ‏‮links‬‏ ‏‮if‬‏ ‏‮you’d‬‏ ‏‮like.‬‏</string>
+    <string name="user_settings_about_me_hint">‏‮Tap‬‏ ‏‮to‬‏ ‏‮add‬‏ ‏‮an‬‏ ‏‮about‬‏ ‏‮me‬‏</string>
     <string name="user_settings_account_change_email_prompt">‏‮Your‬‏ ‏‮current‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮is‬‏ ‏‮!!‬‏‏‮{email}‬‏‏‮!!‬‏ ‏‮What‬‏ ‏‮would‬‏ ‏‮you‬‏ ‏‮like‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮it‬‏ ‏‮to?‬‏</string>
     <string name="user_settings_account_change_email_prompt_desktop">‏‮Enter‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮and‬‏ ‏‮your‬‏ ‏‮existing‬‏ ‏‮password.‬‏</string>
     <string name="user_settings_account_change_email_title">‏‮Edit‬‏ ‏‮Email‬‏</string>
@@ -8184,13 +8285,18 @@
     <string name="user_settings_appearance_zoom_tip">‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮the‬‏ ‏‮zoom‬‏ ‏‮level‬‏ ‏‮with‬‏ ‏‮{modKey}‬‏ ‏‮+/-‬‏ ‏‮and‬‏ ‏‮reset‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮default‬‏ ‏‮zoom‬‏ ‏‮with‬‏ ‏‮{modKey}‬‏‏‮+0.‬‏</string>
     <string name="user_settings_available_codes">‏‮Available‬‏ ‏‮Backup‬‏ ‏‮Codes‬‏</string>
     <string name="user_settings_avatar">‏‮Avatar‬‏</string>
-    <string name="user_settings_banner_color">‏‮Banner‬‏ ‏‮Color‬‏</string>
+    <string name="user_settings_banner_a11y_label">‏‮Change‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏</string>
+    <string name="user_settings_banner_edit_sub_label">‏‮The‬‏ ‏‮recommended‬‏ ‏‮minimum‬‏ ‏‮size‬‏ ‏‮and‬‏ ‏‮aspect‬‏ ‏‮ratio‬‏ ‏‮are‬‏ ‏‮600x240‬‏ ‏‮and‬‏ ‏‮5:2.‬‏ ‏‮Accepted‬‏ ‏‮file‬‏ ‏‮types‬‏ ‏‮include‬‏ ‏‮PNG,‬‏ ‏‮JPG,‬‏ ‏‮and‬‏ ‏‮animated‬‏ ‏‮GIFs.‬‏</string>
     <string name="user_settings_banner_specs">‏‮We‬‏ ‏‮recommend‬‏ ‏‮an‬‏ ‏‮image‬‏ ‏‮of‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮600x240.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮upload‬‏ ‏‮a‬‏ ‏‮PNG,‬‏ ‏‮JPG,‬‏ ‏‮or‬‏ ‏‮an‬‏ ‏‮animated‬‏ ‏‮GIF.‬‏</string>
+    <string name="user_settings_banner_upload">‏‮Upload‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏</string>
     <string name="user_settings_blocked_users">‏‮Blocked‬‏ ‏‮Users‬‏</string>
     <string name="user_settings_blocked_users_empty">‏‮You‬‏ ‏‮don\'t‬‏ ‏‮have‬‏ ‏‮any‬‏ ‏‮blocked‬‏ ‏‮users‬‏</string>
     <string name="user_settings_blocked_users_header">‏‮{numberOfBlockedUsers}‬‏ ‏‮Blocked‬‏ ‏‮Users‬‏</string>
     <string name="user_settings_blocked_users_unblockbutton">‏‮Unblock‬‏</string>
     <string name="user_settings_change_avatar">‏‮Change‬‏ ‏‮Avatar‬‏</string>
+    <string name="user_settings_change_avatar_a11y_label">‏‮Change‬‏ ‏‮Avatar‬‏</string>
+    <string name="user_settings_change_banner_a11y_label">‏‮Change‬‏ ‏‮Banner‬‏</string>
+    <string name="user_settings_change_profile_banner">‏‮Change‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏</string>
     <string name="user_settings_close_button">‏‮Close‬‏ ‏‮Button‬‏</string>
     <string name="user_settings_confirm_logout">‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮logout?‬‏</string>
     <string name="user_settings_customization_upsell">‏‮Unlock‬‏ ‏‮with‬‏ ‏‮Nitro‬‏</string>
@@ -8202,6 +8308,9 @@
     <string name="user_settings_edit_account_password_label">‏‮Enter‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮to‬‏ ‏‮confirm‬‏ ‏‮changes‬‏</string>
     <string name="user_settings_edit_account_tag">‏‮TAG‬‏</string>
     <string name="user_settings_edit_profile">‏‮Edit‬‏ ‏‮Profile‬‏</string>
+    <string name="user_settings_edit_profile_dont_save">‏‮Don\'t‬‏ ‏‮Save‬‏</string>
+    <string name="user_settings_edit_profile_save_changes">‏‮Save‬‏ ‏‮Changes?‬‏</string>
+    <string name="user_settings_edit_profile_save_confirmation_body">‏‮You\'ve‬‏ ‏‮made‬‏ ‏‮changes.‬‏ ‏‮Do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮save‬‏ ‏‮them‬‏ ‏‮before‬‏ ‏‮leaving‬‏ ‏‮this‬‏ ‏‮page?‬‏</string>
     <string name="user_settings_enter_password_view_codes">‏‮Enter‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮to‬‏ ‏‮view‬‏ ‏‮backup‬‏ ‏‮codes.‬‏</string>
     <string name="user_settings_games_install_location">‏‮Location‬‏</string>
     <string name="user_settings_games_install_location_add">‏‮Add‬‏ ‏‮Install‬‏ ‏‮Location‬‏</string>
@@ -8242,6 +8351,8 @@
     <string name="user_settings_my_account">‏‮My‬‏ ‏‮Account‬‏</string>
     <string name="user_settings_no_email_placeholder">‏‮You‬‏ ‏‮haven\'t‬‏ ‏‮added‬‏ ‏‮an‬‏ ‏‮email‬‏ ‏‮yet.‬‏</string>
     <string name="user_settings_no_phone_placeholder">‏‮You‬‏ ‏‮haven\'t‬‏ ‏‮added‬‏ ‏‮a‬‏ ‏‮phone‬‏ ‏‮number‬‏ ‏‮yet.‬‏</string>
+    <string name="user_settings_no_subscription_credit">‏‮You‬‏ ‏‮have‬‏ ‏‮no‬‏ ‏‮unused‬‏ ‏‮credits‬‏</string>
+    <string name="user_settings_no_subscriptions">‏‮You‬‏ ‏‮have‬‏ ‏‮no‬‏ ‏‮active‬‏ ‏‮subscriptions‬‏</string>
     <string name="user_settings_noise_cancellation">‏‮Noise‬‏ ‏‮Suppression‬‏</string>
     <string name="user_settings_noise_cancellation_description">‏‮Suppress‬‏ ‏‮background‬‏ ‏‮noise‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮mic.‬‏</string>
     <string name="user_settings_noise_cancellation_model">‏‮Noise‬‏ ‏‮suppression‬‏ ‏‮model‬‏</string>
@@ -8254,8 +8365,12 @@
     <string name="user_settings_open_on_startup_label">‏‮Open‬‏ ‏‮Discord‬‏</string>
     <string name="user_settings_privacy_terms">‏‮Check‬‏ ‏‮out‬‏ ‏‮our‬‏ ‏‮[Terms‬‏ ‏‮of‬‏ ‏‮Service](‬‏‏‮{termsLink}‬‏‏‮)‬‏ ‏‮and‬‏ ‏‮[Privacy‬‏ ‏‮Policy](‬‏‏‮{privacyLink}‬‏‏‮).‬‏</string>
     <string name="user_settings_profile_banner">‏‮Profile‬‏ ‏‮Banner‬‏</string>
+    <string name="user_settings_profile_color_custom">‏‮Custom‬‏</string>
+    <string name="user_settings_profile_color_default">‏‮Default‬‏</string>
+    <string name="user_settings_profle_color">‏‮Profile‬‏ ‏‮Color‬‏</string>
     <string name="user_settings_remove_avatar">‏‮Remove‬‏ ‏‮Avatar‬‏</string>
     <string name="user_settings_remove_banner">‏‮Remove‬‏ ‏‮Banner‬‏</string>
+    <string name="user_settings_remove_profile_banner">‏‮Remove‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏</string>
     <string name="user_settings_restart_app_mobile">‏‮Restart‬‏ ‏‮the‬‏ ‏‮app‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮new‬‏ ‏‮settings‬‏ ‏‮to‬‏ ‏‮take‬‏ ‏‮effect.‬‏</string>
     <string name="user_settings_save">‏‮Save‬‏</string>
     <string name="user_settings_scan_qr_code">‏‮Scan‬‏ ‏‮QR‬‏ ‏‮Code‬‏</string>
@@ -8266,10 +8381,11 @@
     <string name="user_settings_startup_behavior">‏‮System‬‏ ‏‮Startup‬‏ ‏‮Behavior‬‏</string>
     <string name="user_settings_streamer_notice_body">‏‮Enhance‬‏ ‏‮your‬‏ ‏‮Discord‬‏ ‏‮community‬‏ ‏‮with‬‏ ‏‮tools‬‏ ‏‮made‬‏ ‏‮for‬‏ ‏‮streamers.‬‏ ‏‮Check‬‏ ‏‮out‬‏ ‏‮[Discord\'s‬‏ ‏‮StreamKit](‬‏‏‮{streamkitURL}‬‏‏‮).‬‏</string>
     <string name="user_settings_streamer_notice_title">‏‮Looking‬‏ ‏‮for‬‏ ‏‮integrations?‬‏</string>
+    <string name="user_settings_subscriptions_header">‏‮Your‬‏ ‏‮Subscriptions‬‏</string>
+    <string name="user_settings_unlock_banner">‏‮Unlock‬‏ ‏‮Banner‬‏</string>
     <string name="user_settings_unverified_email_body">‏‮Please‬‏ ‏‮check‬‏ ‏‮your‬‏ ‏‮email‬‏ ‏‮and‬‏ ‏‮follow‬‏ ‏‮the‬‏ ‏‮instructions‬‏ ‏‮to‬‏ ‏‮verify‬‏ ‏‮your‬‏ ‏‮email.‬‏ ‏‮If‬‏ ‏‮you‬‏ ‏‮did‬‏ ‏‮not‬‏ ‏‮receive‬‏ ‏‮an‬‏ ‏‮email‬‏ ‏‮or‬‏ ‏‮if‬‏ ‏‮it‬‏ ‏‮expired,‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮resend‬‏ ‏‮one.‬‏</string>
     <string name="user_settings_upload_avatar">‏‮Upload‬‏ ‏‮Avatar‬‏</string>
     <string name="user_settings_upload_banner">‏‮Upload‬‏ ‏‮Banner‬‏</string>
-    <string name="user_settings_use_default_banner_color">‏‮Use‬‏ ‏‮default‬‏</string>
     <string name="user_settings_used_backup_codes">‏‮Used‬‏ ‏‮Backup‬‏ ‏‮Codes‬‏</string>
     <string name="user_settings_user_profile">‏‮User‬‏ ‏‮Profile‬‏</string>
     <string name="user_settings_voice_add_multiple">‏‮You‬‏ ‏‮can‬‏ ‏‮add‬‏ ‏‮multiple‬‏ ‏‮Push‬‏ ‏‮to‬‏ ‏‮Talk‬‏ ‏‮binds‬‏ ‏‮under‬‏ ‏‮[Keybind‬‏ ‏‮Settings](onClick).‬‏</string>
@@ -8396,6 +8512,7 @@
     <string name="view_profile">‏‮View‬‏ ‏‮Profile‬‏</string>
     <string name="view_spectators">‏‮View‬‏ ‏‮spectators‬‏</string>
     <string name="view_surrounding_messages">‏‮View‬‏ ‏‮surrounding‬‏ ‏‮messages.‬‏</string>
+    <string name="view_thread">‏‮View‬‏ ‏‮Thread‬‏</string>
     <string name="viewing_as_roles">‏‮You‬‏ ‏‮are‬‏ ‏‮viewing‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮as‬‏ ‏‮{numRoles}‬‏‏‮.‬‏</string>
     <string name="viewing_as_roles_back">‏‮Back‬‏ ‏‮to‬‏ ‏‮Roles‬‏ ‏‮Settings‬‏</string>
     <string name="viewing_as_roles_select">‏‮Select‬‏ ‏‮Roles‬‏</string>
@@ -8523,25 +8640,6 @@
     <string name="working">‏‮Working…‬‏</string>
     <string name="wumpus">‏‮Wumpus‬‏</string>
     <string name="xbox_authorization_title">‏‮Xbox‬‏ ‏‮Account‬‏ ‏‮Authorization‬‏</string>
-    <string name="xbox_game_pass_card_body_claimed">‏‮You\'ve‬‏ ‏‮claimed‬‏ ‏‮this.‬‏ ‏‮Here\'s‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮!!‬‏‏‮{code}‬‏‏‮!!.‬‏ ‏‮[More‬‏ ‏‮Details](onToggleLegalese)‬‏</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮January‬‏ ‏‮15th,‬‏ ‏‮2021.‬‏ ‏‮[Less‬‏ ‏‮Details](onToggleLegalese)‬‏</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮January‬‏ ‏‮15th,‬‏ ‏‮2021.‬‏ ‏‮[More‬‏ ‏‮Details](onToggleLegalese)‬‏</string>
-    <string name="xbox_game_pass_modal_code_description">‏‮This‬‏ ‏‮code‬‏ ‏‮is‬‏ ‏‮also‬‏ ‏‮included‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮confirmation‬‏ ‏‮email‬‏ ‏‮we‬‏ ‏‮just‬‏ ‏‮sent‬‏ ‏‮you.‬‏</string>
-    <string name="xbox_game_pass_modal_code_description_failed">‏‮Something‬‏ ‏‮went‬‏ ‏‮wrong,‬‏ ‏‮try‬‏ ‏‮again‬‏ ‏‮later!‬‏</string>
-    <string name="xbox_game_pass_modal_code_header">‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC‬‏ ‏‮Code‬‏</string>
-    <string name="xbox_game_pass_modal_code_header_failed">‏‮Uh‬‏ ‏‮Oh‬‏</string>
-    <string name="xbox_game_pass_modal_header_description_success">‏‮Redeem‬‏ ‏‮the‬‏ ‏‮code‬‏ ‏‮below‬‏ ‏‮on‬‏ ‏‮the‬‏ ‏‮[Microsoft‬‏ ‏‮redemption‬‏ ‏‮site](‬‏‏‮{redemptionURL}‬‏‏‮)‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC‬‏ ‏‮for‬‏ ‏‮3‬‏ ‏‮months.‬‏</string>
-    <string name="xbox_game_pass_modal_header_success">‏‮Awesome!‬‏</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">‏‮Since‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮a‬‏ ‏‮boost‬‏ ‏‮subscription,‬‏ ‏‮we\'ll‬‏ ‏‮give‬‏ ‏‮you‬‏ ‏‮Nitro‬‏ ‏‮subscription‬‏ ‏‮credit.‬‏ ‏‮Nitro‬‏ ‏‮credit‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮applied‬‏ ‏‮when‬‏ ‏‮you‬‏ ‏‮subscribe‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{planName}‬‏‏‮**.‬‏</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">‏‮Redeem‬‏</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">‏‮You‬‏ ‏‮now‬‏ ‏‮have‬‏ ‏‮Nitro‬‏ ‏‮Credit!‬‏ ‏‮Subscribe‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{planName}‬‏‏‮**‬‏ ‏‮today‬‏ ‏‮to‬‏ ‏‮apply‬‏ ‏‮your‬‏ ‏‮Nitro‬‏ ‏‮credit.‬‏</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">‏‮Nice!‬‏</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">‏‮Subscription‬‏ ‏‮Credit‬‏</string>
-    <string name="xbox_game_pass_promotion_banner_description">‏‮We‬‏ ‏‮got‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮little‬‏ ‏‮something‬‏ ‏‮extra.‬‏ ‏‮Nitro‬‏ ‏‮subscribers‬‏ ‏‮now‬‏ ‏‮get‬‏ ‏‮3‬‏ ‏‮months‬‏ ‏‮of‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC.‬‏ ‏‮Available‬‏ ‏‮now‬‏ ‏‮until‬‏ ‏‮January‬‏ ‏‮15th,‬‏ ‏‮2021.‬‏ ‏‮[More‬‏ ‏‮Details](onToggleExpand).‬‏</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">‏‮We‬‏ ‏‮got‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮little‬‏ ‏‮something‬‏ ‏‮extra.‬‏ ‏‮Nitro‬‏ ‏‮subscribers‬‏ ‏‮now‬‏ ‏‮get‬‏ ‏‮3‬‏ ‏‮months‬‏ ‏‮of‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC.‬‏ ‏‮Available‬‏ ‏‮now‬‏ ‏‮until‬‏ ‏‮January‬‏ ‏‮15th,‬‏ ‏‮2021.‬‏ ‏‮[Less‬‏ ‏‮Details](onToggleExpand).‬‏</string>
-    <string name="xbox_game_pass_promotion_banner_header">‏‮3‬‏ ‏‮Months‬‏ ‏‮of‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC‬‏</string>
-    <string name="xbox_game_pass_promotion_card_header">‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC‬‏ ‏‮(3‬‏ ‏‮months)‬‏</string>
-    <string name="xbox_game_pass_promotion_legalese">‏‮Not‬‏ ‏‮valid‬‏ ‏‮for‬‏ ‏‮current‬‏ ‏‮or‬‏ ‏‮previous‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮for‬‏ ‏‮PC‬‏ ‏‮members,‬‏ ‏‮or‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮Ultimate‬‏ ‏‮members.‬‏ ‏‮Redeem‬‏ ‏‮your‬‏ ‏‮Xbox‬‏ ‏‮Game‬‏ ‏‮Pass‬‏ ‏‮code(s),‬‏ ‏‮at‬‏ ‏‮[microsoft.com/redeem](https://microsoft.com/redeem)‬‏ ‏‮by‬‏ ‏‮February‬‏ ‏‮15th,‬‏ ‏‮2021.‬‏ ‏‮Credit‬‏ ‏‮card‬‏ ‏‮required.‬‏ ‏‮Unless‬‏ ‏‮you‬‏ ‏‮cancel,‬‏ ‏‮you‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮charged‬‏ ‏‮the‬‏ ‏‮then-current‬‏ ‏‮regular‬‏ ‏‮membership‬‏ ‏‮rate‬‏ ‏‮every‬‏ ‏‮month‬‏ ‏‮when‬‏ ‏‮the‬‏ ‏‮promotional‬‏ ‏‮period‬‏ ‏‮ends.‬‏ ‏‮Not‬‏ ‏‮supported‬‏ ‏‮on‬‏ ‏‮Windows‬‏ ‏‮10‬‏ ‏‮in‬‏ ‏‮S‬‏ ‏‮mode‬‏ ‏‮and‬‏ ‏‮on‬‏ ‏‮ARM‬‏ ‏‮devices.‬‏ ‏‮Game‬‏ ‏‮catalog‬‏ ‏‮varies‬‏ ‏‮over‬‏ ‏‮time.‬‏ ‏‮See‬‏ ‏‮[xbox.com/gamepass](https://xbox.com/gamepass).‬‏ ‏‮Limit:‬‏ ‏‮1‬‏ ‏‮per‬‏ ‏‮person/account.‬‏</string>
     <string name="xbox_link">‏‮Link‬‏</string>
     <string name="xbox_pin_step1">‏‮Open‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮app‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮phone‬‏</string>
     <string name="xbox_pin_step2">‏‮Go‬‏ ‏‮to‬‏ ‏‮Settings‬‏ ‏‮&gt;‬‏ ‏‮Connections‬‏ ‏‮&gt;‬‏ ‏‮Add‬‏</string>
diff --git a/app/src/main/res/values-bg/plurals.xml b/app/src/main/res/values-bg/plurals.xml
index 35cbd67cd9..2a382f66c7 100644
--- a/app/src/main/res/values-bg/plurals.xml
+++ b/app/src/main/res/values-bg/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 седмица</item>
         <item quantity="other">{minimumGuildAge} седмици</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">името</item>
-        <item quantity="other">имената</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">името</item>
-        <item quantity="other">имената</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Чакаща кандидатура</item>
         <item quantity="other">{count} Чакащи кандидатури</item>
@@ -1144,13 +1136,12 @@
         <item quantity="other">{count} членове</item>
     </plurals>
     <plurals name="role_row_description_count">
-        <item quantity="one">{count} участник</item>
-        <item quantity="few">{count} участника</item>
-        <item quantity="other">{count} участников</item>
+        <item quantity="one">{count} член</item>
+        <item quantity="other">{count} членове</item>
     </plurals>
     <plurals name="role_row_view_members_count">
-        <item quantity="one">{count} участника</item>
-        <item quantity="other">{count} участников</item>
+        <item quantity="one">{count} член</item>
+        <item quantity="other">{count} членове</item>
     </plurals>
     <plurals name="roles_list_numRoles">
         <item quantity="one">Роля</item>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 81cb9cb476..ab62ac36e4 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -179,7 +179,7 @@
     <string name="add_friend_nearby_stopped">Връзката на Наблизо е прекъсната.</string>
     <string name="add_friend_nearby_title">Сканиране на вълните…</string>
     <string name="add_friend_nickname">Добавяне на псевдоним на приятел</string>
-    <string name="add_friend_other_options">или используйте эти настройки</string>
+    <string name="add_friend_other_options">или използвай тези опции</string>
     <string name="add_friend_placeholder">Въведи потребителско име#0000</string>
     <string name="add_friend_success">Успех! Поканата ти за приятелство до **!!{discordTag}!!** е изпратена.</string>
     <string name="add_keybind">Добавяне на клавишна комбинация</string>
@@ -234,9 +234,9 @@
     <string name="age_gate_view_help_article">Виж помощната статия</string>
     <string name="age_gate_your_birthday">Твоят рожден ден</string>
     <string name="aka">Известен и като</string>
-    <string name="aka_more_avatars_overflow">Просмотреть больше аватаров для разных серверов</string>
+    <string name="aka_more_avatars_overflow">Виж още аватари за сървъри</string>
     <string name="all_servers">Всички сървъри</string>
-    <string name="allow">Разрешить</string>
+    <string name="allow">Разреши</string>
     <string name="allow_direct_messages">Позволи директни съобщения</string>
     <string name="allow_direct_messages_caption">Всеки в сървъра може да ти изпрати съобщение</string>
     <string name="allow_server_dms">Позволи директни съобщения от сървърните членове.</string>
@@ -924,22 +924,22 @@
     <string name="browser_notifications_enabled_body">Swoosh. Известията са включени!</string>
     <string name="browser_output_device_warning">Изходните устройства не могат да се променят, докато използваш браузъра. [Свали](onDownloadClick) десктоп приложението, за да получиш пълен контрол върху изходните устройства.</string>
     <string name="bug_hunter_badge_tooltip">Ловец на бъгове на Discord</string>
-    <string name="bug_report_description">Подробное описание (необязательно)</string>
-    <string name="bug_report_error_name_required">Нужно указать название проблемы</string>
-    <string name="bug_report_error_priority_required">Нужно указать приоритет</string>
-    <string name="bug_report_name">В чём проблема?</string>
-    <string name="bug_report_no_screenshot">Скриншот удалён из жалобы</string>
+    <string name="bug_report_description">Подробно описание (по избор)</string>
+    <string name="bug_report_error_name_required">Името на проблема е задължително</string>
+    <string name="bug_report_error_priority_required">Приоритетът е задължителен</string>
+    <string name="bug_report_name">Какъв е проблемът?</string>
+    <string name="bug_report_no_screenshot">Скрийншотът бе премахнат от доклада</string>
     <string name="bug_report_priority">Приоритет</string>
-    <string name="bug_report_priority_critical_description">**Срочно и важно.** Это **критические проблемы**, которые не позволяют **широкому кругу** пользователей использовать основные функции приложения.</string>
-    <string name="bug_report_priority_critical_title">Критичный (П0)</string>
-    <string name="bug_report_priority_high_description">**Срочно, но не важно.** Это проблемы, которые мешают пользователям использовать ключевые функции приложения, но при этом остальные функции им доступны.</string>
-    <string name="bug_report_priority_high_title">Высокий (П1)</string>
-    <string name="bug_report_priority_low_description">**Не срочно, но важно.** Проблемы, которые отрицательно сказываются на возможности пользователей использовать приложение, но при этом ключевые функции приложения им доступны.</string>
-    <string name="bug_report_priority_low_title">Низкий (П2)</string>
-    <string name="bug_report_priority_very_low_description">**Не срочно и не важно.** П3 даёт нам понять, что существует какая-то проблема, но её исправление можно отложить до того времени, когда мы разберёмся с более насущными проблемами.</string>
-    <string name="bug_report_priority_very_low_title">Очень низкий (П3)</string>
-    <string name="bug_report_status_sending">Отправка жалобы</string>
-    <string name="bug_report_status_sent">Жалоба отправлена</string>
+    <string name="bug_report_priority_critical_description">**Спешно и важно.** Това са **критични за работата** проблеми, които пречат на **голям** брой потребители да използват критични функции на приложението.</string>
+    <string name="bug_report_priority_critical_title">Критичен (P0)</string>
+    <string name="bug_report_priority_high_description">**Спешно, но не важно.** Това са проблеми, които се отразяват на възможността на потребителя да използва основна функция на приложението, като същевременно не му пречат да използва други части на приложението.</string>
+    <string name="bug_report_priority_high_title">Висок (P1)</string>
+    <string name="bug_report_priority_low_description">**Не спешно, но важно.** Това са проблеми, които се отразяват негативно на практическата работа на потребителя с приложението, но не му пречат активно да използва основните функции на приложението.</string>
+    <string name="bug_report_priority_low_title">Нисък (P2)</string>
+    <string name="bug_report_priority_very_low_description">**Не спешно и не важно.** P3 ни дава възможност да отчетем, че нещо е проблем, но тези видове проблеми няма нужда да бъдат коригирани преди други по-належащи притеснения.</string>
+    <string name="bug_report_priority_very_low_title">Много нисък (P3)</string>
+    <string name="bug_report_status_sending">Докладът се изпраща</string>
+    <string name="bug_report_status_sent">Докладът е изпратен</string>
     <string name="build_override">Заместване на компилация</string>
     <string name="build_override_apply">Кандидатствай</string>
     <string name="build_override_clear">Изчистване</string>
@@ -1045,21 +1045,21 @@
     <string name="change_email">Кликни тук, за да промениш своя имейл</string>
     <string name="change_email_short">Промяна на имейл</string>
     <string name="change_friend_nickname">Промяна на псевдоним на приятел</string>
-    <string name="change_guild_member_avatar">Изменить аватар на сервере</string>
+    <string name="change_guild_member_avatar">Промяна на аватара за сървъра</string>
     <string name="change_icon">Промяна на иконата</string>
-    <string name="change_identity">Сменить личность</string>
-    <string name="change_identity_beta_tooltip">На текущий момент возможность выбора разных аватаров для каждого сервера доступна ограниченному кругу пользователей.</string>
-    <string name="change_identity_guild_header_tooltip_button">Ясно</string>
-    <string name="change_identity_guild_header_tooltip_content">Используйте никнейм, а также, при наличии подписки Nitro, разные аватары на каждом из своих серверов.</string>
-    <string name="change_identity_guild_header_tooltip_title">НОВОЕ! Измените свою личность на сервере</string>
-    <string name="change_identity_modal_change_nickname_disabled">Никнейм (выключен)</string>
-    <string name="change_identity_modal_description">Вы можете изменить то, как другие видят вас на этом сервере, выбрав никнейм и аватар для этого сервера.</string>
-    <string name="change_identity_modal_per_server_section">Аватары для серверов $[БЕТА](betaBadgeHook)</string>
-    <string name="change_identity_modal_reset_primary_avatar">Вернуться к основному аватару</string>
-    <string name="change_identity_modal_title">Сменить сервер</string>
-    <string name="change_identity_modal_unknown_error">Неизвестная ошибка</string>
-    <string name="change_identity_modal_uploader_cta">Изменить аватар на сервере</string>
-    <string name="change_identity_modal_upsell">Используйте разные аватары на каждом из своих серверов и многое другое с **подпиской Discord Nitro!**</string>
+    <string name="change_identity">Промяна на самоличността</string>
+    <string name="change_identity_beta_tooltip">Задаването на различен аватар за всеки от твоите сървъри в момента се предлага само на ограничен брой хора.</string>
+    <string name="change_identity_guild_header_tooltip_button">Разбрах</string>
+    <string name="change_identity_guild_header_tooltip_content">Използвай псевдоним и, ако имаш Nitro, различен аватар във всеки от своите сървъри.</string>
+    <string name="change_identity_guild_header_tooltip_title">НОВО! Промяна на самоличността в сървъра</string>
+    <string name="change_identity_modal_change_nickname_disabled">Псевдоним (деактивирано)</string>
+    <string name="change_identity_modal_description">Можеш да промениш как другите те виждат в този сървър, като зададеш псевдоним и аватар за сървъра.</string>
+    <string name="change_identity_modal_per_server_section">Аватар за сървъра $[БЕТА ВЕРСИЯ](betaBadgeHook)</string>
+    <string name="change_identity_modal_reset_primary_avatar">Нулиране до основния аватар</string>
+    <string name="change_identity_modal_title">Промяна на сървъра</string>
+    <string name="change_identity_modal_unknown_error">Неизвестна грешка</string>
+    <string name="change_identity_modal_uploader_cta">Промени аватара за сървъра</string>
+    <string name="change_identity_modal_upsell">Използвай различен аватар във всеки от своите сървъри и още много с **Discord Nitro!**</string>
     <string name="change_log">Промени</string>
     <string name="change_nickname">Промяна на псевдоним</string>
     <string name="change_nickname_description">Членовете с това разрешение могат да сменят псевдонима си.</string>
@@ -1419,7 +1419,6 @@
     <string name="contact_sync_we_found_your_friends_body">Сега сте приятели в Discord. Говори с тях, покани ги на твоя сървър, забавлявай се! Ще те уведомим, когато нови приятели се присъединят към Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Намерихме твоите приятели!</string>
     <string name="content_matching">!!{command}!! съвпадение на съдържание **!!{query}!!**</string>
-    <string name="context_menu_hint">Кликни с десният бутон за повече действия</string>
     <string name="continue_in_browser">Продължи в браузъра</string>
     <string name="continue_to_webapp">Продължи към Discord</string>
     <string name="control_volume">Контролирай силата на звука</string>
@@ -1870,8 +1869,8 @@
     <string name="developer_application_test_mode_placeholder">ID за приложението</string>
     <string name="developer_mode">Режим на разработчик</string>
     <string name="developer_mode_help_text">Режим на разработчик дава достъп до контекстуални менюта, които са полезни за хора, които създават ботове, използвайки [Discord API]({apiDocsUrl}).</string>
-    <string name="developer_settings_bug_reporting_description">Позволяет сообщить Discord об ошибке после того, как вы делаете скриншот</string>
-    <string name="developer_settings_bug_reporting_title">Скриншот для сообщения об ошибке</string>
+    <string name="developer_settings_bug_reporting_description">Активира възможността за изпращане на доклад за грешка на Discord, след като направиш скрийншот</string>
+    <string name="developer_settings_bug_reporting_title">Направи скрийншот, за да докладваш грешка</string>
     <string name="device_settings">Настройки на устройството</string>
     <string name="dialog_just_so_you_know">Споделяме с теб!</string>
     <string name="direct_message">Директно съобщение</string>
@@ -2056,7 +2055,7 @@
     <string name="enable_ingame_overlay">Активиране на наслагването в игра.</string>
     <string name="enable_noise_cancellation">Активирай подтискане на шума</string>
     <string name="enable_notifications">Активирай известия</string>
-    <string name="enable_notifications_titlecase">Включить уведомления</string>
+    <string name="enable_notifications_titlecase">Активирай известия</string>
     <string name="enable_permission">Активирай разрешение</string>
     <string name="enable_privacy_access">Можеш да разрешиш достъпа от настройките за поверителност.</string>
     <string name="enable_public_modal_content_filter_help">Discord автоматично сканира и изтрива медийни файлове, изпратени в този сървър, които съдържат нецензурно съдържание (не важи за NSFW канали).</string>
@@ -2900,8 +2899,8 @@
     <string name="guild_join_reason_other">Друго</string>
     <string name="guild_join_reason_search_online">Потърсих сървър онлайн</string>
     <string name="guild_join_reason_title_label">Твоят отговор</string>
-    <string name="guild_member_avatar_upsell_body">Будьте, кем захотите: используйте разные аватары на каждом из своих серверов, разблокируйте анимированные аватары — всё это [и многое другое с подпиской Discord Nitro!](onAndMore)</string>
-    <string name="guild_member_avatar_upsell_title">Хотите сменить аватар?</string>
+    <string name="guild_member_avatar_upsell_body">Бъди това, което искаш, и използвай различен аватар за всеки от своите сървъри, отключи анимирани аватари [и още много с Discord Nitro!](onAndMore)</string>
+    <string name="guild_member_avatar_upsell_title">Искаш да използваш различен аватар?</string>
     <string name="guild_members_header">!!{guild}!! членове</string>
     <string name="guild_members_search_no_result">Не бяха открити членове.</string>
     <string name="guild_owner">Собственик на сървъра</string>
@@ -3044,7 +3043,7 @@
     <string name="guild_settings_audit_log_channel_stage_create">$[**!!{user}!!**](userHook) създаде канал сцена $[**!!{target}!!**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**!!{user}!!**](userHook) създаде текстов канал $[**!!{target}!!**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Смени темата на **!!{newValue}!!**</string>
-    <string name="guild_settings_audit_log_channel_topic_clear">Тема **очищена**</string>
+    <string name="guild_settings_audit_log_channel_topic_clear">**Изчисти** темата</string>
     <string name="guild_settings_audit_log_channel_topic_create">Задаване на темата на **!!{newValue}!!**</string>
     <string name="guild_settings_audit_log_channel_type_change">Смени типа от **!!{oldValue}!!** на **!!{newValue}!!**</string>
     <string name="guild_settings_audit_log_channel_type_create">Задай типа на **!!{newValue}!!**</string>
@@ -3222,8 +3221,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Сървърите в Откриване трябва да са на възраст от поне {minimumGuildAge}. Провери отново на {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Сървърът е прекалено млад</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Твоят сървър **$[не](doesNotHook)** отговаря на всички изисквания, за да бъде част от Откриване на сървър.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Трябва да промениш {numCategories} на категорията: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Трябва да промениш {numChannels} на канала: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Трябва да промениш твоето $[описание](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Трябва да промениш $[името на сървъра](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Увеличи броя на комуникаторите всяка седмица</string>
@@ -4369,7 +4366,7 @@
     <string name="login_as">Влизаш като !!{username}!!</string>
     <string name="login_body">Влез със своя имейл, за да започнеш да говориш.</string>
     <string name="login_required">Изисква се валидно име за вписване.</string>
-    <string name="login_stage">Зайти в качестве слушателя</string>
+    <string name="login_stage">Влез и слушай</string>
     <string name="login_title">Добре дошли отново!</string>
     <string name="login_with_qr">Влезте с QR код</string>
     <string name="login_with_qr_description">Сканирай това с **мобилното приложение Discord**, за да влезеш незабавно.</string>
@@ -4418,10 +4415,10 @@
     <string name="mark_as_read">Маркиране като прочетено</string>
     <string name="mark_unread">Маркирай като непрочетено</string>
     <string name="marked_as_read">Маркирани като прочетени</string>
-    <string name="marketing_premium_tier_1_perk_list_omit_guild_cap">Не включает дополнительные серверы</string>
-    <string name="marketing_premium_tier_1_perk_list_omit_message_length">Не включает длинные сообщения</string>
-    <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages">Не включает длинные сообщения</string>
-    <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds">Не включает дополнительные серверы</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_guild_cap">Не включва повече сървъри</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_message_length">Не включва по-дълги съобщения</string>
+    <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages">Не включва по-дълги съобщения</string>
+    <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds">Не включва повече сървъри</string>
     <string name="marketing_refresh_premium_features_badge_heading">Пусть все знают о вашей поддержке</string>
     <string name="marketing_refresh_premium_features_badge_subheading">Значок в профиле показывает, как долго вы поддерживаете Discord.</string>
     <string name="marketing_refresh_premium_features_emoji_heading">Больше силы эмодзи</string>
@@ -4437,22 +4434,22 @@
     <string name="marketing_refresh_premium_features_profile_subheading">Поставьте анимированный аватар и получите особый тег.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description">Не хотите ничего лишнего? Перейдите на упрощённый тариф с меньшим количеством бонусов $[подробности](infoHook), продолжайте поддерживать Discord и получите скидку !!{discountPercentage}!! на бусты сервера.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_fps">Исходное разрешение до 1080p при 60 кадрах в секунду.</string>
-    <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_guild_cap">**Не включает** дополнительные серверы.</string>
+    <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_guild_cap">**Не** включва повече сървъри.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_label">Не включает {numFreeGuildSubscriptions}. Загружайте файлы до 50 МБ (вместо 100 МБ) и получите разрешение до 1080p при 60 кадрах в секунду.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_message_length">**Не включает** увеличенную длину сообщений.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_no_premium_guild_subscriptions">**Не** включает {numFreeGuildSubscriptions}.</string>
-    <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_profile_customization">**Не включает** баннер профиля.</string>
+    <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_profile_customization">**Не** включва банер на профила.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_upload">Загружайте файлы до 50 МБ (вместо 100 МБ).</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_with_price">Не хотите ничего лишнего? Перейдите на упрощённый тариф с меньшим количеством бонусов $[подробности](infoHook), продолжайте поддерживать Discord и получите скидку !!{discountPercentage}!! на бусты сервера. Выбирайте: **!!{monthlyPrice}!! в месяц** или **!!{yearlyPrice}!! в год**.</string>
-    <string name="marketing_refresh_premium_tier_1_cta_description_with_price_no_info_hook">Не хотите ничего лишнего? Перейдите на упрощённый тариф с меньшим количеством бонусов, продолжайте поддерживать Discord и получите скидку !!{discountPercentage}!! на бусты сервера. Выбирайте: **!!{monthlyPrice}!! в месяц** или **!!{yearlyPrice}!! в год**.</string>
+    <string name="marketing_refresh_premium_tier_1_cta_description_with_price_no_info_hook">Искаш нещата да са опростени? Наслади се на лек план с по-малко бонуси, продължи да поддържаш Discord и вземи !!{discountPercentage}!! отстъпка за усилвания на сървър. Избери между **!!{monthlyPrice}!! на месец** или **!!{yearlyPrice}!! на година**.</string>
     <string name="marketing_refresh_premium_tier_2_cta_subtitle">Выберите подходящий тариф и начните создавать свою коллекцию эмодзи.</string>
     <string name="marketing_refresh_premium_tier_2_cta_title">Готовы перейти на Nitro?</string>
     <string name="marketing_refresh_premium_tier_2_subtitle">Улучшите свои эмодзи, персонализируйте профиль и выделитесь на своих серверах.</string>
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Улучшите свои эмодзи, персонализируйте профиль и заявите о себе на своих серверах. Выбирайте: **!!{monthlyPrice}!! в месяц** или **!!{yearlyPrice}!! в год**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Расширьте свои возможности в Discord.</string>
-    <string name="marketing_tier_1_perk_list_boost_discount">30%% скидка на бусты сервера</string>
-    <string name="marketing_tier_1_perk_list_stream_quality">Разрешение до 1080p при 60 кадрах в секунду</string>
-    <string name="marketing_tier_1_perk_list_upload_size">Загрузка файлов до 50 МБ (вместо 100 МБ)</string>
+    <string name="marketing_tier_1_perk_list_boost_discount">30%% отстъпка от цената за усилвания на сървър</string>
+    <string name="marketing_tier_1_perk_list_stream_quality">Резолюция до 1080p и до 60 кадъра в секунда</string>
+    <string name="marketing_tier_1_perk_list_upload_size">50 MB място за качване вместо 100 MB</string>
     <string name="masked_link_body">Тази връзка ще те отведе до **!!{url}!!**. Наистина ли искаш да отидеш там?</string>
     <string name="masked_link_cancel">Отказ</string>
     <string name="masked_link_confirm">Да!</string>
@@ -4482,7 +4479,7 @@
     <string name="max_uses">{maxUses}</string>
     <string name="max_uses_description_mobile">{maxUses}</string>
     <string name="max_uses_description_unlimited_uses">неограничен брой използвания</string>
-    <string name="maybe_later">Может, позже</string>
+    <string name="maybe_later">Може би по-късно</string>
     <string name="me">Аз</string>
     <string name="media_keyboard_browse">Преглед</string>
     <string name="media_keyboard_gift">Подарък</string>
@@ -4630,12 +4627,12 @@
     <string name="mention_role_autocomplete_description_mobile">Уведомява потребителите с тази роля в този канал.</string>
     <string name="mention_users_with_role">Уведоми потребителите с тази роля, които имат разрешение да разглеждат този канал.</string>
     <string name="mentions">Споменавания</string>
-    <string name="mentions_and_quickswitcher">Упоминания и быстрый переключатель</string>
+    <string name="mentions_and_quickswitcher">Споменавания и бързо превключване</string>
     <string name="mentions_count">{count} споменавания</string>
     <string name="message_action_reply">Отговор</string>
     <string name="message_actions_menu_label">Действия със съобщения</string>
-    <string name="message_button_component_link_context_menu_copy">Копировать ссылку</string>
-    <string name="message_button_component_link_context_menu_name">Действия, привязанные к кнопкам</string>
+    <string name="message_button_component_link_context_menu_copy">Копирай връзка</string>
+    <string name="message_button_component_link_context_menu_name">Бутон за действия с връзка</string>
     <string name="message_display_mode_label">Показване на съобщение</string>
     <string name="message_edited">редактирано</string>
     <string name="message_header_replied">$[](currentAuthor) $[отговори](replyHook)</string>
@@ -4778,8 +4775,8 @@
     <string name="mutual_guilds">Общи сървъри</string>
     <string name="n_days">{days}</string>
     <string name="nearby_scan">Сканиране наблизо</string>
-    <string name="nearby_scan_cta_title">Поиск через Nearby</string>
-    <string name="nearby_scan_subtitle">Включите Bluetooth и Wi-Fi, чтобы найти друзей поблизости.</string>
+    <string name="nearby_scan_cta_title">Сканиране наблизо</string>
+    <string name="nearby_scan_subtitle">Използвай Bluetooth и Wifi, за да намериш приятели наблизо.</string>
     <string name="need_account">Трябва ти акаунт?</string>
     <string name="network_error_bad_request">Възникна грешна мрежова заявка, моля, опитай пак.</string>
     <string name="network_error_cloudflare_intermittent">Може да е имало кратко прекъсване на CloudFlare услугата; моля, опитай пак.</string>
@@ -4951,8 +4948,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Имаш още {days} да получиш един безплатен месец абонамент за Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Имаш още {hours} да получиш един безплатен месец абонамент за Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Имаш още {minutes} да получиш един безплатен месец абонамент за Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Здравей, абонат на Nitro, честито! Получаваш 3 месеца Xbox Game Pass за PC от нас!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Заяви</string>
     <string name="notice_product_feedback_survey">Искаш ли да участваш в дискусия, свързана с обратната връзка относно продуктите с нас?</string>
     <string name="notice_product_feedback_survey_cta">Съобщи ни тук!</string>
     <string name="notice_register_to_vote">Регистриран ли си за гласуване? Провери статуса си и се регистрирай за две минути.</string>
@@ -5062,9 +5057,9 @@
     <string name="nux_navigation_help_channels">Сървърите са изградени от канали; места, където хората говорят на различни теми</string>
     <string name="nux_navigation_help_dms">Добави приятели и започни директен чат с тях</string>
     <string name="nux_navigation_help_guild">Сървърът е супер зареден групов чат, където хората се събират да си общуват</string>
-    <string name="nux_notification_permission_alert_title">Разрешить уведомления</string>
-    <string name="nux_notification_permission_prompt_subtitle">Будьте в курсе всего! Настройте уведомления, чтобы не пропустить ни одно сообщение от друзей.</string>
-    <string name="nux_notification_permission_prompt_text">Вы будете получать push-уведомления о событиях в Discord, таких как сообщения, упоминания, запросы на добавление в друзья и мероприятия.</string>
+    <string name="nux_notification_permission_alert_title">Разреши известия</string>
+    <string name="nux_notification_permission_prompt_subtitle">Не пропускай нищо! Настрой си известията, за да знаеш кога твоите приятели ти изпращат съобщения.</string>
+    <string name="nux_notification_permission_prompt_text">Ще получаваш насочени известия за дейности в Discord като съобщения, споменавания, покани за приятелство и събития.</string>
     <string name="nux_overlay_description">Виж кой говори и получи достъп до преки пътища, докато използваш други приложения – няма нужда да се връщащ в Discord.</string>
     <string name="nux_overlay_enable">Активиране на наслагване</string>
     <string name="nux_overlay_title">Запознай се с мобилното гласово наслагване!</string>
@@ -5139,6 +5134,7 @@
     <string name="out_of_date_action">Актуализирай Discord</string>
     <string name="out_of_date_description">Направихме няколко жестоки промени в Discord (и май оправихме някой бъг тук-там). Актуализирай, за да продължиш.</string>
     <string name="out_of_date_title">Не си актуален</string>
+    <string name="outbound_promotion_redemption_modal_title">Страхотно!</string>
     <string name="outgoing_friend_request">Изходяща заявка за приятелство</string>
     <string name="outgoing_friend_request_delete_msg">Наистина ли искаш да изтриеш своята заявка за приятелство до **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Изходяща покана за приятелство към !!{name}!!</string>
@@ -5275,8 +5271,8 @@
     <string name="pending">Чакащи</string>
     <string name="pending_friends_list_header">Чакащи приятели</string>
     <string name="people">Хора</string>
-    <string name="per_guild_avatars_premium_feature_description">Будьте, кем захотите, и используйте разные аватары на каждом из своих серверов.</string>
-    <string name="per_guild_avatars_premium_feature_title">Несколько аватаров</string>
+    <string name="per_guild_avatars_premium_feature_description">Бъди това, което искаш, и използвай различен аватар за всеки от своите сървъри.</string>
+    <string name="per_guild_avatars_premium_feature_title">Няколко аватара</string>
     <string name="percentage_since_last_week">{percentage}%% от миналата седмица</string>
     <string name="permission_helpdesk">Имате нужда от помощ за разрешенията?</string>
     <string name="permission_media_denied">Отказан достъп до медийни файлове - Discord се нуждае от достъп до диск за съхранение за публикуване на прикачени файлове.</string>
@@ -5373,8 +5369,8 @@
     <string name="premium_chat_perks_description_premium_guild_included">{numFreeGuildSubscriptions} с Nitro за моментално достигане на ниво 1 на сървъра.</string>
     <string name="premium_chat_perks_description_upload_limit">Качване на файлове с по-голям размер от {maxUploadStandard} на {maxUploadPremiumTier2} с Nitro или {maxUploadPremiumTier1} с Nitro Classic.</string>
     <string name="premium_chat_perks_discriminator_mobile">Избери своя персонален таг</string>
-    <string name="premium_chat_perks_max_guilds">Повысьте лимит серверов, к которым вы можете присоединиться, с {nonPremiumMaxGuilds} до {premiumMaxGuilds}</string>
-    <string name="premium_chat_perks_max_message_length">Выражайте свои мысли полнее — количество символов увеличится с {nonPremiumMaxMessageLength} до {premiumMaxMessageLength}</string>
+    <string name="premium_chat_perks_max_guilds">Удвои броя на сървърите, към които можеш да се присъединиш, от {nonPremiumMaxGuilds} на {premiumMaxGuilds}</string>
+    <string name="premium_chat_perks_max_message_length">Казвай какво мислиш с увеличен лимит за знаци от {nonPremiumMaxMessageLength} на {premiumMaxMessageLength} знака</string>
     <string name="premium_chat_perks_premium_guild_subscription">Усили любимия си сървър!</string>
     <string name="premium_chat_perks_rep_mobile">Ексклузивен Nitro бадж в профила ти</string>
     <string name="premium_chat_perks_screenshare_mobile">Споделяне на екран на настолен компютър със 720p 60fps или 1080p 30fps</string>
@@ -5388,7 +5384,7 @@
     <string name="premium_features_chat_perks_header">Получи супер заредени чат бонуси!</string>
     <string name="premium_features_message_length_heading">По-дълги съобщения</string>
     <string name="premium_features_message_length_subheading">Казвай какво мислиш с увеличен лимит за знаци.</string>
-    <string name="premium_features_profile_customization_header">Оформите профиль со вкусом</string>
+    <string name="premium_features_profile_customization_header">Стилизирай профила си</string>
     <string name="premium_features_profile_customization_subheader">Изрази себе си с анимиран аватар, банер на профила и персонализиран таг.</string>
     <string name="premium_game">Игра на Discord Nitro</string>
     <string name="premium_gift_button_label">Изпрати подарък</string>
@@ -5596,14 +5592,14 @@
     <string name="premium_marketing_feature_premium_go_live_description">По-добра резолюция на видеото за всички твои стриймове. $[Информация](infoHook)</string>
     <string name="premium_marketing_feature_premium_go_live_title">HD Видео</string>
     <string name="premium_marketing_feature_premium_guild_description">Вземи {numFreeGuildSubscriptions} и !!{percentageOff}!! отстъпка за допълнителни усилвания. $[Научи повече](learnMoreHook).</string>
-    <string name="premium_marketing_feature_premium_guild_title">Поддержите свой сервер</string>
+    <string name="premium_marketing_feature_premium_guild_title">Поддържай сървъра си</string>
     <string name="premium_marketing_feature_premium_upload_size_description">Качвай каквото пожелаеш с увеличен размер на качване от 100 MB.</string>
     <string name="premium_marketing_feature_premium_upload_size_title">По-големи качвания</string>
     <string name="premium_marketing_feature_profile_description">Персонализирай профила си с анимиран аватар и персонализиран таг.</string>
     <string name="premium_marketing_feature_profile_title">Персонализиран профил</string>
     <string name="premium_marketing_hero_body">Надгради емотиконите си, персонализирай потребителския си профил и се откроявай в твоите сървъри.</string>
     <string name="premium_marketing_hero_header">Направи Discord свой</string>
-    <string name="premium_message_length_chatbox_flair">Благодаря подписке Nitro количество символов в сообщении увеличено до {maxLength}!</string>
+    <string name="premium_message_length_chatbox_flair">Nitro ти дава по {maxLength} знака на съобщение!</string>
     <string name="premium_message_length_roadblock_modal_body">Ти достигна ограничението за брой знаци от {maxLength}. Казвай какво мислиш с 2x по-дълги съобщения, качвай по-големи файлове и още с Discord Nitro. [](onLearnMore)</string>
     <string name="premium_message_length_roadblock_modal_header">Съобщението ти е прекалено дълго…</string>
     <string name="premium_message_length_upsell_modal_body">Казвай какво мислиш с 2x по-дълги съобщения, качвай по-големи файлове и [още с Discord Nitro!](onLearnMore)</string>
@@ -5819,12 +5815,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">За да създадеш този частен канал, ти е нужно разрешение за **преглед на канали**.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">За да създадеш този частен канал, са нужни разрешения за **преглед на канали** и за **свързване**.</string>
     <string name="profile">Профил</string>
+    <string name="profile_banner_icon_tooltip_upsell">Качи свой собствен персонализиран банер и много други с Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Персонализирането на профил в момента се предлага само на ограничен брой хора.</string>
+    <string name="profile_customization_bio_placeholder">Кажи на света малко за себе си</string>
     <string name="profile_customization_marketing_tooltip_body">Изрази себе си с раздел „За мен“ и, ако имаш Nitro – банер на профила.</string>
     <string name="profile_customization_marketing_tooltip_cta">Разбрах</string>
     <string name="profile_customization_marketing_tooltip_header">Ново персонализиране на профила!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Ексклузивно за Nitro</string>
     <string name="promotion_card_action_claim">Заяви</string>
-    <string name="promotion_card_body_claimed_hidden">Ти вече заяви това, но кодът е скрит поради Стрийминг режим.</string>
     <string name="promotion_error_body">Явно нещо се обърка и не можеш да използваш този код. Съжаляваме за това.</string>
     <string name="promotion_error_title">Изчакай малко…</string>
     <string name="promotion_existing_subscriber_title">О, не!</string>
@@ -5929,7 +5927,7 @@
     <string name="recent_mentions_pro_tip">Всеки път, когато някой те спомене, това ще се запише тук за 7 дни.</string>
     <string name="recent_mentions_roles_and_direct">пряко и @role</string>
     <string name="recents_notifications_menu_label">Действия с известия</string>
-    <string name="recommended">Рекомендованные</string>
+    <string name="recommended">Препоръчано</string>
     <string name="reconnect">Повторно свързване</string>
     <string name="reconnecting">Повторно свързване</string>
     <string name="refund">Върната сума</string>
@@ -6018,10 +6016,10 @@
     <string name="request_to_speak_empty_list_title">Няма искания</string>
     <string name="request_to_speak_invitation_send">Изпратена покана</string>
     <string name="request_to_speak_list_title">Искания за говорене – {numHands}</string>
-    <string name="request_to_speak_member_info_member">Участник</string>
-    <string name="request_to_speak_member_info_member_roles">Участник с ролью (ролями)</string>
-    <string name="request_to_speak_member_info_new_member">Новый участник</string>
-    <string name="request_to_speak_member_info_non_member">Посетитель (Не участник)</string>
+    <string name="request_to_speak_member_info_member">Член</string>
+    <string name="request_to_speak_member_info_member_roles">Член с роля(и)</string>
+    <string name="request_to_speak_member_info_new_member">Нов член</string>
+    <string name="request_to_speak_member_info_non_member">Посетител (не е член)</string>
     <string name="resend">Изпрати пак</string>
     <string name="resend_code">Повторно изпращане на код</string>
     <string name="resend_email">Изпрати ми отново имейл за потвърждение!</string>
@@ -6253,8 +6251,8 @@
     <string name="role_remove_member_confirm_title">Премахване на член</string>
     <string name="role_remove_member_managed">Членовете не могат да бъдат ръчно добавяни или премахвани от тази роля</string>
     <string name="role_required_single_user_message">(Само ти можеш да виждаш този канал)</string>
-    <string name="role_row_description">!!{name}!!, {count}, изменить</string>
-    <string name="role_row_view_members">Показать {count}</string>
+    <string name="role_row_description">!!{name}!!, {count}, редактиране</string>
+    <string name="role_row_view_members">Преглед на {count}</string>
     <string name="role_sample_message">камъните са наистина стари</string>
     <string name="roles">Роли</string>
     <string name="roles_list">{numRoles}</string>
@@ -6565,7 +6563,7 @@
     <string name="show_spoiler_on_servers_i_mod">На сървъри, които модерирам</string>
     <string name="skip">Пропускане</string>
     <string name="skip_all_tips">Пропусни всички съвети</string>
-    <string name="skip_for_now">Не сейчас</string>
+    <string name="skip_for_now">Пропусни засега</string>
     <string name="skip_to_content">Прескочи към съдържание</string>
     <string name="sku_payment_steps_label">Купуване</string>
     <string name="sky_blue">Небесно синьо</string>
@@ -6652,7 +6650,7 @@
     <string name="stage_channel_no_audience">Все още няма слушатели</string>
     <string name="stage_channel_no_topic">Все още няма тема. Напиши тема, за да стартираш сцената!</string>
     <string name="stage_channel_people_count">{count} ({speakerCount})</string>
-    <string name="stage_channel_permission_microphone_denied">Если вы хотите говорить, Discord должен получить доступ к аудио.</string>
+    <string name="stage_channel_permission_microphone_denied">Discord изисква аудио достъп, за да ти позволи да говориш.</string>
     <string name="stage_channel_start_alt_text">Зелена икона на канал сцена със знак плюс</string>
     <string name="stage_channel_start_subtitle">Избери тема, за да започнеш разговора.</string>
     <string name="stage_channel_start_title">Стартирай сцената</string>
@@ -6732,51 +6730,50 @@
     <string name="stage_voice_channel">Подготовка на канал</string>
     <string name="start">Старт</string>
     <string name="start_call">Започни обаждане</string>
-    <string name="start_stage_button_text">Открыть трибуну</string>
-    <string name="start_stage_button_text_mobile">Открыть трибуну</string>
+    <string name="start_stage_button_text">Стартиране на сцена</string>
+    <string name="start_stage_button_text_mobile">Стартиране на сцена</string>
     <string name="start_stage_channel_event_members_subtitle">Само членовете на сървъра ти могат да се присъединят.</string>
-    <string name="start_stage_channel_event_members_title">Только для участников</string>
+    <string name="start_stage_channel_event_members_title">Само за членове</string>
     <string name="start_stage_channel_event_modal_button">Стартирай сцената</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Ти ще бъдеш говорител, когато подготовката се отвори.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Напиши тема, за да обявиш, че сцената ти е на живо.</string>
-    <string name="start_stage_channel_event_modal_title">О чём вы будете говорить?</string>
+    <string name="start_stage_channel_event_modal_title">За какво ще си говорите?</string>
     <string name="start_stage_channel_event_modal_topic_label">Тема на подготовката</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Дебатът приключи: диетичната е по-добра от обикновената</string>
     <string name="start_stage_channel_event_modal_topic_required">Трябва да зададеш тема. Това е правило, което измислихме.</string>
     <string name="start_stage_channel_event_privacy_title">Поверителност</string>
     <string name="start_stage_channel_event_public_everyone_warning">Можеш да стартираш публични сцени само в канали, към които могат да се присъединят всички (@everyone).</string>
-    <string name="start_stage_channel_event_public_explanation">Слушатели также смогут присоединиться к вашему серверу, пока трибуна открыта. Публичные трибуны должны соответствовать [дополнительным требованиям.]({articleURL})</string>
+    <string name="start_stage_channel_event_public_explanation">Хората, които слушат, ще могат също така да се присъединят към сървъра ти, докато сцената се провежда на живо. Публичните сцени трябва да спазват [допълнителни указания.]({articleURL})</string>
     <string name="start_stage_channel_event_public_permanent_disclaimer">Публичните сцени не могат да станат затворени.</string>
     <string name="start_stage_channel_event_public_permissions_disclaimer">Само модераторите на сцената с разрешение за покана на членове могат да направят сцената си публична.</string>
-    <string name="start_stage_channel_event_public_subtitle">Ваша трибуна появится в списке «Путешествия по трибунам». Кто угодно сможет присоединиться к ней в качестве слушателя!</string>
+    <string name="start_stage_channel_event_public_subtitle">Сцената ти ще бъде изброена в „Откриване на сцени“. Всеки може да се включи да слуша!</string>
     <string name="start_stage_channel_event_public_title">Публичен</string>
-    <string name="start_stage_modal_confirm_text">Открыть трибуну</string>
-    <string name="start_stage_modal_select_channel">Выберите трибуну</string>
-    <string name="start_stage_modal_server_modal_label">Открыть трибуну</string>
-    <string name="start_stage_modal_server_selection_bullet_1">Создайте [сервер сообщества.]({helpdeskArticle})</string>
-    <string name="start_stage_modal_server_selection_bullet_2">Создайте трибуну.</string>
-    <string name="start_stage_modal_server_selection_bullet_3">Придумайте интересное событие.</string>
-    <string name="start_stage_modal_server_selection_bullet_4">Организуйте и откройте свою трибуну!</string>
-    <string name="start_stage_modal_server_selection_button_hint">Хотите узнать больше?</string>
-    <string name="start_stage_modal_server_selection_button_text">Узнайте, как организовать хорошую трибуну</string>
-    <string name="start_stage_modal_server_selection_empty_title">Вы пока не можете открыть трибуну</string>
-    <string name="start_stage_modal_server_selection_subtitle">Увеличивайте и развивайте своё сообщество с помощью трибун.</string>
-    <string name="start_stage_modal_server_selection_title">В каком сообществе вы хотите провести голосовое событие?</string>
-    <string name="start_stage_modal_set_topic_change_channel">Место проведения вашей трибуны: $[**!!{stageName}!!**](stageHook). $[Изменить канал](changeHook)</string>
-    <string name="start_stage_modal_set_topic_create_channel">Мы автоматически создадим для вас трибуну под названием $[**!!{stageName}!!**](stageHook). Вы можете изменить его позже.</string>
-    <string name="start_stage_modal_set_topic_help_text">Место проведения вашей трибуны: $[**!!{stageName}!!**](stageHook).</string>
-    <string name="start_stage_modal_set_topic_select_label">Трибуна</string>
-    <string name="start_stage_modal_set_topic_subtitle">Опишите тематику вашей трибуны, чтобы объявить о её открытии.</string>
-    <string name="start_stage_modal_set_topic_title">О чём вы будете говорить?</string>
-    <string name="start_stage_public_confirm">Сделаем это</string>
-    <string name="start_stage_public_info_alt_text">Выступающие</string>
-    <string name="start_stage_public_info_section_four">Публичные трибуны не могут содержать откровенные сообщения или контент сексуального характера. Также описание темы трибуны должно быть точным и информативным.</string>
-    <string name="start_stage_public_info_section_one">Эта трибуна появится в списке «Путешествия по трибунам». Каждый сможет присоединиться к ней в качестве слушателя!</string>
-    <string name="start_stage_public_info_section_three">Публичные трибуны должны соответствовать некоторым дополнительным требованиям. [Ознакомиться с ними можно здесь.]({articleURL})</string>
-    <string name="start_stage_public_info_section_two">Пока трибуна находится в открытом доступе, слушатели смогут присоединиться к вашему серверу и стать частью вашего сообщества.</string>
-    <string name="start_stage_public_info_title">Ваша трибуна становится публичной!</string>
-    <string name="start_stage_public_info_title_caption">Вот что вам нужно знать.</string>
-    <string name="start_stage_public_short_topic_warning">Достаточно ли понятно описание вашей темы? Убедитесь, что люди, просматривающие «Путешествие по трибунам», легко поймут, чему посвящены ваши трибуна и сообщество.</string>
+    <string name="start_stage_modal_confirm_text">Стартирай сцената</string>
+    <string name="start_stage_modal_select_channel">Избери канал на сцена</string>
+    <string name="start_stage_modal_server_modal_label">Стартиране на сцена</string>
+    <string name="start_stage_modal_server_selection_bullet_1">Създай [сървър на общност.]({helpdeskArticle})</string>
+    <string name="start_stage_modal_server_selection_bullet_2">Създай канал на сцена.</string>
+    <string name="start_stage_modal_server_selection_bullet_3">Създай страхотно събитие.</string>
+    <string name="start_stage_modal_server_selection_bullet_4">Стартирай и отвори своята сцена!</string>
+    <string name="start_stage_modal_server_selection_button_hint">Искаш да научиш повече?</string>
+    <string name="start_stage_modal_server_selection_button_text">Научи как да хостваш страхотна сцена</string>
+    <string name="start_stage_modal_server_selection_empty_title">Все още не можеш да стартираш сцена</string>
+    <string name="start_stage_modal_server_selection_subtitle">Забавлявай и разшири общността си с канали на сцена</string>
+    <string name="start_stage_modal_server_selection_title">В коя общност искаш да проведеш аудио събитие?</string>
+    <string name="start_stage_modal_set_topic_change_channel">Сцената ти ще бъде хоствана в $[**!!{stageName}!!**](stageHook). $[Промени канала](changeHook)</string>
+    <string name="start_stage_modal_set_topic_create_channel">Ние ще създадем автоматично канал на сцена за теб, наречен $[**!!{stageName}!!**](stageHook). Можеш да промениш името по-късно.</string>
+    <string name="start_stage_modal_set_topic_help_text">Сцената ти ще бъде хоствана в $[**!!{stageName}!!**](stageHook).</string>
+    <string name="start_stage_modal_set_topic_select_label">Канал на сцена</string>
+    <string name="start_stage_modal_set_topic_subtitle">Напиши тема, за да обявиш, че сцената ти е на живо.</string>
+    <string name="start_stage_modal_set_topic_title">За какво ще си говорите?</string>
+    <string name="start_stage_public_confirm">Да го направим</string>
+    <string name="start_stage_public_info_alt_text">Изпълнители</string>
+    <string name="start_stage_public_info_section_four">Публичните сцени не могат да включват нецензурно, графично или сексуално съдържание и трябва да се увериш, че темата ти е точна и описателна.</string>
+    <string name="start_stage_public_info_section_one">Тази сцена ще бъде изброена в „Откриване на сцени“. Всеки може да се включи и да слуша!</string>
+    <string name="start_stage_public_info_section_three">Публичните сцени трябва да спазват няколко допълнителни правила. [Прочети пълните указания тук.]({articleURL})</string>
+    <string name="start_stage_public_info_section_two">Докато сцената се провежда на живо, слушателите могат да се присъединят към сървъра ти и да станат част от твоята общност.</string>
+    <string name="start_stage_public_info_title">Сцената ти става публична!</string>
+    <string name="start_stage_public_info_title_caption">Ето някои неща, които трябва да знаеш.</string>
+    <string name="start_stage_public_short_topic_warning">Достатъчно описателна ли е темата ти? Увери се, че е ясно разбираема, за да могат хората, разглеждащи „Откриване на сцени“, лесно да разберат какви си твоята сцена и общност.</string>
     <string name="start_video_call">Започни видео обаждане</string>
     <string name="start_voice_call">Започни гласово обаждане</string>
     <string name="starting_at">На цена от</string>
@@ -6801,7 +6798,7 @@
     <string name="sticker_from_pack">от **!!{packName}!!**</string>
     <string name="sticker_notification_body">Изпрати стикер: !!{stickerName}!!</string>
     <string name="sticker_pack_available_with_premium">Вземи с Nitro</string>
-    <string name="sticker_pack_get_premium">Подписаться на Nitro</string>
+    <string name="sticker_pack_get_premium">Вземи Nitro</string>
     <string name="sticker_pack_premium_cta">Вземи Nitro</string>
     <string name="sticker_pack_price_free">Безплатно</string>
     <string name="sticker_pack_price_free_with_premium_tier_1">Безплатно с Nitro Classic</string>
@@ -6827,8 +6824,8 @@
     <string name="sticker_picker_view_all">Виж всички</string>
     <string name="sticker_popout_countdown_header">Остава ограничено време</string>
     <string name="sticker_popout_pack_info">Това е от пакета стикери **{stickerPackName}**. Получаваш {discount}%% отстъпка с [Nitro](onClick).</string>
-    <string name="sticker_popout_pack_info_nonpremium">Нравится стикер? Оформите подписку Nitro, разблокируйте этот и более 300 похожих стикеров и получите другие преимущества.</string>
-    <string name="sticker_popout_pack_info_premium">Это стикер из набора **{stickerPackName}**.</string>
+    <string name="sticker_popout_pack_info_nonpremium">Харесва ли ти? Вземи Nitro, за да използваш още 300 стикера като този и други.</string>
+    <string name="sticker_popout_pack_info_premium">Това е стикер от **{stickerPackName}**.</string>
     <string name="sticker_popout_pack_info_unavailable">Това е стикер от **{stickerPackName}**. Те вече не се предлагат.</string>
     <string name="sticker_premium_tier_1_upsell_alert_upgrade_cta">Абонирай се за Nitro Classic</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount">Получи {percent} отстъпка за покупки на усилване</string>
@@ -6842,7 +6839,7 @@
     <string name="sticker_premium_tier_2_upsell_perk_guild_subscription">Получи {numGuildSubscriptions} безплатни усилвания и {discountPercent} отстъпка при покупка на усилвания</string>
     <string name="sticker_premium_tier_2_upsell_perk_premium_pack">Постоянен достъп до пакета !!{stickerPackName}!!</string>
     <string name="sticker_premium_tier_2_upsell_perk_premium_subscription">Страхотни чат бонуси: анимирани емотикони, персонализиран Discord Tag, по-добър стрийминг Go Live и още</string>
-    <string name="sticker_premium_tier_2_upsell_perk_quantity">Выражайте свои чувства с помощью более 300 стикеров, доступных только подписчикам Nitro</string>
+    <string name="sticker_premium_tier_2_upsell_perk_quantity">Изразявай себе си с 300 стикера само за Nitro</string>
     <string name="sticker_purchase_modal_confirm_body_content">Пакетът стикери !!{packName}!! бе добавен към чекмеджето ти със стикери.</string>
     <string name="sticker_purchase_modal_confirm_body_header">Йее, стикери!</string>
     <string name="sticker_purchase_modal_header">Закупуване на пакет стикери</string>
@@ -6888,7 +6885,7 @@
     <string name="stream_no_preview">Стриймът е започнал. Побързай!</string>
     <string name="stream_participants_hidden">Участниците без видео са скрити в момента. Искаш ли да ги покажеш?</string>
     <string name="stream_playing">Играе !!{game}!!</string>
-    <string name="stream_premium_upsell_body">Стримьте в разрешении HD с частотой 60 кадров в секунду, получите доступ к бонусам для чата [и многому другому с Discord Nitro!](onPressMore)</string>
+    <string name="stream_premium_upsell_body">Стриймвай с изходна резолюция с 60 кадъра в секунда, получи достъп до чат бонуси [и много други с Discord Nitro!](onPressMore)</string>
     <string name="stream_premium_upsell_body_no_cta">Стриймвай с изходна резолюция с 60 кадъра в секунда, получи достъп до чат бонуси и много други с Discord Nitro!</string>
     <string name="stream_premium_upsell_cta">Абонирай се</string>
     <string name="stream_premium_upsell_header">Отключи HD видео стрийминг с Discord Nitro</string>
@@ -6950,7 +6947,7 @@
     <string name="streaming_a_game">Стриймване на игра</string>
     <string name="sub_enabled_servers">Активирани подсървъри</string>
     <string name="submit">Изпращане</string>
-    <string name="submit_bug">Сообщить об ошибке</string>
+    <string name="submit_bug">Изпрати доклад за грешка</string>
     <string name="subscriber_information">Информация за абонат</string>
     <string name="subscription_payment_legalese_monthly">Здравей! Това, което купуваш, е периодичен абонамент, което означава, че ще те таксуваме днес и ще продължим да те таксуваме всеки месец, докато не се откажеш от абонамента си. Можеш обаче да се откажеш по всяко време от страницата за настройки!</string>
     <string name="subscription_payment_legalese_yearly">Хей! Това, което купуваш, е периодичен абонамент, което означава, че ще те таксуваме днес и ще продължим да те таксуваме ежегодно, докато не се откажеш от абонамента си. Можеш обаче да се откажеш по всяко време от страницата за настройки!</string>
@@ -7231,7 +7228,7 @@
     <string name="unclaimed_account_body_2">Моля, добави имейл и парола, за да заявиш акаунта си, преди да бъде изгубен.</string>
     <string name="unclaimed_account_title">Нерегистриран акаунт</string>
     <string name="undeafen">Премахване на заглушаване</string>
-    <string name="undo">Отменить</string>
+    <string name="undo">Отмяна</string>
     <string name="unfocus_participant">Премахни фокуса от този човек</string>
     <string name="unhandled_link_body">Съжаляваме, на устройството ти не бяха намерени приложения, които да обработят тази връзка:</string>
     <string name="unhandled_link_title">Необработена връзка</string>
@@ -7401,9 +7398,9 @@
     <string name="user_info">Потребителска информация</string>
     <string name="user_management">Управление на членове</string>
     <string name="user_popout_about_me">За мен</string>
-    <string name="user_popout_identity_cta_avatar">Выбрать аватар для этого сервера</string>
-    <string name="user_popout_identity_cta_both">Выбрать аватар и никнейм для этого сервера</string>
-    <string name="user_popout_identity_cta_nickname">Выбрать никнейм для этого сервера</string>
+    <string name="user_popout_identity_cta_avatar">Задай аватар за сървъра</string>
+    <string name="user_popout_identity_cta_both">Задай псевдоним и аватар за сървъра</string>
+    <string name="user_popout_identity_cta_nickname">Задай псевдоним за сървъра</string>
     <string name="user_popout_message">Съобщение</string>
     <string name="user_popout_wumpus_tooltip">Нов съм в Discord, кажи „Здрасти“!</string>
     <string name="user_profile_add_friend">Добавяне на приятел</string>
@@ -7412,7 +7409,7 @@
     <string name="user_profile_guild_name_content_description">Име на сървъра</string>
     <string name="user_profile_incoming_friend_request_dialog_body">Приемаш ли тази покана за приятелство?</string>
     <string name="user_profile_message">Съобщение</string>
-    <string name="user_profile_modal">Интерфейс профиля пользователя</string>
+    <string name="user_profile_modal">Модалност на потребителски профил</string>
     <string name="user_profile_mutual_friends">{count}</string>
     <string name="user_profile_mutual_friends_placeholder">Общи приятели</string>
     <string name="user_profile_mutual_guilds">{count}</string>
@@ -7421,9 +7418,10 @@
     <string name="user_profile_settings_setstatus">Задаване на статус</string>
     <string name="user_profile_video">Видео</string>
     <string name="user_profile_volume">Сила на звука</string>
-    <string name="user_setting_notification_not_enabled_prompt">Push-уведомления не включены</string>
+    <string name="user_setting_notification_not_enabled_prompt">Насочените известия не са активирани</string>
     <string name="user_settings">Потребителски настройки</string>
     <string name="user_settings_about_me">За мен</string>
+    <string name="user_settings_about_me_description">Напиши каквото искаш за себе си – само не надвишавай лимита от {maxLength} знака. Ако искаш, можеш да използваш markdown и линкове.</string>
     <string name="user_settings_account_change_email_prompt">Текущият ти имейл адрес е !!{email}!! Как искаш да го промениш?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Въведи нов имейл адрес и текущата си парола.</string>
     <string name="user_settings_account_change_email_title">Редактиране на имейла</string>
@@ -7458,6 +7456,8 @@
     <string name="user_settings_appearance_preview_message_5">О, ето го!</string>
     <string name="user_settings_appearance_zoom_tip">Можеш да промениш нивото на мащабиране с {modKey} +/- и да нулираш до мащабирането по подразбиране с {modKey}+0.</string>
     <string name="user_settings_available_codes">Налични резервни кодове</string>
+    <string name="user_settings_avatar">Аватар</string>
+    <string name="user_settings_banner_specs">Препоръчваме качване на изображение поне 600х240. Може да е PNG, JPG или анимиран GIF.</string>
     <string name="user_settings_blocked_users">Блокирани потребители</string>
     <string name="user_settings_blocked_users_empty">Нямаш блокирани потребители</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Блокирани потребители</string>
@@ -7466,11 +7466,13 @@
     <string name="user_settings_close_button">Бутон за затваряне</string>
     <string name="user_settings_confirm_logout">Сигурен/на ли си, че искаш да излезеш?</string>
     <string name="user_settings_customization_upsell">Отключване с Nitro</string>
+    <string name="user_settings_customize_profile_title">Персонализиране на профила ми</string>
     <string name="user_settings_delete_avatar">Изтриване на аватар</string>
     <string name="user_settings_disable_advanced_voice_activity">Включването на тази функция може да помогне, ако гласът ти не се разпознава от автоматичната чувствителност на входа.</string>
     <string name="user_settings_disable_noise_suppression">Намаляването на шума се деактивира, докато подтискането на шума е активно.</string>
     <string name="user_settings_edit_account">Редактирай акаунт</string>
     <string name="user_settings_edit_account_password_label">Въведи паролата си, за да потвърдиш промените</string>
+    <string name="user_settings_edit_profile">Редактиране на профил</string>
     <string name="user_settings_enter_password_view_codes">Въведи паролата си, за да видиш резервни кодове.</string>
     <string name="user_settings_games_install_location">Място</string>
     <string name="user_settings_games_install_location_add">Добавяне на място на инсталиране</string>
@@ -7521,6 +7523,8 @@
     <string name="user_settings_open_on_startup_label">Отваряне на Discord</string>
     <string name="user_settings_privacy_terms">Виж нашите [Условия за ползване]({termsLink}) и [Политика за поверителност]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Банер на профила</string>
+    <string name="user_settings_remove_avatar">Премахване на аватар</string>
+    <string name="user_settings_remove_banner">Премахване на банер</string>
     <string name="user_settings_restart_app_mobile">Рестартирай приложението, за да приложиш новите настройки.</string>
     <string name="user_settings_save">Запазване</string>
     <string name="user_settings_scan_qr_code">Сканирай QR код</string>
@@ -7535,6 +7539,7 @@
     <string name="user_settings_upload_avatar">Качване на аватар</string>
     <string name="user_settings_upload_banner">Качи банер</string>
     <string name="user_settings_used_backup_codes">Използвани резервни кодове</string>
+    <string name="user_settings_user_profile">Потребителски профил</string>
     <string name="user_settings_voice_add_multiple">Можеш да добавиш няколко Push to Talk комбинации от [Настройки за клавишни комбинации](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord използва само най-добрия, органичен, местен Opus гласов кодек.</string>
     <string name="user_settings_voice_codec_title">Аудио кодек</string>
@@ -7549,9 +7554,9 @@
     <string name="user_settings_voice_mic_test_voice_caption">Възпроизвеждаме красивия ти глас</string>
     <string name="user_settings_voice_mic_test_voice_no_input_notice">Discord не открива нищо казано в микрофона. Провери дали си избрал правилното входно устройство.</string>
     <string name="user_settings_voice_open_h264">OpenH264 видео кодек, предоставен от Cisco Systems, Inc.</string>
-    <string name="user_settings_voice_soundshare_enabled_label">Теперь вы можете захватывать звук из приложений. [Подробнее]({helpdeskArticle})</string>
-    <string name="user_settings_voice_soundshare_enabling_label">Расширению для захвата звука требуется авторизация для завершения установки. Проверьте настройки защиты и безопасности в разделе системных настроек. [Подробнее]({helpdeskArticle})</string>
-    <string name="user_settings_voice_soundshare_not_enabled_label">Захват звука на вашем устройстве требует установки дополнительного программного обеспечения. После нажатия кнопки установки ниже вам будет предложено авторизоваться. [Подробнее]({helpdeskArticle})</string>
+    <string name="user_settings_voice_soundshare_enabled_label">Всичко е готово за запис на аудио от приложения. [Научи повече]({helpdeskArticle})</string>
+    <string name="user_settings_voice_soundshare_enabling_label">Разширението за записване на аудио изисква упълномощаване, за да завърши инсталацията. Провери своите системни предпочитания за „Сигурност и поверителност“. [Научи повече]({helpdeskArticle})</string>
+    <string name="user_settings_voice_soundshare_not_enabled_label">Записването на аудио от устройството ти изисква инсталирането на допълнителен софтуер. След като кликнеш върху бутона за инсталиране по-долу, ще получиш подкана за оторизиране. [Научи повече]({helpdeskArticle})</string>
     <string name="user_settings_voice_video_codec_title">Видео кодек</string>
     <string name="user_settings_voice_video_hook_label">Използвай нашата най-нова технология да заснемеш екрана си</string>
     <string name="user_settings_windows_settings">Настройки на Windows</string>
@@ -7770,25 +7775,6 @@
     <string name="widget">Изпълним модул</string>
     <string name="working">Работи…</string>
     <string name="xbox_authorization_title">Оторизация на Xbox акаунт</string>
-    <string name="xbox_game_pass_card_body_claimed">Ти вече заяви това. Кодът ти е !!{code}!!. [Повече подробности](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Подаръкът е наличен за заявяване до 15 януари 2021 г. [По-малко подробности](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Подаръкът е наличен за заявяване до 15 януари 2021 г. [Повече подробности](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Този код е включен също и в имейла за потвърждение, който току що ти изпратихме.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Нещо се обърка, опитай отново по-късно!</string>
-    <string name="xbox_game_pass_modal_code_header">Код за Xbox Game Pass за PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">О, не</string>
-    <string name="xbox_game_pass_modal_header_description_success">Активирай показания по-долу код в [сайта за активиране на Microsoft]({redemptionURL}), за да получиш достъп до Xbox Game Pass за PC за 3 месеца.</string>
-    <string name="xbox_game_pass_modal_header_success">Страхотно!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Тъй като имаш абонамент за усилване, ще ти дадем абонаментен кредит за Nitro. Кредитът за Nitro ще бъде приложен, когато се абонираш за **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Осребри</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Сега имаш Nitro кредит! Абонирай се за **{planName}** днес, за да използваш твоя Nitro кредит.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Чудесно!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Абонаментен кредит</string>
-    <string name="xbox_game_pass_promotion_banner_description">Имаме още нещо за теб. Абонатите на Nitro вече получават 3 месеца Xbox Game Pass за PC. Офертата важи до 15 януари 2021 г. [Повече подробности](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Имаме още нещо за теб. Абонатите на Nitro вече получават 3 месеца Xbox Game Pass за PC. Офертата важи до 15 януари 2021 г. [По-малко подробности](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 месеца Xbox Game Pass за PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass за PC (3 месеца)</string>
-    <string name="xbox_game_pass_promotion_legalese">Не е валидно за настоящи или бивши членове на Xbox Game Pass за PC или за настоящи членове на Xbox Game Pass Ultimate. Активирай кода(овете) си за Xbox Game Pass на [microsoft.com/redeem](https://microsoft.com/redeem) до 15 февруари 2021 г. Изисква се кредитна карта. Ако не анулираш, ще ти бъде начислявана актуалната към момента редовна цена за членство всеки месец, когато промоционалният период приключи. Не се поддържа на Windows 10 в S режим и на ARM устройства. Каталогът с игри се променя с времето. Виж [xbox.com/gamepass](https://xbox.com/gamepass). Лимит: 1 на човек/акаунт.</string>
     <string name="xbox_link">Връзка</string>
     <string name="xbox_pin_step1">Отвори приложението Discord на твоя телефон</string>
     <string name="xbox_pin_step2">Отиди на Настройки &gt; Връзки &gt; Добавяне</string>
diff --git a/app/src/main/res/values-cs/plurals.xml b/app/src/main/res/values-cs/plurals.xml
index b5c9ac75e3..36242eed71 100644
--- a/app/src/main/res/values-cs/plurals.xml
+++ b/app/src/main/res/values-cs/plurals.xml
@@ -655,16 +655,6 @@
         <item quantity="one">1 týden</item>
         <item quantity="other">{minimumGuildAge} týdny/-ů</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">název</item>
-        <item quantity="few">názvy</item>
-        <item quantity="other">názvů</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">název</item>
-        <item quantity="few">názvy</item>
-        <item quantity="other">názvů</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">1 nevyřízená žádost</item>
         <item quantity="few">{count} nevyřízené žádosti</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 77e02e3ecc..c0f7941a14 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1396,7 +1396,6 @@
     <string name="contact_sync_we_found_your_friends_body">Teď jste na Discordu přátelé. Popovídejte si, pozvěte je na svůj server, bavte se! Dáme vědět, když se na Discord přidají noví přátelé.</string>
     <string name="contact_sync_we_found_your_friends_title">Našli jsme tvé přátele!</string>
     <string name="content_matching">!!{command}!! obsah odpovídající **!!{query}!!**</string>
-    <string name="context_menu_hint">Více akcí zobrazíš kliknutím na uživatele pravým tlačítkem</string>
     <string name="continue_in_browser">Pokračovat v prohlížeči</string>
     <string name="continue_to_webapp">Pokračovat do Discordu</string>
     <string name="control_volume">Ovládání hlasitosti</string>
@@ -3142,8 +3141,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Servery ve Vyhledávání musejí být staré alespoň {minimumGuildAge}. Vrať se prosím {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server je příliš mladý</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Tvůj server **$[bohužel](doesNotHook)** nesplňuje všechny podmínky Vyhledávání serverů.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Musíš změnit {numCategories}kategorie: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Musíš změnit {numChannels}kanálu: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Musíš změnit $[popis](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Musíš změnit $[název serveru](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Zvyš počet komunikujících uživatelů za týden</string>
@@ -4552,7 +4549,7 @@
     <string name="message_action_reply">Odpovědět</string>
     <string name="message_actions_menu_label">Akce se zprávou</string>
     <string name="message_button_component_link_context_menu_copy">Kopírovat odkaz</string>
-    <string name="message_button_component_link_context_menu_name">Akce odkazu</string>
+    <string name="message_button_component_link_context_menu_name">Akce tlačítka odkazu</string>
     <string name="message_display_mode_label">Zobrazení zpráv</string>
     <string name="message_edited">upraveno</string>
     <string name="message_header_replied">$[](currentAuthor) $[odpověděl/a](replyHook)</string>
@@ -4868,8 +4865,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Tvá šance získat Nitro na měsíc zadarmo vyprší za {days}</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Tvá šance získat Nitro na měsíc zadarmo vyprší za {hours}</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Tvá šance získat Nitro na měsíc zadarmo vyprší za {minutes}</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Vážený předplatiteli Nitra, zdravíme a gratulujeme! Dostáváš od nás Xbox Game Pass pro PC na 3 měsíce zdarma!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Vyzvednout</string>
     <string name="notice_product_feedback_survey">Chceš se s námi zapojit do diskuzí ohledně tvého názoru na produkt?</string>
     <string name="notice_product_feedback_survey_cta">Dej nám vědět tady!</string>
     <string name="notice_register_to_vote">Máš registraci pro hlasování? Omrkni svůj stav a zaregistruj se během dvou minut.</string>
@@ -5056,6 +5051,7 @@
     <string name="out_of_date_action">Aktualizovat Discord</string>
     <string name="out_of_date_description">Máme pro Discord pár super novinek (a asi taky jednu dvě opravy chyb). Než budeš pokračovat, proveď aktualizaci.</string>
     <string name="out_of_date_title">Jsi pozadu</string>
+    <string name="outbound_promotion_redemption_modal_title">Skvěle!</string>
     <string name="outgoing_friend_request">Odchozí žádost o přátelství</string>
     <string name="outgoing_friend_request_delete_msg">Určitě chceš odstranit svou žádost o přátelství s **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Odchozí žádost o přátelství pro !!{name}!!</string>
@@ -5732,12 +5728,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Pro vytvoření tohoto soukromého kanálu potřebuješ oprávnění k **zobrazení kanálů**.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Pro vytvoření tohoto soukromého kanálu potřebuješ oprávnění k **zobrazení kanálů** a **připojení**.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Pořiď si vlastní přizpůsobený banner a další výhody s Discordem Nitro!</string>
     <string name="profile_customization_beta_tooltip">Přizpůsobení profilu je momentálně dostupné jen omezenému počtu lidí.</string>
+    <string name="profile_customization_bio_placeholder">Řekni světu něco málo o sobě</string>
     <string name="profile_customization_marketing_tooltip_body">Prezentuj se v části „O mně“. Pokud máš Nitro, můžeš používat taky banner profilu!</string>
     <string name="profile_customization_marketing_tooltip_cta">Rozumím</string>
     <string name="profile_customization_marketing_tooltip_header">Nové přizpůsobení profilu!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exkluzivní pro Nitro</string>
     <string name="promotion_card_action_claim">Vyzvednout</string>
-    <string name="promotion_card_body_claimed_hidden">Vyzvednutí jsme zaznamenali, ale kód je schovaný kvůli streamovacímu režimu.</string>
     <string name="promotion_error_body">Asi se něco pokazilo. Tento kód nelze použít. Omlouváme se za nepříjemnosti.</string>
     <string name="promotion_error_title">Okamžik strpení…</string>
     <string name="promotion_existing_subscriber_title">Ale ne!</string>
@@ -6643,7 +6641,6 @@
     <string name="start_stage_channel_event_members_title">Pouze členové</string>
     <string name="start_stage_channel_event_modal_button">Otevřít pódium</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Až se pódium otevře, ty budeš řečník.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Napiš téma a prohlas své pódium za aktivní.</string>
     <string name="start_stage_channel_event_modal_title">O čem se budete bavit?</string>
     <string name="start_stage_channel_event_modal_topic_label">Téma pro pódium</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Debata je uzavřená: dietní je lepší než obyčejné</string>
@@ -7325,6 +7322,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Vyskakovací oznámení nejsou zapnutá</string>
     <string name="user_settings">Uživatelská nastavení</string>
     <string name="user_settings_about_me">O mně</string>
+    <string name="user_settings_about_me_description">Napiš o sobě, cokoliv se ti zachce – tedy dokud si vystačíš s {maxLength} znaky. Pokud chceš, můžeš použít markdown a odkazy.</string>
     <string name="user_settings_account_change_email_prompt">Tvoje aktuální e-mailová adresa je !!{email}!!. Na jakou adresu ji chceš změnit?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Zadej novou e-mailovou adresu a své současné heslo.</string>
     <string name="user_settings_account_change_email_title">Upravit e-mail</string>
@@ -7359,6 +7357,8 @@
     <string name="user_settings_appearance_preview_message_5">A hele, tady je!</string>
     <string name="user_settings_appearance_zoom_tip">Přiblížení můžeš změnit stisknutím {modKey} +/- a vrátit jej na výchozí hodnotu stisknutím {modKey}+0.</string>
     <string name="user_settings_available_codes">Dostupné záložní kódy</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Doporučujeme obrázek veliký alespoň 600x240. Můžeš nahrát PNG, JPG nebo animovaný GIF.</string>
     <string name="user_settings_blocked_users">Zablokovaní uživatelé</string>
     <string name="user_settings_blocked_users_empty">Nemáš žádné blokované uživatele</string>
     <string name="user_settings_blocked_users_header">Zablokovaných uživatelů: {numberOfBlockedUsers}</string>
@@ -7366,12 +7366,14 @@
     <string name="user_settings_change_avatar">Změnit avatar</string>
     <string name="user_settings_close_button">Tlačítko pro zavření</string>
     <string name="user_settings_confirm_logout">Určitě se chceš odhlásit?</string>
-    <string name="user_settings_customization_upsell">Odemknout s Nitrem</string>
+    <string name="user_settings_customization_upsell">Odemknout s Nitrem</string>
+    <string name="user_settings_customize_profile_title">Přizpůsobení profilu</string>
     <string name="user_settings_delete_avatar">Smazat avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Vypnutí této možnosti může pomoci, pokud automatická citlivost vstupu nezaznamenává tvůj hlas.</string>
     <string name="user_settings_disable_noise_suppression">Pokud je aktivní potlačení šumu, redukce šumu je vypnutá.</string>
     <string name="user_settings_edit_account">Upravit účet</string>
     <string name="user_settings_edit_account_password_label">Zadej heslo pro potvrzení změn.</string>
+    <string name="user_settings_edit_profile">Upravit profil</string>
     <string name="user_settings_enter_password_view_codes">Zadej heslo pro zobrazení záložních kódů.</string>
     <string name="user_settings_games_install_location">Umístění</string>
     <string name="user_settings_games_install_location_add">Přidat umístění instalace</string>
@@ -7421,6 +7423,8 @@
     <string name="user_settings_open_on_startup_label">Otevřít Discord</string>
     <string name="user_settings_privacy_terms">Přečti si [Podmínky využívání služeb]({termsLink}) a [Zásady na ochranu osobních údajů]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Banner profilu</string>
+    <string name="user_settings_remove_avatar">Odebrat avatar</string>
+    <string name="user_settings_remove_banner">Odebrat banner</string>
     <string name="user_settings_restart_app_mobile">Aby se nová nastavení projevila, restartuj aplikaci.</string>
     <string name="user_settings_save">Uložit</string>
     <string name="user_settings_scan_qr_code">Naskenovat QR kód</string>
@@ -7435,6 +7439,7 @@
     <string name="user_settings_upload_avatar">Nahrát avatar</string>
     <string name="user_settings_upload_banner">Nahrát banner</string>
     <string name="user_settings_used_backup_codes">Použité záložní kódy</string>
+    <string name="user_settings_user_profile">Uživatelský profil</string>
     <string name="user_settings_voice_add_multiple">Více zkratek pro Push to Talk můžeš přidat v [nastavení klávesových zkratek](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord používá jedině nejlepší organický kodek z místních zdrojů zvaný Opus Voice.</string>
     <string name="user_settings_voice_codec_title">Zvukový kodek</string>
@@ -7671,25 +7676,6 @@
     <string name="whitelisting">Přidávání na bílou listinu…</string>
     <string name="working">Pracuji…</string>
     <string name="xbox_authorization_title">Autorizace účtu Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">A je to vyzvednuto. Toto je tvůj kód: !!{code}!!. [Zobrazit podrobnosti](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Svůj dárek si můžeš vyzvednout do 15. ledna 2021. [Skrýt podrobnosti](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Svůj dárek si můžeš vyzvednout do 15. ledna 2021. [Zobrazit podrobnosti](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Tento kód najdeš také v potvrzení, které jsme ti právě poslali na e-mail.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Někde se stala chyba. Zkus to za chvíli!</string>
-    <string name="xbox_game_pass_modal_code_header">Kód Xbox Game Pass pro PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Ajaj…</string>
-    <string name="xbox_game_pass_modal_header_description_success">Níže uvedený kód můžeš uplatnit na [stránkách Microsoftu]({redemptionURL}). Tím získáš přístup k Xbox Game Pass pro PC na 3 měsíce.</string>
-    <string name="xbox_game_pass_modal_header_success">Skvěle!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Protože si předplácíš vylepšení, dáme ti kredit na předplatné Nitro. Kredit Nitro se uplatní, když si předplatíš **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Uplatnit</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Dostal jsi kredit na Nitro! Předplať si **{planName}** ještě dnes, abys mohl kredit uplatnit.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Super!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Kredit na předplatné</string>
-    <string name="xbox_game_pass_promotion_banner_description">Máme pro tebe takovou maličkost. Předplatitelé Nitra nyní získávají Xbox Game Pass pro PC na 3 měsíce. Nabídka platí do 15. ledna 2021. [Zobrazit podrobnosti](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Máme pro tebe takovou maličkost. Předplatitelé Nitra nyní získávají Xbox Game Pass pro PC na 3 měsíce. Nabídka platí do 15. ledna 2021. [Skrýt podrobnosti](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">Xbox Game Pass pro PC na 3 měsíce</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass pro PC (3 měsíce)</string>
-    <string name="xbox_game_pass_promotion_legalese">Tato nabídka se nevztahuje na stávající ani dřívější členy Xbox Game Pass pro PC, ani na členy Xbox Game Pass Ultimate. Své kódy Xbox Game Pass můžeš uplatnit na webu [microsoft.com/redeem](https://microsoft.com/redeem) do 15. února 2021. Budeš potřebovat platební kartu. Pokud své předplatné nezrušíš, po uplynutí bezplatného období se ti každý měsíc bude účtovat cena za běžné předplatné platná ve chvíli prodloužení. Zařízení se systémem Windows 10 v režimu S a zařízení ARM nejsou podporována. Nabídka her se může měnit. Další informace najdeš na [xbox.com/gamepass](https://xbox.com/gamepass). Omezení: 1 na osobu a účet.</string>
     <string name="xbox_link">Připojit</string>
     <string name="xbox_pin_step1">Spusť aplikaci Discord na svém telefonu</string>
     <string name="xbox_pin_step2">Jdi do Nastavení &gt; Připojení &gt; Přidat</string>
diff --git a/app/src/main/res/values-da/plurals.xml b/app/src/main/res/values-da/plurals.xml
index bb9e94fd2b..1fe844d4a8 100644
--- a/app/src/main/res/values-da/plurals.xml
+++ b/app/src/main/res/values-da/plurals.xml
@@ -540,14 +540,6 @@
         <item quantity="one">1 uge</item>
         <item quantity="other">{minimumGuildAge} uger</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">navn</item>
-        <item quantity="other">navne</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">navn</item>
-        <item quantity="other">navne</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Afventende ansøgning</item>
         <item quantity="other">{count} Afventende ansøgninger</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index cddb76b198..e02cf913fe 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1387,7 +1387,6 @@
     <string name="contact_sync_we_found_your_friends_body">Du er nu venner med dem på Discord. Tal med dem, inviter dem til din server, hav det sjovt! Vi vil give dig besked, når nye venner tilmelder sig Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Vi har fundet dine venner!</string>
     <string name="content_matching">!!{command}!! indhold, der matcher **!!{query}!!**</string>
-    <string name="context_menu_hint">Højreklik på bruger for flere handlinger</string>
     <string name="continue_in_browser">Fortsæt i browseren</string>
     <string name="continue_to_webapp">Fortsæt til Discord</string>
     <string name="control_volume">Styr lydniveau</string>
@@ -3057,8 +3056,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Server i serveropdagelser skal være mindst {minimumGuildAge} gammel. Prøv venligst igen d. {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server er for ny</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Din server **$[opfylder ikke](doesNotHook)** alle krav til serveropdagelse.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Du skal ændre din kategori {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Du skal ændre dit kanal {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Du skal ændre din $[description](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Du skal ændre dit $[server navn](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Forøg antallet af ugentligt kommunikerende mennesker</string>
@@ -4266,6 +4263,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Opgrader din emoji, tilpas din profil, og få mere synlighed på dine servere. Vælg mellem **!!{monthlyPrice}!! pr. måned** eller **!!{yearlyPrice}!! pr. år**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Få en udvidet Discord oplevelse</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30 %% rabat på Serverboosts</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Brug tilpassede og animerede emoji hvor som helst</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Op til 1080p opløsning og en framerate på op til 60 fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">Få 50 MB upload i stedet for 100 MB</string>
     <string name="masked_link_body">Dette link vil tage dig til **!!{url}!!**. Er du sikker på, at du vil derhen?</string>
@@ -4763,8 +4761,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Du har {days} tilbage til at få en gratis måned med Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Du har {hours} tilbage til at få en gratis måned med Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Du har {minutes} tilbage til at få en gratis måned med Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hey Nitro-abonnent, tillykke! Du får 3 måneders Xbox Game Pass til PC fra os!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Indløs</string>
     <string name="notice_product_feedback_survey">Har du lyst til at deltage i en snak med os vedrørende produkt-feedback?</string>
     <string name="notice_product_feedback_survey_cta">Så lad os det vide her!</string>
     <string name="notice_register_to_vote">Er du registreret for at kunne stemme? Tjek din status og registrer på få minutter.</string>
@@ -4950,6 +4946,7 @@
     <string name="out_of_date_action">Opdater Discord</string>
     <string name="out_of_date_description">Vi har nogle nice ændringer til Discord (og sikkert også en eller to fejlrettelser). Opdater for at fortsætte.</string>
     <string name="out_of_date_title">Din er forældet</string>
+    <string name="outbound_promotion_redemption_modal_title">Fantastisk!</string>
     <string name="outgoing_friend_request">Udgående venneanmodning</string>
     <string name="outgoing_friend_request_delete_msg">Er du sikker på, at du vil slette din venneanmodning til **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Udgående venneanmodning til !!{name}!!</string>
@@ -5625,12 +5622,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">**Se kanaler** tilladelsen er påkrævet for at oprette denne private kanal.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">**Se kanaler** og **Tilslut** tilladelser er påkrævet for at oprette denne private kanal.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Upload dit eget personligt tilpassede banner og mere med Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Profiltilpasning er i øjeblikket kun tilgængelig for et begrænset antal personer.</string>
+    <string name="profile_customization_bio_placeholder">Fortæl verden en smule om dig selv</string>
     <string name="profile_customization_marketing_tooltip_body">Udtryk dig selv med et om mig, og hvis du har Nitro, et profil banner også!</string>
     <string name="profile_customization_marketing_tooltip_cta">Forstået</string>
     <string name="profile_customization_marketing_tooltip_header">Ny profiltilpasning!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Eksklusivt for Nitro</string>
     <string name="promotion_card_action_claim">Indløs</string>
-    <string name="promotion_card_body_claimed_hidden">Du indløste denne, men koden er skjult grundet streaming-tilstand.</string>
     <string name="promotion_error_body">Det ser ud til, at noget er gået galt, og du kan ikke bruge den kode. Det må du undskylde.</string>
     <string name="promotion_error_title">Vent et øjeblik…</string>
     <string name="promotion_existing_subscriber_title">Åh nej!</string>
@@ -6520,7 +6519,6 @@
     <string name="start_stage_channel_event_members_title">Kun for medlemmer</string>
     <string name="start_stage_channel_event_modal_button">Start podiet</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Du vil være taleren, når podiet bliver åbnet.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Skriv et emne for at offentliggøre, at dit podie er åbent.</string>
     <string name="start_stage_channel_event_modal_title">Hvad vil du tale om?</string>
     <string name="start_stage_channel_event_modal_topic_label">Podie-emne</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Debatten er forbi; diæt er bedre end sædvanligt</string>
@@ -7195,6 +7193,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Push-notifikationer er ikke aktiveret</string>
     <string name="user_settings">Brugerindstillinger</string>
     <string name="user_settings_about_me">Om mig</string>
+    <string name="user_settings_about_me_description">Skriv alt, hvad du vil om dig selv — så længe du holder det under {maxLength} tegn. Du kan anvende optegnelser og links, hvis du ønsker det.</string>
     <string name="user_settings_account_change_email_prompt">Din nuværende e-mail adresse er !!{email}!! Hvad ønsker du at ændre den til?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Indtast en ny e-mail-adresse og din nuværende adgangskode.</string>
     <string name="user_settings_account_change_email_title">Rediger e-mail-adresse</string>
@@ -7229,6 +7228,8 @@
     <string name="user_settings_appearance_preview_message_5">Åh, her er den!</string>
     <string name="user_settings_appearance_zoom_tip">Du kan ændre zoom-niveauet med {modKey} +/- og sætte zoom tilbage til standard med {modKey}+0.</string>
     <string name="user_settings_available_codes">Tilgængelige koder for sikkerhedskopier</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Vi anbefaler et billede på mindst 600x240. Du kan uploade en PNG, JPG eller en animeret GIF.</string>
     <string name="user_settings_blocked_users">Blokerede brugere</string>
     <string name="user_settings_blocked_users_empty">Du har ikke nogen blokerede brugere</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Blokerede brugere</string>
@@ -7237,12 +7238,14 @@
     <string name="user_settings_close_button">Knappen Luk</string>
     <string name="user_settings_confirm_logout">Er du sikker på, at du vil logge ud?</string>
     <string name="user_settings_customization_upsell">Lås op med Nitro</string>
+    <string name="user_settings_customize_profile_title">Tilpasning af min profil</string>
     <string name="user_settings_delete_avatar">Slet avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">At deaktivere denne kan hjælpe, hvis din stemme ikke bliver detekteret af den automatiske inputsensor.</string>
     <string name="user_settings_disable_noise_suppression">Støjdæmpning er deaktiveret, når støjannullering er aktiv.</string>
     <string name="user_settings_edit_account">Rediger konto</string>
     <string name="user_settings_edit_account_password_label">Indtast din adgangskode for at bekræfte ændringerne</string>
     <string name="user_settings_edit_account_tag">FLAG</string>
+    <string name="user_settings_edit_profile">Rediger profil</string>
     <string name="user_settings_enter_password_view_codes">Indtast din adgangskode for at kunne se koder til sikkerhedskopiering.</string>
     <string name="user_settings_games_install_location">Sted</string>
     <string name="user_settings_games_install_location_add">Tilføj Installer sted</string>
@@ -7291,6 +7294,8 @@
     <string name="user_settings_open_on_startup_label">Åbn Discord</string>
     <string name="user_settings_privacy_terms">Læs vores [Betingelser]({termsLink}) og [beskyttelse af privatlivets fred]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profilbanner</string>
+    <string name="user_settings_remove_avatar">Fjern avatar</string>
+    <string name="user_settings_remove_banner">Fjern banner</string>
     <string name="user_settings_restart_app_mobile">Genstart appen, så dine nye indstillinger kan træde i kraft.</string>
     <string name="user_settings_save">Gem</string>
     <string name="user_settings_scan_qr_code">Scan QR-koden</string>
@@ -7305,6 +7310,7 @@
     <string name="user_settings_upload_avatar">Upload avatar</string>
     <string name="user_settings_upload_banner">Upload banner</string>
     <string name="user_settings_used_backup_codes">Brugte koder til sikkerhedskopier</string>
+    <string name="user_settings_user_profile">Brugerprofil</string>
     <string name="user_settings_voice_add_multiple">Du kan tilføje mange Tryk-og-tal-tilknytninger i [Indstillinger af tast-tilknytninger](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord bruger kun det bedste organiske, lokalt fremskaffede Opus Voice codec.</string>
     <string name="user_settings_voice_codec_title">Lyd-codec</string>
@@ -7537,25 +7543,6 @@
     <string name="whitelisting">Hvidlister…</string>
     <string name="working">Arbejder…</string>
     <string name="xbox_authorization_title">Xbox-kontoautorisation</string>
-    <string name="xbox_game_pass_card_body_claimed">Du har indløst denne. Her er din kode !!{code}!!. [Se mere](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Gaven kan indløses indtil d. 15. januar 2021. [Se mindre](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Gaven kan indløses indtil d. 15. januar 2021. [Se mere](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Denne kode er også angivet i den bekræftelsesmail vi lige har sendt til dig.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Noget gik galt, prøv igen senere!</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass til PC - kode</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Åh åååh</string>
-    <string name="xbox_game_pass_modal_header_description_success">Indløs koden nedenfor på [Microsoft-indløsningssite]({redemptionURL}) for at få adgang til Xbox Game Pass for PC i 3 måneder.</string>
-    <string name="xbox_game_pass_modal_header_success">Fantastisk!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Idet du har et boost-abonnement, vil vi give dig Nitro-abonnementskredit. Nitro-kredit vil blive tilføjet til din konto når du tegner abonnement på **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Indløs</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Du har nu Nitro Kredit! Tilmeld dig til **{planName}** i dag for at få din Nitro-kredit.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Godt!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Abonnementskredit</string>
-    <string name="xbox_game_pass_promotion_banner_description">Vi har lidt ekstra til dig. Nitro abonnementer får nu 3 måneders Xbox Game Pass til PC. Tilgængelig nu og indtil d. 15. januar 2021. [Se mere](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Vi har lidt ekstra til dig. Nitro abonnementer får 3 måneders Xbox Game Pass til PC. Tilgængelig nu og indtil d. 15. januar 2021. [Se mindre](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 måneders Xbox Game Pass til PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass til PC (3 måneder)</string>
-    <string name="xbox_game_pass_promotion_legalese">Ikke gyldig for eksisterende eller tidligere medlemmer i Xbox Game Pass for PC, eller eksisterende Xbox Game Pass Ultimate-medlemmer. Indløs din Xbox Game Pass kode(r), på [microsoft.com/redeem](https://microsoft.com/redeem) senest 15. februar 2021. Der kræves et betalingskort. Medmindre du annullerer abonnementet, vil du blive opkrævet den på tidspunktet gældende abonnementspris hver måned efter at promo-perioden ophører. Understøttes ikke på Windows 10 i S-tilstand og på ARM-enheder.Spilkataloget varierer fra tid til anden. Se mere på [xbox.com/gamepass](https://xbox.com/gamepass). Begrænsning: 1 stk. pr.person/konto.</string>
     <string name="xbox_pin_step1">Åbn Discord-appen på din telefon</string>
     <string name="xbox_pin_step2">Gå til Indstillinger &gt; Forbindelser &gt; Tilføj</string>
     <string name="xbox_pin_step3">Klik på Xbox, og indtast PIN ovenfor</string>
diff --git a/app/src/main/res/values-de/plurals.xml b/app/src/main/res/values-de/plurals.xml
index 70b32d961d..e10be4ee6c 100644
--- a/app/src/main/res/values-de/plurals.xml
+++ b/app/src/main/res/values-de/plurals.xml
@@ -266,7 +266,7 @@
     </plurals>
     <plurals name="form_help_last_seen_days">
         <item quantity="one">seit gestern</item>
-        <item quantity="other">seit{days} Tagen</item>
+        <item quantity="other">seit {days} Tagen</item>
     </plurals>
     <plurals name="form_help_last_seen_members">
         <item quantity="one">1 Mitglied</item>
@@ -274,7 +274,7 @@
     </plurals>
     <plurals name="form_help_last_seen_with_roles_days">
         <item quantity="one">seit gestern</item>
-        <item quantity="other">seit{days} Tagen</item>
+        <item quantity="other">seit {days} Tagen</item>
     </plurals>
     <plurals name="form_help_last_seen_with_roles_members">
         <item quantity="one">1 Mitglied</item>
@@ -568,14 +568,6 @@
         <item quantity="one">1 Woche</item>
         <item quantity="other">{minimumGuildAge} Wochen</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">deinen Kategorienamen</item>
-        <item quantity="other">deine Kategorienamen</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">deinen Kanalnamen</item>
-        <item quantity="other">deine Kanalnamen</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Ausstehende Bewerbung</item>
         <item quantity="other">{count} Ausstehende Bewerbungen</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2d80a07523..86b72fa998 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1022,7 +1022,7 @@
     <string name="change_identity_modal_uploader_cta">Server -Avatar ändern</string>
     <string name="change_identity_modal_upsell">Benutze auf jedem deiner Server einen anderen Avatar und vieles mehr mit **Discord Nitro!**</string>
     <string name="change_log">Änderungsprotokoll</string>
-    <string name="change_log_md_body">Neue Features {added marginTop}\n======================\n\n* **Stage Channel können jetzt entdeckt werden.** Über den neuen Entdeckungen-Tab findest du Communitys, die live on Stage sind – erlebe alle möglichen Audioevents wie Konzerte, Panels, Talentwettbewerbe und andere merkwürdige, aber völlig legale Veranstaltungen. \n* **Deine Freunde finden ist da.** Wir haben eine Option hinzugefügt, die es erleichtert, Freunde auf Discord zu finden. Wenn du die Telefonnummer deines Freundes abgespeichert hast und ihr beide über Entdeckungen gefunden werden könnt, kannst du deinen Freund finden und ihm eine Freundschaftsanfrage senden. Das peinliche Gespräch ist vorprogrammiert: Wenn du \'ne Anfrage von xXSoulzLuverXx#0000 bekommst, bin das ich.\n* **Lieblingsemojis verfügbar.** Tippe ein Emoji im Chat an oder halte die Emoji-Auswahl gedrückt, um Emojis zu deinen Favoriten hinzuzufügen oder von deinen Favoriten zu entfernen. Die Synchronisierung deiner Favoriten mit der Desktop-App ist *noch* nicht möglich, aber immerhin kannst du so rausfinden, welche fünf von deinen 2.459 Emojis du überhaupt benutzt.\n* **Seitennummerierung zur Suchleiste hinzugefügt.** Du musst nie wieder ewig durch die Suchergebnisse scrollen. Ab jetzt kannst du direkt zu einer Seite springen. Endlich hast du den Beweis dafür, dass deine Freunde vor sechs Monaten etwas ganz Bestimmtes gesagt haben, innerhalb von wenigen Sekunden. Du hast recht und das sollen sie ruhig wissen!\n* **Töne für Sprachkanäle hinzugefügt.** Dein Mobilgerät spielt ab jetzt Töne ab, wenn du einem Sprachkanal betrittst, ihn verlässt oder verschoben wirst. Ich kann sie klar und deutlich in meinem Kopf hören. Ba-dum … Ba-da-doo …\n\n\nFehlerbehebungen und Updates {progress}\n======================\n\n* **Keine Benachrichtigungen mehr bei bearbeiteten Antworten!** Wenn du eine Antwort bearbeitest, wird der Autor der ursprünglichen Nachricht meistens nicht noch mal benachrichtigt. Ich hab es einfach satt. Ich wollte nur \'nen kleinen Grammatikfehler ausbügeln und das ist mir jetzt peinlich.\n* **Verbesserungen an Serverordnern.** Jetzt kannst du deine Serverordner als gelesen markieren! Wir haben auch Einstellungen für Serverordner hinzugefügt, damit du Namen und Farben personalisieren kannst.\n* **Erhebliche Verbesserungen und Fehlerbehebungen an der Mitgliedschaftsauswahl.** Du wirst dort endlich nicht mehr hängen bleiben.\n* **Verbesserter Zugriff auf Eingabemodus.** Du kannst deine Einstellungen für Push-to-Talk und Sprachaktivierung jetzt ändern, ohne das Fenster zu verlassen.\n\n\n</string>
+    <string name="change_log_md_body">Neue Features {added marginTop}\n======================\n\n* **Deine Freunde finden ist da.** Wir haben eine Option hinzugefügt, die es erleichtert, Freunde auf Discord zu finden. Wenn du die Telefonnummer deines Freundes abgespeichert hast und ihr beide über Entdeckungen gefunden werden könnt, kannst du deinen Freund finden und ihm eine Freundschaftsanfrage senden. Das peinliche Gespräch ist vorprogrammiert: Wenn du \'ne Anfrage von xXSoulzLuverXx#0000 bekommst, bin das ich.\n* **Lieblingsemojis verfügbar.** Tippe ein Emoji im Chat an oder halte die Emoji-Auswahl gedrückt, um Emojis zu deinen Favoriten hinzuzufügen oder von deinen Favoriten zu entfernen. Die Synchronisierung deiner Favoriten mit der Desktop-App ist *noch* nicht möglich, aber immerhin kannst du so rausfinden, welche fünf von deinen 2.459 Emojis du überhaupt benutzt.\n* **Seitennummerierung zur Suchleiste hinzugefügt.** Du musst nie wieder ewig durch die Suchergebnisse scrollen. Ab jetzt kannst du direkt zu einer Seite springen. Endlich hast du den Beweis dafür, dass deine Freunde vor sechs Monaten etwas ganz Bestimmtes gesagt haben, innerhalb von wenigen Sekunden. Du hast recht und das sollen sie ruhig wissen!\n* **Töne für Sprachkanäle hinzugefügt.** Dein Mobilgerät spielt ab jetzt Töne ab, wenn du einem Sprachkanal betrittst, ihn verlässt oder verschoben wirst. Ich kann sie klar und deutlich in meinem Kopf hören. Ba-dum … Ba-da-doo …\n\n\nFehlerbehebungen und Updates {progress}\n======================\n\n* **Keine Benachrichtigungen mehr bei bearbeiteten Antworten!** Wenn du eine Antwort bearbeitest, wird der Autor der ursprünglichen Nachricht meistens nicht noch mal benachrichtigt. Ich hab es einfach satt. Ich wollte nur \'nen kleinen Grammatikfehler ausbügeln und das ist mir jetzt peinlich.\n* **Verbesserungen an Serverordnern.** Jetzt kannst du deine Serverordner als gelesen markieren! Wir haben auch Einstellungen für Serverordner hinzugefügt, damit du Namen und Farben personalisieren kannst.\n* **Erhebliche Verbesserungen und Fehlerbehebungen an der Mitgliedschaftsauswahl.** Du wirst dort endlich nicht mehr hängen bleiben.\n* **Verbesserter Zugriff auf Eingabemodus.** Du kannst deine Einstellungen für Push-to-Talk und Sprachaktivierung jetzt ändern, ohne das Fenster zu verlassen.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">de</string>
     <string name="change_log_md_revision">1</string>
@@ -1378,7 +1378,6 @@
     <string name="contact_sync_we_found_your_friends_body">Ihr seid jetzt Freunde auf Discord. Unterhaltet euch, lade sie/ihn auf deinen Server ein und habt Spaß! Wir geben dir Bescheid, wenn neue Freunde Discord beitreten.</string>
     <string name="contact_sync_we_found_your_friends_title">Wir haben deine Freunde gefunden!</string>
     <string name="content_matching">**!!{query}!!** entsprechende !!{command}!!-Inhalte</string>
-    <string name="context_menu_hint">Rechtsklicke auf einen Benutzer für mehr Aktionen</string>
     <string name="continue_in_browser">Im Browser fortfahren</string>
     <string name="continue_to_webapp">Weiter zu Discord</string>
     <string name="control_volume">Lautstärke ändern</string>
@@ -3086,8 +3085,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Server in Entdeckung müssen mindestens {minimumGuildAge} auf dem Buckel haben. Bitte schau am {passDate} noch mal vorbei.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server ist zu jung</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Dein Server erfüllt **$[nicht](doesNotHook)** alle Anforderungen, um Teil von „Server entdecken“ zu werden.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Du musst {numCategories}: $[{categoryNames}](categoryHook) ändern.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Du musst {numChannels}: $[{channelNames}](channelHook) ändern.</string>
     <string name="guild_settings_discovery_checklist_change_description">Du musst deine $[Beschreibung](descriptionHook) ändern.</string>
     <string name="guild_settings_discovery_checklist_change_name">Du musst deinen $[Servernamen](nameHook) ändern.</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Die Anzahl wöchentlicher Beiträger steigern</string>
@@ -4301,6 +4298,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Verbessere deine Emojis, passe dein Profil an und rage auf deinen Servern aus der Masse heraus. Wähle zwischen **!!{monthlyPrice}!! pro Monat** oder **!!{yearlyPrice}!! pro Jahr**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Hol noch mehr aus Discord raus</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30%% Rabatt auf Server-Boosts</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Verwende überall benutzerdefinierte und animierte Emojis</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Auflösung bis zu 1080p und bis zu 60 FPS</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB statt 100 MB hochladen</string>
     <string name="masked_link_body">Dieser Link führt dich zu **!!{url}!!**. Bist du sicher, dass du dorthin möchtest?</string>
@@ -4797,8 +4795,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Du hast noch {days} Zeit, um einen Monat Nitro gratis zu erhalten.</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Du hast noch {hours} Zeit, um einen Monat Nitro gratis zu erhalten.</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Du hast noch {minutes} Zeit, um einen Monat Nitro gratis zu erhalten.</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hallo, Discord-Nitro-Abonnent! Glückwunsch! Du erhältst drei Monate lang kostenlos Xbox Game Pass für PC von uns!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Beanspruchen</string>
     <string name="notice_product_feedback_survey_cta">Gib uns hier Bescheid!</string>
     <string name="notice_scheduled_maintenance">Discord wird am **{start}** um **{start}** Uhr geplante Wartungsarbeiten durchführen.</string>
     <string name="notice_spotify_auto_paused">Spotify wird während Audioübertragungen pausiert.</string>
@@ -4981,6 +4977,7 @@
     <string name="out_of_date_action">Discord aktualisieren</string>
     <string name="out_of_date_description">Wir haben ein paar schicke Änderungen (und möglicherweise ein oder zwei Bugfixes) eingearbeitet. Aktualisiere Discord, um fortzufahren.</string>
     <string name="out_of_date_title">Du bist nicht mehr auf dem neuesten Stand</string>
+    <string name="outbound_promotion_redemption_modal_title">Großartig!</string>
     <string name="outgoing_friend_request">Ausgehende Freundschaftsanfrage</string>
     <string name="outgoing_friend_request_delete_msg">Bist du sicher, dass du deine Freundschaftsanfrage an **!!{name}!!** löschen möchtest?</string>
     <string name="outgoing_friend_request_to">Ausgehende Freundschaftsanfrage an !!{name}!!</string>
@@ -5654,12 +5651,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Du brauchst die **Kanäle ansehen**-Berechtigung, um diesen privaten Kanal zu erstellen.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Du brauchst die **Kanäle ansehen**- und die **Verbinden**-Berechtigung, um diesen privaten Kanal zu erstellen.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Mit Discord Nitro kannst du unter anderem ein personalisiertes Banner hochladen!</string>
     <string name="profile_customization_beta_tooltip">Die Profilanpassung steht derzeit nur einer begrenzten Anzahl an Leuten zur Verfügung.</string>
+    <string name="profile_customization_bio_placeholder">Erzähl der Welt ein bisschen was von dir</string>
     <string name="profile_customization_marketing_tooltip_body">Zeig deine Stimmung in „Über mich“ und hol dir mit Nitro ein Profilbanner!</string>
-    <string name="profile_customization_marketing_tooltip_cta">Alles klar!</string>
+    <string name="profile_customization_marketing_tooltip_cta">Alles klar</string>
     <string name="profile_customization_marketing_tooltip_header">Neue Profilanpassung!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Nur mit Nitro</string>
     <string name="promotion_card_action_claim">Beanspruchen</string>
-    <string name="promotion_card_body_claimed_hidden">Du hast dies beansprucht, aber der Code ist aufgrund des Streamer-Modus verborgen.</string>
     <string name="promotion_error_body">Wie es scheint, ist etwas schief gelaufen und du kannst diesen Code nicht verwenden. ’Tschuldigung.</string>
     <string name="promotion_error_title">Einen Augenblick …</string>
     <string name="promotion_existing_subscriber_title">Oh nein!</string>
@@ -6569,7 +6568,6 @@
     <string name="start_stage_channel_event_members_title">Nur für Mitglieder</string>
     <string name="start_stage_channel_event_modal_button">Podium erstellen</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Du wirst ein Sprecher sein, wenn das Podium freigegeben ist.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Gib eine Themenbeschreibung an, um dein Podium freizugeben.</string>
     <string name="start_stage_channel_event_modal_title">Worüber möchtest du reden?</string>
     <string name="start_stage_channel_event_modal_topic_label">Podiumsthema</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Das Gespräch ist zu Ende: Zuckerfreie Limo ist besser als normale</string>
@@ -7247,6 +7245,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Push-Benachrichtigungen deaktiviert</string>
     <string name="user_settings">Benutzereinstellungen</string>
     <string name="user_settings_about_me">Über mich</string>
+    <string name="user_settings_about_me_description">Schreib über dich, was du willst ؘ– solange du unter {maxLength} Zeichen bleibst. Du kannst sogar Markdown und Links benutzen.</string>
     <string name="user_settings_account_change_email_prompt">Deine aktuelle E-Mail-Adresse lautet !!{email}!!. Bitte gib deine neue E-Mail-Adresse an.</string>
     <string name="user_settings_account_change_email_prompt_desktop">Gib eine neue E-Mail-Adresse und dein bestehendes Passwort ein.</string>
     <string name="user_settings_account_change_email_title">E-Mail bearbeiten</string>
@@ -7281,6 +7280,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh, da ist er ja!</string>
     <string name="user_settings_appearance_zoom_tip">Du kannst die Zoomstufe mit {modKey} +/- ändern und mit {modKey}+0 auf den Standard-Zoom zurücksetzen.</string>
     <string name="user_settings_available_codes">Verfügbare Backup-Codes</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Wir empfehlen ein Bild von mindestens 600x240 px. Du kannst PNG-, JPG-Dateien oder ein animiertes GIF hochladen.</string>
     <string name="user_settings_blocked_users">Blockierte Benutzer</string>
     <string name="user_settings_blocked_users_empty">Du hast keine blockierten Benutzer</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} blockierte Benutzer</string>
@@ -7289,11 +7290,13 @@
     <string name="user_settings_close_button">Schließen-Schaltfläche</string>
     <string name="user_settings_confirm_logout">Bist du sicher, dass du dich abmelden möchtest?</string>
     <string name="user_settings_customization_upsell">Mit Nitro freischalten</string>
+    <string name="user_settings_customize_profile_title">Mein Profil personalisieren</string>
     <string name="user_settings_delete_avatar">Avatar löschen</string>
     <string name="user_settings_disable_advanced_voice_activity">Falls deine Stimme trotz Ermittlung durch Mikrofonempfindlichkeit nicht automatisch erkannt wird, könnte die Deaktivierung dieser Option das Problem beheben.</string>
     <string name="user_settings_disable_noise_suppression">Geräuschreduzierung wird bei eingeschalteter Hintergrundgeräusch-Unterdrückung deaktiviert.</string>
     <string name="user_settings_edit_account">Account bearbeiten</string>
     <string name="user_settings_edit_account_password_label">Gib dein Passwort ein, um deine Änderungen zu bestätigen.</string>
+    <string name="user_settings_edit_profile">Profil bearbeiten</string>
     <string name="user_settings_enter_password_view_codes">Gib dein Passwort ein, um die Backup-Codes zu sehen.</string>
     <string name="user_settings_games_install_location">Verzeichnis</string>
     <string name="user_settings_games_install_location_add">Installationsverzeichnis hinzufügen</string>
@@ -7342,6 +7345,8 @@
     <string name="user_settings_open_on_startup_label">Discord öffnen</string>
     <string name="user_settings_privacy_terms">Sieh dir unsere [Nutzungsbedingungen]({termsLink}) und [Datenschutzerklärung]({privacyLink}) an.</string>
     <string name="user_settings_profile_banner">Profilbanner</string>
+    <string name="user_settings_remove_avatar">Avatar entfernen</string>
+    <string name="user_settings_remove_banner">Banner entfernen</string>
     <string name="user_settings_restart_app_mobile">Starte die App neu, damit deine Einstellungen übernommen werden.</string>
     <string name="user_settings_save">Speichern</string>
     <string name="user_settings_scan_qr_code">QR-Code scannen</string>
@@ -7356,6 +7361,7 @@
     <string name="user_settings_upload_avatar">Avatar hochladen</string>
     <string name="user_settings_upload_banner">Banner hochladen</string>
     <string name="user_settings_used_backup_codes">Benutzte Backup-Codes</string>
+    <string name="user_settings_user_profile">Nutzerprofil</string>
     <string name="user_settings_voice_add_multiple">Unter [Hotkey-Einstellungen](onClick) kannst du mehrere Push-to-Talk-Hotkeys hinzufügen.</string>
     <string name="user_settings_voice_codec_description">Discord benutzt nur den besten bio-veganen, regional angebauten und vollständig recycelbaren Opus-Sprachcodec.</string>
     <string name="user_settings_voice_codec_title">Audio-Codec</string>
@@ -7590,25 +7596,6 @@
     <string name="whitelisting">Zur Whitelist hinzufügen …</string>
     <string name="working">Arbeitet …</string>
     <string name="xbox_authorization_title">Xbox-Account-Authentifizierung</string>
-    <string name="xbox_game_pass_card_body_claimed">Du hast dies beansprucht. Hier ist dein Code !!{code}!!. [Mehr Details](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Das Geschenk kann bis zum 15. Januar 2021 beansprucht werden. [Weniger Details](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Das Geschenk kann bis zum 15. Januar 2021 beansprucht werden. [Mehr Details](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Der Code steht auch in einer Bestätigungs-E-Mail, die wir dir gerade geschickt haben.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Etwas ist schiefgelaufen, bitte versuche es später noch einmal!</string>
-    <string name="xbox_game_pass_modal_code_header">Code für Xbox Game Pass für PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oh-oh</string>
-    <string name="xbox_game_pass_modal_header_description_success">Löse den unten stehenden Code auf dieser [Microsoft-Webseite]({redemptionURL}) ein, um für 3 Monate Zugriff zu deinem Xbox Game Pass für PC zu erhalten.</string>
-    <string name="xbox_game_pass_modal_header_success">Großartig!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Du hast ein Boost-Abonnement, also geben wir dir Nitro-Abonnement-Guthaben. Nitro-Guthaben wird angerechnet, wenn du **{planName}** abonnierst.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Einlösen</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Du verfügst jetzt über Nitro-Guthaben! Hol dir noch heute **{planName}**, um dein Nitro-Guthaben anzuwenden.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Sehr gut!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Abonnement-Guthaben</string>
-    <string name="xbox_game_pass_promotion_banner_description">Wir haben noch ein kleines Extra für dich. Nitro-Abonnementen erhalten jetzt drei Monate Xbox Game Pass für PC. Sofort verfügbar bis zum 15. Januar 2021. [Mehr Details](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Wir haben noch ein kleines Extra für dich. Nitro-Abonnementen erhalten jetzt drei Monate Xbox Game Pass für PC. Sofort verfügbar bis zum 15. Januar 2021. [Weniger Details](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 Monate Xbox Game Pass für PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass für PC (3 Monate)</string>
-    <string name="xbox_game_pass_promotion_legalese">Gilt nicht für aktuelle oder frühere Mitglieder von Xbox Game Pass für PC oder Mitglieder von Xbox Game Pass Ultimate. Löse deine(n) Code(s) für Xbox Game Pass bis zum 15. Februar 2021 unter [microsoft.com/redeem](https://microsoft.com/redeem) ein. Kreditkarte erforderlich. Wenn du nicht kündigst, zahlst du nach Ende der Werbeaktion monatlich den dann gültigen regulären Mitgliedschaftspreis. Nicht unterstützt auf Windows 10 im S Modus oder auf ARM-Geräten. Spielekatalog kann sich mit der Zeit ändern. Weitere Informationen unter [xbox.com/gamepass](https://xbox.com/gamepass). Limit: 1 pro Person/Account.</string>
     <string name="xbox_pin_step1">Öffne die Discord-App auf deinem Smartphone</string>
     <string name="xbox_pin_step2">Geh zu Einstellungen &gt; Verknüpfungen &gt; Hinzufügen</string>
     <string name="xbox_pin_step3">Wähle Xbox und gib die oben angezeigte PIN ein</string>
diff --git a/app/src/main/res/values-el/plurals.xml b/app/src/main/res/values-el/plurals.xml
index c47941b395..e4fd49f63b 100644
--- a/app/src/main/res/values-el/plurals.xml
+++ b/app/src/main/res/values-el/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 εβδομάδα</item>
         <item quantity="other">{minimumGuildAge} εβδομάδες</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">το όνομα</item>
-        <item quantity="other">τα ονόματα</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">το όνομα</item>
-        <item quantity="other">τα ονόματα</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Αίτηση σε εκκρεμότητα</item>
         <item quantity="other">{count} Αιτήσεις σε εκκρεμότητα</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4b78924237..38a4d8c4c9 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1415,7 +1415,6 @@
     <string name="contact_sync_we_found_your_friends_body">Γίνατε φίλοι στο Discord. Ξεκίνα μια συζήτηση ή προσκάλεσε τον νέο σου φίλο στον διακομιστή σου και διασκεδάστε το! Θα σε ενημερώσουμε όταν νέοι φίλοι σου γίνουν μέλη του Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Βρήκαμε τους φίλους σου!</string>
     <string name="content_matching">!!{command}!! περιεχόμενο που αντιστοιχεί σε **!!{query}!!**</string>
-    <string name="context_menu_hint">Κάνε δεξί κλικ στον χρήστη για περισσότερες ενέργειες</string>
     <string name="continue_in_browser">Συνέχεια σε περιηγητή ιστού</string>
     <string name="continue_to_webapp">Συνεχίστε στο Discord</string>
     <string name="control_volume">Έλεγχος έντασης ήχου</string>
@@ -3215,8 +3214,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Οι διακομιστές στην ανακάλυψη πρέπει να έχουν ηλικία τουλάχιστον {minimumGuildAge}. Προσπάθησε ξανά αργότερα στις {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Ο διακομιστής είναι πολύ νέος</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Ο διακομιστής σου **$[δεν](doesNotHook)** πληροί όλες τις προϋποθέσεις για να εμφανίζεται στην Ανακάλυψη Διακομιστή.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Πρέπει να αλλάξεις {numCategories} κατηγορίας: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Πρέπει να αλλάξεις {numChannels} καναλιού: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Πρέπει να αλλάξεις την $[περιγραφή](descriptionHook) σου</string>
     <string name="guild_settings_discovery_checklist_change_name">Πρέπει να αλλάξεις το $[όνομα διακομιστή](nameHook) σου</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Αύξησε τον αριθμό των πομπών ανά εβδομάδα</string>
@@ -4936,8 +4933,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Έχεις ακόμα {days} για να πάρεις έναν μήνα δωρεάν Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Έχεις ακόμα {hours} για να πάρεις έναν μήνα δωρεάν Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Έχεις ακόμα {minutes} για να πάρεις έναν μήνα δωρεάν Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Έι, συνδρομητή Nitro! Συγχαρητήρια! Κέρδισες 3 μήνες Xbox Game Pass για PC από εμάς!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Πάρ\' το</string>
     <string name="notice_product_feedback_survey">Θέλεις να συμμετάσχεις στη συζήτηση σχετικά με το προϊόν μαζί μας;</string>
     <string name="notice_product_feedback_survey_cta">Ενημέρωσέ μας εδώ!</string>
     <string name="notice_register_to_vote">Έχεις εγγραφεί για να ψηφίσεις; Τσέκαρε την κατάστασή σου και κάνε εγγραφή σε δύο λεπτά.</string>
@@ -5124,6 +5119,7 @@
     <string name="out_of_date_action">Ενημέρωση Discord</string>
     <string name="out_of_date_description">Έχουμε κάνει μερικές γλυκές αλλαγές στο Discord (και ίσως διορθώσαμε και καναδυό προβλήματα). Κάνε ενημέρωση για να συνεχίσεις.</string>
     <string name="out_of_date_title">Είσαι ανενημέρωτος</string>
+    <string name="outbound_promotion_redemption_modal_title">Τέλεια!</string>
     <string name="outgoing_friend_request">Εξερχόμενο αίτημα φιλίας</string>
     <string name="outgoing_friend_request_delete_msg">Είσαι σίγουρος ότι θέλεις να διαγράψεις το αίτημα φιλίας προς τον χρήστη **!!{name}!!**;</string>
     <string name="outgoing_friend_request_to">Εξερχόμενο αίτημα φιλίας στον χρήστη !!{name}!!</string>
@@ -5802,12 +5798,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Απαιτείται η άδεια **Παρακολούθηση Καναλιών** για τη δημιουργία αυτού του ιδιωτικού καναλιού.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Απαιτείται η άδεια **Παρακολούθηση Καναλιών** και **Σύνδεση** για τη δημιουργία αυτού του ιδιωτικού καναλιού.</string>
     <string name="profile">Προφίλ</string>
+    <string name="profile_banner_icon_tooltip_upsell">Μεταφόρτωσε το εξατομικευμένο banner σου και πολλά άλλα με το Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Η δυνατότητα προσαρμογής προφίλ προς το παρόν είναι διαθέσιμη σε περιορισμένο αριθμό ατόμων.</string>
+    <string name="profile_customization_bio_placeholder">Πες λίγα λόγια στον κόσμο για εσένα</string>
     <string name="profile_customization_marketing_tooltip_body">Εκφράσου με μια ενότητα «σχετικά με εμένα» και, εάν διαθέτεις το Nitro, ένα banner προφίλ!</string>
     <string name="profile_customization_marketing_tooltip_cta">Το ’πιασα</string>
     <string name="profile_customization_marketing_tooltip_header">Νέα προσαρμογή προφίλ!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Αποκλειστικά στο Nitro</string>
     <string name="promotion_card_action_claim">Πάρ\' το</string>
-    <string name="promotion_card_body_claimed_hidden">Το έχεις πάρει ήδη, αλλά ο κωδικός είναι κρυμμένος λόγω της Λειτουργίας ζωντανής ροής.</string>
     <string name="promotion_error_body">Φαίνεται ότι παρουσιάστηκε κάποιο πρόβλημα και δεν μπορείς να χρησιμοποιήσεις αυτόν τον κωδικό. Λυπούμαστε γι’ αυτό.</string>
     <string name="promotion_error_title">Μια στιγμή…</string>
     <string name="promotion_existing_subscriber_title">Ωχ, όχι!</string>
@@ -6717,7 +6715,6 @@
     <string name="start_stage_channel_event_members_title">Μόνο για μέλη</string>
     <string name="start_stage_channel_event_modal_button">Έναρξη σκηνής</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Θα είσαι Ομιλητής μόλις ανοίξει η Σκηνή.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Γράψε ένα θέμα για να ανακοινώσεις ότι η Σκηνή σου βρίσκεται σε ζωντανή μετάδοση.</string>
     <string name="start_stage_channel_event_modal_title">Για τι θα μιλήσεις;</string>
     <string name="start_stage_channel_event_modal_topic_label">Θέμα σκηνής</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Η συζήτηση ολοκληρώθηκε: το διαιτητικό είναι καλύτερο από το κανονικό</string>
@@ -7403,6 +7400,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Οι ειδοποιήσεις push δεν είναι ενεργοποιημένες</string>
     <string name="user_settings">Ρυθμίσεις χρήστη</string>
     <string name="user_settings_about_me">Σχετικά με εμένα</string>
+    <string name="user_settings_about_me_description">Γράψε ό,τι θέλεις σχετικά με εσένα — αρκεί να το κάνεις με λιγότερους από {maxLength} χαρακτήρες. Μπορείς να χρησιμοποιήσεις markdown και συνδέσμους αν θες.</string>
     <string name="user_settings_account_change_email_prompt">Η τρέχουσα διεύθυνση email σου είναι !!{email}!! Με ποια θα ήθελες να την αλλάξεις;</string>
     <string name="user_settings_account_change_email_prompt_desktop">Καταχώρισε μια νέα διεύθυνση email και τον υπάρχοντα κωδικό πρόσβασης.</string>
     <string name="user_settings_account_change_email_title">Επεξεργασία email</string>
@@ -7437,6 +7435,8 @@
     <string name="user_settings_appearance_preview_message_5">Ω, εδώ είναι!</string>
     <string name="user_settings_appearance_zoom_tip">Μπορείς να αλλάξεις το μέγεθος προβολής με {modKey} +/-, και να το επαναφέρεις στην προεπιλογή με {modKey}+0.</string>
     <string name="user_settings_available_codes">Διαθέσιμοι εφεδρικοί κωδικοί</string>
+    <string name="user_settings_avatar">Άβαταρ</string>
+    <string name="user_settings_banner_specs">Προτείνουμε μια εικόνα με μέγεθος τουλάχιστον 600x240. Μπορείς να μεταφορτώσεις PNG, JPG ή κινούμενο GIF.</string>
     <string name="user_settings_blocked_users">Αποκλεισμένοι χρήστες</string>
     <string name="user_settings_blocked_users_empty">Δεν έχεις αποκλείσει κανέναν χρήστη</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Αποκλεισμένοι χρήστες</string>
@@ -7445,11 +7445,13 @@
     <string name="user_settings_close_button">Κουμπί κλεισίματος</string>
     <string name="user_settings_confirm_logout">Είσαι σίγουρος ότι θες να αποσυνδεθείς;</string>
     <string name="user_settings_customization_upsell">Ξεκλείδωσε με το Nitro</string>
+    <string name="user_settings_customize_profile_title">Προσαρμογή του προφίλ μου</string>
     <string name="user_settings_delete_avatar">Διαγραφή άβαταρ</string>
     <string name="user_settings_disable_advanced_voice_activity">Η απενεργοποίηση αυτής της λειτουργίας θα σε βοηθήσει αν η ομιλία σου δεν αναγνωρίζεται από την αυτόματη ευαισθησία εισόδου.</string>
     <string name="user_settings_disable_noise_suppression">Η μείωση θορύβου είναι απενεργοποιημένη, ενώ η Καταστολή θορύβου είναι ενεργή.</string>
     <string name="user_settings_edit_account">Επεξεργασία λογαριασμού</string>
     <string name="user_settings_edit_account_password_label">Συμπλήρωσε τον κωδικό πρόσβασής σου για να επιβεβαιώσεις τις αλλαγές</string>
+    <string name="user_settings_edit_profile">Επεξεργασία προφίλ</string>
     <string name="user_settings_enter_password_view_codes">Συμπλήρωσε τον κωδικό πρόσβασής σου για να δεις τους εφεδρικούς κωδικούς.</string>
     <string name="user_settings_games_install_location">Τοποθεσία</string>
     <string name="user_settings_games_install_location_add">Προσθήκη τοποθεσίας εγκατάστασης</string>
@@ -7500,6 +7502,8 @@
     <string name="user_settings_open_on_startup_label">Ανοίξτε το Discord</string>
     <string name="user_settings_privacy_terms">Δείτε τους [Όρους Παροχής Υπηρεσιών]({termsLink}) και την [Πολιτική Απορρήτου]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Banner προφίλ</string>
+    <string name="user_settings_remove_avatar">Αφαίρεση άβαταρ</string>
+    <string name="user_settings_remove_banner">Αφαίρεση banner</string>
     <string name="user_settings_restart_app_mobile">Κάνε επανεκκίνηση της εφαρμογής για να εφαρμοστούν οι νέες ρυθμίσεις σου.</string>
     <string name="user_settings_save">Αποθήκευση</string>
     <string name="user_settings_scan_qr_code">Σάρωση κωδικού QR</string>
@@ -7514,6 +7518,7 @@
     <string name="user_settings_upload_avatar">Μεταφόρτωση άβαταρ</string>
     <string name="user_settings_upload_banner">Μεταφόρτωση banner</string>
     <string name="user_settings_used_backup_codes">Εφεδρικοί κωδικοί που έχουν χρησιμοποιηθεί</string>
+    <string name="user_settings_user_profile">Προφίλ χρήστη</string>
     <string name="user_settings_voice_add_multiple">Μπορείς να προσθέσεις πολλαπλές Push to Talk συντομεύσεις στις [Ρυθμίσεις συντομεύσεων](onClick).</string>
     <string name="user_settings_voice_codec_description">Η Discord χρησιμοποιεί την καλύτερη οργανική τοπική πηγή κωδικοποίηση φωνής Opus.</string>
     <string name="user_settings_voice_codec_title">Κωδικοποίηση ήχου</string>
@@ -7749,25 +7754,6 @@
     <string name="whitelisting">Εγκρίνεται…</string>
     <string name="working">Σε λειτουργία…</string>
     <string name="xbox_authorization_title">Εξουσιοδότηση λογαριασμού Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Τον έχεις εξαργυρώσει. Ορίστε ο κωδικός σου !!{code}!!. [Περισσότερες λεπτομέρειες](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Το δώρο είναι διαθέσιμο μέχρι τις 15 Ιανουαρίου 2021. [Λιγότερες λεπτομέρειες](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Το δώρο είναι διαθέσιμο μέχρι τις 15 Ιανουαρίου 2021. [Περισσότερες λεπτομέρειες](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Αυτός ο κωδικός αναφέρεται και στο email επιβεβαίωσης που μόλις σου στείλαμε.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Κάτι πήγε στραβά, προσπάθησε ξανά αργότερα!</string>
-    <string name="xbox_game_pass_modal_code_header">Κωδικός Xbox Game Pass για PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Ωχ</string>
-    <string name="xbox_game_pass_modal_header_description_success">Εξαργύρωσε τον παρακάτω κωδικό στη [σελίδα εξαργύρωσης της Microsoft]({redemptionURL}) για να αποκτήσεις πρόσβαση στο Xbox Game Pass για PC για 3 μήνες.</string>
-    <string name="xbox_game_pass_modal_header_success">Τέλεια!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Επειδή έχεις ενισχυμένη συνδρομή, θα σου δώσουμε πίστωση για συνδρομή Nitro. Η πίστωση Nitro θα εφαρμοστεί όταν εγγραφείς στο **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Εξαργύρωση</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Τώρα έχεις πίστωση Nitro! Γίνε συνδρομητής στο **{planName}** για να εφαρμοστεί σήμερα η πίστωση Nitro που έχεις.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Ωραία!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Πίστωση συνδρομής</string>
-    <string name="xbox_game_pass_promotion_banner_description">Έχεις και κάτι ακόμα. Οι συνδρομητές Nitro κερδίζουν τώρα 3 μήνες Xbox Game Pass για PC. Η προσφορά είναι διαθέσιμη από τώρα μέχρι τις 15 Ιανουαρίου 2021. [Περισσότερες λεπτομέρειες](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Έχεις και κάτι ακόμα. Οι συνδρομητές Nitro κερδίζουν τώρα 3 μήνες Xbox Game Pass για PC. Η προσφορά είναι διαθέσιμη από τώρα μέχρι τις 15 Ιανουαρίου 2021. [Λιγότερες λεπτομέρειες](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 μήνες Xbox Game Pass για PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass για PC (3 μήνες)</string>
-    <string name="xbox_game_pass_promotion_legalese">Δεν ισχύει για συνδρομητές που έχουν ή είχαν Xbox Game Pass για PC ή Xbox Game Pass Ultimate. Εξαργύρωσε τον κωδικό Xbox Game Pass που έχεις στο [microsoft.com/redeem](https://microsoft.com/redeem) μέχρι τις 15 Φεβρουαρίου 2021. Απαιτείται πιστωτική κάρτα. Αν δεν ακυρώσεις τη συνδρομή, θα χρεωθείς με την κανονική τιμή μέλους κάθε μήνα μετά το τέλος της προωθητικής περιόδου. Δεν υποστηρίζεται σε Windows 10 σε λειτουργία S και σε συσκευές ARM. Ο κατάλογος παιχνιδιών διαφέρει με την πάροδο του χρόνου. Δες το [xbox.com/gamepass](https://xbox.com/gamepass). Όριο: 1 ανά άτομο/λογαριασμό.</string>
     <string name="xbox_link">Σύνδεση</string>
     <string name="xbox_pin_step1">Άνοιξε την εφαρμογή Discord στο κινητό σου</string>
     <string name="xbox_pin_step2">Πήγαινε στις Ρυθμίσεις &gt; Συνδέσεις &gt; Προσθήκη</string>
diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml
index 99eaa14d42..9612fe9a65 100644
--- a/app/src/main/res/values-en-rXA/plurals.xml
+++ b/app/src/main/res/values-en-rXA/plurals.xml
@@ -596,14 +596,6 @@
         <item quantity="one">[1 ŵééķ one two]</item>
         <item quantity="other">[»{minimumGuildAge}« ŵééķš one two]</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">[ñåḿé one]</item>
-        <item quantity="other">[ñåḿéš one]</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">[ñåḿé one]</item>
-        <item quantity="other">[ñåḿéš one]</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">[Þéñðîñĝ Åþþļîçåţîöñ one two three]</item>
         <item quantity="other">[»{count}« Þéñðîñĝ Åþþļîçåţîöñš one two three]</item>
@@ -708,6 +700,10 @@
         <item quantity="one">[»{#}« ḿéñţîöñ, one two]</item>
         <item quantity="other">[»{#}« ḿéñţîöñš, one two]</item>
     </plurals>
+    <plurals name="hub_email_connection_invite_header_count">
+        <item quantity="one">[»{count}« öţĥéŕ ḿéḿɓéŕ one two]</item>
+        <item quantity="other">[»{count}« öţĥéŕ ḿéḿɓéŕš one two three]</item>
+    </plurals>
     <plurals name="humanize_duration_days_time">
         <item quantity="one">[1 ðåý one]</item>
         <item quantity="other">[»{#}« ðåýš one]</item>
diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml
index acea731dd7..3d8883e10f 100644
--- a/app/src/main/res/values-en-rXA/strings.xml
+++ b/app/src/main/res/values-en-rXA/strings.xml
@@ -1531,7 +1531,6 @@
     <string name="contact_sync_we_found_your_friends_title">[Ŵé ƒöûñð ýöûŕ ƒŕîéñðš¡ one two three]</string>
     <string name="contacts_invite_placeholder">[ĥéý çöḿé çĥéçķ öûţ Ðîšçöŕð ŵîţĥ ḿé ¡¡»{link}«¡¡ one two three four five]</string>
     <string name="content_matching">[¡¡»{command}«¡¡ çöñţéñţ ḿåţçĥîñĝ **¡¡»{query}«¡¡** one two three four]</string>
-    <string name="context_menu_hint">[Ŕîĝĥţ çļîçķ ûšéŕ ƒöŕ ḿöŕé åçţîöñš one two three four]</string>
     <string name="continue_in_browser">[Çöñţîñûé îñ ɓŕöŵšéŕ one two three]</string>
     <string name="continue_to_webapp">[Çöñţîñûé ţö Ðîšçöŕð one two three]</string>
     <string name="control_volume">[Çöñţŕöļ Vöļûḿé one two three]</string>
@@ -2120,6 +2119,7 @@
     <string name="edit_message">[Éðîţ Ḿéššåĝé one two]</string>
     <string name="edit_note">[Éðîţ Ñöţé one two]</string>
     <string name="edit_overview">[Éðîţ ÖVéŕVîéŵ one two]</string>
+    <string name="edit_profile">[Éðîţ Þŕöƒîļé one two]</string>
     <string name="edit_roles">[Éðîţ Ŕöļéš one two]</string>
     <string name="edit_stage_channel_subtitle">[Çĥåñĝé ţĥé ţöþîç öŕ þŕîVåçý šéţţîñĝš one two three four five]</string>
     <string name="edit_stage_channel_title">[Éðîţ Šţåĝé one two]</string>
@@ -2391,6 +2391,7 @@
     <string name="explicit_end_stage_confirm_mobile">[Éхîţ åñð éñð ţĥé Šţåĝé one two three]</string>
     <string name="explicit_end_stage_subtitle">[Å Šţåĝé ŵîţĥ ñö šþéåķéŕš ŵîļļ åûţöḿåţîçåļļý éñð åƒţéŕ å ƒéŵ ḿîñûţéš. one two three four five six seven eight]</string>
     <string name="explicit_end_stage_title">[Ðö ýöû ŵåñţ ţö åļšö éñð ţĥé Šţåĝé¿ one two three four]</string>
+    <string name="explicit_end_ticketed_guild_event_subtitle">[Ýöû’ŕé ţĥé ļåšţ éVéñţ ḿåñåĝéŕ îñ ţĥîš Šţåĝé. one two three four five]</string>
     <string name="exposed_dropdown_menu_content_description">[Šĥöŵ ðŕöþðöŵñ ḿéñû one two three]</string>
     <string name="expression_picker_emoji">[Éḿöĵî one]</string>
     <string name="expression_picker_gif">[ĜÎFš one]</string>
@@ -2868,8 +2869,11 @@
     <string name="general_permissions">[Ĝéñéŕåļ Þéŕḿîššîöñš one two three]</string>
     <string name="generate_a_new_link">[Ĝéñéŕåţé å Ñéŵ Ļîñķ one two three]</string>
     <string name="generic_actions_menu_label">[Åçţîöñš one two]</string>
+    <string name="generic_error_body">[Šééḿš ļîķé šöḿéţĥîñĝ\'š ĝöñé ŵŕöñĝ. Šöŕŕý åɓöûţ ţĥåţ. one two three four five six]</string>
+    <string name="generic_error_title">[Öĥ ñö¡ one two]</string>
     <string name="get_mobile_app">[Ĝéţ ţĥé Ðîšçöŕð åþþ one two three]</string>
     <string name="get_mobile_app_cta">[Ĝéţ ţĥé Åþþ one two]</string>
+    <string name="get_mobile_app_skip">[Šķîþ ƒöŕ ñöŵ one two]</string>
     <string name="get_mobile_app_subtitle">[Ðîšçöŕð îšñ\'ţ šûþþöŕţéð öñ ḿöɓîļé ŵéɓ ɓŕöŵšéŕš. Ĵöîñ öVéŕ 100 ḿîļļîöñ þéöþļé ŵĥö ûšé Ðîšçöŕð ţö ţåļķ ŵîţĥ çöḿḿûñîţîéš åñð ƒŕîéñðš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two]</string>
     <string name="get_started">[Ĝéţ Šţåŕţéð one two]</string>
     <string name="gif">[ĜÎF one]</string>
@@ -3143,7 +3147,10 @@
     <string name="guild_discovery_search_results_header">[»{count}« ƒöŕ »{query}« one]</string>
     <string name="guild_discovery_tooltip">[Éхþļöŕé Þûɓļîç ŠéŕVéŕš one two three]</string>
     <string name="guild_discovery_view_button">[νîéŵ one]</string>
+    <string name="guild_event_add_moderators_label">[Åðð Ḿöðéŕåţöŕš one two three]</string>
+    <string name="guild_event_moderators_description">[Šţåĝé ḿöðéŕåţöŕš åŕé Šþéåķéŕš ŵĥö çåñ åðð åñð ŕéḿöVé öţĥéŕ Šþéåķéŕš. Ţĥéý çåñ åļšö éñð ţĥé Šţåĝé. Šţåĝé ḿöðéŕåţöŕš ðöñ\'ţ ĥåVé ţö ɓé ḿöðš öƒ ţĥé šéŕVéŕ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven]</string>
     <string name="guild_event_ticket_billing_invoice_total_tax_inclusive">[**Ţöţåļ** (Ţåх Îñçļûðéð) one two three]</string>
+    <string name="guild_events">[ÉVéñţš one two]</string>
     <string name="guild_folder_color">[Föļðéŕ Çöļöŕ one two]</string>
     <string name="guild_folder_name">[Föļðéŕ Ñåḿé one two]</string>
     <string name="guild_folder_tooltip_a11y_label">[¡¡»{folderName}«¡¡, ƒöļðéŕ »{mentions}« one two]</string>
@@ -3518,8 +3525,7 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">[ŠéŕVéŕš îñ ÐîšçöVéŕý ñééð ţö ɓé åţ ļéåšţ »{minimumGuildAge}« öļð. Þļéåšé çĥéçķ ɓåçķ öñ »{passDate}«. one two three four five six seven eight]</string>
     <string name="guild_settings_discovery_checklist_age_failing">[ŠéŕVéŕ Ţöö Ýöûñĝ one two three]</string>
     <string name="guild_settings_discovery_checklist_bad_standing">[Ýöûŕ šéŕVéŕ **€[ðöéš ñöţ](ðöéšÑöţĤööķ)** ḿééţ åļļ ţĥé ŕéQûîŕéḿéñţš ţö ɓé îñ ŠéŕVéŕ ÐîšçöVéŕý. one two three four five six seven eight nine ten]</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">[Ýöû ñééð ţö çĥåñĝé ýöûŕ çåţéĝöŕý »{numCategories}«: €[»{categoryNames}«](çåţéĝöŕýĤööķ) one two three four five six]</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">[Ýöû ñééð ţö çĥåñĝé ýöûŕ çĥåññéļ »{numChannels}«: €[»{channelNames}«](çĥåññéļĤööķ) one two three four five six]</string>
+    <string name="guild_settings_discovery_checklist_change_channel_names_2">[Ýöû ñééð ţö çĥåñĝé €[öñé öŕ ḿöŕé çĥåññéļ ñåḿéš](çĥåññéļĤööķ) one two three four five six seven]</string>
     <string name="guild_settings_discovery_checklist_change_description">[Ýöû ñééð ţö çĥåñĝé ýöûŕ €[ðéšçŕîþţîöñ](ðéšçŕîþţîöñĤööķ) one two three four five six seven]</string>
     <string name="guild_settings_discovery_checklist_change_name">[Ýöû ñééð ţö çĥåñĝé ýöûŕ €[šéŕVéŕ ñåḿé](ñåḿéĤööķ) one two three four five six]</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">[Îñçŕéåšé ñûḿɓéŕ öƒ ŵééķļý çöḿḿûñîçåţöŕš one two three four five]</string>
@@ -3797,8 +3803,9 @@
     <string name="guild_settings_stickers">[Šţîçķéŕš one two]</string>
     <string name="guild_settings_stickers_boost_server">[βööšţ ŠéŕVéŕ one two]</string>
     <string name="guild_settings_stickers_upload_heading">[Ûþļöåð ŔéQûîŕéḿéñţš one two three]</string>
-    <string name="guild_settings_stickers_upload_requirements">[βéƒöŕé ûþļöåðîñĝ ýöûŕ šţîçķéŕ ƒîļé, ḿåķéŕ šûŕé ýöû ḿééţ ţĥé ƒöļļöŵîñĝ ŕéQûîŕéḿéñţš one two three four five six seven eight nine]</string>
-    <string name="guild_settings_stickers_upload_requirements_1">[Fîļé ţýþé: ÞÑĜ, ÅÞÑĜ, åñð Ļöţţîé (Ŕéåð ḿöŕé åɓöûţ ƒîļé ţýþéš ĥéŕé) one two three four five six seven eight nine ten eleven twelve thirteen]</string>
+    <string name="guild_settings_stickers_upload_help">[Föŕ ḿöŕé îñƒöŕḿåţîöñ åɓöûţ ƒîļé ţýþéš, åñð ţîþš öñ ûþļöåðîñĝ çûšţöḿ šţîçķéŕš, çĥéçķ öûţ ţĥîš [Ĥéļþ Çéñţéŕ åŕţîçļé](»{articleUrl}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty]</string>
+    <string name="guild_settings_stickers_upload_requirements">[βéƒöŕé ûþļöåðîñĝ ýöûŕ šţîçķéŕ ƒîļé, ḿåķé šûŕé ýöû ḿééţ ţĥé ƒöļļöŵîñĝ ŕéQûîŕéḿéñţš one two three four five six seven eight nine]</string>
+    <string name="guild_settings_stickers_upload_requirements_1">[Fîļé ţýþé: ÞÑĜ, ÅÞÑĜ, åñð Ļöţţîé one two three four five six seven]</string>
     <string name="guild_settings_stickers_upload_requirements_2">[Fîļé šîžé: »{fileSize}« one two]</string>
     <string name="guild_settings_stickers_upload_requirements_3">[Ðîḿéñšîöñš: 320 х 320 one two three]</string>
     <string name="guild_settings_stickers_upload_requirements_4">[Éḿöĵî Ţåĝ: Ýöû ŵîļļ ɓé ŕéQûîŕéð ţö šéļéçţ å ûñîçöðé éḿöĵî ţĥåţ ḿåţçĥéš ýöûŕ šţîçķéŕ ţĥé çļöšéšţ. one two three four five six seven eight nine ten eleven]</string>
@@ -3886,13 +3893,17 @@
     <string name="guild_template_default_server_name_local_communities">[»{username}«\'š Çöḿḿûñîţý one two]</string>
     <string name="guild_template_default_server_name_study_groups">[»{username}«\'š Šţûðý Ĝŕöûþ one two three]</string>
     <string name="guild_template_embed_view_in_app">[ÅVåîļåɓļé îñ Åþþ one two three]</string>
+    <string name="guild_template_header_class">[Çļåšš one]</string>
     <string name="guild_template_header_clubs">[Çļûɓš one]</string>
     <string name="guild_template_header_community">[Ļöçåļ Çöḿḿûñîţý one two three]</string>
     <string name="guild_template_header_create">[Çŕéåţé Ḿý Öŵñ one two]</string>
     <string name="guild_template_header_creator">[Åŕţîšţš &amp;  Çŕéåţöŕš one two three]</string>
+    <string name="guild_template_header_dorm">[Ðöŕḿ one]</string>
     <string name="guild_template_header_friend">[Fŕîéñðš one two]</string>
     <string name="guild_template_header_gaming">[Ĝåḿîñĝ one two]</string>
+    <string name="guild_template_header_major">[Šûɓĵéçţ öŕ Ḿåĵöŕ one two three]</string>
     <string name="guild_template_header_school_club">[Šçĥööļ Çļûɓ one two]</string>
+    <string name="guild_template_header_social">[Šöçîåļ one two]</string>
     <string name="guild_template_header_study">[Šţûðý Ĝŕöûþ one two]</string>
     <string name="guild_template_invalid_subtitle">[Ýöû çåñ åšķ ţĥé öŵñéŕ ţö ḿåķé å ñéŵ öñé ţĥöûĝĥ one two three four five six]</string>
     <string name="guild_template_invalid_title">[ÎñVåļîð šéŕVéŕ ţéḿþļåţé one two three]</string>
@@ -3927,19 +3938,25 @@
     <string name="guild_template_modal_title_local_communities">[Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ çöḿḿûñîţý one two three four]</string>
     <string name="guild_template_modal_title_study_groups">[Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ šţûðý ĝŕöûþ one two three four five]</string>
     <string name="guild_template_name_announcements">[åññöûñçéḿéñţš one two]</string>
+    <string name="guild_template_name_assignments">[åššîĝñḿéñţš one two]</string>
+    <string name="guild_template_name_category_chat">[Çĥåţ one]</string>
+    <string name="guild_template_name_category_info">[Îñƒö one]</string>
     <string name="guild_template_name_category_information">[Îñƒöŕḿåţîöñ one two]</string>
     <string name="guild_template_name_category_text">[Ţéхţ Çĥåññéļš one two]</string>
     <string name="guild_template_name_category_voice">[νöîçé Çĥåññéļš one two three]</string>
     <string name="guild_template_name_clips_and_highlights">[çļîþš-åñð-ĥîĝĥļîĝĥţš one two three]</string>
+    <string name="guild_template_name_dorm_news">[ðöŕḿ-ñéŵš one two]</string>
     <string name="guild_template_name_events">[éVéñţš one two]</string>
     <string name="guild_template_name_game">[ĝåḿéš one]</string>
     <string name="guild_template_name_game_new">[ñéŵ-ĝåḿéš one two]</string>
     <string name="guild_template_name_game_room">[ĝåḿé-ŕööḿ-»{number}« one two]</string>
     <string name="guild_template_name_general">[ĝéñéŕåļ one two]</string>
     <string name="guild_template_name_giveaways">[ĝîVéåŵåýš one two]</string>
+    <string name="guild_template_name_help_questions">[ĥéļþ-åñð-Qûéšţîöñš one two three]</string>
     <string name="guild_template_name_homework">[ĥöḿéŵöŕķ one two]</string>
     <string name="guild_template_name_homework_help">[ĥöḿéŵöŕķ-ĥéļþ one two]</string>
     <string name="guild_template_name_ideas_and_feedback">[îðéåš-åñð-ƒééðɓåçķ one two three]</string>
+    <string name="guild_template_name_introductions">[îñţŕöðûçţîöñš one two]</string>
     <string name="guild_template_name_meeting_plans">[ḿééţîñĝ-þļåñš one two]</string>
     <string name="guild_template_name_meetups">[ḿééţûþš one two]</string>
     <string name="guild_template_name_memes">[ḿéḿéš one]</string>
@@ -3953,6 +3970,7 @@
     <string name="guild_template_name_social">[šöçîåļ-þöšţš one two]</string>
     <string name="guild_template_name_strategy">[šţŕåţéĝý-ðîšçûššîöñ one two three]</string>
     <string name="guild_template_name_voice_community_hangout">[Çöḿḿûñîţý Ĥåñĝöûţ one two three]</string>
+    <string name="guild_template_name_voice_couches">[Çöûçĥéš one two]</string>
     <string name="guild_template_name_voice_gaming">[Ĝåḿîñĝ one two]</string>
     <string name="guild_template_name_voice_general">[Ĝéñéŕåļ one two]</string>
     <string name="guild_template_name_voice_lobby">[Ļöɓɓý one]</string>
@@ -3960,8 +3978,10 @@
     <string name="guild_template_name_voice_meeting_room">[Ḿééţîñĝ Ŕööḿ one two]</string>
     <string name="guild_template_name_voice_meeting_room_1">[Ḿééţîñĝ Ŕööḿ 1 one two three]</string>
     <string name="guild_template_name_voice_meeting_room_2">[Ḿééţîñĝ Ŕööḿ 2 one two three]</string>
+    <string name="guild_template_name_voice_movie_room">[ḾöVîé Ŕööḿ one two]</string>
     <string name="guild_template_name_voice_stream_room">[Šţŕéåḿ Ŕööḿ one two]</string>
     <string name="guild_template_name_voice_study_room">[Šţûðý Ŕööḿ »{number}« one two]</string>
+    <string name="guild_template_name_voice_unnumbered_study_room">[Šţûðý Ŕööḿ one two]</string>
     <string name="guild_template_name_welcome">[ŵéļçöḿé one two]</string>
     <string name="guild_template_name_welcome_and_rules">[ŵéļçöḿé-åñð-ŕûļéš one two three]</string>
     <string name="guild_template_open">[νîéŵ Ţéḿþļåţé one two]</string>
@@ -4063,17 +4083,26 @@
     <string name="how_to_invite_others">[Ĥéļļö. βééþ. βööþ. ΃ ýöû ŵåññå îñVîţé ƒŕîéñðš ţö ţĥîš šéŕVéŕ, çļîçķ ţĥé šéŕVéŕ ñåḿé îñ ţĥé ţöþ ļéƒţ åñð šéļéçţ ¡¡»{invitePeople}«¡¡. βééþ¡ one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty]</string>
     <string name="hr">[Çŕöåţîåñ one two]</string>
     <string name="hu">[Ĥûñĝåŕîåñ one two]</string>
-    <string name="hub_add_guild_description_help">[Ţĥé šéŕVéŕ ðéšçŕîþţîöñ ŵîļļ åþþéåŕ îñ ţĥé ĥûɓ. Ûšé îţ ţö ĥéļþ šţûðéñţš ðéçîðé ŵĥéţĥéŕ ţö ĵöîñ. one two three four five six seven eight nine ten]</string>
-    <string name="hub_add_guild_description_placeholder">[Ðéšçŕîþţîöñ öƒ çļåšš, þŕöƒéššöŕ, åñð šéŕVéŕ ĝöåļš (šţûðý ĝŕöûþ), éţç. one two three four five six seven eight nine ten eleven twelve thirteen]</string>
+    <string name="hub_add_guild_description_help">[Ţĥîš šéŕVéŕ ðéšçŕîþţîöñ ŵîļļ åþþéåŕ îñ ţĥé Ĥûɓ. one two three four five six]</string>
+    <string name="hub_add_guild_description_placeholder">[Ŵĥåţ\'š ýöûŕ šéŕVéŕ åɓöûţ¿ Ŵĥåţ ðö þéöþļé ðö ţĥéŕé¿ one two three four five six]</string>
     <string name="hub_add_guild_description_title">[ŠéŕVéŕ Ðéšçŕîþţîöñ one two three]</string>
+    <string name="hub_add_or_create_server_confirmation_title">[Šûççéšš¡ one two]</string>
+    <string name="hub_add_server_confirmation_button">[Ĝöţ îţ¡ one two]</string>
+    <string name="hub_add_server_confirmation_subtitle">[Ýöûŕ šéŕVéŕ ĥåš ɓééñ åððéð ţö ţĥé Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡¡ one two three four five six]</string>
     <string name="hub_add_server_cta">[Åðð ŠéŕVéŕ one two]</string>
-    <string name="hub_choose_guild_subtitle">[Çĥööšé å ŕéļéVåñţ šéŕVéŕ ƒŕöḿ ţĥîš ļîšţ öƒ šéŕVéŕš ýöû åŕé åñ åðḿîñ ƒöŕ. Îţ ŵîļļ šţîļļ ɓé åççéššîɓļé ţö þéöþļé öûţšîðé ţĥé ĥûɓ. one two three four five six seven eight nine ten eleven twelve thirteen]</string>
+    <string name="hub_choose_guild_empty">[Ýöû åŕé ñöţ åñ åðḿîñ öƒ åñý ûñļîšţéð šéŕVéŕš. one two three four five]</string>
+    <string name="hub_choose_guild_subtitle">[Ýöûŕ šéŕVéŕ ŵîļļ ɓé ðîšçöVéŕåɓļé ɓý šţûðéñţš îñ ţĥîš Ĥûɓ. Öñļý šéŕVéŕš ýöû ĥåVé åðḿîñ þéŕḿîššîöñš îñ åŕé šĥöŵñ. one two three four five six seven eight nine ten eleven twelve]</string>
     <string name="hub_choose_guild_title">[Åðð å šéŕVéŕ ţö ¡¡»{guildName}«¡¡ one two three]</string>
     <string name="hub_create_guild_cta">[Çŕéåţé Ñéŵ ŠéŕVéŕ one two three]</string>
-    <string name="hub_create_guild_label">[ĤåVé åñ îðéå ƒöŕ å ñéŵ šéŕVéŕ¿ one two three four]</string>
-    <string name="hub_create_or_add_guild_subtitle">[Ŵĥéñ ýöû åðð å šéŕVéŕ, îţ ŵîļļ ɓé Vîšîɓļé ţö öţĥéŕ šţûðéñţš åñð ḿéḿɓéŕš, šö ḿåķé šûŕé îţ\'š šçĥööļ åþþŕöþŕîåţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen]</string>
+    <string name="hub_create_guild_label">[Ŵåñţ ţö šţåŕţ å ñéŵ ĝŕöûþ¿ one two three four]</string>
+    <string name="hub_create_or_add_guild_subtitle">[Ýöûŕ šéŕVéŕ ŵîļļ šţîļļ ɓé åççéššîɓļé ţö þéöþļé öûţšîðé ţĥé Ĥûɓ. one two three four five six seven]</string>
     <string name="hub_create_or_add_guild_title">[Ĥéļþ ĝŕöŵ ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡ one two three four]</string>
+    <string name="hub_create_server_confirmation_go">[Ĝö ţö ŠéŕVéŕ one two]</string>
+    <string name="hub_create_server_confirmation_stay">[βåçķ ţö Ĥûɓ one two]</string>
+    <string name="hub_create_server_confirmation_subtitle">[Ýöûŕ šéŕVéŕ ĥåš ɓééñ çŕéåţéð åñð åððéð ţö ţĥé Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡¡ one two three four five six seven]</string>
     <string name="hub_customize_existing_guild_title">[Ĥéļþ öţĥéŕ šţûðéñţš ƒîñð ¡¡»{guildName}«¡¡ one two three four]</string>
+    <string name="hub_customize_new_guild_subtitle">[Ţĥîš šéŕVéŕ ðéšçŕîþţîöñ ŵîļļ åþþéåŕ îñ ţĥé Ĥûɓ. Ûšé îţ ţö ĥéļþ šţûðéñţš ðéçîðé ŵĥéţĥéŕ ţö ĵöîñ. one two three four five six seven eight nine ten]</string>
+    <string name="hub_directory_card_joined_guild_button">[Ĝö ţö šéŕVéŕ one two]</string>
     <string name="hub_directory_channel_empty_add_server">[Åðð å šéŕVéŕ ţö ţĥîš Ĥûɓ one two three]</string>
     <string name="hub_directory_channel_empty_invite">[ÎñVîţé þéöþļé ţö ţĥîš Ĥûɓ one two three]</string>
     <string name="hub_directory_channel_empty_subtitle">[Ýöû\'ŕé öñé öƒ ţĥé ƒîŕšţ þéöþļé ĥéŕé¡ Ļéţ\'š šţåŕţ ɓý åððîñĝ šöḿé šéŕVéŕš åñð ḿéḿɓéŕš. one two three four five six seven eight nine]</string>
@@ -4081,13 +4110,48 @@
     <string name="hub_directory_channel_title">[Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡ one two three]</string>
     <string name="hub_directory_search_subtitle">[Fŕöḿ çļûɓš ţö šţûðý ĝŕöûþš, šţåý ûþ ţö ðåţé ŵîţĥ ŵĥåţ\'š ĥåþþéñîñĝ one two three four five six seven]</string>
     <string name="hub_directory_search_title">[Fîñð ýöûŕ šçĥööļ-ŕéļåţéð šéŕVéŕš one two three four]</string>
+    <string name="hub_discord_hub">[Ðîšçöŕð Ĥûɓ one two]</string>
+    <string name="hub_discord_hubs">[Ðîšçöŕð Ĥûɓš one two]</string>
+    <string name="hub_discovery_description">[Fŕöḿ çļûɓš, ţö šţûðý ĝŕöûþš, šţåý ûþ ţö ðåţé ŵîţĥ ŵĥåţ\'š ĥåþþéñîñĝ. one two three four five six seven eight nine ten eleven twelve thirteen]</string>
+    <string name="hub_discovery_footer_description">[Ĥûɓš çöññéçţ ḿûļţîþļé ŕéļåţéð šéŕVéŕš ţĥåţ åŕé þåŕţ öƒ å ɓŕöåðéŕ çöḿḿûñîţý. Ĥûɓš ŕéļåţéð ţö éðûçåţîöñ åŕé šţûðéñţ-ŕûñ åñð ñöţ öƒƒîçîåļļý 僃îļîåţéð ŵîţĥ šçĥööļš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
+    <string name="hub_discovery_header">[Fîñð Ðîšçöŕð Ĥûɓš ƒöŕ ýöûŕ šçĥööļš one two three four]</string>
+    <string name="hub_email_confirmation_description">[Çöñƒîŕḿ ţĥé ļîñķ ƒŕöḿ ýöûŕ éḿåîļ ţö çöñţîñûé Véŕîƒîçåţîöñ. Ţĥîš þåĝé ŵîļļ åûţöḿåţîçåļļý ŕéƒŕéšĥ. one two three four five six seven eight nine ten eleven]</string>
+    <string name="hub_email_confirmation_different_email">[Ţŕý Å Ðéŕéñţ Éḿåîļ one two three]</string>
+    <string name="hub_email_confirmation_header">[Ŵé’Vé šéñţ å çöñƒîŕḿåţîöñ ļîñķ ţö ¡¡»{email}«¡¡ one two three four five]</string>
+    <string name="hub_email_confirmation_resend">[Ŕéšéñð Çöñƒîŕḿåţîöñ Ļîñķ one two three]</string>
+    <string name="hub_email_connection_add_description">[Ýöû çåñ ĵöîñ ţĥé ĥûɓ öƒ åñý šçĥööļ ýöû’ŕé åţţéñðîñĝ. one two three four five six]</string>
+    <string name="hub_email_connection_add_header">[Åţţéñð ḿûļţîþļé šçĥööļš¿ one two three]</string>
+    <string name="hub_email_connection_content_button">[Ĵöîñ Ḿý Šçĥööļ one two three]</string>
+    <string name="hub_email_connection_content_description">[Éåšîļý ƒîñð šţûðéñţ-ŕûñ šéŕVéŕš ƒöŕ ýöûŕ šţûðý ĝŕöûþš, çļûɓš, šþöŕţš, ƒŕéé ƒööð, åñð ḿöŕé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen]</string>
+    <string name="hub_email_connection_content_header">[Åŕé ýöû å çûŕŕéñţ šţûðéñţ¿ Ĵöîñ ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ýöûŕ šçĥööļ one two three four five six seven]</string>
+    <string name="hub_email_connection_content_input_description">[Éñţéŕ ýöûŕ öƒƒîçîåļ šçĥööļ éḿåîļ åððŕéšš one two three four five]</string>
+    <string name="hub_email_connection_content_input_header">[Šçĥööļ Éḿåîļ one two]</string>
+    <string name="hub_email_connection_content_input_placeholder">[ñåḿé@šçĥööļ.éðû one two three]</string>
+    <string name="hub_email_connection_invite_header">[Ĵöîñ »{count}« îñ ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡¡ one two three four]</string>
+    <string name="hub_email_connection_join_another">[Ĵöîñ Åñöţĥéŕ Ĥûɓ one two three]</string>
+    <string name="hub_email_connection_sidebar_description">[Ĥûɓš çöññéçţ ḿûļţîþļé ŕéļåţéð šéŕVéŕš ţĥåţ åŕé þåŕţ öƒ å ɓŕöåðéŕ šçĥööļ çöḿḿûñîţý. Ĥûɓš ŕéļåţéð ţö éðûçåţîöñ åŕé šţûðéñţ-ŕûñ åñð ñöţ öƒƒîçîåļļý 僃îļîåţéð ŵîţĥ šçĥööļš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
+    <string name="hub_email_connection_sidebar_header">[Ðîšçöŕð Ĥûɓš one two]</string>
     <string name="hub_entry_invite_subtitle">[΃ ýöûŕ šéŕVéŕ îš îñţéñðéð ƒöŕ šţûðéñţš öñļý, ĵûšţ îñVîţé ýöûŕ çļåššḿåţéš. Ţĥéý ðöñ\'ţ ñééð å .éðû åððŕéšš ţö ĵöîñ one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen]</string>
     <string name="hub_entry_remove">[ŔéḿöVé ƒŕöḿ Ĥûɓ one two three]</string>
-    <string name="hub_entry_remove_body">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŕéḿöVé ¡¡»{guildName}«¡¡ ƒŕöḿ ţĥîš ðîŕéçţöŕý¿ one two three four five six seven]</string>
+    <string name="hub_entry_remove_body">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŕéḿöVé ¡¡»{guildName}«¡¡ ƒŕöḿ ţĥîš Ĥûɓ¿ one two three four five six]</string>
+    <string name="hub_entry_update">[Ûþðåţé ðéšçŕîþţîöñ one two three]</string>
+    <string name="hub_entry_update_description_title">[Ûþðåţé ðéšçŕîþţîöñ ƒöŕ ¡¡»{guildName}«¡¡ one two three four]</string>
+    <string name="hub_invite_another_school_link">[Ĝö ţö å ðéŕéñţ šçĥööļ¿ [Ĵöîñ ĥéŕé](öñÇļîçķ) one two three four five six]</string>
+    <string name="hub_invite_button_title_invited">[Ýöû\'Vé ɓééñ îñVîţéð ţö ĵöîñ å Ĥûɓ one two three four]</string>
+    <string name="hub_invite_button_title_inviter">[Ýöû šéñţ åñ îñVîţé ţö ĵöîñ å Ĥûɓ one two three four]</string>
+    <string name="hub_real_name_cta">[Ļéţ\'š ĝö¡ one two]</string>
+    <string name="hub_real_name_modal_form_placeholder">[Fîŕšţ Ļåšţ one two]</string>
+    <string name="hub_real_name_modal_form_title">[Ŕéåļ Ñåḿé one two]</string>
+    <string name="hub_real_name_modal_header">[Ŵéļçöḿé ţö ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡¡ one two three four five]</string>
+    <string name="hub_real_name_modal_subheader">[Åðð ýöûŕ ŕéåļ ñåḿé šö þéöþļé ŵîļļ ŕéçöĝñîžé ýöû. Ýöû çåñ çĥåñĝé ţĥîš åñýţîḿé Vîå ţĥé Ĥûɓ Šéţţîñĝš. one two three four five six seven eight nine ten eleven]</string>
+    <string name="hub_sidebar_add_servers">[Åðð ŠéŕVéŕš one two]</string>
+    <string name="hub_sidebar_invite_members">[ÎñVîţé Ḿéḿɓéŕš one two three]</string>
+    <string name="hub_sidebar_join_servers">[Ĵöîñ ŠéŕVéŕš one two]</string>
+    <string name="hub_verified_discord_hub">[νéŕîƒîéð Ðîšçöŕð Ĥûɓ one two three]</string>
     <string name="hub_waitlist_modal_form_description">[Éñţéŕ ýöûŕ öƒƒîçîåļ šçĥööļ éḿåîļ åððŕéšš one two three four five]</string>
     <string name="hub_waitlist_modal_form_placeholder">[šåḿ@çöļļéĝé.éðû one two three]</string>
     <string name="hub_waitlist_modal_form_title">[Šçĥööļ Éḿåîļ one two]</string>
-    <string name="hub_waitlist_modal_join_header">[Åŕé ýöû å çûŕŕéñţ šţûðéñţ¿ Ĵöîñ ţĥé Ðîšçöŕð ĥûɓ ƒöŕ ýöûŕ šçĥööļ¡ one two three four five six seven]</string>
+    <string name="hub_waitlist_modal_join_header">[Åŕé ýöû å çûŕŕéñţ šţûðéñţ¿ Ĵöîñ ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ýöûŕ šçĥööļ¡ one two three four five six seven]</string>
     <string name="hub_waitlist_modal_join_subheader">[Ĝéţ ñöţîƒîéð ŵĥéñ ýöûŕ ĥûɓ ļåûñçĥéš šö ýöû çåñ éåšîļý ƒîñð šţûðéñţ-ŕûñ šéŕVéŕš ƒöŕ ýöûŕ šţûðý ĝŕöûþš åñð çļûɓš. one two three four five six seven eight nine ten eleven twelve]</string>
     <string name="hub_waitlist_modal_joined_header">[Ŵé’ļļ ļéţ ýöû ķñöŵ ŵĥéñ ýöûŕ šçĥööļ ĥûɓ îš ļîVé¡ one two three four five six]</string>
     <string name="humanize_duration_a_few_seconds">[å ƒéŵ šéçöñðš one two]</string>
@@ -4397,12 +4461,14 @@
     <string name="invite_button_streaming_subtext">[îñ ¡¡»{guildName}«¡¡ one two]</string>
     <string name="invite_button_title_invited">[Ýöû\'Vé ɓééñ îñVîţéð ţö ĵöîñ å šéŕVéŕ one two three four five]</string>
     <string name="invite_button_title_invited_group_dm">[Ýöû\'Vé ɓééñ îñVîţéð ţö ĵöîñ å ĝŕöûþ ÐḾ one two three four five]</string>
+    <string name="invite_button_title_invited_hub">[Ýöû\'Vé ɓééñ îñVîţéð ţö ĵöîñ å Ĥûɓ one two three four]</string>
     <string name="invite_button_title_invited_invalid">[Ýöû ŕéçéîVéð åñ îñVîţé, ɓûţ… one two three four]</string>
     <string name="invite_button_title_invited_stream">[Ýöû\'Vé ɓééñ îñVîţéð ţö ŵåţçĥ å šţŕéåḿ one two three four five]</string>
     <string name="invite_button_title_invited_to_play">[Ýöû\'Vé ɓééñ îñVîţéð ţö þļåý one two three four]</string>
     <string name="invite_button_title_invited_voice_channel">[Ýöû\'Vé ɓééñ îñVîţéð ţö ĵöîñ å Vöîçé çĥåññéļ one two three four five]</string>
     <string name="invite_button_title_inviter">[Ýöû šéñţ åñ îñVîţé ţö ĵöîñ å šéŕVéŕ one two three four]</string>
     <string name="invite_button_title_inviter_group_dm">[Ýöû šéñţ åñ îñVîţé ţö ĵöîñ å ĝŕöûþ ÐḾ one two three four five]</string>
+    <string name="invite_button_title_inviter_hub">[Ýöû šéñţ åñ îñVîţé ţö ĵöîñ å Ĥûɓ one two three four]</string>
     <string name="invite_button_title_inviter_invalid">[Ýöû šéñţ åñ îñVîţé, ɓûţ… one two three]</string>
     <string name="invite_button_title_inviter_stream">[Ýöû šéñţ åñ îñVîţé ţö ŵåţçĥ å šţŕéåḿ one two three four five]</string>
     <string name="invite_button_title_inviter_voice_channel">[Ýöû šéñţ åñ îñVîţé ţö ĵöîñ å Vöîçé çĥåññéļ one two three four five]</string>
@@ -4693,6 +4759,8 @@
     <string name="leave_group_dm_managed_body">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ļéåVé¿ Ýöû ŵöñ\'ţ ɓé åɓļé ţö ŕéĵöîñ ţĥîš ĝŕöûþ ûñļéšš **¡¡»{name}«¡¡** åððš ýöû åĝåîñ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen]</string>
     <string name="leave_group_dm_managed_title">[ĻéåVé ¡¡»{name}«¡¡ Ĝŕöûþ one two three]</string>
     <string name="leave_group_dm_title">[ĻéåVé \'¡¡»{name}« one two]</string>
+    <string name="leave_hub">[ĻéåVé Ĥûɓ one two]</string>
+    <string name="leave_hub_body">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ļéåVé **¡¡»{name}«¡¡**¿ Ýöû ŵöñ\'ţ ɓé åɓļé ţö ŕéĵöîñ ţĥîš Ĥûɓ ûñļéšš ýöû åŕé ŕé-îñVîţéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen]</string>
     <string name="leave_server">[ĻéåVé ŠéŕVéŕ one two]</string>
     <string name="leave_server_body">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ļéåVé **¡¡»{name}«¡¡**¿ Ýöû ŵöñ\'ţ ɓé åɓļé ţö ŕéĵöîñ ţĥîš šéŕVéŕ ûñļéšš ýöû åŕé ŕé-îñVîţéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen]</string>
     <string name="leave_server_body_mobile">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ļéåVé ¡¡»{name}«¡¡¿ one two three four five]</string>
@@ -4840,6 +4908,7 @@
     <string name="marked_as_read">[Ḿåŕķéð Åš Ŕéåð one two three]</string>
     <string name="marketing_premium_tier_1_perk_list_omit_guild_cap">[Ðöéš ñöţ îñçļûðé ḿöŕé šéŕVéŕš one two three four]</string>
     <string name="marketing_premium_tier_1_perk_list_omit_message_length">[Ðöéš ñöţ îñçļûðé ļöñĝéŕ ḿéššåĝéš one two three four]</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_profile_customization">[Ðöéš ñöţ îñçļûðé þŕöƒîļé ɓåññéŕ one two three four]</string>
     <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages">[Ðöéš ñöţ îñçļûðé ļöñĝéŕ ḿéššåĝéš one two three four]</string>
     <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds">[Ðöéš ñöţ îñçļûðé ḿöŕé šéŕVéŕš one two three four]</string>
     <string name="marketing_refresh_premium_features_badge_heading">[Ŕéþ Ýöûŕ Šûþþöŕţ one two three]</string>
@@ -5158,8 +5227,8 @@
     <string name="move_members_description">[Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
     <string name="move_to">[ḾöVé Ţö one two]</string>
     <string name="move_to_success">[Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five]</string>
-    <string name="res_2131891257_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
-    <string name="res_2131891258_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
+    <string name="res_2131891328_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
+    <string name="res_2131891329_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
     <string name="mtrl_badge_numberless_content_description">[Ñéŵ ñöţîƒîçåţîöñ one two three]</string>
     <string name="mtrl_chip_close_icon_content_description">[ŔéḿöVé »%1$s« one two]</string>
     <string name="mtrl_exceed_max_badge_number_content_description">[Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four]</string>
@@ -5397,8 +5466,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">[Ýöû ĥåVé »{days}« ļéƒţ ţö ĝéţ å ƒŕéé ḿöñţĥ öƒ Ñîţŕö one two three four five]</string>
     <string name="notice_premium_tier_2_trial_ending_hours">[Ýöû ĥåVé »{hours}« ļéƒţ ţö ĝéţ å ƒŕéé ḿöñţĥ öƒ Ñîţŕö one two three four five]</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">[Ýöû ĥåVé »{minutes}« ļéƒţ ţö ĝéţ å ƒŕéé ḿöñţĥ öƒ Ñîţŕö one two three four five]</string>
-    <string name="notice_premium_xbox_game_pass_promotion">[Ĥéý Ñîţŕö šûɓšçŕîɓéŕ, çöñĝŕåţš¡ Ýöû ĝéţ 3 ḿöñţĥš öƒ ×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ, öñ ûš¡ one two three four five six seven eight nine]</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">[Çļåîḿ one]</string>
     <string name="notice_product_feedback_survey">[Ŵöûļð ýöû ļîķé ţö þåŕţîçîþåţé îñ þŕöðûçţ ƒééðɓåçķ ðîšçûššîöñš ŵîţĥ ûš¿ one two three four five six seven eight]</string>
     <string name="notice_product_feedback_survey_cta">[Ļéţ ûš ķñöŵ ĥéŕé¡ one two three]</string>
     <string name="notice_register_to_vote">[Åŕé ýöû ŕéĝîšţéŕéð ţö Vöţé¿ Çĥéçķ ýöûŕ šţåţûš åñð ŕéĝîšţéŕ îñ ţŵö ḿîñûţéš. one two three four five six seven eight]</string>
@@ -5601,8 +5668,11 @@
     <string name="outbound_promotion_card_claimed_unexpanded_body">[Ûšé ýöûŕ çöðé ɓéƒöŕé »{endDate}«. [Ḿöŕé Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six]</string>
     <string name="outbound_promotion_card_unclaimed_expanded_body">[Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ »{endDate}«. [Ļéšš Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six seven]</string>
     <string name="outbound_promotion_card_unclaimed_unexpanded_body">[Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ »{endDate}«. [Ḿöŕé Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six seven]</string>
+    <string name="outbound_promotion_code_confirmation_email">[Ţĥîš çöðé îš îñçļûðéð îñ å çöñƒîŕḿåţîöñ éḿåîļ ŵé ĵûšţ šéñţ ýöû. one two three four five six seven]</string>
     <string name="outbound_promotion_less_details">[[Ļéšš Ðéţåîļš](öñÇļîçķ) one two three]</string>
     <string name="outbound_promotion_more_details">[[Ḿöŕé Ðéţåîļš](öñÇļîçķ) one two three]</string>
+    <string name="outbound_promotion_notice">[Ĥéý, ýöû ĥåVé šöḿéţĥîñĝ ŵåîţîñĝ ƒöŕ ýöû îñ ýöûŕ ĝîƒţ îñVéñţöŕý¡ Ðöñ’ţ ƒöŕĝéţ ţö çļåîḿ îţ ɓéƒöŕé îţ’š ļöšţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen]</string>
+    <string name="outbound_promotion_redemption_modal_title">[Åŵéšöḿé¡ one two]</string>
     <string name="outbound_promotion_see_code">[Šéé Çöðé one two]</string>
     <string name="outgoing_friend_request">[Öûţĝöîñĝ Fŕîéñð ŔéQûéšţ one two three]</string>
     <string name="outgoing_friend_request_delete_msg">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ðéļéţé ýöûŕ ƒŕîéñð ŕéQûéšţ ţö **¡¡»{name}«¡¡**¿ one two three four five six seven]</string>
@@ -6077,6 +6147,9 @@
     <string name="premium_marketing_feature_premium_upload_size_title">[βîĝĝéŕ Ûþļöåðš one two three]</string>
     <string name="premium_marketing_feature_profile_description">[Þéŕšöñåļîžé ýöûŕ þŕöƒîļé ŵîţĥ åñ åñîḿåţéð åVåţåŕ åñð çûšţöḿ ţåĝ. one two three four five six seven]</string>
     <string name="premium_marketing_feature_profile_title">[Þéŕšöñåļîžéð Þŕöƒîļé one two three]</string>
+    <string name="premium_marketing_feature_stickers_description">[Ûšé çûšţöḿ šţîçķéŕš åñýŵĥéŕé åñð åççéšš 300 Ñîţŕö-éхçļûšîVé šţîçķéŕš. €[Îñƒö](îñƒöĤööķ) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
+    <string name="premium_marketing_feature_stickers_info">[βööšţéð šéŕVéŕš çåñ ûþļöåð çûšţöḿ šţîçķéŕš ţĥŕöûĝĥ ŠéŕVéŕ Šéţţîñĝš &gt; Šţîçķéŕš. Ñîţŕö ûšéŕš çåñ ûšé çûšţöḿ šţîçķéŕš åñýŵĥéŕé. one two three four five six seven eight nine ten eleven twelve thirteen]</string>
+    <string name="premium_marketing_feature_stickers_title">[Šþéçîåļ Šţîçķéŕš Åççéšš one two three]</string>
     <string name="premium_marketing_hero_body">[Ûþĝŕåðé ýöûŕ éḿöĵî, þéŕšöñåļîžé ýöûŕ þŕöƒîļé, åñð šţåñð öûţ îñ ýöûŕ šéŕVéŕš. one two three four five six seven eight]</string>
     <string name="premium_marketing_hero_header">[Ḿåķé Ðîšçöŕð ýöûŕš one two three]</string>
     <string name="premium_message_length_chatbox_flair">[Ñîţŕö îš þöŵéŕîñĝ ýöû ŵîţĥ »{maxLength}« çĥåŕåçţéŕš þéŕ ḿéššåĝé¡ one two three four five six]</string>
@@ -6116,7 +6189,9 @@
     <string name="premium_plan_year_tier_2">[Ñîţŕö Ýéåŕļý one two]</string>
     <string name="premium_plan_year_tier_2_trial">[Ñîţŕö Ýéåŕļý **(+»{months}« »{months}« ƒŕéé)** one two three four]</string>
     <string name="premium_profile_customization_upsell_body">[Ĝéţ ḿöŕé çûšţöḿîžåţîöñ ŵîţĥ å þŕöƒîļé ɓåññéŕ, åñ åñîḿåţéð åVåţåŕ, å çûšţöḿ ţåĝ, [åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡](öñĻéåŕñḾöŕé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty]</string>
-    <string name="premium_profile_customization_upsell_header">[Ûñļöçķ Þŕöƒîļé Çûšţöḿîžåţîöñ one two three four]</string>
+    <string name="premium_profile_customization_upsell_body_mobile">[Ĝéţ ḿöŕé çûšţöḿîžåţîöñ ŵîţĥ å þŕöƒîļé ɓåññéŕ, åñ åñîḿåţéð åVåţåŕ, å çûšţöḿ ţåĝ, åñð ḿöŕé ŵîţĥ **Ðîšçöŕð Ñîţŕö¡** one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen]</string>
+    <string name="premium_profile_customization_upsell_header">[Ŵåññå ûþļöåð ýöûŕ öŵñ ɓåññéŕ¿ one two three four]</string>
+    <string name="premium_profile_customization_upsell_header_mobile">[Ŵåññå ûþļöåð ýöûŕ öŵñ þŕöƒîļé ɓåññéŕ¿ one two three four five]</string>
     <string name="premium_promo_description">[Ļîƒţ öƒƒ ŵîţĥ Ðîšçöŕð Ñîţŕö ţö ûšé åñîḿåţéð åñð çûšţöḿ éḿöĵî åñýŵĥéŕé. one two three four five six seven eight]</string>
     <string name="premium_promo_description_search_upsell">[Ļîƒţ öƒƒ ŵîţĥ **Ðîšçöŕð Ñîţŕö** ţö ûšé åñîḿåţéð åñð çûšţöḿ éḿöĵîš åñýŵĥéŕé. [Ļéåŕñ ḿöŕé](öñÇļîçķ) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen]</string>
     <string name="premium_promo_description_trial">[Çļåîḿ ýöûŕ ƒŕéé ḿöñţĥ öƒ Ðîšçöŕð Ñîţŕö ţö ûšé åñîḿåţéð åñð çûšţöḿ éḿöĵîš åñýŵĥéŕé. one two three four five six seven eight nine]</string>
@@ -6183,6 +6258,7 @@
     <string name="premium_subscription_renewal_footer_trial">[Ýöûŕ ƒŕéé ḿöñţĥ çŕéðîţ ŵîļļ ɓé åþþļîéð ûñţîļ îţ ŕûñš öûţ, åñð ŵé\'ļļ šéñð ýöû å ŕéḿîñðéŕ éḿåîļ **»{days}«** ɓéƒöŕé ýöûŕ ƒŕéé þéŕîöð éñðš. ĤåVé Qûéšţîöñš¿ [Çĥéçķ öûţ öûŕ öƒƒéŕ FÅq](»{helpdeskArticle}«) öŕ [çöñţåçţ öûŕ šûþþöŕţ ţéåḿ](»{contactLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
     <string name="premium_subscription_required_body">[Ĥöļð ûþ¡ Ýöû ñééð Ñîţŕö ţö ĝéţ ţĥîš ļööţ. one two three four five]</string>
     <string name="premium_subscription_show_details">[Šĥöŵ Šûɓšçŕîþţîöñ Ðéţåîļš one two three]</string>
+    <string name="premium_subscription_subscriptions_link">[Ţŕýîñĝ ţö ḿåñåĝé ýöûŕ Ñîţŕö šûɓšçŕîþţîöñ¿ Ĝö ţö ýöûŕ [Šûɓšçŕîþţîöñš](öñŠûɓšçŕîþţîöñšÇļîçķ) þåĝé. one two three four five six seven eight nine ten eleven]</string>
     <string name="premium_subscription_updates">[Šûɓšçŕîþţîöñ Ûþðåţéš one two three]</string>
     <string name="premium_switch_plan_disabled_in_trial">[Ýöû çåññöţ šŵîţçĥ þļåñš ðûŕîñĝ ýöûŕ ţŕîåļ. one two three four five]</string>
     <string name="premium_switch_plan_disabled_pending_mutation_plan">[Ýöû ĥåVé ţö çåñçéļ ýöûŕ þéñðîñĝ þļåñ çĥåñĝé ɓéƒöŕé çĥööšîñĝ åñöţĥéŕ þļåñ. one two three four five six seven eight]</string>
@@ -6307,19 +6383,21 @@
     <string name="private_voice_channel_creation_permission_missing_hint">[**νîéŵ Çĥåññéļš** åñð **Çöññéçţ** þéŕḿîššîöñš ŕéQûîŕéð ţö çŕéåţé ţĥîš þŕîVåţé çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
     <string name="profile">[Þŕöƒîļé one two]</string>
     <string name="profile_banner_icon_tooltip_upsell">[Ûþļöåð ýöûŕ öŵñ þéŕšöñåļîžéð ɓåññéŕ åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡ one two three four five six seven]</string>
+    <string name="profile_customization_activity_time">[€[](ŕéñðéŕŢîḿéĤööķ) éļåþšéð one two three four]</string>
     <string name="profile_customization_beta_tooltip">[Þŕöƒîļé Çûšţöḿîžåţîöñ îš çûŕŕéñţļý åVåîļåɓļé ţö å ļîḿîţéð ñûḿɓéŕ öƒ þéöþļé. one two three four five six seven eight]</string>
     <string name="profile_customization_bio_placeholder">[Ţéļļ ţĥé ŵöŕļð å ļîţţļé åɓöûţ ýöûŕšéļƒ one two three four five]</string>
     <string name="profile_customization_marketing_tooltip_body">[Éхþŕéšš ýöûŕšéļƒ ŵîţĥ åñ åɓöûţ ḿé åñð, îƒ ýöû ĥåVé Ñîţŕö, å þŕöƒîļé ɓåññéŕ¡ one two three four five six seven eight]</string>
     <string name="profile_customization_marketing_tooltip_cta">[Ĝöţ îţ one two]</string>
-    <string name="profile_customization_marketing_tooltip_header">[Ñéŵ Þŕöƒîļé Çûšţöḿîžåţîöñ¡ one two three four]</string>
+    <string name="profile_customization_marketing_tooltip_header">[Ñéŵ Ûšéŕ Þŕöƒîļéš¡ one two three]</string>
     <string name="profile_customization_nitro_icon_tooltip">[ÉхçļûšîVé ţö Ñîţŕö one two three]</string>
+    <string name="profile_customization_preview">[ÞŕéVîéŵ one two]</string>
+    <string name="profile_user_badges">[Ûšéŕ βåðĝéš one two]</string>
     <string name="progress_completed">[Ýöû åŕé åļļ šéţ¡ one two three]</string>
     <string name="progress_completed_description">[Ŵöŵ ýöûŕ šéŕVéŕ îš ļööķîñĝ åļļ šñåžžý¡ Ĥéŕé åŕé å ƒéŵ ḿöŕé ţĥîñĝš ýöû çåñ ðö ŵîţĥ ýöûŕ šéŕVéŕ. ĤåVé ƒûñ¡ one two three four five six seven eight nine ten eleven]</string>
     <string name="progress_steps">[Šţéþ »{step}« öƒ 4 one two]</string>
     <string name="progress_steps_finished">[Çöḿþļéţéð¡ one two]</string>
     <string name="promotion_account_identifier">[Šîĝñéð îñ åš €[](åVåţåŕĤööķ) »{tag}«. [Ñöţ Ýöû¿](ļöĝöûţĤööķ) one two three four five six seven eight nine ten eleven]</string>
     <string name="promotion_card_action_claim">[Çļåîḿ one]</string>
-    <string name="promotion_card_body_claimed_hidden">[Ýöû\'Vé çļåîḿéð ţĥîš, ɓûţ ţĥé çöðé îš ĥîððéñ ðûé ţö Šţŕéåḿéŕ Ḿöðé. one two three four five six seven]</string>
     <string name="promotion_error_body">[Šééḿš ļîķé šöḿéţĥîñĝ’š ĝöñé ŵŕöñĝ åñð ýöû çåñ’ţ ûšé ţĥåţ çöðé. Šöŕŕý åɓöûţ ţĥåţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
     <string name="promotion_error_claimed_body">[Šöŕŕý, ļööķš ļîķé ţĥîš çöðé ĥåš åļŕéåðý ɓééñ ŕéðééḿéð. one two three four five six seven]</string>
     <string name="promotion_error_no_code_body">[Ļööķš ļîķé ţĥîš çöðé ðîðñ\'ţ ŵöŕķ. Ḿåķé šûŕé ýöû ĥåVé ţĥé ŕîĝĥţ çöðé åñð ţŕý åĝåîñ. one two three four five six seven eight nine]</string>
@@ -6435,6 +6513,8 @@
     <string name="recommended">[Ŕéçöḿḿéñðéð one two]</string>
     <string name="reconnect">[Ŕéçöññéçţ one two]</string>
     <string name="reconnecting">[Ŕéçöññéçţîñĝ one two]</string>
+    <string name="redeem">[Ŕéðééḿ one two]</string>
+    <string name="redemption_code">[Ŕéðéḿþţîöñ Çöðé one two three]</string>
     <string name="refund">[Ŕéƒûñð one two]</string>
     <string name="region">[ŕéĝîöñ one two]</string>
     <string name="region_select_footer">[ŠéŕVéŕ ŕéĝîöñ çåñ ɓé çĥåñĝéð åñýţîḿé ŵîţĥ ļéšš ţĥåñ å šéçöñð öƒ Vöîçé îñţéŕŕûþţîöñ. one two three four five six seven eight nine]</string>
@@ -6867,6 +6947,8 @@
     <string name="save_media_failure_mobile">[ŠåVé Fåîļéð one two]</string>
     <string name="save_media_success_mobile">[ŠåVéð one]</string>
     <string name="saved_settings">[Šéţţîñĝš šûççéššƒûļļý ûþðåţéð. one two three four]</string>
+    <string name="schedule_event">[Šçĥéðûļé ÉVéñţ one two three]</string>
+    <string name="schedule_event_description">[Çŕéåţé å Šţåĝé ţö ɓé šţåŕţéð ļåţéŕ. one two three four]</string>
     <string name="scope_activities_read">[Åççéšš ýöûŕ ÅçţîVé Ñöŵ åçţîVîţîéš one two three four]</string>
     <string name="scope_activities_read_description">[Ţĥîš åļļöŵš ţĥé åþþ ţö ŕéåð ţĥé îñƒöŕḿåţîöñ ƒŕöḿ ţĥé ÅçţîVé Ñöŵ šéçţîöñ öƒ ýöûŕ Fŕîéñðš þåĝé. one two three four five six seven eight nine ten]</string>
     <string name="scope_activities_write">[Ûþðåţé ýöûŕ çûŕŕéñţ åçţîVîţý one two three four]</string>
@@ -7345,6 +7427,7 @@
     <string name="stage_voice_channel">[Šţåĝé Çĥåññéļ one two]</string>
     <string name="start">[Šţåŕţ one]</string>
     <string name="start_call">[Šţåŕţ Çåļļ one two]</string>
+    <string name="start_scheduled_event">[Šţåŕţ å Šçĥéðûļéð ÉVéñţ one two three]</string>
     <string name="start_stage_button_text">[Šţåŕţ å Šţåĝé one two]</string>
     <string name="start_stage_button_text_mobile">[Šţåŕţ å Šţåĝé one two]</string>
     <string name="start_stage_channel_event_members_subtitle">[Öñļý ḿéḿɓéŕš öƒ ýöûŕ šéŕVéŕ çåñ ĵöîñ. one two three four five]</string>
@@ -7443,10 +7526,23 @@
     <string name="sticker_picker_price_with_premium_tier_2">[¡¡»{price}«¡¡ ŵîţĥ Ñîţŕö one two three]</string>
     <string name="sticker_picker_view_all">[νîéŵ Åļļ one two]</string>
     <string name="sticker_popout_countdown_header">[Ļîḿîţéð ţîḿé ļéƒţ one two three]</string>
+    <string name="sticker_popout_current_guild_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ ţĥîš šéŕVéŕ. Ĝéţ Ñîţŕö ţö ûšé îţ éVéŕýŵĥéŕé. one two three four five six seven]</string>
+    <string name="sticker_popout_join_server">[Ĵöîñ ŠéŕVéŕ one two]</string>
+    <string name="sticker_popout_joined_guild_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ öñé öƒ ýöûŕ šéŕVéŕš. Ĝéţ Ñîţŕö ţö ûšé îţ éVéŕýŵĥéŕé. one two three four five six seven eight]</string>
+    <string name="sticker_popout_joined_guild_emoji_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ one two three]</string>
     <string name="sticker_popout_pack_info">[Ţĥîš îš ƒŕöḿ ţĥé **»{stickerPackName}«** šţîçķéŕ þåçķ. Ĝéţ »{discount}«%% öƒƒ ŵîţĥ [Ñîţŕö](öñÇļîçķ). one two three four five six seven eight nine ten eleven twelve thirteen]</string>
     <string name="sticker_popout_pack_info_nonpremium">[Fééļîñ\' îţ¿ Ĝéţ Ñîţŕö ţö ûšé 300 šţîçķéŕš ļîķé ţĥîš åñð ḿöŕé. one two three four five six seven]</string>
     <string name="sticker_popout_pack_info_premium">[Ţĥîš îš å **»{stickerPackName}«** šţîçķéŕ. one two three]</string>
     <string name="sticker_popout_pack_info_unavailable">[Ţĥîš îš å **»{stickerPackName}«** šţîçķéŕ. Ţĥéý åŕé ñö ļöñĝéŕ åVåîļåɓļé. one two three four five six seven eight nine ten eleven]</string>
+    <string name="sticker_popout_premium_current_guild_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ ţĥîš šéŕVéŕ. Ýöû çåñ ûšé îţ éVéŕýŵĥéŕé. one two three four five six seven]</string>
+    <string name="sticker_popout_premium_joined_guild_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ öñé öƒ ýöûŕ šéŕVéŕš. Ţýþé îţš ñåḿé îñ ţĥé çĥåţ ɓåŕ ţö ûšé îţ. one two three four five six seven eight nine]</string>
+    <string name="sticker_popout_premium_unjoined_discoverable_guild_description">[Ŵåñţ ţö ûšé ţĥîš šţîçķéŕ éVéŕýŵĥéŕé¿ Ĵöîñ ţĥé šéŕVéŕ. one two three four five six]</string>
+    <string name="sticker_popout_premium_unjoined_private_guild_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ å šéŕVéŕ ţĥåţ îš éîţĥéŕ þŕîVåţé öŕ ûñåVåîļåɓļé. one two three four five six seven eight]</string>
+    <string name="sticker_popout_private_server">[ÞŕîVåţé šéŕVéŕ one two three]</string>
+    <string name="sticker_popout_public_server">[Þûɓļîç ŠéŕVéŕ one two]</string>
+    <string name="sticker_popout_unjoined_discoverable_guild_description">[Ŵåñţ ţö ûšé ţĥîš šţîçķéŕ éVéŕýŵĥéŕé¿ Ĝéţ Ñîţŕö åñð ĵöîñ ţĥé šéŕVéŕ. one two three four five six seven eight]</string>
+    <string name="sticker_popout_unjoined_guild_emoji_description">[Ĝéţ ţĥîš šţîçķéŕ ƒŕöḿ one two three]</string>
+    <string name="sticker_popout_unjoined_private_guild_description">[Ţĥîš šţîçķéŕ îš ƒŕöḿ å šéŕVéŕ ţĥåţ îš éîţĥéŕ þŕîVåţé öŕ ûñåVåîļåɓļé. [Ļéåŕñ ḿöŕé](öþéñÞŕéḿîûḿŠéţţîñĝš) åɓöûţ ûšîñĝ çûšţöḿ šţîçķéŕš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three]</string>
     <string name="sticker_premium_tier_1_upsell_alert_upgrade_cta">[Šûɓšçŕîɓé ţö Ñîţŕö Çļåššîç one two three four]</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount">[Ĝéţ »{percent}« öƒƒ öñ βööšţ þûŕçĥåšéš one two three four]</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_subscription">[Éхţŕå çĥåţ þéŕķš: åñîḿåţéð éḿöĵî, çûšţöḿ Ðîšçöŕð ţåĝ, åñð ḿöŕé one two three four five six seven]</string>
@@ -7701,6 +7797,7 @@
     <string name="tabs_search_accessibility_label">[Šéåŕçĥ ţåɓ one two]</string>
     <string name="tabs_settings_accessibility_label">[Šéţţîñĝš ţåɓ one two]</string>
     <string name="take_a_photo">[Ţåķé å Þĥöţö one two]</string>
+    <string name="take_me_there">[Ţåķé ḿé ţĥéŕé one two]</string>
     <string name="take_survey">[Ţåķé ŠûŕVéý one two]</string>
     <string name="tan">[Ţåñ one]</string>
     <string name="tap_add_nickname">[Ţåþ ţö åðð å ñîçķñåḿé one two three]</string>
@@ -7769,6 +7866,8 @@
     <string name="thread_header_notice_archived">[Ţĥîš ţĥŕéåð îš åŕçĥîVéð. Ýöû çåñ šéñð å ḿéššåĝé ţö ûñåŕçĥîVé îţ. one two three four five six seven]</string>
     <string name="thread_header_notice_join">[Ĵöîñ ţĥîš ţĥŕéåð ţö ĝéţ ñöţîƒîçåţîöñš åñð ţö šåVé îñ ýöûŕ çĥåññéļ ļîšţ. one two three four five six seven eight]</string>
     <string name="thread_header_notice_locked">[Ţĥîš ţĥŕéåð ŵåš åŕçĥîVéð ɓý å ḿöðéŕåţöŕ. Öñļý ḿöðéŕåţöŕš çåñ ûñåŕçĥîVé îţ. one two three four five six seven eight]</string>
+    <string name="thread_member_list_empty_state_header">[Ţĥéŕé’š ñö öñé îñ ţĥîš ţĥŕéåð. one two three four]</string>
+    <string name="thread_member_list_empty_state_subtext">[Ýöû çåñ îñVîţé þéöþļé ɓý @ḿéñţîöñîñĝ ţĥéḿ îñ å ḿéššåĝé. one two three four five six seven]</string>
     <string name="thread_member_without_access">[Çåññöţ Vîéŵ ţĥîš ţĥŕéåð one two three]</string>
     <string name="thread_message_count">[»{count}«]</string>
     <string name="thread_message_count_max">[50+ Ḿéššåĝéš › one two three]</string>
@@ -7933,6 +8032,7 @@
     <string name="unable_to_join_channel_full_modal_body">[Šöŕŕý, ţĥîš çĥåññéļ ĥåš ţĥé ḿåх ñûḿɓéŕ öƒ þéöþļé¡ one two three four five six]</string>
     <string name="unable_to_join_channel_full_modal_header">[Çĥåññéļ îš ƒûļļ one two three]</string>
     <string name="unable_to_open_media_chooser">[Ûñåɓļé ţö öþéñ ḿéðîå çĥööšéŕ. »%1$s« one two three four]</string>
+    <string name="unable_to_process_image">[Ûñåɓļé ţö þŕöçéšš îḿåĝé one two three]</string>
     <string name="unarchive">[ÛñåŕçĥîVé one two]</string>
     <string name="unarchive_thread">[ÛñåŕçĥîVé Ţĥŕéåð one two three]</string>
     <string name="unban">[Ûñɓåñ one]</string>
@@ -8149,6 +8249,7 @@
     <string name="user_settings">[Ûšéŕ Šéţţîñĝš one two]</string>
     <string name="user_settings_about_me">[Åɓöûţ Ḿé one two]</string>
     <string name="user_settings_about_me_description">[Ŵŕîţé åñýţĥîñĝ ýöû’ð ļîķé åɓöûţ ýöûŕšéļƒ — åš ļöñĝ åš ýöû ðö îţ îñ ûñðéŕ »{maxLength}« çĥåŕåçţéŕš. Ýöû çåñ ûšé ḿåŕķðöŵñ åñð ļîñķš îƒ ýöû’ð ļîķé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three]</string>
+    <string name="user_settings_about_me_hint">[Ţåþ ţö åðð åñ åɓöûţ ḿé one two three]</string>
     <string name="user_settings_account_change_email_prompt">[Ýöûŕ çûŕŕéñţ éḿåîļ åððŕéšš îš ¡¡»{email}«¡¡ Ŵĥåţ ŵöûļð ýöû ļîķé ţö çĥåñĝé îţ ţö¿ one two three four five six seven eight]</string>
     <string name="user_settings_account_change_email_prompt_desktop">[Éñţéŕ å ñéŵ éḿåîļ åððŕéšš åñð ýöûŕ éхîšţîñĝ þåššŵöŕð. one two three four five six]</string>
     <string name="user_settings_account_change_email_title">[Éðîţ Éḿåîļ one two]</string>
@@ -8184,13 +8285,18 @@
     <string name="user_settings_appearance_zoom_tip">[Ýöû çåñ çĥåñĝé ţĥé žööḿ ļéVéļ ŵîţĥ »{modKey}« +/- åñð ŕéšéţ ţö ţĥé ðéƒåûļţ žööḿ ŵîţĥ »{modKey}«+0. one two three four five six seven eight nine]</string>
     <string name="user_settings_available_codes">[ÅVåîļåɓļé βåçķûþ Çöðéš one two three]</string>
     <string name="user_settings_avatar">[ÅVåţåŕ one two]</string>
-    <string name="user_settings_banner_color">[βåññéŕ Çöļöŕ one two]</string>
+    <string name="user_settings_banner_a11y_label">[Çĥåñĝé Þŕöƒîļé βåññéŕ one two three]</string>
+    <string name="user_settings_banner_edit_sub_label">[Ţĥé ŕéçöḿḿéñðéð ḿîñîḿûḿ šîžé åñð åšþéçţ ŕåţîö åŕé 600х240 åñð 5:2. Åççéþţéð ƒîļé ţýþéš îñçļûðé ÞÑĜ, ĴÞĜ, åñð åñîḿåţéð ĜÎFš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty]</string>
     <string name="user_settings_banner_specs">[Ŵé ŕéçöḿḿéñð åñ îḿåĝé öƒ åţ ļéåšţ 600х240. Ýöû çåñ ûþļöåð å ÞÑĜ, ĴÞĜ, öŕ åñ åñîḿåţéð ĜÎF. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen]</string>
+    <string name="user_settings_banner_upload">[Ûþļöåð Þŕöƒîļé βåññéŕ one two three]</string>
     <string name="user_settings_blocked_users">[βļöçķéð Ûšéŕš one two]</string>
     <string name="user_settings_blocked_users_empty">[Ýöû ðöñ\'ţ ĥåVé åñý ɓļöçķéð ûšéŕš one two three four]</string>
     <string name="user_settings_blocked_users_header">[»{numberOfBlockedUsers}« βļöçķéð Ûšéŕš one two three]</string>
     <string name="user_settings_blocked_users_unblockbutton">[Ûñɓļöçķ one two]</string>
     <string name="user_settings_change_avatar">[Çĥåñĝé ÅVåţåŕ one two]</string>
+    <string name="user_settings_change_avatar_a11y_label">[Çĥåñĝé ÅVåţåŕ one two]</string>
+    <string name="user_settings_change_banner_a11y_label">[Çĥåñĝé βåññéŕ one two]</string>
+    <string name="user_settings_change_profile_banner">[Çĥåñĝé Þŕöƒîļé βåññéŕ one two three]</string>
     <string name="user_settings_close_button">[Çļöšé βûţţöñ one two]</string>
     <string name="user_settings_confirm_logout">[Åŕé ýöû šûŕé ýöû ŵåñţ ţö ļöĝöûţ¿ one two three four]</string>
     <string name="user_settings_customization_upsell">[Ûñļöçķ ŵîţĥ Ñîţŕö one two three]</string>
@@ -8202,6 +8308,9 @@
     <string name="user_settings_edit_account_password_label">[Éñţéŕ ýöûŕ þåššŵöŕð ţö çöñƒîŕḿ çĥåñĝéš one two three four five]</string>
     <string name="user_settings_edit_account_tag">[ŢÅĜ one]</string>
     <string name="user_settings_edit_profile">[Éðîţ Þŕöƒîļé one two]</string>
+    <string name="user_settings_edit_profile_dont_save">[Ðöñ\'ţ ŠåVé one two]</string>
+    <string name="user_settings_edit_profile_save_changes">[ŠåVé Çĥåñĝéš¿ one two]</string>
+    <string name="user_settings_edit_profile_save_confirmation_body">[Ýöû\'Vé ḿåðé çĥåñĝéš. Ðö ýöû ŵåñţ ţö šåVé ţĥéḿ ɓéƒöŕé ļéåVîñĝ ţĥîš þåĝé¿ one two three four five six seven eight]</string>
     <string name="user_settings_enter_password_view_codes">[Éñţéŕ ýöûŕ þåššŵöŕð ţö Vîéŵ ɓåçķûþ çöðéš. one two three four five]</string>
     <string name="user_settings_games_install_location">[Ļöçåţîöñ one two]</string>
     <string name="user_settings_games_install_location_add">[Åðð Îñšţåļļ Ļöçåţîöñ one two three]</string>
@@ -8242,6 +8351,8 @@
     <string name="user_settings_my_account">[Ḿý Åççöûñţ one two]</string>
     <string name="user_settings_no_email_placeholder">[Ýöû ĥåVéñ\'ţ åððéð åñ éḿåîļ ýéţ. one two three four]</string>
     <string name="user_settings_no_phone_placeholder">[Ýöû ĥåVéñ\'ţ åððéð å þĥöñé ñûḿɓéŕ ýéţ. one two three four five]</string>
+    <string name="user_settings_no_subscription_credit">[Ýöû ĥåVé ñö ûñûšéð çŕéðîţš one two three four]</string>
+    <string name="user_settings_no_subscriptions">[Ýöû ĥåVé ñö åçţîVé šûɓšçŕîþţîöñš one two three four]</string>
     <string name="user_settings_noise_cancellation">[Ñöîšé Šûþþŕéššîöñ one two three]</string>
     <string name="user_settings_noise_cancellation_description">[Šûþþŕéšš ɓåçķĝŕöûñð ñöîšé ƒŕöḿ ýöûŕ ḿîç. one two three four five]</string>
     <string name="user_settings_noise_cancellation_model">[Ñöîšé šûþþŕéššîöñ ḿöðéļ one two three]</string>
@@ -8254,8 +8365,12 @@
     <string name="user_settings_open_on_startup_label">[Öþéñ Ðîšçöŕð one two]</string>
     <string name="user_settings_privacy_terms">[Çĥéçķ öûţ öûŕ [Ţéŕḿš öƒ ŠéŕVîçé](»{termsLink}«) åñð [ÞŕîVåçý Þöļîçý](»{privacyLink}«). one two three four five six seven eight nine ten eleven twelve]</string>
     <string name="user_settings_profile_banner">[Þŕöƒîļé βåññéŕ one two three]</string>
+    <string name="user_settings_profile_color_custom">[Çûšţöḿ one two]</string>
+    <string name="user_settings_profile_color_default">[Ðéƒåûļţ one two]</string>
+    <string name="user_settings_profle_color">[Þŕöƒîļé Çöļöŕ one two]</string>
     <string name="user_settings_remove_avatar">[ŔéḿöVé ÅVåţåŕ one two]</string>
     <string name="user_settings_remove_banner">[ŔéḿöVé βåññéŕ one two]</string>
+    <string name="user_settings_remove_profile_banner">[ŔéḿöVé Þŕöƒîļé βåññéŕ one two three]</string>
     <string name="user_settings_restart_app_mobile">[Ŕéšţåŕţ ţĥé åþþ ƒöŕ ýöûŕ ñéŵ šéţţîñĝš ţö ţåķé 郃éçţ. one two three four five six]</string>
     <string name="user_settings_save">[ŠåVé one]</string>
     <string name="user_settings_scan_qr_code">[Šçåñ qŔ Çöðé one two]</string>
@@ -8266,10 +8381,11 @@
     <string name="user_settings_startup_behavior">[Šýšţéḿ Šţåŕţûþ βéĥåVîöŕ one two three]</string>
     <string name="user_settings_streamer_notice_body">[Éñĥåñçé ýöûŕ Ðîšçöŕð çöḿḿûñîţý ŵîţĥ ţööļš ḿåðé ƒöŕ šţŕéåḿéŕš. Çĥéçķ öûţ [Ðîšçöŕð\'š ŠţŕéåḿĶîţ](»{streamkitURL}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen]</string>
     <string name="user_settings_streamer_notice_title">[Ļööķîñĝ ƒöŕ îñţéĝŕåţîöñš¿ one two three]</string>
+    <string name="user_settings_subscriptions_header">[Ýöûŕ Šûɓšçŕîþţîöñš one two three]</string>
+    <string name="user_settings_unlock_banner">[Ûñļöçķ βåññéŕ one two]</string>
     <string name="user_settings_unverified_email_body">[Þļéåšé çĥéçķ ýöûŕ éḿåîļ åñð ƒöļļöŵ ţĥé îñšţŕûçţîöñš ţö Véŕîƒý ýöûŕ éḿåîļ. ΃ ýöû ðîð ñöţ ŕéçéîVé åñ éḿåîļ öŕ îƒ îţ éхþîŕéð, ýöû çåñ ŕéšéñð öñé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen]</string>
     <string name="user_settings_upload_avatar">[Ûþļöåð ÅVåţåŕ one two]</string>
     <string name="user_settings_upload_banner">[Ûþļöåð βåññéŕ one two]</string>
-    <string name="user_settings_use_default_banner_color">[Ûšé ðéƒåûļţ one two]</string>
     <string name="user_settings_used_backup_codes">[Ûšéð βåçķûþ Çöðéš one two three]</string>
     <string name="user_settings_user_profile">[Ûšéŕ Þŕöƒîļé one two]</string>
     <string name="user_settings_voice_add_multiple">[Ýöû çåñ åðð ḿûļţîþļé Þûšĥ ţö Ţåļķ ɓîñðš ûñðéŕ [Ķéýɓîñð Šéţţîñĝš](öñÇļîçķ). one two three four five six seven eight]</string>
@@ -8396,6 +8512,7 @@
     <string name="view_profile">[νîéŵ Þŕöƒîļé one two]</string>
     <string name="view_spectators">[νîéŵ šþéçţåţöŕš one two three]</string>
     <string name="view_surrounding_messages">[νîéŵ šûŕŕöûñðîñĝ ḿéššåĝéš. one two three four]</string>
+    <string name="view_thread">[νîéŵ Ţĥŕéåð one two]</string>
     <string name="viewing_as_roles">[Ýöû åŕé Vîéŵîñĝ ţĥîš šéŕVéŕ åš »{numRoles}«. one two three four]</string>
     <string name="viewing_as_roles_back">[βåçķ ţö Ŕöļéš Šéţţîñĝš one two three]</string>
     <string name="viewing_as_roles_select">[Šéļéçţ Ŕöļéš one two]</string>
@@ -8523,25 +8640,6 @@
     <string name="working">[Ŵöŕķîñĝ… one two]</string>
     <string name="wumpus">[Ŵûḿþûš one two]</string>
     <string name="xbox_authorization_title">[×ɓöх Åççöûñţ Åûţĥöŕîžåţîöñ one two three four]</string>
-    <string name="xbox_game_pass_card_body_claimed">[Ýöû\'Vé çļåîḿéð ţĥîš. Ĥéŕé\'š ýöûŕ çöðé ¡¡»{code}«¡¡. [Ḿöŕé Ðéţåîļš](öñŢöĝĝļéĻéĝåļéšé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen]</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">[Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ Ĵåñûåŕý 15ţĥ, 2021. [Ļéšš Ðéţåîļš](öñŢöĝĝļéĻéĝåļéšé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">[Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ Ĵåñûåŕý 15ţĥ, 2021. [Ḿöŕé Ðéţåîļš](öñŢöĝĝļéĻéĝåļéšé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
-    <string name="xbox_game_pass_modal_code_description">[Ţĥîš çöðé îš åļšö îñçļûðéð îñ å çöñƒîŕḿåţîöñ éḿåîļ ŵé ĵûšţ šéñţ ýöû. one two three four five six seven eight]</string>
-    <string name="xbox_game_pass_modal_code_description_failed">[Šöḿéţĥîñĝ ŵéñţ ŵŕöñĝ, ţŕý åĝåîñ ļåţéŕ¡ one two three four five]</string>
-    <string name="xbox_game_pass_modal_code_header">[×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ Çöðé one two three four]</string>
-    <string name="xbox_game_pass_modal_code_header_failed">[Ûĥ Öĥ one]</string>
-    <string name="xbox_game_pass_modal_header_description_success">[Ŕéðééḿ ţĥé çöðé ɓéļöŵ öñ ţĥé [Ḿîçŕöšöƒţ ŕéðéḿþţîöñ šîţé](»{redemptionURL}«) ţö ĝéţ åççéšš ţö ×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ ƒöŕ 3 ḿöñţĥš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen]</string>
-    <string name="xbox_game_pass_modal_header_success">[Åŵéšöḿé¡ one two]</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">[Šîñçé ýöû ĥåVé å ɓööšţ šûɓšçŕîþţîöñ, ŵé\'ļļ ĝîVé ýöû Ñîţŕö šûɓšçŕîþţîöñ çŕéðîţ. Ñîţŕö çŕéðîţ ŵîļļ ɓé åþþļîéð ŵĥéñ ýöû šûɓšçŕîɓé ţö **»{planName}«**. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three]</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">[Ŕéðééḿ one two]</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">[Ýöû ñöŵ ĥåVé Ñîţŕö Çŕéðîţ¡ Šûɓšçŕîɓé ţö **»{planName}«** ţöðåý ţö åþþļý ýöûŕ Ñîţŕö çŕéðîţ. one two three four five six seven eight nine]</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">[Ñîçé¡ one]</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">[Šûɓšçŕîþţîöñ Çŕéðîţ one two three]</string>
-    <string name="xbox_game_pass_promotion_banner_description">[Ŵé ĝöţ ýöû å ļîţţļé šöḿéţĥîñĝ éхţŕå. Ñîţŕö šûɓšçŕîɓéŕš ñöŵ ĝéţ 3 ḿöñţĥš öƒ ×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ. ÅVåîļåɓļé ñöŵ ûñţîļ Ĵåñûåŕý 15ţĥ, 2021. [Ḿöŕé Ðéţåîļš](öñŢöĝĝļéÉхþåñð). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten]</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">[Ŵé ĝöţ ýöû å ļîţţļé šöḿéţĥîñĝ éхţŕå. Ñîţŕö šûɓšçŕîɓéŕš ñöŵ ĝéţ 3 ḿöñţĥš öƒ ×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ. ÅVåîļåɓļé ñöŵ ûñţîļ Ĵåñûåŕý 15ţĥ, 2021. [Ļéšš Ðéţåîļš](öñŢöĝĝļéÉхþåñð). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten]</string>
-    <string name="xbox_game_pass_promotion_banner_header">[3 Ḿöñţĥš öƒ ×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ one two three four]</string>
-    <string name="xbox_game_pass_promotion_card_header">[×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ (3 ḿöñţĥš) one two three four]</string>
-    <string name="xbox_game_pass_promotion_legalese">[Ñöţ Våļîð ƒöŕ çûŕŕéñţ öŕ þŕéVîöûš ×ɓöх Ĝåḿé Þåšš ƒöŕ ÞÇ ḿéḿɓéŕš, öŕ ×ɓöх Ĝåḿé Þåšš Ûļţîḿåţé ḿéḿɓéŕš. Ŕéðééḿ ýöûŕ ×ɓöх Ĝåḿé Þåšš çöðé(š), åţ [ḿîçŕöšöƒţ.çöḿ/ŕéðééḿ](ĥţţþš://ḿîçŕöšöƒţ.çöḿ/ŕéðééḿ) ɓý Féɓŕûåŕý 15ţĥ, 2021. Çŕéðîţ çåŕð ŕéQûîŕéð. Ûñļéšš ýöû çåñçéļ, ýöû ŵîļļ ɓé çĥåŕĝéð ţĥé ţĥéñ-çûŕŕéñţ ŕéĝûļåŕ ḿéḿɓéŕšĥîþ ŕåţé éVéŕý ḿöñţĥ ŵĥéñ ţĥé þŕöḿöţîöñåļ þéŕîöð éñðš. Ñöţ šûþþöŕţéð öñ Ŵîñðöŵš 10 îñ Š ḿöðé åñð öñ ÅŔḾ ðéVîçéš. Ĝåḿé çåţåļöĝ Våŕîéš öVéŕ ţîḿé. Šéé [хɓöх.çöḿ/ĝåḿéþåšš](ĥţţþš://хɓöх.çöḿ/ĝåḿéþåšš). Ļîḿîţ: 1 þéŕ þéŕšöñ/åççöûñţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight]</string>
     <string name="xbox_link">[Ļîñķ one]</string>
     <string name="xbox_pin_step1">[Öþéñ ţĥé Ðîšçöŕð åþþ öñ ýöûŕ þĥöñé one two three four]</string>
     <string name="xbox_pin_step2">[Ĝö ţö Šéţţîñĝš &gt; Çöññéçţîöñš &gt; Åðð one two three four]</string>
diff --git a/app/src/main/res/values-es-rES/plurals.xml b/app/src/main/res/values-es-rES/plurals.xml
index 551bc206e0..ca188e91bc 100644
--- a/app/src/main/res/values-es-rES/plurals.xml
+++ b/app/src/main/res/values-es-rES/plurals.xml
@@ -560,14 +560,6 @@
         <item quantity="one">1 semana</item>
         <item quantity="other">{minimumGuildAge} semanas</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">el nombre de tu categoría</item>
-        <item quantity="other">los nombres de tus categorías</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">el nombre de tu canal</item>
-        <item quantity="other">los nombres de tus canales</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">solicitud pendiente</item>
         <item quantity="other">{count} solicitudes pendientes</item>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index dd479502e0..acf122af92 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1015,7 +1015,7 @@
     <string name="change_identity_modal_uploader_cta">Cambiar de avatar de servidor</string>
     <string name="change_identity_modal_upsell">¡Utiliza un avatar diferente en cada uno de tus servidores y más con **Discord Nitro!**</string>
     <string name="change_log">Historial de cambios</string>
-    <string name="change_log_md_body">Nuevas características {added marginTop}\n======================\n\n* **Hemos añadido el Descubrimiento de escenario.** Encontrad comunidades que organicen escenarios en directo (eventos con audio como conciertos, mesas redondas, concursos de talentos o cualquier otro rollo extraño pero legal que se os ocurra) haciendo clic en la nueva pestaña de Descubrimiento. \n* **Ya está aquí Encuentra a tus amigos.** Hemos añadido una forma opcional de encontrar amigos en Discord más fácilmente. Si tenéis el número de teléfono de vuestro amigo y ambos tenéis activada la opción de descubrimiento, podréis encontraros y enviaros una solicitud de amistad, lo que dará origen a esta incómoda conversación: «Si recibes una solicitud de xXSoulzLuverXx#0000, que sepas que soy yo».\n* **Hemos añadido los emojis favoritos.** Tocad un emoji en el chat o mantened pulsado uno en el selector de emojis para empezar a añadir y eliminar emojis de vuestros favoritos. Vuestros favoritos no se sincronizarán con el escritorio (aún), pero podéis empezar a pensar cuáles son los 5 que más usáis de entre los 2459 emojis que hay.\n* **Hemos añadido la paginación a la barra de búsqueda.** Ya no tenéis que navegar durante una eternidad por los resultados de búsqueda. Ahora podéis saltar de una página a otra para encontrar la prueba irrefutable que necesitáis contra vuestro amigo en un intento por demostrar inequívocamente que dijo una cosa hace unos 6 meses, pero que no recordáis, pero que podréis demostrar si os da un minuto para buscarla porque estáis seguros de que lo dijo.\n* **Hemos añadido sonidos a los canales de voz:** ahora vuestro teléfono reproducirá sonidos cuando os unáis a canales de voz, los abandonéis u os muevan a ellos; unos sonidos que puedo repetir en la cabeza con una exactitud estremecedora. Tará..., tarará...\n\n\n\n\nCorrecciones y actualizaciones {progress}\n======================\n\n* **¡Adiós a las menciones al editar!** Al editar una respuesta, ya no se mencionará al autor de la referencia en la mayoría de los casos. Es que..., por favor, yo solo quería arreglar mi pequeño error gramatical y ahora me muero de vergüenza.\n* **Mejoras en las carpetas de servidor.** ¡Ahora podéis marcar vuestras carpetas de servidor como leídas! También hemos añadido ajustes a las carpetas de servidor para que podáis personalizar nombres y colores.\n* **Mejoras y correcciones importantes del Cribado de miembros.** Ya no os quedaréis atascados en estas páginas.\n* **Hemos facilitado el acceso al modo de entrada.** Ahora podéis cambiar los ajustes de pulsar para hablar y de actividad de voz sin salir de la pantalla de llamada.\n\n\n</string>
+    <string name="change_log_md_body">Nuevas características {added marginTop}\n======================\n\n* **Ya está aquí Encuentra a tus amigos.** Hemos añadido una forma opcional de encontrar amigos en Discord más fácilmente. Si tenéis el número de teléfono de vuestro amigo y ambos tenéis activada la opción de descubrimiento, podréis encontraros y enviaros una solicitud de amistad, lo que dará origen a esta incómoda conversación: «Si recibes una solicitud de xXSoulzLuverXx#0000, que sepas que soy yo».\n* **Hemos añadido los emojis favoritos.** Tocad un emoji en el chat o mantened pulsado uno en el selector de emojis para empezar a añadir y eliminar emojis de vuestros favoritos. Vuestros favoritos no se sincronizarán con el escritorio (aún), pero podéis empezar a pensar cuáles son los 5 que más usáis de entre los 2459 emojis que hay.\n* **Hemos añadido la paginación a la barra de búsqueda.** Ya no tenéis que navegar durante una eternidad por los resultados de búsqueda. Ahora podéis saltar de una página a otra para encontrar la prueba irrefutable que necesitáis contra vuestro amigo en un intento por demostrar inequívocamente que dijo una cosa hace unos 6 meses, pero que no recordáis, pero que podréis demostrar si os da un minuto para buscarla porque estáis seguros de que lo dijo.\n* **Hemos añadido sonidos a los canales de voz:** ahora vuestro teléfono reproducirá sonidos cuando os unáis a canales de voz, los abandonéis u os muevan a ellos; unos sonidos que puedo repetir en la cabeza con una exactitud estremecedora. Tará..., tarará...\n\n\n\n\nCorrecciones y actualizaciones {progress}\n======================\n\n* **¡Adiós a las menciones al editar!** Al editar una respuesta, ya no se mencionará al autor de la referencia en la mayoría de los casos. Es que..., por favor, yo solo quería arreglar mi pequeño error gramatical y ahora me muero de vergüenza.\n* **Mejoras en las carpetas de servidor.** ¡Ahora podéis marcar vuestras carpetas de servidor como leídas! También hemos añadido ajustes a las carpetas de servidor para que podáis personalizar nombres y colores.\n* **Mejoras y correcciones importantes del Cribado de miembros.** Ya no os quedaréis atascados en estas páginas.\n* **Hemos facilitado el acceso al modo de entrada.** Ahora podéis cambiar los ajustes de pulsar para hablar y de actividad de voz sin salir de la pantalla de llamada.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">es-ES</string>
     <string name="change_log_md_revision">1</string>
@@ -1356,7 +1356,6 @@
     <string name="contact_sync_we_found_your_friends_body">Ahora sois amigos en Discord. Háblales, invítalos a tu servidor, ¡divertíos! Te avisaremos cuando se unan más amigos a Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">¡Hemos encontrado a tus amigos!</string>
     <string name="content_matching">Contenido de !!{command}!! que coincide con **!!{query}!!**</string>
-    <string name="context_menu_hint">Haz clic derecho en el usuario para ver más opciones</string>
     <string name="continue_in_browser">Continuar en navegador</string>
     <string name="continue_to_webapp">Continuar a Discord</string>
     <string name="control_volume">Controlar volumen</string>
@@ -3014,8 +3013,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Los servidores de Descubrimiento deben tener al menos {minimumGuildAge} de antigüedad. Vuelve a intentarlo el {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">El servidor es demasiado nuevo</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Tu servidor **$[no](doesNotHook)** reúne todos los requisitos para estar en Descubrimiento de servidor.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Tienes que cambiar {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Tienes que cambiar {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Tienes que cambiar tu $[descripción](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Tienes que cambiar el $[nombre de tu servidor](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Aumenta el número de comunicadores semanales</string>
@@ -4228,6 +4225,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Mejora tus emojis, personaliza tu perfil y destaca en tus servidores. Elige entre **!!{monthlyPrice}!! al mes** o **!!{yearlyPrice}!! al año**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Consigue una experiencia mejorada en Discord</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30 %% de descuento en mejoras del servidor</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Use emojis personalizados y animados en cualquier lugar</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Una resolución de hasta 1080p y hasta 60fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB de subida en vez de 100</string>
     <string name="masked_link_body">Este enlace te llevará a **!!{url}!!**. ¿Seguro que quieres ir allí?</string>
@@ -4680,8 +4678,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Tienes {days} para conseguir un mes de Nitro gratis</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Tienes {hours} para conseguir un mes de Nitro gratis</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Tienes {minutes} para conseguir un mes de Nitro gratis</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Eh, suscriptor de Nitro, ¡enhorabuena! ¡Te llevas 3 meses de Xbox Game Pass para PC que corren de nuestra cuenta!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Obtener</string>
     <string name="notice_product_feedback_survey">¿Quieres participar con nosotros y dar tu opinión sobre un producto?</string>
     <string name="notice_product_feedback_survey_cta">¡Cuéntanoslo aquí!</string>
     <string name="notice_register_to_vote">¿Te has registrado para votar? Comprueba tu estado y regístrate en dos minutos.</string>
@@ -4868,6 +4864,7 @@
     <string name="out_of_date_action">Actualizar Discord</string>
     <string name="out_of_date_description">Tenemos cambios jugosos para Discord (y puede que un par de correcciones de errores). Actualiza para continuar.</string>
     <string name="out_of_date_title">Estás desactualizado</string>
+    <string name="outbound_promotion_redemption_modal_title">¡Fantástico!</string>
     <string name="outgoing_friend_request">Solicitud de amistad saliente</string>
     <string name="outgoing_friend_request_delete_msg">¿Seguro que quieres eliminar tu solicitud de amistad con **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Enviando solicitud de amistad a !!{name}!!</string>
@@ -5545,12 +5542,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Se necesita el permiso **Ver canales** para crear este canal privado.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Se necesitan los permisos **Ver canales** y **Conectar** para crear este canal privado.</string>
     <string name="profile">Perfil</string>
+    <string name="profile_banner_icon_tooltip_upsell">¡Sube tu propio cartel personalizado y más con Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">La personalización del perfil está disponible para un número limitado de personas.</string>
+    <string name="profile_customization_bio_placeholder">Háblales un poco a todos acerca de ti</string>
     <string name="profile_customization_marketing_tooltip_body">¡Exprésate con un sobre mí y, si tienes Nitro, un cartel de perfil!</string>
     <string name="profile_customization_marketing_tooltip_cta">Entendido</string>
     <string name="profile_customization_marketing_tooltip_header">¡Nueva personalización del perfil!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exclusivo de Nitro</string>
     <string name="promotion_card_action_claim">Obtener</string>
-    <string name="promotion_card_body_claimed_hidden">Ya lo has obtenido, pero el código está oculto debido al modo Streamer.</string>
     <string name="promotion_error_body">Parece que ha habido un error y no puedes usar ese código. Lo sentimos.</string>
     <string name="promotion_error_title">Un segundo…</string>
     <string name="promotion_existing_subscriber_title">¡Oh, no!</string>
@@ -6460,7 +6459,6 @@
     <string name="start_stage_channel_event_members_title">Solo miembros</string>
     <string name="start_stage_channel_event_modal_button">Iniciar el escenario</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Al abrirse el escenario, serás un orador.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Escribe un tema para anunciar que tu escenario está en directo.</string>
     <string name="start_stage_channel_event_modal_title">¿De qué vas a hablar?</string>
     <string name="start_stage_channel_event_modal_topic_label">Tema del escenario</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Se acabó el debate: la cola light es mejor</string>
@@ -7142,6 +7140,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Notificaciones push sin habilitar</string>
     <string name="user_settings">Ajustes de usuario</string>
     <string name="user_settings_about_me">Sobre mí</string>
+    <string name="user_settings_about_me_description">Escribe lo que quieras sobre ti mismo (siempre y cuando no supere el límite de {maxLength} caracteres). Puedes usar Markdown y los enlaces que quieras.</string>
     <string name="user_settings_account_change_email_prompt">Tu dirección de correo electrónico actual es !!{email}!!. ¿Por cuál te gustaría cambiarla?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Introduce una nueva dirección de correo electrónico y tu contraseña ya existente.</string>
     <string name="user_settings_account_change_email_title">Edita tu correo electrónico</string>
@@ -7176,6 +7175,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh, ¡aquí está!</string>
     <string name="user_settings_appearance_zoom_tip">Puedes cambiar el nivel de zoom con {modKey} +/- y restablecer el nivel de zoom con {modKey}+0.</string>
     <string name="user_settings_available_codes">Códigos de respaldo disponibles</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Recomendamos una imagen de al menos 600x240. Puedes subir un PNG, JPG o GIF animado.</string>
     <string name="user_settings_blocked_users">Usuarios bloqueados</string>
     <string name="user_settings_blocked_users_empty">No tienes usuarios bloqueados</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} usuarios bloqueados</string>
@@ -7184,12 +7185,14 @@
     <string name="user_settings_close_button">Botón Cerrar</string>
     <string name="user_settings_confirm_logout">¿Seguro que quieres cerrar sesión?</string>
     <string name="user_settings_customization_upsell">Desbloquear con Nitro</string>
+    <string name="user_settings_customize_profile_title">Personalización de mi perfil</string>
     <string name="user_settings_delete_avatar">Eliminar avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Desactivarla puede ayudar si la sensibilidad de entrada automática no detecta tu voz.</string>
     <string name="user_settings_disable_noise_suppression">La reducción de ruido se deshabilita mientras la supresión de ruido está activa.</string>
     <string name="user_settings_edit_account">Editar cuenta</string>
     <string name="user_settings_edit_account_password_label">Introduce tu contraseña para confirmar los cambios.</string>
     <string name="user_settings_edit_account_tag">ETIQUETA</string>
+    <string name="user_settings_edit_profile">Editar perfil</string>
     <string name="user_settings_enter_password_view_codes">Introduce tu contraseña para ver los códigos de respaldo.</string>
     <string name="user_settings_games_install_location">Ubicación</string>
     <string name="user_settings_games_install_location_add">Añadir ubicación de instalación</string>
@@ -7239,6 +7242,8 @@
     <string name="user_settings_open_on_startup_label">Abrir Discord</string>
     <string name="user_settings_privacy_terms">Echa un vistazo a nuestras [Condiciones del Servicio]({termsLink}) y [Política de Privacidad]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Cartel de perfil</string>
+    <string name="user_settings_remove_avatar">Eliminar avatar</string>
+    <string name="user_settings_remove_banner">Eliminar cartel</string>
     <string name="user_settings_restart_app_mobile">Reinicia la aplicación para que se apliquen los ajustes.</string>
     <string name="user_settings_save">Guardar</string>
     <string name="user_settings_scan_qr_code">Escanear código QR</string>
@@ -7253,6 +7258,7 @@
     <string name="user_settings_upload_avatar">Subir avatar</string>
     <string name="user_settings_upload_banner">Subir cartel</string>
     <string name="user_settings_used_backup_codes">Códigos de respaldo usados</string>
+    <string name="user_settings_user_profile">Perfil de usuario</string>
     <string name="user_settings_voice_add_multiple">Puedes añadir múltiples atajos para Pulsar para hablar en los [Ajustes de atajos de teclado](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord solo utiliza Opus Voice, el mejor códec orgánico de producción local.</string>
     <string name="user_settings_voice_codec_title">Códec de audio</string>
@@ -7486,25 +7492,6 @@
     <string name="whitelisting">Añadiendo a la lista blanca…</string>
     <string name="working">En proceso…</string>
     <string name="xbox_authorization_title">Autorización de la cuenta de Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Ya lo has obtenido. Aquí tienes tu código !!{code}!!. [Más información](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Puedes obtener el regalo hasta el 15 de enero de 2021. [Menos información](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Puedes obtener el regalo hasta el 15 de enero de 2021. [Más información](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Este código también está incluido en el correo de confirmación que te acabamos de enviar.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Algo ha fallado, ¡vuelve a intentarlo más tarde!</string>
-    <string name="xbox_game_pass_modal_code_header">Código de Xbox Game Pass para PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oh, oh</string>
-    <string name="xbox_game_pass_modal_header_description_success">Canjea el siguiente código en la [página de canje de Microsoft]({redemptionURL}) para obtener acceso a Xbox Game Pass para PC durante 3 meses.</string>
-    <string name="xbox_game_pass_modal_header_success">¡Fantástico!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Ya que tienes una suscripción de mejora, te daremos crédito de suscripción Nitro. El crédito de Nitro se aplicará cuando te suscribas a **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Canjear</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">¡Ahora tienes crédito de Nitro! Suscríbete hoy a **{planName}** para aplicar tu crédito de Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">¡Bien!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Crédito de suscripción</string>
-    <string name="xbox_game_pass_promotion_banner_description">Te hemos traído una cosilla. Ahora, los suscriptores de Nitro consiguen 3 meses de Xbox Game Pass para PC. Ya disponible hasta el 15 de enero de 2021. [Más información](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Te hemos traído una cosilla. Ahora, los suscriptores de Nitro consiguen 3 meses de Xbox Game Pass para PC. Ya disponible hasta el 15 de enero de 2021. [Menos información](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 meses de Xbox Game Pass para PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass para PC (3 meses)</string>
-    <string name="xbox_game_pass_promotion_legalese">No disponible para los miembros que tengan o hayan tenido Xbox Game Pass para PC ni para aquellos miembros que tengan Xbox Game Pass Ultimate. Canjea tu(s) código(s) de Xbox Game Pass en [microsoft.com/redeem](https://microsoft.com/redeem) hasta el 15 de febrero de 2021. Se necesita tarjeta de crédito. A no ser que canceles tu suscripción, todos los meses se te cobrará el precio que haya vigente en ese momento por la membresía una vez que haya acabado el periodo de promoción. No disponible para Windows 10 en modo S ni para dispositivos ARM. El catálogo de juegos varía con el tiempo. Más información en [xbox.com/gamepass](https://xbox.com/gamepass). Límite: 1 por persona/cuenta.</string>
     <string name="xbox_link">Vincular</string>
     <string name="xbox_pin_step1">Abre la aplicación de Discord en tu teléfono</string>
     <string name="xbox_pin_step2">Ve a Ajustes &gt; Conexiones &gt; Añadir</string>
diff --git a/app/src/main/res/values-fi/plurals.xml b/app/src/main/res/values-fi/plurals.xml
index 58ce890291..31335435ff 100644
--- a/app/src/main/res/values-fi/plurals.xml
+++ b/app/src/main/res/values-fi/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 viikon</item>
         <item quantity="other">{minimumGuildAge} viikkoa</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">seuraava luokan nimi</item>
-        <item quantity="other">seuraavat luokkien nimet</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">seuraava kanavan nimi</item>
-        <item quantity="other">seuraavat kanavan nimet</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">odottava hakemus</item>
         <item quantity="other">{count} odottavaa hakemusta</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index c8b558fd0c..9b0759f715 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1413,7 +1413,6 @@
     <string name="contact_sync_we_found_your_friends_body">Olet nyt yhteyshenkilöidesi kaveri Discordissa. Voit jutella heille, kutsua heitä palvelimellesi ja pitää hauskaa yhdessä! Kerromme, kun uusia kavereitasi liittyy Discordiin.</string>
     <string name="contact_sync_we_found_your_friends_title">Löysimme kaverisi!</string>
     <string name="content_matching">Komennon !!{command}!! sisältö, joka vastaa hakua **!!{query}!!**</string>
-    <string name="context_menu_hint">Avaa lisätoiminnot klikkaamalla käyttäjää hiiren kakkospainikkeella</string>
     <string name="continue_in_browser">Jatka selaimessa</string>
     <string name="continue_to_webapp">Jatka Discordiin</string>
     <string name="control_volume">Säädä äänenvoimakkuutta</string>
@@ -3113,8 +3112,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Palvelinhaun palvelimen on oltava vähintään {minimumGuildAge} vanha. Palaa tarkistamaan tilanne {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Liian nuori palvelin</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Palvelimesi **$[ei](doesNotHook)** täytä kaikkia palvelinhakuun lisäämisen vaatimuksia.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Sinun on muutettava {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Sinun on muutettava {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Sinun on muutettava $[kuvaustasi](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Sinun on muutettava $[palvelimesi nimi](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Nosta viikoittaisten keskustelijoiden määrää</string>
@@ -4844,8 +4841,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Sinulla on {days} aikaa lunastaa Nitron ilmaiskuukausi</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Sinulla on {hours} aikaa lunastaa Nitron ilmaiskuukausi</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Sinulla on {minutes} aikaa lunastaa Nitron ilmaiskuukausi</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hei, Nitro-tilaaja! Onnittelut, saat Xbox Game Passin PC:lle ilmaiseksi kolmeksi kuukaudeksi.</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Lunasta</string>
     <string name="notice_product_feedback_survey">Haluatko osallistua tuotepalautekeskusteluihin kanssamme?</string>
     <string name="notice_product_feedback_survey_cta">Kerro meille siitä täällä!</string>
     <string name="notice_register_to_vote">Oletko rekisteröitynyt äänestäjäksi? Tarkista tilanteesi ja rekisteröidy tarvittaessa kahdessa minuutissa.</string>
@@ -5032,6 +5027,7 @@
     <string name="out_of_date_action">Päivitä Discord</string>
     <string name="out_of_date_description">Meillä on Discordiin makeita muutoksia (ja pari bugiakin on varmaan korjattu). Jatka päivittämällä.</string>
     <string name="out_of_date_title">Käytät vanhaa versiota</string>
+    <string name="outbound_promotion_redemption_modal_title">Mahtavaa!</string>
     <string name="outgoing_friend_request">Lähtevä kaveripyyntö</string>
     <string name="outgoing_friend_request_delete_msg">Haluatko varmasti poistaa kaveripyyntösi käyttäjälle **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Lähtevä kaveripyyntö käyttäjälle !!{name}!!</string>
@@ -5711,12 +5707,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Tämän yksityisen kanavan luomiseen tarvitaan **Näytä kanavat** ‑käyttöoikeudet.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Tämän yksityisen kanavan luomiseen tarvitaan **Näytä kanavat**- ja **Yhdistä**‑käyttöoikeudet.</string>
     <string name="profile">Profiili</string>
+    <string name="profile_banner_icon_tooltip_upsell">Oman yksilöidyn bannerin lataus palvelimelle ja paljon muuta Discord Nitrolla!</string>
     <string name="profile_customization_beta_tooltip">Profiilin mukautus on tällä hetkellä rajoitetun käyttäjäjoukon käytettävissä.</string>
+    <string name="profile_customization_bio_placeholder">Kerro maailmalle jotain pientä itsestäsi</string>
     <string name="profile_customization_marketing_tooltip_body">Ilmaise itseäsi Tietoja minusta ‑kuvauksella ja Nitro-tilaajana myös profiilibannerilla!</string>
     <string name="profile_customization_marketing_tooltip_cta">Selvä</string>
     <string name="profile_customization_marketing_tooltip_header">Uusi profiilin mukautus!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Vain Nitrossa</string>
     <string name="promotion_card_action_claim">Lunasta</string>
-    <string name="promotion_card_body_claimed_hidden">Olet lunastanut tämän, mutta koodi on piilotettu striimaustilan takia.</string>
     <string name="promotion_error_body">Jokin näyttää menneen vikaan, etkä voi käyttää tätä koodia. Pahoittelut tästä.</string>
     <string name="promotion_error_title">Odota hetki…</string>
     <string name="promotion_existing_subscriber_title">Oi ei!</string>
@@ -6630,7 +6628,6 @@
     <string name="start_stage_channel_event_members_title">Vain jäsenet</string>
     <string name="start_stage_channel_event_modal_button">Aloita esitys</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Olet puhuja esityksen avautuessa.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Ilmoita live-esityksesi alkamisesta kirjoittamalla sen aihe.</string>
     <string name="start_stage_channel_event_modal_title">Mistä aiot puhua?</string>
     <string name="start_stage_channel_event_modal_topic_label">Esityksen aihe</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Kiista on ratkennut: light on normaalia parempi</string>
@@ -7317,6 +7314,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Push-ilmoitukset eivät käytössä</string>
     <string name="user_settings">Käyttäjäasetukset</string>
     <string name="user_settings_about_me">Tietoja minusta</string>
+    <string name="user_settings_about_me_description">Kirjoita itsestäsi mitä haluat – kunhan pysyttelet alle {maxLength} merkissä. Voit halutessasi käyttää markdown-synktaksia ja linkkejä.</string>
     <string name="user_settings_account_change_email_prompt">Nykyinen sähköpostiosoitteesi on !!{email}!!. Mihin osoitteeseen haluat vaihtaa sen?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Anna uusi sähköpostiosoite ja nykyinen salasanasi.</string>
     <string name="user_settings_account_change_email_title">Muokkaa sähköpostia</string>
@@ -7351,6 +7349,8 @@
     <string name="user_settings_appearance_preview_message_5">Ai, katsos, tässä se on!</string>
     <string name="user_settings_appearance_zoom_tip">Voit vaihtaa suurennuksen tasoa näppäimillä {modKey} +/- ja palauttaa suurennuksen oletustasolle näppäimillä {modKey}+0.</string>
     <string name="user_settings_available_codes">Käytettävissä olevat varakoodit</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Suosittelemme kuvaa, jonka koko on vähintään 600 x 240. Voit ladata kuvaksi PNG- tai JPG-kuvatiedoston tai GIF-animaation.</string>
     <string name="user_settings_blocked_users">Estetyt käyttäjät</string>
     <string name="user_settings_blocked_users_empty">Sinulla ei ole estettyjä käyttäjiä</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} estettyä käyttäjää</string>
@@ -7359,11 +7359,13 @@
     <string name="user_settings_close_button">Sulkemispainike</string>
     <string name="user_settings_confirm_logout">Haluatko varmasti kirjautua ulos?</string>
     <string name="user_settings_customization_upsell">Avaa Nitrolla</string>
+    <string name="user_settings_customize_profile_title">Oman profiilin mukautus</string>
     <string name="user_settings_delete_avatar">Poista avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Tämän poistaminen käytöstä voi auttaa, jos automaattinen syötteentunnistus ei havaitse ääntäsi.</string>
     <string name="user_settings_disable_noise_suppression">Taustamelun vaimennus on pois käytöstä, kun kohinanvaimennus on käytössä.</string>
     <string name="user_settings_edit_account">Muokkaa tiliä</string>
     <string name="user_settings_edit_account_password_label">Vahvista muutokset antamalla salasanasi</string>
+    <string name="user_settings_edit_profile">Muokkaa profiilia</string>
     <string name="user_settings_enter_password_view_codes">Katso varakoodeja antamalla salasanasi.</string>
     <string name="user_settings_games_install_location">Sijainti</string>
     <string name="user_settings_games_install_location_add">Lisää asennussijainti</string>
@@ -7414,6 +7416,8 @@
     <string name="user_settings_open_on_startup_label">Avaa Discord</string>
     <string name="user_settings_privacy_terms">Katso [palveluehtomme]({termsLink}) ja [tietosuojakäytäntömme]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profiilibanneri</string>
+    <string name="user_settings_remove_avatar">Poista avatar</string>
+    <string name="user_settings_remove_banner">Poista banneri</string>
     <string name="user_settings_restart_app_mobile">Ota uudet asetukset käyttöön käynnistämällä sovellus uudelleen.</string>
     <string name="user_settings_save">Tallenna</string>
     <string name="user_settings_scan_qr_code">Skannaa QR-koodi</string>
@@ -7428,6 +7432,7 @@
     <string name="user_settings_upload_avatar">Lataa avatar palvelimelle</string>
     <string name="user_settings_upload_banner">Lataa banneri palvelimelle</string>
     <string name="user_settings_used_backup_codes">Käytetyt varakoodit</string>
+    <string name="user_settings_user_profile">Käyttäjäprofiili</string>
     <string name="user_settings_voice_add_multiple">Voit lisätä useita radiopuhelintoiminnon näppäinkomentoja [näppäinkomentoasetuksissa](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord käyttää vain parasta, paikallisesti tuotettua Opus Voice ‑luomukoodekkia.</string>
     <string name="user_settings_voice_codec_title">Äänikoodekki</string>
@@ -7664,25 +7669,6 @@
     <string name="widget">Pienoisohjelma</string>
     <string name="working">Käsitellään…</string>
     <string name="xbox_authorization_title">Xbox-tilin valtuutus</string>
-    <string name="xbox_game_pass_card_body_claimed">Olet lunastanut tämän. Tässä on koodisi: !!{code}!!. [Lisää tietoja](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Lahja on lunastettavissa 15.1.2021 asti. [Lisää tietoja](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Lahja on lunastettavissa 15.1.2021 asti. [Lisää tietoja](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Tämä koodi on myös sinulle lähetetyssä sähköpostiviestissä.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Jokin meni pieleen, yritä uudelleen myöhemmin.</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass ‑lunastuskoodi PC:lle</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oho</string>
-    <string name="xbox_game_pass_modal_header_description_success">Lunasta alla oleva koodi [Microsoftin lunastussivustolla]({redemptionURL}), niin saat Xbox Game Passin PC:lle kolmeksi kuukaudeksi.</string>
-    <string name="xbox_game_pass_modal_header_success">Mahtavaa!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Koska olet tilannut nostatuksen, annamme sinulle hyvityksen, jonka voit käyttää Nitro-tilaukseen. Tilaa **{planName}**, niin Nitro-hyvitys vähennetään tilauksestasi.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Lunasta</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Sinulla on nyt Nitro-hyvitys! Tilaa **{planName}** vaikka heti, jotta saat hyödynnettyä Nitro-hyvityksesi.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Hienoa!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Tilaushyvitys</string>
-    <string name="xbox_game_pass_promotion_banner_description">Meillä lisäbonus tarjolla sinulle. Nitro-tilaajat saavat nyt Xbox Game Passin PC:lle 3 kuukaudeksi. Tarjous on voimassa 15. tammikuuta 2021 asti. [Lisää tietoja](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Meillä lisäbonus tarjolla sinulle. Nitro-tilaajat saavat nyt Xbox Game Passin PC:lle 3 kuukaudeksi. Tarjous on voimassa 15. tammikuuta 2021 asti. [Vähemmän tietoja](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 kk:n Xbox Game Pass ‑tilaus PC:lle</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass PC:lle (3 kk)</string>
-    <string name="xbox_game_pass_promotion_legalese">Tarjous ei koske jäseniä, joilla on voimassa oleva Xbox Game Pass ‑tilaus PC:lle tai joilla on ollut tilaus aiemmin tai joilla on Xbox Game Pass Ultimate ‑tilaus. Lunasta Xbox Game Pass ‑koodisi osoitteessa [microsoft.com/redeem](https://microsoft.com/redeem) 15.2.2021 mennessä. Luottokortti tarvitaan. Mikäli et peruuta tilausta, sinulta veloitetaan voimassa oleva tilausmaksu kuukausittain kampanjajakson päättymisen jälkeen. Ei yhteensopiva Windows 10:n S mode ‑tilan tai ARM-laitteiden kanssa. Pelivalikoima vaihtelee. Lisätietoja on osoitteessa [xbox.com/gamepass](https://xbox.com/gamepass). Rajoitus: 1 kpl henkilöä/tiliä kohti.</string>
     <string name="xbox_link">Linkki</string>
     <string name="xbox_pin_step1">Avaa Discord-sovellus puhelimessasi</string>
     <string name="xbox_pin_step2">Valitse Asetukset &gt; Yhteydet &gt; Lisää</string>
diff --git a/app/src/main/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml
index 3c94dfabf5..7fd4d3f524 100644
--- a/app/src/main/res/values-fr/plurals.xml
+++ b/app/src/main/res/values-fr/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 semaine</item>
         <item quantity="other">{minimumGuildAge} semaines</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">de cette catégorie</item>
-        <item quantity="other">de ces catégories</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">de ce salon</item>
-        <item quantity="other">de ces salons</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Candidature en attente</item>
         <item quantity="other">{count} Candidatures en attente</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 38d81792a3..25e78a0c03 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -156,7 +156,7 @@
     <string name="add_friend_error_already_friends">Tu es déjà ami(e) avec cet utilisateur !</string>
     <string name="add_friend_error_discord_tag_username">DiscordTag n\'est pas un vrai nom d\'utilisateur. Entre le vrai nom d\'utilisateur et numéro d\'identification (ou tag) de ton ami… Il doit ressembler à ce modèle : SuperNomDUtilisateur#0000</string>
     <string name="add_friend_error_invalid_discord_tag">**!!{discordTag}!!** n\'accepte pas les demandes d\'amis. Cette personne devra t\'ajouter pour que vous deveniez amis.</string>
-    <string name="add_friend_error_numbers_only">Nous sommes plus que des numéros… nous sommes des êtres humains ! Entre un nom d\'utilisateur et un tag, sur le modèle suivant : SuperNomDUtilisateur#0000</string>
+    <string name="add_friend_error_numbers_only">Nous sommes plus que des numéros… nous sommes des humains ! Entre un nom d\'utilisateur et un tag, sur le modèle suivant : NomDUtilisateur#0000</string>
     <string name="add_friend_error_other">Mhm, ça n\'a pas marché. Vérifie bien que la casse, l\'orthographe, les espaces et les chiffres sont corrects.</string>
     <string name="add_friend_error_too_many_friends">La goutte d\'eau a bien failli déborder du vase avec tous ces amis, et on dirait que tu en as atteint ses limites. Bienvenue dans le club des élites qui détiennent plus de 1 000 amis !</string>
     <string name="add_friend_error_username_only">Nous avons besoin du tag à quatre chiffres de !!{username}!! pour le différencier des autres.</string>
@@ -1044,7 +1044,7 @@
     <string name="change_identity_modal_uploader_cta">Changer l\'avatar du serveur</string>
     <string name="change_identity_modal_upsell">Avec **Discord Nitro**, utilise un avatar différent sur chacun de tes serveurs et bien plus !</string>
     <string name="change_log">Notes de mise à jour</string>
-    <string name="change_log_md_body">Nouvelles fonctionnalités {added marginTop}\n======================\n\n* **Ajout de Découverte de conférences.** En cliquant sur le nouvel onglet Découverte, tu peux jeter un œil aux communautés qui organisent des conférences en direct, c\'est-à-dire des événements audio comme des concerts, des tables rondes, des concours de talents ou tout autre événement bizarre qui te viendrait à l\'esprit, du moment qu\'il reste légal. \n* **« Trouver tes amis » fait son entrée.** Nous avons ajouté une option pour te permettre de trouver plus facilement des amis sur Discord. Si tu as le numéro de téléphone de ton ami et que vous avez tous deux choisi d\'être visibles, tu pourras le trouver et lui envoyer une demande d\'ami. Tu pourras aussi le prévenir de cette façon assez gênante : « Si tu reçois une demande de xXSoulzLuverXx#0000, c\'est moi. »\n* **Ajout des favoris pour émojis.** Touche un émoji dans le chat ou reste appuyé longtemps sur l\'un d\'eux dans le sélecteur d\'émojis pour ajouter ou supprimer des émojis de tes favoris. Tes favoris ne seront pas synchronisés avec le bureau *pour l\'instant*, mais tu peux commencer à déterminer quels sont les 5 émojis que tu utilises réellement parmi les 2 459 que tu possèdes.\n* **Ajout d\'une pagination à la barre de recherche.** Plus besoin de faire défiler pendant des heures les résultats de tes recherches. Tu peux maintenant passer d\'une page à l\'autre pour trouver la preuve exacte dont tu as besoin pour convaincre tes amis qu\'ils ont dit telle ou telle chose il y a 6 mois. Tu ne te rappelles plus quoi exactement, mais tu vas trouver dans une minute parce que tu peux jurer qu\'ils l\'ont dit.\n* **Ajout de sons dans les salons vocaux :** Ton téléphone émettra désormais des sons lorsque tu rejoindras/quitteras/te déplaceras dans les salons vocaux. J\'arrive d\'ailleurs à jouer ces sons dans ma tête avec une clarté effrayante. Ba-dum...ba-da-doo...\n\n\n\n\nCorrections et mises à jour {progress}\n======================\n\n* **Plus de mentions de modification !** Modifier une réponse ne mentionnera plus l\'auteur de référence dans la plupart des cas parce que voilà quoi, à la base je voulais juste corriger ma petite faute de grammaire et v\'là-ti pas que je me tape la honte maintenant.\n* **Améliorations des dossiers de serveurs.** Tu peux maintenant marquer tes dossiers de serveurs comme lus ! Nous avons également ajouté des paramètres afin que tu puisses les personnaliser avec des noms et des couleurs.\n* **Améliorations majeures et correction de bugs concernant la gestion des critères de sélection des membres.** Plus aucun risque de rester bloqué sur ces pages.\n* **Accès simplifié à l\'activation du micro.** Tu peux maintenant modifier les paramètres des fonctions Appuyer-pour-parler et Détection de la voix sans quitter l\'écran d\'appel.\n\n\n</string>
+    <string name="change_log_md_body">Nouvelles fonctionnalités {added marginTop}\n======================\n\n* **« Trouver tes amis » fait son entrée.** Nous avons ajouté une option pour te permettre de trouver plus facilement des amis sur Discord. Si tu as le numéro de téléphone de ton ami et que vous avez tous deux choisi d\'être visibles, tu pourras le trouver et lui envoyer une demande d\'ami. Tu pourras aussi le prévenir de cette façon assez gênante : « Si tu reçois une demande de xXSoulzLuverXx#0000, c\'est moi. »\n* **Ajout des favoris pour émojis.** Touche un émoji dans le chat ou reste appuyé longtemps sur l\'un d\'eux dans le sélecteur d\'émojis pour ajouter ou supprimer des émojis de tes favoris. Tes favoris ne seront pas synchronisés avec le bureau *pour l\'instant*, mais tu peux commencer à déterminer quels sont les 5 émojis que tu utilises réellement parmi les 2 459 que tu possèdes.\n* **Ajout d\'une pagination à la barre de recherche.** Plus besoin de faire défiler pendant des heures les résultats de tes recherches. Tu peux maintenant passer d\'une page à l\'autre pour trouver la preuve exacte dont tu as besoin pour convaincre tes amis qu\'ils ont dit telle ou telle chose il y a 6 mois. Tu ne te rappelles plus quoi exactement, mais tu vas trouver dans une minute parce que tu peux jurer qu\'ils l\'ont dit.\n* **Ajout de sons dans les salons vocaux :** Ton téléphone émettra désormais des sons lorsque tu rejoindras/quitteras/te déplaceras dans les salons vocaux. J\'arrive d\'ailleurs à jouer ces sons dans ma tête avec une clarté effrayante. Ba-dum...ba-da-doo...\n\n\n\n\nCorrections et mises à jour {progress}\n======================\n\n* **Plus de mentions de modification !** Modifier une réponse ne mentionnera plus l\'auteur de référence dans la plupart des cas parce que voilà quoi, à la base je voulais juste corriger ma petite faute de grammaire et v\'là-ti pas que je me tape la honte maintenant.\n* **Améliorations des dossiers de serveurs.** Tu peux maintenant marquer tes dossiers de serveurs comme lus ! Nous avons également ajouté des paramètres afin que tu puisses les personnaliser avec des noms et des couleurs.\n* **Améliorations majeures et correction de bugs concernant la gestion des critères de sélection des membres.** Plus aucun risque de rester bloqué sur ces pages.\n* **Accès simplifié à l\'activation du micro.** Tu peux maintenant modifier les paramètres des fonctions Appuyer-pour-parler et Détection de la voix sans quitter l\'écran d\'appel.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">fr</string>
     <string name="change_log_md_revision">1</string>
@@ -1404,7 +1404,6 @@
     <string name="contact_sync_we_found_your_friends_body">Ça y est, tu es ami(e) avec eux sur Discord. Tu peux leur parler, les inviter à rejoindre ton serveur, bref, t\'amuser ! Nous te préviendrons lorsque de nouveaux amis rejoindront Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Nous avons trouvé tes amis !</string>
     <string name="content_matching">!!{command}!! correspond à **!!{query}!!**</string>
-    <string name="context_menu_hint">Fais un clic droit sur l\'utilisateur pour plus d\'actions</string>
     <string name="continue_in_browser">Continuer dans le navigateur web</string>
     <string name="continue_to_webapp">Continuer vers Discord</string>
     <string name="control_volume">Contrôler le volume</string>
@@ -3135,8 +3134,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Les serveurs en Découverte doivent avoir au moins {minimumGuildAge}. Réessaie le {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Serveur trop récent</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Ton serveur **$[ne remplit pas](doesNotHook)** tous les critères pour apparaître dans Découverte de serveurs.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Tu dois changer le nom {numCategories} : $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Tu dois changer le nom {numChannels} : $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Tu dois changer ta $[description](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Tu dois changer le $[nom de ton serveur](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Augmente le nombre de communicateurs hebdomadaires</string>
@@ -4348,6 +4345,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Fais passer tes émojis au niveau supérieur, personnalise ton profil et démarque-toi sur tes serveurs. Choisis entre **!!{monthlyPrice}!! par mois** ou **!!{yearlyPrice}!! par an**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Profite d\'une expérience améliorée sur Discord</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30 %% de rabais sur les boosts de serveur</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Utilisez des emojis animés et personnalisés partout</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Une résolution allant jusqu\'à 1080 p et 60 FPS</string>
     <string name="marketing_tier_1_perk_list_upload_size">Uploads de 50 Mo au lieu de 100 Mo</string>
     <string name="masked_link_body">Ce lien t\'emmène vers **!!{url}!!**.Tu es sûr(e) de vouloir t\'y rendre ?</string>
@@ -4842,8 +4840,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Il te reste {days} pour obtenir un mois Nitro gratuit</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Il te reste {hours} pour obtenir un mois Nitro gratuit</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Il te reste {minutes} pour obtenir un mois Nitro gratuit</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Toi, là, avec l\'abonnement Nitro ! Félicitations ! On t\'offre 3 mois de Xbox Game Pass sur PC !</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Récupérer</string>
     <string name="notice_product_feedback_survey">Veux-tu discuter avec nous et nous faire part de tes commentaires ?</string>
     <string name="notice_product_feedback_survey_cta">Dis-le-nous ici !</string>
     <string name="notice_register_to_vote">Es-tu inscrit(e) pour voter ? Vérifie ton statut et inscris-toi en deux minutes.</string>
@@ -5028,6 +5024,7 @@
     <string name="out_of_date_action">Mettre à jour Discord</string>
     <string name="out_of_date_description">Nous avons des changements aux petits oignons à apporter à Discord (et probablement une correction de bug ou deux). Lance la mise à jour pour continuer.</string>
     <string name="out_of_date_title">Tu n\'es pas à jour</string>
+    <string name="outbound_promotion_redemption_modal_title">Super !</string>
     <string name="outgoing_friend_request">Demande d\'ami envoyée</string>
     <string name="outgoing_friend_request_delete_msg">Tu es sûr(e) de vouloir supprimer la demande d\'ami envoyée à **!!{name}!!** ?</string>
     <string name="outgoing_friend_request_to">Demande d\'ami envoyée à !!{name}!!</string>
@@ -5702,12 +5699,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Permission de **voir les salons** requise pour créer ce salon privé.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Permissions de **voir les salons** et de **connexion** requises pour créer ce salon privé.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Uploade ta propre bannière personnalisée et bien plus avec Discord Nitro !</string>
     <string name="profile_customization_beta_tooltip">La personnalisation du profil est accessible à un nombre limité de personnes pour le moment.</string>
+    <string name="profile_customization_bio_placeholder">Présente-toi en quelques mots au monde entier</string>
     <string name="profile_customization_marketing_tooltip_body">Exprime-toi avec un « à propos » et, si tu as un abonnement Discord Nitro, une bannière de profil !</string>
     <string name="profile_customization_marketing_tooltip_cta">Compris</string>
     <string name="profile_customization_marketing_tooltip_header">Nouvelle personnalisation du profil !</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exclusivité Nitro</string>
     <string name="promotion_card_action_claim">Récupérer</string>
-    <string name="promotion_card_body_claimed_hidden">Tu as récupéré ceci, mais le code est caché à cause du mode streamer.</string>
     <string name="promotion_error_body">Il semblerait qu\'il y ait eu un problème et que tu ne puisses pas utiliser ce code. Toutes nos excuses !</string>
     <string name="promotion_error_title">Une seconde…</string>
     <string name="promotion_existing_subscriber_title">Oh non !</string>
@@ -5927,7 +5926,7 @@
     <string name="reversed">Annulé</string>
     <string name="revoke">Révoquer</string>
     <string name="revoke_ban">Révoquer le bannissement</string>
-    <string name="ring">Rejoindre l\'appel</string>
+    <string name="ring">Ajouter à l\'appel</string>
     <string name="ring_username_a11y_label">Rappeler !!{username}!!</string>
     <string name="ro">Roumain, Roumanie</string>
     <string name="role_add_members_button">Ajouter des membres</string>
@@ -6605,7 +6604,6 @@
     <string name="start_stage_channel_event_members_title">Membres uniquement</string>
     <string name="start_stage_channel_event_modal_button">Commencer la conférence</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Tu seras locuteur lorsque la conférence sera ouverte.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Écris un sujet pour annoncer que ta conférence commence.</string>
     <string name="start_stage_channel_event_modal_title">De quoi veux-tu discuter ?</string>
     <string name="start_stage_channel_event_modal_topic_label">Sujet de la conférence</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Fin du débat : un régime équilibré est mieux qu\'un régime normal</string>
@@ -7291,6 +7289,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Notifications push désactivées</string>
     <string name="user_settings">Paramètres utilisateur</string>
     <string name="user_settings_about_me">À propos de moi</string>
+    <string name="user_settings_about_me_description">Écris tout ce que tu veux à propos de toi, tant que ça reste sous {maxLength} caractères. Si tu veux, tu peux utiliser la syntaxe Markdown et des liens.</string>
     <string name="user_settings_account_change_email_prompt">Ton adresse e-mail actuelle est la suivante : !!{email}!!. Par quelle adresse souhaites-tu la remplacer ?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Saisis une nouvelle adresse e-mail et ton mot de passe.</string>
     <string name="user_settings_account_change_email_title">Modifier l\'adresse e-mail</string>
@@ -7325,6 +7324,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh, le voilà !</string>
     <string name="user_settings_appearance_zoom_tip">Tu peux modifier le niveau de zoom avec {modKey} +/- et rétablir le zoom par défaut avec {modKey}+0.</string>
     <string name="user_settings_available_codes">Codes de sauvegarde disponibles</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Nous recommandons une image d\'au moins 600x240. Tu peux uploader un fichier PNG, JPG ou GIF.</string>
     <string name="user_settings_blocked_users">Utilisateurs bloqués</string>
     <string name="user_settings_blocked_users_empty">Tu n\'as pas encore d\'utilisateurs bloqués</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} utilisateurs bloqués</string>
@@ -7333,11 +7334,13 @@
     <string name="user_settings_close_button">Bouton « Fermer »</string>
     <string name="user_settings_confirm_logout">Tu es sûr(e) de vouloir te déconnecter ?</string>
     <string name="user_settings_customization_upsell">Déverrouiller avec Nitro</string>
+    <string name="user_settings_customize_profile_title">Personnalisation de mon profil</string>
     <string name="user_settings_delete_avatar">Supprimer l\'avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Désactiver cette option peut t\'aider si ta voix n\'est pas détectée par la sensibilité de la détection de la voix automatique.</string>
     <string name="user_settings_disable_noise_suppression">La réduction de bruit est désactivée pendant que la suppression du bruit est activée.</string>
     <string name="user_settings_edit_account">Modifier le compte</string>
     <string name="user_settings_edit_account_password_label">Saisis ton mot de passe pour confirmer les changements.</string>
+    <string name="user_settings_edit_profile">Modifier le profil</string>
     <string name="user_settings_enter_password_view_codes">Saisis ton mot de passe pour afficher les codes de sauvegarde.</string>
     <string name="user_settings_games_install_location">Emplacement</string>
     <string name="user_settings_games_install_location_add">Ajouter un emplacement d\'installation</string>
@@ -7385,6 +7388,8 @@
     <string name="user_settings_open_on_startup_label">Ouvrir Discord</string>
     <string name="user_settings_privacy_terms">Consulte nos [Conditions d\'Utilisation]({termsLink}) et notre [Politique de Confidentialité]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Bannière de profil</string>
+    <string name="user_settings_remove_avatar">Supprimer l\'avatar</string>
+    <string name="user_settings_remove_banner">Supprimer la bannière</string>
     <string name="user_settings_restart_app_mobile">Redémarre l\'application afin d\'appliquer tes nouveaux paramètres.</string>
     <string name="user_settings_save">Enregistrer</string>
     <string name="user_settings_scan_qr_code">Scanner le code QR</string>
@@ -7399,6 +7404,7 @@
     <string name="user_settings_upload_avatar">Uploader un avatar</string>
     <string name="user_settings_upload_banner">Uploader la bannière</string>
     <string name="user_settings_used_backup_codes">Codes de sauvegarde utilisés</string>
+    <string name="user_settings_user_profile">Profil d\'utilisateur</string>
     <string name="user_settings_voice_add_multiple">Tu peux ajouter plusieurs raccourcis Appuyer-pour-parler dans les [Paramètres des raccourcis](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord utilise uniquement le meilleur codec audio Opus, organique et produit localement.</string>
     <string name="user_settings_voice_codec_title">Codec audio</string>
@@ -7633,25 +7639,6 @@
     <string name="whitelisting">Mise sur liste blanche…</string>
     <string name="working">Chargement…</string>
     <string name="xbox_authorization_title">Autorisation du compte Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Tu as récupéré ceci. Voici ton code : !!{code}!!. [Voir les détails](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Cadeau récupérable jusqu\'au 15 janvier 2021. [Masquer les détails](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Cadeau récupérable jusqu\'au 15 janvier 2021. [Voir les détails](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Ce code est également inscrit dans l\'e-mail de confirmation que nous venons de t\'envoyer.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Une erreur s\'est produite. Merci de réessayer plus tard !</string>
-    <string name="xbox_game_pass_modal_code_header">Code pour Xbox Game Pass pour PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oh oh…</string>
-    <string name="xbox_game_pass_modal_header_description_success">Saisis le code ci-dessous sur le [site Microsoft de la récompense]({redemptionURL}) pour avoir accès à ton Xbox Game Pass pour PC pendant 3 mois.</string>
-    <string name="xbox_game_pass_modal_header_success">Super !</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Puisque tu as un abonnement Boost, nous te donnons des crédits d\'abonnement Discord Nitro. Ces crédits Nitro seront appliqués lorsque tu souscriras à l\'abonnement suivant : **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Utiliser</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Tu as maintenant tes crédits Nitro ! Souscris à l\'abonnement **{planName}** dès aujourd\'hui pour appliquer tes crédits Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Cool !</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Crédit d\'abonnement</string>
-    <string name="xbox_game_pass_promotion_banner_description">On a un cadeau à te faire : les abonnés Nitro bénéficient de 3 mois de Xbox Game Pass pour PC. Offre valable dès maintenant, jusqu\'au 15 janvier 2021. [Voir les détails](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">On a un cadeau à te faire : les abonnés Nitro bénéficient de 3 mois de Xbox Game Pass pour PC. Offre valable dès maintenant, jusqu\'au 15 janvier 2021. [Masquer les détails](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 mois de Xbox Game Pass pour PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass pour PC (3 mois)</string>
-    <string name="xbox_game_pass_promotion_legalese">Non valide pour les membres Xbox Game Pass pour PC anciens ou actuels, ni pour les membres Xbox Game Pass Ultimate. Récupère ton ou tes codes sur [microsoft.com/redeem](https://microsoft.com/redeem) avant le 15 janvier 2021. Carte bancaire requise. Sauf annulation, tu devras régler chaque mois le montant en cours de l\'abonnement standard lorsque la période promotionnelle sera terminée. Non supporté par Windows 10 en mode S et sur les appareils de type ARM. Le catalogue de jeux change avec le temps. Voir [xbox.com/gamepass](https://xbox.com/gamepass). Limite : 1 par personne/compte.</string>
     <string name="xbox_link">Lien</string>
     <string name="xbox_pin_step1">Ouvre l\'application Discord sur ton téléphone</string>
     <string name="xbox_pin_step2">Va dans Paramètres -&gt; Connexions -&gt; Ajouter</string>
@@ -7661,6 +7648,7 @@
     <string name="yes_text">Oui</string>
     <string name="your_pin_expires">Ton code pin expire {time}</string>
     <string name="your_pin_is_expired">Ton code pin a expiré</string>
+    <string name="youre_viewing_older_messages">Tu consultes d\'anciens messages</string>
     <string name="zh_cn">Chinois, Chine</string>
     <string name="zh_tw">Chinois, Taïwan</string>
 </resources>
diff --git a/app/src/main/res/values-hi/plurals.xml b/app/src/main/res/values-hi/plurals.xml
index 596a47d247..50565a7bfd 100644
--- a/app/src/main/res/values-hi/plurals.xml
+++ b/app/src/main/res/values-hi/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 सप्ताह</item>
         <item quantity="other">{minimumGuildAge} सप्ताह</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">नाम</item>
-        <item quantity="other">नाम</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">नाम</item>
-        <item quantity="other">नाम</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">पेंडिंग एप्लिकेशन</item>
         <item quantity="other">{count} पेंडिंग एप्लिकेशन्स</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index f12c635c27..841550ee8e 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1421,7 +1421,6 @@
     <string name="contact_sync_we_found_your_friends_body">अब आप Discord पर उनके फ्रेंड्स हैं. उनसे बात करें, उन्हें अपने सर्वर पर इनवाइट करें, मज़े करें! हम आपको सूचित करेंगे जब नये फ्रेंड्स Discord को जॉइन करेंगे.</string>
     <string name="contact_sync_we_found_your_friends_title">हमें आपके फ्रेंड्स मिल गए!</string>
     <string name="content_matching">!!{command}!! कंटेंट मैच करता है **!!{query}!!**</string>
-    <string name="context_menu_hint">ज़्यादा एक्शन के लिए यूज़र पर राइट क्लिक करें</string>
     <string name="continue_in_browser">ब्राउज़र में जारी रखें</string>
     <string name="continue_to_webapp">Discord पर आगे बढ़ें</string>
     <string name="control_volume">वॉयस को कंट्रोल करें</string>
@@ -3223,8 +3222,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">डिस्कवरी वाले सर्वर को कम से कम {minimumGuildAge} पुराना होना चाहिए.प्लीज़ {passDate} तारीख को वापस आकर देखें.</string>
     <string name="guild_settings_discovery_checklist_age_failing">सर्वर बहुत यंग है</string>
     <string name="guild_settings_discovery_checklist_bad_standing">आपके सर्वर ने सर्वर डिस्कवरी में शामिल होने की सभी शर्तों को पूरा **$[नहीं](doesNotHook)** किया है.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">आपको अपनी कैटेगरी का {numCategories}: $[{categoryNames}](categoryHook) चेंज करने की ज़रूरत है</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">आपको अपने चैनल का {numChannels}: $[{channelNames}](channelHook) चेंज करने की ज़रूरत है</string>
     <string name="guild_settings_discovery_checklist_change_description">आपको अपना $[डिस्क्रिप्शन](descriptionHook) चेंज की जरूरत है</string>
     <string name="guild_settings_discovery_checklist_change_name">आपको अपने $[सर्वर का नाम](nameHook) चेंज करने की ज़रूरत है</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">साप्ताहिक कम्युनिकेटर की संख्या बढ़ाएं</string>
@@ -4954,8 +4951,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">आपके पास Nitro के एक महीने के मुफ्त सब्सक्रिप्शन पाने के लिए {days} बचे हैं</string>
     <string name="notice_premium_tier_2_trial_ending_hours">आपके पास Nitro के एक महीने के मुफ्त सब्सक्रिप्शन पाने के लिए {hours} बचे हैं</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">आपके पास Nitro के एक महीने के मुफ्त सब्सक्रिप्शन पाने के लिए {minutes} बचे हैं</string>
-    <string name="notice_premium_xbox_game_pass_promotion">हेलो Nitro सबस्क्राइबर, बधाई हो! हमारी तरफ से आपको PC के लिए 3 महीने का Xbox Game Pass दिया जाता है!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">क्लेम करें</string>
     <string name="notice_product_feedback_survey">क्या आप प्रोडक्ट फ़ीडबैक डिस्कशन में हिस्सा लेना चाहेंगे?</string>
     <string name="notice_product_feedback_survey_cta">हमें यहां बताएं!</string>
     <string name="notice_register_to_vote">क्या आप वोट करने के लिए रजिस्टर कर चुके हैं? अपना स्टेटस जांचें और दो मिनट में रजिस्टर करें.</string>
@@ -5142,6 +5137,7 @@
     <string name="out_of_date_action">Discord को अपडेट करें</string>
     <string name="out_of_date_description">Discord के लिए हमें कुछ अच्छे बदलाव मिले हैं (और शायद एक बग ठीक करना हो या उससे ज़्यादा). जारी रखने के लिए अपडेट करें.</string>
     <string name="out_of_date_title">आप आउट ऑफ डेट हो चुके है</string>
+    <string name="outbound_promotion_redemption_modal_title">शानदार!</string>
     <string name="outgoing_friend_request">आउटगोइंग फ्रेंड रिक्वेस्ट</string>
     <string name="outgoing_friend_request_delete_msg">क्या आप वाकई **!!{name}!!** को भेजी गई फ्रेंड रिक्वेस्ट को डिलीट करना चाहते हैं?</string>
     <string name="outgoing_friend_request_to">!!{name}!! को आउटगोइंग फ्रेंड रिक्वेस्ट</string>
@@ -5821,12 +5817,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">इस प्राइवेट चैनल को क्रिएट करने के लिए **चैनल्स देखें** परमिशन होनी ज़रूरी है.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">इस प्राइवेट चैनल को क्रिएट करने के लिए **चैनल्स देखें** और **कनेक्ट** परमिशन होनी ज़रूरी हैं.</string>
     <string name="profile">प्रोफ़ाइल</string>
+    <string name="profile_banner_icon_tooltip_upsell">Discord Nitro सदस्यता के साथ अपना खुद का बैनर और बहुत सी चीज़ें अपलोड करें!</string>
     <string name="profile_customization_beta_tooltip">प्रोफ़ाइल कस्टमाइज़ेशन फिलहाल कुछ लोगों के लिए ही उपलब्ध है.</string>
+    <string name="profile_customization_bio_placeholder">दुनिया को कुछ अपने बारे में बताएं</string>
     <string name="profile_customization_marketing_tooltip_body">अगर आपके पास Nitro सब्सक्रिप्शन, प्रोफाइल बैनर है, तो मेरे बारे में के साथ खुद को एक्सप्रेस करें!</string>
     <string name="profile_customization_marketing_tooltip_cta">समझ गए</string>
     <string name="profile_customization_marketing_tooltip_header">नया प्रोफ़ाइल कस्टमाइज़ेशन!</string>
+    <string name="profile_customization_nitro_icon_tooltip">सिर्फ Nitro सदस्यता के लिए</string>
     <string name="promotion_card_action_claim">क्लेम करें</string>
-    <string name="promotion_card_body_claimed_hidden">आप इसे रिडीम कर चुके हैं, पर स्ट्रीमर मोड की वजह से ये कोड हिडन है.</string>
     <string name="promotion_error_body">ऐसा लग रहा है कि कुछ गड़बड़ हो गई है और आप उस कोड का इस्तेमाल नहीं कर सकते हैं. इसके लिए हम माफ़ी चाहते हैं.</string>
     <string name="promotion_error_title">ज़रा रुकिए…</string>
     <string name="promotion_existing_subscriber_title">अरे नहीं!</string>
@@ -6737,7 +6735,6 @@
     <string name="start_stage_channel_event_members_title">सिर्फ़ मेम्बर्स</string>
     <string name="start_stage_channel_event_modal_button">स्टेज स्टार्ट करें</string>
     <string name="start_stage_channel_event_modal_speaker_hint">स्टेज खुलने पर आप स्पीकर होंगे.</string>
-    <string name="start_stage_channel_event_modal_subtitle">आपका स्टेज लाइव है, ये बताने के लिए टॉपिक लिखें.</string>
     <string name="start_stage_channel_event_modal_title">आप किस बारे में बात करेंगे?</string>
     <string name="start_stage_channel_event_modal_topic_label">स्टेज का टॉपिक</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">डिबेट का टॉपिक है: डायट नियमित रूप से बेहतर है</string>
@@ -7425,6 +7422,7 @@
     <string name="user_setting_notification_not_enabled_prompt">पुश नोटिफ़िकेशन इनेबल नहीं हैं</string>
     <string name="user_settings">यूज़र सेटिंग</string>
     <string name="user_settings_about_me">मेरे बारे में</string>
+    <string name="user_settings_about_me_description">आपको अपने बारे में जो अच्छा लगता है उसे ज़्यादा से ज़्यादा {maxLength} कैरेक्टर में लिखें. अगर आप चाहें तो मार्कडाउन और लिंक्स का भी इस्तेमाल कर सकते हैं.</string>
     <string name="user_settings_account_change_email_prompt">आपका मौजूदा ईमेल एड्रेस !!{email}!! है आप इसमें क्या बदलना चाहते हैं?</string>
     <string name="user_settings_account_change_email_prompt_desktop">नया ईमेल पता और अपना मौजूदा पासवर्ड डालें.</string>
     <string name="user_settings_account_change_email_title">ईमेल एडिट करें</string>
@@ -7459,6 +7457,8 @@
     <string name="user_settings_appearance_preview_message_5">ओह, ये यहां है!</string>
     <string name="user_settings_appearance_zoom_tip">आप {modKey} +/- से ज़ूम लेवल को बदल सकते हैं और {modKey}+0 से इसे डिफ़ॉल्ट ज़ूम पर रीसेट कर सकते है.</string>
     <string name="user_settings_available_codes">बैकअप कोड उपलब्ध है</string>
+    <string name="user_settings_avatar">अवतार</string>
+    <string name="user_settings_banner_specs">हम कम से कम 600x240 इमेज का सुझाव देते हैं. आप PNG, JPG या एनिमेटेड GIF अपलोड कर सकते हैं.</string>
     <string name="user_settings_blocked_users">ब्लॉक किया गया यूज़र</string>
     <string name="user_settings_blocked_users_empty">आपके पास कोई भी ब्लॉक किया गया यूज़र नहीं है</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} ब्लॉक किया गया यूज़र्स</string>
@@ -7467,12 +7467,14 @@
     <string name="user_settings_close_button">क्लोज़ बटन</string>
     <string name="user_settings_confirm_logout">क्या आप वाकई में लॉग आउट करना चाहते हैं?</string>
     <string name="user_settings_customization_upsell">Nitro के साथ अनलॉक करें</string>
+    <string name="user_settings_customize_profile_title">मेरी प्रोफ़ाइल कस्टमाइज करना</string>
     <string name="user_settings_delete_avatar">अवतार डिलीट करें</string>
     <string name="user_settings_disable_advanced_voice_activity">अगर आपकी आवाज़ ऑटोमेटिक इनपुट सेंसिटिविटी द्वारा नहीं पहचानी जा रही है, तो इसे ऑफ़ करके मदद मिल सकती है.</string>
     <string name="user_settings_disable_noise_suppression">जब नॉइज़ सप्रेशन एक्टिव होगा नॉइज़ रिडक्शन डिसेबल हो जाता है.</string>
     <string name="user_settings_edit_account">अकाउंट एडिट करें</string>
     <string name="user_settings_edit_account_password_label">बदलाव कन्फर्म करने के लिए अपना पासवर्ड डालें</string>
     <string name="user_settings_edit_account_tag">टैग</string>
+    <string name="user_settings_edit_profile">प्रोफ़ाइल एडिट करें</string>
     <string name="user_settings_enter_password_view_codes">बैकअप कोड देखने के लिए अपना पासवर्ड डालें.</string>
     <string name="user_settings_games_install_location">लोकेशन</string>
     <string name="user_settings_games_install_location_add">इन्स्टॉल लोकेशन ऐड करें</string>
@@ -7523,6 +7525,8 @@
     <string name="user_settings_open_on_startup_label">Discord खोलें</string>
     <string name="user_settings_privacy_terms">हमारी [सेवा की शर्तें]({termsLink})और [निजता नीति]({privacyLink}) को देखें.</string>
     <string name="user_settings_profile_banner">प्रोफाइल बैनर</string>
+    <string name="user_settings_remove_avatar">अवतार रिमूव करें</string>
+    <string name="user_settings_remove_banner">बैनर रिमूव करें</string>
     <string name="user_settings_restart_app_mobile">अपनी नई सेटिंग को इफ़ेक्ट करने के लिए ऐप को रिस्टार्ट करें.</string>
     <string name="user_settings_save">सेव करें</string>
     <string name="user_settings_scan_qr_code">QR कोड को स्कैन करें</string>
@@ -7537,6 +7541,7 @@
     <string name="user_settings_upload_avatar">अवतार अपलोड करें</string>
     <string name="user_settings_upload_banner">अपलोड बैनर</string>
     <string name="user_settings_used_backup_codes">बैकअप कोड इस्तेमाल किया गया</string>
+    <string name="user_settings_user_profile">यूज़र प्रोफ़ाइल</string>
     <string name="user_settings_voice_add_multiple">आप [कीबाइंड सेटिंग](onClick) के तहत बहुत सारे पुश टू टॉक बाइंड जोड़ सकते हैं.</string>
     <string name="user_settings_voice_codec_description">Discord सिर्फ बेहतरीन ऑर्गेनिक आसपास से सोर्स किये गए Opus Voice कोडेक का इस्तेमाल करता है.</string>
     <string name="user_settings_voice_codec_title">ऑडियो कोडेक</string>
@@ -7775,25 +7780,6 @@
     <string name="whitelisting">वाइटलिस्ट बन रही है…</string>
     <string name="working">काम हो रहा है….</string>
     <string name="xbox_authorization_title">Xbox खाता प्रमाणीकरण</string>
-    <string name="xbox_game_pass_card_body_claimed">आप इसे क्लेम कर चुके हैं. ये रहा आपका कोड !!{code}!!. [ज़्यादा जानकारी देखें](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">गिफ्ट क्लेम करने के लिए 15 जनवरी 2021 तक उपलब्ध है. [कम जानकारी देखें](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">गिफ्ट क्लेम करने के लिए 15 जनवरी 2021 तक उपलब्ध है. [ज़्यादा जानकारी देखें](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">यह कोड उस कन्फर्मेशन ईमेल में भी दिया गया है जिसे अभी-अभी हमने आपके पास भेजा है.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">कुछ गड़बड़ी हुई है, बाद में फिर से कोशिश करें!</string>
-    <string name="xbox_game_pass_modal_code_header">PC कोड के लिए Xbox Game Pass</string>
-    <string name="xbox_game_pass_modal_code_header_failed">ओफ्फ़ोह</string>
-    <string name="xbox_game_pass_modal_header_description_success">[Microsoft रिडेम्पशन साइट]({redemptionURL}) पर नीचे दिया गया कोड रिडीम करें और PC के लिए 3 महीने का Xbox Game Pass का एक्सेस पाएं.</string>
-    <string name="xbox_game_pass_modal_header_success">शानदार!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">चूंकि आपके पास बूस्ट सब्सक्रिप्शन है, इसलिए हम आपको Nitro सब्सक्रिप्शन क्रेडिट देंगे. Nitro क्रेडिट अप्लाई होगा जब आप सब्सक्राइब करेंगे **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">रिडीम करें</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">अब आपके पास Nitro क्रेडिट है! अपने Nitro क्रेडिट का इस्तेमाल करने के लिए आज ही **{planName}** को सब्सक्राइब करें.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">बहुत अच्छे!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">सब्सक्रिप्शन क्रेडिट</string>
-    <string name="xbox_game_pass_promotion_banner_description">हम आपके लिए कुछ अलग से लाए हैं. Nitro सब्स्क्राइबर को अब PC के लिए 3 महीने का Xbox Game Pass मिलेगा. अभी से 15 जनवरी 2021 तक उपलब्ध है. [ज़्यादा जानकारी देखें](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">हम आपके लिए कुछ अलग से लाए हैं. Nitro सब्स्क्राइबर को अब PC के लिए 3 महीने का Xbox Game Pass मिलेगा. अभी से 15 जनवरी 2021 तक उपलब्ध है. [कम जानकारी देखें](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">PC के लिए 3 महीने का Xbox Game Pass</string>
-    <string name="xbox_game_pass_promotion_card_header">PC के लिए Xbox Game Pass (3 महीने)</string>
-    <string name="xbox_game_pass_promotion_legalese">मौजूदा या पिछले PC के Xbox Game Pass मेम्बर, या मौजूदा Xbox Game Pass अनलिमिटेड मेम्बर के लिए मान्य नहीं है. अपने Xbox Game Pass कोड को [microsoft.com/redeem](https://microsoft.com/redeem) पर 15 फरवरी 2021 से पहले रिडीम करें. क्रेडिट कार्ड होना ज़रूरी है. प्रमोशन की अवधि समाप्त होने के बाद, जब तक आप इसे कैंसल नहीं करेंगे तब तक आपसे उस समय की मौजूदा मेम्बरशिप रेट के मुताबिक हर महीने चार्ज लिया जाएगा. Windows 10 पर S मोड पर और ARM डिवाइस पर समर्थित नहीं है. गेम कैटलॉग समय के साथ बदलता है. देखें [xbox.com/gamepass](https://xbox.com/gamepass). सीमा: 1 प्रति व्यक्ति/अकाउंट.</string>
     <string name="xbox_link">लिंक</string>
     <string name="xbox_pin_step1">अपने फोन पर Discord ऐप खोलें</string>
     <string name="xbox_pin_step2">सेटिंग्स &gt; कनेक्शन &gt; जोड़ें पर जाएँ</string>
diff --git a/app/src/main/res/values-hr/plurals.xml b/app/src/main/res/values-hr/plurals.xml
index 56a50ae807..8e42b4848d 100644
--- a/app/src/main/res/values-hr/plurals.xml
+++ b/app/src/main/res/values-hr/plurals.xml
@@ -655,14 +655,6 @@
         <item quantity="few">{minimumGuildAge} tjedna</item>
         <item quantity="other">{minimumGuildAge} tjedana</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">naziv kategorije</item>
-        <item quantity="other">nazive kategorija</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">naziv kanala</item>
-        <item quantity="other">nazive kanala</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Zahtjev na čekanju</item>
         <item quantity="other">{count} zahtjeva na čekanju</item>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2561d461e2..584c6774bd 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1380,7 +1380,6 @@
     <string name="contact_sync_we_found_your_friends_body">Sad ste prijatelji na Discordu. Razgovarajte, pozivajte se na svoje servere, zabavite se! Kad god netko tvoj dođe na Discord, mi ti to javimo.</string>
     <string name="contact_sync_we_found_your_friends_title">Našli smo tvoje prijatelje!</string>
     <string name="content_matching">!!{command}!! sadržaj koji odgovara **!!{query}!! **</string>
-    <string name="context_menu_hint">Desni klik na korisnika za više opcija</string>
     <string name="continue_in_browser">Nastavi u pregledniku</string>
     <string name="continue_to_webapp">Nastavi na Discord</string>
     <string name="control_volume">Upravljaj glasnoćom</string>
@@ -3119,8 +3118,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Serveri u Otkrivanju moraju biti stari najmanje {minimumGuildAge}. Vrati se i provjeri {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server je premlad</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Tvoj server **$[nije](doesNotHook)** udovoljio svim zahtjevima za uvrštavanje u program Otkrivanje servera.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Trebat ćeš promijeniti {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Trebat ćeš promijeniti {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Trebat ćeš promijeniti svoj $[opis](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Trebat ćeš promijeniti svoj $[naziv servera](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Povećaj broj tjednih komunikatora</string>
@@ -4836,8 +4833,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Preostalo ti je {days} dok ne dobiješ Nitro na jedan mjesec besplatno</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Preostalo ti je {hours} dok ne dobiješ Nitro na jedan mjesec besplatno</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Preostalo ti je {minutes} dok ne dobiješ Nitro na jedan mjesec besplatno</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hej, Pretplatniče Nitro, čestitke! Xbox Game Pass za PC ti mi plaćamo 3 mjeseca!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Uzmi</string>
     <string name="notice_product_feedback_survey">Želiš li sudjelovati u raspravama o povratnim informacijama o proizvodima s nama?</string>
     <string name="notice_product_feedback_survey_cta">Javi nam ovdje!</string>
     <string name="notice_register_to_vote">Jesi li registriran za glasovanje na izborima? Provjeri svoj status i registriraj se za dvije minute.</string>
@@ -5024,6 +5019,7 @@
     <string name="out_of_date_action">Ažuriraj Discord</string>
     <string name="out_of_date_description">Promijenili smo par stvarčica na Discordu (i vjerojatno ispravili par pogrešaka). Ažuriraj za nastavak.</string>
     <string name="out_of_date_title">Nemaš najnoviju verziju</string>
+    <string name="outbound_promotion_redemption_modal_title">Vrh!</string>
     <string name="outgoing_friend_request">Izlazni zahtjev za prijateljstvo</string>
     <string name="outgoing_friend_request_delete_msg">Jesi li siguran/na da želiš izbrisati zahtjev za prijateljstvo poslan korisniku **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Izlazni zahtjev za prijateljstvo na ime !!{name}!!</string>
@@ -5700,12 +5696,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Dopuštenje **Prikaz kanala** obavezno je za ovaj privatni kanal.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Dopuštenja **Prikaz kanala** i **Povezivanje** obavezna su za stvaranje ovog privatnog kanala.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Ako imaš Discord Nitro, možeš nam dati da ti stavimo tvoj vlastiti banner koji je tvojih ruku djelo.</string>
     <string name="profile_customization_beta_tooltip">Prilagođavanje profila trenutno je dostupno samo ograničenom broju korisnika.</string>
+    <string name="profile_customization_bio_placeholder">Reci svijetu nešto o sebi</string>
     <string name="profile_customization_marketing_tooltip_body">Izrazi se uz dio O meni, a - ako imaš Nitro - dobiješ i banner svojega profila!</string>
     <string name="profile_customization_marketing_tooltip_cta">Kužim</string>
     <string name="profile_customization_marketing_tooltip_header">Nova prilagođavanja profila!</string>
+    <string name="profile_customization_nitro_icon_tooltip">To ima samo Nitro</string>
     <string name="promotion_card_action_claim">Uzmi</string>
-    <string name="promotion_card_body_claimed_hidden">Uzeo si već, ali kôd je skriven jer je aktivan Streamer način rada.</string>
     <string name="promotion_error_body">Čini se da je nešto pošlo po zlu i ne možeš koristiti taj kod. Ispričavamo se zbog toga.</string>
     <string name="promotion_error_title">Čekaj malo…</string>
     <string name="promotion_existing_subscriber_title">Ajoj!</string>
@@ -6612,7 +6610,6 @@
     <string name="start_stage_channel_event_members_title">Samo za članove</string>
     <string name="start_stage_channel_event_modal_button">Pokreni pozornicu</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Postat ćeš Govornik kada se Pozornica otvori.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Napiši temu da najaviš da je tvoja pozornica aktivna.</string>
     <string name="start_stage_channel_event_modal_title">O čemu ćete razgovarati?</string>
     <string name="start_stage_channel_event_modal_topic_label">Tema Pozornice</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Debata je završila: diet je bolja od obične</string>
@@ -6739,7 +6736,7 @@
     <string name="stop_ringing_username_a11y_label">Prestani zvoniti korisniku !!{username}!!</string>
     <string name="stop_speaking_message">Prestani čitati poruku</string>
     <string name="stop_streaming">Zaustavi streaming</string>
-    <string name="stop_watching">Prestani gledanje</string>
+    <string name="stop_watching">Prestani gledati</string>
     <string name="stop_watching_user">Prestani gledanje – !!{username}!!</string>
     <string name="storage_permission_denied">Potrebna je dozvola za pohranu</string>
     <string name="store_channel">Prodajni kanal</string>
@@ -7293,6 +7290,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Automatske obavijesti nisu omogućene</string>
     <string name="user_settings">Korisničke postavke</string>
     <string name="user_settings_about_me">O meni</string>
+    <string name="user_settings_about_me_description">Piši o sebi što god želiš, samo neka ti broj utrošenih znakova bude najviše {maxLength}. Ako želiš, možeš koristiti efekte i dodavati linkove.</string>
     <string name="user_settings_account_change_email_prompt">Tvoja sadašnja adresa e-pošte je !!{email}!!. U koju je želiš promijeniti?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Unesi novu adresu e-pošte i tvoju postojeću lozinku.</string>
     <string name="user_settings_account_change_email_title">Uredi e-poštu</string>
@@ -7327,6 +7325,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh, ovdje je!</string>
     <string name="user_settings_appearance_zoom_tip">Možeš promijeniti razinu zumiranja s {modKey} +/- i vratiti na zadani zoom s {modKey}+0.</string>
     <string name="user_settings_available_codes">Dostupni rezervni kôdovi</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Preporučujemo sliku veličine barem 600x240. Možeš nam prebaciti datoteke tipa PNG, JPG ili animirani GIF.</string>
     <string name="user_settings_blocked_users">Blokirani korisnici</string>
     <string name="user_settings_blocked_users_empty">Nemaš nijednog blokiranog korisnika</string>
     <string name="user_settings_blocked_users_header">Blokirani korisnici: {numberOfBlockedUsers}</string>
@@ -7335,12 +7335,14 @@
     <string name="user_settings_close_button">Gumb za zatvaranje</string>
     <string name="user_settings_confirm_logout">Jesi li siguran/na da se želiš odjaviti?</string>
     <string name="user_settings_customization_upsell">Otključaj s Nitrom</string>
+    <string name="user_settings_customize_profile_title">Prilagođavanje mojeg profila</string>
     <string name="user_settings_delete_avatar">Izbriši avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Isključivanje ove opcije može pomoći u slučajevima kada automatsko prepoznavanje ne može prepoznati tvoj glas.</string>
     <string name="user_settings_disable_noise_suppression">Filtracija šuma onemogućena je kad je Potiskivanje šuma aktivno.</string>
     <string name="user_settings_edit_account">Uredi račun</string>
     <string name="user_settings_edit_account_password_label">Unesi svoju lozinku kako bi potvrdio izmjene</string>
     <string name="user_settings_edit_account_tag">OZNAKA</string>
+    <string name="user_settings_edit_profile">Uredi profil</string>
     <string name="user_settings_enter_password_view_codes">Unesi svoju lozinku kako bi vidio rezervne kodove.</string>
     <string name="user_settings_games_install_location">Mjesto</string>
     <string name="user_settings_games_install_location_add">Dodaj mjesto instalacije</string>
@@ -7389,6 +7391,8 @@
     <string name="user_settings_open_on_startup_label">Otvori Discord</string>
     <string name="user_settings_privacy_terms">Pogledaj naše [Uvjete pružanja usluge]({termsLink}) i [Pravila zaštite osobnih podataka]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Banner profila</string>
+    <string name="user_settings_remove_avatar">Ukloni avatar</string>
+    <string name="user_settings_remove_banner">Ukloni banner</string>
     <string name="user_settings_restart_app_mobile">Ponovno pokreni aplikaciju da bi se nove postavke aktivirale.</string>
     <string name="user_settings_save">Spremi</string>
     <string name="user_settings_scan_qr_code">Skeniraj QR kôd</string>
@@ -7403,6 +7407,7 @@
     <string name="user_settings_upload_avatar">Prenesi avatar</string>
     <string name="user_settings_upload_banner">Prenesi banner</string>
     <string name="user_settings_used_backup_codes">Iskorišteni rezervni kôdovi</string>
+    <string name="user_settings_user_profile">Korisnički profil</string>
     <string name="user_settings_voice_add_multiple">Možeš dodati više Push to Talk prečaca u [Postavkama za Prečace](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord koristi samo najbolji organski lokalno-izvorni Opus Voice kodek.</string>
     <string name="user_settings_voice_codec_title">Zvučni kodek</string>
@@ -7637,25 +7642,6 @@
     <string name="whitelisting">Dodavanje na listu poželjnih…</string>
     <string name="working">U radu…</string>
     <string name="xbox_authorization_title">Autorizacija za Xbox račun</string>
-    <string name="xbox_game_pass_card_body_claimed">Ovo si uzeo. Tvoj kôd: !!{code}!!. [Podrobnije informacije](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Dar je dostupan za preuzimanje sve do 15. siječnja 2021. [Manje podrobne informacije](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Dar je dostupan za preuzimanje sve do 15. siječnja 2021. [Podrobnije informacije](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Taj kôd je i u e-pošti s potvrdom koju smo ti maločas poslali.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Nešto je pošlo po zlu, pokušaj ponovo kasnije!</string>
-    <string name="xbox_game_pass_modal_code_header">Kôd za Xbox Game Pass za PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">O-o</string>
-    <string name="xbox_game_pass_modal_header_description_success">Iskoristi svoj kôd naveden u nastavku na [Microsoftovim stranicama za iskorištavanje kodova]({redemptionURL}) i dobit ćeš svoj Xbox Game Pass za PC koji vrijedi 3 mjeseca.</string>
-    <string name="xbox_game_pass_modal_header_success">Vrh!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">S obzirom na to da imaš pretplatu na boost, dat ćemo ti kredit za pretplatu na Nitro. Kredit za Nitro će se primijeniti kada se pretplatiš na **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Iskoristi</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Sada imaš Nitro kredit! Pretplati se još danas na **{planName}** kako bi se tvoj Nitro kredit utrošio na pravi način.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Fino!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Kredit iz pretplate</string>
-    <string name="xbox_game_pass_promotion_banner_description">Odlučili smo se da ti malo uljepšamo život jednom sitnicom za tebe. Nitro pretplatnici dobivaju još i 3 mjeseca dug Xbox Game Pass za PC. Dostupno sada pa sve do 15. siječnja 2021. [Podrobnije informacije](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Odlučili smo se da ti malo uljepšamo život jednom sitnicom za tebe. Nitro pretplatnici dobivaju još i 3 mjeseca dug Xbox Game Pass za PC. Dostupno sada pa sve do 15. siječnja 2021. [Manje podrobne informacije](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 mjeseca dugačak Xbox Game Pass za PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass za PC (3 mjeseca)</string>
-    <string name="xbox_game_pass_promotion_legalese">Ne vrijedi za sadašnje ili prijašnje članove Xbox Game Pass za PC, kao ni za postojeće članove Xbox Game Pass Ultimate. Iskoristi svoj kôd ili kodove za Xbox Game Pass code na adresi [microsoft.com/redeem](https://microsoft.com/redeem) 15. veljače 2021. Potrebna je kreditna kartica. Ako ne otkažeš, naplaćivat će ti se trenutno važeća naknada svakog mjeseca nakon što istekne promotivno razdoblje. Nije podržano na OS-u Windows 10 u načinu rada S i na uređajima platforme ARM. Katalog igara podložan je povremenim promjenama. Vidi [xbox.com/gamepass](https://xbox.com/gamepass). Ograničenje: 1 po osobi/računu.</string>
     <string name="xbox_link">Poveznica</string>
     <string name="xbox_pin_step1">Otvori Discord aplikaciju na svom mobilnom telefonu</string>
     <string name="xbox_pin_step2">Idi na Postavke &gt; Veze&gt; Dodaj</string>
diff --git a/app/src/main/res/values-hu/plurals.xml b/app/src/main/res/values-hu/plurals.xml
index c768134953..55733830af 100644
--- a/app/src/main/res/values-hu/plurals.xml
+++ b/app/src/main/res/values-hu/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 hete</item>
         <item quantity="other">{minimumGuildAge} hete</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">kategóriád nevén</item>
-        <item quantity="other">kategóriáid nevén</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">csatornád nevén</item>
-        <item quantity="other">csatornáid nevén</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">függőben lévő jelentkezés</item>
         <item quantity="other">{count} függőben lévő jelentkezés</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 88d22d4fc9..8f42bc2dfb 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1405,7 +1405,6 @@
     <string name="contact_sync_we_found_your_friends_body">Már barátok vagytok a Discordon. Beszélgess velük, hívd meg őket a szerveredre, és szórakozzatok egyet! Jelezni fogjuk, ha új barátok csatlakoznak a Discordhoz.</string>
     <string name="contact_sync_we_found_your_friends_title">Megtaláltuk a barátaidat!</string>
     <string name="content_matching">!!{command}!! tartalom, ami egyezik ezzel: **!!{query}!!**</string>
-    <string name="context_menu_hint">Jobb kattintás a felhasználóra a további műveletekhez</string>
     <string name="continue_in_browser">Folytatás a böngészőben</string>
     <string name="continue_to_webapp">Tovább a Discordra</string>
     <string name="control_volume">Szabályozó hangerő</string>
@@ -3144,8 +3143,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">A Felfedezésben megjelenő szervereknek legalább {minimumGuildAge} léteznie kell. Próbáld meg újra ekkor: {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Túl fiatal szerver</string>
     <string name="guild_settings_discovery_checklist_bad_standing">A szervered **$[nem](doesNotHook)** felel meg a szerverfelfedezés minden követelményének.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Módosítanod kell a következő {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Módosítanod kell a következő {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Módosítanod kell a $[leírásodon](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Módosítanod kell a $[szervered nevén](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Növeld heti hozzászólóid számát!</string>
@@ -4869,8 +4866,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">{days} maradt az ingyenes Nitro-hónap igénylésére</string>
     <string name="notice_premium_tier_2_trial_ending_hours">{hours} maradt az ingyenes Nitro-hónap igénylésére</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">{minutes} maradt az ingyenes Nitro-hónap igénylésére</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Gratulálunk, kedves Nitro-előfizető, 3 havi Xbox Game Pass PC bérletet kapsz tőlünk ajándékba!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Igénylés</string>
     <string name="notice_product_feedback_survey">Szeretnél részt venni egy termékvisszajelzési beszélgetésben velünk?</string>
     <string name="notice_product_feedback_survey_cta">Értesíts róla minket itt!</string>
     <string name="notice_register_to_vote">Regisztráltál a szavazáshoz? Ellenőrizd az állapotodat és regisztrálj két perc alatt.</string>
@@ -5057,6 +5052,7 @@
     <string name="out_of_date_action">Discord frissítése</string>
     <string name="out_of_date_description">Van néhány érdekes változtatásunk a Discordon (és valószínűleg egy-két hibajavítás). Frissíts a folytatáshoz.</string>
     <string name="out_of_date_title">A kliensed elavult</string>
+    <string name="outbound_promotion_redemption_modal_title">Káprázatos!</string>
     <string name="outgoing_friend_request">Kimenő barátkérelem</string>
     <string name="outgoing_friend_request_delete_msg">Biztos, hogy törlöd a barátkérelmet **!!{name}!!** felé?</string>
     <string name="outgoing_friend_request_to">Kimenő barátkérelem: !!{name}!!</string>
@@ -5738,12 +5734,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">**Csatornák megtekintése** engedély szükséges a privát csatorna létrehozásához.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">**Csatornák megtekintése** és **Csatlakozás** engedély szükséges ehhez a privát csatornához.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Töltsd fel a személyre szabott banneredet és sok mást a Discord Nitro-előfizetéssel!</string>
     <string name="profile_customization_beta_tooltip">A profil testreszabása jelenleg korlátozott számú felhasználó számára érhető el.</string>
+    <string name="profile_customization_bio_placeholder">Mesélj a világnak egy kicsit magadról</string>
     <string name="profile_customization_marketing_tooltip_body">Mondj el többet magadról a „Bemutatkozás” részben, és ha van Nitro-előfizetésed, egy profilbannerrel!</string>
     <string name="profile_customization_marketing_tooltip_cta">Megértettem</string>
     <string name="profile_customization_marketing_tooltip_header">Új profil-testreszabási lehetőségek!</string>
+    <string name="profile_customization_nitro_icon_tooltip">A Nitro-előfizetés exkluzív része</string>
     <string name="promotion_card_action_claim">Igénylés</string>
-    <string name="promotion_card_body_claimed_hidden">Ezt már beváltottad, de a kód a Közvetítő mód miatt rejtett.</string>
     <string name="promotion_error_body">Úgy tűnik, hogy hiba történt, és nem használhatod ezt a kódot. Nagyon sajnáljuk.</string>
     <string name="promotion_error_title">Várjunk csak…</string>
     <string name="promotion_existing_subscriber_title">Ó, ne!</string>
@@ -6653,7 +6651,6 @@
     <string name="start_stage_channel_event_members_title">Csak tagok</string>
     <string name="start_stage_channel_event_modal_button">Pódium indítása</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Amikor megnyílik a pódium, te leszel a beszélő.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Add meg a témát, amellyel bejelentheted, hogy megnyílt a pódiumod.</string>
     <string name="start_stage_channel_event_modal_title">Miről fogtok beszélgetni?</string>
     <string name="start_stage_channel_event_modal_topic_label">Pódium témája</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Vita lezárva: a diétás jobb, mint a sima</string>
@@ -7339,6 +7336,7 @@
     <string name="user_setting_notification_not_enabled_prompt">A leküldéses értesítések nem engedélyezettek</string>
     <string name="user_settings">Felhasználói beállítások</string>
     <string name="user_settings_about_me">Bemutatkozás</string>
+    <string name="user_settings_about_me_description">Írj magadról bármit, amihez csak kedved szottyan, de ne legyen több {maxLength} karakternél. Jelöléseket és hivatkozásokat is használhatsz.</string>
     <string name="user_settings_account_change_email_prompt">A jelenlegi e-mail-címed !!{email}!! Mire szeretnéd módosítani?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Adj meg egy új e-mail-címet és a meglévő jelszavadat.</string>
     <string name="user_settings_account_change_email_title">E-mail-cím szerkesztése</string>
@@ -7373,6 +7371,8 @@
     <string name="user_settings_appearance_preview_message_5">Ó, már itt is van!</string>
     <string name="user_settings_appearance_zoom_tip">Megváltoztathatod a nagyítási szintet a(z) {modKey} +/- gyorsgombokkal és alapértelmezettre visszaállíthatod a(z) {modKey}+0 gyorsgombbal.</string>
     <string name="user_settings_available_codes">Elérhető biztonsági kódok</string>
+    <string name="user_settings_avatar">Profilkép</string>
+    <string name="user_settings_banner_specs">Javasoljuk, hogy legalább egy 600x240-es képet válassz. PNG- és JPG-formátumot, valamint animált GIF-et tölthetsz fel.</string>
     <string name="user_settings_blocked_users">Letiltott felhasználók</string>
     <string name="user_settings_blocked_users_empty">Nincs tiltott felhasználód</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} letiltott felhasználók</string>
@@ -7381,12 +7381,14 @@
     <string name="user_settings_close_button">Bezárás gomb</string>
     <string name="user_settings_confirm_logout">Biztos, hogy kijelentkezel?</string>
     <string name="user_settings_customization_upsell">Feloldás Nitróval</string>
+    <string name="user_settings_customize_profile_title">Sajt profil testreszabása</string>
     <string name="user_settings_delete_avatar">Profilkép törlése</string>
     <string name="user_settings_disable_advanced_voice_activity">A funkció kikapcsolása segíthet abban az esetben, ha hangodat nem érzékeli az automatikus bemeneti érzékenység.</string>
     <string name="user_settings_disable_noise_suppression">A zajszűrés ki van kapcsolva, amíg a Zajcsökkentés aktív.</string>
     <string name="user_settings_edit_account">Fiók szerkesztése</string>
     <string name="user_settings_edit_account_password_label">Add meg jelszavad a módosítások megerősítéséhez</string>
     <string name="user_settings_edit_account_tag">CÍMKE</string>
+    <string name="user_settings_edit_profile">Profil szerkesztése</string>
     <string name="user_settings_enter_password_view_codes">Add meg a jelszót a biztonsági kódok megtekintéséhez.</string>
     <string name="user_settings_games_install_location">Hely</string>
     <string name="user_settings_games_install_location_add">Telepítési hely hozzáadása</string>
@@ -7437,6 +7439,8 @@
     <string name="user_settings_open_on_startup_label">A Discord megnyitása</string>
     <string name="user_settings_privacy_terms">Nézd meg a [Szolgáltatási feltételeket]({termsLink}) és az [Adatvédelmi szabályzatot]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profilbanner</string>
+    <string name="user_settings_remove_avatar">Profilkép eltávolítása</string>
+    <string name="user_settings_remove_banner">Banner eltávolítása</string>
     <string name="user_settings_restart_app_mobile">Indítsd újra az alkalmazást az új beállítások érvénybe lépéséhez.</string>
     <string name="user_settings_save">Mentés</string>
     <string name="user_settings_scan_qr_code">QR-kód beolvasása</string>
@@ -7451,6 +7455,7 @@
     <string name="user_settings_upload_avatar">Profilkép feltöltése</string>
     <string name="user_settings_upload_banner">Banner feltöltése</string>
     <string name="user_settings_used_backup_codes">Használt biztonsági kódok</string>
+    <string name="user_settings_user_profile">Felhasználói profil</string>
     <string name="user_settings_voice_add_multiple">Több Push to Talk gombot is hozzáadhatsz a [Gyorsgombok](onClick) alatt.</string>
     <string name="user_settings_voice_codec_description">A Discord csak a legjobb természetes, hazai alapanyagokból készült Opus Voice kodeket használja.</string>
     <string name="user_settings_voice_codec_title">Hang kodek</string>
@@ -7687,25 +7692,6 @@
     <string name="whitelisting">Engedélyezés…</string>
     <string name="working">Folyamatban…</string>
     <string name="xbox_authorization_title">Xbox-fiók csatlakoztatása</string>
-    <string name="xbox_game_pass_card_body_claimed">Beváltottad. Íme, a kódod: !!{code}!!. [További részletek](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Az ajándék 2021. január 15-ig váltható be. [Részletek elrejtése](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Az ajándék 2021. január 15-ig váltható be. [További részletek](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">A kódot a megerősítő e-mail is tartalmazza, amit épp az imént küldtünk el neked.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Hiba történt! Kérjük, próbáld meg újra!</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass PC kód</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Ajjaj</string>
-    <string name="xbox_game_pass_modal_header_description_success">Váltsd be a lenti kódot a [Microsoft beváltási oldalán]({redemptionURL}) és 3 hónapnyi Xbox Game Pass PC hozzáférést kapsz.</string>
-    <string name="xbox_game_pass_modal_header_success">Káprázatos!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Mivel előfizettél gyorsításra, Nitro-előfizetési kreditet is adunk neked. A Nitro-kredit akkor kerül beváltásra, ha előfizetsz a következőre: **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Beváltás</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Nitro-kreditet szereztél! A Nitro-kredit használatához fizess elő még ma: **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Szép!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Előfizetési kredit</string>
-    <string name="xbox_game_pass_promotion_banner_description">Van egy kis meglepetésünk. A Nitro-előfizetők most 3 havi Xbox Game Pass PC bérletet kapnak. 2021. január 15-ig érhető el. [További részletek](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Van egy kis meglepetésünk. A Nitro-előfizetők most 3 havi Xbox Game Pass PC bérletet kapnak. 2021. január 15-ig érhető el. [Részletek elrejtése](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 hónapos Xbox Game Pass PC bérlet</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass PC bérlet (3 hónap)</string>
-    <string name="xbox_game_pass_promotion_legalese">Már meglévő Xbox Game Pass PC vagy Xbox Game Pass Ultimate tagság esetén nem érvényes. Xbox Game Pass kódjaidat a [microsoft.com/redeem](https://microsoft.com/redeem) oldalon válthatod be 2021. február 15-ig. Hitel- vagy bankkártya szükséges. Amennyiben nem mondod le, a promóciós időszak végeztével az éppen aktuális előfizetési díj minden azt követő hónapban a kártyádra terhelődik. S módú Windows 10 és ARM-készülékek esetén nem támogatott. A játékkatalógus folyamatosan változik. Lásd: [xbox.com/gamepass](https://xbox.com/gamepass). Korlát: személyenként/fiókonként 1.</string>
     <string name="xbox_pin_step1">Nyisd meg a Discord alkalmazást a telefonodon</string>
     <string name="xbox_pin_step2">Lépj a Beállítások &gt; Kapcsolatok &gt; Hozzáadás elemre</string>
     <string name="xbox_pin_step3">Kattints az Xbox-ra, és írd be a fenti PIN-kódot</string>
diff --git a/app/src/main/res/values-it/plurals.xml b/app/src/main/res/values-it/plurals.xml
index dbf4ef2957..2c00be381f 100644
--- a/app/src/main/res/values-it/plurals.xml
+++ b/app/src/main/res/values-it/plurals.xml
@@ -556,14 +556,6 @@
         <item quantity="one">una settimana</item>
         <item quantity="other">{minimumGuildAge} settimane</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">nome</item>
-        <item quantity="other">nomi</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">nome</item>
-        <item quantity="other">nomi</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Candidatura in attesa</item>
         <item quantity="other">{count} Candidature in attesa</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 922c508df9..b2211ffa01 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1035,7 +1035,7 @@
     <string name="change_identity_modal_uploader_cta">Cambia avatar del server</string>
     <string name="change_identity_modal_upsell">Utilizza un avatar diverso in ognuno dei tuoi server e molto altro ancora con **Discord Nitro!**</string>
     <string name="change_log">Registro dei cambiamenti</string>
-    <string name="change_log_md_body">Nuove funzionalità {added marginTop}\n======================\n\n* **Abbiamo aggiunto Esplora palco.** Dai un\'occhiata alle community che stanno ospitando dei palchi, da eventi audio come concerti, panel, talent show a qualunque altra stranezza ti venga in mente a patto che sia legale, cliccando sulla nuova scheda Esplora. \n* **È arrivato Trova i tuoi amici.** Abbiamo aggiunto una modalità attivabile per trovare i tuoi amici su Discord più facilmente. Se hai il numero di telefono del tuo amico ed entrambi avete dato il consenso per essere trovati, potrai trovarlo e inviargli una richiesta di amicizia. Niente più conversazioni imbarazzanti come: \"Se ti arriva una richiesta da xXSoulzLuverXx#0000, sono io.\"\n* **Abbiamo aggiunto gli emoji preferiti.** Tocca un emoji nella chat o tienine premuto uno nel selettore emoji per iniziare ad aggiungere e rimuovere gli emoji dai tuoi preferiti. I preferiti non verranno sincronizzati su desktop *per ora* ma puoi cominciare a pensare a quali 5 dei 2459 emoji a tua disposizione usi davvero.\n* **Aggiunte pagine alla barra di ricerca.** Non devi più scorrere all\'infinito tra i risultati di ricerca. Ora puoi saltare da una pagina all\'altra per trovare esattamente le prove da sbattere in faccia ai tuoi amici che negano di aver detto quella cosa 6 mesi fa ma tu non ti ricordi bene e ora ti basta un minuto per ritrovarla perché non hai nessun dubbio sul fatto che lo abbiano detto.\n* **Abbiamo aggiunto i suoni del canale vocale:** il tuo telefono ora riprodurrà suoni specifici per quando ti unisci/esci/vieni spostato nei canali vocali, tutti suoni che mi passano in testa fin troppo chiaramente. Ba-dum...ba-da-doo...\n\n\nCorrezioni e aggiornamenti {progress}\n======================\n\n* **Niente più ping di modifica!** Modificare una risposta non rimanderà più all\'autore nella maggior parte dei casi perché insomma volevo solo correggere il mio piccolo errore di grammatica e ora mi vergogno da morire.\n* **Miglioramenti delle cartelle server.** Ora puoi segnare le cartelle folder come già lette! Abbiamo aggiunto anche delle impostazioni per le cartelle server e ora puoi impostare nomi e colori personalizzati.\n* **Importanti miglioramenti e correzioni di bug per la Verifica dell\'iscrizione.** Non ti bloccherai più su queste pagine.\n* **Ora è più facile accedere alla modalità dell\'ingresso.** Puoi cambiare le impostazioni di push-to-talk e dell\'attività vocale senza uscire dalla schermata della chiamata.\n\n\n</string>
+    <string name="change_log_md_body">Nuove funzionalità {added marginTop}\n======================\n\n* **È arrivato Trova i tuoi amici.** Abbiamo aggiunto una modalità attivabile per trovare i tuoi amici su Discord più facilmente. Se hai il numero di telefono del tuo amico ed entrambi avete dato il consenso per essere trovati, potrai trovarlo e inviargli una richiesta di amicizia. Niente più conversazioni imbarazzanti come: \"Se ti arriva una richiesta da xXSoulzLuverXx#0000, sono io.\"\n* **Abbiamo aggiunto gli emoji preferiti.** Tocca un emoji nella chat o tienine premuto uno nel selettore emoji per iniziare ad aggiungere e rimuovere gli emoji dai tuoi preferiti. I preferiti non verranno sincronizzati su desktop *per ora* ma puoi cominciare a pensare a quali 5 dei 2459 emoji a tua disposizione usi davvero.\n* **Aggiunte pagine alla barra di ricerca.** Non devi più scorrere all\'infinito tra i risultati di ricerca. Ora puoi saltare da una pagina all\'altra per trovare esattamente le prove da sbattere in faccia ai tuoi amici che negano di aver detto quella cosa 6 mesi fa ma tu non ti ricordi bene e ora ti basta un minuto per ritrovarla perché non hai nessun dubbio sul fatto che lo abbiano detto.\n* **Abbiamo aggiunto i suoni del canale vocale:** il tuo telefono ora riprodurrà suoni specifici per quando ti unisci/esci/vieni spostato nei canali vocali, tutti suoni che mi passano in testa fin troppo chiaramente. Ba-dum...ba-da-doo...\n\n\nCorrezioni e aggiornamenti {progress}\n======================\n\n* **Niente più ping di modifica!** Modificare una risposta non rimanderà più all\'autore nella maggior parte dei casi perché insomma volevo solo correggere il mio piccolo errore di grammatica e ora mi vergogno da morire.\n* **Miglioramenti delle cartelle server.** Ora puoi segnare le cartelle folder come già lette! Abbiamo aggiunto anche delle impostazioni per le cartelle server e ora puoi impostare nomi e colori personalizzati.\n* **Importanti miglioramenti e correzioni di bug per la Verifica dell\'iscrizione.** Non ti bloccherai più su queste pagine.\n* **Ora è più facile accedere alla modalità dell\'ingresso.** Puoi cambiare le impostazioni di push-to-talk e dell\'attività vocale senza uscire dalla schermata della chiamata.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">it</string>
     <string name="change_log_md_revision">1</string>
@@ -1396,7 +1396,6 @@
     <string name="contact_sync_we_found_your_friends_body">Ora siete amici su Discord. Inizia una conversazione, manda un invito per il tuo server, divertitevi! Ti avviseremo quando nuovi amici si uniranno a Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Abbiamo trovato i tuoi amici!</string>
     <string name="content_matching">Contenuti di !!{command}!! trovati per **!!{query}!!**</string>
-    <string name="context_menu_hint">clicca sull\'utente col tasto destro del mouse per vedere più azioni</string>
     <string name="continue_in_browser">Continua sul browser</string>
     <string name="continue_to_webapp">Continua su Discord</string>
     <string name="control_volume">Controllo volume</string>
@@ -3062,8 +3061,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">I server in Esplora devono avere almeno {minimumGuildAge}. Riprova il {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server troppo giovane</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Il tuo server **$[non](doesNotHook)** soddisfa tutti i requisiti per essere in Esplora server.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Devi cambiare {numCategories} alla tua categoria: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Devi cambiare {numChannels} al tuo canale: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Devi cambiare la tua $[descrizione](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Devi cambiare il tuo $[nome server](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Aumenta il numero di comunicatori settimanali</string>
@@ -4277,6 +4274,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Fai l\'upgrade delle emoji, personalizza il tuo profilo e fatti notare nei server. Scegli tra **!!{monthlyPrice}!! al mese** oppure **!!{yearlyPrice}!! all\'anno**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Ottieni un\'esperienza Discord migliorata</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30%% di sconto sui potenziamenti server</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Usa emoji personalizzate e animate ovunque</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Fino a 1080p di risoluzione e 60 FPS</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB di upload invece di 100 MB</string>
     <string name="masked_link_body">L\'URL di destinazione di questo link è **!!{url}!!**. Aprire il link?</string>
@@ -4776,8 +4774,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Hai ancora {days} per ottenere un mese gratis di Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Hai ancora {hours} per ottenere un mese gratis di Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Hai ancora {minutes} per ottenere un mese gratis di Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Ehi abbonato Nitro, congratulazioni! Eccoti 3 mesi di Xbox Game Pass per PC, da parte nostra!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Riscatta</string>
     <string name="notice_product_feedback_survey">Vuoi partecipare con noi a discussioni di feedback del prodotto?</string>
     <string name="notice_product_feedback_survey_cta">Faccelo sapere qui!</string>
     <string name="notice_register_to_vote">Ti sei registrato per votare? Controlla il tuo status e registrati in soli due minuti.</string>
@@ -4964,6 +4960,7 @@
     <string name="out_of_date_action">Aggiorna Discord</string>
     <string name="out_of_date_description">Abbiamo nuovi aggiornamenti per Discord (e probabilmente qualche bug risolto). Aggiorna per continuare.</string>
     <string name="out_of_date_title">Non sei più al passo coi tempi</string>
+    <string name="outbound_promotion_redemption_modal_title">Fantastico!</string>
     <string name="outgoing_friend_request">Richiesta di amicizia in uscita</string>
     <string name="outgoing_friend_request_delete_msg">Sei sicuro di voler eliminare la tua richiesta di amicizia a **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Richiesta di amicizia inviata a !!{name}!!</string>
@@ -5644,12 +5641,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">È necessario il permesso **Visualizza canali** per creare questo canale privato.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Sono necessari i permessi **Visualizza canali** e **Collega** per creare questo canale privato.</string>
     <string name="profile">Profilo</string>
+    <string name="profile_banner_icon_tooltip_upsell">Carica il tuo banner personalizzato e molto altro ancora con Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">La personalizzazione del profilo è al momento disponibile per un numero limitato di persone.</string>
+    <string name="profile_customization_bio_placeholder">Racconta al mondo chi sei</string>
     <string name="profile_customization_marketing_tooltip_body">Esprimiti nella sezione Chi sono e, se hai Nitro, con un banner del profilo!</string>
     <string name="profile_customization_marketing_tooltip_cta">Capito</string>
     <string name="profile_customization_marketing_tooltip_header">Nuova personalizzazione del profilo!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Esclusiva Nitro</string>
     <string name="promotion_card_action_claim">Riscatta</string>
-    <string name="promotion_card_body_claimed_hidden">L\'hai già riscattato, ma il codice è nascosto per via della Modalità Streamer.</string>
     <string name="promotion_error_body">Sembra che qualcosa sia andato storto e non puoi usare questo codice. Ci dispiace.</string>
     <string name="promotion_error_title">Aspetta un attimo…</string>
     <string name="promotion_existing_subscriber_title">Oh no!</string>
@@ -6556,7 +6555,6 @@
     <string name="start_stage_channel_event_members_title">Solo membri</string>
     <string name="start_stage_channel_event_modal_button">Avvia il palco</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Sarai un relatore quando il palco aprirà.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Scrivi un argomento per annunciare che il tuo palco è in onda.</string>
     <string name="start_stage_channel_event_modal_title">Di che cosa parlerete?</string>
     <string name="start_stage_channel_event_modal_topic_label">Argomento del palco</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Il dibattito è concluso: le bevande zero calorie sono meglio delle originali</string>
@@ -7237,6 +7235,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Notifiche push non abilitate</string>
     <string name="user_settings">Impostazioni utente</string>
     <string name="user_settings_about_me">Chi sono</string>
+    <string name="user_settings_about_me_description">Scrivi quello che vuoi su di te, basta che tu lo faccia in meno di {maxLength} caratteri. Puoi anche utilizzare markdown e link, se ti va.</string>
     <string name="user_settings_account_change_email_prompt">Il tuo indirizzo e-mail attuale è !!{email}!! Con quale vuoi sostituirlo?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Inserisci un nuovo indirizzo e-mail e la tua password esistente.</string>
     <string name="user_settings_account_change_email_title">Modifica l\'indirizzo e-mail</string>
@@ -7271,6 +7270,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh, eccola lì!</string>
     <string name="user_settings_appearance_zoom_tip">Puoi cambiare il livello di zoom con {modKey} +/- e ripristinare il livello predefinito con {modKey}+0.</string>
     <string name="user_settings_available_codes">Codici di backup disponibili</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Consigliamo un\'immagine di almeno 600x240 pixel. Puoi caricare un file PNG, JPG o una GIF animata.</string>
     <string name="user_settings_blocked_users">Utenti bloccati</string>
     <string name="user_settings_blocked_users_empty">Non hai utenti bloccati</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Utenti bloccati</string>
@@ -7279,11 +7280,13 @@
     <string name="user_settings_close_button">Pulsante chiudi</string>
     <string name="user_settings_confirm_logout">Sei sicuro di volerti disconnettere?</string>
     <string name="user_settings_customization_upsell">Sblocca con Nitro</string>
+    <string name="user_settings_customize_profile_title">Personalizzazione del mio profilo</string>
     <string name="user_settings_delete_avatar">Elimina avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Disattivare questa funzione potrebbe risultare utile nel caso la tua voce non venga rilevata automaticamente.</string>
     <string name="user_settings_disable_noise_suppression">La Riduzione del rumore è disabilitata quando la Cancellazione del rumore è attiva.</string>
     <string name="user_settings_edit_account">Modifica account</string>
     <string name="user_settings_edit_account_password_label">Inserisci la tua password per confermare le modifiche</string>
+    <string name="user_settings_edit_profile">Modifica profilo</string>
     <string name="user_settings_enter_password_view_codes">Inserisci la tua password per vedere i codici di backup.</string>
     <string name="user_settings_games_install_location">Posizione</string>
     <string name="user_settings_games_install_location_add">Aggiungi posizione di installazione</string>
@@ -7333,6 +7336,8 @@
     <string name="user_settings_open_on_startup_label">Apri Discord</string>
     <string name="user_settings_privacy_terms">Controlla i nostri [Termini di Servizio]({termsLink}) e [Informativa sulla privacy]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Banner del profilo</string>
+    <string name="user_settings_remove_avatar">Rimuovi avatar</string>
+    <string name="user_settings_remove_banner">Rimuovi banner</string>
     <string name="user_settings_restart_app_mobile">Riavvia l\'app per caricare le tue nuove impostazioni.</string>
     <string name="user_settings_save">Salva</string>
     <string name="user_settings_scan_qr_code">Scansiona codice QR</string>
@@ -7347,6 +7352,7 @@
     <string name="user_settings_upload_avatar">Carica avatar</string>
     <string name="user_settings_upload_banner">Carica banner</string>
     <string name="user_settings_used_backup_codes">Codici di backup utilizzati</string>
+    <string name="user_settings_user_profile">Profilo utente</string>
     <string name="user_settings_voice_add_multiple">Puoi impostare vari tipi di push-to-talk dal [Impostazioni di associazione tasti](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord utilizza solo i migliori codec audio open source Opus, organici e a chilometro zero.</string>
     <string name="user_settings_voice_codec_title">Codec audio</string>
@@ -7581,25 +7587,6 @@
     <string name="whitelisting">Aggiunta in corso alla lista bianca…</string>
     <string name="working">In funzione…</string>
     <string name="xbox_authorization_title">Autorizzazione account Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">L\'hai riscattato. Ecco il tuo codice !!{code}!!. [Più dettagli](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Puoi riscattare il regalo fino al 15 gennaio 2021. [Meno dettagli](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Puoi riscattare il regalo fino al 15 gennaio 2021. [Più dettagli](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Trovi incluso questo codice anche nella e-mail di conferma che ti abbiamo appena inviato.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Qualcosa è andato storto, riprova più tardi!</string>
-    <string name="xbox_game_pass_modal_code_header">Codice Xbox Game Pass per PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oh oh</string>
-    <string name="xbox_game_pass_modal_header_description_success">Riscatta il codice qui sotto sul [sito web dedicato di Microsoft]({redemptionURL}) per ottenere l\'accesso a Xbox Game Pass per PC per 3 mesi.</string>
-    <string name="xbox_game_pass_modal_header_success">Fantastico!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Dal momento che hai un abbonamento potenziato, ti regaliamo del credito per un abbonamento a Nitro. Il credito Nitro viene applicato quando ti iscrivi a **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Riscatta</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Hai del credito Nitro! Abbonati oggi a **{planName}** per utilizzare il tuo credito Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Bello!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Credito abbonamento</string>
-    <string name="xbox_game_pass_promotion_banner_description">Per te anche un piccolo extra. Gli abbonati Nitro ora riceveranno 3 mesi di Xbox Game Pass per PC. Disponibile da ora fino al 15 gennaio 2021. [Più dettagli](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Per te anche un piccolo extra. Gli abbonati Nitro ora riceveranno 3 mesi di Xbox Game Pass per PC. Disponibile da ora fino al 15 gennaio 2021. [Meno dettagli](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 mesi di Xbox Game Pass per PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass per PC (3 mesi)</string>
-    <string name="xbox_game_pass_promotion_legalese">Non valido per gli attuali o precedenti membri di Xbox Game Pass per PC o di Xbox Game Pass Ultimate. Riscatta i tuoi codici Xbox Game Pass su [microsoft.com/redeem](https://microsoft.com/redeem) fino al 15 febbraio 2021. Carta di credito necessaria. Al termine del periodo promozionale ti verrà addebitata ogni mese la quota regolare d\'iscrizione, a meno che non annulli l\'abbonamento. Non disponibile su Windows 10 in modalità S o sui dispositivi ARM. Il catalogo dei giochi varia nel tempo. Visita [xbox.com/gamepass](https://xbox.com/gamepass). Limite: 1 per persona/account.</string>
     <string name="xbox_link">Collega</string>
     <string name="xbox_pin_step1">Apri l\'app Discord sul tuo smartphone</string>
     <string name="xbox_pin_step2">Vai in Impostazioni utente &gt; Collegamenti &gt; Aggiungi</string>
diff --git a/app/src/main/res/values-ja/plurals.xml b/app/src/main/res/values-ja/plurals.xml
index a0e92747f2..b265e783ab 100644
--- a/app/src/main/res/values-ja/plurals.xml
+++ b/app/src/main/res/values-ja/plurals.xml
@@ -556,14 +556,6 @@
         <item quantity="one">1週間</item>
         <item quantity="other">{minimumGuildAge}週間</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">名前</item>
-        <item quantity="other">名前</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">名前</item>
-        <item quantity="other">名前</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">保留中の申請</item>
         <item quantity="other">{count}保留中の申請</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f0f4702c24..7c554c55fb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1058,7 +1058,7 @@
     <string name="change_identity_modal_uploader_cta">サーバー アバターを 変更</string>
     <string name="change_identity_modal_upsell">サーバーごとに使うアバターを変えることも、**Discord Nitro ならできちゃいます！**</string>
     <string name="change_log">変更履歴</string>
-    <string name="change_log_md_body">新機能{added marginTop}\n======================\n\n* **ステージ発見を追加しました。**コンサートやパネルディスカッション、かくし芸大会、その他の意味不明だけど合法なオーディオイベント――すなわちステージを配信中のコミュニティを探せます。新規実装の「発見」タブをクリックしてみてください。 \n* **「フレンドを探す」がやってきました。**Discord をやっている友達を探す作業がもっと簡単になるよう、選べる機能を追加しました。友達の電話番号を知っていて、お互いに「フレンドを探す」を有効にしている場合は、友達が Discord に表示され、フレンドリクエストを送れるようになります。こんなふうにぎこちない会話から始めましょう: xXSoulzLuverXx#0000 からリクエストがあったら、それは私です。\n* **「お気に入りの絵文字」機能を追加しました。**チャットで絵文字をタップするか、任意の絵文字を絵文字ピッカーで長押しすると、お気に入りに追加したり削除したりできます。お気に入りの絵文字は *まだ* デスクトップ版と同期できませんが、全部で 2,459 ある絵文字のうち実際に使っているのが 5 個くらいだという事実をご自分で確かめてみてくださいね。\n* **検索バーでページ分けできるようになりました。**検索結果を永久にスクロールし続ける手間はもういりません。これからはページ間をジャンプして、6 ヶ月前くらいに友達が〇〇って言ったけど正確にいつかは思い出せなくて一瞬だけ時間ちょうだい絶対間違いなく言ってたからすぐに探し出して言質取るから、っていうときに役立てることができます。\n* **ボイスチャンネルに通知音を追加しました。**今後ボイスチャンネルで参加／退出／移動したときには、スマホで通知音がなります。ちなみにこの通知音、脳内で明瞭に再生されまくるのでつらいです。バドゥン……バダドゥ……\n\n\n\nバグ修正と更新{progress}\n======================\n\n* **編集 ping、さようなら！** 一度送った返信を編集しても、返信元メッセージの書き手にメンションが飛ぶことがほぼなくなりました。ちょっとタイポを直したかっただけなのに、そういうの恥ずか死ぬじゃん。\n* **サーバーフォルダーが改善されました。**これからはサーバーフォルダーを既読としてマークできます！ サーバーフォルダー設定も実装したので、カスタム名称や色を設定できるようになりましたよ。\n* **メンバー・スクリーニングを大幅改善しました。**もうスクリーニング関連のページでつまづくことはありません。\n* **入力モードへのアクセスが簡単になりました。**通話スクリーンを閉じることなく、プッシュツートークや音声検出設定を変更できるようになりました。\n\n\n</string>
+    <string name="change_log_md_body">新機能{added marginTop}\n======================\n\n* **「フレンドを探す」がやってきました。**Discord をやっている友達を探す作業がもっと簡単になるよう、選べる機能を追加しました。友達の電話番号を知っていて、お互いに「フレンドを探す」を有効にしている場合は、友達が Discord に表示され、フレンドリクエストを送れるようになります。こんなふうにぎこちない会話から始めましょう: xXSoulzLuverXx#0000 からリクエストがあったら、それは私です。\n* **「お気に入りの絵文字」機能を追加しました。**チャットで絵文字をタップするか、任意の絵文字を絵文字ピッカーで長押しすると、お気に入りに追加したり削除したりできます。お気に入りの絵文字は *まだ* デスクトップ版と同期できませんが、全部で 2,459 ある絵文字のうち実際に使っているのが 5 個くらいだという事実をご自分で確かめてみてくださいね。\n* **検索バーでページ分けできるようになりました。**検索結果を永久にスクロールし続ける手間はもういりません。これからはページ間をジャンプして、6 ヶ月前くらいに友達が〇〇って言ったけど正確にいつかは思い出せなくて一瞬だけ時間ちょうだい絶対間違いなく言ってたからすぐに探し出して言質取るから、っていうときに役立てることができます。\n* **ボイスチャンネルに通知音を追加しました。**今後ボイスチャンネルで参加／退出／移動したときには、スマホで通知音がなります。ちなみにこの通知音、脳内で明瞭に再生されまくるのでつらいです。バドゥン……バダドゥ……\n\n\n\nバグ修正と更新{progress}\n======================\n\n* **編集 ping、さようなら！** 一度送った返信を編集しても、返信元メッセージの書き手にメンションが飛ぶことがほぼなくなりました。ちょっとタイポを直したかっただけなのに、そういうの恥ずか死ぬじゃん。\n* **サーバーフォルダーが改善されました。**これからはサーバーフォルダーを既読としてマークできます！ サーバーフォルダー設定も実装したので、カスタム名称や色を設定できるようになりましたよ。\n* **メンバー・スクリーニングを大幅改善しました。**もうスクリーニング関連のページでつまづくことはありません。\n* **入力モードへのアクセスが簡単になりました。**通話スクリーンを閉じることなく、プッシュツートークや音声検出設定を変更できるようになりました。\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">ja</string>
     <string name="change_log_md_revision">1</string>
@@ -1421,7 +1421,6 @@
     <string name="contact_sync_we_found_your_friends_body">Discordの友達になりました。 お話をしたり、サーバーに招待したして、一緒に楽しみましょう！ 新しい友達がDiscordに参加したときにお知らせします。</string>
     <string name="contact_sync_we_found_your_friends_title">友達を見つけました！</string>
     <string name="content_matching">**!!{query}!!**に一致する!!{command}!!</string>
-    <string name="context_menu_hint">ユーザーを右クリックすると更なる操作ができます</string>
     <string name="continue_in_browser">ブラウザで続ける</string>
     <string name="continue_to_webapp">Discordで開く</string>
     <string name="control_volume">音量をコントロールする</string>
@@ -3233,8 +3232,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">発見内のサーバーは、{minimumGuildAge}以上経過している必要があります。{passDate}にもう一度ご確認ください。</string>
     <string name="guild_settings_discovery_checklist_age_failing">サーバーの経過期間が短すぎる</string>
     <string name="guild_settings_discovery_checklist_bad_standing">あなたのサーバーは、サーバー発見の参加要件を全て満たすことが**$[できていません](doesNotHook)**。</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">カテゴリーの{numCategories}: $[{categoryNames}](categoryHook)を変更してください</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">チャンネルの{numChannels}: $[{channelNames}](channelHook)を変更してください</string>
     <string name="guild_settings_discovery_checklist_change_description">$[概要](descriptionHook)を変更してください</string>
     <string name="guild_settings_discovery_checklist_change_name">$[サーバー名](nameHook)を変更してください</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">週あたりのコミュニケーター数を増やす</string>
@@ -4463,6 +4460,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">絵文字をアップグレード、自分専用のプロフィールを作成、サーバーで存在感をアピール。**!!{monthlyPrice}!!(月間)**もしくは**!!{yearlyPrice}!!(年間)**からお選びいただけます。</string>
     <string name="marketing_refresh_premium_tier_2_title">Discordでのエクスペリエンスを高めましょう</string>
     <string name="marketing_tier_1_perk_list_boost_discount">サーバーブースト 30%% OFF</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">カスタム&amp;アニメーション絵文字をどこでも使えるようにしよう</string>
     <string name="marketing_tier_1_perk_list_stream_quality">解像度が最大 1080p、60fps にアップ</string>
     <string name="marketing_tier_1_perk_list_upload_size">アップロード上限が 100MB から 50MB に</string>
     <string name="masked_link_body">このリンクは**!!{url}!!**へ飛びます。実行してもよろしいですか？</string>
@@ -4964,8 +4962,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Nitroの1ヶ月無料トライアルを入手できるのは、あと{days}です</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Nitroの1ヶ月無料トライアルを入手できるのは、あと{hours}です</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Nitroの1ヶ月無料トライアルを入手できるのは、あと{minutes}です</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Nitroサブスクライバーの皆さん、おめでとうございます！Discordから3ヶ月分のXbox Game Pass for PCのプレゼントです！</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">獲得する</string>
     <string name="notice_product_feedback_survey">サービスへのフィードバック・ディスカッションにご参加くださいませんか？</string>
     <string name="notice_product_feedback_survey_cta">こちらからご連絡ください！</string>
     <string name="notice_register_to_vote">有権者登録はお済みですか？ ステータスを確認して、2分で登録を済ませられます。</string>
@@ -5152,6 +5148,7 @@
     <string name="out_of_date_action">Discordを更新する</string>
     <string name="out_of_date_description">Discordがさらに便利になりました！続行するにはアップデートしてください。</string>
     <string name="out_of_date_title">古いバージョンを使用しています</string>
+    <string name="outbound_promotion_redemption_modal_title">最高！</string>
     <string name="outgoing_friend_request">フレンド申請を送信済み</string>
     <string name="outgoing_friend_request_delete_msg">本当に**!!{name}!!**へのフレンド申請を取り消しますか？</string>
     <string name="outgoing_friend_request_to">!!{name}!!にフレンド申請を送信済み</string>
@@ -5831,12 +5828,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">このプライベートチャンネルを作成するには、**チャンネルの閲覧**権限が必要です。</string>
     <string name="private_voice_channel_creation_permission_missing_hint">このプライベートチャンネルを作成するには、**チャンネルの閲覧**および**接続**権限が必要です。</string>
     <string name="profile">プロフィール</string>
+    <string name="profile_banner_icon_tooltip_upsell">Discord Nitro なら、自分だけのバナーをアップロードしたりできますよ！</string>
     <string name="profile_customization_beta_tooltip">プロフィールのカスタマイズは現在、一部のユーザー限定の機能となっています。</string>
+    <string name="profile_customization_bio_placeholder">世界があなたを知りたがっています</string>
     <string name="profile_customization_marketing_tooltip_body">「自己紹介」で自己表現。Nitro に登録していればプロフィールバナーも使えます！</string>
     <string name="profile_customization_marketing_tooltip_cta">了解</string>
     <string name="profile_customization_marketing_tooltip_header">プロフィールのカスタマイズ、新登場！</string>
+    <string name="profile_customization_nitro_icon_tooltip">Nitro 限定</string>
     <string name="promotion_card_action_claim">獲得</string>
-    <string name="promotion_card_body_claimed_hidden">獲得しましたが、配信モードのためコードは非表示になっています。</string>
     <string name="promotion_error_body">そのコードはお使いいただけないようです。申し訳ございません。</string>
     <string name="promotion_error_title">おっと…</string>
     <string name="promotion_existing_subscriber_title">申し訳ありません。</string>
@@ -6749,7 +6748,6 @@
     <string name="start_stage_channel_event_members_title">メンバー限定</string>
     <string name="start_stage_channel_event_modal_button">ステージを開始</string>
     <string name="start_stage_channel_event_modal_speaker_hint">ステージがオープンすると、あなたがスピーカーに設定されます。</string>
-    <string name="start_stage_channel_event_modal_subtitle">トピックを記入して、ステージが配信中であることを伝えましょう。</string>
     <string name="start_stage_channel_event_modal_title">何の話をしますか？</string>
     <string name="start_stage_channel_event_modal_topic_label">ステージのトピック</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">最終結論：ローカロリー食品は普通のよりおいしい</string>
@@ -7436,6 +7434,7 @@
     <string name="user_setting_notification_not_enabled_prompt">プッシュ通知が無効です</string>
     <string name="user_settings">ユーザー設定</string>
     <string name="user_settings_about_me">自己紹介</string>
+    <string name="user_settings_about_me_description">フリースタイルで自己紹介しましょう。{maxLength}文字以内なら、マークダウンやリンクを使ってもＯＫです。</string>
     <string name="user_settings_account_change_email_prompt">現在のメールアドレスは !!{email}!! です。変更後のアドレスを記入してください。</string>
     <string name="user_settings_account_change_email_prompt_desktop">新しいメールアドレスと既存のパスワードを入力してください。</string>
     <string name="user_settings_account_change_email_title">メールアドレスの編集</string>
@@ -7470,6 +7469,8 @@
     <string name="user_settings_appearance_preview_message_5">ああ、ついに来た！</string>
     <string name="user_settings_appearance_zoom_tip">{modKey}+/-で拡大・縮小、{modKey}+0でリセットできます。</string>
     <string name="user_settings_available_codes">利用可能なバックアップコード</string>
+    <string name="user_settings_avatar">アバター</string>
+    <string name="user_settings_banner_specs">推奨画像サイズは 600x240 以上です。PNG、JPG、アニメーションGIFがアップロードできます。</string>
     <string name="user_settings_blocked_users">ブロックしたユーザー</string>
     <string name="user_settings_blocked_users_empty">ブロックしているユーザーはいません</string>
     <string name="user_settings_blocked_users_header">ブロック済みユーザー：{numberOfBlockedUsers}人</string>
@@ -7478,12 +7479,14 @@
     <string name="user_settings_close_button">閉じるボタン</string>
     <string name="user_settings_confirm_logout">本当にログアウトしますか？</string>
     <string name="user_settings_customization_upsell">Nitro でアンロックする</string>
+    <string name="user_settings_customize_profile_title">プロフィールをカスタマイズ</string>
     <string name="user_settings_delete_avatar">アバターを削除</string>
     <string name="user_settings_disable_advanced_voice_activity">あなたの声が入力感度自動調整で検出されない場合、こちらの設定をオフにしてみてください。</string>
     <string name="user_settings_disable_noise_suppression">ノイズ抑制が有効のときは、ノイズ低減機能は無効になります。</string>
     <string name="user_settings_edit_account">アカウントを編集</string>
     <string name="user_settings_edit_account_password_label">パスワードを入力して変更を確定します</string>
     <string name="user_settings_edit_account_tag">タグ</string>
+    <string name="user_settings_edit_profile">プロフィール編集</string>
     <string name="user_settings_enter_password_view_codes">パスワードを編集してバックアップコードを表示します。</string>
     <string name="user_settings_games_install_location">場所</string>
     <string name="user_settings_games_install_location_add">インストール場所を追加する</string>
@@ -7534,6 +7537,8 @@
     <string name="user_settings_open_on_startup_label">Discordを開く</string>
     <string name="user_settings_privacy_terms">[サービス利用規約]({termsLink}) 及び [プライバシーポリシー]({privacyLink}) を確認してください。</string>
     <string name="user_settings_profile_banner">プロフィールバナー</string>
+    <string name="user_settings_remove_avatar">アバター削除</string>
+    <string name="user_settings_remove_banner">バナー削除</string>
     <string name="user_settings_restart_app_mobile">アプリを再起動して新しい設定を有効にします。</string>
     <string name="user_settings_save">保存</string>
     <string name="user_settings_scan_qr_code">QRコードのスキャン</string>
@@ -7548,6 +7553,7 @@
     <string name="user_settings_upload_avatar">アバターをアップロード</string>
     <string name="user_settings_upload_banner">バナーをアップロード</string>
     <string name="user_settings_used_backup_codes">使用済みバックアップコード</string>
+    <string name="user_settings_user_profile">ユーザープロフィール</string>
     <string name="user_settings_voice_add_multiple">プッシュトゥトークのショートカットは[キー割り当て設定](onClick)で複数追加することができます。</string>
     <string name="user_settings_voice_codec_description">Discordは自然由来の地元産で最良なOpus Voiceコーデックのみを使用しています。</string>
     <string name="user_settings_voice_codec_title">オーディオコーデック</string>
@@ -7785,25 +7791,6 @@
     <string name="widget">ウィジェット</string>
     <string name="working">処理しています…</string>
     <string name="xbox_authorization_title">Xboxアカウント認証</string>
-    <string name="xbox_game_pass_card_body_claimed">獲得済みです。あなたのコードは!!{code}!!です。[詳しくはこちら](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">ギフトの入手は2021年1月15日まで。[詳細を隠す](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">ギフトの入手は2021年1月15日まで。[詳しくはこちら](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">こちらのコードは、先ほどお送りした確認メールにも記載されています。</string>
-    <string name="xbox_game_pass_modal_code_description_failed">問題が発生しました。再度お試しください。</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass for PCコード</string>
-    <string name="xbox_game_pass_modal_code_header_failed">問題が発生しました</string>
-    <string name="xbox_game_pass_modal_header_description_success">Xbox Game Pass for PCを3ヶ月間無料で使用するには、[Microsoftコード利用サイト]({redemptionURL})にて下記のコードを入力してください。</string>
-    <string name="xbox_game_pass_modal_header_success">最高！</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">ブーストサブスクリプションをご利用ですので、Nitroサブスクリプションクレジットを差し上げます。Nitroクレジットは、**{planName}**をサブスクリプションした際に適用されます。</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">交換する</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Nitro購読クレジットを取得しました！ 今すぐ**{planName}**を購読して、Nitro購読を適用しましょう。</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">いいね！</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">購読クレジット</string>
-    <string name="xbox_game_pass_promotion_banner_description">さらにおまけがあります。Nitroサブスクライバーの皆さんに、3ヶ月分のXbox Game Pass for PCをプレゼント！ 2021年1月15日までの期間限定となります。[詳細](onToggleExpand)</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">さらにおまけがあります。Nitroサブスクライバーの皆さんに、3ヶ月分のXbox Game Pass for PCをプレゼント！ 2021年1月15日までの期間限定となります。[詳細を隠す](onToggleExpand)</string>
-    <string name="xbox_game_pass_promotion_banner_header">Xbox Game Pass for PCが3ヶ月無料</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass for PC（3ヶ月分）</string>
-    <string name="xbox_game_pass_promotion_legalese">現在または以前にXbox Game Pass for PCメンバーまたはXbox Game Pass Ultimateメンバーである場合は対象外です。Xbox Game Passコードのお引換は、[microsoft.com/redeem](https://microsoft.com/redeem)にて、2021年2月15日までに行ってください。お引換にはクレジットカードが必要です。無料期間が終了すると、解約されていない限り、その時点での月額料金が請求されます。Windows 10のSモードおよびARMデバイスは対象外です。ゲームカタログは時期によって変わりますので、[xbox.com/gamepass](https://xbox.com/gamepass) でご確認ください。特典のご利用はお1人／1アカウントにつき1回までとなります。</string>
     <string name="xbox_link">リンク</string>
     <string name="xbox_pin_step1">自分の電話でDiscordアプリを開く</string>
     <string name="xbox_pin_step2">[設定] &gt; [接続] &gt; [追加]と進みます</string>
diff --git a/app/src/main/res/values-ko/plurals.xml b/app/src/main/res/values-ko/plurals.xml
index 3f3a1adde6..c6d3fd478a 100644
--- a/app/src/main/res/values-ko/plurals.xml
+++ b/app/src/main/res/values-ko/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1주</item>
         <item quantity="other">{minimumGuildAge}주</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">이름</item>
-        <item quantity="other">이름</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">이름</item>
-        <item quantity="other">이름</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">개</item>
         <item quantity="other">{count}개</item>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b6682fe25b..e32feddec4 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1058,7 +1058,7 @@
     <string name="change_identity_modal_uploader_cta">서버 아바타 변경하기</string>
     <string name="change_identity_modal_upsell">**Discord Nitro 구독**으로 참가 중인 서버마다 각기 다른 아바타를 사용해보세요!</string>
     <string name="change_log">변경 사항</string>
-    <string name="change_log_md_body">새 기능 {added marginTop}\n======================\n\n* **스테이지 찾기 기능을 추가했어요.** 새로운 찾기 탭을 클릭해 스테이지(콘서트, 토론, 장기 자랑을 포함한 상상할 수 있는 모든 종류의 합법적인 오디오 행사)를 호스팅 중인 커뮤니티를 확인해보세요. \n* **친구 찾기를 추가했어요.** Discord에서 친구를 더 쉽게 찾는 방법을 추가했어요. 친구의 전화번호를 알고 있고, 두 사람 모두 친구 찾기 기능에 동의한 상태라면 친구를 찾아서 친구 요청을 보낼 수 있어요. \"혹시 xX영혼의단짝Xx#0000이라는 사람이 요청을 보내면 난 줄 알아.\" 같은 다소 민망한 말로 대화를 시작하게 되겠군요.\n* **이모티콘 즐겨찾기 기능을 추가했어요.** 대화 중 이모티콘을 탭하거나, 이모티콘 선택기에서 이모티콘 하나를 길게 누르면, 해당 이모티콘을 즐겨찾기로 추가하거나 제거할 수 있어요. 가지고 있는 총 2,459개의 이모티콘 중 실제로 사용하는 이모티콘 5개가 무엇인지 슬슬 생각해볼 때가 됐어요. 참, PC 버전과는 *아직* 동기화되지 않아요.\n* **검색 창에 페이지 기능을 추가했어요.** 검색 결과를 뒤져볼 때 더는 손가락 빠지도록 스크롤을 내릴 필요가 없어요. 6개월 전 친구가 뭔가에 관해 무슨 얘기를 했는데 그게 정확히 무엇에 관한 것이었는지 기억이 가물가물하지만 왠지 당장 궁금해서 미칠 거 같을 때, 검색 결과 페이지를 오가며 편하게 그 실마리를 찾아볼 수 있을 거예요.\n* **음성 채널에 알림 사운드를 추가했어요.** 이제부터는 음성 채널에 참가하거나, 채널을 떠나거나, 다른 채널로 이동될 때 휴대폰에서 소리가 날 거예요.\n\n\n\n\n수정 및 업데이트 {progress}\n======================\n\n* **댓글 수정 핑이 사라졌어요!** 이제 댓글을 수정해도 거의 모든 경우에서 원글 작성자에게 멘션이 가지 않아요. 민망한 문법 실수도 몰래 수정하는 게 가능하단 이야기죠.\n* **서버 폴더를 개선했어요.** 이제 서버 폴더를 읽음으로 표시할 수 있어요! 또 서버 폴더 설정에서 폴더에 사용자 정의 이름과 색상을 지정할 수도 있어요.\n* **멤버십 심사 기능을 대폭 개선하고 버그를 수정했어요.** 이제 페이지에 갇혀 오도 가도 못 하는 일은 벌어지지 않을 거예요.\n* **녹음 모드를 더 쉽게 사용할 수 있어요.** 이제 통화 화면을 떠나지 않고도 눌러서 말하기 모드로 전환하거나 음성 활동 설정을 변경할 수 있어요.\n\n\n</string>
+    <string name="change_log_md_body">새 기능 {added marginTop}\n======================\n\n* **친구 찾기를 추가했어요.** Discord에서 친구를 더 쉽게 찾는 방법을 추가했어요. 친구의 전화번호를 알고 있고, 두 사람 모두 친구 찾기 기능에 동의한 상태라면 친구를 찾아서 친구 요청을 보낼 수 있어요. \"혹시 xX영혼의단짝Xx#0000이라는 사람이 요청을 보내면 난 줄 알아.\" 같은 다소 민망한 말로 대화를 시작하게 되겠군요.\n* **이모티콘 즐겨찾기 기능을 추가했어요.** 대화 중 이모티콘을 탭하거나, 이모티콘 선택기에서 이모티콘 하나를 길게 누르면, 해당 이모티콘을 즐겨찾기로 추가하거나 제거할 수 있어요. 가지고 있는 총 2,459개의 이모티콘 중 실제로 사용하는 이모티콘 5개가 무엇인지 슬슬 생각해볼 때가 됐어요. 참, PC 버전과는 *아직* 동기화되지 않아요.\n* **검색 창에 페이지 기능을 추가했어요.** 검색 결과를 뒤져볼 때 더는 손가락 빠지도록 스크롤을 내릴 필요가 없어요. 6개월 전 친구가 뭔가에 관해 무슨 얘기를 했는데 그게 정확히 무엇에 관한 것이었는지 기억이 가물가물하지만 왠지 당장 궁금해서 미칠 거 같을 때, 검색 결과 페이지를 오가며 편하게 그 실마리를 찾아볼 수 있을 거예요.\n* **음성 채널에 알림 사운드를 추가했어요.** 이제부터는 음성 채널에 참가하거나, 채널을 떠나거나, 다른 채널로 이동될 때 휴대폰에서 소리가 날 거예요.\n\n\n\n\n수정 및 업데이트 {progress}\n======================\n\n* **댓글 수정 핑이 사라졌어요!** 이제 댓글을 수정해도 거의 모든 경우에서 원글 작성자에게 멘션이 가지 않아요. 민망한 문법 실수도 몰래 수정하는 게 가능하단 이야기죠.\n* **서버 폴더를 개선했어요.** 이제 서버 폴더를 읽음으로 표시할 수 있어요! 또 서버 폴더 설정에서 폴더에 사용자 정의 이름과 색상을 지정할 수도 있어요.\n* **멤버십 심사 기능을 대폭 개선하고 버그를 수정했어요.** 이제 페이지에 갇혀 오도 가도 못 하는 일은 벌어지지 않을 거예요.\n* **녹음 모드를 더 쉽게 사용할 수 있어요.** 이제 통화 화면을 떠나지 않고도 눌러서 말하기 모드로 전환하거나 음성 활동 설정을 변경할 수 있어요.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">ko</string>
     <string name="change_log_md_revision">1</string>
@@ -1421,7 +1421,6 @@
     <string name="contact_sync_we_found_your_friends_body">이제 Discord에서 친구가 생겼네요. 함께 이야기하고, 서버로 초대하고, 즐거운 시간을 보내세요! 새로운 친구가 Discord에 가입하면 알려드릴게요.</string>
     <string name="contact_sync_we_found_your_friends_title">친구를 찾았어요!</string>
     <string name="content_matching">!!{command}!! 검색 결과 **!!{query}!!**</string>
-    <string name="context_menu_hint">사용자를 오른쪽 클릭해서 추가 작업 보기</string>
     <string name="continue_in_browser">브라우저에서 계속하기</string>
     <string name="continue_to_webapp">Discord로 계속하기</string>
     <string name="control_volume">음량 조절하기</string>
@@ -3224,8 +3223,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">서버 찾기에 표시되려면 서버가 생성된 지 최소 {minimumGuildAge}가 지나야 해요. {passDate} 후 다시 확인하세요.</string>
     <string name="guild_settings_discovery_checklist_age_failing">서버가 생긴 지 얼마 되지 않음</string>
     <string name="guild_settings_discovery_checklist_bad_standing">서버가 서버 찾기에 노출되기 위한 모든 요구 조건을 **$[만족하지 못했어요](doesNotHook)**.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">카테고리 {numCategories}을 바꿔야 해요: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">채널 {numChannels}을 바꿔야 해요: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">$[설명](descriptionHook)을 바꿔야 해요</string>
     <string name="guild_settings_discovery_checklist_change_name">$[서버 이름](nameHook)을 바꿔야 해요</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">주간 대화 참여자 수 늘리기</string>
@@ -4450,6 +4447,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">이모티콘을 업그레이드하고, 프로필을 개성 있게 설정해 서버에서 존재감을 뽐내보세요. **매월 !!{monthlyPrice}!!**, 혹은 **매년 !!{yearlyPrice}!!** 중 선택할 수 있어요.</string>
     <string name="marketing_refresh_premium_tier_2_title">Discord 사용 경험 향상</string>
     <string name="marketing_tier_1_perk_list_boost_discount">서버 부스트 30%% 할인</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">어디서나 커스텀 및 애니메이션 이모티콘을 사용해 보세요</string>
     <string name="marketing_tier_1_perk_list_stream_quality">1080p 해상도와 60fps까지 지원</string>
     <string name="marketing_tier_1_perk_list_upload_size">100MB가 아닌 50MB까지 업로드 가능</string>
     <string name="masked_link_body">이 링크를 누르면 **!!{url}!!**(으)로 이동합니다. 정말로 접속하시겠어요?</string>
@@ -4949,8 +4947,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Nitro 구독 무료 이용 기간이 {days} 남았어요</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Nitro 구독 무료 이용 기간이 {hours} 남았어요</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Nitro 구독 무료 이용 기간이 {minutes} 남았어요</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Nitro 구독자님, 축하드려요! PC용 Xbox Game Pass 3개월권을 받으실 수 있어요!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">받기</string>
     <string name="notice_product_feedback_survey">제품 피드백 논의에 참여하시겠어요?</string>
     <string name="notice_product_feedback_survey_cta">여기서 알려주세요!</string>
     <string name="notice_register_to_vote">투표 등록은 하셨나요? 상태를 확인해보세요. 2분이면 등록할 수 있어요.</string>
@@ -5136,6 +5132,7 @@
     <string name="out_of_date_action">Discord 업데이트</string>
     <string name="out_of_date_description">Discord에 변경 사항이 있어요(버그도 한두 개 고쳤을 수도 있고요). 계속 하려면 업데이트해 주세요.</string>
     <string name="out_of_date_title">최신 버전이 아니네요</string>
+    <string name="outbound_promotion_redemption_modal_title">좋았어요!</string>
     <string name="outgoing_friend_request">보낸 친구 요청</string>
     <string name="outgoing_friend_request_delete_msg">정말로 **!!{name}!!** 님에게 보낸 친구 요청을 취소하시겠어요?</string>
     <string name="outgoing_friend_request_to">!!{name}!!님에게 보낸 친구 요청</string>
@@ -5815,12 +5812,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">이 비공개 채널을 만들려면 **채널 보기** 권한이 필요해요.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">이 비공개 채널을 만들려면 **채널 보기** 권한과 **접속** 권한이 있어야 해요.</string>
     <string name="profile">프로필</string>
+    <string name="profile_banner_icon_tooltip_upsell">Discord Nitro로 개인 배너를 업로드하는 등 다양한 기능을 이용할 수 있어요!</string>
     <string name="profile_customization_beta_tooltip">프로필 맞춤 설정은 현재 일부 사용자들만 사용할 수 있습니다.</string>
+    <string name="profile_customization_bio_placeholder">자신을 소개해주세요</string>
     <string name="profile_customization_marketing_tooltip_body">내 소개, 그리고 Nitro를 구독 중이라면 프로필 배너로 자신을 표현하세요!</string>
     <string name="profile_customization_marketing_tooltip_cta">알겠어요</string>
     <string name="profile_customization_marketing_tooltip_header">새로운 프로필 맞춤 설정 기능!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Nitro 전용</string>
     <string name="promotion_card_action_claim">받기</string>
-    <string name="promotion_card_body_claimed_hidden">받았지만, 방송 모드가 켜져 있어 코드는 보이지 않아요.</string>
     <string name="promotion_error_body">뭔가 잘못된 모양이에요. 그 코드를 사용할 수 없네요. 죄송해요.</string>
     <string name="promotion_error_title">잠깐만 기다려주세요…</string>
     <string name="promotion_existing_subscriber_title">이런!</string>
@@ -6736,7 +6735,6 @@
     <string name="start_stage_channel_event_members_title">멤버 전용</string>
     <string name="start_stage_channel_event_modal_button">스테이지 시작하기</string>
     <string name="start_stage_channel_event_modal_speaker_hint">스테이지가 열리면 연설자로 참여하게 됩니다.</string>
-    <string name="start_stage_channel_event_modal_subtitle">주제를 설명해 스테이지가 열렸다는 걸 알리세요.</string>
     <string name="start_stage_channel_event_modal_title">무슨 주제로 대화를 나눠볼까요?</string>
     <string name="start_stage_channel_event_modal_topic_label">스테이지 주제</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">논란 종결: 역시 닭보다는 알이 먼저죠</string>
@@ -7425,6 +7423,7 @@
     <string name="user_setting_notification_not_enabled_prompt">푸시 알림 비활성화</string>
     <string name="user_settings">사용자 설정</string>
     <string name="user_settings_about_me">내 소개</string>
+    <string name="user_settings_about_me_description">{maxLength}글자 이하로 얼마든지 자기소개를 해보세요. 마크다운 문법과 링크도 사용할 수 있어요.</string>
     <string name="user_settings_account_change_email_prompt">사용 중인 이메일 주소는 !!{email}!!이에요. 무엇으로 변경할까요?</string>
     <string name="user_settings_account_change_email_prompt_desktop">새로운 이메일 주소와 기존 비밀번호를 입력하세요.</string>
     <string name="user_settings_account_change_email_title">이메일 편집</string>
@@ -7435,7 +7434,7 @@
     <string name="user_settings_account_change_username_title">사용자명 수정하기</string>
     <string name="user_settings_account_change_username_title_desktop">사용자명 변경하기</string>
     <string name="user_settings_account_password_and_authentication">비밀번호와 인증</string>
-    <string name="user_settings_account_removal_description">계정을 제거한 후에도 언제든 복구할 수 있어요.</string>
+    <string name="user_settings_account_removal_description">계정을 비활성화하면 언제든 복구할 수 있어요.</string>
     <string name="user_settings_account_removal_description_unclaimed">더 이상 계정이 필요하지 않나요?</string>
     <string name="user_settings_account_removal_section">계정 제거</string>
     <string name="user_settings_account_remove_phone_number_button">전화번호 제거</string>
@@ -7459,6 +7458,8 @@
     <string name="user_settings_appearance_preview_message_5">아, 여기 있네요!</string>
     <string name="user_settings_appearance_zoom_tip">{modKey} +/-로 확대/축소 수준을 조절할 수 있고, {modKey}+0으로 기본 확대/축소 값으로 돌아갈 수 있어요.</string>
     <string name="user_settings_available_codes">복구 코드 사용 가능</string>
+    <string name="user_settings_avatar">아바타</string>
+    <string name="user_settings_banner_specs">이미지 해상도는 최소 600x240 크기여야 해요. PNG, JPG, 움직이는 GIF를 업로드할 수 있어요.</string>
     <string name="user_settings_blocked_users">차단한 사용자</string>
     <string name="user_settings_blocked_users_empty">차단한 친구가 없어요.</string>
     <string name="user_settings_blocked_users_header">차단한 사용자: {numberOfBlockedUsers}명</string>
@@ -7467,12 +7468,14 @@
     <string name="user_settings_close_button">닫기 버튼</string>
     <string name="user_settings_confirm_logout">정말로 로그아웃하시겠어요?</string>
     <string name="user_settings_customization_upsell">Nitro로 해제</string>
+    <string name="user_settings_customize_profile_title">내 프로필 꾸미지</string>
     <string name="user_settings_delete_avatar">아바타 삭제하기</string>
     <string name="user_settings_disable_advanced_voice_activity">내 목소리가 자동 입력 감도로 감지되지 않는다면, 이 기능을 끄는 게 도움이 될지도 몰라요.</string>
     <string name="user_settings_disable_noise_suppression">잡음 제거가 활성화되어 있는 동안에는 잡음 감소가 비활성화돼요.</string>
     <string name="user_settings_edit_account">계정 수정</string>
     <string name="user_settings_edit_account_password_label">변경을 확인하려면 비밀번호를 입력하세요</string>
     <string name="user_settings_edit_account_tag">태그</string>
+    <string name="user_settings_edit_profile">프로필 편집</string>
     <string name="user_settings_enter_password_view_codes">복구 코드를 보려면 비밀번호를 입력하세요.</string>
     <string name="user_settings_games_install_location">위치</string>
     <string name="user_settings_games_install_location_add">설치 위치 추가하기</string>
@@ -7523,6 +7526,8 @@
     <string name="user_settings_open_on_startup_label">Discord 열기</string>
     <string name="user_settings_privacy_terms">[이용 약관]({termsLink})과 [개인정보 보호 정책]({privacyLink})을 확인하세요.</string>
     <string name="user_settings_profile_banner">프로필 배너</string>
+    <string name="user_settings_remove_avatar">아바타 제거</string>
+    <string name="user_settings_remove_banner">배너 제거</string>
     <string name="user_settings_restart_app_mobile">새로운 설정을 적용하려면 앱을 재시작하세요.</string>
     <string name="user_settings_save">저장</string>
     <string name="user_settings_scan_qr_code">QR 코드 스캔</string>
@@ -7537,6 +7542,7 @@
     <string name="user_settings_upload_avatar">아바타 업로드하기</string>
     <string name="user_settings_upload_banner">배너 업로드</string>
     <string name="user_settings_used_backup_codes">사용한 복구 코드</string>
+    <string name="user_settings_user_profile">사용자 프로필</string>
     <string name="user_settings_voice_add_multiple">[단축키 설정](onClick)에서 눌러서 말하기 단축키를 여러 개 추가할 수 있어요.</string>
     <string name="user_settings_voice_codec_description">Discord는 최고의 Opus Voice 코덱만을 사용해요.</string>
     <string name="user_settings_voice_codec_title">오디오 코덱</string>
@@ -7774,25 +7780,6 @@
     <string name="widget">위젯</string>
     <string name="working">작업 중…</string>
     <string name="xbox_authorization_title">Xbox 계정 승인</string>
-    <string name="xbox_game_pass_card_body_claimed">획득하셨어요. 코드는 !!{code}!!예요. [자세히 알아보기](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">이 선물은 2021년 1월 15일까지 수령할 수 있어요. [간단히 보기](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">이 선물은 2021년 1월 15일까지 수령할 수 있어요. [자세히 알아보기](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">이 코드는 방금 보내드린 확인 이메일에서도 확인하실 수 있습니다.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">뭔가 잘못됐어요. 다시 시도해주세요.</string>
-    <string name="xbox_game_pass_modal_code_header">PC용 Xbox Game Pass 코드</string>
-    <string name="xbox_game_pass_modal_code_header_failed">이런</string>
-    <string name="xbox_game_pass_modal_header_description_success">[Microsoft 코드 또는 기프트 카드 사용 페이지]({redemptionURL})에서 아래 코드를 입력하면 PC용 Xbox Game Pass (3개월)를 받으실 수 있어요.</string>
-    <string name="xbox_game_pass_modal_header_success">좋았어요!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">부스트 구독 중이시군요. Nitro 구독 크레딧을 드릴게요. **{planName}**을(를) 구독하시면 Nitro 크레딧이 적용될 거예요.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">적용하기</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">이제 Nitro 크레딧이 있으시네요! 오늘 바로 **{planName}**을(를) 구독하여 Nitro 크레딧을 사용해보세요.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">좋았어요!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">구독 크레딧</string>
-    <string name="xbox_game_pass_promotion_banner_description">준비한 게 또 있어요. Nitro 구독자에게는 PC용 Xbox Game Pass 3개월권이 제공되죠. 지금부터 2021년 1월 15일까지 받으실 수 있답니다. [자세히 알아보기](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">준비한 게 또 있어요. Nitro 구독자에게는 PC용 Xbox Game Pass 3개월권이 제공되죠. 지금부터 2021년 1월 15일까지 받으실 수 있답니다. [간단히 보기](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">PC용 Xbox Game Pass 3개월권</string>
-    <string name="xbox_game_pass_promotion_card_header">PC용 Xbox Game Pass (3개월)</string>
-    <string name="xbox_game_pass_promotion_legalese">현재 혹은 이전의 PC용 Xbox Game Pass 멤버 또는 Xbox Game Pass 얼티밋 멤버는 해당되지 않아요. Xbox Game Pass 코드를 [microsoft.com/redeem](https://microsoft.com/redeem)에서 2021년 2월 15일까지 등록하세요. 신용카드가 필요해요. 무료 기간이 종료된 후 취소하지 않으면 매월 해당 시점의 일반 멤버십 요금이 청구돼요. Windows 10 S 모드와 ARM 기기는 지원하지 않아요. 게임 카탈로그는 때에 따라 달라집니다. [xbox.com/gamepass](https://xbox.com/gamepass)를 참고하세요. 이용자 또는 계정당 하나로 제한돼요.</string>
     <string name="xbox_link">연결</string>
     <string name="xbox_pin_step1">휴대전화에서 Discord 앱 열기</string>
     <string name="xbox_pin_step2">설정 &gt; 연결 &gt; 추가로 이동하세요.</string>
diff --git a/app/src/main/res/values-lt/plurals.xml b/app/src/main/res/values-lt/plurals.xml
index 07c734fd6f..bba533726a 100644
--- a/app/src/main/res/values-lt/plurals.xml
+++ b/app/src/main/res/values-lt/plurals.xml
@@ -619,16 +619,6 @@
         <item quantity="one">1 sav.</item>
         <item quantity="other">{minimumGuildAge} sav.</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">{#} kategorijos pavadinimą</item>
-        <item quantity="few">{#} kategorijų pavadinimus</item>
-        <item quantity="other">{#} kategorijų pavadinimus</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">{#} kanalo pavadinimą</item>
-        <item quantity="few">{#} kanalų pavadinimus</item>
-        <item quantity="other">{#} kanalų pavadinimus</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Paraiška, laukianti patvirtinimo</item>
         <item quantity="other">{count} Paraiškos, laukiančios patvirtinimo</item>
@@ -1280,11 +1270,12 @@
     </plurals>
     <plurals name="role_row_description_count">
         <item quantity="one">{count} narys</item>
-        <item quantity="other">{count} nariai</item>
+        <item quantity="other">{count} narių</item>
     </plurals>
     <plurals name="role_row_view_members_count">
-        <item quantity="one">{count} Narys</item>
-        <item quantity="other">{count} Nariai</item>
+        <item quantity="one">{count} narį</item>
+        <item quantity="few">{count} narius</item>
+        <item quantity="other">{count} narių</item>
     </plurals>
     <plurals name="roles_list_numRoles">
         <item quantity="one">1 vaidmuo</item>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 1d7f46b1dc..de7fc069d9 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -233,7 +233,7 @@
     <string name="age_gate_view_help_article">Žiūrėti pagalbos straipsnį</string>
     <string name="age_gate_your_birthday">Tavo gimimo data</string>
     <string name="aka">Taip pat žinomas kaip</string>
-    <string name="aka_more_avatars_overflow">Žiūrėti daugiau pseudoportretų serveriui</string>
+    <string name="aka_more_avatars_overflow">Žiūrėti daugiau serverio pseudoportretų</string>
     <string name="all_servers">Visi Serveriai</string>
     <string name="allow">Leisti</string>
     <string name="allow_direct_messages">Leisti asmenines žinutes</string>
@@ -913,17 +913,17 @@
     <string name="browser_notifications_enabled_body">Swoosh. Pranešimai įjungti!</string>
     <string name="browser_output_device_warning">Išvedimo įrenginiai negali būti pakeisti, kol naudojate naršyklę. [Atsisiųsk](onDownloadClick) kompiuterio versiją visiškam išvedimo įrenginių valdymui.</string>
     <string name="bug_hunter_badge_tooltip">Discord trikdžių medžiotojas</string>
-    <string name="bug_report_description">Detalus aprašymas (neprivaloma)</string>
-    <string name="bug_report_error_name_required">Reikalingas problemos pavadinimas</string>
-    <string name="bug_report_error_priority_required">Reikalinga svarba</string>
+    <string name="bug_report_description">Detalus aprašymas (nebūtina)</string>
+    <string name="bug_report_error_name_required">Būtina nurodyti problemos pavadinimą</string>
+    <string name="bug_report_error_priority_required">Būtina nurodyti svarbą</string>
     <string name="bug_report_name">Kokia problema?</string>
     <string name="bug_report_no_screenshot">Ekrano kopija pašalinta iš pranešimo</string>
     <string name="bug_report_priority">Svarba</string>
     <string name="bug_report_priority_critical_description">**Skubu ir svarbu.** Tai yra **kritinės** problemos, neleidžiančios **dideliam** skaičiui naudotojų naudotis svarbiausiomis programėlės funkcijomis.</string>
     <string name="bug_report_priority_critical_title">Kritinė (P0)</string>
-    <string name="bug_report_priority_high_description">**Skubu bet nesvarbu.** Tai yra problemos, paveikiančios naudotojo galimybę naudotis pagrindinėmis programėlės funkcijomis, bet netrukdančios naudotis kitomis programėlės dalimis.</string>
+    <string name="bug_report_priority_high_description">**Skubu, bet nesvarbu.** Tai yra problemos, paveikiančios naudotojo galimybę naudotis pagrindinėmis programėlės funkcijomis, bet netrukdančios naudotis kitomis programėlės dalimis.</string>
     <string name="bug_report_priority_high_title">Aukšta (P1)</string>
-    <string name="bug_report_priority_low_description">**Neskubu bet svarbu.** Tai yra problemos, neigiamai veikiančios naudotojo patirtį su programėle, bet aktyviai netrukdančios naudotis pagrindinėmis programėlės funkcijomis.</string>
+    <string name="bug_report_priority_low_description">**Neskubu, bet svarbu.** Tai yra problemos, neigiamai veikiančios naudotojo patirtį su programėle, bet aktyviai netrukdančios naudotis pagrindinėmis programėlės funkcijomis.</string>
     <string name="bug_report_priority_low_title">Žema (P2)</string>
     <string name="bug_report_priority_very_low_description">**Neskubu ir nesvarbu.** P3 leidžia mums pamatyti problemas, bet šio tipo problemų nereikia taisyti, kol yra skubesnių nesklandumų.</string>
     <string name="bug_report_priority_very_low_title">Labai žema (P3)</string>
@@ -1038,16 +1038,16 @@
     <string name="change_friend_nickname">Keisti draugo slapyvardį</string>
     <string name="change_guild_member_avatar">Pakeisti serverio pseudoportretą</string>
     <string name="change_icon">Keisti Piktogramą</string>
-    <string name="change_identity">Pakeisti tapatybę</string>
+    <string name="change_identity">Keisti tapatybę</string>
     <string name="change_identity_beta_tooltip">Skirtingų pseudoportretų kiekvienam serveriui nustatymas šiuo metu galimas tik ribotam žmonių skaičiui.</string>
     <string name="change_identity_guild_header_tooltip_button">Supratau</string>
-    <string name="change_identity_guild_header_tooltip_content">Naudok slapyvardį ir, jei turi Nitro, naudok skirtingus pseudoportretus kiekviename savo serveryje.</string>
+    <string name="change_identity_guild_header_tooltip_content">Naudok slapyvardį ir, jei turi Nitro, skirtingus pseudoportretus kiekviename savo serveryje.</string>
     <string name="change_identity_guild_header_tooltip_title">NAUJA! Pakeisti serverio tapatybę</string>
     <string name="change_identity_modal_change_nickname_disabled">Slapyvardis (išjungtas)</string>
     <string name="change_identity_modal_description">Gali pakeisti, kaip kiti mato tave šiame serveryje, nustatydamas serverio slapyvardį ir pseudoportretą.</string>
     <string name="change_identity_modal_per_server_section">Serverio pseudoportretas $[BETA](betaBadgeHook)</string>
     <string name="change_identity_modal_reset_primary_avatar">Atkurti pirminį pseudoportretą</string>
-    <string name="change_identity_modal_title">Pakeisti serverį</string>
+    <string name="change_identity_modal_title">Keisti serverį</string>
     <string name="change_identity_modal_unknown_error">Nežinoma klaida</string>
     <string name="change_identity_modal_uploader_cta">Pakeisti serverio pseudoportretą</string>
     <string name="change_identity_modal_upsell">Naudok skirtingus pseudoportretus kiekviename savo serveryje, atrakink animuotus pseudoportretus **ir dar daugiau su Discord Nitro!**</string>
@@ -1410,7 +1410,6 @@
     <string name="contact_sync_we_found_your_friends_body">Nuo šiol esi draugas (-ė) su jais Discord platformoje. Bendrauk su jais, kviesk juos į savo serverį, linksmai leisk laiką! Pranešime, kai prie Discord prisijungs naujų draugų.</string>
     <string name="contact_sync_we_found_your_friends_title">Radome tavo draugų!</string>
     <string name="content_matching">!!{command}!! turinio atitikmuo **!!{query}!!**</string>
-    <string name="context_menu_hint">Dešiniuoju pelės mygtuku spustelėk ant naudotojo, kad gautum daugiau veiksmų</string>
     <string name="continue_in_browser">Tęsti naršyklėje</string>
     <string name="continue_to_webapp">Toliau naudoti Discord</string>
     <string name="control_volume">Valdyti garsumą</string>
@@ -1844,7 +1843,7 @@
     <string name="developer_application_test_mode_placeholder">Programėlės ID</string>
     <string name="developer_mode">Programuotojo režimas</string>
     <string name="developer_mode_help_text">Įjungia Programuotojo režimą, kuris atskleidžia kontekstinio meniu elementus, naudingus žmonėms rašantiems botus su [Discord API]({apiDocsUrl}).</string>
-    <string name="developer_settings_bug_reporting_description">Leidžia išsiųsti trikties pranešimą Discord po to, kai padaroma ekrano kopija</string>
+    <string name="developer_settings_bug_reporting_description">Leidžia išsiųsti trikties pranešimą Discord, kai padaroma ekrano kopija</string>
     <string name="developer_settings_bug_reporting_title">Padaryti ekrano kopiją, kad praneštum apie triktį</string>
     <string name="device_settings">Įrenginio nustatymai</string>
     <string name="dialog_just_so_you_know">Informuojame, kad žinotum.</string>
@@ -2876,7 +2875,7 @@
     <string name="guild_join_reason_other">Kita</string>
     <string name="guild_join_reason_search_online">Ieškojau serverio internete</string>
     <string name="guild_join_reason_title_label">Tavo atsakymas</string>
-    <string name="guild_member_avatar_upsell_body">Būk kuo nori būti ir naudok skirtingus pseudoportretus kiekviename savo serveryje, atrakink animuotus pseudoportretus, [ir dar daugiau su Discord Nitro!](onAndMore)</string>
+    <string name="guild_member_avatar_upsell_body">Būk, kuo nori būti, ir naudok skirtingus pseudoportretus kiekviename savo serveryje, atrakink animuotus pseudoportretus [ir dar daugiau su Discord Nitro!](onAndMore)</string>
     <string name="guild_member_avatar_upsell_title">Ar nori naudoti kitą pseudoportretą?</string>
     <string name="guild_members_header">!!{guild}!! nariai</string>
     <string name="guild_members_search_no_result">Nerasta jokių narių.</string>
@@ -3198,8 +3197,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Atradimo sąraše esantys serveriai turi būti bent {minimumGuildAge} senumo. Sugrįžk {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Serveris per naujas</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Tavo serveris **$[neatitinka](doesNotHook)** visų įtraukimo į serverių atradimo sąrašą reikalavimų.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Turi pakeisti {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Turi pakeisti {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Turi pakeisti $[aprašą](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Turi pakeisti $[serverio pavadinimą](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Padidink bendraujančių lankytojų per savaitę skaičių</string>
@@ -4423,7 +4420,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle">Pagerink jaustukus, suasmenink savo profilį ir išsiskirk savo serveriuose.</string>
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Pagerink jaustukus, suasmenink savo profilį ir išsiskirk savo serveriuose. Rinkis **!!{monthlyPrice}!! per mėnesį** arba **!!{yearlyPrice}!! per metus**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Mėgaukis geresne Discord patirtimi</string>
-    <string name="marketing_tier_1_perk_list_boost_discount">30%% nuolaida serverio stiprinimams</string>
+    <string name="marketing_tier_1_perk_list_boost_discount">30 %% nuolaida serverio stiprinimams</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Iki 1080p raiška ir iki 60 kadr./sek.</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB įkėlimas vietoje 100 MB</string>
     <string name="masked_link_body">Ši nuoroda peradresuos tave į **!!{url}!!**. Ar tikrai nori ten eiti?</string>
@@ -4924,8 +4921,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Liko {days}, kad galėtum naudotis Nitro nemokamai visą mėnesį</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Liko {hours}, kad galėtum naudotis Nitro nemokamai visą mėnesį</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Liko {minutes}, kad galėtum naudotis Nitro nemokamai visą mėnesį</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Labas, Nitro prenumeratoriau, sveikiname! Nuo savęs pridedame kompiuteriams skirtą 3 mėnesių Xbox Game Pass!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Atsiimti</string>
     <string name="notice_product_feedback_survey">Ar norėtum dalyvauti atsiliepimų apie produktą diskusijose su mumis?</string>
     <string name="notice_product_feedback_survey_cta">Pranešk mums čia!</string>
     <string name="notice_register_to_vote">Ar esi registruotas, kad galėtum balsuoti? Peržiūrėk savo būseną ir užsiregistruok per dvi minutes.</string>
@@ -5037,7 +5032,7 @@
     <string name="nux_navigation_help_guild">Serveris – ypatingų pranašumų suteikiantis grupinis pokalbis, kur žmonės susirenka pabendrauti</string>
     <string name="nux_notification_permission_alert_title">Leisti pranešimus</string>
     <string name="nux_notification_permission_prompt_subtitle">Nieko nepraleisk! Nustatyk pranešimus, kad žinotum, kada draugai tau atsiunčia žinutę.</string>
-    <string name="nux_notification_permission_prompt_text">Gausi push pranešimus apie tokias Discord veiklas kaip žinutės, draugų užklausos ir renginiai.</string>
+    <string name="nux_notification_permission_prompt_text">Gausi push pranešimus apie tokias Discord veiklas, kaip žinutės, draugų užklausos ir renginiai.</string>
     <string name="nux_overlay_description">Matyk, kas kalba, ir pasiek sparčiuosius klavišus, kai naudoji kitas programėles, kad nereikėtų persijungti į Discord.</string>
     <string name="nux_overlay_enable">Įgalinti Perdanga</string>
     <string name="nux_overlay_title">Susipažink su mobiliojo garso persidengimu!</string>
@@ -5112,6 +5107,7 @@
     <string name="out_of_date_action">Atnaujinti Discord</string>
     <string name="out_of_date_description">Mes turime saldžių pakeitimų Discord (ir tikriausiai keletas klaidų taisymų). Atnaujink, kad galėtum tęsti.</string>
     <string name="out_of_date_title">Jūs esate pasenęs</string>
+    <string name="outbound_promotion_redemption_modal_title">Nuostabu!</string>
     <string name="outgoing_friend_request">Išsiųsta Draugo Užklausa</string>
     <string name="outgoing_friend_request_delete_msg">Ar tikrai nori naikinti kvietimą draugauti su **!{name}! **?</string>
     <string name="outgoing_friend_request_to">Prašymas draugauti išsiųstas !!{name}!!</string>
@@ -5247,7 +5243,7 @@
     <string name="pending">Laukiama</string>
     <string name="pending_friends_list_header">Laukiantys draugai</string>
     <string name="people">Žmonės</string>
-    <string name="per_guild_avatars_premium_feature_description">Būk kuo nori būti ir naudok skirtingus pseudoportretus kiekviename savo serveryje.</string>
+    <string name="per_guild_avatars_premium_feature_description">Būk, kuo nori būti, ir naudok skirtingus pseudoportretus kiekviename savo serveryje.</string>
     <string name="per_guild_avatars_premium_feature_title">Keli pseudoportretai</string>
     <string name="percentage_since_last_week">{percentage} %% nuo praėjusios savaitės</string>
     <string name="permission_helpdesk">Reikia pagalbos su leidimais?</string>
@@ -5359,7 +5355,7 @@
     <string name="premium_features_chat_perks_header">Gauk ypatingų funkcijų suteikiančių pokalbių pranašumų!</string>
     <string name="premium_features_message_length_heading">Ilgesnės žinutės</string>
     <string name="premium_features_message_length_subheading">Galėsi dar geriau išreikšti savo mintis, nes turėsi daugiau simbolių.</string>
-    <string name="premium_features_profile_customization_header">Personalizuok savo profilį</string>
+    <string name="premium_features_profile_customization_header">Suasmenink savo profilį</string>
     <string name="premium_features_profile_customization_subheader">Išreikšk save su animuotu pseudoportretu, profilio reklamjuoste ir pritaikyta žyme.</string>
     <string name="premium_game">Discord Nitro žaidimas</string>
     <string name="premium_gift_button_label">Siųsti dovaną</string>
@@ -5790,12 +5786,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Norint sukurti šį privatų kanalą, reikalingas leidimas **peržiūrėti kanalus**.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Norint sukurti šį privatų kanalą, reikalingas leidimas **peržiūrėti kanalus** ir **prisijungti**.</string>
     <string name="profile">Profilis</string>
+    <string name="profile_banner_icon_tooltip_upsell">Įkelk savo suasmenintą reklamjuostę ir dar daugiau, naudodamas Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Šiuo metu profilio pritaikymo funkcijos pasiekiamos ribotam žmonių skaičiui.</string>
+    <string name="profile_customization_bio_placeholder">Papasakok pasauliui šiek tiek apie save</string>
     <string name="profile_customization_marketing_tooltip_body">Išreikšk save papasakodamas apie save ir naudodamas profilio reklamjuostę, jei turi Nitro!</string>
     <string name="profile_customization_marketing_tooltip_cta">Supratau</string>
     <string name="profile_customization_marketing_tooltip_header">Naujos profilio pritaikymo funkcijos!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Tik Nitro</string>
     <string name="promotion_card_action_claim">Atsiimti</string>
-    <string name="promotion_card_body_claimed_hidden">Jau gavai, tačiau kodas paslėptas dėl transliavimo režimo.</string>
     <string name="promotion_error_body">Kažkas negerai, todėl negali naudoti šio kodo. Atsiprašome.</string>
     <string name="promotion_error_title">Sekundėlę…</string>
     <string name="promotion_existing_subscriber_title">O ne!</string>
@@ -5989,7 +5987,7 @@
     <string name="request_to_speak_invitation_send">Pakvietimas Išsiųstas</string>
     <string name="request_to_speak_list_title">Prašymai leisti kalbėti: {numHands}</string>
     <string name="request_to_speak_member_info_member">Narys</string>
-    <string name="request_to_speak_member_info_member_roles">Nariai su vaidmeniu (vaidmenimis)</string>
+    <string name="request_to_speak_member_info_member_roles">Nariai su vaidmeniu (-imis)</string>
     <string name="request_to_speak_member_info_new_member">Naujas narys</string>
     <string name="request_to_speak_member_info_non_member">Lankytojas (ne narys)</string>
     <string name="resend">Siųsti iš naujo</string>
@@ -6704,51 +6702,50 @@
     <string name="stage_voice_channel">Scenos kanalas</string>
     <string name="start">Pradėti</string>
     <string name="start_call">Pradėti pokalbį</string>
-    <string name="start_stage_button_text">Pradėti sceną</string>
-    <string name="start_stage_button_text_mobile">Pradėti sceną</string>
+    <string name="start_stage_button_text">Pradėti scenos kanalą</string>
+    <string name="start_stage_button_text_mobile">Pradėti scenos kanalą</string>
     <string name="start_stage_channel_event_members_subtitle">Prisijungti gali tik jūsų serverio nariai.</string>
     <string name="start_stage_channel_event_members_title">Tik nariams</string>
     <string name="start_stage_channel_event_modal_button">Pradėti scenos kanalą</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Tu būsi kalbėtojas, kai scenos kanalas bus atidarytas.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Parašyk temą, kad praneštum, jog tavo scenos kanalas jau tiesioginiame eteryje.</string>
     <string name="start_stage_channel_event_modal_title">Apie ką kalbėsitės?</string>
     <string name="start_stage_channel_event_modal_topic_label">Scenos kanalo tema</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Diskusijos baigtos: dietinė yra geresnė už įprastą</string>
     <string name="start_stage_channel_event_modal_topic_required">Turi nurodyti temą. Tokia mūsų sugalvota taisyklė.</string>
     <string name="start_stage_channel_event_privacy_title">Privatumas</string>
     <string name="start_stage_channel_event_public_everyone_warning">Gali pradėti scenos kanalus tik kanaluose, kurie pasiekiami visiems (@everyone).</string>
-    <string name="start_stage_channel_event_public_explanation">Žmonės, kurie klausosi, taip pat galės prisijungti prie jūsų serverio, kol scena veikia. Vieši Scenų kanalai turi atitikti [papildomas gaires.]({articleURL})</string>
+    <string name="start_stage_channel_event_public_explanation">Žmonės, kurie klausosi, taip pat galės prisijungti prie jūsų serverio, kol scenos kanalas veikia. Vieši scenos kanalai turi atitikti [papildomas gaires.]({articleURL})</string>
     <string name="start_stage_channel_event_public_permanent_disclaimer">Viešos scenos negali būti uždarytos.</string>
     <string name="start_stage_channel_event_public_permissions_disclaimer">Tik scenos moderatoriai, turintys kviestinių narių leidimą, gali paviešinti savo sceną.</string>
     <string name="start_stage_channel_event_public_subtitle">Tavo scenos kanalas bus įtrauktas į scenos kanalų atradimo funkciją. Jo klausytis gali visi norintieji!</string>
     <string name="start_stage_channel_event_public_title">Vieša</string>
     <string name="start_stage_modal_confirm_text">Pradėti scenos kanalą</string>
-    <string name="start_stage_modal_select_channel">Pasirinkite Scenos kanalą</string>
-    <string name="start_stage_modal_server_modal_label">Pradėti sceną</string>
+    <string name="start_stage_modal_select_channel">Pasirinkite scenos kanalą</string>
+    <string name="start_stage_modal_server_modal_label">Pradėti scenos kanalą</string>
     <string name="start_stage_modal_server_selection_bullet_1">Sukurk [bendruomenės serverį.]({helpdeskArticle})</string>
-    <string name="start_stage_modal_server_selection_bullet_2">Sukurti scenos kanalą.</string>
-    <string name="start_stage_modal_server_selection_bullet_3">Sugalvoti puikų renginį.</string>
-    <string name="start_stage_modal_server_selection_bullet_4">Pradėk ir atidaryk savo Sceną!</string>
+    <string name="start_stage_modal_server_selection_bullet_2">Sukurk scenos kanalą.</string>
+    <string name="start_stage_modal_server_selection_bullet_3">Sugalvok puikų renginį.</string>
+    <string name="start_stage_modal_server_selection_bullet_4">Pradėk ir atidaryk savo scenos kanalą!</string>
     <string name="start_stage_modal_server_selection_button_hint">Nori sužinoti daugiau?</string>
-    <string name="start_stage_modal_server_selection_button_text">Išmok suorganizuoti puikią Sceną</string>
-    <string name="start_stage_modal_server_selection_empty_title">Dar negali pradėti Scenos</string>
-    <string name="start_stage_modal_server_selection_subtitle">Įtrauk ir augink savo bendruomenę su Scenų kanalais.</string>
-    <string name="start_stage_modal_server_selection_title">Kurioje bendruomenėje nori rengti audio renginį?</string>
-    <string name="start_stage_modal_set_topic_change_channel">Tavo Scena bus $[**!!{stageName}!!**](stageHook). $[Pakeisti kanalą](changeHook)</string>
-    <string name="start_stage_modal_set_topic_create_channel">Mes automatiškai sukursime tau Scenos kanalą pavadinimu $[**!!{stageName}!!**](stageHook). Vėliau galėsi pakeisti pavadinimą.</string>
-    <string name="start_stage_modal_set_topic_help_text">Tavo Scena bus $[**!!{stageName}!!**](stageHook).</string>
+    <string name="start_stage_modal_server_selection_button_text">Išmok organizuoti puikų scenos kanalą</string>
+    <string name="start_stage_modal_server_selection_empty_title">Dar negali pradėti scenos kanalo</string>
+    <string name="start_stage_modal_server_selection_subtitle">Įtrauk ir plėsk savo bendruomenę su scenos kanalais.</string>
+    <string name="start_stage_modal_server_selection_title">Kurioje bendruomenėje nori rengti garso renginį?</string>
+    <string name="start_stage_modal_set_topic_change_channel">Tavo scenos kanalas bus $[**!!{stageName}!!**](stageHook). $[Pakeisti kanalą](changeHook)</string>
+    <string name="start_stage_modal_set_topic_create_channel">Automatiškai sukursime tau scenos kanalą pavadinimu $[**!!{stageName}!!**](stageHook). Vėliau pavadinimą galėsi pakeisti.</string>
+    <string name="start_stage_modal_set_topic_help_text">Tavo scenos kanalas bus $[**!!{stageName}!!**](stageHook).</string>
     <string name="start_stage_modal_set_topic_select_label">Scenos kanalas</string>
     <string name="start_stage_modal_set_topic_subtitle">Parašyk temą, kad praneštum, jog tavo scenos kanalas jau tiesioginiame eteryje.</string>
     <string name="start_stage_modal_set_topic_title">Apie ką kalbėsitės?</string>
     <string name="start_stage_public_confirm">Padarykime tai</string>
     <string name="start_stage_public_info_alt_text">Atliekantys žmonės</string>
-    <string name="start_stage_public_info_section_four">Vieši scenų kanalai negali pristatinėti intymaus, grafinio ar seksualinio turinio; be to, įsitikink, kad tavo tema yra tiksli ir aiškiai aprašyta.</string>
+    <string name="start_stage_public_info_section_four">Vieši scenos kanalai negali pristatinėti nepadoraus, atviro pobūdžio ar seksualinio turinio, o tema turi būti tiksli ir aiškiai aprašyta.</string>
     <string name="start_stage_public_info_section_one">Šis scenos kanalas bus įtrauktas į scenos kanalų atradimo funkciją. Jo klausytis gali visi norintieji!</string>
-    <string name="start_stage_public_info_section_three">Vieši Scenų kanalai turi atitikti kelias papildomas taisykles. [Pilnas gaires skaityk čia.]({articleURL})</string>
+    <string name="start_stage_public_info_section_three">Vieši scenos kanalai turi atitikti kelias papildomas taisykles. [Išsamias gaires skaityk čia.]({articleURL})</string>
     <string name="start_stage_public_info_section_two">Kol šis scenos kanalas transliuojamas gyvai, klausytojai gali prisijungti prie tavo serverio ir tapti tavo bendruomenės dalimi.</string>
-    <string name="start_stage_public_info_title">Tavo scena tampa vieša!</string>
+    <string name="start_stage_public_info_title">Tavo scenos kanalas tampa viešas!</string>
     <string name="start_stage_public_info_title_caption">Keli dalykai, kuriuos turėtum žinoti.</string>
-    <string name="start_stage_public_short_topic_warning">Ar tavo tema pakankamai išsami? Įsitikink, kad aprašymas aiškus, kad žmonės, naršantys su Scenų kanalų atradimo funkcija galėtų lengvai suprasti, apie ką yra tavo Scenos kanalas ir bendruomenė.</string>
+    <string name="start_stage_public_short_topic_warning">Ar tavo tema pakankamai išsami? Įsitikink, kad aprašymas aiškus, kad žmonės, naršantys su scenos kanalų atradimo funkcija galėtų lengvai suprasti, apie ką yra tavo scenos kanalas ir bendruomenė.</string>
     <string name="start_video_call">Pradėti vaizdo skambutį</string>
     <string name="start_voice_call">Pradėti skambutį</string>
     <string name="starting_at">Pradžia</string>
@@ -6860,7 +6857,7 @@
     <string name="stream_no_preview">Transliaciją ką tik prasidėjo. Prisijunk!</string>
     <string name="stream_participants_hidden">Dalyviai, kurie neturi vaizdo, šiuo metu yra paslėpti. Ar nori juos rodyti?</string>
     <string name="stream_playing">Žaidžia !!{game}!!</string>
-    <string name="stream_premium_upsell_body">Transliuok HD 60 kadrų per sekundę sparta, gauk prieigą prie pokalbių pranašumų [ir dar daugiau su Discord Nitro!](onPressMore)!</string>
+    <string name="stream_premium_upsell_body">Transliuok HD raiška 60 kadrų per sekundę sparta, gauk prieigą prie pokalbių pranašumų [ir dar daugiau su Discord Nitro!](onPressMore)!</string>
     <string name="stream_premium_upsell_body_no_cta">Transliuok HD 60 kadrų per sekundę sparta naudodamas Discord Nitro, gauk prieigą prie pokalbių pranašumų ir dar daugiau!</string>
     <string name="stream_premium_upsell_cta">Prenumeruoti</string>
     <string name="stream_premium_upsell_header">Įgalink HD vaizdo transliavimą naudodamas Discord Nitro</string>
@@ -6922,7 +6919,7 @@
     <string name="streaming_a_game">Transliuojamas žaidimas</string>
     <string name="sub_enabled_servers">Iš Dalies Įgalinti Serveriai</string>
     <string name="submit">Pateikti</string>
-    <string name="submit_bug">Pateikti trikties pranešima</string>
+    <string name="submit_bug">Pateikti trikties pranešimą</string>
     <string name="subscriber_information">Prenumeratoriaus Informacija</string>
     <string name="subscription_payment_legalese_monthly">Sveikas! Tu perki pratęsiamąją prenumeratą, o tai reiškia, kad nuskaitysime mokestį šiandien ir kas mėnesį, kol atšauksi prenumeratą. Tačiau gali ją bet kada atšaukti Nustatymų puslapyje!</string>
     <string name="subscription_payment_legalese_yearly">Sveikas! Tu perki pratęsiamąją prenumeratą, o tai reiškia, kad nuskaitysime mokestį šiandien ir kas metus, kol atšauksi prenumeratą. Tačiau gali ją bet kada atšaukti Nustatymų puslapyje!</string>
@@ -7397,6 +7394,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Push pranešimai neleidžiami</string>
     <string name="user_settings">Naudotojo Nustatymai</string>
     <string name="user_settings_about_me">Apie mane</string>
+    <string name="user_settings_about_me_description">Parašyk apie save, ką tik nori, tik neviršyk maksimalaus simbolių skaičiaus – {maxLength}. Jei nori, gali naudoti ženklinimą ir nuorodas.</string>
     <string name="user_settings_account_change_email_prompt">Dabartinis tavo el. pašto adresas yra !!{email}!! Į kokį jį nori pakeisti?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Įvesk naują el. pašto adresą ir dabartinį slaptažodį.</string>
     <string name="user_settings_account_change_email_title">Redaguoti el. paštą</string>
@@ -7431,6 +7429,8 @@
     <string name="user_settings_appearance_preview_message_5">O, štai jis!</string>
     <string name="user_settings_appearance_zoom_tip">Galite keisti mastelio lygį su {modKey} +/– ir iš naujo nustatyti numatytąją mastelį su {modKey} + 0.</string>
     <string name="user_settings_available_codes">Pasiekiami atsarginių kopijų kodai</string>
+    <string name="user_settings_avatar">Pseudoportretas</string>
+    <string name="user_settings_banner_specs">Rekomenduojame bent 600 x 240 dydžio paveikslėlį. Gali įkelti PNG, JPG arba animuotą GIF.</string>
     <string name="user_settings_blocked_users">Užblokuoti naudotojai</string>
     <string name="user_settings_blocked_users_empty">Neturi užblokuotų naudotojų</string>
     <string name="user_settings_blocked_users_header">Užblokuotų naudotojų: {numberOfBlockedUsers}</string>
@@ -7439,12 +7439,14 @@
     <string name="user_settings_close_button">Uždarymo Mygtukas</string>
     <string name="user_settings_confirm_logout">Ar tikrai nori atsijungti?</string>
     <string name="user_settings_customization_upsell">Gauk su Nitro</string>
+    <string name="user_settings_customize_profile_title">Mano profilio tinkinimas</string>
     <string name="user_settings_delete_avatar">Šalinti avatarą</string>
     <string name="user_settings_disable_advanced_voice_activity">Jei automatinis įvesties jautrumas neaptinka tavo balso, gali būti, kad tai pasikeis išjungus šią funkciją.</string>
     <string name="user_settings_disable_noise_suppression">Kol įjungtas triukšmo slopinimas, triukšmo mažinimo funkcija išjungiama.</string>
     <string name="user_settings_edit_account">Redaguoti paskyrą</string>
     <string name="user_settings_edit_account_password_label">Įvesk slaptažodį, kad patvirtintum pakeitimus</string>
     <string name="user_settings_edit_account_tag">ŽYMĖ</string>
+    <string name="user_settings_edit_profile">Redaguoti profilį</string>
     <string name="user_settings_enter_password_view_codes">Įvesk slaptažodį, kad peržiūrėtum atsarginių kopijų kodus.</string>
     <string name="user_settings_games_install_location">Vieta</string>
     <string name="user_settings_games_install_location_add">Pridėti Diegimo Vietą</string>
@@ -7495,6 +7497,8 @@
     <string name="user_settings_open_on_startup_label">Atidaryti Discord</string>
     <string name="user_settings_privacy_terms">Peržiūrėk mūsų [Paslaugų teikimo sąlygas]({termsLink}) ir [Privatumo politiką]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profilio reklamjuostė</string>
+    <string name="user_settings_remove_avatar">Šalinti pseudoportretą</string>
+    <string name="user_settings_remove_banner">Šalinti reklamjuostę</string>
     <string name="user_settings_restart_app_mobile">Paleisk programėlę iš naujo, kad įsigaliotų naujosios nuostatos.</string>
     <string name="user_settings_save">Išsaugoti</string>
     <string name="user_settings_scan_qr_code">Nuskaityti QR kodą</string>
@@ -7509,6 +7513,7 @@
     <string name="user_settings_upload_avatar">Įkelti avatarą</string>
     <string name="user_settings_upload_banner">Įkelti reklamjuostę</string>
     <string name="user_settings_used_backup_codes">Panaudoti atsarginių kopijų kodai</string>
+    <string name="user_settings_user_profile">Naudotojo profilis</string>
     <string name="user_settings_voice_add_multiple">Push to Talk funkciją gali susieti su daugiau nei vienu klavišu — [Keybind Settings](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord naudoja tik geriausią organišką vietoje užaugintą Opus Voice kodavimą.</string>
     <string name="user_settings_voice_codec_title">Garso Kodavimas</string>
@@ -7745,25 +7750,6 @@
     <string name="widget">Valdiklis</string>
     <string name="working">Dirbama…</string>
     <string name="xbox_authorization_title">Xbox Paskyrų Autorizavimas</string>
-    <string name="xbox_game_pass_card_body_claimed">Jau gavai. Pateikiame tavo kodą – !!{code}!!. [Daugiau informacijos](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Dovanos kodą galima panaudoti iki 2021 m. sausio 15 d. [Mažiau informacijos](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Dovanos kodą galima panaudoti iki 2021 m. sausio 15 d. [Daugiau informacijos](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Šis kodas taip pat bus patvirtinimo el. laiške, kurį tau išsiuntėme.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Kažkas negerai, bandyk dar kartą vėliau!</string>
-    <string name="xbox_game_pass_modal_code_header">Tavo kompiuteriui skirto Xbox Game Pass kodas</string>
-    <string name="xbox_game_pass_modal_code_header_failed">O ne</string>
-    <string name="xbox_game_pass_modal_header_description_success">Panaudok toliau nurodytą kodą [Microsoft kodų naudojimo svetainėje]({redemptionURL}) ir gauk kompiuteriui skirtą 3 mėnesių Xbox Game Pass prenumeratą.</string>
-    <string name="xbox_game_pass_modal_header_success">Nuostabu!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Kadangi turi stiprinimo prenumeratą, duosime tau Nitro prenumeratos kreditą. Nitro kreditas bus pritaikytas, kai užsiprenumeruosi **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Panaudok</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Gavai Nitro kreditą! Užsiprenumeruok **{planName}** šiandien ir pritaikyk savo Nitro kreditą.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Jėga!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Prenumeratos kreditas</string>
-    <string name="xbox_game_pass_promotion_banner_description">Ir tai dar ne viskas. Dabar Nitro prenumeratoriams suteikiamas 3 mėnesių kompiuteriui skirtas Xbox Game Pass. Galima pasinaudoti dabar, iki 2021 m. sausio 15 d. [Daugiau informacijos](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Ir tai dar ne viskas. Dabar Nitro prenumeratoriams suteikiamas 3 mėnesių kompiuteriui skirtas Xbox Game Pass. Galima pasinaudoti dabar, iki 2021 m. sausio 15 d. [Mažiau informacijos](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">Kompiuteriui skirtas 3 mėnesių Xbox Game Pass</string>
-    <string name="xbox_game_pass_promotion_card_header">Kompiuteriui skirtas Xbox Game Pass (3 mėnesių)</string>
-    <string name="xbox_game_pass_promotion_legalese">Netaikoma dabartiniams arba ankstesniems kompiuteriui skirto Xbox Game Pass nariams arba dabartiniams Xbox Game Pass Ultimate nariams. Panaudok Xbox Game Pass kodą (-us) adresu [microsoft.com/redeem](https://microsoft.com/redeem) iki 2021 m. vasario 15 d. Reikia pateikti kredito kortelės numerį. Pasibaigus akcijos laikotarpiui, kiekvieną mėnesį reikės mokėti tuo metu taikomą įprastą narystės mokestį, jei neatšauksi. Nepalaikoma Windows 10, kai nustatytas S režimas, ir ARM įrenginiuose. Žaidimų katalogas su laiku keičiamas. Žr. [xbox.com/gamepass](https://xbox.com/gamepass). Apribojimas: 1 asmeniui / paskyrai.</string>
     <string name="xbox_link">Nuoroda</string>
     <string name="xbox_pin_step1">Atidaryk Discord programėlę savo telefone</string>
     <string name="xbox_pin_step2">Eik į Nustatymai &gt; Sąsajos &gt; Pridėti</string>
diff --git a/app/src/main/res/values-nl/plurals.xml b/app/src/main/res/values-nl/plurals.xml
index 65d9f9b745..bf3bd83779 100644
--- a/app/src/main/res/values-nl/plurals.xml
+++ b/app/src/main/res/values-nl/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 week</item>
         <item quantity="other">{minimumGuildAge} weken</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">categorienaam</item>
-        <item quantity="other">categorienamen</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">kanaalnaam</item>
-        <item quantity="other">kanaalnamen</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">verzoek in behandeling</item>
         <item quantity="other">{count} verzoeken in behandeling</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index eb05102c0b..f97b5a9f5a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1015,7 +1015,7 @@
     <string name="change_identity_modal_uploader_cta">Serveravatar wijzigen</string>
     <string name="change_identity_modal_upsell">Gebruik een andere avatar op al je servers en nog veel meer met **Discord Nitro!**</string>
     <string name="change_log">Logboek</string>
-    <string name="change_log_md_body">Nieuwe functies {added marginTop}\n======================\n\n* **Podiumontdekking toegevoegd.** Ontdek community\'s die live podiums hosten (audio-evementen zoals concerten, panels, talentenjachten en alle andere vreemde maar legale dingen die je kunt bedenken) door op de nieuwe Ontdekking-tab te tikken. \n* **\'Zoek je vrienden\' is nu beschikbaar.** We hebben een optionele manier toegevoegd om makkelijker vrienden te vinden op Discord. Als je het telefoonnummer van een vriend(in) hebt en jullie kiezen er beiden voor om vindbaar te zijn, dan kunnen jullie elkaar vinden en een vriendschapsverzoek sturen. Een mooie kans om een ongemakkelijk gesprek te beginnen, zoals: \"Als je een verzoek krijgt van xXSoulzLuverXx#0000, dan ben ik dat.\"\n* **Favoriete emoji toegevoegd.** Tik op een emoji in de chat of hou hem lang ingedrukt in de emojikiezer om hem aan je favorieten toe te voegen of daaruit te verwijderen. Je favorieten worden *nog* niet gesynchroniseerd op je desktop, maar je kunt wel vast ontdekken welke 5 van je 2459 emoji\'s je daadwerkelijk gebruikt.\n* **Paginering aan de zoekbalk toegevoegd.** Je hoeft niet langer eindeloos door de zoekresultaten te scrollen. Je kunt naar andere pagina\'s springen om het exacte bewijs te vinden dat je nodig hebt om aan je vriend te laten zien dat hij dat ene zes maanden geleden echt heeft gezegd, ook al weet je niet meer wat het was. Dus zoek je het op omdat je zeker weet dat hij dat écht heeft gezegd.\n* **Spraakkanaalgeluiden toegevoegd:** Je telefoon maakt nu geluid wanneer je deelneemt aan een spraakkanaal, er een verlaat of erin verplaatst wordt. Deze geluiden kan ik angstaanjagend goed in mijn hoofd afspelen. Ba-dum... ba-da-doe...\n\n\n\n\nProbleemoplossingen en updates {progress}\n======================\n\n* **Geen pings meer na bewerken!** Wanneer je een reactie bewerkt, ontvangt de auteur van het bericht waar je op reageerde daar in de meeste gevallen geen melding meer van, want ik wilde gewoon ongezien mijn spelfout aanpassen en nu schaam ik me kapot.\n* **Verbeteringen servermap.** Je kunt je servermappen nu als gelezen markeren! We hebben ook servermapinstellingen toegevoegd zodat je aanpasbare namen en kleuren kunt gebruiken.\n* **Grote verbeteringen en probleemoplossingen voor Lidmaatschapscreening.** Je komt niet meer vast te zitten op deze pagina\'s.\n* **Je hebt nu makkelijker toegang tot je invoermodus.** Je kunt je instellingen voor push-to-talk en je spraakactiviteit nu makkelijker wijzigen zonder het oproepscherm te verlaten.\n\n\n</string>
+    <string name="change_log_md_body">Nieuwe functies {added marginTop}\n======================\n\n* **\'Zoek je vrienden\' is nu beschikbaar.** We hebben een optionele manier toegevoegd om makkelijker vrienden te vinden op Discord. Als je het telefoonnummer van een vriend(in) hebt en jullie kiezen er beiden voor om vindbaar te zijn, dan kunnen jullie elkaar vinden en een vriendschapsverzoek sturen. Een mooie kans om een ongemakkelijk gesprek te beginnen, zoals: \"Als je een verzoek krijgt van xXSoulzLuverXx#0000, dan ben ik dat.\"\n* **Favoriete emoji toegevoegd.** Tik op een emoji in de chat of hou hem lang ingedrukt in de emojikiezer om hem aan je favorieten toe te voegen of daaruit te verwijderen. Je favorieten worden *nog* niet gesynchroniseerd op je desktop, maar je kunt wel vast ontdekken welke 5 van je 2459 emoji\'s je daadwerkelijk gebruikt.\n* **Paginering aan de zoekbalk toegevoegd.** Je hoeft niet langer eindeloos door de zoekresultaten te scrollen. Je kunt naar andere pagina\'s springen om het exacte bewijs te vinden dat je nodig hebt om aan je vriend te laten zien dat hij dat ene zes maanden geleden echt heeft gezegd, ook al weet je niet meer wat het was. Dus zoek je het op omdat je zeker weet dat hij dat écht heeft gezegd.\n* **Spraakkanaalgeluiden toegevoegd:** Je telefoon maakt nu geluid wanneer je deelneemt aan een spraakkanaal, er een verlaat of erin verplaatst wordt. Deze geluiden kan ik angstaanjagend goed in mijn hoofd afspelen. Ba-dum... ba-da-doe...\n\n\n\n\nProbleemoplossingen en updates {progress}\n======================\n\n* **Geen pings meer na bewerken!** Wanneer je een reactie bewerkt, ontvangt de auteur van het bericht waar je op reageerde daar in de meeste gevallen geen melding meer van, want ik wilde gewoon ongezien mijn spelfout aanpassen en nu schaam ik me kapot.\n* **Verbeteringen servermap.** Je kunt je servermappen nu als gelezen markeren! We hebben ook servermapinstellingen toegevoegd zodat je aanpasbare namen en kleuren kunt gebruiken.\n* **Grote verbeteringen en probleemoplossingen voor Lidmaatschapscreening.** Je komt niet meer vast te zitten op deze pagina\'s.\n* **Je hebt nu makkelijker toegang tot je invoermodus.** Je kunt je instellingen voor push-to-talk en je spraakactiviteit nu makkelijker wijzigen zonder het oproepscherm te verlaten.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">nl</string>
     <string name="change_log_md_revision">1</string>
@@ -1374,7 +1374,6 @@
     <string name="contact_sync_we_found_your_friends_body">Jullie zijn nu vrienden op Discord. Praat, stuur een uitnodiging voor je server en maak plezier! We laten het je weten als er nieuwe vrienden van je op Discord komen.</string>
     <string name="contact_sync_we_found_your_friends_title">We hebben je vrienden gevonden!</string>
     <string name="content_matching">!!{command}!! content dat overeenkomt met **!!{query}!!**</string>
-    <string name="context_menu_hint">Klik met de rechtermuisknop voor meer acties</string>
     <string name="continue_in_browser">Ga door in browser</string>
     <string name="continue_to_webapp">Ga verder naar Discord</string>
     <string name="control_volume">Volume aanpassen</string>
@@ -3060,8 +3059,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Servers in Ontdekking moeten minstens {minimumGuildAge} oud zijn. Kom terug op {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server te jong</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Je server **$[voldoet niet](doesNotHook)** aan alle vereisten om in de serverontdekking te staan.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Je moet je {numCategories}: $[{categoryNames}](categoryHook) wijzigen</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Je moet je {numChannels}: $[{channelNames}](channelHook) wijzigen</string>
     <string name="guild_settings_discovery_checklist_change_description">Je moet je $[beschrijving](descriptionHook) wijzigen</string>
     <string name="guild_settings_discovery_checklist_change_name">Je moet je $[servernaam](nameHook) wijzigen</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Vergroot het aantal wekelijkse communicators</string>
@@ -3334,7 +3331,7 @@
     <string name="guild_settings_splash_info">Deze afbeelding wordt getoond als gebruikers een uitnodiging voor de server ontvangen.</string>
     <string name="guild_settings_splash_recommend">De aanbevolen minimumgrootte is 1920x1080 en de aanbevolen beeldverhouding is 16:9. [Meer informatie]({articleURL})</string>
     <string name="guild_settings_title_server_widget">Widget server</string>
-    <string name="guild_settings_widget_embed_help">Sluit deze HTML in op je website om de prachtige vooraf gemaakte widget van Discord te gebruiken. Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &amp;username= aan de querystring toevoegen.</string>
+    <string name="guild_settings_widget_embed_help">Sluit deze HTML in op je website om de prachtige vooraf gemaakte widget van Discord te gebruiken. Als je toegang hebt tot de gebruikers van je site, kun je dynamisch &amp;username= aan de querystring toevoegen.</string>
     <string name="guild_settings_widget_enable_widget">Widget server inschakelen</string>
     <string name="guild_sidebar_announcement_channel_a11y_label">!!{channelName}!! (aankondigingskanaal)</string>
     <string name="guild_sidebar_announcement_channel_a11y_label_with_mentions">{mentionCount}, !!{channelName}!! (aankondigingskanaal)</string>
@@ -4263,6 +4260,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Upgrade je emoji, personaliseer je profiel en val op op je servers. Kies voor **!!{monthlyPrice}!! per maand** of **!!{yearlyPrice}!! per jaar**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Krijg een verbeterde Discord-ervaring</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30%% korting op serverboosts</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Gebruik je zelfgemaakte en geanimeerde emoji op alle servers</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Een resolutie tot 1080p en maximaal 60 fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB upload in plaats van 100 MB</string>
     <string name="masked_link_body">Deze link leidt naar **!!{url}!!**. Weet je zeker dat je hier wilt zijn?</string>
@@ -4761,8 +4759,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Je hebt nog {days} om een gratis maand Nitro te krijgen</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Je hebt nog {hours} om een gratis maand Nitro te krijgen</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Je hebt nog {minutes} om een gratis maand Nitro te krijgen</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hé, Nitro-abonnee. Gefeliciteerd! Je krijgt van ons 3 maanden Xbox Game Pass voor pc.</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Claimen</string>
     <string name="notice_product_feedback_survey">Wil je deelnemen aan productfeedbackgesprekken met ons?</string>
     <string name="notice_product_feedback_survey_cta">Laat het ons hier weten!</string>
     <string name="notice_register_to_vote">Heb je je aangemeld om te stemmen? Check je status en regel het binnen twee minuten.</string>
@@ -4948,6 +4944,7 @@
     <string name="out_of_date_action">Werk Discord bij</string>
     <string name="out_of_date_description">We hebben een aantal leuke wijzigingen in Discord (en waarschijnlijk een bugfix of twee). Update om door te gaan.</string>
     <string name="out_of_date_title">Je bent verouderd</string>
+    <string name="outbound_promotion_redemption_modal_title">Super!</string>
     <string name="outgoing_friend_request">Uitgaand vriendverzoek</string>
     <string name="outgoing_friend_request_delete_msg">Weet je zeker dat je je vriendschapsverzoek aan **!!{name}!!**wilt verwijderen?</string>
     <string name="outgoing_friend_request_to">Uitgaand vriendschapsverzoek aan !!{name}!!</string>
@@ -5620,12 +5617,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Machtiging **Kanalen bekijken** is vereist om dit privékanaal aan te maken.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Machtigingen **Kanalen bekijken** en **Verbinden** zijn vereist om dit privékanaal aan te maken.</string>
     <string name="profile">Profiel</string>
+    <string name="profile_banner_icon_tooltip_upsell">Upload je eigen aangepaste banner en meer met Nitro!</string>
     <string name="profile_customization_beta_tooltip">Profielaanpassing is op dit moment beschikbaar voor een beperkt aantal mensen.</string>
+    <string name="profile_customization_bio_placeholder">Stel je voor aan de wereld</string>
     <string name="profile_customization_marketing_tooltip_body">Toon je creativiteit met een \'over mij\' en, als je Nitro hebt, een profielbanner!</string>
     <string name="profile_customization_marketing_tooltip_cta">Begrepen</string>
     <string name="profile_customization_marketing_tooltip_header">Nieuwe profielaanpassing!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exclusief voor Nitro</string>
     <string name="promotion_card_action_claim">Claimen</string>
-    <string name="promotion_card_body_claimed_hidden">Je hebt dit al geclaimd, maar de code is verborgen door Streamer-modus.</string>
     <string name="promotion_error_body">Er lijkt iets mis te gaan en je kunt die code niet gebruiken. Onze excuses.</string>
     <string name="promotion_error_title">Wacht even…</string>
     <string name="promotion_existing_subscriber_title">Balen!</string>
@@ -6517,7 +6516,6 @@
     <string name="start_stage_channel_event_members_title">Alleen voor leden</string>
     <string name="start_stage_channel_event_modal_button">Podium starten</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Je wordt spreker zodra het podium geopend is.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Schrijf een onderwerp om aan te kondigen dat je podium live is.</string>
     <string name="start_stage_channel_event_modal_title">Waar ga je het over hebben?</string>
     <string name="start_stage_channel_event_modal_topic_label">Podiumonderwerp</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Het debat is afgelopen: diëten is beter dan gewoon eten</string>
@@ -7197,6 +7195,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Pushmeldingen niet ingeschakeld</string>
     <string name="user_settings">Gebruikersinstellingen</string>
     <string name="user_settings_about_me">Over mij</string>
+    <string name="user_settings_about_me_description">Schrijf wat je maar wilt over jezelf, zolang je maar onder de {maxLength} tekens blijft. Je mag markdown en links gebruiken als je dat wilt.</string>
     <string name="user_settings_account_change_email_prompt">Je huidige e-mailadres is !!{email}!! Waar wil je het in veranderen?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Voer een nieuw e-mailadres en je huidige wachtwoord in.</string>
     <string name="user_settings_account_change_email_title">E-mailadres bewerken</string>
@@ -7231,6 +7230,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh hier is hij!</string>
     <string name="user_settings_appearance_zoom_tip">Je kunt het zoomniveau wijzigen met {modKey} +/- en resetten naar de standaardzoom met {modKey}+0.</string>
     <string name="user_settings_available_codes">Beschikbare backupcodes</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">We raden een afbeelding aan van minimaal 600x240. Je kunt een PNG, JPG of bewegend gifje uploaden.</string>
     <string name="user_settings_blocked_users">Geblokkeerde gebruikers</string>
     <string name="user_settings_blocked_users_empty">Je hebt nog geen gebruikers geblokkeerd</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} geblokkeerde gebruikers</string>
@@ -7239,11 +7240,13 @@
     <string name="user_settings_close_button">Knop Sluiten</string>
     <string name="user_settings_confirm_logout">Weet je zeker dat je wilt uitloggen?</string>
     <string name="user_settings_customization_upsell">Ontgrendel met Nitro</string>
+    <string name="user_settings_customize_profile_title">Mijn profiel aanpassen</string>
     <string name="user_settings_delete_avatar">Avatar verwijderen</string>
     <string name="user_settings_disable_advanced_voice_activity">Het kan helpen om deze optie uit te zetten als je stem niet wordt gedetecteerd door de automatische inputgevoeligheid.</string>
     <string name="user_settings_disable_noise_suppression">Passieve ruisonderdrukking wordt uitgeschakeld wanneer actieve ruisonderdrukking is ingeschakeld.</string>
     <string name="user_settings_edit_account">Account bewerken</string>
     <string name="user_settings_edit_account_password_label">Voer je wachtwoord in om wijzigingen te bevestigen</string>
+    <string name="user_settings_edit_profile">Profiel bewerken</string>
     <string name="user_settings_enter_password_view_codes">Voer je wachtwoord in om backupcodes te bekijken.</string>
     <string name="user_settings_games_install_location">Locatie</string>
     <string name="user_settings_games_install_location_add">Voeg Locatie installeren toe</string>
@@ -7292,6 +7295,8 @@
     <string name="user_settings_open_on_startup_body">Bespaar jezelf een paar klikken en laat Discord je groeten als je computer opstart.</string>
     <string name="user_settings_privacy_terms">Lees onze [Servicevoorwaarden]({termsLink}) en ons [Privacybeleid]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profielbanner</string>
+    <string name="user_settings_remove_avatar">Avatar verwijderen</string>
+    <string name="user_settings_remove_banner">Banner verwijderen</string>
     <string name="user_settings_restart_app_mobile">Start de app opnieuw om je nieuwe instellingen van kracht te laten worden.</string>
     <string name="user_settings_save">Opslaan</string>
     <string name="user_settings_scan_qr_code">QR-code scannen</string>
@@ -7305,6 +7310,7 @@
     <string name="user_settings_upload_avatar">Avatar uploaden</string>
     <string name="user_settings_upload_banner">Banner uploaden</string>
     <string name="user_settings_used_backup_codes">Gebruikte backupcodes</string>
+    <string name="user_settings_user_profile">Gebruikersprofiel</string>
     <string name="user_settings_voice_add_multiple">Je kunt meerdere Push-to-Talk-koppelingen toevoegen onder [Toetsencombinatie-instellingen](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord gebruikt alleen de beste, biologische, lokaal geproduceerde Opus Voice-codec.</string>
     <string name="user_settings_voice_experimental_soundshare_label">Gebruik een experimentele methode om geluid van applicaties vast te leggen</string>
@@ -7535,25 +7541,6 @@
     <string name="whitelisting">Wordt op de witte lijst geplaatst…</string>
     <string name="working">Bezig…</string>
     <string name="xbox_authorization_title">Xbox-accountautorisatie</string>
-    <string name="xbox_game_pass_card_body_claimed">Je hebt dit al geclaimd. Hier is je code: !!{code}!!. [Meer info](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Je kunt het geschenk claimen tot 15 januari 2021. [Minder info](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Je kunt het geschenk claimen tot 15 januari 2021. [Meer info](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Deze code vind je ook in een bevestigingsmail die we je zojuist hebben gestuurd.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Er is iets fout gegaan. Probeer het later nog eens!</string>
-    <string name="xbox_game_pass_modal_code_header">Code Xbox Game Pass voor pc</string>
-    <string name="xbox_game_pass_modal_code_header_failed">O, jee</string>
-    <string name="xbox_game_pass_modal_header_description_success">Verzilver de code hieronder op de [Microsoft-verzilversite]({redemptionURL}) om toegang te krijgen tot 3 maanden Xbox Game Pass voor pc.</string>
-    <string name="xbox_game_pass_modal_header_success">Super!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Je hebt een boostabonnement, dus we geven je Nitro-abonnementtegoed. Je ontvangt het Nitro-tegoed zodra je een abonnement hebt op **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Verzilveren</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Je hebt nu Nitro-tegoed! Neem vandaag nog een abonnement op **{planName}** om je Nitro-tegoed te ontvangen.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Lekker!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Abonnementtegoed</string>
-    <string name="xbox_game_pass_promotion_banner_description">We hebben nog een extraatje voor je. Nitro-abonnees krijgen nu 3 maanden Xbox Game Pass voor pc. Nu beschikbaar tot 15 januari 2021. [Meer info](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">We hebben nog een extraatje voor je. Nitro-abonnees krijgen nu 3 maanden Xbox Game Pass voor pc. Nu beschikbaar tot 15 januari 2021. [Minder info](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 maanden Xbox Game Pass voor pc</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass voor pc (3 maanden)</string>
-    <string name="xbox_game_pass_promotion_legalese">Niet geldig als je nu of in het verleden een Xbox Game Pass voor pc hebt gehad of een Xbox Game Pass Ultimate-abonnement hebt. Verzilver je Xbox Game Pass-code(s) op [microsoft.com/redeem](https://microsoft.com/redeem) voor 15 februari 2021. Creditcard vereist. Na afloop van de promotieperiode worden de dan geldende abonnementskosten maandelijks in rekening gebracht, tenzij je het abonnement annuleert. Wordt niet ondersteund door de S-modus van Windows 10 en op ARM-apparaten. Gameaanbod wisselt van tijd tot tijd. Ga naar [xbox.com/gamepass](https://xbox.com/gamepass). Limiet: 1 per persoon/account.</string>
     <string name="xbox_pin_step1">Open de Discord-app op je telefoon</string>
     <string name="xbox_pin_step2">Ga naar Instellingen&gt; Verbindingen&gt; Toevoegen</string>
     <string name="xbox_pin_step3">Klik op Xbox en voer de bovenstaande pincode in</string>
diff --git a/app/src/main/res/values-no/plurals.xml b/app/src/main/res/values-no/plurals.xml
index 79647e8b00..7019a771b5 100644
--- a/app/src/main/res/values-no/plurals.xml
+++ b/app/src/main/res/values-no/plurals.xml
@@ -544,14 +544,6 @@
         <item quantity="one">1 uke</item>
         <item quantity="other">{minimumGuildAge} uker</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">navn</item>
-        <item quantity="other">navn</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">navn</item>
-        <item quantity="other">navn</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Ventende søknad</item>
         <item quantity="other">{count} Ventende søknader</item>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 237af76a03..45a90c8eb6 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -1322,7 +1322,6 @@
     <string name="contact_sync_we_found_your_friends_body">Du er nå venn med dem på Discord. Snakk med dem, inviter dem til serveren din, mor dere! Vi lar deg vite når en ny venn blir med i Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Vi har funnet vennene dine!</string>
     <string name="content_matching">!!{command}!! innhold samsvarer **!!{query}!!**</string>
-    <string name="context_menu_hint">Høyreklikk på brukeren for å se flere handlinger</string>
     <string name="continue_in_browser">Fortsett i nettleser</string>
     <string name="continue_to_webapp">Fortsett til Discord</string>
     <string name="control_volume">Styr volum</string>
@@ -2919,8 +2918,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Servere i oppdagelse må være minst {minimumGuildAge} gammel. Sjekk igjen den {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Serveren er for ung</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Serveren din **$[oppfyller ikke](doesNotHook)** alle kravene til å være med i serveroppdagelse.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Du må endre følgende kategori {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Du må endre følgende kanal {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Du må endre $[beskrivelse](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Du må endre $[servernavnet](nameHook) ditt</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Få flere kommuniserende i uken</string>
@@ -4122,6 +4119,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Oppgrader emojiene dine, gjør profilen din mer personlig, og skill deg ut i serverne dine. Velg mellom **!!{monthlyPrice}!! per måned** og **!!{yearlyPrice}!! per år**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Få en forbedret Discord-opplevelse</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30 %% rabatt på Server Boosting</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Bruk egendefinerte og animerte emojier hvor som helst</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Oppløsning på opptil 1080p og opptil 60 fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB opplasting i stedet for 100 MB</string>
     <string name="masked_link_body">Denne lenken tar deg til **!!{url}!!**. Er du sikker på at du vil dit?</string>
@@ -4564,8 +4562,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Du har {days} på deg til å få en prøvemåned på Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Du har {hours} på deg til å få en prøvemåned på Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Du har {minutes} på deg til å få en prøvemåned på Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hei, Nitro-abonnent, og gratulerer! Vi spanderer tre måneders Xbox Game Pass for PC på deg.</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Løs inn</string>
     <string name="notice_product_feedback_survey">Vil du delta i diskusjoner der du gir oss tilbakemeldinger om produktene våre?</string>
     <string name="notice_product_feedback_survey_cta">Gi beskjed her!</string>
     <string name="notice_register_to_vote">Er du registrert som velger? Sjekk statusen din og registrer deg på to minutter.</string>
@@ -4748,6 +4744,7 @@
     <string name="out_of_date_action">Oppdater Discord</string>
     <string name="out_of_date_description">Vi har gjort noen kule endringer i Discord (og sannsynligvis en feilrettelse eller to). Oppdater for å fortsette.</string>
     <string name="out_of_date_title">Du er utdatert</string>
+    <string name="outbound_promotion_redemption_modal_title">Fantastisk!</string>
     <string name="outgoing_friend_request">Utgående venneforespørsel</string>
     <string name="outgoing_friend_request_delete_msg">Er du sikker på at du vil slette venneforespørselen til **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Utgående venneforespørsel til !!{name}!!</string>
@@ -5388,12 +5385,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">**Vis kanaler**-tillatelse kreves for å opprette denne private kanalen.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">**Vis kanaler**- og **Koble til**-tillatelser kreves for å opprette denne private kanalen.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Last opp din personlige fane og mer med Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Profiltilpasning er for øyeblikket tilgjengelig for et begrenset antall personer.</string>
+    <string name="profile_customization_bio_placeholder">Fortell verden litt om deg selv</string>
     <string name="profile_customization_marketing_tooltip_body">Uttrykk deg med et «om meg» og, hvis du har Nitro, et profilbanner!</string>
     <string name="profile_customization_marketing_tooltip_cta">Forstått</string>
     <string name="profile_customization_marketing_tooltip_header">Ny profiltilpasning!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Eksklusivt for Nitro</string>
     <string name="promotion_card_action_claim">Hent</string>
-    <string name="promotion_card_body_claimed_hidden">Du har hentet dette, men koden er skjult på grunn av strømmermodusen.</string>
     <string name="promotion_error_body">Det ser ut til at noe er galt, og at du ikke kan bruke den koden. Beklager.</string>
     <string name="promotion_error_title">Vent et øyeblikk …</string>
     <string name="promotion_existing_subscriber_title">Å nei!</string>
@@ -6286,7 +6285,6 @@
     <string name="start_stage_channel_event_members_title">Kun medlemmer</string>
     <string name="start_stage_channel_event_modal_button">Start scenen</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Du er taler når scenen åpnes.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Skriv et emne for å kunngjøre at scenen er åpnet.</string>
     <string name="start_stage_channel_event_modal_title">Hva skal dere snakke om?</string>
     <string name="start_stage_channel_event_modal_topic_label">Scenens emne</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Debatten er avsluttet: Sukkerfri er bedre enn vanlig</string>
@@ -6954,6 +6952,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Push-varsler er ikke tillatt</string>
     <string name="user_settings">Brukerinnstillinger</string>
     <string name="user_settings_about_me">Om meg</string>
+    <string name="user_settings_about_me_description">Skriv hva du vil om deg selv – så lenge du gjør det på under {maxLength} tegn. Du kan bruke markdown og koblinger hvis du vil.</string>
     <string name="user_settings_account_change_email_prompt_desktop">Skriv inn en ny e-postadresse og ditt nåværende passord.</string>
     <string name="user_settings_account_change_email_title">Rediger e-postadressen</string>
     <string name="user_settings_account_change_email_title_desktop">Skriv inn en e-postadresse</string>
@@ -6984,6 +6983,8 @@
     <string name="user_settings_appearance_preview_message_5">Åh, her er den!</string>
     <string name="user_settings_appearance_zoom_tip">Du kan endre zoomnivået med {modKey} +/- og tilbakestille til standard zoom med {modKey}+0.</string>
     <string name="user_settings_available_codes">Tilgjengelige sikkerhetskopikoder</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Vi anbefaler et bilde på minst 600 x 240. Du kan laste opp en PNG, JPG eller en animert GIF.</string>
     <string name="user_settings_blocked_users">Blokkerte brukere</string>
     <string name="user_settings_blocked_users_empty">Du har ingen blokkerte brukere</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Blokkerte brukere</string>
@@ -6992,12 +6993,14 @@
     <string name="user_settings_close_button">Lukk knapp</string>
     <string name="user_settings_confirm_logout">Er du sikker på at du vil logge ut?</string>
     <string name="user_settings_customization_upsell">Lås opp med Nitro</string>
+    <string name="user_settings_customize_profile_title">Tilpass Min profil</string>
     <string name="user_settings_delete_avatar">Slett avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Det å slå av dette kan hjelpe hvis stemmen din ikke registreres ved automatisk inngangsfølsomhet.</string>
     <string name="user_settings_disable_noise_suppression">Støyreduksjon er deaktivert når støydemping er aktivert.</string>
     <string name="user_settings_edit_account">Rediger konto</string>
     <string name="user_settings_edit_account_password_label">Angi passordet for å bekrefte endringene</string>
     <string name="user_settings_edit_account_tag">TAGG</string>
+    <string name="user_settings_edit_profile">Rediger profil</string>
     <string name="user_settings_enter_password_view_codes">Angi passordet for å vise sikkerhetskopikoder.</string>
     <string name="user_settings_games_install_location">Posisjon</string>
     <string name="user_settings_games_install_location_add">Legg til installasjonsposisjon</string>
@@ -7046,6 +7049,8 @@
     <string name="user_settings_open_on_startup_label">Åpne Discord</string>
     <string name="user_settings_privacy_terms">Sjekk [Vilkår for bruk]({termsLink}) og [Personvernerklæring]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profilbanner</string>
+    <string name="user_settings_remove_avatar">Fjern Avatar</string>
+    <string name="user_settings_remove_banner">Fjern banner</string>
     <string name="user_settings_restart_app_mobile">Start appen på nytt for at de nye innstillingene skal tre i kraft.</string>
     <string name="user_settings_save">Lagre</string>
     <string name="user_settings_scan_qr_code">Skann QR-kode</string>
@@ -7060,6 +7065,7 @@
     <string name="user_settings_upload_avatar">Last opp avatar</string>
     <string name="user_settings_upload_banner">Last opp banner</string>
     <string name="user_settings_used_backup_codes">Brukte sikkerhetskopikoder</string>
+    <string name="user_settings_user_profile">Brukerprofil</string>
     <string name="user_settings_voice_add_multiple">Du kan legge til flere trykk og snakk-hurtigtaster under [Innstillinger for hurtigtaster](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord bruker bare den beste organiske, lokale Opus-talekodeken.</string>
     <string name="user_settings_voice_codec_title">Lydkodek</string>
@@ -7282,25 +7288,6 @@
     <string name="widget">Modul</string>
     <string name="working">Jobber …</string>
     <string name="xbox_authorization_title">Autorisering av Xbox konto</string>
-    <string name="xbox_game_pass_card_body_claimed">Du har hentet dette. Her er koden din !!{code}!!. [Mer informasjon](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Gaven kan hentes frem til 15. januar 2021. [Mindre informasjon](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Gaven kan hentes frem til 15. januar 2021. [Mer informasjon](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Denne koden er også sendt i en e-postbekreftelse til deg.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Noe gikk galt. Prøv senere.</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass for PC-kode</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oi da</string>
-    <string name="xbox_game_pass_modal_header_description_success">Løs inn koden under på [Microsofts innløsningsside]({redemptionURL}) for å få tilgang til Xbox Game Pass for PC i tre måneder.</string>
-    <string name="xbox_game_pass_modal_header_success">Fantastisk!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Siden du har et boost-abonnement, gir vi deg Nitro-abonnementskreditt. Nitro-kreditt blir lagt til når du abonnerer på **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Løs inn</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Du har nå Nitro-kreditt! Abonner på **{planName}** i dag for å bruke Nitro-kreditten din.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Flott!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Abonnementskreditt</string>
-    <string name="xbox_game_pass_promotion_banner_description">Vi har gitt deg en liten gave. Nitro-abonnenter får nå 3 måneder med Xbox Game Pass for PC. Tilgjengelig fra nå til 15. januar 2021. [Mer informasjon](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Vi har gitt deg en liten gave. Nitro-abonnenter får nå 3 måneder med Xbox Game Pass for PC. Tilgjengelig fra nå til 15. januar 2021. [Mindre informasjon](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 måneder med Xbox Game Pass for PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass for PC (3 måneder)</string>
-    <string name="xbox_game_pass_promotion_legalese">Gjelder ikke for gjeldende eller tidligere Xbox Game Pass for PC-medlemmer eller Xbox Game Pass Ultimate-medlemmer. Innløs Xbox Game Pass-koden(e) på [microsoft.com/redeem](https://microsoft.com/redeem) før 15. februar 2021. Kredittkort er en forutsetning. Med mindre du sier opp abonnementet, blir du deretter belastet full pris for medlemskapet hver måned etter at kampanjeperioden er over. Støttes ikke på Windows 10 i S-modus eller på ARM-enheter. Spillutvalget vil variere over tid. Se [xbox.com/gamepass](https://xbox.com/gamepass). Begrensning: 1 per person/konto.</string>
     <string name="xbox_link">Lenke</string>
     <string name="xbox_pin_step1">Åpne Discord-appen på telefonen din</string>
     <string name="xbox_pin_step2">Gå til innstillinger &gt; Tilkoblinger &gt; Legg til</string>
diff --git a/app/src/main/res/values-pl/plurals.xml b/app/src/main/res/values-pl/plurals.xml
index 188b733487..9fabc17e80 100644
--- a/app/src/main/res/values-pl/plurals.xml
+++ b/app/src/main/res/values-pl/plurals.xml
@@ -635,14 +635,6 @@
         <item quantity="few">{minimumGuildAge} tygodnie</item>
         <item quantity="other">{minimumGuildAge} tygodni</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">nazwę swojej kategorii</item>
-        <item quantity="other">nazwy swoich kategorii</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">nazwę swojego kanału</item>
-        <item quantity="other">nazwy swoich kanałów</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">oczekujący wniosek</item>
         <item quantity="few">{count} oczekujące wnioski</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9377dcf159..26df838dde 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1050,7 +1050,7 @@
     <string name="change_identity_modal_uploader_cta">Zmień awatar na serwerze</string>
     <string name="change_identity_modal_upsell">Używaj innego awatara na każdym ze swoich serwerów i nie tylko dzięki **Discord Nitro!**</string>
     <string name="change_log">Dziennik zmian</string>
-    <string name="change_log_md_body">Nowe funkcje {added marginTop}\n======================\n\n* **Dodano Wyszukiwanie podiów.** Poznaj społeczności, które organizują podium na żywo — wydarzenia audio, takie jak koncerty, panele, pokazy talentów i wszelkie inne dziwne, ale legalne rzeczy, które mogą Ci przyjść do głowy — wystarczy kliknąć nową zakładkę Wyszukiwanie. \n* **Dodano funkcję wyszukiwania znajomych.** Dodaliśmy funkcję umożliwiającą łatwiejsze wyszukiwanie znajomych, którzy zgodzili się na przekazanie danych do aplikacji Discord. Jeśli również przystąpisz do usługi, mając numer telefonu znajomego, łatwo go znajdziesz i wyślesz prośbę o dodanie do listy znajomych. Dzięki temu unikniesz wysyłania krępujących wiadomości takich jak Ta prośba o dodanie do znajomych od xXSoulzLuverXx#0000 jest ode mnie....\n* **Dodano ulubione emoji.** Stuknij emoji na czacie lub naciśnij długo jedno z nich w obszarze wybierania emoji, aby zacząć dodawać i usuwać emoji z ulubionych. Twoje ulubione nie będą synchronizowane z pulpitem *jeszcze*, ale możesz zacząć zastanawiać się, które 5 z posiadanych 2459 emoji rzeczywiście używasz.\n* **Dodano paginację do paska wyszukiwania.** Nie musisz już przewijać w nieskończoność wyników wyszukiwania. Teraz możesz przeskakiwać między stronami, aby znaleźć niezbity dowód, którego potrzebujesz, chcąc udowodnić swojemu znajomemu, że naprawdę coś powiedział 6 miesięcy temu, ale nie możesz sobie przypomnieć, więc poświęcasz trochę czasu, aby to znaleźć, ponieważ przysięgasz, że naprawdę to powiedział.\n* **Dodano dźwięki kanałów głosowych:** Twój telefon będzie teraz odtwarzał dźwięki, gdy dołączysz, opuścisz lub zostaniesz przeniesiony w kanałach głosowych — są to wszystkie dźwięki, które mogą pojawić się w głowie z przerażającą wyrazistością. Ba-dum... ba-da-doo...\n\n\n\n\nPoprawki i aktualizacje {progress}\n======================\n\n* **Koniec z pingami edycji!** Edycja odpowiedzi nie będzie już wspominać autora referencji w większości przypadków (Chciałem tylko poprawić mój mały błąd gramatyczny, a teraz jestem poważnie zakłopotany.)\n* **Ulepszenia folderów serwera.** Teraz możesz oznaczyć foldery serwera jako przeczytane! Dodaliśmy także ustawienia folderów serwera, aby można było ustawić własne nazwy i kolory.\n* **Dużo ulepszeń i poprawek błędów w funkcji sprawdzania członków.** Nie będziesz już na dłużej zatrzymywać się na tych stronach.\n* **Ułatwiono dostęp do trybu wprowadzania danych.** Możesz teraz zmieniać ustawienia funkcji Naciśnij i Mów oraz aktywności głosowej bez opuszczania ekranu połączenia.\n\n\n</string>
+    <string name="change_log_md_body">Nowe funkcje {added marginTop}\n======================\n\n* **Dodano funkcję wyszukiwania znajomych.** Dodaliśmy funkcję umożliwiającą łatwiejsze wyszukiwanie znajomych, którzy zgodzili się na przekazanie danych do aplikacji Discord. Jeśli również przystąpisz do usługi, mając numer telefonu znajomego, łatwo go znajdziesz i wyślesz prośbę o dodanie do listy znajomych. Dzięki temu unikniesz wysyłania krępujących wiadomości takich jak Ta prośba o dodanie do znajomych od xXSoulzLuverXx#0000 jest ode mnie....\n* **Dodano ulubione emoji.** Stuknij emoji na czacie lub naciśnij długo jedno z nich w obszarze wybierania emoji, aby zacząć dodawać i usuwać emoji z ulubionych. Twoje ulubione nie będą synchronizowane z pulpitem *jeszcze*, ale możesz zacząć zastanawiać się, które 5 z posiadanych 2459 emoji rzeczywiście używasz.\n* **Dodano paginację do paska wyszukiwania.** Nie musisz już przewijać w nieskończoność wyników wyszukiwania. Teraz możesz przeskakiwać między stronami, aby znaleźć niezbity dowód, którego potrzebujesz, chcąc udowodnić swojemu znajomemu, że naprawdę coś powiedział 6 miesięcy temu, ale nie możesz sobie przypomnieć, więc poświęcasz trochę czasu, aby to znaleźć, ponieważ przysięgasz, że naprawdę to powiedział.\n* **Dodano dźwięki kanałów głosowych:** Twój telefon będzie teraz odtwarzał dźwięki, gdy dołączysz, opuścisz lub zostaniesz przeniesiony w kanałach głosowych — są to wszystkie dźwięki, które mogą pojawić się w głowie z przerażającą wyrazistością. Ba-dum... ba-da-doo...\n\n\n\n\nPoprawki i aktualizacje {progress}\n======================\n\n* **Koniec z pingami edycji!** Edycja odpowiedzi nie będzie już wspominać autora referencji w większości przypadków (Chciałem tylko poprawić mój mały błąd gramatyczny, a teraz jestem poważnie zakłopotany.)\n* **Ulepszenia folderów serwera.** Teraz możesz oznaczyć foldery serwera jako przeczytane! Dodaliśmy także ustawienia folderów serwera, aby można było ustawić własne nazwy i kolory.\n* **Dużo ulepszeń i poprawek błędów w funkcji sprawdzania członków.** Nie będziesz już na dłużej zatrzymywać się na tych stronach.\n* **Ułatwiono dostęp do trybu wprowadzania danych.** Możesz teraz zmieniać ustawienia funkcji Naciśnij i Mów oraz aktywności głosowej bez opuszczania ekranu połączenia.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">pl</string>
     <string name="change_log_md_revision">1</string>
@@ -1342,7 +1342,7 @@
     <string name="connection_status_stream_self_connected">Współdzielenie ekranu</string>
     <string name="connection_status_video_connected">Połączono z czatem wideo</string>
     <string name="connection_status_voice_connected">Połączono z czatem głosowym</string>
-    <string name="connection_verified">Zweryfikowana</string>
+    <string name="connection_verified">Zweryfikowane</string>
     <string name="connections">Połączone konta</string>
     <string name="contact_sync_android_landing_screen_subtitle">Discord może dodać Twoich znajomych i pomóc im znaleźć Ciebie.</string>
     <string name="contact_sync_cta_button_subtitle">Automatycznie dodaj znajomych z kontaktów</string>
@@ -1413,7 +1413,6 @@
     <string name="contact_sync_we_found_your_friends_body">Jesteście teraz znajomymi na Discordzie. Porozmawiajcie, zaproś znajomego na swój serwer, bawcie się dobrze! Damy Ci znać, gdy nowi znajomi dołączą do Discorda.</string>
     <string name="contact_sync_we_found_your_friends_title">Znaleźliśmy Twoich znajomych!</string>
     <string name="content_matching">!!{command}!! dopasowanie zawartości **!!{query}!!**</string>
-    <string name="context_menu_hint">Kliknij prawym przyciskiem myszy po więcej działań</string>
     <string name="continue_in_browser">Kontynuuj w przeglądarce</string>
     <string name="continue_to_webapp">Przejdź do Discorda</string>
     <string name="control_volume">Ustawienia głośności</string>
@@ -3146,8 +3145,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Serwery obecne w Wyszukiwaniu muszą istnieć co najmniej przez {minimumGuildAge}. Sprawdź ponownie w dniu {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Serwer istnieje zbyt krótko</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Twój serwer **$[nie spełnia](doesNotHook)** wszystkich wymagań, by znaleźć się w Wyszukiwaniu serwerów.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Musisz zmienić {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Musisz zmienić {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Musisz zmienić swój $[opis](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Musisz zmienić swoją $[nazwę serwera](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Zwiększ liczbę rozmawiających w tygodniu</string>
@@ -4370,6 +4367,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Ulepsz swoje emoji, personalizuj swój profil i wyróżniaj się na swoich serwerach. Wybierz **!!{monthlyPrice}!! miesięcznie** lub **!!{yearlyPrice}!! rocznie**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Zdobądź lepsze możliwości na Discordzie</string>
     <string name="marketing_tier_1_perk_list_boost_discount">Zniżka 30%% na ulepszenia serwera</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Używaj własnych i animowanych emoji, gdzie chcesz</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Rozdzielczość do 1080p i do 60 klatek na sekundę</string>
     <string name="marketing_tier_1_perk_list_upload_size">Rozmiar przesyłanych plików do 50 MB zamiast 100 MB</string>
     <string name="masked_link_body">Ten link prowadzi do **!!{url}!!**. Na pewno chcesz tam przejść?</string>
@@ -4734,7 +4732,7 @@
     <string name="new_terms_continue">Przejdź do Discorda</string>
     <string name="new_terms_description">Aby dalej używać Discorda, zapoznaj się z zaktualizowanymi Warunkami Korzystania z Usługi oraz Polityką prywatności i wyraź na nie zgodę.</string>
     <string name="new_terms_title">Aktualizacja Warunków Korzystania z Usługi i Polityki Prywatności</string>
-    <string name="new_unreads">Nowe nieprzeczytane wiadomości</string>
+    <string name="new_unreads">Nowe nieprzeczyt. wiad.</string>
     <string name="news_channel">Kanał ogłoszeniowy</string>
     <string name="news_channel_desc">Kanał tekstowy, który może przesyłać informacje na śledzące go serwery</string>
     <string name="news_channel_publish">Opublikuj</string>
@@ -4870,8 +4868,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Masz jeszcze {days}, by skorzystać z darmowego miesiąca Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Masz jeszcze {hours}, by skorzystać z darmowego miesiąca Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Masz jeszcze {minutes}, by skorzystać z darmowego miesiąca Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hej, subskrybencie Nitro, gratulacje! Dostajesz 3 miesiące Xbox Game Pass na PC, my stawiamy!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Zdobądź</string>
     <string name="notice_product_feedback_survey_cta">Daj nam znać!</string>
     <string name="notice_scheduled_maintenance">Discord przejdzie w stan zaplanowanej konserwacji od godziny **{start}** dnia **{start}**.</string>
     <string name="notice_spotify_auto_paused">Odtwarzanie ze Spotify zostało wstrzymane podczas przesyłania dźwięku.</string>
@@ -5056,6 +5052,7 @@
     <string name="out_of_date_action">Zaktualizuj Discorda</string>
     <string name="out_of_date_description">Mamy parę świetnych zmian do Discorda (i mamy nadzieję, że załataliśmy kilka bugów). Zaktualizuj, aby kontynuować.</string>
     <string name="out_of_date_title">Jesteś do tyłu</string>
+    <string name="outbound_promotion_redemption_modal_title">Wspaniale!</string>
     <string name="outgoing_friend_request">Wychodzące zaproszenie do znajomych</string>
     <string name="outgoing_friend_request_delete_msg">Na pewno chcesz usunąć swoje zaproszenie do znajomych dla **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Wychodzące zaproszenie do znajomych do użytkownika !!{name}!!</string>
@@ -5252,7 +5249,7 @@
     <string name="playing_game">W grze **!!{game}!!**</string>
     <string name="please_try_again_later">Spróbuj ponownie później.</string>
     <string name="popout_player">Otwórz w nowym oknie</string>
-    <string name="popout_player_opened">Przenosisz gracza na oddzielne, wyskakujące okienko</string>
+    <string name="popout_player_opened">Przenosisz odtwarzacz na oddzielne, wyskakujące okienko</string>
     <string name="popout_remove_from_top">Odepnij</string>
     <string name="popout_return">Powrót do aplikacji</string>
     <string name="popout_stay_on_top">Przypnij</string>
@@ -5734,12 +5731,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Wymagane uprawnienie **Wyświetlanie kanałów**, aby utworzyć ten kanał prywatny.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Wymagane uprawnienia **Wyświetlanie kanałów** i **Łączenie**, aby utworzyć ten kanał prywatny.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Discord Nitro pozwala Ci przesłać spersonalizowany baner i nie tylko!</string>
     <string name="profile_customization_beta_tooltip">Personalizacja profilu jest obecnie dostępna tylko dla ograniczonej liczby osób.</string>
+    <string name="profile_customization_bio_placeholder">Opowiedz innym o sobie</string>
     <string name="profile_customization_marketing_tooltip_body">Wyrażaj siebie za pomocą opisu „o mnie” i, jeśli masz Nitro, banera profilu!</string>
     <string name="profile_customization_marketing_tooltip_cta">Zrozumiano</string>
     <string name="profile_customization_marketing_tooltip_header">Nowe możliwości personalizacji profilu!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Tylko w Nitro</string>
     <string name="promotion_card_action_claim">Zajmij</string>
-    <string name="promotion_card_body_claimed_hidden">Zajęto, ale kod pozostaje ukryty z uwagi na tryb streamowania.</string>
     <string name="promotion_error_body">Wygląda na to, że coś poszło nie tak i nie możesz użyć tego kodu. Przykro nam.</string>
     <string name="promotion_error_title">Zaczekaj chwilę…</string>
     <string name="promotion_existing_subscriber_title">O nie!</string>
@@ -6649,7 +6648,6 @@
     <string name="start_stage_channel_event_members_title">Tylko członkowie</string>
     <string name="start_stage_channel_event_modal_button">Zainicjuj podium</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Gdy Podium się otworzy, będziesz mówcą.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Określ temat, aby ogłosić, że podium się zaczęło.</string>
     <string name="start_stage_channel_event_modal_title">O czym będziecie rozmawiać?</string>
     <string name="start_stage_channel_event_modal_topic_label">Temat Podium</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Debata zakończona: napoje dietetyczne są lepsze niż zwykłe</string>
@@ -7333,6 +7331,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Powiadomienia push są wyłączone</string>
     <string name="user_settings">Ustawienia użytkownika</string>
     <string name="user_settings_about_me">O mnie</string>
+    <string name="user_settings_about_me_description">Opowiedz o sobie, co tylko chcesz. Możesz użyć składni Markdown i linków. Długość tekstu nie może przekroczyć {maxLength} znaków.</string>
     <string name="user_settings_account_change_email_prompt">Twój obecny adres e-mail to !!{email}!!. Na jaki chcesz go zmienić?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Wprowadź nowy adres e-mail i istniejące hasło.</string>
     <string name="user_settings_account_change_email_title">Edytuj adres e-mail</string>
@@ -7367,6 +7366,8 @@
     <string name="user_settings_appearance_preview_message_5">Oto i on!</string>
     <string name="user_settings_appearance_zoom_tip">Możesz zmienić poziom przybliżenia poprzez {modKey} +/- lub zresetować do domyślnego poziomu dzięki {modKey}+0.</string>
     <string name="user_settings_available_codes">Dostępne zapasowe kody</string>
+    <string name="user_settings_avatar">Awatar</string>
+    <string name="user_settings_banner_specs">Zalecamy obrazy o rozmiarze co najmniej 600x240. Możesz przesyłać obrazy w formacie PNG, JP lub animowane GIF-y.</string>
     <string name="user_settings_blocked_users">Zablokowani użytkownicy</string>
     <string name="user_settings_blocked_users_empty">Nie masz jeszcze żadnych zablokowanych użytkowników</string>
     <string name="user_settings_blocked_users_header">Liczba zablokowanych użytkowników: {numberOfBlockedUsers}</string>
@@ -7375,11 +7376,13 @@
     <string name="user_settings_close_button">Przycisk Zamknij</string>
     <string name="user_settings_confirm_logout">Na pewno chcesz się wylogować?</string>
     <string name="user_settings_customization_upsell">Odblokuj dzięki Nitro</string>
+    <string name="user_settings_customize_profile_title">Personalizacja mojego profilu</string>
     <string name="user_settings_delete_avatar">Usuń awatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Wyłączenie tego może pomóc, jeśli Twojego głosu nie wykrywa automatyczna czułość wejściowa.</string>
     <string name="user_settings_disable_noise_suppression">Gdy tłumienie zakłóceń jest włączone, nie działa funkcja redukcji szumów.</string>
     <string name="user_settings_edit_account">Edytuj konto</string>
     <string name="user_settings_edit_account_password_label">Wprowadź hasło, aby potwierdzić zmiany</string>
+    <string name="user_settings_edit_profile">Edytuj profil</string>
     <string name="user_settings_enter_password_view_codes">Wprowadź hasło, aby zobaczyć zapasowe kody.</string>
     <string name="user_settings_games_install_location">Lokalizacja</string>
     <string name="user_settings_games_install_location_add">Dodaj lokalizację instalacji</string>
@@ -7430,6 +7433,8 @@
     <string name="user_settings_open_on_startup_label">Otwórz Discorda</string>
     <string name="user_settings_privacy_terms">Przyjrzyj się naszym [Warunkom Korzystania z Usługi]({termsLink}) i [Polityce prywatności]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Baner profilu</string>
+    <string name="user_settings_remove_avatar">Usuń awatar</string>
+    <string name="user_settings_remove_banner">Usuń baner</string>
     <string name="user_settings_restart_app_mobile">Uruchom ponownie aplikację, aby zaczęły obowiązywać bieżące ustawienia.</string>
     <string name="user_settings_save">Zapisz</string>
     <string name="user_settings_scan_qr_code">Zeskanuj kod QR</string>
@@ -7444,6 +7449,7 @@
     <string name="user_settings_upload_avatar">Prześlij awatar</string>
     <string name="user_settings_upload_banner">Prześlij baner</string>
     <string name="user_settings_used_backup_codes">Użyte zapasowe kody</string>
+    <string name="user_settings_user_profile">Profil użytkownika</string>
     <string name="user_settings_voice_add_multiple">Możesz dodać wiele skrótów klawiszowych do Naciśnij i Mów w [Ustawieniach skrótów klawiszowych](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord używa najbardziej ekologicznego, lokalnie uprawianego kodeku Opus Voice.</string>
     <string name="user_settings_voice_codec_title">Kodek audio</string>
@@ -7681,25 +7687,6 @@
     <string name="widget">Widżet</string>
     <string name="working">Przetwarzanie danych…</string>
     <string name="xbox_authorization_title">Autoryzacja konta Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Już zajęto. Oto Twój kod: !!{code}!!. [Więcej szczegółów](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Prezent można zdobyć do 15 stycznia 2021 r. [Mniej szczegółów](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Prezent można zdobyć do 15 stycznia 2021 r. [Więcej szczegółów](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Ten kod podaliśmy również w e-mailu z potwierdzeniem, który właśnie Ci wysłaliśmy.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Coś poszło nie tak, spróbuj ponownie później!</string>
-    <string name="xbox_game_pass_modal_code_header">Kod na Xbox Game Pass na PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">O nie</string>
-    <string name="xbox_game_pass_modal_header_description_success">Zrealizuj poniższy kod na [stronie realizowania kodów Microsoft]({redemptionURL}), by uzyskać dostęp do Xbox Game Pass na PC na 3 miesiące.</string>
-    <string name="xbox_game_pass_modal_header_success">Wspaniale!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Masz subskrypcję na ulepszenia, więc damy Ci kredyty na subskrypcję Nitro. Użyjesz kredytów Nitro, gdy zasubskrybujesz **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Zrealizuj</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Masz teraz kredyty Nitro! Zasubskrybuj **{planName}** już dziś, by wykorzystać kredyty Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Super!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Kredyty na subskrypcję</string>
-    <string name="xbox_game_pass_promotion_banner_description">Dajemy Ci coś więcej. Subskrybenci Nitro otrzymują teraz 3 miesiące Xbox Game Pass na PC. Dostępne już teraz do 15 stycznia 2021 r. [Więcej szczegółów](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Dajemy Ci coś więcej. Subskrybenci Nitro otrzymują teraz 3 miesiące Xbox Game Pass na PC. Dostępne już teraz do 15 stycznia 2021 r. [Mniej szczegółów](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 miesiące Xbox Game Pass na PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Twój Xbox Game Pass na PC (3 miesiące)</string>
-    <string name="xbox_game_pass_promotion_legalese">Nie dotyczy obecnych lub uprzednich członków Xbox Game Pass na PC ani członków Xbox Game Pass Ultimate. Zrealizuj swój kod / swoje kody Xbox Game Pass na stronie [microsoft.com/redeem](https://microsoft.com/redeem) do 15 lutego 2021 r. Wymagana karta kredytowa. Jeżeli nie anulujesz subskrypcji, po zakończeniu okresu promocyjnego pobrana zostanie opłata za regularne członkostwo. Nieobsługiwane na Windows 10 w trybie S ani na urządzeniach ARM. Katalog gier zmienia się w czasie. Sprawdź go na stronie [xbox.com/gamepass](https://xbox.com/gamepass). Limit: 1 na osobę/konto.</string>
     <string name="xbox_link">Połącz</string>
     <string name="xbox_pin_step1">Otwórz aplikację Discorda na telefonie</string>
     <string name="xbox_pin_step2">Przejdź do Ustawień &gt; Połączone konta &gt; Dodaj</string>
diff --git a/app/src/main/res/values-pt-rBR/plurals.xml b/app/src/main/res/values-pt-rBR/plurals.xml
index d676865b24..fb78ec63db 100644
--- a/app/src/main/res/values-pt-rBR/plurals.xml
+++ b/app/src/main/res/values-pt-rBR/plurals.xml
@@ -532,14 +532,6 @@
         <item quantity="one">1 semana</item>
         <item quantity="other">{minimumGuildAge} semanas</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">o nome da sua categoria</item>
-        <item quantity="other">os nomes das suas categorias</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">o nome</item>
-        <item quantity="other">os nomes</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">pedido pendente</item>
         <item quantity="other">{count} pedidos pendentes</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5c8777e85e..c5893e8597 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -684,7 +684,7 @@
     <string name="beginning_group_dm">Bem-vindo (ou vinda) ao começo do grupo **!!{name}!!**.</string>
     <string name="beginning_group_dm_managed">Você sairá automaticamente deste grupo quando tiver terminado.</string>
     <string name="beginning_role_required_channel_description">Este é o começo do canal **particular** !!{channelName}!!. $[](topicHook)</string>
-    <string name="beta">S</string>
+    <string name="beta">Beta</string>
     <string name="bg">Búlgaro</string>
     <string name="billing">Cobrança</string>
     <string name="billing_accept_terms_tooltip">Aceite os Termos de Serviço para continuar</string>
@@ -1041,7 +1041,7 @@
     <string name="change_identity_modal_uploader_cta">Mudar avatar do servidor</string>
     <string name="change_identity_modal_upsell">Use um avatar diferente em cada um dos seus servidores e muito mais com o **Discord Nitro!**</string>
     <string name="change_log">Registro de alterações</string>
-    <string name="change_log_md_body">Novos recursos {added marginTop}\n======================\n\n* **Adicionamos o Descobrir Palcos.** Dê uma olhada nas comunidades com palcos ao vivo — eventos de áudio como shows, painéis, concurso de talentos e muitas outras coisas estranhas, mas completamente legais, em que você possa pensar — clicando na aba Descobrir. \n* **Encontre Seus Amigos chegou.** Nós acrescentamos uma forma prática para você encontrar seus amigos mais facilmente no Discord. Se você tiver o número do seu amigo, e ambos tenham permitido serem encontrados, você poderá encontrá-lo e mandar um pedido de amizade. Já tô até vendo as conversas do tipo: \"Se você receber um pedido de xXReidoChamegoXx#0000, sou eu.\"\n* **Adicionamos emojis favoritos.** Toque em um emoji no chat ou toque e segure no seletor de emojis para adicionar ou remover emojis dos seus favoritos. Esta lista *ainda* não vai sincronizar com seu Desktop, mas você já pode ir decidindo quais 5 dos nossos 2.459 emojis você realmente usa.\n* **Adicionamos paginação à barra de busca.** Você não vai mais precisar rolar infinitamente pelos resultados de busca. Agora você pode pular direto entre páginas para encontrar a prova concreta contra seu amigo, de que ele realmente disse isso, tipo, seis meses atrás, apesar de você não se lembrar direito, mas espera só um minuto para você ir procurar, porque ele disse isso sim e você pode provar.\n* **Adicionamos sons no canal de voz:** Agora, seu telefone fará sons quando você entrar, sair e for movido em canais de voz, e são sons que eu posso ouvir na minha cabeça com clareza assustadora. Du-rum… Di-ru-rum…\n\n\n\n\nCorreções e atualizações {progress}\n======================\n\n* **Chega de menções na edição!** Editar uma resposta não vai mais gerar uma menção ao autor, na maioria das vezes, porque eu só queria consertar meu pequeno erro de gramática e agora estou com muita vergonha.\n* **Melhorias na pasta de servidores.** Agora você pode marcar as pastas do seu servidor como lidas! Também acrescentamos configurações da pasta do servidor para você poder usar nomes e cores personalizados.\n* **Grandes melhorias e correção de erros na Avaliação de Associação.** Você não vai mais encalhar nestas páginas.\n* **Deixamos seu modo de entrada mais fácil de acessar.** Agora você pode alterar suas configurações de aperte para falar e atividade de voz sem sair da tela de chamada.\n\n\n</string>
+    <string name="change_log_md_body">Novos recursos {added marginTop}\n======================\n\n* **Encontre Seus Amigos chegou.** Nós acrescentamos uma forma prática para você encontrar seus amigos mais facilmente no Discord. Se você tiver o número do seu amigo, e ambos tenham permitido serem encontrados, você poderá encontrá-lo e mandar um pedido de amizade. Já tô até vendo as conversas do tipo: \"Se você receber um pedido de xXReidoChamegoXx#0000, sou eu.\"\n* **Adicionamos emojis favoritos.** Toque em um emoji no chat ou toque e segure no seletor de emojis para adicionar ou remover emojis dos seus favoritos. Esta lista *ainda* não vai sincronizar com seu Desktop, mas você já pode ir decidindo quais 5 dos nossos 2.459 emojis você realmente usa.\n* **Adicionamos paginação à barra de busca.** Você não vai mais precisar rolar infinitamente pelos resultados de busca. Agora você pode pular direto entre páginas para encontrar a prova concreta contra seu amigo, de que ele realmente disse isso, tipo, seis meses atrás, apesar de você não se lembrar direito, mas espera só um minuto para você ir procurar, porque ele disse isso sim e você pode provar.\n* **Adicionamos sons no canal de voz:** Agora, seu telefone fará sons quando você entrar, sair e for movido em canais de voz, e são sons que eu posso ouvir na minha cabeça com clareza assustadora. Du-rum… Di-ru-rum…\n\n\n\n\nCorreções e atualizações {progress}\n======================\n\n* **Chega de menções na edição!** Editar uma resposta não vai mais gerar uma menção ao autor, na maioria das vezes, porque eu só queria consertar meu pequeno erro de gramática e agora estou com muita vergonha.\n* **Melhorias na pasta de servidores.** Agora você pode marcar as pastas do seu servidor como lidas! Também acrescentamos configurações da pasta do servidor para você poder usar nomes e cores personalizados.\n* **Grandes melhorias e correção de erros na Avaliação de Associação.** Você não vai mais encalhar nestas páginas.\n* **Deixamos seu modo de entrada mais fácil de acessar.** Agora você pode alterar suas configurações de aperte para falar e atividade de voz sem sair da tela de chamada.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">pt-BR</string>
     <string name="change_log_md_revision">1</string>
@@ -1404,7 +1404,6 @@
     <string name="contact_sync_we_found_your_friends_body">Agora esta pessoa é sua amiga no Discord. Fale com ela, convide-a para seu servidor e divirta-se! Vamos avisar se novos amigos aparecerem no Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Encontramos seus amigos!</string>
     <string name="content_matching">Resultados de conteúdo de !!{command}!! para **!!{query}!!**</string>
-    <string name="context_menu_hint">Clique com o botão direito em um usuário para mais ações</string>
     <string name="continue_in_browser">Continuar no navegador</string>
     <string name="continue_to_webapp">Continuar para o Discord</string>
     <string name="control_volume">Controle de volume</string>
@@ -3092,8 +3091,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Os servidores no recurso Descobrir precisam ter pelo menos {minimumGuildAge} de idade. Tente novamente em {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Servidor muito novo</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Seu servidor **$[não](doesNotHook)** cumpre todos os requisitos para estar no Descobrir Servidores.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Você precisa mudar {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Você precisa mudar {numChannels} do seu canal: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Você precisa mudar sua $[descrição](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Você precisa mudar o $[nome do seu servidor](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Aumente o número de comunicadores semanais</string>
@@ -4306,6 +4303,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Melhore seus emojis, personalize seu perfil e destaque-se nos seus servidores. Escolha entre **!!{monthlyPrice}!! por mês** ou **!!{yearlyPrice}!! por ano**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Obtenha uma experiência aprimorada do Discord</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30%% de desconto em impulsos de servidor</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Use emojis personalizados e animados em qualquer lugar</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Resolução de até 1080p e 60fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">Envie 100MB ao invés de 50MB</string>
     <string name="masked_link_body">Este link vai te levar a **!!{url}!!**. Tem certeza que quer ir?</string>
@@ -4805,8 +4803,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Você tem {days} para garantir seu mês de Nitro grátis</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Você tem {hours} para garantir seu mês de Nitro grátis</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Você tem {minutes} para garantir seu mês de Nitro grátis</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Aí, assinante Nitro, parabainx! Você ganhou 3 meses de Xbox Game Pass para PC por nossa conta!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Resgatar</string>
     <string name="notice_product_feedback_survey">Gostaria de participar de conversas sobre feedback de produtos conosco?</string>
     <string name="notice_product_feedback_survey_cta">Nos avise aqui!</string>
     <string name="notice_register_to_vote">Você já se registrou para votar? Confira sua situação e faça o cadastro em dois minutos.</string>
@@ -4993,6 +4989,7 @@
     <string name="out_of_date_action">Atualizar o Discord</string>
     <string name="out_of_date_description">Fizemos algumas mudanças maneiras no Discord (e talvez uma correção de bug ou outra). Atualize para continuar.</string>
     <string name="out_of_date_title">Você está desatualizado</string>
+    <string name="outbound_promotion_redemption_modal_title">Show de bola!</string>
     <string name="outgoing_friend_request">Pedido de amizade enviado</string>
     <string name="outgoing_friend_request_delete_msg">Deseja mesmo excluir o seu pedido de amizade a **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Pedido de amizade enviado para !!{name}!!</string>
@@ -5672,12 +5669,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Requer a permissão **Ver Canais** para criar este canal privado.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Requer as permissões **Ver Canais** e **Conectar** para criar este canal privado.</string>
     <string name="profile">Perfil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Faça upload do seu banner personalizado e muito mais com Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">No momento, a personalização de perfil está disponível apenas para algumas pessoas.</string>
+    <string name="profile_customization_bio_placeholder">Conte ao mundo um pouco sobre você</string>
     <string name="profile_customization_marketing_tooltip_body">Expresse-se com uma sessão sobre mim e, se tiver o Nitro, uma faixa de perfil!</string>
     <string name="profile_customization_marketing_tooltip_cta">Entendi</string>
     <string name="profile_customization_marketing_tooltip_header">Nova personalização de perfil!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exclusivo do Nitro</string>
     <string name="promotion_card_action_claim">Resgatar</string>
-    <string name="promotion_card_body_claimed_hidden">Você já resgatou isso, mas o código está oculto devido ao modo streamer.</string>
     <string name="promotion_error_body">Parece que algo deu errado e você não consegue usar esse código. Desculpa aí.</string>
     <string name="promotion_error_title">Espere um pouco…</string>
     <string name="promotion_existing_subscriber_title">Ih, rapaz!</string>
@@ -6587,7 +6586,6 @@
     <string name="start_stage_channel_event_members_title">Apenas membros</string>
     <string name="start_stage_channel_event_modal_button">Começar o palco</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Você será um(a) orador(a) quando o palco for aberto.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Escreva um tópico para anunciar que seu palco está ao vivo.</string>
     <string name="start_stage_channel_event_modal_title">Sobre o que vocês vão conversar?</string>
     <string name="start_stage_channel_event_modal_topic_label">Tópico do palco</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Acabou a discussão: diet é melhor do que normal</string>
@@ -7269,6 +7267,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Notificações push desabilitadas</string>
     <string name="user_settings">Configurações de Usuário</string>
     <string name="user_settings_about_me">Sobre mim</string>
+    <string name="user_settings_about_me_description">Escreva o que quiser sobre você, desde que tenha menos de {maxLength} caracteres. Você pode usar markdown e links, se desejar.</string>
     <string name="user_settings_account_change_email_prompt">Seu e-mail atual é !!{email}!! Gostaria de mudar para qual e-mail?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Insira um novo e-mail e sua senha atual.</string>
     <string name="user_settings_account_change_email_title">Editar e-mail</string>
@@ -7303,6 +7302,8 @@
     <string name="user_settings_appearance_preview_message_5">Ah, aqui está!</string>
     <string name="user_settings_appearance_zoom_tip">Você pode mudar o nível de zoom com {modKey} +/- e retornar ao zoom padrão com {modKey}+0.</string>
     <string name="user_settings_available_codes">Códigos de recuperação disponíveis</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Recomendamos uma imagem com pelo menos 600x240. Você pode utilizar PNG, JPG ou GIF animado.</string>
     <string name="user_settings_blocked_users">Usuários bloqueados</string>
     <string name="user_settings_blocked_users_empty">Você não tem usuários bloqueados</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Usuários Bloqueados</string>
@@ -7311,11 +7312,13 @@
     <string name="user_settings_close_button">Botão Fechar</string>
     <string name="user_settings_confirm_logout">Deseja mesmo sair?</string>
     <string name="user_settings_customization_upsell">Desbloquear com Nitro</string>
+    <string name="user_settings_customize_profile_title">Personalização do meu perfil</string>
     <string name="user_settings_delete_avatar">Excluir Avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Desligar isso pode ajudar se sua voz não está sendo detectada pela sensibilidade automática de entrada.</string>
     <string name="user_settings_disable_noise_suppression">A redução de ruído fica desativada enquanto a supressão de ruído estiver ativa.</string>
     <string name="user_settings_edit_account">Editar conta</string>
     <string name="user_settings_edit_account_password_label">Insira sua senha para confirmar as mudanças</string>
+    <string name="user_settings_edit_profile">Editar perfil</string>
     <string name="user_settings_enter_password_view_codes">Insira sua senha para ver códigos de recuperação.</string>
     <string name="user_settings_games_install_location">Localização</string>
     <string name="user_settings_games_install_location_add">Adicionar local de instalação</string>
@@ -7366,6 +7369,8 @@
     <string name="user_settings_open_on_startup_label">Abrir o Discord</string>
     <string name="user_settings_privacy_terms">Veja nossos [Termos de Serviço]({termsLink}) e [Política de Privacidade]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Faixa do perfil</string>
+    <string name="user_settings_remove_avatar">Remover avatar</string>
+    <string name="user_settings_remove_banner">Remover faixa</string>
     <string name="user_settings_restart_app_mobile">Reinicie o aplicativo para aplicar suas novas configurações.</string>
     <string name="user_settings_save">Salvar</string>
     <string name="user_settings_scan_qr_code">Escanear o código QR</string>
@@ -7380,6 +7385,7 @@
     <string name="user_settings_upload_avatar">Enviar Avatar</string>
     <string name="user_settings_upload_banner">Carregar faixa</string>
     <string name="user_settings_used_backup_codes">Códigos de recuperação usados</string>
+    <string name="user_settings_user_profile">Perfil de usuário</string>
     <string name="user_settings_voice_add_multiple">Você pode adicionar múltiplos atalhos de Aperte para Falar nas [Configurações de Atalho](onClick).</string>
     <string name="user_settings_voice_codec_description">O Discord utiliza apenas o melhor codec orgânico de origem local Opus Voice.</string>
     <string name="user_settings_voice_codec_title">Codec de áudio</string>
@@ -7615,25 +7621,6 @@
     <string name="whitelisting">Adicionando à lista branca…</string>
     <string name="working">Trabalhando…</string>
     <string name="xbox_authorization_title">Autorização da conta Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Você já resgatou isso. Seu código é !!{code}!!. [Mais detalhes](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">O presente pode ser resgatado até 15 de janeiro de 2021. [Menos detalhes](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">O presente pode ser resgatado até 15 de janeiro de 2021. [Mais detalhes](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Este código também está em um e-mail de confirmação que acabamos de te enviar.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Algo deu errado, tente novamente mais tarde!</string>
-    <string name="xbox_game_pass_modal_code_header">Código do Xbox Game Pass para PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Ah, não</string>
-    <string name="xbox_game_pass_modal_header_description_success">Resgate o código abaixo no [site de resgate da Microsoft]({redemptionURL}) para ter 3 meses de acesso ao Xbox Game Pass para PC.</string>
-    <string name="xbox_game_pass_modal_header_success">Show de bola!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Já que você tem uma assinatura de impulsos, vamos te dar crédito de assinatura do Nitro. O crédito Nitro será aplicado quando você assinar **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Resgatar</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Agora você tem créditos Nitro! Assine hoje o **{planName}** para aplicar seu crédito Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Aêêê!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Crédito de Assinatura</string>
-    <string name="xbox_game_pass_promotion_banner_description">Conseguimos um brinde pra você. Assinantes Nitro ganham 3 meses de Xbox Game Pass para PC. Disponível até 15 de janeiro de 2021. [Mais detalhes](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Conseguimos um brinde pra você. Assinantes Nitro ganham 3 meses de Xbox Game Pass para PC. Disponível até 15 de janeiro de 2021. [Menos detalhes](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 meses de Xbox Game Pass para PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass para PC (3 meses)</string>
-    <string name="xbox_game_pass_promotion_legalese">Não é válido para membros atuais ou passados do Xbox Game Pass para PC, ou membros existentes do Xbox Game Pass Ultimate. Resgate seu(s) código(s) do Xbox Game Pass em [microsoft.com/redeem](https://microsoft.com/redeem) até 15 de fevereiro de 2021. Cartão de crédito necessário. A menos que cancele, você receberá a cobrança vigente mensalmente após o término do período promocional. Não é compatível com Windows 10 em modo S e em dispositivos ARM. O catálogo de jogos varia com o tempo. Vide [xbox.com/gamepass](https://xbox.com/gamepass). Limite: 1 por pessoa/conta.</string>
     <string name="xbox_link">Vincular</string>
     <string name="xbox_pin_step1">Abra o aplicativo do Discord no seu telefone</string>
     <string name="xbox_pin_step2">Vá para Configurações do usuário &gt; Conexões &gt; Adicionar</string>
diff --git a/app/src/main/res/values-ro/plurals.xml b/app/src/main/res/values-ro/plurals.xml
index c6b5432e5f..002b385f61 100644
--- a/app/src/main/res/values-ro/plurals.xml
+++ b/app/src/main/res/values-ro/plurals.xml
@@ -558,14 +558,6 @@
         <item quantity="one">1 săptămână</item>
         <item quantity="other">{minimumGuildAge} săptămâni</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">categoriei</item>
-        <item quantity="other">categoriilor</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">canalului</item>
-        <item quantity="other">canalelor</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Cerere în așteptare</item>
         <item quantity="other">{count} cereri în așteptare</item>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 0dda2ef18c..6420d37806 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1383,7 +1383,6 @@
     <string name="contact_sync_we_found_your_friends_body">Acum sunteți prieteni pe Discord. Stați de vorbă, invită-i pe server-ul tău, distrați-vă! Te vom anunța când îți apar noi prieteni pe Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Ți-am găsit prieteni!</string>
     <string name="content_matching">Conținut !!{command}!! care corespunde cu **!!{query}!!**</string>
-    <string name="context_menu_hint">Click dreapta pe utilizator pentru mai multe acțiuni</string>
     <string name="continue_in_browser">Continuă în browser</string>
     <string name="continue_to_webapp">Continuă pe Discord</string>
     <string name="control_volume">Controlează volumul</string>
@@ -3052,8 +3051,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Serverele din Descoperire trebuie să aibă cel puțin {minimumGuildAge}. Te rugăm să revii pe {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server-ul este prea nou</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Server-ul tău **$[nu](doesNotHook)** îndeplinește toate cerințele pentru a fi inclus în Descoperire server.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Trebuie să schimbi numele {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Trebuie să schimbi numele {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Trebuie să schimbi $[descrierea](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Trebuie să schimbi $[numele server-ului](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Crește numărul de persoane care comunică săptămânal</string>
@@ -4768,8 +4765,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Mai ai {days} pentru a obține o lună gratuită de Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Mai ai {hours} pentru a obține o lună gratuită de Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Mai ai {minutes} pentru a obține o lună gratuită de Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Felicitări, abonat Nitro! Îți oferim gratuit 3 luni de Xbox Game Pass pentru PC!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Revendică</string>
     <string name="notice_product_feedback_survey_cta">Anunță-ne aici!</string>
     <string name="notice_scheduled_maintenance">Discord va fi supus întreținerii programate pe **{start}** la **{start}**.</string>
     <string name="notice_spotify_auto_paused">Redarea Spotify a fost pusă pe pauză în timpul transmiterii audio.</string>
@@ -4954,6 +4949,7 @@
     <string name="out_of_date_action">Actualizează Discord</string>
     <string name="out_of_date_description">Am făcut niște schimbări faine la Discord (probabil am și reparat câteva erori). Actualizează pentru a continua.</string>
     <string name="out_of_date_title">Ai expirat</string>
+    <string name="outbound_promotion_redemption_modal_title">Super!</string>
     <string name="outgoing_friend_request">Cerere de prietenie trimisă</string>
     <string name="outgoing_friend_request_delete_msg">Ești sigur că vrei să-ți ștergi cererea de prietenie către **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Cerere de prietenie trimisă către !!{name}!!</string>
@@ -5631,12 +5627,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Ai nevoie de permisiunea **Vizualizează canalele** pentru a putea crea acest canal privat.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Ai nevoie de permisiunile **Vizualizează canalele** și **Conectează-te** pentru a putea crea acest canal privat.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Încarcă-ți propriul banner personalizat și multe altele cu Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Personalizarea profilului este momentan disponibilă doar unui număr limitat de utilizatori.</string>
+    <string name="profile_customization_bio_placeholder">Povestește oamenilor câte ceva despre tine</string>
     <string name="profile_customization_marketing_tooltip_body">Exprimă-te cu o secțiune „despre mine” și, dacă ai Nitro, cu un banner pentru profil!</string>
     <string name="profile_customization_marketing_tooltip_cta">Am înțeles</string>
     <string name="profile_customization_marketing_tooltip_header">Noi opțiuni de personalizare a profilului!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exclusiv la Nitro</string>
     <string name="promotion_card_action_claim">Revendică</string>
-    <string name="promotion_card_body_claimed_hidden">Ai revendicat deja asta, dar codul este ascuns din cauza Modului streamer.</string>
     <string name="promotion_error_body">Se pare că ceva nu a funcționat corect și nu poți folosi acest cod. Ne pare rău.</string>
     <string name="promotion_error_title">Așteaptă o clipă…</string>
     <string name="promotion_existing_subscriber_title">Oh, nu!</string>
@@ -6541,7 +6539,6 @@
     <string name="start_stage_channel_event_members_title">Exclusiv pentru membri</string>
     <string name="start_stage_channel_event_modal_button">Deschide podiumul</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Vei avea rolul de vorbitor la deschiderea podiumului.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Indică un subiect pentru a anunța că podiumul este în direct.</string>
     <string name="start_stage_channel_event_modal_title">Despre ce se va vorbi?</string>
     <string name="start_stage_channel_event_modal_topic_label">Subiect podium</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Nici nu e loc de discuții: varianta light e mult superioară</string>
@@ -7220,6 +7217,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Notificările push nu sunt active</string>
     <string name="user_settings">Setări utilizator</string>
     <string name="user_settings_about_me">Despre mine</string>
+    <string name="user_settings_about_me_description">Scrie ce vrei despre tine, atât timp cât te încadrezi în {maxLength} caractere. Dacă vrei, poți folosi linkuri și sintaxa markdown.</string>
     <string name="user_settings_account_change_email_prompt">Adresa ta actuală de e-mail este !!{email}!! Cu ce vrei să o înlocuiești?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Introdu o adresă de e-mail nouă și parola actuală.</string>
     <string name="user_settings_account_change_email_title">Editează adresa de e-mail</string>
@@ -7254,6 +7252,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh, aici este!</string>
     <string name="user_settings_appearance_zoom_tip">Poți schimba nivelul de zoom cu {modKey} +/- și reseta la mărirea normală cu {modKey}+0.</string>
     <string name="user_settings_available_codes">Coduri de rezervă disponibile</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Îți recomandăm o imagine cu o rezoluție de cel puțin 600x240. Poți încărca un fișier PNG, JPG sau un GIF animat.</string>
     <string name="user_settings_blocked_users">Utilizatori blocați</string>
     <string name="user_settings_blocked_users_empty">Nu ai utilizatori blocați</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} utilizatori blocați</string>
@@ -7262,12 +7262,14 @@
     <string name="user_settings_close_button">Buton de închidere</string>
     <string name="user_settings_confirm_logout">Ești sigur că vrei să te deconectezi?</string>
     <string name="user_settings_customization_upsell">Deblochează cu Nitro</string>
+    <string name="user_settings_customize_profile_title">Personalizare profilul meu</string>
     <string name="user_settings_delete_avatar">Șterge avatarul</string>
     <string name="user_settings_disable_advanced_voice_activity">Dezactivarea acestei opțiuni poate fi utilă dacă vocea ta nu este detectată de sensibilitatea automată a sistemului de intrare audio.</string>
     <string name="user_settings_disable_noise_suppression">Reducerea zgomotului este dezactivată în timp ce este activă funcția de suprimare a zgomotului.</string>
     <string name="user_settings_edit_account">Editează cont</string>
     <string name="user_settings_edit_account_password_label">Introdu-ți parola pentru a confirma modificările</string>
     <string name="user_settings_edit_account_tag">ETICHETĂ</string>
+    <string name="user_settings_edit_profile">Editează profilul</string>
     <string name="user_settings_enter_password_view_codes">Introdu-ți parola pentru a vizualiza codurile de rezervă.</string>
     <string name="user_settings_games_install_location">Locație</string>
     <string name="user_settings_games_install_location_add">Adaugă locație de instalare</string>
@@ -7316,6 +7318,8 @@
     <string name="user_settings_open_on_startup_label">Deschide Discord</string>
     <string name="user_settings_privacy_terms">Consultă [Condițiile de Prestare a Serviciilor]({termsLink}) și [Politica de confidențialitate]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Banner pentru profil</string>
+    <string name="user_settings_remove_avatar">Elimină avatarul</string>
+    <string name="user_settings_remove_banner">Elimină bannerul</string>
     <string name="user_settings_restart_app_mobile">Repornește aplicația pentru ca setările tale să fie puse în aplicare.</string>
     <string name="user_settings_save">Salvează</string>
     <string name="user_settings_scan_qr_code">Scanează cod QR</string>
@@ -7330,6 +7334,7 @@
     <string name="user_settings_upload_avatar">Încarcă un avatar</string>
     <string name="user_settings_upload_banner">Încarcă un banner</string>
     <string name="user_settings_used_backup_codes">Coduri de rezervă folosite</string>
+    <string name="user_settings_user_profile">Profil utilizator</string>
     <string name="user_settings_voice_add_multiple">Poți adaugă mai multe taste pentru Push to Talk din [Setări scurtături](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord folosește doar cel mai bun codec Opus Voice organic produs local.</string>
     <string name="user_settings_voice_codec_title">Codec audio</string>
@@ -7565,25 +7570,6 @@
     <string name="whitelisting">Se adaugă în lista albă…</string>
     <string name="working">Se lucrează…</string>
     <string name="xbox_authorization_title">Autorizare cont Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Ai revendicat deja asta. Codul tău este !!{code}!!. [Mai multe detalii](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Cadoul poate fi revendicat până pe 15 ianuarie 2021. [Mai puține detalii](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Cadoul poate fi revendicat până pe 15 ianuarie 2021. [Mai multe detalii](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Acest cod figurează și în e-mail-ul de confirmare pe care tocmai ți l-am trimis.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Ceva nu a mers bine, încearcă din nou mai târziu!</string>
-    <string name="xbox_game_pass_modal_code_header">Cod Xbox Game Pass pentru PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Vai</string>
-    <string name="xbox_game_pass_modal_header_description_success">Valorifică codul de mai jos pe [site-ul Microsoft dedicat]({redemptionURL}) pentru a avea acces la Xbox Game Pass pentru PC timp de 3 luni.</string>
-    <string name="xbox_game_pass_modal_header_success">Super!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Pentru că ai abonament Boost, îți vom oferi credit pentru un abonament Nitro. Creditul Nitro se va aplica atunci când te abonezi la **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Valorifică</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Acum ai credit Nitro! Abonează-te la **{planName}** chiar azi și folosește-ți creditul Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Tare!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Credit abonament</string>
-    <string name="xbox_game_pass_promotion_banner_description">Ți-am mai pregătit ceva. Abonații la Nitro primesc acum 3 luni de Xbox Game Pass pentru PC. Oferta e valabilă până pe 15 ianuarie 2021. [Mai multe detalii](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Ți-am mai pregătit ceva. Abonații la Nitro primesc acum 3 luni de Xbox Game Pass pentru PC. Oferta e valabilă până pe 15 ianuarie 2021. [Mai puține detalii](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 luni de Xbox Game Pass pentru PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass pentru PC (3 luni)</string>
-    <string name="xbox_game_pass_promotion_legalese">Oferta nu este valabilă pentru membrii Xbox Game Pass pentru PC actuali sau anteriori sau pentru membrii Xbox Game Pass Ultimate. Valorifică-ți codul sau codurile Xbox Game Pass la adresa [microsoft.com/redeem](https://microsoft.com/redeem) până pe 15 februarie 2021. Este necesar un card de credit. Cu excepția cazului în care anulezi, după încheierea perioadei promoționale ți se va percepe lunar tariful de abonament obișnuit valabil la momentul respectiv. Oferta nu este acceptată pe Windows 10 în modul S și nici pe dispozitivele ARM. Catalogul cu jocuri variază în timp. Consultă [xbox.com/gamepass](https://xbox.com/gamepass). Limită: 1 per persoană/cont.</string>
     <string name="xbox_link">Asociază</string>
     <string name="xbox_pin_step1">Deschide aplicația Discord pe telefonul tău</string>
     <string name="xbox_pin_step2">Mergi la Setări &gt; Conexiuni &gt; Adaugă</string>
diff --git a/app/src/main/res/values-ru/plurals.xml b/app/src/main/res/values-ru/plurals.xml
index 43208eedec..aa3050f1ad 100644
--- a/app/src/main/res/values-ru/plurals.xml
+++ b/app/src/main/res/values-ru/plurals.xml
@@ -640,14 +640,6 @@
         <item quantity="one">1 недели</item>
         <item quantity="other">{minimumGuildAge} недель</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">1 категории</item>
-        <item quantity="other">нескольких категорий</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">1 канала</item>
-        <item quantity="other">нескольких каналов</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Заявка на рассмотрении</item>
         <item quantity="few">{count} заявки на рассмотрении</item>
@@ -1321,6 +1313,15 @@
         <item quantity="few">{count} участника</item>
         <item quantity="other">{count} участников</item>
     </plurals>
+    <plurals name="role_row_description_count">
+        <item quantity="one">{count} участник</item>
+        <item quantity="few">{count} участника</item>
+        <item quantity="other">{count} участников</item>
+    </plurals>
+    <plurals name="role_row_view_members_count">
+        <item quantity="one">{count} участника</item>
+        <item quantity="other">{count} участников</item>
+    </plurals>
     <plurals name="roles_list_numRoles">
         <item quantity="one">Роли</item>
         <item quantity="few">Роли</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a1f618dc03..9c2fd61eb6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -179,6 +179,7 @@
     <string name="add_friend_nearby_stopped">Работа функции «Поблизости» прекращена.</string>
     <string name="add_friend_nearby_title">Ищем ваших друзей на радиоволнах…</string>
     <string name="add_friend_nickname">Добавить никнейм друга</string>
+    <string name="add_friend_other_options">или используйте эти настройки</string>
     <string name="add_friend_placeholder">Введите имя пользователя#0000</string>
     <string name="add_friend_success">Получилось! Запрос дружбы отправлен **!!{discordTag}!!**.</string>
     <string name="add_keybind">Добавить горячие клавиши</string>
@@ -232,7 +233,9 @@
     <string name="age_gate_underage_header">Не удалось зарегистрировать</string>
     <string name="age_gate_view_help_article">Посмотреть статью</string>
     <string name="age_gate_your_birthday">Ваш день рождения</string>
+    <string name="aka_more_avatars_overflow">Просмотреть больше аватаров для разных серверов</string>
     <string name="all_servers">Все серверы</string>
+    <string name="allow">Разрешить</string>
     <string name="allow_direct_messages">Разрешить личные сообщения</string>
     <string name="allow_direct_messages_caption">Вам сможет написать любой участник сервера.</string>
     <string name="allow_server_dms">Разрешить личные сообщения от участников сервера.</string>
@@ -926,6 +929,22 @@
     <string name="browser_notifications_enabled_body">Вжух. Уведомления идут!</string>
     <string name="browser_output_device_warning">Устройства вывода не могут быть изменены через браузер. [Загрузите](onDownloadClick) приложение для компьютера, чтобы получить полный контроль над устройствами вывода.</string>
     <string name="bug_hunter_badge_tooltip">Discord Bug Hunter</string>
+    <string name="bug_report_description">Подробное описание (необязательно)</string>
+    <string name="bug_report_error_name_required">Нужно указать название проблемы</string>
+    <string name="bug_report_error_priority_required">Нужно указать приоритет</string>
+    <string name="bug_report_name">В чём проблема?</string>
+    <string name="bug_report_no_screenshot">Скриншот удалён из жалобы</string>
+    <string name="bug_report_priority">Приоритет</string>
+    <string name="bug_report_priority_critical_description">**Срочно и важно.** Это **критические проблемы**, которые не позволяют **широкому кругу** пользователей использовать основные функции приложения.</string>
+    <string name="bug_report_priority_critical_title">Критичный (П0)</string>
+    <string name="bug_report_priority_high_description">**Срочно, но не важно.** Это проблемы, которые мешают пользователям использовать ключевые функции приложения, но при этом остальные функции им доступны.</string>
+    <string name="bug_report_priority_high_title">Высокий (П1)</string>
+    <string name="bug_report_priority_low_description">**Не срочно, но важно.** Проблемы, которые отрицательно сказываются на возможности пользователей использовать приложение, но при этом ключевые функции приложения им доступны.</string>
+    <string name="bug_report_priority_low_title">Низкий (П2)</string>
+    <string name="bug_report_priority_very_low_description">**Не срочно и не важно.** П3 даёт нам понять, что существует какая-то проблема, но её исправление можно отложить до того времени, когда мы разберёмся с более насущными проблемами.</string>
+    <string name="bug_report_priority_very_low_title">Очень низкий (П3)</string>
+    <string name="bug_report_status_sending">Отправка жалобы</string>
+    <string name="bug_report_status_sent">Жалоба отправлена</string>
     <string name="build_override">Переопределение сборки</string>
     <string name="build_override_apply">Подать заявку</string>
     <string name="build_override_clear">Очистить</string>
@@ -1032,9 +1051,23 @@
     <string name="change_email">Нажмите тут, чтобы поменять электронную почту</string>
     <string name="change_email_short">Сменить адрес эл. почты</string>
     <string name="change_friend_nickname">Изменить никнейм друга</string>
+    <string name="change_guild_member_avatar">Изменить аватар на сервере</string>
     <string name="change_icon">Сменить значок</string>
+    <string name="change_identity">Сменить личность</string>
+    <string name="change_identity_beta_tooltip">На текущий момент возможность выбора разных аватаров для каждого сервера доступна ограниченному кругу пользователей.</string>
+    <string name="change_identity_guild_header_tooltip_button">Ясно</string>
+    <string name="change_identity_guild_header_tooltip_content">Используйте никнейм, а также, при наличии подписки Nitro, разные аватары на каждом из своих серверов.</string>
+    <string name="change_identity_guild_header_tooltip_title">НОВОЕ! Измените свою личность на сервере</string>
+    <string name="change_identity_modal_change_nickname_disabled">Никнейм (выключен)</string>
+    <string name="change_identity_modal_description">Вы можете изменить то, как другие видят вас на этом сервере, выбрав никнейм и аватар для этого сервера.</string>
+    <string name="change_identity_modal_per_server_section">Аватары для серверов $[БЕТА](betaBadgeHook)</string>
+    <string name="change_identity_modal_reset_primary_avatar">Вернуться к основному аватару</string>
+    <string name="change_identity_modal_title">Сменить сервер</string>
+    <string name="change_identity_modal_unknown_error">Неизвестная ошибка</string>
+    <string name="change_identity_modal_uploader_cta">Изменить аватар на сервере</string>
+    <string name="change_identity_modal_upsell">Используйте разные аватары на каждом из своих серверов и многое другое с **подпиской Discord Nitro!**</string>
     <string name="change_log">Список изменений</string>
-    <string name="change_log_md_body">Новые функции {added marginTop}\n======================\n\n* **Добавлено «Путешествие по трибунам».** Щёлкнув по новой вкладке «Путешествие», вы сможете найти сообщества, которые организуют открытые трибуны — голосовые события, такие как концерты, семинары, шоу талантов и множество других странных, но легальных мероприятий, которые только придут вам в голову. \n* **Функция «Найдите своих друзей»:** Теперь искать друзей в Discord стало ещё проще. Если вам известен номер телефона друга и вы оба включите у себя эту функцию, то этого будет достаточно, чтобы отправить запрос дружбы. Только не смотрите другу в глаза, когда будете объяснять ему, что xXPozhirayuDushiXx#0000 — это вы.\n* **Добавлены избранные эмодзи.** Коснитесь эмодзи в чате или нажмите и удерживайте эмодзи в соответствующем меню, чтобы добавить его в список избранного или убрать оттуда. Ваши любимые эмодзи *пока* не будут синхронизированы с Discord на компьютере, но вы уже можете прикинуть, какие 5 из 2459 эмодзи вы используете чаще всего.\n* **Добавлена нумерация страниц поиска.** Больше не нужно бесконечно прокручивать результаты поиска. Теперь вы легко сможете победить в споре с друзьями и найти ту фразу, которую они сказали полгода назад, даже если они утверждают, будто такого не было.\n* **Добавлены звуки голосовых каналов:** теперь ваш телефон будет воспроизводить звуки, когда вы присоединяетесь к голосовому каналу, покидаете его или вас туда перемещают. Пара-пара-пам! Фьють!\n\n\n\n\nИсправления и улучшения {progress}\n======================\n\n* **Больше никаких упоминаний из-за редактирования!** При исправлении ответа теперь не будет упоминаться автор исходного сообщения, чтобы избежать ситуаций вроде «я просто хочу исправить небольшую грамматическую ошибку, а теперь мне ужасно стыдно».\n* **Улучшения папок серверов.** Теперь можно отметить папки серверов как прочитанные! Мы также добавили настройки папок серверов, чтобы вы могли использовать для них свои названия и цвета.\n* **Мы значительно улучшили и исправили функцию отбора участников.** Вы больше не застрянете на этих страницах.\n* **Доступ к режиму ввода стал проще.** Теперь можно переключаться с режима рации на активацию по голосу и обратно прямо на экране звонка.\n\n\n</string>
+    <string name="change_log_md_body">Новые функции {added marginTop}\n======================\n\n* **Функция «Найдите своих друзей»:** Теперь искать друзей в Discord стало ещё проще. Если вам известен номер телефона друга и вы оба включите у себя эту функцию, то этого будет достаточно, чтобы отправить запрос дружбы. Только не смотрите другу в глаза, когда будете объяснять ему, что xXPozhirayuDushiXx#0000 — это вы.\n* **Добавлены избранные эмодзи.** Коснитесь эмодзи в чате или нажмите и удерживайте эмодзи в соответствующем меню, чтобы добавить его в список избранного или убрать оттуда. Ваши любимые эмодзи *пока* не будут синхронизированы с Discord на компьютере, но вы уже можете прикинуть, какие 5 из 2459 эмодзи вы используете чаще всего.\n* **Добавлена нумерация страниц поиска.** Больше не нужно бесконечно прокручивать результаты поиска. Теперь вы легко сможете победить в споре с друзьями и найти ту фразу, которую они сказали полгода назад, даже если они утверждают, будто такого не было.\n* **Добавлены звуки голосовых каналов:** теперь ваш телефон будет воспроизводить звуки, когда вы присоединяетесь к голосовому каналу, покидаете его или вас туда перемещают. Пара-пара-пам! Фьють!\n\n\n\n\nИсправления и улучшения {progress}\n======================\n\n* **Больше никаких упоминаний из-за редактирования!** При исправлении ответа теперь не будет упоминаться автор исходного сообщения, чтобы избежать ситуаций вроде «я просто хочу исправить небольшую грамматическую ошибку, а теперь мне ужасно стыдно».\n* **Улучшения папок серверов.** Теперь можно отметить папки серверов как прочитанные! Мы также добавили настройки папок серверов, чтобы вы могли использовать для них свои названия и цвета.\n* **Мы значительно улучшили и исправили функцию отбора участников.** Вы больше не застрянете на этих страницах.\n* **Доступ к режиму ввода стал проще.** Теперь можно переключаться с режима рации на активацию по голосу и обратно прямо на экране звонка.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">ru</string>
     <string name="change_log_md_revision">1</string>
@@ -1397,7 +1430,6 @@
     <string name="contact_sync_we_found_your_friends_body">Теперь вы друзья в Discord. Поговорите друг с другом, пригласите их на свой сервер — повеселитесь вместе! Мы дадим знать, когда другие ваши контакты присоединятся к Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Мы нашли ваших друзей!</string>
     <string name="content_matching">Результаты !!{command}!! по запросу **!!{query}!!**</string>
-    <string name="context_menu_hint">Для других действий щёлкните правой кнопкой по пользователю</string>
     <string name="continue_in_browser">Продолжить в браузере</string>
     <string name="continue_to_webapp">Перейти в Discord</string>
     <string name="control_volume">Изменить громкость</string>
@@ -1854,6 +1886,8 @@
     <string name="developer_application_test_mode_placeholder">Код приложения</string>
     <string name="developer_mode">Режим разработчика</string>
     <string name="developer_mode_help_text">Режим разработчика раскрывает элементы контекстного меню, полезные для создания ботов с использованием [Discord API]({apiDocsUrl}).</string>
+    <string name="developer_settings_bug_reporting_description">Позволяет сообщить Discord об ошибке после того, как вы делаете скриншот</string>
+    <string name="developer_settings_bug_reporting_title">Скриншот для сообщения об ошибке</string>
     <string name="device_settings">Настройки устройства</string>
     <string name="dialog_just_so_you_know">Обратите внимание!</string>
     <string name="direct_message">Личное сообщение</string>
@@ -2038,6 +2072,7 @@
     <string name="enable_ingame_overlay">Включить внутриигровой оверлей.</string>
     <string name="enable_noise_cancellation">Включить шумоподавление</string>
     <string name="enable_notifications">Включить уведомления</string>
+    <string name="enable_notifications_titlecase">Включить уведомления</string>
     <string name="enable_permission">Предоставить разрешение</string>
     <string name="enable_privacy_access">Вы можете разрешить доступ в настройках конфиденциальности.</string>
     <string name="enable_public_modal_content_filter_help">Discord будет автоматически сканировать и удалять медиафайлы с нежелательным содержимым на этом сервере (не распространяется на каналы с откровенным контентом).</string>
@@ -2890,6 +2925,8 @@
     <string name="guild_join_reason_other">Другое</string>
     <string name="guild_join_reason_search_online">Я отыскал(-а) этот сервер в сети</string>
     <string name="guild_join_reason_title_label">Ваш ответ</string>
+    <string name="guild_member_avatar_upsell_body">Будьте, кем захотите: используйте разные аватары на каждом из своих серверов, разблокируйте анимированные аватары — всё это [и многое другое с подпиской Discord Nitro!](onAndMore)</string>
+    <string name="guild_member_avatar_upsell_title">Хотите сменить аватар?</string>
     <string name="guild_members_header">Участники: !!{guild}!!</string>
     <string name="guild_members_search_no_result">Участники не найдены.</string>
     <string name="guild_owner">Владелец сервера</string>
@@ -3032,6 +3069,7 @@
     <string name="guild_settings_audit_log_channel_stage_create">$[**!!{user}!!**](userHook) создаёт трибуну $[**!!{target}!!**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_text_create">$[**!!{user}!!**](userHook) создаёт текстовый канал $[**!!{target}!!**](targetHook)</string>
     <string name="guild_settings_audit_log_channel_topic_change">Меняет заголовок на **!!{newValue}!!**</string>
+    <string name="guild_settings_audit_log_channel_topic_clear">Тема **очищена**</string>
     <string name="guild_settings_audit_log_channel_topic_create">Устанавливает тему канала: **!!{newValue}!!**</string>
     <string name="guild_settings_audit_log_channel_type_change">Меняет тип с **!!{oldValue}!!** на **!!{newValue}!!**</string>
     <string name="guild_settings_audit_log_channel_type_create">Устанавливает тип на **!!{newValue}!!**</string>
@@ -3209,8 +3247,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Серверам из «Путешествия» должно быть не менее {minimumGuildAge}. Возвращайтесь {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Слишком молодой сервер</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Ваш сервер **$[не удовлетворяет](doesNotHook)** всем требованиям и не может быть добавлен в «Путешествие по серверам».</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Вам нужно изменить название {numCategories}: $[{categoryNames}](categoryHook).</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Вам нужно изменить название {numChannels}: $[{channelNames}](channelHook).</string>
     <string name="guild_settings_discovery_checklist_change_description">Вам нужно изменить $[описание](descriptionHook).</string>
     <string name="guild_settings_discovery_checklist_change_name">Вам нужно изменить $[название сервера](nameHook).</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Увеличьте количество еженедельных собеседников</string>
@@ -4355,6 +4391,7 @@
     <string name="login_as">Вход: !!{username}!!</string>
     <string name="login_body">Войдите с помощью электронной почты, чтобы начать общение.</string>
     <string name="login_required">Требуются действительные данные для входа.</string>
+    <string name="login_stage">Зайти в качестве слушателя</string>
     <string name="login_title">С возвращением!</string>
     <string name="login_with_qr">Войти с помощью QR-кода</string>
     <string name="login_with_qr_description">Отсканируйте код с помощью **мобильного приложения Discord**, чтобы сразу же войти в систему.</string>
@@ -4403,6 +4440,10 @@
     <string name="mark_as_read">Пометить как прочитанное</string>
     <string name="mark_unread">Отметить как непрочитанное</string>
     <string name="marked_as_read">Помечено как прочитанное</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_guild_cap">Не включает дополнительные серверы</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_message_length">Не включает длинные сообщения</string>
+    <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages">Не включает длинные сообщения</string>
+    <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds">Не включает дополнительные серверы</string>
     <string name="marketing_refresh_premium_features_badge_heading">Пусть все знают о вашей поддержке</string>
     <string name="marketing_refresh_premium_features_badge_subheading">Значок в профиле показывает, как долго вы поддерживаете Discord.</string>
     <string name="marketing_refresh_premium_features_emoji_heading">Больше силы эмодзи</string>
@@ -4422,14 +4463,19 @@
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_label">Не включает {numFreeGuildSubscriptions}. Загружайте файлы до 50 МБ (вместо 100 МБ) и получите разрешение до 1080p при 60 кадрах в секунду.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_message_length">**Не включает** увеличенную длину сообщений.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_no_premium_guild_subscriptions">**Не** включает {numFreeGuildSubscriptions}.</string>
-    <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_profile_customization">**Не включает** настройку профиля.</string>
+    <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_profile_customization">**Не включает** баннер профиля.</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_perks_info_upload">Загружайте файлы до 50 МБ (вместо 100 МБ).</string>
     <string name="marketing_refresh_premium_tier_1_cta_description_with_price">Не хотите ничего лишнего? Перейдите на упрощённый тариф с меньшим количеством бонусов $[подробности](infoHook), продолжайте поддерживать Discord и получите скидку !!{discountPercentage}!! на бусты сервера. Выбирайте: **!!{monthlyPrice}!! в месяц** или **!!{yearlyPrice}!! в год**.</string>
+    <string name="marketing_refresh_premium_tier_1_cta_description_with_price_no_info_hook">Не хотите ничего лишнего? Перейдите на упрощённый тариф с меньшим количеством бонусов, продолжайте поддерживать Discord и получите скидку !!{discountPercentage}!! на бусты сервера. Выбирайте: **!!{monthlyPrice}!! в месяц** или **!!{yearlyPrice}!! в год**.</string>
     <string name="marketing_refresh_premium_tier_2_cta_subtitle">Выберите подходящий тариф и начните создавать свою коллекцию эмодзи.</string>
     <string name="marketing_refresh_premium_tier_2_cta_title">Готовы перейти на Nitro?</string>
     <string name="marketing_refresh_premium_tier_2_subtitle">Улучшите свои эмодзи, персонализируйте профиль и выделитесь на своих серверах.</string>
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Улучшите свои эмодзи, персонализируйте профиль и заявите о себе на своих серверах. Выбирайте: **!!{monthlyPrice}!! в месяц** или **!!{yearlyPrice}!! в год**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Расширьте свои возможности в Discord.</string>
+    <string name="marketing_tier_1_perk_list_boost_discount">30%% скидка на бусты сервера</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Используйте кастомные и анимированные эмодзи где угодно</string>
+    <string name="marketing_tier_1_perk_list_stream_quality">Разрешение до 1080p при 60 кадрах в секунду</string>
+    <string name="marketing_tier_1_perk_list_upload_size">Загрузка файлов до 50 МБ (вместо 100 МБ)</string>
     <string name="masked_link_body">Эта ссылка ведёт на **!!{url}!!**. Вы действительно хотите туда перейти?</string>
     <string name="masked_link_cancel">Отмена</string>
     <string name="masked_link_confirm">Ага!</string>
@@ -4452,13 +4498,14 @@
     <string name="mature_listing_decline">Нет</string>
     <string name="mature_listing_description">Эта игра предназначена для лиц не младше 18 лет. Вы старше 18 лет и согласны увидеть материалы для взрослых?</string>
     <string name="mature_listing_title">!!{name}!! предназначена для взрослых игроков</string>
-    <string name="max_age_never">Никогда</string>
+    <string name="max_age_never">бессрочное</string>
     <string name="max_age_never_description_mobile">Не истекает</string>
     <string name="max_guild_members_reached_error">На сервере нет мест. Повторите попытку позже.</string>
     <string name="max_number_of_uses">Максимальное кол-во использований</string>
     <string name="max_uses">{maxUses}</string>
     <string name="max_uses_description_mobile">{maxUses}</string>
     <string name="max_uses_description_unlimited_uses">неограниченное число использований</string>
+    <string name="maybe_later">Может, позже</string>
     <string name="me">Я</string>
     <string name="media_keyboard_browse">Просмотр</string>
     <string name="media_keyboard_gift">Подарить</string>
@@ -4606,9 +4653,12 @@
     <string name="mention_role_autocomplete_description_mobile">Оповестить всех пользователей с этой ролью в этом канале.</string>
     <string name="mention_users_with_role">Оповестить пользователей, имеющих эту роль и право на просмотр этого канала.</string>
     <string name="mentions">Упоминания</string>
+    <string name="mentions_and_quickswitcher">Упоминания и быстрый переключатель</string>
     <string name="mentions_count">{count} упоминаний</string>
     <string name="message_action_reply">Ответить</string>
     <string name="message_actions_menu_label">Действия с сообщениями</string>
+    <string name="message_button_component_link_context_menu_copy">Копировать ссылку</string>
+    <string name="message_button_component_link_context_menu_name">Действия, привязанные к кнопкам</string>
     <string name="message_display_mode_label">Отображение сообщений</string>
     <string name="message_edited">изменено</string>
     <string name="message_header_replied">$[](currentAuthor) $[ответил(а)](replyHook)</string>
@@ -4751,6 +4801,8 @@
     <string name="mutual_guilds">Общие серверы</string>
     <string name="n_days">{days}</string>
     <string name="nearby_scan">Искать поблизости</string>
+    <string name="nearby_scan_cta_title">Поиск через Nearby</string>
+    <string name="nearby_scan_subtitle">Включите Bluetooth и Wi-Fi, чтобы найти друзей поблизости.</string>
     <string name="need_account">Нужна учётная запись?</string>
     <string name="network_error_bad_request">Соединение прервалось, пожалуйста, попробуйте снова.</string>
     <string name="network_error_cloudflare_intermittent">Возможно, в сервисе CloudFlare произошёл маленький сбой; пожалуйста, попробуйте снова.</string>
@@ -4922,8 +4974,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">У вас {days}, чтобы получить бесплатный месяц Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">У вас {hours}, чтобы получить бесплатный месяц Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">У вас {minutes}, чтобы получить бесплатный месяц Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Поздравляем, подписчик Nitro! Вам полагается 3 месяца Xbox Game Pass на ПК бесплатно!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Получить</string>
     <string name="notice_product_feedback_survey">Хотите обсуждать с нами отзывы о продукте?</string>
     <string name="notice_product_feedback_survey_cta">Сообщите нам об этом!</string>
     <string name="notice_register_to_vote">Вы уже зарегистрировались для голосования? Проверьте свой статус и зарегистрируйтесь всего за пару минут.</string>
@@ -5033,6 +5083,9 @@
     <string name="nux_navigation_help_channels">Серверы состоят из каналов, на которых люди обсуждают различные темы.</string>
     <string name="nux_navigation_help_dms">Добавьте друзей и общайтесь с ними напрямую.</string>
     <string name="nux_navigation_help_guild">Сервер — это мощный групповой чат, где люди собираются для общения.</string>
+    <string name="nux_notification_permission_alert_title">Разрешить уведомления</string>
+    <string name="nux_notification_permission_prompt_subtitle">Будьте в курсе всего! Настройте уведомления, чтобы не пропустить ни одно сообщение от друзей.</string>
+    <string name="nux_notification_permission_prompt_text">Вы будете получать push-уведомления о событиях в Discord, таких как сообщения, упоминания, запросы на добавление в друзья и мероприятия.</string>
     <string name="nux_overlay_description">Больше не нужно то и дело переключаться на Discord — узнавайте информацию о говорящих и используйте ярлыки, когда находитесь в других приложениях.</string>
     <string name="nux_overlay_enable">Включить оверлей</string>
     <string name="nux_overlay_title">Встречайте мобильный голосовой оверлей!</string>
@@ -5107,6 +5160,7 @@
     <string name="out_of_date_action">Обновить Discord</string>
     <string name="out_of_date_description">Мы добавили несколько прекрасных изменений в Discord (и кое-что по мелочи поправили). Обновитесь, чтобы продолжить.</string>
     <string name="out_of_date_title">Ваша версия устарела</string>
+    <string name="outbound_promotion_redemption_modal_title">Отлично!</string>
     <string name="outgoing_friend_request">Исходящий запрос дружбы</string>
     <string name="outgoing_friend_request_delete_msg">Вы действительно хотите удалить запрос дружбы к пользователю **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Исходящий запрос дружбы к !!{name}!!</string>
@@ -5242,6 +5296,8 @@
     <string name="pending">Ожидание</string>
     <string name="pending_friends_list_header">Запросы дружбы</string>
     <string name="people">Люди</string>
+    <string name="per_guild_avatars_premium_feature_description">Будьте, кем захотите, и используйте разные аватары на каждом из своих серверов.</string>
+    <string name="per_guild_avatars_premium_feature_title">Несколько аватаров</string>
     <string name="percentage_since_last_week">{percentage}%% с прошлой недели</string>
     <string name="permission_helpdesk">Нужна помощь с правами?</string>
     <string name="permission_media_denied">Доступ к медиа запрещён. Discord требует доступ к хранилищу, чтобы отправить файлы.</string>
@@ -5338,6 +5394,8 @@
     <string name="premium_chat_perks_description_premium_guild_included">{numFreeGuildSubscriptions} с Nitro для мгновенного получения 1-го уровня сервера.</string>
     <string name="premium_chat_perks_description_upload_limit">Отправляйте файлы размером от {maxUploadStandard} до {maxUploadPremiumTier2} с Nitro или {maxUploadPremiumTier1} с Nitro Classic.</string>
     <string name="premium_chat_perks_discriminator_mobile">Выберите собственный тег.</string>
+    <string name="premium_chat_perks_max_guilds">Повысьте лимит серверов, к которым вы можете присоединиться, с {nonPremiumMaxGuilds} до {premiumMaxGuilds}</string>
+    <string name="premium_chat_perks_max_message_length">Выражайте свои мысли полнее — количество символов увеличится с {nonPremiumMaxMessageLength} до {premiumMaxMessageLength}</string>
     <string name="premium_chat_perks_premium_guild_subscription">Дайте буст любимому серверу!</string>
     <string name="premium_chat_perks_rep_mobile">Эксклюзивный значок Nitro в профиле.</string>
     <string name="premium_chat_perks_screenshare_mobile">Демонстрируйте экран на ПК в 720p 60FPS или 1080p 30FPS.</string>
@@ -5559,12 +5617,14 @@
     <string name="premium_marketing_feature_premium_go_live_description">Улучшенное разрешение видео для всех ваших стримов. $[Подробности](infoHook)</string>
     <string name="premium_marketing_feature_premium_go_live_title">Видео в высоком качестве</string>
     <string name="premium_marketing_feature_premium_guild_description">Получите {numFreeGuildSubscriptions} и скидку !!{percentageOff}!! на дополнительные бусты. $[Узнать подробности](learnMoreHook).</string>
+    <string name="premium_marketing_feature_premium_guild_title">Поддержите свой сервер</string>
     <string name="premium_marketing_feature_premium_upload_size_description">Загружайте любые файлы размером до 100 МБ.</string>
     <string name="premium_marketing_feature_premium_upload_size_title">Увеличение размера загружаемых файлов</string>
     <string name="premium_marketing_feature_profile_description">Персонализируйте свой профиль с помощью анимированного аватара и особого тега.</string>
     <string name="premium_marketing_feature_profile_title">Персонализация профиля</string>
     <string name="premium_marketing_hero_body">Улучшите свои эмодзи, персонализируйте профиль и выделитесь на своих серверах.</string>
     <string name="premium_marketing_hero_header">Настройте Discord под себя</string>
+    <string name="premium_message_length_chatbox_flair">Благодаря подписке Nitro количество символов в сообщении увеличено до {maxLength}!</string>
     <string name="premium_message_length_roadblock_modal_body">Количество символов в вашем сообщении превышает лимит ({maxLength}). Пишите сообщения в два раза длиннее, отправляйте файлы большего размера и пользуйтесь [другими возможностями подписки Discord Nitro!](onLearnMore)</string>
     <string name="premium_message_length_roadblock_modal_header">Ваше сообщение слишком длинное…</string>
     <string name="premium_message_length_upsell_modal_body">Пишите сообщения в два раза длиннее, отправляйте файлы большего размера и пользуйтесь [другими возможностями подписки Discord Nitro!](onLearnMore)</string>
@@ -5780,12 +5840,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Для создания этого приватного канала требуется право **Просматривать каналы**.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Для создания этого приватного канала требуются права **Просматривать каналы** и **Подключаться**.</string>
     <string name="profile">Профиль</string>
+    <string name="profile_banner_icon_tooltip_upsell">Загрузите собственный баннер и откройте другие возможности с подпиской Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">На текущий момент персонализация профиля доступна ограниченному кругу пользователей.</string>
+    <string name="profile_customization_bio_placeholder">Расскажите миру о себе</string>
     <string name="profile_customization_marketing_tooltip_body">Придайте вашему профилю уникальности, заполнив раздел «Обо мне» и, если у вас есть подписка Nitrо, установив баннер профиля!</string>
     <string name="profile_customization_marketing_tooltip_cta">Ясно</string>
     <string name="profile_customization_marketing_tooltip_header">Новые настройки персонализации!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Только для подписчиков Nitro</string>
     <string name="promotion_card_action_claim">Получить</string>
-    <string name="promotion_card_body_claimed_hidden">Подарок получен, но мы спрятали код, потому что вы находитесь в режиме стримера.</string>
     <string name="promotion_error_body">Похоже, что-то пошло не так. К сожалению, вы не можете использовать этот код.</string>
     <string name="promotion_error_title">Секундочку…</string>
     <string name="promotion_existing_subscriber_title">О нет!</string>
@@ -5890,6 +5952,7 @@
     <string name="recent_mentions_pro_tip">Всякое упоминание вас будет сохранено здесь на 7 дней.</string>
     <string name="recent_mentions_roles_and_direct">личные и @role</string>
     <string name="recents_notifications_menu_label">Действия с уведомлениями</string>
+    <string name="recommended">Рекомендованные</string>
     <string name="reconnect">Переподключиться</string>
     <string name="reconnecting">Переподключение</string>
     <string name="refund">Возврат средств</string>
@@ -5978,6 +6041,10 @@
     <string name="request_to_speak_empty_list_title">Нет запросов</string>
     <string name="request_to_speak_invitation_send">Приглашение отправлено</string>
     <string name="request_to_speak_list_title">Запросы на выступление — {numHands}</string>
+    <string name="request_to_speak_member_info_member">Участник</string>
+    <string name="request_to_speak_member_info_member_roles">Участник с ролью (ролями)</string>
+    <string name="request_to_speak_member_info_new_member">Новый участник</string>
+    <string name="request_to_speak_member_info_non_member">Посетитель (Не участник)</string>
     <string name="resend">Отправить заново</string>
     <string name="resend_code">Прислать код ещё раз</string>
     <string name="resend_email">Повторно отправить письмо с подтверждением!</string>
@@ -6210,6 +6277,8 @@
     <string name="role_remove_member_confirm_title">Удалить участника</string>
     <string name="role_remove_member_managed">Нельзя вручную назначить или снять эту роль с участника</string>
     <string name="role_required_single_user_message">(Этот канал видите только вы)</string>
+    <string name="role_row_description">!!{name}!!, {count}, изменить</string>
+    <string name="role_row_view_members">Показать {count}</string>
     <string name="role_sample_message">камни очень старые</string>
     <string name="roles">Роли</string>
     <string name="roles_list">{numRoles}</string>
@@ -6520,6 +6589,7 @@
     <string name="show_spoiler_on_servers_i_mod">На серверах, которые я модерирую</string>
     <string name="skip">Пропустить</string>
     <string name="skip_all_tips">Пропустить все подсказки</string>
+    <string name="skip_for_now">Не сейчас</string>
     <string name="skip_to_content">Перейти к контенту</string>
     <string name="sku_payment_steps_label">Купить</string>
     <string name="sky_blue">Небесно-голубой</string>
@@ -6606,6 +6676,7 @@
     <string name="stage_channel_no_audience">Нет слушателей</string>
     <string name="stage_channel_no_topic">Нет тематики. Укажите тематику, чтобы открыть трибуну!</string>
     <string name="stage_channel_people_count">{count} ({speakerCount})</string>
+    <string name="stage_channel_permission_microphone_denied">Если вы хотите говорить, Discord должен получить доступ к аудио.</string>
     <string name="stage_channel_start_alt_text">Зелёный значок трибуны с символом «+»</string>
     <string name="stage_channel_start_subtitle">Выберите тему для начала разговора.</string>
     <string name="stage_channel_start_title">Открыть трибуну</string>
@@ -6685,28 +6756,57 @@
     <string name="stage_voice_channel">Трибуна</string>
     <string name="start">Начать</string>
     <string name="start_call">Начать звонок</string>
+    <string name="start_stage_button_text">Открыть трибуну</string>
+    <string name="start_stage_button_text_mobile">Открыть трибуну</string>
     <string name="start_stage_channel_event_members_subtitle">Присоединиться могут только участники вашего сервера.</string>
+    <string name="start_stage_channel_event_members_title">Только для участников</string>
     <string name="start_stage_channel_event_modal_button">Открыть трибуну</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Когда трибуна откроется, вы будете оратором.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Опишите тематику вашей трибуны, чтобы объявить о её открытии.</string>
+    <string name="start_stage_channel_event_modal_title">О чём вы будете говорить?</string>
     <string name="start_stage_channel_event_modal_topic_label">Тематика трибуны</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Дебаты окончены: диетическая газировка лучше обычной</string>
     <string name="start_stage_channel_event_modal_topic_required">Необходимо указать тематику. Таково наше правило.</string>
     <string name="start_stage_channel_event_privacy_title">Конфиденциальность</string>
     <string name="start_stage_channel_event_public_everyone_warning">Вы можете открывать публичные трибуны только на каналах с настройками вступления @everyone.</string>
+    <string name="start_stage_channel_event_public_explanation">Слушатели также смогут присоединиться к вашему серверу, пока трибуна открыта. Публичные трибуны должны соответствовать [дополнительным требованиям.]({articleURL})</string>
     <string name="start_stage_channel_event_public_permanent_disclaimer">Публичные трибуны нельзя закрыть.</string>
     <string name="start_stage_channel_event_public_permissions_disclaimer">Делать трибуны публичными могут только модераторы трибуны с правом приглашения участников.</string>
-    <string name="start_stage_channel_event_public_subtitle">Ваша трибуна появится в списке «Путешествия по трибунам». Каждый сможет присоединиться к ней в качестве слушателя.</string>
+    <string name="start_stage_channel_event_public_subtitle">Ваша трибуна появится в списке «Путешествия по трибунам». Кто угодно сможет присоединиться к ней в качестве слушателя!</string>
     <string name="start_stage_channel_event_public_title">Публичная</string>
-    <string name="start_stage_public_info_section_four">Публичные трибуны не могут содержать откровенные сообщения или контент сексуального характера.</string>
-    <string name="start_stage_public_info_section_one">Эта трибуна появится в списке «Путешествия по трибунам». Каждый сможет присоединиться к ней в качестве слушателя.</string>
+    <string name="start_stage_modal_confirm_text">Открыть трибуну</string>
+    <string name="start_stage_modal_select_channel">Выберите трибуну</string>
+    <string name="start_stage_modal_server_modal_label">Открыть трибуну</string>
+    <string name="start_stage_modal_server_selection_bullet_1">Создайте [сервер сообщества.]({helpdeskArticle})</string>
+    <string name="start_stage_modal_server_selection_bullet_2">Создайте трибуну.</string>
+    <string name="start_stage_modal_server_selection_bullet_3">Придумайте интересное событие.</string>
+    <string name="start_stage_modal_server_selection_bullet_4">Организуйте и откройте свою трибуну!</string>
+    <string name="start_stage_modal_server_selection_button_hint">Хотите узнать больше?</string>
+    <string name="start_stage_modal_server_selection_button_text">Узнайте, как организовать хорошую трибуну</string>
+    <string name="start_stage_modal_server_selection_empty_title">Вы пока не можете открыть трибуну</string>
+    <string name="start_stage_modal_server_selection_subtitle">Увеличивайте и развивайте своё сообщество с помощью трибун.</string>
+    <string name="start_stage_modal_server_selection_title">В каком сообществе вы хотите провести голосовое событие?</string>
+    <string name="start_stage_modal_set_topic_change_channel">Место проведения вашей трибуны: $[**!!{stageName}!!**](stageHook). $[Изменить канал](changeHook)</string>
+    <string name="start_stage_modal_set_topic_create_channel">Мы автоматически создадим для вас трибуну под названием $[**!!{stageName}!!**](stageHook). Вы можете изменить его позже.</string>
+    <string name="start_stage_modal_set_topic_help_text">Место проведения вашей трибуны: $[**!!{stageName}!!**](stageHook).</string>
+    <string name="start_stage_modal_set_topic_select_label">Трибуна</string>
+    <string name="start_stage_modal_set_topic_subtitle">Опишите тематику вашей трибуны, чтобы объявить о её открытии.</string>
+    <string name="start_stage_modal_set_topic_title">О чём вы будете говорить?</string>
+    <string name="start_stage_public_confirm">Сделаем это</string>
+    <string name="start_stage_public_info_alt_text">Выступающие</string>
+    <string name="start_stage_public_info_section_four">Публичные трибуны не могут содержать откровенные сообщения или контент сексуального характера. Также описание темы трибуны должно быть точным и информативным.</string>
+    <string name="start_stage_public_info_section_one">Эта трибуна появится в списке «Путешествия по трибунам». Каждый сможет присоединиться к ней в качестве слушателя!</string>
+    <string name="start_stage_public_info_section_three">Публичные трибуны должны соответствовать некоторым дополнительным требованиям. [Ознакомиться с ними можно здесь.]({articleURL})</string>
+    <string name="start_stage_public_info_section_two">Пока трибуна находится в открытом доступе, слушатели смогут присоединиться к вашему серверу и стать частью вашего сообщества.</string>
+    <string name="start_stage_public_info_title">Ваша трибуна становится публичной!</string>
+    <string name="start_stage_public_info_title_caption">Вот что вам нужно знать.</string>
+    <string name="start_stage_public_short_topic_warning">Достаточно ли понятно описание вашей темы? Убедитесь, что люди, просматривающие «Путешествие по трибунам», легко поймут, чему посвящены ваши трибуна и сообщество.</string>
     <string name="start_video_call">Начать видеозвонок</string>
     <string name="start_voice_call">Начать голосовой звонок</string>
     <string name="starting_at">Начиная от</string>
     <string name="status_bar_notification_info_overflow">&gt;999</string>
     <string name="status_dnd">Не беспокоить</string>
     <string name="status_dnd_help">Вы не будете получать уведомления на рабочем столе.</string>
-    <string name="status_idle">Не активен</string>
+    <string name="status_idle">Неактивен</string>
     <string name="status_invisible">Невидимый</string>
     <string name="status_invisible_helper">Вы не будете отображаться в сети, но будете иметь полный доступ к функциям Discord.</string>
     <string name="status_offline">Не в сети</string>
@@ -6724,6 +6824,7 @@
     <string name="sticker_from_pack">от **!!{packName}!!**</string>
     <string name="sticker_notification_body">Отправляет стикер: !!{stickerName}!!</string>
     <string name="sticker_pack_available_with_premium">Получить преимущества Nitro</string>
+    <string name="sticker_pack_get_premium">Подписаться на Nitro</string>
     <string name="sticker_pack_premium_cta">Подписаться на Nitro</string>
     <string name="sticker_pack_price_free">Бесплатно</string>
     <string name="sticker_pack_price_free_with_premium_tier_1">Бесплатно с подпиской Nitro Classic</string>
@@ -6749,6 +6850,8 @@
     <string name="sticker_picker_view_all">Посмотреть все</string>
     <string name="sticker_popout_countdown_header">Доступно в течение ограниченного времени</string>
     <string name="sticker_popout_pack_info">Это стикер из набора «**{stickerPackName}**». Получите скидку {discount}%% с [подпиской Nitro](onClick).</string>
+    <string name="sticker_popout_pack_info_nonpremium">Нравится стикер? Оформите подписку Nitro, разблокируйте этот и более 300 похожих стикеров и получите другие преимущества.</string>
+    <string name="sticker_popout_pack_info_premium">Это стикер из набора **{stickerPackName}**.</string>
     <string name="sticker_popout_pack_info_unavailable">Это стикер из набора **{stickerPackName}**. Набор больше не доступен.</string>
     <string name="sticker_premium_tier_1_upsell_alert_upgrade_cta">Подпишитесь на Nitro Classic</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount">Получите скидку {percent} на покупку бустов</string>
@@ -6762,7 +6865,7 @@
     <string name="sticker_premium_tier_2_upsell_perk_guild_subscription">Получите бесплатные бусты ({numGuildSubscriptions}) и скидку {discountPercent} на покупку бустов</string>
     <string name="sticker_premium_tier_2_upsell_perk_premium_pack">Постоянный доступ к набору «!!{stickerPackName}!!»</string>
     <string name="sticker_premium_tier_2_upsell_perk_premium_subscription">Мощные бонусы для чата: анимированные эмодзи, пользовательский Discord Tag, улучшенные стримы Go Live и многое другое</string>
-    <string name="sticker_premium_tier_2_upsell_perk_quantity">Выражайте свои чувства с помощью более 200 стикеров, доступных только подписчикам Nitro</string>
+    <string name="sticker_premium_tier_2_upsell_perk_quantity">Выражайте свои чувства с помощью более 300 стикеров, доступных только подписчикам Nitro</string>
     <string name="sticker_purchase_modal_confirm_body_content">Набор стикеров «!!{packName}!!» теперь в вашем ящике для стикеров.</string>
     <string name="sticker_purchase_modal_confirm_body_header">Ура, стикеры!</string>
     <string name="sticker_purchase_modal_header">Купить набор стикеров</string>
@@ -6808,6 +6911,7 @@
     <string name="stream_no_preview">Стрим начался. Не пропустите его!</string>
     <string name="stream_participants_hidden">Участники без видео сейчас скрыты. Хотите показать их?</string>
     <string name="stream_playing">Играет в !!{game}!!</string>
+    <string name="stream_premium_upsell_body">Стримьте в разрешении HD с частотой 60 кадров в секунду, получите доступ к бонусам для чата [и многому другому с Discord Nitro!](onPressMore)</string>
     <string name="stream_premium_upsell_body_no_cta">Стримьте в разрешении HD на 60 кадрах в секунду, получите доступ к бонусам для чата и многому другому с Discord Nitro!</string>
     <string name="stream_premium_upsell_cta">Подписаться</string>
     <string name="stream_premium_upsell_header">Откройте стриминг в высоком качестве с Discord Nitro</string>
@@ -6869,6 +6973,7 @@
     <string name="streaming_a_game">Стримит игру</string>
     <string name="sub_enabled_servers">Сервера для подписчиков</string>
     <string name="submit">Отправить</string>
+    <string name="submit_bug">Сообщить об ошибке</string>
     <string name="subscriber_information">Информация о подписчике</string>
     <string name="subscription_payment_legalese_monthly">Минутку внимания! Вы покупаете подписку с автоматическим продлением, а это значит, что сегодня мы выставим вам счёт, а затем будем взимать плату каждый месяц, пока вы не отмените подписку. Отменить её можно в любое время, зайдя в «Настройки пользователя»!</string>
     <string name="subscription_payment_legalese_yearly">Минутку внимания! Вы покупаете подписку с автоматическим продлением, а это значит, что сегодня мы выставим вам счёт, а затем будем взимать плату каждый год, пока вы не отмените подписку. Отменить её можно в любое время, зайдя в «Настройки пользователя»!</string>
@@ -7148,6 +7253,7 @@
     <string name="unclaimed_account_body_2">Укажите адрес электронной почты и пароль, чтобы присвоить учётную запись, прежде чем она будет утеряна.</string>
     <string name="unclaimed_account_title">Учётная запись не присвоена</string>
     <string name="undeafen">Вкл. звук</string>
+    <string name="undo">Отменить</string>
     <string name="unfocus_participant">Убрать фокус</string>
     <string name="unhandled_link_body">Извините, на вашем устройстве не найдено приложения, чтобы обработать эту ссылку:</string>
     <string name="unhandled_link_title">Неизвестная ссылка</string>
@@ -7317,6 +7423,9 @@
     <string name="user_info">Личные данные</string>
     <string name="user_management">Управление участниками</string>
     <string name="user_popout_about_me">Обо мне</string>
+    <string name="user_popout_identity_cta_avatar">Выбрать аватар для этого сервера</string>
+    <string name="user_popout_identity_cta_both">Выбрать аватар и никнейм для этого сервера</string>
+    <string name="user_popout_identity_cta_nickname">Выбрать никнейм для этого сервера</string>
     <string name="user_popout_message">Написать сообщение</string>
     <string name="user_popout_wumpus_tooltip">Я новичок, встречайте!</string>
     <string name="user_profile_add_friend">Добавить в друзья</string>
@@ -7325,6 +7434,7 @@
     <string name="user_profile_guild_name_content_description">Название сервера</string>
     <string name="user_profile_incoming_friend_request_dialog_body">Принять запрос дружбы?</string>
     <string name="user_profile_message">Сообщение</string>
+    <string name="user_profile_modal">Интерфейс профиля пользователя</string>
     <string name="user_profile_mutual_friends">{count}</string>
     <string name="user_profile_mutual_friends_placeholder">Общие друзья</string>
     <string name="user_profile_mutual_guilds">{count}</string>
@@ -7333,8 +7443,10 @@
     <string name="user_profile_settings_setstatus">Задать статус</string>
     <string name="user_profile_video">Видео</string>
     <string name="user_profile_volume">Громкость</string>
+    <string name="user_setting_notification_not_enabled_prompt">Push-уведомления не включены</string>
     <string name="user_settings">Настройки пользователя</string>
     <string name="user_settings_about_me">Обо мне</string>
+    <string name="user_settings_about_me_description">Напишите о себе что захотите. Главное, чтобы количество символов не превышало {maxLength}. Можно использовать разметку текста и ссылки.</string>
     <string name="user_settings_account_change_email_prompt">Ваш текущий адрес электронной почты: !!{email}!!. Хотите его изменить?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Введите новый адрес электронной почты и текущий пароль.</string>
     <string name="user_settings_account_change_email_title">Измените адрес электронной почты</string>
@@ -7369,6 +7481,8 @@
     <string name="user_settings_appearance_preview_message_5">О, вот и он!</string>
     <string name="user_settings_appearance_zoom_tip">Вы можете изменять масштаб, удерживая клавишу {modKey} и нажимая «+» и «-». Используйте {modKey}+0, чтобы сбросить масштаб на значение по умолчанию.</string>
     <string name="user_settings_available_codes">Доступные резервные коды</string>
+    <string name="user_settings_avatar">Аватар</string>
+    <string name="user_settings_banner_specs">Мы рекомендуем использовать изображение размером как минимум 600x240. Доступные форматы: PNG, JPG или анимированный GIF.</string>
     <string name="user_settings_blocked_users">Заблокированные пользователи</string>
     <string name="user_settings_blocked_users_empty">У вас нет заблокированных пользователей</string>
     <string name="user_settings_blocked_users_header">Заблокированные пользователи: {numberOfBlockedUsers}</string>
@@ -7377,12 +7491,14 @@
     <string name="user_settings_close_button">Кнопка закрытия</string>
     <string name="user_settings_confirm_logout">Вы уверены, что хотите выйти?</string>
     <string name="user_settings_customization_upsell">Откройте с подпиской Nitro</string>
+    <string name="user_settings_customize_profile_title">Настройка профиля</string>
     <string name="user_settings_delete_avatar">Удалить аватар</string>
     <string name="user_settings_disable_advanced_voice_activity">Попробуйте отключить эту функцию, если автоматическая чувствительность ввода не обнаруживает ваш голос.</string>
     <string name="user_settings_disable_noise_suppression">Обычное шумоподавление недоступно, пока активно шумоподавление Krisp.</string>
     <string name="user_settings_edit_account">Редактировать учётную запись</string>
     <string name="user_settings_edit_account_password_label">Введите пароль, чтобы подтвердить изменения.</string>
     <string name="user_settings_edit_account_tag">ТЕГ</string>
+    <string name="user_settings_edit_profile">Редактировать профиль</string>
     <string name="user_settings_enter_password_view_codes">Введите пароль, чтобы посмотреть резервные коды.</string>
     <string name="user_settings_games_install_location">Место</string>
     <string name="user_settings_games_install_location_add">Добавить место для установки</string>
@@ -7433,6 +7549,8 @@
     <string name="user_settings_open_on_startup_label">Открыть Discord</string>
     <string name="user_settings_privacy_terms">Ознакомьтесь с [Условиями Использования]({termsLink}) и [Политикой конфиденциальности]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Баннер профиля</string>
+    <string name="user_settings_remove_avatar">Удалить аватар</string>
+    <string name="user_settings_remove_banner">Удалить баннер</string>
     <string name="user_settings_restart_app_mobile">Перезапустите приложение, чтобы новые параметры вступили в силу.</string>
     <string name="user_settings_save">Сохранить</string>
     <string name="user_settings_scan_qr_code">Сканировать QR-код</string>
@@ -7447,6 +7565,7 @@
     <string name="user_settings_upload_avatar">Загрузить аватар</string>
     <string name="user_settings_upload_banner">Загрузить баннер</string>
     <string name="user_settings_used_backup_codes">Использованы резервные коды</string>
+    <string name="user_settings_user_profile">Профиль пользователя</string>
     <string name="user_settings_voice_add_multiple">Вы можете добавить несколько комбинаций для режима рации в [настройках горячих клавиш](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord использует отборный, органический, выращенный на домашней грядке голосовой кодек Opus.</string>
     <string name="user_settings_voice_codec_title">Аудио кодек</string>
@@ -7461,6 +7580,7 @@
     <string name="user_settings_voice_mic_test_voice_caption">Воспроизводим ваш прекрасный голос</string>
     <string name="user_settings_voice_mic_test_voice_no_input_notice">Discord не может обнаружить сигнал вашего микрофона. Убедитесь, что вы выбрали правильное устройство ввода.</string>
     <string name="user_settings_voice_open_h264">Видеокодек OpenH264 предоставлен Cisco Systems, Inc.</string>
+    <string name="user_settings_voice_soundshare_enabled_label">Теперь вы можете захватывать звук из приложений. [Подробнее]({helpdeskArticle})</string>
     <string name="user_settings_voice_soundshare_enabling_label">Расширению для захвата звука требуется авторизация для завершения установки. Проверьте настройки защиты и безопасности в разделе системных настроек. [Подробнее]({helpdeskArticle})</string>
     <string name="user_settings_voice_soundshare_not_enabled_label">Захват звука на вашем устройстве требует установки дополнительного программного обеспечения. После нажатия кнопки установки ниже вам будет предложено авторизоваться. [Подробнее]({helpdeskArticle})</string>
     <string name="user_settings_voice_video_codec_title">Видеокодек</string>
@@ -7684,25 +7804,6 @@
     <string name="working">Идёт работа…</string>
     <string name="wumpus">Вампус</string>
     <string name="xbox_authorization_title">Авторизация учётной записи Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Уже получено. Ваш код: !!{code}!!. [Показать подробности](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Подарок можно активировать до 15 января 2021 г. [Скрыть подробности](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Подарок можно активировать до 15 января 2021 г. [Показать подробности](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Код также можно найти в только что отправленном вам письме с подтверждением.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Что-то пошло не так. Повторите попытку позже!</string>
-    <string name="xbox_game_pass_modal_code_header">Код Xbox Game Pass для ПК</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Ой-ой</string>
-    <string name="xbox_game_pass_modal_header_description_success">Активируйте приведенный ниже код на [сайте Microsoft]({redemptionURL}), чтобы получить Xbox Game Pass для ПК на 3 месяца.</string>
-    <string name="xbox_game_pass_modal_header_success">Отлично!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Поскольку у вас есть подписка с бустом, мы дадим вам кредит подписки Nitro. Кредит Nitro будет активирован, когда вы подпишетесь на **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Активировать</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Теперь у вас есть кредит Nitro! Подпишитесь на **{planName}**, чтобы использовать его.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Здорово!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Кредит подписки</string>
-    <string name="xbox_game_pass_promotion_banner_description">Мы приготовили для вас кое-что особенное. Подписчики Nitro теперь могут получить 3 месяца Xbox Game Pass для ПК. Акция продлится до 15 января 2021 года. [Показать подробности](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Мы приготовили для вас кое-что особенное. Подписчики Nitro теперь могут получить 3 месяца Xbox Game Pass для ПК. Акция продлится до 15 января 2021 года. [Скрыть подробности](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 месяца Xbox Game Pass для ПК</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass для ПК (3 месяца)</string>
-    <string name="xbox_game_pass_promotion_legalese">Предложение не распространяется на текущих или бывших пользователей Xbox Game Pass для ПК или пользователей Xbox Game Pass Ultimate. Код(ы) Xbox Game Pass можно активировать на сайте [microsoft.com/redeem](https://microsoft.com/redeem) до 15 февраля 2021 г. Требуется банковская карта. Если подписка не будет отменена, то после окончания бесплатного периода с вас будет ежемесячно списываться средства за продление подписки по актуальной на тот момент цене. Не поддерживается в режиме S на Windows 10 и на устройствах ARM. Каталог игр периодически меняется. Подробности см. на сайте [xbox.com/gamepass](https://xbox.com/gamepass). Не более 1 кода на пользователя/учётную запись.</string>
     <string name="xbox_link">Привязать</string>
     <string name="xbox_pin_step1">Откройте приложение Discord на смартфоне</string>
     <string name="xbox_pin_step2">Перейдите в Настройки → Интеграции → Добавить</string>
diff --git a/app/src/main/res/values-sv-rSE/plurals.xml b/app/src/main/res/values-sv-rSE/plurals.xml
index 8825b8bf98..b3385f9f0a 100644
--- a/app/src/main/res/values-sv-rSE/plurals.xml
+++ b/app/src/main/res/values-sv-rSE/plurals.xml
@@ -560,14 +560,6 @@
         <item quantity="one">1 vecka</item>
         <item quantity="other">{minimumGuildAge} veckor</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">namnet</item>
-        <item quantity="other">namnen</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">namnet</item>
-        <item quantity="other">namnen</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Väntande ansökan</item>
         <item quantity="other">{count} Väntande ansökningar</item>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index d37bed7056..520b61ad99 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1002,7 +1002,7 @@
     <string name="change_identity_modal_uploader_cta">Ändra serveravatar</string>
     <string name="change_identity_modal_upsell">Använd olika avatarer på var och en av dina servrar och mer med **Discord Nitro!**</string>
     <string name="change_log">Ändringslogg</string>
-    <string name="change_log_md_body">Nya funktioner {added marginTop}\n======================\n\n* **Nu har vi lagt till Podieidentifiering.** Kolla in communityn som är värdar för Livesända podier – audioevent som konserter, paneler, talangshower och allt annat knäppt men lagligt som du kan hitta på – genom att klicka på den nya identifieringsfliken. \n* **Nu är Hitta dina vänner här.** Vi har lagt till en funktion som låter dig hitta vänner enklare på Discord. Om du har din väns telefonnummer, och ni båda väljer att vara identifierbara, kommer du att kunna hitta honom eller henne och skicka en vänförfrågan. Vad sägs om den här genanta konversationen: Om du får en förfrågan från xXSoulzLuverXx#0000 så är det jag.\n* **Vi har lagt till favoritemojier.** Tryck på en emoji i en chatt eller tryck länge på en i emojiväljaren för att lägga till och ta bort emojier från dina favoriter. Dina favoriter synkas inte med skrivbordet *än* men du kan börja fundera på vilka 5 av de 2 459 emojier du har som du egentligen använder.\n* **Vi har lagt till paginering till sökfältet.** Du behöver inte längre bläddra bland ändlösa sökresultat. Nu kan du hoppa mellan sidor för att hitta precis de bevis du behöver mot en kompis för att påpeka att hon eller han helt säkert sa en sak för sex månader sedan, men du kommer inte riktigt ihåg vad det var och behöver bara en minut för att hitta det som du lovar att hon eller han bergis sa.\n* **Vi har lagt till röstkanalljud:** Nu kommer din telefon att spela upp ljud när du går med/lämnar/flyttas i röstkanaler. Det är ljud som jag med skrämmande klarhet kan spela upp i mitt huvud. Ba-dum...ba-da-doo...\n\n\n\n\nFixar och uppdateringar {progress}\n======================\n\n* **Inget mer redigeringsping!** När du redigerar ett svar kommer referensförfattaren i de flesta fall inte längre att nämnas så nu, när du fixar ett litet grammatikfel, slipper du bli så djupt generad.\n* **Förbättrade servermappar.** Nu kan du markera dina servermappar som lästa! Vi har även lagt till servermappsinställningar där namn och färger ingår.\n* **Stora förbättringar och buggfixar för medlemskapsscreening.** Nu kommer du inte att fastna på de här sidorna längre.\n* **Vi har förenklat inmatningsläget.** Du kan nu ändra dina inställningar för tryck-för-tal och röstaktivitet utan att lämna samtalsskärmen.\n\n\n</string>
+    <string name="change_log_md_body">Nya funktioner {added marginTop}\n======================\n\n* **Nu är Hitta dina vänner här.** Vi har lagt till en funktion som låter dig hitta vänner enklare på Discord. Om du har din väns telefonnummer, och ni båda väljer att vara identifierbara, kommer du att kunna hitta honom eller henne och skicka en vänförfrågan. Vad sägs om den här genanta konversationen: Om du får en förfrågan från xXSoulzLuverXx#0000 så är det jag.\n* **Vi har lagt till favoritemojier.** Tryck på en emoji i en chatt eller tryck länge på en i emojiväljaren för att lägga till och ta bort emojier från dina favoriter. Dina favoriter synkas inte med skrivbordet *än* men du kan börja fundera på vilka 5 av de 2 459 emojier du har som du egentligen använder.\n* **Vi har lagt till paginering till sökfältet.** Du behöver inte längre bläddra bland ändlösa sökresultat. Nu kan du hoppa mellan sidor för att hitta precis de bevis du behöver mot en kompis för att påpeka att hon eller han helt säkert sa en sak för sex månader sedan, men du kommer inte riktigt ihåg vad det var och behöver bara en minut för att hitta det som du lovar att hon eller han bergis sa.\n* **Vi har lagt till röstkanalljud:** Nu kommer din telefon att spela upp ljud när du går med/lämnar/flyttas i röstkanaler. Det är ljud som jag med skrämmande klarhet kan spela upp i mitt huvud. Ba-dum...ba-da-doo...\n\n\n\n\nFixar och uppdateringar {progress}\n======================\n\n* **Inget mer redigeringsping!** När du redigerar ett svar kommer referensförfattaren i de flesta fall inte längre att nämnas så nu, när du fixar ett litet grammatikfel, slipper du bli så djupt generad.\n* **Förbättrade servermappar.** Nu kan du markera dina servermappar som lästa! Vi har även lagt till servermappsinställningar där namn och färger ingår.\n* **Stora förbättringar och buggfixar för medlemskapsscreening.** Nu kommer du inte att fastna på de här sidorna längre.\n* **Vi har förenklat inmatningsläget.** Du kan nu ändra dina inställningar för tryck-för-tal och röstaktivitet utan att lämna samtalsskärmen.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">sv-SE</string>
     <string name="change_log_md_revision">1</string>
@@ -1341,7 +1341,6 @@
     <string name="contact_sync_we_found_your_friends_body">Nu är du vän med dem på Discord. Prata med dem, bjud in dem till din server, ha kul! Vi meddelar dig när nya vänner går med i Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Vi hittade dina vänner!</string>
     <string name="content_matching">!!{command}!!-innehåll matchar **!!{query}!!**</string>
-    <string name="context_menu_hint">Högerklicka på användaren för fler åtgärder</string>
     <string name="continue_in_browser">Fortsätt i webbläsare</string>
     <string name="continue_to_webapp">Fortsätt till Discord</string>
     <string name="control_volume">Kontrollvolym</string>
@@ -2970,8 +2969,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Servrar i Serveridentifiering måste vara minst {minimumGuildAge} gamla. Kom tillbaka {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Servern har inte existerat tillräckligt länge</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Din server uppfyller **$[inte](doesNotHook)** alla krav för att få vara med i Serveridentifiering.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Du behöver ändra kategori{numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Du behöver ändra kanal{numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Du behöver ändra din $[beskrivning](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Du behöver ändra ditt $[servernamn](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Öka antalet veckovisa kommunikatörer</string>
@@ -4182,6 +4179,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Uppgradera din emoji, anpassa din profil och gör så att du sticker ut i dina servrar. Välj mellan **!!{monthlyPrice}!! per månad** eller **!!{yearlyPrice}!! per år**.</string>
     <string name="marketing_refresh_premium_tier_2_title">Få en förbättrad Discord-upplevelse</string>
     <string name="marketing_tier_1_perk_list_boost_discount">30 %% rabatt på serverboostar</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Använd anpassade och animerade emojis överallt</string>
     <string name="marketing_tier_1_perk_list_stream_quality">Upplösning i upp till 1080p och upp till 60 fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">50 MB uppladdning istället för 100 MB</string>
     <string name="masked_link_body">Denna länk tar dig till **!!{url}!!**. Vill du verkligen gå dit?</string>
@@ -4635,8 +4633,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Du har {days} kvar för att få en gratismånad av Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Du har {hours} kvar för att få en gratismånad av Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Du har {minutes} kvar för att få en gratismånad av Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Grattis, Nitro-prenumerant! Du får 3 månaders Xbox Game Pass för PC från oss!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Hämta</string>
     <string name="notice_product_feedback_survey_cta">Berätta det för oss här!</string>
     <string name="notice_register_to_vote">Har du registrerat dig för att få rösta? Kolla din status och registrera dig på två minuter.</string>
     <string name="notice_scheduled_maintenance">Discord kommer genomgå planerat underhåll den **{start}** kl. **{start}**.</string>
@@ -4821,6 +4817,7 @@
     <string name="out_of_date_action">Uppdatera Discord</string>
     <string name="out_of_date_description">Vi har några sköna ändringar på gång till Discord (och förmodligen en buggfix eller två). Uppdatera för att fortsätta.</string>
     <string name="out_of_date_title">Du är utdaterad</string>
+    <string name="outbound_promotion_redemption_modal_title">Lysande!</string>
     <string name="outgoing_friend_request">Utgående vänförfrågan</string>
     <string name="outgoing_friend_request_delete_msg">Är du säker på att du vill ta bort din vänförfrågan till **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Utgående vänförfrågan till !!{name}!!</string>
@@ -5498,12 +5495,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Behörighet att **visa kanaler** krävs för att skapa denna privata kanal.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Behörighet att **visa kanaler** och att **ansluta** krävs för att skapa denna privata kanal.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Ladda upp din personliga banner och annat med Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Profilanpassning finns för närvarande tillgängligt för ett begränsat antal personer.</string>
+    <string name="profile_customization_bio_placeholder">Berätta lite om dig själv för världen</string>
     <string name="profile_customization_marketing_tooltip_body">Tala om vem du är med en om mig och, om du har Nitro, en profilbanner!</string>
     <string name="profile_customization_marketing_tooltip_cta">Jag förstår</string>
     <string name="profile_customization_marketing_tooltip_header">Ny profilanpassning!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Exklusiv för Nitro</string>
     <string name="promotion_card_action_claim">Hämta</string>
-    <string name="promotion_card_body_claimed_hidden">Du har hämtat den här, men koden är dold i streamarläge.</string>
     <string name="promotion_error_body">Något verkar ha gått fel och du kan inte använda koden. Vi beklagar.</string>
     <string name="promotion_error_title">Vänta en sekund …</string>
     <string name="promotion_existing_subscriber_title">Åh nej!</string>
@@ -6401,7 +6400,6 @@
     <string name="start_stage_channel_event_members_title">Enbart medlemmar</string>
     <string name="start_stage_channel_event_modal_button">Starta podiet</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Du kommer att vara en talare när podiet öppnar.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Skriv ett ämne för att visa att podiet är igång.</string>
     <string name="start_stage_channel_event_modal_title">Vad kommer du att prata om?</string>
     <string name="start_stage_channel_event_modal_topic_label">Podiets ämne</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Slutsnackat: Sockerfritt är bäst</string>
@@ -7079,6 +7077,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Aviseringar är inte aktiverade</string>
     <string name="user_settings">Användarinställningar</string>
     <string name="user_settings_about_me">Om mig</string>
+    <string name="user_settings_about_me_description">Skriv vad du vill om dig själv – så länge du håller det under {maxLength} tecken. Du kan använda markdown och länkar om du vill.</string>
     <string name="user_settings_account_change_email_prompt">Din nuvarande e-postadress är !!{email}!! Vad vill du ändra den till?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Skriv in en ny e-postadress och ditt nuvarande lösenord.</string>
     <string name="user_settings_account_change_email_title">Redigera e-post</string>
@@ -7113,6 +7112,8 @@
     <string name="user_settings_appearance_preview_message_5">Här är den ju!</string>
     <string name="user_settings_appearance_zoom_tip">Du kan ändra zoomnivå med {modKey} +/- och återställa till standardnivån med {modKey}+0.</string>
     <string name="user_settings_available_codes">Tillgängliga säkerhetskopieringskoder</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Vi rekommenderar en bild på minst 600 x 240. Du kan ladda upp en PNG, JPG eller en animerad GIF.</string>
     <string name="user_settings_blocked_users">Blockerade användare</string>
     <string name="user_settings_blocked_users_empty">Du har inga blockerade användare</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Blockerade användare</string>
@@ -7121,11 +7122,13 @@
     <string name="user_settings_close_button">Stängknappen</string>
     <string name="user_settings_confirm_logout">Är du säker på att du vill logga ut?</string>
     <string name="user_settings_customization_upsell">Lås upp med Nitro</string>
+    <string name="user_settings_customize_profile_title">Specialanpassa min profil</string>
     <string name="user_settings_delete_avatar">Ta bort avatar</string>
     <string name="user_settings_disable_advanced_voice_activity">Det kan underlätta att stänga av det här om den automatiska ingångskänsligheten inte känner av din röst.</string>
     <string name="user_settings_disable_noise_suppression">Brusminskningen avaktiveras när brusreduceringen är aktiv.</string>
     <string name="user_settings_edit_account">Redigera konto</string>
     <string name="user_settings_edit_account_password_label">Ange ditt lösenord för att bekräfta ändringar</string>
+    <string name="user_settings_edit_profile">Redigera profil</string>
     <string name="user_settings_enter_password_view_codes">Ange ditt lösenord för att visa säkerhetskopieringskoder.</string>
     <string name="user_settings_games_install_location">Plats</string>
     <string name="user_settings_games_install_location_add">Lägg till installationsplatser</string>
@@ -7176,6 +7179,8 @@
     <string name="user_settings_open_on_startup_label">Öppna Discord</string>
     <string name="user_settings_privacy_terms">Kolla in [Användarvillkoren]({termsLink}) och [Sekretesspolicyn]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profilbanner</string>
+    <string name="user_settings_remove_avatar">Ta bort avatar</string>
+    <string name="user_settings_remove_banner">Ta bort banner</string>
     <string name="user_settings_restart_app_mobile">Starta om appen för att dina nya inställningar ska börja gälla.</string>
     <string name="user_settings_save">Spara</string>
     <string name="user_settings_scan_qr_code">Skanna QR-kod</string>
@@ -7190,6 +7195,7 @@
     <string name="user_settings_upload_avatar">Ladda upp avatar</string>
     <string name="user_settings_upload_banner">Ladda upp banner</string>
     <string name="user_settings_used_backup_codes">Använda säkerhetskopieringskoder</string>
+    <string name="user_settings_user_profile">Användarprofil</string>
     <string name="user_settings_voice_add_multiple">Du kan lägga till flera tryck-för-tal-kommandon i [Kortkommando-inställningarna](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord använder bara den bästa ekologiska, närodlade Opus röst-kodeken.</string>
     <string name="user_settings_voice_codec_title">Ljud-codec</string>
@@ -7421,25 +7427,6 @@
     <string name="whitelisting">Vitlistar …</string>
     <string name="working">Arbetar …</string>
     <string name="xbox_authorization_title">Auktorisering av Xbox-konto</string>
-    <string name="xbox_game_pass_card_body_claimed">Du har hämtat det här. Här är din kod !!{code}!!. [Mer information](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Gåvan går att hämta fram till den 15 januari 2021. [Mindre information](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Gåvan går att hämta fram till den 15 januari 2021. [Mer information](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Koden följer även med i ett bekräftelsemejl som vi just skickat till dig.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Någonting gick snett, försök igen senare!</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass för PC-kod</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Oj då</string>
-    <string name="xbox_game_pass_modal_header_description_success">Lös in koden nedan på [inlösningsplats för Microsoft]({redemptionURL}) för att få tillträde till Xbox Game Pass i 3 månader.</string>
-    <string name="xbox_game_pass_modal_header_success">Lysande!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Eftersom du har en boostprenumeration ger vi dig Nitro-prenumerationskredit. Du får Nitro-krediten när du börjar prenumerera på **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Lös in</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Nu har du Nitro-kredit! Börja prenumerera på **{planName}** i dag för att få tillgång till din Nitro-kredit.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Snyggt!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Prenumerationskredit</string>
-    <string name="xbox_game_pass_promotion_banner_description">Vi har något litet extra till dig. Nitro-prenumeranter får nu 3 månaders Xbox Game Pass för PC. Tillgängligt nu fram till den 15 januari 2021. [Mer information](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Vi har något litet extra till dig. Nitro-prenumeranter får nu 3 månaders Xbox Game Pass för PC. Tillgängligt nu fram till den 15 januari 2021. [Mindre information](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 månaders Xbox Game Pass för PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass för PC (3 månader)</string>
-    <string name="xbox_game_pass_promotion_legalese">Erbjudandet är inte giltigt för medlemmar som har eller har haft Xbox Game Pass till PC eller de som har eller har haft Xbox Game Pass Ultimate. Lös in din Xbox Game Pass-kod på [microsoft.com/redeem](https://microsoft.com/redeem) innan den 15 februari 2021. Kreditkort krävs. Såvida du inte säger upp medlemskapet kommer du att debiteras den dåvarande ordinarie medlemsavgiften varje månad efter att kampanjperioden tagit slut. Stöds inte på Windows 10 i S-läge eller på ARM-enheter. Spelkatalogen varierar med tiden. Se [xbox.com/gamepass](https://xbox.com/gamepass). Begränsat till 1 per person/konto.</string>
     <string name="xbox_link">Länk</string>
     <string name="xbox_pin_step1">Öppna Discord-appen på din mobil</string>
     <string name="xbox_pin_step2">Gå till Inställningar &gt; Anslutningar &gt; Lägg till</string>
diff --git a/app/src/main/res/values-th/plurals.xml b/app/src/main/res/values-th/plurals.xml
index 16261ef9eb..a81568785f 100644
--- a/app/src/main/res/values-th/plurals.xml
+++ b/app/src/main/res/values-th/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 สัปดาห์</item>
         <item quantity="other">{minimumGuildAge} สัปดาห์</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">ชื่อ</item>
-        <item quantity="other">ชื่อ</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">ชื่อ</item>
-        <item quantity="other">ชื่อ</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">ใบสมัครที่รอดำเนินการ</item>
         <item quantity="other">{count} ใบสมัครที่รอดำเนินการ</item>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 78a3b91cab..a325639498 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1416,7 +1416,6 @@
     <string name="contact_sync_we_found_your_friends_body">ตอนนี้ คุณได้เป็นเพื่อนกับพวกเขาบน Discord แล้ว ลองคุยกับพวกเขา แล้วชวนเข้าเซิร์ฟเวอร์ของคุณดูสิ ขอให้สนุกนะ! เราจะแจ้งให้คุณทราบถ้ามีเพื่อนใหม่เข้าร่วม Discord</string>
     <string name="contact_sync_we_found_your_friends_title">เราเจอเพื่อนคุณแล้ว!</string>
     <string name="content_matching">!!{command}!! เนื้อหาที่ตรงกับ **!!{query}!!**</string>
-    <string name="context_menu_hint">คลิกขวาที่ผู้ใช้เพื่อการกระทำอื่นๆ</string>
     <string name="continue_in_browser">ดำเนินการต่อในเบราว์เซอร์</string>
     <string name="continue_to_webapp">ไปที่ Discord</string>
     <string name="control_volume">ควบคุมระดับเสียง</string>
@@ -2553,7 +2552,7 @@
     <string name="game_feed_user_playing_for_hours">เล่นมาแล้วเป็นเวลา {time} {time}</string>
     <string name="game_feed_user_playing_for_minutes">เล่นมาแล้วเป็นเวลา {time} {time}</string>
     <string name="game_feed_user_playing_just_ended">เพิ่งหยุดเล่น</string>
-    <string name="game_feed_user_playing_just_started">เพิ่มเริ่มเล่น</string>
+    <string name="game_feed_user_playing_just_started">เพิ่งเริ่มเล่น</string>
     <string name="game_launch_failed_launch_target_not_found">ไม่สามารถเปิดเกม ไม่พบการเปิดเกม</string>
     <string name="game_library_last_played_days">{time}</string>
     <string name="game_library_last_played_hours">{time} ที่แล้ว</string>
@@ -3221,8 +3220,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">เซิร์ฟเวอร์ในการค้นพบจำเป็นต้องมีอายุอย่างน้อย {minimumGuildAge} โปรดลองกลับมาอีกครั้งในวันที่ {passDate}</string>
     <string name="guild_settings_discovery_checklist_age_failing">เซิร์ฟเวอร์ใหม่เกินไป</string>
     <string name="guild_settings_discovery_checklist_bad_standing">เซิร์ฟเวอร์ของคุณ **$[ผ่านเงื่อนไขไม่ครบ](doesNotHook)** ตามกำหนดในการเข้าสู่การค้นพบเซิร์ฟเวอร์</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">คุณจำเป็นต้องเปลี่ยนประเภทของ {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">ช่องของคุณจำเป็นต้องเปลี่ยน {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">คุณจำเป็นต้องเปลี่ยน $[คำบรรยาย](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">คุณจำเป็นต้องเปลี่ยน $[ชื่อเซิร์ฟเวอร์](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">เพิ่มจำนวนผู้สื่อสารรายสัปดาห์</string>
@@ -4447,6 +4444,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">อัปเกรดอีโมจิของคุณ เพิ่มตัวตนของคุณลงในโปรไฟล์ และเฉิดฉายบนเซิร์ฟเวอร์ของคุณ เลือกระหว่าง **!!{monthlyPrice}!! ต่อเดือน** หรือ **!!{yearlyPrice}!! ต่อปี**</string>
     <string name="marketing_refresh_premium_tier_2_title">รับประสบการณ์การใช้งาน Discord แบบยกระดับ</string>
     <string name="marketing_tier_1_perk_list_boost_discount">ลดราคาการบูสต์เซิร์ฟเวอร์ 30%%</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">ใช้อีโมจิที่กำหนดเองและเคลื่อนไหวได้ทุกที่</string>
     <string name="marketing_tier_1_perk_list_stream_quality">ความละเอียดสูงสุด 1080p และเฟรมเรทสูงสุด 60fps</string>
     <string name="marketing_tier_1_perk_list_upload_size">พื้นที่การอัปโหลด 50 MB จากเดิม 100 MB</string>
     <string name="masked_link_body">ลิงก์นี้จะพาคุณไปที่ **!!{url}!!** คุณแน่ใจใช่ไหมว่าอยากไปที่นั่น</string>
@@ -4947,8 +4945,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">คุณมีเวลาเหลืออีก {days}ในการรับสิทธิ์ใช้งาน Nitro ฟรีหนึ่งเดือน</string>
     <string name="notice_premium_tier_2_trial_ending_hours">คุณมีเวลาเหลืออีก {hours}ในการรับสิทธิ์ใช้งาน Nitro ฟรีหนึ่งเดือน</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">คุณมีเวลาเหลืออีก {minutes}ในการรับสิทธิ์ใช้งาน Nitro ฟรีหนึ่งเดือน</string>
-    <string name="notice_premium_xbox_game_pass_promotion">ไง สมาชิก Nitro ยินดีด้วย! คุณได้รับ Xbox Game Pass อายุ 3 เดือนสำหรับ PC จากเรา!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">รับสิทธิ์</string>
     <string name="notice_product_feedback_survey">คุณต้องการที่จะเข้าร่วมการพูดคุยติชมผลิตภัณฑ์กับเราหรือไม่</string>
     <string name="notice_product_feedback_survey_cta">บอกให้เรารู้ได้ที่นี่เลย!</string>
     <string name="notice_register_to_vote">คุณได้ลงทะเบียนสำหรับการเลือกตั้งแล้วหรือยัง ตรวจสอบสถานะของคุณแล้วลงทะเบียนภายในสองนาที</string>
@@ -5135,6 +5131,7 @@
     <string name="out_of_date_action">อัปเดต Discord</string>
     <string name="out_of_date_description">เราทำการปรับปรุง Discord แล้วตั้งหลายอย่าง (แถมมีการแก้บักสักที่สองที่) อัปเดตเพื่อไปต่อ</string>
     <string name="out_of_date_title">คุณกำลังใช้เวอร์ชั่นเก่า</string>
+    <string name="outbound_promotion_redemption_modal_title">เยี่ยมเลย!</string>
     <string name="outgoing_friend_request">ได้ส่งคำขอเป็นเพื่อน</string>
     <string name="outgoing_friend_request_delete_msg">คุณแน่ใจหรือไม่ว่าต้องการลบคำร้องขอเป็นเพื่อน **!!{name}!!**</string>
     <string name="outgoing_friend_request_to">คำขอเป็นเพื่อนที่ส่งไปให้ !!{name}!!</string>
@@ -5814,12 +5811,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">ต้องมีสิทธิ์อนุญาต **ดูช่อง** เพื่อสร้างช่องส่วนตัวนี้</string>
     <string name="private_voice_channel_creation_permission_missing_hint">ต้องมีสิทธิ์อนุญาต **ดูช่อง** และ **เชื่อมต่อ** เพื่อสร้างช่องส่วนตัวนี้</string>
     <string name="profile">โปรไฟล์</string>
+    <string name="profile_banner_icon_tooltip_upsell">อัปโหลดแบนเนอร์ที่ปรับแต่งตามสไตล์ของคุณเองและอีกมากมายด้วย Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">ในตอนนี้ การปรับแต่งโปรไฟล์เปิดให้ใช้งานแล้ว แต่จำกัดจำนวนผู้ใช้</string>
+    <string name="profile_customization_bio_placeholder">บอกให้โลกรู้จักคุณเพิ่มอีกสักนิด</string>
     <string name="profile_customization_marketing_tooltip_body">แสดงความเป็นตัวคุณด้วย “รู้จักฉัน” และด้วยแบนเนอร์โปรไฟล์หากคุณมี Nitro</string>
     <string name="profile_customization_marketing_tooltip_cta">เข้าใจแล้ว</string>
     <string name="profile_customization_marketing_tooltip_header">การปรับแต่งโปรไฟล์ใหม่!</string>
+    <string name="profile_customization_nitro_icon_tooltip">พิเศษเฉพาะ Nitro</string>
     <string name="promotion_card_action_claim">รับสิทธิ์</string>
-    <string name="promotion_card_body_claimed_hidden">คุณได้รับสิทธิ์แล้ว แต่รหัสยังถูกซ่อนอยู่เนื่องจากอยู่ในโหมดสตรีมเมอร์</string>
     <string name="promotion_error_body">ดูเหมือนจะมีบางอย่างผิดพลาด คุณไม่สามารถใช้รหัสนั้นได้ ต้องขอโทษด้วย</string>
     <string name="promotion_error_title">รอสักครู่…</string>
     <string name="promotion_existing_subscriber_title">โอ้ไม่นะ!</string>
@@ -6733,7 +6732,6 @@
     <string name="start_stage_channel_event_members_title">สำหรับสมาชิกเท่านั้น</string>
     <string name="start_stage_channel_event_modal_button">ตั้งเวที</string>
     <string name="start_stage_channel_event_modal_speaker_hint">คุณจะเป็นผู้พูดเมื่อเวทีเปิด</string>
-    <string name="start_stage_channel_event_modal_subtitle">เขียนหัวข้อเพื่อประกาศว่าเวทีของคุณกำลังถ่ายทอดสด</string>
     <string name="start_stage_channel_event_modal_title">คุณจะพูดเกี่ยวกับอะไร</string>
     <string name="start_stage_channel_event_modal_topic_label">หัวข้อของเวที</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">การโต้วาทีจบลงแล้ว: สูตรไดเอตดีกว่าสูตรปกติ</string>
@@ -7418,6 +7416,7 @@
     <string name="user_setting_notification_not_enabled_prompt">การแจ้งเตือนแบบพุชไม่ได้เปิดใช้งาน</string>
     <string name="user_settings">ตั้งค่าผู้ใช้</string>
     <string name="user_settings_about_me">รู้จักฉัน</string>
+    <string name="user_settings_about_me_description">เขียนแนะนำตัวเองได้ตามต้องการตราบใดที่คุณเขียนไม่เกิน {maxLength} ตัวอักษร คุณสามารถใช้รูปแบบข้อความและลิงก์ได้หากต้องการ</string>
     <string name="user_settings_account_change_email_prompt">ที่อยู่อีเมลปัจจุบันของคุณคือ !!{email}!! คุณต้องการเปลี่ยนเป็นอะไร</string>
     <string name="user_settings_account_change_email_prompt_desktop">ป้อนที่อยู่อีเมลใหม่และรหัสผ่านที่มีอยู่ของคุณ</string>
     <string name="user_settings_account_change_email_title">แก้ไขอีเมล</string>
@@ -7452,6 +7451,8 @@
     <string name="user_settings_appearance_preview_message_5">โอ้ นี่ไง!</string>
     <string name="user_settings_appearance_zoom_tip">คุณซูมเข้าออกด้วยการ {modKey} +/- และสามารถตั้งค่าคืนได้โดยปุ่ม {modKey} + 0</string>
     <string name="user_settings_available_codes">รหัสสำรองที่มีอยู่</string>
+    <string name="user_settings_avatar">สัญลักษณ์ประจำตัว</string>
+    <string name="user_settings_banner_specs">เราแนะนำให้ใช้ภาพขนาดอย่างน้อย 600x240 คุณสามารถอัปโหลดไฟล์ PNG, JPG หรือภาพเคลื่อนไหว GIF</string>
     <string name="user_settings_blocked_users">ผู้ใช้ที่ถูกบล็อก</string>
     <string name="user_settings_blocked_users_empty">คุณไม่มีผู้ใช้ที่ถูกบล็อก</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} ผู้ใช้ที่ถูกบล็อก</string>
@@ -7460,12 +7461,14 @@
     <string name="user_settings_close_button">ปุ่มปิด</string>
     <string name="user_settings_confirm_logout">คุณแน่ใจหรือว่าจะออกจากระบบ</string>
     <string name="user_settings_customization_upsell">ปลดล็อกด้วย Nitro</string>
+    <string name="user_settings_customize_profile_title">ปรับแต่งโปรไฟล์ของฉัน</string>
     <string name="user_settings_delete_avatar">ลบสัญลักษณ์ประจำตัว</string>
     <string name="user_settings_disable_advanced_voice_activity">การปิดการตรวจจับเสียงขั้นสูงอาจช่วยได้หากการตรวจจับความไวของไมค์อัตโนมัติไม่ได้กำลังตรวจจับเสียงของคุณอยู่</string>
     <string name="user_settings_disable_noise_suppression">การตัดเสียงรบกวนจะถูกปิดเมื่อใช้งานการลดเสียงรบกวน</string>
     <string name="user_settings_edit_account">แก้ไขบัญชี</string>
     <string name="user_settings_edit_account_password_label">ป้อนรหัสผ่านของคุณเพื่อยืนยันการเปลี่ยนแปลง</string>
     <string name="user_settings_edit_account_tag">แท็ก</string>
+    <string name="user_settings_edit_profile">แก้ไขโปรไฟล์</string>
     <string name="user_settings_enter_password_view_codes">ป้อนรหัสผ่านของคุณเพื่อดูรหัสสำรอง</string>
     <string name="user_settings_games_install_location">ตำแหน่ง</string>
     <string name="user_settings_games_install_location_add">เพิ่มตำแหน่งติดตั้ง</string>
@@ -7516,6 +7519,8 @@
     <string name="user_settings_open_on_startup_label">เปิด Discord</string>
     <string name="user_settings_privacy_terms">ตรวจสอบ [เงื่อนไขการให้บริการ]({termsLink}) และ [นโยบายความเป็นส่วนตัว]({privacyLink}) ของเรา</string>
     <string name="user_settings_profile_banner">ป้ายแบนเนอร์โปรไฟล์</string>
+    <string name="user_settings_remove_avatar">ลบสัญลักษณ์ประจำตัว</string>
+    <string name="user_settings_remove_banner">ลบแบนเนอร์</string>
     <string name="user_settings_restart_app_mobile">เริ่มต้นแอปใหม่เพื่อให้การตั้งค่าใหม่มีผล</string>
     <string name="user_settings_save">บันทึก</string>
     <string name="user_settings_scan_qr_code">สแกนรหัส QR</string>
@@ -7530,6 +7535,7 @@
     <string name="user_settings_upload_avatar">อัปโหลดสัญลักษณ์ประจำตัว</string>
     <string name="user_settings_upload_banner">อัปโหลดป้ายแบนเนอร์</string>
     <string name="user_settings_used_backup_codes">ใช้รหัสสำรอง</string>
+    <string name="user_settings_user_profile">โปรไฟล์ผู้ใช้</string>
     <string name="user_settings_voice_add_multiple">คุณสามารถเพิ่มปุ่ม Push To Talk หลายปุ่มได้ใน [การตั้งค่าปุ่ม](onClick)</string>
     <string name="user_settings_voice_codec_description">Discord ใช้แหล่งข้อมูล Codec เสียงพูดภายในที่ดีที่สุดจาก Opus Voice เท่านั้น</string>
     <string name="user_settings_voice_codec_title">ตัวแปลงสัญญาณเสียง</string>
@@ -7764,25 +7770,6 @@
     <string name="widget">widget</string>
     <string name="working">รอหน่อย…</string>
     <string name="xbox_authorization_title">อนุญาตบัญชีผู้ใช้ Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">คุณได้รับสิทธิ์แล้ว รหัสของคุณคือ !!{code}!! [ดูรายละเอียด](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">รับของขวัญได้จนถึงวันที่ 15 มกราคม 2021 [ซ่อนรายละเอียด](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">รับของขวัญได้จนถึงวันที่ 15 มกราคม 2021 [ดูรายละเอียด](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">รหัสนี้รวมอยู่ในอีเมลยืนยันที่เราส่งให้คุณด้วย</string>
-    <string name="xbox_game_pass_modal_code_description_failed">มีบางอย่างผิดพลาด ลองอีกครั้งในภายหลัง!</string>
-    <string name="xbox_game_pass_modal_code_header">รหัส Xbox Game Pass สำหรับ PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">โอ๊ะโอ</string>
-    <string name="xbox_game_pass_modal_header_description_success">นำรหัสด้านล่างไปแลกใน [เว็บไซต์แลกรับสิทธิ์ของ Microsoft]({redemptionURL}) เพื่อเข้าถึง Xbox Game Pass อายุ 3 เดือนสำหรับ PC</string>
-    <string name="xbox_game_pass_modal_header_success">เยี่ยมเลย!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">เนื่องจากคุณมีการสมัครสมาชิกบูสต์อยู่ เราจึงจะมอบเครดิตสมาชิก Nitro ให้คุณ โดยจะใช้เครดิต Nitro เมื่อคุณสมัครสมาชิก **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">แลกใช้</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">ตอนนี้คุณมีเครดิต Nitro แล้ว! บอกรับเป็นสมาชิก **{planName}** วันนี้เพื่อใช้เครดิต Nitro ของคุณ</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">เยี่ยมเลย!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">เครดิตสมาชิก</string>
-    <string name="xbox_game_pass_promotion_banner_description">เรามีของพิเศษเล็ก ๆ น้อย ๆ มาให้คุณ สมาชิก Nitro รับ Xbox Game Pass อายุ 3 เดือนสำหรับ PC ได้เลย รับได้ตั้งแต่วันนี้จนถึงวันที่ 15 มกราคม 2021 [ดูรายละเอียด](onToggleExpand)</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">เรามีของพิเศษเล็ก ๆ น้อย ๆ มาให้คุณ สมาชิก Nitro รับ Xbox Game Pass อายุ 3 เดือนสำหรับ PC ได้เลย รับได้ตั้งแต่วันนี้จนถึงวันที่ 15 มกราคม 2021 [ซ่อนรายละเอียด](onToggleExpand)</string>
-    <string name="xbox_game_pass_promotion_banner_header">Xbox Game Pass อายุ 3 เดือนสำหรับ PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass สำหรับ PC (3 เดือน)</string>
-    <string name="xbox_game_pass_promotion_legalese">สมาชิกปัจจุบันหรือผู้ที่เคยเป็นสมาชิก Xbox Game Pass สำหรับ PC หรือ Xbox Game Pass Ultimate จะไม่สามารถใช้รหัสได้ นำรหัส Xbox Game Pass ของคุณไปแลกที่ [microsoft.com/redeem](https://microsoft.com/redeem) ภายในวันที่ 15 กุมภาพันธ์ 2021 โดยต้องใช้บัตรเครดิตด้วย หากคุณไม่ยกเลิก คุณจะถูกเรียกเก็บค่าบริการในอัตราสมาชิกปกติเป็นประจำทุกเดือนหลังหมดช่วงโปรโมชัน ระบบจะไม่รองรับ Windows 10 ในโหมด S และอุปกรณ์ ARM แคตตาล็อกเกมจะแตกต่างกันไปตามช่วงเวลา ดู [xbox.com/gamepass](https://xbox.com/gamepass) จำกัด: 1 รหัสต่อคน/บัญชี</string>
     <string name="xbox_link">ลิงก์</string>
     <string name="xbox_pin_step1">เปิดแอป Discord ในโทรศัพท์ของคุณ</string>
     <string name="xbox_pin_step2">ไปที่การตั้งค่า &gt; การเชื่อมต่อ &gt; เพิ่ม</string>
diff --git a/app/src/main/res/values-tr/plurals.xml b/app/src/main/res/values-tr/plurals.xml
index bf06338c98..f75d370ca5 100644
--- a/app/src/main/res/values-tr/plurals.xml
+++ b/app/src/main/res/values-tr/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 haftalık</item>
         <item quantity="other">{minimumGuildAge} haftalık</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">adını</item>
-        <item quantity="other">adlarını</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">adını</item>
-        <item quantity="other">adlarını</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Bekleyen Başvuru</item>
         <item quantity="other">{count} Bekleyen Başvuru</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d685a44209..f5c7fe9d06 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1048,7 +1048,7 @@
     <string name="change_identity_modal_uploader_cta">Sunucu Avatarını Değiştir</string>
     <string name="change_identity_modal_upsell">**Discord Nitro!** ile sunucularında farklı avatarlar kullan ve daha fazla özelliğe eriş!</string>
     <string name="change_log">Değişim Kaydı</string>
-    <string name="change_log_md_body">Yeni Özellikler {added marginTop}\n======================\n\n* **Sahne Keşfi ekledik.** Canlı Sahneler düzenleyen topluluklara göz at. Bunların içinde konserler, paneller, yetenek gösterileri gibi sesli etkinlikler veya aklına gelen garip ama yasalara uygun başka şeyler de olabilir. Keşif sekmesine tıklayarak başla. \n* **Arkadaşlarını Bul özelliği geldi.** Discord\'daki arkadaşlarını daha kolay bulmanın isteğe bağlı olarak kullanılabilecek bir yolunu ekledik. Arkadaşının telefon numarasına sahipsen ve ikiniz de arkadaş bulma sistemine dahilseniz, arkadaşını görüp ona arkadaş talebi gönderebileceksin. \"xXYaRaLI_GoNuLXx#0000\'dan davet aldıysan, o benim,\" minvalindeki muhabbetlere hazır ol.\n* **Favori emoji seçeneği ekledik.** Sohbetteki bir emojiye dokunarak veya emoji seçiciden birine basılı tutarak favorilerine emoji ekleyip çıkarabilirsin. Favorilerin *şimdilik* masaüstüyle senkronize edilmeyecek ama 2.459 emoji arasından gerçekten kullandığın beş tanesini seçmeye başlayabilirsin.\n* **Arama çubuğuna sayfalandırma ekledik.** Artık arama sonuçlarının içinde kaybolmana gerek kalmayacak. Böylece arkadaşının altı ay önce söylediğini iddia ettiğin, onun kesinlikle yalanladığı, ama tam hatırlamasan da senin yüzde yüz emin olduğun şey hakkındaki delili saniyeler içinde bulmak için sayfalar arasında hızlıca geçiş yapabilirsin.\n* **Ses kanalı sesleri ekledik.** Artık telefonun ses kanallarına katıldığında, kanaldan ayrıldığında veya yerin değiştirildiğinde bir ses çalacak. Bu seslerin hepsini zihnimde çalabildiğimi biliyor muydun? Dı-rın... Dı-rı-rın...\n\n\n\n\nDüzeltmeler ve Güncellemeler {progress}\n======================\n\n* **Düzenleme pinglerini kaldırdık!** Bir cevabı düzenlemek artık çoğu zaman ilk yazardan bahsetmeyecek çünkü lütfen yani, sadece ufacık bir yazım hatası gidermek istemiştim ama resmen rezil oldum.\n* **Sunucu klasörü geliştirmeleri.** Artık sunucu klasörlerini okundu olarak işaretleyebilirsin! Özel isim ve renkler atamanı sağlayan sunucu klasörü ayarları da ekledik.\n* **Üye Seçimi\'yle ilgili kapsamlı geliştirmeler ve hata gidermeleri.** Artık bu sayfalarda çakılı kalmayacaksın.\n* **Giriş moduna erişmeyi kolaylaştırdık.** Artık arama ekranından ayrılmadan bas-konuş ve ses etkinliği ayarlarını değiştirebilirsin.\n\n\n</string>
+    <string name="change_log_md_body">Yeni Özellikler {added marginTop}\n======================\n\n* **Arkadaşlarını Bul özelliği geldi.** Discord\'daki arkadaşlarını daha kolay bulmanın isteğe bağlı olarak kullanılabilecek bir yolunu ekledik. Arkadaşının telefon numarasına sahipsen ve ikiniz de arkadaş bulma sistemine dahilseniz, arkadaşını görüp ona arkadaş talebi gönderebileceksin. \"xXYaRaLI_GoNuLXx#0000\'dan davet aldıysan, o benim,\" minvalindeki muhabbetlere hazır ol.\n* **Favori emoji seçeneği ekledik.** Sohbetteki bir emojiye dokunarak veya emoji seçiciden birine basılı tutarak favorilerine emoji ekleyip çıkarabilirsin. Favorilerin *şimdilik* masaüstüyle senkronize edilmeyecek ama 2.459 emoji arasından gerçekten kullandığın beş tanesini seçmeye başlayabilirsin.\n* **Arama çubuğuna sayfalandırma ekledik.** Artık arama sonuçlarının içinde kaybolmana gerek kalmayacak. Böylece arkadaşının altı ay önce söylediğini iddia ettiğin, onun kesinlikle yalanladığı, ama tam hatırlamasan da senin yüzde yüz emin olduğun şey hakkındaki delili saniyeler içinde bulmak için sayfalar arasında hızlıca geçiş yapabilirsin.\n* **Ses kanalı sesleri ekledik.** Artık telefonun ses kanallarına katıldığında, kanaldan ayrıldığında veya yerin değiştirildiğinde bir ses çalacak. Bu seslerin hepsini zihnimde çalabildiğimi biliyor muydun? Dı-rın... Dı-rı-rın...\n\n\n\n\nDüzeltmeler ve Güncellemeler {progress}\n======================\n\n* **Düzenleme pinglerini kaldırdık!** Bir cevabı düzenlemek artık çoğu zaman ilk yazardan bahsetmeyecek çünkü lütfen yani, sadece ufacık bir yazım hatası gidermek istemiştim ama resmen rezil oldum.\n* **Sunucu klasörü geliştirmeleri.** Artık sunucu klasörlerini okundu olarak işaretleyebilirsin! Özel isim ve renkler atamanı sağlayan sunucu klasörü ayarları da ekledik.\n* **Üye Seçimi\'yle ilgili kapsamlı geliştirmeler ve hata gidermeleri.** Artık bu sayfalarda çakılı kalmayacaksın.\n* **Giriş moduna erişmeyi kolaylaştırdık.** Artık arama ekranından ayrılmadan bas-konuş ve ses etkinliği ayarlarını değiştirebilirsin.\n\n\n</string>
     <string name="change_log_md_date">2021-06-21</string>
     <string name="change_log_md_locale">tr</string>
     <string name="change_log_md_revision">1</string>
@@ -1411,7 +1411,6 @@
     <string name="contact_sync_we_found_your_friends_body">Artık onunla Discord\'da arkadaşsın. Onunla sohbet et, onu sunucuna davet et, iyi eğlenceler! Diğer arkadaşların Discord\'a katıldığında sana haber vereceğiz.</string>
     <string name="contact_sync_we_found_your_friends_title">Arkadaşlarını bulduk!</string>
     <string name="content_matching">**!!{query}!!** ile eşleşen !!{command}!! içeriği</string>
-    <string name="context_menu_hint">Daha fazla eylem için kullanıcıya sağ tıkla</string>
     <string name="continue_in_browser">Tarayıcıda devam et</string>
     <string name="continue_to_webapp">Discord\'a devam et</string>
     <string name="control_volume">Sesi kontrol et</string>
@@ -1940,7 +1939,7 @@
     <string name="emoji_picker_premium_upsell_body">Nitro\'ya abone olarak bu emojileri ve daha fazlasını kullan.</string>
     <string name="emoji_picker_premium_upsell_cta">Nitro Al</string>
     <string name="emoji_popout_current_guild_description">Bu emoji bu sunucudan geliyor. Onu her yerde kullanmak için Nitro aboneliği al.</string>
-    <string name="emoji_popout_joined_guild_description">Bu emoji sunucularından biri geliyor. Onu her yerde kullanmak için Nitro aboneliği al.</string>
+    <string name="emoji_popout_joined_guild_description">Bu emoji sunucularından birinden geliyor. Onu her yerde kullanmak için Nitro aboneliği al.</string>
     <string name="emoji_popout_joined_guild_emoji_description">Bu emoji şuradan geliyor:</string>
     <string name="emoji_popout_premium_cta">Nitro Al</string>
     <string name="emoji_popout_premium_current_guild_description">Bu emoji bu sunucudan geliyor. Onu her yerde kullanabilirsin.</string>
@@ -3156,8 +3155,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Keşif içindeki sunucuların en az {minimumGuildAge} olması gerekiyor. Lütfen {passDate} tarihinde tekrar kontrol et.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Sunucu Çok Yeni</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Sunucun, Sunucu Keşfi\'nde yer alma şartlarının tamamını **$[sağlamıyor](doesNotHook)**.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Kategori {numCategories} değiştirmen gerekiyor: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Kanal {numChannels} değiştirmen gerekiyor: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">$[Açıklamanı](descriptionHook) değiştirmen gerekiyor</string>
     <string name="guild_settings_discovery_checklist_change_name">$[Sunucu adını](nameHook) değiştirmen gerekiyor</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Haftalık iletişimci sayısını arttır</string>
@@ -4386,6 +4383,7 @@
     <string name="marketing_refresh_premium_tier_2_subtitle_with_price">Emoji geliştir, profilini kişiselleştir ve sunucularda fark yarat. **Aylık !!{monthlyPrice}!!** veya **yıllık !!{yearlyPrice}!!** ödeme planı arasında seçim yap.</string>
     <string name="marketing_refresh_premium_tier_2_title">Geliştirilmiş bir Discord deneyimi yaşa</string>
     <string name="marketing_tier_1_perk_list_boost_discount">Sunucu Takviyelerinde %%30 indirim</string>
+    <string name="marketing_tier_1_perk_list_custom_emoji">Her yerde özel ve animasyonlu emoji kullan</string>
     <string name="marketing_tier_1_perk_list_stream_quality">1080p\'ye kadar çözünürlük ve 60 FPS\'ye kadar kare hızı</string>
     <string name="marketing_tier_1_perk_list_upload_size">100 MB yerine 50 MB yükleme</string>
     <string name="masked_link_body">Bu link seni **!!{url}!!** adresine yönlendirecek. Gitmek istediğine emin misin?</string>
@@ -4885,8 +4883,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Bir aylık ücretsiz Nitro kazanmak için {days} var</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Bir aylık ücretsiz Nitro kazanmak için {hours} var</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Bir aylık ücretsiz Nitro kazanmak için {minutes} var</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hey Nitro abonesi, tebrikler! Bizden 3 aylık Xbox Game Pass for PC kazandın!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Al</string>
     <string name="notice_product_feedback_survey">Bizimle birlikte ürün geribildirimi tartışmalarında yer almak ister misin?</string>
     <string name="notice_product_feedback_survey_cta">Buradan bize bildir!</string>
     <string name="notice_scheduled_maintenance">Discord şu tarihlerde bakıma girecek **{start}**de **{start}**.</string>
@@ -5072,6 +5068,7 @@
     <string name="out_of_date_action">Discord\'u Güncelle</string>
     <string name="out_of_date_description">Discord için güzel yeniliklerimiz (ve muhtemelen bir iki hata düzeltmesi) var. Devam etmek için güncelle.</string>
     <string name="out_of_date_title">Güncel değilsin</string>
+    <string name="outbound_promotion_redemption_modal_title">Harika!</string>
     <string name="outgoing_friend_request">Giden Arkadaş İsteği</string>
     <string name="outgoing_friend_request_delete_msg">**!!{name}!!** kullanıcısına olan arkadaşlık isteğini silmek istediğine emin misin?</string>
     <string name="outgoing_friend_request_to">!!{name}!! Kullanıcısına Giden Arkadaşlık İsteği</string>
@@ -5749,12 +5746,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Bu özel kanalı oluşturmak için **Kanalları Görüntüleme** izni gerekli.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Bu özel kanalı oluşturmak için **Kanalları Görüntüleme** ve **Bağlanma** izinleri gerekli.</string>
     <string name="profile">Profil</string>
+    <string name="profile_banner_icon_tooltip_upsell">Discord Nitro ile kendi kişiselleştirilmiş afişini ve daha fazlasını yükle!</string>
     <string name="profile_customization_beta_tooltip">Profil Özelleştirmeleri şimdilik sınırlı sayıda kişi tarafından kullanılabilir.</string>
+    <string name="profile_customization_bio_placeholder">Dünyaya kendin hakkında bir şeyler anlat.</string>
     <string name="profile_customization_marketing_tooltip_body">Hakkımda bölümüyle ve eğer Nitro sahibiysen bir profil afişiyle kendini ifade et!</string>
     <string name="profile_customization_marketing_tooltip_cta">Anladım</string>
     <string name="profile_customization_marketing_tooltip_header">Yeni Profil Özelleştirmeleri!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Nitro\'ya Özel</string>
     <string name="promotion_card_action_claim">Al</string>
-    <string name="promotion_card_body_claimed_hidden">Bunu aldın ama kod Yayıncı Modu\'ndan dolayı gizli.</string>
     <string name="promotion_error_body">Bir hata oluştu ve o kodu kullanamayacaksın. Üzgünüz.</string>
     <string name="promotion_error_title">Dur biraz…</string>
     <string name="promotion_existing_subscriber_title">Olamaz!</string>
@@ -6663,7 +6662,6 @@
     <string name="start_stage_channel_event_members_title">Üyelere Özel</string>
     <string name="start_stage_channel_event_modal_button">Sahneyi Başlat</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Sahne açıldığında Konuşmacı olacaksın.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Sahnenin yayında olduğunu ilan etmek için bir konu yaz.</string>
     <string name="start_stage_channel_event_modal_title">Ne hakkında konuşacaksın?</string>
     <string name="start_stage_channel_event_modal_topic_label">Sahne Konusu</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Tartışma sona erdi: diyet kola normal koladan daha güzel</string>
@@ -7347,6 +7345,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Anlık bildirimler etkin değil.</string>
     <string name="user_settings">Kullanıcı Ayarları</string>
     <string name="user_settings_about_me">Hakkımda</string>
+    <string name="user_settings_about_me_description">Kendin hakkında istediğini yaz. Tabii en fazla {maxLength} karakter uzunluğunda olduğu sürece. İstersen markdown ve bağlantı kullanabilirsin.</string>
     <string name="user_settings_account_change_email_prompt">Mevcut e-posta adresin !!{email}!!. Ne olarak değiştirmek istiyorsun?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Yeni bir e-posta adresi ve mevcut şifreni gir.</string>
     <string name="user_settings_account_change_email_title">E-postanı Düzenle</string>
@@ -7381,6 +7380,8 @@
     <string name="user_settings_appearance_preview_message_5">Oh işte burada!</string>
     <string name="user_settings_appearance_zoom_tip">{modKey} +/- ile yakınlaştırma düzeyini değiştirebilirsin ve {modKey}+0 ile yakınlaştırma düzeyini varsayılan değere sıfırlayabilirsin.</string>
     <string name="user_settings_available_codes">Kullanılabilir Yedek Kodlar</string>
+    <string name="user_settings_avatar">Avatar</string>
+    <string name="user_settings_banner_specs">Çözünürlüğü en az 600x240 olan bir görsel kullanılmasını öneriyoruz. PNG, JPG veya hareketli GIF yükleyebilirsin.</string>
     <string name="user_settings_blocked_users">Engellenen Kullanıcılar</string>
     <string name="user_settings_blocked_users_empty">Henüz engellediğin kullanıcı yok</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Engellenen Kullanıcı</string>
@@ -7389,12 +7390,14 @@
     <string name="user_settings_close_button">Kapatma Düğmesi</string>
     <string name="user_settings_confirm_logout">Çıkış yapmak istediğine emin misin?</string>
     <string name="user_settings_customization_upsell">Nitro ile aç</string>
+    <string name="user_settings_customize_profile_title">Profilimi Özelleştirme</string>
     <string name="user_settings_delete_avatar">Avatarını Sil</string>
     <string name="user_settings_disable_advanced_voice_activity">Otomatik giriş duyarlılığı sesini tespit edemiyorsa bunu kapatmak işe yarayabilir.</string>
     <string name="user_settings_disable_noise_suppression">Gürültü Azaltma ayarı etkinken gürültü önleme devre dışı kalır.</string>
     <string name="user_settings_edit_account">Hesabı Düzenle</string>
     <string name="user_settings_edit_account_password_label">Değişiklikleri onaylamak için şifreni gir</string>
     <string name="user_settings_edit_account_tag">ETİKET</string>
+    <string name="user_settings_edit_profile">Profili Düzenle</string>
     <string name="user_settings_enter_password_view_codes">Yedek kodları görüntülemek için şifreni gir.</string>
     <string name="user_settings_games_install_location">Konum</string>
     <string name="user_settings_games_install_location_add">Kurulum Yeri ekle</string>
@@ -7445,6 +7448,8 @@
     <string name="user_settings_open_on_startup_label">Discord\'u Aç</string>
     <string name="user_settings_privacy_terms">[Hizmet Koşullarına]({termsLink}) ve [Gizlilik Politikasına]({privacyLink}) göz at.</string>
     <string name="user_settings_profile_banner">Profil Afişi</string>
+    <string name="user_settings_remove_avatar">Avatarı Kaldır</string>
+    <string name="user_settings_remove_banner">Afişi Kaldır</string>
     <string name="user_settings_restart_app_mobile">Yeni ayarlarının devreye girmesi için uygulamayı yeniden başlat.</string>
     <string name="user_settings_save">Kaydet</string>
     <string name="user_settings_scan_qr_code">QR Kodunu tara</string>
@@ -7459,6 +7464,7 @@
     <string name="user_settings_upload_avatar">Avatar Yükle</string>
     <string name="user_settings_upload_banner">Afiş Yükle</string>
     <string name="user_settings_used_backup_codes">Kullanılan Yedek Kodlar</string>
+    <string name="user_settings_user_profile">Kullanıcı Profili</string>
     <string name="user_settings_voice_add_multiple">[Tuş Atama Ayarları](onClick)\'nda Bas-Konuş için birden fazla tuş atayabilirsin.</string>
     <string name="user_settings_voice_codec_description">Discord sadece en iyi organik yerel-kaynaklı Opus Ses codec\'ini kullanır.</string>
     <string name="user_settings_voice_codec_title">Ses Kodeki</string>
@@ -7693,25 +7699,6 @@
     <string name="whitelisting">Beyaz Listeye Ekleniyor…</string>
     <string name="working">Çalışıyor…</string>
     <string name="xbox_authorization_title">Xbox Hesap Yetkilendirmesi</string>
-    <string name="xbox_game_pass_card_body_claimed">Bunu aldın. İşte kodun: !!{code}!!. [Daha fazla bilgi](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Hediye 15 Ocak 2021 tarihine kadar alınabilir. [Daha Az Bilgi](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Hediye 15 Ocak 2021 tarihine kadar alınabilir. [Daha Fazla Bilgi](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Bu kod, sana az önce gönderdiğimiz onay e-postasında da bulunuyor.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Bir şeyler ters gitti, daha sonra tekrar dene!</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass for PC Kodu</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Hayda</string>
-    <string name="xbox_game_pass_modal_header_description_success">3 ay boyunca Xbox Game Pass for PC erişimi kazanmak için kodu aşağıdaki [Microsoft kullanım sitesinden]({redemptionURL}) al.</string>
-    <string name="xbox_game_pass_modal_header_success">Harika!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Bir takviye aboneliğin olduğu için sana Nitro aboneliği kredisi vereceğiz. Nitro kredisi, sen **{planName}** planına abone olduğunda eklenecek.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Al</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Artık Nitro Kredisine sahipsin! Nitro kredini eklemek için hemen **{planName}** planına abone ol.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Güzel!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Abonelik Kredisi</string>
-    <string name="xbox_game_pass_promotion_banner_description">Sana fazladan küçük bir hediyemiz var. Nitro aboneleri artık 3 aylık Xbox Game Pass for PC kazanıyor. Şu andan itibaren 15 Ocak 2021\'e kadar geçerlidir. [Daha Fazla Bilgi](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Sana fazladan küçük bir hediyemiz var. Nitro aboneleri artık 3 aylık Xbox Game Pass for PC kazanıyor. Şu andan itibaren 15 Ocak 2021\'e kadar geçerlidir. [Daha Az Bilgi](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 Aylık Xbox Game Pass for PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass for PC (3 ay)</string>
-    <string name="xbox_game_pass_promotion_legalese">Şu anki veya daha önceki Xbox Game Pass for PC üyeleri ya da Xbox Game Pass Ultimate üyeleri için geçerli değildir. Xbox Game Pass kodunu [microsoft.com/redeem](https://microsoft.com/redeem) adresinden 15 Şubat 2021\'e kadar alabilirsin. Kredi kartı gerektirir. İptal etmediğin sürece, promosyonlu süre sona erdikten sonra o anki normal üyelik ücreti hesabından çekilir. Windows 10 S modunda ve ARM cihazlarında desteklenmez. Oyun kataloğu zamanla değişebilir. [xbox.com/gamepass](https://xbox.com/gamepass) adresine göz at. Hesap başına 1 kişiyle sınırlıdır.</string>
     <string name="xbox_link">Bağlantı</string>
     <string name="xbox_pin_step1">Discord uygulamasını telefonunda aç</string>
     <string name="xbox_pin_step2">Ayarlar &gt; Bağlantılar &gt; Ekle bölümüne git</string>
diff --git a/app/src/main/res/values-uk/plurals.xml b/app/src/main/res/values-uk/plurals.xml
index 95729c7095..a2e77f90ff 100644
--- a/app/src/main/res/values-uk/plurals.xml
+++ b/app/src/main/res/values-uk/plurals.xml
@@ -648,16 +648,6 @@
         <item quantity="few">{#}тижні</item>
         <item quantity="other">{minimumGuildAge} тижнів</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">ім&apos;я категорії</item>
-        <item quantity="few">імен категорій</item>
-        <item quantity="other">імені категорій</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">ім&apos;я каналу</item>
-        <item quantity="few">імен каналів</item>
-        <item quantity="other">імені каналів</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">заявка на розгляді</item>
         <item quantity="few">{count} заявки на розгляді</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c865a52df1..ac48b53a63 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1422,7 +1422,6 @@
     <string name="contact_sync_we_found_your_friends_body">Тепер ви друзі на Discord. Спілкуйтеся, запрошуйте на свій сервер, розважайтеся! Ми повідомимо, коли інші твої друзі приєднаються до Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Ми знайшли твоїх друзів!</string>
     <string name="content_matching">Результати !!{command}!!, відповідні запиту **!!{query}!!**</string>
-    <string name="context_menu_hint">Клацни правою кнопкою миші по користувачу для додаткових дій</string>
     <string name="continue_in_browser">Продовжити в браузері</string>
     <string name="continue_to_webapp">Перейти до Discord</string>
     <string name="control_volume">Керувати гучністю</string>
@@ -3233,8 +3232,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Вік серверів у категорії «Знайомство з серверами» має становити щонайменше{minimumGuildAge}. Повертайся {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Занадто молодий сервер</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Твій сервер відповідає **$[не всім](doesNotHook)** вимогам для додання в категорію «Знайомство з серверами».</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Тобі потрібно змінити {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Тобі потрібно змінити {numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Тобі потрібно змінити свій $[опис](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Тобі потрібно змінити своє $[ім\'я сервера](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Збільш кількість співрозмовників на тиждень</string>
@@ -4791,7 +4788,7 @@
     <string name="mutual_guilds">Спільні сервери</string>
     <string name="n_days">{days}</string>
     <string name="nearby_scan">Сканувати поблизу</string>
-    <string name="nearby_scan_cta_title">Сканувати поблизу</string>
+    <string name="nearby_scan_cta_title">Сканування Nearby</string>
     <string name="nearby_scan_subtitle">Використай Bluetooth або Wifi, щоби знайти друзів поблизу.</string>
     <string name="need_account">Потрібен акаунт?</string>
     <string name="network_error_bad_request">Мав місце невірний запит мережі. Спробуй ще раз.</string>
@@ -4964,8 +4961,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">У тебе є {days}, щоб отримати безкоштовний місяць передплати Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">У тебе є {hours}, щоб отримати безкоштовний місяць передплати Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">У тебе є {minutes}, щоб отримати безкоштовний місяць передплати Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Агов, передплатнику Nitro! Вітаємо! Ти отримуєш від нас абонемент Xbox Game Pass для ПК на 3 місяці.</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Отримати</string>
     <string name="notice_product_feedback_survey_cta">Повідом нам про це!</string>
     <string name="notice_scheduled_maintenance">Роботи з технічного обслуговування програми Discord проводитимуться з **{start}** по **{start}**.</string>
     <string name="notice_spotify_auto_paused">Відтворення на Spotify призупинено під час передачі аудіо.</string>
@@ -5150,6 +5145,7 @@
     <string name="out_of_date_action">Оновити Discord</string>
     <string name="out_of_date_description">Ми зробили декілька цікавих змін в Discord (і, можливо, виправили кілька багів). Онови програму, щоб продовжити.</string>
     <string name="out_of_date_title">Твоя версія застаріла</string>
+    <string name="outbound_promotion_redemption_modal_title">Чудово!</string>
     <string name="outgoing_friend_request">Вихідний запит на дружбу</string>
     <string name="outgoing_friend_request_delete_msg">Ти впевнений, що бажаєш видалити свій запит на дружбу, адресований **!!{name}!!**?</string>
     <string name="outgoing_friend_request_to">Вихідний запит на дружбу користувачу !!{name}!!</string>
@@ -5832,12 +5828,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Щоб створити приватний канал, потрібен дозвіл на **перегляд каналів**.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Щоб створити приватний канал, потрібні дозволи на **перегляд каналів** і **підключення**.</string>
     <string name="profile">Профіль</string>
+    <string name="profile_banner_icon_tooltip_upsell">Завантажуй персоналізований банер та отримай інші переваги з Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Персоналізація профілю наразі доступна обмеженій кількості людей.</string>
+    <string name="profile_customization_bio_placeholder">Розкажи світу трохи про себе</string>
     <string name="profile_customization_marketing_tooltip_body">Виражай себе з інформацією «Про мене» та, якщо ти маєш Nitro, з банером профілю!</string>
     <string name="profile_customization_marketing_tooltip_cta">Зрозуміло</string>
     <string name="profile_customization_marketing_tooltip_header">Нова персоналізація профілю!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Ексклюзивно з Nitro</string>
     <string name="promotion_card_action_claim">Отримати</string>
-    <string name="promotion_card_body_claimed_hidden">Подарунок отримано, але код приховано через режим стрімера.</string>
     <string name="promotion_error_body">Здається, щось пішло не так, і цей код використати не можна. Вибач.</string>
     <string name="promotion_error_title">Почекай трохи…</string>
     <string name="promotion_existing_subscriber_title">О ні!</string>
@@ -6751,7 +6749,6 @@
     <string name="start_stage_channel_event_members_title">Тільки для учасників</string>
     <string name="start_stage_channel_event_modal_button">Розпочати роботу трибуни</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Після відкриття етапу ти станеш спікером.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Напиши тему, щоб оголосити початок роботи трибуни.</string>
     <string name="start_stage_channel_event_modal_title">Про що будеш говорити?</string>
     <string name="start_stage_channel_event_modal_topic_label">Тема етапу</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Дискусія закінчилася: краще дієта, ніж звичайне харчування</string>
@@ -6884,8 +6881,8 @@
     <string name="storage_permission_denied">Потрібен дозвіл для жорсткого диска</string>
     <string name="store_channel">Канал магазину</string>
     <string name="stream_actions_menu_label">Транслювати дії</string>
-    <string name="stream_bad_spectator">Трансляція, яку ти наразі дивишся, має знижену якість зображення або звуку. Це може бути пов\'язане зі станом мережи.</string>
-    <string name="stream_bad_streamer">Твоя трансляція наразі ведеться зі зниженою якістю зображення або звуку. Це може бути пов\'язане зі станом мережи.</string>
+    <string name="stream_bad_spectator">Твоя трансляція наразі ведеться зі зниженою якістю зображення або звуку. Це може бути пов\'язано зі станом мережі.</string>
+    <string name="stream_bad_streamer">Твоя трансляція наразі ведеться зі зниженою якістю зображення або звуку. Це може бути пов\'язано зі станом мережі.</string>
     <string name="stream_capture_paused">Трансляцію призупинено</string>
     <string name="stream_capture_paused_details">Повернися до своєї програми, щоб відновити трансляцію.</string>
     <string name="stream_capture_paused_details_viewer">Користувач !!{username}!! згорнув програму… зачекай!</string>
@@ -7436,6 +7433,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Push-сповіщення не увімкнені</string>
     <string name="user_settings">Користувацькі налаштування</string>
     <string name="user_settings_about_me">Про мене</string>
+    <string name="user_settings_about_me_description">Напиши про себе все, що вважаєш за потрібне, але не більше {maxLength} символів. Можеш використовувати форматування та посилання.</string>
     <string name="user_settings_account_change_email_prompt">Твоя поточна адреса — !!{email}!!. Хочеш змінити її?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Введіть електронну адресу та поточний пароль.</string>
     <string name="user_settings_account_change_email_title">Редагувати електронну адресу</string>
@@ -7470,6 +7468,8 @@
     <string name="user_settings_appearance_preview_message_5">О, а ось і він!</string>
     <string name="user_settings_appearance_zoom_tip">Ти можеш змінити масштаб за допомогою {modKey} +/- та повернутися до стандартного масштабу за допомогою {modKey}+0.</string>
     <string name="user_settings_available_codes">Доступні резервні коди</string>
+    <string name="user_settings_avatar">Аватар</string>
+    <string name="user_settings_banner_specs">Ми радимо використовувати зображення не менше 600х240 пікселів. Можеш завантажити файл PNG, JPG або анімований GIF.</string>
     <string name="user_settings_blocked_users">Заблоковані користувачі</string>
     <string name="user_settings_blocked_users_empty">У тебе немає заблокованих користувачів</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} заблок. користувач.</string>
@@ -7478,12 +7478,14 @@
     <string name="user_settings_close_button">Кнопка закриття</string>
     <string name="user_settings_confirm_logout">Ти впевнений, що хочеш вийти?</string>
     <string name="user_settings_customization_upsell">Розблокувати з Nitro</string>
+    <string name="user_settings_customize_profile_title">Персоналізація профілю</string>
     <string name="user_settings_delete_avatar">Видалити аватар</string>
     <string name="user_settings_disable_advanced_voice_activity">Вимкнення цієї функції може допомогти, якщо твій голос не виявляється з автоматичним налаштуванням чутливості вхідного сигналу.</string>
     <string name="user_settings_disable_noise_suppression">Зниження шумів вимикається, коли функція поглинання шуму активована.</string>
     <string name="user_settings_edit_account">Редагувати акаунт</string>
     <string name="user_settings_edit_account_password_label">Введи свій пароль, щоб підтвердити зміни</string>
     <string name="user_settings_edit_account_tag">ТЕГ</string>
+    <string name="user_settings_edit_profile">Редагувати профіль</string>
     <string name="user_settings_enter_password_view_codes">Введи свій пароль, щоб переглянути резервні коди.</string>
     <string name="user_settings_games_install_location">Місце розташування</string>
     <string name="user_settings_games_install_location_add">Додати місце встановлення</string>
@@ -7534,6 +7536,8 @@
     <string name="user_settings_open_on_startup_label">Відкрити Discord</string>
     <string name="user_settings_privacy_terms">Ознайомся з нашими [Умовами надання послуг]({termsLink}) та [Політикою конфіденційності]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Банер для профілю</string>
+    <string name="user_settings_remove_avatar">Прибрати аватар</string>
+    <string name="user_settings_remove_banner">Прибрати банер</string>
     <string name="user_settings_restart_app_mobile">Перезавантаж програму, щоб зміни набули чинності.</string>
     <string name="user_settings_save">Зберегти</string>
     <string name="user_settings_scan_qr_code">Сканувати QR-код</string>
@@ -7548,6 +7552,7 @@
     <string name="user_settings_upload_avatar">Завантажити аватар</string>
     <string name="user_settings_upload_banner">Завантажити банер</string>
     <string name="user_settings_used_backup_codes">Використані резервні коди</string>
+    <string name="user_settings_user_profile">Профіль користувача</string>
     <string name="user_settings_voice_add_multiple">Ти можеш додати кілька прив\'язок активації кнопкою в [налаштуваннях гарячих клавіш](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord використовує тільки добірний, органічний, вирощений на домашній грядці голосовий кодек Opus.</string>
     <string name="user_settings_voice_codec_title">Аудіо кодек</string>
@@ -7786,25 +7791,6 @@
     <string name="working">Обробляється…</string>
     <string name="wumpus">Вампус</string>
     <string name="xbox_authorization_title">Авторизація акаунта Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Подарунок отримано. Ось твій код !!{code}!!. [Показати більше](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Подарунок можна забрати до 15 січня 2021 року. [Показати менше](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Подарунок можна забрати до 15 січня 2021 року. [Показати більше](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Цей код також відправлений тобі в електронному повідомленні з підтвердженням.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Щось пішло не так. Спробуй пізніше!</string>
-    <string name="xbox_game_pass_modal_code_header">Код абонемента Xbox Game Pass для ПК</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Хай йому!</string>
-    <string name="xbox_game_pass_modal_header_description_success">Використай код нижче на [сторінці використання кодів Microsoft]({redemptionURL}), щоб отримати абонемент Xbox Game Pass для ПК на 3 місяці.</string>
-    <string name="xbox_game_pass_modal_header_success">Чудово!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Оскільки ти маєш передплату бустів, ми надаємо тобі кредит на передплату Nitro. Кредит Nitro буде застосовано, якщо ти оформиш передплату **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Використати</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Тепер в тебе є кредит Nitro! Оформи передплату **{planName}** вже сьогодні, щоб активувати свій кредит Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Чудово!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Кредит на передплату</string>
-    <string name="xbox_game_pass_promotion_banner_description">Ми приготували для тебе ще дещо. Передплатники Nitro зараз можуть отримати 3-місячний абонемент Xbox Game Pass для ПК. Абонемент доступний від сьогодні і до 15 січня 2021 р. [Показати більше](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Ми приготували для тебе ще дещо. Передплатники Nitro зараз можуть отримати 3-місячний абонемент Xbox Game Pass для ПК. Абонемент доступний від сьогодні і до 15 січня 2021 р. [Показати менше](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 місяці абонемента Xbox Game Pass для ПК</string>
-    <string name="xbox_game_pass_promotion_card_header">Абонемент Xbox Game Pass для ПК (3 місяці)</string>
-    <string name="xbox_game_pass_promotion_legalese">Пропозиція недійсна для чинних або колишніх користувачів Xbox Game Pass для ПК або користувачів Xbox Game Pass Ultimate. Використай код(-и) для Xbox Game Pass на сторінці [microsoft.com/redeem](https://microsoft.com/redeem) не пізніше 15 лютого 2021 року. Потрібна банківська картка. Якщо передплату не буде скасовано, то після завершення акційного періоду ти будеш сплачувати стандартну щомісячну вартість абонемента, чинну на відповідний момент. Не підтримується Windows 10 в S-режимі і на пристроях ARM. Каталог ігор з часом змінюється. Більше інформації на [xbox.com/gamepass](https://xbox.com/gamepass). Обмеження: 1 на людину/обліковий запис.</string>
     <string name="xbox_link">Прив\'яжи</string>
     <string name="xbox_pin_step1">Відкрий програму Discord на своєму телефоні</string>
     <string name="xbox_pin_step2">Перейди до Налаштувань &gt; Підключення &gt; Додати</string>
diff --git a/app/src/main/res/values-vi/plurals.xml b/app/src/main/res/values-vi/plurals.xml
index 920639fe77..b2d8836be5 100644
--- a/app/src/main/res/values-vi/plurals.xml
+++ b/app/src/main/res/values-vi/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 tuần</item>
         <item quantity="other">{minimumGuildAge} tuần</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">tên</item>
-        <item quantity="other">tên</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">tên</item>
-        <item quantity="other">tên</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Đơn Đăng Ký Đang Chờ Xử Lý</item>
         <item quantity="other">{count} Đơn Đăng Ký Đang Chờ Xử Lý</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f863e3d30f..81f7788ce9 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1405,7 +1405,6 @@
     <string name="contact_sync_we_found_your_friends_body">Giờ bạn đã kết bạn với họ trên Discord. Hãy trò chuyện, mời họ vào máy chủ của bạn và tận hưởng niềm vui! Chúng tôi sẽ thông báo cho bạn khi có bạn mới tham gia Discord.</string>
     <string name="contact_sync_we_found_your_friends_title">Chúng tôi đã tìm thấy bạn bè của bạn!</string>
     <string name="content_matching">!!{command}!! trùng với nội dung **!!{query}!!**</string>
-    <string name="context_menu_hint">Nhấn chuột phải vào người dùng để xem thêm các hành động</string>
     <string name="continue_in_browser">Tiếp tục trong trình duyệt</string>
     <string name="continue_to_webapp">Tiếp tục vào Discord</string>
     <string name="control_volume">Điều chỉnh âm lượng</string>
@@ -3035,8 +3034,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Máy chủ trong Khám Phá cần có tuổi thọ ít nhất là {minimumGuildAge}. Vui lòng kiểm tra lại vào ngày {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Máy Chủ Quá Trẻ</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Máy chủ của bạn **$[không](doesNotHook)** đáp ứng đủ các yêu cầu để được hiển thị trong mục Khám Phá Máy Chủ.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">Bạn cần thay đổi {numCategories} mục: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">Bạn cần thay đổi {numChannels} kênh: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">Bạn cần thay đổi $[mô tả](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">Bạn cần thay đổi $[tên máy chủ](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Tăng số lượng thành viên trò chuyện hàng tuần</string>
@@ -4757,8 +4754,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">Bạn còn {days} để nhận một tháng Nitro miễn phí</string>
     <string name="notice_premium_tier_2_trial_ending_hours">Bạn còn {hours} để nhận một tháng Nitro miễn phí</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">Bạn còn {minutes} để nhận một tháng Nitro miễn phí</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Này bạn gì đăng ký Nitro ơi, chúc mừng nhá! Discord xin gửi tặng bạn 3 tháng sử dụng miễn phí Xbox Game Pass dành cho PC!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Nhận</string>
     <string name="notice_product_feedback_survey">Bạn có muốn tham gia thảo luận phản hồi sản phẩm với chúng tôi không?</string>
     <string name="notice_product_feedback_survey_cta">Hãy cho chúng tôi biết ở đây!</string>
     <string name="notice_register_to_vote">Bạn đã đăng ký để bầu chưa? Hãy kiểm tra trạng thái của mình và đăng ký trong 2 phút.</string>
@@ -4945,6 +4940,7 @@
     <string name="out_of_date_action">Cập nhật Discord</string>
     <string name="out_of_date_description">Chúng tôi có một vài thay đổi thú vị dành cho Discord (và cũng sửa lại 1, 2 lỗi gì đó). Cập nhật để tiếp tục.</string>
     <string name="out_of_date_title">Ứng dụng đã lỗi thời</string>
+    <string name="outbound_promotion_redemption_modal_title">Tuyệt cú mèo!</string>
     <string name="outgoing_friend_request">Yêu Cầu Kết Bạn Gửi Đi</string>
     <string name="outgoing_friend_request_delete_msg">Bạn có chắc là muốn xóa yêu cầu của bạn bè về **!!{name}!!**không?</string>
     <string name="outgoing_friend_request_to">Yêu Cầu Kết Bạn được gửi đến !!{name}!!</string>
@@ -5622,12 +5618,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">Cần có quyền **Xem Kênh** để tạo kênh riêng tư này.</string>
     <string name="private_voice_channel_creation_permission_missing_hint">Cần có quyền **Xem Kênh** và **Kết Nối** để tạo kênh riêng tư này.</string>
     <string name="profile">Hồ sơ</string>
+    <string name="profile_banner_icon_tooltip_upsell">Tải lên biểu ngữ được cá nhân hóa của riêng bạn và hơn thế nữa với Discord Nitro!</string>
     <string name="profile_customization_beta_tooltip">Tùy Chỉnh Hồ Sơ hiện có cho một số người giới hạn.</string>
+    <string name="profile_customization_bio_placeholder">Hãy giới thiệu với mọi người một chút về bạn</string>
     <string name="profile_customization_marketing_tooltip_body">Thể hiện bản thân bằng giới thiệu về tôi và biểu ngữ hồ sơ nếu bạn có Nitro!</string>
     <string name="profile_customization_marketing_tooltip_cta">Đã rõ</string>
     <string name="profile_customization_marketing_tooltip_header">Tùy Chỉnh Hồ Sơ Mới!</string>
+    <string name="profile_customization_nitro_icon_tooltip">Dành riêng cho Nitro</string>
     <string name="promotion_card_action_claim">Nhận</string>
-    <string name="promotion_card_body_claimed_hidden">Bạn đã nhận rồi, nhưng mã đã bị ẩn do đang sử dụng Chế Độ Streamer.</string>
     <string name="promotion_error_body">Hình như có một vài trục trặc và bạn không thể dùng mã này. Xin lỗi nha.</string>
     <string name="promotion_error_title">Đợi đã…</string>
     <string name="promotion_existing_subscriber_title">Ôi không!</string>
@@ -6533,7 +6531,6 @@
     <string name="start_stage_channel_event_members_title">Chỉ dành cho thành viên</string>
     <string name="start_stage_channel_event_modal_button">Bắt đầu Sân Khấu</string>
     <string name="start_stage_channel_event_modal_speaker_hint">Bạn sẽ là Người nói khi Sân khấu mở.</string>
-    <string name="start_stage_channel_event_modal_subtitle">Viết một chủ đề để thông báo rằng Sân Khấu của bạn đang trực tuyến.</string>
     <string name="start_stage_channel_event_modal_title">Bạn sẽ nói về điều gì?</string>
     <string name="start_stage_channel_event_modal_topic_label">Chủ đề Sân khấu</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">Cuộc tranh luận đã kết thúc: Ăn kiêng tốt hơn ăn thường</string>
@@ -7214,6 +7211,7 @@
     <string name="user_setting_notification_not_enabled_prompt">Thông báo đẩy không được bật</string>
     <string name="user_settings">Cài đặt người dùng</string>
     <string name="user_settings_about_me">Giới thiệu về tôi</string>
+    <string name="user_settings_about_me_description">Viết bất kỳ điều gì bạn thích về bản thân – miễn là dưới {maxLength} ký tự. Bạn có thể sử dụng markdown và liên kết nếu muốn.</string>
     <string name="user_settings_account_change_email_prompt">Địa chỉ email hiện tại của bạn là !!{email}!! Bạn muốn đổi sang địa chỉ email mới nào?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Nhập địa chỉ email mới và mật khẩu hiện tại của bạn.</string>
     <string name="user_settings_account_change_email_title">Chỉnh Sửa Email</string>
@@ -7248,6 +7246,8 @@
     <string name="user_settings_appearance_preview_message_5">Đây rồi!</string>
     <string name="user_settings_appearance_zoom_tip">Bạn có thể thay đổi mức độ phóng to {modKey} +/- và trở lại mức phóng to mặc định với {modKey}+0.</string>
     <string name="user_settings_available_codes">Mã Sao Lưu Có Sẵn</string>
+    <string name="user_settings_avatar">Ảnh đại diện</string>
+    <string name="user_settings_banner_specs">Chúng tôi khuyên bạn nên sử dụng hình ảnh có kích thước tối thiểu 600x240. Bạn có thể tải lên PNG, JPG hoặc ảnh GIF.</string>
     <string name="user_settings_blocked_users">Người Dùng Bị Chặn</string>
     <string name="user_settings_blocked_users_empty">Không có người dùng nào bị chặn cả</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Người Dùng Bị Chặn</string>
@@ -7256,11 +7256,13 @@
     <string name="user_settings_close_button">Nút Đóng</string>
     <string name="user_settings_confirm_logout">Bạn có chắc muốn đăng xuất không?</string>
     <string name="user_settings_customization_upsell">Mở khóa với Nitro</string>
+    <string name="user_settings_customize_profile_title">Tùy Chỉnh Hồ Sơ Của Tôi</string>
     <string name="user_settings_delete_avatar">Xoá Ảnh Đại Diện</string>
     <string name="user_settings_disable_advanced_voice_activity">Bạn có thể tắt tính năng này đi nếu cảm biến đầu vào tự động không nhận diện được giọng của bạn.</string>
     <string name="user_settings_disable_noise_suppression">Tính năng giảm tiếng ồn sẽ bị tắt khi bật tính năng Chặn Tiếng Ồn.</string>
     <string name="user_settings_edit_account">Chỉnh Sửa Tài Khoản</string>
     <string name="user_settings_edit_account_password_label">Nhập mật khẩu để xác nhận thay đổi</string>
+    <string name="user_settings_edit_profile">Sửa Hồ sơ</string>
     <string name="user_settings_enter_password_view_codes">Nhập mật khẩu để xem các mã sao lưu.</string>
     <string name="user_settings_games_install_location">Thư mục</string>
     <string name="user_settings_games_install_location_add">Thêm Thư Mục Cài Đặt</string>
@@ -7310,6 +7312,8 @@
     <string name="user_settings_open_on_startup_label">Mở Discord</string>
     <string name="user_settings_privacy_terms">Hãy đọc [Điều Khoản Dịch Vụ]({termsLink}) và [Chính Sách Bảo Mật]({privacyLink}) của chúng tôi.</string>
     <string name="user_settings_profile_banner">Biểu Ngữ Hồ Sơ</string>
+    <string name="user_settings_remove_avatar">Xóa Ảnh đại diện</string>
+    <string name="user_settings_remove_banner">Xóa Biểu Ngữ</string>
     <string name="user_settings_restart_app_mobile">Khởi động lại ứng dụng để cài đặt mới có hiệu lực.</string>
     <string name="user_settings_save">Lưu</string>
     <string name="user_settings_scan_qr_code">Quét Mã QR</string>
@@ -7324,6 +7328,7 @@
     <string name="user_settings_upload_avatar">Tải Lên Ảnh Đại Diện</string>
     <string name="user_settings_upload_banner">Tải lên Biểu Ngữ</string>
     <string name="user_settings_used_backup_codes">Các mã sao lưu đã được sử dụng</string>
+    <string name="user_settings_user_profile">Hồ Sơ Người dùng</string>
     <string name="user_settings_voice_add_multiple">Bạn có thể thêm nhiều phím nóng Nhấn Để Nói trong [Cài Đặt Phím Nóng](onClick).</string>
     <string name="user_settings_voice_codec_description">Discord chỉ sử dụng bộ codec Opus Voice nguyên bản và thuần khiết nhất.</string>
     <string name="user_settings_voice_codec_title">Audio codec</string>
@@ -7558,25 +7563,6 @@
     <string name="widget">Công cụ</string>
     <string name="working">Đang xử lý…</string>
     <string name="xbox_authorization_title">Ủy Quyền Tài Khoản Xbox</string>
-    <string name="xbox_game_pass_card_body_claimed">Bạn đã nhận rồi. Đây là mã của bạn !!{code}!!. [Hiển Thị Thêm Thông Tin](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Có thể nhận quà tặng đến ngày 15/01/2021. [Hiển Thị Bớt Thông Tin](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Có thể nhận quà tặng đến ngày 15/01/2021. [Hiển Thị Thêm Thông Tin](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">Mã này cũng được gửi kèm trong email xác nhận mà chúng tôi vừa gửi cho bạn.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Đã xảy ra lỗi, vui lòng thử lại sau!</string>
-    <string name="xbox_game_pass_modal_code_header">Mã Xbox Game Pass Cho PC</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Ôi không</string>
-    <string name="xbox_game_pass_modal_header_description_success">Đổi mã dưới đây trên [trang web đổi quà của Microsoft]({redemptionURL}) để nhận quyền truy cập Xbox Game Pass Cho PC trong 3 tháng.</string>
-    <string name="xbox_game_pass_modal_header_success">Tuyệt cú mèo!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Vì bạn có một lần đăng ký nâng cấp, chúng tôi sẽ tặng bạn tín dụng đăng ký Nitro. Tín dụng Nitro sẽ có hiệu lực khi bạn đăng ký **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Lấy lại</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">Giờ bạn đã có Tín Dụng Nitro! Hãy đăng ký **{planName}** ngay hôm nay để trải nghiệm tín dụng Nitro.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Tuyệt!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Tín Dụng Đăng Ký</string>
-    <string name="xbox_game_pass_promotion_banner_description">Chúng tôi có một món quà nho nhỏ nữa cho bạn đây. Người dùng đăng ký Nitro giờ sẽ được nhận 3 tháng sử dụng Xbox Game Pass Cho PC. Hiệu lực từ giờ đến 15/01/2021. [Hiển Thị Thêm Thông Tin](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">Chúng tôi có một món quà nho nhỏ nữa cho bạn đây. Người dùng đăng ký Nitro giờ sẽ được nhận 3 tháng sử dụng Xbox Game Pass Cho PC. Hiệu lực từ giờ đến 15/01/2021. [Hiển Thị Bớt Thông Tin](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 Tháng Sử Dụng Xbox Game Pass Cho PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass Cho PC (3 tháng)</string>
-    <string name="xbox_game_pass_promotion_legalese">Không áp dụng cho người dùng Xbox Game Pass cho PC hiện tại hoặc cũ, hoặc người dùng Xbox Game Pass Ultimate. Truy cập [microsoft.com/redeem](https://microsoft.com/redeem) để đổi mã Xbox Game Pass trước ngày 16/02/2021. Yêu cầu sử dụng thẻ tín dụng. Nếu hết thời gian khuyến mãi mà bạn không huỷ gói đăng ký, bạn sẽ bị tính phí hằng tháng theo giá tương ứng vào thời điểm đó. Không hỗ trợ Windows 10 chạy S mode và trên các thiết bị ARM. Danh mục game sẽ thay đổi theo thời gian. Tìm hiểu thêm tại [xbox.com/gamepass](https://xbox.com/gamepass). Giới hạn: 1 cho mỗi người/tài khoản.</string>
     <string name="xbox_pin_step1">Mở ứng dụng Discord trên điện thoại</string>
     <string name="xbox_pin_step2">Đến Phần Cài Đặt &gt; Kết Nối &gt; Thêm</string>
     <string name="xbox_pin_step3">Nhấp vào Xbox và nhập mã PIN ở trên</string>
diff --git a/app/src/main/res/values-zh-rCN/plurals.xml b/app/src/main/res/values-zh-rCN/plurals.xml
index d1c33dda84..87b601bc0a 100644
--- a/app/src/main/res/values-zh-rCN/plurals.xml
+++ b/app/src/main/res/values-zh-rCN/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1周</item>
         <item quantity="other">{minimumGuildAge}周</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">名称</item>
-        <item quantity="other">名称</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">名称</item>
-        <item quantity="other">名称</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">申请处理中</item>
         <item quantity="other">{count}申请处理中</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 78bb511b3d..83cb2ace05 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1426,7 +1426,6 @@
     <string name="contact_sync_we_found_your_friends_body">您现在已经成为了他们的 Discord 好友。跟他们聊天，邀请他们到您的服务器来，嗨起来！当您的好友加入 Discord 时，我们会通知您。</string>
     <string name="contact_sync_we_found_your_friends_title">我们找到了您的好友！</string>
     <string name="content_matching">!!{command}!! 内容匹配 **!!{query}!!**</string>
-    <string name="context_menu_hint">右击用户头像执行更多选项</string>
     <string name="continue_in_browser">在浏览器中继续</string>
     <string name="continue_to_webapp">继续使用 Discord</string>
     <string name="control_volume">控制音量</string>
@@ -3230,8 +3229,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">“发现服务器”中的服务器需要至少为{minimumGuildAge}。请于{passDate}后再次进行核对。</string>
     <string name="guild_settings_discovery_checklist_age_failing">服务器还太年轻</string>
     <string name="guild_settings_discovery_checklist_bad_standing">您的服务器**$[未](doesNotHook)**符合登录“发现服务器”的所有要求。</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">您需要更改您的类别{numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">您需要更改您的频道{numChannels}: $[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">您需要更改您的$[简介](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">您需要更改您的$[服务器名称](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">增加每周交流者数量</string>
@@ -4961,8 +4958,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">还有{days}，您就可以享受为期一个月的免费 Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">还有{hours}，您就可以享受为期一个月的免费 Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">还有{minutes}，您就可以享受为期一个月的免费 Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">恭喜您，Nitro 订阅用户！您可获得我们送出的3个月的 PC 端 Xbox Game Pass！</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">领取</string>
     <string name="notice_product_feedback_survey_cta">请告诉我们！</string>
     <string name="notice_scheduled_maintenance">Discord将会在**{start}**至**{start}**时进行例行维护。</string>
     <string name="notice_spotify_auto_paused">在传送音频时，Spotify 会暂停播放。</string>
@@ -5147,6 +5142,7 @@
     <string name="out_of_date_action">更新Discord</string>
     <string name="out_of_date_description">我们给Discord带来了一些改动（有可能是修复了一两个BUG）。更新并继续。</string>
     <string name="out_of_date_title">您的客户端过期了</string>
+    <string name="outbound_promotion_redemption_modal_title">好极了！</string>
     <string name="outgoing_friend_request">送出的好友请求</string>
     <string name="outgoing_friend_request_delete_msg">您确定要删除这条好友请求**!!{name}!!**？</string>
     <string name="outgoing_friend_request_to">向!!{name}!!发送好友请求</string>
@@ -5827,12 +5823,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">需要**查看频道**权限来创建此私密频道。</string>
     <string name="private_voice_channel_creation_permission_missing_hint">需要**查看频道**以及**连接**权限来创建此私密频道。</string>
     <string name="profile">个人资料</string>
+    <string name="profile_banner_icon_tooltip_upsell">使用 Discord Nitro 上传您自己的个性化横幅及更多内容！</string>
     <string name="profile_customization_beta_tooltip">个人资料自定义当前仅部分用户可用。</string>
+    <string name="profile_customization_bio_placeholder">向世界介绍一下你自己</string>
     <string name="profile_customization_marketing_tooltip_body">用“自我介绍”进行自我表达，如果您有 Nitro，还可以使用个人资料横幅！</string>
     <string name="profile_customization_marketing_tooltip_cta">了解</string>
     <string name="profile_customization_marketing_tooltip_header">全新个人资料自定义！</string>
+    <string name="profile_customization_nitro_icon_tooltip">Nitro 独家</string>
     <string name="promotion_card_action_claim">领取</string>
-    <string name="promotion_card_body_claimed_hidden">您已进行了领取，但代码因主播模式被隐藏。</string>
     <string name="promotion_error_body">出了一些问题，导致您无法使用该代码。非常抱歉。</string>
     <string name="promotion_error_title">请稍等……</string>
     <string name="promotion_existing_subscriber_title">糟糕！</string>
@@ -6750,7 +6748,6 @@
     <string name="start_stage_channel_event_members_title">仅限成员</string>
     <string name="start_stage_channel_event_modal_button">开始讲堂</string>
     <string name="start_stage_channel_event_modal_speaker_hint">讲堂开启时，您将成为发言者。</string>
-    <string name="start_stage_channel_event_modal_subtitle">撰写一个话题，宣布您的讲堂已开讲。</string>
     <string name="start_stage_channel_event_modal_title">您想讲些什么？</string>
     <string name="start_stage_channel_event_modal_topic_label">讲堂话题</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">讨论已经结束：控制饮食比常规饮食好</string>
@@ -7437,6 +7434,7 @@
     <string name="user_setting_notification_not_enabled_prompt">推送通知未开启</string>
     <string name="user_settings">用户设置</string>
     <string name="user_settings_about_me">自我介绍</string>
+    <string name="user_settings_about_me_description">写些关于您自己的东西，什么都行——只要小于 {maxLength} 字符数。如果您愿意，还可以使用 markdown 和链接。</string>
     <string name="user_settings_account_change_email_prompt">您的当前电子邮件是 !!{email}!!。您想将其变更成什么呢？</string>
     <string name="user_settings_account_change_email_prompt_desktop">输入新的电子邮箱地址和现有密码。</string>
     <string name="user_settings_account_change_email_title">编辑电子邮件地址</string>
@@ -7471,6 +7469,8 @@
     <string name="user_settings_appearance_preview_message_5">哦它在这儿 ！</string>
     <string name="user_settings_appearance_zoom_tip">您可以使用{modKey} + /-来更改缩放大小，并用{modKey} + 0重置默认缩放大小。</string>
     <string name="user_settings_available_codes">可用的备用安全码</string>
+    <string name="user_settings_avatar">头像</string>
+    <string name="user_settings_banner_specs">我们建议使用至少 600x240 大小的图片。您可上传 PNG、JPG 或动态 GIF。</string>
     <string name="user_settings_blocked_users">已屏蔽用户</string>
     <string name="user_settings_blocked_users_empty">您尚未屏蔽任何用户</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} 位已屏蔽用户</string>
@@ -7479,12 +7479,14 @@
     <string name="user_settings_close_button">关闭按钮</string>
     <string name="user_settings_confirm_logout">您确定您要退出登录吗？</string>
     <string name="user_settings_customization_upsell">用 Nitro 解锁</string>
+    <string name="user_settings_customize_profile_title">自定义我的个人资料</string>
     <string name="user_settings_delete_avatar">删除头像</string>
     <string name="user_settings_disable_advanced_voice_activity">如果自动输入灵敏度检测不到您的语音，禁用该项可能会有所助益。</string>
     <string name="user_settings_disable_noise_suppression">噪音抑制功能开启时，降噪功能将无法启用。</string>
     <string name="user_settings_edit_account">编辑账户</string>
     <string name="user_settings_edit_account_password_label">请输入您的密码以确认更改</string>
     <string name="user_settings_edit_account_tag">标签</string>
+    <string name="user_settings_edit_profile">编辑个人资料</string>
     <string name="user_settings_enter_password_view_codes">请输入您的密码以查看备用安全码。</string>
     <string name="user_settings_games_install_location">位置</string>
     <string name="user_settings_games_install_location_add">添加安装位置</string>
@@ -7535,6 +7537,8 @@
     <string name="user_settings_open_on_startup_label">打开 Discord</string>
     <string name="user_settings_privacy_terms">快阅读一下我们的[服务条款]({termsLink})和[隐私权政策]({privacyLink})吧。</string>
     <string name="user_settings_profile_banner">个人资料横幅</string>
+    <string name="user_settings_remove_avatar">移除头像</string>
+    <string name="user_settings_remove_banner">移除横幅</string>
     <string name="user_settings_restart_app_mobile">您的新设置会在重启APP后生效。</string>
     <string name="user_settings_save">保存</string>
     <string name="user_settings_scan_qr_code">扫描二维码</string>
@@ -7549,6 +7553,7 @@
     <string name="user_settings_upload_avatar">上传头像</string>
     <string name="user_settings_upload_banner">上传横幅</string>
     <string name="user_settings_used_backup_codes">已使用的备用安全码</string>
+    <string name="user_settings_user_profile">用户个人资料</string>
     <string name="user_settings_voice_add_multiple">您可以到 [热键设置](onClick) 加入多个热键发言设置。</string>
     <string name="user_settings_voice_codec_description">Discord 只使用本地最好的有机产品 Opus 语音编解码器。</string>
     <string name="user_settings_voice_codec_title">音频编解码器</string>
@@ -7786,25 +7791,6 @@
     <string name="widget">小工具</string>
     <string name="working">运行中……</string>
     <string name="xbox_authorization_title">Xbox 账号认证</string>
-    <string name="xbox_game_pass_card_body_claimed">您已进行了领取。请收下您的代码：!!{code}!!。[详细信息](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">礼品领取期截止至 2021 年 1 月 15 日。[收起信息](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">礼品领取期截止至 2021 年 1 月 15 日。[了解详情](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">该代码也包含在我们刚刚发送给您的电子邮件内。</string>
-    <string name="xbox_game_pass_modal_code_description_failed">出现错误，请稍后重试！</string>
-    <string name="xbox_game_pass_modal_code_header">PC 端 Xbox Game Pass 代码</string>
-    <string name="xbox_game_pass_modal_code_header_failed">哎呀</string>
-    <string name="xbox_game_pass_modal_header_description_success">前往下方的 [Microsoft兑换网站]({redemptionURL}) 兑换代码，获得为期3个月的 PC 端 Xbox Game Pass。</string>
-    <string name="xbox_game_pass_modal_header_success">好极了！</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">鉴于您已有一份助力订阅，我们将会为您送上 Nitro 订阅余额。Nitro 余额可在订阅 **{planName}** 时应用。</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">兑换</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">您获得了Nitro余额！今天就订阅 **{planName}** 来使用您的Nitro余额吧。</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">棒！</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">订阅余额</string>
-    <string name="xbox_game_pass_promotion_banner_description">我们为您准备了一些额外的干货。现在就成为 Nitro 订阅用户，获取为期 3 个月的 PC 端 Xbox Game Pass。现已开放，截止至 2021 年 1 月 15 日。[了解详情](onToggleExpand)。</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">我们为您准备了一些额外的干货。现在就成为 Nitro 订阅用户，获取为期 3 个月的 PC 端 Xbox Game Pass。现已开放，截止至 2021 年 1 月 15 日。[收起信息](onToggleExpand)。</string>
-    <string name="xbox_game_pass_promotion_banner_header">为期3个月的 PC 端 Xbox Game Pass</string>
-    <string name="xbox_game_pass_promotion_card_header">PC 端 Xbox Game Pass（3个月）</string>
-    <string name="xbox_game_pass_promotion_legalese">对当前或此前 PC 端的 Xbox Game Pass 成员，或 Xbox Game Pass Ultimate 成员无效。请于 2021 年 2 月 15 日前，在 [microsoft.com/redeem](https://microsoft.com/redeem)页面兑换您的 Xbox Game Pass 代码。兑换时，需要提供信用卡。除非您取消，否则在促销期结束后，您每月将被按照当时公认常规会员费收取费用。不支持 S 模式的 Windows 10 以及 ARM 设备。游戏目录会随时间而发生变化。请查阅[xbox.com/gamepass](https://xbox.com/gamepass)。限制：每人每账户 1 件。</string>
     <string name="xbox_link">链接</string>
     <string name="xbox_pin_step1">在手机上打开 Discord APP</string>
     <string name="xbox_pin_step2">前往设置 &gt; 连接 &gt; 添加</string>
diff --git a/app/src/main/res/values-zh-rTW/plurals.xml b/app/src/main/res/values-zh-rTW/plurals.xml
index 6a94ab9ac9..6835c530af 100644
--- a/app/src/main/res/values-zh-rTW/plurals.xml
+++ b/app/src/main/res/values-zh-rTW/plurals.xml
@@ -568,14 +568,6 @@
         <item quantity="one">1 週</item>
         <item quantity="other">{minimumGuildAge} 週</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">名稱</item>
-        <item quantity="other">名稱</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">名稱</item>
-        <item quantity="other">名稱</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">申請等待中</item>
         <item quantity="other">{count}申請等待中</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 959ef525a7..faf37b9abf 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1424,7 +1424,6 @@
     <string name="contact_sync_we_found_your_friends_body">您跟他們現在是 Discord 上的好友了。跟他們聊天、邀請他們到您的伺服器，好好享受吧！新朋友加入 Discord 時我們會通知您。</string>
     <string name="contact_sync_we_found_your_friends_title">我們找到您的好友了！</string>
     <string name="content_matching">!!{command}!! 內容符合 **!!{query}!!**</string>
-    <string name="context_menu_hint">對使用者按下右鍵進行更多動作</string>
     <string name="continue_in_browser">在瀏覽器中繼續</string>
     <string name="continue_to_webapp">繼續使用 Discord</string>
     <string name="control_volume">控制音量</string>
@@ -3233,8 +3232,6 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">要加入探索的伺服器，其存在時間須達 {minimumGuildAge} 以上。請於 {passDate} 再回來確認。</string>
     <string name="guild_settings_discovery_checklist_age_failing">伺服器存在時間過短</string>
     <string name="guild_settings_discovery_checklist_bad_standing">你的伺服器**$[未](doesNotHook)**符合加入探索伺服器的所有要求。</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">請更改你的類別{numCategories}：$[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">請更改你的頻道{numChannels}：$[{channelNames}](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">請更改你的$[簡介](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">請更改你的$[伺服器名稱](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">提升每週聊天者的數量</string>
@@ -4961,8 +4958,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">您還剩 {days}可取得免費的 Nitro 一個月試用期</string>
     <string name="notice_premium_tier_2_trial_ending_hours">您還剩 {hours}可取得免費的 Nitro 一個月試用期</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">您還剩 {minutes}可取得免費的 Nitro 一個月試用期</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Nitro 訂閱者，恭喜！您已獲得我們贈送的 3 個月 Xbox Game Pass！</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">領取</string>
     <string name="notice_product_feedback_survey">您想要參與我們的產品意見回饋討論嗎？</string>
     <string name="notice_product_feedback_survey_cta">請立即告知我們！</string>
     <string name="notice_register_to_vote">您要登記投票嗎？花兩分鐘查看您的狀態並登記。</string>
@@ -5149,6 +5144,7 @@
     <string name="out_of_date_action">更新 Discord</string>
     <string name="out_of_date_description">我們為 Discord 增添了一些酷炫功能（可能也順便修正了一兩個臭蟲）。需要先更新才能繼續使用。</string>
     <string name="out_of_date_title">您該更新了</string>
+    <string name="outbound_promotion_redemption_modal_title">太好了！</string>
     <string name="outgoing_friend_request">送出中的好友請求</string>
     <string name="outgoing_friend_request_delete_msg">您確定您要刪除您對 **!!{name}!!** 的好友請求？</string>
     <string name="outgoing_friend_request_to">向 !!{name}!! 送出中的好友請求</string>
@@ -5397,7 +5393,7 @@
     <string name="premium_features_message_length_heading">更長的訊息</string>
     <string name="premium_features_message_length_subheading">用更長的篇幅表達您的想法。</string>
     <string name="premium_features_profile_customization_header">設計您的個人資料</string>
-    <string name="premium_features_profile_customization_subheader">使用動態頭像、個人資料橫幅和訂製標籤表現你自己。</string>
+    <string name="premium_features_profile_customization_subheader">使用動態頭像、個人資料橫幅和自訂標籤展現自我。</string>
     <string name="premium_game">Discord Nitro 遊戲</string>
     <string name="premium_gift_button_label">發送禮物</string>
     <string name="premium_gift_button_tooltip">幫好友升級！把超棒的聊天福利和 Nitro 送給他們吧。</string>
@@ -5647,8 +5643,8 @@
     <string name="premium_plan_year_tier_1">Nitro Classic 年度訂閱方案</string>
     <string name="premium_plan_year_tier_2">Nitro 年度訂閱方案</string>
     <string name="premium_plan_year_tier_2_trial">Nitro 年度訂閱方案 **(+{months} {months}免費試用)**</string>
-    <string name="premium_profile_customization_upsell_body">使用個人資料橫幅、動態頭像、訂製標籤進行更多訂製，[更多內容盡在 Discord Nitro！](onLearnMore)</string>
-    <string name="premium_profile_customization_upsell_header">解鎖個人資料訂製</string>
+    <string name="premium_profile_customization_upsell_body">透過個人資料橫幅、動態頭像、自訂標籤進行更多自訂，[更多內容盡在 Discord Nitro！](onLearnMore)</string>
+    <string name="premium_profile_customization_upsell_header">解鎖個人資料自訂</string>
     <string name="premium_promo_description">升級成 Discord Nitro，就可在任何地方使用動態表情符號與自訂的表情符號。</string>
     <string name="premium_promo_description_search_upsell">升級為 **Discord Nitro**，就可在任何地方使用動態表情符號與自訂的表情符號。[了解更多](onClick)</string>
     <string name="premium_promo_description_trial">領取 Discord Nitro 一個月免費試用，就可在任何地方使用動態與自訂表情符號。</string>
@@ -5827,12 +5823,14 @@
     <string name="private_text_channel_creation_permission_missing_hint">**檢視頻道** 需要權限來建立此私人頻道。</string>
     <string name="private_voice_channel_creation_permission_missing_hint">**檢視頻道** 並 **連接** 需要權限來建立此私人頻道。</string>
     <string name="profile">個人資料</string>
-    <string name="profile_customization_beta_tooltip">個人資料訂製目前僅對有限數量的人開放。</string>
+    <string name="profile_banner_icon_tooltip_upsell">透過 Discord Nitro 上傳屬於您自己的個性化橫幅，還能體驗其他更多功能！</string>
+    <string name="profile_customization_beta_tooltip">個人資料自訂目前僅對少數人開放。</string>
+    <string name="profile_customization_bio_placeholder">向大家稍微介紹一下您自己</string>
     <string name="profile_customization_marketing_tooltip_body">在「關於我」中表現你自己，或者如果您有 Nitro，則使用個人資料橫幅！</string>
     <string name="profile_customization_marketing_tooltip_cta">知道了</string>
-    <string name="profile_customization_marketing_tooltip_header">新的個人資料訂製！</string>
+    <string name="profile_customization_marketing_tooltip_header">新的個人資料自訂！</string>
+    <string name="profile_customization_nitro_icon_tooltip">Nitro 限定</string>
     <string name="promotion_card_action_claim">領取</string>
-    <string name="promotion_card_body_claimed_hidden">您已領取成功，但因目前為直播模式，代碼將會隱藏。</string>
     <string name="promotion_error_body">好像出了點問題，您無法使用該代碼。很抱歉。</string>
     <string name="promotion_error_title">請稍等……</string>
     <string name="promotion_existing_subscriber_title">噢噢！</string>
@@ -6750,7 +6748,6 @@
     <string name="start_stage_channel_event_members_title">僅限成員</string>
     <string name="start_stage_channel_event_modal_button">開啟舞台</string>
     <string name="start_stage_channel_event_modal_speaker_hint">舞台開放後，您將會成為發言者。</string>
-    <string name="start_stage_channel_event_modal_subtitle">輸入一段主題，讓大家知道您的舞台現正開放中。</string>
     <string name="start_stage_channel_event_modal_title">您想聊些什麼？</string>
     <string name="start_stage_channel_event_modal_topic_label">舞台主題</string>
     <string name="start_stage_channel_event_modal_topic_placeholder">理性勿戰：零卡可樂比一般可樂好喝啦</string>
@@ -7440,6 +7437,7 @@
     <string name="user_setting_notification_not_enabled_prompt">推播通知未啟用</string>
     <string name="user_settings">使用者設定</string>
     <string name="user_settings_about_me">關於我</string>
+    <string name="user_settings_about_me_description">隨意寫點關於您自己的介紹，不要超過 {maxLength} 個字元。想要的話，也可以使用 markdown 語法和連結。</string>
     <string name="user_settings_account_change_email_prompt">您目前的電子郵件地址為 !!{email}!!，您希望如何更改？</string>
     <string name="user_settings_account_change_email_prompt_desktop">請輸入新的電子郵件地址和您現有的密碼。</string>
     <string name="user_settings_account_change_email_title">編輯電子郵件</string>
@@ -7474,6 +7472,8 @@
     <string name="user_settings_appearance_preview_message_5">哦它在這兒！</string>
     <string name="user_settings_appearance_zoom_tip">您可以用 {modKey} +/- 來更改縮放等級和用 {modKey}+0 來重置為預設縮放等級。</string>
     <string name="user_settings_available_codes">可用的備份安全碼</string>
+    <string name="user_settings_avatar">頭像</string>
+    <string name="user_settings_banner_specs">我們建議使用最小 600x240 的圖片。您可以上傳 PNG、JPG，或動態 GIF 檔。</string>
     <string name="user_settings_blocked_users">已封鎖的使用者</string>
     <string name="user_settings_blocked_users_empty">您沒有任何已封鎖的使用者</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} 位已封鎖的使用者</string>
@@ -7482,11 +7482,13 @@
     <string name="user_settings_close_button">關閉按鈕</string>
     <string name="user_settings_confirm_logout">您確定您要登出嗎？</string>
     <string name="user_settings_customization_upsell">解鎖 Nitro</string>
+    <string name="user_settings_customize_profile_title">自訂我的個人資料</string>
     <string name="user_settings_delete_avatar">刪除頭像</string>
     <string name="user_settings_disable_advanced_voice_activity">若自動輸入靈敏度無法偵測到您的聲音，將此功能關閉或許可以改善。</string>
     <string name="user_settings_disable_noise_suppression">啟用雜訊抑制功能時，噪音消除功能將會停用。</string>
     <string name="user_settings_edit_account">編輯帳號</string>
     <string name="user_settings_edit_account_password_label">輸入你的密碼來確認更改</string>
+    <string name="user_settings_edit_profile">編輯個人資料</string>
     <string name="user_settings_enter_password_view_codes">輸入你的密碼來檢視備份安全碼。</string>
     <string name="user_settings_games_install_location">位置</string>
     <string name="user_settings_games_install_location_add">新增安裝位置</string>
@@ -7537,6 +7539,8 @@
     <string name="user_settings_open_on_startup_label">開啟 Discord</string>
     <string name="user_settings_privacy_terms">查看我們的 [服務條款]({termsLink}) 與 [隱私權政策]({privacyLink})。</string>
     <string name="user_settings_profile_banner">個人資料橫幅</string>
+    <string name="user_settings_remove_avatar">移除頭像</string>
+    <string name="user_settings_remove_banner">移除橫幅</string>
     <string name="user_settings_restart_app_mobile">重新啟動程式來套用你的新設定。</string>
     <string name="user_settings_save">儲存</string>
     <string name="user_settings_scan_qr_code">掃描 QR Code</string>
@@ -7551,6 +7555,7 @@
     <string name="user_settings_upload_avatar">上傳頭像</string>
     <string name="user_settings_upload_banner">上傳橫幅</string>
     <string name="user_settings_used_backup_codes">已使用的備份安全碼</string>
+    <string name="user_settings_user_profile">使用者個人資料</string>
     <string name="user_settings_voice_add_multiple">您可以到 [快速鍵設定](onClick) 加入多個按鍵發話配置。</string>
     <string name="user_settings_voice_codec_description">Discord 僅使用最好的有機本地產品 Opus 語音編解碼器。</string>
     <string name="user_settings_voice_codec_title">音訊編解碼器</string>
@@ -7788,25 +7793,6 @@
     <string name="widget">小工具</string>
     <string name="working">正在啟用…</string>
     <string name="xbox_authorization_title">Xbox 帳號授權</string>
-    <string name="xbox_game_pass_card_body_claimed">您已領取成功，這是您的代碼 !!{code}!!。[更多詳細資訊](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">禮物領取期限為 2021 年 1 月 15 日。[簡短詳細資訊](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">禮物領取期限為 2021 年 1 月 15 日。[更多詳細資訊](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">此代碼也附在我們剛剛發送的確認電子郵件中。</string>
-    <string name="xbox_game_pass_modal_code_description_failed">出現錯誤，請稍後再試！</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass for PC 代碼</string>
-    <string name="xbox_game_pass_modal_code_header_failed">糟糕</string>
-    <string name="xbox_game_pass_modal_header_description_success">請到下方的 [Microsoft 兌換網站]({redemptionURL}) 兌換代碼，換取效期 3 個月的 Xbox Game Pass for PC。</string>
-    <string name="xbox_game_pass_modal_header_success">太好了！</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">因為您訂閱了加成，所以我們將贈送您 Nitro 訂閱點數。Nitro 點數會在您訂閱 **{planName}** 時自動套用。</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">換取</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">您已獲得 Nitro 點數！今天訂閱 **{planName}** 即可使用 Nitro 點數。</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">很好！</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">訂閱點數</string>
-    <string name="xbox_game_pass_promotion_banner_description">我們現在提供您更多好康。從現在起到 2021 年 1 月 15 日，訂閱 Nitro 就能獲得 3 個月 Xbox Game Pass for PC。[更多詳細資訊](onToggleExpand)。</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">我們現在提供您更多好康。從現在起到 2021 年 1 月 15 日，訂閱 Nitro 就能獲得 3 個月 Xbox Game Pass for PC。[簡短詳細資訊](onToggleExpand)。</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 個月 Xbox Game Pass for PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass for PC (效期 3 個月)</string>
-    <string name="xbox_game_pass_promotion_legalese">不適用於 Xbox Game Pass for PC 的目前或過期會員，也不適用於 Xbox Game Pass Ultimate 的現有會員。請於 2021 年 2 月 15 日前至 [microsoft.com/redeem](https://microsoft.com/redeem) 兌換您的 Xbox Game Pass 代碼。需要使用信用卡。除非您取消訂閱，否則在促銷期間結束後，我們會以屆時的一般會員價格每月向您收費。不支援 Windows 10 的 S 模式和 ARM 裝置。遊戲目錄會隨時更新。請於 [xbox.com/gamepass](https://xbox.com/gamepass) 查看。限制：1 人/帳號。</string>
     <string name="xbox_link">連結</string>
     <string name="xbox_pin_step1">在您的手機上開啟 Discord 應用程式</string>
     <string name="xbox_pin_step2">前往「設定」&gt;「連結」&gt;「新增」</string>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 8eef30dbf5..f6be951ff8 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -9,6 +9,7 @@
     <integer name="bottom_sheet_slide_duration">150</integer>
     <integer name="cancel_button_image_alpha">127</integer>
     <integer name="config_tooltipAnimTime">150</integer>
+    <integer name="custom_profiles_bio_max_length">190</integer>
     <integer name="design_snackbar_text_max_lines">2</integer>
     <integer name="design_tab_indicator_anim_duration_ms">300</integer>
     <integer name="exo_media_button_opacity_percentage_disabled">33</integer>
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
index ee1b3e0700..8d6d103689 100644
--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@@ -596,14 +596,6 @@
         <item quantity="one">1 week</item>
         <item quantity="other">{minimumGuildAge} weeks</item>
     </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_categories_numCategories">
-        <item quantity="one">name</item>
-        <item quantity="other">names</item>
-    </plurals>
-    <plurals name="guild_settings_discovery_checklist_change_channel_names_numChannels">
-        <item quantity="one">name</item>
-        <item quantity="other">names</item>
-    </plurals>
     <plurals name="guild_settings_member_verification_review_pending_applications_count">
         <item quantity="one">Pending Application</item>
         <item quantity="other">{count} Pending Applications</item>
@@ -708,6 +700,10 @@
         <item quantity="one">{#} mention,</item>
         <item quantity="other">{#} mentions,</item>
     </plurals>
+    <plurals name="hub_email_connection_invite_header_count">
+        <item quantity="one">{count} other member</item>
+        <item quantity="other">{count} other members</item>
+    </plurals>
     <plurals name="humanize_duration_days_time">
         <item quantity="one">1 day</item>
         <item quantity="other">{#} days</item>
diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml
index 85e3a919b3..aa48b5f9bd 100644
--- a/app/src/main/res/values/public.xml
+++ b/app/src/main/res/values/public.xml
@@ -3334,1621 +3334,1631 @@
     <public type="drawable" name="res_2131230731_bg_premium_subscription_header__0" id="0x7F08000B" />
     <public type="drawable" name="res_2131230732_bg_premium_subscription_header_error__0" id="0x7F08000C" />
     <public type="drawable" name="res_2131230733_bg_premium_subscription_header_resub__0" id="0x7F08000D" />
-    <public type="drawable" name="res_2131230734_discovery_empty_state__0" id="0x7F08000E" />
-    <public type="drawable" name="res_2131230735_drawable_guild_template_create__0" id="0x7F08000F" />
-    <public type="drawable" name="res_2131230736_drawable_guild_template_study__0" id="0x7F080010" />
-    <public type="drawable" name="res_2131230737_drawable_ic_nitro__0" id="0x7F080011" />
-    <public type="drawable" name="res_2131230738_drawable_ic_nitro_classic__0" id="0x7F080012" />
-    <public type="drawable" name="res_2131230739_ic_boosted_guild_tier_1__0" id="0x7F080013" />
-    <public type="drawable" name="res_2131230740_ic_boosted_guild_tier_2__0" id="0x7F080014" />
-    <public type="drawable" name="res_2131230741_ic_boosted_guild_tier_3__0" id="0x7F080015" />
-    <public type="drawable" name="res_2131230742_ic_network_connecting_animated_vector__0" id="0x7F080016" />
-    <public type="drawable" name="res_2131230743_ic_network_connecting_animated_vector__1" id="0x7F080017" />
-    <public type="drawable" name="res_2131230744_ic_network_connecting_animated_vector__2" id="0x7F080018" />
-    <public type="drawable" name="res_2131230745_ic_network_connecting_animated_vector__3" id="0x7F080019" />
-    <public type="drawable" name="res_2131230746_ic_network_connecting_animated_vector__4" id="0x7F08001A" />
-    <public type="drawable" name="res_2131230747_ic_network_connecting_animated_vector_light__0" id="0x7F08001B" />
-    <public type="drawable" name="res_2131230748_ic_network_connecting_animated_vector_light__1" id="0x7F08001C" />
-    <public type="drawable" name="res_2131230749_ic_network_connecting_animated_vector_light__2" id="0x7F08001D" />
-    <public type="drawable" name="res_2131230750_ic_network_connecting_animated_vector_light__3" id="0x7F08001E" />
-    <public type="drawable" name="res_2131230751_ic_network_connecting_animated_vector_light__4" id="0x7F08001F" />
-    <public type="drawable" name="res_2131230752_ic_nitro_badge_nitro_gradient_16dp__0" id="0x7F080020" />
-    <public type="drawable" name="res_2131230753_ic_nitro_badge_nitro_gradient_16dp__1" id="0x7F080021" />
-    <public type="drawable" name="res_2131230754_img_age_gate_failure__0" id="0x7F080022" />
-    <public type="drawable" name="res_2131230755_img_age_gate_failure__1" id="0x7F080023" />
-    <public type="drawable" name="res_2131230756_img_age_gate_failure__2" id="0x7F080024" />
-    <public type="drawable" name="res_2131230757_img_age_gate_failure__3" id="0x7F080025" />
-    <public type="drawable" name="res_2131230758_img_age_gate_failure__4" id="0x7F080026" />
-    <public type="drawable" name="res_2131230759_img_age_gate_failure__5" id="0x7F080027" />
-    <public type="drawable" name="res_2131230760_img_age_gate_safety__0" id="0x7F080028" />
-    <public type="drawable" name="res_2131230761_img_age_gate_safety__1" id="0x7F080029" />
-    <public type="drawable" name="res_2131230762_img_boost_activated_dark__0" id="0x7F08002A" />
-    <public type="drawable" name="res_2131230763_img_boost_activated_light__0" id="0x7F08002B" />
-    <public type="drawable" name="res_2131230764_img_krisp_onboarding__0" id="0x7F08002C" />
-    <public type="drawable" name="res_2131230765_img_krisp_onboarding__1" id="0x7F08002D" />
-    <public type="drawable" name="res_2131230766_img_nitro_pattern__0" id="0x7F08002E" />
-    <public type="drawable" name="res_2131230767_img_nitro_pattern__1" id="0x7F08002F" />
-    <public type="drawable" name="res_2131230768_img_nitro_pattern__2" id="0x7F080030" />
-    <public type="drawable" name="res_2131230769_img_nitro_pattern__3" id="0x7F080031" />
-    <public type="drawable" name="res_2131230770_img_nitro_pattern__4" id="0x7F080032" />
-    <public type="drawable" name="res_2131230771_img_plan_activated_dark__0" id="0x7F080033" />
-    <public type="drawable" name="res_2131230772_img_plan_activated_light__0" id="0x7F080034" />
-    <public type="drawable" name="res_2131230773_img_premium_activated_tier_1_dark__0" id="0x7F080035" />
-    <public type="drawable" name="res_2131230774_img_premium_activated_tier_1_light__0" id="0x7F080036" />
-    <public type="drawable" name="res_2131230775_img_premium_activated_tier_2_dark__0" id="0x7F080037" />
-    <public type="drawable" name="res_2131230776_img_premium_activated_tier_2_light__0" id="0x7F080038" />
-    <public type="drawable" name="res_2131230777_img_remote_auth_loaded__0" id="0x7F080039" />
-    <public type="drawable" name="res_2131230778_img_wumpus_playing_with_friends__0" id="0x7F08003A" />
-    <public type="drawable" name="res_2131230779_screen_share_nfx_illustration__0" id="0x7F08003B" />
-    <public type="drawable" name="res_2131230780_screen_share_nfx_illustration__1" id="0x7F08003C" />
-    <public type="drawable" name="res_2131230781_screen_share_nfx_illustration__2" id="0x7F08003D" />
-    <public type="drawable" name="res_2131230782_sparkle_animated_vector__0" id="0x7F08003E" />
-    <public type="drawable" name="res_2131230783_sparkle_animated_vector__1" id="0x7F08003F" />
-    <public type="drawable" name="res_2131230784_sparkle_animated_vector__2" id="0x7F080040" />
-    <public type="drawable" name="res_2131230785_sparkle_yellow_animated_vector__0" id="0x7F080041" />
-    <public type="drawable" name="res_2131230786_sparkle_yellow_animated_vector__1" id="0x7F080042" />
-    <public type="drawable" name="res_2131230787_sparkle_yellow_animated_vector__2" id="0x7F080043" />
-    <public type="drawable" name="res_2131230788_video_call_illustration__0" id="0x7F080044" />
-    <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7F080045" />
-    <public type="drawable" name="abc_action_bar_item_background_material" id="0x7F080046" />
-    <public type="drawable" name="abc_btn_borderless_material" id="0x7F080047" />
-    <public type="drawable" name="abc_btn_check_material" id="0x7F080048" />
-    <public type="drawable" name="abc_btn_check_material_anim" id="0x7F080049" />
-    <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7F08004A" />
-    <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7F08004B" />
-    <public type="drawable" name="abc_btn_colored_material" id="0x7F08004C" />
-    <public type="drawable" name="abc_btn_default_mtrl_shape" id="0x7F08004D" />
-    <public type="drawable" name="abc_btn_radio_material" id="0x7F08004E" />
-    <public type="drawable" name="abc_btn_radio_material_anim" id="0x7F08004F" />
-    <public type="drawable" name="abc_btn_radio_to_on_mtrl_000" id="0x7F080050" />
-    <public type="drawable" name="abc_btn_radio_to_on_mtrl_015" id="0x7F080051" />
-    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00001" id="0x7F080052" />
-    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00012" id="0x7F080053" />
-    <public type="drawable" name="abc_cab_background_internal_bg" id="0x7F080054" />
-    <public type="drawable" name="abc_cab_background_top_material" id="0x7F080055" />
-    <public type="drawable" name="abc_cab_background_top_mtrl_alpha" id="0x7F080056" />
-    <public type="drawable" name="abc_control_background_material" id="0x7F080057" />
-    <public type="drawable" name="abc_dialog_material_background" id="0x7F080058" />
-    <public type="drawable" name="abc_edit_text_material" id="0x7F080059" />
-    <public type="drawable" name="abc_ic_ab_back_material" id="0x7F08005A" />
-    <public type="drawable" name="abc_ic_arrow_drop_right_black_24dp" id="0x7F08005B" />
-    <public type="drawable" name="abc_ic_clear_material" id="0x7F08005C" />
-    <public type="drawable" name="abc_ic_commit_search_api_mtrl_alpha" id="0x7F08005D" />
-    <public type="drawable" name="abc_ic_go_search_api_material" id="0x7F08005E" />
-    <public type="drawable" name="abc_ic_menu_copy_mtrl_am_alpha" id="0x7F08005F" />
-    <public type="drawable" name="abc_ic_menu_cut_mtrl_alpha" id="0x7F080060" />
-    <public type="drawable" name="abc_ic_menu_overflow_material" id="0x7F080061" />
-    <public type="drawable" name="abc_ic_menu_paste_mtrl_am_alpha" id="0x7F080062" />
-    <public type="drawable" name="abc_ic_menu_selectall_mtrl_alpha" id="0x7F080063" />
-    <public type="drawable" name="abc_ic_menu_share_mtrl_alpha" id="0x7F080064" />
-    <public type="drawable" name="abc_ic_search_api_material" id="0x7F080065" />
-    <public type="drawable" name="abc_ic_star_black_16dp" id="0x7F080066" />
-    <public type="drawable" name="abc_ic_star_black_36dp" id="0x7F080067" />
-    <public type="drawable" name="abc_ic_star_black_48dp" id="0x7F080068" />
-    <public type="drawable" name="abc_ic_star_half_black_16dp" id="0x7F080069" />
-    <public type="drawable" name="abc_ic_star_half_black_36dp" id="0x7F08006A" />
-    <public type="drawable" name="abc_ic_star_half_black_48dp" id="0x7F08006B" />
-    <public type="drawable" name="abc_ic_voice_search_api_material" id="0x7F08006C" />
-    <public type="drawable" name="abc_item_background_holo_dark" id="0x7F08006D" />
-    <public type="drawable" name="abc_item_background_holo_light" id="0x7F08006E" />
-    <public type="drawable" name="abc_list_divider_material" id="0x7F08006F" />
-    <public type="drawable" name="abc_list_divider_mtrl_alpha" id="0x7F080070" />
-    <public type="drawable" name="abc_list_focused_holo" id="0x7F080071" />
-    <public type="drawable" name="abc_list_longpressed_holo" id="0x7F080072" />
-    <public type="drawable" name="abc_list_pressed_holo_dark" id="0x7F080073" />
-    <public type="drawable" name="abc_list_pressed_holo_light" id="0x7F080074" />
-    <public type="drawable" name="abc_list_selector_background_transition_holo_dark" id="0x7F080075" />
-    <public type="drawable" name="abc_list_selector_background_transition_holo_light" id="0x7F080076" />
-    <public type="drawable" name="abc_list_selector_disabled_holo_dark" id="0x7F080077" />
-    <public type="drawable" name="abc_list_selector_disabled_holo_light" id="0x7F080078" />
-    <public type="drawable" name="abc_list_selector_holo_dark" id="0x7F080079" />
-    <public type="drawable" name="abc_list_selector_holo_light" id="0x7F08007A" />
-    <public type="drawable" name="abc_menu_hardkey_panel_mtrl_mult" id="0x7F08007B" />
-    <public type="drawable" name="abc_popup_background_mtrl_mult" id="0x7F08007C" />
-    <public type="drawable" name="abc_ratingbar_indicator_material" id="0x7F08007D" />
-    <public type="drawable" name="abc_ratingbar_material" id="0x7F08007E" />
-    <public type="drawable" name="abc_ratingbar_small_material" id="0x7F08007F" />
-    <public type="drawable" name="abc_scrubber_control_off_mtrl_alpha" id="0x7F080080" />
-    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_000" id="0x7F080081" />
-    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_005" id="0x7F080082" />
-    <public type="drawable" name="abc_scrubber_primary_mtrl_alpha" id="0x7F080083" />
-    <public type="drawable" name="abc_scrubber_track_mtrl_alpha" id="0x7F080084" />
-    <public type="drawable" name="abc_seekbar_thumb_material" id="0x7F080085" />
-    <public type="drawable" name="abc_seekbar_tick_mark_material" id="0x7F080086" />
-    <public type="drawable" name="abc_seekbar_track_material" id="0x7F080087" />
-    <public type="drawable" name="abc_spinner_mtrl_am_alpha" id="0x7F080088" />
-    <public type="drawable" name="abc_spinner_textfield_background_material" id="0x7F080089" />
-    <public type="drawable" name="abc_switch_thumb_material" id="0x7F08008A" />
-    <public type="drawable" name="abc_switch_track_mtrl_alpha" id="0x7F08008B" />
-    <public type="drawable" name="abc_tab_indicator_material" id="0x7F08008C" />
-    <public type="drawable" name="abc_tab_indicator_mtrl_alpha" id="0x7F08008D" />
-    <public type="drawable" name="abc_text_cursor_material" id="0x7F08008E" />
-    <public type="drawable" name="abc_text_select_handle_left_mtrl_dark" id="0x7F08008F" />
-    <public type="drawable" name="abc_text_select_handle_left_mtrl_light" id="0x7F080090" />
-    <public type="drawable" name="abc_text_select_handle_middle_mtrl_dark" id="0x7F080091" />
-    <public type="drawable" name="abc_text_select_handle_middle_mtrl_light" id="0x7F080092" />
-    <public type="drawable" name="abc_text_select_handle_right_mtrl_dark" id="0x7F080093" />
-    <public type="drawable" name="abc_text_select_handle_right_mtrl_light" id="0x7F080094" />
-    <public type="drawable" name="abc_textfield_activated_mtrl_alpha" id="0x7F080095" />
-    <public type="drawable" name="abc_textfield_default_mtrl_alpha" id="0x7F080096" />
-    <public type="drawable" name="abc_textfield_search_activated_mtrl_alpha" id="0x7F080097" />
-    <public type="drawable" name="abc_textfield_search_default_mtrl_alpha" id="0x7F080098" />
-    <public type="drawable" name="abc_textfield_search_material" id="0x7F080099" />
-    <public type="drawable" name="abc_vector_test" id="0x7F08009A" />
-    <public type="drawable" name="alerter_alert_button_background" id="0x7F08009B" />
-    <public type="drawable" name="alerter_ic_face" id="0x7F08009C" />
-    <public type="drawable" name="alerter_ic_notifications" id="0x7F08009D" />
-    <public type="drawable" name="app_toast_frame" id="0x7F08009E" />
-    <public type="drawable" name="asset_account_sync_twitch" id="0x7F08009F" />
-    <public type="drawable" name="asset_account_sync_youtube" id="0x7F0800A0" />
-    <public type="drawable" name="asset_broken_results_dark" id="0x7F0800A1" />
-    <public type="drawable" name="asset_broken_results_light" id="0x7F0800A2" />
-    <public type="drawable" name="asset_default_avatar_32dp" id="0x7F0800A3" />
-    <public type="drawable" name="asset_default_avatar_64dp" id="0x7F0800A4" />
-    <public type="drawable" name="asset_default_avatar_80dp" id="0x7F0800A5" />
-    <public type="drawable" name="asset_default_avatar_new_32dp" id="0x7F0800A6" />
-    <public type="drawable" name="asset_default_avatar_new_64dp" id="0x7F0800A7" />
-    <public type="drawable" name="asset_default_avatar_new_80dp" id="0x7F0800A8" />
-    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7F0800A9" />
-    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7F0800AA" />
-    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7F0800AB" />
-    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7F0800AC" />
-    <public type="drawable" name="asset_empty_no_bans" id="0x7F0800AD" />
-    <public type="drawable" name="asset_empty_no_invites" id="0x7F0800AE" />
-    <public type="drawable" name="asset_group_full" id="0x7F0800AF" />
-    <public type="drawable" name="asset_mfa_server" id="0x7F0800B0" />
-    <public type="drawable" name="asset_no_results_alt_dark" id="0x7F0800B1" />
-    <public type="drawable" name="asset_no_results_alt_light" id="0x7F0800B2" />
-    <public type="drawable" name="asset_no_results_dark" id="0x7F0800B3" />
-    <public type="drawable" name="asset_no_results_light" id="0x7F0800B4" />
-    <public type="drawable" name="asset_nux_navigation_channels" id="0x7F0800B5" />
-    <public type="drawable" name="asset_nux_navigation_dms" id="0x7F0800B6" />
-    <public type="drawable" name="asset_nux_navigation_guilds" id="0x7F0800B7" />
-    <public type="drawable" name="asset_sadbot" id="0x7F0800B8" />
-    <public type="drawable" name="asset_security" id="0x7F0800B9" />
-    <public type="drawable" name="asset_tooltip_server_create" id="0x7F0800BA" />
-    <public type="drawable" name="avd_hide_password" id="0x7F0800BB" />
-    <public type="drawable" name="avd_show_password" id="0x7F0800BC" />
-    <public type="drawable" name="bg_announcements_follow_sheet_dark" id="0x7F0800BD" />
-    <public type="drawable" name="bg_announcements_follow_sheet_light" id="0x7F0800BE" />
-    <public type="drawable" name="bg_bot_ui_component_select" id="0x7F0800BF" />
-    <public type="drawable" name="bg_bot_ui_component_select_pill" id="0x7F0800C0" />
-    <public type="drawable" name="bg_changelog_special_header" id="0x7F0800C1" />
-    <public type="drawable" name="bg_chat_sticker_greet_button" id="0x7F0800C2" />
-    <public type="drawable" name="bg_chat_sticker_greet_button_default" id="0x7F0800C3" />
-    <public type="drawable" name="bg_chat_sticker_greet_button_pressed" id="0x7F0800C4" />
-    <public type="drawable" name="bg_cloud_pattern_dark" id="0x7F0800C5" />
-    <public type="drawable" name="bg_cloud_pattern_light" id="0x7F0800C6" />
-    <public type="drawable" name="bg_payment_method_spinner_closed" id="0x7F0800C7" />
-    <public type="drawable" name="bg_payment_method_spinner_closed_light" id="0x7F0800C8" />
-    <public type="drawable" name="bg_payment_method_spinner_dropdown" id="0x7F0800C9" />
-    <public type="drawable" name="bg_payment_method_spinner_dropdown_light" id="0x7F0800CA" />
-    <public type="drawable" name="bg_premium_bundle_header" id="0x7F0800CB" />
-    <public type="drawable" name="bg_premium_classic_subscription_header" id="0x7F0800CC" />
-    <public type="drawable" name="bg_premium_guild_subscription_header" id="0x7F0800CD" />
-    <public type="drawable" name="bg_premium_guild_subscription_header_error" id="0x7F0800CE" />
-    <public type="drawable" name="bg_premium_guild_subscription_header_resub" id="0x7F0800CF" />
-    <public type="drawable" name="bg_premium_subscription_header" id="0x7F0800D0" />
-    <public type="drawable" name="bg_premium_subscription_header_error" id="0x7F0800D1" />
-    <public type="drawable" name="bg_premium_subscription_header_resub" id="0x7F0800D2" />
-    <public type="drawable" name="bg_pressed_highlight" id="0x7F0800D3" />
-    <public type="drawable" name="bg_pressed_highlight_brighten" id="0x7F0800D4" />
-    <public type="drawable" name="bg_pressed_highlight_darken" id="0x7F0800D5" />
-    <public type="drawable" name="bg_stage_channel_speaking_chip" id="0x7F0800D6" />
-    <public type="drawable" name="bg_start_stage_cutout" id="0x7F0800D7" />
-    <public type="drawable" name="bg_start_stage_event_button" id="0x7F0800D8" />
-    <public type="drawable" name="bg_stream_label" id="0x7F0800D9" />
-    <public type="drawable" name="bg_stream_live_indicator" id="0x7F0800DA" />
-    <public type="drawable" name="bg_stream_live_indicator_split_pill" id="0x7F0800DB" />
-    <public type="drawable" name="bg_stream_preview" id="0x7F0800DC" />
-    <public type="drawable" name="bg_stream_preview_overlay_caption" id="0x7F0800DD" />
-    <public type="drawable" name="bg_stream_preview_overlay_caption_opaque" id="0x7F0800DE" />
-    <public type="drawable" name="bg_stream_resolution_indicator_split_pill" id="0x7F0800DF" />
-    <public type="drawable" name="bg_subscription_placeholder_pattern_dark" id="0x7F0800E0" />
-    <public type="drawable" name="bg_subscription_placeholder_pattern_light" id="0x7F0800E1" />
-    <public type="drawable" name="bot_ui_component_divider_drawable" id="0x7F0800E2" />
-    <public type="drawable" name="btn_checkbox_checked_mtrl" id="0x7F0800E3" />
-    <public type="drawable" name="btn_checkbox_checked_to_unchecked_mtrl_animation" id="0x7F0800E4" />
-    <public type="drawable" name="btn_checkbox_unchecked_mtrl" id="0x7F0800E5" />
-    <public type="drawable" name="btn_checkbox_unchecked_to_checked_mtrl_animation" id="0x7F0800E6" />
-    <public type="drawable" name="btn_radio_off_mtrl" id="0x7F0800E7" />
-    <public type="drawable" name="btn_radio_off_to_on_mtrl_animation" id="0x7F0800E8" />
-    <public type="drawable" name="btn_radio_on_mtrl" id="0x7F0800E9" />
-    <public type="drawable" name="btn_radio_on_to_off_mtrl_animation" id="0x7F0800EA" />
-    <public type="drawable" name="bubble_state_selector" id="0x7F0800EB" />
-    <public type="drawable" name="button_brand_500" id="0x7F0800EC" />
-    <public type="drawable" name="button_text_color_primary_100" id="0x7F0800ED" />
-    <public type="drawable" name="cameraview_focus_marker_fill" id="0x7F0800EE" />
-    <public type="drawable" name="cameraview_focus_marker_outline" id="0x7F0800EF" />
-    <public type="drawable" name="changelog_special_back" id="0x7F0800F0" />
-    <public type="drawable" name="changelog_special_close" id="0x7F0800F1" />
-    <public type="drawable" name="changelog_special_footer" id="0x7F0800F2" />
-    <public type="drawable" name="changelog_special_hero" id="0x7F0800F3" />
-    <public type="drawable" name="common_full_open_on_phone" id="0x7F0800F4" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7F0800F5" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7F0800F6" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7F0800F7" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal_background" id="0x7F0800F8" />
-    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7F0800F9" />
-    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7F0800FA" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7F0800FB" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7F0800FC" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7F0800FD" />
-    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7F0800FE" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7F0800FF" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7F080100" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7F080101" />
-    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7F080102" />
-    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7F080103" />
-    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7F080104" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7F080105" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7F080106" />
-    <public type="drawable" name="community_server_get_started_hogwarts" id="0x7F080107" />
-    <public type="drawable" name="community_server_get_started_latin" id="0x7F080108" />
-    <public type="drawable" name="community_server_get_started_pokemon" id="0x7F080109" />
-    <public type="drawable" name="community_server_get_started_sneakers" id="0x7F08010A" />
-    <public type="drawable" name="community_setup_get_started" id="0x7F08010B" />
-    <public type="drawable" name="cpv_alpha" id="0x7F08010C" />
-    <public type="drawable" name="cpv_btn_background" id="0x7F08010D" />
-    <public type="drawable" name="cpv_btn_background_pressed" id="0x7F08010E" />
-    <public type="drawable" name="cpv_ic_arrow_right_black_24dp" id="0x7F08010F" />
-    <public type="drawable" name="cpv_preset_checked" id="0x7F080110" />
-    <public type="drawable" name="cursor_color" id="0x7F080111" />
-    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7F080112" />
-    <public type="drawable" name="design_fab_background" id="0x7F080113" />
-    <public type="drawable" name="design_ic_visibility" id="0x7F080114" />
-    <public type="drawable" name="design_ic_visibility_off" id="0x7F080115" />
-    <public type="drawable" name="design_password_eye" id="0x7F080116" />
-    <public type="drawable" name="design_snackbar_background" id="0x7F080117" />
-    <public type="drawable" name="discovery_empty_state" id="0x7F080118" />
-    <public type="drawable" name="drawable_auth_splash" id="0x7F080119" />
-    <public type="drawable" name="drawable_bg_card_grey" id="0x7F08011A" />
-    <public type="drawable" name="drawable_bg_card_white" id="0x7F08011B" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7F08011C" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7F08011D" />
-    <public type="drawable" name="drawable_bg_command_param_highlight" id="0x7F08011E" />
-    <public type="drawable" name="drawable_bg_command_param_normal" id="0x7F08011F" />
-    <public type="drawable" name="drawable_bg_corners_4dp" id="0x7F080120" />
-    <public type="drawable" name="drawable_bg_highlight" id="0x7F080121" />
-    <public type="drawable" name="drawable_bg_item_filter" id="0x7F080122" />
-    <public type="drawable" name="drawable_bg_loading" id="0x7F080123" />
-    <public type="drawable" name="drawable_bg_loading_new" id="0x7F080124" />
-    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7F080125" />
-    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7F080126" />
-    <public type="drawable" name="drawable_bg_nitro_classic_gradient_diagonal" id="0x7F080127" />
-    <public type="drawable" name="drawable_bg_nitro_gradient" id="0x7F080128" />
-    <public type="drawable" name="drawable_bg_nitro_gradient_diagonal" id="0x7F080129" />
-    <public type="drawable" name="drawable_bg_outline_dark" id="0x7F08012A" />
-    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7F08012B" />
-    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7F08012C" />
-    <public type="drawable" name="drawable_bg_premium_guild_gradient" id="0x7F08012D" />
-    <public type="drawable" name="drawable_bg_premium_guild_gradient_corners" id="0x7F08012E" />
-    <public type="drawable" name="drawable_bg_premium_tier_1_and_premium_guild_gradient" id="0x7F08012F" />
-    <public type="drawable" name="drawable_bg_premium_tier_2_and_premium_guild_gradient" id="0x7F080130" />
-    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7F080131" />
-    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7F080132" />
-    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7F080133" />
-    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7F080134" />
-    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7F080135" />
-    <public type="drawable" name="drawable_bg_reaction_light" id="0x7F080136" />
-    <public type="drawable" name="drawable_bg_settings_header" id="0x7F080137" />
-    <public type="drawable" name="drawable_bg_settings_item" id="0x7F080138" />
-    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7F080139" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_bottom" id="0x7F08013A" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_middle" id="0x7F08013B" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_only" id="0x7F08013C" />
-    <public type="drawable" name="drawable_bg_start_stage_list_item_top" id="0x7F08013D" />
-    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7F08013E" />
-    <public type="drawable" name="drawable_bg_ternary_off" id="0x7F08013F" />
-    <public type="drawable" name="drawable_bg_ternary_on" id="0x7F080140" />
-    <public type="drawable" name="drawable_bg_tooltip" id="0x7F080141" />
-    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7F080142" />
-    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7F080143" />
-    <public type="drawable" name="drawable_bg_white_alpha_06_corners_gradient" id="0x7F080144" />
-    <public type="drawable" name="drawable_bg_white_alpha_24_corners_gradient" id="0x7F080145" />
-    <public type="drawable" name="drawable_black_underlay_gradient" id="0x7F080146" />
-    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7F080147" />
-    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7F080148" />
-    <public type="drawable" name="drawable_boost_progress_ring" id="0x7F080149" />
-    <public type="drawable" name="drawable_boost_removal" id="0x7F08014A" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7F08014B" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7F08014C" />
-    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7F08014D" />
-    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7F08014E" />
-    <public type="drawable" name="drawable_button_brand_neutral" id="0x7F08014F" />
-    <public type="drawable" name="drawable_button_green" id="0x7F080150" />
-    <public type="drawable" name="drawable_button_green_neutral" id="0x7F080151" />
-    <public type="drawable" name="drawable_button_grey" id="0x7F080152" />
-    <public type="drawable" name="drawable_button_grey_disabled" id="0x7F080153" />
-    <public type="drawable" name="drawable_button_red" id="0x7F080154" />
-    <public type="drawable" name="drawable_button_red_neutral" id="0x7F080155" />
-    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7F080156" />
-    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7F080157" />
-    <public type="drawable" name="drawable_chip_background_deprecated" id="0x7F080158" />
-    <public type="drawable" name="drawable_chip_circle" id="0x7F080159" />
-    <public type="drawable" name="drawable_chip_delete" id="0x7F08015A" />
-    <public type="drawable" name="drawable_circle_background_primary" id="0x7F08015B" />
-    <public type="drawable" name="drawable_circle_background_secondary" id="0x7F08015C" />
-    <public type="drawable" name="drawable_circle_background_tertiary" id="0x7F08015D" />
-    <public type="drawable" name="drawable_circle_black" id="0x7F08015E" />
-    <public type="drawable" name="drawable_circle_brand" id="0x7F08015F" />
-    <public type="drawable" name="drawable_circle_brand_500" id="0x7F080160" />
-    <public type="drawable" name="drawable_circle_dashed" id="0x7F080161" />
-    <public type="drawable" name="drawable_circle_green" id="0x7F080162" />
-    <public type="drawable" name="drawable_circle_guild_badge_activateable_dark" id="0x7F080163" />
-    <public type="drawable" name="drawable_circle_guild_badge_activateable_light" id="0x7F080164" />
-    <public type="drawable" name="drawable_circle_guild_badge_active_dark" id="0x7F080165" />
-    <public type="drawable" name="drawable_circle_guild_badge_active_light" id="0x7F080166" />
-    <public type="drawable" name="drawable_circle_guild_badge_inactive_dark" id="0x7F080167" />
-    <public type="drawable" name="drawable_circle_guild_badge_inactive_light" id="0x7F080168" />
-    <public type="drawable" name="drawable_circle_premium_guild_gradient" id="0x7F080169" />
-    <public type="drawable" name="drawable_circle_primary_700" id="0x7F08016A" />
-    <public type="drawable" name="drawable_circle_primary_900" id="0x7F08016B" />
-    <public type="drawable" name="drawable_circle_primary_900_alpha_80" id="0x7F08016C" />
-    <public type="drawable" name="drawable_circle_red" id="0x7F08016D" />
-    <public type="drawable" name="drawable_circle_transparent" id="0x7F08016E" />
-    <public type="drawable" name="drawable_circle_white" id="0x7F08016F" />
-    <public type="drawable" name="drawable_circle_white_1" id="0x7F080170" />
-    <public type="drawable" name="drawable_circle_white_12dp" id="0x7F080171" />
-    <public type="drawable" name="drawable_circle_white_5" id="0x7F080172" />
-    <public type="drawable" name="drawable_clickable_rounded_4dp_brighten" id="0x7F080173" />
-    <public type="drawable" name="drawable_clickable_rounded_4dp_darken" id="0x7F080174" />
-    <public type="drawable" name="drawable_community_setup_first_step_dark" id="0x7F080175" />
-    <public type="drawable" name="drawable_community_setup_first_step_light" id="0x7F080176" />
-    <public type="drawable" name="drawable_community_setup_second_step_dark" id="0x7F080177" />
-    <public type="drawable" name="drawable_community_setup_second_step_light" id="0x7F080178" />
-    <public type="drawable" name="drawable_community_setup_third_step_dark" id="0x7F080179" />
-    <public type="drawable" name="drawable_community_setup_third_step_light" id="0x7F08017A" />
-    <public type="drawable" name="drawable_cpv_edit_text_background" id="0x7F08017B" />
-    <public type="drawable" name="drawable_default_invite_splash" id="0x7F08017C" />
-    <public type="drawable" name="drawable_discovery_card_icon_bg_12dp_rounded" id="0x7F08017D" />
-    <public type="drawable" name="drawable_discovery_card_icon_bg_4dp_rounded" id="0x7F08017E" />
-    <public type="drawable" name="drawable_discovery_card_icon_bg_circle" id="0x7F08017F" />
-    <public type="drawable" name="drawable_discovery_intro_card_bg" id="0x7F080180" />
-    <public type="drawable" name="drawable_discovery_stage_card_bg" id="0x7F080181" />
-    <public type="drawable" name="drawable_divider" id="0x7F080182" />
-    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7F080183" />
-    <public type="drawable" name="drawable_empty_text_placeholder_white" id="0x7F080184" />
-    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7F080185" />
-    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7F080186" />
-    <public type="drawable" name="drawable_fill_brand" id="0x7F080187" />
-    <public type="drawable" name="drawable_flex_input_bg" id="0x7F080188" />
-    <public type="drawable" name="drawable_friends_pending_dark" id="0x7F080189" />
-    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7F08018A" />
-    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7F08018B" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7F08018C" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7F08018D" />
-    <public type="drawable" name="drawable_friends_pending_light" id="0x7F08018E" />
-    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7F08018F" />
-    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7F080190" />
-    <public type="drawable" name="drawable_gem_premium_guild_background_dark" id="0x7F080191" />
-    <public type="drawable" name="drawable_gem_premium_guild_background_light" id="0x7F080192" />
-    <public type="drawable" name="drawable_gem_tier_3" id="0x7F080193" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7F080194" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7F080195" />
-    <public type="drawable" name="drawable_grey_user_icon" id="0x7F080196" />
-    <public type="drawable" name="drawable_guild_placeholder_primary_500" id="0x7F080197" />
-    <public type="drawable" name="drawable_guild_template_club" id="0x7F080198" />
-    <public type="drawable" name="drawable_guild_template_community" id="0x7F080199" />
-    <public type="drawable" name="drawable_guild_template_create" id="0x7F08019A" />
-    <public type="drawable" name="drawable_guild_template_creator" id="0x7F08019B" />
-    <public type="drawable" name="drawable_guild_template_friend" id="0x7F08019C" />
-    <public type="drawable" name="drawable_guild_template_gaming" id="0x7F08019D" />
-    <public type="drawable" name="drawable_guild_template_study" id="0x7F08019E" />
-    <public type="drawable" name="drawable_ic_community_setting_analytics_dark" id="0x7F08019F" />
-    <public type="drawable" name="drawable_ic_community_setting_analytics_light" id="0x7F0801A0" />
-    <public type="drawable" name="drawable_ic_community_setting_info_dark" id="0x7F0801A1" />
-    <public type="drawable" name="drawable_ic_community_setting_info_light" id="0x7F0801A2" />
-    <public type="drawable" name="drawable_ic_community_setting_server_insights_dark" id="0x7F0801A3" />
-    <public type="drawable" name="drawable_ic_community_setting_server_insights_light" id="0x7F0801A4" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7F0801A5" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7F0801A6" />
-    <public type="drawable" name="drawable_ic_nitro" id="0x7F0801A7" />
-    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7F0801A8" />
-    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7F0801A9" />
-    <public type="drawable" name="drawable_ic_ternary_off" id="0x7F0801AA" />
-    <public type="drawable" name="drawable_ic_ternary_on" id="0x7F0801AB" />
-    <public type="drawable" name="drawable_icon_sync_integration" id="0x7F0801AC" />
-    <public type="drawable" name="drawable_invite_share_art_envelope" id="0x7F0801AD" />
-    <public type="drawable" name="drawable_listitem_divider_left_padded" id="0x7F0801AE" />
-    <public type="drawable" name="drawable_logo_auth_dark" id="0x7F0801AF" />
-    <public type="drawable" name="drawable_logo_auth_light" id="0x7F0801B0" />
-    <public type="drawable" name="drawable_nitro_server_boost" id="0x7F0801B1" />
-    <public type="drawable" name="drawable_notifications_badge_border_color_tabs_background" id="0x7F0801B2" />
-    <public type="drawable" name="drawable_open_folder_dark" id="0x7F0801B3" />
-    <public type="drawable" name="drawable_open_folder_light" id="0x7F0801B4" />
-    <public type="drawable" name="drawable_overlay_category_dark" id="0x7F0801B5" />
-    <public type="drawable" name="drawable_overlay_category_light" id="0x7F0801B6" />
-    <public type="drawable" name="drawable_overlay_category_pressed_dark" id="0x7F0801B7" />
-    <public type="drawable" name="drawable_overlay_category_pressed_light" id="0x7F0801B8" />
-    <public type="drawable" name="drawable_overlay_channel_pressed_dark" id="0x7F0801B9" />
-    <public type="drawable" name="drawable_overlay_channel_pressed_light" id="0x7F0801BA" />
-    <public type="drawable" name="drawable_overlay_channels_active_dark" id="0x7F0801BB" />
-    <public type="drawable" name="drawable_overlay_channels_active_light" id="0x7F0801BC" />
-    <public type="drawable" name="drawable_overlay_channels_dark" id="0x7F0801BD" />
-    <public type="drawable" name="drawable_overlay_channels_light" id="0x7F0801BE" />
-    <public type="drawable" name="drawable_overlay_channels_selected_dark" id="0x7F0801BF" />
-    <public type="drawable" name="drawable_overlay_channels_selected_light" id="0x7F0801C0" />
-    <public type="drawable" name="drawable_overlay_guild_mentions_dark" id="0x7F0801C1" />
-    <public type="drawable" name="drawable_overlay_guild_mentions_light" id="0x7F0801C2" />
-    <public type="drawable" name="drawable_overlay_image_square" id="0x7F0801C3" />
-    <public type="drawable" name="drawable_overlay_mentions" id="0x7F0801C4" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7F0801C5" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7F0801C6" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7F0801C7" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_800" id="0x7F0801C8" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_light_130" id="0x7F0801C9" />
-    <public type="drawable" name="drawable_overlay_mentions_white" id="0x7F0801CA" />
-    <public type="drawable" name="drawable_overlay_thread_count_primary_dark" id="0x7F0801CB" />
-    <public type="drawable" name="drawable_overlay_thread_count_primary_light" id="0x7F0801CC" />
-    <public type="drawable" name="drawable_pill_background_tertiary" id="0x7F0801CD" />
-    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7F0801CE" />
-    <public type="drawable" name="drawable_progress_gradient_light" id="0x7F0801CF" />
-    <public type="drawable" name="drawable_progress_green" id="0x7F0801D0" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7F0801D1" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7F0801D2" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7F0801D3" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7F0801D4" />
-    <public type="drawable" name="drawable_ptrn_landing_bg_dark" id="0x7F0801D5" />
-    <public type="drawable" name="drawable_ptrn_landing_bg_light" id="0x7F0801D6" />
-    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7F0801D7" />
-    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7F0801D8" />
-    <public type="drawable" name="drawable_rect_guild_selected" id="0x7F0801D9" />
-    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7F0801DA" />
-    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7F0801DB" />
-    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7F0801DC" />
-    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7F0801DD" />
-    <public type="drawable" name="drawable_rect_rounded_white_corner_radius_8dp" id="0x7F0801DE" />
-    <public type="drawable" name="drawable_segmented_control_container_bg" id="0x7F0801DF" />
-    <public type="drawable" name="drawable_settings_progress" id="0x7F0801E0" />
-    <public type="drawable" name="drawable_squircle_brand_500" id="0x7F0801E1" />
-    <public type="drawable" name="drawable_squircle_primary_600" id="0x7F0801E2" />
-    <public type="drawable" name="drawable_squircle_primary_light_500_alpha_30" id="0x7F0801E3" />
-    <public type="drawable" name="drawable_squircle_transparent" id="0x7F0801E4" />
-    <public type="drawable" name="drawable_squircle_white" id="0x7F0801E5" />
-    <public type="drawable" name="drawable_squircle_white_alpha_30" id="0x7F0801E6" />
-    <public type="drawable" name="drawable_start_stage_bg" id="0x7F0801E7" />
-    <public type="drawable" name="drawable_stream_ended_dark" id="0x7F0801E8" />
-    <public type="drawable" name="drawable_stream_ended_light" id="0x7F0801E9" />
-    <public type="drawable" name="drawable_stream_full" id="0x7F0801EA" />
-    <public type="drawable" name="drawable_stream_preview_not_available_dark" id="0x7F0801EB" />
-    <public type="drawable" name="drawable_stream_preview_not_available_light" id="0x7F0801EC" />
-    <public type="drawable" name="drawable_tag_brand" id="0x7F0801ED" />
-    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7F0801EE" />
-    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7F0801EF" />
-    <public type="drawable" name="drawable_thumb_grey" id="0x7F0801F0" />
-    <public type="drawable" name="drawable_thumb_white" id="0x7F0801F1" />
-    <public type="drawable" name="drawable_tooltip_top_tail" id="0x7F0801F2" />
-    <public type="drawable" name="drawable_top_down_black_40_alpha_gradient" id="0x7F0801F3" />
-    <public type="drawable" name="drawable_uikit_background_tertiary_button" id="0x7F0801F4" />
-    <public type="drawable" name="drawable_uikit_background_tertiary_button_outline" id="0x7F0801F5" />
-    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7F0801F6" />
-    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7F0801F7" />
-    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7F0801F8" />
-    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7F0801F9" />
-    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7F0801FA" />
-    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7F0801FB" />
-    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7F0801FC" />
-    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7F0801FD" />
-    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7F0801FE" />
-    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7F0801FF" />
-    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7F080200" />
-    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7F080201" />
-    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7F080202" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7F080203" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7F080204" />
-    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7F080205" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7F080206" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7F080207" />
-    <public type="drawable" name="drawable_uikit_primary_700_alpha_50_circle" id="0x7F080208" />
-    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7F080209" />
-    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7F08020A" />
-    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7F08020B" />
-    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7F08020C" />
-    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7F08020D" />
-    <public type="drawable" name="drawable_uikit_primary_light_000_circle" id="0x7F08020E" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7F08020F" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7F080210" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7F080211" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7F080212" />
-    <public type="drawable" name="drawable_uikit_primary_light_200_alpha_50_circle" id="0x7F080213" />
-    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7F080214" />
-    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7F080215" />
-    <public type="drawable" name="drawable_uikit_white_circle" id="0x7F080216" />
-    <public type="drawable" name="drawable_vc_empty" id="0x7F080217" />
-    <public type="drawable" name="drawable_voice_controls_bg" id="0x7F080218" />
-    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7F080219" />
-    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7F08021A" />
-    <public type="drawable" name="drawable_voice_sensitivity_progress" id="0x7F08021B" />
-    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7F08021C" />
-    <public type="drawable" name="empty_pins_dark" id="0x7F08021D" />
-    <public type="drawable" name="empty_pins_light" id="0x7F08021E" />
-    <public type="drawable" name="exo_controls_fastforward" id="0x7F08021F" />
-    <public type="drawable" name="exo_controls_fullscreen_enter" id="0x7F080220" />
-    <public type="drawable" name="exo_controls_fullscreen_exit" id="0x7F080221" />
-    <public type="drawable" name="exo_controls_next" id="0x7F080222" />
-    <public type="drawable" name="exo_controls_pause" id="0x7F080223" />
-    <public type="drawable" name="exo_controls_play" id="0x7F080224" />
-    <public type="drawable" name="exo_controls_previous" id="0x7F080225" />
-    <public type="drawable" name="exo_controls_repeat_all" id="0x7F080226" />
-    <public type="drawable" name="exo_controls_repeat_off" id="0x7F080227" />
-    <public type="drawable" name="exo_controls_repeat_one" id="0x7F080228" />
-    <public type="drawable" name="exo_controls_rewind" id="0x7F080229" />
-    <public type="drawable" name="exo_controls_shuffle_off" id="0x7F08022A" />
-    <public type="drawable" name="exo_controls_shuffle_on" id="0x7F08022B" />
-    <public type="drawable" name="exo_controls_vr" id="0x7F08022C" />
-    <public type="drawable" name="exo_edit_mode_logo" id="0x7F08022D" />
-    <public type="drawable" name="exo_ic_audiotrack" id="0x7F08022E" />
-    <public type="drawable" name="exo_ic_check" id="0x7F08022F" />
-    <public type="drawable" name="exo_ic_chevron_left" id="0x7F080230" />
-    <public type="drawable" name="exo_ic_chevron_right" id="0x7F080231" />
-    <public type="drawable" name="exo_ic_default_album_image" id="0x7F080232" />
-    <public type="drawable" name="exo_ic_forward" id="0x7F080233" />
-    <public type="drawable" name="exo_ic_fullscreen_enter" id="0x7F080234" />
-    <public type="drawable" name="exo_ic_fullscreen_exit" id="0x7F080235" />
-    <public type="drawable" name="exo_ic_pause_circle_filled" id="0x7F080236" />
-    <public type="drawable" name="exo_ic_play_circle_filled" id="0x7F080237" />
-    <public type="drawable" name="exo_ic_rewind" id="0x7F080238" />
-    <public type="drawable" name="exo_ic_settings" id="0x7F080239" />
-    <public type="drawable" name="exo_ic_skip_next" id="0x7F08023A" />
-    <public type="drawable" name="exo_ic_skip_previous" id="0x7F08023B" />
-    <public type="drawable" name="exo_ic_speed" id="0x7F08023C" />
-    <public type="drawable" name="exo_ic_subtitle_off" id="0x7F08023D" />
-    <public type="drawable" name="exo_ic_subtitle_on" id="0x7F08023E" />
-    <public type="drawable" name="exo_icon_circular_play" id="0x7F08023F" />
-    <public type="drawable" name="exo_icon_fastforward" id="0x7F080240" />
-    <public type="drawable" name="exo_icon_fullscreen_enter" id="0x7F080241" />
-    <public type="drawable" name="exo_icon_fullscreen_exit" id="0x7F080242" />
-    <public type="drawable" name="exo_icon_next" id="0x7F080243" />
-    <public type="drawable" name="exo_icon_pause" id="0x7F080244" />
-    <public type="drawable" name="exo_icon_play" id="0x7F080245" />
-    <public type="drawable" name="exo_icon_previous" id="0x7F080246" />
-    <public type="drawable" name="exo_icon_repeat_all" id="0x7F080247" />
-    <public type="drawable" name="exo_icon_repeat_off" id="0x7F080248" />
-    <public type="drawable" name="exo_icon_repeat_one" id="0x7F080249" />
-    <public type="drawable" name="exo_icon_rewind" id="0x7F08024A" />
-    <public type="drawable" name="exo_icon_shuffle_off" id="0x7F08024B" />
-    <public type="drawable" name="exo_icon_shuffle_on" id="0x7F08024C" />
-    <public type="drawable" name="exo_icon_stop" id="0x7F08024D" />
-    <public type="drawable" name="exo_icon_vr" id="0x7F08024E" />
-    <public type="drawable" name="exo_notification_fastforward" id="0x7F08024F" />
-    <public type="drawable" name="exo_notification_next" id="0x7F080250" />
-    <public type="drawable" name="exo_notification_pause" id="0x7F080251" />
-    <public type="drawable" name="exo_notification_play" id="0x7F080252" />
-    <public type="drawable" name="exo_notification_previous" id="0x7F080253" />
-    <public type="drawable" name="exo_notification_rewind" id="0x7F080254" />
-    <public type="drawable" name="exo_notification_small_icon" id="0x7F080255" />
-    <public type="drawable" name="exo_notification_stop" id="0x7F080256" />
-    <public type="drawable" name="exo_rounded_rectangle" id="0x7F080257" />
-    <public type="drawable" name="exo_styled_controls_audiotrack" id="0x7F080258" />
-    <public type="drawable" name="exo_styled_controls_check" id="0x7F080259" />
-    <public type="drawable" name="exo_styled_controls_fastforward" id="0x7F08025A" />
-    <public type="drawable" name="exo_styled_controls_fullscreen_enter" id="0x7F08025B" />
-    <public type="drawable" name="exo_styled_controls_fullscreen_exit" id="0x7F08025C" />
-    <public type="drawable" name="exo_styled_controls_next" id="0x7F08025D" />
-    <public type="drawable" name="exo_styled_controls_overflow_hide" id="0x7F08025E" />
-    <public type="drawable" name="exo_styled_controls_overflow_show" id="0x7F08025F" />
-    <public type="drawable" name="exo_styled_controls_pause" id="0x7F080260" />
-    <public type="drawable" name="exo_styled_controls_play" id="0x7F080261" />
-    <public type="drawable" name="exo_styled_controls_previous" id="0x7F080262" />
-    <public type="drawable" name="exo_styled_controls_repeat_all" id="0x7F080263" />
-    <public type="drawable" name="exo_styled_controls_repeat_off" id="0x7F080264" />
-    <public type="drawable" name="exo_styled_controls_repeat_one" id="0x7F080265" />
-    <public type="drawable" name="exo_styled_controls_rewind" id="0x7F080266" />
-    <public type="drawable" name="exo_styled_controls_settings" id="0x7F080267" />
-    <public type="drawable" name="exo_styled_controls_shuffle_off" id="0x7F080268" />
-    <public type="drawable" name="exo_styled_controls_shuffle_on" id="0x7F080269" />
-    <public type="drawable" name="exo_styled_controls_speed" id="0x7F08026A" />
-    <public type="drawable" name="exo_styled_controls_subtitle_off" id="0x7F08026B" />
-    <public type="drawable" name="exo_styled_controls_subtitle_on" id="0x7F08026C" />
-    <public type="drawable" name="exo_styled_controls_vr" id="0x7F08026D" />
-    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7F08026E" />
-    <public type="drawable" name="gif" id="0x7F08026F" />
-    <public type="drawable" name="googleg_disabled_color_18" id="0x7F080270" />
-    <public type="drawable" name="googleg_standard_color_18" id="0x7F080271" />
-    <public type="drawable" name="ic_accessibility_24dp" id="0x7F080272" />
-    <public type="drawable" name="ic_account_bnet" id="0x7F080273" />
-    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7F080274" />
-    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7F080275" />
-    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7F080276" />
-    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7F080277" />
-    <public type="drawable" name="ic_account_facebook" id="0x7F080278" />
-    <public type="drawable" name="ic_account_github" id="0x7F080279" />
-    <public type="drawable" name="ic_account_google" id="0x7F08027A" />
-    <public type="drawable" name="ic_account_lol" id="0x7F08027B" />
-    <public type="drawable" name="ic_account_microsoft" id="0x7F08027C" />
-    <public type="drawable" name="ic_account_obs" id="0x7F08027D" />
-    <public type="drawable" name="ic_account_patreon" id="0x7F08027E" />
-    <public type="drawable" name="ic_account_reddit" id="0x7F08027F" />
-    <public type="drawable" name="ic_account_skype" id="0x7F080280" />
-    <public type="drawable" name="ic_account_spotify" id="0x7F080281" />
-    <public type="drawable" name="ic_account_steam" id="0x7F080282" />
-    <public type="drawable" name="ic_account_twitch" id="0x7F080283" />
-    <public type="drawable" name="ic_account_twitter" id="0x7F080284" />
-    <public type="drawable" name="ic_account_xbox" id="0x7F080285" />
-    <public type="drawable" name="ic_account_xsplit" id="0x7F080286" />
-    <public type="drawable" name="ic_account_youtube" id="0x7F080287" />
-    <public type="drawable" name="ic_activity_status_24dp" id="0x7F080288" />
-    <public type="drawable" name="ic_add_24dp" id="0x7F080289" />
-    <public type="drawable" name="ic_add_circle" id="0x7F08028A" />
-    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7F08028B" />
-    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7F08028C" />
-    <public type="drawable" name="ic_add_friend_green_check" id="0x7F08028D" />
-    <public type="drawable" name="ic_add_friend_plus" id="0x7F08028E" />
-    <public type="drawable" name="ic_add_friend_send" id="0x7F08028F" />
-    <public type="drawable" name="ic_add_person_16dp" id="0x7F080290" />
-    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7F080291" />
-    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7F080292" />
-    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7F080293" />
-    <public type="drawable" name="ic_add_white_24dp" id="0x7F080294" />
-    <public type="drawable" name="ic_alert_circle_16dp" id="0x7F080295" />
-    <public type="drawable" name="ic_analytics_16dp" id="0x7F080296" />
-    <public type="drawable" name="ic_application_status_approved" id="0x7F080297" />
-    <public type="drawable" name="ic_application_status_pending" id="0x7F080298" />
-    <public type="drawable" name="ic_application_status_rejected" id="0x7F080299" />
-    <public type="drawable" name="ic_application_status_started" id="0x7F08029A" />
-    <public type="drawable" name="ic_archived_clock_dark" id="0x7F08029B" />
-    <public type="drawable" name="ic_archived_clock_light" id="0x7F08029C" />
-    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7F08029D" />
-    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7F08029E" />
-    <public type="drawable" name="ic_arrow_down" id="0x7F08029F" />
-    <public type="drawable" name="ic_arrow_down_14dp" id="0x7F0802A0" />
-    <public type="drawable" name="ic_arrow_down_24dp" id="0x7F0802A1" />
-    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7F0802A2" />
-    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7F0802A3" />
-    <public type="drawable" name="ic_arrow_end_24dp" id="0x7F0802A4" />
-    <public type="drawable" name="ic_arrow_right" id="0x7F0802A5" />
-    <public type="drawable" name="ic_arrow_right_24dp" id="0x7F0802A6" />
-    <public type="drawable" name="ic_arrow_up_24dp" id="0x7F0802A7" />
-    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7F0802A8" />
-    <public type="drawable" name="ic_attachment_white_24dp" id="0x7F0802A9" />
-    <public type="drawable" name="ic_audio_output_bluetooth_white_24dp" id="0x7F0802AA" />
-    <public type="drawable" name="ic_audio_output_white_24dp" id="0x7F0802AB" />
-    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7F0802AC" />
-    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7F0802AD" />
-    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7F0802AE" />
-    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7F0802AF" />
-    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7F0802B0" />
-    <public type="drawable" name="ic_audit_calendar_grey_24dp" id="0x7F0802B1" />
-    <public type="drawable" name="ic_audit_calendar_white_24dp" id="0x7F0802B2" />
-    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7F0802B3" />
-    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7F0802B4" />
-    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7F0802B5" />
-    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7F0802B6" />
-    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7F0802B7" />
-    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7F0802B8" />
-    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7F0802B9" />
-    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7F0802BA" />
-    <public type="drawable" name="ic_audit_integrations_grey_24dp" id="0x7F0802BB" />
-    <public type="drawable" name="ic_audit_integrations_white_24dp" id="0x7F0802BC" />
-    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7F0802BD" />
-    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7F0802BE" />
-    <public type="drawable" name="ic_audit_logs_24dp" id="0x7F0802BF" />
-    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7F0802C0" />
-    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7F0802C1" />
-    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7F0802C2" />
-    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7F0802C3" />
-    <public type="drawable" name="ic_audit_stage_instance_grey_24dp" id="0x7F0802C4" />
-    <public type="drawable" name="ic_audit_stage_instance_white_24dp" id="0x7F0802C5" />
-    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7F0802C6" />
-    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7F0802C7" />
-    <public type="drawable" name="ic_authed_apps_24dp" id="0x7F0802C8" />
-    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7F0802C9" />
-    <public type="drawable" name="ic_backspace_white_24dp" id="0x7F0802CA" />
-    <public type="drawable" name="ic_ban_red_24dp" id="0x7F0802CB" />
-    <public type="drawable" name="ic_behavior_24dp" id="0x7F0802CC" />
-    <public type="drawable" name="ic_billing_24dp" id="0x7F0802CD" />
-    <public type="drawable" name="ic_blocked_12dp" id="0x7F0802CE" />
-    <public type="drawable" name="ic_bluetooth_24dp" id="0x7F0802CF" />
-    <public type="drawable" name="ic_bnet_white_24dp" id="0x7F0802D0" />
-    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7F0802D1" />
-    <public type="drawable" name="ic_boosted_badge_18dp" id="0x7F0802D2" />
-    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7F0802D3" />
-    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7F0802D4" />
-    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7F0802D5" />
-    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7F0802D6" />
-    <public type="drawable" name="ic_booster_profile_badge_24dp" id="0x7F0802D7" />
-    <public type="drawable" name="ic_call_24dp" id="0x7F0802D8" />
-    <public type="drawable" name="ic_call_disconnect_24dp" id="0x7F0802D9" />
-    <public type="drawable" name="ic_call_indicator_mobile_screenshare_16dp" id="0x7F0802DA" />
-    <public type="drawable" name="ic_call_indicator_streaming_16dp" id="0x7F0802DB" />
-    <public type="drawable" name="ic_call_indicator_voice_16dp" id="0x7F0802DC" />
-    <public type="drawable" name="ic_call_invite_icon" id="0x7F0802DD" />
-    <public type="drawable" name="ic_call_toolbar_icon_camera_swap" id="0x7F0802DE" />
-    <public type="drawable" name="ic_call_toolbar_icon_grid" id="0x7F0802DF" />
-    <public type="drawable" name="ic_call_toolbar_icon_group" id="0x7F0802E0" />
-    <public type="drawable" name="ic_call_toolbar_icon_minimize" id="0x7F0802E1" />
-    <public type="drawable" name="ic_call_toolbar_icon_minimize_cutout" id="0x7F0802E2" />
-    <public type="drawable" name="ic_call_toolbar_stage_minimize" id="0x7F0802E3" />
-    <public type="drawable" name="ic_call_toolbar_stage_minimize_cutout" id="0x7F0802E4" />
-    <public type="drawable" name="ic_camera_24dp" id="0x7F0802E5" />
-    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7F0802E6" />
-    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7F0802E7" />
-    <public type="drawable" name="ic_carot_right_24dp" id="0x7F0802E8" />
-    <public type="drawable" name="ic_category_16dp" id="0x7F0802E9" />
-    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7F0802EA" />
-    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7F0802EB" />
-    <public type="drawable" name="ic_channel_announcements" id="0x7F0802EC" />
-    <public type="drawable" name="ic_channel_announcements_16dp" id="0x7F0802ED" />
-    <public type="drawable" name="ic_channel_announcements_locked" id="0x7F0802EE" />
-    <public type="drawable" name="ic_channel_announcements_nsfw" id="0x7F0802EF" />
-    <public type="drawable" name="ic_channel_announcements_thread" id="0x7F0802F0" />
-    <public type="drawable" name="ic_channel_announcements_thread_locked" id="0x7F0802F1" />
-    <public type="drawable" name="ic_channel_announcements_thread_nsfw" id="0x7F0802F2" />
-    <public type="drawable" name="ic_channel_lock_16dp" id="0x7F0802F3" />
-    <public type="drawable" name="ic_channel_pinned_message" id="0x7F0802F4" />
-    <public type="drawable" name="ic_channel_stage_16dp" id="0x7F0802F5" />
-    <public type="drawable" name="ic_channel_stage_24dp" id="0x7F0802F6" />
-    <public type="drawable" name="ic_channel_stage_24dp_gray_a60" id="0x7F0802F7" />
-    <public type="drawable" name="ic_channel_stage_24dp_white" id="0x7F0802F8" />
-    <public type="drawable" name="ic_channel_stage_24dp_white_a60" id="0x7F0802F9" />
-    <public type="drawable" name="ic_channel_stage_locked" id="0x7F0802FA" />
-    <public type="drawable" name="ic_channel_text" id="0x7F0802FB" />
-    <public type="drawable" name="ic_channel_text_16dp" id="0x7F0802FC" />
-    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7F0802FD" />
-    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7F0802FE" />
-    <public type="drawable" name="ic_channel_text_locked" id="0x7F0802FF" />
-    <public type="drawable" name="ic_channel_text_nsfw" id="0x7F080300" />
-    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7F080301" />
-    <public type="drawable" name="ic_channel_topic_ellipsis_dark" id="0x7F080302" />
-    <public type="drawable" name="ic_channel_topic_ellipsis_light" id="0x7F080303" />
-    <public type="drawable" name="ic_channel_voice" id="0x7F080304" />
-    <public type="drawable" name="ic_channel_voice_16dp" id="0x7F080305" />
-    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7F080306" />
-    <public type="drawable" name="ic_channel_voice_locked" id="0x7F080307" />
-    <public type="drawable" name="ic_channels_24dp" id="0x7F080308" />
-    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7F080309" />
-    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7F08030A" />
-    <public type="drawable" name="ic_chat_list_actions_add_reaction" id="0x7F08030B" />
-    <public type="drawable" name="ic_chat_message_white_24dp" id="0x7F08030C" />
-    <public type="drawable" name="ic_check_brand_24dp" id="0x7F08030D" />
-    <public type="drawable" name="ic_check_circle_24dp" id="0x7F08030E" />
-    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7F08030F" />
-    <public type="drawable" name="ic_check_green_24dp" id="0x7F080310" />
-    <public type="drawable" name="ic_check_grey_24dp" id="0x7F080311" />
-    <public type="drawable" name="ic_check_white_24dp" id="0x7F080312" />
-    <public type="drawable" name="ic_checkmark_green_16dp" id="0x7F080313" />
-    <public type="drawable" name="ic_chevron" id="0x7F080314" />
-    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7F080315" />
-    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7F080316" />
-    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7F080317" />
-    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7F080318" />
-    <public type="drawable" name="ic_chevron_left_24dp" id="0x7F080319" />
-    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7F08031A" />
-    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7F08031B" />
-    <public type="drawable" name="ic_clear_24dp" id="0x7F08031C" />
-    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7F08031D" />
-    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7F08031E" />
-    <public type="drawable" name="ic_clear_white_24dp" id="0x7F08031F" />
-    <public type="drawable" name="ic_clock_black_24dp" id="0x7F080320" />
-    <public type="drawable" name="ic_close_24dp" id="0x7F080321" />
-    <public type="drawable" name="ic_close_circle_grey_24dp" id="0x7F080322" />
-    <public type="drawable" name="ic_close_circle_nova_grey_24dp" id="0x7F080323" />
-    <public type="drawable" name="ic_close_grey_24dp" id="0x7F080324" />
-    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7F080325" />
-    <public type="drawable" name="ic_close_white_18dp" id="0x7F080326" />
-    <public type="drawable" name="ic_close_white_24dp" id="0x7F080327" />
-    <public type="drawable" name="ic_community_24dp" id="0x7F080328" />
-    <public type="drawable" name="ic_community_update" id="0x7F080329" />
-    <public type="drawable" name="ic_compass" id="0x7F08032A" />
-    <public type="drawable" name="ic_contact_sync_friends_list_upsell" id="0x7F08032B" />
-    <public type="drawable" name="ic_contact_sync_white" id="0x7F08032C" />
-    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7F08032D" />
-    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7F08032E" />
-    <public type="drawable" name="ic_controller_24dp" id="0x7F08032F" />
-    <public type="drawable" name="ic_copy_24dp" id="0x7F080330" />
-    <public type="drawable" name="ic_creditcard_amex" id="0x7F080331" />
-    <public type="drawable" name="ic_creditcard_discover" id="0x7F080332" />
-    <public type="drawable" name="ic_creditcard_generic" id="0x7F080333" />
-    <public type="drawable" name="ic_creditcard_mastercard" id="0x7F080334" />
-    <public type="drawable" name="ic_creditcard_paypal" id="0x7F080335" />
-    <public type="drawable" name="ic_creditcard_visa" id="0x7F080336" />
-    <public type="drawable" name="ic_crown_16dp" id="0x7F080337" />
-    <public type="drawable" name="ic_crown_24dp" id="0x7F080338" />
-    <public type="drawable" name="ic_deafen_state_dark" id="0x7F080339" />
-    <public type="drawable" name="ic_deafen_state_light" id="0x7F08033A" />
-    <public type="drawable" name="ic_deafen_v2_deafened" id="0x7F08033B" />
-    <public type="drawable" name="ic_deafen_v2_red_strike_primary_dark_300" id="0x7F08033C" />
-    <public type="drawable" name="ic_deafen_v2_red_strike_primary_light_600" id="0x7F08033D" />
-    <public type="drawable" name="ic_delete_24dp" id="0x7F08033E" />
-    <public type="drawable" name="ic_delete_circle" id="0x7F08033F" />
-    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7F080340" />
-    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7F080341" />
-    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7F080342" />
-    <public type="drawable" name="ic_delete_white_24dp" id="0x7F080343" />
-    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7F080344" />
-    <public type="drawable" name="ic_diag_link_24dp" id="0x7F080345" />
-    <public type="drawable" name="ic_direct_message_header" id="0x7F080346" />
-    <public type="drawable" name="ic_directory_selected_background" id="0x7F080347" />
-    <public type="drawable" name="ic_directory_selector_background" id="0x7F080348" />
-    <public type="drawable" name="ic_done_activated_24dp" id="0x7F080349" />
-    <public type="drawable" name="ic_done_green_24dp" id="0x7F08034A" />
-    <public type="drawable" name="ic_double_carot_right_16dp" id="0x7F08034B" />
-    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7F08034C" />
-    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7F08034D" />
-    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7F08034E" />
-    <public type="drawable" name="ic_edit_24dp" id="0x7F08034F" />
-    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7F080350" />
-    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7F080351" />
-    <public type="drawable" name="ic_email_verification_24dp" id="0x7F080352" />
-    <public type="drawable" name="ic_embed_white_24dp" id="0x7F080353" />
-    <public type="drawable" name="ic_emoji_24dp" id="0x7F080354" />
-    <public type="drawable" name="ic_emoji_blue_24dp" id="0x7F080355" />
-    <public type="drawable" name="ic_emoji_picker_category_activity" id="0x7F080356" />
-    <public type="drawable" name="ic_emoji_picker_category_custom" id="0x7F080357" />
-    <public type="drawable" name="ic_emoji_picker_category_favorites_star" id="0x7F080358" />
-    <public type="drawable" name="ic_emoji_picker_category_flags" id="0x7F080359" />
-    <public type="drawable" name="ic_emoji_picker_category_food" id="0x7F08035A" />
-    <public type="drawable" name="ic_emoji_picker_category_nature" id="0x7F08035B" />
-    <public type="drawable" name="ic_emoji_picker_category_objects" id="0x7F08035C" />
-    <public type="drawable" name="ic_emoji_picker_category_people" id="0x7F08035D" />
-    <public type="drawable" name="ic_emoji_picker_category_recent" id="0x7F08035E" />
-    <public type="drawable" name="ic_emoji_picker_category_symbols" id="0x7F08035F" />
-    <public type="drawable" name="ic_emoji_picker_category_travel" id="0x7F080360" />
-    <public type="drawable" name="ic_empty_server_settings_integrations_dark" id="0x7F080361" />
-    <public type="drawable" name="ic_empty_server_settings_integrations_light" id="0x7F080362" />
-    <public type="drawable" name="ic_exit_24dp" id="0x7F080363" />
-    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7F080364" />
-    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7F080365" />
-    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7F080366" />
-    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7F080367" />
-    <public type="drawable" name="ic_expression_icon_cutout_24dp" id="0x7F080368" />
-    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_100" id="0x7F080369" />
-    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_500" id="0x7F08036A" />
-    <public type="drawable" name="ic_expression_search_empty_dark" id="0x7F08036B" />
-    <public type="drawable" name="ic_expression_search_empty_light" id="0x7F08036C" />
-    <public type="drawable" name="ic_facebook_white_18dp" id="0x7F08036D" />
-    <public type="drawable" name="ic_facebook_white_24dp" id="0x7F08036E" />
-    <public type="drawable" name="ic_feedback_happy" id="0x7F08036F" />
-    <public type="drawable" name="ic_feedback_happy_desaturated_dark" id="0x7F080370" />
-    <public type="drawable" name="ic_feedback_happy_desaturated_light" id="0x7F080371" />
-    <public type="drawable" name="ic_feedback_neutral" id="0x7F080372" />
-    <public type="drawable" name="ic_feedback_neutral_desaturated_dark" id="0x7F080373" />
-    <public type="drawable" name="ic_feedback_neutral_desaturated_light" id="0x7F080374" />
-    <public type="drawable" name="ic_feedback_sad" id="0x7F080375" />
-    <public type="drawable" name="ic_feedback_sad_desaturated_dark" id="0x7F080376" />
-    <public type="drawable" name="ic_feedback_sad_desaturated_light" id="0x7F080377" />
-    <public type="drawable" name="ic_file_acrobat" id="0x7F080378" />
-    <public type="drawable" name="ic_file_ae" id="0x7F080379" />
-    <public type="drawable" name="ic_file_ai" id="0x7F08037A" />
-    <public type="drawable" name="ic_file_archive" id="0x7F08037B" />
-    <public type="drawable" name="ic_file_audio" id="0x7F08037C" />
-    <public type="drawable" name="ic_file_code" id="0x7F08037D" />
-    <public type="drawable" name="ic_file_document" id="0x7F08037E" />
-    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7F08037F" />
-    <public type="drawable" name="ic_file_download_white_24dp" id="0x7F080380" />
-    <public type="drawable" name="ic_file_large_code" id="0x7F080381" />
-    <public type="drawable" name="ic_file_large_document" id="0x7F080382" />
-    <public type="drawable" name="ic_file_large_video" id="0x7F080383" />
-    <public type="drawable" name="ic_file_ps" id="0x7F080384" />
-    <public type="drawable" name="ic_file_sketch" id="0x7F080385" />
-    <public type="drawable" name="ic_file_spreadsheet" id="0x7F080386" />
-    <public type="drawable" name="ic_file_unknown" id="0x7F080387" />
-    <public type="drawable" name="ic_file_upload_24dp" id="0x7F080388" />
-    <public type="drawable" name="ic_file_video" id="0x7F080389" />
-    <public type="drawable" name="ic_file_webcode" id="0x7F08038A" />
-    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7F08038B" />
-    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7F08038C" />
-    <public type="drawable" name="ic_flag_24dp" id="0x7F08038D" />
-    <public type="drawable" name="ic_flash_auto_24dp" id="0x7F08038E" />
-    <public type="drawable" name="ic_flash_off_24dp" id="0x7F08038F" />
-    <public type="drawable" name="ic_flash_on_24dp" id="0x7F080390" />
-    <public type="drawable" name="ic_flash_torch_24dp" id="0x7F080391" />
-    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_dark" id="0x7F080392" />
-    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_light" id="0x7F080393" />
-    <public type="drawable" name="ic_flex_input_audio_24dp_dark" id="0x7F080394" />
-    <public type="drawable" name="ic_flex_input_audio_24dp_light" id="0x7F080395" />
-    <public type="drawable" name="ic_flex_input_file_24dp_dark" id="0x7F080396" />
-    <public type="drawable" name="ic_flex_input_file_24dp_light" id="0x7F080397" />
-    <public type="drawable" name="ic_flex_input_image_24dp_dark" id="0x7F080398" />
-    <public type="drawable" name="ic_flex_input_image_24dp_light" id="0x7F080399" />
-    <public type="drawable" name="ic_flex_input_movie_24dp_dark" id="0x7F08039A" />
-    <public type="drawable" name="ic_flex_input_movie_24dp_light" id="0x7F08039B" />
-    <public type="drawable" name="ic_gallery_24dp" id="0x7F08039C" />
-    <public type="drawable" name="ic_games_24dp" id="0x7F08039D" />
-    <public type="drawable" name="ic_gem_tier_1" id="0x7F08039E" />
-    <public type="drawable" name="ic_gem_tier_2" id="0x7F08039F" />
-    <public type="drawable" name="ic_gem_tier_3" id="0x7F0803A0" />
-    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7F0803A1" />
-    <public type="drawable" name="ic_gift_24dp" id="0x7F0803A2" />
-    <public type="drawable" name="ic_github_white" id="0x7F0803A3" />
-    <public type="drawable" name="ic_globe_24dp" id="0x7F0803A4" />
-    <public type="drawable" name="ic_globe_32dp" id="0x7F0803A5" />
-    <public type="drawable" name="ic_google_auth_logo" id="0x7F0803A6" />
-    <public type="drawable" name="ic_google_white_24dp" id="0x7F0803A7" />
-    <public type="drawable" name="ic_group_add_white_24dp" id="0x7F0803A8" />
-    <public type="drawable" name="ic_group_edit" id="0x7F0803A9" />
-    <public type="drawable" name="ic_group_join" id="0x7F0803AA" />
-    <public type="drawable" name="ic_group_leave" id="0x7F0803AB" />
-    <public type="drawable" name="ic_group_message_header" id="0x7F0803AC" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7F0803AD" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7F0803AE" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7F0803AF" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7F0803B0" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7F0803B1" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7F0803B2" />
-    <public type="drawable" name="ic_guild_folder" id="0x7F0803B3" />
-    <public type="drawable" name="ic_guild_invite_24dp" id="0x7F0803B4" />
-    <public type="drawable" name="ic_guild_list_dms_24dp" id="0x7F0803B5" />
-    <public type="drawable" name="ic_guild_list_pending_folder" id="0x7F0803B6" />
-    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7F0803B7" />
-    <public type="drawable" name="ic_guild_nitro_progress" id="0x7F0803B8" />
-    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7F0803B9" />
-    <public type="drawable" name="ic_guild_notifications_24dp" id="0x7F0803BA" />
-    <public type="drawable" name="ic_guild_settings_24dp" id="0x7F0803BB" />
-    <public type="drawable" name="ic_guild_welcome_add_friend" id="0x7F0803BC" />
-    <public type="drawable" name="ic_guild_welcome_personalize" id="0x7F0803BD" />
-    <public type="drawable" name="ic_hammer_24dp" id="0x7F0803BE" />
-    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7F0803BF" />
-    <public type="drawable" name="ic_headset_10dp" id="0x7F0803C0" />
-    <public type="drawable" name="ic_headset_24dp" id="0x7F0803C1" />
-    <public type="drawable" name="ic_headset_blue_24dp" id="0x7F0803C2" />
-    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7F0803C3" />
-    <public type="drawable" name="ic_headset_deafened_grey_a60_24dp" id="0x7F0803C4" />
-    <public type="drawable" name="ic_headset_deafened_interactiveactive_dark_24dp" id="0x7F0803C5" />
-    <public type="drawable" name="ic_headset_deafened_interactiveactive_light_24dp" id="0x7F0803C6" />
-    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7F0803C7" />
-    <public type="drawable" name="ic_headset_deafened_white_a60_24dp" id="0x7F0803C8" />
-    <public type="drawable" name="ic_headset_grey_24dp" id="0x7F0803C9" />
-    <public type="drawable" name="ic_headset_grey_a60_24dp" id="0x7F0803CA" />
-    <public type="drawable" name="ic_headset_interactivenormal_dark_24dp" id="0x7F0803CB" />
-    <public type="drawable" name="ic_headset_interactivenormal_light_24dp" id="0x7F0803CC" />
-    <public type="drawable" name="ic_headset_white_18dp" id="0x7F0803CD" />
-    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7F0803CE" />
-    <public type="drawable" name="ic_headset_white_24dp" id="0x7F0803CF" />
-    <public type="drawable" name="ic_headset_white_a60_24dp" id="0x7F0803D0" />
-    <public type="drawable" name="ic_help_24dp" id="0x7F0803D1" />
-    <public type="drawable" name="ic_history_white_24dp" id="0x7F0803D2" />
-    <public type="drawable" name="ic_hour_glass_10dp" id="0x7F0803D3" />
-    <public type="drawable" name="ic_house_24dp" id="0x7F0803D4" />
-    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7F0803D5" />
-    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7F0803D6" />
-    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7F0803D7" />
-    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7F0803D8" />
-    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7F0803D9" />
-    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7F0803DA" />
-    <public type="drawable" name="ic_image_library_24dp" id="0x7F0803DB" />
-    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7F0803DC" />
-    <public type="drawable" name="ic_img_selected_light_theme" id="0x7F0803DD" />
-    <public type="drawable" name="ic_increased_max_guilds_24dp" id="0x7F0803DE" />
-    <public type="drawable" name="ic_increased_message_length_24dp" id="0x7F0803DF" />
-    <public type="drawable" name="ic_info_24dp" id="0x7F0803E0" />
-    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7F0803E1" />
-    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7F0803E2" />
-    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7F0803E3" />
-    <public type="drawable" name="ic_instagram_white_18dp" id="0x7F0803E4" />
-    <public type="drawable" name="ic_keyboard_24dp" id="0x7F0803E5" />
-    <public type="drawable" name="ic_keyboard_black_24dp" id="0x7F0803E6" />
-    <public type="drawable" name="ic_krisp_logo_dark" id="0x7F0803E7" />
-    <public type="drawable" name="ic_krisp_logo_light" id="0x7F0803E8" />
-    <public type="drawable" name="ic_launch_24dp" id="0x7F0803E9" />
-    <public type="drawable" name="ic_link_white_24dp" id="0x7F0803EA" />
-    <public type="drawable" name="ic_locale_24dp" id="0x7F0803EB" />
-    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7F0803EC" />
-    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7F0803ED" />
-    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7F0803EE" />
-    <public type="drawable" name="ic_logo" id="0x7F0803EF" />
-    <public type="drawable" name="ic_lol_white_24dp" id="0x7F0803F0" />
-    <public type="drawable" name="ic_mail_24dp" id="0x7F0803F1" />
-    <public type="drawable" name="ic_mark_unread_24dp" id="0x7F0803F2" />
-    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7F0803F3" />
-    <public type="drawable" name="ic_member_verification_chat_guard_cta" id="0x7F0803F4" />
-    <public type="drawable" name="ic_member_verification_pending" id="0x7F0803F5" />
-    <public type="drawable" name="ic_members_24dp" id="0x7F0803F6" />
-    <public type="drawable" name="ic_mentions_white_24dp" id="0x7F0803F7" />
-    <public type="drawable" name="ic_menu_24dp" id="0x7F0803F8" />
-    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7F0803F9" />
-    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7F0803FA" />
-    <public type="drawable" name="ic_mic_grey_24dp" id="0x7F0803FB" />
-    <public type="drawable" name="ic_mic_grey_a60_24dp" id="0x7F0803FC" />
-    <public type="drawable" name="ic_mic_interactivenormal_dark_24dp" id="0x7F0803FD" />
-    <public type="drawable" name="ic_mic_interactivenormal_light_24dp" id="0x7F0803FE" />
-    <public type="drawable" name="ic_mic_mute_red_strike_24dp" id="0x7F0803FF" />
-    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7F080400" />
-    <public type="drawable" name="ic_mic_muted_grey_a60_24dp" id="0x7F080401" />
-    <public type="drawable" name="ic_mic_muted_interactiveactive_dark_24dp" id="0x7F080402" />
-    <public type="drawable" name="ic_mic_muted_interactiveactive_light_24dp" id="0x7F080403" />
-    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7F080404" />
-    <public type="drawable" name="ic_mic_muted_white_a60_24dp" id="0x7F080405" />
-    <public type="drawable" name="ic_mic_state_dark" id="0x7F080406" />
-    <public type="drawable" name="ic_mic_state_light" id="0x7F080407" />
-    <public type="drawable" name="ic_mic_white_18dp" id="0x7F080408" />
-    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7F080409" />
-    <public type="drawable" name="ic_mic_white_24dp" id="0x7F08040A" />
-    <public type="drawable" name="ic_mic_white_a60_24dp" id="0x7F08040B" />
-    <public type="drawable" name="ic_mobile" id="0x7F08040C" />
-    <public type="drawable" name="ic_mobile_screenshare_24dp" id="0x7F08040D" />
-    <public type="drawable" name="ic_mobile_screenshare_end_24dp" id="0x7F08040E" />
-    <public type="drawable" name="ic_moderator_shield_24dp" id="0x7F08040F" />
-    <public type="drawable" name="ic_monitor_white_24dp" id="0x7F080410" />
-    <public type="drawable" name="ic_more_options_with_circular_background" id="0x7F080411" />
-    <public type="drawable" name="ic_more_primary100_24dp" id="0x7F080412" />
-    <public type="drawable" name="ic_more_primary900_24dp" id="0x7F080413" />
-    <public type="drawable" name="ic_mtrl_checked_circle" id="0x7F080414" />
-    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7F080415" />
-    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7F080416" />
-    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7F080417" />
-    <public type="drawable" name="ic_mute_v2_muted" id="0x7F080418" />
-    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_dark_300" id="0x7F080419" />
-    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_light_600" id="0x7F08041A" />
-    <public type="drawable" name="ic_my_account_24dp" id="0x7F08041B" />
-    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7F08041C" />
-    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7F08041D" />
-    <public type="drawable" name="ic_network_airplane_mode" id="0x7F08041E" />
-    <public type="drawable" name="ic_network_airplane_mode_light" id="0x7F08041F" />
-    <public type="drawable" name="ic_network_connecting_animated_vector" id="0x7F080420" />
-    <public type="drawable" name="ic_network_connecting_animated_vector_light" id="0x7F080421" />
-    <public type="drawable" name="ic_network_offline" id="0x7F080422" />
-    <public type="drawable" name="ic_network_offline_light" id="0x7F080423" />
-    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7F080424" />
-    <public type="drawable" name="ic_nitro_badge_white" id="0x7F080425" />
-    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7F080426" />
-    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7F080427" />
-    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7F080428" />
-    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7F080429" />
-    <public type="drawable" name="ic_nitro_rep" id="0x7F08042A" />
-    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7F08042B" />
-    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7F08042C" />
-    <public type="drawable" name="ic_noise_cancellation_active_24dp" id="0x7F08042D" />
-    <public type="drawable" name="ic_noise_cancellation_disabled_24dp" id="0x7F08042E" />
-    <public type="drawable" name="ic_notification_24dp" id="0x7F08042F" />
-    <public type="drawable" name="ic_notification_call_24dp" id="0x7F080430" />
-    <public type="drawable" name="ic_notification_friends_24dp" id="0x7F080431" />
-    <public type="drawable" name="ic_notification_message_24dp" id="0x7F080432" />
-    <public type="drawable" name="ic_notification_settings_24dp" id="0x7F080433" />
-    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7F080434" />
-    <public type="drawable" name="ic_notifications_off_grey_24dp" id="0x7F080435" />
-    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7F080436" />
-    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7F080437" />
-    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7F080438" />
-    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7F080439" />
-    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7F08043A" />
-    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7F08043B" />
-    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7F08043C" />
-    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7F08043D" />
-    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7F08043E" />
-    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7F08043F" />
-    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7F080440" />
-    <public type="drawable" name="ic_overflow_dark_24dp" id="0x7F080441" />
-    <public type="drawable" name="ic_overflow_light_24dp" id="0x7F080442" />
-    <public type="drawable" name="ic_partnered_badge" id="0x7F080443" />
-    <public type="drawable" name="ic_partnered_badge_banner" id="0x7F080444" />
-    <public type="drawable" name="ic_people_white_24dp" id="0x7F080445" />
-    <public type="drawable" name="ic_perk_lock" id="0x7F080446" />
-    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7F080447" />
-    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7F080448" />
-    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7F080449" />
-    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7F08044A" />
-    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7F08044B" />
-    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7F08044C" />
-    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7F08044D" />
-    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7F08044E" />
-    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7F08044F" />
-    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7F080450" />
-    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7F080451" />
-    <public type="drawable" name="ic_person_shield_24dp" id="0x7F080452" />
-    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7F080453" />
-    <public type="drawable" name="ic_phone_24dp" id="0x7F080454" />
-    <public type="drawable" name="ic_phone_verification_24dp" id="0x7F080455" />
-    <public type="drawable" name="ic_phonelink_24dp" id="0x7F080456" />
-    <public type="drawable" name="ic_photo_grey_24dp" id="0x7F080457" />
-    <public type="drawable" name="ic_pin_24dp" id="0x7F080458" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_1" id="0x7F080459" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_10" id="0x7F08045A" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_13" id="0x7F08045B" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_2" id="0x7F08045C" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_28" id="0x7F08045D" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_3" id="0x7F08045E" />
-    <public type="drawable" name="ic_plan_premium_and_premium_guild_5" id="0x7F08045F" />
-    <public type="drawable" name="ic_plan_premium_guild_1" id="0x7F080460" />
-    <public type="drawable" name="ic_plan_premium_guild_2" id="0x7F080461" />
-    <public type="drawable" name="ic_plan_premium_tier_1" id="0x7F080462" />
-    <public type="drawable" name="ic_plan_premium_tier_1_and_premium_guild_1" id="0x7F080463" />
-    <public type="drawable" name="ic_plan_premium_tier_1_year" id="0x7F080464" />
-    <public type="drawable" name="ic_plan_premium_tier_2" id="0x7F080465" />
-    <public type="drawable" name="ic_plan_premium_tier_2_year" id="0x7F080466" />
-    <public type="drawable" name="ic_play_arrow_24dp" id="0x7F080467" />
-    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7F080468" />
-    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7F080469" />
-    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7F08046A" />
-    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7F08046B" />
-    <public type="drawable" name="ic_privacy_24dp" id="0x7F08046C" />
-    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7F08046D" />
-    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7F08046E" />
-    <public type="drawable" name="ic_profile_24dp" id="0x7F08046F" />
-    <public type="drawable" name="ic_profile_badge_bughunter_level_1_32dp" id="0x7F080470" />
-    <public type="drawable" name="ic_profile_badge_bughunter_level_2_32dp" id="0x7F080471" />
-    <public type="drawable" name="ic_profile_badge_certified_moderator_32dp" id="0x7F080472" />
-    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7F080473" />
-    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7F080474" />
-    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7F080475" />
-    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7F080476" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7F080477" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7F080478" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7F080479" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7F08047A" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7F08047B" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7F08047C" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7F08047D" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7F08047E" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7F08047F" />
-    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7F080480" />
-    <public type="drawable" name="ic_profile_badge_verified_developer_32dp" id="0x7F080481" />
-    <public type="drawable" name="ic_publish_24dp" id="0x7F080482" />
-    <public type="drawable" name="ic_qr_code_24dp" id="0x7F080483" />
-    <public type="drawable" name="ic_quote_grey_a60_24dp" id="0x7F080484" />
-    <public type="drawable" name="ic_quote_white_a60_24dp" id="0x7F080485" />
-    <public type="drawable" name="ic_raised_hand_action_24dp" id="0x7F080486" />
-    <public type="drawable" name="ic_reaction_24dp" id="0x7F080487" />
-    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7F080488" />
-    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7F080489" />
-    <public type="drawable" name="ic_recent_24dp" id="0x7F08048A" />
-    <public type="drawable" name="ic_recent_grey_a60_24dp" id="0x7F08048B" />
-    <public type="drawable" name="ic_recent_white_a60_24dp" id="0x7F08048C" />
-    <public type="drawable" name="ic_reddit_white_24dp" id="0x7F08048D" />
-    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7F08048E" />
-    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7F08048F" />
-    <public type="drawable" name="ic_reminder_notification" id="0x7F080490" />
-    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7F080491" />
-    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7F080492" />
-    <public type="drawable" name="ic_remove_reaction_24dp" id="0x7F080493" />
-    <public type="drawable" name="ic_removed_sticker_72dp" id="0x7F080494" />
-    <public type="drawable" name="ic_reply_24dp" id="0x7F080495" />
-    <public type="drawable" name="ic_resend_24dp" id="0x7F080496" />
-    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7F080497" />
-    <public type="drawable" name="ic_role_24dp" id="0x7F080498" />
-    <public type="drawable" name="ic_role_lock" id="0x7F080499" />
-    <public type="drawable" name="ic_role_pink_24dp" id="0x7F08049A" />
-    <public type="drawable" name="ic_screen_14dp" id="0x7F08049B" />
-    <public type="drawable" name="ic_search" id="0x7F08049C" />
-    <public type="drawable" name="ic_search_16dp" id="0x7F08049D" />
-    <public type="drawable" name="ic_search_grey_24dp" id="0x7F08049E" />
-    <public type="drawable" name="ic_search_white_24dp" id="0x7F08049F" />
-    <public type="drawable" name="ic_security_24dp" id="0x7F0804A0" />
-    <public type="drawable" name="ic_send_24dp" id="0x7F0804A1" />
-    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7F0804A2" />
-    <public type="drawable" name="ic_send_white_24dp" id="0x7F0804A3" />
-    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7F0804A4" />
-    <public type="drawable" name="ic_settings_24dp" id="0x7F0804A5" />
-    <public type="drawable" name="ic_settings_boost_24dp" id="0x7F0804A6" />
-    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7F0804A7" />
-    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7F0804A8" />
-    <public type="drawable" name="ic_share_24dp" id="0x7F0804A9" />
-    <public type="drawable" name="ic_share_grey_24dp" id="0x7F0804AA" />
-    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7F0804AB" />
-    <public type="drawable" name="ic_share_white_24dp" id="0x7F0804AC" />
-    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7F0804AD" />
-    <public type="drawable" name="ic_shieldstar_24dp" id="0x7F0804AE" />
-    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7F0804AF" />
-    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7F0804B0" />
-    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7F0804B1" />
-    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7F0804B2" />
-    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7F0804B3" />
-    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7F0804B4" />
-    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7F0804B5" />
-    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7F0804B6" />
-    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7F0804B7" />
-    <public type="drawable" name="ic_skype_white_24dp" id="0x7F0804B8" />
-    <public type="drawable" name="ic_slash_command_24dp" id="0x7F0804B9" />
-    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7F0804BA" />
-    <public type="drawable" name="ic_smile_24dp" id="0x7F0804BB" />
-    <public type="drawable" name="ic_smiley_desaturated" id="0x7F0804BC" />
-    <public type="drawable" name="ic_sort_grey_24dp" id="0x7F0804BD" />
-    <public type="drawable" name="ic_sort_white_24dp" id="0x7F0804BE" />
-    <public type="drawable" name="ic_sound_24dp" id="0x7F0804BF" />
-    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7F0804C0" />
-    <public type="drawable" name="ic_sound_quiet_24dp" id="0x7F0804C1" />
-    <public type="drawable" name="ic_sparkle" id="0x7F0804C2" />
-    <public type="drawable" name="ic_spectate" id="0x7F0804C3" />
-    <public type="drawable" name="ic_spine_long_cap" id="0x7F0804C4" />
-    <public type="drawable" name="ic_spine_long_no_cap" id="0x7F0804C5" />
-    <public type="drawable" name="ic_spine_short_cap" id="0x7F0804C6" />
-    <public type="drawable" name="ic_spine_short_no_cap" id="0x7F0804C7" />
-    <public type="drawable" name="ic_spotify_green_24dp" id="0x7F0804C8" />
-    <public type="drawable" name="ic_spotify_white_24dp" id="0x7F0804C9" />
-    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7F0804CA" />
-    <public type="drawable" name="ic_stage_audience" id="0x7F0804CB" />
-    <public type="drawable" name="ic_stage_invite_speak" id="0x7F0804CC" />
-    <public type="drawable" name="ic_stage_leave_20dp" id="0x7F0804CD" />
-    <public type="drawable" name="ic_stage_move_to_audience" id="0x7F0804CE" />
-    <public type="drawable" name="ic_stage_move_to_speaker" id="0x7F0804CF" />
-    <public type="drawable" name="ic_stage_raised_hand" id="0x7F0804D0" />
-    <public type="drawable" name="ic_stage_raised_hand_24dp_activatable" id="0x7F0804D1" />
-    <public type="drawable" name="ic_stage_raised_hand_green_bg_24dp" id="0x7F0804D2" />
-    <public type="drawable" name="ic_stage_raised_hand_list" id="0x7F0804D3" />
-    <public type="drawable" name="ic_stage_raised_hand_white_bg_24dp" id="0x7F0804D4" />
-    <public type="drawable" name="ic_star_24dp" id="0x7F0804D5" />
-    <public type="drawable" name="ic_status_24dp" id="0x7F0804D6" />
-    <public type="drawable" name="ic_status_dnd_16dp" id="0x7F0804D7" />
-    <public type="drawable" name="ic_status_idle_16dp" id="0x7F0804D8" />
-    <public type="drawable" name="ic_status_invisible_16dp" id="0x7F0804D9" />
-    <public type="drawable" name="ic_status_online_16dp" id="0x7F0804DA" />
-    <public type="drawable" name="ic_status_streaming_16dp" id="0x7F0804DB" />
-    <public type="drawable" name="ic_steam_white_24dp" id="0x7F0804DC" />
-    <public type="drawable" name="ic_sticker_icon_20dp" id="0x7F0804DD" />
-    <public type="drawable" name="ic_sticker_shop_icon_32dp" id="0x7F0804DE" />
-    <public type="drawable" name="ic_sticker_shop_icon_badged_32dp" id="0x7F0804DF" />
-    <public type="drawable" name="ic_stop_stream" id="0x7F0804E0" />
-    <public type="drawable" name="ic_success_discovery" id="0x7F0804E1" />
-    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7F0804E2" />
-    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7F0804E3" />
-    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7F0804E4" />
-    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7F0804E5" />
-    <public type="drawable" name="ic_tab_friends" id="0x7F0804E6" />
-    <public type="drawable" name="ic_tab_home" id="0x7F0804E7" />
-    <public type="drawable" name="ic_tab_home_new" id="0x7F0804E8" />
-    <public type="drawable" name="ic_tab_mentions" id="0x7F0804E9" />
-    <public type="drawable" name="ic_tab_search" id="0x7F0804EA" />
-    <public type="drawable" name="ic_take_photo" id="0x7F0804EB" />
-    <public type="drawable" name="ic_template_32dp" id="0x7F0804EC" />
-    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7F0804ED" />
-    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7F0804EE" />
-    <public type="drawable" name="ic_ternary_off_checked" id="0x7F0804EF" />
-    <public type="drawable" name="ic_ternary_off_disabled" id="0x7F0804F0" />
-    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7F0804F1" />
-    <public type="drawable" name="ic_ternary_on_checked" id="0x7F0804F2" />
-    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7F0804F3" />
-    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7F0804F4" />
-    <public type="drawable" name="ic_text_image_24dp" id="0x7F0804F5" />
-    <public type="drawable" name="ic_theme_24dp" id="0x7F0804F6" />
-    <public type="drawable" name="ic_thread" id="0x7F0804F7" />
-    <public type="drawable" name="ic_thread_locked" id="0x7F0804F8" />
-    <public type="drawable" name="ic_thread_nsfw" id="0x7F0804F9" />
-    <public type="drawable" name="ic_timer_dark" id="0x7F0804FA" />
-    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7F0804FB" />
-    <public type="drawable" name="ic_timer_light" id="0x7F0804FC" />
-    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7F0804FD" />
-    <public type="drawable" name="ic_tooltip_bottom_tail" id="0x7F0804FE" />
-    <public type="drawable" name="ic_transfer_red_24dp" id="0x7F0804FF" />
-    <public type="drawable" name="ic_trash_outline" id="0x7F080500" />
-    <public type="drawable" name="ic_twitch_white_24dp" id="0x7F080501" />
-    <public type="drawable" name="ic_twitter_white_18dp" id="0x7F080502" />
-    <public type="drawable" name="ic_twitter_white_24dp" id="0x7F080503" />
-    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7F080504" />
-    <public type="drawable" name="ic_unban_grey" id="0x7F080505" />
-    <public type="drawable" name="ic_unread_white_9dp" id="0x7F080506" />
-    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7F080507" />
-    <public type="drawable" name="ic_upload_24dp" id="0x7F080508" />
-    <public type="drawable" name="ic_upload_image_34dp" id="0x7F080509" />
-    <public type="drawable" name="ic_upload_image_40dp" id="0x7F08050A" />
-    <public type="drawable" name="ic_upload_plus_32dp" id="0x7F08050B" />
-    <public type="drawable" name="ic_uploads_file_dark" id="0x7F08050C" />
-    <public type="drawable" name="ic_uploads_file_light" id="0x7F08050D" />
-    <public type="drawable" name="ic_uploads_generic_dark" id="0x7F08050E" />
-    <public type="drawable" name="ic_uploads_generic_light" id="0x7F08050F" />
-    <public type="drawable" name="ic_uploads_image_dark" id="0x7F080510" />
-    <public type="drawable" name="ic_uploads_image_light" id="0x7F080511" />
-    <public type="drawable" name="ic_uploads_video_dark" id="0x7F080512" />
-    <public type="drawable" name="ic_uploads_video_light" id="0x7F080513" />
-    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7F080514" />
-    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7F080515" />
-    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7F080516" />
-    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7F080517" />
-    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7F080518" />
-    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7F080519" />
-    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7F08051A" />
-    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7F08051B" />
-    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7F08051C" />
-    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7F08051D" />
-    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7F08051E" />
-    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7F08051F" />
-    <public type="drawable" name="ic_user_profile_action_pending" id="0x7F080520" />
-    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7F080521" />
-    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7F080522" />
-    <public type="drawable" name="ic_verified_10dp" id="0x7F080523" />
-    <public type="drawable" name="ic_verified_badge" id="0x7F080524" />
-    <public type="drawable" name="ic_verified_badge_banner" id="0x7F080525" />
-    <public type="drawable" name="ic_video_grid_view_grey" id="0x7F080526" />
-    <public type="drawable" name="ic_video_grid_view_white" id="0x7F080527" />
-    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7F080528" />
-    <public type="drawable" name="ic_videocam_white_12dp" id="0x7F080529" />
-    <public type="drawable" name="ic_videocam_white_16dp" id="0x7F08052A" />
-    <public type="drawable" name="ic_videocam_white_24dp" id="0x7F08052B" />
-    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7F08052C" />
-    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7F08052D" />
-    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7F08052E" />
-    <public type="drawable" name="ic_visibility_white_24dp" id="0x7F08052F" />
-    <public type="drawable" name="ic_voice_quality_average" id="0x7F080530" />
-    <public type="drawable" name="ic_voice_quality_bad" id="0x7F080531" />
-    <public type="drawable" name="ic_voice_quality_fine" id="0x7F080532" />
-    <public type="drawable" name="ic_voice_quality_unknown" id="0x7F080533" />
-    <public type="drawable" name="ic_voice_settings_24dp" id="0x7F080534" />
-    <public type="drawable" name="ic_volume_off_24dp" id="0x7F080535" />
-    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7F080536" />
-    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7F080537" />
-    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7F080538" />
-    <public type="drawable" name="ic_wand_24dp" id="0x7F080539" />
-    <public type="drawable" name="ic_warning_circle_24dp" id="0x7F08053A" />
-    <public type="drawable" name="ic_x_red_24dp" id="0x7F08053B" />
-    <public type="drawable" name="ic_xbox_white_24dp" id="0x7F08053C" />
-    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7F08053D" />
-    <public type="drawable" name="icon_carrot" id="0x7F08053E" />
-    <public type="drawable" name="icon_flag_au" id="0x7F08053F" />
-    <public type="drawable" name="icon_flag_bg" id="0x7F080540" />
-    <public type="drawable" name="icon_flag_cs" id="0x7F080541" />
-    <public type="drawable" name="icon_flag_da" id="0x7F080542" />
-    <public type="drawable" name="icon_flag_de" id="0x7F080543" />
-    <public type="drawable" name="icon_flag_el" id="0x7F080544" />
-    <public type="drawable" name="icon_flag_en_gb" id="0x7F080545" />
-    <public type="drawable" name="icon_flag_en_us" id="0x7F080546" />
-    <public type="drawable" name="icon_flag_es_es" id="0x7F080547" />
-    <public type="drawable" name="icon_flag_eu" id="0x7F080548" />
-    <public type="drawable" name="icon_flag_fi" id="0x7F080549" />
-    <public type="drawable" name="icon_flag_fr" id="0x7F08054A" />
-    <public type="drawable" name="icon_flag_gb" id="0x7F08054B" />
-    <public type="drawable" name="icon_flag_hi" id="0x7F08054C" />
-    <public type="drawable" name="icon_flag_hk" id="0x7F08054D" />
-    <public type="drawable" name="icon_flag_hr" id="0x7F08054E" />
-    <public type="drawable" name="icon_flag_hu" id="0x7F08054F" />
-    <public type="drawable" name="icon_flag_it" id="0x7F080550" />
-    <public type="drawable" name="icon_flag_ja" id="0x7F080551" />
-    <public type="drawable" name="icon_flag_ko" id="0x7F080552" />
-    <public type="drawable" name="icon_flag_lt" id="0x7F080553" />
-    <public type="drawable" name="icon_flag_nl" id="0x7F080554" />
-    <public type="drawable" name="icon_flag_no" id="0x7F080555" />
-    <public type="drawable" name="icon_flag_pl" id="0x7F080556" />
-    <public type="drawable" name="icon_flag_pt_br" id="0x7F080557" />
-    <public type="drawable" name="icon_flag_ro" id="0x7F080558" />
-    <public type="drawable" name="icon_flag_ru" id="0x7F080559" />
-    <public type="drawable" name="icon_flag_sg" id="0x7F08055A" />
-    <public type="drawable" name="icon_flag_sv_se" id="0x7F08055B" />
-    <public type="drawable" name="icon_flag_th" id="0x7F08055C" />
-    <public type="drawable" name="icon_flag_tr" id="0x7F08055D" />
-    <public type="drawable" name="icon_flag_uk" id="0x7F08055E" />
-    <public type="drawable" name="icon_flag_unknown" id="0x7F08055F" />
-    <public type="drawable" name="icon_flag_vi" id="0x7F080560" />
-    <public type="drawable" name="icon_flag_zh_cn" id="0x7F080561" />
-    <public type="drawable" name="icon_flag_zh_tw" id="0x7F080562" />
-    <public type="drawable" name="icon_menu_copy" id="0x7F080563" />
-    <public type="drawable" name="icon_save" id="0x7F080564" />
-    <public type="drawable" name="img_addfriends_empty_dark" id="0x7F080565" />
-    <public type="drawable" name="img_addfriends_empty_light" id="0x7F080566" />
-    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7F080567" />
-    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7F080568" />
-    <public type="drawable" name="img_age_gate_failure" id="0x7F080569" />
-    <public type="drawable" name="img_age_gate_safety" id="0x7F08056A" />
-    <public type="drawable" name="img_animated_emoji_upsell" id="0x7F08056B" />
-    <public type="drawable" name="img_auth_bg_dark" id="0x7F08056C" />
-    <public type="drawable" name="img_auth_bg_light" id="0x7F08056D" />
-    <public type="drawable" name="img_avatar_upsell" id="0x7F08056E" />
-    <public type="drawable" name="img_baddies_dark_theme" id="0x7F08056F" />
-    <public type="drawable" name="img_baddies_light_theme" id="0x7F080570" />
-    <public type="drawable" name="img_badge_upsell" id="0x7F080571" />
-    <public type="drawable" name="img_boost_activated_dark" id="0x7F080572" />
-    <public type="drawable" name="img_boost_activated_light" id="0x7F080573" />
-    <public type="drawable" name="img_boost_cancel" id="0x7F080574" />
-    <public type="drawable" name="img_boost_hands" id="0x7F080575" />
-    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7F080576" />
-    <public type="drawable" name="img_channel_following_success_1_light" id="0x7F080577" />
-    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7F080578" />
-    <public type="drawable" name="img_channel_following_success_2_light" id="0x7F080579" />
-    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7F08057A" />
-    <public type="drawable" name="img_channel_following_success_3_light" id="0x7F08057B" />
-    <public type="drawable" name="img_channels_onboarding_dark" id="0x7F08057C" />
-    <public type="drawable" name="img_channels_onboarding_light" id="0x7F08057D" />
-    <public type="drawable" name="img_clyde_empty" id="0x7F08057E" />
-    <public type="drawable" name="img_contact_sync_empty_state_upsell" id="0x7F08057F" />
-    <public type="drawable" name="img_contact_sync_landing_header" id="0x7F080580" />
-    <public type="drawable" name="img_contact_sync_suggestions_empty_header" id="0x7F080581" />
-    <public type="drawable" name="img_create_stage_choose_server" id="0x7F080582" />
-    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7F080583" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7F080584" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7F080585" />
-    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7F080586" />
-    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7F080587" />
-    <public type="drawable" name="img_empty_friends_none_dark" id="0x7F080588" />
-    <public type="drawable" name="img_empty_friends_none_light" id="0x7F080589" />
-    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7F08058A" />
-    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7F08058B" />
-    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7F08058C" />
-    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7F08058D" />
-    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7F08058E" />
-    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7F08058F" />
-    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7F080590" />
-    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7F080591" />
-    <public type="drawable" name="img_forced_update_dark" id="0x7F080592" />
-    <public type="drawable" name="img_forced_update_light" id="0x7F080593" />
-    <public type="drawable" name="img_game_presence_nux" id="0x7F080594" />
-    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7F080595" />
-    <public type="drawable" name="img_gem_hands_faded_light" id="0x7F080596" />
-    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7F080597" />
-    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7F080598" />
-    <public type="drawable" name="img_gifting_pattern_dark" id="0x7F080599" />
-    <public type="drawable" name="img_gifting_pattern_light" id="0x7F08059A" />
-    <public type="drawable" name="img_global_emoji_upsell" id="0x7F08059B" />
-    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7F08059C" />
-    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7F08059D" />
-    <public type="drawable" name="img_krisp_onboarding" id="0x7F08059E" />
-    <public type="drawable" name="img_landing_bg_dark" id="0x7F08059F" />
-    <public type="drawable" name="img_landing_bg_light" id="0x7F0805A0" />
-    <public type="drawable" name="img_landing_splash" id="0x7F0805A1" />
-    <public type="drawable" name="img_logo" id="0x7F0805A2" />
-    <public type="drawable" name="img_logo_discord" id="0x7F0805A3" />
-    <public type="drawable" name="img_logo_discord_new" id="0x7F0805A4" />
-    <public type="drawable" name="img_logo_discord_nitro" id="0x7F0805A5" />
-    <public type="drawable" name="img_logo_discord_nitro_and_boost" id="0x7F0805A6" />
-    <public type="drawable" name="img_logo_discord_nitro_and_boost_horizontal" id="0x7F0805A7" />
-    <public type="drawable" name="img_logo_discord_nitro_and_boost_horizontal_new" id="0x7F0805A8" />
-    <public type="drawable" name="img_logo_discord_nitro_and_boost_new" id="0x7F0805A9" />
-    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7F0805AA" />
-    <public type="drawable" name="img_logo_discord_nitro_brand_new" id="0x7F0805AB" />
-    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7F0805AC" />
-    <public type="drawable" name="img_logo_discord_nitro_new" id="0x7F0805AD" />
-    <public type="drawable" name="img_logo_new" id="0x7F0805AE" />
-    <public type="drawable" name="img_logo_nitro" id="0x7F0805AF" />
-    <public type="drawable" name="img_logo_nitro_classic" id="0x7F0805B0" />
-    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7F0805B1" />
-    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7F0805B2" />
-    <public type="drawable" name="img_logo_square" id="0x7F0805B3" />
-    <public type="drawable" name="img_logo_wordmark" id="0x7F0805B4" />
-    <public type="drawable" name="img_logo_wordmark_new" id="0x7F0805B5" />
-    <public type="drawable" name="img_member_verification_denied" id="0x7F0805B6" />
-    <public type="drawable" name="img_member_verification_pending" id="0x7F0805B7" />
-    <public type="drawable" name="img_member_verification_started" id="0x7F0805B8" />
-    <public type="drawable" name="img_mfa_dark" id="0x7F0805B9" />
-    <public type="drawable" name="img_mfa_light" id="0x7F0805BA" />
-    <public type="drawable" name="img_new_tos_dark_theme" id="0x7F0805BB" />
-    <public type="drawable" name="img_new_tos_light_theme" id="0x7F0805BC" />
-    <public type="drawable" name="img_nitro_classic_pattern" id="0x7F0805BD" />
-    <public type="drawable" name="img_nitro_pattern" id="0x7F0805BE" />
-    <public type="drawable" name="img_nitro_splash_dark" id="0x7F0805BF" />
-    <public type="drawable" name="img_nitro_splash_light" id="0x7F0805C0" />
-    <public type="drawable" name="img_nitro_uncancel" id="0x7F0805C1" />
-    <public type="drawable" name="img_no_gifts" id="0x7F0805C2" />
-    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7F0805C3" />
-    <public type="drawable" name="img_no_mutual_friends_light" id="0x7F0805C4" />
-    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7F0805C5" />
-    <public type="drawable" name="img_no_mutual_servers_light" id="0x7F0805C6" />
-    <public type="drawable" name="img_no_text_channels_dark" id="0x7F0805C7" />
-    <public type="drawable" name="img_no_text_channels_light" id="0x7F0805C8" />
-    <public type="drawable" name="img_nsfw_dark_theme" id="0x7F0805C9" />
-    <public type="drawable" name="img_nsfw_light_theme" id="0x7F0805CA" />
-    <public type="drawable" name="img_overlay_nux" id="0x7F0805CB" />
-    <public type="drawable" name="img_permission_prime" id="0x7F0805CC" />
-    <public type="drawable" name="img_plan_activated_dark" id="0x7F0805CD" />
-    <public type="drawable" name="img_plan_activated_light" id="0x7F0805CE" />
-    <public type="drawable" name="img_poop_dark" id="0x7F0805CF" />
-    <public type="drawable" name="img_poop_light" id="0x7F0805D0" />
-    <public type="drawable" name="img_premium_activated_tier_1_dark" id="0x7F0805D1" />
-    <public type="drawable" name="img_premium_activated_tier_1_light" id="0x7F0805D2" />
-    <public type="drawable" name="img_premium_activated_tier_2_dark" id="0x7F0805D3" />
-    <public type="drawable" name="img_premium_activated_tier_2_light" id="0x7F0805D4" />
-    <public type="drawable" name="img_premium_and_premium_guild_subscription_header" id="0x7F0805D5" />
-    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7F0805D6" />
-    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7F0805D7" />
-    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7F0805D8" />
-    <public type="drawable" name="img_premium_classic_subscription_header_logo_new" id="0x7F0805D9" />
-    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7F0805DA" />
-    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7F0805DB" />
-    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7F0805DC" />
-    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7F0805DD" />
-    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7F0805DE" />
-    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_1" id="0x7F0805DF" />
-    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_2" id="0x7F0805E0" />
-    <public type="drawable" name="img_premium_stickers_upsell" id="0x7F0805E1" />
-    <public type="drawable" name="img_premium_subscription_header" id="0x7F0805E2" />
-    <public type="drawable" name="img_premium_subscription_header_error" id="0x7F0805E3" />
-    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7F0805E4" />
-    <public type="drawable" name="img_premium_subscription_header_logo_new" id="0x7F0805E5" />
-    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7F0805E6" />
-    <public type="drawable" name="img_quick_switcher_empty" id="0x7F0805E7" />
-    <public type="drawable" name="img_remote_auth_finished" id="0x7F0805E8" />
-    <public type="drawable" name="img_remote_auth_loaded" id="0x7F0805E9" />
-    <public type="drawable" name="img_remote_auth_not_found" id="0x7F0805EA" />
-    <public type="drawable" name="img_report_success_shield" id="0x7F0805EB" />
-    <public type="drawable" name="img_save_your_group" id="0x7F0805EC" />
-    <public type="drawable" name="img_server_boost_long" id="0x7F0805ED" />
-    <public type="drawable" name="img_stickers_search_empty_90dp" id="0x7F0805EE" />
-    <public type="drawable" name="img_tag_upsell" id="0x7F0805EF" />
-    <public type="drawable" name="img_upload_upsell" id="0x7F0805F0" />
-    <public type="drawable" name="img_verify_email_dark_theme" id="0x7F0805F1" />
-    <public type="drawable" name="img_verify_email_light_theme" id="0x7F0805F2" />
-    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7F0805F3" />
-    <public type="drawable" name="img_verify_phone_light_theme" id="0x7F0805F4" />
-    <public type="drawable" name="img_voice_no_connections_dark" id="0x7F0805F5" />
-    <public type="drawable" name="img_voice_no_connections_light" id="0x7F0805F6" />
-    <public type="drawable" name="img_voice_onboarding" id="0x7F0805F7" />
-    <public type="drawable" name="img_wump_trash_dark" id="0x7F0805F8" />
-    <public type="drawable" name="img_wumpus_ball_dark" id="0x7F0805F9" />
-    <public type="drawable" name="img_wumpus_ball_light" id="0x7F0805FA" />
-    <public type="drawable" name="img_wumpus_custom_status" id="0x7F0805FB" />
-    <public type="drawable" name="img_wumpus_jetpack" id="0x7F0805FC" />
-    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7F0805FD" />
-    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7F0805FE" />
-    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7F0805FF" />
-    <public type="drawable" name="img_wumpus_tophat_light" id="0x7F080600" />
-    <public type="drawable" name="invite_settings_radio_button_dark" id="0x7F080601" />
-    <public type="drawable" name="invite_settings_radio_button_light" id="0x7F080602" />
-    <public type="drawable" name="material_cursor_drawable" id="0x7F080603" />
-    <public type="drawable" name="material_ic_calendar_black_24dp" id="0x7F080604" />
-    <public type="drawable" name="material_ic_clear_black_24dp" id="0x7F080605" />
-    <public type="drawable" name="material_ic_edit_black_24dp" id="0x7F080606" />
-    <public type="drawable" name="material_ic_keyboard_arrow_left_black_24dp" id="0x7F080607" />
-    <public type="drawable" name="material_ic_keyboard_arrow_next_black_24dp" id="0x7F080608" />
-    <public type="drawable" name="material_ic_keyboard_arrow_previous_black_24dp" id="0x7F080609" />
-    <public type="drawable" name="material_ic_keyboard_arrow_right_black_24dp" id="0x7F08060A" />
-    <public type="drawable" name="material_ic_menu_arrow_down_black_24dp" id="0x7F08060B" />
-    <public type="drawable" name="material_ic_menu_arrow_up_black_24dp" id="0x7F08060C" />
-    <public type="drawable" name="mtrl_dialog_background" id="0x7F08060D" />
-    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7F08060E" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7F08060F" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7F080610" />
-    <public type="drawable" name="mtrl_ic_cancel" id="0x7F080611" />
-    <public type="drawable" name="mtrl_ic_error" id="0x7F080612" />
-    <public type="drawable" name="mtrl_popupmenu_background" id="0x7F080613" />
-    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7F080614" />
-    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7F080615" />
-    <public type="drawable" name="navigation_empty_icon" id="0x7F080616" />
-    <public type="drawable" name="notification_action_background" id="0x7F080617" />
-    <public type="drawable" name="notification_bg" id="0x7F080618" />
-    <public type="drawable" name="notification_bg_low" id="0x7F080619" />
-    <public type="drawable" name="notification_bg_low_normal" id="0x7F08061A" />
-    <public type="drawable" name="notification_bg_low_pressed" id="0x7F08061B" />
-    <public type="drawable" name="notification_bg_normal" id="0x7F08061C" />
-    <public type="drawable" name="notification_bg_normal_pressed" id="0x7F08061D" />
-    <public type="drawable" name="notification_icon_background" id="0x7F08061E" />
-    <public type="drawable" name="notification_template_icon_bg" id="0x7F08061F" />
-    <public type="drawable" name="notification_template_icon_low_bg" id="0x7F080620" />
-    <public type="drawable" name="notification_tile_bg" id="0x7F080621" />
-    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7F080622" />
-    <public type="drawable" name="preference_list_divider_material" id="0x7F080623" />
-    <public type="drawable" name="reactions_divider" id="0x7F080624" />
-    <public type="drawable" name="ripple_brighten" id="0x7F080625" />
-    <public type="drawable" name="ripple_circle_background_primary" id="0x7F080626" />
-    <public type="drawable" name="ripple_circle_black" id="0x7F080627" />
-    <public type="drawable" name="ripple_circle_red" id="0x7F080628" />
-    <public type="drawable" name="ripple_darken" id="0x7F080629" />
-    <public type="drawable" name="ripple_pill_red" id="0x7F08062A" />
-    <public type="drawable" name="ripple_selector_rounded" id="0x7F08062B" />
-    <public type="drawable" name="rounded_rectangle_1000dp_radius" id="0x7F08062C" />
-    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7F08062D" />
-    <public type="drawable" name="rounded_rectangle_8dp_radius" id="0x7F08062E" />
-    <public type="drawable" name="screen_share_illustration" id="0x7F08062F" />
-    <public type="drawable" name="screen_share_nfx_illustration" id="0x7F080630" />
-    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7F080631" />
-    <public type="drawable" name="selectable_feedback_happy_light" id="0x7F080632" />
-    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7F080633" />
-    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7F080634" />
-    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7F080635" />
-    <public type="drawable" name="selectable_feedback_sad_light" id="0x7F080636" />
-    <public type="drawable" name="sparkle_animated_vector" id="0x7F080637" />
-    <public type="drawable" name="sparkle_yellow_animated_vector" id="0x7F080638" />
-    <public type="drawable" name="stage_channel_audience_notice" id="0x7F080639" />
-    <public type="drawable" name="stage_channel_dot_separator" id="0x7F08063A" />
-    <public type="drawable" name="stage_channel_info_separator_dot" id="0x7F08063B" />
-    <public type="drawable" name="stage_channel_live_dot" id="0x7F08063C" />
-    <public type="drawable" name="stage_channel_role_dot" id="0x7F08063D" />
-    <public type="drawable" name="tab_dot_selector" id="0x7F08063E" />
-    <public type="drawable" name="tab_indicator_default" id="0x7F08063F" />
-    <public type="drawable" name="tab_indicator_selected" id="0x7F080640" />
-    <public type="drawable" name="test_custom_background" id="0x7F080641" />
-    <public type="drawable" name="thread_embed_spine_drawable" id="0x7F080642" />
-    <public type="drawable" name="tooltip_frame_dark" id="0x7F080643" />
-    <public type="drawable" name="tooltip_frame_light" id="0x7F080644" />
-    <public type="drawable" name="trash_bg" id="0x7F080645" />
-    <public type="drawable" name="ucrop_crop" id="0x7F080646" />
-    <public type="drawable" name="ucrop_ic_angle" id="0x7F080647" />
-    <public type="drawable" name="ucrop_ic_crop" id="0x7F080648" />
-    <public type="drawable" name="ucrop_ic_crop_unselected" id="0x7F080649" />
-    <public type="drawable" name="ucrop_ic_cross" id="0x7F08064A" />
-    <public type="drawable" name="ucrop_ic_done" id="0x7F08064B" />
-    <public type="drawable" name="ucrop_ic_next" id="0x7F08064C" />
-    <public type="drawable" name="ucrop_ic_reset" id="0x7F08064D" />
-    <public type="drawable" name="ucrop_ic_rotate" id="0x7F08064E" />
-    <public type="drawable" name="ucrop_ic_rotate_unselected" id="0x7F08064F" />
-    <public type="drawable" name="ucrop_ic_scale" id="0x7F080650" />
-    <public type="drawable" name="ucrop_ic_scale_unselected" id="0x7F080651" />
-    <public type="drawable" name="ucrop_rotate" id="0x7F080652" />
-    <public type="drawable" name="ucrop_scale" id="0x7F080653" />
-    <public type="drawable" name="ucrop_shadow_upside" id="0x7F080654" />
-    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7F080655" />
-    <public type="drawable" name="ucrop_vector_loader" id="0x7F080656" />
-    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7F080657" />
-    <public type="drawable" name="ucrop_wrapper_controls_shape" id="0x7F080658" />
-    <public type="drawable" name="video_call_illustration" id="0x7F080659" />
-    <public type="drawable" name="voice_user_limit_view_left_bg" id="0x7F08065A" />
-    <public type="drawable" name="voice_user_limit_view_right_bg" id="0x7F08065B" />
-    <public type="drawable" name="widget_stage_raised_hands_divider" id="0x7F08065C" />
+    <public type="drawable" name="res_2131230734_claim_promo_success__0" id="0x7F08000E" />
+    <public type="drawable" name="res_2131230735_claim_promo_success__1" id="0x7F08000F" />
+    <public type="drawable" name="res_2131230736_claim_promo_success__2" id="0x7F080010" />
+    <public type="drawable" name="res_2131230737_discovery_empty_state__0" id="0x7F080011" />
+    <public type="drawable" name="res_2131230738_drawable_guild_template_create__0" id="0x7F080012" />
+    <public type="drawable" name="res_2131230739_drawable_guild_template_study__0" id="0x7F080013" />
+    <public type="drawable" name="res_2131230740_drawable_ic_nitro__0" id="0x7F080014" />
+    <public type="drawable" name="res_2131230741_drawable_ic_nitro_classic__0" id="0x7F080015" />
+    <public type="drawable" name="res_2131230742_ic_boosted_guild_tier_1__0" id="0x7F080016" />
+    <public type="drawable" name="res_2131230743_ic_boosted_guild_tier_2__0" id="0x7F080017" />
+    <public type="drawable" name="res_2131230744_ic_boosted_guild_tier_3__0" id="0x7F080018" />
+    <public type="drawable" name="res_2131230745_ic_network_connecting_animated_vector__0" id="0x7F080019" />
+    <public type="drawable" name="res_2131230746_ic_network_connecting_animated_vector__1" id="0x7F08001A" />
+    <public type="drawable" name="res_2131230747_ic_network_connecting_animated_vector__2" id="0x7F08001B" />
+    <public type="drawable" name="res_2131230748_ic_network_connecting_animated_vector__3" id="0x7F08001C" />
+    <public type="drawable" name="res_2131230749_ic_network_connecting_animated_vector__4" id="0x7F08001D" />
+    <public type="drawable" name="res_2131230750_ic_network_connecting_animated_vector_light__0" id="0x7F08001E" />
+    <public type="drawable" name="res_2131230751_ic_network_connecting_animated_vector_light__1" id="0x7F08001F" />
+    <public type="drawable" name="res_2131230752_ic_network_connecting_animated_vector_light__2" id="0x7F080020" />
+    <public type="drawable" name="res_2131230753_ic_network_connecting_animated_vector_light__3" id="0x7F080021" />
+    <public type="drawable" name="res_2131230754_ic_network_connecting_animated_vector_light__4" id="0x7F080022" />
+    <public type="drawable" name="res_2131230755_ic_nitro_badge_nitro_gradient_16dp__0" id="0x7F080023" />
+    <public type="drawable" name="res_2131230756_ic_nitro_badge_nitro_gradient_16dp__1" id="0x7F080024" />
+    <public type="drawable" name="res_2131230757_img_age_gate_failure__0" id="0x7F080025" />
+    <public type="drawable" name="res_2131230758_img_age_gate_failure__1" id="0x7F080026" />
+    <public type="drawable" name="res_2131230759_img_age_gate_failure__2" id="0x7F080027" />
+    <public type="drawable" name="res_2131230760_img_age_gate_failure__3" id="0x7F080028" />
+    <public type="drawable" name="res_2131230761_img_age_gate_failure__4" id="0x7F080029" />
+    <public type="drawable" name="res_2131230762_img_age_gate_failure__5" id="0x7F08002A" />
+    <public type="drawable" name="res_2131230763_img_age_gate_safety__0" id="0x7F08002B" />
+    <public type="drawable" name="res_2131230764_img_age_gate_safety__1" id="0x7F08002C" />
+    <public type="drawable" name="res_2131230765_img_boost_activated_dark__0" id="0x7F08002D" />
+    <public type="drawable" name="res_2131230766_img_boost_activated_light__0" id="0x7F08002E" />
+    <public type="drawable" name="res_2131230767_img_krisp_onboarding__0" id="0x7F08002F" />
+    <public type="drawable" name="res_2131230768_img_krisp_onboarding__1" id="0x7F080030" />
+    <public type="drawable" name="res_2131230769_img_nitro_pattern__0" id="0x7F080031" />
+    <public type="drawable" name="res_2131230770_img_nitro_pattern__1" id="0x7F080032" />
+    <public type="drawable" name="res_2131230771_img_nitro_pattern__2" id="0x7F080033" />
+    <public type="drawable" name="res_2131230772_img_nitro_pattern__3" id="0x7F080034" />
+    <public type="drawable" name="res_2131230773_img_nitro_pattern__4" id="0x7F080035" />
+    <public type="drawable" name="res_2131230774_img_plan_activated_dark__0" id="0x7F080036" />
+    <public type="drawable" name="res_2131230775_img_plan_activated_light__0" id="0x7F080037" />
+    <public type="drawable" name="res_2131230776_img_premium_activated_tier_1_dark__0" id="0x7F080038" />
+    <public type="drawable" name="res_2131230777_img_premium_activated_tier_1_light__0" id="0x7F080039" />
+    <public type="drawable" name="res_2131230778_img_premium_activated_tier_2_dark__0" id="0x7F08003A" />
+    <public type="drawable" name="res_2131230779_img_premium_activated_tier_2_light__0" id="0x7F08003B" />
+    <public type="drawable" name="res_2131230780_img_remote_auth_loaded__0" id="0x7F08003C" />
+    <public type="drawable" name="res_2131230781_img_wumpus_playing_with_friends__0" id="0x7F08003D" />
+    <public type="drawable" name="res_2131230782_screen_share_nfx_illustration__0" id="0x7F08003E" />
+    <public type="drawable" name="res_2131230783_screen_share_nfx_illustration__1" id="0x7F08003F" />
+    <public type="drawable" name="res_2131230784_screen_share_nfx_illustration__2" id="0x7F080040" />
+    <public type="drawable" name="res_2131230785_sparkle_animated_vector__0" id="0x7F080041" />
+    <public type="drawable" name="res_2131230786_sparkle_animated_vector__1" id="0x7F080042" />
+    <public type="drawable" name="res_2131230787_sparkle_animated_vector__2" id="0x7F080043" />
+    <public type="drawable" name="res_2131230788_sparkle_yellow_animated_vector__0" id="0x7F080044" />
+    <public type="drawable" name="res_2131230789_sparkle_yellow_animated_vector__1" id="0x7F080045" />
+    <public type="drawable" name="res_2131230790_sparkle_yellow_animated_vector__2" id="0x7F080046" />
+    <public type="drawable" name="res_2131230791_video_call_illustration__0" id="0x7F080047" />
+    <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7F080048" />
+    <public type="drawable" name="abc_action_bar_item_background_material" id="0x7F080049" />
+    <public type="drawable" name="abc_btn_borderless_material" id="0x7F08004A" />
+    <public type="drawable" name="abc_btn_check_material" id="0x7F08004B" />
+    <public type="drawable" name="abc_btn_check_material_anim" id="0x7F08004C" />
+    <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7F08004D" />
+    <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7F08004E" />
+    <public type="drawable" name="abc_btn_colored_material" id="0x7F08004F" />
+    <public type="drawable" name="abc_btn_default_mtrl_shape" id="0x7F080050" />
+    <public type="drawable" name="abc_btn_radio_material" id="0x7F080051" />
+    <public type="drawable" name="abc_btn_radio_material_anim" id="0x7F080052" />
+    <public type="drawable" name="abc_btn_radio_to_on_mtrl_000" id="0x7F080053" />
+    <public type="drawable" name="abc_btn_radio_to_on_mtrl_015" id="0x7F080054" />
+    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00001" id="0x7F080055" />
+    <public type="drawable" name="abc_btn_switch_to_on_mtrl_00012" id="0x7F080056" />
+    <public type="drawable" name="abc_cab_background_internal_bg" id="0x7F080057" />
+    <public type="drawable" name="abc_cab_background_top_material" id="0x7F080058" />
+    <public type="drawable" name="abc_cab_background_top_mtrl_alpha" id="0x7F080059" />
+    <public type="drawable" name="abc_control_background_material" id="0x7F08005A" />
+    <public type="drawable" name="abc_dialog_material_background" id="0x7F08005B" />
+    <public type="drawable" name="abc_edit_text_material" id="0x7F08005C" />
+    <public type="drawable" name="abc_ic_ab_back_material" id="0x7F08005D" />
+    <public type="drawable" name="abc_ic_arrow_drop_right_black_24dp" id="0x7F08005E" />
+    <public type="drawable" name="abc_ic_clear_material" id="0x7F08005F" />
+    <public type="drawable" name="abc_ic_commit_search_api_mtrl_alpha" id="0x7F080060" />
+    <public type="drawable" name="abc_ic_go_search_api_material" id="0x7F080061" />
+    <public type="drawable" name="abc_ic_menu_copy_mtrl_am_alpha" id="0x7F080062" />
+    <public type="drawable" name="abc_ic_menu_cut_mtrl_alpha" id="0x7F080063" />
+    <public type="drawable" name="abc_ic_menu_overflow_material" id="0x7F080064" />
+    <public type="drawable" name="abc_ic_menu_paste_mtrl_am_alpha" id="0x7F080065" />
+    <public type="drawable" name="abc_ic_menu_selectall_mtrl_alpha" id="0x7F080066" />
+    <public type="drawable" name="abc_ic_menu_share_mtrl_alpha" id="0x7F080067" />
+    <public type="drawable" name="abc_ic_search_api_material" id="0x7F080068" />
+    <public type="drawable" name="abc_ic_star_black_16dp" id="0x7F080069" />
+    <public type="drawable" name="abc_ic_star_black_36dp" id="0x7F08006A" />
+    <public type="drawable" name="abc_ic_star_black_48dp" id="0x7F08006B" />
+    <public type="drawable" name="abc_ic_star_half_black_16dp" id="0x7F08006C" />
+    <public type="drawable" name="abc_ic_star_half_black_36dp" id="0x7F08006D" />
+    <public type="drawable" name="abc_ic_star_half_black_48dp" id="0x7F08006E" />
+    <public type="drawable" name="abc_ic_voice_search_api_material" id="0x7F08006F" />
+    <public type="drawable" name="abc_item_background_holo_dark" id="0x7F080070" />
+    <public type="drawable" name="abc_item_background_holo_light" id="0x7F080071" />
+    <public type="drawable" name="abc_list_divider_material" id="0x7F080072" />
+    <public type="drawable" name="abc_list_divider_mtrl_alpha" id="0x7F080073" />
+    <public type="drawable" name="abc_list_focused_holo" id="0x7F080074" />
+    <public type="drawable" name="abc_list_longpressed_holo" id="0x7F080075" />
+    <public type="drawable" name="abc_list_pressed_holo_dark" id="0x7F080076" />
+    <public type="drawable" name="abc_list_pressed_holo_light" id="0x7F080077" />
+    <public type="drawable" name="abc_list_selector_background_transition_holo_dark" id="0x7F080078" />
+    <public type="drawable" name="abc_list_selector_background_transition_holo_light" id="0x7F080079" />
+    <public type="drawable" name="abc_list_selector_disabled_holo_dark" id="0x7F08007A" />
+    <public type="drawable" name="abc_list_selector_disabled_holo_light" id="0x7F08007B" />
+    <public type="drawable" name="abc_list_selector_holo_dark" id="0x7F08007C" />
+    <public type="drawable" name="abc_list_selector_holo_light" id="0x7F08007D" />
+    <public type="drawable" name="abc_menu_hardkey_panel_mtrl_mult" id="0x7F08007E" />
+    <public type="drawable" name="abc_popup_background_mtrl_mult" id="0x7F08007F" />
+    <public type="drawable" name="abc_ratingbar_indicator_material" id="0x7F080080" />
+    <public type="drawable" name="abc_ratingbar_material" id="0x7F080081" />
+    <public type="drawable" name="abc_ratingbar_small_material" id="0x7F080082" />
+    <public type="drawable" name="abc_scrubber_control_off_mtrl_alpha" id="0x7F080083" />
+    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_000" id="0x7F080084" />
+    <public type="drawable" name="abc_scrubber_control_to_pressed_mtrl_005" id="0x7F080085" />
+    <public type="drawable" name="abc_scrubber_primary_mtrl_alpha" id="0x7F080086" />
+    <public type="drawable" name="abc_scrubber_track_mtrl_alpha" id="0x7F080087" />
+    <public type="drawable" name="abc_seekbar_thumb_material" id="0x7F080088" />
+    <public type="drawable" name="abc_seekbar_tick_mark_material" id="0x7F080089" />
+    <public type="drawable" name="abc_seekbar_track_material" id="0x7F08008A" />
+    <public type="drawable" name="abc_spinner_mtrl_am_alpha" id="0x7F08008B" />
+    <public type="drawable" name="abc_spinner_textfield_background_material" id="0x7F08008C" />
+    <public type="drawable" name="abc_switch_thumb_material" id="0x7F08008D" />
+    <public type="drawable" name="abc_switch_track_mtrl_alpha" id="0x7F08008E" />
+    <public type="drawable" name="abc_tab_indicator_material" id="0x7F08008F" />
+    <public type="drawable" name="abc_tab_indicator_mtrl_alpha" id="0x7F080090" />
+    <public type="drawable" name="abc_text_cursor_material" id="0x7F080091" />
+    <public type="drawable" name="abc_text_select_handle_left_mtrl_dark" id="0x7F080092" />
+    <public type="drawable" name="abc_text_select_handle_left_mtrl_light" id="0x7F080093" />
+    <public type="drawable" name="abc_text_select_handle_middle_mtrl_dark" id="0x7F080094" />
+    <public type="drawable" name="abc_text_select_handle_middle_mtrl_light" id="0x7F080095" />
+    <public type="drawable" name="abc_text_select_handle_right_mtrl_dark" id="0x7F080096" />
+    <public type="drawable" name="abc_text_select_handle_right_mtrl_light" id="0x7F080097" />
+    <public type="drawable" name="abc_textfield_activated_mtrl_alpha" id="0x7F080098" />
+    <public type="drawable" name="abc_textfield_default_mtrl_alpha" id="0x7F080099" />
+    <public type="drawable" name="abc_textfield_search_activated_mtrl_alpha" id="0x7F08009A" />
+    <public type="drawable" name="abc_textfield_search_default_mtrl_alpha" id="0x7F08009B" />
+    <public type="drawable" name="abc_textfield_search_material" id="0x7F08009C" />
+    <public type="drawable" name="abc_vector_test" id="0x7F08009D" />
+    <public type="drawable" name="alerter_alert_button_background" id="0x7F08009E" />
+    <public type="drawable" name="alerter_ic_face" id="0x7F08009F" />
+    <public type="drawable" name="alerter_ic_notifications" id="0x7F0800A0" />
+    <public type="drawable" name="app_toast_frame" id="0x7F0800A1" />
+    <public type="drawable" name="asset_account_sync_twitch" id="0x7F0800A2" />
+    <public type="drawable" name="asset_account_sync_youtube" id="0x7F0800A3" />
+    <public type="drawable" name="asset_broken_results_dark" id="0x7F0800A4" />
+    <public type="drawable" name="asset_broken_results_light" id="0x7F0800A5" />
+    <public type="drawable" name="asset_default_avatar_32dp" id="0x7F0800A6" />
+    <public type="drawable" name="asset_default_avatar_64dp" id="0x7F0800A7" />
+    <public type="drawable" name="asset_default_avatar_80dp" id="0x7F0800A8" />
+    <public type="drawable" name="asset_default_avatar_new_32dp" id="0x7F0800A9" />
+    <public type="drawable" name="asset_default_avatar_new_64dp" id="0x7F0800AA" />
+    <public type="drawable" name="asset_default_avatar_new_80dp" id="0x7F0800AB" />
+    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7F0800AC" />
+    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7F0800AD" />
+    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7F0800AE" />
+    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7F0800AF" />
+    <public type="drawable" name="asset_empty_no_bans" id="0x7F0800B0" />
+    <public type="drawable" name="asset_empty_no_invites" id="0x7F0800B1" />
+    <public type="drawable" name="asset_group_full" id="0x7F0800B2" />
+    <public type="drawable" name="asset_mfa_server" id="0x7F0800B3" />
+    <public type="drawable" name="asset_no_results_alt_dark" id="0x7F0800B4" />
+    <public type="drawable" name="asset_no_results_alt_light" id="0x7F0800B5" />
+    <public type="drawable" name="asset_no_results_dark" id="0x7F0800B6" />
+    <public type="drawable" name="asset_no_results_light" id="0x7F0800B7" />
+    <public type="drawable" name="asset_nux_navigation_channels" id="0x7F0800B8" />
+    <public type="drawable" name="asset_nux_navigation_dms" id="0x7F0800B9" />
+    <public type="drawable" name="asset_nux_navigation_guilds" id="0x7F0800BA" />
+    <public type="drawable" name="asset_sadbot" id="0x7F0800BB" />
+    <public type="drawable" name="asset_security" id="0x7F0800BC" />
+    <public type="drawable" name="asset_tooltip_server_create" id="0x7F0800BD" />
+    <public type="drawable" name="avd_hide_password" id="0x7F0800BE" />
+    <public type="drawable" name="avd_show_password" id="0x7F0800BF" />
+    <public type="drawable" name="bg_announcements_follow_sheet_dark" id="0x7F0800C0" />
+    <public type="drawable" name="bg_announcements_follow_sheet_light" id="0x7F0800C1" />
+    <public type="drawable" name="bg_bot_ui_component_select" id="0x7F0800C2" />
+    <public type="drawable" name="bg_bot_ui_component_select_pill" id="0x7F0800C3" />
+    <public type="drawable" name="bg_changelog_special_header" id="0x7F0800C4" />
+    <public type="drawable" name="bg_chat_sticker_greet_button" id="0x7F0800C5" />
+    <public type="drawable" name="bg_chat_sticker_greet_button_default" id="0x7F0800C6" />
+    <public type="drawable" name="bg_chat_sticker_greet_button_pressed" id="0x7F0800C7" />
+    <public type="drawable" name="bg_cloud_pattern_dark" id="0x7F0800C8" />
+    <public type="drawable" name="bg_cloud_pattern_light" id="0x7F0800C9" />
+    <public type="drawable" name="bg_payment_method_spinner_closed" id="0x7F0800CA" />
+    <public type="drawable" name="bg_payment_method_spinner_closed_light" id="0x7F0800CB" />
+    <public type="drawable" name="bg_payment_method_spinner_dropdown" id="0x7F0800CC" />
+    <public type="drawable" name="bg_payment_method_spinner_dropdown_light" id="0x7F0800CD" />
+    <public type="drawable" name="bg_premium_bundle_header" id="0x7F0800CE" />
+    <public type="drawable" name="bg_premium_classic_subscription_header" id="0x7F0800CF" />
+    <public type="drawable" name="bg_premium_guild_subscription_header" id="0x7F0800D0" />
+    <public type="drawable" name="bg_premium_guild_subscription_header_error" id="0x7F0800D1" />
+    <public type="drawable" name="bg_premium_guild_subscription_header_resub" id="0x7F0800D2" />
+    <public type="drawable" name="bg_premium_subscription_header" id="0x7F0800D3" />
+    <public type="drawable" name="bg_premium_subscription_header_error" id="0x7F0800D4" />
+    <public type="drawable" name="bg_premium_subscription_header_resub" id="0x7F0800D5" />
+    <public type="drawable" name="bg_pressed_highlight" id="0x7F0800D6" />
+    <public type="drawable" name="bg_pressed_highlight_brighten" id="0x7F0800D7" />
+    <public type="drawable" name="bg_pressed_highlight_darken" id="0x7F0800D8" />
+    <public type="drawable" name="bg_server_discovery_header" id="0x7F0800D9" />
+    <public type="drawable" name="bg_stage_channel_speaking_chip" id="0x7F0800DA" />
+    <public type="drawable" name="bg_start_stage_cutout" id="0x7F0800DB" />
+    <public type="drawable" name="bg_start_stage_event_button" id="0x7F0800DC" />
+    <public type="drawable" name="bg_stream_label" id="0x7F0800DD" />
+    <public type="drawable" name="bg_stream_live_indicator" id="0x7F0800DE" />
+    <public type="drawable" name="bg_stream_live_indicator_split_pill" id="0x7F0800DF" />
+    <public type="drawable" name="bg_stream_preview" id="0x7F0800E0" />
+    <public type="drawable" name="bg_stream_preview_overlay_caption" id="0x7F0800E1" />
+    <public type="drawable" name="bg_stream_preview_overlay_caption_opaque" id="0x7F0800E2" />
+    <public type="drawable" name="bg_stream_resolution_indicator_split_pill" id="0x7F0800E3" />
+    <public type="drawable" name="bg_subscription_placeholder_pattern_dark" id="0x7F0800E4" />
+    <public type="drawable" name="bg_subscription_placeholder_pattern_light" id="0x7F0800E5" />
+    <public type="drawable" name="bot_ui_component_divider_drawable" id="0x7F0800E6" />
+    <public type="drawable" name="btn_checkbox_checked_mtrl" id="0x7F0800E7" />
+    <public type="drawable" name="btn_checkbox_checked_to_unchecked_mtrl_animation" id="0x7F0800E8" />
+    <public type="drawable" name="btn_checkbox_unchecked_mtrl" id="0x7F0800E9" />
+    <public type="drawable" name="btn_checkbox_unchecked_to_checked_mtrl_animation" id="0x7F0800EA" />
+    <public type="drawable" name="btn_radio_off_mtrl" id="0x7F0800EB" />
+    <public type="drawable" name="btn_radio_off_to_on_mtrl_animation" id="0x7F0800EC" />
+    <public type="drawable" name="btn_radio_on_mtrl" id="0x7F0800ED" />
+    <public type="drawable" name="btn_radio_on_to_off_mtrl_animation" id="0x7F0800EE" />
+    <public type="drawable" name="bubble_state_selector" id="0x7F0800EF" />
+    <public type="drawable" name="button_brand_500" id="0x7F0800F0" />
+    <public type="drawable" name="button_text_color_primary_100" id="0x7F0800F1" />
+    <public type="drawable" name="cameraview_focus_marker_fill" id="0x7F0800F2" />
+    <public type="drawable" name="cameraview_focus_marker_outline" id="0x7F0800F3" />
+    <public type="drawable" name="changelog_special_back" id="0x7F0800F4" />
+    <public type="drawable" name="changelog_special_close" id="0x7F0800F5" />
+    <public type="drawable" name="changelog_special_footer" id="0x7F0800F6" />
+    <public type="drawable" name="changelog_special_hero" id="0x7F0800F7" />
+    <public type="drawable" name="claim_promo_success" id="0x7F0800F8" />
+    <public type="drawable" name="common_full_open_on_phone" id="0x7F0800F9" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7F0800FA" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7F0800FB" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7F0800FC" />
+    <public type="drawable" name="common_google_signin_btn_icon_dark_normal_background" id="0x7F0800FD" />
+    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7F0800FE" />
+    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7F0800FF" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7F080100" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7F080101" />
+    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7F080102" />
+    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7F080103" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7F080104" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7F080105" />
+    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7F080106" />
+    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7F080107" />
+    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7F080108" />
+    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7F080109" />
+    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7F08010A" />
+    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7F08010B" />
+    <public type="drawable" name="community_server_get_started_hogwarts" id="0x7F08010C" />
+    <public type="drawable" name="community_server_get_started_latin" id="0x7F08010D" />
+    <public type="drawable" name="community_server_get_started_pokemon" id="0x7F08010E" />
+    <public type="drawable" name="community_server_get_started_sneakers" id="0x7F08010F" />
+    <public type="drawable" name="community_setup_get_started" id="0x7F080110" />
+    <public type="drawable" name="cpv_alpha" id="0x7F080111" />
+    <public type="drawable" name="cpv_btn_background" id="0x7F080112" />
+    <public type="drawable" name="cpv_btn_background_pressed" id="0x7F080113" />
+    <public type="drawable" name="cpv_ic_arrow_right_black_24dp" id="0x7F080114" />
+    <public type="drawable" name="cpv_preset_checked" id="0x7F080115" />
+    <public type="drawable" name="cursor_color" id="0x7F080116" />
+    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7F080117" />
+    <public type="drawable" name="design_fab_background" id="0x7F080118" />
+    <public type="drawable" name="design_ic_visibility" id="0x7F080119" />
+    <public type="drawable" name="design_ic_visibility_off" id="0x7F08011A" />
+    <public type="drawable" name="design_password_eye" id="0x7F08011B" />
+    <public type="drawable" name="design_snackbar_background" id="0x7F08011C" />
+    <public type="drawable" name="discovery_empty_state" id="0x7F08011D" />
+    <public type="drawable" name="drawable_auth_splash" id="0x7F08011E" />
+    <public type="drawable" name="drawable_bg_card_grey" id="0x7F08011F" />
+    <public type="drawable" name="drawable_bg_card_white" id="0x7F080120" />
+    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7F080121" />
+    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7F080122" />
+    <public type="drawable" name="drawable_bg_command_param_highlight" id="0x7F080123" />
+    <public type="drawable" name="drawable_bg_command_param_normal" id="0x7F080124" />
+    <public type="drawable" name="drawable_bg_corners_4dp" id="0x7F080125" />
+    <public type="drawable" name="drawable_bg_highlight" id="0x7F080126" />
+    <public type="drawable" name="drawable_bg_item_filter" id="0x7F080127" />
+    <public type="drawable" name="drawable_bg_loading" id="0x7F080128" />
+    <public type="drawable" name="drawable_bg_loading_new" id="0x7F080129" />
+    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7F08012A" />
+    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7F08012B" />
+    <public type="drawable" name="drawable_bg_nitro_classic_gradient_diagonal" id="0x7F08012C" />
+    <public type="drawable" name="drawable_bg_nitro_gradient" id="0x7F08012D" />
+    <public type="drawable" name="drawable_bg_nitro_gradient_diagonal" id="0x7F08012E" />
+    <public type="drawable" name="drawable_bg_outline_dark" id="0x7F08012F" />
+    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7F080130" />
+    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7F080131" />
+    <public type="drawable" name="drawable_bg_premium_guild_gradient" id="0x7F080132" />
+    <public type="drawable" name="drawable_bg_premium_guild_gradient_corners" id="0x7F080133" />
+    <public type="drawable" name="drawable_bg_premium_tier_1_and_premium_guild_gradient" id="0x7F080134" />
+    <public type="drawable" name="drawable_bg_premium_tier_2_and_premium_guild_gradient" id="0x7F080135" />
+    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7F080136" />
+    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7F080137" />
+    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7F080138" />
+    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7F080139" />
+    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7F08013A" />
+    <public type="drawable" name="drawable_bg_reaction_light" id="0x7F08013B" />
+    <public type="drawable" name="drawable_bg_settings_header" id="0x7F08013C" />
+    <public type="drawable" name="drawable_bg_settings_item" id="0x7F08013D" />
+    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7F08013E" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_bottom" id="0x7F08013F" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_middle" id="0x7F080140" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_only" id="0x7F080141" />
+    <public type="drawable" name="drawable_bg_start_stage_list_item_top" id="0x7F080142" />
+    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7F080143" />
+    <public type="drawable" name="drawable_bg_ternary_off" id="0x7F080144" />
+    <public type="drawable" name="drawable_bg_ternary_on" id="0x7F080145" />
+    <public type="drawable" name="drawable_bg_tooltip" id="0x7F080146" />
+    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7F080147" />
+    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7F080148" />
+    <public type="drawable" name="drawable_bg_white_alpha_06_corners_gradient" id="0x7F080149" />
+    <public type="drawable" name="drawable_bg_white_alpha_24_corners_gradient" id="0x7F08014A" />
+    <public type="drawable" name="drawable_black_underlay_gradient" id="0x7F08014B" />
+    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7F08014C" />
+    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7F08014D" />
+    <public type="drawable" name="drawable_boost_progress_ring" id="0x7F08014E" />
+    <public type="drawable" name="drawable_boost_removal" id="0x7F08014F" />
+    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7F080150" />
+    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7F080151" />
+    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7F080152" />
+    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7F080153" />
+    <public type="drawable" name="drawable_button_brand_neutral" id="0x7F080154" />
+    <public type="drawable" name="drawable_button_green" id="0x7F080155" />
+    <public type="drawable" name="drawable_button_green_neutral" id="0x7F080156" />
+    <public type="drawable" name="drawable_button_grey" id="0x7F080157" />
+    <public type="drawable" name="drawable_button_grey_disabled" id="0x7F080158" />
+    <public type="drawable" name="drawable_button_red" id="0x7F080159" />
+    <public type="drawable" name="drawable_button_red_neutral" id="0x7F08015A" />
+    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7F08015B" />
+    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7F08015C" />
+    <public type="drawable" name="drawable_chip_background_deprecated" id="0x7F08015D" />
+    <public type="drawable" name="drawable_chip_circle" id="0x7F08015E" />
+    <public type="drawable" name="drawable_chip_delete" id="0x7F08015F" />
+    <public type="drawable" name="drawable_circle_background_primary" id="0x7F080160" />
+    <public type="drawable" name="drawable_circle_background_secondary" id="0x7F080161" />
+    <public type="drawable" name="drawable_circle_background_tertiary" id="0x7F080162" />
+    <public type="drawable" name="drawable_circle_black" id="0x7F080163" />
+    <public type="drawable" name="drawable_circle_brand" id="0x7F080164" />
+    <public type="drawable" name="drawable_circle_brand_500" id="0x7F080165" />
+    <public type="drawable" name="drawable_circle_dashed" id="0x7F080166" />
+    <public type="drawable" name="drawable_circle_green" id="0x7F080167" />
+    <public type="drawable" name="drawable_circle_guild_badge_activateable_dark" id="0x7F080168" />
+    <public type="drawable" name="drawable_circle_guild_badge_activateable_light" id="0x7F080169" />
+    <public type="drawable" name="drawable_circle_guild_badge_active_dark" id="0x7F08016A" />
+    <public type="drawable" name="drawable_circle_guild_badge_active_light" id="0x7F08016B" />
+    <public type="drawable" name="drawable_circle_guild_badge_inactive_dark" id="0x7F08016C" />
+    <public type="drawable" name="drawable_circle_guild_badge_inactive_light" id="0x7F08016D" />
+    <public type="drawable" name="drawable_circle_premium_guild_gradient" id="0x7F08016E" />
+    <public type="drawable" name="drawable_circle_primary_700" id="0x7F08016F" />
+    <public type="drawable" name="drawable_circle_primary_900" id="0x7F080170" />
+    <public type="drawable" name="drawable_circle_primary_900_alpha_80" id="0x7F080171" />
+    <public type="drawable" name="drawable_circle_red" id="0x7F080172" />
+    <public type="drawable" name="drawable_circle_transparent" id="0x7F080173" />
+    <public type="drawable" name="drawable_circle_white" id="0x7F080174" />
+    <public type="drawable" name="drawable_circle_white_1" id="0x7F080175" />
+    <public type="drawable" name="drawable_circle_white_12dp" id="0x7F080176" />
+    <public type="drawable" name="drawable_circle_white_5" id="0x7F080177" />
+    <public type="drawable" name="drawable_clickable_rounded_4dp_brighten" id="0x7F080178" />
+    <public type="drawable" name="drawable_clickable_rounded_4dp_darken" id="0x7F080179" />
+    <public type="drawable" name="drawable_community_setup_first_step_dark" id="0x7F08017A" />
+    <public type="drawable" name="drawable_community_setup_first_step_light" id="0x7F08017B" />
+    <public type="drawable" name="drawable_community_setup_second_step_dark" id="0x7F08017C" />
+    <public type="drawable" name="drawable_community_setup_second_step_light" id="0x7F08017D" />
+    <public type="drawable" name="drawable_community_setup_third_step_dark" id="0x7F08017E" />
+    <public type="drawable" name="drawable_community_setup_third_step_light" id="0x7F08017F" />
+    <public type="drawable" name="drawable_cpv_edit_text_background" id="0x7F080180" />
+    <public type="drawable" name="drawable_default_invite_splash" id="0x7F080181" />
+    <public type="drawable" name="drawable_discovery_card_icon_bg_12dp_rounded" id="0x7F080182" />
+    <public type="drawable" name="drawable_discovery_card_icon_bg_4dp_rounded" id="0x7F080183" />
+    <public type="drawable" name="drawable_discovery_card_icon_bg_circle" id="0x7F080184" />
+    <public type="drawable" name="drawable_discovery_intro_card_bg" id="0x7F080185" />
+    <public type="drawable" name="drawable_discovery_stage_card_bg" id="0x7F080186" />
+    <public type="drawable" name="drawable_divider" id="0x7F080187" />
+    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7F080188" />
+    <public type="drawable" name="drawable_empty_text_placeholder_white" id="0x7F080189" />
+    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7F08018A" />
+    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7F08018B" />
+    <public type="drawable" name="drawable_fill_brand" id="0x7F08018C" />
+    <public type="drawable" name="drawable_flex_input_bg" id="0x7F08018D" />
+    <public type="drawable" name="drawable_friends_pending_dark" id="0x7F08018E" />
+    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7F08018F" />
+    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7F080190" />
+    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7F080191" />
+    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7F080192" />
+    <public type="drawable" name="drawable_friends_pending_light" id="0x7F080193" />
+    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7F080194" />
+    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7F080195" />
+    <public type="drawable" name="drawable_gem_premium_guild_background_dark" id="0x7F080196" />
+    <public type="drawable" name="drawable_gem_premium_guild_background_light" id="0x7F080197" />
+    <public type="drawable" name="drawable_gem_tier_3" id="0x7F080198" />
+    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7F080199" />
+    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7F08019A" />
+    <public type="drawable" name="drawable_grey_user_icon" id="0x7F08019B" />
+    <public type="drawable" name="drawable_guild_placeholder_primary_500" id="0x7F08019C" />
+    <public type="drawable" name="drawable_guild_template_club" id="0x7F08019D" />
+    <public type="drawable" name="drawable_guild_template_community" id="0x7F08019E" />
+    <public type="drawable" name="drawable_guild_template_create" id="0x7F08019F" />
+    <public type="drawable" name="drawable_guild_template_creator" id="0x7F0801A0" />
+    <public type="drawable" name="drawable_guild_template_friend" id="0x7F0801A1" />
+    <public type="drawable" name="drawable_guild_template_gaming" id="0x7F0801A2" />
+    <public type="drawable" name="drawable_guild_template_study" id="0x7F0801A3" />
+    <public type="drawable" name="drawable_ic_community_setting_analytics_dark" id="0x7F0801A4" />
+    <public type="drawable" name="drawable_ic_community_setting_analytics_light" id="0x7F0801A5" />
+    <public type="drawable" name="drawable_ic_community_setting_info_dark" id="0x7F0801A6" />
+    <public type="drawable" name="drawable_ic_community_setting_info_light" id="0x7F0801A7" />
+    <public type="drawable" name="drawable_ic_community_setting_server_insights_dark" id="0x7F0801A8" />
+    <public type="drawable" name="drawable_ic_community_setting_server_insights_light" id="0x7F0801A9" />
+    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7F0801AA" />
+    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7F0801AB" />
+    <public type="drawable" name="drawable_ic_nitro" id="0x7F0801AC" />
+    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7F0801AD" />
+    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7F0801AE" />
+    <public type="drawable" name="drawable_ic_ternary_off" id="0x7F0801AF" />
+    <public type="drawable" name="drawable_ic_ternary_on" id="0x7F0801B0" />
+    <public type="drawable" name="drawable_icon_sync_integration" id="0x7F0801B1" />
+    <public type="drawable" name="drawable_invite_share_art_envelope" id="0x7F0801B2" />
+    <public type="drawable" name="drawable_listitem_divider_left_padded" id="0x7F0801B3" />
+    <public type="drawable" name="drawable_logo_auth_dark" id="0x7F0801B4" />
+    <public type="drawable" name="drawable_logo_auth_light" id="0x7F0801B5" />
+    <public type="drawable" name="drawable_nitro_server_boost" id="0x7F0801B6" />
+    <public type="drawable" name="drawable_notifications_badge_border_color_tabs_background" id="0x7F0801B7" />
+    <public type="drawable" name="drawable_open_folder_dark" id="0x7F0801B8" />
+    <public type="drawable" name="drawable_open_folder_light" id="0x7F0801B9" />
+    <public type="drawable" name="drawable_overlay_category_dark" id="0x7F0801BA" />
+    <public type="drawable" name="drawable_overlay_category_light" id="0x7F0801BB" />
+    <public type="drawable" name="drawable_overlay_category_pressed_dark" id="0x7F0801BC" />
+    <public type="drawable" name="drawable_overlay_category_pressed_light" id="0x7F0801BD" />
+    <public type="drawable" name="drawable_overlay_channel_pressed_dark" id="0x7F0801BE" />
+    <public type="drawable" name="drawable_overlay_channel_pressed_light" id="0x7F0801BF" />
+    <public type="drawable" name="drawable_overlay_channels_active_dark" id="0x7F0801C0" />
+    <public type="drawable" name="drawable_overlay_channels_active_light" id="0x7F0801C1" />
+    <public type="drawable" name="drawable_overlay_channels_dark" id="0x7F0801C2" />
+    <public type="drawable" name="drawable_overlay_channels_light" id="0x7F0801C3" />
+    <public type="drawable" name="drawable_overlay_channels_selected_dark" id="0x7F0801C4" />
+    <public type="drawable" name="drawable_overlay_channels_selected_light" id="0x7F0801C5" />
+    <public type="drawable" name="drawable_overlay_guild_mentions_dark" id="0x7F0801C6" />
+    <public type="drawable" name="drawable_overlay_guild_mentions_light" id="0x7F0801C7" />
+    <public type="drawable" name="drawable_overlay_image_square" id="0x7F0801C8" />
+    <public type="drawable" name="drawable_overlay_mentions" id="0x7F0801C9" />
+    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7F0801CA" />
+    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7F0801CB" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7F0801CC" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_800" id="0x7F0801CD" />
+    <public type="drawable" name="drawable_overlay_mentions_primary_light_130" id="0x7F0801CE" />
+    <public type="drawable" name="drawable_overlay_mentions_white" id="0x7F0801CF" />
+    <public type="drawable" name="drawable_overlay_thread_count_primary_dark" id="0x7F0801D0" />
+    <public type="drawable" name="drawable_overlay_thread_count_primary_light" id="0x7F0801D1" />
+    <public type="drawable" name="drawable_pill_background_tertiary" id="0x7F0801D2" />
+    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7F0801D3" />
+    <public type="drawable" name="drawable_progress_gradient_light" id="0x7F0801D4" />
+    <public type="drawable" name="drawable_progress_green" id="0x7F0801D5" />
+    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7F0801D6" />
+    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7F0801D7" />
+    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7F0801D8" />
+    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7F0801D9" />
+    <public type="drawable" name="drawable_ptrn_landing_bg_dark" id="0x7F0801DA" />
+    <public type="drawable" name="drawable_ptrn_landing_bg_light" id="0x7F0801DB" />
+    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7F0801DC" />
+    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7F0801DD" />
+    <public type="drawable" name="drawable_rect_guild_selected" id="0x7F0801DE" />
+    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7F0801DF" />
+    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7F0801E0" />
+    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7F0801E1" />
+    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7F0801E2" />
+    <public type="drawable" name="drawable_rect_rounded_white_corner_radius_8dp" id="0x7F0801E3" />
+    <public type="drawable" name="drawable_segmented_control_container_bg" id="0x7F0801E4" />
+    <public type="drawable" name="drawable_settings_progress" id="0x7F0801E5" />
+    <public type="drawable" name="drawable_squircle_brand_500" id="0x7F0801E6" />
+    <public type="drawable" name="drawable_squircle_primary_600" id="0x7F0801E7" />
+    <public type="drawable" name="drawable_squircle_primary_light_500_alpha_30" id="0x7F0801E8" />
+    <public type="drawable" name="drawable_squircle_transparent" id="0x7F0801E9" />
+    <public type="drawable" name="drawable_squircle_white" id="0x7F0801EA" />
+    <public type="drawable" name="drawable_squircle_white_alpha_30" id="0x7F0801EB" />
+    <public type="drawable" name="drawable_start_stage_bg" id="0x7F0801EC" />
+    <public type="drawable" name="drawable_stream_ended_dark" id="0x7F0801ED" />
+    <public type="drawable" name="drawable_stream_ended_light" id="0x7F0801EE" />
+    <public type="drawable" name="drawable_stream_full" id="0x7F0801EF" />
+    <public type="drawable" name="drawable_stream_preview_not_available_dark" id="0x7F0801F0" />
+    <public type="drawable" name="drawable_stream_preview_not_available_light" id="0x7F0801F1" />
+    <public type="drawable" name="drawable_tag_brand" id="0x7F0801F2" />
+    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7F0801F3" />
+    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7F0801F4" />
+    <public type="drawable" name="drawable_thumb_grey" id="0x7F0801F5" />
+    <public type="drawable" name="drawable_thumb_white" id="0x7F0801F6" />
+    <public type="drawable" name="drawable_tooltip_top_tail" id="0x7F0801F7" />
+    <public type="drawable" name="drawable_top_down_black_40_alpha_gradient" id="0x7F0801F8" />
+    <public type="drawable" name="drawable_uikit_background_tertiary_button" id="0x7F0801F9" />
+    <public type="drawable" name="drawable_uikit_background_tertiary_button_outline" id="0x7F0801FA" />
+    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7F0801FB" />
+    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7F0801FC" />
+    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7F0801FD" />
+    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7F0801FE" />
+    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7F0801FF" />
+    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7F080200" />
+    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7F080201" />
+    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7F080202" />
+    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7F080203" />
+    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7F080204" />
+    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7F080205" />
+    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7F080206" />
+    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7F080207" />
+    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7F080208" />
+    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7F080209" />
+    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7F08020A" />
+    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7F08020B" />
+    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7F08020C" />
+    <public type="drawable" name="drawable_uikit_primary_700_alpha_50_circle" id="0x7F08020D" />
+    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7F08020E" />
+    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7F08020F" />
+    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7F080210" />
+    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7F080211" />
+    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7F080212" />
+    <public type="drawable" name="drawable_uikit_primary_light_000_circle" id="0x7F080213" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7F080214" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7F080215" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7F080216" />
+    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7F080217" />
+    <public type="drawable" name="drawable_uikit_primary_light_200_alpha_50_circle" id="0x7F080218" />
+    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7F080219" />
+    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7F08021A" />
+    <public type="drawable" name="drawable_uikit_white_circle" id="0x7F08021B" />
+    <public type="drawable" name="drawable_vc_empty" id="0x7F08021C" />
+    <public type="drawable" name="drawable_voice_controls_bg" id="0x7F08021D" />
+    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7F08021E" />
+    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7F08021F" />
+    <public type="drawable" name="drawable_voice_sensitivity_progress" id="0x7F080220" />
+    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7F080221" />
+    <public type="drawable" name="empty_pins_dark" id="0x7F080222" />
+    <public type="drawable" name="empty_pins_light" id="0x7F080223" />
+    <public type="drawable" name="exo_controls_fastforward" id="0x7F080224" />
+    <public type="drawable" name="exo_controls_fullscreen_enter" id="0x7F080225" />
+    <public type="drawable" name="exo_controls_fullscreen_exit" id="0x7F080226" />
+    <public type="drawable" name="exo_controls_next" id="0x7F080227" />
+    <public type="drawable" name="exo_controls_pause" id="0x7F080228" />
+    <public type="drawable" name="exo_controls_play" id="0x7F080229" />
+    <public type="drawable" name="exo_controls_previous" id="0x7F08022A" />
+    <public type="drawable" name="exo_controls_repeat_all" id="0x7F08022B" />
+    <public type="drawable" name="exo_controls_repeat_off" id="0x7F08022C" />
+    <public type="drawable" name="exo_controls_repeat_one" id="0x7F08022D" />
+    <public type="drawable" name="exo_controls_rewind" id="0x7F08022E" />
+    <public type="drawable" name="exo_controls_shuffle_off" id="0x7F08022F" />
+    <public type="drawable" name="exo_controls_shuffle_on" id="0x7F080230" />
+    <public type="drawable" name="exo_controls_vr" id="0x7F080231" />
+    <public type="drawable" name="exo_edit_mode_logo" id="0x7F080232" />
+    <public type="drawable" name="exo_ic_audiotrack" id="0x7F080233" />
+    <public type="drawable" name="exo_ic_check" id="0x7F080234" />
+    <public type="drawable" name="exo_ic_chevron_left" id="0x7F080235" />
+    <public type="drawable" name="exo_ic_chevron_right" id="0x7F080236" />
+    <public type="drawable" name="exo_ic_default_album_image" id="0x7F080237" />
+    <public type="drawable" name="exo_ic_forward" id="0x7F080238" />
+    <public type="drawable" name="exo_ic_fullscreen_enter" id="0x7F080239" />
+    <public type="drawable" name="exo_ic_fullscreen_exit" id="0x7F08023A" />
+    <public type="drawable" name="exo_ic_pause_circle_filled" id="0x7F08023B" />
+    <public type="drawable" name="exo_ic_play_circle_filled" id="0x7F08023C" />
+    <public type="drawable" name="exo_ic_rewind" id="0x7F08023D" />
+    <public type="drawable" name="exo_ic_settings" id="0x7F08023E" />
+    <public type="drawable" name="exo_ic_skip_next" id="0x7F08023F" />
+    <public type="drawable" name="exo_ic_skip_previous" id="0x7F080240" />
+    <public type="drawable" name="exo_ic_speed" id="0x7F080241" />
+    <public type="drawable" name="exo_ic_subtitle_off" id="0x7F080242" />
+    <public type="drawable" name="exo_ic_subtitle_on" id="0x7F080243" />
+    <public type="drawable" name="exo_icon_circular_play" id="0x7F080244" />
+    <public type="drawable" name="exo_icon_fastforward" id="0x7F080245" />
+    <public type="drawable" name="exo_icon_fullscreen_enter" id="0x7F080246" />
+    <public type="drawable" name="exo_icon_fullscreen_exit" id="0x7F080247" />
+    <public type="drawable" name="exo_icon_next" id="0x7F080248" />
+    <public type="drawable" name="exo_icon_pause" id="0x7F080249" />
+    <public type="drawable" name="exo_icon_play" id="0x7F08024A" />
+    <public type="drawable" name="exo_icon_previous" id="0x7F08024B" />
+    <public type="drawable" name="exo_icon_repeat_all" id="0x7F08024C" />
+    <public type="drawable" name="exo_icon_repeat_off" id="0x7F08024D" />
+    <public type="drawable" name="exo_icon_repeat_one" id="0x7F08024E" />
+    <public type="drawable" name="exo_icon_rewind" id="0x7F08024F" />
+    <public type="drawable" name="exo_icon_shuffle_off" id="0x7F080250" />
+    <public type="drawable" name="exo_icon_shuffle_on" id="0x7F080251" />
+    <public type="drawable" name="exo_icon_stop" id="0x7F080252" />
+    <public type="drawable" name="exo_icon_vr" id="0x7F080253" />
+    <public type="drawable" name="exo_notification_fastforward" id="0x7F080254" />
+    <public type="drawable" name="exo_notification_next" id="0x7F080255" />
+    <public type="drawable" name="exo_notification_pause" id="0x7F080256" />
+    <public type="drawable" name="exo_notification_play" id="0x7F080257" />
+    <public type="drawable" name="exo_notification_previous" id="0x7F080258" />
+    <public type="drawable" name="exo_notification_rewind" id="0x7F080259" />
+    <public type="drawable" name="exo_notification_small_icon" id="0x7F08025A" />
+    <public type="drawable" name="exo_notification_stop" id="0x7F08025B" />
+    <public type="drawable" name="exo_rounded_rectangle" id="0x7F08025C" />
+    <public type="drawable" name="exo_styled_controls_audiotrack" id="0x7F08025D" />
+    <public type="drawable" name="exo_styled_controls_check" id="0x7F08025E" />
+    <public type="drawable" name="exo_styled_controls_fastforward" id="0x7F08025F" />
+    <public type="drawable" name="exo_styled_controls_fullscreen_enter" id="0x7F080260" />
+    <public type="drawable" name="exo_styled_controls_fullscreen_exit" id="0x7F080261" />
+    <public type="drawable" name="exo_styled_controls_next" id="0x7F080262" />
+    <public type="drawable" name="exo_styled_controls_overflow_hide" id="0x7F080263" />
+    <public type="drawable" name="exo_styled_controls_overflow_show" id="0x7F080264" />
+    <public type="drawable" name="exo_styled_controls_pause" id="0x7F080265" />
+    <public type="drawable" name="exo_styled_controls_play" id="0x7F080266" />
+    <public type="drawable" name="exo_styled_controls_previous" id="0x7F080267" />
+    <public type="drawable" name="exo_styled_controls_repeat_all" id="0x7F080268" />
+    <public type="drawable" name="exo_styled_controls_repeat_off" id="0x7F080269" />
+    <public type="drawable" name="exo_styled_controls_repeat_one" id="0x7F08026A" />
+    <public type="drawable" name="exo_styled_controls_rewind" id="0x7F08026B" />
+    <public type="drawable" name="exo_styled_controls_settings" id="0x7F08026C" />
+    <public type="drawable" name="exo_styled_controls_shuffle_off" id="0x7F08026D" />
+    <public type="drawable" name="exo_styled_controls_shuffle_on" id="0x7F08026E" />
+    <public type="drawable" name="exo_styled_controls_speed" id="0x7F08026F" />
+    <public type="drawable" name="exo_styled_controls_subtitle_off" id="0x7F080270" />
+    <public type="drawable" name="exo_styled_controls_subtitle_on" id="0x7F080271" />
+    <public type="drawable" name="exo_styled_controls_vr" id="0x7F080272" />
+    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7F080273" />
+    <public type="drawable" name="gif" id="0x7F080274" />
+    <public type="drawable" name="googleg_disabled_color_18" id="0x7F080275" />
+    <public type="drawable" name="googleg_standard_color_18" id="0x7F080276" />
+    <public type="drawable" name="gradient_transparent_colorbackgroundsecondary" id="0x7F080277" />
+    <public type="drawable" name="ic_accessibility_24dp" id="0x7F080278" />
+    <public type="drawable" name="ic_account_bnet" id="0x7F080279" />
+    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7F08027A" />
+    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7F08027B" />
+    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7F08027C" />
+    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7F08027D" />
+    <public type="drawable" name="ic_account_facebook" id="0x7F08027E" />
+    <public type="drawable" name="ic_account_github" id="0x7F08027F" />
+    <public type="drawable" name="ic_account_google" id="0x7F080280" />
+    <public type="drawable" name="ic_account_lol" id="0x7F080281" />
+    <public type="drawable" name="ic_account_microsoft" id="0x7F080282" />
+    <public type="drawable" name="ic_account_obs" id="0x7F080283" />
+    <public type="drawable" name="ic_account_patreon" id="0x7F080284" />
+    <public type="drawable" name="ic_account_reddit" id="0x7F080285" />
+    <public type="drawable" name="ic_account_skype" id="0x7F080286" />
+    <public type="drawable" name="ic_account_spotify" id="0x7F080287" />
+    <public type="drawable" name="ic_account_steam" id="0x7F080288" />
+    <public type="drawable" name="ic_account_twitch" id="0x7F080289" />
+    <public type="drawable" name="ic_account_twitter" id="0x7F08028A" />
+    <public type="drawable" name="ic_account_xbox" id="0x7F08028B" />
+    <public type="drawable" name="ic_account_xsplit" id="0x7F08028C" />
+    <public type="drawable" name="ic_account_youtube" id="0x7F08028D" />
+    <public type="drawable" name="ic_activity_status_24dp" id="0x7F08028E" />
+    <public type="drawable" name="ic_add_24dp" id="0x7F08028F" />
+    <public type="drawable" name="ic_add_circle" id="0x7F080290" />
+    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7F080291" />
+    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7F080292" />
+    <public type="drawable" name="ic_add_friend_green_check" id="0x7F080293" />
+    <public type="drawable" name="ic_add_friend_plus" id="0x7F080294" />
+    <public type="drawable" name="ic_add_friend_send" id="0x7F080295" />
+    <public type="drawable" name="ic_add_person_16dp" id="0x7F080296" />
+    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7F080297" />
+    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7F080298" />
+    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7F080299" />
+    <public type="drawable" name="ic_add_white_24dp" id="0x7F08029A" />
+    <public type="drawable" name="ic_alert_circle_16dp" id="0x7F08029B" />
+    <public type="drawable" name="ic_analytics_16dp" id="0x7F08029C" />
+    <public type="drawable" name="ic_application_status_approved" id="0x7F08029D" />
+    <public type="drawable" name="ic_application_status_pending" id="0x7F08029E" />
+    <public type="drawable" name="ic_application_status_rejected" id="0x7F08029F" />
+    <public type="drawable" name="ic_application_status_started" id="0x7F0802A0" />
+    <public type="drawable" name="ic_archived_clock_dark" id="0x7F0802A1" />
+    <public type="drawable" name="ic_archived_clock_light" id="0x7F0802A2" />
+    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7F0802A3" />
+    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7F0802A4" />
+    <public type="drawable" name="ic_arrow_down" id="0x7F0802A5" />
+    <public type="drawable" name="ic_arrow_down_14dp" id="0x7F0802A6" />
+    <public type="drawable" name="ic_arrow_down_24dp" id="0x7F0802A7" />
+    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7F0802A8" />
+    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7F0802A9" />
+    <public type="drawable" name="ic_arrow_end_24dp" id="0x7F0802AA" />
+    <public type="drawable" name="ic_arrow_right" id="0x7F0802AB" />
+    <public type="drawable" name="ic_arrow_right_24dp" id="0x7F0802AC" />
+    <public type="drawable" name="ic_arrow_up_24dp" id="0x7F0802AD" />
+    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7F0802AE" />
+    <public type="drawable" name="ic_attachment_white_24dp" id="0x7F0802AF" />
+    <public type="drawable" name="ic_audio_output_bluetooth_white_24dp" id="0x7F0802B0" />
+    <public type="drawable" name="ic_audio_output_white_24dp" id="0x7F0802B1" />
+    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7F0802B2" />
+    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7F0802B3" />
+    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7F0802B4" />
+    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7F0802B5" />
+    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7F0802B6" />
+    <public type="drawable" name="ic_audit_calendar_grey_24dp" id="0x7F0802B7" />
+    <public type="drawable" name="ic_audit_calendar_white_24dp" id="0x7F0802B8" />
+    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7F0802B9" />
+    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7F0802BA" />
+    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7F0802BB" />
+    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7F0802BC" />
+    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7F0802BD" />
+    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7F0802BE" />
+    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7F0802BF" />
+    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7F0802C0" />
+    <public type="drawable" name="ic_audit_integrations_grey_24dp" id="0x7F0802C1" />
+    <public type="drawable" name="ic_audit_integrations_white_24dp" id="0x7F0802C2" />
+    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7F0802C3" />
+    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7F0802C4" />
+    <public type="drawable" name="ic_audit_logs_24dp" id="0x7F0802C5" />
+    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7F0802C6" />
+    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7F0802C7" />
+    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7F0802C8" />
+    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7F0802C9" />
+    <public type="drawable" name="ic_audit_stage_instance_grey_24dp" id="0x7F0802CA" />
+    <public type="drawable" name="ic_audit_stage_instance_white_24dp" id="0x7F0802CB" />
+    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7F0802CC" />
+    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7F0802CD" />
+    <public type="drawable" name="ic_authed_apps_24dp" id="0x7F0802CE" />
+    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7F0802CF" />
+    <public type="drawable" name="ic_backspace_white_24dp" id="0x7F0802D0" />
+    <public type="drawable" name="ic_ban_red_24dp" id="0x7F0802D1" />
+    <public type="drawable" name="ic_behavior_24dp" id="0x7F0802D2" />
+    <public type="drawable" name="ic_billing_24dp" id="0x7F0802D3" />
+    <public type="drawable" name="ic_blocked_12dp" id="0x7F0802D4" />
+    <public type="drawable" name="ic_bluetooth_24dp" id="0x7F0802D5" />
+    <public type="drawable" name="ic_bnet_white_24dp" id="0x7F0802D6" />
+    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7F0802D7" />
+    <public type="drawable" name="ic_boosted_badge_18dp" id="0x7F0802D8" />
+    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7F0802D9" />
+    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7F0802DA" />
+    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7F0802DB" />
+    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7F0802DC" />
+    <public type="drawable" name="ic_booster_profile_badge_24dp" id="0x7F0802DD" />
+    <public type="drawable" name="ic_call_24dp" id="0x7F0802DE" />
+    <public type="drawable" name="ic_call_disconnect_24dp" id="0x7F0802DF" />
+    <public type="drawable" name="ic_call_indicator_mobile_screenshare_16dp" id="0x7F0802E0" />
+    <public type="drawable" name="ic_call_indicator_streaming_16dp" id="0x7F0802E1" />
+    <public type="drawable" name="ic_call_indicator_voice_16dp" id="0x7F0802E2" />
+    <public type="drawable" name="ic_call_invite_icon" id="0x7F0802E3" />
+    <public type="drawable" name="ic_call_toolbar_icon_camera_swap" id="0x7F0802E4" />
+    <public type="drawable" name="ic_call_toolbar_icon_grid" id="0x7F0802E5" />
+    <public type="drawable" name="ic_call_toolbar_icon_group" id="0x7F0802E6" />
+    <public type="drawable" name="ic_call_toolbar_icon_minimize" id="0x7F0802E7" />
+    <public type="drawable" name="ic_call_toolbar_icon_minimize_cutout" id="0x7F0802E8" />
+    <public type="drawable" name="ic_call_toolbar_stage_minimize" id="0x7F0802E9" />
+    <public type="drawable" name="ic_call_toolbar_stage_minimize_cutout" id="0x7F0802EA" />
+    <public type="drawable" name="ic_camera_24dp" id="0x7F0802EB" />
+    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7F0802EC" />
+    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7F0802ED" />
+    <public type="drawable" name="ic_carot_right_24dp" id="0x7F0802EE" />
+    <public type="drawable" name="ic_category_16dp" id="0x7F0802EF" />
+    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7F0802F0" />
+    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7F0802F1" />
+    <public type="drawable" name="ic_channel_announcements" id="0x7F0802F2" />
+    <public type="drawable" name="ic_channel_announcements_16dp" id="0x7F0802F3" />
+    <public type="drawable" name="ic_channel_announcements_locked" id="0x7F0802F4" />
+    <public type="drawable" name="ic_channel_announcements_nsfw" id="0x7F0802F5" />
+    <public type="drawable" name="ic_channel_announcements_thread" id="0x7F0802F6" />
+    <public type="drawable" name="ic_channel_announcements_thread_locked" id="0x7F0802F7" />
+    <public type="drawable" name="ic_channel_announcements_thread_nsfw" id="0x7F0802F8" />
+    <public type="drawable" name="ic_channel_lock_16dp" id="0x7F0802F9" />
+    <public type="drawable" name="ic_channel_pinned_message" id="0x7F0802FA" />
+    <public type="drawable" name="ic_channel_stage_16dp" id="0x7F0802FB" />
+    <public type="drawable" name="ic_channel_stage_24dp" id="0x7F0802FC" />
+    <public type="drawable" name="ic_channel_stage_24dp_gray_a60" id="0x7F0802FD" />
+    <public type="drawable" name="ic_channel_stage_24dp_white" id="0x7F0802FE" />
+    <public type="drawable" name="ic_channel_stage_24dp_white_a60" id="0x7F0802FF" />
+    <public type="drawable" name="ic_channel_stage_locked" id="0x7F080300" />
+    <public type="drawable" name="ic_channel_text" id="0x7F080301" />
+    <public type="drawable" name="ic_channel_text_16dp" id="0x7F080302" />
+    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7F080303" />
+    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7F080304" />
+    <public type="drawable" name="ic_channel_text_locked" id="0x7F080305" />
+    <public type="drawable" name="ic_channel_text_nsfw" id="0x7F080306" />
+    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7F080307" />
+    <public type="drawable" name="ic_channel_topic_ellipsis_dark" id="0x7F080308" />
+    <public type="drawable" name="ic_channel_topic_ellipsis_light" id="0x7F080309" />
+    <public type="drawable" name="ic_channel_voice" id="0x7F08030A" />
+    <public type="drawable" name="ic_channel_voice_16dp" id="0x7F08030B" />
+    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7F08030C" />
+    <public type="drawable" name="ic_channel_voice_locked" id="0x7F08030D" />
+    <public type="drawable" name="ic_channels_24dp" id="0x7F08030E" />
+    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7F08030F" />
+    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7F080310" />
+    <public type="drawable" name="ic_chat_list_actions_add_reaction" id="0x7F080311" />
+    <public type="drawable" name="ic_chat_message_white_24dp" id="0x7F080312" />
+    <public type="drawable" name="ic_check_brand_24dp" id="0x7F080313" />
+    <public type="drawable" name="ic_check_circle_24dp" id="0x7F080314" />
+    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7F080315" />
+    <public type="drawable" name="ic_check_green_24dp" id="0x7F080316" />
+    <public type="drawable" name="ic_check_grey_24dp" id="0x7F080317" />
+    <public type="drawable" name="ic_check_white_24dp" id="0x7F080318" />
+    <public type="drawable" name="ic_checkmark_green_16dp" id="0x7F080319" />
+    <public type="drawable" name="ic_chevron" id="0x7F08031A" />
+    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7F08031B" />
+    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7F08031C" />
+    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7F08031D" />
+    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7F08031E" />
+    <public type="drawable" name="ic_chevron_left_24dp" id="0x7F08031F" />
+    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7F080320" />
+    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7F080321" />
+    <public type="drawable" name="ic_clear_24dp" id="0x7F080322" />
+    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7F080323" />
+    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7F080324" />
+    <public type="drawable" name="ic_clear_white_24dp" id="0x7F080325" />
+    <public type="drawable" name="ic_clock_black_24dp" id="0x7F080326" />
+    <public type="drawable" name="ic_close_24dp" id="0x7F080327" />
+    <public type="drawable" name="ic_close_circle_grey_24dp" id="0x7F080328" />
+    <public type="drawable" name="ic_close_circle_nova_grey_24dp" id="0x7F080329" />
+    <public type="drawable" name="ic_close_grey_24dp" id="0x7F08032A" />
+    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7F08032B" />
+    <public type="drawable" name="ic_close_white_18dp" id="0x7F08032C" />
+    <public type="drawable" name="ic_close_white_24dp" id="0x7F08032D" />
+    <public type="drawable" name="ic_community_24dp" id="0x7F08032E" />
+    <public type="drawable" name="ic_community_update" id="0x7F08032F" />
+    <public type="drawable" name="ic_compass" id="0x7F080330" />
+    <public type="drawable" name="ic_contact_sync_friends_list_upsell" id="0x7F080331" />
+    <public type="drawable" name="ic_contact_sync_white" id="0x7F080332" />
+    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7F080333" />
+    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7F080334" />
+    <public type="drawable" name="ic_controller_24dp" id="0x7F080335" />
+    <public type="drawable" name="ic_copy_24dp" id="0x7F080336" />
+    <public type="drawable" name="ic_creditcard_amex" id="0x7F080337" />
+    <public type="drawable" name="ic_creditcard_discover" id="0x7F080338" />
+    <public type="drawable" name="ic_creditcard_generic" id="0x7F080339" />
+    <public type="drawable" name="ic_creditcard_mastercard" id="0x7F08033A" />
+    <public type="drawable" name="ic_creditcard_paypal" id="0x7F08033B" />
+    <public type="drawable" name="ic_creditcard_visa" id="0x7F08033C" />
+    <public type="drawable" name="ic_crown_16dp" id="0x7F08033D" />
+    <public type="drawable" name="ic_crown_24dp" id="0x7F08033E" />
+    <public type="drawable" name="ic_deafen_state_dark" id="0x7F08033F" />
+    <public type="drawable" name="ic_deafen_state_light" id="0x7F080340" />
+    <public type="drawable" name="ic_deafen_v2_deafened" id="0x7F080341" />
+    <public type="drawable" name="ic_deafen_v2_red_strike_primary_dark_300" id="0x7F080342" />
+    <public type="drawable" name="ic_deafen_v2_red_strike_primary_light_600" id="0x7F080343" />
+    <public type="drawable" name="ic_delete_24dp" id="0x7F080344" />
+    <public type="drawable" name="ic_delete_circle" id="0x7F080345" />
+    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7F080346" />
+    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7F080347" />
+    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7F080348" />
+    <public type="drawable" name="ic_delete_white_24dp" id="0x7F080349" />
+    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7F08034A" />
+    <public type="drawable" name="ic_diag_link_24dp" id="0x7F08034B" />
+    <public type="drawable" name="ic_direct_message_header" id="0x7F08034C" />
+    <public type="drawable" name="ic_directory_selected_background" id="0x7F08034D" />
+    <public type="drawable" name="ic_directory_selector_background" id="0x7F08034E" />
+    <public type="drawable" name="ic_done_activated_24dp" id="0x7F08034F" />
+    <public type="drawable" name="ic_done_green_24dp" id="0x7F080350" />
+    <public type="drawable" name="ic_double_carot_right_16dp" id="0x7F080351" />
+    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7F080352" />
+    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7F080353" />
+    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7F080354" />
+    <public type="drawable" name="ic_edit_24dp" id="0x7F080355" />
+    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7F080356" />
+    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7F080357" />
+    <public type="drawable" name="ic_email_verification_24dp" id="0x7F080358" />
+    <public type="drawable" name="ic_embed_white_24dp" id="0x7F080359" />
+    <public type="drawable" name="ic_emoji_24dp" id="0x7F08035A" />
+    <public type="drawable" name="ic_emoji_blue_24dp" id="0x7F08035B" />
+    <public type="drawable" name="ic_emoji_picker_category_activity" id="0x7F08035C" />
+    <public type="drawable" name="ic_emoji_picker_category_custom" id="0x7F08035D" />
+    <public type="drawable" name="ic_emoji_picker_category_favorites_star" id="0x7F08035E" />
+    <public type="drawable" name="ic_emoji_picker_category_flags" id="0x7F08035F" />
+    <public type="drawable" name="ic_emoji_picker_category_food" id="0x7F080360" />
+    <public type="drawable" name="ic_emoji_picker_category_nature" id="0x7F080361" />
+    <public type="drawable" name="ic_emoji_picker_category_objects" id="0x7F080362" />
+    <public type="drawable" name="ic_emoji_picker_category_people" id="0x7F080363" />
+    <public type="drawable" name="ic_emoji_picker_category_recent" id="0x7F080364" />
+    <public type="drawable" name="ic_emoji_picker_category_symbols" id="0x7F080365" />
+    <public type="drawable" name="ic_emoji_picker_category_travel" id="0x7F080366" />
+    <public type="drawable" name="ic_empty_server_settings_integrations_dark" id="0x7F080367" />
+    <public type="drawable" name="ic_empty_server_settings_integrations_light" id="0x7F080368" />
+    <public type="drawable" name="ic_exit_24dp" id="0x7F080369" />
+    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7F08036A" />
+    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7F08036B" />
+    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7F08036C" />
+    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7F08036D" />
+    <public type="drawable" name="ic_expression_icon_cutout_24dp" id="0x7F08036E" />
+    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_100" id="0x7F08036F" />
+    <public type="drawable" name="ic_expression_picker_item_placeholder_primary_500" id="0x7F080370" />
+    <public type="drawable" name="ic_expression_search_empty_dark" id="0x7F080371" />
+    <public type="drawable" name="ic_expression_search_empty_light" id="0x7F080372" />
+    <public type="drawable" name="ic_facebook_white_18dp" id="0x7F080373" />
+    <public type="drawable" name="ic_facebook_white_24dp" id="0x7F080374" />
+    <public type="drawable" name="ic_feedback_happy" id="0x7F080375" />
+    <public type="drawable" name="ic_feedback_happy_desaturated_dark" id="0x7F080376" />
+    <public type="drawable" name="ic_feedback_happy_desaturated_light" id="0x7F080377" />
+    <public type="drawable" name="ic_feedback_neutral" id="0x7F080378" />
+    <public type="drawable" name="ic_feedback_neutral_desaturated_dark" id="0x7F080379" />
+    <public type="drawable" name="ic_feedback_neutral_desaturated_light" id="0x7F08037A" />
+    <public type="drawable" name="ic_feedback_sad" id="0x7F08037B" />
+    <public type="drawable" name="ic_feedback_sad_desaturated_dark" id="0x7F08037C" />
+    <public type="drawable" name="ic_feedback_sad_desaturated_light" id="0x7F08037D" />
+    <public type="drawable" name="ic_file_acrobat" id="0x7F08037E" />
+    <public type="drawable" name="ic_file_ae" id="0x7F08037F" />
+    <public type="drawable" name="ic_file_ai" id="0x7F080380" />
+    <public type="drawable" name="ic_file_archive" id="0x7F080381" />
+    <public type="drawable" name="ic_file_audio" id="0x7F080382" />
+    <public type="drawable" name="ic_file_code" id="0x7F080383" />
+    <public type="drawable" name="ic_file_document" id="0x7F080384" />
+    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7F080385" />
+    <public type="drawable" name="ic_file_download_white_24dp" id="0x7F080386" />
+    <public type="drawable" name="ic_file_large_code" id="0x7F080387" />
+    <public type="drawable" name="ic_file_large_document" id="0x7F080388" />
+    <public type="drawable" name="ic_file_large_video" id="0x7F080389" />
+    <public type="drawable" name="ic_file_ps" id="0x7F08038A" />
+    <public type="drawable" name="ic_file_sketch" id="0x7F08038B" />
+    <public type="drawable" name="ic_file_spreadsheet" id="0x7F08038C" />
+    <public type="drawable" name="ic_file_unknown" id="0x7F08038D" />
+    <public type="drawable" name="ic_file_upload_24dp" id="0x7F08038E" />
+    <public type="drawable" name="ic_file_video" id="0x7F08038F" />
+    <public type="drawable" name="ic_file_webcode" id="0x7F080390" />
+    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7F080391" />
+    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7F080392" />
+    <public type="drawable" name="ic_flag_24dp" id="0x7F080393" />
+    <public type="drawable" name="ic_flash_auto_24dp" id="0x7F080394" />
+    <public type="drawable" name="ic_flash_off_24dp" id="0x7F080395" />
+    <public type="drawable" name="ic_flash_on_24dp" id="0x7F080396" />
+    <public type="drawable" name="ic_flash_torch_24dp" id="0x7F080397" />
+    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_dark" id="0x7F080398" />
+    <public type="drawable" name="ic_flex_input_add_a_photo_24dp_light" id="0x7F080399" />
+    <public type="drawable" name="ic_flex_input_audio_24dp_dark" id="0x7F08039A" />
+    <public type="drawable" name="ic_flex_input_audio_24dp_light" id="0x7F08039B" />
+    <public type="drawable" name="ic_flex_input_file_24dp_dark" id="0x7F08039C" />
+    <public type="drawable" name="ic_flex_input_file_24dp_light" id="0x7F08039D" />
+    <public type="drawable" name="ic_flex_input_image_24dp_dark" id="0x7F08039E" />
+    <public type="drawable" name="ic_flex_input_image_24dp_light" id="0x7F08039F" />
+    <public type="drawable" name="ic_flex_input_movie_24dp_dark" id="0x7F0803A0" />
+    <public type="drawable" name="ic_flex_input_movie_24dp_light" id="0x7F0803A1" />
+    <public type="drawable" name="ic_gallery_24dp" id="0x7F0803A2" />
+    <public type="drawable" name="ic_games_24dp" id="0x7F0803A3" />
+    <public type="drawable" name="ic_gem_tier_1" id="0x7F0803A4" />
+    <public type="drawable" name="ic_gem_tier_2" id="0x7F0803A5" />
+    <public type="drawable" name="ic_gem_tier_3" id="0x7F0803A6" />
+    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7F0803A7" />
+    <public type="drawable" name="ic_gift_24dp" id="0x7F0803A8" />
+    <public type="drawable" name="ic_github_white" id="0x7F0803A9" />
+    <public type="drawable" name="ic_globe_24dp" id="0x7F0803AA" />
+    <public type="drawable" name="ic_globe_32dp" id="0x7F0803AB" />
+    <public type="drawable" name="ic_google_auth_logo" id="0x7F0803AC" />
+    <public type="drawable" name="ic_google_white_24dp" id="0x7F0803AD" />
+    <public type="drawable" name="ic_group_add_white_24dp" id="0x7F0803AE" />
+    <public type="drawable" name="ic_group_edit" id="0x7F0803AF" />
+    <public type="drawable" name="ic_group_join" id="0x7F0803B0" />
+    <public type="drawable" name="ic_group_leave" id="0x7F0803B1" />
+    <public type="drawable" name="ic_group_message_header" id="0x7F0803B2" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7F0803B3" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7F0803B4" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7F0803B5" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7F0803B6" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7F0803B7" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7F0803B8" />
+    <public type="drawable" name="ic_guild_folder" id="0x7F0803B9" />
+    <public type="drawable" name="ic_guild_invite_24dp" id="0x7F0803BA" />
+    <public type="drawable" name="ic_guild_list_dms_24dp" id="0x7F0803BB" />
+    <public type="drawable" name="ic_guild_list_pending_folder" id="0x7F0803BC" />
+    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7F0803BD" />
+    <public type="drawable" name="ic_guild_nitro_progress" id="0x7F0803BE" />
+    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7F0803BF" />
+    <public type="drawable" name="ic_guild_notifications_24dp" id="0x7F0803C0" />
+    <public type="drawable" name="ic_guild_settings_24dp" id="0x7F0803C1" />
+    <public type="drawable" name="ic_guild_welcome_add_friend" id="0x7F0803C2" />
+    <public type="drawable" name="ic_guild_welcome_personalize" id="0x7F0803C3" />
+    <public type="drawable" name="ic_hammer_24dp" id="0x7F0803C4" />
+    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7F0803C5" />
+    <public type="drawable" name="ic_headset_10dp" id="0x7F0803C6" />
+    <public type="drawable" name="ic_headset_24dp" id="0x7F0803C7" />
+    <public type="drawable" name="ic_headset_blue_24dp" id="0x7F0803C8" />
+    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7F0803C9" />
+    <public type="drawable" name="ic_headset_deafened_grey_a60_24dp" id="0x7F0803CA" />
+    <public type="drawable" name="ic_headset_deafened_interactiveactive_dark_24dp" id="0x7F0803CB" />
+    <public type="drawable" name="ic_headset_deafened_interactiveactive_light_24dp" id="0x7F0803CC" />
+    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7F0803CD" />
+    <public type="drawable" name="ic_headset_deafened_white_a60_24dp" id="0x7F0803CE" />
+    <public type="drawable" name="ic_headset_grey_24dp" id="0x7F0803CF" />
+    <public type="drawable" name="ic_headset_grey_a60_24dp" id="0x7F0803D0" />
+    <public type="drawable" name="ic_headset_interactivenormal_dark_24dp" id="0x7F0803D1" />
+    <public type="drawable" name="ic_headset_interactivenormal_light_24dp" id="0x7F0803D2" />
+    <public type="drawable" name="ic_headset_white_18dp" id="0x7F0803D3" />
+    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7F0803D4" />
+    <public type="drawable" name="ic_headset_white_24dp" id="0x7F0803D5" />
+    <public type="drawable" name="ic_headset_white_a60_24dp" id="0x7F0803D6" />
+    <public type="drawable" name="ic_help_24dp" id="0x7F0803D7" />
+    <public type="drawable" name="ic_history_white_24dp" id="0x7F0803D8" />
+    <public type="drawable" name="ic_hour_glass_10dp" id="0x7F0803D9" />
+    <public type="drawable" name="ic_house_24dp" id="0x7F0803DA" />
+    <public type="drawable" name="ic_hub_24dp" id="0x7F0803DB" />
+    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7F0803DC" />
+    <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7F0803DD" />
+    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7F0803DE" />
+    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7F0803DF" />
+    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7F0803E0" />
+    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7F0803E1" />
+    <public type="drawable" name="ic_image_library_24dp" id="0x7F0803E2" />
+    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7F0803E3" />
+    <public type="drawable" name="ic_img_selected_light_theme" id="0x7F0803E4" />
+    <public type="drawable" name="ic_increased_max_guilds_24dp" id="0x7F0803E5" />
+    <public type="drawable" name="ic_increased_message_length_24dp" id="0x7F0803E6" />
+    <public type="drawable" name="ic_info_24dp" id="0x7F0803E7" />
+    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7F0803E8" />
+    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7F0803E9" />
+    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7F0803EA" />
+    <public type="drawable" name="ic_instagram_white_18dp" id="0x7F0803EB" />
+    <public type="drawable" name="ic_keyboard_24dp" id="0x7F0803EC" />
+    <public type="drawable" name="ic_keyboard_black_24dp" id="0x7F0803ED" />
+    <public type="drawable" name="ic_krisp_logo_dark" id="0x7F0803EE" />
+    <public type="drawable" name="ic_krisp_logo_light" id="0x7F0803EF" />
+    <public type="drawable" name="ic_launch_24dp" id="0x7F0803F0" />
+    <public type="drawable" name="ic_link_white_24dp" id="0x7F0803F1" />
+    <public type="drawable" name="ic_locale_24dp" id="0x7F0803F2" />
+    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7F0803F3" />
+    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7F0803F4" />
+    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7F0803F5" />
+    <public type="drawable" name="ic_logo" id="0x7F0803F6" />
+    <public type="drawable" name="ic_lol_white_24dp" id="0x7F0803F7" />
+    <public type="drawable" name="ic_mail_24dp" id="0x7F0803F8" />
+    <public type="drawable" name="ic_mark_unread_24dp" id="0x7F0803F9" />
+    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7F0803FA" />
+    <public type="drawable" name="ic_member_verification_chat_guard_cta" id="0x7F0803FB" />
+    <public type="drawable" name="ic_member_verification_pending" id="0x7F0803FC" />
+    <public type="drawable" name="ic_members_24dp" id="0x7F0803FD" />
+    <public type="drawable" name="ic_mentions_empty" id="0x7F0803FE" />
+    <public type="drawable" name="ic_mentions_white_24dp" id="0x7F0803FF" />
+    <public type="drawable" name="ic_menu_24dp" id="0x7F080400" />
+    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7F080401" />
+    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7F080402" />
+    <public type="drawable" name="ic_mic_grey_24dp" id="0x7F080403" />
+    <public type="drawable" name="ic_mic_grey_a60_24dp" id="0x7F080404" />
+    <public type="drawable" name="ic_mic_interactivenormal_dark_24dp" id="0x7F080405" />
+    <public type="drawable" name="ic_mic_interactivenormal_light_24dp" id="0x7F080406" />
+    <public type="drawable" name="ic_mic_mute_red_strike_24dp" id="0x7F080407" />
+    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7F080408" />
+    <public type="drawable" name="ic_mic_muted_grey_a60_24dp" id="0x7F080409" />
+    <public type="drawable" name="ic_mic_muted_interactiveactive_dark_24dp" id="0x7F08040A" />
+    <public type="drawable" name="ic_mic_muted_interactiveactive_light_24dp" id="0x7F08040B" />
+    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7F08040C" />
+    <public type="drawable" name="ic_mic_muted_white_a60_24dp" id="0x7F08040D" />
+    <public type="drawable" name="ic_mic_state_dark" id="0x7F08040E" />
+    <public type="drawable" name="ic_mic_state_light" id="0x7F08040F" />
+    <public type="drawable" name="ic_mic_white_18dp" id="0x7F080410" />
+    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7F080411" />
+    <public type="drawable" name="ic_mic_white_24dp" id="0x7F080412" />
+    <public type="drawable" name="ic_mic_white_a60_24dp" id="0x7F080413" />
+    <public type="drawable" name="ic_mobile" id="0x7F080414" />
+    <public type="drawable" name="ic_mobile_screenshare_24dp" id="0x7F080415" />
+    <public type="drawable" name="ic_mobile_screenshare_end_24dp" id="0x7F080416" />
+    <public type="drawable" name="ic_moderator_shield_24dp" id="0x7F080417" />
+    <public type="drawable" name="ic_monitor_white_24dp" id="0x7F080418" />
+    <public type="drawable" name="ic_more_options_with_circular_background" id="0x7F080419" />
+    <public type="drawable" name="ic_more_primary100_24dp" id="0x7F08041A" />
+    <public type="drawable" name="ic_more_primary900_24dp" id="0x7F08041B" />
+    <public type="drawable" name="ic_mtrl_checked_circle" id="0x7F08041C" />
+    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7F08041D" />
+    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7F08041E" />
+    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7F08041F" />
+    <public type="drawable" name="ic_mute_v2_muted" id="0x7F080420" />
+    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_dark_300" id="0x7F080421" />
+    <public type="drawable" name="ic_mute_v2_muted_red_strike_primary_light_600" id="0x7F080422" />
+    <public type="drawable" name="ic_my_account_24dp" id="0x7F080423" />
+    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7F080424" />
+    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7F080425" />
+    <public type="drawable" name="ic_network_airplane_mode" id="0x7F080426" />
+    <public type="drawable" name="ic_network_airplane_mode_light" id="0x7F080427" />
+    <public type="drawable" name="ic_network_connecting_animated_vector" id="0x7F080428" />
+    <public type="drawable" name="ic_network_connecting_animated_vector_light" id="0x7F080429" />
+    <public type="drawable" name="ic_network_offline" id="0x7F08042A" />
+    <public type="drawable" name="ic_network_offline_light" id="0x7F08042B" />
+    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7F08042C" />
+    <public type="drawable" name="ic_nitro_badge_white" id="0x7F08042D" />
+    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7F08042E" />
+    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7F08042F" />
+    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7F080430" />
+    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7F080431" />
+    <public type="drawable" name="ic_nitro_rep" id="0x7F080432" />
+    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7F080433" />
+    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7F080434" />
+    <public type="drawable" name="ic_noise_cancellation_active_24dp" id="0x7F080435" />
+    <public type="drawable" name="ic_noise_cancellation_disabled_24dp" id="0x7F080436" />
+    <public type="drawable" name="ic_notification_24dp" id="0x7F080437" />
+    <public type="drawable" name="ic_notification_call_24dp" id="0x7F080438" />
+    <public type="drawable" name="ic_notification_friends_24dp" id="0x7F080439" />
+    <public type="drawable" name="ic_notification_message_24dp" id="0x7F08043A" />
+    <public type="drawable" name="ic_notification_settings_24dp" id="0x7F08043B" />
+    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7F08043C" />
+    <public type="drawable" name="ic_notifications_off_grey_24dp" id="0x7F08043D" />
+    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7F08043E" />
+    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7F08043F" />
+    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7F080440" />
+    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7F080441" />
+    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7F080442" />
+    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7F080443" />
+    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7F080444" />
+    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7F080445" />
+    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7F080446" />
+    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7F080447" />
+    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7F080448" />
+    <public type="drawable" name="ic_overflow_dark_24dp" id="0x7F080449" />
+    <public type="drawable" name="ic_overflow_light_24dp" id="0x7F08044A" />
+    <public type="drawable" name="ic_partnered_badge" id="0x7F08044B" />
+    <public type="drawable" name="ic_partnered_badge_banner" id="0x7F08044C" />
+    <public type="drawable" name="ic_people_white_24dp" id="0x7F08044D" />
+    <public type="drawable" name="ic_perk_lock" id="0x7F08044E" />
+    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7F08044F" />
+    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7F080450" />
+    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7F080451" />
+    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7F080452" />
+    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7F080453" />
+    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7F080454" />
+    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7F080455" />
+    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7F080456" />
+    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7F080457" />
+    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7F080458" />
+    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7F080459" />
+    <public type="drawable" name="ic_person_shield_24dp" id="0x7F08045A" />
+    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7F08045B" />
+    <public type="drawable" name="ic_phone_24dp" id="0x7F08045C" />
+    <public type="drawable" name="ic_phone_verification_24dp" id="0x7F08045D" />
+    <public type="drawable" name="ic_phonelink_24dp" id="0x7F08045E" />
+    <public type="drawable" name="ic_photo_grey_24dp" id="0x7F08045F" />
+    <public type="drawable" name="ic_pin_24dp" id="0x7F080460" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_1" id="0x7F080461" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_10" id="0x7F080462" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_13" id="0x7F080463" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_2" id="0x7F080464" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_28" id="0x7F080465" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_3" id="0x7F080466" />
+    <public type="drawable" name="ic_plan_premium_and_premium_guild_5" id="0x7F080467" />
+    <public type="drawable" name="ic_plan_premium_guild_1" id="0x7F080468" />
+    <public type="drawable" name="ic_plan_premium_guild_2" id="0x7F080469" />
+    <public type="drawable" name="ic_plan_premium_tier_1" id="0x7F08046A" />
+    <public type="drawable" name="ic_plan_premium_tier_1_and_premium_guild_1" id="0x7F08046B" />
+    <public type="drawable" name="ic_plan_premium_tier_1_year" id="0x7F08046C" />
+    <public type="drawable" name="ic_plan_premium_tier_2" id="0x7F08046D" />
+    <public type="drawable" name="ic_plan_premium_tier_2_year" id="0x7F08046E" />
+    <public type="drawable" name="ic_play_arrow_24dp" id="0x7F08046F" />
+    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7F080470" />
+    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7F080471" />
+    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7F080472" />
+    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7F080473" />
+    <public type="drawable" name="ic_privacy_24dp" id="0x7F080474" />
+    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7F080475" />
+    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7F080476" />
+    <public type="drawable" name="ic_profile_24dp" id="0x7F080477" />
+    <public type="drawable" name="ic_profile_badge_bughunter_level_1_32dp" id="0x7F080478" />
+    <public type="drawable" name="ic_profile_badge_bughunter_level_2_32dp" id="0x7F080479" />
+    <public type="drawable" name="ic_profile_badge_certified_moderator_32dp" id="0x7F08047A" />
+    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7F08047B" />
+    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7F08047C" />
+    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7F08047D" />
+    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7F08047E" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7F08047F" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7F080480" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7F080481" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7F080482" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7F080483" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7F080484" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7F080485" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7F080486" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7F080487" />
+    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7F080488" />
+    <public type="drawable" name="ic_profile_badge_verified_developer_32dp" id="0x7F080489" />
+    <public type="drawable" name="ic_publish_24dp" id="0x7F08048A" />
+    <public type="drawable" name="ic_qr_code_24dp" id="0x7F08048B" />
+    <public type="drawable" name="ic_quote_grey_a60_24dp" id="0x7F08048C" />
+    <public type="drawable" name="ic_quote_white_a60_24dp" id="0x7F08048D" />
+    <public type="drawable" name="ic_raised_hand_action_24dp" id="0x7F08048E" />
+    <public type="drawable" name="ic_reaction_24dp" id="0x7F08048F" />
+    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7F080490" />
+    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7F080491" />
+    <public type="drawable" name="ic_recent_24dp" id="0x7F080492" />
+    <public type="drawable" name="ic_recent_grey_a60_24dp" id="0x7F080493" />
+    <public type="drawable" name="ic_recent_white_a60_24dp" id="0x7F080494" />
+    <public type="drawable" name="ic_reddit_white_24dp" id="0x7F080495" />
+    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7F080496" />
+    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7F080497" />
+    <public type="drawable" name="ic_reminder_notification" id="0x7F080498" />
+    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7F080499" />
+    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7F08049A" />
+    <public type="drawable" name="ic_remove_reaction_24dp" id="0x7F08049B" />
+    <public type="drawable" name="ic_removed_sticker_72dp" id="0x7F08049C" />
+    <public type="drawable" name="ic_reply_24dp" id="0x7F08049D" />
+    <public type="drawable" name="ic_resend_24dp" id="0x7F08049E" />
+    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7F08049F" />
+    <public type="drawable" name="ic_role_24dp" id="0x7F0804A0" />
+    <public type="drawable" name="ic_role_lock" id="0x7F0804A1" />
+    <public type="drawable" name="ic_role_pink_24dp" id="0x7F0804A2" />
+    <public type="drawable" name="ic_screen_14dp" id="0x7F0804A3" />
+    <public type="drawable" name="ic_search" id="0x7F0804A4" />
+    <public type="drawable" name="ic_search_16dp" id="0x7F0804A5" />
+    <public type="drawable" name="ic_search_grey_24dp" id="0x7F0804A6" />
+    <public type="drawable" name="ic_search_white_24dp" id="0x7F0804A7" />
+    <public type="drawable" name="ic_security_24dp" id="0x7F0804A8" />
+    <public type="drawable" name="ic_send_24dp" id="0x7F0804A9" />
+    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7F0804AA" />
+    <public type="drawable" name="ic_send_white_24dp" id="0x7F0804AB" />
+    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7F0804AC" />
+    <public type="drawable" name="ic_settings_24dp" id="0x7F0804AD" />
+    <public type="drawable" name="ic_settings_boost_24dp" id="0x7F0804AE" />
+    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7F0804AF" />
+    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7F0804B0" />
+    <public type="drawable" name="ic_share_24dp" id="0x7F0804B1" />
+    <public type="drawable" name="ic_share_grey_24dp" id="0x7F0804B2" />
+    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7F0804B3" />
+    <public type="drawable" name="ic_share_white_24dp" id="0x7F0804B4" />
+    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7F0804B5" />
+    <public type="drawable" name="ic_shieldstar_24dp" id="0x7F0804B6" />
+    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7F0804B7" />
+    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7F0804B8" />
+    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7F0804B9" />
+    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7F0804BA" />
+    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7F0804BB" />
+    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7F0804BC" />
+    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7F0804BD" />
+    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7F0804BE" />
+    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7F0804BF" />
+    <public type="drawable" name="ic_skype_white_24dp" id="0x7F0804C0" />
+    <public type="drawable" name="ic_slash_command_24dp" id="0x7F0804C1" />
+    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7F0804C2" />
+    <public type="drawable" name="ic_smile_24dp" id="0x7F0804C3" />
+    <public type="drawable" name="ic_smiley_desaturated" id="0x7F0804C4" />
+    <public type="drawable" name="ic_sort_grey_24dp" id="0x7F0804C5" />
+    <public type="drawable" name="ic_sort_white_24dp" id="0x7F0804C6" />
+    <public type="drawable" name="ic_sound_24dp" id="0x7F0804C7" />
+    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7F0804C8" />
+    <public type="drawable" name="ic_sound_quiet_24dp" id="0x7F0804C9" />
+    <public type="drawable" name="ic_sparkle" id="0x7F0804CA" />
+    <public type="drawable" name="ic_spectate" id="0x7F0804CB" />
+    <public type="drawable" name="ic_spine_long_cap" id="0x7F0804CC" />
+    <public type="drawable" name="ic_spine_long_no_cap" id="0x7F0804CD" />
+    <public type="drawable" name="ic_spine_short_cap" id="0x7F0804CE" />
+    <public type="drawable" name="ic_spine_short_no_cap" id="0x7F0804CF" />
+    <public type="drawable" name="ic_spotify_green_24dp" id="0x7F0804D0" />
+    <public type="drawable" name="ic_spotify_white_24dp" id="0x7F0804D1" />
+    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7F0804D2" />
+    <public type="drawable" name="ic_stage_audience" id="0x7F0804D3" />
+    <public type="drawable" name="ic_stage_invite_speak" id="0x7F0804D4" />
+    <public type="drawable" name="ic_stage_leave_20dp" id="0x7F0804D5" />
+    <public type="drawable" name="ic_stage_move_to_audience" id="0x7F0804D6" />
+    <public type="drawable" name="ic_stage_move_to_speaker" id="0x7F0804D7" />
+    <public type="drawable" name="ic_stage_raised_hand" id="0x7F0804D8" />
+    <public type="drawable" name="ic_stage_raised_hand_24dp_activatable" id="0x7F0804D9" />
+    <public type="drawable" name="ic_stage_raised_hand_green_bg_24dp" id="0x7F0804DA" />
+    <public type="drawable" name="ic_stage_raised_hand_list" id="0x7F0804DB" />
+    <public type="drawable" name="ic_stage_raised_hand_white_bg_24dp" id="0x7F0804DC" />
+    <public type="drawable" name="ic_star_24dp" id="0x7F0804DD" />
+    <public type="drawable" name="ic_status_24dp" id="0x7F0804DE" />
+    <public type="drawable" name="ic_status_dnd_16dp" id="0x7F0804DF" />
+    <public type="drawable" name="ic_status_idle_16dp" id="0x7F0804E0" />
+    <public type="drawable" name="ic_status_invisible_16dp" id="0x7F0804E1" />
+    <public type="drawable" name="ic_status_online_16dp" id="0x7F0804E2" />
+    <public type="drawable" name="ic_status_streaming_16dp" id="0x7F0804E3" />
+    <public type="drawable" name="ic_steam_white_24dp" id="0x7F0804E4" />
+    <public type="drawable" name="ic_sticker_icon_24dp" id="0x7F0804E5" />
+    <public type="drawable" name="ic_sticker_shop_icon_32dp" id="0x7F0804E6" />
+    <public type="drawable" name="ic_sticker_shop_icon_badged_32dp" id="0x7F0804E7" />
+    <public type="drawable" name="ic_stop_stream" id="0x7F0804E8" />
+    <public type="drawable" name="ic_success_discovery" id="0x7F0804E9" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7F0804EA" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7F0804EB" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7F0804EC" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7F0804ED" />
+    <public type="drawable" name="ic_tab_friends" id="0x7F0804EE" />
+    <public type="drawable" name="ic_tab_home" id="0x7F0804EF" />
+    <public type="drawable" name="ic_tab_home_new" id="0x7F0804F0" />
+    <public type="drawable" name="ic_tab_mentions" id="0x7F0804F1" />
+    <public type="drawable" name="ic_tab_search" id="0x7F0804F2" />
+    <public type="drawable" name="ic_take_photo" id="0x7F0804F3" />
+    <public type="drawable" name="ic_template_32dp" id="0x7F0804F4" />
+    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7F0804F5" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7F0804F6" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7F0804F7" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7F0804F8" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7F0804F9" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7F0804FA" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7F0804FB" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7F0804FC" />
+    <public type="drawable" name="ic_text_image_24dp" id="0x7F0804FD" />
+    <public type="drawable" name="ic_theme_24dp" id="0x7F0804FE" />
+    <public type="drawable" name="ic_thread" id="0x7F0804FF" />
+    <public type="drawable" name="ic_thread_locked" id="0x7F080500" />
+    <public type="drawable" name="ic_thread_nsfw" id="0x7F080501" />
+    <public type="drawable" name="ic_timer_dark" id="0x7F080502" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7F080503" />
+    <public type="drawable" name="ic_timer_light" id="0x7F080504" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7F080505" />
+    <public type="drawable" name="ic_tooltip_bottom_tail" id="0x7F080506" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7F080507" />
+    <public type="drawable" name="ic_trash_outline" id="0x7F080508" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7F080509" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7F08050A" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7F08050B" />
+    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7F08050C" />
+    <public type="drawable" name="ic_unban_grey" id="0x7F08050D" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7F08050E" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7F08050F" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7F080510" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7F080511" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7F080512" />
+    <public type="drawable" name="ic_upload_plus_32dp" id="0x7F080513" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7F080514" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7F080515" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7F080516" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7F080517" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7F080518" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7F080519" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7F08051A" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7F08051B" />
+    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7F08051C" />
+    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7F08051D" />
+    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7F08051E" />
+    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7F08051F" />
+    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7F080520" />
+    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7F080521" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7F080522" />
+    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7F080523" />
+    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7F080524" />
+    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7F080525" />
+    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7F080526" />
+    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7F080527" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7F080528" />
+    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7F080529" />
+    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7F08052A" />
+    <public type="drawable" name="ic_verified_10dp" id="0x7F08052B" />
+    <public type="drawable" name="ic_verified_badge" id="0x7F08052C" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7F08052D" />
+    <public type="drawable" name="ic_video_grid_view_grey" id="0x7F08052E" />
+    <public type="drawable" name="ic_video_grid_view_white" id="0x7F08052F" />
+    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7F080530" />
+    <public type="drawable" name="ic_videocam_white_12dp" id="0x7F080531" />
+    <public type="drawable" name="ic_videocam_white_16dp" id="0x7F080532" />
+    <public type="drawable" name="ic_videocam_white_24dp" id="0x7F080533" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7F080534" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7F080535" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7F080536" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7F080537" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7F080538" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7F080539" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7F08053A" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7F08053B" />
+    <public type="drawable" name="ic_voice_settings_24dp" id="0x7F08053C" />
+    <public type="drawable" name="ic_volume_off_24dp" id="0x7F08053D" />
+    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7F08053E" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7F08053F" />
+    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7F080540" />
+    <public type="drawable" name="ic_wand_24dp" id="0x7F080541" />
+    <public type="drawable" name="ic_warning_circle_24dp" id="0x7F080542" />
+    <public type="drawable" name="ic_x_red_24dp" id="0x7F080543" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7F080544" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7F080545" />
+    <public type="drawable" name="icon_carrot" id="0x7F080546" />
+    <public type="drawable" name="icon_flag_au" id="0x7F080547" />
+    <public type="drawable" name="icon_flag_bg" id="0x7F080548" />
+    <public type="drawable" name="icon_flag_cs" id="0x7F080549" />
+    <public type="drawable" name="icon_flag_da" id="0x7F08054A" />
+    <public type="drawable" name="icon_flag_de" id="0x7F08054B" />
+    <public type="drawable" name="icon_flag_el" id="0x7F08054C" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7F08054D" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7F08054E" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7F08054F" />
+    <public type="drawable" name="icon_flag_eu" id="0x7F080550" />
+    <public type="drawable" name="icon_flag_fi" id="0x7F080551" />
+    <public type="drawable" name="icon_flag_fr" id="0x7F080552" />
+    <public type="drawable" name="icon_flag_gb" id="0x7F080553" />
+    <public type="drawable" name="icon_flag_hi" id="0x7F080554" />
+    <public type="drawable" name="icon_flag_hk" id="0x7F080555" />
+    <public type="drawable" name="icon_flag_hr" id="0x7F080556" />
+    <public type="drawable" name="icon_flag_hu" id="0x7F080557" />
+    <public type="drawable" name="icon_flag_it" id="0x7F080558" />
+    <public type="drawable" name="icon_flag_ja" id="0x7F080559" />
+    <public type="drawable" name="icon_flag_ko" id="0x7F08055A" />
+    <public type="drawable" name="icon_flag_lt" id="0x7F08055B" />
+    <public type="drawable" name="icon_flag_nl" id="0x7F08055C" />
+    <public type="drawable" name="icon_flag_no" id="0x7F08055D" />
+    <public type="drawable" name="icon_flag_pl" id="0x7F08055E" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7F08055F" />
+    <public type="drawable" name="icon_flag_ro" id="0x7F080560" />
+    <public type="drawable" name="icon_flag_ru" id="0x7F080561" />
+    <public type="drawable" name="icon_flag_sg" id="0x7F080562" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7F080563" />
+    <public type="drawable" name="icon_flag_th" id="0x7F080564" />
+    <public type="drawable" name="icon_flag_tr" id="0x7F080565" />
+    <public type="drawable" name="icon_flag_uk" id="0x7F080566" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7F080567" />
+    <public type="drawable" name="icon_flag_vi" id="0x7F080568" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7F080569" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7F08056A" />
+    <public type="drawable" name="icon_menu_copy" id="0x7F08056B" />
+    <public type="drawable" name="icon_save" id="0x7F08056C" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7F08056D" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7F08056E" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7F08056F" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7F080570" />
+    <public type="drawable" name="img_age_gate_failure" id="0x7F080571" />
+    <public type="drawable" name="img_age_gate_safety" id="0x7F080572" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7F080573" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7F080574" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7F080575" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7F080576" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7F080577" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7F080578" />
+    <public type="drawable" name="img_badge_upsell" id="0x7F080579" />
+    <public type="drawable" name="img_boost_activated_dark" id="0x7F08057A" />
+    <public type="drawable" name="img_boost_activated_light" id="0x7F08057B" />
+    <public type="drawable" name="img_boost_cancel" id="0x7F08057C" />
+    <public type="drawable" name="img_boost_hands" id="0x7F08057D" />
+    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7F08057E" />
+    <public type="drawable" name="img_channel_following_success_1_light" id="0x7F08057F" />
+    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7F080580" />
+    <public type="drawable" name="img_channel_following_success_2_light" id="0x7F080581" />
+    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7F080582" />
+    <public type="drawable" name="img_channel_following_success_3_light" id="0x7F080583" />
+    <public type="drawable" name="img_channels_onboarding_dark" id="0x7F080584" />
+    <public type="drawable" name="img_channels_onboarding_light" id="0x7F080585" />
+    <public type="drawable" name="img_clyde_empty" id="0x7F080586" />
+    <public type="drawable" name="img_contact_sync_empty_state_upsell" id="0x7F080587" />
+    <public type="drawable" name="img_contact_sync_landing_header" id="0x7F080588" />
+    <public type="drawable" name="img_contact_sync_suggestions_empty_header" id="0x7F080589" />
+    <public type="drawable" name="img_create_stage_choose_server" id="0x7F08058A" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7F08058B" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7F08058C" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7F08058D" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7F08058E" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7F08058F" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7F080590" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7F080591" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7F080592" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7F080593" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7F080594" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7F080595" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7F080596" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7F080597" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7F080598" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7F080599" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7F08059A" />
+    <public type="drawable" name="img_forced_update_light" id="0x7F08059B" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7F08059C" />
+    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7F08059D" />
+    <public type="drawable" name="img_gem_hands_faded_light" id="0x7F08059E" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7F08059F" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7F0805A0" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7F0805A1" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7F0805A2" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7F0805A3" />
+    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7F0805A4" />
+    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7F0805A5" />
+    <public type="drawable" name="img_krisp_onboarding" id="0x7F0805A6" />
+    <public type="drawable" name="img_landing_bg_dark" id="0x7F0805A7" />
+    <public type="drawable" name="img_landing_bg_light" id="0x7F0805A8" />
+    <public type="drawable" name="img_landing_splash" id="0x7F0805A9" />
+    <public type="drawable" name="img_logo" id="0x7F0805AA" />
+    <public type="drawable" name="img_logo_discord" id="0x7F0805AB" />
+    <public type="drawable" name="img_logo_discord_new" id="0x7F0805AC" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7F0805AD" />
+    <public type="drawable" name="img_logo_discord_nitro_and_boost" id="0x7F0805AE" />
+    <public type="drawable" name="img_logo_discord_nitro_and_boost_horizontal" id="0x7F0805AF" />
+    <public type="drawable" name="img_logo_discord_nitro_and_boost_horizontal_new" id="0x7F0805B0" />
+    <public type="drawable" name="img_logo_discord_nitro_and_boost_new" id="0x7F0805B1" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7F0805B2" />
+    <public type="drawable" name="img_logo_discord_nitro_brand_new" id="0x7F0805B3" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7F0805B4" />
+    <public type="drawable" name="img_logo_discord_nitro_new" id="0x7F0805B5" />
+    <public type="drawable" name="img_logo_new" id="0x7F0805B6" />
+    <public type="drawable" name="img_logo_nitro" id="0x7F0805B7" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7F0805B8" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7F0805B9" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7F0805BA" />
+    <public type="drawable" name="img_logo_square" id="0x7F0805BB" />
+    <public type="drawable" name="img_logo_wordmark" id="0x7F0805BC" />
+    <public type="drawable" name="img_logo_wordmark_new" id="0x7F0805BD" />
+    <public type="drawable" name="img_member_verification_denied" id="0x7F0805BE" />
+    <public type="drawable" name="img_member_verification_pending" id="0x7F0805BF" />
+    <public type="drawable" name="img_member_verification_started" id="0x7F0805C0" />
+    <public type="drawable" name="img_mfa_dark" id="0x7F0805C1" />
+    <public type="drawable" name="img_mfa_light" id="0x7F0805C2" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7F0805C3" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7F0805C4" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7F0805C5" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7F0805C6" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7F0805C7" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7F0805C8" />
+    <public type="drawable" name="img_nitro_uncancel" id="0x7F0805C9" />
+    <public type="drawable" name="img_no_gifts" id="0x7F0805CA" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7F0805CB" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7F0805CC" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7F0805CD" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7F0805CE" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7F0805CF" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7F0805D0" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7F0805D1" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7F0805D2" />
+    <public type="drawable" name="img_overlay_nux" id="0x7F0805D3" />
+    <public type="drawable" name="img_permission_prime" id="0x7F0805D4" />
+    <public type="drawable" name="img_plan_activated_dark" id="0x7F0805D5" />
+    <public type="drawable" name="img_plan_activated_light" id="0x7F0805D6" />
+    <public type="drawable" name="img_poop_dark" id="0x7F0805D7" />
+    <public type="drawable" name="img_poop_light" id="0x7F0805D8" />
+    <public type="drawable" name="img_premium_activated_tier_1_dark" id="0x7F0805D9" />
+    <public type="drawable" name="img_premium_activated_tier_1_light" id="0x7F0805DA" />
+    <public type="drawable" name="img_premium_activated_tier_2_dark" id="0x7F0805DB" />
+    <public type="drawable" name="img_premium_activated_tier_2_light" id="0x7F0805DC" />
+    <public type="drawable" name="img_premium_and_premium_guild_subscription_header" id="0x7F0805DD" />
+    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7F0805DE" />
+    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7F0805DF" />
+    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7F0805E0" />
+    <public type="drawable" name="img_premium_classic_subscription_header_logo_new" id="0x7F0805E1" />
+    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7F0805E2" />
+    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7F0805E3" />
+    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7F0805E4" />
+    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7F0805E5" />
+    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7F0805E6" />
+    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_1" id="0x7F0805E7" />
+    <public type="drawable" name="img_premium_guild_subscription_purchase_header_tier_2" id="0x7F0805E8" />
+    <public type="drawable" name="img_premium_stickers_upsell" id="0x7F0805E9" />
+    <public type="drawable" name="img_premium_subscription_header" id="0x7F0805EA" />
+    <public type="drawable" name="img_premium_subscription_header_error" id="0x7F0805EB" />
+    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7F0805EC" />
+    <public type="drawable" name="img_premium_subscription_header_logo_new" id="0x7F0805ED" />
+    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7F0805EE" />
+    <public type="drawable" name="img_profile_banner_value_prop" id="0x7F0805EF" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7F0805F0" />
+    <public type="drawable" name="img_remote_auth_finished" id="0x7F0805F1" />
+    <public type="drawable" name="img_remote_auth_loaded" id="0x7F0805F2" />
+    <public type="drawable" name="img_remote_auth_not_found" id="0x7F0805F3" />
+    <public type="drawable" name="img_report_success_shield" id="0x7F0805F4" />
+    <public type="drawable" name="img_save_your_group" id="0x7F0805F5" />
+    <public type="drawable" name="img_server_boost_long" id="0x7F0805F6" />
+    <public type="drawable" name="img_stickers_search_empty_90dp" id="0x7F0805F7" />
+    <public type="drawable" name="img_tag_upsell" id="0x7F0805F8" />
+    <public type="drawable" name="img_upload_upsell" id="0x7F0805F9" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7F0805FA" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7F0805FB" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7F0805FC" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7F0805FD" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7F0805FE" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7F0805FF" />
+    <public type="drawable" name="img_voice_onboarding" id="0x7F080600" />
+    <public type="drawable" name="img_wump_trash_dark" id="0x7F080601" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7F080602" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7F080603" />
+    <public type="drawable" name="img_wumpus_custom_status" id="0x7F080604" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7F080605" />
+    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7F080606" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7F080607" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7F080608" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7F080609" />
+    <public type="drawable" name="invite_settings_radio_button_dark" id="0x7F08060A" />
+    <public type="drawable" name="invite_settings_radio_button_light" id="0x7F08060B" />
+    <public type="drawable" name="material_cursor_drawable" id="0x7F08060C" />
+    <public type="drawable" name="material_ic_calendar_black_24dp" id="0x7F08060D" />
+    <public type="drawable" name="material_ic_clear_black_24dp" id="0x7F08060E" />
+    <public type="drawable" name="material_ic_edit_black_24dp" id="0x7F08060F" />
+    <public type="drawable" name="material_ic_keyboard_arrow_left_black_24dp" id="0x7F080610" />
+    <public type="drawable" name="material_ic_keyboard_arrow_next_black_24dp" id="0x7F080611" />
+    <public type="drawable" name="material_ic_keyboard_arrow_previous_black_24dp" id="0x7F080612" />
+    <public type="drawable" name="material_ic_keyboard_arrow_right_black_24dp" id="0x7F080613" />
+    <public type="drawable" name="material_ic_menu_arrow_down_black_24dp" id="0x7F080614" />
+    <public type="drawable" name="material_ic_menu_arrow_up_black_24dp" id="0x7F080615" />
+    <public type="drawable" name="mg_profile_banner_value_prop" id="0x7F080616" />
+    <public type="drawable" name="mtrl_dialog_background" id="0x7F080617" />
+    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7F080618" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7F080619" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7F08061A" />
+    <public type="drawable" name="mtrl_ic_cancel" id="0x7F08061B" />
+    <public type="drawable" name="mtrl_ic_error" id="0x7F08061C" />
+    <public type="drawable" name="mtrl_popupmenu_background" id="0x7F08061D" />
+    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7F08061E" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7F08061F" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7F080620" />
+    <public type="drawable" name="notification_action_background" id="0x7F080621" />
+    <public type="drawable" name="notification_bg" id="0x7F080622" />
+    <public type="drawable" name="notification_bg_low" id="0x7F080623" />
+    <public type="drawable" name="notification_bg_low_normal" id="0x7F080624" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7F080625" />
+    <public type="drawable" name="notification_bg_normal" id="0x7F080626" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7F080627" />
+    <public type="drawable" name="notification_icon_background" id="0x7F080628" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7F080629" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7F08062A" />
+    <public type="drawable" name="notification_tile_bg" id="0x7F08062B" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7F08062C" />
+    <public type="drawable" name="preference_list_divider_material" id="0x7F08062D" />
+    <public type="drawable" name="reactions_divider" id="0x7F08062E" />
+    <public type="drawable" name="ripple_brighten" id="0x7F08062F" />
+    <public type="drawable" name="ripple_circle_background_primary" id="0x7F080630" />
+    <public type="drawable" name="ripple_circle_black" id="0x7F080631" />
+    <public type="drawable" name="ripple_circle_red" id="0x7F080632" />
+    <public type="drawable" name="ripple_darken" id="0x7F080633" />
+    <public type="drawable" name="ripple_pill_red" id="0x7F080634" />
+    <public type="drawable" name="ripple_selector_rounded" id="0x7F080635" />
+    <public type="drawable" name="rounded_rectangle_1000dp_radius" id="0x7F080636" />
+    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7F080637" />
+    <public type="drawable" name="rounded_rectangle_8dp_radius" id="0x7F080638" />
+    <public type="drawable" name="screen_share_illustration" id="0x7F080639" />
+    <public type="drawable" name="screen_share_nfx_illustration" id="0x7F08063A" />
+    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7F08063B" />
+    <public type="drawable" name="selectable_feedback_happy_light" id="0x7F08063C" />
+    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7F08063D" />
+    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7F08063E" />
+    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7F08063F" />
+    <public type="drawable" name="selectable_feedback_sad_light" id="0x7F080640" />
+    <public type="drawable" name="sparkle_animated_vector" id="0x7F080641" />
+    <public type="drawable" name="sparkle_yellow_animated_vector" id="0x7F080642" />
+    <public type="drawable" name="stage_channel_audience_notice" id="0x7F080643" />
+    <public type="drawable" name="stage_channel_dot_separator" id="0x7F080644" />
+    <public type="drawable" name="stage_channel_info_separator_dot" id="0x7F080645" />
+    <public type="drawable" name="stage_channel_live_dot" id="0x7F080646" />
+    <public type="drawable" name="stage_channel_role_dot" id="0x7F080647" />
+    <public type="drawable" name="tab_dot_selector" id="0x7F080648" />
+    <public type="drawable" name="tab_indicator_default" id="0x7F080649" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7F08064A" />
+    <public type="drawable" name="test_custom_background" id="0x7F08064B" />
+    <public type="drawable" name="thread_embed_spine_drawable" id="0x7F08064C" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7F08064D" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7F08064E" />
+    <public type="drawable" name="trash_bg" id="0x7F08064F" />
+    <public type="drawable" name="ucrop_crop" id="0x7F080650" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7F080651" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7F080652" />
+    <public type="drawable" name="ucrop_ic_crop_unselected" id="0x7F080653" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7F080654" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7F080655" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7F080656" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7F080657" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7F080658" />
+    <public type="drawable" name="ucrop_ic_rotate_unselected" id="0x7F080659" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7F08065A" />
+    <public type="drawable" name="ucrop_ic_scale_unselected" id="0x7F08065B" />
+    <public type="drawable" name="ucrop_rotate" id="0x7F08065C" />
+    <public type="drawable" name="ucrop_scale" id="0x7F08065D" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7F08065E" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7F08065F" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7F080660" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7F080661" />
+    <public type="drawable" name="ucrop_wrapper_controls_shape" id="0x7F080662" />
+    <public type="drawable" name="video_call_illustration" id="0x7F080663" />
+    <public type="drawable" name="voice_user_limit_view_left_bg" id="0x7F080664" />
+    <public type="drawable" name="voice_user_limit_view_right_bg" id="0x7F080665" />
+    <public type="drawable" name="widget_stage_raised_hands_divider" id="0x7F080666" />
     <public type="font" name="ginto_bold" id="0x7F090000" />
     <public type="font" name="ginto_medium" id="0x7F090001" />
     <public type="font" name="ginto_regular" id="0x7F090002" />
@@ -5200,3631 +5210,3692 @@
     <public type="id" name="auth_login_password_manager_link" id="0x7F0A00F0" />
     <public type="id" name="auth_login_password_wrap" id="0x7F0A00F1" />
     <public type="id" name="auth_mfa_verification" id="0x7F0A00F2" />
-    <public type="id" name="auth_phone_verify_action_separator" id="0x7F0A00F3" />
-    <public type="id" name="auth_phone_verify_call" id="0x7F0A00F4" />
-    <public type="id" name="auth_phone_verify_code" id="0x7F0A00F5" />
-    <public type="id" name="auth_phone_verify_resend" id="0x7F0A00F6" />
-    <public type="id" name="auth_phone_verify_subtitle" id="0x7F0A00F7" />
-    <public type="id" name="auth_phone_verify_title" id="0x7F0A00F8" />
-    <public type="id" name="auth_policy_links" id="0x7F0A00F9" />
-    <public type="id" name="auth_register_account_information_button" id="0x7F0A00FA" />
-    <public type="id" name="auth_register_account_information_password_wrap" id="0x7F0A00FB" />
-    <public type="id" name="auth_register_account_information_username_wrap" id="0x7F0A00FC" />
-    <public type="id" name="auth_register_birthday" id="0x7F0A00FD" />
-    <public type="id" name="auth_register_button" id="0x7F0A00FE" />
-    <public type="id" name="auth_register_container" id="0x7F0A00FF" />
-    <public type="id" name="auth_register_identity_button" id="0x7F0A0100" />
-    <public type="id" name="auth_register_identity_first_segment_card" id="0x7F0A0101" />
-    <public type="id" name="auth_register_identity_input" id="0x7F0A0102" />
-    <public type="id" name="auth_register_identity_policy_link" id="0x7F0A0103" />
-    <public type="id" name="auth_register_identity_second_segment_card" id="0x7F0A0104" />
-    <public type="id" name="auth_register_identity_segmented_control" id="0x7F0A0105" />
-    <public type="id" name="auth_register_underage_button" id="0x7F0A0106" />
-    <public type="id" name="auth_register_underage_description" id="0x7F0A0107" />
-    <public type="id" name="auth_reset_password_back" id="0x7F0A0108" />
-    <public type="id" name="auth_reset_password_submit" id="0x7F0A0109" />
-    <public type="id" name="auth_success" id="0x7F0A010A" />
-    <public type="id" name="auth_tos_opt_in" id="0x7F0A010B" />
-    <public type="id" name="auth_undelete_cancel" id="0x7F0A010C" />
-    <public type="id" name="auth_undelete_delete" id="0x7F0A010D" />
-    <public type="id" name="auth_undelete_title" id="0x7F0A010E" />
-    <public type="id" name="authorized_apps" id="0x7F0A010F" />
-    <public type="id" name="authorized_apps_list" id="0x7F0A0110" />
-    <public type="id" name="auto" id="0x7F0A0111" />
-    <public type="id" name="autoComplete" id="0x7F0A0112" />
-    <public type="id" name="autoCompleteToEnd" id="0x7F0A0113" />
-    <public type="id" name="autoCompleteToStart" id="0x7F0A0114" />
-    <public type="id" name="autoFocus" id="0x7F0A0115" />
-    <public type="id" name="auto_archive_duration" id="0x7F0A0116" />
-    <public type="id" name="auto_archive_header" id="0x7F0A0117" />
-    <public type="id" name="auto_archive_sheet_duration_options" id="0x7F0A0118" />
-    <public type="id" name="automatic" id="0x7F0A0119" />
-    <public type="id" name="avatar" id="0x7F0A011A" />
-    <public type="id" name="avatar_container" id="0x7F0A011B" />
-    <public type="id" name="avatar_cutout" id="0x7F0A011C" />
-    <public type="id" name="back" id="0x7F0A011D" />
-    <public type="id" name="badge" id="0x7F0A011E" />
-    <public type="id" name="ban_container" id="0x7F0A011F" />
-    <public type="id" name="ban_list_item_avatar" id="0x7F0A0120" />
-    <public type="id" name="ban_list_item_name" id="0x7F0A0121" />
-    <public type="id" name="ban_user_body" id="0x7F0A0122" />
-    <public type="id" name="ban_user_button_container" id="0x7F0A0123" />
-    <public type="id" name="ban_user_cancel" id="0x7F0A0124" />
-    <public type="id" name="ban_user_confirm" id="0x7F0A0125" />
-    <public type="id" name="ban_user_delete_messages_1_day" id="0x7F0A0126" />
-    <public type="id" name="ban_user_delete_messages_7_days" id="0x7F0A0127" />
-    <public type="id" name="ban_user_delete_messages_none" id="0x7F0A0128" />
-    <public type="id" name="ban_user_reason" id="0x7F0A0129" />
-    <public type="id" name="ban_user_title" id="0x7F0A012A" />
-    <public type="id" name="banner" id="0x7F0A012B" />
-    <public type="id" name="barrier" id="0x7F0A012C" />
-    <public type="id" name="baseline" id="0x7F0A012D" />
-    <public type="id" name="beginOnFirstDraw" id="0x7F0A012E" />
-    <public type="id" name="beginning" id="0x7F0A012F" />
-    <public type="id" name="behavior" id="0x7F0A0130" />
-    <public type="id" name="beta_tag" id="0x7F0A0131" />
-    <public type="id" name="bitrate_divider" id="0x7F0A0132" />
-    <public type="id" name="bitrate_seekbar" id="0x7F0A0133" />
-    <public type="id" name="bitrate_title" id="0x7F0A0134" />
-    <public type="id" name="blank_item_avatar_placeholder" id="0x7F0A0135" />
-    <public type="id" name="blank_item_username_placeholder" id="0x7F0A0136" />
-    <public type="id" name="blocked_user_item" id="0x7F0A0137" />
-    <public type="id" name="blocked_user_item_avatar" id="0x7F0A0138" />
-    <public type="id" name="blocked_user_item_name" id="0x7F0A0139" />
-    <public type="id" name="blocked_users" id="0x7F0A013A" />
-    <public type="id" name="blocked_users_flipper" id="0x7F0A013B" />
-    <public type="id" name="blocked_users_list_recycler" id="0x7F0A013C" />
-    <public type="id" name="blocking" id="0x7F0A013D" />
-    <public type="id" name="body" id="0x7F0A013E" />
-    <public type="id" name="boost_bar_progress_bar" id="0x7F0A013F" />
-    <public type="id" name="boost_bar_tier_0_container" id="0x7F0A0140" />
-    <public type="id" name="boost_bar_tier_0_iv" id="0x7F0A0141" />
-    <public type="id" name="boost_bar_tier_1_container" id="0x7F0A0142" />
-    <public type="id" name="boost_bar_tier_1_iv" id="0x7F0A0143" />
-    <public type="id" name="boost_bar_tier_1_tv" id="0x7F0A0144" />
-    <public type="id" name="boost_bar_tier_2_container" id="0x7F0A0145" />
-    <public type="id" name="boost_bar_tier_2_iv" id="0x7F0A0146" />
-    <public type="id" name="boost_bar_tier_2_tv" id="0x7F0A0147" />
-    <public type="id" name="boost_bar_tier_3_container" id="0x7F0A0148" />
-    <public type="id" name="boost_bar_tier_3_iv" id="0x7F0A0149" />
-    <public type="id" name="boost_bar_tier_3_tv" id="0x7F0A014A" />
-    <public type="id" name="boost_confirmation_button_container" id="0x7F0A014B" />
-    <public type="id" name="boost_confirmation_confirmation_view" id="0x7F0A014C" />
-    <public type="id" name="boost_confirmation_cooldown_warning" id="0x7F0A014D" />
-    <public type="id" name="boost_confirmation_error" id="0x7F0A014E" />
-    <public type="id" name="boost_confirmation_select" id="0x7F0A014F" />
-    <public type="id" name="boost_status_flipper" id="0x7F0A0150" />
-    <public type="id" name="boost_status_learn_more" id="0x7F0A0151" />
-    <public type="id" name="boost_status_num_boosts" id="0x7F0A0152" />
-    <public type="id" name="boost_status_premium_marketing" id="0x7F0A0153" />
-    <public type="id" name="boost_status_premium_upsell" id="0x7F0A0154" />
-    <public type="id" name="boost_status_protip" id="0x7F0A0155" />
-    <public type="id" name="boost_status_retry" id="0x7F0A0156" />
-    <public type="id" name="boost_status_subscribe_button" id="0x7F0A0157" />
-    <public type="id" name="boost_status_subscribe_button2" id="0x7F0A0158" />
-    <public type="id" name="boost_status_viewpager" id="0x7F0A0159" />
-    <public type="id" name="boosted_boost_action" id="0x7F0A015A" />
-    <public type="id" name="boosted_boost_cancelled" id="0x7F0A015B" />
-    <public type="id" name="boosted_boost_cooldown" id="0x7F0A015C" />
-    <public type="id" name="boosted_boost_date" id="0x7F0A015D" />
-    <public type="id" name="boosted_guild_banner" id="0x7F0A015E" />
-    <public type="id" name="boosted_guild_gradient" id="0x7F0A015F" />
-    <public type="id" name="boosted_guild_progress_view" id="0x7F0A0160" />
-    <public type="id" name="boosted_header" id="0x7F0A0161" />
-    <public type="id" name="boosted_sample_guild_count" id="0x7F0A0162" />
-    <public type="id" name="boosted_sample_guild_icon" id="0x7F0A0163" />
-    <public type="id" name="boosted_sample_guild_name" id="0x7F0A0164" />
-    <public type="id" name="boosted_sample_guild_progress" id="0x7F0A0165" />
-    <public type="id" name="bottom" id="0x7F0A0166" />
-    <public type="id" name="bottom_header_tv" id="0x7F0A0167" />
-    <public type="id" name="bottom_of_bullets" id="0x7F0A0168" />
-    <public type="id" name="bottom_sheet_tint" id="0x7F0A0169" />
-    <public type="id" name="bottom_to_end" id="0x7F0A016A" />
-    <public type="id" name="bounce" id="0x7F0A016B" />
-    <public type="id" name="browser_actions_header_text" id="0x7F0A016C" />
-    <public type="id" name="browser_actions_menu_item_icon" id="0x7F0A016D" />
-    <public type="id" name="browser_actions_menu_item_text" id="0x7F0A016E" />
-    <public type="id" name="browser_actions_menu_items" id="0x7F0A016F" />
-    <public type="id" name="browser_actions_menu_view" id="0x7F0A0170" />
-    <public type="id" name="bug_report_clear_screenshot" id="0x7F0A0171" />
-    <public type="id" name="bug_report_description" id="0x7F0A0172" />
-    <public type="id" name="bug_report_name" id="0x7F0A0173" />
-    <public type="id" name="bug_report_no_screenshot_label" id="0x7F0A0174" />
-    <public type="id" name="bug_report_priority" id="0x7F0A0175" />
-    <public type="id" name="bug_report_priority_card" id="0x7F0A0176" />
-    <public type="id" name="bug_report_priority_icon" id="0x7F0A0177" />
-    <public type="id" name="bug_report_screenshot" id="0x7F0A0178" />
-    <public type="id" name="bug_report_select_component_chevron" id="0x7F0A0179" />
-    <public type="id" name="bug_report_status_expression" id="0x7F0A017A" />
-    <public type="id" name="bug_report_status_text" id="0x7F0A017B" />
-    <public type="id" name="bug_report_submit" id="0x7F0A017C" />
-    <public type="id" name="bug_report_switch_flipper" id="0x7F0A017D" />
-    <public type="id" name="bug_report_undo_screenshot_remove" id="0x7F0A017E" />
-    <public type="id" name="bullet_1_icon" id="0x7F0A017F" />
-    <public type="id" name="bullet_1_label" id="0x7F0A0180" />
-    <public type="id" name="bullet_2_icon" id="0x7F0A0181" />
-    <public type="id" name="bullet_2_label" id="0x7F0A0182" />
-    <public type="id" name="bullet_3_icon" id="0x7F0A0183" />
-    <public type="id" name="bullet_3_label" id="0x7F0A0184" />
-    <public type="id" name="bullet_4_icon" id="0x7F0A0185" />
-    <public type="id" name="bullet_4_label" id="0x7F0A0186" />
-    <public type="id" name="button" id="0x7F0A0187" />
-    <public type="id" name="buttonPanel" id="0x7F0A0188" />
-    <public type="id" name="button_container" id="0x7F0A0189" />
-    <public type="id" name="cache_measures" id="0x7F0A018A" />
-    <public type="id" name="call_audio_share_warning_barrier" id="0x7F0A018B" />
-    <public type="id" name="call_container" id="0x7F0A018C" />
-    <public type="id" name="call_controls_sheet_container" id="0x7F0A018D" />
-    <public type="id" name="call_floating_push_to_talk" id="0x7F0A018E" />
-    <public type="id" name="call_fullscreen_mentions" id="0x7F0A018F" />
-    <public type="id" name="call_non_video_container" id="0x7F0A0190" />
-    <public type="id" name="call_participants_hidden" id="0x7F0A0191" />
-    <public type="id" name="call_participants_show_button" id="0x7F0A0192" />
-    <public type="id" name="call_pip" id="0x7F0A0193" />
-    <public type="id" name="call_stage_recycler" id="0x7F0A0194" />
-    <public type="id" name="call_stop_streaming_button" id="0x7F0A0195" />
-    <public type="id" name="call_streaming_active" id="0x7F0A0196" />
-    <public type="id" name="call_streaming_active_body" id="0x7F0A0197" />
-    <public type="id" name="call_streaming_active_header" id="0x7F0A0198" />
-    <public type="id" name="call_streaming_active_illustration" id="0x7F0A0199" />
-    <public type="id" name="call_streaming_audio_share_warning" id="0x7F0A019A" />
-    <public type="id" name="call_video_recycler" id="0x7F0A019B" />
-    <public type="id" name="call_visit_community" id="0x7F0A019C" />
-    <public type="id" name="camera1" id="0x7F0A019D" />
-    <public type="id" name="camera2" id="0x7F0A019E" />
-    <public type="id" name="camera_capacity_body" id="0x7F0A019F" />
-    <public type="id" name="camera_capacity_confirm" id="0x7F0A01A0" />
-    <public type="id" name="camera_container" id="0x7F0A01A1" />
-    <public type="id" name="camera_facing_btn" id="0x7F0A01A2" />
-    <public type="id" name="camera_flash_btn" id="0x7F0A01A3" />
-    <public type="id" name="camera_view" id="0x7F0A01A4" />
-    <public type="id" name="cancel" id="0x7F0A01A5" />
-    <public type="id" name="cancel_action" id="0x7F0A01A6" />
-    <public type="id" name="cancel_button" id="0x7F0A01A7" />
-    <public type="id" name="cannot_send_text" id="0x7F0A01A8" />
-    <public type="id" name="cap_long" id="0x7F0A01A9" />
-    <public type="id" name="cap_long_and_short" id="0x7F0A01AA" />
-    <public type="id" name="card_segment_badge" id="0x7F0A01AB" />
-    <public type="id" name="card_segment_text" id="0x7F0A01AC" />
-    <public type="id" name="category_override_name" id="0x7F0A01AD" />
-    <public type="id" name="category_override_status" id="0x7F0A01AE" />
-    <public type="id" name="category_overview_name" id="0x7F0A01AF" />
-    <public type="id" name="center" id="0x7F0A01B0" />
-    <public type="id" name="centerCrop" id="0x7F0A01B1" />
-    <public type="id" name="centerInside" id="0x7F0A01B2" />
-    <public type="id" name="center_horizontal" id="0x7F0A01B3" />
-    <public type="id" name="center_vertical" id="0x7F0A01B4" />
-    <public type="id" name="chain" id="0x7F0A01B5" />
-    <public type="id" name="chains" id="0x7F0A01B6" />
-    <public type="id" name="change_log_body" id="0x7F0A01B7" />
-    <public type="id" name="change_log_contents" id="0x7F0A01B8" />
-    <public type="id" name="change_log_facebook" id="0x7F0A01B9" />
-    <public type="id" name="change_log_instagram" id="0x7F0A01BA" />
-    <public type="id" name="change_log_scrollview" id="0x7F0A01BB" />
-    <public type="id" name="change_log_special_back" id="0x7F0A01BC" />
-    <public type="id" name="change_log_special_button" id="0x7F0A01BD" />
-    <public type="id" name="change_log_special_close" id="0x7F0A01BE" />
-    <public type="id" name="change_log_special_contents" id="0x7F0A01BF" />
-    <public type="id" name="change_log_special_cta_body" id="0x7F0A01C0" />
-    <public type="id" name="change_log_special_date" id="0x7F0A01C1" />
-    <public type="id" name="change_log_special_scrollview" id="0x7F0A01C2" />
-    <public type="id" name="change_log_thumbnail" id="0x7F0A01C3" />
-    <public type="id" name="change_log_twitter" id="0x7F0A01C4" />
-    <public type="id" name="change_log_video" id="0x7F0A01C5" />
-    <public type="id" name="change_log_video_overlay" id="0x7F0A01C6" />
-    <public type="id" name="change_password_current_password_input" id="0x7F0A01C7" />
-    <public type="id" name="change_password_new_password_input" id="0x7F0A01C8" />
-    <public type="id" name="change_password_save" id="0x7F0A01C9" />
-    <public type="id" name="change_password_two_factor" id="0x7F0A01CA" />
-    <public type="id" name="changelog" id="0x7F0A01CB" />
-    <public type="id" name="changelog_special_header_container" id="0x7F0A01CC" />
-    <public type="id" name="changelog_special_video" id="0x7F0A01CD" />
-    <public type="id" name="channel_actions_view" id="0x7F0A01CE" />
-    <public type="id" name="channel_follow_channel_dropdown_icon" id="0x7F0A01CF" />
-    <public type="id" name="channel_follow_channel_name" id="0x7F0A01D0" />
-    <public type="id" name="channel_follow_error_text" id="0x7F0A01D1" />
-    <public type="id" name="channel_follow_guild_dropdown_icon" id="0x7F0A01D2" />
-    <public type="id" name="channel_follow_guild_icon" id="0x7F0A01D3" />
-    <public type="id" name="channel_follow_select_channel" id="0x7F0A01D4" />
-    <public type="id" name="channel_follow_select_guild" id="0x7F0A01D5" />
-    <public type="id" name="channel_follow_selected_channel_name" id="0x7F0A01D6" />
-    <public type="id" name="channel_follow_selected_guild_name" id="0x7F0A01D7" />
-    <public type="id" name="channel_follow_success_confirm" id="0x7F0A01D8" />
-    <public type="id" name="channel_follow_success_image" id="0x7F0A01D9" />
-    <public type="id" name="channel_follow_success_text" id="0x7F0A01DA" />
-    <public type="id" name="channel_list_item_private_status" id="0x7F0A01DB" />
-    <public type="id" name="channel_members_list_item_add" id="0x7F0A01DC" />
-    <public type="id" name="channel_members_list_item_add_title" id="0x7F0A01DD" />
-    <public type="id" name="channel_members_list_item_avatar" id="0x7F0A01DE" />
-    <public type="id" name="channel_members_list_item_boosted_indicator" id="0x7F0A01DF" />
-    <public type="id" name="channel_members_list_item_game" id="0x7F0A01E0" />
-    <public type="id" name="channel_members_list_item_group_owner_indicator" id="0x7F0A01E1" />
-    <public type="id" name="channel_members_list_item_header_placeholder" id="0x7F0A01E2" />
-    <public type="id" name="channel_members_list_item_header_text" id="0x7F0A01E3" />
-    <public type="id" name="channel_members_list_item_name" id="0x7F0A01E4" />
-    <public type="id" name="channel_members_list_item_presence" id="0x7F0A01E5" />
-    <public type="id" name="channel_members_list_item_rich_presence_iv" id="0x7F0A01E6" />
-    <public type="id" name="channel_muted_details" id="0x7F0A01E7" />
-    <public type="id" name="channel_notification_settings_system" id="0x7F0A01E8" />
-    <public type="id" name="channel_notifications_mute_settings_view" id="0x7F0A01E9" />
-    <public type="id" name="channel_override_category_name" id="0x7F0A01EA" />
-    <public type="id" name="channel_override_name" id="0x7F0A01EB" />
-    <public type="id" name="channel_override_status" id="0x7F0A01EC" />
-    <public type="id" name="channel_permission_general_create_instant_invite" id="0x7F0A01ED" />
-    <public type="id" name="channel_permission_general_manage_channel" id="0x7F0A01EE" />
-    <public type="id" name="channel_permission_general_manage_permissions" id="0x7F0A01EF" />
-    <public type="id" name="channel_permission_general_manage_webhooks" id="0x7F0A01F0" />
-    <public type="id" name="channel_permission_owner_view" id="0x7F0A01F1" />
-    <public type="id" name="channel_permission_stage_request_to_speak" id="0x7F0A01F2" />
-    <public type="id" name="channel_permission_text_add_reactions" id="0x7F0A01F3" />
-    <public type="id" name="channel_permission_text_attach_files" id="0x7F0A01F4" />
-    <public type="id" name="channel_permission_text_embed_links" id="0x7F0A01F5" />
-    <public type="id" name="channel_permission_text_manage_messages" id="0x7F0A01F6" />
-    <public type="id" name="channel_permission_text_mention_everyone" id="0x7F0A01F7" />
-    <public type="id" name="channel_permission_text_read_message_history" id="0x7F0A01F8" />
-    <public type="id" name="channel_permission_text_read_messages" id="0x7F0A01F9" />
-    <public type="id" name="channel_permission_text_send_messages" id="0x7F0A01FA" />
-    <public type="id" name="channel_permission_text_send_tts_messages" id="0x7F0A01FB" />
-    <public type="id" name="channel_permission_text_use_external_emojis" id="0x7F0A01FC" />
-    <public type="id" name="channel_permission_use_application_commands" id="0x7F0A01FD" />
-    <public type="id" name="channel_permission_voice_connect" id="0x7F0A01FE" />
-    <public type="id" name="channel_permission_voice_deafen_members" id="0x7F0A01FF" />
-    <public type="id" name="channel_permission_voice_move_members" id="0x7F0A0200" />
-    <public type="id" name="channel_permission_voice_mute_members" id="0x7F0A0201" />
-    <public type="id" name="channel_permission_voice_priority_speaker" id="0x7F0A0202" />
-    <public type="id" name="channel_permission_voice_speak" id="0x7F0A0203" />
-    <public type="id" name="channel_permission_voice_use_vad" id="0x7F0A0204" />
-    <public type="id" name="channel_permission_voice_video" id="0x7F0A0205" />
-    <public type="id" name="channel_permissions_avatar" id="0x7F0A0206" />
-    <public type="id" name="channel_permissions_channel_name" id="0x7F0A0207" />
-    <public type="id" name="channel_permissions_save" id="0x7F0A0208" />
-    <public type="id" name="channel_permissions_stage_container" id="0x7F0A0209" />
-    <public type="id" name="channel_permissions_target_name" id="0x7F0A020A" />
-    <public type="id" name="channel_permissions_text_container" id="0x7F0A020B" />
-    <public type="id" name="channel_permissions_voice_container" id="0x7F0A020C" />
-    <public type="id" name="channel_pinned_messages_recycler" id="0x7F0A020D" />
-    <public type="id" name="channel_selector_list" id="0x7F0A020E" />
-    <public type="id" name="channel_separator" id="0x7F0A020F" />
-    <public type="id" name="channel_settings_announcement" id="0x7F0A0210" />
-    <public type="id" name="channel_settings_cannot_delete_body" id="0x7F0A0211" />
-    <public type="id" name="channel_settings_cannot_delete_confirm" id="0x7F0A0212" />
-    <public type="id" name="channel_settings_cannot_delete_title" id="0x7F0A0213" />
-    <public type="id" name="channel_settings_delete_body" id="0x7F0A0214" />
-    <public type="id" name="channel_settings_delete_cancel" id="0x7F0A0215" />
-    <public type="id" name="channel_settings_delete_confirm" id="0x7F0A0216" />
-    <public type="id" name="channel_settings_delete_title" id="0x7F0A0217" />
-    <public type="id" name="channel_settings_edit_name" id="0x7F0A0218" />
-    <public type="id" name="channel_settings_edit_topic" id="0x7F0A0219" />
-    <public type="id" name="channel_settings_edit_wrap" id="0x7F0A021A" />
-    <public type="id" name="channel_settings_notifications_frequency_0" id="0x7F0A021B" />
-    <public type="id" name="channel_settings_notifications_frequency_1" id="0x7F0A021C" />
-    <public type="id" name="channel_settings_notifications_frequency_2" id="0x7F0A021D" />
-    <public type="id" name="channel_settings_notifications_frequency_wrap" id="0x7F0A021E" />
-    <public type="id" name="channel_settings_nsfw" id="0x7F0A021F" />
-    <public type="id" name="channel_settings_permissions" id="0x7F0A0220" />
-    <public type="id" name="channel_settings_permissions_add_member_name_search" id="0x7F0A0221" />
-    <public type="id" name="channel_settings_permissions_add_member_recycler" id="0x7F0A0222" />
-    <public type="id" name="channel_settings_permissions_add_member_view_flipper" id="0x7F0A0223" />
-    <public type="id" name="channel_settings_permissions_add_role_recycler" id="0x7F0A0224" />
-    <public type="id" name="channel_settings_pinned_messages" id="0x7F0A0225" />
-    <public type="id" name="channel_settings_pinned_messages_container" id="0x7F0A0226" />
-    <public type="id" name="channel_settings_pinned_messages_disabled_overlay" id="0x7F0A0227" />
-    <public type="id" name="channel_settings_region_override" id="0x7F0A0228" />
-    <public type="id" name="channel_settings_region_override_container" id="0x7F0A0229" />
-    <public type="id" name="channel_settings_region_override_help" id="0x7F0A022A" />
-    <public type="id" name="channel_settings_save" id="0x7F0A022B" />
-    <public type="id" name="channel_settings_section_privacy_safety" id="0x7F0A022C" />
-    <public type="id" name="channel_settings_section_slow_mode" id="0x7F0A022D" />
-    <public type="id" name="channel_settings_section_user_management" id="0x7F0A022E" />
-    <public type="id" name="channel_settings_slow_mode_cooldown_label" id="0x7F0A022F" />
-    <public type="id" name="channel_settings_slow_mode_cooldown_slider" id="0x7F0A0230" />
-    <public type="id" name="channel_settings_slowmode_label" id="0x7F0A0231" />
-    <public type="id" name="channel_sidebar_actions_notifications" id="0x7F0A0232" />
-    <public type="id" name="channel_sidebar_actions_pins" id="0x7F0A0233" />
-    <public type="id" name="channel_sidebar_actions_search" id="0x7F0A0234" />
-    <public type="id" name="channel_sidebar_actions_settings" id="0x7F0A0235" />
-    <public type="id" name="channel_spinner_dropdown_item_textview" id="0x7F0A0236" />
-    <public type="id" name="channel_spinner_item_textview" id="0x7F0A0237" />
-    <public type="id" name="channel_topic" id="0x7F0A0238" />
-    <public type="id" name="channel_topic_channel_icon" id="0x7F0A0239" />
-    <public type="id" name="channel_topic_ellipsis" id="0x7F0A023A" />
-    <public type="id" name="channel_topic_more_icon" id="0x7F0A023B" />
-    <public type="id" name="channel_topic_name" id="0x7F0A023C" />
-    <public type="id" name="channel_topic_title" id="0x7F0A023D" />
-    <public type="id" name="channels_item_category_add" id="0x7F0A023E" />
-    <public type="id" name="channels_item_category_arrow" id="0x7F0A023F" />
-    <public type="id" name="channels_item_category_name" id="0x7F0A0240" />
-    <public type="id" name="channels_item_channel_hash" id="0x7F0A0241" />
-    <public type="id" name="channels_item_channel_mentions" id="0x7F0A0242" />
-    <public type="id" name="channels_item_channel_name" id="0x7F0A0243" />
-    <public type="id" name="channels_item_channel_unread" id="0x7F0A0244" />
-    <public type="id" name="channels_item_thread_content" id="0x7F0A0245" />
-    <public type="id" name="channels_item_thread_mentions" id="0x7F0A0246" />
-    <public type="id" name="channels_item_thread_name" id="0x7F0A0247" />
-    <public type="id" name="channels_item_thread_spine" id="0x7F0A0248" />
-    <public type="id" name="channels_item_thread_unread" id="0x7F0A0249" />
-    <public type="id" name="channels_item_voice_channel_name" id="0x7F0A024A" />
-    <public type="id" name="channels_item_voice_channel_speaker" id="0x7F0A024B" />
-    <public type="id" name="channels_item_voice_channel_user_limit" id="0x7F0A024C" />
-    <public type="id" name="channels_item_voice_user_avatar" id="0x7F0A024D" />
-    <public type="id" name="channels_item_voice_user_camera" id="0x7F0A024E" />
-    <public type="id" name="channels_item_voice_user_headphones" id="0x7F0A024F" />
-    <public type="id" name="channels_item_voice_user_live" id="0x7F0A0250" />
-    <public type="id" name="channels_item_voice_user_microphone" id="0x7F0A0251" />
-    <public type="id" name="channels_item_voice_user_name" id="0x7F0A0252" />
-    <public type="id" name="channels_list" id="0x7F0A0253" />
-    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7F0A0254" />
-    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7F0A0255" />
-    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7F0A0256" />
-    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7F0A0257" />
-    <public type="id" name="channels_list_banner" id="0x7F0A0258" />
-    <public type="id" name="channels_list_banner_foreground" id="0x7F0A0259" />
-    <public type="id" name="channels_list_direct_messages_title" id="0x7F0A025A" />
-    <public type="id" name="channels_list_header" id="0x7F0A025B" />
-    <public type="id" name="channels_list_item_header" id="0x7F0A025C" />
-    <public type="id" name="channels_list_item_mfa_text" id="0x7F0A025D" />
-    <public type="id" name="channels_list_item_private_avatar" id="0x7F0A025E" />
-    <public type="id" name="channels_list_item_private_desc" id="0x7F0A025F" />
-    <public type="id" name="channels_list_item_private_mentions" id="0x7F0A0260" />
-    <public type="id" name="channels_list_item_private_name" id="0x7F0A0261" />
-    <public type="id" name="channels_list_item_private_tag" id="0x7F0A0262" />
-    <public type="id" name="channels_list_item_text_actions_channel_notifications" id="0x7F0A0263" />
-    <public type="id" name="channels_list_item_text_actions_channel_settings" id="0x7F0A0264" />
-    <public type="id" name="channels_list_item_text_actions_copy_id" id="0x7F0A0265" />
-    <public type="id" name="channels_list_item_text_actions_developer_divider" id="0x7F0A0266" />
-    <public type="id" name="channels_list_item_text_actions_icon" id="0x7F0A0267" />
-    <public type="id" name="channels_list_item_text_actions_invite" id="0x7F0A0268" />
-    <public type="id" name="channels_list_item_text_actions_mark_as_read" id="0x7F0A0269" />
-    <public type="id" name="channels_list_item_text_actions_mute" id="0x7F0A026A" />
-    <public type="id" name="channels_list_item_text_actions_profile" id="0x7F0A026B" />
-    <public type="id" name="channels_list_item_text_actions_thread_browser" id="0x7F0A026C" />
-    <public type="id" name="channels_list_item_text_actions_title" id="0x7F0A026D" />
-    <public type="id" name="channels_list_item_thread_actions_archive_settings" id="0x7F0A026E" />
-    <public type="id" name="channels_list_item_thread_actions_archive_settings_header" id="0x7F0A026F" />
-    <public type="id" name="channels_list_item_thread_actions_archive_settings_subheader" id="0x7F0A0270" />
-    <public type="id" name="channels_list_item_thread_actions_channel_notifications" id="0x7F0A0271" />
-    <public type="id" name="channels_list_item_thread_actions_copy_id" id="0x7F0A0272" />
-    <public type="id" name="channels_list_item_thread_actions_developer_divider" id="0x7F0A0273" />
-    <public type="id" name="channels_list_item_thread_actions_divider" id="0x7F0A0274" />
-    <public type="id" name="channels_list_item_thread_actions_edit" id="0x7F0A0275" />
-    <public type="id" name="channels_list_item_thread_actions_icon" id="0x7F0A0276" />
-    <public type="id" name="channels_list_item_thread_actions_leave" id="0x7F0A0277" />
-    <public type="id" name="channels_list_item_thread_actions_mark_as_read" id="0x7F0A0278" />
-    <public type="id" name="channels_list_item_thread_actions_title" id="0x7F0A0279" />
-    <public type="id" name="channels_list_item_thread_actions_unarchive" id="0x7F0A027A" />
-    <public type="id" name="channels_list_new" id="0x7F0A027B" />
-    <public type="id" name="channels_list_premium_guild_hint" id="0x7F0A027C" />
-    <public type="id" name="channels_list_premium_guild_hint_button" id="0x7F0A027D" />
-    <public type="id" name="channels_list_premium_guild_hint_subtitle" id="0x7F0A027E" />
-    <public type="id" name="channels_list_premium_guild_hint_title" id="0x7F0A027F" />
-    <public type="id" name="channels_list_private_channels_header" id="0x7F0A0280" />
-    <public type="id" name="channels_list_search" id="0x7F0A0281" />
-    <public type="id" name="channels_list_start_group" id="0x7F0A0282" />
-    <public type="id" name="channels_list_tooltip_background" id="0x7F0A0283" />
-    <public type="id" name="channels_list_tooltip_top_tail" id="0x7F0A0284" />
-    <public type="id" name="channels_list_unreads" id="0x7F0A0285" />
-    <public type="id" name="channels_list_unreads_background" id="0x7F0A0286" />
-    <public type="id" name="channels_list_unreads_stub" id="0x7F0A0287" />
-    <public type="id" name="channels_toolbar" id="0x7F0A0288" />
-    <public type="id" name="chat_action_item_button" id="0x7F0A0289" />
-    <public type="id" name="chat_action_item_image" id="0x7F0A028A" />
-    <public type="id" name="chat_action_item_subtext" id="0x7F0A028B" />
-    <public type="id" name="chat_action_item_text" id="0x7F0A028C" />
-    <public type="id" name="chat_input_application_avatar" id="0x7F0A028D" />
-    <public type="id" name="chat_input_application_commands_option_description" id="0x7F0A028E" />
-    <public type="id" name="chat_input_application_commands_recycler" id="0x7F0A028F" />
-    <public type="id" name="chat_input_application_name" id="0x7F0A0290" />
-    <public type="id" name="chat_input_categories_recycler" id="0x7F0A0291" />
-    <public type="id" name="chat_input_container" id="0x7F0A0292" />
-    <public type="id" name="chat_input_context_bar" id="0x7F0A0293" />
-    <public type="id" name="chat_input_context_cancel" id="0x7F0A0294" />
-    <public type="id" name="chat_input_context_description" id="0x7F0A0295" />
-    <public type="id" name="chat_input_context_reply_mention_button" id="0x7F0A0296" />
-    <public type="id" name="chat_input_context_reply_mention_button_image" id="0x7F0A0297" />
-    <public type="id" name="chat_input_context_reply_mention_button_text" id="0x7F0A0298" />
-    <public type="id" name="chat_input_emoji_matching_header" id="0x7F0A0299" />
-    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7F0A029A" />
-    <public type="id" name="chat_input_emoji_picker_view_flipper" id="0x7F0A029B" />
-    <public type="id" name="chat_input_emoji_upsell_pile" id="0x7F0A029C" />
-    <public type="id" name="chat_input_emoji_upsell_text" id="0x7F0A029D" />
-    <public type="id" name="chat_input_guard_action" id="0x7F0A029E" />
-    <public type="id" name="chat_input_guard_action_secondary" id="0x7F0A029F" />
-    <public type="id" name="chat_input_guard_subtext" id="0x7F0A02A0" />
-    <public type="id" name="chat_input_guard_text" id="0x7F0A02A1" />
-    <public type="id" name="chat_input_icon_barrier" id="0x7F0A02A2" />
-    <public type="id" name="chat_input_item_avatar" id="0x7F0A02A3" />
-    <public type="id" name="chat_input_item_description" id="0x7F0A02A4" />
-    <public type="id" name="chat_input_item_divider" id="0x7F0A02A5" />
-    <public type="id" name="chat_input_item_emoji" id="0x7F0A02A6" />
-    <public type="id" name="chat_input_item_icon_container" id="0x7F0A02A7" />
-    <public type="id" name="chat_input_item_name" id="0x7F0A02A8" />
-    <public type="id" name="chat_input_item_name_right" id="0x7F0A02A9" />
-    <public type="id" name="chat_input_item_status" id="0x7F0A02AA" />
-    <public type="id" name="chat_input_mentions_recycler" id="0x7F0A02AB" />
-    <public type="id" name="chat_input_sticker_picker_empty_container" id="0x7F0A02AC" />
-    <public type="id" name="chat_input_sticker_picker_empty_container_phase_1" id="0x7F0A02AD" />
-    <public type="id" name="chat_input_sticker_picker_empty_image" id="0x7F0A02AE" />
-    <public type="id" name="chat_input_sticker_picker_empty_link" id="0x7F0A02AF" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_1" id="0x7F0A02B0" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_2" id="0x7F0A02B1" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_3" id="0x7F0A02B2" />
-    <public type="id" name="chat_input_sticker_picker_empty_sticker_4" id="0x7F0A02B3" />
-    <public type="id" name="chat_input_sticker_picker_empty_subscribe_phase_1" id="0x7F0A02B4" />
-    <public type="id" name="chat_input_sticker_picker_empty_subtitle" id="0x7F0A02B5" />
-    <public type="id" name="chat_input_sticker_picker_empty_subtitle_phase_1" id="0x7F0A02B6" />
-    <public type="id" name="chat_input_sticker_picker_empty_title" id="0x7F0A02B7" />
-    <public type="id" name="chat_input_sticker_picker_empty_title_phase_1" id="0x7F0A02B8" />
-    <public type="id" name="chat_input_sticker_picker_recycler" id="0x7F0A02B9" />
-    <public type="id" name="chat_input_sticker_picker_view_flipper" id="0x7F0A02BA" />
-    <public type="id" name="chat_input_stickers_container" id="0x7F0A02BB" />
-    <public type="id" name="chat_input_stickers_matching_header" id="0x7F0A02BC" />
-    <public type="id" name="chat_input_stickers_recycler" id="0x7F0A02BD" />
-    <public type="id" name="chat_input_suggested_sticker_1" id="0x7F0A02BE" />
-    <public type="id" name="chat_input_suggested_sticker_2" id="0x7F0A02BF" />
-    <public type="id" name="chat_input_suggested_sticker_3" id="0x7F0A02C0" />
-    <public type="id" name="chat_input_suggested_sticker_4" id="0x7F0A02C1" />
-    <public type="id" name="chat_input_suggested_sticker_4_container" id="0x7F0A02C2" />
-    <public type="id" name="chat_input_suggested_sticker_4_lock" id="0x7F0A02C3" />
-    <public type="id" name="chat_input_suggested_sticker_cancel" id="0x7F0A02C4" />
-    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7F0A02C5" />
-    <public type="id" name="chat_input_widget" id="0x7F0A02C6" />
-    <public type="id" name="chat_input_wrap" id="0x7F0A02C7" />
-    <public type="id" name="chat_item" id="0x7F0A02C8" />
-    <public type="id" name="chat_list_adapter_item_alert_text" id="0x7F0A02C9" />
-    <public type="id" name="chat_list_adapter_item_blocked" id="0x7F0A02CA" />
-    <public type="id" name="chat_list_adapter_item_call_icon" id="0x7F0A02CB" />
-    <public type="id" name="chat_list_adapter_item_call_participants" id="0x7F0A02CC" />
-    <public type="id" name="chat_list_adapter_item_call_subtitle" id="0x7F0A02CD" />
-    <public type="id" name="chat_list_adapter_item_call_title" id="0x7F0A02CE" />
-    <public type="id" name="chat_list_adapter_item_call_unjoined_ongoing_subtitle" id="0x7F0A02CF" />
-    <public type="id" name="chat_list_adapter_item_chat_attachment_icon" id="0x7F0A02D0" />
-    <public type="id" name="chat_list_adapter_item_component_root" id="0x7F0A02D1" />
-    <public type="id" name="chat_list_adapter_item_edit_channel" id="0x7F0A02D2" />
-    <public type="id" name="chat_list_adapter_item_failed" id="0x7F0A02D3" />
-    <public type="id" name="chat_list_adapter_item_failed_upload_list" id="0x7F0A02D4" />
-    <public type="id" name="chat_list_adapter_item_gutter_bg" id="0x7F0A02D5" />
-    <public type="id" name="chat_list_adapter_item_header" id="0x7F0A02D6" />
-    <public type="id" name="chat_list_adapter_item_highlighted_bg" id="0x7F0A02D7" />
-    <public type="id" name="chat_list_adapter_item_icon_help" id="0x7F0A02D8" />
-    <public type="id" name="chat_list_adapter_item_private_channel_start_header" id="0x7F0A02D9" />
-    <public type="id" name="chat_list_adapter_item_reply_leading_views" id="0x7F0A02DA" />
-    <public type="id" name="chat_list_adapter_item_selectable_background" id="0x7F0A02DB" />
-    <public type="id" name="chat_list_adapter_item_sticker" id="0x7F0A02DC" />
-    <public type="id" name="chat_list_adapter_item_sticker_greet" id="0x7F0A02DD" />
-    <public type="id" name="chat_list_adapter_item_sticker_greet_text" id="0x7F0A02DE" />
-    <public type="id" name="chat_list_adapter_item_subheader1" id="0x7F0A02DF" />
-    <public type="id" name="chat_list_adapter_item_subheader2" id="0x7F0A02E0" />
-    <public type="id" name="chat_list_adapter_item_text" id="0x7F0A02E1" />
-    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7F0A02E2" />
-    <public type="id" name="chat_list_adapter_item_text_command" id="0x7F0A02E3" />
-    <public type="id" name="chat_list_adapter_item_text_decorator" id="0x7F0A02E4" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_avatar" id="0x7F0A02E5" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_reply_icon" id="0x7F0A02E6" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_reply_link_icon" id="0x7F0A02E7" />
-    <public type="id" name="chat_list_adapter_item_text_decorator_reply_name" id="0x7F0A02E8" />
-    <public type="id" name="chat_list_adapter_item_text_dismiss" id="0x7F0A02E9" />
-    <public type="id" name="chat_list_adapter_item_text_error" id="0x7F0A02EA" />
-    <public type="id" name="chat_list_adapter_item_text_header" id="0x7F0A02EB" />
-    <public type="id" name="chat_list_adapter_item_text_loading" id="0x7F0A02EC" />
-    <public type="id" name="chat_list_adapter_item_text_name" id="0x7F0A02ED" />
-    <public type="id" name="chat_list_adapter_item_text_reply_content" id="0x7F0A02EE" />
-    <public type="id" name="chat_list_adapter_item_text_tag" id="0x7F0A02EF" />
-    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7F0A02F0" />
-    <public type="id" name="chat_list_adapter_item_thread_embed_spine" id="0x7F0A02F1" />
-    <public type="id" name="chat_list_adapter_item_unjoined_call_duration" id="0x7F0A02F2" />
-    <public type="id" name="chat_list_adapter_item_visibility_icon" id="0x7F0A02F3" />
-    <public type="id" name="chat_list_adapter_thread_header_icon" id="0x7F0A02F4" />
-    <public type="id" name="chat_list_empty_image" id="0x7F0A02F5" />
-    <public type="id" name="chat_list_empty_pins_text" id="0x7F0A02F6" />
-    <public type="id" name="chat_list_item_attachment_barrier" id="0x7F0A02F7" />
-    <public type="id" name="chat_list_item_attachment_card" id="0x7F0A02F8" />
-    <public type="id" name="chat_list_item_attachment_description" id="0x7F0A02F9" />
-    <public type="id" name="chat_list_item_attachment_download" id="0x7F0A02FA" />
-    <public type="id" name="chat_list_item_attachment_icon" id="0x7F0A02FB" />
-    <public type="id" name="chat_list_item_attachment_inline_media" id="0x7F0A02FC" />
-    <public type="id" name="chat_list_item_attachment_name" id="0x7F0A02FD" />
-    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7F0A02FE" />
-    <public type="id" name="chat_list_item_embed_author_icon" id="0x7F0A02FF" />
-    <public type="id" name="chat_list_item_embed_author_text" id="0x7F0A0300" />
-    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7F0A0301" />
-    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7F0A0302" />
-    <public type="id" name="chat_list_item_embed_container_card" id="0x7F0A0303" />
-    <public type="id" name="chat_list_item_embed_content" id="0x7F0A0304" />
-    <public type="id" name="chat_list_item_embed_description" id="0x7F0A0305" />
-    <public type="id" name="chat_list_item_embed_divider" id="0x7F0A0306" />
-    <public type="id" name="chat_list_item_embed_field_name" id="0x7F0A0307" />
-    <public type="id" name="chat_list_item_embed_field_value" id="0x7F0A0308" />
-    <public type="id" name="chat_list_item_embed_fields" id="0x7F0A0309" />
-    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7F0A030A" />
-    <public type="id" name="chat_list_item_embed_footer_text" id="0x7F0A030B" />
-    <public type="id" name="chat_list_item_embed_image" id="0x7F0A030C" />
-    <public type="id" name="chat_list_item_embed_image_icons" id="0x7F0A030D" />
-    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7F0A030E" />
-    <public type="id" name="chat_list_item_embed_provider" id="0x7F0A030F" />
-    <public type="id" name="chat_list_item_embed_spoiler" id="0x7F0A0310" />
-    <public type="id" name="chat_list_item_embed_title" id="0x7F0A0311" />
-    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7F0A0312" />
-    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7F0A0313" />
-    <public type="id" name="chat_list_item_message_header_channel" id="0x7F0A0314" />
-    <public type="id" name="chat_list_item_message_header_divider" id="0x7F0A0315" />
-    <public type="id" name="chat_list_item_message_header_guild" id="0x7F0A0316" />
-    <public type="id" name="chat_list_item_message_header_spacer" id="0x7F0A0317" />
-    <public type="id" name="chat_list_item_reactions" id="0x7F0A0318" />
-    <public type="id" name="chat_list_recycler" id="0x7F0A0319" />
-    <public type="id" name="chat_list_search_empty_image" id="0x7F0A031A" />
-    <public type="id" name="chat_list_search_error_text" id="0x7F0A031B" />
-    <public type="id" name="chat_list_search_indexing_animation" id="0x7F0A031C" />
-    <public type="id" name="chat_list_search_indexing_text" id="0x7F0A031D" />
-    <public type="id" name="chat_member_verification_input_guard_action" id="0x7F0A031E" />
-    <public type="id" name="chat_member_verification_input_guard_chevron" id="0x7F0A031F" />
-    <public type="id" name="chat_member_verification_input_guard_icon" id="0x7F0A0320" />
-    <public type="id" name="chat_member_verification_input_guard_text" id="0x7F0A0321" />
-    <public type="id" name="chat_overlay_old_messages_fab" id="0x7F0A0322" />
-    <public type="id" name="chat_overlay_typing" id="0x7F0A0323" />
-    <public type="id" name="chat_overlay_typing_dots" id="0x7F0A0324" />
-    <public type="id" name="chat_status_unread_messages" id="0x7F0A0325" />
-    <public type="id" name="chat_status_unread_messages_mark" id="0x7F0A0326" />
-    <public type="id" name="chat_status_unread_messages_text" id="0x7F0A0327" />
-    <public type="id" name="chat_typing_users_slowmode" id="0x7F0A0328" />
-    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7F0A0329" />
-    <public type="id" name="chat_typing_users_typing" id="0x7F0A032A" />
-    <public type="id" name="chat_upload_1" id="0x7F0A032B" />
-    <public type="id" name="chat_upload_2" id="0x7F0A032C" />
-    <public type="id" name="chat_upload_3" id="0x7F0A032D" />
-    <public type="id" name="check" id="0x7F0A032E" />
-    <public type="id" name="checkable_off_container" id="0x7F0A032F" />
-    <public type="id" name="checkbox" id="0x7F0A0330" />
-    <public type="id" name="checkboxes_container" id="0x7F0A0331" />
-    <public type="id" name="checked" id="0x7F0A0332" />
-    <public type="id" name="chip" id="0x7F0A0333" />
-    <public type="id" name="chip1" id="0x7F0A0334" />
-    <public type="id" name="chip2" id="0x7F0A0335" />
-    <public type="id" name="chip3" id="0x7F0A0336" />
-    <public type="id" name="chip_group" id="0x7F0A0337" />
-    <public type="id" name="chip_image" id="0x7F0A0338" />
-    <public type="id" name="chip_text" id="0x7F0A0339" />
-    <public type="id" name="chips_view" id="0x7F0A033A" />
-    <public type="id" name="choose_plan_empty_container" id="0x7F0A033B" />
-    <public type="id" name="choose_plan_empty_description" id="0x7F0A033C" />
-    <public type="id" name="choose_plan_recycler" id="0x7F0A033D" />
-    <public type="id" name="chronometer" id="0x7F0A033E" />
-    <public type="id" name="circle" id="0x7F0A033F" />
-    <public type="id" name="circle_center" id="0x7F0A0340" />
-    <public type="id" name="clear_text" id="0x7F0A0341" />
-    <public type="id" name="client_outdated_anchor_wrap" id="0x7F0A0342" />
-    <public type="id" name="client_outdated_update" id="0x7F0A0343" />
-    <public type="id" name="clip_horizontal" id="0x7F0A0344" />
-    <public type="id" name="clip_vertical" id="0x7F0A0345" />
-    <public type="id" name="clockwise" id="0x7F0A0346" />
-    <public type="id" name="close" id="0x7F0A0347" />
-    <public type="id" name="close_button" id="0x7F0A0348" />
-    <public type="id" name="cloudy" id="0x7F0A0349" />
-    <public type="id" name="collapseActionView" id="0x7F0A034A" />
-    <public type="id" name="collapsing_toolbar" id="0x7F0A034B" />
-    <public type="id" name="column" id="0x7F0A034C" />
-    <public type="id" name="column_reverse" id="0x7F0A034D" />
-    <public type="id" name="command_bottom_sheet_command_avatar" id="0x7F0A034E" />
-    <public type="id" name="command_bottom_sheet_command_content" id="0x7F0A034F" />
-    <public type="id" name="command_bottom_sheet_command_copy_button" id="0x7F0A0350" />
-    <public type="id" name="command_bottom_sheet_command_loader" id="0x7F0A0351" />
-    <public type="id" name="command_bottom_sheet_command_slash_heading" id="0x7F0A0352" />
-    <public type="id" name="command_bottom_sheet_command_title" id="0x7F0A0353" />
-    <public type="id" name="command_bottom_sheet_command_title_application_name" id="0x7F0A0354" />
-    <public type="id" name="command_category_item_icon" id="0x7F0A0355" />
-    <public type="id" name="community_first_step_scroll" id="0x7F0A0356" />
-    <public type="id" name="community_get_started_header" id="0x7F0A0357" />
-    <public type="id" name="community_get_started_header_icon" id="0x7F0A0358" />
-    <public type="id" name="community_get_started_header_icon_text" id="0x7F0A0359" />
-    <public type="id" name="community_get_started_header_image" id="0x7F0A035A" />
-    <public type="id" name="community_get_started_scroll" id="0x7F0A035B" />
-    <public type="id" name="community_guideline" id="0x7F0A035C" />
-    <public type="id" name="community_guidelines_channel" id="0x7F0A035D" />
-    <public type="id" name="community_header_image" id="0x7F0A035E" />
-    <public type="id" name="community_list_adapter_item_description" id="0x7F0A035F" />
-    <public type="id" name="community_list_adapter_item_icon" id="0x7F0A0360" />
-    <public type="id" name="community_list_adapter_item_text_header" id="0x7F0A0361" />
-    <public type="id" name="community_list_adapter_item_text_icon" id="0x7F0A0362" />
-    <public type="id" name="community_list_adapter_item_text_name" id="0x7F0A0363" />
-    <public type="id" name="community_rules_channel" id="0x7F0A0364" />
-    <public type="id" name="community_setting_community_guidelines_switch" id="0x7F0A0365" />
-    <public type="id" name="community_setting_get_started" id="0x7F0A0366" />
-    <public type="id" name="community_setting_guidelines" id="0x7F0A0367" />
-    <public type="id" name="community_setting_manage_permissions_switch" id="0x7F0A0368" />
-    <public type="id" name="community_setting_notifications_to_mentions_switch" id="0x7F0A0369" />
-    <public type="id" name="community_settings_scan_messages_switch" id="0x7F0A036A" />
-    <public type="id" name="community_settings_verified_emailed_switch" id="0x7F0A036B" />
-    <public type="id" name="community_step_header" id="0x7F0A036C" />
-    <public type="id" name="community_updates_channel" id="0x7F0A036D" />
-    <public type="id" name="compression_toggle" id="0x7F0A036E" />
-    <public type="id" name="compression_toggle_subtext" id="0x7F0A036F" />
-    <public type="id" name="confirm" id="0x7F0A0370" />
-    <public type="id" name="confirm_button" id="0x7F0A0371" />
-    <public type="id" name="confirm_deleting_community_body_text" id="0x7F0A0372" />
-    <public type="id" name="confirm_deleting_community_cancel" id="0x7F0A0373" />
-    <public type="id" name="confirm_deleting_community_header" id="0x7F0A0374" />
-    <public type="id" name="confirm_deleting_community_header_container" id="0x7F0A0375" />
-    <public type="id" name="confirm_deleting_community_ok" id="0x7F0A0376" />
-    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7F0A0377" />
-    <public type="id" name="connected_account_actions_dialog_header" id="0x7F0A0378" />
-    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7F0A0379" />
-    <public type="id" name="connected_account_disconnect" id="0x7F0A037A" />
-    <public type="id" name="connected_account_divider" id="0x7F0A037B" />
-    <public type="id" name="connected_account_img" id="0x7F0A037C" />
-    <public type="id" name="connected_account_name" id="0x7F0A037D" />
-    <public type="id" name="connections" id="0x7F0A037E" />
-    <public type="id" name="connections_empty" id="0x7F0A037F" />
-    <public type="id" name="connections_recycler" id="0x7F0A0380" />
-    <public type="id" name="connections_xbox_code" id="0x7F0A0381" />
-    <public type="id" name="connections_xbox_login" id="0x7F0A0382" />
-    <public type="id" name="contact" id="0x7F0A0383" />
-    <public type="id" name="contact_sync_add_phone" id="0x7F0A0384" />
-    <public type="id" name="contact_sync_add_phone_input" id="0x7F0A0385" />
-    <public type="id" name="contact_sync_add_phone_next" id="0x7F0A0386" />
-    <public type="id" name="contact_sync_add_phone_subtitle" id="0x7F0A0387" />
-    <public type="id" name="contact_sync_add_phone_title" id="0x7F0A0388" />
-    <public type="id" name="contact_sync_discovery_info_1" id="0x7F0A0389" />
-    <public type="id" name="contact_sync_discovery_info_2" id="0x7F0A038A" />
-    <public type="id" name="contact_sync_discovery_toggle" id="0x7F0A038B" />
-    <public type="id" name="contact_sync_friend_suggestions" id="0x7F0A038C" />
-    <public type="id" name="contact_sync_friend_suggestions_empty" id="0x7F0A038D" />
-    <public type="id" name="contact_sync_landing" id="0x7F0A038E" />
-    <public type="id" name="contact_sync_landing_cta" id="0x7F0A038F" />
-    <public type="id" name="contact_sync_landing_needs_permissions" id="0x7F0A0390" />
-    <public type="id" name="contact_sync_landing_next_button" id="0x7F0A0391" />
-    <public type="id" name="contact_sync_landing_permissions_divider" id="0x7F0A0392" />
-    <public type="id" name="contact_sync_landing_subtitle" id="0x7F0A0393" />
-    <public type="id" name="contact_sync_landing_title" id="0x7F0A0394" />
-    <public type="id" name="contact_sync_landing_toggle_info" id="0x7F0A0395" />
-    <public type="id" name="contact_sync_name" id="0x7F0A0396" />
-    <public type="id" name="contact_sync_name_input" id="0x7F0A0397" />
-    <public type="id" name="contact_sync_name_input_wrap" id="0x7F0A0398" />
-    <public type="id" name="contact_sync_name_next_button" id="0x7F0A0399" />
-    <public type="id" name="contact_sync_name_prefill_hint" id="0x7F0A039A" />
-    <public type="id" name="contact_sync_name_subtitle" id="0x7F0A039B" />
-    <public type="id" name="contact_sync_name_title" id="0x7F0A039C" />
-    <public type="id" name="contact_sync_permissions_discoverable_toggle" id="0x7F0A039D" />
-    <public type="id" name="contact_sync_permissions_discovery_info_1" id="0x7F0A039E" />
-    <public type="id" name="contact_sync_permissions_discovery_info_2" id="0x7F0A039F" />
-    <public type="id" name="contact_sync_permissions_email_toggle" id="0x7F0A03A0" />
-    <public type="id" name="contact_sync_permissions_learn_more" id="0x7F0A03A1" />
-    <public type="id" name="contact_sync_permissions_phone_toggle" id="0x7F0A03A2" />
-    <public type="id" name="contact_sync_permissions_subtitle" id="0x7F0A03A3" />
-    <public type="id" name="contact_sync_setting_email" id="0x7F0A03A4" />
-    <public type="id" name="contact_sync_setting_enabled" id="0x7F0A03A5" />
-    <public type="id" name="contact_sync_setting_info" id="0x7F0A03A6" />
-    <public type="id" name="contact_sync_setting_phone" id="0x7F0A03A7" />
-    <public type="id" name="contact_sync_setting_staff_only" id="0x7F0A03A8" />
-    <public type="id" name="contact_sync_suggestions_empty_subtitle" id="0x7F0A03A9" />
-    <public type="id" name="contact_sync_suggestions_empty_title" id="0x7F0A03AA" />
-    <public type="id" name="contact_sync_suggestions_invite_button" id="0x7F0A03AB" />
-    <public type="id" name="contact_sync_suggestions_list_recycler" id="0x7F0A03AC" />
-    <public type="id" name="contact_sync_suggestions_skip_button" id="0x7F0A03AD" />
-    <public type="id" name="contact_sync_suggestions_submit_button" id="0x7F0A03AE" />
-    <public type="id" name="contact_sync_suggestions_subtitle" id="0x7F0A03AF" />
-    <public type="id" name="contact_sync_suggestions_title" id="0x7F0A03B0" />
-    <public type="id" name="contact_sync_upsell_cta" id="0x7F0A03B1" />
-    <public type="id" name="contact_sync_upsell_next_button" id="0x7F0A03B2" />
-    <public type="id" name="contact_sync_upsell_skip_button" id="0x7F0A03B3" />
-    <public type="id" name="contact_sync_upsell_subtitle" id="0x7F0A03B4" />
-    <public type="id" name="contact_sync_upsell_title" id="0x7F0A03B5" />
-    <public type="id" name="contact_sync_upsell_toggle_info" id="0x7F0A03B6" />
-    <public type="id" name="contact_sync_verify_phone" id="0x7F0A03B7" />
-    <public type="id" name="contact_sync_verify_phone_code" id="0x7F0A03B8" />
-    <public type="id" name="contact_sync_verify_phone_subtitle" id="0x7F0A03B9" />
-    <public type="id" name="contact_sync_verify_phone_title" id="0x7F0A03BA" />
-    <public type="id" name="contact_sync_view_flipper" id="0x7F0A03BB" />
-    <public type="id" name="container" id="0x7F0A03BC" />
-    <public type="id" name="content" id="0x7F0A03BD" />
-    <public type="id" name="contentPanel" id="0x7F0A03BE" />
-    <public type="id" name="content_container" id="0x7F0A03BF" />
-    <public type="id" name="content_iv" id="0x7F0A03C0" />
-    <public type="id" name="content_pager" id="0x7F0A03C1" />
-    <public type="id" name="content_tabs" id="0x7F0A03C2" />
-    <public type="id" name="contiguous" id="0x7F0A03C3" />
-    <public type="id" name="continue_button" id="0x7F0A03C4" />
-    <public type="id" name="controls_shadow" id="0x7F0A03C5" />
-    <public type="id" name="controls_wrapper" id="0x7F0A03C6" />
-    <public type="id" name="coordinator" id="0x7F0A03C7" />
-    <public type="id" name="copy_link_group" id="0x7F0A03C8" />
-    <public type="id" name="copy_link_icon" id="0x7F0A03C9" />
-    <public type="id" name="copy_link_icon_barrier" id="0x7F0A03CA" />
-    <public type="id" name="copy_link_subtitle" id="0x7F0A03CB" />
-    <public type="id" name="copy_link_title" id="0x7F0A03CC" />
-    <public type="id" name="cos" id="0x7F0A03CD" />
-    <public type="id" name="counter_text_1" id="0x7F0A03CE" />
-    <public type="id" name="counter_text_2" id="0x7F0A03CF" />
-    <public type="id" name="counter_text_switcher" id="0x7F0A03D0" />
-    <public type="id" name="counterclockwise" id="0x7F0A03D1" />
-    <public type="id" name="cpv_color_image_view" id="0x7F0A03D2" />
-    <public type="id" name="cpv_color_panel_new" id="0x7F0A03D3" />
-    <public type="id" name="cpv_color_panel_old" id="0x7F0A03D4" />
-    <public type="id" name="cpv_color_panel_view" id="0x7F0A03D5" />
-    <public type="id" name="cpv_color_picker_content" id="0x7F0A03D6" />
-    <public type="id" name="cpv_color_picker_custom_button" id="0x7F0A03D7" />
-    <public type="id" name="cpv_color_picker_custom_reset" id="0x7F0A03D8" />
-    <public type="id" name="cpv_color_picker_select_button" id="0x7F0A03D9" />
-    <public type="id" name="cpv_color_picker_title" id="0x7F0A03DA" />
-    <public type="id" name="cpv_color_picker_view" id="0x7F0A03DB" />
-    <public type="id" name="cpv_hex" id="0x7F0A03DC" />
-    <public type="id" name="cpv_hex_container" id="0x7F0A03DD" />
-    <public type="id" name="cpv_hex_prefix" id="0x7F0A03DE" />
-    <public type="id" name="cpv_preference_preview_color_panel" id="0x7F0A03DF" />
-    <public type="id" name="create_channel_announcements_container" id="0x7F0A03E0" />
-    <public type="id" name="create_channel_announcements_icon" id="0x7F0A03E1" />
-    <public type="id" name="create_channel_announcements_radio" id="0x7F0A03E2" />
-    <public type="id" name="create_channel_announcements_title" id="0x7F0A03E3" />
-    <public type="id" name="create_channel_follower_button" id="0x7F0A03E4" />
-    <public type="id" name="create_channel_name_layout" id="0x7F0A03E5" />
-    <public type="id" name="create_channel_private_container" id="0x7F0A03E6" />
-    <public type="id" name="create_channel_private_info" id="0x7F0A03E7" />
-    <public type="id" name="create_channel_private_switch" id="0x7F0A03E8" />
-    <public type="id" name="create_channel_private_title" id="0x7F0A03E9" />
-    <public type="id" name="create_channel_role_access_recycler" id="0x7F0A03EA" />
-    <public type="id" name="create_channel_role_divider" id="0x7F0A03EB" />
-    <public type="id" name="create_channel_role_header" id="0x7F0A03EC" />
-    <public type="id" name="create_channel_stage_container" id="0x7F0A03ED" />
-    <public type="id" name="create_channel_stage_icon" id="0x7F0A03EE" />
-    <public type="id" name="create_channel_stage_radio" id="0x7F0A03EF" />
-    <public type="id" name="create_channel_stage_title" id="0x7F0A03F0" />
-    <public type="id" name="create_channel_text_container" id="0x7F0A03F1" />
-    <public type="id" name="create_channel_text_icon" id="0x7F0A03F2" />
-    <public type="id" name="create_channel_text_radio" id="0x7F0A03F3" />
-    <public type="id" name="create_channel_text_title" id="0x7F0A03F4" />
-    <public type="id" name="create_channel_type_container" id="0x7F0A03F5" />
-    <public type="id" name="create_channel_voice_container" id="0x7F0A03F6" />
-    <public type="id" name="create_channel_voice_icon" id="0x7F0A03F7" />
-    <public type="id" name="create_channel_voice_radio" id="0x7F0A03F8" />
-    <public type="id" name="create_channel_voice_title" id="0x7F0A03F9" />
-    <public type="id" name="creation_intent_first_option" id="0x7F0A03FA" />
-    <public type="id" name="creation_intent_first_option_text" id="0x7F0A03FB" />
-    <public type="id" name="creation_intent_second_option" id="0x7F0A03FC" />
-    <public type="id" name="creation_intent_second_option_text" id="0x7F0A03FD" />
-    <public type="id" name="creation_intent_skip_text" id="0x7F0A03FE" />
-    <public type="id" name="credit_header" id="0x7F0A03FF" />
-    <public type="id" name="credit_icon" id="0x7F0A0400" />
-    <public type="id" name="credit_info" id="0x7F0A0401" />
-    <public type="id" name="credit_info_container" id="0x7F0A0402" />
-    <public type="id" name="credit_nitro" id="0x7F0A0403" />
-    <public type="id" name="credit_nitro_classic" id="0x7F0A0404" />
-    <public type="id" name="credit_nitro_divider" id="0x7F0A0405" />
-    <public type="id" name="credit_time" id="0x7F0A0406" />
-    <public type="id" name="crown" id="0x7F0A0407" />
-    <public type="id" name="cs_subtitle" id="0x7F0A0408" />
-    <public type="id" name="current_bitrate_display" id="0x7F0A0409" />
-    <public type="id" name="current_user_limit_display" id="0x7F0A040A" />
-    <public type="id" name="custom" id="0x7F0A040B" />
-    <public type="id" name="customPanel" id="0x7F0A040C" />
-    <public type="id" name="cut" id="0x7F0A040D" />
-    <public type="id" name="dark" id="0x7F0A040E" />
-    <public type="id" name="date" id="0x7F0A040F" />
-    <public type="id" name="date_picker_actions" id="0x7F0A0410" />
-    <public type="id" name="daylight" id="0x7F0A0411" />
-    <public type="id" name="deafen_secondary_button" id="0x7F0A0412" />
-    <public type="id" name="debugging_logs" id="0x7F0A0413" />
-    <public type="id" name="decelerate" id="0x7F0A0414" />
-    <public type="id" name="decelerateAndComplete" id="0x7F0A0415" />
-    <public type="id" name="decor_content_parent" id="0x7F0A0416" />
-    <public type="id" name="default_activity_button" id="0x7F0A0417" />
-    <public type="id" name="default_tooltip_text" id="0x7F0A0418" />
-    <public type="id" name="default_window_insets_handler" id="0x7F0A0419" />
-    <public type="id" name="deltaRelative" id="0x7F0A041A" />
-    <public type="id" name="demote_common_words" id="0x7F0A041B" />
-    <public type="id" name="demote_rfc822_hostnames" id="0x7F0A041C" />
-    <public type="id" name="dependency_ordering" id="0x7F0A041D" />
-    <public type="id" name="description" id="0x7F0A041E" />
-    <public type="id" name="description_placeholder" id="0x7F0A041F" />
-    <public type="id" name="description_placeholder_end_guideline" id="0x7F0A0420" />
-    <public type="id" name="design_bottom_sheet" id="0x7F0A0421" />
-    <public type="id" name="design_menu_item_action_area" id="0x7F0A0422" />
-    <public type="id" name="design_menu_item_action_area_stub" id="0x7F0A0423" />
-    <public type="id" name="design_menu_item_text" id="0x7F0A0424" />
-    <public type="id" name="design_navigation_view" id="0x7F0A0425" />
-    <public type="id" name="developer_options" id="0x7F0A0426" />
-    <public type="id" name="developer_options_divider" id="0x7F0A0427" />
-    <public type="id" name="developer_options_header" id="0x7F0A0428" />
-    <public type="id" name="developer_settings_crash_discord_jnibridge" id="0x7F0A0429" />
-    <public type="id" name="developer_settings_crash_discord_nonfatal" id="0x7F0A042A" />
-    <public type="id" name="developer_settings_crash_kotlin" id="0x7F0A042B" />
-    <public type="id" name="developer_settings_experiments" id="0x7F0A042C" />
-    <public type="id" name="developer_settings_notices" id="0x7F0A042D" />
-    <public type="id" name="developer_settings_simulate_gateway_reconnect" id="0x7F0A042E" />
-    <public type="id" name="deviceDefault" id="0x7F0A042F" />
-    <public type="id" name="dialog_button" id="0x7F0A0430" />
-    <public type="id" name="dialog_cancel" id="0x7F0A0431" />
-    <public type="id" name="dialog_card" id="0x7F0A0432" />
-    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7F0A0433" />
-    <public type="id" name="dialog_chat_actions_container" id="0x7F0A0434" />
-    <public type="id" name="dialog_chat_actions_copy" id="0x7F0A0435" />
-    <public type="id" name="dialog_chat_actions_copy_id" id="0x7F0A0436" />
-    <public type="id" name="dialog_chat_actions_delete" id="0x7F0A0437" />
-    <public type="id" name="dialog_chat_actions_edit" id="0x7F0A0438" />
-    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7F0A0439" />
-    <public type="id" name="dialog_chat_actions_mark_unread" id="0x7F0A043A" />
-    <public type="id" name="dialog_chat_actions_pin" id="0x7F0A043B" />
-    <public type="id" name="dialog_chat_actions_profile" id="0x7F0A043C" />
-    <public type="id" name="dialog_chat_actions_publish" id="0x7F0A043D" />
-    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7F0A043E" />
-    <public type="id" name="dialog_chat_actions_reply" id="0x7F0A043F" />
-    <public type="id" name="dialog_chat_actions_report" id="0x7F0A0440" />
-    <public type="id" name="dialog_chat_actions_resend" id="0x7F0A0441" />
-    <public type="id" name="dialog_chat_actions_share" id="0x7F0A0442" />
-    <public type="id" name="dialog_chat_actions_start_thread" id="0x7F0A0443" />
-    <public type="id" name="dialog_date_picker_done" id="0x7F0A0444" />
-    <public type="id" name="dialog_date_picker_input" id="0x7F0A0445" />
-    <public type="id" name="dialog_date_picker_title" id="0x7F0A0446" />
-    <public type="id" name="dialog_delete" id="0x7F0A0447" />
-    <public type="id" name="dialog_save" id="0x7F0A0448" />
-    <public type="id" name="dialog_selections" id="0x7F0A0449" />
-    <public type="id" name="dialog_title" id="0x7F0A044A" />
-    <public type="id" name="dialog_url_actions_copy" id="0x7F0A044B" />
-    <public type="id" name="dialog_url_actions_open" id="0x7F0A044C" />
-    <public type="id" name="dialog_url_actions_share" id="0x7F0A044D" />
-    <public type="id" name="dialog_url_actions_url" id="0x7F0A044E" />
-    <public type="id" name="dimensions" id="0x7F0A044F" />
-    <public type="id" name="dimmer_view" id="0x7F0A0450" />
-    <public type="id" name="direct" id="0x7F0A0451" />
-    <public type="id" name="directory_channel_icon" id="0x7F0A0452" />
-    <public type="id" name="directory_channel_name" id="0x7F0A0453" />
-    <public type="id" name="disableHome" id="0x7F0A0454" />
-    <public type="id" name="disablePostScroll" id="0x7F0A0455" />
-    <public type="id" name="disableScroll" id="0x7F0A0456" />
-    <public type="id" name="disable_delete_body" id="0x7F0A0457" />
-    <public type="id" name="disable_delete_cancel" id="0x7F0A0458" />
-    <public type="id" name="disable_delete_code_wrap" id="0x7F0A0459" />
-    <public type="id" name="disable_delete_confirm" id="0x7F0A045A" />
-    <public type="id" name="disable_delete_header" id="0x7F0A045B" />
-    <public type="id" name="disable_delete_password_wrap" id="0x7F0A045C" />
-    <public type="id" name="disconnect_btn" id="0x7F0A045D" />
-    <public type="id" name="disconnect_button" id="0x7F0A045E" />
-    <public type="id" name="discovery_control_audio_icon" id="0x7F0A045F" />
-    <public type="id" name="discovery_control_exit_quietly" id="0x7F0A0460" />
-    <public type="id" name="discovery_control_joined_as" id="0x7F0A0461" />
-    <public type="id" name="discovery_control_open_stage" id="0x7F0A0462" />
-    <public type="id" name="discovery_empty_state" id="0x7F0A0463" />
-    <public type="id" name="discovery_empty_state_header" id="0x7F0A0464" />
-    <public type="id" name="discovery_empty_state_subheader" id="0x7F0A0465" />
-    <public type="id" name="discovery_empty_state_wumpus" id="0x7F0A0466" />
-    <public type="id" name="discovery_intro_card_dismiss" id="0x7F0A0467" />
-    <public type="id" name="discovery_intro_card_subtitle" id="0x7F0A0468" />
-    <public type="id" name="discovery_intro_card_title" id="0x7F0A0469" />
-    <public type="id" name="discovery_recycler" id="0x7F0A046A" />
-    <public type="id" name="discovery_speakers_recycler" id="0x7F0A046B" />
-    <public type="id" name="discovery_stage_card" id="0x7F0A046C" />
-    <public type="id" name="discovery_stage_card_body_view" id="0x7F0A046D" />
-    <public type="id" name="discovery_stage_card_controls" id="0x7F0A046E" />
-    <public type="id" name="discovery_stage_card_error" id="0x7F0A046F" />
-    <public type="id" name="discovery_stage_card_speaker_avatar" id="0x7F0A0470" />
-    <public type="id" name="discovery_stage_card_speaker_name" id="0x7F0A0471" />
-    <public type="id" name="discovery_stage_card_top_hat" id="0x7F0A0472" />
-    <public type="id" name="discovery_stage_card_top_hat_icon" id="0x7F0A0473" />
-    <public type="id" name="discovery_stage_card_top_hat_text" id="0x7F0A0474" />
-    <public type="id" name="discovery_start_stage" id="0x7F0A0475" />
-    <public type="id" name="discovery_title" id="0x7F0A0476" />
-    <public type="id" name="disjoint" id="0x7F0A0477" />
-    <public type="id" name="display_activity_switch" id="0x7F0A0478" />
-    <public type="id" name="display_name" id="0x7F0A0479" />
-    <public type="id" name="display_switch" id="0x7F0A047A" />
-    <public type="id" name="divider" id="0x7F0A047B" />
-    <public type="id" name="divider_stroke" id="0x7F0A047C" />
-    <public type="id" name="divider_stroke_left" id="0x7F0A047D" />
-    <public type="id" name="divider_stroke_right" id="0x7F0A047E" />
-    <public type="id" name="divider_text" id="0x7F0A047F" />
-    <public type="id" name="dng" id="0x7F0A0480" />
-    <public type="id" name="dragDown" id="0x7F0A0481" />
-    <public type="id" name="dragEnd" id="0x7F0A0482" />
-    <public type="id" name="dragLeft" id="0x7F0A0483" />
-    <public type="id" name="dragRight" id="0x7F0A0484" />
-    <public type="id" name="dragStart" id="0x7F0A0485" />
-    <public type="id" name="dragUp" id="0x7F0A0486" />
-    <public type="id" name="draw3x3" id="0x7F0A0487" />
-    <public type="id" name="draw4x4" id="0x7F0A0488" />
-    <public type="id" name="drawPhi" id="0x7F0A0489" />
-    <public type="id" name="dropdown_menu" id="0x7F0A048A" />
-    <public type="id" name="dtddd" id="0x7F0A048B" />
-    <public type="id" name="easeIn" id="0x7F0A048C" />
-    <public type="id" name="easeInOut" id="0x7F0A048D" />
-    <public type="id" name="easeOut" id="0x7F0A048E" />
-    <public type="id" name="edit_account_discriminator_wrap" id="0x7F0A048F" />
-    <public type="id" name="edit_account_email_wrap" id="0x7F0A0490" />
-    <public type="id" name="edit_account_name_wrap" id="0x7F0A0491" />
-    <public type="id" name="edit_account_password_wrap" id="0x7F0A0492" />
-    <public type="id" name="edit_account_tag_layout_container" id="0x7F0A0493" />
-    <public type="id" name="edit_account_username_wrap" id="0x7F0A0494" />
-    <public type="id" name="edit_guild_folder_name" id="0x7F0A0495" />
-    <public type="id" name="edit_integration_custom_emotes_container" id="0x7F0A0496" />
-    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7F0A0497" />
-    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7F0A0498" />
-    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7F0A0499" />
-    <public type="id" name="edit_integration_expired_sub_container" id="0x7F0A049A" />
-    <public type="id" name="edit_integration_grace_period_container" id="0x7F0A049B" />
-    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7F0A049C" />
-    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7F0A049D" />
-    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7F0A049E" />
-    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7F0A049F" />
-    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7F0A04A0" />
-    <public type="id" name="edit_integration_icon" id="0x7F0A04A1" />
-    <public type="id" name="edit_integration_last_sync_time" id="0x7F0A04A2" />
-    <public type="id" name="edit_integration_name" id="0x7F0A04A3" />
-    <public type="id" name="edit_integration_name_container" id="0x7F0A04A4" />
-    <public type="id" name="edit_integration_owner_name" id="0x7F0A04A5" />
-    <public type="id" name="edit_integration_save" id="0x7F0A04A6" />
-    <public type="id" name="edit_integration_settings_scroll" id="0x7F0A04A7" />
-    <public type="id" name="edit_integration_subscriber_count" id="0x7F0A04A8" />
-    <public type="id" name="edit_integration_sync_container" id="0x7F0A04A9" />
-    <public type="id" name="edit_integration_synced_role" id="0x7F0A04AA" />
-    <public type="id" name="edit_integration_synced_role_container" id="0x7F0A04AB" />
-    <public type="id" name="edit_member_administrative_container" id="0x7F0A04AC" />
-    <public type="id" name="edit_member_ban_button" id="0x7F0A04AD" />
-    <public type="id" name="edit_member_kick_button" id="0x7F0A04AE" />
-    <public type="id" name="edit_member_nickname" id="0x7F0A04AF" />
-    <public type="id" name="edit_member_roles_container" id="0x7F0A04B0" />
-    <public type="id" name="edit_member_roles_recycler" id="0x7F0A04B1" />
-    <public type="id" name="edit_member_save" id="0x7F0A04B2" />
-    <public type="id" name="edit_member_transfer_ownership_button" id="0x7F0A04B3" />
-    <public type="id" name="edit_query" id="0x7F0A04B4" />
-    <public type="id" name="edit_role_name" id="0x7F0A04B5" />
-    <public type="id" name="edit_role_save" id="0x7F0A04B6" />
-    <public type="id" name="elastic" id="0x7F0A04B7" />
-    <public type="id" name="email" id="0x7F0A04B8" />
-    <public type="id" name="embed_image_container" id="0x7F0A04B9" />
-    <public type="id" name="embed_inline_media" id="0x7F0A04BA" />
-    <public type="id" name="emoji" id="0x7F0A04BB" />
-    <public type="id" name="emojiPickerPremiumCta" id="0x7F0A04BC" />
-    <public type="id" name="emoji_app_bar" id="0x7F0A04BD" />
-    <public type="id" name="emoji_category_item_guild_icon" id="0x7F0A04BE" />
-    <public type="id" name="emoji_category_item_standard_icon" id="0x7F0A04BF" />
-    <public type="id" name="emoji_info_tv" id="0x7F0A04C0" />
-    <public type="id" name="emoji_inline_search_button" id="0x7F0A04C1" />
-    <public type="id" name="emoji_item_draweeview" id="0x7F0A04C2" />
-    <public type="id" name="emoji_iv" id="0x7F0A04C3" />
-    <public type="id" name="emoji_picker_backspace_icon" id="0x7F0A04C4" />
-    <public type="id" name="emoji_picker_bottom_bar" id="0x7F0A04C5" />
-    <public type="id" name="emoji_picker_bottom_bar_divider" id="0x7F0A04C6" />
-    <public type="id" name="emoji_picker_category_barrier" id="0x7F0A04C7" />
-    <public type="id" name="emoji_picker_category_recycler" id="0x7F0A04C8" />
-    <public type="id" name="emoji_picker_container" id="0x7F0A04C9" />
-    <public type="id" name="emoji_picker_unicode_emoji_shortcut_button" id="0x7F0A04CA" />
-    <public type="id" name="emoji_search_bar" id="0x7F0A04CB" />
-    <public type="id" name="emoji_search_clear" id="0x7F0A04CC" />
-    <public type="id" name="emoji_search_input" id="0x7F0A04CD" />
-    <public type="id" name="emoji_sheet_emoji_picker_content" id="0x7F0A04CE" />
-    <public type="id" name="emoji_sheet_flipper" id="0x7F0A04CF" />
-    <public type="id" name="emoji_text_view" id="0x7F0A04D0" />
-    <public type="id" name="emoji_toolbar" id="0x7F0A04D1" />
-    <public type="id" name="empty" id="0x7F0A04D2" />
-    <public type="id" name="empty_friends_state_add_friend" id="0x7F0A04D3" />
-    <public type="id" name="empty_friends_state_cs_button" id="0x7F0A04D4" />
-    <public type="id" name="empty_friends_state_cs_image" id="0x7F0A04D5" />
-    <public type="id" name="empty_friends_state_cs_title" id="0x7F0A04D6" />
-    <public type="id" name="empty_friends_state_image" id="0x7F0A04D7" />
-    <public type="id" name="empty_friends_state_title" id="0x7F0A04D8" />
-    <public type="id" name="empty_results" id="0x7F0A04D9" />
-    <public type="id" name="empty_state_body" id="0x7F0A04DA" />
-    <public type="id" name="empty_state_img" id="0x7F0A04DB" />
-    <public type="id" name="empty_state_invite_link" id="0x7F0A04DC" />
-    <public type="id" name="empty_state_link_options" id="0x7F0A04DD" />
-    <public type="id" name="empty_state_scroller" id="0x7F0A04DE" />
-    <public type="id" name="empty_state_settings_subtext" id="0x7F0A04DF" />
-    <public type="id" name="empty_state_share_btn" id="0x7F0A04E0" />
-    <public type="id" name="empty_state_title" id="0x7F0A04E1" />
-    <public type="id" name="empty_view" id="0x7F0A04E2" />
-    <public type="id" name="enable_button" id="0x7F0A04E3" />
-    <public type="id" name="enable_community_stepsview" id="0x7F0A04E4" />
-    <public type="id" name="enable_mfa_key_code" id="0x7F0A04E5" />
-    <public type="id" name="enable_mfa_key_launch_authy" id="0x7F0A04E6" />
-    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7F0A04E7" />
-    <public type="id" name="enable_mfa_stepsview" id="0x7F0A04E8" />
-    <public type="id" name="enable_sms_backup_body" id="0x7F0A04E9" />
-    <public type="id" name="enable_sms_backup_cancel" id="0x7F0A04EA" />
-    <public type="id" name="enable_sms_backup_confirm" id="0x7F0A04EB" />
-    <public type="id" name="enable_sms_backup_header" id="0x7F0A04EC" />
-    <public type="id" name="enable_sms_backup_password_wrap" id="0x7F0A04ED" />
-    <public type="id" name="enable_two_factor_password_body_container" id="0x7F0A04EE" />
-    <public type="id" name="enable_two_factor_password_body_text" id="0x7F0A04EF" />
-    <public type="id" name="enable_two_factor_password_cancel" id="0x7F0A04F0" />
-    <public type="id" name="enable_two_factor_password_header" id="0x7F0A04F1" />
-    <public type="id" name="enable_two_factor_password_header_container" id="0x7F0A04F2" />
-    <public type="id" name="enable_two_factor_password_ok" id="0x7F0A04F3" />
-    <public type="id" name="enable_two_factor_password_view_input" id="0x7F0A04F4" />
-    <public type="id" name="end" id="0x7F0A04F5" />
-    <public type="id" name="endToStart" id="0x7F0A04F6" />
-    <public type="id" name="end_padder" id="0x7F0A04F7" />
-    <public type="id" name="enterAlways" id="0x7F0A04F8" />
-    <public type="id" name="enterAlwaysCollapsed" id="0x7F0A04F9" />
-    <public type="id" name="exitUntilCollapsed" id="0x7F0A04FA" />
-    <public type="id" name="exo_ad_overlay" id="0x7F0A04FB" />
-    <public type="id" name="exo_artwork" id="0x7F0A04FC" />
-    <public type="id" name="exo_audio_track" id="0x7F0A04FD" />
-    <public type="id" name="exo_basic_controls" id="0x7F0A04FE" />
-    <public type="id" name="exo_bottom_bar" id="0x7F0A04FF" />
-    <public type="id" name="exo_buffering" id="0x7F0A0500" />
-    <public type="id" name="exo_center_controls" id="0x7F0A0501" />
-    <public type="id" name="exo_check" id="0x7F0A0502" />
-    <public type="id" name="exo_content_frame" id="0x7F0A0503" />
-    <public type="id" name="exo_controller" id="0x7F0A0504" />
-    <public type="id" name="exo_controller_placeholder" id="0x7F0A0505" />
-    <public type="id" name="exo_controls_background" id="0x7F0A0506" />
-    <public type="id" name="exo_duration" id="0x7F0A0507" />
-    <public type="id" name="exo_error_message" id="0x7F0A0508" />
-    <public type="id" name="exo_extra_controls" id="0x7F0A0509" />
-    <public type="id" name="exo_extra_controls_scroll_view" id="0x7F0A050A" />
-    <public type="id" name="exo_ffwd" id="0x7F0A050B" />
-    <public type="id" name="exo_ffwd_with_amount" id="0x7F0A050C" />
-    <public type="id" name="exo_fullscreen" id="0x7F0A050D" />
-    <public type="id" name="exo_icon" id="0x7F0A050E" />
-    <public type="id" name="exo_main_text" id="0x7F0A050F" />
-    <public type="id" name="exo_minimal_controls" id="0x7F0A0510" />
-    <public type="id" name="exo_minimal_fullscreen" id="0x7F0A0511" />
-    <public type="id" name="exo_next" id="0x7F0A0512" />
-    <public type="id" name="exo_overflow_hide" id="0x7F0A0513" />
-    <public type="id" name="exo_overflow_show" id="0x7F0A0514" />
-    <public type="id" name="exo_overlay" id="0x7F0A0515" />
-    <public type="id" name="exo_pause" id="0x7F0A0516" />
-    <public type="id" name="exo_play" id="0x7F0A0517" />
-    <public type="id" name="exo_play_pause" id="0x7F0A0518" />
-    <public type="id" name="exo_playback_speed" id="0x7F0A0519" />
-    <public type="id" name="exo_position" id="0x7F0A051A" />
-    <public type="id" name="exo_prev" id="0x7F0A051B" />
-    <public type="id" name="exo_progress" id="0x7F0A051C" />
-    <public type="id" name="exo_progress_placeholder" id="0x7F0A051D" />
-    <public type="id" name="exo_repeat_toggle" id="0x7F0A051E" />
-    <public type="id" name="exo_rew" id="0x7F0A051F" />
-    <public type="id" name="exo_rew_with_amount" id="0x7F0A0520" />
-    <public type="id" name="exo_settings" id="0x7F0A0521" />
-    <public type="id" name="exo_settings_listview" id="0x7F0A0522" />
-    <public type="id" name="exo_shuffle" id="0x7F0A0523" />
-    <public type="id" name="exo_shutter" id="0x7F0A0524" />
-    <public type="id" name="exo_sub_text" id="0x7F0A0525" />
-    <public type="id" name="exo_subtitle" id="0x7F0A0526" />
-    <public type="id" name="exo_subtitles" id="0x7F0A0527" />
-    <public type="id" name="exo_text" id="0x7F0A0528" />
-    <public type="id" name="exo_time" id="0x7F0A0529" />
-    <public type="id" name="exo_track_selection_view" id="0x7F0A052A" />
-    <public type="id" name="exo_vr" id="0x7F0A052B" />
-    <public type="id" name="expand_activities_button" id="0x7F0A052C" />
-    <public type="id" name="expand_btn" id="0x7F0A052D" />
-    <public type="id" name="expanded_menu" id="0x7F0A052E" />
-    <public type="id" name="experiment_override_bucket_descriptions" id="0x7F0A052F" />
-    <public type="id" name="experiment_override_buckets_spinner" id="0x7F0A0530" />
-    <public type="id" name="experiment_override_buckets_spinner_container" id="0x7F0A0531" />
-    <public type="id" name="experiment_override_clear" id="0x7F0A0532" />
-    <public type="id" name="experiment_override_experiment_api_name" id="0x7F0A0533" />
-    <public type="id" name="experiment_override_experiment_name" id="0x7F0A0534" />
-    <public type="id" name="experiment_overrides_list_item_experiment_override_view" id="0x7F0A0535" />
-    <public type="id" name="exposureCorrection" id="0x7F0A0536" />
-    <public type="id" name="expression_btn" id="0x7F0A0537" />
-    <public type="id" name="expression_btn_badge" id="0x7F0A0538" />
-    <public type="id" name="expression_btn_container" id="0x7F0A0539" />
-    <public type="id" name="expression_picker_category_selection_overline" id="0x7F0A053A" />
-    <public type="id" name="expression_tray_container" id="0x7F0A053B" />
-    <public type="id" name="expression_tray_content_container" id="0x7F0A053C" />
-    <public type="id" name="expression_tray_detail_page" id="0x7F0A053D" />
-    <public type="id" name="expression_tray_emoji_card" id="0x7F0A053E" />
-    <public type="id" name="expression_tray_emoji_picker_content" id="0x7F0A053F" />
-    <public type="id" name="expression_tray_gif_card" id="0x7F0A0540" />
-    <public type="id" name="expression_tray_gif_picker_content" id="0x7F0A0541" />
-    <public type="id" name="expression_tray_landing_page" id="0x7F0A0542" />
-    <public type="id" name="expression_tray_search_bar" id="0x7F0A0543" />
-    <public type="id" name="expression_tray_search_button" id="0x7F0A0544" />
-    <public type="id" name="expression_tray_search_icon" id="0x7F0A0545" />
-    <public type="id" name="expression_tray_segmented_control" id="0x7F0A0546" />
-    <public type="id" name="expression_tray_sticker_card" id="0x7F0A0547" />
-    <public type="id" name="expression_tray_sticker_picker_content" id="0x7F0A0548" />
-    <public type="id" name="expression_tray_toolbar" id="0x7F0A0549" />
-    <public type="id" name="expression_tray_toolbar_layout" id="0x7F0A054A" />
-    <public type="id" name="external_share_activity_action_preview" id="0x7F0A054B" />
-    <public type="id" name="external_share_comment" id="0x7F0A054C" />
-    <public type="id" name="external_share_list" id="0x7F0A054D" />
-    <public type="id" name="external_share_list_wrap" id="0x7F0A054E" />
-    <public type="id" name="external_share_search" id="0x7F0A054F" />
-    <public type="id" name="external_share_search_results" id="0x7F0A0550" />
-    <public type="id" name="extra_info" id="0x7F0A0551" />
-    <public type="id" name="fab_menu_add_category" id="0x7F0A0552" />
-    <public type="id" name="fab_menu_add_text" id="0x7F0A0553" />
-    <public type="id" name="fab_menu_add_voice" id="0x7F0A0554" />
-    <public type="id" name="fab_menu_main" id="0x7F0A0555" />
-    <public type="id" name="fab_menu_main_fab" id="0x7F0A0556" />
-    <public type="id" name="fab_menu_table" id="0x7F0A0557" />
-    <public type="id" name="fade" id="0x7F0A0558" />
-    <public type="id" name="failed_alert_icon" id="0x7F0A0559" />
-    <public type="id" name="fatal_crash_app_version" id="0x7F0A055A" />
-    <public type="id" name="fatal_crash_details" id="0x7F0A055B" />
-    <public type="id" name="fatal_crash_device" id="0x7F0A055C" />
-    <public type="id" name="fatal_crash_os_version" id="0x7F0A055D" />
-    <public type="id" name="fatal_crash_source" id="0x7F0A055E" />
-    <public type="id" name="fatal_crash_testers_invite" id="0x7F0A055F" />
-    <public type="id" name="fatal_crash_time" id="0x7F0A0560" />
-    <public type="id" name="favorite_add_button" id="0x7F0A0561" />
-    <public type="id" name="favorite_container" id="0x7F0A0562" />
-    <public type="id" name="favorite_remove_button" id="0x7F0A0563" />
-    <public type="id" name="feedback_happy_rating" id="0x7F0A0564" />
-    <public type="id" name="feedback_issue_section_header" id="0x7F0A0565" />
-    <public type="id" name="feedback_issues_card" id="0x7F0A0566" />
-    <public type="id" name="feedback_issues_recycler" id="0x7F0A0567" />
-    <public type="id" name="feedback_neutral_rating" id="0x7F0A0568" />
-    <public type="id" name="feedback_rating_container" id="0x7F0A0569" />
-    <public type="id" name="feedback_rating_summary_prompt" id="0x7F0A056A" />
-    <public type="id" name="feedback_sad_rating" id="0x7F0A056B" />
-    <public type="id" name="feedback_sheet_close_button" id="0x7F0A056C" />
-    <public type="id" name="feedback_sheet_container" id="0x7F0A056D" />
-    <public type="id" name="feedback_sheet_feedback_view" id="0x7F0A056E" />
-    <public type="id" name="feedback_sheet_title" id="0x7F0A056F" />
-    <public type="id" name="file_image" id="0x7F0A0570" />
-    <public type="id" name="file_name_tv" id="0x7F0A0571" />
-    <public type="id" name="file_subtitle_tv" id="0x7F0A0572" />
-    <public type="id" name="fill" id="0x7F0A0573" />
-    <public type="id" name="fill_horizontal" id="0x7F0A0574" />
-    <public type="id" name="fill_vertical" id="0x7F0A0575" />
-    <public type="id" name="filled" id="0x7F0A0576" />
-    <public type="id" name="filterControl1" id="0x7F0A0577" />
-    <public type="id" name="filterControl2" id="0x7F0A0578" />
-    <public type="id" name="fit" id="0x7F0A0579" />
-    <public type="id" name="fitBottomStart" id="0x7F0A057A" />
-    <public type="id" name="fitCenter" id="0x7F0A057B" />
-    <public type="id" name="fitEnd" id="0x7F0A057C" />
-    <public type="id" name="fitStart" id="0x7F0A057D" />
-    <public type="id" name="fitToContents" id="0x7F0A057E" />
-    <public type="id" name="fitXY" id="0x7F0A057F" />
-    <public type="id" name="fixed" id="0x7F0A0580" />
-    <public type="id" name="fixed_height" id="0x7F0A0581" />
-    <public type="id" name="fixed_width" id="0x7F0A0582" />
-    <public type="id" name="flClickShield" id="0x7F0A0583" />
-    <public type="id" name="flIconContainer" id="0x7F0A0584" />
-    <public type="id" name="flRightIconContainer" id="0x7F0A0585" />
-    <public type="id" name="flag_icon" id="0x7F0A0586" />
-    <public type="id" name="flag_icon_barrier" id="0x7F0A0587" />
-    <public type="id" name="flex_end" id="0x7F0A0588" />
-    <public type="id" name="flex_start" id="0x7F0A0589" />
-    <public type="id" name="flip" id="0x7F0A058A" />
-    <public type="id" name="flipper" id="0x7F0A058B" />
-    <public type="id" name="floating" id="0x7F0A058C" />
-    <public type="id" name="fluorescent" id="0x7F0A058D" />
-    <public type="id" name="focusCrop" id="0x7F0A058E" />
-    <public type="id" name="focusMarkerContainer" id="0x7F0A058F" />
-    <public type="id" name="focusMarkerFill" id="0x7F0A0590" />
-    <public type="id" name="folder_context_menu_card" id="0x7F0A0591" />
-    <public type="id" name="folder_context_menu_header" id="0x7F0A0592" />
-    <public type="id" name="folder_context_menu_header_divider" id="0x7F0A0593" />
-    <public type="id" name="folder_context_menu_mark_as_read" id="0x7F0A0594" />
-    <public type="id" name="folder_context_menu_settings" id="0x7F0A0595" />
-    <public type="id" name="folder_view_folder_image" id="0x7F0A0596" />
-    <public type="id" name="follow_sheet_view_flipper" id="0x7F0A0597" />
-    <public type="id" name="forever" id="0x7F0A0598" />
-    <public type="id" name="fragment_container_view_tag" id="0x7F0A0599" />
-    <public type="id" name="friend_add_username_indicator" id="0x7F0A059A" />
-    <public type="id" name="friend_container" id="0x7F0A059B" />
-    <public type="id" name="friend_suggestion_avatar" id="0x7F0A059C" />
-    <public type="id" name="friend_suggestion_container" id="0x7F0A059D" />
-    <public type="id" name="friend_suggestion_discriminator" id="0x7F0A059E" />
-    <public type="id" name="friend_suggestion_name" id="0x7F0A059F" />
-    <public type="id" name="friend_suggestion_nickname" id="0x7F0A05A0" />
-    <public type="id" name="friend_suggestion_selected" id="0x7F0A05A1" />
-    <public type="id" name="friends_add_container" id="0x7F0A05A2" />
-    <public type="id" name="friends_add_send" id="0x7F0A05A3" />
-    <public type="id" name="friends_add_text_edit_wrap" id="0x7F0A05A4" />
-    <public type="id" name="friends_list_contact_sync_upsell_arrow" id="0x7F0A05A5" />
-    <public type="id" name="friends_list_contact_sync_upsell_container" id="0x7F0A05A6" />
-    <public type="id" name="friends_list_contact_sync_upsell_icon" id="0x7F0A05A7" />
-    <public type="id" name="friends_list_contact_sync_upsell_subtitle" id="0x7F0A05A8" />
-    <public type="id" name="friends_list_contact_sync_upsell_title" id="0x7F0A05A9" />
-    <public type="id" name="friends_list_empty_friends_state_cs_view" id="0x7F0A05AA" />
-    <public type="id" name="friends_list_empty_friends_state_view" id="0x7F0A05AB" />
-    <public type="id" name="friends_list_expandable_header_button" id="0x7F0A05AC" />
-    <public type="id" name="friends_list_flipper" id="0x7F0A05AD" />
-    <public type="id" name="friends_list_item_accept_button" id="0x7F0A05AE" />
-    <public type="id" name="friends_list_item_activity" id="0x7F0A05AF" />
-    <public type="id" name="friends_list_item_avatar" id="0x7F0A05B0" />
-    <public type="id" name="friends_list_item_avatar_wrap" id="0x7F0A05B1" />
-    <public type="id" name="friends_list_item_buttons_wrap" id="0x7F0A05B2" />
-    <public type="id" name="friends_list_item_call_button" id="0x7F0A05B3" />
-    <public type="id" name="friends_list_item_chat_button" id="0x7F0A05B4" />
-    <public type="id" name="friends_list_item_decline_button" id="0x7F0A05B5" />
-    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7F0A05B6" />
-    <public type="id" name="friends_list_item_game" id="0x7F0A05B7" />
-    <public type="id" name="friends_list_item_header_text" id="0x7F0A05B8" />
-    <public type="id" name="friends_list_item_name" id="0x7F0A05B9" />
-    <public type="id" name="friends_list_item_status" id="0x7F0A05BA" />
-    <public type="id" name="friends_list_item_text" id="0x7F0A05BB" />
-    <public type="id" name="friends_list_loading" id="0x7F0A05BC" />
-    <public type="id" name="friends_list_pending_item_header_text" id="0x7F0A05BD" />
-    <public type="id" name="friends_list_recycler" id="0x7F0A05BE" />
-    <public type="id" name="front" id="0x7F0A05BF" />
-    <public type="id" name="gallery_btn" id="0x7F0A05C0" />
-    <public type="id" name="ghost_view" id="0x7F0A05C1" />
-    <public type="id" name="ghost_view_holder" id="0x7F0A05C2" />
-    <public type="id" name="gif_category_container" id="0x7F0A05C3" />
-    <public type="id" name="gif_category_gif_recycler" id="0x7F0A05C4" />
-    <public type="id" name="gif_category_item_icon" id="0x7F0A05C5" />
-    <public type="id" name="gif_category_item_preview" id="0x7F0A05C6" />
-    <public type="id" name="gif_category_item_title" id="0x7F0A05C7" />
-    <public type="id" name="gif_category_loading_view" id="0x7F0A05C8" />
-    <public type="id" name="gif_category_title" id="0x7F0A05C9" />
-    <public type="id" name="gif_item_image" id="0x7F0A05CA" />
-    <public type="id" name="gif_picker_category_recycler" id="0x7F0A05CB" />
-    <public type="id" name="gif_picker_container" id="0x7F0A05CC" />
-    <public type="id" name="gif_picker_loading_view" id="0x7F0A05CD" />
-    <public type="id" name="gif_search_app_bar" id="0x7F0A05CE" />
-    <public type="id" name="gif_search_gif_recycler" id="0x7F0A05CF" />
-    <public type="id" name="gif_search_loading_view" id="0x7F0A05D0" />
-    <public type="id" name="gif_search_sheet_content" id="0x7F0A05D1" />
-    <public type="id" name="gif_search_suggested_terms_container" id="0x7F0A05D2" />
-    <public type="id" name="gif_search_suggested_terms_flex_box" id="0x7F0A05D3" />
-    <public type="id" name="gif_search_suggested_terms_icon_text" id="0x7F0A05D4" />
-    <public type="id" name="gif_search_toolbar" id="0x7F0A05D5" />
-    <public type="id" name="gif_search_view_flipper" id="0x7F0A05D6" />
-    <public type="id" name="giftPromoButton" id="0x7F0A05D7" />
-    <public type="id" name="giftPromoDescription" id="0x7F0A05D8" />
-    <public type="id" name="giftPromoImage" id="0x7F0A05D9" />
-    <public type="id" name="giftPromoMoreDetails" id="0x7F0A05DA" />
-    <public type="id" name="giftPromoTitle" id="0x7F0A05DB" />
-    <public type="id" name="gift_btn" id="0x7F0A05DC" />
-    <public type="id" name="gift_entitlement_code" id="0x7F0A05DD" />
-    <public type="id" name="gift_entitlement_code_container" id="0x7F0A05DE" />
-    <public type="id" name="gift_entitlement_container" id="0x7F0A05DF" />
-    <public type="id" name="gift_entitlement_copy" id="0x7F0A05E0" />
-    <public type="id" name="gift_entitlement_divider" id="0x7F0A05E1" />
-    <public type="id" name="gift_entitlement_flipper" id="0x7F0A05E2" />
-    <public type="id" name="gift_entitlement_generate" id="0x7F0A05E3" />
-    <public type="id" name="gift_entitlement_revoke" id="0x7F0A05E4" />
-    <public type="id" name="gift_link_subtext" id="0x7F0A05E5" />
-    <public type="id" name="gift_purchased_dialog_confirm" id="0x7F0A05E6" />
-    <public type="id" name="gift_purchased_dialog_subtext" id="0x7F0A05E7" />
-    <public type="id" name="gift_purchased_icon" id="0x7F0A05E8" />
-    <public type="id" name="gift_select_premium_tier_1_month" id="0x7F0A05E9" />
-    <public type="id" name="gift_select_premium_tier_1_year" id="0x7F0A05EA" />
-    <public type="id" name="gift_select_premium_tier_2_month" id="0x7F0A05EB" />
-    <public type="id" name="gift_select_premium_tier_2_year" id="0x7F0A05EC" />
-    <public type="id" name="gift_sku_arrow" id="0x7F0A05ED" />
-    <public type="id" name="gift_sku_copies" id="0x7F0A05EE" />
-    <public type="id" name="gift_sku_icon" id="0x7F0A05EF" />
-    <public type="id" name="gift_sku_name" id="0x7F0A05F0" />
-    <public type="id" name="glSurface" id="0x7F0A05F1" />
-    <public type="id" name="gl_surface_view" id="0x7F0A05F2" />
-    <public type="id" name="global_search_add_a_friend_btn" id="0x7F0A05F3" />
-    <public type="id" name="global_search_bar" id="0x7F0A05F4" />
-    <public type="id" name="global_search_bar_text" id="0x7F0A05F5" />
-    <public type="id" name="global_search_guild_list" id="0x7F0A05F6" />
-    <public type="id" name="global_search_join_guild_btn" id="0x7F0A05F7" />
-    <public type="id" name="global_search_recycler" id="0x7F0A05F8" />
-    <public type="id" name="global_search_view_flipper" id="0x7F0A05F9" />
-    <public type="id" name="gone" id="0x7F0A05FA" />
-    <public type="id" name="graph" id="0x7F0A05FB" />
-    <public type="id" name="graph_wrap" id="0x7F0A05FC" />
-    <public type="id" name="gridView" id="0x7F0A05FD" />
-    <public type="id" name="group_divider" id="0x7F0A05FE" />
-    <public type="id" name="group_dm_notifications_mute_settings_view" id="0x7F0A05FF" />
-    <public type="id" name="group_dm_settings_scroll_view" id="0x7F0A0600" />
-    <public type="id" name="group_invite_friends_chips" id="0x7F0A0601" />
-    <public type="id" name="group_invite_friends_recipients_container" id="0x7F0A0602" />
-    <public type="id" name="group_invite_friends_recycler" id="0x7F0A0603" />
-    <public type="id" name="group_invite_friends_save_fab" id="0x7F0A0604" />
-    <public type="id" name="group_invite_friends_text_to" id="0x7F0A0605" />
-    <public type="id" name="group_invite_friends_view_flipper" id="0x7F0A0606" />
-    <public type="id" name="grouping" id="0x7F0A0607" />
-    <public type="id" name="groups" id="0x7F0A0608" />
-    <public type="id" name="guard" id="0x7F0A0609" />
-    <public type="id" name="guard_member_verification" id="0x7F0A060A" />
-    <public type="id" name="guideline" id="0x7F0A060B" />
-    <public type="id" name="guildAvatarText" id="0x7F0A060C" />
-    <public type="id" name="guildAvatarWrap" id="0x7F0A060D" />
-    <public type="id" name="guild_actions_overview_header_tv" id="0x7F0A060E" />
-    <public type="id" name="guild_avatar" id="0x7F0A060F" />
-    <public type="id" name="guild_call_onboarding_connect" id="0x7F0A0610" />
-    <public type="id" name="guild_container" id="0x7F0A0611" />
-    <public type="id" name="guild_context_menu_card" id="0x7F0A0612" />
-    <public type="id" name="guild_context_menu_header" id="0x7F0A0613" />
-    <public type="id" name="guild_context_menu_header_divider" id="0x7F0A0614" />
-    <public type="id" name="guild_context_menu_leave_guild" id="0x7F0A0615" />
-    <public type="id" name="guild_context_menu_mark_as_read" id="0x7F0A0616" />
-    <public type="id" name="guild_context_menu_more_options" id="0x7F0A0617" />
-    <public type="id" name="guild_context_menu_notifications" id="0x7F0A0618" />
-    <public type="id" name="guild_create_button" id="0x7F0A0619" />
-    <public type="id" name="guild_create_flipper" id="0x7F0A061A" />
-    <public type="id" name="guild_create_guidelines" id="0x7F0A061B" />
-    <public type="id" name="guild_create_icon_uploader" id="0x7F0A061C" />
-    <public type="id" name="guild_create_name" id="0x7F0A061D" />
-    <public type="id" name="guild_create_protip" id="0x7F0A061E" />
-    <public type="id" name="guild_create_screen_title" id="0x7F0A061F" />
-    <public type="id" name="guild_folder_color_name" id="0x7F0A0620" />
-    <public type="id" name="guild_folder_settings_color" id="0x7F0A0621" />
-    <public type="id" name="guild_folder_settings_color_display" id="0x7F0A0622" />
-    <public type="id" name="guild_folder_settings_save" id="0x7F0A0623" />
-    <public type="id" name="guild_info_tv" id="0x7F0A0624" />
-    <public type="id" name="guild_invite_accept" id="0x7F0A0625" />
-    <public type="id" name="guild_invite_actions" id="0x7F0A0626" />
-    <public type="id" name="guild_invite_cancel" id="0x7F0A0627" />
-    <public type="id" name="guild_invite_channel_spinner" id="0x7F0A0628" />
-    <public type="id" name="guild_invite_empty_results" id="0x7F0A0629" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7F0A062A" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7F0A062B" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7F0A062C" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7F0A062D" />
-    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7F0A062E" />
-    <public type="id" name="guild_invite_generate_link" id="0x7F0A062F" />
-    <public type="id" name="guild_invite_info" id="0x7F0A0630" />
-    <public type="id" name="guild_invite_link" id="0x7F0A0631" />
-    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7F0A0632" />
-    <public type="id" name="guild_invite_never_expire" id="0x7F0A0633" />
-    <public type="id" name="guild_invite_settings_edit" id="0x7F0A0634" />
-    <public type="id" name="guild_invite_share_btn" id="0x7F0A0635" />
-    <public type="id" name="guild_invite_share_compact_search" id="0x7F0A0636" />
-    <public type="id" name="guild_invite_share_search" id="0x7F0A0637" />
-    <public type="id" name="guild_invite_splash" id="0x7F0A0638" />
-    <public type="id" name="guild_invite_suggestion_list" id="0x7F0A0639" />
-    <public type="id" name="guild_invite_suggestions_flipper" id="0x7F0A063A" />
-    <public type="id" name="guild_invite_temporary_membership" id="0x7F0A063B" />
-    <public type="id" name="guild_iv" id="0x7F0A063C" />
-    <public type="id" name="guild_join_action_btn" id="0x7F0A063D" />
-    <public type="id" name="guild_join_content" id="0x7F0A063E" />
-    <public type="id" name="guild_join_invite" id="0x7F0A063F" />
-    <public type="id" name="guild_list" id="0x7F0A0640" />
-    <public type="id" name="guild_list_add_hint" id="0x7F0A0641" />
-    <public type="id" name="guild_list_unreads_stub" id="0x7F0A0642" />
-    <public type="id" name="guild_name_tv" id="0x7F0A0643" />
-    <public type="id" name="guild_notifications_channel_list" id="0x7F0A0644" />
-    <public type="id" name="guild_notifications_channel_search" id="0x7F0A0645" />
-    <public type="id" name="guild_notifications_override_list" id="0x7F0A0646" />
-    <public type="id" name="guild_profile_sheet_actions" id="0x7F0A0647" />
-    <public type="id" name="guild_profile_sheet_actions_top_barrier" id="0x7F0A0648" />
-    <public type="id" name="guild_profile_sheet_allow_dm" id="0x7F0A0649" />
-    <public type="id" name="guild_profile_sheet_banner" id="0x7F0A064A" />
-    <public type="id" name="guild_profile_sheet_boosts" id="0x7F0A064B" />
-    <public type="id" name="guild_profile_sheet_bottom_actions" id="0x7F0A064C" />
-    <public type="id" name="guild_profile_sheet_bottom_container" id="0x7F0A064D" />
-    <public type="id" name="guild_profile_sheet_change_nickname" id="0x7F0A064E" />
-    <public type="id" name="guild_profile_sheet_constraint_layout" id="0x7F0A064F" />
-    <public type="id" name="guild_profile_sheet_content_container" id="0x7F0A0650" />
-    <public type="id" name="guild_profile_sheet_content_container_bottom_divider" id="0x7F0A0651" />
-    <public type="id" name="guild_profile_sheet_copy_id" id="0x7F0A0652" />
-    <public type="id" name="guild_profile_sheet_create_category" id="0x7F0A0653" />
-    <public type="id" name="guild_profile_sheet_create_channel" id="0x7F0A0654" />
-    <public type="id" name="guild_profile_sheet_description" id="0x7F0A0655" />
-    <public type="id" name="guild_profile_sheet_developer_actions" id="0x7F0A0656" />
-    <public type="id" name="guild_profile_sheet_emoji_imageview" id="0x7F0A0657" />
-    <public type="id" name="guild_profile_sheet_emojis" id="0x7F0A0658" />
-    <public type="id" name="guild_profile_sheet_emojis_card" id="0x7F0A0659" />
-    <public type="id" name="guild_profile_sheet_emojis_count" id="0x7F0A065A" />
-    <public type="id" name="guild_profile_sheet_flipper" id="0x7F0A065B" />
-    <public type="id" name="guild_profile_sheet_guild_verified_premium_icon" id="0x7F0A065C" />
-    <public type="id" name="guild_profile_sheet_hide_muted_channels" id="0x7F0A065D" />
-    <public type="id" name="guild_profile_sheet_icon" id="0x7F0A065E" />
-    <public type="id" name="guild_profile_sheet_icon_card" id="0x7F0A065F" />
-    <public type="id" name="guild_profile_sheet_icon_name" id="0x7F0A0660" />
-    <public type="id" name="guild_profile_sheet_invite" id="0x7F0A0661" />
-    <public type="id" name="guild_profile_sheet_join_server" id="0x7F0A0662" />
-    <public type="id" name="guild_profile_sheet_leave_server" id="0x7F0A0663" />
-    <public type="id" name="guild_profile_sheet_mark_as_read" id="0x7F0A0664" />
-    <public type="id" name="guild_profile_sheet_mark_as_read_action" id="0x7F0A0665" />
-    <public type="id" name="guild_profile_sheet_member_count" id="0x7F0A0666" />
-    <public type="id" name="guild_profile_sheet_member_count_text" id="0x7F0A0667" />
-    <public type="id" name="guild_profile_sheet_name" id="0x7F0A0668" />
-    <public type="id" name="guild_profile_sheet_nickname" id="0x7F0A0669" />
-    <public type="id" name="guild_profile_sheet_notifications" id="0x7F0A066A" />
-    <public type="id" name="guild_profile_sheet_online_count" id="0x7F0A066B" />
-    <public type="id" name="guild_profile_sheet_online_count_text" id="0x7F0A066C" />
-    <public type="id" name="guild_profile_sheet_premium_upsell_dot_separator" id="0x7F0A066D" />
-    <public type="id" name="guild_profile_sheet_premium_upsell_text" id="0x7F0A066E" />
-    <public type="id" name="guild_profile_sheet_primary_actions" id="0x7F0A066F" />
-    <public type="id" name="guild_profile_sheet_secondary_actions" id="0x7F0A0670" />
-    <public type="id" name="guild_profile_sheet_settings" id="0x7F0A0671" />
-    <public type="id" name="guild_profile_sheet_tab_items" id="0x7F0A0672" />
-    <public type="id" name="guild_profile_sheet_upload_emoji" id="0x7F0A0673" />
-    <public type="id" name="guild_profile_sheet_view_server" id="0x7F0A0674" />
-    <public type="id" name="guild_region_help" id="0x7F0A0675" />
-    <public type="id" name="guild_role_item_text" id="0x7F0A0676" />
-    <public type="id" name="guild_selector_list" id="0x7F0A0677" />
-    <public type="id" name="guild_template_channels_item_image" id="0x7F0A0678" />
-    <public type="id" name="guild_template_channels_item_name" id="0x7F0A0679" />
-    <public type="id" name="guild_template_channels_recycler_view" id="0x7F0A067A" />
-    <public type="id" name="guild_template_name" id="0x7F0A067B" />
-    <public type="id" name="guild_template_preview_channels" id="0x7F0A067C" />
-    <public type="id" name="guild_template_preview_roles" id="0x7F0A067D" />
-    <public type="id" name="guild_template_preview_roles_layout" id="0x7F0A067E" />
-    <public type="id" name="guild_text" id="0x7F0A067F" />
-    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7F0A0680" />
-    <public type="id" name="guild_transfer_ownership_cancel" id="0x7F0A0681" />
-    <public type="id" name="guild_transfer_ownership_confirm" id="0x7F0A0682" />
-    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7F0A0683" />
-    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7F0A0684" />
-    <public type="id" name="guild_video_at_capacity_confirm" id="0x7F0A0685" />
-    <public type="id" name="guild_view_1" id="0x7F0A0686" />
-    <public type="id" name="guild_view_2" id="0x7F0A0687" />
-    <public type="id" name="guild_view_3" id="0x7F0A0688" />
-    <public type="id" name="guild_view_4" id="0x7F0A0689" />
-    <public type="id" name="guild_views" id="0x7F0A068A" />
-    <public type="id" name="guild_welcome_channel" id="0x7F0A068B" />
-    <public type="id" name="guild_welcome_channel_description" id="0x7F0A068C" />
-    <public type="id" name="guild_welcome_channel_details" id="0x7F0A068D" />
-    <public type="id" name="guild_welcome_channel_emoji" id="0x7F0A068E" />
-    <public type="id" name="guild_welcome_channel_hash" id="0x7F0A068F" />
-    <public type="id" name="guild_welcome_channel_icon" id="0x7F0A0690" />
-    <public type="id" name="guild_welcome_channel_name" id="0x7F0A0691" />
-    <public type="id" name="guild_welcome_channel_text" id="0x7F0A0692" />
-    <public type="id" name="guild_welcome_channel_unicode_emoji" id="0x7F0A0693" />
-    <public type="id" name="guild_welcome_sheet_channels" id="0x7F0A0694" />
-    <public type="id" name="guild_welcome_sheet_description" id="0x7F0A0695" />
-    <public type="id" name="guild_welcome_sheet_flipper" id="0x7F0A0696" />
-    <public type="id" name="guild_welcome_sheet_icon" id="0x7F0A0697" />
-    <public type="id" name="guild_welcome_sheet_icon_card" id="0x7F0A0698" />
-    <public type="id" name="guild_welcome_sheet_icon_name" id="0x7F0A0699" />
-    <public type="id" name="guild_welcome_sheet_name" id="0x7F0A069A" />
-    <public type="id" name="guilds_item_application_status" id="0x7F0A069B" />
-    <public type="id" name="guilds_item_application_stream" id="0x7F0A069C" />
-    <public type="id" name="guilds_item_avatar" id="0x7F0A069D" />
-    <public type="id" name="guilds_item_avatar_text" id="0x7F0A069E" />
-    <public type="id" name="guilds_item_avatar_wrap" id="0x7F0A069F" />
-    <public type="id" name="guilds_item_dm_avatar" id="0x7F0A06A0" />
-    <public type="id" name="guilds_item_dm_count" id="0x7F0A06A1" />
-    <public type="id" name="guilds_item_folder" id="0x7F0A06A2" />
-    <public type="id" name="guilds_item_folder_container" id="0x7F0A06A3" />
-    <public type="id" name="guilds_item_highlight" id="0x7F0A06A4" />
-    <public type="id" name="guilds_item_mentions" id="0x7F0A06A5" />
-    <public type="id" name="guilds_item_profile_avatar" id="0x7F0A06A6" />
-    <public type="id" name="guilds_item_profile_avatar_wrap" id="0x7F0A06A7" />
-    <public type="id" name="guilds_item_profile_selected" id="0x7F0A06A8" />
-    <public type="id" name="guilds_item_selected" id="0x7F0A06A9" />
-    <public type="id" name="guilds_item_unread" id="0x7F0A06AA" />
-    <public type="id" name="guilds_item_voice" id="0x7F0A06AB" />
-    <public type="id" name="h263" id="0x7F0A06AC" />
-    <public type="id" name="h264" id="0x7F0A06AD" />
-    <public type="id" name="handle" id="0x7F0A06AE" />
-    <public type="id" name="hardware" id="0x7F0A06AF" />
-    <public type="id" name="heAac" id="0x7F0A06B0" />
-    <public type="id" name="header" id="0x7F0A06B1" />
-    <public type="id" name="header_item_text" id="0x7F0A06B2" />
-    <public type="id" name="header_name" id="0x7F0A06B3" />
-    <public type="id" name="header_title" id="0x7F0A06B4" />
-    <public type="id" name="hideable" id="0x7F0A06B5" />
-    <public type="id" name="home" id="0x7F0A06B6" />
-    <public type="id" name="homeAsUp" id="0x7F0A06B7" />
-    <public type="id" name="home_panel_center_channel_less" id="0x7F0A06B8" />
-    <public type="id" name="home_panel_center_channel_less_body" id="0x7F0A06B9" />
-    <public type="id" name="home_panel_center_channel_less_title" id="0x7F0A06BA" />
-    <public type="id" name="home_panel_center_nsfw" id="0x7F0A06BB" />
-    <public type="id" name="home_panel_center_nsfw_anchor_wrap" id="0x7F0A06BC" />
-    <public type="id" name="home_panel_center_nsfw_art" id="0x7F0A06BD" />
-    <public type="id" name="home_panel_center_nsfw_confirm" id="0x7F0A06BE" />
-    <public type="id" name="home_panel_center_nsfw_deny" id="0x7F0A06BF" />
-    <public type="id" name="home_panel_center_nsfw_description" id="0x7F0A06C0" />
-    <public type="id" name="home_panel_center_nsfw_title" id="0x7F0A06C1" />
-    <public type="id" name="home_toolbar_unread_count" id="0x7F0A06C2" />
-    <public type="id" name="honorRequest" id="0x7F0A06C3" />
-    <public type="id" name="html" id="0x7F0A06C4" />
-    <public type="id" name="icon" id="0x7F0A06C5" />
-    <public type="id" name="icon_frame" id="0x7F0A06C6" />
-    <public type="id" name="icon_group" id="0x7F0A06C7" />
-    <public type="id" name="icon_label" id="0x7F0A06C8" />
-    <public type="id" name="icon_only" id="0x7F0A06C9" />
-    <public type="id" name="icon_uploader_image" id="0x7F0A06CA" />
-    <public type="id" name="icon_uploader_placeholder_border" id="0x7F0A06CB" />
-    <public type="id" name="icon_uploader_placeholder_icon" id="0x7F0A06CC" />
-    <public type="id" name="icon_uploader_placeholder_text" id="0x7F0A06CD" />
-    <public type="id" name="icon_uploader_plus" id="0x7F0A06CE" />
-    <public type="id" name="icon_uri" id="0x7F0A06CF" />
-    <public type="id" name="ifRoom" id="0x7F0A06D0" />
-    <public type="id" name="ignore" id="0x7F0A06D1" />
-    <public type="id" name="ignoreRequest" id="0x7F0A06D2" />
-    <public type="id" name="image" id="0x7F0A06D3" />
-    <public type="id" name="image_bottom_guideline" id="0x7F0A06D4" />
-    <public type="id" name="image_upload_failed_cancel" id="0x7F0A06D5" />
-    <public type="id" name="image_upload_failed_compression_settings_checkbox" id="0x7F0A06D6" />
-    <public type="id" name="image_upload_failed_compression_settings_container" id="0x7F0A06D7" />
-    <public type="id" name="image_upload_failed_divider" id="0x7F0A06D8" />
-    <public type="id" name="image_upload_failed_nitro" id="0x7F0A06D9" />
-    <public type="id" name="image_upload_failed_nitro_wrapper" id="0x7F0A06DA" />
-    <public type="id" name="image_upload_failed_okay" id="0x7F0A06DB" />
-    <public type="id" name="image_upload_failed_send_compress" id="0x7F0A06DC" />
-    <public type="id" name="image_upload_failed_text" id="0x7F0A06DD" />
-    <public type="id" name="image_view_crop" id="0x7F0A06DE" />
-    <public type="id" name="image_view_logo" id="0x7F0A06DF" />
-    <public type="id" name="image_view_state_aspect_ratio" id="0x7F0A06E0" />
-    <public type="id" name="image_view_state_rotate" id="0x7F0A06E1" />
-    <public type="id" name="image_view_state_scale" id="0x7F0A06E2" />
-    <public type="id" name="incandescent" id="0x7F0A06E3" />
-    <public type="id" name="incoming_call_accept_alt_container" id="0x7F0A06E4" />
-    <public type="id" name="incoming_call_accept_button" id="0x7F0A06E5" />
-    <public type="id" name="incoming_call_accept_video_button" id="0x7F0A06E6" />
-    <public type="id" name="incoming_call_blurred_view" id="0x7F0A06E7" />
-    <public type="id" name="incoming_call_decline_button" id="0x7F0A06E8" />
-    <public type="id" name="incoming_call_status_container" id="0x7F0A06E9" />
-    <public type="id" name="incoming_call_status_primary" id="0x7F0A06EA" />
-    <public type="id" name="incoming_call_status_secondary" id="0x7F0A06EB" />
-    <public type="id" name="incoming_call_top_guideline" id="0x7F0A06EC" />
-    <public type="id" name="incoming_call_users_grid_view" id="0x7F0A06ED" />
-    <public type="id" name="incoming_share_no_results_img" id="0x7F0A06EE" />
-    <public type="id" name="incoming_share_results_flipper" id="0x7F0A06EF" />
-    <public type="id" name="index_entity_types" id="0x7F0A06F0" />
-    <public type="id" name="indicator" id="0x7F0A06F1" />
-    <public type="id" name="indicator_accept" id="0x7F0A06F2" />
-    <public type="id" name="indicator_actions" id="0x7F0A06F3" />
-    <public type="id" name="indicator_content" id="0x7F0A06F4" />
-    <public type="id" name="indicator_decline" id="0x7F0A06F5" />
-    <public type="id" name="indicator_icon" id="0x7F0A06F6" />
-    <public type="id" name="indicator_text" id="0x7F0A06F7" />
-    <public type="id" name="indicators_container" id="0x7F0A06F8" />
-    <public type="id" name="info" id="0x7F0A06F9" />
-    <public type="id" name="inline_media_gif_indicator" id="0x7F0A06FA" />
-    <public type="id" name="inline_media_image_preview" id="0x7F0A06FB" />
-    <public type="id" name="inline_media_loading_indicator" id="0x7F0A06FC" />
-    <public type="id" name="inline_media_play_button" id="0x7F0A06FD" />
-    <public type="id" name="inline_media_player_view" id="0x7F0A06FE" />
-    <public type="id" name="inline_media_volume_toggle" id="0x7F0A06FF" />
-    <public type="id" name="instant_message" id="0x7F0A0700" />
-    <public type="id" name="integration_header_container" id="0x7F0A0701" />
-    <public type="id" name="integration_header_disabled_overlay" id="0x7F0A0702" />
-    <public type="id" name="integration_icon" id="0x7F0A0703" />
-    <public type="id" name="integration_name" id="0x7F0A0704" />
-    <public type="id" name="integration_name_container" id="0x7F0A0705" />
-    <public type="id" name="integration_owner_name" id="0x7F0A0706" />
-    <public type="id" name="integration_settings_icon" id="0x7F0A0707" />
-    <public type="id" name="integration_sync_switch" id="0x7F0A0708" />
-    <public type="id" name="integration_syncing_progress_bar" id="0x7F0A0709" />
-    <public type="id" name="integrations_empty_body" id="0x7F0A070A" />
-    <public type="id" name="integrations_empty_header" id="0x7F0A070B" />
-    <public type="id" name="integrations_recycler" id="0x7F0A070C" />
-    <public type="id" name="integrations_root" id="0x7F0A070D" />
-    <public type="id" name="integrations_view_flipper" id="0x7F0A070E" />
-    <public type="id" name="intent_action" id="0x7F0A070F" />
-    <public type="id" name="intent_activity" id="0x7F0A0710" />
-    <public type="id" name="intent_data" id="0x7F0A0711" />
-    <public type="id" name="intent_data_id" id="0x7F0A0712" />
-    <public type="id" name="intent_extra_data" id="0x7F0A0713" />
-    <public type="id" name="invisible" id="0x7F0A0714" />
-    <public type="id" name="invite_actions_copy" id="0x7F0A0715" />
-    <public type="id" name="invite_actions_revoke" id="0x7F0A0716" />
-    <public type="id" name="invite_actions_share" id="0x7F0A0717" />
-    <public type="id" name="invite_actions_title" id="0x7F0A0718" />
-    <public type="id" name="invite_avatar" id="0x7F0A0719" />
-    <public type="id" name="invite_avatar_small" id="0x7F0A071A" />
-    <public type="id" name="invite_avatar_small_card" id="0x7F0A071B" />
-    <public type="id" name="invite_avatar_small_wrap" id="0x7F0A071C" />
-    <public type="id" name="invite_avatar_wrap" id="0x7F0A071D" />
-    <public type="id" name="invite_button" id="0x7F0A071E" />
-    <public type="id" name="invite_channel" id="0x7F0A071F" />
-    <public type="id" name="invite_code" id="0x7F0A0720" />
-    <public type="id" name="invite_container" id="0x7F0A0721" />
-    <public type="id" name="invite_divider" id="0x7F0A0722" />
-    <public type="id" name="invite_expiration_container" id="0x7F0A0723" />
-    <public type="id" name="invite_expiration_time" id="0x7F0A0724" />
-    <public type="id" name="invite_expired_image" id="0x7F0A0725" />
-    <public type="id" name="invite_expires_label" id="0x7F0A0726" />
-    <public type="id" name="invite_list_item_avatar" id="0x7F0A0727" />
-    <public type="id" name="invite_members_online" id="0x7F0A0728" />
-    <public type="id" name="invite_members_online_wrap" id="0x7F0A0729" />
-    <public type="id" name="invite_members_total" id="0x7F0A072A" />
-    <public type="id" name="invite_members_total_wrap" id="0x7F0A072B" />
-    <public type="id" name="invite_members_wrap" id="0x7F0A072C" />
-    <public type="id" name="invite_message" id="0x7F0A072D" />
-    <public type="id" name="invite_name_container" id="0x7F0A072E" />
-    <public type="id" name="invite_secondary_button" id="0x7F0A072F" />
-    <public type="id" name="invite_settings_bottom_sheet" id="0x7F0A0730" />
-    <public type="id" name="invite_settings_button" id="0x7F0A0731" />
-    <public type="id" name="invite_settings_icon" id="0x7F0A0732" />
-    <public type="id" name="invite_suggestions_header" id="0x7F0A0733" />
-    <public type="id" name="invite_title" id="0x7F0A0734" />
-    <public type="id" name="invite_user_name" id="0x7F0A0735" />
-    <public type="id" name="invite_uses" id="0x7F0A0736" />
-    <public type="id" name="invite_uses_label" id="0x7F0A0737" />
-    <public type="id" name="inward" id="0x7F0A0738" />
-    <public type="id" name="issue_details_cx_prompt" id="0x7F0A0739" />
-    <public type="id" name="issue_details_input" id="0x7F0A073A" />
-    <public type="id" name="issue_details_submit_button" id="0x7F0A073B" />
-    <public type="id" name="italic" id="0x7F0A073C" />
-    <public type="id" name="item_avatar_wrap" id="0x7F0A073D" />
-    <public type="id" name="item_backup_code_tv" id="0x7F0A073E" />
-    <public type="id" name="item_check_indicator" id="0x7F0A073F" />
-    <public type="id" name="item_description_tv" id="0x7F0A0740" />
-    <public type="id" name="item_game_invite" id="0x7F0A0741" />
-    <public type="id" name="item_game_invite_action_btn" id="0x7F0A0742" />
-    <public type="id" name="item_game_invite_application_name_tv" id="0x7F0A0743" />
-    <public type="id" name="item_game_invite_avatar_iv" id="0x7F0A0744" />
-    <public type="id" name="item_game_invite_avatar_status_iv" id="0x7F0A0745" />
-    <public type="id" name="item_game_invite_barrier" id="0x7F0A0746" />
-    <public type="id" name="item_game_invite_cover_iv" id="0x7F0A0747" />
-    <public type="id" name="item_game_invite_header" id="0x7F0A0748" />
-    <public type="id" name="item_game_invite_recycler" id="0x7F0A0749" />
-    <public type="id" name="item_game_invite_subtext" id="0x7F0A074A" />
-    <public type="id" name="item_gift_accept_button" id="0x7F0A074B" />
-    <public type="id" name="item_gift_cannot_claim_button" id="0x7F0A074C" />
-    <public type="id" name="item_gift_details" id="0x7F0A074D" />
-    <public type="id" name="item_gift_expires" id="0x7F0A074E" />
-    <public type="id" name="item_gift_header" id="0x7F0A074F" />
-    <public type="id" name="item_gift_image" id="0x7F0A0750" />
-    <public type="id" name="item_gift_image_background" id="0x7F0A0751" />
-    <public type="id" name="item_gift_loading_button_placeholder" id="0x7F0A0752" />
-    <public type="id" name="item_gift_name" id="0x7F0A0753" />
-    <public type="id" name="item_gift_subtext" id="0x7F0A0754" />
-    <public type="id" name="item_gift_verify_button" id="0x7F0A0755" />
-    <public type="id" name="item_group_tv" id="0x7F0A0756" />
-    <public type="id" name="item_guild_template_header" id="0x7F0A0757" />
-    <public type="id" name="item_guild_template_image" id="0x7F0A0758" />
-    <public type="id" name="item_guild_template_join_button" id="0x7F0A0759" />
-    <public type="id" name="item_guild_template_name" id="0x7F0A075A" />
-    <public type="id" name="item_guild_template_subtext" id="0x7F0A075B" />
-    <public type="id" name="item_guild_welcome_header" id="0x7F0A075C" />
-    <public type="id" name="item_guild_welcome_subheader" id="0x7F0A075D" />
-    <public type="id" name="item_guild_welcome_subheader_intro" id="0x7F0A075E" />
-    <public type="id" name="item_header" id="0x7F0A075F" />
-    <public type="id" name="item_header_tv" id="0x7F0A0760" />
-    <public type="id" name="item_icon" id="0x7F0A0761" />
-    <public type="id" name="item_icon_iv" id="0x7F0A0762" />
-    <public type="id" name="item_invite_btn" id="0x7F0A0763" />
-    <public type="id" name="item_invite_channel_name" id="0x7F0A0764" />
-    <public type="id" name="item_invite_channel_topic" id="0x7F0A0765" />
-    <public type="id" name="item_invite_guild_name" id="0x7F0A0766" />
-    <public type="id" name="item_invite_header" id="0x7F0A0767" />
-    <public type="id" name="item_invite_image" id="0x7F0A0768" />
-    <public type="id" name="item_invite_image_text" id="0x7F0A0769" />
-    <public type="id" name="item_invite_join_button" id="0x7F0A076A" />
-    <public type="id" name="item_invite_joined_button" id="0x7F0A076B" />
-    <public type="id" name="item_invite_loading_button" id="0x7F0A076C" />
-    <public type="id" name="item_invite_member_container" id="0x7F0A076D" />
-    <public type="id" name="item_invite_mention_button" id="0x7F0A076E" />
-    <public type="id" name="item_invite_name" id="0x7F0A076F" />
-    <public type="id" name="item_invite_online_dot" id="0x7F0A0770" />
-    <public type="id" name="item_invite_online_text" id="0x7F0A0771" />
-    <public type="id" name="item_invite_total_member_dot" id="0x7F0A0772" />
-    <public type="id" name="item_invite_total_member_text" id="0x7F0A0773" />
-    <public type="id" name="item_listen_together_album_image" id="0x7F0A0774" />
-    <public type="id" name="item_listen_together_artist" id="0x7F0A0775" />
-    <public type="id" name="item_listen_together_container" id="0x7F0A0776" />
-    <public type="id" name="item_listen_together_header" id="0x7F0A0777" />
-    <public type="id" name="item_listen_together_join" id="0x7F0A0778" />
-    <public type="id" name="item_listen_together_recycler" id="0x7F0A0779" />
-    <public type="id" name="item_listen_together_session_ended" id="0x7F0A077A" />
-    <public type="id" name="item_listen_together_track" id="0x7F0A077B" />
-    <public type="id" name="item_listeners_count" id="0x7F0A077C" />
-    <public type="id" name="item_mentions_tv" id="0x7F0A077D" />
-    <public type="id" name="item_name" id="0x7F0A077E" />
-    <public type="id" name="item_name_tv" id="0x7F0A077F" />
-    <public type="id" name="item_sent" id="0x7F0A0780" />
-    <public type="id" name="item_text" id="0x7F0A0781" />
-    <public type="id" name="item_touch_helper_previous_elevation" id="0x7F0A0782" />
-    <public type="id" name="item_unread" id="0x7F0A0783" />
-    <public type="id" name="item_video_indicator" id="0x7F0A0784" />
-    <public type="id" name="ivIcon" id="0x7F0A0785" />
-    <public type="id" name="ivRightIcon" id="0x7F0A0786" />
-    <public type="id" name="join_audience" id="0x7F0A0787" />
-    <public type="id" name="join_btn" id="0x7F0A0788" />
-    <public type="id" name="join_speaker" id="0x7F0A0789" />
-    <public type="id" name="jpeg" id="0x7F0A078A" />
-    <public type="id" name="jumpToEnd" id="0x7F0A078B" />
-    <public type="id" name="jumpToStart" id="0x7F0A078C" />
-    <public type="id" name="kick_user_body" id="0x7F0A078D" />
-    <public type="id" name="kick_user_cancel" id="0x7F0A078E" />
-    <public type="id" name="kick_user_confirm" id="0x7F0A078F" />
-    <public type="id" name="kick_user_reason" id="0x7F0A0790" />
-    <public type="id" name="kick_user_title" id="0x7F0A0791" />
-    <public type="id" name="label" id="0x7F0A0792" />
-    <public type="id" name="labelGroup" id="0x7F0A0793" />
-    <public type="id" name="labeled" id="0x7F0A0794" />
-    <public type="id" name="language" id="0x7F0A0795" />
-    <public type="id" name="large" id="0x7F0A0796" />
-    <public type="id" name="largeLabel" id="0x7F0A0797" />
-    <public type="id" name="large_avatar" id="0x7F0A0798" />
-    <public type="id" name="large_avatar_barrier" id="0x7F0A0799" />
-    <public type="id" name="large_icon_uri" id="0x7F0A079A" />
-    <public type="id" name="launch_btn" id="0x7F0A079B" />
-    <public type="id" name="launch_camera_btn" id="0x7F0A079C" />
-    <public type="id" name="layout" id="0x7F0A079D" />
-    <public type="id" name="layout_aspect_ratio" id="0x7F0A079E" />
-    <public type="id" name="layout_rotate_wheel" id="0x7F0A079F" />
-    <public type="id" name="layout_scale_wheel" id="0x7F0A07A0" />
-    <public type="id" name="leave_guild_cancel_btn" id="0x7F0A07A1" />
-    <public type="id" name="leave_guild_confirm_btn" id="0x7F0A07A2" />
-    <public type="id" name="leave_guild_dialog_body" id="0x7F0A07A3" />
-    <public type="id" name="leave_guild_dialog_header" id="0x7F0A07A4" />
-    <public type="id" name="left" id="0x7F0A07A5" />
-    <public type="id" name="leftToRight" id="0x7F0A07A6" />
-    <public type="id" name="left_btns_container" id="0x7F0A07A7" />
-    <public type="id" name="light" id="0x7F0A07A8" />
-    <public type="id" name="line1" id="0x7F0A07A9" />
-    <public type="id" name="line3" id="0x7F0A07AA" />
-    <public type="id" name="linear" id="0x7F0A07AB" />
-    <public type="id" name="link_icon" id="0x7F0A07AC" />
-    <public type="id" name="link_settings_barrier" id="0x7F0A07AD" />
-    <public type="id" name="list" id="0x7F0A07AE" />
-    <public type="id" name="listMode" id="0x7F0A07AF" />
-    <public type="id" name="list_item" id="0x7F0A07B0" />
-    <public type="id" name="live_now_dot" id="0x7F0A07B1" />
-    <public type="id" name="live_now_label" id="0x7F0A07B2" />
-    <public type="id" name="llAlertBackground" id="0x7F0A07B3" />
-    <public type="id" name="llButtonContainer" id="0x7F0A07B4" />
-    <public type="id" name="loading" id="0x7F0A07B5" />
-    <public type="id" name="loadingContainer" id="0x7F0A07B6" />
-    <public type="id" name="loading_button_button" id="0x7F0A07B7" />
-    <public type="id" name="loading_button_progress" id="0x7F0A07B8" />
-    <public type="id" name="loading_dots" id="0x7F0A07B9" />
-    <public type="id" name="loading_progress_bar" id="0x7F0A07BA" />
-    <public type="id" name="log_message" id="0x7F0A07BB" />
-    <public type="id" name="logo" id="0x7F0A07BC" />
-    <public type="id" name="lottie_layer_name" id="0x7F0A07BD" />
-    <public type="id" name="main_input_container" id="0x7F0A07BE" />
-    <public type="id" name="main_panel_right_rounded_container" id="0x7F0A07BF" />
-    <public type="id" name="manage_reactions_emoji_container" id="0x7F0A07C0" />
-    <public type="id" name="manage_reactions_emoji_counter" id="0x7F0A07C1" />
-    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7F0A07C2" />
-    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7F0A07C3" />
-    <public type="id" name="manage_reactions_emojis_recycler" id="0x7F0A07C4" />
-    <public type="id" name="manage_reactions_result_error_img" id="0x7F0A07C5" />
-    <public type="id" name="manage_reactions_result_error_text" id="0x7F0A07C6" />
-    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7F0A07C7" />
-    <public type="id" name="manage_reactions_result_user_avatar" id="0x7F0A07C8" />
-    <public type="id" name="manage_reactions_result_user_name" id="0x7F0A07C9" />
-    <public type="id" name="manage_reactions_results_recycler" id="0x7F0A07CA" />
-    <public type="id" name="masked" id="0x7F0A07CB" />
-    <public type="id" name="masked_links_body_text" id="0x7F0A07CC" />
-    <public type="id" name="masked_links_cancel" id="0x7F0A07CD" />
-    <public type="id" name="masked_links_confirm" id="0x7F0A07CE" />
-    <public type="id" name="masked_links_trust_domain" id="0x7F0A07CF" />
-    <public type="id" name="match_global_nicknames" id="0x7F0A07D0" />
-    <public type="id" name="material_clock_display" id="0x7F0A07D1" />
-    <public type="id" name="material_clock_face" id="0x7F0A07D2" />
-    <public type="id" name="material_clock_hand" id="0x7F0A07D3" />
-    <public type="id" name="material_clock_period_am_button" id="0x7F0A07D4" />
-    <public type="id" name="material_clock_period_pm_button" id="0x7F0A07D5" />
-    <public type="id" name="material_clock_period_toggle" id="0x7F0A07D6" />
-    <public type="id" name="material_hour_text_input" id="0x7F0A07D7" />
-    <public type="id" name="material_hour_tv" id="0x7F0A07D8" />
-    <public type="id" name="material_label" id="0x7F0A07D9" />
-    <public type="id" name="material_minute_text_input" id="0x7F0A07DA" />
-    <public type="id" name="material_minute_tv" id="0x7F0A07DB" />
-    <public type="id" name="material_textinput_timepicker" id="0x7F0A07DC" />
-    <public type="id" name="material_timepicker_cancel_button" id="0x7F0A07DD" />
-    <public type="id" name="material_timepicker_container" id="0x7F0A07DE" />
-    <public type="id" name="material_timepicker_edit_text" id="0x7F0A07DF" />
-    <public type="id" name="material_timepicker_mode_button" id="0x7F0A07E0" />
-    <public type="id" name="material_timepicker_ok_button" id="0x7F0A07E1" />
-    <public type="id" name="material_timepicker_view" id="0x7F0A07E2" />
-    <public type="id" name="material_value_index" id="0x7F0A07E3" />
-    <public type="id" name="max_guilds" id="0x7F0A07E4" />
-    <public type="id" name="max_message_length" id="0x7F0A07E5" />
-    <public type="id" name="media_actions" id="0x7F0A07E6" />
-    <public type="id" name="media_container" id="0x7F0A07E7" />
-    <public type="id" name="media_controller_compat_view_tag" id="0x7F0A07E8" />
-    <public type="id" name="media_image" id="0x7F0A07E9" />
-    <public type="id" name="media_loading_indicator" id="0x7F0A07EA" />
-    <public type="id" name="media_player_control_view" id="0x7F0A07EB" />
-    <public type="id" name="media_player_view" id="0x7F0A07EC" />
-    <public type="id" name="member_list_item_avatar" id="0x7F0A07ED" />
-    <public type="id" name="member_list_item_container" id="0x7F0A07EE" />
-    <public type="id" name="member_list_item_lock" id="0x7F0A07EF" />
-    <public type="id" name="member_list_item_name" id="0x7F0A07F0" />
-    <public type="id" name="member_list_item_overflow" id="0x7F0A07F1" />
-    <public type="id" name="member_list_item_roles_list" id="0x7F0A07F2" />
-    <public type="id" name="member_verification_avatar" id="0x7F0A07F3" />
-    <public type="id" name="member_verification_banner_image" id="0x7F0A07F4" />
-    <public type="id" name="member_verification_confirm" id="0x7F0A07F5" />
-    <public type="id" name="member_verification_container" id="0x7F0A07F6" />
-    <public type="id" name="member_verification_guild_icon" id="0x7F0A07F7" />
-    <public type="id" name="member_verification_guild_name" id="0x7F0A07F8" />
-    <public type="id" name="member_verification_multiple_choice_radio_group" id="0x7F0A07F9" />
-    <public type="id" name="member_verification_paragraph_field" id="0x7F0A07FA" />
-    <public type="id" name="member_verification_pending_img" id="0x7F0A07FB" />
-    <public type="id" name="member_verification_primary_btn" id="0x7F0A07FC" />
-    <public type="id" name="member_verification_rule_container" id="0x7F0A07FD" />
-    <public type="id" name="member_verification_rule_description" id="0x7F0A07FE" />
-    <public type="id" name="member_verification_rule_divider" id="0x7F0A07FF" />
-    <public type="id" name="member_verification_rule_index" id="0x7F0A0800" />
-    <public type="id" name="member_verification_rule_root" id="0x7F0A0801" />
-    <public type="id" name="member_verification_rules_check" id="0x7F0A0802" />
-    <public type="id" name="member_verification_rules_confirm" id="0x7F0A0803" />
-    <public type="id" name="member_verification_rules_header" id="0x7F0A0804" />
-    <public type="id" name="member_verification_rules_recycler" id="0x7F0A0805" />
-    <public type="id" name="member_verification_scrollview" id="0x7F0A0806" />
-    <public type="id" name="member_verification_secondary_btn" id="0x7F0A0807" />
-    <public type="id" name="member_verification_success_card" id="0x7F0A0808" />
-    <public type="id" name="member_verification_tertiary_btn" id="0x7F0A0809" />
-    <public type="id" name="member_verification_text" id="0x7F0A080A" />
-    <public type="id" name="member_verification_text_input_field" id="0x7F0A080B" />
-    <public type="id" name="member_verification_verified_check" id="0x7F0A080C" />
-    <public type="id" name="member_verification_verify_button" id="0x7F0A080D" />
-    <public type="id" name="member_verification_verify_icon" id="0x7F0A080E" />
-    <public type="id" name="member_verification_verify_text" id="0x7F0A080F" />
-    <public type="id" name="members_container" id="0x7F0A0810" />
-    <public type="id" name="members_permission_owners_list" id="0x7F0A0811" />
-    <public type="id" name="members_recycler" id="0x7F0A0812" />
-    <public type="id" name="menu_add_connections" id="0x7F0A0813" />
-    <public type="id" name="menu_audit_log_sort_actions" id="0x7F0A0814" />
-    <public type="id" name="menu_audit_log_sort_users" id="0x7F0A0815" />
-    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7F0A0816" />
-    <public type="id" name="menu_auth_mfa_info" id="0x7F0A0817" />
-    <public type="id" name="menu_call_overlay_launcher" id="0x7F0A0818" />
-    <public type="id" name="menu_call_switch_camera" id="0x7F0A0819" />
-    <public type="id" name="menu_call_video_list" id="0x7F0A081A" />
-    <public type="id" name="menu_call_voice_settings" id="0x7F0A081B" />
-    <public type="id" name="menu_channel_settings_delete" id="0x7F0A081C" />
-    <public type="id" name="menu_channel_settings_reset" id="0x7F0A081D" />
-    <public type="id" name="menu_chat_add_friend" id="0x7F0A081E" />
-    <public type="id" name="menu_chat_search" id="0x7F0A081F" />
-    <public type="id" name="menu_chat_side_panel" id="0x7F0A0820" />
-    <public type="id" name="menu_chat_start_call" id="0x7F0A0821" />
-    <public type="id" name="menu_chat_start_group" id="0x7F0A0822" />
-    <public type="id" name="menu_chat_start_video_call" id="0x7F0A0823" />
-    <public type="id" name="menu_chat_stop_call" id="0x7F0A0824" />
-    <public type="id" name="menu_chat_thread_browser" id="0x7F0A0825" />
-    <public type="id" name="menu_code_verification_paste" id="0x7F0A0826" />
-    <public type="id" name="menu_contact_sync_skip" id="0x7F0A0827" />
-    <public type="id" name="menu_contact_sync_upsell_dismiss" id="0x7F0A0828" />
-    <public type="id" name="menu_continue" id="0x7F0A0829" />
-    <public type="id" name="menu_copy_id" id="0x7F0A082A" />
-    <public type="id" name="menu_crop" id="0x7F0A082B" />
-    <public type="id" name="menu_debugging_filter" id="0x7F0A082C" />
-    <public type="id" name="menu_edit_overwrite_delete" id="0x7F0A082D" />
-    <public type="id" name="menu_edit_role_delete" id="0x7F0A082E" />
-    <public type="id" name="menu_filter" id="0x7F0A082F" />
-    <public type="id" name="menu_friends_add_friend" id="0x7F0A0830" />
-    <public type="id" name="menu_friends_contact_sync" id="0x7F0A0831" />
-    <public type="id" name="menu_friends_start_group" id="0x7F0A0832" />
-    <public type="id" name="menu_leave_group" id="0x7F0A0833" />
-    <public type="id" name="menu_loader" id="0x7F0A0834" />
-    <public type="id" name="menu_media_browser" id="0x7F0A0835" />
-    <public type="id" name="menu_media_download" id="0x7F0A0836" />
-    <public type="id" name="menu_media_share" id="0x7F0A0837" />
-    <public type="id" name="menu_premium_guild" id="0x7F0A0838" />
-    <public type="id" name="menu_private_channel_sidebar_close" id="0x7F0A0839" />
-    <public type="id" name="menu_private_channel_sidebar_copy_id" id="0x7F0A083A" />
-    <public type="id" name="menu_private_channel_sidebar_customize_gorup" id="0x7F0A083B" />
-    <public type="id" name="menu_private_channel_sidebar_pinned_messages" id="0x7F0A083C" />
-    <public type="id" name="menu_reports_node_view_holder" id="0x7F0A083D" />
-    <public type="id" name="menu_send" id="0x7F0A083E" />
-    <public type="id" name="menu_server_settings_delete" id="0x7F0A083F" />
-    <public type="id" name="menu_server_settings_emoji_delete" id="0x7F0A0840" />
-    <public type="id" name="menu_server_settings_members_prune" id="0x7F0A0841" />
-    <public type="id" name="menu_settings_debugging" id="0x7F0A0842" />
-    <public type="id" name="menu_settings_log_out" id="0x7F0A0843" />
-    <public type="id" name="menu_settings_premium_guild_sub_cancel" id="0x7F0A0844" />
-    <public type="id" name="menu_settings_premium_guild_sub_transfer" id="0x7F0A0845" />
-    <public type="id" name="menu_settings_premium_guild_sub_uncancel" id="0x7F0A0846" />
-    <public type="id" name="menu_sort_channel" id="0x7F0A0847" />
-    <public type="id" name="menu_sort_done" id="0x7F0A0848" />
-    <public type="id" name="menu_thread_browser_create_thread" id="0x7F0A0849" />
-    <public type="id" name="menu_thread_browser_filters" id="0x7F0A084A" />
-    <public type="id" name="menu_user_mentions_filter" id="0x7F0A084B" />
-    <public type="id" name="message" id="0x7F0A084C" />
-    <public type="id" name="mfa_description_text" id="0x7F0A084D" />
-    <public type="id" name="mfa_download_body" id="0x7F0A084E" />
-    <public type="id" name="mfa_success_enable_sms" id="0x7F0A084F" />
-    <public type="id" name="middle" id="0x7F0A0850" />
-    <public type="id" name="mini" id="0x7F0A0851" />
-    <public type="id" name="mobile_reports_block_user_avatar" id="0x7F0A0852" />
-    <public type="id" name="mobile_reports_block_user_button" id="0x7F0A0853" />
-    <public type="id" name="mobile_reports_block_user_description" id="0x7F0A0854" />
-    <public type="id" name="mobile_reports_block_user_header" id="0x7F0A0855" />
-    <public type="id" name="mobile_reports_block_user_name" id="0x7F0A0856" />
-    <public type="id" name="mobile_reports_channel_preview" id="0x7F0A0857" />
-    <public type="id" name="mobile_reports_channel_preview_bottom_guideline" id="0x7F0A0858" />
-    <public type="id" name="mobile_reports_channel_preview_channel_name" id="0x7F0A0859" />
-    <public type="id" name="mobile_reports_channel_preview_end_guideline" id="0x7F0A085A" />
-    <public type="id" name="mobile_reports_channel_preview_image" id="0x7F0A085B" />
-    <public type="id" name="mobile_reports_channel_preview_stage_title" id="0x7F0A085C" />
-    <public type="id" name="mobile_reports_channel_preview_start_guideline" id="0x7F0A085D" />
-    <public type="id" name="mobile_reports_channel_preview_top_guideline" id="0x7F0A085E" />
-    <public type="id" name="mobile_reports_child" id="0x7F0A085F" />
-    <public type="id" name="mobile_reports_child_menu_title" id="0x7F0A0860" />
-    <public type="id" name="mobile_reports_message_preview" id="0x7F0A0861" />
-    <public type="id" name="mobile_reports_multiselect" id="0x7F0A0862" />
-    <public type="id" name="mobile_reports_node_block_user" id="0x7F0A0863" />
-    <public type="id" name="mobile_reports_node_bottom_button" id="0x7F0A0864" />
-    <public type="id" name="mobile_reports_node_breadcrumbs" id="0x7F0A0865" />
-    <public type="id" name="mobile_reports_node_channel_preview" id="0x7F0A0866" />
-    <public type="id" name="mobile_reports_node_child_list" id="0x7F0A0867" />
-    <public type="id" name="mobile_reports_node_header" id="0x7F0A0868" />
-    <public type="id" name="mobile_reports_node_info_box" id="0x7F0A0869" />
-    <public type="id" name="mobile_reports_node_info_text" id="0x7F0A086A" />
-    <public type="id" name="mobile_reports_node_message_preview" id="0x7F0A086B" />
-    <public type="id" name="mobile_reports_node_subheader" id="0x7F0A086C" />
-    <public type="id" name="mobile_reports_node_success_shield" id="0x7F0A086D" />
-    <public type="id" name="mobile_reports_progress_bar" id="0x7F0A086E" />
-    <public type="id" name="mono" id="0x7F0A086F" />
-    <public type="id" name="month_grid" id="0x7F0A0870" />
-    <public type="id" name="month_navigation_bar" id="0x7F0A0871" />
-    <public type="id" name="month_navigation_fragment_toggle" id="0x7F0A0872" />
-    <public type="id" name="month_navigation_next" id="0x7F0A0873" />
-    <public type="id" name="month_navigation_previous" id="0x7F0A0874" />
-    <public type="id" name="month_title" id="0x7F0A0875" />
-    <public type="id" name="more_arrow" id="0x7F0A0876" />
-    <public type="id" name="motion_base" id="0x7F0A0877" />
-    <public type="id" name="move_to_audience_button" id="0x7F0A0878" />
-    <public type="id" name="mtrl_anchor_parent" id="0x7F0A0879" />
-    <public type="id" name="mtrl_calendar_day_selector_frame" id="0x7F0A087A" />
-    <public type="id" name="mtrl_calendar_days_of_week" id="0x7F0A087B" />
-    <public type="id" name="mtrl_calendar_frame" id="0x7F0A087C" />
-    <public type="id" name="mtrl_calendar_main_pane" id="0x7F0A087D" />
-    <public type="id" name="mtrl_calendar_months" id="0x7F0A087E" />
-    <public type="id" name="mtrl_calendar_selection_frame" id="0x7F0A087F" />
-    <public type="id" name="mtrl_calendar_text_input_frame" id="0x7F0A0880" />
-    <public type="id" name="mtrl_calendar_year_selector_frame" id="0x7F0A0881" />
-    <public type="id" name="mtrl_card_checked_layer_id" id="0x7F0A0882" />
-    <public type="id" name="mtrl_child_content_container" id="0x7F0A0883" />
-    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7F0A0884" />
-    <public type="id" name="mtrl_motion_snapshot_view" id="0x7F0A0885" />
-    <public type="id" name="mtrl_picker_fullscreen" id="0x7F0A0886" />
-    <public type="id" name="mtrl_picker_header" id="0x7F0A0887" />
-    <public type="id" name="mtrl_picker_header_selection_text" id="0x7F0A0888" />
-    <public type="id" name="mtrl_picker_header_title_and_selection" id="0x7F0A0889" />
-    <public type="id" name="mtrl_picker_header_toggle" id="0x7F0A088A" />
-    <public type="id" name="mtrl_picker_text_input_date" id="0x7F0A088B" />
-    <public type="id" name="mtrl_picker_text_input_range_end" id="0x7F0A088C" />
-    <public type="id" name="mtrl_picker_text_input_range_start" id="0x7F0A088D" />
-    <public type="id" name="mtrl_picker_title_text" id="0x7F0A088E" />
-    <public type="id" name="mtrl_view_tag_bottom_padding" id="0x7F0A088F" />
-    <public type="id" name="multiply" id="0x7F0A0890" />
-    <public type="id" name="mute_button" id="0x7F0A0891" />
-    <public type="id" name="mute_settings_sheet_mute_options" id="0x7F0A0892" />
-    <public type="id" name="mute_toggle" id="0x7F0A0893" />
-    <public type="id" name="mutual_server_1" id="0x7F0A0894" />
-    <public type="id" name="mutual_server_2" id="0x7F0A0895" />
-    <public type="id" name="mutual_server_3" id="0x7F0A0896" />
-    <public type="id" name="mutual_server_4" id="0x7F0A0897" />
-    <public type="id" name="name" id="0x7F0A0898" />
-    <public type="id" name="name_placeholder" id="0x7F0A0899" />
-    <public type="id" name="name_placeholder_end_guideline" id="0x7F0A089A" />
-    <public type="id" name="name_tv" id="0x7F0A089B" />
-    <public type="id" name="navigation_header_container" id="0x7F0A089C" />
-    <public type="id" name="navigation_help_close" id="0x7F0A089D" />
-    <public type="id" name="navigation_help_indicators" id="0x7F0A089E" />
-    <public type="id" name="navigation_help_nux_pager" id="0x7F0A089F" />
-    <public type="id" name="navigation_indicator" id="0x7F0A08A0" />
-    <public type="id" name="nearby_friends_enable" id="0x7F0A08A1" />
-    <public type="id" name="nearby_friends_learn_more" id="0x7F0A08A2" />
-    <public type="id" name="nearby_friends_recycler" id="0x7F0A08A3" />
-    <public type="id" name="nearby_friends_searching_body" id="0x7F0A08A4" />
-    <public type="id" name="nearby_friends_searching_lottie" id="0x7F0A08A5" />
-    <public type="id" name="nearby_friends_searching_title" id="0x7F0A08A6" />
-    <public type="id" name="never" id="0x7F0A08A7" />
-    <public type="id" name="nitro_boosting" id="0x7F0A08A8" />
-    <public type="id" name="nitro_gifting" id="0x7F0A08A9" />
-    <public type="id" name="nitro_header" id="0x7F0A08AA" />
-    <public type="id" name="nitro_settings_container" id="0x7F0A08AB" />
-    <public type="id" name="noScroll" id="0x7F0A08AC" />
-    <public type="id" name="no_bans_body" id="0x7F0A08AD" />
-    <public type="id" name="no_guilds" id="0x7F0A08AE" />
-    <public type="id" name="no_invites_body" id="0x7F0A08AF" />
-    <public type="id" name="no_invites_header" id="0x7F0A08B0" />
-    <public type="id" name="no_logs_body" id="0x7F0A08B1" />
-    <public type="id" name="no_logs_title" id="0x7F0A08B2" />
-    <public type="id" name="no_results_text" id="0x7F0A08B3" />
-    <public type="id" name="noise_cancellation_enable_button" id="0x7F0A08B4" />
-    <public type="id" name="noise_cancellation_learn_more" id="0x7F0A08B5" />
-    <public type="id" name="none" id="0x7F0A08B6" />
-    <public type="id" name="normal" id="0x7F0A08B7" />
-    <public type="id" name="not_found" id="0x7F0A08B8" />
-    <public type="id" name="notice_body_container" id="0x7F0A08B9" />
-    <public type="id" name="notice_body_text" id="0x7F0A08BA" />
-    <public type="id" name="notice_cancel" id="0x7F0A08BB" />
-    <public type="id" name="notice_crop" id="0x7F0A08BC" />
-    <public type="id" name="notice_header" id="0x7F0A08BD" />
-    <public type="id" name="notice_header_container" id="0x7F0A08BE" />
-    <public type="id" name="notice_image" id="0x7F0A08BF" />
-    <public type="id" name="notice_ok" id="0x7F0A08C0" />
-    <public type="id" name="notice_upload" id="0x7F0A08C1" />
-    <public type="id" name="notification_background" id="0x7F0A08C2" />
-    <public type="id" name="notification_main_column" id="0x7F0A08C3" />
-    <public type="id" name="notification_main_column_container" id="0x7F0A08C4" />
-    <public type="id" name="notification_mute_settings_mute_item" id="0x7F0A08C5" />
-    <public type="id" name="notification_mute_settings_mute_item_description" id="0x7F0A08C6" />
-    <public type="id" name="notification_mute_settings_mute_item_status" id="0x7F0A08C7" />
-    <public type="id" name="notification_settings_button" id="0x7F0A08C8" />
-    <public type="id" name="notification_settings_button_container" id="0x7F0A08C9" />
-    <public type="id" name="notification_settings_label" id="0x7F0A08CA" />
-    <public type="id" name="notification_settings_overrides_label" id="0x7F0A08CB" />
-    <public type="id" name="notifications" id="0x7F0A08CC" />
-    <public type="id" name="nowrap" id="0x7F0A08CD" />
-    <public type="id" name="nuf_channel_prompt_cta_button" id="0x7F0A08CE" />
-    <public type="id" name="nuf_channel_prompt_guild_icon" id="0x7F0A08CF" />
-    <public type="id" name="nuf_channel_prompt_guild_icon_name" id="0x7F0A08D0" />
-    <public type="id" name="nuf_channel_prompt_guild_name" id="0x7F0A08D1" />
-    <public type="id" name="nuf_channel_prompt_skip_button" id="0x7F0A08D2" />
-    <public type="id" name="nuf_channel_prompt_topic_wrap" id="0x7F0A08D3" />
-    <public type="id" name="numeric" id="0x7F0A08D4" />
-    <public type="id" name="nux_guild_template_action_club" id="0x7F0A08D5" />
-    <public type="id" name="nux_guild_template_action_community" id="0x7F0A08D6" />
-    <public type="id" name="nux_guild_template_action_create" id="0x7F0A08D7" />
-    <public type="id" name="nux_guild_template_action_creator" id="0x7F0A08D8" />
-    <public type="id" name="nux_guild_template_action_friend" id="0x7F0A08D9" />
-    <public type="id" name="nux_guild_template_action_gaming" id="0x7F0A08DA" />
-    <public type="id" name="nux_guild_template_action_join" id="0x7F0A08DB" />
-    <public type="id" name="nux_guild_template_action_study" id="0x7F0A08DC" />
-    <public type="id" name="nux_guild_template_section_bottom" id="0x7F0A08DD" />
-    <public type="id" name="nux_guild_template_section_custom" id="0x7F0A08DE" />
-    <public type="id" name="nux_guild_template_section_custom_label" id="0x7F0A08DF" />
-    <public type="id" name="nux_guild_template_section_top" id="0x7F0A08E0" />
-    <public type="id" name="oauth_application_deauthorize_btn" id="0x7F0A08E1" />
-    <public type="id" name="oauth_application_description_label_tv" id="0x7F0A08E2" />
-    <public type="id" name="oauth_application_description_tv" id="0x7F0A08E3" />
-    <public type="id" name="oauth_application_icon_iv" id="0x7F0A08E4" />
-    <public type="id" name="oauth_application_list_item" id="0x7F0A08E5" />
-    <public type="id" name="oauth_application_name_tv" id="0x7F0A08E6" />
-    <public type="id" name="oauth_application_permissions_label_tv" id="0x7F0A08E7" />
-    <public type="id" name="oauth_application_permissions_rv" id="0x7F0A08E8" />
-    <public type="id" name="oauth_authorize_age_notice" id="0x7F0A08E9" />
-    <public type="id" name="oauth_authorize_age_notice_icon" id="0x7F0A08EA" />
-    <public type="id" name="oauth_authorize_application_icon" id="0x7F0A08EB" />
-    <public type="id" name="oauth_authorize_application_name" id="0x7F0A08EC" />
-    <public type="id" name="oauth_authorize_card" id="0x7F0A08ED" />
-    <public type="id" name="oauth_authorize_connect_label" id="0x7F0A08EE" />
-    <public type="id" name="oauth_authorize_content" id="0x7F0A08EF" />
-    <public type="id" name="oauth_authorize_deny" id="0x7F0A08F0" />
-    <public type="id" name="oauth_authorize_grant" id="0x7F0A08F1" />
-    <public type="id" name="oauth_authorize_loading" id="0x7F0A08F2" />
-    <public type="id" name="oauth_authorize_loading_cancel" id="0x7F0A08F3" />
-    <public type="id" name="oauth_authorize_logo" id="0x7F0A08F4" />
-    <public type="id" name="oauth_authorize_not_supported" id="0x7F0A08F5" />
-    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7F0A08F6" />
-    <public type="id" name="oauth_authorize_permissions_list" id="0x7F0A08F7" />
-    <public type="id" name="oauth_authorize_security_notice" id="0x7F0A08F8" />
-    <public type="id" name="oauth_authorize_security_notice_icon" id="0x7F0A08F9" />
-    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7F0A08FA" />
-    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7F0A08FB" />
-    <public type="id" name="oauth_authorize_user_icon" id="0x7F0A08FC" />
-    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7F0A08FD" />
-    <public type="id" name="oauth_token_permission_detailed_name" id="0x7F0A08FE" />
-    <public type="id" name="off" id="0x7F0A08FF" />
-    <public type="id" name="off_disabled_overlay" id="0x7F0A0900" />
-    <public type="id" name="omnibox_title_section" id="0x7F0A0901" />
-    <public type="id" name="omnibox_url_section" id="0x7F0A0902" />
-    <public type="id" name="on" id="0x7F0A0903" />
-    <public type="id" name="one" id="0x7F0A0904" />
-    <public type="id" name="option_always" id="0x7F0A0905" />
-    <public type="id" name="option_eight_hours" id="0x7F0A0906" />
-    <public type="id" name="option_fifteen_minutes" id="0x7F0A0907" />
-    <public type="id" name="option_one_hour" id="0x7F0A0908" />
-    <public type="id" name="option_one_week" id="0x7F0A0909" />
-    <public type="id" name="option_three_days" id="0x7F0A090A" />
-    <public type="id" name="option_twenty_four_hours" id="0x7F0A090B" />
-    <public type="id" name="other_speakers_count_text" id="0x7F0A090C" />
-    <public type="id" name="outline" id="0x7F0A090D" />
-    <public type="id" name="outward" id="0x7F0A090E" />
-    <public type="id" name="overlapping_panels" id="0x7F0A090F" />
-    <public type="id" name="overlay_bubble_iv" id="0x7F0A0910" />
-    <public type="id" name="overlay_channel_name" id="0x7F0A0911" />
-    <public type="id" name="overlay_channel_search" id="0x7F0A0912" />
-    <public type="id" name="overlay_guild_name" id="0x7F0A0913" />
-    <public type="id" name="overlay_header" id="0x7F0A0914" />
-    <public type="id" name="overlay_invite_link" id="0x7F0A0915" />
-    <public type="id" name="overlay_linked_anchor_view" id="0x7F0A0916" />
-    <public type="id" name="overlay_members_overflow_tv" id="0x7F0A0917" />
-    <public type="id" name="overlay_members_rv" id="0x7F0A0918" />
-    <public type="id" name="overlay_menu" id="0x7F0A0919" />
-    <public type="id" name="overlay_network_icon" id="0x7F0A091A" />
-    <public type="id" name="overlay_open_app" id="0x7F0A091B" />
-    <public type="id" name="overlay_switch_channels" id="0x7F0A091C" />
-    <public type="id" name="overline" id="0x7F0A091D" />
-    <public type="id" name="overview_name" id="0x7F0A091E" />
-    <public type="id" name="overview_region" id="0x7F0A091F" />
-    <public type="id" name="overview_region_flag" id="0x7F0A0920" />
-    <public type="id" name="overview_region_wrap" id="0x7F0A0921" />
-    <public type="id" name="overview_region_wrap_help" id="0x7F0A0922" />
-    <public type="id" name="packed" id="0x7F0A0923" />
-    <public type="id" name="panel_center" id="0x7F0A0924" />
-    <public type="id" name="panel_left" id="0x7F0A0925" />
-    <public type="id" name="panel_right" id="0x7F0A0926" />
-    <public type="id" name="parallax" id="0x7F0A0927" />
-    <public type="id" name="parent" id="0x7F0A0928" />
-    <public type="id" name="parentPanel" id="0x7F0A0929" />
-    <public type="id" name="parentRelative" id="0x7F0A092A" />
-    <public type="id" name="parent_matrix" id="0x7F0A092B" />
-    <public type="id" name="participant_bg_avatar" id="0x7F0A092C" />
-    <public type="id" name="participant_bg_letterbox" id="0x7F0A092D" />
-    <public type="id" name="participant_deafen_status_indicator" id="0x7F0A092E" />
-    <public type="id" name="participant_fullscreen_streamqual_container" id="0x7F0A092F" />
-    <public type="id" name="participant_fullscreen_streamqual_divider" id="0x7F0A0930" />
-    <public type="id" name="participant_fullscreen_streamqual_icon" id="0x7F0A0931" />
-    <public type="id" name="participant_fullscreen_streamqual_info" id="0x7F0A0932" />
-    <public type="id" name="participant_fullscreen_streamqual_info_container" id="0x7F0A0933" />
-    <public type="id" name="participant_fullscreen_streamqual_live_indicator" id="0x7F0A0934" />
-    <public type="id" name="participant_live_indicator" id="0x7F0A0935" />
-    <public type="id" name="participant_mute_status_indicator" id="0x7F0A0936" />
-    <public type="id" name="participant_stream_ended" id="0x7F0A0937" />
-    <public type="id" name="participant_stream_ended_img" id="0x7F0A0938" />
-    <public type="id" name="participant_stream_ended_label" id="0x7F0A0939" />
-    <public type="id" name="participant_stream_paused" id="0x7F0A093A" />
-    <public type="id" name="participant_stream_preview_image" id="0x7F0A093B" />
-    <public type="id" name="participant_stream_preview_text" id="0x7F0A093C" />
-    <public type="id" name="participant_video_label" id="0x7F0A093D" />
-    <public type="id" name="participant_video_loading_indicator" id="0x7F0A093E" />
-    <public type="id" name="participant_video_stream_renderer" id="0x7F0A093F" />
-    <public type="id" name="participant_voice_indicators" id="0x7F0A0940" />
-    <public type="id" name="participant_voice_user_view" id="0x7F0A0941" />
-    <public type="id" name="password_toggle" id="0x7F0A0942" />
-    <public type="id" name="path" id="0x7F0A0943" />
-    <public type="id" name="pathRelative" id="0x7F0A0944" />
-    <public type="id" name="payment" id="0x7F0A0945" />
-    <public type="id" name="payment_method_edit" id="0x7F0A0946" />
-    <public type="id" name="payment_method_header" id="0x7F0A0947" />
-    <public type="id" name="payment_method_summary" id="0x7F0A0948" />
-    <public type="id" name="payment_source_edit_address1" id="0x7F0A0949" />
-    <public type="id" name="payment_source_edit_address2" id="0x7F0A094A" />
-    <public type="id" name="payment_source_edit_city" id="0x7F0A094B" />
-    <public type="id" name="payment_source_edit_country" id="0x7F0A094C" />
-    <public type="id" name="payment_source_edit_default" id="0x7F0A094D" />
-    <public type="id" name="payment_source_edit_error" id="0x7F0A094E" />
-    <public type="id" name="payment_source_edit_help" id="0x7F0A094F" />
-    <public type="id" name="payment_source_edit_name" id="0x7F0A0950" />
-    <public type="id" name="payment_source_edit_postal_code" id="0x7F0A0951" />
-    <public type="id" name="payment_source_edit_state" id="0x7F0A0952" />
-    <public type="id" name="payment_source_summary" id="0x7F0A0953" />
-    <public type="id" name="payment_source_view_icon" id="0x7F0A0954" />
-    <public type="id" name="payment_source_view_icon_wrapper" id="0x7F0A0955" />
-    <public type="id" name="payment_source_view_invalid" id="0x7F0A0956" />
-    <public type="id" name="payment_source_view_premium" id="0x7F0A0957" />
-    <public type="id" name="payment_source_view_subtext" id="0x7F0A0958" />
-    <public type="id" name="payment_source_view_title" id="0x7F0A0959" />
-    <public type="id" name="pbProgress" id="0x7F0A095A" />
-    <public type="id" name="peekHeight" id="0x7F0A095B" />
-    <public type="id" name="peek_container" id="0x7F0A095C" />
-    <public type="id" name="pending_dialog_desc" id="0x7F0A095D" />
-    <public type="id" name="pending_dialog_title" id="0x7F0A095E" />
-    <public type="id" name="pending_login" id="0x7F0A095F" />
-    <public type="id" name="percent" id="0x7F0A0960" />
-    <public type="id" name="perk_view_content_list_item" id="0x7F0A0961" />
-    <public type="id" name="perks_level_contents_header" id="0x7F0A0962" />
-    <public type="id" name="perks_level_contents_recycler" id="0x7F0A0963" />
-    <public type="id" name="perks_level_header" id="0x7F0A0964" />
-    <public type="id" name="perks_level_header_boosts" id="0x7F0A0965" />
-    <public type="id" name="perks_level_header_boosts_container" id="0x7F0A0966" />
-    <public type="id" name="perks_level_header_text" id="0x7F0A0967" />
-    <public type="id" name="perks_level_header_unlocked" id="0x7F0A0968" />
-    <public type="id" name="perm_req_text" id="0x7F0A0969" />
-    <public type="id" name="permission_owner_view" id="0x7F0A096A" />
-    <public type="id" name="permissions_req_btn" id="0x7F0A096B" />
-    <public type="id" name="permissions_required_action_btn" id="0x7F0A096C" />
-    <public type="id" name="permissions_required_text" id="0x7F0A096D" />
-    <public type="id" name="permissions_view_stub" id="0x7F0A096E" />
-    <public type="id" name="phone" id="0x7F0A096F" />
-    <public type="id" name="phone_country_code_code" id="0x7F0A0970" />
-    <public type="id" name="phone_country_code_item" id="0x7F0A0971" />
-    <public type="id" name="phone_country_code_name" id="0x7F0A0972" />
-    <public type="id" name="phone_country_code_recycler" id="0x7F0A0973" />
-    <public type="id" name="phone_country_code_search" id="0x7F0A0974" />
-    <public type="id" name="phone_digit_verification_view" id="0x7F0A0975" />
-    <public type="id" name="phone_or_email_country_code_wrap" id="0x7F0A0976" />
-    <public type="id" name="phone_or_email_main_input" id="0x7F0A0977" />
-    <public type="id" name="phone_or_email_main_input_wrap" id="0x7F0A0978" />
-    <public type="id" name="picture" id="0x7F0A0979" />
-    <public type="id" name="pileItemBg" id="0x7F0A097A" />
-    <public type="id" name="pileItemImage" id="0x7F0A097B" />
-    <public type="id" name="pin" id="0x7F0A097C" />
-    <public type="id" name="placeholder_group" id="0x7F0A097D" />
-    <public type="id" name="plain" id="0x7F0A097E" />
-    <public type="id" name="plan_item_border" id="0x7F0A097F" />
-    <public type="id" name="plan_item_container" id="0x7F0A0980" />
-    <public type="id" name="plan_item_current_plan" id="0x7F0A0981" />
-    <public type="id" name="plan_item_icon" id="0x7F0A0982" />
-    <public type="id" name="plan_item_name" id="0x7F0A0983" />
-    <public type="id" name="plan_item_price" id="0x7F0A0984" />
-    <public type="id" name="plus_badge" id="0x7F0A0985" />
-    <public type="id" name="popup_attachment" id="0x7F0A0986" />
-    <public type="id" name="popup_body" id="0x7F0A0987" />
-    <public type="id" name="popup_close_btn" id="0x7F0A0988" />
-    <public type="id" name="popup_icon" id="0x7F0A0989" />
-    <public type="id" name="popup_sticker" id="0x7F0A098A" />
-    <public type="id" name="popup_subtitle" id="0x7F0A098B" />
-    <public type="id" name="popup_title" id="0x7F0A098C" />
-    <public type="id" name="popup_title_wrap" id="0x7F0A098D" />
-    <public type="id" name="position" id="0x7F0A098E" />
-    <public type="id" name="postLayout" id="0x7F0A098F" />
-    <public type="id" name="premium_activated_confirm" id="0x7F0A0990" />
-    <public type="id" name="premium_activated_description" id="0x7F0A0991" />
-    <public type="id" name="premium_activated_header_background" id="0x7F0A0992" />
-    <public type="id" name="premium_activated_logo" id="0x7F0A0993" />
-    <public type="id" name="premium_activated_title" id="0x7F0A0994" />
-    <public type="id" name="premium_activated_wumpus" id="0x7F0A0995" />
-    <public type="id" name="premium_and_premium_guild_activated_text" id="0x7F0A0996" />
-    <public type="id" name="premium_btn" id="0x7F0A0997" />
-    <public type="id" name="premium_guild_confirmation_avatar" id="0x7F0A0998" />
-    <public type="id" name="premium_guild_confirmation_guild_name" id="0x7F0A0999" />
-    <public type="id" name="premium_guild_confirmation_level_info_previous" id="0x7F0A099A" />
-    <public type="id" name="premium_guild_confirmation_level_info_upgrade" id="0x7F0A099B" />
-    <public type="id" name="premium_guild_confirmation_upgrade_arrow" id="0x7F0A099C" />
-    <public type="id" name="premium_guild_subscription_activated_body1" id="0x7F0A099D" />
-    <public type="id" name="premium_guild_subscription_activated_body2" id="0x7F0A099E" />
-    <public type="id" name="premium_guild_subscription_activated_lottie" id="0x7F0A099F" />
-    <public type="id" name="premium_guild_subscription_activated_ok" id="0x7F0A09A0" />
-    <public type="id" name="premium_guild_subscription_cancel_body" id="0x7F0A09A1" />
-    <public type="id" name="premium_guild_subscription_cancel_confirm" id="0x7F0A09A2" />
-    <public type="id" name="premium_guild_subscription_cancel_error" id="0x7F0A09A3" />
-    <public type="id" name="premium_guild_subscription_cancel_flipper" id="0x7F0A09A4" />
-    <public type="id" name="premium_guild_subscription_cancel_header" id="0x7F0A09A5" />
-    <public type="id" name="premium_guild_subscription_cancel_nevermind" id="0x7F0A09A6" />
-    <public type="id" name="premium_guild_subscription_uncancel_body" id="0x7F0A09A7" />
-    <public type="id" name="premium_guild_subscription_uncancel_confirm" id="0x7F0A09A8" />
-    <public type="id" name="premium_guild_subscription_uncancel_error" id="0x7F0A09A9" />
-    <public type="id" name="premium_guild_subscription_uncancel_flipper" id="0x7F0A09AA" />
-    <public type="id" name="premium_guild_subscription_uncancel_header" id="0x7F0A09AB" />
-    <public type="id" name="premium_guild_subscription_uncancel_image" id="0x7F0A09AC" />
-    <public type="id" name="premium_guild_subscription_uncancel_nevermind" id="0x7F0A09AD" />
-    <public type="id" name="premium_guild_transfer_confirmation_blurb" id="0x7F0A09AE" />
-    <public type="id" name="premium_guild_transfer_error" id="0x7F0A09AF" />
-    <public type="id" name="premium_guild_transfer_previous_guild" id="0x7F0A09B0" />
-    <public type="id" name="premium_guild_transfer_previous_guild_header" id="0x7F0A09B1" />
-    <public type="id" name="premium_guild_transfer_select" id="0x7F0A09B2" />
-    <public type="id" name="premium_guild_transfer_target_guild" id="0x7F0A09B3" />
-    <public type="id" name="premium_guild_transfer_target_guild_header" id="0x7F0A09B4" />
-    <public type="id" name="premium_perks" id="0x7F0A09B5" />
-    <public type="id" name="premium_perks_max_guilds" id="0x7F0A09B6" />
-    <public type="id" name="premium_perks_max_message_length" id="0x7F0A09B7" />
-    <public type="id" name="premium_perks_stickers" id="0x7F0A09B8" />
-    <public type="id" name="premium_perks_upload_text" id="0x7F0A09B9" />
-    <public type="id" name="premium_settings_active_guild_subscription" id="0x7F0A09BA" />
-    <public type="id" name="premium_settings_active_subscription" id="0x7F0A09BB" />
-    <public type="id" name="premium_settings_billing_divider" id="0x7F0A09BC" />
-    <public type="id" name="premium_settings_billing_information" id="0x7F0A09BD" />
-    <public type="id" name="premium_settings_credit_container" id="0x7F0A09BE" />
-    <public type="id" name="premium_settings_credit_header" id="0x7F0A09BF" />
-    <public type="id" name="premium_settings_google_play_manage" id="0x7F0A09C0" />
-    <public type="id" name="premium_settings_grandfathered" id="0x7F0A09C1" />
-    <public type="id" name="premium_settings_legalese" id="0x7F0A09C2" />
-    <public type="id" name="premium_settings_nitro" id="0x7F0A09C3" />
-    <public type="id" name="premium_settings_nitro_classic" id="0x7F0A09C4" />
-    <public type="id" name="premium_settings_nitro_classic_boost_count" id="0x7F0A09C5" />
-    <public type="id" name="premium_settings_nitro_classic_boost_discount" id="0x7F0A09C6" />
-    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7F0A09C7" />
-    <public type="id" name="premium_settings_nitro_wumpus" id="0x7F0A09C8" />
-    <public type="id" name="premium_settings_payment_container" id="0x7F0A09C9" />
-    <public type="id" name="premium_settings_payment_header" id="0x7F0A09CA" />
-    <public type="id" name="premium_settings_premium" id="0x7F0A09CB" />
-    <public type="id" name="premium_settings_premium_classic" id="0x7F0A09CC" />
-    <public type="id" name="premium_settings_retry" id="0x7F0A09CD" />
-    <public type="id" name="premium_settings_scrollview" id="0x7F0A09CE" />
-    <public type="id" name="premium_settings_status_notice_button" id="0x7F0A09CF" />
-    <public type="id" name="premium_settings_status_notice_container" id="0x7F0A09D0" />
-    <public type="id" name="premium_settings_status_notice_tv" id="0x7F0A09D1" />
-    <public type="id" name="premium_settings_subscription_container" id="0x7F0A09D2" />
-    <public type="id" name="premium_settings_subscriptions_header" id="0x7F0A09D3" />
-    <public type="id" name="premium_settings_view_flipper" id="0x7F0A09D4" />
-    <public type="id" name="premium_sticker_upsell_close" id="0x7F0A09D5" />
-    <public type="id" name="premium_sticker_upsell_continue" id="0x7F0A09D6" />
-    <public type="id" name="premium_sticker_upsell_description" id="0x7F0A09D7" />
-    <public type="id" name="premium_sticker_upsell_perk_boost_discount" id="0x7F0A09D8" />
-    <public type="id" name="premium_sticker_upsell_perk_free_pack" id="0x7F0A09D9" />
-    <public type="id" name="premium_sticker_upsell_perk_free_pack_divider" id="0x7F0A09DA" />
-    <public type="id" name="premium_sticker_upsell_perk_sticker_discount" id="0x7F0A09DB" />
-    <public type="id" name="premium_sticker_upsell_upgrade" id="0x7F0A09DC" />
-    <public type="id" name="premium_tier_1" id="0x7F0A09DD" />
-    <public type="id" name="premium_tier_1_gift_learn_more" id="0x7F0A09DE" />
-    <public type="id" name="premium_tier_2" id="0x7F0A09DF" />
-    <public type="id" name="premium_tier_2_gift_learn_more" id="0x7F0A09E0" />
-    <public type="id" name="premium_upsell_body" id="0x7F0A09E1" />
-    <public type="id" name="premium_upsell_button_container" id="0x7F0A09E2" />
-    <public type="id" name="premium_upsell_close" id="0x7F0A09E3" />
-    <public type="id" name="premium_upsell_description" id="0x7F0A09E4" />
-    <public type="id" name="premium_upsell_divider" id="0x7F0A09E5" />
-    <public type="id" name="premium_upsell_dots" id="0x7F0A09E6" />
-    <public type="id" name="premium_upsell_get_premium" id="0x7F0A09E7" />
-    <public type="id" name="premium_upsell_header" id="0x7F0A09E8" />
-    <public type="id" name="premium_upsell_img" id="0x7F0A09E9" />
-    <public type="id" name="premium_upsell_learn_more" id="0x7F0A09EA" />
-    <public type="id" name="premium_upsell_server_perk" id="0x7F0A09EB" />
-    <public type="id" name="premium_upsell_viewpager" id="0x7F0A09EC" />
-    <public type="id" name="premium_upsell_yearly_description" id="0x7F0A09ED" />
-    <public type="id" name="premium_upsell_yearly_title" id="0x7F0A09EE" />
-    <public type="id" name="preset" id="0x7F0A09EF" />
-    <public type="id" name="privacy" id="0x7F0A09F0" />
-    <public type="id" name="private_call" id="0x7F0A09F1" />
-    <public type="id" name="private_call_blurred_grid_view" id="0x7F0A09F2" />
-    <public type="id" name="private_call_connectivity_status_bar" id="0x7F0A09F3" />
-    <public type="id" name="private_call_container" id="0x7F0A09F4" />
-    <public type="id" name="private_call_container_content" id="0x7F0A09F5" />
-    <public type="id" name="private_call_grid_view" id="0x7F0A09F6" />
-    <public type="id" name="private_call_status_duration" id="0x7F0A09F7" />
-    <public type="id" name="private_call_status_primary" id="0x7F0A09F8" />
-    <public type="id" name="private_call_status_secondary" id="0x7F0A09F9" />
-    <public type="id" name="private_channel_sidebar_actions_call" id="0x7F0A09FA" />
-    <public type="id" name="private_channel_sidebar_actions_notifications" id="0x7F0A09FB" />
-    <public type="id" name="private_channel_sidebar_actions_search" id="0x7F0A09FC" />
-    <public type="id" name="private_channel_sidebar_actions_video" id="0x7F0A09FD" />
-    <public type="id" name="private_channel_start_image" id="0x7F0A09FE" />
-    <public type="id" name="private_channel_start_text" id="0x7F0A09FF" />
-    <public type="id" name="private_thread_toggle" id="0x7F0A0A00" />
-    <public type="id" name="progress" id="0x7F0A0A01" />
-    <public type="id" name="progress_bar" id="0x7F0A0A02" />
-    <public type="id" name="progress_cancel_centered" id="0x7F0A0A03" />
-    <public type="id" name="progress_cancel_top" id="0x7F0A0A04" />
-    <public type="id" name="progress_circular" id="0x7F0A0A05" />
-    <public type="id" name="progress_file_image" id="0x7F0A0A06" />
-    <public type="id" name="progress_gem_icon" id="0x7F0A0A07" />
-    <public type="id" name="progress_horizontal" id="0x7F0A0A08" />
-    <public type="id" name="progress_level_text" id="0x7F0A0A09" />
-    <public type="id" name="progress_progress" id="0x7F0A0A0A" />
-    <public type="id" name="progress_subtext" id="0x7F0A0A0B" />
-    <public type="id" name="progress_text" id="0x7F0A0A0C" />
-    <public type="id" name="promoTermsClose" id="0x7F0A0A0D" />
-    <public type="id" name="promoTermsContent" id="0x7F0A0A0E" />
-    <public type="id" name="prune_user_cancel" id="0x7F0A0A0F" />
-    <public type="id" name="prune_user_header" id="0x7F0A0A10" />
-    <public type="id" name="prune_user_prune" id="0x7F0A0A11" />
-    <public type="id" name="prune_users_estimate_text" id="0x7F0A0A12" />
-    <public type="id" name="prune_users_history_1_radio" id="0x7F0A0A13" />
-    <public type="id" name="prune_users_history_2_radio" id="0x7F0A0A14" />
-    <public type="id" name="prune_users_loading_progressbar" id="0x7F0A0A15" />
-    <public type="id" name="public_dot" id="0x7F0A0A16" />
-    <public type="id" name="public_icon" id="0x7F0A0A17" />
-    <public type="id" name="public_notice_confirm" id="0x7F0A0A18" />
-    <public type="id" name="public_notice_dismiss" id="0x7F0A0A19" />
-    <public type="id" name="public_notice_header_icon" id="0x7F0A0A1A" />
-    <public type="id" name="public_notice_info_wrap" id="0x7F0A0A1B" />
-    <public type="id" name="public_notice_title" id="0x7F0A0A1C" />
-    <public type="id" name="public_text" id="0x7F0A0A1D" />
-    <public type="id" name="purchase_premium_monthly" id="0x7F0A0A1E" />
-    <public type="id" name="purchase_premium_yearly" id="0x7F0A0A1F" />
-    <public type="id" name="push_to_talk_button" id="0x7F0A0A20" />
-    <public type="id" name="qr_scanner" id="0x7F0A0A21" />
-    <public type="id" name="qr_scanner_chip" id="0x7F0A0A22" />
-    <public type="id" name="radio" id="0x7F0A0A23" />
-    <public type="id" name="raise_hand_badge" id="0x7F0A0A24" />
-    <public type="id" name="raise_hand_button" id="0x7F0A0A25" />
-    <public type="id" name="raised_hands_count_label" id="0x7F0A0A26" />
-    <public type="id" name="raised_hands_empty_group" id="0x7F0A0A27" />
-    <public type="id" name="raised_hands_empty_sparkle" id="0x7F0A0A28" />
-    <public type="id" name="raised_hands_empty_subtitle" id="0x7F0A0A29" />
-    <public type="id" name="raised_hands_empty_title" id="0x7F0A0A2A" />
-    <public type="id" name="ratio" id="0x7F0A0A2B" />
-    <public type="id" name="reaction_quick_add" id="0x7F0A0A2C" />
-    <public type="id" name="rectangles" id="0x7F0A0A2D" />
-    <public type="id" name="recycler" id="0x7F0A0A2E" />
-    <public type="id" name="recycler_view" id="0x7F0A0A2F" />
-    <public type="id" name="region" id="0x7F0A0A30" />
-    <public type="id" name="region_help" id="0x7F0A0A31" />
-    <public type="id" name="region_override_divider" id="0x7F0A0A32" />
-    <public type="id" name="regular" id="0x7F0A0A33" />
-    <public type="id" name="remote_auth_cancel_button" id="0x7F0A0A34" />
-    <public type="id" name="remote_auth_finish_button" id="0x7F0A0A35" />
-    <public type="id" name="remote_auth_login_button" id="0x7F0A0A36" />
-    <public type="id" name="remote_auth_not_found_cancel_button" id="0x7F0A0A37" />
-    <public type="id" name="remote_auth_temporary_switch" id="0x7F0A0A38" />
-    <public type="id" name="remote_auth_view_flipper" id="0x7F0A0A39" />
-    <public type="id" name="remove" id="0x7F0A0A3A" />
-    <public type="id" name="remove_phone" id="0x7F0A0A3B" />
-    <public type="id" name="report_button" id="0x7F0A0A3C" />
-    <public type="id" name="report_header" id="0x7F0A0A3D" />
-    <public type="id" name="report_message_end_guideline" id="0x7F0A0A3E" />
-    <public type="id" name="report_message_start_guideline" id="0x7F0A0A3F" />
-    <public type="id" name="report_message_top_guideline" id="0x7F0A0A40" />
-    <public type="id" name="report_node_bottom_button" id="0x7F0A0A41" />
-    <public type="id" name="report_node_bottom_button_cancel" id="0x7F0A0A42" />
-    <public type="id" name="report_node_bottom_button_description" id="0x7F0A0A43" />
-    <public type="id" name="report_node_bottom_button_error_text" id="0x7F0A0A44" />
-    <public type="id" name="report_reason_descriptipn" id="0x7F0A0A45" />
-    <public type="id" name="report_reason_header" id="0x7F0A0A46" />
-    <public type="id" name="report_reason_radio" id="0x7F0A0A47" />
-    <public type="id" name="report_reasons_container" id="0x7F0A0A48" />
-    <public type="id" name="report_reasons_header" id="0x7F0A0A49" />
-    <public type="id" name="report_reasons_loading" id="0x7F0A0A4A" />
-    <public type="id" name="report_tooltip" id="0x7F0A0A4B" />
-    <public type="id" name="reports_breadcrumbs_item_dot" id="0x7F0A0A4C" />
-    <public type="id" name="reports_breadcrumbs_item_title" id="0x7F0A0A4D" />
-    <public type="id" name="request_data_link" id="0x7F0A0A4E" />
-    <public type="id" name="restart" id="0x7F0A0A4F" />
-    <public type="id" name="result_count" id="0x7F0A0A50" />
-    <public type="id" name="results_rv" id="0x7F0A0A51" />
-    <public type="id" name="reverse" id="0x7F0A0A52" />
-    <public type="id" name="reverseSawtooth" id="0x7F0A0A53" />
-    <public type="id" name="rfc822" id="0x7F0A0A54" />
-    <public type="id" name="rich_presence_container" id="0x7F0A0A55" />
-    <public type="id" name="rich_presence_container_data" id="0x7F0A0A56" />
-    <public type="id" name="rich_presence_details" id="0x7F0A0A57" />
-    <public type="id" name="rich_presence_header" id="0x7F0A0A58" />
-    <public type="id" name="rich_presence_image_large" id="0x7F0A0A59" />
-    <public type="id" name="rich_presence_image_large_text" id="0x7F0A0A5A" />
-    <public type="id" name="rich_presence_image_large_wrap" id="0x7F0A0A5B" />
-    <public type="id" name="rich_presence_image_small" id="0x7F0A0A5C" />
-    <public type="id" name="rich_presence_music_duration" id="0x7F0A0A5D" />
-    <public type="id" name="rich_presence_music_elapsed" id="0x7F0A0A5E" />
-    <public type="id" name="rich_presence_music_progress_container" id="0x7F0A0A5F" />
-    <public type="id" name="rich_presence_primary_button" id="0x7F0A0A60" />
-    <public type="id" name="rich_presence_secondary_button" id="0x7F0A0A61" />
-    <public type="id" name="rich_presence_seekbar" id="0x7F0A0A62" />
-    <public type="id" name="rich_presence_state" id="0x7F0A0A63" />
-    <public type="id" name="rich_presence_time" id="0x7F0A0A64" />
-    <public type="id" name="rich_presence_title" id="0x7F0A0A65" />
-    <public type="id" name="right" id="0x7F0A0A66" />
-    <public type="id" name="rightToLeft" id="0x7F0A0A67" />
-    <public type="id" name="right_icon" id="0x7F0A0A68" />
-    <public type="id" name="right_side" id="0x7F0A0A69" />
-    <public type="id" name="role_item_checked_setting" id="0x7F0A0A6A" />
-    <public type="id" name="role_settings_add_reactions" id="0x7F0A0A6B" />
-    <public type="id" name="role_settings_administrator" id="0x7F0A0A6C" />
-    <public type="id" name="role_settings_attach_files" id="0x7F0A0A6D" />
-    <public type="id" name="role_settings_ban_members" id="0x7F0A0A6E" />
-    <public type="id" name="role_settings_change_nickname" id="0x7F0A0A6F" />
-    <public type="id" name="role_settings_color_disabled_overlay" id="0x7F0A0A70" />
-    <public type="id" name="role_settings_color_selector_container" id="0x7F0A0A71" />
-    <public type="id" name="role_settings_create_instant_invite" id="0x7F0A0A72" />
-    <public type="id" name="role_settings_current_color_display" id="0x7F0A0A73" />
-    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7F0A0A74" />
-    <public type="id" name="role_settings_embed_links" id="0x7F0A0A75" />
-    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7F0A0A76" />
-    <public type="id" name="role_settings_kick_members" id="0x7F0A0A77" />
-    <public type="id" name="role_settings_manage_channels" id="0x7F0A0A78" />
-    <public type="id" name="role_settings_manage_emojis" id="0x7F0A0A79" />
-    <public type="id" name="role_settings_manage_messages" id="0x7F0A0A7A" />
-    <public type="id" name="role_settings_manage_nicknames" id="0x7F0A0A7B" />
-    <public type="id" name="role_settings_manage_roles" id="0x7F0A0A7C" />
-    <public type="id" name="role_settings_manage_server" id="0x7F0A0A7D" />
-    <public type="id" name="role_settings_manage_webhooks" id="0x7F0A0A7E" />
-    <public type="id" name="role_settings_mention_everyone" id="0x7F0A0A7F" />
-    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7F0A0A80" />
-    <public type="id" name="role_settings_overview_scroll" id="0x7F0A0A81" />
-    <public type="id" name="role_settings_priority_speaker" id="0x7F0A0A82" />
-    <public type="id" name="role_settings_read_message_history" id="0x7F0A0A83" />
-    <public type="id" name="role_settings_read_messages" id="0x7F0A0A84" />
-    <public type="id" name="role_settings_request_to_speak" id="0x7F0A0A85" />
-    <public type="id" name="role_settings_send_messages" id="0x7F0A0A86" />
-    <public type="id" name="role_settings_send_tts_messages" id="0x7F0A0A87" />
-    <public type="id" name="role_settings_use_application_commands" id="0x7F0A0A88" />
-    <public type="id" name="role_settings_use_external_emojis" id="0x7F0A0A89" />
-    <public type="id" name="role_settings_view_audit_log" id="0x7F0A0A8A" />
-    <public type="id" name="role_settings_view_guild_analytics" id="0x7F0A0A8B" />
-    <public type="id" name="role_settings_voice_connect" id="0x7F0A0A8C" />
-    <public type="id" name="role_settings_voice_deafen_members" id="0x7F0A0A8D" />
-    <public type="id" name="role_settings_voice_move_members" id="0x7F0A0A8E" />
-    <public type="id" name="role_settings_voice_mute_members" id="0x7F0A0A8F" />
-    <public type="id" name="role_settings_voice_speak" id="0x7F0A0A90" />
-    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7F0A0A91" />
-    <public type="id" name="role_settings_voice_video" id="0x7F0A0A92" />
-    <public type="id" name="role_spinner_item_textview" id="0x7F0A0A93" />
-    <public type="id" name="roles_container" id="0x7F0A0A94" />
-    <public type="id" name="roles_list_add_role_fab" id="0x7F0A0A95" />
-    <public type="id" name="roles_permission_owners_list" id="0x7F0A0A96" />
-    <public type="id" name="roles_recycler" id="0x7F0A0A97" />
-    <public type="id" name="root" id="0x7F0A0A98" />
-    <public type="id" name="rotate_scroll_wheel" id="0x7F0A0A99" />
-    <public type="id" name="rounded" id="0x7F0A0A9A" />
-    <public type="id" name="row" id="0x7F0A0A9B" />
-    <public type="id" name="row_index_key" id="0x7F0A0A9C" />
-    <public type="id" name="row_reverse" id="0x7F0A0A9D" />
-    <public type="id" name="save" id="0x7F0A0A9E" />
-    <public type="id" name="save_non_transition_alpha" id="0x7F0A0A9F" />
-    <public type="id" name="save_overlay_view" id="0x7F0A0AA0" />
-    <public type="id" name="sawtooth" id="0x7F0A0AA1" />
-    <public type="id" name="scale" id="0x7F0A0AA2" />
-    <public type="id" name="scale_scroll_wheel" id="0x7F0A0AA3" />
-    <public type="id" name="screen" id="0x7F0A0AA4" />
-    <public type="id" name="screen_share_button" id="0x7F0A0AA5" />
-    <public type="id" name="screen_share_nfx_cancel_button" id="0x7F0A0AA6" />
-    <public type="id" name="screen_share_nfx_cta" id="0x7F0A0AA7" />
-    <public type="id" name="screen_share_secondary_button" id="0x7F0A0AA8" />
-    <public type="id" name="screen_title" id="0x7F0A0AA9" />
-    <public type="id" name="screen_title_subtitle" id="0x7F0A0AAA" />
-    <public type="id" name="screen_title_title" id="0x7F0A0AAB" />
-    <public type="id" name="scroll" id="0x7F0A0AAC" />
-    <public type="id" name="scrollIndicatorDown" id="0x7F0A0AAD" />
-    <public type="id" name="scrollIndicatorUp" id="0x7F0A0AAE" />
-    <public type="id" name="scrollView" id="0x7F0A0AAF" />
-    <public type="id" name="scroll_view" id="0x7F0A0AB0" />
-    <public type="id" name="scrollable" id="0x7F0A0AB1" />
-    <public type="id" name="search_badge" id="0x7F0A0AB2" />
-    <public type="id" name="search_bar" id="0x7F0A0AB3" />
-    <public type="id" name="search_barrier" id="0x7F0A0AB4" />
-    <public type="id" name="search_button" id="0x7F0A0AB5" />
-    <public type="id" name="search_clear" id="0x7F0A0AB6" />
-    <public type="id" name="search_close_btn" id="0x7F0A0AB7" />
-    <public type="id" name="search_edit_frame" id="0x7F0A0AB8" />
-    <public type="id" name="search_flipper" id="0x7F0A0AB9" />
-    <public type="id" name="search_go_btn" id="0x7F0A0ABA" />
-    <public type="id" name="search_icon" id="0x7F0A0ABB" />
-    <public type="id" name="search_input" id="0x7F0A0ABC" />
-    <public type="id" name="search_input_edit_text" id="0x7F0A0ABD" />
-    <public type="id" name="search_mag_icon" id="0x7F0A0ABE" />
-    <public type="id" name="search_plate" id="0x7F0A0ABF" />
-    <public type="id" name="search_results_list" id="0x7F0A0AC0" />
-    <public type="id" name="search_send_query_fab" id="0x7F0A0AC1" />
-    <public type="id" name="search_src_text" id="0x7F0A0AC2" />
-    <public type="id" name="search_suggestion_item_channel_container" id="0x7F0A0AC3" />
-    <public type="id" name="search_suggestion_item_has_container" id="0x7F0A0AC4" />
-    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7F0A0AC5" />
-    <public type="id" name="search_suggestion_item_user_container" id="0x7F0A0AC6" />
-    <public type="id" name="search_suggestions_item_channel_icon" id="0x7F0A0AC7" />
-    <public type="id" name="search_suggestions_item_channel_text" id="0x7F0A0AC8" />
-    <public type="id" name="search_suggestions_item_has_icon" id="0x7F0A0AC9" />
-    <public type="id" name="search_suggestions_item_has_text" id="0x7F0A0ACA" />
-    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7F0A0ACB" />
-    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7F0A0ACC" />
-    <public type="id" name="search_suggestions_recycler" id="0x7F0A0ACD" />
-    <public type="id" name="search_voice_btn" id="0x7F0A0ACE" />
-    <public type="id" name="secondary_actions_card" id="0x7F0A0ACF" />
-    <public type="id" name="section_general_permissions" id="0x7F0A0AD0" />
-    <public type="id" name="section_three" id="0x7F0A0AD1" />
-    <public type="id" name="seekbar" id="0x7F0A0AD2" />
-    <public type="id" name="seekbar_value" id="0x7F0A0AD3" />
-    <public type="id" name="segmented_control" id="0x7F0A0AD4" />
-    <public type="id" name="select_component_chevron" id="0x7F0A0AD5" />
-    <public type="id" name="select_component_loading" id="0x7F0A0AD6" />
-    <public type="id" name="select_component_selection_icon" id="0x7F0A0AD7" />
-    <public type="id" name="select_component_selection_text" id="0x7F0A0AD8" />
-    <public type="id" name="select_component_selections_root" id="0x7F0A0AD9" />
-    <public type="id" name="select_component_sheet_item_description" id="0x7F0A0ADA" />
-    <public type="id" name="select_component_sheet_item_divider" id="0x7F0A0ADB" />
-    <public type="id" name="select_component_sheet_item_divider_icon" id="0x7F0A0ADC" />
-    <public type="id" name="select_component_sheet_item_icon" id="0x7F0A0ADD" />
-    <public type="id" name="select_component_sheet_item_selected" id="0x7F0A0ADE" />
-    <public type="id" name="select_component_sheet_item_title" id="0x7F0A0ADF" />
-    <public type="id" name="select_dialog_listview" id="0x7F0A0AE0" />
-    <public type="id" name="select_subscription_header_text" id="0x7F0A0AE1" />
-    <public type="id" name="selected" id="0x7F0A0AE2" />
-    <public type="id" name="selection_indicator" id="0x7F0A0AE3" />
-    <public type="id" name="selection_type" id="0x7F0A0AE4" />
-    <public type="id" name="send_btn_container" id="0x7F0A0AE5" />
-    <public type="id" name="send_btn_image" id="0x7F0A0AE6" />
-    <public type="id" name="send_sticker_greet_button" id="0x7F0A0AE7" />
-    <public type="id" name="server_notifications_everyone_switch" id="0x7F0A0AE8" />
-    <public type="id" name="server_notifications_frequency_0_radio" id="0x7F0A0AE9" />
-    <public type="id" name="server_notifications_frequency_1_radio" id="0x7F0A0AEA" />
-    <public type="id" name="server_notifications_frequency_2_radio" id="0x7F0A0AEB" />
-    <public type="id" name="server_notifications_frequency_divider" id="0x7F0A0AEC" />
-    <public type="id" name="server_notifications_frequency_wrap" id="0x7F0A0AED" />
-    <public type="id" name="server_notifications_mute_settings_view" id="0x7F0A0AEE" />
-    <public type="id" name="server_notifications_push_switch" id="0x7F0A0AEF" />
-    <public type="id" name="server_notifications_roles_switch" id="0x7F0A0AF0" />
-    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7F0A0AF1" />
-    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7F0A0AF2" />
-    <public type="id" name="server_settings_audit_logs_recycler" id="0x7F0A0AF3" />
-    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7F0A0AF4" />
-    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7F0A0AF5" />
-    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7F0A0AF6" />
-    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7F0A0AF7" />
-    <public type="id" name="server_settings_bans_option" id="0x7F0A0AF8" />
-    <public type="id" name="server_settings_bans_recycler" id="0x7F0A0AF9" />
-    <public type="id" name="server_settings_bans_search" id="0x7F0A0AFA" />
-    <public type="id" name="server_settings_bans_view_flipper" id="0x7F0A0AFB" />
-    <public type="id" name="server_settings_channels_create_channel" id="0x7F0A0AFC" />
-    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7F0A0AFD" />
-    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7F0A0AFE" />
-    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7F0A0AFF" />
-    <public type="id" name="server_settings_channels_text_recycler" id="0x7F0A0B00" />
-    <public type="id" name="server_settings_community_locale" id="0x7F0A0B01" />
-    <public type="id" name="server_settings_community_overview_option" id="0x7F0A0B02" />
-    <public type="id" name="server_settings_community_overview_scroll" id="0x7F0A0B03" />
-    <public type="id" name="server_settings_community_setting_selector_description" id="0x7F0A0B04" />
-    <public type="id" name="server_settings_community_setting_selector_dropdown_icon" id="0x7F0A0B05" />
-    <public type="id" name="server_settings_community_setting_selector_subtitle" id="0x7F0A0B06" />
-    <public type="id" name="server_settings_community_setting_selector_title" id="0x7F0A0B07" />
-    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7F0A0B08" />
-    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7F0A0B09" />
-    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7F0A0B0A" />
-    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7F0A0B0B" />
-    <public type="id" name="server_settings_delete_server_cancel" id="0x7F0A0B0C" />
-    <public type="id" name="server_settings_delete_server_confirm" id="0x7F0A0B0D" />
-    <public type="id" name="server_settings_delete_server_header" id="0x7F0A0B0E" />
-    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7F0A0B0F" />
-    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7F0A0B10" />
-    <public type="id" name="server_settings_delete_server_text" id="0x7F0A0B11" />
-    <public type="id" name="server_settings_disable_community_button" id="0x7F0A0B12" />
-    <public type="id" name="server_settings_disable_community_message" id="0x7F0A0B13" />
-    <public type="id" name="server_settings_emojis_avatar" id="0x7F0A0B14" />
-    <public type="id" name="server_settings_emojis_container" id="0x7F0A0B15" />
-    <public type="id" name="server_settings_emojis_edit_alias" id="0x7F0A0B16" />
-    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7F0A0B17" />
-    <public type="id" name="server_settings_emojis_name" id="0x7F0A0B18" />
-    <public type="id" name="server_settings_emojis_option" id="0x7F0A0B19" />
-    <public type="id" name="server_settings_emojis_overflow" id="0x7F0A0B1A" />
-    <public type="id" name="server_settings_emojis_username" id="0x7F0A0B1B" />
-    <public type="id" name="server_settings_emojis_username_avatar" id="0x7F0A0B1C" />
-    <public type="id" name="server_settings_enable_community_option" id="0x7F0A0B1D" />
-    <public type="id" name="server_settings_help_item" id="0x7F0A0B1E" />
-    <public type="id" name="server_settings_instant_invites_option" id="0x7F0A0B1F" />
-    <public type="id" name="server_settings_instant_invites_recycler" id="0x7F0A0B20" />
-    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7F0A0B21" />
-    <public type="id" name="server_settings_members_header_container" id="0x7F0A0B22" />
-    <public type="id" name="server_settings_members_name_search" id="0x7F0A0B23" />
-    <public type="id" name="server_settings_members_option" id="0x7F0A0B24" />
-    <public type="id" name="server_settings_members_recycler" id="0x7F0A0B25" />
-    <public type="id" name="server_settings_members_roles_spinner" id="0x7F0A0B26" />
-    <public type="id" name="server_settings_members_view_flipper" id="0x7F0A0B27" />
-    <public type="id" name="server_settings_moderation_explicit_1" id="0x7F0A0B28" />
-    <public type="id" name="server_settings_moderation_explicit_2" id="0x7F0A0B29" />
-    <public type="id" name="server_settings_moderation_explicit_3" id="0x7F0A0B2A" />
-    <public type="id" name="server_settings_moderation_explicit_help" id="0x7F0A0B2B" />
-    <public type="id" name="server_settings_moderation_verification_1" id="0x7F0A0B2C" />
-    <public type="id" name="server_settings_moderation_verification_2" id="0x7F0A0B2D" />
-    <public type="id" name="server_settings_moderation_verification_3" id="0x7F0A0B2E" />
-    <public type="id" name="server_settings_moderation_verification_4" id="0x7F0A0B2F" />
-    <public type="id" name="server_settings_moderation_verification_5" id="0x7F0A0B30" />
-    <public type="id" name="server_settings_moderation_verification_help" id="0x7F0A0B31" />
-    <public type="id" name="server_settings_option_audit_log" id="0x7F0A0B32" />
-    <public type="id" name="server_settings_option_channels" id="0x7F0A0B33" />
-    <public type="id" name="server_settings_option_integrations" id="0x7F0A0B34" />
-    <public type="id" name="server_settings_option_moderation" id="0x7F0A0B35" />
-    <public type="id" name="server_settings_option_overview" id="0x7F0A0B36" />
-    <public type="id" name="server_settings_option_security" id="0x7F0A0B37" />
-    <public type="id" name="server_settings_option_vanity_url" id="0x7F0A0B38" />
-    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7F0A0B39" />
-    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7F0A0B3A" />
-    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7F0A0B3B" />
-    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7F0A0B3C" />
-    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7F0A0B3D" />
-    <public type="id" name="server_settings_overview_icon" id="0x7F0A0B3E" />
-    <public type="id" name="server_settings_overview_icon_name_container" id="0x7F0A0B3F" />
-    <public type="id" name="server_settings_overview_icon_remove" id="0x7F0A0B40" />
-    <public type="id" name="server_settings_overview_icon_text" id="0x7F0A0B41" />
-    <public type="id" name="server_settings_overview_notification_all" id="0x7F0A0B42" />
-    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7F0A0B43" />
-    <public type="id" name="server_settings_overview_region_item_name" id="0x7F0A0B44" />
-    <public type="id" name="server_settings_overview_region_list" id="0x7F0A0B45" />
-    <public type="id" name="server_settings_overview_scroll" id="0x7F0A0B46" />
-    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7F0A0B47" />
-    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7F0A0B48" />
-    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7F0A0B49" />
-    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7F0A0B4A" />
-    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7F0A0B4B" />
-    <public type="id" name="server_settings_public_setting_selector" id="0x7F0A0B4C" />
-    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7F0A0B4D" />
-    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7F0A0B4E" />
-    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7F0A0B4F" />
-    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7F0A0B50" />
-    <public type="id" name="server_settings_role_item_name" id="0x7F0A0B51" />
-    <public type="id" name="server_settings_roles_option" id="0x7F0A0B52" />
-    <public type="id" name="server_settings_roles_recycler" id="0x7F0A0B53" />
-    <public type="id" name="server_settings_section_community" id="0x7F0A0B54" />
-    <public type="id" name="server_settings_section_community_divider" id="0x7F0A0B55" />
-    <public type="id" name="server_settings_section_general_settings" id="0x7F0A0B56" />
-    <public type="id" name="server_settings_section_user_management" id="0x7F0A0B57" />
-    <public type="id" name="server_settings_section_user_management_divider" id="0x7F0A0B58" />
-    <public type="id" name="server_settings_security_dialog_cancel" id="0x7F0A0B59" />
-    <public type="id" name="server_settings_security_dialog_confirm" id="0x7F0A0B5A" />
-    <public type="id" name="server_settings_security_label" id="0x7F0A0B5B" />
-    <public type="id" name="server_settings_security_server_mfa_code" id="0x7F0A0B5C" />
-    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7F0A0B5D" />
-    <public type="id" name="server_settings_server_icon" id="0x7F0A0B5E" />
-    <public type="id" name="server_settings_server_icon_text" id="0x7F0A0B5F" />
-    <public type="id" name="server_settings_server_name" id="0x7F0A0B60" />
-    <public type="id" name="server_settings_vanity_input" id="0x7F0A0B61" />
-    <public type="id" name="server_settings_vanity_url_current_url" id="0x7F0A0B62" />
-    <public type="id" name="server_settings_vanity_url_error_text" id="0x7F0A0B63" />
-    <public type="id" name="server_settings_vanity_url_header" id="0x7F0A0B64" />
-    <public type="id" name="server_settings_vanity_url_input_container" id="0x7F0A0B65" />
-    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7F0A0B66" />
-    <public type="id" name="server_settings_vanity_url_prefix" id="0x7F0A0B67" />
-    <public type="id" name="server_settings_vanity_url_remove" id="0x7F0A0B68" />
-    <public type="id" name="server_settings_vanity_url_save" id="0x7F0A0B69" />
-    <public type="id" name="set_custom_status_emoji" id="0x7F0A0B6A" />
-    <public type="id" name="set_custom_status_emoji_button" id="0x7F0A0B6B" />
-    <public type="id" name="set_custom_status_expiration" id="0x7F0A0B6C" />
-    <public type="id" name="set_custom_status_expiration_1_hour" id="0x7F0A0B6D" />
-    <public type="id" name="set_custom_status_expiration_30_minutes" id="0x7F0A0B6E" />
-    <public type="id" name="set_custom_status_expiration_4_hours" id="0x7F0A0B6F" />
-    <public type="id" name="set_custom_status_expiration_never" id="0x7F0A0B70" />
-    <public type="id" name="set_custom_status_expiration_tomorrow" id="0x7F0A0B71" />
-    <public type="id" name="set_custom_status_save" id="0x7F0A0B72" />
-    <public type="id" name="set_custom_status_text" id="0x7F0A0B73" />
-    <public type="id" name="set_status_container" id="0x7F0A0B74" />
-    <public type="id" name="setting_button" id="0x7F0A0B75" />
-    <public type="id" name="setting_container" id="0x7F0A0B76" />
-    <public type="id" name="setting_disabled_overlay" id="0x7F0A0B77" />
-    <public type="id" name="setting_drawable_left" id="0x7F0A0B78" />
-    <public type="id" name="setting_label" id="0x7F0A0B79" />
-    <public type="id" name="setting_subtext" id="0x7F0A0B7A" />
-    <public type="id" name="setting_tag" id="0x7F0A0B7B" />
-    <public type="id" name="settings_accessibility_allow_animate_emoji_switch" id="0x7F0A0B7C" />
-    <public type="id" name="settings_accessibility_allow_autoplay_gif_switch" id="0x7F0A0B7D" />
-    <public type="id" name="settings_accessibility_images_header" id="0x7F0A0B7E" />
-    <public type="id" name="settings_accessibility_reduced_motion_description" id="0x7F0A0B7F" />
-    <public type="id" name="settings_accessibility_reduced_motion_header" id="0x7F0A0B80" />
-    <public type="id" name="settings_accessibility_reduced_motion_switch" id="0x7F0A0B81" />
-    <public type="id" name="settings_accessibility_stickers_container" id="0x7F0A0B82" />
-    <public type="id" name="settings_accessibility_stickers_header" id="0x7F0A0B83" />
-    <public type="id" name="settings_account_2fa_header" id="0x7F0A0B84" />
-    <public type="id" name="settings_account_avatar" id="0x7F0A0B85" />
-    <public type="id" name="settings_account_avatar_container" id="0x7F0A0B86" />
-    <public type="id" name="settings_account_avatar_edit" id="0x7F0A0B87" />
-    <public type="id" name="settings_account_avatar_wrap" id="0x7F0A0B88" />
-    <public type="id" name="settings_account_change_password" id="0x7F0A0B89" />
-    <public type="id" name="settings_account_email_container" id="0x7F0A0B8A" />
-    <public type="id" name="settings_account_email_label" id="0x7F0A0B8B" />
-    <public type="id" name="settings_account_email_text" id="0x7F0A0B8C" />
-    <public type="id" name="settings_account_information_data_wrap" id="0x7F0A0B8D" />
-    <public type="id" name="settings_account_information_header" id="0x7F0A0B8E" />
-    <public type="id" name="settings_account_management_header" id="0x7F0A0B8F" />
-    <public type="id" name="settings_account_mfa_container" id="0x7F0A0B90" />
-    <public type="id" name="settings_account_mfa_disabled_container" id="0x7F0A0B91" />
-    <public type="id" name="settings_account_mfa_enable" id="0x7F0A0B92" />
-    <public type="id" name="settings_account_mfa_enabled_container" id="0x7F0A0B93" />
-    <public type="id" name="settings_account_mfa_enabled_header" id="0x7F0A0B94" />
-    <public type="id" name="settings_account_mfa_flipper" id="0x7F0A0B95" />
-    <public type="id" name="settings_account_mfa_lottie" id="0x7F0A0B96" />
-    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7F0A0B97" />
-    <public type="id" name="settings_account_name_clear" id="0x7F0A0B98" />
-    <public type="id" name="settings_account_name_container" id="0x7F0A0B99" />
-    <public type="id" name="settings_account_name_label" id="0x7F0A0B9A" />
-    <public type="id" name="settings_account_name_text" id="0x7F0A0B9B" />
-    <public type="id" name="settings_account_phone_container" id="0x7F0A0B9C" />
-    <public type="id" name="settings_account_phone_label" id="0x7F0A0B9D" />
-    <public type="id" name="settings_account_phone_text" id="0x7F0A0B9E" />
-    <public type="id" name="settings_account_private_data_delete" id="0x7F0A0B9F" />
-    <public type="id" name="settings_account_private_data_disable" id="0x7F0A0BA0" />
-    <public type="id" name="settings_account_private_data_wrap" id="0x7F0A0BA1" />
-    <public type="id" name="settings_account_remove_avatar" id="0x7F0A0BA2" />
-    <public type="id" name="settings_account_remove_two_fa" id="0x7F0A0BA3" />
-    <public type="id" name="settings_account_save" id="0x7F0A0BA4" />
-    <public type="id" name="settings_account_scroll" id="0x7F0A0BA5" />
-    <public type="id" name="settings_account_sms_backup" id="0x7F0A0BA6" />
-    <public type="id" name="settings_account_sms_phone" id="0x7F0A0BA7" />
-    <public type="id" name="settings_account_tag" id="0x7F0A0BA8" />
-    <public type="id" name="settings_account_tag_container" id="0x7F0A0BA9" />
-    <public type="id" name="settings_account_tag_label" id="0x7F0A0BAA" />
-    <public type="id" name="settings_account_tag_text" id="0x7F0A0BAB" />
-    <public type="id" name="settings_account_verification" id="0x7F0A0BAC" />
-    <public type="id" name="settings_account_verification_button" id="0x7F0A0BAD" />
-    <public type="id" name="settings_account_verification_title" id="0x7F0A0BAE" />
-    <public type="id" name="settings_account_view_backup_codes" id="0x7F0A0BAF" />
-    <public type="id" name="settings_appearance_font_scale_header" id="0x7F0A0BB0" />
-    <public type="id" name="settings_appearance_font_scale_platform" id="0x7F0A0BB1" />
-    <public type="id" name="settings_appearance_font_scaling_container" id="0x7F0A0BB2" />
-    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7F0A0BB3" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7F0A0BB4" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7F0A0BB5" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7F0A0BB6" />
-    <public type="id" name="settings_appearance_holy_light" id="0x7F0A0BB7" />
-    <public type="id" name="settings_appearance_sync_header" id="0x7F0A0BB8" />
-    <public type="id" name="settings_appearance_sync_switch" id="0x7F0A0BB9" />
-    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7F0A0BBA" />
-    <public type="id" name="settings_appearance_theme_header" id="0x7F0A0BBB" />
-    <public type="id" name="settings_appearance_theme_light_radio" id="0x7F0A0BBC" />
-    <public type="id" name="settings_appearance_theme_pure_evil_switch" id="0x7F0A0BBD" />
-    <public type="id" name="settings_backup_codes_generate" id="0x7F0A0BBE" />
-    <public type="id" name="settings_backup_codes_info" id="0x7F0A0BBF" />
-    <public type="id" name="settings_backup_codes_rv" id="0x7F0A0BC0" />
-    <public type="id" name="settings_behavior_browser_switch" id="0x7F0A0BC1" />
-    <public type="id" name="settings_behavior_chat_header" id="0x7F0A0BC2" />
-    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7F0A0BC3" />
-    <public type="id" name="settings_behavior_keyboard_header" id="0x7F0A0BC4" />
-    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7F0A0BC5" />
-    <public type="id" name="settings_billing" id="0x7F0A0BC6" />
-    <public type="id" name="settings_bitrate" id="0x7F0A0BC7" />
-    <public type="id" name="settings_bitrate_help" id="0x7F0A0BC8" />
-    <public type="id" name="settings_blocked_users" id="0x7F0A0BC9" />
-    <public type="id" name="settings_boost_flipper" id="0x7F0A0BCA" />
-    <public type="id" name="settings_boost_marketing_view" id="0x7F0A0BCB" />
-    <public type="id" name="settings_boost_no_guilds_image" id="0x7F0A0BCC" />
-    <public type="id" name="settings_boost_no_guilds_subtitle" id="0x7F0A0BCD" />
-    <public type="id" name="settings_boost_no_guilds_title" id="0x7F0A0BCE" />
-    <public type="id" name="settings_boost_recycler" id="0x7F0A0BCF" />
-    <public type="id" name="settings_boost_retry" id="0x7F0A0BD0" />
-    <public type="id" name="settings_boost_sample_guilds" id="0x7F0A0BD1" />
-    <public type="id" name="settings_boost_subtext" id="0x7F0A0BD2" />
-    <public type="id" name="settings_boost_subtext_container" id="0x7F0A0BD3" />
-    <public type="id" name="settings_boost_upsell_view" id="0x7F0A0BD4" />
-    <public type="id" name="settings_channel_list_category_item_drag" id="0x7F0A0BD5" />
-    <public type="id" name="settings_channel_list_category_item_text" id="0x7F0A0BD6" />
-    <public type="id" name="settings_channel_list_item_drag" id="0x7F0A0BD7" />
-    <public type="id" name="settings_channel_list_item_hash" id="0x7F0A0BD8" />
-    <public type="id" name="settings_channel_list_item_name" id="0x7F0A0BD9" />
-    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7F0A0BDA" />
-    <public type="id" name="settings_developer_screenshot_bug_reporting" id="0x7F0A0BDB" />
-    <public type="id" name="settings_gifting_flipper" id="0x7F0A0BDC" />
-    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7F0A0BDD" />
-    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7F0A0BDE" />
-    <public type="id" name="settings_gifting_gifts_you_purchased_header" id="0x7F0A0BDF" />
-    <public type="id" name="settings_gifting_gifts_you_purchased_recycler" id="0x7F0A0BE0" />
-    <public type="id" name="settings_gifting_purchase_gift_section" id="0x7F0A0BE1" />
-    <public type="id" name="settings_gifting_redeem_codes_header" id="0x7F0A0BE2" />
-    <public type="id" name="settings_gifting_retry" id="0x7F0A0BE3" />
-    <public type="id" name="settings_gifting_select_classic_gift_header" id="0x7F0A0BE4" />
-    <public type="id" name="settings_gifting_select_gift_header" id="0x7F0A0BE5" />
-    <public type="id" name="settings_gifting_your_gifts_header" id="0x7F0A0BE6" />
-    <public type="id" name="settings_gifting_your_gifts_recycler" id="0x7F0A0BE7" />
-    <public type="id" name="settings_group_icon" id="0x7F0A0BE8" />
-    <public type="id" name="settings_group_icon_label" id="0x7F0A0BE9" />
-    <public type="id" name="settings_group_icon_remove" id="0x7F0A0BEA" />
-    <public type="id" name="settings_inapp_notifs_switch" id="0x7F0A0BEB" />
-    <public type="id" name="settings_language_current" id="0x7F0A0BEC" />
-    <public type="id" name="settings_language_current_flag" id="0x7F0A0BED" />
-    <public type="id" name="settings_language_current_text" id="0x7F0A0BEE" />
-    <public type="id" name="settings_language_header" id="0x7F0A0BEF" />
-    <public type="id" name="settings_language_select_item_name" id="0x7F0A0BF0" />
-    <public type="id" name="settings_language_select_item_name_localized" id="0x7F0A0BF1" />
-    <public type="id" name="settings_language_select_list" id="0x7F0A0BF2" />
-    <public type="id" name="settings_language_sync_check" id="0x7F0A0BF3" />
-    <public type="id" name="settings_language_sync_header" id="0x7F0A0BF4" />
-    <public type="id" name="settings_nitro" id="0x7F0A0BF5" />
-    <public type="id" name="settings_notification_os" id="0x7F0A0BF6" />
-    <public type="id" name="settings_notification_os_label" id="0x7F0A0BF7" />
-    <public type="id" name="settings_notification_switch" id="0x7F0A0BF8" />
-    <public type="id" name="settings_notifications_blink" id="0x7F0A0BF9" />
-    <public type="id" name="settings_notifications_enabled" id="0x7F0A0BFA" />
-    <public type="id" name="settings_notifications_mute_all" id="0x7F0A0BFB" />
-    <public type="id" name="settings_notifications_vibrations" id="0x7F0A0BFC" />
-    <public type="id" name="settings_notifications_wrap" id="0x7F0A0BFD" />
-    <public type="id" name="settings_presence_text" id="0x7F0A0BFE" />
-    <public type="id" name="settings_privacy_basic_service" id="0x7F0A0BFF" />
-    <public type="id" name="settings_privacy_contact_sync" id="0x7F0A0C00" />
-    <public type="id" name="settings_privacy_contact_sync_title" id="0x7F0A0C01" />
-    <public type="id" name="settings_privacy_controls" id="0x7F0A0C02" />
-    <public type="id" name="settings_privacy_data_header" id="0x7F0A0C03" />
-    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7F0A0C04" />
-    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7F0A0C05" />
-    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7F0A0C06" />
-    <public type="id" name="settings_privacy_defaults_header" id="0x7F0A0C07" />
-    <public type="id" name="settings_privacy_explicit_0" id="0x7F0A0C08" />
-    <public type="id" name="settings_privacy_explicit_1" id="0x7F0A0C09" />
-    <public type="id" name="settings_privacy_explicit_2" id="0x7F0A0C0A" />
-    <public type="id" name="settings_privacy_friend_source_0" id="0x7F0A0C0B" />
-    <public type="id" name="settings_privacy_friend_source_1" id="0x7F0A0C0C" />
-    <public type="id" name="settings_privacy_friend_source_2" id="0x7F0A0C0D" />
-    <public type="id" name="settings_privacy_friend_source_header" id="0x7F0A0C0E" />
-    <public type="id" name="settings_privacy_personalization" id="0x7F0A0C0F" />
-    <public type="id" name="settings_privacy_request_data" id="0x7F0A0C10" />
-    <public type="id" name="settings_privacy_safe_messaging_header" id="0x7F0A0C11" />
-    <public type="id" name="settings_privacy_screenreader_detection" id="0x7F0A0C12" />
-    <public type="id" name="settings_privacy_statistics" id="0x7F0A0C13" />
-    <public type="id" name="settings_status_view" id="0x7F0A0C14" />
-    <public type="id" name="settings_text_images_compression_header" id="0x7F0A0C15" />
-    <public type="id" name="settings_text_images_display_header" id="0x7F0A0C16" />
-    <public type="id" name="settings_text_images_embeds_toggle" id="0x7F0A0C17" />
-    <public type="id" name="settings_text_images_links_toggle" id="0x7F0A0C18" />
-    <public type="id" name="settings_text_images_preview_header" id="0x7F0A0C19" />
-    <public type="id" name="settings_text_images_stickers_container" id="0x7F0A0C1A" />
-    <public type="id" name="settings_text_images_stickers_header" id="0x7F0A0C1B" />
-    <public type="id" name="settings_text_images_sync_header" id="0x7F0A0C1C" />
-    <public type="id" name="settings_text_images_sync_toggle" id="0x7F0A0C1D" />
-    <public type="id" name="settings_user_limit" id="0x7F0A0C1E" />
-    <public type="id" name="settings_user_limit_help" id="0x7F0A0C1F" />
-    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7F0A0C20" />
-    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7F0A0C21" />
-    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7F0A0C22" />
-    <public type="id" name="settings_voice_gain_control_toggle" id="0x7F0A0C23" />
-    <public type="id" name="settings_voice_input_header" id="0x7F0A0C24" />
-    <public type="id" name="settings_voice_input_mode_ptt" id="0x7F0A0C25" />
-    <public type="id" name="settings_voice_input_mode_vad" id="0x7F0A0C26" />
-    <public type="id" name="settings_voice_krisp_info" id="0x7F0A0C27" />
-    <public type="id" name="settings_voice_krisp_vad_toggle" id="0x7F0A0C28" />
-    <public type="id" name="settings_voice_mode" id="0x7F0A0C29" />
-    <public type="id" name="settings_voice_mode_header" id="0x7F0A0C2A" />
-    <public type="id" name="settings_voice_mode_value" id="0x7F0A0C2B" />
-    <public type="id" name="settings_voice_noise_cancellation_toggle" id="0x7F0A0C2C" />
-    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7F0A0C2D" />
-    <public type="id" name="settings_voice_opensl_header" id="0x7F0A0C2E" />
-    <public type="id" name="settings_voice_opensles_default" id="0x7F0A0C2F" />
-    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7F0A0C30" />
-    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7F0A0C31" />
-    <public type="id" name="settings_voice_opensles_help" id="0x7F0A0C32" />
-    <public type="id" name="settings_voice_output_header" id="0x7F0A0C33" />
-    <public type="id" name="settings_voice_output_volume" id="0x7F0A0C34" />
-    <public type="id" name="settings_voice_output_volume_wrap" id="0x7F0A0C35" />
-    <public type="id" name="settings_voice_overlay_header" id="0x7F0A0C36" />
-    <public type="id" name="settings_voice_overlay_toggle" id="0x7F0A0C37" />
-    <public type="id" name="settings_voice_processing_header" id="0x7F0A0C38" />
-    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7F0A0C39" />
-    <public type="id" name="settings_voice_sensitivity_header" id="0x7F0A0C3A" />
-    <public type="id" name="settings_voice_sensitivity_label" id="0x7F0A0C3B" />
-    <public type="id" name="settings_voice_sensitivity_manual" id="0x7F0A0C3C" />
-    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7F0A0C3D" />
-    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7F0A0C3E" />
-    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7F0A0C3F" />
-    <public type="id" name="settings_voice_video_container" id="0x7F0A0C40" />
-    <public type="id" name="settings_voice_video_header" id="0x7F0A0C41" />
-    <public type="id" name="settings_voice_video_troubleshooting_guide" id="0x7F0A0C42" />
-    <public type="id" name="shades_divider" id="0x7F0A0C43" />
-    <public type="id" name="shades_layout" id="0x7F0A0C44" />
-    <public type="id" name="share_button" id="0x7F0A0C45" />
-    <public type="id" name="shortcut" id="0x7F0A0C46" />
-    <public type="id" name="showCustom" id="0x7F0A0C47" />
-    <public type="id" name="showHome" id="0x7F0A0C48" />
-    <public type="id" name="showTitle" id="0x7F0A0C49" />
-    <public type="id" name="show_current_activity" id="0x7F0A0C4A" />
-    <public type="id" name="sin" id="0x7F0A0C4B" />
-    <public type="id" name="skipCollapsed" id="0x7F0A0C4C" />
-    <public type="id" name="slide" id="0x7F0A0C4D" />
-    <public type="id" name="smallLabel" id="0x7F0A0C4E" />
-    <public type="id" name="snackbar_action" id="0x7F0A0C4F" />
-    <public type="id" name="snackbar_text" id="0x7F0A0C50" />
-    <public type="id" name="snap" id="0x7F0A0C51" />
-    <public type="id" name="snapMargins" id="0x7F0A0C52" />
-    <public type="id" name="software" id="0x7F0A0C53" />
-    <public type="id" name="space_around" id="0x7F0A0C54" />
-    <public type="id" name="space_between" id="0x7F0A0C55" />
-    <public type="id" name="space_evenly" id="0x7F0A0C56" />
-    <public type="id" name="spacer" id="0x7F0A0C57" />
-    <public type="id" name="sparkle" id="0x7F0A0C58" />
-    <public type="id" name="sparkle_view_image" id="0x7F0A0C59" />
-    <public type="id" name="speaker_hint" id="0x7F0A0C5A" />
-    <public type="id" name="special_effects_controller_view_tag" id="0x7F0A0C5B" />
-    <public type="id" name="spherical_gl_surface_view" id="0x7F0A0C5C" />
-    <public type="id" name="spinner" id="0x7F0A0C5D" />
-    <public type="id" name="spline" id="0x7F0A0C5E" />
-    <public type="id" name="split_action_bar" id="0x7F0A0C5F" />
-    <public type="id" name="spread" id="0x7F0A0C60" />
-    <public type="id" name="spread_inside" id="0x7F0A0C61" />
-    <public type="id" name="square" id="0x7F0A0C62" />
-    <public type="id" name="src_atop" id="0x7F0A0C63" />
-    <public type="id" name="src_in" id="0x7F0A0C64" />
-    <public type="id" name="src_over" id="0x7F0A0C65" />
-    <public type="id" name="src_toggle" id="0x7F0A0C66" />
-    <public type="id" name="stage_call_speaking_chip" id="0x7F0A0C67" />
-    <public type="id" name="stage_call_speaking_user_summary" id="0x7F0A0C68" />
-    <public type="id" name="stage_call_speaking_user_summary_label" id="0x7F0A0C69" />
-    <public type="id" name="stage_card_controls_divider" id="0x7F0A0C6A" />
-    <public type="id" name="stage_card_top_hat_divider" id="0x7F0A0C6B" />
-    <public type="id" name="stage_channel_audience_icon" id="0x7F0A0C6C" />
-    <public type="id" name="stage_channel_audience_member_container" id="0x7F0A0C6D" />
-    <public type="id" name="stage_channel_audience_member_icon" id="0x7F0A0C6E" />
-    <public type="id" name="stage_channel_audience_member_icon_container" id="0x7F0A0C6F" />
-    <public type="id" name="stage_channel_audience_member_name" id="0x7F0A0C70" />
-    <public type="id" name="stage_channel_audience_member_raised_hand" id="0x7F0A0C71" />
-    <public type="id" name="stage_channel_audience_role_text" id="0x7F0A0C72" />
-    <public type="id" name="stage_channel_blocked_member_container" id="0x7F0A0C73" />
-    <public type="id" name="stage_channel_blocked_member_icon" id="0x7F0A0C74" />
-    <public type="id" name="stage_channel_blocked_member_icon_container" id="0x7F0A0C75" />
-    <public type="id" name="stage_channel_blocked_member_name" id="0x7F0A0C76" />
-    <public type="id" name="stage_channel_blocked_member_speaker" id="0x7F0A0C77" />
-    <public type="id" name="stage_channel_blocked_text" id="0x7F0A0C78" />
-    <public type="id" name="stage_channel_blocked_text_divider" id="0x7F0A0C79" />
-    <public type="id" name="stage_channel_blocked_text_speaker" id="0x7F0A0C7A" />
-    <public type="id" name="stage_channel_item_stage_channel_icon" id="0x7F0A0C7B" />
-    <public type="id" name="stage_channel_item_voice_channel_name" id="0x7F0A0C7C" />
-    <public type="id" name="stage_channel_item_voice_channel_topic" id="0x7F0A0C7D" />
-    <public type="id" name="stage_channel_speaker" id="0x7F0A0C7E" />
-    <public type="id" name="stage_channel_speaker_blocked" id="0x7F0A0C7F" />
-    <public type="id" name="stage_channel_speaker_container" id="0x7F0A0C80" />
-    <public type="id" name="stage_channel_speaker_deafen_indicator" id="0x7F0A0C81" />
-    <public type="id" name="stage_channel_speaker_mod_indicator" id="0x7F0A0C82" />
-    <public type="id" name="stage_channel_speaker_mute_indicator" id="0x7F0A0C83" />
-    <public type="id" name="stage_channel_speaker_name" id="0x7F0A0C84" />
-    <public type="id" name="stage_channel_speaker_pulse" id="0x7F0A0C85" />
-    <public type="id" name="stage_channels_audience_count" id="0x7F0A0C86" />
-    <public type="id" name="stage_disconnect_button_large" id="0x7F0A0C87" />
-    <public type="id" name="stage_discovery_audience_badge" id="0x7F0A0C88" />
-    <public type="id" name="stage_discovery_audience_badge_text" id="0x7F0A0C89" />
-    <public type="id" name="stage_discovery_badge_barrier" id="0x7F0A0C8A" />
-    <public type="id" name="stage_discovery_guild_icon" id="0x7F0A0C8B" />
-    <public type="id" name="stage_discovery_guild_icon_text" id="0x7F0A0C8C" />
-    <public type="id" name="stage_discovery_guild_icon_wrap" id="0x7F0A0C8D" />
-    <public type="id" name="stage_discovery_guild_name" id="0x7F0A0C8E" />
-    <public type="id" name="stage_discovery_speakers_view" id="0x7F0A0C8F" />
-    <public type="id" name="stage_discovery_stage_name" id="0x7F0A0C90" />
-    <public type="id" name="stage_event_channel" id="0x7F0A0C91" />
-    <public type="id" name="stage_event_listen_button" id="0x7F0A0C92" />
-    <public type="id" name="stage_event_listeners" id="0x7F0A0C93" />
-    <public type="id" name="stage_event_topic" id="0x7F0A0C94" />
-    <public type="id" name="stage_moderator_permissions_fragment" id="0x7F0A0C95" />
-    <public type="id" name="stage_permissions_divider" id="0x7F0A0C96" />
-    <public type="id" name="stage_permissions_title" id="0x7F0A0C97" />
-    <public type="id" name="stage_raise_hands_enabled_toggle" id="0x7F0A0C98" />
-    <public type="id" name="stage_raised_hands_bottom_sheet_root" id="0x7F0A0C99" />
-    <public type="id" name="stage_raised_hands_item_dismiss_button" id="0x7F0A0C9A" />
-    <public type="id" name="stage_raised_hands_item_invite_button" id="0x7F0A0C9B" />
-    <public type="id" name="stage_raised_hands_item_role" id="0x7F0A0C9C" />
-    <public type="id" name="stage_raised_hands_item_user_avatar" id="0x7F0A0C9D" />
-    <public type="id" name="stage_raised_hands_item_user_name" id="0x7F0A0C9E" />
-    <public type="id" name="stage_raised_hands_recycler" id="0x7F0A0C9F" />
-    <public type="id" name="stage_start_creation_options" id="0x7F0A0CA0" />
-    <public type="id" name="stage_start_divider" id="0x7F0A0CA1" />
-    <public type="id" name="stage_start_help_text" id="0x7F0A0CA2" />
-    <public type="id" name="stage_start_members_radio_button" id="0x7F0A0CA3" />
-    <public type="id" name="stage_start_public_disclaimer" id="0x7F0A0CA4" />
-    <public type="id" name="stage_start_public_radio_button" id="0x7F0A0CA5" />
-    <public type="id" name="stage_start_screen_title" id="0x7F0A0CA6" />
-    <public type="id" name="stage_start_topic_layout" id="0x7F0A0CA7" />
-    <public type="id" name="stage_start_topic_title" id="0x7F0A0CA8" />
-    <public type="id" name="standard" id="0x7F0A0CA9" />
-    <public type="id" name="start" id="0x7F0A0CAA" />
-    <public type="id" name="startHorizontal" id="0x7F0A0CAB" />
-    <public type="id" name="startToEnd" id="0x7F0A0CAC" />
-    <public type="id" name="startVertical" id="0x7F0A0CAD" />
-    <public type="id" name="start_call_sheet_video_item" id="0x7F0A0CAE" />
-    <public type="id" name="start_call_sheet_voice_item" id="0x7F0A0CAF" />
-    <public type="id" name="start_stage_button" id="0x7F0A0CB0" />
-    <public type="id" name="start_stage_button_spacer" id="0x7F0A0CB1" />
-    <public type="id" name="start_stage_event_button_stub" id="0x7F0A0CB2" />
-    <public type="id" name="start_stage_server_selection_banner" id="0x7F0A0CB3" />
-    <public type="id" name="start_stage_server_selection_bullet_item_container" id="0x7F0A0CB4" />
-    <public type="id" name="start_stage_server_selection_bullet_item_divider" id="0x7F0A0CB5" />
-    <public type="id" name="start_stage_server_selection_bullet_item_icon" id="0x7F0A0CB6" />
-    <public type="id" name="start_stage_server_selection_bullet_item_text" id="0x7F0A0CB7" />
-    <public type="id" name="start_stage_server_selection_button" id="0x7F0A0CB8" />
-    <public type="id" name="start_stage_server_selection_button_hint" id="0x7F0A0CB9" />
-    <public type="id" name="start_stage_server_selection_guild_item_arrow" id="0x7F0A0CBA" />
-    <public type="id" name="start_stage_server_selection_guild_item_container" id="0x7F0A0CBB" />
-    <public type="id" name="start_stage_server_selection_guild_item_divider" id="0x7F0A0CBC" />
-    <public type="id" name="start_stage_server_selection_guild_item_icon" id="0x7F0A0CBD" />
-    <public type="id" name="start_stage_server_selection_guild_item_text" id="0x7F0A0CBE" />
-    <public type="id" name="start_stage_server_selection_subtitle" id="0x7F0A0CBF" />
-    <public type="id" name="start_stage_server_selection_title" id="0x7F0A0CC0" />
-    <public type="id" name="state_aspect_ratio" id="0x7F0A0CC1" />
-    <public type="id" name="state_rotate" id="0x7F0A0CC2" />
-    <public type="id" name="state_scale" id="0x7F0A0CC3" />
-    <public type="id" name="staticLayout" id="0x7F0A0CC4" />
-    <public type="id" name="staticPostLayout" id="0x7F0A0CC5" />
-    <public type="id" name="static_avatar" id="0x7F0A0CC6" />
-    <public type="id" name="status_bar_latest_event_content" id="0x7F0A0CC7" />
-    <public type="id" name="steps_button_container" id="0x7F0A0CC8" />
-    <public type="id" name="steps_cancel" id="0x7F0A0CC9" />
-    <public type="id" name="steps_close" id="0x7F0A0CCA" />
-    <public type="id" name="steps_done" id="0x7F0A0CCB" />
-    <public type="id" name="steps_next" id="0x7F0A0CCC" />
-    <public type="id" name="steps_viewpager" id="0x7F0A0CCD" />
-    <public type="id" name="stereo" id="0x7F0A0CCE" />
-    <public type="id" name="sticker_app_bar" id="0x7F0A0CCF" />
-    <public type="id" name="sticker_autocomplete_sticker" id="0x7F0A0CD0" />
-    <public type="id" name="sticker_category_item_pack_avatar" id="0x7F0A0CD1" />
-    <public type="id" name="sticker_full_size_sticker" id="0x7F0A0CD2" />
-    <public type="id" name="sticker_pack_activated_banner" id="0x7F0A0CD3" />
-    <public type="id" name="sticker_pack_activated_body" id="0x7F0A0CD4" />
-    <public type="id" name="sticker_pack_activated_confirm" id="0x7F0A0CD5" />
-    <public type="id" name="sticker_pack_details_animated" id="0x7F0A0CD6" />
-    <public type="id" name="sticker_pack_details_close" id="0x7F0A0CD7" />
-    <public type="id" name="sticker_pack_details_limited" id="0x7F0A0CD8" />
-    <public type="id" name="sticker_pack_details_pack" id="0x7F0A0CD9" />
-    <public type="id" name="sticker_pack_details_premium" id="0x7F0A0CDA" />
-    <public type="id" name="sticker_pack_store_sheet_buy_button_container" id="0x7F0A0CDB" />
-    <public type="id" name="sticker_pack_store_sheet_container" id="0x7F0A0CDC" />
-    <public type="id" name="sticker_pack_store_sheet_recycler" id="0x7F0A0CDD" />
-    <public type="id" name="sticker_pack_view_all_banner" id="0x7F0A0CDE" />
-    <public type="id" name="sticker_picker_bottom_bar" id="0x7F0A0CDF" />
-    <public type="id" name="sticker_picker_bottom_bar_divider" id="0x7F0A0CE0" />
-    <public type="id" name="sticker_picker_category_recycler" id="0x7F0A0CE1" />
-    <public type="id" name="sticker_picker_container" id="0x7F0A0CE2" />
-    <public type="id" name="sticker_picker_sticker" id="0x7F0A0CE3" />
-    <public type="id" name="sticker_search_input" id="0x7F0A0CE4" />
-    <public type="id" name="sticker_sheet_buy_button" id="0x7F0A0CE5" />
-    <public type="id" name="sticker_sheet_sticker_info" id="0x7F0A0CE6" />
-    <public type="id" name="sticker_sheet_sticker_name" id="0x7F0A0CE7" />
-    <public type="id" name="sticker_sheet_sticker_picker_content" id="0x7F0A0CE8" />
-    <public type="id" name="sticker_sheet_stickers_container" id="0x7F0A0CE9" />
-    <public type="id" name="sticker_sheet_view_button" id="0x7F0A0CEA" />
-    <public type="id" name="sticker_sheet_view_limited_chip" id="0x7F0A0CEB" />
-    <public type="id" name="sticker_sheet_view_limited_container" id="0x7F0A0CEC" />
-    <public type="id" name="sticker_store_buy_button_premium" id="0x7F0A0CED" />
-    <public type="id" name="sticker_store_header_item_animated" id="0x7F0A0CEE" />
-    <public type="id" name="sticker_store_header_item_container" id="0x7F0A0CEF" />
-    <public type="id" name="sticker_store_header_item_description" id="0x7F0A0CF0" />
-    <public type="id" name="sticker_store_header_item_new" id="0x7F0A0CF1" />
-    <public type="id" name="sticker_store_header_item_premium" id="0x7F0A0CF2" />
-    <public type="id" name="sticker_store_header_item_subtitle" id="0x7F0A0CF3" />
-    <public type="id" name="sticker_store_header_item_title" id="0x7F0A0CF4" />
-    <public type="id" name="sticker_toolbar" id="0x7F0A0CF5" />
-    <public type="id" name="sticker_view_imageview" id="0x7F0A0CF6" />
-    <public type="id" name="sticker_view_lottie" id="0x7F0A0CF7" />
-    <public type="id" name="sticker_view_placeholder" id="0x7F0A0CF8" />
-    <public type="id" name="stickers_always_animate" id="0x7F0A0CF9" />
-    <public type="id" name="stickers_animate_on_interaction" id="0x7F0A0CFA" />
-    <public type="id" name="stickers_never_animate" id="0x7F0A0CFB" />
-    <public type="id" name="stickers_sheet_sticker_1" id="0x7F0A0CFC" />
-    <public type="id" name="stickers_sheet_sticker_2" id="0x7F0A0CFD" />
-    <public type="id" name="stickers_sheet_sticker_3" id="0x7F0A0CFE" />
-    <public type="id" name="stickers_sheet_sticker_4" id="0x7F0A0CFF" />
-    <public type="id" name="stickers_suggestions" id="0x7F0A0D00" />
-    <public type="id" name="stop" id="0x7F0A0D01" />
-    <public type="id" name="stop_watching_button" id="0x7F0A0D02" />
-    <public type="id" name="stream_preview" id="0x7F0A0D03" />
-    <public type="id" name="stream_preview_image" id="0x7F0A0D04" />
-    <public type="id" name="stream_preview_overlay_text" id="0x7F0A0D05" />
-    <public type="id" name="stream_preview_placeholder_caption" id="0x7F0A0D06" />
-    <public type="id" name="stream_volume_label" id="0x7F0A0D07" />
-    <public type="id" name="stream_volume_slider" id="0x7F0A0D08" />
-    <public type="id" name="stretch" id="0x7F0A0D09" />
-    <public type="id" name="submenuarrow" id="0x7F0A0D0A" />
-    <public type="id" name="submit_area" id="0x7F0A0D0B" />
-    <public type="id" name="submit_report_error" id="0x7F0A0D0C" />
-    <public type="id" name="subtitle" id="0x7F0A0D0D" />
-    <public type="id" name="subtitle_text" id="0x7F0A0D0E" />
-    <public type="id" name="suggested_friend_avatar" id="0x7F0A0D0F" />
-    <public type="id" name="suggested_friend_decline" id="0x7F0A0D10" />
-    <public type="id" name="suggested_friend_public_name" id="0x7F0A0D11" />
-    <public type="id" name="suggested_friend_send_request" id="0x7F0A0D12" />
-    <public type="id" name="suggested_friend_username" id="0x7F0A0D13" />
-    <public type="id" name="suggested_friend_view" id="0x7F0A0D14" />
-    <public type="id" name="suggestion_example_answer" id="0x7F0A0D15" />
-    <public type="id" name="suggestion_example_container" id="0x7F0A0D16" />
-    <public type="id" name="suggestion_example_filter" id="0x7F0A0D17" />
-    <public type="id" name="suggestion_example_icon" id="0x7F0A0D18" />
-    <public type="id" name="suggestion_item_header" id="0x7F0A0D19" />
-    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7F0A0D1A" />
-    <public type="id" name="suggestion_item_header_history_divider" id="0x7F0A0D1B" />
-    <public type="id" name="suggestion_item_header_history_text" id="0x7F0A0D1C" />
-    <public type="id" name="suggestion_list" id="0x7F0A0D1D" />
-    <public type="id" name="suggestions_flipper" id="0x7F0A0D1E" />
-    <public type="id" name="support" id="0x7F0A0D1F" />
-    <public type="id" name="surface" id="0x7F0A0D20" />
-    <public type="id" name="surface_view" id="0x7F0A0D21" />
-    <public type="id" name="surface_view_root" id="0x7F0A0D22" />
-    <public type="id" name="swipeRefreshLayout" id="0x7F0A0D23" />
-    <public type="id" name="swipe_refresh_layout" id="0x7F0A0D24" />
-    <public type="id" name="switchWidget" id="0x7F0A0D25" />
-    <public type="id" name="switchview" id="0x7F0A0D26" />
-    <public type="id" name="sync_friends_switch" id="0x7F0A0D27" />
-    <public type="id" name="sync_settings" id="0x7F0A0D28" />
-    <public type="id" name="systemChannel" id="0x7F0A0D29" />
-    <public type="id" name="system_channel" id="0x7F0A0D2A" />
-    <public type="id" name="system_channel_boost" id="0x7F0A0D2B" />
-    <public type="id" name="system_channel_join" id="0x7F0A0D2C" />
-    <public type="id" name="system_channel_wrap" id="0x7F0A0D2D" />
-    <public type="id" name="system_icon" id="0x7F0A0D2E" />
-    <public type="id" name="system_text" id="0x7F0A0D2F" />
-    <public type="id" name="system_timestamp" id="0x7F0A0D30" />
-    <public type="id" name="tabMode" id="0x7F0A0D31" />
-    <public type="id" name="tab_contents" id="0x7F0A0D32" />
-    <public type="id" name="tabs" id="0x7F0A0D33" />
-    <public type="id" name="tabs_host_bottom_nav_friends_icon" id="0x7F0A0D34" />
-    <public type="id" name="tabs_host_bottom_nav_friends_item" id="0x7F0A0D35" />
-    <public type="id" name="tabs_host_bottom_nav_friends_notifications_badge" id="0x7F0A0D36" />
-    <public type="id" name="tabs_host_bottom_nav_home_icon" id="0x7F0A0D37" />
-    <public type="id" name="tabs_host_bottom_nav_home_item" id="0x7F0A0D38" />
-    <public type="id" name="tabs_host_bottom_nav_home_notifications_badge" id="0x7F0A0D39" />
-    <public type="id" name="tabs_host_bottom_nav_mentions_icon" id="0x7F0A0D3A" />
-    <public type="id" name="tabs_host_bottom_nav_mentions_item" id="0x7F0A0D3B" />
-    <public type="id" name="tabs_host_bottom_nav_search_icon" id="0x7F0A0D3C" />
-    <public type="id" name="tabs_host_bottom_nav_search_item" id="0x7F0A0D3D" />
-    <public type="id" name="tabs_host_bottom_nav_stage_discovery_icon" id="0x7F0A0D3E" />
-    <public type="id" name="tabs_host_bottom_nav_stage_discovery_item" id="0x7F0A0D3F" />
-    <public type="id" name="tabs_host_bottom_nav_tabs_container" id="0x7F0A0D40" />
-    <public type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" id="0x7F0A0D41" />
-    <public type="id" name="tabs_host_bottom_nav_user_settings_item" id="0x7F0A0D42" />
-    <public type="id" name="tag_accessibility_actions" id="0x7F0A0D43" />
-    <public type="id" name="tag_accessibility_clickable_spans" id="0x7F0A0D44" />
-    <public type="id" name="tag_accessibility_heading" id="0x7F0A0D45" />
-    <public type="id" name="tag_accessibility_pane_title" id="0x7F0A0D46" />
-    <public type="id" name="tag_screen_reader_focusable" id="0x7F0A0D47" />
-    <public type="id" name="tag_transition_group" id="0x7F0A0D48" />
-    <public type="id" name="tag_unhandled_key_event_manager" id="0x7F0A0D49" />
-    <public type="id" name="tag_unhandled_key_listeners" id="0x7F0A0D4A" />
-    <public type="id" name="takePicture" id="0x7F0A0D4B" />
-    <public type="id" name="takePictureSnapshot" id="0x7F0A0D4C" />
-    <public type="id" name="take_photo_btn" id="0x7F0A0D4D" />
-    <public type="id" name="ternary_check_neutral" id="0x7F0A0D4E" />
-    <public type="id" name="ternary_check_off" id="0x7F0A0D4F" />
-    <public type="id" name="ternary_check_on" id="0x7F0A0D50" />
-    <public type="id" name="test" id="0x7F0A0D51" />
-    <public type="id" name="test_checkbox_android_button_tint" id="0x7F0A0D52" />
-    <public type="id" name="test_checkbox_app_button_tint" id="0x7F0A0D53" />
-    <public type="id" name="test_radiobutton_android_button_tint" id="0x7F0A0D54" />
-    <public type="id" name="test_radiobutton_app_button_tint" id="0x7F0A0D55" />
-    <public type="id" name="text" id="0x7F0A0D56" />
-    <public type="id" name="text1" id="0x7F0A0D57" />
-    <public type="id" name="text2" id="0x7F0A0D58" />
-    <public type="id" name="textEnd" id="0x7F0A0D59" />
-    <public type="id" name="textSpacerNoButtons" id="0x7F0A0D5A" />
-    <public type="id" name="textSpacerNoTitle" id="0x7F0A0D5B" />
-    <public type="id" name="textStart" id="0x7F0A0D5C" />
-    <public type="id" name="textTop" id="0x7F0A0D5D" />
-    <public type="id" name="textView" id="0x7F0A0D5E" />
-    <public type="id" name="text_images_settings" id="0x7F0A0D5F" />
-    <public type="id" name="text_input" id="0x7F0A0D60" />
-    <public type="id" name="text_input_end_icon" id="0x7F0A0D61" />
-    <public type="id" name="text_input_error_icon" id="0x7F0A0D62" />
-    <public type="id" name="text_input_start_icon" id="0x7F0A0D63" />
-    <public type="id" name="text_view_crop" id="0x7F0A0D64" />
-    <public type="id" name="text_view_rotate" id="0x7F0A0D65" />
-    <public type="id" name="text_view_scale" id="0x7F0A0D66" />
-    <public type="id" name="textinput_counter" id="0x7F0A0D67" />
-    <public type="id" name="textinput_error" id="0x7F0A0D68" />
-    <public type="id" name="textinput_helper_text" id="0x7F0A0D69" />
-    <public type="id" name="textinput_placeholder" id="0x7F0A0D6A" />
-    <public type="id" name="textinput_prefix_text" id="0x7F0A0D6B" />
-    <public type="id" name="textinput_suffix_text" id="0x7F0A0D6C" />
-    <public type="id" name="texture" id="0x7F0A0D6D" />
-    <public type="id" name="texture_view" id="0x7F0A0D6E" />
-    <public type="id" name="thing_proto" id="0x7F0A0D6F" />
-    <public type="id" name="thread_avatar" id="0x7F0A0D70" />
-    <public type="id" name="thread_browser_count" id="0x7F0A0D71" />
-    <public type="id" name="thread_browser_empty" id="0x7F0A0D72" />
-    <public type="id" name="thread_browser_empty_create_button" id="0x7F0A0D73" />
-    <public type="id" name="thread_browser_empty_heading" id="0x7F0A0D74" />
-    <public type="id" name="thread_browser_empty_subheading" id="0x7F0A0D75" />
-    <public type="id" name="thread_browser_error_msg" id="0x7F0A0D76" />
-    <public type="id" name="thread_browser_error_overlay" id="0x7F0A0D77" />
-    <public type="id" name="thread_browser_icon" id="0x7F0A0D78" />
-    <public type="id" name="thread_browser_moderator_view" id="0x7F0A0D79" />
-    <public type="id" name="thread_browser_moderator_view_card" id="0x7F0A0D7A" />
-    <public type="id" name="thread_browser_root" id="0x7F0A0D7B" />
-    <public type="id" name="thread_browser_toolbar" id="0x7F0A0D7C" />
-    <public type="id" name="thread_browser_try_again" id="0x7F0A0D7D" />
-    <public type="id" name="thread_browser_view_pager" id="0x7F0A0D7E" />
-    <public type="id" name="thread_browser_visibility_private" id="0x7F0A0D7F" />
-    <public type="id" name="thread_browser_visibility_public" id="0x7F0A0D80" />
-    <public type="id" name="thread_embed_container" id="0x7F0A0D81" />
-    <public type="id" name="thread_embed_icon" id="0x7F0A0D82" />
-    <public type="id" name="thread_embed_message_center_guideline" id="0x7F0A0D83" />
-    <public type="id" name="thread_embed_messages_count" id="0x7F0A0D84" />
-    <public type="id" name="thread_embed_messages_count_chevron" id="0x7F0A0D85" />
-    <public type="id" name="thread_embed_most_recent_message_avatar" id="0x7F0A0D86" />
-    <public type="id" name="thread_embed_most_recent_message_content" id="0x7F0A0D87" />
-    <public type="id" name="thread_embed_most_recent_message_header" id="0x7F0A0D88" />
-    <public type="id" name="thread_embed_most_recent_message_name" id="0x7F0A0D89" />
-    <public type="id" name="thread_embed_name" id="0x7F0A0D8A" />
-    <public type="id" name="thread_embed_selectable_background" id="0x7F0A0D8B" />
-    <public type="id" name="thread_embed_spine" id="0x7F0A0D8C" />
-    <public type="id" name="thread_icon" id="0x7F0A0D8D" />
-    <public type="id" name="thread_image" id="0x7F0A0D8E" />
-    <public type="id" name="thread_message" id="0x7F0A0D8F" />
-    <public type="id" name="thread_name" id="0x7F0A0D90" />
-    <public type="id" name="thread_name_input" id="0x7F0A0D91" />
-    <public type="id" name="thread_notification_settings_system" id="0x7F0A0D92" />
-    <public type="id" name="thread_settings_edit_name" id="0x7F0A0D93" />
-    <public type="id" name="thread_settings_edit_wrap" id="0x7F0A0D94" />
-    <public type="id" name="thread_settings_notifications_frequency_0" id="0x7F0A0D95" />
-    <public type="id" name="thread_settings_notifications_frequency_1" id="0x7F0A0D96" />
-    <public type="id" name="thread_settings_notifications_frequency_2" id="0x7F0A0D97" />
-    <public type="id" name="thread_settings_save" id="0x7F0A0D98" />
-    <public type="id" name="thread_starter_message_header" id="0x7F0A0D99" />
-    <public type="id" name="thread_starter_message_header_icon" id="0x7F0A0D9A" />
-    <public type="id" name="thread_starter_message_header_text" id="0x7F0A0D9B" />
-    <public type="id" name="thread_status" id="0x7F0A0D9C" />
-    <public type="id" name="thread_status_button" id="0x7F0A0D9D" />
-    <public type="id" name="thread_status_text" id="0x7F0A0D9E" />
-    <public type="id" name="thread_timestamp" id="0x7F0A0D9F" />
-    <public type="id" name="thread_timestamp_separator" id="0x7F0A0DA0" />
-    <public type="id" name="thread_view" id="0x7F0A0DA1" />
-    <public type="id" name="thumb_iv" id="0x7F0A0DA2" />
-    <public type="id" name="tier_1_stickers_perk" id="0x7F0A0DA3" />
-    <public type="id" name="tile" id="0x7F0A0DA4" />
-    <public type="id" name="time" id="0x7F0A0DA5" />
-    <public type="id" name="title" id="0x7F0A0DA6" />
-    <public type="id" name="titleDividerNoCustom" id="0x7F0A0DA7" />
-    <public type="id" name="title_template" id="0x7F0A0DA8" />
-    <public type="id" name="title_text_barrier" id="0x7F0A0DA9" />
-    <public type="id" name="toggle" id="0x7F0A0DAA" />
-    <public type="id" name="toggle_speaker_state_button" id="0x7F0A0DAB" />
-    <public type="id" name="toggle_speaker_state_group" id="0x7F0A0DAC" />
-    <public type="id" name="toggle_speaker_state_icon" id="0x7F0A0DAD" />
-    <public type="id" name="toolbar" id="0x7F0A0DAE" />
-    <public type="id" name="toolbar_presence" id="0x7F0A0DAF" />
-    <public type="id" name="toolbar_title" id="0x7F0A0DB0" />
-    <public type="id" name="toolbar_title_subtext" id="0x7F0A0DB1" />
-    <public type="id" name="top" id="0x7F0A0DB2" />
-    <public type="id" name="topPanel" id="0x7F0A0DB3" />
-    <public type="id" name="top_of_ui" id="0x7F0A0DB4" />
-    <public type="id" name="top_to_end" id="0x7F0A0DB5" />
-    <public type="id" name="topic_input" id="0x7F0A0DB6" />
-    <public type="id" name="topic_label" id="0x7F0A0DB7" />
-    <public type="id" name="topic_layout" id="0x7F0A0DB8" />
-    <public type="id" name="torch" id="0x7F0A0DB9" />
-    <public type="id" name="touch_outside" id="0x7F0A0DBA" />
-    <public type="id" name="transitionToEnd" id="0x7F0A0DBB" />
-    <public type="id" name="transitionToStart" id="0x7F0A0DBC" />
-    <public type="id" name="transition_current_scene" id="0x7F0A0DBD" />
-    <public type="id" name="transition_layout_save" id="0x7F0A0DBE" />
-    <public type="id" name="transition_position" id="0x7F0A0DBF" />
-    <public type="id" name="transition_scene_layoutid_cache" id="0x7F0A0DC0" />
-    <public type="id" name="transition_transform" id="0x7F0A0DC1" />
-    <public type="id" name="transparency_layout" id="0x7F0A0DC2" />
-    <public type="id" name="transparency_seekbar" id="0x7F0A0DC3" />
-    <public type="id" name="transparency_text" id="0x7F0A0DC4" />
-    <public type="id" name="transparency_title" id="0x7F0A0DC5" />
-    <public type="id" name="trash_wrap_icon" id="0x7F0A0DC6" />
-    <public type="id" name="trash_wrap_target_container" id="0x7F0A0DC7" />
-    <public type="id" name="trash_wrap_target_zone" id="0x7F0A0DC8" />
-    <public type="id" name="triangle" id="0x7F0A0DC9" />
-    <public type="id" name="tvText" id="0x7F0A0DCA" />
-    <public type="id" name="tvTitle" id="0x7F0A0DCB" />
-    <public type="id" name="type_iv" id="0x7F0A0DCC" />
-    <public type="id" name="ucrop" id="0x7F0A0DCD" />
-    <public type="id" name="ucrop_frame" id="0x7F0A0DCE" />
-    <public type="id" name="ucrop_photobox" id="0x7F0A0DCF" />
-    <public type="id" name="uikit_chat_guideline" id="0x7F0A0DD0" />
-    <public type="id" name="uikit_icon_url" id="0x7F0A0DD1" />
-    <public type="id" name="uikit_sheet_header_guideline" id="0x7F0A0DD2" />
-    <public type="id" name="unblock_user_button" id="0x7F0A0DD3" />
-    <public type="id" name="unchecked" id="0x7F0A0DD4" />
-    <public type="id" name="underage" id="0x7F0A0DD5" />
-    <public type="id" name="underage_warning" id="0x7F0A0DD6" />
-    <public type="id" name="unhandled_uri_display" id="0x7F0A0DD7" />
-    <public type="id" name="unhandled_uri_okay" id="0x7F0A0DD8" />
-    <public type="id" name="uniform" id="0x7F0A0DD9" />
-    <public type="id" name="unlabeled" id="0x7F0A0DDA" />
-    <public type="id" name="unmute_button" id="0x7F0A0DDB" />
-    <public type="id" name="unmute_button_details_label" id="0x7F0A0DDC" />
-    <public type="id" name="unmute_button_label" id="0x7F0A0DDD" />
-    <public type="id" name="unread" id="0x7F0A0DDE" />
-    <public type="id" name="up" id="0x7F0A0DDF" />
-    <public type="id" name="upgrade_button" id="0x7F0A0DE0" />
-    <public type="id" name="uploadBanner" id="0x7F0A0DE1" />
-    <public type="id" name="uploadSplash" id="0x7F0A0DE2" />
-    <public type="id" name="upload_banner" id="0x7F0A0DE3" />
-    <public type="id" name="upload_banner_fab" id="0x7F0A0DE4" />
-    <public type="id" name="upload_banner_learn_more" id="0x7F0A0DE5" />
-    <public type="id" name="upload_banner_nitro_tier" id="0x7F0A0DE6" />
-    <public type="id" name="upload_banner_unlock" id="0x7F0A0DE7" />
-    <public type="id" name="upload_debug_logs" id="0x7F0A0DE8" />
-    <public type="id" name="upload_progress_1" id="0x7F0A0DE9" />
-    <public type="id" name="upload_progress_2" id="0x7F0A0DEA" />
-    <public type="id" name="upload_progress_3" id="0x7F0A0DEB" />
-    <public type="id" name="upload_splash" id="0x7F0A0DEC" />
-    <public type="id" name="upload_splash_learn_more" id="0x7F0A0DED" />
-    <public type="id" name="upload_splash_nitro_tier" id="0x7F0A0DEE" />
-    <public type="id" name="upload_splash_unlock" id="0x7F0A0DEF" />
-    <public type="id" name="url" id="0x7F0A0DF0" />
-    <public type="id" name="useLogo" id="0x7F0A0DF1" />
-    <public type="id" name="user_actions_dialog_avatar" id="0x7F0A0DF2" />
-    <public type="id" name="user_actions_dialog_block_item" id="0x7F0A0DF3" />
-    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7F0A0DF4" />
-    <public type="id" name="user_actions_dialog_unblock_item" id="0x7F0A0DF5" />
-    <public type="id" name="user_actions_dialog_user_name" id="0x7F0A0DF6" />
-    <public type="id" name="user_avatar_presence_container" id="0x7F0A0DF7" />
-    <public type="id" name="user_avatar_presence_status" id="0x7F0A0DF8" />
-    <public type="id" name="user_limit_divider" id="0x7F0A0DF9" />
-    <public type="id" name="user_limit_seekbar" id="0x7F0A0DFA" />
-    <public type="id" name="user_limit_title" id="0x7F0A0DFB" />
-    <public type="id" name="user_list_item_avatar" id="0x7F0A0DFC" />
-    <public type="id" name="user_list_item_name" id="0x7F0A0DFD" />
-    <public type="id" name="user_list_item_name_secondary" id="0x7F0A0DFE" />
-    <public type="id" name="user_list_item_status" id="0x7F0A0DFF" />
-    <public type="id" name="user_mentions_filter_include_everyone" id="0x7F0A0E00" />
-    <public type="id" name="user_mentions_filter_include_roles" id="0x7F0A0E01" />
-    <public type="id" name="user_mentions_filter_this_server" id="0x7F0A0E02" />
-    <public type="id" name="user_mentions_list" id="0x7F0A0E03" />
-    <public type="id" name="user_mutual_friends_recycler_view" id="0x7F0A0E04" />
-    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7F0A0E05" />
-    <public type="id" name="user_phone_add_description_note" id="0x7F0A0E06" />
-    <public type="id" name="user_phone_add_next" id="0x7F0A0E07" />
-    <public type="id" name="user_phone_add_number" id="0x7F0A0E08" />
-    <public type="id" name="user_phone_title" id="0x7F0A0E09" />
-    <public type="id" name="user_profile_adapter_item_empty" id="0x7F0A0E0A" />
-    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7F0A0E0B" />
-    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7F0A0E0C" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7F0A0E0D" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7F0A0E0E" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7F0A0E0F" />
-    <public type="id" name="user_profile_adapter_item_friend_status" id="0x7F0A0E10" />
-    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7F0A0E11" />
-    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7F0A0E12" />
-    <public type="id" name="user_profile_adapter_item_server_image" id="0x7F0A0E13" />
-    <public type="id" name="user_profile_adapter_item_server_name" id="0x7F0A0E14" />
-    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7F0A0E15" />
-    <public type="id" name="user_profile_adapter_item_server_text" id="0x7F0A0E16" />
-    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7F0A0E17" />
-    <public type="id" name="user_profile_admin_ban" id="0x7F0A0E18" />
-    <public type="id" name="user_profile_admin_edit_member" id="0x7F0A0E19" />
-    <public type="id" name="user_profile_admin_kick" id="0x7F0A0E1A" />
-    <public type="id" name="user_profile_admin_server_deafen" id="0x7F0A0E1B" />
-    <public type="id" name="user_profile_admin_server_disconnect" id="0x7F0A0E1C" />
-    <public type="id" name="user_profile_admin_server_move" id="0x7F0A0E1D" />
-    <public type="id" name="user_profile_admin_server_mute" id="0x7F0A0E1E" />
-    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7F0A0E1F" />
-    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7F0A0E20" />
-    <public type="id" name="user_profile_connections_view_recycler" id="0x7F0A0E21" />
-    <public type="id" name="user_profile_header_badges_recycler" id="0x7F0A0E22" />
-    <public type="id" name="user_profile_header_custom_status" id="0x7F0A0E23" />
-    <public type="id" name="user_profile_header_name_wrap" id="0x7F0A0E24" />
-    <public type="id" name="user_profile_header_primary_name" id="0x7F0A0E25" />
-    <public type="id" name="user_profile_header_secondary_name" id="0x7F0A0E26" />
-    <public type="id" name="user_profile_stage_invite_to_speak" id="0x7F0A0E27" />
-    <public type="id" name="user_profile_stage_move_to_audience" id="0x7F0A0E28" />
-    <public type="id" name="user_selected_checkbox" id="0x7F0A0E29" />
-    <public type="id" name="user_settings_header" id="0x7F0A0E2A" />
-    <public type="id" name="user_settings_mfa_enable_input_code" id="0x7F0A0E2B" />
-    <public type="id" name="user_settings_profile_header_view" id="0x7F0A0E2C" />
-    <public type="id" name="user_sheet_add_friend_action_button" id="0x7F0A0E2D" />
-    <public type="id" name="user_sheet_admin_card" id="0x7F0A0E2E" />
-    <public type="id" name="user_sheet_admin_view" id="0x7F0A0E2F" />
-    <public type="id" name="user_sheet_badge_image" id="0x7F0A0E30" />
-    <public type="id" name="user_sheet_call_action_button" id="0x7F0A0E31" />
-    <public type="id" name="user_sheet_connections_header" id="0x7F0A0E32" />
-    <public type="id" name="user_sheet_connections_view" id="0x7F0A0E33" />
-    <public type="id" name="user_sheet_content" id="0x7F0A0E34" />
-    <public type="id" name="user_sheet_copy_id" id="0x7F0A0E35" />
-    <public type="id" name="user_sheet_deafen" id="0x7F0A0E36" />
-    <public type="id" name="user_sheet_developer_header" id="0x7F0A0E37" />
-    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7F0A0E38" />
-    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7F0A0E39" />
-    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7F0A0E3A" />
-    <public type="id" name="user_sheet_guild_container" id="0x7F0A0E3B" />
-    <public type="id" name="user_sheet_guild_header" id="0x7F0A0E3C" />
-    <public type="id" name="user_sheet_header" id="0x7F0A0E3D" />
-    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7F0A0E3E" />
-    <public type="id" name="user_sheet_loading_container" id="0x7F0A0E3F" />
-    <public type="id" name="user_sheet_message_action_button" id="0x7F0A0E40" />
-    <public type="id" name="user_sheet_more_button" id="0x7F0A0E41" />
-    <public type="id" name="user_sheet_muted" id="0x7F0A0E42" />
-    <public type="id" name="user_sheet_note_header" id="0x7F0A0E43" />
-    <public type="id" name="user_sheet_note_text_field" id="0x7F0A0E44" />
-    <public type="id" name="user_sheet_note_text_field_wrap" id="0x7F0A0E45" />
-    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7F0A0E46" />
-    <public type="id" name="user_sheet_profile_actions_container" id="0x7F0A0E47" />
-    <public type="id" name="user_sheet_profile_actions_divider" id="0x7F0A0E48" />
-    <public type="id" name="user_sheet_profile_header_view" id="0x7F0A0E49" />
-    <public type="id" name="user_sheet_profile_stage_actions_card" id="0x7F0A0E4A" />
-    <public type="id" name="user_sheet_profile_stage_actions_view" id="0x7F0A0E4B" />
-    <public type="id" name="user_sheet_profile_voice_settings_header" id="0x7F0A0E4C" />
-    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7F0A0E4D" />
-    <public type="id" name="user_sheet_roles_list" id="0x7F0A0E4E" />
-    <public type="id" name="user_sheet_video_action_button" id="0x7F0A0E4F" />
-    <public type="id" name="user_sheet_volume_label" id="0x7F0A0E50" />
-    <public type="id" name="user_sheet_volume_slider" id="0x7F0A0E51" />
-    <public type="id" name="user_status_presence_custom_clear" id="0x7F0A0E52" />
-    <public type="id" name="user_status_presence_custom_emoji" id="0x7F0A0E53" />
-    <public type="id" name="user_status_presence_custom_text" id="0x7F0A0E54" />
-    <public type="id" name="user_status_presence_dot" id="0x7F0A0E55" />
-    <public type="id" name="user_status_presence_subtitle" id="0x7F0A0E56" />
-    <public type="id" name="user_status_presence_title" id="0x7F0A0E57" />
-    <public type="id" name="user_status_update_custom" id="0x7F0A0E58" />
-    <public type="id" name="user_status_update_dnd" id="0x7F0A0E59" />
-    <public type="id" name="user_status_update_idle" id="0x7F0A0E5A" />
-    <public type="id" name="user_status_update_invisible" id="0x7F0A0E5B" />
-    <public type="id" name="user_status_update_online" id="0x7F0A0E5C" />
-    <public type="id" name="user_summary" id="0x7F0A0E5D" />
-    <public type="id" name="user_summary_label" id="0x7F0A0E5E" />
-    <public type="id" name="username_placeholder_end_guideline" id="0x7F0A0E5F" />
-    <public type="id" name="username_tag" id="0x7F0A0E60" />
-    <public type="id" name="username_text" id="0x7F0A0E61" />
-    <public type="id" name="vAlertContentContainer" id="0x7F0A0E62" />
-    <public type="id" name="verify" id="0x7F0A0E63" />
-    <public type="id" name="verify_account_by_email" id="0x7F0A0E64" />
-    <public type="id" name="verify_account_by_phone" id="0x7F0A0E65" />
-    <public type="id" name="verify_account_support" id="0x7F0A0E66" />
-    <public type="id" name="verify_account_text_body" id="0x7F0A0E67" />
-    <public type="id" name="verify_char_1" id="0x7F0A0E68" />
-    <public type="id" name="verify_char_2" id="0x7F0A0E69" />
-    <public type="id" name="verify_char_3" id="0x7F0A0E6A" />
-    <public type="id" name="verify_char_4" id="0x7F0A0E6B" />
-    <public type="id" name="verify_char_5" id="0x7F0A0E6C" />
-    <public type="id" name="verify_char_6" id="0x7F0A0E6D" />
-    <public type="id" name="video" id="0x7F0A0E6E" />
-    <public type="id" name="video_button" id="0x7F0A0E6F" />
-    <public type="id" name="video_decoder_gl_surface_view" id="0x7F0A0E70" />
-    <public type="id" name="view_dialog_confirmation_cancel" id="0x7F0A0E71" />
-    <public type="id" name="view_dialog_confirmation_confirm" id="0x7F0A0E72" />
-    <public type="id" name="view_dialog_confirmation_header" id="0x7F0A0E73" />
-    <public type="id" name="view_dialog_confirmation_text" id="0x7F0A0E74" />
-    <public type="id" name="view_input" id="0x7F0A0E75" />
-    <public type="id" name="view_interaction_failed_label_icon" id="0x7F0A0E76" />
-    <public type="id" name="view_interaction_failed_label_message" id="0x7F0A0E77" />
-    <public type="id" name="view_offset_helper" id="0x7F0A0E78" />
-    <public type="id" name="view_overlay" id="0x7F0A0E79" />
-    <public type="id" name="view_premium_marketing_container_tier1" id="0x7F0A0E7A" />
-    <public type="id" name="view_premium_marketing_learn_more" id="0x7F0A0E7B" />
-    <public type="id" name="view_premium_marketing_marketing_container" id="0x7F0A0E7C" />
-    <public type="id" name="view_premium_marketing_marketing_subtitle" id="0x7F0A0E7D" />
-    <public type="id" name="view_premium_marketing_marketing_title" id="0x7F0A0E7E" />
-    <public type="id" name="view_premium_marketing_nitro_boost_count" id="0x7F0A0E7F" />
-    <public type="id" name="view_premium_marketing_nitro_boost_discount" id="0x7F0A0E80" />
-    <public type="id" name="view_premium_marketing_nitro_classic_boost_count" id="0x7F0A0E81" />
-    <public type="id" name="view_premium_marketing_nitro_classic_boost_discount" id="0x7F0A0E82" />
-    <public type="id" name="view_premium_upsell_info_subheading" id="0x7F0A0E83" />
-    <public type="id" name="view_premium_upsell_info_subheading_blurb" id="0x7F0A0E84" />
-    <public type="id" name="view_premium_upsell_info_subheading_price" id="0x7F0A0E85" />
-    <public type="id" name="view_tree_lifecycle_owner" id="0x7F0A0E86" />
-    <public type="id" name="view_tree_saved_state_registry_owner" id="0x7F0A0E87" />
-    <public type="id" name="view_tree_view_model_store_owner" id="0x7F0A0E88" />
-    <public type="id" name="view_typing_dots_1" id="0x7F0A0E89" />
-    <public type="id" name="view_typing_dots_2" id="0x7F0A0E8A" />
-    <public type="id" name="view_typing_dots_3" id="0x7F0A0E8B" />
-    <public type="id" name="visible" id="0x7F0A0E8C" />
-    <public type="id" name="visible_removing_fragment_view_tag" id="0x7F0A0E8D" />
-    <public type="id" name="visit_community_icon" id="0x7F0A0E8E" />
-    <public type="id" name="visit_community_icon_text" id="0x7F0A0E8F" />
-    <public type="id" name="visit_community_text" id="0x7F0A0E90" />
-    <public type="id" name="voice" id="0x7F0A0E91" />
-    <public type="id" name="voice_bottom_sheet_bottom_content_container" id="0x7F0A0E92" />
-    <public type="id" name="voice_bottom_sheet_connect" id="0x7F0A0E93" />
-    <public type="id" name="voice_bottom_sheet_connect_container" id="0x7F0A0E94" />
-    <public type="id" name="voice_bottom_sheet_controls" id="0x7F0A0E95" />
-    <public type="id" name="voice_bottom_sheet_header_deafen" id="0x7F0A0E96" />
-    <public type="id" name="voice_bottom_sheet_header_icon" id="0x7F0A0E97" />
-    <public type="id" name="voice_bottom_sheet_header_invite" id="0x7F0A0E98" />
-    <public type="id" name="voice_bottom_sheet_header_noise_cancellation" id="0x7F0A0E99" />
-    <public type="id" name="voice_bottom_sheet_header_settings" id="0x7F0A0E9A" />
-    <public type="id" name="voice_bottom_sheet_header_subtitle" id="0x7F0A0E9B" />
-    <public type="id" name="voice_bottom_sheet_header_title" id="0x7F0A0E9C" />
-    <public type="id" name="voice_bottom_sheet_join_video" id="0x7F0A0E9D" />
-    <public type="id" name="voice_bottom_sheet_recycler" id="0x7F0A0E9E" />
-    <public type="id" name="voice_bottom_sheet_root" id="0x7F0A0E9F" />
-    <public type="id" name="voice_call_inline_container" id="0x7F0A0EA0" />
-    <public type="id" name="voice_connected_ptt" id="0x7F0A0EA1" />
-    <public type="id" name="voice_controls_sheet_view" id="0x7F0A0EA2" />
-    <public type="id" name="voice_fullscreen_controls_camera" id="0x7F0A0EA3" />
-    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7F0A0EA4" />
-    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7F0A0EA5" />
-    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7F0A0EA6" />
-    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7F0A0EA7" />
-    <public type="id" name="voice_fullscreen_controls_screenshare" id="0x7F0A0EA8" />
-    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7F0A0EA9" />
-    <public type="id" name="voice_settings_invite" id="0x7F0A0EAA" />
-    <public type="id" name="voice_settings_noise_suppression" id="0x7F0A0EAB" />
-    <public type="id" name="voice_settings_report" id="0x7F0A0EAC" />
-    <public type="id" name="voice_settings_sheet_container" id="0x7F0A0EAD" />
-    <public type="id" name="voice_settings_stage_settings" id="0x7F0A0EAE" />
-    <public type="id" name="voice_settings_toggle_video_participants" id="0x7F0A0EAF" />
-    <public type="id" name="voice_settings_view_card" id="0x7F0A0EB0" />
-    <public type="id" name="voice_settings_voice_settings" id="0x7F0A0EB1" />
-    <public type="id" name="voice_user_avatar" id="0x7F0A0EB2" />
-    <public type="id" name="voice_user_limit_current" id="0x7F0A0EB3" />
-    <public type="id" name="voice_user_limit_max" id="0x7F0A0EB4" />
-    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7F0A0EB5" />
-    <public type="id" name="voice_user_list_item_header_label" id="0x7F0A0EB6" />
-    <public type="id" name="voice_user_list_item_live_indicator" id="0x7F0A0EB7" />
-    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7F0A0EB8" />
-    <public type="id" name="voice_user_list_item_spectating_indicator" id="0x7F0A0EB9" />
-    <public type="id" name="voice_user_list_item_toggle_ringing" id="0x7F0A0EBA" />
-    <public type="id" name="voice_user_list_item_user_avatar" id="0x7F0A0EBB" />
-    <public type="id" name="voice_user_list_item_user_name" id="0x7F0A0EBC" />
-    <public type="id" name="voice_user_list_item_user_stream_preview" id="0x7F0A0EBD" />
-    <public type="id" name="voice_user_list_item_video_indicator" id="0x7F0A0EBE" />
-    <public type="id" name="voice_user_name_display" id="0x7F0A0EBF" />
-    <public type="id" name="volume_slider_max_vol" id="0x7F0A0EC0" />
-    <public type="id" name="volume_slider_min_vol" id="0x7F0A0EC1" />
-    <public type="id" name="volume_slider_seek_bar" id="0x7F0A0EC2" />
-    <public type="id" name="webView" id="0x7F0A0EC3" />
-    <public type="id" name="welcome_card_invite_friends" id="0x7F0A0EC4" />
-    <public type="id" name="welcome_card_upload_icon" id="0x7F0A0EC5" />
-    <public type="id" name="when_playing" id="0x7F0A0EC6" />
-    <public type="id" name="wide" id="0x7F0A0EC7" />
-    <public type="id" name="widget_add_friend_user_list_item" id="0x7F0A0EC8" />
-    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7F0A0EC9" />
-    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7F0A0ECA" />
-    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7F0A0ECB" />
-    <public type="id" name="widget_auth_mfa_info_okay" id="0x7F0A0ECC" />
-    <public type="id" name="widget_auth_mfa_info_text" id="0x7F0A0ECD" />
-    <public type="id" name="widget_bug_report_severity_touch_delegate" id="0x7F0A0ECE" />
-    <public type="id" name="widget_channel_action_bar" id="0x7F0A0ECF" />
-    <public type="id" name="widget_channel_search_item" id="0x7F0A0ED0" />
-    <public type="id" name="widget_channel_search_item_remove" id="0x7F0A0ED1" />
-    <public type="id" name="widget_channel_sidebar_actions_guild_view" id="0x7F0A0ED2" />
-    <public type="id" name="widget_channel_sidebar_actions_private_view" id="0x7F0A0ED3" />
-    <public type="id" name="widget_channel_topic" id="0x7F0A0ED4" />
-    <public type="id" name="widget_channels" id="0x7F0A0ED5" />
-    <public type="id" name="widget_channels_list_container" id="0x7F0A0ED6" />
-    <public type="id" name="widget_channels_list_empty_friends_state_cs_view" id="0x7F0A0ED7" />
-    <public type="id" name="widget_channels_list_empty_friends_state_view" id="0x7F0A0ED8" />
-    <public type="id" name="widget_chat_bottom_space" id="0x7F0A0ED9" />
-    <public type="id" name="widget_chat_input" id="0x7F0A0EDA" />
-    <public type="id" name="widget_chat_list" id="0x7F0A0EDB" />
-    <public type="id" name="widget_chat_overlay_actions" id="0x7F0A0EDC" />
-    <public type="id" name="widget_chat_voice_inline" id="0x7F0A0EDD" />
-    <public type="id" name="widget_collapsed_user_count" id="0x7F0A0EDE" />
-    <public type="id" name="widget_collapsed_user_imageview" id="0x7F0A0EDF" />
-    <public type="id" name="widget_connected_list" id="0x7F0A0EE0" />
-    <public type="id" name="widget_connection_integration_guild_handle" id="0x7F0A0EE1" />
-    <public type="id" name="widget_connection_integration_guild_icon" id="0x7F0A0EE2" />
-    <public type="id" name="widget_connection_integration_guild_join_error" id="0x7F0A0EE3" />
-    <public type="id" name="widget_connection_integration_guild_name" id="0x7F0A0EE4" />
-    <public type="id" name="widget_connection_integration_join_guild" id="0x7F0A0EE5" />
-    <public type="id" name="widget_global_search_container" id="0x7F0A0EE6" />
-    <public type="id" name="widget_global_status" id="0x7F0A0EE7" />
-    <public type="id" name="widget_guilds" id="0x7F0A0EE8" />
-    <public type="id" name="widget_home_container" id="0x7F0A0EE9" />
-    <public type="id" name="widget_profile_strip" id="0x7F0A0EEA" />
-    <public type="id" name="widget_search_input" id="0x7F0A0EEB" />
-    <public type="id" name="widget_search_results" id="0x7F0A0EEC" />
-    <public type="id" name="widget_search_suggestions" id="0x7F0A0EED" />
-    <public type="id" name="widget_server_settings_channels_container" id="0x7F0A0EEE" />
-    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7F0A0EEF" />
-    <public type="id" name="widget_server_settings_emojis_section" id="0x7F0A0EF0" />
-    <public type="id" name="widget_server_settings_emojis_upload" id="0x7F0A0EF1" />
-    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7F0A0EF2" />
-    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7F0A0EF3" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_header" id="0x7F0A0EF4" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_placeholder" id="0x7F0A0EF5" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_recycler" id="0x7F0A0EF6" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_select" id="0x7F0A0EF7" />
-    <public type="id" name="widget_sheet_component_bottom_sheet_subtitle" id="0x7F0A0EF8" />
-    <public type="id" name="widget_simple_bottom_sheet_selector_header" id="0x7F0A0EF9" />
-    <public type="id" name="widget_simple_bottom_sheet_selector_placeholder" id="0x7F0A0EFA" />
-    <public type="id" name="widget_simple_bottom_sheet_selector_recycler" id="0x7F0A0EFB" />
-    <public type="id" name="widget_stage_channel_details_blocked_count" id="0x7F0A0EFC" />
-    <public type="id" name="widget_stage_channel_details_blocked_icon" id="0x7F0A0EFD" />
-    <public type="id" name="widget_stage_channel_details_dot" id="0x7F0A0EFE" />
-    <public type="id" name="widget_stage_channel_details_listener_count" id="0x7F0A0EFF" />
-    <public type="id" name="widget_stage_channel_details_listener_icon" id="0x7F0A0F00" />
-    <public type="id" name="widget_stage_channel_details_name" id="0x7F0A0F01" />
-    <public type="id" name="widget_stage_channel_details_speaker_count" id="0x7F0A0F02" />
-    <public type="id" name="widget_stage_channel_details_speaker_icon" id="0x7F0A0F03" />
-    <public type="id" name="widget_stage_channel_details_topic" id="0x7F0A0F04" />
-    <public type="id" name="widget_status" id="0x7F0A0F05" />
-    <public type="id" name="widget_tabs_host_bottom_navigation_view" id="0x7F0A0F06" />
-    <public type="id" name="widget_tabs_host_container" id="0x7F0A0F07" />
-    <public type="id" name="widget_tabs_host_discovery" id="0x7F0A0F08" />
-    <public type="id" name="widget_tabs_host_friends" id="0x7F0A0F09" />
-    <public type="id" name="widget_tabs_host_global_status_indicator" id="0x7F0A0F0A" />
-    <public type="id" name="widget_tabs_host_home" id="0x7F0A0F0B" />
-    <public type="id" name="widget_tabs_host_mentions" id="0x7F0A0F0C" />
-    <public type="id" name="widget_tabs_host_nav_host" id="0x7F0A0F0D" />
-    <public type="id" name="widget_tabs_host_non_fullscreen_nav_host" id="0x7F0A0F0E" />
-    <public type="id" name="widget_tabs_host_user_settings" id="0x7F0A0F0F" />
-    <public type="id" name="widget_thread_status" id="0x7F0A0F10" />
-    <public type="id" name="withText" id="0x7F0A0F11" />
-    <public type="id" name="withinBounds" id="0x7F0A0F12" />
-    <public type="id" name="wrap" id="0x7F0A0F13" />
-    <public type="id" name="wrap_content" id="0x7F0A0F14" />
-    <public type="id" name="wrap_reverse" id="0x7F0A0F15" />
-    <public type="id" name="wrapper_controls" id="0x7F0A0F16" />
-    <public type="id" name="wrapper_reset_rotate" id="0x7F0A0F17" />
-    <public type="id" name="wrapper_rotate_by_angle" id="0x7F0A0F18" />
-    <public type="id" name="wrapper_states" id="0x7F0A0F19" />
-    <public type="id" name="zero_corner_chip" id="0x7F0A0F1A" />
-    <public type="id" name="zoom" id="0x7F0A0F1B" />
+    <public type="id" name="auth_phone_bailout" id="0x7F0A00F3" />
+    <public type="id" name="auth_phone_verify_action_separator" id="0x7F0A00F4" />
+    <public type="id" name="auth_phone_verify_call" id="0x7F0A00F5" />
+    <public type="id" name="auth_phone_verify_code" id="0x7F0A00F6" />
+    <public type="id" name="auth_phone_verify_resend" id="0x7F0A00F7" />
+    <public type="id" name="auth_phone_verify_subtitle" id="0x7F0A00F8" />
+    <public type="id" name="auth_phone_verify_title" id="0x7F0A00F9" />
+    <public type="id" name="auth_policy_links" id="0x7F0A00FA" />
+    <public type="id" name="auth_register_account_information_button" id="0x7F0A00FB" />
+    <public type="id" name="auth_register_account_information_password_wrap" id="0x7F0A00FC" />
+    <public type="id" name="auth_register_account_information_username_wrap" id="0x7F0A00FD" />
+    <public type="id" name="auth_register_birthday" id="0x7F0A00FE" />
+    <public type="id" name="auth_register_button" id="0x7F0A00FF" />
+    <public type="id" name="auth_register_container" id="0x7F0A0100" />
+    <public type="id" name="auth_register_identity_button" id="0x7F0A0101" />
+    <public type="id" name="auth_register_identity_first_segment_card" id="0x7F0A0102" />
+    <public type="id" name="auth_register_identity_input" id="0x7F0A0103" />
+    <public type="id" name="auth_register_identity_policy_link" id="0x7F0A0104" />
+    <public type="id" name="auth_register_identity_second_segment_card" id="0x7F0A0105" />
+    <public type="id" name="auth_register_identity_segmented_control" id="0x7F0A0106" />
+    <public type="id" name="auth_register_underage_button" id="0x7F0A0107" />
+    <public type="id" name="auth_register_underage_description" id="0x7F0A0108" />
+    <public type="id" name="auth_reset_password_back" id="0x7F0A0109" />
+    <public type="id" name="auth_reset_password_submit" id="0x7F0A010A" />
+    <public type="id" name="auth_success" id="0x7F0A010B" />
+    <public type="id" name="auth_tos_opt_in" id="0x7F0A010C" />
+    <public type="id" name="auth_undelete_cancel" id="0x7F0A010D" />
+    <public type="id" name="auth_undelete_delete" id="0x7F0A010E" />
+    <public type="id" name="auth_undelete_title" id="0x7F0A010F" />
+    <public type="id" name="authorized_apps" id="0x7F0A0110" />
+    <public type="id" name="authorized_apps_list" id="0x7F0A0111" />
+    <public type="id" name="auto" id="0x7F0A0112" />
+    <public type="id" name="autoComplete" id="0x7F0A0113" />
+    <public type="id" name="autoCompleteToEnd" id="0x7F0A0114" />
+    <public type="id" name="autoCompleteToStart" id="0x7F0A0115" />
+    <public type="id" name="autoFocus" id="0x7F0A0116" />
+    <public type="id" name="auto_archive_duration" id="0x7F0A0117" />
+    <public type="id" name="auto_archive_header" id="0x7F0A0118" />
+    <public type="id" name="auto_archive_sheet_duration_options" id="0x7F0A0119" />
+    <public type="id" name="automatic" id="0x7F0A011A" />
+    <public type="id" name="avatar" id="0x7F0A011B" />
+    <public type="id" name="avatar_container" id="0x7F0A011C" />
+    <public type="id" name="avatar_cutout" id="0x7F0A011D" />
+    <public type="id" name="avatar_edit" id="0x7F0A011E" />
+    <public type="id" name="avatar_edit_section" id="0x7F0A011F" />
+    <public type="id" name="avatar_edit_section_bottom_divider" id="0x7F0A0120" />
+    <public type="id" name="back" id="0x7F0A0121" />
+    <public type="id" name="badge" id="0x7F0A0122" />
+    <public type="id" name="ban_container" id="0x7F0A0123" />
+    <public type="id" name="ban_list_item_avatar" id="0x7F0A0124" />
+    <public type="id" name="ban_list_item_name" id="0x7F0A0125" />
+    <public type="id" name="ban_user_body" id="0x7F0A0126" />
+    <public type="id" name="ban_user_button_container" id="0x7F0A0127" />
+    <public type="id" name="ban_user_cancel" id="0x7F0A0128" />
+    <public type="id" name="ban_user_confirm" id="0x7F0A0129" />
+    <public type="id" name="ban_user_delete_messages_1_day" id="0x7F0A012A" />
+    <public type="id" name="ban_user_delete_messages_7_days" id="0x7F0A012B" />
+    <public type="id" name="ban_user_delete_messages_none" id="0x7F0A012C" />
+    <public type="id" name="ban_user_reason" id="0x7F0A012D" />
+    <public type="id" name="ban_user_title" id="0x7F0A012E" />
+    <public type="id" name="banner" id="0x7F0A012F" />
+    <public type="id" name="banner_edit" id="0x7F0A0130" />
+    <public type="id" name="barrier" id="0x7F0A0131" />
+    <public type="id" name="baseline" id="0x7F0A0132" />
+    <public type="id" name="beginOnFirstDraw" id="0x7F0A0133" />
+    <public type="id" name="beginning" id="0x7F0A0134" />
+    <public type="id" name="behavior" id="0x7F0A0135" />
+    <public type="id" name="beta_tag" id="0x7F0A0136" />
+    <public type="id" name="bio_editor_card" id="0x7F0A0137" />
+    <public type="id" name="bio_editor_text_input_field" id="0x7F0A0138" />
+    <public type="id" name="bio_editor_text_input_field_wrap" id="0x7F0A0139" />
+    <public type="id" name="bio_header" id="0x7F0A013A" />
+    <public type="id" name="bio_preview_card" id="0x7F0A013B" />
+    <public type="id" name="bio_preview_text" id="0x7F0A013C" />
+    <public type="id" name="bitrate_divider" id="0x7F0A013D" />
+    <public type="id" name="bitrate_seekbar" id="0x7F0A013E" />
+    <public type="id" name="bitrate_title" id="0x7F0A013F" />
+    <public type="id" name="blank_item_avatar_placeholder" id="0x7F0A0140" />
+    <public type="id" name="blank_item_username_placeholder" id="0x7F0A0141" />
+    <public type="id" name="blocked_user_item" id="0x7F0A0142" />
+    <public type="id" name="blocked_user_item_avatar" id="0x7F0A0143" />
+    <public type="id" name="blocked_user_item_name" id="0x7F0A0144" />
+    <public type="id" name="blocked_users" id="0x7F0A0145" />
+    <public type="id" name="blocked_users_flipper" id="0x7F0A0146" />
+    <public type="id" name="blocked_users_list_recycler" id="0x7F0A0147" />
+    <public type="id" name="blocking" id="0x7F0A0148" />
+    <public type="id" name="body" id="0x7F0A0149" />
+    <public type="id" name="boost_bar_progress_bar" id="0x7F0A014A" />
+    <public type="id" name="boost_bar_tier_0_container" id="0x7F0A014B" />
+    <public type="id" name="boost_bar_tier_0_iv" id="0x7F0A014C" />
+    <public type="id" name="boost_bar_tier_1_container" id="0x7F0A014D" />
+    <public type="id" name="boost_bar_tier_1_iv" id="0x7F0A014E" />
+    <public type="id" name="boost_bar_tier_1_tv" id="0x7F0A014F" />
+    <public type="id" name="boost_bar_tier_2_container" id="0x7F0A0150" />
+    <public type="id" name="boost_bar_tier_2_iv" id="0x7F0A0151" />
+    <public type="id" name="boost_bar_tier_2_tv" id="0x7F0A0152" />
+    <public type="id" name="boost_bar_tier_3_container" id="0x7F0A0153" />
+    <public type="id" name="boost_bar_tier_3_iv" id="0x7F0A0154" />
+    <public type="id" name="boost_bar_tier_3_tv" id="0x7F0A0155" />
+    <public type="id" name="boost_confirmation_button_container" id="0x7F0A0156" />
+    <public type="id" name="boost_confirmation_confirmation_view" id="0x7F0A0157" />
+    <public type="id" name="boost_confirmation_cooldown_warning" id="0x7F0A0158" />
+    <public type="id" name="boost_confirmation_error" id="0x7F0A0159" />
+    <public type="id" name="boost_confirmation_select" id="0x7F0A015A" />
+    <public type="id" name="boost_status_flipper" id="0x7F0A015B" />
+    <public type="id" name="boost_status_learn_more" id="0x7F0A015C" />
+    <public type="id" name="boost_status_num_boosts" id="0x7F0A015D" />
+    <public type="id" name="boost_status_premium_marketing" id="0x7F0A015E" />
+    <public type="id" name="boost_status_premium_upsell" id="0x7F0A015F" />
+    <public type="id" name="boost_status_protip" id="0x7F0A0160" />
+    <public type="id" name="boost_status_retry" id="0x7F0A0161" />
+    <public type="id" name="boost_status_subscribe_button" id="0x7F0A0162" />
+    <public type="id" name="boost_status_subscribe_button2" id="0x7F0A0163" />
+    <public type="id" name="boost_status_viewpager" id="0x7F0A0164" />
+    <public type="id" name="boosted_boost_action" id="0x7F0A0165" />
+    <public type="id" name="boosted_boost_cancelled" id="0x7F0A0166" />
+    <public type="id" name="boosted_boost_cooldown" id="0x7F0A0167" />
+    <public type="id" name="boosted_boost_date" id="0x7F0A0168" />
+    <public type="id" name="boosted_guild_banner" id="0x7F0A0169" />
+    <public type="id" name="boosted_guild_gradient" id="0x7F0A016A" />
+    <public type="id" name="boosted_guild_progress_view" id="0x7F0A016B" />
+    <public type="id" name="boosted_header" id="0x7F0A016C" />
+    <public type="id" name="boosted_sample_guild_count" id="0x7F0A016D" />
+    <public type="id" name="boosted_sample_guild_icon" id="0x7F0A016E" />
+    <public type="id" name="boosted_sample_guild_name" id="0x7F0A016F" />
+    <public type="id" name="boosted_sample_guild_progress" id="0x7F0A0170" />
+    <public type="id" name="bottom" id="0x7F0A0171" />
+    <public type="id" name="bottom_header_tv" id="0x7F0A0172" />
+    <public type="id" name="bottom_of_bullets" id="0x7F0A0173" />
+    <public type="id" name="bottom_sheet_tint" id="0x7F0A0174" />
+    <public type="id" name="bottom_to_end" id="0x7F0A0175" />
+    <public type="id" name="bounce" id="0x7F0A0176" />
+    <public type="id" name="browser_actions_header_text" id="0x7F0A0177" />
+    <public type="id" name="browser_actions_menu_item_icon" id="0x7F0A0178" />
+    <public type="id" name="browser_actions_menu_item_text" id="0x7F0A0179" />
+    <public type="id" name="browser_actions_menu_items" id="0x7F0A017A" />
+    <public type="id" name="browser_actions_menu_view" id="0x7F0A017B" />
+    <public type="id" name="bug_report_clear_screenshot" id="0x7F0A017C" />
+    <public type="id" name="bug_report_description" id="0x7F0A017D" />
+    <public type="id" name="bug_report_name" id="0x7F0A017E" />
+    <public type="id" name="bug_report_no_screenshot_label" id="0x7F0A017F" />
+    <public type="id" name="bug_report_priority" id="0x7F0A0180" />
+    <public type="id" name="bug_report_priority_card" id="0x7F0A0181" />
+    <public type="id" name="bug_report_priority_icon" id="0x7F0A0182" />
+    <public type="id" name="bug_report_screenshot" id="0x7F0A0183" />
+    <public type="id" name="bug_report_select_component_chevron" id="0x7F0A0184" />
+    <public type="id" name="bug_report_status_expression" id="0x7F0A0185" />
+    <public type="id" name="bug_report_status_text" id="0x7F0A0186" />
+    <public type="id" name="bug_report_submit" id="0x7F0A0187" />
+    <public type="id" name="bug_report_switch_flipper" id="0x7F0A0188" />
+    <public type="id" name="bug_report_undo_screenshot_remove" id="0x7F0A0189" />
+    <public type="id" name="bullet_1_icon" id="0x7F0A018A" />
+    <public type="id" name="bullet_1_label" id="0x7F0A018B" />
+    <public type="id" name="bullet_2_icon" id="0x7F0A018C" />
+    <public type="id" name="bullet_2_label" id="0x7F0A018D" />
+    <public type="id" name="bullet_3_icon" id="0x7F0A018E" />
+    <public type="id" name="bullet_3_label" id="0x7F0A018F" />
+    <public type="id" name="bullet_4_icon" id="0x7F0A0190" />
+    <public type="id" name="bullet_4_label" id="0x7F0A0191" />
+    <public type="id" name="button" id="0x7F0A0192" />
+    <public type="id" name="buttonPanel" id="0x7F0A0193" />
+    <public type="id" name="button_container" id="0x7F0A0194" />
+    <public type="id" name="cache_measures" id="0x7F0A0195" />
+    <public type="id" name="call_audio_share_warning_barrier" id="0x7F0A0196" />
+    <public type="id" name="call_container" id="0x7F0A0197" />
+    <public type="id" name="call_controls_sheet_container" id="0x7F0A0198" />
+    <public type="id" name="call_floating_push_to_talk" id="0x7F0A0199" />
+    <public type="id" name="call_fullscreen_mentions" id="0x7F0A019A" />
+    <public type="id" name="call_non_video_container" id="0x7F0A019B" />
+    <public type="id" name="call_participants_hidden" id="0x7F0A019C" />
+    <public type="id" name="call_participants_show_button" id="0x7F0A019D" />
+    <public type="id" name="call_pip" id="0x7F0A019E" />
+    <public type="id" name="call_stage_recycler" id="0x7F0A019F" />
+    <public type="id" name="call_stop_streaming_button" id="0x7F0A01A0" />
+    <public type="id" name="call_streaming_active" id="0x7F0A01A1" />
+    <public type="id" name="call_streaming_active_body" id="0x7F0A01A2" />
+    <public type="id" name="call_streaming_active_header" id="0x7F0A01A3" />
+    <public type="id" name="call_streaming_active_illustration" id="0x7F0A01A4" />
+    <public type="id" name="call_streaming_audio_share_warning" id="0x7F0A01A5" />
+    <public type="id" name="call_video_recycler" id="0x7F0A01A6" />
+    <public type="id" name="call_visit_community" id="0x7F0A01A7" />
+    <public type="id" name="camera1" id="0x7F0A01A8" />
+    <public type="id" name="camera2" id="0x7F0A01A9" />
+    <public type="id" name="camera_capacity_body" id="0x7F0A01AA" />
+    <public type="id" name="camera_capacity_confirm" id="0x7F0A01AB" />
+    <public type="id" name="camera_container" id="0x7F0A01AC" />
+    <public type="id" name="camera_facing_btn" id="0x7F0A01AD" />
+    <public type="id" name="camera_flash_btn" id="0x7F0A01AE" />
+    <public type="id" name="camera_view" id="0x7F0A01AF" />
+    <public type="id" name="cancel" id="0x7F0A01B0" />
+    <public type="id" name="cancel_action" id="0x7F0A01B1" />
+    <public type="id" name="cancel_button" id="0x7F0A01B2" />
+    <public type="id" name="cannot_send_text" id="0x7F0A01B3" />
+    <public type="id" name="cap_long" id="0x7F0A01B4" />
+    <public type="id" name="cap_long_and_short" id="0x7F0A01B5" />
+    <public type="id" name="card_segment_badge" id="0x7F0A01B6" />
+    <public type="id" name="card_segment_text" id="0x7F0A01B7" />
+    <public type="id" name="category_override_name" id="0x7F0A01B8" />
+    <public type="id" name="category_override_status" id="0x7F0A01B9" />
+    <public type="id" name="category_overview_name" id="0x7F0A01BA" />
+    <public type="id" name="center" id="0x7F0A01BB" />
+    <public type="id" name="centerCrop" id="0x7F0A01BC" />
+    <public type="id" name="centerInside" id="0x7F0A01BD" />
+    <public type="id" name="center_horizontal" id="0x7F0A01BE" />
+    <public type="id" name="center_vertical" id="0x7F0A01BF" />
+    <public type="id" name="chain" id="0x7F0A01C0" />
+    <public type="id" name="chains" id="0x7F0A01C1" />
+    <public type="id" name="change_log_body" id="0x7F0A01C2" />
+    <public type="id" name="change_log_contents" id="0x7F0A01C3" />
+    <public type="id" name="change_log_facebook" id="0x7F0A01C4" />
+    <public type="id" name="change_log_instagram" id="0x7F0A01C5" />
+    <public type="id" name="change_log_scrollview" id="0x7F0A01C6" />
+    <public type="id" name="change_log_special_back" id="0x7F0A01C7" />
+    <public type="id" name="change_log_special_button" id="0x7F0A01C8" />
+    <public type="id" name="change_log_special_close" id="0x7F0A01C9" />
+    <public type="id" name="change_log_special_contents" id="0x7F0A01CA" />
+    <public type="id" name="change_log_special_cta_body" id="0x7F0A01CB" />
+    <public type="id" name="change_log_special_date" id="0x7F0A01CC" />
+    <public type="id" name="change_log_special_scrollview" id="0x7F0A01CD" />
+    <public type="id" name="change_log_thumbnail" id="0x7F0A01CE" />
+    <public type="id" name="change_log_twitter" id="0x7F0A01CF" />
+    <public type="id" name="change_log_video" id="0x7F0A01D0" />
+    <public type="id" name="change_log_video_overlay" id="0x7F0A01D1" />
+    <public type="id" name="change_password_current_password_input" id="0x7F0A01D2" />
+    <public type="id" name="change_password_new_password_input" id="0x7F0A01D3" />
+    <public type="id" name="change_password_save" id="0x7F0A01D4" />
+    <public type="id" name="change_password_two_factor" id="0x7F0A01D5" />
+    <public type="id" name="changelog" id="0x7F0A01D6" />
+    <public type="id" name="changelog_special_header_container" id="0x7F0A01D7" />
+    <public type="id" name="changelog_special_video" id="0x7F0A01D8" />
+    <public type="id" name="channel_actions_view" id="0x7F0A01D9" />
+    <public type="id" name="channel_follow_channel_dropdown_icon" id="0x7F0A01DA" />
+    <public type="id" name="channel_follow_channel_name" id="0x7F0A01DB" />
+    <public type="id" name="channel_follow_error_text" id="0x7F0A01DC" />
+    <public type="id" name="channel_follow_guild_dropdown_icon" id="0x7F0A01DD" />
+    <public type="id" name="channel_follow_guild_icon" id="0x7F0A01DE" />
+    <public type="id" name="channel_follow_select_channel" id="0x7F0A01DF" />
+    <public type="id" name="channel_follow_select_guild" id="0x7F0A01E0" />
+    <public type="id" name="channel_follow_selected_channel_name" id="0x7F0A01E1" />
+    <public type="id" name="channel_follow_selected_guild_name" id="0x7F0A01E2" />
+    <public type="id" name="channel_follow_success_confirm" id="0x7F0A01E3" />
+    <public type="id" name="channel_follow_success_image" id="0x7F0A01E4" />
+    <public type="id" name="channel_follow_success_text" id="0x7F0A01E5" />
+    <public type="id" name="channel_list_item_private_status" id="0x7F0A01E6" />
+    <public type="id" name="channel_members_list_item_add" id="0x7F0A01E7" />
+    <public type="id" name="channel_members_list_item_add_title" id="0x7F0A01E8" />
+    <public type="id" name="channel_members_list_item_avatar" id="0x7F0A01E9" />
+    <public type="id" name="channel_members_list_item_boosted_indicator" id="0x7F0A01EA" />
+    <public type="id" name="channel_members_list_item_game" id="0x7F0A01EB" />
+    <public type="id" name="channel_members_list_item_group_owner_indicator" id="0x7F0A01EC" />
+    <public type="id" name="channel_members_list_item_header_placeholder" id="0x7F0A01ED" />
+    <public type="id" name="channel_members_list_item_header_text" id="0x7F0A01EE" />
+    <public type="id" name="channel_members_list_item_name" id="0x7F0A01EF" />
+    <public type="id" name="channel_members_list_item_presence" id="0x7F0A01F0" />
+    <public type="id" name="channel_members_list_item_rich_presence_iv" id="0x7F0A01F1" />
+    <public type="id" name="channel_muted_details" id="0x7F0A01F2" />
+    <public type="id" name="channel_notification_settings_system" id="0x7F0A01F3" />
+    <public type="id" name="channel_notifications_mute_settings_view" id="0x7F0A01F4" />
+    <public type="id" name="channel_override_category_name" id="0x7F0A01F5" />
+    <public type="id" name="channel_override_name" id="0x7F0A01F6" />
+    <public type="id" name="channel_override_status" id="0x7F0A01F7" />
+    <public type="id" name="channel_permission_general_create_instant_invite" id="0x7F0A01F8" />
+    <public type="id" name="channel_permission_general_manage_channel" id="0x7F0A01F9" />
+    <public type="id" name="channel_permission_general_manage_permissions" id="0x7F0A01FA" />
+    <public type="id" name="channel_permission_general_manage_webhooks" id="0x7F0A01FB" />
+    <public type="id" name="channel_permission_owner_view" id="0x7F0A01FC" />
+    <public type="id" name="channel_permission_stage_request_to_speak" id="0x7F0A01FD" />
+    <public type="id" name="channel_permission_text_add_reactions" id="0x7F0A01FE" />
+    <public type="id" name="channel_permission_text_attach_files" id="0x7F0A01FF" />
+    <public type="id" name="channel_permission_text_embed_links" id="0x7F0A0200" />
+    <public type="id" name="channel_permission_text_manage_messages" id="0x7F0A0201" />
+    <public type="id" name="channel_permission_text_mention_everyone" id="0x7F0A0202" />
+    <public type="id" name="channel_permission_text_read_message_history" id="0x7F0A0203" />
+    <public type="id" name="channel_permission_text_read_messages" id="0x7F0A0204" />
+    <public type="id" name="channel_permission_text_send_messages" id="0x7F0A0205" />
+    <public type="id" name="channel_permission_text_send_tts_messages" id="0x7F0A0206" />
+    <public type="id" name="channel_permission_text_use_external_emojis" id="0x7F0A0207" />
+    <public type="id" name="channel_permission_use_application_commands" id="0x7F0A0208" />
+    <public type="id" name="channel_permission_voice_connect" id="0x7F0A0209" />
+    <public type="id" name="channel_permission_voice_deafen_members" id="0x7F0A020A" />
+    <public type="id" name="channel_permission_voice_move_members" id="0x7F0A020B" />
+    <public type="id" name="channel_permission_voice_mute_members" id="0x7F0A020C" />
+    <public type="id" name="channel_permission_voice_priority_speaker" id="0x7F0A020D" />
+    <public type="id" name="channel_permission_voice_speak" id="0x7F0A020E" />
+    <public type="id" name="channel_permission_voice_use_vad" id="0x7F0A020F" />
+    <public type="id" name="channel_permission_voice_video" id="0x7F0A0210" />
+    <public type="id" name="channel_permissions_avatar" id="0x7F0A0211" />
+    <public type="id" name="channel_permissions_channel_name" id="0x7F0A0212" />
+    <public type="id" name="channel_permissions_save" id="0x7F0A0213" />
+    <public type="id" name="channel_permissions_stage_container" id="0x7F0A0214" />
+    <public type="id" name="channel_permissions_target_name" id="0x7F0A0215" />
+    <public type="id" name="channel_permissions_text_container" id="0x7F0A0216" />
+    <public type="id" name="channel_permissions_voice_container" id="0x7F0A0217" />
+    <public type="id" name="channel_pinned_messages_recycler" id="0x7F0A0218" />
+    <public type="id" name="channel_selector_list" id="0x7F0A0219" />
+    <public type="id" name="channel_separator" id="0x7F0A021A" />
+    <public type="id" name="channel_settings_announcement" id="0x7F0A021B" />
+    <public type="id" name="channel_settings_cannot_delete_body" id="0x7F0A021C" />
+    <public type="id" name="channel_settings_cannot_delete_confirm" id="0x7F0A021D" />
+    <public type="id" name="channel_settings_cannot_delete_title" id="0x7F0A021E" />
+    <public type="id" name="channel_settings_default_auto_archive_duration_label" id="0x7F0A021F" />
+    <public type="id" name="channel_settings_default_auto_archive_duration_slider" id="0x7F0A0220" />
+    <public type="id" name="channel_settings_default_auto_archive_label" id="0x7F0A0221" />
+    <public type="id" name="channel_settings_delete_body" id="0x7F0A0222" />
+    <public type="id" name="channel_settings_delete_cancel" id="0x7F0A0223" />
+    <public type="id" name="channel_settings_delete_confirm" id="0x7F0A0224" />
+    <public type="id" name="channel_settings_delete_title" id="0x7F0A0225" />
+    <public type="id" name="channel_settings_edit_name" id="0x7F0A0226" />
+    <public type="id" name="channel_settings_edit_topic" id="0x7F0A0227" />
+    <public type="id" name="channel_settings_edit_wrap" id="0x7F0A0228" />
+    <public type="id" name="channel_settings_notifications_frequency_0" id="0x7F0A0229" />
+    <public type="id" name="channel_settings_notifications_frequency_1" id="0x7F0A022A" />
+    <public type="id" name="channel_settings_notifications_frequency_2" id="0x7F0A022B" />
+    <public type="id" name="channel_settings_notifications_frequency_wrap" id="0x7F0A022C" />
+    <public type="id" name="channel_settings_nsfw" id="0x7F0A022D" />
+    <public type="id" name="channel_settings_permissions" id="0x7F0A022E" />
+    <public type="id" name="channel_settings_permissions_add_member_name_search" id="0x7F0A022F" />
+    <public type="id" name="channel_settings_permissions_add_member_recycler" id="0x7F0A0230" />
+    <public type="id" name="channel_settings_permissions_add_member_view_flipper" id="0x7F0A0231" />
+    <public type="id" name="channel_settings_permissions_add_role_recycler" id="0x7F0A0232" />
+    <public type="id" name="channel_settings_pinned_messages" id="0x7F0A0233" />
+    <public type="id" name="channel_settings_pinned_messages_container" id="0x7F0A0234" />
+    <public type="id" name="channel_settings_pinned_messages_disabled_overlay" id="0x7F0A0235" />
+    <public type="id" name="channel_settings_region_override" id="0x7F0A0236" />
+    <public type="id" name="channel_settings_region_override_container" id="0x7F0A0237" />
+    <public type="id" name="channel_settings_region_override_help" id="0x7F0A0238" />
+    <public type="id" name="channel_settings_save" id="0x7F0A0239" />
+    <public type="id" name="channel_settings_section_default_auto_archive_duration" id="0x7F0A023A" />
+    <public type="id" name="channel_settings_section_privacy_safety" id="0x7F0A023B" />
+    <public type="id" name="channel_settings_section_slow_mode" id="0x7F0A023C" />
+    <public type="id" name="channel_settings_section_user_management" id="0x7F0A023D" />
+    <public type="id" name="channel_settings_slow_mode_cooldown_label" id="0x7F0A023E" />
+    <public type="id" name="channel_settings_slow_mode_cooldown_slider" id="0x7F0A023F" />
+    <public type="id" name="channel_settings_slowmode_label" id="0x7F0A0240" />
+    <public type="id" name="channel_sidebar_actions_notifications" id="0x7F0A0241" />
+    <public type="id" name="channel_sidebar_actions_pins" id="0x7F0A0242" />
+    <public type="id" name="channel_sidebar_actions_search" id="0x7F0A0243" />
+    <public type="id" name="channel_sidebar_actions_settings" id="0x7F0A0244" />
+    <public type="id" name="channel_spinner_dropdown_item_textview" id="0x7F0A0245" />
+    <public type="id" name="channel_spinner_item_textview" id="0x7F0A0246" />
+    <public type="id" name="channel_topic" id="0x7F0A0247" />
+    <public type="id" name="channel_topic_channel_icon" id="0x7F0A0248" />
+    <public type="id" name="channel_topic_ellipsis" id="0x7F0A0249" />
+    <public type="id" name="channel_topic_more_icon" id="0x7F0A024A" />
+    <public type="id" name="channel_topic_name" id="0x7F0A024B" />
+    <public type="id" name="channel_topic_title" id="0x7F0A024C" />
+    <public type="id" name="channels_item_category_add" id="0x7F0A024D" />
+    <public type="id" name="channels_item_category_arrow" id="0x7F0A024E" />
+    <public type="id" name="channels_item_category_name" id="0x7F0A024F" />
+    <public type="id" name="channels_item_channel_hash" id="0x7F0A0250" />
+    <public type="id" name="channels_item_channel_mentions" id="0x7F0A0251" />
+    <public type="id" name="channels_item_channel_name" id="0x7F0A0252" />
+    <public type="id" name="channels_item_channel_unread" id="0x7F0A0253" />
+    <public type="id" name="channels_item_thread_content" id="0x7F0A0254" />
+    <public type="id" name="channels_item_thread_mentions" id="0x7F0A0255" />
+    <public type="id" name="channels_item_thread_name" id="0x7F0A0256" />
+    <public type="id" name="channels_item_thread_spine" id="0x7F0A0257" />
+    <public type="id" name="channels_item_thread_unread" id="0x7F0A0258" />
+    <public type="id" name="channels_item_voice_channel_name" id="0x7F0A0259" />
+    <public type="id" name="channels_item_voice_channel_speaker" id="0x7F0A025A" />
+    <public type="id" name="channels_item_voice_channel_user_limit" id="0x7F0A025B" />
+    <public type="id" name="channels_item_voice_user_avatar" id="0x7F0A025C" />
+    <public type="id" name="channels_item_voice_user_camera" id="0x7F0A025D" />
+    <public type="id" name="channels_item_voice_user_headphones" id="0x7F0A025E" />
+    <public type="id" name="channels_item_voice_user_live" id="0x7F0A025F" />
+    <public type="id" name="channels_item_voice_user_microphone" id="0x7F0A0260" />
+    <public type="id" name="channels_item_voice_user_name" id="0x7F0A0261" />
+    <public type="id" name="channels_list" id="0x7F0A0262" />
+    <public type="id" name="channels_list_actions_change_nickname_cancel" id="0x7F0A0263" />
+    <public type="id" name="channels_list_actions_change_nickname_edit_text" id="0x7F0A0264" />
+    <public type="id" name="channels_list_actions_change_nickname_reset" id="0x7F0A0265" />
+    <public type="id" name="channels_list_actions_change_nickname_save" id="0x7F0A0266" />
+    <public type="id" name="channels_list_banner" id="0x7F0A0267" />
+    <public type="id" name="channels_list_banner_foreground" id="0x7F0A0268" />
+    <public type="id" name="channels_list_direct_messages_title" id="0x7F0A0269" />
+    <public type="id" name="channels_list_header" id="0x7F0A026A" />
+    <public type="id" name="channels_list_item_header" id="0x7F0A026B" />
+    <public type="id" name="channels_list_item_mfa_text" id="0x7F0A026C" />
+    <public type="id" name="channels_list_item_private_avatar" id="0x7F0A026D" />
+    <public type="id" name="channels_list_item_private_desc" id="0x7F0A026E" />
+    <public type="id" name="channels_list_item_private_mentions" id="0x7F0A026F" />
+    <public type="id" name="channels_list_item_private_name" id="0x7F0A0270" />
+    <public type="id" name="channels_list_item_private_tag" id="0x7F0A0271" />
+    <public type="id" name="channels_list_item_text_actions_channel_notifications" id="0x7F0A0272" />
+    <public type="id" name="channels_list_item_text_actions_channel_settings" id="0x7F0A0273" />
+    <public type="id" name="channels_list_item_text_actions_copy_id" id="0x7F0A0274" />
+    <public type="id" name="channels_list_item_text_actions_developer_divider" id="0x7F0A0275" />
+    <public type="id" name="channels_list_item_text_actions_icon" id="0x7F0A0276" />
+    <public type="id" name="channels_list_item_text_actions_invite" id="0x7F0A0277" />
+    <public type="id" name="channels_list_item_text_actions_mark_as_read" id="0x7F0A0278" />
+    <public type="id" name="channels_list_item_text_actions_mute" id="0x7F0A0279" />
+    <public type="id" name="channels_list_item_text_actions_profile" id="0x7F0A027A" />
+    <public type="id" name="channels_list_item_text_actions_thread_browser" id="0x7F0A027B" />
+    <public type="id" name="channels_list_item_text_actions_title" id="0x7F0A027C" />
+    <public type="id" name="channels_list_item_thread_actions_archive_settings" id="0x7F0A027D" />
+    <public type="id" name="channels_list_item_thread_actions_archive_settings_header" id="0x7F0A027E" />
+    <public type="id" name="channels_list_item_thread_actions_archive_settings_subheader" id="0x7F0A027F" />
+    <public type="id" name="channels_list_item_thread_actions_channel_notifications" id="0x7F0A0280" />
+    <public type="id" name="channels_list_item_thread_actions_copy_id" id="0x7F0A0281" />
+    <public type="id" name="channels_list_item_thread_actions_developer_divider" id="0x7F0A0282" />
+    <public type="id" name="channels_list_item_thread_actions_divider" id="0x7F0A0283" />
+    <public type="id" name="channels_list_item_thread_actions_edit" id="0x7F0A0284" />
+    <public type="id" name="channels_list_item_thread_actions_icon" id="0x7F0A0285" />
+    <public type="id" name="channels_list_item_thread_actions_leave" id="0x7F0A0286" />
+    <public type="id" name="channels_list_item_thread_actions_mark_as_read" id="0x7F0A0287" />
+    <public type="id" name="channels_list_item_thread_actions_title" id="0x7F0A0288" />
+    <public type="id" name="channels_list_item_thread_actions_unarchive" id="0x7F0A0289" />
+    <public type="id" name="channels_list_new" id="0x7F0A028A" />
+    <public type="id" name="channels_list_premium_guild_hint" id="0x7F0A028B" />
+    <public type="id" name="channels_list_premium_guild_hint_button" id="0x7F0A028C" />
+    <public type="id" name="channels_list_premium_guild_hint_subtitle" id="0x7F0A028D" />
+    <public type="id" name="channels_list_premium_guild_hint_title" id="0x7F0A028E" />
+    <public type="id" name="channels_list_private_channels_header" id="0x7F0A028F" />
+    <public type="id" name="channels_list_search" id="0x7F0A0290" />
+    <public type="id" name="channels_list_start_group" id="0x7F0A0291" />
+    <public type="id" name="channels_list_tooltip_background" id="0x7F0A0292" />
+    <public type="id" name="channels_list_tooltip_top_tail" id="0x7F0A0293" />
+    <public type="id" name="channels_list_unreads" id="0x7F0A0294" />
+    <public type="id" name="channels_list_unreads_background" id="0x7F0A0295" />
+    <public type="id" name="channels_list_unreads_stub" id="0x7F0A0296" />
+    <public type="id" name="channels_toolbar" id="0x7F0A0297" />
+    <public type="id" name="chat_action_item_button" id="0x7F0A0298" />
+    <public type="id" name="chat_action_item_image" id="0x7F0A0299" />
+    <public type="id" name="chat_action_item_subtext" id="0x7F0A029A" />
+    <public type="id" name="chat_action_item_text" id="0x7F0A029B" />
+    <public type="id" name="chat_input_application_avatar" id="0x7F0A029C" />
+    <public type="id" name="chat_input_application_commands_option_description" id="0x7F0A029D" />
+    <public type="id" name="chat_input_application_commands_recycler" id="0x7F0A029E" />
+    <public type="id" name="chat_input_application_name" id="0x7F0A029F" />
+    <public type="id" name="chat_input_categories_recycler" id="0x7F0A02A0" />
+    <public type="id" name="chat_input_container" id="0x7F0A02A1" />
+    <public type="id" name="chat_input_context_bar" id="0x7F0A02A2" />
+    <public type="id" name="chat_input_context_cancel" id="0x7F0A02A3" />
+    <public type="id" name="chat_input_context_description" id="0x7F0A02A4" />
+    <public type="id" name="chat_input_context_reply_mention_button" id="0x7F0A02A5" />
+    <public type="id" name="chat_input_context_reply_mention_button_image" id="0x7F0A02A6" />
+    <public type="id" name="chat_input_context_reply_mention_button_text" id="0x7F0A02A7" />
+    <public type="id" name="chat_input_emoji_matching_header" id="0x7F0A02A8" />
+    <public type="id" name="chat_input_emoji_picker_recycler" id="0x7F0A02A9" />
+    <public type="id" name="chat_input_emoji_picker_view_flipper" id="0x7F0A02AA" />
+    <public type="id" name="chat_input_emoji_upsell_pile" id="0x7F0A02AB" />
+    <public type="id" name="chat_input_emoji_upsell_text" id="0x7F0A02AC" />
+    <public type="id" name="chat_input_guard_action" id="0x7F0A02AD" />
+    <public type="id" name="chat_input_guard_action_secondary" id="0x7F0A02AE" />
+    <public type="id" name="chat_input_guard_subtext" id="0x7F0A02AF" />
+    <public type="id" name="chat_input_guard_text" id="0x7F0A02B0" />
+    <public type="id" name="chat_input_icon_barrier" id="0x7F0A02B1" />
+    <public type="id" name="chat_input_item_avatar" id="0x7F0A02B2" />
+    <public type="id" name="chat_input_item_description" id="0x7F0A02B3" />
+    <public type="id" name="chat_input_item_divider" id="0x7F0A02B4" />
+    <public type="id" name="chat_input_item_emoji" id="0x7F0A02B5" />
+    <public type="id" name="chat_input_item_icon_container" id="0x7F0A02B6" />
+    <public type="id" name="chat_input_item_name" id="0x7F0A02B7" />
+    <public type="id" name="chat_input_item_name_right" id="0x7F0A02B8" />
+    <public type="id" name="chat_input_item_status" id="0x7F0A02B9" />
+    <public type="id" name="chat_input_mentions_recycler" id="0x7F0A02BA" />
+    <public type="id" name="chat_input_sticker_picker_empty_container" id="0x7F0A02BB" />
+    <public type="id" name="chat_input_sticker_picker_empty_container_phase_1" id="0x7F0A02BC" />
+    <public type="id" name="chat_input_sticker_picker_empty_image" id="0x7F0A02BD" />
+    <public type="id" name="chat_input_sticker_picker_empty_link" id="0x7F0A02BE" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_1" id="0x7F0A02BF" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_2" id="0x7F0A02C0" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_3" id="0x7F0A02C1" />
+    <public type="id" name="chat_input_sticker_picker_empty_sticker_4" id="0x7F0A02C2" />
+    <public type="id" name="chat_input_sticker_picker_empty_subscribe_phase_1" id="0x7F0A02C3" />
+    <public type="id" name="chat_input_sticker_picker_empty_subtitle" id="0x7F0A02C4" />
+    <public type="id" name="chat_input_sticker_picker_empty_subtitle_phase_1" id="0x7F0A02C5" />
+    <public type="id" name="chat_input_sticker_picker_empty_title" id="0x7F0A02C6" />
+    <public type="id" name="chat_input_sticker_picker_empty_title_phase_1" id="0x7F0A02C7" />
+    <public type="id" name="chat_input_sticker_picker_recycler" id="0x7F0A02C8" />
+    <public type="id" name="chat_input_sticker_picker_view_flipper" id="0x7F0A02C9" />
+    <public type="id" name="chat_input_stickers_container" id="0x7F0A02CA" />
+    <public type="id" name="chat_input_stickers_matching_header" id="0x7F0A02CB" />
+    <public type="id" name="chat_input_stickers_recycler" id="0x7F0A02CC" />
+    <public type="id" name="chat_input_suggested_sticker_1" id="0x7F0A02CD" />
+    <public type="id" name="chat_input_suggested_sticker_2" id="0x7F0A02CE" />
+    <public type="id" name="chat_input_suggested_sticker_3" id="0x7F0A02CF" />
+    <public type="id" name="chat_input_suggested_sticker_4" id="0x7F0A02D0" />
+    <public type="id" name="chat_input_suggested_sticker_cancel" id="0x7F0A02D1" />
+    <public type="id" name="chat_input_upload_too_large_center_file" id="0x7F0A02D2" />
+    <public type="id" name="chat_input_widget" id="0x7F0A02D3" />
+    <public type="id" name="chat_input_wrap" id="0x7F0A02D4" />
+    <public type="id" name="chat_item" id="0x7F0A02D5" />
+    <public type="id" name="chat_list_adapter_item_alert_text" id="0x7F0A02D6" />
+    <public type="id" name="chat_list_adapter_item_blocked" id="0x7F0A02D7" />
+    <public type="id" name="chat_list_adapter_item_call_icon" id="0x7F0A02D8" />
+    <public type="id" name="chat_list_adapter_item_call_participants" id="0x7F0A02D9" />
+    <public type="id" name="chat_list_adapter_item_call_subtitle" id="0x7F0A02DA" />
+    <public type="id" name="chat_list_adapter_item_call_title" id="0x7F0A02DB" />
+    <public type="id" name="chat_list_adapter_item_call_unjoined_ongoing_subtitle" id="0x7F0A02DC" />
+    <public type="id" name="chat_list_adapter_item_chat_attachment_icon" id="0x7F0A02DD" />
+    <public type="id" name="chat_list_adapter_item_component_root" id="0x7F0A02DE" />
+    <public type="id" name="chat_list_adapter_item_edit_channel" id="0x7F0A02DF" />
+    <public type="id" name="chat_list_adapter_item_failed" id="0x7F0A02E0" />
+    <public type="id" name="chat_list_adapter_item_failed_upload_list" id="0x7F0A02E1" />
+    <public type="id" name="chat_list_adapter_item_gutter_bg" id="0x7F0A02E2" />
+    <public type="id" name="chat_list_adapter_item_header" id="0x7F0A02E3" />
+    <public type="id" name="chat_list_adapter_item_highlighted_bg" id="0x7F0A02E4" />
+    <public type="id" name="chat_list_adapter_item_icon_help" id="0x7F0A02E5" />
+    <public type="id" name="chat_list_adapter_item_private_channel_start_header" id="0x7F0A02E6" />
+    <public type="id" name="chat_list_adapter_item_reply_leading_views" id="0x7F0A02E7" />
+    <public type="id" name="chat_list_adapter_item_selectable_background" id="0x7F0A02E8" />
+    <public type="id" name="chat_list_adapter_item_sticker" id="0x7F0A02E9" />
+    <public type="id" name="chat_list_adapter_item_sticker_greet" id="0x7F0A02EA" />
+    <public type="id" name="chat_list_adapter_item_sticker_greet_text" id="0x7F0A02EB" />
+    <public type="id" name="chat_list_adapter_item_subheader1" id="0x7F0A02EC" />
+    <public type="id" name="chat_list_adapter_item_subheader2" id="0x7F0A02ED" />
+    <public type="id" name="chat_list_adapter_item_text" id="0x7F0A02EE" />
+    <public type="id" name="chat_list_adapter_item_text_avatar" id="0x7F0A02EF" />
+    <public type="id" name="chat_list_adapter_item_text_command" id="0x7F0A02F0" />
+    <public type="id" name="chat_list_adapter_item_text_decorator" id="0x7F0A02F1" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_avatar" id="0x7F0A02F2" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_reply_icon" id="0x7F0A02F3" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_reply_link_icon" id="0x7F0A02F4" />
+    <public type="id" name="chat_list_adapter_item_text_decorator_reply_name" id="0x7F0A02F5" />
+    <public type="id" name="chat_list_adapter_item_text_dismiss" id="0x7F0A02F6" />
+    <public type="id" name="chat_list_adapter_item_text_error" id="0x7F0A02F7" />
+    <public type="id" name="chat_list_adapter_item_text_header" id="0x7F0A02F8" />
+    <public type="id" name="chat_list_adapter_item_text_loading" id="0x7F0A02F9" />
+    <public type="id" name="chat_list_adapter_item_text_name" id="0x7F0A02FA" />
+    <public type="id" name="chat_list_adapter_item_text_reply_content" id="0x7F0A02FB" />
+    <public type="id" name="chat_list_adapter_item_text_tag" id="0x7F0A02FC" />
+    <public type="id" name="chat_list_adapter_item_text_timestamp" id="0x7F0A02FD" />
+    <public type="id" name="chat_list_adapter_item_thread_embed_spine" id="0x7F0A02FE" />
+    <public type="id" name="chat_list_adapter_item_unjoined_call_duration" id="0x7F0A02FF" />
+    <public type="id" name="chat_list_adapter_item_visibility_icon" id="0x7F0A0300" />
+    <public type="id" name="chat_list_adapter_thread_header_icon" id="0x7F0A0301" />
+    <public type="id" name="chat_list_empty_image" id="0x7F0A0302" />
+    <public type="id" name="chat_list_empty_pins_text" id="0x7F0A0303" />
+    <public type="id" name="chat_list_item_attachment_barrier" id="0x7F0A0304" />
+    <public type="id" name="chat_list_item_attachment_card" id="0x7F0A0305" />
+    <public type="id" name="chat_list_item_attachment_description" id="0x7F0A0306" />
+    <public type="id" name="chat_list_item_attachment_download" id="0x7F0A0307" />
+    <public type="id" name="chat_list_item_attachment_icon" id="0x7F0A0308" />
+    <public type="id" name="chat_list_item_attachment_inline_media" id="0x7F0A0309" />
+    <public type="id" name="chat_list_item_attachment_name" id="0x7F0A030A" />
+    <public type="id" name="chat_list_item_attachment_spoiler" id="0x7F0A030B" />
+    <public type="id" name="chat_list_item_embed_author_icon" id="0x7F0A030C" />
+    <public type="id" name="chat_list_item_embed_author_text" id="0x7F0A030D" />
+    <public type="id" name="chat_list_item_embed_barrier_data" id="0x7F0A030E" />
+    <public type="id" name="chat_list_item_embed_barrier_header" id="0x7F0A030F" />
+    <public type="id" name="chat_list_item_embed_container_card" id="0x7F0A0310" />
+    <public type="id" name="chat_list_item_embed_content" id="0x7F0A0311" />
+    <public type="id" name="chat_list_item_embed_description" id="0x7F0A0312" />
+    <public type="id" name="chat_list_item_embed_divider" id="0x7F0A0313" />
+    <public type="id" name="chat_list_item_embed_field_name" id="0x7F0A0314" />
+    <public type="id" name="chat_list_item_embed_field_value" id="0x7F0A0315" />
+    <public type="id" name="chat_list_item_embed_fields" id="0x7F0A0316" />
+    <public type="id" name="chat_list_item_embed_footer_icon" id="0x7F0A0317" />
+    <public type="id" name="chat_list_item_embed_footer_text" id="0x7F0A0318" />
+    <public type="id" name="chat_list_item_embed_image" id="0x7F0A0319" />
+    <public type="id" name="chat_list_item_embed_image_icons" id="0x7F0A031A" />
+    <public type="id" name="chat_list_item_embed_image_thumbnail" id="0x7F0A031B" />
+    <public type="id" name="chat_list_item_embed_provider" id="0x7F0A031C" />
+    <public type="id" name="chat_list_item_embed_spoiler" id="0x7F0A031D" />
+    <public type="id" name="chat_list_item_embed_title" id="0x7F0A031E" />
+    <public type="id" name="chat_list_item_mention_footer_divider" id="0x7F0A031F" />
+    <public type="id" name="chat_list_item_mention_footer_hand" id="0x7F0A0320" />
+    <public type="id" name="chat_list_item_message_header_channel" id="0x7F0A0321" />
+    <public type="id" name="chat_list_item_message_header_divider" id="0x7F0A0322" />
+    <public type="id" name="chat_list_item_message_header_guild" id="0x7F0A0323" />
+    <public type="id" name="chat_list_item_message_header_spacer" id="0x7F0A0324" />
+    <public type="id" name="chat_list_item_reactions" id="0x7F0A0325" />
+    <public type="id" name="chat_list_recycler" id="0x7F0A0326" />
+    <public type="id" name="chat_list_search_empty_image" id="0x7F0A0327" />
+    <public type="id" name="chat_list_search_error_text" id="0x7F0A0328" />
+    <public type="id" name="chat_list_search_indexing_animation" id="0x7F0A0329" />
+    <public type="id" name="chat_list_search_indexing_text" id="0x7F0A032A" />
+    <public type="id" name="chat_member_verification_input_guard_action" id="0x7F0A032B" />
+    <public type="id" name="chat_member_verification_input_guard_chevron" id="0x7F0A032C" />
+    <public type="id" name="chat_member_verification_input_guard_icon" id="0x7F0A032D" />
+    <public type="id" name="chat_member_verification_input_guard_text" id="0x7F0A032E" />
+    <public type="id" name="chat_overlay_old_messages_fab" id="0x7F0A032F" />
+    <public type="id" name="chat_overlay_typing" id="0x7F0A0330" />
+    <public type="id" name="chat_overlay_typing_dots" id="0x7F0A0331" />
+    <public type="id" name="chat_status_unread_messages" id="0x7F0A0332" />
+    <public type="id" name="chat_status_unread_messages_mark" id="0x7F0A0333" />
+    <public type="id" name="chat_status_unread_messages_text" id="0x7F0A0334" />
+    <public type="id" name="chat_typing_users_slowmode" id="0x7F0A0335" />
+    <public type="id" name="chat_typing_users_slowmode_icon" id="0x7F0A0336" />
+    <public type="id" name="chat_typing_users_typing" id="0x7F0A0337" />
+    <public type="id" name="chat_upload_1" id="0x7F0A0338" />
+    <public type="id" name="chat_upload_2" id="0x7F0A0339" />
+    <public type="id" name="chat_upload_3" id="0x7F0A033A" />
+    <public type="id" name="check" id="0x7F0A033B" />
+    <public type="id" name="checkable_off_container" id="0x7F0A033C" />
+    <public type="id" name="checkbox" id="0x7F0A033D" />
+    <public type="id" name="checkboxes_container" id="0x7F0A033E" />
+    <public type="id" name="checked" id="0x7F0A033F" />
+    <public type="id" name="chip" id="0x7F0A0340" />
+    <public type="id" name="chip1" id="0x7F0A0341" />
+    <public type="id" name="chip2" id="0x7F0A0342" />
+    <public type="id" name="chip3" id="0x7F0A0343" />
+    <public type="id" name="chip_group" id="0x7F0A0344" />
+    <public type="id" name="chip_image" id="0x7F0A0345" />
+    <public type="id" name="chip_text" id="0x7F0A0346" />
+    <public type="id" name="chips_view" id="0x7F0A0347" />
+    <public type="id" name="choose_plan_empty_container" id="0x7F0A0348" />
+    <public type="id" name="choose_plan_empty_description" id="0x7F0A0349" />
+    <public type="id" name="choose_plan_recycler" id="0x7F0A034A" />
+    <public type="id" name="chronometer" id="0x7F0A034B" />
+    <public type="id" name="circle" id="0x7F0A034C" />
+    <public type="id" name="circle_center" id="0x7F0A034D" />
+    <public type="id" name="claimPromoBody" id="0x7F0A034E" />
+    <public type="id" name="claimPromoCode" id="0x7F0A034F" />
+    <public type="id" name="claimPromoCodeBox" id="0x7F0A0350" />
+    <public type="id" name="claimPromoCopyButton" id="0x7F0A0351" />
+    <public type="id" name="claimPromoFailure" id="0x7F0A0352" />
+    <public type="id" name="claimPromoFailureCloseButton" id="0x7F0A0353" />
+    <public type="id" name="claimPromoFlipper" id="0x7F0A0354" />
+    <public type="id" name="claimPromoLoading" id="0x7F0A0355" />
+    <public type="id" name="claimPromoMaybeLaterButton" id="0x7F0A0356" />
+    <public type="id" name="claimPromoRedeemButton" id="0x7F0A0357" />
+    <public type="id" name="claimPromoSuccess" id="0x7F0A0358" />
+    <public type="id" name="clear_text" id="0x7F0A0359" />
+    <public type="id" name="client_outdated_anchor_wrap" id="0x7F0A035A" />
+    <public type="id" name="client_outdated_update" id="0x7F0A035B" />
+    <public type="id" name="clip_horizontal" id="0x7F0A035C" />
+    <public type="id" name="clip_vertical" id="0x7F0A035D" />
+    <public type="id" name="clockwise" id="0x7F0A035E" />
+    <public type="id" name="close" id="0x7F0A035F" />
+    <public type="id" name="close_button" id="0x7F0A0360" />
+    <public type="id" name="cloudy" id="0x7F0A0361" />
+    <public type="id" name="collapseActionView" id="0x7F0A0362" />
+    <public type="id" name="collapsing_toolbar" id="0x7F0A0363" />
+    <public type="id" name="column" id="0x7F0A0364" />
+    <public type="id" name="column_reverse" id="0x7F0A0365" />
+    <public type="id" name="command_bottom_sheet_command_avatar" id="0x7F0A0366" />
+    <public type="id" name="command_bottom_sheet_command_content" id="0x7F0A0367" />
+    <public type="id" name="command_bottom_sheet_command_copy_button" id="0x7F0A0368" />
+    <public type="id" name="command_bottom_sheet_command_loader" id="0x7F0A0369" />
+    <public type="id" name="command_bottom_sheet_command_slash_heading" id="0x7F0A036A" />
+    <public type="id" name="command_bottom_sheet_command_title" id="0x7F0A036B" />
+    <public type="id" name="command_bottom_sheet_command_title_application_name" id="0x7F0A036C" />
+    <public type="id" name="command_category_item_icon" id="0x7F0A036D" />
+    <public type="id" name="community_first_step_scroll" id="0x7F0A036E" />
+    <public type="id" name="community_get_started_header" id="0x7F0A036F" />
+    <public type="id" name="community_get_started_header_icon" id="0x7F0A0370" />
+    <public type="id" name="community_get_started_header_icon_text" id="0x7F0A0371" />
+    <public type="id" name="community_get_started_header_image" id="0x7F0A0372" />
+    <public type="id" name="community_get_started_scroll" id="0x7F0A0373" />
+    <public type="id" name="community_guideline" id="0x7F0A0374" />
+    <public type="id" name="community_guidelines_channel" id="0x7F0A0375" />
+    <public type="id" name="community_header_image" id="0x7F0A0376" />
+    <public type="id" name="community_list_adapter_item_description" id="0x7F0A0377" />
+    <public type="id" name="community_list_adapter_item_icon" id="0x7F0A0378" />
+    <public type="id" name="community_list_adapter_item_text_header" id="0x7F0A0379" />
+    <public type="id" name="community_list_adapter_item_text_icon" id="0x7F0A037A" />
+    <public type="id" name="community_list_adapter_item_text_name" id="0x7F0A037B" />
+    <public type="id" name="community_rules_channel" id="0x7F0A037C" />
+    <public type="id" name="community_setting_community_guidelines_switch" id="0x7F0A037D" />
+    <public type="id" name="community_setting_get_started" id="0x7F0A037E" />
+    <public type="id" name="community_setting_guidelines" id="0x7F0A037F" />
+    <public type="id" name="community_setting_manage_permissions_switch" id="0x7F0A0380" />
+    <public type="id" name="community_setting_notifications_to_mentions_switch" id="0x7F0A0381" />
+    <public type="id" name="community_settings_scan_messages_switch" id="0x7F0A0382" />
+    <public type="id" name="community_settings_verified_emailed_switch" id="0x7F0A0383" />
+    <public type="id" name="community_step_header" id="0x7F0A0384" />
+    <public type="id" name="community_updates_channel" id="0x7F0A0385" />
+    <public type="id" name="compression_toggle" id="0x7F0A0386" />
+    <public type="id" name="compression_toggle_subtext" id="0x7F0A0387" />
+    <public type="id" name="confirm" id="0x7F0A0388" />
+    <public type="id" name="confirm_button" id="0x7F0A0389" />
+    <public type="id" name="confirm_deleting_community_body_text" id="0x7F0A038A" />
+    <public type="id" name="confirm_deleting_community_cancel" id="0x7F0A038B" />
+    <public type="id" name="confirm_deleting_community_header" id="0x7F0A038C" />
+    <public type="id" name="confirm_deleting_community_header_container" id="0x7F0A038D" />
+    <public type="id" name="confirm_deleting_community_ok" id="0x7F0A038E" />
+    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7F0A038F" />
+    <public type="id" name="connected_account_actions_dialog_header" id="0x7F0A0390" />
+    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7F0A0391" />
+    <public type="id" name="connected_account_disconnect" id="0x7F0A0392" />
+    <public type="id" name="connected_account_divider" id="0x7F0A0393" />
+    <public type="id" name="connected_account_img" id="0x7F0A0394" />
+    <public type="id" name="connected_account_name" id="0x7F0A0395" />
+    <public type="id" name="connections" id="0x7F0A0396" />
+    <public type="id" name="connections_empty" id="0x7F0A0397" />
+    <public type="id" name="connections_recycler" id="0x7F0A0398" />
+    <public type="id" name="connections_xbox_code" id="0x7F0A0399" />
+    <public type="id" name="connections_xbox_login" id="0x7F0A039A" />
+    <public type="id" name="contact" id="0x7F0A039B" />
+    <public type="id" name="contact_sync_add_phone" id="0x7F0A039C" />
+    <public type="id" name="contact_sync_add_phone_input" id="0x7F0A039D" />
+    <public type="id" name="contact_sync_add_phone_next" id="0x7F0A039E" />
+    <public type="id" name="contact_sync_add_phone_subtitle" id="0x7F0A039F" />
+    <public type="id" name="contact_sync_add_phone_title" id="0x7F0A03A0" />
+    <public type="id" name="contact_sync_discovery_info_1" id="0x7F0A03A1" />
+    <public type="id" name="contact_sync_discovery_info_2" id="0x7F0A03A2" />
+    <public type="id" name="contact_sync_discovery_toggle" id="0x7F0A03A3" />
+    <public type="id" name="contact_sync_friend_suggestions" id="0x7F0A03A4" />
+    <public type="id" name="contact_sync_friend_suggestions_empty" id="0x7F0A03A5" />
+    <public type="id" name="contact_sync_landing" id="0x7F0A03A6" />
+    <public type="id" name="contact_sync_landing_cta" id="0x7F0A03A7" />
+    <public type="id" name="contact_sync_landing_needs_permissions" id="0x7F0A03A8" />
+    <public type="id" name="contact_sync_landing_next_button" id="0x7F0A03A9" />
+    <public type="id" name="contact_sync_landing_permissions_divider" id="0x7F0A03AA" />
+    <public type="id" name="contact_sync_landing_subtitle" id="0x7F0A03AB" />
+    <public type="id" name="contact_sync_landing_title" id="0x7F0A03AC" />
+    <public type="id" name="contact_sync_landing_toggle_info" id="0x7F0A03AD" />
+    <public type="id" name="contact_sync_name" id="0x7F0A03AE" />
+    <public type="id" name="contact_sync_name_input" id="0x7F0A03AF" />
+    <public type="id" name="contact_sync_name_input_wrap" id="0x7F0A03B0" />
+    <public type="id" name="contact_sync_name_next_button" id="0x7F0A03B1" />
+    <public type="id" name="contact_sync_name_prefill_hint" id="0x7F0A03B2" />
+    <public type="id" name="contact_sync_name_subtitle" id="0x7F0A03B3" />
+    <public type="id" name="contact_sync_name_title" id="0x7F0A03B4" />
+    <public type="id" name="contact_sync_permissions_discoverable_toggle" id="0x7F0A03B5" />
+    <public type="id" name="contact_sync_permissions_discovery_info_1" id="0x7F0A03B6" />
+    <public type="id" name="contact_sync_permissions_discovery_info_2" id="0x7F0A03B7" />
+    <public type="id" name="contact_sync_permissions_email_toggle" id="0x7F0A03B8" />
+    <public type="id" name="contact_sync_permissions_learn_more" id="0x7F0A03B9" />
+    <public type="id" name="contact_sync_permissions_phone_toggle" id="0x7F0A03BA" />
+    <public type="id" name="contact_sync_permissions_subtitle" id="0x7F0A03BB" />
+    <public type="id" name="contact_sync_setting_email" id="0x7F0A03BC" />
+    <public type="id" name="contact_sync_setting_enabled" id="0x7F0A03BD" />
+    <public type="id" name="contact_sync_setting_info" id="0x7F0A03BE" />
+    <public type="id" name="contact_sync_setting_phone" id="0x7F0A03BF" />
+    <public type="id" name="contact_sync_setting_staff_only" id="0x7F0A03C0" />
+    <public type="id" name="contact_sync_suggestions_empty_subtitle" id="0x7F0A03C1" />
+    <public type="id" name="contact_sync_suggestions_empty_title" id="0x7F0A03C2" />
+    <public type="id" name="contact_sync_suggestions_invite_button" id="0x7F0A03C3" />
+    <public type="id" name="contact_sync_suggestions_list_recycler" id="0x7F0A03C4" />
+    <public type="id" name="contact_sync_suggestions_skip_button" id="0x7F0A03C5" />
+    <public type="id" name="contact_sync_suggestions_submit_button" id="0x7F0A03C6" />
+    <public type="id" name="contact_sync_suggestions_subtitle" id="0x7F0A03C7" />
+    <public type="id" name="contact_sync_suggestions_title" id="0x7F0A03C8" />
+    <public type="id" name="contact_sync_upsell_cta" id="0x7F0A03C9" />
+    <public type="id" name="contact_sync_upsell_next_button" id="0x7F0A03CA" />
+    <public type="id" name="contact_sync_upsell_skip_button" id="0x7F0A03CB" />
+    <public type="id" name="contact_sync_upsell_subtitle" id="0x7F0A03CC" />
+    <public type="id" name="contact_sync_upsell_title" id="0x7F0A03CD" />
+    <public type="id" name="contact_sync_upsell_toggle_info" id="0x7F0A03CE" />
+    <public type="id" name="contact_sync_verify_phone" id="0x7F0A03CF" />
+    <public type="id" name="contact_sync_verify_phone_code" id="0x7F0A03D0" />
+    <public type="id" name="contact_sync_verify_phone_subtitle" id="0x7F0A03D1" />
+    <public type="id" name="contact_sync_verify_phone_title" id="0x7F0A03D2" />
+    <public type="id" name="contact_sync_view_flipper" id="0x7F0A03D3" />
+    <public type="id" name="container" id="0x7F0A03D4" />
+    <public type="id" name="content" id="0x7F0A03D5" />
+    <public type="id" name="contentPanel" id="0x7F0A03D6" />
+    <public type="id" name="content_background" id="0x7F0A03D7" />
+    <public type="id" name="content_container" id="0x7F0A03D8" />
+    <public type="id" name="content_iv" id="0x7F0A03D9" />
+    <public type="id" name="content_pager" id="0x7F0A03DA" />
+    <public type="id" name="content_tabs" id="0x7F0A03DB" />
+    <public type="id" name="contiguous" id="0x7F0A03DC" />
+    <public type="id" name="continue_button" id="0x7F0A03DD" />
+    <public type="id" name="controls_shadow" id="0x7F0A03DE" />
+    <public type="id" name="controls_wrapper" id="0x7F0A03DF" />
+    <public type="id" name="coordinator" id="0x7F0A03E0" />
+    <public type="id" name="copy_link_group" id="0x7F0A03E1" />
+    <public type="id" name="copy_link_icon" id="0x7F0A03E2" />
+    <public type="id" name="copy_link_icon_barrier" id="0x7F0A03E3" />
+    <public type="id" name="copy_link_subtitle" id="0x7F0A03E4" />
+    <public type="id" name="copy_link_title" id="0x7F0A03E5" />
+    <public type="id" name="cos" id="0x7F0A03E6" />
+    <public type="id" name="counter_text_1" id="0x7F0A03E7" />
+    <public type="id" name="counter_text_2" id="0x7F0A03E8" />
+    <public type="id" name="counter_text_switcher" id="0x7F0A03E9" />
+    <public type="id" name="counterclockwise" id="0x7F0A03EA" />
+    <public type="id" name="cpv_color_image_view" id="0x7F0A03EB" />
+    <public type="id" name="cpv_color_panel_new" id="0x7F0A03EC" />
+    <public type="id" name="cpv_color_panel_old" id="0x7F0A03ED" />
+    <public type="id" name="cpv_color_panel_view" id="0x7F0A03EE" />
+    <public type="id" name="cpv_color_picker_content" id="0x7F0A03EF" />
+    <public type="id" name="cpv_color_picker_custom_button" id="0x7F0A03F0" />
+    <public type="id" name="cpv_color_picker_custom_reset" id="0x7F0A03F1" />
+    <public type="id" name="cpv_color_picker_select_button" id="0x7F0A03F2" />
+    <public type="id" name="cpv_color_picker_title" id="0x7F0A03F3" />
+    <public type="id" name="cpv_color_picker_view" id="0x7F0A03F4" />
+    <public type="id" name="cpv_hex" id="0x7F0A03F5" />
+    <public type="id" name="cpv_hex_container" id="0x7F0A03F6" />
+    <public type="id" name="cpv_hex_prefix" id="0x7F0A03F7" />
+    <public type="id" name="cpv_preference_preview_color_panel" id="0x7F0A03F8" />
+    <public type="id" name="create_channel_announcements_container" id="0x7F0A03F9" />
+    <public type="id" name="create_channel_announcements_icon" id="0x7F0A03FA" />
+    <public type="id" name="create_channel_announcements_radio" id="0x7F0A03FB" />
+    <public type="id" name="create_channel_announcements_title" id="0x7F0A03FC" />
+    <public type="id" name="create_channel_follower_button" id="0x7F0A03FD" />
+    <public type="id" name="create_channel_name_layout" id="0x7F0A03FE" />
+    <public type="id" name="create_channel_private_container" id="0x7F0A03FF" />
+    <public type="id" name="create_channel_private_info" id="0x7F0A0400" />
+    <public type="id" name="create_channel_private_switch" id="0x7F0A0401" />
+    <public type="id" name="create_channel_private_title" id="0x7F0A0402" />
+    <public type="id" name="create_channel_role_access_recycler" id="0x7F0A0403" />
+    <public type="id" name="create_channel_role_divider" id="0x7F0A0404" />
+    <public type="id" name="create_channel_role_header" id="0x7F0A0405" />
+    <public type="id" name="create_channel_stage_container" id="0x7F0A0406" />
+    <public type="id" name="create_channel_stage_icon" id="0x7F0A0407" />
+    <public type="id" name="create_channel_stage_radio" id="0x7F0A0408" />
+    <public type="id" name="create_channel_stage_title" id="0x7F0A0409" />
+    <public type="id" name="create_channel_text_container" id="0x7F0A040A" />
+    <public type="id" name="create_channel_text_icon" id="0x7F0A040B" />
+    <public type="id" name="create_channel_text_radio" id="0x7F0A040C" />
+    <public type="id" name="create_channel_text_title" id="0x7F0A040D" />
+    <public type="id" name="create_channel_type_container" id="0x7F0A040E" />
+    <public type="id" name="create_channel_voice_container" id="0x7F0A040F" />
+    <public type="id" name="create_channel_voice_icon" id="0x7F0A0410" />
+    <public type="id" name="create_channel_voice_radio" id="0x7F0A0411" />
+    <public type="id" name="create_channel_voice_title" id="0x7F0A0412" />
+    <public type="id" name="creation_intent_first_option" id="0x7F0A0413" />
+    <public type="id" name="creation_intent_first_option_text" id="0x7F0A0414" />
+    <public type="id" name="creation_intent_second_option" id="0x7F0A0415" />
+    <public type="id" name="creation_intent_second_option_text" id="0x7F0A0416" />
+    <public type="id" name="creation_intent_skip_text" id="0x7F0A0417" />
+    <public type="id" name="credit_header" id="0x7F0A0418" />
+    <public type="id" name="credit_icon" id="0x7F0A0419" />
+    <public type="id" name="credit_info" id="0x7F0A041A" />
+    <public type="id" name="credit_info_container" id="0x7F0A041B" />
+    <public type="id" name="credit_nitro" id="0x7F0A041C" />
+    <public type="id" name="credit_nitro_classic" id="0x7F0A041D" />
+    <public type="id" name="credit_nitro_divider" id="0x7F0A041E" />
+    <public type="id" name="credit_time" id="0x7F0A041F" />
+    <public type="id" name="crown" id="0x7F0A0420" />
+    <public type="id" name="cs_subtitle" id="0x7F0A0421" />
+    <public type="id" name="current_bitrate_display" id="0x7F0A0422" />
+    <public type="id" name="current_user_limit_display" id="0x7F0A0423" />
+    <public type="id" name="custom" id="0x7F0A0424" />
+    <public type="id" name="customPanel" id="0x7F0A0425" />
+    <public type="id" name="cut" id="0x7F0A0426" />
+    <public type="id" name="dark" id="0x7F0A0427" />
+    <public type="id" name="date" id="0x7F0A0428" />
+    <public type="id" name="date_picker_actions" id="0x7F0A0429" />
+    <public type="id" name="daylight" id="0x7F0A042A" />
+    <public type="id" name="deafen_secondary_button" id="0x7F0A042B" />
+    <public type="id" name="debugging_logs" id="0x7F0A042C" />
+    <public type="id" name="decelerate" id="0x7F0A042D" />
+    <public type="id" name="decelerateAndComplete" id="0x7F0A042E" />
+    <public type="id" name="decor_content_parent" id="0x7F0A042F" />
+    <public type="id" name="default_activity_button" id="0x7F0A0430" />
+    <public type="id" name="default_tooltip_text" id="0x7F0A0431" />
+    <public type="id" name="default_window_insets_handler" id="0x7F0A0432" />
+    <public type="id" name="deltaRelative" id="0x7F0A0433" />
+    <public type="id" name="demote_common_words" id="0x7F0A0434" />
+    <public type="id" name="demote_rfc822_hostnames" id="0x7F0A0435" />
+    <public type="id" name="dependency_ordering" id="0x7F0A0436" />
+    <public type="id" name="description" id="0x7F0A0437" />
+    <public type="id" name="description_placeholder" id="0x7F0A0438" />
+    <public type="id" name="description_placeholder_end_guideline" id="0x7F0A0439" />
+    <public type="id" name="design_bottom_sheet" id="0x7F0A043A" />
+    <public type="id" name="design_menu_item_action_area" id="0x7F0A043B" />
+    <public type="id" name="design_menu_item_action_area_stub" id="0x7F0A043C" />
+    <public type="id" name="design_menu_item_text" id="0x7F0A043D" />
+    <public type="id" name="design_navigation_view" id="0x7F0A043E" />
+    <public type="id" name="developer_options" id="0x7F0A043F" />
+    <public type="id" name="developer_options_divider" id="0x7F0A0440" />
+    <public type="id" name="developer_options_header" id="0x7F0A0441" />
+    <public type="id" name="developer_settings_crash_discord_jnibridge" id="0x7F0A0442" />
+    <public type="id" name="developer_settings_crash_discord_nonfatal" id="0x7F0A0443" />
+    <public type="id" name="developer_settings_crash_kotlin" id="0x7F0A0444" />
+    <public type="id" name="developer_settings_experiments" id="0x7F0A0445" />
+    <public type="id" name="developer_settings_notices" id="0x7F0A0446" />
+    <public type="id" name="developer_settings_simulate_gateway_reconnect" id="0x7F0A0447" />
+    <public type="id" name="deviceDefault" id="0x7F0A0448" />
+    <public type="id" name="dialog_button" id="0x7F0A0449" />
+    <public type="id" name="dialog_cancel" id="0x7F0A044A" />
+    <public type="id" name="dialog_card" id="0x7F0A044B" />
+    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7F0A044C" />
+    <public type="id" name="dialog_chat_actions_container" id="0x7F0A044D" />
+    <public type="id" name="dialog_chat_actions_copy" id="0x7F0A044E" />
+    <public type="id" name="dialog_chat_actions_copy_id" id="0x7F0A044F" />
+    <public type="id" name="dialog_chat_actions_delete" id="0x7F0A0450" />
+    <public type="id" name="dialog_chat_actions_edit" id="0x7F0A0451" />
+    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7F0A0452" />
+    <public type="id" name="dialog_chat_actions_mark_unread" id="0x7F0A0453" />
+    <public type="id" name="dialog_chat_actions_pin" id="0x7F0A0454" />
+    <public type="id" name="dialog_chat_actions_profile" id="0x7F0A0455" />
+    <public type="id" name="dialog_chat_actions_publish" id="0x7F0A0456" />
+    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7F0A0457" />
+    <public type="id" name="dialog_chat_actions_reply" id="0x7F0A0458" />
+    <public type="id" name="dialog_chat_actions_report" id="0x7F0A0459" />
+    <public type="id" name="dialog_chat_actions_resend" id="0x7F0A045A" />
+    <public type="id" name="dialog_chat_actions_share" id="0x7F0A045B" />
+    <public type="id" name="dialog_chat_actions_start_thread" id="0x7F0A045C" />
+    <public type="id" name="dialog_date_picker_done" id="0x7F0A045D" />
+    <public type="id" name="dialog_date_picker_input" id="0x7F0A045E" />
+    <public type="id" name="dialog_date_picker_title" id="0x7F0A045F" />
+    <public type="id" name="dialog_delete" id="0x7F0A0460" />
+    <public type="id" name="dialog_save" id="0x7F0A0461" />
+    <public type="id" name="dialog_selections" id="0x7F0A0462" />
+    <public type="id" name="dialog_title" id="0x7F0A0463" />
+    <public type="id" name="dialog_url_actions_copy" id="0x7F0A0464" />
+    <public type="id" name="dialog_url_actions_open" id="0x7F0A0465" />
+    <public type="id" name="dialog_url_actions_share" id="0x7F0A0466" />
+    <public type="id" name="dialog_url_actions_url" id="0x7F0A0467" />
+    <public type="id" name="dimensions" id="0x7F0A0468" />
+    <public type="id" name="dimmer_view" id="0x7F0A0469" />
+    <public type="id" name="direct" id="0x7F0A046A" />
+    <public type="id" name="directory_channel_icon" id="0x7F0A046B" />
+    <public type="id" name="directory_channel_name" id="0x7F0A046C" />
+    <public type="id" name="disableHome" id="0x7F0A046D" />
+    <public type="id" name="disablePostScroll" id="0x7F0A046E" />
+    <public type="id" name="disableScroll" id="0x7F0A046F" />
+    <public type="id" name="disable_delete_body" id="0x7F0A0470" />
+    <public type="id" name="disable_delete_cancel" id="0x7F0A0471" />
+    <public type="id" name="disable_delete_code_wrap" id="0x7F0A0472" />
+    <public type="id" name="disable_delete_confirm" id="0x7F0A0473" />
+    <public type="id" name="disable_delete_header" id="0x7F0A0474" />
+    <public type="id" name="disable_delete_password_wrap" id="0x7F0A0475" />
+    <public type="id" name="disconnect_btn" id="0x7F0A0476" />
+    <public type="id" name="disconnect_button" id="0x7F0A0477" />
+    <public type="id" name="discovery_control_audio_icon" id="0x7F0A0478" />
+    <public type="id" name="discovery_control_exit_quietly" id="0x7F0A0479" />
+    <public type="id" name="discovery_control_joined_as" id="0x7F0A047A" />
+    <public type="id" name="discovery_control_open_stage" id="0x7F0A047B" />
+    <public type="id" name="discovery_empty_state" id="0x7F0A047C" />
+    <public type="id" name="discovery_empty_state_header" id="0x7F0A047D" />
+    <public type="id" name="discovery_empty_state_subheader" id="0x7F0A047E" />
+    <public type="id" name="discovery_empty_state_wumpus" id="0x7F0A047F" />
+    <public type="id" name="discovery_intro_card_dismiss" id="0x7F0A0480" />
+    <public type="id" name="discovery_intro_card_subtitle" id="0x7F0A0481" />
+    <public type="id" name="discovery_intro_card_title" id="0x7F0A0482" />
+    <public type="id" name="discovery_recycler" id="0x7F0A0483" />
+    <public type="id" name="discovery_speakers_recycler" id="0x7F0A0484" />
+    <public type="id" name="discovery_stage_card" id="0x7F0A0485" />
+    <public type="id" name="discovery_stage_card_body_view" id="0x7F0A0486" />
+    <public type="id" name="discovery_stage_card_controls" id="0x7F0A0487" />
+    <public type="id" name="discovery_stage_card_error" id="0x7F0A0488" />
+    <public type="id" name="discovery_stage_card_speaker_avatar" id="0x7F0A0489" />
+    <public type="id" name="discovery_stage_card_speaker_name" id="0x7F0A048A" />
+    <public type="id" name="discovery_stage_card_top_hat" id="0x7F0A048B" />
+    <public type="id" name="discovery_stage_card_top_hat_icon" id="0x7F0A048C" />
+    <public type="id" name="discovery_stage_card_top_hat_text" id="0x7F0A048D" />
+    <public type="id" name="discovery_start_stage" id="0x7F0A048E" />
+    <public type="id" name="discovery_title" id="0x7F0A048F" />
+    <public type="id" name="disjoint" id="0x7F0A0490" />
+    <public type="id" name="display_activity_switch" id="0x7F0A0491" />
+    <public type="id" name="display_name" id="0x7F0A0492" />
+    <public type="id" name="display_switch" id="0x7F0A0493" />
+    <public type="id" name="divider" id="0x7F0A0494" />
+    <public type="id" name="divider_stroke" id="0x7F0A0495" />
+    <public type="id" name="divider_stroke_left" id="0x7F0A0496" />
+    <public type="id" name="divider_stroke_right" id="0x7F0A0497" />
+    <public type="id" name="divider_text" id="0x7F0A0498" />
+    <public type="id" name="dng" id="0x7F0A0499" />
+    <public type="id" name="dragDown" id="0x7F0A049A" />
+    <public type="id" name="dragEnd" id="0x7F0A049B" />
+    <public type="id" name="dragLeft" id="0x7F0A049C" />
+    <public type="id" name="dragRight" id="0x7F0A049D" />
+    <public type="id" name="dragStart" id="0x7F0A049E" />
+    <public type="id" name="dragUp" id="0x7F0A049F" />
+    <public type="id" name="draw3x3" id="0x7F0A04A0" />
+    <public type="id" name="draw4x4" id="0x7F0A04A1" />
+    <public type="id" name="drawPhi" id="0x7F0A04A2" />
+    <public type="id" name="dropdown_menu" id="0x7F0A04A3" />
+    <public type="id" name="dtddd" id="0x7F0A04A4" />
+    <public type="id" name="easeIn" id="0x7F0A04A5" />
+    <public type="id" name="easeInOut" id="0x7F0A04A6" />
+    <public type="id" name="easeOut" id="0x7F0A04A7" />
+    <public type="id" name="edit_account_discriminator_wrap" id="0x7F0A04A8" />
+    <public type="id" name="edit_account_email_wrap" id="0x7F0A04A9" />
+    <public type="id" name="edit_account_name_wrap" id="0x7F0A04AA" />
+    <public type="id" name="edit_account_password_wrap" id="0x7F0A04AB" />
+    <public type="id" name="edit_account_tag_layout_container" id="0x7F0A04AC" />
+    <public type="id" name="edit_account_username_wrap" id="0x7F0A04AD" />
+    <public type="id" name="edit_guild_folder_name" id="0x7F0A04AE" />
+    <public type="id" name="edit_integration_custom_emotes_container" id="0x7F0A04AF" />
+    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7F0A04B0" />
+    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7F0A04B1" />
+    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7F0A04B2" />
+    <public type="id" name="edit_integration_expired_sub_container" id="0x7F0A04B3" />
+    <public type="id" name="edit_integration_grace_period_container" id="0x7F0A04B4" />
+    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7F0A04B5" />
+    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7F0A04B6" />
+    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7F0A04B7" />
+    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7F0A04B8" />
+    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7F0A04B9" />
+    <public type="id" name="edit_integration_icon" id="0x7F0A04BA" />
+    <public type="id" name="edit_integration_last_sync_time" id="0x7F0A04BB" />
+    <public type="id" name="edit_integration_name" id="0x7F0A04BC" />
+    <public type="id" name="edit_integration_name_container" id="0x7F0A04BD" />
+    <public type="id" name="edit_integration_owner_name" id="0x7F0A04BE" />
+    <public type="id" name="edit_integration_save" id="0x7F0A04BF" />
+    <public type="id" name="edit_integration_settings_scroll" id="0x7F0A04C0" />
+    <public type="id" name="edit_integration_subscriber_count" id="0x7F0A04C1" />
+    <public type="id" name="edit_integration_sync_container" id="0x7F0A04C2" />
+    <public type="id" name="edit_integration_synced_role" id="0x7F0A04C3" />
+    <public type="id" name="edit_integration_synced_role_container" id="0x7F0A04C4" />
+    <public type="id" name="edit_member_administrative_container" id="0x7F0A04C5" />
+    <public type="id" name="edit_member_ban_button" id="0x7F0A04C6" />
+    <public type="id" name="edit_member_kick_button" id="0x7F0A04C7" />
+    <public type="id" name="edit_member_nickname" id="0x7F0A04C8" />
+    <public type="id" name="edit_member_roles_container" id="0x7F0A04C9" />
+    <public type="id" name="edit_member_roles_recycler" id="0x7F0A04CA" />
+    <public type="id" name="edit_member_save" id="0x7F0A04CB" />
+    <public type="id" name="edit_member_transfer_ownership_button" id="0x7F0A04CC" />
+    <public type="id" name="edit_query" id="0x7F0A04CD" />
+    <public type="id" name="edit_role_name" id="0x7F0A04CE" />
+    <public type="id" name="edit_role_save" id="0x7F0A04CF" />
+    <public type="id" name="elastic" id="0x7F0A04D0" />
+    <public type="id" name="email" id="0x7F0A04D1" />
+    <public type="id" name="embed_image_container" id="0x7F0A04D2" />
+    <public type="id" name="embed_inline_media" id="0x7F0A04D3" />
+    <public type="id" name="emoji" id="0x7F0A04D4" />
+    <public type="id" name="emojiPickerPremiumCta" id="0x7F0A04D5" />
+    <public type="id" name="emoji_app_bar" id="0x7F0A04D6" />
+    <public type="id" name="emoji_category_item_guild_icon" id="0x7F0A04D7" />
+    <public type="id" name="emoji_category_item_standard_icon" id="0x7F0A04D8" />
+    <public type="id" name="emoji_info_tv" id="0x7F0A04D9" />
+    <public type="id" name="emoji_inline_search_button" id="0x7F0A04DA" />
+    <public type="id" name="emoji_item_draweeview" id="0x7F0A04DB" />
+    <public type="id" name="emoji_iv" id="0x7F0A04DC" />
+    <public type="id" name="emoji_picker_backspace_icon" id="0x7F0A04DD" />
+    <public type="id" name="emoji_picker_bottom_bar" id="0x7F0A04DE" />
+    <public type="id" name="emoji_picker_bottom_bar_divider" id="0x7F0A04DF" />
+    <public type="id" name="emoji_picker_category_barrier" id="0x7F0A04E0" />
+    <public type="id" name="emoji_picker_category_recycler" id="0x7F0A04E1" />
+    <public type="id" name="emoji_picker_container" id="0x7F0A04E2" />
+    <public type="id" name="emoji_picker_unicode_emoji_shortcut_button" id="0x7F0A04E3" />
+    <public type="id" name="emoji_search_bar" id="0x7F0A04E4" />
+    <public type="id" name="emoji_search_clear" id="0x7F0A04E5" />
+    <public type="id" name="emoji_search_input" id="0x7F0A04E6" />
+    <public type="id" name="emoji_sheet_emoji_picker_content" id="0x7F0A04E7" />
+    <public type="id" name="emoji_sheet_flipper" id="0x7F0A04E8" />
+    <public type="id" name="emoji_text_view" id="0x7F0A04E9" />
+    <public type="id" name="emoji_toolbar" id="0x7F0A04EA" />
+    <public type="id" name="empty" id="0x7F0A04EB" />
+    <public type="id" name="empty_friends_state_add_friend" id="0x7F0A04EC" />
+    <public type="id" name="empty_friends_state_cs_button" id="0x7F0A04ED" />
+    <public type="id" name="empty_friends_state_cs_image" id="0x7F0A04EE" />
+    <public type="id" name="empty_friends_state_cs_title" id="0x7F0A04EF" />
+    <public type="id" name="empty_friends_state_image" id="0x7F0A04F0" />
+    <public type="id" name="empty_friends_state_title" id="0x7F0A04F1" />
+    <public type="id" name="empty_results" id="0x7F0A04F2" />
+    <public type="id" name="empty_state_body" id="0x7F0A04F3" />
+    <public type="id" name="empty_state_img" id="0x7F0A04F4" />
+    <public type="id" name="empty_state_invite_link" id="0x7F0A04F5" />
+    <public type="id" name="empty_state_link_options" id="0x7F0A04F6" />
+    <public type="id" name="empty_state_scroller" id="0x7F0A04F7" />
+    <public type="id" name="empty_state_settings_subtext" id="0x7F0A04F8" />
+    <public type="id" name="empty_state_share_btn" id="0x7F0A04F9" />
+    <public type="id" name="empty_state_title" id="0x7F0A04FA" />
+    <public type="id" name="empty_view" id="0x7F0A04FB" />
+    <public type="id" name="enable_button" id="0x7F0A04FC" />
+    <public type="id" name="enable_community_stepsview" id="0x7F0A04FD" />
+    <public type="id" name="enable_mfa_key_code" id="0x7F0A04FE" />
+    <public type="id" name="enable_mfa_key_launch_authy" id="0x7F0A04FF" />
+    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7F0A0500" />
+    <public type="id" name="enable_mfa_stepsview" id="0x7F0A0501" />
+    <public type="id" name="enable_sms_backup_body" id="0x7F0A0502" />
+    <public type="id" name="enable_sms_backup_cancel" id="0x7F0A0503" />
+    <public type="id" name="enable_sms_backup_confirm" id="0x7F0A0504" />
+    <public type="id" name="enable_sms_backup_header" id="0x7F0A0505" />
+    <public type="id" name="enable_sms_backup_password_wrap" id="0x7F0A0506" />
+    <public type="id" name="enable_two_factor_password_body_container" id="0x7F0A0507" />
+    <public type="id" name="enable_two_factor_password_body_text" id="0x7F0A0508" />
+    <public type="id" name="enable_two_factor_password_cancel" id="0x7F0A0509" />
+    <public type="id" name="enable_two_factor_password_header" id="0x7F0A050A" />
+    <public type="id" name="enable_two_factor_password_header_container" id="0x7F0A050B" />
+    <public type="id" name="enable_two_factor_password_ok" id="0x7F0A050C" />
+    <public type="id" name="enable_two_factor_password_view_input" id="0x7F0A050D" />
+    <public type="id" name="end" id="0x7F0A050E" />
+    <public type="id" name="endToStart" id="0x7F0A050F" />
+    <public type="id" name="end_padder" id="0x7F0A0510" />
+    <public type="id" name="enterAlways" id="0x7F0A0511" />
+    <public type="id" name="enterAlwaysCollapsed" id="0x7F0A0512" />
+    <public type="id" name="exitUntilCollapsed" id="0x7F0A0513" />
+    <public type="id" name="exo_ad_overlay" id="0x7F0A0514" />
+    <public type="id" name="exo_artwork" id="0x7F0A0515" />
+    <public type="id" name="exo_audio_track" id="0x7F0A0516" />
+    <public type="id" name="exo_basic_controls" id="0x7F0A0517" />
+    <public type="id" name="exo_bottom_bar" id="0x7F0A0518" />
+    <public type="id" name="exo_buffering" id="0x7F0A0519" />
+    <public type="id" name="exo_center_controls" id="0x7F0A051A" />
+    <public type="id" name="exo_check" id="0x7F0A051B" />
+    <public type="id" name="exo_content_frame" id="0x7F0A051C" />
+    <public type="id" name="exo_controller" id="0x7F0A051D" />
+    <public type="id" name="exo_controller_placeholder" id="0x7F0A051E" />
+    <public type="id" name="exo_controls_background" id="0x7F0A051F" />
+    <public type="id" name="exo_duration" id="0x7F0A0520" />
+    <public type="id" name="exo_error_message" id="0x7F0A0521" />
+    <public type="id" name="exo_extra_controls" id="0x7F0A0522" />
+    <public type="id" name="exo_extra_controls_scroll_view" id="0x7F0A0523" />
+    <public type="id" name="exo_ffwd" id="0x7F0A0524" />
+    <public type="id" name="exo_ffwd_with_amount" id="0x7F0A0525" />
+    <public type="id" name="exo_fullscreen" id="0x7F0A0526" />
+    <public type="id" name="exo_icon" id="0x7F0A0527" />
+    <public type="id" name="exo_main_text" id="0x7F0A0528" />
+    <public type="id" name="exo_minimal_controls" id="0x7F0A0529" />
+    <public type="id" name="exo_minimal_fullscreen" id="0x7F0A052A" />
+    <public type="id" name="exo_next" id="0x7F0A052B" />
+    <public type="id" name="exo_overflow_hide" id="0x7F0A052C" />
+    <public type="id" name="exo_overflow_show" id="0x7F0A052D" />
+    <public type="id" name="exo_overlay" id="0x7F0A052E" />
+    <public type="id" name="exo_pause" id="0x7F0A052F" />
+    <public type="id" name="exo_play" id="0x7F0A0530" />
+    <public type="id" name="exo_play_pause" id="0x7F0A0531" />
+    <public type="id" name="exo_playback_speed" id="0x7F0A0532" />
+    <public type="id" name="exo_position" id="0x7F0A0533" />
+    <public type="id" name="exo_prev" id="0x7F0A0534" />
+    <public type="id" name="exo_progress" id="0x7F0A0535" />
+    <public type="id" name="exo_progress_placeholder" id="0x7F0A0536" />
+    <public type="id" name="exo_repeat_toggle" id="0x7F0A0537" />
+    <public type="id" name="exo_rew" id="0x7F0A0538" />
+    <public type="id" name="exo_rew_with_amount" id="0x7F0A0539" />
+    <public type="id" name="exo_settings" id="0x7F0A053A" />
+    <public type="id" name="exo_settings_listview" id="0x7F0A053B" />
+    <public type="id" name="exo_shuffle" id="0x7F0A053C" />
+    <public type="id" name="exo_shutter" id="0x7F0A053D" />
+    <public type="id" name="exo_sub_text" id="0x7F0A053E" />
+    <public type="id" name="exo_subtitle" id="0x7F0A053F" />
+    <public type="id" name="exo_subtitles" id="0x7F0A0540" />
+    <public type="id" name="exo_text" id="0x7F0A0541" />
+    <public type="id" name="exo_time" id="0x7F0A0542" />
+    <public type="id" name="exo_track_selection_view" id="0x7F0A0543" />
+    <public type="id" name="exo_vr" id="0x7F0A0544" />
+    <public type="id" name="expand_activities_button" id="0x7F0A0545" />
+    <public type="id" name="expand_btn" id="0x7F0A0546" />
+    <public type="id" name="expanded_menu" id="0x7F0A0547" />
+    <public type="id" name="experiment_override_bucket_descriptions" id="0x7F0A0548" />
+    <public type="id" name="experiment_override_buckets_spinner" id="0x7F0A0549" />
+    <public type="id" name="experiment_override_buckets_spinner_container" id="0x7F0A054A" />
+    <public type="id" name="experiment_override_clear" id="0x7F0A054B" />
+    <public type="id" name="experiment_override_experiment_api_name" id="0x7F0A054C" />
+    <public type="id" name="experiment_override_experiment_name" id="0x7F0A054D" />
+    <public type="id" name="experiment_overrides_list_item_experiment_override_view" id="0x7F0A054E" />
+    <public type="id" name="exposureCorrection" id="0x7F0A054F" />
+    <public type="id" name="expression_btn" id="0x7F0A0550" />
+    <public type="id" name="expression_btn_badge" id="0x7F0A0551" />
+    <public type="id" name="expression_btn_container" id="0x7F0A0552" />
+    <public type="id" name="expression_picker_category_selection_overline" id="0x7F0A0553" />
+    <public type="id" name="expression_tray_container" id="0x7F0A0554" />
+    <public type="id" name="expression_tray_content_container" id="0x7F0A0555" />
+    <public type="id" name="expression_tray_detail_page" id="0x7F0A0556" />
+    <public type="id" name="expression_tray_emoji_card" id="0x7F0A0557" />
+    <public type="id" name="expression_tray_emoji_picker_content" id="0x7F0A0558" />
+    <public type="id" name="expression_tray_gif_card" id="0x7F0A0559" />
+    <public type="id" name="expression_tray_gif_picker_content" id="0x7F0A055A" />
+    <public type="id" name="expression_tray_landing_page" id="0x7F0A055B" />
+    <public type="id" name="expression_tray_search_bar" id="0x7F0A055C" />
+    <public type="id" name="expression_tray_search_button" id="0x7F0A055D" />
+    <public type="id" name="expression_tray_search_icon" id="0x7F0A055E" />
+    <public type="id" name="expression_tray_segmented_control" id="0x7F0A055F" />
+    <public type="id" name="expression_tray_sticker_card" id="0x7F0A0560" />
+    <public type="id" name="expression_tray_sticker_picker_content" id="0x7F0A0561" />
+    <public type="id" name="expression_tray_toolbar" id="0x7F0A0562" />
+    <public type="id" name="expression_tray_toolbar_layout" id="0x7F0A0563" />
+    <public type="id" name="external_share_activity_action_preview" id="0x7F0A0564" />
+    <public type="id" name="external_share_comment" id="0x7F0A0565" />
+    <public type="id" name="external_share_list" id="0x7F0A0566" />
+    <public type="id" name="external_share_list_wrap" id="0x7F0A0567" />
+    <public type="id" name="external_share_search" id="0x7F0A0568" />
+    <public type="id" name="external_share_search_results" id="0x7F0A0569" />
+    <public type="id" name="extra_info" id="0x7F0A056A" />
+    <public type="id" name="fab_menu_add_category" id="0x7F0A056B" />
+    <public type="id" name="fab_menu_add_text" id="0x7F0A056C" />
+    <public type="id" name="fab_menu_add_voice" id="0x7F0A056D" />
+    <public type="id" name="fab_menu_main" id="0x7F0A056E" />
+    <public type="id" name="fab_menu_main_fab" id="0x7F0A056F" />
+    <public type="id" name="fab_menu_table" id="0x7F0A0570" />
+    <public type="id" name="fade" id="0x7F0A0571" />
+    <public type="id" name="failed_alert_icon" id="0x7F0A0572" />
+    <public type="id" name="fatal_crash_app_version" id="0x7F0A0573" />
+    <public type="id" name="fatal_crash_details" id="0x7F0A0574" />
+    <public type="id" name="fatal_crash_device" id="0x7F0A0575" />
+    <public type="id" name="fatal_crash_os_version" id="0x7F0A0576" />
+    <public type="id" name="fatal_crash_source" id="0x7F0A0577" />
+    <public type="id" name="fatal_crash_testers_invite" id="0x7F0A0578" />
+    <public type="id" name="fatal_crash_time" id="0x7F0A0579" />
+    <public type="id" name="favorite_add_button" id="0x7F0A057A" />
+    <public type="id" name="favorite_container" id="0x7F0A057B" />
+    <public type="id" name="favorite_remove_button" id="0x7F0A057C" />
+    <public type="id" name="feedback_happy_rating" id="0x7F0A057D" />
+    <public type="id" name="feedback_issue_section_header" id="0x7F0A057E" />
+    <public type="id" name="feedback_issues_card" id="0x7F0A057F" />
+    <public type="id" name="feedback_issues_recycler" id="0x7F0A0580" />
+    <public type="id" name="feedback_neutral_rating" id="0x7F0A0581" />
+    <public type="id" name="feedback_rating_container" id="0x7F0A0582" />
+    <public type="id" name="feedback_rating_summary_prompt" id="0x7F0A0583" />
+    <public type="id" name="feedback_sad_rating" id="0x7F0A0584" />
+    <public type="id" name="feedback_sheet_close_button" id="0x7F0A0585" />
+    <public type="id" name="feedback_sheet_container" id="0x7F0A0586" />
+    <public type="id" name="feedback_sheet_feedback_view" id="0x7F0A0587" />
+    <public type="id" name="feedback_sheet_title" id="0x7F0A0588" />
+    <public type="id" name="file_image" id="0x7F0A0589" />
+    <public type="id" name="file_name_tv" id="0x7F0A058A" />
+    <public type="id" name="file_subtitle_tv" id="0x7F0A058B" />
+    <public type="id" name="fill" id="0x7F0A058C" />
+    <public type="id" name="fill_horizontal" id="0x7F0A058D" />
+    <public type="id" name="fill_vertical" id="0x7F0A058E" />
+    <public type="id" name="filled" id="0x7F0A058F" />
+    <public type="id" name="filterControl1" id="0x7F0A0590" />
+    <public type="id" name="filterControl2" id="0x7F0A0591" />
+    <public type="id" name="fit" id="0x7F0A0592" />
+    <public type="id" name="fitBottomStart" id="0x7F0A0593" />
+    <public type="id" name="fitCenter" id="0x7F0A0594" />
+    <public type="id" name="fitEnd" id="0x7F0A0595" />
+    <public type="id" name="fitStart" id="0x7F0A0596" />
+    <public type="id" name="fitToContents" id="0x7F0A0597" />
+    <public type="id" name="fitXY" id="0x7F0A0598" />
+    <public type="id" name="fixed" id="0x7F0A0599" />
+    <public type="id" name="fixed_height" id="0x7F0A059A" />
+    <public type="id" name="fixed_width" id="0x7F0A059B" />
+    <public type="id" name="flClickShield" id="0x7F0A059C" />
+    <public type="id" name="flIconContainer" id="0x7F0A059D" />
+    <public type="id" name="flRightIconContainer" id="0x7F0A059E" />
+    <public type="id" name="flag_icon" id="0x7F0A059F" />
+    <public type="id" name="flag_icon_barrier" id="0x7F0A05A0" />
+    <public type="id" name="flex_end" id="0x7F0A05A1" />
+    <public type="id" name="flex_start" id="0x7F0A05A2" />
+    <public type="id" name="flip" id="0x7F0A05A3" />
+    <public type="id" name="flipper" id="0x7F0A05A4" />
+    <public type="id" name="floating" id="0x7F0A05A5" />
+    <public type="id" name="fluorescent" id="0x7F0A05A6" />
+    <public type="id" name="focusCrop" id="0x7F0A05A7" />
+    <public type="id" name="focusMarkerContainer" id="0x7F0A05A8" />
+    <public type="id" name="focusMarkerFill" id="0x7F0A05A9" />
+    <public type="id" name="folder_context_menu_card" id="0x7F0A05AA" />
+    <public type="id" name="folder_context_menu_header" id="0x7F0A05AB" />
+    <public type="id" name="folder_context_menu_header_divider" id="0x7F0A05AC" />
+    <public type="id" name="folder_context_menu_mark_as_read" id="0x7F0A05AD" />
+    <public type="id" name="folder_context_menu_settings" id="0x7F0A05AE" />
+    <public type="id" name="folder_view_folder_image" id="0x7F0A05AF" />
+    <public type="id" name="follow_sheet_view_flipper" id="0x7F0A05B0" />
+    <public type="id" name="forever" id="0x7F0A05B1" />
+    <public type="id" name="fragment_container_view_tag" id="0x7F0A05B2" />
+    <public type="id" name="friend_add_username_indicator" id="0x7F0A05B3" />
+    <public type="id" name="friend_container" id="0x7F0A05B4" />
+    <public type="id" name="friend_suggestion_avatar" id="0x7F0A05B5" />
+    <public type="id" name="friend_suggestion_container" id="0x7F0A05B6" />
+    <public type="id" name="friend_suggestion_discriminator" id="0x7F0A05B7" />
+    <public type="id" name="friend_suggestion_name" id="0x7F0A05B8" />
+    <public type="id" name="friend_suggestion_nickname" id="0x7F0A05B9" />
+    <public type="id" name="friend_suggestion_selected" id="0x7F0A05BA" />
+    <public type="id" name="friends_add_container" id="0x7F0A05BB" />
+    <public type="id" name="friends_add_send" id="0x7F0A05BC" />
+    <public type="id" name="friends_add_text_edit_wrap" id="0x7F0A05BD" />
+    <public type="id" name="friends_list_contact_sync_upsell_arrow" id="0x7F0A05BE" />
+    <public type="id" name="friends_list_contact_sync_upsell_container" id="0x7F0A05BF" />
+    <public type="id" name="friends_list_contact_sync_upsell_icon" id="0x7F0A05C0" />
+    <public type="id" name="friends_list_contact_sync_upsell_subtitle" id="0x7F0A05C1" />
+    <public type="id" name="friends_list_contact_sync_upsell_title" id="0x7F0A05C2" />
+    <public type="id" name="friends_list_empty_friends_state_cs_view" id="0x7F0A05C3" />
+    <public type="id" name="friends_list_empty_friends_state_view" id="0x7F0A05C4" />
+    <public type="id" name="friends_list_expandable_header_button" id="0x7F0A05C5" />
+    <public type="id" name="friends_list_flipper" id="0x7F0A05C6" />
+    <public type="id" name="friends_list_item_accept_button" id="0x7F0A05C7" />
+    <public type="id" name="friends_list_item_activity" id="0x7F0A05C8" />
+    <public type="id" name="friends_list_item_avatar" id="0x7F0A05C9" />
+    <public type="id" name="friends_list_item_avatar_wrap" id="0x7F0A05CA" />
+    <public type="id" name="friends_list_item_buttons_wrap" id="0x7F0A05CB" />
+    <public type="id" name="friends_list_item_call_button" id="0x7F0A05CC" />
+    <public type="id" name="friends_list_item_chat_button" id="0x7F0A05CD" />
+    <public type="id" name="friends_list_item_decline_button" id="0x7F0A05CE" />
+    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7F0A05CF" />
+    <public type="id" name="friends_list_item_game" id="0x7F0A05D0" />
+    <public type="id" name="friends_list_item_header_text" id="0x7F0A05D1" />
+    <public type="id" name="friends_list_item_name" id="0x7F0A05D2" />
+    <public type="id" name="friends_list_item_status" id="0x7F0A05D3" />
+    <public type="id" name="friends_list_item_text" id="0x7F0A05D4" />
+    <public type="id" name="friends_list_loading" id="0x7F0A05D5" />
+    <public type="id" name="friends_list_pending_item_header_text" id="0x7F0A05D6" />
+    <public type="id" name="friends_list_recycler" id="0x7F0A05D7" />
+    <public type="id" name="front" id="0x7F0A05D8" />
+    <public type="id" name="gallery_btn" id="0x7F0A05D9" />
+    <public type="id" name="get_premium_button" id="0x7F0A05DA" />
+    <public type="id" name="ghost_view" id="0x7F0A05DB" />
+    <public type="id" name="ghost_view_holder" id="0x7F0A05DC" />
+    <public type="id" name="gif_category_container" id="0x7F0A05DD" />
+    <public type="id" name="gif_category_gif_recycler" id="0x7F0A05DE" />
+    <public type="id" name="gif_category_item_icon" id="0x7F0A05DF" />
+    <public type="id" name="gif_category_item_preview" id="0x7F0A05E0" />
+    <public type="id" name="gif_category_item_title" id="0x7F0A05E1" />
+    <public type="id" name="gif_category_loading_view" id="0x7F0A05E2" />
+    <public type="id" name="gif_category_title" id="0x7F0A05E3" />
+    <public type="id" name="gif_item_image" id="0x7F0A05E4" />
+    <public type="id" name="gif_picker_category_recycler" id="0x7F0A05E5" />
+    <public type="id" name="gif_picker_container" id="0x7F0A05E6" />
+    <public type="id" name="gif_picker_loading_view" id="0x7F0A05E7" />
+    <public type="id" name="gif_search_app_bar" id="0x7F0A05E8" />
+    <public type="id" name="gif_search_gif_recycler" id="0x7F0A05E9" />
+    <public type="id" name="gif_search_loading_view" id="0x7F0A05EA" />
+    <public type="id" name="gif_search_sheet_content" id="0x7F0A05EB" />
+    <public type="id" name="gif_search_suggested_terms_container" id="0x7F0A05EC" />
+    <public type="id" name="gif_search_suggested_terms_flex_box" id="0x7F0A05ED" />
+    <public type="id" name="gif_search_suggested_terms_icon_text" id="0x7F0A05EE" />
+    <public type="id" name="gif_search_toolbar" id="0x7F0A05EF" />
+    <public type="id" name="gif_search_view_flipper" id="0x7F0A05F0" />
+    <public type="id" name="giftPromoButton" id="0x7F0A05F1" />
+    <public type="id" name="giftPromoDescription" id="0x7F0A05F2" />
+    <public type="id" name="giftPromoImage" id="0x7F0A05F3" />
+    <public type="id" name="giftPromoMoreDetails" id="0x7F0A05F4" />
+    <public type="id" name="giftPromoTitle" id="0x7F0A05F5" />
+    <public type="id" name="gift_btn" id="0x7F0A05F6" />
+    <public type="id" name="gift_entitlement_code" id="0x7F0A05F7" />
+    <public type="id" name="gift_entitlement_code_container" id="0x7F0A05F8" />
+    <public type="id" name="gift_entitlement_container" id="0x7F0A05F9" />
+    <public type="id" name="gift_entitlement_copy" id="0x7F0A05FA" />
+    <public type="id" name="gift_entitlement_divider" id="0x7F0A05FB" />
+    <public type="id" name="gift_entitlement_flipper" id="0x7F0A05FC" />
+    <public type="id" name="gift_entitlement_generate" id="0x7F0A05FD" />
+    <public type="id" name="gift_entitlement_revoke" id="0x7F0A05FE" />
+    <public type="id" name="gift_link_subtext" id="0x7F0A05FF" />
+    <public type="id" name="gift_purchased_dialog_confirm" id="0x7F0A0600" />
+    <public type="id" name="gift_purchased_dialog_subtext" id="0x7F0A0601" />
+    <public type="id" name="gift_purchased_icon" id="0x7F0A0602" />
+    <public type="id" name="gift_select_premium_tier_1_month" id="0x7F0A0603" />
+    <public type="id" name="gift_select_premium_tier_1_year" id="0x7F0A0604" />
+    <public type="id" name="gift_select_premium_tier_2_month" id="0x7F0A0605" />
+    <public type="id" name="gift_select_premium_tier_2_year" id="0x7F0A0606" />
+    <public type="id" name="gift_sku_arrow" id="0x7F0A0607" />
+    <public type="id" name="gift_sku_copies" id="0x7F0A0608" />
+    <public type="id" name="gift_sku_icon" id="0x7F0A0609" />
+    <public type="id" name="gift_sku_name" id="0x7F0A060A" />
+    <public type="id" name="glSurface" id="0x7F0A060B" />
+    <public type="id" name="gl_surface_view" id="0x7F0A060C" />
+    <public type="id" name="global_search_add_a_friend_btn" id="0x7F0A060D" />
+    <public type="id" name="global_search_bar" id="0x7F0A060E" />
+    <public type="id" name="global_search_bar_text" id="0x7F0A060F" />
+    <public type="id" name="global_search_guild_list" id="0x7F0A0610" />
+    <public type="id" name="global_search_join_guild_btn" id="0x7F0A0611" />
+    <public type="id" name="global_search_recycler" id="0x7F0A0612" />
+    <public type="id" name="global_search_view_flipper" id="0x7F0A0613" />
+    <public type="id" name="gone" id="0x7F0A0614" />
+    <public type="id" name="graph" id="0x7F0A0615" />
+    <public type="id" name="graph_wrap" id="0x7F0A0616" />
+    <public type="id" name="gridView" id="0x7F0A0617" />
+    <public type="id" name="group_divider" id="0x7F0A0618" />
+    <public type="id" name="group_dm_notifications_mute_settings_view" id="0x7F0A0619" />
+    <public type="id" name="group_dm_settings_scroll_view" id="0x7F0A061A" />
+    <public type="id" name="group_invite_friends_chips" id="0x7F0A061B" />
+    <public type="id" name="group_invite_friends_recipients_container" id="0x7F0A061C" />
+    <public type="id" name="group_invite_friends_recycler" id="0x7F0A061D" />
+    <public type="id" name="group_invite_friends_save_fab" id="0x7F0A061E" />
+    <public type="id" name="group_invite_friends_text_to" id="0x7F0A061F" />
+    <public type="id" name="group_invite_friends_view_flipper" id="0x7F0A0620" />
+    <public type="id" name="grouping" id="0x7F0A0621" />
+    <public type="id" name="groups" id="0x7F0A0622" />
+    <public type="id" name="guard" id="0x7F0A0623" />
+    <public type="id" name="guard_member_verification" id="0x7F0A0624" />
+    <public type="id" name="guideline" id="0x7F0A0625" />
+    <public type="id" name="guildAvatarText" id="0x7F0A0626" />
+    <public type="id" name="guildAvatarWrap" id="0x7F0A0627" />
+    <public type="id" name="guild_actions_overview_header_tv" id="0x7F0A0628" />
+    <public type="id" name="guild_avatar" id="0x7F0A0629" />
+    <public type="id" name="guild_call_onboarding_connect" id="0x7F0A062A" />
+    <public type="id" name="guild_container" id="0x7F0A062B" />
+    <public type="id" name="guild_context_menu_card" id="0x7F0A062C" />
+    <public type="id" name="guild_context_menu_header" id="0x7F0A062D" />
+    <public type="id" name="guild_context_menu_header_divider" id="0x7F0A062E" />
+    <public type="id" name="guild_context_menu_leave_guild" id="0x7F0A062F" />
+    <public type="id" name="guild_context_menu_mark_as_read" id="0x7F0A0630" />
+    <public type="id" name="guild_context_menu_more_options" id="0x7F0A0631" />
+    <public type="id" name="guild_context_menu_notifications" id="0x7F0A0632" />
+    <public type="id" name="guild_create_button" id="0x7F0A0633" />
+    <public type="id" name="guild_create_flipper" id="0x7F0A0634" />
+    <public type="id" name="guild_create_guidelines" id="0x7F0A0635" />
+    <public type="id" name="guild_create_icon_uploader" id="0x7F0A0636" />
+    <public type="id" name="guild_create_name" id="0x7F0A0637" />
+    <public type="id" name="guild_create_protip" id="0x7F0A0638" />
+    <public type="id" name="guild_create_screen_title" id="0x7F0A0639" />
+    <public type="id" name="guild_folder_color_name" id="0x7F0A063A" />
+    <public type="id" name="guild_folder_settings_color" id="0x7F0A063B" />
+    <public type="id" name="guild_folder_settings_color_display" id="0x7F0A063C" />
+    <public type="id" name="guild_folder_settings_save" id="0x7F0A063D" />
+    <public type="id" name="guild_info_tv" id="0x7F0A063E" />
+    <public type="id" name="guild_invite_accept" id="0x7F0A063F" />
+    <public type="id" name="guild_invite_actions" id="0x7F0A0640" />
+    <public type="id" name="guild_invite_cancel" id="0x7F0A0641" />
+    <public type="id" name="guild_invite_channel_spinner" id="0x7F0A0642" />
+    <public type="id" name="guild_invite_empty_results" id="0x7F0A0643" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7F0A0644" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7F0A0645" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7F0A0646" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7F0A0647" />
+    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7F0A0648" />
+    <public type="id" name="guild_invite_generate_link" id="0x7F0A0649" />
+    <public type="id" name="guild_invite_info" id="0x7F0A064A" />
+    <public type="id" name="guild_invite_link" id="0x7F0A064B" />
+    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7F0A064C" />
+    <public type="id" name="guild_invite_never_expire" id="0x7F0A064D" />
+    <public type="id" name="guild_invite_settings_edit" id="0x7F0A064E" />
+    <public type="id" name="guild_invite_share_btn" id="0x7F0A064F" />
+    <public type="id" name="guild_invite_share_compact_search" id="0x7F0A0650" />
+    <public type="id" name="guild_invite_share_search" id="0x7F0A0651" />
+    <public type="id" name="guild_invite_splash" id="0x7F0A0652" />
+    <public type="id" name="guild_invite_suggestion_list" id="0x7F0A0653" />
+    <public type="id" name="guild_invite_suggestions_flipper" id="0x7F0A0654" />
+    <public type="id" name="guild_invite_temporary_membership" id="0x7F0A0655" />
+    <public type="id" name="guild_item_sparkle" id="0x7F0A0656" />
+    <public type="id" name="guild_iv" id="0x7F0A0657" />
+    <public type="id" name="guild_join_action_btn" id="0x7F0A0658" />
+    <public type="id" name="guild_join_content" id="0x7F0A0659" />
+    <public type="id" name="guild_join_invite" id="0x7F0A065A" />
+    <public type="id" name="guild_list" id="0x7F0A065B" />
+    <public type="id" name="guild_list_add_hint" id="0x7F0A065C" />
+    <public type="id" name="guild_list_unreads_stub" id="0x7F0A065D" />
+    <public type="id" name="guild_name_tv" id="0x7F0A065E" />
+    <public type="id" name="guild_notifications_channel_list" id="0x7F0A065F" />
+    <public type="id" name="guild_notifications_channel_search" id="0x7F0A0660" />
+    <public type="id" name="guild_notifications_override_list" id="0x7F0A0661" />
+    <public type="id" name="guild_profile_sheet_actions" id="0x7F0A0662" />
+    <public type="id" name="guild_profile_sheet_actions_top_barrier" id="0x7F0A0663" />
+    <public type="id" name="guild_profile_sheet_allow_dm" id="0x7F0A0664" />
+    <public type="id" name="guild_profile_sheet_banner" id="0x7F0A0665" />
+    <public type="id" name="guild_profile_sheet_boosts" id="0x7F0A0666" />
+    <public type="id" name="guild_profile_sheet_bottom_actions" id="0x7F0A0667" />
+    <public type="id" name="guild_profile_sheet_bottom_container" id="0x7F0A0668" />
+    <public type="id" name="guild_profile_sheet_change_nickname" id="0x7F0A0669" />
+    <public type="id" name="guild_profile_sheet_constraint_layout" id="0x7F0A066A" />
+    <public type="id" name="guild_profile_sheet_content_container" id="0x7F0A066B" />
+    <public type="id" name="guild_profile_sheet_content_container_bottom_divider" id="0x7F0A066C" />
+    <public type="id" name="guild_profile_sheet_copy_id" id="0x7F0A066D" />
+    <public type="id" name="guild_profile_sheet_create_category" id="0x7F0A066E" />
+    <public type="id" name="guild_profile_sheet_create_channel" id="0x7F0A066F" />
+    <public type="id" name="guild_profile_sheet_description" id="0x7F0A0670" />
+    <public type="id" name="guild_profile_sheet_developer_actions" id="0x7F0A0671" />
+    <public type="id" name="guild_profile_sheet_emoji_imageview" id="0x7F0A0672" />
+    <public type="id" name="guild_profile_sheet_emojis" id="0x7F0A0673" />
+    <public type="id" name="guild_profile_sheet_emojis_card" id="0x7F0A0674" />
+    <public type="id" name="guild_profile_sheet_emojis_count" id="0x7F0A0675" />
+    <public type="id" name="guild_profile_sheet_flipper" id="0x7F0A0676" />
+    <public type="id" name="guild_profile_sheet_guild_verified_premium_icon" id="0x7F0A0677" />
+    <public type="id" name="guild_profile_sheet_hide_muted_channels" id="0x7F0A0678" />
+    <public type="id" name="guild_profile_sheet_icon" id="0x7F0A0679" />
+    <public type="id" name="guild_profile_sheet_icon_card" id="0x7F0A067A" />
+    <public type="id" name="guild_profile_sheet_icon_name" id="0x7F0A067B" />
+    <public type="id" name="guild_profile_sheet_invite" id="0x7F0A067C" />
+    <public type="id" name="guild_profile_sheet_join_server" id="0x7F0A067D" />
+    <public type="id" name="guild_profile_sheet_leave_server" id="0x7F0A067E" />
+    <public type="id" name="guild_profile_sheet_mark_as_read" id="0x7F0A067F" />
+    <public type="id" name="guild_profile_sheet_mark_as_read_action" id="0x7F0A0680" />
+    <public type="id" name="guild_profile_sheet_member_count" id="0x7F0A0681" />
+    <public type="id" name="guild_profile_sheet_member_count_text" id="0x7F0A0682" />
+    <public type="id" name="guild_profile_sheet_name" id="0x7F0A0683" />
+    <public type="id" name="guild_profile_sheet_nickname" id="0x7F0A0684" />
+    <public type="id" name="guild_profile_sheet_notifications" id="0x7F0A0685" />
+    <public type="id" name="guild_profile_sheet_online_count" id="0x7F0A0686" />
+    <public type="id" name="guild_profile_sheet_online_count_text" id="0x7F0A0687" />
+    <public type="id" name="guild_profile_sheet_premium_upsell_dot_separator" id="0x7F0A0688" />
+    <public type="id" name="guild_profile_sheet_premium_upsell_text" id="0x7F0A0689" />
+    <public type="id" name="guild_profile_sheet_primary_actions" id="0x7F0A068A" />
+    <public type="id" name="guild_profile_sheet_secondary_actions" id="0x7F0A068B" />
+    <public type="id" name="guild_profile_sheet_settings" id="0x7F0A068C" />
+    <public type="id" name="guild_profile_sheet_tab_items" id="0x7F0A068D" />
+    <public type="id" name="guild_profile_sheet_upload_emoji" id="0x7F0A068E" />
+    <public type="id" name="guild_profile_sheet_view_server" id="0x7F0A068F" />
+    <public type="id" name="guild_region_help" id="0x7F0A0690" />
+    <public type="id" name="guild_role_item_text" id="0x7F0A0691" />
+    <public type="id" name="guild_selector_list" id="0x7F0A0692" />
+    <public type="id" name="guild_sticker_sheet_button_container" id="0x7F0A0693" />
+    <public type="id" name="guild_sticker_sheet_description" id="0x7F0A0694" />
+    <public type="id" name="guild_sticker_sheet_flipper" id="0x7F0A0695" />
+    <public type="id" name="guild_sticker_sheet_guild_container" id="0x7F0A0696" />
+    <public type="id" name="guild_sticker_sheet_guild_header" id="0x7F0A0697" />
+    <public type="id" name="guild_sticker_sheet_guild_icon" id="0x7F0A0698" />
+    <public type="id" name="guild_sticker_sheet_guild_icon_text" id="0x7F0A0699" />
+    <public type="id" name="guild_sticker_sheet_guild_icon_wrapper" id="0x7F0A069A" />
+    <public type="id" name="guild_sticker_sheet_guild_info" id="0x7F0A069B" />
+    <public type="id" name="guild_sticker_sheet_guild_name" id="0x7F0A069C" />
+    <public type="id" name="guild_sticker_sheet_join_btn" id="0x7F0A069D" />
+    <public type="id" name="guild_sticker_sheet_premium_btn" id="0x7F0A069E" />
+    <public type="id" name="guild_sticker_sheet_sticker" id="0x7F0A069F" />
+    <public type="id" name="guild_sticker_sheet_sticker_name" id="0x7F0A06A0" />
+    <public type="id" name="guild_template_channels_item_image" id="0x7F0A06A1" />
+    <public type="id" name="guild_template_channels_item_name" id="0x7F0A06A2" />
+    <public type="id" name="guild_template_channels_recycler_view" id="0x7F0A06A3" />
+    <public type="id" name="guild_template_name" id="0x7F0A06A4" />
+    <public type="id" name="guild_template_preview_channels" id="0x7F0A06A5" />
+    <public type="id" name="guild_template_preview_roles" id="0x7F0A06A6" />
+    <public type="id" name="guild_template_preview_roles_layout" id="0x7F0A06A7" />
+    <public type="id" name="guild_text" id="0x7F0A06A8" />
+    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7F0A06A9" />
+    <public type="id" name="guild_transfer_ownership_cancel" id="0x7F0A06AA" />
+    <public type="id" name="guild_transfer_ownership_confirm" id="0x7F0A06AB" />
+    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7F0A06AC" />
+    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7F0A06AD" />
+    <public type="id" name="guild_video_at_capacity_confirm" id="0x7F0A06AE" />
+    <public type="id" name="guild_view_1" id="0x7F0A06AF" />
+    <public type="id" name="guild_view_2" id="0x7F0A06B0" />
+    <public type="id" name="guild_view_3" id="0x7F0A06B1" />
+    <public type="id" name="guild_view_4" id="0x7F0A06B2" />
+    <public type="id" name="guild_views" id="0x7F0A06B3" />
+    <public type="id" name="guild_welcome_channel" id="0x7F0A06B4" />
+    <public type="id" name="guild_welcome_channel_description" id="0x7F0A06B5" />
+    <public type="id" name="guild_welcome_channel_details" id="0x7F0A06B6" />
+    <public type="id" name="guild_welcome_channel_emoji" id="0x7F0A06B7" />
+    <public type="id" name="guild_welcome_channel_hash" id="0x7F0A06B8" />
+    <public type="id" name="guild_welcome_channel_icon" id="0x7F0A06B9" />
+    <public type="id" name="guild_welcome_channel_name" id="0x7F0A06BA" />
+    <public type="id" name="guild_welcome_channel_text" id="0x7F0A06BB" />
+    <public type="id" name="guild_welcome_channel_unicode_emoji" id="0x7F0A06BC" />
+    <public type="id" name="guild_welcome_sheet_channels" id="0x7F0A06BD" />
+    <public type="id" name="guild_welcome_sheet_description" id="0x7F0A06BE" />
+    <public type="id" name="guild_welcome_sheet_flipper" id="0x7F0A06BF" />
+    <public type="id" name="guild_welcome_sheet_icon" id="0x7F0A06C0" />
+    <public type="id" name="guild_welcome_sheet_icon_card" id="0x7F0A06C1" />
+    <public type="id" name="guild_welcome_sheet_icon_name" id="0x7F0A06C2" />
+    <public type="id" name="guild_welcome_sheet_name" id="0x7F0A06C3" />
+    <public type="id" name="guilds_item_application_status" id="0x7F0A06C4" />
+    <public type="id" name="guilds_item_application_stream" id="0x7F0A06C5" />
+    <public type="id" name="guilds_item_avatar" id="0x7F0A06C6" />
+    <public type="id" name="guilds_item_avatar_text" id="0x7F0A06C7" />
+    <public type="id" name="guilds_item_avatar_wrap" id="0x7F0A06C8" />
+    <public type="id" name="guilds_item_dm_avatar" id="0x7F0A06C9" />
+    <public type="id" name="guilds_item_dm_count" id="0x7F0A06CA" />
+    <public type="id" name="guilds_item_folder" id="0x7F0A06CB" />
+    <public type="id" name="guilds_item_folder_container" id="0x7F0A06CC" />
+    <public type="id" name="guilds_item_highlight" id="0x7F0A06CD" />
+    <public type="id" name="guilds_item_mentions" id="0x7F0A06CE" />
+    <public type="id" name="guilds_item_profile_avatar" id="0x7F0A06CF" />
+    <public type="id" name="guilds_item_profile_avatar_wrap" id="0x7F0A06D0" />
+    <public type="id" name="guilds_item_profile_selected" id="0x7F0A06D1" />
+    <public type="id" name="guilds_item_selected" id="0x7F0A06D2" />
+    <public type="id" name="guilds_item_unread" id="0x7F0A06D3" />
+    <public type="id" name="guilds_item_voice" id="0x7F0A06D4" />
+    <public type="id" name="h263" id="0x7F0A06D5" />
+    <public type="id" name="h264" id="0x7F0A06D6" />
+    <public type="id" name="handle" id="0x7F0A06D7" />
+    <public type="id" name="hardware" id="0x7F0A06D8" />
+    <public type="id" name="heAac" id="0x7F0A06D9" />
+    <public type="id" name="header" id="0x7F0A06DA" />
+    <public type="id" name="header_item_text" id="0x7F0A06DB" />
+    <public type="id" name="header_name" id="0x7F0A06DC" />
+    <public type="id" name="header_title" id="0x7F0A06DD" />
+    <public type="id" name="hideable" id="0x7F0A06DE" />
+    <public type="id" name="home" id="0x7F0A06DF" />
+    <public type="id" name="homeAsUp" id="0x7F0A06E0" />
+    <public type="id" name="home_panel_center_channel_less" id="0x7F0A06E1" />
+    <public type="id" name="home_panel_center_channel_less_body" id="0x7F0A06E2" />
+    <public type="id" name="home_panel_center_channel_less_title" id="0x7F0A06E3" />
+    <public type="id" name="home_panel_center_nsfw" id="0x7F0A06E4" />
+    <public type="id" name="home_panel_center_nsfw_anchor_wrap" id="0x7F0A06E5" />
+    <public type="id" name="home_panel_center_nsfw_art" id="0x7F0A06E6" />
+    <public type="id" name="home_panel_center_nsfw_confirm" id="0x7F0A06E7" />
+    <public type="id" name="home_panel_center_nsfw_deny" id="0x7F0A06E8" />
+    <public type="id" name="home_panel_center_nsfw_description" id="0x7F0A06E9" />
+    <public type="id" name="home_panel_center_nsfw_title" id="0x7F0A06EA" />
+    <public type="id" name="home_toolbar_unread_count" id="0x7F0A06EB" />
+    <public type="id" name="honorRequest" id="0x7F0A06EC" />
+    <public type="id" name="html" id="0x7F0A06ED" />
+    <public type="id" name="icon" id="0x7F0A06EE" />
+    <public type="id" name="icon_frame" id="0x7F0A06EF" />
+    <public type="id" name="icon_group" id="0x7F0A06F0" />
+    <public type="id" name="icon_label" id="0x7F0A06F1" />
+    <public type="id" name="icon_only" id="0x7F0A06F2" />
+    <public type="id" name="icon_uploader_image" id="0x7F0A06F3" />
+    <public type="id" name="icon_uploader_placeholder_border" id="0x7F0A06F4" />
+    <public type="id" name="icon_uploader_placeholder_icon" id="0x7F0A06F5" />
+    <public type="id" name="icon_uploader_placeholder_text" id="0x7F0A06F6" />
+    <public type="id" name="icon_uploader_plus" id="0x7F0A06F7" />
+    <public type="id" name="icon_uri" id="0x7F0A06F8" />
+    <public type="id" name="ifRoom" id="0x7F0A06F9" />
+    <public type="id" name="ignore" id="0x7F0A06FA" />
+    <public type="id" name="ignoreRequest" id="0x7F0A06FB" />
+    <public type="id" name="image" id="0x7F0A06FC" />
+    <public type="id" name="image_bottom_guideline" id="0x7F0A06FD" />
+    <public type="id" name="image_upload_failed_cancel" id="0x7F0A06FE" />
+    <public type="id" name="image_upload_failed_compression_settings_checkbox" id="0x7F0A06FF" />
+    <public type="id" name="image_upload_failed_compression_settings_container" id="0x7F0A0700" />
+    <public type="id" name="image_upload_failed_divider" id="0x7F0A0701" />
+    <public type="id" name="image_upload_failed_nitro" id="0x7F0A0702" />
+    <public type="id" name="image_upload_failed_nitro_wrapper" id="0x7F0A0703" />
+    <public type="id" name="image_upload_failed_okay" id="0x7F0A0704" />
+    <public type="id" name="image_upload_failed_send_compress" id="0x7F0A0705" />
+    <public type="id" name="image_upload_failed_text" id="0x7F0A0706" />
+    <public type="id" name="image_view_crop" id="0x7F0A0707" />
+    <public type="id" name="image_view_logo" id="0x7F0A0708" />
+    <public type="id" name="image_view_state_aspect_ratio" id="0x7F0A0709" />
+    <public type="id" name="image_view_state_rotate" id="0x7F0A070A" />
+    <public type="id" name="image_view_state_scale" id="0x7F0A070B" />
+    <public type="id" name="incandescent" id="0x7F0A070C" />
+    <public type="id" name="incoming_call_accept_alt_container" id="0x7F0A070D" />
+    <public type="id" name="incoming_call_accept_button" id="0x7F0A070E" />
+    <public type="id" name="incoming_call_accept_video_button" id="0x7F0A070F" />
+    <public type="id" name="incoming_call_blurred_view" id="0x7F0A0710" />
+    <public type="id" name="incoming_call_decline_button" id="0x7F0A0711" />
+    <public type="id" name="incoming_call_status_container" id="0x7F0A0712" />
+    <public type="id" name="incoming_call_status_primary" id="0x7F0A0713" />
+    <public type="id" name="incoming_call_status_secondary" id="0x7F0A0714" />
+    <public type="id" name="incoming_call_top_guideline" id="0x7F0A0715" />
+    <public type="id" name="incoming_call_users_grid_view" id="0x7F0A0716" />
+    <public type="id" name="incoming_share_no_results_img" id="0x7F0A0717" />
+    <public type="id" name="incoming_share_results_flipper" id="0x7F0A0718" />
+    <public type="id" name="index_entity_types" id="0x7F0A0719" />
+    <public type="id" name="indicator" id="0x7F0A071A" />
+    <public type="id" name="indicator_accept" id="0x7F0A071B" />
+    <public type="id" name="indicator_actions" id="0x7F0A071C" />
+    <public type="id" name="indicator_content" id="0x7F0A071D" />
+    <public type="id" name="indicator_decline" id="0x7F0A071E" />
+    <public type="id" name="indicator_icon" id="0x7F0A071F" />
+    <public type="id" name="indicator_text" id="0x7F0A0720" />
+    <public type="id" name="indicators_container" id="0x7F0A0721" />
+    <public type="id" name="info" id="0x7F0A0722" />
+    <public type="id" name="inline_media_gif_indicator" id="0x7F0A0723" />
+    <public type="id" name="inline_media_image_preview" id="0x7F0A0724" />
+    <public type="id" name="inline_media_loading_indicator" id="0x7F0A0725" />
+    <public type="id" name="inline_media_play_button" id="0x7F0A0726" />
+    <public type="id" name="inline_media_player_view" id="0x7F0A0727" />
+    <public type="id" name="inline_media_volume_toggle" id="0x7F0A0728" />
+    <public type="id" name="instant_message" id="0x7F0A0729" />
+    <public type="id" name="integration_header_container" id="0x7F0A072A" />
+    <public type="id" name="integration_header_disabled_overlay" id="0x7F0A072B" />
+    <public type="id" name="integration_icon" id="0x7F0A072C" />
+    <public type="id" name="integration_name" id="0x7F0A072D" />
+    <public type="id" name="integration_name_container" id="0x7F0A072E" />
+    <public type="id" name="integration_owner_name" id="0x7F0A072F" />
+    <public type="id" name="integration_settings_icon" id="0x7F0A0730" />
+    <public type="id" name="integration_sync_switch" id="0x7F0A0731" />
+    <public type="id" name="integration_syncing_progress_bar" id="0x7F0A0732" />
+    <public type="id" name="integrations_empty_body" id="0x7F0A0733" />
+    <public type="id" name="integrations_empty_header" id="0x7F0A0734" />
+    <public type="id" name="integrations_recycler" id="0x7F0A0735" />
+    <public type="id" name="integrations_root" id="0x7F0A0736" />
+    <public type="id" name="integrations_view_flipper" id="0x7F0A0737" />
+    <public type="id" name="intent_action" id="0x7F0A0738" />
+    <public type="id" name="intent_activity" id="0x7F0A0739" />
+    <public type="id" name="intent_data" id="0x7F0A073A" />
+    <public type="id" name="intent_data_id" id="0x7F0A073B" />
+    <public type="id" name="intent_extra_data" id="0x7F0A073C" />
+    <public type="id" name="invisible" id="0x7F0A073D" />
+    <public type="id" name="invite_actions_copy" id="0x7F0A073E" />
+    <public type="id" name="invite_actions_revoke" id="0x7F0A073F" />
+    <public type="id" name="invite_actions_share" id="0x7F0A0740" />
+    <public type="id" name="invite_actions_title" id="0x7F0A0741" />
+    <public type="id" name="invite_avatar" id="0x7F0A0742" />
+    <public type="id" name="invite_avatar_small" id="0x7F0A0743" />
+    <public type="id" name="invite_avatar_small_card" id="0x7F0A0744" />
+    <public type="id" name="invite_avatar_small_wrap" id="0x7F0A0745" />
+    <public type="id" name="invite_avatar_wrap" id="0x7F0A0746" />
+    <public type="id" name="invite_button" id="0x7F0A0747" />
+    <public type="id" name="invite_channel" id="0x7F0A0748" />
+    <public type="id" name="invite_code" id="0x7F0A0749" />
+    <public type="id" name="invite_container" id="0x7F0A074A" />
+    <public type="id" name="invite_divider" id="0x7F0A074B" />
+    <public type="id" name="invite_expiration_container" id="0x7F0A074C" />
+    <public type="id" name="invite_expiration_time" id="0x7F0A074D" />
+    <public type="id" name="invite_expired_image" id="0x7F0A074E" />
+    <public type="id" name="invite_expires_label" id="0x7F0A074F" />
+    <public type="id" name="invite_list_item_avatar" id="0x7F0A0750" />
+    <public type="id" name="invite_members_online" id="0x7F0A0751" />
+    <public type="id" name="invite_members_online_wrap" id="0x7F0A0752" />
+    <public type="id" name="invite_members_total" id="0x7F0A0753" />
+    <public type="id" name="invite_members_total_wrap" id="0x7F0A0754" />
+    <public type="id" name="invite_members_wrap" id="0x7F0A0755" />
+    <public type="id" name="invite_message" id="0x7F0A0756" />
+    <public type="id" name="invite_name_container" id="0x7F0A0757" />
+    <public type="id" name="invite_secondary_button" id="0x7F0A0758" />
+    <public type="id" name="invite_settings_bottom_sheet" id="0x7F0A0759" />
+    <public type="id" name="invite_settings_button" id="0x7F0A075A" />
+    <public type="id" name="invite_settings_icon" id="0x7F0A075B" />
+    <public type="id" name="invite_suggestions_header" id="0x7F0A075C" />
+    <public type="id" name="invite_title" id="0x7F0A075D" />
+    <public type="id" name="invite_user_name" id="0x7F0A075E" />
+    <public type="id" name="invite_uses" id="0x7F0A075F" />
+    <public type="id" name="invite_uses_label" id="0x7F0A0760" />
+    <public type="id" name="inward" id="0x7F0A0761" />
+    <public type="id" name="issue_details_cx_prompt" id="0x7F0A0762" />
+    <public type="id" name="issue_details_input" id="0x7F0A0763" />
+    <public type="id" name="issue_details_submit_button" id="0x7F0A0764" />
+    <public type="id" name="italic" id="0x7F0A0765" />
+    <public type="id" name="item_avatar_wrap" id="0x7F0A0766" />
+    <public type="id" name="item_backup_code_tv" id="0x7F0A0767" />
+    <public type="id" name="item_check_indicator" id="0x7F0A0768" />
+    <public type="id" name="item_description_tv" id="0x7F0A0769" />
+    <public type="id" name="item_game_invite" id="0x7F0A076A" />
+    <public type="id" name="item_game_invite_action_btn" id="0x7F0A076B" />
+    <public type="id" name="item_game_invite_application_name_tv" id="0x7F0A076C" />
+    <public type="id" name="item_game_invite_avatar_iv" id="0x7F0A076D" />
+    <public type="id" name="item_game_invite_avatar_status_iv" id="0x7F0A076E" />
+    <public type="id" name="item_game_invite_barrier" id="0x7F0A076F" />
+    <public type="id" name="item_game_invite_cover_iv" id="0x7F0A0770" />
+    <public type="id" name="item_game_invite_header" id="0x7F0A0771" />
+    <public type="id" name="item_game_invite_recycler" id="0x7F0A0772" />
+    <public type="id" name="item_game_invite_subtext" id="0x7F0A0773" />
+    <public type="id" name="item_gift_accept_button" id="0x7F0A0774" />
+    <public type="id" name="item_gift_cannot_claim_button" id="0x7F0A0775" />
+    <public type="id" name="item_gift_details" id="0x7F0A0776" />
+    <public type="id" name="item_gift_expires" id="0x7F0A0777" />
+    <public type="id" name="item_gift_header" id="0x7F0A0778" />
+    <public type="id" name="item_gift_image" id="0x7F0A0779" />
+    <public type="id" name="item_gift_image_background" id="0x7F0A077A" />
+    <public type="id" name="item_gift_loading_button_placeholder" id="0x7F0A077B" />
+    <public type="id" name="item_gift_name" id="0x7F0A077C" />
+    <public type="id" name="item_gift_subtext" id="0x7F0A077D" />
+    <public type="id" name="item_gift_verify_button" id="0x7F0A077E" />
+    <public type="id" name="item_group_tv" id="0x7F0A077F" />
+    <public type="id" name="item_guild_template_header" id="0x7F0A0780" />
+    <public type="id" name="item_guild_template_image" id="0x7F0A0781" />
+    <public type="id" name="item_guild_template_join_button" id="0x7F0A0782" />
+    <public type="id" name="item_guild_template_name" id="0x7F0A0783" />
+    <public type="id" name="item_guild_template_subtext" id="0x7F0A0784" />
+    <public type="id" name="item_guild_welcome_header" id="0x7F0A0785" />
+    <public type="id" name="item_guild_welcome_subheader" id="0x7F0A0786" />
+    <public type="id" name="item_guild_welcome_subheader_intro" id="0x7F0A0787" />
+    <public type="id" name="item_header" id="0x7F0A0788" />
+    <public type="id" name="item_header_tv" id="0x7F0A0789" />
+    <public type="id" name="item_icon" id="0x7F0A078A" />
+    <public type="id" name="item_icon_iv" id="0x7F0A078B" />
+    <public type="id" name="item_invite_btn" id="0x7F0A078C" />
+    <public type="id" name="item_invite_channel_name" id="0x7F0A078D" />
+    <public type="id" name="item_invite_channel_topic" id="0x7F0A078E" />
+    <public type="id" name="item_invite_guild_name" id="0x7F0A078F" />
+    <public type="id" name="item_invite_header" id="0x7F0A0790" />
+    <public type="id" name="item_invite_image" id="0x7F0A0791" />
+    <public type="id" name="item_invite_image_text" id="0x7F0A0792" />
+    <public type="id" name="item_invite_join_button" id="0x7F0A0793" />
+    <public type="id" name="item_invite_joined_button" id="0x7F0A0794" />
+    <public type="id" name="item_invite_loading_button" id="0x7F0A0795" />
+    <public type="id" name="item_invite_member_container" id="0x7F0A0796" />
+    <public type="id" name="item_invite_mention_button" id="0x7F0A0797" />
+    <public type="id" name="item_invite_name" id="0x7F0A0798" />
+    <public type="id" name="item_invite_online_dot" id="0x7F0A0799" />
+    <public type="id" name="item_invite_online_text" id="0x7F0A079A" />
+    <public type="id" name="item_invite_total_member_dot" id="0x7F0A079B" />
+    <public type="id" name="item_invite_total_member_text" id="0x7F0A079C" />
+    <public type="id" name="item_listen_together_album_image" id="0x7F0A079D" />
+    <public type="id" name="item_listen_together_artist" id="0x7F0A079E" />
+    <public type="id" name="item_listen_together_container" id="0x7F0A079F" />
+    <public type="id" name="item_listen_together_header" id="0x7F0A07A0" />
+    <public type="id" name="item_listen_together_join" id="0x7F0A07A1" />
+    <public type="id" name="item_listen_together_recycler" id="0x7F0A07A2" />
+    <public type="id" name="item_listen_together_session_ended" id="0x7F0A07A3" />
+    <public type="id" name="item_listen_together_track" id="0x7F0A07A4" />
+    <public type="id" name="item_listeners_count" id="0x7F0A07A5" />
+    <public type="id" name="item_mentions_tv" id="0x7F0A07A6" />
+    <public type="id" name="item_name" id="0x7F0A07A7" />
+    <public type="id" name="item_name_tv" id="0x7F0A07A8" />
+    <public type="id" name="item_sent" id="0x7F0A07A9" />
+    <public type="id" name="item_text" id="0x7F0A07AA" />
+    <public type="id" name="item_touch_helper_previous_elevation" id="0x7F0A07AB" />
+    <public type="id" name="item_unread" id="0x7F0A07AC" />
+    <public type="id" name="item_video_indicator" id="0x7F0A07AD" />
+    <public type="id" name="ivIcon" id="0x7F0A07AE" />
+    <public type="id" name="ivRightIcon" id="0x7F0A07AF" />
+    <public type="id" name="join_audience" id="0x7F0A07B0" />
+    <public type="id" name="join_btn" id="0x7F0A07B1" />
+    <public type="id" name="join_speaker" id="0x7F0A07B2" />
+    <public type="id" name="jpeg" id="0x7F0A07B3" />
+    <public type="id" name="jumpToEnd" id="0x7F0A07B4" />
+    <public type="id" name="jumpToStart" id="0x7F0A07B5" />
+    <public type="id" name="kick_user_body" id="0x7F0A07B6" />
+    <public type="id" name="kick_user_cancel" id="0x7F0A07B7" />
+    <public type="id" name="kick_user_confirm" id="0x7F0A07B8" />
+    <public type="id" name="kick_user_reason" id="0x7F0A07B9" />
+    <public type="id" name="kick_user_title" id="0x7F0A07BA" />
+    <public type="id" name="label" id="0x7F0A07BB" />
+    <public type="id" name="labelGroup" id="0x7F0A07BC" />
+    <public type="id" name="labeled" id="0x7F0A07BD" />
+    <public type="id" name="language" id="0x7F0A07BE" />
+    <public type="id" name="large" id="0x7F0A07BF" />
+    <public type="id" name="largeLabel" id="0x7F0A07C0" />
+    <public type="id" name="large_avatar" id="0x7F0A07C1" />
+    <public type="id" name="large_avatar_barrier" id="0x7F0A07C2" />
+    <public type="id" name="large_icon_uri" id="0x7F0A07C3" />
+    <public type="id" name="launch_btn" id="0x7F0A07C4" />
+    <public type="id" name="launch_camera_btn" id="0x7F0A07C5" />
+    <public type="id" name="layout" id="0x7F0A07C6" />
+    <public type="id" name="layout_aspect_ratio" id="0x7F0A07C7" />
+    <public type="id" name="layout_rotate_wheel" id="0x7F0A07C8" />
+    <public type="id" name="layout_scale_wheel" id="0x7F0A07C9" />
+    <public type="id" name="leave_guild_cancel_btn" id="0x7F0A07CA" />
+    <public type="id" name="leave_guild_confirm_btn" id="0x7F0A07CB" />
+    <public type="id" name="leave_guild_dialog_body" id="0x7F0A07CC" />
+    <public type="id" name="leave_guild_dialog_header" id="0x7F0A07CD" />
+    <public type="id" name="left" id="0x7F0A07CE" />
+    <public type="id" name="leftToRight" id="0x7F0A07CF" />
+    <public type="id" name="left_btns_container" id="0x7F0A07D0" />
+    <public type="id" name="light" id="0x7F0A07D1" />
+    <public type="id" name="line1" id="0x7F0A07D2" />
+    <public type="id" name="line3" id="0x7F0A07D3" />
+    <public type="id" name="linear" id="0x7F0A07D4" />
+    <public type="id" name="link_icon" id="0x7F0A07D5" />
+    <public type="id" name="link_settings_barrier" id="0x7F0A07D6" />
+    <public type="id" name="list" id="0x7F0A07D7" />
+    <public type="id" name="listMode" id="0x7F0A07D8" />
+    <public type="id" name="list_item" id="0x7F0A07D9" />
+    <public type="id" name="live_now_dot" id="0x7F0A07DA" />
+    <public type="id" name="live_now_label" id="0x7F0A07DB" />
+    <public type="id" name="llAlertBackground" id="0x7F0A07DC" />
+    <public type="id" name="llButtonContainer" id="0x7F0A07DD" />
+    <public type="id" name="loading" id="0x7F0A07DE" />
+    <public type="id" name="loadingContainer" id="0x7F0A07DF" />
+    <public type="id" name="loading_button_button" id="0x7F0A07E0" />
+    <public type="id" name="loading_button_progress" id="0x7F0A07E1" />
+    <public type="id" name="loading_dots" id="0x7F0A07E2" />
+    <public type="id" name="loading_progress_bar" id="0x7F0A07E3" />
+    <public type="id" name="log_message" id="0x7F0A07E4" />
+    <public type="id" name="logo" id="0x7F0A07E5" />
+    <public type="id" name="lottie_layer_name" id="0x7F0A07E6" />
+    <public type="id" name="main_input_container" id="0x7F0A07E7" />
+    <public type="id" name="main_panel_right_rounded_container" id="0x7F0A07E8" />
+    <public type="id" name="manage_reactions_emoji_container" id="0x7F0A07E9" />
+    <public type="id" name="manage_reactions_emoji_counter" id="0x7F0A07EA" />
+    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7F0A07EB" />
+    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7F0A07EC" />
+    <public type="id" name="manage_reactions_emojis_recycler" id="0x7F0A07ED" />
+    <public type="id" name="manage_reactions_result_error_img" id="0x7F0A07EE" />
+    <public type="id" name="manage_reactions_result_error_text" id="0x7F0A07EF" />
+    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7F0A07F0" />
+    <public type="id" name="manage_reactions_result_user_avatar" id="0x7F0A07F1" />
+    <public type="id" name="manage_reactions_result_user_name" id="0x7F0A07F2" />
+    <public type="id" name="manage_reactions_results_recycler" id="0x7F0A07F3" />
+    <public type="id" name="masked" id="0x7F0A07F4" />
+    <public type="id" name="masked_links_body_text" id="0x7F0A07F5" />
+    <public type="id" name="masked_links_cancel" id="0x7F0A07F6" />
+    <public type="id" name="masked_links_confirm" id="0x7F0A07F7" />
+    <public type="id" name="masked_links_trust_domain" id="0x7F0A07F8" />
+    <public type="id" name="match_global_nicknames" id="0x7F0A07F9" />
+    <public type="id" name="material_clock_display" id="0x7F0A07FA" />
+    <public type="id" name="material_clock_face" id="0x7F0A07FB" />
+    <public type="id" name="material_clock_hand" id="0x7F0A07FC" />
+    <public type="id" name="material_clock_period_am_button" id="0x7F0A07FD" />
+    <public type="id" name="material_clock_period_pm_button" id="0x7F0A07FE" />
+    <public type="id" name="material_clock_period_toggle" id="0x7F0A07FF" />
+    <public type="id" name="material_hour_text_input" id="0x7F0A0800" />
+    <public type="id" name="material_hour_tv" id="0x7F0A0801" />
+    <public type="id" name="material_label" id="0x7F0A0802" />
+    <public type="id" name="material_minute_text_input" id="0x7F0A0803" />
+    <public type="id" name="material_minute_tv" id="0x7F0A0804" />
+    <public type="id" name="material_textinput_timepicker" id="0x7F0A0805" />
+    <public type="id" name="material_timepicker_cancel_button" id="0x7F0A0806" />
+    <public type="id" name="material_timepicker_container" id="0x7F0A0807" />
+    <public type="id" name="material_timepicker_edit_text" id="0x7F0A0808" />
+    <public type="id" name="material_timepicker_mode_button" id="0x7F0A0809" />
+    <public type="id" name="material_timepicker_ok_button" id="0x7F0A080A" />
+    <public type="id" name="material_timepicker_view" id="0x7F0A080B" />
+    <public type="id" name="material_value_index" id="0x7F0A080C" />
+    <public type="id" name="max_guilds" id="0x7F0A080D" />
+    <public type="id" name="max_message_length" id="0x7F0A080E" />
+    <public type="id" name="media_actions" id="0x7F0A080F" />
+    <public type="id" name="media_container" id="0x7F0A0810" />
+    <public type="id" name="media_controller_compat_view_tag" id="0x7F0A0811" />
+    <public type="id" name="media_image" id="0x7F0A0812" />
+    <public type="id" name="media_loading_indicator" id="0x7F0A0813" />
+    <public type="id" name="media_player_control_view" id="0x7F0A0814" />
+    <public type="id" name="media_player_view" id="0x7F0A0815" />
+    <public type="id" name="member_list_item_avatar" id="0x7F0A0816" />
+    <public type="id" name="member_list_item_container" id="0x7F0A0817" />
+    <public type="id" name="member_list_item_lock" id="0x7F0A0818" />
+    <public type="id" name="member_list_item_name" id="0x7F0A0819" />
+    <public type="id" name="member_list_item_overflow" id="0x7F0A081A" />
+    <public type="id" name="member_list_item_roles_list" id="0x7F0A081B" />
+    <public type="id" name="member_verification_avatar" id="0x7F0A081C" />
+    <public type="id" name="member_verification_banner_image" id="0x7F0A081D" />
+    <public type="id" name="member_verification_confirm" id="0x7F0A081E" />
+    <public type="id" name="member_verification_container" id="0x7F0A081F" />
+    <public type="id" name="member_verification_guild_icon" id="0x7F0A0820" />
+    <public type="id" name="member_verification_guild_name" id="0x7F0A0821" />
+    <public type="id" name="member_verification_multiple_choice_radio_group" id="0x7F0A0822" />
+    <public type="id" name="member_verification_paragraph_field" id="0x7F0A0823" />
+    <public type="id" name="member_verification_pending_img" id="0x7F0A0824" />
+    <public type="id" name="member_verification_primary_btn" id="0x7F0A0825" />
+    <public type="id" name="member_verification_rule_container" id="0x7F0A0826" />
+    <public type="id" name="member_verification_rule_description" id="0x7F0A0827" />
+    <public type="id" name="member_verification_rule_divider" id="0x7F0A0828" />
+    <public type="id" name="member_verification_rule_index" id="0x7F0A0829" />
+    <public type="id" name="member_verification_rule_root" id="0x7F0A082A" />
+    <public type="id" name="member_verification_rules_check" id="0x7F0A082B" />
+    <public type="id" name="member_verification_rules_confirm" id="0x7F0A082C" />
+    <public type="id" name="member_verification_rules_header" id="0x7F0A082D" />
+    <public type="id" name="member_verification_rules_recycler" id="0x7F0A082E" />
+    <public type="id" name="member_verification_scrollview" id="0x7F0A082F" />
+    <public type="id" name="member_verification_secondary_btn" id="0x7F0A0830" />
+    <public type="id" name="member_verification_success_card" id="0x7F0A0831" />
+    <public type="id" name="member_verification_tertiary_btn" id="0x7F0A0832" />
+    <public type="id" name="member_verification_text" id="0x7F0A0833" />
+    <public type="id" name="member_verification_text_input_field" id="0x7F0A0834" />
+    <public type="id" name="member_verification_verified_check" id="0x7F0A0835" />
+    <public type="id" name="member_verification_verify_button" id="0x7F0A0836" />
+    <public type="id" name="member_verification_verify_icon" id="0x7F0A0837" />
+    <public type="id" name="member_verification_verify_text" id="0x7F0A0838" />
+    <public type="id" name="members_container" id="0x7F0A0839" />
+    <public type="id" name="members_permission_owners_list" id="0x7F0A083A" />
+    <public type="id" name="members_recycler" id="0x7F0A083B" />
+    <public type="id" name="menu_add_connections" id="0x7F0A083C" />
+    <public type="id" name="menu_audit_log_sort_actions" id="0x7F0A083D" />
+    <public type="id" name="menu_audit_log_sort_users" id="0x7F0A083E" />
+    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7F0A083F" />
+    <public type="id" name="menu_auth_mfa_info" id="0x7F0A0840" />
+    <public type="id" name="menu_call_overlay_launcher" id="0x7F0A0841" />
+    <public type="id" name="menu_call_switch_camera" id="0x7F0A0842" />
+    <public type="id" name="menu_call_video_list" id="0x7F0A0843" />
+    <public type="id" name="menu_call_voice_settings" id="0x7F0A0844" />
+    <public type="id" name="menu_channel_settings_delete" id="0x7F0A0845" />
+    <public type="id" name="menu_channel_settings_reset" id="0x7F0A0846" />
+    <public type="id" name="menu_chat_add_friend" id="0x7F0A0847" />
+    <public type="id" name="menu_chat_search" id="0x7F0A0848" />
+    <public type="id" name="menu_chat_side_panel" id="0x7F0A0849" />
+    <public type="id" name="menu_chat_start_call" id="0x7F0A084A" />
+    <public type="id" name="menu_chat_start_group" id="0x7F0A084B" />
+    <public type="id" name="menu_chat_start_video_call" id="0x7F0A084C" />
+    <public type="id" name="menu_chat_stop_call" id="0x7F0A084D" />
+    <public type="id" name="menu_chat_thread_browser" id="0x7F0A084E" />
+    <public type="id" name="menu_code_verification_paste" id="0x7F0A084F" />
+    <public type="id" name="menu_contact_sync_skip" id="0x7F0A0850" />
+    <public type="id" name="menu_contact_sync_upsell_dismiss" id="0x7F0A0851" />
+    <public type="id" name="menu_continue" id="0x7F0A0852" />
+    <public type="id" name="menu_copy_id" id="0x7F0A0853" />
+    <public type="id" name="menu_crop" id="0x7F0A0854" />
+    <public type="id" name="menu_debugging_filter" id="0x7F0A0855" />
+    <public type="id" name="menu_edit_overwrite_delete" id="0x7F0A0856" />
+    <public type="id" name="menu_edit_role_delete" id="0x7F0A0857" />
+    <public type="id" name="menu_filter" id="0x7F0A0858" />
+    <public type="id" name="menu_friends_add_friend" id="0x7F0A0859" />
+    <public type="id" name="menu_friends_contact_sync" id="0x7F0A085A" />
+    <public type="id" name="menu_friends_start_group" id="0x7F0A085B" />
+    <public type="id" name="menu_leave_group" id="0x7F0A085C" />
+    <public type="id" name="menu_loader" id="0x7F0A085D" />
+    <public type="id" name="menu_media_browser" id="0x7F0A085E" />
+    <public type="id" name="menu_media_download" id="0x7F0A085F" />
+    <public type="id" name="menu_media_share" id="0x7F0A0860" />
+    <public type="id" name="menu_premium_guild" id="0x7F0A0861" />
+    <public type="id" name="menu_private_channel_sidebar_close" id="0x7F0A0862" />
+    <public type="id" name="menu_private_channel_sidebar_copy_id" id="0x7F0A0863" />
+    <public type="id" name="menu_private_channel_sidebar_customize_gorup" id="0x7F0A0864" />
+    <public type="id" name="menu_private_channel_sidebar_pinned_messages" id="0x7F0A0865" />
+    <public type="id" name="menu_reports_node_view_holder" id="0x7F0A0866" />
+    <public type="id" name="menu_send" id="0x7F0A0867" />
+    <public type="id" name="menu_server_settings_delete" id="0x7F0A0868" />
+    <public type="id" name="menu_server_settings_emoji_delete" id="0x7F0A0869" />
+    <public type="id" name="menu_server_settings_members_prune" id="0x7F0A086A" />
+    <public type="id" name="menu_settings_debugging" id="0x7F0A086B" />
+    <public type="id" name="menu_settings_log_out" id="0x7F0A086C" />
+    <public type="id" name="menu_settings_premium_guild_sub_cancel" id="0x7F0A086D" />
+    <public type="id" name="menu_settings_premium_guild_sub_transfer" id="0x7F0A086E" />
+    <public type="id" name="menu_settings_premium_guild_sub_uncancel" id="0x7F0A086F" />
+    <public type="id" name="menu_sort_channel" id="0x7F0A0870" />
+    <public type="id" name="menu_sort_done" id="0x7F0A0871" />
+    <public type="id" name="menu_thread_browser_create_thread" id="0x7F0A0872" />
+    <public type="id" name="menu_thread_browser_filters" id="0x7F0A0873" />
+    <public type="id" name="menu_user_mentions_filter" id="0x7F0A0874" />
+    <public type="id" name="message" id="0x7F0A0875" />
+    <public type="id" name="mfa_description_text" id="0x7F0A0876" />
+    <public type="id" name="mfa_download_body" id="0x7F0A0877" />
+    <public type="id" name="mfa_success_enable_sms" id="0x7F0A0878" />
+    <public type="id" name="middle" id="0x7F0A0879" />
+    <public type="id" name="mini" id="0x7F0A087A" />
+    <public type="id" name="mobile_reports_block_user_avatar" id="0x7F0A087B" />
+    <public type="id" name="mobile_reports_block_user_button" id="0x7F0A087C" />
+    <public type="id" name="mobile_reports_block_user_description" id="0x7F0A087D" />
+    <public type="id" name="mobile_reports_block_user_header" id="0x7F0A087E" />
+    <public type="id" name="mobile_reports_block_user_name" id="0x7F0A087F" />
+    <public type="id" name="mobile_reports_channel_preview" id="0x7F0A0880" />
+    <public type="id" name="mobile_reports_channel_preview_bottom_guideline" id="0x7F0A0881" />
+    <public type="id" name="mobile_reports_channel_preview_channel_name" id="0x7F0A0882" />
+    <public type="id" name="mobile_reports_channel_preview_end_guideline" id="0x7F0A0883" />
+    <public type="id" name="mobile_reports_channel_preview_image" id="0x7F0A0884" />
+    <public type="id" name="mobile_reports_channel_preview_stage_title" id="0x7F0A0885" />
+    <public type="id" name="mobile_reports_channel_preview_start_guideline" id="0x7F0A0886" />
+    <public type="id" name="mobile_reports_channel_preview_top_guideline" id="0x7F0A0887" />
+    <public type="id" name="mobile_reports_child" id="0x7F0A0888" />
+    <public type="id" name="mobile_reports_child_menu_title" id="0x7F0A0889" />
+    <public type="id" name="mobile_reports_message_preview" id="0x7F0A088A" />
+    <public type="id" name="mobile_reports_multiselect" id="0x7F0A088B" />
+    <public type="id" name="mobile_reports_node_block_user" id="0x7F0A088C" />
+    <public type="id" name="mobile_reports_node_bottom_button" id="0x7F0A088D" />
+    <public type="id" name="mobile_reports_node_breadcrumbs" id="0x7F0A088E" />
+    <public type="id" name="mobile_reports_node_channel_preview" id="0x7F0A088F" />
+    <public type="id" name="mobile_reports_node_child_list" id="0x7F0A0890" />
+    <public type="id" name="mobile_reports_node_header" id="0x7F0A0891" />
+    <public type="id" name="mobile_reports_node_info_box" id="0x7F0A0892" />
+    <public type="id" name="mobile_reports_node_info_text" id="0x7F0A0893" />
+    <public type="id" name="mobile_reports_node_message_preview" id="0x7F0A0894" />
+    <public type="id" name="mobile_reports_node_subheader" id="0x7F0A0895" />
+    <public type="id" name="mobile_reports_node_success_shield" id="0x7F0A0896" />
+    <public type="id" name="mobile_reports_progress_bar" id="0x7F0A0897" />
+    <public type="id" name="mono" id="0x7F0A0898" />
+    <public type="id" name="month_grid" id="0x7F0A0899" />
+    <public type="id" name="month_navigation_bar" id="0x7F0A089A" />
+    <public type="id" name="month_navigation_fragment_toggle" id="0x7F0A089B" />
+    <public type="id" name="month_navigation_next" id="0x7F0A089C" />
+    <public type="id" name="month_navigation_previous" id="0x7F0A089D" />
+    <public type="id" name="month_title" id="0x7F0A089E" />
+    <public type="id" name="more_arrow" id="0x7F0A089F" />
+    <public type="id" name="motion_base" id="0x7F0A08A0" />
+    <public type="id" name="move_to_audience_button" id="0x7F0A08A1" />
+    <public type="id" name="mtrl_anchor_parent" id="0x7F0A08A2" />
+    <public type="id" name="mtrl_calendar_day_selector_frame" id="0x7F0A08A3" />
+    <public type="id" name="mtrl_calendar_days_of_week" id="0x7F0A08A4" />
+    <public type="id" name="mtrl_calendar_frame" id="0x7F0A08A5" />
+    <public type="id" name="mtrl_calendar_main_pane" id="0x7F0A08A6" />
+    <public type="id" name="mtrl_calendar_months" id="0x7F0A08A7" />
+    <public type="id" name="mtrl_calendar_selection_frame" id="0x7F0A08A8" />
+    <public type="id" name="mtrl_calendar_text_input_frame" id="0x7F0A08A9" />
+    <public type="id" name="mtrl_calendar_year_selector_frame" id="0x7F0A08AA" />
+    <public type="id" name="mtrl_card_checked_layer_id" id="0x7F0A08AB" />
+    <public type="id" name="mtrl_child_content_container" id="0x7F0A08AC" />
+    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7F0A08AD" />
+    <public type="id" name="mtrl_motion_snapshot_view" id="0x7F0A08AE" />
+    <public type="id" name="mtrl_picker_fullscreen" id="0x7F0A08AF" />
+    <public type="id" name="mtrl_picker_header" id="0x7F0A08B0" />
+    <public type="id" name="mtrl_picker_header_selection_text" id="0x7F0A08B1" />
+    <public type="id" name="mtrl_picker_header_title_and_selection" id="0x7F0A08B2" />
+    <public type="id" name="mtrl_picker_header_toggle" id="0x7F0A08B3" />
+    <public type="id" name="mtrl_picker_text_input_date" id="0x7F0A08B4" />
+    <public type="id" name="mtrl_picker_text_input_range_end" id="0x7F0A08B5" />
+    <public type="id" name="mtrl_picker_text_input_range_start" id="0x7F0A08B6" />
+    <public type="id" name="mtrl_picker_title_text" id="0x7F0A08B7" />
+    <public type="id" name="mtrl_view_tag_bottom_padding" id="0x7F0A08B8" />
+    <public type="id" name="multiply" id="0x7F0A08B9" />
+    <public type="id" name="mute_button" id="0x7F0A08BA" />
+    <public type="id" name="mute_settings_sheet_mute_options" id="0x7F0A08BB" />
+    <public type="id" name="mute_toggle" id="0x7F0A08BC" />
+    <public type="id" name="mutual_server_1" id="0x7F0A08BD" />
+    <public type="id" name="mutual_server_2" id="0x7F0A08BE" />
+    <public type="id" name="mutual_server_3" id="0x7F0A08BF" />
+    <public type="id" name="mutual_server_4" id="0x7F0A08C0" />
+    <public type="id" name="name" id="0x7F0A08C1" />
+    <public type="id" name="name_placeholder" id="0x7F0A08C2" />
+    <public type="id" name="name_placeholder_end_guideline" id="0x7F0A08C3" />
+    <public type="id" name="name_tv" id="0x7F0A08C4" />
+    <public type="id" name="navigation_header_container" id="0x7F0A08C5" />
+    <public type="id" name="navigation_help_close" id="0x7F0A08C6" />
+    <public type="id" name="navigation_help_indicators" id="0x7F0A08C7" />
+    <public type="id" name="navigation_help_nux_pager" id="0x7F0A08C8" />
+    <public type="id" name="navigation_indicator" id="0x7F0A08C9" />
+    <public type="id" name="nearby_friends_enable" id="0x7F0A08CA" />
+    <public type="id" name="nearby_friends_learn_more" id="0x7F0A08CB" />
+    <public type="id" name="nearby_friends_recycler" id="0x7F0A08CC" />
+    <public type="id" name="nearby_friends_searching_body" id="0x7F0A08CD" />
+    <public type="id" name="nearby_friends_searching_lottie" id="0x7F0A08CE" />
+    <public type="id" name="nearby_friends_searching_title" id="0x7F0A08CF" />
+    <public type="id" name="never" id="0x7F0A08D0" />
+    <public type="id" name="nitroGiftingBadge" id="0x7F0A08D1" />
+    <public type="id" name="nitroGiftingContainer" id="0x7F0A08D2" />
+    <public type="id" name="nitro_boosting" id="0x7F0A08D3" />
+    <public type="id" name="nitro_gifting" id="0x7F0A08D4" />
+    <public type="id" name="nitro_header" id="0x7F0A08D5" />
+    <public type="id" name="nitro_settings_container" id="0x7F0A08D6" />
+    <public type="id" name="noScroll" id="0x7F0A08D7" />
+    <public type="id" name="no_bans_body" id="0x7F0A08D8" />
+    <public type="id" name="no_guilds" id="0x7F0A08D9" />
+    <public type="id" name="no_invites_body" id="0x7F0A08DA" />
+    <public type="id" name="no_invites_header" id="0x7F0A08DB" />
+    <public type="id" name="no_logs_body" id="0x7F0A08DC" />
+    <public type="id" name="no_logs_title" id="0x7F0A08DD" />
+    <public type="id" name="no_results_text" id="0x7F0A08DE" />
+    <public type="id" name="noise_cancellation_enable_button" id="0x7F0A08DF" />
+    <public type="id" name="noise_cancellation_learn_more" id="0x7F0A08E0" />
+    <public type="id" name="none" id="0x7F0A08E1" />
+    <public type="id" name="normal" id="0x7F0A08E2" />
+    <public type="id" name="not_found" id="0x7F0A08E3" />
+    <public type="id" name="notice_body_container" id="0x7F0A08E4" />
+    <public type="id" name="notice_body_text" id="0x7F0A08E5" />
+    <public type="id" name="notice_cancel" id="0x7F0A08E6" />
+    <public type="id" name="notice_crop" id="0x7F0A08E7" />
+    <public type="id" name="notice_header" id="0x7F0A08E8" />
+    <public type="id" name="notice_header_container" id="0x7F0A08E9" />
+    <public type="id" name="notice_image" id="0x7F0A08EA" />
+    <public type="id" name="notice_ok" id="0x7F0A08EB" />
+    <public type="id" name="notice_upload" id="0x7F0A08EC" />
+    <public type="id" name="notification_background" id="0x7F0A08ED" />
+    <public type="id" name="notification_main_column" id="0x7F0A08EE" />
+    <public type="id" name="notification_main_column_container" id="0x7F0A08EF" />
+    <public type="id" name="notification_mute_settings_mute_item" id="0x7F0A08F0" />
+    <public type="id" name="notification_mute_settings_mute_item_description" id="0x7F0A08F1" />
+    <public type="id" name="notification_mute_settings_mute_item_status" id="0x7F0A08F2" />
+    <public type="id" name="notification_settings_button" id="0x7F0A08F3" />
+    <public type="id" name="notification_settings_button_container" id="0x7F0A08F4" />
+    <public type="id" name="notification_settings_label" id="0x7F0A08F5" />
+    <public type="id" name="notification_settings_overrides_label" id="0x7F0A08F6" />
+    <public type="id" name="notifications" id="0x7F0A08F7" />
+    <public type="id" name="nowrap" id="0x7F0A08F8" />
+    <public type="id" name="nuf_channel_prompt_cta_button" id="0x7F0A08F9" />
+    <public type="id" name="nuf_channel_prompt_guild_icon" id="0x7F0A08FA" />
+    <public type="id" name="nuf_channel_prompt_guild_icon_name" id="0x7F0A08FB" />
+    <public type="id" name="nuf_channel_prompt_guild_name" id="0x7F0A08FC" />
+    <public type="id" name="nuf_channel_prompt_skip_button" id="0x7F0A08FD" />
+    <public type="id" name="nuf_channel_prompt_topic_wrap" id="0x7F0A08FE" />
+    <public type="id" name="numeric" id="0x7F0A08FF" />
+    <public type="id" name="nux_guild_template_action_club" id="0x7F0A0900" />
+    <public type="id" name="nux_guild_template_action_community" id="0x7F0A0901" />
+    <public type="id" name="nux_guild_template_action_create" id="0x7F0A0902" />
+    <public type="id" name="nux_guild_template_action_creator" id="0x7F0A0903" />
+    <public type="id" name="nux_guild_template_action_friend" id="0x7F0A0904" />
+    <public type="id" name="nux_guild_template_action_gaming" id="0x7F0A0905" />
+    <public type="id" name="nux_guild_template_action_join" id="0x7F0A0906" />
+    <public type="id" name="nux_guild_template_action_study" id="0x7F0A0907" />
+    <public type="id" name="nux_guild_template_section_bottom" id="0x7F0A0908" />
+    <public type="id" name="nux_guild_template_section_custom" id="0x7F0A0909" />
+    <public type="id" name="nux_guild_template_section_custom_label" id="0x7F0A090A" />
+    <public type="id" name="nux_guild_template_section_top" id="0x7F0A090B" />
+    <public type="id" name="oauth_application_deauthorize_btn" id="0x7F0A090C" />
+    <public type="id" name="oauth_application_description_label_tv" id="0x7F0A090D" />
+    <public type="id" name="oauth_application_description_tv" id="0x7F0A090E" />
+    <public type="id" name="oauth_application_icon_iv" id="0x7F0A090F" />
+    <public type="id" name="oauth_application_list_item" id="0x7F0A0910" />
+    <public type="id" name="oauth_application_name_tv" id="0x7F0A0911" />
+    <public type="id" name="oauth_application_permissions_label_tv" id="0x7F0A0912" />
+    <public type="id" name="oauth_application_permissions_rv" id="0x7F0A0913" />
+    <public type="id" name="oauth_authorize_age_notice" id="0x7F0A0914" />
+    <public type="id" name="oauth_authorize_age_notice_icon" id="0x7F0A0915" />
+    <public type="id" name="oauth_authorize_application_icon" id="0x7F0A0916" />
+    <public type="id" name="oauth_authorize_application_name" id="0x7F0A0917" />
+    <public type="id" name="oauth_authorize_card" id="0x7F0A0918" />
+    <public type="id" name="oauth_authorize_connect_label" id="0x7F0A0919" />
+    <public type="id" name="oauth_authorize_content" id="0x7F0A091A" />
+    <public type="id" name="oauth_authorize_deny" id="0x7F0A091B" />
+    <public type="id" name="oauth_authorize_grant" id="0x7F0A091C" />
+    <public type="id" name="oauth_authorize_loading" id="0x7F0A091D" />
+    <public type="id" name="oauth_authorize_loading_cancel" id="0x7F0A091E" />
+    <public type="id" name="oauth_authorize_logo" id="0x7F0A091F" />
+    <public type="id" name="oauth_authorize_not_supported" id="0x7F0A0920" />
+    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7F0A0921" />
+    <public type="id" name="oauth_authorize_permissions_list" id="0x7F0A0922" />
+    <public type="id" name="oauth_authorize_security_notice" id="0x7F0A0923" />
+    <public type="id" name="oauth_authorize_security_notice_icon" id="0x7F0A0924" />
+    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7F0A0925" />
+    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7F0A0926" />
+    <public type="id" name="oauth_authorize_user_icon" id="0x7F0A0927" />
+    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7F0A0928" />
+    <public type="id" name="oauth_token_permission_detailed_name" id="0x7F0A0929" />
+    <public type="id" name="off" id="0x7F0A092A" />
+    <public type="id" name="off_disabled_overlay" id="0x7F0A092B" />
+    <public type="id" name="omnibox_title_section" id="0x7F0A092C" />
+    <public type="id" name="omnibox_url_section" id="0x7F0A092D" />
+    <public type="id" name="on" id="0x7F0A092E" />
+    <public type="id" name="one" id="0x7F0A092F" />
+    <public type="id" name="option_always" id="0x7F0A0930" />
+    <public type="id" name="option_eight_hours" id="0x7F0A0931" />
+    <public type="id" name="option_fifteen_minutes" id="0x7F0A0932" />
+    <public type="id" name="option_one_hour" id="0x7F0A0933" />
+    <public type="id" name="option_one_week" id="0x7F0A0934" />
+    <public type="id" name="option_three_days" id="0x7F0A0935" />
+    <public type="id" name="option_twenty_four_hours" id="0x7F0A0936" />
+    <public type="id" name="other_speakers_count_text" id="0x7F0A0937" />
+    <public type="id" name="outline" id="0x7F0A0938" />
+    <public type="id" name="outward" id="0x7F0A0939" />
+    <public type="id" name="overlapping_panels" id="0x7F0A093A" />
+    <public type="id" name="overlay_bubble_iv" id="0x7F0A093B" />
+    <public type="id" name="overlay_channel_name" id="0x7F0A093C" />
+    <public type="id" name="overlay_channel_search" id="0x7F0A093D" />
+    <public type="id" name="overlay_guild_name" id="0x7F0A093E" />
+    <public type="id" name="overlay_header" id="0x7F0A093F" />
+    <public type="id" name="overlay_invite_link" id="0x7F0A0940" />
+    <public type="id" name="overlay_linked_anchor_view" id="0x7F0A0941" />
+    <public type="id" name="overlay_members_overflow_tv" id="0x7F0A0942" />
+    <public type="id" name="overlay_members_rv" id="0x7F0A0943" />
+    <public type="id" name="overlay_menu" id="0x7F0A0944" />
+    <public type="id" name="overlay_network_icon" id="0x7F0A0945" />
+    <public type="id" name="overlay_open_app" id="0x7F0A0946" />
+    <public type="id" name="overlay_switch_channels" id="0x7F0A0947" />
+    <public type="id" name="overline" id="0x7F0A0948" />
+    <public type="id" name="overview_name" id="0x7F0A0949" />
+    <public type="id" name="overview_region" id="0x7F0A094A" />
+    <public type="id" name="overview_region_flag" id="0x7F0A094B" />
+    <public type="id" name="overview_region_wrap" id="0x7F0A094C" />
+    <public type="id" name="overview_region_wrap_help" id="0x7F0A094D" />
+    <public type="id" name="packed" id="0x7F0A094E" />
+    <public type="id" name="panel_center" id="0x7F0A094F" />
+    <public type="id" name="panel_left" id="0x7F0A0950" />
+    <public type="id" name="panel_right" id="0x7F0A0951" />
+    <public type="id" name="parallax" id="0x7F0A0952" />
+    <public type="id" name="parent" id="0x7F0A0953" />
+    <public type="id" name="parentPanel" id="0x7F0A0954" />
+    <public type="id" name="parentRelative" id="0x7F0A0955" />
+    <public type="id" name="parent_matrix" id="0x7F0A0956" />
+    <public type="id" name="participant_bg_avatar" id="0x7F0A0957" />
+    <public type="id" name="participant_bg_letterbox" id="0x7F0A0958" />
+    <public type="id" name="participant_deafen_status_indicator" id="0x7F0A0959" />
+    <public type="id" name="participant_fullscreen_streamqual_container" id="0x7F0A095A" />
+    <public type="id" name="participant_fullscreen_streamqual_divider" id="0x7F0A095B" />
+    <public type="id" name="participant_fullscreen_streamqual_icon" id="0x7F0A095C" />
+    <public type="id" name="participant_fullscreen_streamqual_info" id="0x7F0A095D" />
+    <public type="id" name="participant_fullscreen_streamqual_info_container" id="0x7F0A095E" />
+    <public type="id" name="participant_fullscreen_streamqual_live_indicator" id="0x7F0A095F" />
+    <public type="id" name="participant_live_indicator" id="0x7F0A0960" />
+    <public type="id" name="participant_mute_status_indicator" id="0x7F0A0961" />
+    <public type="id" name="participant_stream_ended" id="0x7F0A0962" />
+    <public type="id" name="participant_stream_ended_img" id="0x7F0A0963" />
+    <public type="id" name="participant_stream_ended_label" id="0x7F0A0964" />
+    <public type="id" name="participant_stream_paused" id="0x7F0A0965" />
+    <public type="id" name="participant_stream_preview_image" id="0x7F0A0966" />
+    <public type="id" name="participant_stream_preview_text" id="0x7F0A0967" />
+    <public type="id" name="participant_video_label" id="0x7F0A0968" />
+    <public type="id" name="participant_video_loading_indicator" id="0x7F0A0969" />
+    <public type="id" name="participant_video_stream_renderer" id="0x7F0A096A" />
+    <public type="id" name="participant_voice_indicators" id="0x7F0A096B" />
+    <public type="id" name="participant_voice_user_view" id="0x7F0A096C" />
+    <public type="id" name="password_toggle" id="0x7F0A096D" />
+    <public type="id" name="path" id="0x7F0A096E" />
+    <public type="id" name="pathRelative" id="0x7F0A096F" />
+    <public type="id" name="payment" id="0x7F0A0970" />
+    <public type="id" name="payment_method_edit" id="0x7F0A0971" />
+    <public type="id" name="payment_method_header" id="0x7F0A0972" />
+    <public type="id" name="payment_method_summary" id="0x7F0A0973" />
+    <public type="id" name="payment_source_edit_address1" id="0x7F0A0974" />
+    <public type="id" name="payment_source_edit_address2" id="0x7F0A0975" />
+    <public type="id" name="payment_source_edit_city" id="0x7F0A0976" />
+    <public type="id" name="payment_source_edit_country" id="0x7F0A0977" />
+    <public type="id" name="payment_source_edit_default" id="0x7F0A0978" />
+    <public type="id" name="payment_source_edit_error" id="0x7F0A0979" />
+    <public type="id" name="payment_source_edit_help" id="0x7F0A097A" />
+    <public type="id" name="payment_source_edit_name" id="0x7F0A097B" />
+    <public type="id" name="payment_source_edit_postal_code" id="0x7F0A097C" />
+    <public type="id" name="payment_source_edit_state" id="0x7F0A097D" />
+    <public type="id" name="payment_source_summary" id="0x7F0A097E" />
+    <public type="id" name="payment_source_view_icon" id="0x7F0A097F" />
+    <public type="id" name="payment_source_view_icon_wrapper" id="0x7F0A0980" />
+    <public type="id" name="payment_source_view_invalid" id="0x7F0A0981" />
+    <public type="id" name="payment_source_view_premium" id="0x7F0A0982" />
+    <public type="id" name="payment_source_view_subtext" id="0x7F0A0983" />
+    <public type="id" name="payment_source_view_title" id="0x7F0A0984" />
+    <public type="id" name="pbProgress" id="0x7F0A0985" />
+    <public type="id" name="peekHeight" id="0x7F0A0986" />
+    <public type="id" name="peek_container" id="0x7F0A0987" />
+    <public type="id" name="peek_transition_bitmap" id="0x7F0A0988" />
+    <public type="id" name="pending_dialog_desc" id="0x7F0A0989" />
+    <public type="id" name="pending_dialog_title" id="0x7F0A098A" />
+    <public type="id" name="pending_login" id="0x7F0A098B" />
+    <public type="id" name="percent" id="0x7F0A098C" />
+    <public type="id" name="perk_view_content_list_item" id="0x7F0A098D" />
+    <public type="id" name="perks_level_contents_header" id="0x7F0A098E" />
+    <public type="id" name="perks_level_contents_recycler" id="0x7F0A098F" />
+    <public type="id" name="perks_level_header" id="0x7F0A0990" />
+    <public type="id" name="perks_level_header_boosts" id="0x7F0A0991" />
+    <public type="id" name="perks_level_header_boosts_container" id="0x7F0A0992" />
+    <public type="id" name="perks_level_header_text" id="0x7F0A0993" />
+    <public type="id" name="perks_level_header_unlocked" id="0x7F0A0994" />
+    <public type="id" name="perm_req_text" id="0x7F0A0995" />
+    <public type="id" name="permission_owner_view" id="0x7F0A0996" />
+    <public type="id" name="permissions_req_btn" id="0x7F0A0997" />
+    <public type="id" name="permissions_required_action_btn" id="0x7F0A0998" />
+    <public type="id" name="permissions_required_text" id="0x7F0A0999" />
+    <public type="id" name="permissions_view_stub" id="0x7F0A099A" />
+    <public type="id" name="phone" id="0x7F0A099B" />
+    <public type="id" name="phone_country_code_code" id="0x7F0A099C" />
+    <public type="id" name="phone_country_code_item" id="0x7F0A099D" />
+    <public type="id" name="phone_country_code_name" id="0x7F0A099E" />
+    <public type="id" name="phone_country_code_recycler" id="0x7F0A099F" />
+    <public type="id" name="phone_country_code_search" id="0x7F0A09A0" />
+    <public type="id" name="phone_digit_verification_view" id="0x7F0A09A1" />
+    <public type="id" name="phone_or_email_country_code_wrap" id="0x7F0A09A2" />
+    <public type="id" name="phone_or_email_main_input" id="0x7F0A09A3" />
+    <public type="id" name="phone_or_email_main_input_wrap" id="0x7F0A09A4" />
+    <public type="id" name="picture" id="0x7F0A09A5" />
+    <public type="id" name="pileItemBg" id="0x7F0A09A6" />
+    <public type="id" name="pileItemImage" id="0x7F0A09A7" />
+    <public type="id" name="pin" id="0x7F0A09A8" />
+    <public type="id" name="placeholder_group" id="0x7F0A09A9" />
+    <public type="id" name="plain" id="0x7F0A09AA" />
+    <public type="id" name="plan_item_border" id="0x7F0A09AB" />
+    <public type="id" name="plan_item_container" id="0x7F0A09AC" />
+    <public type="id" name="plan_item_current_plan" id="0x7F0A09AD" />
+    <public type="id" name="plan_item_icon" id="0x7F0A09AE" />
+    <public type="id" name="plan_item_name" id="0x7F0A09AF" />
+    <public type="id" name="plan_item_price" id="0x7F0A09B0" />
+    <public type="id" name="plus_badge" id="0x7F0A09B1" />
+    <public type="id" name="popup_attachment" id="0x7F0A09B2" />
+    <public type="id" name="popup_body" id="0x7F0A09B3" />
+    <public type="id" name="popup_close_btn" id="0x7F0A09B4" />
+    <public type="id" name="popup_icon" id="0x7F0A09B5" />
+    <public type="id" name="popup_sticker" id="0x7F0A09B6" />
+    <public type="id" name="popup_subtitle" id="0x7F0A09B7" />
+    <public type="id" name="popup_title" id="0x7F0A09B8" />
+    <public type="id" name="popup_title_wrap" id="0x7F0A09B9" />
+    <public type="id" name="position" id="0x7F0A09BA" />
+    <public type="id" name="postLayout" id="0x7F0A09BB" />
+    <public type="id" name="premium_activated_confirm" id="0x7F0A09BC" />
+    <public type="id" name="premium_activated_description" id="0x7F0A09BD" />
+    <public type="id" name="premium_activated_header_background" id="0x7F0A09BE" />
+    <public type="id" name="premium_activated_logo" id="0x7F0A09BF" />
+    <public type="id" name="premium_activated_title" id="0x7F0A09C0" />
+    <public type="id" name="premium_activated_wumpus" id="0x7F0A09C1" />
+    <public type="id" name="premium_and_premium_guild_activated_text" id="0x7F0A09C2" />
+    <public type="id" name="premium_btn" id="0x7F0A09C3" />
+    <public type="id" name="premium_guild_confirmation_avatar" id="0x7F0A09C4" />
+    <public type="id" name="premium_guild_confirmation_guild_name" id="0x7F0A09C5" />
+    <public type="id" name="premium_guild_confirmation_level_info_previous" id="0x7F0A09C6" />
+    <public type="id" name="premium_guild_confirmation_level_info_upgrade" id="0x7F0A09C7" />
+    <public type="id" name="premium_guild_confirmation_upgrade_arrow" id="0x7F0A09C8" />
+    <public type="id" name="premium_guild_subscription_activated_body1" id="0x7F0A09C9" />
+    <public type="id" name="premium_guild_subscription_activated_body2" id="0x7F0A09CA" />
+    <public type="id" name="premium_guild_subscription_activated_lottie" id="0x7F0A09CB" />
+    <public type="id" name="premium_guild_subscription_activated_ok" id="0x7F0A09CC" />
+    <public type="id" name="premium_guild_subscription_cancel_body" id="0x7F0A09CD" />
+    <public type="id" name="premium_guild_subscription_cancel_confirm" id="0x7F0A09CE" />
+    <public type="id" name="premium_guild_subscription_cancel_error" id="0x7F0A09CF" />
+    <public type="id" name="premium_guild_subscription_cancel_flipper" id="0x7F0A09D0" />
+    <public type="id" name="premium_guild_subscription_cancel_header" id="0x7F0A09D1" />
+    <public type="id" name="premium_guild_subscription_cancel_nevermind" id="0x7F0A09D2" />
+    <public type="id" name="premium_guild_subscription_uncancel_body" id="0x7F0A09D3" />
+    <public type="id" name="premium_guild_subscription_uncancel_confirm" id="0x7F0A09D4" />
+    <public type="id" name="premium_guild_subscription_uncancel_error" id="0x7F0A09D5" />
+    <public type="id" name="premium_guild_subscription_uncancel_flipper" id="0x7F0A09D6" />
+    <public type="id" name="premium_guild_subscription_uncancel_header" id="0x7F0A09D7" />
+    <public type="id" name="premium_guild_subscription_uncancel_image" id="0x7F0A09D8" />
+    <public type="id" name="premium_guild_subscription_uncancel_nevermind" id="0x7F0A09D9" />
+    <public type="id" name="premium_guild_transfer_confirmation_blurb" id="0x7F0A09DA" />
+    <public type="id" name="premium_guild_transfer_error" id="0x7F0A09DB" />
+    <public type="id" name="premium_guild_transfer_previous_guild" id="0x7F0A09DC" />
+    <public type="id" name="premium_guild_transfer_previous_guild_header" id="0x7F0A09DD" />
+    <public type="id" name="premium_guild_transfer_select" id="0x7F0A09DE" />
+    <public type="id" name="premium_guild_transfer_target_guild" id="0x7F0A09DF" />
+    <public type="id" name="premium_guild_transfer_target_guild_header" id="0x7F0A09E0" />
+    <public type="id" name="premium_perks" id="0x7F0A09E1" />
+    <public type="id" name="premium_perks_max_guilds" id="0x7F0A09E2" />
+    <public type="id" name="premium_perks_max_message_length" id="0x7F0A09E3" />
+    <public type="id" name="premium_perks_stickers" id="0x7F0A09E4" />
+    <public type="id" name="premium_perks_upload_text" id="0x7F0A09E5" />
+    <public type="id" name="premium_settings_active_guild_subscription" id="0x7F0A09E6" />
+    <public type="id" name="premium_settings_active_subscription" id="0x7F0A09E7" />
+    <public type="id" name="premium_settings_billing_divider" id="0x7F0A09E8" />
+    <public type="id" name="premium_settings_billing_information" id="0x7F0A09E9" />
+    <public type="id" name="premium_settings_credit_container" id="0x7F0A09EA" />
+    <public type="id" name="premium_settings_credit_header" id="0x7F0A09EB" />
+    <public type="id" name="premium_settings_google_play_manage" id="0x7F0A09EC" />
+    <public type="id" name="premium_settings_grandfathered" id="0x7F0A09ED" />
+    <public type="id" name="premium_settings_legalese" id="0x7F0A09EE" />
+    <public type="id" name="premium_settings_nitro" id="0x7F0A09EF" />
+    <public type="id" name="premium_settings_nitro_classic" id="0x7F0A09F0" />
+    <public type="id" name="premium_settings_nitro_classic_boost_count" id="0x7F0A09F1" />
+    <public type="id" name="premium_settings_nitro_classic_boost_discount" id="0x7F0A09F2" />
+    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7F0A09F3" />
+    <public type="id" name="premium_settings_nitro_wumpus" id="0x7F0A09F4" />
+    <public type="id" name="premium_settings_payment_container" id="0x7F0A09F5" />
+    <public type="id" name="premium_settings_payment_header" id="0x7F0A09F6" />
+    <public type="id" name="premium_settings_premium" id="0x7F0A09F7" />
+    <public type="id" name="premium_settings_premium_classic" id="0x7F0A09F8" />
+    <public type="id" name="premium_settings_retry" id="0x7F0A09F9" />
+    <public type="id" name="premium_settings_scrollview" id="0x7F0A09FA" />
+    <public type="id" name="premium_settings_status_notice_button" id="0x7F0A09FB" />
+    <public type="id" name="premium_settings_status_notice_container" id="0x7F0A09FC" />
+    <public type="id" name="premium_settings_status_notice_tv" id="0x7F0A09FD" />
+    <public type="id" name="premium_settings_subscription_container" id="0x7F0A09FE" />
+    <public type="id" name="premium_settings_subscriptions_header" id="0x7F0A09FF" />
+    <public type="id" name="premium_settings_view_flipper" id="0x7F0A0A00" />
+    <public type="id" name="premium_tier_1" id="0x7F0A0A01" />
+    <public type="id" name="premium_tier_1_gift_learn_more" id="0x7F0A0A02" />
+    <public type="id" name="premium_tier_2" id="0x7F0A0A03" />
+    <public type="id" name="premium_tier_2_gift_learn_more" id="0x7F0A0A04" />
+    <public type="id" name="premium_upsell_body" id="0x7F0A0A05" />
+    <public type="id" name="premium_upsell_button_container" id="0x7F0A0A06" />
+    <public type="id" name="premium_upsell_close" id="0x7F0A0A07" />
+    <public type="id" name="premium_upsell_description" id="0x7F0A0A08" />
+    <public type="id" name="premium_upsell_divider" id="0x7F0A0A09" />
+    <public type="id" name="premium_upsell_dots" id="0x7F0A0A0A" />
+    <public type="id" name="premium_upsell_get_premium" id="0x7F0A0A0B" />
+    <public type="id" name="premium_upsell_header" id="0x7F0A0A0C" />
+    <public type="id" name="premium_upsell_img" id="0x7F0A0A0D" />
+    <public type="id" name="premium_upsell_learn_more" id="0x7F0A0A0E" />
+    <public type="id" name="premium_upsell_server_perk" id="0x7F0A0A0F" />
+    <public type="id" name="premium_upsell_viewpager" id="0x7F0A0A10" />
+    <public type="id" name="premium_upsell_yearly_description" id="0x7F0A0A11" />
+    <public type="id" name="premium_upsell_yearly_title" id="0x7F0A0A12" />
+    <public type="id" name="preset" id="0x7F0A0A13" />
+    <public type="id" name="privacy" id="0x7F0A0A14" />
+    <public type="id" name="private_call" id="0x7F0A0A15" />
+    <public type="id" name="private_call_blurred_grid_view" id="0x7F0A0A16" />
+    <public type="id" name="private_call_connectivity_status_bar" id="0x7F0A0A17" />
+    <public type="id" name="private_call_container" id="0x7F0A0A18" />
+    <public type="id" name="private_call_container_content" id="0x7F0A0A19" />
+    <public type="id" name="private_call_grid_view" id="0x7F0A0A1A" />
+    <public type="id" name="private_call_status_duration" id="0x7F0A0A1B" />
+    <public type="id" name="private_call_status_primary" id="0x7F0A0A1C" />
+    <public type="id" name="private_call_status_secondary" id="0x7F0A0A1D" />
+    <public type="id" name="private_channel_sidebar_actions_call" id="0x7F0A0A1E" />
+    <public type="id" name="private_channel_sidebar_actions_notifications" id="0x7F0A0A1F" />
+    <public type="id" name="private_channel_sidebar_actions_search" id="0x7F0A0A20" />
+    <public type="id" name="private_channel_sidebar_actions_video" id="0x7F0A0A21" />
+    <public type="id" name="private_channel_start_image" id="0x7F0A0A22" />
+    <public type="id" name="private_channel_start_text" id="0x7F0A0A23" />
+    <public type="id" name="private_thread_toggle" id="0x7F0A0A24" />
+    <public type="id" name="profile" id="0x7F0A0A25" />
+    <public type="id" name="profile_container" id="0x7F0A0A26" />
+    <public type="id" name="progress" id="0x7F0A0A27" />
+    <public type="id" name="progress_bar" id="0x7F0A0A28" />
+    <public type="id" name="progress_cancel_centered" id="0x7F0A0A29" />
+    <public type="id" name="progress_cancel_top" id="0x7F0A0A2A" />
+    <public type="id" name="progress_circular" id="0x7F0A0A2B" />
+    <public type="id" name="progress_file_image" id="0x7F0A0A2C" />
+    <public type="id" name="progress_gem_icon" id="0x7F0A0A2D" />
+    <public type="id" name="progress_horizontal" id="0x7F0A0A2E" />
+    <public type="id" name="progress_level_text" id="0x7F0A0A2F" />
+    <public type="id" name="progress_progress" id="0x7F0A0A30" />
+    <public type="id" name="progress_subtext" id="0x7F0A0A31" />
+    <public type="id" name="progress_text" id="0x7F0A0A32" />
+    <public type="id" name="promoTermsClose" id="0x7F0A0A33" />
+    <public type="id" name="promoTermsContent" id="0x7F0A0A34" />
+    <public type="id" name="prune_user_cancel" id="0x7F0A0A35" />
+    <public type="id" name="prune_user_header" id="0x7F0A0A36" />
+    <public type="id" name="prune_user_prune" id="0x7F0A0A37" />
+    <public type="id" name="prune_users_estimate_text" id="0x7F0A0A38" />
+    <public type="id" name="prune_users_history_1_radio" id="0x7F0A0A39" />
+    <public type="id" name="prune_users_history_2_radio" id="0x7F0A0A3A" />
+    <public type="id" name="prune_users_loading_progressbar" id="0x7F0A0A3B" />
+    <public type="id" name="public_dot" id="0x7F0A0A3C" />
+    <public type="id" name="public_icon" id="0x7F0A0A3D" />
+    <public type="id" name="public_notice_confirm" id="0x7F0A0A3E" />
+    <public type="id" name="public_notice_dismiss" id="0x7F0A0A3F" />
+    <public type="id" name="public_notice_header_icon" id="0x7F0A0A40" />
+    <public type="id" name="public_notice_info_wrap" id="0x7F0A0A41" />
+    <public type="id" name="public_notice_title" id="0x7F0A0A42" />
+    <public type="id" name="public_text" id="0x7F0A0A43" />
+    <public type="id" name="purchase_premium_monthly" id="0x7F0A0A44" />
+    <public type="id" name="purchase_premium_yearly" id="0x7F0A0A45" />
+    <public type="id" name="push_to_talk_button" id="0x7F0A0A46" />
+    <public type="id" name="qr_scanner" id="0x7F0A0A47" />
+    <public type="id" name="qr_scanner_chip" id="0x7F0A0A48" />
+    <public type="id" name="radio" id="0x7F0A0A49" />
+    <public type="id" name="raise_hand_badge" id="0x7F0A0A4A" />
+    <public type="id" name="raise_hand_button" id="0x7F0A0A4B" />
+    <public type="id" name="raised_hands_count_label" id="0x7F0A0A4C" />
+    <public type="id" name="raised_hands_empty_group" id="0x7F0A0A4D" />
+    <public type="id" name="raised_hands_empty_sparkle" id="0x7F0A0A4E" />
+    <public type="id" name="raised_hands_empty_subtitle" id="0x7F0A0A4F" />
+    <public type="id" name="raised_hands_empty_title" id="0x7F0A0A50" />
+    <public type="id" name="ratio" id="0x7F0A0A51" />
+    <public type="id" name="reaction_quick_add" id="0x7F0A0A52" />
+    <public type="id" name="rectangles" id="0x7F0A0A53" />
+    <public type="id" name="recycler" id="0x7F0A0A54" />
+    <public type="id" name="recycler_view" id="0x7F0A0A55" />
+    <public type="id" name="region" id="0x7F0A0A56" />
+    <public type="id" name="region_help" id="0x7F0A0A57" />
+    <public type="id" name="region_override_divider" id="0x7F0A0A58" />
+    <public type="id" name="regular" id="0x7F0A0A59" />
+    <public type="id" name="remote_auth_cancel_button" id="0x7F0A0A5A" />
+    <public type="id" name="remote_auth_finish_button" id="0x7F0A0A5B" />
+    <public type="id" name="remote_auth_login_button" id="0x7F0A0A5C" />
+    <public type="id" name="remote_auth_not_found_cancel_button" id="0x7F0A0A5D" />
+    <public type="id" name="remote_auth_temporary_switch" id="0x7F0A0A5E" />
+    <public type="id" name="remote_auth_view_flipper" id="0x7F0A0A5F" />
+    <public type="id" name="remove" id="0x7F0A0A60" />
+    <public type="id" name="remove_phone" id="0x7F0A0A61" />
+    <public type="id" name="report_button" id="0x7F0A0A62" />
+    <public type="id" name="report_header" id="0x7F0A0A63" />
+    <public type="id" name="report_message_end_guideline" id="0x7F0A0A64" />
+    <public type="id" name="report_message_start_guideline" id="0x7F0A0A65" />
+    <public type="id" name="report_message_top_guideline" id="0x7F0A0A66" />
+    <public type="id" name="report_node_bottom_button" id="0x7F0A0A67" />
+    <public type="id" name="report_node_bottom_button_cancel" id="0x7F0A0A68" />
+    <public type="id" name="report_node_bottom_button_description" id="0x7F0A0A69" />
+    <public type="id" name="report_node_bottom_button_error_text" id="0x7F0A0A6A" />
+    <public type="id" name="report_reason_descriptipn" id="0x7F0A0A6B" />
+    <public type="id" name="report_reason_header" id="0x7F0A0A6C" />
+    <public type="id" name="report_reason_radio" id="0x7F0A0A6D" />
+    <public type="id" name="report_reasons_container" id="0x7F0A0A6E" />
+    <public type="id" name="report_reasons_header" id="0x7F0A0A6F" />
+    <public type="id" name="report_reasons_loading" id="0x7F0A0A70" />
+    <public type="id" name="report_tooltip" id="0x7F0A0A71" />
+    <public type="id" name="reports_breadcrumbs_item_dot" id="0x7F0A0A72" />
+    <public type="id" name="reports_breadcrumbs_item_title" id="0x7F0A0A73" />
+    <public type="id" name="request_data_link" id="0x7F0A0A74" />
+    <public type="id" name="restart" id="0x7F0A0A75" />
+    <public type="id" name="result_count" id="0x7F0A0A76" />
+    <public type="id" name="results_rv" id="0x7F0A0A77" />
+    <public type="id" name="reverse" id="0x7F0A0A78" />
+    <public type="id" name="reverseSawtooth" id="0x7F0A0A79" />
+    <public type="id" name="rfc822" id="0x7F0A0A7A" />
+    <public type="id" name="rich_presence_container" id="0x7F0A0A7B" />
+    <public type="id" name="rich_presence_container_data" id="0x7F0A0A7C" />
+    <public type="id" name="rich_presence_details" id="0x7F0A0A7D" />
+    <public type="id" name="rich_presence_header" id="0x7F0A0A7E" />
+    <public type="id" name="rich_presence_image_large" id="0x7F0A0A7F" />
+    <public type="id" name="rich_presence_image_large_text" id="0x7F0A0A80" />
+    <public type="id" name="rich_presence_image_large_wrap" id="0x7F0A0A81" />
+    <public type="id" name="rich_presence_image_small" id="0x7F0A0A82" />
+    <public type="id" name="rich_presence_music_duration" id="0x7F0A0A83" />
+    <public type="id" name="rich_presence_music_elapsed" id="0x7F0A0A84" />
+    <public type="id" name="rich_presence_music_progress_container" id="0x7F0A0A85" />
+    <public type="id" name="rich_presence_primary_button" id="0x7F0A0A86" />
+    <public type="id" name="rich_presence_secondary_button" id="0x7F0A0A87" />
+    <public type="id" name="rich_presence_seekbar" id="0x7F0A0A88" />
+    <public type="id" name="rich_presence_state" id="0x7F0A0A89" />
+    <public type="id" name="rich_presence_time" id="0x7F0A0A8A" />
+    <public type="id" name="rich_presence_title" id="0x7F0A0A8B" />
+    <public type="id" name="right" id="0x7F0A0A8C" />
+    <public type="id" name="rightToLeft" id="0x7F0A0A8D" />
+    <public type="id" name="right_icon" id="0x7F0A0A8E" />
+    <public type="id" name="right_side" id="0x7F0A0A8F" />
+    <public type="id" name="role_item_checked_setting" id="0x7F0A0A90" />
+    <public type="id" name="role_settings_add_reactions" id="0x7F0A0A91" />
+    <public type="id" name="role_settings_administrator" id="0x7F0A0A92" />
+    <public type="id" name="role_settings_attach_files" id="0x7F0A0A93" />
+    <public type="id" name="role_settings_ban_members" id="0x7F0A0A94" />
+    <public type="id" name="role_settings_change_nickname" id="0x7F0A0A95" />
+    <public type="id" name="role_settings_color_disabled_overlay" id="0x7F0A0A96" />
+    <public type="id" name="role_settings_color_selector_container" id="0x7F0A0A97" />
+    <public type="id" name="role_settings_create_instant_invite" id="0x7F0A0A98" />
+    <public type="id" name="role_settings_current_color_display" id="0x7F0A0A99" />
+    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7F0A0A9A" />
+    <public type="id" name="role_settings_embed_links" id="0x7F0A0A9B" />
+    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7F0A0A9C" />
+    <public type="id" name="role_settings_kick_members" id="0x7F0A0A9D" />
+    <public type="id" name="role_settings_manage_channels" id="0x7F0A0A9E" />
+    <public type="id" name="role_settings_manage_emojis" id="0x7F0A0A9F" />
+    <public type="id" name="role_settings_manage_messages" id="0x7F0A0AA0" />
+    <public type="id" name="role_settings_manage_nicknames" id="0x7F0A0AA1" />
+    <public type="id" name="role_settings_manage_roles" id="0x7F0A0AA2" />
+    <public type="id" name="role_settings_manage_server" id="0x7F0A0AA3" />
+    <public type="id" name="role_settings_manage_webhooks" id="0x7F0A0AA4" />
+    <public type="id" name="role_settings_mention_everyone" id="0x7F0A0AA5" />
+    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7F0A0AA6" />
+    <public type="id" name="role_settings_overview_scroll" id="0x7F0A0AA7" />
+    <public type="id" name="role_settings_priority_speaker" id="0x7F0A0AA8" />
+    <public type="id" name="role_settings_read_message_history" id="0x7F0A0AA9" />
+    <public type="id" name="role_settings_read_messages" id="0x7F0A0AAA" />
+    <public type="id" name="role_settings_request_to_speak" id="0x7F0A0AAB" />
+    <public type="id" name="role_settings_send_messages" id="0x7F0A0AAC" />
+    <public type="id" name="role_settings_send_tts_messages" id="0x7F0A0AAD" />
+    <public type="id" name="role_settings_use_application_commands" id="0x7F0A0AAE" />
+    <public type="id" name="role_settings_use_external_emojis" id="0x7F0A0AAF" />
+    <public type="id" name="role_settings_view_audit_log" id="0x7F0A0AB0" />
+    <public type="id" name="role_settings_view_guild_analytics" id="0x7F0A0AB1" />
+    <public type="id" name="role_settings_voice_connect" id="0x7F0A0AB2" />
+    <public type="id" name="role_settings_voice_deafen_members" id="0x7F0A0AB3" />
+    <public type="id" name="role_settings_voice_move_members" id="0x7F0A0AB4" />
+    <public type="id" name="role_settings_voice_mute_members" id="0x7F0A0AB5" />
+    <public type="id" name="role_settings_voice_speak" id="0x7F0A0AB6" />
+    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7F0A0AB7" />
+    <public type="id" name="role_settings_voice_video" id="0x7F0A0AB8" />
+    <public type="id" name="role_spinner_item_textview" id="0x7F0A0AB9" />
+    <public type="id" name="roles_container" id="0x7F0A0ABA" />
+    <public type="id" name="roles_list_add_role_fab" id="0x7F0A0ABB" />
+    <public type="id" name="roles_permission_owners_list" id="0x7F0A0ABC" />
+    <public type="id" name="roles_recycler" id="0x7F0A0ABD" />
+    <public type="id" name="root" id="0x7F0A0ABE" />
+    <public type="id" name="rotate_scroll_wheel" id="0x7F0A0ABF" />
+    <public type="id" name="rounded" id="0x7F0A0AC0" />
+    <public type="id" name="row" id="0x7F0A0AC1" />
+    <public type="id" name="row_index_key" id="0x7F0A0AC2" />
+    <public type="id" name="row_reverse" id="0x7F0A0AC3" />
+    <public type="id" name="save" id="0x7F0A0AC4" />
+    <public type="id" name="save_fab" id="0x7F0A0AC5" />
+    <public type="id" name="save_non_transition_alpha" id="0x7F0A0AC6" />
+    <public type="id" name="save_overlay_view" id="0x7F0A0AC7" />
+    <public type="id" name="sawtooth" id="0x7F0A0AC8" />
+    <public type="id" name="scale" id="0x7F0A0AC9" />
+    <public type="id" name="scale_scroll_wheel" id="0x7F0A0ACA" />
+    <public type="id" name="screen" id="0x7F0A0ACB" />
+    <public type="id" name="screen_share_button" id="0x7F0A0ACC" />
+    <public type="id" name="screen_share_nfx_cancel_button" id="0x7F0A0ACD" />
+    <public type="id" name="screen_share_nfx_cta" id="0x7F0A0ACE" />
+    <public type="id" name="screen_share_secondary_button" id="0x7F0A0ACF" />
+    <public type="id" name="screen_title" id="0x7F0A0AD0" />
+    <public type="id" name="screen_title_subtitle" id="0x7F0A0AD1" />
+    <public type="id" name="screen_title_title" id="0x7F0A0AD2" />
+    <public type="id" name="scroll" id="0x7F0A0AD3" />
+    <public type="id" name="scrollIndicatorDown" id="0x7F0A0AD4" />
+    <public type="id" name="scrollIndicatorUp" id="0x7F0A0AD5" />
+    <public type="id" name="scrollView" id="0x7F0A0AD6" />
+    <public type="id" name="scroll_view" id="0x7F0A0AD7" />
+    <public type="id" name="scrollable" id="0x7F0A0AD8" />
+    <public type="id" name="search_badge" id="0x7F0A0AD9" />
+    <public type="id" name="search_bar" id="0x7F0A0ADA" />
+    <public type="id" name="search_barrier" id="0x7F0A0ADB" />
+    <public type="id" name="search_button" id="0x7F0A0ADC" />
+    <public type="id" name="search_clear" id="0x7F0A0ADD" />
+    <public type="id" name="search_close_btn" id="0x7F0A0ADE" />
+    <public type="id" name="search_edit_frame" id="0x7F0A0ADF" />
+    <public type="id" name="search_flipper" id="0x7F0A0AE0" />
+    <public type="id" name="search_go_btn" id="0x7F0A0AE1" />
+    <public type="id" name="search_icon" id="0x7F0A0AE2" />
+    <public type="id" name="search_input" id="0x7F0A0AE3" />
+    <public type="id" name="search_input_edit_text" id="0x7F0A0AE4" />
+    <public type="id" name="search_mag_icon" id="0x7F0A0AE5" />
+    <public type="id" name="search_plate" id="0x7F0A0AE6" />
+    <public type="id" name="search_results_list" id="0x7F0A0AE7" />
+    <public type="id" name="search_send_query_fab" id="0x7F0A0AE8" />
+    <public type="id" name="search_src_text" id="0x7F0A0AE9" />
+    <public type="id" name="search_suggestion_item_channel_container" id="0x7F0A0AEA" />
+    <public type="id" name="search_suggestion_item_has_container" id="0x7F0A0AEB" />
+    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7F0A0AEC" />
+    <public type="id" name="search_suggestion_item_user_container" id="0x7F0A0AED" />
+    <public type="id" name="search_suggestions_item_channel_icon" id="0x7F0A0AEE" />
+    <public type="id" name="search_suggestions_item_channel_text" id="0x7F0A0AEF" />
+    <public type="id" name="search_suggestions_item_has_icon" id="0x7F0A0AF0" />
+    <public type="id" name="search_suggestions_item_has_text" id="0x7F0A0AF1" />
+    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7F0A0AF2" />
+    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7F0A0AF3" />
+    <public type="id" name="search_suggestions_recycler" id="0x7F0A0AF4" />
+    <public type="id" name="search_voice_btn" id="0x7F0A0AF5" />
+    <public type="id" name="secondary_actions_card" id="0x7F0A0AF6" />
+    <public type="id" name="section_general_permissions" id="0x7F0A0AF7" />
+    <public type="id" name="section_three" id="0x7F0A0AF8" />
+    <public type="id" name="seekbar" id="0x7F0A0AF9" />
+    <public type="id" name="seekbar_value" id="0x7F0A0AFA" />
+    <public type="id" name="segmented_control" id="0x7F0A0AFB" />
+    <public type="id" name="select_component_chevron" id="0x7F0A0AFC" />
+    <public type="id" name="select_component_loading" id="0x7F0A0AFD" />
+    <public type="id" name="select_component_selection_icon" id="0x7F0A0AFE" />
+    <public type="id" name="select_component_selection_text" id="0x7F0A0AFF" />
+    <public type="id" name="select_component_selections_root" id="0x7F0A0B00" />
+    <public type="id" name="select_component_sheet_item_description" id="0x7F0A0B01" />
+    <public type="id" name="select_component_sheet_item_divider" id="0x7F0A0B02" />
+    <public type="id" name="select_component_sheet_item_divider_icon" id="0x7F0A0B03" />
+    <public type="id" name="select_component_sheet_item_icon" id="0x7F0A0B04" />
+    <public type="id" name="select_component_sheet_item_selected" id="0x7F0A0B05" />
+    <public type="id" name="select_component_sheet_item_title" id="0x7F0A0B06" />
+    <public type="id" name="select_dialog_listview" id="0x7F0A0B07" />
+    <public type="id" name="select_subscription_header_text" id="0x7F0A0B08" />
+    <public type="id" name="selected" id="0x7F0A0B09" />
+    <public type="id" name="selection_indicator" id="0x7F0A0B0A" />
+    <public type="id" name="selection_type" id="0x7F0A0B0B" />
+    <public type="id" name="send_btn_container" id="0x7F0A0B0C" />
+    <public type="id" name="send_btn_image" id="0x7F0A0B0D" />
+    <public type="id" name="send_sticker_greet_button" id="0x7F0A0B0E" />
+    <public type="id" name="server_discovery_header_description" id="0x7F0A0B0F" />
+    <public type="id" name="server_discovery_header_image" id="0x7F0A0B10" />
+    <public type="id" name="server_discovery_header_search_layout" id="0x7F0A0B11" />
+    <public type="id" name="server_discovery_header_title" id="0x7F0A0B12" />
+    <public type="id" name="server_discovery_item_barrier" id="0x7F0A0B13" />
+    <public type="id" name="server_discovery_item_button" id="0x7F0A0B14" />
+    <public type="id" name="server_discovery_item_count_container" id="0x7F0A0B15" />
+    <public type="id" name="server_discovery_item_description" id="0x7F0A0B16" />
+    <public type="id" name="server_discovery_item_image" id="0x7F0A0B17" />
+    <public type="id" name="server_discovery_item_title" id="0x7F0A0B18" />
+    <public type="id" name="server_notifications_everyone_switch" id="0x7F0A0B19" />
+    <public type="id" name="server_notifications_frequency_0_radio" id="0x7F0A0B1A" />
+    <public type="id" name="server_notifications_frequency_1_radio" id="0x7F0A0B1B" />
+    <public type="id" name="server_notifications_frequency_2_radio" id="0x7F0A0B1C" />
+    <public type="id" name="server_notifications_frequency_divider" id="0x7F0A0B1D" />
+    <public type="id" name="server_notifications_frequency_wrap" id="0x7F0A0B1E" />
+    <public type="id" name="server_notifications_mute_settings_view" id="0x7F0A0B1F" />
+    <public type="id" name="server_notifications_push_switch" id="0x7F0A0B20" />
+    <public type="id" name="server_notifications_roles_switch" id="0x7F0A0B21" />
+    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7F0A0B22" />
+    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7F0A0B23" />
+    <public type="id" name="server_settings_audit_logs_recycler" id="0x7F0A0B24" />
+    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7F0A0B25" />
+    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7F0A0B26" />
+    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7F0A0B27" />
+    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7F0A0B28" />
+    <public type="id" name="server_settings_bans_option" id="0x7F0A0B29" />
+    <public type="id" name="server_settings_bans_recycler" id="0x7F0A0B2A" />
+    <public type="id" name="server_settings_bans_search" id="0x7F0A0B2B" />
+    <public type="id" name="server_settings_bans_view_flipper" id="0x7F0A0B2C" />
+    <public type="id" name="server_settings_channels_create_channel" id="0x7F0A0B2D" />
+    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7F0A0B2E" />
+    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7F0A0B2F" />
+    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7F0A0B30" />
+    <public type="id" name="server_settings_channels_text_recycler" id="0x7F0A0B31" />
+    <public type="id" name="server_settings_community_locale" id="0x7F0A0B32" />
+    <public type="id" name="server_settings_community_overview_option" id="0x7F0A0B33" />
+    <public type="id" name="server_settings_community_overview_scroll" id="0x7F0A0B34" />
+    <public type="id" name="server_settings_community_setting_selector_description" id="0x7F0A0B35" />
+    <public type="id" name="server_settings_community_setting_selector_dropdown_icon" id="0x7F0A0B36" />
+    <public type="id" name="server_settings_community_setting_selector_subtitle" id="0x7F0A0B37" />
+    <public type="id" name="server_settings_community_setting_selector_title" id="0x7F0A0B38" />
+    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7F0A0B39" />
+    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7F0A0B3A" />
+    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7F0A0B3B" />
+    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7F0A0B3C" />
+    <public type="id" name="server_settings_delete_server_cancel" id="0x7F0A0B3D" />
+    <public type="id" name="server_settings_delete_server_confirm" id="0x7F0A0B3E" />
+    <public type="id" name="server_settings_delete_server_header" id="0x7F0A0B3F" />
+    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7F0A0B40" />
+    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7F0A0B41" />
+    <public type="id" name="server_settings_delete_server_text" id="0x7F0A0B42" />
+    <public type="id" name="server_settings_disable_community_button" id="0x7F0A0B43" />
+    <public type="id" name="server_settings_disable_community_message" id="0x7F0A0B44" />
+    <public type="id" name="server_settings_emojis_avatar" id="0x7F0A0B45" />
+    <public type="id" name="server_settings_emojis_container" id="0x7F0A0B46" />
+    <public type="id" name="server_settings_emojis_edit_alias" id="0x7F0A0B47" />
+    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7F0A0B48" />
+    <public type="id" name="server_settings_emojis_name" id="0x7F0A0B49" />
+    <public type="id" name="server_settings_emojis_option" id="0x7F0A0B4A" />
+    <public type="id" name="server_settings_emojis_overflow" id="0x7F0A0B4B" />
+    <public type="id" name="server_settings_emojis_username" id="0x7F0A0B4C" />
+    <public type="id" name="server_settings_emojis_username_avatar" id="0x7F0A0B4D" />
+    <public type="id" name="server_settings_enable_community_option" id="0x7F0A0B4E" />
+    <public type="id" name="server_settings_help_item" id="0x7F0A0B4F" />
+    <public type="id" name="server_settings_instant_invites_option" id="0x7F0A0B50" />
+    <public type="id" name="server_settings_instant_invites_recycler" id="0x7F0A0B51" />
+    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7F0A0B52" />
+    <public type="id" name="server_settings_members_header_container" id="0x7F0A0B53" />
+    <public type="id" name="server_settings_members_name_search" id="0x7F0A0B54" />
+    <public type="id" name="server_settings_members_option" id="0x7F0A0B55" />
+    <public type="id" name="server_settings_members_recycler" id="0x7F0A0B56" />
+    <public type="id" name="server_settings_members_roles_spinner" id="0x7F0A0B57" />
+    <public type="id" name="server_settings_members_view_flipper" id="0x7F0A0B58" />
+    <public type="id" name="server_settings_moderation_explicit_1" id="0x7F0A0B59" />
+    <public type="id" name="server_settings_moderation_explicit_2" id="0x7F0A0B5A" />
+    <public type="id" name="server_settings_moderation_explicit_3" id="0x7F0A0B5B" />
+    <public type="id" name="server_settings_moderation_explicit_help" id="0x7F0A0B5C" />
+    <public type="id" name="server_settings_moderation_verification_1" id="0x7F0A0B5D" />
+    <public type="id" name="server_settings_moderation_verification_2" id="0x7F0A0B5E" />
+    <public type="id" name="server_settings_moderation_verification_3" id="0x7F0A0B5F" />
+    <public type="id" name="server_settings_moderation_verification_4" id="0x7F0A0B60" />
+    <public type="id" name="server_settings_moderation_verification_5" id="0x7F0A0B61" />
+    <public type="id" name="server_settings_moderation_verification_help" id="0x7F0A0B62" />
+    <public type="id" name="server_settings_option_audit_log" id="0x7F0A0B63" />
+    <public type="id" name="server_settings_option_channels" id="0x7F0A0B64" />
+    <public type="id" name="server_settings_option_integrations" id="0x7F0A0B65" />
+    <public type="id" name="server_settings_option_moderation" id="0x7F0A0B66" />
+    <public type="id" name="server_settings_option_overview" id="0x7F0A0B67" />
+    <public type="id" name="server_settings_option_security" id="0x7F0A0B68" />
+    <public type="id" name="server_settings_option_vanity_url" id="0x7F0A0B69" />
+    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7F0A0B6A" />
+    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7F0A0B6B" />
+    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7F0A0B6C" />
+    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7F0A0B6D" />
+    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7F0A0B6E" />
+    <public type="id" name="server_settings_overview_icon" id="0x7F0A0B6F" />
+    <public type="id" name="server_settings_overview_icon_name_container" id="0x7F0A0B70" />
+    <public type="id" name="server_settings_overview_icon_remove" id="0x7F0A0B71" />
+    <public type="id" name="server_settings_overview_icon_text" id="0x7F0A0B72" />
+    <public type="id" name="server_settings_overview_notification_all" id="0x7F0A0B73" />
+    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7F0A0B74" />
+    <public type="id" name="server_settings_overview_region_item_name" id="0x7F0A0B75" />
+    <public type="id" name="server_settings_overview_region_list" id="0x7F0A0B76" />
+    <public type="id" name="server_settings_overview_scroll" id="0x7F0A0B77" />
+    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7F0A0B78" />
+    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7F0A0B79" />
+    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7F0A0B7A" />
+    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7F0A0B7B" />
+    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7F0A0B7C" />
+    <public type="id" name="server_settings_public_setting_selector" id="0x7F0A0B7D" />
+    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7F0A0B7E" />
+    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7F0A0B7F" />
+    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7F0A0B80" />
+    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7F0A0B81" />
+    <public type="id" name="server_settings_role_item_name" id="0x7F0A0B82" />
+    <public type="id" name="server_settings_roles_option" id="0x7F0A0B83" />
+    <public type="id" name="server_settings_roles_recycler" id="0x7F0A0B84" />
+    <public type="id" name="server_settings_section_community" id="0x7F0A0B85" />
+    <public type="id" name="server_settings_section_community_divider" id="0x7F0A0B86" />
+    <public type="id" name="server_settings_section_general_settings" id="0x7F0A0B87" />
+    <public type="id" name="server_settings_section_user_management" id="0x7F0A0B88" />
+    <public type="id" name="server_settings_section_user_management_divider" id="0x7F0A0B89" />
+    <public type="id" name="server_settings_security_dialog_cancel" id="0x7F0A0B8A" />
+    <public type="id" name="server_settings_security_dialog_confirm" id="0x7F0A0B8B" />
+    <public type="id" name="server_settings_security_label" id="0x7F0A0B8C" />
+    <public type="id" name="server_settings_security_server_mfa_code" id="0x7F0A0B8D" />
+    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7F0A0B8E" />
+    <public type="id" name="server_settings_server_icon" id="0x7F0A0B8F" />
+    <public type="id" name="server_settings_server_icon_text" id="0x7F0A0B90" />
+    <public type="id" name="server_settings_server_name" id="0x7F0A0B91" />
+    <public type="id" name="server_settings_vanity_input" id="0x7F0A0B92" />
+    <public type="id" name="server_settings_vanity_url_current_url" id="0x7F0A0B93" />
+    <public type="id" name="server_settings_vanity_url_error_text" id="0x7F0A0B94" />
+    <public type="id" name="server_settings_vanity_url_header" id="0x7F0A0B95" />
+    <public type="id" name="server_settings_vanity_url_input_container" id="0x7F0A0B96" />
+    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7F0A0B97" />
+    <public type="id" name="server_settings_vanity_url_prefix" id="0x7F0A0B98" />
+    <public type="id" name="server_settings_vanity_url_remove" id="0x7F0A0B99" />
+    <public type="id" name="server_settings_vanity_url_save" id="0x7F0A0B9A" />
+    <public type="id" name="set_custom_status_emoji" id="0x7F0A0B9B" />
+    <public type="id" name="set_custom_status_emoji_button" id="0x7F0A0B9C" />
+    <public type="id" name="set_custom_status_expiration" id="0x7F0A0B9D" />
+    <public type="id" name="set_custom_status_expiration_1_hour" id="0x7F0A0B9E" />
+    <public type="id" name="set_custom_status_expiration_30_minutes" id="0x7F0A0B9F" />
+    <public type="id" name="set_custom_status_expiration_4_hours" id="0x7F0A0BA0" />
+    <public type="id" name="set_custom_status_expiration_never" id="0x7F0A0BA1" />
+    <public type="id" name="set_custom_status_expiration_tomorrow" id="0x7F0A0BA2" />
+    <public type="id" name="set_custom_status_save" id="0x7F0A0BA3" />
+    <public type="id" name="set_custom_status_text" id="0x7F0A0BA4" />
+    <public type="id" name="set_status_container" id="0x7F0A0BA5" />
+    <public type="id" name="setting_button" id="0x7F0A0BA6" />
+    <public type="id" name="setting_container" id="0x7F0A0BA7" />
+    <public type="id" name="setting_disabled_overlay" id="0x7F0A0BA8" />
+    <public type="id" name="setting_drawable_left" id="0x7F0A0BA9" />
+    <public type="id" name="setting_label" id="0x7F0A0BAA" />
+    <public type="id" name="setting_subtext" id="0x7F0A0BAB" />
+    <public type="id" name="setting_tag" id="0x7F0A0BAC" />
+    <public type="id" name="settings_accessibility_allow_animate_emoji_switch" id="0x7F0A0BAD" />
+    <public type="id" name="settings_accessibility_allow_autoplay_gif_switch" id="0x7F0A0BAE" />
+    <public type="id" name="settings_accessibility_images_header" id="0x7F0A0BAF" />
+    <public type="id" name="settings_accessibility_reduced_motion_description" id="0x7F0A0BB0" />
+    <public type="id" name="settings_accessibility_reduced_motion_header" id="0x7F0A0BB1" />
+    <public type="id" name="settings_accessibility_reduced_motion_switch" id="0x7F0A0BB2" />
+    <public type="id" name="settings_accessibility_stickers_container" id="0x7F0A0BB3" />
+    <public type="id" name="settings_accessibility_stickers_header" id="0x7F0A0BB4" />
+    <public type="id" name="settings_account_2fa_header" id="0x7F0A0BB5" />
+    <public type="id" name="settings_account_avatar" id="0x7F0A0BB6" />
+    <public type="id" name="settings_account_avatar_container" id="0x7F0A0BB7" />
+    <public type="id" name="settings_account_avatar_edit" id="0x7F0A0BB8" />
+    <public type="id" name="settings_account_avatar_wrap" id="0x7F0A0BB9" />
+    <public type="id" name="settings_account_change_password" id="0x7F0A0BBA" />
+    <public type="id" name="settings_account_email_container" id="0x7F0A0BBB" />
+    <public type="id" name="settings_account_email_label" id="0x7F0A0BBC" />
+    <public type="id" name="settings_account_email_text" id="0x7F0A0BBD" />
+    <public type="id" name="settings_account_information_data_wrap" id="0x7F0A0BBE" />
+    <public type="id" name="settings_account_information_header" id="0x7F0A0BBF" />
+    <public type="id" name="settings_account_management_header" id="0x7F0A0BC0" />
+    <public type="id" name="settings_account_mfa_container" id="0x7F0A0BC1" />
+    <public type="id" name="settings_account_mfa_disabled_container" id="0x7F0A0BC2" />
+    <public type="id" name="settings_account_mfa_enable" id="0x7F0A0BC3" />
+    <public type="id" name="settings_account_mfa_enabled_container" id="0x7F0A0BC4" />
+    <public type="id" name="settings_account_mfa_enabled_header" id="0x7F0A0BC5" />
+    <public type="id" name="settings_account_mfa_flipper" id="0x7F0A0BC6" />
+    <public type="id" name="settings_account_mfa_lottie" id="0x7F0A0BC7" />
+    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7F0A0BC8" />
+    <public type="id" name="settings_account_name_clear" id="0x7F0A0BC9" />
+    <public type="id" name="settings_account_name_container" id="0x7F0A0BCA" />
+    <public type="id" name="settings_account_name_label" id="0x7F0A0BCB" />
+    <public type="id" name="settings_account_name_text" id="0x7F0A0BCC" />
+    <public type="id" name="settings_account_phone_container" id="0x7F0A0BCD" />
+    <public type="id" name="settings_account_phone_label" id="0x7F0A0BCE" />
+    <public type="id" name="settings_account_phone_text" id="0x7F0A0BCF" />
+    <public type="id" name="settings_account_private_data_delete" id="0x7F0A0BD0" />
+    <public type="id" name="settings_account_private_data_disable" id="0x7F0A0BD1" />
+    <public type="id" name="settings_account_private_data_wrap" id="0x7F0A0BD2" />
+    <public type="id" name="settings_account_remove_avatar" id="0x7F0A0BD3" />
+    <public type="id" name="settings_account_remove_two_fa" id="0x7F0A0BD4" />
+    <public type="id" name="settings_account_save" id="0x7F0A0BD5" />
+    <public type="id" name="settings_account_scroll" id="0x7F0A0BD6" />
+    <public type="id" name="settings_account_sms_backup" id="0x7F0A0BD7" />
+    <public type="id" name="settings_account_sms_phone" id="0x7F0A0BD8" />
+    <public type="id" name="settings_account_tag" id="0x7F0A0BD9" />
+    <public type="id" name="settings_account_tag_container" id="0x7F0A0BDA" />
+    <public type="id" name="settings_account_tag_label" id="0x7F0A0BDB" />
+    <public type="id" name="settings_account_tag_text" id="0x7F0A0BDC" />
+    <public type="id" name="settings_account_verification" id="0x7F0A0BDD" />
+    <public type="id" name="settings_account_verification_button" id="0x7F0A0BDE" />
+    <public type="id" name="settings_account_verification_title" id="0x7F0A0BDF" />
+    <public type="id" name="settings_account_view_backup_codes" id="0x7F0A0BE0" />
+    <public type="id" name="settings_appearance_font_scale_header" id="0x7F0A0BE1" />
+    <public type="id" name="settings_appearance_font_scale_platform" id="0x7F0A0BE2" />
+    <public type="id" name="settings_appearance_font_scaling_container" id="0x7F0A0BE3" />
+    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7F0A0BE4" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7F0A0BE5" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7F0A0BE6" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7F0A0BE7" />
+    <public type="id" name="settings_appearance_holy_light" id="0x7F0A0BE8" />
+    <public type="id" name="settings_appearance_sync_header" id="0x7F0A0BE9" />
+    <public type="id" name="settings_appearance_sync_switch" id="0x7F0A0BEA" />
+    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7F0A0BEB" />
+    <public type="id" name="settings_appearance_theme_header" id="0x7F0A0BEC" />
+    <public type="id" name="settings_appearance_theme_light_radio" id="0x7F0A0BED" />
+    <public type="id" name="settings_appearance_theme_pure_evil_switch" id="0x7F0A0BEE" />
+    <public type="id" name="settings_backup_codes_generate" id="0x7F0A0BEF" />
+    <public type="id" name="settings_backup_codes_info" id="0x7F0A0BF0" />
+    <public type="id" name="settings_backup_codes_rv" id="0x7F0A0BF1" />
+    <public type="id" name="settings_behavior_browser_switch" id="0x7F0A0BF2" />
+    <public type="id" name="settings_behavior_chat_header" id="0x7F0A0BF3" />
+    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7F0A0BF4" />
+    <public type="id" name="settings_behavior_keyboard_header" id="0x7F0A0BF5" />
+    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7F0A0BF6" />
+    <public type="id" name="settings_billing" id="0x7F0A0BF7" />
+    <public type="id" name="settings_bitrate" id="0x7F0A0BF8" />
+    <public type="id" name="settings_bitrate_help" id="0x7F0A0BF9" />
+    <public type="id" name="settings_blocked_users" id="0x7F0A0BFA" />
+    <public type="id" name="settings_boost_flipper" id="0x7F0A0BFB" />
+    <public type="id" name="settings_boost_marketing_view" id="0x7F0A0BFC" />
+    <public type="id" name="settings_boost_no_guilds_image" id="0x7F0A0BFD" />
+    <public type="id" name="settings_boost_no_guilds_subtitle" id="0x7F0A0BFE" />
+    <public type="id" name="settings_boost_no_guilds_title" id="0x7F0A0BFF" />
+    <public type="id" name="settings_boost_recycler" id="0x7F0A0C00" />
+    <public type="id" name="settings_boost_retry" id="0x7F0A0C01" />
+    <public type="id" name="settings_boost_sample_guilds" id="0x7F0A0C02" />
+    <public type="id" name="settings_boost_subtext" id="0x7F0A0C03" />
+    <public type="id" name="settings_boost_subtext_container" id="0x7F0A0C04" />
+    <public type="id" name="settings_boost_upsell_view" id="0x7F0A0C05" />
+    <public type="id" name="settings_channel_list_category_item_drag" id="0x7F0A0C06" />
+    <public type="id" name="settings_channel_list_category_item_text" id="0x7F0A0C07" />
+    <public type="id" name="settings_channel_list_item_drag" id="0x7F0A0C08" />
+    <public type="id" name="settings_channel_list_item_hash" id="0x7F0A0C09" />
+    <public type="id" name="settings_channel_list_item_name" id="0x7F0A0C0A" />
+    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7F0A0C0B" />
+    <public type="id" name="settings_developer_screenshot_bug_reporting" id="0x7F0A0C0C" />
+    <public type="id" name="settings_gifting_flipper" id="0x7F0A0C0D" />
+    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7F0A0C0E" />
+    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7F0A0C0F" />
+    <public type="id" name="settings_gifting_gifts_you_purchased_header" id="0x7F0A0C10" />
+    <public type="id" name="settings_gifting_gifts_you_purchased_recycler" id="0x7F0A0C11" />
+    <public type="id" name="settings_gifting_purchase_gift_section" id="0x7F0A0C12" />
+    <public type="id" name="settings_gifting_redeem_codes_header" id="0x7F0A0C13" />
+    <public type="id" name="settings_gifting_retry" id="0x7F0A0C14" />
+    <public type="id" name="settings_gifting_select_classic_gift_header" id="0x7F0A0C15" />
+    <public type="id" name="settings_gifting_select_gift_header" id="0x7F0A0C16" />
+    <public type="id" name="settings_gifting_your_gifts_header" id="0x7F0A0C17" />
+    <public type="id" name="settings_gifting_your_gifts_recycler" id="0x7F0A0C18" />
+    <public type="id" name="settings_group_icon" id="0x7F0A0C19" />
+    <public type="id" name="settings_group_icon_label" id="0x7F0A0C1A" />
+    <public type="id" name="settings_group_icon_remove" id="0x7F0A0C1B" />
+    <public type="id" name="settings_inapp_notifs_switch" id="0x7F0A0C1C" />
+    <public type="id" name="settings_language_current" id="0x7F0A0C1D" />
+    <public type="id" name="settings_language_current_flag" id="0x7F0A0C1E" />
+    <public type="id" name="settings_language_current_text" id="0x7F0A0C1F" />
+    <public type="id" name="settings_language_header" id="0x7F0A0C20" />
+    <public type="id" name="settings_language_select_item_name" id="0x7F0A0C21" />
+    <public type="id" name="settings_language_select_item_name_localized" id="0x7F0A0C22" />
+    <public type="id" name="settings_language_select_list" id="0x7F0A0C23" />
+    <public type="id" name="settings_language_sync_check" id="0x7F0A0C24" />
+    <public type="id" name="settings_language_sync_header" id="0x7F0A0C25" />
+    <public type="id" name="settings_nitro" id="0x7F0A0C26" />
+    <public type="id" name="settings_notification_os" id="0x7F0A0C27" />
+    <public type="id" name="settings_notification_os_label" id="0x7F0A0C28" />
+    <public type="id" name="settings_notification_switch" id="0x7F0A0C29" />
+    <public type="id" name="settings_notifications_blink" id="0x7F0A0C2A" />
+    <public type="id" name="settings_notifications_enabled" id="0x7F0A0C2B" />
+    <public type="id" name="settings_notifications_mute_all" id="0x7F0A0C2C" />
+    <public type="id" name="settings_notifications_vibrations" id="0x7F0A0C2D" />
+    <public type="id" name="settings_notifications_wrap" id="0x7F0A0C2E" />
+    <public type="id" name="settings_presence_text" id="0x7F0A0C2F" />
+    <public type="id" name="settings_privacy_basic_service" id="0x7F0A0C30" />
+    <public type="id" name="settings_privacy_contact_sync" id="0x7F0A0C31" />
+    <public type="id" name="settings_privacy_contact_sync_title" id="0x7F0A0C32" />
+    <public type="id" name="settings_privacy_controls" id="0x7F0A0C33" />
+    <public type="id" name="settings_privacy_data_header" id="0x7F0A0C34" />
+    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7F0A0C35" />
+    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7F0A0C36" />
+    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7F0A0C37" />
+    <public type="id" name="settings_privacy_defaults_header" id="0x7F0A0C38" />
+    <public type="id" name="settings_privacy_explicit_0" id="0x7F0A0C39" />
+    <public type="id" name="settings_privacy_explicit_1" id="0x7F0A0C3A" />
+    <public type="id" name="settings_privacy_explicit_2" id="0x7F0A0C3B" />
+    <public type="id" name="settings_privacy_friend_source_0" id="0x7F0A0C3C" />
+    <public type="id" name="settings_privacy_friend_source_1" id="0x7F0A0C3D" />
+    <public type="id" name="settings_privacy_friend_source_2" id="0x7F0A0C3E" />
+    <public type="id" name="settings_privacy_friend_source_header" id="0x7F0A0C3F" />
+    <public type="id" name="settings_privacy_personalization" id="0x7F0A0C40" />
+    <public type="id" name="settings_privacy_request_data" id="0x7F0A0C41" />
+    <public type="id" name="settings_privacy_safe_messaging_header" id="0x7F0A0C42" />
+    <public type="id" name="settings_privacy_screenreader_detection" id="0x7F0A0C43" />
+    <public type="id" name="settings_privacy_statistics" id="0x7F0A0C44" />
+    <public type="id" name="settings_profile_scroll" id="0x7F0A0C45" />
+    <public type="id" name="settings_status_view" id="0x7F0A0C46" />
+    <public type="id" name="settings_text_images_compression_header" id="0x7F0A0C47" />
+    <public type="id" name="settings_text_images_display_header" id="0x7F0A0C48" />
+    <public type="id" name="settings_text_images_embeds_toggle" id="0x7F0A0C49" />
+    <public type="id" name="settings_text_images_links_toggle" id="0x7F0A0C4A" />
+    <public type="id" name="settings_text_images_preview_header" id="0x7F0A0C4B" />
+    <public type="id" name="settings_text_images_stickers_container" id="0x7F0A0C4C" />
+    <public type="id" name="settings_text_images_stickers_header" id="0x7F0A0C4D" />
+    <public type="id" name="settings_text_images_sync_header" id="0x7F0A0C4E" />
+    <public type="id" name="settings_text_images_sync_toggle" id="0x7F0A0C4F" />
+    <public type="id" name="settings_user_limit" id="0x7F0A0C50" />
+    <public type="id" name="settings_user_limit_help" id="0x7F0A0C51" />
+    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7F0A0C52" />
+    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7F0A0C53" />
+    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7F0A0C54" />
+    <public type="id" name="settings_voice_gain_control_toggle" id="0x7F0A0C55" />
+    <public type="id" name="settings_voice_input_header" id="0x7F0A0C56" />
+    <public type="id" name="settings_voice_input_mode_ptt" id="0x7F0A0C57" />
+    <public type="id" name="settings_voice_input_mode_vad" id="0x7F0A0C58" />
+    <public type="id" name="settings_voice_krisp_info" id="0x7F0A0C59" />
+    <public type="id" name="settings_voice_krisp_vad_toggle" id="0x7F0A0C5A" />
+    <public type="id" name="settings_voice_mode" id="0x7F0A0C5B" />
+    <public type="id" name="settings_voice_mode_header" id="0x7F0A0C5C" />
+    <public type="id" name="settings_voice_mode_value" id="0x7F0A0C5D" />
+    <public type="id" name="settings_voice_noise_cancellation_toggle" id="0x7F0A0C5E" />
+    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7F0A0C5F" />
+    <public type="id" name="settings_voice_opensl_header" id="0x7F0A0C60" />
+    <public type="id" name="settings_voice_opensles_default" id="0x7F0A0C61" />
+    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7F0A0C62" />
+    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7F0A0C63" />
+    <public type="id" name="settings_voice_opensles_help" id="0x7F0A0C64" />
+    <public type="id" name="settings_voice_output_header" id="0x7F0A0C65" />
+    <public type="id" name="settings_voice_output_volume" id="0x7F0A0C66" />
+    <public type="id" name="settings_voice_output_volume_wrap" id="0x7F0A0C67" />
+    <public type="id" name="settings_voice_overlay_header" id="0x7F0A0C68" />
+    <public type="id" name="settings_voice_overlay_toggle" id="0x7F0A0C69" />
+    <public type="id" name="settings_voice_processing_header" id="0x7F0A0C6A" />
+    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7F0A0C6B" />
+    <public type="id" name="settings_voice_sensitivity_header" id="0x7F0A0C6C" />
+    <public type="id" name="settings_voice_sensitivity_label" id="0x7F0A0C6D" />
+    <public type="id" name="settings_voice_sensitivity_manual" id="0x7F0A0C6E" />
+    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7F0A0C6F" />
+    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7F0A0C70" />
+    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7F0A0C71" />
+    <public type="id" name="settings_voice_video_container" id="0x7F0A0C72" />
+    <public type="id" name="settings_voice_video_header" id="0x7F0A0C73" />
+    <public type="id" name="settings_voice_video_troubleshooting_guide" id="0x7F0A0C74" />
+    <public type="id" name="shades_divider" id="0x7F0A0C75" />
+    <public type="id" name="shades_layout" id="0x7F0A0C76" />
+    <public type="id" name="share_button" id="0x7F0A0C77" />
+    <public type="id" name="shortcut" id="0x7F0A0C78" />
+    <public type="id" name="showCustom" id="0x7F0A0C79" />
+    <public type="id" name="showHome" id="0x7F0A0C7A" />
+    <public type="id" name="showTitle" id="0x7F0A0C7B" />
+    <public type="id" name="show_current_activity" id="0x7F0A0C7C" />
+    <public type="id" name="sin" id="0x7F0A0C7D" />
+    <public type="id" name="skipCollapsed" id="0x7F0A0C7E" />
+    <public type="id" name="slide" id="0x7F0A0C7F" />
+    <public type="id" name="smallLabel" id="0x7F0A0C80" />
+    <public type="id" name="snackbar_action" id="0x7F0A0C81" />
+    <public type="id" name="snackbar_text" id="0x7F0A0C82" />
+    <public type="id" name="snap" id="0x7F0A0C83" />
+    <public type="id" name="snapMargins" id="0x7F0A0C84" />
+    <public type="id" name="software" id="0x7F0A0C85" />
+    <public type="id" name="space_around" id="0x7F0A0C86" />
+    <public type="id" name="space_between" id="0x7F0A0C87" />
+    <public type="id" name="space_evenly" id="0x7F0A0C88" />
+    <public type="id" name="spacer" id="0x7F0A0C89" />
+    <public type="id" name="sparkle" id="0x7F0A0C8A" />
+    <public type="id" name="sparkle_view_image" id="0x7F0A0C8B" />
+    <public type="id" name="speaker_hint" id="0x7F0A0C8C" />
+    <public type="id" name="special_effects_controller_view_tag" id="0x7F0A0C8D" />
+    <public type="id" name="spherical_gl_surface_view" id="0x7F0A0C8E" />
+    <public type="id" name="spinner" id="0x7F0A0C8F" />
+    <public type="id" name="spline" id="0x7F0A0C90" />
+    <public type="id" name="split_action_bar" id="0x7F0A0C91" />
+    <public type="id" name="spread" id="0x7F0A0C92" />
+    <public type="id" name="spread_inside" id="0x7F0A0C93" />
+    <public type="id" name="square" id="0x7F0A0C94" />
+    <public type="id" name="src_atop" id="0x7F0A0C95" />
+    <public type="id" name="src_in" id="0x7F0A0C96" />
+    <public type="id" name="src_over" id="0x7F0A0C97" />
+    <public type="id" name="src_toggle" id="0x7F0A0C98" />
+    <public type="id" name="stage_call_speaking_chip" id="0x7F0A0C99" />
+    <public type="id" name="stage_call_speaking_user_summary" id="0x7F0A0C9A" />
+    <public type="id" name="stage_call_speaking_user_summary_label" id="0x7F0A0C9B" />
+    <public type="id" name="stage_card_controls_divider" id="0x7F0A0C9C" />
+    <public type="id" name="stage_card_top_hat_divider" id="0x7F0A0C9D" />
+    <public type="id" name="stage_channel_audience_icon" id="0x7F0A0C9E" />
+    <public type="id" name="stage_channel_audience_member_container" id="0x7F0A0C9F" />
+    <public type="id" name="stage_channel_audience_member_icon" id="0x7F0A0CA0" />
+    <public type="id" name="stage_channel_audience_member_icon_container" id="0x7F0A0CA1" />
+    <public type="id" name="stage_channel_audience_member_name" id="0x7F0A0CA2" />
+    <public type="id" name="stage_channel_audience_member_raised_hand" id="0x7F0A0CA3" />
+    <public type="id" name="stage_channel_audience_role_text" id="0x7F0A0CA4" />
+    <public type="id" name="stage_channel_blocked_member_container" id="0x7F0A0CA5" />
+    <public type="id" name="stage_channel_blocked_member_icon" id="0x7F0A0CA6" />
+    <public type="id" name="stage_channel_blocked_member_icon_container" id="0x7F0A0CA7" />
+    <public type="id" name="stage_channel_blocked_member_name" id="0x7F0A0CA8" />
+    <public type="id" name="stage_channel_blocked_member_speaker" id="0x7F0A0CA9" />
+    <public type="id" name="stage_channel_blocked_text" id="0x7F0A0CAA" />
+    <public type="id" name="stage_channel_blocked_text_divider" id="0x7F0A0CAB" />
+    <public type="id" name="stage_channel_blocked_text_speaker" id="0x7F0A0CAC" />
+    <public type="id" name="stage_channel_item_stage_channel_icon" id="0x7F0A0CAD" />
+    <public type="id" name="stage_channel_item_voice_channel_name" id="0x7F0A0CAE" />
+    <public type="id" name="stage_channel_item_voice_channel_topic" id="0x7F0A0CAF" />
+    <public type="id" name="stage_channel_speaker" id="0x7F0A0CB0" />
+    <public type="id" name="stage_channel_speaker_blocked" id="0x7F0A0CB1" />
+    <public type="id" name="stage_channel_speaker_container" id="0x7F0A0CB2" />
+    <public type="id" name="stage_channel_speaker_deafen_indicator" id="0x7F0A0CB3" />
+    <public type="id" name="stage_channel_speaker_mod_indicator" id="0x7F0A0CB4" />
+    <public type="id" name="stage_channel_speaker_mute_indicator" id="0x7F0A0CB5" />
+    <public type="id" name="stage_channel_speaker_name" id="0x7F0A0CB6" />
+    <public type="id" name="stage_channel_speaker_pulse" id="0x7F0A0CB7" />
+    <public type="id" name="stage_channels_audience_count" id="0x7F0A0CB8" />
+    <public type="id" name="stage_disconnect_button_large" id="0x7F0A0CB9" />
+    <public type="id" name="stage_discovery_audience_badge" id="0x7F0A0CBA" />
+    <public type="id" name="stage_discovery_audience_badge_text" id="0x7F0A0CBB" />
+    <public type="id" name="stage_discovery_badge_barrier" id="0x7F0A0CBC" />
+    <public type="id" name="stage_discovery_guild_icon" id="0x7F0A0CBD" />
+    <public type="id" name="stage_discovery_guild_icon_text" id="0x7F0A0CBE" />
+    <public type="id" name="stage_discovery_guild_icon_wrap" id="0x7F0A0CBF" />
+    <public type="id" name="stage_discovery_guild_name" id="0x7F0A0CC0" />
+    <public type="id" name="stage_discovery_speakers_view" id="0x7F0A0CC1" />
+    <public type="id" name="stage_discovery_stage_name" id="0x7F0A0CC2" />
+    <public type="id" name="stage_event_channel" id="0x7F0A0CC3" />
+    <public type="id" name="stage_event_listen_button" id="0x7F0A0CC4" />
+    <public type="id" name="stage_event_listeners" id="0x7F0A0CC5" />
+    <public type="id" name="stage_event_topic" id="0x7F0A0CC6" />
+    <public type="id" name="stage_moderator_permissions_fragment" id="0x7F0A0CC7" />
+    <public type="id" name="stage_permissions_divider" id="0x7F0A0CC8" />
+    <public type="id" name="stage_permissions_title" id="0x7F0A0CC9" />
+    <public type="id" name="stage_raise_hands_enabled_toggle" id="0x7F0A0CCA" />
+    <public type="id" name="stage_raised_hands_bottom_sheet_root" id="0x7F0A0CCB" />
+    <public type="id" name="stage_raised_hands_item_dismiss_button" id="0x7F0A0CCC" />
+    <public type="id" name="stage_raised_hands_item_invite_button" id="0x7F0A0CCD" />
+    <public type="id" name="stage_raised_hands_item_role" id="0x7F0A0CCE" />
+    <public type="id" name="stage_raised_hands_item_user_avatar" id="0x7F0A0CCF" />
+    <public type="id" name="stage_raised_hands_item_user_name" id="0x7F0A0CD0" />
+    <public type="id" name="stage_raised_hands_recycler" id="0x7F0A0CD1" />
+    <public type="id" name="stage_start_creation_options" id="0x7F0A0CD2" />
+    <public type="id" name="stage_start_divider" id="0x7F0A0CD3" />
+    <public type="id" name="stage_start_help_text" id="0x7F0A0CD4" />
+    <public type="id" name="stage_start_members_radio_button" id="0x7F0A0CD5" />
+    <public type="id" name="stage_start_public_disclaimer" id="0x7F0A0CD6" />
+    <public type="id" name="stage_start_public_radio_button" id="0x7F0A0CD7" />
+    <public type="id" name="stage_start_screen_title" id="0x7F0A0CD8" />
+    <public type="id" name="stage_start_topic_layout" id="0x7F0A0CD9" />
+    <public type="id" name="stage_start_topic_title" id="0x7F0A0CDA" />
+    <public type="id" name="standard" id="0x7F0A0CDB" />
+    <public type="id" name="start" id="0x7F0A0CDC" />
+    <public type="id" name="startHorizontal" id="0x7F0A0CDD" />
+    <public type="id" name="startToEnd" id="0x7F0A0CDE" />
+    <public type="id" name="startVertical" id="0x7F0A0CDF" />
+    <public type="id" name="start_call_sheet_video_item" id="0x7F0A0CE0" />
+    <public type="id" name="start_call_sheet_voice_item" id="0x7F0A0CE1" />
+    <public type="id" name="start_stage_button" id="0x7F0A0CE2" />
+    <public type="id" name="start_stage_button_spacer" id="0x7F0A0CE3" />
+    <public type="id" name="start_stage_event_button_stub" id="0x7F0A0CE4" />
+    <public type="id" name="start_stage_icon" id="0x7F0A0CE5" />
+    <public type="id" name="start_stage_server_selection_banner" id="0x7F0A0CE6" />
+    <public type="id" name="start_stage_server_selection_bullet_item_container" id="0x7F0A0CE7" />
+    <public type="id" name="start_stage_server_selection_bullet_item_divider" id="0x7F0A0CE8" />
+    <public type="id" name="start_stage_server_selection_bullet_item_icon" id="0x7F0A0CE9" />
+    <public type="id" name="start_stage_server_selection_bullet_item_text" id="0x7F0A0CEA" />
+    <public type="id" name="start_stage_server_selection_button" id="0x7F0A0CEB" />
+    <public type="id" name="start_stage_server_selection_button_hint" id="0x7F0A0CEC" />
+    <public type="id" name="start_stage_server_selection_guild_item_arrow" id="0x7F0A0CED" />
+    <public type="id" name="start_stage_server_selection_guild_item_container" id="0x7F0A0CEE" />
+    <public type="id" name="start_stage_server_selection_guild_item_divider" id="0x7F0A0CEF" />
+    <public type="id" name="start_stage_server_selection_guild_item_icon" id="0x7F0A0CF0" />
+    <public type="id" name="start_stage_server_selection_guild_item_text" id="0x7F0A0CF1" />
+    <public type="id" name="start_stage_server_selection_subtitle" id="0x7F0A0CF2" />
+    <public type="id" name="start_stage_server_selection_title" id="0x7F0A0CF3" />
+    <public type="id" name="start_stage_start_button" id="0x7F0A0CF4" />
+    <public type="id" name="start_stage_subtitle" id="0x7F0A0CF5" />
+    <public type="id" name="start_stage_title" id="0x7F0A0CF6" />
+    <public type="id" name="state_aspect_ratio" id="0x7F0A0CF7" />
+    <public type="id" name="state_rotate" id="0x7F0A0CF8" />
+    <public type="id" name="state_scale" id="0x7F0A0CF9" />
+    <public type="id" name="staticLayout" id="0x7F0A0CFA" />
+    <public type="id" name="staticPostLayout" id="0x7F0A0CFB" />
+    <public type="id" name="static_avatar" id="0x7F0A0CFC" />
+    <public type="id" name="status_bar_latest_event_content" id="0x7F0A0CFD" />
+    <public type="id" name="steps_button_container" id="0x7F0A0CFE" />
+    <public type="id" name="steps_cancel" id="0x7F0A0CFF" />
+    <public type="id" name="steps_close" id="0x7F0A0D00" />
+    <public type="id" name="steps_done" id="0x7F0A0D01" />
+    <public type="id" name="steps_next" id="0x7F0A0D02" />
+    <public type="id" name="steps_viewpager" id="0x7F0A0D03" />
+    <public type="id" name="stereo" id="0x7F0A0D04" />
+    <public type="id" name="sticker_app_bar" id="0x7F0A0D05" />
+    <public type="id" name="sticker_autocomplete_sticker" id="0x7F0A0D06" />
+    <public type="id" name="sticker_category_item_guild_icon" id="0x7F0A0D07" />
+    <public type="id" name="sticker_category_item_pack_avatar" id="0x7F0A0D08" />
+    <public type="id" name="sticker_full_size_sticker" id="0x7F0A0D09" />
+    <public type="id" name="sticker_pack_activated_banner" id="0x7F0A0D0A" />
+    <public type="id" name="sticker_pack_activated_body" id="0x7F0A0D0B" />
+    <public type="id" name="sticker_pack_activated_confirm" id="0x7F0A0D0C" />
+    <public type="id" name="sticker_pack_details_animated" id="0x7F0A0D0D" />
+    <public type="id" name="sticker_pack_details_close" id="0x7F0A0D0E" />
+    <public type="id" name="sticker_pack_details_limited" id="0x7F0A0D0F" />
+    <public type="id" name="sticker_pack_details_pack" id="0x7F0A0D10" />
+    <public type="id" name="sticker_pack_details_premium" id="0x7F0A0D11" />
+    <public type="id" name="sticker_pack_store_sheet_buy_button_container" id="0x7F0A0D12" />
+    <public type="id" name="sticker_pack_store_sheet_container" id="0x7F0A0D13" />
+    <public type="id" name="sticker_pack_store_sheet_recycler" id="0x7F0A0D14" />
+    <public type="id" name="sticker_pack_view_all_banner" id="0x7F0A0D15" />
+    <public type="id" name="sticker_picker_bottom_bar" id="0x7F0A0D16" />
+    <public type="id" name="sticker_picker_bottom_bar_divider" id="0x7F0A0D17" />
+    <public type="id" name="sticker_picker_category_recycler" id="0x7F0A0D18" />
+    <public type="id" name="sticker_picker_container" id="0x7F0A0D19" />
+    <public type="id" name="sticker_picker_sticker" id="0x7F0A0D1A" />
+    <public type="id" name="sticker_search_input" id="0x7F0A0D1B" />
+    <public type="id" name="sticker_sheet_buy_button" id="0x7F0A0D1C" />
+    <public type="id" name="sticker_sheet_sticker_info" id="0x7F0A0D1D" />
+    <public type="id" name="sticker_sheet_sticker_name" id="0x7F0A0D1E" />
+    <public type="id" name="sticker_sheet_sticker_picker_content" id="0x7F0A0D1F" />
+    <public type="id" name="sticker_sheet_stickers_container" id="0x7F0A0D20" />
+    <public type="id" name="sticker_sheet_view_button" id="0x7F0A0D21" />
+    <public type="id" name="sticker_sheet_view_limited_chip" id="0x7F0A0D22" />
+    <public type="id" name="sticker_sheet_view_limited_container" id="0x7F0A0D23" />
+    <public type="id" name="sticker_store_buy_button_premium" id="0x7F0A0D24" />
+    <public type="id" name="sticker_store_header_item_animated" id="0x7F0A0D25" />
+    <public type="id" name="sticker_store_header_item_container" id="0x7F0A0D26" />
+    <public type="id" name="sticker_store_header_item_description" id="0x7F0A0D27" />
+    <public type="id" name="sticker_store_header_item_new" id="0x7F0A0D28" />
+    <public type="id" name="sticker_store_header_item_premium" id="0x7F0A0D29" />
+    <public type="id" name="sticker_store_header_item_subtitle" id="0x7F0A0D2A" />
+    <public type="id" name="sticker_store_header_item_title" id="0x7F0A0D2B" />
+    <public type="id" name="sticker_toolbar" id="0x7F0A0D2C" />
+    <public type="id" name="sticker_view_imageview" id="0x7F0A0D2D" />
+    <public type="id" name="sticker_view_lottie" id="0x7F0A0D2E" />
+    <public type="id" name="sticker_view_placeholder" id="0x7F0A0D2F" />
+    <public type="id" name="stickers_always_animate" id="0x7F0A0D30" />
+    <public type="id" name="stickers_animate_on_interaction" id="0x7F0A0D31" />
+    <public type="id" name="stickers_never_animate" id="0x7F0A0D32" />
+    <public type="id" name="stickers_sheet_sticker_1" id="0x7F0A0D33" />
+    <public type="id" name="stickers_sheet_sticker_2" id="0x7F0A0D34" />
+    <public type="id" name="stickers_sheet_sticker_3" id="0x7F0A0D35" />
+    <public type="id" name="stickers_sheet_sticker_4" id="0x7F0A0D36" />
+    <public type="id" name="stickers_suggestions" id="0x7F0A0D37" />
+    <public type="id" name="stop" id="0x7F0A0D38" />
+    <public type="id" name="stop_watching_button" id="0x7F0A0D39" />
+    <public type="id" name="stream_preview" id="0x7F0A0D3A" />
+    <public type="id" name="stream_preview_image" id="0x7F0A0D3B" />
+    <public type="id" name="stream_preview_overlay_text" id="0x7F0A0D3C" />
+    <public type="id" name="stream_preview_placeholder_caption" id="0x7F0A0D3D" />
+    <public type="id" name="stream_volume_label" id="0x7F0A0D3E" />
+    <public type="id" name="stream_volume_slider" id="0x7F0A0D3F" />
+    <public type="id" name="stretch" id="0x7F0A0D40" />
+    <public type="id" name="submenuarrow" id="0x7F0A0D41" />
+    <public type="id" name="submit_area" id="0x7F0A0D42" />
+    <public type="id" name="submit_report_error" id="0x7F0A0D43" />
+    <public type="id" name="subtitle" id="0x7F0A0D44" />
+    <public type="id" name="subtitle_text" id="0x7F0A0D45" />
+    <public type="id" name="suggested_friend_avatar" id="0x7F0A0D46" />
+    <public type="id" name="suggested_friend_decline" id="0x7F0A0D47" />
+    <public type="id" name="suggested_friend_public_name" id="0x7F0A0D48" />
+    <public type="id" name="suggested_friend_send_request" id="0x7F0A0D49" />
+    <public type="id" name="suggested_friend_username" id="0x7F0A0D4A" />
+    <public type="id" name="suggested_friend_view" id="0x7F0A0D4B" />
+    <public type="id" name="suggestion_example_answer" id="0x7F0A0D4C" />
+    <public type="id" name="suggestion_example_container" id="0x7F0A0D4D" />
+    <public type="id" name="suggestion_example_filter" id="0x7F0A0D4E" />
+    <public type="id" name="suggestion_example_icon" id="0x7F0A0D4F" />
+    <public type="id" name="suggestion_item_header" id="0x7F0A0D50" />
+    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7F0A0D51" />
+    <public type="id" name="suggestion_item_header_history_divider" id="0x7F0A0D52" />
+    <public type="id" name="suggestion_item_header_history_text" id="0x7F0A0D53" />
+    <public type="id" name="suggestion_list" id="0x7F0A0D54" />
+    <public type="id" name="suggestions_flipper" id="0x7F0A0D55" />
+    <public type="id" name="support" id="0x7F0A0D56" />
+    <public type="id" name="surface" id="0x7F0A0D57" />
+    <public type="id" name="surface_view" id="0x7F0A0D58" />
+    <public type="id" name="surface_view_root" id="0x7F0A0D59" />
+    <public type="id" name="swipeRefreshLayout" id="0x7F0A0D5A" />
+    <public type="id" name="swipe_refresh_layout" id="0x7F0A0D5B" />
+    <public type="id" name="switchWidget" id="0x7F0A0D5C" />
+    <public type="id" name="switchview" id="0x7F0A0D5D" />
+    <public type="id" name="sync_friends_switch" id="0x7F0A0D5E" />
+    <public type="id" name="sync_settings" id="0x7F0A0D5F" />
+    <public type="id" name="systemChannel" id="0x7F0A0D60" />
+    <public type="id" name="system_channel" id="0x7F0A0D61" />
+    <public type="id" name="system_channel_boost" id="0x7F0A0D62" />
+    <public type="id" name="system_channel_join" id="0x7F0A0D63" />
+    <public type="id" name="system_channel_wrap" id="0x7F0A0D64" />
+    <public type="id" name="system_icon" id="0x7F0A0D65" />
+    <public type="id" name="system_text" id="0x7F0A0D66" />
+    <public type="id" name="system_timestamp" id="0x7F0A0D67" />
+    <public type="id" name="tabMode" id="0x7F0A0D68" />
+    <public type="id" name="tab_contents" id="0x7F0A0D69" />
+    <public type="id" name="tabs" id="0x7F0A0D6A" />
+    <public type="id" name="tabs_host_bottom_nav_friends_icon" id="0x7F0A0D6B" />
+    <public type="id" name="tabs_host_bottom_nav_friends_item" id="0x7F0A0D6C" />
+    <public type="id" name="tabs_host_bottom_nav_friends_notifications_badge" id="0x7F0A0D6D" />
+    <public type="id" name="tabs_host_bottom_nav_home_icon" id="0x7F0A0D6E" />
+    <public type="id" name="tabs_host_bottom_nav_home_item" id="0x7F0A0D6F" />
+    <public type="id" name="tabs_host_bottom_nav_home_notifications_badge" id="0x7F0A0D70" />
+    <public type="id" name="tabs_host_bottom_nav_mentions_icon" id="0x7F0A0D71" />
+    <public type="id" name="tabs_host_bottom_nav_mentions_item" id="0x7F0A0D72" />
+    <public type="id" name="tabs_host_bottom_nav_search_icon" id="0x7F0A0D73" />
+    <public type="id" name="tabs_host_bottom_nav_search_item" id="0x7F0A0D74" />
+    <public type="id" name="tabs_host_bottom_nav_stage_discovery_icon" id="0x7F0A0D75" />
+    <public type="id" name="tabs_host_bottom_nav_stage_discovery_item" id="0x7F0A0D76" />
+    <public type="id" name="tabs_host_bottom_nav_tabs_container" id="0x7F0A0D77" />
+    <public type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" id="0x7F0A0D78" />
+    <public type="id" name="tabs_host_bottom_nav_user_settings_item" id="0x7F0A0D79" />
+    <public type="id" name="tag_accessibility_actions" id="0x7F0A0D7A" />
+    <public type="id" name="tag_accessibility_clickable_spans" id="0x7F0A0D7B" />
+    <public type="id" name="tag_accessibility_heading" id="0x7F0A0D7C" />
+    <public type="id" name="tag_accessibility_pane_title" id="0x7F0A0D7D" />
+    <public type="id" name="tag_screen_reader_focusable" id="0x7F0A0D7E" />
+    <public type="id" name="tag_transition_group" id="0x7F0A0D7F" />
+    <public type="id" name="tag_unhandled_key_event_manager" id="0x7F0A0D80" />
+    <public type="id" name="tag_unhandled_key_listeners" id="0x7F0A0D81" />
+    <public type="id" name="takePicture" id="0x7F0A0D82" />
+    <public type="id" name="takePictureSnapshot" id="0x7F0A0D83" />
+    <public type="id" name="take_photo_btn" id="0x7F0A0D84" />
+    <public type="id" name="ternary_check_neutral" id="0x7F0A0D85" />
+    <public type="id" name="ternary_check_off" id="0x7F0A0D86" />
+    <public type="id" name="ternary_check_on" id="0x7F0A0D87" />
+    <public type="id" name="test" id="0x7F0A0D88" />
+    <public type="id" name="test_checkbox_android_button_tint" id="0x7F0A0D89" />
+    <public type="id" name="test_checkbox_app_button_tint" id="0x7F0A0D8A" />
+    <public type="id" name="test_radiobutton_android_button_tint" id="0x7F0A0D8B" />
+    <public type="id" name="test_radiobutton_app_button_tint" id="0x7F0A0D8C" />
+    <public type="id" name="text" id="0x7F0A0D8D" />
+    <public type="id" name="text1" id="0x7F0A0D8E" />
+    <public type="id" name="text2" id="0x7F0A0D8F" />
+    <public type="id" name="textEnd" id="0x7F0A0D90" />
+    <public type="id" name="textSpacerNoButtons" id="0x7F0A0D91" />
+    <public type="id" name="textSpacerNoTitle" id="0x7F0A0D92" />
+    <public type="id" name="textStart" id="0x7F0A0D93" />
+    <public type="id" name="textTop" id="0x7F0A0D94" />
+    <public type="id" name="textView" id="0x7F0A0D95" />
+    <public type="id" name="text_images_settings" id="0x7F0A0D96" />
+    <public type="id" name="text_input" id="0x7F0A0D97" />
+    <public type="id" name="text_input_end_icon" id="0x7F0A0D98" />
+    <public type="id" name="text_input_error_icon" id="0x7F0A0D99" />
+    <public type="id" name="text_input_start_icon" id="0x7F0A0D9A" />
+    <public type="id" name="text_view_crop" id="0x7F0A0D9B" />
+    <public type="id" name="text_view_rotate" id="0x7F0A0D9C" />
+    <public type="id" name="text_view_scale" id="0x7F0A0D9D" />
+    <public type="id" name="textinput_counter" id="0x7F0A0D9E" />
+    <public type="id" name="textinput_error" id="0x7F0A0D9F" />
+    <public type="id" name="textinput_helper_text" id="0x7F0A0DA0" />
+    <public type="id" name="textinput_placeholder" id="0x7F0A0DA1" />
+    <public type="id" name="textinput_prefix_text" id="0x7F0A0DA2" />
+    <public type="id" name="textinput_suffix_text" id="0x7F0A0DA3" />
+    <public type="id" name="texture" id="0x7F0A0DA4" />
+    <public type="id" name="texture_view" id="0x7F0A0DA5" />
+    <public type="id" name="thing_proto" id="0x7F0A0DA6" />
+    <public type="id" name="thread_avatar" id="0x7F0A0DA7" />
+    <public type="id" name="thread_browser_count" id="0x7F0A0DA8" />
+    <public type="id" name="thread_browser_empty" id="0x7F0A0DA9" />
+    <public type="id" name="thread_browser_empty_create_button" id="0x7F0A0DAA" />
+    <public type="id" name="thread_browser_empty_heading" id="0x7F0A0DAB" />
+    <public type="id" name="thread_browser_empty_subheading" id="0x7F0A0DAC" />
+    <public type="id" name="thread_browser_error_msg" id="0x7F0A0DAD" />
+    <public type="id" name="thread_browser_error_overlay" id="0x7F0A0DAE" />
+    <public type="id" name="thread_browser_icon" id="0x7F0A0DAF" />
+    <public type="id" name="thread_browser_moderator_view" id="0x7F0A0DB0" />
+    <public type="id" name="thread_browser_moderator_view_card" id="0x7F0A0DB1" />
+    <public type="id" name="thread_browser_root" id="0x7F0A0DB2" />
+    <public type="id" name="thread_browser_toolbar" id="0x7F0A0DB3" />
+    <public type="id" name="thread_browser_try_again" id="0x7F0A0DB4" />
+    <public type="id" name="thread_browser_view_pager" id="0x7F0A0DB5" />
+    <public type="id" name="thread_browser_visibility_private" id="0x7F0A0DB6" />
+    <public type="id" name="thread_browser_visibility_public" id="0x7F0A0DB7" />
+    <public type="id" name="thread_embed_container" id="0x7F0A0DB8" />
+    <public type="id" name="thread_embed_icon" id="0x7F0A0DB9" />
+    <public type="id" name="thread_embed_message_center_guideline" id="0x7F0A0DBA" />
+    <public type="id" name="thread_embed_messages_count" id="0x7F0A0DBB" />
+    <public type="id" name="thread_embed_messages_count_chevron" id="0x7F0A0DBC" />
+    <public type="id" name="thread_embed_most_recent_message_avatar" id="0x7F0A0DBD" />
+    <public type="id" name="thread_embed_most_recent_message_content" id="0x7F0A0DBE" />
+    <public type="id" name="thread_embed_most_recent_message_header" id="0x7F0A0DBF" />
+    <public type="id" name="thread_embed_most_recent_message_name" id="0x7F0A0DC0" />
+    <public type="id" name="thread_embed_name" id="0x7F0A0DC1" />
+    <public type="id" name="thread_embed_selectable_background" id="0x7F0A0DC2" />
+    <public type="id" name="thread_embed_spine" id="0x7F0A0DC3" />
+    <public type="id" name="thread_icon" id="0x7F0A0DC4" />
+    <public type="id" name="thread_image" id="0x7F0A0DC5" />
+    <public type="id" name="thread_message" id="0x7F0A0DC6" />
+    <public type="id" name="thread_name" id="0x7F0A0DC7" />
+    <public type="id" name="thread_name_input" id="0x7F0A0DC8" />
+    <public type="id" name="thread_notification_settings_system" id="0x7F0A0DC9" />
+    <public type="id" name="thread_settings_edit_name" id="0x7F0A0DCA" />
+    <public type="id" name="thread_settings_edit_wrap" id="0x7F0A0DCB" />
+    <public type="id" name="thread_settings_notifications_frequency_0" id="0x7F0A0DCC" />
+    <public type="id" name="thread_settings_notifications_frequency_1" id="0x7F0A0DCD" />
+    <public type="id" name="thread_settings_notifications_frequency_2" id="0x7F0A0DCE" />
+    <public type="id" name="thread_settings_save" id="0x7F0A0DCF" />
+    <public type="id" name="thread_starter_message_header" id="0x7F0A0DD0" />
+    <public type="id" name="thread_starter_message_header_icon" id="0x7F0A0DD1" />
+    <public type="id" name="thread_starter_message_header_text" id="0x7F0A0DD2" />
+    <public type="id" name="thread_status" id="0x7F0A0DD3" />
+    <public type="id" name="thread_status_button" id="0x7F0A0DD4" />
+    <public type="id" name="thread_status_text" id="0x7F0A0DD5" />
+    <public type="id" name="thread_timestamp" id="0x7F0A0DD6" />
+    <public type="id" name="thread_timestamp_separator" id="0x7F0A0DD7" />
+    <public type="id" name="thread_view" id="0x7F0A0DD8" />
+    <public type="id" name="thumb_iv" id="0x7F0A0DD9" />
+    <public type="id" name="tier_1_stickers_perk" id="0x7F0A0DDA" />
+    <public type="id" name="tile" id="0x7F0A0DDB" />
+    <public type="id" name="time" id="0x7F0A0DDC" />
+    <public type="id" name="title" id="0x7F0A0DDD" />
+    <public type="id" name="titleDividerNoCustom" id="0x7F0A0DDE" />
+    <public type="id" name="title_template" id="0x7F0A0DDF" />
+    <public type="id" name="title_text_barrier" id="0x7F0A0DE0" />
+    <public type="id" name="toggle" id="0x7F0A0DE1" />
+    <public type="id" name="toggle_speaker_state_button" id="0x7F0A0DE2" />
+    <public type="id" name="toggle_speaker_state_group" id="0x7F0A0DE3" />
+    <public type="id" name="toggle_speaker_state_icon" id="0x7F0A0DE4" />
+    <public type="id" name="toolbar" id="0x7F0A0DE5" />
+    <public type="id" name="toolbar_presence" id="0x7F0A0DE6" />
+    <public type="id" name="toolbar_title" id="0x7F0A0DE7" />
+    <public type="id" name="toolbar_title_subtext" id="0x7F0A0DE8" />
+    <public type="id" name="top" id="0x7F0A0DE9" />
+    <public type="id" name="topPanel" id="0x7F0A0DEA" />
+    <public type="id" name="top_of_ui" id="0x7F0A0DEB" />
+    <public type="id" name="top_to_end" id="0x7F0A0DEC" />
+    <public type="id" name="topic_input" id="0x7F0A0DED" />
+    <public type="id" name="topic_label" id="0x7F0A0DEE" />
+    <public type="id" name="topic_layout" id="0x7F0A0DEF" />
+    <public type="id" name="torch" id="0x7F0A0DF0" />
+    <public type="id" name="touch_outside" id="0x7F0A0DF1" />
+    <public type="id" name="transitionToEnd" id="0x7F0A0DF2" />
+    <public type="id" name="transitionToStart" id="0x7F0A0DF3" />
+    <public type="id" name="transition_current_scene" id="0x7F0A0DF4" />
+    <public type="id" name="transition_layout_save" id="0x7F0A0DF5" />
+    <public type="id" name="transition_position" id="0x7F0A0DF6" />
+    <public type="id" name="transition_scene_layoutid_cache" id="0x7F0A0DF7" />
+    <public type="id" name="transition_transform" id="0x7F0A0DF8" />
+    <public type="id" name="transparency_layout" id="0x7F0A0DF9" />
+    <public type="id" name="transparency_seekbar" id="0x7F0A0DFA" />
+    <public type="id" name="transparency_text" id="0x7F0A0DFB" />
+    <public type="id" name="transparency_title" id="0x7F0A0DFC" />
+    <public type="id" name="transparent_space" id="0x7F0A0DFD" />
+    <public type="id" name="trash_wrap_icon" id="0x7F0A0DFE" />
+    <public type="id" name="trash_wrap_target_container" id="0x7F0A0DFF" />
+    <public type="id" name="trash_wrap_target_zone" id="0x7F0A0E00" />
+    <public type="id" name="triangle" id="0x7F0A0E01" />
+    <public type="id" name="tvText" id="0x7F0A0E02" />
+    <public type="id" name="tvTitle" id="0x7F0A0E03" />
+    <public type="id" name="type_iv" id="0x7F0A0E04" />
+    <public type="id" name="ucrop" id="0x7F0A0E05" />
+    <public type="id" name="ucrop_frame" id="0x7F0A0E06" />
+    <public type="id" name="ucrop_photobox" id="0x7F0A0E07" />
+    <public type="id" name="uikit_chat_guideline" id="0x7F0A0E08" />
+    <public type="id" name="uikit_icon_url" id="0x7F0A0E09" />
+    <public type="id" name="uikit_sheet_header_guideline" id="0x7F0A0E0A" />
+    <public type="id" name="unblock_user_button" id="0x7F0A0E0B" />
+    <public type="id" name="unchecked" id="0x7F0A0E0C" />
+    <public type="id" name="underage" id="0x7F0A0E0D" />
+    <public type="id" name="underage_warning" id="0x7F0A0E0E" />
+    <public type="id" name="unhandled_uri_display" id="0x7F0A0E0F" />
+    <public type="id" name="unhandled_uri_okay" id="0x7F0A0E10" />
+    <public type="id" name="uniform" id="0x7F0A0E11" />
+    <public type="id" name="unknown_sticker_sheet_sticker" id="0x7F0A0E12" />
+    <public type="id" name="unknown_sticker_sheet_sticker_name" id="0x7F0A0E13" />
+    <public type="id" name="unlabeled" id="0x7F0A0E14" />
+    <public type="id" name="unmute_button" id="0x7F0A0E15" />
+    <public type="id" name="unmute_button_details_label" id="0x7F0A0E16" />
+    <public type="id" name="unmute_button_label" id="0x7F0A0E17" />
+    <public type="id" name="unread" id="0x7F0A0E18" />
+    <public type="id" name="up" id="0x7F0A0E19" />
+    <public type="id" name="upgrade_button" id="0x7F0A0E1A" />
+    <public type="id" name="uploadBanner" id="0x7F0A0E1B" />
+    <public type="id" name="uploadSplash" id="0x7F0A0E1C" />
+    <public type="id" name="upload_banner" id="0x7F0A0E1D" />
+    <public type="id" name="upload_banner_fab" id="0x7F0A0E1E" />
+    <public type="id" name="upload_banner_learn_more" id="0x7F0A0E1F" />
+    <public type="id" name="upload_banner_nitro_tier" id="0x7F0A0E20" />
+    <public type="id" name="upload_banner_unlock" id="0x7F0A0E21" />
+    <public type="id" name="upload_debug_logs" id="0x7F0A0E22" />
+    <public type="id" name="upload_progress_1" id="0x7F0A0E23" />
+    <public type="id" name="upload_progress_2" id="0x7F0A0E24" />
+    <public type="id" name="upload_progress_3" id="0x7F0A0E25" />
+    <public type="id" name="upload_splash" id="0x7F0A0E26" />
+    <public type="id" name="upload_splash_learn_more" id="0x7F0A0E27" />
+    <public type="id" name="upload_splash_nitro_tier" id="0x7F0A0E28" />
+    <public type="id" name="upload_splash_unlock" id="0x7F0A0E29" />
+    <public type="id" name="upsell_body_text" id="0x7F0A0E2A" />
+    <public type="id" name="upsell_header_text" id="0x7F0A0E2B" />
+    <public type="id" name="url" id="0x7F0A0E2C" />
+    <public type="id" name="useLogo" id="0x7F0A0E2D" />
+    <public type="id" name="user_actions_dialog_avatar" id="0x7F0A0E2E" />
+    <public type="id" name="user_actions_dialog_block_item" id="0x7F0A0E2F" />
+    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7F0A0E30" />
+    <public type="id" name="user_actions_dialog_unblock_item" id="0x7F0A0E31" />
+    <public type="id" name="user_actions_dialog_user_name" id="0x7F0A0E32" />
+    <public type="id" name="user_avatar_presence_container" id="0x7F0A0E33" />
+    <public type="id" name="user_avatar_presence_status" id="0x7F0A0E34" />
+    <public type="id" name="user_limit_divider" id="0x7F0A0E35" />
+    <public type="id" name="user_limit_seekbar" id="0x7F0A0E36" />
+    <public type="id" name="user_limit_title" id="0x7F0A0E37" />
+    <public type="id" name="user_list_item_avatar" id="0x7F0A0E38" />
+    <public type="id" name="user_list_item_name" id="0x7F0A0E39" />
+    <public type="id" name="user_list_item_name_secondary" id="0x7F0A0E3A" />
+    <public type="id" name="user_list_item_status" id="0x7F0A0E3B" />
+    <public type="id" name="user_mentions_filter_include_everyone" id="0x7F0A0E3C" />
+    <public type="id" name="user_mentions_filter_include_roles" id="0x7F0A0E3D" />
+    <public type="id" name="user_mentions_filter_this_server" id="0x7F0A0E3E" />
+    <public type="id" name="user_mentions_list" id="0x7F0A0E3F" />
+    <public type="id" name="user_mutual_friends_recycler_view" id="0x7F0A0E40" />
+    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7F0A0E41" />
+    <public type="id" name="user_phone_add_description_note" id="0x7F0A0E42" />
+    <public type="id" name="user_phone_add_next" id="0x7F0A0E43" />
+    <public type="id" name="user_phone_add_number" id="0x7F0A0E44" />
+    <public type="id" name="user_phone_title" id="0x7F0A0E45" />
+    <public type="id" name="user_profile_adapter_item_empty" id="0x7F0A0E46" />
+    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7F0A0E47" />
+    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7F0A0E48" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7F0A0E49" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7F0A0E4A" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7F0A0E4B" />
+    <public type="id" name="user_profile_adapter_item_friend_status" id="0x7F0A0E4C" />
+    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7F0A0E4D" />
+    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7F0A0E4E" />
+    <public type="id" name="user_profile_adapter_item_server_image" id="0x7F0A0E4F" />
+    <public type="id" name="user_profile_adapter_item_server_name" id="0x7F0A0E50" />
+    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7F0A0E51" />
+    <public type="id" name="user_profile_adapter_item_server_text" id="0x7F0A0E52" />
+    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7F0A0E53" />
+    <public type="id" name="user_profile_admin_ban" id="0x7F0A0E54" />
+    <public type="id" name="user_profile_admin_edit_member" id="0x7F0A0E55" />
+    <public type="id" name="user_profile_admin_kick" id="0x7F0A0E56" />
+    <public type="id" name="user_profile_admin_server_deafen" id="0x7F0A0E57" />
+    <public type="id" name="user_profile_admin_server_disconnect" id="0x7F0A0E58" />
+    <public type="id" name="user_profile_admin_server_move" id="0x7F0A0E59" />
+    <public type="id" name="user_profile_admin_server_mute" id="0x7F0A0E5A" />
+    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7F0A0E5B" />
+    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7F0A0E5C" />
+    <public type="id" name="user_profile_connections_view_recycler" id="0x7F0A0E5D" />
+    <public type="id" name="user_profile_header_badges_recycler" id="0x7F0A0E5E" />
+    <public type="id" name="user_profile_header_custom_status" id="0x7F0A0E5F" />
+    <public type="id" name="user_profile_header_name_wrap" id="0x7F0A0E60" />
+    <public type="id" name="user_profile_header_primary_name" id="0x7F0A0E61" />
+    <public type="id" name="user_profile_header_secondary_name" id="0x7F0A0E62" />
+    <public type="id" name="user_profile_stage_invite_to_speak" id="0x7F0A0E63" />
+    <public type="id" name="user_profile_stage_move_to_audience" id="0x7F0A0E64" />
+    <public type="id" name="user_selected_checkbox" id="0x7F0A0E65" />
+    <public type="id" name="user_settings_header" id="0x7F0A0E66" />
+    <public type="id" name="user_settings_mfa_enable_input_code" id="0x7F0A0E67" />
+    <public type="id" name="user_settings_profile_header_view" id="0x7F0A0E68" />
+    <public type="id" name="user_sheet_add_friend_action_button" id="0x7F0A0E69" />
+    <public type="id" name="user_sheet_admin_card" id="0x7F0A0E6A" />
+    <public type="id" name="user_sheet_admin_view" id="0x7F0A0E6B" />
+    <public type="id" name="user_sheet_badge_image" id="0x7F0A0E6C" />
+    <public type="id" name="user_sheet_call_action_button" id="0x7F0A0E6D" />
+    <public type="id" name="user_sheet_connections_header" id="0x7F0A0E6E" />
+    <public type="id" name="user_sheet_connections_view" id="0x7F0A0E6F" />
+    <public type="id" name="user_sheet_content" id="0x7F0A0E70" />
+    <public type="id" name="user_sheet_copy_id" id="0x7F0A0E71" />
+    <public type="id" name="user_sheet_deafen" id="0x7F0A0E72" />
+    <public type="id" name="user_sheet_developer_header" id="0x7F0A0E73" />
+    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7F0A0E74" />
+    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7F0A0E75" />
+    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7F0A0E76" />
+    <public type="id" name="user_sheet_guild_container" id="0x7F0A0E77" />
+    <public type="id" name="user_sheet_guild_header" id="0x7F0A0E78" />
+    <public type="id" name="user_sheet_header" id="0x7F0A0E79" />
+    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7F0A0E7A" />
+    <public type="id" name="user_sheet_loading_container" id="0x7F0A0E7B" />
+    <public type="id" name="user_sheet_message_action_button" id="0x7F0A0E7C" />
+    <public type="id" name="user_sheet_more_button" id="0x7F0A0E7D" />
+    <public type="id" name="user_sheet_muted" id="0x7F0A0E7E" />
+    <public type="id" name="user_sheet_note_header" id="0x7F0A0E7F" />
+    <public type="id" name="user_sheet_note_text_field" id="0x7F0A0E80" />
+    <public type="id" name="user_sheet_note_text_field_wrap" id="0x7F0A0E81" />
+    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7F0A0E82" />
+    <public type="id" name="user_sheet_profile_actions_container" id="0x7F0A0E83" />
+    <public type="id" name="user_sheet_profile_actions_divider" id="0x7F0A0E84" />
+    <public type="id" name="user_sheet_profile_header_view" id="0x7F0A0E85" />
+    <public type="id" name="user_sheet_profile_stage_actions_card" id="0x7F0A0E86" />
+    <public type="id" name="user_sheet_profile_stage_actions_view" id="0x7F0A0E87" />
+    <public type="id" name="user_sheet_profile_voice_settings_header" id="0x7F0A0E88" />
+    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7F0A0E89" />
+    <public type="id" name="user_sheet_roles_list" id="0x7F0A0E8A" />
+    <public type="id" name="user_sheet_video_action_button" id="0x7F0A0E8B" />
+    <public type="id" name="user_sheet_volume_label" id="0x7F0A0E8C" />
+    <public type="id" name="user_sheet_volume_slider" id="0x7F0A0E8D" />
+    <public type="id" name="user_status_presence_custom_clear" id="0x7F0A0E8E" />
+    <public type="id" name="user_status_presence_custom_emoji" id="0x7F0A0E8F" />
+    <public type="id" name="user_status_presence_custom_text" id="0x7F0A0E90" />
+    <public type="id" name="user_status_presence_dot" id="0x7F0A0E91" />
+    <public type="id" name="user_status_presence_subtitle" id="0x7F0A0E92" />
+    <public type="id" name="user_status_presence_title" id="0x7F0A0E93" />
+    <public type="id" name="user_status_update_custom" id="0x7F0A0E94" />
+    <public type="id" name="user_status_update_dnd" id="0x7F0A0E95" />
+    <public type="id" name="user_status_update_idle" id="0x7F0A0E96" />
+    <public type="id" name="user_status_update_invisible" id="0x7F0A0E97" />
+    <public type="id" name="user_status_update_online" id="0x7F0A0E98" />
+    <public type="id" name="user_summary" id="0x7F0A0E99" />
+    <public type="id" name="user_summary_label" id="0x7F0A0E9A" />
+    <public type="id" name="username_placeholder_end_guideline" id="0x7F0A0E9B" />
+    <public type="id" name="username_tag" id="0x7F0A0E9C" />
+    <public type="id" name="username_text" id="0x7F0A0E9D" />
+    <public type="id" name="vAlertContentContainer" id="0x7F0A0E9E" />
+    <public type="id" name="value_prop_image" id="0x7F0A0E9F" />
+    <public type="id" name="verify" id="0x7F0A0EA0" />
+    <public type="id" name="verify_account_by_email" id="0x7F0A0EA1" />
+    <public type="id" name="verify_account_by_phone" id="0x7F0A0EA2" />
+    <public type="id" name="verify_account_support" id="0x7F0A0EA3" />
+    <public type="id" name="verify_account_text_body" id="0x7F0A0EA4" />
+    <public type="id" name="verify_char_1" id="0x7F0A0EA5" />
+    <public type="id" name="verify_char_2" id="0x7F0A0EA6" />
+    <public type="id" name="verify_char_3" id="0x7F0A0EA7" />
+    <public type="id" name="verify_char_4" id="0x7F0A0EA8" />
+    <public type="id" name="verify_char_5" id="0x7F0A0EA9" />
+    <public type="id" name="verify_char_6" id="0x7F0A0EAA" />
+    <public type="id" name="video" id="0x7F0A0EAB" />
+    <public type="id" name="video_button" id="0x7F0A0EAC" />
+    <public type="id" name="video_decoder_gl_surface_view" id="0x7F0A0EAD" />
+    <public type="id" name="view_dialog_confirmation_cancel" id="0x7F0A0EAE" />
+    <public type="id" name="view_dialog_confirmation_confirm" id="0x7F0A0EAF" />
+    <public type="id" name="view_dialog_confirmation_header" id="0x7F0A0EB0" />
+    <public type="id" name="view_dialog_confirmation_text" id="0x7F0A0EB1" />
+    <public type="id" name="view_input" id="0x7F0A0EB2" />
+    <public type="id" name="view_interaction_failed_label_icon" id="0x7F0A0EB3" />
+    <public type="id" name="view_interaction_failed_label_message" id="0x7F0A0EB4" />
+    <public type="id" name="view_offset_helper" id="0x7F0A0EB5" />
+    <public type="id" name="view_overlay" id="0x7F0A0EB6" />
+    <public type="id" name="view_premium_marketing_container_tier1" id="0x7F0A0EB7" />
+    <public type="id" name="view_premium_marketing_learn_more" id="0x7F0A0EB8" />
+    <public type="id" name="view_premium_marketing_marketing_container" id="0x7F0A0EB9" />
+    <public type="id" name="view_premium_marketing_marketing_subtitle" id="0x7F0A0EBA" />
+    <public type="id" name="view_premium_marketing_marketing_title" id="0x7F0A0EBB" />
+    <public type="id" name="view_premium_marketing_nitro_boost_count" id="0x7F0A0EBC" />
+    <public type="id" name="view_premium_marketing_nitro_boost_discount" id="0x7F0A0EBD" />
+    <public type="id" name="view_premium_marketing_nitro_classic_boost_count" id="0x7F0A0EBE" />
+    <public type="id" name="view_premium_marketing_nitro_classic_boost_discount" id="0x7F0A0EBF" />
+    <public type="id" name="view_premium_upsell_info_subheading" id="0x7F0A0EC0" />
+    <public type="id" name="view_premium_upsell_info_subheading_blurb" id="0x7F0A0EC1" />
+    <public type="id" name="view_premium_upsell_info_subheading_price" id="0x7F0A0EC2" />
+    <public type="id" name="view_tree_lifecycle_owner" id="0x7F0A0EC3" />
+    <public type="id" name="view_tree_saved_state_registry_owner" id="0x7F0A0EC4" />
+    <public type="id" name="view_tree_view_model_store_owner" id="0x7F0A0EC5" />
+    <public type="id" name="view_typing_dots_1" id="0x7F0A0EC6" />
+    <public type="id" name="view_typing_dots_2" id="0x7F0A0EC7" />
+    <public type="id" name="view_typing_dots_3" id="0x7F0A0EC8" />
+    <public type="id" name="visible" id="0x7F0A0EC9" />
+    <public type="id" name="visible_removing_fragment_view_tag" id="0x7F0A0ECA" />
+    <public type="id" name="visit_community_icon" id="0x7F0A0ECB" />
+    <public type="id" name="visit_community_icon_text" id="0x7F0A0ECC" />
+    <public type="id" name="visit_community_text" id="0x7F0A0ECD" />
+    <public type="id" name="voice" id="0x7F0A0ECE" />
+    <public type="id" name="voice_bottom_sheet_bottom_content_container" id="0x7F0A0ECF" />
+    <public type="id" name="voice_bottom_sheet_connect" id="0x7F0A0ED0" />
+    <public type="id" name="voice_bottom_sheet_connect_container" id="0x7F0A0ED1" />
+    <public type="id" name="voice_bottom_sheet_controls" id="0x7F0A0ED2" />
+    <public type="id" name="voice_bottom_sheet_header_deafen" id="0x7F0A0ED3" />
+    <public type="id" name="voice_bottom_sheet_header_icon" id="0x7F0A0ED4" />
+    <public type="id" name="voice_bottom_sheet_header_invite" id="0x7F0A0ED5" />
+    <public type="id" name="voice_bottom_sheet_header_noise_cancellation" id="0x7F0A0ED6" />
+    <public type="id" name="voice_bottom_sheet_header_settings" id="0x7F0A0ED7" />
+    <public type="id" name="voice_bottom_sheet_header_subtitle" id="0x7F0A0ED8" />
+    <public type="id" name="voice_bottom_sheet_header_title" id="0x7F0A0ED9" />
+    <public type="id" name="voice_bottom_sheet_join_video" id="0x7F0A0EDA" />
+    <public type="id" name="voice_bottom_sheet_recycler" id="0x7F0A0EDB" />
+    <public type="id" name="voice_bottom_sheet_root" id="0x7F0A0EDC" />
+    <public type="id" name="voice_call_inline_container" id="0x7F0A0EDD" />
+    <public type="id" name="voice_connected_ptt" id="0x7F0A0EDE" />
+    <public type="id" name="voice_controls_sheet_view" id="0x7F0A0EDF" />
+    <public type="id" name="voice_fullscreen_controls_camera" id="0x7F0A0EE0" />
+    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7F0A0EE1" />
+    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7F0A0EE2" />
+    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7F0A0EE3" />
+    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7F0A0EE4" />
+    <public type="id" name="voice_fullscreen_controls_screenshare" id="0x7F0A0EE5" />
+    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7F0A0EE6" />
+    <public type="id" name="voice_settings_invite" id="0x7F0A0EE7" />
+    <public type="id" name="voice_settings_noise_suppression" id="0x7F0A0EE8" />
+    <public type="id" name="voice_settings_report" id="0x7F0A0EE9" />
+    <public type="id" name="voice_settings_sheet_container" id="0x7F0A0EEA" />
+    <public type="id" name="voice_settings_stage_settings" id="0x7F0A0EEB" />
+    <public type="id" name="voice_settings_toggle_video_participants" id="0x7F0A0EEC" />
+    <public type="id" name="voice_settings_view_card" id="0x7F0A0EED" />
+    <public type="id" name="voice_settings_voice_settings" id="0x7F0A0EEE" />
+    <public type="id" name="voice_user_avatar" id="0x7F0A0EEF" />
+    <public type="id" name="voice_user_limit_current" id="0x7F0A0EF0" />
+    <public type="id" name="voice_user_limit_max" id="0x7F0A0EF1" />
+    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7F0A0EF2" />
+    <public type="id" name="voice_user_list_item_header_label" id="0x7F0A0EF3" />
+    <public type="id" name="voice_user_list_item_live_indicator" id="0x7F0A0EF4" />
+    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7F0A0EF5" />
+    <public type="id" name="voice_user_list_item_spectating_indicator" id="0x7F0A0EF6" />
+    <public type="id" name="voice_user_list_item_toggle_ringing" id="0x7F0A0EF7" />
+    <public type="id" name="voice_user_list_item_user_avatar" id="0x7F0A0EF8" />
+    <public type="id" name="voice_user_list_item_user_name" id="0x7F0A0EF9" />
+    <public type="id" name="voice_user_list_item_user_stream_preview" id="0x7F0A0EFA" />
+    <public type="id" name="voice_user_list_item_video_indicator" id="0x7F0A0EFB" />
+    <public type="id" name="voice_user_name_display" id="0x7F0A0EFC" />
+    <public type="id" name="volume_slider_max_vol" id="0x7F0A0EFD" />
+    <public type="id" name="volume_slider_min_vol" id="0x7F0A0EFE" />
+    <public type="id" name="volume_slider_seek_bar" id="0x7F0A0EFF" />
+    <public type="id" name="webView" id="0x7F0A0F00" />
+    <public type="id" name="welcome_card_invite_friends" id="0x7F0A0F01" />
+    <public type="id" name="welcome_card_upload_icon" id="0x7F0A0F02" />
+    <public type="id" name="when_playing" id="0x7F0A0F03" />
+    <public type="id" name="wide" id="0x7F0A0F04" />
+    <public type="id" name="widget_add_friend_user_list_item" id="0x7F0A0F05" />
+    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7F0A0F06" />
+    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7F0A0F07" />
+    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7F0A0F08" />
+    <public type="id" name="widget_auth_mfa_info_okay" id="0x7F0A0F09" />
+    <public type="id" name="widget_auth_mfa_info_text" id="0x7F0A0F0A" />
+    <public type="id" name="widget_bug_report_severity_touch_delegate" id="0x7F0A0F0B" />
+    <public type="id" name="widget_channel_action_bar" id="0x7F0A0F0C" />
+    <public type="id" name="widget_channel_search_item" id="0x7F0A0F0D" />
+    <public type="id" name="widget_channel_search_item_remove" id="0x7F0A0F0E" />
+    <public type="id" name="widget_channel_sidebar_actions_guild_view" id="0x7F0A0F0F" />
+    <public type="id" name="widget_channel_sidebar_actions_private_view" id="0x7F0A0F10" />
+    <public type="id" name="widget_channel_topic" id="0x7F0A0F11" />
+    <public type="id" name="widget_channels" id="0x7F0A0F12" />
+    <public type="id" name="widget_channels_list_container" id="0x7F0A0F13" />
+    <public type="id" name="widget_channels_list_empty_friends_state_cs_view" id="0x7F0A0F14" />
+    <public type="id" name="widget_channels_list_empty_friends_state_view" id="0x7F0A0F15" />
+    <public type="id" name="widget_chat_bottom_space" id="0x7F0A0F16" />
+    <public type="id" name="widget_chat_input" id="0x7F0A0F17" />
+    <public type="id" name="widget_chat_list" id="0x7F0A0F18" />
+    <public type="id" name="widget_chat_overlay_actions" id="0x7F0A0F19" />
+    <public type="id" name="widget_chat_voice_inline" id="0x7F0A0F1A" />
+    <public type="id" name="widget_collapsed_user_count" id="0x7F0A0F1B" />
+    <public type="id" name="widget_collapsed_user_imageview" id="0x7F0A0F1C" />
+    <public type="id" name="widget_connected_list" id="0x7F0A0F1D" />
+    <public type="id" name="widget_connection_integration_guild_handle" id="0x7F0A0F1E" />
+    <public type="id" name="widget_connection_integration_guild_icon" id="0x7F0A0F1F" />
+    <public type="id" name="widget_connection_integration_guild_join_error" id="0x7F0A0F20" />
+    <public type="id" name="widget_connection_integration_guild_name" id="0x7F0A0F21" />
+    <public type="id" name="widget_connection_integration_join_guild" id="0x7F0A0F22" />
+    <public type="id" name="widget_global_search_container" id="0x7F0A0F23" />
+    <public type="id" name="widget_global_status" id="0x7F0A0F24" />
+    <public type="id" name="widget_guilds" id="0x7F0A0F25" />
+    <public type="id" name="widget_home_container" id="0x7F0A0F26" />
+    <public type="id" name="widget_profile_strip" id="0x7F0A0F27" />
+    <public type="id" name="widget_search_input" id="0x7F0A0F28" />
+    <public type="id" name="widget_search_results" id="0x7F0A0F29" />
+    <public type="id" name="widget_search_suggestions" id="0x7F0A0F2A" />
+    <public type="id" name="widget_server_settings_channels_container" id="0x7F0A0F2B" />
+    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7F0A0F2C" />
+    <public type="id" name="widget_server_settings_emojis_section" id="0x7F0A0F2D" />
+    <public type="id" name="widget_server_settings_emojis_upload" id="0x7F0A0F2E" />
+    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7F0A0F2F" />
+    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7F0A0F30" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_header" id="0x7F0A0F31" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_placeholder" id="0x7F0A0F32" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_recycler" id="0x7F0A0F33" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_select" id="0x7F0A0F34" />
+    <public type="id" name="widget_sheet_component_bottom_sheet_subtitle" id="0x7F0A0F35" />
+    <public type="id" name="widget_simple_bottom_sheet_selector_header" id="0x7F0A0F36" />
+    <public type="id" name="widget_simple_bottom_sheet_selector_placeholder" id="0x7F0A0F37" />
+    <public type="id" name="widget_simple_bottom_sheet_selector_recycler" id="0x7F0A0F38" />
+    <public type="id" name="widget_stage_channel_details_blocked_count" id="0x7F0A0F39" />
+    <public type="id" name="widget_stage_channel_details_blocked_icon" id="0x7F0A0F3A" />
+    <public type="id" name="widget_stage_channel_details_dot" id="0x7F0A0F3B" />
+    <public type="id" name="widget_stage_channel_details_listener_count" id="0x7F0A0F3C" />
+    <public type="id" name="widget_stage_channel_details_listener_icon" id="0x7F0A0F3D" />
+    <public type="id" name="widget_stage_channel_details_name" id="0x7F0A0F3E" />
+    <public type="id" name="widget_stage_channel_details_speaker_count" id="0x7F0A0F3F" />
+    <public type="id" name="widget_stage_channel_details_speaker_icon" id="0x7F0A0F40" />
+    <public type="id" name="widget_stage_channel_details_topic" id="0x7F0A0F41" />
+    <public type="id" name="widget_status" id="0x7F0A0F42" />
+    <public type="id" name="widget_tabs_host_bottom_navigation_view" id="0x7F0A0F43" />
+    <public type="id" name="widget_tabs_host_container" id="0x7F0A0F44" />
+    <public type="id" name="widget_tabs_host_discovery" id="0x7F0A0F45" />
+    <public type="id" name="widget_tabs_host_friends" id="0x7F0A0F46" />
+    <public type="id" name="widget_tabs_host_global_status_indicator" id="0x7F0A0F47" />
+    <public type="id" name="widget_tabs_host_home" id="0x7F0A0F48" />
+    <public type="id" name="widget_tabs_host_mentions" id="0x7F0A0F49" />
+    <public type="id" name="widget_tabs_host_nav_host" id="0x7F0A0F4A" />
+    <public type="id" name="widget_tabs_host_non_fullscreen_nav_host" id="0x7F0A0F4B" />
+    <public type="id" name="widget_tabs_host_user_settings" id="0x7F0A0F4C" />
+    <public type="id" name="widget_thread_status" id="0x7F0A0F4D" />
+    <public type="id" name="withText" id="0x7F0A0F4E" />
+    <public type="id" name="withinBounds" id="0x7F0A0F4F" />
+    <public type="id" name="wrap" id="0x7F0A0F50" />
+    <public type="id" name="wrap_content" id="0x7F0A0F51" />
+    <public type="id" name="wrap_reverse" id="0x7F0A0F52" />
+    <public type="id" name="wrapper_controls" id="0x7F0A0F53" />
+    <public type="id" name="wrapper_reset_rotate" id="0x7F0A0F54" />
+    <public type="id" name="wrapper_rotate_by_angle" id="0x7F0A0F55" />
+    <public type="id" name="wrapper_states" id="0x7F0A0F56" />
+    <public type="id" name="zero_corner_chip" id="0x7F0A0F57" />
+    <public type="id" name="zoom" id="0x7F0A0F58" />
     <public type="integer" name="abc_config_activityDefaultDur" id="0x7F0B0000" />
     <public type="integer" name="abc_config_activityShortDur" id="0x7F0B0001" />
     <public type="integer" name="animation_time_fast" id="0x7F0B0002" />
@@ -8834,35 +8905,36 @@
     <public type="integer" name="bottom_sheet_slide_duration" id="0x7F0B0006" />
     <public type="integer" name="cancel_button_image_alpha" id="0x7F0B0007" />
     <public type="integer" name="config_tooltipAnimTime" id="0x7F0B0008" />
-    <public type="integer" name="design_snackbar_text_max_lines" id="0x7F0B0009" />
-    <public type="integer" name="design_tab_indicator_anim_duration_ms" id="0x7F0B000A" />
-    <public type="integer" name="exo_media_button_opacity_percentage_disabled" id="0x7F0B000B" />
-    <public type="integer" name="exo_media_button_opacity_percentage_enabled" id="0x7F0B000C" />
-    <public type="integer" name="google_play_services_version" id="0x7F0B000D" />
-    <public type="integer" name="hide_password_duration" id="0x7F0B000E" />
-    <public type="integer" name="mtrl_badge_max_character_count" id="0x7F0B000F" />
-    <public type="integer" name="mtrl_btn_anim_delay_ms" id="0x7F0B0010" />
-    <public type="integer" name="mtrl_btn_anim_duration_ms" id="0x7F0B0011" />
-    <public type="integer" name="mtrl_calendar_header_orientation" id="0x7F0B0012" />
-    <public type="integer" name="mtrl_calendar_selection_text_lines" id="0x7F0B0013" />
-    <public type="integer" name="mtrl_calendar_year_selector_span" id="0x7F0B0014" />
-    <public type="integer" name="mtrl_card_anim_delay_ms" id="0x7F0B0015" />
-    <public type="integer" name="mtrl_card_anim_duration_ms" id="0x7F0B0016" />
-    <public type="integer" name="mtrl_chip_anim_duration" id="0x7F0B0017" />
-    <public type="integer" name="mtrl_tab_indicator_anim_duration_ms" id="0x7F0B0018" />
-    <public type="integer" name="show_password_duration" id="0x7F0B0019" />
-    <public type="integer" name="status_bar_notification_info_maxnum" id="0x7F0B001A" />
-    <public type="integer" name="typing_dots_max_alpha" id="0x7F0B001B" />
-    <public type="integer" name="typing_dots_max_scale" id="0x7F0B001C" />
-    <public type="integer" name="typing_dots_min_alpha" id="0x7F0B001D" />
-    <public type="integer" name="typing_dots_min_scale" id="0x7F0B001E" />
-    <public type="integer" name="ucrop_progress_loading_anim_time" id="0x7F0B001F" />
-    <public type="integer" name="uikit_badge_angle" id="0x7F0B0020" />
-    <public type="integer" name="uikit_textsize_large_sp" id="0x7F0B0021" />
-    <public type="integer" name="uikit_textsize_medium_sp" id="0x7F0B0022" />
-    <public type="integer" name="uikit_textsize_xxlarge_sp" id="0x7F0B0023" />
-    <public type="integer" name="viewfinder_border_length" id="0x7F0B0024" />
-    <public type="integer" name="viewfinder_border_width" id="0x7F0B0025" />
+    <public type="integer" name="custom_profiles_bio_max_length" id="0x7F0B0009" />
+    <public type="integer" name="design_snackbar_text_max_lines" id="0x7F0B000A" />
+    <public type="integer" name="design_tab_indicator_anim_duration_ms" id="0x7F0B000B" />
+    <public type="integer" name="exo_media_button_opacity_percentage_disabled" id="0x7F0B000C" />
+    <public type="integer" name="exo_media_button_opacity_percentage_enabled" id="0x7F0B000D" />
+    <public type="integer" name="google_play_services_version" id="0x7F0B000E" />
+    <public type="integer" name="hide_password_duration" id="0x7F0B000F" />
+    <public type="integer" name="mtrl_badge_max_character_count" id="0x7F0B0010" />
+    <public type="integer" name="mtrl_btn_anim_delay_ms" id="0x7F0B0011" />
+    <public type="integer" name="mtrl_btn_anim_duration_ms" id="0x7F0B0012" />
+    <public type="integer" name="mtrl_calendar_header_orientation" id="0x7F0B0013" />
+    <public type="integer" name="mtrl_calendar_selection_text_lines" id="0x7F0B0014" />
+    <public type="integer" name="mtrl_calendar_year_selector_span" id="0x7F0B0015" />
+    <public type="integer" name="mtrl_card_anim_delay_ms" id="0x7F0B0016" />
+    <public type="integer" name="mtrl_card_anim_duration_ms" id="0x7F0B0017" />
+    <public type="integer" name="mtrl_chip_anim_duration" id="0x7F0B0018" />
+    <public type="integer" name="mtrl_tab_indicator_anim_duration_ms" id="0x7F0B0019" />
+    <public type="integer" name="show_password_duration" id="0x7F0B001A" />
+    <public type="integer" name="status_bar_notification_info_maxnum" id="0x7F0B001B" />
+    <public type="integer" name="typing_dots_max_alpha" id="0x7F0B001C" />
+    <public type="integer" name="typing_dots_max_scale" id="0x7F0B001D" />
+    <public type="integer" name="typing_dots_min_alpha" id="0x7F0B001E" />
+    <public type="integer" name="typing_dots_min_scale" id="0x7F0B001F" />
+    <public type="integer" name="ucrop_progress_loading_anim_time" id="0x7F0B0020" />
+    <public type="integer" name="uikit_badge_angle" id="0x7F0B0021" />
+    <public type="integer" name="uikit_textsize_large_sp" id="0x7F0B0022" />
+    <public type="integer" name="uikit_textsize_medium_sp" id="0x7F0B0023" />
+    <public type="integer" name="uikit_textsize_xxlarge_sp" id="0x7F0B0024" />
+    <public type="integer" name="viewfinder_border_length" id="0x7F0B0025" />
+    <public type="integer" name="viewfinder_border_width" id="0x7F0B0026" />
     <public type="interpolator" name="btn_checkbox_checked_mtrl_animation_interpolator_0" id="0x7F0C0000" />
     <public type="interpolator" name="btn_checkbox_checked_mtrl_animation_interpolator_1" id="0x7F0C0001" />
     <public type="interpolator" name="btn_checkbox_unchecked_mtrl_animation_interpolator_0" id="0x7F0C0002" />
@@ -9066,80 +9138,80 @@
     <public type="layout" name="mtrl_picker_header_toggle" id="0x7F0D00BD" />
     <public type="layout" name="mtrl_picker_text_input_date" id="0x7F0D00BE" />
     <public type="layout" name="mtrl_picker_text_input_date_range" id="0x7F0D00BF" />
-    <public type="layout" name="notification_action" id="0x7F0D00C0" />
-    <public type="layout" name="notification_action_tombstone" id="0x7F0D00C1" />
-    <public type="layout" name="notification_media_action" id="0x7F0D00C2" />
-    <public type="layout" name="notification_media_cancel_action" id="0x7F0D00C3" />
-    <public type="layout" name="notification_mute_settings_view" id="0x7F0D00C4" />
-    <public type="layout" name="notification_template_big_media" id="0x7F0D00C5" />
-    <public type="layout" name="notification_template_big_media_custom" id="0x7F0D00C6" />
-    <public type="layout" name="notification_template_big_media_narrow" id="0x7F0D00C7" />
-    <public type="layout" name="notification_template_big_media_narrow_custom" id="0x7F0D00C8" />
-    <public type="layout" name="notification_template_custom_big" id="0x7F0D00C9" />
-    <public type="layout" name="notification_template_icon_group" id="0x7F0D00CA" />
-    <public type="layout" name="notification_template_lines_media" id="0x7F0D00CB" />
-    <public type="layout" name="notification_template_media" id="0x7F0D00CC" />
-    <public type="layout" name="notification_template_media_custom" id="0x7F0D00CD" />
-    <public type="layout" name="notification_template_part_chronometer" id="0x7F0D00CE" />
-    <public type="layout" name="notification_template_part_time" id="0x7F0D00CF" />
-    <public type="layout" name="oauth_token_permission_detailed_list_item" id="0x7F0D00D0" />
-    <public type="layout" name="oauth_token_permission_list_item" id="0x7F0D00D1" />
-    <public type="layout" name="overlay_bubble_menu" id="0x7F0D00D2" />
-    <public type="layout" name="overlay_menu_voice_members_item" id="0x7F0D00D3" />
-    <public type="layout" name="overlay_voice_bubble" id="0x7F0D00D4" />
-    <public type="layout" name="overlay_voice_channel_selector" id="0x7F0D00D5" />
-    <public type="layout" name="payment_method_list_add_item" id="0x7F0D00D6" />
-    <public type="layout" name="payment_method_list_header" id="0x7F0D00D7" />
-    <public type="layout" name="payment_method_list_item" id="0x7F0D00D8" />
-    <public type="layout" name="payment_source_view" id="0x7F0D00D9" />
-    <public type="layout" name="preference" id="0x7F0D00DA" />
-    <public type="layout" name="preference_category" id="0x7F0D00DB" />
-    <public type="layout" name="preference_category_material" id="0x7F0D00DC" />
-    <public type="layout" name="preference_dialog_edittext" id="0x7F0D00DD" />
-    <public type="layout" name="preference_dropdown" id="0x7F0D00DE" />
-    <public type="layout" name="preference_dropdown_material" id="0x7F0D00DF" />
-    <public type="layout" name="preference_information" id="0x7F0D00E0" />
-    <public type="layout" name="preference_information_material" id="0x7F0D00E1" />
-    <public type="layout" name="preference_list_fragment" id="0x7F0D00E2" />
-    <public type="layout" name="preference_material" id="0x7F0D00E3" />
-    <public type="layout" name="preference_recyclerview" id="0x7F0D00E4" />
-    <public type="layout" name="preference_widget_checkbox" id="0x7F0D00E5" />
-    <public type="layout" name="preference_widget_seekbar" id="0x7F0D00E6" />
-    <public type="layout" name="preference_widget_seekbar_material" id="0x7F0D00E7" />
-    <public type="layout" name="preference_widget_switch" id="0x7F0D00E8" />
-    <public type="layout" name="preference_widget_switch_compat" id="0x7F0D00E9" />
-    <public type="layout" name="premium_activated_dialog" id="0x7F0D00EA" />
-    <public type="layout" name="premium_and_premium_guild_activated_dialog" id="0x7F0D00EB" />
-    <public type="layout" name="premium_guild_subscription_activated_dialog" id="0x7F0D00EC" />
-    <public type="layout" name="premium_guild_subscription_cancel_dialog" id="0x7F0D00ED" />
-    <public type="layout" name="premium_guild_subscription_uncancel_dialog" id="0x7F0D00EE" />
-    <public type="layout" name="premium_guild_upgrade_dialog" id="0x7F0D00EF" />
-    <public type="layout" name="premium_sticker_pack_upsell_tier_1_dialog" id="0x7F0D00F0" />
-    <public type="layout" name="premium_sticker_pack_upsell_tier_2_dialog" id="0x7F0D00F1" />
-    <public type="layout" name="premium_upgrade_yearly_dialog" id="0x7F0D00F2" />
-    <public type="layout" name="premium_upsell_dialog" id="0x7F0D00F3" />
-    <public type="layout" name="private_channel_side_bar_actions_view" id="0x7F0D00F4" />
-    <public type="layout" name="publish_message_dialog" id="0x7F0D00F5" />
-    <public type="layout" name="reaction_quick_add" id="0x7F0D00F6" />
-    <public type="layout" name="reaction_view" id="0x7F0D00F7" />
-    <public type="layout" name="recycler_item_bottom_nav_space" id="0x7F0D00F8" />
-    <public type="layout" name="removable_permission_owner_view" id="0x7F0D00F9" />
-    <public type="layout" name="search_input_view" id="0x7F0D00FA" />
-    <public type="layout" name="select_dialog_item_material" id="0x7F0D00FB" />
-    <public type="layout" name="select_dialog_multichoice_material" id="0x7F0D00FC" />
-    <public type="layout" name="select_dialog_singlechoice_material" id="0x7F0D00FD" />
-    <public type="layout" name="selectable_list_item" id="0x7F0D00FE" />
-    <public type="layout" name="server_settings_members_role_spinner_item" id="0x7F0D00FF" />
-    <public type="layout" name="server_settings_members_role_spinner_item_open" id="0x7F0D0100" />
-    <public type="layout" name="settings_channel_list_category_item" id="0x7F0D0101" />
-    <public type="layout" name="settings_channel_list_item" id="0x7F0D0102" />
-    <public type="layout" name="simple_member_list_item" id="0x7F0D0103" />
-    <public type="layout" name="simple_role_list_item" id="0x7F0D0104" />
-    <public type="layout" name="sparkle_view" id="0x7F0D0105" />
-    <public type="layout" name="stage_audience_blocked_bottom_sheet_header_item" id="0x7F0D0106" />
-    <public type="layout" name="stage_audience_blocked_bottom_sheet_item" id="0x7F0D0107" />
-    <public type="layout" name="stage_raised_hands_item_user" id="0x7F0D0108" />
-    <public type="layout" name="sticker_autocomplete_item" id="0x7F0D0109" />
+    <public type="layout" name="multi_value_prop_premium_upsell_dialog" id="0x7F0D00C0" />
+    <public type="layout" name="notification_action" id="0x7F0D00C1" />
+    <public type="layout" name="notification_action_tombstone" id="0x7F0D00C2" />
+    <public type="layout" name="notification_media_action" id="0x7F0D00C3" />
+    <public type="layout" name="notification_media_cancel_action" id="0x7F0D00C4" />
+    <public type="layout" name="notification_mute_settings_view" id="0x7F0D00C5" />
+    <public type="layout" name="notification_template_big_media" id="0x7F0D00C6" />
+    <public type="layout" name="notification_template_big_media_custom" id="0x7F0D00C7" />
+    <public type="layout" name="notification_template_big_media_narrow" id="0x7F0D00C8" />
+    <public type="layout" name="notification_template_big_media_narrow_custom" id="0x7F0D00C9" />
+    <public type="layout" name="notification_template_custom_big" id="0x7F0D00CA" />
+    <public type="layout" name="notification_template_icon_group" id="0x7F0D00CB" />
+    <public type="layout" name="notification_template_lines_media" id="0x7F0D00CC" />
+    <public type="layout" name="notification_template_media" id="0x7F0D00CD" />
+    <public type="layout" name="notification_template_media_custom" id="0x7F0D00CE" />
+    <public type="layout" name="notification_template_part_chronometer" id="0x7F0D00CF" />
+    <public type="layout" name="notification_template_part_time" id="0x7F0D00D0" />
+    <public type="layout" name="oauth_token_permission_detailed_list_item" id="0x7F0D00D1" />
+    <public type="layout" name="oauth_token_permission_list_item" id="0x7F0D00D2" />
+    <public type="layout" name="overlay_bubble_menu" id="0x7F0D00D3" />
+    <public type="layout" name="overlay_menu_voice_members_item" id="0x7F0D00D4" />
+    <public type="layout" name="overlay_voice_bubble" id="0x7F0D00D5" />
+    <public type="layout" name="overlay_voice_channel_selector" id="0x7F0D00D6" />
+    <public type="layout" name="payment_method_list_add_item" id="0x7F0D00D7" />
+    <public type="layout" name="payment_method_list_header" id="0x7F0D00D8" />
+    <public type="layout" name="payment_method_list_item" id="0x7F0D00D9" />
+    <public type="layout" name="payment_source_view" id="0x7F0D00DA" />
+    <public type="layout" name="preference" id="0x7F0D00DB" />
+    <public type="layout" name="preference_category" id="0x7F0D00DC" />
+    <public type="layout" name="preference_category_material" id="0x7F0D00DD" />
+    <public type="layout" name="preference_dialog_edittext" id="0x7F0D00DE" />
+    <public type="layout" name="preference_dropdown" id="0x7F0D00DF" />
+    <public type="layout" name="preference_dropdown_material" id="0x7F0D00E0" />
+    <public type="layout" name="preference_information" id="0x7F0D00E1" />
+    <public type="layout" name="preference_information_material" id="0x7F0D00E2" />
+    <public type="layout" name="preference_list_fragment" id="0x7F0D00E3" />
+    <public type="layout" name="preference_material" id="0x7F0D00E4" />
+    <public type="layout" name="preference_recyclerview" id="0x7F0D00E5" />
+    <public type="layout" name="preference_widget_checkbox" id="0x7F0D00E6" />
+    <public type="layout" name="preference_widget_seekbar" id="0x7F0D00E7" />
+    <public type="layout" name="preference_widget_seekbar_material" id="0x7F0D00E8" />
+    <public type="layout" name="preference_widget_switch" id="0x7F0D00E9" />
+    <public type="layout" name="preference_widget_switch_compat" id="0x7F0D00EA" />
+    <public type="layout" name="premium_activated_dialog" id="0x7F0D00EB" />
+    <public type="layout" name="premium_and_premium_guild_activated_dialog" id="0x7F0D00EC" />
+    <public type="layout" name="premium_guild_subscription_activated_dialog" id="0x7F0D00ED" />
+    <public type="layout" name="premium_guild_subscription_cancel_dialog" id="0x7F0D00EE" />
+    <public type="layout" name="premium_guild_subscription_uncancel_dialog" id="0x7F0D00EF" />
+    <public type="layout" name="premium_guild_upgrade_dialog" id="0x7F0D00F0" />
+    <public type="layout" name="premium_upgrade_yearly_dialog" id="0x7F0D00F1" />
+    <public type="layout" name="private_channel_side_bar_actions_view" id="0x7F0D00F2" />
+    <public type="layout" name="publish_message_dialog" id="0x7F0D00F3" />
+    <public type="layout" name="reaction_quick_add" id="0x7F0D00F4" />
+    <public type="layout" name="reaction_view" id="0x7F0D00F5" />
+    <public type="layout" name="recycler_item_bottom_nav_space" id="0x7F0D00F6" />
+    <public type="layout" name="removable_permission_owner_view" id="0x7F0D00F7" />
+    <public type="layout" name="search_input_view" id="0x7F0D00F8" />
+    <public type="layout" name="select_dialog_item_material" id="0x7F0D00F9" />
+    <public type="layout" name="select_dialog_multichoice_material" id="0x7F0D00FA" />
+    <public type="layout" name="select_dialog_singlechoice_material" id="0x7F0D00FB" />
+    <public type="layout" name="selectable_list_item" id="0x7F0D00FC" />
+    <public type="layout" name="server_settings_members_role_spinner_item" id="0x7F0D00FD" />
+    <public type="layout" name="server_settings_members_role_spinner_item_open" id="0x7F0D00FE" />
+    <public type="layout" name="settings_channel_list_category_item" id="0x7F0D00FF" />
+    <public type="layout" name="settings_channel_list_item" id="0x7F0D0100" />
+    <public type="layout" name="simple_member_list_item" id="0x7F0D0101" />
+    <public type="layout" name="simple_role_list_item" id="0x7F0D0102" />
+    <public type="layout" name="single_value_prop_premium_upsell_dialog" id="0x7F0D0103" />
+    <public type="layout" name="sparkle_view" id="0x7F0D0104" />
+    <public type="layout" name="stage_audience_blocked_bottom_sheet_header_item" id="0x7F0D0105" />
+    <public type="layout" name="stage_audience_blocked_bottom_sheet_item" id="0x7F0D0106" />
+    <public type="layout" name="stage_raised_hands_item_user" id="0x7F0D0107" />
+    <public type="layout" name="sticker_autocomplete_item" id="0x7F0D0108" />
+    <public type="layout" name="sticker_category_item_guild" id="0x7F0D0109" />
     <public type="layout" name="sticker_category_item_pack" id="0x7F0D010A" />
     <public type="layout" name="sticker_category_item_recent" id="0x7F0D010B" />
     <public type="layout" name="sticker_full_size_dialog" id="0x7F0D010C" />
@@ -9268,495 +9340,504 @@
     <public type="layout" name="view_review_request_modal_image" id="0x7F0D0187" />
     <public type="layout" name="view_screen_title" id="0x7F0D0188" />
     <public type="layout" name="view_selectable_friend_suggestion" id="0x7F0D0189" />
-    <public type="layout" name="view_server_folder" id="0x7F0D018A" />
-    <public type="layout" name="view_server_settings_community_setting_selector" id="0x7F0D018B" />
-    <public type="layout" name="view_server_settings_icon_name" id="0x7F0D018C" />
-    <public type="layout" name="view_server_settings_notifications" id="0x7F0D018D" />
-    <public type="layout" name="view_server_settings_region" id="0x7F0D018E" />
-    <public type="layout" name="view_server_settings_region_help" id="0x7F0D018F" />
-    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7F0D0190" />
-    <public type="layout" name="view_server_settings_upload_banner" id="0x7F0D0191" />
-    <public type="layout" name="view_server_settings_upload_splash" id="0x7F0D0192" />
-    <public type="layout" name="view_setting_check" id="0x7F0D0193" />
-    <public type="layout" name="view_setting_radio" id="0x7F0D0194" />
-    <public type="layout" name="view_setting_shared" id="0x7F0D0195" />
-    <public type="layout" name="view_setting_switch" id="0x7F0D0196" />
-    <public type="layout" name="view_settings_boosted_boost_listitem" id="0x7F0D0197" />
-    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7F0D0198" />
-    <public type="layout" name="view_settings_boosted_header_listitem" id="0x7F0D0199" />
-    <public type="layout" name="view_settings_boosted_sample_guild" id="0x7F0D019A" />
-    <public type="layout" name="view_settings_premium_guild_marketing_header" id="0x7F0D019B" />
-    <public type="layout" name="view_settings_premium_guild_no_guilds" id="0x7F0D019C" />
-    <public type="layout" name="view_simple_spinner_dropdown_item" id="0x7F0D019D" />
-    <public type="layout" name="view_stage_channel_speaker" id="0x7F0D019E" />
-    <public type="layout" name="view_stage_channel_visit_community" id="0x7F0D019F" />
-    <public type="layout" name="view_steps" id="0x7F0D01A0" />
-    <public type="layout" name="view_stream_preview" id="0x7F0D01A1" />
-    <public type="layout" name="view_ternary_checkbox" id="0x7F0D01A2" />
-    <public type="layout" name="view_toolbar_title" id="0x7F0D01A3" />
-    <public type="layout" name="view_upload_progress" id="0x7F0D01A4" />
-    <public type="layout" name="view_user_list_item" id="0x7F0D01A5" />
-    <public type="layout" name="view_user_status_presence" id="0x7F0D01A6" />
-    <public type="layout" name="view_user_status_presence_custom" id="0x7F0D01A7" />
-    <public type="layout" name="view_user_summary_item" id="0x7F0D01A8" />
-    <public type="layout" name="view_username" id="0x7F0D01A9" />
-    <public type="layout" name="view_video_call_participant" id="0x7F0D01AA" />
-    <public type="layout" name="view_voice_user" id="0x7F0D01AB" />
-    <public type="layout" name="voice_controls_sheet_view" id="0x7F0D01AC" />
-    <public type="layout" name="voice_user_limit_view" id="0x7F0D01AD" />
-    <public type="layout" name="voice_user_list_item_divider" id="0x7F0D01AE" />
-    <public type="layout" name="voice_user_list_item_header" id="0x7F0D01AF" />
-    <public type="layout" name="voice_user_list_item_invite" id="0x7F0D01B0" />
-    <public type="layout" name="voice_user_list_item_user" id="0x7F0D01B1" />
-    <public type="layout" name="volume_slider_view" id="0x7F0D01B2" />
-    <public type="layout" name="widget_accept_gift_dialog" id="0x7F0D01B3" />
-    <public type="layout" name="widget_add_friend_user_list_item" id="0x7F0D01B4" />
-    <public type="layout" name="widget_age_verify" id="0x7F0D01B5" />
-    <public type="layout" name="widget_announcement_guild_profile_sheet" id="0x7F0D01B6" />
-    <public type="layout" name="widget_application_command_bottom_sheet" id="0x7F0D01B7" />
-    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7F0D01B8" />
-    <public type="layout" name="widget_auth_age_gated" id="0x7F0D01B9" />
-    <public type="layout" name="widget_auth_birthday" id="0x7F0D01BA" />
-    <public type="layout" name="widget_auth_captcha" id="0x7F0D01BB" />
-    <public type="layout" name="widget_auth_header" id="0x7F0D01BC" />
-    <public type="layout" name="widget_auth_landing" id="0x7F0D01BD" />
-    <public type="layout" name="widget_auth_login" id="0x7F0D01BE" />
-    <public type="layout" name="widget_auth_mfa" id="0x7F0D01BF" />
-    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7F0D01C0" />
-    <public type="layout" name="widget_auth_mfa_info" id="0x7F0D01C1" />
-    <public type="layout" name="widget_auth_phone_verify" id="0x7F0D01C2" />
-    <public type="layout" name="widget_auth_register_account_information" id="0x7F0D01C3" />
-    <public type="layout" name="widget_auth_register_identity" id="0x7F0D01C4" />
-    <public type="layout" name="widget_auth_reset_password" id="0x7F0D01C5" />
-    <public type="layout" name="widget_auth_undelete_account" id="0x7F0D01C6" />
-    <public type="layout" name="widget_ban_user" id="0x7F0D01C7" />
-    <public type="layout" name="widget_bug_report" id="0x7F0D01C8" />
-    <public type="layout" name="widget_call_fullscreen" id="0x7F0D01C9" />
-    <public type="layout" name="widget_call_fullscreen_audio_share_warning" id="0x7F0D01CA" />
-    <public type="layout" name="widget_call_fullscreen_private_call" id="0x7F0D01CB" />
-    <public type="layout" name="widget_change_log" id="0x7F0D01CC" />
-    <public type="layout" name="widget_change_log_special" id="0x7F0D01CD" />
-    <public type="layout" name="widget_channel_follow_sheet" id="0x7F0D01CE" />
-    <public type="layout" name="widget_channel_follow_success_dialog" id="0x7F0D01CF" />
-    <public type="layout" name="widget_channel_group_dm_settings" id="0x7F0D01D0" />
-    <public type="layout" name="widget_channel_members_list" id="0x7F0D01D1" />
-    <public type="layout" name="widget_channel_members_list_item_add" id="0x7F0D01D2" />
-    <public type="layout" name="widget_channel_members_list_item_header" id="0x7F0D01D3" />
-    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7F0D01D4" />
-    <public type="layout" name="widget_channel_members_list_item_placeholder_header" id="0x7F0D01D5" />
-    <public type="layout" name="widget_channel_members_list_item_user" id="0x7F0D01D6" />
-    <public type="layout" name="widget_channel_notification_settings" id="0x7F0D01D7" />
-    <public type="layout" name="widget_channel_onboarding" id="0x7F0D01D8" />
-    <public type="layout" name="widget_channel_pinned_messages" id="0x7F0D01D9" />
-    <public type="layout" name="widget_channel_search_item" id="0x7F0D01DA" />
-    <public type="layout" name="widget_channel_search_item_header" id="0x7F0D01DB" />
-    <public type="layout" name="widget_channel_selector" id="0x7F0D01DC" />
-    <public type="layout" name="widget_channel_selector_item" id="0x7F0D01DD" />
-    <public type="layout" name="widget_channel_settings_add_member" id="0x7F0D01DE" />
-    <public type="layout" name="widget_channel_settings_add_member_category" id="0x7F0D01DF" />
-    <public type="layout" name="widget_channel_settings_add_member_item" id="0x7F0D01E0" />
-    <public type="layout" name="widget_channel_settings_add_member_sheet" id="0x7F0D01E1" />
-    <public type="layout" name="widget_channel_settings_cannot_delete" id="0x7F0D01E2" />
-    <public type="layout" name="widget_channel_settings_delete" id="0x7F0D01E3" />
-    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7F0D01E4" />
-    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7F0D01E5" />
-    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7F0D01E6" />
-    <public type="layout" name="widget_channel_settings_permissions_advanced" id="0x7F0D01E7" />
-    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7F0D01E8" />
-    <public type="layout" name="widget_channel_sidebar_actions" id="0x7F0D01E9" />
-    <public type="layout" name="widget_channel_topic" id="0x7F0D01EA" />
-    <public type="layout" name="widget_channels_list" id="0x7F0D01EB" />
-    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7F0D01EC" />
-    <public type="layout" name="widget_channels_list_item_active_stage_event" id="0x7F0D01ED" />
-    <public type="layout" name="widget_channels_list_item_audience_count" id="0x7F0D01EE" />
-    <public type="layout" name="widget_channels_list_item_category" id="0x7F0D01EF" />
-    <public type="layout" name="widget_channels_list_item_channel" id="0x7F0D01F0" />
-    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7F0D01F1" />
-    <public type="layout" name="widget_channels_list_item_channel_stage_voice" id="0x7F0D01F2" />
-    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7F0D01F3" />
-    <public type="layout" name="widget_channels_list_item_directory" id="0x7F0D01F4" />
-    <public type="layout" name="widget_channels_list_item_header" id="0x7F0D01F5" />
-    <public type="layout" name="widget_channels_list_item_invite" id="0x7F0D01F6" />
-    <public type="layout" name="widget_channels_list_item_mfa" id="0x7F0D01F7" />
-    <public type="layout" name="widget_channels_list_item_stage_events_separator" id="0x7F0D01F8" />
-    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7F0D01F9" />
-    <public type="layout" name="widget_channels_list_item_thread" id="0x7F0D01FA" />
-    <public type="layout" name="widget_channels_list_item_thread_actions" id="0x7F0D01FB" />
-    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7F0D01FC" />
-    <public type="layout" name="widget_channels_list_unreads" id="0x7F0D01FD" />
-    <public type="layout" name="widget_chat_input" id="0x7F0D01FE" />
-    <public type="layout" name="widget_chat_input_application_commands" id="0x7F0D01FF" />
-    <public type="layout" name="widget_chat_input_autocomplete_item" id="0x7F0D0200" />
-    <public type="layout" name="widget_chat_input_command_application_header_item" id="0x7F0D0201" />
-    <public type="layout" name="widget_chat_input_emoji_autocomplete_upsell_item" id="0x7F0D0202" />
-    <public type="layout" name="widget_chat_input_guard" id="0x7F0D0203" />
-    <public type="layout" name="widget_chat_input_item" id="0x7F0D0204" />
-    <public type="layout" name="widget_chat_input_member_verification_guard" id="0x7F0D0205" />
-    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7F0D0206" />
-    <public type="layout" name="widget_chat_input_slash_loading_item" id="0x7F0D0207" />
-    <public type="layout" name="widget_chat_input_sticker_suggestions" id="0x7F0D0208" />
-    <public type="layout" name="widget_chat_list" id="0x7F0D0209" />
-    <public type="layout" name="widget_chat_list_actions" id="0x7F0D020A" />
-    <public type="layout" name="widget_chat_list_adapter_item_application_command" id="0x7F0D020B" />
-    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7F0D020C" />
-    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7F0D020D" />
-    <public type="layout" name="widget_chat_list_adapter_item_bot_component_row" id="0x7F0D020E" />
-    <public type="layout" name="widget_chat_list_adapter_item_call" id="0x7F0D020F" />
-    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7F0D0210" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7F0D0211" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7F0D0212" />
-    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7F0D0213" />
-    <public type="layout" name="widget_chat_list_adapter_item_ephemeral_message" id="0x7F0D0214" />
-    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7F0D0215" />
-    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7F0D0216" />
-    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7F0D0217" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_invite_reminder" id="0x7F0D0218" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_template" id="0x7F0D0219" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7F0D021A" />
-    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7F0D021B" />
-    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7F0D021C" />
-    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7F0D021D" />
-    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7F0D021E" />
-    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7F0D021F" />
-    <public type="layout" name="widget_chat_list_adapter_item_private_channel_start" id="0x7F0D0220" />
-    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7F0D0221" />
-    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7F0D0222" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7F0D0223" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7F0D0224" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7F0D0225" />
-    <public type="layout" name="widget_chat_list_adapter_item_single_line_message_preview" id="0x7F0D0226" />
-    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7F0D0227" />
-    <public type="layout" name="widget_chat_list_adapter_item_spotify_listen_together" id="0x7F0D0228" />
-    <public type="layout" name="widget_chat_list_adapter_item_stage_invite" id="0x7F0D0229" />
-    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7F0D022A" />
-    <public type="layout" name="widget_chat_list_adapter_item_sticker" id="0x7F0D022B" />
-    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet" id="0x7F0D022C" />
-    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet_compact" id="0x7F0D022D" />
-    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7F0D022E" />
-    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7F0D022F" />
-    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7F0D0230" />
-    <public type="layout" name="widget_chat_list_adapter_item_thread_draft_form" id="0x7F0D0231" />
-    <public type="layout" name="widget_chat_list_adapter_item_thread_embed" id="0x7F0D0232" />
-    <public type="layout" name="widget_chat_list_adapter_item_thread_starter_divider" id="0x7F0D0233" />
-    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7F0D0234" />
-    <public type="layout" name="widget_chat_list_bot_ui_action_row_component" id="0x7F0D0235" />
-    <public type="layout" name="widget_chat_list_bot_ui_button_component" id="0x7F0D0236" />
-    <public type="layout" name="widget_chat_list_bot_ui_select_component" id="0x7F0D0237" />
-    <public type="layout" name="widget_chat_list_bot_ui_select_component_pill" id="0x7F0D0238" />
-    <public type="layout" name="widget_chat_overlay" id="0x7F0D0239" />
-    <public type="layout" name="widget_chat_status" id="0x7F0D023A" />
-    <public type="layout" name="widget_choose_plan" id="0x7F0D023B" />
-    <public type="layout" name="widget_choose_plan_adapter_divider_item" id="0x7F0D023C" />
-    <public type="layout" name="widget_choose_plan_adapter_header_item" id="0x7F0D023D" />
-    <public type="layout" name="widget_choose_plan_adapter_plan_item" id="0x7F0D023E" />
-    <public type="layout" name="widget_client_outdated" id="0x7F0D023F" />
-    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7F0D0240" />
-    <public type="layout" name="widget_confirm_remove_community_dialog" id="0x7F0D0241" />
-    <public type="layout" name="widget_connections_add_xbox" id="0x7F0D0242" />
-    <public type="layout" name="widget_contact_sync" id="0x7F0D0243" />
-    <public type="layout" name="widget_create_channel" id="0x7F0D0244" />
-    <public type="layout" name="widget_create_channel_add_member" id="0x7F0D0245" />
-    <public type="layout" name="widget_creation_intent" id="0x7F0D0246" />
-    <public type="layout" name="widget_debugging" id="0x7F0D0247" />
-    <public type="layout" name="widget_debugging_adapter_item" id="0x7F0D0248" />
-    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7F0D0249" />
-    <public type="layout" name="widget_discovery" id="0x7F0D024A" />
-    <public type="layout" name="widget_discovery_intro_card" id="0x7F0D024B" />
-    <public type="layout" name="widget_discovery_other_speakers_count" id="0x7F0D024C" />
-    <public type="layout" name="widget_discovery_stage_card" id="0x7F0D024D" />
-    <public type="layout" name="widget_discovery_stage_card_speaker" id="0x7F0D024E" />
-    <public type="layout" name="widget_edit_role" id="0x7F0D024F" />
-    <public type="layout" name="widget_emoji_picker" id="0x7F0D0250" />
-    <public type="layout" name="widget_emoji_picker_sheet" id="0x7F0D0251" />
-    <public type="layout" name="widget_emoji_sheet" id="0x7F0D0252" />
-    <public type="layout" name="widget_enable_community_steps" id="0x7F0D0253" />
-    <public type="layout" name="widget_enable_mfa_steps" id="0x7F0D0254" />
-    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7F0D0255" />
-    <public type="layout" name="widget_enable_two_factor_password_dialog" id="0x7F0D0256" />
-    <public type="layout" name="widget_end_stage_bottom_sheet" id="0x7F0D0257" />
-    <public type="layout" name="widget_expression_tray" id="0x7F0D0258" />
-    <public type="layout" name="widget_fatal_crash" id="0x7F0D0259" />
-    <public type="layout" name="widget_feedback_sheet" id="0x7F0D025A" />
-    <public type="layout" name="widget_folder_context_menu" id="0x7F0D025B" />
-    <public type="layout" name="widget_friends_add" id="0x7F0D025C" />
-    <public type="layout" name="widget_friends_add_by_id" id="0x7F0D025D" />
-    <public type="layout" name="widget_friends_list" id="0x7F0D025E" />
-    <public type="layout" name="widget_friends_list_adapter_item_friend" id="0x7F0D025F" />
-    <public type="layout" name="widget_friends_list_adapter_item_header" id="0x7F0D0260" />
-    <public type="layout" name="widget_friends_list_adapter_item_loading" id="0x7F0D0261" />
-    <public type="layout" name="widget_friends_list_adapter_item_pending" id="0x7F0D0262" />
-    <public type="layout" name="widget_friends_list_adapter_suggested_friend" id="0x7F0D0263" />
-    <public type="layout" name="widget_friends_list_contact_sync_upsell" id="0x7F0D0264" />
-    <public type="layout" name="widget_friends_list_expandable_header" id="0x7F0D0265" />
-    <public type="layout" name="widget_friends_nearby" id="0x7F0D0266" />
-    <public type="layout" name="widget_gif_category" id="0x7F0D0267" />
-    <public type="layout" name="widget_gif_picker" id="0x7F0D0268" />
-    <public type="layout" name="widget_gif_picker_search" id="0x7F0D0269" />
-    <public type="layout" name="widget_gif_picker_sheet" id="0x7F0D026A" />
-    <public type="layout" name="widget_global_search" id="0x7F0D026B" />
-    <public type="layout" name="widget_global_search_dialog" id="0x7F0D026C" />
-    <public type="layout" name="widget_global_search_item_divider" id="0x7F0D026D" />
-    <public type="layout" name="widget_global_search_item_dm" id="0x7F0D026E" />
-    <public type="layout" name="widget_global_search_item_guild" id="0x7F0D026F" />
-    <public type="layout" name="widget_global_status_indicator" id="0x7F0D0270" />
-    <public type="layout" name="widget_group_invite_friends" id="0x7F0D0271" />
-    <public type="layout" name="widget_group_invite_friends_item" id="0x7F0D0272" />
-    <public type="layout" name="widget_guild_call_onboarding" id="0x7F0D0273" />
-    <public type="layout" name="widget_guild_clone" id="0x7F0D0274" />
-    <public type="layout" name="widget_guild_context_menu" id="0x7F0D0275" />
-    <public type="layout" name="widget_guild_create" id="0x7F0D0276" />
-    <public type="layout" name="widget_guild_folder_settings" id="0x7F0D0277" />
-    <public type="layout" name="widget_guild_invite" id="0x7F0D0278" />
-    <public type="layout" name="widget_guild_invite_info" id="0x7F0D0279" />
-    <public type="layout" name="widget_guild_invite_settings" id="0x7F0D027A" />
-    <public type="layout" name="widget_guild_invite_share" id="0x7F0D027B" />
-    <public type="layout" name="widget_guild_invite_share_compact" id="0x7F0D027C" />
-    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7F0D027D" />
-    <public type="layout" name="widget_guild_invite_share_item" id="0x7F0D027E" />
-    <public type="layout" name="widget_guild_invite_share_sheet" id="0x7F0D027F" />
-    <public type="layout" name="widget_guild_join" id="0x7F0D0280" />
-    <public type="layout" name="widget_guild_join_invite_examples" id="0x7F0D0281" />
-    <public type="layout" name="widget_guild_profile_emoji_extra" id="0x7F0D0282" />
-    <public type="layout" name="widget_guild_profile_emoji_item" id="0x7F0D0283" />
-    <public type="layout" name="widget_guild_profile_sheet" id="0x7F0D0284" />
-    <public type="layout" name="widget_guild_selector" id="0x7F0D0285" />
-    <public type="layout" name="widget_guild_selector_item" id="0x7F0D0286" />
-    <public type="layout" name="widget_guild_transfer_ownership" id="0x7F0D0287" />
-    <public type="layout" name="widget_guild_welcome_channel" id="0x7F0D0288" />
-    <public type="layout" name="widget_guild_welcome_sheet" id="0x7F0D0289" />
-    <public type="layout" name="widget_guilds_list" id="0x7F0D028A" />
-    <public type="layout" name="widget_guilds_list_item_divider" id="0x7F0D028B" />
-    <public type="layout" name="widget_guilds_list_item_dm" id="0x7F0D028C" />
-    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7F0D028D" />
-    <public type="layout" name="widget_guilds_list_item_folder" id="0x7F0D028E" />
-    <public type="layout" name="widget_guilds_list_item_guild" id="0x7F0D028F" />
-    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7F0D0290" />
-    <public type="layout" name="widget_guilds_list_item_guild_nux" id="0x7F0D0291" />
-    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7F0D0292" />
-    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7F0D0293" />
-    <public type="layout" name="widget_guilds_list_item_profile" id="0x7F0D0294" />
-    <public type="layout" name="widget_home" id="0x7F0D0295" />
-    <public type="layout" name="widget_home_panel_center" id="0x7F0D0296" />
-    <public type="layout" name="widget_home_panel_center_channel_less" id="0x7F0D0297" />
-    <public type="layout" name="widget_home_panel_center_content_unread" id="0x7F0D0298" />
-    <public type="layout" name="widget_home_panel_center_nsfw" id="0x7F0D0299" />
-    <public type="layout" name="widget_home_panel_left" id="0x7F0D029A" />
-    <public type="layout" name="widget_home_panel_loading" id="0x7F0D029B" />
-    <public type="layout" name="widget_home_panel_right" id="0x7F0D029C" />
-    <public type="layout" name="widget_incoming_share" id="0x7F0D029D" />
-    <public type="layout" name="widget_issue_details_form" id="0x7F0D029E" />
-    <public type="layout" name="widget_kick_user" id="0x7F0D029F" />
-    <public type="layout" name="widget_manage_reactions" id="0x7F0D02A0" />
-    <public type="layout" name="widget_manage_reactions_emoji" id="0x7F0D02A1" />
-    <public type="layout" name="widget_manage_reactions_result_error" id="0x7F0D02A2" />
-    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7F0D02A3" />
-    <public type="layout" name="widget_manage_reactions_result_user" id="0x7F0D02A4" />
-    <public type="layout" name="widget_masked_links_dialog" id="0x7F0D02A5" />
-    <public type="layout" name="widget_media" id="0x7F0D02A6" />
-    <public type="layout" name="widget_member_verification" id="0x7F0D02A7" />
-    <public type="layout" name="widget_member_verification_approve_terms_item" id="0x7F0D02A8" />
-    <public type="layout" name="widget_member_verification_header_item" id="0x7F0D02A9" />
-    <public type="layout" name="widget_member_verification_multiple_choice_item" id="0x7F0D02AA" />
-    <public type="layout" name="widget_member_verification_multiple_choice_radio_item" id="0x7F0D02AB" />
-    <public type="layout" name="widget_member_verification_paragraph_item" id="0x7F0D02AC" />
-    <public type="layout" name="widget_member_verification_pending_dialog" id="0x7F0D02AD" />
-    <public type="layout" name="widget_member_verification_rule_item" id="0x7F0D02AE" />
-    <public type="layout" name="widget_member_verification_success" id="0x7F0D02AF" />
-    <public type="layout" name="widget_member_verification_text_input_item" id="0x7F0D02B0" />
-    <public type="layout" name="widget_mobile_reports" id="0x7F0D02B1" />
-    <public type="layout" name="widget_music_rich_presence" id="0x7F0D02B2" />
-    <public type="layout" name="widget_mute_settings_sheet" id="0x7F0D02B3" />
-    <public type="layout" name="widget_navigation_help" id="0x7F0D02B4" />
-    <public type="layout" name="widget_navigation_help_nux_channels" id="0x7F0D02B5" />
-    <public type="layout" name="widget_navigation_help_nux_dms" id="0x7F0D02B6" />
-    <public type="layout" name="widget_navigation_help_nux_guilds" id="0x7F0D02B7" />
-    <public type="layout" name="widget_notice_dialog" id="0x7F0D02B8" />
-    <public type="layout" name="widget_notice_nux_overlay" id="0x7F0D02B9" />
-    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7F0D02BA" />
-    <public type="layout" name="widget_notice_popup" id="0x7F0D02BB" />
-    <public type="layout" name="widget_nux_channel_prompt" id="0x7F0D02BC" />
-    <public type="layout" name="widget_nux_guild_template" id="0x7F0D02BD" />
-    <public type="layout" name="widget_nux_post_registration" id="0x7F0D02BE" />
-    <public type="layout" name="widget_oauth_authorize" id="0x7F0D02BF" />
-    <public type="layout" name="widget_outbound_promo_terms_sheet" id="0x7F0D02C0" />
-    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7F0D02C1" />
-    <public type="layout" name="widget_phone_country_code_bottom_sheet" id="0x7F0D02C2" />
-    <public type="layout" name="widget_phone_country_code_list_item" id="0x7F0D02C3" />
-    <public type="layout" name="widget_platform_rich_presence" id="0x7F0D02C4" />
-    <public type="layout" name="widget_premium_guild_transfer" id="0x7F0D02C5" />
-    <public type="layout" name="widget_premium_upsell" id="0x7F0D02C6" />
-    <public type="layout" name="widget_prune_users" id="0x7F0D02C7" />
-    <public type="layout" name="widget_qr_scanner" id="0x7F0D02C8" />
-    <public type="layout" name="widget_quick_mentions_dialog" id="0x7F0D02C9" />
-    <public type="layout" name="widget_remote_auth" id="0x7F0D02CA" />
-    <public type="layout" name="widget_remote_auth_not_found" id="0x7F0D02CB" />
-    <public type="layout" name="widget_remote_auth_pending_login" id="0x7F0D02CC" />
-    <public type="layout" name="widget_remote_auth_success" id="0x7F0D02CD" />
-    <public type="layout" name="widget_screen_share_nfx_sheet" id="0x7F0D02CE" />
-    <public type="layout" name="widget_search" id="0x7F0D02CF" />
-    <public type="layout" name="widget_search_results" id="0x7F0D02D0" />
-    <public type="layout" name="widget_search_suggestion_item_header" id="0x7F0D02D1" />
-    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7F0D02D2" />
-    <public type="layout" name="widget_search_suggestions" id="0x7F0D02D3" />
-    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7F0D02D4" />
-    <public type="layout" name="widget_search_suggestions_item_has" id="0x7F0D02D5" />
-    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7F0D02D6" />
-    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7F0D02D7" />
-    <public type="layout" name="widget_search_suggestions_item_user" id="0x7F0D02D8" />
-    <public type="layout" name="widget_select_component_bottom_sheet" id="0x7F0D02D9" />
-    <public type="layout" name="widget_select_component_bottom_sheet_item" id="0x7F0D02DA" />
-    <public type="layout" name="widget_server_boost_confirmation" id="0x7F0D02DB" />
-    <public type="layout" name="widget_server_boost_status" id="0x7F0D02DC" />
-    <public type="layout" name="widget_server_delete_dialog" id="0x7F0D02DD" />
-    <public type="layout" name="widget_server_notification_override_selector" id="0x7F0D02DE" />
-    <public type="layout" name="widget_server_notifications" id="0x7F0D02DF" />
-    <public type="layout" name="widget_server_settings" id="0x7F0D02E0" />
-    <public type="layout" name="widget_server_settings_audit_log" id="0x7F0D02E1" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7F0D02E2" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7F0D02E3" />
-    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7F0D02E4" />
-    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7F0D02E5" />
-    <public type="layout" name="widget_server_settings_audit_log_menu_filter" id="0x7F0D02E6" />
-    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7F0D02E7" />
-    <public type="layout" name="widget_server_settings_bans" id="0x7F0D02E8" />
-    <public type="layout" name="widget_server_settings_channels" id="0x7F0D02E9" />
-    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7F0D02EA" />
-    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7F0D02EB" />
-    <public type="layout" name="widget_server_settings_community_overview" id="0x7F0D02EC" />
-    <public type="layout" name="widget_server_settings_community_setup_first_step" id="0x7F0D02ED" />
-    <public type="layout" name="widget_server_settings_community_setup_second_step" id="0x7F0D02EE" />
-    <public type="layout" name="widget_server_settings_community_setup_third_step" id="0x7F0D02EF" />
-    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7F0D02F0" />
-    <public type="layout" name="widget_server_settings_edit_integration" id="0x7F0D02F1" />
-    <public type="layout" name="widget_server_settings_edit_member" id="0x7F0D02F2" />
-    <public type="layout" name="widget_server_settings_emojis" id="0x7F0D02F3" />
-    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7F0D02F4" />
-    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7F0D02F5" />
-    <public type="layout" name="widget_server_settings_emojis_header" id="0x7F0D02F6" />
-    <public type="layout" name="widget_server_settings_emojis_item" id="0x7F0D02F7" />
-    <public type="layout" name="widget_server_settings_emojis_section" id="0x7F0D02F8" />
-    <public type="layout" name="widget_server_settings_enable_community" id="0x7F0D02F9" />
-    <public type="layout" name="widget_server_settings_help_item" id="0x7F0D02FA" />
-    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7F0D02FB" />
-    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7F0D02FC" />
-    <public type="layout" name="widget_server_settings_instant_invites" id="0x7F0D02FD" />
-    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7F0D02FE" />
-    <public type="layout" name="widget_server_settings_integrations" id="0x7F0D02FF" />
-    <public type="layout" name="widget_server_settings_member_list_item" id="0x7F0D0300" />
-    <public type="layout" name="widget_server_settings_members" id="0x7F0D0301" />
-    <public type="layout" name="widget_server_settings_moderation" id="0x7F0D0302" />
-    <public type="layout" name="widget_server_settings_overview" id="0x7F0D0303" />
-    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7F0D0304" />
-    <public type="layout" name="widget_server_settings_overview_region" id="0x7F0D0305" />
-    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7F0D0306" />
-    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7F0D0307" />
-    <public type="layout" name="widget_server_settings_role_item" id="0x7F0D0308" />
-    <public type="layout" name="widget_server_settings_roles_list" id="0x7F0D0309" />
-    <public type="layout" name="widget_server_settings_security" id="0x7F0D030A" />
-    <public type="layout" name="widget_server_settings_security_dialog" id="0x7F0D030B" />
-    <public type="layout" name="widget_server_settings_vanity_url" id="0x7F0D030C" />
-    <public type="layout" name="widget_settings" id="0x7F0D030D" />
-    <public type="layout" name="widget_settings_accessibility" id="0x7F0D030E" />
-    <public type="layout" name="widget_settings_account" id="0x7F0D030F" />
-    <public type="layout" name="widget_settings_account_backup_codes" id="0x7F0D0310" />
-    <public type="layout" name="widget_settings_account_change_password" id="0x7F0D0311" />
-    <public type="layout" name="widget_settings_account_contacts_name_edit" id="0x7F0D0312" />
-    <public type="layout" name="widget_settings_account_edit" id="0x7F0D0313" />
-    <public type="layout" name="widget_settings_account_email_edit" id="0x7F0D0314" />
-    <public type="layout" name="widget_settings_activity_status" id="0x7F0D0315" />
-    <public type="layout" name="widget_settings_appearance" id="0x7F0D0316" />
-    <public type="layout" name="widget_settings_authorized_apps" id="0x7F0D0317" />
-    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7F0D0318" />
-    <public type="layout" name="widget_settings_behavior" id="0x7F0D0319" />
-    <public type="layout" name="widget_settings_blocked_users" id="0x7F0D031A" />
-    <public type="layout" name="widget_settings_boost" id="0x7F0D031B" />
-    <public type="layout" name="widget_settings_connections" id="0x7F0D031C" />
-    <public type="layout" name="widget_settings_connections_add" id="0x7F0D031D" />
-    <public type="layout" name="widget_settings_developer" id="0x7F0D031E" />
-    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7F0D031F" />
-    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7F0D0320" />
-    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7F0D0321" />
-    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7F0D0322" />
-    <public type="layout" name="widget_settings_gifting" id="0x7F0D0323" />
-    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7F0D0324" />
-    <public type="layout" name="widget_settings_item_backup_code" id="0x7F0D0325" />
-    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7F0D0326" />
-    <public type="layout" name="widget_settings_item_blocked_user" id="0x7F0D0327" />
-    <public type="layout" name="widget_settings_item_connected_account" id="0x7F0D0328" />
-    <public type="layout" name="widget_settings_language" id="0x7F0D0329" />
-    <public type="layout" name="widget_settings_language_select" id="0x7F0D032A" />
-    <public type="layout" name="widget_settings_language_select_item" id="0x7F0D032B" />
-    <public type="layout" name="widget_settings_media" id="0x7F0D032C" />
-    <public type="layout" name="widget_settings_notification_os" id="0x7F0D032D" />
-    <public type="layout" name="widget_settings_notifications" id="0x7F0D032E" />
-    <public type="layout" name="widget_settings_premium" id="0x7F0D032F" />
-    <public type="layout" name="widget_settings_privacy" id="0x7F0D0330" />
-    <public type="layout" name="widget_settings_privacy_defaults" id="0x7F0D0331" />
-    <public type="layout" name="widget_settings_voice" id="0x7F0D0332" />
-    <public type="layout" name="widget_settings_voice_input_mode" id="0x7F0D0333" />
-    <public type="layout" name="widget_stage_audience_blocked_bottom_sheet" id="0x7F0D0334" />
-    <public type="layout" name="widget_stage_audience_notice_bottom_sheet" id="0x7F0D0335" />
-    <public type="layout" name="widget_stage_channel_audience" id="0x7F0D0336" />
-    <public type="layout" name="widget_stage_channel_audience_role" id="0x7F0D0337" />
-    <public type="layout" name="widget_stage_channel_details" id="0x7F0D0338" />
-    <public type="layout" name="widget_stage_channel_divider" id="0x7F0D0339" />
-    <public type="layout" name="widget_stage_channel_moderator_permissions" id="0x7F0D033A" />
-    <public type="layout" name="widget_stage_channel_rich_presence" id="0x7F0D033B" />
-    <public type="layout" name="widget_stage_channel_speaker" id="0x7F0D033C" />
-    <public type="layout" name="widget_stage_moderator_join_bottom_sheet" id="0x7F0D033D" />
-    <public type="layout" name="widget_stage_public_notice_bottom_sheet" id="0x7F0D033E" />
-    <public type="layout" name="widget_stage_raised_hands_bottom_sheet" id="0x7F0D033F" />
-    <public type="layout" name="widget_stage_settings" id="0x7F0D0340" />
-    <public type="layout" name="widget_stage_start_event_bottom_sheet" id="0x7F0D0341" />
-    <public type="layout" name="widget_start_call_sheet" id="0x7F0D0342" />
-    <public type="layout" name="widget_start_stage_server_selection" id="0x7F0D0343" />
-    <public type="layout" name="widget_start_stage_server_selection_bullet_item" id="0x7F0D0344" />
-    <public type="layout" name="widget_start_stage_server_selection_guild_item" id="0x7F0D0345" />
-    <public type="layout" name="widget_sticker_pack_store_sheet" id="0x7F0D0346" />
-    <public type="layout" name="widget_sticker_picker" id="0x7F0D0347" />
-    <public type="layout" name="widget_sticker_picker_sheet" id="0x7F0D0348" />
-    <public type="layout" name="widget_sticker_sheet" id="0x7F0D0349" />
-    <public type="layout" name="widget_stream_rich_presence" id="0x7F0D034A" />
-    <public type="layout" name="widget_tabs_host" id="0x7F0D034B" />
-    <public type="layout" name="widget_text_channel_settings" id="0x7F0D034C" />
-    <public type="layout" name="widget_thread_archive_actions_sheet" id="0x7F0D034D" />
-    <public type="layout" name="widget_thread_browser" id="0x7F0D034E" />
-    <public type="layout" name="widget_thread_browser_active" id="0x7F0D034F" />
-    <public type="layout" name="widget_thread_browser_archived" id="0x7F0D0350" />
-    <public type="layout" name="widget_thread_browser_filter_sheet" id="0x7F0D0351" />
-    <public type="layout" name="widget_thread_notification_settings" id="0x7F0D0352" />
-    <public type="layout" name="widget_thread_settings" id="0x7F0D0353" />
-    <public type="layout" name="widget_thread_status" id="0x7F0D0354" />
-    <public type="layout" name="widget_tos_accept" id="0x7F0D0355" />
-    <public type="layout" name="widget_tos_report_violation" id="0x7F0D0356" />
-    <public type="layout" name="widget_tos_report_violation_reason" id="0x7F0D0357" />
-    <public type="layout" name="widget_urgent_message_dialog" id="0x7F0D0358" />
-    <public type="layout" name="widget_url_actions" id="0x7F0D0359" />
-    <public type="layout" name="widget_usage_settings_dialog" id="0x7F0D035A" />
-    <public type="layout" name="widget_user_account_verify" id="0x7F0D035B" />
-    <public type="layout" name="widget_user_email_update" id="0x7F0D035C" />
-    <public type="layout" name="widget_user_email_verify" id="0x7F0D035D" />
-    <public type="layout" name="widget_user_mentions" id="0x7F0D035E" />
-    <public type="layout" name="widget_user_mentions_filter" id="0x7F0D035F" />
-    <public type="layout" name="widget_user_mutual_friends" id="0x7F0D0360" />
-    <public type="layout" name="widget_user_mutual_guilds" id="0x7F0D0361" />
-    <public type="layout" name="widget_user_password_verify" id="0x7F0D0362" />
-    <public type="layout" name="widget_user_phone_manage" id="0x7F0D0363" />
-    <public type="layout" name="widget_user_phone_verify" id="0x7F0D0364" />
-    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7F0D0365" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7F0D0366" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7F0D0367" />
-    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7F0D0368" />
-    <public type="layout" name="widget_user_rich_presence" id="0x7F0D0369" />
-    <public type="layout" name="widget_user_set_custom_status" id="0x7F0D036A" />
-    <public type="layout" name="widget_user_sheet" id="0x7F0D036B" />
-    <public type="layout" name="widget_user_status_update" id="0x7F0D036C" />
-    <public type="layout" name="widget_voice_bottom_sheet" id="0x7F0D036D" />
-    <public type="layout" name="widget_voice_call_incoming" id="0x7F0D036E" />
-    <public type="layout" name="widget_voice_call_inline" id="0x7F0D036F" />
-    <public type="layout" name="widget_voice_channel_settings" id="0x7F0D0370" />
-    <public type="layout" name="widget_voice_noise_cancellation_bottom_sheet" id="0x7F0D0371" />
-    <public type="layout" name="widget_voice_settings_bottom_sheet" id="0x7F0D0372" />
+    <public type="layout" name="view_server_discovery_header" id="0x7F0D018A" />
+    <public type="layout" name="view_server_discovery_item" id="0x7F0D018B" />
+    <public type="layout" name="view_server_folder" id="0x7F0D018C" />
+    <public type="layout" name="view_server_member_count" id="0x7F0D018D" />
+    <public type="layout" name="view_server_settings_community_setting_selector" id="0x7F0D018E" />
+    <public type="layout" name="view_server_settings_icon_name" id="0x7F0D018F" />
+    <public type="layout" name="view_server_settings_notifications" id="0x7F0D0190" />
+    <public type="layout" name="view_server_settings_region" id="0x7F0D0191" />
+    <public type="layout" name="view_server_settings_region_help" id="0x7F0D0192" />
+    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7F0D0193" />
+    <public type="layout" name="view_server_settings_upload_banner" id="0x7F0D0194" />
+    <public type="layout" name="view_server_settings_upload_splash" id="0x7F0D0195" />
+    <public type="layout" name="view_setting_check" id="0x7F0D0196" />
+    <public type="layout" name="view_setting_radio" id="0x7F0D0197" />
+    <public type="layout" name="view_setting_shared" id="0x7F0D0198" />
+    <public type="layout" name="view_setting_switch" id="0x7F0D0199" />
+    <public type="layout" name="view_settings_boosted_boost_listitem" id="0x7F0D019A" />
+    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7F0D019B" />
+    <public type="layout" name="view_settings_boosted_header_listitem" id="0x7F0D019C" />
+    <public type="layout" name="view_settings_boosted_sample_guild" id="0x7F0D019D" />
+    <public type="layout" name="view_settings_premium_guild_marketing_header" id="0x7F0D019E" />
+    <public type="layout" name="view_settings_premium_guild_no_guilds" id="0x7F0D019F" />
+    <public type="layout" name="view_simple_spinner_dropdown_item" id="0x7F0D01A0" />
+    <public type="layout" name="view_stage_channel_speaker" id="0x7F0D01A1" />
+    <public type="layout" name="view_stage_channel_visit_community" id="0x7F0D01A2" />
+    <public type="layout" name="view_steps" id="0x7F0D01A3" />
+    <public type="layout" name="view_stream_preview" id="0x7F0D01A4" />
+    <public type="layout" name="view_ternary_checkbox" id="0x7F0D01A5" />
+    <public type="layout" name="view_toolbar_title" id="0x7F0D01A6" />
+    <public type="layout" name="view_upload_progress" id="0x7F0D01A7" />
+    <public type="layout" name="view_user_list_item" id="0x7F0D01A8" />
+    <public type="layout" name="view_user_status_presence" id="0x7F0D01A9" />
+    <public type="layout" name="view_user_status_presence_custom" id="0x7F0D01AA" />
+    <public type="layout" name="view_user_summary_item" id="0x7F0D01AB" />
+    <public type="layout" name="view_username" id="0x7F0D01AC" />
+    <public type="layout" name="view_video_call_participant" id="0x7F0D01AD" />
+    <public type="layout" name="view_voice_user" id="0x7F0D01AE" />
+    <public type="layout" name="voice_controls_sheet_view" id="0x7F0D01AF" />
+    <public type="layout" name="voice_user_limit_view" id="0x7F0D01B0" />
+    <public type="layout" name="voice_user_list_item_divider" id="0x7F0D01B1" />
+    <public type="layout" name="voice_user_list_item_header" id="0x7F0D01B2" />
+    <public type="layout" name="voice_user_list_item_invite" id="0x7F0D01B3" />
+    <public type="layout" name="voice_user_list_item_user" id="0x7F0D01B4" />
+    <public type="layout" name="volume_slider_view" id="0x7F0D01B5" />
+    <public type="layout" name="widget_accept_gift_dialog" id="0x7F0D01B6" />
+    <public type="layout" name="widget_add_friend_user_list_item" id="0x7F0D01B7" />
+    <public type="layout" name="widget_age_verify" id="0x7F0D01B8" />
+    <public type="layout" name="widget_announcement_guild_profile_sheet" id="0x7F0D01B9" />
+    <public type="layout" name="widget_application_command_bottom_sheet" id="0x7F0D01BA" />
+    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7F0D01BB" />
+    <public type="layout" name="widget_auth_age_gated" id="0x7F0D01BC" />
+    <public type="layout" name="widget_auth_birthday" id="0x7F0D01BD" />
+    <public type="layout" name="widget_auth_captcha" id="0x7F0D01BE" />
+    <public type="layout" name="widget_auth_header" id="0x7F0D01BF" />
+    <public type="layout" name="widget_auth_landing" id="0x7F0D01C0" />
+    <public type="layout" name="widget_auth_login" id="0x7F0D01C1" />
+    <public type="layout" name="widget_auth_mfa" id="0x7F0D01C2" />
+    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7F0D01C3" />
+    <public type="layout" name="widget_auth_mfa_info" id="0x7F0D01C4" />
+    <public type="layout" name="widget_auth_phone_verify" id="0x7F0D01C5" />
+    <public type="layout" name="widget_auth_register_account_information" id="0x7F0D01C6" />
+    <public type="layout" name="widget_auth_register_identity" id="0x7F0D01C7" />
+    <public type="layout" name="widget_auth_reset_password" id="0x7F0D01C8" />
+    <public type="layout" name="widget_auth_undelete_account" id="0x7F0D01C9" />
+    <public type="layout" name="widget_ban_user" id="0x7F0D01CA" />
+    <public type="layout" name="widget_bug_report" id="0x7F0D01CB" />
+    <public type="layout" name="widget_call_fullscreen" id="0x7F0D01CC" />
+    <public type="layout" name="widget_call_fullscreen_audio_share_warning" id="0x7F0D01CD" />
+    <public type="layout" name="widget_call_fullscreen_private_call" id="0x7F0D01CE" />
+    <public type="layout" name="widget_change_log" id="0x7F0D01CF" />
+    <public type="layout" name="widget_change_log_special" id="0x7F0D01D0" />
+    <public type="layout" name="widget_channel_follow_sheet" id="0x7F0D01D1" />
+    <public type="layout" name="widget_channel_follow_success_dialog" id="0x7F0D01D2" />
+    <public type="layout" name="widget_channel_group_dm_settings" id="0x7F0D01D3" />
+    <public type="layout" name="widget_channel_members_list" id="0x7F0D01D4" />
+    <public type="layout" name="widget_channel_members_list_item_add" id="0x7F0D01D5" />
+    <public type="layout" name="widget_channel_members_list_item_header" id="0x7F0D01D6" />
+    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7F0D01D7" />
+    <public type="layout" name="widget_channel_members_list_item_placeholder_header" id="0x7F0D01D8" />
+    <public type="layout" name="widget_channel_members_list_item_user" id="0x7F0D01D9" />
+    <public type="layout" name="widget_channel_notification_settings" id="0x7F0D01DA" />
+    <public type="layout" name="widget_channel_onboarding" id="0x7F0D01DB" />
+    <public type="layout" name="widget_channel_pinned_messages" id="0x7F0D01DC" />
+    <public type="layout" name="widget_channel_search_item" id="0x7F0D01DD" />
+    <public type="layout" name="widget_channel_search_item_header" id="0x7F0D01DE" />
+    <public type="layout" name="widget_channel_selector" id="0x7F0D01DF" />
+    <public type="layout" name="widget_channel_selector_item" id="0x7F0D01E0" />
+    <public type="layout" name="widget_channel_settings_add_member" id="0x7F0D01E1" />
+    <public type="layout" name="widget_channel_settings_add_member_category" id="0x7F0D01E2" />
+    <public type="layout" name="widget_channel_settings_add_member_item" id="0x7F0D01E3" />
+    <public type="layout" name="widget_channel_settings_add_member_sheet" id="0x7F0D01E4" />
+    <public type="layout" name="widget_channel_settings_cannot_delete" id="0x7F0D01E5" />
+    <public type="layout" name="widget_channel_settings_delete" id="0x7F0D01E6" />
+    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7F0D01E7" />
+    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7F0D01E8" />
+    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7F0D01E9" />
+    <public type="layout" name="widget_channel_settings_permissions_advanced" id="0x7F0D01EA" />
+    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7F0D01EB" />
+    <public type="layout" name="widget_channel_sidebar_actions" id="0x7F0D01EC" />
+    <public type="layout" name="widget_channel_topic" id="0x7F0D01ED" />
+    <public type="layout" name="widget_channels_list" id="0x7F0D01EE" />
+    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7F0D01EF" />
+    <public type="layout" name="widget_channels_list_item_active_stage_event" id="0x7F0D01F0" />
+    <public type="layout" name="widget_channels_list_item_audience_count" id="0x7F0D01F1" />
+    <public type="layout" name="widget_channels_list_item_category" id="0x7F0D01F2" />
+    <public type="layout" name="widget_channels_list_item_channel" id="0x7F0D01F3" />
+    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7F0D01F4" />
+    <public type="layout" name="widget_channels_list_item_channel_stage_voice" id="0x7F0D01F5" />
+    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7F0D01F6" />
+    <public type="layout" name="widget_channels_list_item_directory" id="0x7F0D01F7" />
+    <public type="layout" name="widget_channels_list_item_header" id="0x7F0D01F8" />
+    <public type="layout" name="widget_channels_list_item_invite" id="0x7F0D01F9" />
+    <public type="layout" name="widget_channels_list_item_mfa" id="0x7F0D01FA" />
+    <public type="layout" name="widget_channels_list_item_stage_events_separator" id="0x7F0D01FB" />
+    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7F0D01FC" />
+    <public type="layout" name="widget_channels_list_item_thread" id="0x7F0D01FD" />
+    <public type="layout" name="widget_channels_list_item_thread_actions" id="0x7F0D01FE" />
+    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7F0D01FF" />
+    <public type="layout" name="widget_channels_list_unreads" id="0x7F0D0200" />
+    <public type="layout" name="widget_chat_input" id="0x7F0D0201" />
+    <public type="layout" name="widget_chat_input_application_commands" id="0x7F0D0202" />
+    <public type="layout" name="widget_chat_input_autocomplete_item" id="0x7F0D0203" />
+    <public type="layout" name="widget_chat_input_command_application_header_item" id="0x7F0D0204" />
+    <public type="layout" name="widget_chat_input_emoji_autocomplete_upsell_item" id="0x7F0D0205" />
+    <public type="layout" name="widget_chat_input_guard" id="0x7F0D0206" />
+    <public type="layout" name="widget_chat_input_item" id="0x7F0D0207" />
+    <public type="layout" name="widget_chat_input_member_verification_guard" id="0x7F0D0208" />
+    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7F0D0209" />
+    <public type="layout" name="widget_chat_input_slash_loading_item" id="0x7F0D020A" />
+    <public type="layout" name="widget_chat_input_sticker_suggestions" id="0x7F0D020B" />
+    <public type="layout" name="widget_chat_list" id="0x7F0D020C" />
+    <public type="layout" name="widget_chat_list_actions" id="0x7F0D020D" />
+    <public type="layout" name="widget_chat_list_adapter_item_application_command" id="0x7F0D020E" />
+    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7F0D020F" />
+    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7F0D0210" />
+    <public type="layout" name="widget_chat_list_adapter_item_bot_component_row" id="0x7F0D0211" />
+    <public type="layout" name="widget_chat_list_adapter_item_call" id="0x7F0D0212" />
+    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7F0D0213" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7F0D0214" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7F0D0215" />
+    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7F0D0216" />
+    <public type="layout" name="widget_chat_list_adapter_item_ephemeral_message" id="0x7F0D0217" />
+    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7F0D0218" />
+    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7F0D0219" />
+    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7F0D021A" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_invite_reminder" id="0x7F0D021B" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_template" id="0x7F0D021C" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7F0D021D" />
+    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7F0D021E" />
+    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7F0D021F" />
+    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7F0D0220" />
+    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7F0D0221" />
+    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7F0D0222" />
+    <public type="layout" name="widget_chat_list_adapter_item_private_channel_start" id="0x7F0D0223" />
+    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7F0D0224" />
+    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7F0D0225" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7F0D0226" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7F0D0227" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7F0D0228" />
+    <public type="layout" name="widget_chat_list_adapter_item_single_line_message_preview" id="0x7F0D0229" />
+    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7F0D022A" />
+    <public type="layout" name="widget_chat_list_adapter_item_spotify_listen_together" id="0x7F0D022B" />
+    <public type="layout" name="widget_chat_list_adapter_item_stage_invite" id="0x7F0D022C" />
+    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7F0D022D" />
+    <public type="layout" name="widget_chat_list_adapter_item_sticker" id="0x7F0D022E" />
+    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet" id="0x7F0D022F" />
+    <public type="layout" name="widget_chat_list_adapter_item_sticker_greet_compact" id="0x7F0D0230" />
+    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7F0D0231" />
+    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7F0D0232" />
+    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7F0D0233" />
+    <public type="layout" name="widget_chat_list_adapter_item_thread_draft_form" id="0x7F0D0234" />
+    <public type="layout" name="widget_chat_list_adapter_item_thread_embed" id="0x7F0D0235" />
+    <public type="layout" name="widget_chat_list_adapter_item_thread_starter_divider" id="0x7F0D0236" />
+    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7F0D0237" />
+    <public type="layout" name="widget_chat_list_bot_ui_action_row_component" id="0x7F0D0238" />
+    <public type="layout" name="widget_chat_list_bot_ui_button_component" id="0x7F0D0239" />
+    <public type="layout" name="widget_chat_list_bot_ui_select_component" id="0x7F0D023A" />
+    <public type="layout" name="widget_chat_list_bot_ui_select_component_pill" id="0x7F0D023B" />
+    <public type="layout" name="widget_chat_overlay" id="0x7F0D023C" />
+    <public type="layout" name="widget_chat_status" id="0x7F0D023D" />
+    <public type="layout" name="widget_choose_plan" id="0x7F0D023E" />
+    <public type="layout" name="widget_choose_plan_adapter_divider_item" id="0x7F0D023F" />
+    <public type="layout" name="widget_choose_plan_adapter_header_item" id="0x7F0D0240" />
+    <public type="layout" name="widget_choose_plan_adapter_plan_item" id="0x7F0D0241" />
+    <public type="layout" name="widget_claim_outbound_promo" id="0x7F0D0242" />
+    <public type="layout" name="widget_client_outdated" id="0x7F0D0243" />
+    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7F0D0244" />
+    <public type="layout" name="widget_confirm_remove_community_dialog" id="0x7F0D0245" />
+    <public type="layout" name="widget_connections_add_xbox" id="0x7F0D0246" />
+    <public type="layout" name="widget_contact_sync" id="0x7F0D0247" />
+    <public type="layout" name="widget_create_channel" id="0x7F0D0248" />
+    <public type="layout" name="widget_create_channel_add_member" id="0x7F0D0249" />
+    <public type="layout" name="widget_creation_intent" id="0x7F0D024A" />
+    <public type="layout" name="widget_debugging" id="0x7F0D024B" />
+    <public type="layout" name="widget_debugging_adapter_item" id="0x7F0D024C" />
+    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7F0D024D" />
+    <public type="layout" name="widget_discovery" id="0x7F0D024E" />
+    <public type="layout" name="widget_discovery_intro_card" id="0x7F0D024F" />
+    <public type="layout" name="widget_discovery_other_speakers_count" id="0x7F0D0250" />
+    <public type="layout" name="widget_discovery_stage_card" id="0x7F0D0251" />
+    <public type="layout" name="widget_discovery_stage_card_speaker" id="0x7F0D0252" />
+    <public type="layout" name="widget_edit_role" id="0x7F0D0253" />
+    <public type="layout" name="widget_emoji_picker" id="0x7F0D0254" />
+    <public type="layout" name="widget_emoji_picker_sheet" id="0x7F0D0255" />
+    <public type="layout" name="widget_emoji_sheet" id="0x7F0D0256" />
+    <public type="layout" name="widget_enable_community_steps" id="0x7F0D0257" />
+    <public type="layout" name="widget_enable_mfa_steps" id="0x7F0D0258" />
+    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7F0D0259" />
+    <public type="layout" name="widget_enable_two_factor_password_dialog" id="0x7F0D025A" />
+    <public type="layout" name="widget_end_stage_bottom_sheet" id="0x7F0D025B" />
+    <public type="layout" name="widget_expression_tray" id="0x7F0D025C" />
+    <public type="layout" name="widget_fatal_crash" id="0x7F0D025D" />
+    <public type="layout" name="widget_feedback_sheet" id="0x7F0D025E" />
+    <public type="layout" name="widget_folder_context_menu" id="0x7F0D025F" />
+    <public type="layout" name="widget_friends_add" id="0x7F0D0260" />
+    <public type="layout" name="widget_friends_add_by_id" id="0x7F0D0261" />
+    <public type="layout" name="widget_friends_list" id="0x7F0D0262" />
+    <public type="layout" name="widget_friends_list_adapter_item_friend" id="0x7F0D0263" />
+    <public type="layout" name="widget_friends_list_adapter_item_header" id="0x7F0D0264" />
+    <public type="layout" name="widget_friends_list_adapter_item_loading" id="0x7F0D0265" />
+    <public type="layout" name="widget_friends_list_adapter_item_pending" id="0x7F0D0266" />
+    <public type="layout" name="widget_friends_list_adapter_suggested_friend" id="0x7F0D0267" />
+    <public type="layout" name="widget_friends_list_contact_sync_upsell" id="0x7F0D0268" />
+    <public type="layout" name="widget_friends_list_expandable_header" id="0x7F0D0269" />
+    <public type="layout" name="widget_friends_nearby" id="0x7F0D026A" />
+    <public type="layout" name="widget_gif_category" id="0x7F0D026B" />
+    <public type="layout" name="widget_gif_picker" id="0x7F0D026C" />
+    <public type="layout" name="widget_gif_picker_search" id="0x7F0D026D" />
+    <public type="layout" name="widget_gif_picker_sheet" id="0x7F0D026E" />
+    <public type="layout" name="widget_global_search" id="0x7F0D026F" />
+    <public type="layout" name="widget_global_search_dialog" id="0x7F0D0270" />
+    <public type="layout" name="widget_global_search_item_divider" id="0x7F0D0271" />
+    <public type="layout" name="widget_global_search_item_dm" id="0x7F0D0272" />
+    <public type="layout" name="widget_global_search_item_guild" id="0x7F0D0273" />
+    <public type="layout" name="widget_global_status_indicator" id="0x7F0D0274" />
+    <public type="layout" name="widget_group_invite_friends" id="0x7F0D0275" />
+    <public type="layout" name="widget_group_invite_friends_item" id="0x7F0D0276" />
+    <public type="layout" name="widget_guild_call_onboarding" id="0x7F0D0277" />
+    <public type="layout" name="widget_guild_clone" id="0x7F0D0278" />
+    <public type="layout" name="widget_guild_context_menu" id="0x7F0D0279" />
+    <public type="layout" name="widget_guild_create" id="0x7F0D027A" />
+    <public type="layout" name="widget_guild_folder_settings" id="0x7F0D027B" />
+    <public type="layout" name="widget_guild_invite" id="0x7F0D027C" />
+    <public type="layout" name="widget_guild_invite_info" id="0x7F0D027D" />
+    <public type="layout" name="widget_guild_invite_settings" id="0x7F0D027E" />
+    <public type="layout" name="widget_guild_invite_share" id="0x7F0D027F" />
+    <public type="layout" name="widget_guild_invite_share_compact" id="0x7F0D0280" />
+    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7F0D0281" />
+    <public type="layout" name="widget_guild_invite_share_item" id="0x7F0D0282" />
+    <public type="layout" name="widget_guild_invite_share_sheet" id="0x7F0D0283" />
+    <public type="layout" name="widget_guild_join" id="0x7F0D0284" />
+    <public type="layout" name="widget_guild_join_invite_examples" id="0x7F0D0285" />
+    <public type="layout" name="widget_guild_profile_emoji_extra" id="0x7F0D0286" />
+    <public type="layout" name="widget_guild_profile_emoji_item" id="0x7F0D0287" />
+    <public type="layout" name="widget_guild_profile_sheet" id="0x7F0D0288" />
+    <public type="layout" name="widget_guild_selector" id="0x7F0D0289" />
+    <public type="layout" name="widget_guild_selector_item" id="0x7F0D028A" />
+    <public type="layout" name="widget_guild_sticker_sheet" id="0x7F0D028B" />
+    <public type="layout" name="widget_guild_transfer_ownership" id="0x7F0D028C" />
+    <public type="layout" name="widget_guild_welcome_channel" id="0x7F0D028D" />
+    <public type="layout" name="widget_guild_welcome_sheet" id="0x7F0D028E" />
+    <public type="layout" name="widget_guilds_list" id="0x7F0D028F" />
+    <public type="layout" name="widget_guilds_list_item_divider" id="0x7F0D0290" />
+    <public type="layout" name="widget_guilds_list_item_dm" id="0x7F0D0291" />
+    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7F0D0292" />
+    <public type="layout" name="widget_guilds_list_item_folder" id="0x7F0D0293" />
+    <public type="layout" name="widget_guilds_list_item_guild" id="0x7F0D0294" />
+    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7F0D0295" />
+    <public type="layout" name="widget_guilds_list_item_guild_nux" id="0x7F0D0296" />
+    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7F0D0297" />
+    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7F0D0298" />
+    <public type="layout" name="widget_guilds_list_item_hub_verification" id="0x7F0D0299" />
+    <public type="layout" name="widget_guilds_list_item_profile" id="0x7F0D029A" />
+    <public type="layout" name="widget_home" id="0x7F0D029B" />
+    <public type="layout" name="widget_home_panel_center" id="0x7F0D029C" />
+    <public type="layout" name="widget_home_panel_center_channel_less" id="0x7F0D029D" />
+    <public type="layout" name="widget_home_panel_center_content_unread" id="0x7F0D029E" />
+    <public type="layout" name="widget_home_panel_center_nsfw" id="0x7F0D029F" />
+    <public type="layout" name="widget_home_panel_left" id="0x7F0D02A0" />
+    <public type="layout" name="widget_home_panel_loading" id="0x7F0D02A1" />
+    <public type="layout" name="widget_home_panel_right" id="0x7F0D02A2" />
+    <public type="layout" name="widget_incoming_share" id="0x7F0D02A3" />
+    <public type="layout" name="widget_issue_details_form" id="0x7F0D02A4" />
+    <public type="layout" name="widget_kick_user" id="0x7F0D02A5" />
+    <public type="layout" name="widget_manage_reactions" id="0x7F0D02A6" />
+    <public type="layout" name="widget_manage_reactions_emoji" id="0x7F0D02A7" />
+    <public type="layout" name="widget_manage_reactions_result_error" id="0x7F0D02A8" />
+    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7F0D02A9" />
+    <public type="layout" name="widget_manage_reactions_result_user" id="0x7F0D02AA" />
+    <public type="layout" name="widget_masked_links_dialog" id="0x7F0D02AB" />
+    <public type="layout" name="widget_media" id="0x7F0D02AC" />
+    <public type="layout" name="widget_member_verification" id="0x7F0D02AD" />
+    <public type="layout" name="widget_member_verification_approve_terms_item" id="0x7F0D02AE" />
+    <public type="layout" name="widget_member_verification_header_item" id="0x7F0D02AF" />
+    <public type="layout" name="widget_member_verification_multiple_choice_item" id="0x7F0D02B0" />
+    <public type="layout" name="widget_member_verification_multiple_choice_radio_item" id="0x7F0D02B1" />
+    <public type="layout" name="widget_member_verification_paragraph_item" id="0x7F0D02B2" />
+    <public type="layout" name="widget_member_verification_pending_dialog" id="0x7F0D02B3" />
+    <public type="layout" name="widget_member_verification_rule_item" id="0x7F0D02B4" />
+    <public type="layout" name="widget_member_verification_success" id="0x7F0D02B5" />
+    <public type="layout" name="widget_member_verification_text_input_item" id="0x7F0D02B6" />
+    <public type="layout" name="widget_mobile_reports" id="0x7F0D02B7" />
+    <public type="layout" name="widget_music_rich_presence" id="0x7F0D02B8" />
+    <public type="layout" name="widget_mute_settings_sheet" id="0x7F0D02B9" />
+    <public type="layout" name="widget_navigation_help" id="0x7F0D02BA" />
+    <public type="layout" name="widget_navigation_help_nux_channels" id="0x7F0D02BB" />
+    <public type="layout" name="widget_navigation_help_nux_dms" id="0x7F0D02BC" />
+    <public type="layout" name="widget_navigation_help_nux_guilds" id="0x7F0D02BD" />
+    <public type="layout" name="widget_notice_dialog" id="0x7F0D02BE" />
+    <public type="layout" name="widget_notice_nux_overlay" id="0x7F0D02BF" />
+    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7F0D02C0" />
+    <public type="layout" name="widget_notice_popup" id="0x7F0D02C1" />
+    <public type="layout" name="widget_nux_channel_prompt" id="0x7F0D02C2" />
+    <public type="layout" name="widget_nux_guild_template" id="0x7F0D02C3" />
+    <public type="layout" name="widget_nux_post_registration" id="0x7F0D02C4" />
+    <public type="layout" name="widget_oauth_authorize" id="0x7F0D02C5" />
+    <public type="layout" name="widget_outbound_promo_terms" id="0x7F0D02C6" />
+    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7F0D02C7" />
+    <public type="layout" name="widget_phone_country_code_bottom_sheet" id="0x7F0D02C8" />
+    <public type="layout" name="widget_phone_country_code_list_item" id="0x7F0D02C9" />
+    <public type="layout" name="widget_platform_rich_presence" id="0x7F0D02CA" />
+    <public type="layout" name="widget_premium_guild_transfer" id="0x7F0D02CB" />
+    <public type="layout" name="widget_premium_upsell" id="0x7F0D02CC" />
+    <public type="layout" name="widget_prune_users" id="0x7F0D02CD" />
+    <public type="layout" name="widget_qr_scanner" id="0x7F0D02CE" />
+    <public type="layout" name="widget_quick_mentions_dialog" id="0x7F0D02CF" />
+    <public type="layout" name="widget_remote_auth" id="0x7F0D02D0" />
+    <public type="layout" name="widget_remote_auth_not_found" id="0x7F0D02D1" />
+    <public type="layout" name="widget_remote_auth_pending_login" id="0x7F0D02D2" />
+    <public type="layout" name="widget_remote_auth_success" id="0x7F0D02D3" />
+    <public type="layout" name="widget_screen_share_nfx_sheet" id="0x7F0D02D4" />
+    <public type="layout" name="widget_search" id="0x7F0D02D5" />
+    <public type="layout" name="widget_search_results" id="0x7F0D02D6" />
+    <public type="layout" name="widget_search_suggestion_item_header" id="0x7F0D02D7" />
+    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7F0D02D8" />
+    <public type="layout" name="widget_search_suggestions" id="0x7F0D02D9" />
+    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7F0D02DA" />
+    <public type="layout" name="widget_search_suggestions_item_has" id="0x7F0D02DB" />
+    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7F0D02DC" />
+    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7F0D02DD" />
+    <public type="layout" name="widget_search_suggestions_item_user" id="0x7F0D02DE" />
+    <public type="layout" name="widget_select_component_bottom_sheet" id="0x7F0D02DF" />
+    <public type="layout" name="widget_select_component_bottom_sheet_item" id="0x7F0D02E0" />
+    <public type="layout" name="widget_server_boost_confirmation" id="0x7F0D02E1" />
+    <public type="layout" name="widget_server_boost_status" id="0x7F0D02E2" />
+    <public type="layout" name="widget_server_delete_dialog" id="0x7F0D02E3" />
+    <public type="layout" name="widget_server_notification_override_selector" id="0x7F0D02E4" />
+    <public type="layout" name="widget_server_notifications" id="0x7F0D02E5" />
+    <public type="layout" name="widget_server_settings" id="0x7F0D02E6" />
+    <public type="layout" name="widget_server_settings_audit_log" id="0x7F0D02E7" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7F0D02E8" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7F0D02E9" />
+    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7F0D02EA" />
+    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7F0D02EB" />
+    <public type="layout" name="widget_server_settings_audit_log_menu_filter" id="0x7F0D02EC" />
+    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7F0D02ED" />
+    <public type="layout" name="widget_server_settings_bans" id="0x7F0D02EE" />
+    <public type="layout" name="widget_server_settings_channels" id="0x7F0D02EF" />
+    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7F0D02F0" />
+    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7F0D02F1" />
+    <public type="layout" name="widget_server_settings_community_overview" id="0x7F0D02F2" />
+    <public type="layout" name="widget_server_settings_community_setup_first_step" id="0x7F0D02F3" />
+    <public type="layout" name="widget_server_settings_community_setup_second_step" id="0x7F0D02F4" />
+    <public type="layout" name="widget_server_settings_community_setup_third_step" id="0x7F0D02F5" />
+    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7F0D02F6" />
+    <public type="layout" name="widget_server_settings_edit_integration" id="0x7F0D02F7" />
+    <public type="layout" name="widget_server_settings_edit_member" id="0x7F0D02F8" />
+    <public type="layout" name="widget_server_settings_emojis" id="0x7F0D02F9" />
+    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7F0D02FA" />
+    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7F0D02FB" />
+    <public type="layout" name="widget_server_settings_emojis_header" id="0x7F0D02FC" />
+    <public type="layout" name="widget_server_settings_emojis_item" id="0x7F0D02FD" />
+    <public type="layout" name="widget_server_settings_emojis_section" id="0x7F0D02FE" />
+    <public type="layout" name="widget_server_settings_enable_community" id="0x7F0D02FF" />
+    <public type="layout" name="widget_server_settings_help_item" id="0x7F0D0300" />
+    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7F0D0301" />
+    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7F0D0302" />
+    <public type="layout" name="widget_server_settings_instant_invites" id="0x7F0D0303" />
+    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7F0D0304" />
+    <public type="layout" name="widget_server_settings_integrations" id="0x7F0D0305" />
+    <public type="layout" name="widget_server_settings_member_list_item" id="0x7F0D0306" />
+    <public type="layout" name="widget_server_settings_members" id="0x7F0D0307" />
+    <public type="layout" name="widget_server_settings_moderation" id="0x7F0D0308" />
+    <public type="layout" name="widget_server_settings_overview" id="0x7F0D0309" />
+    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7F0D030A" />
+    <public type="layout" name="widget_server_settings_overview_region" id="0x7F0D030B" />
+    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7F0D030C" />
+    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7F0D030D" />
+    <public type="layout" name="widget_server_settings_role_item" id="0x7F0D030E" />
+    <public type="layout" name="widget_server_settings_roles_list" id="0x7F0D030F" />
+    <public type="layout" name="widget_server_settings_security" id="0x7F0D0310" />
+    <public type="layout" name="widget_server_settings_security_dialog" id="0x7F0D0311" />
+    <public type="layout" name="widget_server_settings_vanity_url" id="0x7F0D0312" />
+    <public type="layout" name="widget_settings" id="0x7F0D0313" />
+    <public type="layout" name="widget_settings_accessibility" id="0x7F0D0314" />
+    <public type="layout" name="widget_settings_account" id="0x7F0D0315" />
+    <public type="layout" name="widget_settings_account_backup_codes" id="0x7F0D0316" />
+    <public type="layout" name="widget_settings_account_change_password" id="0x7F0D0317" />
+    <public type="layout" name="widget_settings_account_contacts_name_edit" id="0x7F0D0318" />
+    <public type="layout" name="widget_settings_account_edit" id="0x7F0D0319" />
+    <public type="layout" name="widget_settings_account_email_edit" id="0x7F0D031A" />
+    <public type="layout" name="widget_settings_activity_status" id="0x7F0D031B" />
+    <public type="layout" name="widget_settings_appearance" id="0x7F0D031C" />
+    <public type="layout" name="widget_settings_authorized_apps" id="0x7F0D031D" />
+    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7F0D031E" />
+    <public type="layout" name="widget_settings_behavior" id="0x7F0D031F" />
+    <public type="layout" name="widget_settings_blocked_users" id="0x7F0D0320" />
+    <public type="layout" name="widget_settings_boost" id="0x7F0D0321" />
+    <public type="layout" name="widget_settings_connections" id="0x7F0D0322" />
+    <public type="layout" name="widget_settings_connections_add" id="0x7F0D0323" />
+    <public type="layout" name="widget_settings_developer" id="0x7F0D0324" />
+    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7F0D0325" />
+    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7F0D0326" />
+    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7F0D0327" />
+    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7F0D0328" />
+    <public type="layout" name="widget_settings_gifting" id="0x7F0D0329" />
+    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7F0D032A" />
+    <public type="layout" name="widget_settings_item_backup_code" id="0x7F0D032B" />
+    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7F0D032C" />
+    <public type="layout" name="widget_settings_item_blocked_user" id="0x7F0D032D" />
+    <public type="layout" name="widget_settings_item_connected_account" id="0x7F0D032E" />
+    <public type="layout" name="widget_settings_language" id="0x7F0D032F" />
+    <public type="layout" name="widget_settings_language_select" id="0x7F0D0330" />
+    <public type="layout" name="widget_settings_language_select_item" id="0x7F0D0331" />
+    <public type="layout" name="widget_settings_media" id="0x7F0D0332" />
+    <public type="layout" name="widget_settings_notification_os" id="0x7F0D0333" />
+    <public type="layout" name="widget_settings_notifications" id="0x7F0D0334" />
+    <public type="layout" name="widget_settings_premium" id="0x7F0D0335" />
+    <public type="layout" name="widget_settings_privacy" id="0x7F0D0336" />
+    <public type="layout" name="widget_settings_privacy_defaults" id="0x7F0D0337" />
+    <public type="layout" name="widget_settings_user_profile" id="0x7F0D0338" />
+    <public type="layout" name="widget_settings_voice" id="0x7F0D0339" />
+    <public type="layout" name="widget_settings_voice_input_mode" id="0x7F0D033A" />
+    <public type="layout" name="widget_stage_audience_blocked_bottom_sheet" id="0x7F0D033B" />
+    <public type="layout" name="widget_stage_audience_notice_bottom_sheet" id="0x7F0D033C" />
+    <public type="layout" name="widget_stage_channel_audience" id="0x7F0D033D" />
+    <public type="layout" name="widget_stage_channel_audience_role" id="0x7F0D033E" />
+    <public type="layout" name="widget_stage_channel_details" id="0x7F0D033F" />
+    <public type="layout" name="widget_stage_channel_divider" id="0x7F0D0340" />
+    <public type="layout" name="widget_stage_channel_moderator_permissions" id="0x7F0D0341" />
+    <public type="layout" name="widget_stage_channel_rich_presence" id="0x7F0D0342" />
+    <public type="layout" name="widget_stage_channel_speaker" id="0x7F0D0343" />
+    <public type="layout" name="widget_stage_moderator_join_bottom_sheet" id="0x7F0D0344" />
+    <public type="layout" name="widget_stage_public_notice_bottom_sheet" id="0x7F0D0345" />
+    <public type="layout" name="widget_stage_raised_hands_bottom_sheet" id="0x7F0D0346" />
+    <public type="layout" name="widget_stage_settings" id="0x7F0D0347" />
+    <public type="layout" name="widget_stage_start_event_bottom_sheet" id="0x7F0D0348" />
+    <public type="layout" name="widget_start_call_sheet" id="0x7F0D0349" />
+    <public type="layout" name="widget_start_stage" id="0x7F0D034A" />
+    <public type="layout" name="widget_start_stage_server_selection" id="0x7F0D034B" />
+    <public type="layout" name="widget_start_stage_server_selection_bullet_item" id="0x7F0D034C" />
+    <public type="layout" name="widget_start_stage_server_selection_guild_item" id="0x7F0D034D" />
+    <public type="layout" name="widget_sticker_pack_store_sheet" id="0x7F0D034E" />
+    <public type="layout" name="widget_sticker_picker" id="0x7F0D034F" />
+    <public type="layout" name="widget_sticker_picker_sheet" id="0x7F0D0350" />
+    <public type="layout" name="widget_sticker_sheet" id="0x7F0D0351" />
+    <public type="layout" name="widget_stream_rich_presence" id="0x7F0D0352" />
+    <public type="layout" name="widget_tabs_host" id="0x7F0D0353" />
+    <public type="layout" name="widget_text_channel_settings" id="0x7F0D0354" />
+    <public type="layout" name="widget_thread_archive_actions_sheet" id="0x7F0D0355" />
+    <public type="layout" name="widget_thread_browser" id="0x7F0D0356" />
+    <public type="layout" name="widget_thread_browser_active" id="0x7F0D0357" />
+    <public type="layout" name="widget_thread_browser_archived" id="0x7F0D0358" />
+    <public type="layout" name="widget_thread_browser_filter_sheet" id="0x7F0D0359" />
+    <public type="layout" name="widget_thread_notification_settings" id="0x7F0D035A" />
+    <public type="layout" name="widget_thread_settings" id="0x7F0D035B" />
+    <public type="layout" name="widget_thread_status" id="0x7F0D035C" />
+    <public type="layout" name="widget_tos_accept" id="0x7F0D035D" />
+    <public type="layout" name="widget_tos_report_violation" id="0x7F0D035E" />
+    <public type="layout" name="widget_tos_report_violation_reason" id="0x7F0D035F" />
+    <public type="layout" name="widget_unknown_sticker_sheet" id="0x7F0D0360" />
+    <public type="layout" name="widget_urgent_message_dialog" id="0x7F0D0361" />
+    <public type="layout" name="widget_url_actions" id="0x7F0D0362" />
+    <public type="layout" name="widget_usage_settings_dialog" id="0x7F0D0363" />
+    <public type="layout" name="widget_user_account_verify" id="0x7F0D0364" />
+    <public type="layout" name="widget_user_email_update" id="0x7F0D0365" />
+    <public type="layout" name="widget_user_email_verify" id="0x7F0D0366" />
+    <public type="layout" name="widget_user_mentions" id="0x7F0D0367" />
+    <public type="layout" name="widget_user_mentions_filter" id="0x7F0D0368" />
+    <public type="layout" name="widget_user_mutual_friends" id="0x7F0D0369" />
+    <public type="layout" name="widget_user_mutual_guilds" id="0x7F0D036A" />
+    <public type="layout" name="widget_user_password_verify" id="0x7F0D036B" />
+    <public type="layout" name="widget_user_phone_manage" id="0x7F0D036C" />
+    <public type="layout" name="widget_user_phone_verify" id="0x7F0D036D" />
+    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7F0D036E" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7F0D036F" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7F0D0370" />
+    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7F0D0371" />
+    <public type="layout" name="widget_user_rich_presence" id="0x7F0D0372" />
+    <public type="layout" name="widget_user_set_custom_status" id="0x7F0D0373" />
+    <public type="layout" name="widget_user_sheet" id="0x7F0D0374" />
+    <public type="layout" name="widget_user_status_update" id="0x7F0D0375" />
+    <public type="layout" name="widget_voice_bottom_sheet" id="0x7F0D0376" />
+    <public type="layout" name="widget_voice_call_incoming" id="0x7F0D0377" />
+    <public type="layout" name="widget_voice_call_inline" id="0x7F0D0378" />
+    <public type="layout" name="widget_voice_channel_settings" id="0x7F0D0379" />
+    <public type="layout" name="widget_voice_noise_cancellation_bottom_sheet" id="0x7F0D037A" />
+    <public type="layout" name="widget_voice_settings_bottom_sheet" id="0x7F0D037B" />
     <public type="menu" name="menu_add_member_continue" id="0x7F0E0000" />
     <public type="menu" name="menu_audit_log_sort" id="0x7F0E0001" />
     <public type="menu" name="menu_auth_mfa" id="0x7F0E0002" />
@@ -9952,8 +10033,6 @@
     <public type="plurals" name="guild_settings_audit_log_role_permissions_granted_count" id="0x7F100092" />
     <public type="plurals" name="guild_settings_discovery_checklist_age_description_failing_minimumGuildAge" id="0x7F100093" />
     <public type="plurals" name="guild_settings_discovery_checklist_age_description_minimumGuildAge" id="0x7F100094" />
-    <public type="plurals" name="guild_settings_discovery_checklist_change_channel_categories_numCategories" id="0x7F100095" />
-    <public type="plurals" name="guild_settings_discovery_checklist_change_channel_names_numChannels" id="0x7F100096" />
     <public type="plurals" name="guild_settings_member_verification_review_pending_applications_count" id="0x7F100097" />
     <public type="plurals" name="guild_settings_overview_boost_unlock_boosts" id="0x7F100098" />
     <public type="plurals" name="guild_settings_partner_checklist_age_description_failing_minimumGuildAge" id="0x7F100099" />
@@ -9980,175 +10059,176 @@
     <public type="plurals" name="guild_template_usages_no_bold_usageCount" id="0x7F1000AE" />
     <public type="plurals" name="guild_template_usages_usageCount" id="0x7F1000AF" />
     <public type="plurals" name="guild_tooltip_a11y_label_mentions" id="0x7F1000B0" />
-    <public type="plurals" name="humanize_duration_days_time" id="0x7F1000B3" />
-    <public type="plurals" name="humanize_duration_hours_time" id="0x7F1000B4" />
-    <public type="plurals" name="humanize_duration_minutes_time" id="0x7F1000B5" />
-    <public type="plurals" name="humanize_duration_seconds_time" id="0x7F1000B6" />
-    <public type="plurals" name="instant_invite_guild_members_total_count" id="0x7F1000B7" />
-    <public type="plurals" name="integrations_channel_following_summary_count" id="0x7F1000B8" />
-    <public type="plurals" name="integrations_twitch_summary_count" id="0x7F1000B9" />
-    <public type="plurals" name="integrations_webhooks_count_count" id="0x7F1000BA" />
-    <public type="plurals" name="integrations_webhooks_summary_count" id="0x7F1000BB" />
-    <public type="plurals" name="integrations_youtube_summary_count" id="0x7F1000BC" />
-    <public type="plurals" name="invite_embed_num_open_slots_number" id="0x7F1000BD" />
-    <public type="plurals" name="invite_expires_days_or_uses_plural_numDays" id="0x7F1000BE" />
-    <public type="plurals" name="invite_expires_days_or_uses_plural_numUses" id="0x7F1000BF" />
-    <public type="plurals" name="invite_expires_days_plural_numDays" id="0x7F1000C0" />
-    <public type="plurals" name="invite_expires_hours_numHours" id="0x7F1000C1" />
-    <public type="plurals" name="invite_expires_hours_or_uses_numHours" id="0x7F1000C2" />
-    <public type="plurals" name="invite_expires_hours_or_uses_numUses" id="0x7F1000C3" />
-    <public type="plurals" name="invite_expires_minutes_or_uses_numUses" id="0x7F1000C4" />
-    <public type="plurals" name="invite_expires_uses_numUses" id="0x7F1000C5" />
-    <public type="plurals" name="invite_urgent_days_message_placeholder_numDays" id="0x7F1000C6" />
-    <public type="plurals" name="invite_urgent_hours_message_placeholder_numHours" id="0x7F1000C7" />
-    <public type="plurals" name="invite_urgent_minutes_placeholder_numMinutes" id="0x7F1000C8" />
-    <public type="plurals" name="last_seen_days" id="0x7F1000C9" />
-    <public type="plurals" name="live_viewers_viewers" id="0x7F1000CA" />
-    <public type="plurals" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading_numFreeGuildSubscriptions" id="0x7F1000CB" />
-    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label_numFreeGuildSubscriptions" id="0x7F1000CC" />
-    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_no_premium_guild_subscriptions_numFreeGuildSubscriptions" id="0x7F1000CD" />
-    <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7F1000CE" />
-    <public type="plurals" name="max_uses_maxUses" id="0x7F1000CF" />
-    <public type="plurals" name="member_verification_num_emojis_emojis" id="0x7F1000D0" />
-    <public type="plurals" name="members_header_members" id="0x7F1000D3" />
-    <public type="plurals" name="mtrl_badge_content_description" id="0x7F1000D4" />
-    <public type="plurals" name="n_days_days" id="0x7F1000D5" />
-    <public type="plurals" name="new_messages_count" id="0x7F1000D6" />
-    <public type="plurals" name="new_messages_with_date_count" id="0x7F1000D7" />
-    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7F1000D8" />
-    <public type="plurals" name="notice_premium_tier_2_trial_ending_days_days" id="0x7F1000D9" />
-    <public type="plurals" name="notice_premium_tier_2_trial_ending_hours_hours" id="0x7F1000DA" />
-    <public type="plurals" name="notice_premium_tier_2_trial_ending_minutes_minutes" id="0x7F1000DB" />
-    <public type="plurals" name="num_channels_num" id="0x7F1000DC" />
-    <public type="plurals" name="num_members_subscribers" id="0x7F1000DD" />
-    <public type="plurals" name="num_subscribers_subscribers" id="0x7F1000DE" />
-    <public type="plurals" name="num_users_num" id="0x7F1000DF" />
-    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7F1000E0" />
-    <public type="plurals" name="only_you_can_see_and_delete_these_countMessages" id="0x7F1000E1" />
-    <public type="plurals" name="partial_outage_a11y_count" id="0x7F1000E2" />
-    <public type="plurals" name="partial_outage_count" id="0x7F1000E3" />
-    <public type="plurals" name="premium_chat_perks_description_premium_guild_included_numFreeGuildSubscriptions" id="0x7F1000E4" />
-    <public type="plurals" name="premium_guild_features_upsell_banner_subscribe_numFreeGuildSubscriptions" id="0x7F1000E5" />
-    <public type="plurals" name="premium_guild_grace_period_cooldown_numPremiumSubscriptions" id="0x7F1000E6" />
-    <public type="plurals" name="premium_guild_grace_period_cooldown_soon_numPremiumSubscriptions" id="0x7F1000E7" />
-    <public type="plurals" name="premium_guild_num_month_guild_subscriptions_num" id="0x7F1000E8" />
-    <public type="plurals" name="premium_guild_num_month_guild_subscriptions_unformatted_num" id="0x7F1000E9" />
-    <public type="plurals" name="premium_guild_num_year_guild_subscriptions_num" id="0x7F1000EA" />
-    <public type="plurals" name="premium_guild_num_year_guild_subscriptions_unformatted_num" id="0x7F1000EB" />
-    <public type="plurals" name="premium_guild_perks_modal_header_subscription_count_subscriptions" id="0x7F1000EC" />
-    <public type="plurals" name="premium_guild_perks_modal_header_user_subscription_count_numSubscriptions" id="0x7F1000ED" />
-    <public type="plurals" name="premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions" id="0x7F1000EE" />
-    <public type="plurals" name="premium_guild_perks_modal_protip_numFreeGuildSubscriptions" id="0x7F1000EF" />
-    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7F1000F0" />
-    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7F1000F1" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cancel_warning_canceledCount" id="0x7F1000F2" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_label_slotCount" id="0x7F1000F3" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_slotCount" id="0x7F1000F4" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7F1000F5" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_slotCount" id="0x7F1000F6" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_guildCount" id="0x7F1000F7" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_slotCount" id="0x7F1000F8" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_from_guild_guildCount" id="0x7F1000F9" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_to_guild_slotCount" id="0x7F1000FA" />
-    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_label_slotCount" id="0x7F1000FB" />
-    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_slotCount" id="0x7F1000FC" />
-    <public type="plurals" name="premium_guild_subscription_available_numSubscriptions" id="0x7F1000FD" />
-    <public type="plurals" name="premium_guild_subscription_cancel_invoice_subscription_cancelled_subscriptionCount" id="0x7F1000FE" />
-    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7F1000FF" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7F100100" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7F100101" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7F100102" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7F100103" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7F100104" />
-    <public type="plurals" name="premium_guild_subscription_guild_subsription_subtitle_numSubscriptions" id="0x7F100105" />
-    <public type="plurals" name="premium_guild_subscription_num_subscriptions_numSubscriptions" id="0x7F100106" />
-    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7F100107" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_account_hold_no_price_quantity" id="0x7F100108" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_account_hold_quantity" id="0x7F100109" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_android_quantity" id="0x7F10010A" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_no_price_quantity" id="0x7F10010B" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android_quantity" id="0x7F10010C" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_no_price_quantity" id="0x7F10010D" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_quantity" id="0x7F10010E" />
-    <public type="plurals" name="premium_guild_subscriptions_renewal_info_quantity" id="0x7F10010F" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7F100110" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7F100111" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7F100112" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7F100113" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7F100114" />
-    <public type="plurals" name="premium_marketing_feature_premium_guild_description_numFreeGuildSubscriptions" id="0x7F100115" />
-    <public type="plurals" name="premium_plan_month_tier_2_trial_months" id="0x7F100116" />
-    <public type="plurals" name="premium_plan_year_tier_2_trial_months" id="0x7F100117" />
-    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7F100118" />
-    <public type="plurals" name="premium_subscription_renewal_footer_trial_days" id="0x7F100119" />
-    <public type="plurals" name="premium_trial_cta_description_expiring_days_days" id="0x7F10011A" />
-    <public type="plurals" name="premium_trial_cta_description_expiring_hours_hours" id="0x7F10011B" />
-    <public type="plurals" name="premium_trial_cta_description_expiring_minutes_minutes" id="0x7F10011C" />
-    <public type="plurals" name="premium_upsell_feature_free_guild_subscription_numFreeGuildSubscriptions" id="0x7F10011D" />
-    <public type="plurals" name="preview_lines_left_lines" id="0x7F10011E" />
-    <public type="plurals" name="preview_num_lines_at_least_lines" id="0x7F10011F" />
-    <public type="plurals" name="preview_num_lines_lines" id="0x7F100120" />
-    <public type="plurals" name="private_channel_access_info_members_count" id="0x7F100121" />
-    <public type="plurals" name="private_channel_access_info_roles_count" id="0x7F100122" />
-    <public type="plurals" name="private_channel_members_added_toast_msg_count" id="0x7F100123" />
-    <public type="plurals" name="private_channel_roles_added_toast_msg_count" id="0x7F100124" />
-    <public type="plurals" name="promotion_existing_subscriber_body_months" id="0x7F100125" />
-    <public type="plurals" name="promotion_previous_subscriber_body_months" id="0x7F100126" />
-    <public type="plurals" name="promotion_redeem_body_months" id="0x7F100127" />
-    <public type="plurals" name="publish_followed_news_body_reach_numGuildsFollowing" id="0x7F100128" />
-    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7F100129" />
-    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7F10012A" />
-    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7F10012B" />
-    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7F10012C" />
-    <public type="plurals" name="reaction_tooltip_n_n" id="0x7F10012D" />
-    <public type="plurals" name="role_member_count_count" id="0x7F10012E" />
-    <public type="plurals" name="role_row_description_count" id="0x7F10012F" />
-    <public type="plurals" name="role_row_view_members_count" id="0x7F100130" />
-    <public type="plurals" name="roles_list_numRoles" id="0x7F100131" />
-    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7F100132" />
-    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7F100133" />
-    <public type="plurals" name="search_still_indexing_hint_count" id="0x7F100134" />
-    <public type="plurals" name="speaking_count_count" id="0x7F100135" />
-    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7F100137" />
-    <public type="plurals" name="stage_blocked_users_body_number" id="0x7F100138" />
-    <public type="plurals" name="stage_blocked_users_description_count_number" id="0x7F100139" />
-    <public type="plurals" name="stage_blocked_users_title_plural_number" id="0x7F10013A" />
-    <public type="plurals" name="stage_channel_people_count_count" id="0x7F10013B" />
-    <public type="plurals" name="stage_channel_people_count_speakerCount" id="0x7F10013C" />
-    <public type="plurals" name="stage_channel_users_are_speaking_count" id="0x7F10013D" />
-    <public type="plurals" name="stage_discovery_card_speaker_text_number" id="0x7F10013E" />
-    <public type="plurals" name="stage_discovery_card_speaker_text_overflow_count" id="0x7F10013F" />
-    <public type="plurals" name="stage_discovery_live_stage_tile_speaker_summary_overflow_count" id="0x7F100140" />
-    <public type="plurals" name="stage_instance_speakers_speakerCount" id="0x7F100141" />
-    <public type="plurals" name="stage_invite_speaker_count_count" id="0x7F100142" />
-    <public type="plurals" name="stage_is_speaking_hook_count" id="0x7F100143" />
-    <public type="plurals" name="stage_speak_invite_blocked_users_number" id="0x7F100144" />
-    <public type="plurals" name="stage_speak_invite_header_blocked_users_number" id="0x7F100145" />
-    <public type="plurals" name="sticker_pack_sticker_count_numStickers" id="0x7F100146" />
-    <public type="plurals" name="sticker_premium_tier_2_upsell_alert_perks_guild_subscriptions_numFreeGuildSubscriptions" id="0x7F100147" />
-    <public type="plurals" name="stickers_gift_inventory_title_month_intervalCount" id="0x7F100148" />
-    <public type="plurals" name="stickers_gift_inventory_title_year_intervalCount" id="0x7F100149" />
-    <public type="plurals" name="thread_message_count_count" id="0x7F10014A" />
-    <public type="plurals" name="thread_reply_suggestion_count" id="0x7F10014B" />
-    <public type="plurals" name="total_results_count" id="0x7F10014C" />
-    <public type="plurals" name="uploading_files_count" id="0x7F10014D" />
-    <public type="plurals" name="uploading_files_failed_count" id="0x7F10014E" />
-    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7F10014F" />
-    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7F100150" />
-    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7F100151" />
-    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7F100152" />
-    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7F100153" />
-    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7F100154" />
-    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7F100155" />
-    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7F100156" />
-    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7F100157" />
-    <public type="plurals" name="user_profile_mutual_friends_count" id="0x7F100158" />
-    <public type="plurals" name="user_profile_mutual_guilds_count" id="0x7F100159" />
-    <public type="plurals" name="user_summary_with_others_count" id="0x7F10015A" />
-    <public type="plurals" name="vanity_url_header_uses_uses" id="0x7F10015B" />
-    <public type="plurals" name="vanity_url_uses_uses" id="0x7F10015C" />
-    <public type="plurals" name="viewing_as_roles_numRoles" id="0x7F10015D" />
-    <public type="plurals" name="voice_call_member_list_title_count" id="0x7F10015E" />
+    <public type="plurals" name="hub_email_connection_invite_header_count" id="0x7F1000B3" />
+    <public type="plurals" name="humanize_duration_days_time" id="0x7F1000B4" />
+    <public type="plurals" name="humanize_duration_hours_time" id="0x7F1000B5" />
+    <public type="plurals" name="humanize_duration_minutes_time" id="0x7F1000B6" />
+    <public type="plurals" name="humanize_duration_seconds_time" id="0x7F1000B7" />
+    <public type="plurals" name="instant_invite_guild_members_total_count" id="0x7F1000B8" />
+    <public type="plurals" name="integrations_channel_following_summary_count" id="0x7F1000B9" />
+    <public type="plurals" name="integrations_twitch_summary_count" id="0x7F1000BA" />
+    <public type="plurals" name="integrations_webhooks_count_count" id="0x7F1000BB" />
+    <public type="plurals" name="integrations_webhooks_summary_count" id="0x7F1000BC" />
+    <public type="plurals" name="integrations_youtube_summary_count" id="0x7F1000BD" />
+    <public type="plurals" name="invite_embed_num_open_slots_number" id="0x7F1000BE" />
+    <public type="plurals" name="invite_expires_days_or_uses_plural_numDays" id="0x7F1000BF" />
+    <public type="plurals" name="invite_expires_days_or_uses_plural_numUses" id="0x7F1000C0" />
+    <public type="plurals" name="invite_expires_days_plural_numDays" id="0x7F1000C1" />
+    <public type="plurals" name="invite_expires_hours_numHours" id="0x7F1000C2" />
+    <public type="plurals" name="invite_expires_hours_or_uses_numHours" id="0x7F1000C3" />
+    <public type="plurals" name="invite_expires_hours_or_uses_numUses" id="0x7F1000C4" />
+    <public type="plurals" name="invite_expires_minutes_or_uses_numUses" id="0x7F1000C5" />
+    <public type="plurals" name="invite_expires_uses_numUses" id="0x7F1000C6" />
+    <public type="plurals" name="invite_urgent_days_message_placeholder_numDays" id="0x7F1000C7" />
+    <public type="plurals" name="invite_urgent_hours_message_placeholder_numHours" id="0x7F1000C8" />
+    <public type="plurals" name="invite_urgent_minutes_placeholder_numMinutes" id="0x7F1000C9" />
+    <public type="plurals" name="last_seen_days" id="0x7F1000CA" />
+    <public type="plurals" name="live_viewers_viewers" id="0x7F1000CB" />
+    <public type="plurals" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading_numFreeGuildSubscriptions" id="0x7F1000CC" />
+    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label_numFreeGuildSubscriptions" id="0x7F1000CD" />
+    <public type="plurals" name="marketing_refresh_premium_tier_1_cta_description_perks_info_no_premium_guild_subscriptions_numFreeGuildSubscriptions" id="0x7F1000CE" />
+    <public type="plurals" name="max_uses_description_mobile_maxUses" id="0x7F1000CF" />
+    <public type="plurals" name="max_uses_maxUses" id="0x7F1000D0" />
+    <public type="plurals" name="member_verification_num_emojis_emojis" id="0x7F1000D1" />
+    <public type="plurals" name="members_header_members" id="0x7F1000D4" />
+    <public type="plurals" name="mtrl_badge_content_description" id="0x7F1000D5" />
+    <public type="plurals" name="n_days_days" id="0x7F1000D6" />
+    <public type="plurals" name="new_messages_count" id="0x7F1000D7" />
+    <public type="plurals" name="new_messages_with_date_count" id="0x7F1000D8" />
+    <public type="plurals" name="notice_premium_grandfathered_ending_numDays" id="0x7F1000D9" />
+    <public type="plurals" name="notice_premium_tier_2_trial_ending_days_days" id="0x7F1000DA" />
+    <public type="plurals" name="notice_premium_tier_2_trial_ending_hours_hours" id="0x7F1000DB" />
+    <public type="plurals" name="notice_premium_tier_2_trial_ending_minutes_minutes" id="0x7F1000DC" />
+    <public type="plurals" name="num_channels_num" id="0x7F1000DD" />
+    <public type="plurals" name="num_members_subscribers" id="0x7F1000DE" />
+    <public type="plurals" name="num_subscribers_subscribers" id="0x7F1000DF" />
+    <public type="plurals" name="num_users_num" id="0x7F1000E0" />
+    <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7F1000E1" />
+    <public type="plurals" name="only_you_can_see_and_delete_these_countMessages" id="0x7F1000E2" />
+    <public type="plurals" name="partial_outage_a11y_count" id="0x7F1000E3" />
+    <public type="plurals" name="partial_outage_count" id="0x7F1000E4" />
+    <public type="plurals" name="premium_chat_perks_description_premium_guild_included_numFreeGuildSubscriptions" id="0x7F1000E5" />
+    <public type="plurals" name="premium_guild_features_upsell_banner_subscribe_numFreeGuildSubscriptions" id="0x7F1000E6" />
+    <public type="plurals" name="premium_guild_grace_period_cooldown_numPremiumSubscriptions" id="0x7F1000E7" />
+    <public type="plurals" name="premium_guild_grace_period_cooldown_soon_numPremiumSubscriptions" id="0x7F1000E8" />
+    <public type="plurals" name="premium_guild_num_month_guild_subscriptions_num" id="0x7F1000E9" />
+    <public type="plurals" name="premium_guild_num_month_guild_subscriptions_unformatted_num" id="0x7F1000EA" />
+    <public type="plurals" name="premium_guild_num_year_guild_subscriptions_num" id="0x7F1000EB" />
+    <public type="plurals" name="premium_guild_num_year_guild_subscriptions_unformatted_num" id="0x7F1000EC" />
+    <public type="plurals" name="premium_guild_perks_modal_header_subscription_count_subscriptions" id="0x7F1000ED" />
+    <public type="plurals" name="premium_guild_perks_modal_header_user_subscription_count_numSubscriptions" id="0x7F1000EE" />
+    <public type="plurals" name="premium_guild_perks_modal_protip_mobile_numFreeGuildSubscriptions" id="0x7F1000EF" />
+    <public type="plurals" name="premium_guild_perks_modal_protip_numFreeGuildSubscriptions" id="0x7F1000F0" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7F1000F1" />
+    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7F1000F2" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cancel_warning_canceledCount" id="0x7F1000F3" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_label_slotCount" id="0x7F1000F4" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_confirmation_slotCount" id="0x7F1000F5" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7F1000F6" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_slotCount" id="0x7F1000F7" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_guildCount" id="0x7F1000F8" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_blurb_slotCount" id="0x7F1000F9" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_from_guild_guildCount" id="0x7F1000FA" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_transfer_to_guild_slotCount" id="0x7F1000FB" />
+    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_label_slotCount" id="0x7F1000FC" />
+    <public type="plurals" name="premium_guild_subscribe_transfer_confirm_confirmation_slotCount" id="0x7F1000FD" />
+    <public type="plurals" name="premium_guild_subscription_available_numSubscriptions" id="0x7F1000FE" />
+    <public type="plurals" name="premium_guild_subscription_cancel_invoice_subscription_cancelled_subscriptionCount" id="0x7F1000FF" />
+    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7F100100" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7F100101" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7F100102" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7F100103" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7F100104" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7F100105" />
+    <public type="plurals" name="premium_guild_subscription_guild_subsription_subtitle_numSubscriptions" id="0x7F100106" />
+    <public type="plurals" name="premium_guild_subscription_num_subscriptions_numSubscriptions" id="0x7F100107" />
+    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7F100108" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_account_hold_no_price_quantity" id="0x7F100109" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_account_hold_quantity" id="0x7F10010A" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_android_quantity" id="0x7F10010B" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_no_price_quantity" id="0x7F10010C" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android_quantity" id="0x7F10010D" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_no_price_quantity" id="0x7F10010E" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_pending_cancelation_quantity" id="0x7F10010F" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_quantity" id="0x7F100110" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7F100111" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7F100112" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7F100113" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7F100114" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7F100115" />
+    <public type="plurals" name="premium_marketing_feature_premium_guild_description_numFreeGuildSubscriptions" id="0x7F100116" />
+    <public type="plurals" name="premium_plan_month_tier_2_trial_months" id="0x7F100117" />
+    <public type="plurals" name="premium_plan_year_tier_2_trial_months" id="0x7F100118" />
+    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7F100119" />
+    <public type="plurals" name="premium_subscription_renewal_footer_trial_days" id="0x7F10011A" />
+    <public type="plurals" name="premium_trial_cta_description_expiring_days_days" id="0x7F10011B" />
+    <public type="plurals" name="premium_trial_cta_description_expiring_hours_hours" id="0x7F10011C" />
+    <public type="plurals" name="premium_trial_cta_description_expiring_minutes_minutes" id="0x7F10011D" />
+    <public type="plurals" name="premium_upsell_feature_free_guild_subscription_numFreeGuildSubscriptions" id="0x7F10011E" />
+    <public type="plurals" name="preview_lines_left_lines" id="0x7F10011F" />
+    <public type="plurals" name="preview_num_lines_at_least_lines" id="0x7F100120" />
+    <public type="plurals" name="preview_num_lines_lines" id="0x7F100121" />
+    <public type="plurals" name="private_channel_access_info_members_count" id="0x7F100122" />
+    <public type="plurals" name="private_channel_access_info_roles_count" id="0x7F100123" />
+    <public type="plurals" name="private_channel_members_added_toast_msg_count" id="0x7F100124" />
+    <public type="plurals" name="private_channel_roles_added_toast_msg_count" id="0x7F100125" />
+    <public type="plurals" name="promotion_existing_subscriber_body_months" id="0x7F100126" />
+    <public type="plurals" name="promotion_previous_subscriber_body_months" id="0x7F100127" />
+    <public type="plurals" name="promotion_redeem_body_months" id="0x7F100128" />
+    <public type="plurals" name="publish_followed_news_body_reach_numGuildsFollowing" id="0x7F100129" />
+    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7F10012A" />
+    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7F10012B" />
+    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7F10012C" />
+    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7F10012D" />
+    <public type="plurals" name="reaction_tooltip_n_n" id="0x7F10012E" />
+    <public type="plurals" name="role_member_count_count" id="0x7F10012F" />
+    <public type="plurals" name="role_row_description_count" id="0x7F100130" />
+    <public type="plurals" name="role_row_view_members_count" id="0x7F100131" />
+    <public type="plurals" name="roles_list_numRoles" id="0x7F100132" />
+    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7F100133" />
+    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7F100134" />
+    <public type="plurals" name="search_still_indexing_hint_count" id="0x7F100135" />
+    <public type="plurals" name="speaking_count_count" id="0x7F100136" />
+    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7F100138" />
+    <public type="plurals" name="stage_blocked_users_body_number" id="0x7F100139" />
+    <public type="plurals" name="stage_blocked_users_description_count_number" id="0x7F10013A" />
+    <public type="plurals" name="stage_blocked_users_title_plural_number" id="0x7F10013B" />
+    <public type="plurals" name="stage_channel_people_count_count" id="0x7F10013C" />
+    <public type="plurals" name="stage_channel_people_count_speakerCount" id="0x7F10013D" />
+    <public type="plurals" name="stage_channel_users_are_speaking_count" id="0x7F10013E" />
+    <public type="plurals" name="stage_discovery_card_speaker_text_number" id="0x7F10013F" />
+    <public type="plurals" name="stage_discovery_card_speaker_text_overflow_count" id="0x7F100140" />
+    <public type="plurals" name="stage_discovery_live_stage_tile_speaker_summary_overflow_count" id="0x7F100141" />
+    <public type="plurals" name="stage_instance_speakers_speakerCount" id="0x7F100142" />
+    <public type="plurals" name="stage_invite_speaker_count_count" id="0x7F100143" />
+    <public type="plurals" name="stage_is_speaking_hook_count" id="0x7F100144" />
+    <public type="plurals" name="stage_speak_invite_blocked_users_number" id="0x7F100145" />
+    <public type="plurals" name="stage_speak_invite_header_blocked_users_number" id="0x7F100146" />
+    <public type="plurals" name="sticker_pack_sticker_count_numStickers" id="0x7F100147" />
+    <public type="plurals" name="sticker_premium_tier_2_upsell_alert_perks_guild_subscriptions_numFreeGuildSubscriptions" id="0x7F100148" />
+    <public type="plurals" name="stickers_gift_inventory_title_month_intervalCount" id="0x7F100149" />
+    <public type="plurals" name="stickers_gift_inventory_title_year_intervalCount" id="0x7F10014A" />
+    <public type="plurals" name="thread_message_count_count" id="0x7F10014B" />
+    <public type="plurals" name="thread_reply_suggestion_count" id="0x7F10014C" />
+    <public type="plurals" name="total_results_count" id="0x7F10014D" />
+    <public type="plurals" name="uploading_files_count" id="0x7F10014E" />
+    <public type="plurals" name="uploading_files_failed_count" id="0x7F10014F" />
+    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7F100150" />
+    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7F100151" />
+    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7F100152" />
+    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7F100153" />
+    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7F100154" />
+    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7F100155" />
+    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7F100156" />
+    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7F100157" />
+    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7F100158" />
+    <public type="plurals" name="user_profile_mutual_friends_count" id="0x7F100159" />
+    <public type="plurals" name="user_profile_mutual_guilds_count" id="0x7F10015A" />
+    <public type="plurals" name="user_summary_with_others_count" id="0x7F10015B" />
+    <public type="plurals" name="vanity_url_header_uses_uses" id="0x7F10015C" />
+    <public type="plurals" name="vanity_url_uses_uses" id="0x7F10015D" />
+    <public type="plurals" name="viewing_as_roles_numRoles" id="0x7F10015E" />
+    <public type="plurals" name="voice_call_member_list_title_count" id="0x7F10015F" />
     <public type="raw" name="anim_friends_add_nearby_looking" id="0x7F110000" />
     <public type="raw" name="call_calling" id="0x7F110001" />
     <public type="raw" name="call_ringing" id="0x7F110002" />
@@ -15237,597 +15317,597 @@
     <public type="string" name="contact_sync_we_found_your_friends_title" id="0x7F1205FC" />
     <public type="string" name="contacts_invite_placeholder" id="0x7F1205FD" />
     <public type="string" name="content_matching" id="0x7F1205FE" />
-    <public type="string" name="context_menu_hint" id="0x7F1205FF" />
-    <public type="string" name="continue_in_browser" id="0x7F120600" />
-    <public type="string" name="continue_to_webapp" id="0x7F120601" />
-    <public type="string" name="control_volume" id="0x7F120602" />
-    <public type="string" name="convert_emoticons" id="0x7F120603" />
-    <public type="string" name="convert_emoticons_help" id="0x7F120604" />
-    <public type="string" name="copied" id="0x7F120605" />
-    <public type="string" name="copied_text" id="0x7F120606" />
-    <public type="string" name="copy" id="0x7F120607" />
-    <public type="string" name="copy_channel_topic" id="0x7F120608" />
-    <public type="string" name="copy_code" id="0x7F120609" />
-    <public type="string" name="copy_command" id="0x7F12060A" />
-    <public type="string" name="copy_id" id="0x7F12060B" />
-    <public type="string" name="copy_image_menu_item" id="0x7F12060C" />
-    <public type="string" name="copy_link" id="0x7F12060D" />
-    <public type="string" name="copy_media_link" id="0x7F12060E" />
-    <public type="string" name="copy_message_link" id="0x7F12060F" />
-    <public type="string" name="copy_owner_id" id="0x7F120610" />
-    <public type="string" name="copy_text" id="0x7F120611" />
-    <public type="string" name="copy_toast_msg" id="0x7F120612" />
-    <public type="string" name="copy_username" id="0x7F120613" />
-    <public type="string" name="countdown_units_days" id="0x7F120614" />
-    <public type="string" name="countdown_units_hours" id="0x7F120615" />
-    <public type="string" name="countdown_units_minutes" id="0x7F120616" />
-    <public type="string" name="countdown_units_seconds" id="0x7F120617" />
-    <public type="string" name="country_code" id="0x7F120618" />
-    <public type="string" name="country_codes" id="0x7F120619" />
-    <public type="string" name="country_name_ac" id="0x7F12061A" />
-    <public type="string" name="country_name_ad" id="0x7F12061B" />
-    <public type="string" name="country_name_ae" id="0x7F12061C" />
-    <public type="string" name="country_name_af" id="0x7F12061D" />
-    <public type="string" name="country_name_ag" id="0x7F12061E" />
-    <public type="string" name="country_name_ai" id="0x7F12061F" />
-    <public type="string" name="country_name_al" id="0x7F120620" />
-    <public type="string" name="country_name_am" id="0x7F120621" />
-    <public type="string" name="country_name_an" id="0x7F120622" />
-    <public type="string" name="country_name_ao" id="0x7F120623" />
-    <public type="string" name="country_name_ar" id="0x7F120624" />
-    <public type="string" name="country_name_as" id="0x7F120625" />
-    <public type="string" name="country_name_at" id="0x7F120626" />
-    <public type="string" name="country_name_au" id="0x7F120627" />
-    <public type="string" name="country_name_aw" id="0x7F120628" />
-    <public type="string" name="country_name_az" id="0x7F120629" />
-    <public type="string" name="country_name_ba" id="0x7F12062A" />
-    <public type="string" name="country_name_bb" id="0x7F12062B" />
-    <public type="string" name="country_name_bd" id="0x7F12062C" />
-    <public type="string" name="country_name_be" id="0x7F12062D" />
-    <public type="string" name="country_name_bf" id="0x7F12062E" />
-    <public type="string" name="country_name_bg" id="0x7F12062F" />
-    <public type="string" name="country_name_bh" id="0x7F120630" />
-    <public type="string" name="country_name_bi" id="0x7F120631" />
-    <public type="string" name="country_name_bj" id="0x7F120632" />
-    <public type="string" name="country_name_bm" id="0x7F120633" />
-    <public type="string" name="country_name_bn" id="0x7F120634" />
-    <public type="string" name="country_name_bo" id="0x7F120635" />
-    <public type="string" name="country_name_br" id="0x7F120636" />
-    <public type="string" name="country_name_bs" id="0x7F120637" />
-    <public type="string" name="country_name_bt" id="0x7F120638" />
-    <public type="string" name="country_name_bw" id="0x7F120639" />
-    <public type="string" name="country_name_by" id="0x7F12063A" />
-    <public type="string" name="country_name_bz" id="0x7F12063B" />
-    <public type="string" name="country_name_ca" id="0x7F12063C" />
-    <public type="string" name="country_name_cc" id="0x7F12063D" />
-    <public type="string" name="country_name_cd" id="0x7F12063E" />
-    <public type="string" name="country_name_cf" id="0x7F12063F" />
-    <public type="string" name="country_name_cg" id="0x7F120640" />
-    <public type="string" name="country_name_ch" id="0x7F120641" />
-    <public type="string" name="country_name_ci" id="0x7F120642" />
-    <public type="string" name="country_name_ck" id="0x7F120643" />
-    <public type="string" name="country_name_cl" id="0x7F120644" />
-    <public type="string" name="country_name_cm" id="0x7F120645" />
-    <public type="string" name="country_name_cn" id="0x7F120646" />
-    <public type="string" name="country_name_co" id="0x7F120647" />
-    <public type="string" name="country_name_cr" id="0x7F120648" />
-    <public type="string" name="country_name_cu" id="0x7F120649" />
-    <public type="string" name="country_name_cv" id="0x7F12064A" />
-    <public type="string" name="country_name_cw" id="0x7F12064B" />
-    <public type="string" name="country_name_cx" id="0x7F12064C" />
-    <public type="string" name="country_name_cy" id="0x7F12064D" />
-    <public type="string" name="country_name_cz" id="0x7F12064E" />
-    <public type="string" name="country_name_de" id="0x7F12064F" />
-    <public type="string" name="country_name_dg" id="0x7F120650" />
-    <public type="string" name="country_name_dj" id="0x7F120651" />
-    <public type="string" name="country_name_dk" id="0x7F120652" />
-    <public type="string" name="country_name_dm" id="0x7F120653" />
-    <public type="string" name="country_name_do" id="0x7F120654" />
-    <public type="string" name="country_name_dz" id="0x7F120655" />
-    <public type="string" name="country_name_ec" id="0x7F120656" />
-    <public type="string" name="country_name_ee" id="0x7F120657" />
-    <public type="string" name="country_name_eg" id="0x7F120658" />
-    <public type="string" name="country_name_er" id="0x7F120659" />
-    <public type="string" name="country_name_es" id="0x7F12065A" />
-    <public type="string" name="country_name_et" id="0x7F12065B" />
-    <public type="string" name="country_name_fi" id="0x7F12065C" />
-    <public type="string" name="country_name_fj" id="0x7F12065D" />
-    <public type="string" name="country_name_fk" id="0x7F12065E" />
-    <public type="string" name="country_name_fm" id="0x7F12065F" />
-    <public type="string" name="country_name_fo" id="0x7F120660" />
-    <public type="string" name="country_name_fr" id="0x7F120661" />
-    <public type="string" name="country_name_ga" id="0x7F120662" />
-    <public type="string" name="country_name_gb" id="0x7F120663" />
-    <public type="string" name="country_name_gd" id="0x7F120664" />
-    <public type="string" name="country_name_ge" id="0x7F120665" />
-    <public type="string" name="country_name_gf" id="0x7F120666" />
-    <public type="string" name="country_name_gh" id="0x7F120667" />
-    <public type="string" name="country_name_gi" id="0x7F120668" />
-    <public type="string" name="country_name_gl" id="0x7F120669" />
-    <public type="string" name="country_name_gm" id="0x7F12066A" />
-    <public type="string" name="country_name_gn" id="0x7F12066B" />
-    <public type="string" name="country_name_gp" id="0x7F12066C" />
-    <public type="string" name="country_name_gq" id="0x7F12066D" />
-    <public type="string" name="country_name_gr" id="0x7F12066E" />
-    <public type="string" name="country_name_gs" id="0x7F12066F" />
-    <public type="string" name="country_name_gt" id="0x7F120670" />
-    <public type="string" name="country_name_gu" id="0x7F120671" />
-    <public type="string" name="country_name_gw" id="0x7F120672" />
-    <public type="string" name="country_name_gy" id="0x7F120673" />
-    <public type="string" name="country_name_hk" id="0x7F120674" />
-    <public type="string" name="country_name_hn" id="0x7F120675" />
-    <public type="string" name="country_name_hr" id="0x7F120676" />
-    <public type="string" name="country_name_ht" id="0x7F120677" />
-    <public type="string" name="country_name_hu" id="0x7F120678" />
-    <public type="string" name="country_name_id" id="0x7F120679" />
-    <public type="string" name="country_name_ie" id="0x7F12067A" />
-    <public type="string" name="country_name_il" id="0x7F12067B" />
-    <public type="string" name="country_name_in" id="0x7F12067C" />
-    <public type="string" name="country_name_io" id="0x7F12067D" />
-    <public type="string" name="country_name_iq" id="0x7F12067E" />
-    <public type="string" name="country_name_ir" id="0x7F12067F" />
-    <public type="string" name="country_name_is" id="0x7F120680" />
-    <public type="string" name="country_name_it" id="0x7F120681" />
-    <public type="string" name="country_name_jm" id="0x7F120682" />
-    <public type="string" name="country_name_jo" id="0x7F120683" />
-    <public type="string" name="country_name_jp" id="0x7F120684" />
-    <public type="string" name="country_name_ke" id="0x7F120685" />
-    <public type="string" name="country_name_kg" id="0x7F120686" />
-    <public type="string" name="country_name_kh" id="0x7F120687" />
-    <public type="string" name="country_name_ki" id="0x7F120688" />
-    <public type="string" name="country_name_km" id="0x7F120689" />
-    <public type="string" name="country_name_kn" id="0x7F12068A" />
-    <public type="string" name="country_name_kp" id="0x7F12068B" />
-    <public type="string" name="country_name_kr" id="0x7F12068C" />
-    <public type="string" name="country_name_kw" id="0x7F12068D" />
-    <public type="string" name="country_name_ky" id="0x7F12068E" />
-    <public type="string" name="country_name_kz" id="0x7F12068F" />
-    <public type="string" name="country_name_la" id="0x7F120690" />
-    <public type="string" name="country_name_lb" id="0x7F120691" />
-    <public type="string" name="country_name_li" id="0x7F120692" />
-    <public type="string" name="country_name_lk" id="0x7F120693" />
-    <public type="string" name="country_name_lr" id="0x7F120694" />
-    <public type="string" name="country_name_ls" id="0x7F120695" />
-    <public type="string" name="country_name_lt" id="0x7F120696" />
-    <public type="string" name="country_name_lu" id="0x7F120697" />
-    <public type="string" name="country_name_lv" id="0x7F120698" />
-    <public type="string" name="country_name_ly" id="0x7F120699" />
-    <public type="string" name="country_name_ma" id="0x7F12069A" />
-    <public type="string" name="country_name_mc" id="0x7F12069B" />
-    <public type="string" name="country_name_md" id="0x7F12069C" />
-    <public type="string" name="country_name_me" id="0x7F12069D" />
-    <public type="string" name="country_name_mg" id="0x7F12069E" />
-    <public type="string" name="country_name_mh" id="0x7F12069F" />
-    <public type="string" name="country_name_mi" id="0x7F1206A0" />
-    <public type="string" name="country_name_mk" id="0x7F1206A1" />
-    <public type="string" name="country_name_ml" id="0x7F1206A2" />
-    <public type="string" name="country_name_mm" id="0x7F1206A3" />
-    <public type="string" name="country_name_mn" id="0x7F1206A4" />
-    <public type="string" name="country_name_mo" id="0x7F1206A5" />
-    <public type="string" name="country_name_mp" id="0x7F1206A6" />
-    <public type="string" name="country_name_mq" id="0x7F1206A7" />
-    <public type="string" name="country_name_mr" id="0x7F1206A8" />
-    <public type="string" name="country_name_ms" id="0x7F1206A9" />
-    <public type="string" name="country_name_mt" id="0x7F1206AA" />
-    <public type="string" name="country_name_mu" id="0x7F1206AB" />
-    <public type="string" name="country_name_mv" id="0x7F1206AC" />
-    <public type="string" name="country_name_mw" id="0x7F1206AD" />
-    <public type="string" name="country_name_mx" id="0x7F1206AE" />
-    <public type="string" name="country_name_my" id="0x7F1206AF" />
-    <public type="string" name="country_name_mz" id="0x7F1206B0" />
-    <public type="string" name="country_name_na" id="0x7F1206B1" />
-    <public type="string" name="country_name_nc" id="0x7F1206B2" />
-    <public type="string" name="country_name_ne" id="0x7F1206B3" />
-    <public type="string" name="country_name_nf" id="0x7F1206B4" />
-    <public type="string" name="country_name_ng" id="0x7F1206B5" />
-    <public type="string" name="country_name_ni" id="0x7F1206B6" />
-    <public type="string" name="country_name_nl" id="0x7F1206B7" />
-    <public type="string" name="country_name_no" id="0x7F1206B8" />
-    <public type="string" name="country_name_np" id="0x7F1206B9" />
-    <public type="string" name="country_name_nr" id="0x7F1206BA" />
-    <public type="string" name="country_name_nu" id="0x7F1206BB" />
-    <public type="string" name="country_name_nz" id="0x7F1206BC" />
-    <public type="string" name="country_name_om" id="0x7F1206BD" />
-    <public type="string" name="country_name_pa" id="0x7F1206BE" />
-    <public type="string" name="country_name_pe" id="0x7F1206BF" />
-    <public type="string" name="country_name_pf" id="0x7F1206C0" />
-    <public type="string" name="country_name_pg" id="0x7F1206C1" />
-    <public type="string" name="country_name_ph" id="0x7F1206C2" />
-    <public type="string" name="country_name_pk" id="0x7F1206C3" />
-    <public type="string" name="country_name_pl" id="0x7F1206C4" />
-    <public type="string" name="country_name_pm" id="0x7F1206C5" />
-    <public type="string" name="country_name_pr" id="0x7F1206C6" />
-    <public type="string" name="country_name_ps" id="0x7F1206C7" />
-    <public type="string" name="country_name_pt" id="0x7F1206C8" />
-    <public type="string" name="country_name_pw" id="0x7F1206C9" />
-    <public type="string" name="country_name_py" id="0x7F1206CA" />
-    <public type="string" name="country_name_qa" id="0x7F1206CB" />
-    <public type="string" name="country_name_re" id="0x7F1206CC" />
-    <public type="string" name="country_name_ro" id="0x7F1206CD" />
-    <public type="string" name="country_name_rs" id="0x7F1206CE" />
-    <public type="string" name="country_name_ru" id="0x7F1206CF" />
-    <public type="string" name="country_name_rw" id="0x7F1206D0" />
-    <public type="string" name="country_name_sa" id="0x7F1206D1" />
-    <public type="string" name="country_name_sb" id="0x7F1206D2" />
-    <public type="string" name="country_name_sc" id="0x7F1206D3" />
-    <public type="string" name="country_name_sd" id="0x7F1206D4" />
-    <public type="string" name="country_name_se" id="0x7F1206D5" />
-    <public type="string" name="country_name_sg" id="0x7F1206D6" />
-    <public type="string" name="country_name_si" id="0x7F1206D7" />
-    <public type="string" name="country_name_sk" id="0x7F1206D8" />
-    <public type="string" name="country_name_sl" id="0x7F1206D9" />
-    <public type="string" name="country_name_sm" id="0x7F1206DA" />
-    <public type="string" name="country_name_sn" id="0x7F1206DB" />
-    <public type="string" name="country_name_so" id="0x7F1206DC" />
-    <public type="string" name="country_name_sr" id="0x7F1206DD" />
-    <public type="string" name="country_name_sv" id="0x7F1206DE" />
-    <public type="string" name="country_name_sx" id="0x7F1206DF" />
-    <public type="string" name="country_name_sy" id="0x7F1206E0" />
-    <public type="string" name="country_name_sz" id="0x7F1206E1" />
-    <public type="string" name="country_name_tc" id="0x7F1206E2" />
-    <public type="string" name="country_name_td" id="0x7F1206E3" />
-    <public type="string" name="country_name_tg" id="0x7F1206E4" />
-    <public type="string" name="country_name_th" id="0x7F1206E5" />
-    <public type="string" name="country_name_tj" id="0x7F1206E6" />
-    <public type="string" name="country_name_tk" id="0x7F1206E7" />
-    <public type="string" name="country_name_tl" id="0x7F1206E8" />
-    <public type="string" name="country_name_tm" id="0x7F1206E9" />
-    <public type="string" name="country_name_tn" id="0x7F1206EA" />
-    <public type="string" name="country_name_to" id="0x7F1206EB" />
-    <public type="string" name="country_name_tp" id="0x7F1206EC" />
-    <public type="string" name="country_name_tr" id="0x7F1206ED" />
-    <public type="string" name="country_name_tt" id="0x7F1206EE" />
-    <public type="string" name="country_name_tv" id="0x7F1206EF" />
-    <public type="string" name="country_name_tw" id="0x7F1206F0" />
-    <public type="string" name="country_name_tz" id="0x7F1206F1" />
-    <public type="string" name="country_name_ua" id="0x7F1206F2" />
-    <public type="string" name="country_name_ug" id="0x7F1206F3" />
-    <public type="string" name="country_name_us" id="0x7F1206F4" />
-    <public type="string" name="country_name_uy" id="0x7F1206F5" />
-    <public type="string" name="country_name_uz" id="0x7F1206F6" />
-    <public type="string" name="country_name_ve" id="0x7F1206F7" />
-    <public type="string" name="country_name_vg" id="0x7F1206F8" />
-    <public type="string" name="country_name_vi" id="0x7F1206F9" />
-    <public type="string" name="country_name_vn" id="0x7F1206FA" />
-    <public type="string" name="country_name_vu" id="0x7F1206FB" />
-    <public type="string" name="country_name_wf" id="0x7F1206FC" />
-    <public type="string" name="country_name_wk" id="0x7F1206FD" />
-    <public type="string" name="country_name_ws" id="0x7F1206FE" />
-    <public type="string" name="country_name_xk" id="0x7F1206FF" />
-    <public type="string" name="country_name_ye" id="0x7F120700" />
-    <public type="string" name="country_name_yt" id="0x7F120701" />
-    <public type="string" name="country_name_za" id="0x7F120702" />
-    <public type="string" name="country_name_zm" id="0x7F120703" />
-    <public type="string" name="country_name_zw" id="0x7F120704" />
-    <public type="string" name="country_no_results" id="0x7F120705" />
-    <public type="string" name="covid_new_user_survey_button" id="0x7F120706" />
-    <public type="string" name="covid_new_user_survey_prompt" id="0x7F120707" />
-    <public type="string" name="cozy_mode" id="0x7F120708" />
-    <public type="string" name="cpv_custom" id="0x7F120709" />
-    <public type="string" name="cpv_default_title" id="0x7F12070A" />
-    <public type="string" name="cpv_presets" id="0x7F12070B" />
-    <public type="string" name="cpv_select" id="0x7F12070C" />
-    <public type="string" name="cpv_transparency" id="0x7F12070D" />
-    <public type="string" name="crash_app_version" id="0x7F12070E" />
-    <public type="string" name="crash_details" id="0x7F12070F" />
-    <public type="string" name="crash_device" id="0x7F120710" />
-    <public type="string" name="crash_device_version" id="0x7F120711" />
-    <public type="string" name="crash_disclaimer" id="0x7F120712" />
-    <public type="string" name="crash_source" id="0x7F120713" />
-    <public type="string" name="crash_testers_invite" id="0x7F120714" />
-    <public type="string" name="crash_timestamp" id="0x7F120715" />
-    <public type="string" name="crash_unexpected" id="0x7F120716" />
-    <public type="string" name="create" id="0x7F120717" />
-    <public type="string" name="create_category" id="0x7F120718" />
-    <public type="string" name="create_channel" id="0x7F120719" />
-    <public type="string" name="create_channel_error" id="0x7F12071A" />
-    <public type="string" name="create_channel_in_category" id="0x7F12071B" />
-    <public type="string" name="create_dm" id="0x7F12071C" />
-    <public type="string" name="create_event_add_end_time_label" id="0x7F12071D" />
-    <public type="string" name="create_event_end_date_label" id="0x7F12071E" />
-    <public type="string" name="create_event_end_time_label" id="0x7F12071F" />
-    <public type="string" name="create_event_remove_end_time_label" id="0x7F120720" />
-    <public type="string" name="create_event_section_label" id="0x7F120721" />
-    <public type="string" name="create_event_start_date_label" id="0x7F120722" />
-    <public type="string" name="create_event_start_time_label" id="0x7F120723" />
-    <public type="string" name="create_event_submit_label" id="0x7F120724" />
-    <public type="string" name="create_event_ticket_scene_title" id="0x7F120725" />
-    <public type="string" name="create_group_dm" id="0x7F120726" />
-    <public type="string" name="create_guild_description" id="0x7F120727" />
-    <public type="string" name="create_guild_with_templates_title" id="0x7F120728" />
-    <public type="string" name="create_instant_invite" id="0x7F120729" />
-    <public type="string" name="create_link" id="0x7F12072A" />
-    <public type="string" name="create_news_channel" id="0x7F12072B" />
-    <public type="string" name="create_news_channel_description" id="0x7F12072C" />
-    <public type="string" name="create_or_join_modal_header" id="0x7F12072D" />
-    <public type="string" name="create_private_text_channel" id="0x7F12072E" />
-    <public type="string" name="create_private_voice_channel" id="0x7F12072F" />
-    <public type="string" name="create_server_button_action" id="0x7F120730" />
-    <public type="string" name="create_server_button_body" id="0x7F120731" />
-    <public type="string" name="create_server_button_cta" id="0x7F120732" />
-    <public type="string" name="create_server_button_cta_mobile" id="0x7F120733" />
-    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7F120734" />
-    <public type="string" name="create_server_default_server_name_format" id="0x7F120735" />
-    <public type="string" name="create_server_description_mobile" id="0x7F120736" />
-    <public type="string" name="create_server_description_mobile_refresh" id="0x7F120737" />
-    <public type="string" name="create_server_description_refresh" id="0x7F120738" />
-    <public type="string" name="create_server_guidelines" id="0x7F120739" />
-    <public type="string" name="create_server_title" id="0x7F12073A" />
-    <public type="string" name="create_server_title_mobile_refresh" id="0x7F12073B" />
-    <public type="string" name="create_stage_channel" id="0x7F12073C" />
-    <public type="string" name="create_stage_channel_description" id="0x7F12073D" />
-    <public type="string" name="create_stage_event_modal_title" id="0x7F12073E" />
-    <public type="string" name="create_stage_instance_add_speaker" id="0x7F12073F" />
-    <public type="string" name="create_stage_instance_add_speaker_label" id="0x7F120740" />
-    <public type="string" name="create_stage_instance_description_input_label" id="0x7F120741" />
-    <public type="string" name="create_stage_instance_description_input_placeholder" id="0x7F120742" />
-    <public type="string" name="create_stage_instance_go_live_label" id="0x7F120743" />
-    <public type="string" name="create_stage_instance_require_ticket_label" id="0x7F120744" />
-    <public type="string" name="create_stage_instance_select_guild_header" id="0x7F120745" />
-    <public type="string" name="create_stage_instance_select_guild_subheader" id="0x7F120746" />
-    <public type="string" name="create_stage_instance_select_privacy_header" id="0x7F120747" />
-    <public type="string" name="create_stage_instance_select_privacy_subheader" id="0x7F120748" />
-    <public type="string" name="create_stage_instance_speakers_label" id="0x7F120749" />
-    <public type="string" name="create_stage_instance_ticket_required_label" id="0x7F12074A" />
-    <public type="string" name="create_stage_instance_ticket_required_sublabel" id="0x7F12074B" />
-    <public type="string" name="create_stage_instance_title_input_label" id="0x7F12074C" />
-    <public type="string" name="create_stage_instance_title_input_placeholder" id="0x7F12074D" />
-    <public type="string" name="create_store_channel" id="0x7F12074E" />
-    <public type="string" name="create_store_channel_application" id="0x7F12074F" />
-    <public type="string" name="create_store_channel_beta_note" id="0x7F120750" />
-    <public type="string" name="create_store_channel_beta_title" id="0x7F120751" />
-    <public type="string" name="create_store_channel_branch" id="0x7F120752" />
-    <public type="string" name="create_store_channel_description" id="0x7F120753" />
-    <public type="string" name="create_store_channel_no_skus" id="0x7F120754" />
-    <public type="string" name="create_store_channel_no_skus_error" id="0x7F120755" />
-    <public type="string" name="create_store_channel_select_application" id="0x7F120756" />
-    <public type="string" name="create_store_channel_select_branch" id="0x7F120757" />
-    <public type="string" name="create_store_channel_select_sku" id="0x7F120758" />
-    <public type="string" name="create_store_channel_sku" id="0x7F120759" />
-    <public type="string" name="create_text_channel" id="0x7F12075A" />
-    <public type="string" name="create_text_channel_description" id="0x7F12075B" />
-    <public type="string" name="create_thread" id="0x7F12075C" />
-    <public type="string" name="create_thread_header_1" id="0x7F12075D" />
-    <public type="string" name="create_thread_header_2" id="0x7F12075E" />
-    <public type="string" name="create_voice_channel" id="0x7F12075F" />
-    <public type="string" name="create_voice_channel_description" id="0x7F120760" />
-    <public type="string" name="creation_intent_checkbox_label" id="0x7F120761" />
-    <public type="string" name="creation_intent_description" id="0x7F120762" />
-    <public type="string" name="creation_intent_option_community" id="0x7F120763" />
-    <public type="string" name="creation_intent_option_friends" id="0x7F120764" />
-    <public type="string" name="creation_intent_skip" id="0x7F120765" />
-    <public type="string" name="creation_intent_title" id="0x7F120766" />
-    <public type="string" name="creator_journey_survey" id="0x7F120767" />
-    <public type="string" name="credit_card_cvc" id="0x7F120768" />
-    <public type="string" name="credit_card_error_expiration" id="0x7F120769" />
-    <public type="string" name="credit_card_error_number" id="0x7F12076A" />
-    <public type="string" name="credit_card_error_required" id="0x7F12076B" />
-    <public type="string" name="credit_card_error_security_code" id="0x7F12076C" />
-    <public type="string" name="credit_card_expiration_date" id="0x7F12076D" />
-    <public type="string" name="credit_card_name" id="0x7F12076E" />
-    <public type="string" name="credit_card_name_on_card" id="0x7F12076F" />
-    <public type="string" name="credit_card_number" id="0x7F120770" />
-    <public type="string" name="credit_card_security_code" id="0x7F120771" />
-    <public type="string" name="crop" id="0x7F120772" />
-    <public type="string" name="cs" id="0x7F120773" />
-    <public type="string" name="custom_color" id="0x7F120774" />
-    <public type="string" name="custom_status" id="0x7F120775" />
-    <public type="string" name="custom_status_clear_after" id="0x7F120776" />
-    <public type="string" name="custom_status_clear_custom_status" id="0x7F120777" />
-    <public type="string" name="custom_status_clear_in_hours" id="0x7F120778" />
-    <public type="string" name="custom_status_clear_in_minutes" id="0x7F120779" />
-    <public type="string" name="custom_status_clear_tomorrow" id="0x7F12077A" />
-    <public type="string" name="custom_status_dont_clear" id="0x7F12077B" />
-    <public type="string" name="custom_status_edit_custom_status_placeholder" id="0x7F12077C" />
-    <public type="string" name="custom_status_hours" id="0x7F12077D" />
-    <public type="string" name="custom_status_minutes" id="0x7F12077E" />
-    <public type="string" name="custom_status_modal_body" id="0x7F12077F" />
-    <public type="string" name="custom_status_modal_placeholder" id="0x7F120780" />
-    <public type="string" name="custom_status_set_custom_status" id="0x7F120781" />
-    <public type="string" name="custom_status_status_title" id="0x7F120782" />
-    <public type="string" name="custom_status_today" id="0x7F120783" />
-    <public type="string" name="custom_status_update_success" id="0x7F120784" />
-    <public type="string" name="custom_tabs_mobile_body" id="0x7F120785" />
-    <public type="string" name="custom_tabs_mobile_header" id="0x7F120786" />
-    <public type="string" name="customize_group" id="0x7F120787" />
-    <public type="string" name="cut" id="0x7F120788" />
-    <public type="string" name="da" id="0x7F120789" />
-    <public type="string" name="dark_blue" id="0x7F12078A" />
-    <public type="string" name="dark_grey" id="0x7F12078B" />
-    <public type="string" name="dark_purple" id="0x7F12078C" />
-    <public type="string" name="dark_teal" id="0x7F12078D" />
-    <public type="string" name="data_download_requested_status_note" id="0x7F12078E" />
-    <public type="string" name="data_privacy_controls" id="0x7F12078F" />
-    <public type="string" name="data_privacy_controls_allow_accessibility_detection_note" id="0x7F120790" />
-    <public type="string" name="data_privacy_controls_allow_accessibility_detection_title" id="0x7F120791" />
-    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7F120792" />
-    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7F120793" />
-    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7F120794" />
-    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7F120795" />
-    <public type="string" name="data_privacy_controls_personalization_title" id="0x7F120796" />
-    <public type="string" name="data_privacy_controls_request_data_download" id="0x7F120797" />
-    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7F120798" />
-    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7F120799" />
-    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7F12079A" />
-    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7F12079B" />
-    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7F12079C" />
-    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7F12079D" />
-    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7F12079E" />
-    <public type="string" name="data_privacy_controls_request_data_note" id="0x7F12079F" />
-    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7F1207A0" />
-    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7F1207A1" />
-    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7F1207A2" />
-    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7F1207A3" />
-    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7F1207A4" />
-    <public type="string" name="data_privacy_rate_limit_title" id="0x7F1207A5" />
-    <public type="string" name="data_privacy_update_consents_failed" id="0x7F1207A6" />
-    <public type="string" name="date" id="0x7F1207A7" />
-    <public type="string" name="de" id="0x7F1207A8" />
-    <public type="string" name="deafen" id="0x7F1207A9" />
-    <public type="string" name="deafen_members" id="0x7F1207AA" />
-    <public type="string" name="deauthorize" id="0x7F1207AB" />
-    <public type="string" name="deauthorize_app" id="0x7F1207AC" />
-    <public type="string" name="deb" id="0x7F1207AD" />
-    <public type="string" name="debug" id="0x7F1207AE" />
-    <public type="string" name="decline" id="0x7F1207AF" />
-    <public type="string" name="default_app_description" id="0x7F1207B0" />
-    <public type="string" name="default_failure_to_perform_action_message" id="0x7F1207B1" />
-    <public type="string" name="default_input_placeholder" id="0x7F1207B2" />
-    <public type="string" name="default_web_client_id" id="0x7F1207B3" />
-    <public type="string" name="delete" id="0x7F1207B4" />
-    <public type="string" name="delete_account" id="0x7F1207B5" />
-    <public type="string" name="delete_account_body" id="0x7F1207B6" />
-    <public type="string" name="delete_account_error" id="0x7F1207B7" />
-    <public type="string" name="delete_account_transfer_ownership" id="0x7F1207B8" />
-    <public type="string" name="delete_account_transfer_ownership_body" id="0x7F1207B9" />
-    <public type="string" name="delete_app_confirm_msg" id="0x7F1207BA" />
-    <public type="string" name="delete_category" id="0x7F1207BB" />
-    <public type="string" name="delete_channel" id="0x7F1207BC" />
-    <public type="string" name="delete_channel_body" id="0x7F1207BD" />
-    <public type="string" name="delete_followed_news_body" id="0x7F1207BE" />
-    <public type="string" name="delete_message" id="0x7F1207BF" />
-    <public type="string" name="delete_message_body" id="0x7F1207C0" />
-    <public type="string" name="delete_message_context_menu_hint" id="0x7F1207C1" />
-    <public type="string" name="delete_message_history_option_24hr" id="0x7F1207C2" />
-    <public type="string" name="delete_message_history_option_7d" id="0x7F1207C3" />
-    <public type="string" name="delete_message_history_option_none" id="0x7F1207C4" />
-    <public type="string" name="delete_message_report" id="0x7F1207C5" />
-    <public type="string" name="delete_message_title" id="0x7F1207C6" />
-    <public type="string" name="delete_role" id="0x7F1207C7" />
-    <public type="string" name="delete_role_mobile" id="0x7F1207C8" />
-    <public type="string" name="delete_rules_channel_body" id="0x7F1207C9" />
-    <public type="string" name="delete_server" id="0x7F1207CA" />
-    <public type="string" name="delete_server_body" id="0x7F1207CB" />
-    <public type="string" name="delete_server_enter_name" id="0x7F1207CC" />
-    <public type="string" name="delete_server_incorrect_name" id="0x7F1207CD" />
-    <public type="string" name="delete_server_title" id="0x7F1207CE" />
-    <public type="string" name="delete_stage_event_confirmation_description" id="0x7F1207CF" />
-    <public type="string" name="delete_stage_event_label" id="0x7F1207D0" />
-    <public type="string" name="delete_thread" id="0x7F1207D1" />
-    <public type="string" name="delete_updates_channel_body" id="0x7F1207D2" />
-    <public type="string" name="description" id="0x7F1207D3" />
-    <public type="string" name="designate_other_channel" id="0x7F1207D4" />
-    <public type="string" name="desktop_app" id="0x7F1207D5" />
-    <public type="string" name="desktop_download_description" id="0x7F1207D6" />
-    <public type="string" name="desktop_download_title_linux" id="0x7F1207D7" />
-    <public type="string" name="desktop_download_title_mac" id="0x7F1207D8" />
-    <public type="string" name="desktop_download_title_windows" id="0x7F1207D9" />
-    <public type="string" name="desktop_notifications_enable" id="0x7F1207DA" />
-    <public type="string" name="desktop_notifications_enable_body" id="0x7F1207DB" />
-    <public type="string" name="detect_platform_accounts" id="0x7F1207DC" />
-    <public type="string" name="developer_application_test_mode" id="0x7F1207DD" />
-    <public type="string" name="developer_application_test_mode_activate" id="0x7F1207DE" />
-    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7F1207DF" />
-    <public type="string" name="developer_application_test_mode_clear" id="0x7F1207E0" />
-    <public type="string" name="developer_application_test_mode_invalid" id="0x7F1207E1" />
-    <public type="string" name="developer_application_test_mode_localhost_option" id="0x7F1207E2" />
-    <public type="string" name="developer_application_test_mode_modal_body" id="0x7F1207E3" />
-    <public type="string" name="developer_application_test_mode_modal_header" id="0x7F1207E4" />
-    <public type="string" name="developer_application_test_mode_note" id="0x7F1207E5" />
-    <public type="string" name="developer_application_test_mode_origin_label" id="0x7F1207E6" />
-    <public type="string" name="developer_application_test_mode_placeholder" id="0x7F1207E7" />
-    <public type="string" name="developer_application_test_mode_port_number_label" id="0x7F1207E8" />
-    <public type="string" name="developer_application_test_mode_proxy_option" id="0x7F1207E9" />
-    <public type="string" name="developer_mode" id="0x7F1207EA" />
-    <public type="string" name="developer_mode_help_text" id="0x7F1207EB" />
-    <public type="string" name="developer_options" id="0x7F1207EC" />
-    <public type="string" name="developer_settings_bug_reporting_description" id="0x7F1207ED" />
-    <public type="string" name="developer_settings_bug_reporting_title" id="0x7F1207EE" />
-    <public type="string" name="device_settings" id="0x7F1207EF" />
-    <public type="string" name="dialog_just_so_you_know" id="0x7F1207F0" />
-    <public type="string" name="direct_message" id="0x7F1207F1" />
-    <public type="string" name="direct_message_a11y_label" id="0x7F1207F2" />
-    <public type="string" name="direct_message_a11y_label_with_unreads" id="0x7F1207F3" />
-    <public type="string" name="direct_messages" id="0x7F1207F4" />
-    <public type="string" name="direct_messages_pending_friends" id="0x7F1207F5" />
-    <public type="string" name="directory_entry_menu_label" id="0x7F1207F6" />
-    <public type="string" name="directory_search_no_results_subtitle" id="0x7F1207F7" />
-    <public type="string" name="directory_search_no_results_title" id="0x7F1207F8" />
-    <public type="string" name="directory_search_placeholder" id="0x7F1207F9" />
-    <public type="string" name="directory_search_results_header" id="0x7F1207FA" />
-    <public type="string" name="disable" id="0x7F1207FB" />
-    <public type="string" name="disable_account" id="0x7F1207FC" />
-    <public type="string" name="disable_account_body" id="0x7F1207FD" />
-    <public type="string" name="disable_email_notifications" id="0x7F1207FE" />
-    <public type="string" name="disable_integration_title" id="0x7F1207FF" />
-    <public type="string" name="disable_integration_twitch_body" id="0x7F120800" />
-    <public type="string" name="disable_integration_youtube_body" id="0x7F120801" />
-    <public type="string" name="disable_noise_cancellation" id="0x7F120802" />
-    <public type="string" name="disable_notifications_description" id="0x7F120803" />
-    <public type="string" name="disable_notifications_label" id="0x7F120804" />
-    <public type="string" name="disable_sounds_description" id="0x7F120805" />
-    <public type="string" name="disable_sounds_label" id="0x7F120806" />
-    <public type="string" name="disable_video" id="0x7F120807" />
-    <public type="string" name="disapproval" id="0x7F120808" />
-    <public type="string" name="discard_changes" id="0x7F120809" />
-    <public type="string" name="discard_changes_description" id="0x7F12080A" />
-    <public type="string" name="discodo_disabled" id="0x7F12080B" />
-    <public type="string" name="discodo_enabled" id="0x7F12080C" />
-    <public type="string" name="disconnect_account" id="0x7F12080D" />
-    <public type="string" name="disconnect_account_body" id="0x7F12080E" />
-    <public type="string" name="disconnect_account_title" id="0x7F12080F" />
-    <public type="string" name="disconnect_from_voice" id="0x7F120810" />
-    <public type="string" name="disconnect_other" id="0x7F120811" />
-    <public type="string" name="disconnect_self" id="0x7F120812" />
-    <public type="string" name="disconnect_user_success" id="0x7F120813" />
-    <public type="string" name="discord" id="0x7F120814" />
-    <public type="string" name="discord_desc_long" id="0x7F120815" />
-    <public type="string" name="discord_desc_short" id="0x7F120816" />
-    <public type="string" name="discord_gg" id="0x7F120817" />
-    <public type="string" name="discord_name" id="0x7F120818" />
-    <public type="string" name="discord_rich_presence" id="0x7F120819" />
-    <public type="string" name="discord_u_coming_soon_to_mobile" id="0x7F12081A" />
-    <public type="string" name="discover" id="0x7F12081B" />
-    <public type="string" name="discovery" id="0x7F12081C" />
-    <public type="string" name="discovery_speaker_count" id="0x7F12081D" />
-    <public type="string" name="dismiss" id="0x7F12081E" />
-    <public type="string" name="dispatch_error_modal_body" id="0x7F12081F" />
-    <public type="string" name="dispatch_error_modal_description" id="0x7F120820" />
-    <public type="string" name="dispatch_error_modal_error_label" id="0x7F120821" />
-    <public type="string" name="dispatch_error_modal_header" id="0x7F120822" />
-    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7F120823" />
-    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7F120824" />
-    <public type="string" name="display_activity" id="0x7F120825" />
-    <public type="string" name="display_on_profile" id="0x7F120826" />
-    <public type="string" name="display_option_always" id="0x7F120827" />
-    <public type="string" name="display_option_never" id="0x7F120828" />
-    <public type="string" name="display_option_only_while_speaking" id="0x7F120829" />
-    <public type="string" name="display_silence_warning" id="0x7F12082A" />
-    <public type="string" name="dm" id="0x7F12082B" />
-    <public type="string" name="dm_search_placeholder" id="0x7F12082C" />
-    <public type="string" name="dm_textarea_placeholder" id="0x7F12082D" />
-    <public type="string" name="dm_tooltip_a11y_label" id="0x7F12082E" />
-    <public type="string" name="dm_verification_text_blocked" id="0x7F12082F" />
-    <public type="string" name="done" id="0x7F120830" />
-    <public type="string" name="dont_show_again" id="0x7F120831" />
-    <public type="string" name="download" id="0x7F120832" />
-    <public type="string" name="download_app" id="0x7F120833" />
-    <public type="string" name="download_apps" id="0x7F120834" />
-    <public type="string" name="download_desktop_ptb_footer" id="0x7F120835" />
-    <public type="string" name="download_desktop_stable_footer" id="0x7F120836" />
-    <public type="string" name="download_desktop_title" id="0x7F120837" />
-    <public type="string" name="download_failed" id="0x7F120838" />
-    <public type="string" name="download_file_complete" id="0x7F120839" />
-    <public type="string" name="download_mobile_title" id="0x7F12083A" />
-    <public type="string" name="duration_days" id="0x7F12083B" />
-    <public type="string" name="duration_days_short" id="0x7F12083C" />
-    <public type="string" name="duration_hours" id="0x7F12083D" />
-    <public type="string" name="duration_hours_minutes_seconds" id="0x7F12083E" />
-    <public type="string" name="duration_hours_short" id="0x7F12083F" />
-    <public type="string" name="duration_mins" id="0x7F120840" />
-    <public type="string" name="duration_minutes" id="0x7F120841" />
-    <public type="string" name="duration_minutes_short" id="0x7F120842" />
-    <public type="string" name="duration_seconds" id="0x7F120843" />
-    <public type="string" name="duration_seconds_short" id="0x7F120844" />
-    <public type="string" name="early_supporter_tooltip" id="0x7F120845" />
-    <public type="string" name="echo_cancellation" id="0x7F120846" />
-    <public type="string" name="edit" id="0x7F120847" />
-    <public type="string" name="edit_category" id="0x7F120848" />
-    <public type="string" name="edit_channel" id="0x7F120849" />
-    <public type="string" name="edit_followed_news_body" id="0x7F12084A" />
-    <public type="string" name="edit_message" id="0x7F12084B" />
-    <public type="string" name="edit_note" id="0x7F12084C" />
-    <public type="string" name="edit_overview" id="0x7F12084D" />
+    <public type="string" name="continue_in_browser" id="0x7F1205FF" />
+    <public type="string" name="continue_to_webapp" id="0x7F120600" />
+    <public type="string" name="control_volume" id="0x7F120601" />
+    <public type="string" name="convert_emoticons" id="0x7F120602" />
+    <public type="string" name="convert_emoticons_help" id="0x7F120603" />
+    <public type="string" name="copied" id="0x7F120604" />
+    <public type="string" name="copied_text" id="0x7F120605" />
+    <public type="string" name="copy" id="0x7F120606" />
+    <public type="string" name="copy_channel_topic" id="0x7F120607" />
+    <public type="string" name="copy_code" id="0x7F120608" />
+    <public type="string" name="copy_command" id="0x7F120609" />
+    <public type="string" name="copy_id" id="0x7F12060A" />
+    <public type="string" name="copy_image_menu_item" id="0x7F12060B" />
+    <public type="string" name="copy_link" id="0x7F12060C" />
+    <public type="string" name="copy_media_link" id="0x7F12060D" />
+    <public type="string" name="copy_message_link" id="0x7F12060E" />
+    <public type="string" name="copy_owner_id" id="0x7F12060F" />
+    <public type="string" name="copy_text" id="0x7F120610" />
+    <public type="string" name="copy_toast_msg" id="0x7F120611" />
+    <public type="string" name="copy_username" id="0x7F120612" />
+    <public type="string" name="countdown_units_days" id="0x7F120613" />
+    <public type="string" name="countdown_units_hours" id="0x7F120614" />
+    <public type="string" name="countdown_units_minutes" id="0x7F120615" />
+    <public type="string" name="countdown_units_seconds" id="0x7F120616" />
+    <public type="string" name="country_code" id="0x7F120617" />
+    <public type="string" name="country_codes" id="0x7F120618" />
+    <public type="string" name="country_name_ac" id="0x7F120619" />
+    <public type="string" name="country_name_ad" id="0x7F12061A" />
+    <public type="string" name="country_name_ae" id="0x7F12061B" />
+    <public type="string" name="country_name_af" id="0x7F12061C" />
+    <public type="string" name="country_name_ag" id="0x7F12061D" />
+    <public type="string" name="country_name_ai" id="0x7F12061E" />
+    <public type="string" name="country_name_al" id="0x7F12061F" />
+    <public type="string" name="country_name_am" id="0x7F120620" />
+    <public type="string" name="country_name_an" id="0x7F120621" />
+    <public type="string" name="country_name_ao" id="0x7F120622" />
+    <public type="string" name="country_name_ar" id="0x7F120623" />
+    <public type="string" name="country_name_as" id="0x7F120624" />
+    <public type="string" name="country_name_at" id="0x7F120625" />
+    <public type="string" name="country_name_au" id="0x7F120626" />
+    <public type="string" name="country_name_aw" id="0x7F120627" />
+    <public type="string" name="country_name_az" id="0x7F120628" />
+    <public type="string" name="country_name_ba" id="0x7F120629" />
+    <public type="string" name="country_name_bb" id="0x7F12062A" />
+    <public type="string" name="country_name_bd" id="0x7F12062B" />
+    <public type="string" name="country_name_be" id="0x7F12062C" />
+    <public type="string" name="country_name_bf" id="0x7F12062D" />
+    <public type="string" name="country_name_bg" id="0x7F12062E" />
+    <public type="string" name="country_name_bh" id="0x7F12062F" />
+    <public type="string" name="country_name_bi" id="0x7F120630" />
+    <public type="string" name="country_name_bj" id="0x7F120631" />
+    <public type="string" name="country_name_bm" id="0x7F120632" />
+    <public type="string" name="country_name_bn" id="0x7F120633" />
+    <public type="string" name="country_name_bo" id="0x7F120634" />
+    <public type="string" name="country_name_br" id="0x7F120635" />
+    <public type="string" name="country_name_bs" id="0x7F120636" />
+    <public type="string" name="country_name_bt" id="0x7F120637" />
+    <public type="string" name="country_name_bw" id="0x7F120638" />
+    <public type="string" name="country_name_by" id="0x7F120639" />
+    <public type="string" name="country_name_bz" id="0x7F12063A" />
+    <public type="string" name="country_name_ca" id="0x7F12063B" />
+    <public type="string" name="country_name_cc" id="0x7F12063C" />
+    <public type="string" name="country_name_cd" id="0x7F12063D" />
+    <public type="string" name="country_name_cf" id="0x7F12063E" />
+    <public type="string" name="country_name_cg" id="0x7F12063F" />
+    <public type="string" name="country_name_ch" id="0x7F120640" />
+    <public type="string" name="country_name_ci" id="0x7F120641" />
+    <public type="string" name="country_name_ck" id="0x7F120642" />
+    <public type="string" name="country_name_cl" id="0x7F120643" />
+    <public type="string" name="country_name_cm" id="0x7F120644" />
+    <public type="string" name="country_name_cn" id="0x7F120645" />
+    <public type="string" name="country_name_co" id="0x7F120646" />
+    <public type="string" name="country_name_cr" id="0x7F120647" />
+    <public type="string" name="country_name_cu" id="0x7F120648" />
+    <public type="string" name="country_name_cv" id="0x7F120649" />
+    <public type="string" name="country_name_cw" id="0x7F12064A" />
+    <public type="string" name="country_name_cx" id="0x7F12064B" />
+    <public type="string" name="country_name_cy" id="0x7F12064C" />
+    <public type="string" name="country_name_cz" id="0x7F12064D" />
+    <public type="string" name="country_name_de" id="0x7F12064E" />
+    <public type="string" name="country_name_dg" id="0x7F12064F" />
+    <public type="string" name="country_name_dj" id="0x7F120650" />
+    <public type="string" name="country_name_dk" id="0x7F120651" />
+    <public type="string" name="country_name_dm" id="0x7F120652" />
+    <public type="string" name="country_name_do" id="0x7F120653" />
+    <public type="string" name="country_name_dz" id="0x7F120654" />
+    <public type="string" name="country_name_ec" id="0x7F120655" />
+    <public type="string" name="country_name_ee" id="0x7F120656" />
+    <public type="string" name="country_name_eg" id="0x7F120657" />
+    <public type="string" name="country_name_er" id="0x7F120658" />
+    <public type="string" name="country_name_es" id="0x7F120659" />
+    <public type="string" name="country_name_et" id="0x7F12065A" />
+    <public type="string" name="country_name_fi" id="0x7F12065B" />
+    <public type="string" name="country_name_fj" id="0x7F12065C" />
+    <public type="string" name="country_name_fk" id="0x7F12065D" />
+    <public type="string" name="country_name_fm" id="0x7F12065E" />
+    <public type="string" name="country_name_fo" id="0x7F12065F" />
+    <public type="string" name="country_name_fr" id="0x7F120660" />
+    <public type="string" name="country_name_ga" id="0x7F120661" />
+    <public type="string" name="country_name_gb" id="0x7F120662" />
+    <public type="string" name="country_name_gd" id="0x7F120663" />
+    <public type="string" name="country_name_ge" id="0x7F120664" />
+    <public type="string" name="country_name_gf" id="0x7F120665" />
+    <public type="string" name="country_name_gh" id="0x7F120666" />
+    <public type="string" name="country_name_gi" id="0x7F120667" />
+    <public type="string" name="country_name_gl" id="0x7F120668" />
+    <public type="string" name="country_name_gm" id="0x7F120669" />
+    <public type="string" name="country_name_gn" id="0x7F12066A" />
+    <public type="string" name="country_name_gp" id="0x7F12066B" />
+    <public type="string" name="country_name_gq" id="0x7F12066C" />
+    <public type="string" name="country_name_gr" id="0x7F12066D" />
+    <public type="string" name="country_name_gs" id="0x7F12066E" />
+    <public type="string" name="country_name_gt" id="0x7F12066F" />
+    <public type="string" name="country_name_gu" id="0x7F120670" />
+    <public type="string" name="country_name_gw" id="0x7F120671" />
+    <public type="string" name="country_name_gy" id="0x7F120672" />
+    <public type="string" name="country_name_hk" id="0x7F120673" />
+    <public type="string" name="country_name_hn" id="0x7F120674" />
+    <public type="string" name="country_name_hr" id="0x7F120675" />
+    <public type="string" name="country_name_ht" id="0x7F120676" />
+    <public type="string" name="country_name_hu" id="0x7F120677" />
+    <public type="string" name="country_name_id" id="0x7F120678" />
+    <public type="string" name="country_name_ie" id="0x7F120679" />
+    <public type="string" name="country_name_il" id="0x7F12067A" />
+    <public type="string" name="country_name_in" id="0x7F12067B" />
+    <public type="string" name="country_name_io" id="0x7F12067C" />
+    <public type="string" name="country_name_iq" id="0x7F12067D" />
+    <public type="string" name="country_name_ir" id="0x7F12067E" />
+    <public type="string" name="country_name_is" id="0x7F12067F" />
+    <public type="string" name="country_name_it" id="0x7F120680" />
+    <public type="string" name="country_name_jm" id="0x7F120681" />
+    <public type="string" name="country_name_jo" id="0x7F120682" />
+    <public type="string" name="country_name_jp" id="0x7F120683" />
+    <public type="string" name="country_name_ke" id="0x7F120684" />
+    <public type="string" name="country_name_kg" id="0x7F120685" />
+    <public type="string" name="country_name_kh" id="0x7F120686" />
+    <public type="string" name="country_name_ki" id="0x7F120687" />
+    <public type="string" name="country_name_km" id="0x7F120688" />
+    <public type="string" name="country_name_kn" id="0x7F120689" />
+    <public type="string" name="country_name_kp" id="0x7F12068A" />
+    <public type="string" name="country_name_kr" id="0x7F12068B" />
+    <public type="string" name="country_name_kw" id="0x7F12068C" />
+    <public type="string" name="country_name_ky" id="0x7F12068D" />
+    <public type="string" name="country_name_kz" id="0x7F12068E" />
+    <public type="string" name="country_name_la" id="0x7F12068F" />
+    <public type="string" name="country_name_lb" id="0x7F120690" />
+    <public type="string" name="country_name_li" id="0x7F120691" />
+    <public type="string" name="country_name_lk" id="0x7F120692" />
+    <public type="string" name="country_name_lr" id="0x7F120693" />
+    <public type="string" name="country_name_ls" id="0x7F120694" />
+    <public type="string" name="country_name_lt" id="0x7F120695" />
+    <public type="string" name="country_name_lu" id="0x7F120696" />
+    <public type="string" name="country_name_lv" id="0x7F120697" />
+    <public type="string" name="country_name_ly" id="0x7F120698" />
+    <public type="string" name="country_name_ma" id="0x7F120699" />
+    <public type="string" name="country_name_mc" id="0x7F12069A" />
+    <public type="string" name="country_name_md" id="0x7F12069B" />
+    <public type="string" name="country_name_me" id="0x7F12069C" />
+    <public type="string" name="country_name_mg" id="0x7F12069D" />
+    <public type="string" name="country_name_mh" id="0x7F12069E" />
+    <public type="string" name="country_name_mi" id="0x7F12069F" />
+    <public type="string" name="country_name_mk" id="0x7F1206A0" />
+    <public type="string" name="country_name_ml" id="0x7F1206A1" />
+    <public type="string" name="country_name_mm" id="0x7F1206A2" />
+    <public type="string" name="country_name_mn" id="0x7F1206A3" />
+    <public type="string" name="country_name_mo" id="0x7F1206A4" />
+    <public type="string" name="country_name_mp" id="0x7F1206A5" />
+    <public type="string" name="country_name_mq" id="0x7F1206A6" />
+    <public type="string" name="country_name_mr" id="0x7F1206A7" />
+    <public type="string" name="country_name_ms" id="0x7F1206A8" />
+    <public type="string" name="country_name_mt" id="0x7F1206A9" />
+    <public type="string" name="country_name_mu" id="0x7F1206AA" />
+    <public type="string" name="country_name_mv" id="0x7F1206AB" />
+    <public type="string" name="country_name_mw" id="0x7F1206AC" />
+    <public type="string" name="country_name_mx" id="0x7F1206AD" />
+    <public type="string" name="country_name_my" id="0x7F1206AE" />
+    <public type="string" name="country_name_mz" id="0x7F1206AF" />
+    <public type="string" name="country_name_na" id="0x7F1206B0" />
+    <public type="string" name="country_name_nc" id="0x7F1206B1" />
+    <public type="string" name="country_name_ne" id="0x7F1206B2" />
+    <public type="string" name="country_name_nf" id="0x7F1206B3" />
+    <public type="string" name="country_name_ng" id="0x7F1206B4" />
+    <public type="string" name="country_name_ni" id="0x7F1206B5" />
+    <public type="string" name="country_name_nl" id="0x7F1206B6" />
+    <public type="string" name="country_name_no" id="0x7F1206B7" />
+    <public type="string" name="country_name_np" id="0x7F1206B8" />
+    <public type="string" name="country_name_nr" id="0x7F1206B9" />
+    <public type="string" name="country_name_nu" id="0x7F1206BA" />
+    <public type="string" name="country_name_nz" id="0x7F1206BB" />
+    <public type="string" name="country_name_om" id="0x7F1206BC" />
+    <public type="string" name="country_name_pa" id="0x7F1206BD" />
+    <public type="string" name="country_name_pe" id="0x7F1206BE" />
+    <public type="string" name="country_name_pf" id="0x7F1206BF" />
+    <public type="string" name="country_name_pg" id="0x7F1206C0" />
+    <public type="string" name="country_name_ph" id="0x7F1206C1" />
+    <public type="string" name="country_name_pk" id="0x7F1206C2" />
+    <public type="string" name="country_name_pl" id="0x7F1206C3" />
+    <public type="string" name="country_name_pm" id="0x7F1206C4" />
+    <public type="string" name="country_name_pr" id="0x7F1206C5" />
+    <public type="string" name="country_name_ps" id="0x7F1206C6" />
+    <public type="string" name="country_name_pt" id="0x7F1206C7" />
+    <public type="string" name="country_name_pw" id="0x7F1206C8" />
+    <public type="string" name="country_name_py" id="0x7F1206C9" />
+    <public type="string" name="country_name_qa" id="0x7F1206CA" />
+    <public type="string" name="country_name_re" id="0x7F1206CB" />
+    <public type="string" name="country_name_ro" id="0x7F1206CC" />
+    <public type="string" name="country_name_rs" id="0x7F1206CD" />
+    <public type="string" name="country_name_ru" id="0x7F1206CE" />
+    <public type="string" name="country_name_rw" id="0x7F1206CF" />
+    <public type="string" name="country_name_sa" id="0x7F1206D0" />
+    <public type="string" name="country_name_sb" id="0x7F1206D1" />
+    <public type="string" name="country_name_sc" id="0x7F1206D2" />
+    <public type="string" name="country_name_sd" id="0x7F1206D3" />
+    <public type="string" name="country_name_se" id="0x7F1206D4" />
+    <public type="string" name="country_name_sg" id="0x7F1206D5" />
+    <public type="string" name="country_name_si" id="0x7F1206D6" />
+    <public type="string" name="country_name_sk" id="0x7F1206D7" />
+    <public type="string" name="country_name_sl" id="0x7F1206D8" />
+    <public type="string" name="country_name_sm" id="0x7F1206D9" />
+    <public type="string" name="country_name_sn" id="0x7F1206DA" />
+    <public type="string" name="country_name_so" id="0x7F1206DB" />
+    <public type="string" name="country_name_sr" id="0x7F1206DC" />
+    <public type="string" name="country_name_sv" id="0x7F1206DD" />
+    <public type="string" name="country_name_sx" id="0x7F1206DE" />
+    <public type="string" name="country_name_sy" id="0x7F1206DF" />
+    <public type="string" name="country_name_sz" id="0x7F1206E0" />
+    <public type="string" name="country_name_tc" id="0x7F1206E1" />
+    <public type="string" name="country_name_td" id="0x7F1206E2" />
+    <public type="string" name="country_name_tg" id="0x7F1206E3" />
+    <public type="string" name="country_name_th" id="0x7F1206E4" />
+    <public type="string" name="country_name_tj" id="0x7F1206E5" />
+    <public type="string" name="country_name_tk" id="0x7F1206E6" />
+    <public type="string" name="country_name_tl" id="0x7F1206E7" />
+    <public type="string" name="country_name_tm" id="0x7F1206E8" />
+    <public type="string" name="country_name_tn" id="0x7F1206E9" />
+    <public type="string" name="country_name_to" id="0x7F1206EA" />
+    <public type="string" name="country_name_tp" id="0x7F1206EB" />
+    <public type="string" name="country_name_tr" id="0x7F1206EC" />
+    <public type="string" name="country_name_tt" id="0x7F1206ED" />
+    <public type="string" name="country_name_tv" id="0x7F1206EE" />
+    <public type="string" name="country_name_tw" id="0x7F1206EF" />
+    <public type="string" name="country_name_tz" id="0x7F1206F0" />
+    <public type="string" name="country_name_ua" id="0x7F1206F1" />
+    <public type="string" name="country_name_ug" id="0x7F1206F2" />
+    <public type="string" name="country_name_us" id="0x7F1206F3" />
+    <public type="string" name="country_name_uy" id="0x7F1206F4" />
+    <public type="string" name="country_name_uz" id="0x7F1206F5" />
+    <public type="string" name="country_name_ve" id="0x7F1206F6" />
+    <public type="string" name="country_name_vg" id="0x7F1206F7" />
+    <public type="string" name="country_name_vi" id="0x7F1206F8" />
+    <public type="string" name="country_name_vn" id="0x7F1206F9" />
+    <public type="string" name="country_name_vu" id="0x7F1206FA" />
+    <public type="string" name="country_name_wf" id="0x7F1206FB" />
+    <public type="string" name="country_name_wk" id="0x7F1206FC" />
+    <public type="string" name="country_name_ws" id="0x7F1206FD" />
+    <public type="string" name="country_name_xk" id="0x7F1206FE" />
+    <public type="string" name="country_name_ye" id="0x7F1206FF" />
+    <public type="string" name="country_name_yt" id="0x7F120700" />
+    <public type="string" name="country_name_za" id="0x7F120701" />
+    <public type="string" name="country_name_zm" id="0x7F120702" />
+    <public type="string" name="country_name_zw" id="0x7F120703" />
+    <public type="string" name="country_no_results" id="0x7F120704" />
+    <public type="string" name="covid_new_user_survey_button" id="0x7F120705" />
+    <public type="string" name="covid_new_user_survey_prompt" id="0x7F120706" />
+    <public type="string" name="cozy_mode" id="0x7F120707" />
+    <public type="string" name="cpv_custom" id="0x7F120708" />
+    <public type="string" name="cpv_default_title" id="0x7F120709" />
+    <public type="string" name="cpv_presets" id="0x7F12070A" />
+    <public type="string" name="cpv_select" id="0x7F12070B" />
+    <public type="string" name="cpv_transparency" id="0x7F12070C" />
+    <public type="string" name="crash_app_version" id="0x7F12070D" />
+    <public type="string" name="crash_details" id="0x7F12070E" />
+    <public type="string" name="crash_device" id="0x7F12070F" />
+    <public type="string" name="crash_device_version" id="0x7F120710" />
+    <public type="string" name="crash_disclaimer" id="0x7F120711" />
+    <public type="string" name="crash_source" id="0x7F120712" />
+    <public type="string" name="crash_testers_invite" id="0x7F120713" />
+    <public type="string" name="crash_timestamp" id="0x7F120714" />
+    <public type="string" name="crash_unexpected" id="0x7F120715" />
+    <public type="string" name="create" id="0x7F120716" />
+    <public type="string" name="create_category" id="0x7F120717" />
+    <public type="string" name="create_channel" id="0x7F120718" />
+    <public type="string" name="create_channel_error" id="0x7F120719" />
+    <public type="string" name="create_channel_in_category" id="0x7F12071A" />
+    <public type="string" name="create_dm" id="0x7F12071B" />
+    <public type="string" name="create_event_add_end_time_label" id="0x7F12071C" />
+    <public type="string" name="create_event_end_date_label" id="0x7F12071D" />
+    <public type="string" name="create_event_end_time_label" id="0x7F12071E" />
+    <public type="string" name="create_event_remove_end_time_label" id="0x7F12071F" />
+    <public type="string" name="create_event_section_label" id="0x7F120720" />
+    <public type="string" name="create_event_start_date_label" id="0x7F120721" />
+    <public type="string" name="create_event_start_time_label" id="0x7F120722" />
+    <public type="string" name="create_event_submit_label" id="0x7F120723" />
+    <public type="string" name="create_event_ticket_scene_title" id="0x7F120724" />
+    <public type="string" name="create_group_dm" id="0x7F120725" />
+    <public type="string" name="create_guild_description" id="0x7F120726" />
+    <public type="string" name="create_guild_with_templates_title" id="0x7F120727" />
+    <public type="string" name="create_instant_invite" id="0x7F120728" />
+    <public type="string" name="create_link" id="0x7F120729" />
+    <public type="string" name="create_news_channel" id="0x7F12072A" />
+    <public type="string" name="create_news_channel_description" id="0x7F12072B" />
+    <public type="string" name="create_or_join_modal_header" id="0x7F12072C" />
+    <public type="string" name="create_private_text_channel" id="0x7F12072D" />
+    <public type="string" name="create_private_voice_channel" id="0x7F12072E" />
+    <public type="string" name="create_server_button_action" id="0x7F12072F" />
+    <public type="string" name="create_server_button_body" id="0x7F120730" />
+    <public type="string" name="create_server_button_cta" id="0x7F120731" />
+    <public type="string" name="create_server_button_cta_mobile" id="0x7F120732" />
+    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7F120733" />
+    <public type="string" name="create_server_default_server_name_format" id="0x7F120734" />
+    <public type="string" name="create_server_description_mobile" id="0x7F120735" />
+    <public type="string" name="create_server_description_mobile_refresh" id="0x7F120736" />
+    <public type="string" name="create_server_description_refresh" id="0x7F120737" />
+    <public type="string" name="create_server_guidelines" id="0x7F120738" />
+    <public type="string" name="create_server_title" id="0x7F120739" />
+    <public type="string" name="create_server_title_mobile_refresh" id="0x7F12073A" />
+    <public type="string" name="create_stage_channel" id="0x7F12073B" />
+    <public type="string" name="create_stage_channel_description" id="0x7F12073C" />
+    <public type="string" name="create_stage_event_modal_title" id="0x7F12073D" />
+    <public type="string" name="create_stage_instance_add_speaker" id="0x7F12073E" />
+    <public type="string" name="create_stage_instance_add_speaker_label" id="0x7F12073F" />
+    <public type="string" name="create_stage_instance_description_input_label" id="0x7F120740" />
+    <public type="string" name="create_stage_instance_description_input_placeholder" id="0x7F120741" />
+    <public type="string" name="create_stage_instance_go_live_label" id="0x7F120742" />
+    <public type="string" name="create_stage_instance_require_ticket_label" id="0x7F120743" />
+    <public type="string" name="create_stage_instance_select_guild_header" id="0x7F120744" />
+    <public type="string" name="create_stage_instance_select_guild_subheader" id="0x7F120745" />
+    <public type="string" name="create_stage_instance_select_privacy_header" id="0x7F120746" />
+    <public type="string" name="create_stage_instance_select_privacy_subheader" id="0x7F120747" />
+    <public type="string" name="create_stage_instance_speakers_label" id="0x7F120748" />
+    <public type="string" name="create_stage_instance_ticket_required_label" id="0x7F120749" />
+    <public type="string" name="create_stage_instance_ticket_required_sublabel" id="0x7F12074A" />
+    <public type="string" name="create_stage_instance_title_input_label" id="0x7F12074B" />
+    <public type="string" name="create_stage_instance_title_input_placeholder" id="0x7F12074C" />
+    <public type="string" name="create_store_channel" id="0x7F12074D" />
+    <public type="string" name="create_store_channel_application" id="0x7F12074E" />
+    <public type="string" name="create_store_channel_beta_note" id="0x7F12074F" />
+    <public type="string" name="create_store_channel_beta_title" id="0x7F120750" />
+    <public type="string" name="create_store_channel_branch" id="0x7F120751" />
+    <public type="string" name="create_store_channel_description" id="0x7F120752" />
+    <public type="string" name="create_store_channel_no_skus" id="0x7F120753" />
+    <public type="string" name="create_store_channel_no_skus_error" id="0x7F120754" />
+    <public type="string" name="create_store_channel_select_application" id="0x7F120755" />
+    <public type="string" name="create_store_channel_select_branch" id="0x7F120756" />
+    <public type="string" name="create_store_channel_select_sku" id="0x7F120757" />
+    <public type="string" name="create_store_channel_sku" id="0x7F120758" />
+    <public type="string" name="create_text_channel" id="0x7F120759" />
+    <public type="string" name="create_text_channel_description" id="0x7F12075A" />
+    <public type="string" name="create_thread" id="0x7F12075B" />
+    <public type="string" name="create_thread_header_1" id="0x7F12075C" />
+    <public type="string" name="create_thread_header_2" id="0x7F12075D" />
+    <public type="string" name="create_voice_channel" id="0x7F12075E" />
+    <public type="string" name="create_voice_channel_description" id="0x7F12075F" />
+    <public type="string" name="creation_intent_checkbox_label" id="0x7F120760" />
+    <public type="string" name="creation_intent_description" id="0x7F120761" />
+    <public type="string" name="creation_intent_option_community" id="0x7F120762" />
+    <public type="string" name="creation_intent_option_friends" id="0x7F120763" />
+    <public type="string" name="creation_intent_skip" id="0x7F120764" />
+    <public type="string" name="creation_intent_title" id="0x7F120765" />
+    <public type="string" name="creator_journey_survey" id="0x7F120766" />
+    <public type="string" name="credit_card_cvc" id="0x7F120767" />
+    <public type="string" name="credit_card_error_expiration" id="0x7F120768" />
+    <public type="string" name="credit_card_error_number" id="0x7F120769" />
+    <public type="string" name="credit_card_error_required" id="0x7F12076A" />
+    <public type="string" name="credit_card_error_security_code" id="0x7F12076B" />
+    <public type="string" name="credit_card_expiration_date" id="0x7F12076C" />
+    <public type="string" name="credit_card_name" id="0x7F12076D" />
+    <public type="string" name="credit_card_name_on_card" id="0x7F12076E" />
+    <public type="string" name="credit_card_number" id="0x7F12076F" />
+    <public type="string" name="credit_card_security_code" id="0x7F120770" />
+    <public type="string" name="crop" id="0x7F120771" />
+    <public type="string" name="cs" id="0x7F120772" />
+    <public type="string" name="custom_color" id="0x7F120773" />
+    <public type="string" name="custom_status" id="0x7F120774" />
+    <public type="string" name="custom_status_clear_after" id="0x7F120775" />
+    <public type="string" name="custom_status_clear_custom_status" id="0x7F120776" />
+    <public type="string" name="custom_status_clear_in_hours" id="0x7F120777" />
+    <public type="string" name="custom_status_clear_in_minutes" id="0x7F120778" />
+    <public type="string" name="custom_status_clear_tomorrow" id="0x7F120779" />
+    <public type="string" name="custom_status_dont_clear" id="0x7F12077A" />
+    <public type="string" name="custom_status_edit_custom_status_placeholder" id="0x7F12077B" />
+    <public type="string" name="custom_status_hours" id="0x7F12077C" />
+    <public type="string" name="custom_status_minutes" id="0x7F12077D" />
+    <public type="string" name="custom_status_modal_body" id="0x7F12077E" />
+    <public type="string" name="custom_status_modal_placeholder" id="0x7F12077F" />
+    <public type="string" name="custom_status_set_custom_status" id="0x7F120780" />
+    <public type="string" name="custom_status_status_title" id="0x7F120781" />
+    <public type="string" name="custom_status_today" id="0x7F120782" />
+    <public type="string" name="custom_status_update_success" id="0x7F120783" />
+    <public type="string" name="custom_tabs_mobile_body" id="0x7F120784" />
+    <public type="string" name="custom_tabs_mobile_header" id="0x7F120785" />
+    <public type="string" name="customize_group" id="0x7F120786" />
+    <public type="string" name="cut" id="0x7F120787" />
+    <public type="string" name="da" id="0x7F120788" />
+    <public type="string" name="dark_blue" id="0x7F120789" />
+    <public type="string" name="dark_grey" id="0x7F12078A" />
+    <public type="string" name="dark_purple" id="0x7F12078B" />
+    <public type="string" name="dark_teal" id="0x7F12078C" />
+    <public type="string" name="data_download_requested_status_note" id="0x7F12078D" />
+    <public type="string" name="data_privacy_controls" id="0x7F12078E" />
+    <public type="string" name="data_privacy_controls_allow_accessibility_detection_note" id="0x7F12078F" />
+    <public type="string" name="data_privacy_controls_allow_accessibility_detection_title" id="0x7F120790" />
+    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7F120791" />
+    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7F120792" />
+    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7F120793" />
+    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7F120794" />
+    <public type="string" name="data_privacy_controls_personalization_title" id="0x7F120795" />
+    <public type="string" name="data_privacy_controls_request_data_download" id="0x7F120796" />
+    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7F120797" />
+    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7F120798" />
+    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7F120799" />
+    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7F12079A" />
+    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7F12079B" />
+    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7F12079C" />
+    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7F12079D" />
+    <public type="string" name="data_privacy_controls_request_data_note" id="0x7F12079E" />
+    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7F12079F" />
+    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7F1207A0" />
+    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7F1207A1" />
+    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7F1207A2" />
+    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7F1207A3" />
+    <public type="string" name="data_privacy_rate_limit_title" id="0x7F1207A4" />
+    <public type="string" name="data_privacy_update_consents_failed" id="0x7F1207A5" />
+    <public type="string" name="date" id="0x7F1207A6" />
+    <public type="string" name="de" id="0x7F1207A7" />
+    <public type="string" name="deafen" id="0x7F1207A8" />
+    <public type="string" name="deafen_members" id="0x7F1207A9" />
+    <public type="string" name="deauthorize" id="0x7F1207AA" />
+    <public type="string" name="deauthorize_app" id="0x7F1207AB" />
+    <public type="string" name="deb" id="0x7F1207AC" />
+    <public type="string" name="debug" id="0x7F1207AD" />
+    <public type="string" name="decline" id="0x7F1207AE" />
+    <public type="string" name="default_app_description" id="0x7F1207AF" />
+    <public type="string" name="default_failure_to_perform_action_message" id="0x7F1207B0" />
+    <public type="string" name="default_input_placeholder" id="0x7F1207B1" />
+    <public type="string" name="default_web_client_id" id="0x7F1207B2" />
+    <public type="string" name="delete" id="0x7F1207B3" />
+    <public type="string" name="delete_account" id="0x7F1207B4" />
+    <public type="string" name="delete_account_body" id="0x7F1207B5" />
+    <public type="string" name="delete_account_error" id="0x7F1207B6" />
+    <public type="string" name="delete_account_transfer_ownership" id="0x7F1207B7" />
+    <public type="string" name="delete_account_transfer_ownership_body" id="0x7F1207B8" />
+    <public type="string" name="delete_app_confirm_msg" id="0x7F1207B9" />
+    <public type="string" name="delete_category" id="0x7F1207BA" />
+    <public type="string" name="delete_channel" id="0x7F1207BB" />
+    <public type="string" name="delete_channel_body" id="0x7F1207BC" />
+    <public type="string" name="delete_followed_news_body" id="0x7F1207BD" />
+    <public type="string" name="delete_message" id="0x7F1207BE" />
+    <public type="string" name="delete_message_body" id="0x7F1207BF" />
+    <public type="string" name="delete_message_context_menu_hint" id="0x7F1207C0" />
+    <public type="string" name="delete_message_history_option_24hr" id="0x7F1207C1" />
+    <public type="string" name="delete_message_history_option_7d" id="0x7F1207C2" />
+    <public type="string" name="delete_message_history_option_none" id="0x7F1207C3" />
+    <public type="string" name="delete_message_report" id="0x7F1207C4" />
+    <public type="string" name="delete_message_title" id="0x7F1207C5" />
+    <public type="string" name="delete_role" id="0x7F1207C6" />
+    <public type="string" name="delete_role_mobile" id="0x7F1207C7" />
+    <public type="string" name="delete_rules_channel_body" id="0x7F1207C8" />
+    <public type="string" name="delete_server" id="0x7F1207C9" />
+    <public type="string" name="delete_server_body" id="0x7F1207CA" />
+    <public type="string" name="delete_server_enter_name" id="0x7F1207CB" />
+    <public type="string" name="delete_server_incorrect_name" id="0x7F1207CC" />
+    <public type="string" name="delete_server_title" id="0x7F1207CD" />
+    <public type="string" name="delete_stage_event_confirmation_description" id="0x7F1207CE" />
+    <public type="string" name="delete_stage_event_label" id="0x7F1207CF" />
+    <public type="string" name="delete_thread" id="0x7F1207D0" />
+    <public type="string" name="delete_updates_channel_body" id="0x7F1207D1" />
+    <public type="string" name="description" id="0x7F1207D2" />
+    <public type="string" name="designate_other_channel" id="0x7F1207D3" />
+    <public type="string" name="desktop_app" id="0x7F1207D4" />
+    <public type="string" name="desktop_download_description" id="0x7F1207D5" />
+    <public type="string" name="desktop_download_title_linux" id="0x7F1207D6" />
+    <public type="string" name="desktop_download_title_mac" id="0x7F1207D7" />
+    <public type="string" name="desktop_download_title_windows" id="0x7F1207D8" />
+    <public type="string" name="desktop_notifications_enable" id="0x7F1207D9" />
+    <public type="string" name="desktop_notifications_enable_body" id="0x7F1207DA" />
+    <public type="string" name="detect_platform_accounts" id="0x7F1207DB" />
+    <public type="string" name="developer_application_test_mode" id="0x7F1207DC" />
+    <public type="string" name="developer_application_test_mode_activate" id="0x7F1207DD" />
+    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7F1207DE" />
+    <public type="string" name="developer_application_test_mode_clear" id="0x7F1207DF" />
+    <public type="string" name="developer_application_test_mode_invalid" id="0x7F1207E0" />
+    <public type="string" name="developer_application_test_mode_localhost_option" id="0x7F1207E1" />
+    <public type="string" name="developer_application_test_mode_modal_body" id="0x7F1207E2" />
+    <public type="string" name="developer_application_test_mode_modal_header" id="0x7F1207E3" />
+    <public type="string" name="developer_application_test_mode_note" id="0x7F1207E4" />
+    <public type="string" name="developer_application_test_mode_origin_label" id="0x7F1207E5" />
+    <public type="string" name="developer_application_test_mode_placeholder" id="0x7F1207E6" />
+    <public type="string" name="developer_application_test_mode_port_number_label" id="0x7F1207E7" />
+    <public type="string" name="developer_application_test_mode_proxy_option" id="0x7F1207E8" />
+    <public type="string" name="developer_mode" id="0x7F1207E9" />
+    <public type="string" name="developer_mode_help_text" id="0x7F1207EA" />
+    <public type="string" name="developer_options" id="0x7F1207EB" />
+    <public type="string" name="developer_settings_bug_reporting_description" id="0x7F1207EC" />
+    <public type="string" name="developer_settings_bug_reporting_title" id="0x7F1207ED" />
+    <public type="string" name="device_settings" id="0x7F1207EE" />
+    <public type="string" name="dialog_just_so_you_know" id="0x7F1207EF" />
+    <public type="string" name="direct_message" id="0x7F1207F0" />
+    <public type="string" name="direct_message_a11y_label" id="0x7F1207F1" />
+    <public type="string" name="direct_message_a11y_label_with_unreads" id="0x7F1207F2" />
+    <public type="string" name="direct_messages" id="0x7F1207F3" />
+    <public type="string" name="direct_messages_pending_friends" id="0x7F1207F4" />
+    <public type="string" name="directory_entry_menu_label" id="0x7F1207F5" />
+    <public type="string" name="directory_search_no_results_subtitle" id="0x7F1207F6" />
+    <public type="string" name="directory_search_no_results_title" id="0x7F1207F7" />
+    <public type="string" name="directory_search_placeholder" id="0x7F1207F8" />
+    <public type="string" name="directory_search_results_header" id="0x7F1207F9" />
+    <public type="string" name="disable" id="0x7F1207FA" />
+    <public type="string" name="disable_account" id="0x7F1207FB" />
+    <public type="string" name="disable_account_body" id="0x7F1207FC" />
+    <public type="string" name="disable_email_notifications" id="0x7F1207FD" />
+    <public type="string" name="disable_integration_title" id="0x7F1207FE" />
+    <public type="string" name="disable_integration_twitch_body" id="0x7F1207FF" />
+    <public type="string" name="disable_integration_youtube_body" id="0x7F120800" />
+    <public type="string" name="disable_noise_cancellation" id="0x7F120801" />
+    <public type="string" name="disable_notifications_description" id="0x7F120802" />
+    <public type="string" name="disable_notifications_label" id="0x7F120803" />
+    <public type="string" name="disable_sounds_description" id="0x7F120804" />
+    <public type="string" name="disable_sounds_label" id="0x7F120805" />
+    <public type="string" name="disable_video" id="0x7F120806" />
+    <public type="string" name="disapproval" id="0x7F120807" />
+    <public type="string" name="discard_changes" id="0x7F120808" />
+    <public type="string" name="discard_changes_description" id="0x7F120809" />
+    <public type="string" name="discodo_disabled" id="0x7F12080A" />
+    <public type="string" name="discodo_enabled" id="0x7F12080B" />
+    <public type="string" name="disconnect_account" id="0x7F12080C" />
+    <public type="string" name="disconnect_account_body" id="0x7F12080D" />
+    <public type="string" name="disconnect_account_title" id="0x7F12080E" />
+    <public type="string" name="disconnect_from_voice" id="0x7F12080F" />
+    <public type="string" name="disconnect_other" id="0x7F120810" />
+    <public type="string" name="disconnect_self" id="0x7F120811" />
+    <public type="string" name="disconnect_user_success" id="0x7F120812" />
+    <public type="string" name="discord" id="0x7F120813" />
+    <public type="string" name="discord_desc_long" id="0x7F120814" />
+    <public type="string" name="discord_desc_short" id="0x7F120815" />
+    <public type="string" name="discord_gg" id="0x7F120816" />
+    <public type="string" name="discord_name" id="0x7F120817" />
+    <public type="string" name="discord_rich_presence" id="0x7F120818" />
+    <public type="string" name="discord_u_coming_soon_to_mobile" id="0x7F120819" />
+    <public type="string" name="discover" id="0x7F12081A" />
+    <public type="string" name="discovery" id="0x7F12081B" />
+    <public type="string" name="discovery_speaker_count" id="0x7F12081C" />
+    <public type="string" name="dismiss" id="0x7F12081D" />
+    <public type="string" name="dispatch_error_modal_body" id="0x7F12081E" />
+    <public type="string" name="dispatch_error_modal_description" id="0x7F12081F" />
+    <public type="string" name="dispatch_error_modal_error_label" id="0x7F120820" />
+    <public type="string" name="dispatch_error_modal_header" id="0x7F120821" />
+    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7F120822" />
+    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7F120823" />
+    <public type="string" name="display_activity" id="0x7F120824" />
+    <public type="string" name="display_on_profile" id="0x7F120825" />
+    <public type="string" name="display_option_always" id="0x7F120826" />
+    <public type="string" name="display_option_never" id="0x7F120827" />
+    <public type="string" name="display_option_only_while_speaking" id="0x7F120828" />
+    <public type="string" name="display_silence_warning" id="0x7F120829" />
+    <public type="string" name="dm" id="0x7F12082A" />
+    <public type="string" name="dm_search_placeholder" id="0x7F12082B" />
+    <public type="string" name="dm_textarea_placeholder" id="0x7F12082C" />
+    <public type="string" name="dm_tooltip_a11y_label" id="0x7F12082D" />
+    <public type="string" name="dm_verification_text_blocked" id="0x7F12082E" />
+    <public type="string" name="done" id="0x7F12082F" />
+    <public type="string" name="dont_show_again" id="0x7F120830" />
+    <public type="string" name="download" id="0x7F120831" />
+    <public type="string" name="download_app" id="0x7F120832" />
+    <public type="string" name="download_apps" id="0x7F120833" />
+    <public type="string" name="download_desktop_ptb_footer" id="0x7F120834" />
+    <public type="string" name="download_desktop_stable_footer" id="0x7F120835" />
+    <public type="string" name="download_desktop_title" id="0x7F120836" />
+    <public type="string" name="download_failed" id="0x7F120837" />
+    <public type="string" name="download_file_complete" id="0x7F120838" />
+    <public type="string" name="download_mobile_title" id="0x7F120839" />
+    <public type="string" name="duration_days" id="0x7F12083A" />
+    <public type="string" name="duration_days_short" id="0x7F12083B" />
+    <public type="string" name="duration_hours" id="0x7F12083C" />
+    <public type="string" name="duration_hours_minutes_seconds" id="0x7F12083D" />
+    <public type="string" name="duration_hours_short" id="0x7F12083E" />
+    <public type="string" name="duration_mins" id="0x7F12083F" />
+    <public type="string" name="duration_minutes" id="0x7F120840" />
+    <public type="string" name="duration_minutes_short" id="0x7F120841" />
+    <public type="string" name="duration_seconds" id="0x7F120842" />
+    <public type="string" name="duration_seconds_short" id="0x7F120843" />
+    <public type="string" name="early_supporter_tooltip" id="0x7F120844" />
+    <public type="string" name="echo_cancellation" id="0x7F120845" />
+    <public type="string" name="edit" id="0x7F120846" />
+    <public type="string" name="edit_category" id="0x7F120847" />
+    <public type="string" name="edit_channel" id="0x7F120848" />
+    <public type="string" name="edit_followed_news_body" id="0x7F120849" />
+    <public type="string" name="edit_message" id="0x7F12084A" />
+    <public type="string" name="edit_note" id="0x7F12084B" />
+    <public type="string" name="edit_overview" id="0x7F12084C" />
+    <public type="string" name="edit_profile" id="0x7F12084D" />
     <public type="string" name="edit_roles" id="0x7F12084E" />
     <public type="string" name="edit_stage_channel_subtitle" id="0x7F12084F" />
     <public type="string" name="edit_stage_channel_title" id="0x7F120850" />
@@ -16101,6190 +16181,6288 @@
     <public type="string" name="explicit_end_stage_confirm_mobile" id="0x7F12095C" />
     <public type="string" name="explicit_end_stage_subtitle" id="0x7F12095D" />
     <public type="string" name="explicit_end_stage_title" id="0x7F12095E" />
-    <public type="string" name="exposed_dropdown_menu_content_description" id="0x7F12095F" />
-    <public type="string" name="expression_picker_emoji" id="0x7F120960" />
-    <public type="string" name="expression_picker_gif" id="0x7F120961" />
-    <public type="string" name="expression_picker_intro_tooltip_action" id="0x7F120962" />
-    <public type="string" name="expression_picker_intro_tooltip_body" id="0x7F120963" />
-    <public type="string" name="expression_picker_intro_tooltip_header" id="0x7F120964" />
-    <public type="string" name="expression_picker_open_emoji_picker_a11y_label" id="0x7F120965" />
-    <public type="string" name="expression_picker_open_gif_picker_a11y_label" id="0x7F120966" />
-    <public type="string" name="expression_picker_open_sticker_picker_a11y_label" id="0x7F120967" />
-    <public type="string" name="expression_picker_sticker" id="0x7F120968" />
-    <public type="string" name="expression_suggestions_sticker_name" id="0x7F120969" />
-    <public type="string" name="expression_suggestions_sticker_short_nav_prompt" id="0x7F12096A" />
-    <public type="string" name="extra_emoji_count" id="0x7F12096B" />
-    <public type="string" name="fab_transformation_scrim_behavior" id="0x7F12096C" />
-    <public type="string" name="fab_transformation_sheet_behavior" id="0x7F12096D" />
-    <public type="string" name="facebook" id="0x7F12096E" />
-    <public type="string" name="failed" id="0x7F12096F" />
-    <public type="string" name="fallback_menu_item_copy_link" id="0x7F120970" />
-    <public type="string" name="fallback_menu_item_open_in_browser" id="0x7F120971" />
-    <public type="string" name="fallback_menu_item_share_link" id="0x7F120972" />
-    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7F120973" />
-    <public type="string" name="feedback_describe_issue" id="0x7F120974" />
-    <public type="string" name="feedback_issue_title" id="0x7F120975" />
-    <public type="string" name="feedback_modal_title" id="0x7F120976" />
-    <public type="string" name="feedback_need_more_help" id="0x7F120977" />
-    <public type="string" name="fi" id="0x7F120978" />
-    <public type="string" name="file_rate_kb" id="0x7F120979" />
-    <public type="string" name="file_rate_mb" id="0x7F12097A" />
-    <public type="string" name="file_size_gb" id="0x7F12097B" />
-    <public type="string" name="file_size_kb" id="0x7F12097C" />
-    <public type="string" name="file_size_mb" id="0x7F12097D" />
-    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7F12097E" />
-    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7F12097F" />
-    <public type="string" name="file_upload_limit_staff" id="0x7F120980" />
-    <public type="string" name="file_upload_limit_standard" id="0x7F120981" />
-    <public type="string" name="files_permission_reason" id="0x7F120982" />
-    <public type="string" name="filter" id="0x7F120983" />
-    <public type="string" name="filter_mentions" id="0x7F120984" />
-    <public type="string" name="filter_options" id="0x7F120985" />
-    <public type="string" name="finish_signing_up" id="0x7F120986" />
-    <public type="string" name="firebase_database_url" id="0x7F120987" />
-    <public type="string" name="first_week_survey_button" id="0x7F120988" />
-    <public type="string" name="first_week_survey_prompt" id="0x7F120989" />
-    <public type="string" name="flash_auto" id="0x7F12098A" />
-    <public type="string" name="flash_off" id="0x7F12098B" />
-    <public type="string" name="flash_on" id="0x7F12098C" />
-    <public type="string" name="flash_torch" id="0x7F12098D" />
-    <public type="string" name="focus_participant" id="0x7F12098E" />
-    <public type="string" name="follow" id="0x7F12098F" />
-    <public type="string" name="follow_modal_body" id="0x7F120990" />
-    <public type="string" name="follow_modal_fail" id="0x7F120991" />
-    <public type="string" name="follow_modal_hint" id="0x7F120992" />
-    <public type="string" name="follow_modal_hint_no_perms" id="0x7F120993" />
-    <public type="string" name="follow_modal_title" id="0x7F120994" />
-    <public type="string" name="follow_modal_too_many_webhooks" id="0x7F120995" />
-    <public type="string" name="follow_modal_warning" id="0x7F120996" />
-    <public type="string" name="follow_news_chat_input_message" id="0x7F120997" />
-    <public type="string" name="follow_news_chat_input_subtitle" id="0x7F120998" />
-    <public type="string" name="follow_success_modal_body" id="0x7F120999" />
-    <public type="string" name="follow_success_modal_header_01" id="0x7F12099A" />
-    <public type="string" name="follow_success_modal_header_02" id="0x7F12099B" />
-    <public type="string" name="follow_success_modal_header_03" id="0x7F12099C" />
-    <public type="string" name="follow_success_modal_header_04" id="0x7F12099D" />
-    <public type="string" name="follow_success_modal_header_05" id="0x7F12099E" />
-    <public type="string" name="follow_success_modal_header_06" id="0x7F12099F" />
-    <public type="string" name="follow_success_modal_header_07" id="0x7F1209A0" />
-    <public type="string" name="follow_success_modal_header_08" id="0x7F1209A1" />
-    <public type="string" name="follow_success_modal_header_09" id="0x7F1209A2" />
-    <public type="string" name="follow_success_modal_header_10" id="0x7F1209A3" />
-    <public type="string" name="follow_us_for_more_updates" id="0x7F1209A4" />
-    <public type="string" name="follower_analytics" id="0x7F1209A5" />
-    <public type="string" name="follower_analytics_header" id="0x7F1209A6" />
-    <public type="string" name="force_sync" id="0x7F1209A7" />
-    <public type="string" name="forgot_password" id="0x7F1209A8" />
-    <public type="string" name="form_checkbox_aec_dump" id="0x7F1209A9" />
-    <public type="string" name="form_checkbox_connection_log" id="0x7F1209AA" />
-    <public type="string" name="form_checkbox_debug_logging" id="0x7F1209AB" />
-    <public type="string" name="form_checkbox_qos" id="0x7F1209AC" />
-    <public type="string" name="form_description_audio_mode_android_call" id="0x7F1209AD" />
-    <public type="string" name="form_description_audio_mode_android_communication" id="0x7F1209AE" />
-    <public type="string" name="form_description_mobile_guild_notification_all_messages" id="0x7F1209AF" />
-    <public type="string" name="form_description_mobile_guild_notification_only_mentions" id="0x7F1209B0" />
-    <public type="string" name="form_description_mobile_notification_muted" id="0x7F1209B1" />
-    <public type="string" name="form_description_push_afk_timeout" id="0x7F1209B2" />
-    <public type="string" name="form_description_tts" id="0x7F1209B3" />
-    <public type="string" name="form_error_generic" id="0x7F1209B4" />
-    <public type="string" name="form_help_aec_dump" id="0x7F1209B5" />
-    <public type="string" name="form_help_afk_channel" id="0x7F1209B6" />
-    <public type="string" name="form_help_attenuation" id="0x7F1209B7" />
-    <public type="string" name="form_help_auto_archive_duration" id="0x7F1209B8" />
-    <public type="string" name="form_help_automatic_vad" id="0x7F1209B9" />
-    <public type="string" name="form_help_bitrate" id="0x7F1209BA" />
-    <public type="string" name="form_help_certified_voice_processing" id="0x7F1209BB" />
-    <public type="string" name="form_help_channel_permissions" id="0x7F1209BC" />
-    <public type="string" name="form_help_connection_log" id="0x7F1209BD" />
-    <public type="string" name="form_help_debug_logging" id="0x7F1209BE" />
-    <public type="string" name="form_help_default_auto_archive_duration" id="0x7F1209BF" />
-    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7F1209C0" />
-    <public type="string" name="form_help_discoverable_change_time" id="0x7F1209C1" />
-    <public type="string" name="form_help_discovery_cover_image" id="0x7F1209C2" />
-    <public type="string" name="form_help_enable_discoverable" id="0x7F1209C3" />
-    <public type="string" name="form_help_explicit_content_filter" id="0x7F1209C4" />
-    <public type="string" name="form_help_hardware_h264" id="0x7F1209C5" />
-    <public type="string" name="form_help_instant_invite_channel" id="0x7F1209C6" />
-    <public type="string" name="form_help_last_seen" id="0x7F1209C7" />
-    <public type="string" name="form_help_last_seen_with_roles" id="0x7F1209C8" />
-    <public type="string" name="form_help_news" id="0x7F1209C9" />
-    <public type="string" name="form_help_news_android" id="0x7F1209CA" />
-    <public type="string" name="form_help_nsfw" id="0x7F1209CB" />
-    <public type="string" name="form_help_open_h264" id="0x7F1209CC" />
-    <public type="string" name="form_help_qos" id="0x7F1209CD" />
-    <public type="string" name="form_help_region_override" id="0x7F1209CE" />
-    <public type="string" name="form_help_server_banner" id="0x7F1209CF" />
-    <public type="string" name="form_help_server_description" id="0x7F1209D0" />
-    <public type="string" name="form_help_server_language" id="0x7F1209D1" />
-    <public type="string" name="form_help_slowmode" id="0x7F1209D2" />
-    <public type="string" name="form_help_system_channel" id="0x7F1209D3" />
-    <public type="string" name="form_help_system_channel_guild_reminders" id="0x7F1209D4" />
-    <public type="string" name="form_help_system_channel_join_messages" id="0x7F1209D5" />
-    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7F1209D6" />
-    <public type="string" name="form_help_temporary" id="0x7F1209D7" />
-    <public type="string" name="form_help_user_limit" id="0x7F1209D8" />
-    <public type="string" name="form_help_verification_level" id="0x7F1209D9" />
-    <public type="string" name="form_help_video_quality_mode" id="0x7F1209DA" />
-    <public type="string" name="form_help_voice_video_troubleshooting_guide" id="0x7F1209DB" />
-    <public type="string" name="form_label_account_information" id="0x7F1209DC" />
-    <public type="string" name="form_label_afk_channel" id="0x7F1209DD" />
-    <public type="string" name="form_label_afk_timeout" id="0x7F1209DE" />
-    <public type="string" name="form_label_all" id="0x7F1209DF" />
-    <public type="string" name="form_label_all_messages" id="0x7F1209E0" />
-    <public type="string" name="form_label_all_messages_short" id="0x7F1209E1" />
-    <public type="string" name="form_label_android_opensl" id="0x7F1209E2" />
-    <public type="string" name="form_label_android_opensl_default" id="0x7F1209E3" />
-    <public type="string" name="form_label_android_opensl_default_desc" id="0x7F1209E4" />
-    <public type="string" name="form_label_android_opensl_desc" id="0x7F1209E5" />
-    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7F1209E6" />
-    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7F1209E7" />
-    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7F1209E8" />
-    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7F1209E9" />
-    <public type="string" name="form_label_attenuation" id="0x7F1209EA" />
-    <public type="string" name="form_label_audio_mode_android" id="0x7F1209EB" />
-    <public type="string" name="form_label_audio_mode_android_call" id="0x7F1209EC" />
-    <public type="string" name="form_label_audio_mode_android_communication" id="0x7F1209ED" />
-    <public type="string" name="form_label_automatic_vad" id="0x7F1209EE" />
-    <public type="string" name="form_label_automatic_vad_mobile" id="0x7F1209EF" />
-    <public type="string" name="form_label_avatar_size" id="0x7F1209F0" />
-    <public type="string" name="form_label_bitrate" id="0x7F1209F1" />
-    <public type="string" name="form_label_category_permissions" id="0x7F1209F2" />
-    <public type="string" name="form_label_channel_name" id="0x7F1209F3" />
-    <public type="string" name="form_label_channel_notifcation_settings" id="0x7F1209F4" />
-    <public type="string" name="form_label_channel_permissions" id="0x7F1209F5" />
-    <public type="string" name="form_label_channel_topic" id="0x7F1209F6" />
-    <public type="string" name="form_label_channel_voice_permissions" id="0x7F1209F7" />
-    <public type="string" name="form_label_current_password" id="0x7F1209F8" />
-    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7F1209F9" />
-    <public type="string" name="form_label_debug" id="0x7F1209FA" />
-    <public type="string" name="form_label_default" id="0x7F1209FB" />
-    <public type="string" name="form_label_default_auto_archive_duration_off" id="0x7F1209FC" />
-    <public type="string" name="form_label_default_notification_settings" id="0x7F1209FD" />
-    <public type="string" name="form_label_delete_message_history" id="0x7F1209FE" />
-    <public type="string" name="form_label_desktop_only" id="0x7F1209FF" />
-    <public type="string" name="form_label_disabled_for_everyone" id="0x7F120A00" />
-    <public type="string" name="form_label_discovery_cover_image" id="0x7F120A01" />
-    <public type="string" name="form_label_discovery_rules_channel" id="0x7F120A02" />
-    <public type="string" name="form_label_display_names" id="0x7F120A03" />
-    <public type="string" name="form_label_display_users" id="0x7F120A04" />
-    <public type="string" name="form_label_email" id="0x7F120A05" />
-    <public type="string" name="form_label_email_or_phone_number" id="0x7F120A06" />
-    <public type="string" name="form_label_expire_grace_period" id="0x7F120A07" />
-    <public type="string" name="form_label_explicit_content_filter" id="0x7F120A08" />
-    <public type="string" name="form_label_hoist_description" id="0x7F120A09" />
-    <public type="string" name="form_label_input" id="0x7F120A0A" />
-    <public type="string" name="form_label_input_device" id="0x7F120A0B" />
-    <public type="string" name="form_label_input_mode" id="0x7F120A0C" />
-    <public type="string" name="form_label_input_sensitivty" id="0x7F120A0D" />
-    <public type="string" name="form_label_input_volume" id="0x7F120A0E" />
-    <public type="string" name="form_label_instant_invite" id="0x7F120A0F" />
-    <public type="string" name="form_label_instant_invite_channel" id="0x7F120A10" />
-    <public type="string" name="form_label_invite_link" id="0x7F120A11" />
-    <public type="string" name="form_label_json_api" id="0x7F120A12" />
-    <public type="string" name="form_label_last_seen" id="0x7F120A13" />
-    <public type="string" name="form_label_max_age" id="0x7F120A14" />
-    <public type="string" name="form_label_max_uses" id="0x7F120A15" />
-    <public type="string" name="form_label_member_add" id="0x7F120A16" />
-    <public type="string" name="form_label_membership_expire_behavior" id="0x7F120A17" />
-    <public type="string" name="form_label_mentionable" id="0x7F120A18" />
-    <public type="string" name="form_label_mentionable_description" id="0x7F120A19" />
-    <public type="string" name="form_label_mentions" id="0x7F120A1A" />
-    <public type="string" name="form_label_mobile_category_muted" id="0x7F120A1B" />
-    <public type="string" name="form_label_mobile_category_muted_until" id="0x7F120A1C" />
-    <public type="string" name="form_label_mobile_category_override_mute" id="0x7F120A1D" />
-    <public type="string" name="form_label_mobile_channel_muted" id="0x7F120A1E" />
-    <public type="string" name="form_label_mobile_channel_muted_until" id="0x7F120A1F" />
-    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7F120A20" />
-    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7F120A21" />
-    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7F120A22" />
-    <public type="string" name="form_label_mobile_dm_muted" id="0x7F120A23" />
-    <public type="string" name="form_label_mobile_dm_muted_until" id="0x7F120A24" />
-    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7F120A25" />
-    <public type="string" name="form_label_mobile_notifications_blink" id="0x7F120A26" />
-    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7F120A27" />
-    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7F120A28" />
-    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7F120A29" />
-    <public type="string" name="form_label_mobile_notifications_label" id="0x7F120A2A" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7F120A2B" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7F120A2C" />
-    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7F120A2D" />
-    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7F120A2E" />
-    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7F120A2F" />
-    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7F120A30" />
-    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7F120A31" />
-    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7F120A32" />
-    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7F120A33" />
-    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7F120A34" />
-    <public type="string" name="form_label_mobile_push_notifications" id="0x7F120A35" />
-    <public type="string" name="form_label_mobile_server_muted" id="0x7F120A36" />
-    <public type="string" name="form_label_mobile_server_muted_until" id="0x7F120A37" />
-    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7F120A38" />
-    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7F120A39" />
-    <public type="string" name="form_label_mute_server" id="0x7F120A3A" />
-    <public type="string" name="form_label_mute_server_description" id="0x7F120A3B" />
-    <public type="string" name="form_label_muted" id="0x7F120A3C" />
-    <public type="string" name="form_label_new_password" id="0x7F120A3D" />
-    <public type="string" name="form_label_news_channel" id="0x7F120A3E" />
-    <public type="string" name="form_label_nothing" id="0x7F120A3F" />
-    <public type="string" name="form_label_notification_frequency" id="0x7F120A40" />
-    <public type="string" name="form_label_notification_position" id="0x7F120A41" />
-    <public type="string" name="form_label_nsfw_channel" id="0x7F120A42" />
-    <public type="string" name="form_label_off" id="0x7F120A43" />
-    <public type="string" name="form_label_only_mentions" id="0x7F120A44" />
-    <public type="string" name="form_label_only_mentions_short" id="0x7F120A45" />
-    <public type="string" name="form_label_output" id="0x7F120A46" />
-    <public type="string" name="form_label_output_device" id="0x7F120A47" />
-    <public type="string" name="form_label_output_volume" id="0x7F120A48" />
-    <public type="string" name="form_label_overlay_chat_opacity" id="0x7F120A49" />
-    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7F120A4A" />
-    <public type="string" name="form_label_password" id="0x7F120A4B" />
-    <public type="string" name="form_label_phone_number" id="0x7F120A4C" />
-    <public type="string" name="form_label_premade_widget" id="0x7F120A4D" />
-    <public type="string" name="form_label_push_afk_timeout" id="0x7F120A4E" />
-    <public type="string" name="form_label_qos" id="0x7F120A4F" />
-    <public type="string" name="form_label_reason_ban" id="0x7F120A50" />
-    <public type="string" name="form_label_reason_kick" id="0x7F120A51" />
-    <public type="string" name="form_label_region_override" id="0x7F120A52" />
-    <public type="string" name="form_label_report_reason" id="0x7F120A53" />
-    <public type="string" name="form_label_role_add" id="0x7F120A54" />
-    <public type="string" name="form_label_role_color" id="0x7F120A55" />
-    <public type="string" name="form_label_role_enter_name" id="0x7F120A56" />
-    <public type="string" name="form_label_role_name" id="0x7F120A57" />
-    <public type="string" name="form_label_role_settings" id="0x7F120A58" />
-    <public type="string" name="form_label_roles_pro_tip" id="0x7F120A59" />
-    <public type="string" name="form_label_roles_pro_tip_description" id="0x7F120A5A" />
-    <public type="string" name="form_label_screenshare" id="0x7F120A5B" />
-    <public type="string" name="form_label_select_channel" id="0x7F120A5C" />
-    <public type="string" name="form_label_send_to" id="0x7F120A5D" />
-    <public type="string" name="form_label_sensitivty" id="0x7F120A5E" />
-    <public type="string" name="form_label_server_banner" id="0x7F120A5F" />
-    <public type="string" name="form_label_server_description" id="0x7F120A60" />
-    <public type="string" name="form_label_server_id" id="0x7F120A61" />
-    <public type="string" name="form_label_server_language" id="0x7F120A62" />
-    <public type="string" name="form_label_server_name" id="0x7F120A63" />
-    <public type="string" name="form_label_server_notification_settings" id="0x7F120A64" />
-    <public type="string" name="form_label_server_region" id="0x7F120A65" />
-    <public type="string" name="form_label_shortcut" id="0x7F120A66" />
-    <public type="string" name="form_label_slowmode" id="0x7F120A67" />
-    <public type="string" name="form_label_slowmode_cooldown" id="0x7F120A68" />
-    <public type="string" name="form_label_slowmode_off" id="0x7F120A69" />
-    <public type="string" name="form_label_stream_volume" id="0x7F120A6A" />
-    <public type="string" name="form_label_sub_expire_behavior" id="0x7F120A6B" />
-    <public type="string" name="form_label_subsystem" id="0x7F120A6C" />
-    <public type="string" name="form_label_suppress_everyone" id="0x7F120A6D" />
-    <public type="string" name="form_label_suppress_roles" id="0x7F120A6E" />
-    <public type="string" name="form_label_synced_members" id="0x7F120A6F" />
-    <public type="string" name="form_label_synced_role" id="0x7F120A70" />
-    <public type="string" name="form_label_synced_subs" id="0x7F120A71" />
-    <public type="string" name="form_label_system_channel" id="0x7F120A72" />
-    <public type="string" name="form_label_system_channel_settings" id="0x7F120A73" />
-    <public type="string" name="form_label_temporary" id="0x7F120A74" />
-    <public type="string" name="form_label_test_microphone" id="0x7F120A75" />
-    <public type="string" name="form_label_tts" id="0x7F120A76" />
-    <public type="string" name="form_label_tts_notifications" id="0x7F120A77" />
-    <public type="string" name="form_label_unmute_server" id="0x7F120A78" />
-    <public type="string" name="form_label_use_rich_chat_box" id="0x7F120A79" />
-    <public type="string" name="form_label_user_limit" id="0x7F120A7A" />
-    <public type="string" name="form_label_username" id="0x7F120A7B" />
-    <public type="string" name="form_label_username_mobile" id="0x7F120A7C" />
-    <public type="string" name="form_label_verification_level" id="0x7F120A7D" />
-    <public type="string" name="form_label_video_device" id="0x7F120A7E" />
-    <public type="string" name="form_label_video_preview" id="0x7F120A7F" />
-    <public type="string" name="form_label_video_quality" id="0x7F120A80" />
-    <public type="string" name="form_label_voice_diagnostics" id="0x7F120A81" />
-    <public type="string" name="form_label_voice_processing" id="0x7F120A82" />
-    <public type="string" name="form_label_volume" id="0x7F120A83" />
-    <public type="string" name="form_placeholder_server_name" id="0x7F120A84" />
-    <public type="string" name="form_placeholder_username" id="0x7F120A85" />
-    <public type="string" name="form_private_thread_description" id="0x7F120A86" />
-    <public type="string" name="form_report_help_text" id="0x7F120A87" />
-    <public type="string" name="form_thread_auto_archive_section_label" id="0x7F120A88" />
-    <public type="string" name="form_thread_name_hint" id="0x7F120A89" />
-    <public type="string" name="form_thread_name_placeholder" id="0x7F120A8A" />
-    <public type="string" name="form_thread_name_required_error" id="0x7F120A8B" />
-    <public type="string" name="form_thread_private_thread_description" id="0x7F120A8C" />
-    <public type="string" name="form_thread_private_thread_section_label" id="0x7F120A8D" />
-    <public type="string" name="form_thread_starter_message_placeholder" id="0x7F120A8E" />
-    <public type="string" name="form_thread_starter_message_section_label" id="0x7F120A8F" />
-    <public type="string" name="form_warning_input_sensitivty" id="0x7F120A90" />
-    <public type="string" name="form_warning_video_preview" id="0x7F120A91" />
-    <public type="string" name="fr" id="0x7F120A92" />
-    <public type="string" name="friend_has_been_deleted" id="0x7F120A93" />
-    <public type="string" name="friend_nickname" id="0x7F120A94" />
-    <public type="string" name="friend_nickname_description" id="0x7F120A95" />
-    <public type="string" name="friend_permitted_source" id="0x7F120A96" />
-    <public type="string" name="friend_permitted_source_all" id="0x7F120A97" />
-    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7F120A98" />
-    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7F120A99" />
-    <public type="string" name="friend_request_accept" id="0x7F120A9A" />
-    <public type="string" name="friend_request_cancel" id="0x7F120A9B" />
-    <public type="string" name="friend_request_cancelled" id="0x7F120A9C" />
-    <public type="string" name="friend_request_failed_body" id="0x7F120A9D" />
-    <public type="string" name="friend_request_failed_body_names" id="0x7F120A9E" />
-    <public type="string" name="friend_request_failed_header" id="0x7F120A9F" />
-    <public type="string" name="friend_request_ignore" id="0x7F120AA0" />
-    <public type="string" name="friend_request_ignored" id="0x7F120AA1" />
-    <public type="string" name="friend_request_rate_limited_body" id="0x7F120AA2" />
-    <public type="string" name="friend_request_rate_limited_button" id="0x7F120AA3" />
-    <public type="string" name="friend_request_rate_limited_header" id="0x7F120AA4" />
-    <public type="string" name="friend_request_received" id="0x7F120AA5" />
-    <public type="string" name="friend_request_requires_email_validation_body" id="0x7F120AA6" />
-    <public type="string" name="friend_request_requires_email_validation_button" id="0x7F120AA7" />
-    <public type="string" name="friend_request_requires_email_validation_header" id="0x7F120AA8" />
-    <public type="string" name="friend_request_sent" id="0x7F120AA9" />
-    <public type="string" name="friends" id="0x7F120AAA" />
-    <public type="string" name="friends_all_header" id="0x7F120AAB" />
-    <public type="string" name="friends_blocked_header" id="0x7F120AAC" />
-    <public type="string" name="friends_column_name" id="0x7F120AAD" />
-    <public type="string" name="friends_column_status" id="0x7F120AAE" />
-    <public type="string" name="friends_empty_state_all" id="0x7F120AAF" />
-    <public type="string" name="friends_empty_state_all_body" id="0x7F120AB0" />
-    <public type="string" name="friends_empty_state_all_cta" id="0x7F120AB1" />
-    <public type="string" name="friends_empty_state_all_header" id="0x7F120AB2" />
-    <public type="string" name="friends_empty_state_blocked" id="0x7F120AB3" />
-    <public type="string" name="friends_empty_state_copy" id="0x7F120AB4" />
-    <public type="string" name="friends_empty_state_friend_suggestions_copy" id="0x7F120AB5" />
-    <public type="string" name="friends_empty_state_online" id="0x7F120AB6" />
-    <public type="string" name="friends_empty_state_pending" id="0x7F120AB7" />
-    <public type="string" name="friends_empty_state_pending_friends_copy" id="0x7F120AB8" />
-    <public type="string" name="friends_empty_state_subtitle" id="0x7F120AB9" />
-    <public type="string" name="friends_friend_suggestions_header" id="0x7F120ABA" />
-    <public type="string" name="friends_offline_header" id="0x7F120ABB" />
-    <public type="string" name="friends_online_header" id="0x7F120ABC" />
-    <public type="string" name="friends_pending_header" id="0x7F120ABD" />
-    <public type="string" name="friends_pending_request_expand" id="0x7F120ABE" />
-    <public type="string" name="friends_pending_request_expand_collapse" id="0x7F120ABF" />
-    <public type="string" name="friends_pending_request_header" id="0x7F120AC0" />
-    <public type="string" name="friends_request_status_incoming" id="0x7F120AC1" />
-    <public type="string" name="friends_request_status_outgoing" id="0x7F120AC2" />
-    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7F120AC3" />
-    <public type="string" name="friends_row_action_button_accessibility_label_accept_suggestion" id="0x7F120AC4" />
-    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7F120AC5" />
-    <public type="string" name="friends_row_action_button_accessibility_label_cancel" id="0x7F120AC6" />
-    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7F120AC7" />
-    <public type="string" name="friends_row_action_button_accessibility_label_ignore_suggestion" id="0x7F120AC8" />
-    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7F120AC9" />
-    <public type="string" name="friends_section_add_friend" id="0x7F120ACA" />
-    <public type="string" name="friends_section_all" id="0x7F120ACB" />
-    <public type="string" name="friends_section_online" id="0x7F120ACC" />
-    <public type="string" name="friends_section_pending" id="0x7F120ACD" />
-    <public type="string" name="friends_share" id="0x7F120ACE" />
-    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7F120ACF" />
-    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7F120AD0" />
-    <public type="string" name="friends_share_tabbar_title" id="0x7F120AD1" />
-    <public type="string" name="full" id="0x7F120AD2" />
-    <public type="string" name="full_screen" id="0x7F120AD3" />
-    <public type="string" name="game_action_button_add_to_library" id="0x7F120AD4" />
-    <public type="string" name="game_action_button_cannot_install" id="0x7F120AD5" />
-    <public type="string" name="game_action_button_downloading" id="0x7F120AD6" />
-    <public type="string" name="game_action_button_game_not_detected" id="0x7F120AD7" />
-    <public type="string" name="game_action_button_install" id="0x7F120AD8" />
-    <public type="string" name="game_action_button_locate" id="0x7F120AD9" />
-    <public type="string" name="game_action_button_login_to_buy" id="0x7F120ADA" />
-    <public type="string" name="game_action_button_now_playing" id="0x7F120ADB" />
-    <public type="string" name="game_action_button_paused" id="0x7F120ADC" />
-    <public type="string" name="game_action_button_play" id="0x7F120ADD" />
-    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7F120ADE" />
-    <public type="string" name="game_action_button_preorder_wait" id="0x7F120ADF" />
-    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7F120AE0" />
-    <public type="string" name="game_action_button_queued" id="0x7F120AE1" />
-    <public type="string" name="game_action_button_restricted_in_region" id="0x7F120AE2" />
-    <public type="string" name="game_action_button_unavailable" id="0x7F120AE3" />
-    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7F120AE4" />
-    <public type="string" name="game_action_button_uninstalling_1" id="0x7F120AE5" />
-    <public type="string" name="game_action_button_uninstalling_10" id="0x7F120AE6" />
-    <public type="string" name="game_action_button_uninstalling_2" id="0x7F120AE7" />
-    <public type="string" name="game_action_button_uninstalling_3" id="0x7F120AE8" />
-    <public type="string" name="game_action_button_uninstalling_4" id="0x7F120AE9" />
-    <public type="string" name="game_action_button_uninstalling_5" id="0x7F120AEA" />
-    <public type="string" name="game_action_button_uninstalling_6" id="0x7F120AEB" />
-    <public type="string" name="game_action_button_uninstalling_7" id="0x7F120AEC" />
-    <public type="string" name="game_action_button_uninstalling_8" id="0x7F120AED" />
-    <public type="string" name="game_action_button_uninstalling_9" id="0x7F120AEE" />
-    <public type="string" name="game_action_button_update" id="0x7F120AEF" />
-    <public type="string" name="game_action_button_view_in_store" id="0x7F120AF0" />
-    <public type="string" name="game_activity" id="0x7F120AF1" />
-    <public type="string" name="game_detected" id="0x7F120AF2" />
-    <public type="string" name="game_detection_open_settings" id="0x7F120AF3" />
-    <public type="string" name="game_detection_service" id="0x7F120AF4" />
-    <public type="string" name="game_feed_activity_action_play" id="0x7F120AF5" />
-    <public type="string" name="game_feed_activity_playing_xbox" id="0x7F120AF6" />
-    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7F120AF7" />
-    <public type="string" name="game_feed_current_header_title" id="0x7F120AF8" />
-    <public type="string" name="game_feed_unknown_player" id="0x7F120AF9" />
-    <public type="string" name="game_feed_unknown_players" id="0x7F120AFA" />
-    <public type="string" name="game_feed_user_played_days_ago" id="0x7F120AFB" />
-    <public type="string" name="game_feed_user_played_hours_ago" id="0x7F120AFC" />
-    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7F120AFD" />
-    <public type="string" name="game_feed_user_played_months_ago" id="0x7F120AFE" />
-    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7F120AFF" />
-    <public type="string" name="game_feed_user_played_years_ago" id="0x7F120B00" />
-    <public type="string" name="game_feed_user_playing_for_days" id="0x7F120B01" />
-    <public type="string" name="game_feed_user_playing_for_hours" id="0x7F120B02" />
-    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7F120B03" />
-    <public type="string" name="game_feed_user_playing_just_ended" id="0x7F120B04" />
-    <public type="string" name="game_feed_user_playing_just_started" id="0x7F120B05" />
-    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7F120B06" />
-    <public type="string" name="game_library_last_played_days" id="0x7F120B07" />
-    <public type="string" name="game_library_last_played_hours" id="0x7F120B08" />
-    <public type="string" name="game_library_last_played_just_now" id="0x7F120B09" />
-    <public type="string" name="game_library_last_played_minutes" id="0x7F120B0A" />
-    <public type="string" name="game_library_last_played_months" id="0x7F120B0B" />
-    <public type="string" name="game_library_last_played_none" id="0x7F120B0C" />
-    <public type="string" name="game_library_last_played_playing_now" id="0x7F120B0D" />
-    <public type="string" name="game_library_last_played_weeks" id="0x7F120B0E" />
-    <public type="string" name="game_library_last_played_years" id="0x7F120B0F" />
-    <public type="string" name="game_library_list_header_last_played" id="0x7F120B10" />
-    <public type="string" name="game_library_list_header_name" id="0x7F120B11" />
-    <public type="string" name="game_library_list_header_platform" id="0x7F120B12" />
-    <public type="string" name="game_library_new" id="0x7F120B13" />
-    <public type="string" name="game_library_not_applicable" id="0x7F120B14" />
-    <public type="string" name="game_library_notification_game_installed_body" id="0x7F120B15" />
-    <public type="string" name="game_library_notification_game_installed_title" id="0x7F120B16" />
-    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7F120B17" />
-    <public type="string" name="game_library_private_tooltip" id="0x7F120B18" />
-    <public type="string" name="game_library_time_played_hours" id="0x7F120B19" />
-    <public type="string" name="game_library_time_played_minutes" id="0x7F120B1A" />
-    <public type="string" name="game_library_time_played_none" id="0x7F120B1B" />
-    <public type="string" name="game_library_time_played_seconds" id="0x7F120B1C" />
-    <public type="string" name="game_library_updates_action_move_up" id="0x7F120B1D" />
-    <public type="string" name="game_library_updates_action_pause" id="0x7F120B1E" />
-    <public type="string" name="game_library_updates_action_remove" id="0x7F120B1F" />
-    <public type="string" name="game_library_updates_action_resume" id="0x7F120B20" />
-    <public type="string" name="game_library_updates_header_disk" id="0x7F120B21" />
-    <public type="string" name="game_library_updates_header_network" id="0x7F120B22" />
-    <public type="string" name="game_library_updates_installing" id="0x7F120B23" />
-    <public type="string" name="game_library_updates_installing_hours" id="0x7F120B24" />
-    <public type="string" name="game_library_updates_installing_minutes" id="0x7F120B25" />
-    <public type="string" name="game_library_updates_installing_seconds" id="0x7F120B26" />
-    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7F120B27" />
-    <public type="string" name="game_library_updates_progress_finalizing" id="0x7F120B28" />
-    <public type="string" name="game_library_updates_progress_finished" id="0x7F120B29" />
-    <public type="string" name="game_library_updates_progress_paused" id="0x7F120B2A" />
-    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7F120B2B" />
-    <public type="string" name="game_library_updates_progress_pausing" id="0x7F120B2C" />
-    <public type="string" name="game_library_updates_progress_planning" id="0x7F120B2D" />
-    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7F120B2E" />
-    <public type="string" name="game_library_updates_progress_queued" id="0x7F120B2F" />
-    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7F120B30" />
-    <public type="string" name="game_library_updates_progress_repairing" id="0x7F120B31" />
-    <public type="string" name="game_library_updates_progress_verifying" id="0x7F120B32" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7F120B33" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7F120B34" />
-    <public type="string" name="game_library_updates_updating" id="0x7F120B35" />
-    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7F120B36" />
-    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7F120B37" />
-    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7F120B38" />
-    <public type="string" name="game_popout_follow" id="0x7F120B39" />
-    <public type="string" name="game_popout_nitro_upsell" id="0x7F120B3A" />
-    <public type="string" name="game_popout_view_server" id="0x7F120B3B" />
-    <public type="string" name="gcm_defaultSenderId" id="0x7F120B3C" />
-    <public type="string" name="general_permissions" id="0x7F120B3D" />
-    <public type="string" name="generate_a_new_link" id="0x7F120B3E" />
-    <public type="string" name="generic_actions_menu_label" id="0x7F120B3F" />
-    <public type="string" name="get_mobile_app" id="0x7F120B40" />
-    <public type="string" name="get_mobile_app_cta" id="0x7F120B41" />
-    <public type="string" name="get_mobile_app_subtitle" id="0x7F120B42" />
-    <public type="string" name="get_started" id="0x7F120B43" />
-    <public type="string" name="gif" id="0x7F120B44" />
-    <public type="string" name="gif_auto_play_label" id="0x7F120B45" />
-    <public type="string" name="gif_auto_play_label_mobile" id="0x7F120B46" />
-    <public type="string" name="gif_button_label" id="0x7F120B47" />
-    <public type="string" name="gif_picker_enter_search" id="0x7F120B48" />
-    <public type="string" name="gif_picker_favorites" id="0x7F120B49" />
-    <public type="string" name="gif_picker_related_search" id="0x7F120B4A" />
-    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7F120B4B" />
-    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7F120B4C" />
-    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7F120B4D" />
-    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7F120B4E" />
-    <public type="string" name="gift_code_auth_accept" id="0x7F120B4F" />
-    <public type="string" name="gift_code_auth_accepting" id="0x7F120B50" />
-    <public type="string" name="gift_code_auth_check_verification_again" id="0x7F120B51" />
-    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7F120B52" />
-    <public type="string" name="gift_code_auth_fetching_user" id="0x7F120B53" />
-    <public type="string" name="gift_code_auth_gifted" id="0x7F120B54" />
-    <public type="string" name="gift_code_auth_gifted_by" id="0x7F120B55" />
-    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7F120B56" />
-    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7F120B57" />
-    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7F120B58" />
-    <public type="string" name="gift_code_auth_help_text_owned" id="0x7F120B59" />
-    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7F120B5A" />
-    <public type="string" name="gift_code_auth_invalid_body" id="0x7F120B5B" />
-    <public type="string" name="gift_code_auth_invalid_tip" id="0x7F120B5C" />
-    <public type="string" name="gift_code_auth_invalid_title" id="0x7F120B5D" />
-    <public type="string" name="gift_code_auth_logged_in_as" id="0x7F120B5E" />
-    <public type="string" name="gift_code_auth_resolving" id="0x7F120B5F" />
-    <public type="string" name="gift_code_auth_verification_sent" id="0x7F120B60" />
-    <public type="string" name="gift_code_auth_verification_title" id="0x7F120B61" />
-    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7F120B62" />
-    <public type="string" name="gift_code_hint" id="0x7F120B63" />
-    <public type="string" name="gift_confirmation_body_claimed" id="0x7F120B64" />
-    <public type="string" name="gift_confirmation_body_confirm" id="0x7F120B65" />
-    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7F120B66" />
-    <public type="string" name="gift_confirmation_body_confirm_nitro_disclaimer" id="0x7F120B67" />
-    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7F120B68" />
-    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7F120B69" />
-    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7F120B6A" />
-    <public type="string" name="gift_confirmation_body_invalid" id="0x7F120B6B" />
-    <public type="string" name="gift_confirmation_body_owned" id="0x7F120B6C" />
-    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7F120B6D" />
-    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7F120B6E" />
-    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7F120B6F" />
-    <public type="string" name="gift_confirmation_body_success" id="0x7F120B70" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7F120B71" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7F120B72" />
-    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7F120B73" />
-    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7F120B74" />
-    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7F120B75" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7F120B76" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7F120B77" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7F120B78" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7F120B79" />
-    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7F120B7A" />
-    <public type="string" name="gift_confirmation_button_confirm" id="0x7F120B7B" />
-    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7F120B7C" />
-    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7F120B7D" />
-    <public type="string" name="gift_confirmation_button_fail" id="0x7F120B7E" />
-    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7F120B7F" />
-    <public type="string" name="gift_confirmation_button_noice" id="0x7F120B80" />
-    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7F120B81" />
-    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7F120B82" />
-    <public type="string" name="gift_confirmation_header_confirm" id="0x7F120B83" />
-    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7F120B84" />
-    <public type="string" name="gift_confirmation_header_fail" id="0x7F120B85" />
-    <public type="string" name="gift_confirmation_header_success" id="0x7F120B86" />
-    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7F120B87" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7F120B88" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7F120B89" />
-    <public type="string" name="gift_embed_body_claimed_other" id="0x7F120B8A" />
-    <public type="string" name="gift_embed_body_claimed_self" id="0x7F120B8B" />
-    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7F120B8C" />
-    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7F120B8D" />
-    <public type="string" name="gift_embed_body_default" id="0x7F120B8E" />
-    <public type="string" name="gift_embed_body_giveaway" id="0x7F120B8F" />
-    <public type="string" name="gift_embed_body_no_user_default" id="0x7F120B90" />
-    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7F120B91" />
-    <public type="string" name="gift_embed_body_owned" id="0x7F120B92" />
-    <public type="string" name="gift_embed_body_owned_mobile" id="0x7F120B93" />
-    <public type="string" name="gift_embed_body_requires_verification" id="0x7F120B94" />
-    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7F120B95" />
-    <public type="string" name="gift_embed_body_self" id="0x7F120B96" />
-    <public type="string" name="gift_embed_body_self_not_redeemable" id="0x7F120B97" />
-    <public type="string" name="gift_embed_body_subscription_already_active" id="0x7F120B98" />
-    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7F120B99" />
-    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7F120B9A" />
-    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7F120B9B" />
-    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7F120B9C" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7F120B9D" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7F120B9E" />
-    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7F120B9F" />
-    <public type="string" name="gift_embed_button_accept" id="0x7F120BA0" />
-    <public type="string" name="gift_embed_button_cant_accept" id="0x7F120BA1" />
-    <public type="string" name="gift_embed_button_claimed" id="0x7F120BA2" />
-    <public type="string" name="gift_embed_button_claiming" id="0x7F120BA3" />
-    <public type="string" name="gift_embed_button_owned" id="0x7F120BA4" />
-    <public type="string" name="gift_embed_copies_left" id="0x7F120BA5" />
-    <public type="string" name="gift_embed_expiration" id="0x7F120BA6" />
-    <public type="string" name="gift_embed_header_owner_invalid" id="0x7F120BA7" />
-    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7F120BA8" />
-    <public type="string" name="gift_embed_info_owner_invalid" id="0x7F120BA9" />
-    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7F120BAA" />
-    <public type="string" name="gift_embed_invalid" id="0x7F120BAB" />
-    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7F120BAC" />
-    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7F120BAD" />
-    <public type="string" name="gift_embed_invalid_title_other" id="0x7F120BAE" />
-    <public type="string" name="gift_embed_invalid_title_self" id="0x7F120BAF" />
-    <public type="string" name="gift_embed_resolving" id="0x7F120BB0" />
-    <public type="string" name="gift_embed_subscriptions_left" id="0x7F120BB1" />
-    <public type="string" name="gift_embed_title" id="0x7F120BB2" />
-    <public type="string" name="gift_embed_title_self" id="0x7F120BB3" />
-    <public type="string" name="gift_embed_title_subscription" id="0x7F120BB4" />
-    <public type="string" name="gift_embed_title_subscription_self" id="0x7F120BB5" />
-    <public type="string" name="gift_inventory" id="0x7F120BB6" />
-    <public type="string" name="gift_inventory_copies" id="0x7F120BB7" />
-    <public type="string" name="gift_inventory_expires_in" id="0x7F120BB8" />
-    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7F120BB9" />
-    <public type="string" name="gift_inventory_generate_help" id="0x7F120BBA" />
-    <public type="string" name="gift_inventory_generate_link" id="0x7F120BBB" />
-    <public type="string" name="gift_inventory_generate_link_ios" id="0x7F120BBC" />
-    <public type="string" name="gift_inventory_gifts_you_purchased" id="0x7F120BBD" />
-    <public type="string" name="gift_inventory_hidden" id="0x7F120BBE" />
-    <public type="string" name="gift_inventory_no_gifts" id="0x7F120BBF" />
-    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7F120BC0" />
-    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7F120BC1" />
-    <public type="string" name="gift_inventory_redeem_codes" id="0x7F120BC2" />
-    <public type="string" name="gift_inventory_select_nitro_classic_gift" id="0x7F120BC3" />
-    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7F120BC4" />
-    <public type="string" name="gift_inventory_subscription_months" id="0x7F120BC5" />
-    <public type="string" name="gift_inventory_subscription_years" id="0x7F120BC6" />
-    <public type="string" name="gift_inventory_your_gifts" id="0x7F120BC7" />
-    <public type="string" name="gift_purchase_google_play_notice" id="0x7F120BC8" />
-    <public type="string" name="gift_purchase_google_play_notice_extended" id="0x7F120BC9" />
-    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7F120BCA" />
-    <public type="string" name="go_live_hey" id="0x7F120BCB" />
-    <public type="string" name="go_live_listen" id="0x7F120BCC" />
-    <public type="string" name="go_live_look" id="0x7F120BCD" />
-    <public type="string" name="go_live_modal_application_form_title" id="0x7F120BCE" />
-    <public type="string" name="go_live_modal_applications" id="0x7F120BCF" />
-    <public type="string" name="go_live_modal_cta" id="0x7F120BD0" />
-    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7F120BD1" />
-    <public type="string" name="go_live_modal_description" id="0x7F120BD2" />
-    <public type="string" name="go_live_modal_description_generic" id="0x7F120BD3" />
-    <public type="string" name="go_live_modal_description_select_source" id="0x7F120BD4" />
-    <public type="string" name="go_live_modal_guild_form_title" id="0x7F120BD5" />
-    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7F120BD6" />
-    <public type="string" name="go_live_modal_overflow_three_users" id="0x7F120BD7" />
-    <public type="string" name="go_live_modal_overflow_two_users" id="0x7F120BD8" />
-    <public type="string" name="go_live_modal_screens" id="0x7F120BD9" />
-    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7F120BDA" />
-    <public type="string" name="go_live_modal_select_guild_form_title" id="0x7F120BDB" />
-    <public type="string" name="go_live_modal_title" id="0x7F120BDC" />
-    <public type="string" name="go_live_private_channels_tooltip_body" id="0x7F120BDD" />
-    <public type="string" name="go_live_private_channels_tooltip_body_no_format" id="0x7F120BDE" />
-    <public type="string" name="go_live_private_channels_tooltip_cta" id="0x7F120BDF" />
-    <public type="string" name="go_live_screenshare_enable_for_soundshare" id="0x7F120BE0" />
-    <public type="string" name="go_live_screenshare_no_sound" id="0x7F120BE1" />
-    <public type="string" name="go_live_screenshare_update_macos_for_soundshare" id="0x7F120BE2" />
-    <public type="string" name="go_live_screenshare_update_windows_for_soundshare" id="0x7F120BE3" />
-    <public type="string" name="go_live_share_screen" id="0x7F120BE4" />
-    <public type="string" name="go_live_tile_screen" id="0x7F120BE5" />
-    <public type="string" name="go_live_user_playing" id="0x7F120BE6" />
-    <public type="string" name="go_live_video_drivers_outdated" id="0x7F120BE7" />
-    <public type="string" name="go_live_watching_user" id="0x7F120BE8" />
-    <public type="string" name="google_api_key" id="0x7F120BE9" />
-    <public type="string" name="google_app_id" id="0x7F120BEA" />
-    <public type="string" name="google_crash_reporting_api_key" id="0x7F120BEB" />
-    <public type="string" name="google_storage_bucket" id="0x7F120BEC" />
-    <public type="string" name="grant_temporary_membership" id="0x7F120BED" />
-    <public type="string" name="green" id="0x7F120BEE" />
-    <public type="string" name="grey" id="0x7F120BEF" />
-    <public type="string" name="group_dm" id="0x7F120BF0" />
-    <public type="string" name="group_dm_add_friends" id="0x7F120BF1" />
-    <public type="string" name="group_dm_header" id="0x7F120BF2" />
-    <public type="string" name="group_dm_invite_confirm" id="0x7F120BF3" />
-    <public type="string" name="group_dm_invite_confirm_button" id="0x7F120BF4" />
-    <public type="string" name="group_dm_invite_confirm_description" id="0x7F120BF5" />
-    <public type="string" name="group_dm_invite_empty" id="0x7F120BF6" />
-    <public type="string" name="group_dm_invite_full_main" id="0x7F120BF7" />
-    <public type="string" name="group_dm_invite_full_sub" id="0x7F120BF8" />
-    <public type="string" name="group_dm_invite_full_sub2" id="0x7F120BF9" />
-    <public type="string" name="group_dm_invite_link_create" id="0x7F120BFA" />
-    <public type="string" name="group_dm_invite_link_example" id="0x7F120BFB" />
-    <public type="string" name="group_dm_invite_link_title" id="0x7F120BFC" />
-    <public type="string" name="group_dm_invite_no_friends" id="0x7F120BFD" />
-    <public type="string" name="group_dm_invite_not_friends" id="0x7F120BFE" />
-    <public type="string" name="group_dm_invite_remaining" id="0x7F120BFF" />
-    <public type="string" name="group_dm_invite_select_existing" id="0x7F120C00" />
-    <public type="string" name="group_dm_invite_to" id="0x7F120C01" />
-    <public type="string" name="group_dm_invite_unselect_users" id="0x7F120C02" />
-    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7F120C03" />
-    <public type="string" name="group_dm_invite_with_name" id="0x7F120C04" />
-    <public type="string" name="group_dm_search_placeholder" id="0x7F120C05" />
-    <public type="string" name="group_dm_settings" id="0x7F120C06" />
-    <public type="string" name="group_message_a11y_label" id="0x7F120C07" />
-    <public type="string" name="group_message_a11y_label_with_unreads" id="0x7F120C08" />
-    <public type="string" name="group_name" id="0x7F120C09" />
-    <public type="string" name="group_owner" id="0x7F120C0A" />
-    <public type="string" name="groups" id="0x7F120C0B" />
-    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7F120C0C" />
-    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7F120C0D" />
-    <public type="string" name="guild_actions_menu_label" id="0x7F120C0E" />
-    <public type="string" name="guild_analyics_developers_button" id="0x7F120C0F" />
-    <public type="string" name="guild_analytics_description" id="0x7F120C10" />
-    <public type="string" name="guild_analytics_developers_cta" id="0x7F120C11" />
-    <public type="string" name="guild_analytics_error_guild_size" id="0x7F120C12" />
-    <public type="string" name="guild_analytics_error_message" id="0x7F120C13" />
-    <public type="string" name="guild_analytics_metrics_last_week" id="0x7F120C14" />
-    <public type="string" name="guild_cap_invite_modal_button" id="0x7F120C15" />
-    <public type="string" name="guild_cap_marketing_hero_body" id="0x7F120C16" />
-    <public type="string" name="guild_cap_premium_feature_description" id="0x7F120C17" />
-    <public type="string" name="guild_cap_premium_feature_title" id="0x7F120C18" />
-    <public type="string" name="guild_cap_upsell_get_nitro" id="0x7F120C19" />
-    <public type="string" name="guild_cap_upsell_modal_at_limit_body" id="0x7F120C1A" />
-    <public type="string" name="guild_cap_upsell_modal_near_limit_body" id="0x7F120C1B" />
-    <public type="string" name="guild_cap_upsell_modal_title" id="0x7F120C1C" />
-    <public type="string" name="guild_cap_upsell_tooltip" id="0x7F120C1D" />
-    <public type="string" name="guild_create_description" id="0x7F120C1E" />
-    <public type="string" name="guild_create_invite_description" id="0x7F120C1F" />
-    <public type="string" name="guild_create_invite_see_more_suggestions" id="0x7F120C20" />
-    <public type="string" name="guild_create_invite_title" id="0x7F120C21" />
-    <public type="string" name="guild_create_title" id="0x7F120C22" />
-    <public type="string" name="guild_create_upload_icon_button_text" id="0x7F120C23" />
-    <public type="string" name="guild_create_upload_icon_label" id="0x7F120C24" />
-    <public type="string" name="guild_create_upload_icon_recommended_size_label" id="0x7F120C25" />
-    <public type="string" name="guild_delete_feedback_accident" id="0x7F120C26" />
-    <public type="string" name="guild_delete_feedback_body" id="0x7F120C27" />
-    <public type="string" name="guild_delete_feedback_header" id="0x7F120C28" />
-    <public type="string" name="guild_delete_feedback_inactive" id="0x7F120C29" />
-    <public type="string" name="guild_delete_feedback_lonely" id="0x7F120C2A" />
-    <public type="string" name="guild_delete_feedback_other" id="0x7F120C2B" />
-    <public type="string" name="guild_delete_feedback_report" id="0x7F120C2C" />
-    <public type="string" name="guild_delete_feedback_template" id="0x7F120C2D" />
-    <public type="string" name="guild_delete_feedback_test" id="0x7F120C2E" />
-    <public type="string" name="guild_delete_feedback_too_hard" id="0x7F120C2F" />
-    <public type="string" name="guild_dicovery_main_view_subtitle" id="0x7F120C30" />
-    <public type="string" name="guild_discovery_all_category_filter" id="0x7F120C31" />
-    <public type="string" name="guild_discovery_category_footer_title" id="0x7F120C32" />
-    <public type="string" name="guild_discovery_category_header" id="0x7F120C33" />
-    <public type="string" name="guild_discovery_category_search_placeholder" id="0x7F120C34" />
-    <public type="string" name="guild_discovery_category_title" id="0x7F120C35" />
-    <public type="string" name="guild_discovery_chat_input_back" id="0x7F120C36" />
-    <public type="string" name="guild_discovery_covid_body" id="0x7F120C37" />
-    <public type="string" name="guild_discovery_covid_button" id="0x7F120C38" />
-    <public type="string" name="guild_discovery_covid_title" id="0x7F120C39" />
-    <public type="string" name="guild_discovery_emojis_tooltip" id="0x7F120C3A" />
-    <public type="string" name="guild_discovery_featured_header" id="0x7F120C3B" />
-    <public type="string" name="guild_discovery_footer_body" id="0x7F120C3C" />
-    <public type="string" name="guild_discovery_header_games_you_play" id="0x7F120C3D" />
-    <public type="string" name="guild_discovery_header_popular_guilds" id="0x7F120C3E" />
-    <public type="string" name="guild_discovery_header_search_results" id="0x7F120C3F" />
-    <public type="string" name="guild_discovery_home_subtitle" id="0x7F120C40" />
-    <public type="string" name="guild_discovery_home_title" id="0x7F120C41" />
-    <public type="string" name="guild_discovery_lurker_follow_news_button" id="0x7F120C42" />
-    <public type="string" name="guild_discovery_main_view_title" id="0x7F120C43" />
-    <public type="string" name="guild_discovery_mobile_search_placeholder" id="0x7F120C44" />
-    <public type="string" name="guild_discovery_popular_header" id="0x7F120C45" />
-    <public type="string" name="guild_discovery_search_empty_body" id="0x7F120C46" />
-    <public type="string" name="guild_discovery_search_empty_category_body" id="0x7F120C47" />
-    <public type="string" name="guild_discovery_search_empty_category_header" id="0x7F120C48" />
-    <public type="string" name="guild_discovery_search_empty_description" id="0x7F120C49" />
-    <public type="string" name="guild_discovery_search_empty_header" id="0x7F120C4A" />
-    <public type="string" name="guild_discovery_search_empty_title" id="0x7F120C4B" />
-    <public type="string" name="guild_discovery_search_enter_cta" id="0x7F120C4C" />
-    <public type="string" name="guild_discovery_search_error" id="0x7F120C4D" />
-    <public type="string" name="guild_discovery_search_header" id="0x7F120C4E" />
-    <public type="string" name="guild_discovery_search_label" id="0x7F120C4F" />
-    <public type="string" name="guild_discovery_search_placeholder" id="0x7F120C50" />
-    <public type="string" name="guild_discovery_search_press_enter" id="0x7F120C51" />
-    <public type="string" name="guild_discovery_search_protip" id="0x7F120C52" />
-    <public type="string" name="guild_discovery_search_results_category_header" id="0x7F120C53" />
-    <public type="string" name="guild_discovery_search_results_header" id="0x7F120C54" />
-    <public type="string" name="guild_discovery_tooltip" id="0x7F120C55" />
-    <public type="string" name="guild_discovery_view_button" id="0x7F120C56" />
-    <public type="string" name="guild_event_ticket_billing_invoice_total_tax_inclusive" id="0x7F120C57" />
-    <public type="string" name="guild_folder_color" id="0x7F120C58" />
-    <public type="string" name="guild_folder_name" id="0x7F120C59" />
-    <public type="string" name="guild_folder_tooltip_a11y_label" id="0x7F120C5A" />
-    <public type="string" name="guild_folder_tooltip_a11y_label_with_expanded_state" id="0x7F120C5B" />
-    <public type="string" name="guild_folder_unnamed" id="0x7F120C5C" />
-    <public type="string" name="guild_folder_updated_success" id="0x7F120C5D" />
-    <public type="string" name="guild_invite_cta" id="0x7F120C5E" />
-    <public type="string" name="guild_invite_expiration_sublabel" id="0x7F120C5F" />
-    <public type="string" name="guild_invite_other_guilds_list_label" id="0x7F120C60" />
-    <public type="string" name="guild_invite_search_no_results" id="0x7F120C61" />
-    <public type="string" name="guild_invite_search_servers_placeholder" id="0x7F120C62" />
-    <public type="string" name="guild_invite_your_guilds_list_label" id="0x7F120C63" />
-    <public type="string" name="guild_join_reason_ask_friends_invite" id="0x7F120C64" />
-    <public type="string" name="guild_join_reason_description_label" id="0x7F120C65" />
-    <public type="string" name="guild_join_reason_existing_community" id="0x7F120C66" />
-    <public type="string" name="guild_join_reason_friend_invite" id="0x7F120C67" />
-    <public type="string" name="guild_join_reason_header" id="0x7F120C68" />
-    <public type="string" name="guild_join_reason_in_app" id="0x7F120C69" />
-    <public type="string" name="guild_join_reason_other" id="0x7F120C6A" />
-    <public type="string" name="guild_join_reason_search_online" id="0x7F120C6B" />
-    <public type="string" name="guild_join_reason_title_label" id="0x7F120C6C" />
-    <public type="string" name="guild_member_avatar_upsell_body" id="0x7F120C6D" />
-    <public type="string" name="guild_member_avatar_upsell_title" id="0x7F120C6E" />
-    <public type="string" name="guild_members_header" id="0x7F120C6F" />
-    <public type="string" name="guild_members_search_no_result" id="0x7F120C70" />
-    <public type="string" name="guild_monetization_app_name" id="0x7F120C71" />
-    <public type="string" name="guild_monetization_enable_ticketing_confirmation_subtitle" id="0x7F120C72" />
-    <public type="string" name="guild_monetization_enable_ticketing_confirmation_title" id="0x7F120C73" />
-    <public type="string" name="guild_monetization_enable_ticketing_cta" id="0x7F120C74" />
-    <public type="string" name="guild_monetization_enable_ticketing_description" id="0x7F120C75" />
-    <public type="string" name="guild_monetization_enable_ticketing_section_title" id="0x7F120C76" />
-    <public type="string" name="guild_monetization_enable_ticketing_select_placeholder" id="0x7F120C77" />
-    <public type="string" name="guild_monetization_enable_ticketing_settings_page_title" id="0x7F120C78" />
-    <public type="string" name="guild_monetization_ticketing_enabled_badge_subtitle" id="0x7F120C79" />
-    <public type="string" name="guild_monetization_ticketing_enabled_badge_title" id="0x7F120C7A" />
-    <public type="string" name="guild_monetization_ticketing_insights_description" id="0x7F120C7B" />
-    <public type="string" name="guild_monetization_ticketing_insights_section" id="0x7F120C7C" />
-    <public type="string" name="guild_monetization_ticketing_settings_page_description" id="0x7F120C7D" />
-    <public type="string" name="guild_monetization_ticketing_settings_page_title" id="0x7F120C7E" />
-    <public type="string" name="guild_owner" id="0x7F120C7F" />
-    <public type="string" name="guild_partner_application_button_pause" id="0x7F120C80" />
-    <public type="string" name="guild_partner_application_category_description" id="0x7F120C81" />
-    <public type="string" name="guild_partner_application_category_label" id="0x7F120C82" />
-    <public type="string" name="guild_partner_application_connect" id="0x7F120C83" />
-    <public type="string" name="guild_partner_application_content_platform" id="0x7F120C84" />
-    <public type="string" name="guild_partner_application_country" id="0x7F120C85" />
-    <public type="string" name="guild_partner_application_creator_connect" id="0x7F120C86" />
-    <public type="string" name="guild_partner_application_creator_must_connect_primary" id="0x7F120C87" />
-    <public type="string" name="guild_partner_application_description_description" id="0x7F120C88" />
-    <public type="string" name="guild_partner_application_description_title" id="0x7F120C89" />
-    <public type="string" name="guild_partner_application_first_name" id="0x7F120C8A" />
-    <public type="string" name="guild_partner_application_has_errors" id="0x7F120C8B" />
-    <public type="string" name="guild_partner_application_invite_link_description" id="0x7F120C8C" />
-    <public type="string" name="guild_partner_application_invite_link_title" id="0x7F120C8D" />
-    <public type="string" name="guild_partner_application_language" id="0x7F120C8E" />
-    <public type="string" name="guild_partner_application_last_name" id="0x7F120C8F" />
-    <public type="string" name="guild_partner_application_other_platform" id="0x7F120C90" />
-    <public type="string" name="guild_partner_application_other_platform_description" id="0x7F120C91" />
-    <public type="string" name="guild_partner_application_other_platform_optional" id="0x7F120C92" />
-    <public type="string" name="guild_partner_application_pause" id="0x7F120C93" />
-    <public type="string" name="guild_partner_application_server_step" id="0x7F120C94" />
-    <public type="string" name="guild_partner_application_server_step_description" id="0x7F120C95" />
-    <public type="string" name="guild_partner_application_server_step_title" id="0x7F120C96" />
-    <public type="string" name="guild_partner_application_subcategory_description" id="0x7F120C97" />
-    <public type="string" name="guild_partner_application_submit_step" id="0x7F120C98" />
-    <public type="string" name="guild_partner_application_submit_step_description" id="0x7F120C99" />
-    <public type="string" name="guild_partner_application_submit_step_description_2" id="0x7F120C9A" />
-    <public type="string" name="guild_partner_application_submit_step_title" id="0x7F120C9B" />
-    <public type="string" name="guild_partner_application_survey_community_team_access" id="0x7F120C9C" />
-    <public type="string" name="guild_partner_application_survey_description" id="0x7F120C9D" />
-    <public type="string" name="guild_partner_application_survey_description_other" id="0x7F120C9E" />
-    <public type="string" name="guild_partner_application_survey_early_access_to_features" id="0x7F120C9F" />
-    <public type="string" name="guild_partner_application_survey_new_ideas_suggestions" id="0x7F120CA0" />
-    <public type="string" name="guild_partner_application_survey_other" id="0x7F120CA1" />
-    <public type="string" name="guild_partner_application_survey_talk_with_other_partners" id="0x7F120CA2" />
-    <public type="string" name="guild_partner_application_survey_title" id="0x7F120CA3" />
-    <public type="string" name="guild_partner_application_title" id="0x7F120CA4" />
-    <public type="string" name="guild_partner_application_type" id="0x7F120CA5" />
-    <public type="string" name="guild_partner_application_type_brand" id="0x7F120CA6" />
-    <public type="string" name="guild_partner_application_type_content" id="0x7F120CA7" />
-    <public type="string" name="guild_partner_application_type_fan" id="0x7F120CA8" />
-    <public type="string" name="guild_partner_application_type_other" id="0x7F120CA9" />
-    <public type="string" name="guild_partner_application_type_software" id="0x7F120CAA" />
-    <public type="string" name="guild_partner_application_user_step" id="0x7F120CAB" />
-    <public type="string" name="guild_partner_application_user_step_description" id="0x7F120CAC" />
-    <public type="string" name="guild_partner_application_user_step_description_content_creator" id="0x7F120CAD" />
-    <public type="string" name="guild_partner_application_user_step_title" id="0x7F120CAE" />
-    <public type="string" name="guild_partner_application_website" id="0x7F120CAF" />
-    <public type="string" name="guild_partner_application_why_you_description" id="0x7F120CB0" />
-    <public type="string" name="guild_partner_application_why_you_title" id="0x7F120CB1" />
-    <public type="string" name="guild_partnered" id="0x7F120CB2" />
-    <public type="string" name="guild_popout_unavailable_flavor" id="0x7F120CB3" />
-    <public type="string" name="guild_popout_unavailable_header" id="0x7F120CB4" />
-    <public type="string" name="guild_popout_view_server_button" id="0x7F120CB5" />
-    <public type="string" name="guild_premium" id="0x7F120CB6" />
-    <public type="string" name="guild_profile_join_server_button" id="0x7F120CB7" />
-    <public type="string" name="guild_progress_cta" id="0x7F120CB8" />
-    <public type="string" name="guild_progress_current_step" id="0x7F120CB9" />
-    <public type="string" name="guild_progress_finish" id="0x7F120CBA" />
-    <public type="string" name="guild_progress_skip" id="0x7F120CBB" />
-    <public type="string" name="guild_progress_steps" id="0x7F120CBC" />
-    <public type="string" name="guild_progress_title" id="0x7F120CBD" />
-    <public type="string" name="guild_region_deprecated_blurb" id="0x7F120CBE" />
-    <public type="string" name="guild_role_actions_menu_label" id="0x7F120CBF" />
-    <public type="string" name="guild_rules_edit_link" id="0x7F120CC0" />
-    <public type="string" name="guild_rules_header" id="0x7F120CC1" />
-    <public type="string" name="guild_rules_subheader" id="0x7F120CC2" />
-    <public type="string" name="guild_security_req_mfa_body" id="0x7F120CC3" />
-    <public type="string" name="guild_security_req_mfa_enable" id="0x7F120CC4" />
-    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7F120CC5" />
-    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7F120CC6" />
-    <public type="string" name="guild_security_req_mfa_label" id="0x7F120CC7" />
-    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7F120CC8" />
-    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7F120CC9" />
-    <public type="string" name="guild_security_req_owner_only" id="0x7F120CCA" />
-    <public type="string" name="guild_select" id="0x7F120CCB" />
-    <public type="string" name="guild_settings_action_filter_bot_add" id="0x7F120CCC" />
-    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7F120CCD" />
-    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7F120CCE" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7F120CCF" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7F120CD0" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7F120CD1" />
-    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7F120CD2" />
-    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7F120CD3" />
-    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7F120CD4" />
-    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7F120CD5" />
-    <public type="string" name="guild_settings_action_filter_guild_scheduled_event_create" id="0x7F120CD6" />
-    <public type="string" name="guild_settings_action_filter_guild_scheduled_event_delete" id="0x7F120CD7" />
-    <public type="string" name="guild_settings_action_filter_guild_scheduled_event_update" id="0x7F120CD8" />
-    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7F120CD9" />
-    <public type="string" name="guild_settings_action_filter_integration_create" id="0x7F120CDA" />
-    <public type="string" name="guild_settings_action_filter_integration_delete" id="0x7F120CDB" />
-    <public type="string" name="guild_settings_action_filter_integration_update" id="0x7F120CDC" />
-    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7F120CDD" />
-    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7F120CDE" />
-    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7F120CDF" />
-    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7F120CE0" />
-    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7F120CE1" />
-    <public type="string" name="guild_settings_action_filter_member_disconnect" id="0x7F120CE2" />
-    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7F120CE3" />
-    <public type="string" name="guild_settings_action_filter_member_move" id="0x7F120CE4" />
-    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7F120CE5" />
-    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7F120CE6" />
-    <public type="string" name="guild_settings_action_filter_member_update" id="0x7F120CE7" />
-    <public type="string" name="guild_settings_action_filter_message_bulk_delete" id="0x7F120CE8" />
-    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7F120CE9" />
-    <public type="string" name="guild_settings_action_filter_message_pin" id="0x7F120CEA" />
-    <public type="string" name="guild_settings_action_filter_message_unpin" id="0x7F120CEB" />
-    <public type="string" name="guild_settings_action_filter_role_create" id="0x7F120CEC" />
-    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7F120CED" />
-    <public type="string" name="guild_settings_action_filter_role_update" id="0x7F120CEE" />
-    <public type="string" name="guild_settings_action_filter_stage_instance_create" id="0x7F120CEF" />
-    <public type="string" name="guild_settings_action_filter_stage_instance_delete" id="0x7F120CF0" />
-    <public type="string" name="guild_settings_action_filter_stage_instance_update" id="0x7F120CF1" />
-    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7F120CF2" />
-    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7F120CF3" />
-    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7F120CF4" />
-    <public type="string" name="guild_settings_audit_log_bot_add" id="0x7F120CF5" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7F120CF6" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7F120CF7" />
-    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7F120CF8" />
-    <public type="string" name="guild_settings_audit_log_channel_default_auto_archive_duration_change" id="0x7F120CF9" />
-    <public type="string" name="guild_settings_audit_log_channel_default_auto_archive_duration_create" id="0x7F120CFA" />
-    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7F120CFB" />
-    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7F120CFC" />
-    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7F120CFD" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7F120CFE" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7F120CFF" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7F120D00" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7F120D01" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7F120D02" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7F120D03" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7F120D04" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_reset" id="0x7F120D05" />
-    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7F120D06" />
-    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7F120D07" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7F120D08" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7F120D09" />
-    <public type="string" name="guild_settings_audit_log_channel_rtc_region_override_change" id="0x7F120D0A" />
-    <public type="string" name="guild_settings_audit_log_channel_rtc_region_override_create" id="0x7F120D0B" />
-    <public type="string" name="guild_settings_audit_log_channel_rtc_region_override_delete" id="0x7F120D0C" />
-    <public type="string" name="guild_settings_audit_log_channel_stage_create" id="0x7F120D0D" />
-    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7F120D0E" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7F120D0F" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_clear" id="0x7F120D10" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7F120D11" />
-    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7F120D12" />
-    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7F120D13" />
-    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7F120D14" />
-    <public type="string" name="guild_settings_audit_log_channel_user_limit_change" id="0x7F120D15" />
-    <public type="string" name="guild_settings_audit_log_channel_user_limit_create" id="0x7F120D16" />
-    <public type="string" name="guild_settings_audit_log_channel_video_quality_mode_change" id="0x7F120D17" />
-    <public type="string" name="guild_settings_audit_log_channel_video_quality_mode_create" id="0x7F120D18" />
-    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7F120D19" />
-    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7F120D1A" />
-    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7F120D1B" />
-    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7F120D1C" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7F120D1D" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7F120D1E" />
-    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7F120D1F" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7F120D20" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7F120D21" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7F120D22" />
-    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7F120D23" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7F120D24" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7F120D25" />
-    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7F120D26" />
-    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7F120D27" />
-    <public type="string" name="guild_settings_audit_log_guild_discovery_splash_hash_change" id="0x7F120D28" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7F120D29" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7F120D2A" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7F120D2B" />
-    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7F120D2C" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7F120D2D" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7F120D2E" />
-    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7F120D2F" />
-    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7F120D30" />
-    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7F120D31" />
-    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7F120D32" />
-    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_change" id="0x7F120D33" />
-    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_clear" id="0x7F120D34" />
-    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7F120D35" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7F120D36" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7F120D37" />
-    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7F120D38" />
-    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_change" id="0x7F120D39" />
-    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_clear" id="0x7F120D3A" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7F120D3B" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7F120D3C" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7F120D3D" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7F120D3E" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7F120D3F" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7F120D40" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7F120D41" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7F120D42" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7F120D43" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7F120D44" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7F120D45" />
-    <public type="string" name="guild_settings_audit_log_integration_create" id="0x7F120D46" />
-    <public type="string" name="guild_settings_audit_log_integration_delete" id="0x7F120D47" />
-    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_off" id="0x7F120D48" />
-    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_on" id="0x7F120D49" />
-    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_kick_from_server" id="0x7F120D4A" />
-    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_remove_synced_role" id="0x7F120D4B" />
-    <public type="string" name="guild_settings_audit_log_integration_expire_grace_period" id="0x7F120D4C" />
-    <public type="string" name="guild_settings_audit_log_integration_update" id="0x7F120D4D" />
-    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7F120D4E" />
-    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7F120D4F" />
-    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7F120D50" />
-    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7F120D51" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7F120D52" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7F120D53" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7F120D54" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7F120D55" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7F120D56" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7F120D57" />
-    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7F120D58" />
-    <public type="string" name="guild_settings_audit_log_load_more" id="0x7F120D59" />
-    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7F120D5A" />
-    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7F120D5B" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7F120D5C" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7F120D5D" />
-    <public type="string" name="guild_settings_audit_log_member_disconnect" id="0x7F120D5E" />
-    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7F120D5F" />
-    <public type="string" name="guild_settings_audit_log_member_move" id="0x7F120D60" />
-    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7F120D61" />
-    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7F120D62" />
-    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7F120D63" />
-    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7F120D64" />
-    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7F120D65" />
-    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7F120D66" />
-    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7F120D67" />
-    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7F120D68" />
-    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7F120D69" />
-    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7F120D6A" />
-    <public type="string" name="guild_settings_audit_log_member_update" id="0x7F120D6B" />
-    <public type="string" name="guild_settings_audit_log_message_bulk_delete" id="0x7F120D6C" />
-    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7F120D6D" />
-    <public type="string" name="guild_settings_audit_log_message_pin" id="0x7F120D6E" />
-    <public type="string" name="guild_settings_audit_log_message_unpin" id="0x7F120D6F" />
-    <public type="string" name="guild_settings_audit_log_role_color" id="0x7F120D70" />
-    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7F120D71" />
-    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7F120D72" />
-    <public type="string" name="guild_settings_audit_log_role_create" id="0x7F120D73" />
-    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7F120D74" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7F120D75" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7F120D76" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7F120D77" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7F120D78" />
-    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7F120D79" />
-    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7F120D7A" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7F120D7B" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7F120D7C" />
-    <public type="string" name="guild_settings_audit_log_role_update" id="0x7F120D7D" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_create" id="0x7F120D7E" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_delete" id="0x7F120D7F" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_description_create" id="0x7F120D80" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_entity_type_none" id="0x7F120D81" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_entity_type_stage_instance" id="0x7F120D82" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_name_create" id="0x7F120D83" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_skus_create" id="0x7F120D84" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_status_active" id="0x7F120D85" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_status_canceled" id="0x7F120D86" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_status_completed" id="0x7F120D87" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_status_scheduled" id="0x7F120D88" />
-    <public type="string" name="guild_settings_audit_log_scheduled_event_update" id="0x7F120D89" />
-    <public type="string" name="guild_settings_audit_log_stage_instance_create" id="0x7F120D8A" />
-    <public type="string" name="guild_settings_audit_log_stage_instance_delete" id="0x7F120D8B" />
-    <public type="string" name="guild_settings_audit_log_stage_instance_delete_no_user" id="0x7F120D8C" />
-    <public type="string" name="guild_settings_audit_log_stage_instance_privacy_level_guild_only" id="0x7F120D8D" />
-    <public type="string" name="guild_settings_audit_log_stage_instance_privacy_level_public" id="0x7F120D8E" />
-    <public type="string" name="guild_settings_audit_log_stage_instance_update" id="0x7F120D8F" />
-    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7F120D90" />
-    <public type="string" name="guild_settings_audit_log_unknown_action" id="0x7F120D91" />
-    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7F120D92" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7F120D93" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7F120D94" />
-    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7F120D95" />
-    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7F120D96" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7F120D97" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7F120D98" />
-    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7F120D99" />
-    <public type="string" name="guild_settings_banner_recommend" id="0x7F120D9A" />
-    <public type="string" name="guild_settings_community" id="0x7F120D9B" />
-    <public type="string" name="guild_settings_community_administrator_only" id="0x7F120D9C" />
-    <public type="string" name="guild_settings_community_disable_community" id="0x7F120D9D" />
-    <public type="string" name="guild_settings_community_disable_community_description" id="0x7F120D9E" />
-    <public type="string" name="guild_settings_community_disable_community_dialog_message" id="0x7F120D9F" />
-    <public type="string" name="guild_settings_community_disable_community_dialog_title" id="0x7F120DA0" />
-    <public type="string" name="guild_settings_community_disable_public_confirm_default_title" id="0x7F120DA1" />
-    <public type="string" name="guild_settings_community_enable_community" id="0x7F120DA2" />
-    <public type="string" name="guild_settings_community_intro_body" id="0x7F120DA3" />
-    <public type="string" name="guild_settings_community_intro_details" id="0x7F120DA4" />
-    <public type="string" name="guild_settings_community_intro_details_disclaimer_mobile" id="0x7F120DA5" />
-    <public type="string" name="guild_settings_community_intro_details_mobile" id="0x7F120DA6" />
-    <public type="string" name="guild_settings_community_intro_header" id="0x7F120DA7" />
-    <public type="string" name="guild_settings_community_intro_learn_more" id="0x7F120DA8" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_body" id="0x7F120DA9" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_body_mobile" id="0x7F120DAA" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_header" id="0x7F120DAB" />
-    <public type="string" name="guild_settings_community_intro_upsell_analytics_tooltip" id="0x7F120DAC" />
-    <public type="string" name="guild_settings_community_intro_upsell_discovery_body" id="0x7F120DAD" />
-    <public type="string" name="guild_settings_community_intro_upsell_discovery_header" id="0x7F120DAE" />
-    <public type="string" name="guild_settings_community_intro_upsell_partner_body" id="0x7F120DAF" />
-    <public type="string" name="guild_settings_community_intro_upsell_partner_header" id="0x7F120DB0" />
-    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_body" id="0x7F120DB1" />
-    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_header" id="0x7F120DB2" />
-    <public type="string" name="guild_settings_community_locale_help" id="0x7F120DB3" />
-    <public type="string" name="guild_settings_community_mod_channel_help" id="0x7F120DB4" />
-    <public type="string" name="guild_settings_community_mod_channel_help_mobile" id="0x7F120DB5" />
-    <public type="string" name="guild_settings_community_mod_channel_selector_title" id="0x7F120DB6" />
-    <public type="string" name="guild_settings_community_mod_channel_title" id="0x7F120DB7" />
-    <public type="string" name="guild_settings_community_rules_channel_help" id="0x7F120DB8" />
-    <public type="string" name="guild_settings_community_rules_channel_help_mobile" id="0x7F120DB9" />
-    <public type="string" name="guild_settings_community_upsell_body" id="0x7F120DBA" />
-    <public type="string" name="guild_settings_community_upsell_button_analytics" id="0x7F120DBB" />
-    <public type="string" name="guild_settings_community_upsell_button_discovery" id="0x7F120DBC" />
-    <public type="string" name="guild_settings_community_upsell_button_welcome_screen" id="0x7F120DBD" />
-    <public type="string" name="guild_settings_community_upsell_header" id="0x7F120DBE" />
-    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7F120DBF" />
-    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7F120DC0" />
-    <public type="string" name="guild_settings_default_notifications_large_guild_notify_all" id="0x7F120DC1" />
-    <public type="string" name="guild_settings_disable_discoverable" id="0x7F120DC2" />
-    <public type="string" name="guild_settings_discovery_admin_only" id="0x7F120DC3" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa" id="0x7F120DC4" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa_description" id="0x7F120DC5" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa_description_failing" id="0x7F120DC6" />
-    <public type="string" name="guild_settings_discovery_checklist_2fa_failing" id="0x7F120DC7" />
-    <public type="string" name="guild_settings_discovery_checklist_abide_by_guidelines" id="0x7F120DC8" />
-    <public type="string" name="guild_settings_discovery_checklist_age" id="0x7F120DC9" />
-    <public type="string" name="guild_settings_discovery_checklist_age_description" id="0x7F120DCA" />
-    <public type="string" name="guild_settings_discovery_checklist_age_description_failing" id="0x7F120DCB" />
-    <public type="string" name="guild_settings_discovery_checklist_age_failing" id="0x7F120DCC" />
-    <public type="string" name="guild_settings_discovery_checklist_bad_standing" id="0x7F120DCD" />
-    <public type="string" name="guild_settings_discovery_checklist_change_channel_categories" id="0x7F120DCE" />
-    <public type="string" name="guild_settings_discovery_checklist_change_channel_names" id="0x7F120DCF" />
-    <public type="string" name="guild_settings_discovery_checklist_change_description" id="0x7F120DD0" />
-    <public type="string" name="guild_settings_discovery_checklist_change_name" id="0x7F120DD1" />
-    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action" id="0x7F120DD2" />
-    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action_details" id="0x7F120DD3" />
-    <public type="string" name="guild_settings_discovery_checklist_communicator_progress_label" id="0x7F120DD4" />
-    <public type="string" name="guild_settings_discovery_checklist_engagement_failing" id="0x7F120DD5" />
-    <public type="string" name="guild_settings_discovery_checklist_good_standing" id="0x7F120DD6" />
-    <public type="string" name="guild_settings_discovery_checklist_health_definitions_intro" id="0x7F120DD7" />
-    <public type="string" name="guild_settings_discovery_checklist_health_view_details" id="0x7F120DD8" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy" id="0x7F120DD9" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description" id="0x7F120DDA" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description_failing" id="0x7F120DDB" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending" id="0x7F120DDC" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending_size" id="0x7F120DDD" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_failing" id="0x7F120DDE" />
-    <public type="string" name="guild_settings_discovery_checklist_healthy_pending" id="0x7F120DDF" />
-    <public type="string" name="guild_settings_discovery_checklist_loading" id="0x7F120DE0" />
-    <public type="string" name="guild_settings_discovery_checklist_nsfw" id="0x7F120DE1" />
-    <public type="string" name="guild_settings_discovery_checklist_nsfw_description" id="0x7F120DE2" />
-    <public type="string" name="guild_settings_discovery_checklist_nsfw_failing" id="0x7F120DE3" />
-    <public type="string" name="guild_settings_discovery_checklist_progress_requirement_label" id="0x7F120DE4" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_failing" id="0x7F120DE5" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action" id="0x7F120DE6" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action_details_updated" id="0x7F120DE7" />
-    <public type="string" name="guild_settings_discovery_checklist_retention_progress_label" id="0x7F120DE8" />
-    <public type="string" name="guild_settings_discovery_checklist_safe" id="0x7F120DE9" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_description" id="0x7F120DEA" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing" id="0x7F120DEB" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing_guidelines" id="0x7F120DEC" />
-    <public type="string" name="guild_settings_discovery_checklist_safe_failing" id="0x7F120DED" />
-    <public type="string" name="guild_settings_discovery_checklist_score_explain" id="0x7F120DEE" />
-    <public type="string" name="guild_settings_discovery_checklist_size" id="0x7F120DEF" />
-    <public type="string" name="guild_settings_discovery_checklist_size_description" id="0x7F120DF0" />
-    <public type="string" name="guild_settings_discovery_checklist_size_description_failing" id="0x7F120DF1" />
-    <public type="string" name="guild_settings_discovery_checklist_size_description_failing_partners" id="0x7F120DF2" />
-    <public type="string" name="guild_settings_discovery_checklist_size_failing" id="0x7F120DF3" />
-    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action" id="0x7F120DF4" />
-    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action_details" id="0x7F120DF5" />
-    <public type="string" name="guild_settings_discovery_checklist_visitor_progress_label" id="0x7F120DF6" />
-    <public type="string" name="guild_settings_discovery_description" id="0x7F120DF7" />
-    <public type="string" name="guild_settings_discovery_disable_public_confirm_text" id="0x7F120DF8" />
-    <public type="string" name="guild_settings_discovery_disqualified" id="0x7F120DF9" />
-    <public type="string" name="guild_settings_discovery_disqualified_description" id="0x7F120DFA" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_description" id="0x7F120DFB" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_disable" id="0x7F120DFC" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_enable" id="0x7F120DFD" />
-    <public type="string" name="guild_settings_discovery_emoji_discoverability_title" id="0x7F120DFE" />
-    <public type="string" name="guild_settings_discovery_enabled_modal_body" id="0x7F120DFF" />
-    <public type="string" name="guild_settings_discovery_enabled_modal_dismiss" id="0x7F120E00" />
-    <public type="string" name="guild_settings_discovery_enabled_modal_header" id="0x7F120E01" />
-    <public type="string" name="guild_settings_discovery_header" id="0x7F120E02" />
-    <public type="string" name="guild_settings_discovery_locale_help" id="0x7F120E03" />
-    <public type="string" name="guild_settings_discovery_pending_healthy" id="0x7F120E04" />
-    <public type="string" name="guild_settings_discovery_preview_description" id="0x7F120E05" />
-    <public type="string" name="guild_settings_discovery_primary_category_description" id="0x7F120E06" />
-    <public type="string" name="guild_settings_discovery_primary_category_title" id="0x7F120E07" />
-    <public type="string" name="guild_settings_discovery_requirements_not_met" id="0x7F120E08" />
-    <public type="string" name="guild_settings_discovery_search_keywords_description" id="0x7F120E09" />
-    <public type="string" name="guild_settings_discovery_search_keywords_title" id="0x7F120E0A" />
-    <public type="string" name="guild_settings_discovery_subcategory_title" id="0x7F120E0B" />
-    <public type="string" name="guild_settings_emoji_alias" id="0x7F120E0C" />
-    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7F120E0D" />
-    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7F120E0E" />
-    <public type="string" name="guild_settings_enable_discoverable" id="0x7F120E0F" />
-    <public type="string" name="guild_settings_example_tooltip" id="0x7F120E10" />
-    <public type="string" name="guild_settings_filter_action" id="0x7F120E11" />
-    <public type="string" name="guild_settings_filter_all" id="0x7F120E12" />
-    <public type="string" name="guild_settings_filter_all_actions" id="0x7F120E13" />
-    <public type="string" name="guild_settings_filter_all_users" id="0x7F120E14" />
-    <public type="string" name="guild_settings_filter_user" id="0x7F120E15" />
-    <public type="string" name="guild_settings_filtered_action" id="0x7F120E16" />
-    <public type="string" name="guild_settings_filtered_user" id="0x7F120E17" />
-    <public type="string" name="guild_settings_follower_analytics" id="0x7F120E18" />
-    <public type="string" name="guild_settings_follower_analytics_description" id="0x7F120E19" />
-    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7F120E1A" />
-    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7F120E1B" />
-    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7F120E1C" />
-    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7F120E1D" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7F120E1E" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7F120E1F" />
-    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7F120E20" />
-    <public type="string" name="guild_settings_follower_analytics_post" id="0x7F120E21" />
-    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7F120E22" />
-    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7F120E23" />
-    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7F120E24" />
-    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7F120E25" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7F120E26" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7F120E27" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7F120E28" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7F120E29" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7F120E2A" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7F120E2B" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7F120E2C" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7F120E2D" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7F120E2E" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7F120E2F" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7F120E30" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7F120E31" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7F120E32" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7F120E33" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7F120E34" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7F120E35" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7F120E36" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7F120E37" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7F120E38" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7F120E39" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7F120E3A" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7F120E3B" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_sticker" id="0x7F120E3C" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7F120E3D" />
-    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7F120E3E" />
-    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7F120E3F" />
-    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7F120E40" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7F120E41" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7F120E42" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7F120E43" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7F120E44" />
-    <public type="string" name="guild_settings_icon_recommend" id="0x7F120E45" />
-    <public type="string" name="guild_settings_label_audit_log" id="0x7F120E46" />
-    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7F120E47" />
-    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7F120E48" />
-    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7F120E49" />
-    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7F120E4A" />
-    <public type="string" name="guild_settings_member_verification" id="0x7F120E4B" />
-    <public type="string" name="guild_settings_member_verification_actioned_by" id="0x7F120E4C" />
-    <public type="string" name="guild_settings_member_verification_application_submitted_time" id="0x7F120E4D" />
-    <public type="string" name="guild_settings_member_verification_applications_title" id="0x7F120E4E" />
-    <public type="string" name="guild_settings_member_verification_approve_application" id="0x7F120E4F" />
-    <public type="string" name="guild_settings_member_verification_approved" id="0x7F120E50" />
-    <public type="string" name="guild_settings_member_verification_auto_approval" id="0x7F120E51" />
-    <public type="string" name="guild_settings_member_verification_auto_approval_description" id="0x7F120E52" />
-    <public type="string" name="guild_settings_member_verification_ban_user" id="0x7F120E53" />
-    <public type="string" name="guild_settings_member_verification_banned" id="0x7F120E54" />
-    <public type="string" name="guild_settings_member_verification_denied" id="0x7F120E55" />
-    <public type="string" name="guild_settings_member_verification_deny_and_ban_application" id="0x7F120E56" />
-    <public type="string" name="guild_settings_member_verification_deny_application" id="0x7F120E57" />
-    <public type="string" name="guild_settings_member_verification_deny_modal_title" id="0x7F120E58" />
-    <public type="string" name="guild_settings_member_verification_description" id="0x7F120E59" />
-    <public type="string" name="guild_settings_member_verification_description_coming_soon" id="0x7F120E5A" />
-    <public type="string" name="guild_settings_member_verification_description_placeholder" id="0x7F120E5B" />
-    <public type="string" name="guild_settings_member_verification_description_title" id="0x7F120E5C" />
-    <public type="string" name="guild_settings_member_verification_empty_approved_applications_body" id="0x7F120E5D" />
-    <public type="string" name="guild_settings_member_verification_empty_approved_applications_title" id="0x7F120E5E" />
-    <public type="string" name="guild_settings_member_verification_empty_pending_applications_body" id="0x7F120E5F" />
-    <public type="string" name="guild_settings_member_verification_empty_pending_applications_title" id="0x7F120E60" />
-    <public type="string" name="guild_settings_member_verification_empty_rejected_applications_body" id="0x7F120E61" />
-    <public type="string" name="guild_settings_member_verification_empty_rejected_applications_title" id="0x7F120E62" />
-    <public type="string" name="guild_settings_member_verification_enable_reminder" id="0x7F120E63" />
-    <public type="string" name="guild_settings_member_verification_enabled" id="0x7F120E64" />
-    <public type="string" name="guild_settings_member_verification_enabled_second_line" id="0x7F120E65" />
-    <public type="string" name="guild_settings_member_verification_example_guild_name" id="0x7F120E66" />
-    <public type="string" name="guild_settings_member_verification_intro_button" id="0x7F120E67" />
-    <public type="string" name="guild_settings_member_verification_manual_approval" id="0x7F120E68" />
-    <public type="string" name="guild_settings_member_verification_manual_approval_description" id="0x7F120E69" />
-    <public type="string" name="guild_settings_member_verification_pending" id="0x7F120E6A" />
-    <public type="string" name="guild_settings_member_verification_preview" id="0x7F120E6B" />
-    <public type="string" name="guild_settings_member_verification_preview_description" id="0x7F120E6C" />
-    <public type="string" name="guild_settings_member_verification_preview_enabled_title" id="0x7F120E6D" />
-    <public type="string" name="guild_settings_member_verification_preview_title" id="0x7F120E6E" />
-    <public type="string" name="guild_settings_member_verification_progress_will_save" id="0x7F120E6F" />
-    <public type="string" name="guild_settings_member_verification_reason_title" id="0x7F120E70" />
-    <public type="string" name="guild_settings_member_verification_rejected" id="0x7F120E71" />
-    <public type="string" name="guild_settings_member_verification_review_application_description" id="0x7F120E72" />
-    <public type="string" name="guild_settings_member_verification_review_application_title" id="0x7F120E73" />
-    <public type="string" name="guild_settings_member_verification_review_approved_applications" id="0x7F120E74" />
-    <public type="string" name="guild_settings_member_verification_review_pending_applications" id="0x7F120E75" />
-    <public type="string" name="guild_settings_member_verification_review_rejected_applications" id="0x7F120E76" />
-    <public type="string" name="guild_settings_member_verification_screen_title" id="0x7F120E77" />
-    <public type="string" name="guild_settings_members_add_role" id="0x7F120E78" />
-    <public type="string" name="guild_settings_members_display_role" id="0x7F120E79" />
-    <public type="string" name="guild_settings_members_remove_role" id="0x7F120E7A" />
-    <public type="string" name="guild_settings_members_server_members" id="0x7F120E7B" />
-    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7F120E7C" />
-    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7F120E7D" />
-    <public type="string" name="guild_settings_overview_tier_info" id="0x7F120E7E" />
-    <public type="string" name="guild_settings_partner_and_discovery_disable_public_confirm_text" id="0x7F120E7F" />
-    <public type="string" name="guild_settings_partner_checklist_age_description" id="0x7F120E80" />
-    <public type="string" name="guild_settings_partner_checklist_age_description_failing" id="0x7F120E81" />
-    <public type="string" name="guild_settings_partner_checklist_failing_header" id="0x7F120E82" />
-    <public type="string" name="guild_settings_partner_checklist_failing_subheader" id="0x7F120E83" />
-    <public type="string" name="guild_settings_partner_checklist_health_view_details" id="0x7F120E84" />
-    <public type="string" name="guild_settings_partner_checklist_healthy_description" id="0x7F120E85" />
-    <public type="string" name="guild_settings_partner_checklist_healthy_description_failing" id="0x7F120E86" />
-    <public type="string" name="guild_settings_partner_checklist_healthy_description_pending" id="0x7F120E87" />
-    <public type="string" name="guild_settings_partner_checklist_healthy_description_pending_size" id="0x7F120E88" />
-    <public type="string" name="guild_settings_partner_checklist_passing_header" id="0x7F120E89" />
-    <public type="string" name="guild_settings_partner_checklist_passing_subheader" id="0x7F120E8A" />
-    <public type="string" name="guild_settings_partner_checklist_size" id="0x7F120E8B" />
-    <public type="string" name="guild_settings_partner_checklist_size_description" id="0x7F120E8C" />
-    <public type="string" name="guild_settings_partner_checklist_size_description_failing" id="0x7F120E8D" />
-    <public type="string" name="guild_settings_partner_checklist_size_failing" id="0x7F120E8E" />
-    <public type="string" name="guild_settings_partner_disable_public_confirm_text" id="0x7F120E8F" />
-    <public type="string" name="guild_settings_partner_intro_apply_button" id="0x7F120E90" />
-    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_only_owner" id="0x7F120E91" />
-    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_pending" id="0x7F120E92" />
-    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_rejected" id="0x7F120E93" />
-    <public type="string" name="guild_settings_partner_intro_apply_details" id="0x7F120E94" />
-    <public type="string" name="guild_settings_partner_intro_body" id="0x7F120E95" />
-    <public type="string" name="guild_settings_partner_intro_cooldown" id="0x7F120E96" />
-    <public type="string" name="guild_settings_partner_intro_cooldown_counter" id="0x7F120E97" />
-    <public type="string" name="guild_settings_partner_intro_header" id="0x7F120E98" />
-    <public type="string" name="guild_settings_partner_intro_pending" id="0x7F120E99" />
-    <public type="string" name="guild_settings_partner_intro_rejected" id="0x7F120E9A" />
-    <public type="string" name="guild_settings_partner_intro_upsell_branding_body" id="0x7F120E9B" />
-    <public type="string" name="guild_settings_partner_intro_upsell_branding_header" id="0x7F120E9C" />
-    <public type="string" name="guild_settings_partner_intro_upsell_perks_body" id="0x7F120E9D" />
-    <public type="string" name="guild_settings_partner_intro_upsell_perks_header" id="0x7F120E9E" />
-    <public type="string" name="guild_settings_partner_intro_upsell_recognition_body" id="0x7F120E9F" />
-    <public type="string" name="guild_settings_partner_intro_upsell_recognition_header" id="0x7F120EA0" />
-    <public type="string" name="guild_settings_partner_not_verified" id="0x7F120EA1" />
-    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7F120EA2" />
-    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7F120EA3" />
-    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7F120EA4" />
-    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7F120EA5" />
-    <public type="string" name="guild_settings_premium_guild_title" id="0x7F120EA6" />
-    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7F120EA7" />
-    <public type="string" name="guild_settings_premium_upsell_body_perk_guild_subscription_discount" id="0x7F120EA8" />
-    <public type="string" name="guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions" id="0x7F120EA9" />
-    <public type="string" name="guild_settings_premium_upsell_body_perk_num_guild_subscriptions" id="0x7F120EAA" />
-    <public type="string" name="guild_settings_premium_upsell_heading_primary" id="0x7F120EAB" />
-    <public type="string" name="guild_settings_premium_upsell_heading_secondary" id="0x7F120EAC" />
-    <public type="string" name="guild_settings_premium_upsell_heading_secondary_premium_user" id="0x7F120EAD" />
-    <public type="string" name="guild_settings_premium_upsell_heading_tertiary_premium_user" id="0x7F120EAE" />
-    <public type="string" name="guild_settings_premium_upsell_learn_more" id="0x7F120EAF" />
-    <public type="string" name="guild_settings_premium_upsell_subheading" id="0x7F120EB0" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_extra_android" id="0x7F120EB1" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_extra_ios" id="0x7F120EB2" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_extra_ios_voiceover_label" id="0x7F120EB3" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1" id="0x7F120EB4" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1_mobile" id="0x7F120EB5" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2" id="0x7F120EB6" />
-    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2_mobile" id="0x7F120EB7" />
-    <public type="string" name="guild_settings_public_mod_channel_title" id="0x7F120EB8" />
-    <public type="string" name="guild_settings_public_no_option_selected" id="0x7F120EB9" />
-    <public type="string" name="guild_settings_public_update_failed" id="0x7F120EBA" />
-    <public type="string" name="guild_settings_public_welcome" id="0x7F120EBB" />
-    <public type="string" name="guild_settings_public_welcome_add_recommended_channel" id="0x7F120EBC" />
-    <public type="string" name="guild_settings_public_welcome_channel_delete" id="0x7F120EBD" />
-    <public type="string" name="guild_settings_public_welcome_channel_description_placeholder" id="0x7F120EBE" />
-    <public type="string" name="guild_settings_public_welcome_channel_edit" id="0x7F120EBF" />
-    <public type="string" name="guild_settings_public_welcome_channel_move_down" id="0x7F120EC0" />
-    <public type="string" name="guild_settings_public_welcome_channel_move_up" id="0x7F120EC1" />
-    <public type="string" name="guild_settings_public_welcome_description_placeholder" id="0x7F120EC2" />
-    <public type="string" name="guild_settings_public_welcome_enable_reminder" id="0x7F120EC3" />
-    <public type="string" name="guild_settings_public_welcome_enabled" id="0x7F120EC4" />
-    <public type="string" name="guild_settings_public_welcome_enabled_second_line" id="0x7F120EC5" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_description_1" id="0x7F120EC6" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_description_2" id="0x7F120EC7" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_description_3" id="0x7F120EC8" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_name_1" id="0x7F120EC9" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_name_2" id="0x7F120ECA" />
-    <public type="string" name="guild_settings_public_welcome_example_channel_name_3" id="0x7F120ECB" />
-    <public type="string" name="guild_settings_public_welcome_example_description" id="0x7F120ECC" />
-    <public type="string" name="guild_settings_public_welcome_example_title" id="0x7F120ECD" />
-    <public type="string" name="guild_settings_public_welcome_intro_button" id="0x7F120ECE" />
-    <public type="string" name="guild_settings_public_welcome_intro_text" id="0x7F120ECF" />
-    <public type="string" name="guild_settings_public_welcome_invalid_channel" id="0x7F120ED0" />
-    <public type="string" name="guild_settings_public_welcome_only_viewable_channels" id="0x7F120ED1" />
-    <public type="string" name="guild_settings_public_welcome_pick_channel" id="0x7F120ED2" />
-    <public type="string" name="guild_settings_public_welcome_preview" id="0x7F120ED3" />
-    <public type="string" name="guild_settings_public_welcome_progress_will_save" id="0x7F120ED4" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_add" id="0x7F120ED5" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_edit" id="0x7F120ED6" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channels_description" id="0x7F120ED7" />
-    <public type="string" name="guild_settings_public_welcome_recommended_channels_title" id="0x7F120ED8" />
-    <public type="string" name="guild_settings_public_welcome_select_a_channel" id="0x7F120ED9" />
-    <public type="string" name="guild_settings_public_welcome_set_description" id="0x7F120EDA" />
-    <public type="string" name="guild_settings_public_welcome_settings_text" id="0x7F120EDB" />
-    <public type="string" name="guild_settings_public_welcome_title" id="0x7F120EDC" />
-    <public type="string" name="guild_settings_public_welcome_update_failure" id="0x7F120EDD" />
-    <public type="string" name="guild_settings_server_banner" id="0x7F120EDE" />
-    <public type="string" name="guild_settings_server_invite_background" id="0x7F120EDF" />
-    <public type="string" name="guild_settings_splash_info" id="0x7F120EE0" />
-    <public type="string" name="guild_settings_splash_recommend" id="0x7F120EE1" />
-    <public type="string" name="guild_settings_stickers" id="0x7F120EE2" />
-    <public type="string" name="guild_settings_stickers_boost_server" id="0x7F120EE3" />
-    <public type="string" name="guild_settings_stickers_upload_heading" id="0x7F120EE4" />
-    <public type="string" name="guild_settings_stickers_upload_requirements" id="0x7F120EE5" />
-    <public type="string" name="guild_settings_stickers_upload_requirements_1" id="0x7F120EE6" />
-    <public type="string" name="guild_settings_stickers_upload_requirements_2" id="0x7F120EE7" />
-    <public type="string" name="guild_settings_stickers_upload_requirements_3" id="0x7F120EE8" />
-    <public type="string" name="guild_settings_stickers_upload_requirements_4" id="0x7F120EE9" />
-    <public type="string" name="guild_settings_stickers_upsell_description" id="0x7F120EEA" />
-    <public type="string" name="guild_settings_stickers_upsell_title" id="0x7F120EEB" />
-    <public type="string" name="guild_settings_title_server_widget" id="0x7F120EEC" />
-    <public type="string" name="guild_settings_widget_embed_help" id="0x7F120EED" />
-    <public type="string" name="guild_settings_widget_enable_widget" id="0x7F120EEE" />
-    <public type="string" name="guild_sidebar_a11y_label" id="0x7F120EEF" />
-    <public type="string" name="guild_sidebar_announcement_channel_a11y_label" id="0x7F120EF0" />
-    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_mentions" id="0x7F120EF1" />
-    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_unreads" id="0x7F120EF2" />
-    <public type="string" name="guild_sidebar_default_channel_a11y_label" id="0x7F120EF3" />
-    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_mentions" id="0x7F120EF4" />
-    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_unreads" id="0x7F120EF5" />
-    <public type="string" name="guild_sidebar_stage_channel_a11y_label" id="0x7F120EF6" />
-    <public type="string" name="guild_sidebar_stage_channel_a11y_label_with_limit" id="0x7F120EF7" />
-    <public type="string" name="guild_sidebar_stage_channel_a11y_label_with_users" id="0x7F120EF8" />
-    <public type="string" name="guild_sidebar_store_channel_a11y_label" id="0x7F120EF9" />
-    <public type="string" name="guild_sidebar_voice_channel_a11y_label" id="0x7F120EFA" />
-    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_limit" id="0x7F120EFB" />
-    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_users" id="0x7F120EFC" />
-    <public type="string" name="guild_stage_discovery_copy_event_url" id="0x7F120EFD" />
-    <public type="string" name="guild_stage_discovery_schedule_event_label" id="0x7F120EFE" />
-    <public type="string" name="guild_stage_instance_actions_menu_label" id="0x7F120EFF" />
-    <public type="string" name="guild_stage_instance_discovery_title" id="0x7F120F00" />
-    <public type="string" name="guild_stages_cant_start_event_yet" id="0x7F120F01" />
-    <public type="string" name="guild_stages_landing_mobile_subtitle" id="0x7F120F02" />
-    <public type="string" name="guild_stages_landing_mobile_title" id="0x7F120F03" />
-    <public type="string" name="guild_sticker_file_too_big" id="0x7F120F04" />
-    <public type="string" name="guild_sticker_grid_upload_label" id="0x7F120F05" />
-    <public type="string" name="guild_sticker_invalid_sticker" id="0x7F120F06" />
-    <public type="string" name="guild_sticker_preview_img_alt_dark" id="0x7F120F07" />
-    <public type="string" name="guild_sticker_preview_img_alt_light" id="0x7F120F08" />
-    <public type="string" name="guild_sticker_settings_additional_slots" id="0x7F120F09" />
-    <public type="string" name="guild_sticker_settings_buy_level" id="0x7F120F0A" />
-    <public type="string" name="guild_sticker_settings_remaining_slots_available" id="0x7F120F0B" />
-    <public type="string" name="guild_sticker_unused_tier" id="0x7F120F0C" />
-    <public type="string" name="guild_sticker_upload_description" id="0x7F120F0D" />
-    <public type="string" name="guild_sticker_upload_description_placeholder" id="0x7F120F0E" />
-    <public type="string" name="guild_sticker_upload_description_title" id="0x7F120F0F" />
-    <public type="string" name="guild_sticker_upload_description_tooltip" id="0x7F120F10" />
-    <public type="string" name="guild_sticker_upload_file_button" id="0x7F120F11" />
-    <public type="string" name="guild_sticker_upload_file_placeholder" id="0x7F120F12" />
-    <public type="string" name="guild_sticker_upload_file_title" id="0x7F120F13" />
-    <public type="string" name="guild_sticker_upload_file_title_blocked" id="0x7F120F14" />
-    <public type="string" name="guild_sticker_upload_name_placeholder" id="0x7F120F15" />
-    <public type="string" name="guild_sticker_upload_name_title" id="0x7F120F16" />
-    <public type="string" name="guild_sticker_upload_preview_title" id="0x7F120F17" />
-    <public type="string" name="guild_sticker_upload_related_emoji_placeholder" id="0x7F120F18" />
-    <public type="string" name="guild_sticker_upload_related_emoji_title" id="0x7F120F19" />
-    <public type="string" name="guild_sticker_upload_title" id="0x7F120F1A" />
-    <public type="string" name="guild_stickers_update" id="0x7F120F1B" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_close_button" id="0x7F120F1C" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description" id="0x7F120F1D" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_generic_guild" id="0x7F120F1E" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile1" id="0x7F120F1F" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile2" id="0x7F120F20" />
-    <public type="string" name="guild_subscription_purchase_modal_activated_description_no_application" id="0x7F120F21" />
-    <public type="string" name="guild_subscription_purchase_modal_apple" id="0x7F120F22" />
-    <public type="string" name="guild_subscription_purchase_modal_counter" id="0x7F120F23" />
-    <public type="string" name="guild_subscription_purchase_modal_external" id="0x7F120F24" />
-    <public type="string" name="guild_subscription_purchase_modal_footer_discount" id="0x7F120F25" />
-    <public type="string" name="guild_subscription_purchase_modal_footer_upsell" id="0x7F120F26" />
-    <public type="string" name="guild_subscription_purchase_modal_footer_upsell_trial" id="0x7F120F27" />
-    <public type="string" name="guild_subscription_purchase_modal_invoice_row_content" id="0x7F120F28" />
-    <public type="string" name="guild_subscription_purchase_modal_payment_source_tooltip" id="0x7F120F29" />
-    <public type="string" name="guild_subscription_purchase_modal_purchase_details_header" id="0x7F120F2A" />
-    <public type="string" name="guild_subscription_purchase_modal_step_select_description" id="0x7F120F2B" />
-    <public type="string" name="guild_subscription_purchase_modal_submit" id="0x7F120F2C" />
-    <public type="string" name="guild_subscription_purchase_modal_subtotal" id="0x7F120F2D" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description" id="0x7F120F2E" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description_generic_guild" id="0x7F120F2F" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile1" id="0x7F120F30" />
-    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile2" id="0x7F120F31" />
-    <public type="string" name="guild_subscription_purchase_modal_unused_slot_notice" id="0x7F120F32" />
-    <public type="string" name="guild_template_based_on" id="0x7F120F33" />
-    <public type="string" name="guild_template_create_discord" id="0x7F120F34" />
-    <public type="string" name="guild_template_default_server_name_campus_clubs" id="0x7F120F35" />
-    <public type="string" name="guild_template_default_server_name_classroom" id="0x7F120F36" />
-    <public type="string" name="guild_template_default_server_name_create_from_scratch" id="0x7F120F37" />
-    <public type="string" name="guild_template_default_server_name_creators_hobbies" id="0x7F120F38" />
-    <public type="string" name="guild_template_default_server_name_friends_family" id="0x7F120F39" />
-    <public type="string" name="guild_template_default_server_name_global_communities" id="0x7F120F3A" />
-    <public type="string" name="guild_template_default_server_name_local_communities" id="0x7F120F3B" />
-    <public type="string" name="guild_template_default_server_name_study_groups" id="0x7F120F3C" />
-    <public type="string" name="guild_template_embed_view_in_app" id="0x7F120F3D" />
-    <public type="string" name="guild_template_header_clubs" id="0x7F120F3E" />
-    <public type="string" name="guild_template_header_community" id="0x7F120F3F" />
-    <public type="string" name="guild_template_header_create" id="0x7F120F40" />
-    <public type="string" name="guild_template_header_creator" id="0x7F120F41" />
-    <public type="string" name="guild_template_header_friend" id="0x7F120F42" />
-    <public type="string" name="guild_template_header_gaming" id="0x7F120F43" />
-    <public type="string" name="guild_template_header_school_club" id="0x7F120F44" />
-    <public type="string" name="guild_template_header_study" id="0x7F120F45" />
-    <public type="string" name="guild_template_invalid_subtitle" id="0x7F120F46" />
-    <public type="string" name="guild_template_invalid_title" id="0x7F120F47" />
-    <public type="string" name="guild_template_mobile_invalid_cta" id="0x7F120F48" />
-    <public type="string" name="guild_template_mobile_invalid_error" id="0x7F120F49" />
-    <public type="string" name="guild_template_modal_channels_descriptions" id="0x7F120F4A" />
-    <public type="string" name="guild_template_modal_channels_header" id="0x7F120F4B" />
-    <public type="string" name="guild_template_modal_channels_tip" id="0x7F120F4C" />
-    <public type="string" name="guild_template_modal_description_campus_clubs" id="0x7F120F4D" />
-    <public type="string" name="guild_template_modal_description_classroom" id="0x7F120F4E" />
-    <public type="string" name="guild_template_modal_description_create_from_scratch" id="0x7F120F4F" />
-    <public type="string" name="guild_template_modal_description_creators_hobbies" id="0x7F120F50" />
-    <public type="string" name="guild_template_modal_description_friends_family" id="0x7F120F51" />
-    <public type="string" name="guild_template_modal_description_github_hackathon" id="0x7F120F52" />
-    <public type="string" name="guild_template_modal_description_global_communities" id="0x7F120F53" />
-    <public type="string" name="guild_template_modal_description_league_clubs" id="0x7F120F54" />
-    <public type="string" name="guild_template_modal_description_local_communities" id="0x7F120F55" />
-    <public type="string" name="guild_template_modal_description_study_groups" id="0x7F120F56" />
-    <public type="string" name="guild_template_modal_error_title" id="0x7F120F57" />
-    <public type="string" name="guild_template_modal_roles_description" id="0x7F120F58" />
-    <public type="string" name="guild_template_modal_roles_header" id="0x7F120F59" />
-    <public type="string" name="guild_template_modal_roles_header2" id="0x7F120F5A" />
-    <public type="string" name="guild_template_modal_title" id="0x7F120F5B" />
-    <public type="string" name="guild_template_modal_title_campus_clubs" id="0x7F120F5C" />
-    <public type="string" name="guild_template_modal_title_classroom" id="0x7F120F5D" />
-    <public type="string" name="guild_template_modal_title_create_from_scratch" id="0x7F120F5E" />
-    <public type="string" name="guild_template_modal_title_creators_hobbies" id="0x7F120F5F" />
-    <public type="string" name="guild_template_modal_title_friends_family" id="0x7F120F60" />
-    <public type="string" name="guild_template_modal_title_github_hackathon" id="0x7F120F61" />
-    <public type="string" name="guild_template_modal_title_global_communities" id="0x7F120F62" />
-    <public type="string" name="guild_template_modal_title_league_clubs" id="0x7F120F63" />
-    <public type="string" name="guild_template_modal_title_local_communities" id="0x7F120F64" />
-    <public type="string" name="guild_template_modal_title_study_groups" id="0x7F120F65" />
-    <public type="string" name="guild_template_name_announcements" id="0x7F120F66" />
-    <public type="string" name="guild_template_name_category_information" id="0x7F120F67" />
-    <public type="string" name="guild_template_name_category_text" id="0x7F120F68" />
-    <public type="string" name="guild_template_name_category_voice" id="0x7F120F69" />
-    <public type="string" name="guild_template_name_clips_and_highlights" id="0x7F120F6A" />
-    <public type="string" name="guild_template_name_events" id="0x7F120F6B" />
-    <public type="string" name="guild_template_name_game" id="0x7F120F6C" />
-    <public type="string" name="guild_template_name_game_new" id="0x7F120F6D" />
-    <public type="string" name="guild_template_name_game_room" id="0x7F120F6E" />
-    <public type="string" name="guild_template_name_general" id="0x7F120F6F" />
-    <public type="string" name="guild_template_name_giveaways" id="0x7F120F70" />
-    <public type="string" name="guild_template_name_homework" id="0x7F120F71" />
-    <public type="string" name="guild_template_name_homework_help" id="0x7F120F72" />
-    <public type="string" name="guild_template_name_ideas_and_feedback" id="0x7F120F73" />
-    <public type="string" name="guild_template_name_meeting_plans" id="0x7F120F74" />
-    <public type="string" name="guild_template_name_meetups" id="0x7F120F75" />
-    <public type="string" name="guild_template_name_memes" id="0x7F120F76" />
-    <public type="string" name="guild_template_name_music" id="0x7F120F77" />
-    <public type="string" name="guild_template_name_notes" id="0x7F120F78" />
-    <public type="string" name="guild_template_name_notes_resources" id="0x7F120F79" />
-    <public type="string" name="guild_template_name_off_topic" id="0x7F120F7A" />
-    <public type="string" name="guild_template_name_random" id="0x7F120F7B" />
-    <public type="string" name="guild_template_name_resources" id="0x7F120F7C" />
-    <public type="string" name="guild_template_name_session_planning" id="0x7F120F7D" />
-    <public type="string" name="guild_template_name_social" id="0x7F120F7E" />
-    <public type="string" name="guild_template_name_strategy" id="0x7F120F7F" />
-    <public type="string" name="guild_template_name_voice_community_hangout" id="0x7F120F80" />
-    <public type="string" name="guild_template_name_voice_gaming" id="0x7F120F81" />
-    <public type="string" name="guild_template_name_voice_general" id="0x7F120F82" />
-    <public type="string" name="guild_template_name_voice_lobby" id="0x7F120F83" />
-    <public type="string" name="guild_template_name_voice_lounge" id="0x7F120F84" />
-    <public type="string" name="guild_template_name_voice_meeting_room" id="0x7F120F85" />
-    <public type="string" name="guild_template_name_voice_meeting_room_1" id="0x7F120F86" />
-    <public type="string" name="guild_template_name_voice_meeting_room_2" id="0x7F120F87" />
-    <public type="string" name="guild_template_name_voice_stream_room" id="0x7F120F88" />
-    <public type="string" name="guild_template_name_voice_study_room" id="0x7F120F89" />
-    <public type="string" name="guild_template_name_welcome" id="0x7F120F8A" />
-    <public type="string" name="guild_template_name_welcome_and_rules" id="0x7F120F8B" />
-    <public type="string" name="guild_template_open" id="0x7F120F8C" />
-    <public type="string" name="guild_template_preview_description" id="0x7F120F8D" />
-    <public type="string" name="guild_template_preview_protip_body" id="0x7F120F8E" />
-    <public type="string" name="guild_template_preview_title" id="0x7F120F8F" />
-    <public type="string" name="guild_template_resolved_embed_title" id="0x7F120F90" />
-    <public type="string" name="guild_template_resolving_title" id="0x7F120F91" />
-    <public type="string" name="guild_template_selector_description" id="0x7F120F92" />
-    <public type="string" name="guild_template_selector_option_header" id="0x7F120F93" />
-    <public type="string" name="guild_template_selector_suggestion" id="0x7F120F94" />
-    <public type="string" name="guild_template_selector_title" id="0x7F120F95" />
-    <public type="string" name="guild_template_settings_description" id="0x7F120F96" />
-    <public type="string" name="guild_template_setup_discord" id="0x7F120F97" />
-    <public type="string" name="guild_template_usages" id="0x7F120F98" />
-    <public type="string" name="guild_template_usages_by_creator2" id="0x7F120F99" />
-    <public type="string" name="guild_template_usages_no_bold" id="0x7F120F9A" />
-    <public type="string" name="guild_templates" id="0x7F120F9B" />
-    <public type="string" name="guild_templates_create_link" id="0x7F120F9C" />
-    <public type="string" name="guild_templates_default_template_name" id="0x7F120F9D" />
-    <public type="string" name="guild_templates_delete_description" id="0x7F120F9E" />
-    <public type="string" name="guild_templates_delete_template" id="0x7F120F9F" />
-    <public type="string" name="guild_templates_delete_template_link" id="0x7F120FA0" />
-    <public type="string" name="guild_templates_form_description_channels" id="0x7F120FA1" />
-    <public type="string" name="guild_templates_form_description_members" id="0x7F120FA2" />
-    <public type="string" name="guild_templates_form_description_messages" id="0x7F120FA3" />
-    <public type="string" name="guild_templates_form_description_perks" id="0x7F120FA4" />
-    <public type="string" name="guild_templates_form_description_roles" id="0x7F120FA5" />
-    <public type="string" name="guild_templates_form_description_settings" id="0x7F120FA6" />
-    <public type="string" name="guild_templates_form_description_will_copy" id="0x7F120FA7" />
-    <public type="string" name="guild_templates_form_description_wont_copy" id="0x7F120FA8" />
-    <public type="string" name="guild_templates_form_error_name_required" id="0x7F120FA9" />
-    <public type="string" name="guild_templates_form_label_description" id="0x7F120FAA" />
-    <public type="string" name="guild_templates_form_label_icon" id="0x7F120FAB" />
-    <public type="string" name="guild_templates_form_label_link" id="0x7F120FAC" />
-    <public type="string" name="guild_templates_form_label_name" id="0x7F120FAD" />
-    <public type="string" name="guild_templates_form_label_server_name_classroom" id="0x7F120FAE" />
-    <public type="string" name="guild_templates_form_label_server_name_create_from_scratch" id="0x7F120FAF" />
-    <public type="string" name="guild_templates_form_label_server_name_creators_hobbies" id="0x7F120FB0" />
-    <public type="string" name="guild_templates_form_label_server_name_friends_family" id="0x7F120FB1" />
-    <public type="string" name="guild_templates_form_label_server_name_global_communities" id="0x7F120FB2" />
-    <public type="string" name="guild_templates_form_label_server_name_local_communities" id="0x7F120FB3" />
-    <public type="string" name="guild_templates_form_label_server_name_study_groups" id="0x7F120FB4" />
-    <public type="string" name="guild_templates_form_placeholder_description" id="0x7F120FB5" />
-    <public type="string" name="guild_templates_form_placeholder_name" id="0x7F120FB6" />
-    <public type="string" name="guild_templates_last_sync" id="0x7F120FB7" />
-    <public type="string" name="guild_templates_preview_template" id="0x7F120FB8" />
-    <public type="string" name="guild_templates_promotion_tooltip" id="0x7F120FB9" />
-    <public type="string" name="guild_templates_promotion_tooltip_aria_label" id="0x7F120FBA" />
-    <public type="string" name="guild_templates_sync_description" id="0x7F120FBB" />
-    <public type="string" name="guild_templates_sync_template" id="0x7F120FBC" />
-    <public type="string" name="guild_templates_template_sync" id="0x7F120FBD" />
-    <public type="string" name="guild_templates_unsynced_tooltip" id="0x7F120FBE" />
-    <public type="string" name="guild_templates_unsynced_warning" id="0x7F120FBF" />
-    <public type="string" name="guild_tooltip_a11y_label" id="0x7F120FC0" />
-    <public type="string" name="guild_unavailable_body" id="0x7F120FC1" />
-    <public type="string" name="guild_unavailable_header" id="0x7F120FC2" />
-    <public type="string" name="guild_unavailable_title" id="0x7F120FC3" />
-    <public type="string" name="guild_verification_text_account_age" id="0x7F120FC4" />
-    <public type="string" name="guild_verification_text_member_age" id="0x7F120FC5" />
-    <public type="string" name="guild_verification_text_not_claimed" id="0x7F120FC6" />
-    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7F120FC7" />
-    <public type="string" name="guild_verification_text_not_verified" id="0x7F120FC8" />
-    <public type="string" name="guild_verification_voice_account_age" id="0x7F120FC9" />
-    <public type="string" name="guild_verification_voice_header" id="0x7F120FCA" />
-    <public type="string" name="guild_verification_voice_member_age" id="0x7F120FCB" />
-    <public type="string" name="guild_verification_voice_not_claimed" id="0x7F120FCC" />
-    <public type="string" name="guild_verification_voice_not_phone_verified" id="0x7F120FCD" />
-    <public type="string" name="guild_verification_voice_not_verified" id="0x7F120FCE" />
-    <public type="string" name="guild_verified" id="0x7F120FCF" />
-    <public type="string" name="guild_verified_and_partnered" id="0x7F120FD0" />
-    <public type="string" name="guild_video_call_marketing_popout_body" id="0x7F120FD1" />
-    <public type="string" name="guild_video_call_marketing_popout_header" id="0x7F120FD2" />
-    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7F120FD3" />
-    <public type="string" name="guilds_bar_a11y_label" id="0x7F120FD4" />
-    <public type="string" name="hardware_acceleration" id="0x7F120FD5" />
-    <public type="string" name="hardware_acceleration_help_text" id="0x7F120FD6" />
-    <public type="string" name="help" id="0x7F120FD7" />
-    <public type="string" name="help_clear_permissions" id="0x7F120FD8" />
-    <public type="string" name="help_desk" id="0x7F120FD9" />
-    <public type="string" name="help_missing_manage_roles_permission" id="0x7F120FDA" />
-    <public type="string" name="help_missing_permission" id="0x7F120FDB" />
-    <public type="string" name="help_role_locked" id="0x7F120FDC" />
-    <public type="string" name="help_role_locked_mine" id="0x7F120FDD" />
-    <public type="string" name="help_roles_description" id="0x7F120FDE" />
-    <public type="string" name="help_singular_permission" id="0x7F120FDF" />
-    <public type="string" name="hi" id="0x7F120FE0" />
-    <public type="string" name="hide" id="0x7F120FE1" />
-    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7F120FE2" />
-    <public type="string" name="hide_chat" id="0x7F120FE3" />
-    <public type="string" name="hide_instant_invites_description" id="0x7F120FE4" />
-    <public type="string" name="hide_instant_invites_label" id="0x7F120FE5" />
-    <public type="string" name="hide_muted" id="0x7F120FE6" />
-    <public type="string" name="hide_muted_channels" id="0x7F120FE7" />
-    <public type="string" name="hide_navigation" id="0x7F120FE8" />
-    <public type="string" name="hide_personal_information_description" id="0x7F120FE9" />
-    <public type="string" name="hide_personal_information_label" id="0x7F120FEA" />
-    <public type="string" name="hold_up" id="0x7F120FEB" />
-    <public type="string" name="home" id="0x7F120FEC" />
-    <public type="string" name="how_to_invite_others" id="0x7F120FED" />
-    <public type="string" name="hr" id="0x7F120FEE" />
-    <public type="string" name="hu" id="0x7F120FEF" />
-    <public type="string" name="hub_add_guild_description_help" id="0x7F120FF0" />
-    <public type="string" name="hub_add_guild_description_placeholder" id="0x7F120FF1" />
-    <public type="string" name="hub_add_guild_description_title" id="0x7F120FF2" />
-    <public type="string" name="hub_add_server_cta" id="0x7F120FF3" />
-    <public type="string" name="hub_choose_guild_subtitle" id="0x7F120FF4" />
-    <public type="string" name="hub_choose_guild_title" id="0x7F120FF5" />
-    <public type="string" name="hub_create_guild_cta" id="0x7F120FF6" />
-    <public type="string" name="hub_create_guild_label" id="0x7F120FF7" />
-    <public type="string" name="hub_create_or_add_guild_subtitle" id="0x7F120FF8" />
-    <public type="string" name="hub_create_or_add_guild_title" id="0x7F120FF9" />
-    <public type="string" name="hub_customize_existing_guild_title" id="0x7F120FFA" />
-    <public type="string" name="hub_directory_channel_empty_add_server" id="0x7F120FFB" />
-    <public type="string" name="hub_directory_channel_empty_invite" id="0x7F120FFC" />
-    <public type="string" name="hub_directory_channel_empty_subtitle" id="0x7F120FFD" />
-    <public type="string" name="hub_directory_channel_empty_title" id="0x7F120FFE" />
-    <public type="string" name="hub_directory_channel_title" id="0x7F120FFF" />
-    <public type="string" name="hub_directory_search_subtitle" id="0x7F121000" />
-    <public type="string" name="hub_directory_search_title" id="0x7F121001" />
-    <public type="string" name="hub_entry_invite_subtitle" id="0x7F121002" />
-    <public type="string" name="hub_entry_remove" id="0x7F121003" />
-    <public type="string" name="hub_entry_remove_body" id="0x7F121004" />
-    <public type="string" name="hub_waitlist_modal_form_description" id="0x7F121005" />
-    <public type="string" name="hub_waitlist_modal_form_placeholder" id="0x7F121006" />
-    <public type="string" name="hub_waitlist_modal_form_title" id="0x7F121007" />
-    <public type="string" name="hub_waitlist_modal_join_header" id="0x7F121008" />
-    <public type="string" name="hub_waitlist_modal_join_subheader" id="0x7F121009" />
-    <public type="string" name="hub_waitlist_modal_joined_header" id="0x7F12100A" />
-    <public type="string" name="humanize_duration_a_few_seconds" id="0x7F12100B" />
-    <public type="string" name="humanize_duration_days" id="0x7F12100C" />
-    <public type="string" name="humanize_duration_hours" id="0x7F12100D" />
-    <public type="string" name="humanize_duration_minutes" id="0x7F12100E" />
-    <public type="string" name="humanize_duration_seconds" id="0x7F12100F" />
-    <public type="string" name="hypesquad_attendee_cta" id="0x7F121010" />
-    <public type="string" name="hypesquad_badge_tooltip" id="0x7F121011" />
-    <public type="string" name="hypesquad_description_house_1" id="0x7F121012" />
-    <public type="string" name="hypesquad_description_house_2" id="0x7F121013" />
-    <public type="string" name="hypesquad_description_house_3" id="0x7F121014" />
-    <public type="string" name="hypesquad_error_body" id="0x7F121015" />
-    <public type="string" name="hypesquad_error_heading" id="0x7F121016" />
-    <public type="string" name="hypesquad_heading" id="0x7F121017" />
-    <public type="string" name="hypesquad_heading_existing_member" id="0x7F121018" />
-    <public type="string" name="hypesquad_house_1" id="0x7F121019" />
-    <public type="string" name="hypesquad_house_2" id="0x7F12101A" />
-    <public type="string" name="hypesquad_house_3" id="0x7F12101B" />
-    <public type="string" name="hypesquad_join" id="0x7F12101C" />
-    <public type="string" name="hypesquad_leave_action" id="0x7F12101D" />
-    <public type="string" name="hypesquad_leave_error" id="0x7F12101E" />
-    <public type="string" name="hypesquad_leave_prompt" id="0x7F12101F" />
-    <public type="string" name="hypesquad_membership_heading" id="0x7F121020" />
-    <public type="string" name="hypesquad_newsletter_warning" id="0x7F121021" />
-    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7F121022" />
-    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7F121023" />
-    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7F121024" />
-    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7F121025" />
-    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7F121026" />
-    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7F121027" />
-    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7F121028" />
-    <public type="string" name="hypesquad_perks_heading" id="0x7F121029" />
-    <public type="string" name="hypesquad_question_0_prompt" id="0x7F12102A" />
-    <public type="string" name="hypesquad_question_0_response_a" id="0x7F12102B" />
-    <public type="string" name="hypesquad_question_0_response_b" id="0x7F12102C" />
-    <public type="string" name="hypesquad_question_0_response_c" id="0x7F12102D" />
-    <public type="string" name="hypesquad_question_0_response_d" id="0x7F12102E" />
-    <public type="string" name="hypesquad_question_10_prompt" id="0x7F12102F" />
-    <public type="string" name="hypesquad_question_10_response_a" id="0x7F121030" />
-    <public type="string" name="hypesquad_question_10_response_b" id="0x7F121031" />
-    <public type="string" name="hypesquad_question_10_response_c" id="0x7F121032" />
-    <public type="string" name="hypesquad_question_10_response_d" id="0x7F121033" />
-    <public type="string" name="hypesquad_question_11_prompt" id="0x7F121034" />
-    <public type="string" name="hypesquad_question_11_response_a" id="0x7F121035" />
-    <public type="string" name="hypesquad_question_11_response_b" id="0x7F121036" />
-    <public type="string" name="hypesquad_question_11_response_c" id="0x7F121037" />
-    <public type="string" name="hypesquad_question_11_response_d" id="0x7F121038" />
-    <public type="string" name="hypesquad_question_12_prompt" id="0x7F121039" />
-    <public type="string" name="hypesquad_question_12_response_a" id="0x7F12103A" />
-    <public type="string" name="hypesquad_question_12_response_b" id="0x7F12103B" />
-    <public type="string" name="hypesquad_question_12_response_c" id="0x7F12103C" />
-    <public type="string" name="hypesquad_question_12_response_d" id="0x7F12103D" />
-    <public type="string" name="hypesquad_question_13_prompt" id="0x7F12103E" />
-    <public type="string" name="hypesquad_question_13_response_a" id="0x7F12103F" />
-    <public type="string" name="hypesquad_question_13_response_b" id="0x7F121040" />
-    <public type="string" name="hypesquad_question_13_response_c" id="0x7F121041" />
-    <public type="string" name="hypesquad_question_13_response_d" id="0x7F121042" />
-    <public type="string" name="hypesquad_question_14_prompt" id="0x7F121043" />
-    <public type="string" name="hypesquad_question_14_response_a" id="0x7F121044" />
-    <public type="string" name="hypesquad_question_14_response_b" id="0x7F121045" />
-    <public type="string" name="hypesquad_question_14_response_c" id="0x7F121046" />
-    <public type="string" name="hypesquad_question_14_response_d" id="0x7F121047" />
-    <public type="string" name="hypesquad_question_1_prompt" id="0x7F121048" />
-    <public type="string" name="hypesquad_question_1_response_a" id="0x7F121049" />
-    <public type="string" name="hypesquad_question_1_response_b" id="0x7F12104A" />
-    <public type="string" name="hypesquad_question_1_response_c" id="0x7F12104B" />
-    <public type="string" name="hypesquad_question_1_response_d" id="0x7F12104C" />
-    <public type="string" name="hypesquad_question_2_prompt" id="0x7F12104D" />
-    <public type="string" name="hypesquad_question_2_response_a" id="0x7F12104E" />
-    <public type="string" name="hypesquad_question_2_response_b" id="0x7F12104F" />
-    <public type="string" name="hypesquad_question_2_response_c" id="0x7F121050" />
-    <public type="string" name="hypesquad_question_2_response_d" id="0x7F121051" />
-    <public type="string" name="hypesquad_question_3_prompt" id="0x7F121052" />
-    <public type="string" name="hypesquad_question_3_response_a" id="0x7F121053" />
-    <public type="string" name="hypesquad_question_3_response_b" id="0x7F121054" />
-    <public type="string" name="hypesquad_question_3_response_c" id="0x7F121055" />
-    <public type="string" name="hypesquad_question_3_response_d" id="0x7F121056" />
-    <public type="string" name="hypesquad_question_4_prompt" id="0x7F121057" />
-    <public type="string" name="hypesquad_question_4_response_a" id="0x7F121058" />
-    <public type="string" name="hypesquad_question_4_response_b" id="0x7F121059" />
-    <public type="string" name="hypesquad_question_4_response_c" id="0x7F12105A" />
-    <public type="string" name="hypesquad_question_4_response_d" id="0x7F12105B" />
-    <public type="string" name="hypesquad_question_5_prompt" id="0x7F12105C" />
-    <public type="string" name="hypesquad_question_5_response_a" id="0x7F12105D" />
-    <public type="string" name="hypesquad_question_5_response_b" id="0x7F12105E" />
-    <public type="string" name="hypesquad_question_5_response_c" id="0x7F12105F" />
-    <public type="string" name="hypesquad_question_5_response_d" id="0x7F121060" />
-    <public type="string" name="hypesquad_question_6_prompt" id="0x7F121061" />
-    <public type="string" name="hypesquad_question_6_response_a" id="0x7F121062" />
-    <public type="string" name="hypesquad_question_6_response_b" id="0x7F121063" />
-    <public type="string" name="hypesquad_question_6_response_c" id="0x7F121064" />
-    <public type="string" name="hypesquad_question_6_response_d" id="0x7F121065" />
-    <public type="string" name="hypesquad_question_7_prompt" id="0x7F121066" />
-    <public type="string" name="hypesquad_question_7_response_a" id="0x7F121067" />
-    <public type="string" name="hypesquad_question_7_response_b" id="0x7F121068" />
-    <public type="string" name="hypesquad_question_7_response_c" id="0x7F121069" />
-    <public type="string" name="hypesquad_question_7_response_d" id="0x7F12106A" />
-    <public type="string" name="hypesquad_question_8_prompt" id="0x7F12106B" />
-    <public type="string" name="hypesquad_question_8_response_a" id="0x7F12106C" />
-    <public type="string" name="hypesquad_question_8_response_b" id="0x7F12106D" />
-    <public type="string" name="hypesquad_question_8_response_c" id="0x7F12106E" />
-    <public type="string" name="hypesquad_question_8_response_d" id="0x7F12106F" />
-    <public type="string" name="hypesquad_question_9_prompt" id="0x7F121070" />
-    <public type="string" name="hypesquad_question_9_response_a" id="0x7F121071" />
-    <public type="string" name="hypesquad_question_9_response_b" id="0x7F121072" />
-    <public type="string" name="hypesquad_question_9_response_c" id="0x7F121073" />
-    <public type="string" name="hypesquad_question_9_response_d" id="0x7F121074" />
-    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7F121075" />
-    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7F121076" />
-    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7F121077" />
-    <public type="string" name="hypesquad_quiz_cancel" id="0x7F121078" />
-    <public type="string" name="hypesquad_quiz_close" id="0x7F121079" />
-    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7F12107A" />
-    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7F12107B" />
-    <public type="string" name="hypesquad_quiz_next_question" id="0x7F12107C" />
-    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7F12107D" />
-    <public type="string" name="hypesquad_quiz_retry" id="0x7F12107E" />
-    <public type="string" name="hypesquad_quiz_select_answer" id="0x7F12107F" />
-    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7F121080" />
-    <public type="string" name="hypesquad_quiz_title" id="0x7F121081" />
-    <public type="string" name="hypesquad_ready_to_rep" id="0x7F121082" />
-    <public type="string" name="hypesquad_subheading" id="0x7F121083" />
-    <public type="string" name="hypesquad_switch_houses_action" id="0x7F121084" />
-    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7F121085" />
-    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7F121086" />
-    <public type="string" name="hypesquad_unverified_email_notice" id="0x7F121087" />
-    <public type="string" name="hypesquad_your_house" id="0x7F121088" />
-    <public type="string" name="i18n_locale_loading_error" id="0x7F121089" />
-    <public type="string" name="icon_content_description" id="0x7F12108A" />
-    <public type="string" name="image" id="0x7F12108B" />
-    <public type="string" name="image_actions_menu_label" id="0x7F12108C" />
-    <public type="string" name="image_compression" id="0x7F12108D" />
-    <public type="string" name="image_compression_label" id="0x7F12108E" />
-    <public type="string" name="image_compression_nitro_upsell" id="0x7F12108F" />
-    <public type="string" name="images" id="0x7F121090" />
-    <public type="string" name="img_alt_attachment_file_type" id="0x7F121091" />
-    <public type="string" name="img_alt_emoji" id="0x7F121092" />
-    <public type="string" name="img_alt_icon" id="0x7F121093" />
-    <public type="string" name="img_alt_logo" id="0x7F121094" />
-    <public type="string" name="in_category" id="0x7F121095" />
-    <public type="string" name="in_game_voice_settings" id="0x7F121096" />
-    <public type="string" name="in_the_voice_channel" id="0x7F121097" />
-    <public type="string" name="inaccessible_channel_link_subtitle" id="0x7F121098" />
-    <public type="string" name="inaccessible_channel_link_title" id="0x7F121099" />
-    <public type="string" name="inbox" id="0x7F12109A" />
-    <public type="string" name="incentivized_install_notice" id="0x7F12109B" />
-    <public type="string" name="incentivized_install_premium_settings_banner" id="0x7F12109C" />
-    <public type="string" name="incoming_call" id="0x7F12109D" />
-    <public type="string" name="incoming_call_ellipsis" id="0x7F12109E" />
-    <public type="string" name="incoming_call_preview_camera" id="0x7F12109F" />
-    <public type="string" name="incoming_friend_request" id="0x7F1210A0" />
-    <public type="string" name="incoming_friend_request_from" id="0x7F1210A1" />
-    <public type="string" name="incoming_friend_requests_count" id="0x7F1210A2" />
-    <public type="string" name="incoming_video_call" id="0x7F1210A3" />
-    <public type="string" name="incoming_video_call_ellipsis" id="0x7F1210A4" />
-    <public type="string" name="incompatible_browser" id="0x7F1210A5" />
-    <public type="string" name="inivte_modal_no_thanks" id="0x7F1210A6" />
-    <public type="string" name="inline_attachment_media" id="0x7F1210A7" />
-    <public type="string" name="inline_attachment_media_help" id="0x7F1210A8" />
-    <public type="string" name="inline_embed_media" id="0x7F1210A9" />
-    <public type="string" name="inline_media_label" id="0x7F1210AA" />
-    <public type="string" name="input_device" id="0x7F1210AB" />
-    <public type="string" name="input_mode_ptt" id="0x7F1210AC" />
-    <public type="string" name="input_mode_ptt_limited" id="0x7F1210AD" />
-    <public type="string" name="input_mode_ptt_release_delay" id="0x7F1210AE" />
-    <public type="string" name="input_mode_vad" id="0x7F1210AF" />
-    <public type="string" name="instagram" id="0x7F1210B0" />
-    <public type="string" name="install_location_main" id="0x7F1210B1" />
-    <public type="string" name="instant_invite" id="0x7F1210B2" />
-    <public type="string" name="instant_invite_accept" id="0x7F1210B3" />
-    <public type="string" name="instant_invite_accept_stage" id="0x7F1210B4" />
-    <public type="string" name="instant_invite_accepting" id="0x7F1210B5" />
-    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7F1210B6" />
-    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7F1210B7" />
-    <public type="string" name="instant_invite_banned" id="0x7F1210B8" />
-    <public type="string" name="instant_invite_banned_info" id="0x7F1210B9" />
-    <public type="string" name="instant_invite_expired" id="0x7F1210BA" />
-    <public type="string" name="instant_invite_expires" id="0x7F1210BB" />
-    <public type="string" name="instant_invite_failed_to_generate" id="0x7F1210BC" />
-    <public type="string" name="instant_invite_friends" id="0x7F1210BD" />
-    <public type="string" name="instant_invite_friends_description" id="0x7F1210BE" />
-    <public type="string" name="instant_invite_generated_by_widget" id="0x7F1210BF" />
-    <public type="string" name="instant_invite_guild_by_user" id="0x7F1210C0" />
-    <public type="string" name="instant_invite_guild_members_online" id="0x7F1210C1" />
-    <public type="string" name="instant_invite_guild_members_total" id="0x7F1210C2" />
-    <public type="string" name="instant_invite_hidden" id="0x7F1210C3" />
-    <public type="string" name="instant_invite_invalid_channel" id="0x7F1210C4" />
-    <public type="string" name="instant_invite_invite_code" id="0x7F1210C5" />
-    <public type="string" name="instant_invite_inviter" id="0x7F1210C6" />
-    <public type="string" name="instant_invite_looks_like" id="0x7F1210C7" />
-    <public type="string" name="instant_invite_not_allowed" id="0x7F1210C8" />
-    <public type="string" name="instant_invite_resolved_title" id="0x7F1210C9" />
-    <public type="string" name="instant_invite_resolving" id="0x7F1210CA" />
-    <public type="string" name="instant_invite_uses" id="0x7F1210CB" />
-    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7F1210CC" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7F1210CD" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7F1210CE" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7F1210CF" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm_by_user" id="0x7F1210D0" />
-    <public type="string" name="instant_invite_you_have_joined" id="0x7F1210D1" />
-    <public type="string" name="instant_invites" id="0x7F1210D2" />
-    <public type="string" name="integration_added_date" id="0x7F1210D3" />
-    <public type="string" name="integration_added_user" id="0x7F1210D4" />
-    <public type="string" name="integration_added_user_date" id="0x7F1210D5" />
-    <public type="string" name="integration_created_date" id="0x7F1210D6" />
-    <public type="string" name="integration_created_user_date" id="0x7F1210D7" />
-    <public type="string" name="integration_settings" id="0x7F1210D8" />
-    <public type="string" name="integrations" id="0x7F1210D9" />
-    <public type="string" name="integrations_account_description" id="0x7F1210DA" />
-    <public type="string" name="integrations_application_added_by" id="0x7F1210DB" />
-    <public type="string" name="integrations_application_bot" id="0x7F1210DC" />
-    <public type="string" name="integrations_application_bot_name" id="0x7F1210DD" />
-    <public type="string" name="integrations_application_button" id="0x7F1210DE" />
-    <public type="string" name="integrations_application_denied_permissions" id="0x7F1210DF" />
-    <public type="string" name="integrations_application_granted_permissions" id="0x7F1210E0" />
-    <public type="string" name="integrations_application_no_bot" id="0x7F1210E1" />
-    <public type="string" name="integrations_application_no_webhooks" id="0x7F1210E2" />
-    <public type="string" name="integrations_application_remove" id="0x7F1210E3" />
-    <public type="string" name="integrations_application_remove_body" id="0x7F1210E4" />
-    <public type="string" name="integrations_application_remove_error" id="0x7F1210E5" />
-    <public type="string" name="integrations_application_remove_error_title" id="0x7F1210E6" />
-    <public type="string" name="integrations_application_remove_no_permissions" id="0x7F1210E7" />
-    <public type="string" name="integrations_application_remove_summary" id="0x7F1210E8" />
-    <public type="string" name="integrations_application_remove_title" id="0x7F1210E9" />
-    <public type="string" name="integrations_application_section" id="0x7F1210EA" />
-    <public type="string" name="integrations_application_verified_bot" id="0x7F1210EB" />
-    <public type="string" name="integrations_application_webhooks" id="0x7F1210EC" />
-    <public type="string" name="integrations_channel_following" id="0x7F1210ED" />
-    <public type="string" name="integrations_channel_following_button" id="0x7F1210EE" />
-    <public type="string" name="integrations_channel_following_description" id="0x7F1210EF" />
-    <public type="string" name="integrations_channel_following_empty" id="0x7F1210F0" />
-    <public type="string" name="integrations_channel_following_empty_button" id="0x7F1210F1" />
-    <public type="string" name="integrations_channel_following_section" id="0x7F1210F2" />
-    <public type="string" name="integrations_channel_following_summary" id="0x7F1210F3" />
-    <public type="string" name="integrations_channel_following_title" id="0x7F1210F4" />
-    <public type="string" name="integrations_disable" id="0x7F1210F5" />
-    <public type="string" name="integrations_enable" id="0x7F1210F6" />
-    <public type="string" name="integrations_enabled" id="0x7F1210F7" />
-    <public type="string" name="integrations_followed_channel_delete" id="0x7F1210F8" />
-    <public type="string" name="integrations_followed_channel_delete_body" id="0x7F1210F9" />
-    <public type="string" name="integrations_followed_channel_delete_title" id="0x7F1210FA" />
-    <public type="string" name="integrations_followed_channel_dest_channel" id="0x7F1210FB" />
-    <public type="string" name="integrations_followed_channel_error_deleting" id="0x7F1210FC" />
-    <public type="string" name="integrations_followed_channel_guild_source" id="0x7F1210FD" />
-    <public type="string" name="integrations_followed_channel_name" id="0x7F1210FE" />
-    <public type="string" name="integrations_last_sync" id="0x7F1210FF" />
-    <public type="string" name="integrations_overview" id="0x7F121100" />
-    <public type="string" name="integrations_overview_description_channel" id="0x7F121101" />
-    <public type="string" name="integrations_overview_description_guild" id="0x7F121102" />
-    <public type="string" name="integrations_overview_no_applications" id="0x7F121103" />
-    <public type="string" name="integrations_twitch" id="0x7F121104" />
-    <public type="string" name="integrations_twitch_button" id="0x7F121105" />
-    <public type="string" name="integrations_twitch_description" id="0x7F121106" />
-    <public type="string" name="integrations_twitch_empty_button" id="0x7F121107" />
-    <public type="string" name="integrations_twitch_empty_summary" id="0x7F121108" />
-    <public type="string" name="integrations_twitch_help" id="0x7F121109" />
-    <public type="string" name="integrations_twitch_summary" id="0x7F12110A" />
-    <public type="string" name="integrations_webhook_copied_url" id="0x7F12110B" />
-    <public type="string" name="integrations_webhook_copy_url" id="0x7F12110C" />
-    <public type="string" name="integrations_webhook_delete" id="0x7F12110D" />
-    <public type="string" name="integrations_webhooks" id="0x7F12110E" />
-    <public type="string" name="integrations_webhooks_button" id="0x7F12110F" />
-    <public type="string" name="integrations_webhooks_count" id="0x7F121110" />
-    <public type="string" name="integrations_webhooks_create" id="0x7F121111" />
-    <public type="string" name="integrations_webhooks_description" id="0x7F121112" />
-    <public type="string" name="integrations_webhooks_empty" id="0x7F121113" />
-    <public type="string" name="integrations_webhooks_empty_button" id="0x7F121114" />
-    <public type="string" name="integrations_webhooks_summary" id="0x7F121115" />
-    <public type="string" name="integrations_youtube" id="0x7F121116" />
-    <public type="string" name="integrations_youtube_button" id="0x7F121117" />
-    <public type="string" name="integrations_youtube_description" id="0x7F121118" />
-    <public type="string" name="integrations_youtube_empty_button" id="0x7F121119" />
-    <public type="string" name="integrations_youtube_empty_summary" id="0x7F12111A" />
-    <public type="string" name="integrations_youtube_help" id="0x7F12111B" />
-    <public type="string" name="integrations_youtube_summary" id="0x7F12111C" />
-    <public type="string" name="interaction_required_body" id="0x7F12111D" />
-    <public type="string" name="interaction_required_title" id="0x7F12111E" />
-    <public type="string" name="internal_server_error" id="0x7F12111F" />
-    <public type="string" name="invalid_animated_emoji_body" id="0x7F121120" />
-    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7F121121" />
-    <public type="string" name="invalid_attachments_failure" id="0x7F121122" />
-    <public type="string" name="invalid_external_emoji_body" id="0x7F121123" />
-    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7F121124" />
-    <public type="string" name="invalid_invite_link_error" id="0x7F121125" />
-    <public type="string" name="invalid_text_channel" id="0x7F121126" />
-    <public type="string" name="invalid_voice_channel" id="0x7F121127" />
-    <public type="string" name="invite_a_friend" id="0x7F121128" />
-    <public type="string" name="invite_app_email" id="0x7F121129" />
-    <public type="string" name="invite_app_gmail" id="0x7F12112A" />
-    <public type="string" name="invite_app_line" id="0x7F12112B" />
-    <public type="string" name="invite_app_messages" id="0x7F12112C" />
-    <public type="string" name="invite_app_messenger" id="0x7F12112D" />
-    <public type="string" name="invite_app_telegram" id="0x7F12112E" />
-    <public type="string" name="invite_app_twitter" id="0x7F12112F" />
-    <public type="string" name="invite_app_whatsapp" id="0x7F121130" />
-    <public type="string" name="invite_button_body_in_guild" id="0x7F121131" />
-    <public type="string" name="invite_button_expired" id="0x7F121132" />
-    <public type="string" name="invite_button_invalid" id="0x7F121133" />
-    <public type="string" name="invite_button_invalid_owner" id="0x7F121134" />
-    <public type="string" name="invite_button_resolving" id="0x7F121135" />
-    <public type="string" name="invite_button_stream_ended" id="0x7F121136" />
-    <public type="string" name="invite_button_stream_ended_streamer" id="0x7F121137" />
-    <public type="string" name="invite_button_stream_watching" id="0x7F121138" />
-    <public type="string" name="invite_button_streamer" id="0x7F121139" />
-    <public type="string" name="invite_button_streaming" id="0x7F12113A" />
-    <public type="string" name="invite_button_streaming_subtext" id="0x7F12113B" />
-    <public type="string" name="invite_button_title_invited" id="0x7F12113C" />
-    <public type="string" name="invite_button_title_invited_group_dm" id="0x7F12113D" />
-    <public type="string" name="invite_button_title_invited_invalid" id="0x7F12113E" />
-    <public type="string" name="invite_button_title_invited_stream" id="0x7F12113F" />
-    <public type="string" name="invite_button_title_invited_to_play" id="0x7F121140" />
-    <public type="string" name="invite_button_title_invited_voice_channel" id="0x7F121141" />
-    <public type="string" name="invite_button_title_inviter" id="0x7F121142" />
-    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7F121143" />
-    <public type="string" name="invite_button_title_inviter_invalid" id="0x7F121144" />
-    <public type="string" name="invite_button_title_inviter_stream" id="0x7F121145" />
-    <public type="string" name="invite_button_title_inviter_voice_channel" id="0x7F121146" />
-    <public type="string" name="invite_button_title_streaming" id="0x7F121147" />
-    <public type="string" name="invite_copied" id="0x7F121148" />
-    <public type="string" name="invite_copy_invite_link_header_mobile" id="0x7F121149" />
-    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7F12114A" />
-    <public type="string" name="invite_edit_link" id="0x7F12114B" />
-    <public type="string" name="invite_embed_ask_to_join" id="0x7F12114C" />
-    <public type="string" name="invite_embed_full_group" id="0x7F12114D" />
-    <public type="string" name="invite_embed_game_has_ended" id="0x7F12114E" />
-    <public type="string" name="invite_embed_game_invite" id="0x7F12114F" />
-    <public type="string" name="invite_embed_in_group" id="0x7F121150" />
-    <public type="string" name="invite_embed_invite_to_join" id="0x7F121151" />
-    <public type="string" name="invite_embed_invite_to_join_group" id="0x7F121152" />
-    <public type="string" name="invite_embed_invite_to_listen" id="0x7F121153" />
-    <public type="string" name="invite_embed_invite_to_watch" id="0x7F121154" />
-    <public type="string" name="invite_embed_join_via_android" id="0x7F121155" />
-    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7F121156" />
-    <public type="string" name="invite_embed_join_via_ios" id="0x7F121157" />
-    <public type="string" name="invite_embed_join_via_xbox" id="0x7F121158" />
-    <public type="string" name="invite_embed_joined" id="0x7F121159" />
-    <public type="string" name="invite_embed_listen_has_ended" id="0x7F12115A" />
-    <public type="string" name="invite_embed_listening_invite" id="0x7F12115B" />
-    <public type="string" name="invite_embed_num_open_slots" id="0x7F12115C" />
-    <public type="string" name="invite_embed_send_invite" id="0x7F12115D" />
-    <public type="string" name="invite_embed_watch_has_ended" id="0x7F12115E" />
-    <public type="string" name="invite_empty_body" id="0x7F12115F" />
-    <public type="string" name="invite_empty_title" id="0x7F121160" />
-    <public type="string" name="invite_expiration_notice" id="0x7F121161" />
-    <public type="string" name="invite_expired_subtext_mobile" id="0x7F121162" />
-    <public type="string" name="invite_expires_days_or_uses_plural" id="0x7F121163" />
-    <public type="string" name="invite_expires_days_plural" id="0x7F121164" />
-    <public type="string" name="invite_expires_hours" id="0x7F121165" />
-    <public type="string" name="invite_expires_hours_or_uses" id="0x7F121166" />
-    <public type="string" name="invite_expires_minutes" id="0x7F121167" />
-    <public type="string" name="invite_expires_minutes_or_uses" id="0x7F121168" />
-    <public type="string" name="invite_expires_never" id="0x7F121169" />
-    <public type="string" name="invite_expires_uses" id="0x7F12116A" />
-    <public type="string" name="invite_footer_link_header" id="0x7F12116B" />
-    <public type="string" name="invite_friend_modal_invite" id="0x7F12116C" />
-    <public type="string" name="invite_friend_modal_loading" id="0x7F12116D" />
-    <public type="string" name="invite_friend_modal_no_results" id="0x7F12116E" />
-    <public type="string" name="invite_friend_modal_retry" id="0x7F12116F" />
-    <public type="string" name="invite_friend_modal_sent" id="0x7F121170" />
-    <public type="string" name="invite_friend_modal_title" id="0x7F121171" />
-    <public type="string" name="invite_friends" id="0x7F121172" />
-    <public type="string" name="invite_invalid_cta" id="0x7F121173" />
-    <public type="string" name="invite_invalid_error" id="0x7F121174" />
-    <public type="string" name="invite_link_copied" id="0x7F121175" />
-    <public type="string" name="invite_link_example_full" id="0x7F121176" />
-    <public type="string" name="invite_link_example_simple" id="0x7F121177" />
-    <public type="string" name="invite_link_example_verified" id="0x7F121178" />
-    <public type="string" name="invite_link_header" id="0x7F121179" />
-    <public type="string" name="invite_links_expire_after_1_day" id="0x7F12117A" />
-    <public type="string" name="invite_links_expire_after_default" id="0x7F12117B" />
-    <public type="string" name="invite_members" id="0x7F12117C" />
-    <public type="string" name="invite_message_placeholder" id="0x7F12117D" />
-    <public type="string" name="invite_modal_button" id="0x7F12117E" />
-    <public type="string" name="invite_modal_error_button_text" id="0x7F12117F" />
-    <public type="string" name="invite_modal_error_default" id="0x7F121180" />
-    <public type="string" name="invite_modal_error_invalid_body" id="0x7F121181" />
-    <public type="string" name="invite_modal_error_invalid_title" id="0x7F121182" />
-    <public type="string" name="invite_modal_error_title" id="0x7F121183" />
-    <public type="string" name="invite_modal_nevermind_button" id="0x7F121184" />
-    <public type="string" name="invite_modal_open_button" id="0x7F121185" />
-    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7F121186" />
-    <public type="string" name="invite_no_thanks" id="0x7F121187" />
-    <public type="string" name="invite_notice_message" id="0x7F121188" />
-    <public type="string" name="invite_notice_message_part_2" id="0x7F121189" />
-    <public type="string" name="invite_people" id="0x7F12118A" />
-    <public type="string" name="invite_pokemon_go_announcements_label_long" id="0x7F12118B" />
-    <public type="string" name="invite_pokemon_go_announcements_label_short" id="0x7F12118C" />
-    <public type="string" name="invite_pokemon_go_friendship_label_long" id="0x7F12118D" />
-    <public type="string" name="invite_pokemon_go_friendship_label_short" id="0x7F12118E" />
-    <public type="string" name="invite_pokemon_go_strategy_label_long" id="0x7F12118F" />
-    <public type="string" name="invite_pokemon_go_strategy_label_short" id="0x7F121190" />
-    <public type="string" name="invite_private_call_heads_up" id="0x7F121191" />
-    <public type="string" name="invite_search_for_friends" id="0x7F121192" />
-    <public type="string" name="invite_send_dm" id="0x7F121193" />
-    <public type="string" name="invite_send_error" id="0x7F121194" />
-    <public type="string" name="invite_sent" id="0x7F121195" />
-    <public type="string" name="invite_settings_description_no_expiration" id="0x7F121196" />
-    <public type="string" name="invite_settings_expired_description" id="0x7F121197" />
-    <public type="string" name="invite_settings_title" id="0x7F121198" />
-    <public type="string" name="invite_share_link_header_mobile" id="0x7F121199" />
-    <public type="string" name="invite_share_link_own_server" id="0x7F12119A" />
-    <public type="string" name="invite_share_link_to_stream" id="0x7F12119B" />
-    <public type="string" name="invite_step_subtitle" id="0x7F12119C" />
-    <public type="string" name="invite_step_title" id="0x7F12119D" />
-    <public type="string" name="invite_stream_footer_link_header" id="0x7F12119E" />
-    <public type="string" name="invite_stream_header" id="0x7F12119F" />
-    <public type="string" name="invite_to_server" id="0x7F1211A0" />
-    <public type="string" name="invite_urgent_days_message_placeholder" id="0x7F1211A1" />
-    <public type="string" name="invite_urgent_hours_message_placeholder" id="0x7F1211A2" />
-    <public type="string" name="invite_urgent_minutes_placeholder" id="0x7F1211A3" />
-    <public type="string" name="invite_url" id="0x7F1211A4" />
-    <public type="string" name="invite_voice_channel_join" id="0x7F1211A5" />
-    <public type="string" name="invite_voice_empty_mobile" id="0x7F1211A6" />
-    <public type="string" name="invite_welcome_heading" id="0x7F1211A7" />
-    <public type="string" name="invite_welcome_subheading" id="0x7F1211A8" />
-    <public type="string" name="invite_your_friends" id="0x7F1211A9" />
-    <public type="string" name="invite_your_friends_channel_mobile" id="0x7F1211AA" />
-    <public type="string" name="invite_your_friends_header_mobile" id="0x7F1211AB" />
-    <public type="string" name="invites" id="0x7F1211AC" />
-    <public type="string" name="ios_automatic_theme" id="0x7F1211AD" />
-    <public type="string" name="ios_automatic_theme_short" id="0x7F1211AE" />
-    <public type="string" name="ios_call_disconnected" id="0x7F1211AF" />
-    <public type="string" name="ios_call_ended" id="0x7F1211B0" />
-    <public type="string" name="ios_guild_delete_feedback_header" id="0x7F1211B1" />
-    <public type="string" name="ios_iap_generic_billing_error" id="0x7F1211B2" />
-    <public type="string" name="ios_iap_itunes_error" id="0x7F1211B3" />
-    <public type="string" name="ios_iap_manage_premium_guild_button" id="0x7F1211B4" />
-    <public type="string" name="ios_iap_manage_subscription_button" id="0x7F1211B5" />
-    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7F1211B6" />
-    <public type="string" name="ios_iap_manage_subscription_google_play" id="0x7F1211B7" />
-    <public type="string" name="ios_iap_restore_subscription_error" id="0x7F1211B8" />
-    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7F1211B9" />
-    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7F1211BA" />
-    <public type="string" name="ios_iap_restore_subscription_success" id="0x7F1211BB" />
-    <public type="string" name="ios_iap_switch_plans_button" id="0x7F1211BC" />
-    <public type="string" name="ios_iap_testflight_error" id="0x7F1211BD" />
-    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7F1211BE" />
-    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7F1211BF" />
-    <public type="string" name="ios_media_keyboard_more_photos" id="0x7F1211C0" />
-    <public type="string" name="ios_media_keyboard_no_permission" id="0x7F1211C1" />
-    <public type="string" name="ios_media_keyboard_no_photos" id="0x7F1211C2" />
-    <public type="string" name="ios_notification_see_full" id="0x7F1211C3" />
-    <public type="string" name="ios_profile_in_voice_call" id="0x7F1211C4" />
-    <public type="string" name="ios_profile_open_voice_channel" id="0x7F1211C5" />
-    <public type="string" name="ios_share_suggestions_hint" id="0x7F1211C6" />
-    <public type="string" name="ios_share_suggestions_toggle" id="0x7F1211C7" />
-    <public type="string" name="ios_stream_participants_hidden" id="0x7F1211C8" />
-    <public type="string" name="ios_stream_show_non_video" id="0x7F1211C9" />
-    <public type="string" name="ios_view_all" id="0x7F1211CA" />
-    <public type="string" name="ip_address_secured" id="0x7F1211CB" />
-    <public type="string" name="ip_authorization_succeeded" id="0x7F1211CC" />
-    <public type="string" name="ipad_no_screenshare_dialog_body" id="0x7F1211CD" />
-    <public type="string" name="ipad_no_screenshare_dialog_title" id="0x7F1211CE" />
-    <public type="string" name="it" id="0x7F1211CF" />
-    <public type="string" name="item_view_role_description" id="0x7F1211D0" />
-    <public type="string" name="ja" id="0x7F1211D1" />
-    <public type="string" name="join" id="0x7F1211D2" />
-    <public type="string" name="join_afk_channel_body" id="0x7F1211D3" />
-    <public type="string" name="join_call" id="0x7F1211D4" />
-    <public type="string" name="join_guild" id="0x7F1211D5" />
-    <public type="string" name="join_guild_connect" id="0x7F1211D6" />
-    <public type="string" name="join_guild_connect_cta" id="0x7F1211D7" />
-    <public type="string" name="join_guild_connect_text" id="0x7F1211D8" />
-    <public type="string" name="join_guild_description" id="0x7F1211D9" />
-    <public type="string" name="join_server_button_body" id="0x7F1211DA" />
-    <public type="string" name="join_server_button_cta" id="0x7F1211DB" />
-    <public type="string" name="join_server_button_cta_mobile" id="0x7F1211DC" />
-    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7F1211DD" />
-    <public type="string" name="join_server_description" id="0x7F1211DE" />
-    <public type="string" name="join_server_description_mobile" id="0x7F1211DF" />
-    <public type="string" name="join_server_description_mobile_refresh" id="0x7F1211E0" />
-    <public type="string" name="join_server_description_nuf" id="0x7F1211E1" />
-    <public type="string" name="join_server_examples" id="0x7F1211E2" />
-    <public type="string" name="join_server_invite_examples_header" id="0x7F1211E3" />
-    <public type="string" name="join_server_invite_examples_mobile_refresh" id="0x7F1211E4" />
-    <public type="string" name="join_server_title" id="0x7F1211E5" />
-    <public type="string" name="join_server_title_mobile_refresh" id="0x7F1211E6" />
-    <public type="string" name="join_stream" id="0x7F1211E7" />
-    <public type="string" name="join_thread" id="0x7F1211E8" />
-    <public type="string" name="join_video_call" id="0x7F1211E9" />
-    <public type="string" name="join_video_channel" id="0x7F1211EA" />
-    <public type="string" name="join_voice_call" id="0x7F1211EB" />
-    <public type="string" name="join_voice_channel" id="0x7F1211EC" />
-    <public type="string" name="join_voice_channel_cta" id="0x7F1211ED" />
-    <public type="string" name="join_waitlist" id="0x7F1211EE" />
-    <public type="string" name="joined_guild" id="0x7F1211EF" />
-    <public type="string" name="joining_guild" id="0x7F1211F0" />
-    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7F1211F1" />
-    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7F1211F2" />
-    <public type="string" name="joining_will_end_current_call_title" id="0x7F1211F3" />
-    <public type="string" name="jump" id="0x7F1211F4" />
-    <public type="string" name="jump_bar_viewing_reply" id="0x7F1211F5" />
-    <public type="string" name="jump_to_channel" id="0x7F1211F6" />
-    <public type="string" name="jump_to_last_unread_message" id="0x7F1211F7" />
-    <public type="string" name="jump_to_message" id="0x7F1211F8" />
-    <public type="string" name="jump_to_original_message" id="0x7F1211F9" />
-    <public type="string" name="jump_to_present" id="0x7F1211FA" />
-    <public type="string" name="jump_to_reply" id="0x7F1211FB" />
-    <public type="string" name="keep_permissions" id="0x7F1211FC" />
-    <public type="string" name="keybind_activate_overlay_chat" id="0x7F1211FD" />
-    <public type="string" name="keybind_conflict" id="0x7F1211FE" />
-    <public type="string" name="keybind_description_modal_call_accept" id="0x7F1211FF" />
-    <public type="string" name="keybind_description_modal_call_decline" id="0x7F121200" />
-    <public type="string" name="keybind_description_modal_call_start" id="0x7F121201" />
-    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7F121202" />
-    <public type="string" name="keybind_description_modal_create_guild" id="0x7F121203" />
-    <public type="string" name="keybind_description_modal_easter_egg" id="0x7F121204" />
-    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7F121205" />
-    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7F121206" />
-    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7F121207" />
-    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7F121208" />
-    <public type="string" name="keybind_description_modal_mark_top_inbox_channel_read" id="0x7F121209" />
-    <public type="string" name="keybind_description_modal_navigate_back_forward" id="0x7F12120A" />
-    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7F12120B" />
-    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7F12120C" />
-    <public type="string" name="keybind_description_modal_navigate_to_call" id="0x7F12120D" />
-    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7F12120E" />
-    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7F12120F" />
-    <public type="string" name="keybind_description_modal_search" id="0x7F121210" />
-    <public type="string" name="keybind_description_modal_search_emojis" id="0x7F121211" />
-    <public type="string" name="keybind_description_modal_search_gifs" id="0x7F121212" />
-    <public type="string" name="keybind_description_modal_search_stickers" id="0x7F121213" />
-    <public type="string" name="keybind_description_modal_subtitle" id="0x7F121214" />
-    <public type="string" name="keybind_description_modal_title" id="0x7F121215" />
-    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7F121216" />
-    <public type="string" name="keybind_description_modal_toggle_help" id="0x7F121217" />
-    <public type="string" name="keybind_description_modal_toggle_inbox" id="0x7F121218" />
-    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7F121219" />
-    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7F12121A" />
-    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7F12121B" />
-    <public type="string" name="keybind_description_modal_toggle_users" id="0x7F12121C" />
-    <public type="string" name="keybind_description_modal_unread_channels" id="0x7F12121D" />
-    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7F12121E" />
-    <public type="string" name="keybind_description_modal_upload_file" id="0x7F12121F" />
-    <public type="string" name="keybind_description_navigate_back" id="0x7F121220" />
-    <public type="string" name="keybind_description_navigate_forward" id="0x7F121221" />
-    <public type="string" name="keybind_description_push_to_mute" id="0x7F121222" />
-    <public type="string" name="keybind_description_push_to_talk" id="0x7F121223" />
-    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7F121224" />
-    <public type="string" name="keybind_description_toggle_deafen" id="0x7F121225" />
-    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7F121226" />
-    <public type="string" name="keybind_description_toggle_mute" id="0x7F121227" />
-    <public type="string" name="keybind_description_toggle_overlay" id="0x7F121228" />
-    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7F121229" />
-    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7F12122A" />
-    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7F12122B" />
-    <public type="string" name="keybind_description_unassigned" id="0x7F12122C" />
-    <public type="string" name="keybind_in_broswer_notice" id="0x7F12122D" />
-    <public type="string" name="keybind_navigate_back" id="0x7F12122E" />
-    <public type="string" name="keybind_navigate_forward" id="0x7F12122F" />
-    <public type="string" name="keybind_navigation_conflict" id="0x7F121230" />
-    <public type="string" name="keybind_push_to_mute" id="0x7F121231" />
-    <public type="string" name="keybind_push_to_talk" id="0x7F121232" />
-    <public type="string" name="keybind_push_to_talk_priority" id="0x7F121233" />
-    <public type="string" name="keybind_toggle_deafen" id="0x7F121234" />
-    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7F121235" />
-    <public type="string" name="keybind_toggle_mute" id="0x7F121236" />
-    <public type="string" name="keybind_toggle_overlay" id="0x7F121237" />
-    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7F121238" />
-    <public type="string" name="keybind_toggle_stream_mode" id="0x7F121239" />
-    <public type="string" name="keybind_toggle_voice_mode" id="0x7F12123A" />
-    <public type="string" name="keybind_unassigned" id="0x7F12123B" />
-    <public type="string" name="keybinds" id="0x7F12123C" />
-    <public type="string" name="keyboard_behavior_mobile_header" id="0x7F12123D" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7F12123E" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7F12123F" />
-    <public type="string" name="keyboard_shortcuts_explainer_help_center_link" id="0x7F121240" />
-    <public type="string" name="keyboard_shortcuts_explainer_list_shortcut" id="0x7F121241" />
-    <public type="string" name="keyboard_shortcuts_explainer_modal_body" id="0x7F121242" />
-    <public type="string" name="keyboard_shortcuts_explainer_modal_title" id="0x7F121243" />
-    <public type="string" name="keyboard_shortcuts_explainer_quickswitcher_shortcut" id="0x7F121244" />
-    <public type="string" name="kick" id="0x7F121245" />
-    <public type="string" name="kick_from_server" id="0x7F121246" />
-    <public type="string" name="kick_members" id="0x7F121247" />
-    <public type="string" name="kick_user" id="0x7F121248" />
-    <public type="string" name="kick_user_body" id="0x7F121249" />
-    <public type="string" name="kick_user_confirmed" id="0x7F12124A" />
-    <public type="string" name="kick_user_error_generic" id="0x7F12124B" />
-    <public type="string" name="kick_user_from_server" id="0x7F12124C" />
-    <public type="string" name="kick_user_title" id="0x7F12124D" />
-    <public type="string" name="ko" id="0x7F12124E" />
-    <public type="string" name="krisp_model_version" id="0x7F12124F" />
-    <public type="string" name="label_with_online_status" id="0x7F121250" />
-    <public type="string" name="language" id="0x7F121251" />
-    <public type="string" name="language_not_found" id="0x7F121252" />
-    <public type="string" name="language_select" id="0x7F121253" />
-    <public type="string" name="language_updated" id="0x7F121254" />
-    <public type="string" name="languages" id="0x7F121255" />
-    <public type="string" name="large_guild_notify_all_messages_description" id="0x7F121256" />
-    <public type="string" name="large_message_upload_subtitle" id="0x7F121257" />
-    <public type="string" name="large_message_upload_title" id="0x7F121258" />
-    <public type="string" name="large_message_upload_title_max_length" id="0x7F121259" />
-    <public type="string" name="last_seen" id="0x7F12125A" />
-    <public type="string" name="last_sync" id="0x7F12125B" />
-    <public type="string" name="launch_app" id="0x7F12125C" />
-    <public type="string" name="learn_more" id="0x7F12125D" />
-    <public type="string" name="learn_more_alt" id="0x7F12125E" />
-    <public type="string" name="learn_more_link" id="0x7F12125F" />
-    <public type="string" name="leave_call" id="0x7F121260" />
-    <public type="string" name="leave_group_dm" id="0x7F121261" />
-    <public type="string" name="leave_group_dm_body" id="0x7F121262" />
-    <public type="string" name="leave_group_dm_managed_body" id="0x7F121263" />
-    <public type="string" name="leave_group_dm_managed_title" id="0x7F121264" />
-    <public type="string" name="leave_group_dm_title" id="0x7F121265" />
-    <public type="string" name="leave_server" id="0x7F121266" />
-    <public type="string" name="leave_server_body" id="0x7F121267" />
-    <public type="string" name="leave_server_body_mobile" id="0x7F121268" />
-    <public type="string" name="leave_server_title" id="0x7F121269" />
-    <public type="string" name="leave_thread" id="0x7F12126A" />
-    <public type="string" name="lets_go" id="0x7F12126B" />
-    <public type="string" name="lib_name" id="0x7F12126C" />
-    <public type="string" name="library" id="0x7F12126D" />
-    <public type="string" name="light_blue" id="0x7F12126E" />
-    <public type="string" name="light_green" id="0x7F12126F" />
-    <public type="string" name="light_grey" id="0x7F121270" />
-    <public type="string" name="link_copied" id="0x7F121271" />
-    <public type="string" name="link_settings" id="0x7F121272" />
-    <public type="string" name="link_your_discord_account" id="0x7F121273" />
-    <public type="string" name="link_your_xbox_account_1" id="0x7F121274" />
-    <public type="string" name="link_your_xbox_account_2" id="0x7F121275" />
-    <public type="string" name="linux" id="0x7F121276" />
-    <public type="string" name="listen_on_spotify" id="0x7F121277" />
-    <public type="string" name="listening_count" id="0x7F121278" />
-    <public type="string" name="listening_to" id="0x7F121279" />
-    <public type="string" name="live" id="0x7F12127A" />
-    <public type="string" name="live_guild_stage_event_label" id="0x7F12127B" />
-    <public type="string" name="live_stages" id="0x7F12127C" />
-    <public type="string" name="live_viewers" id="0x7F12127D" />
-    <public type="string" name="load_image_error" id="0x7F12127E" />
-    <public type="string" name="load_more_messages" id="0x7F12127F" />
-    <public type="string" name="load_reactions_error" id="0x7F121280" />
-    <public type="string" name="loading" id="0x7F121281" />
-    <public type="string" name="loading_did_you_know" id="0x7F121282" />
-    <public type="string" name="loading_keybind_tip_1" id="0x7F121283" />
-    <public type="string" name="loading_keybind_tip_2" id="0x7F121284" />
-    <public type="string" name="loading_keybind_tip_3" id="0x7F121285" />
-    <public type="string" name="loading_keybind_tip_4" id="0x7F121286" />
-    <public type="string" name="loading_keybind_tip_5" id="0x7F121287" />
-    <public type="string" name="loading_keybind_tip_6" id="0x7F121288" />
-    <public type="string" name="loading_keybind_tip_7" id="0x7F121289" />
-    <public type="string" name="loading_keybind_tip_8" id="0x7F12128A" />
-    <public type="string" name="loading_line_1" id="0x7F12128B" />
-    <public type="string" name="loading_line_10" id="0x7F12128C" />
-    <public type="string" name="loading_line_11" id="0x7F12128D" />
-    <public type="string" name="loading_line_12" id="0x7F12128E" />
-    <public type="string" name="loading_line_13" id="0x7F12128F" />
-    <public type="string" name="loading_line_14" id="0x7F121290" />
-    <public type="string" name="loading_line_15" id="0x7F121291" />
-    <public type="string" name="loading_line_2" id="0x7F121292" />
-    <public type="string" name="loading_line_3" id="0x7F121293" />
-    <public type="string" name="loading_line_4" id="0x7F121294" />
-    <public type="string" name="loading_line_5" id="0x7F121295" />
-    <public type="string" name="loading_line_6" id="0x7F121296" />
-    <public type="string" name="loading_line_7" id="0x7F121297" />
-    <public type="string" name="loading_line_8" id="0x7F121298" />
-    <public type="string" name="loading_line_9" id="0x7F121299" />
-    <public type="string" name="loading_messages_a11y_label" id="0x7F12129A" />
-    <public type="string" name="loading_note" id="0x7F12129B" />
-    <public type="string" name="loading_text" id="0x7F12129C" />
-    <public type="string" name="loading_tip_1" id="0x7F12129D" />
-    <public type="string" name="loading_tip_10" id="0x7F12129E" />
-    <public type="string" name="loading_tip_11" id="0x7F12129F" />
-    <public type="string" name="loading_tip_12" id="0x7F1212A0" />
-    <public type="string" name="loading_tip_13" id="0x7F1212A1" />
-    <public type="string" name="loading_tip_14" id="0x7F1212A2" />
-    <public type="string" name="loading_tip_15" id="0x7F1212A3" />
-    <public type="string" name="loading_tip_16" id="0x7F1212A4" />
-    <public type="string" name="loading_tip_17" id="0x7F1212A5" />
-    <public type="string" name="loading_tip_18" id="0x7F1212A6" />
-    <public type="string" name="loading_tip_19" id="0x7F1212A7" />
-    <public type="string" name="loading_tip_2" id="0x7F1212A8" />
-    <public type="string" name="loading_tip_20" id="0x7F1212A9" />
-    <public type="string" name="loading_tip_21" id="0x7F1212AA" />
-    <public type="string" name="loading_tip_22" id="0x7F1212AB" />
-    <public type="string" name="loading_tip_23" id="0x7F1212AC" />
-    <public type="string" name="loading_tip_24" id="0x7F1212AD" />
-    <public type="string" name="loading_tip_25" id="0x7F1212AE" />
-    <public type="string" name="loading_tip_26" id="0x7F1212AF" />
-    <public type="string" name="loading_tip_3" id="0x7F1212B0" />
-    <public type="string" name="loading_tip_4" id="0x7F1212B1" />
-    <public type="string" name="loading_tip_5" id="0x7F1212B2" />
-    <public type="string" name="loading_tip_6" id="0x7F1212B3" />
-    <public type="string" name="loading_tip_7" id="0x7F1212B4" />
-    <public type="string" name="loading_tip_8" id="0x7F1212B5" />
-    <public type="string" name="loading_tip_9" id="0x7F1212B6" />
-    <public type="string" name="loading_your_pin" id="0x7F1212B7" />
-    <public type="string" name="lobby" id="0x7F1212B8" />
-    <public type="string" name="local_muted" id="0x7F1212B9" />
-    <public type="string" name="local_push_notification_guild_verification_body" id="0x7F1212BA" />
-    <public type="string" name="local_push_notification_screenshare_not_supported" id="0x7F1212BB" />
-    <public type="string" name="local_video_disabled" id="0x7F1212BC" />
-    <public type="string" name="locale" id="0x7F1212BD" />
-    <public type="string" name="login" id="0x7F1212BE" />
-    <public type="string" name="login_as" id="0x7F1212BF" />
-    <public type="string" name="login_body" id="0x7F1212C0" />
-    <public type="string" name="login_required" id="0x7F1212C1" />
-    <public type="string" name="login_stage" id="0x7F1212C2" />
-    <public type="string" name="login_title" id="0x7F1212C3" />
-    <public type="string" name="login_with_qr" id="0x7F1212C4" />
-    <public type="string" name="login_with_qr_description" id="0x7F1212C5" />
-    <public type="string" name="logo_description" id="0x7F1212C6" />
-    <public type="string" name="logout" id="0x7F1212C7" />
-    <public type="string" name="low_quality_image_mode" id="0x7F1212C8" />
-    <public type="string" name="low_quality_image_mode_help" id="0x7F1212C9" />
-    <public type="string" name="lt" id="0x7F1212CA" />
-    <public type="string" name="lurker_mode_chat_input_button" id="0x7F1212CB" />
-    <public type="string" name="lurker_mode_chat_input_message" id="0x7F1212CC" />
-    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7F1212CD" />
-    <public type="string" name="lurker_mode_nag_bar_button" id="0x7F1212CE" />
-    <public type="string" name="lurker_mode_nag_bar_header" id="0x7F1212CF" />
-    <public type="string" name="lurker_mode_popout_cancel" id="0x7F1212D0" />
-    <public type="string" name="lurker_mode_popout_chat_header" id="0x7F1212D1" />
-    <public type="string" name="lurker_mode_popout_join" id="0x7F1212D2" />
-    <public type="string" name="lurker_mode_popout_reactions_header" id="0x7F1212D3" />
-    <public type="string" name="lurker_mode_popout_success_body" id="0x7F1212D4" />
-    <public type="string" name="lurker_mode_popout_success_button" id="0x7F1212D5" />
-    <public type="string" name="lurker_mode_popout_success_header" id="0x7F1212D6" />
-    <public type="string" name="lurker_mode_popout_upsell_body" id="0x7F1212D7" />
-    <public type="string" name="lurker_mode_view_guild" id="0x7F1212D8" />
-    <public type="string" name="macos" id="0x7F1212D9" />
-    <public type="string" name="magenta" id="0x7F1212DA" />
-    <public type="string" name="manage_channel" id="0x7F1212DB" />
-    <public type="string" name="manage_channel_description" id="0x7F1212DC" />
-    <public type="string" name="manage_channels" id="0x7F1212DD" />
-    <public type="string" name="manage_channels_description" id="0x7F1212DE" />
-    <public type="string" name="manage_emojis" id="0x7F1212DF" />
-    <public type="string" name="manage_emojis_and_stickers" id="0x7F1212E0" />
-    <public type="string" name="manage_events" id="0x7F1212E1" />
-    <public type="string" name="manage_messages" id="0x7F1212E2" />
-    <public type="string" name="manage_messages_description" id="0x7F1212E3" />
-    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7F1212E4" />
-    <public type="string" name="manage_nicknames" id="0x7F1212E5" />
-    <public type="string" name="manage_nicknames_description" id="0x7F1212E6" />
-    <public type="string" name="manage_permissions" id="0x7F1212E7" />
-    <public type="string" name="manage_permissions_description" id="0x7F1212E8" />
-    <public type="string" name="manage_roles" id="0x7F1212E9" />
-    <public type="string" name="manage_roles_description" id="0x7F1212EA" />
-    <public type="string" name="manage_server" id="0x7F1212EB" />
-    <public type="string" name="manage_server_description" id="0x7F1212EC" />
-    <public type="string" name="manage_threads" id="0x7F1212ED" />
-    <public type="string" name="manage_user" id="0x7F1212EE" />
-    <public type="string" name="manage_user_shorthand" id="0x7F1212EF" />
-    <public type="string" name="manage_webhooks" id="0x7F1212F0" />
-    <public type="string" name="manage_webhooks_description" id="0x7F1212F1" />
-    <public type="string" name="managed_role_explaination" id="0x7F1212F2" />
-    <public type="string" name="managed_role_integration_linked_explanation" id="0x7F1212F3" />
-    <public type="string" name="managed_role_premium_subscriber_explanation" id="0x7F1212F4" />
-    <public type="string" name="mark_as_read" id="0x7F1212F5" />
-    <public type="string" name="mark_unread" id="0x7F1212F6" />
-    <public type="string" name="marked_as_read" id="0x7F1212F7" />
-    <public type="string" name="marketing_premium_tier_1_perk_list_omit_guild_cap" id="0x7F1212F8" />
-    <public type="string" name="marketing_premium_tier_1_perk_list_omit_message_length" id="0x7F1212F9" />
-    <public type="string" name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages" id="0x7F1212FA" />
-    <public type="string" name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds" id="0x7F1212FB" />
-    <public type="string" name="marketing_refresh_premium_features_badge_heading" id="0x7F1212FC" />
-    <public type="string" name="marketing_refresh_premium_features_badge_subheading" id="0x7F1212FD" />
-    <public type="string" name="marketing_refresh_premium_features_emoji_heading" id="0x7F1212FE" />
-    <public type="string" name="marketing_refresh_premium_features_emoji_subheading" id="0x7F1212FF" />
-    <public type="string" name="marketing_refresh_premium_features_file_upload_heading" id="0x7F121300" />
-    <public type="string" name="marketing_refresh_premium_features_file_upload_subheading" id="0x7F121301" />
-    <public type="string" name="marketing_refresh_premium_features_go_live_heading" id="0x7F121302" />
-    <public type="string" name="marketing_refresh_premium_features_go_live_info" id="0x7F121303" />
-    <public type="string" name="marketing_refresh_premium_features_go_live_subheading" id="0x7F121304" />
-    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_heading" id="0x7F121305" />
-    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading" id="0x7F121306" />
-    <public type="string" name="marketing_refresh_premium_features_profile_heading" id="0x7F121307" />
-    <public type="string" name="marketing_refresh_premium_features_profile_subheading" id="0x7F121308" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description" id="0x7F121309" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_fps" id="0x7F12130A" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_guild_cap" id="0x7F12130B" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label" id="0x7F12130C" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_message_length" id="0x7F12130D" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_no_premium_guild_subscriptions" id="0x7F12130E" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_profile_customization" id="0x7F12130F" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_upload" id="0x7F121310" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_with_price" id="0x7F121311" />
-    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_with_price_no_info_hook" id="0x7F121312" />
-    <public type="string" name="marketing_refresh_premium_tier_2_cta_subtitle" id="0x7F121313" />
-    <public type="string" name="marketing_refresh_premium_tier_2_cta_title" id="0x7F121314" />
-    <public type="string" name="marketing_refresh_premium_tier_2_subtitle" id="0x7F121315" />
-    <public type="string" name="marketing_refresh_premium_tier_2_subtitle_with_price" id="0x7F121316" />
-    <public type="string" name="marketing_refresh_premium_tier_2_title" id="0x7F121317" />
-    <public type="string" name="marketing_tier_1_perk_list_boost_discount" id="0x7F121318" />
-    <public type="string" name="marketing_tier_1_perk_list_custom_emoji" id="0x7F121319" />
-    <public type="string" name="marketing_tier_1_perk_list_stream_quality" id="0x7F12131A" />
-    <public type="string" name="marketing_tier_1_perk_list_upload_size" id="0x7F12131B" />
-    <public type="string" name="marketing_tier_1_perk_omit_stickers" id="0x7F12131C" />
-    <public type="string" name="masked_link_body" id="0x7F12131D" />
-    <public type="string" name="masked_link_cancel" id="0x7F12131E" />
-    <public type="string" name="masked_link_confirm" id="0x7F12131F" />
-    <public type="string" name="masked_link_trust_this_domain" id="0x7F121320" />
-    <public type="string" name="masked_link_trust_this_protocol" id="0x7F121321" />
-    <public type="string" name="masked_protocol_link_body" id="0x7F121322" />
-    <public type="string" name="material_clock_display_divider" id="0x7F121323" />
-    <public type="string" name="material_clock_toggle_content_description" id="0x7F121324" />
-    <public type="string" name="material_hour_selection" id="0x7F121325" />
-    <public type="string" name="material_hour_suffix" id="0x7F121326" />
-    <public type="string" name="material_minute_selection" id="0x7F121327" />
-    <public type="string" name="material_minute_suffix" id="0x7F121328" />
-    <public type="string" name="material_slider_range_end" id="0x7F121329" />
-    <public type="string" name="material_slider_range_start" id="0x7F12132A" />
-    <public type="string" name="material_timepicker_am" id="0x7F12132B" />
-    <public type="string" name="material_timepicker_clock_mode_description" id="0x7F12132C" />
-    <public type="string" name="material_timepicker_hour" id="0x7F12132D" />
-    <public type="string" name="material_timepicker_minute" id="0x7F12132E" />
-    <public type="string" name="material_timepicker_pm" id="0x7F12132F" />
-    <public type="string" name="material_timepicker_select_time" id="0x7F121330" />
-    <public type="string" name="material_timepicker_text_input_mode_description" id="0x7F121331" />
-    <public type="string" name="mature_listing_accept" id="0x7F121332" />
-    <public type="string" name="mature_listing_decline" id="0x7F121333" />
-    <public type="string" name="mature_listing_description" id="0x7F121334" />
-    <public type="string" name="mature_listing_title" id="0x7F121335" />
-    <public type="string" name="max_age_never" id="0x7F121336" />
-    <public type="string" name="max_age_never_description_mobile" id="0x7F121337" />
-    <public type="string" name="max_guild_members_reached_error" id="0x7F121338" />
-    <public type="string" name="max_number_of_uses" id="0x7F121339" />
-    <public type="string" name="max_uses" id="0x7F12133A" />
-    <public type="string" name="max_uses_description_mobile" id="0x7F12133B" />
-    <public type="string" name="max_uses_description_unlimited_uses" id="0x7F12133C" />
-    <public type="string" name="maybe_later" id="0x7F12133D" />
-    <public type="string" name="me" id="0x7F12133E" />
-    <public type="string" name="media_keyboard_browse" id="0x7F12133F" />
-    <public type="string" name="media_keyboard_gift" id="0x7F121340" />
-    <public type="string" name="member" id="0x7F121341" />
-    <public type="string" name="member_list" id="0x7F121342" />
-    <public type="string" name="member_list_private_thread_instructions" id="0x7F121343" />
-    <public type="string" name="member_list_server_owner_help" id="0x7F121344" />
-    <public type="string" name="member_verification_add_question" id="0x7F121345" />
-    <public type="string" name="member_verification_add_rule" id="0x7F121346" />
-    <public type="string" name="member_verification_application_confirmation_subtitle" id="0x7F121347" />
-    <public type="string" name="member_verification_application_confirmation_title" id="0x7F121348" />
-    <public type="string" name="member_verification_application_confirmation_title_with_guild_name" id="0x7F121349" />
-    <public type="string" name="member_verification_application_reapply" id="0x7F12134A" />
-    <public type="string" name="member_verification_application_rejected_icon" id="0x7F12134B" />
-    <public type="string" name="member_verification_application_rejected_reason" id="0x7F12134C" />
-    <public type="string" name="member_verification_application_rejected_title" id="0x7F12134D" />
-    <public type="string" name="member_verification_application_rejected_title_with_guild_name" id="0x7F12134E" />
-    <public type="string" name="member_verification_approved_application_modal_confirm" id="0x7F12134F" />
-    <public type="string" name="member_verification_approved_application_modal_desc" id="0x7F121350" />
-    <public type="string" name="member_verification_approved_application_modal_title" id="0x7F121351" />
-    <public type="string" name="member_verification_cancel_application" id="0x7F121352" />
-    <public type="string" name="member_verification_cancel_application_subtitle" id="0x7F121353" />
-    <public type="string" name="member_verification_cancel_pending_application_modal_desc" id="0x7F121354" />
-    <public type="string" name="member_verification_cancel_pending_application_modal_title" id="0x7F121355" />
-    <public type="string" name="member_verification_chat_blocker_text" id="0x7F121356" />
-    <public type="string" name="member_verification_chat_input_guard_message" id="0x7F121357" />
-    <public type="string" name="member_verification_choices_required_error" id="0x7F121358" />
-    <public type="string" name="member_verification_claim_account_icon" id="0x7F121359" />
-    <public type="string" name="member_verification_claim_account_info" id="0x7F12135A" />
-    <public type="string" name="member_verification_claim_account_subtitle" id="0x7F12135B" />
-    <public type="string" name="member_verification_claim_account_title" id="0x7F12135C" />
-    <public type="string" name="member_verification_confirm_leave_title" id="0x7F12135D" />
-    <public type="string" name="member_verification_delete_field_confirm_text" id="0x7F12135E" />
-    <public type="string" name="member_verification_delete_field_confirm_title" id="0x7F12135F" />
-    <public type="string" name="member_verification_disable_confirm_approve_all" id="0x7F121360" />
-    <public type="string" name="member_verification_disable_confirm_body" id="0x7F121361" />
-    <public type="string" name="member_verification_disable_confirm_kick_all" id="0x7F121362" />
-    <public type="string" name="member_verification_disable_confirm_title" id="0x7F121363" />
-    <public type="string" name="member_verification_email_confirmation_subtitle" id="0x7F121364" />
-    <public type="string" name="member_verification_email_confirmation_title" id="0x7F121365" />
-    <public type="string" name="member_verification_email_resend" id="0x7F121366" />
-    <public type="string" name="member_verification_email_verification_email_sent" id="0x7F121367" />
-    <public type="string" name="member_verification_email_verification_enabled" id="0x7F121368" />
-    <public type="string" name="member_verification_email_verification_resend_email" id="0x7F121369" />
-    <public type="string" name="member_verification_email_verified" id="0x7F12136A" />
-    <public type="string" name="member_verification_example_rules" id="0x7F12136B" />
-    <public type="string" name="member_verification_field_placeholder" id="0x7F12136C" />
-    <public type="string" name="member_verification_field_question" id="0x7F12136D" />
-    <public type="string" name="member_verification_field_question_required_error" id="0x7F12136E" />
-    <public type="string" name="member_verification_folder_name" id="0x7F12136F" />
-    <public type="string" name="member_verification_form_fields_limit" id="0x7F121370" />
-    <public type="string" name="member_verification_form_incomplete" id="0x7F121371" />
-    <public type="string" name="member_verification_form_item_coming_soon" id="0x7F121372" />
-    <public type="string" name="member_verification_form_item_email_verification_label" id="0x7F121373" />
-    <public type="string" name="member_verification_form_item_email_verification_settings_label" id="0x7F121374" />
-    <public type="string" name="member_verification_form_item_file_upload" id="0x7F121375" />
-    <public type="string" name="member_verification_form_item_multiple_choice" id="0x7F121376" />
-    <public type="string" name="member_verification_form_item_paragraph" id="0x7F121377" />
-    <public type="string" name="member_verification_form_item_phone_verification_label" id="0x7F121378" />
-    <public type="string" name="member_verification_form_item_rules" id="0x7F121379" />
-    <public type="string" name="member_verification_form_item_text_input" id="0x7F12137A" />
-    <public type="string" name="member_verification_form_item_verification" id="0x7F12137B" />
-    <public type="string" name="member_verification_form_required_item" id="0x7F12137C" />
-    <public type="string" name="member_verification_form_rules_label" id="0x7F12137D" />
-    <public type="string" name="member_verification_form_verification_settings" id="0x7F12137E" />
-    <public type="string" name="member_verification_get_started_button" id="0x7F12137F" />
-    <public type="string" name="member_verification_get_started_subtitle" id="0x7F121380" />
-    <public type="string" name="member_verification_get_started_title" id="0x7F121381" />
-    <public type="string" name="member_verification_icon_desc" id="0x7F121382" />
-    <public type="string" name="member_verification_learn_more" id="0x7F121383" />
-    <public type="string" name="member_verification_leave_application_complete_later" id="0x7F121384" />
-    <public type="string" name="member_verification_leave_application_desc" id="0x7F121385" />
-    <public type="string" name="member_verification_leave_application_title" id="0x7F121386" />
-    <public type="string" name="member_verification_modal_subtitle" id="0x7F121387" />
-    <public type="string" name="member_verification_modal_title" id="0x7F121388" />
-    <public type="string" name="member_verification_multiple_choice_add" id="0x7F121389" />
-    <public type="string" name="member_verification_multiple_choice_limit" id="0x7F12138A" />
-    <public type="string" name="member_verification_multiple_choice_placeholder" id="0x7F12138B" />
-    <public type="string" name="member_verification_need_rules_channel_perms" id="0x7F12138C" />
-    <public type="string" name="member_verification_notice_cta" id="0x7F12138D" />
-    <public type="string" name="member_verification_notice_text" id="0x7F12138E" />
-    <public type="string" name="member_verification_num_emojis" id="0x7F12138F" />
-    <public type="string" name="member_verification_num_members" id="0x7F121390" />
-    <public type="string" name="member_verification_num_online" id="0x7F121391" />
-    <public type="string" name="member_verification_pending_application_cancel_modal_title" id="0x7F121392" />
-    <public type="string" name="member_verification_pending_application_icon" id="0x7F121393" />
-    <public type="string" name="member_verification_pending_application_leave_server_modal_desc" id="0x7F121394" />
-    <public type="string" name="member_verification_pending_application_leave_server_modal_title" id="0x7F121395" />
-    <public type="string" name="member_verification_pending_application_modal_cancel" id="0x7F121396" />
-    <public type="string" name="member_verification_pending_application_modal_confirm" id="0x7F121397" />
-    <public type="string" name="member_verification_pending_application_modal_desc" id="0x7F121398" />
-    <public type="string" name="member_verification_pending_application_modal_dismiss" id="0x7F121399" />
-    <public type="string" name="member_verification_pending_application_modal_leave" id="0x7F12139A" />
-    <public type="string" name="member_verification_pending_application_modal_reapply" id="0x7F12139B" />
-    <public type="string" name="member_verification_pending_application_modal_title" id="0x7F12139C" />
-    <public type="string" name="member_verification_pending_application_modal_withdraw_and_leave" id="0x7F12139D" />
-    <public type="string" name="member_verification_phone_verification_enabled" id="0x7F12139E" />
-    <public type="string" name="member_verification_phone_verified" id="0x7F12139F" />
-    <public type="string" name="member_verification_preview_disabled_markdown_warning" id="0x7F1213A0" />
-    <public type="string" name="member_verification_progress_lost_continue" id="0x7F1213A1" />
-    <public type="string" name="member_verification_progress_lost_title" id="0x7F1213A2" />
-    <public type="string" name="member_verification_read_rules" id="0x7F1213A3" />
-    <public type="string" name="member_verification_rejected_title" id="0x7F1213A4" />
-    <public type="string" name="member_verification_rule_be_respectful" id="0x7F1213A5" />
-    <public type="string" name="member_verification_rule_be_respectful_full" id="0x7F1213A6" />
-    <public type="string" name="member_verification_rule_index" id="0x7F1213A7" />
-    <public type="string" name="member_verification_rule_limit" id="0x7F1213A8" />
-    <public type="string" name="member_verification_rule_no_nsfw" id="0x7F1213A9" />
-    <public type="string" name="member_verification_rule_no_nsfw_full" id="0x7F1213AA" />
-    <public type="string" name="member_verification_rule_no_spam" id="0x7F1213AB" />
-    <public type="string" name="member_verification_rule_no_spam_full" id="0x7F1213AC" />
-    <public type="string" name="member_verification_rule_placeholder" id="0x7F1213AD" />
-    <public type="string" name="member_verification_rule_safe" id="0x7F1213AE" />
-    <public type="string" name="member_verification_rule_safe_full" id="0x7F1213AF" />
-    <public type="string" name="member_verification_rule_tooltip" id="0x7F1213B0" />
-    <public type="string" name="member_verification_rules_required_error" id="0x7F1213B1" />
-    <public type="string" name="member_verification_verification_field_settings_tooltip" id="0x7F1213B2" />
-    <public type="string" name="member_verification_verification_icon" id="0x7F1213B3" />
-    <public type="string" name="member_verification_verified" id="0x7F1213B4" />
-    <public type="string" name="member_verification_verify_email_icon" id="0x7F1213B5" />
-    <public type="string" name="member_verification_version_mismatch_error" id="0x7F1213B6" />
-    <public type="string" name="member_verification_warning" id="0x7F1213B7" />
-    <public type="string" name="member_verification_warning_cancel" id="0x7F1213B8" />
-    <public type="string" name="member_verification_warning_confirm" id="0x7F1213B9" />
-    <public type="string" name="member_verification_warning_description" id="0x7F1213BA" />
-    <public type="string" name="member_verification_warning_description_and_fields" id="0x7F1213BB" />
-    <public type="string" name="member_verification_warning_fields" id="0x7F1213BC" />
-    <public type="string" name="member_verification_warning_title" id="0x7F1213BD" />
-    <public type="string" name="member_verification_warning_update" id="0x7F1213BE" />
-    <public type="string" name="member_verification_warning_update_modal_desc" id="0x7F1213BF" />
-    <public type="string" name="member_verification_warning_update_modal_title" id="0x7F1213C0" />
-    <public type="string" name="members" id="0x7F1213C1" />
-    <public type="string" name="members_header" id="0x7F1213C2" />
-    <public type="string" name="members_matching" id="0x7F1213C3" />
-    <public type="string" name="members_search_placeholder" id="0x7F1213C4" />
-    <public type="string" name="mention" id="0x7F1213C5" />
-    <public type="string" name="mention_everyone" id="0x7F1213C6" />
-    <public type="string" name="mention_everyone_android" id="0x7F1213C7" />
-    <public type="string" name="mention_everyone_autocomplete_description" id="0x7F1213C8" />
-    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7F1213C9" />
-    <public type="string" name="mention_everyone_channel_description" id="0x7F1213CA" />
-    <public type="string" name="mention_everyone_channel_description_android" id="0x7F1213CB" />
-    <public type="string" name="mention_everyone_description" id="0x7F1213CC" />
-    <public type="string" name="mention_everyone_description_android" id="0x7F1213CD" />
-    <public type="string" name="mention_here_autocomplete_description" id="0x7F1213CE" />
-    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7F1213CF" />
-    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7F1213D0" />
-    <public type="string" name="mention_users_with_role" id="0x7F1213D1" />
-    <public type="string" name="mentions" id="0x7F1213D2" />
-    <public type="string" name="mentions_and_quickswitcher" id="0x7F1213D3" />
-    <public type="string" name="mentions_count" id="0x7F1213D4" />
-    <public type="string" name="message_action_reply" id="0x7F1213D5" />
-    <public type="string" name="message_actions_menu_label" id="0x7F1213D6" />
-    <public type="string" name="message_button_component_link_context_menu_copy" id="0x7F1213D7" />
-    <public type="string" name="message_button_component_link_context_menu_name" id="0x7F1213D8" />
-    <public type="string" name="message_display_mode_label" id="0x7F1213D9" />
-    <public type="string" name="message_edited" id="0x7F1213DA" />
-    <public type="string" name="message_header_replied" id="0x7F1213DB" />
-    <public type="string" name="message_header_replied_to" id="0x7F1213DC" />
-    <public type="string" name="message_options" id="0x7F1213DD" />
-    <public type="string" name="message_pinned" id="0x7F1213DE" />
-    <public type="string" name="message_preview" id="0x7F1213DF" />
-    <public type="string" name="message_published" id="0x7F1213E0" />
-    <public type="string" name="message_rate_limited_body" id="0x7F1213E1" />
-    <public type="string" name="message_rate_limited_button" id="0x7F1213E2" />
-    <public type="string" name="message_rate_limited_header" id="0x7F1213E3" />
-    <public type="string" name="message_replied_to" id="0x7F1213E4" />
-    <public type="string" name="message_select_component_default_placeholder" id="0x7F1213E5" />
-    <public type="string" name="message_select_component_select_requirement" id="0x7F1213E6" />
-    <public type="string" name="message_step_subtitle" id="0x7F1213E7" />
-    <public type="string" name="message_step_title" id="0x7F1213E8" />
-    <public type="string" name="message_too_long_body_text" id="0x7F1213E9" />
-    <public type="string" name="message_too_long_header" id="0x7F1213EA" />
-    <public type="string" name="message_tts" id="0x7F1213EB" />
-    <public type="string" name="message_tts_deleted_role" id="0x7F1213EC" />
-    <public type="string" name="message_tts_reply" id="0x7F1213ED" />
-    <public type="string" name="message_unpinned" id="0x7F1213EE" />
-    <public type="string" name="message_utilities_a11y_label" id="0x7F1213EF" />
-    <public type="string" name="messages" id="0x7F1213F0" />
-    <public type="string" name="messages_failed_to_load" id="0x7F1213F1" />
-    <public type="string" name="messages_failed_to_load_try_again" id="0x7F1213F2" />
-    <public type="string" name="mfa_sms_add_phone" id="0x7F1213F3" />
-    <public type="string" name="mfa_sms_already_enabled" id="0x7F1213F4" />
-    <public type="string" name="mfa_sms_auth" id="0x7F1213F5" />
-    <public type="string" name="mfa_sms_auth_current_phone" id="0x7F1213F6" />
-    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7F1213F7" />
-    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7F1213F8" />
-    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7F1213F9" />
-    <public type="string" name="mfa_sms_disabled_no_email" id="0x7F1213FA" />
-    <public type="string" name="mfa_sms_disabled_partner" id="0x7F1213FB" />
-    <public type="string" name="mfa_sms_enable" id="0x7F1213FC" />
-    <public type="string" name="mfa_sms_enable_should_do" id="0x7F1213FD" />
-    <public type="string" name="mfa_sms_enable_subheader" id="0x7F1213FE" />
-    <public type="string" name="mfa_sms_phone_number_hide" id="0x7F1213FF" />
-    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7F121400" />
-    <public type="string" name="mfa_sms_receive_code" id="0x7F121401" />
-    <public type="string" name="mfa_sms_remove" id="0x7F121402" />
-    <public type="string" name="mfa_sms_resend" id="0x7F121403" />
-    <public type="string" name="mic_test_voice_channel_warning" id="0x7F121404" />
-    <public type="string" name="minimum_size" id="0x7F121405" />
-    <public type="string" name="missed_an_update" id="0x7F121406" />
-    <public type="string" name="missed_call" id="0x7F121407" />
-    <public type="string" name="missing_entitlement_modal_body" id="0x7F121408" />
-    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7F121409" />
-    <public type="string" name="missing_entitlement_modal_header" id="0x7F12140A" />
-    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7F12140B" />
-    <public type="string" name="mobile_advanced_voice_activity_cpu_overuse" id="0x7F12140C" />
-    <public type="string" name="mobile_app_download_cta" id="0x7F12140D" />
-    <public type="string" name="mobile_designate_other_channel" id="0x7F12140E" />
-    <public type="string" name="mobile_enable_hardware_scaling" id="0x7F12140F" />
-    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7F121410" />
-    <public type="string" name="mobile_noise_cancellation_cpu_overuse" id="0x7F121411" />
-    <public type="string" name="mobile_noise_cancellation_failed" id="0x7F121412" />
-    <public type="string" name="mobile_noise_cancellation_popout_description" id="0x7F121413" />
-    <public type="string" name="mobile_noise_cancellation_popout_title" id="0x7F121414" />
-    <public type="string" name="mobile_outbound_promotion_card_claimed_body" id="0x7F121415" />
-    <public type="string" name="mobile_outbound_promotion_card_unclaimed_body" id="0x7F121416" />
-    <public type="string" name="mobile_replying_to" id="0x7F121417" />
-    <public type="string" name="mobile_reports_block_element_description" id="0x7F121418" />
-    <public type="string" name="mobile_reports_block_element_header" id="0x7F121419" />
-    <public type="string" name="mobile_reports_breadcrumbs_title" id="0x7F12141A" />
-    <public type="string" name="mobile_reports_message_preview_title" id="0x7F12141B" />
-    <public type="string" name="mobile_reports_stage_channel_preview_title" id="0x7F12141C" />
-    <public type="string" name="mobile_reports_submit_failed" id="0x7F12141D" />
-    <public type="string" name="mobile_reports_submit_info_text" id="0x7F12141E" />
-    <public type="string" name="mobile_reports_submit_report" id="0x7F12141F" />
-    <public type="string" name="mobile_stream_active_body" id="0x7F121420" />
-    <public type="string" name="mobile_stream_active_header" id="0x7F121421" />
-    <public type="string" name="mobile_stream_active_soundshare_warning_android" id="0x7F121422" />
-    <public type="string" name="mobile_stream_participants_hidden" id="0x7F121423" />
-    <public type="string" name="mobile_stream_screen_share" id="0x7F121424" />
-    <public type="string" name="mobile_stream_screen_sharing" id="0x7F121425" />
-    <public type="string" name="mobile_stream_stop_sharing" id="0x7F121426" />
-    <public type="string" name="moderation" id="0x7F121427" />
-    <public type="string" name="moderator_allow_everyone_raise_hand" id="0x7F121428" />
-    <public type="string" name="moderator_raise_own_hand" id="0x7F121429" />
-    <public type="string" name="moderator_view" id="0x7F12142A" />
-    <public type="string" name="moderator_view_description" id="0x7F12142B" />
-    <public type="string" name="moderator_view_tooltip" id="0x7F12142C" />
-    <public type="string" name="moderator_view_tooltip_mobile" id="0x7F12142D" />
-    <public type="string" name="modify_followed_news_header" id="0x7F12142E" />
-    <public type="string" name="monthly" id="0x7F12142F" />
-    <public type="string" name="more" id="0x7F121430" />
-    <public type="string" name="more_details" id="0x7F121431" />
-    <public type="string" name="more_options" id="0x7F121432" />
-    <public type="string" name="move_from_category_to" id="0x7F121433" />
-    <public type="string" name="move_me_to_audience" id="0x7F121434" />
-    <public type="string" name="move_members" id="0x7F121435" />
-    <public type="string" name="move_members_description" id="0x7F121436" />
-    <public type="string" name="move_to" id="0x7F121437" />
-    <public type="string" name="move_to_success" id="0x7F121438" />
-    <public type="string" name="res_2131891257_msg_alert_cleared" id="0x7F121439" />
-    <public type="string" name="res_2131891258_msg_no_alert_showing" id="0x7F12143A" />
-    <public type="string" name="mtrl_badge_numberless_content_description" id="0x7F12143B" />
-    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7F12143C" />
-    <public type="string" name="mtrl_exceed_max_badge_number_content_description" id="0x7F12143D" />
-    <public type="string" name="mtrl_exceed_max_badge_number_suffix" id="0x7F12143E" />
-    <public type="string" name="mtrl_picker_a11y_next_month" id="0x7F12143F" />
-    <public type="string" name="mtrl_picker_a11y_prev_month" id="0x7F121440" />
-    <public type="string" name="mtrl_picker_announce_current_selection" id="0x7F121441" />
-    <public type="string" name="mtrl_picker_cancel" id="0x7F121442" />
-    <public type="string" name="mtrl_picker_confirm" id="0x7F121443" />
-    <public type="string" name="mtrl_picker_date_header_selected" id="0x7F121444" />
-    <public type="string" name="mtrl_picker_date_header_title" id="0x7F121445" />
-    <public type="string" name="mtrl_picker_date_header_unselected" id="0x7F121446" />
-    <public type="string" name="mtrl_picker_day_of_week_column_header" id="0x7F121447" />
-    <public type="string" name="mtrl_picker_invalid_format" id="0x7F121448" />
-    <public type="string" name="mtrl_picker_invalid_format_example" id="0x7F121449" />
-    <public type="string" name="mtrl_picker_invalid_format_use" id="0x7F12144A" />
-    <public type="string" name="mtrl_picker_invalid_range" id="0x7F12144B" />
-    <public type="string" name="mtrl_picker_navigate_to_year_description" id="0x7F12144C" />
-    <public type="string" name="mtrl_picker_out_of_range" id="0x7F12144D" />
-    <public type="string" name="mtrl_picker_range_header_only_end_selected" id="0x7F12144E" />
-    <public type="string" name="mtrl_picker_range_header_only_start_selected" id="0x7F12144F" />
-    <public type="string" name="mtrl_picker_range_header_selected" id="0x7F121450" />
-    <public type="string" name="mtrl_picker_range_header_title" id="0x7F121451" />
-    <public type="string" name="mtrl_picker_range_header_unselected" id="0x7F121452" />
-    <public type="string" name="mtrl_picker_save" id="0x7F121453" />
-    <public type="string" name="mtrl_picker_text_input_date_hint" id="0x7F121454" />
-    <public type="string" name="mtrl_picker_text_input_date_range_end_hint" id="0x7F121455" />
-    <public type="string" name="mtrl_picker_text_input_date_range_start_hint" id="0x7F121456" />
-    <public type="string" name="mtrl_picker_text_input_day_abbr" id="0x7F121457" />
-    <public type="string" name="mtrl_picker_text_input_month_abbr" id="0x7F121458" />
-    <public type="string" name="mtrl_picker_text_input_year_abbr" id="0x7F121459" />
-    <public type="string" name="mtrl_picker_toggle_to_calendar_input_mode" id="0x7F12145A" />
-    <public type="string" name="mtrl_picker_toggle_to_day_selection" id="0x7F12145B" />
-    <public type="string" name="mtrl_picker_toggle_to_text_input_mode" id="0x7F12145C" />
-    <public type="string" name="mtrl_picker_toggle_to_year_selection" id="0x7F12145D" />
-    <public type="string" name="mute" id="0x7F12145E" />
-    <public type="string" name="mute_category" id="0x7F12145F" />
-    <public type="string" name="mute_channel" id="0x7F121460" />
-    <public type="string" name="mute_channel_generic" id="0x7F121461" />
-    <public type="string" name="mute_conversation" id="0x7F121462" />
-    <public type="string" name="mute_duration_15_minutes" id="0x7F121463" />
-    <public type="string" name="mute_duration_1_hour" id="0x7F121464" />
-    <public type="string" name="mute_duration_24_hours" id="0x7F121465" />
-    <public type="string" name="mute_duration_8_hours" id="0x7F121466" />
-    <public type="string" name="mute_duration_always" id="0x7F121467" />
-    <public type="string" name="mute_group_dm" id="0x7F121468" />
-    <public type="string" name="mute_members" id="0x7F121469" />
-    <public type="string" name="mute_server" id="0x7F12146A" />
-    <public type="string" name="mute_settings_mute_category" id="0x7F12146B" />
-    <public type="string" name="mute_settings_mute_channel" id="0x7F12146C" />
-    <public type="string" name="mute_settings_mute_server" id="0x7F12146D" />
-    <public type="string" name="mute_settings_mute_this_conversation" id="0x7F12146E" />
-    <public type="string" name="mute_until" id="0x7F12146F" />
-    <public type="string" name="muted_until_time" id="0x7F121470" />
-    <public type="string" name="mutual_friends" id="0x7F121471" />
-    <public type="string" name="mutual_guilds" id="0x7F121472" />
-    <public type="string" name="n_days" id="0x7F121473" />
-    <public type="string" name="nearby_scan" id="0x7F121474" />
-    <public type="string" name="nearby_scan_cta_title" id="0x7F121475" />
-    <public type="string" name="nearby_scan_subtitle" id="0x7F121476" />
-    <public type="string" name="need_account" id="0x7F121477" />
-    <public type="string" name="network_error_bad_request" id="0x7F121478" />
-    <public type="string" name="network_error_cloudflare_intermittent" id="0x7F121479" />
-    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7F12147A" />
-    <public type="string" name="network_error_connection" id="0x7F12147B" />
-    <public type="string" name="network_error_forbidden" id="0x7F12147C" />
-    <public type="string" name="network_error_request_too_large" id="0x7F12147D" />
-    <public type="string" name="network_error_rest_request" id="0x7F12147E" />
-    <public type="string" name="network_error_ssl" id="0x7F12147F" />
-    <public type="string" name="network_error_unauthorized" id="0x7F121480" />
-    <public type="string" name="network_error_unknown" id="0x7F121481" />
-    <public type="string" name="network_offline" id="0x7F121482" />
-    <public type="string" name="network_offline_airplane_mode" id="0x7F121483" />
-    <public type="string" name="never_ask_again" id="0x7F121484" />
-    <public type="string" name="nevermind" id="0x7F121485" />
-    <public type="string" name="new_dm" id="0x7F121486" />
-    <public type="string" name="new_dm_cta_invite_to_server_message" id="0x7F121487" />
-    <public type="string" name="new_dm_cta_send_first_message" id="0x7F121488" />
-    <public type="string" name="new_dm_cta_start_group_message" id="0x7F121489" />
-    <public type="string" name="new_group_dm" id="0x7F12148A" />
-    <public type="string" name="new_guilds_dm_allowed" id="0x7F12148B" />
-    <public type="string" name="new_member_retention_info" id="0x7F12148C" />
-    <public type="string" name="new_mentions" id="0x7F12148D" />
-    <public type="string" name="new_messages" id="0x7F12148E" />
-    <public type="string" name="new_messages_divider" id="0x7F12148F" />
-    <public type="string" name="new_messages_estimated" id="0x7F121490" />
-    <public type="string" name="new_messages_estimated_with_date" id="0x7F121491" />
-    <public type="string" name="new_messages_with_date" id="0x7F121492" />
-    <public type="string" name="new_override" id="0x7F121493" />
-    <public type="string" name="new_permission" id="0x7F121494" />
-    <public type="string" name="new_role" id="0x7F121495" />
-    <public type="string" name="new_terms_ack" id="0x7F121496" />
-    <public type="string" name="new_terms_continue" id="0x7F121497" />
-    <public type="string" name="new_terms_description" id="0x7F121498" />
-    <public type="string" name="new_terms_title" id="0x7F121499" />
-    <public type="string" name="new_thread" id="0x7F12149A" />
-    <public type="string" name="new_unreads" id="0x7F12149B" />
-    <public type="string" name="news_channel" id="0x7F12149C" />
-    <public type="string" name="news_channel_desc" id="0x7F12149D" />
-    <public type="string" name="news_channel_publish" id="0x7F12149E" />
-    <public type="string" name="news_channel_publish_bump" id="0x7F12149F" />
-    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7F1214A0" />
-    <public type="string" name="news_channel_published" id="0x7F1214A1" />
-    <public type="string" name="next" id="0x7F1214A2" />
-    <public type="string" name="nickname" id="0x7F1214A3" />
-    <public type="string" name="nickname_changed" id="0x7F1214A4" />
-    <public type="string" name="nickname_cleared" id="0x7F1214A5" />
-    <public type="string" name="nl" id="0x7F1214A6" />
-    <public type="string" name="no" id="0x7F1214A7" />
-    <public type="string" name="no_afk_channel" id="0x7F1214A8" />
-    <public type="string" name="no_authorized_apps" id="0x7F1214A9" />
-    <public type="string" name="no_authorized_apps_note" id="0x7F1214AA" />
-    <public type="string" name="no_ban_reason" id="0x7F1214AB" />
-    <public type="string" name="no_bans" id="0x7F1214AC" />
-    <public type="string" name="no_camera_access" id="0x7F1214AD" />
-    <public type="string" name="no_camera_body" id="0x7F1214AE" />
-    <public type="string" name="no_camera_title" id="0x7F1214AF" />
-    <public type="string" name="no_category" id="0x7F1214B0" />
-    <public type="string" name="no_contacts_access" id="0x7F1214B1" />
-    <public type="string" name="no_emoji" id="0x7F1214B2" />
-    <public type="string" name="no_emoji_body" id="0x7F1214B3" />
-    <public type="string" name="no_emoji_search_results" id="0x7F1214B4" />
-    <public type="string" name="no_emoji_title" id="0x7F1214B5" />
-    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7F1214B6" />
-    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7F1214B7" />
-    <public type="string" name="no_gif_favorites_go_favorite" id="0x7F1214B8" />
-    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7F1214B9" />
-    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7F1214BA" />
-    <public type="string" name="no_gif_search_results" id="0x7F1214BB" />
-    <public type="string" name="no_gif_search_results_with_related_search" id="0x7F1214BC" />
-    <public type="string" name="no_gif_search_results_without_related_search" id="0x7F1214BD" />
-    <public type="string" name="no_input_devices" id="0x7F1214BE" />
-    <public type="string" name="no_input_monitoring_access" id="0x7F1214BF" />
-    <public type="string" name="no_instant_invite" id="0x7F1214C0" />
-    <public type="string" name="no_integrations" id="0x7F1214C1" />
-    <public type="string" name="no_integrations_body" id="0x7F1214C2" />
-    <public type="string" name="no_integrations_label" id="0x7F1214C3" />
-    <public type="string" name="no_invites_body" id="0x7F1214C4" />
-    <public type="string" name="no_invites_caption" id="0x7F1214C5" />
-    <public type="string" name="no_invites_label" id="0x7F1214C6" />
-    <public type="string" name="no_mic_body" id="0x7F1214C7" />
-    <public type="string" name="no_mic_title" id="0x7F1214C8" />
-    <public type="string" name="no_micrphone_access" id="0x7F1214C9" />
-    <public type="string" name="no_mutual_friends" id="0x7F1214CA" />
-    <public type="string" name="no_mutual_guilds" id="0x7F1214CB" />
-    <public type="string" name="no_output_devices" id="0x7F1214CC" />
-    <public type="string" name="no_photos_access" id="0x7F1214CD" />
-    <public type="string" name="no_pins_in_channel" id="0x7F1214CE" />
-    <public type="string" name="no_pins_in_dm" id="0x7F1214CF" />
-    <public type="string" name="no_private_channels_description" id="0x7F1214D0" />
-    <public type="string" name="no_private_channels_title" id="0x7F1214D1" />
-    <public type="string" name="no_reactions_body" id="0x7F1214D2" />
-    <public type="string" name="no_reactions_header" id="0x7F1214D3" />
-    <public type="string" name="no_recent_mentions" id="0x7F1214D4" />
-    <public type="string" name="no_recent_thread_messages" id="0x7F1214D5" />
-    <public type="string" name="no_results_found" id="0x7F1214D6" />
-    <public type="string" name="no_screenshare_permission_dialog_body" id="0x7F1214D7" />
-    <public type="string" name="no_screenshare_permission_dialog_title" id="0x7F1214D8" />
-    <public type="string" name="no_send_messages_permission_placeholder" id="0x7F1214D9" />
-    <public type="string" name="no_sticker_search_results" id="0x7F1214DA" />
-    <public type="string" name="no_sticker_search_results_with_suggestions" id="0x7F1214DB" />
-    <public type="string" name="no_stickers_to_search_through" id="0x7F1214DC" />
-    <public type="string" name="no_system_channel" id="0x7F1214DD" />
-    <public type="string" name="no_text" id="0x7F1214DE" />
-    <public type="string" name="no_thanks" id="0x7F1214DF" />
-    <public type="string" name="no_thread_messages" id="0x7F1214E0" />
-    <public type="string" name="no_user_limit" id="0x7F1214E1" />
-    <public type="string" name="no_video_devices" id="0x7F1214E2" />
-    <public type="string" name="no_video_permission_dialog_body" id="0x7F1214E3" />
-    <public type="string" name="no_video_permission_dialog_title" id="0x7F1214E4" />
-    <public type="string" name="noise_cancellation_cpu_overuse" id="0x7F1214E5" />
-    <public type="string" name="noise_cancellation_off" id="0x7F1214E6" />
-    <public type="string" name="noise_cancellation_on" id="0x7F1214E7" />
-    <public type="string" name="noise_cancellation_popout_description" id="0x7F1214E8" />
-    <public type="string" name="noise_cancellation_popout_footer" id="0x7F1214E9" />
-    <public type="string" name="noise_cancellation_popout_header" id="0x7F1214EA" />
-    <public type="string" name="noise_cancellation_popout_mic_test_title" id="0x7F1214EB" />
-    <public type="string" name="noise_cancellation_popout_stop" id="0x7F1214EC" />
-    <public type="string" name="noise_cancellation_popout_test" id="0x7F1214ED" />
-    <public type="string" name="noise_cancellation_tooltip" id="0x7F1214EE" />
-    <public type="string" name="noise_suppression" id="0x7F1214EF" />
-    <public type="string" name="none" id="0x7F1214F0" />
-    <public type="string" name="not_available" id="0x7F1214F1" />
-    <public type="string" name="not_in_the_voice_channel" id="0x7F1214F2" />
-    <public type="string" name="not_set" id="0x7F1214F3" />
-    <public type="string" name="note" id="0x7F1214F4" />
-    <public type="string" name="note_placeholder" id="0x7F1214F5" />
-    <public type="string" name="note_placeholder_mobile" id="0x7F1214F6" />
-    <public type="string" name="notice_application_test_mode" id="0x7F1214F7" />
-    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7F1214F8" />
-    <public type="string" name="notice_channel_max_members_cap_reached_message" id="0x7F1214F9" />
-    <public type="string" name="notice_connect_spotify" id="0x7F1214FA" />
-    <public type="string" name="notice_connection_conflict" id="0x7F1214FB" />
-    <public type="string" name="notice_corrupt_installation" id="0x7F1214FC" />
-    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7F1214FD" />
-    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7F1214FE" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7F1214FF" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7F121500" />
-    <public type="string" name="notice_dispatch_api_error" id="0x7F121501" />
-    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7F121502" />
-    <public type="string" name="notice_dispatch_error" id="0x7F121503" />
-    <public type="string" name="notice_dispatch_error_disk_full" id="0x7F121504" />
-    <public type="string" name="notice_dispatch_error_disk_low" id="0x7F121505" />
-    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7F121506" />
-    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7F121507" />
-    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7F121508" />
-    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7F121509" />
-    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7F12150A" />
-    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7F12150B" />
-    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7F12150C" />
-    <public type="string" name="notice_dispatch_error_unwritable" id="0x7F12150D" />
-    <public type="string" name="notice_dispatch_error_with_code" id="0x7F12150E" />
-    <public type="string" name="notice_dispatch_install_script_progress" id="0x7F12150F" />
-    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7F121510" />
-    <public type="string" name="notice_embedded_application_test_mode" id="0x7F121511" />
-    <public type="string" name="notice_enable_public_guild_upsell_message" id="0x7F121512" />
-    <public type="string" name="notice_guild_feedback_survey" id="0x7F121513" />
-    <public type="string" name="notice_hardware_mute" id="0x7F121514" />
-    <public type="string" name="notice_messaging_experience_button" id="0x7F121515" />
-    <public type="string" name="notice_messaging_experience_survey" id="0x7F121516" />
-    <public type="string" name="notice_mfa_sms_backup" id="0x7F121517" />
-    <public type="string" name="notice_mfa_sms_backup_button" id="0x7F121518" />
-    <public type="string" name="notice_native_apps_2020_06" id="0x7F121519" />
-    <public type="string" name="notice_no_input_detected" id="0x7F12151A" />
-    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7F12151B" />
-    <public type="string" name="notice_no_input_detected_settings" id="0x7F12151C" />
-    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7F12151D" />
-    <public type="string" name="notice_noise_detected" id="0x7F12151E" />
-    <public type="string" name="notice_notification_message" id="0x7F12151F" />
-    <public type="string" name="notice_notification_message2" id="0x7F121520" />
-    <public type="string" name="notice_premium_grandfathered_ended" id="0x7F121521" />
-    <public type="string" name="notice_premium_grandfathered_ending" id="0x7F121522" />
-    <public type="string" name="notice_premium_grandfathered_monthly_ending" id="0x7F121523" />
-    <public type="string" name="notice_premium_grandfathered_upgrade" id="0x7F121524" />
-    <public type="string" name="notice_premium_promo_action" id="0x7F121525" />
-    <public type="string" name="notice_premium_promo_message" id="0x7F121526" />
-    <public type="string" name="notice_premium_tier_2_trial_ending_cta" id="0x7F121527" />
-    <public type="string" name="notice_premium_tier_2_trial_ending_days" id="0x7F121528" />
-    <public type="string" name="notice_premium_tier_2_trial_ending_hours" id="0x7F121529" />
-    <public type="string" name="notice_premium_tier_2_trial_ending_minutes" id="0x7F12152A" />
-    <public type="string" name="notice_premium_xbox_game_pass_promotion" id="0x7F12152B" />
-    <public type="string" name="notice_premium_xbox_game_pass_promotion_redeem" id="0x7F12152C" />
-    <public type="string" name="notice_product_feedback_survey" id="0x7F12152D" />
-    <public type="string" name="notice_product_feedback_survey_cta" id="0x7F12152E" />
-    <public type="string" name="notice_register_to_vote" id="0x7F12152F" />
-    <public type="string" name="notice_register_to_vote_cta" id="0x7F121530" />
-    <public type="string" name="notice_scheduled_maintenance" id="0x7F121531" />
-    <public type="string" name="notice_snowsgiving" id="0x7F121532" />
-    <public type="string" name="notice_snowsgiving_cta" id="0x7F121533" />
-    <public type="string" name="notice_spotify_auto_paused" id="0x7F121534" />
-    <public type="string" name="notice_streamer_mode_text" id="0x7F121535" />
-    <public type="string" name="notice_survey_body" id="0x7F121536" />
-    <public type="string" name="notice_survey_button" id="0x7F121537" />
-    <public type="string" name="notice_survey_improve_prompt" id="0x7F121538" />
-    <public type="string" name="notice_survey_prompt" id="0x7F121539" />
-    <public type="string" name="notice_unclaimed_account" id="0x7F12153A" />
-    <public type="string" name="notice_unverified_account" id="0x7F12153B" />
-    <public type="string" name="notice_whats_this" id="0x7F12153C" />
-    <public type="string" name="notification_accepted_friend_request" id="0x7F12153D" />
-    <public type="string" name="notification_body_attachment" id="0x7F12153E" />
-    <public type="string" name="notification_body_start_game" id="0x7F12153F" />
-    <public type="string" name="notification_dismiss" id="0x7F121540" />
-    <public type="string" name="notification_message_create_dm_activity_join" id="0x7F121541" />
-    <public type="string" name="notification_message_create_dm_activity_join_request" id="0x7F121542" />
-    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7F121543" />
-    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7F121544" />
-    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7F121545" />
-    <public type="string" name="notification_message_create_guild_activity_join" id="0x7F121546" />
-    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7F121547" />
-    <public type="string" name="notification_mute_1_hour" id="0x7F121548" />
-    <public type="string" name="notification_overrides" id="0x7F121549" />
-    <public type="string" name="notification_pending_friend_request" id="0x7F12154A" />
-    <public type="string" name="notification_reply" id="0x7F12154B" />
-    <public type="string" name="notification_reply_failed" id="0x7F12154C" />
-    <public type="string" name="notification_reply_success" id="0x7F12154D" />
-    <public type="string" name="notification_settings" id="0x7F12154E" />
-    <public type="string" name="notification_title_discord" id="0x7F12154F" />
-    <public type="string" name="notification_title_start_game" id="0x7F121550" />
-    <public type="string" name="notifications" id="0x7F121551" />
-    <public type="string" name="notifications_muted" id="0x7F121552" />
-    <public type="string" name="notifications_nuf_body" id="0x7F121553" />
-    <public type="string" name="notifications_nuf_cta" id="0x7F121554" />
-    <public type="string" name="notifications_nuf_title" id="0x7F121555" />
-    <public type="string" name="now_playing_gdpr_body" id="0x7F121556" />
-    <public type="string" name="now_playing_gdpr_header" id="0x7F121557" />
-    <public type="string" name="nsfw_accept" id="0x7F121558" />
-    <public type="string" name="nsfw_channel_header" id="0x7F121559" />
-    <public type="string" name="nsfw_decline" id="0x7F12155A" />
-    <public type="string" name="nsfw_description" id="0x7F12155B" />
-    <public type="string" name="nsfw_guild_channel_description" id="0x7F12155C" />
-    <public type="string" name="nsfw_guild_close" id="0x7F12155D" />
-    <public type="string" name="nsfw_guild_description" id="0x7F12155E" />
-    <public type="string" name="nsfw_guild_description_more" id="0x7F12155F" />
-    <public type="string" name="nsfw_guild_emoji_unavailable" id="0x7F121560" />
-    <public type="string" name="nsfw_guild_header" id="0x7F121561" />
-    <public type="string" name="nsfw_guild_sidebar_description" id="0x7F121562" />
-    <public type="string" name="nsfw_guild_sidebar_header" id="0x7F121563" />
-    <public type="string" name="nsfw_guilds_toggle_caption" id="0x7F121564" />
-    <public type="string" name="nsfw_guilds_toggle_header" id="0x7F121565" />
-    <public type="string" name="nsfw_title" id="0x7F121566" />
-    <public type="string" name="nuf_age_gate_body" id="0x7F121567" />
-    <public type="string" name="nuf_ask_friend_server_invite" id="0x7F121568" />
-    <public type="string" name="nuf_body" id="0x7F121569" />
-    <public type="string" name="nuf_body_mobile" id="0x7F12156A" />
-    <public type="string" name="nuf_body_refresh" id="0x7F12156B" />
-    <public type="string" name="nuf_channel_prompt_channel_topic_template" id="0x7F12156C" />
-    <public type="string" name="nuf_channel_prompt_cta" id="0x7F12156D" />
-    <public type="string" name="nuf_channel_prompt_subtitle" id="0x7F12156E" />
-    <public type="string" name="nuf_channel_prompt_title" id="0x7F12156F" />
-    <public type="string" name="nuf_channel_prompt_topic" id="0x7F121570" />
-    <public type="string" name="nuf_channel_prompt_topic_placeholder" id="0x7F121571" />
-    <public type="string" name="nuf_channels_cta_label" id="0x7F121572" />
-    <public type="string" name="nuf_channels_description" id="0x7F121573" />
-    <public type="string" name="nuf_channels_title" id="0x7F121574" />
-    <public type="string" name="nuf_chat_with_friends" id="0x7F121575" />
-    <public type="string" name="nuf_club_or_interest_group" id="0x7F121576" />
-    <public type="string" name="nuf_complete_cta" id="0x7F121577" />
-    <public type="string" name="nuf_complete_subtitle" id="0x7F121578" />
-    <public type="string" name="nuf_complete_title" id="0x7F121579" />
-    <public type="string" name="nuf_create_guild_cta_description" id="0x7F12157A" />
-    <public type="string" name="nuf_create_server_button" id="0x7F12157B" />
-    <public type="string" name="nuf_create_server_customize_header" id="0x7F12157C" />
-    <public type="string" name="nuf_create_server_customize_subheader" id="0x7F12157D" />
-    <public type="string" name="nuf_desktop_templates_subtitle" id="0x7F12157E" />
-    <public type="string" name="nuf_desktop_templates_title" id="0x7F12157F" />
-    <public type="string" name="nuf_download_app_button_platform" id="0x7F121580" />
-    <public type="string" name="nuf_gaming_community" id="0x7F121581" />
-    <public type="string" name="nuf_get_started" id="0x7F121582" />
-    <public type="string" name="nuf_have_an_invite_already" id="0x7F121583" />
-    <public type="string" name="nuf_join_a_friend" id="0x7F121584" />
-    <public type="string" name="nuf_join_server_button" id="0x7F121585" />
-    <public type="string" name="nuf_join_server_title_2" id="0x7F121586" />
-    <public type="string" name="nuf_just_look_around" id="0x7F121587" />
-    <public type="string" name="nuf_title_mobile" id="0x7F121588" />
-    <public type="string" name="nuf_voice_channels_description" id="0x7F121589" />
-    <public type="string" name="nuf_voice_channels_title" id="0x7F12158A" />
-    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7F12158B" />
-    <public type="string" name="nuf_welcome_body" id="0x7F12158C" />
-    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7F12158D" />
-    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7F12158E" />
-    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7F12158F" />
-    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7F121590" />
-    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7F121591" />
-    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7F121592" />
-    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7F121593" />
-    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7F121594" />
-    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7F121595" />
-    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7F121596" />
-    <public type="string" name="nuf_what_do_you_want" id="0x7F121597" />
-    <public type="string" name="num_channels" id="0x7F121598" />
-    <public type="string" name="num_members" id="0x7F121599" />
-    <public type="string" name="num_subscribers" id="0x7F12159A" />
-    <public type="string" name="num_users" id="0x7F12159B" />
-    <public type="string" name="numbers_only" id="0x7F12159C" />
-    <public type="string" name="nux_navigation_help_channels" id="0x7F12159D" />
-    <public type="string" name="nux_navigation_help_dms" id="0x7F12159E" />
-    <public type="string" name="nux_navigation_help_guild" id="0x7F12159F" />
-    <public type="string" name="nux_notification_permission_alert_title" id="0x7F1215A0" />
-    <public type="string" name="nux_notification_permission_prompt_subtitle" id="0x7F1215A1" />
-    <public type="string" name="nux_notification_permission_prompt_text" id="0x7F1215A2" />
-    <public type="string" name="nux_overlay_description" id="0x7F1215A3" />
-    <public type="string" name="nux_overlay_enable" id="0x7F1215A4" />
-    <public type="string" name="nux_overlay_title" id="0x7F1215A5" />
-    <public type="string" name="nux_post_reg_join_server_description" id="0x7F1215A6" />
-    <public type="string" name="nux_post_reg_join_server_skip" id="0x7F1215A7" />
-    <public type="string" name="nux_post_reg_join_server_title" id="0x7F1215A8" />
-    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7F1215A9" />
-    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7F1215AA" />
-    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7F1215AB" />
-    <public type="string" name="oauth2_add_bot" id="0x7F1215AC" />
-    <public type="string" name="oauth2_add_to_guild" id="0x7F1215AD" />
-    <public type="string" name="oauth2_add_to_guild_description" id="0x7F1215AE" />
-    <public type="string" name="oauth2_add_to_guild_placeholder" id="0x7F1215AF" />
-    <public type="string" name="oauth2_add_webhook_incoming" id="0x7F1215B0" />
-    <public type="string" name="oauth2_can_read_notice" id="0x7F1215B1" />
-    <public type="string" name="oauth2_cannot_read_send_notice" id="0x7F1215B2" />
-    <public type="string" name="oauth2_confirm_bot_permissions" id="0x7F1215B3" />
-    <public type="string" name="oauth2_connect_to_discord" id="0x7F1215B4" />
-    <public type="string" name="oauth2_details_creation_date" id="0x7F1215B5" />
-    <public type="string" name="oauth2_details_guilds" id="0x7F1215B6" />
-    <public type="string" name="oauth2_details_privacy_policy" id="0x7F1215B7" />
-    <public type="string" name="oauth2_details_privacy_policy_with_developer" id="0x7F1215B8" />
-    <public type="string" name="oauth2_details_privacy_policy_with_links" id="0x7F1215B9" />
-    <public type="string" name="oauth2_details_privacy_policy_with_links_with_developer" id="0x7F1215BA" />
-    <public type="string" name="oauth2_details_privacy_policy_with_privacy_policy_link" id="0x7F1215BB" />
-    <public type="string" name="oauth2_details_privacy_policy_with_privacy_policy_link_with_developer" id="0x7F1215BC" />
-    <public type="string" name="oauth2_details_privacy_policy_with_terms_of_service_link" id="0x7F1215BD" />
-    <public type="string" name="oauth2_details_privacy_policy_with_terms_of_service_link_with_developer" id="0x7F1215BE" />
-    <public type="string" name="oauth2_details_redirect" id="0x7F1215BF" />
-    <public type="string" name="oauth2_disabled_permissions" id="0x7F1215C0" />
-    <public type="string" name="oauth2_fake_scope_1" id="0x7F1215C1" />
-    <public type="string" name="oauth2_fake_scope_2" id="0x7F1215C2" />
-    <public type="string" name="oauth2_fake_scope_3" id="0x7F1215C3" />
-    <public type="string" name="oauth2_fake_scope_4" id="0x7F1215C4" />
-    <public type="string" name="oauth2_fake_scope_5" id="0x7F1215C5" />
-    <public type="string" name="oauth2_fake_scope_6" id="0x7F1215C6" />
-    <public type="string" name="oauth2_fake_scope_7" id="0x7F1215C7" />
-    <public type="string" name="oauth2_fake_scope_8" id="0x7F1215C8" />
-    <public type="string" name="oauth2_logout" id="0x7F1215C9" />
-    <public type="string" name="oauth2_message_cta" id="0x7F1215CA" />
-    <public type="string" name="oauth2_request_invalid_scope" id="0x7F1215CB" />
-    <public type="string" name="oauth2_request_missing_param" id="0x7F1215CC" />
-    <public type="string" name="oauth2_requests_account_access" id="0x7F1215CD" />
-    <public type="string" name="oauth2_scopes_label" id="0x7F1215CE" />
-    <public type="string" name="oauth2_signed_in_as" id="0x7F1215CF" />
-    <public type="string" name="oauth2_title" id="0x7F1215D0" />
-    <public type="string" name="oauth2_unknown_error" id="0x7F1215D1" />
-    <public type="string" name="okay" id="0x7F1215D2" />
-    <public type="string" name="onboarding_video_bot_message" id="0x7F1215D3" />
-    <public type="string" name="onboarding_video_bot_message_new_user" id="0x7F1215D4" />
-    <public type="string" name="one_user_typing" id="0x7F1215D5" />
-    <public type="string" name="ongoing_call" id="0x7F1215D6" />
-    <public type="string" name="ongoing_call_connected_users" id="0x7F1215D7" />
-    <public type="string" name="ongoing_call_tap_to_join" id="0x7F1215D8" />
-    <public type="string" name="ongoing_call_voice_quality_low" id="0x7F1215D9" />
-    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7F1215DA" />
-    <public type="string" name="only_you_can_see_and_delete_these" id="0x7F1215DB" />
-    <public type="string" name="open" id="0x7F1215DC" />
-    <public type="string" name="open_connection_replay" id="0x7F1215DD" />
-    <public type="string" name="open_in_browser" id="0x7F1215DE" />
-    <public type="string" name="open_in_full_view" id="0x7F1215DF" />
-    <public type="string" name="open_in_split_view" id="0x7F1215E0" />
-    <public type="string" name="open_in_theater" id="0x7F1215E1" />
-    <public type="string" name="open_link" id="0x7F1215E2" />
-    <public type="string" name="open_navigation" id="0x7F1215E3" />
-    <public type="string" name="open_original_image" id="0x7F1215E4" />
-    <public type="string" name="open_standard_keyboard_accessibility_label" id="0x7F1215E5" />
-    <public type="string" name="optional_application_command_indicator" id="0x7F1215E6" />
-    <public type="string" name="options" id="0x7F1215E7" />
-    <public type="string" name="options_matching" id="0x7F1215E8" />
-    <public type="string" name="orange" id="0x7F1215E9" />
-    <public type="string" name="os_min_screenshare_dialog_body" id="0x7F1215EA" />
-    <public type="string" name="os_min_screenshare_dialog_title" id="0x7F1215EB" />
-    <public type="string" name="other" id="0x7F1215EC" />
-    <public type="string" name="other_options" id="0x7F1215ED" />
-    <public type="string" name="other_reactions" id="0x7F1215EE" />
-    <public type="string" name="others_online" id="0x7F1215EF" />
-    <public type="string" name="out_of_date_action" id="0x7F1215F0" />
-    <public type="string" name="out_of_date_description" id="0x7F1215F1" />
-    <public type="string" name="out_of_date_title" id="0x7F1215F2" />
-    <public type="string" name="outbound_promotion_card_claimed_expanded_body" id="0x7F1215F3" />
-    <public type="string" name="outbound_promotion_card_claimed_unexpanded_body" id="0x7F1215F4" />
-    <public type="string" name="outbound_promotion_card_unclaimed_expanded_body" id="0x7F1215F5" />
-    <public type="string" name="outbound_promotion_card_unclaimed_unexpanded_body" id="0x7F1215F6" />
-    <public type="string" name="outbound_promotion_less_details" id="0x7F1215F7" />
-    <public type="string" name="outbound_promotion_more_details" id="0x7F1215F8" />
-    <public type="string" name="outbound_promotion_see_code" id="0x7F1215F9" />
-    <public type="string" name="outgoing_friend_request" id="0x7F1215FA" />
-    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7F1215FB" />
-    <public type="string" name="outgoing_friend_request_to" id="0x7F1215FC" />
-    <public type="string" name="output_device" id="0x7F1215FD" />
-    <public type="string" name="overlay" id="0x7F1215FE" />
-    <public type="string" name="overlay_actions_menu_label" id="0x7F1215FF" />
-    <public type="string" name="overlay_channel_chat_hotkey" id="0x7F121600" />
-    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7F121601" />
-    <public type="string" name="overlay_click_to_unlock" id="0x7F121602" />
-    <public type="string" name="overlay_crashed_title" id="0x7F121603" />
-    <public type="string" name="overlay_explanation" id="0x7F121604" />
-    <public type="string" name="overlay_friend_calling" id="0x7F121605" />
-    <public type="string" name="overlay_in_game_preview_header" id="0x7F121606" />
-    <public type="string" name="overlay_launch_open_tip" id="0x7F121607" />
-    <public type="string" name="overlay_launch_title" id="0x7F121608" />
-    <public type="string" name="overlay_link_alert_body" id="0x7F121609" />
-    <public type="string" name="overlay_link_alert_secondary" id="0x7F12160A" />
-    <public type="string" name="overlay_link_alert_title" id="0x7F12160B" />
-    <public type="string" name="overlay_menu_get_invite" id="0x7F12160C" />
-    <public type="string" name="overlay_menu_open_discord" id="0x7F12160D" />
-    <public type="string" name="overlay_menu_switch_channels" id="0x7F12160E" />
-    <public type="string" name="overlay_mobile_required" id="0x7F12160F" />
-    <public type="string" name="overlay_mobile_toggle_desc" id="0x7F121610" />
-    <public type="string" name="overlay_mobile_toggle_label" id="0x7F121611" />
-    <public type="string" name="overlay_mobile_unauthed" id="0x7F121612" />
-    <public type="string" name="overlay_news_go_live_body" id="0x7F121613" />
-    <public type="string" name="overlay_news_go_live_body_no_voice_channel" id="0x7F121614" />
-    <public type="string" name="overlay_news_go_live_cta" id="0x7F121615" />
-    <public type="string" name="overlay_no_results" id="0x7F121616" />
-    <public type="string" name="overlay_notification_incoming_call" id="0x7F121617" />
-    <public type="string" name="overlay_notification_settings_disabled" id="0x7F121618" />
-    <public type="string" name="overlay_notification_settings_position" id="0x7F121619" />
-    <public type="string" name="overlay_notifications_bottom_left" id="0x7F12161A" />
-    <public type="string" name="overlay_notifications_bottom_right" id="0x7F12161B" />
-    <public type="string" name="overlay_notifications_disabled" id="0x7F12161C" />
-    <public type="string" name="overlay_notifications_settings" id="0x7F12161D" />
-    <public type="string" name="overlay_notifications_top_left" id="0x7F12161E" />
-    <public type="string" name="overlay_notifications_top_right" id="0x7F12161F" />
-    <public type="string" name="overlay_reload" id="0x7F121620" />
-    <public type="string" name="overlay_reset_default_layout" id="0x7F121621" />
-    <public type="string" name="overlay_settings_general_tab" id="0x7F121622" />
-    <public type="string" name="overlay_settings_title" id="0x7F121623" />
-    <public type="string" name="overlay_settings_voice_tab" id="0x7F121624" />
-    <public type="string" name="overlay_too_small" id="0x7F121625" />
-    <public type="string" name="overlay_unlock_to_answer" id="0x7F121626" />
-    <public type="string" name="overlay_unlock_to_join" id="0x7F121627" />
-    <public type="string" name="overlay_user_chat_hotkey" id="0x7F121628" />
-    <public type="string" name="overlay_widget_hide_in_game" id="0x7F121629" />
-    <public type="string" name="overlay_widget_show_in_game" id="0x7F12162A" />
-    <public type="string" name="overview" id="0x7F12162B" />
-    <public type="string" name="overwrite_autocomplete_a11y_label" id="0x7F12162C" />
-    <public type="string" name="overwrite_autocomplete_label" id="0x7F12162D" />
-    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7F12162E" />
-    <public type="string" name="overwrite_no_role_to_add" id="0x7F12162F" />
-    <public type="string" name="pagination_next" id="0x7F121630" />
-    <public type="string" name="pagination_page_label" id="0x7F121631" />
-    <public type="string" name="pagination_page_of" id="0x7F121632" />
-    <public type="string" name="pagination_previous" id="0x7F121633" />
-    <public type="string" name="paginator_current_page" id="0x7F121634" />
-    <public type="string" name="paginator_of_pages" id="0x7F121635" />
-    <public type="string" name="partial_outage" id="0x7F121636" />
-    <public type="string" name="partial_outage_a11y" id="0x7F121637" />
-    <public type="string" name="partner_badge_tooltip" id="0x7F121638" />
-    <public type="string" name="partner_program" id="0x7F121639" />
-    <public type="string" name="password_length_error" id="0x7F12163A" />
-    <public type="string" name="password_manager" id="0x7F12163B" />
-    <public type="string" name="password_manager_info_android" id="0x7F12163C" />
-    <public type="string" name="password_manager_open_settings" id="0x7F12163D" />
-    <public type="string" name="password_manager_open_settings_error" id="0x7F12163E" />
-    <public type="string" name="password_manager_use" id="0x7F12163F" />
-    <public type="string" name="password_recovery_external_link_description" id="0x7F121640" />
-    <public type="string" name="password_recovery_title" id="0x7F121641" />
-    <public type="string" name="password_recovery_verify_phone_subtitle" id="0x7F121642" />
-    <public type="string" name="password_recovery_verify_phone_subtitle_resend" id="0x7F121643" />
-    <public type="string" name="password_recovery_verify_phone_title" id="0x7F121644" />
-    <public type="string" name="password_required" id="0x7F121645" />
-    <public type="string" name="password_toggle_content_description" id="0x7F121646" />
-    <public type="string" name="paste" id="0x7F121647" />
-    <public type="string" name="path_password_eye" id="0x7F121648" />
-    <public type="string" name="path_password_eye_mask_strike_through" id="0x7F121649" />
-    <public type="string" name="path_password_eye_mask_visible" id="0x7F12164A" />
-    <public type="string" name="path_password_strike_through" id="0x7F12164B" />
-    <public type="string" name="pause" id="0x7F12164C" />
-    <public type="string" name="payment_authentication_modal_button" id="0x7F12164D" />
-    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7F12164E" />
-    <public type="string" name="payment_authentication_modal_canceled" id="0x7F12164F" />
-    <public type="string" name="payment_authentication_modal_fail" id="0x7F121650" />
-    <public type="string" name="payment_authentication_modal_start" id="0x7F121651" />
-    <public type="string" name="payment_authentication_modal_success" id="0x7F121652" />
-    <public type="string" name="payment_authentication_modal_title" id="0x7F121653" />
-    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7F121654" />
-    <public type="string" name="payment_authentication_modal_title_fail" id="0x7F121655" />
-    <public type="string" name="payment_authentication_modal_title_success" id="0x7F121656" />
-    <public type="string" name="payment_modal_button_premium" id="0x7F121657" />
-    <public type="string" name="payment_modal_button_premium_gift" id="0x7F121658" />
-    <public type="string" name="payment_modal_one_month" id="0x7F121659" />
-    <public type="string" name="payment_modal_one_year" id="0x7F12165A" />
-    <public type="string" name="payment_modal_subtitle_premium_gift" id="0x7F12165B" />
-    <public type="string" name="payment_price_change_body" id="0x7F12165C" />
-    <public type="string" name="payment_price_change_title" id="0x7F12165D" />
-    <public type="string" name="payment_source_card_ending" id="0x7F12165E" />
-    <public type="string" name="payment_source_card_ending_in" id="0x7F12165F" />
-    <public type="string" name="payment_source_card_expires" id="0x7F121660" />
-    <public type="string" name="payment_source_card_number" id="0x7F121661" />
-    <public type="string" name="payment_source_confirm_paypal_details" id="0x7F121662" />
-    <public type="string" name="payment_source_credit_card" id="0x7F121663" />
-    <public type="string" name="payment_source_delete" id="0x7F121664" />
-    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7F121665" />
-    <public type="string" name="payment_source_deleted" id="0x7F121666" />
-    <public type="string" name="payment_source_edit_help_card" id="0x7F121667" />
-    <public type="string" name="payment_source_edit_help_paypal" id="0x7F121668" />
-    <public type="string" name="payment_source_edit_saved" id="0x7F121669" />
-    <public type="string" name="payment_source_edit_select_state" id="0x7F12166A" />
-    <public type="string" name="payment_source_edit_title" id="0x7F12166B" />
-    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7F12166C" />
-    <public type="string" name="payment_source_information" id="0x7F12166D" />
-    <public type="string" name="payment_source_invalid" id="0x7F12166E" />
-    <public type="string" name="payment_source_invalid_help" id="0x7F12166F" />
-    <public type="string" name="payment_source_make_default" id="0x7F121670" />
-    <public type="string" name="payment_source_name_error_required" id="0x7F121671" />
-    <public type="string" name="payment_source_payment_request_button_generic" id="0x7F121672" />
-    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7F121673" />
-    <public type="string" name="payment_source_payment_request_info_creating" id="0x7F121674" />
-    <public type="string" name="payment_source_payment_request_info_loading" id="0x7F121675" />
-    <public type="string" name="payment_source_payment_request_info_title" id="0x7F121676" />
-    <public type="string" name="payment_source_payment_request_label" id="0x7F121677" />
-    <public type="string" name="payment_source_payment_request_unsupported" id="0x7F121678" />
-    <public type="string" name="payment_source_paypal" id="0x7F121679" />
-    <public type="string" name="payment_source_paypal_account" id="0x7F12167A" />
-    <public type="string" name="payment_source_paypal_details" id="0x7F12167B" />
-    <public type="string" name="payment_source_paypal_loading" id="0x7F12167C" />
-    <public type="string" name="payment_source_paypal_reopen" id="0x7F12167D" />
-    <public type="string" name="payment_source_subscription" id="0x7F12167E" />
-    <public type="string" name="payment_source_type" id="0x7F12167F" />
-    <public type="string" name="payment_source_type_select" id="0x7F121680" />
-    <public type="string" name="payment_sources_add" id="0x7F121681" />
-    <public type="string" name="payment_waiting_for_authentication" id="0x7F121682" />
-    <public type="string" name="paypal_account_verifying" id="0x7F121683" />
-    <public type="string" name="paypal_callback_error" id="0x7F121684" />
-    <public type="string" name="paypal_callback_success" id="0x7F121685" />
-    <public type="string" name="pending" id="0x7F121686" />
-    <public type="string" name="pending_friends_list_header" id="0x7F121687" />
-    <public type="string" name="people" id="0x7F121688" />
-    <public type="string" name="per_guild_avatars_premium_feature_description" id="0x7F121689" />
-    <public type="string" name="per_guild_avatars_premium_feature_title" id="0x7F12168A" />
-    <public type="string" name="percentage_since_last_week" id="0x7F12168B" />
-    <public type="string" name="permission_helpdesk" id="0x7F12168C" />
-    <public type="string" name="permission_media_denied" id="0x7F12168D" />
-    <public type="string" name="permission_media_download_denied" id="0x7F12168E" />
-    <public type="string" name="permission_microphone_denied" id="0x7F12168F" />
-    <public type="string" name="permission_override_allow" id="0x7F121690" />
-    <public type="string" name="permission_override_deny" id="0x7F121691" />
-    <public type="string" name="permission_override_passthrough" id="0x7F121692" />
-    <public type="string" name="permission_overrides" id="0x7F121693" />
-    <public type="string" name="permission_qr_scanner_denied" id="0x7F121694" />
-    <public type="string" name="permissions" id="0x7F121695" />
-    <public type="string" name="permissions_unsynced" id="0x7F121696" />
-    <public type="string" name="personalization_disable_modal_body" id="0x7F121697" />
-    <public type="string" name="personalization_disable_modal_cancel" id="0x7F121698" />
-    <public type="string" name="personalization_disable_modal_confirm" id="0x7F121699" />
-    <public type="string" name="personalization_disable_modal_title" id="0x7F12169A" />
-    <public type="string" name="phone" id="0x7F12169B" />
-    <public type="string" name="phone_failed_to_add" id="0x7F12169C" />
-    <public type="string" name="phone_invalid" id="0x7F12169D" />
-    <public type="string" name="phone_ip_authorization_subtitle" id="0x7F12169E" />
-    <public type="string" name="phone_ip_authorization_subtitle_resend" id="0x7F12169F" />
-    <public type="string" name="phone_ip_authorization_title" id="0x7F1216A0" />
-    <public type="string" name="phone_required" id="0x7F1216A1" />
-    <public type="string" name="phone_verification_add_title" id="0x7F1216A2" />
-    <public type="string" name="phone_verification_current_phone" id="0x7F1216A3" />
-    <public type="string" name="phone_verification_new_phone_label" id="0x7F1216A4" />
-    <public type="string" name="phone_verification_phone_label" id="0x7F1216A5" />
-    <public type="string" name="phone_verification_receive_text" id="0x7F1216A6" />
-    <public type="string" name="phone_verification_update_title" id="0x7F1216A7" />
-    <public type="string" name="pick_a_color" id="0x7F1216A8" />
-    <public type="string" name="picture_in_picture_collapse" id="0x7F1216A9" />
-    <public type="string" name="picture_in_picture_expand" id="0x7F1216AA" />
-    <public type="string" name="pin" id="0x7F1216AB" />
-    <public type="string" name="pin_confirm" id="0x7F1216AC" />
-    <public type="string" name="pin_message" id="0x7F1216AD" />
-    <public type="string" name="pin_message_body" id="0x7F1216AE" />
-    <public type="string" name="pin_message_body_mobile" id="0x7F1216AF" />
-    <public type="string" name="pin_message_body_private_channel" id="0x7F1216B0" />
-    <public type="string" name="pin_message_title" id="0x7F1216B1" />
-    <public type="string" name="pin_message_too_many_body" id="0x7F1216B2" />
-    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7F1216B3" />
-    <public type="string" name="pin_message_too_many_title" id="0x7F1216B4" />
-    <public type="string" name="pinned_messages" id="0x7F1216B5" />
-    <public type="string" name="pinned_messages_pro_tip" id="0x7F1216B6" />
-    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7F1216B7" />
-    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7F1216B8" />
-    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7F1216B9" />
-    <public type="string" name="pins" id="0x7F1216BA" />
-    <public type="string" name="pins_disabled_nsfw" id="0x7F1216BB" />
-    <public type="string" name="pins_unread_a11y_label" id="0x7F1216BC" />
-    <public type="string" name="pl" id="0x7F1216BD" />
-    <public type="string" name="platform_android" id="0x7F1216BE" />
-    <public type="string" name="platform_ios" id="0x7F1216BF" />
-    <public type="string" name="platform_linux" id="0x7F1216C0" />
-    <public type="string" name="platform_macos" id="0x7F1216C1" />
-    <public type="string" name="platform_windows" id="0x7F1216C2" />
-    <public type="string" name="play" id="0x7F1216C3" />
-    <public type="string" name="play_again" id="0x7F1216C4" />
-    <public type="string" name="play_full_video" id="0x7F1216C5" />
-    <public type="string" name="play_stream" id="0x7F1216C6" />
-    <public type="string" name="playing_game" id="0x7F1216C7" />
-    <public type="string" name="please_try_again_later" id="0x7F1216C8" />
-    <public type="string" name="poker_survey_prompt" id="0x7F1216C9" />
-    <public type="string" name="popout_player" id="0x7F1216CA" />
-    <public type="string" name="popout_player_opened" id="0x7F1216CB" />
-    <public type="string" name="popout_remove_from_top" id="0x7F1216CC" />
-    <public type="string" name="popout_return" id="0x7F1216CD" />
-    <public type="string" name="popout_stay_on_top" id="0x7F1216CE" />
-    <public type="string" name="preference_copied" id="0x7F1216CF" />
-    <public type="string" name="premium" id="0x7F1216D0" />
-    <public type="string" name="premium_activated" id="0x7F1216D1" />
-    <public type="string" name="premium_alert_error_title" id="0x7F1216D2" />
-    <public type="string" name="premium_and_premium_guild_subscription" id="0x7F1216D3" />
-    <public type="string" name="premium_badge_tooltip" id="0x7F1216D4" />
-    <public type="string" name="premium_cancel_cancel_mobile" id="0x7F1216D5" />
-    <public type="string" name="premium_cancel_confirm_body" id="0x7F1216D6" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7F1216D7" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7F1216D8" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7F1216D9" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7F1216DA" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7F1216DB" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7F1216DC" />
-    <public type="string" name="premium_cancel_confirm_button" id="0x7F1216DD" />
-    <public type="string" name="premium_cancel_confirm_header" id="0x7F1216DE" />
-    <public type="string" name="premium_cancel_confirm_mobile" id="0x7F1216DF" />
-    <public type="string" name="premium_cancel_confirm_new" id="0x7F1216E0" />
-    <public type="string" name="premium_cancel_confirm_title" id="0x7F1216E1" />
-    <public type="string" name="premium_cancel_failed_body" id="0x7F1216E2" />
-    <public type="string" name="premium_cancel_past_due_confirm_body" id="0x7F1216E3" />
-    <public type="string" name="premium_change_discriminator_length_error" id="0x7F1216E4" />
-    <public type="string" name="premium_change_discriminator_modal_body" id="0x7F1216E5" />
-    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7F1216E6" />
-    <public type="string" name="premium_change_discriminator_modal_header" id="0x7F1216E7" />
-    <public type="string" name="premium_change_discriminator_tooltip" id="0x7F1216E8" />
-    <public type="string" name="premium_change_discriminator_warning" id="0x7F1216E9" />
-    <public type="string" name="premium_change_discriminator_zero_error" id="0x7F1216EA" />
-    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7F1216EB" />
-    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7F1216EC" />
-    <public type="string" name="premium_chat_perks_custom_stickers" id="0x7F1216ED" />
-    <public type="string" name="premium_chat_perks_description_premium_guild_discount" id="0x7F1216EE" />
-    <public type="string" name="premium_chat_perks_description_premium_guild_included" id="0x7F1216EF" />
-    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7F1216F0" />
-    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7F1216F1" />
-    <public type="string" name="premium_chat_perks_max_guilds" id="0x7F1216F2" />
-    <public type="string" name="premium_chat_perks_max_message_length" id="0x7F1216F3" />
-    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7F1216F4" />
-    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7F1216F5" />
-    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7F1216F6" />
-    <public type="string" name="premium_chat_perks_simple_title" id="0x7F1216F7" />
-    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7F1216F9" />
-    <public type="string" name="premium_choose_plan_title" id="0x7F1216FA" />
-    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7F1216FB" />
-    <public type="string" name="premium_current_active_subscription" id="0x7F1216FC" />
-    <public type="string" name="premium_downgrade_done_button" id="0x7F1216FD" />
-    <public type="string" name="premium_features_chat_perks" id="0x7F1216FE" />
-    <public type="string" name="premium_features_chat_perks_header" id="0x7F1216FF" />
-    <public type="string" name="premium_features_message_length_heading" id="0x7F121700" />
-    <public type="string" name="premium_features_message_length_subheading" id="0x7F121701" />
-    <public type="string" name="premium_features_profile_customization_header" id="0x7F121702" />
-    <public type="string" name="premium_features_profile_customization_subheader" id="0x7F121703" />
-    <public type="string" name="premium_game" id="0x7F121704" />
-    <public type="string" name="premium_gift_button_label" id="0x7F121705" />
-    <public type="string" name="premium_gift_button_tooltip" id="0x7F121706" />
-    <public type="string" name="premium_gift_send" id="0x7F121707" />
-    <public type="string" name="premium_gift_share_link_ios" id="0x7F121708" />
-    <public type="string" name="premium_gifting_button" id="0x7F121709" />
-    <public type="string" name="premium_gifting_purchase_gift" id="0x7F12170A" />
-    <public type="string" name="premium_gifting_title" id="0x7F12170B" />
-    <public type="string" name="premium_gifting_title_mobile" id="0x7F12170C" />
-    <public type="string" name="premium_grandfathered_monthly" id="0x7F12170D" />
-    <public type="string" name="premium_grandfathered_upgrade" id="0x7F12170E" />
-    <public type="string" name="premium_grandfathered_upgrade_confirm" id="0x7F12170F" />
-    <public type="string" name="premium_grandfathered_upgrade_estimated_title" id="0x7F121710" />
-    <public type="string" name="premium_grandfathered_upgrade_legalese" id="0x7F121711" />
-    <public type="string" name="premium_grandfathered_upgrade_review_header" id="0x7F121712" />
-    <public type="string" name="premium_grandfathered_warning" id="0x7F121713" />
-    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7F121714" />
-    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7F121715" />
-    <public type="string" name="premium_grandfathered_warning_title" id="0x7F121716" />
-    <public type="string" name="premium_grandfathered_yearly" id="0x7F121717" />
-    <public type="string" name="premium_grandfathered_yearly_upgrading" id="0x7F121718" />
-    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7F121719" />
-    <public type="string" name="premium_guild_emoji_promo_title" id="0x7F12171A" />
-    <public type="string" name="premium_guild_features_custom_emoji_mobile" id="0x7F12171B" />
-    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7F12171C" />
-    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7F12171D" />
-    <public type="string" name="premium_guild_features_voice_quality" id="0x7F12171E" />
-    <public type="string" name="premium_guild_full_feature_list" id="0x7F12171F" />
-    <public type="string" name="premium_guild_grace_period_cooldown" id="0x7F121720" />
-    <public type="string" name="premium_guild_grace_period_cooldown_soon" id="0x7F121721" />
-    <public type="string" name="premium_guild_grace_period_notice" id="0x7F121722" />
-    <public type="string" name="premium_guild_grace_period_notice_button" id="0x7F121723" />
-    <public type="string" name="premium_guild_grace_period_title" id="0x7F121724" />
-    <public type="string" name="premium_guild_guild_feature_audio_quality" id="0x7F121725" />
-    <public type="string" name="premium_guild_guild_feature_emoji" id="0x7F121726" />
-    <public type="string" name="premium_guild_guild_feature_upload_size" id="0x7F121727" />
-    <public type="string" name="premium_guild_guild_features_header" id="0x7F121728" />
-    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7F121729" />
-    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7F12172A" />
-    <public type="string" name="premium_guild_num_month_guild_subscriptions" id="0x7F12172B" />
-    <public type="string" name="premium_guild_num_month_guild_subscriptions_unformatted" id="0x7F12172C" />
-    <public type="string" name="premium_guild_num_year_guild_subscriptions" id="0x7F12172D" />
-    <public type="string" name="premium_guild_num_year_guild_subscriptions_unformatted" id="0x7F12172E" />
-    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7F12172F" />
-    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7F121730" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile" id="0x7F121731" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile_learn_more" id="0x7F121732" />
-    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_body" id="0x7F121733" />
-    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_title" id="0x7F121734" />
-    <public type="string" name="premium_guild_perks_modal_button_gift_premium" id="0x7F121735" />
-    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7F121736" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_external_error" id="0x7F121737" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7F121738" />
-    <public type="string" name="premium_guild_perks_modal_gift_nitro" id="0x7F121739" />
-    <public type="string" name="premium_guild_perks_modal_header" id="0x7F12173A" />
-    <public type="string" name="premium_guild_perks_modal_header_subscription_count" id="0x7F12173B" />
-    <public type="string" name="premium_guild_perks_modal_header_user_subscription_count" id="0x7F12173C" />
-    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7F12173D" />
-    <public type="string" name="premium_guild_perks_modal_manage_your_subscriptions" id="0x7F12173E" />
-    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7F12173F" />
-    <public type="string" name="premium_guild_perks_modal_protip" id="0x7F121740" />
-    <public type="string" name="premium_guild_perks_modal_protip_mobile" id="0x7F121741" />
-    <public type="string" name="premium_guild_perks_modal_subscribe_to_tier_tooltip" id="0x7F121742" />
-    <public type="string" name="premium_guild_perks_modal_subscriber_perks_header" id="0x7F121743" />
-    <public type="string" name="premium_guild_plan_month" id="0x7F121744" />
-    <public type="string" name="premium_guild_plan_year" id="0x7F121745" />
-    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7F121746" />
-    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7F121747" />
-    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7F121748" />
-    <public type="string" name="premium_guild_subscribe_confirm_cancel_warning" id="0x7F121749" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7F12174A" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7F12174B" />
-    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7F12174C" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_blurb" id="0x7F12174D" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_from_guild" id="0x7F12174E" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_header" id="0x7F12174F" />
-    <public type="string" name="premium_guild_subscribe_confirm_transfer_to_guild" id="0x7F121750" />
-    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7F121751" />
-    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7F121752" />
-    <public type="string" name="premium_guild_subscribe_select_guild_transfer_header" id="0x7F121753" />
-    <public type="string" name="premium_guild_subscribe_success_okay" id="0x7F121754" />
-    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7F121755" />
-    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation" id="0x7F121756" />
-    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation_label" id="0x7F121757" />
-    <public type="string" name="premium_guild_subscribe_transfer_error_body" id="0x7F121758" />
-    <public type="string" name="premium_guild_subscribe_transfer_error_header" id="0x7F121759" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_cancel" id="0x7F12175A" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_counter" id="0x7F12175B" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_description" id="0x7F12175C" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_header" id="0x7F12175D" />
-    <public type="string" name="premium_guild_subscribe_unused_slots_next" id="0x7F12175E" />
-    <public type="string" name="premium_guild_subscriber_feature_member_badge" id="0x7F12175F" />
-    <public type="string" name="premium_guild_subscriber_feature_profile_badge" id="0x7F121760" />
-    <public type="string" name="premium_guild_subscriber_feature_role" id="0x7F121761" />
-    <public type="string" name="premium_guild_subscription" id="0x7F121762" />
-    <public type="string" name="premium_guild_subscription_active_title" id="0x7F121763" />
-    <public type="string" name="premium_guild_subscription_available" id="0x7F121764" />
-    <public type="string" name="premium_guild_subscription_cancel_body_external" id="0x7F121765" />
-    <public type="string" name="premium_guild_subscription_cancel_body_guild" id="0x7F121766" />
-    <public type="string" name="premium_guild_subscription_cancel_body_inventory" id="0x7F121767" />
-    <public type="string" name="premium_guild_subscription_cancel_button" id="0x7F121768" />
-    <public type="string" name="premium_guild_subscription_cancel_button_disabled_past_due_tooltip" id="0x7F121769" />
-    <public type="string" name="premium_guild_subscription_cancel_button_disabled_tooltip" id="0x7F12176A" />
-    <public type="string" name="premium_guild_subscription_cancel_button_mobile" id="0x7F12176B" />
-    <public type="string" name="premium_guild_subscription_cancel_error_mobile" id="0x7F12176C" />
-    <public type="string" name="premium_guild_subscription_cancel_invoice_subscription_cancelled" id="0x7F12176D" />
-    <public type="string" name="premium_guild_subscription_cancel_preview" id="0x7F12176E" />
-    <public type="string" name="premium_guild_subscription_cancel_title" id="0x7F12176F" />
-    <public type="string" name="premium_guild_subscription_cancel_title_guild" id="0x7F121770" />
-    <public type="string" name="premium_guild_subscription_cancel_title_inventory" id="0x7F121771" />
-    <public type="string" name="premium_guild_subscription_cancel_title_pending_cancellation" id="0x7F121772" />
-    <public type="string" name="premium_guild_subscription_confirm_body" id="0x7F121773" />
-    <public type="string" name="premium_guild_subscription_confirm_title" id="0x7F121774" />
-    <public type="string" name="premium_guild_subscription_creation_date" id="0x7F121775" />
-    <public type="string" name="premium_guild_subscription_duration" id="0x7F121776" />
-    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7F121777" />
-    <public type="string" name="premium_guild_subscription_error_pending_mutation" id="0x7F121778" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7F121779" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7F12177A" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7F12177B" />
-    <public type="string" name="premium_guild_subscription_guild_affinity_notice" id="0x7F12177C" />
-    <public type="string" name="premium_guild_subscription_guild_affinity_notice_button" id="0x7F12177D" />
-    <public type="string" name="premium_guild_subscription_guild_affinity_notice_small_guild" id="0x7F12177E" />
-    <public type="string" name="premium_guild_subscription_guild_subsription_subtitle" id="0x7F12177F" />
-    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_close" id="0x7F121780" />
-    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_header" id="0x7F121781" />
-    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_text" id="0x7F121782" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_button" id="0x7F121783" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_button_mobile" id="0x7F121784" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_description" id="0x7F121785" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_title" id="0x7F121786" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_description" id="0x7F121787" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_error" id="0x7F121788" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_title" id="0x7F121789" />
-    <public type="string" name="premium_guild_subscription_inventory_uncancel_title_mobile" id="0x7F12178A" />
-    <public type="string" name="premium_guild_subscription_marketing_blurb" id="0x7F12178B" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb" id="0x7F12178C" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_prompt" id="0x7F12178D" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_without_prompt" id="0x7F12178E" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_blurb_mobile" id="0x7F12178F" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_text" id="0x7F121790" />
-    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_title" id="0x7F121791" />
-    <public type="string" name="premium_guild_subscription_marketing_header" id="0x7F121792" />
-    <public type="string" name="premium_guild_subscription_marketing_header_ios" id="0x7F121793" />
-    <public type="string" name="premium_guild_subscription_notice" id="0x7F121794" />
-    <public type="string" name="premium_guild_subscription_notice_button" id="0x7F121795" />
-    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7F121796" />
-    <public type="string" name="premium_guild_subscription_num_subscriptions" id="0x7F121797" />
-    <public type="string" name="premium_guild_subscription_out_of_slots_account_hold" id="0x7F121798" />
-    <public type="string" name="premium_guild_subscription_out_of_slots_account_hold_title" id="0x7F121799" />
-    <public type="string" name="premium_guild_subscription_out_of_slots_canceled_subscription" id="0x7F12179A" />
-    <public type="string" name="premium_guild_subscription_out_of_slots_pending_plan_change" id="0x7F12179B" />
-    <public type="string" name="premium_guild_subscription_out_of_slots_purchase_on_desktop" id="0x7F12179C" />
-    <public type="string" name="premium_guild_subscription_out_of_slots_title" id="0x7F12179D" />
-    <public type="string" name="premium_guild_subscription_pending_cancelation" id="0x7F12179E" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_plan" id="0x7F12179F" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription" id="0x7F1217A0" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_subscription_account_hold" id="0x7F1217A1" />
-    <public type="string" name="premium_guild_subscription_purchase_button_disabled_subscription_past_due" id="0x7F1217A2" />
-    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7F1217A3" />
-    <public type="string" name="premium_guild_subscription_slot_cancel_button" id="0x7F1217A4" />
-    <public type="string" name="premium_guild_subscription_slot_uncancel_button" id="0x7F1217A5" />
-    <public type="string" name="premium_guild_subscription_slot_uncancel_button_mobile" id="0x7F1217A6" />
-    <public type="string" name="premium_guild_subscription_subscribe" id="0x7F1217A7" />
-    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7F1217A8" />
-    <public type="string" name="premium_guild_subscription_subtitle" id="0x7F1217A9" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7F1217AA" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7F1217AB" />
-    <public type="string" name="premium_guild_subscription_title" id="0x7F1217AC" />
-    <public type="string" name="premium_guild_subscription_tooltip" id="0x7F1217AD" />
-    <public type="string" name="premium_guild_subscription_transfer_button" id="0x7F1217AE" />
-    <public type="string" name="premium_guild_subscription_transfer_button_disabled_tooltip" id="0x7F1217AF" />
-    <public type="string" name="premium_guild_subscription_unused_slot_description" id="0x7F1217B0" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info" id="0x7F1217B1" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_account_hold" id="0x7F1217B2" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_account_hold_no_price" id="0x7F1217B3" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_android" id="0x7F1217B4" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_no_price" id="0x7F1217B5" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation" id="0x7F1217B6" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android" id="0x7F1217B7" />
-    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation_no_price" id="0x7F1217B8" />
-    <public type="string" name="premium_guild_tier_0" id="0x7F1217B9" />
-    <public type="string" name="premium_guild_tier_1" id="0x7F1217BA" />
-    <public type="string" name="premium_guild_tier_2" id="0x7F1217BB" />
-    <public type="string" name="premium_guild_tier_3" id="0x7F1217BC" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7F1217BD" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7F1217BE" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7F1217BF" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7F1217C0" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7F1217C1" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7F1217C2" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7F1217C3" />
-    <public type="string" name="premium_guild_user_feature_member_badge" id="0x7F1217C4" />
-    <public type="string" name="premium_guild_user_feature_profile_badge" id="0x7F1217C5" />
-    <public type="string" name="premium_guild_user_feature_role" id="0x7F1217C6" />
-    <public type="string" name="premium_guild_user_features_header" id="0x7F1217C7" />
-    <public type="string" name="premium_included" id="0x7F1217C8" />
-    <public type="string" name="premium_legacy" id="0x7F1217C9" />
-    <public type="string" name="premium_manage_via_desktop" id="0x7F1217CA" />
-    <public type="string" name="premium_marketing_feature_emoji_description" id="0x7F1217CB" />
-    <public type="string" name="premium_marketing_feature_emoji_title" id="0x7F1217CC" />
-    <public type="string" name="premium_marketing_feature_header" id="0x7F1217CD" />
-    <public type="string" name="premium_marketing_feature_premium_badge_description" id="0x7F1217CE" />
-    <public type="string" name="premium_marketing_feature_premium_badge_title" id="0x7F1217CF" />
-    <public type="string" name="premium_marketing_feature_premium_go_live_description" id="0x7F1217D0" />
-    <public type="string" name="premium_marketing_feature_premium_go_live_title" id="0x7F1217D1" />
-    <public type="string" name="premium_marketing_feature_premium_guild_description" id="0x7F1217D2" />
-    <public type="string" name="premium_marketing_feature_premium_guild_title" id="0x7F1217D3" />
-    <public type="string" name="premium_marketing_feature_premium_upload_size_description" id="0x7F1217D4" />
-    <public type="string" name="premium_marketing_feature_premium_upload_size_title" id="0x7F1217D5" />
-    <public type="string" name="premium_marketing_feature_profile_description" id="0x7F1217D6" />
-    <public type="string" name="premium_marketing_feature_profile_title" id="0x7F1217D7" />
-    <public type="string" name="premium_marketing_hero_body" id="0x7F1217D8" />
-    <public type="string" name="premium_marketing_hero_header" id="0x7F1217D9" />
-    <public type="string" name="premium_message_length_chatbox_flair" id="0x7F1217DA" />
-    <public type="string" name="premium_message_length_roadblock_modal_body" id="0x7F1217DB" />
-    <public type="string" name="premium_message_length_roadblock_modal_header" id="0x7F1217DC" />
-    <public type="string" name="premium_message_length_upsell_modal_body" id="0x7F1217DD" />
-    <public type="string" name="premium_message_length_upsell_modal_header" id="0x7F1217DE" />
-    <public type="string" name="premium_message_length_upsell_modal_upload" id="0x7F1217DF" />
-    <public type="string" name="premium_message_length_upsell_tooltip" id="0x7F1217E0" />
-    <public type="string" name="premium_no_plans_body" id="0x7F1217E1" />
-    <public type="string" name="premium_no_plans_header" id="0x7F1217E2" />
-    <public type="string" name="premium_not_claimed" id="0x7F1217E3" />
-    <public type="string" name="premium_not_claimed_body" id="0x7F1217E4" />
-    <public type="string" name="premium_not_verified" id="0x7F1217E5" />
-    <public type="string" name="premium_not_verified_body" id="0x7F1217E6" />
-    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7F1217E7" />
-    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7F1217E8" />
-    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7F1217E9" />
-    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7F1217EA" />
-    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7F1217EB" />
-    <public type="string" name="premium_payment_gift_subtext_monthly" id="0x7F1217EC" />
-    <public type="string" name="premium_payment_gift_subtext_yearly" id="0x7F1217ED" />
-    <public type="string" name="premium_payment_is_gift" id="0x7F1217EE" />
-    <public type="string" name="premium_payment_select" id="0x7F1217EF" />
-    <public type="string" name="premium_pending_plan_change_cancel_body" id="0x7F1217F0" />
-    <public type="string" name="premium_pending_plan_change_cancel_body_no_existing_plan" id="0x7F1217F1" />
-    <public type="string" name="premium_pending_plan_change_cancel_button" id="0x7F1217F2" />
-    <public type="string" name="premium_pending_plan_change_cancel_header" id="0x7F1217F3" />
-    <public type="string" name="premium_pending_plan_change_notice" id="0x7F1217F4" />
-    <public type="string" name="premium_pending_plan_change_notice_grandfathered_upgrade" id="0x7F1217F5" />
-    <public type="string" name="premium_plan_month" id="0x7F1217F6" />
-    <public type="string" name="premium_plan_month_tier_1" id="0x7F1217F7" />
-    <public type="string" name="premium_plan_month_tier_2" id="0x7F1217F8" />
-    <public type="string" name="premium_plan_month_tier_2_trial" id="0x7F1217F9" />
-    <public type="string" name="premium_plan_year" id="0x7F1217FA" />
-    <public type="string" name="premium_plan_year_tier_1" id="0x7F1217FB" />
-    <public type="string" name="premium_plan_year_tier_2" id="0x7F1217FC" />
-    <public type="string" name="premium_plan_year_tier_2_trial" id="0x7F1217FD" />
-    <public type="string" name="premium_profile_customization_upsell_body" id="0x7F1217FE" />
-    <public type="string" name="premium_profile_customization_upsell_header" id="0x7F1217FF" />
-    <public type="string" name="premium_promo_description" id="0x7F121800" />
-    <public type="string" name="premium_promo_description_search_upsell" id="0x7F121801" />
-    <public type="string" name="premium_promo_description_trial" id="0x7F121802" />
-    <public type="string" name="premium_promo_title" id="0x7F121803" />
-    <public type="string" name="premium_promo_title_search_upsell" id="0x7F121804" />
-    <public type="string" name="premium_required" id="0x7F121805" />
-    <public type="string" name="premium_required_get_nitro" id="0x7F121806" />
-    <public type="string" name="premium_restore_subscription_ios" id="0x7F121807" />
-    <public type="string" name="premium_retention_emoji_picker_description" id="0x7F121808" />
-    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7F121809" />
-    <public type="string" name="premium_settings" id="0x7F12180A" />
-    <public type="string" name="premium_settings_account_hold_info" id="0x7F12180B" />
-    <public type="string" name="premium_settings_account_hold_info_external" id="0x7F12180C" />
-    <public type="string" name="premium_settings_account_hold_info_price" id="0x7F12180D" />
-    <public type="string" name="premium_settings_account_hold_notice_change_payment_method_button" id="0x7F12180E" />
-    <public type="string" name="premium_settings_account_hold_notice_info" id="0x7F12180F" />
-    <public type="string" name="premium_settings_billing_info" id="0x7F121810" />
-    <public type="string" name="premium_settings_cancelled_info" id="0x7F121811" />
-    <public type="string" name="premium_settings_get" id="0x7F121812" />
-    <public type="string" name="premium_settings_manage" id="0x7F121813" />
-    <public type="string" name="premium_settings_past_due_info" id="0x7F121814" />
-    <public type="string" name="premium_settings_past_due_info_external" id="0x7F121815" />
-    <public type="string" name="premium_settings_premium_guild_subscriptions" id="0x7F121816" />
-    <public type="string" name="premium_settings_renewal_info" id="0x7F121817" />
-    <public type="string" name="premium_settings_renewal_info_external" id="0x7F121818" />
-    <public type="string" name="premium_settings_renewal_info_grandfathered_upgrade" id="0x7F121819" />
-    <public type="string" name="premium_settings_renewal_info_with_plan" id="0x7F12181A" />
-    <public type="string" name="premium_settings_starting_at_per_month" id="0x7F12181B" />
-    <public type="string" name="premium_settings_subscribe_today" id="0x7F12181C" />
-    <public type="string" name="premium_settings_subscriptions_mobile_header" id="0x7F12181D" />
-    <public type="string" name="premium_subscription_adjustment_tooltip" id="0x7F12181E" />
-    <public type="string" name="premium_subscription_billing_info_mobile" id="0x7F12181F" />
-    <public type="string" name="premium_subscription_cancelled" id="0x7F121820" />
-    <public type="string" name="premium_subscription_credit" id="0x7F121821" />
-    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7F121822" />
-    <public type="string" name="premium_subscription_credit_applied_mismatched_plan_android" id="0x7F121823" />
-    <public type="string" name="premium_subscription_credit_applied_on" id="0x7F121824" />
-    <public type="string" name="premium_subscription_credit_count_months" id="0x7F121825" />
-    <public type="string" name="premium_subscription_current_label" id="0x7F121826" />
-    <public type="string" name="premium_subscription_description_tier_1" id="0x7F121827" />
-    <public type="string" name="premium_subscription_description_tier_1_account_hold" id="0x7F121828" />
-    <public type="string" name="premium_subscription_description_tier_1_account_hold_no_price" id="0x7F121829" />
-    <public type="string" name="premium_subscription_description_tier_1_no_price" id="0x7F12182A" />
-    <public type="string" name="premium_subscription_description_tier_1_pending_cancelation" id="0x7F12182B" />
-    <public type="string" name="premium_subscription_description_tier_1_pending_cancelation_no_price" id="0x7F12182C" />
-    <public type="string" name="premium_subscription_description_tier_2" id="0x7F12182D" />
-    <public type="string" name="premium_subscription_description_tier_2_account_hold" id="0x7F12182E" />
-    <public type="string" name="premium_subscription_description_tier_2_account_hold_no_price" id="0x7F12182F" />
-    <public type="string" name="premium_subscription_description_tier_2_no_price" id="0x7F121830" />
-    <public type="string" name="premium_subscription_description_tier_2_pending_cancelation" id="0x7F121831" />
-    <public type="string" name="premium_subscription_description_tier_2_pending_cancelation_no_price" id="0x7F121832" />
-    <public type="string" name="premium_subscription_grandfathered_upgrade_note" id="0x7F121833" />
-    <public type="string" name="premium_subscription_guild_subscription_adjustment" id="0x7F121834" />
-    <public type="string" name="premium_subscription_guild_subscription_adjustment_text" id="0x7F121835" />
-    <public type="string" name="premium_subscription_guild_subscription_adjustment_tooltip" id="0x7F121836" />
-    <public type="string" name="premium_subscription_hide_details" id="0x7F121837" />
-    <public type="string" name="premium_subscription_new_label" id="0x7F121838" />
-    <public type="string" name="premium_subscription_new_total" id="0x7F121839" />
-    <public type="string" name="premium_subscription_period_reset_notice" id="0x7F12183A" />
-    <public type="string" name="premium_subscription_plan_adjustment" id="0x7F12183B" />
-    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7F12183C" />
-    <public type="string" name="premium_subscription_policy_ios" id="0x7F12183D" />
-    <public type="string" name="premium_subscription_renewal_footer" id="0x7F12183E" />
-    <public type="string" name="premium_subscription_renewal_footer_trial" id="0x7F12183F" />
-    <public type="string" name="premium_subscription_required_body" id="0x7F121840" />
-    <public type="string" name="premium_subscription_show_details" id="0x7F121841" />
-    <public type="string" name="premium_subscription_updates" id="0x7F121842" />
-    <public type="string" name="premium_switch_plan_disabled_in_trial" id="0x7F121843" />
-    <public type="string" name="premium_switch_plan_disabled_pending_mutation_plan" id="0x7F121844" />
-    <public type="string" name="premium_switch_plan_disabled_pending_mutation_premium_guild_subscription" id="0x7F121845" />
-    <public type="string" name="premium_switch_plans" id="0x7F121846" />
-    <public type="string" name="premium_switch_review_header_premium_month_tier_1" id="0x7F121847" />
-    <public type="string" name="premium_switch_review_header_premium_month_tier_2" id="0x7F121848" />
-    <public type="string" name="premium_switch_review_header_premium_year_tier_1" id="0x7F121849" />
-    <public type="string" name="premium_switch_review_header_premium_year_tier_2" id="0x7F12184A" />
-    <public type="string" name="premium_tier_1" id="0x7F12184B" />
-    <public type="string" name="premium_tier_1_sticker_pack" id="0x7F12184C" />
-    <public type="string" name="premium_tier_2" id="0x7F12184D" />
-    <public type="string" name="premium_tier_2_subtitle" id="0x7F12184E" />
-    <public type="string" name="premium_tier_2_title" id="0x7F12184F" />
-    <public type="string" name="premium_tier_2_trial_cta_note" id="0x7F121850" />
-    <public type="string" name="premium_tier_2_trial_cta_subtitle" id="0x7F121851" />
-    <public type="string" name="premium_tier_2_trial_cta_title" id="0x7F121852" />
-    <public type="string" name="premium_title" id="0x7F121853" />
-    <public type="string" name="premium_trial_cta_button" id="0x7F121854" />
-    <public type="string" name="premium_trial_cta_description" id="0x7F121855" />
-    <public type="string" name="premium_trial_cta_description_expiring_days" id="0x7F121856" />
-    <public type="string" name="premium_trial_cta_description_expiring_hours" id="0x7F121857" />
-    <public type="string" name="premium_trial_cta_description_expiring_minutes" id="0x7F121858" />
-    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7F121859" />
-    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7F12185A" />
-    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7F12185B" />
-    <public type="string" name="premium_upgrade_done_button" id="0x7F12185C" />
-    <public type="string" name="premium_upgrade_required_body" id="0x7F12185D" />
-    <public type="string" name="premium_upload_promo" id="0x7F12185E" />
-    <public type="string" name="premium_upload_promo_trial" id="0x7F12185F" />
-    <public type="string" name="premium_upsell_animated_avatar" id="0x7F121860" />
-    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7F121861" />
-    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7F121862" />
-    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7F121863" />
-    <public type="string" name="premium_upsell_animated_avatar_subtitle" id="0x7F121864" />
-    <public type="string" name="premium_upsell_animated_avatar_text" id="0x7F121865" />
-    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7F121866" />
-    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7F121867" />
-    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7F121868" />
-    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7F121869" />
-    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7F12186A" />
-    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7F12186B" />
-    <public type="string" name="premium_upsell_continue_to_boosts" id="0x7F12186C" />
-    <public type="string" name="premium_upsell_continue_to_monthly" id="0x7F12186D" />
-    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7F12186E" />
-    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7F12186F" />
-    <public type="string" name="premium_upsell_emoji_description_mobile_new" id="0x7F121870" />
-    <public type="string" name="premium_upsell_emoji_mobile" id="0x7F121871" />
-    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7F121872" />
-    <public type="string" name="premium_upsell_feature_chat_perks" id="0x7F121873" />
-    <public type="string" name="premium_upsell_feature_chat_perks_mobile" id="0x7F121874" />
-    <public type="string" name="premium_upsell_feature_free_guild_subscription" id="0x7F121875" />
-    <public type="string" name="premium_upsell_feature_guild_subscription_discount" id="0x7F121876" />
-    <public type="string" name="premium_upsell_feature_pretext" id="0x7F121877" />
-    <public type="string" name="premium_upsell_feature_pretext_trial" id="0x7F121878" />
-    <public type="string" name="premium_upsell_feature_stream" id="0x7F121879" />
-    <public type="string" name="premium_upsell_feature_upload" id="0x7F12187A" />
-    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7F12187B" />
-    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7F12187C" />
-    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7F12187D" />
-    <public type="string" name="premium_upsell_upgrade" id="0x7F12187E" />
-    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7F12187F" />
-    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7F121880" />
-    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7F121881" />
-    <public type="string" name="premium_upsell_yearly_cta" id="0x7F121882" />
-    <public type="string" name="premium_upsell_yearly_description" id="0x7F121883" />
-    <public type="string" name="premium_upsell_yearly_title" id="0x7F121884" />
-    <public type="string" name="premium_utility_marketing_tooltip_body" id="0x7F121885" />
-    <public type="string" name="premium_utility_marketing_tooltip_cta" id="0x7F121886" />
-    <public type="string" name="premium_utility_marketing_tooltip_header" id="0x7F121887" />
-    <public type="string" name="premium_with_premium_guild_external_plan_description" id="0x7F121888" />
-    <public type="string" name="premium_with_price" id="0x7F121889" />
-    <public type="string" name="preorder_sku_name" id="0x7F12188A" />
-    <public type="string" name="preview_bytes_left" id="0x7F12188B" />
-    <public type="string" name="preview_change_language" id="0x7F12188C" />
-    <public type="string" name="preview_lines_left" id="0x7F12188D" />
-    <public type="string" name="preview_modal_label" id="0x7F12188E" />
-    <public type="string" name="preview_num_lines" id="0x7F12188F" />
-    <public type="string" name="preview_num_lines_at_least" id="0x7F121890" />
-    <public type="string" name="preview_search_language_placeholder" id="0x7F121891" />
-    <public type="string" name="preview_whole_file" id="0x7F121892" />
-    <public type="string" name="priority_speaker" id="0x7F121893" />
-    <public type="string" name="priority_speaker_description" id="0x7F121894" />
-    <public type="string" name="priority_speaker_description_app" id="0x7F121895" />
-    <public type="string" name="privacy_and_safety" id="0x7F121896" />
-    <public type="string" name="privacy_policy" id="0x7F121897" />
-    <public type="string" name="privacy_policy_url" id="0x7F121898" />
-    <public type="string" name="privacy_settings" id="0x7F121899" />
-    <public type="string" name="private_category" id="0x7F12189A" />
-    <public type="string" name="private_category_creation_permission_missing_hint" id="0x7F12189B" />
-    <public type="string" name="private_category_note" id="0x7F12189C" />
-    <public type="string" name="private_channel" id="0x7F12189D" />
-    <public type="string" name="private_channel_access_info_members" id="0x7F12189E" />
-    <public type="string" name="private_channel_access_info_members_overflow" id="0x7F12189F" />
-    <public type="string" name="private_channel_access_info_roles" id="0x7F1218A0" />
-    <public type="string" name="private_channel_access_info_roles_overflow" id="0x7F1218A1" />
-    <public type="string" name="private_channel_access_info_title" id="0x7F1218A2" />
-    <public type="string" name="private_channel_access_info_title_with_colon" id="0x7F1218A3" />
-    <public type="string" name="private_channel_add_members_modal_no_result" id="0x7F1218A4" />
-    <public type="string" name="private_channel_add_members_modal_no_roles" id="0x7F1218A5" />
-    <public type="string" name="private_channel_add_members_modal_placeholder" id="0x7F1218A6" />
-    <public type="string" name="private_channel_add_members_modal_row_administrator" id="0x7F1218A7" />
-    <public type="string" name="private_channel_add_members_modal_row_member" id="0x7F1218A8" />
-    <public type="string" name="private_channel_add_members_modal_row_owner" id="0x7F1218A9" />
-    <public type="string" name="private_channel_add_members_modal_row_role" id="0x7F1218AA" />
-    <public type="string" name="private_channel_add_members_modal_search_placeholder_mobile" id="0x7F1218AB" />
-    <public type="string" name="private_channel_add_members_modal_skip" id="0x7F1218AC" />
-    <public type="string" name="private_channel_add_members_modal_subtitle" id="0x7F1218AD" />
-    <public type="string" name="private_channel_manage_channel_access_cta" id="0x7F1218AE" />
-    <public type="string" name="private_channel_manage_role_permission_missing_hint" id="0x7F1218AF" />
-    <public type="string" name="private_channel_members_added_toast_msg" id="0x7F1218B0" />
-    <public type="string" name="private_channel_members_remove_yes_confirmation" id="0x7F1218B1" />
-    <public type="string" name="private_channel_members_removed" id="0x7F1218B2" />
-    <public type="string" name="private_channel_members_roles_added_toast_msg" id="0x7F1218B3" />
-    <public type="string" name="private_channel_members_section_header" id="0x7F1218B4" />
-    <public type="string" name="private_channel_modal_admin_role_force_enabled" id="0x7F1218B5" />
-    <public type="string" name="private_channel_note" id="0x7F1218B6" />
-    <public type="string" name="private_channel_roles_added_toast_msg" id="0x7F1218B7" />
-    <public type="string" name="private_channels_a11y_label" id="0x7F1218B8" />
-    <public type="string" name="private_text_channel_creation_permission_missing_hint" id="0x7F1218B9" />
-    <public type="string" name="private_thread" id="0x7F1218BA" />
-    <public type="string" name="private_voice_channel_creation_permission_missing_hint" id="0x7F1218BB" />
-    <public type="string" name="profile" id="0x7F1218BC" />
-    <public type="string" name="profile_banner_icon_tooltip_upsell" id="0x7F1218BD" />
-    <public type="string" name="profile_customization_beta_tooltip" id="0x7F1218BE" />
-    <public type="string" name="profile_customization_bio_placeholder" id="0x7F1218BF" />
-    <public type="string" name="profile_customization_marketing_tooltip_body" id="0x7F1218C0" />
-    <public type="string" name="profile_customization_marketing_tooltip_cta" id="0x7F1218C1" />
-    <public type="string" name="profile_customization_marketing_tooltip_header" id="0x7F1218C2" />
-    <public type="string" name="profile_customization_nitro_icon_tooltip" id="0x7F1218C3" />
-    <public type="string" name="progress_completed" id="0x7F1218C4" />
-    <public type="string" name="progress_completed_description" id="0x7F1218C5" />
-    <public type="string" name="progress_steps" id="0x7F1218C6" />
-    <public type="string" name="progress_steps_finished" id="0x7F1218C7" />
-    <public type="string" name="project_id" id="0x7F1218C8" />
-    <public type="string" name="promotion_account_identifier" id="0x7F1218C9" />
-    <public type="string" name="promotion_card_action_claim" id="0x7F1218CA" />
-    <public type="string" name="promotion_card_body_claimed_hidden" id="0x7F1218CB" />
-    <public type="string" name="promotion_error_body" id="0x7F1218CC" />
-    <public type="string" name="promotion_error_claimed_body" id="0x7F1218CD" />
-    <public type="string" name="promotion_error_no_code_body" id="0x7F1218CE" />
-    <public type="string" name="promotion_error_not_verified_body" id="0x7F1218CF" />
-    <public type="string" name="promotion_error_title" id="0x7F1218D0" />
-    <public type="string" name="promotion_existing_subscriber_body" id="0x7F1218D1" />
-    <public type="string" name="promotion_existing_subscriber_title" id="0x7F1218D2" />
-    <public type="string" name="promotion_previous_subscriber_body" id="0x7F1218D3" />
-    <public type="string" name="promotion_redeem_body" id="0x7F1218D4" />
-    <public type="string" name="prune" id="0x7F1218D5" />
-    <public type="string" name="prune_members" id="0x7F1218D6" />
-    <public type="string" name="prune_with_roles" id="0x7F1218D7" />
-    <public type="string" name="pt_br" id="0x7F1218D8" />
-    <public type="string" name="ptt_limited_body" id="0x7F1218D9" />
-    <public type="string" name="ptt_limited_title" id="0x7F1218DA" />
-    <public type="string" name="ptt_limited_warning" id="0x7F1218DB" />
-    <public type="string" name="ptt_permission_body" id="0x7F1218DC" />
-    <public type="string" name="ptt_permission_title" id="0x7F1218DD" />
-    <public type="string" name="public_guild_policy_accept" id="0x7F1218DE" />
-    <public type="string" name="public_guild_policy_title" id="0x7F1218DF" />
-    <public type="string" name="public_locale_help" id="0x7F1218E0" />
-    <public type="string" name="public_locale_selector_title" id="0x7F1218E1" />
-    <public type="string" name="public_locale_title" id="0x7F1218E2" />
-    <public type="string" name="public_rules_channel_title" id="0x7F1218E3" />
-    <public type="string" name="public_rules_selector_title" id="0x7F1218E4" />
-    <public type="string" name="public_updates_channel_title" id="0x7F1218E5" />
-    <public type="string" name="publish_followed_news_body" id="0x7F1218E6" />
-    <public type="string" name="publish_followed_news_body_reach" id="0x7F1218E7" />
-    <public type="string" name="publish_followed_news_body_settings_insights" id="0x7F1218E8" />
-    <public type="string" name="publish_followed_news_fail_body" id="0x7F1218E9" />
-    <public type="string" name="publish_followed_news_fail_title" id="0x7F1218EA" />
-    <public type="string" name="publish_followed_news_generic_body" id="0x7F1218EB" />
-    <public type="string" name="purchase_ticket_legal_label" id="0x7F1218EC" />
-    <public type="string" name="purchase_ticket_modal_title" id="0x7F1218ED" />
-    <public type="string" name="purple" id="0x7F1218EE" />
-    <public type="string" name="qr_code_download_cta" id="0x7F1218EF" />
-    <public type="string" name="qr_code_fail" id="0x7F1218F0" />
-    <public type="string" name="qr_code_fail_description" id="0x7F1218F1" />
-    <public type="string" name="qr_code_in_app_scanner_only" id="0x7F1218F2" />
-    <public type="string" name="qr_code_invalid" id="0x7F1218F3" />
-    <public type="string" name="qr_code_login_confirm" id="0x7F1218F4" />
-    <public type="string" name="qr_code_login_finish_button" id="0x7F1218F5" />
-    <public type="string" name="qr_code_login_start_over" id="0x7F1218F6" />
-    <public type="string" name="qr_code_login_success" id="0x7F1218F7" />
-    <public type="string" name="qr_code_login_success_flavor" id="0x7F1218F8" />
-    <public type="string" name="qr_code_not_found" id="0x7F1218F9" />
-    <public type="string" name="qr_code_not_found_description" id="0x7F1218FA" />
-    <public type="string" name="quality_indicator" id="0x7F1218FB" />
-    <public type="string" name="quick_dm_blocked" id="0x7F1218FC" />
-    <public type="string" name="quick_dm_user" id="0x7F1218FD" />
-    <public type="string" name="quick_switcher" id="0x7F1218FE" />
-    <public type="string" name="quickswitcher_drafts" id="0x7F1218FF" />
-    <public type="string" name="quickswitcher_empty_cta" id="0x7F121900" />
-    <public type="string" name="quickswitcher_empty_text" id="0x7F121901" />
-    <public type="string" name="quickswitcher_last_channel" id="0x7F121902" />
-    <public type="string" name="quickswitcher_link_message" id="0x7F121903" />
-    <public type="string" name="quickswitcher_link_no_access" id="0x7F121904" />
-    <public type="string" name="quickswitcher_link_unknown" id="0x7F121905" />
-    <public type="string" name="quickswitcher_mentions" id="0x7F121906" />
-    <public type="string" name="quickswitcher_notice" id="0x7F121907" />
-    <public type="string" name="quickswitcher_placeholder" id="0x7F121908" />
-    <public type="string" name="quickswitcher_protip" id="0x7F121909" />
-    <public type="string" name="quickswitcher_protip_guilds" id="0x7F12190A" />
-    <public type="string" name="quickswitcher_protip_text_channels" id="0x7F12190B" />
-    <public type="string" name="quickswitcher_protip_usernames" id="0x7F12190C" />
-    <public type="string" name="quickswitcher_protip_voice_channels" id="0x7F12190D" />
-    <public type="string" name="quickswitcher_querymode_applications" id="0x7F12190E" />
-    <public type="string" name="quickswitcher_querymode_guilds" id="0x7F12190F" />
-    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7F121910" />
-    <public type="string" name="quickswitcher_querymode_users" id="0x7F121911" />
-    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7F121912" />
-    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7F121913" />
-    <public type="string" name="quickswitcher_tip_nav" id="0x7F121914" />
-    <public type="string" name="quickswitcher_tip_select" id="0x7F121915" />
-    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7F121916" />
-    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7F121917" />
-    <public type="string" name="quickswitcher_unread_channels" id="0x7F121918" />
-    <public type="string" name="quote" id="0x7F121919" />
-    <public type="string" name="quote_attribution" id="0x7F12191A" />
-    <public type="string" name="quote_attribution_facebook" id="0x7F12191B" />
-    <public type="string" name="quote_attribution_instagram" id="0x7F12191C" />
-    <public type="string" name="rate_limited" id="0x7F12191D" />
-    <public type="string" name="rating_request_body_android" id="0x7F12191E" />
-    <public type="string" name="rating_request_title" id="0x7F12191F" />
-    <public type="string" name="react_with_label" id="0x7F121920" />
-    <public type="string" name="reaction_tooltip_1" id="0x7F121921" />
-    <public type="string" name="reaction_tooltip_1_n" id="0x7F121922" />
-    <public type="string" name="reaction_tooltip_2" id="0x7F121923" />
-    <public type="string" name="reaction_tooltip_2_n" id="0x7F121924" />
-    <public type="string" name="reaction_tooltip_3" id="0x7F121925" />
-    <public type="string" name="reaction_tooltip_3_n" id="0x7F121926" />
-    <public type="string" name="reaction_tooltip_n" id="0x7F121927" />
-    <public type="string" name="reactions" id="0x7F121928" />
-    <public type="string" name="reactions_matching" id="0x7F121929" />
-    <public type="string" name="read_message_history" id="0x7F12192A" />
-    <public type="string" name="read_messages" id="0x7F12192B" />
-    <public type="string" name="read_messages_view_channels" id="0x7F12192C" />
-    <public type="string" name="read_only_channel" id="0x7F12192D" />
-    <public type="string" name="ready" id="0x7F12192E" />
-    <public type="string" name="recent_mentions" id="0x7F12192F" />
-    <public type="string" name="recent_mentions_direct_only" id="0x7F121930" />
-    <public type="string" name="recent_mentions_empty_state_header" id="0x7F121931" />
-    <public type="string" name="recent_mentions_empty_state_tip" id="0x7F121932" />
-    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7F121933" />
-    <public type="string" name="recent_mentions_filter_all_servers" id="0x7F121934" />
-    <public type="string" name="recent_mentions_filter_everyone" id="0x7F121935" />
-    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7F121936" />
-    <public type="string" name="recent_mentions_filter_label" id="0x7F121937" />
-    <public type="string" name="recent_mentions_filter_roles" id="0x7F121938" />
-    <public type="string" name="recent_mentions_pro_tip" id="0x7F121939" />
-    <public type="string" name="recent_mentions_roles_and_direct" id="0x7F12193A" />
-    <public type="string" name="recents_notifications_menu_label" id="0x7F12193B" />
-    <public type="string" name="recommended" id="0x7F12193C" />
-    <public type="string" name="reconnect" id="0x7F12193D" />
-    <public type="string" name="reconnecting" id="0x7F12193E" />
-    <public type="string" name="refund" id="0x7F12193F" />
-    <public type="string" name="region" id="0x7F121940" />
-    <public type="string" name="region_select_footer" id="0x7F121941" />
-    <public type="string" name="region_select_header" id="0x7F121942" />
-    <public type="string" name="register" id="0x7F121943" />
-    <public type="string" name="register_body" id="0x7F121944" />
-    <public type="string" name="register_enter_email" id="0x7F121945" />
-    <public type="string" name="register_enter_phone" id="0x7F121946" />
-    <public type="string" name="register_login_privacy_notice" id="0x7F121947" />
-    <public type="string" name="register_or_email" id="0x7F121948" />
-    <public type="string" name="register_or_phone" id="0x7F121949" />
-    <public type="string" name="register_title" id="0x7F12194A" />
-    <public type="string" name="register_username_hint" id="0x7F12194B" />
-    <public type="string" name="remaining_participants" id="0x7F12194C" />
-    <public type="string" name="remind_me_later" id="0x7F12194D" />
-    <public type="string" name="remove" id="0x7F12194E" />
-    <public type="string" name="remove_all_reactions" id="0x7F12194F" />
-    <public type="string" name="remove_all_reactions_confirm_body" id="0x7F121950" />
-    <public type="string" name="remove_all_reactions_confirm_title" id="0x7F121951" />
-    <public type="string" name="remove_attachment_body" id="0x7F121952" />
-    <public type="string" name="remove_attachment_confirm" id="0x7F121953" />
-    <public type="string" name="remove_attachment_title" id="0x7F121954" />
-    <public type="string" name="remove_friend" id="0x7F121955" />
-    <public type="string" name="remove_friend_body" id="0x7F121956" />
-    <public type="string" name="remove_friend_title" id="0x7F121957" />
-    <public type="string" name="remove_from_group" id="0x7F121958" />
-    <public type="string" name="remove_icon" id="0x7F121959" />
-    <public type="string" name="remove_keybind" id="0x7F12195A" />
-    <public type="string" name="remove_message_attachment" id="0x7F12195B" />
-    <public type="string" name="remove_reaction" id="0x7F12195C" />
-    <public type="string" name="remove_role_or_user" id="0x7F12195D" />
-    <public type="string" name="remove_synced_role" id="0x7F12195E" />
-    <public type="string" name="remove_user_from_thread" id="0x7F12195F" />
-    <public type="string" name="remove_vanity_url" id="0x7F121960" />
-    <public type="string" name="render_embeds" id="0x7F121961" />
-    <public type="string" name="render_embeds_label" id="0x7F121962" />
-    <public type="string" name="render_reactions" id="0x7F121963" />
-    <public type="string" name="reorder" id="0x7F121964" />
-    <public type="string" name="reordering_channels" id="0x7F121965" />
-    <public type="string" name="reply_mention_off" id="0x7F121966" />
-    <public type="string" name="reply_mention_off_tooltip" id="0x7F121967" />
-    <public type="string" name="reply_mention_on" id="0x7F121968" />
-    <public type="string" name="reply_mention_on_tooltip" id="0x7F121969" />
-    <public type="string" name="reply_quote_command" id="0x7F12196A" />
-    <public type="string" name="reply_quote_message_blocked" id="0x7F12196B" />
-    <public type="string" name="reply_quote_message_deleted" id="0x7F12196C" />
-    <public type="string" name="reply_quote_message_not_loaded" id="0x7F12196D" />
-    <public type="string" name="reply_quote_no_text_content" id="0x7F12196E" />
-    <public type="string" name="reply_quote_no_text_content_mobile" id="0x7F12196F" />
-    <public type="string" name="reply_quote_sticker" id="0x7F121970" />
-    <public type="string" name="reply_quote_sticker_mobile" id="0x7F121971" />
-    <public type="string" name="replying_to" id="0x7F121972" />
-    <public type="string" name="report" id="0x7F121973" />
-    <public type="string" name="report_message" id="0x7F121974" />
-    <public type="string" name="report_message_menu_option" id="0x7F121975" />
-    <public type="string" name="report_modal_block_user" id="0x7F121976" />
-    <public type="string" name="report_modal_description" id="0x7F121977" />
-    <public type="string" name="report_modal_description_max_exceeded" id="0x7F121978" />
-    <public type="string" name="report_modal_description_min_max" id="0x7F121979" />
-    <public type="string" name="report_modal_error" id="0x7F12197A" />
-    <public type="string" name="report_modal_message_selected" id="0x7F12197B" />
-    <public type="string" name="report_modal_report_message" id="0x7F12197C" />
-    <public type="string" name="report_modal_report_stage_menu_item" id="0x7F12197D" />
-    <public type="string" name="report_modal_select_one" id="0x7F12197E" />
-    <public type="string" name="report_modal_should_block" id="0x7F12197F" />
-    <public type="string" name="report_modal_should_delete" id="0x7F121980" />
-    <public type="string" name="report_modal_subject" id="0x7F121981" />
-    <public type="string" name="report_modal_submit" id="0x7F121982" />
-    <public type="string" name="report_modal_submitted" id="0x7F121983" />
-    <public type="string" name="report_modal_submitted_email_confirmation" id="0x7F121984" />
-    <public type="string" name="report_modal_type_title" id="0x7F121985" />
-    <public type="string" name="report_server" id="0x7F121986" />
-    <public type="string" name="report_server_no_name" id="0x7F121987" />
-    <public type="string" name="report_user" id="0x7F121988" />
-    <public type="string" name="request_to_speak" id="0x7F121989" />
-    <public type="string" name="request_to_speak_accept" id="0x7F12198A" />
-    <public type="string" name="request_to_speak_accessibility_text" id="0x7F12198B" />
-    <public type="string" name="request_to_speak_area_all_roles" id="0x7F12198C" />
-    <public type="string" name="request_to_speak_area_all_roles_disabled" id="0x7F12198D" />
-    <public type="string" name="request_to_speak_area_close" id="0x7F12198E" />
-    <public type="string" name="request_to_speak_area_open" id="0x7F12198F" />
-    <public type="string" name="request_to_speak_area_title" id="0x7F121990" />
-    <public type="string" name="request_to_speak_decline" id="0x7F121991" />
-    <public type="string" name="request_to_speak_empty_list_body" id="0x7F121992" />
-    <public type="string" name="request_to_speak_empty_list_title" id="0x7F121993" />
-    <public type="string" name="request_to_speak_invitation_send" id="0x7F121994" />
-    <public type="string" name="request_to_speak_list_title" id="0x7F121995" />
-    <public type="string" name="request_to_speak_member_info_member" id="0x7F121996" />
-    <public type="string" name="request_to_speak_member_info_member_roles" id="0x7F121997" />
-    <public type="string" name="request_to_speak_member_info_new_member" id="0x7F121998" />
-    <public type="string" name="request_to_speak_member_info_new_to_discord" id="0x7F121999" />
-    <public type="string" name="request_to_speak_member_info_non_member" id="0x7F12199A" />
-    <public type="string" name="resend" id="0x7F12199B" />
-    <public type="string" name="resend_code" id="0x7F12199C" />
-    <public type="string" name="resend_email" id="0x7F12199D" />
-    <public type="string" name="resend_email_short" id="0x7F12199E" />
-    <public type="string" name="resend_message" id="0x7F12199F" />
-    <public type="string" name="resend_verification_email" id="0x7F1219A0" />
-    <public type="string" name="reset" id="0x7F1219A1" />
-    <public type="string" name="reset_friend_nickname" id="0x7F1219A2" />
-    <public type="string" name="reset_nickname" id="0x7F1219A3" />
-    <public type="string" name="reset_notification_override" id="0x7F1219A4" />
-    <public type="string" name="reset_notification_settings" id="0x7F1219A5" />
-    <public type="string" name="reset_password_success_title" id="0x7F1219A6" />
-    <public type="string" name="reset_password_title" id="0x7F1219A7" />
-    <public type="string" name="reset_to_default" id="0x7F1219A8" />
-    <public type="string" name="reset_voice_settings" id="0x7F1219A9" />
-    <public type="string" name="reset_voice_settings_body" id="0x7F1219AA" />
-    <public type="string" name="resubscribe" id="0x7F1219AB" />
-    <public type="string" name="resume_setup" id="0x7F1219AC" />
-    <public type="string" name="retry" id="0x7F1219AD" />
-    <public type="string" name="return_to_login" id="0x7F1219AE" />
-    <public type="string" name="reveal" id="0x7F1219AF" />
-    <public type="string" name="reversed" id="0x7F1219B0" />
-    <public type="string" name="revoke" id="0x7F1219B1" />
-    <public type="string" name="revoke_ban" id="0x7F1219B2" />
-    <public type="string" name="ring" id="0x7F1219B3" />
-    <public type="string" name="ring_username_a11y_label" id="0x7F1219B4" />
-    <public type="string" name="ro" id="0x7F1219B5" />
-    <public type="string" name="role_add_members_button" id="0x7F1219B6" />
-    <public type="string" name="role_add_members_search" id="0x7F1219B7" />
-    <public type="string" name="role_add_members_title" id="0x7F1219B8" />
-    <public type="string" name="role_changed_dont_save" id="0x7F1219B9" />
-    <public type="string" name="role_changed_save_changes" id="0x7F1219BA" />
-    <public type="string" name="role_changed_save_changes_body" id="0x7F1219BB" />
-    <public type="string" name="role_color" id="0x7F1219BC" />
-    <public type="string" name="role_color_help" id="0x7F1219BD" />
-    <public type="string" name="role_create_add_members_subtitle" id="0x7F1219BE" />
-    <public type="string" name="role_create_cta" id="0x7F1219BF" />
-    <public type="string" name="role_create_display_subtitle" id="0x7F1219C0" />
-    <public type="string" name="role_create_display_title" id="0x7F1219C1" />
-    <public type="string" name="role_create_name_examples" id="0x7F1219C2" />
-    <public type="string" name="role_create_permissions_subtitle" id="0x7F1219C3" />
-    <public type="string" name="role_create_permissions_title" id="0x7F1219C4" />
-    <public type="string" name="role_create_tip_tooltip_text" id="0x7F1219C5" />
-    <public type="string" name="role_create_tooltip_tip" id="0x7F1219C6" />
-    <public type="string" name="role_created_toast" id="0x7F1219C7" />
-    <public type="string" name="role_creation_create_step_color_hint" id="0x7F1219C8" />
-    <public type="string" name="role_creation_create_step_name_hint" id="0x7F1219C9" />
-    <public type="string" name="role_creation_create_step_subtitle" id="0x7F1219CA" />
-    <public type="string" name="role_creation_create_step_title" id="0x7F1219CB" />
-    <public type="string" name="role_creation_failed" id="0x7F1219CC" />
-    <public type="string" name="role_creation_finish" id="0x7F1219CD" />
-    <public type="string" name="role_creation_member_step_subtitle" id="0x7F1219CE" />
-    <public type="string" name="role_creation_member_step_title" id="0x7F1219CF" />
-    <public type="string" name="role_creation_permission_step_subtitle" id="0x7F1219D0" />
-    <public type="string" name="role_creation_permission_step_title" id="0x7F1219D1" />
-    <public type="string" name="role_creation_skip" id="0x7F1219D2" />
-    <public type="string" name="role_creation_step_title" id="0x7F1219D3" />
-    <public type="string" name="role_delete_cannot_be_undone" id="0x7F1219D4" />
-    <public type="string" name="role_edit_hoist_label" id="0x7F1219D5" />
-    <public type="string" name="role_edit_members_missing" id="0x7F1219D6" />
-    <public type="string" name="role_edit_members_no_results" id="0x7F1219D7" />
-    <public type="string" name="role_edit_members_no_search_results" id="0x7F1219D8" />
-    <public type="string" name="role_edit_permissions_no_results" id="0x7F1219D9" />
-    <public type="string" name="role_edit_saved" id="0x7F1219DA" />
-    <public type="string" name="role_edit_tab_display" id="0x7F1219DB" />
-    <public type="string" name="role_edit_tab_manage_members" id="0x7F1219DC" />
-    <public type="string" name="role_edit_tab_members" id="0x7F1219DD" />
-    <public type="string" name="role_edit_tab_members_with_list" id="0x7F1219DE" />
-    <public type="string" name="role_edit_tab_permissions" id="0x7F1219DF" />
-    <public type="string" name="role_edit_tab_role_settings" id="0x7F1219E0" />
-    <public type="string" name="role_edit_title_with_name" id="0x7F1219E1" />
-    <public type="string" name="role_empty_state_clubs_role_1" id="0x7F1219E2" />
-    <public type="string" name="role_empty_state_clubs_role_2" id="0x7F1219E3" />
-    <public type="string" name="role_empty_state_clubs_role_3" id="0x7F1219E4" />
-    <public type="string" name="role_empty_state_clubs_role_4" id="0x7F1219E5" />
-    <public type="string" name="role_empty_state_clubs_role_5" id="0x7F1219E6" />
-    <public type="string" name="role_empty_state_clubs_role_6" id="0x7F1219E7" />
-    <public type="string" name="role_empty_state_gaming_role_1" id="0x7F1219E8" />
-    <public type="string" name="role_empty_state_gaming_role_2" id="0x7F1219E9" />
-    <public type="string" name="role_empty_state_gaming_role_3" id="0x7F1219EA" />
-    <public type="string" name="role_empty_state_gaming_role_4" id="0x7F1219EB" />
-    <public type="string" name="role_empty_state_gaming_role_5" id="0x7F1219EC" />
-    <public type="string" name="role_empty_state_gaming_role_6" id="0x7F1219ED" />
-    <public type="string" name="role_empty_state_hobbies_role_1" id="0x7F1219EE" />
-    <public type="string" name="role_empty_state_hobbies_role_2" id="0x7F1219EF" />
-    <public type="string" name="role_empty_state_hobbies_role_3" id="0x7F1219F0" />
-    <public type="string" name="role_empty_state_hobbies_role_4" id="0x7F1219F1" />
-    <public type="string" name="role_empty_state_hobbies_role_5" id="0x7F1219F2" />
-    <public type="string" name="role_empty_state_hobbies_role_6" id="0x7F1219F3" />
-    <public type="string" name="role_everyone_description" id="0x7F1219F4" />
-    <public type="string" name="role_everyone_label" id="0x7F1219F5" />
-    <public type="string" name="role_everyone_sublabel" id="0x7F1219F6" />
-    <public type="string" name="role_id_copied" id="0x7F1219F7" />
-    <public type="string" name="role_list_body" id="0x7F1219F8" />
-    <public type="string" name="role_list_body_with_help" id="0x7F1219F9" />
-    <public type="string" name="role_list_empty" id="0x7F1219FA" />
-    <public type="string" name="role_list_empty_sort" id="0x7F1219FB" />
-    <public type="string" name="role_list_header" id="0x7F1219FC" />
-    <public type="string" name="role_list_reorder_help" id="0x7F1219FD" />
-    <public type="string" name="role_member_count" id="0x7F1219FE" />
-    <public type="string" name="role_order_updated" id="0x7F1219FF" />
-    <public type="string" name="role_overview_description" id="0x7F121A00" />
-    <public type="string" name="role_overview_empty_subheader" id="0x7F121A01" />
-    <public type="string" name="role_overview_header" id="0x7F121A02" />
-    <public type="string" name="role_overview_view_members" id="0x7F121A03" />
-    <public type="string" name="role_permission_help_body" id="0x7F121A04" />
-    <public type="string" name="role_permission_template_cosmetic_content_1" id="0x7F121A05" />
-    <public type="string" name="role_permission_template_cosmetic_content_2" id="0x7F121A06" />
-    <public type="string" name="role_permission_template_description_cosmetic" id="0x7F121A07" />
-    <public type="string" name="role_permission_template_description_manager" id="0x7F121A08" />
-    <public type="string" name="role_permission_template_description_member" id="0x7F121A09" />
-    <public type="string" name="role_permission_template_description_moderator" id="0x7F121A0A" />
-    <public type="string" name="role_permission_template_manager_content_1" id="0x7F121A0B" />
-    <public type="string" name="role_permission_template_manager_content_2" id="0x7F121A0C" />
-    <public type="string" name="role_permission_template_manager_content_3" id="0x7F121A0D" />
-    <public type="string" name="role_permission_template_manager_content_4" id="0x7F121A0E" />
-    <public type="string" name="role_permission_template_manager_content_preface" id="0x7F121A0F" />
-    <public type="string" name="role_permission_template_member_content_1" id="0x7F121A10" />
-    <public type="string" name="role_permission_template_member_content_2" id="0x7F121A11" />
-    <public type="string" name="role_permission_template_member_content_3" id="0x7F121A12" />
-    <public type="string" name="role_permission_template_moderator_content_1" id="0x7F121A13" />
-    <public type="string" name="role_permission_template_moderator_content_2" id="0x7F121A14" />
-    <public type="string" name="role_permission_template_moderator_content_3" id="0x7F121A15" />
-    <public type="string" name="role_permission_template_moderator_content_preface" id="0x7F121A16" />
-    <public type="string" name="role_permission_template_name_cosmetic" id="0x7F121A17" />
-    <public type="string" name="role_permission_template_name_manager" id="0x7F121A18" />
-    <public type="string" name="role_permission_template_name_member" id="0x7F121A19" />
-    <public type="string" name="role_permission_template_name_moderator" id="0x7F121A1A" />
-    <public type="string" name="role_permission_template_select_confirmation_toast" id="0x7F121A1B" />
-    <public type="string" name="role_permission_template_select_cta" id="0x7F121A1C" />
-    <public type="string" name="role_permission_template_select_warning_body" id="0x7F121A1D" />
-    <public type="string" name="role_permission_template_select_warning_title" id="0x7F121A1E" />
-    <public type="string" name="role_permission_template_title" id="0x7F121A1F" />
-    <public type="string" name="role_permissions_add_reactions_description" id="0x7F121A20" />
-    <public type="string" name="role_permissions_add_reactions_description_category" id="0x7F121A21" />
-    <public type="string" name="role_permissions_add_reactions_description_text" id="0x7F121A22" />
-    <public type="string" name="role_permissions_administrator_description" id="0x7F121A23" />
-    <public type="string" name="role_permissions_attach_files_description" id="0x7F121A24" />
-    <public type="string" name="role_permissions_attach_files_description_category" id="0x7F121A25" />
-    <public type="string" name="role_permissions_attach_files_description_text" id="0x7F121A26" />
-    <public type="string" name="role_permissions_ban_members_description" id="0x7F121A27" />
-    <public type="string" name="role_permissions_change_nickname_description" id="0x7F121A28" />
-    <public type="string" name="role_permissions_clear_permissions" id="0x7F121A29" />
-    <public type="string" name="role_permissions_connect_description" id="0x7F121A2A" />
-    <public type="string" name="role_permissions_connect_description_category" id="0x7F121A2B" />
-    <public type="string" name="role_permissions_connect_description_category_everyone" id="0x7F121A2C" />
-    <public type="string" name="role_permissions_connect_description_stage" id="0x7F121A2D" />
-    <public type="string" name="role_permissions_connect_description_stage_everyone" id="0x7F121A2E" />
-    <public type="string" name="role_permissions_connect_description_voice" id="0x7F121A2F" />
-    <public type="string" name="role_permissions_connect_description_voice_everyone" id="0x7F121A30" />
-    <public type="string" name="role_permissions_create_instant_invite_description" id="0x7F121A31" />
-    <public type="string" name="role_permissions_create_instant_invite_description_category" id="0x7F121A32" />
-    <public type="string" name="role_permissions_create_instant_invite_description_text" id="0x7F121A33" />
-    <public type="string" name="role_permissions_create_instant_invite_description_voice" id="0x7F121A34" />
-    <public type="string" name="role_permissions_deafen_members_description" id="0x7F121A35" />
-    <public type="string" name="role_permissions_deafen_members_description_category" id="0x7F121A36" />
-    <public type="string" name="role_permissions_deafen_members_description_voice" id="0x7F121A37" />
-    <public type="string" name="role_permissions_embed_links_description" id="0x7F121A38" />
-    <public type="string" name="role_permissions_embed_links_description_category" id="0x7F121A39" />
-    <public type="string" name="role_permissions_embed_links_description_text" id="0x7F121A3A" />
-    <public type="string" name="role_permissions_empty_text" id="0x7F121A3B" />
-    <public type="string" name="role_permissions_kick_members_description" id="0x7F121A3C" />
-    <public type="string" name="role_permissions_manage_channel_description_category" id="0x7F121A3D" />
-    <public type="string" name="role_permissions_manage_channel_description_stage" id="0x7F121A3E" />
-    <public type="string" name="role_permissions_manage_channel_description_text" id="0x7F121A3F" />
-    <public type="string" name="role_permissions_manage_channel_description_voice" id="0x7F121A40" />
-    <public type="string" name="role_permissions_manage_channels_description" id="0x7F121A41" />
-    <public type="string" name="role_permissions_manage_emojis_and_stickers_description" id="0x7F121A42" />
-    <public type="string" name="role_permissions_manage_emojis_description" id="0x7F121A43" />
-    <public type="string" name="role_permissions_manage_events_description" id="0x7F121A44" />
-    <public type="string" name="role_permissions_manage_messages_description" id="0x7F121A45" />
-    <public type="string" name="role_permissions_manage_messages_description_announcement" id="0x7F121A46" />
-    <public type="string" name="role_permissions_manage_messages_description_category" id="0x7F121A47" />
-    <public type="string" name="role_permissions_manage_messages_description_text" id="0x7F121A48" />
-    <public type="string" name="role_permissions_manage_nicknames_description" id="0x7F121A49" />
-    <public type="string" name="role_permissions_manage_roles_description" id="0x7F121A4A" />
-    <public type="string" name="role_permissions_manage_roles_description_category" id="0x7F121A4B" />
-    <public type="string" name="role_permissions_manage_roles_description_channel" id="0x7F121A4C" />
-    <public type="string" name="role_permissions_manage_roles_description_stage" id="0x7F121A4D" />
-    <public type="string" name="role_permissions_manage_server_description" id="0x7F121A4E" />
-    <public type="string" name="role_permissions_manage_threads_description" id="0x7F121A4F" />
-    <public type="string" name="role_permissions_manage_threads_description_category" id="0x7F121A50" />
-    <public type="string" name="role_permissions_manage_threads_description_text" id="0x7F121A51" />
-    <public type="string" name="role_permissions_manage_webhooks_description" id="0x7F121A52" />
-    <public type="string" name="role_permissions_manage_webhooks_description_category" id="0x7F121A53" />
-    <public type="string" name="role_permissions_manage_webhooks_description_channel" id="0x7F121A54" />
-    <public type="string" name="role_permissions_mention_everyone_description" id="0x7F121A55" />
-    <public type="string" name="role_permissions_mention_everyone_description_category" id="0x7F121A56" />
-    <public type="string" name="role_permissions_mention_everyone_description_text" id="0x7F121A57" />
-    <public type="string" name="role_permissions_move_members_description" id="0x7F121A58" />
-    <public type="string" name="role_permissions_move_members_description_category" id="0x7F121A59" />
-    <public type="string" name="role_permissions_move_members_description_stage" id="0x7F121A5A" />
-    <public type="string" name="role_permissions_move_members_description_voice" id="0x7F121A5B" />
-    <public type="string" name="role_permissions_mute_members_description" id="0x7F121A5C" />
-    <public type="string" name="role_permissions_mute_members_description_category" id="0x7F121A5D" />
-    <public type="string" name="role_permissions_mute_members_description_stage" id="0x7F121A5E" />
-    <public type="string" name="role_permissions_mute_members_description_voice" id="0x7F121A5F" />
-    <public type="string" name="role_permissions_priority_speaker_description" id="0x7F121A60" />
-    <public type="string" name="role_permissions_priority_speaker_description_app" id="0x7F121A61" />
-    <public type="string" name="role_permissions_priority_speaker_description_category" id="0x7F121A62" />
-    <public type="string" name="role_permissions_priority_speaker_description_category_mobile" id="0x7F121A63" />
-    <public type="string" name="role_permissions_priority_speaker_description_mobile" id="0x7F121A64" />
-    <public type="string" name="role_permissions_priority_speaker_description_voice" id="0x7F121A65" />
-    <public type="string" name="role_permissions_priority_speaker_description_voice_mobile" id="0x7F121A66" />
-    <public type="string" name="role_permissions_read_message_history_description" id="0x7F121A67" />
-    <public type="string" name="role_permissions_read_message_history_description_category" id="0x7F121A68" />
-    <public type="string" name="role_permissions_read_message_history_description_text" id="0x7F121A69" />
-    <public type="string" name="role_permissions_request_to_speak_description" id="0x7F121A6A" />
-    <public type="string" name="role_permissions_request_to_speak_description_category" id="0x7F121A6B" />
-    <public type="string" name="role_permissions_request_to_speak_description_stage" id="0x7F121A6C" />
-    <public type="string" name="role_permissions_search_placeholder" id="0x7F121A6D" />
-    <public type="string" name="role_permissions_section_advanced" id="0x7F121A6E" />
-    <public type="string" name="role_permissions_section_general_category" id="0x7F121A6F" />
-    <public type="string" name="role_permissions_section_general_channel" id="0x7F121A70" />
-    <public type="string" name="role_permissions_section_general_guild" id="0x7F121A71" />
-    <public type="string" name="role_permissions_section_guild_events" id="0x7F121A72" />
-    <public type="string" name="role_permissions_section_membership" id="0x7F121A73" />
-    <public type="string" name="role_permissions_section_stage" id="0x7F121A74" />
-    <public type="string" name="role_permissions_section_text" id="0x7F121A75" />
-    <public type="string" name="role_permissions_section_voice" id="0x7F121A76" />
-    <public type="string" name="role_permissions_send_messages_description" id="0x7F121A77" />
-    <public type="string" name="role_permissions_send_messages_description_announcement" id="0x7F121A78" />
-    <public type="string" name="role_permissions_send_messages_description_category" id="0x7F121A79" />
-    <public type="string" name="role_permissions_send_messages_description_text" id="0x7F121A7A" />
-    <public type="string" name="role_permissions_send_tts_messages" id="0x7F121A7B" />
-    <public type="string" name="role_permissions_send_tts_messages_description" id="0x7F121A7C" />
-    <public type="string" name="role_permissions_send_tts_messages_description_category" id="0x7F121A7D" />
-    <public type="string" name="role_permissions_send_tts_messages_description_text" id="0x7F121A7E" />
-    <public type="string" name="role_permissions_speak_description" id="0x7F121A7F" />
-    <public type="string" name="role_permissions_speak_description_category" id="0x7F121A80" />
-    <public type="string" name="role_permissions_speak_description_stage" id="0x7F121A81" />
-    <public type="string" name="role_permissions_speak_description_voice" id="0x7F121A82" />
-    <public type="string" name="role_permissions_stream_description" id="0x7F121A83" />
-    <public type="string" name="role_permissions_stream_description_category" id="0x7F121A84" />
-    <public type="string" name="role_permissions_stream_description_voice" id="0x7F121A85" />
-    <public type="string" name="role_permissions_use_application_commands" id="0x7F121A86" />
-    <public type="string" name="role_permissions_use_application_commands_channel_description" id="0x7F121A87" />
-    <public type="string" name="role_permissions_use_application_commands_description_category" id="0x7F121A88" />
-    <public type="string" name="role_permissions_use_application_commands_description_text" id="0x7F121A89" />
-    <public type="string" name="role_permissions_use_application_commands_guild_description" id="0x7F121A8A" />
-    <public type="string" name="role_permissions_use_external_emojis" id="0x7F121A8B" />
-    <public type="string" name="role_permissions_use_external_emojis_description" id="0x7F121A8C" />
-    <public type="string" name="role_permissions_use_external_emojis_description_category" id="0x7F121A8D" />
-    <public type="string" name="role_permissions_use_external_emojis_description_text" id="0x7F121A8E" />
-    <public type="string" name="role_permissions_use_private_threads_description" id="0x7F121A8F" />
-    <public type="string" name="role_permissions_use_private_threads_description_category" id="0x7F121A90" />
-    <public type="string" name="role_permissions_use_private_threads_description_text" id="0x7F121A91" />
-    <public type="string" name="role_permissions_use_public_threads_description" id="0x7F121A92" />
-    <public type="string" name="role_permissions_use_public_threads_description_category" id="0x7F121A93" />
-    <public type="string" name="role_permissions_use_public_threads_description_text" id="0x7F121A94" />
-    <public type="string" name="role_permissions_use_vad_description" id="0x7F121A95" />
-    <public type="string" name="role_permissions_use_vad_description_category" id="0x7F121A96" />
-    <public type="string" name="role_permissions_use_vad_description_stage" id="0x7F121A97" />
-    <public type="string" name="role_permissions_use_vad_description_voice" id="0x7F121A98" />
-    <public type="string" name="role_permissions_view_audit_log_description" id="0x7F121A99" />
-    <public type="string" name="role_permissions_view_channel" id="0x7F121A9A" />
-    <public type="string" name="role_permissions_view_channel_description" id="0x7F121A9B" />
-    <public type="string" name="role_permissions_view_channel_description_category" id="0x7F121A9C" />
-    <public type="string" name="role_permissions_view_channel_description_category_everyone" id="0x7F121A9D" />
-    <public type="string" name="role_permissions_view_channel_description_channel" id="0x7F121A9E" />
-    <public type="string" name="role_permissions_view_channel_description_text_everyone" id="0x7F121A9F" />
-    <public type="string" name="role_permissions_view_channel_description_voice_everyone" id="0x7F121AA0" />
-    <public type="string" name="role_permissions_view_guild_analytics_description" id="0x7F121AA1" />
-    <public type="string" name="role_remove_member_confirm_body" id="0x7F121AA2" />
-    <public type="string" name="role_remove_member_confirm_tip" id="0x7F121AA3" />
-    <public type="string" name="role_remove_member_confirm_title" id="0x7F121AA4" />
-    <public type="string" name="role_remove_member_managed" id="0x7F121AA5" />
-    <public type="string" name="role_required_edit_roles_modal_subtitle" id="0x7F121AA6" />
-    <public type="string" name="role_required_edit_roles_modal_title" id="0x7F121AA7" />
-    <public type="string" name="role_required_single_user_message" id="0x7F121AA8" />
-    <public type="string" name="role_row_description" id="0x7F121AA9" />
-    <public type="string" name="role_row_view_members" id="0x7F121AAA" />
-    <public type="string" name="role_sample_message" id="0x7F121AAB" />
-    <public type="string" name="role_update_cta" id="0x7F121AAC" />
-    <public type="string" name="roles" id="0x7F121AAD" />
-    <public type="string" name="roles_list" id="0x7F121AAE" />
-    <public type="string" name="roles_matching" id="0x7F121AAF" />
-    <public type="string" name="rtc_connection" id="0x7F121AB0" />
-    <public type="string" name="rtc_connection_state_authenticating" id="0x7F121AB1" />
-    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7F121AB2" />
-    <public type="string" name="rtc_connection_state_connecting" id="0x7F121AB3" />
-    <public type="string" name="rtc_connection_state_disconnected" id="0x7F121AB4" />
-    <public type="string" name="rtc_connection_state_ice_checking" id="0x7F121AB5" />
-    <public type="string" name="rtc_connection_state_no_route" id="0x7F121AB6" />
-    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7F121AB7" />
-    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7F121AB8" />
-    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7F121AB9" />
-    <public type="string" name="rtc_debug_context" id="0x7F121ABA" />
-    <public type="string" name="rtc_debug_open" id="0x7F121ABB" />
-    <public type="string" name="rtc_debug_rtp_inbound" id="0x7F121ABC" />
-    <public type="string" name="rtc_debug_rtp_outbound" id="0x7F121ABD" />
-    <public type="string" name="rtc_debug_screenshare" id="0x7F121ABE" />
-    <public type="string" name="rtc_debug_transport" id="0x7F121ABF" />
-    <public type="string" name="ru" id="0x7F121AC0" />
-    <public type="string" name="salmon" id="0x7F121AC1" />
-    <public type="string" name="sample_channel_message" id="0x7F121AC2" />
-    <public type="string" name="sample_channel_name" id="0x7F121AC3" />
-    <public type="string" name="sample_channel_name_short" id="0x7F121AC4" />
-    <public type="string" name="sample_channel_search_filter" id="0x7F121AC5" />
-    <public type="string" name="sample_channel_topic" id="0x7F121AC6" />
-    <public type="string" name="sample_confirmation" id="0x7F121AC7" />
-    <public type="string" name="sample_connected_account" id="0x7F121AC8" />
-    <public type="string" name="sample_discrim" id="0x7F121AC9" />
-    <public type="string" name="sample_email" id="0x7F121ACA" />
-    <public type="string" name="sample_empty_string" id="0x7F121ACB" />
-    <public type="string" name="sample_language" id="0x7F121ACC" />
-    <public type="string" name="sample_notification_frequency" id="0x7F121ACD" />
-    <public type="string" name="sample_number_9" id="0x7F121ACE" />
-    <public type="string" name="sample_number_99" id="0x7F121ACF" />
-    <public type="string" name="sample_number_999" id="0x7F121AD0" />
-    <public type="string" name="sample_number_9999" id="0x7F121AD1" />
-    <public type="string" name="sample_number_bandwidth" id="0x7F121AD2" />
-    <public type="string" name="sample_number_ratio" id="0x7F121AD3" />
-    <public type="string" name="sample_online_members" id="0x7F121AD4" />
-    <public type="string" name="sample_phone" id="0x7F121AD5" />
-    <public type="string" name="sample_phone_country_code" id="0x7F121AD6" />
-    <public type="string" name="sample_server_name" id="0x7F121AD7" />
-    <public type="string" name="sample_server_name_short" id="0x7F121AD8" />
-    <public type="string" name="sample_server_role_name" id="0x7F121AD9" />
-    <public type="string" name="sample_thread_started_by_message" id="0x7F121ADA" />
-    <public type="string" name="sample_time_duration_minutes" id="0x7F121ADB" />
-    <public type="string" name="sample_time_duration_seconds" id="0x7F121ADC" />
-    <public type="string" name="sample_time_pm" id="0x7F121ADD" />
-    <public type="string" name="sample_time_stamp" id="0x7F121ADE" />
-    <public type="string" name="sample_total_members" id="0x7F121ADF" />
-    <public type="string" name="sample_total_messages" id="0x7F121AE0" />
-    <public type="string" name="sample_user_generated_link" id="0x7F121AE1" />
-    <public type="string" name="sample_user_name" id="0x7F121AE2" />
-    <public type="string" name="sample_user_name_discrim" id="0x7F121AE3" />
-    <public type="string" name="sample_user_nick" id="0x7F121AE4" />
-    <public type="string" name="sample_user_presence" id="0x7F121AE5" />
-    <public type="string" name="sample_user_presence_details" id="0x7F121AE6" />
-    <public type="string" name="save" id="0x7F121AE7" />
-    <public type="string" name="save_changes" id="0x7F121AE8" />
-    <public type="string" name="save_image" id="0x7F121AE9" />
-    <public type="string" name="save_image_menu_item" id="0x7F121AEA" />
-    <public type="string" name="save_media_failure_help_mobile" id="0x7F121AEB" />
-    <public type="string" name="save_media_failure_mobile" id="0x7F121AEC" />
-    <public type="string" name="save_media_success_mobile" id="0x7F121AED" />
-    <public type="string" name="saved_settings" id="0x7F121AEE" />
-    <public type="string" name="scope_activities_read" id="0x7F121AEF" />
-    <public type="string" name="scope_activities_read_description" id="0x7F121AF0" />
-    <public type="string" name="scope_activities_write" id="0x7F121AF1" />
-    <public type="string" name="scope_activities_write_description" id="0x7F121AF2" />
-    <public type="string" name="scope_applications_builds_read" id="0x7F121AF3" />
-    <public type="string" name="scope_applications_builds_read_description" id="0x7F121AF4" />
-    <public type="string" name="scope_applications_builds_upload" id="0x7F121AF5" />
-    <public type="string" name="scope_applications_builds_upload_description" id="0x7F121AF6" />
-    <public type="string" name="scope_applications_commands" id="0x7F121AF7" />
-    <public type="string" name="scope_applications_commands_description" id="0x7F121AF8" />
-    <public type="string" name="scope_applications_commands_update" id="0x7F121AF9" />
-    <public type="string" name="scope_applications_commands_update_description" id="0x7F121AFA" />
-    <public type="string" name="scope_applications_entitlements" id="0x7F121AFB" />
-    <public type="string" name="scope_applications_entitlements_description" id="0x7F121AFC" />
-    <public type="string" name="scope_applications_store_update" id="0x7F121AFD" />
-    <public type="string" name="scope_applications_store_update_description" id="0x7F121AFE" />
-    <public type="string" name="scope_bot" id="0x7F121AFF" />
-    <public type="string" name="scope_bot_permissions" id="0x7F121B00" />
-    <public type="string" name="scope_bot_permissions_description" id="0x7F121B01" />
-    <public type="string" name="scope_connections" id="0x7F121B02" />
-    <public type="string" name="scope_connections_empty" id="0x7F121B03" />
-    <public type="string" name="scope_email" id="0x7F121B04" />
-    <public type="string" name="scope_email_empty" id="0x7F121B05" />
-    <public type="string" name="scope_gdm_join" id="0x7F121B06" />
-    <public type="string" name="scope_gdm_join_description" id="0x7F121B07" />
-    <public type="string" name="scope_guilds" id="0x7F121B08" />
-    <public type="string" name="scope_guilds_empty" id="0x7F121B09" />
-    <public type="string" name="scope_guilds_join" id="0x7F121B0A" />
-    <public type="string" name="scope_guilds_join_description" id="0x7F121B0B" />
-    <public type="string" name="scope_identify" id="0x7F121B0C" />
-    <public type="string" name="scope_messages_read" id="0x7F121B0D" />
-    <public type="string" name="scope_messages_read_description" id="0x7F121B0E" />
-    <public type="string" name="scope_relationships_read" id="0x7F121B0F" />
-    <public type="string" name="scope_relationships_read_description" id="0x7F121B10" />
-    <public type="string" name="scope_rpc" id="0x7F121B11" />
-    <public type="string" name="scope_rpc_activities_write" id="0x7F121B12" />
-    <public type="string" name="scope_rpc_description" id="0x7F121B13" />
-    <public type="string" name="scope_rpc_notifications_read" id="0x7F121B14" />
-    <public type="string" name="scope_rpc_notifications_read_description" id="0x7F121B15" />
-    <public type="string" name="scope_rpc_voice_read" id="0x7F121B16" />
-    <public type="string" name="scope_rpc_voice_write" id="0x7F121B17" />
-    <public type="string" name="scope_unsupported_on_android" id="0x7F121B18" />
-    <public type="string" name="scope_unsupported_on_android_description" id="0x7F121B19" />
-    <public type="string" name="scope_webhook_incoming" id="0x7F121B1A" />
-    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7F121B1B" />
-    <public type="string" name="scope_webhook_incoming_description" id="0x7F121B1C" />
-    <public type="string" name="screen_share_nfx_body" id="0x7F121B1D" />
-    <public type="string" name="screen_share_nfx_skip" id="0x7F121B1E" />
-    <public type="string" name="screen_share_nfx_title" id="0x7F121B1F" />
-    <public type="string" name="screen_share_nfx_try" id="0x7F121B20" />
-    <public type="string" name="screen_share_on" id="0x7F121B21" />
-    <public type="string" name="screen_share_options" id="0x7F121B22" />
-    <public type="string" name="screenshare_change_windows" id="0x7F121B23" />
-    <public type="string" name="screenshare_description" id="0x7F121B24" />
-    <public type="string" name="screenshare_fps_abbreviated" id="0x7F121B25" />
-    <public type="string" name="screenshare_frame_rate" id="0x7F121B26" />
-    <public type="string" name="screenshare_quality_tooltip_normal" id="0x7F121B27" />
-    <public type="string" name="screenshare_quality_tooltip_premium" id="0x7F121B28" />
-    <public type="string" name="screenshare_quality_tooltip_reduced" id="0x7F121B29" />
-    <public type="string" name="screenshare_relaunch" id="0x7F121B2A" />
-    <public type="string" name="screenshare_relaunch_body" id="0x7F121B2B" />
-    <public type="string" name="screenshare_resolution_abbreviated" id="0x7F121B2C" />
-    <public type="string" name="screenshare_screen" id="0x7F121B2D" />
-    <public type="string" name="screenshare_share_screen_or_window" id="0x7F121B2E" />
-    <public type="string" name="screenshare_sound_toggle_label" id="0x7F121B2F" />
-    <public type="string" name="screenshare_source" id="0x7F121B30" />
-    <public type="string" name="screenshare_stop" id="0x7F121B31" />
-    <public type="string" name="screenshare_stream_game" id="0x7F121B32" />
-    <public type="string" name="screenshare_stream_quality" id="0x7F121B33" />
-    <public type="string" name="screenshare_unavailable" id="0x7F121B34" />
-    <public type="string" name="screenshare_unavailable_download_app" id="0x7F121B35" />
-    <public type="string" name="screenshare_window" id="0x7F121B36" />
-    <public type="string" name="search" id="0x7F121B37" />
-    <public type="string" name="search_actions" id="0x7F121B38" />
-    <public type="string" name="search_answer_date" id="0x7F121B39" />
-    <public type="string" name="search_answer_file_name" id="0x7F121B3A" />
-    <public type="string" name="search_answer_file_type" id="0x7F121B3B" />
-    <public type="string" name="search_answer_from" id="0x7F121B3C" />
-    <public type="string" name="search_answer_has" id="0x7F121B3D" />
-    <public type="string" name="search_answer_has_attachment" id="0x7F121B3E" />
-    <public type="string" name="search_answer_has_embed" id="0x7F121B3F" />
-    <public type="string" name="search_answer_has_image" id="0x7F121B40" />
-    <public type="string" name="search_answer_has_link" id="0x7F121B41" />
-    <public type="string" name="search_answer_has_sound" id="0x7F121B42" />
-    <public type="string" name="search_answer_has_video" id="0x7F121B43" />
-    <public type="string" name="search_answer_in" id="0x7F121B44" />
-    <public type="string" name="search_answer_link_from" id="0x7F121B45" />
-    <public type="string" name="search_answer_mentions" id="0x7F121B46" />
-    <public type="string" name="search_channels" id="0x7F121B47" />
-    <public type="string" name="search_channels_no_result" id="0x7F121B48" />
-    <public type="string" name="search_clear" id="0x7F121B49" />
-    <public type="string" name="search_clear_history" id="0x7F121B4A" />
-    <public type="string" name="search_country" id="0x7F121B4B" />
-    <public type="string" name="search_date_picker_hint" id="0x7F121B4C" />
-    <public type="string" name="search_dm_still_indexing" id="0x7F121B4D" />
-    <public type="string" name="search_dm_with" id="0x7F121B4E" />
-    <public type="string" name="search_emojis" id="0x7F121B4F" />
-    <public type="string" name="search_error" id="0x7F121B50" />
-    <public type="string" name="search_filter_after" id="0x7F121B51" />
-    <public type="string" name="search_filter_before" id="0x7F121B52" />
-    <public type="string" name="search_filter_during" id="0x7F121B53" />
-    <public type="string" name="search_filter_file_name" id="0x7F121B54" />
-    <public type="string" name="search_filter_file_type" id="0x7F121B55" />
-    <public type="string" name="search_filter_from" id="0x7F121B56" />
-    <public type="string" name="search_filter_has" id="0x7F121B57" />
-    <public type="string" name="search_filter_in" id="0x7F121B58" />
-    <public type="string" name="search_filter_link_from" id="0x7F121B59" />
-    <public type="string" name="search_filter_mentions" id="0x7F121B5A" />
-    <public type="string" name="search_filter_on" id="0x7F121B5B" />
-    <public type="string" name="search_for_emoji" id="0x7F121B5C" />
-    <public type="string" name="search_for_sticker" id="0x7F121B5D" />
-    <public type="string" name="search_for_stickers" id="0x7F121B5E" />
-    <public type="string" name="search_for_value" id="0x7F121B5F" />
-    <public type="string" name="search_from_suggestions" id="0x7F121B60" />
-    <public type="string" name="search_gifs" id="0x7F121B61" />
-    <public type="string" name="search_group_header_channels" id="0x7F121B62" />
-    <public type="string" name="search_group_header_dates" id="0x7F121B63" />
-    <public type="string" name="search_group_header_file_type" id="0x7F121B64" />
-    <public type="string" name="search_group_header_from" id="0x7F121B65" />
-    <public type="string" name="search_group_header_has" id="0x7F121B66" />
-    <public type="string" name="search_group_header_history" id="0x7F121B67" />
-    <public type="string" name="search_group_header_link_from" id="0x7F121B68" />
-    <public type="string" name="search_group_header_mentions" id="0x7F121B69" />
-    <public type="string" name="search_group_header_search_options" id="0x7F121B6A" />
-    <public type="string" name="search_guild_still_indexing" id="0x7F121B6B" />
-    <public type="string" name="search_hide_blocked_messages" id="0x7F121B6C" />
-    <public type="string" name="search_in" id="0x7F121B6D" />
-    <public type="string" name="search_members" id="0x7F121B6E" />
-    <public type="string" name="search_members_no_result" id="0x7F121B6F" />
-    <public type="string" name="search_menu_title" id="0x7F121B70" />
-    <public type="string" name="search_most_relevant" id="0x7F121B71" />
-    <public type="string" name="search_most_relevant_short" id="0x7F121B72" />
-    <public type="string" name="search_newest" id="0x7F121B73" />
-    <public type="string" name="search_newest_short" id="0x7F121B74" />
-    <public type="string" name="search_no_results" id="0x7F121B75" />
-    <public type="string" name="search_no_results_alt" id="0x7F121B76" />
-    <public type="string" name="search_num_results_blocked_not_shown" id="0x7F121B77" />
-    <public type="string" name="search_oldest" id="0x7F121B78" />
-    <public type="string" name="search_oldest_short" id="0x7F121B79" />
-    <public type="string" name="search_pagination_a11y_label" id="0x7F121B7A" />
-    <public type="string" name="search_pick_date" id="0x7F121B7B" />
-    <public type="string" name="search_result" id="0x7F121B7C" />
-    <public type="string" name="search_results_section_label" id="0x7F121B7D" />
-    <public type="string" name="search_roles" id="0x7F121B7E" />
-    <public type="string" name="search_roles_no_result" id="0x7F121B7F" />
-    <public type="string" name="search_shortcut_month" id="0x7F121B80" />
-    <public type="string" name="search_shortcut_today" id="0x7F121B81" />
-    <public type="string" name="search_shortcut_week" id="0x7F121B82" />
-    <public type="string" name="search_shortcut_year" id="0x7F121B83" />
-    <public type="string" name="search_shortcut_yesterday" id="0x7F121B84" />
-    <public type="string" name="search_still_indexing_hint" id="0x7F121B85" />
-    <public type="string" name="search_tenor" id="0x7F121B86" />
-    <public type="string" name="search_with_google" id="0x7F121B87" />
-    <public type="string" name="searching" id="0x7F121B88" />
-    <public type="string" name="security" id="0x7F121B89" />
-    <public type="string" name="see_thread" id="0x7F121B8A" />
-    <public type="string" name="see_thread_mobile" id="0x7F121B8B" />
-    <public type="string" name="select" id="0x7F121B8C" />
-    <public type="string" name="select_accessibility_desc" id="0x7F121B8D" />
-    <public type="string" name="select_accessibility_desc_open_options_list" id="0x7F121B8E" />
-    <public type="string" name="select_accessibility_desc_option" id="0x7F121B8F" />
-    <public type="string" name="select_accessibility_desc_with_selection" id="0x7F121B90" />
-    <public type="string" name="select_channel_or_category" id="0x7F121B91" />
-    <public type="string" name="select_emoji" id="0x7F121B92" />
-    <public type="string" name="select_from_application_a11y_label" id="0x7F121B93" />
-    <public type="string" name="select_message" id="0x7F121B94" />
-    <public type="string" name="select_picture" id="0x7F121B95" />
-    <public type="string" name="select_sort_mode" id="0x7F121B96" />
-    <public type="string" name="selection_shrink_scale" id="0x7F121B97" />
-    <public type="string" name="self_deny_permission_body" id="0x7F121B98" />
-    <public type="string" name="self_deny_permission_title" id="0x7F121B99" />
-    <public type="string" name="self_username_indicator" id="0x7F121B9A" />
-    <public type="string" name="self_username_indicator_hook" id="0x7F121B9B" />
-    <public type="string" name="self_xss_header" id="0x7F121B9C" />
-    <public type="string" name="self_xss_line_1" id="0x7F121B9D" />
-    <public type="string" name="self_xss_line_2" id="0x7F121B9E" />
-    <public type="string" name="self_xss_line_3" id="0x7F121B9F" />
-    <public type="string" name="self_xss_line_4" id="0x7F121BA0" />
-    <public type="string" name="send" id="0x7F121BA1" />
-    <public type="string" name="send_a_message" id="0x7F121BA2" />
-    <public type="string" name="send_compressed" id="0x7F121BA3" />
-    <public type="string" name="send_dm" id="0x7F121BA4" />
-    <public type="string" name="send_images_label" id="0x7F121BA5" />
-    <public type="string" name="send_message" id="0x7F121BA6" />
-    <public type="string" name="send_message_failure" id="0x7F121BA7" />
-    <public type="string" name="send_messages" id="0x7F121BA8" />
-    <public type="string" name="send_messages_description" id="0x7F121BA9" />
-    <public type="string" name="send_tts_messages" id="0x7F121BAA" />
-    <public type="string" name="send_tts_messages_description" id="0x7F121BAB" />
-    <public type="string" name="send_wave" id="0x7F121BAC" />
-    <public type="string" name="server_deafen" id="0x7F121BAD" />
-    <public type="string" name="server_deafened" id="0x7F121BAE" />
-    <public type="string" name="server_deafened_dialog_body" id="0x7F121BAF" />
-    <public type="string" name="server_deafened_dialog_title" id="0x7F121BB0" />
-    <public type="string" name="server_desciption_empty" id="0x7F121BB1" />
-    <public type="string" name="server_emoji" id="0x7F121BB2" />
-    <public type="string" name="server_folder_mark_as_read" id="0x7F121BB3" />
-    <public type="string" name="server_folder_placeholder" id="0x7F121BB4" />
-    <public type="string" name="server_folder_settings" id="0x7F121BB5" />
-    <public type="string" name="server_insights" id="0x7F121BB6" />
-    <public type="string" name="server_is_currently_full" id="0x7F121BB7" />
-    <public type="string" name="server_mute" id="0x7F121BB8" />
-    <public type="string" name="server_muted" id="0x7F121BB9" />
-    <public type="string" name="server_muted_dialog_body" id="0x7F121BBA" />
-    <public type="string" name="server_muted_dialog_title" id="0x7F121BBB" />
-    <public type="string" name="server_name_required" id="0x7F121BBC" />
-    <public type="string" name="server_options" id="0x7F121BBD" />
-    <public type="string" name="server_overview" id="0x7F121BBE" />
-    <public type="string" name="server_quest" id="0x7F121BBF" />
-    <public type="string" name="server_region_unavailable" id="0x7F121BC0" />
-    <public type="string" name="server_settings" id="0x7F121BC1" />
-    <public type="string" name="server_settings_updated" id="0x7F121BC2" />
-    <public type="string" name="server_status" id="0x7F121BC3" />
-    <public type="string" name="server_undeafen" id="0x7F121BC4" />
-    <public type="string" name="server_unmute" id="0x7F121BC5" />
-    <public type="string" name="server_voice_mute" id="0x7F121BC6" />
-    <public type="string" name="server_voice_unmute" id="0x7F121BC7" />
-    <public type="string" name="servers" id="0x7F121BC8" />
-    <public type="string" name="service_connections_disconnect" id="0x7F121BC9" />
-    <public type="string" name="set_debug_logging" id="0x7F121BCA" />
-    <public type="string" name="set_debug_logging_body" id="0x7F121BCB" />
-    <public type="string" name="set_invite_link_never_expire" id="0x7F121BCC" />
-    <public type="string" name="set_status" id="0x7F121BCD" />
-    <public type="string" name="set_up_description" id="0x7F121BCE" />
-    <public type="string" name="set_up_your_server" id="0x7F121BCF" />
-    <public type="string" name="settings" id="0x7F121BD0" />
-    <public type="string" name="settings_advanced" id="0x7F121BD1" />
-    <public type="string" name="settings_games_add_game" id="0x7F121BD2" />
-    <public type="string" name="settings_games_add_new_game" id="0x7F121BD3" />
-    <public type="string" name="settings_games_added_games_label" id="0x7F121BD4" />
-    <public type="string" name="settings_games_enable_overlay_label" id="0x7F121BD5" />
-    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7F121BD6" />
-    <public type="string" name="settings_games_last_played" id="0x7F121BD7" />
-    <public type="string" name="settings_games_no_game_detected" id="0x7F121BD8" />
-    <public type="string" name="settings_games_no_games_header" id="0x7F121BD9" />
-    <public type="string" name="settings_games_not_playing" id="0x7F121BDA" />
-    <public type="string" name="settings_games_not_seeing_game" id="0x7F121BDB" />
-    <public type="string" name="settings_games_now_playing_state" id="0x7F121BDC" />
-    <public type="string" name="settings_games_overlay" id="0x7F121BDD" />
-    <public type="string" name="settings_games_overlay_off" id="0x7F121BDE" />
-    <public type="string" name="settings_games_overlay_on" id="0x7F121BDF" />
-    <public type="string" name="settings_games_overlay_warning" id="0x7F121BE0" />
-    <public type="string" name="settings_games_toggle_overlay" id="0x7F121BE1" />
-    <public type="string" name="settings_games_verified_icon" id="0x7F121BE2" />
-    <public type="string" name="settings_invite_tip" id="0x7F121BE3" />
-    <public type="string" name="settings_invite_tip_without_create" id="0x7F121BE4" />
-    <public type="string" name="settings_notice_message" id="0x7F121BE5" />
-    <public type="string" name="settings_permissions_delete_body" id="0x7F121BE6" />
-    <public type="string" name="settings_permissions_delete_title" id="0x7F121BE7" />
-    <public type="string" name="settings_roles_delete_body" id="0x7F121BE8" />
-    <public type="string" name="settings_roles_delete_title" id="0x7F121BE9" />
-    <public type="string" name="settings_sync" id="0x7F121BEA" />
-    <public type="string" name="settings_webhooks_empty_body" id="0x7F121BEB" />
-    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7F121BEC" />
-    <public type="string" name="settings_webhooks_empty_title" id="0x7F121BED" />
-    <public type="string" name="settings_webhooks_intro" id="0x7F121BEE" />
-    <public type="string" name="setup_progress" id="0x7F121BEF" />
-    <public type="string" name="setup_vanity_url" id="0x7F121BF0" />
-    <public type="string" name="several_users_typing" id="0x7F121BF1" />
-    <public type="string" name="share" id="0x7F121BF2" />
-    <public type="string" name="share_invite_link_for_access" id="0x7F121BF3" />
-    <public type="string" name="share_invite_mobile" id="0x7F121BF4" />
-    <public type="string" name="share_link" id="0x7F121BF5" />
-    <public type="string" name="share_settings_title" id="0x7F121BF6" />
-    <public type="string" name="share_to" id="0x7F121BF7" />
-    <public type="string" name="share_your_screen" id="0x7F121BF8" />
-    <public type="string" name="sharing_screen" id="0x7F121BF9" />
-    <public type="string" name="shortcut_recorder_button" id="0x7F121BFA" />
-    <public type="string" name="shortcut_recorder_button_edit" id="0x7F121BFB" />
-    <public type="string" name="shortcut_recorder_button_recording" id="0x7F121BFC" />
-    <public type="string" name="shortcut_recorder_no_bind" id="0x7F121BFD" />
-    <public type="string" name="show_chat" id="0x7F121BFE" />
-    <public type="string" name="show_current_activity" id="0x7F121BFF" />
-    <public type="string" name="show_current_activity_desc" id="0x7F121C00" />
-    <public type="string" name="show_current_activity_desc_embedded" id="0x7F121C01" />
-    <public type="string" name="show_folder" id="0x7F121C02" />
-    <public type="string" name="show_keyboard" id="0x7F121C03" />
-    <public type="string" name="show_muted" id="0x7F121C04" />
-    <public type="string" name="show_muted_channels" id="0x7F121C05" />
-    <public type="string" name="show_spoiler_always" id="0x7F121C06" />
-    <public type="string" name="show_spoiler_content" id="0x7F121C07" />
-    <public type="string" name="show_spoiler_content_help" id="0x7F121C08" />
-    <public type="string" name="show_spoiler_on_click" id="0x7F121C09" />
-    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7F121C0A" />
-    <public type="string" name="skip" id="0x7F121C0B" />
-    <public type="string" name="skip_all_tips" id="0x7F121C0C" />
-    <public type="string" name="skip_for_now" id="0x7F121C0D" />
-    <public type="string" name="skip_to_content" id="0x7F121C0E" />
-    <public type="string" name="sku_payment_steps_label" id="0x7F121C0F" />
-    <public type="string" name="sky_blue" id="0x7F121C10" />
-    <public type="string" name="sms_confirmation_description" id="0x7F121C11" />
-    <public type="string" name="sms_confirmation_title" id="0x7F121C12" />
-    <public type="string" name="sort" id="0x7F121C13" />
-    <public type="string" name="sorting" id="0x7F121C14" />
-    <public type="string" name="sorting_channels" id="0x7F121C15" />
-    <public type="string" name="sound_deafen" id="0x7F121C16" />
-    <public type="string" name="sound_incoming_ring" id="0x7F121C17" />
-    <public type="string" name="sound_invited_to_speak" id="0x7F121C18" />
-    <public type="string" name="sound_message" id="0x7F121C19" />
-    <public type="string" name="sound_mute" id="0x7F121C1A" />
-    <public type="string" name="sound_outgoing_ring" id="0x7F121C1B" />
-    <public type="string" name="sound_ptt_activate" id="0x7F121C1C" />
-    <public type="string" name="sound_ptt_deactivate" id="0x7F121C1D" />
-    <public type="string" name="sound_stream_started" id="0x7F121C1E" />
-    <public type="string" name="sound_stream_stopped" id="0x7F121C1F" />
-    <public type="string" name="sound_undeafen" id="0x7F121C20" />
-    <public type="string" name="sound_unmute" id="0x7F121C21" />
-    <public type="string" name="sound_user_join" id="0x7F121C22" />
-    <public type="string" name="sound_user_leave" id="0x7F121C23" />
-    <public type="string" name="sound_user_moved" id="0x7F121C24" />
-    <public type="string" name="sound_viewer_join" id="0x7F121C25" />
-    <public type="string" name="sound_viewer_leave" id="0x7F121C26" />
-    <public type="string" name="sound_voice_disconnected" id="0x7F121C27" />
-    <public type="string" name="soundpack_chaos_label" id="0x7F121C28" />
-    <public type="string" name="soundpack_classic_label" id="0x7F121C29" />
-    <public type="string" name="soundpack_label" id="0x7F121C2A" />
-    <public type="string" name="soundpack_uncle_label" id="0x7F121C2B" />
-    <public type="string" name="soundpack_yachty_label" id="0x7F121C2C" />
-    <public type="string" name="sounds" id="0x7F121C2D" />
-    <public type="string" name="source_message_deleted" id="0x7F121C2E" />
-    <public type="string" name="speak" id="0x7F121C2F" />
-    <public type="string" name="speak_message" id="0x7F121C30" />
-    <public type="string" name="speaker_a11y_label" id="0x7F121C31" />
-    <public type="string" name="speaking_count" id="0x7F121C32" />
-    <public type="string" name="spectate" id="0x7F121C33" />
-    <public type="string" name="spectators" id="0x7F121C34" />
-    <public type="string" name="spellcheck" id="0x7F121C35" />
-    <public type="string" name="spoiler" id="0x7F121C36" />
-    <public type="string" name="spoiler_hidden_a11y_label" id="0x7F121C37" />
-    <public type="string" name="spoiler_mark_selected" id="0x7F121C38" />
-    <public type="string" name="spoiler_reveal" id="0x7F121C39" />
-    <public type="string" name="spotify_connection_info_android" id="0x7F121C3A" />
-    <public type="string" name="spotify_listen_along_host" id="0x7F121C3B" />
-    <public type="string" name="spotify_listen_along_info" id="0x7F121C3C" />
-    <public type="string" name="spotify_listen_along_listener" id="0x7F121C3D" />
-    <public type="string" name="spotify_listen_along_listeners" id="0x7F121C3E" />
-    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7F121C3F" />
-    <public type="string" name="spotify_listen_along_stop" id="0x7F121C40" />
-    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7F121C41" />
-    <public type="string" name="spotify_listen_along_title_host" id="0x7F121C42" />
-    <public type="string" name="spotify_listen_along_title_listener" id="0x7F121C43" />
-    <public type="string" name="spotify_premium_upgrade_body" id="0x7F121C44" />
-    <public type="string" name="spotify_premium_upgrade_button" id="0x7F121C45" />
-    <public type="string" name="spotify_premium_upgrade_header" id="0x7F121C46" />
-    <public type="string" name="staff_badge_tooltip" id="0x7F121C47" />
-    <public type="string" name="stage_audience" id="0x7F121C48" />
-    <public type="string" name="stage_blocked_users_accept" id="0x7F121C49" />
-    <public type="string" name="stage_blocked_users_body" id="0x7F121C4A" />
-    <public type="string" name="stage_blocked_users_cancel" id="0x7F121C4B" />
-    <public type="string" name="stage_blocked_users_description_count" id="0x7F121C4C" />
-    <public type="string" name="stage_blocked_users_title" id="0x7F121C4D" />
-    <public type="string" name="stage_blocked_users_title_plural" id="0x7F121C4E" />
-    <public type="string" name="stage_channel" id="0x7F121C4F" />
-    <public type="string" name="stage_channel_activity_feed_default" id="0x7F121C50" />
-    <public type="string" name="stage_channel_activity_feed_join" id="0x7F121C51" />
-    <public type="string" name="stage_channel_audience_count" id="0x7F121C52" />
-    <public type="string" name="stage_channel_audience_modal_action" id="0x7F121C53" />
-    <public type="string" name="stage_channel_audience_modal_alt_text" id="0x7F121C54" />
-    <public type="string" name="stage_channel_audience_modal_bullet_1" id="0x7F121C55" />
-    <public type="string" name="stage_channel_audience_modal_bullet_2" id="0x7F121C56" />
-    <public type="string" name="stage_channel_audience_modal_bullet_3" id="0x7F121C57" />
-    <public type="string" name="stage_channel_audience_modal_bullet_4" id="0x7F121C58" />
-    <public type="string" name="stage_channel_audience_modal_subtitle" id="0x7F121C59" />
-    <public type="string" name="stage_channel_audience_modal_title" id="0x7F121C5A" />
-    <public type="string" name="stage_channel_audience_no_topic" id="0x7F121C5B" />
-    <public type="string" name="stage_channel_cannot_overwrite_permission" id="0x7F121C5C" />
-    <public type="string" name="stage_channel_currently_disabled_channel_setting" id="0x7F121C5D" />
-    <public type="string" name="stage_channel_desc" id="0x7F121C5E" />
-    <public type="string" name="stage_channel_invite_to_stage_modal_footer" id="0x7F121C5F" />
-    <public type="string" name="stage_channel_invite_to_stage_modal_header" id="0x7F121C60" />
-    <public type="string" name="stage_channel_join_button" id="0x7F121C61" />
-    <public type="string" name="stage_channel_joined_audience_button" id="0x7F121C62" />
-    <public type="string" name="stage_channel_joined_speaker_button" id="0x7F121C63" />
-    <public type="string" name="stage_channel_leave_button" id="0x7F121C64" />
-    <public type="string" name="stage_channel_live_indicator" id="0x7F121C65" />
-    <public type="string" name="stage_channel_live_now" id="0x7F121C66" />
-    <public type="string" name="stage_channel_no_audience" id="0x7F121C67" />
-    <public type="string" name="stage_channel_no_topic" id="0x7F121C68" />
-    <public type="string" name="stage_channel_people_count" id="0x7F121C69" />
-    <public type="string" name="stage_channel_permission_microphone_denied" id="0x7F121C6A" />
-    <public type="string" name="stage_channel_start_alt_text" id="0x7F121C6B" />
-    <public type="string" name="stage_channel_start_subtitle" id="0x7F121C6C" />
-    <public type="string" name="stage_channel_start_title" id="0x7F121C6D" />
-    <public type="string" name="stage_channel_user_context_menu" id="0x7F121C6E" />
-    <public type="string" name="stage_channel_user_invite_to_speak" id="0x7F121C6F" />
-    <public type="string" name="stage_channel_user_invited_to_speak" id="0x7F121C70" />
-    <public type="string" name="stage_channel_user_move_to_audience" id="0x7F121C71" />
-    <public type="string" name="stage_channel_user_set_myself_to_speaker" id="0x7F121C72" />
-    <public type="string" name="stage_channel_users_are_speaking" id="0x7F121C73" />
-    <public type="string" name="stage_discovery" id="0x7F121C74" />
-    <public type="string" name="stage_discovery_audience_join_notice" id="0x7F121C75" />
-    <public type="string" name="stage_discovery_card_open_stage" id="0x7F121C76" />
-    <public type="string" name="stage_discovery_card_speaker_text" id="0x7F121C77" />
-    <public type="string" name="stage_discovery_card_speaker_text_overflow" id="0x7F121C78" />
-    <public type="string" name="stage_discovery_connection_error_button_text" id="0x7F121C79" />
-    <public type="string" name="stage_discovery_connection_error_generic" id="0x7F121C7A" />
-    <public type="string" name="stage_discovery_footer_body" id="0x7F121C7B" />
-    <public type="string" name="stage_discovery_footer_button" id="0x7F121C7C" />
-    <public type="string" name="stage_discovery_footer_title" id="0x7F121C7D" />
-    <public type="string" name="stage_discovery_guild_sidebar_live_stages_category" id="0x7F121C7E" />
-    <public type="string" name="stage_discovery_intro_card_alt_text" id="0x7F121C7F" />
-    <public type="string" name="stage_discovery_intro_card_body" id="0x7F121C80" />
-    <public type="string" name="stage_discovery_intro_card_body_desktop" id="0x7F121C81" />
-    <public type="string" name="stage_discovery_intro_card_header" id="0x7F121C82" />
-    <public type="string" name="stage_discovery_live_stage_listening_indicator" id="0x7F121C83" />
-    <public type="string" name="stage_discovery_live_stage_tile_disconnecting" id="0x7F121C84" />
-    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_audience" id="0x7F121C85" />
-    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_audience_hook" id="0x7F121C86" />
-    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_speaker" id="0x7F121C87" />
-    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_speaker_hook" id="0x7F121C88" />
-    <public type="string" name="stage_discovery_live_stage_tile_speaker_summary_overflow" id="0x7F121C89" />
-    <public type="string" name="stage_discovery_live_stage_tile_subtext_community" id="0x7F121C8A" />
-    <public type="string" name="stage_discovery_live_stage_tile_subtext_just_started" id="0x7F121C8B" />
-    <public type="string" name="stage_discovery_live_stage_tile_subtext_partner" id="0x7F121C8C" />
-    <public type="string" name="stage_discovery_live_stage_tile_subtext_your_server" id="0x7F121C8D" />
-    <public type="string" name="stage_discovery_live_stage_tile_user_guilds_boosting_context" id="0x7F121C8E" />
-    <public type="string" name="stage_discovery_live_stage_tile_user_guilds_context" id="0x7F121C8F" />
-    <public type="string" name="stage_discovery_live_stage_tile_user_guilds_context_subtext" id="0x7F121C90" />
-    <public type="string" name="stage_discovery_no_results_alt" id="0x7F121C91" />
-    <public type="string" name="stage_discovery_no_results_button" id="0x7F121C92" />
-    <public type="string" name="stage_discovery_no_results_header" id="0x7F121C93" />
-    <public type="string" name="stage_discovery_no_results_subheader" id="0x7F121C94" />
-    <public type="string" name="stage_discovery_origin_text" id="0x7F121C95" />
-    <public type="string" name="stage_discovery_refresh_icon_label" id="0x7F121C96" />
-    <public type="string" name="stage_discovery_speaker_join_notice" id="0x7F121C97" />
-    <public type="string" name="stage_discovery_timestamp_days" id="0x7F121C98" />
-    <public type="string" name="stage_discovery_timestamp_hours" id="0x7F121C99" />
-    <public type="string" name="stage_discovery_timestamp_minutes" id="0x7F121C9A" />
-    <public type="string" name="stage_discovery_tooltip" id="0x7F121C9B" />
-    <public type="string" name="stage_discovery_tooltip_mobile" id="0x7F121C9C" />
-    <public type="string" name="stage_instance_building_stage_label" id="0x7F121C9D" />
-    <public type="string" name="stage_instance_buy_ticket_label" id="0x7F121C9E" />
-    <public type="string" name="stage_instance_guild_picker_subtitle" id="0x7F121C9F" />
-    <public type="string" name="stage_instance_guild_picker_title" id="0x7F121CA0" />
-    <public type="string" name="stage_instance_interested_label" id="0x7F121CA1" />
-    <public type="string" name="stage_instance_privacy_type_friends_only_label" id="0x7F121CA2" />
-    <public type="string" name="stage_instance_privacy_type_friends_only_sub_label" id="0x7F121CA3" />
-    <public type="string" name="stage_instance_privacy_type_private_label" id="0x7F121CA4" />
-    <public type="string" name="stage_instance_privacy_type_private_sub_label" id="0x7F121CA5" />
-    <public type="string" name="stage_instance_privacy_type_public_label" id="0x7F121CA6" />
-    <public type="string" name="stage_instance_privacy_type_public_sub_label" id="0x7F121CA7" />
-    <public type="string" name="stage_instance_privacy_type_sheet_title" id="0x7F121CA8" />
-    <public type="string" name="stage_instance_purchased_label" id="0x7F121CA9" />
-    <public type="string" name="stage_instance_rsvp_count" id="0x7F121CAA" />
-    <public type="string" name="stage_instance_speakers" id="0x7F121CAB" />
-    <public type="string" name="stage_instance_start_stage_label" id="0x7F121CAC" />
-    <public type="string" name="stage_instance_ticket_buy_label" id="0x7F121CAD" />
-    <public type="string" name="stage_instance_ticket_purchase_confirmation_got_it_label" id="0x7F121CAE" />
-    <public type="string" name="stage_instance_ticket_purchase_confirmation_stage_started_sub_title" id="0x7F121CAF" />
-    <public type="string" name="stage_instance_ticket_purchase_confirmation_sub_title" id="0x7F121CB0" />
-    <public type="string" name="stage_instance_ticket_purchase_confirmation_title" id="0x7F121CB1" />
-    <public type="string" name="stage_instance_ticket_purchase_label" id="0x7F121CB2" />
-    <public type="string" name="stage_instance_ticket_purchase_modal_purchase_details_header" id="0x7F121CB3" />
-    <public type="string" name="stage_instance_ticket_sold_out_label" id="0x7F121CB4" />
-    <public type="string" name="stage_instance_today_label" id="0x7F121CB5" />
-    <public type="string" name="stage_invite_guild_header" id="0x7F121CB6" />
-    <public type="string" name="stage_invite_speaker_count" id="0x7F121CB7" />
-    <public type="string" name="stage_is_speaking_hook" id="0x7F121CB8" />
-    <public type="string" name="stage_is_speaking_zero_quantity_hook" id="0x7F121CB9" />
-    <public type="string" name="stage_microphone_permissions_denied" id="0x7F121CBA" />
-    <public type="string" name="stage_moderator_join_modal_join_audience" id="0x7F121CBB" />
-    <public type="string" name="stage_moderator_join_modal_join_speaker" id="0x7F121CBC" />
-    <public type="string" name="stage_moderator_join_modal_subtitle" id="0x7F121CBD" />
-    <public type="string" name="stage_moderator_join_modal_title" id="0x7F121CBE" />
-    <public type="string" name="stage_moderator_tooltip" id="0x7F121CBF" />
-    <public type="string" name="stage_settings" id="0x7F121CC0" />
-    <public type="string" name="stage_speak_invite_accept" id="0x7F121CC1" />
-    <public type="string" name="stage_speak_invite_blocked_users" id="0x7F121CC2" />
-    <public type="string" name="stage_speak_invite_decline" id="0x7F121CC3" />
-    <public type="string" name="stage_speak_invite_header" id="0x7F121CC4" />
-    <public type="string" name="stage_speak_invite_header_blocked_users" id="0x7F121CC5" />
-    <public type="string" name="stage_speak_invite_push_notification" id="0x7F121CC6" />
-    <public type="string" name="stage_speak_invite_send" id="0x7F121CC7" />
-    <public type="string" name="stage_speaker" id="0x7F121CC8" />
-    <public type="string" name="stage_topic_empty" id="0x7F121CC9" />
-    <public type="string" name="stage_voice_channel" id="0x7F121CCA" />
-    <public type="string" name="start" id="0x7F121CCB" />
-    <public type="string" name="start_call" id="0x7F121CCC" />
-    <public type="string" name="start_stage_button_text" id="0x7F121CCD" />
-    <public type="string" name="start_stage_button_text_mobile" id="0x7F121CCE" />
-    <public type="string" name="start_stage_channel_event_members_subtitle" id="0x7F121CCF" />
-    <public type="string" name="start_stage_channel_event_members_title" id="0x7F121CD0" />
-    <public type="string" name="start_stage_channel_event_modal_button" id="0x7F121CD1" />
-    <public type="string" name="start_stage_channel_event_modal_speaker_hint" id="0x7F121CD2" />
-    <public type="string" name="start_stage_channel_event_modal_subtitle" id="0x7F121CD3" />
-    <public type="string" name="start_stage_channel_event_modal_title" id="0x7F121CD4" />
-    <public type="string" name="start_stage_channel_event_modal_topic_label" id="0x7F121CD5" />
-    <public type="string" name="start_stage_channel_event_modal_topic_placeholder" id="0x7F121CD6" />
-    <public type="string" name="start_stage_channel_event_modal_topic_required" id="0x7F121CD7" />
-    <public type="string" name="start_stage_channel_event_privacy_title" id="0x7F121CD8" />
-    <public type="string" name="start_stage_channel_event_public_everyone_warning" id="0x7F121CD9" />
-    <public type="string" name="start_stage_channel_event_public_explanation" id="0x7F121CDA" />
-    <public type="string" name="start_stage_channel_event_public_permanent_disclaimer" id="0x7F121CDB" />
-    <public type="string" name="start_stage_channel_event_public_permissions_disclaimer" id="0x7F121CDC" />
-    <public type="string" name="start_stage_channel_event_public_subtitle" id="0x7F121CDD" />
-    <public type="string" name="start_stage_channel_event_public_title" id="0x7F121CDE" />
-    <public type="string" name="start_stage_confirmation_description_different_day" id="0x7F121CDF" />
-    <public type="string" name="start_stage_confirmation_description_same_day" id="0x7F121CE0" />
-    <public type="string" name="start_stage_confirmation_title" id="0x7F121CE1" />
-    <public type="string" name="start_stage_modal_confirm_text" id="0x7F121CE2" />
-    <public type="string" name="start_stage_modal_select_channel" id="0x7F121CE3" />
-    <public type="string" name="start_stage_modal_server_modal_label" id="0x7F121CE4" />
-    <public type="string" name="start_stage_modal_server_selection_bullet_1" id="0x7F121CE5" />
-    <public type="string" name="start_stage_modal_server_selection_bullet_2" id="0x7F121CE6" />
-    <public type="string" name="start_stage_modal_server_selection_bullet_3" id="0x7F121CE7" />
-    <public type="string" name="start_stage_modal_server_selection_bullet_4" id="0x7F121CE8" />
-    <public type="string" name="start_stage_modal_server_selection_button_hint" id="0x7F121CE9" />
-    <public type="string" name="start_stage_modal_server_selection_button_text" id="0x7F121CEA" />
-    <public type="string" name="start_stage_modal_server_selection_empty_title" id="0x7F121CEB" />
-    <public type="string" name="start_stage_modal_server_selection_subtitle" id="0x7F121CEC" />
-    <public type="string" name="start_stage_modal_server_selection_title" id="0x7F121CED" />
-    <public type="string" name="start_stage_modal_set_topic_change_channel" id="0x7F121CEE" />
-    <public type="string" name="start_stage_modal_set_topic_create_channel" id="0x7F121CEF" />
-    <public type="string" name="start_stage_modal_set_topic_help_text" id="0x7F121CF0" />
-    <public type="string" name="start_stage_modal_set_topic_select_label" id="0x7F121CF1" />
-    <public type="string" name="start_stage_modal_set_topic_subtitle" id="0x7F121CF2" />
-    <public type="string" name="start_stage_modal_set_topic_title" id="0x7F121CF3" />
-    <public type="string" name="start_stage_public_confirm" id="0x7F121CF4" />
-    <public type="string" name="start_stage_public_info_alt_text" id="0x7F121CF5" />
-    <public type="string" name="start_stage_public_info_section_four" id="0x7F121CF6" />
-    <public type="string" name="start_stage_public_info_section_one" id="0x7F121CF7" />
-    <public type="string" name="start_stage_public_info_section_three" id="0x7F121CF8" />
-    <public type="string" name="start_stage_public_info_section_two" id="0x7F121CF9" />
-    <public type="string" name="start_stage_public_info_title" id="0x7F121CFA" />
-    <public type="string" name="start_stage_public_info_title_caption" id="0x7F121CFB" />
-    <public type="string" name="start_stage_public_short_topic_warning" id="0x7F121CFC" />
-    <public type="string" name="start_video_call" id="0x7F121CFD" />
-    <public type="string" name="start_voice_call" id="0x7F121CFE" />
-    <public type="string" name="starting_at" id="0x7F121CFF" />
-    <public type="string" name="status_bar_notification_info_overflow" id="0x7F121D00" />
-    <public type="string" name="status_dnd" id="0x7F121D01" />
-    <public type="string" name="status_dnd_help" id="0x7F121D02" />
-    <public type="string" name="status_idle" id="0x7F121D03" />
-    <public type="string" name="status_invisible" id="0x7F121D04" />
-    <public type="string" name="status_invisible_helper" id="0x7F121D05" />
-    <public type="string" name="status_offline" id="0x7F121D06" />
-    <public type="string" name="status_online" id="0x7F121D07" />
-    <public type="string" name="status_online_mobile" id="0x7F121D08" />
-    <public type="string" name="status_streaming" id="0x7F121D09" />
-    <public type="string" name="status_unknown" id="0x7F121D0A" />
-    <public type="string" name="step_number" id="0x7F121D0B" />
-    <public type="string" name="sticker" id="0x7F121D0C" />
-    <public type="string" name="sticker_a11y_label" id="0x7F121D0D" />
-    <public type="string" name="sticker_asset_load_error" id="0x7F121D0E" />
-    <public type="string" name="sticker_button_label" id="0x7F121D0F" />
-    <public type="string" name="sticker_category_a11y_label" id="0x7F121D10" />
-    <public type="string" name="sticker_category_recent" id="0x7F121D11" />
-    <public type="string" name="sticker_from_pack" id="0x7F121D12" />
-    <public type="string" name="sticker_notification_body" id="0x7F121D13" />
-    <public type="string" name="sticker_pack_available_with_premium" id="0x7F121D14" />
-    <public type="string" name="sticker_pack_get_premium" id="0x7F121D15" />
-    <public type="string" name="sticker_pack_premium_cta" id="0x7F121D16" />
-    <public type="string" name="sticker_pack_price_free" id="0x7F121D17" />
-    <public type="string" name="sticker_pack_price_free_with_premium_tier_1" id="0x7F121D18" />
-    <public type="string" name="sticker_pack_price_free_with_premium_tier_2" id="0x7F121D19" />
-    <public type="string" name="sticker_pack_sticker_count" id="0x7F121D1A" />
-    <public type="string" name="sticker_pack_view" id="0x7F121D1B" />
-    <public type="string" name="sticker_picker_categories_recent" id="0x7F121D1C" />
-    <public type="string" name="sticker_picker_discounted_free_android" id="0x7F121D1D" />
-    <public type="string" name="sticker_picker_discounted_price_android" id="0x7F121D1E" />
-    <public type="string" name="sticker_picker_empty_state_subtitle" id="0x7F121D1F" />
-    <public type="string" name="sticker_picker_empty_state_subtitle_browse" id="0x7F121D20" />
-    <public type="string" name="sticker_picker_empty_state_subtitle_mobile" id="0x7F121D21" />
-    <public type="string" name="sticker_picker_empty_state_title" id="0x7F121D22" />
-    <public type="string" name="sticker_picker_owned_pack" id="0x7F121D23" />
-    <public type="string" name="sticker_picker_pack_details" id="0x7F121D24" />
-    <public type="string" name="sticker_picker_pack_details_animated" id="0x7F121D25" />
-    <public type="string" name="sticker_picker_pack_details_limited_time_left" id="0x7F121D26" />
-    <public type="string" name="sticker_picker_pack_details_premium" id="0x7F121D27" />
-    <public type="string" name="sticker_picker_pack_expiring_soon" id="0x7F121D28" />
-    <public type="string" name="sticker_picker_premium_empty_state_cta" id="0x7F121D29" />
-    <public type="string" name="sticker_picker_premium_empty_state_subtitle" id="0x7F121D2A" />
-    <public type="string" name="sticker_picker_premium_empty_state_title" id="0x7F121D2B" />
-    <public type="string" name="sticker_picker_price_with_premium_tier_2" id="0x7F121D2C" />
-    <public type="string" name="sticker_picker_view_all" id="0x7F121D2D" />
-    <public type="string" name="sticker_popout_countdown_header" id="0x7F121D2E" />
-    <public type="string" name="sticker_popout_pack_info" id="0x7F121D2F" />
-    <public type="string" name="sticker_popout_pack_info_nonpremium" id="0x7F121D30" />
-    <public type="string" name="sticker_popout_pack_info_premium" id="0x7F121D31" />
-    <public type="string" name="sticker_popout_pack_info_unavailable" id="0x7F121D32" />
-    <public type="string" name="sticker_premium_tier_1_upsell_alert_upgrade_cta" id="0x7F121D33" />
-    <public type="string" name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount" id="0x7F121D34" />
-    <public type="string" name="sticker_premium_tier_1_upsell_perk_premium_subscription" id="0x7F121D35" />
-    <public type="string" name="sticker_premium_tier_2_upsell_alert_description" id="0x7F121D36" />
-    <public type="string" name="sticker_premium_tier_2_upsell_alert_perks_guild_subscriptions" id="0x7F121D37" />
-    <public type="string" name="sticker_premium_tier_2_upsell_alert_perks_misc" id="0x7F121D38" />
-    <public type="string" name="sticker_premium_tier_2_upsell_alert_title" id="0x7F121D39" />
-    <public type="string" name="sticker_premium_tier_2_upsell_alert_upgrade_cta" id="0x7F121D3A" />
-    <public type="string" name="sticker_premium_tier_2_upsell_perk_discount" id="0x7F121D3B" />
-    <public type="string" name="sticker_premium_tier_2_upsell_perk_guild_subscription" id="0x7F121D3C" />
-    <public type="string" name="sticker_premium_tier_2_upsell_perk_premium_pack" id="0x7F121D3D" />
-    <public type="string" name="sticker_premium_tier_2_upsell_perk_premium_subscription" id="0x7F121D3E" />
-    <public type="string" name="sticker_premium_tier_2_upsell_perk_quantity" id="0x7F121D3F" />
-    <public type="string" name="sticker_purchase_modal_confirm_body_content" id="0x7F121D40" />
-    <public type="string" name="sticker_purchase_modal_confirm_body_header" id="0x7F121D41" />
-    <public type="string" name="sticker_purchase_modal_header" id="0x7F121D42" />
-    <public type="string" name="sticker_view_more_stickers" id="0x7F121D43" />
-    <public type="string" name="stickers_always_animate" id="0x7F121D44" />
-    <public type="string" name="stickers_animate_on_interaction" id="0x7F121D45" />
-    <public type="string" name="stickers_animate_on_interaction_description" id="0x7F121D46" />
-    <public type="string" name="stickers_auto_play_heading" id="0x7F121D47" />
-    <public type="string" name="stickers_auto_play_help" id="0x7F121D48" />
-    <public type="string" name="stickers_auto_play_help_disabled" id="0x7F121D49" />
-    <public type="string" name="stickers_gift_inventory_title_month" id="0x7F121D4A" />
-    <public type="string" name="stickers_gift_inventory_title_year" id="0x7F121D4B" />
-    <public type="string" name="stickers_matching" id="0x7F121D4C" />
-    <public type="string" name="stickers_matching_ios" id="0x7F121D4D" />
-    <public type="string" name="stickers_never_animate" id="0x7F121D4E" />
-    <public type="string" name="stickers_you_might_like" id="0x7F121D4F" />
-    <public type="string" name="stickers_you_might_like_a11y" id="0x7F121D50" />
-    <public type="string" name="still_indexing" id="0x7F121D51" />
-    <public type="string" name="stop" id="0x7F121D52" />
-    <public type="string" name="stop_ringing" id="0x7F121D53" />
-    <public type="string" name="stop_ringing_username_a11y_label" id="0x7F121D54" />
-    <public type="string" name="stop_speaking_message" id="0x7F121D55" />
-    <public type="string" name="stop_streaming" id="0x7F121D56" />
-    <public type="string" name="stop_watching" id="0x7F121D57" />
-    <public type="string" name="stop_watching_user" id="0x7F121D58" />
-    <public type="string" name="storage_permission_denied" id="0x7F121D59" />
-    <public type="string" name="store_channel" id="0x7F121D5A" />
-    <public type="string" name="stream_actions_menu_label" id="0x7F121D5B" />
-    <public type="string" name="stream_bad_spectator" id="0x7F121D5C" />
-    <public type="string" name="stream_bad_streamer" id="0x7F121D5D" />
-    <public type="string" name="stream_capture_paused" id="0x7F121D5E" />
-    <public type="string" name="stream_capture_paused_details" id="0x7F121D5F" />
-    <public type="string" name="stream_capture_paused_details_viewer" id="0x7F121D60" />
-    <public type="string" name="stream_channel_description" id="0x7F121D61" />
-    <public type="string" name="stream_description" id="0x7F121D62" />
-    <public type="string" name="stream_ended" id="0x7F121D63" />
-    <public type="string" name="stream_failed_description" id="0x7F121D64" />
-    <public type="string" name="stream_failed_title" id="0x7F121D65" />
-    <public type="string" name="stream_fps_option" id="0x7F121D66" />
-    <public type="string" name="stream_full_modal_body" id="0x7F121D67" />
-    <public type="string" name="stream_full_modal_header" id="0x7F121D68" />
-    <public type="string" name="stream_issue_modal_header" id="0x7F121D69" />
-    <public type="string" name="stream_network_quality_error" id="0x7F121D6A" />
-    <public type="string" name="stream_no_preview" id="0x7F121D6B" />
-    <public type="string" name="stream_participants_hidden" id="0x7F121D6C" />
-    <public type="string" name="stream_playing" id="0x7F121D6D" />
-    <public type="string" name="stream_premium_upsell_body" id="0x7F121D6E" />
-    <public type="string" name="stream_premium_upsell_body_no_cta" id="0x7F121D6F" />
-    <public type="string" name="stream_premium_upsell_cta" id="0x7F121D70" />
-    <public type="string" name="stream_premium_upsell_header" id="0x7F121D71" />
-    <public type="string" name="stream_preset_custom" id="0x7F121D72" />
-    <public type="string" name="stream_preset_documents" id="0x7F121D73" />
-    <public type="string" name="stream_preset_documents_description_nitro" id="0x7F121D74" />
-    <public type="string" name="stream_preset_documents_description_non_nitro" id="0x7F121D75" />
-    <public type="string" name="stream_preset_video" id="0x7F121D76" />
-    <public type="string" name="stream_preview_loading" id="0x7F121D77" />
-    <public type="string" name="stream_preview_paused" id="0x7F121D78" />
-    <public type="string" name="stream_preview_paused_subtext" id="0x7F121D79" />
-    <public type="string" name="stream_quality" id="0x7F121D7A" />
-    <public type="string" name="stream_quality_unlock" id="0x7F121D7B" />
-    <public type="string" name="stream_reconnecting_error" id="0x7F121D7C" />
-    <public type="string" name="stream_reconnecting_error_subtext" id="0x7F121D7D" />
-    <public type="string" name="stream_report_a_problem" id="0x7F121D7E" />
-    <public type="string" name="stream_report_a_problem_post_stream" id="0x7F121D7F" />
-    <public type="string" name="stream_report_audio_missing" id="0x7F121D80" />
-    <public type="string" name="stream_report_audio_poor" id="0x7F121D81" />
-    <public type="string" name="stream_report_black" id="0x7F121D82" />
-    <public type="string" name="stream_report_blurry" id="0x7F121D83" />
-    <public type="string" name="stream_report_ended_audio_missing" id="0x7F121D84" />
-    <public type="string" name="stream_report_ended_audio_poor" id="0x7F121D85" />
-    <public type="string" name="stream_report_ended_black" id="0x7F121D86" />
-    <public type="string" name="stream_report_ended_blurry" id="0x7F121D87" />
-    <public type="string" name="stream_report_ended_lagging" id="0x7F121D88" />
-    <public type="string" name="stream_report_ended_out_of_sync" id="0x7F121D89" />
-    <public type="string" name="stream_report_ended_stream_stopped_unexpectedly" id="0x7F121D8A" />
-    <public type="string" name="stream_report_game_issue" id="0x7F121D8B" />
-    <public type="string" name="stream_report_label" id="0x7F121D8C" />
-    <public type="string" name="stream_report_lagging" id="0x7F121D8D" />
-    <public type="string" name="stream_report_out_of_sync" id="0x7F121D8E" />
-    <public type="string" name="stream_report_placeholder" id="0x7F121D8F" />
-    <public type="string" name="stream_report_problem" id="0x7F121D90" />
-    <public type="string" name="stream_report_problem_body" id="0x7F121D91" />
-    <public type="string" name="stream_report_problem_header_mobile" id="0x7F121D92" />
-    <public type="string" name="stream_report_problem_menu_item" id="0x7F121D93" />
-    <public type="string" name="stream_report_problem_mobile" id="0x7F121D94" />
-    <public type="string" name="stream_report_rating_body" id="0x7F121D95" />
-    <public type="string" name="stream_report_rating_body_streamer" id="0x7F121D96" />
-    <public type="string" name="stream_report_submit" id="0x7F121D97" />
-    <public type="string" name="stream_reported" id="0x7F121D98" />
-    <public type="string" name="stream_reported_body" id="0x7F121D99" />
-    <public type="string" name="stream_resolution" id="0x7F121D9A" />
-    <public type="string" name="stream_show_all_participants" id="0x7F121D9B" />
-    <public type="string" name="stream_show_non_video" id="0x7F121D9C" />
-    <public type="string" name="stream_single_person_body" id="0x7F121D9D" />
-    <public type="string" name="stream_single_person_body_alt" id="0x7F121D9E" />
-    <public type="string" name="stream_single_person_invite" id="0x7F121D9F" />
-    <public type="string" name="stream_single_person_no_invite" id="0x7F121DA0" />
-    <public type="string" name="stream_soundshare_failed" id="0x7F121DA1" />
-    <public type="string" name="stream_volume" id="0x7F121DA2" />
-    <public type="string" name="stream_watch_multiple_tooltip" id="0x7F121DA3" />
-    <public type="string" name="streamer_mode" id="0x7F121DA4" />
-    <public type="string" name="streamer_mode_enabled" id="0x7F121DA5" />
-    <public type="string" name="streamer_playing" id="0x7F121DA6" />
-    <public type="string" name="streamer_settings_title" id="0x7F121DA7" />
-    <public type="string" name="streaming" id="0x7F121DA8" />
-    <public type="string" name="streaming_a_game" id="0x7F121DA9" />
-    <public type="string" name="sub_enabled_servers" id="0x7F121DAA" />
-    <public type="string" name="submit" id="0x7F121DAB" />
-    <public type="string" name="submit_bug" id="0x7F121DAC" />
-    <public type="string" name="subscriber_information" id="0x7F121DAD" />
-    <public type="string" name="subscription_payment_legalese_monthly" id="0x7F121DAE" />
-    <public type="string" name="subscription_payment_legalese_yearly" id="0x7F121DAF" />
-    <public type="string" name="subscription_survey_prompt" id="0x7F121DB0" />
-    <public type="string" name="subscriptions_title" id="0x7F121DB1" />
-    <public type="string" name="suggested_friends_list_header" id="0x7F121DB2" />
-    <public type="string" name="suggestions" id="0x7F121DB3" />
-    <public type="string" name="summary_collapsed_preference_list" id="0x7F121DB4" />
-    <public type="string" name="support" id="0x7F121DB5" />
-    <public type="string" name="suppress_all_embeds" id="0x7F121DB6" />
-    <public type="string" name="suppress_embed_body" id="0x7F121DB7" />
-    <public type="string" name="suppress_embed_confirm" id="0x7F121DB8" />
-    <public type="string" name="suppress_embed_tip" id="0x7F121DB9" />
-    <public type="string" name="suppress_embed_title" id="0x7F121DBA" />
-    <public type="string" name="suppressed" id="0x7F121DBB" />
-    <public type="string" name="suppressed_afk_body" id="0x7F121DBC" />
-    <public type="string" name="suppressed_afk_title" id="0x7F121DBD" />
-    <public type="string" name="suppressed_permission_body" id="0x7F121DBE" />
-    <public type="string" name="sv_se" id="0x7F121DBF" />
-    <public type="string" name="switch_audio_output" id="0x7F121DC0" />
-    <public type="string" name="switch_hardware_acceleration" id="0x7F121DC1" />
-    <public type="string" name="switch_hardware_acceleration_body" id="0x7F121DC2" />
-    <public type="string" name="switch_pip_to_activity" id="0x7F121DC3" />
-    <public type="string" name="switch_pip_to_activity_name" id="0x7F121DC4" />
-    <public type="string" name="switch_pip_to_go_live" id="0x7F121DC5" />
-    <public type="string" name="switch_pip_to_user_stream" id="0x7F121DC6" />
-    <public type="string" name="switch_subsystem" id="0x7F121DC7" />
-    <public type="string" name="switch_subsystem_body" id="0x7F121DC8" />
-    <public type="string" name="switch_to_compact_mode" id="0x7F121DC9" />
-    <public type="string" name="switch_to_cozy_mode" id="0x7F121DCA" />
-    <public type="string" name="switch_to_dark_theme" id="0x7F121DCB" />
-    <public type="string" name="switch_to_light_theme" id="0x7F121DCC" />
-    <public type="string" name="switch_to_push_to_talk" id="0x7F121DCD" />
-    <public type="string" name="switch_to_voice_activity" id="0x7F121DCE" />
-    <public type="string" name="sync" id="0x7F121DCF" />
-    <public type="string" name="sync_across_clients_appearance_help" id="0x7F121DD0" />
-    <public type="string" name="sync_across_clients_text" id="0x7F121DD1" />
-    <public type="string" name="sync_across_clients_text_help" id="0x7F121DD2" />
-    <public type="string" name="sync_friends" id="0x7F121DD3" />
-    <public type="string" name="sync_now" id="0x7F121DD4" />
-    <public type="string" name="sync_permissions" id="0x7F121DD5" />
-    <public type="string" name="sync_permissions_explanation" id="0x7F121DD6" />
-    <public type="string" name="sync_revoked" id="0x7F121DD7" />
-    <public type="string" name="sync_this_account" id="0x7F121DD8" />
-    <public type="string" name="system_dm_activity_text" id="0x7F121DD9" />
-    <public type="string" name="system_dm_channel_description" id="0x7F121DDA" />
-    <public type="string" name="system_dm_channel_description_subtext" id="0x7F121DDB" />
-    <public type="string" name="system_dm_empty_message" id="0x7F121DDC" />
-    <public type="string" name="system_dm_tag_system" id="0x7F121DDD" />
-    <public type="string" name="system_dm_urgent_message_modal_body" id="0x7F121DDE" />
-    <public type="string" name="system_dm_urgent_message_modal_header" id="0x7F121DDF" />
-    <public type="string" name="system_keyboard" id="0x7F121DE0" />
-    <public type="string" name="system_message_application_command_reply" id="0x7F121DE1" />
-    <public type="string" name="system_message_application_command_used" id="0x7F121DE2" />
-    <public type="string" name="system_message_application_command_used_as_title" id="0x7F121DE3" />
-    <public type="string" name="system_message_application_command_used_mobile" id="0x7F121DE4" />
-    <public type="string" name="system_message_application_command_used_short_mobile" id="0x7F121DE5" />
-    <public type="string" name="system_message_call_missed" id="0x7F121DE6" />
-    <public type="string" name="system_message_call_missed_with_duration" id="0x7F121DE7" />
-    <public type="string" name="system_message_call_started" id="0x7F121DE8" />
-    <public type="string" name="system_message_call_started_with_duration" id="0x7F121DE9" />
-    <public type="string" name="system_message_channel_follow_add" id="0x7F121DEA" />
-    <public type="string" name="system_message_channel_follow_add_ios" id="0x7F121DEB" />
-    <public type="string" name="system_message_channel_icon_change" id="0x7F121DEC" />
-    <public type="string" name="system_message_channel_name_change" id="0x7F121DED" />
-    <public type="string" name="system_message_channel_name_change2" id="0x7F121DEE" />
-    <public type="string" name="system_message_guild_bot_join" id="0x7F121DEF" />
-    <public type="string" name="system_message_guild_discovery_disqualified" id="0x7F121DF0" />
-    <public type="string" name="system_message_guild_discovery_disqualified_mobile" id="0x7F121DF1" />
-    <public type="string" name="system_message_guild_discovery_grace_period_final_warning" id="0x7F121DF2" />
-    <public type="string" name="system_message_guild_discovery_grace_period_initial_warning" id="0x7F121DF3" />
-    <public type="string" name="system_message_guild_discovery_requalified" id="0x7F121DF4" />
-    <public type="string" name="system_message_guild_member_join_001" id="0x7F121DF5" />
-    <public type="string" name="system_message_guild_member_join_002" id="0x7F121DF6" />
-    <public type="string" name="system_message_guild_member_join_003" id="0x7F121DF7" />
-    <public type="string" name="system_message_guild_member_join_004" id="0x7F121DF8" />
-    <public type="string" name="system_message_guild_member_join_005" id="0x7F121DF9" />
-    <public type="string" name="system_message_guild_member_join_006" id="0x7F121DFA" />
-    <public type="string" name="system_message_guild_member_join_007" id="0x7F121DFB" />
-    <public type="string" name="system_message_guild_member_join_008" id="0x7F121DFC" />
-    <public type="string" name="system_message_guild_member_join_009" id="0x7F121DFD" />
-    <public type="string" name="system_message_guild_member_join_010" id="0x7F121DFE" />
-    <public type="string" name="system_message_guild_member_join_011" id="0x7F121DFF" />
-    <public type="string" name="system_message_guild_member_join_012" id="0x7F121E00" />
-    <public type="string" name="system_message_guild_member_join_013" id="0x7F121E01" />
-    <public type="string" name="system_message_guild_member_subscribed" id="0x7F121E02" />
-    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7F121E03" />
-    <public type="string" name="system_message_guild_member_subscribed_many" id="0x7F121E04" />
-    <public type="string" name="system_message_guild_member_subscribed_many_achieved_tier" id="0x7F121E05" />
-    <public type="string" name="system_message_guild_stream_active" id="0x7F121E06" />
-    <public type="string" name="system_message_guild_stream_active_android" id="0x7F121E07" />
-    <public type="string" name="system_message_guild_stream_active_mobile" id="0x7F121E08" />
-    <public type="string" name="system_message_guild_stream_active_no_activity" id="0x7F121E09" />
-    <public type="string" name="system_message_guild_stream_ended" id="0x7F121E0A" />
-    <public type="string" name="system_message_guild_stream_ended_mobile" id="0x7F121E0B" />
-    <public type="string" name="system_message_invite_notification" id="0x7F121E0C" />
-    <public type="string" name="system_message_invite_users" id="0x7F121E0D" />
-    <public type="string" name="system_message_invite_users_button" id="0x7F121E0E" />
-    <public type="string" name="system_message_invite_users_compact" id="0x7F121E0F" />
-    <public type="string" name="system_message_invite_users_description" id="0x7F121E10" />
-    <public type="string" name="system_message_invite_users_description_owner" id="0x7F121E11" />
-    <public type="string" name="system_message_invite_users_owner" id="0x7F121E12" />
-    <public type="string" name="system_message_invite_users_owner_compact" id="0x7F121E13" />
-    <public type="string" name="system_message_join_call" id="0x7F121E14" />
-    <public type="string" name="system_message_manage_settings" id="0x7F121E15" />
-    <public type="string" name="system_message_pinned_message" id="0x7F121E16" />
-    <public type="string" name="system_message_pinned_message_mobile" id="0x7F121E17" />
-    <public type="string" name="system_message_pinned_message_no_cta" id="0x7F121E18" />
-    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7F121E19" />
-    <public type="string" name="system_message_pinned_message_no_cta_formatted_with_message" id="0x7F121E1A" />
-    <public type="string" name="system_message_pinned_message_with_message" id="0x7F121E1B" />
-    <public type="string" name="system_message_recipient_add" id="0x7F121E1C" />
-    <public type="string" name="system_message_recipient_remove" id="0x7F121E1D" />
-    <public type="string" name="system_message_recipient_remove_self" id="0x7F121E1E" />
-    <public type="string" name="system_message_thread_created" id="0x7F121E1F" />
-    <public type="string" name="system_message_thread_created_mobile" id="0x7F121E20" />
-    <public type="string" name="system_message_thread_member_add" id="0x7F121E21" />
-    <public type="string" name="system_message_thread_member_add_mobile" id="0x7F121E22" />
-    <public type="string" name="system_message_thread_member_remove" id="0x7F121E23" />
-    <public type="string" name="system_message_thread_member_remove_mobile" id="0x7F121E24" />
-    <public type="string" name="system_message_thread_member_remove_self" id="0x7F121E25" />
-    <public type="string" name="system_message_thread_member_remove_self_mobile" id="0x7F121E26" />
-    <public type="string" name="system_permission_grant" id="0x7F121E27" />
-    <public type="string" name="system_permission_request_camera" id="0x7F121E28" />
-    <public type="string" name="system_permission_request_files" id="0x7F121E29" />
-    <public type="string" name="tab_bar" id="0x7F121E2A" />
-    <public type="string" name="tabs_friends_accessibility_label" id="0x7F121E2B" />
-    <public type="string" name="tabs_home_accessibility_label" id="0x7F121E2C" />
-    <public type="string" name="tabs_mentions_accessibility_label" id="0x7F121E2D" />
-    <public type="string" name="tabs_search_accessibility_label" id="0x7F121E2E" />
-    <public type="string" name="tabs_settings_accessibility_label" id="0x7F121E2F" />
-    <public type="string" name="take_a_photo" id="0x7F121E30" />
-    <public type="string" name="take_survey" id="0x7F121E31" />
-    <public type="string" name="tan" id="0x7F121E32" />
-    <public type="string" name="tap_add_nickname" id="0x7F121E33" />
-    <public type="string" name="tar_gz" id="0x7F121E34" />
-    <public type="string" name="teal" id="0x7F121E35" />
-    <public type="string" name="temporary_membership_explanation" id="0x7F121E36" />
-    <public type="string" name="terms_and_conditions" id="0x7F121E37" />
-    <public type="string" name="terms_of_service" id="0x7F121E38" />
-    <public type="string" name="terms_of_service_url" id="0x7F121E39" />
-    <public type="string" name="terms_privacy" id="0x7F121E3A" />
-    <public type="string" name="terms_privacy_opt_in" id="0x7F121E3B" />
-    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7F121E3C" />
-    <public type="string" name="terracotta" id="0x7F121E3D" />
-    <public type="string" name="test_newlines_key" id="0x7F121E3E" />
-    <public type="string" name="test_video" id="0x7F121E3F" />
-    <public type="string" name="text" id="0x7F121E40" />
-    <public type="string" name="text_actions_menu_label" id="0x7F121E41" />
-    <public type="string" name="text_and_images" id="0x7F121E42" />
-    <public type="string" name="text_channel" id="0x7F121E43" />
-    <public type="string" name="text_channel_desc" id="0x7F121E44" />
-    <public type="string" name="text_channels" id="0x7F121E45" />
-    <public type="string" name="text_channels_matching" id="0x7F121E46" />
-    <public type="string" name="text_permissions" id="0x7F121E47" />
-    <public type="string" name="textarea_actions_menu_label" id="0x7F121E48" />
-    <public type="string" name="textarea_placeholder" id="0x7F121E49" />
-    <public type="string" name="th" id="0x7F121E4A" />
-    <public type="string" name="theme" id="0x7F121E4B" />
-    <public type="string" name="theme_dark" id="0x7F121E4C" />
-    <public type="string" name="theme_holy_light_reveal" id="0x7F121E4D" />
-    <public type="string" name="theme_light" id="0x7F121E4E" />
-    <public type="string" name="theme_pure_evil_easter_hint" id="0x7F121E4F" />
-    <public type="string" name="theme_pure_evil_easter_reveal" id="0x7F121E50" />
-    <public type="string" name="theme_pure_evil_switch_label" id="0x7F121E51" />
-    <public type="string" name="theme_pure_evil_updated" id="0x7F121E52" />
-    <public type="string" name="theme_system" id="0x7F121E53" />
-    <public type="string" name="theme_updated" id="0x7F121E54" />
-    <public type="string" name="this_server" id="0x7F121E55" />
-    <public type="string" name="this_server_named" id="0x7F121E56" />
-    <public type="string" name="thread" id="0x7F121E57" />
-    <public type="string" name="thread_actions_menu_label" id="0x7F121E58" />
-    <public type="string" name="thread_archived" id="0x7F121E59" />
-    <public type="string" name="thread_browser_active" id="0x7F121E5A" />
-    <public type="string" name="thread_browser_archive_time" id="0x7F121E5B" />
-    <public type="string" name="thread_browser_archived" id="0x7F121E5C" />
-    <public type="string" name="thread_browser_creation_time" id="0x7F121E5D" />
-    <public type="string" name="thread_browser_empty_state_active_header" id="0x7F121E5E" />
-    <public type="string" name="thread_browser_empty_state_archived_header" id="0x7F121E5F" />
-    <public type="string" name="thread_browser_empty_state_subtext" id="0x7F121E60" />
-    <public type="string" name="thread_browser_filter_content_description" id="0x7F121E61" />
-    <public type="string" name="thread_browser_filter_settings_title" id="0x7F121E62" />
-    <public type="string" name="thread_browser_filter_settings_visibility" id="0x7F121E63" />
-    <public type="string" name="thread_browser_joined_header" id="0x7F121E64" />
-    <public type="string" name="thread_browser_message_preview" id="0x7F121E65" />
-    <public type="string" name="thread_browser_no_recent_messages" id="0x7F121E66" />
-    <public type="string" name="thread_browser_other_header" id="0x7F121E67" />
-    <public type="string" name="thread_browser_private" id="0x7F121E68" />
-    <public type="string" name="thread_browser_private_header" id="0x7F121E69" />
-    <public type="string" name="thread_browser_public" id="0x7F121E6A" />
-    <public type="string" name="thread_browser_public_header" id="0x7F121E6B" />
-    <public type="string" name="thread_browser_started_by" id="0x7F121E6C" />
-    <public type="string" name="thread_browser_timestamp_days" id="0x7F121E6D" />
-    <public type="string" name="thread_browser_timestamp_hours" id="0x7F121E6E" />
-    <public type="string" name="thread_browser_timestamp_minutes" id="0x7F121E6F" />
-    <public type="string" name="thread_browser_timestamp_more_than_month" id="0x7F121E70" />
-    <public type="string" name="thread_browser_title" id="0x7F121E71" />
-    <public type="string" name="thread_header_notice_archived" id="0x7F121E72" />
-    <public type="string" name="thread_header_notice_join" id="0x7F121E73" />
-    <public type="string" name="thread_header_notice_locked" id="0x7F121E74" />
-    <public type="string" name="thread_member_without_access" id="0x7F121E75" />
-    <public type="string" name="thread_message_count" id="0x7F121E76" />
-    <public type="string" name="thread_message_count_max" id="0x7F121E77" />
-    <public type="string" name="thread_message_count_max_mobile" id="0x7F121E78" />
-    <public type="string" name="thread_message_count_mobile" id="0x7F121E79" />
-    <public type="string" name="thread_name" id="0x7F121E7A" />
-    <public type="string" name="thread_notification_settings_nudge_cancel" id="0x7F121E7B" />
-    <public type="string" name="thread_notification_settings_nudge_cta" id="0x7F121E7C" />
-    <public type="string" name="thread_notification_settings_nudge_description" id="0x7F121E7D" />
-    <public type="string" name="thread_reply_suggestion" id="0x7F121E7E" />
-    <public type="string" name="thread_settings" id="0x7F121E7F" />
-    <public type="string" name="thread_settings_updated" id="0x7F121E80" />
-    <public type="string" name="thread_started_by" id="0x7F121E81" />
-    <public type="string" name="thread_starter_message_not_loaded" id="0x7F121E82" />
-    <public type="string" name="thread_starter_message_original_message" id="0x7F121E83" />
-    <public type="string" name="threads" id="0x7F121E84" />
-    <public type="string" name="three_users_typing" id="0x7F121E85" />
-    <public type="string" name="timeout_error" id="0x7F121E86" />
-    <public type="string" name="tip_create_first_server_body3" id="0x7F121E87" />
-    <public type="string" name="tip_create_first_server_title3" id="0x7F121E88" />
-    <public type="string" name="tip_create_more_servers_body3" id="0x7F121E89" />
-    <public type="string" name="tip_create_more_servers_title3" id="0x7F121E8A" />
-    <public type="string" name="tip_direct_messages_body3" id="0x7F121E8B" />
-    <public type="string" name="tip_direct_messages_title3" id="0x7F121E8C" />
-    <public type="string" name="tip_friends_list_body3" id="0x7F121E8D" />
-    <public type="string" name="tip_friends_list_title3" id="0x7F121E8E" />
-    <public type="string" name="tip_instant_invite_body3" id="0x7F121E8F" />
-    <public type="string" name="tip_instant_invite_title3" id="0x7F121E90" />
-    <public type="string" name="tip_organize_by_topic_body3" id="0x7F121E91" />
-    <public type="string" name="tip_organize_by_topic_title3" id="0x7F121E92" />
-    <public type="string" name="tip_server_settings_body3" id="0x7F121E93" />
-    <public type="string" name="tip_server_settings_title3" id="0x7F121E94" />
-    <public type="string" name="tip_voice_conversations_body3" id="0x7F121E95" />
-    <public type="string" name="tip_voice_conversations_title3" id="0x7F121E96" />
-    <public type="string" name="tip_whos_online_body3" id="0x7F121E97" />
-    <public type="string" name="tip_whos_online_title3" id="0x7F121E98" />
-    <public type="string" name="tip_writing_messages_body3" id="0x7F121E99" />
-    <public type="string" name="tip_writing_messages_title3" id="0x7F121E9A" />
-    <public type="string" name="title" id="0x7F121E9B" />
-    <public type="string" name="title_bar_close_window" id="0x7F121E9C" />
-    <public type="string" name="title_bar_fullscreen_window" id="0x7F121E9D" />
-    <public type="string" name="title_bar_maximize_window" id="0x7F121E9E" />
-    <public type="string" name="title_bar_minimize_window" id="0x7F121E9F" />
-    <public type="string" name="toast_add_friend" id="0x7F121EA0" />
-    <public type="string" name="toast_add_friends" id="0x7F121EA1" />
-    <public type="string" name="toast_command_copied" id="0x7F121EA2" />
-    <public type="string" name="toast_feedback_sent" id="0x7F121EA3" />
-    <public type="string" name="toast_gif_saved" id="0x7F121EA4" />
-    <public type="string" name="toast_id_copied" id="0x7F121EA5" />
-    <public type="string" name="toast_image_saved" id="0x7F121EA6" />
-    <public type="string" name="toast_message_copied" id="0x7F121EA7" />
-    <public type="string" name="toast_message_hiya" id="0x7F121EA8" />
-    <public type="string" name="toast_message_howdy" id="0x7F121EA9" />
-    <public type="string" name="toast_message_id_copied" id="0x7F121EAA" />
-    <public type="string" name="toast_message_oh_hello" id="0x7F121EAB" />
-    <public type="string" name="toast_username_saved" id="0x7F121EAC" />
-    <public type="string" name="toast_video_saved" id="0x7F121EAD" />
-    <public type="string" name="toggle_camera" id="0x7F121EAE" />
-    <public type="string" name="toggle_deafen" id="0x7F121EAF" />
-    <public type="string" name="toggle_drawer" id="0x7F121EB0" />
-    <public type="string" name="toggle_emoji_keyboard" id="0x7F121EB1" />
-    <public type="string" name="toggle_media_keyboard" id="0x7F121EB2" />
-    <public type="string" name="toggle_microphone" id="0x7F121EB3" />
-    <public type="string" name="toggle_mute" id="0x7F121EB4" />
-    <public type="string" name="toggle_screenshare" id="0x7F121EB5" />
-    <public type="string" name="token_popout_body" id="0x7F121EB6" />
-    <public type="string" name="too_many_animated_emoji" id="0x7F121EB7" />
-    <public type="string" name="too_many_announcement_threads_message" id="0x7F121EB8" />
-    <public type="string" name="too_many_emoji" id="0x7F121EB9" />
-    <public type="string" name="too_many_members_message" id="0x7F121EBA" />
-    <public type="string" name="too_many_reactions_alert_body" id="0x7F121EBB" />
-    <public type="string" name="too_many_reactions_alert_header" id="0x7F121EBC" />
-    <public type="string" name="too_many_threads_message" id="0x7F121EBD" />
-    <public type="string" name="too_many_user_guilds_alert_description" id="0x7F121EBE" />
-    <public type="string" name="too_many_user_guilds_alert_title" id="0x7F121EBF" />
-    <public type="string" name="too_many_user_guilds_description" id="0x7F121EC0" />
-    <public type="string" name="too_many_user_guilds_title" id="0x7F121EC1" />
-    <public type="string" name="tooltip_community_feature_disabled" id="0x7F121EC2" />
-    <public type="string" name="tooltip_discoverable_guild_feature_disabled" id="0x7F121EC3" />
-    <public type="string" name="total_members" id="0x7F121EC4" />
-    <public type="string" name="total_results" id="0x7F121EC5" />
-    <public type="string" name="tr" id="0x7F121EC6" />
-    <public type="string" name="transfer" id="0x7F121EC7" />
-    <public type="string" name="transfer_ownership" id="0x7F121EC8" />
-    <public type="string" name="transfer_ownership_acknowledge" id="0x7F121EC9" />
-    <public type="string" name="transfer_ownership_protected_guild" id="0x7F121ECA" />
-    <public type="string" name="transfer_ownership_to_user" id="0x7F121ECB" />
-    <public type="string" name="trending_arrow_down" id="0x7F121ECC" />
-    <public type="string" name="trending_arrow_up" id="0x7F121ECD" />
-    <public type="string" name="try_again" id="0x7F121ECE" />
-    <public type="string" name="tts_alls" id="0x7F121ECF" />
-    <public type="string" name="tts_current" id="0x7F121ED0" />
-    <public type="string" name="tts_never" id="0x7F121ED1" />
-    <public type="string" name="tutorial_close" id="0x7F121ED2" />
-    <public type="string" name="tweet_us" id="0x7F121ED3" />
-    <public type="string" name="twitter" id="0x7F121ED4" />
-    <public type="string" name="twitter_page_url" id="0x7F121ED5" />
-    <public type="string" name="two_fa" id="0x7F121ED6" />
-    <public type="string" name="two_fa_activate" id="0x7F121ED7" />
-    <public type="string" name="two_fa_app_name_authy" id="0x7F121ED8" />
-    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7F121ED9" />
-    <public type="string" name="two_fa_auth_code" id="0x7F121EDA" />
-    <public type="string" name="two_fa_auth_code_no_backup" id="0x7F121EDB" />
-    <public type="string" name="two_fa_backup_code_enter" id="0x7F121EDC" />
-    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7F121EDD" />
-    <public type="string" name="two_fa_backup_code_hint" id="0x7F121EDE" />
-    <public type="string" name="two_fa_backup_code_used" id="0x7F121EDF" />
-    <public type="string" name="two_fa_backup_codes_body" id="0x7F121EE0" />
-    <public type="string" name="two_fa_backup_codes_label" id="0x7F121EE1" />
-    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7F121EE2" />
-    <public type="string" name="two_fa_backup_codes_warning" id="0x7F121EE3" />
-    <public type="string" name="two_fa_change_account" id="0x7F121EE4" />
-    <public type="string" name="two_fa_confirm_body" id="0x7F121EE5" />
-    <public type="string" name="two_fa_confirm_confirm" id="0x7F121EE6" />
-    <public type="string" name="two_fa_confirm_title" id="0x7F121EE7" />
-    <public type="string" name="two_fa_description" id="0x7F121EE8" />
-    <public type="string" name="two_fa_disable" id="0x7F121EE9" />
-    <public type="string" name="two_fa_discord_backup_codes" id="0x7F121EEA" />
-    <public type="string" name="two_fa_download_app_body" id="0x7F121EEB" />
-    <public type="string" name="two_fa_download_app_label" id="0x7F121EEC" />
-    <public type="string" name="two_fa_download_codes" id="0x7F121EED" />
-    <public type="string" name="two_fa_enable" id="0x7F121EEE" />
-    <public type="string" name="two_fa_enable_subheader" id="0x7F121EEF" />
-    <public type="string" name="two_fa_enabled" id="0x7F121EF0" />
-    <public type="string" name="two_fa_enter_sms_token_label" id="0x7F121EF1" />
-    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7F121EF2" />
-    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7F121EF3" />
-    <public type="string" name="two_fa_enter_token_body" id="0x7F121EF4" />
-    <public type="string" name="two_fa_enter_token_label" id="0x7F121EF5" />
-    <public type="string" name="two_fa_enter_token_no_backup_label" id="0x7F121EF6" />
-    <public type="string" name="two_fa_generate_codes" id="0x7F121EF7" />
-    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7F121EF8" />
-    <public type="string" name="two_fa_guild_mfa_warning" id="0x7F121EF9" />
-    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7F121EFA" />
-    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7F121EFB" />
-    <public type="string" name="two_fa_guild_mfa_warning_message_with_spacing" id="0x7F121EFC" />
-    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7F121EFD" />
-    <public type="string" name="two_fa_key" id="0x7F121EFE" />
-    <public type="string" name="two_fa_login_body" id="0x7F121EFF" />
-    <public type="string" name="two_fa_login_footer" id="0x7F121F00" />
-    <public type="string" name="two_fa_login_label" id="0x7F121F01" />
-    <public type="string" name="two_fa_not_verified" id="0x7F121F02" />
-    <public type="string" name="two_fa_qr_body" id="0x7F121F03" />
-    <public type="string" name="two_fa_qr_label" id="0x7F121F04" />
-    <public type="string" name="two_fa_remove" id="0x7F121F05" />
-    <public type="string" name="two_fa_sales_pitch" id="0x7F121F06" />
-    <public type="string" name="two_fa_success_body_mobile" id="0x7F121F07" />
-    <public type="string" name="two_fa_success_header" id="0x7F121F08" />
-    <public type="string" name="two_fa_token_required" id="0x7F121F09" />
-    <public type="string" name="two_fa_use_desktop_app" id="0x7F121F0A" />
-    <public type="string" name="two_fa_view_backup_codes" id="0x7F121F0B" />
-    <public type="string" name="two_fa_view_codes" id="0x7F121F0C" />
-    <public type="string" name="two_users_typing" id="0x7F121F0D" />
-    <public type="string" name="ucrop_crop" id="0x7F121F0E" />
-    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7F121F0F" />
-    <public type="string" name="ucrop_label_edit_photo" id="0x7F121F10" />
-    <public type="string" name="ucrop_label_original" id="0x7F121F11" />
-    <public type="string" name="ucrop_menu_crop" id="0x7F121F12" />
-    <public type="string" name="ucrop_mutate_exception_hint" id="0x7F121F13" />
-    <public type="string" name="ucrop_rotate" id="0x7F121F14" />
-    <public type="string" name="ucrop_scale" id="0x7F121F15" />
-    <public type="string" name="uk" id="0x7F121F16" />
-    <public type="string" name="unable_to_join_channel_full" id="0x7F121F17" />
-    <public type="string" name="unable_to_join_channel_full_modal_body" id="0x7F121F18" />
-    <public type="string" name="unable_to_join_channel_full_modal_header" id="0x7F121F19" />
-    <public type="string" name="unable_to_open_media_chooser" id="0x7F121F1A" />
-    <public type="string" name="unarchive" id="0x7F121F1B" />
-    <public type="string" name="unarchive_thread" id="0x7F121F1C" />
-    <public type="string" name="unban" id="0x7F121F1D" />
-    <public type="string" name="unban_user_body" id="0x7F121F1E" />
-    <public type="string" name="unban_user_title" id="0x7F121F1F" />
-    <public type="string" name="unblock" id="0x7F121F20" />
-    <public type="string" name="unblock_to_jump_body" id="0x7F121F21" />
-    <public type="string" name="unblock_to_jump_title" id="0x7F121F22" />
-    <public type="string" name="uncategorized" id="0x7F121F23" />
-    <public type="string" name="unclaimed_account_body" id="0x7F121F24" />
-    <public type="string" name="unclaimed_account_body_2" id="0x7F121F25" />
-    <public type="string" name="unclaimed_account_title" id="0x7F121F26" />
-    <public type="string" name="undeafen" id="0x7F121F27" />
-    <public type="string" name="undo" id="0x7F121F28" />
-    <public type="string" name="unfocus_participant" id="0x7F121F29" />
-    <public type="string" name="unhandled_link_body" id="0x7F121F2A" />
-    <public type="string" name="unhandled_link_title" id="0x7F121F2B" />
-    <public type="string" name="unicode_emoji_category_shortcut_a11y_label" id="0x7F121F2C" />
-    <public type="string" name="unknown_region" id="0x7F121F2D" />
-    <public type="string" name="unknown_user" id="0x7F121F2E" />
-    <public type="string" name="unmute" id="0x7F121F2F" />
-    <public type="string" name="unmute_category" id="0x7F121F30" />
-    <public type="string" name="unmute_channel" id="0x7F121F31" />
-    <public type="string" name="unmute_channel_generic" id="0x7F121F32" />
-    <public type="string" name="unmute_conversation" id="0x7F121F33" />
-    <public type="string" name="unmute_server" id="0x7F121F34" />
-    <public type="string" name="unnamed" id="0x7F121F35" />
-    <public type="string" name="unpin" id="0x7F121F36" />
-    <public type="string" name="unpin_confirm" id="0x7F121F37" />
-    <public type="string" name="unpin_message" id="0x7F121F38" />
-    <public type="string" name="unpin_message_body" id="0x7F121F39" />
-    <public type="string" name="unpin_message_context_menu_hint" id="0x7F121F3A" />
-    <public type="string" name="unpin_message_failed_body" id="0x7F121F3B" />
-    <public type="string" name="unpin_message_failed_title" id="0x7F121F3C" />
-    <public type="string" name="unpin_message_title" id="0x7F121F3D" />
-    <public type="string" name="unreads_confirm_mark_all_read_description" id="0x7F121F3E" />
-    <public type="string" name="unreads_confirm_mark_all_read_header" id="0x7F121F3F" />
-    <public type="string" name="unreads_empty_state_header" id="0x7F121F40" />
-    <public type="string" name="unreads_empty_state_tip" id="0x7F121F41" />
-    <public type="string" name="unreads_empty_state_tip_mac" id="0x7F121F42" />
-    <public type="string" name="unreads_mark_read" id="0x7F121F43" />
-    <public type="string" name="unreads_no_notifications_divider" id="0x7F121F44" />
-    <public type="string" name="unreads_old_channels_divider" id="0x7F121F45" />
-    <public type="string" name="unreads_tab_label" id="0x7F121F46" />
-    <public type="string" name="unreads_tutorial_body" id="0x7F121F47" />
-    <public type="string" name="unreads_tutorial_header" id="0x7F121F48" />
-    <public type="string" name="unreads_view_channel" id="0x7F121F49" />
-    <public type="string" name="unsupported_browser" id="0x7F121F4A" />
-    <public type="string" name="unsupported_browser_body" id="0x7F121F4B" />
-    <public type="string" name="unsupported_browser_details" id="0x7F121F4C" />
-    <public type="string" name="unsupported_browser_title" id="0x7F121F4D" />
-    <public type="string" name="unverified_email_title" id="0x7F121F4E" />
-    <public type="string" name="upcoming_guild_stage_instance_discovery_empty_state_sub_title" id="0x7F121F4F" />
-    <public type="string" name="upcoming_guild_stage_instance_discovery_empty_state_title" id="0x7F121F50" />
-    <public type="string" name="update_available" id="0x7F121F51" />
-    <public type="string" name="update_badge_header" id="0x7F121F52" />
-    <public type="string" name="update_downloaded" id="0x7F121F53" />
-    <public type="string" name="update_during_call_body" id="0x7F121F54" />
-    <public type="string" name="update_during_call_continue" id="0x7F121F55" />
-    <public type="string" name="update_during_call_title" id="0x7F121F56" />
-    <public type="string" name="update_manually" id="0x7F121F57" />
-    <public type="string" name="upload" id="0x7F121F58" />
-    <public type="string" name="upload_a_media_file" id="0x7F121F59" />
-    <public type="string" name="upload_area_always_compress" id="0x7F121F5A" />
-    <public type="string" name="upload_area_always_compress_desc" id="0x7F121F5B" />
-    <public type="string" name="upload_area_cancel_all" id="0x7F121F5C" />
-    <public type="string" name="upload_area_filename" id="0x7F121F5D" />
-    <public type="string" name="upload_area_help" id="0x7F121F5E" />
-    <public type="string" name="upload_area_invalid_file_type_help" id="0x7F121F5F" />
-    <public type="string" name="upload_area_invalid_file_type_title" id="0x7F121F60" />
-    <public type="string" name="upload_area_leave_a_comment" id="0x7F121F61" />
-    <public type="string" name="upload_area_optional" id="0x7F121F62" />
-    <public type="string" name="upload_area_title" id="0x7F121F63" />
-    <public type="string" name="upload_area_title_no_confirmation" id="0x7F121F64" />
-    <public type="string" name="upload_area_too_large_help" id="0x7F121F65" />
-    <public type="string" name="upload_area_too_large_help_mobile" id="0x7F121F66" />
-    <public type="string" name="upload_area_too_large_help_premium_tier_1" id="0x7F121F67" />
-    <public type="string" name="upload_area_too_large_title" id="0x7F121F68" />
-    <public type="string" name="upload_area_upload_failed_help" id="0x7F121F69" />
-    <public type="string" name="upload_area_upload_failed_title" id="0x7F121F6A" />
-    <public type="string" name="upload_background" id="0x7F121F6B" />
-    <public type="string" name="upload_debug_log_failure" id="0x7F121F6C" />
-    <public type="string" name="upload_debug_log_failure_header" id="0x7F121F6D" />
-    <public type="string" name="upload_debug_log_failure_no_file" id="0x7F121F6E" />
-    <public type="string" name="upload_debug_log_failure_progress" id="0x7F121F6F" />
-    <public type="string" name="upload_debug_log_failure_read" id="0x7F121F70" />
-    <public type="string" name="upload_debug_log_failure_upload" id="0x7F121F71" />
-    <public type="string" name="upload_debug_log_success" id="0x7F121F72" />
-    <public type="string" name="upload_debug_log_success_header" id="0x7F121F73" />
-    <public type="string" name="upload_debug_logs" id="0x7F121F74" />
-    <public type="string" name="upload_emoji" id="0x7F121F75" />
-    <public type="string" name="upload_emoji_subtitle" id="0x7F121F76" />
-    <public type="string" name="upload_emoji_title" id="0x7F121F77" />
-    <public type="string" name="upload_file_subtext" id="0x7F121F78" />
-    <public type="string" name="upload_image" id="0x7F121F79" />
-    <public type="string" name="upload_image_body" id="0x7F121F7A" />
-    <public type="string" name="upload_open_file_failed" id="0x7F121F7B" />
-    <public type="string" name="upload_queued" id="0x7F121F7C" />
-    <public type="string" name="upload_to" id="0x7F121F7D" />
-    <public type="string" name="upload_uploads_too_large_help" id="0x7F121F7E" />
-    <public type="string" name="upload_uploads_too_large_title" id="0x7F121F7F" />
-    <public type="string" name="uploaded_by" id="0x7F121F80" />
-    <public type="string" name="uploading_files" id="0x7F121F81" />
-    <public type="string" name="uploading_files_failed" id="0x7F121F82" />
-    <public type="string" name="usage_access" id="0x7F121F83" />
-    <public type="string" name="usage_statistics_disable_modal_body" id="0x7F121F84" />
-    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7F121F85" />
-    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7F121F86" />
-    <public type="string" name="usage_statistics_disable_modal_title" id="0x7F121F87" />
-    <public type="string" name="use_application_commands" id="0x7F121F88" />
-    <public type="string" name="use_application_commands_channel_description" id="0x7F121F89" />
-    <public type="string" name="use_application_commands_guild_description" id="0x7F121F8A" />
-    <public type="string" name="use_email" id="0x7F121F8B" />
-    <public type="string" name="use_external_emojis" id="0x7F121F8C" />
-    <public type="string" name="use_external_emojis_description" id="0x7F121F8D" />
-    <public type="string" name="use_phone" id="0x7F121F8E" />
-    <public type="string" name="use_private_threads" id="0x7F121F8F" />
-    <public type="string" name="use_public_threads" id="0x7F121F90" />
-    <public type="string" name="use_rich_chat_box_description" id="0x7F121F91" />
-    <public type="string" name="use_speaker" id="0x7F121F92" />
-    <public type="string" name="use_vad" id="0x7F121F93" />
-    <public type="string" name="use_vad_description" id="0x7F121F94" />
-    <public type="string" name="user_actions_menu_label" id="0x7F121F95" />
-    <public type="string" name="user_activity_accept_invite" id="0x7F121F96" />
-    <public type="string" name="user_activity_action_ask_to_join" id="0x7F121F97" />
-    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7F121F98" />
-    <public type="string" name="user_activity_action_download_app" id="0x7F121F99" />
-    <public type="string" name="user_activity_action_failed_to_launch" id="0x7F121F9A" />
-    <public type="string" name="user_activity_action_invite_to_join" id="0x7F121F9B" />
-    <public type="string" name="user_activity_action_invite_to_listen_along" id="0x7F121F9C" />
-    <public type="string" name="user_activity_action_notify_me" id="0x7F121F9D" />
-    <public type="string" name="user_activity_already_playing" id="0x7F121F9E" />
-    <public type="string" name="user_activity_already_syncing" id="0x7F121F9F" />
-    <public type="string" name="user_activity_cannot_join_self" id="0x7F121FA0" />
-    <public type="string" name="user_activity_cannot_play_self" id="0x7F121FA1" />
-    <public type="string" name="user_activity_cannot_sync_self" id="0x7F121FA2" />
-    <public type="string" name="user_activity_chat_invite_education" id="0x7F121FA3" />
-    <public type="string" name="user_activity_connect_platform" id="0x7F121FA4" />
-    <public type="string" name="user_activity_header_competing" id="0x7F121FA5" />
-    <public type="string" name="user_activity_header_listening" id="0x7F121FA6" />
-    <public type="string" name="user_activity_header_live_on_platform" id="0x7F121FA7" />
-    <public type="string" name="user_activity_header_playing" id="0x7F121FA8" />
-    <public type="string" name="user_activity_header_playing_on_platform" id="0x7F121FA9" />
-    <public type="string" name="user_activity_header_streaming_to_dm" id="0x7F121FAA" />
-    <public type="string" name="user_activity_header_streaming_to_guild" id="0x7F121FAB" />
-    <public type="string" name="user_activity_header_watching" id="0x7F121FAC" />
-    <public type="string" name="user_activity_invite_request_expired" id="0x7F121FAD" />
-    <public type="string" name="user_activity_invite_request_received" id="0x7F121FAE" />
-    <public type="string" name="user_activity_invite_request_requested" id="0x7F121FAF" />
-    <public type="string" name="user_activity_invite_request_sent" id="0x7F121FB0" />
-    <public type="string" name="user_activity_invite_request_waiting" id="0x7F121FB1" />
-    <public type="string" name="user_activity_invite_to_join" id="0x7F121FB2" />
-    <public type="string" name="user_activity_joining" id="0x7F121FB3" />
-    <public type="string" name="user_activity_listen_along" id="0x7F121FB4" />
-    <public type="string" name="user_activity_listen_along_description" id="0x7F121FB5" />
-    <public type="string" name="user_activity_listening_album" id="0x7F121FB6" />
-    <public type="string" name="user_activity_listening_artists" id="0x7F121FB7" />
-    <public type="string" name="user_activity_never_mind" id="0x7F121FB8" />
-    <public type="string" name="user_activity_not_detected" id="0x7F121FB9" />
-    <public type="string" name="user_activity_play_on_platform" id="0x7F121FBA" />
-    <public type="string" name="user_activity_respond_nope" id="0x7F121FBB" />
-    <public type="string" name="user_activity_respond_yeah" id="0x7F121FBC" />
-    <public type="string" name="user_activity_stage_state_size" id="0x7F121FBD" />
-    <public type="string" name="user_activity_state_size" id="0x7F121FBE" />
-    <public type="string" name="user_activity_timestamp_end" id="0x7F121FBF" />
-    <public type="string" name="user_activity_timestamp_end_simple" id="0x7F121FC0" />
-    <public type="string" name="user_activity_timestamp_start" id="0x7F121FC1" />
-    <public type="string" name="user_activity_timestamp_start_simple" id="0x7F121FC2" />
-    <public type="string" name="user_activity_user_join" id="0x7F121FC3" />
-    <public type="string" name="user_activity_user_join_hint" id="0x7F121FC4" />
-    <public type="string" name="user_activity_user_playing_for_days" id="0x7F121FC5" />
-    <public type="string" name="user_activity_user_playing_for_hours" id="0x7F121FC6" />
-    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7F121FC7" />
-    <public type="string" name="user_activity_watch_along" id="0x7F121FC8" />
-    <public type="string" name="user_dm_settings" id="0x7F121FC9" />
-    <public type="string" name="user_dm_settings_help" id="0x7F121FCA" />
-    <public type="string" name="user_dm_settings_question" id="0x7F121FCB" />
-    <public type="string" name="user_explicit_content_filter" id="0x7F121FCC" />
-    <public type="string" name="user_explicit_content_filter_disabled" id="0x7F121FCD" />
-    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7F121FCE" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7F121FCF" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7F121FD0" />
-    <public type="string" name="user_explicit_content_filter_help" id="0x7F121FD1" />
-    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7F121FD2" />
-    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7F121FD3" />
-    <public type="string" name="user_has_been_blocked" id="0x7F121FD4" />
-    <public type="string" name="user_has_been_unblocked" id="0x7F121FD5" />
-    <public type="string" name="user_info" id="0x7F121FD6" />
-    <public type="string" name="user_management" id="0x7F121FD7" />
-    <public type="string" name="user_popout_about_me" id="0x7F121FD8" />
-    <public type="string" name="user_popout_identity_cta_avatar" id="0x7F121FD9" />
-    <public type="string" name="user_popout_identity_cta_both" id="0x7F121FDA" />
-    <public type="string" name="user_popout_identity_cta_nickname" id="0x7F121FDB" />
-    <public type="string" name="user_popout_message" id="0x7F121FDC" />
-    <public type="string" name="user_popout_wumpus_tooltip" id="0x7F121FDD" />
-    <public type="string" name="user_profile_about_me" id="0x7F121FDE" />
-    <public type="string" name="user_profile_activity" id="0x7F121FDF" />
-    <public type="string" name="user_profile_add_friend" id="0x7F121FE0" />
-    <public type="string" name="user_profile_audio" id="0x7F121FE1" />
-    <public type="string" name="user_profile_failure_to_open_message" id="0x7F121FE2" />
-    <public type="string" name="user_profile_guild_name_content_description" id="0x7F121FE3" />
-    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7F121FE4" />
-    <public type="string" name="user_profile_message" id="0x7F121FE5" />
-    <public type="string" name="user_profile_modal" id="0x7F121FE6" />
-    <public type="string" name="user_profile_mutual_friends" id="0x7F121FE7" />
-    <public type="string" name="user_profile_mutual_friends_placeholder" id="0x7F121FE8" />
-    <public type="string" name="user_profile_mutual_guilds" id="0x7F121FE9" />
-    <public type="string" name="user_profile_mutual_guilds_placeholder" id="0x7F121FEA" />
-    <public type="string" name="user_profile_pending" id="0x7F121FEB" />
-    <public type="string" name="user_profile_settings_setstatus" id="0x7F121FEC" />
-    <public type="string" name="user_profile_video" id="0x7F121FED" />
-    <public type="string" name="user_profile_volume" id="0x7F121FEE" />
-    <public type="string" name="user_setting_notification_not_enabled_prompt" id="0x7F121FEF" />
-    <public type="string" name="user_settings" id="0x7F121FF0" />
-    <public type="string" name="user_settings_about_me" id="0x7F121FF1" />
-    <public type="string" name="user_settings_about_me_description" id="0x7F121FF2" />
-    <public type="string" name="user_settings_account_change_email_prompt" id="0x7F121FF3" />
-    <public type="string" name="user_settings_account_change_email_prompt_desktop" id="0x7F121FF4" />
-    <public type="string" name="user_settings_account_change_email_title" id="0x7F121FF5" />
-    <public type="string" name="user_settings_account_change_email_title_desktop" id="0x7F121FF6" />
-    <public type="string" name="user_settings_account_change_password_prompt_desktop" id="0x7F121FF7" />
-    <public type="string" name="user_settings_account_change_password_title_desktop" id="0x7F121FF8" />
-    <public type="string" name="user_settings_account_change_username_prompt_desktop" id="0x7F121FF9" />
-    <public type="string" name="user_settings_account_change_username_title" id="0x7F121FFA" />
-    <public type="string" name="user_settings_account_change_username_title_desktop" id="0x7F121FFB" />
-    <public type="string" name="user_settings_account_password_and_authentication" id="0x7F121FFC" />
-    <public type="string" name="user_settings_account_removal_description" id="0x7F121FFD" />
-    <public type="string" name="user_settings_account_removal_description_unclaimed" id="0x7F121FFE" />
-    <public type="string" name="user_settings_account_removal_section" id="0x7F121FFF" />
-    <public type="string" name="user_settings_account_remove_phone_number_button" id="0x7F122000" />
-    <public type="string" name="user_settings_account_remove_phone_number_title" id="0x7F122001" />
-    <public type="string" name="user_settings_account_remove_phone_number_warning_body" id="0x7F122002" />
-    <public type="string" name="user_settings_account_remove_phone_number_warning_title" id="0x7F122003" />
-    <public type="string" name="user_settings_account_remove_phone_sms_backup_warning" id="0x7F122004" />
-    <public type="string" name="user_settings_account_verify_password_subtitle" id="0x7F122005" />
-    <public type="string" name="user_settings_account_verify_password_title" id="0x7F122006" />
-    <public type="string" name="user_settings_account_verify_password_title_in_title_case" id="0x7F122007" />
-    <public type="string" name="user_settings_actions_menu_label" id="0x7F122008" />
-    <public type="string" name="user_settings_add_email_claim" id="0x7F122009" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7F12200A" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7F12200B" />
-    <public type="string" name="user_settings_appearance_colors" id="0x7F12200C" />
-    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7F12200D" />
-    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7F12200E" />
-    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7F12200F" />
-    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7F122010" />
-    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7F122011" />
-    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7F122012" />
-    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7F122013" />
-    <public type="string" name="user_settings_available_codes" id="0x7F122014" />
-    <public type="string" name="user_settings_avatar" id="0x7F122015" />
-    <public type="string" name="user_settings_banner_color" id="0x7F122016" />
-    <public type="string" name="user_settings_banner_specs" id="0x7F122017" />
-    <public type="string" name="user_settings_blocked_users" id="0x7F122018" />
-    <public type="string" name="user_settings_blocked_users_empty" id="0x7F122019" />
-    <public type="string" name="user_settings_blocked_users_header" id="0x7F12201A" />
-    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7F12201B" />
-    <public type="string" name="user_settings_change_avatar" id="0x7F12201C" />
-    <public type="string" name="user_settings_close_button" id="0x7F12201D" />
-    <public type="string" name="user_settings_confirm_logout" id="0x7F12201E" />
-    <public type="string" name="user_settings_customization_upsell" id="0x7F12201F" />
-    <public type="string" name="user_settings_customize_profile_title" id="0x7F122020" />
-    <public type="string" name="user_settings_delete_avatar" id="0x7F122021" />
-    <public type="string" name="user_settings_disable_advanced_voice_activity" id="0x7F122022" />
-    <public type="string" name="user_settings_disable_noise_suppression" id="0x7F122023" />
-    <public type="string" name="user_settings_edit_account" id="0x7F122024" />
-    <public type="string" name="user_settings_edit_account_password_label" id="0x7F122025" />
-    <public type="string" name="user_settings_edit_account_tag" id="0x7F122026" />
-    <public type="string" name="user_settings_edit_profile" id="0x7F122027" />
-    <public type="string" name="user_settings_enter_password_view_codes" id="0x7F122028" />
-    <public type="string" name="user_settings_games_install_location" id="0x7F122029" />
-    <public type="string" name="user_settings_games_install_location_add" id="0x7F12202A" />
-    <public type="string" name="user_settings_games_install_location_make_default" id="0x7F12202B" />
-    <public type="string" name="user_settings_games_install_location_name" id="0x7F12202C" />
-    <public type="string" name="user_settings_games_install_location_remove" id="0x7F12202D" />
-    <public type="string" name="user_settings_games_install_location_space" id="0x7F12202E" />
-    <public type="string" name="user_settings_games_install_locations" id="0x7F12202F" />
-    <public type="string" name="user_settings_games_remove_location_body" id="0x7F122030" />
-    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7F122031" />
-    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7F122032" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7F122033" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7F122034" />
-    <public type="string" name="user_settings_hypesquad" id="0x7F122035" />
-    <public type="string" name="user_settings_keybinds_action" id="0x7F122036" />
-    <public type="string" name="user_settings_keybinds_chat_section_title" id="0x7F122037" />
-    <public type="string" name="user_settings_keybinds_default_keybinds_title" id="0x7F122038" />
-    <public type="string" name="user_settings_keybinds_keybind" id="0x7F122039" />
-    <public type="string" name="user_settings_keybinds_message_description" id="0x7F12203A" />
-    <public type="string" name="user_settings_keybinds_message_section_title" id="0x7F12203B" />
-    <public type="string" name="user_settings_keybinds_miscellaneous_section_title" id="0x7F12203C" />
-    <public type="string" name="user_settings_keybinds_navigation_section_title" id="0x7F12203D" />
-    <public type="string" name="user_settings_keybinds_show_list_title" id="0x7F12203E" />
-    <public type="string" name="user_settings_keybinds_voice_and_video_section_title" id="0x7F12203F" />
-    <public type="string" name="user_settings_label_current_password" id="0x7F122040" />
-    <public type="string" name="user_settings_label_discriminator" id="0x7F122041" />
-    <public type="string" name="user_settings_label_email" id="0x7F122042" />
-    <public type="string" name="user_settings_label_new_password" id="0x7F122043" />
-    <public type="string" name="user_settings_label_phone_number" id="0x7F122044" />
-    <public type="string" name="user_settings_label_username" id="0x7F122045" />
-    <public type="string" name="user_settings_linux_settings" id="0x7F122046" />
-    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7F122047" />
-    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7F122048" />
-    <public type="string" name="user_settings_mfa_enabled" id="0x7F122049" />
-    <public type="string" name="user_settings_mfa_removed" id="0x7F12204A" />
-    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7F12204B" />
-    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7F12204C" />
-    <public type="string" name="user_settings_my_account" id="0x7F12204D" />
-    <public type="string" name="user_settings_no_email_placeholder" id="0x7F12204E" />
-    <public type="string" name="user_settings_no_phone_placeholder" id="0x7F12204F" />
-    <public type="string" name="user_settings_noise_cancellation" id="0x7F122050" />
-    <public type="string" name="user_settings_noise_cancellation_description" id="0x7F122051" />
-    <public type="string" name="user_settings_noise_cancellation_model" id="0x7F122052" />
-    <public type="string" name="user_settings_notifications_preview_sound" id="0x7F122053" />
-    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7F122054" />
-    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7F122055" />
-    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7F122056" />
-    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7F122057" />
-    <public type="string" name="user_settings_open_on_startup_body" id="0x7F122058" />
-    <public type="string" name="user_settings_open_on_startup_label" id="0x7F122059" />
-    <public type="string" name="user_settings_privacy_terms" id="0x7F12205A" />
-    <public type="string" name="user_settings_profile_banner" id="0x7F12205B" />
-    <public type="string" name="user_settings_remove_avatar" id="0x7F12205C" />
-    <public type="string" name="user_settings_remove_banner" id="0x7F12205D" />
-    <public type="string" name="user_settings_restart_app_mobile" id="0x7F12205E" />
-    <public type="string" name="user_settings_save" id="0x7F12205F" />
-    <public type="string" name="user_settings_scan_qr_code" id="0x7F122060" />
-    <public type="string" name="user_settings_show_library" id="0x7F122061" />
-    <public type="string" name="user_settings_show_library_note" id="0x7F122062" />
-    <public type="string" name="user_settings_start_minimized_body" id="0x7F122063" />
-    <public type="string" name="user_settings_start_minimized_label" id="0x7F122064" />
-    <public type="string" name="user_settings_startup_behavior" id="0x7F122065" />
-    <public type="string" name="user_settings_streamer_notice_body" id="0x7F122066" />
-    <public type="string" name="user_settings_streamer_notice_title" id="0x7F122067" />
-    <public type="string" name="user_settings_unverified_email_body" id="0x7F122068" />
-    <public type="string" name="user_settings_upload_avatar" id="0x7F122069" />
-    <public type="string" name="user_settings_upload_banner" id="0x7F12206A" />
-    <public type="string" name="user_settings_use_default_banner_color" id="0x7F12206B" />
-    <public type="string" name="user_settings_used_backup_codes" id="0x7F12206C" />
-    <public type="string" name="user_settings_user_profile" id="0x7F12206D" />
-    <public type="string" name="user_settings_voice_add_multiple" id="0x7F12206E" />
-    <public type="string" name="user_settings_voice_codec_description" id="0x7F12206F" />
-    <public type="string" name="user_settings_voice_codec_title" id="0x7F122070" />
-    <public type="string" name="user_settings_voice_experimental_soundshare_label" id="0x7F122071" />
-    <public type="string" name="user_settings_voice_hardware_h264" id="0x7F122072" />
-    <public type="string" name="user_settings_voice_install_label" id="0x7F122073" />
-    <public type="string" name="user_settings_voice_installed_label" id="0x7F122074" />
-    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7F122075" />
-    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7F122076" />
-    <public type="string" name="user_settings_voice_mic_test_description" id="0x7F122077" />
-    <public type="string" name="user_settings_voice_mic_test_title" id="0x7F122078" />
-    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7F122079" />
-    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7F12207A" />
-    <public type="string" name="user_settings_voice_open_h264" id="0x7F12207B" />
-    <public type="string" name="user_settings_voice_soundshare_enabled_label" id="0x7F12207C" />
-    <public type="string" name="user_settings_voice_soundshare_enabling_label" id="0x7F12207D" />
-    <public type="string" name="user_settings_voice_soundshare_not_enabled_label" id="0x7F12207E" />
-    <public type="string" name="user_settings_voice_video_codec_title" id="0x7F12207F" />
-    <public type="string" name="user_settings_voice_video_hook_label" id="0x7F122080" />
-    <public type="string" name="user_settings_windows_settings" id="0x7F122081" />
-    <public type="string" name="user_settings_with_build_override" id="0x7F122082" />
-    <public type="string" name="user_summary_with_others" id="0x7F122083" />
-    <public type="string" name="user_volume" id="0x7F122084" />
-    <public type="string" name="username" id="0x7F122085" />
-    <public type="string" name="username_and_tag" id="0x7F122086" />
-    <public type="string" name="username_live" id="0x7F122087" />
-    <public type="string" name="username_required" id="0x7F122088" />
-    <public type="string" name="users" id="0x7F122089" />
-    <public type="string" name="v7_preference_off" id="0x7F12208A" />
-    <public type="string" name="v7_preference_on" id="0x7F12208B" />
-    <public type="string" name="vad_permission_body" id="0x7F12208C" />
-    <public type="string" name="vad_permission_enable_ptt" id="0x7F12208D" />
-    <public type="string" name="vad_permission_okay" id="0x7F12208E" />
-    <public type="string" name="vad_permission_small" id="0x7F12208F" />
-    <public type="string" name="vad_permission_title" id="0x7F122090" />
-    <public type="string" name="vanity_url" id="0x7F122091" />
-    <public type="string" name="vanity_url_header_uses" id="0x7F122092" />
-    <public type="string" name="vanity_url_help" id="0x7F122093" />
-    <public type="string" name="vanity_url_help_conflict" id="0x7F122094" />
-    <public type="string" name="vanity_url_help_extended" id="0x7F122095" />
-    <public type="string" name="vanity_url_help_extended_link" id="0x7F122096" />
-    <public type="string" name="vanity_url_hint_mobile" id="0x7F122097" />
-    <public type="string" name="vanity_url_uses" id="0x7F122098" />
-    <public type="string" name="verfication_expired" id="0x7F122099" />
-    <public type="string" name="verification_body" id="0x7F12209A" />
-    <public type="string" name="verification_body_alt" id="0x7F12209B" />
-    <public type="string" name="verification_email_body" id="0x7F12209C" />
-    <public type="string" name="verification_email_error_body" id="0x7F12209D" />
-    <public type="string" name="verification_email_error_title" id="0x7F12209E" />
-    <public type="string" name="verification_email_title" id="0x7F12209F" />
-    <public type="string" name="verification_footer" id="0x7F1220A0" />
-    <public type="string" name="verification_footer_logout" id="0x7F1220A1" />
-    <public type="string" name="verification_footer_support" id="0x7F1220A2" />
-    <public type="string" name="verification_level_high" id="0x7F1220A3" />
-    <public type="string" name="verification_level_high_criteria" id="0x7F1220A4" />
-    <public type="string" name="verification_level_low" id="0x7F1220A5" />
-    <public type="string" name="verification_level_low_criteria" id="0x7F1220A6" />
-    <public type="string" name="verification_level_medium" id="0x7F1220A7" />
-    <public type="string" name="verification_level_medium_criteria" id="0x7F1220A8" />
-    <public type="string" name="verification_level_none" id="0x7F1220A9" />
-    <public type="string" name="verification_level_none_criteria" id="0x7F1220AA" />
-    <public type="string" name="verification_level_very_high" id="0x7F1220AB" />
-    <public type="string" name="verification_level_very_high_criteria" id="0x7F1220AC" />
-    <public type="string" name="verification_open_discord" id="0x7F1220AD" />
-    <public type="string" name="verification_phone_description" id="0x7F1220AE" />
-    <public type="string" name="verification_phone_title" id="0x7F1220AF" />
-    <public type="string" name="verification_title" id="0x7F1220B0" />
-    <public type="string" name="verification_verified" id="0x7F1220B1" />
-    <public type="string" name="verification_verifying" id="0x7F1220B2" />
-    <public type="string" name="verified_bot_tooltip" id="0x7F1220B3" />
-    <public type="string" name="verified_developer_badge_tooltip" id="0x7F1220B4" />
-    <public type="string" name="verify" id="0x7F1220B5" />
-    <public type="string" name="verify_account" id="0x7F1220B6" />
-    <public type="string" name="verify_by" id="0x7F1220B7" />
-    <public type="string" name="verify_by_email" id="0x7F1220B8" />
-    <public type="string" name="verify_by_email_formatted" id="0x7F1220B9" />
-    <public type="string" name="verify_by_hcaptcha" id="0x7F1220BA" />
-    <public type="string" name="verify_by_phone_bail" id="0x7F1220BB" />
-    <public type="string" name="verify_by_phone_formatted" id="0x7F1220BC" />
-    <public type="string" name="verify_by_recaptcha" id="0x7F1220BD" />
-    <public type="string" name="verify_by_recaptcha_description" id="0x7F1220BE" />
-    <public type="string" name="verify_email" id="0x7F1220BF" />
-    <public type="string" name="verify_email_body" id="0x7F1220C0" />
-    <public type="string" name="verify_email_body_resent" id="0x7F1220C1" />
-    <public type="string" name="verify_phone" id="0x7F1220C2" />
-    <public type="string" name="verify_phone_for_support" id="0x7F1220C3" />
-    <public type="string" name="verify_your_email" id="0x7F1220C4" />
-    <public type="string" name="verifying" id="0x7F1220C5" />
-    <public type="string" name="very_out_of_date_description" id="0x7F1220C6" />
-    <public type="string" name="vi" id="0x7F1220C7" />
-    <public type="string" name="video" id="0x7F1220C8" />
-    <public type="string" name="video_call_auto_select" id="0x7F1220C9" />
-    <public type="string" name="video_call_hide_members" id="0x7F1220CA" />
-    <public type="string" name="video_call_return_to_grid" id="0x7F1220CB" />
-    <public type="string" name="video_call_return_to_list" id="0x7F1220CC" />
-    <public type="string" name="video_call_show_members" id="0x7F1220CD" />
-    <public type="string" name="video_capacity_modal_body" id="0x7F1220CE" />
-    <public type="string" name="video_capacity_modal_header" id="0x7F1220CF" />
-    <public type="string" name="video_playback_mute_accessibility_label" id="0x7F1220D0" />
-    <public type="string" name="video_playback_unmute_accessibility_label" id="0x7F1220D1" />
-    <public type="string" name="video_quality_mode_auto" id="0x7F1220D2" />
-    <public type="string" name="video_quality_mode_full" id="0x7F1220D3" />
-    <public type="string" name="video_settings" id="0x7F1220D4" />
-    <public type="string" name="video_unavailable" id="0x7F1220D5" />
-    <public type="string" name="video_unsupported_browser_body" id="0x7F1220D6" />
-    <public type="string" name="video_unsupported_browser_title" id="0x7F1220D7" />
-    <public type="string" name="view" id="0x7F1220D8" />
-    <public type="string" name="view_all" id="0x7F1220D9" />
-    <public type="string" name="view_as_role" id="0x7F1220DA" />
-    <public type="string" name="view_as_role_description" id="0x7F1220DB" />
-    <public type="string" name="view_as_roles_hidden_vc_warning" id="0x7F1220DC" />
-    <public type="string" name="view_as_roles_mentions_warning" id="0x7F1220DD" />
-    <public type="string" name="view_as_roles_upsell_body" id="0x7F1220DE" />
-    <public type="string" name="view_as_roles_upsell_title" id="0x7F1220DF" />
-    <public type="string" name="view_as_roles_voice_warning" id="0x7F1220E0" />
-    <public type="string" name="view_audit_log" id="0x7F1220E1" />
-    <public type="string" name="view_audit_log_description" id="0x7F1220E2" />
-    <public type="string" name="view_channel" id="0x7F1220E3" />
-    <public type="string" name="view_embed" id="0x7F1220E4" />
-    <public type="string" name="view_guild_analytics" id="0x7F1220E5" />
-    <public type="string" name="view_guild_analytics_description" id="0x7F1220E6" />
-    <public type="string" name="view_profile" id="0x7F1220E7" />
-    <public type="string" name="view_spectators" id="0x7F1220E8" />
-    <public type="string" name="view_surrounding_messages" id="0x7F1220E9" />
-    <public type="string" name="viewing_as_roles" id="0x7F1220EA" />
-    <public type="string" name="viewing_as_roles_back" id="0x7F1220EB" />
-    <public type="string" name="viewing_as_roles_select" id="0x7F1220EC" />
-    <public type="string" name="visit_community" id="0x7F1220ED" />
-    <public type="string" name="visitors_info" id="0x7F1220EE" />
-    <public type="string" name="voice" id="0x7F1220EF" />
-    <public type="string" name="voice_and_video" id="0x7F1220F0" />
-    <public type="string" name="voice_call_action_a11y_hint" id="0x7F1220F1" />
-    <public type="string" name="voice_call_member_list_title" id="0x7F1220F2" />
-    <public type="string" name="voice_channel" id="0x7F1220F3" />
-    <public type="string" name="voice_channel_deafened" id="0x7F1220F4" />
-    <public type="string" name="voice_channel_desc" id="0x7F1220F5" />
-    <public type="string" name="voice_channel_empty" id="0x7F1220F6" />
-    <public type="string" name="voice_channel_hide_names" id="0x7F1220F7" />
-    <public type="string" name="voice_channel_locked" id="0x7F1220F8" />
-    <public type="string" name="voice_channel_muted" id="0x7F1220F9" />
-    <public type="string" name="voice_channel_show_names" id="0x7F1220FA" />
-    <public type="string" name="voice_channel_subtitle" id="0x7F1220FB" />
-    <public type="string" name="voice_channel_title" id="0x7F1220FC" />
-    <public type="string" name="voice_channel_undeafened" id="0x7F1220FD" />
-    <public type="string" name="voice_channel_unmuted" id="0x7F1220FE" />
-    <public type="string" name="voice_channels" id="0x7F1220FF" />
-    <public type="string" name="voice_channels_matching" id="0x7F122100" />
-    <public type="string" name="voice_controls_sheet_tooltip_swipe_up" id="0x7F122101" />
-    <public type="string" name="voice_panel_hide_extras" id="0x7F122102" />
-    <public type="string" name="voice_panel_introduction_close" id="0x7F122103" />
-    <public type="string" name="voice_panel_introduction_header" id="0x7F122104" />
-    <public type="string" name="voice_panel_introduction_text" id="0x7F122105" />
-    <public type="string" name="voice_panel_show_extras" id="0x7F122106" />
-    <public type="string" name="voice_panel_show_voice_users" id="0x7F122107" />
-    <public type="string" name="voice_panel_user_tooltip" id="0x7F122108" />
-    <public type="string" name="voice_panel_users_a11y_label" id="0x7F122109" />
-    <public type="string" name="voice_permissions" id="0x7F12210A" />
-    <public type="string" name="voice_settings" id="0x7F12210B" />
-    <public type="string" name="voice_status_connecting" id="0x7F12210C" />
-    <public type="string" name="voice_status_not_connected" id="0x7F12210D" />
-    <public type="string" name="voice_status_not_connected_mobile" id="0x7F12210E" />
-    <public type="string" name="voice_status_ringing" id="0x7F12210F" />
-    <public type="string" name="voice_unavailable" id="0x7F122110" />
-    <public type="string" name="watch" id="0x7F122111" />
-    <public type="string" name="watch_media_survey_button" id="0x7F122112" />
-    <public type="string" name="watch_media_survey_prompt" id="0x7F122113" />
-    <public type="string" name="watch_stream" id="0x7F122114" />
-    <public type="string" name="watch_stream_in_app" id="0x7F122115" />
-    <public type="string" name="watch_stream_streaming" id="0x7F122116" />
-    <public type="string" name="watch_stream_tip" id="0x7F122117" />
-    <public type="string" name="watch_stream_watching" id="0x7F122118" />
-    <public type="string" name="watch_user_stream" id="0x7F122119" />
-    <public type="string" name="watching" id="0x7F12211A" />
-    <public type="string" name="wave_accessibility_text" id="0x7F12211B" />
-    <public type="string" name="wave_default_recipient" id="0x7F12211C" />
-    <public type="string" name="wave_to" id="0x7F12211D" />
-    <public type="string" name="web_browser" id="0x7F12211E" />
-    <public type="string" name="web_browser_chrome" id="0x7F12211F" />
-    <public type="string" name="web_browser_in_app" id="0x7F122120" />
-    <public type="string" name="web_browser_safari" id="0x7F122121" />
-    <public type="string" name="webhook_cancel" id="0x7F122122" />
-    <public type="string" name="webhook_create" id="0x7F122123" />
-    <public type="string" name="webhook_created_on" id="0x7F122124" />
-    <public type="string" name="webhook_delete" id="0x7F122125" />
-    <public type="string" name="webhook_delete_body" id="0x7F122126" />
-    <public type="string" name="webhook_delete_title" id="0x7F122127" />
-    <public type="string" name="webhook_error_creating_webhook" id="0x7F122128" />
-    <public type="string" name="webhook_error_deleting_webhook" id="0x7F122129" />
-    <public type="string" name="webhook_error_internal_server_error" id="0x7F12212A" />
-    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7F12212B" />
-    <public type="string" name="webhook_form_name" id="0x7F12212C" />
-    <public type="string" name="webhook_form_url" id="0x7F12212D" />
-    <public type="string" name="webhook_form_webhook_url_help" id="0x7F12212E" />
-    <public type="string" name="webhook_modal_icon_description" id="0x7F12212F" />
-    <public type="string" name="webhook_modal_icon_title" id="0x7F122130" />
-    <public type="string" name="webhook_modal_title" id="0x7F122131" />
-    <public type="string" name="webhooks" id="0x7F122132" />
-    <public type="string" name="weekly_communicators" id="0x7F122133" />
-    <public type="string" name="weekly_new_member_retention" id="0x7F122134" />
-    <public type="string" name="weekly_new_members" id="0x7F122135" />
-    <public type="string" name="weekly_visitors" id="0x7F122136" />
-    <public type="string" name="welcome_channel_delete_confirm_body" id="0x7F122137" />
-    <public type="string" name="welcome_channel_delete_confirm_body_generic" id="0x7F122138" />
-    <public type="string" name="welcome_channel_delete_confirm_title" id="0x7F122139" />
-    <public type="string" name="welcome_channel_emoji_picker_tooltip" id="0x7F12213A" />
-    <public type="string" name="welcome_cta_download_title" id="0x7F12213B" />
-    <public type="string" name="welcome_cta_invite_title" id="0x7F12213C" />
-    <public type="string" name="welcome_cta_label" id="0x7F12213D" />
-    <public type="string" name="welcome_cta_message_title" id="0x7F12213E" />
-    <public type="string" name="welcome_cta_onboarding_video_title" id="0x7F12213F" />
-    <public type="string" name="welcome_cta_onboarding_video_title_new_user" id="0x7F122140" />
-    <public type="string" name="welcome_cta_personalize_title" id="0x7F122141" />
-    <public type="string" name="welcome_cta_personalize_title_mobile" id="0x7F122142" />
-    <public type="string" name="welcome_cta_subtitle_action_with_guide" id="0x7F122143" />
-    <public type="string" name="welcome_cta_subtitle_existing_server" id="0x7F122144" />
-    <public type="string" name="welcome_cta_subtitle_member" id="0x7F122145" />
-    <public type="string" name="welcome_cta_subtitle_owner" id="0x7F122146" />
-    <public type="string" name="welcome_cta_title" id="0x7F122147" />
-    <public type="string" name="welcome_cta_title_mobile" id="0x7F122148" />
-    <public type="string" name="welcome_message_desktop_apps" id="0x7F122149" />
-    <public type="string" name="welcome_message_edit_channel" id="0x7F12214A" />
-    <public type="string" name="welcome_message_instant_invite" id="0x7F12214B" />
-    <public type="string" name="welcome_message_mobile_apps" id="0x7F12214C" />
-    <public type="string" name="welcome_message_mobile_explore_server" id="0x7F12214D" />
-    <public type="string" name="welcome_message_mobile_explore_server_desc" id="0x7F12214E" />
-    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7F12214F" />
-    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7F122150" />
-    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7F122151" />
-    <public type="string" name="welcome_message_mobile_owner_title" id="0x7F122152" />
-    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7F122153" />
-    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7F122154" />
-    <public type="string" name="welcome_message_owner_title" id="0x7F122155" />
-    <public type="string" name="welcome_message_setup_server" id="0x7F122156" />
-    <public type="string" name="welcome_message_subtitle_channel" id="0x7F122157" />
-    <public type="string" name="welcome_message_support" id="0x7F122158" />
-    <public type="string" name="welcome_message_title" id="0x7F122159" />
-    <public type="string" name="welcome_message_title_channel" id="0x7F12215A" />
-    <public type="string" name="welcome_message_tutorial" id="0x7F12215B" />
-    <public type="string" name="welcome_screen_choice_header" id="0x7F12215C" />
-    <public type="string" name="welcome_screen_skip" id="0x7F12215D" />
-    <public type="string" name="welcome_screen_title" id="0x7F12215E" />
-    <public type="string" name="whats_new" id="0x7F12215F" />
-    <public type="string" name="whats_new_date" id="0x7F122160" />
-    <public type="string" name="whitelist_failed" id="0x7F122161" />
-    <public type="string" name="whitelisted" id="0x7F122162" />
-    <public type="string" name="whitelisting" id="0x7F122163" />
-    <public type="string" name="widget" id="0x7F122164" />
-    <public type="string" name="windows" id="0x7F122165" />
-    <public type="string" name="working" id="0x7F122166" />
-    <public type="string" name="wumpus" id="0x7F122167" />
-    <public type="string" name="xbox_authorization_title" id="0x7F122168" />
-    <public type="string" name="xbox_game_pass_card_body_claimed" id="0x7F122169" />
-    <public type="string" name="xbox_game_pass_card_body_unclaimed_expanded" id="0x7F12216A" />
-    <public type="string" name="xbox_game_pass_card_body_unclaimed_unexpanded" id="0x7F12216B" />
-    <public type="string" name="xbox_game_pass_modal_code_description" id="0x7F12216C" />
-    <public type="string" name="xbox_game_pass_modal_code_description_failed" id="0x7F12216D" />
-    <public type="string" name="xbox_game_pass_modal_code_header" id="0x7F12216E" />
-    <public type="string" name="xbox_game_pass_modal_code_header_failed" id="0x7F12216F" />
-    <public type="string" name="xbox_game_pass_modal_header_description_success" id="0x7F122170" />
-    <public type="string" name="xbox_game_pass_modal_header_success" id="0x7F122171" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_body" id="0x7F122172" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_button" id="0x7F122173" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_body" id="0x7F122174" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_title" id="0x7F122175" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_title" id="0x7F122176" />
-    <public type="string" name="xbox_game_pass_promotion_banner_description" id="0x7F122177" />
-    <public type="string" name="xbox_game_pass_promotion_banner_description_expanded" id="0x7F122178" />
-    <public type="string" name="xbox_game_pass_promotion_banner_header" id="0x7F122179" />
-    <public type="string" name="xbox_game_pass_promotion_card_header" id="0x7F12217A" />
-    <public type="string" name="xbox_game_pass_promotion_legalese" id="0x7F12217B" />
-    <public type="string" name="xbox_link" id="0x7F12217C" />
-    <public type="string" name="xbox_pin_step1" id="0x7F12217D" />
-    <public type="string" name="xbox_pin_step2" id="0x7F12217E" />
-    <public type="string" name="xbox_pin_step3" id="0x7F12217F" />
-    <public type="string" name="yearly" id="0x7F122180" />
-    <public type="string" name="yellow" id="0x7F122181" />
-    <public type="string" name="yes_text" id="0x7F122182" />
-    <public type="string" name="your_pin_expires" id="0x7F122183" />
-    <public type="string" name="your_pin_is_expired" id="0x7F122184" />
-    <public type="string" name="youre_viewing_older_messages" id="0x7F122185" />
-    <public type="string" name="zh_cn" id="0x7F122186" />
-    <public type="string" name="zh_tw" id="0x7F122187" />
+    <public type="string" name="explicit_end_ticketed_guild_event_subtitle" id="0x7F12095F" />
+    <public type="string" name="exposed_dropdown_menu_content_description" id="0x7F120960" />
+    <public type="string" name="expression_picker_emoji" id="0x7F120961" />
+    <public type="string" name="expression_picker_gif" id="0x7F120962" />
+    <public type="string" name="expression_picker_intro_tooltip_action" id="0x7F120963" />
+    <public type="string" name="expression_picker_intro_tooltip_body" id="0x7F120964" />
+    <public type="string" name="expression_picker_intro_tooltip_header" id="0x7F120965" />
+    <public type="string" name="expression_picker_open_emoji_picker_a11y_label" id="0x7F120966" />
+    <public type="string" name="expression_picker_open_gif_picker_a11y_label" id="0x7F120967" />
+    <public type="string" name="expression_picker_open_sticker_picker_a11y_label" id="0x7F120968" />
+    <public type="string" name="expression_picker_sticker" id="0x7F120969" />
+    <public type="string" name="expression_suggestions_sticker_name" id="0x7F12096A" />
+    <public type="string" name="expression_suggestions_sticker_short_nav_prompt" id="0x7F12096B" />
+    <public type="string" name="extra_emoji_count" id="0x7F12096C" />
+    <public type="string" name="fab_transformation_scrim_behavior" id="0x7F12096D" />
+    <public type="string" name="fab_transformation_sheet_behavior" id="0x7F12096E" />
+    <public type="string" name="facebook" id="0x7F12096F" />
+    <public type="string" name="failed" id="0x7F120970" />
+    <public type="string" name="fallback_menu_item_copy_link" id="0x7F120971" />
+    <public type="string" name="fallback_menu_item_open_in_browser" id="0x7F120972" />
+    <public type="string" name="fallback_menu_item_share_link" id="0x7F120973" />
+    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7F120974" />
+    <public type="string" name="feedback_describe_issue" id="0x7F120975" />
+    <public type="string" name="feedback_issue_title" id="0x7F120976" />
+    <public type="string" name="feedback_modal_title" id="0x7F120977" />
+    <public type="string" name="feedback_need_more_help" id="0x7F120978" />
+    <public type="string" name="fi" id="0x7F120979" />
+    <public type="string" name="file_rate_kb" id="0x7F12097A" />
+    <public type="string" name="file_rate_mb" id="0x7F12097B" />
+    <public type="string" name="file_size_gb" id="0x7F12097C" />
+    <public type="string" name="file_size_kb" id="0x7F12097D" />
+    <public type="string" name="file_size_mb" id="0x7F12097E" />
+    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7F12097F" />
+    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7F120980" />
+    <public type="string" name="file_upload_limit_staff" id="0x7F120981" />
+    <public type="string" name="file_upload_limit_standard" id="0x7F120982" />
+    <public type="string" name="files_permission_reason" id="0x7F120983" />
+    <public type="string" name="filter" id="0x7F120984" />
+    <public type="string" name="filter_mentions" id="0x7F120985" />
+    <public type="string" name="filter_options" id="0x7F120986" />
+    <public type="string" name="finish_signing_up" id="0x7F120987" />
+    <public type="string" name="firebase_database_url" id="0x7F120988" />
+    <public type="string" name="first_week_survey_button" id="0x7F120989" />
+    <public type="string" name="first_week_survey_prompt" id="0x7F12098A" />
+    <public type="string" name="flash_auto" id="0x7F12098B" />
+    <public type="string" name="flash_off" id="0x7F12098C" />
+    <public type="string" name="flash_on" id="0x7F12098D" />
+    <public type="string" name="flash_torch" id="0x7F12098E" />
+    <public type="string" name="focus_participant" id="0x7F12098F" />
+    <public type="string" name="follow" id="0x7F120990" />
+    <public type="string" name="follow_modal_body" id="0x7F120991" />
+    <public type="string" name="follow_modal_fail" id="0x7F120992" />
+    <public type="string" name="follow_modal_hint" id="0x7F120993" />
+    <public type="string" name="follow_modal_hint_no_perms" id="0x7F120994" />
+    <public type="string" name="follow_modal_title" id="0x7F120995" />
+    <public type="string" name="follow_modal_too_many_webhooks" id="0x7F120996" />
+    <public type="string" name="follow_modal_warning" id="0x7F120997" />
+    <public type="string" name="follow_news_chat_input_message" id="0x7F120998" />
+    <public type="string" name="follow_news_chat_input_subtitle" id="0x7F120999" />
+    <public type="string" name="follow_success_modal_body" id="0x7F12099A" />
+    <public type="string" name="follow_success_modal_header_01" id="0x7F12099B" />
+    <public type="string" name="follow_success_modal_header_02" id="0x7F12099C" />
+    <public type="string" name="follow_success_modal_header_03" id="0x7F12099D" />
+    <public type="string" name="follow_success_modal_header_04" id="0x7F12099E" />
+    <public type="string" name="follow_success_modal_header_05" id="0x7F12099F" />
+    <public type="string" name="follow_success_modal_header_06" id="0x7F1209A0" />
+    <public type="string" name="follow_success_modal_header_07" id="0x7F1209A1" />
+    <public type="string" name="follow_success_modal_header_08" id="0x7F1209A2" />
+    <public type="string" name="follow_success_modal_header_09" id="0x7F1209A3" />
+    <public type="string" name="follow_success_modal_header_10" id="0x7F1209A4" />
+    <public type="string" name="follow_us_for_more_updates" id="0x7F1209A5" />
+    <public type="string" name="follower_analytics" id="0x7F1209A6" />
+    <public type="string" name="follower_analytics_header" id="0x7F1209A7" />
+    <public type="string" name="force_sync" id="0x7F1209A8" />
+    <public type="string" name="forgot_password" id="0x7F1209A9" />
+    <public type="string" name="form_checkbox_aec_dump" id="0x7F1209AA" />
+    <public type="string" name="form_checkbox_connection_log" id="0x7F1209AB" />
+    <public type="string" name="form_checkbox_debug_logging" id="0x7F1209AC" />
+    <public type="string" name="form_checkbox_qos" id="0x7F1209AD" />
+    <public type="string" name="form_description_audio_mode_android_call" id="0x7F1209AE" />
+    <public type="string" name="form_description_audio_mode_android_communication" id="0x7F1209AF" />
+    <public type="string" name="form_description_mobile_guild_notification_all_messages" id="0x7F1209B0" />
+    <public type="string" name="form_description_mobile_guild_notification_only_mentions" id="0x7F1209B1" />
+    <public type="string" name="form_description_mobile_notification_muted" id="0x7F1209B2" />
+    <public type="string" name="form_description_push_afk_timeout" id="0x7F1209B3" />
+    <public type="string" name="form_description_tts" id="0x7F1209B4" />
+    <public type="string" name="form_error_generic" id="0x7F1209B5" />
+    <public type="string" name="form_help_aec_dump" id="0x7F1209B6" />
+    <public type="string" name="form_help_afk_channel" id="0x7F1209B7" />
+    <public type="string" name="form_help_attenuation" id="0x7F1209B8" />
+    <public type="string" name="form_help_auto_archive_duration" id="0x7F1209B9" />
+    <public type="string" name="form_help_automatic_vad" id="0x7F1209BA" />
+    <public type="string" name="form_help_bitrate" id="0x7F1209BB" />
+    <public type="string" name="form_help_certified_voice_processing" id="0x7F1209BC" />
+    <public type="string" name="form_help_channel_permissions" id="0x7F1209BD" />
+    <public type="string" name="form_help_connection_log" id="0x7F1209BE" />
+    <public type="string" name="form_help_debug_logging" id="0x7F1209BF" />
+    <public type="string" name="form_help_default_auto_archive_duration" id="0x7F1209C0" />
+    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7F1209C1" />
+    <public type="string" name="form_help_discoverable_change_time" id="0x7F1209C2" />
+    <public type="string" name="form_help_discovery_cover_image" id="0x7F1209C3" />
+    <public type="string" name="form_help_enable_discoverable" id="0x7F1209C4" />
+    <public type="string" name="form_help_explicit_content_filter" id="0x7F1209C5" />
+    <public type="string" name="form_help_hardware_h264" id="0x7F1209C6" />
+    <public type="string" name="form_help_instant_invite_channel" id="0x7F1209C7" />
+    <public type="string" name="form_help_last_seen" id="0x7F1209C8" />
+    <public type="string" name="form_help_last_seen_with_roles" id="0x7F1209C9" />
+    <public type="string" name="form_help_news" id="0x7F1209CA" />
+    <public type="string" name="form_help_news_android" id="0x7F1209CB" />
+    <public type="string" name="form_help_nsfw" id="0x7F1209CC" />
+    <public type="string" name="form_help_open_h264" id="0x7F1209CD" />
+    <public type="string" name="form_help_qos" id="0x7F1209CE" />
+    <public type="string" name="form_help_region_override" id="0x7F1209CF" />
+    <public type="string" name="form_help_server_banner" id="0x7F1209D0" />
+    <public type="string" name="form_help_server_description" id="0x7F1209D1" />
+    <public type="string" name="form_help_server_language" id="0x7F1209D2" />
+    <public type="string" name="form_help_slowmode" id="0x7F1209D3" />
+    <public type="string" name="form_help_system_channel" id="0x7F1209D4" />
+    <public type="string" name="form_help_system_channel_guild_reminders" id="0x7F1209D5" />
+    <public type="string" name="form_help_system_channel_join_messages" id="0x7F1209D6" />
+    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7F1209D7" />
+    <public type="string" name="form_help_temporary" id="0x7F1209D8" />
+    <public type="string" name="form_help_user_limit" id="0x7F1209D9" />
+    <public type="string" name="form_help_verification_level" id="0x7F1209DA" />
+    <public type="string" name="form_help_video_quality_mode" id="0x7F1209DB" />
+    <public type="string" name="form_help_voice_video_troubleshooting_guide" id="0x7F1209DC" />
+    <public type="string" name="form_label_account_information" id="0x7F1209DD" />
+    <public type="string" name="form_label_afk_channel" id="0x7F1209DE" />
+    <public type="string" name="form_label_afk_timeout" id="0x7F1209DF" />
+    <public type="string" name="form_label_all" id="0x7F1209E0" />
+    <public type="string" name="form_label_all_messages" id="0x7F1209E1" />
+    <public type="string" name="form_label_all_messages_short" id="0x7F1209E2" />
+    <public type="string" name="form_label_android_opensl" id="0x7F1209E3" />
+    <public type="string" name="form_label_android_opensl_default" id="0x7F1209E4" />
+    <public type="string" name="form_label_android_opensl_default_desc" id="0x7F1209E5" />
+    <public type="string" name="form_label_android_opensl_desc" id="0x7F1209E6" />
+    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7F1209E7" />
+    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7F1209E8" />
+    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7F1209E9" />
+    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7F1209EA" />
+    <public type="string" name="form_label_attenuation" id="0x7F1209EB" />
+    <public type="string" name="form_label_audio_mode_android" id="0x7F1209EC" />
+    <public type="string" name="form_label_audio_mode_android_call" id="0x7F1209ED" />
+    <public type="string" name="form_label_audio_mode_android_communication" id="0x7F1209EE" />
+    <public type="string" name="form_label_automatic_vad" id="0x7F1209EF" />
+    <public type="string" name="form_label_automatic_vad_mobile" id="0x7F1209F0" />
+    <public type="string" name="form_label_avatar_size" id="0x7F1209F1" />
+    <public type="string" name="form_label_bitrate" id="0x7F1209F2" />
+    <public type="string" name="form_label_category_permissions" id="0x7F1209F3" />
+    <public type="string" name="form_label_channel_name" id="0x7F1209F4" />
+    <public type="string" name="form_label_channel_notifcation_settings" id="0x7F1209F5" />
+    <public type="string" name="form_label_channel_permissions" id="0x7F1209F6" />
+    <public type="string" name="form_label_channel_topic" id="0x7F1209F7" />
+    <public type="string" name="form_label_channel_voice_permissions" id="0x7F1209F8" />
+    <public type="string" name="form_label_current_password" id="0x7F1209F9" />
+    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7F1209FA" />
+    <public type="string" name="form_label_debug" id="0x7F1209FB" />
+    <public type="string" name="form_label_default" id="0x7F1209FC" />
+    <public type="string" name="form_label_default_auto_archive_duration_off" id="0x7F1209FD" />
+    <public type="string" name="form_label_default_notification_settings" id="0x7F1209FE" />
+    <public type="string" name="form_label_delete_message_history" id="0x7F1209FF" />
+    <public type="string" name="form_label_desktop_only" id="0x7F120A00" />
+    <public type="string" name="form_label_disabled_for_everyone" id="0x7F120A01" />
+    <public type="string" name="form_label_discovery_cover_image" id="0x7F120A02" />
+    <public type="string" name="form_label_discovery_rules_channel" id="0x7F120A03" />
+    <public type="string" name="form_label_display_names" id="0x7F120A04" />
+    <public type="string" name="form_label_display_users" id="0x7F120A05" />
+    <public type="string" name="form_label_email" id="0x7F120A06" />
+    <public type="string" name="form_label_email_or_phone_number" id="0x7F120A07" />
+    <public type="string" name="form_label_expire_grace_period" id="0x7F120A08" />
+    <public type="string" name="form_label_explicit_content_filter" id="0x7F120A09" />
+    <public type="string" name="form_label_hoist_description" id="0x7F120A0A" />
+    <public type="string" name="form_label_input" id="0x7F120A0B" />
+    <public type="string" name="form_label_input_device" id="0x7F120A0C" />
+    <public type="string" name="form_label_input_mode" id="0x7F120A0D" />
+    <public type="string" name="form_label_input_sensitivty" id="0x7F120A0E" />
+    <public type="string" name="form_label_input_volume" id="0x7F120A0F" />
+    <public type="string" name="form_label_instant_invite" id="0x7F120A10" />
+    <public type="string" name="form_label_instant_invite_channel" id="0x7F120A11" />
+    <public type="string" name="form_label_invite_link" id="0x7F120A12" />
+    <public type="string" name="form_label_json_api" id="0x7F120A13" />
+    <public type="string" name="form_label_last_seen" id="0x7F120A14" />
+    <public type="string" name="form_label_max_age" id="0x7F120A15" />
+    <public type="string" name="form_label_max_uses" id="0x7F120A16" />
+    <public type="string" name="form_label_member_add" id="0x7F120A17" />
+    <public type="string" name="form_label_membership_expire_behavior" id="0x7F120A18" />
+    <public type="string" name="form_label_mentionable" id="0x7F120A19" />
+    <public type="string" name="form_label_mentionable_description" id="0x7F120A1A" />
+    <public type="string" name="form_label_mentions" id="0x7F120A1B" />
+    <public type="string" name="form_label_mobile_category_muted" id="0x7F120A1C" />
+    <public type="string" name="form_label_mobile_category_muted_until" id="0x7F120A1D" />
+    <public type="string" name="form_label_mobile_category_override_mute" id="0x7F120A1E" />
+    <public type="string" name="form_label_mobile_channel_muted" id="0x7F120A1F" />
+    <public type="string" name="form_label_mobile_channel_muted_until" id="0x7F120A20" />
+    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7F120A21" />
+    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7F120A22" />
+    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7F120A23" />
+    <public type="string" name="form_label_mobile_dm_muted" id="0x7F120A24" />
+    <public type="string" name="form_label_mobile_dm_muted_until" id="0x7F120A25" />
+    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7F120A26" />
+    <public type="string" name="form_label_mobile_notifications_blink" id="0x7F120A27" />
+    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7F120A28" />
+    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7F120A29" />
+    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7F120A2A" />
+    <public type="string" name="form_label_mobile_notifications_label" id="0x7F120A2B" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7F120A2C" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7F120A2D" />
+    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7F120A2E" />
+    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7F120A2F" />
+    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7F120A30" />
+    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7F120A31" />
+    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7F120A32" />
+    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7F120A33" />
+    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7F120A34" />
+    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7F120A35" />
+    <public type="string" name="form_label_mobile_push_notifications" id="0x7F120A36" />
+    <public type="string" name="form_label_mobile_server_muted" id="0x7F120A37" />
+    <public type="string" name="form_label_mobile_server_muted_until" id="0x7F120A38" />
+    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7F120A39" />
+    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7F120A3A" />
+    <public type="string" name="form_label_mute_server" id="0x7F120A3B" />
+    <public type="string" name="form_label_mute_server_description" id="0x7F120A3C" />
+    <public type="string" name="form_label_muted" id="0x7F120A3D" />
+    <public type="string" name="form_label_new_password" id="0x7F120A3E" />
+    <public type="string" name="form_label_news_channel" id="0x7F120A3F" />
+    <public type="string" name="form_label_nothing" id="0x7F120A40" />
+    <public type="string" name="form_label_notification_frequency" id="0x7F120A41" />
+    <public type="string" name="form_label_notification_position" id="0x7F120A42" />
+    <public type="string" name="form_label_nsfw_channel" id="0x7F120A43" />
+    <public type="string" name="form_label_off" id="0x7F120A44" />
+    <public type="string" name="form_label_only_mentions" id="0x7F120A45" />
+    <public type="string" name="form_label_only_mentions_short" id="0x7F120A46" />
+    <public type="string" name="form_label_output" id="0x7F120A47" />
+    <public type="string" name="form_label_output_device" id="0x7F120A48" />
+    <public type="string" name="form_label_output_volume" id="0x7F120A49" />
+    <public type="string" name="form_label_overlay_chat_opacity" id="0x7F120A4A" />
+    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7F120A4B" />
+    <public type="string" name="form_label_password" id="0x7F120A4C" />
+    <public type="string" name="form_label_phone_number" id="0x7F120A4D" />
+    <public type="string" name="form_label_premade_widget" id="0x7F120A4E" />
+    <public type="string" name="form_label_push_afk_timeout" id="0x7F120A4F" />
+    <public type="string" name="form_label_qos" id="0x7F120A50" />
+    <public type="string" name="form_label_reason_ban" id="0x7F120A51" />
+    <public type="string" name="form_label_reason_kick" id="0x7F120A52" />
+    <public type="string" name="form_label_region_override" id="0x7F120A53" />
+    <public type="string" name="form_label_report_reason" id="0x7F120A54" />
+    <public type="string" name="form_label_role_add" id="0x7F120A55" />
+    <public type="string" name="form_label_role_color" id="0x7F120A56" />
+    <public type="string" name="form_label_role_enter_name" id="0x7F120A57" />
+    <public type="string" name="form_label_role_name" id="0x7F120A58" />
+    <public type="string" name="form_label_role_settings" id="0x7F120A59" />
+    <public type="string" name="form_label_roles_pro_tip" id="0x7F120A5A" />
+    <public type="string" name="form_label_roles_pro_tip_description" id="0x7F120A5B" />
+    <public type="string" name="form_label_screenshare" id="0x7F120A5C" />
+    <public type="string" name="form_label_select_channel" id="0x7F120A5D" />
+    <public type="string" name="form_label_send_to" id="0x7F120A5E" />
+    <public type="string" name="form_label_sensitivty" id="0x7F120A5F" />
+    <public type="string" name="form_label_server_banner" id="0x7F120A60" />
+    <public type="string" name="form_label_server_description" id="0x7F120A61" />
+    <public type="string" name="form_label_server_id" id="0x7F120A62" />
+    <public type="string" name="form_label_server_language" id="0x7F120A63" />
+    <public type="string" name="form_label_server_name" id="0x7F120A64" />
+    <public type="string" name="form_label_server_notification_settings" id="0x7F120A65" />
+    <public type="string" name="form_label_server_region" id="0x7F120A66" />
+    <public type="string" name="form_label_shortcut" id="0x7F120A67" />
+    <public type="string" name="form_label_slowmode" id="0x7F120A68" />
+    <public type="string" name="form_label_slowmode_cooldown" id="0x7F120A69" />
+    <public type="string" name="form_label_slowmode_off" id="0x7F120A6A" />
+    <public type="string" name="form_label_stream_volume" id="0x7F120A6B" />
+    <public type="string" name="form_label_sub_expire_behavior" id="0x7F120A6C" />
+    <public type="string" name="form_label_subsystem" id="0x7F120A6D" />
+    <public type="string" name="form_label_suppress_everyone" id="0x7F120A6E" />
+    <public type="string" name="form_label_suppress_roles" id="0x7F120A6F" />
+    <public type="string" name="form_label_synced_members" id="0x7F120A70" />
+    <public type="string" name="form_label_synced_role" id="0x7F120A71" />
+    <public type="string" name="form_label_synced_subs" id="0x7F120A72" />
+    <public type="string" name="form_label_system_channel" id="0x7F120A73" />
+    <public type="string" name="form_label_system_channel_settings" id="0x7F120A74" />
+    <public type="string" name="form_label_temporary" id="0x7F120A75" />
+    <public type="string" name="form_label_test_microphone" id="0x7F120A76" />
+    <public type="string" name="form_label_tts" id="0x7F120A77" />
+    <public type="string" name="form_label_tts_notifications" id="0x7F120A78" />
+    <public type="string" name="form_label_unmute_server" id="0x7F120A79" />
+    <public type="string" name="form_label_use_rich_chat_box" id="0x7F120A7A" />
+    <public type="string" name="form_label_user_limit" id="0x7F120A7B" />
+    <public type="string" name="form_label_username" id="0x7F120A7C" />
+    <public type="string" name="form_label_username_mobile" id="0x7F120A7D" />
+    <public type="string" name="form_label_verification_level" id="0x7F120A7E" />
+    <public type="string" name="form_label_video_device" id="0x7F120A7F" />
+    <public type="string" name="form_label_video_preview" id="0x7F120A80" />
+    <public type="string" name="form_label_video_quality" id="0x7F120A81" />
+    <public type="string" name="form_label_voice_diagnostics" id="0x7F120A82" />
+    <public type="string" name="form_label_voice_processing" id="0x7F120A83" />
+    <public type="string" name="form_label_volume" id="0x7F120A84" />
+    <public type="string" name="form_placeholder_server_name" id="0x7F120A85" />
+    <public type="string" name="form_placeholder_username" id="0x7F120A86" />
+    <public type="string" name="form_private_thread_description" id="0x7F120A87" />
+    <public type="string" name="form_report_help_text" id="0x7F120A88" />
+    <public type="string" name="form_thread_auto_archive_section_label" id="0x7F120A89" />
+    <public type="string" name="form_thread_name_hint" id="0x7F120A8A" />
+    <public type="string" name="form_thread_name_placeholder" id="0x7F120A8B" />
+    <public type="string" name="form_thread_name_required_error" id="0x7F120A8C" />
+    <public type="string" name="form_thread_private_thread_description" id="0x7F120A8D" />
+    <public type="string" name="form_thread_private_thread_section_label" id="0x7F120A8E" />
+    <public type="string" name="form_thread_starter_message_placeholder" id="0x7F120A8F" />
+    <public type="string" name="form_thread_starter_message_section_label" id="0x7F120A90" />
+    <public type="string" name="form_warning_input_sensitivty" id="0x7F120A91" />
+    <public type="string" name="form_warning_video_preview" id="0x7F120A92" />
+    <public type="string" name="fr" id="0x7F120A93" />
+    <public type="string" name="friend_has_been_deleted" id="0x7F120A94" />
+    <public type="string" name="friend_nickname" id="0x7F120A95" />
+    <public type="string" name="friend_nickname_description" id="0x7F120A96" />
+    <public type="string" name="friend_permitted_source" id="0x7F120A97" />
+    <public type="string" name="friend_permitted_source_all" id="0x7F120A98" />
+    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7F120A99" />
+    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7F120A9A" />
+    <public type="string" name="friend_request_accept" id="0x7F120A9B" />
+    <public type="string" name="friend_request_cancel" id="0x7F120A9C" />
+    <public type="string" name="friend_request_cancelled" id="0x7F120A9D" />
+    <public type="string" name="friend_request_failed_body" id="0x7F120A9E" />
+    <public type="string" name="friend_request_failed_body_names" id="0x7F120A9F" />
+    <public type="string" name="friend_request_failed_header" id="0x7F120AA0" />
+    <public type="string" name="friend_request_ignore" id="0x7F120AA1" />
+    <public type="string" name="friend_request_ignored" id="0x7F120AA2" />
+    <public type="string" name="friend_request_rate_limited_body" id="0x7F120AA3" />
+    <public type="string" name="friend_request_rate_limited_button" id="0x7F120AA4" />
+    <public type="string" name="friend_request_rate_limited_header" id="0x7F120AA5" />
+    <public type="string" name="friend_request_received" id="0x7F120AA6" />
+    <public type="string" name="friend_request_requires_email_validation_body" id="0x7F120AA7" />
+    <public type="string" name="friend_request_requires_email_validation_button" id="0x7F120AA8" />
+    <public type="string" name="friend_request_requires_email_validation_header" id="0x7F120AA9" />
+    <public type="string" name="friend_request_sent" id="0x7F120AAA" />
+    <public type="string" name="friends" id="0x7F120AAB" />
+    <public type="string" name="friends_all_header" id="0x7F120AAC" />
+    <public type="string" name="friends_blocked_header" id="0x7F120AAD" />
+    <public type="string" name="friends_column_name" id="0x7F120AAE" />
+    <public type="string" name="friends_column_status" id="0x7F120AAF" />
+    <public type="string" name="friends_empty_state_all" id="0x7F120AB0" />
+    <public type="string" name="friends_empty_state_all_body" id="0x7F120AB1" />
+    <public type="string" name="friends_empty_state_all_cta" id="0x7F120AB2" />
+    <public type="string" name="friends_empty_state_all_header" id="0x7F120AB3" />
+    <public type="string" name="friends_empty_state_blocked" id="0x7F120AB4" />
+    <public type="string" name="friends_empty_state_copy" id="0x7F120AB5" />
+    <public type="string" name="friends_empty_state_friend_suggestions_copy" id="0x7F120AB6" />
+    <public type="string" name="friends_empty_state_online" id="0x7F120AB7" />
+    <public type="string" name="friends_empty_state_pending" id="0x7F120AB8" />
+    <public type="string" name="friends_empty_state_pending_friends_copy" id="0x7F120AB9" />
+    <public type="string" name="friends_empty_state_subtitle" id="0x7F120ABA" />
+    <public type="string" name="friends_friend_suggestions_header" id="0x7F120ABB" />
+    <public type="string" name="friends_offline_header" id="0x7F120ABC" />
+    <public type="string" name="friends_online_header" id="0x7F120ABD" />
+    <public type="string" name="friends_pending_header" id="0x7F120ABE" />
+    <public type="string" name="friends_pending_request_expand" id="0x7F120ABF" />
+    <public type="string" name="friends_pending_request_expand_collapse" id="0x7F120AC0" />
+    <public type="string" name="friends_pending_request_header" id="0x7F120AC1" />
+    <public type="string" name="friends_request_status_incoming" id="0x7F120AC2" />
+    <public type="string" name="friends_request_status_outgoing" id="0x7F120AC3" />
+    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7F120AC4" />
+    <public type="string" name="friends_row_action_button_accessibility_label_accept_suggestion" id="0x7F120AC5" />
+    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7F120AC6" />
+    <public type="string" name="friends_row_action_button_accessibility_label_cancel" id="0x7F120AC7" />
+    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7F120AC8" />
+    <public type="string" name="friends_row_action_button_accessibility_label_ignore_suggestion" id="0x7F120AC9" />
+    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7F120ACA" />
+    <public type="string" name="friends_section_add_friend" id="0x7F120ACB" />
+    <public type="string" name="friends_section_all" id="0x7F120ACC" />
+    <public type="string" name="friends_section_online" id="0x7F120ACD" />
+    <public type="string" name="friends_section_pending" id="0x7F120ACE" />
+    <public type="string" name="friends_share" id="0x7F120ACF" />
+    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7F120AD0" />
+    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7F120AD1" />
+    <public type="string" name="friends_share_tabbar_title" id="0x7F120AD2" />
+    <public type="string" name="full" id="0x7F120AD3" />
+    <public type="string" name="full_screen" id="0x7F120AD4" />
+    <public type="string" name="game_action_button_add_to_library" id="0x7F120AD5" />
+    <public type="string" name="game_action_button_cannot_install" id="0x7F120AD6" />
+    <public type="string" name="game_action_button_downloading" id="0x7F120AD7" />
+    <public type="string" name="game_action_button_game_not_detected" id="0x7F120AD8" />
+    <public type="string" name="game_action_button_install" id="0x7F120AD9" />
+    <public type="string" name="game_action_button_locate" id="0x7F120ADA" />
+    <public type="string" name="game_action_button_login_to_buy" id="0x7F120ADB" />
+    <public type="string" name="game_action_button_now_playing" id="0x7F120ADC" />
+    <public type="string" name="game_action_button_paused" id="0x7F120ADD" />
+    <public type="string" name="game_action_button_play" id="0x7F120ADE" />
+    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7F120ADF" />
+    <public type="string" name="game_action_button_preorder_wait" id="0x7F120AE0" />
+    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7F120AE1" />
+    <public type="string" name="game_action_button_queued" id="0x7F120AE2" />
+    <public type="string" name="game_action_button_restricted_in_region" id="0x7F120AE3" />
+    <public type="string" name="game_action_button_unavailable" id="0x7F120AE4" />
+    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7F120AE5" />
+    <public type="string" name="game_action_button_uninstalling_1" id="0x7F120AE6" />
+    <public type="string" name="game_action_button_uninstalling_10" id="0x7F120AE7" />
+    <public type="string" name="game_action_button_uninstalling_2" id="0x7F120AE8" />
+    <public type="string" name="game_action_button_uninstalling_3" id="0x7F120AE9" />
+    <public type="string" name="game_action_button_uninstalling_4" id="0x7F120AEA" />
+    <public type="string" name="game_action_button_uninstalling_5" id="0x7F120AEB" />
+    <public type="string" name="game_action_button_uninstalling_6" id="0x7F120AEC" />
+    <public type="string" name="game_action_button_uninstalling_7" id="0x7F120AED" />
+    <public type="string" name="game_action_button_uninstalling_8" id="0x7F120AEE" />
+    <public type="string" name="game_action_button_uninstalling_9" id="0x7F120AEF" />
+    <public type="string" name="game_action_button_update" id="0x7F120AF0" />
+    <public type="string" name="game_action_button_view_in_store" id="0x7F120AF1" />
+    <public type="string" name="game_activity" id="0x7F120AF2" />
+    <public type="string" name="game_detected" id="0x7F120AF3" />
+    <public type="string" name="game_detection_open_settings" id="0x7F120AF4" />
+    <public type="string" name="game_detection_service" id="0x7F120AF5" />
+    <public type="string" name="game_feed_activity_action_play" id="0x7F120AF6" />
+    <public type="string" name="game_feed_activity_playing_xbox" id="0x7F120AF7" />
+    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7F120AF8" />
+    <public type="string" name="game_feed_current_header_title" id="0x7F120AF9" />
+    <public type="string" name="game_feed_unknown_player" id="0x7F120AFA" />
+    <public type="string" name="game_feed_unknown_players" id="0x7F120AFB" />
+    <public type="string" name="game_feed_user_played_days_ago" id="0x7F120AFC" />
+    <public type="string" name="game_feed_user_played_hours_ago" id="0x7F120AFD" />
+    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7F120AFE" />
+    <public type="string" name="game_feed_user_played_months_ago" id="0x7F120AFF" />
+    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7F120B00" />
+    <public type="string" name="game_feed_user_played_years_ago" id="0x7F120B01" />
+    <public type="string" name="game_feed_user_playing_for_days" id="0x7F120B02" />
+    <public type="string" name="game_feed_user_playing_for_hours" id="0x7F120B03" />
+    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7F120B04" />
+    <public type="string" name="game_feed_user_playing_just_ended" id="0x7F120B05" />
+    <public type="string" name="game_feed_user_playing_just_started" id="0x7F120B06" />
+    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7F120B07" />
+    <public type="string" name="game_library_last_played_days" id="0x7F120B08" />
+    <public type="string" name="game_library_last_played_hours" id="0x7F120B09" />
+    <public type="string" name="game_library_last_played_just_now" id="0x7F120B0A" />
+    <public type="string" name="game_library_last_played_minutes" id="0x7F120B0B" />
+    <public type="string" name="game_library_last_played_months" id="0x7F120B0C" />
+    <public type="string" name="game_library_last_played_none" id="0x7F120B0D" />
+    <public type="string" name="game_library_last_played_playing_now" id="0x7F120B0E" />
+    <public type="string" name="game_library_last_played_weeks" id="0x7F120B0F" />
+    <public type="string" name="game_library_last_played_years" id="0x7F120B10" />
+    <public type="string" name="game_library_list_header_last_played" id="0x7F120B11" />
+    <public type="string" name="game_library_list_header_name" id="0x7F120B12" />
+    <public type="string" name="game_library_list_header_platform" id="0x7F120B13" />
+    <public type="string" name="game_library_new" id="0x7F120B14" />
+    <public type="string" name="game_library_not_applicable" id="0x7F120B15" />
+    <public type="string" name="game_library_notification_game_installed_body" id="0x7F120B16" />
+    <public type="string" name="game_library_notification_game_installed_title" id="0x7F120B17" />
+    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7F120B18" />
+    <public type="string" name="game_library_private_tooltip" id="0x7F120B19" />
+    <public type="string" name="game_library_time_played_hours" id="0x7F120B1A" />
+    <public type="string" name="game_library_time_played_minutes" id="0x7F120B1B" />
+    <public type="string" name="game_library_time_played_none" id="0x7F120B1C" />
+    <public type="string" name="game_library_time_played_seconds" id="0x7F120B1D" />
+    <public type="string" name="game_library_updates_action_move_up" id="0x7F120B1E" />
+    <public type="string" name="game_library_updates_action_pause" id="0x7F120B1F" />
+    <public type="string" name="game_library_updates_action_remove" id="0x7F120B20" />
+    <public type="string" name="game_library_updates_action_resume" id="0x7F120B21" />
+    <public type="string" name="game_library_updates_header_disk" id="0x7F120B22" />
+    <public type="string" name="game_library_updates_header_network" id="0x7F120B23" />
+    <public type="string" name="game_library_updates_installing" id="0x7F120B24" />
+    <public type="string" name="game_library_updates_installing_hours" id="0x7F120B25" />
+    <public type="string" name="game_library_updates_installing_minutes" id="0x7F120B26" />
+    <public type="string" name="game_library_updates_installing_seconds" id="0x7F120B27" />
+    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7F120B28" />
+    <public type="string" name="game_library_updates_progress_finalizing" id="0x7F120B29" />
+    <public type="string" name="game_library_updates_progress_finished" id="0x7F120B2A" />
+    <public type="string" name="game_library_updates_progress_paused" id="0x7F120B2B" />
+    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7F120B2C" />
+    <public type="string" name="game_library_updates_progress_pausing" id="0x7F120B2D" />
+    <public type="string" name="game_library_updates_progress_planning" id="0x7F120B2E" />
+    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7F120B2F" />
+    <public type="string" name="game_library_updates_progress_queued" id="0x7F120B30" />
+    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7F120B31" />
+    <public type="string" name="game_library_updates_progress_repairing" id="0x7F120B32" />
+    <public type="string" name="game_library_updates_progress_verifying" id="0x7F120B33" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7F120B34" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7F120B35" />
+    <public type="string" name="game_library_updates_updating" id="0x7F120B36" />
+    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7F120B37" />
+    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7F120B38" />
+    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7F120B39" />
+    <public type="string" name="game_popout_follow" id="0x7F120B3A" />
+    <public type="string" name="game_popout_nitro_upsell" id="0x7F120B3B" />
+    <public type="string" name="game_popout_view_server" id="0x7F120B3C" />
+    <public type="string" name="gcm_defaultSenderId" id="0x7F120B3D" />
+    <public type="string" name="general_permissions" id="0x7F120B3E" />
+    <public type="string" name="generate_a_new_link" id="0x7F120B3F" />
+    <public type="string" name="generic_actions_menu_label" id="0x7F120B40" />
+    <public type="string" name="generic_error_body" id="0x7F120B41" />
+    <public type="string" name="generic_error_title" id="0x7F120B42" />
+    <public type="string" name="get_mobile_app" id="0x7F120B43" />
+    <public type="string" name="get_mobile_app_cta" id="0x7F120B44" />
+    <public type="string" name="get_mobile_app_skip" id="0x7F120B45" />
+    <public type="string" name="get_mobile_app_subtitle" id="0x7F120B46" />
+    <public type="string" name="get_started" id="0x7F120B47" />
+    <public type="string" name="gif" id="0x7F120B48" />
+    <public type="string" name="gif_auto_play_label" id="0x7F120B49" />
+    <public type="string" name="gif_auto_play_label_mobile" id="0x7F120B4A" />
+    <public type="string" name="gif_button_label" id="0x7F120B4B" />
+    <public type="string" name="gif_picker_enter_search" id="0x7F120B4C" />
+    <public type="string" name="gif_picker_favorites" id="0x7F120B4D" />
+    <public type="string" name="gif_picker_related_search" id="0x7F120B4E" />
+    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7F120B4F" />
+    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7F120B50" />
+    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7F120B51" />
+    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7F120B52" />
+    <public type="string" name="gift_code_auth_accept" id="0x7F120B53" />
+    <public type="string" name="gift_code_auth_accepting" id="0x7F120B54" />
+    <public type="string" name="gift_code_auth_check_verification_again" id="0x7F120B55" />
+    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7F120B56" />
+    <public type="string" name="gift_code_auth_fetching_user" id="0x7F120B57" />
+    <public type="string" name="gift_code_auth_gifted" id="0x7F120B58" />
+    <public type="string" name="gift_code_auth_gifted_by" id="0x7F120B59" />
+    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7F120B5A" />
+    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7F120B5B" />
+    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7F120B5C" />
+    <public type="string" name="gift_code_auth_help_text_owned" id="0x7F120B5D" />
+    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7F120B5E" />
+    <public type="string" name="gift_code_auth_invalid_body" id="0x7F120B5F" />
+    <public type="string" name="gift_code_auth_invalid_tip" id="0x7F120B60" />
+    <public type="string" name="gift_code_auth_invalid_title" id="0x7F120B61" />
+    <public type="string" name="gift_code_auth_logged_in_as" id="0x7F120B62" />
+    <public type="string" name="gift_code_auth_resolving" id="0x7F120B63" />
+    <public type="string" name="gift_code_auth_verification_sent" id="0x7F120B64" />
+    <public type="string" name="gift_code_auth_verification_title" id="0x7F120B65" />
+    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7F120B66" />
+    <public type="string" name="gift_code_hint" id="0x7F120B67" />
+    <public type="string" name="gift_confirmation_body_claimed" id="0x7F120B68" />
+    <public type="string" name="gift_confirmation_body_confirm" id="0x7F120B69" />
+    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7F120B6A" />
+    <public type="string" name="gift_confirmation_body_confirm_nitro_disclaimer" id="0x7F120B6B" />
+    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7F120B6C" />
+    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7F120B6D" />
+    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7F120B6E" />
+    <public type="string" name="gift_confirmation_body_invalid" id="0x7F120B6F" />
+    <public type="string" name="gift_confirmation_body_owned" id="0x7F120B70" />
+    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7F120B71" />
+    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7F120B72" />
+    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7F120B73" />
+    <public type="string" name="gift_confirmation_body_success" id="0x7F120B74" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7F120B75" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7F120B76" />
+    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7F120B77" />
+    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7F120B78" />
+    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7F120B79" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7F120B7A" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7F120B7B" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7F120B7C" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7F120B7D" />
+    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7F120B7E" />
+    <public type="string" name="gift_confirmation_button_confirm" id="0x7F120B7F" />
+    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7F120B80" />
+    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7F120B81" />
+    <public type="string" name="gift_confirmation_button_fail" id="0x7F120B82" />
+    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7F120B83" />
+    <public type="string" name="gift_confirmation_button_noice" id="0x7F120B84" />
+    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7F120B85" />
+    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7F120B86" />
+    <public type="string" name="gift_confirmation_header_confirm" id="0x7F120B87" />
+    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7F120B88" />
+    <public type="string" name="gift_confirmation_header_fail" id="0x7F120B89" />
+    <public type="string" name="gift_confirmation_header_success" id="0x7F120B8A" />
+    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7F120B8B" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7F120B8C" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7F120B8D" />
+    <public type="string" name="gift_embed_body_claimed_other" id="0x7F120B8E" />
+    <public type="string" name="gift_embed_body_claimed_self" id="0x7F120B8F" />
+    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7F120B90" />
+    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7F120B91" />
+    <public type="string" name="gift_embed_body_default" id="0x7F120B92" />
+    <public type="string" name="gift_embed_body_giveaway" id="0x7F120B93" />
+    <public type="string" name="gift_embed_body_no_user_default" id="0x7F120B94" />
+    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7F120B95" />
+    <public type="string" name="gift_embed_body_owned" id="0x7F120B96" />
+    <public type="string" name="gift_embed_body_owned_mobile" id="0x7F120B97" />
+    <public type="string" name="gift_embed_body_requires_verification" id="0x7F120B98" />
+    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7F120B99" />
+    <public type="string" name="gift_embed_body_self" id="0x7F120B9A" />
+    <public type="string" name="gift_embed_body_self_not_redeemable" id="0x7F120B9B" />
+    <public type="string" name="gift_embed_body_subscription_already_active" id="0x7F120B9C" />
+    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7F120B9D" />
+    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7F120B9E" />
+    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7F120B9F" />
+    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7F120BA0" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7F120BA1" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7F120BA2" />
+    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7F120BA3" />
+    <public type="string" name="gift_embed_button_accept" id="0x7F120BA4" />
+    <public type="string" name="gift_embed_button_cant_accept" id="0x7F120BA5" />
+    <public type="string" name="gift_embed_button_claimed" id="0x7F120BA6" />
+    <public type="string" name="gift_embed_button_claiming" id="0x7F120BA7" />
+    <public type="string" name="gift_embed_button_owned" id="0x7F120BA8" />
+    <public type="string" name="gift_embed_copies_left" id="0x7F120BA9" />
+    <public type="string" name="gift_embed_expiration" id="0x7F120BAA" />
+    <public type="string" name="gift_embed_header_owner_invalid" id="0x7F120BAB" />
+    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7F120BAC" />
+    <public type="string" name="gift_embed_info_owner_invalid" id="0x7F120BAD" />
+    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7F120BAE" />
+    <public type="string" name="gift_embed_invalid" id="0x7F120BAF" />
+    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7F120BB0" />
+    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7F120BB1" />
+    <public type="string" name="gift_embed_invalid_title_other" id="0x7F120BB2" />
+    <public type="string" name="gift_embed_invalid_title_self" id="0x7F120BB3" />
+    <public type="string" name="gift_embed_resolving" id="0x7F120BB4" />
+    <public type="string" name="gift_embed_subscriptions_left" id="0x7F120BB5" />
+    <public type="string" name="gift_embed_title" id="0x7F120BB6" />
+    <public type="string" name="gift_embed_title_self" id="0x7F120BB7" />
+    <public type="string" name="gift_embed_title_subscription" id="0x7F120BB8" />
+    <public type="string" name="gift_embed_title_subscription_self" id="0x7F120BB9" />
+    <public type="string" name="gift_inventory" id="0x7F120BBA" />
+    <public type="string" name="gift_inventory_copies" id="0x7F120BBB" />
+    <public type="string" name="gift_inventory_expires_in" id="0x7F120BBC" />
+    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7F120BBD" />
+    <public type="string" name="gift_inventory_generate_help" id="0x7F120BBE" />
+    <public type="string" name="gift_inventory_generate_link" id="0x7F120BBF" />
+    <public type="string" name="gift_inventory_generate_link_ios" id="0x7F120BC0" />
+    <public type="string" name="gift_inventory_gifts_you_purchased" id="0x7F120BC1" />
+    <public type="string" name="gift_inventory_hidden" id="0x7F120BC2" />
+    <public type="string" name="gift_inventory_no_gifts" id="0x7F120BC3" />
+    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7F120BC4" />
+    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7F120BC5" />
+    <public type="string" name="gift_inventory_redeem_codes" id="0x7F120BC6" />
+    <public type="string" name="gift_inventory_select_nitro_classic_gift" id="0x7F120BC7" />
+    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7F120BC8" />
+    <public type="string" name="gift_inventory_subscription_months" id="0x7F120BC9" />
+    <public type="string" name="gift_inventory_subscription_years" id="0x7F120BCA" />
+    <public type="string" name="gift_inventory_your_gifts" id="0x7F120BCB" />
+    <public type="string" name="gift_purchase_google_play_notice" id="0x7F120BCC" />
+    <public type="string" name="gift_purchase_google_play_notice_extended" id="0x7F120BCD" />
+    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7F120BCE" />
+    <public type="string" name="go_live_hey" id="0x7F120BCF" />
+    <public type="string" name="go_live_listen" id="0x7F120BD0" />
+    <public type="string" name="go_live_look" id="0x7F120BD1" />
+    <public type="string" name="go_live_modal_application_form_title" id="0x7F120BD2" />
+    <public type="string" name="go_live_modal_applications" id="0x7F120BD3" />
+    <public type="string" name="go_live_modal_cta" id="0x7F120BD4" />
+    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7F120BD5" />
+    <public type="string" name="go_live_modal_description" id="0x7F120BD6" />
+    <public type="string" name="go_live_modal_description_generic" id="0x7F120BD7" />
+    <public type="string" name="go_live_modal_description_select_source" id="0x7F120BD8" />
+    <public type="string" name="go_live_modal_guild_form_title" id="0x7F120BD9" />
+    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7F120BDA" />
+    <public type="string" name="go_live_modal_overflow_three_users" id="0x7F120BDB" />
+    <public type="string" name="go_live_modal_overflow_two_users" id="0x7F120BDC" />
+    <public type="string" name="go_live_modal_screens" id="0x7F120BDD" />
+    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7F120BDE" />
+    <public type="string" name="go_live_modal_select_guild_form_title" id="0x7F120BDF" />
+    <public type="string" name="go_live_modal_title" id="0x7F120BE0" />
+    <public type="string" name="go_live_private_channels_tooltip_body" id="0x7F120BE1" />
+    <public type="string" name="go_live_private_channels_tooltip_body_no_format" id="0x7F120BE2" />
+    <public type="string" name="go_live_private_channels_tooltip_cta" id="0x7F120BE3" />
+    <public type="string" name="go_live_screenshare_enable_for_soundshare" id="0x7F120BE4" />
+    <public type="string" name="go_live_screenshare_no_sound" id="0x7F120BE5" />
+    <public type="string" name="go_live_screenshare_update_macos_for_soundshare" id="0x7F120BE6" />
+    <public type="string" name="go_live_screenshare_update_windows_for_soundshare" id="0x7F120BE7" />
+    <public type="string" name="go_live_share_screen" id="0x7F120BE8" />
+    <public type="string" name="go_live_tile_screen" id="0x7F120BE9" />
+    <public type="string" name="go_live_user_playing" id="0x7F120BEA" />
+    <public type="string" name="go_live_video_drivers_outdated" id="0x7F120BEB" />
+    <public type="string" name="go_live_watching_user" id="0x7F120BEC" />
+    <public type="string" name="google_api_key" id="0x7F120BED" />
+    <public type="string" name="google_app_id" id="0x7F120BEE" />
+    <public type="string" name="google_crash_reporting_api_key" id="0x7F120BEF" />
+    <public type="string" name="google_storage_bucket" id="0x7F120BF0" />
+    <public type="string" name="grant_temporary_membership" id="0x7F120BF1" />
+    <public type="string" name="green" id="0x7F120BF2" />
+    <public type="string" name="grey" id="0x7F120BF3" />
+    <public type="string" name="group_dm" id="0x7F120BF4" />
+    <public type="string" name="group_dm_add_friends" id="0x7F120BF5" />
+    <public type="string" name="group_dm_header" id="0x7F120BF6" />
+    <public type="string" name="group_dm_invite_confirm" id="0x7F120BF7" />
+    <public type="string" name="group_dm_invite_confirm_button" id="0x7F120BF8" />
+    <public type="string" name="group_dm_invite_confirm_description" id="0x7F120BF9" />
+    <public type="string" name="group_dm_invite_empty" id="0x7F120BFA" />
+    <public type="string" name="group_dm_invite_full_main" id="0x7F120BFB" />
+    <public type="string" name="group_dm_invite_full_sub" id="0x7F120BFC" />
+    <public type="string" name="group_dm_invite_full_sub2" id="0x7F120BFD" />
+    <public type="string" name="group_dm_invite_link_create" id="0x7F120BFE" />
+    <public type="string" name="group_dm_invite_link_example" id="0x7F120BFF" />
+    <public type="string" name="group_dm_invite_link_title" id="0x7F120C00" />
+    <public type="string" name="group_dm_invite_no_friends" id="0x7F120C01" />
+    <public type="string" name="group_dm_invite_not_friends" id="0x7F120C02" />
+    <public type="string" name="group_dm_invite_remaining" id="0x7F120C03" />
+    <public type="string" name="group_dm_invite_select_existing" id="0x7F120C04" />
+    <public type="string" name="group_dm_invite_to" id="0x7F120C05" />
+    <public type="string" name="group_dm_invite_unselect_users" id="0x7F120C06" />
+    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7F120C07" />
+    <public type="string" name="group_dm_invite_with_name" id="0x7F120C08" />
+    <public type="string" name="group_dm_search_placeholder" id="0x7F120C09" />
+    <public type="string" name="group_dm_settings" id="0x7F120C0A" />
+    <public type="string" name="group_message_a11y_label" id="0x7F120C0B" />
+    <public type="string" name="group_message_a11y_label_with_unreads" id="0x7F120C0C" />
+    <public type="string" name="group_name" id="0x7F120C0D" />
+    <public type="string" name="group_owner" id="0x7F120C0E" />
+    <public type="string" name="groups" id="0x7F120C0F" />
+    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7F120C10" />
+    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7F120C11" />
+    <public type="string" name="guild_actions_menu_label" id="0x7F120C12" />
+    <public type="string" name="guild_analyics_developers_button" id="0x7F120C13" />
+    <public type="string" name="guild_analytics_description" id="0x7F120C14" />
+    <public type="string" name="guild_analytics_developers_cta" id="0x7F120C15" />
+    <public type="string" name="guild_analytics_error_guild_size" id="0x7F120C16" />
+    <public type="string" name="guild_analytics_error_message" id="0x7F120C17" />
+    <public type="string" name="guild_analytics_metrics_last_week" id="0x7F120C18" />
+    <public type="string" name="guild_cap_invite_modal_button" id="0x7F120C19" />
+    <public type="string" name="guild_cap_marketing_hero_body" id="0x7F120C1A" />
+    <public type="string" name="guild_cap_premium_feature_description" id="0x7F120C1B" />
+    <public type="string" name="guild_cap_premium_feature_title" id="0x7F120C1C" />
+    <public type="string" name="guild_cap_upsell_get_nitro" id="0x7F120C1D" />
+    <public type="string" name="guild_cap_upsell_modal_at_limit_body" id="0x7F120C1E" />
+    <public type="string" name="guild_cap_upsell_modal_near_limit_body" id="0x7F120C1F" />
+    <public type="string" name="guild_cap_upsell_modal_title" id="0x7F120C20" />
+    <public type="string" name="guild_cap_upsell_tooltip" id="0x7F120C21" />
+    <public type="string" name="guild_create_description" id="0x7F120C22" />
+    <public type="string" name="guild_create_invite_description" id="0x7F120C23" />
+    <public type="string" name="guild_create_invite_see_more_suggestions" id="0x7F120C24" />
+    <public type="string" name="guild_create_invite_title" id="0x7F120C25" />
+    <public type="string" name="guild_create_title" id="0x7F120C26" />
+    <public type="string" name="guild_create_upload_icon_button_text" id="0x7F120C27" />
+    <public type="string" name="guild_create_upload_icon_label" id="0x7F120C28" />
+    <public type="string" name="guild_create_upload_icon_recommended_size_label" id="0x7F120C29" />
+    <public type="string" name="guild_delete_feedback_accident" id="0x7F120C2A" />
+    <public type="string" name="guild_delete_feedback_body" id="0x7F120C2B" />
+    <public type="string" name="guild_delete_feedback_header" id="0x7F120C2C" />
+    <public type="string" name="guild_delete_feedback_inactive" id="0x7F120C2D" />
+    <public type="string" name="guild_delete_feedback_lonely" id="0x7F120C2E" />
+    <public type="string" name="guild_delete_feedback_other" id="0x7F120C2F" />
+    <public type="string" name="guild_delete_feedback_report" id="0x7F120C30" />
+    <public type="string" name="guild_delete_feedback_template" id="0x7F120C31" />
+    <public type="string" name="guild_delete_feedback_test" id="0x7F120C32" />
+    <public type="string" name="guild_delete_feedback_too_hard" id="0x7F120C33" />
+    <public type="string" name="guild_dicovery_main_view_subtitle" id="0x7F120C34" />
+    <public type="string" name="guild_discovery_all_category_filter" id="0x7F120C35" />
+    <public type="string" name="guild_discovery_category_footer_title" id="0x7F120C36" />
+    <public type="string" name="guild_discovery_category_header" id="0x7F120C37" />
+    <public type="string" name="guild_discovery_category_search_placeholder" id="0x7F120C38" />
+    <public type="string" name="guild_discovery_category_title" id="0x7F120C39" />
+    <public type="string" name="guild_discovery_chat_input_back" id="0x7F120C3A" />
+    <public type="string" name="guild_discovery_covid_body" id="0x7F120C3B" />
+    <public type="string" name="guild_discovery_covid_button" id="0x7F120C3C" />
+    <public type="string" name="guild_discovery_covid_title" id="0x7F120C3D" />
+    <public type="string" name="guild_discovery_emojis_tooltip" id="0x7F120C3E" />
+    <public type="string" name="guild_discovery_featured_header" id="0x7F120C3F" />
+    <public type="string" name="guild_discovery_footer_body" id="0x7F120C40" />
+    <public type="string" name="guild_discovery_header_games_you_play" id="0x7F120C41" />
+    <public type="string" name="guild_discovery_header_popular_guilds" id="0x7F120C42" />
+    <public type="string" name="guild_discovery_header_search_results" id="0x7F120C43" />
+    <public type="string" name="guild_discovery_home_subtitle" id="0x7F120C44" />
+    <public type="string" name="guild_discovery_home_title" id="0x7F120C45" />
+    <public type="string" name="guild_discovery_lurker_follow_news_button" id="0x7F120C46" />
+    <public type="string" name="guild_discovery_main_view_title" id="0x7F120C47" />
+    <public type="string" name="guild_discovery_mobile_search_placeholder" id="0x7F120C48" />
+    <public type="string" name="guild_discovery_popular_header" id="0x7F120C49" />
+    <public type="string" name="guild_discovery_search_empty_body" id="0x7F120C4A" />
+    <public type="string" name="guild_discovery_search_empty_category_body" id="0x7F120C4B" />
+    <public type="string" name="guild_discovery_search_empty_category_header" id="0x7F120C4C" />
+    <public type="string" name="guild_discovery_search_empty_description" id="0x7F120C4D" />
+    <public type="string" name="guild_discovery_search_empty_header" id="0x7F120C4E" />
+    <public type="string" name="guild_discovery_search_empty_title" id="0x7F120C4F" />
+    <public type="string" name="guild_discovery_search_enter_cta" id="0x7F120C50" />
+    <public type="string" name="guild_discovery_search_error" id="0x7F120C51" />
+    <public type="string" name="guild_discovery_search_header" id="0x7F120C52" />
+    <public type="string" name="guild_discovery_search_label" id="0x7F120C53" />
+    <public type="string" name="guild_discovery_search_placeholder" id="0x7F120C54" />
+    <public type="string" name="guild_discovery_search_press_enter" id="0x7F120C55" />
+    <public type="string" name="guild_discovery_search_protip" id="0x7F120C56" />
+    <public type="string" name="guild_discovery_search_results_category_header" id="0x7F120C57" />
+    <public type="string" name="guild_discovery_search_results_header" id="0x7F120C58" />
+    <public type="string" name="guild_discovery_tooltip" id="0x7F120C59" />
+    <public type="string" name="guild_discovery_view_button" id="0x7F120C5A" />
+    <public type="string" name="guild_event_add_moderators_label" id="0x7F120C5B" />
+    <public type="string" name="guild_event_moderators_description" id="0x7F120C5C" />
+    <public type="string" name="guild_event_ticket_billing_invoice_total_tax_inclusive" id="0x7F120C5D" />
+    <public type="string" name="guild_events" id="0x7F120C5E" />
+    <public type="string" name="guild_folder_color" id="0x7F120C5F" />
+    <public type="string" name="guild_folder_name" id="0x7F120C60" />
+    <public type="string" name="guild_folder_tooltip_a11y_label" id="0x7F120C61" />
+    <public type="string" name="guild_folder_tooltip_a11y_label_with_expanded_state" id="0x7F120C62" />
+    <public type="string" name="guild_folder_unnamed" id="0x7F120C63" />
+    <public type="string" name="guild_folder_updated_success" id="0x7F120C64" />
+    <public type="string" name="guild_invite_cta" id="0x7F120C65" />
+    <public type="string" name="guild_invite_expiration_sublabel" id="0x7F120C66" />
+    <public type="string" name="guild_invite_other_guilds_list_label" id="0x7F120C67" />
+    <public type="string" name="guild_invite_search_no_results" id="0x7F120C68" />
+    <public type="string" name="guild_invite_search_servers_placeholder" id="0x7F120C69" />
+    <public type="string" name="guild_invite_your_guilds_list_label" id="0x7F120C6A" />
+    <public type="string" name="guild_join_reason_ask_friends_invite" id="0x7F120C6B" />
+    <public type="string" name="guild_join_reason_description_label" id="0x7F120C6C" />
+    <public type="string" name="guild_join_reason_existing_community" id="0x7F120C6D" />
+    <public type="string" name="guild_join_reason_friend_invite" id="0x7F120C6E" />
+    <public type="string" name="guild_join_reason_header" id="0x7F120C6F" />
+    <public type="string" name="guild_join_reason_in_app" id="0x7F120C70" />
+    <public type="string" name="guild_join_reason_other" id="0x7F120C71" />
+    <public type="string" name="guild_join_reason_search_online" id="0x7F120C72" />
+    <public type="string" name="guild_join_reason_title_label" id="0x7F120C73" />
+    <public type="string" name="guild_member_avatar_upsell_body" id="0x7F120C74" />
+    <public type="string" name="guild_member_avatar_upsell_title" id="0x7F120C75" />
+    <public type="string" name="guild_members_header" id="0x7F120C76" />
+    <public type="string" name="guild_members_search_no_result" id="0x7F120C77" />
+    <public type="string" name="guild_monetization_app_name" id="0x7F120C78" />
+    <public type="string" name="guild_monetization_enable_ticketing_confirmation_subtitle" id="0x7F120C79" />
+    <public type="string" name="guild_monetization_enable_ticketing_confirmation_title" id="0x7F120C7A" />
+    <public type="string" name="guild_monetization_enable_ticketing_cta" id="0x7F120C7B" />
+    <public type="string" name="guild_monetization_enable_ticketing_description" id="0x7F120C7C" />
+    <public type="string" name="guild_monetization_enable_ticketing_section_title" id="0x7F120C7D" />
+    <public type="string" name="guild_monetization_enable_ticketing_select_placeholder" id="0x7F120C7E" />
+    <public type="string" name="guild_monetization_enable_ticketing_settings_page_title" id="0x7F120C7F" />
+    <public type="string" name="guild_monetization_ticketing_enabled_badge_subtitle" id="0x7F120C80" />
+    <public type="string" name="guild_monetization_ticketing_enabled_badge_title" id="0x7F120C81" />
+    <public type="string" name="guild_monetization_ticketing_insights_description" id="0x7F120C82" />
+    <public type="string" name="guild_monetization_ticketing_insights_section" id="0x7F120C83" />
+    <public type="string" name="guild_monetization_ticketing_settings_page_description" id="0x7F120C84" />
+    <public type="string" name="guild_monetization_ticketing_settings_page_title" id="0x7F120C85" />
+    <public type="string" name="guild_owner" id="0x7F120C86" />
+    <public type="string" name="guild_partner_application_button_pause" id="0x7F120C87" />
+    <public type="string" name="guild_partner_application_category_description" id="0x7F120C88" />
+    <public type="string" name="guild_partner_application_category_label" id="0x7F120C89" />
+    <public type="string" name="guild_partner_application_connect" id="0x7F120C8A" />
+    <public type="string" name="guild_partner_application_content_platform" id="0x7F120C8B" />
+    <public type="string" name="guild_partner_application_country" id="0x7F120C8C" />
+    <public type="string" name="guild_partner_application_creator_connect" id="0x7F120C8D" />
+    <public type="string" name="guild_partner_application_creator_must_connect_primary" id="0x7F120C8E" />
+    <public type="string" name="guild_partner_application_description_description" id="0x7F120C8F" />
+    <public type="string" name="guild_partner_application_description_title" id="0x7F120C90" />
+    <public type="string" name="guild_partner_application_first_name" id="0x7F120C91" />
+    <public type="string" name="guild_partner_application_has_errors" id="0x7F120C92" />
+    <public type="string" name="guild_partner_application_invite_link_description" id="0x7F120C93" />
+    <public type="string" name="guild_partner_application_invite_link_title" id="0x7F120C94" />
+    <public type="string" name="guild_partner_application_language" id="0x7F120C95" />
+    <public type="string" name="guild_partner_application_last_name" id="0x7F120C96" />
+    <public type="string" name="guild_partner_application_other_platform" id="0x7F120C97" />
+    <public type="string" name="guild_partner_application_other_platform_description" id="0x7F120C98" />
+    <public type="string" name="guild_partner_application_other_platform_optional" id="0x7F120C99" />
+    <public type="string" name="guild_partner_application_pause" id="0x7F120C9A" />
+    <public type="string" name="guild_partner_application_server_step" id="0x7F120C9B" />
+    <public type="string" name="guild_partner_application_server_step_description" id="0x7F120C9C" />
+    <public type="string" name="guild_partner_application_server_step_title" id="0x7F120C9D" />
+    <public type="string" name="guild_partner_application_subcategory_description" id="0x7F120C9E" />
+    <public type="string" name="guild_partner_application_submit_step" id="0x7F120C9F" />
+    <public type="string" name="guild_partner_application_submit_step_description" id="0x7F120CA0" />
+    <public type="string" name="guild_partner_application_submit_step_description_2" id="0x7F120CA1" />
+    <public type="string" name="guild_partner_application_submit_step_title" id="0x7F120CA2" />
+    <public type="string" name="guild_partner_application_survey_community_team_access" id="0x7F120CA3" />
+    <public type="string" name="guild_partner_application_survey_description" id="0x7F120CA4" />
+    <public type="string" name="guild_partner_application_survey_description_other" id="0x7F120CA5" />
+    <public type="string" name="guild_partner_application_survey_early_access_to_features" id="0x7F120CA6" />
+    <public type="string" name="guild_partner_application_survey_new_ideas_suggestions" id="0x7F120CA7" />
+    <public type="string" name="guild_partner_application_survey_other" id="0x7F120CA8" />
+    <public type="string" name="guild_partner_application_survey_talk_with_other_partners" id="0x7F120CA9" />
+    <public type="string" name="guild_partner_application_survey_title" id="0x7F120CAA" />
+    <public type="string" name="guild_partner_application_title" id="0x7F120CAB" />
+    <public type="string" name="guild_partner_application_type" id="0x7F120CAC" />
+    <public type="string" name="guild_partner_application_type_brand" id="0x7F120CAD" />
+    <public type="string" name="guild_partner_application_type_content" id="0x7F120CAE" />
+    <public type="string" name="guild_partner_application_type_fan" id="0x7F120CAF" />
+    <public type="string" name="guild_partner_application_type_other" id="0x7F120CB0" />
+    <public type="string" name="guild_partner_application_type_software" id="0x7F120CB1" />
+    <public type="string" name="guild_partner_application_user_step" id="0x7F120CB2" />
+    <public type="string" name="guild_partner_application_user_step_description" id="0x7F120CB3" />
+    <public type="string" name="guild_partner_application_user_step_description_content_creator" id="0x7F120CB4" />
+    <public type="string" name="guild_partner_application_user_step_title" id="0x7F120CB5" />
+    <public type="string" name="guild_partner_application_website" id="0x7F120CB6" />
+    <public type="string" name="guild_partner_application_why_you_description" id="0x7F120CB7" />
+    <public type="string" name="guild_partner_application_why_you_title" id="0x7F120CB8" />
+    <public type="string" name="guild_partnered" id="0x7F120CB9" />
+    <public type="string" name="guild_popout_unavailable_flavor" id="0x7F120CBA" />
+    <public type="string" name="guild_popout_unavailable_header" id="0x7F120CBB" />
+    <public type="string" name="guild_popout_view_server_button" id="0x7F120CBC" />
+    <public type="string" name="guild_premium" id="0x7F120CBD" />
+    <public type="string" name="guild_profile_join_server_button" id="0x7F120CBE" />
+    <public type="string" name="guild_progress_cta" id="0x7F120CBF" />
+    <public type="string" name="guild_progress_current_step" id="0x7F120CC0" />
+    <public type="string" name="guild_progress_finish" id="0x7F120CC1" />
+    <public type="string" name="guild_progress_skip" id="0x7F120CC2" />
+    <public type="string" name="guild_progress_steps" id="0x7F120CC3" />
+    <public type="string" name="guild_progress_title" id="0x7F120CC4" />
+    <public type="string" name="guild_region_deprecated_blurb" id="0x7F120CC5" />
+    <public type="string" name="guild_role_actions_menu_label" id="0x7F120CC6" />
+    <public type="string" name="guild_rules_edit_link" id="0x7F120CC7" />
+    <public type="string" name="guild_rules_header" id="0x7F120CC8" />
+    <public type="string" name="guild_rules_subheader" id="0x7F120CC9" />
+    <public type="string" name="guild_security_req_mfa_body" id="0x7F120CCA" />
+    <public type="string" name="guild_security_req_mfa_enable" id="0x7F120CCB" />
+    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7F120CCC" />
+    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7F120CCD" />
+    <public type="string" name="guild_security_req_mfa_label" id="0x7F120CCE" />
+    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7F120CCF" />
+    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7F120CD0" />
+    <public type="string" name="guild_security_req_owner_only" id="0x7F120CD1" />
+    <public type="string" name="guild_select" id="0x7F120CD2" />
+    <public type="string" name="guild_settings_action_filter_bot_add" id="0x7F120CD3" />
+    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7F120CD4" />
+    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7F120CD5" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7F120CD6" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7F120CD7" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7F120CD8" />
+    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7F120CD9" />
+    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7F120CDA" />
+    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7F120CDB" />
+    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7F120CDC" />
+    <public type="string" name="guild_settings_action_filter_guild_scheduled_event_create" id="0x7F120CDD" />
+    <public type="string" name="guild_settings_action_filter_guild_scheduled_event_delete" id="0x7F120CDE" />
+    <public type="string" name="guild_settings_action_filter_guild_scheduled_event_update" id="0x7F120CDF" />
+    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7F120CE0" />
+    <public type="string" name="guild_settings_action_filter_integration_create" id="0x7F120CE1" />
+    <public type="string" name="guild_settings_action_filter_integration_delete" id="0x7F120CE2" />
+    <public type="string" name="guild_settings_action_filter_integration_update" id="0x7F120CE3" />
+    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7F120CE4" />
+    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7F120CE5" />
+    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7F120CE6" />
+    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7F120CE7" />
+    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7F120CE8" />
+    <public type="string" name="guild_settings_action_filter_member_disconnect" id="0x7F120CE9" />
+    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7F120CEA" />
+    <public type="string" name="guild_settings_action_filter_member_move" id="0x7F120CEB" />
+    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7F120CEC" />
+    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7F120CED" />
+    <public type="string" name="guild_settings_action_filter_member_update" id="0x7F120CEE" />
+    <public type="string" name="guild_settings_action_filter_message_bulk_delete" id="0x7F120CEF" />
+    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7F120CF0" />
+    <public type="string" name="guild_settings_action_filter_message_pin" id="0x7F120CF1" />
+    <public type="string" name="guild_settings_action_filter_message_unpin" id="0x7F120CF2" />
+    <public type="string" name="guild_settings_action_filter_role_create" id="0x7F120CF3" />
+    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7F120CF4" />
+    <public type="string" name="guild_settings_action_filter_role_update" id="0x7F120CF5" />
+    <public type="string" name="guild_settings_action_filter_stage_instance_create" id="0x7F120CF6" />
+    <public type="string" name="guild_settings_action_filter_stage_instance_delete" id="0x7F120CF7" />
+    <public type="string" name="guild_settings_action_filter_stage_instance_update" id="0x7F120CF8" />
+    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7F120CF9" />
+    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7F120CFA" />
+    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7F120CFB" />
+    <public type="string" name="guild_settings_audit_log_bot_add" id="0x7F120CFC" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7F120CFD" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7F120CFE" />
+    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7F120CFF" />
+    <public type="string" name="guild_settings_audit_log_channel_default_auto_archive_duration_change" id="0x7F120D00" />
+    <public type="string" name="guild_settings_audit_log_channel_default_auto_archive_duration_create" id="0x7F120D01" />
+    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7F120D02" />
+    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7F120D03" />
+    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7F120D04" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7F120D05" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7F120D06" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7F120D07" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7F120D08" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7F120D09" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7F120D0A" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7F120D0B" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_reset" id="0x7F120D0C" />
+    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7F120D0D" />
+    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7F120D0E" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7F120D0F" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7F120D10" />
+    <public type="string" name="guild_settings_audit_log_channel_rtc_region_override_change" id="0x7F120D11" />
+    <public type="string" name="guild_settings_audit_log_channel_rtc_region_override_create" id="0x7F120D12" />
+    <public type="string" name="guild_settings_audit_log_channel_rtc_region_override_delete" id="0x7F120D13" />
+    <public type="string" name="guild_settings_audit_log_channel_stage_create" id="0x7F120D14" />
+    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7F120D15" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7F120D16" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_clear" id="0x7F120D17" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7F120D18" />
+    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7F120D19" />
+    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7F120D1A" />
+    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7F120D1B" />
+    <public type="string" name="guild_settings_audit_log_channel_user_limit_change" id="0x7F120D1C" />
+    <public type="string" name="guild_settings_audit_log_channel_user_limit_create" id="0x7F120D1D" />
+    <public type="string" name="guild_settings_audit_log_channel_video_quality_mode_change" id="0x7F120D1E" />
+    <public type="string" name="guild_settings_audit_log_channel_video_quality_mode_create" id="0x7F120D1F" />
+    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7F120D20" />
+    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7F120D21" />
+    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7F120D22" />
+    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7F120D23" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7F120D24" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7F120D25" />
+    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7F120D26" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7F120D27" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7F120D28" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7F120D29" />
+    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7F120D2A" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7F120D2B" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7F120D2C" />
+    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7F120D2D" />
+    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7F120D2E" />
+    <public type="string" name="guild_settings_audit_log_guild_discovery_splash_hash_change" id="0x7F120D2F" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7F120D30" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7F120D31" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7F120D32" />
+    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7F120D33" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7F120D34" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7F120D35" />
+    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7F120D36" />
+    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7F120D37" />
+    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7F120D38" />
+    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7F120D39" />
+    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_change" id="0x7F120D3A" />
+    <public type="string" name="guild_settings_audit_log_guild_rules_channel_id_clear" id="0x7F120D3B" />
+    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7F120D3C" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7F120D3D" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7F120D3E" />
+    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7F120D3F" />
+    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_change" id="0x7F120D40" />
+    <public type="string" name="guild_settings_audit_log_guild_updates_channel_id_clear" id="0x7F120D41" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7F120D42" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7F120D43" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7F120D44" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7F120D45" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7F120D46" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7F120D47" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7F120D48" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7F120D49" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7F120D4A" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7F120D4B" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7F120D4C" />
+    <public type="string" name="guild_settings_audit_log_integration_create" id="0x7F120D4D" />
+    <public type="string" name="guild_settings_audit_log_integration_delete" id="0x7F120D4E" />
+    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_off" id="0x7F120D4F" />
+    <public type="string" name="guild_settings_audit_log_integration_enable_emoticons_on" id="0x7F120D50" />
+    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_kick_from_server" id="0x7F120D51" />
+    <public type="string" name="guild_settings_audit_log_integration_expire_behavior_remove_synced_role" id="0x7F120D52" />
+    <public type="string" name="guild_settings_audit_log_integration_expire_grace_period" id="0x7F120D53" />
+    <public type="string" name="guild_settings_audit_log_integration_update" id="0x7F120D54" />
+    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7F120D55" />
+    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7F120D56" />
+    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7F120D57" />
+    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7F120D58" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7F120D59" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7F120D5A" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7F120D5B" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7F120D5C" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7F120D5D" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7F120D5E" />
+    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7F120D5F" />
+    <public type="string" name="guild_settings_audit_log_load_more" id="0x7F120D60" />
+    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7F120D61" />
+    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7F120D62" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7F120D63" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7F120D64" />
+    <public type="string" name="guild_settings_audit_log_member_disconnect" id="0x7F120D65" />
+    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7F120D66" />
+    <public type="string" name="guild_settings_audit_log_member_move" id="0x7F120D67" />
+    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7F120D68" />
+    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7F120D69" />
+    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7F120D6A" />
+    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7F120D6B" />
+    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7F120D6C" />
+    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7F120D6D" />
+    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7F120D6E" />
+    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7F120D6F" />
+    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7F120D70" />
+    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7F120D71" />
+    <public type="string" name="guild_settings_audit_log_member_update" id="0x7F120D72" />
+    <public type="string" name="guild_settings_audit_log_message_bulk_delete" id="0x7F120D73" />
+    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7F120D74" />
+    <public type="string" name="guild_settings_audit_log_message_pin" id="0x7F120D75" />
+    <public type="string" name="guild_settings_audit_log_message_unpin" id="0x7F120D76" />
+    <public type="string" name="guild_settings_audit_log_role_color" id="0x7F120D77" />
+    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7F120D78" />
+    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7F120D79" />
+    <public type="string" name="guild_settings_audit_log_role_create" id="0x7F120D7A" />
+    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7F120D7B" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7F120D7C" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7F120D7D" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7F120D7E" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7F120D7F" />
+    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7F120D80" />
+    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7F120D81" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7F120D82" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7F120D83" />
+    <public type="string" name="guild_settings_audit_log_role_update" id="0x7F120D84" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_create" id="0x7F120D85" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_delete" id="0x7F120D86" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_description_create" id="0x7F120D87" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_entity_type_none" id="0x7F120D88" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_entity_type_stage_instance" id="0x7F120D89" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_name_create" id="0x7F120D8A" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_skus_create" id="0x7F120D8B" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_status_active" id="0x7F120D8C" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_status_canceled" id="0x7F120D8D" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_status_completed" id="0x7F120D8E" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_status_scheduled" id="0x7F120D8F" />
+    <public type="string" name="guild_settings_audit_log_scheduled_event_update" id="0x7F120D90" />
+    <public type="string" name="guild_settings_audit_log_stage_instance_create" id="0x7F120D91" />
+    <public type="string" name="guild_settings_audit_log_stage_instance_delete" id="0x7F120D92" />
+    <public type="string" name="guild_settings_audit_log_stage_instance_delete_no_user" id="0x7F120D93" />
+    <public type="string" name="guild_settings_audit_log_stage_instance_privacy_level_guild_only" id="0x7F120D94" />
+    <public type="string" name="guild_settings_audit_log_stage_instance_privacy_level_public" id="0x7F120D95" />
+    <public type="string" name="guild_settings_audit_log_stage_instance_update" id="0x7F120D96" />
+    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7F120D97" />
+    <public type="string" name="guild_settings_audit_log_unknown_action" id="0x7F120D98" />
+    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7F120D99" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7F120D9A" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7F120D9B" />
+    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7F120D9C" />
+    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7F120D9D" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7F120D9E" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7F120D9F" />
+    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7F120DA0" />
+    <public type="string" name="guild_settings_banner_recommend" id="0x7F120DA1" />
+    <public type="string" name="guild_settings_community" id="0x7F120DA2" />
+    <public type="string" name="guild_settings_community_administrator_only" id="0x7F120DA3" />
+    <public type="string" name="guild_settings_community_disable_community" id="0x7F120DA4" />
+    <public type="string" name="guild_settings_community_disable_community_description" id="0x7F120DA5" />
+    <public type="string" name="guild_settings_community_disable_community_dialog_message" id="0x7F120DA6" />
+    <public type="string" name="guild_settings_community_disable_community_dialog_title" id="0x7F120DA7" />
+    <public type="string" name="guild_settings_community_disable_public_confirm_default_title" id="0x7F120DA8" />
+    <public type="string" name="guild_settings_community_enable_community" id="0x7F120DA9" />
+    <public type="string" name="guild_settings_community_intro_body" id="0x7F120DAA" />
+    <public type="string" name="guild_settings_community_intro_details" id="0x7F120DAB" />
+    <public type="string" name="guild_settings_community_intro_details_disclaimer_mobile" id="0x7F120DAC" />
+    <public type="string" name="guild_settings_community_intro_details_mobile" id="0x7F120DAD" />
+    <public type="string" name="guild_settings_community_intro_header" id="0x7F120DAE" />
+    <public type="string" name="guild_settings_community_intro_learn_more" id="0x7F120DAF" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_body" id="0x7F120DB0" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_body_mobile" id="0x7F120DB1" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_header" id="0x7F120DB2" />
+    <public type="string" name="guild_settings_community_intro_upsell_analytics_tooltip" id="0x7F120DB3" />
+    <public type="string" name="guild_settings_community_intro_upsell_discovery_body" id="0x7F120DB4" />
+    <public type="string" name="guild_settings_community_intro_upsell_discovery_header" id="0x7F120DB5" />
+    <public type="string" name="guild_settings_community_intro_upsell_partner_body" id="0x7F120DB6" />
+    <public type="string" name="guild_settings_community_intro_upsell_partner_header" id="0x7F120DB7" />
+    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_body" id="0x7F120DB8" />
+    <public type="string" name="guild_settings_community_intro_upsell_stay_informed_header" id="0x7F120DB9" />
+    <public type="string" name="guild_settings_community_locale_help" id="0x7F120DBA" />
+    <public type="string" name="guild_settings_community_mod_channel_help" id="0x7F120DBB" />
+    <public type="string" name="guild_settings_community_mod_channel_help_mobile" id="0x7F120DBC" />
+    <public type="string" name="guild_settings_community_mod_channel_selector_title" id="0x7F120DBD" />
+    <public type="string" name="guild_settings_community_mod_channel_title" id="0x7F120DBE" />
+    <public type="string" name="guild_settings_community_rules_channel_help" id="0x7F120DBF" />
+    <public type="string" name="guild_settings_community_rules_channel_help_mobile" id="0x7F120DC0" />
+    <public type="string" name="guild_settings_community_upsell_body" id="0x7F120DC1" />
+    <public type="string" name="guild_settings_community_upsell_button_analytics" id="0x7F120DC2" />
+    <public type="string" name="guild_settings_community_upsell_button_discovery" id="0x7F120DC3" />
+    <public type="string" name="guild_settings_community_upsell_button_welcome_screen" id="0x7F120DC4" />
+    <public type="string" name="guild_settings_community_upsell_header" id="0x7F120DC5" />
+    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7F120DC6" />
+    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7F120DC7" />
+    <public type="string" name="guild_settings_default_notifications_large_guild_notify_all" id="0x7F120DC8" />
+    <public type="string" name="guild_settings_disable_discoverable" id="0x7F120DC9" />
+    <public type="string" name="guild_settings_discovery_admin_only" id="0x7F120DCA" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa" id="0x7F120DCB" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa_description" id="0x7F120DCC" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa_description_failing" id="0x7F120DCD" />
+    <public type="string" name="guild_settings_discovery_checklist_2fa_failing" id="0x7F120DCE" />
+    <public type="string" name="guild_settings_discovery_checklist_abide_by_guidelines" id="0x7F120DCF" />
+    <public type="string" name="guild_settings_discovery_checklist_age" id="0x7F120DD0" />
+    <public type="string" name="guild_settings_discovery_checklist_age_description" id="0x7F120DD1" />
+    <public type="string" name="guild_settings_discovery_checklist_age_description_failing" id="0x7F120DD2" />
+    <public type="string" name="guild_settings_discovery_checklist_age_failing" id="0x7F120DD3" />
+    <public type="string" name="guild_settings_discovery_checklist_bad_standing" id="0x7F120DD4" />
+    <public type="string" name="guild_settings_discovery_checklist_change_channel_names_2" id="0x7F120DD7" />
+    <public type="string" name="guild_settings_discovery_checklist_change_description" id="0x7F120DD8" />
+    <public type="string" name="guild_settings_discovery_checklist_change_name" id="0x7F120DD9" />
+    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action" id="0x7F120DDA" />
+    <public type="string" name="guild_settings_discovery_checklist_communicator_failing_action_details" id="0x7F120DDB" />
+    <public type="string" name="guild_settings_discovery_checklist_communicator_progress_label" id="0x7F120DDC" />
+    <public type="string" name="guild_settings_discovery_checklist_engagement_failing" id="0x7F120DDD" />
+    <public type="string" name="guild_settings_discovery_checklist_good_standing" id="0x7F120DDE" />
+    <public type="string" name="guild_settings_discovery_checklist_health_definitions_intro" id="0x7F120DDF" />
+    <public type="string" name="guild_settings_discovery_checklist_health_view_details" id="0x7F120DE0" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy" id="0x7F120DE1" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description" id="0x7F120DE2" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description_failing" id="0x7F120DE3" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending" id="0x7F120DE4" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_description_pending_size" id="0x7F120DE5" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_failing" id="0x7F120DE6" />
+    <public type="string" name="guild_settings_discovery_checklist_healthy_pending" id="0x7F120DE7" />
+    <public type="string" name="guild_settings_discovery_checklist_loading" id="0x7F120DE8" />
+    <public type="string" name="guild_settings_discovery_checklist_nsfw" id="0x7F120DE9" />
+    <public type="string" name="guild_settings_discovery_checklist_nsfw_description" id="0x7F120DEA" />
+    <public type="string" name="guild_settings_discovery_checklist_nsfw_failing" id="0x7F120DEB" />
+    <public type="string" name="guild_settings_discovery_checklist_progress_requirement_label" id="0x7F120DEC" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_failing" id="0x7F120DED" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action" id="0x7F120DEE" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_failing_action_details_updated" id="0x7F120DEF" />
+    <public type="string" name="guild_settings_discovery_checklist_retention_progress_label" id="0x7F120DF0" />
+    <public type="string" name="guild_settings_discovery_checklist_safe" id="0x7F120DF1" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_description" id="0x7F120DF2" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing" id="0x7F120DF3" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_description_failing_guidelines" id="0x7F120DF4" />
+    <public type="string" name="guild_settings_discovery_checklist_safe_failing" id="0x7F120DF5" />
+    <public type="string" name="guild_settings_discovery_checklist_score_explain" id="0x7F120DF6" />
+    <public type="string" name="guild_settings_discovery_checklist_size" id="0x7F120DF7" />
+    <public type="string" name="guild_settings_discovery_checklist_size_description" id="0x7F120DF8" />
+    <public type="string" name="guild_settings_discovery_checklist_size_description_failing" id="0x7F120DF9" />
+    <public type="string" name="guild_settings_discovery_checklist_size_description_failing_partners" id="0x7F120DFA" />
+    <public type="string" name="guild_settings_discovery_checklist_size_failing" id="0x7F120DFB" />
+    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action" id="0x7F120DFC" />
+    <public type="string" name="guild_settings_discovery_checklist_visitor_failing_action_details" id="0x7F120DFD" />
+    <public type="string" name="guild_settings_discovery_checklist_visitor_progress_label" id="0x7F120DFE" />
+    <public type="string" name="guild_settings_discovery_description" id="0x7F120DFF" />
+    <public type="string" name="guild_settings_discovery_disable_public_confirm_text" id="0x7F120E00" />
+    <public type="string" name="guild_settings_discovery_disqualified" id="0x7F120E01" />
+    <public type="string" name="guild_settings_discovery_disqualified_description" id="0x7F120E02" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_description" id="0x7F120E03" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_disable" id="0x7F120E04" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_enable" id="0x7F120E05" />
+    <public type="string" name="guild_settings_discovery_emoji_discoverability_title" id="0x7F120E06" />
+    <public type="string" name="guild_settings_discovery_enabled_modal_body" id="0x7F120E07" />
+    <public type="string" name="guild_settings_discovery_enabled_modal_dismiss" id="0x7F120E08" />
+    <public type="string" name="guild_settings_discovery_enabled_modal_header" id="0x7F120E09" />
+    <public type="string" name="guild_settings_discovery_header" id="0x7F120E0A" />
+    <public type="string" name="guild_settings_discovery_locale_help" id="0x7F120E0B" />
+    <public type="string" name="guild_settings_discovery_pending_healthy" id="0x7F120E0C" />
+    <public type="string" name="guild_settings_discovery_preview_description" id="0x7F120E0D" />
+    <public type="string" name="guild_settings_discovery_primary_category_description" id="0x7F120E0E" />
+    <public type="string" name="guild_settings_discovery_primary_category_title" id="0x7F120E0F" />
+    <public type="string" name="guild_settings_discovery_requirements_not_met" id="0x7F120E10" />
+    <public type="string" name="guild_settings_discovery_search_keywords_description" id="0x7F120E11" />
+    <public type="string" name="guild_settings_discovery_search_keywords_title" id="0x7F120E12" />
+    <public type="string" name="guild_settings_discovery_subcategory_title" id="0x7F120E13" />
+    <public type="string" name="guild_settings_emoji_alias" id="0x7F120E14" />
+    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7F120E15" />
+    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7F120E16" />
+    <public type="string" name="guild_settings_enable_discoverable" id="0x7F120E17" />
+    <public type="string" name="guild_settings_example_tooltip" id="0x7F120E18" />
+    <public type="string" name="guild_settings_filter_action" id="0x7F120E19" />
+    <public type="string" name="guild_settings_filter_all" id="0x7F120E1A" />
+    <public type="string" name="guild_settings_filter_all_actions" id="0x7F120E1B" />
+    <public type="string" name="guild_settings_filter_all_users" id="0x7F120E1C" />
+    <public type="string" name="guild_settings_filter_user" id="0x7F120E1D" />
+    <public type="string" name="guild_settings_filtered_action" id="0x7F120E1E" />
+    <public type="string" name="guild_settings_filtered_user" id="0x7F120E1F" />
+    <public type="string" name="guild_settings_follower_analytics" id="0x7F120E20" />
+    <public type="string" name="guild_settings_follower_analytics_description" id="0x7F120E21" />
+    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7F120E22" />
+    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7F120E23" />
+    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7F120E24" />
+    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7F120E25" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7F120E26" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7F120E27" />
+    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7F120E28" />
+    <public type="string" name="guild_settings_follower_analytics_post" id="0x7F120E29" />
+    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7F120E2A" />
+    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7F120E2B" />
+    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7F120E2C" />
+    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7F120E2D" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7F120E2E" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7F120E2F" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7F120E30" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7F120E31" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7F120E32" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7F120E33" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7F120E34" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7F120E35" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7F120E36" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7F120E37" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7F120E38" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7F120E39" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7F120E3A" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7F120E3B" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7F120E3C" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7F120E3D" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7F120E3E" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7F120E3F" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7F120E40" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7F120E41" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7F120E42" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7F120E43" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_sticker" id="0x7F120E44" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7F120E45" />
+    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7F120E46" />
+    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7F120E47" />
+    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7F120E48" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7F120E49" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7F120E4A" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7F120E4B" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7F120E4C" />
+    <public type="string" name="guild_settings_icon_recommend" id="0x7F120E4D" />
+    <public type="string" name="guild_settings_label_audit_log" id="0x7F120E4E" />
+    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7F120E4F" />
+    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7F120E50" />
+    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7F120E51" />
+    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7F120E52" />
+    <public type="string" name="guild_settings_member_verification" id="0x7F120E53" />
+    <public type="string" name="guild_settings_member_verification_actioned_by" id="0x7F120E54" />
+    <public type="string" name="guild_settings_member_verification_application_submitted_time" id="0x7F120E55" />
+    <public type="string" name="guild_settings_member_verification_applications_title" id="0x7F120E56" />
+    <public type="string" name="guild_settings_member_verification_approve_application" id="0x7F120E57" />
+    <public type="string" name="guild_settings_member_verification_approved" id="0x7F120E58" />
+    <public type="string" name="guild_settings_member_verification_auto_approval" id="0x7F120E59" />
+    <public type="string" name="guild_settings_member_verification_auto_approval_description" id="0x7F120E5A" />
+    <public type="string" name="guild_settings_member_verification_ban_user" id="0x7F120E5B" />
+    <public type="string" name="guild_settings_member_verification_banned" id="0x7F120E5C" />
+    <public type="string" name="guild_settings_member_verification_denied" id="0x7F120E5D" />
+    <public type="string" name="guild_settings_member_verification_deny_and_ban_application" id="0x7F120E5E" />
+    <public type="string" name="guild_settings_member_verification_deny_application" id="0x7F120E5F" />
+    <public type="string" name="guild_settings_member_verification_deny_modal_title" id="0x7F120E60" />
+    <public type="string" name="guild_settings_member_verification_description" id="0x7F120E61" />
+    <public type="string" name="guild_settings_member_verification_description_coming_soon" id="0x7F120E62" />
+    <public type="string" name="guild_settings_member_verification_description_placeholder" id="0x7F120E63" />
+    <public type="string" name="guild_settings_member_verification_description_title" id="0x7F120E64" />
+    <public type="string" name="guild_settings_member_verification_empty_approved_applications_body" id="0x7F120E65" />
+    <public type="string" name="guild_settings_member_verification_empty_approved_applications_title" id="0x7F120E66" />
+    <public type="string" name="guild_settings_member_verification_empty_pending_applications_body" id="0x7F120E67" />
+    <public type="string" name="guild_settings_member_verification_empty_pending_applications_title" id="0x7F120E68" />
+    <public type="string" name="guild_settings_member_verification_empty_rejected_applications_body" id="0x7F120E69" />
+    <public type="string" name="guild_settings_member_verification_empty_rejected_applications_title" id="0x7F120E6A" />
+    <public type="string" name="guild_settings_member_verification_enable_reminder" id="0x7F120E6B" />
+    <public type="string" name="guild_settings_member_verification_enabled" id="0x7F120E6C" />
+    <public type="string" name="guild_settings_member_verification_enabled_second_line" id="0x7F120E6D" />
+    <public type="string" name="guild_settings_member_verification_example_guild_name" id="0x7F120E6E" />
+    <public type="string" name="guild_settings_member_verification_intro_button" id="0x7F120E6F" />
+    <public type="string" name="guild_settings_member_verification_manual_approval" id="0x7F120E70" />
+    <public type="string" name="guild_settings_member_verification_manual_approval_description" id="0x7F120E71" />
+    <public type="string" name="guild_settings_member_verification_pending" id="0x7F120E72" />
+    <public type="string" name="guild_settings_member_verification_preview" id="0x7F120E73" />
+    <public type="string" name="guild_settings_member_verification_preview_description" id="0x7F120E74" />
+    <public type="string" name="guild_settings_member_verification_preview_enabled_title" id="0x7F120E75" />
+    <public type="string" name="guild_settings_member_verification_preview_title" id="0x7F120E76" />
+    <public type="string" name="guild_settings_member_verification_progress_will_save" id="0x7F120E77" />
+    <public type="string" name="guild_settings_member_verification_reason_title" id="0x7F120E78" />
+    <public type="string" name="guild_settings_member_verification_rejected" id="0x7F120E79" />
+    <public type="string" name="guild_settings_member_verification_review_application_description" id="0x7F120E7A" />
+    <public type="string" name="guild_settings_member_verification_review_application_title" id="0x7F120E7B" />
+    <public type="string" name="guild_settings_member_verification_review_approved_applications" id="0x7F120E7C" />
+    <public type="string" name="guild_settings_member_verification_review_pending_applications" id="0x7F120E7D" />
+    <public type="string" name="guild_settings_member_verification_review_rejected_applications" id="0x7F120E7E" />
+    <public type="string" name="guild_settings_member_verification_screen_title" id="0x7F120E7F" />
+    <public type="string" name="guild_settings_members_add_role" id="0x7F120E80" />
+    <public type="string" name="guild_settings_members_display_role" id="0x7F120E81" />
+    <public type="string" name="guild_settings_members_remove_role" id="0x7F120E82" />
+    <public type="string" name="guild_settings_members_server_members" id="0x7F120E83" />
+    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7F120E84" />
+    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7F120E85" />
+    <public type="string" name="guild_settings_overview_tier_info" id="0x7F120E86" />
+    <public type="string" name="guild_settings_partner_and_discovery_disable_public_confirm_text" id="0x7F120E87" />
+    <public type="string" name="guild_settings_partner_checklist_age_description" id="0x7F120E88" />
+    <public type="string" name="guild_settings_partner_checklist_age_description_failing" id="0x7F120E89" />
+    <public type="string" name="guild_settings_partner_checklist_failing_header" id="0x7F120E8A" />
+    <public type="string" name="guild_settings_partner_checklist_failing_subheader" id="0x7F120E8B" />
+    <public type="string" name="guild_settings_partner_checklist_health_view_details" id="0x7F120E8C" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description" id="0x7F120E8D" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description_failing" id="0x7F120E8E" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description_pending" id="0x7F120E8F" />
+    <public type="string" name="guild_settings_partner_checklist_healthy_description_pending_size" id="0x7F120E90" />
+    <public type="string" name="guild_settings_partner_checklist_passing_header" id="0x7F120E91" />
+    <public type="string" name="guild_settings_partner_checklist_passing_subheader" id="0x7F120E92" />
+    <public type="string" name="guild_settings_partner_checklist_size" id="0x7F120E93" />
+    <public type="string" name="guild_settings_partner_checklist_size_description" id="0x7F120E94" />
+    <public type="string" name="guild_settings_partner_checklist_size_description_failing" id="0x7F120E95" />
+    <public type="string" name="guild_settings_partner_checklist_size_failing" id="0x7F120E96" />
+    <public type="string" name="guild_settings_partner_disable_public_confirm_text" id="0x7F120E97" />
+    <public type="string" name="guild_settings_partner_intro_apply_button" id="0x7F120E98" />
+    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_only_owner" id="0x7F120E99" />
+    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_pending" id="0x7F120E9A" />
+    <public type="string" name="guild_settings_partner_intro_apply_button_tooltip_rejected" id="0x7F120E9B" />
+    <public type="string" name="guild_settings_partner_intro_apply_details" id="0x7F120E9C" />
+    <public type="string" name="guild_settings_partner_intro_body" id="0x7F120E9D" />
+    <public type="string" name="guild_settings_partner_intro_cooldown" id="0x7F120E9E" />
+    <public type="string" name="guild_settings_partner_intro_cooldown_counter" id="0x7F120E9F" />
+    <public type="string" name="guild_settings_partner_intro_header" id="0x7F120EA0" />
+    <public type="string" name="guild_settings_partner_intro_pending" id="0x7F120EA1" />
+    <public type="string" name="guild_settings_partner_intro_rejected" id="0x7F120EA2" />
+    <public type="string" name="guild_settings_partner_intro_upsell_branding_body" id="0x7F120EA3" />
+    <public type="string" name="guild_settings_partner_intro_upsell_branding_header" id="0x7F120EA4" />
+    <public type="string" name="guild_settings_partner_intro_upsell_perks_body" id="0x7F120EA5" />
+    <public type="string" name="guild_settings_partner_intro_upsell_perks_header" id="0x7F120EA6" />
+    <public type="string" name="guild_settings_partner_intro_upsell_recognition_body" id="0x7F120EA7" />
+    <public type="string" name="guild_settings_partner_intro_upsell_recognition_header" id="0x7F120EA8" />
+    <public type="string" name="guild_settings_partner_not_verified" id="0x7F120EA9" />
+    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7F120EAA" />
+    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7F120EAB" />
+    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7F120EAC" />
+    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7F120EAD" />
+    <public type="string" name="guild_settings_premium_guild_title" id="0x7F120EAE" />
+    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7F120EAF" />
+    <public type="string" name="guild_settings_premium_upsell_body_perk_guild_subscription_discount" id="0x7F120EB0" />
+    <public type="string" name="guild_settings_premium_upsell_body_perk_no_free_guild_subscriptions" id="0x7F120EB1" />
+    <public type="string" name="guild_settings_premium_upsell_body_perk_num_guild_subscriptions" id="0x7F120EB2" />
+    <public type="string" name="guild_settings_premium_upsell_heading_primary" id="0x7F120EB3" />
+    <public type="string" name="guild_settings_premium_upsell_heading_secondary" id="0x7F120EB4" />
+    <public type="string" name="guild_settings_premium_upsell_heading_secondary_premium_user" id="0x7F120EB5" />
+    <public type="string" name="guild_settings_premium_upsell_heading_tertiary_premium_user" id="0x7F120EB6" />
+    <public type="string" name="guild_settings_premium_upsell_learn_more" id="0x7F120EB7" />
+    <public type="string" name="guild_settings_premium_upsell_subheading" id="0x7F120EB8" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_extra_android" id="0x7F120EB9" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_extra_ios" id="0x7F120EBA" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_extra_ios_voiceover_label" id="0x7F120EBB" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1" id="0x7F120EBC" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_1_mobile" id="0x7F120EBD" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2" id="0x7F120EBE" />
+    <public type="string" name="guild_settings_premium_upsell_subheading_tier_2_mobile" id="0x7F120EBF" />
+    <public type="string" name="guild_settings_public_mod_channel_title" id="0x7F120EC0" />
+    <public type="string" name="guild_settings_public_no_option_selected" id="0x7F120EC1" />
+    <public type="string" name="guild_settings_public_update_failed" id="0x7F120EC2" />
+    <public type="string" name="guild_settings_public_welcome" id="0x7F120EC3" />
+    <public type="string" name="guild_settings_public_welcome_add_recommended_channel" id="0x7F120EC4" />
+    <public type="string" name="guild_settings_public_welcome_channel_delete" id="0x7F120EC5" />
+    <public type="string" name="guild_settings_public_welcome_channel_description_placeholder" id="0x7F120EC6" />
+    <public type="string" name="guild_settings_public_welcome_channel_edit" id="0x7F120EC7" />
+    <public type="string" name="guild_settings_public_welcome_channel_move_down" id="0x7F120EC8" />
+    <public type="string" name="guild_settings_public_welcome_channel_move_up" id="0x7F120EC9" />
+    <public type="string" name="guild_settings_public_welcome_description_placeholder" id="0x7F120ECA" />
+    <public type="string" name="guild_settings_public_welcome_enable_reminder" id="0x7F120ECB" />
+    <public type="string" name="guild_settings_public_welcome_enabled" id="0x7F120ECC" />
+    <public type="string" name="guild_settings_public_welcome_enabled_second_line" id="0x7F120ECD" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_description_1" id="0x7F120ECE" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_description_2" id="0x7F120ECF" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_description_3" id="0x7F120ED0" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_name_1" id="0x7F120ED1" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_name_2" id="0x7F120ED2" />
+    <public type="string" name="guild_settings_public_welcome_example_channel_name_3" id="0x7F120ED3" />
+    <public type="string" name="guild_settings_public_welcome_example_description" id="0x7F120ED4" />
+    <public type="string" name="guild_settings_public_welcome_example_title" id="0x7F120ED5" />
+    <public type="string" name="guild_settings_public_welcome_intro_button" id="0x7F120ED6" />
+    <public type="string" name="guild_settings_public_welcome_intro_text" id="0x7F120ED7" />
+    <public type="string" name="guild_settings_public_welcome_invalid_channel" id="0x7F120ED8" />
+    <public type="string" name="guild_settings_public_welcome_only_viewable_channels" id="0x7F120ED9" />
+    <public type="string" name="guild_settings_public_welcome_pick_channel" id="0x7F120EDA" />
+    <public type="string" name="guild_settings_public_welcome_preview" id="0x7F120EDB" />
+    <public type="string" name="guild_settings_public_welcome_progress_will_save" id="0x7F120EDC" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_add" id="0x7F120EDD" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channel_modal_edit" id="0x7F120EDE" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channels_description" id="0x7F120EDF" />
+    <public type="string" name="guild_settings_public_welcome_recommended_channels_title" id="0x7F120EE0" />
+    <public type="string" name="guild_settings_public_welcome_select_a_channel" id="0x7F120EE1" />
+    <public type="string" name="guild_settings_public_welcome_set_description" id="0x7F120EE2" />
+    <public type="string" name="guild_settings_public_welcome_settings_text" id="0x7F120EE3" />
+    <public type="string" name="guild_settings_public_welcome_title" id="0x7F120EE4" />
+    <public type="string" name="guild_settings_public_welcome_update_failure" id="0x7F120EE5" />
+    <public type="string" name="guild_settings_server_banner" id="0x7F120EE6" />
+    <public type="string" name="guild_settings_server_invite_background" id="0x7F120EE7" />
+    <public type="string" name="guild_settings_splash_info" id="0x7F120EE8" />
+    <public type="string" name="guild_settings_splash_recommend" id="0x7F120EE9" />
+    <public type="string" name="guild_settings_stickers" id="0x7F120EEA" />
+    <public type="string" name="guild_settings_stickers_boost_server" id="0x7F120EEB" />
+    <public type="string" name="guild_settings_stickers_upload_heading" id="0x7F120EEC" />
+    <public type="string" name="guild_settings_stickers_upload_help" id="0x7F120EED" />
+    <public type="string" name="guild_settings_stickers_upload_requirements" id="0x7F120EEE" />
+    <public type="string" name="guild_settings_stickers_upload_requirements_1" id="0x7F120EEF" />
+    <public type="string" name="guild_settings_stickers_upload_requirements_2" id="0x7F120EF0" />
+    <public type="string" name="guild_settings_stickers_upload_requirements_3" id="0x7F120EF1" />
+    <public type="string" name="guild_settings_stickers_upload_requirements_4" id="0x7F120EF2" />
+    <public type="string" name="guild_settings_stickers_upsell_description" id="0x7F120EF3" />
+    <public type="string" name="guild_settings_stickers_upsell_title" id="0x7F120EF4" />
+    <public type="string" name="guild_settings_title_server_widget" id="0x7F120EF5" />
+    <public type="string" name="guild_settings_widget_embed_help" id="0x7F120EF6" />
+    <public type="string" name="guild_settings_widget_enable_widget" id="0x7F120EF7" />
+    <public type="string" name="guild_sidebar_a11y_label" id="0x7F120EF8" />
+    <public type="string" name="guild_sidebar_announcement_channel_a11y_label" id="0x7F120EF9" />
+    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_mentions" id="0x7F120EFA" />
+    <public type="string" name="guild_sidebar_announcement_channel_a11y_label_with_unreads" id="0x7F120EFB" />
+    <public type="string" name="guild_sidebar_default_channel_a11y_label" id="0x7F120EFC" />
+    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_mentions" id="0x7F120EFD" />
+    <public type="string" name="guild_sidebar_default_channel_a11y_label_with_unreads" id="0x7F120EFE" />
+    <public type="string" name="guild_sidebar_stage_channel_a11y_label" id="0x7F120EFF" />
+    <public type="string" name="guild_sidebar_stage_channel_a11y_label_with_limit" id="0x7F120F00" />
+    <public type="string" name="guild_sidebar_stage_channel_a11y_label_with_users" id="0x7F120F01" />
+    <public type="string" name="guild_sidebar_store_channel_a11y_label" id="0x7F120F02" />
+    <public type="string" name="guild_sidebar_voice_channel_a11y_label" id="0x7F120F03" />
+    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_limit" id="0x7F120F04" />
+    <public type="string" name="guild_sidebar_voice_channel_a11y_label_with_users" id="0x7F120F05" />
+    <public type="string" name="guild_stage_discovery_copy_event_url" id="0x7F120F06" />
+    <public type="string" name="guild_stage_discovery_schedule_event_label" id="0x7F120F07" />
+    <public type="string" name="guild_stage_instance_actions_menu_label" id="0x7F120F08" />
+    <public type="string" name="guild_stage_instance_discovery_title" id="0x7F120F09" />
+    <public type="string" name="guild_stages_cant_start_event_yet" id="0x7F120F0A" />
+    <public type="string" name="guild_stages_landing_mobile_subtitle" id="0x7F120F0B" />
+    <public type="string" name="guild_stages_landing_mobile_title" id="0x7F120F0C" />
+    <public type="string" name="guild_sticker_file_too_big" id="0x7F120F0D" />
+    <public type="string" name="guild_sticker_grid_upload_label" id="0x7F120F0E" />
+    <public type="string" name="guild_sticker_invalid_sticker" id="0x7F120F0F" />
+    <public type="string" name="guild_sticker_preview_img_alt_dark" id="0x7F120F10" />
+    <public type="string" name="guild_sticker_preview_img_alt_light" id="0x7F120F11" />
+    <public type="string" name="guild_sticker_settings_additional_slots" id="0x7F120F12" />
+    <public type="string" name="guild_sticker_settings_buy_level" id="0x7F120F13" />
+    <public type="string" name="guild_sticker_settings_remaining_slots_available" id="0x7F120F14" />
+    <public type="string" name="guild_sticker_unused_tier" id="0x7F120F15" />
+    <public type="string" name="guild_sticker_upload_description" id="0x7F120F16" />
+    <public type="string" name="guild_sticker_upload_description_placeholder" id="0x7F120F17" />
+    <public type="string" name="guild_sticker_upload_description_title" id="0x7F120F18" />
+    <public type="string" name="guild_sticker_upload_description_tooltip" id="0x7F120F19" />
+    <public type="string" name="guild_sticker_upload_file_button" id="0x7F120F1A" />
+    <public type="string" name="guild_sticker_upload_file_placeholder" id="0x7F120F1B" />
+    <public type="string" name="guild_sticker_upload_file_title" id="0x7F120F1C" />
+    <public type="string" name="guild_sticker_upload_file_title_blocked" id="0x7F120F1D" />
+    <public type="string" name="guild_sticker_upload_name_placeholder" id="0x7F120F1E" />
+    <public type="string" name="guild_sticker_upload_name_title" id="0x7F120F1F" />
+    <public type="string" name="guild_sticker_upload_preview_title" id="0x7F120F20" />
+    <public type="string" name="guild_sticker_upload_related_emoji_placeholder" id="0x7F120F21" />
+    <public type="string" name="guild_sticker_upload_related_emoji_title" id="0x7F120F22" />
+    <public type="string" name="guild_sticker_upload_title" id="0x7F120F23" />
+    <public type="string" name="guild_stickers_update" id="0x7F120F24" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_close_button" id="0x7F120F25" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description" id="0x7F120F26" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_generic_guild" id="0x7F120F27" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile1" id="0x7F120F28" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_mobile2" id="0x7F120F29" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_no_application" id="0x7F120F2A" />
+    <public type="string" name="guild_subscription_purchase_modal_apple" id="0x7F120F2B" />
+    <public type="string" name="guild_subscription_purchase_modal_counter" id="0x7F120F2C" />
+    <public type="string" name="guild_subscription_purchase_modal_external" id="0x7F120F2D" />
+    <public type="string" name="guild_subscription_purchase_modal_footer_discount" id="0x7F120F2E" />
+    <public type="string" name="guild_subscription_purchase_modal_footer_upsell" id="0x7F120F2F" />
+    <public type="string" name="guild_subscription_purchase_modal_footer_upsell_trial" id="0x7F120F30" />
+    <public type="string" name="guild_subscription_purchase_modal_invoice_row_content" id="0x7F120F31" />
+    <public type="string" name="guild_subscription_purchase_modal_payment_source_tooltip" id="0x7F120F32" />
+    <public type="string" name="guild_subscription_purchase_modal_purchase_details_header" id="0x7F120F33" />
+    <public type="string" name="guild_subscription_purchase_modal_step_select_description" id="0x7F120F34" />
+    <public type="string" name="guild_subscription_purchase_modal_submit" id="0x7F120F35" />
+    <public type="string" name="guild_subscription_purchase_modal_subtotal" id="0x7F120F36" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description" id="0x7F120F37" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description_generic_guild" id="0x7F120F38" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile1" id="0x7F120F39" />
+    <public type="string" name="guild_subscription_purchase_modal_transferred_description_mobile2" id="0x7F120F3A" />
+    <public type="string" name="guild_subscription_purchase_modal_unused_slot_notice" id="0x7F120F3B" />
+    <public type="string" name="guild_template_based_on" id="0x7F120F3C" />
+    <public type="string" name="guild_template_create_discord" id="0x7F120F3D" />
+    <public type="string" name="guild_template_default_server_name_campus_clubs" id="0x7F120F3E" />
+    <public type="string" name="guild_template_default_server_name_classroom" id="0x7F120F3F" />
+    <public type="string" name="guild_template_default_server_name_create_from_scratch" id="0x7F120F40" />
+    <public type="string" name="guild_template_default_server_name_creators_hobbies" id="0x7F120F41" />
+    <public type="string" name="guild_template_default_server_name_friends_family" id="0x7F120F42" />
+    <public type="string" name="guild_template_default_server_name_global_communities" id="0x7F120F43" />
+    <public type="string" name="guild_template_default_server_name_local_communities" id="0x7F120F44" />
+    <public type="string" name="guild_template_default_server_name_study_groups" id="0x7F120F45" />
+    <public type="string" name="guild_template_embed_view_in_app" id="0x7F120F46" />
+    <public type="string" name="guild_template_header_class" id="0x7F120F47" />
+    <public type="string" name="guild_template_header_clubs" id="0x7F120F48" />
+    <public type="string" name="guild_template_header_community" id="0x7F120F49" />
+    <public type="string" name="guild_template_header_create" id="0x7F120F4A" />
+    <public type="string" name="guild_template_header_creator" id="0x7F120F4B" />
+    <public type="string" name="guild_template_header_dorm" id="0x7F120F4C" />
+    <public type="string" name="guild_template_header_friend" id="0x7F120F4D" />
+    <public type="string" name="guild_template_header_gaming" id="0x7F120F4E" />
+    <public type="string" name="guild_template_header_major" id="0x7F120F4F" />
+    <public type="string" name="guild_template_header_school_club" id="0x7F120F50" />
+    <public type="string" name="guild_template_header_social" id="0x7F120F51" />
+    <public type="string" name="guild_template_header_study" id="0x7F120F52" />
+    <public type="string" name="guild_template_invalid_subtitle" id="0x7F120F53" />
+    <public type="string" name="guild_template_invalid_title" id="0x7F120F54" />
+    <public type="string" name="guild_template_mobile_invalid_cta" id="0x7F120F55" />
+    <public type="string" name="guild_template_mobile_invalid_error" id="0x7F120F56" />
+    <public type="string" name="guild_template_modal_channels_descriptions" id="0x7F120F57" />
+    <public type="string" name="guild_template_modal_channels_header" id="0x7F120F58" />
+    <public type="string" name="guild_template_modal_channels_tip" id="0x7F120F59" />
+    <public type="string" name="guild_template_modal_description_campus_clubs" id="0x7F120F5A" />
+    <public type="string" name="guild_template_modal_description_classroom" id="0x7F120F5B" />
+    <public type="string" name="guild_template_modal_description_create_from_scratch" id="0x7F120F5C" />
+    <public type="string" name="guild_template_modal_description_creators_hobbies" id="0x7F120F5D" />
+    <public type="string" name="guild_template_modal_description_friends_family" id="0x7F120F5E" />
+    <public type="string" name="guild_template_modal_description_github_hackathon" id="0x7F120F5F" />
+    <public type="string" name="guild_template_modal_description_global_communities" id="0x7F120F60" />
+    <public type="string" name="guild_template_modal_description_league_clubs" id="0x7F120F61" />
+    <public type="string" name="guild_template_modal_description_local_communities" id="0x7F120F62" />
+    <public type="string" name="guild_template_modal_description_study_groups" id="0x7F120F63" />
+    <public type="string" name="guild_template_modal_error_title" id="0x7F120F64" />
+    <public type="string" name="guild_template_modal_roles_description" id="0x7F120F65" />
+    <public type="string" name="guild_template_modal_roles_header" id="0x7F120F66" />
+    <public type="string" name="guild_template_modal_roles_header2" id="0x7F120F67" />
+    <public type="string" name="guild_template_modal_title" id="0x7F120F68" />
+    <public type="string" name="guild_template_modal_title_campus_clubs" id="0x7F120F69" />
+    <public type="string" name="guild_template_modal_title_classroom" id="0x7F120F6A" />
+    <public type="string" name="guild_template_modal_title_create_from_scratch" id="0x7F120F6B" />
+    <public type="string" name="guild_template_modal_title_creators_hobbies" id="0x7F120F6C" />
+    <public type="string" name="guild_template_modal_title_friends_family" id="0x7F120F6D" />
+    <public type="string" name="guild_template_modal_title_github_hackathon" id="0x7F120F6E" />
+    <public type="string" name="guild_template_modal_title_global_communities" id="0x7F120F6F" />
+    <public type="string" name="guild_template_modal_title_league_clubs" id="0x7F120F70" />
+    <public type="string" name="guild_template_modal_title_local_communities" id="0x7F120F71" />
+    <public type="string" name="guild_template_modal_title_study_groups" id="0x7F120F72" />
+    <public type="string" name="guild_template_name_announcements" id="0x7F120F73" />
+    <public type="string" name="guild_template_name_assignments" id="0x7F120F74" />
+    <public type="string" name="guild_template_name_category_chat" id="0x7F120F75" />
+    <public type="string" name="guild_template_name_category_info" id="0x7F120F76" />
+    <public type="string" name="guild_template_name_category_information" id="0x7F120F77" />
+    <public type="string" name="guild_template_name_category_text" id="0x7F120F78" />
+    <public type="string" name="guild_template_name_category_voice" id="0x7F120F79" />
+    <public type="string" name="guild_template_name_clips_and_highlights" id="0x7F120F7A" />
+    <public type="string" name="guild_template_name_dorm_news" id="0x7F120F7B" />
+    <public type="string" name="guild_template_name_events" id="0x7F120F7C" />
+    <public type="string" name="guild_template_name_game" id="0x7F120F7D" />
+    <public type="string" name="guild_template_name_game_new" id="0x7F120F7E" />
+    <public type="string" name="guild_template_name_game_room" id="0x7F120F7F" />
+    <public type="string" name="guild_template_name_general" id="0x7F120F80" />
+    <public type="string" name="guild_template_name_giveaways" id="0x7F120F81" />
+    <public type="string" name="guild_template_name_help_questions" id="0x7F120F82" />
+    <public type="string" name="guild_template_name_homework" id="0x7F120F83" />
+    <public type="string" name="guild_template_name_homework_help" id="0x7F120F84" />
+    <public type="string" name="guild_template_name_ideas_and_feedback" id="0x7F120F85" />
+    <public type="string" name="guild_template_name_introductions" id="0x7F120F86" />
+    <public type="string" name="guild_template_name_meeting_plans" id="0x7F120F87" />
+    <public type="string" name="guild_template_name_meetups" id="0x7F120F88" />
+    <public type="string" name="guild_template_name_memes" id="0x7F120F89" />
+    <public type="string" name="guild_template_name_music" id="0x7F120F8A" />
+    <public type="string" name="guild_template_name_notes" id="0x7F120F8B" />
+    <public type="string" name="guild_template_name_notes_resources" id="0x7F120F8C" />
+    <public type="string" name="guild_template_name_off_topic" id="0x7F120F8D" />
+    <public type="string" name="guild_template_name_random" id="0x7F120F8E" />
+    <public type="string" name="guild_template_name_resources" id="0x7F120F8F" />
+    <public type="string" name="guild_template_name_session_planning" id="0x7F120F90" />
+    <public type="string" name="guild_template_name_social" id="0x7F120F91" />
+    <public type="string" name="guild_template_name_strategy" id="0x7F120F92" />
+    <public type="string" name="guild_template_name_voice_community_hangout" id="0x7F120F93" />
+    <public type="string" name="guild_template_name_voice_couches" id="0x7F120F94" />
+    <public type="string" name="guild_template_name_voice_gaming" id="0x7F120F95" />
+    <public type="string" name="guild_template_name_voice_general" id="0x7F120F96" />
+    <public type="string" name="guild_template_name_voice_lobby" id="0x7F120F97" />
+    <public type="string" name="guild_template_name_voice_lounge" id="0x7F120F98" />
+    <public type="string" name="guild_template_name_voice_meeting_room" id="0x7F120F99" />
+    <public type="string" name="guild_template_name_voice_meeting_room_1" id="0x7F120F9A" />
+    <public type="string" name="guild_template_name_voice_meeting_room_2" id="0x7F120F9B" />
+    <public type="string" name="guild_template_name_voice_movie_room" id="0x7F120F9C" />
+    <public type="string" name="guild_template_name_voice_stream_room" id="0x7F120F9D" />
+    <public type="string" name="guild_template_name_voice_study_room" id="0x7F120F9E" />
+    <public type="string" name="guild_template_name_voice_unnumbered_study_room" id="0x7F120F9F" />
+    <public type="string" name="guild_template_name_welcome" id="0x7F120FA0" />
+    <public type="string" name="guild_template_name_welcome_and_rules" id="0x7F120FA1" />
+    <public type="string" name="guild_template_open" id="0x7F120FA2" />
+    <public type="string" name="guild_template_preview_description" id="0x7F120FA3" />
+    <public type="string" name="guild_template_preview_protip_body" id="0x7F120FA4" />
+    <public type="string" name="guild_template_preview_title" id="0x7F120FA5" />
+    <public type="string" name="guild_template_resolved_embed_title" id="0x7F120FA6" />
+    <public type="string" name="guild_template_resolving_title" id="0x7F120FA7" />
+    <public type="string" name="guild_template_selector_description" id="0x7F120FA8" />
+    <public type="string" name="guild_template_selector_option_header" id="0x7F120FA9" />
+    <public type="string" name="guild_template_selector_suggestion" id="0x7F120FAA" />
+    <public type="string" name="guild_template_selector_title" id="0x7F120FAB" />
+    <public type="string" name="guild_template_settings_description" id="0x7F120FAC" />
+    <public type="string" name="guild_template_setup_discord" id="0x7F120FAD" />
+    <public type="string" name="guild_template_usages" id="0x7F120FAE" />
+    <public type="string" name="guild_template_usages_by_creator2" id="0x7F120FAF" />
+    <public type="string" name="guild_template_usages_no_bold" id="0x7F120FB0" />
+    <public type="string" name="guild_templates" id="0x7F120FB1" />
+    <public type="string" name="guild_templates_create_link" id="0x7F120FB2" />
+    <public type="string" name="guild_templates_default_template_name" id="0x7F120FB3" />
+    <public type="string" name="guild_templates_delete_description" id="0x7F120FB4" />
+    <public type="string" name="guild_templates_delete_template" id="0x7F120FB5" />
+    <public type="string" name="guild_templates_delete_template_link" id="0x7F120FB6" />
+    <public type="string" name="guild_templates_form_description_channels" id="0x7F120FB7" />
+    <public type="string" name="guild_templates_form_description_members" id="0x7F120FB8" />
+    <public type="string" name="guild_templates_form_description_messages" id="0x7F120FB9" />
+    <public type="string" name="guild_templates_form_description_perks" id="0x7F120FBA" />
+    <public type="string" name="guild_templates_form_description_roles" id="0x7F120FBB" />
+    <public type="string" name="guild_templates_form_description_settings" id="0x7F120FBC" />
+    <public type="string" name="guild_templates_form_description_will_copy" id="0x7F120FBD" />
+    <public type="string" name="guild_templates_form_description_wont_copy" id="0x7F120FBE" />
+    <public type="string" name="guild_templates_form_error_name_required" id="0x7F120FBF" />
+    <public type="string" name="guild_templates_form_label_description" id="0x7F120FC0" />
+    <public type="string" name="guild_templates_form_label_icon" id="0x7F120FC1" />
+    <public type="string" name="guild_templates_form_label_link" id="0x7F120FC2" />
+    <public type="string" name="guild_templates_form_label_name" id="0x7F120FC3" />
+    <public type="string" name="guild_templates_form_label_server_name_classroom" id="0x7F120FC4" />
+    <public type="string" name="guild_templates_form_label_server_name_create_from_scratch" id="0x7F120FC5" />
+    <public type="string" name="guild_templates_form_label_server_name_creators_hobbies" id="0x7F120FC6" />
+    <public type="string" name="guild_templates_form_label_server_name_friends_family" id="0x7F120FC7" />
+    <public type="string" name="guild_templates_form_label_server_name_global_communities" id="0x7F120FC8" />
+    <public type="string" name="guild_templates_form_label_server_name_local_communities" id="0x7F120FC9" />
+    <public type="string" name="guild_templates_form_label_server_name_study_groups" id="0x7F120FCA" />
+    <public type="string" name="guild_templates_form_placeholder_description" id="0x7F120FCB" />
+    <public type="string" name="guild_templates_form_placeholder_name" id="0x7F120FCC" />
+    <public type="string" name="guild_templates_last_sync" id="0x7F120FCD" />
+    <public type="string" name="guild_templates_preview_template" id="0x7F120FCE" />
+    <public type="string" name="guild_templates_promotion_tooltip" id="0x7F120FCF" />
+    <public type="string" name="guild_templates_promotion_tooltip_aria_label" id="0x7F120FD0" />
+    <public type="string" name="guild_templates_sync_description" id="0x7F120FD1" />
+    <public type="string" name="guild_templates_sync_template" id="0x7F120FD2" />
+    <public type="string" name="guild_templates_template_sync" id="0x7F120FD3" />
+    <public type="string" name="guild_templates_unsynced_tooltip" id="0x7F120FD4" />
+    <public type="string" name="guild_templates_unsynced_warning" id="0x7F120FD5" />
+    <public type="string" name="guild_tooltip_a11y_label" id="0x7F120FD6" />
+    <public type="string" name="guild_unavailable_body" id="0x7F120FD7" />
+    <public type="string" name="guild_unavailable_header" id="0x7F120FD8" />
+    <public type="string" name="guild_unavailable_title" id="0x7F120FD9" />
+    <public type="string" name="guild_verification_text_account_age" id="0x7F120FDA" />
+    <public type="string" name="guild_verification_text_member_age" id="0x7F120FDB" />
+    <public type="string" name="guild_verification_text_not_claimed" id="0x7F120FDC" />
+    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7F120FDD" />
+    <public type="string" name="guild_verification_text_not_verified" id="0x7F120FDE" />
+    <public type="string" name="guild_verification_voice_account_age" id="0x7F120FDF" />
+    <public type="string" name="guild_verification_voice_header" id="0x7F120FE0" />
+    <public type="string" name="guild_verification_voice_member_age" id="0x7F120FE1" />
+    <public type="string" name="guild_verification_voice_not_claimed" id="0x7F120FE2" />
+    <public type="string" name="guild_verification_voice_not_phone_verified" id="0x7F120FE3" />
+    <public type="string" name="guild_verification_voice_not_verified" id="0x7F120FE4" />
+    <public type="string" name="guild_verified" id="0x7F120FE5" />
+    <public type="string" name="guild_verified_and_partnered" id="0x7F120FE6" />
+    <public type="string" name="guild_video_call_marketing_popout_body" id="0x7F120FE7" />
+    <public type="string" name="guild_video_call_marketing_popout_header" id="0x7F120FE8" />
+    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7F120FE9" />
+    <public type="string" name="guilds_bar_a11y_label" id="0x7F120FEA" />
+    <public type="string" name="hardware_acceleration" id="0x7F120FEB" />
+    <public type="string" name="hardware_acceleration_help_text" id="0x7F120FEC" />
+    <public type="string" name="help" id="0x7F120FED" />
+    <public type="string" name="help_clear_permissions" id="0x7F120FEE" />
+    <public type="string" name="help_desk" id="0x7F120FEF" />
+    <public type="string" name="help_missing_manage_roles_permission" id="0x7F120FF0" />
+    <public type="string" name="help_missing_permission" id="0x7F120FF1" />
+    <public type="string" name="help_role_locked" id="0x7F120FF2" />
+    <public type="string" name="help_role_locked_mine" id="0x7F120FF3" />
+    <public type="string" name="help_roles_description" id="0x7F120FF4" />
+    <public type="string" name="help_singular_permission" id="0x7F120FF5" />
+    <public type="string" name="hi" id="0x7F120FF6" />
+    <public type="string" name="hide" id="0x7F120FF7" />
+    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7F120FF8" />
+    <public type="string" name="hide_chat" id="0x7F120FF9" />
+    <public type="string" name="hide_instant_invites_description" id="0x7F120FFA" />
+    <public type="string" name="hide_instant_invites_label" id="0x7F120FFB" />
+    <public type="string" name="hide_muted" id="0x7F120FFC" />
+    <public type="string" name="hide_muted_channels" id="0x7F120FFD" />
+    <public type="string" name="hide_navigation" id="0x7F120FFE" />
+    <public type="string" name="hide_personal_information_description" id="0x7F120FFF" />
+    <public type="string" name="hide_personal_information_label" id="0x7F121000" />
+    <public type="string" name="hold_up" id="0x7F121001" />
+    <public type="string" name="home" id="0x7F121002" />
+    <public type="string" name="how_to_invite_others" id="0x7F121003" />
+    <public type="string" name="hr" id="0x7F121004" />
+    <public type="string" name="hu" id="0x7F121005" />
+    <public type="string" name="hub_add_guild_description_help" id="0x7F121006" />
+    <public type="string" name="hub_add_guild_description_placeholder" id="0x7F121007" />
+    <public type="string" name="hub_add_guild_description_title" id="0x7F121008" />
+    <public type="string" name="hub_add_or_create_server_confirmation_title" id="0x7F121009" />
+    <public type="string" name="hub_add_server_confirmation_button" id="0x7F12100A" />
+    <public type="string" name="hub_add_server_confirmation_subtitle" id="0x7F12100B" />
+    <public type="string" name="hub_add_server_cta" id="0x7F12100C" />
+    <public type="string" name="hub_choose_guild_empty" id="0x7F12100D" />
+    <public type="string" name="hub_choose_guild_subtitle" id="0x7F12100E" />
+    <public type="string" name="hub_choose_guild_title" id="0x7F12100F" />
+    <public type="string" name="hub_create_guild_cta" id="0x7F121010" />
+    <public type="string" name="hub_create_guild_label" id="0x7F121011" />
+    <public type="string" name="hub_create_or_add_guild_subtitle" id="0x7F121012" />
+    <public type="string" name="hub_create_or_add_guild_title" id="0x7F121013" />
+    <public type="string" name="hub_create_server_confirmation_go" id="0x7F121014" />
+    <public type="string" name="hub_create_server_confirmation_stay" id="0x7F121015" />
+    <public type="string" name="hub_create_server_confirmation_subtitle" id="0x7F121016" />
+    <public type="string" name="hub_customize_existing_guild_title" id="0x7F121017" />
+    <public type="string" name="hub_customize_new_guild_subtitle" id="0x7F121018" />
+    <public type="string" name="hub_directory_card_joined_guild_button" id="0x7F121019" />
+    <public type="string" name="hub_directory_channel_empty_add_server" id="0x7F12101A" />
+    <public type="string" name="hub_directory_channel_empty_invite" id="0x7F12101B" />
+    <public type="string" name="hub_directory_channel_empty_subtitle" id="0x7F12101C" />
+    <public type="string" name="hub_directory_channel_empty_title" id="0x7F12101D" />
+    <public type="string" name="hub_directory_channel_title" id="0x7F12101E" />
+    <public type="string" name="hub_directory_search_subtitle" id="0x7F12101F" />
+    <public type="string" name="hub_directory_search_title" id="0x7F121020" />
+    <public type="string" name="hub_discord_hub" id="0x7F121021" />
+    <public type="string" name="hub_discord_hubs" id="0x7F121022" />
+    <public type="string" name="hub_discovery_description" id="0x7F121023" />
+    <public type="string" name="hub_discovery_footer_description" id="0x7F121024" />
+    <public type="string" name="hub_discovery_header" id="0x7F121025" />
+    <public type="string" name="hub_email_confirmation_description" id="0x7F121026" />
+    <public type="string" name="hub_email_confirmation_different_email" id="0x7F121027" />
+    <public type="string" name="hub_email_confirmation_header" id="0x7F121028" />
+    <public type="string" name="hub_email_confirmation_resend" id="0x7F121029" />
+    <public type="string" name="hub_email_connection_add_description" id="0x7F12102A" />
+    <public type="string" name="hub_email_connection_add_header" id="0x7F12102B" />
+    <public type="string" name="hub_email_connection_content_button" id="0x7F12102C" />
+    <public type="string" name="hub_email_connection_content_description" id="0x7F12102D" />
+    <public type="string" name="hub_email_connection_content_header" id="0x7F12102E" />
+    <public type="string" name="hub_email_connection_content_input_description" id="0x7F12102F" />
+    <public type="string" name="hub_email_connection_content_input_header" id="0x7F121030" />
+    <public type="string" name="hub_email_connection_content_input_placeholder" id="0x7F121031" />
+    <public type="string" name="hub_email_connection_invite_header" id="0x7F121032" />
+    <public type="string" name="hub_email_connection_join_another" id="0x7F121033" />
+    <public type="string" name="hub_email_connection_sidebar_description" id="0x7F121034" />
+    <public type="string" name="hub_email_connection_sidebar_header" id="0x7F121035" />
+    <public type="string" name="hub_entry_invite_subtitle" id="0x7F121036" />
+    <public type="string" name="hub_entry_remove" id="0x7F121037" />
+    <public type="string" name="hub_entry_remove_body" id="0x7F121038" />
+    <public type="string" name="hub_entry_update" id="0x7F121039" />
+    <public type="string" name="hub_entry_update_description_title" id="0x7F12103A" />
+    <public type="string" name="hub_invite_another_school_link" id="0x7F12103B" />
+    <public type="string" name="hub_invite_button_title_invited" id="0x7F12103C" />
+    <public type="string" name="hub_invite_button_title_inviter" id="0x7F12103D" />
+    <public type="string" name="hub_real_name_cta" id="0x7F12103E" />
+    <public type="string" name="hub_real_name_modal_form_placeholder" id="0x7F12103F" />
+    <public type="string" name="hub_real_name_modal_form_title" id="0x7F121040" />
+    <public type="string" name="hub_real_name_modal_header" id="0x7F121041" />
+    <public type="string" name="hub_real_name_modal_subheader" id="0x7F121042" />
+    <public type="string" name="hub_sidebar_add_servers" id="0x7F121043" />
+    <public type="string" name="hub_sidebar_invite_members" id="0x7F121044" />
+    <public type="string" name="hub_sidebar_join_servers" id="0x7F121045" />
+    <public type="string" name="hub_verified_discord_hub" id="0x7F121046" />
+    <public type="string" name="hub_waitlist_modal_form_description" id="0x7F121047" />
+    <public type="string" name="hub_waitlist_modal_form_placeholder" id="0x7F121048" />
+    <public type="string" name="hub_waitlist_modal_form_title" id="0x7F121049" />
+    <public type="string" name="hub_waitlist_modal_join_header" id="0x7F12104A" />
+    <public type="string" name="hub_waitlist_modal_join_subheader" id="0x7F12104B" />
+    <public type="string" name="hub_waitlist_modal_joined_header" id="0x7F12104C" />
+    <public type="string" name="humanize_duration_a_few_seconds" id="0x7F12104D" />
+    <public type="string" name="humanize_duration_days" id="0x7F12104E" />
+    <public type="string" name="humanize_duration_hours" id="0x7F12104F" />
+    <public type="string" name="humanize_duration_minutes" id="0x7F121050" />
+    <public type="string" name="humanize_duration_seconds" id="0x7F121051" />
+    <public type="string" name="hypesquad_attendee_cta" id="0x7F121052" />
+    <public type="string" name="hypesquad_badge_tooltip" id="0x7F121053" />
+    <public type="string" name="hypesquad_description_house_1" id="0x7F121054" />
+    <public type="string" name="hypesquad_description_house_2" id="0x7F121055" />
+    <public type="string" name="hypesquad_description_house_3" id="0x7F121056" />
+    <public type="string" name="hypesquad_error_body" id="0x7F121057" />
+    <public type="string" name="hypesquad_error_heading" id="0x7F121058" />
+    <public type="string" name="hypesquad_heading" id="0x7F121059" />
+    <public type="string" name="hypesquad_heading_existing_member" id="0x7F12105A" />
+    <public type="string" name="hypesquad_house_1" id="0x7F12105B" />
+    <public type="string" name="hypesquad_house_2" id="0x7F12105C" />
+    <public type="string" name="hypesquad_house_3" id="0x7F12105D" />
+    <public type="string" name="hypesquad_join" id="0x7F12105E" />
+    <public type="string" name="hypesquad_leave_action" id="0x7F12105F" />
+    <public type="string" name="hypesquad_leave_error" id="0x7F121060" />
+    <public type="string" name="hypesquad_leave_prompt" id="0x7F121061" />
+    <public type="string" name="hypesquad_membership_heading" id="0x7F121062" />
+    <public type="string" name="hypesquad_newsletter_warning" id="0x7F121063" />
+    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7F121064" />
+    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7F121065" />
+    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7F121066" />
+    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7F121067" />
+    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7F121068" />
+    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7F121069" />
+    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7F12106A" />
+    <public type="string" name="hypesquad_perks_heading" id="0x7F12106B" />
+    <public type="string" name="hypesquad_question_0_prompt" id="0x7F12106C" />
+    <public type="string" name="hypesquad_question_0_response_a" id="0x7F12106D" />
+    <public type="string" name="hypesquad_question_0_response_b" id="0x7F12106E" />
+    <public type="string" name="hypesquad_question_0_response_c" id="0x7F12106F" />
+    <public type="string" name="hypesquad_question_0_response_d" id="0x7F121070" />
+    <public type="string" name="hypesquad_question_10_prompt" id="0x7F121071" />
+    <public type="string" name="hypesquad_question_10_response_a" id="0x7F121072" />
+    <public type="string" name="hypesquad_question_10_response_b" id="0x7F121073" />
+    <public type="string" name="hypesquad_question_10_response_c" id="0x7F121074" />
+    <public type="string" name="hypesquad_question_10_response_d" id="0x7F121075" />
+    <public type="string" name="hypesquad_question_11_prompt" id="0x7F121076" />
+    <public type="string" name="hypesquad_question_11_response_a" id="0x7F121077" />
+    <public type="string" name="hypesquad_question_11_response_b" id="0x7F121078" />
+    <public type="string" name="hypesquad_question_11_response_c" id="0x7F121079" />
+    <public type="string" name="hypesquad_question_11_response_d" id="0x7F12107A" />
+    <public type="string" name="hypesquad_question_12_prompt" id="0x7F12107B" />
+    <public type="string" name="hypesquad_question_12_response_a" id="0x7F12107C" />
+    <public type="string" name="hypesquad_question_12_response_b" id="0x7F12107D" />
+    <public type="string" name="hypesquad_question_12_response_c" id="0x7F12107E" />
+    <public type="string" name="hypesquad_question_12_response_d" id="0x7F12107F" />
+    <public type="string" name="hypesquad_question_13_prompt" id="0x7F121080" />
+    <public type="string" name="hypesquad_question_13_response_a" id="0x7F121081" />
+    <public type="string" name="hypesquad_question_13_response_b" id="0x7F121082" />
+    <public type="string" name="hypesquad_question_13_response_c" id="0x7F121083" />
+    <public type="string" name="hypesquad_question_13_response_d" id="0x7F121084" />
+    <public type="string" name="hypesquad_question_14_prompt" id="0x7F121085" />
+    <public type="string" name="hypesquad_question_14_response_a" id="0x7F121086" />
+    <public type="string" name="hypesquad_question_14_response_b" id="0x7F121087" />
+    <public type="string" name="hypesquad_question_14_response_c" id="0x7F121088" />
+    <public type="string" name="hypesquad_question_14_response_d" id="0x7F121089" />
+    <public type="string" name="hypesquad_question_1_prompt" id="0x7F12108A" />
+    <public type="string" name="hypesquad_question_1_response_a" id="0x7F12108B" />
+    <public type="string" name="hypesquad_question_1_response_b" id="0x7F12108C" />
+    <public type="string" name="hypesquad_question_1_response_c" id="0x7F12108D" />
+    <public type="string" name="hypesquad_question_1_response_d" id="0x7F12108E" />
+    <public type="string" name="hypesquad_question_2_prompt" id="0x7F12108F" />
+    <public type="string" name="hypesquad_question_2_response_a" id="0x7F121090" />
+    <public type="string" name="hypesquad_question_2_response_b" id="0x7F121091" />
+    <public type="string" name="hypesquad_question_2_response_c" id="0x7F121092" />
+    <public type="string" name="hypesquad_question_2_response_d" id="0x7F121093" />
+    <public type="string" name="hypesquad_question_3_prompt" id="0x7F121094" />
+    <public type="string" name="hypesquad_question_3_response_a" id="0x7F121095" />
+    <public type="string" name="hypesquad_question_3_response_b" id="0x7F121096" />
+    <public type="string" name="hypesquad_question_3_response_c" id="0x7F121097" />
+    <public type="string" name="hypesquad_question_3_response_d" id="0x7F121098" />
+    <public type="string" name="hypesquad_question_4_prompt" id="0x7F121099" />
+    <public type="string" name="hypesquad_question_4_response_a" id="0x7F12109A" />
+    <public type="string" name="hypesquad_question_4_response_b" id="0x7F12109B" />
+    <public type="string" name="hypesquad_question_4_response_c" id="0x7F12109C" />
+    <public type="string" name="hypesquad_question_4_response_d" id="0x7F12109D" />
+    <public type="string" name="hypesquad_question_5_prompt" id="0x7F12109E" />
+    <public type="string" name="hypesquad_question_5_response_a" id="0x7F12109F" />
+    <public type="string" name="hypesquad_question_5_response_b" id="0x7F1210A0" />
+    <public type="string" name="hypesquad_question_5_response_c" id="0x7F1210A1" />
+    <public type="string" name="hypesquad_question_5_response_d" id="0x7F1210A2" />
+    <public type="string" name="hypesquad_question_6_prompt" id="0x7F1210A3" />
+    <public type="string" name="hypesquad_question_6_response_a" id="0x7F1210A4" />
+    <public type="string" name="hypesquad_question_6_response_b" id="0x7F1210A5" />
+    <public type="string" name="hypesquad_question_6_response_c" id="0x7F1210A6" />
+    <public type="string" name="hypesquad_question_6_response_d" id="0x7F1210A7" />
+    <public type="string" name="hypesquad_question_7_prompt" id="0x7F1210A8" />
+    <public type="string" name="hypesquad_question_7_response_a" id="0x7F1210A9" />
+    <public type="string" name="hypesquad_question_7_response_b" id="0x7F1210AA" />
+    <public type="string" name="hypesquad_question_7_response_c" id="0x7F1210AB" />
+    <public type="string" name="hypesquad_question_7_response_d" id="0x7F1210AC" />
+    <public type="string" name="hypesquad_question_8_prompt" id="0x7F1210AD" />
+    <public type="string" name="hypesquad_question_8_response_a" id="0x7F1210AE" />
+    <public type="string" name="hypesquad_question_8_response_b" id="0x7F1210AF" />
+    <public type="string" name="hypesquad_question_8_response_c" id="0x7F1210B0" />
+    <public type="string" name="hypesquad_question_8_response_d" id="0x7F1210B1" />
+    <public type="string" name="hypesquad_question_9_prompt" id="0x7F1210B2" />
+    <public type="string" name="hypesquad_question_9_response_a" id="0x7F1210B3" />
+    <public type="string" name="hypesquad_question_9_response_b" id="0x7F1210B4" />
+    <public type="string" name="hypesquad_question_9_response_c" id="0x7F1210B5" />
+    <public type="string" name="hypesquad_question_9_response_d" id="0x7F1210B6" />
+    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7F1210B7" />
+    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7F1210B8" />
+    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7F1210B9" />
+    <public type="string" name="hypesquad_quiz_cancel" id="0x7F1210BA" />
+    <public type="string" name="hypesquad_quiz_close" id="0x7F1210BB" />
+    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7F1210BC" />
+    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7F1210BD" />
+    <public type="string" name="hypesquad_quiz_next_question" id="0x7F1210BE" />
+    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7F1210BF" />
+    <public type="string" name="hypesquad_quiz_retry" id="0x7F1210C0" />
+    <public type="string" name="hypesquad_quiz_select_answer" id="0x7F1210C1" />
+    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7F1210C2" />
+    <public type="string" name="hypesquad_quiz_title" id="0x7F1210C3" />
+    <public type="string" name="hypesquad_ready_to_rep" id="0x7F1210C4" />
+    <public type="string" name="hypesquad_subheading" id="0x7F1210C5" />
+    <public type="string" name="hypesquad_switch_houses_action" id="0x7F1210C6" />
+    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7F1210C7" />
+    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7F1210C8" />
+    <public type="string" name="hypesquad_unverified_email_notice" id="0x7F1210C9" />
+    <public type="string" name="hypesquad_your_house" id="0x7F1210CA" />
+    <public type="string" name="i18n_locale_loading_error" id="0x7F1210CB" />
+    <public type="string" name="icon_content_description" id="0x7F1210CC" />
+    <public type="string" name="image" id="0x7F1210CD" />
+    <public type="string" name="image_actions_menu_label" id="0x7F1210CE" />
+    <public type="string" name="image_compression" id="0x7F1210CF" />
+    <public type="string" name="image_compression_label" id="0x7F1210D0" />
+    <public type="string" name="image_compression_nitro_upsell" id="0x7F1210D1" />
+    <public type="string" name="images" id="0x7F1210D2" />
+    <public type="string" name="img_alt_attachment_file_type" id="0x7F1210D3" />
+    <public type="string" name="img_alt_emoji" id="0x7F1210D4" />
+    <public type="string" name="img_alt_icon" id="0x7F1210D5" />
+    <public type="string" name="img_alt_logo" id="0x7F1210D6" />
+    <public type="string" name="in_category" id="0x7F1210D7" />
+    <public type="string" name="in_game_voice_settings" id="0x7F1210D8" />
+    <public type="string" name="in_the_voice_channel" id="0x7F1210D9" />
+    <public type="string" name="inaccessible_channel_link_subtitle" id="0x7F1210DA" />
+    <public type="string" name="inaccessible_channel_link_title" id="0x7F1210DB" />
+    <public type="string" name="inbox" id="0x7F1210DC" />
+    <public type="string" name="incentivized_install_notice" id="0x7F1210DD" />
+    <public type="string" name="incentivized_install_premium_settings_banner" id="0x7F1210DE" />
+    <public type="string" name="incoming_call" id="0x7F1210DF" />
+    <public type="string" name="incoming_call_ellipsis" id="0x7F1210E0" />
+    <public type="string" name="incoming_call_preview_camera" id="0x7F1210E1" />
+    <public type="string" name="incoming_friend_request" id="0x7F1210E2" />
+    <public type="string" name="incoming_friend_request_from" id="0x7F1210E3" />
+    <public type="string" name="incoming_friend_requests_count" id="0x7F1210E4" />
+    <public type="string" name="incoming_video_call" id="0x7F1210E5" />
+    <public type="string" name="incoming_video_call_ellipsis" id="0x7F1210E6" />
+    <public type="string" name="incompatible_browser" id="0x7F1210E7" />
+    <public type="string" name="inivte_modal_no_thanks" id="0x7F1210E8" />
+    <public type="string" name="inline_attachment_media" id="0x7F1210E9" />
+    <public type="string" name="inline_attachment_media_help" id="0x7F1210EA" />
+    <public type="string" name="inline_embed_media" id="0x7F1210EB" />
+    <public type="string" name="inline_media_label" id="0x7F1210EC" />
+    <public type="string" name="input_device" id="0x7F1210ED" />
+    <public type="string" name="input_mode_ptt" id="0x7F1210EE" />
+    <public type="string" name="input_mode_ptt_limited" id="0x7F1210EF" />
+    <public type="string" name="input_mode_ptt_release_delay" id="0x7F1210F0" />
+    <public type="string" name="input_mode_vad" id="0x7F1210F1" />
+    <public type="string" name="instagram" id="0x7F1210F2" />
+    <public type="string" name="install_location_main" id="0x7F1210F3" />
+    <public type="string" name="instant_invite" id="0x7F1210F4" />
+    <public type="string" name="instant_invite_accept" id="0x7F1210F5" />
+    <public type="string" name="instant_invite_accept_stage" id="0x7F1210F6" />
+    <public type="string" name="instant_invite_accepting" id="0x7F1210F7" />
+    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7F1210F8" />
+    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7F1210F9" />
+    <public type="string" name="instant_invite_banned" id="0x7F1210FA" />
+    <public type="string" name="instant_invite_banned_info" id="0x7F1210FB" />
+    <public type="string" name="instant_invite_expired" id="0x7F1210FC" />
+    <public type="string" name="instant_invite_expires" id="0x7F1210FD" />
+    <public type="string" name="instant_invite_failed_to_generate" id="0x7F1210FE" />
+    <public type="string" name="instant_invite_friends" id="0x7F1210FF" />
+    <public type="string" name="instant_invite_friends_description" id="0x7F121100" />
+    <public type="string" name="instant_invite_generated_by_widget" id="0x7F121101" />
+    <public type="string" name="instant_invite_guild_by_user" id="0x7F121102" />
+    <public type="string" name="instant_invite_guild_members_online" id="0x7F121103" />
+    <public type="string" name="instant_invite_guild_members_total" id="0x7F121104" />
+    <public type="string" name="instant_invite_hidden" id="0x7F121105" />
+    <public type="string" name="instant_invite_invalid_channel" id="0x7F121106" />
+    <public type="string" name="instant_invite_invite_code" id="0x7F121107" />
+    <public type="string" name="instant_invite_inviter" id="0x7F121108" />
+    <public type="string" name="instant_invite_looks_like" id="0x7F121109" />
+    <public type="string" name="instant_invite_not_allowed" id="0x7F12110A" />
+    <public type="string" name="instant_invite_resolved_title" id="0x7F12110B" />
+    <public type="string" name="instant_invite_resolving" id="0x7F12110C" />
+    <public type="string" name="instant_invite_uses" id="0x7F12110D" />
+    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7F12110E" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7F12110F" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7F121110" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7F121111" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm_by_user" id="0x7F121112" />
+    <public type="string" name="instant_invite_you_have_joined" id="0x7F121113" />
+    <public type="string" name="instant_invites" id="0x7F121114" />
+    <public type="string" name="integration_added_date" id="0x7F121115" />
+    <public type="string" name="integration_added_user" id="0x7F121116" />
+    <public type="string" name="integration_added_user_date" id="0x7F121117" />
+    <public type="string" name="integration_created_date" id="0x7F121118" />
+    <public type="string" name="integration_created_user_date" id="0x7F121119" />
+    <public type="string" name="integration_settings" id="0x7F12111A" />
+    <public type="string" name="integrations" id="0x7F12111B" />
+    <public type="string" name="integrations_account_description" id="0x7F12111C" />
+    <public type="string" name="integrations_application_added_by" id="0x7F12111D" />
+    <public type="string" name="integrations_application_bot" id="0x7F12111E" />
+    <public type="string" name="integrations_application_bot_name" id="0x7F12111F" />
+    <public type="string" name="integrations_application_button" id="0x7F121120" />
+    <public type="string" name="integrations_application_denied_permissions" id="0x7F121121" />
+    <public type="string" name="integrations_application_granted_permissions" id="0x7F121122" />
+    <public type="string" name="integrations_application_no_bot" id="0x7F121123" />
+    <public type="string" name="integrations_application_no_webhooks" id="0x7F121124" />
+    <public type="string" name="integrations_application_remove" id="0x7F121125" />
+    <public type="string" name="integrations_application_remove_body" id="0x7F121126" />
+    <public type="string" name="integrations_application_remove_error" id="0x7F121127" />
+    <public type="string" name="integrations_application_remove_error_title" id="0x7F121128" />
+    <public type="string" name="integrations_application_remove_no_permissions" id="0x7F121129" />
+    <public type="string" name="integrations_application_remove_summary" id="0x7F12112A" />
+    <public type="string" name="integrations_application_remove_title" id="0x7F12112B" />
+    <public type="string" name="integrations_application_section" id="0x7F12112C" />
+    <public type="string" name="integrations_application_verified_bot" id="0x7F12112D" />
+    <public type="string" name="integrations_application_webhooks" id="0x7F12112E" />
+    <public type="string" name="integrations_channel_following" id="0x7F12112F" />
+    <public type="string" name="integrations_channel_following_button" id="0x7F121130" />
+    <public type="string" name="integrations_channel_following_description" id="0x7F121131" />
+    <public type="string" name="integrations_channel_following_empty" id="0x7F121132" />
+    <public type="string" name="integrations_channel_following_empty_button" id="0x7F121133" />
+    <public type="string" name="integrations_channel_following_section" id="0x7F121134" />
+    <public type="string" name="integrations_channel_following_summary" id="0x7F121135" />
+    <public type="string" name="integrations_channel_following_title" id="0x7F121136" />
+    <public type="string" name="integrations_disable" id="0x7F121137" />
+    <public type="string" name="integrations_enable" id="0x7F121138" />
+    <public type="string" name="integrations_enabled" id="0x7F121139" />
+    <public type="string" name="integrations_followed_channel_delete" id="0x7F12113A" />
+    <public type="string" name="integrations_followed_channel_delete_body" id="0x7F12113B" />
+    <public type="string" name="integrations_followed_channel_delete_title" id="0x7F12113C" />
+    <public type="string" name="integrations_followed_channel_dest_channel" id="0x7F12113D" />
+    <public type="string" name="integrations_followed_channel_error_deleting" id="0x7F12113E" />
+    <public type="string" name="integrations_followed_channel_guild_source" id="0x7F12113F" />
+    <public type="string" name="integrations_followed_channel_name" id="0x7F121140" />
+    <public type="string" name="integrations_last_sync" id="0x7F121141" />
+    <public type="string" name="integrations_overview" id="0x7F121142" />
+    <public type="string" name="integrations_overview_description_channel" id="0x7F121143" />
+    <public type="string" name="integrations_overview_description_guild" id="0x7F121144" />
+    <public type="string" name="integrations_overview_no_applications" id="0x7F121145" />
+    <public type="string" name="integrations_twitch" id="0x7F121146" />
+    <public type="string" name="integrations_twitch_button" id="0x7F121147" />
+    <public type="string" name="integrations_twitch_description" id="0x7F121148" />
+    <public type="string" name="integrations_twitch_empty_button" id="0x7F121149" />
+    <public type="string" name="integrations_twitch_empty_summary" id="0x7F12114A" />
+    <public type="string" name="integrations_twitch_help" id="0x7F12114B" />
+    <public type="string" name="integrations_twitch_summary" id="0x7F12114C" />
+    <public type="string" name="integrations_webhook_copied_url" id="0x7F12114D" />
+    <public type="string" name="integrations_webhook_copy_url" id="0x7F12114E" />
+    <public type="string" name="integrations_webhook_delete" id="0x7F12114F" />
+    <public type="string" name="integrations_webhooks" id="0x7F121150" />
+    <public type="string" name="integrations_webhooks_button" id="0x7F121151" />
+    <public type="string" name="integrations_webhooks_count" id="0x7F121152" />
+    <public type="string" name="integrations_webhooks_create" id="0x7F121153" />
+    <public type="string" name="integrations_webhooks_description" id="0x7F121154" />
+    <public type="string" name="integrations_webhooks_empty" id="0x7F121155" />
+    <public type="string" name="integrations_webhooks_empty_button" id="0x7F121156" />
+    <public type="string" name="integrations_webhooks_summary" id="0x7F121157" />
+    <public type="string" name="integrations_youtube" id="0x7F121158" />
+    <public type="string" name="integrations_youtube_button" id="0x7F121159" />
+    <public type="string" name="integrations_youtube_description" id="0x7F12115A" />
+    <public type="string" name="integrations_youtube_empty_button" id="0x7F12115B" />
+    <public type="string" name="integrations_youtube_empty_summary" id="0x7F12115C" />
+    <public type="string" name="integrations_youtube_help" id="0x7F12115D" />
+    <public type="string" name="integrations_youtube_summary" id="0x7F12115E" />
+    <public type="string" name="interaction_required_body" id="0x7F12115F" />
+    <public type="string" name="interaction_required_title" id="0x7F121160" />
+    <public type="string" name="internal_server_error" id="0x7F121161" />
+    <public type="string" name="invalid_animated_emoji_body" id="0x7F121162" />
+    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7F121163" />
+    <public type="string" name="invalid_attachments_failure" id="0x7F121164" />
+    <public type="string" name="invalid_external_emoji_body" id="0x7F121165" />
+    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7F121166" />
+    <public type="string" name="invalid_invite_link_error" id="0x7F121167" />
+    <public type="string" name="invalid_text_channel" id="0x7F121168" />
+    <public type="string" name="invalid_voice_channel" id="0x7F121169" />
+    <public type="string" name="invite_a_friend" id="0x7F12116A" />
+    <public type="string" name="invite_app_email" id="0x7F12116B" />
+    <public type="string" name="invite_app_gmail" id="0x7F12116C" />
+    <public type="string" name="invite_app_line" id="0x7F12116D" />
+    <public type="string" name="invite_app_messages" id="0x7F12116E" />
+    <public type="string" name="invite_app_messenger" id="0x7F12116F" />
+    <public type="string" name="invite_app_telegram" id="0x7F121170" />
+    <public type="string" name="invite_app_twitter" id="0x7F121171" />
+    <public type="string" name="invite_app_whatsapp" id="0x7F121172" />
+    <public type="string" name="invite_button_body_in_guild" id="0x7F121173" />
+    <public type="string" name="invite_button_expired" id="0x7F121174" />
+    <public type="string" name="invite_button_invalid" id="0x7F121175" />
+    <public type="string" name="invite_button_invalid_owner" id="0x7F121176" />
+    <public type="string" name="invite_button_resolving" id="0x7F121177" />
+    <public type="string" name="invite_button_stream_ended" id="0x7F121178" />
+    <public type="string" name="invite_button_stream_ended_streamer" id="0x7F121179" />
+    <public type="string" name="invite_button_stream_watching" id="0x7F12117A" />
+    <public type="string" name="invite_button_streamer" id="0x7F12117B" />
+    <public type="string" name="invite_button_streaming" id="0x7F12117C" />
+    <public type="string" name="invite_button_streaming_subtext" id="0x7F12117D" />
+    <public type="string" name="invite_button_title_invited" id="0x7F12117E" />
+    <public type="string" name="invite_button_title_invited_group_dm" id="0x7F12117F" />
+    <public type="string" name="invite_button_title_invited_hub" id="0x7F121180" />
+    <public type="string" name="invite_button_title_invited_invalid" id="0x7F121181" />
+    <public type="string" name="invite_button_title_invited_stream" id="0x7F121182" />
+    <public type="string" name="invite_button_title_invited_to_play" id="0x7F121183" />
+    <public type="string" name="invite_button_title_invited_voice_channel" id="0x7F121184" />
+    <public type="string" name="invite_button_title_inviter" id="0x7F121185" />
+    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7F121186" />
+    <public type="string" name="invite_button_title_inviter_hub" id="0x7F121187" />
+    <public type="string" name="invite_button_title_inviter_invalid" id="0x7F121188" />
+    <public type="string" name="invite_button_title_inviter_stream" id="0x7F121189" />
+    <public type="string" name="invite_button_title_inviter_voice_channel" id="0x7F12118A" />
+    <public type="string" name="invite_button_title_streaming" id="0x7F12118B" />
+    <public type="string" name="invite_copied" id="0x7F12118C" />
+    <public type="string" name="invite_copy_invite_link_header_mobile" id="0x7F12118D" />
+    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7F12118E" />
+    <public type="string" name="invite_edit_link" id="0x7F12118F" />
+    <public type="string" name="invite_embed_ask_to_join" id="0x7F121190" />
+    <public type="string" name="invite_embed_full_group" id="0x7F121191" />
+    <public type="string" name="invite_embed_game_has_ended" id="0x7F121192" />
+    <public type="string" name="invite_embed_game_invite" id="0x7F121193" />
+    <public type="string" name="invite_embed_in_group" id="0x7F121194" />
+    <public type="string" name="invite_embed_invite_to_join" id="0x7F121195" />
+    <public type="string" name="invite_embed_invite_to_join_group" id="0x7F121196" />
+    <public type="string" name="invite_embed_invite_to_listen" id="0x7F121197" />
+    <public type="string" name="invite_embed_invite_to_watch" id="0x7F121198" />
+    <public type="string" name="invite_embed_join_via_android" id="0x7F121199" />
+    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7F12119A" />
+    <public type="string" name="invite_embed_join_via_ios" id="0x7F12119B" />
+    <public type="string" name="invite_embed_join_via_xbox" id="0x7F12119C" />
+    <public type="string" name="invite_embed_joined" id="0x7F12119D" />
+    <public type="string" name="invite_embed_listen_has_ended" id="0x7F12119E" />
+    <public type="string" name="invite_embed_listening_invite" id="0x7F12119F" />
+    <public type="string" name="invite_embed_num_open_slots" id="0x7F1211A0" />
+    <public type="string" name="invite_embed_send_invite" id="0x7F1211A1" />
+    <public type="string" name="invite_embed_watch_has_ended" id="0x7F1211A2" />
+    <public type="string" name="invite_empty_body" id="0x7F1211A3" />
+    <public type="string" name="invite_empty_title" id="0x7F1211A4" />
+    <public type="string" name="invite_expiration_notice" id="0x7F1211A5" />
+    <public type="string" name="invite_expired_subtext_mobile" id="0x7F1211A6" />
+    <public type="string" name="invite_expires_days_or_uses_plural" id="0x7F1211A7" />
+    <public type="string" name="invite_expires_days_plural" id="0x7F1211A8" />
+    <public type="string" name="invite_expires_hours" id="0x7F1211A9" />
+    <public type="string" name="invite_expires_hours_or_uses" id="0x7F1211AA" />
+    <public type="string" name="invite_expires_minutes" id="0x7F1211AB" />
+    <public type="string" name="invite_expires_minutes_or_uses" id="0x7F1211AC" />
+    <public type="string" name="invite_expires_never" id="0x7F1211AD" />
+    <public type="string" name="invite_expires_uses" id="0x7F1211AE" />
+    <public type="string" name="invite_footer_link_header" id="0x7F1211AF" />
+    <public type="string" name="invite_friend_modal_invite" id="0x7F1211B0" />
+    <public type="string" name="invite_friend_modal_loading" id="0x7F1211B1" />
+    <public type="string" name="invite_friend_modal_no_results" id="0x7F1211B2" />
+    <public type="string" name="invite_friend_modal_retry" id="0x7F1211B3" />
+    <public type="string" name="invite_friend_modal_sent" id="0x7F1211B4" />
+    <public type="string" name="invite_friend_modal_title" id="0x7F1211B5" />
+    <public type="string" name="invite_friends" id="0x7F1211B6" />
+    <public type="string" name="invite_invalid_cta" id="0x7F1211B7" />
+    <public type="string" name="invite_invalid_error" id="0x7F1211B8" />
+    <public type="string" name="invite_link_copied" id="0x7F1211B9" />
+    <public type="string" name="invite_link_example_full" id="0x7F1211BA" />
+    <public type="string" name="invite_link_example_simple" id="0x7F1211BB" />
+    <public type="string" name="invite_link_example_verified" id="0x7F1211BC" />
+    <public type="string" name="invite_link_header" id="0x7F1211BD" />
+    <public type="string" name="invite_links_expire_after_1_day" id="0x7F1211BE" />
+    <public type="string" name="invite_links_expire_after_default" id="0x7F1211BF" />
+    <public type="string" name="invite_members" id="0x7F1211C0" />
+    <public type="string" name="invite_message_placeholder" id="0x7F1211C1" />
+    <public type="string" name="invite_modal_button" id="0x7F1211C2" />
+    <public type="string" name="invite_modal_error_button_text" id="0x7F1211C3" />
+    <public type="string" name="invite_modal_error_default" id="0x7F1211C4" />
+    <public type="string" name="invite_modal_error_invalid_body" id="0x7F1211C5" />
+    <public type="string" name="invite_modal_error_invalid_title" id="0x7F1211C6" />
+    <public type="string" name="invite_modal_error_title" id="0x7F1211C7" />
+    <public type="string" name="invite_modal_nevermind_button" id="0x7F1211C8" />
+    <public type="string" name="invite_modal_open_button" id="0x7F1211C9" />
+    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7F1211CA" />
+    <public type="string" name="invite_no_thanks" id="0x7F1211CB" />
+    <public type="string" name="invite_notice_message" id="0x7F1211CC" />
+    <public type="string" name="invite_notice_message_part_2" id="0x7F1211CD" />
+    <public type="string" name="invite_people" id="0x7F1211CE" />
+    <public type="string" name="invite_pokemon_go_announcements_label_long" id="0x7F1211CF" />
+    <public type="string" name="invite_pokemon_go_announcements_label_short" id="0x7F1211D0" />
+    <public type="string" name="invite_pokemon_go_friendship_label_long" id="0x7F1211D1" />
+    <public type="string" name="invite_pokemon_go_friendship_label_short" id="0x7F1211D2" />
+    <public type="string" name="invite_pokemon_go_strategy_label_long" id="0x7F1211D3" />
+    <public type="string" name="invite_pokemon_go_strategy_label_short" id="0x7F1211D4" />
+    <public type="string" name="invite_private_call_heads_up" id="0x7F1211D5" />
+    <public type="string" name="invite_search_for_friends" id="0x7F1211D6" />
+    <public type="string" name="invite_send_dm" id="0x7F1211D7" />
+    <public type="string" name="invite_send_error" id="0x7F1211D8" />
+    <public type="string" name="invite_sent" id="0x7F1211D9" />
+    <public type="string" name="invite_settings_description_no_expiration" id="0x7F1211DA" />
+    <public type="string" name="invite_settings_expired_description" id="0x7F1211DB" />
+    <public type="string" name="invite_settings_title" id="0x7F1211DC" />
+    <public type="string" name="invite_share_link_header_mobile" id="0x7F1211DD" />
+    <public type="string" name="invite_share_link_own_server" id="0x7F1211DE" />
+    <public type="string" name="invite_share_link_to_stream" id="0x7F1211DF" />
+    <public type="string" name="invite_step_subtitle" id="0x7F1211E0" />
+    <public type="string" name="invite_step_title" id="0x7F1211E1" />
+    <public type="string" name="invite_stream_footer_link_header" id="0x7F1211E2" />
+    <public type="string" name="invite_stream_header" id="0x7F1211E3" />
+    <public type="string" name="invite_to_server" id="0x7F1211E4" />
+    <public type="string" name="invite_urgent_days_message_placeholder" id="0x7F1211E5" />
+    <public type="string" name="invite_urgent_hours_message_placeholder" id="0x7F1211E6" />
+    <public type="string" name="invite_urgent_minutes_placeholder" id="0x7F1211E7" />
+    <public type="string" name="invite_url" id="0x7F1211E8" />
+    <public type="string" name="invite_voice_channel_join" id="0x7F1211E9" />
+    <public type="string" name="invite_voice_empty_mobile" id="0x7F1211EA" />
+    <public type="string" name="invite_welcome_heading" id="0x7F1211EB" />
+    <public type="string" name="invite_welcome_subheading" id="0x7F1211EC" />
+    <public type="string" name="invite_your_friends" id="0x7F1211ED" />
+    <public type="string" name="invite_your_friends_channel_mobile" id="0x7F1211EE" />
+    <public type="string" name="invite_your_friends_header_mobile" id="0x7F1211EF" />
+    <public type="string" name="invites" id="0x7F1211F0" />
+    <public type="string" name="ios_automatic_theme" id="0x7F1211F1" />
+    <public type="string" name="ios_automatic_theme_short" id="0x7F1211F2" />
+    <public type="string" name="ios_call_disconnected" id="0x7F1211F3" />
+    <public type="string" name="ios_call_ended" id="0x7F1211F4" />
+    <public type="string" name="ios_guild_delete_feedback_header" id="0x7F1211F5" />
+    <public type="string" name="ios_iap_generic_billing_error" id="0x7F1211F6" />
+    <public type="string" name="ios_iap_itunes_error" id="0x7F1211F7" />
+    <public type="string" name="ios_iap_manage_premium_guild_button" id="0x7F1211F8" />
+    <public type="string" name="ios_iap_manage_subscription_button" id="0x7F1211F9" />
+    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7F1211FA" />
+    <public type="string" name="ios_iap_manage_subscription_google_play" id="0x7F1211FB" />
+    <public type="string" name="ios_iap_restore_subscription_error" id="0x7F1211FC" />
+    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7F1211FD" />
+    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7F1211FE" />
+    <public type="string" name="ios_iap_restore_subscription_success" id="0x7F1211FF" />
+    <public type="string" name="ios_iap_switch_plans_button" id="0x7F121200" />
+    <public type="string" name="ios_iap_testflight_error" id="0x7F121201" />
+    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7F121202" />
+    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7F121203" />
+    <public type="string" name="ios_media_keyboard_more_photos" id="0x7F121204" />
+    <public type="string" name="ios_media_keyboard_no_permission" id="0x7F121205" />
+    <public type="string" name="ios_media_keyboard_no_photos" id="0x7F121206" />
+    <public type="string" name="ios_notification_see_full" id="0x7F121207" />
+    <public type="string" name="ios_profile_in_voice_call" id="0x7F121208" />
+    <public type="string" name="ios_profile_open_voice_channel" id="0x7F121209" />
+    <public type="string" name="ios_share_suggestions_hint" id="0x7F12120A" />
+    <public type="string" name="ios_share_suggestions_toggle" id="0x7F12120B" />
+    <public type="string" name="ios_stream_participants_hidden" id="0x7F12120C" />
+    <public type="string" name="ios_stream_show_non_video" id="0x7F12120D" />
+    <public type="string" name="ios_view_all" id="0x7F12120E" />
+    <public type="string" name="ip_address_secured" id="0x7F12120F" />
+    <public type="string" name="ip_authorization_succeeded" id="0x7F121210" />
+    <public type="string" name="ipad_no_screenshare_dialog_body" id="0x7F121211" />
+    <public type="string" name="ipad_no_screenshare_dialog_title" id="0x7F121212" />
+    <public type="string" name="it" id="0x7F121213" />
+    <public type="string" name="item_view_role_description" id="0x7F121214" />
+    <public type="string" name="ja" id="0x7F121215" />
+    <public type="string" name="join" id="0x7F121216" />
+    <public type="string" name="join_afk_channel_body" id="0x7F121217" />
+    <public type="string" name="join_call" id="0x7F121218" />
+    <public type="string" name="join_guild" id="0x7F121219" />
+    <public type="string" name="join_guild_connect" id="0x7F12121A" />
+    <public type="string" name="join_guild_connect_cta" id="0x7F12121B" />
+    <public type="string" name="join_guild_connect_text" id="0x7F12121C" />
+    <public type="string" name="join_guild_description" id="0x7F12121D" />
+    <public type="string" name="join_server_button_body" id="0x7F12121E" />
+    <public type="string" name="join_server_button_cta" id="0x7F12121F" />
+    <public type="string" name="join_server_button_cta_mobile" id="0x7F121220" />
+    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7F121221" />
+    <public type="string" name="join_server_description" id="0x7F121222" />
+    <public type="string" name="join_server_description_mobile" id="0x7F121223" />
+    <public type="string" name="join_server_description_mobile_refresh" id="0x7F121224" />
+    <public type="string" name="join_server_description_nuf" id="0x7F121225" />
+    <public type="string" name="join_server_examples" id="0x7F121226" />
+    <public type="string" name="join_server_invite_examples_header" id="0x7F121227" />
+    <public type="string" name="join_server_invite_examples_mobile_refresh" id="0x7F121228" />
+    <public type="string" name="join_server_title" id="0x7F121229" />
+    <public type="string" name="join_server_title_mobile_refresh" id="0x7F12122A" />
+    <public type="string" name="join_stream" id="0x7F12122B" />
+    <public type="string" name="join_thread" id="0x7F12122C" />
+    <public type="string" name="join_video_call" id="0x7F12122D" />
+    <public type="string" name="join_video_channel" id="0x7F12122E" />
+    <public type="string" name="join_voice_call" id="0x7F12122F" />
+    <public type="string" name="join_voice_channel" id="0x7F121230" />
+    <public type="string" name="join_voice_channel_cta" id="0x7F121231" />
+    <public type="string" name="join_waitlist" id="0x7F121232" />
+    <public type="string" name="joined_guild" id="0x7F121233" />
+    <public type="string" name="joining_guild" id="0x7F121234" />
+    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7F121235" />
+    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7F121236" />
+    <public type="string" name="joining_will_end_current_call_title" id="0x7F121237" />
+    <public type="string" name="jump" id="0x7F121238" />
+    <public type="string" name="jump_bar_viewing_reply" id="0x7F121239" />
+    <public type="string" name="jump_to_channel" id="0x7F12123A" />
+    <public type="string" name="jump_to_last_unread_message" id="0x7F12123B" />
+    <public type="string" name="jump_to_message" id="0x7F12123C" />
+    <public type="string" name="jump_to_original_message" id="0x7F12123D" />
+    <public type="string" name="jump_to_present" id="0x7F12123E" />
+    <public type="string" name="jump_to_reply" id="0x7F12123F" />
+    <public type="string" name="keep_permissions" id="0x7F121240" />
+    <public type="string" name="keybind_activate_overlay_chat" id="0x7F121241" />
+    <public type="string" name="keybind_conflict" id="0x7F121242" />
+    <public type="string" name="keybind_description_modal_call_accept" id="0x7F121243" />
+    <public type="string" name="keybind_description_modal_call_decline" id="0x7F121244" />
+    <public type="string" name="keybind_description_modal_call_start" id="0x7F121245" />
+    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7F121246" />
+    <public type="string" name="keybind_description_modal_create_guild" id="0x7F121247" />
+    <public type="string" name="keybind_description_modal_easter_egg" id="0x7F121248" />
+    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7F121249" />
+    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7F12124A" />
+    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7F12124B" />
+    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7F12124C" />
+    <public type="string" name="keybind_description_modal_mark_top_inbox_channel_read" id="0x7F12124D" />
+    <public type="string" name="keybind_description_modal_navigate_back_forward" id="0x7F12124E" />
+    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7F12124F" />
+    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7F121250" />
+    <public type="string" name="keybind_description_modal_navigate_to_call" id="0x7F121251" />
+    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7F121252" />
+    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7F121253" />
+    <public type="string" name="keybind_description_modal_search" id="0x7F121254" />
+    <public type="string" name="keybind_description_modal_search_emojis" id="0x7F121255" />
+    <public type="string" name="keybind_description_modal_search_gifs" id="0x7F121256" />
+    <public type="string" name="keybind_description_modal_search_stickers" id="0x7F121257" />
+    <public type="string" name="keybind_description_modal_subtitle" id="0x7F121258" />
+    <public type="string" name="keybind_description_modal_title" id="0x7F121259" />
+    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7F12125A" />
+    <public type="string" name="keybind_description_modal_toggle_help" id="0x7F12125B" />
+    <public type="string" name="keybind_description_modal_toggle_inbox" id="0x7F12125C" />
+    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7F12125D" />
+    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7F12125E" />
+    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7F12125F" />
+    <public type="string" name="keybind_description_modal_toggle_users" id="0x7F121260" />
+    <public type="string" name="keybind_description_modal_unread_channels" id="0x7F121261" />
+    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7F121262" />
+    <public type="string" name="keybind_description_modal_upload_file" id="0x7F121263" />
+    <public type="string" name="keybind_description_navigate_back" id="0x7F121264" />
+    <public type="string" name="keybind_description_navigate_forward" id="0x7F121265" />
+    <public type="string" name="keybind_description_push_to_mute" id="0x7F121266" />
+    <public type="string" name="keybind_description_push_to_talk" id="0x7F121267" />
+    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7F121268" />
+    <public type="string" name="keybind_description_toggle_deafen" id="0x7F121269" />
+    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7F12126A" />
+    <public type="string" name="keybind_description_toggle_mute" id="0x7F12126B" />
+    <public type="string" name="keybind_description_toggle_overlay" id="0x7F12126C" />
+    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7F12126D" />
+    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7F12126E" />
+    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7F12126F" />
+    <public type="string" name="keybind_description_unassigned" id="0x7F121270" />
+    <public type="string" name="keybind_in_broswer_notice" id="0x7F121271" />
+    <public type="string" name="keybind_navigate_back" id="0x7F121272" />
+    <public type="string" name="keybind_navigate_forward" id="0x7F121273" />
+    <public type="string" name="keybind_navigation_conflict" id="0x7F121274" />
+    <public type="string" name="keybind_push_to_mute" id="0x7F121275" />
+    <public type="string" name="keybind_push_to_talk" id="0x7F121276" />
+    <public type="string" name="keybind_push_to_talk_priority" id="0x7F121277" />
+    <public type="string" name="keybind_toggle_deafen" id="0x7F121278" />
+    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7F121279" />
+    <public type="string" name="keybind_toggle_mute" id="0x7F12127A" />
+    <public type="string" name="keybind_toggle_overlay" id="0x7F12127B" />
+    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7F12127C" />
+    <public type="string" name="keybind_toggle_stream_mode" id="0x7F12127D" />
+    <public type="string" name="keybind_toggle_voice_mode" id="0x7F12127E" />
+    <public type="string" name="keybind_unassigned" id="0x7F12127F" />
+    <public type="string" name="keybinds" id="0x7F121280" />
+    <public type="string" name="keyboard_behavior_mobile_header" id="0x7F121281" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7F121282" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7F121283" />
+    <public type="string" name="keyboard_shortcuts_explainer_help_center_link" id="0x7F121284" />
+    <public type="string" name="keyboard_shortcuts_explainer_list_shortcut" id="0x7F121285" />
+    <public type="string" name="keyboard_shortcuts_explainer_modal_body" id="0x7F121286" />
+    <public type="string" name="keyboard_shortcuts_explainer_modal_title" id="0x7F121287" />
+    <public type="string" name="keyboard_shortcuts_explainer_quickswitcher_shortcut" id="0x7F121288" />
+    <public type="string" name="kick" id="0x7F121289" />
+    <public type="string" name="kick_from_server" id="0x7F12128A" />
+    <public type="string" name="kick_members" id="0x7F12128B" />
+    <public type="string" name="kick_user" id="0x7F12128C" />
+    <public type="string" name="kick_user_body" id="0x7F12128D" />
+    <public type="string" name="kick_user_confirmed" id="0x7F12128E" />
+    <public type="string" name="kick_user_error_generic" id="0x7F12128F" />
+    <public type="string" name="kick_user_from_server" id="0x7F121290" />
+    <public type="string" name="kick_user_title" id="0x7F121291" />
+    <public type="string" name="ko" id="0x7F121292" />
+    <public type="string" name="krisp_model_version" id="0x7F121293" />
+    <public type="string" name="label_with_online_status" id="0x7F121294" />
+    <public type="string" name="language" id="0x7F121295" />
+    <public type="string" name="language_not_found" id="0x7F121296" />
+    <public type="string" name="language_select" id="0x7F121297" />
+    <public type="string" name="language_updated" id="0x7F121298" />
+    <public type="string" name="languages" id="0x7F121299" />
+    <public type="string" name="large_guild_notify_all_messages_description" id="0x7F12129A" />
+    <public type="string" name="large_message_upload_subtitle" id="0x7F12129B" />
+    <public type="string" name="large_message_upload_title" id="0x7F12129C" />
+    <public type="string" name="large_message_upload_title_max_length" id="0x7F12129D" />
+    <public type="string" name="last_seen" id="0x7F12129E" />
+    <public type="string" name="last_sync" id="0x7F12129F" />
+    <public type="string" name="launch_app" id="0x7F1212A0" />
+    <public type="string" name="learn_more" id="0x7F1212A1" />
+    <public type="string" name="learn_more_alt" id="0x7F1212A2" />
+    <public type="string" name="learn_more_link" id="0x7F1212A3" />
+    <public type="string" name="leave_call" id="0x7F1212A4" />
+    <public type="string" name="leave_group_dm" id="0x7F1212A5" />
+    <public type="string" name="leave_group_dm_body" id="0x7F1212A6" />
+    <public type="string" name="leave_group_dm_managed_body" id="0x7F1212A7" />
+    <public type="string" name="leave_group_dm_managed_title" id="0x7F1212A8" />
+    <public type="string" name="leave_group_dm_title" id="0x7F1212A9" />
+    <public type="string" name="leave_hub" id="0x7F1212AA" />
+    <public type="string" name="leave_hub_body" id="0x7F1212AB" />
+    <public type="string" name="leave_server" id="0x7F1212AC" />
+    <public type="string" name="leave_server_body" id="0x7F1212AD" />
+    <public type="string" name="leave_server_body_mobile" id="0x7F1212AE" />
+    <public type="string" name="leave_server_title" id="0x7F1212AF" />
+    <public type="string" name="leave_thread" id="0x7F1212B0" />
+    <public type="string" name="lets_go" id="0x7F1212B1" />
+    <public type="string" name="lib_name" id="0x7F1212B2" />
+    <public type="string" name="library" id="0x7F1212B3" />
+    <public type="string" name="light_blue" id="0x7F1212B4" />
+    <public type="string" name="light_green" id="0x7F1212B5" />
+    <public type="string" name="light_grey" id="0x7F1212B6" />
+    <public type="string" name="link_copied" id="0x7F1212B7" />
+    <public type="string" name="link_settings" id="0x7F1212B8" />
+    <public type="string" name="link_your_discord_account" id="0x7F1212B9" />
+    <public type="string" name="link_your_xbox_account_1" id="0x7F1212BA" />
+    <public type="string" name="link_your_xbox_account_2" id="0x7F1212BB" />
+    <public type="string" name="linux" id="0x7F1212BC" />
+    <public type="string" name="listen_on_spotify" id="0x7F1212BD" />
+    <public type="string" name="listening_count" id="0x7F1212BE" />
+    <public type="string" name="listening_to" id="0x7F1212BF" />
+    <public type="string" name="live" id="0x7F1212C0" />
+    <public type="string" name="live_guild_stage_event_label" id="0x7F1212C1" />
+    <public type="string" name="live_stages" id="0x7F1212C2" />
+    <public type="string" name="live_viewers" id="0x7F1212C3" />
+    <public type="string" name="load_image_error" id="0x7F1212C4" />
+    <public type="string" name="load_more_messages" id="0x7F1212C5" />
+    <public type="string" name="load_reactions_error" id="0x7F1212C6" />
+    <public type="string" name="loading" id="0x7F1212C7" />
+    <public type="string" name="loading_did_you_know" id="0x7F1212C8" />
+    <public type="string" name="loading_keybind_tip_1" id="0x7F1212C9" />
+    <public type="string" name="loading_keybind_tip_2" id="0x7F1212CA" />
+    <public type="string" name="loading_keybind_tip_3" id="0x7F1212CB" />
+    <public type="string" name="loading_keybind_tip_4" id="0x7F1212CC" />
+    <public type="string" name="loading_keybind_tip_5" id="0x7F1212CD" />
+    <public type="string" name="loading_keybind_tip_6" id="0x7F1212CE" />
+    <public type="string" name="loading_keybind_tip_7" id="0x7F1212CF" />
+    <public type="string" name="loading_keybind_tip_8" id="0x7F1212D0" />
+    <public type="string" name="loading_line_1" id="0x7F1212D1" />
+    <public type="string" name="loading_line_10" id="0x7F1212D2" />
+    <public type="string" name="loading_line_11" id="0x7F1212D3" />
+    <public type="string" name="loading_line_12" id="0x7F1212D4" />
+    <public type="string" name="loading_line_13" id="0x7F1212D5" />
+    <public type="string" name="loading_line_14" id="0x7F1212D6" />
+    <public type="string" name="loading_line_15" id="0x7F1212D7" />
+    <public type="string" name="loading_line_2" id="0x7F1212D8" />
+    <public type="string" name="loading_line_3" id="0x7F1212D9" />
+    <public type="string" name="loading_line_4" id="0x7F1212DA" />
+    <public type="string" name="loading_line_5" id="0x7F1212DB" />
+    <public type="string" name="loading_line_6" id="0x7F1212DC" />
+    <public type="string" name="loading_line_7" id="0x7F1212DD" />
+    <public type="string" name="loading_line_8" id="0x7F1212DE" />
+    <public type="string" name="loading_line_9" id="0x7F1212DF" />
+    <public type="string" name="loading_messages_a11y_label" id="0x7F1212E0" />
+    <public type="string" name="loading_note" id="0x7F1212E1" />
+    <public type="string" name="loading_text" id="0x7F1212E2" />
+    <public type="string" name="loading_tip_1" id="0x7F1212E3" />
+    <public type="string" name="loading_tip_10" id="0x7F1212E4" />
+    <public type="string" name="loading_tip_11" id="0x7F1212E5" />
+    <public type="string" name="loading_tip_12" id="0x7F1212E6" />
+    <public type="string" name="loading_tip_13" id="0x7F1212E7" />
+    <public type="string" name="loading_tip_14" id="0x7F1212E8" />
+    <public type="string" name="loading_tip_15" id="0x7F1212E9" />
+    <public type="string" name="loading_tip_16" id="0x7F1212EA" />
+    <public type="string" name="loading_tip_17" id="0x7F1212EB" />
+    <public type="string" name="loading_tip_18" id="0x7F1212EC" />
+    <public type="string" name="loading_tip_19" id="0x7F1212ED" />
+    <public type="string" name="loading_tip_2" id="0x7F1212EE" />
+    <public type="string" name="loading_tip_20" id="0x7F1212EF" />
+    <public type="string" name="loading_tip_21" id="0x7F1212F0" />
+    <public type="string" name="loading_tip_22" id="0x7F1212F1" />
+    <public type="string" name="loading_tip_23" id="0x7F1212F2" />
+    <public type="string" name="loading_tip_24" id="0x7F1212F3" />
+    <public type="string" name="loading_tip_25" id="0x7F1212F4" />
+    <public type="string" name="loading_tip_26" id="0x7F1212F5" />
+    <public type="string" name="loading_tip_3" id="0x7F1212F6" />
+    <public type="string" name="loading_tip_4" id="0x7F1212F7" />
+    <public type="string" name="loading_tip_5" id="0x7F1212F8" />
+    <public type="string" name="loading_tip_6" id="0x7F1212F9" />
+    <public type="string" name="loading_tip_7" id="0x7F1212FA" />
+    <public type="string" name="loading_tip_8" id="0x7F1212FB" />
+    <public type="string" name="loading_tip_9" id="0x7F1212FC" />
+    <public type="string" name="loading_your_pin" id="0x7F1212FD" />
+    <public type="string" name="lobby" id="0x7F1212FE" />
+    <public type="string" name="local_muted" id="0x7F1212FF" />
+    <public type="string" name="local_push_notification_guild_verification_body" id="0x7F121300" />
+    <public type="string" name="local_push_notification_screenshare_not_supported" id="0x7F121301" />
+    <public type="string" name="local_video_disabled" id="0x7F121302" />
+    <public type="string" name="locale" id="0x7F121303" />
+    <public type="string" name="login" id="0x7F121304" />
+    <public type="string" name="login_as" id="0x7F121305" />
+    <public type="string" name="login_body" id="0x7F121306" />
+    <public type="string" name="login_required" id="0x7F121307" />
+    <public type="string" name="login_stage" id="0x7F121308" />
+    <public type="string" name="login_title" id="0x7F121309" />
+    <public type="string" name="login_with_qr" id="0x7F12130A" />
+    <public type="string" name="login_with_qr_description" id="0x7F12130B" />
+    <public type="string" name="logo_description" id="0x7F12130C" />
+    <public type="string" name="logout" id="0x7F12130D" />
+    <public type="string" name="low_quality_image_mode" id="0x7F12130E" />
+    <public type="string" name="low_quality_image_mode_help" id="0x7F12130F" />
+    <public type="string" name="lt" id="0x7F121310" />
+    <public type="string" name="lurker_mode_chat_input_button" id="0x7F121311" />
+    <public type="string" name="lurker_mode_chat_input_message" id="0x7F121312" />
+    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7F121313" />
+    <public type="string" name="lurker_mode_nag_bar_button" id="0x7F121314" />
+    <public type="string" name="lurker_mode_nag_bar_header" id="0x7F121315" />
+    <public type="string" name="lurker_mode_popout_cancel" id="0x7F121316" />
+    <public type="string" name="lurker_mode_popout_chat_header" id="0x7F121317" />
+    <public type="string" name="lurker_mode_popout_join" id="0x7F121318" />
+    <public type="string" name="lurker_mode_popout_reactions_header" id="0x7F121319" />
+    <public type="string" name="lurker_mode_popout_success_body" id="0x7F12131A" />
+    <public type="string" name="lurker_mode_popout_success_button" id="0x7F12131B" />
+    <public type="string" name="lurker_mode_popout_success_header" id="0x7F12131C" />
+    <public type="string" name="lurker_mode_popout_upsell_body" id="0x7F12131D" />
+    <public type="string" name="lurker_mode_view_guild" id="0x7F12131E" />
+    <public type="string" name="macos" id="0x7F12131F" />
+    <public type="string" name="magenta" id="0x7F121320" />
+    <public type="string" name="manage_channel" id="0x7F121321" />
+    <public type="string" name="manage_channel_description" id="0x7F121322" />
+    <public type="string" name="manage_channels" id="0x7F121323" />
+    <public type="string" name="manage_channels_description" id="0x7F121324" />
+    <public type="string" name="manage_emojis" id="0x7F121325" />
+    <public type="string" name="manage_emojis_and_stickers" id="0x7F121326" />
+    <public type="string" name="manage_events" id="0x7F121327" />
+    <public type="string" name="manage_messages" id="0x7F121328" />
+    <public type="string" name="manage_messages_description" id="0x7F121329" />
+    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7F12132A" />
+    <public type="string" name="manage_nicknames" id="0x7F12132B" />
+    <public type="string" name="manage_nicknames_description" id="0x7F12132C" />
+    <public type="string" name="manage_permissions" id="0x7F12132D" />
+    <public type="string" name="manage_permissions_description" id="0x7F12132E" />
+    <public type="string" name="manage_roles" id="0x7F12132F" />
+    <public type="string" name="manage_roles_description" id="0x7F121330" />
+    <public type="string" name="manage_server" id="0x7F121331" />
+    <public type="string" name="manage_server_description" id="0x7F121332" />
+    <public type="string" name="manage_threads" id="0x7F121333" />
+    <public type="string" name="manage_user" id="0x7F121334" />
+    <public type="string" name="manage_user_shorthand" id="0x7F121335" />
+    <public type="string" name="manage_webhooks" id="0x7F121336" />
+    <public type="string" name="manage_webhooks_description" id="0x7F121337" />
+    <public type="string" name="managed_role_explaination" id="0x7F121338" />
+    <public type="string" name="managed_role_integration_linked_explanation" id="0x7F121339" />
+    <public type="string" name="managed_role_premium_subscriber_explanation" id="0x7F12133A" />
+    <public type="string" name="mark_as_read" id="0x7F12133B" />
+    <public type="string" name="mark_unread" id="0x7F12133C" />
+    <public type="string" name="marked_as_read" id="0x7F12133D" />
+    <public type="string" name="marketing_premium_tier_1_perk_list_omit_guild_cap" id="0x7F12133E" />
+    <public type="string" name="marketing_premium_tier_1_perk_list_omit_message_length" id="0x7F12133F" />
+    <public type="string" name="marketing_premium_tier_1_perk_list_omit_profile_customization" id="0x7F121340" />
+    <public type="string" name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages" id="0x7F121341" />
+    <public type="string" name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds" id="0x7F121342" />
+    <public type="string" name="marketing_refresh_premium_features_badge_heading" id="0x7F121343" />
+    <public type="string" name="marketing_refresh_premium_features_badge_subheading" id="0x7F121344" />
+    <public type="string" name="marketing_refresh_premium_features_emoji_heading" id="0x7F121345" />
+    <public type="string" name="marketing_refresh_premium_features_emoji_subheading" id="0x7F121346" />
+    <public type="string" name="marketing_refresh_premium_features_file_upload_heading" id="0x7F121347" />
+    <public type="string" name="marketing_refresh_premium_features_file_upload_subheading" id="0x7F121348" />
+    <public type="string" name="marketing_refresh_premium_features_go_live_heading" id="0x7F121349" />
+    <public type="string" name="marketing_refresh_premium_features_go_live_info" id="0x7F12134A" />
+    <public type="string" name="marketing_refresh_premium_features_go_live_subheading" id="0x7F12134B" />
+    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_heading" id="0x7F12134C" />
+    <public type="string" name="marketing_refresh_premium_features_included_guild_subscriptions_subheading" id="0x7F12134D" />
+    <public type="string" name="marketing_refresh_premium_features_profile_heading" id="0x7F12134E" />
+    <public type="string" name="marketing_refresh_premium_features_profile_subheading" id="0x7F12134F" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description" id="0x7F121350" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_fps" id="0x7F121351" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_guild_cap" id="0x7F121352" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_label" id="0x7F121353" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_message_length" id="0x7F121354" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_no_premium_guild_subscriptions" id="0x7F121355" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_profile_customization" id="0x7F121356" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_perks_info_upload" id="0x7F121357" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_with_price" id="0x7F121358" />
+    <public type="string" name="marketing_refresh_premium_tier_1_cta_description_with_price_no_info_hook" id="0x7F121359" />
+    <public type="string" name="marketing_refresh_premium_tier_2_cta_subtitle" id="0x7F12135A" />
+    <public type="string" name="marketing_refresh_premium_tier_2_cta_title" id="0x7F12135B" />
+    <public type="string" name="marketing_refresh_premium_tier_2_subtitle" id="0x7F12135C" />
+    <public type="string" name="marketing_refresh_premium_tier_2_subtitle_with_price" id="0x7F12135D" />
+    <public type="string" name="marketing_refresh_premium_tier_2_title" id="0x7F12135E" />
+    <public type="string" name="marketing_tier_1_perk_list_boost_discount" id="0x7F12135F" />
+    <public type="string" name="marketing_tier_1_perk_list_custom_emoji" id="0x7F121360" />
+    <public type="string" name="marketing_tier_1_perk_list_stream_quality" id="0x7F121361" />
+    <public type="string" name="marketing_tier_1_perk_list_upload_size" id="0x7F121362" />
+    <public type="string" name="marketing_tier_1_perk_omit_stickers" id="0x7F121363" />
+    <public type="string" name="masked_link_body" id="0x7F121364" />
+    <public type="string" name="masked_link_cancel" id="0x7F121365" />
+    <public type="string" name="masked_link_confirm" id="0x7F121366" />
+    <public type="string" name="masked_link_trust_this_domain" id="0x7F121367" />
+    <public type="string" name="masked_link_trust_this_protocol" id="0x7F121368" />
+    <public type="string" name="masked_protocol_link_body" id="0x7F121369" />
+    <public type="string" name="material_clock_display_divider" id="0x7F12136A" />
+    <public type="string" name="material_clock_toggle_content_description" id="0x7F12136B" />
+    <public type="string" name="material_hour_selection" id="0x7F12136C" />
+    <public type="string" name="material_hour_suffix" id="0x7F12136D" />
+    <public type="string" name="material_minute_selection" id="0x7F12136E" />
+    <public type="string" name="material_minute_suffix" id="0x7F12136F" />
+    <public type="string" name="material_slider_range_end" id="0x7F121370" />
+    <public type="string" name="material_slider_range_start" id="0x7F121371" />
+    <public type="string" name="material_timepicker_am" id="0x7F121372" />
+    <public type="string" name="material_timepicker_clock_mode_description" id="0x7F121373" />
+    <public type="string" name="material_timepicker_hour" id="0x7F121374" />
+    <public type="string" name="material_timepicker_minute" id="0x7F121375" />
+    <public type="string" name="material_timepicker_pm" id="0x7F121376" />
+    <public type="string" name="material_timepicker_select_time" id="0x7F121377" />
+    <public type="string" name="material_timepicker_text_input_mode_description" id="0x7F121378" />
+    <public type="string" name="mature_listing_accept" id="0x7F121379" />
+    <public type="string" name="mature_listing_decline" id="0x7F12137A" />
+    <public type="string" name="mature_listing_description" id="0x7F12137B" />
+    <public type="string" name="mature_listing_title" id="0x7F12137C" />
+    <public type="string" name="max_age_never" id="0x7F12137D" />
+    <public type="string" name="max_age_never_description_mobile" id="0x7F12137E" />
+    <public type="string" name="max_guild_members_reached_error" id="0x7F12137F" />
+    <public type="string" name="max_number_of_uses" id="0x7F121380" />
+    <public type="string" name="max_uses" id="0x7F121381" />
+    <public type="string" name="max_uses_description_mobile" id="0x7F121382" />
+    <public type="string" name="max_uses_description_unlimited_uses" id="0x7F121383" />
+    <public type="string" name="maybe_later" id="0x7F121384" />
+    <public type="string" name="me" id="0x7F121385" />
+    <public type="string" name="media_keyboard_browse" id="0x7F121386" />
+    <public type="string" name="media_keyboard_gift" id="0x7F121387" />
+    <public type="string" name="member" id="0x7F121388" />
+    <public type="string" name="member_list" id="0x7F121389" />
+    <public type="string" name="member_list_private_thread_instructions" id="0x7F12138A" />
+    <public type="string" name="member_list_server_owner_help" id="0x7F12138B" />
+    <public type="string" name="member_verification_add_question" id="0x7F12138C" />
+    <public type="string" name="member_verification_add_rule" id="0x7F12138D" />
+    <public type="string" name="member_verification_application_confirmation_subtitle" id="0x7F12138E" />
+    <public type="string" name="member_verification_application_confirmation_title" id="0x7F12138F" />
+    <public type="string" name="member_verification_application_confirmation_title_with_guild_name" id="0x7F121390" />
+    <public type="string" name="member_verification_application_reapply" id="0x7F121391" />
+    <public type="string" name="member_verification_application_rejected_icon" id="0x7F121392" />
+    <public type="string" name="member_verification_application_rejected_reason" id="0x7F121393" />
+    <public type="string" name="member_verification_application_rejected_title" id="0x7F121394" />
+    <public type="string" name="member_verification_application_rejected_title_with_guild_name" id="0x7F121395" />
+    <public type="string" name="member_verification_approved_application_modal_confirm" id="0x7F121396" />
+    <public type="string" name="member_verification_approved_application_modal_desc" id="0x7F121397" />
+    <public type="string" name="member_verification_approved_application_modal_title" id="0x7F121398" />
+    <public type="string" name="member_verification_cancel_application" id="0x7F121399" />
+    <public type="string" name="member_verification_cancel_application_subtitle" id="0x7F12139A" />
+    <public type="string" name="member_verification_cancel_pending_application_modal_desc" id="0x7F12139B" />
+    <public type="string" name="member_verification_cancel_pending_application_modal_title" id="0x7F12139C" />
+    <public type="string" name="member_verification_chat_blocker_text" id="0x7F12139D" />
+    <public type="string" name="member_verification_chat_input_guard_message" id="0x7F12139E" />
+    <public type="string" name="member_verification_choices_required_error" id="0x7F12139F" />
+    <public type="string" name="member_verification_claim_account_icon" id="0x7F1213A0" />
+    <public type="string" name="member_verification_claim_account_info" id="0x7F1213A1" />
+    <public type="string" name="member_verification_claim_account_subtitle" id="0x7F1213A2" />
+    <public type="string" name="member_verification_claim_account_title" id="0x7F1213A3" />
+    <public type="string" name="member_verification_confirm_leave_title" id="0x7F1213A4" />
+    <public type="string" name="member_verification_delete_field_confirm_text" id="0x7F1213A5" />
+    <public type="string" name="member_verification_delete_field_confirm_title" id="0x7F1213A6" />
+    <public type="string" name="member_verification_disable_confirm_approve_all" id="0x7F1213A7" />
+    <public type="string" name="member_verification_disable_confirm_body" id="0x7F1213A8" />
+    <public type="string" name="member_verification_disable_confirm_kick_all" id="0x7F1213A9" />
+    <public type="string" name="member_verification_disable_confirm_title" id="0x7F1213AA" />
+    <public type="string" name="member_verification_email_confirmation_subtitle" id="0x7F1213AB" />
+    <public type="string" name="member_verification_email_confirmation_title" id="0x7F1213AC" />
+    <public type="string" name="member_verification_email_resend" id="0x7F1213AD" />
+    <public type="string" name="member_verification_email_verification_email_sent" id="0x7F1213AE" />
+    <public type="string" name="member_verification_email_verification_enabled" id="0x7F1213AF" />
+    <public type="string" name="member_verification_email_verification_resend_email" id="0x7F1213B0" />
+    <public type="string" name="member_verification_email_verified" id="0x7F1213B1" />
+    <public type="string" name="member_verification_example_rules" id="0x7F1213B2" />
+    <public type="string" name="member_verification_field_placeholder" id="0x7F1213B3" />
+    <public type="string" name="member_verification_field_question" id="0x7F1213B4" />
+    <public type="string" name="member_verification_field_question_required_error" id="0x7F1213B5" />
+    <public type="string" name="member_verification_folder_name" id="0x7F1213B6" />
+    <public type="string" name="member_verification_form_fields_limit" id="0x7F1213B7" />
+    <public type="string" name="member_verification_form_incomplete" id="0x7F1213B8" />
+    <public type="string" name="member_verification_form_item_coming_soon" id="0x7F1213B9" />
+    <public type="string" name="member_verification_form_item_email_verification_label" id="0x7F1213BA" />
+    <public type="string" name="member_verification_form_item_email_verification_settings_label" id="0x7F1213BB" />
+    <public type="string" name="member_verification_form_item_file_upload" id="0x7F1213BC" />
+    <public type="string" name="member_verification_form_item_multiple_choice" id="0x7F1213BD" />
+    <public type="string" name="member_verification_form_item_paragraph" id="0x7F1213BE" />
+    <public type="string" name="member_verification_form_item_phone_verification_label" id="0x7F1213BF" />
+    <public type="string" name="member_verification_form_item_rules" id="0x7F1213C0" />
+    <public type="string" name="member_verification_form_item_text_input" id="0x7F1213C1" />
+    <public type="string" name="member_verification_form_item_verification" id="0x7F1213C2" />
+    <public type="string" name="member_verification_form_required_item" id="0x7F1213C3" />
+    <public type="string" name="member_verification_form_rules_label" id="0x7F1213C4" />
+    <public type="string" name="member_verification_form_verification_settings" id="0x7F1213C5" />
+    <public type="string" name="member_verification_get_started_button" id="0x7F1213C6" />
+    <public type="string" name="member_verification_get_started_subtitle" id="0x7F1213C7" />
+    <public type="string" name="member_verification_get_started_title" id="0x7F1213C8" />
+    <public type="string" name="member_verification_icon_desc" id="0x7F1213C9" />
+    <public type="string" name="member_verification_learn_more" id="0x7F1213CA" />
+    <public type="string" name="member_verification_leave_application_complete_later" id="0x7F1213CB" />
+    <public type="string" name="member_verification_leave_application_desc" id="0x7F1213CC" />
+    <public type="string" name="member_verification_leave_application_title" id="0x7F1213CD" />
+    <public type="string" name="member_verification_modal_subtitle" id="0x7F1213CE" />
+    <public type="string" name="member_verification_modal_title" id="0x7F1213CF" />
+    <public type="string" name="member_verification_multiple_choice_add" id="0x7F1213D0" />
+    <public type="string" name="member_verification_multiple_choice_limit" id="0x7F1213D1" />
+    <public type="string" name="member_verification_multiple_choice_placeholder" id="0x7F1213D2" />
+    <public type="string" name="member_verification_need_rules_channel_perms" id="0x7F1213D3" />
+    <public type="string" name="member_verification_notice_cta" id="0x7F1213D4" />
+    <public type="string" name="member_verification_notice_text" id="0x7F1213D5" />
+    <public type="string" name="member_verification_num_emojis" id="0x7F1213D6" />
+    <public type="string" name="member_verification_num_members" id="0x7F1213D7" />
+    <public type="string" name="member_verification_num_online" id="0x7F1213D8" />
+    <public type="string" name="member_verification_pending_application_cancel_modal_title" id="0x7F1213D9" />
+    <public type="string" name="member_verification_pending_application_icon" id="0x7F1213DA" />
+    <public type="string" name="member_verification_pending_application_leave_server_modal_desc" id="0x7F1213DB" />
+    <public type="string" name="member_verification_pending_application_leave_server_modal_title" id="0x7F1213DC" />
+    <public type="string" name="member_verification_pending_application_modal_cancel" id="0x7F1213DD" />
+    <public type="string" name="member_verification_pending_application_modal_confirm" id="0x7F1213DE" />
+    <public type="string" name="member_verification_pending_application_modal_desc" id="0x7F1213DF" />
+    <public type="string" name="member_verification_pending_application_modal_dismiss" id="0x7F1213E0" />
+    <public type="string" name="member_verification_pending_application_modal_leave" id="0x7F1213E1" />
+    <public type="string" name="member_verification_pending_application_modal_reapply" id="0x7F1213E2" />
+    <public type="string" name="member_verification_pending_application_modal_title" id="0x7F1213E3" />
+    <public type="string" name="member_verification_pending_application_modal_withdraw_and_leave" id="0x7F1213E4" />
+    <public type="string" name="member_verification_phone_verification_enabled" id="0x7F1213E5" />
+    <public type="string" name="member_verification_phone_verified" id="0x7F1213E6" />
+    <public type="string" name="member_verification_preview_disabled_markdown_warning" id="0x7F1213E7" />
+    <public type="string" name="member_verification_progress_lost_continue" id="0x7F1213E8" />
+    <public type="string" name="member_verification_progress_lost_title" id="0x7F1213E9" />
+    <public type="string" name="member_verification_read_rules" id="0x7F1213EA" />
+    <public type="string" name="member_verification_rejected_title" id="0x7F1213EB" />
+    <public type="string" name="member_verification_rule_be_respectful" id="0x7F1213EC" />
+    <public type="string" name="member_verification_rule_be_respectful_full" id="0x7F1213ED" />
+    <public type="string" name="member_verification_rule_index" id="0x7F1213EE" />
+    <public type="string" name="member_verification_rule_limit" id="0x7F1213EF" />
+    <public type="string" name="member_verification_rule_no_nsfw" id="0x7F1213F0" />
+    <public type="string" name="member_verification_rule_no_nsfw_full" id="0x7F1213F1" />
+    <public type="string" name="member_verification_rule_no_spam" id="0x7F1213F2" />
+    <public type="string" name="member_verification_rule_no_spam_full" id="0x7F1213F3" />
+    <public type="string" name="member_verification_rule_placeholder" id="0x7F1213F4" />
+    <public type="string" name="member_verification_rule_safe" id="0x7F1213F5" />
+    <public type="string" name="member_verification_rule_safe_full" id="0x7F1213F6" />
+    <public type="string" name="member_verification_rule_tooltip" id="0x7F1213F7" />
+    <public type="string" name="member_verification_rules_required_error" id="0x7F1213F8" />
+    <public type="string" name="member_verification_verification_field_settings_tooltip" id="0x7F1213F9" />
+    <public type="string" name="member_verification_verification_icon" id="0x7F1213FA" />
+    <public type="string" name="member_verification_verified" id="0x7F1213FB" />
+    <public type="string" name="member_verification_verify_email_icon" id="0x7F1213FC" />
+    <public type="string" name="member_verification_version_mismatch_error" id="0x7F1213FD" />
+    <public type="string" name="member_verification_warning" id="0x7F1213FE" />
+    <public type="string" name="member_verification_warning_cancel" id="0x7F1213FF" />
+    <public type="string" name="member_verification_warning_confirm" id="0x7F121400" />
+    <public type="string" name="member_verification_warning_description" id="0x7F121401" />
+    <public type="string" name="member_verification_warning_description_and_fields" id="0x7F121402" />
+    <public type="string" name="member_verification_warning_fields" id="0x7F121403" />
+    <public type="string" name="member_verification_warning_title" id="0x7F121404" />
+    <public type="string" name="member_verification_warning_update" id="0x7F121405" />
+    <public type="string" name="member_verification_warning_update_modal_desc" id="0x7F121406" />
+    <public type="string" name="member_verification_warning_update_modal_title" id="0x7F121407" />
+    <public type="string" name="members" id="0x7F121408" />
+    <public type="string" name="members_header" id="0x7F121409" />
+    <public type="string" name="members_matching" id="0x7F12140A" />
+    <public type="string" name="members_search_placeholder" id="0x7F12140B" />
+    <public type="string" name="mention" id="0x7F12140C" />
+    <public type="string" name="mention_everyone" id="0x7F12140D" />
+    <public type="string" name="mention_everyone_android" id="0x7F12140E" />
+    <public type="string" name="mention_everyone_autocomplete_description" id="0x7F12140F" />
+    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7F121410" />
+    <public type="string" name="mention_everyone_channel_description" id="0x7F121411" />
+    <public type="string" name="mention_everyone_channel_description_android" id="0x7F121412" />
+    <public type="string" name="mention_everyone_description" id="0x7F121413" />
+    <public type="string" name="mention_everyone_description_android" id="0x7F121414" />
+    <public type="string" name="mention_here_autocomplete_description" id="0x7F121415" />
+    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7F121416" />
+    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7F121417" />
+    <public type="string" name="mention_users_with_role" id="0x7F121418" />
+    <public type="string" name="mentions" id="0x7F121419" />
+    <public type="string" name="mentions_and_quickswitcher" id="0x7F12141A" />
+    <public type="string" name="mentions_count" id="0x7F12141B" />
+    <public type="string" name="message_action_reply" id="0x7F12141C" />
+    <public type="string" name="message_actions_menu_label" id="0x7F12141D" />
+    <public type="string" name="message_button_component_link_context_menu_copy" id="0x7F12141E" />
+    <public type="string" name="message_button_component_link_context_menu_name" id="0x7F12141F" />
+    <public type="string" name="message_display_mode_label" id="0x7F121420" />
+    <public type="string" name="message_edited" id="0x7F121421" />
+    <public type="string" name="message_header_replied" id="0x7F121422" />
+    <public type="string" name="message_header_replied_to" id="0x7F121423" />
+    <public type="string" name="message_options" id="0x7F121424" />
+    <public type="string" name="message_pinned" id="0x7F121425" />
+    <public type="string" name="message_preview" id="0x7F121426" />
+    <public type="string" name="message_published" id="0x7F121427" />
+    <public type="string" name="message_rate_limited_body" id="0x7F121428" />
+    <public type="string" name="message_rate_limited_button" id="0x7F121429" />
+    <public type="string" name="message_rate_limited_header" id="0x7F12142A" />
+    <public type="string" name="message_replied_to" id="0x7F12142B" />
+    <public type="string" name="message_select_component_default_placeholder" id="0x7F12142C" />
+    <public type="string" name="message_select_component_select_requirement" id="0x7F12142D" />
+    <public type="string" name="message_step_subtitle" id="0x7F12142E" />
+    <public type="string" name="message_step_title" id="0x7F12142F" />
+    <public type="string" name="message_too_long_body_text" id="0x7F121430" />
+    <public type="string" name="message_too_long_header" id="0x7F121431" />
+    <public type="string" name="message_tts" id="0x7F121432" />
+    <public type="string" name="message_tts_deleted_role" id="0x7F121433" />
+    <public type="string" name="message_tts_reply" id="0x7F121434" />
+    <public type="string" name="message_unpinned" id="0x7F121435" />
+    <public type="string" name="message_utilities_a11y_label" id="0x7F121436" />
+    <public type="string" name="messages" id="0x7F121437" />
+    <public type="string" name="messages_failed_to_load" id="0x7F121438" />
+    <public type="string" name="messages_failed_to_load_try_again" id="0x7F121439" />
+    <public type="string" name="mfa_sms_add_phone" id="0x7F12143A" />
+    <public type="string" name="mfa_sms_already_enabled" id="0x7F12143B" />
+    <public type="string" name="mfa_sms_auth" id="0x7F12143C" />
+    <public type="string" name="mfa_sms_auth_current_phone" id="0x7F12143D" />
+    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7F12143E" />
+    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7F12143F" />
+    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7F121440" />
+    <public type="string" name="mfa_sms_disabled_no_email" id="0x7F121441" />
+    <public type="string" name="mfa_sms_disabled_partner" id="0x7F121442" />
+    <public type="string" name="mfa_sms_enable" id="0x7F121443" />
+    <public type="string" name="mfa_sms_enable_should_do" id="0x7F121444" />
+    <public type="string" name="mfa_sms_enable_subheader" id="0x7F121445" />
+    <public type="string" name="mfa_sms_phone_number_hide" id="0x7F121446" />
+    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7F121447" />
+    <public type="string" name="mfa_sms_receive_code" id="0x7F121448" />
+    <public type="string" name="mfa_sms_remove" id="0x7F121449" />
+    <public type="string" name="mfa_sms_resend" id="0x7F12144A" />
+    <public type="string" name="mic_test_voice_channel_warning" id="0x7F12144B" />
+    <public type="string" name="minimum_size" id="0x7F12144C" />
+    <public type="string" name="missed_an_update" id="0x7F12144D" />
+    <public type="string" name="missed_call" id="0x7F12144E" />
+    <public type="string" name="missing_entitlement_modal_body" id="0x7F12144F" />
+    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7F121450" />
+    <public type="string" name="missing_entitlement_modal_header" id="0x7F121451" />
+    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7F121452" />
+    <public type="string" name="mobile_advanced_voice_activity_cpu_overuse" id="0x7F121453" />
+    <public type="string" name="mobile_app_download_cta" id="0x7F121454" />
+    <public type="string" name="mobile_designate_other_channel" id="0x7F121455" />
+    <public type="string" name="mobile_enable_hardware_scaling" id="0x7F121456" />
+    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7F121457" />
+    <public type="string" name="mobile_noise_cancellation_cpu_overuse" id="0x7F121458" />
+    <public type="string" name="mobile_noise_cancellation_failed" id="0x7F121459" />
+    <public type="string" name="mobile_noise_cancellation_popout_description" id="0x7F12145A" />
+    <public type="string" name="mobile_noise_cancellation_popout_title" id="0x7F12145B" />
+    <public type="string" name="mobile_outbound_promotion_card_claimed_body" id="0x7F12145C" />
+    <public type="string" name="mobile_outbound_promotion_card_unclaimed_body" id="0x7F12145D" />
+    <public type="string" name="mobile_replying_to" id="0x7F12145E" />
+    <public type="string" name="mobile_reports_block_element_description" id="0x7F12145F" />
+    <public type="string" name="mobile_reports_block_element_header" id="0x7F121460" />
+    <public type="string" name="mobile_reports_breadcrumbs_title" id="0x7F121461" />
+    <public type="string" name="mobile_reports_message_preview_title" id="0x7F121462" />
+    <public type="string" name="mobile_reports_stage_channel_preview_title" id="0x7F121463" />
+    <public type="string" name="mobile_reports_submit_failed" id="0x7F121464" />
+    <public type="string" name="mobile_reports_submit_info_text" id="0x7F121465" />
+    <public type="string" name="mobile_reports_submit_report" id="0x7F121466" />
+    <public type="string" name="mobile_stream_active_body" id="0x7F121467" />
+    <public type="string" name="mobile_stream_active_header" id="0x7F121468" />
+    <public type="string" name="mobile_stream_active_soundshare_warning_android" id="0x7F121469" />
+    <public type="string" name="mobile_stream_participants_hidden" id="0x7F12146A" />
+    <public type="string" name="mobile_stream_screen_share" id="0x7F12146B" />
+    <public type="string" name="mobile_stream_screen_sharing" id="0x7F12146C" />
+    <public type="string" name="mobile_stream_stop_sharing" id="0x7F12146D" />
+    <public type="string" name="moderation" id="0x7F12146E" />
+    <public type="string" name="moderator_allow_everyone_raise_hand" id="0x7F12146F" />
+    <public type="string" name="moderator_raise_own_hand" id="0x7F121470" />
+    <public type="string" name="moderator_view" id="0x7F121471" />
+    <public type="string" name="moderator_view_description" id="0x7F121472" />
+    <public type="string" name="moderator_view_tooltip" id="0x7F121473" />
+    <public type="string" name="moderator_view_tooltip_mobile" id="0x7F121474" />
+    <public type="string" name="modify_followed_news_header" id="0x7F121475" />
+    <public type="string" name="monthly" id="0x7F121476" />
+    <public type="string" name="more" id="0x7F121477" />
+    <public type="string" name="more_details" id="0x7F121478" />
+    <public type="string" name="more_options" id="0x7F121479" />
+    <public type="string" name="move_from_category_to" id="0x7F12147A" />
+    <public type="string" name="move_me_to_audience" id="0x7F12147B" />
+    <public type="string" name="move_members" id="0x7F12147C" />
+    <public type="string" name="move_members_description" id="0x7F12147D" />
+    <public type="string" name="move_to" id="0x7F12147E" />
+    <public type="string" name="move_to_success" id="0x7F12147F" />
+    <public type="string" name="res_2131891328_msg_alert_cleared" id="0x7F121480" />
+    <public type="string" name="res_2131891329_msg_no_alert_showing" id="0x7F121481" />
+    <public type="string" name="mtrl_badge_numberless_content_description" id="0x7F121482" />
+    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7F121483" />
+    <public type="string" name="mtrl_exceed_max_badge_number_content_description" id="0x7F121484" />
+    <public type="string" name="mtrl_exceed_max_badge_number_suffix" id="0x7F121485" />
+    <public type="string" name="mtrl_picker_a11y_next_month" id="0x7F121486" />
+    <public type="string" name="mtrl_picker_a11y_prev_month" id="0x7F121487" />
+    <public type="string" name="mtrl_picker_announce_current_selection" id="0x7F121488" />
+    <public type="string" name="mtrl_picker_cancel" id="0x7F121489" />
+    <public type="string" name="mtrl_picker_confirm" id="0x7F12148A" />
+    <public type="string" name="mtrl_picker_date_header_selected" id="0x7F12148B" />
+    <public type="string" name="mtrl_picker_date_header_title" id="0x7F12148C" />
+    <public type="string" name="mtrl_picker_date_header_unselected" id="0x7F12148D" />
+    <public type="string" name="mtrl_picker_day_of_week_column_header" id="0x7F12148E" />
+    <public type="string" name="mtrl_picker_invalid_format" id="0x7F12148F" />
+    <public type="string" name="mtrl_picker_invalid_format_example" id="0x7F121490" />
+    <public type="string" name="mtrl_picker_invalid_format_use" id="0x7F121491" />
+    <public type="string" name="mtrl_picker_invalid_range" id="0x7F121492" />
+    <public type="string" name="mtrl_picker_navigate_to_year_description" id="0x7F121493" />
+    <public type="string" name="mtrl_picker_out_of_range" id="0x7F121494" />
+    <public type="string" name="mtrl_picker_range_header_only_end_selected" id="0x7F121495" />
+    <public type="string" name="mtrl_picker_range_header_only_start_selected" id="0x7F121496" />
+    <public type="string" name="mtrl_picker_range_header_selected" id="0x7F121497" />
+    <public type="string" name="mtrl_picker_range_header_title" id="0x7F121498" />
+    <public type="string" name="mtrl_picker_range_header_unselected" id="0x7F121499" />
+    <public type="string" name="mtrl_picker_save" id="0x7F12149A" />
+    <public type="string" name="mtrl_picker_text_input_date_hint" id="0x7F12149B" />
+    <public type="string" name="mtrl_picker_text_input_date_range_end_hint" id="0x7F12149C" />
+    <public type="string" name="mtrl_picker_text_input_date_range_start_hint" id="0x7F12149D" />
+    <public type="string" name="mtrl_picker_text_input_day_abbr" id="0x7F12149E" />
+    <public type="string" name="mtrl_picker_text_input_month_abbr" id="0x7F12149F" />
+    <public type="string" name="mtrl_picker_text_input_year_abbr" id="0x7F1214A0" />
+    <public type="string" name="mtrl_picker_toggle_to_calendar_input_mode" id="0x7F1214A1" />
+    <public type="string" name="mtrl_picker_toggle_to_day_selection" id="0x7F1214A2" />
+    <public type="string" name="mtrl_picker_toggle_to_text_input_mode" id="0x7F1214A3" />
+    <public type="string" name="mtrl_picker_toggle_to_year_selection" id="0x7F1214A4" />
+    <public type="string" name="mute" id="0x7F1214A5" />
+    <public type="string" name="mute_category" id="0x7F1214A6" />
+    <public type="string" name="mute_channel" id="0x7F1214A7" />
+    <public type="string" name="mute_channel_generic" id="0x7F1214A8" />
+    <public type="string" name="mute_conversation" id="0x7F1214A9" />
+    <public type="string" name="mute_duration_15_minutes" id="0x7F1214AA" />
+    <public type="string" name="mute_duration_1_hour" id="0x7F1214AB" />
+    <public type="string" name="mute_duration_24_hours" id="0x7F1214AC" />
+    <public type="string" name="mute_duration_8_hours" id="0x7F1214AD" />
+    <public type="string" name="mute_duration_always" id="0x7F1214AE" />
+    <public type="string" name="mute_group_dm" id="0x7F1214AF" />
+    <public type="string" name="mute_members" id="0x7F1214B0" />
+    <public type="string" name="mute_server" id="0x7F1214B1" />
+    <public type="string" name="mute_settings_mute_category" id="0x7F1214B2" />
+    <public type="string" name="mute_settings_mute_channel" id="0x7F1214B3" />
+    <public type="string" name="mute_settings_mute_server" id="0x7F1214B4" />
+    <public type="string" name="mute_settings_mute_this_conversation" id="0x7F1214B5" />
+    <public type="string" name="mute_until" id="0x7F1214B6" />
+    <public type="string" name="muted_until_time" id="0x7F1214B7" />
+    <public type="string" name="mutual_friends" id="0x7F1214B8" />
+    <public type="string" name="mutual_guilds" id="0x7F1214B9" />
+    <public type="string" name="n_days" id="0x7F1214BA" />
+    <public type="string" name="nearby_scan" id="0x7F1214BB" />
+    <public type="string" name="nearby_scan_cta_title" id="0x7F1214BC" />
+    <public type="string" name="nearby_scan_subtitle" id="0x7F1214BD" />
+    <public type="string" name="need_account" id="0x7F1214BE" />
+    <public type="string" name="network_error_bad_request" id="0x7F1214BF" />
+    <public type="string" name="network_error_cloudflare_intermittent" id="0x7F1214C0" />
+    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7F1214C1" />
+    <public type="string" name="network_error_connection" id="0x7F1214C2" />
+    <public type="string" name="network_error_forbidden" id="0x7F1214C3" />
+    <public type="string" name="network_error_request_too_large" id="0x7F1214C4" />
+    <public type="string" name="network_error_rest_request" id="0x7F1214C5" />
+    <public type="string" name="network_error_ssl" id="0x7F1214C6" />
+    <public type="string" name="network_error_unauthorized" id="0x7F1214C7" />
+    <public type="string" name="network_error_unknown" id="0x7F1214C8" />
+    <public type="string" name="network_offline" id="0x7F1214C9" />
+    <public type="string" name="network_offline_airplane_mode" id="0x7F1214CA" />
+    <public type="string" name="never_ask_again" id="0x7F1214CB" />
+    <public type="string" name="nevermind" id="0x7F1214CC" />
+    <public type="string" name="new_dm" id="0x7F1214CD" />
+    <public type="string" name="new_dm_cta_invite_to_server_message" id="0x7F1214CE" />
+    <public type="string" name="new_dm_cta_send_first_message" id="0x7F1214CF" />
+    <public type="string" name="new_dm_cta_start_group_message" id="0x7F1214D0" />
+    <public type="string" name="new_group_dm" id="0x7F1214D1" />
+    <public type="string" name="new_guilds_dm_allowed" id="0x7F1214D2" />
+    <public type="string" name="new_member_retention_info" id="0x7F1214D3" />
+    <public type="string" name="new_mentions" id="0x7F1214D4" />
+    <public type="string" name="new_messages" id="0x7F1214D5" />
+    <public type="string" name="new_messages_divider" id="0x7F1214D6" />
+    <public type="string" name="new_messages_estimated" id="0x7F1214D7" />
+    <public type="string" name="new_messages_estimated_with_date" id="0x7F1214D8" />
+    <public type="string" name="new_messages_with_date" id="0x7F1214D9" />
+    <public type="string" name="new_override" id="0x7F1214DA" />
+    <public type="string" name="new_permission" id="0x7F1214DB" />
+    <public type="string" name="new_role" id="0x7F1214DC" />
+    <public type="string" name="new_terms_ack" id="0x7F1214DD" />
+    <public type="string" name="new_terms_continue" id="0x7F1214DE" />
+    <public type="string" name="new_terms_description" id="0x7F1214DF" />
+    <public type="string" name="new_terms_title" id="0x7F1214E0" />
+    <public type="string" name="new_thread" id="0x7F1214E1" />
+    <public type="string" name="new_unreads" id="0x7F1214E2" />
+    <public type="string" name="news_channel" id="0x7F1214E3" />
+    <public type="string" name="news_channel_desc" id="0x7F1214E4" />
+    <public type="string" name="news_channel_publish" id="0x7F1214E5" />
+    <public type="string" name="news_channel_publish_bump" id="0x7F1214E6" />
+    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7F1214E7" />
+    <public type="string" name="news_channel_published" id="0x7F1214E8" />
+    <public type="string" name="next" id="0x7F1214E9" />
+    <public type="string" name="nickname" id="0x7F1214EA" />
+    <public type="string" name="nickname_changed" id="0x7F1214EB" />
+    <public type="string" name="nickname_cleared" id="0x7F1214EC" />
+    <public type="string" name="nl" id="0x7F1214ED" />
+    <public type="string" name="no" id="0x7F1214EE" />
+    <public type="string" name="no_afk_channel" id="0x7F1214EF" />
+    <public type="string" name="no_authorized_apps" id="0x7F1214F0" />
+    <public type="string" name="no_authorized_apps_note" id="0x7F1214F1" />
+    <public type="string" name="no_ban_reason" id="0x7F1214F2" />
+    <public type="string" name="no_bans" id="0x7F1214F3" />
+    <public type="string" name="no_camera_access" id="0x7F1214F4" />
+    <public type="string" name="no_camera_body" id="0x7F1214F5" />
+    <public type="string" name="no_camera_title" id="0x7F1214F6" />
+    <public type="string" name="no_category" id="0x7F1214F7" />
+    <public type="string" name="no_contacts_access" id="0x7F1214F8" />
+    <public type="string" name="no_emoji" id="0x7F1214F9" />
+    <public type="string" name="no_emoji_body" id="0x7F1214FA" />
+    <public type="string" name="no_emoji_search_results" id="0x7F1214FB" />
+    <public type="string" name="no_emoji_title" id="0x7F1214FC" />
+    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7F1214FD" />
+    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7F1214FE" />
+    <public type="string" name="no_gif_favorites_go_favorite" id="0x7F1214FF" />
+    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7F121500" />
+    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7F121501" />
+    <public type="string" name="no_gif_search_results" id="0x7F121502" />
+    <public type="string" name="no_gif_search_results_with_related_search" id="0x7F121503" />
+    <public type="string" name="no_gif_search_results_without_related_search" id="0x7F121504" />
+    <public type="string" name="no_input_devices" id="0x7F121505" />
+    <public type="string" name="no_input_monitoring_access" id="0x7F121506" />
+    <public type="string" name="no_instant_invite" id="0x7F121507" />
+    <public type="string" name="no_integrations" id="0x7F121508" />
+    <public type="string" name="no_integrations_body" id="0x7F121509" />
+    <public type="string" name="no_integrations_label" id="0x7F12150A" />
+    <public type="string" name="no_invites_body" id="0x7F12150B" />
+    <public type="string" name="no_invites_caption" id="0x7F12150C" />
+    <public type="string" name="no_invites_label" id="0x7F12150D" />
+    <public type="string" name="no_mic_body" id="0x7F12150E" />
+    <public type="string" name="no_mic_title" id="0x7F12150F" />
+    <public type="string" name="no_micrphone_access" id="0x7F121510" />
+    <public type="string" name="no_mutual_friends" id="0x7F121511" />
+    <public type="string" name="no_mutual_guilds" id="0x7F121512" />
+    <public type="string" name="no_output_devices" id="0x7F121513" />
+    <public type="string" name="no_photos_access" id="0x7F121514" />
+    <public type="string" name="no_pins_in_channel" id="0x7F121515" />
+    <public type="string" name="no_pins_in_dm" id="0x7F121516" />
+    <public type="string" name="no_private_channels_description" id="0x7F121517" />
+    <public type="string" name="no_private_channels_title" id="0x7F121518" />
+    <public type="string" name="no_reactions_body" id="0x7F121519" />
+    <public type="string" name="no_reactions_header" id="0x7F12151A" />
+    <public type="string" name="no_recent_mentions" id="0x7F12151B" />
+    <public type="string" name="no_recent_thread_messages" id="0x7F12151C" />
+    <public type="string" name="no_results_found" id="0x7F12151D" />
+    <public type="string" name="no_screenshare_permission_dialog_body" id="0x7F12151E" />
+    <public type="string" name="no_screenshare_permission_dialog_title" id="0x7F12151F" />
+    <public type="string" name="no_send_messages_permission_placeholder" id="0x7F121520" />
+    <public type="string" name="no_sticker_search_results" id="0x7F121521" />
+    <public type="string" name="no_sticker_search_results_with_suggestions" id="0x7F121522" />
+    <public type="string" name="no_stickers_to_search_through" id="0x7F121523" />
+    <public type="string" name="no_system_channel" id="0x7F121524" />
+    <public type="string" name="no_text" id="0x7F121525" />
+    <public type="string" name="no_thanks" id="0x7F121526" />
+    <public type="string" name="no_thread_messages" id="0x7F121527" />
+    <public type="string" name="no_user_limit" id="0x7F121528" />
+    <public type="string" name="no_video_devices" id="0x7F121529" />
+    <public type="string" name="no_video_permission_dialog_body" id="0x7F12152A" />
+    <public type="string" name="no_video_permission_dialog_title" id="0x7F12152B" />
+    <public type="string" name="noise_cancellation_cpu_overuse" id="0x7F12152C" />
+    <public type="string" name="noise_cancellation_off" id="0x7F12152D" />
+    <public type="string" name="noise_cancellation_on" id="0x7F12152E" />
+    <public type="string" name="noise_cancellation_popout_description" id="0x7F12152F" />
+    <public type="string" name="noise_cancellation_popout_footer" id="0x7F121530" />
+    <public type="string" name="noise_cancellation_popout_header" id="0x7F121531" />
+    <public type="string" name="noise_cancellation_popout_mic_test_title" id="0x7F121532" />
+    <public type="string" name="noise_cancellation_popout_stop" id="0x7F121533" />
+    <public type="string" name="noise_cancellation_popout_test" id="0x7F121534" />
+    <public type="string" name="noise_cancellation_tooltip" id="0x7F121535" />
+    <public type="string" name="noise_suppression" id="0x7F121536" />
+    <public type="string" name="none" id="0x7F121537" />
+    <public type="string" name="not_available" id="0x7F121538" />
+    <public type="string" name="not_in_the_voice_channel" id="0x7F121539" />
+    <public type="string" name="not_set" id="0x7F12153A" />
+    <public type="string" name="note" id="0x7F12153B" />
+    <public type="string" name="note_placeholder" id="0x7F12153C" />
+    <public type="string" name="note_placeholder_mobile" id="0x7F12153D" />
+    <public type="string" name="notice_application_test_mode" id="0x7F12153E" />
+    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7F12153F" />
+    <public type="string" name="notice_channel_max_members_cap_reached_message" id="0x7F121540" />
+    <public type="string" name="notice_connect_spotify" id="0x7F121541" />
+    <public type="string" name="notice_connection_conflict" id="0x7F121542" />
+    <public type="string" name="notice_corrupt_installation" id="0x7F121543" />
+    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7F121544" />
+    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7F121545" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7F121546" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7F121547" />
+    <public type="string" name="notice_dispatch_api_error" id="0x7F121548" />
+    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7F121549" />
+    <public type="string" name="notice_dispatch_error" id="0x7F12154A" />
+    <public type="string" name="notice_dispatch_error_disk_full" id="0x7F12154B" />
+    <public type="string" name="notice_dispatch_error_disk_low" id="0x7F12154C" />
+    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7F12154D" />
+    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7F12154E" />
+    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7F12154F" />
+    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7F121550" />
+    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7F121551" />
+    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7F121552" />
+    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7F121553" />
+    <public type="string" name="notice_dispatch_error_unwritable" id="0x7F121554" />
+    <public type="string" name="notice_dispatch_error_with_code" id="0x7F121555" />
+    <public type="string" name="notice_dispatch_install_script_progress" id="0x7F121556" />
+    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7F121557" />
+    <public type="string" name="notice_embedded_application_test_mode" id="0x7F121558" />
+    <public type="string" name="notice_enable_public_guild_upsell_message" id="0x7F121559" />
+    <public type="string" name="notice_guild_feedback_survey" id="0x7F12155A" />
+    <public type="string" name="notice_hardware_mute" id="0x7F12155B" />
+    <public type="string" name="notice_messaging_experience_button" id="0x7F12155C" />
+    <public type="string" name="notice_messaging_experience_survey" id="0x7F12155D" />
+    <public type="string" name="notice_mfa_sms_backup" id="0x7F12155E" />
+    <public type="string" name="notice_mfa_sms_backup_button" id="0x7F12155F" />
+    <public type="string" name="notice_native_apps_2020_06" id="0x7F121560" />
+    <public type="string" name="notice_no_input_detected" id="0x7F121561" />
+    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7F121562" />
+    <public type="string" name="notice_no_input_detected_settings" id="0x7F121563" />
+    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7F121564" />
+    <public type="string" name="notice_noise_detected" id="0x7F121565" />
+    <public type="string" name="notice_notification_message" id="0x7F121566" />
+    <public type="string" name="notice_notification_message2" id="0x7F121567" />
+    <public type="string" name="notice_premium_grandfathered_ended" id="0x7F121568" />
+    <public type="string" name="notice_premium_grandfathered_ending" id="0x7F121569" />
+    <public type="string" name="notice_premium_grandfathered_monthly_ending" id="0x7F12156A" />
+    <public type="string" name="notice_premium_grandfathered_upgrade" id="0x7F12156B" />
+    <public type="string" name="notice_premium_promo_action" id="0x7F12156C" />
+    <public type="string" name="notice_premium_promo_message" id="0x7F12156D" />
+    <public type="string" name="notice_premium_tier_2_trial_ending_cta" id="0x7F12156E" />
+    <public type="string" name="notice_premium_tier_2_trial_ending_days" id="0x7F12156F" />
+    <public type="string" name="notice_premium_tier_2_trial_ending_hours" id="0x7F121570" />
+    <public type="string" name="notice_premium_tier_2_trial_ending_minutes" id="0x7F121571" />
+    <public type="string" name="notice_product_feedback_survey" id="0x7F121572" />
+    <public type="string" name="notice_product_feedback_survey_cta" id="0x7F121573" />
+    <public type="string" name="notice_register_to_vote" id="0x7F121574" />
+    <public type="string" name="notice_register_to_vote_cta" id="0x7F121575" />
+    <public type="string" name="notice_scheduled_maintenance" id="0x7F121576" />
+    <public type="string" name="notice_snowsgiving" id="0x7F121577" />
+    <public type="string" name="notice_snowsgiving_cta" id="0x7F121578" />
+    <public type="string" name="notice_spotify_auto_paused" id="0x7F121579" />
+    <public type="string" name="notice_streamer_mode_text" id="0x7F12157A" />
+    <public type="string" name="notice_survey_body" id="0x7F12157B" />
+    <public type="string" name="notice_survey_button" id="0x7F12157C" />
+    <public type="string" name="notice_survey_improve_prompt" id="0x7F12157D" />
+    <public type="string" name="notice_survey_prompt" id="0x7F12157E" />
+    <public type="string" name="notice_unclaimed_account" id="0x7F12157F" />
+    <public type="string" name="notice_unverified_account" id="0x7F121580" />
+    <public type="string" name="notice_whats_this" id="0x7F121581" />
+    <public type="string" name="notification_accepted_friend_request" id="0x7F121582" />
+    <public type="string" name="notification_body_attachment" id="0x7F121583" />
+    <public type="string" name="notification_body_start_game" id="0x7F121584" />
+    <public type="string" name="notification_dismiss" id="0x7F121585" />
+    <public type="string" name="notification_message_create_dm_activity_join" id="0x7F121586" />
+    <public type="string" name="notification_message_create_dm_activity_join_request" id="0x7F121587" />
+    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7F121588" />
+    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7F121589" />
+    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7F12158A" />
+    <public type="string" name="notification_message_create_guild_activity_join" id="0x7F12158B" />
+    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7F12158C" />
+    <public type="string" name="notification_mute_1_hour" id="0x7F12158D" />
+    <public type="string" name="notification_overrides" id="0x7F12158E" />
+    <public type="string" name="notification_pending_friend_request" id="0x7F12158F" />
+    <public type="string" name="notification_reply" id="0x7F121590" />
+    <public type="string" name="notification_reply_failed" id="0x7F121591" />
+    <public type="string" name="notification_reply_success" id="0x7F121592" />
+    <public type="string" name="notification_settings" id="0x7F121593" />
+    <public type="string" name="notification_title_discord" id="0x7F121594" />
+    <public type="string" name="notification_title_start_game" id="0x7F121595" />
+    <public type="string" name="notifications" id="0x7F121596" />
+    <public type="string" name="notifications_muted" id="0x7F121597" />
+    <public type="string" name="notifications_nuf_body" id="0x7F121598" />
+    <public type="string" name="notifications_nuf_cta" id="0x7F121599" />
+    <public type="string" name="notifications_nuf_title" id="0x7F12159A" />
+    <public type="string" name="now_playing_gdpr_body" id="0x7F12159B" />
+    <public type="string" name="now_playing_gdpr_header" id="0x7F12159C" />
+    <public type="string" name="nsfw_accept" id="0x7F12159D" />
+    <public type="string" name="nsfw_channel_header" id="0x7F12159E" />
+    <public type="string" name="nsfw_decline" id="0x7F12159F" />
+    <public type="string" name="nsfw_description" id="0x7F1215A0" />
+    <public type="string" name="nsfw_guild_channel_description" id="0x7F1215A1" />
+    <public type="string" name="nsfw_guild_close" id="0x7F1215A2" />
+    <public type="string" name="nsfw_guild_description" id="0x7F1215A3" />
+    <public type="string" name="nsfw_guild_description_more" id="0x7F1215A4" />
+    <public type="string" name="nsfw_guild_emoji_unavailable" id="0x7F1215A5" />
+    <public type="string" name="nsfw_guild_header" id="0x7F1215A6" />
+    <public type="string" name="nsfw_guild_sidebar_description" id="0x7F1215A7" />
+    <public type="string" name="nsfw_guild_sidebar_header" id="0x7F1215A8" />
+    <public type="string" name="nsfw_guilds_toggle_caption" id="0x7F1215A9" />
+    <public type="string" name="nsfw_guilds_toggle_header" id="0x7F1215AA" />
+    <public type="string" name="nsfw_title" id="0x7F1215AB" />
+    <public type="string" name="nuf_age_gate_body" id="0x7F1215AC" />
+    <public type="string" name="nuf_ask_friend_server_invite" id="0x7F1215AD" />
+    <public type="string" name="nuf_body" id="0x7F1215AE" />
+    <public type="string" name="nuf_body_mobile" id="0x7F1215AF" />
+    <public type="string" name="nuf_body_refresh" id="0x7F1215B0" />
+    <public type="string" name="nuf_channel_prompt_channel_topic_template" id="0x7F1215B1" />
+    <public type="string" name="nuf_channel_prompt_cta" id="0x7F1215B2" />
+    <public type="string" name="nuf_channel_prompt_subtitle" id="0x7F1215B3" />
+    <public type="string" name="nuf_channel_prompt_title" id="0x7F1215B4" />
+    <public type="string" name="nuf_channel_prompt_topic" id="0x7F1215B5" />
+    <public type="string" name="nuf_channel_prompt_topic_placeholder" id="0x7F1215B6" />
+    <public type="string" name="nuf_channels_cta_label" id="0x7F1215B7" />
+    <public type="string" name="nuf_channels_description" id="0x7F1215B8" />
+    <public type="string" name="nuf_channels_title" id="0x7F1215B9" />
+    <public type="string" name="nuf_chat_with_friends" id="0x7F1215BA" />
+    <public type="string" name="nuf_club_or_interest_group" id="0x7F1215BB" />
+    <public type="string" name="nuf_complete_cta" id="0x7F1215BC" />
+    <public type="string" name="nuf_complete_subtitle" id="0x7F1215BD" />
+    <public type="string" name="nuf_complete_title" id="0x7F1215BE" />
+    <public type="string" name="nuf_create_guild_cta_description" id="0x7F1215BF" />
+    <public type="string" name="nuf_create_server_button" id="0x7F1215C0" />
+    <public type="string" name="nuf_create_server_customize_header" id="0x7F1215C1" />
+    <public type="string" name="nuf_create_server_customize_subheader" id="0x7F1215C2" />
+    <public type="string" name="nuf_desktop_templates_subtitle" id="0x7F1215C3" />
+    <public type="string" name="nuf_desktop_templates_title" id="0x7F1215C4" />
+    <public type="string" name="nuf_download_app_button_platform" id="0x7F1215C5" />
+    <public type="string" name="nuf_gaming_community" id="0x7F1215C6" />
+    <public type="string" name="nuf_get_started" id="0x7F1215C7" />
+    <public type="string" name="nuf_have_an_invite_already" id="0x7F1215C8" />
+    <public type="string" name="nuf_join_a_friend" id="0x7F1215C9" />
+    <public type="string" name="nuf_join_server_button" id="0x7F1215CA" />
+    <public type="string" name="nuf_join_server_title_2" id="0x7F1215CB" />
+    <public type="string" name="nuf_just_look_around" id="0x7F1215CC" />
+    <public type="string" name="nuf_title_mobile" id="0x7F1215CD" />
+    <public type="string" name="nuf_voice_channels_description" id="0x7F1215CE" />
+    <public type="string" name="nuf_voice_channels_title" id="0x7F1215CF" />
+    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7F1215D0" />
+    <public type="string" name="nuf_welcome_body" id="0x7F1215D1" />
+    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7F1215D2" />
+    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7F1215D3" />
+    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7F1215D4" />
+    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7F1215D5" />
+    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7F1215D6" />
+    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7F1215D7" />
+    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7F1215D8" />
+    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7F1215D9" />
+    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7F1215DA" />
+    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7F1215DB" />
+    <public type="string" name="nuf_what_do_you_want" id="0x7F1215DC" />
+    <public type="string" name="num_channels" id="0x7F1215DD" />
+    <public type="string" name="num_members" id="0x7F1215DE" />
+    <public type="string" name="num_subscribers" id="0x7F1215DF" />
+    <public type="string" name="num_users" id="0x7F1215E0" />
+    <public type="string" name="numbers_only" id="0x7F1215E1" />
+    <public type="string" name="nux_navigation_help_channels" id="0x7F1215E2" />
+    <public type="string" name="nux_navigation_help_dms" id="0x7F1215E3" />
+    <public type="string" name="nux_navigation_help_guild" id="0x7F1215E4" />
+    <public type="string" name="nux_notification_permission_alert_title" id="0x7F1215E5" />
+    <public type="string" name="nux_notification_permission_prompt_subtitle" id="0x7F1215E6" />
+    <public type="string" name="nux_notification_permission_prompt_text" id="0x7F1215E7" />
+    <public type="string" name="nux_overlay_description" id="0x7F1215E8" />
+    <public type="string" name="nux_overlay_enable" id="0x7F1215E9" />
+    <public type="string" name="nux_overlay_title" id="0x7F1215EA" />
+    <public type="string" name="nux_post_reg_join_server_description" id="0x7F1215EB" />
+    <public type="string" name="nux_post_reg_join_server_skip" id="0x7F1215EC" />
+    <public type="string" name="nux_post_reg_join_server_title" id="0x7F1215ED" />
+    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7F1215EE" />
+    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7F1215EF" />
+    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7F1215F0" />
+    <public type="string" name="oauth2_add_bot" id="0x7F1215F1" />
+    <public type="string" name="oauth2_add_to_guild" id="0x7F1215F2" />
+    <public type="string" name="oauth2_add_to_guild_description" id="0x7F1215F3" />
+    <public type="string" name="oauth2_add_to_guild_placeholder" id="0x7F1215F4" />
+    <public type="string" name="oauth2_add_webhook_incoming" id="0x7F1215F5" />
+    <public type="string" name="oauth2_can_read_notice" id="0x7F1215F6" />
+    <public type="string" name="oauth2_cannot_read_send_notice" id="0x7F1215F7" />
+    <public type="string" name="oauth2_confirm_bot_permissions" id="0x7F1215F8" />
+    <public type="string" name="oauth2_connect_to_discord" id="0x7F1215F9" />
+    <public type="string" name="oauth2_details_creation_date" id="0x7F1215FA" />
+    <public type="string" name="oauth2_details_guilds" id="0x7F1215FB" />
+    <public type="string" name="oauth2_details_privacy_policy" id="0x7F1215FC" />
+    <public type="string" name="oauth2_details_privacy_policy_with_developer" id="0x7F1215FD" />
+    <public type="string" name="oauth2_details_privacy_policy_with_links" id="0x7F1215FE" />
+    <public type="string" name="oauth2_details_privacy_policy_with_links_with_developer" id="0x7F1215FF" />
+    <public type="string" name="oauth2_details_privacy_policy_with_privacy_policy_link" id="0x7F121600" />
+    <public type="string" name="oauth2_details_privacy_policy_with_privacy_policy_link_with_developer" id="0x7F121601" />
+    <public type="string" name="oauth2_details_privacy_policy_with_terms_of_service_link" id="0x7F121602" />
+    <public type="string" name="oauth2_details_privacy_policy_with_terms_of_service_link_with_developer" id="0x7F121603" />
+    <public type="string" name="oauth2_details_redirect" id="0x7F121604" />
+    <public type="string" name="oauth2_disabled_permissions" id="0x7F121605" />
+    <public type="string" name="oauth2_fake_scope_1" id="0x7F121606" />
+    <public type="string" name="oauth2_fake_scope_2" id="0x7F121607" />
+    <public type="string" name="oauth2_fake_scope_3" id="0x7F121608" />
+    <public type="string" name="oauth2_fake_scope_4" id="0x7F121609" />
+    <public type="string" name="oauth2_fake_scope_5" id="0x7F12160A" />
+    <public type="string" name="oauth2_fake_scope_6" id="0x7F12160B" />
+    <public type="string" name="oauth2_fake_scope_7" id="0x7F12160C" />
+    <public type="string" name="oauth2_fake_scope_8" id="0x7F12160D" />
+    <public type="string" name="oauth2_logout" id="0x7F12160E" />
+    <public type="string" name="oauth2_message_cta" id="0x7F12160F" />
+    <public type="string" name="oauth2_request_invalid_scope" id="0x7F121610" />
+    <public type="string" name="oauth2_request_missing_param" id="0x7F121611" />
+    <public type="string" name="oauth2_requests_account_access" id="0x7F121612" />
+    <public type="string" name="oauth2_scopes_label" id="0x7F121613" />
+    <public type="string" name="oauth2_signed_in_as" id="0x7F121614" />
+    <public type="string" name="oauth2_title" id="0x7F121615" />
+    <public type="string" name="oauth2_unknown_error" id="0x7F121616" />
+    <public type="string" name="okay" id="0x7F121617" />
+    <public type="string" name="onboarding_video_bot_message" id="0x7F121618" />
+    <public type="string" name="onboarding_video_bot_message_new_user" id="0x7F121619" />
+    <public type="string" name="one_user_typing" id="0x7F12161A" />
+    <public type="string" name="ongoing_call" id="0x7F12161B" />
+    <public type="string" name="ongoing_call_connected_users" id="0x7F12161C" />
+    <public type="string" name="ongoing_call_tap_to_join" id="0x7F12161D" />
+    <public type="string" name="ongoing_call_voice_quality_low" id="0x7F12161E" />
+    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7F12161F" />
+    <public type="string" name="only_you_can_see_and_delete_these" id="0x7F121620" />
+    <public type="string" name="open" id="0x7F121621" />
+    <public type="string" name="open_connection_replay" id="0x7F121622" />
+    <public type="string" name="open_in_browser" id="0x7F121623" />
+    <public type="string" name="open_in_full_view" id="0x7F121624" />
+    <public type="string" name="open_in_split_view" id="0x7F121625" />
+    <public type="string" name="open_in_theater" id="0x7F121626" />
+    <public type="string" name="open_link" id="0x7F121627" />
+    <public type="string" name="open_navigation" id="0x7F121628" />
+    <public type="string" name="open_original_image" id="0x7F121629" />
+    <public type="string" name="open_standard_keyboard_accessibility_label" id="0x7F12162A" />
+    <public type="string" name="optional_application_command_indicator" id="0x7F12162B" />
+    <public type="string" name="options" id="0x7F12162C" />
+    <public type="string" name="options_matching" id="0x7F12162D" />
+    <public type="string" name="orange" id="0x7F12162E" />
+    <public type="string" name="os_min_screenshare_dialog_body" id="0x7F12162F" />
+    <public type="string" name="os_min_screenshare_dialog_title" id="0x7F121630" />
+    <public type="string" name="other" id="0x7F121631" />
+    <public type="string" name="other_options" id="0x7F121632" />
+    <public type="string" name="other_reactions" id="0x7F121633" />
+    <public type="string" name="others_online" id="0x7F121634" />
+    <public type="string" name="out_of_date_action" id="0x7F121635" />
+    <public type="string" name="out_of_date_description" id="0x7F121636" />
+    <public type="string" name="out_of_date_title" id="0x7F121637" />
+    <public type="string" name="outbound_promotion_card_claimed_expanded_body" id="0x7F121638" />
+    <public type="string" name="outbound_promotion_card_claimed_unexpanded_body" id="0x7F121639" />
+    <public type="string" name="outbound_promotion_card_unclaimed_expanded_body" id="0x7F12163A" />
+    <public type="string" name="outbound_promotion_card_unclaimed_unexpanded_body" id="0x7F12163B" />
+    <public type="string" name="outbound_promotion_code_confirmation_email" id="0x7F12163C" />
+    <public type="string" name="outbound_promotion_less_details" id="0x7F12163D" />
+    <public type="string" name="outbound_promotion_more_details" id="0x7F12163E" />
+    <public type="string" name="outbound_promotion_notice" id="0x7F12163F" />
+    <public type="string" name="outbound_promotion_redemption_modal_title" id="0x7F121640" />
+    <public type="string" name="outbound_promotion_see_code" id="0x7F121641" />
+    <public type="string" name="outgoing_friend_request" id="0x7F121642" />
+    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7F121643" />
+    <public type="string" name="outgoing_friend_request_to" id="0x7F121644" />
+    <public type="string" name="output_device" id="0x7F121645" />
+    <public type="string" name="overlay" id="0x7F121646" />
+    <public type="string" name="overlay_actions_menu_label" id="0x7F121647" />
+    <public type="string" name="overlay_channel_chat_hotkey" id="0x7F121648" />
+    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7F121649" />
+    <public type="string" name="overlay_click_to_unlock" id="0x7F12164A" />
+    <public type="string" name="overlay_crashed_title" id="0x7F12164B" />
+    <public type="string" name="overlay_explanation" id="0x7F12164C" />
+    <public type="string" name="overlay_friend_calling" id="0x7F12164D" />
+    <public type="string" name="overlay_in_game_preview_header" id="0x7F12164E" />
+    <public type="string" name="overlay_launch_open_tip" id="0x7F12164F" />
+    <public type="string" name="overlay_launch_title" id="0x7F121650" />
+    <public type="string" name="overlay_link_alert_body" id="0x7F121651" />
+    <public type="string" name="overlay_link_alert_secondary" id="0x7F121652" />
+    <public type="string" name="overlay_link_alert_title" id="0x7F121653" />
+    <public type="string" name="overlay_menu_get_invite" id="0x7F121654" />
+    <public type="string" name="overlay_menu_open_discord" id="0x7F121655" />
+    <public type="string" name="overlay_menu_switch_channels" id="0x7F121656" />
+    <public type="string" name="overlay_mobile_required" id="0x7F121657" />
+    <public type="string" name="overlay_mobile_toggle_desc" id="0x7F121658" />
+    <public type="string" name="overlay_mobile_toggle_label" id="0x7F121659" />
+    <public type="string" name="overlay_mobile_unauthed" id="0x7F12165A" />
+    <public type="string" name="overlay_news_go_live_body" id="0x7F12165B" />
+    <public type="string" name="overlay_news_go_live_body_no_voice_channel" id="0x7F12165C" />
+    <public type="string" name="overlay_news_go_live_cta" id="0x7F12165D" />
+    <public type="string" name="overlay_no_results" id="0x7F12165E" />
+    <public type="string" name="overlay_notification_incoming_call" id="0x7F12165F" />
+    <public type="string" name="overlay_notification_settings_disabled" id="0x7F121660" />
+    <public type="string" name="overlay_notification_settings_position" id="0x7F121661" />
+    <public type="string" name="overlay_notifications_bottom_left" id="0x7F121662" />
+    <public type="string" name="overlay_notifications_bottom_right" id="0x7F121663" />
+    <public type="string" name="overlay_notifications_disabled" id="0x7F121664" />
+    <public type="string" name="overlay_notifications_settings" id="0x7F121665" />
+    <public type="string" name="overlay_notifications_top_left" id="0x7F121666" />
+    <public type="string" name="overlay_notifications_top_right" id="0x7F121667" />
+    <public type="string" name="overlay_reload" id="0x7F121668" />
+    <public type="string" name="overlay_reset_default_layout" id="0x7F121669" />
+    <public type="string" name="overlay_settings_general_tab" id="0x7F12166A" />
+    <public type="string" name="overlay_settings_title" id="0x7F12166B" />
+    <public type="string" name="overlay_settings_voice_tab" id="0x7F12166C" />
+    <public type="string" name="overlay_too_small" id="0x7F12166D" />
+    <public type="string" name="overlay_unlock_to_answer" id="0x7F12166E" />
+    <public type="string" name="overlay_unlock_to_join" id="0x7F12166F" />
+    <public type="string" name="overlay_user_chat_hotkey" id="0x7F121670" />
+    <public type="string" name="overlay_widget_hide_in_game" id="0x7F121671" />
+    <public type="string" name="overlay_widget_show_in_game" id="0x7F121672" />
+    <public type="string" name="overview" id="0x7F121673" />
+    <public type="string" name="overwrite_autocomplete_a11y_label" id="0x7F121674" />
+    <public type="string" name="overwrite_autocomplete_label" id="0x7F121675" />
+    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7F121676" />
+    <public type="string" name="overwrite_no_role_to_add" id="0x7F121677" />
+    <public type="string" name="pagination_next" id="0x7F121678" />
+    <public type="string" name="pagination_page_label" id="0x7F121679" />
+    <public type="string" name="pagination_page_of" id="0x7F12167A" />
+    <public type="string" name="pagination_previous" id="0x7F12167B" />
+    <public type="string" name="paginator_current_page" id="0x7F12167C" />
+    <public type="string" name="paginator_of_pages" id="0x7F12167D" />
+    <public type="string" name="partial_outage" id="0x7F12167E" />
+    <public type="string" name="partial_outage_a11y" id="0x7F12167F" />
+    <public type="string" name="partner_badge_tooltip" id="0x7F121680" />
+    <public type="string" name="partner_program" id="0x7F121681" />
+    <public type="string" name="password_length_error" id="0x7F121682" />
+    <public type="string" name="password_manager" id="0x7F121683" />
+    <public type="string" name="password_manager_info_android" id="0x7F121684" />
+    <public type="string" name="password_manager_open_settings" id="0x7F121685" />
+    <public type="string" name="password_manager_open_settings_error" id="0x7F121686" />
+    <public type="string" name="password_manager_use" id="0x7F121687" />
+    <public type="string" name="password_recovery_external_link_description" id="0x7F121688" />
+    <public type="string" name="password_recovery_title" id="0x7F121689" />
+    <public type="string" name="password_recovery_verify_phone_subtitle" id="0x7F12168A" />
+    <public type="string" name="password_recovery_verify_phone_subtitle_resend" id="0x7F12168B" />
+    <public type="string" name="password_recovery_verify_phone_title" id="0x7F12168C" />
+    <public type="string" name="password_required" id="0x7F12168D" />
+    <public type="string" name="password_toggle_content_description" id="0x7F12168E" />
+    <public type="string" name="paste" id="0x7F12168F" />
+    <public type="string" name="path_password_eye" id="0x7F121690" />
+    <public type="string" name="path_password_eye_mask_strike_through" id="0x7F121691" />
+    <public type="string" name="path_password_eye_mask_visible" id="0x7F121692" />
+    <public type="string" name="path_password_strike_through" id="0x7F121693" />
+    <public type="string" name="pause" id="0x7F121694" />
+    <public type="string" name="payment_authentication_modal_button" id="0x7F121695" />
+    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7F121696" />
+    <public type="string" name="payment_authentication_modal_canceled" id="0x7F121697" />
+    <public type="string" name="payment_authentication_modal_fail" id="0x7F121698" />
+    <public type="string" name="payment_authentication_modal_start" id="0x7F121699" />
+    <public type="string" name="payment_authentication_modal_success" id="0x7F12169A" />
+    <public type="string" name="payment_authentication_modal_title" id="0x7F12169B" />
+    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7F12169C" />
+    <public type="string" name="payment_authentication_modal_title_fail" id="0x7F12169D" />
+    <public type="string" name="payment_authentication_modal_title_success" id="0x7F12169E" />
+    <public type="string" name="payment_modal_button_premium" id="0x7F12169F" />
+    <public type="string" name="payment_modal_button_premium_gift" id="0x7F1216A0" />
+    <public type="string" name="payment_modal_one_month" id="0x7F1216A1" />
+    <public type="string" name="payment_modal_one_year" id="0x7F1216A2" />
+    <public type="string" name="payment_modal_subtitle_premium_gift" id="0x7F1216A3" />
+    <public type="string" name="payment_price_change_body" id="0x7F1216A4" />
+    <public type="string" name="payment_price_change_title" id="0x7F1216A5" />
+    <public type="string" name="payment_source_card_ending" id="0x7F1216A6" />
+    <public type="string" name="payment_source_card_ending_in" id="0x7F1216A7" />
+    <public type="string" name="payment_source_card_expires" id="0x7F1216A8" />
+    <public type="string" name="payment_source_card_number" id="0x7F1216A9" />
+    <public type="string" name="payment_source_confirm_paypal_details" id="0x7F1216AA" />
+    <public type="string" name="payment_source_credit_card" id="0x7F1216AB" />
+    <public type="string" name="payment_source_delete" id="0x7F1216AC" />
+    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7F1216AD" />
+    <public type="string" name="payment_source_deleted" id="0x7F1216AE" />
+    <public type="string" name="payment_source_edit_help_card" id="0x7F1216AF" />
+    <public type="string" name="payment_source_edit_help_paypal" id="0x7F1216B0" />
+    <public type="string" name="payment_source_edit_saved" id="0x7F1216B1" />
+    <public type="string" name="payment_source_edit_select_state" id="0x7F1216B2" />
+    <public type="string" name="payment_source_edit_title" id="0x7F1216B3" />
+    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7F1216B4" />
+    <public type="string" name="payment_source_information" id="0x7F1216B5" />
+    <public type="string" name="payment_source_invalid" id="0x7F1216B6" />
+    <public type="string" name="payment_source_invalid_help" id="0x7F1216B7" />
+    <public type="string" name="payment_source_make_default" id="0x7F1216B8" />
+    <public type="string" name="payment_source_name_error_required" id="0x7F1216B9" />
+    <public type="string" name="payment_source_payment_request_button_generic" id="0x7F1216BA" />
+    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7F1216BB" />
+    <public type="string" name="payment_source_payment_request_info_creating" id="0x7F1216BC" />
+    <public type="string" name="payment_source_payment_request_info_loading" id="0x7F1216BD" />
+    <public type="string" name="payment_source_payment_request_info_title" id="0x7F1216BE" />
+    <public type="string" name="payment_source_payment_request_label" id="0x7F1216BF" />
+    <public type="string" name="payment_source_payment_request_unsupported" id="0x7F1216C0" />
+    <public type="string" name="payment_source_paypal" id="0x7F1216C1" />
+    <public type="string" name="payment_source_paypal_account" id="0x7F1216C2" />
+    <public type="string" name="payment_source_paypal_details" id="0x7F1216C3" />
+    <public type="string" name="payment_source_paypal_loading" id="0x7F1216C4" />
+    <public type="string" name="payment_source_paypal_reopen" id="0x7F1216C5" />
+    <public type="string" name="payment_source_subscription" id="0x7F1216C6" />
+    <public type="string" name="payment_source_type" id="0x7F1216C7" />
+    <public type="string" name="payment_source_type_select" id="0x7F1216C8" />
+    <public type="string" name="payment_sources_add" id="0x7F1216C9" />
+    <public type="string" name="payment_waiting_for_authentication" id="0x7F1216CA" />
+    <public type="string" name="paypal_account_verifying" id="0x7F1216CB" />
+    <public type="string" name="paypal_callback_error" id="0x7F1216CC" />
+    <public type="string" name="paypal_callback_success" id="0x7F1216CD" />
+    <public type="string" name="pending" id="0x7F1216CE" />
+    <public type="string" name="pending_friends_list_header" id="0x7F1216CF" />
+    <public type="string" name="people" id="0x7F1216D0" />
+    <public type="string" name="per_guild_avatars_premium_feature_description" id="0x7F1216D1" />
+    <public type="string" name="per_guild_avatars_premium_feature_title" id="0x7F1216D2" />
+    <public type="string" name="percentage_since_last_week" id="0x7F1216D3" />
+    <public type="string" name="permission_helpdesk" id="0x7F1216D4" />
+    <public type="string" name="permission_media_denied" id="0x7F1216D5" />
+    <public type="string" name="permission_media_download_denied" id="0x7F1216D6" />
+    <public type="string" name="permission_microphone_denied" id="0x7F1216D7" />
+    <public type="string" name="permission_override_allow" id="0x7F1216D8" />
+    <public type="string" name="permission_override_deny" id="0x7F1216D9" />
+    <public type="string" name="permission_override_passthrough" id="0x7F1216DA" />
+    <public type="string" name="permission_overrides" id="0x7F1216DB" />
+    <public type="string" name="permission_qr_scanner_denied" id="0x7F1216DC" />
+    <public type="string" name="permissions" id="0x7F1216DD" />
+    <public type="string" name="permissions_unsynced" id="0x7F1216DE" />
+    <public type="string" name="personalization_disable_modal_body" id="0x7F1216DF" />
+    <public type="string" name="personalization_disable_modal_cancel" id="0x7F1216E0" />
+    <public type="string" name="personalization_disable_modal_confirm" id="0x7F1216E1" />
+    <public type="string" name="personalization_disable_modal_title" id="0x7F1216E2" />
+    <public type="string" name="phone" id="0x7F1216E3" />
+    <public type="string" name="phone_failed_to_add" id="0x7F1216E4" />
+    <public type="string" name="phone_invalid" id="0x7F1216E5" />
+    <public type="string" name="phone_ip_authorization_subtitle" id="0x7F1216E6" />
+    <public type="string" name="phone_ip_authorization_subtitle_resend" id="0x7F1216E7" />
+    <public type="string" name="phone_ip_authorization_title" id="0x7F1216E8" />
+    <public type="string" name="phone_required" id="0x7F1216E9" />
+    <public type="string" name="phone_verification_add_title" id="0x7F1216EA" />
+    <public type="string" name="phone_verification_current_phone" id="0x7F1216EB" />
+    <public type="string" name="phone_verification_new_phone_label" id="0x7F1216EC" />
+    <public type="string" name="phone_verification_phone_label" id="0x7F1216ED" />
+    <public type="string" name="phone_verification_receive_text" id="0x7F1216EE" />
+    <public type="string" name="phone_verification_update_title" id="0x7F1216EF" />
+    <public type="string" name="pick_a_color" id="0x7F1216F0" />
+    <public type="string" name="picture_in_picture_collapse" id="0x7F1216F1" />
+    <public type="string" name="picture_in_picture_expand" id="0x7F1216F2" />
+    <public type="string" name="pin" id="0x7F1216F3" />
+    <public type="string" name="pin_confirm" id="0x7F1216F4" />
+    <public type="string" name="pin_message" id="0x7F1216F5" />
+    <public type="string" name="pin_message_body" id="0x7F1216F6" />
+    <public type="string" name="pin_message_body_mobile" id="0x7F1216F7" />
+    <public type="string" name="pin_message_body_private_channel" id="0x7F1216F8" />
+    <public type="string" name="pin_message_title" id="0x7F1216F9" />
+    <public type="string" name="pin_message_too_many_body" id="0x7F1216FA" />
+    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7F1216FB" />
+    <public type="string" name="pin_message_too_many_title" id="0x7F1216FC" />
+    <public type="string" name="pinned_messages" id="0x7F1216FD" />
+    <public type="string" name="pinned_messages_pro_tip" id="0x7F1216FE" />
+    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7F1216FF" />
+    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7F121700" />
+    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7F121701" />
+    <public type="string" name="pins" id="0x7F121702" />
+    <public type="string" name="pins_disabled_nsfw" id="0x7F121703" />
+    <public type="string" name="pins_unread_a11y_label" id="0x7F121704" />
+    <public type="string" name="pl" id="0x7F121705" />
+    <public type="string" name="platform_android" id="0x7F121706" />
+    <public type="string" name="platform_ios" id="0x7F121707" />
+    <public type="string" name="platform_linux" id="0x7F121708" />
+    <public type="string" name="platform_macos" id="0x7F121709" />
+    <public type="string" name="platform_windows" id="0x7F12170A" />
+    <public type="string" name="play" id="0x7F12170B" />
+    <public type="string" name="play_again" id="0x7F12170C" />
+    <public type="string" name="play_full_video" id="0x7F12170D" />
+    <public type="string" name="play_stream" id="0x7F12170E" />
+    <public type="string" name="playing_game" id="0x7F12170F" />
+    <public type="string" name="please_try_again_later" id="0x7F121710" />
+    <public type="string" name="poker_survey_prompt" id="0x7F121711" />
+    <public type="string" name="popout_player" id="0x7F121712" />
+    <public type="string" name="popout_player_opened" id="0x7F121713" />
+    <public type="string" name="popout_remove_from_top" id="0x7F121714" />
+    <public type="string" name="popout_return" id="0x7F121715" />
+    <public type="string" name="popout_stay_on_top" id="0x7F121716" />
+    <public type="string" name="preference_copied" id="0x7F121717" />
+    <public type="string" name="premium" id="0x7F121718" />
+    <public type="string" name="premium_activated" id="0x7F121719" />
+    <public type="string" name="premium_alert_error_title" id="0x7F12171A" />
+    <public type="string" name="premium_and_premium_guild_subscription" id="0x7F12171B" />
+    <public type="string" name="premium_badge_tooltip" id="0x7F12171C" />
+    <public type="string" name="premium_cancel_cancel_mobile" id="0x7F12171D" />
+    <public type="string" name="premium_cancel_confirm_body" id="0x7F12171E" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7F12171F" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7F121720" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7F121721" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7F121722" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7F121723" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7F121724" />
+    <public type="string" name="premium_cancel_confirm_button" id="0x7F121725" />
+    <public type="string" name="premium_cancel_confirm_header" id="0x7F121726" />
+    <public type="string" name="premium_cancel_confirm_mobile" id="0x7F121727" />
+    <public type="string" name="premium_cancel_confirm_new" id="0x7F121728" />
+    <public type="string" name="premium_cancel_confirm_title" id="0x7F121729" />
+    <public type="string" name="premium_cancel_failed_body" id="0x7F12172A" />
+    <public type="string" name="premium_cancel_past_due_confirm_body" id="0x7F12172B" />
+    <public type="string" name="premium_change_discriminator_length_error" id="0x7F12172C" />
+    <public type="string" name="premium_change_discriminator_modal_body" id="0x7F12172D" />
+    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7F12172E" />
+    <public type="string" name="premium_change_discriminator_modal_header" id="0x7F12172F" />
+    <public type="string" name="premium_change_discriminator_tooltip" id="0x7F121730" />
+    <public type="string" name="premium_change_discriminator_warning" id="0x7F121731" />
+    <public type="string" name="premium_change_discriminator_zero_error" id="0x7F121732" />
+    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7F121733" />
+    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7F121734" />
+    <public type="string" name="premium_chat_perks_custom_stickers" id="0x7F121735" />
+    <public type="string" name="premium_chat_perks_description_premium_guild_discount" id="0x7F121736" />
+    <public type="string" name="premium_chat_perks_description_premium_guild_included" id="0x7F121737" />
+    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7F121738" />
+    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7F121739" />
+    <public type="string" name="premium_chat_perks_max_guilds" id="0x7F12173A" />
+    <public type="string" name="premium_chat_perks_max_message_length" id="0x7F12173B" />
+    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7F12173C" />
+    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7F12173D" />
+    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7F12173E" />
+    <public type="string" name="premium_chat_perks_simple_title" id="0x7F12173F" />
+    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7F121740" />
+    <public type="string" name="premium_choose_plan_title" id="0x7F121741" />
+    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7F121742" />
+    <public type="string" name="premium_current_active_subscription" id="0x7F121743" />
+    <public type="string" name="premium_downgrade_done_button" id="0x7F121744" />
+    <public type="string" name="premium_features_chat_perks" id="0x7F121745" />
+    <public type="string" name="premium_features_chat_perks_header" id="0x7F121746" />
+    <public type="string" name="premium_features_message_length_heading" id="0x7F121747" />
+    <public type="string" name="premium_features_message_length_subheading" id="0x7F121748" />
+    <public type="string" name="premium_features_profile_customization_header" id="0x7F121749" />
+    <public type="string" name="premium_features_profile_customization_subheader" id="0x7F12174A" />
+    <public type="string" name="premium_game" id="0x7F12174B" />
+    <public type="string" name="premium_gift_button_label" id="0x7F12174C" />
+    <public type="string" name="premium_gift_button_tooltip" id="0x7F12174D" />
+    <public type="string" name="premium_gift_send" id="0x7F12174E" />
+    <public type="string" name="premium_gift_share_link_ios" id="0x7F12174F" />
+    <public type="string" name="premium_gifting_button" id="0x7F121750" />
+    <public type="string" name="premium_gifting_purchase_gift" id="0x7F121751" />
+    <public type="string" name="premium_gifting_title" id="0x7F121752" />
+    <public type="string" name="premium_gifting_title_mobile" id="0x7F121753" />
+    <public type="string" name="premium_grandfathered_monthly" id="0x7F121754" />
+    <public type="string" name="premium_grandfathered_upgrade" id="0x7F121755" />
+    <public type="string" name="premium_grandfathered_upgrade_confirm" id="0x7F121756" />
+    <public type="string" name="premium_grandfathered_upgrade_estimated_title" id="0x7F121757" />
+    <public type="string" name="premium_grandfathered_upgrade_legalese" id="0x7F121758" />
+    <public type="string" name="premium_grandfathered_upgrade_review_header" id="0x7F121759" />
+    <public type="string" name="premium_grandfathered_warning" id="0x7F12175A" />
+    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7F12175B" />
+    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7F12175C" />
+    <public type="string" name="premium_grandfathered_warning_title" id="0x7F12175D" />
+    <public type="string" name="premium_grandfathered_yearly" id="0x7F12175E" />
+    <public type="string" name="premium_grandfathered_yearly_upgrading" id="0x7F12175F" />
+    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7F121760" />
+    <public type="string" name="premium_guild_emoji_promo_title" id="0x7F121761" />
+    <public type="string" name="premium_guild_features_custom_emoji_mobile" id="0x7F121762" />
+    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7F121763" />
+    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7F121764" />
+    <public type="string" name="premium_guild_features_voice_quality" id="0x7F121765" />
+    <public type="string" name="premium_guild_full_feature_list" id="0x7F121766" />
+    <public type="string" name="premium_guild_grace_period_cooldown" id="0x7F121767" />
+    <public type="string" name="premium_guild_grace_period_cooldown_soon" id="0x7F121768" />
+    <public type="string" name="premium_guild_grace_period_notice" id="0x7F121769" />
+    <public type="string" name="premium_guild_grace_period_notice_button" id="0x7F12176A" />
+    <public type="string" name="premium_guild_grace_period_title" id="0x7F12176B" />
+    <public type="string" name="premium_guild_guild_feature_audio_quality" id="0x7F12176C" />
+    <public type="string" name="premium_guild_guild_feature_emoji" id="0x7F12176D" />
+    <public type="string" name="premium_guild_guild_feature_upload_size" id="0x7F12176E" />
+    <public type="string" name="premium_guild_guild_features_header" id="0x7F12176F" />
+    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7F121770" />
+    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7F121771" />
+    <public type="string" name="premium_guild_num_month_guild_subscriptions" id="0x7F121772" />
+    <public type="string" name="premium_guild_num_month_guild_subscriptions_unformatted" id="0x7F121773" />
+    <public type="string" name="premium_guild_num_year_guild_subscriptions" id="0x7F121774" />
+    <public type="string" name="premium_guild_num_year_guild_subscriptions_unformatted" id="0x7F121775" />
+    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7F121776" />
+    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7F121777" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile" id="0x7F121778" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile_learn_more" id="0x7F121779" />
+    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_body" id="0x7F12177A" />
+    <public type="string" name="premium_guild_perks_modal_boost_alert_ios_title" id="0x7F12177B" />
+    <public type="string" name="premium_guild_perks_modal_button_gift_premium" id="0x7F12177C" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7F12177D" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_external_error" id="0x7F12177E" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7F12177F" />
+    <public type="string" name="premium_guild_perks_modal_gift_nitro" id="0x7F121780" />
+    <public type="string" name="premium_guild_perks_modal_header" id="0x7F121781" />
+    <public type="string" name="premium_guild_perks_modal_header_subscription_count" id="0x7F121782" />
+    <public type="string" name="premium_guild_perks_modal_header_user_subscription_count" id="0x7F121783" />
+    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7F121784" />
+    <public type="string" name="premium_guild_perks_modal_manage_your_subscriptions" id="0x7F121785" />
+    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7F121786" />
+    <public type="string" name="premium_guild_perks_modal_protip" id="0x7F121787" />
+    <public type="string" name="premium_guild_perks_modal_protip_mobile" id="0x7F121788" />
+    <public type="string" name="premium_guild_perks_modal_subscribe_to_tier_tooltip" id="0x7F121789" />
+    <public type="string" name="premium_guild_perks_modal_subscriber_perks_header" id="0x7F12178A" />
+    <public type="string" name="premium_guild_plan_month" id="0x7F12178B" />
+    <public type="string" name="premium_guild_plan_year" id="0x7F12178C" />
+    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7F12178D" />
+    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7F12178E" />
+    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7F12178F" />
+    <public type="string" name="premium_guild_subscribe_confirm_cancel_warning" id="0x7F121790" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7F121791" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7F121792" />
+    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7F121793" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_blurb" id="0x7F121794" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_from_guild" id="0x7F121795" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_header" id="0x7F121796" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_to_guild" id="0x7F121797" />
+    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7F121798" />
+    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7F121799" />
+    <public type="string" name="premium_guild_subscribe_select_guild_transfer_header" id="0x7F12179A" />
+    <public type="string" name="premium_guild_subscribe_success_okay" id="0x7F12179B" />
+    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7F12179C" />
+    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation" id="0x7F12179D" />
+    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation_label" id="0x7F12179E" />
+    <public type="string" name="premium_guild_subscribe_transfer_error_body" id="0x7F12179F" />
+    <public type="string" name="premium_guild_subscribe_transfer_error_header" id="0x7F1217A0" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_cancel" id="0x7F1217A1" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_counter" id="0x7F1217A2" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_description" id="0x7F1217A3" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_header" id="0x7F1217A4" />
+    <public type="string" name="premium_guild_subscribe_unused_slots_next" id="0x7F1217A5" />
+    <public type="string" name="premium_guild_subscriber_feature_member_badge" id="0x7F1217A6" />
+    <public type="string" name="premium_guild_subscriber_feature_profile_badge" id="0x7F1217A7" />
+    <public type="string" name="premium_guild_subscriber_feature_role" id="0x7F1217A8" />
+    <public type="string" name="premium_guild_subscription" id="0x7F1217A9" />
+    <public type="string" name="premium_guild_subscription_active_title" id="0x7F1217AA" />
+    <public type="string" name="premium_guild_subscription_available" id="0x7F1217AB" />
+    <public type="string" name="premium_guild_subscription_cancel_body_external" id="0x7F1217AC" />
+    <public type="string" name="premium_guild_subscription_cancel_body_guild" id="0x7F1217AD" />
+    <public type="string" name="premium_guild_subscription_cancel_body_inventory" id="0x7F1217AE" />
+    <public type="string" name="premium_guild_subscription_cancel_button" id="0x7F1217AF" />
+    <public type="string" name="premium_guild_subscription_cancel_button_disabled_past_due_tooltip" id="0x7F1217B0" />
+    <public type="string" name="premium_guild_subscription_cancel_button_disabled_tooltip" id="0x7F1217B1" />
+    <public type="string" name="premium_guild_subscription_cancel_button_mobile" id="0x7F1217B2" />
+    <public type="string" name="premium_guild_subscription_cancel_error_mobile" id="0x7F1217B3" />
+    <public type="string" name="premium_guild_subscription_cancel_invoice_subscription_cancelled" id="0x7F1217B4" />
+    <public type="string" name="premium_guild_subscription_cancel_preview" id="0x7F1217B5" />
+    <public type="string" name="premium_guild_subscription_cancel_title" id="0x7F1217B6" />
+    <public type="string" name="premium_guild_subscription_cancel_title_guild" id="0x7F1217B7" />
+    <public type="string" name="premium_guild_subscription_cancel_title_inventory" id="0x7F1217B8" />
+    <public type="string" name="premium_guild_subscription_cancel_title_pending_cancellation" id="0x7F1217B9" />
+    <public type="string" name="premium_guild_subscription_confirm_body" id="0x7F1217BA" />
+    <public type="string" name="premium_guild_subscription_confirm_title" id="0x7F1217BB" />
+    <public type="string" name="premium_guild_subscription_creation_date" id="0x7F1217BC" />
+    <public type="string" name="premium_guild_subscription_duration" id="0x7F1217BD" />
+    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7F1217BE" />
+    <public type="string" name="premium_guild_subscription_error_pending_mutation" id="0x7F1217BF" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7F1217C0" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7F1217C1" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7F1217C2" />
+    <public type="string" name="premium_guild_subscription_guild_affinity_notice" id="0x7F1217C3" />
+    <public type="string" name="premium_guild_subscription_guild_affinity_notice_button" id="0x7F1217C4" />
+    <public type="string" name="premium_guild_subscription_guild_affinity_notice_small_guild" id="0x7F1217C5" />
+    <public type="string" name="premium_guild_subscription_guild_subsription_subtitle" id="0x7F1217C6" />
+    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_close" id="0x7F1217C7" />
+    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_header" id="0x7F1217C8" />
+    <public type="string" name="premium_guild_subscription_header_subscribe_tooltip_text" id="0x7F1217C9" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_button" id="0x7F1217CA" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_button_mobile" id="0x7F1217CB" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_description" id="0x7F1217CC" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_title" id="0x7F1217CD" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_description" id="0x7F1217CE" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_error" id="0x7F1217CF" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_title" id="0x7F1217D0" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_title_mobile" id="0x7F1217D1" />
+    <public type="string" name="premium_guild_subscription_marketing_blurb" id="0x7F1217D2" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb" id="0x7F1217D3" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_prompt" id="0x7F1217D4" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb_without_prompt" id="0x7F1217D5" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_blurb_mobile" id="0x7F1217D6" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_text" id="0x7F1217D7" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_title" id="0x7F1217D8" />
+    <public type="string" name="premium_guild_subscription_marketing_header" id="0x7F1217D9" />
+    <public type="string" name="premium_guild_subscription_marketing_header_ios" id="0x7F1217DA" />
+    <public type="string" name="premium_guild_subscription_notice" id="0x7F1217DB" />
+    <public type="string" name="premium_guild_subscription_notice_button" id="0x7F1217DC" />
+    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7F1217DD" />
+    <public type="string" name="premium_guild_subscription_num_subscriptions" id="0x7F1217DE" />
+    <public type="string" name="premium_guild_subscription_out_of_slots_account_hold" id="0x7F1217DF" />
+    <public type="string" name="premium_guild_subscription_out_of_slots_account_hold_title" id="0x7F1217E0" />
+    <public type="string" name="premium_guild_subscription_out_of_slots_canceled_subscription" id="0x7F1217E1" />
+    <public type="string" name="premium_guild_subscription_out_of_slots_pending_plan_change" id="0x7F1217E2" />
+    <public type="string" name="premium_guild_subscription_out_of_slots_purchase_on_desktop" id="0x7F1217E3" />
+    <public type="string" name="premium_guild_subscription_out_of_slots_title" id="0x7F1217E4" />
+    <public type="string" name="premium_guild_subscription_pending_cancelation" id="0x7F1217E5" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_plan" id="0x7F1217E6" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription" id="0x7F1217E7" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_subscription_account_hold" id="0x7F1217E8" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_subscription_past_due" id="0x7F1217E9" />
+    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7F1217EA" />
+    <public type="string" name="premium_guild_subscription_slot_cancel_button" id="0x7F1217EB" />
+    <public type="string" name="premium_guild_subscription_slot_uncancel_button" id="0x7F1217EC" />
+    <public type="string" name="premium_guild_subscription_slot_uncancel_button_mobile" id="0x7F1217ED" />
+    <public type="string" name="premium_guild_subscription_subscribe" id="0x7F1217EE" />
+    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7F1217EF" />
+    <public type="string" name="premium_guild_subscription_subtitle" id="0x7F1217F0" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7F1217F1" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7F1217F2" />
+    <public type="string" name="premium_guild_subscription_title" id="0x7F1217F3" />
+    <public type="string" name="premium_guild_subscription_tooltip" id="0x7F1217F4" />
+    <public type="string" name="premium_guild_subscription_transfer_button" id="0x7F1217F5" />
+    <public type="string" name="premium_guild_subscription_transfer_button_disabled_tooltip" id="0x7F1217F6" />
+    <public type="string" name="premium_guild_subscription_unused_slot_description" id="0x7F1217F7" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info" id="0x7F1217F8" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_account_hold" id="0x7F1217F9" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_account_hold_no_price" id="0x7F1217FA" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_android" id="0x7F1217FB" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_no_price" id="0x7F1217FC" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation" id="0x7F1217FD" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation_android" id="0x7F1217FE" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info_pending_cancelation_no_price" id="0x7F1217FF" />
+    <public type="string" name="premium_guild_tier_0" id="0x7F121800" />
+    <public type="string" name="premium_guild_tier_1" id="0x7F121801" />
+    <public type="string" name="premium_guild_tier_2" id="0x7F121802" />
+    <public type="string" name="premium_guild_tier_3" id="0x7F121803" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7F121804" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7F121805" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7F121806" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7F121807" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7F121808" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7F121809" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7F12180A" />
+    <public type="string" name="premium_guild_user_feature_member_badge" id="0x7F12180B" />
+    <public type="string" name="premium_guild_user_feature_profile_badge" id="0x7F12180C" />
+    <public type="string" name="premium_guild_user_feature_role" id="0x7F12180D" />
+    <public type="string" name="premium_guild_user_features_header" id="0x7F12180E" />
+    <public type="string" name="premium_included" id="0x7F12180F" />
+    <public type="string" name="premium_legacy" id="0x7F121810" />
+    <public type="string" name="premium_manage_via_desktop" id="0x7F121811" />
+    <public type="string" name="premium_marketing_feature_emoji_description" id="0x7F121812" />
+    <public type="string" name="premium_marketing_feature_emoji_title" id="0x7F121813" />
+    <public type="string" name="premium_marketing_feature_header" id="0x7F121814" />
+    <public type="string" name="premium_marketing_feature_premium_badge_description" id="0x7F121815" />
+    <public type="string" name="premium_marketing_feature_premium_badge_title" id="0x7F121816" />
+    <public type="string" name="premium_marketing_feature_premium_go_live_description" id="0x7F121817" />
+    <public type="string" name="premium_marketing_feature_premium_go_live_title" id="0x7F121818" />
+    <public type="string" name="premium_marketing_feature_premium_guild_description" id="0x7F121819" />
+    <public type="string" name="premium_marketing_feature_premium_guild_title" id="0x7F12181A" />
+    <public type="string" name="premium_marketing_feature_premium_upload_size_description" id="0x7F12181B" />
+    <public type="string" name="premium_marketing_feature_premium_upload_size_title" id="0x7F12181C" />
+    <public type="string" name="premium_marketing_feature_profile_description" id="0x7F12181D" />
+    <public type="string" name="premium_marketing_feature_profile_title" id="0x7F12181E" />
+    <public type="string" name="premium_marketing_feature_stickers_description" id="0x7F12181F" />
+    <public type="string" name="premium_marketing_feature_stickers_info" id="0x7F121820" />
+    <public type="string" name="premium_marketing_feature_stickers_title" id="0x7F121821" />
+    <public type="string" name="premium_marketing_hero_body" id="0x7F121822" />
+    <public type="string" name="premium_marketing_hero_header" id="0x7F121823" />
+    <public type="string" name="premium_message_length_chatbox_flair" id="0x7F121824" />
+    <public type="string" name="premium_message_length_roadblock_modal_body" id="0x7F121825" />
+    <public type="string" name="premium_message_length_roadblock_modal_header" id="0x7F121826" />
+    <public type="string" name="premium_message_length_upsell_modal_body" id="0x7F121827" />
+    <public type="string" name="premium_message_length_upsell_modal_header" id="0x7F121828" />
+    <public type="string" name="premium_message_length_upsell_modal_upload" id="0x7F121829" />
+    <public type="string" name="premium_message_length_upsell_tooltip" id="0x7F12182A" />
+    <public type="string" name="premium_no_plans_body" id="0x7F12182B" />
+    <public type="string" name="premium_no_plans_header" id="0x7F12182C" />
+    <public type="string" name="premium_not_claimed" id="0x7F12182D" />
+    <public type="string" name="premium_not_claimed_body" id="0x7F12182E" />
+    <public type="string" name="premium_not_verified" id="0x7F12182F" />
+    <public type="string" name="premium_not_verified_body" id="0x7F121830" />
+    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7F121831" />
+    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7F121832" />
+    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7F121833" />
+    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7F121834" />
+    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7F121835" />
+    <public type="string" name="premium_payment_gift_subtext_monthly" id="0x7F121836" />
+    <public type="string" name="premium_payment_gift_subtext_yearly" id="0x7F121837" />
+    <public type="string" name="premium_payment_is_gift" id="0x7F121838" />
+    <public type="string" name="premium_payment_select" id="0x7F121839" />
+    <public type="string" name="premium_pending_plan_change_cancel_body" id="0x7F12183A" />
+    <public type="string" name="premium_pending_plan_change_cancel_body_no_existing_plan" id="0x7F12183B" />
+    <public type="string" name="premium_pending_plan_change_cancel_button" id="0x7F12183C" />
+    <public type="string" name="premium_pending_plan_change_cancel_header" id="0x7F12183D" />
+    <public type="string" name="premium_pending_plan_change_notice" id="0x7F12183E" />
+    <public type="string" name="premium_pending_plan_change_notice_grandfathered_upgrade" id="0x7F12183F" />
+    <public type="string" name="premium_plan_month" id="0x7F121840" />
+    <public type="string" name="premium_plan_month_tier_1" id="0x7F121841" />
+    <public type="string" name="premium_plan_month_tier_2" id="0x7F121842" />
+    <public type="string" name="premium_plan_month_tier_2_trial" id="0x7F121843" />
+    <public type="string" name="premium_plan_year" id="0x7F121844" />
+    <public type="string" name="premium_plan_year_tier_1" id="0x7F121845" />
+    <public type="string" name="premium_plan_year_tier_2" id="0x7F121846" />
+    <public type="string" name="premium_plan_year_tier_2_trial" id="0x7F121847" />
+    <public type="string" name="premium_profile_customization_upsell_body" id="0x7F121848" />
+    <public type="string" name="premium_profile_customization_upsell_body_mobile" id="0x7F121849" />
+    <public type="string" name="premium_profile_customization_upsell_header" id="0x7F12184A" />
+    <public type="string" name="premium_profile_customization_upsell_header_mobile" id="0x7F12184B" />
+    <public type="string" name="premium_promo_description" id="0x7F12184C" />
+    <public type="string" name="premium_promo_description_search_upsell" id="0x7F12184D" />
+    <public type="string" name="premium_promo_description_trial" id="0x7F12184E" />
+    <public type="string" name="premium_promo_title" id="0x7F12184F" />
+    <public type="string" name="premium_promo_title_search_upsell" id="0x7F121850" />
+    <public type="string" name="premium_required" id="0x7F121851" />
+    <public type="string" name="premium_required_get_nitro" id="0x7F121852" />
+    <public type="string" name="premium_restore_subscription_ios" id="0x7F121853" />
+    <public type="string" name="premium_retention_emoji_picker_description" id="0x7F121854" />
+    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7F121855" />
+    <public type="string" name="premium_settings" id="0x7F121856" />
+    <public type="string" name="premium_settings_account_hold_info" id="0x7F121857" />
+    <public type="string" name="premium_settings_account_hold_info_external" id="0x7F121858" />
+    <public type="string" name="premium_settings_account_hold_info_price" id="0x7F121859" />
+    <public type="string" name="premium_settings_account_hold_notice_change_payment_method_button" id="0x7F12185A" />
+    <public type="string" name="premium_settings_account_hold_notice_info" id="0x7F12185B" />
+    <public type="string" name="premium_settings_billing_info" id="0x7F12185C" />
+    <public type="string" name="premium_settings_cancelled_info" id="0x7F12185D" />
+    <public type="string" name="premium_settings_get" id="0x7F12185E" />
+    <public type="string" name="premium_settings_manage" id="0x7F12185F" />
+    <public type="string" name="premium_settings_past_due_info" id="0x7F121860" />
+    <public type="string" name="premium_settings_past_due_info_external" id="0x7F121861" />
+    <public type="string" name="premium_settings_premium_guild_subscriptions" id="0x7F121862" />
+    <public type="string" name="premium_settings_renewal_info" id="0x7F121863" />
+    <public type="string" name="premium_settings_renewal_info_external" id="0x7F121864" />
+    <public type="string" name="premium_settings_renewal_info_grandfathered_upgrade" id="0x7F121865" />
+    <public type="string" name="premium_settings_renewal_info_with_plan" id="0x7F121866" />
+    <public type="string" name="premium_settings_starting_at_per_month" id="0x7F121867" />
+    <public type="string" name="premium_settings_subscribe_today" id="0x7F121868" />
+    <public type="string" name="premium_settings_subscriptions_mobile_header" id="0x7F121869" />
+    <public type="string" name="premium_subscription_adjustment_tooltip" id="0x7F12186A" />
+    <public type="string" name="premium_subscription_billing_info_mobile" id="0x7F12186B" />
+    <public type="string" name="premium_subscription_cancelled" id="0x7F12186C" />
+    <public type="string" name="premium_subscription_credit" id="0x7F12186D" />
+    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7F12186E" />
+    <public type="string" name="premium_subscription_credit_applied_mismatched_plan_android" id="0x7F12186F" />
+    <public type="string" name="premium_subscription_credit_applied_on" id="0x7F121870" />
+    <public type="string" name="premium_subscription_credit_count_months" id="0x7F121871" />
+    <public type="string" name="premium_subscription_current_label" id="0x7F121872" />
+    <public type="string" name="premium_subscription_description_tier_1" id="0x7F121873" />
+    <public type="string" name="premium_subscription_description_tier_1_account_hold" id="0x7F121874" />
+    <public type="string" name="premium_subscription_description_tier_1_account_hold_no_price" id="0x7F121875" />
+    <public type="string" name="premium_subscription_description_tier_1_no_price" id="0x7F121876" />
+    <public type="string" name="premium_subscription_description_tier_1_pending_cancelation" id="0x7F121877" />
+    <public type="string" name="premium_subscription_description_tier_1_pending_cancelation_no_price" id="0x7F121878" />
+    <public type="string" name="premium_subscription_description_tier_2" id="0x7F121879" />
+    <public type="string" name="premium_subscription_description_tier_2_account_hold" id="0x7F12187A" />
+    <public type="string" name="premium_subscription_description_tier_2_account_hold_no_price" id="0x7F12187B" />
+    <public type="string" name="premium_subscription_description_tier_2_no_price" id="0x7F12187C" />
+    <public type="string" name="premium_subscription_description_tier_2_pending_cancelation" id="0x7F12187D" />
+    <public type="string" name="premium_subscription_description_tier_2_pending_cancelation_no_price" id="0x7F12187E" />
+    <public type="string" name="premium_subscription_grandfathered_upgrade_note" id="0x7F12187F" />
+    <public type="string" name="premium_subscription_guild_subscription_adjustment" id="0x7F121880" />
+    <public type="string" name="premium_subscription_guild_subscription_adjustment_text" id="0x7F121881" />
+    <public type="string" name="premium_subscription_guild_subscription_adjustment_tooltip" id="0x7F121882" />
+    <public type="string" name="premium_subscription_hide_details" id="0x7F121883" />
+    <public type="string" name="premium_subscription_new_label" id="0x7F121884" />
+    <public type="string" name="premium_subscription_new_total" id="0x7F121885" />
+    <public type="string" name="premium_subscription_period_reset_notice" id="0x7F121886" />
+    <public type="string" name="premium_subscription_plan_adjustment" id="0x7F121887" />
+    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7F121888" />
+    <public type="string" name="premium_subscription_policy_ios" id="0x7F121889" />
+    <public type="string" name="premium_subscription_renewal_footer" id="0x7F12188A" />
+    <public type="string" name="premium_subscription_renewal_footer_trial" id="0x7F12188B" />
+    <public type="string" name="premium_subscription_required_body" id="0x7F12188C" />
+    <public type="string" name="premium_subscription_show_details" id="0x7F12188D" />
+    <public type="string" name="premium_subscription_subscriptions_link" id="0x7F12188E" />
+    <public type="string" name="premium_subscription_updates" id="0x7F12188F" />
+    <public type="string" name="premium_switch_plan_disabled_in_trial" id="0x7F121890" />
+    <public type="string" name="premium_switch_plan_disabled_pending_mutation_plan" id="0x7F121891" />
+    <public type="string" name="premium_switch_plan_disabled_pending_mutation_premium_guild_subscription" id="0x7F121892" />
+    <public type="string" name="premium_switch_plans" id="0x7F121893" />
+    <public type="string" name="premium_switch_review_header_premium_month_tier_1" id="0x7F121894" />
+    <public type="string" name="premium_switch_review_header_premium_month_tier_2" id="0x7F121895" />
+    <public type="string" name="premium_switch_review_header_premium_year_tier_1" id="0x7F121896" />
+    <public type="string" name="premium_switch_review_header_premium_year_tier_2" id="0x7F121897" />
+    <public type="string" name="premium_tier_1" id="0x7F121898" />
+    <public type="string" name="premium_tier_1_sticker_pack" id="0x7F121899" />
+    <public type="string" name="premium_tier_2" id="0x7F12189A" />
+    <public type="string" name="premium_tier_2_subtitle" id="0x7F12189B" />
+    <public type="string" name="premium_tier_2_title" id="0x7F12189C" />
+    <public type="string" name="premium_tier_2_trial_cta_note" id="0x7F12189D" />
+    <public type="string" name="premium_tier_2_trial_cta_subtitle" id="0x7F12189E" />
+    <public type="string" name="premium_tier_2_trial_cta_title" id="0x7F12189F" />
+    <public type="string" name="premium_title" id="0x7F1218A0" />
+    <public type="string" name="premium_trial_cta_button" id="0x7F1218A1" />
+    <public type="string" name="premium_trial_cta_description" id="0x7F1218A2" />
+    <public type="string" name="premium_trial_cta_description_expiring_days" id="0x7F1218A3" />
+    <public type="string" name="premium_trial_cta_description_expiring_hours" id="0x7F1218A4" />
+    <public type="string" name="premium_trial_cta_description_expiring_minutes" id="0x7F1218A5" />
+    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7F1218A6" />
+    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7F1218A7" />
+    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7F1218A8" />
+    <public type="string" name="premium_upgrade_done_button" id="0x7F1218A9" />
+    <public type="string" name="premium_upgrade_required_body" id="0x7F1218AA" />
+    <public type="string" name="premium_upload_promo" id="0x7F1218AB" />
+    <public type="string" name="premium_upload_promo_trial" id="0x7F1218AC" />
+    <public type="string" name="premium_upsell_animated_avatar" id="0x7F1218AD" />
+    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7F1218AE" />
+    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7F1218AF" />
+    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7F1218B0" />
+    <public type="string" name="premium_upsell_animated_avatar_subtitle" id="0x7F1218B1" />
+    <public type="string" name="premium_upsell_animated_avatar_text" id="0x7F1218B2" />
+    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7F1218B3" />
+    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7F1218B4" />
+    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7F1218B5" />
+    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7F1218B6" />
+    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7F1218B7" />
+    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7F1218B8" />
+    <public type="string" name="premium_upsell_continue_to_boosts" id="0x7F1218B9" />
+    <public type="string" name="premium_upsell_continue_to_monthly" id="0x7F1218BA" />
+    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7F1218BB" />
+    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7F1218BC" />
+    <public type="string" name="premium_upsell_emoji_description_mobile_new" id="0x7F1218BD" />
+    <public type="string" name="premium_upsell_emoji_mobile" id="0x7F1218BE" />
+    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7F1218BF" />
+    <public type="string" name="premium_upsell_feature_chat_perks" id="0x7F1218C0" />
+    <public type="string" name="premium_upsell_feature_chat_perks_mobile" id="0x7F1218C1" />
+    <public type="string" name="premium_upsell_feature_free_guild_subscription" id="0x7F1218C2" />
+    <public type="string" name="premium_upsell_feature_guild_subscription_discount" id="0x7F1218C3" />
+    <public type="string" name="premium_upsell_feature_pretext" id="0x7F1218C4" />
+    <public type="string" name="premium_upsell_feature_pretext_trial" id="0x7F1218C5" />
+    <public type="string" name="premium_upsell_feature_stream" id="0x7F1218C6" />
+    <public type="string" name="premium_upsell_feature_upload" id="0x7F1218C7" />
+    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7F1218C8" />
+    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7F1218C9" />
+    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7F1218CA" />
+    <public type="string" name="premium_upsell_upgrade" id="0x7F1218CB" />
+    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7F1218CC" />
+    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7F1218CD" />
+    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7F1218CE" />
+    <public type="string" name="premium_upsell_yearly_cta" id="0x7F1218CF" />
+    <public type="string" name="premium_upsell_yearly_description" id="0x7F1218D0" />
+    <public type="string" name="premium_upsell_yearly_title" id="0x7F1218D1" />
+    <public type="string" name="premium_utility_marketing_tooltip_body" id="0x7F1218D2" />
+    <public type="string" name="premium_utility_marketing_tooltip_cta" id="0x7F1218D3" />
+    <public type="string" name="premium_utility_marketing_tooltip_header" id="0x7F1218D4" />
+    <public type="string" name="premium_with_premium_guild_external_plan_description" id="0x7F1218D5" />
+    <public type="string" name="premium_with_price" id="0x7F1218D6" />
+    <public type="string" name="preorder_sku_name" id="0x7F1218D7" />
+    <public type="string" name="preview_bytes_left" id="0x7F1218D8" />
+    <public type="string" name="preview_change_language" id="0x7F1218D9" />
+    <public type="string" name="preview_lines_left" id="0x7F1218DA" />
+    <public type="string" name="preview_modal_label" id="0x7F1218DB" />
+    <public type="string" name="preview_num_lines" id="0x7F1218DC" />
+    <public type="string" name="preview_num_lines_at_least" id="0x7F1218DD" />
+    <public type="string" name="preview_search_language_placeholder" id="0x7F1218DE" />
+    <public type="string" name="preview_whole_file" id="0x7F1218DF" />
+    <public type="string" name="priority_speaker" id="0x7F1218E0" />
+    <public type="string" name="priority_speaker_description" id="0x7F1218E1" />
+    <public type="string" name="priority_speaker_description_app" id="0x7F1218E2" />
+    <public type="string" name="privacy_and_safety" id="0x7F1218E3" />
+    <public type="string" name="privacy_policy" id="0x7F1218E4" />
+    <public type="string" name="privacy_policy_url" id="0x7F1218E5" />
+    <public type="string" name="privacy_settings" id="0x7F1218E6" />
+    <public type="string" name="private_category" id="0x7F1218E7" />
+    <public type="string" name="private_category_creation_permission_missing_hint" id="0x7F1218E8" />
+    <public type="string" name="private_category_note" id="0x7F1218E9" />
+    <public type="string" name="private_channel" id="0x7F1218EA" />
+    <public type="string" name="private_channel_access_info_members" id="0x7F1218EB" />
+    <public type="string" name="private_channel_access_info_members_overflow" id="0x7F1218EC" />
+    <public type="string" name="private_channel_access_info_roles" id="0x7F1218ED" />
+    <public type="string" name="private_channel_access_info_roles_overflow" id="0x7F1218EE" />
+    <public type="string" name="private_channel_access_info_title" id="0x7F1218EF" />
+    <public type="string" name="private_channel_access_info_title_with_colon" id="0x7F1218F0" />
+    <public type="string" name="private_channel_add_members_modal_no_result" id="0x7F1218F1" />
+    <public type="string" name="private_channel_add_members_modal_no_roles" id="0x7F1218F2" />
+    <public type="string" name="private_channel_add_members_modal_placeholder" id="0x7F1218F3" />
+    <public type="string" name="private_channel_add_members_modal_row_administrator" id="0x7F1218F4" />
+    <public type="string" name="private_channel_add_members_modal_row_member" id="0x7F1218F5" />
+    <public type="string" name="private_channel_add_members_modal_row_owner" id="0x7F1218F6" />
+    <public type="string" name="private_channel_add_members_modal_row_role" id="0x7F1218F7" />
+    <public type="string" name="private_channel_add_members_modal_search_placeholder_mobile" id="0x7F1218F8" />
+    <public type="string" name="private_channel_add_members_modal_skip" id="0x7F1218F9" />
+    <public type="string" name="private_channel_add_members_modal_subtitle" id="0x7F1218FA" />
+    <public type="string" name="private_channel_manage_channel_access_cta" id="0x7F1218FB" />
+    <public type="string" name="private_channel_manage_role_permission_missing_hint" id="0x7F1218FC" />
+    <public type="string" name="private_channel_members_added_toast_msg" id="0x7F1218FD" />
+    <public type="string" name="private_channel_members_remove_yes_confirmation" id="0x7F1218FE" />
+    <public type="string" name="private_channel_members_removed" id="0x7F1218FF" />
+    <public type="string" name="private_channel_members_roles_added_toast_msg" id="0x7F121900" />
+    <public type="string" name="private_channel_members_section_header" id="0x7F121901" />
+    <public type="string" name="private_channel_modal_admin_role_force_enabled" id="0x7F121902" />
+    <public type="string" name="private_channel_note" id="0x7F121903" />
+    <public type="string" name="private_channel_roles_added_toast_msg" id="0x7F121904" />
+    <public type="string" name="private_channels_a11y_label" id="0x7F121905" />
+    <public type="string" name="private_text_channel_creation_permission_missing_hint" id="0x7F121906" />
+    <public type="string" name="private_thread" id="0x7F121907" />
+    <public type="string" name="private_voice_channel_creation_permission_missing_hint" id="0x7F121908" />
+    <public type="string" name="profile" id="0x7F121909" />
+    <public type="string" name="profile_banner_icon_tooltip_upsell" id="0x7F12190A" />
+    <public type="string" name="profile_customization_activity_time" id="0x7F12190B" />
+    <public type="string" name="profile_customization_beta_tooltip" id="0x7F12190C" />
+    <public type="string" name="profile_customization_bio_placeholder" id="0x7F12190D" />
+    <public type="string" name="profile_customization_marketing_tooltip_body" id="0x7F12190E" />
+    <public type="string" name="profile_customization_marketing_tooltip_cta" id="0x7F12190F" />
+    <public type="string" name="profile_customization_marketing_tooltip_header" id="0x7F121910" />
+    <public type="string" name="profile_customization_nitro_icon_tooltip" id="0x7F121911" />
+    <public type="string" name="profile_customization_preview" id="0x7F121912" />
+    <public type="string" name="profile_user_badges" id="0x7F121913" />
+    <public type="string" name="progress_completed" id="0x7F121914" />
+    <public type="string" name="progress_completed_description" id="0x7F121915" />
+    <public type="string" name="progress_steps" id="0x7F121916" />
+    <public type="string" name="progress_steps_finished" id="0x7F121917" />
+    <public type="string" name="project_id" id="0x7F121918" />
+    <public type="string" name="promotion_account_identifier" id="0x7F121919" />
+    <public type="string" name="promotion_card_action_claim" id="0x7F12191A" />
+    <public type="string" name="promotion_error_body" id="0x7F12191B" />
+    <public type="string" name="promotion_error_claimed_body" id="0x7F12191C" />
+    <public type="string" name="promotion_error_no_code_body" id="0x7F12191D" />
+    <public type="string" name="promotion_error_not_verified_body" id="0x7F12191E" />
+    <public type="string" name="promotion_error_title" id="0x7F12191F" />
+    <public type="string" name="promotion_existing_subscriber_body" id="0x7F121920" />
+    <public type="string" name="promotion_existing_subscriber_title" id="0x7F121921" />
+    <public type="string" name="promotion_previous_subscriber_body" id="0x7F121922" />
+    <public type="string" name="promotion_redeem_body" id="0x7F121923" />
+    <public type="string" name="prune" id="0x7F121924" />
+    <public type="string" name="prune_members" id="0x7F121925" />
+    <public type="string" name="prune_with_roles" id="0x7F121926" />
+    <public type="string" name="pt_br" id="0x7F121927" />
+    <public type="string" name="ptt_limited_body" id="0x7F121928" />
+    <public type="string" name="ptt_limited_title" id="0x7F121929" />
+    <public type="string" name="ptt_limited_warning" id="0x7F12192A" />
+    <public type="string" name="ptt_permission_body" id="0x7F12192B" />
+    <public type="string" name="ptt_permission_title" id="0x7F12192C" />
+    <public type="string" name="public_guild_policy_accept" id="0x7F12192D" />
+    <public type="string" name="public_guild_policy_title" id="0x7F12192E" />
+    <public type="string" name="public_locale_help" id="0x7F12192F" />
+    <public type="string" name="public_locale_selector_title" id="0x7F121930" />
+    <public type="string" name="public_locale_title" id="0x7F121931" />
+    <public type="string" name="public_rules_channel_title" id="0x7F121932" />
+    <public type="string" name="public_rules_selector_title" id="0x7F121933" />
+    <public type="string" name="public_updates_channel_title" id="0x7F121934" />
+    <public type="string" name="publish_followed_news_body" id="0x7F121935" />
+    <public type="string" name="publish_followed_news_body_reach" id="0x7F121936" />
+    <public type="string" name="publish_followed_news_body_settings_insights" id="0x7F121937" />
+    <public type="string" name="publish_followed_news_fail_body" id="0x7F121938" />
+    <public type="string" name="publish_followed_news_fail_title" id="0x7F121939" />
+    <public type="string" name="publish_followed_news_generic_body" id="0x7F12193A" />
+    <public type="string" name="purchase_ticket_legal_label" id="0x7F12193B" />
+    <public type="string" name="purchase_ticket_modal_title" id="0x7F12193C" />
+    <public type="string" name="purple" id="0x7F12193D" />
+    <public type="string" name="qr_code_download_cta" id="0x7F12193E" />
+    <public type="string" name="qr_code_fail" id="0x7F12193F" />
+    <public type="string" name="qr_code_fail_description" id="0x7F121940" />
+    <public type="string" name="qr_code_in_app_scanner_only" id="0x7F121941" />
+    <public type="string" name="qr_code_invalid" id="0x7F121942" />
+    <public type="string" name="qr_code_login_confirm" id="0x7F121943" />
+    <public type="string" name="qr_code_login_finish_button" id="0x7F121944" />
+    <public type="string" name="qr_code_login_start_over" id="0x7F121945" />
+    <public type="string" name="qr_code_login_success" id="0x7F121946" />
+    <public type="string" name="qr_code_login_success_flavor" id="0x7F121947" />
+    <public type="string" name="qr_code_not_found" id="0x7F121948" />
+    <public type="string" name="qr_code_not_found_description" id="0x7F121949" />
+    <public type="string" name="quality_indicator" id="0x7F12194A" />
+    <public type="string" name="quick_dm_blocked" id="0x7F12194B" />
+    <public type="string" name="quick_dm_user" id="0x7F12194C" />
+    <public type="string" name="quick_switcher" id="0x7F12194D" />
+    <public type="string" name="quickswitcher_drafts" id="0x7F12194E" />
+    <public type="string" name="quickswitcher_empty_cta" id="0x7F12194F" />
+    <public type="string" name="quickswitcher_empty_text" id="0x7F121950" />
+    <public type="string" name="quickswitcher_last_channel" id="0x7F121951" />
+    <public type="string" name="quickswitcher_link_message" id="0x7F121952" />
+    <public type="string" name="quickswitcher_link_no_access" id="0x7F121953" />
+    <public type="string" name="quickswitcher_link_unknown" id="0x7F121954" />
+    <public type="string" name="quickswitcher_mentions" id="0x7F121955" />
+    <public type="string" name="quickswitcher_notice" id="0x7F121956" />
+    <public type="string" name="quickswitcher_placeholder" id="0x7F121957" />
+    <public type="string" name="quickswitcher_protip" id="0x7F121958" />
+    <public type="string" name="quickswitcher_protip_guilds" id="0x7F121959" />
+    <public type="string" name="quickswitcher_protip_text_channels" id="0x7F12195A" />
+    <public type="string" name="quickswitcher_protip_usernames" id="0x7F12195B" />
+    <public type="string" name="quickswitcher_protip_voice_channels" id="0x7F12195C" />
+    <public type="string" name="quickswitcher_querymode_applications" id="0x7F12195D" />
+    <public type="string" name="quickswitcher_querymode_guilds" id="0x7F12195E" />
+    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7F12195F" />
+    <public type="string" name="quickswitcher_querymode_users" id="0x7F121960" />
+    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7F121961" />
+    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7F121962" />
+    <public type="string" name="quickswitcher_tip_nav" id="0x7F121963" />
+    <public type="string" name="quickswitcher_tip_select" id="0x7F121964" />
+    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7F121965" />
+    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7F121966" />
+    <public type="string" name="quickswitcher_unread_channels" id="0x7F121967" />
+    <public type="string" name="quote" id="0x7F121968" />
+    <public type="string" name="quote_attribution" id="0x7F121969" />
+    <public type="string" name="quote_attribution_facebook" id="0x7F12196A" />
+    <public type="string" name="quote_attribution_instagram" id="0x7F12196B" />
+    <public type="string" name="rate_limited" id="0x7F12196C" />
+    <public type="string" name="rating_request_body_android" id="0x7F12196D" />
+    <public type="string" name="rating_request_title" id="0x7F12196E" />
+    <public type="string" name="react_with_label" id="0x7F12196F" />
+    <public type="string" name="reaction_tooltip_1" id="0x7F121970" />
+    <public type="string" name="reaction_tooltip_1_n" id="0x7F121971" />
+    <public type="string" name="reaction_tooltip_2" id="0x7F121972" />
+    <public type="string" name="reaction_tooltip_2_n" id="0x7F121973" />
+    <public type="string" name="reaction_tooltip_3" id="0x7F121974" />
+    <public type="string" name="reaction_tooltip_3_n" id="0x7F121975" />
+    <public type="string" name="reaction_tooltip_n" id="0x7F121976" />
+    <public type="string" name="reactions" id="0x7F121977" />
+    <public type="string" name="reactions_matching" id="0x7F121978" />
+    <public type="string" name="read_message_history" id="0x7F121979" />
+    <public type="string" name="read_messages" id="0x7F12197A" />
+    <public type="string" name="read_messages_view_channels" id="0x7F12197B" />
+    <public type="string" name="read_only_channel" id="0x7F12197C" />
+    <public type="string" name="ready" id="0x7F12197D" />
+    <public type="string" name="recent_mentions" id="0x7F12197E" />
+    <public type="string" name="recent_mentions_direct_only" id="0x7F12197F" />
+    <public type="string" name="recent_mentions_empty_state_header" id="0x7F121980" />
+    <public type="string" name="recent_mentions_empty_state_tip" id="0x7F121981" />
+    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7F121982" />
+    <public type="string" name="recent_mentions_filter_all_servers" id="0x7F121983" />
+    <public type="string" name="recent_mentions_filter_everyone" id="0x7F121984" />
+    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7F121985" />
+    <public type="string" name="recent_mentions_filter_label" id="0x7F121986" />
+    <public type="string" name="recent_mentions_filter_roles" id="0x7F121987" />
+    <public type="string" name="recent_mentions_pro_tip" id="0x7F121988" />
+    <public type="string" name="recent_mentions_roles_and_direct" id="0x7F121989" />
+    <public type="string" name="recents_notifications_menu_label" id="0x7F12198A" />
+    <public type="string" name="recommended" id="0x7F12198B" />
+    <public type="string" name="reconnect" id="0x7F12198C" />
+    <public type="string" name="reconnecting" id="0x7F12198D" />
+    <public type="string" name="redeem" id="0x7F12198E" />
+    <public type="string" name="redemption_code" id="0x7F12198F" />
+    <public type="string" name="refund" id="0x7F121990" />
+    <public type="string" name="region" id="0x7F121991" />
+    <public type="string" name="region_select_footer" id="0x7F121992" />
+    <public type="string" name="region_select_header" id="0x7F121993" />
+    <public type="string" name="register" id="0x7F121994" />
+    <public type="string" name="register_body" id="0x7F121995" />
+    <public type="string" name="register_enter_email" id="0x7F121996" />
+    <public type="string" name="register_enter_phone" id="0x7F121997" />
+    <public type="string" name="register_login_privacy_notice" id="0x7F121998" />
+    <public type="string" name="register_or_email" id="0x7F121999" />
+    <public type="string" name="register_or_phone" id="0x7F12199A" />
+    <public type="string" name="register_title" id="0x7F12199B" />
+    <public type="string" name="register_username_hint" id="0x7F12199C" />
+    <public type="string" name="remaining_participants" id="0x7F12199D" />
+    <public type="string" name="remind_me_later" id="0x7F12199E" />
+    <public type="string" name="remove" id="0x7F12199F" />
+    <public type="string" name="remove_all_reactions" id="0x7F1219A0" />
+    <public type="string" name="remove_all_reactions_confirm_body" id="0x7F1219A1" />
+    <public type="string" name="remove_all_reactions_confirm_title" id="0x7F1219A2" />
+    <public type="string" name="remove_attachment_body" id="0x7F1219A3" />
+    <public type="string" name="remove_attachment_confirm" id="0x7F1219A4" />
+    <public type="string" name="remove_attachment_title" id="0x7F1219A5" />
+    <public type="string" name="remove_friend" id="0x7F1219A6" />
+    <public type="string" name="remove_friend_body" id="0x7F1219A7" />
+    <public type="string" name="remove_friend_title" id="0x7F1219A8" />
+    <public type="string" name="remove_from_group" id="0x7F1219A9" />
+    <public type="string" name="remove_icon" id="0x7F1219AA" />
+    <public type="string" name="remove_keybind" id="0x7F1219AB" />
+    <public type="string" name="remove_message_attachment" id="0x7F1219AC" />
+    <public type="string" name="remove_reaction" id="0x7F1219AD" />
+    <public type="string" name="remove_role_or_user" id="0x7F1219AE" />
+    <public type="string" name="remove_synced_role" id="0x7F1219AF" />
+    <public type="string" name="remove_user_from_thread" id="0x7F1219B0" />
+    <public type="string" name="remove_vanity_url" id="0x7F1219B1" />
+    <public type="string" name="render_embeds" id="0x7F1219B2" />
+    <public type="string" name="render_embeds_label" id="0x7F1219B3" />
+    <public type="string" name="render_reactions" id="0x7F1219B4" />
+    <public type="string" name="reorder" id="0x7F1219B5" />
+    <public type="string" name="reordering_channels" id="0x7F1219B6" />
+    <public type="string" name="reply_mention_off" id="0x7F1219B7" />
+    <public type="string" name="reply_mention_off_tooltip" id="0x7F1219B8" />
+    <public type="string" name="reply_mention_on" id="0x7F1219B9" />
+    <public type="string" name="reply_mention_on_tooltip" id="0x7F1219BA" />
+    <public type="string" name="reply_quote_command" id="0x7F1219BB" />
+    <public type="string" name="reply_quote_message_blocked" id="0x7F1219BC" />
+    <public type="string" name="reply_quote_message_deleted" id="0x7F1219BD" />
+    <public type="string" name="reply_quote_message_not_loaded" id="0x7F1219BE" />
+    <public type="string" name="reply_quote_no_text_content" id="0x7F1219BF" />
+    <public type="string" name="reply_quote_no_text_content_mobile" id="0x7F1219C0" />
+    <public type="string" name="reply_quote_sticker" id="0x7F1219C1" />
+    <public type="string" name="reply_quote_sticker_mobile" id="0x7F1219C2" />
+    <public type="string" name="replying_to" id="0x7F1219C3" />
+    <public type="string" name="report" id="0x7F1219C4" />
+    <public type="string" name="report_message" id="0x7F1219C5" />
+    <public type="string" name="report_message_menu_option" id="0x7F1219C6" />
+    <public type="string" name="report_modal_block_user" id="0x7F1219C7" />
+    <public type="string" name="report_modal_description" id="0x7F1219C8" />
+    <public type="string" name="report_modal_description_max_exceeded" id="0x7F1219C9" />
+    <public type="string" name="report_modal_description_min_max" id="0x7F1219CA" />
+    <public type="string" name="report_modal_error" id="0x7F1219CB" />
+    <public type="string" name="report_modal_message_selected" id="0x7F1219CC" />
+    <public type="string" name="report_modal_report_message" id="0x7F1219CD" />
+    <public type="string" name="report_modal_report_stage_menu_item" id="0x7F1219CE" />
+    <public type="string" name="report_modal_select_one" id="0x7F1219CF" />
+    <public type="string" name="report_modal_should_block" id="0x7F1219D0" />
+    <public type="string" name="report_modal_should_delete" id="0x7F1219D1" />
+    <public type="string" name="report_modal_subject" id="0x7F1219D2" />
+    <public type="string" name="report_modal_submit" id="0x7F1219D3" />
+    <public type="string" name="report_modal_submitted" id="0x7F1219D4" />
+    <public type="string" name="report_modal_submitted_email_confirmation" id="0x7F1219D5" />
+    <public type="string" name="report_modal_type_title" id="0x7F1219D6" />
+    <public type="string" name="report_server" id="0x7F1219D7" />
+    <public type="string" name="report_server_no_name" id="0x7F1219D8" />
+    <public type="string" name="report_user" id="0x7F1219D9" />
+    <public type="string" name="request_to_speak" id="0x7F1219DA" />
+    <public type="string" name="request_to_speak_accept" id="0x7F1219DB" />
+    <public type="string" name="request_to_speak_accessibility_text" id="0x7F1219DC" />
+    <public type="string" name="request_to_speak_area_all_roles" id="0x7F1219DD" />
+    <public type="string" name="request_to_speak_area_all_roles_disabled" id="0x7F1219DE" />
+    <public type="string" name="request_to_speak_area_close" id="0x7F1219DF" />
+    <public type="string" name="request_to_speak_area_open" id="0x7F1219E0" />
+    <public type="string" name="request_to_speak_area_title" id="0x7F1219E1" />
+    <public type="string" name="request_to_speak_decline" id="0x7F1219E2" />
+    <public type="string" name="request_to_speak_empty_list_body" id="0x7F1219E3" />
+    <public type="string" name="request_to_speak_empty_list_title" id="0x7F1219E4" />
+    <public type="string" name="request_to_speak_invitation_send" id="0x7F1219E5" />
+    <public type="string" name="request_to_speak_list_title" id="0x7F1219E6" />
+    <public type="string" name="request_to_speak_member_info_member" id="0x7F1219E7" />
+    <public type="string" name="request_to_speak_member_info_member_roles" id="0x7F1219E8" />
+    <public type="string" name="request_to_speak_member_info_new_member" id="0x7F1219E9" />
+    <public type="string" name="request_to_speak_member_info_new_to_discord" id="0x7F1219EA" />
+    <public type="string" name="request_to_speak_member_info_non_member" id="0x7F1219EB" />
+    <public type="string" name="resend" id="0x7F1219EC" />
+    <public type="string" name="resend_code" id="0x7F1219ED" />
+    <public type="string" name="resend_email" id="0x7F1219EE" />
+    <public type="string" name="resend_email_short" id="0x7F1219EF" />
+    <public type="string" name="resend_message" id="0x7F1219F0" />
+    <public type="string" name="resend_verification_email" id="0x7F1219F1" />
+    <public type="string" name="reset" id="0x7F1219F2" />
+    <public type="string" name="reset_friend_nickname" id="0x7F1219F3" />
+    <public type="string" name="reset_nickname" id="0x7F1219F4" />
+    <public type="string" name="reset_notification_override" id="0x7F1219F5" />
+    <public type="string" name="reset_notification_settings" id="0x7F1219F6" />
+    <public type="string" name="reset_password_success_title" id="0x7F1219F7" />
+    <public type="string" name="reset_password_title" id="0x7F1219F8" />
+    <public type="string" name="reset_to_default" id="0x7F1219F9" />
+    <public type="string" name="reset_voice_settings" id="0x7F1219FA" />
+    <public type="string" name="reset_voice_settings_body" id="0x7F1219FB" />
+    <public type="string" name="resubscribe" id="0x7F1219FC" />
+    <public type="string" name="resume_setup" id="0x7F1219FD" />
+    <public type="string" name="retry" id="0x7F1219FE" />
+    <public type="string" name="return_to_login" id="0x7F1219FF" />
+    <public type="string" name="reveal" id="0x7F121A00" />
+    <public type="string" name="reversed" id="0x7F121A01" />
+    <public type="string" name="revoke" id="0x7F121A02" />
+    <public type="string" name="revoke_ban" id="0x7F121A03" />
+    <public type="string" name="ring" id="0x7F121A04" />
+    <public type="string" name="ring_username_a11y_label" id="0x7F121A05" />
+    <public type="string" name="ro" id="0x7F121A06" />
+    <public type="string" name="role_add_members_button" id="0x7F121A07" />
+    <public type="string" name="role_add_members_search" id="0x7F121A08" />
+    <public type="string" name="role_add_members_title" id="0x7F121A09" />
+    <public type="string" name="role_changed_dont_save" id="0x7F121A0A" />
+    <public type="string" name="role_changed_save_changes" id="0x7F121A0B" />
+    <public type="string" name="role_changed_save_changes_body" id="0x7F121A0C" />
+    <public type="string" name="role_color" id="0x7F121A0D" />
+    <public type="string" name="role_color_help" id="0x7F121A0E" />
+    <public type="string" name="role_create_add_members_subtitle" id="0x7F121A0F" />
+    <public type="string" name="role_create_cta" id="0x7F121A10" />
+    <public type="string" name="role_create_display_subtitle" id="0x7F121A11" />
+    <public type="string" name="role_create_display_title" id="0x7F121A12" />
+    <public type="string" name="role_create_name_examples" id="0x7F121A13" />
+    <public type="string" name="role_create_permissions_subtitle" id="0x7F121A14" />
+    <public type="string" name="role_create_permissions_title" id="0x7F121A15" />
+    <public type="string" name="role_create_tip_tooltip_text" id="0x7F121A16" />
+    <public type="string" name="role_create_tooltip_tip" id="0x7F121A17" />
+    <public type="string" name="role_created_toast" id="0x7F121A18" />
+    <public type="string" name="role_creation_create_step_color_hint" id="0x7F121A19" />
+    <public type="string" name="role_creation_create_step_name_hint" id="0x7F121A1A" />
+    <public type="string" name="role_creation_create_step_subtitle" id="0x7F121A1B" />
+    <public type="string" name="role_creation_create_step_title" id="0x7F121A1C" />
+    <public type="string" name="role_creation_failed" id="0x7F121A1D" />
+    <public type="string" name="role_creation_finish" id="0x7F121A1E" />
+    <public type="string" name="role_creation_member_step_subtitle" id="0x7F121A1F" />
+    <public type="string" name="role_creation_member_step_title" id="0x7F121A20" />
+    <public type="string" name="role_creation_permission_step_subtitle" id="0x7F121A21" />
+    <public type="string" name="role_creation_permission_step_title" id="0x7F121A22" />
+    <public type="string" name="role_creation_skip" id="0x7F121A23" />
+    <public type="string" name="role_creation_step_title" id="0x7F121A24" />
+    <public type="string" name="role_delete_cannot_be_undone" id="0x7F121A25" />
+    <public type="string" name="role_edit_hoist_label" id="0x7F121A26" />
+    <public type="string" name="role_edit_members_missing" id="0x7F121A27" />
+    <public type="string" name="role_edit_members_no_results" id="0x7F121A28" />
+    <public type="string" name="role_edit_members_no_search_results" id="0x7F121A29" />
+    <public type="string" name="role_edit_permissions_no_results" id="0x7F121A2A" />
+    <public type="string" name="role_edit_saved" id="0x7F121A2B" />
+    <public type="string" name="role_edit_tab_display" id="0x7F121A2C" />
+    <public type="string" name="role_edit_tab_manage_members" id="0x7F121A2D" />
+    <public type="string" name="role_edit_tab_members" id="0x7F121A2E" />
+    <public type="string" name="role_edit_tab_members_with_list" id="0x7F121A2F" />
+    <public type="string" name="role_edit_tab_permissions" id="0x7F121A30" />
+    <public type="string" name="role_edit_tab_role_settings" id="0x7F121A31" />
+    <public type="string" name="role_edit_title_with_name" id="0x7F121A32" />
+    <public type="string" name="role_empty_state_clubs_role_1" id="0x7F121A33" />
+    <public type="string" name="role_empty_state_clubs_role_2" id="0x7F121A34" />
+    <public type="string" name="role_empty_state_clubs_role_3" id="0x7F121A35" />
+    <public type="string" name="role_empty_state_clubs_role_4" id="0x7F121A36" />
+    <public type="string" name="role_empty_state_clubs_role_5" id="0x7F121A37" />
+    <public type="string" name="role_empty_state_clubs_role_6" id="0x7F121A38" />
+    <public type="string" name="role_empty_state_gaming_role_1" id="0x7F121A39" />
+    <public type="string" name="role_empty_state_gaming_role_2" id="0x7F121A3A" />
+    <public type="string" name="role_empty_state_gaming_role_3" id="0x7F121A3B" />
+    <public type="string" name="role_empty_state_gaming_role_4" id="0x7F121A3C" />
+    <public type="string" name="role_empty_state_gaming_role_5" id="0x7F121A3D" />
+    <public type="string" name="role_empty_state_gaming_role_6" id="0x7F121A3E" />
+    <public type="string" name="role_empty_state_hobbies_role_1" id="0x7F121A3F" />
+    <public type="string" name="role_empty_state_hobbies_role_2" id="0x7F121A40" />
+    <public type="string" name="role_empty_state_hobbies_role_3" id="0x7F121A41" />
+    <public type="string" name="role_empty_state_hobbies_role_4" id="0x7F121A42" />
+    <public type="string" name="role_empty_state_hobbies_role_5" id="0x7F121A43" />
+    <public type="string" name="role_empty_state_hobbies_role_6" id="0x7F121A44" />
+    <public type="string" name="role_everyone_description" id="0x7F121A45" />
+    <public type="string" name="role_everyone_label" id="0x7F121A46" />
+    <public type="string" name="role_everyone_sublabel" id="0x7F121A47" />
+    <public type="string" name="role_id_copied" id="0x7F121A48" />
+    <public type="string" name="role_list_body" id="0x7F121A49" />
+    <public type="string" name="role_list_body_with_help" id="0x7F121A4A" />
+    <public type="string" name="role_list_empty" id="0x7F121A4B" />
+    <public type="string" name="role_list_empty_sort" id="0x7F121A4C" />
+    <public type="string" name="role_list_header" id="0x7F121A4D" />
+    <public type="string" name="role_list_reorder_help" id="0x7F121A4E" />
+    <public type="string" name="role_member_count" id="0x7F121A4F" />
+    <public type="string" name="role_order_updated" id="0x7F121A50" />
+    <public type="string" name="role_overview_description" id="0x7F121A51" />
+    <public type="string" name="role_overview_empty_subheader" id="0x7F121A52" />
+    <public type="string" name="role_overview_header" id="0x7F121A53" />
+    <public type="string" name="role_overview_view_members" id="0x7F121A54" />
+    <public type="string" name="role_permission_help_body" id="0x7F121A55" />
+    <public type="string" name="role_permission_template_cosmetic_content_1" id="0x7F121A56" />
+    <public type="string" name="role_permission_template_cosmetic_content_2" id="0x7F121A57" />
+    <public type="string" name="role_permission_template_description_cosmetic" id="0x7F121A58" />
+    <public type="string" name="role_permission_template_description_manager" id="0x7F121A59" />
+    <public type="string" name="role_permission_template_description_member" id="0x7F121A5A" />
+    <public type="string" name="role_permission_template_description_moderator" id="0x7F121A5B" />
+    <public type="string" name="role_permission_template_manager_content_1" id="0x7F121A5C" />
+    <public type="string" name="role_permission_template_manager_content_2" id="0x7F121A5D" />
+    <public type="string" name="role_permission_template_manager_content_3" id="0x7F121A5E" />
+    <public type="string" name="role_permission_template_manager_content_4" id="0x7F121A5F" />
+    <public type="string" name="role_permission_template_manager_content_preface" id="0x7F121A60" />
+    <public type="string" name="role_permission_template_member_content_1" id="0x7F121A61" />
+    <public type="string" name="role_permission_template_member_content_2" id="0x7F121A62" />
+    <public type="string" name="role_permission_template_member_content_3" id="0x7F121A63" />
+    <public type="string" name="role_permission_template_moderator_content_1" id="0x7F121A64" />
+    <public type="string" name="role_permission_template_moderator_content_2" id="0x7F121A65" />
+    <public type="string" name="role_permission_template_moderator_content_3" id="0x7F121A66" />
+    <public type="string" name="role_permission_template_moderator_content_preface" id="0x7F121A67" />
+    <public type="string" name="role_permission_template_name_cosmetic" id="0x7F121A68" />
+    <public type="string" name="role_permission_template_name_manager" id="0x7F121A69" />
+    <public type="string" name="role_permission_template_name_member" id="0x7F121A6A" />
+    <public type="string" name="role_permission_template_name_moderator" id="0x7F121A6B" />
+    <public type="string" name="role_permission_template_select_confirmation_toast" id="0x7F121A6C" />
+    <public type="string" name="role_permission_template_select_cta" id="0x7F121A6D" />
+    <public type="string" name="role_permission_template_select_warning_body" id="0x7F121A6E" />
+    <public type="string" name="role_permission_template_select_warning_title" id="0x7F121A6F" />
+    <public type="string" name="role_permission_template_title" id="0x7F121A70" />
+    <public type="string" name="role_permissions_add_reactions_description" id="0x7F121A71" />
+    <public type="string" name="role_permissions_add_reactions_description_category" id="0x7F121A72" />
+    <public type="string" name="role_permissions_add_reactions_description_text" id="0x7F121A73" />
+    <public type="string" name="role_permissions_administrator_description" id="0x7F121A74" />
+    <public type="string" name="role_permissions_attach_files_description" id="0x7F121A75" />
+    <public type="string" name="role_permissions_attach_files_description_category" id="0x7F121A76" />
+    <public type="string" name="role_permissions_attach_files_description_text" id="0x7F121A77" />
+    <public type="string" name="role_permissions_ban_members_description" id="0x7F121A78" />
+    <public type="string" name="role_permissions_change_nickname_description" id="0x7F121A79" />
+    <public type="string" name="role_permissions_clear_permissions" id="0x7F121A7A" />
+    <public type="string" name="role_permissions_connect_description" id="0x7F121A7B" />
+    <public type="string" name="role_permissions_connect_description_category" id="0x7F121A7C" />
+    <public type="string" name="role_permissions_connect_description_category_everyone" id="0x7F121A7D" />
+    <public type="string" name="role_permissions_connect_description_stage" id="0x7F121A7E" />
+    <public type="string" name="role_permissions_connect_description_stage_everyone" id="0x7F121A7F" />
+    <public type="string" name="role_permissions_connect_description_voice" id="0x7F121A80" />
+    <public type="string" name="role_permissions_connect_description_voice_everyone" id="0x7F121A81" />
+    <public type="string" name="role_permissions_create_instant_invite_description" id="0x7F121A82" />
+    <public type="string" name="role_permissions_create_instant_invite_description_category" id="0x7F121A83" />
+    <public type="string" name="role_permissions_create_instant_invite_description_text" id="0x7F121A84" />
+    <public type="string" name="role_permissions_create_instant_invite_description_voice" id="0x7F121A85" />
+    <public type="string" name="role_permissions_deafen_members_description" id="0x7F121A86" />
+    <public type="string" name="role_permissions_deafen_members_description_category" id="0x7F121A87" />
+    <public type="string" name="role_permissions_deafen_members_description_voice" id="0x7F121A88" />
+    <public type="string" name="role_permissions_embed_links_description" id="0x7F121A89" />
+    <public type="string" name="role_permissions_embed_links_description_category" id="0x7F121A8A" />
+    <public type="string" name="role_permissions_embed_links_description_text" id="0x7F121A8B" />
+    <public type="string" name="role_permissions_empty_text" id="0x7F121A8C" />
+    <public type="string" name="role_permissions_kick_members_description" id="0x7F121A8D" />
+    <public type="string" name="role_permissions_manage_channel_description_category" id="0x7F121A8E" />
+    <public type="string" name="role_permissions_manage_channel_description_stage" id="0x7F121A8F" />
+    <public type="string" name="role_permissions_manage_channel_description_text" id="0x7F121A90" />
+    <public type="string" name="role_permissions_manage_channel_description_voice" id="0x7F121A91" />
+    <public type="string" name="role_permissions_manage_channels_description" id="0x7F121A92" />
+    <public type="string" name="role_permissions_manage_emojis_and_stickers_description" id="0x7F121A93" />
+    <public type="string" name="role_permissions_manage_emojis_description" id="0x7F121A94" />
+    <public type="string" name="role_permissions_manage_events_description" id="0x7F121A95" />
+    <public type="string" name="role_permissions_manage_messages_description" id="0x7F121A96" />
+    <public type="string" name="role_permissions_manage_messages_description_announcement" id="0x7F121A97" />
+    <public type="string" name="role_permissions_manage_messages_description_category" id="0x7F121A98" />
+    <public type="string" name="role_permissions_manage_messages_description_text" id="0x7F121A99" />
+    <public type="string" name="role_permissions_manage_nicknames_description" id="0x7F121A9A" />
+    <public type="string" name="role_permissions_manage_roles_description" id="0x7F121A9B" />
+    <public type="string" name="role_permissions_manage_roles_description_category" id="0x7F121A9C" />
+    <public type="string" name="role_permissions_manage_roles_description_channel" id="0x7F121A9D" />
+    <public type="string" name="role_permissions_manage_roles_description_stage" id="0x7F121A9E" />
+    <public type="string" name="role_permissions_manage_server_description" id="0x7F121A9F" />
+    <public type="string" name="role_permissions_manage_threads_description" id="0x7F121AA0" />
+    <public type="string" name="role_permissions_manage_threads_description_category" id="0x7F121AA1" />
+    <public type="string" name="role_permissions_manage_threads_description_text" id="0x7F121AA2" />
+    <public type="string" name="role_permissions_manage_webhooks_description" id="0x7F121AA3" />
+    <public type="string" name="role_permissions_manage_webhooks_description_category" id="0x7F121AA4" />
+    <public type="string" name="role_permissions_manage_webhooks_description_channel" id="0x7F121AA5" />
+    <public type="string" name="role_permissions_mention_everyone_description" id="0x7F121AA6" />
+    <public type="string" name="role_permissions_mention_everyone_description_category" id="0x7F121AA7" />
+    <public type="string" name="role_permissions_mention_everyone_description_text" id="0x7F121AA8" />
+    <public type="string" name="role_permissions_move_members_description" id="0x7F121AA9" />
+    <public type="string" name="role_permissions_move_members_description_category" id="0x7F121AAA" />
+    <public type="string" name="role_permissions_move_members_description_stage" id="0x7F121AAB" />
+    <public type="string" name="role_permissions_move_members_description_voice" id="0x7F121AAC" />
+    <public type="string" name="role_permissions_mute_members_description" id="0x7F121AAD" />
+    <public type="string" name="role_permissions_mute_members_description_category" id="0x7F121AAE" />
+    <public type="string" name="role_permissions_mute_members_description_stage" id="0x7F121AAF" />
+    <public type="string" name="role_permissions_mute_members_description_voice" id="0x7F121AB0" />
+    <public type="string" name="role_permissions_priority_speaker_description" id="0x7F121AB1" />
+    <public type="string" name="role_permissions_priority_speaker_description_app" id="0x7F121AB2" />
+    <public type="string" name="role_permissions_priority_speaker_description_category" id="0x7F121AB3" />
+    <public type="string" name="role_permissions_priority_speaker_description_category_mobile" id="0x7F121AB4" />
+    <public type="string" name="role_permissions_priority_speaker_description_mobile" id="0x7F121AB5" />
+    <public type="string" name="role_permissions_priority_speaker_description_voice" id="0x7F121AB6" />
+    <public type="string" name="role_permissions_priority_speaker_description_voice_mobile" id="0x7F121AB7" />
+    <public type="string" name="role_permissions_read_message_history_description" id="0x7F121AB8" />
+    <public type="string" name="role_permissions_read_message_history_description_category" id="0x7F121AB9" />
+    <public type="string" name="role_permissions_read_message_history_description_text" id="0x7F121ABA" />
+    <public type="string" name="role_permissions_request_to_speak_description" id="0x7F121ABB" />
+    <public type="string" name="role_permissions_request_to_speak_description_category" id="0x7F121ABC" />
+    <public type="string" name="role_permissions_request_to_speak_description_stage" id="0x7F121ABD" />
+    <public type="string" name="role_permissions_search_placeholder" id="0x7F121ABE" />
+    <public type="string" name="role_permissions_section_advanced" id="0x7F121ABF" />
+    <public type="string" name="role_permissions_section_general_category" id="0x7F121AC0" />
+    <public type="string" name="role_permissions_section_general_channel" id="0x7F121AC1" />
+    <public type="string" name="role_permissions_section_general_guild" id="0x7F121AC2" />
+    <public type="string" name="role_permissions_section_guild_events" id="0x7F121AC3" />
+    <public type="string" name="role_permissions_section_membership" id="0x7F121AC4" />
+    <public type="string" name="role_permissions_section_stage" id="0x7F121AC5" />
+    <public type="string" name="role_permissions_section_text" id="0x7F121AC6" />
+    <public type="string" name="role_permissions_section_voice" id="0x7F121AC7" />
+    <public type="string" name="role_permissions_send_messages_description" id="0x7F121AC8" />
+    <public type="string" name="role_permissions_send_messages_description_announcement" id="0x7F121AC9" />
+    <public type="string" name="role_permissions_send_messages_description_category" id="0x7F121ACA" />
+    <public type="string" name="role_permissions_send_messages_description_text" id="0x7F121ACB" />
+    <public type="string" name="role_permissions_send_tts_messages" id="0x7F121ACC" />
+    <public type="string" name="role_permissions_send_tts_messages_description" id="0x7F121ACD" />
+    <public type="string" name="role_permissions_send_tts_messages_description_category" id="0x7F121ACE" />
+    <public type="string" name="role_permissions_send_tts_messages_description_text" id="0x7F121ACF" />
+    <public type="string" name="role_permissions_speak_description" id="0x7F121AD0" />
+    <public type="string" name="role_permissions_speak_description_category" id="0x7F121AD1" />
+    <public type="string" name="role_permissions_speak_description_stage" id="0x7F121AD2" />
+    <public type="string" name="role_permissions_speak_description_voice" id="0x7F121AD3" />
+    <public type="string" name="role_permissions_stream_description" id="0x7F121AD4" />
+    <public type="string" name="role_permissions_stream_description_category" id="0x7F121AD5" />
+    <public type="string" name="role_permissions_stream_description_voice" id="0x7F121AD6" />
+    <public type="string" name="role_permissions_use_application_commands" id="0x7F121AD7" />
+    <public type="string" name="role_permissions_use_application_commands_channel_description" id="0x7F121AD8" />
+    <public type="string" name="role_permissions_use_application_commands_description_category" id="0x7F121AD9" />
+    <public type="string" name="role_permissions_use_application_commands_description_text" id="0x7F121ADA" />
+    <public type="string" name="role_permissions_use_application_commands_guild_description" id="0x7F121ADB" />
+    <public type="string" name="role_permissions_use_external_emojis" id="0x7F121ADC" />
+    <public type="string" name="role_permissions_use_external_emojis_description" id="0x7F121ADD" />
+    <public type="string" name="role_permissions_use_external_emojis_description_category" id="0x7F121ADE" />
+    <public type="string" name="role_permissions_use_external_emojis_description_text" id="0x7F121ADF" />
+    <public type="string" name="role_permissions_use_private_threads_description" id="0x7F121AE0" />
+    <public type="string" name="role_permissions_use_private_threads_description_category" id="0x7F121AE1" />
+    <public type="string" name="role_permissions_use_private_threads_description_text" id="0x7F121AE2" />
+    <public type="string" name="role_permissions_use_public_threads_description" id="0x7F121AE3" />
+    <public type="string" name="role_permissions_use_public_threads_description_category" id="0x7F121AE4" />
+    <public type="string" name="role_permissions_use_public_threads_description_text" id="0x7F121AE5" />
+    <public type="string" name="role_permissions_use_vad_description" id="0x7F121AE6" />
+    <public type="string" name="role_permissions_use_vad_description_category" id="0x7F121AE7" />
+    <public type="string" name="role_permissions_use_vad_description_stage" id="0x7F121AE8" />
+    <public type="string" name="role_permissions_use_vad_description_voice" id="0x7F121AE9" />
+    <public type="string" name="role_permissions_view_audit_log_description" id="0x7F121AEA" />
+    <public type="string" name="role_permissions_view_channel" id="0x7F121AEB" />
+    <public type="string" name="role_permissions_view_channel_description" id="0x7F121AEC" />
+    <public type="string" name="role_permissions_view_channel_description_category" id="0x7F121AED" />
+    <public type="string" name="role_permissions_view_channel_description_category_everyone" id="0x7F121AEE" />
+    <public type="string" name="role_permissions_view_channel_description_channel" id="0x7F121AEF" />
+    <public type="string" name="role_permissions_view_channel_description_text_everyone" id="0x7F121AF0" />
+    <public type="string" name="role_permissions_view_channel_description_voice_everyone" id="0x7F121AF1" />
+    <public type="string" name="role_permissions_view_guild_analytics_description" id="0x7F121AF2" />
+    <public type="string" name="role_remove_member_confirm_body" id="0x7F121AF3" />
+    <public type="string" name="role_remove_member_confirm_tip" id="0x7F121AF4" />
+    <public type="string" name="role_remove_member_confirm_title" id="0x7F121AF5" />
+    <public type="string" name="role_remove_member_managed" id="0x7F121AF6" />
+    <public type="string" name="role_required_edit_roles_modal_subtitle" id="0x7F121AF7" />
+    <public type="string" name="role_required_edit_roles_modal_title" id="0x7F121AF8" />
+    <public type="string" name="role_required_single_user_message" id="0x7F121AF9" />
+    <public type="string" name="role_row_description" id="0x7F121AFA" />
+    <public type="string" name="role_row_view_members" id="0x7F121AFB" />
+    <public type="string" name="role_sample_message" id="0x7F121AFC" />
+    <public type="string" name="role_update_cta" id="0x7F121AFD" />
+    <public type="string" name="roles" id="0x7F121AFE" />
+    <public type="string" name="roles_list" id="0x7F121AFF" />
+    <public type="string" name="roles_matching" id="0x7F121B00" />
+    <public type="string" name="rtc_connection" id="0x7F121B01" />
+    <public type="string" name="rtc_connection_state_authenticating" id="0x7F121B02" />
+    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7F121B03" />
+    <public type="string" name="rtc_connection_state_connecting" id="0x7F121B04" />
+    <public type="string" name="rtc_connection_state_disconnected" id="0x7F121B05" />
+    <public type="string" name="rtc_connection_state_ice_checking" id="0x7F121B06" />
+    <public type="string" name="rtc_connection_state_no_route" id="0x7F121B07" />
+    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7F121B08" />
+    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7F121B09" />
+    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7F121B0A" />
+    <public type="string" name="rtc_debug_context" id="0x7F121B0B" />
+    <public type="string" name="rtc_debug_open" id="0x7F121B0C" />
+    <public type="string" name="rtc_debug_rtp_inbound" id="0x7F121B0D" />
+    <public type="string" name="rtc_debug_rtp_outbound" id="0x7F121B0E" />
+    <public type="string" name="rtc_debug_screenshare" id="0x7F121B0F" />
+    <public type="string" name="rtc_debug_transport" id="0x7F121B10" />
+    <public type="string" name="ru" id="0x7F121B11" />
+    <public type="string" name="salmon" id="0x7F121B12" />
+    <public type="string" name="sample_channel_message" id="0x7F121B13" />
+    <public type="string" name="sample_channel_name" id="0x7F121B14" />
+    <public type="string" name="sample_channel_name_short" id="0x7F121B15" />
+    <public type="string" name="sample_channel_search_filter" id="0x7F121B16" />
+    <public type="string" name="sample_channel_topic" id="0x7F121B17" />
+    <public type="string" name="sample_confirmation" id="0x7F121B18" />
+    <public type="string" name="sample_connected_account" id="0x7F121B19" />
+    <public type="string" name="sample_discrim" id="0x7F121B1A" />
+    <public type="string" name="sample_email" id="0x7F121B1B" />
+    <public type="string" name="sample_empty_string" id="0x7F121B1C" />
+    <public type="string" name="sample_language" id="0x7F121B1D" />
+    <public type="string" name="sample_notification_frequency" id="0x7F121B1E" />
+    <public type="string" name="sample_number_9" id="0x7F121B1F" />
+    <public type="string" name="sample_number_99" id="0x7F121B20" />
+    <public type="string" name="sample_number_999" id="0x7F121B21" />
+    <public type="string" name="sample_number_9999" id="0x7F121B22" />
+    <public type="string" name="sample_number_bandwidth" id="0x7F121B23" />
+    <public type="string" name="sample_number_ratio" id="0x7F121B24" />
+    <public type="string" name="sample_online_members" id="0x7F121B25" />
+    <public type="string" name="sample_phone" id="0x7F121B26" />
+    <public type="string" name="sample_phone_country_code" id="0x7F121B27" />
+    <public type="string" name="sample_server_name" id="0x7F121B28" />
+    <public type="string" name="sample_server_name_short" id="0x7F121B29" />
+    <public type="string" name="sample_server_role_name" id="0x7F121B2A" />
+    <public type="string" name="sample_thread_started_by_message" id="0x7F121B2B" />
+    <public type="string" name="sample_time_duration_minutes" id="0x7F121B2C" />
+    <public type="string" name="sample_time_duration_seconds" id="0x7F121B2D" />
+    <public type="string" name="sample_time_pm" id="0x7F121B2E" />
+    <public type="string" name="sample_time_stamp" id="0x7F121B2F" />
+    <public type="string" name="sample_total_members" id="0x7F121B30" />
+    <public type="string" name="sample_total_messages" id="0x7F121B31" />
+    <public type="string" name="sample_user_generated_link" id="0x7F121B32" />
+    <public type="string" name="sample_user_name" id="0x7F121B33" />
+    <public type="string" name="sample_user_name_discrim" id="0x7F121B34" />
+    <public type="string" name="sample_user_nick" id="0x7F121B35" />
+    <public type="string" name="sample_user_presence" id="0x7F121B36" />
+    <public type="string" name="sample_user_presence_details" id="0x7F121B37" />
+    <public type="string" name="save" id="0x7F121B38" />
+    <public type="string" name="save_changes" id="0x7F121B39" />
+    <public type="string" name="save_image" id="0x7F121B3A" />
+    <public type="string" name="save_image_menu_item" id="0x7F121B3B" />
+    <public type="string" name="save_media_failure_help_mobile" id="0x7F121B3C" />
+    <public type="string" name="save_media_failure_mobile" id="0x7F121B3D" />
+    <public type="string" name="save_media_success_mobile" id="0x7F121B3E" />
+    <public type="string" name="saved_settings" id="0x7F121B3F" />
+    <public type="string" name="schedule_event" id="0x7F121B40" />
+    <public type="string" name="schedule_event_description" id="0x7F121B41" />
+    <public type="string" name="scope_activities_read" id="0x7F121B42" />
+    <public type="string" name="scope_activities_read_description" id="0x7F121B43" />
+    <public type="string" name="scope_activities_write" id="0x7F121B44" />
+    <public type="string" name="scope_activities_write_description" id="0x7F121B45" />
+    <public type="string" name="scope_applications_builds_read" id="0x7F121B46" />
+    <public type="string" name="scope_applications_builds_read_description" id="0x7F121B47" />
+    <public type="string" name="scope_applications_builds_upload" id="0x7F121B48" />
+    <public type="string" name="scope_applications_builds_upload_description" id="0x7F121B49" />
+    <public type="string" name="scope_applications_commands" id="0x7F121B4A" />
+    <public type="string" name="scope_applications_commands_description" id="0x7F121B4B" />
+    <public type="string" name="scope_applications_commands_update" id="0x7F121B4C" />
+    <public type="string" name="scope_applications_commands_update_description" id="0x7F121B4D" />
+    <public type="string" name="scope_applications_entitlements" id="0x7F121B4E" />
+    <public type="string" name="scope_applications_entitlements_description" id="0x7F121B4F" />
+    <public type="string" name="scope_applications_store_update" id="0x7F121B50" />
+    <public type="string" name="scope_applications_store_update_description" id="0x7F121B51" />
+    <public type="string" name="scope_bot" id="0x7F121B52" />
+    <public type="string" name="scope_bot_permissions" id="0x7F121B53" />
+    <public type="string" name="scope_bot_permissions_description" id="0x7F121B54" />
+    <public type="string" name="scope_connections" id="0x7F121B55" />
+    <public type="string" name="scope_connections_empty" id="0x7F121B56" />
+    <public type="string" name="scope_email" id="0x7F121B57" />
+    <public type="string" name="scope_email_empty" id="0x7F121B58" />
+    <public type="string" name="scope_gdm_join" id="0x7F121B59" />
+    <public type="string" name="scope_gdm_join_description" id="0x7F121B5A" />
+    <public type="string" name="scope_guilds" id="0x7F121B5B" />
+    <public type="string" name="scope_guilds_empty" id="0x7F121B5C" />
+    <public type="string" name="scope_guilds_join" id="0x7F121B5D" />
+    <public type="string" name="scope_guilds_join_description" id="0x7F121B5E" />
+    <public type="string" name="scope_identify" id="0x7F121B5F" />
+    <public type="string" name="scope_messages_read" id="0x7F121B60" />
+    <public type="string" name="scope_messages_read_description" id="0x7F121B61" />
+    <public type="string" name="scope_relationships_read" id="0x7F121B62" />
+    <public type="string" name="scope_relationships_read_description" id="0x7F121B63" />
+    <public type="string" name="scope_rpc" id="0x7F121B64" />
+    <public type="string" name="scope_rpc_activities_write" id="0x7F121B65" />
+    <public type="string" name="scope_rpc_description" id="0x7F121B66" />
+    <public type="string" name="scope_rpc_notifications_read" id="0x7F121B67" />
+    <public type="string" name="scope_rpc_notifications_read_description" id="0x7F121B68" />
+    <public type="string" name="scope_rpc_voice_read" id="0x7F121B69" />
+    <public type="string" name="scope_rpc_voice_write" id="0x7F121B6A" />
+    <public type="string" name="scope_unsupported_on_android" id="0x7F121B6B" />
+    <public type="string" name="scope_unsupported_on_android_description" id="0x7F121B6C" />
+    <public type="string" name="scope_webhook_incoming" id="0x7F121B6D" />
+    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7F121B6E" />
+    <public type="string" name="scope_webhook_incoming_description" id="0x7F121B6F" />
+    <public type="string" name="screen_share_nfx_body" id="0x7F121B70" />
+    <public type="string" name="screen_share_nfx_skip" id="0x7F121B71" />
+    <public type="string" name="screen_share_nfx_title" id="0x7F121B72" />
+    <public type="string" name="screen_share_nfx_try" id="0x7F121B73" />
+    <public type="string" name="screen_share_on" id="0x7F121B74" />
+    <public type="string" name="screen_share_options" id="0x7F121B75" />
+    <public type="string" name="screenshare_change_windows" id="0x7F121B76" />
+    <public type="string" name="screenshare_description" id="0x7F121B77" />
+    <public type="string" name="screenshare_fps_abbreviated" id="0x7F121B78" />
+    <public type="string" name="screenshare_frame_rate" id="0x7F121B79" />
+    <public type="string" name="screenshare_quality_tooltip_normal" id="0x7F121B7A" />
+    <public type="string" name="screenshare_quality_tooltip_premium" id="0x7F121B7B" />
+    <public type="string" name="screenshare_quality_tooltip_reduced" id="0x7F121B7C" />
+    <public type="string" name="screenshare_relaunch" id="0x7F121B7D" />
+    <public type="string" name="screenshare_relaunch_body" id="0x7F121B7E" />
+    <public type="string" name="screenshare_resolution_abbreviated" id="0x7F121B7F" />
+    <public type="string" name="screenshare_screen" id="0x7F121B80" />
+    <public type="string" name="screenshare_share_screen_or_window" id="0x7F121B81" />
+    <public type="string" name="screenshare_sound_toggle_label" id="0x7F121B82" />
+    <public type="string" name="screenshare_source" id="0x7F121B83" />
+    <public type="string" name="screenshare_stop" id="0x7F121B84" />
+    <public type="string" name="screenshare_stream_game" id="0x7F121B85" />
+    <public type="string" name="screenshare_stream_quality" id="0x7F121B86" />
+    <public type="string" name="screenshare_unavailable" id="0x7F121B87" />
+    <public type="string" name="screenshare_unavailable_download_app" id="0x7F121B88" />
+    <public type="string" name="screenshare_window" id="0x7F121B89" />
+    <public type="string" name="search" id="0x7F121B8A" />
+    <public type="string" name="search_actions" id="0x7F121B8B" />
+    <public type="string" name="search_answer_date" id="0x7F121B8C" />
+    <public type="string" name="search_answer_file_name" id="0x7F121B8D" />
+    <public type="string" name="search_answer_file_type" id="0x7F121B8E" />
+    <public type="string" name="search_answer_from" id="0x7F121B8F" />
+    <public type="string" name="search_answer_has" id="0x7F121B90" />
+    <public type="string" name="search_answer_has_attachment" id="0x7F121B91" />
+    <public type="string" name="search_answer_has_embed" id="0x7F121B92" />
+    <public type="string" name="search_answer_has_image" id="0x7F121B93" />
+    <public type="string" name="search_answer_has_link" id="0x7F121B94" />
+    <public type="string" name="search_answer_has_sound" id="0x7F121B95" />
+    <public type="string" name="search_answer_has_video" id="0x7F121B96" />
+    <public type="string" name="search_answer_in" id="0x7F121B97" />
+    <public type="string" name="search_answer_link_from" id="0x7F121B98" />
+    <public type="string" name="search_answer_mentions" id="0x7F121B99" />
+    <public type="string" name="search_channels" id="0x7F121B9A" />
+    <public type="string" name="search_channels_no_result" id="0x7F121B9B" />
+    <public type="string" name="search_clear" id="0x7F121B9C" />
+    <public type="string" name="search_clear_history" id="0x7F121B9D" />
+    <public type="string" name="search_country" id="0x7F121B9E" />
+    <public type="string" name="search_date_picker_hint" id="0x7F121B9F" />
+    <public type="string" name="search_dm_still_indexing" id="0x7F121BA0" />
+    <public type="string" name="search_dm_with" id="0x7F121BA1" />
+    <public type="string" name="search_emojis" id="0x7F121BA2" />
+    <public type="string" name="search_error" id="0x7F121BA3" />
+    <public type="string" name="search_filter_after" id="0x7F121BA4" />
+    <public type="string" name="search_filter_before" id="0x7F121BA5" />
+    <public type="string" name="search_filter_during" id="0x7F121BA6" />
+    <public type="string" name="search_filter_file_name" id="0x7F121BA7" />
+    <public type="string" name="search_filter_file_type" id="0x7F121BA8" />
+    <public type="string" name="search_filter_from" id="0x7F121BA9" />
+    <public type="string" name="search_filter_has" id="0x7F121BAA" />
+    <public type="string" name="search_filter_in" id="0x7F121BAB" />
+    <public type="string" name="search_filter_link_from" id="0x7F121BAC" />
+    <public type="string" name="search_filter_mentions" id="0x7F121BAD" />
+    <public type="string" name="search_filter_on" id="0x7F121BAE" />
+    <public type="string" name="search_for_emoji" id="0x7F121BAF" />
+    <public type="string" name="search_for_sticker" id="0x7F121BB0" />
+    <public type="string" name="search_for_stickers" id="0x7F121BB1" />
+    <public type="string" name="search_for_value" id="0x7F121BB2" />
+    <public type="string" name="search_from_suggestions" id="0x7F121BB3" />
+    <public type="string" name="search_gifs" id="0x7F121BB4" />
+    <public type="string" name="search_group_header_channels" id="0x7F121BB5" />
+    <public type="string" name="search_group_header_dates" id="0x7F121BB6" />
+    <public type="string" name="search_group_header_file_type" id="0x7F121BB7" />
+    <public type="string" name="search_group_header_from" id="0x7F121BB8" />
+    <public type="string" name="search_group_header_has" id="0x7F121BB9" />
+    <public type="string" name="search_group_header_history" id="0x7F121BBA" />
+    <public type="string" name="search_group_header_link_from" id="0x7F121BBB" />
+    <public type="string" name="search_group_header_mentions" id="0x7F121BBC" />
+    <public type="string" name="search_group_header_search_options" id="0x7F121BBD" />
+    <public type="string" name="search_guild_still_indexing" id="0x7F121BBE" />
+    <public type="string" name="search_hide_blocked_messages" id="0x7F121BBF" />
+    <public type="string" name="search_in" id="0x7F121BC0" />
+    <public type="string" name="search_members" id="0x7F121BC1" />
+    <public type="string" name="search_members_no_result" id="0x7F121BC2" />
+    <public type="string" name="search_menu_title" id="0x7F121BC3" />
+    <public type="string" name="search_most_relevant" id="0x7F121BC4" />
+    <public type="string" name="search_most_relevant_short" id="0x7F121BC5" />
+    <public type="string" name="search_newest" id="0x7F121BC6" />
+    <public type="string" name="search_newest_short" id="0x7F121BC7" />
+    <public type="string" name="search_no_results" id="0x7F121BC8" />
+    <public type="string" name="search_no_results_alt" id="0x7F121BC9" />
+    <public type="string" name="search_num_results_blocked_not_shown" id="0x7F121BCA" />
+    <public type="string" name="search_oldest" id="0x7F121BCB" />
+    <public type="string" name="search_oldest_short" id="0x7F121BCC" />
+    <public type="string" name="search_pagination_a11y_label" id="0x7F121BCD" />
+    <public type="string" name="search_pick_date" id="0x7F121BCE" />
+    <public type="string" name="search_result" id="0x7F121BCF" />
+    <public type="string" name="search_results_section_label" id="0x7F121BD0" />
+    <public type="string" name="search_roles" id="0x7F121BD1" />
+    <public type="string" name="search_roles_no_result" id="0x7F121BD2" />
+    <public type="string" name="search_shortcut_month" id="0x7F121BD3" />
+    <public type="string" name="search_shortcut_today" id="0x7F121BD4" />
+    <public type="string" name="search_shortcut_week" id="0x7F121BD5" />
+    <public type="string" name="search_shortcut_year" id="0x7F121BD6" />
+    <public type="string" name="search_shortcut_yesterday" id="0x7F121BD7" />
+    <public type="string" name="search_still_indexing_hint" id="0x7F121BD8" />
+    <public type="string" name="search_tenor" id="0x7F121BD9" />
+    <public type="string" name="search_with_google" id="0x7F121BDA" />
+    <public type="string" name="searching" id="0x7F121BDB" />
+    <public type="string" name="security" id="0x7F121BDC" />
+    <public type="string" name="see_thread" id="0x7F121BDD" />
+    <public type="string" name="see_thread_mobile" id="0x7F121BDE" />
+    <public type="string" name="select" id="0x7F121BDF" />
+    <public type="string" name="select_accessibility_desc" id="0x7F121BE0" />
+    <public type="string" name="select_accessibility_desc_open_options_list" id="0x7F121BE1" />
+    <public type="string" name="select_accessibility_desc_option" id="0x7F121BE2" />
+    <public type="string" name="select_accessibility_desc_with_selection" id="0x7F121BE3" />
+    <public type="string" name="select_channel_or_category" id="0x7F121BE4" />
+    <public type="string" name="select_emoji" id="0x7F121BE5" />
+    <public type="string" name="select_from_application_a11y_label" id="0x7F121BE6" />
+    <public type="string" name="select_message" id="0x7F121BE7" />
+    <public type="string" name="select_picture" id="0x7F121BE8" />
+    <public type="string" name="select_sort_mode" id="0x7F121BE9" />
+    <public type="string" name="selection_shrink_scale" id="0x7F121BEA" />
+    <public type="string" name="self_deny_permission_body" id="0x7F121BEB" />
+    <public type="string" name="self_deny_permission_title" id="0x7F121BEC" />
+    <public type="string" name="self_username_indicator" id="0x7F121BED" />
+    <public type="string" name="self_username_indicator_hook" id="0x7F121BEE" />
+    <public type="string" name="self_xss_header" id="0x7F121BEF" />
+    <public type="string" name="self_xss_line_1" id="0x7F121BF0" />
+    <public type="string" name="self_xss_line_2" id="0x7F121BF1" />
+    <public type="string" name="self_xss_line_3" id="0x7F121BF2" />
+    <public type="string" name="self_xss_line_4" id="0x7F121BF3" />
+    <public type="string" name="send" id="0x7F121BF4" />
+    <public type="string" name="send_a_message" id="0x7F121BF5" />
+    <public type="string" name="send_compressed" id="0x7F121BF6" />
+    <public type="string" name="send_dm" id="0x7F121BF7" />
+    <public type="string" name="send_images_label" id="0x7F121BF8" />
+    <public type="string" name="send_message" id="0x7F121BF9" />
+    <public type="string" name="send_message_failure" id="0x7F121BFA" />
+    <public type="string" name="send_messages" id="0x7F121BFB" />
+    <public type="string" name="send_messages_description" id="0x7F121BFC" />
+    <public type="string" name="send_tts_messages" id="0x7F121BFD" />
+    <public type="string" name="send_tts_messages_description" id="0x7F121BFE" />
+    <public type="string" name="send_wave" id="0x7F121BFF" />
+    <public type="string" name="server_deafen" id="0x7F121C00" />
+    <public type="string" name="server_deafened" id="0x7F121C01" />
+    <public type="string" name="server_deafened_dialog_body" id="0x7F121C02" />
+    <public type="string" name="server_deafened_dialog_title" id="0x7F121C03" />
+    <public type="string" name="server_desciption_empty" id="0x7F121C04" />
+    <public type="string" name="server_emoji" id="0x7F121C05" />
+    <public type="string" name="server_folder_mark_as_read" id="0x7F121C06" />
+    <public type="string" name="server_folder_placeholder" id="0x7F121C07" />
+    <public type="string" name="server_folder_settings" id="0x7F121C08" />
+    <public type="string" name="server_insights" id="0x7F121C09" />
+    <public type="string" name="server_is_currently_full" id="0x7F121C0A" />
+    <public type="string" name="server_mute" id="0x7F121C0B" />
+    <public type="string" name="server_muted" id="0x7F121C0C" />
+    <public type="string" name="server_muted_dialog_body" id="0x7F121C0D" />
+    <public type="string" name="server_muted_dialog_title" id="0x7F121C0E" />
+    <public type="string" name="server_name_required" id="0x7F121C0F" />
+    <public type="string" name="server_options" id="0x7F121C10" />
+    <public type="string" name="server_overview" id="0x7F121C11" />
+    <public type="string" name="server_quest" id="0x7F121C12" />
+    <public type="string" name="server_region_unavailable" id="0x7F121C13" />
+    <public type="string" name="server_settings" id="0x7F121C14" />
+    <public type="string" name="server_settings_updated" id="0x7F121C15" />
+    <public type="string" name="server_status" id="0x7F121C16" />
+    <public type="string" name="server_undeafen" id="0x7F121C17" />
+    <public type="string" name="server_unmute" id="0x7F121C18" />
+    <public type="string" name="server_voice_mute" id="0x7F121C19" />
+    <public type="string" name="server_voice_unmute" id="0x7F121C1A" />
+    <public type="string" name="servers" id="0x7F121C1B" />
+    <public type="string" name="service_connections_disconnect" id="0x7F121C1C" />
+    <public type="string" name="set_debug_logging" id="0x7F121C1D" />
+    <public type="string" name="set_debug_logging_body" id="0x7F121C1E" />
+    <public type="string" name="set_invite_link_never_expire" id="0x7F121C1F" />
+    <public type="string" name="set_status" id="0x7F121C20" />
+    <public type="string" name="set_up_description" id="0x7F121C21" />
+    <public type="string" name="set_up_your_server" id="0x7F121C22" />
+    <public type="string" name="settings" id="0x7F121C23" />
+    <public type="string" name="settings_advanced" id="0x7F121C24" />
+    <public type="string" name="settings_games_add_game" id="0x7F121C25" />
+    <public type="string" name="settings_games_add_new_game" id="0x7F121C26" />
+    <public type="string" name="settings_games_added_games_label" id="0x7F121C27" />
+    <public type="string" name="settings_games_enable_overlay_label" id="0x7F121C28" />
+    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7F121C29" />
+    <public type="string" name="settings_games_last_played" id="0x7F121C2A" />
+    <public type="string" name="settings_games_no_game_detected" id="0x7F121C2B" />
+    <public type="string" name="settings_games_no_games_header" id="0x7F121C2C" />
+    <public type="string" name="settings_games_not_playing" id="0x7F121C2D" />
+    <public type="string" name="settings_games_not_seeing_game" id="0x7F121C2E" />
+    <public type="string" name="settings_games_now_playing_state" id="0x7F121C2F" />
+    <public type="string" name="settings_games_overlay" id="0x7F121C30" />
+    <public type="string" name="settings_games_overlay_off" id="0x7F121C31" />
+    <public type="string" name="settings_games_overlay_on" id="0x7F121C32" />
+    <public type="string" name="settings_games_overlay_warning" id="0x7F121C33" />
+    <public type="string" name="settings_games_toggle_overlay" id="0x7F121C34" />
+    <public type="string" name="settings_games_verified_icon" id="0x7F121C35" />
+    <public type="string" name="settings_invite_tip" id="0x7F121C36" />
+    <public type="string" name="settings_invite_tip_without_create" id="0x7F121C37" />
+    <public type="string" name="settings_notice_message" id="0x7F121C38" />
+    <public type="string" name="settings_permissions_delete_body" id="0x7F121C39" />
+    <public type="string" name="settings_permissions_delete_title" id="0x7F121C3A" />
+    <public type="string" name="settings_roles_delete_body" id="0x7F121C3B" />
+    <public type="string" name="settings_roles_delete_title" id="0x7F121C3C" />
+    <public type="string" name="settings_sync" id="0x7F121C3D" />
+    <public type="string" name="settings_webhooks_empty_body" id="0x7F121C3E" />
+    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7F121C3F" />
+    <public type="string" name="settings_webhooks_empty_title" id="0x7F121C40" />
+    <public type="string" name="settings_webhooks_intro" id="0x7F121C41" />
+    <public type="string" name="setup_progress" id="0x7F121C42" />
+    <public type="string" name="setup_vanity_url" id="0x7F121C43" />
+    <public type="string" name="several_users_typing" id="0x7F121C44" />
+    <public type="string" name="share" id="0x7F121C45" />
+    <public type="string" name="share_invite_link_for_access" id="0x7F121C46" />
+    <public type="string" name="share_invite_mobile" id="0x7F121C47" />
+    <public type="string" name="share_link" id="0x7F121C48" />
+    <public type="string" name="share_settings_title" id="0x7F121C49" />
+    <public type="string" name="share_to" id="0x7F121C4A" />
+    <public type="string" name="share_your_screen" id="0x7F121C4B" />
+    <public type="string" name="sharing_screen" id="0x7F121C4C" />
+    <public type="string" name="shortcut_recorder_button" id="0x7F121C4D" />
+    <public type="string" name="shortcut_recorder_button_edit" id="0x7F121C4E" />
+    <public type="string" name="shortcut_recorder_button_recording" id="0x7F121C4F" />
+    <public type="string" name="shortcut_recorder_no_bind" id="0x7F121C50" />
+    <public type="string" name="show_chat" id="0x7F121C51" />
+    <public type="string" name="show_current_activity" id="0x7F121C52" />
+    <public type="string" name="show_current_activity_desc" id="0x7F121C53" />
+    <public type="string" name="show_current_activity_desc_embedded" id="0x7F121C54" />
+    <public type="string" name="show_folder" id="0x7F121C55" />
+    <public type="string" name="show_keyboard" id="0x7F121C56" />
+    <public type="string" name="show_muted" id="0x7F121C57" />
+    <public type="string" name="show_muted_channels" id="0x7F121C58" />
+    <public type="string" name="show_spoiler_always" id="0x7F121C59" />
+    <public type="string" name="show_spoiler_content" id="0x7F121C5A" />
+    <public type="string" name="show_spoiler_content_help" id="0x7F121C5B" />
+    <public type="string" name="show_spoiler_on_click" id="0x7F121C5C" />
+    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7F121C5D" />
+    <public type="string" name="skip" id="0x7F121C5E" />
+    <public type="string" name="skip_all_tips" id="0x7F121C5F" />
+    <public type="string" name="skip_for_now" id="0x7F121C60" />
+    <public type="string" name="skip_to_content" id="0x7F121C61" />
+    <public type="string" name="sku_payment_steps_label" id="0x7F121C62" />
+    <public type="string" name="sky_blue" id="0x7F121C63" />
+    <public type="string" name="sms_confirmation_description" id="0x7F121C64" />
+    <public type="string" name="sms_confirmation_title" id="0x7F121C65" />
+    <public type="string" name="sort" id="0x7F121C66" />
+    <public type="string" name="sorting" id="0x7F121C67" />
+    <public type="string" name="sorting_channels" id="0x7F121C68" />
+    <public type="string" name="sound_deafen" id="0x7F121C69" />
+    <public type="string" name="sound_incoming_ring" id="0x7F121C6A" />
+    <public type="string" name="sound_invited_to_speak" id="0x7F121C6B" />
+    <public type="string" name="sound_message" id="0x7F121C6C" />
+    <public type="string" name="sound_mute" id="0x7F121C6D" />
+    <public type="string" name="sound_outgoing_ring" id="0x7F121C6E" />
+    <public type="string" name="sound_ptt_activate" id="0x7F121C6F" />
+    <public type="string" name="sound_ptt_deactivate" id="0x7F121C70" />
+    <public type="string" name="sound_stream_started" id="0x7F121C71" />
+    <public type="string" name="sound_stream_stopped" id="0x7F121C72" />
+    <public type="string" name="sound_undeafen" id="0x7F121C73" />
+    <public type="string" name="sound_unmute" id="0x7F121C74" />
+    <public type="string" name="sound_user_join" id="0x7F121C75" />
+    <public type="string" name="sound_user_leave" id="0x7F121C76" />
+    <public type="string" name="sound_user_moved" id="0x7F121C77" />
+    <public type="string" name="sound_viewer_join" id="0x7F121C78" />
+    <public type="string" name="sound_viewer_leave" id="0x7F121C79" />
+    <public type="string" name="sound_voice_disconnected" id="0x7F121C7A" />
+    <public type="string" name="soundpack_chaos_label" id="0x7F121C7B" />
+    <public type="string" name="soundpack_classic_label" id="0x7F121C7C" />
+    <public type="string" name="soundpack_label" id="0x7F121C7D" />
+    <public type="string" name="soundpack_uncle_label" id="0x7F121C7E" />
+    <public type="string" name="soundpack_yachty_label" id="0x7F121C7F" />
+    <public type="string" name="sounds" id="0x7F121C80" />
+    <public type="string" name="source_message_deleted" id="0x7F121C81" />
+    <public type="string" name="speak" id="0x7F121C82" />
+    <public type="string" name="speak_message" id="0x7F121C83" />
+    <public type="string" name="speaker_a11y_label" id="0x7F121C84" />
+    <public type="string" name="speaking_count" id="0x7F121C85" />
+    <public type="string" name="spectate" id="0x7F121C86" />
+    <public type="string" name="spectators" id="0x7F121C87" />
+    <public type="string" name="spellcheck" id="0x7F121C88" />
+    <public type="string" name="spoiler" id="0x7F121C89" />
+    <public type="string" name="spoiler_hidden_a11y_label" id="0x7F121C8A" />
+    <public type="string" name="spoiler_mark_selected" id="0x7F121C8B" />
+    <public type="string" name="spoiler_reveal" id="0x7F121C8C" />
+    <public type="string" name="spotify_connection_info_android" id="0x7F121C8D" />
+    <public type="string" name="spotify_listen_along_host" id="0x7F121C8E" />
+    <public type="string" name="spotify_listen_along_info" id="0x7F121C8F" />
+    <public type="string" name="spotify_listen_along_listener" id="0x7F121C90" />
+    <public type="string" name="spotify_listen_along_listeners" id="0x7F121C91" />
+    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7F121C92" />
+    <public type="string" name="spotify_listen_along_stop" id="0x7F121C93" />
+    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7F121C94" />
+    <public type="string" name="spotify_listen_along_title_host" id="0x7F121C95" />
+    <public type="string" name="spotify_listen_along_title_listener" id="0x7F121C96" />
+    <public type="string" name="spotify_premium_upgrade_body" id="0x7F121C97" />
+    <public type="string" name="spotify_premium_upgrade_button" id="0x7F121C98" />
+    <public type="string" name="spotify_premium_upgrade_header" id="0x7F121C99" />
+    <public type="string" name="staff_badge_tooltip" id="0x7F121C9A" />
+    <public type="string" name="stage_audience" id="0x7F121C9B" />
+    <public type="string" name="stage_blocked_users_accept" id="0x7F121C9C" />
+    <public type="string" name="stage_blocked_users_body" id="0x7F121C9D" />
+    <public type="string" name="stage_blocked_users_cancel" id="0x7F121C9E" />
+    <public type="string" name="stage_blocked_users_description_count" id="0x7F121C9F" />
+    <public type="string" name="stage_blocked_users_title" id="0x7F121CA0" />
+    <public type="string" name="stage_blocked_users_title_plural" id="0x7F121CA1" />
+    <public type="string" name="stage_channel" id="0x7F121CA2" />
+    <public type="string" name="stage_channel_activity_feed_default" id="0x7F121CA3" />
+    <public type="string" name="stage_channel_activity_feed_join" id="0x7F121CA4" />
+    <public type="string" name="stage_channel_audience_count" id="0x7F121CA5" />
+    <public type="string" name="stage_channel_audience_modal_action" id="0x7F121CA6" />
+    <public type="string" name="stage_channel_audience_modal_alt_text" id="0x7F121CA7" />
+    <public type="string" name="stage_channel_audience_modal_bullet_1" id="0x7F121CA8" />
+    <public type="string" name="stage_channel_audience_modal_bullet_2" id="0x7F121CA9" />
+    <public type="string" name="stage_channel_audience_modal_bullet_3" id="0x7F121CAA" />
+    <public type="string" name="stage_channel_audience_modal_bullet_4" id="0x7F121CAB" />
+    <public type="string" name="stage_channel_audience_modal_subtitle" id="0x7F121CAC" />
+    <public type="string" name="stage_channel_audience_modal_title" id="0x7F121CAD" />
+    <public type="string" name="stage_channel_audience_no_topic" id="0x7F121CAE" />
+    <public type="string" name="stage_channel_cannot_overwrite_permission" id="0x7F121CAF" />
+    <public type="string" name="stage_channel_currently_disabled_channel_setting" id="0x7F121CB0" />
+    <public type="string" name="stage_channel_desc" id="0x7F121CB1" />
+    <public type="string" name="stage_channel_invite_to_stage_modal_footer" id="0x7F121CB2" />
+    <public type="string" name="stage_channel_invite_to_stage_modal_header" id="0x7F121CB3" />
+    <public type="string" name="stage_channel_join_button" id="0x7F121CB4" />
+    <public type="string" name="stage_channel_joined_audience_button" id="0x7F121CB5" />
+    <public type="string" name="stage_channel_joined_speaker_button" id="0x7F121CB6" />
+    <public type="string" name="stage_channel_leave_button" id="0x7F121CB7" />
+    <public type="string" name="stage_channel_live_indicator" id="0x7F121CB8" />
+    <public type="string" name="stage_channel_live_now" id="0x7F121CB9" />
+    <public type="string" name="stage_channel_no_audience" id="0x7F121CBA" />
+    <public type="string" name="stage_channel_no_topic" id="0x7F121CBB" />
+    <public type="string" name="stage_channel_people_count" id="0x7F121CBC" />
+    <public type="string" name="stage_channel_permission_microphone_denied" id="0x7F121CBD" />
+    <public type="string" name="stage_channel_start_alt_text" id="0x7F121CBE" />
+    <public type="string" name="stage_channel_start_subtitle" id="0x7F121CBF" />
+    <public type="string" name="stage_channel_start_title" id="0x7F121CC0" />
+    <public type="string" name="stage_channel_user_context_menu" id="0x7F121CC1" />
+    <public type="string" name="stage_channel_user_invite_to_speak" id="0x7F121CC2" />
+    <public type="string" name="stage_channel_user_invited_to_speak" id="0x7F121CC3" />
+    <public type="string" name="stage_channel_user_move_to_audience" id="0x7F121CC4" />
+    <public type="string" name="stage_channel_user_set_myself_to_speaker" id="0x7F121CC5" />
+    <public type="string" name="stage_channel_users_are_speaking" id="0x7F121CC6" />
+    <public type="string" name="stage_discovery" id="0x7F121CC7" />
+    <public type="string" name="stage_discovery_audience_join_notice" id="0x7F121CC8" />
+    <public type="string" name="stage_discovery_card_open_stage" id="0x7F121CC9" />
+    <public type="string" name="stage_discovery_card_speaker_text" id="0x7F121CCA" />
+    <public type="string" name="stage_discovery_card_speaker_text_overflow" id="0x7F121CCB" />
+    <public type="string" name="stage_discovery_connection_error_button_text" id="0x7F121CCC" />
+    <public type="string" name="stage_discovery_connection_error_generic" id="0x7F121CCD" />
+    <public type="string" name="stage_discovery_footer_body" id="0x7F121CCE" />
+    <public type="string" name="stage_discovery_footer_button" id="0x7F121CCF" />
+    <public type="string" name="stage_discovery_footer_title" id="0x7F121CD0" />
+    <public type="string" name="stage_discovery_guild_sidebar_live_stages_category" id="0x7F121CD1" />
+    <public type="string" name="stage_discovery_intro_card_alt_text" id="0x7F121CD2" />
+    <public type="string" name="stage_discovery_intro_card_body" id="0x7F121CD3" />
+    <public type="string" name="stage_discovery_intro_card_body_desktop" id="0x7F121CD4" />
+    <public type="string" name="stage_discovery_intro_card_header" id="0x7F121CD5" />
+    <public type="string" name="stage_discovery_live_stage_listening_indicator" id="0x7F121CD6" />
+    <public type="string" name="stage_discovery_live_stage_tile_disconnecting" id="0x7F121CD7" />
+    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_audience" id="0x7F121CD8" />
+    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_audience_hook" id="0x7F121CD9" />
+    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_speaker" id="0x7F121CDA" />
+    <public type="string" name="stage_discovery_live_stage_tile_friends_guilds_context_speaker_hook" id="0x7F121CDB" />
+    <public type="string" name="stage_discovery_live_stage_tile_speaker_summary_overflow" id="0x7F121CDC" />
+    <public type="string" name="stage_discovery_live_stage_tile_subtext_community" id="0x7F121CDD" />
+    <public type="string" name="stage_discovery_live_stage_tile_subtext_just_started" id="0x7F121CDE" />
+    <public type="string" name="stage_discovery_live_stage_tile_subtext_partner" id="0x7F121CDF" />
+    <public type="string" name="stage_discovery_live_stage_tile_subtext_your_server" id="0x7F121CE0" />
+    <public type="string" name="stage_discovery_live_stage_tile_user_guilds_boosting_context" id="0x7F121CE1" />
+    <public type="string" name="stage_discovery_live_stage_tile_user_guilds_context" id="0x7F121CE2" />
+    <public type="string" name="stage_discovery_live_stage_tile_user_guilds_context_subtext" id="0x7F121CE3" />
+    <public type="string" name="stage_discovery_no_results_alt" id="0x7F121CE4" />
+    <public type="string" name="stage_discovery_no_results_button" id="0x7F121CE5" />
+    <public type="string" name="stage_discovery_no_results_header" id="0x7F121CE6" />
+    <public type="string" name="stage_discovery_no_results_subheader" id="0x7F121CE7" />
+    <public type="string" name="stage_discovery_origin_text" id="0x7F121CE8" />
+    <public type="string" name="stage_discovery_refresh_icon_label" id="0x7F121CE9" />
+    <public type="string" name="stage_discovery_speaker_join_notice" id="0x7F121CEA" />
+    <public type="string" name="stage_discovery_timestamp_days" id="0x7F121CEB" />
+    <public type="string" name="stage_discovery_timestamp_hours" id="0x7F121CEC" />
+    <public type="string" name="stage_discovery_timestamp_minutes" id="0x7F121CED" />
+    <public type="string" name="stage_discovery_tooltip" id="0x7F121CEE" />
+    <public type="string" name="stage_discovery_tooltip_mobile" id="0x7F121CEF" />
+    <public type="string" name="stage_instance_building_stage_label" id="0x7F121CF0" />
+    <public type="string" name="stage_instance_buy_ticket_label" id="0x7F121CF1" />
+    <public type="string" name="stage_instance_guild_picker_subtitle" id="0x7F121CF2" />
+    <public type="string" name="stage_instance_guild_picker_title" id="0x7F121CF3" />
+    <public type="string" name="stage_instance_interested_label" id="0x7F121CF4" />
+    <public type="string" name="stage_instance_privacy_type_friends_only_label" id="0x7F121CF5" />
+    <public type="string" name="stage_instance_privacy_type_friends_only_sub_label" id="0x7F121CF6" />
+    <public type="string" name="stage_instance_privacy_type_private_label" id="0x7F121CF7" />
+    <public type="string" name="stage_instance_privacy_type_private_sub_label" id="0x7F121CF8" />
+    <public type="string" name="stage_instance_privacy_type_public_label" id="0x7F121CF9" />
+    <public type="string" name="stage_instance_privacy_type_public_sub_label" id="0x7F121CFA" />
+    <public type="string" name="stage_instance_privacy_type_sheet_title" id="0x7F121CFB" />
+    <public type="string" name="stage_instance_purchased_label" id="0x7F121CFC" />
+    <public type="string" name="stage_instance_rsvp_count" id="0x7F121CFD" />
+    <public type="string" name="stage_instance_speakers" id="0x7F121CFE" />
+    <public type="string" name="stage_instance_start_stage_label" id="0x7F121CFF" />
+    <public type="string" name="stage_instance_ticket_buy_label" id="0x7F121D00" />
+    <public type="string" name="stage_instance_ticket_purchase_confirmation_got_it_label" id="0x7F121D01" />
+    <public type="string" name="stage_instance_ticket_purchase_confirmation_stage_started_sub_title" id="0x7F121D02" />
+    <public type="string" name="stage_instance_ticket_purchase_confirmation_sub_title" id="0x7F121D03" />
+    <public type="string" name="stage_instance_ticket_purchase_confirmation_title" id="0x7F121D04" />
+    <public type="string" name="stage_instance_ticket_purchase_label" id="0x7F121D05" />
+    <public type="string" name="stage_instance_ticket_purchase_modal_purchase_details_header" id="0x7F121D06" />
+    <public type="string" name="stage_instance_ticket_sold_out_label" id="0x7F121D07" />
+    <public type="string" name="stage_instance_today_label" id="0x7F121D08" />
+    <public type="string" name="stage_invite_guild_header" id="0x7F121D09" />
+    <public type="string" name="stage_invite_speaker_count" id="0x7F121D0A" />
+    <public type="string" name="stage_is_speaking_hook" id="0x7F121D0B" />
+    <public type="string" name="stage_is_speaking_zero_quantity_hook" id="0x7F121D0C" />
+    <public type="string" name="stage_microphone_permissions_denied" id="0x7F121D0D" />
+    <public type="string" name="stage_moderator_join_modal_join_audience" id="0x7F121D0E" />
+    <public type="string" name="stage_moderator_join_modal_join_speaker" id="0x7F121D0F" />
+    <public type="string" name="stage_moderator_join_modal_subtitle" id="0x7F121D10" />
+    <public type="string" name="stage_moderator_join_modal_title" id="0x7F121D11" />
+    <public type="string" name="stage_moderator_tooltip" id="0x7F121D12" />
+    <public type="string" name="stage_settings" id="0x7F121D13" />
+    <public type="string" name="stage_speak_invite_accept" id="0x7F121D14" />
+    <public type="string" name="stage_speak_invite_blocked_users" id="0x7F121D15" />
+    <public type="string" name="stage_speak_invite_decline" id="0x7F121D16" />
+    <public type="string" name="stage_speak_invite_header" id="0x7F121D17" />
+    <public type="string" name="stage_speak_invite_header_blocked_users" id="0x7F121D18" />
+    <public type="string" name="stage_speak_invite_push_notification" id="0x7F121D19" />
+    <public type="string" name="stage_speak_invite_send" id="0x7F121D1A" />
+    <public type="string" name="stage_speaker" id="0x7F121D1B" />
+    <public type="string" name="stage_topic_empty" id="0x7F121D1C" />
+    <public type="string" name="stage_voice_channel" id="0x7F121D1D" />
+    <public type="string" name="start" id="0x7F121D1E" />
+    <public type="string" name="start_call" id="0x7F121D1F" />
+    <public type="string" name="start_scheduled_event" id="0x7F121D20" />
+    <public type="string" name="start_stage_button_text" id="0x7F121D21" />
+    <public type="string" name="start_stage_button_text_mobile" id="0x7F121D22" />
+    <public type="string" name="start_stage_channel_event_members_subtitle" id="0x7F121D23" />
+    <public type="string" name="start_stage_channel_event_members_title" id="0x7F121D24" />
+    <public type="string" name="start_stage_channel_event_modal_button" id="0x7F121D25" />
+    <public type="string" name="start_stage_channel_event_modal_speaker_hint" id="0x7F121D26" />
+    <public type="string" name="start_stage_channel_event_modal_subtitle" id="0x7F121D27" />
+    <public type="string" name="start_stage_channel_event_modal_title" id="0x7F121D28" />
+    <public type="string" name="start_stage_channel_event_modal_topic_label" id="0x7F121D29" />
+    <public type="string" name="start_stage_channel_event_modal_topic_placeholder" id="0x7F121D2A" />
+    <public type="string" name="start_stage_channel_event_modal_topic_required" id="0x7F121D2B" />
+    <public type="string" name="start_stage_channel_event_privacy_title" id="0x7F121D2C" />
+    <public type="string" name="start_stage_channel_event_public_everyone_warning" id="0x7F121D2D" />
+    <public type="string" name="start_stage_channel_event_public_explanation" id="0x7F121D2E" />
+    <public type="string" name="start_stage_channel_event_public_permanent_disclaimer" id="0x7F121D2F" />
+    <public type="string" name="start_stage_channel_event_public_permissions_disclaimer" id="0x7F121D30" />
+    <public type="string" name="start_stage_channel_event_public_subtitle" id="0x7F121D31" />
+    <public type="string" name="start_stage_channel_event_public_title" id="0x7F121D32" />
+    <public type="string" name="start_stage_confirmation_description_different_day" id="0x7F121D33" />
+    <public type="string" name="start_stage_confirmation_description_same_day" id="0x7F121D34" />
+    <public type="string" name="start_stage_confirmation_title" id="0x7F121D35" />
+    <public type="string" name="start_stage_modal_confirm_text" id="0x7F121D36" />
+    <public type="string" name="start_stage_modal_select_channel" id="0x7F121D37" />
+    <public type="string" name="start_stage_modal_server_modal_label" id="0x7F121D38" />
+    <public type="string" name="start_stage_modal_server_selection_bullet_1" id="0x7F121D39" />
+    <public type="string" name="start_stage_modal_server_selection_bullet_2" id="0x7F121D3A" />
+    <public type="string" name="start_stage_modal_server_selection_bullet_3" id="0x7F121D3B" />
+    <public type="string" name="start_stage_modal_server_selection_bullet_4" id="0x7F121D3C" />
+    <public type="string" name="start_stage_modal_server_selection_button_hint" id="0x7F121D3D" />
+    <public type="string" name="start_stage_modal_server_selection_button_text" id="0x7F121D3E" />
+    <public type="string" name="start_stage_modal_server_selection_empty_title" id="0x7F121D3F" />
+    <public type="string" name="start_stage_modal_server_selection_subtitle" id="0x7F121D40" />
+    <public type="string" name="start_stage_modal_server_selection_title" id="0x7F121D41" />
+    <public type="string" name="start_stage_modal_set_topic_change_channel" id="0x7F121D42" />
+    <public type="string" name="start_stage_modal_set_topic_create_channel" id="0x7F121D43" />
+    <public type="string" name="start_stage_modal_set_topic_help_text" id="0x7F121D44" />
+    <public type="string" name="start_stage_modal_set_topic_select_label" id="0x7F121D45" />
+    <public type="string" name="start_stage_modal_set_topic_subtitle" id="0x7F121D46" />
+    <public type="string" name="start_stage_modal_set_topic_title" id="0x7F121D47" />
+    <public type="string" name="start_stage_public_confirm" id="0x7F121D48" />
+    <public type="string" name="start_stage_public_info_alt_text" id="0x7F121D49" />
+    <public type="string" name="start_stage_public_info_section_four" id="0x7F121D4A" />
+    <public type="string" name="start_stage_public_info_section_one" id="0x7F121D4B" />
+    <public type="string" name="start_stage_public_info_section_three" id="0x7F121D4C" />
+    <public type="string" name="start_stage_public_info_section_two" id="0x7F121D4D" />
+    <public type="string" name="start_stage_public_info_title" id="0x7F121D4E" />
+    <public type="string" name="start_stage_public_info_title_caption" id="0x7F121D4F" />
+    <public type="string" name="start_stage_public_short_topic_warning" id="0x7F121D50" />
+    <public type="string" name="start_video_call" id="0x7F121D51" />
+    <public type="string" name="start_voice_call" id="0x7F121D52" />
+    <public type="string" name="starting_at" id="0x7F121D53" />
+    <public type="string" name="status_bar_notification_info_overflow" id="0x7F121D54" />
+    <public type="string" name="status_dnd" id="0x7F121D55" />
+    <public type="string" name="status_dnd_help" id="0x7F121D56" />
+    <public type="string" name="status_idle" id="0x7F121D57" />
+    <public type="string" name="status_invisible" id="0x7F121D58" />
+    <public type="string" name="status_invisible_helper" id="0x7F121D59" />
+    <public type="string" name="status_offline" id="0x7F121D5A" />
+    <public type="string" name="status_online" id="0x7F121D5B" />
+    <public type="string" name="status_online_mobile" id="0x7F121D5C" />
+    <public type="string" name="status_streaming" id="0x7F121D5D" />
+    <public type="string" name="status_unknown" id="0x7F121D5E" />
+    <public type="string" name="step_number" id="0x7F121D5F" />
+    <public type="string" name="sticker" id="0x7F121D60" />
+    <public type="string" name="sticker_a11y_label" id="0x7F121D61" />
+    <public type="string" name="sticker_asset_load_error" id="0x7F121D62" />
+    <public type="string" name="sticker_button_label" id="0x7F121D63" />
+    <public type="string" name="sticker_category_a11y_label" id="0x7F121D64" />
+    <public type="string" name="sticker_category_recent" id="0x7F121D65" />
+    <public type="string" name="sticker_from_pack" id="0x7F121D66" />
+    <public type="string" name="sticker_notification_body" id="0x7F121D67" />
+    <public type="string" name="sticker_pack_available_with_premium" id="0x7F121D68" />
+    <public type="string" name="sticker_pack_get_premium" id="0x7F121D69" />
+    <public type="string" name="sticker_pack_premium_cta" id="0x7F121D6A" />
+    <public type="string" name="sticker_pack_price_free" id="0x7F121D6B" />
+    <public type="string" name="sticker_pack_price_free_with_premium_tier_1" id="0x7F121D6C" />
+    <public type="string" name="sticker_pack_price_free_with_premium_tier_2" id="0x7F121D6D" />
+    <public type="string" name="sticker_pack_sticker_count" id="0x7F121D6E" />
+    <public type="string" name="sticker_pack_view" id="0x7F121D6F" />
+    <public type="string" name="sticker_picker_categories_recent" id="0x7F121D70" />
+    <public type="string" name="sticker_picker_discounted_free_android" id="0x7F121D71" />
+    <public type="string" name="sticker_picker_discounted_price_android" id="0x7F121D72" />
+    <public type="string" name="sticker_picker_empty_state_subtitle" id="0x7F121D73" />
+    <public type="string" name="sticker_picker_empty_state_subtitle_browse" id="0x7F121D74" />
+    <public type="string" name="sticker_picker_empty_state_subtitle_mobile" id="0x7F121D75" />
+    <public type="string" name="sticker_picker_empty_state_title" id="0x7F121D76" />
+    <public type="string" name="sticker_picker_owned_pack" id="0x7F121D77" />
+    <public type="string" name="sticker_picker_pack_details" id="0x7F121D78" />
+    <public type="string" name="sticker_picker_pack_details_animated" id="0x7F121D79" />
+    <public type="string" name="sticker_picker_pack_details_limited_time_left" id="0x7F121D7A" />
+    <public type="string" name="sticker_picker_pack_details_premium" id="0x7F121D7B" />
+    <public type="string" name="sticker_picker_pack_expiring_soon" id="0x7F121D7C" />
+    <public type="string" name="sticker_picker_premium_empty_state_cta" id="0x7F121D7D" />
+    <public type="string" name="sticker_picker_premium_empty_state_subtitle" id="0x7F121D7E" />
+    <public type="string" name="sticker_picker_premium_empty_state_title" id="0x7F121D7F" />
+    <public type="string" name="sticker_picker_price_with_premium_tier_2" id="0x7F121D80" />
+    <public type="string" name="sticker_picker_view_all" id="0x7F121D81" />
+    <public type="string" name="sticker_popout_countdown_header" id="0x7F121D82" />
+    <public type="string" name="sticker_popout_current_guild_description" id="0x7F121D83" />
+    <public type="string" name="sticker_popout_join_server" id="0x7F121D84" />
+    <public type="string" name="sticker_popout_joined_guild_description" id="0x7F121D85" />
+    <public type="string" name="sticker_popout_joined_guild_emoji_description" id="0x7F121D86" />
+    <public type="string" name="sticker_popout_pack_info" id="0x7F121D87" />
+    <public type="string" name="sticker_popout_pack_info_nonpremium" id="0x7F121D88" />
+    <public type="string" name="sticker_popout_pack_info_premium" id="0x7F121D89" />
+    <public type="string" name="sticker_popout_pack_info_unavailable" id="0x7F121D8A" />
+    <public type="string" name="sticker_popout_premium_current_guild_description" id="0x7F121D8B" />
+    <public type="string" name="sticker_popout_premium_joined_guild_description" id="0x7F121D8C" />
+    <public type="string" name="sticker_popout_premium_unjoined_discoverable_guild_description" id="0x7F121D8D" />
+    <public type="string" name="sticker_popout_premium_unjoined_private_guild_description" id="0x7F121D8E" />
+    <public type="string" name="sticker_popout_private_server" id="0x7F121D8F" />
+    <public type="string" name="sticker_popout_public_server" id="0x7F121D90" />
+    <public type="string" name="sticker_popout_unjoined_discoverable_guild_description" id="0x7F121D91" />
+    <public type="string" name="sticker_popout_unjoined_guild_emoji_description" id="0x7F121D92" />
+    <public type="string" name="sticker_popout_unjoined_private_guild_description" id="0x7F121D93" />
+    <public type="string" name="sticker_premium_tier_1_upsell_alert_upgrade_cta" id="0x7F121D94" />
+    <public type="string" name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount" id="0x7F121D95" />
+    <public type="string" name="sticker_premium_tier_1_upsell_perk_premium_subscription" id="0x7F121D96" />
+    <public type="string" name="sticker_premium_tier_2_upsell_alert_description" id="0x7F121D97" />
+    <public type="string" name="sticker_premium_tier_2_upsell_alert_perks_guild_subscriptions" id="0x7F121D98" />
+    <public type="string" name="sticker_premium_tier_2_upsell_alert_perks_misc" id="0x7F121D99" />
+    <public type="string" name="sticker_premium_tier_2_upsell_alert_title" id="0x7F121D9A" />
+    <public type="string" name="sticker_premium_tier_2_upsell_alert_upgrade_cta" id="0x7F121D9B" />
+    <public type="string" name="sticker_premium_tier_2_upsell_perk_discount" id="0x7F121D9C" />
+    <public type="string" name="sticker_premium_tier_2_upsell_perk_guild_subscription" id="0x7F121D9D" />
+    <public type="string" name="sticker_premium_tier_2_upsell_perk_premium_pack" id="0x7F121D9E" />
+    <public type="string" name="sticker_premium_tier_2_upsell_perk_premium_subscription" id="0x7F121D9F" />
+    <public type="string" name="sticker_premium_tier_2_upsell_perk_quantity" id="0x7F121DA0" />
+    <public type="string" name="sticker_purchase_modal_confirm_body_content" id="0x7F121DA1" />
+    <public type="string" name="sticker_purchase_modal_confirm_body_header" id="0x7F121DA2" />
+    <public type="string" name="sticker_purchase_modal_header" id="0x7F121DA3" />
+    <public type="string" name="sticker_view_more_stickers" id="0x7F121DA4" />
+    <public type="string" name="stickers_always_animate" id="0x7F121DA5" />
+    <public type="string" name="stickers_animate_on_interaction" id="0x7F121DA6" />
+    <public type="string" name="stickers_animate_on_interaction_description" id="0x7F121DA7" />
+    <public type="string" name="stickers_auto_play_heading" id="0x7F121DA8" />
+    <public type="string" name="stickers_auto_play_help" id="0x7F121DA9" />
+    <public type="string" name="stickers_auto_play_help_disabled" id="0x7F121DAA" />
+    <public type="string" name="stickers_gift_inventory_title_month" id="0x7F121DAB" />
+    <public type="string" name="stickers_gift_inventory_title_year" id="0x7F121DAC" />
+    <public type="string" name="stickers_matching" id="0x7F121DAD" />
+    <public type="string" name="stickers_matching_ios" id="0x7F121DAE" />
+    <public type="string" name="stickers_never_animate" id="0x7F121DAF" />
+    <public type="string" name="stickers_you_might_like" id="0x7F121DB0" />
+    <public type="string" name="stickers_you_might_like_a11y" id="0x7F121DB1" />
+    <public type="string" name="still_indexing" id="0x7F121DB2" />
+    <public type="string" name="stop" id="0x7F121DB3" />
+    <public type="string" name="stop_ringing" id="0x7F121DB4" />
+    <public type="string" name="stop_ringing_username_a11y_label" id="0x7F121DB5" />
+    <public type="string" name="stop_speaking_message" id="0x7F121DB6" />
+    <public type="string" name="stop_streaming" id="0x7F121DB7" />
+    <public type="string" name="stop_watching" id="0x7F121DB8" />
+    <public type="string" name="stop_watching_user" id="0x7F121DB9" />
+    <public type="string" name="storage_permission_denied" id="0x7F121DBA" />
+    <public type="string" name="store_channel" id="0x7F121DBB" />
+    <public type="string" name="stream_actions_menu_label" id="0x7F121DBC" />
+    <public type="string" name="stream_bad_spectator" id="0x7F121DBD" />
+    <public type="string" name="stream_bad_streamer" id="0x7F121DBE" />
+    <public type="string" name="stream_capture_paused" id="0x7F121DBF" />
+    <public type="string" name="stream_capture_paused_details" id="0x7F121DC0" />
+    <public type="string" name="stream_capture_paused_details_viewer" id="0x7F121DC1" />
+    <public type="string" name="stream_channel_description" id="0x7F121DC2" />
+    <public type="string" name="stream_description" id="0x7F121DC3" />
+    <public type="string" name="stream_ended" id="0x7F121DC4" />
+    <public type="string" name="stream_failed_description" id="0x7F121DC5" />
+    <public type="string" name="stream_failed_title" id="0x7F121DC6" />
+    <public type="string" name="stream_fps_option" id="0x7F121DC7" />
+    <public type="string" name="stream_full_modal_body" id="0x7F121DC8" />
+    <public type="string" name="stream_full_modal_header" id="0x7F121DC9" />
+    <public type="string" name="stream_issue_modal_header" id="0x7F121DCA" />
+    <public type="string" name="stream_network_quality_error" id="0x7F121DCB" />
+    <public type="string" name="stream_no_preview" id="0x7F121DCC" />
+    <public type="string" name="stream_participants_hidden" id="0x7F121DCD" />
+    <public type="string" name="stream_playing" id="0x7F121DCE" />
+    <public type="string" name="stream_premium_upsell_body" id="0x7F121DCF" />
+    <public type="string" name="stream_premium_upsell_body_no_cta" id="0x7F121DD0" />
+    <public type="string" name="stream_premium_upsell_cta" id="0x7F121DD1" />
+    <public type="string" name="stream_premium_upsell_header" id="0x7F121DD2" />
+    <public type="string" name="stream_preset_custom" id="0x7F121DD3" />
+    <public type="string" name="stream_preset_documents" id="0x7F121DD4" />
+    <public type="string" name="stream_preset_documents_description_nitro" id="0x7F121DD5" />
+    <public type="string" name="stream_preset_documents_description_non_nitro" id="0x7F121DD6" />
+    <public type="string" name="stream_preset_video" id="0x7F121DD7" />
+    <public type="string" name="stream_preview_loading" id="0x7F121DD8" />
+    <public type="string" name="stream_preview_paused" id="0x7F121DD9" />
+    <public type="string" name="stream_preview_paused_subtext" id="0x7F121DDA" />
+    <public type="string" name="stream_quality" id="0x7F121DDB" />
+    <public type="string" name="stream_quality_unlock" id="0x7F121DDC" />
+    <public type="string" name="stream_reconnecting_error" id="0x7F121DDD" />
+    <public type="string" name="stream_reconnecting_error_subtext" id="0x7F121DDE" />
+    <public type="string" name="stream_report_a_problem" id="0x7F121DDF" />
+    <public type="string" name="stream_report_a_problem_post_stream" id="0x7F121DE0" />
+    <public type="string" name="stream_report_audio_missing" id="0x7F121DE1" />
+    <public type="string" name="stream_report_audio_poor" id="0x7F121DE2" />
+    <public type="string" name="stream_report_black" id="0x7F121DE3" />
+    <public type="string" name="stream_report_blurry" id="0x7F121DE4" />
+    <public type="string" name="stream_report_ended_audio_missing" id="0x7F121DE5" />
+    <public type="string" name="stream_report_ended_audio_poor" id="0x7F121DE6" />
+    <public type="string" name="stream_report_ended_black" id="0x7F121DE7" />
+    <public type="string" name="stream_report_ended_blurry" id="0x7F121DE8" />
+    <public type="string" name="stream_report_ended_lagging" id="0x7F121DE9" />
+    <public type="string" name="stream_report_ended_out_of_sync" id="0x7F121DEA" />
+    <public type="string" name="stream_report_ended_stream_stopped_unexpectedly" id="0x7F121DEB" />
+    <public type="string" name="stream_report_game_issue" id="0x7F121DEC" />
+    <public type="string" name="stream_report_label" id="0x7F121DED" />
+    <public type="string" name="stream_report_lagging" id="0x7F121DEE" />
+    <public type="string" name="stream_report_out_of_sync" id="0x7F121DEF" />
+    <public type="string" name="stream_report_placeholder" id="0x7F121DF0" />
+    <public type="string" name="stream_report_problem" id="0x7F121DF1" />
+    <public type="string" name="stream_report_problem_body" id="0x7F121DF2" />
+    <public type="string" name="stream_report_problem_header_mobile" id="0x7F121DF3" />
+    <public type="string" name="stream_report_problem_menu_item" id="0x7F121DF4" />
+    <public type="string" name="stream_report_problem_mobile" id="0x7F121DF5" />
+    <public type="string" name="stream_report_rating_body" id="0x7F121DF6" />
+    <public type="string" name="stream_report_rating_body_streamer" id="0x7F121DF7" />
+    <public type="string" name="stream_report_submit" id="0x7F121DF8" />
+    <public type="string" name="stream_reported" id="0x7F121DF9" />
+    <public type="string" name="stream_reported_body" id="0x7F121DFA" />
+    <public type="string" name="stream_resolution" id="0x7F121DFB" />
+    <public type="string" name="stream_show_all_participants" id="0x7F121DFC" />
+    <public type="string" name="stream_show_non_video" id="0x7F121DFD" />
+    <public type="string" name="stream_single_person_body" id="0x7F121DFE" />
+    <public type="string" name="stream_single_person_body_alt" id="0x7F121DFF" />
+    <public type="string" name="stream_single_person_invite" id="0x7F121E00" />
+    <public type="string" name="stream_single_person_no_invite" id="0x7F121E01" />
+    <public type="string" name="stream_soundshare_failed" id="0x7F121E02" />
+    <public type="string" name="stream_volume" id="0x7F121E03" />
+    <public type="string" name="stream_watch_multiple_tooltip" id="0x7F121E04" />
+    <public type="string" name="streamer_mode" id="0x7F121E05" />
+    <public type="string" name="streamer_mode_enabled" id="0x7F121E06" />
+    <public type="string" name="streamer_playing" id="0x7F121E07" />
+    <public type="string" name="streamer_settings_title" id="0x7F121E08" />
+    <public type="string" name="streaming" id="0x7F121E09" />
+    <public type="string" name="streaming_a_game" id="0x7F121E0A" />
+    <public type="string" name="sub_enabled_servers" id="0x7F121E0B" />
+    <public type="string" name="submit" id="0x7F121E0C" />
+    <public type="string" name="submit_bug" id="0x7F121E0D" />
+    <public type="string" name="subscriber_information" id="0x7F121E0E" />
+    <public type="string" name="subscription_payment_legalese_monthly" id="0x7F121E0F" />
+    <public type="string" name="subscription_payment_legalese_yearly" id="0x7F121E10" />
+    <public type="string" name="subscription_survey_prompt" id="0x7F121E11" />
+    <public type="string" name="subscriptions_title" id="0x7F121E12" />
+    <public type="string" name="suggested_friends_list_header" id="0x7F121E13" />
+    <public type="string" name="suggestions" id="0x7F121E14" />
+    <public type="string" name="summary_collapsed_preference_list" id="0x7F121E15" />
+    <public type="string" name="support" id="0x7F121E16" />
+    <public type="string" name="suppress_all_embeds" id="0x7F121E17" />
+    <public type="string" name="suppress_embed_body" id="0x7F121E18" />
+    <public type="string" name="suppress_embed_confirm" id="0x7F121E19" />
+    <public type="string" name="suppress_embed_tip" id="0x7F121E1A" />
+    <public type="string" name="suppress_embed_title" id="0x7F121E1B" />
+    <public type="string" name="suppressed" id="0x7F121E1C" />
+    <public type="string" name="suppressed_afk_body" id="0x7F121E1D" />
+    <public type="string" name="suppressed_afk_title" id="0x7F121E1E" />
+    <public type="string" name="suppressed_permission_body" id="0x7F121E1F" />
+    <public type="string" name="sv_se" id="0x7F121E20" />
+    <public type="string" name="switch_audio_output" id="0x7F121E21" />
+    <public type="string" name="switch_hardware_acceleration" id="0x7F121E22" />
+    <public type="string" name="switch_hardware_acceleration_body" id="0x7F121E23" />
+    <public type="string" name="switch_pip_to_activity" id="0x7F121E24" />
+    <public type="string" name="switch_pip_to_activity_name" id="0x7F121E25" />
+    <public type="string" name="switch_pip_to_go_live" id="0x7F121E26" />
+    <public type="string" name="switch_pip_to_user_stream" id="0x7F121E27" />
+    <public type="string" name="switch_subsystem" id="0x7F121E28" />
+    <public type="string" name="switch_subsystem_body" id="0x7F121E29" />
+    <public type="string" name="switch_to_compact_mode" id="0x7F121E2A" />
+    <public type="string" name="switch_to_cozy_mode" id="0x7F121E2B" />
+    <public type="string" name="switch_to_dark_theme" id="0x7F121E2C" />
+    <public type="string" name="switch_to_light_theme" id="0x7F121E2D" />
+    <public type="string" name="switch_to_push_to_talk" id="0x7F121E2E" />
+    <public type="string" name="switch_to_voice_activity" id="0x7F121E2F" />
+    <public type="string" name="sync" id="0x7F121E30" />
+    <public type="string" name="sync_across_clients_appearance_help" id="0x7F121E31" />
+    <public type="string" name="sync_across_clients_text" id="0x7F121E32" />
+    <public type="string" name="sync_across_clients_text_help" id="0x7F121E33" />
+    <public type="string" name="sync_friends" id="0x7F121E34" />
+    <public type="string" name="sync_now" id="0x7F121E35" />
+    <public type="string" name="sync_permissions" id="0x7F121E36" />
+    <public type="string" name="sync_permissions_explanation" id="0x7F121E37" />
+    <public type="string" name="sync_revoked" id="0x7F121E38" />
+    <public type="string" name="sync_this_account" id="0x7F121E39" />
+    <public type="string" name="system_dm_activity_text" id="0x7F121E3A" />
+    <public type="string" name="system_dm_channel_description" id="0x7F121E3B" />
+    <public type="string" name="system_dm_channel_description_subtext" id="0x7F121E3C" />
+    <public type="string" name="system_dm_empty_message" id="0x7F121E3D" />
+    <public type="string" name="system_dm_tag_system" id="0x7F121E3E" />
+    <public type="string" name="system_dm_urgent_message_modal_body" id="0x7F121E3F" />
+    <public type="string" name="system_dm_urgent_message_modal_header" id="0x7F121E40" />
+    <public type="string" name="system_keyboard" id="0x7F121E41" />
+    <public type="string" name="system_message_application_command_reply" id="0x7F121E42" />
+    <public type="string" name="system_message_application_command_used" id="0x7F121E43" />
+    <public type="string" name="system_message_application_command_used_as_title" id="0x7F121E44" />
+    <public type="string" name="system_message_application_command_used_mobile" id="0x7F121E45" />
+    <public type="string" name="system_message_application_command_used_short_mobile" id="0x7F121E46" />
+    <public type="string" name="system_message_call_missed" id="0x7F121E47" />
+    <public type="string" name="system_message_call_missed_with_duration" id="0x7F121E48" />
+    <public type="string" name="system_message_call_started" id="0x7F121E49" />
+    <public type="string" name="system_message_call_started_with_duration" id="0x7F121E4A" />
+    <public type="string" name="system_message_channel_follow_add" id="0x7F121E4B" />
+    <public type="string" name="system_message_channel_follow_add_ios" id="0x7F121E4C" />
+    <public type="string" name="system_message_channel_icon_change" id="0x7F121E4D" />
+    <public type="string" name="system_message_channel_name_change" id="0x7F121E4E" />
+    <public type="string" name="system_message_channel_name_change2" id="0x7F121E4F" />
+    <public type="string" name="system_message_guild_bot_join" id="0x7F121E50" />
+    <public type="string" name="system_message_guild_discovery_disqualified" id="0x7F121E51" />
+    <public type="string" name="system_message_guild_discovery_disqualified_mobile" id="0x7F121E52" />
+    <public type="string" name="system_message_guild_discovery_grace_period_final_warning" id="0x7F121E53" />
+    <public type="string" name="system_message_guild_discovery_grace_period_initial_warning" id="0x7F121E54" />
+    <public type="string" name="system_message_guild_discovery_requalified" id="0x7F121E55" />
+    <public type="string" name="system_message_guild_member_join_001" id="0x7F121E56" />
+    <public type="string" name="system_message_guild_member_join_002" id="0x7F121E57" />
+    <public type="string" name="system_message_guild_member_join_003" id="0x7F121E58" />
+    <public type="string" name="system_message_guild_member_join_004" id="0x7F121E59" />
+    <public type="string" name="system_message_guild_member_join_005" id="0x7F121E5A" />
+    <public type="string" name="system_message_guild_member_join_006" id="0x7F121E5B" />
+    <public type="string" name="system_message_guild_member_join_007" id="0x7F121E5C" />
+    <public type="string" name="system_message_guild_member_join_008" id="0x7F121E5D" />
+    <public type="string" name="system_message_guild_member_join_009" id="0x7F121E5E" />
+    <public type="string" name="system_message_guild_member_join_010" id="0x7F121E5F" />
+    <public type="string" name="system_message_guild_member_join_011" id="0x7F121E60" />
+    <public type="string" name="system_message_guild_member_join_012" id="0x7F121E61" />
+    <public type="string" name="system_message_guild_member_join_013" id="0x7F121E62" />
+    <public type="string" name="system_message_guild_member_subscribed" id="0x7F121E63" />
+    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7F121E64" />
+    <public type="string" name="system_message_guild_member_subscribed_many" id="0x7F121E65" />
+    <public type="string" name="system_message_guild_member_subscribed_many_achieved_tier" id="0x7F121E66" />
+    <public type="string" name="system_message_guild_stream_active" id="0x7F121E67" />
+    <public type="string" name="system_message_guild_stream_active_android" id="0x7F121E68" />
+    <public type="string" name="system_message_guild_stream_active_mobile" id="0x7F121E69" />
+    <public type="string" name="system_message_guild_stream_active_no_activity" id="0x7F121E6A" />
+    <public type="string" name="system_message_guild_stream_ended" id="0x7F121E6B" />
+    <public type="string" name="system_message_guild_stream_ended_mobile" id="0x7F121E6C" />
+    <public type="string" name="system_message_invite_notification" id="0x7F121E6D" />
+    <public type="string" name="system_message_invite_users" id="0x7F121E6E" />
+    <public type="string" name="system_message_invite_users_button" id="0x7F121E6F" />
+    <public type="string" name="system_message_invite_users_compact" id="0x7F121E70" />
+    <public type="string" name="system_message_invite_users_description" id="0x7F121E71" />
+    <public type="string" name="system_message_invite_users_description_owner" id="0x7F121E72" />
+    <public type="string" name="system_message_invite_users_owner" id="0x7F121E73" />
+    <public type="string" name="system_message_invite_users_owner_compact" id="0x7F121E74" />
+    <public type="string" name="system_message_join_call" id="0x7F121E75" />
+    <public type="string" name="system_message_manage_settings" id="0x7F121E76" />
+    <public type="string" name="system_message_pinned_message" id="0x7F121E77" />
+    <public type="string" name="system_message_pinned_message_mobile" id="0x7F121E78" />
+    <public type="string" name="system_message_pinned_message_no_cta" id="0x7F121E79" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7F121E7A" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted_with_message" id="0x7F121E7B" />
+    <public type="string" name="system_message_pinned_message_with_message" id="0x7F121E7C" />
+    <public type="string" name="system_message_recipient_add" id="0x7F121E7D" />
+    <public type="string" name="system_message_recipient_remove" id="0x7F121E7E" />
+    <public type="string" name="system_message_recipient_remove_self" id="0x7F121E7F" />
+    <public type="string" name="system_message_thread_created" id="0x7F121E80" />
+    <public type="string" name="system_message_thread_created_mobile" id="0x7F121E81" />
+    <public type="string" name="system_message_thread_member_add" id="0x7F121E82" />
+    <public type="string" name="system_message_thread_member_add_mobile" id="0x7F121E83" />
+    <public type="string" name="system_message_thread_member_remove" id="0x7F121E84" />
+    <public type="string" name="system_message_thread_member_remove_mobile" id="0x7F121E85" />
+    <public type="string" name="system_message_thread_member_remove_self" id="0x7F121E86" />
+    <public type="string" name="system_message_thread_member_remove_self_mobile" id="0x7F121E87" />
+    <public type="string" name="system_permission_grant" id="0x7F121E88" />
+    <public type="string" name="system_permission_request_camera" id="0x7F121E89" />
+    <public type="string" name="system_permission_request_files" id="0x7F121E8A" />
+    <public type="string" name="tab_bar" id="0x7F121E8B" />
+    <public type="string" name="tabs_friends_accessibility_label" id="0x7F121E8C" />
+    <public type="string" name="tabs_home_accessibility_label" id="0x7F121E8D" />
+    <public type="string" name="tabs_mentions_accessibility_label" id="0x7F121E8E" />
+    <public type="string" name="tabs_search_accessibility_label" id="0x7F121E8F" />
+    <public type="string" name="tabs_settings_accessibility_label" id="0x7F121E90" />
+    <public type="string" name="take_a_photo" id="0x7F121E91" />
+    <public type="string" name="take_me_there" id="0x7F121E92" />
+    <public type="string" name="take_survey" id="0x7F121E93" />
+    <public type="string" name="tan" id="0x7F121E94" />
+    <public type="string" name="tap_add_nickname" id="0x7F121E95" />
+    <public type="string" name="tar_gz" id="0x7F121E96" />
+    <public type="string" name="teal" id="0x7F121E97" />
+    <public type="string" name="temporary_membership_explanation" id="0x7F121E98" />
+    <public type="string" name="terms_and_conditions" id="0x7F121E99" />
+    <public type="string" name="terms_of_service" id="0x7F121E9A" />
+    <public type="string" name="terms_of_service_url" id="0x7F121E9B" />
+    <public type="string" name="terms_privacy" id="0x7F121E9C" />
+    <public type="string" name="terms_privacy_opt_in" id="0x7F121E9D" />
+    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7F121E9E" />
+    <public type="string" name="terracotta" id="0x7F121E9F" />
+    <public type="string" name="test_newlines_key" id="0x7F121EA0" />
+    <public type="string" name="test_video" id="0x7F121EA1" />
+    <public type="string" name="text" id="0x7F121EA2" />
+    <public type="string" name="text_actions_menu_label" id="0x7F121EA3" />
+    <public type="string" name="text_and_images" id="0x7F121EA4" />
+    <public type="string" name="text_channel" id="0x7F121EA5" />
+    <public type="string" name="text_channel_desc" id="0x7F121EA6" />
+    <public type="string" name="text_channels" id="0x7F121EA7" />
+    <public type="string" name="text_channels_matching" id="0x7F121EA8" />
+    <public type="string" name="text_permissions" id="0x7F121EA9" />
+    <public type="string" name="textarea_actions_menu_label" id="0x7F121EAA" />
+    <public type="string" name="textarea_placeholder" id="0x7F121EAB" />
+    <public type="string" name="th" id="0x7F121EAC" />
+    <public type="string" name="theme" id="0x7F121EAD" />
+    <public type="string" name="theme_dark" id="0x7F121EAE" />
+    <public type="string" name="theme_holy_light_reveal" id="0x7F121EAF" />
+    <public type="string" name="theme_light" id="0x7F121EB0" />
+    <public type="string" name="theme_pure_evil_easter_hint" id="0x7F121EB1" />
+    <public type="string" name="theme_pure_evil_easter_reveal" id="0x7F121EB2" />
+    <public type="string" name="theme_pure_evil_switch_label" id="0x7F121EB3" />
+    <public type="string" name="theme_pure_evil_updated" id="0x7F121EB4" />
+    <public type="string" name="theme_system" id="0x7F121EB5" />
+    <public type="string" name="theme_updated" id="0x7F121EB6" />
+    <public type="string" name="this_server" id="0x7F121EB7" />
+    <public type="string" name="this_server_named" id="0x7F121EB8" />
+    <public type="string" name="thread" id="0x7F121EB9" />
+    <public type="string" name="thread_actions_menu_label" id="0x7F121EBA" />
+    <public type="string" name="thread_archived" id="0x7F121EBB" />
+    <public type="string" name="thread_browser_active" id="0x7F121EBC" />
+    <public type="string" name="thread_browser_archive_time" id="0x7F121EBD" />
+    <public type="string" name="thread_browser_archived" id="0x7F121EBE" />
+    <public type="string" name="thread_browser_creation_time" id="0x7F121EBF" />
+    <public type="string" name="thread_browser_empty_state_active_header" id="0x7F121EC0" />
+    <public type="string" name="thread_browser_empty_state_archived_header" id="0x7F121EC1" />
+    <public type="string" name="thread_browser_empty_state_subtext" id="0x7F121EC2" />
+    <public type="string" name="thread_browser_filter_content_description" id="0x7F121EC3" />
+    <public type="string" name="thread_browser_filter_settings_title" id="0x7F121EC4" />
+    <public type="string" name="thread_browser_filter_settings_visibility" id="0x7F121EC5" />
+    <public type="string" name="thread_browser_joined_header" id="0x7F121EC6" />
+    <public type="string" name="thread_browser_message_preview" id="0x7F121EC7" />
+    <public type="string" name="thread_browser_no_recent_messages" id="0x7F121EC8" />
+    <public type="string" name="thread_browser_other_header" id="0x7F121EC9" />
+    <public type="string" name="thread_browser_private" id="0x7F121ECA" />
+    <public type="string" name="thread_browser_private_header" id="0x7F121ECB" />
+    <public type="string" name="thread_browser_public" id="0x7F121ECC" />
+    <public type="string" name="thread_browser_public_header" id="0x7F121ECD" />
+    <public type="string" name="thread_browser_started_by" id="0x7F121ECE" />
+    <public type="string" name="thread_browser_timestamp_days" id="0x7F121ECF" />
+    <public type="string" name="thread_browser_timestamp_hours" id="0x7F121ED0" />
+    <public type="string" name="thread_browser_timestamp_minutes" id="0x7F121ED1" />
+    <public type="string" name="thread_browser_timestamp_more_than_month" id="0x7F121ED2" />
+    <public type="string" name="thread_browser_title" id="0x7F121ED3" />
+    <public type="string" name="thread_header_notice_archived" id="0x7F121ED4" />
+    <public type="string" name="thread_header_notice_join" id="0x7F121ED5" />
+    <public type="string" name="thread_header_notice_locked" id="0x7F121ED6" />
+    <public type="string" name="thread_member_list_empty_state_header" id="0x7F121ED7" />
+    <public type="string" name="thread_member_list_empty_state_subtext" id="0x7F121ED8" />
+    <public type="string" name="thread_member_without_access" id="0x7F121ED9" />
+    <public type="string" name="thread_message_count" id="0x7F121EDA" />
+    <public type="string" name="thread_message_count_max" id="0x7F121EDB" />
+    <public type="string" name="thread_message_count_max_mobile" id="0x7F121EDC" />
+    <public type="string" name="thread_message_count_mobile" id="0x7F121EDD" />
+    <public type="string" name="thread_name" id="0x7F121EDE" />
+    <public type="string" name="thread_notification_settings_nudge_cancel" id="0x7F121EDF" />
+    <public type="string" name="thread_notification_settings_nudge_cta" id="0x7F121EE0" />
+    <public type="string" name="thread_notification_settings_nudge_description" id="0x7F121EE1" />
+    <public type="string" name="thread_reply_suggestion" id="0x7F121EE2" />
+    <public type="string" name="thread_settings" id="0x7F121EE3" />
+    <public type="string" name="thread_settings_updated" id="0x7F121EE4" />
+    <public type="string" name="thread_started_by" id="0x7F121EE5" />
+    <public type="string" name="thread_starter_message_not_loaded" id="0x7F121EE6" />
+    <public type="string" name="thread_starter_message_original_message" id="0x7F121EE7" />
+    <public type="string" name="threads" id="0x7F121EE8" />
+    <public type="string" name="three_users_typing" id="0x7F121EE9" />
+    <public type="string" name="timeout_error" id="0x7F121EEA" />
+    <public type="string" name="tip_create_first_server_body3" id="0x7F121EEB" />
+    <public type="string" name="tip_create_first_server_title3" id="0x7F121EEC" />
+    <public type="string" name="tip_create_more_servers_body3" id="0x7F121EED" />
+    <public type="string" name="tip_create_more_servers_title3" id="0x7F121EEE" />
+    <public type="string" name="tip_direct_messages_body3" id="0x7F121EEF" />
+    <public type="string" name="tip_direct_messages_title3" id="0x7F121EF0" />
+    <public type="string" name="tip_friends_list_body3" id="0x7F121EF1" />
+    <public type="string" name="tip_friends_list_title3" id="0x7F121EF2" />
+    <public type="string" name="tip_instant_invite_body3" id="0x7F121EF3" />
+    <public type="string" name="tip_instant_invite_title3" id="0x7F121EF4" />
+    <public type="string" name="tip_organize_by_topic_body3" id="0x7F121EF5" />
+    <public type="string" name="tip_organize_by_topic_title3" id="0x7F121EF6" />
+    <public type="string" name="tip_server_settings_body3" id="0x7F121EF7" />
+    <public type="string" name="tip_server_settings_title3" id="0x7F121EF8" />
+    <public type="string" name="tip_voice_conversations_body3" id="0x7F121EF9" />
+    <public type="string" name="tip_voice_conversations_title3" id="0x7F121EFA" />
+    <public type="string" name="tip_whos_online_body3" id="0x7F121EFB" />
+    <public type="string" name="tip_whos_online_title3" id="0x7F121EFC" />
+    <public type="string" name="tip_writing_messages_body3" id="0x7F121EFD" />
+    <public type="string" name="tip_writing_messages_title3" id="0x7F121EFE" />
+    <public type="string" name="title" id="0x7F121EFF" />
+    <public type="string" name="title_bar_close_window" id="0x7F121F00" />
+    <public type="string" name="title_bar_fullscreen_window" id="0x7F121F01" />
+    <public type="string" name="title_bar_maximize_window" id="0x7F121F02" />
+    <public type="string" name="title_bar_minimize_window" id="0x7F121F03" />
+    <public type="string" name="toast_add_friend" id="0x7F121F04" />
+    <public type="string" name="toast_add_friends" id="0x7F121F05" />
+    <public type="string" name="toast_command_copied" id="0x7F121F06" />
+    <public type="string" name="toast_feedback_sent" id="0x7F121F07" />
+    <public type="string" name="toast_gif_saved" id="0x7F121F08" />
+    <public type="string" name="toast_id_copied" id="0x7F121F09" />
+    <public type="string" name="toast_image_saved" id="0x7F121F0A" />
+    <public type="string" name="toast_message_copied" id="0x7F121F0B" />
+    <public type="string" name="toast_message_hiya" id="0x7F121F0C" />
+    <public type="string" name="toast_message_howdy" id="0x7F121F0D" />
+    <public type="string" name="toast_message_id_copied" id="0x7F121F0E" />
+    <public type="string" name="toast_message_oh_hello" id="0x7F121F0F" />
+    <public type="string" name="toast_username_saved" id="0x7F121F10" />
+    <public type="string" name="toast_video_saved" id="0x7F121F11" />
+    <public type="string" name="toggle_camera" id="0x7F121F12" />
+    <public type="string" name="toggle_deafen" id="0x7F121F13" />
+    <public type="string" name="toggle_drawer" id="0x7F121F14" />
+    <public type="string" name="toggle_emoji_keyboard" id="0x7F121F15" />
+    <public type="string" name="toggle_media_keyboard" id="0x7F121F16" />
+    <public type="string" name="toggle_microphone" id="0x7F121F17" />
+    <public type="string" name="toggle_mute" id="0x7F121F18" />
+    <public type="string" name="toggle_screenshare" id="0x7F121F19" />
+    <public type="string" name="token_popout_body" id="0x7F121F1A" />
+    <public type="string" name="too_many_animated_emoji" id="0x7F121F1B" />
+    <public type="string" name="too_many_announcement_threads_message" id="0x7F121F1C" />
+    <public type="string" name="too_many_emoji" id="0x7F121F1D" />
+    <public type="string" name="too_many_members_message" id="0x7F121F1E" />
+    <public type="string" name="too_many_reactions_alert_body" id="0x7F121F1F" />
+    <public type="string" name="too_many_reactions_alert_header" id="0x7F121F20" />
+    <public type="string" name="too_many_threads_message" id="0x7F121F21" />
+    <public type="string" name="too_many_user_guilds_alert_description" id="0x7F121F22" />
+    <public type="string" name="too_many_user_guilds_alert_title" id="0x7F121F23" />
+    <public type="string" name="too_many_user_guilds_description" id="0x7F121F24" />
+    <public type="string" name="too_many_user_guilds_title" id="0x7F121F25" />
+    <public type="string" name="tooltip_community_feature_disabled" id="0x7F121F26" />
+    <public type="string" name="tooltip_discoverable_guild_feature_disabled" id="0x7F121F27" />
+    <public type="string" name="total_members" id="0x7F121F28" />
+    <public type="string" name="total_results" id="0x7F121F29" />
+    <public type="string" name="tr" id="0x7F121F2A" />
+    <public type="string" name="transfer" id="0x7F121F2B" />
+    <public type="string" name="transfer_ownership" id="0x7F121F2C" />
+    <public type="string" name="transfer_ownership_acknowledge" id="0x7F121F2D" />
+    <public type="string" name="transfer_ownership_protected_guild" id="0x7F121F2E" />
+    <public type="string" name="transfer_ownership_to_user" id="0x7F121F2F" />
+    <public type="string" name="trending_arrow_down" id="0x7F121F30" />
+    <public type="string" name="trending_arrow_up" id="0x7F121F31" />
+    <public type="string" name="try_again" id="0x7F121F32" />
+    <public type="string" name="tts_alls" id="0x7F121F33" />
+    <public type="string" name="tts_current" id="0x7F121F34" />
+    <public type="string" name="tts_never" id="0x7F121F35" />
+    <public type="string" name="tutorial_close" id="0x7F121F36" />
+    <public type="string" name="tweet_us" id="0x7F121F37" />
+    <public type="string" name="twitter" id="0x7F121F38" />
+    <public type="string" name="twitter_page_url" id="0x7F121F39" />
+    <public type="string" name="two_fa" id="0x7F121F3A" />
+    <public type="string" name="two_fa_activate" id="0x7F121F3B" />
+    <public type="string" name="two_fa_app_name_authy" id="0x7F121F3C" />
+    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7F121F3D" />
+    <public type="string" name="two_fa_auth_code" id="0x7F121F3E" />
+    <public type="string" name="two_fa_auth_code_no_backup" id="0x7F121F3F" />
+    <public type="string" name="two_fa_backup_code_enter" id="0x7F121F40" />
+    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7F121F41" />
+    <public type="string" name="two_fa_backup_code_hint" id="0x7F121F42" />
+    <public type="string" name="two_fa_backup_code_used" id="0x7F121F43" />
+    <public type="string" name="two_fa_backup_codes_body" id="0x7F121F44" />
+    <public type="string" name="two_fa_backup_codes_label" id="0x7F121F45" />
+    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7F121F46" />
+    <public type="string" name="two_fa_backup_codes_warning" id="0x7F121F47" />
+    <public type="string" name="two_fa_change_account" id="0x7F121F48" />
+    <public type="string" name="two_fa_confirm_body" id="0x7F121F49" />
+    <public type="string" name="two_fa_confirm_confirm" id="0x7F121F4A" />
+    <public type="string" name="two_fa_confirm_title" id="0x7F121F4B" />
+    <public type="string" name="two_fa_description" id="0x7F121F4C" />
+    <public type="string" name="two_fa_disable" id="0x7F121F4D" />
+    <public type="string" name="two_fa_discord_backup_codes" id="0x7F121F4E" />
+    <public type="string" name="two_fa_download_app_body" id="0x7F121F4F" />
+    <public type="string" name="two_fa_download_app_label" id="0x7F121F50" />
+    <public type="string" name="two_fa_download_codes" id="0x7F121F51" />
+    <public type="string" name="two_fa_enable" id="0x7F121F52" />
+    <public type="string" name="two_fa_enable_subheader" id="0x7F121F53" />
+    <public type="string" name="two_fa_enabled" id="0x7F121F54" />
+    <public type="string" name="two_fa_enter_sms_token_label" id="0x7F121F55" />
+    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7F121F56" />
+    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7F121F57" />
+    <public type="string" name="two_fa_enter_token_body" id="0x7F121F58" />
+    <public type="string" name="two_fa_enter_token_label" id="0x7F121F59" />
+    <public type="string" name="two_fa_enter_token_no_backup_label" id="0x7F121F5A" />
+    <public type="string" name="two_fa_generate_codes" id="0x7F121F5B" />
+    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7F121F5C" />
+    <public type="string" name="two_fa_guild_mfa_warning" id="0x7F121F5D" />
+    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7F121F5E" />
+    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7F121F5F" />
+    <public type="string" name="two_fa_guild_mfa_warning_message_with_spacing" id="0x7F121F60" />
+    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7F121F61" />
+    <public type="string" name="two_fa_key" id="0x7F121F62" />
+    <public type="string" name="two_fa_login_body" id="0x7F121F63" />
+    <public type="string" name="two_fa_login_footer" id="0x7F121F64" />
+    <public type="string" name="two_fa_login_label" id="0x7F121F65" />
+    <public type="string" name="two_fa_not_verified" id="0x7F121F66" />
+    <public type="string" name="two_fa_qr_body" id="0x7F121F67" />
+    <public type="string" name="two_fa_qr_label" id="0x7F121F68" />
+    <public type="string" name="two_fa_remove" id="0x7F121F69" />
+    <public type="string" name="two_fa_sales_pitch" id="0x7F121F6A" />
+    <public type="string" name="two_fa_success_body_mobile" id="0x7F121F6B" />
+    <public type="string" name="two_fa_success_header" id="0x7F121F6C" />
+    <public type="string" name="two_fa_token_required" id="0x7F121F6D" />
+    <public type="string" name="two_fa_use_desktop_app" id="0x7F121F6E" />
+    <public type="string" name="two_fa_view_backup_codes" id="0x7F121F6F" />
+    <public type="string" name="two_fa_view_codes" id="0x7F121F70" />
+    <public type="string" name="two_users_typing" id="0x7F121F71" />
+    <public type="string" name="ucrop_crop" id="0x7F121F72" />
+    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7F121F73" />
+    <public type="string" name="ucrop_label_edit_photo" id="0x7F121F74" />
+    <public type="string" name="ucrop_label_original" id="0x7F121F75" />
+    <public type="string" name="ucrop_menu_crop" id="0x7F121F76" />
+    <public type="string" name="ucrop_mutate_exception_hint" id="0x7F121F77" />
+    <public type="string" name="ucrop_rotate" id="0x7F121F78" />
+    <public type="string" name="ucrop_scale" id="0x7F121F79" />
+    <public type="string" name="uk" id="0x7F121F7A" />
+    <public type="string" name="unable_to_join_channel_full" id="0x7F121F7B" />
+    <public type="string" name="unable_to_join_channel_full_modal_body" id="0x7F121F7C" />
+    <public type="string" name="unable_to_join_channel_full_modal_header" id="0x7F121F7D" />
+    <public type="string" name="unable_to_open_media_chooser" id="0x7F121F7E" />
+    <public type="string" name="unable_to_process_image" id="0x7F121F7F" />
+    <public type="string" name="unarchive" id="0x7F121F80" />
+    <public type="string" name="unarchive_thread" id="0x7F121F81" />
+    <public type="string" name="unban" id="0x7F121F82" />
+    <public type="string" name="unban_user_body" id="0x7F121F83" />
+    <public type="string" name="unban_user_title" id="0x7F121F84" />
+    <public type="string" name="unblock" id="0x7F121F85" />
+    <public type="string" name="unblock_to_jump_body" id="0x7F121F86" />
+    <public type="string" name="unblock_to_jump_title" id="0x7F121F87" />
+    <public type="string" name="uncategorized" id="0x7F121F88" />
+    <public type="string" name="unclaimed_account_body" id="0x7F121F89" />
+    <public type="string" name="unclaimed_account_body_2" id="0x7F121F8A" />
+    <public type="string" name="unclaimed_account_title" id="0x7F121F8B" />
+    <public type="string" name="undeafen" id="0x7F121F8C" />
+    <public type="string" name="undo" id="0x7F121F8D" />
+    <public type="string" name="unfocus_participant" id="0x7F121F8E" />
+    <public type="string" name="unhandled_link_body" id="0x7F121F8F" />
+    <public type="string" name="unhandled_link_title" id="0x7F121F90" />
+    <public type="string" name="unicode_emoji_category_shortcut_a11y_label" id="0x7F121F91" />
+    <public type="string" name="unknown_region" id="0x7F121F92" />
+    <public type="string" name="unknown_user" id="0x7F121F93" />
+    <public type="string" name="unmute" id="0x7F121F94" />
+    <public type="string" name="unmute_category" id="0x7F121F95" />
+    <public type="string" name="unmute_channel" id="0x7F121F96" />
+    <public type="string" name="unmute_channel_generic" id="0x7F121F97" />
+    <public type="string" name="unmute_conversation" id="0x7F121F98" />
+    <public type="string" name="unmute_server" id="0x7F121F99" />
+    <public type="string" name="unnamed" id="0x7F121F9A" />
+    <public type="string" name="unpin" id="0x7F121F9B" />
+    <public type="string" name="unpin_confirm" id="0x7F121F9C" />
+    <public type="string" name="unpin_message" id="0x7F121F9D" />
+    <public type="string" name="unpin_message_body" id="0x7F121F9E" />
+    <public type="string" name="unpin_message_context_menu_hint" id="0x7F121F9F" />
+    <public type="string" name="unpin_message_failed_body" id="0x7F121FA0" />
+    <public type="string" name="unpin_message_failed_title" id="0x7F121FA1" />
+    <public type="string" name="unpin_message_title" id="0x7F121FA2" />
+    <public type="string" name="unreads_confirm_mark_all_read_description" id="0x7F121FA3" />
+    <public type="string" name="unreads_confirm_mark_all_read_header" id="0x7F121FA4" />
+    <public type="string" name="unreads_empty_state_header" id="0x7F121FA5" />
+    <public type="string" name="unreads_empty_state_tip" id="0x7F121FA6" />
+    <public type="string" name="unreads_empty_state_tip_mac" id="0x7F121FA7" />
+    <public type="string" name="unreads_mark_read" id="0x7F121FA8" />
+    <public type="string" name="unreads_no_notifications_divider" id="0x7F121FA9" />
+    <public type="string" name="unreads_old_channels_divider" id="0x7F121FAA" />
+    <public type="string" name="unreads_tab_label" id="0x7F121FAB" />
+    <public type="string" name="unreads_tutorial_body" id="0x7F121FAC" />
+    <public type="string" name="unreads_tutorial_header" id="0x7F121FAD" />
+    <public type="string" name="unreads_view_channel" id="0x7F121FAE" />
+    <public type="string" name="unsupported_browser" id="0x7F121FAF" />
+    <public type="string" name="unsupported_browser_body" id="0x7F121FB0" />
+    <public type="string" name="unsupported_browser_details" id="0x7F121FB1" />
+    <public type="string" name="unsupported_browser_title" id="0x7F121FB2" />
+    <public type="string" name="unverified_email_title" id="0x7F121FB3" />
+    <public type="string" name="upcoming_guild_stage_instance_discovery_empty_state_sub_title" id="0x7F121FB4" />
+    <public type="string" name="upcoming_guild_stage_instance_discovery_empty_state_title" id="0x7F121FB5" />
+    <public type="string" name="update_available" id="0x7F121FB6" />
+    <public type="string" name="update_badge_header" id="0x7F121FB7" />
+    <public type="string" name="update_downloaded" id="0x7F121FB8" />
+    <public type="string" name="update_during_call_body" id="0x7F121FB9" />
+    <public type="string" name="update_during_call_continue" id="0x7F121FBA" />
+    <public type="string" name="update_during_call_title" id="0x7F121FBB" />
+    <public type="string" name="update_manually" id="0x7F121FBC" />
+    <public type="string" name="upload" id="0x7F121FBD" />
+    <public type="string" name="upload_a_media_file" id="0x7F121FBE" />
+    <public type="string" name="upload_area_always_compress" id="0x7F121FBF" />
+    <public type="string" name="upload_area_always_compress_desc" id="0x7F121FC0" />
+    <public type="string" name="upload_area_cancel_all" id="0x7F121FC1" />
+    <public type="string" name="upload_area_filename" id="0x7F121FC2" />
+    <public type="string" name="upload_area_help" id="0x7F121FC3" />
+    <public type="string" name="upload_area_invalid_file_type_help" id="0x7F121FC4" />
+    <public type="string" name="upload_area_invalid_file_type_title" id="0x7F121FC5" />
+    <public type="string" name="upload_area_leave_a_comment" id="0x7F121FC6" />
+    <public type="string" name="upload_area_optional" id="0x7F121FC7" />
+    <public type="string" name="upload_area_title" id="0x7F121FC8" />
+    <public type="string" name="upload_area_title_no_confirmation" id="0x7F121FC9" />
+    <public type="string" name="upload_area_too_large_help" id="0x7F121FCA" />
+    <public type="string" name="upload_area_too_large_help_mobile" id="0x7F121FCB" />
+    <public type="string" name="upload_area_too_large_help_premium_tier_1" id="0x7F121FCC" />
+    <public type="string" name="upload_area_too_large_title" id="0x7F121FCD" />
+    <public type="string" name="upload_area_upload_failed_help" id="0x7F121FCE" />
+    <public type="string" name="upload_area_upload_failed_title" id="0x7F121FCF" />
+    <public type="string" name="upload_background" id="0x7F121FD0" />
+    <public type="string" name="upload_debug_log_failure" id="0x7F121FD1" />
+    <public type="string" name="upload_debug_log_failure_header" id="0x7F121FD2" />
+    <public type="string" name="upload_debug_log_failure_no_file" id="0x7F121FD3" />
+    <public type="string" name="upload_debug_log_failure_progress" id="0x7F121FD4" />
+    <public type="string" name="upload_debug_log_failure_read" id="0x7F121FD5" />
+    <public type="string" name="upload_debug_log_failure_upload" id="0x7F121FD6" />
+    <public type="string" name="upload_debug_log_success" id="0x7F121FD7" />
+    <public type="string" name="upload_debug_log_success_header" id="0x7F121FD8" />
+    <public type="string" name="upload_debug_logs" id="0x7F121FD9" />
+    <public type="string" name="upload_emoji" id="0x7F121FDA" />
+    <public type="string" name="upload_emoji_subtitle" id="0x7F121FDB" />
+    <public type="string" name="upload_emoji_title" id="0x7F121FDC" />
+    <public type="string" name="upload_file_subtext" id="0x7F121FDD" />
+    <public type="string" name="upload_image" id="0x7F121FDE" />
+    <public type="string" name="upload_image_body" id="0x7F121FDF" />
+    <public type="string" name="upload_open_file_failed" id="0x7F121FE0" />
+    <public type="string" name="upload_queued" id="0x7F121FE1" />
+    <public type="string" name="upload_to" id="0x7F121FE2" />
+    <public type="string" name="upload_uploads_too_large_help" id="0x7F121FE3" />
+    <public type="string" name="upload_uploads_too_large_title" id="0x7F121FE4" />
+    <public type="string" name="uploaded_by" id="0x7F121FE5" />
+    <public type="string" name="uploading_files" id="0x7F121FE6" />
+    <public type="string" name="uploading_files_failed" id="0x7F121FE7" />
+    <public type="string" name="usage_access" id="0x7F121FE8" />
+    <public type="string" name="usage_statistics_disable_modal_body" id="0x7F121FE9" />
+    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7F121FEA" />
+    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7F121FEB" />
+    <public type="string" name="usage_statistics_disable_modal_title" id="0x7F121FEC" />
+    <public type="string" name="use_application_commands" id="0x7F121FED" />
+    <public type="string" name="use_application_commands_channel_description" id="0x7F121FEE" />
+    <public type="string" name="use_application_commands_guild_description" id="0x7F121FEF" />
+    <public type="string" name="use_email" id="0x7F121FF0" />
+    <public type="string" name="use_external_emojis" id="0x7F121FF1" />
+    <public type="string" name="use_external_emojis_description" id="0x7F121FF2" />
+    <public type="string" name="use_phone" id="0x7F121FF3" />
+    <public type="string" name="use_private_threads" id="0x7F121FF4" />
+    <public type="string" name="use_public_threads" id="0x7F121FF5" />
+    <public type="string" name="use_rich_chat_box_description" id="0x7F121FF6" />
+    <public type="string" name="use_speaker" id="0x7F121FF7" />
+    <public type="string" name="use_vad" id="0x7F121FF8" />
+    <public type="string" name="use_vad_description" id="0x7F121FF9" />
+    <public type="string" name="user_actions_menu_label" id="0x7F121FFA" />
+    <public type="string" name="user_activity_accept_invite" id="0x7F121FFB" />
+    <public type="string" name="user_activity_action_ask_to_join" id="0x7F121FFC" />
+    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7F121FFD" />
+    <public type="string" name="user_activity_action_download_app" id="0x7F121FFE" />
+    <public type="string" name="user_activity_action_failed_to_launch" id="0x7F121FFF" />
+    <public type="string" name="user_activity_action_invite_to_join" id="0x7F122000" />
+    <public type="string" name="user_activity_action_invite_to_listen_along" id="0x7F122001" />
+    <public type="string" name="user_activity_action_notify_me" id="0x7F122002" />
+    <public type="string" name="user_activity_already_playing" id="0x7F122003" />
+    <public type="string" name="user_activity_already_syncing" id="0x7F122004" />
+    <public type="string" name="user_activity_cannot_join_self" id="0x7F122005" />
+    <public type="string" name="user_activity_cannot_play_self" id="0x7F122006" />
+    <public type="string" name="user_activity_cannot_sync_self" id="0x7F122007" />
+    <public type="string" name="user_activity_chat_invite_education" id="0x7F122008" />
+    <public type="string" name="user_activity_connect_platform" id="0x7F122009" />
+    <public type="string" name="user_activity_header_competing" id="0x7F12200A" />
+    <public type="string" name="user_activity_header_listening" id="0x7F12200B" />
+    <public type="string" name="user_activity_header_live_on_platform" id="0x7F12200C" />
+    <public type="string" name="user_activity_header_playing" id="0x7F12200D" />
+    <public type="string" name="user_activity_header_playing_on_platform" id="0x7F12200E" />
+    <public type="string" name="user_activity_header_streaming_to_dm" id="0x7F12200F" />
+    <public type="string" name="user_activity_header_streaming_to_guild" id="0x7F122010" />
+    <public type="string" name="user_activity_header_watching" id="0x7F122011" />
+    <public type="string" name="user_activity_invite_request_expired" id="0x7F122012" />
+    <public type="string" name="user_activity_invite_request_received" id="0x7F122013" />
+    <public type="string" name="user_activity_invite_request_requested" id="0x7F122014" />
+    <public type="string" name="user_activity_invite_request_sent" id="0x7F122015" />
+    <public type="string" name="user_activity_invite_request_waiting" id="0x7F122016" />
+    <public type="string" name="user_activity_invite_to_join" id="0x7F122017" />
+    <public type="string" name="user_activity_joining" id="0x7F122018" />
+    <public type="string" name="user_activity_listen_along" id="0x7F122019" />
+    <public type="string" name="user_activity_listen_along_description" id="0x7F12201A" />
+    <public type="string" name="user_activity_listening_album" id="0x7F12201B" />
+    <public type="string" name="user_activity_listening_artists" id="0x7F12201C" />
+    <public type="string" name="user_activity_never_mind" id="0x7F12201D" />
+    <public type="string" name="user_activity_not_detected" id="0x7F12201E" />
+    <public type="string" name="user_activity_play_on_platform" id="0x7F12201F" />
+    <public type="string" name="user_activity_respond_nope" id="0x7F122020" />
+    <public type="string" name="user_activity_respond_yeah" id="0x7F122021" />
+    <public type="string" name="user_activity_stage_state_size" id="0x7F122022" />
+    <public type="string" name="user_activity_state_size" id="0x7F122023" />
+    <public type="string" name="user_activity_timestamp_end" id="0x7F122024" />
+    <public type="string" name="user_activity_timestamp_end_simple" id="0x7F122025" />
+    <public type="string" name="user_activity_timestamp_start" id="0x7F122026" />
+    <public type="string" name="user_activity_timestamp_start_simple" id="0x7F122027" />
+    <public type="string" name="user_activity_user_join" id="0x7F122028" />
+    <public type="string" name="user_activity_user_join_hint" id="0x7F122029" />
+    <public type="string" name="user_activity_user_playing_for_days" id="0x7F12202A" />
+    <public type="string" name="user_activity_user_playing_for_hours" id="0x7F12202B" />
+    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7F12202C" />
+    <public type="string" name="user_activity_watch_along" id="0x7F12202D" />
+    <public type="string" name="user_dm_settings" id="0x7F12202E" />
+    <public type="string" name="user_dm_settings_help" id="0x7F12202F" />
+    <public type="string" name="user_dm_settings_question" id="0x7F122030" />
+    <public type="string" name="user_explicit_content_filter" id="0x7F122031" />
+    <public type="string" name="user_explicit_content_filter_disabled" id="0x7F122032" />
+    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7F122033" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7F122034" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7F122035" />
+    <public type="string" name="user_explicit_content_filter_help" id="0x7F122036" />
+    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7F122037" />
+    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7F122038" />
+    <public type="string" name="user_has_been_blocked" id="0x7F122039" />
+    <public type="string" name="user_has_been_unblocked" id="0x7F12203A" />
+    <public type="string" name="user_info" id="0x7F12203B" />
+    <public type="string" name="user_management" id="0x7F12203C" />
+    <public type="string" name="user_popout_about_me" id="0x7F12203D" />
+    <public type="string" name="user_popout_identity_cta_avatar" id="0x7F12203E" />
+    <public type="string" name="user_popout_identity_cta_both" id="0x7F12203F" />
+    <public type="string" name="user_popout_identity_cta_nickname" id="0x7F122040" />
+    <public type="string" name="user_popout_message" id="0x7F122041" />
+    <public type="string" name="user_popout_wumpus_tooltip" id="0x7F122042" />
+    <public type="string" name="user_profile_about_me" id="0x7F122043" />
+    <public type="string" name="user_profile_activity" id="0x7F122044" />
+    <public type="string" name="user_profile_add_friend" id="0x7F122045" />
+    <public type="string" name="user_profile_audio" id="0x7F122046" />
+    <public type="string" name="user_profile_failure_to_open_message" id="0x7F122047" />
+    <public type="string" name="user_profile_guild_name_content_description" id="0x7F122048" />
+    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7F122049" />
+    <public type="string" name="user_profile_message" id="0x7F12204A" />
+    <public type="string" name="user_profile_modal" id="0x7F12204B" />
+    <public type="string" name="user_profile_mutual_friends" id="0x7F12204C" />
+    <public type="string" name="user_profile_mutual_friends_placeholder" id="0x7F12204D" />
+    <public type="string" name="user_profile_mutual_guilds" id="0x7F12204E" />
+    <public type="string" name="user_profile_mutual_guilds_placeholder" id="0x7F12204F" />
+    <public type="string" name="user_profile_pending" id="0x7F122050" />
+    <public type="string" name="user_profile_settings_setstatus" id="0x7F122051" />
+    <public type="string" name="user_profile_video" id="0x7F122052" />
+    <public type="string" name="user_profile_volume" id="0x7F122053" />
+    <public type="string" name="user_setting_notification_not_enabled_prompt" id="0x7F122054" />
+    <public type="string" name="user_settings" id="0x7F122055" />
+    <public type="string" name="user_settings_about_me" id="0x7F122056" />
+    <public type="string" name="user_settings_about_me_description" id="0x7F122057" />
+    <public type="string" name="user_settings_about_me_hint" id="0x7F122058" />
+    <public type="string" name="user_settings_account_change_email_prompt" id="0x7F122059" />
+    <public type="string" name="user_settings_account_change_email_prompt_desktop" id="0x7F12205A" />
+    <public type="string" name="user_settings_account_change_email_title" id="0x7F12205B" />
+    <public type="string" name="user_settings_account_change_email_title_desktop" id="0x7F12205C" />
+    <public type="string" name="user_settings_account_change_password_prompt_desktop" id="0x7F12205D" />
+    <public type="string" name="user_settings_account_change_password_title_desktop" id="0x7F12205E" />
+    <public type="string" name="user_settings_account_change_username_prompt_desktop" id="0x7F12205F" />
+    <public type="string" name="user_settings_account_change_username_title" id="0x7F122060" />
+    <public type="string" name="user_settings_account_change_username_title_desktop" id="0x7F122061" />
+    <public type="string" name="user_settings_account_password_and_authentication" id="0x7F122062" />
+    <public type="string" name="user_settings_account_removal_description" id="0x7F122063" />
+    <public type="string" name="user_settings_account_removal_description_unclaimed" id="0x7F122064" />
+    <public type="string" name="user_settings_account_removal_section" id="0x7F122065" />
+    <public type="string" name="user_settings_account_remove_phone_number_button" id="0x7F122066" />
+    <public type="string" name="user_settings_account_remove_phone_number_title" id="0x7F122067" />
+    <public type="string" name="user_settings_account_remove_phone_number_warning_body" id="0x7F122068" />
+    <public type="string" name="user_settings_account_remove_phone_number_warning_title" id="0x7F122069" />
+    <public type="string" name="user_settings_account_remove_phone_sms_backup_warning" id="0x7F12206A" />
+    <public type="string" name="user_settings_account_verify_password_subtitle" id="0x7F12206B" />
+    <public type="string" name="user_settings_account_verify_password_title" id="0x7F12206C" />
+    <public type="string" name="user_settings_account_verify_password_title_in_title_case" id="0x7F12206D" />
+    <public type="string" name="user_settings_actions_menu_label" id="0x7F12206E" />
+    <public type="string" name="user_settings_add_email_claim" id="0x7F12206F" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7F122070" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7F122071" />
+    <public type="string" name="user_settings_appearance_colors" id="0x7F122072" />
+    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7F122073" />
+    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7F122074" />
+    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7F122075" />
+    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7F122076" />
+    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7F122077" />
+    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7F122078" />
+    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7F122079" />
+    <public type="string" name="user_settings_available_codes" id="0x7F12207A" />
+    <public type="string" name="user_settings_avatar" id="0x7F12207B" />
+    <public type="string" name="user_settings_banner_a11y_label" id="0x7F12207C" />
+    <public type="string" name="user_settings_banner_edit_sub_label" id="0x7F12207E" />
+    <public type="string" name="user_settings_banner_specs" id="0x7F12207F" />
+    <public type="string" name="user_settings_banner_upload" id="0x7F122080" />
+    <public type="string" name="user_settings_blocked_users" id="0x7F122081" />
+    <public type="string" name="user_settings_blocked_users_empty" id="0x7F122082" />
+    <public type="string" name="user_settings_blocked_users_header" id="0x7F122083" />
+    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7F122084" />
+    <public type="string" name="user_settings_change_avatar" id="0x7F122085" />
+    <public type="string" name="user_settings_change_avatar_a11y_label" id="0x7F122086" />
+    <public type="string" name="user_settings_change_banner_a11y_label" id="0x7F122087" />
+    <public type="string" name="user_settings_change_profile_banner" id="0x7F122088" />
+    <public type="string" name="user_settings_close_button" id="0x7F122089" />
+    <public type="string" name="user_settings_confirm_logout" id="0x7F12208A" />
+    <public type="string" name="user_settings_customization_upsell" id="0x7F12208B" />
+    <public type="string" name="user_settings_customize_profile_title" id="0x7F12208C" />
+    <public type="string" name="user_settings_delete_avatar" id="0x7F12208D" />
+    <public type="string" name="user_settings_disable_advanced_voice_activity" id="0x7F12208E" />
+    <public type="string" name="user_settings_disable_noise_suppression" id="0x7F12208F" />
+    <public type="string" name="user_settings_edit_account" id="0x7F122090" />
+    <public type="string" name="user_settings_edit_account_password_label" id="0x7F122091" />
+    <public type="string" name="user_settings_edit_account_tag" id="0x7F122092" />
+    <public type="string" name="user_settings_edit_profile" id="0x7F122093" />
+    <public type="string" name="user_settings_edit_profile_dont_save" id="0x7F122094" />
+    <public type="string" name="user_settings_edit_profile_save_changes" id="0x7F122095" />
+    <public type="string" name="user_settings_edit_profile_save_confirmation_body" id="0x7F122096" />
+    <public type="string" name="user_settings_enter_password_view_codes" id="0x7F122097" />
+    <public type="string" name="user_settings_games_install_location" id="0x7F122098" />
+    <public type="string" name="user_settings_games_install_location_add" id="0x7F122099" />
+    <public type="string" name="user_settings_games_install_location_make_default" id="0x7F12209A" />
+    <public type="string" name="user_settings_games_install_location_name" id="0x7F12209B" />
+    <public type="string" name="user_settings_games_install_location_remove" id="0x7F12209C" />
+    <public type="string" name="user_settings_games_install_location_space" id="0x7F12209D" />
+    <public type="string" name="user_settings_games_install_locations" id="0x7F12209E" />
+    <public type="string" name="user_settings_games_remove_location_body" id="0x7F12209F" />
+    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7F1220A0" />
+    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7F1220A1" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7F1220A2" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7F1220A3" />
+    <public type="string" name="user_settings_hypesquad" id="0x7F1220A4" />
+    <public type="string" name="user_settings_keybinds_action" id="0x7F1220A5" />
+    <public type="string" name="user_settings_keybinds_chat_section_title" id="0x7F1220A6" />
+    <public type="string" name="user_settings_keybinds_default_keybinds_title" id="0x7F1220A7" />
+    <public type="string" name="user_settings_keybinds_keybind" id="0x7F1220A8" />
+    <public type="string" name="user_settings_keybinds_message_description" id="0x7F1220A9" />
+    <public type="string" name="user_settings_keybinds_message_section_title" id="0x7F1220AA" />
+    <public type="string" name="user_settings_keybinds_miscellaneous_section_title" id="0x7F1220AB" />
+    <public type="string" name="user_settings_keybinds_navigation_section_title" id="0x7F1220AC" />
+    <public type="string" name="user_settings_keybinds_show_list_title" id="0x7F1220AD" />
+    <public type="string" name="user_settings_keybinds_voice_and_video_section_title" id="0x7F1220AE" />
+    <public type="string" name="user_settings_label_current_password" id="0x7F1220AF" />
+    <public type="string" name="user_settings_label_discriminator" id="0x7F1220B0" />
+    <public type="string" name="user_settings_label_email" id="0x7F1220B1" />
+    <public type="string" name="user_settings_label_new_password" id="0x7F1220B2" />
+    <public type="string" name="user_settings_label_phone_number" id="0x7F1220B3" />
+    <public type="string" name="user_settings_label_username" id="0x7F1220B4" />
+    <public type="string" name="user_settings_linux_settings" id="0x7F1220B5" />
+    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7F1220B6" />
+    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7F1220B7" />
+    <public type="string" name="user_settings_mfa_enabled" id="0x7F1220B8" />
+    <public type="string" name="user_settings_mfa_removed" id="0x7F1220B9" />
+    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7F1220BA" />
+    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7F1220BB" />
+    <public type="string" name="user_settings_my_account" id="0x7F1220BC" />
+    <public type="string" name="user_settings_no_email_placeholder" id="0x7F1220BD" />
+    <public type="string" name="user_settings_no_phone_placeholder" id="0x7F1220BE" />
+    <public type="string" name="user_settings_no_subscription_credit" id="0x7F1220BF" />
+    <public type="string" name="user_settings_no_subscriptions" id="0x7F1220C0" />
+    <public type="string" name="user_settings_noise_cancellation" id="0x7F1220C1" />
+    <public type="string" name="user_settings_noise_cancellation_description" id="0x7F1220C2" />
+    <public type="string" name="user_settings_noise_cancellation_model" id="0x7F1220C3" />
+    <public type="string" name="user_settings_notifications_preview_sound" id="0x7F1220C4" />
+    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7F1220C5" />
+    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7F1220C6" />
+    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7F1220C7" />
+    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7F1220C8" />
+    <public type="string" name="user_settings_open_on_startup_body" id="0x7F1220C9" />
+    <public type="string" name="user_settings_open_on_startup_label" id="0x7F1220CA" />
+    <public type="string" name="user_settings_privacy_terms" id="0x7F1220CB" />
+    <public type="string" name="user_settings_profile_banner" id="0x7F1220CC" />
+    <public type="string" name="user_settings_profile_color_custom" id="0x7F1220CD" />
+    <public type="string" name="user_settings_profile_color_default" id="0x7F1220CE" />
+    <public type="string" name="user_settings_profle_color" id="0x7F1220CF" />
+    <public type="string" name="user_settings_remove_avatar" id="0x7F1220D0" />
+    <public type="string" name="user_settings_remove_banner" id="0x7F1220D1" />
+    <public type="string" name="user_settings_remove_profile_banner" id="0x7F1220D2" />
+    <public type="string" name="user_settings_restart_app_mobile" id="0x7F1220D3" />
+    <public type="string" name="user_settings_save" id="0x7F1220D4" />
+    <public type="string" name="user_settings_scan_qr_code" id="0x7F1220D5" />
+    <public type="string" name="user_settings_show_library" id="0x7F1220D6" />
+    <public type="string" name="user_settings_show_library_note" id="0x7F1220D7" />
+    <public type="string" name="user_settings_start_minimized_body" id="0x7F1220D8" />
+    <public type="string" name="user_settings_start_minimized_label" id="0x7F1220D9" />
+    <public type="string" name="user_settings_startup_behavior" id="0x7F1220DA" />
+    <public type="string" name="user_settings_streamer_notice_body" id="0x7F1220DB" />
+    <public type="string" name="user_settings_streamer_notice_title" id="0x7F1220DC" />
+    <public type="string" name="user_settings_subscriptions_header" id="0x7F1220DD" />
+    <public type="string" name="user_settings_unlock_banner" id="0x7F1220DE" />
+    <public type="string" name="user_settings_unverified_email_body" id="0x7F1220DF" />
+    <public type="string" name="user_settings_upload_avatar" id="0x7F1220E0" />
+    <public type="string" name="user_settings_upload_banner" id="0x7F1220E1" />
+    <public type="string" name="user_settings_used_backup_codes" id="0x7F1220E3" />
+    <public type="string" name="user_settings_user_profile" id="0x7F1220E4" />
+    <public type="string" name="user_settings_voice_add_multiple" id="0x7F1220E5" />
+    <public type="string" name="user_settings_voice_codec_description" id="0x7F1220E6" />
+    <public type="string" name="user_settings_voice_codec_title" id="0x7F1220E7" />
+    <public type="string" name="user_settings_voice_experimental_soundshare_label" id="0x7F1220E8" />
+    <public type="string" name="user_settings_voice_hardware_h264" id="0x7F1220E9" />
+    <public type="string" name="user_settings_voice_install_label" id="0x7F1220EA" />
+    <public type="string" name="user_settings_voice_installed_label" id="0x7F1220EB" />
+    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7F1220EC" />
+    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7F1220ED" />
+    <public type="string" name="user_settings_voice_mic_test_description" id="0x7F1220EE" />
+    <public type="string" name="user_settings_voice_mic_test_title" id="0x7F1220EF" />
+    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7F1220F0" />
+    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7F1220F1" />
+    <public type="string" name="user_settings_voice_open_h264" id="0x7F1220F2" />
+    <public type="string" name="user_settings_voice_soundshare_enabled_label" id="0x7F1220F3" />
+    <public type="string" name="user_settings_voice_soundshare_enabling_label" id="0x7F1220F4" />
+    <public type="string" name="user_settings_voice_soundshare_not_enabled_label" id="0x7F1220F5" />
+    <public type="string" name="user_settings_voice_video_codec_title" id="0x7F1220F6" />
+    <public type="string" name="user_settings_voice_video_hook_label" id="0x7F1220F7" />
+    <public type="string" name="user_settings_windows_settings" id="0x7F1220F8" />
+    <public type="string" name="user_settings_with_build_override" id="0x7F1220F9" />
+    <public type="string" name="user_summary_with_others" id="0x7F1220FA" />
+    <public type="string" name="user_volume" id="0x7F1220FB" />
+    <public type="string" name="username" id="0x7F1220FC" />
+    <public type="string" name="username_and_tag" id="0x7F1220FD" />
+    <public type="string" name="username_live" id="0x7F1220FE" />
+    <public type="string" name="username_required" id="0x7F1220FF" />
+    <public type="string" name="users" id="0x7F122100" />
+    <public type="string" name="v7_preference_off" id="0x7F122101" />
+    <public type="string" name="v7_preference_on" id="0x7F122102" />
+    <public type="string" name="vad_permission_body" id="0x7F122103" />
+    <public type="string" name="vad_permission_enable_ptt" id="0x7F122104" />
+    <public type="string" name="vad_permission_okay" id="0x7F122105" />
+    <public type="string" name="vad_permission_small" id="0x7F122106" />
+    <public type="string" name="vad_permission_title" id="0x7F122107" />
+    <public type="string" name="vanity_url" id="0x7F122108" />
+    <public type="string" name="vanity_url_header_uses" id="0x7F122109" />
+    <public type="string" name="vanity_url_help" id="0x7F12210A" />
+    <public type="string" name="vanity_url_help_conflict" id="0x7F12210B" />
+    <public type="string" name="vanity_url_help_extended" id="0x7F12210C" />
+    <public type="string" name="vanity_url_help_extended_link" id="0x7F12210D" />
+    <public type="string" name="vanity_url_hint_mobile" id="0x7F12210E" />
+    <public type="string" name="vanity_url_uses" id="0x7F12210F" />
+    <public type="string" name="verfication_expired" id="0x7F122110" />
+    <public type="string" name="verification_body" id="0x7F122111" />
+    <public type="string" name="verification_body_alt" id="0x7F122112" />
+    <public type="string" name="verification_email_body" id="0x7F122113" />
+    <public type="string" name="verification_email_error_body" id="0x7F122114" />
+    <public type="string" name="verification_email_error_title" id="0x7F122115" />
+    <public type="string" name="verification_email_title" id="0x7F122116" />
+    <public type="string" name="verification_footer" id="0x7F122117" />
+    <public type="string" name="verification_footer_logout" id="0x7F122118" />
+    <public type="string" name="verification_footer_support" id="0x7F122119" />
+    <public type="string" name="verification_level_high" id="0x7F12211A" />
+    <public type="string" name="verification_level_high_criteria" id="0x7F12211B" />
+    <public type="string" name="verification_level_low" id="0x7F12211C" />
+    <public type="string" name="verification_level_low_criteria" id="0x7F12211D" />
+    <public type="string" name="verification_level_medium" id="0x7F12211E" />
+    <public type="string" name="verification_level_medium_criteria" id="0x7F12211F" />
+    <public type="string" name="verification_level_none" id="0x7F122120" />
+    <public type="string" name="verification_level_none_criteria" id="0x7F122121" />
+    <public type="string" name="verification_level_very_high" id="0x7F122122" />
+    <public type="string" name="verification_level_very_high_criteria" id="0x7F122123" />
+    <public type="string" name="verification_open_discord" id="0x7F122124" />
+    <public type="string" name="verification_phone_description" id="0x7F122125" />
+    <public type="string" name="verification_phone_title" id="0x7F122126" />
+    <public type="string" name="verification_title" id="0x7F122127" />
+    <public type="string" name="verification_verified" id="0x7F122128" />
+    <public type="string" name="verification_verifying" id="0x7F122129" />
+    <public type="string" name="verified_bot_tooltip" id="0x7F12212A" />
+    <public type="string" name="verified_developer_badge_tooltip" id="0x7F12212B" />
+    <public type="string" name="verify" id="0x7F12212C" />
+    <public type="string" name="verify_account" id="0x7F12212D" />
+    <public type="string" name="verify_by" id="0x7F12212E" />
+    <public type="string" name="verify_by_email" id="0x7F12212F" />
+    <public type="string" name="verify_by_email_formatted" id="0x7F122130" />
+    <public type="string" name="verify_by_hcaptcha" id="0x7F122131" />
+    <public type="string" name="verify_by_phone_bail" id="0x7F122132" />
+    <public type="string" name="verify_by_phone_formatted" id="0x7F122133" />
+    <public type="string" name="verify_by_recaptcha" id="0x7F122134" />
+    <public type="string" name="verify_by_recaptcha_description" id="0x7F122135" />
+    <public type="string" name="verify_email" id="0x7F122136" />
+    <public type="string" name="verify_email_body" id="0x7F122137" />
+    <public type="string" name="verify_email_body_resent" id="0x7F122138" />
+    <public type="string" name="verify_phone" id="0x7F122139" />
+    <public type="string" name="verify_phone_for_support" id="0x7F12213A" />
+    <public type="string" name="verify_your_email" id="0x7F12213B" />
+    <public type="string" name="verifying" id="0x7F12213C" />
+    <public type="string" name="very_out_of_date_description" id="0x7F12213D" />
+    <public type="string" name="vi" id="0x7F12213E" />
+    <public type="string" name="video" id="0x7F12213F" />
+    <public type="string" name="video_call_auto_select" id="0x7F122140" />
+    <public type="string" name="video_call_hide_members" id="0x7F122141" />
+    <public type="string" name="video_call_return_to_grid" id="0x7F122142" />
+    <public type="string" name="video_call_return_to_list" id="0x7F122143" />
+    <public type="string" name="video_call_show_members" id="0x7F122144" />
+    <public type="string" name="video_capacity_modal_body" id="0x7F122145" />
+    <public type="string" name="video_capacity_modal_header" id="0x7F122146" />
+    <public type="string" name="video_playback_mute_accessibility_label" id="0x7F122147" />
+    <public type="string" name="video_playback_unmute_accessibility_label" id="0x7F122148" />
+    <public type="string" name="video_quality_mode_auto" id="0x7F122149" />
+    <public type="string" name="video_quality_mode_full" id="0x7F12214A" />
+    <public type="string" name="video_settings" id="0x7F12214B" />
+    <public type="string" name="video_unavailable" id="0x7F12214C" />
+    <public type="string" name="video_unsupported_browser_body" id="0x7F12214D" />
+    <public type="string" name="video_unsupported_browser_title" id="0x7F12214E" />
+    <public type="string" name="view" id="0x7F12214F" />
+    <public type="string" name="view_all" id="0x7F122150" />
+    <public type="string" name="view_as_role" id="0x7F122151" />
+    <public type="string" name="view_as_role_description" id="0x7F122152" />
+    <public type="string" name="view_as_roles_hidden_vc_warning" id="0x7F122153" />
+    <public type="string" name="view_as_roles_mentions_warning" id="0x7F122154" />
+    <public type="string" name="view_as_roles_upsell_body" id="0x7F122155" />
+    <public type="string" name="view_as_roles_upsell_title" id="0x7F122156" />
+    <public type="string" name="view_as_roles_voice_warning" id="0x7F122157" />
+    <public type="string" name="view_audit_log" id="0x7F122158" />
+    <public type="string" name="view_audit_log_description" id="0x7F122159" />
+    <public type="string" name="view_channel" id="0x7F12215A" />
+    <public type="string" name="view_embed" id="0x7F12215B" />
+    <public type="string" name="view_guild_analytics" id="0x7F12215C" />
+    <public type="string" name="view_guild_analytics_description" id="0x7F12215D" />
+    <public type="string" name="view_profile" id="0x7F12215E" />
+    <public type="string" name="view_spectators" id="0x7F12215F" />
+    <public type="string" name="view_surrounding_messages" id="0x7F122160" />
+    <public type="string" name="view_thread" id="0x7F122161" />
+    <public type="string" name="viewing_as_roles" id="0x7F122162" />
+    <public type="string" name="viewing_as_roles_back" id="0x7F122163" />
+    <public type="string" name="viewing_as_roles_select" id="0x7F122164" />
+    <public type="string" name="visit_community" id="0x7F122165" />
+    <public type="string" name="visitors_info" id="0x7F122166" />
+    <public type="string" name="voice" id="0x7F122167" />
+    <public type="string" name="voice_and_video" id="0x7F122168" />
+    <public type="string" name="voice_call_action_a11y_hint" id="0x7F122169" />
+    <public type="string" name="voice_call_member_list_title" id="0x7F12216A" />
+    <public type="string" name="voice_channel" id="0x7F12216B" />
+    <public type="string" name="voice_channel_deafened" id="0x7F12216C" />
+    <public type="string" name="voice_channel_desc" id="0x7F12216D" />
+    <public type="string" name="voice_channel_empty" id="0x7F12216E" />
+    <public type="string" name="voice_channel_hide_names" id="0x7F12216F" />
+    <public type="string" name="voice_channel_locked" id="0x7F122170" />
+    <public type="string" name="voice_channel_muted" id="0x7F122171" />
+    <public type="string" name="voice_channel_show_names" id="0x7F122172" />
+    <public type="string" name="voice_channel_subtitle" id="0x7F122173" />
+    <public type="string" name="voice_channel_title" id="0x7F122174" />
+    <public type="string" name="voice_channel_undeafened" id="0x7F122175" />
+    <public type="string" name="voice_channel_unmuted" id="0x7F122176" />
+    <public type="string" name="voice_channels" id="0x7F122177" />
+    <public type="string" name="voice_channels_matching" id="0x7F122178" />
+    <public type="string" name="voice_controls_sheet_tooltip_swipe_up" id="0x7F122179" />
+    <public type="string" name="voice_panel_hide_extras" id="0x7F12217A" />
+    <public type="string" name="voice_panel_introduction_close" id="0x7F12217B" />
+    <public type="string" name="voice_panel_introduction_header" id="0x7F12217C" />
+    <public type="string" name="voice_panel_introduction_text" id="0x7F12217D" />
+    <public type="string" name="voice_panel_show_extras" id="0x7F12217E" />
+    <public type="string" name="voice_panel_show_voice_users" id="0x7F12217F" />
+    <public type="string" name="voice_panel_user_tooltip" id="0x7F122180" />
+    <public type="string" name="voice_panel_users_a11y_label" id="0x7F122181" />
+    <public type="string" name="voice_permissions" id="0x7F122182" />
+    <public type="string" name="voice_settings" id="0x7F122183" />
+    <public type="string" name="voice_status_connecting" id="0x7F122184" />
+    <public type="string" name="voice_status_not_connected" id="0x7F122185" />
+    <public type="string" name="voice_status_not_connected_mobile" id="0x7F122186" />
+    <public type="string" name="voice_status_ringing" id="0x7F122187" />
+    <public type="string" name="voice_unavailable" id="0x7F122188" />
+    <public type="string" name="watch" id="0x7F122189" />
+    <public type="string" name="watch_media_survey_button" id="0x7F12218A" />
+    <public type="string" name="watch_media_survey_prompt" id="0x7F12218B" />
+    <public type="string" name="watch_stream" id="0x7F12218C" />
+    <public type="string" name="watch_stream_in_app" id="0x7F12218D" />
+    <public type="string" name="watch_stream_streaming" id="0x7F12218E" />
+    <public type="string" name="watch_stream_tip" id="0x7F12218F" />
+    <public type="string" name="watch_stream_watching" id="0x7F122190" />
+    <public type="string" name="watch_user_stream" id="0x7F122191" />
+    <public type="string" name="watching" id="0x7F122192" />
+    <public type="string" name="wave_accessibility_text" id="0x7F122193" />
+    <public type="string" name="wave_default_recipient" id="0x7F122194" />
+    <public type="string" name="wave_to" id="0x7F122195" />
+    <public type="string" name="web_browser" id="0x7F122196" />
+    <public type="string" name="web_browser_chrome" id="0x7F122197" />
+    <public type="string" name="web_browser_in_app" id="0x7F122198" />
+    <public type="string" name="web_browser_safari" id="0x7F122199" />
+    <public type="string" name="webhook_cancel" id="0x7F12219A" />
+    <public type="string" name="webhook_create" id="0x7F12219B" />
+    <public type="string" name="webhook_created_on" id="0x7F12219C" />
+    <public type="string" name="webhook_delete" id="0x7F12219D" />
+    <public type="string" name="webhook_delete_body" id="0x7F12219E" />
+    <public type="string" name="webhook_delete_title" id="0x7F12219F" />
+    <public type="string" name="webhook_error_creating_webhook" id="0x7F1221A0" />
+    <public type="string" name="webhook_error_deleting_webhook" id="0x7F1221A1" />
+    <public type="string" name="webhook_error_internal_server_error" id="0x7F1221A2" />
+    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7F1221A3" />
+    <public type="string" name="webhook_form_name" id="0x7F1221A4" />
+    <public type="string" name="webhook_form_url" id="0x7F1221A5" />
+    <public type="string" name="webhook_form_webhook_url_help" id="0x7F1221A6" />
+    <public type="string" name="webhook_modal_icon_description" id="0x7F1221A7" />
+    <public type="string" name="webhook_modal_icon_title" id="0x7F1221A8" />
+    <public type="string" name="webhook_modal_title" id="0x7F1221A9" />
+    <public type="string" name="webhooks" id="0x7F1221AA" />
+    <public type="string" name="weekly_communicators" id="0x7F1221AB" />
+    <public type="string" name="weekly_new_member_retention" id="0x7F1221AC" />
+    <public type="string" name="weekly_new_members" id="0x7F1221AD" />
+    <public type="string" name="weekly_visitors" id="0x7F1221AE" />
+    <public type="string" name="welcome_channel_delete_confirm_body" id="0x7F1221AF" />
+    <public type="string" name="welcome_channel_delete_confirm_body_generic" id="0x7F1221B0" />
+    <public type="string" name="welcome_channel_delete_confirm_title" id="0x7F1221B1" />
+    <public type="string" name="welcome_channel_emoji_picker_tooltip" id="0x7F1221B2" />
+    <public type="string" name="welcome_cta_download_title" id="0x7F1221B3" />
+    <public type="string" name="welcome_cta_invite_title" id="0x7F1221B4" />
+    <public type="string" name="welcome_cta_label" id="0x7F1221B5" />
+    <public type="string" name="welcome_cta_message_title" id="0x7F1221B6" />
+    <public type="string" name="welcome_cta_onboarding_video_title" id="0x7F1221B7" />
+    <public type="string" name="welcome_cta_onboarding_video_title_new_user" id="0x7F1221B8" />
+    <public type="string" name="welcome_cta_personalize_title" id="0x7F1221B9" />
+    <public type="string" name="welcome_cta_personalize_title_mobile" id="0x7F1221BA" />
+    <public type="string" name="welcome_cta_subtitle_action_with_guide" id="0x7F1221BB" />
+    <public type="string" name="welcome_cta_subtitle_existing_server" id="0x7F1221BC" />
+    <public type="string" name="welcome_cta_subtitle_member" id="0x7F1221BD" />
+    <public type="string" name="welcome_cta_subtitle_owner" id="0x7F1221BE" />
+    <public type="string" name="welcome_cta_title" id="0x7F1221BF" />
+    <public type="string" name="welcome_cta_title_mobile" id="0x7F1221C0" />
+    <public type="string" name="welcome_message_desktop_apps" id="0x7F1221C1" />
+    <public type="string" name="welcome_message_edit_channel" id="0x7F1221C2" />
+    <public type="string" name="welcome_message_instant_invite" id="0x7F1221C3" />
+    <public type="string" name="welcome_message_mobile_apps" id="0x7F1221C4" />
+    <public type="string" name="welcome_message_mobile_explore_server" id="0x7F1221C5" />
+    <public type="string" name="welcome_message_mobile_explore_server_desc" id="0x7F1221C6" />
+    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7F1221C7" />
+    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7F1221C8" />
+    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7F1221C9" />
+    <public type="string" name="welcome_message_mobile_owner_title" id="0x7F1221CA" />
+    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7F1221CB" />
+    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7F1221CC" />
+    <public type="string" name="welcome_message_owner_title" id="0x7F1221CD" />
+    <public type="string" name="welcome_message_setup_server" id="0x7F1221CE" />
+    <public type="string" name="welcome_message_subtitle_channel" id="0x7F1221CF" />
+    <public type="string" name="welcome_message_support" id="0x7F1221D0" />
+    <public type="string" name="welcome_message_title" id="0x7F1221D1" />
+    <public type="string" name="welcome_message_title_channel" id="0x7F1221D2" />
+    <public type="string" name="welcome_message_tutorial" id="0x7F1221D3" />
+    <public type="string" name="welcome_screen_choice_header" id="0x7F1221D4" />
+    <public type="string" name="welcome_screen_skip" id="0x7F1221D5" />
+    <public type="string" name="welcome_screen_title" id="0x7F1221D6" />
+    <public type="string" name="whats_new" id="0x7F1221D7" />
+    <public type="string" name="whats_new_date" id="0x7F1221D8" />
+    <public type="string" name="whitelist_failed" id="0x7F1221D9" />
+    <public type="string" name="whitelisted" id="0x7F1221DA" />
+    <public type="string" name="whitelisting" id="0x7F1221DB" />
+    <public type="string" name="widget" id="0x7F1221DC" />
+    <public type="string" name="windows" id="0x7F1221DD" />
+    <public type="string" name="working" id="0x7F1221DE" />
+    <public type="string" name="wumpus" id="0x7F1221DF" />
+    <public type="string" name="xbox_authorization_title" id="0x7F1221E0" />
+    <public type="string" name="xbox_link" id="0x7F1221E1" />
+    <public type="string" name="xbox_pin_step1" id="0x7F1221E2" />
+    <public type="string" name="xbox_pin_step2" id="0x7F1221E3" />
+    <public type="string" name="xbox_pin_step3" id="0x7F1221E4" />
+    <public type="string" name="yearly" id="0x7F1221E5" />
+    <public type="string" name="yellow" id="0x7F1221E6" />
+    <public type="string" name="yes_text" id="0x7F1221E7" />
+    <public type="string" name="your_pin_expires" id="0x7F1221E8" />
+    <public type="string" name="your_pin_is_expired" id="0x7F1221E9" />
+    <public type="string" name="youre_viewing_older_messages" id="0x7F1221EA" />
+    <public type="string" name="zh_cn" id="0x7F1221EB" />
+    <public type="string" name="zh_tw" id="0x7F1221EC" />
     <public type="style" name="AlertButton" id="0x7F130000" />
     <public type="style" name="res_2131951617_alertdialog_appcompat" id="0x7F130001" />
     <public type="style" name="res_2131951618_alertdialog_appcompat_light" id="0x7F130002" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a39e0f9e7..3b2c388455 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1341,7 +1341,7 @@
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
-    <string name="res_2131887421_com_crashlytics_android_build_id">ceb3a36bfac34fe792ff10844c4d22fb</string>
+    <string name="res_2131887421_com_crashlytics_android_build_id">df62e7a584c54bbbb7d0e1b9e39006d6</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>
@@ -1535,7 +1535,6 @@
     <string name="contact_sync_we_found_your_friends_title">We found your friends!</string>
     <string name="contacts_invite_placeholder">hey come check out Discord with me !!{link}!!</string>
     <string name="content_matching">!!{command}!! content matching **!!{query}!!**</string>
-    <string name="context_menu_hint">Right click user for more actions</string>
     <string name="continue_in_browser">Continue in browser</string>
     <string name="continue_to_webapp">Continue to Discord</string>
     <string name="control_volume">Control volume</string>
@@ -2126,6 +2125,7 @@
     <string name="edit_message">Edit Message</string>
     <string name="edit_note">Edit Note</string>
     <string name="edit_overview">Edit Overview</string>
+    <string name="edit_profile">Edit Profile</string>
     <string name="edit_roles">Edit Roles</string>
     <string name="edit_stage_channel_subtitle">Change the topic or privacy settings</string>
     <string name="edit_stage_channel_title">Edit Stage</string>
@@ -2399,6 +2399,7 @@
     <string name="explicit_end_stage_confirm_mobile">Exit and end the Stage</string>
     <string name="explicit_end_stage_subtitle">A Stage with no speakers will automatically end after a few minutes.</string>
     <string name="explicit_end_stage_title">Do you want to also end the Stage?</string>
+    <string name="explicit_end_ticketed_guild_event_subtitle">You’re the last event manager in this Stage.</string>
     <string name="exposed_dropdown_menu_content_description">Show dropdown menu</string>
     <string name="expression_picker_emoji">Emoji</string>
     <string name="expression_picker_gif">GIFs</string>
@@ -2880,8 +2881,11 @@
     <string name="general_permissions">General Permissions</string>
     <string name="generate_a_new_link">Generate a New Link</string>
     <string name="generic_actions_menu_label">Actions</string>
+    <string name="generic_error_body">Seems like something\'s gone wrong. Sorry about that.</string>
+    <string name="generic_error_title">Oh no!</string>
     <string name="get_mobile_app">Get the Discord app</string>
     <string name="get_mobile_app_cta">Get the App</string>
+    <string name="get_mobile_app_skip">Skip for now</string>
     <string name="get_mobile_app_subtitle">Discord isn\'t supported on mobile web browsers. Join over 100 million people who use Discord to talk with communities and friends.</string>
     <string name="get_started">Get Started</string>
     <string name="gif">GIF</string>
@@ -3159,7 +3163,10 @@
     <string name="guild_discovery_search_results_header">{count} for {query}</string>
     <string name="guild_discovery_tooltip">Explore Public Servers</string>
     <string name="guild_discovery_view_button">View</string>
+    <string name="guild_event_add_moderators_label">Add Moderators</string>
+    <string name="guild_event_moderators_description">Stage moderators are Speakers who can add and remove other Speakers. They can also end the Stage. Stage moderators don\'t have to be mods of the server.</string>
     <string name="guild_event_ticket_billing_invoice_total_tax_inclusive">**Total** (Tax Included)</string>
+    <string name="guild_events">Events</string>
     <string name="guild_folder_color">Folder Color</string>
     <string name="guild_folder_name">Folder Name</string>
     <string name="guild_folder_tooltip_a11y_label">!!{folderName}!!, folder {mentions}</string>
@@ -3534,8 +3541,7 @@
     <string name="guild_settings_discovery_checklist_age_description_failing">Servers in Discovery need to be at least {minimumGuildAge} old. Please check back on {passDate}.</string>
     <string name="guild_settings_discovery_checklist_age_failing">Server Too Young</string>
     <string name="guild_settings_discovery_checklist_bad_standing">Your server **$[does not](doesNotHook)** meet all the requirements to be in Server Discovery.</string>
-    <string name="guild_settings_discovery_checklist_change_channel_categories">You need to change your category {numCategories}: $[{categoryNames}](categoryHook)</string>
-    <string name="guild_settings_discovery_checklist_change_channel_names">You need to change your channel {numChannels}: $[{channelNames}](channelHook)</string>
+    <string name="guild_settings_discovery_checklist_change_channel_names_2">You need to change $[one or more channel names](channelHook)</string>
     <string name="guild_settings_discovery_checklist_change_description">You need to change your $[description](descriptionHook)</string>
     <string name="guild_settings_discovery_checklist_change_name">You need to change your $[server name](nameHook)</string>
     <string name="guild_settings_discovery_checklist_communicator_failing_action">Increase number of weekly communicators</string>
@@ -3813,8 +3819,9 @@
     <string name="guild_settings_stickers">Stickers</string>
     <string name="guild_settings_stickers_boost_server">Boost Server</string>
     <string name="guild_settings_stickers_upload_heading">Upload Requirements</string>
-    <string name="guild_settings_stickers_upload_requirements">Before uploading your sticker file, maker sure you meet the following requirements</string>
-    <string name="guild_settings_stickers_upload_requirements_1">File type: PNG, APNG, and Lottie (Read more about file types here)</string>
+    <string name="guild_settings_stickers_upload_help">For more information about file types, and tips on uploading custom stickers, check out this [Help Center article]({articleUrl}).</string>
+    <string name="guild_settings_stickers_upload_requirements">Before uploading your sticker file, make sure you meet the following requirements</string>
+    <string name="guild_settings_stickers_upload_requirements_1">File type: PNG, APNG, and Lottie</string>
     <string name="guild_settings_stickers_upload_requirements_2">File size: {fileSize}</string>
     <string name="guild_settings_stickers_upload_requirements_3">Dimensions: 320 x 320</string>
     <string name="guild_settings_stickers_upload_requirements_4">Emoji Tag: You will be required to select a unicode emoji that matches your sticker the closest.</string>
@@ -3902,13 +3909,17 @@
     <string name="guild_template_default_server_name_local_communities">{username}\'s Community</string>
     <string name="guild_template_default_server_name_study_groups">{username}\'s Study Group</string>
     <string name="guild_template_embed_view_in_app">Available in App</string>
+    <string name="guild_template_header_class">Class</string>
     <string name="guild_template_header_clubs">Clubs</string>
     <string name="guild_template_header_community">Local Community</string>
     <string name="guild_template_header_create">Create My Own</string>
     <string name="guild_template_header_creator">Artists &amp; Creators</string>
+    <string name="guild_template_header_dorm">Dorm</string>
     <string name="guild_template_header_friend">Friends</string>
     <string name="guild_template_header_gaming">Gaming</string>
+    <string name="guild_template_header_major">Subject or Major</string>
     <string name="guild_template_header_school_club">School Club</string>
+    <string name="guild_template_header_social">Social</string>
     <string name="guild_template_header_study">Study Group</string>
     <string name="guild_template_invalid_subtitle">You can ask the owner to make a new one though</string>
     <string name="guild_template_invalid_title">Invalid server template</string>
@@ -3943,19 +3954,25 @@
     <string name="guild_template_modal_title_local_communities">Create a server for your community</string>
     <string name="guild_template_modal_title_study_groups">Create a server for your study group</string>
     <string name="guild_template_name_announcements">announcements</string>
+    <string name="guild_template_name_assignments">assignments</string>
+    <string name="guild_template_name_category_chat">Chat</string>
+    <string name="guild_template_name_category_info">Info</string>
     <string name="guild_template_name_category_information">Information</string>
     <string name="guild_template_name_category_text">Text Channels</string>
     <string name="guild_template_name_category_voice">Voice Channels</string>
     <string name="guild_template_name_clips_and_highlights">clips-and-highlights</string>
+    <string name="guild_template_name_dorm_news">dorm-news</string>
     <string name="guild_template_name_events">events</string>
     <string name="guild_template_name_game">games</string>
     <string name="guild_template_name_game_new">new-games</string>
     <string name="guild_template_name_game_room">game-room-{number}</string>
     <string name="guild_template_name_general">general</string>
     <string name="guild_template_name_giveaways">giveaways</string>
+    <string name="guild_template_name_help_questions">help-and-questions</string>
     <string name="guild_template_name_homework">homework</string>
     <string name="guild_template_name_homework_help">homework-help</string>
     <string name="guild_template_name_ideas_and_feedback">ideas-and-feedback</string>
+    <string name="guild_template_name_introductions">introductions</string>
     <string name="guild_template_name_meeting_plans">meeting-plans</string>
     <string name="guild_template_name_meetups">meetups</string>
     <string name="guild_template_name_memes">memes</string>
@@ -3969,6 +3986,7 @@
     <string name="guild_template_name_social">social-posts</string>
     <string name="guild_template_name_strategy">strategy-discussion</string>
     <string name="guild_template_name_voice_community_hangout">Community Hangout</string>
+    <string name="guild_template_name_voice_couches">Couches</string>
     <string name="guild_template_name_voice_gaming">Gaming</string>
     <string name="guild_template_name_voice_general">General</string>
     <string name="guild_template_name_voice_lobby">Lobby</string>
@@ -3976,8 +3994,10 @@
     <string name="guild_template_name_voice_meeting_room">Meeting Room</string>
     <string name="guild_template_name_voice_meeting_room_1">Meeting Room 1</string>
     <string name="guild_template_name_voice_meeting_room_2">Meeting Room 2</string>
+    <string name="guild_template_name_voice_movie_room">Movie Room</string>
     <string name="guild_template_name_voice_stream_room">Stream Room</string>
     <string name="guild_template_name_voice_study_room">Study Room {number}</string>
+    <string name="guild_template_name_voice_unnumbered_study_room">Study Room</string>
     <string name="guild_template_name_welcome">welcome</string>
     <string name="guild_template_name_welcome_and_rules">welcome-and-rules</string>
     <string name="guild_template_open">View Template</string>
@@ -4080,17 +4100,26 @@
     <string name="how_to_invite_others">Hello. Beep. Boop. If you wanna invite friends to this server, click the server name in the top left and select !!{invitePeople}!!. Beep!</string>
     <string name="hr">Croatian</string>
     <string name="hu">Hungarian</string>
-    <string name="hub_add_guild_description_help">The server description will appear in the hub. Use it to help students decide whether to join.</string>
-    <string name="hub_add_guild_description_placeholder">Description of class, professor, and server goals (study group), etc.</string>
+    <string name="hub_add_guild_description_help">This server description will appear in the Hub.</string>
+    <string name="hub_add_guild_description_placeholder">What\'s your server about? What do people do there?</string>
     <string name="hub_add_guild_description_title">Server Description</string>
+    <string name="hub_add_or_create_server_confirmation_title">Success!</string>
+    <string name="hub_add_server_confirmation_button">Got it!</string>
+    <string name="hub_add_server_confirmation_subtitle">Your server has been added to the Hub for !!{guildName}!!!</string>
     <string name="hub_add_server_cta">Add Server</string>
-    <string name="hub_choose_guild_subtitle">Choose a relevant server from this list of servers you are an admin for. It will still be accessible to people outside the hub.</string>
+    <string name="hub_choose_guild_empty">You are not an admin of any unlisted servers.</string>
+    <string name="hub_choose_guild_subtitle">Your server will be discoverable by students in this Hub. Only servers you have admin permissions in are shown.</string>
     <string name="hub_choose_guild_title">Add a server to !!{guildName}!!</string>
     <string name="hub_create_guild_cta">Create New Server</string>
-    <string name="hub_create_guild_label">Have an idea for a new server?</string>
-    <string name="hub_create_or_add_guild_subtitle">When you add a server, it will be visible to other students and members, so make sure it\'s school appropriate.</string>
+    <string name="hub_create_guild_label">Want to start a new group?</string>
+    <string name="hub_create_or_add_guild_subtitle">Your server will still be accessible to people outside the Hub.</string>
     <string name="hub_create_or_add_guild_title">Help grow the Discord Hub for !!{guildName}!!</string>
+    <string name="hub_create_server_confirmation_go">Go to Server</string>
+    <string name="hub_create_server_confirmation_stay">Back to Hub</string>
+    <string name="hub_create_server_confirmation_subtitle">Your server has been created and added to the Hub for !!{guildName}!!!</string>
     <string name="hub_customize_existing_guild_title">Help other students find !!{guildName}!!</string>
+    <string name="hub_customize_new_guild_subtitle">This server description will appear in the Hub. Use it to help students decide whether to join.</string>
+    <string name="hub_directory_card_joined_guild_button">Go to server</string>
     <string name="hub_directory_channel_empty_add_server">Add a server to this Hub</string>
     <string name="hub_directory_channel_empty_invite">Invite people to this Hub</string>
     <string name="hub_directory_channel_empty_subtitle">You\'re one of the first people here! Let\'s start by adding some servers and members.</string>
@@ -4098,13 +4127,48 @@
     <string name="hub_directory_channel_title">Discord Hub for !!{guildName}!!</string>
     <string name="hub_directory_search_subtitle">From clubs to study groups, stay up to date with what\'s happening</string>
     <string name="hub_directory_search_title">Find your school-related servers</string>
+    <string name="hub_discord_hub">Discord Hub</string>
+    <string name="hub_discord_hubs">Discord Hubs</string>
+    <string name="hub_discovery_description">From clubs, to study groups, stay up to date with what\'s happening.</string>
+    <string name="hub_discovery_footer_description">Hubs connect multiple related servers that are part of a broader community. Hubs related to education are student-run and not officially affiliated with schools.</string>
+    <string name="hub_discovery_header">Find Discord Hubs for your schools</string>
+    <string name="hub_email_confirmation_description">Confirm the link from your email to continue verification. This page will automatically refresh.</string>
+    <string name="hub_email_confirmation_different_email">Try A Different Email</string>
+    <string name="hub_email_confirmation_header">We’ve sent a confirmation link to !!{email}!!</string>
+    <string name="hub_email_confirmation_resend">Resend Confirmation Link</string>
+    <string name="hub_email_connection_add_description">You can join the hub of any school you’re attending.</string>
+    <string name="hub_email_connection_add_header">Attend multiple schools?</string>
+    <string name="hub_email_connection_content_button">Join My School</string>
+    <string name="hub_email_connection_content_description">Easily find student-run servers for your study groups, clubs, sports, free food, and more.</string>
+    <string name="hub_email_connection_content_header">Are you a current student? Join the Discord Hub for your school</string>
+    <string name="hub_email_connection_content_input_description">Enter your official school email address</string>
+    <string name="hub_email_connection_content_input_header">School Email</string>
+    <string name="hub_email_connection_content_input_placeholder">name@school.edu</string>
+    <string name="hub_email_connection_invite_header">Join {count} in the Discord Hub for !!{guildName}!!!</string>
+    <string name="hub_email_connection_join_another">Join Another Hub</string>
+    <string name="hub_email_connection_sidebar_description">Hubs connect multiple related servers that are part of a broader school community. Hubs related to education are student-run and not officially affiliated with schools.</string>
+    <string name="hub_email_connection_sidebar_header">Discord Hubs</string>
     <string name="hub_entry_invite_subtitle">If your server is intended for students only, just invite your classmates. They don\'t need a .edu address to join</string>
     <string name="hub_entry_remove">Remove from Hub</string>
-    <string name="hub_entry_remove_body">Are you sure you want to remove !!{guildName}!! from this directory?</string>
+    <string name="hub_entry_remove_body">Are you sure you want to remove !!{guildName}!! from this Hub?</string>
+    <string name="hub_entry_update">Update description</string>
+    <string name="hub_entry_update_description_title">Update description for !!{guildName}!!</string>
+    <string name="hub_invite_another_school_link">Go to a different school? [Join here](onClick)</string>
+    <string name="hub_invite_button_title_invited">You\'ve been invited to join a Hub</string>
+    <string name="hub_invite_button_title_inviter">You sent an invite to join a Hub</string>
+    <string name="hub_real_name_cta">Let\'s go!</string>
+    <string name="hub_real_name_modal_form_placeholder">First Last</string>
+    <string name="hub_real_name_modal_form_title">Real Name</string>
+    <string name="hub_real_name_modal_header">Welcome to the Discord Hub for !!{guildName}!!!</string>
+    <string name="hub_real_name_modal_subheader">Add your real name so people will recognize you. You can change this anytime via the Hub Settings.</string>
+    <string name="hub_sidebar_add_servers">Add Servers</string>
+    <string name="hub_sidebar_invite_members">Invite Members</string>
+    <string name="hub_sidebar_join_servers">Join Servers</string>
+    <string name="hub_verified_discord_hub">Verified Discord Hub</string>
     <string name="hub_waitlist_modal_form_description">Enter your official school email address</string>
     <string name="hub_waitlist_modal_form_placeholder">sam@college.edu</string>
     <string name="hub_waitlist_modal_form_title">School Email</string>
-    <string name="hub_waitlist_modal_join_header">Are you a current student? Join the Discord hub for your school!</string>
+    <string name="hub_waitlist_modal_join_header">Are you a current student? Join the Discord Hub for your school!</string>
     <string name="hub_waitlist_modal_join_subheader">Get notified when your hub launches so you can easily find student-run servers for your study groups and clubs.</string>
     <string name="hub_waitlist_modal_joined_header">We’ll let you know when your school hub is live!</string>
     <string name="humanize_duration_a_few_seconds">a few seconds</string>
@@ -4414,12 +4478,14 @@
     <string name="invite_button_streaming_subtext">in !!{guildName}!!</string>
     <string name="invite_button_title_invited">You\'ve been invited to join a server</string>
     <string name="invite_button_title_invited_group_dm">You\'ve been invited to join a group DM</string>
+    <string name="invite_button_title_invited_hub">You\'ve been invited to join a Hub</string>
     <string name="invite_button_title_invited_invalid">You received an invite, but…</string>
     <string name="invite_button_title_invited_stream">You\'ve been invited to watch a stream</string>
     <string name="invite_button_title_invited_to_play">You\'ve been invited to play</string>
     <string name="invite_button_title_invited_voice_channel">You\'ve been invited to join a voice channel</string>
     <string name="invite_button_title_inviter">You sent an invite to join a server</string>
     <string name="invite_button_title_inviter_group_dm">You sent an invite to join a group DM</string>
+    <string name="invite_button_title_inviter_hub">You sent an invite to join a Hub</string>
     <string name="invite_button_title_inviter_invalid">You sent an invite, but…</string>
     <string name="invite_button_title_inviter_stream">You sent an invite to watch a stream</string>
     <string name="invite_button_title_inviter_voice_channel">You sent an invite to join a voice channel</string>
@@ -4710,6 +4776,8 @@
     <string name="leave_group_dm_managed_body">Are you sure you want to leave? You won\'t be able to rejoin this group unless **!!{name}!!** adds you again.</string>
     <string name="leave_group_dm_managed_title">Leave !!{name}!! Group</string>
     <string name="leave_group_dm_title">Leave \'!!{name}!!\'</string>
+    <string name="leave_hub">Leave Hub</string>
+    <string name="leave_hub_body">Are you sure you want to leave **!!{name}!!**? You won\'t be able to rejoin this Hub unless you are re-invited.</string>
     <string name="leave_server">Leave Server</string>
     <string name="leave_server_body">Are you sure you want to leave **!!{name}!!**? You won\'t be able to rejoin this server unless you are re-invited.</string>
     <string name="leave_server_body_mobile">Are you sure you want to leave !!{name}!!?</string>
@@ -4858,6 +4926,7 @@
     <string name="marked_as_read">Marked As Read</string>
     <string name="marketing_premium_tier_1_perk_list_omit_guild_cap">Does not include more servers</string>
     <string name="marketing_premium_tier_1_perk_list_omit_message_length">Does not include longer messages</string>
+    <string name="marketing_premium_tier_1_perk_list_omit_profile_customization">Does not include profile banner</string>
     <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_longer_messages">Does not include longer messages</string>
     <string name="marketing_referesh_premium_tier_1_cta_description_perks_info_max_guilds">Does not include more servers</string>
     <string name="marketing_refresh_premium_features_badge_heading">Rep Your Support</string>
@@ -5177,8 +5246,8 @@
     <string name="move_members_description">Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access.</string>
     <string name="move_to">Move To</string>
     <string name="move_to_success">User has been moved to the selected channel.</string>
-    <string name="res_2131891257_msg_alert_cleared">Alert Cleared</string>
-    <string name="res_2131891258_msg_no_alert_showing">No Alert Showing</string>
+    <string name="res_2131891328_msg_alert_cleared">Alert Cleared</string>
+    <string name="res_2131891329_msg_no_alert_showing">No Alert Showing</string>
     <string name="mtrl_badge_numberless_content_description">New notification</string>
     <string name="mtrl_chip_close_icon_content_description">Remove %1$s</string>
     <string name="mtrl_exceed_max_badge_number_content_description">More than %1$d new notifications</string>
@@ -5419,8 +5488,6 @@
     <string name="notice_premium_tier_2_trial_ending_days">You have {days} left to get a free month of Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_hours">You have {hours} left to get a free month of Nitro</string>
     <string name="notice_premium_tier_2_trial_ending_minutes">You have {minutes} left to get a free month of Nitro</string>
-    <string name="notice_premium_xbox_game_pass_promotion">Hey Nitro subscriber, congrats! You get 3 months of Xbox Game Pass for PC, on us!</string>
-    <string name="notice_premium_xbox_game_pass_promotion_redeem">Claim</string>
     <string name="notice_product_feedback_survey">Would you like to participate in product feedback discussions with us?</string>
     <string name="notice_product_feedback_survey_cta">Let us know here!</string>
     <string name="notice_register_to_vote">Are you registered to vote? Check your status and register in two minutes.</string>
@@ -5623,8 +5690,11 @@
     <string name="outbound_promotion_card_claimed_unexpanded_body">Use your code before {endDate}. [More Details](onClickDetails)</string>
     <string name="outbound_promotion_card_unclaimed_expanded_body">Gift is available to claim until {endDate}. [Less Details](onClickDetails)</string>
     <string name="outbound_promotion_card_unclaimed_unexpanded_body">Gift is available to claim until {endDate}. [More Details](onClickDetails)</string>
+    <string name="outbound_promotion_code_confirmation_email">This code is included in a confirmation email we just sent you.</string>
     <string name="outbound_promotion_less_details">[Less Details](onClick)</string>
     <string name="outbound_promotion_more_details">[More Details](onClick)</string>
+    <string name="outbound_promotion_notice">Hey, you have something waiting for you in your gift inventory! Don’t forget to claim it before it’s lost.</string>
+    <string name="outbound_promotion_redemption_modal_title">Awesome!</string>
     <string name="outbound_promotion_see_code">See Code</string>
     <string name="outgoing_friend_request">Outgoing Friend Request</string>
     <string name="outgoing_friend_request_delete_msg">Are you sure you want to delete your friend request to **!!{name}!!**?</string>
@@ -6103,6 +6173,9 @@
     <string name="premium_marketing_feature_premium_upload_size_title">Bigger Uploads</string>
     <string name="premium_marketing_feature_profile_description">Personalize your profile with an animated avatar and custom tag.</string>
     <string name="premium_marketing_feature_profile_title">Personalized Profile</string>
+    <string name="premium_marketing_feature_stickers_description">Use custom stickers anywhere and access 300 Nitro-exclusive stickers. $[Info](infoHook)</string>
+    <string name="premium_marketing_feature_stickers_info">Boosted servers can upload custom stickers through Server Settings &gt; Stickers. Nitro users can use custom stickers anywhere.</string>
+    <string name="premium_marketing_feature_stickers_title">Special Stickers Access</string>
     <string name="premium_marketing_hero_body">Upgrade your emoji, personalize your profile, and stand out in your servers.</string>
     <string name="premium_marketing_hero_header">Make Discord yours</string>
     <string name="premium_message_length_chatbox_flair">Nitro is powering you with {maxLength} characters per message!</string>
@@ -6142,7 +6215,9 @@
     <string name="premium_plan_year_tier_2">Nitro Yearly</string>
     <string name="premium_plan_year_tier_2_trial">Nitro Yearly **(+{months} {months} free)**</string>
     <string name="premium_profile_customization_upsell_body">Get more customization with a profile banner, an animated avatar, a custom tag, [and more with Discord Nitro!](onLearnMore)</string>
-    <string name="premium_profile_customization_upsell_header">Unlock Profile Customization</string>
+    <string name="premium_profile_customization_upsell_body_mobile">Get more customization with a profile banner, an animated avatar, a custom tag, and more with **Discord Nitro!**</string>
+    <string name="premium_profile_customization_upsell_header">Wanna upload your own banner?</string>
+    <string name="premium_profile_customization_upsell_header_mobile">Wanna upload your own profile banner?</string>
     <string name="premium_promo_description">Lift off with Discord Nitro to use animated and custom emoji anywhere.</string>
     <string name="premium_promo_description_search_upsell">Lift off with **Discord Nitro** to use animated and custom emojis anywhere. [Learn more](onClick)</string>
     <string name="premium_promo_description_trial">Claim your free month of Discord Nitro to use animated and custom emojis anywhere.</string>
@@ -6209,6 +6284,7 @@
     <string name="premium_subscription_renewal_footer_trial">Your free month credit will be applied until it runs out, and we\'ll send you a reminder email **{days}** before your free period ends. Have questions? [Check out our offer FAQ]({helpdeskArticle}) or [contact our support team]({contactLink}).</string>
     <string name="premium_subscription_required_body">Hold up! You need Nitro to get this loot.</string>
     <string name="premium_subscription_show_details">Show Subscription Details</string>
+    <string name="premium_subscription_subscriptions_link">Trying to manage your Nitro subscription? Go to your [Subscriptions](onSubscriptionsClick) page.</string>
     <string name="premium_subscription_updates">Subscription Updates</string>
     <string name="premium_switch_plan_disabled_in_trial">You cannot switch plans during your trial.</string>
     <string name="premium_switch_plan_disabled_pending_mutation_plan">You have to cancel your pending plan change before choosing another plan.</string>
@@ -6333,12 +6409,15 @@
     <string name="private_voice_channel_creation_permission_missing_hint">**View Channels** and **Connect** permissions required to create this private channel.</string>
     <string name="profile">Profile</string>
     <string name="profile_banner_icon_tooltip_upsell">Upload your own personalized banner and more with Discord Nitro!</string>
+    <string name="profile_customization_activity_time">$[](renderTimeHook) elapsed</string>
     <string name="profile_customization_beta_tooltip">Profile Customization is currently available to a limited number of people.</string>
     <string name="profile_customization_bio_placeholder">Tell the world a little about yourself</string>
     <string name="profile_customization_marketing_tooltip_body">Express yourself with an about me and, if you have Nitro, a profile banner!</string>
     <string name="profile_customization_marketing_tooltip_cta">Got it</string>
-    <string name="profile_customization_marketing_tooltip_header">New Profile Customization!</string>
+    <string name="profile_customization_marketing_tooltip_header">New User Profiles!</string>
     <string name="profile_customization_nitro_icon_tooltip">Exclusive to Nitro</string>
+    <string name="profile_customization_preview">Preview</string>
+    <string name="profile_user_badges">User Badges</string>
     <string name="progress_completed">You are all set!</string>
     <string name="progress_completed_description">Wow your server is looking all snazzy! Here are a few more things you can do with your server. Have fun!</string>
     <string name="progress_steps">Step {step} of 4</string>
@@ -6346,7 +6425,6 @@
     <string name="project_id">adept-ethos-91518</string>
     <string name="promotion_account_identifier">Signed in as $[](avatarHook) {tag}. [Not You?](logoutHook)</string>
     <string name="promotion_card_action_claim">Claim</string>
-    <string name="promotion_card_body_claimed_hidden">You\'ve claimed this, but the code is hidden due to Streamer Mode.</string>
     <string name="promotion_error_body">Seems like something’s gone wrong and you can’t use that code. Sorry about that.</string>
     <string name="promotion_error_claimed_body">Sorry, looks like this code has already been redeemed.</string>
     <string name="promotion_error_no_code_body">Looks like this code didn\'t work. Make sure you have the right code and try again.</string>
@@ -6462,6 +6540,8 @@
     <string name="recommended">Recommended</string>
     <string name="reconnect">Reconnect</string>
     <string name="reconnecting">Reconnecting</string>
+    <string name="redeem">Redeem</string>
+    <string name="redemption_code">Redemption Code</string>
     <string name="refund">Refund</string>
     <string name="region">region</string>
     <string name="region_select_footer">Server region can be changed anytime with less than a second of voice interruption.</string>
@@ -6894,6 +6974,8 @@
     <string name="save_media_failure_mobile">Save Failed</string>
     <string name="save_media_success_mobile">Saved</string>
     <string name="saved_settings">Settings successfully updated.</string>
+    <string name="schedule_event">Schedule Event</string>
+    <string name="schedule_event_description">Create a Stage to be started later.</string>
     <string name="scope_activities_read">Access your Active Now activities</string>
     <string name="scope_activities_read_description">This allows the app to read the information from the Active Now section of your Friends page.</string>
     <string name="scope_activities_write">Update your current activity</string>
@@ -7372,6 +7454,7 @@
     <string name="stage_voice_channel">Stage Channel</string>
     <string name="start">Start</string>
     <string name="start_call">Start Call</string>
+    <string name="start_scheduled_event">Start a Scheduled Event</string>
     <string name="start_stage_button_text">Start a Stage</string>
     <string name="start_stage_button_text_mobile">Start a Stage</string>
     <string name="start_stage_channel_event_members_subtitle">Only members of your server can join.</string>
@@ -7470,10 +7553,23 @@
     <string name="sticker_picker_price_with_premium_tier_2">!!{price}!! with Nitro</string>
     <string name="sticker_picker_view_all">View All</string>
     <string name="sticker_popout_countdown_header">Limited time left</string>
+    <string name="sticker_popout_current_guild_description">This sticker is from this server. Get Nitro to use it everywhere.</string>
+    <string name="sticker_popout_join_server">Join Server</string>
+    <string name="sticker_popout_joined_guild_description">This sticker is from one of your servers. Get Nitro to use it everywhere.</string>
+    <string name="sticker_popout_joined_guild_emoji_description">This sticker is from</string>
     <string name="sticker_popout_pack_info">This is from the **{stickerPackName}** sticker pack. Get {discount}%% off with [Nitro](onClick).</string>
     <string name="sticker_popout_pack_info_nonpremium">Feelin\' it? Get Nitro to use 300 stickers like this and more.</string>
     <string name="sticker_popout_pack_info_premium">This is a **{stickerPackName}** sticker.</string>
     <string name="sticker_popout_pack_info_unavailable">This is a **{stickerPackName}** sticker. They are no longer available.</string>
+    <string name="sticker_popout_premium_current_guild_description">This sticker is from this server. You can use it everywhere.</string>
+    <string name="sticker_popout_premium_joined_guild_description">This sticker is from one of your servers. Type its name in the chat bar to use it.</string>
+    <string name="sticker_popout_premium_unjoined_discoverable_guild_description">Want to use this sticker everywhere? Join the server.</string>
+    <string name="sticker_popout_premium_unjoined_private_guild_description">This sticker is from a server that is either private or unavailable.</string>
+    <string name="sticker_popout_private_server">Private server</string>
+    <string name="sticker_popout_public_server">Public Server</string>
+    <string name="sticker_popout_unjoined_discoverable_guild_description">Want to use this sticker everywhere? Get Nitro and join the server.</string>
+    <string name="sticker_popout_unjoined_guild_emoji_description">Get this sticker from</string>
+    <string name="sticker_popout_unjoined_private_guild_description">This sticker is from a server that is either private or unavailable. [Learn more](openPremiumSettings) about using custom stickers.</string>
     <string name="sticker_premium_tier_1_upsell_alert_upgrade_cta">Subscribe to Nitro Classic</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_guild_subscription_discount">Get {percent} off on Boost purchases</string>
     <string name="sticker_premium_tier_1_upsell_perk_premium_subscription">Extra chat perks: animated emoji, custom Discord tag, and more</string>
@@ -7728,6 +7824,7 @@
     <string name="tabs_search_accessibility_label">Search tab</string>
     <string name="tabs_settings_accessibility_label">Settings tab</string>
     <string name="take_a_photo">Take a Photo</string>
+    <string name="take_me_there">Take me there</string>
     <string name="take_survey">Take Survey</string>
     <string name="tan">Tan</string>
     <string name="tap_add_nickname">Tap to add a nickname</string>
@@ -7796,6 +7893,8 @@
     <string name="thread_header_notice_archived">This thread is archived. You can send a message to unarchive it.</string>
     <string name="thread_header_notice_join">Join this thread to get notifications and to save in your channel list.</string>
     <string name="thread_header_notice_locked">This thread was archived by a moderator. Only moderators can unarchive it.</string>
+    <string name="thread_member_list_empty_state_header">There’s no one in this thread.</string>
+    <string name="thread_member_list_empty_state_subtext">You can invite people by @mentioning them in a message.</string>
     <string name="thread_member_without_access">Cannot view this thread</string>
     <string name="thread_message_count">{count}</string>
     <string name="thread_message_count_max">50+ Messages ›</string>
@@ -7962,6 +8061,7 @@
     <string name="unable_to_join_channel_full_modal_body">Sorry, this channel has the max number of people!</string>
     <string name="unable_to_join_channel_full_modal_header">Channel is full</string>
     <string name="unable_to_open_media_chooser">Unable to open media chooser. %1$s</string>
+    <string name="unable_to_process_image">Unable to process image</string>
     <string name="unarchive">Unarchive</string>
     <string name="unarchive_thread">Unarchive Thread</string>
     <string name="unban">Unban</string>
@@ -8178,6 +8278,7 @@
     <string name="user_settings">User Settings</string>
     <string name="user_settings_about_me">About Me</string>
     <string name="user_settings_about_me_description">Write anything you’d like about yourself — as long as you do it in under {maxLength} characters. You can use markdown and links if you’d like.</string>
+    <string name="user_settings_about_me_hint">Tap to add an about me</string>
     <string name="user_settings_account_change_email_prompt">Your current email address is !!{email}!! What would you like to change it to?</string>
     <string name="user_settings_account_change_email_prompt_desktop">Enter a new email address and your existing password.</string>
     <string name="user_settings_account_change_email_title">Edit Email</string>
@@ -8213,13 +8314,18 @@
     <string name="user_settings_appearance_zoom_tip">You can change the zoom level with {modKey} +/- and reset to the default zoom with {modKey}+0.</string>
     <string name="user_settings_available_codes">Available Backup Codes</string>
     <string name="user_settings_avatar">Avatar</string>
-    <string name="user_settings_banner_color">Banner Color</string>
+    <string name="user_settings_banner_a11y_label">Change Profile Banner</string>
+    <string name="user_settings_banner_edit_sub_label">The recommended minimum size and aspect ratio are 600x240 and 5:2. Accepted file types include PNG, JPG, and animated GIFs.</string>
     <string name="user_settings_banner_specs">We recommend an image of at least 600x240. You can upload a PNG, JPG, or an animated GIF.</string>
+    <string name="user_settings_banner_upload">Upload Profile Banner</string>
     <string name="user_settings_blocked_users">Blocked Users</string>
     <string name="user_settings_blocked_users_empty">You don\'t have any blocked users</string>
     <string name="user_settings_blocked_users_header">{numberOfBlockedUsers} Blocked Users</string>
     <string name="user_settings_blocked_users_unblockbutton">Unblock</string>
     <string name="user_settings_change_avatar">Change Avatar</string>
+    <string name="user_settings_change_avatar_a11y_label">Change Avatar</string>
+    <string name="user_settings_change_banner_a11y_label">Change Banner</string>
+    <string name="user_settings_change_profile_banner">Change Profile Banner</string>
     <string name="user_settings_close_button">Close Button</string>
     <string name="user_settings_confirm_logout">Are you sure you want to logout?</string>
     <string name="user_settings_customization_upsell">Unlock with Nitro</string>
@@ -8231,6 +8337,9 @@
     <string name="user_settings_edit_account_password_label">Enter your password to confirm changes</string>
     <string name="user_settings_edit_account_tag">TAG</string>
     <string name="user_settings_edit_profile">Edit Profile</string>
+    <string name="user_settings_edit_profile_dont_save">Don\'t Save</string>
+    <string name="user_settings_edit_profile_save_changes">Save Changes?</string>
+    <string name="user_settings_edit_profile_save_confirmation_body">You\'ve made changes. Do you want to save them before leaving this page?</string>
     <string name="user_settings_enter_password_view_codes">Enter your password to view backup codes.</string>
     <string name="user_settings_games_install_location">Location</string>
     <string name="user_settings_games_install_location_add">Add Install Location</string>
@@ -8271,6 +8380,8 @@
     <string name="user_settings_my_account">My Account</string>
     <string name="user_settings_no_email_placeholder">You haven\'t added an email yet.</string>
     <string name="user_settings_no_phone_placeholder">You haven\'t added a phone number yet.</string>
+    <string name="user_settings_no_subscription_credit">You have no unused credits</string>
+    <string name="user_settings_no_subscriptions">You have no active subscriptions</string>
     <string name="user_settings_noise_cancellation">Noise Suppression</string>
     <string name="user_settings_noise_cancellation_description">Suppress background noise from your mic.</string>
     <string name="user_settings_noise_cancellation_model">Noise suppression model</string>
@@ -8283,8 +8394,12 @@
     <string name="user_settings_open_on_startup_label">Open Discord</string>
     <string name="user_settings_privacy_terms">Check out our [Terms of Service]({termsLink}) and [Privacy Policy]({privacyLink}).</string>
     <string name="user_settings_profile_banner">Profile Banner</string>
+    <string name="user_settings_profile_color_custom">Custom</string>
+    <string name="user_settings_profile_color_default">Default</string>
+    <string name="user_settings_profle_color">Profile Color</string>
     <string name="user_settings_remove_avatar">Remove Avatar</string>
     <string name="user_settings_remove_banner">Remove Banner</string>
+    <string name="user_settings_remove_profile_banner">Remove Profile Banner</string>
     <string name="user_settings_restart_app_mobile">Restart the app for your new settings to take effect.</string>
     <string name="user_settings_save">Save</string>
     <string name="user_settings_scan_qr_code">Scan QR Code</string>
@@ -8295,10 +8410,11 @@
     <string name="user_settings_startup_behavior">System Startup Behavior</string>
     <string name="user_settings_streamer_notice_body">Enhance your Discord community with tools made for streamers. Check out [Discord\'s StreamKit]({streamkitURL}).</string>
     <string name="user_settings_streamer_notice_title">Looking for integrations?</string>
+    <string name="user_settings_subscriptions_header">Your Subscriptions</string>
+    <string name="user_settings_unlock_banner">Unlock Banner</string>
     <string name="user_settings_unverified_email_body">Please check your email and follow the instructions to verify your email. If you did not receive an email or if it expired, you can resend one.</string>
     <string name="user_settings_upload_avatar">Upload Avatar</string>
     <string name="user_settings_upload_banner">Upload Banner</string>
-    <string name="user_settings_use_default_banner_color">Use default</string>
     <string name="user_settings_used_backup_codes">Used Backup Codes</string>
     <string name="user_settings_user_profile">User Profile</string>
     <string name="user_settings_voice_add_multiple">You can add multiple Push to Talk binds under [Keybind Settings](onClick).</string>
@@ -8425,6 +8541,7 @@
     <string name="view_profile">View Profile</string>
     <string name="view_spectators">View spectators</string>
     <string name="view_surrounding_messages">View surrounding messages.</string>
+    <string name="view_thread">View Thread</string>
     <string name="viewing_as_roles">You are viewing this server as {numRoles}.</string>
     <string name="viewing_as_roles_back">Back to Roles Settings</string>
     <string name="viewing_as_roles_select">Select Roles</string>
@@ -8552,25 +8669,6 @@
     <string name="working">Working…</string>
     <string name="wumpus">Wumpus</string>
     <string name="xbox_authorization_title">Xbox Account Authorization</string>
-    <string name="xbox_game_pass_card_body_claimed">You\'ve claimed this. Here\'s your code !!{code}!!. [More Details](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_expanded">Gift is available to claim until January 15th, 2021. [Less Details](onToggleLegalese)</string>
-    <string name="xbox_game_pass_card_body_unclaimed_unexpanded">Gift is available to claim until January 15th, 2021. [More Details](onToggleLegalese)</string>
-    <string name="xbox_game_pass_modal_code_description">This code is also included in a confirmation email we just sent you.</string>
-    <string name="xbox_game_pass_modal_code_description_failed">Something went wrong, try again later!</string>
-    <string name="xbox_game_pass_modal_code_header">Xbox Game Pass for PC Code</string>
-    <string name="xbox_game_pass_modal_code_header_failed">Uh Oh</string>
-    <string name="xbox_game_pass_modal_header_description_success">Redeem the code below on the [Microsoft redemption site]({redemptionURL}) to get access to Xbox Game Pass for PC for 3 months.</string>
-    <string name="xbox_game_pass_modal_header_success">Awesome!</string>
-    <string name="xbox_game_pass_promotion_account_credit_body">Since you have a boost subscription, we\'ll give you Nitro subscription credit. Nitro credit will be applied when you subscribe to **{planName}**.</string>
-    <string name="xbox_game_pass_promotion_account_credit_button">Redeem</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_body">You now have Nitro Credit! Subscribe to **{planName}** today to apply your Nitro credit.</string>
-    <string name="xbox_game_pass_promotion_account_credit_confirm_title">Nice!</string>
-    <string name="xbox_game_pass_promotion_account_credit_title">Subscription Credit</string>
-    <string name="xbox_game_pass_promotion_banner_description">We got you a little something extra. Nitro subscribers now get 3 months of Xbox Game Pass for PC. Available now until January 15th, 2021. [More Details](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_description_expanded">We got you a little something extra. Nitro subscribers now get 3 months of Xbox Game Pass for PC. Available now until January 15th, 2021. [Less Details](onToggleExpand).</string>
-    <string name="xbox_game_pass_promotion_banner_header">3 Months of Xbox Game Pass for PC</string>
-    <string name="xbox_game_pass_promotion_card_header">Xbox Game Pass for PC (3 months)</string>
-    <string name="xbox_game_pass_promotion_legalese">Not valid for current or previous Xbox Game Pass for PC members, or Xbox Game Pass Ultimate members. Redeem your Xbox Game Pass code(s), at [microsoft.com/redeem](https://microsoft.com/redeem) by February 15th, 2021. Credit card required. Unless you cancel, you will be charged the then-current regular membership rate every month when the promotional period ends. Not supported on Windows 10 in S mode and on ARM devices. Game catalog varies over time. See [xbox.com/gamepass](https://xbox.com/gamepass). Limit: 1 per person/account.</string>
     <string name="xbox_link">Link</string>
     <string name="xbox_pin_step1">Open the Discord app on your phone</string>
     <string name="xbox_pin_step2">Go to Settings &gt; Connections &gt; Add</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8f0c11055d..6043079d84 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5814,6 +5814,7 @@
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?attr/colorTextNormal</item>
         <item name="android:textColorLink">?attr/colorTextLink</item>
+        <item name="android:fontFamily">?attr/font_primary_normal</item>
         <item name="android:textDirection">locale</item>
         <item name="fontFamily">?attr/font_primary_normal</item>
     </style>
diff --git a/build.gradle b/build.gradle
index c95e445df4..1c7fff77da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,20 @@
-buildscript {
-    repositories {
-    	google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+buildscript {
+    repositories {
+    	google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.0'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/settings.gradle b/settings.gradle
index ae6cd7efef..a82326b3c6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app'
-rootProject.name = 'UNKNOWN'
+include ':app'
+rootProject.name = 'UNKNOWN'